diff --git a/.cargo/config.toml b/.cargo/config.toml
index 5e3900f082..f7d8e616f8 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -8,7 +8,3 @@ benchmark = "bench -p ruff_benchmark --bench linter --bench formatter --"
 # See: https://github.com/astral-sh/ruff/issues/11503
 [target.'cfg(all(target_env="msvc", target_os = "windows"))']
 rustflags = ["-C", "target-feature=+crt-static"]
-
-[target.'wasm32-unknown-unknown']
-# See https://docs.rs/getrandom/latest/getrandom/#webassembly-support
-rustflags = ["--cfg", 'getrandom_backend="wasm_js"']
\ No newline at end of file
diff --git a/.config/nextest.toml b/.config/nextest.toml
index 2ab53e2239..f2537ce580 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -1,3 +1,12 @@
+# Define serial test group for running tests sequentially.
+[test-groups]
+serial = { max-threads = 1 }
+
+# Run ty file watching tests sequentially to avoid race conditions.
+[[profile.default.overrides]]
+filter = 'binary(file_watching)'
+test-group = 'serial'
+
 [profile.ci]
 # Print out output for failing tests as soon as they fail, and also at the end
 # of the run (for easy scrollability).
diff --git a/.editorconfig b/.editorconfig
index 23a805b49f..125f7f5de9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 indent_size = 2
 
-[*.{rs,py,pyi}]
+[*.{rs,py,pyi,toml}]
 indent_size = 4
 
 [*.snap]
@@ -18,6 +18,3 @@ trim_trailing_whitespace = false
 
 [*.md]
 max_line_length = 100
-
-[*.toml]
-indent_size = 4
\ No newline at end of file
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 5735130799..c26802228f 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -39,11 +39,11 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
@@ -68,11 +68,11 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -110,11 +110,11 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: arm64
@@ -166,11 +166,11 @@ jobs:
           - target: aarch64-pc-windows-msvc
             arch: x64
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.platform.arch }}
@@ -219,11 +219,11 @@ jobs:
           - x86_64-unknown-linux-gnu
           - i686-unknown-linux-gnu
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -296,11 +296,11 @@ jobs:
             arch: riscv64
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
@@ -361,11 +361,11 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -427,11 +427,11 @@ jobs:
             arch: armv7
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index c7662f807d..70275ab152 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -33,14 +33,14 @@ jobs:
           - linux/amd64
           - linux/arm64
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
           persist-credentials: false
 
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -113,7 +113,7 @@ jobs:
     if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
     steps:
       - name: Download digests
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           path: /tmp/digests
           pattern: digests-*
@@ -131,7 +131,7 @@ jobs:
             type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
             type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -169,7 +169,7 @@ jobs:
     steps:
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -256,7 +256,7 @@ jobs:
     if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
     steps:
       - name: Download digests
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           path: /tmp/digests
           pattern: digests-*
@@ -276,7 +276,7 @@ jobs:
             type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
             type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9ac4c7b62b..c57773078f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,13 +12,18 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.13"
+  PYTHON_VERSION: "3.14"
+  NEXTEST_PROFILE: ci
 
 jobs:
   determine_changes:
@@ -43,7 +48,7 @@ jobs:
       # Flag that is set to "true" when code related to the playground changes.
       playground: ${{ steps.check_playground.outputs.changed }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -88,7 +93,6 @@ jobs:
             ':!crates/ruff_python_formatter/**' \
             ':!crates/ruff_formatter/**' \
             ':!crates/ruff_dev/**' \
-            ':!crates/ruff_db/**' \
             ':scripts/*' \
             ':python/**' \
             ':.github/workflows/ci.yaml' \
@@ -143,7 +147,7 @@ jobs:
         env:
           MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
         run: |
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py_fuzzer/**' \
+          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py-fuzzer/**' \
           ; then
               echo "changed=false" >> "$GITHUB_OUTPUT"
           else
@@ -209,7 +213,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
@@ -223,10 +227,10 @@ jobs:
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
@@ -238,27 +242,31 @@ jobs:
 
   cargo-test-linux:
     name: "cargo test (linux)"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     needs: determine_changes
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-insta
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: "true"
       - name: ty mdtests (GitHub annotations)
         if: ${{ needs.determine_changes.outputs.ty == 'true' }}
         env:
@@ -268,11 +276,9 @@ jobs:
         # This step is just to get nice GitHub annotations on the PR diff in the files-changed tab.
         run: cargo test -p ty_python_semantic --test mdtest || true
       - name: "Run tests"
-        shell: bash
-        env:
-          NEXTEST_PROFILE: "ci"
         run: cargo insta test --all-features --unreferenced reject --test-runner nextest
-
+      # Dogfood ty on py-fuzzer
+      - run: uv run --project=./python/py-fuzzer cargo run -p ty check --project=./python/py-fuzzer
       # Check for broken links in the documentation.
       - run: cargo doc --all --no-deps
         env:
@@ -296,56 +302,65 @@ jobs:
 
   cargo-test-linux-release:
     name: "cargo test (linux, release)"
+    # release builds timeout on GitHub runners, so this job is just skipped on forks in the `if` check
     runs-on: depot-ubuntu-22.04-16
     needs: determine_changes
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
+    if: |
+      github.repository == 'astral-sh/ruff' &&
+      !contains(github.event.pull_request.labels.*.name, 'no-test') &&
+      (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main')
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-insta
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: "true"
       - name: "Run tests"
-        shell: bash
-        env:
-          NEXTEST_PROFILE: "ci"
         run: cargo insta test --release --all-features --unreferenced reject --test-runner nextest
 
-  cargo-test-windows:
-    name: "cargo test (windows)"
-    runs-on: depot-windows-2022-16
+  cargo-test-other:
+    strategy:
+      matrix:
+        platform:
+          - ${{ github.repository == 'astral-sh/ruff' && 'depot-windows-2022-16' || 'windows-latest' }}
+          - macos-latest
+    name: "cargo test (${{ matrix.platform }})"
+    runs-on: ${{ matrix.platform }}
     needs: determine_changes
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-nextest
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: "true"
       - name: "Run tests"
-        shell: bash
-        env:
-          NEXTEST_PROFILE: "ci"
-          # Workaround for <https://github.com/nextest-rs/nextest/issues/1493>.
-          RUSTUP_WINDOWS_PATH_ADD_BIN: 1
         run: |
           cargo nextest run --all-features --profile ci
           cargo test --all-features --doc
@@ -357,15 +372,15 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
           cache-dependency-path: playground/package-lock.json
       - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
@@ -380,31 +395,14 @@ jobs:
           cd crates/ty_wasm
           wasm-pack test --node
 
-  cargo-build-release:
-    name: "cargo build (release)"
-    runs-on: macos-latest
-    if: ${{ github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
-      - name: "Build"
-        run: cargo build --release --locked
-
   cargo-build-msrv:
     name: "cargo build (msrv)"
-    runs-on: depot-ubuntu-latest-8
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
     needs: determine_changes
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - uses: SebRollen/toml-action@b1b3628f55fc3a28208d4203ada8b737e9687876 # v1.2.0
@@ -412,15 +410,14 @@ jobs:
         with:
           file: "Cargo.toml"
           field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         env:
           MSRV: ${{ steps.msrv.outputs.value }}
         run: rustup default "${MSRV}"
       - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Build tests"
-        shell: bash
         env:
           MSRV: ${{ steps.msrv.outputs.value }}
         run: cargo "+${MSRV}" test --no-run --all-features
@@ -432,18 +429,16 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' || needs.determine_changes.outputs.fuzz == 'true' || needs.determine_changes.outputs.code == 'true' }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "fuzz -> target"
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
-        with:
-          tool: cargo-fuzz@0.11.2
+        uses: cargo-bins/cargo-binstall@a66119fbb1c952daba62640c2609111fe0803621 # v1.15.7
       - name: "Install cargo-fuzz"
         # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
         run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -460,11 +455,11 @@ jobs:
     env:
       FORCE_COLOR: 1
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         name: Download Ruff binary to test
         id: download-cached-binary
         with:
@@ -478,9 +473,10 @@ jobs:
           chmod +x "${DOWNLOAD_PATH}/ruff"
 
           (
-            uvx \
+            uv run \
             --python="${PYTHON_VERSION}" \
-            --from=./python/py-fuzzer \
+            --project=./python/py-fuzzer \
+            --locked \
             fuzz \
             --test-executable="${DOWNLOAD_PATH}/ruff" \
             --bin=ruff \
@@ -494,10 +490,11 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       # Run all code generation scripts, and verify that the current output is
@@ -512,10 +509,15 @@ jobs:
           ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
           ./scripts/add_rule.py --name FirstRule --prefix TST --code 001 --linter test
       - run: cargo check
+      # Lint/format/type-check py-fuzzer
+      # (dogfooding with ty is done in a separate job)
+      - run: uv run --directory=./python/py-fuzzer mypy
+      - run: uv run --directory=./python/py-fuzzer ruff format --check
+      - run: uv run --directory=./python/py-fuzzer ruff check
 
   ecosystem:
     name: "ecosystem"
-    runs-on: depot-ubuntu-latest-8
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
     needs:
       - cargo-test-linux
       - determine_changes
@@ -524,14 +526,16 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.code == 'true' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          # TODO: figure out why `ruff-ecosystem` crashes on Python 3.14
+          python-version: "3.13"
+          activate-environment: true
 
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         name: Download comparison Ruff binary
         id: ruff-target
         with:
@@ -548,7 +552,7 @@ jobs:
 
       - name: Install ruff-ecosystem
         run: |
-          pip install ./python/ruff-ecosystem
+          uv pip install ./python/ruff-ecosystem
 
       - name: Run `ruff check` stable ecosystem check
         if: ${{ needs.determine_changes.outputs.linter == 'true' }}
@@ -640,18 +644,18 @@ jobs:
 
   fuzz-ty:
     name: "Fuzz for new ty panics"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     needs:
       - cargo-test-linux
       - determine_changes
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
-    timeout-minutes: 20
+    timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 5 || 20 }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         name: Download new ty binary
         id: ty-new
         with:
@@ -664,7 +668,7 @@ jobs:
           branch: ${{ github.event.pull_request.base.ref }}
           workflow: "ci.yaml"
           check_artifacts: true
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: Fuzz
         env:
           FORCE_COLOR: 1
@@ -674,15 +678,16 @@ jobs:
           chmod +x "${PWD}/ty" "${NEW_TY}/ty"
 
           (
-            uvx \
+            uv run \
             --python="${PYTHON_VERSION}" \
-            --from=./python/py-fuzzer \
+            --project=./python/py-fuzzer \
+            --locked \
             fuzz \
             --test-executable="${NEW_TY}/ty" \
             --baseline-executable="${PWD}/ty" \
             --only-new-bugs \
             --bin=ty \
-            0-500
+            0-1000
           )
 
   cargo-shear:
@@ -691,27 +696,45 @@ jobs:
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
+      - uses: cargo-bins/cargo-binstall@a66119fbb1c952daba62640c2609111fe0803621 # v1.15.7
       - run: cargo binstall --no-confirm cargo-shear
       - run: cargo shear
 
+  ty-completion-evaluation:
+    name: "ty completion evaluation"
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    needs: determine_changes
+    if: ${{ needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main' }}
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Run ty completion evaluation"
+        run: cargo run --release --package ty_completion_eval -- all --threshold 0.4 --tasks /tmp/completion-evaluation-tasks.csv
+      - name: "Ensure there are no changes"
+        run: diff ./crates/ty_completion_eval/completion-evaluation-tasks.csv /tmp/completion-evaluation-tasks.csv
+
   python-package:
     name: "python package"
     runs-on: ubuntu-latest
     timeout-minutes: 20
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
@@ -728,19 +751,19 @@ jobs:
 
   pre-commit:
     name: "pre-commit"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 22
       - name: "Cache pre-commit"
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -762,13 +785,10 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.13"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
@@ -777,13 +797,16 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          python-version: 3.13
+          activate-environment: true
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: uv pip install -r docs/requirements-insiders.txt --system
+        run: uv pip install -r docs/requirements-insiders.txt
       - name: "Install dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: uv pip install -r docs/requirements.txt --system
+        run: uv pip install -r docs/requirements.txt
       - name: "Update README File"
         run: python scripts/transform_readme.py --target mkdocs
       - name: "Generate docs"
@@ -804,10 +827,10 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Run checks"
@@ -830,18 +853,18 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         name: "Download ruff-lsp source"
         with:
           persist-credentials: false
           repository: "astral-sh/ruff-lsp"
 
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           # installation fails on 3.13 and newer
           python-version: "3.12"
 
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         name: Download development ruff binary
         id: ruff-target
         with:
@@ -872,13 +895,13 @@ jobs:
       - determine_changes
     if: ${{ (needs.determine_changes.outputs.playground == 'true') }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 22
           cache: "npm"
@@ -897,58 +920,108 @@ jobs:
         run: npm run fmt:check
         working-directory: playground
 
-  benchmarks-instrumented:
+  benchmarks-instrumented-ruff:
+    name: "benchmarks instrumented (ruff)"
     runs-on: ubuntu-24.04
     needs: determine_changes
-    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
+    if: |
+      github.repository == 'astral-sh/ruff' &&
+      (
+        github.ref == 'refs/heads/main' ||
+        needs.determine_changes.outputs.formatter == 'true' ||
+        needs.determine_changes.outputs.linter == 'true'
+      )
     timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark
+        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
+        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
         with:
+          mode: instrumentation
           run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}
 
-  benchmarks-walltime:
-    runs-on: codspeed-macro
+  benchmarks-instrumented-ty:
+    name: "benchmarks instrumented (ty)"
+    runs-on: ubuntu-24.04
     needs: determine_changes
-    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
+    if: |
+      github.repository == 'astral-sh/ruff' &&
+      (
+        github.ref == 'refs/heads/main' ||
+        needs.determine_changes.outputs.ty == 'true'
+      )
     timeout-minutes: 20
-    env:
-      TY_LOG: ruff_benchmark=debug
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        with:
+          tool: cargo-codspeed
+
+      - name: "Build benchmarks"
+        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench ty
+
+      - name: "Run benchmarks"
+        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        with:
+          mode: instrumentation
+          run: cargo codspeed run
+          token: ${{ secrets.CODSPEED_TOKEN }}
+
+  benchmarks-walltime:
+    name: "benchmarks walltime (${{ matrix.benchmarks }})"
+    runs-on: codspeed-macro
+    needs: determine_changes
+    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        benchmarks:
+          - "medium|multithreaded"
+          - "small|large"
+    steps:
+      - name: "Checkout Branch"
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+
+      - name: "Install Rust toolchain"
+        run: rustup show
+
+      - name: "Install codspeed"
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
         with:
           tool: cargo-codspeed
 
@@ -956,7 +1029,13 @@ jobs:
         run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
+        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        env:
+          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
+          # appear to provide much useful insight for our walltime benchmarks right now
+          # (see https://github.com/astral-sh/ruff/pull/20419)
+          CODSPEED_PERF_ENABLED: false
         with:
-          run: cargo codspeed run
+          mode: walltime
+          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
           token: ${{ secrets.CODSPEED_TOKEN }}
diff --git a/.github/workflows/daily_fuzz.yaml b/.github/workflows/daily_fuzz.yaml
index a32ed2a80d..c299e00fda 100644
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -31,15 +31,15 @@ jobs:
     # Don't run the cron job on forks:
     if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: Build ruff
         # A debug build means the script runs slower once it gets started,
         # but this is outweighed by the fact that a release build takes *much* longer to compile in CI
@@ -48,9 +48,10 @@ jobs:
         run: |
           # shellcheck disable=SC2046
           (
-            uvx \
-            --python=3.12 \
-            --from=./python/py-fuzzer \
+            uv run \
+            --python=3.14 \
+            --project=./python/py-fuzzer \
+            --locked \
             fuzz \
             --test-executable=target/debug/ruff \
             --bin=ruff \
@@ -65,7 +66,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/mypy_primer.yaml b/.github/workflows/mypy_primer.yaml
index 3d91decb11..672a038537 100644
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -19,6 +19,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
@@ -29,19 +33,19 @@ env:
 jobs:
   mypy_primer:
     name: Run mypy_primer
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
 
@@ -49,7 +53,6 @@ jobs:
         run: rustup show
 
       - name: Run mypy_primer
-        shell: bash
         env:
           PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/good.txt
           DIFF_FILE: mypy_primer.diff
@@ -72,19 +75,19 @@ jobs:
 
   memory_usage:
     name: Run memory statistics
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
 
@@ -92,7 +95,6 @@ jobs:
         run: rustup show
 
       - name: Run mypy_primer
-        shell: bash
         env:
           TY_MAX_PARALLELISM: 1 # for deterministic memory numbers
           TY_MEMORY_REPORT: mypy_primer
diff --git a/.github/workflows/notify-dependents.yml b/.github/workflows/notify-dependents.yml
index 3f5da37782..c7f7224d7a 100644
--- a/.github/workflows/notify-dependents.yml
+++ b/.github/workflows/notify-dependents.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Update pre-commit mirror"
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }}
           script: |
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index eaa0303296..8adbe4536c 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -23,12 +23,12 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           ref: ${{ inputs.ref }}
           persist-credentials: true
 
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: 3.12
 
@@ -68,7 +68,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
 
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
diff --git a/.github/workflows/publish-playground.yml b/.github/workflows/publish-playground.yml
index e7bf15dde2..24bf4b4fef 100644
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -18,22 +18,23 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
+permissions: {}
+
 jobs:
   publish:
     runs-on: ubuntu-latest
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 22
-          cache: "npm"
-          cache-dependency-path: playground/package-lock.json
+          package-manager-cache: false
       - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
       - name: "Install Node dependencies"
         run: npm ci
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
index 300e6f8585..e5473f80a3 100644
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,8 +22,8 @@ jobs:
       id-token: write
     steps:
       - name: "Install uv"
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           pattern: wheels-*
           path: wheels
diff --git a/.github/workflows/publish-ty-playground.yml b/.github/workflows/publish-ty-playground.yml
index b5dc37dc47..f28086517c 100644
--- a/.github/workflows/publish-ty-playground.yml
+++ b/.github/workflows/publish-ty-playground.yml
@@ -30,14 +30,15 @@ jobs:
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 22
+          package-manager-cache: false
       - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
       - name: "Install Node dependencies"
         run: npm ci
diff --git a/.github/workflows/publish-wasm.yml b/.github/workflows/publish-wasm.yml
index 81193b9352..a51c888286 100644
--- a/.github/workflows/publish-wasm.yml
+++ b/.github/workflows/publish-wasm.yml
@@ -29,7 +29,7 @@ jobs:
         target: [web, bundler, nodejs]
       fail-fast: false
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
@@ -45,9 +45,9 @@ jobs:
           jq '.name="@astral-sh/ruff-wasm-${{ matrix.target }}"' crates/ruff_wasm/pkg/package.json > /tmp/package.json
           mv /tmp/package.json crates/ruff_wasm/pkg
       - run: cp LICENSE crates/ruff_wasm/pkg # wasm-pack does not put the LICENSE file in the pkg
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
-          node-version: 20
+          node-version: 22
           registry-url: "https://registry.npmjs.org"
       - name: "Publish (dry-run)"
         if: ${{ inputs.plan == '' || fromJson(inputs.plan).announcement_tag_is_implicit }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 218f07b9a8..6261aed8ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,6 @@
-# This file was autogenerated by dist: https://github.com/astral-sh/cargo-dist
+# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
 #
 # Copyright 2022-2024, axodotdev
-# Copyright 2025 Astral Software Inc.
 # SPDX-License-Identifier: MIT or Apache-2.0
 #
 # CI that:
@@ -61,7 +60,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
@@ -69,7 +68,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.5-prerelease.1/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
       - name: Cache dist
         uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
         with:
@@ -124,7 +123,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
@@ -175,7 +174,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
@@ -251,7 +250,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
diff --git a/.github/workflows/sync_typeshed.yaml b/.github/workflows/sync_typeshed.yaml
index c75cc9af6e..f7bb4c5426 100644
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -16,8 +16,10 @@ name: Sync typeshed
 # 3. Once the Windows worker is done, a MacOS worker:
 #    a. Checks out the branch created by the Linux worker
 #    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Commits the changes and pushes them to the same upstream branch
-#    d. Creates a PR against the `main` branch using the branch all three workers have pushed to
+#    c. Attempts to update any snapshots that might have changed
+#       (this sub-step is allowed to fail)
+#    d. Commits the changes and pushes them to the same upstream branch
+#    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
 
 on:
@@ -26,8 +28,18 @@ on:
     # Run on the 1st and the 15th of every month:
     - cron: "0 0 1,15 * *"
 
+defaults:
+  run:
+    shell: bash
+
 env:
-  FORCE_COLOR: 1
+  # Don't set this flag globally for the workflow: it does strange things
+  # to the snapshots in the `cargo insta test --accept` step in the MacOS job.
+  #
+  # FORCE_COLOR: 1
+
+  CARGO_TERM_COLOR: always
+  NEXTEST_PROFILE: "ci"
   GH_TOKEN: ${{ github.token }}
 
   # The name of the upstream branch that the first worker creates,
@@ -50,12 +62,12 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         name: Checkout Ruff
         with:
           path: ruff
           persist-credentials: true
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         name: Checkout typeshed
         with:
           repository: python/typeshed
@@ -65,7 +77,7 @@ jobs:
         run: |
           git config --global user.name typeshedbot
           git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: Sync typeshed stubs
         run: |
           rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -86,6 +98,8 @@ jobs:
           git commit -m "Sync typeshed. Source commit: https://github.com/python/typeshed/commit/$(git -C ../typeshed rev-parse HEAD)" --allow-empty
       - name: Sync Linux docstrings
         if: ${{ success() }}
+        env:
+          FORCE_COLOR: 1
         run: |
           cd ruff
           ./scripts/codemod_docstrings.sh
@@ -112,19 +126,20 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         name: Checkout Ruff
         with:
           persist-credentials: true
           ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: Setup git
         run: |
           git config --global user.name typeshedbot
           git config --global user.email '<>'
       - name: Sync Windows docstrings
         id: docstrings
-        shell: bash
+        env:
+          FORCE_COLOR: 1
         run: ./scripts/codemod_docstrings.sh
       - name: Commit the changes
         if: ${{ steps.docstrings.outcome == 'success' }}
@@ -150,37 +165,74 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         name: Checkout Ruff
         with:
           persist-credentials: true
           ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: Setup git
         run: |
           git config --global user.name typeshedbot
           git config --global user.email '<>'
       - name: Sync macOS docstrings
-        run: ./scripts/codemod_docstrings.sh
-      - name: Commit and push the changes
         if: ${{ success() }}
+        env:
+          FORCE_COLOR: 1
         run: |
+          ./scripts/codemod_docstrings.sh
           git commit -am "Sync macOS docstrings" --allow-empty
-
+      - name: Format the changes
+        if: ${{ success() }}
+        env:
+          FORCE_COLOR: 1
+        run: |
           # Here we just reformat the codemodded stubs so that they are
           # consistent with the other typeshed stubs around them.
           # Typeshed formats code using black in their CI, so we just invoke
           # black on the stubs the same way that typeshed does.
           uvx black "${VENDORED_TYPESHED}/stdlib" --config "${VENDORED_TYPESHED}/pyproject.toml" || true
           git commit -am "Format codemodded docstrings" --allow-empty
-
-          rm "${VENDORED_TYPESHED}/pyproject.toml"
-          git commit -am "Remove pyproject.toml file"
-
-          git push
-      - name: Create a PR
+      - name: Remove typeshed pyproject.toml file
         if: ${{ success() }}
         run: |
+          rm "${VENDORED_TYPESHED}/pyproject.toml"
+          git commit -am "Remove pyproject.toml file"
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - name: "Install Rust toolchain"
+        if: ${{ success() }}
+        run: rustup show
+      - name: "Install mold"
+        if: ${{ success() }}
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Install cargo nextest"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        with:
+          tool: cargo-nextest
+      - name: "Install cargo insta"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        with:
+          tool: cargo-insta
+      - name: Update snapshots
+        if: ${{ success() }}
+        run: |
+          # The `cargo insta` docs indicate that `--unreferenced=delete` might be a good option,
+          # but from local testing it appears to just revert all changes made by `cargo insta test --accept`.
+          #
+          # If there were only snapshot-related failures, `cargo insta test --accept` will have exit code 0,
+          # but if there were also other mdtest failures (for example), it will return a nonzero exit code.
+          # We don't care about other tests failing here, we just want snapshots updated where possible,
+          # so we use `|| true` here to ignore the exit code.
+          cargo insta test --accept --color=always --all-features --test-runner=nextest || true
+      - name: Commit snapshot changes
+        if: ${{ success() }}
+        run: git commit -am "Update snapshots" || echo "No snapshot changes to commit"
+      - name: Push changes upstream and create a PR
+        if: ${{ success() }}
+        run: |
+          git push
           gh pr list --repo "${GITHUB_REPOSITORY}" --head "${UPSTREAM_BRANCH}" --json id --jq length | grep 1 && exit 0 # exit if there is existing pr
           gh pr create --title "[ty] Sync vendored typeshed stubs" --body "Close and reopen this PR to trigger CI" --label "ty"
 
@@ -192,7 +244,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/ty-ecosystem-analyzer.yaml b/.github/workflows/ty-ecosystem-analyzer.yaml
index 1d6f1482ee..a59cc6c947 100644
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -22,22 +22,25 @@ env:
 jobs:
   ty-ecosystem-analyzer:
     name: Compute diagnostic diff
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     if: contains(github.event.label.name, 'ecosystem-analyzer')
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - name: Install Rust toolchain
         run: rustup show
@@ -64,11 +67,12 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@27dd66d9e397d986ef9c631119ee09556eab8af9"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
 
           ecosystem-analyzer \
             --repository ruff \
             diff \
+            --profile=profiling \
             --projects-old ruff/projects_old.txt \
             --projects-new ruff/projects_new.txt \
             --old old_commit \
@@ -94,6 +98,14 @@ jobs:
             --new-name "$REF_NAME" \
             --output diff-statistics.md
 
+          ecosystem-analyzer \
+            generate-timing-diff \
+            diagnostics-old.json \
+            diagnostics-new.json \
+            --old-name "main (merge base)" \
+            --new-name "$REF_NAME" \
+            --output-html dist/timing.html
+
           echo '## `ecosystem-analyzer` results' > comment.md
           echo >> comment.md
           cat diff-statistics.md >> comment.md
@@ -117,7 +129,7 @@ jobs:
           DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
         run: |
           echo >> comment.md
-          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)**" >> comment.md
+          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md
 
       - name: Upload comment
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -136,3 +148,9 @@ jobs:
         with:
           name: diff.html
           path: dist/diff.html
+
+      - name: Upload timing diff
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: timing.html
+          path: dist/timing.html
diff --git a/.github/workflows/ty-ecosystem-report.yaml b/.github/workflows/ty-ecosystem-report.yaml
index 6ddbaa9727..30b3bc93ab 100644
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -19,21 +19,24 @@ env:
 jobs:
   ty-ecosystem-report:
     name: Create ecosystem report
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - name: Install Rust toolchain
         run: rustup show
@@ -49,12 +52,13 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@27dd66d9e397d986ef9c631119ee09556eab8af9"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
 
           ecosystem-analyzer \
             --verbose \
             --repository ruff \
             analyze \
+            --profile=profiling \
             --projects ruff/crates/ty_python_semantic/resources/primer/good.txt \
             --output ecosystem-diagnostics.json
 
@@ -62,7 +66,7 @@ jobs:
 
           ecosystem-analyzer \
             generate-report \
-            --max-diagnostics-per-project=1200 \
+            --max-diagnostics-per-project=1000 \
             ecosystem-diagnostics.json \
             --output dist/index.html
 
diff --git a/.github/workflows/typing_conformance.yaml b/.github/workflows/typing_conformance.yaml
index 660163fea7..ed23e6c084 100644
--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -29,23 +29,23 @@ env:
 jobs:
   typing_conformance:
     name: Compute diagnostic diff
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: python/typing
           ref: ${{ env.CONFORMANCE_SUITE_COMMIT }}
           path: typing
           persist-credentials: false
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
 
diff --git a/.github/zizmor.yml b/.github/zizmor.yml
index 8eae6bd3f3..2dc7f7dba3 100644
--- a/.github/zizmor.yml
+++ b/.github/zizmor.yml
@@ -9,13 +9,18 @@ rules:
   cache-poisoning:
     ignore:
       - build-docker.yml
-      - publish-playground.yml
-      - ty-ecosystem-analyzer.yaml
-      - ty-ecosystem-report.yaml
   excessive-permissions:
     # it's hard to test what the impact of removing these ignores would be
     # without actually running the release workflow...
     ignore:
       - build-docker.yml
-      - publish-playground.yml
       - publish-docs.yml
+  secrets-inherit:
+    # `cargo dist` makes extensive use of `secrets: inherit`,
+    # and we can't easily fix that until an upstream release changes that.
+    disable: true
+  template-injection:
+    ignore:
+      # like with `secrets-inherit`, `cargo dist` introduces some
+      # template injections. We've manually audited these usages for safety.
+      - release.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5c40d6ec78..130aaa554f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,8 @@ exclude: |
     crates/ruff_python_formatter/resources/.*|
     crates/ruff_python_formatter/tests/snapshots/.*|
     crates/ruff_python_resolver/resources/.*|
-    crates/ruff_python_resolver/tests/snapshots/.*
+    crates/ruff_python_resolver/tests/snapshots/.*|
+    crates/ty_completion_eval/truth/.*
   )$
 
 repos:
@@ -34,6 +35,7 @@ repos:
     rev: 0.7.22
     hooks:
       - id: mdformat
+        language: python # means renovate will also update `additional_dependencies`
         additional_dependencies:
           - mdformat-mkdocs==4.0.0
           - mdformat-footnote==0.1.1
@@ -57,6 +59,7 @@ repos:
     rev: 1.19.1
     hooks:
       - id: blacken-docs
+        language: python # means renovate will also update `additional_dependencies`
         args: ["--pyi", "--line-length", "130"]
         files: '^crates/.*/resources/mdtest/.*\.md'
         exclude: |
@@ -98,8 +101,8 @@ repos:
 
   # zizmor detects security vulnerabilities in GitHub Actions workflows.
   # Additional configuration for the tool is found in `.github/zizmor.yml`
-  - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.11.0
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.15.2
     hooks:
       - id: zizmor
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 91c33bc2c6..ed69b26b29 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,4 +3,7 @@
         "--all-features"
     ],
     "rust-analyzer.check.command": "clippy",
-}
\ No newline at end of file
+    "search.exclude": {
+        "**/*.snap": true
+    }
+}
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
index 7dc0583db5..491eb59cca 100644
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,5 +1,60 @@
 # Breaking Changes
 
+## 0.14.0
+
+- **Default to Python 3.10**
+
+    Ruff now defaults to Python 3.10 instead of 3.9 if no explicit Python
+    version is configured using [`ruff.target-version`](https://docs.astral.sh/ruff/settings/#target-version)
+    or [`project.requires-python`](https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#python-requires)
+    ([#20725](https://github.com/astral-sh/ruff/pull/20725))
+
+- **Default to Python 3.14 for syntax errors**
+
+    Ruff will default to the _latest_ supported Python version (3.14) when
+    checking for syntax errors without a Python version configured. The default
+    in all other cases, like applying lint rules, remains at the minimum
+    supported Python version (3.10).
+
+## 0.13.0
+
+- **Several rules can now add `from __future__ import annotations` automatically**
+
+    `TC001`, `TC002`, `TC003`, `RUF013`, and `UP037` now add `from __future__ import annotations` as part of their fixes when the
+    `lint.future-annotations` setting is enabled. This allows the rules to move
+    more imports into `TYPE_CHECKING` blocks (`TC001`, `TC002`, and `TC003`),
+    use PEP 604 union syntax on Python versions before 3.10 (`RUF013`), and
+    unquote more annotations (`UP037`).
+
+- **Full module paths are now used to verify first-party modules**
+
+    Ruff now checks that the full path to a module exists on disk before
+    categorizing it as a first-party import. This change makes first-party
+    import detection more accurate, helping to avoid false positives on local
+    directories with the same name as a third-party dependency, for example. See
+    the [FAQ
+    section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) on import categorization for more details.
+
+- **Deprecated rules must now be selected by exact rule code**
+
+    Ruff will no longer activate deprecated rules selected by their group name
+    or prefix. As noted below, the two remaining deprecated rules were also
+    removed in this release, so this won't affect any current rules, but it will
+    still affect any deprecations in the future.
+
+- **The deprecated macOS configuration directory fallback has been removed**
+
+    Ruff will no longer look for a user-level configuration file at
+    `~/Library/Application Support/ruff/ruff.toml` on macOS. This feature was
+    deprecated in v0.5 in favor of using the [XDG
+    specification](https://specifications.freedesktop.org/basedir-spec/latest/)
+    (usually resolving to `~/.config/ruff/ruff.toml`), like on Linux. The
+    fallback and accompanying deprecation warning have now been removed.
+
+- **[`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name) (`PD901`) has been removed**
+
+- **[`non-pep604-isinstance`](https://docs.astral.sh/ruff/rules/non-pep604-isinstance) (`UP038`) has been removed**
+
 ## 0.12.0
 
 - **Detection of more syntax errors**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9952e0f66..4689757c34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,466 +1,156 @@
 # Changelog
 
-## 0.12.9
+## 0.14.2
+
+Released on 2025-10-23.
 
 ### Preview features
 
-- \[`airflow`\] Add check for `airflow.secrets.cache.SecretCache` (`AIR301`) ([#17707](https://github.com/astral-sh/ruff/pull/17707))
-- \[`ruff`\] Offer a safe fix for multi-digit zeros (`RUF064`) ([#19847](https://github.com/astral-sh/ruff/pull/19847))
+- \[`flake8-gettext`\] Resolve qualified names and built-in bindings (`INT001`, `INT002`, `INT003`) ([#19045](https://github.com/astral-sh/ruff/pull/19045))
 
 ### Bug fixes
 
-- \[`flake8-blind-except`\] Fix `BLE001` false-positive on `raise ... from None` ([#19755](https://github.com/astral-sh/ruff/pull/19755))
-- \[`flake8-comprehensions`\] Fix false positive for `C420` with attribute, subscript, or slice assignment targets ([#19513](https://github.com/astral-sh/ruff/pull/19513))
-- \[`flake8-simplify`\] Fix handling of U+001C..U+001F whitespace (`SIM905`) ([#19849](https://github.com/astral-sh/ruff/pull/19849))
+- Avoid reusing nested, interpolated quotes before Python 3.12 ([#20930](https://github.com/astral-sh/ruff/pull/20930))
+- Catch syntax errors in nested interpolations before Python 3.12 ([#20949](https://github.com/astral-sh/ruff/pull/20949))
+- \[`fastapi`\] Handle ellipsis defaults in `FAST002` autofix ([#20810](https://github.com/astral-sh/ruff/pull/20810))
+- \[`flake8-simplify`\] Skip `SIM911` when unknown arguments are present ([#20697](https://github.com/astral-sh/ruff/pull/20697))
+- \[`pyupgrade`\] Always parenthesize assignment expressions in fix for `f-string` (`UP032`) ([#21003](https://github.com/astral-sh/ruff/pull/21003))
+- \[`pyupgrade`\] Fix `UP032` conversion for decimal ints with underscores ([#21022](https://github.com/astral-sh/ruff/pull/21022))
+- \[`fastapi`\] Skip autofix for keyword and `__debug__` path params (`FAST003`) ([#20960](https://github.com/astral-sh/ruff/pull/20960))
 
 ### Rule changes
 
-- \[`pylint`\] Use lowercase hex characters to match the formatter (`PLE2513`) ([#19808](https://github.com/astral-sh/ruff/pull/19808))
+- \[`flake8-bugbear`\] Skip `B905` and `B912` for fewer than two iterables and no starred arguments ([#20998](https://github.com/astral-sh/ruff/pull/20998))
+- \[`ruff`\] Use `DiagnosticTag` for more `pyflakes` and `pandas` rules ([#20801](https://github.com/astral-sh/ruff/pull/20801))
+
+### CLI
+
+- Improve JSON output from `ruff rule` ([#20168](https://github.com/astral-sh/ruff/pull/20168))
 
 ### Documentation
 
-- Fix `lint.future-annotations` link ([#19876](https://github.com/astral-sh/ruff/pull/19876))
+- Add source to testimonial ([#20971](https://github.com/astral-sh/ruff/pull/20971))
+- Document when a rule was added ([#21035](https://github.com/astral-sh/ruff/pull/21035))
 
 ### Other changes
 
-- Build `riscv64` binaries for release ([#19819](https://github.com/astral-sh/ruff/pull/19819))
+- [syntax-errors] Name is parameter and global ([#20426](https://github.com/astral-sh/ruff/pull/20426))
+- [syntax-errors] Alternative `match` patterns bind different names ([#20682](https://github.com/astral-sh/ruff/pull/20682))
 
-- Add rule code to error description in GitLab output ([#19896](https://github.com/astral-sh/ruff/pull/19896))
+### Contributors
 
-- Improve rendering of the `full` output format ([#19415](https://github.com/astral-sh/ruff/pull/19415))
+- [@hengky-kurniawan-1](https://github.com/hengky-kurniawan-1)
+- [@ShalokShalom](https://github.com/ShalokShalom)
+- [@robsdedude](https://github.com/robsdedude)
+- [@LoicRiegel](https://github.com/LoicRiegel)
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@dylwil3](https://github.com/dylwil3)
+- [@11happy](https://github.com/11happy)
+- [@ntBre](https://github.com/ntBre)
 
-    Below is an example diff for [`F401`](https://docs.astral.sh/ruff/rules/unused-import/):
+## 0.14.1
 
-    ```diff
-    -unused.py:8:19: F401 [*] `pathlib` imported but unused
-    +F401 [*] `pathlib` imported but unused
-    +  --> unused.py:8:19
-        |
-      7 | # Unused, _not_ marked as required (due to the alias).
-      8 | import pathlib as non_alias
-    -   |                   ^^^^^^^^^ F401
-    +   |                   ^^^^^^^^^
-      9 |
-     10 | # Unused, marked as required.
-        |
-    -   = help: Remove unused import: `pathlib`
-    +help: Remove unused import: `pathlib`
-    ```
-
-    For now, the primary difference is the movement of the filename, line number, and column information to a second line in the header. This new representation will allow us to make further additions to Ruff's diagnostics, such as adding sub-diagnostics and multiple annotations to the same snippet.
-
-## 0.12.8
+Released on 2025-10-16.
 
 ### Preview features
 
-- \[`flake8-use-pathlib`\] Expand `PTH201` to check all `PurePath` subclasses ([#19440](https://github.com/astral-sh/ruff/pull/19440))
+- [formatter] Remove parentheses around multiple exception types on Python 3.14+ ([#20768](https://github.com/astral-sh/ruff/pull/20768))
+- \[`flake8-bugbear`\] Omit annotation in preview fix for `B006` ([#20877](https://github.com/astral-sh/ruff/pull/20877))
+- \[`flake8-logging-format`\] Avoid dropping implicitly concatenated pieces in the `G004` fix ([#20793](https://github.com/astral-sh/ruff/pull/20793))
+- \[`pydoclint`\] Implement `docstring-extraneous-parameter` (`DOC102`) ([#20376](https://github.com/astral-sh/ruff/pull/20376))
+- \[`pyupgrade`\] Extend `UP019` to detect `typing_extensions.Text` (`UP019`) ([#20825](https://github.com/astral-sh/ruff/pull/20825))
+- \[`pyupgrade`\] Fix false negative for `TypeVar` with default argument in `non-pep695-generic-class` (`UP046`) ([#20660](https://github.com/astral-sh/ruff/pull/20660))
 
 ### Bug fixes
 
-- \[`flake8-blind-except`\] Change `BLE001` to correctly parse exception tuples ([#19747](https://github.com/astral-sh/ruff/pull/19747))
-- \[`flake8-errmsg`\] Exclude `typing.cast` from `EM101` ([#19656](https://github.com/astral-sh/ruff/pull/19656))
-- \[`flake8-simplify`\] Fix raw string handling in `SIM905` for embedded quotes ([#19591](https://github.com/astral-sh/ruff/pull/19591))
-- \[`flake8-import-conventions`\] Avoid false positives for NFKC-normalized `__debug__` import aliases in `ICN001` ([#19411](https://github.com/astral-sh/ruff/pull/19411))
-- \[`isort`\] Fix syntax error after docstring ending with backslash (`I002`) ([#19505](https://github.com/astral-sh/ruff/pull/19505))
-- \[`pylint`\] Mark `PLC0207` fixes as unsafe when `*args` unpacking is present ([#19679](https://github.com/astral-sh/ruff/pull/19679))
-- \[`pyupgrade`\] Prevent infinite loop with `I002` (`UP010`, `UP035`) ([#19413](https://github.com/astral-sh/ruff/pull/19413))
-- \[`ruff`\] Parenthesize generator expressions in f-strings (`RUF010`) ([#19434](https://github.com/astral-sh/ruff/pull/19434))
+- Fix false negatives in `Truthiness::from_expr` for lambdas, generators, and f-strings ([#20704](https://github.com/astral-sh/ruff/pull/20704))
+- Fix syntax error false positives for escapes and quotes in f-strings ([#20867](https://github.com/astral-sh/ruff/pull/20867))
+- Fix syntax error false positives on parenthesized context managers ([#20846](https://github.com/astral-sh/ruff/pull/20846))
+- \[`fastapi`\] Fix false positives for path parameters that FastAPI doesn't recognize (`FAST003`) ([#20687](https://github.com/astral-sh/ruff/pull/20687))
+- \[`flake8-pyi`\] Fix operator precedence by adding parentheses when needed (`PYI061`) ([#20508](https://github.com/astral-sh/ruff/pull/20508))
+- \[`ruff`\] Suppress diagnostic for f-string interpolations with debug text (`RUF010`) ([#20525](https://github.com/astral-sh/ruff/pull/20525))
 
 ### Rule changes
 
-- \[`eradicate`\] Don't flag `pyrefly` pragmas as unused code (`ERA001`) ([#19731](https://github.com/astral-sh/ruff/pull/19731))
+- \[`airflow`\] Add warning to `airflow.datasets.DatasetEvent` usage (`AIR301`) ([#20551](https://github.com/astral-sh/ruff/pull/20551))
+- \[`flake8-bugbear`\] Mark `B905` and `B912` fixes as unsafe ([#20695](https://github.com/astral-sh/ruff/pull/20695))
+- Use `DiagnosticTag` for more rules - changes display in editors ([#20758](https://github.com/astral-sh/ruff/pull/20758),[#20734](https://github.com/astral-sh/ruff/pull/20734))
 
 ### Documentation
 
-- Replace "associative" with "commutative" in docs for `RUF036` ([#19706](https://github.com/astral-sh/ruff/pull/19706))
-- Fix copy and line separator colors in dark mode ([#19630](https://github.com/astral-sh/ruff/pull/19630))
-- Fix link to `typing` documentation ([#19648](https://github.com/astral-sh/ruff/pull/19648))
-- \[`refurb`\] Make more examples error out-of-the-box ([#19695](https://github.com/astral-sh/ruff/pull/19695),[#19673](https://github.com/astral-sh/ruff/pull/19673),[#19672](https://github.com/astral-sh/ruff/pull/19672))
+- Update Python compatibility from 3.13 to 3.14 in README.md ([#20852](https://github.com/astral-sh/ruff/pull/20852))
+- Update `lint.flake8-type-checking.quoted-annotations` docs ([#20765](https://github.com/astral-sh/ruff/pull/20765))
+- Update setup instructions for Zed 0.208.0+ ([#20902](https://github.com/astral-sh/ruff/pull/20902))
+- \[`flake8-datetimez`\] Clarify docs for several rules ([#20778](https://github.com/astral-sh/ruff/pull/20778))
+- Fix typo in `RUF015` description ([#20873](https://github.com/astral-sh/ruff/pull/20873))
 
 ### Other changes
 
-- Include column numbers in GitLab output format ([#19708](https://github.com/astral-sh/ruff/pull/19708))
-- Always expand tabs to four spaces in diagnostics ([#19618](https://github.com/astral-sh/ruff/pull/19618))
-- Update pre-commit's `ruff` id ([#19654](https://github.com/astral-sh/ruff/pull/19654))
+- Reduce binary size ([#20863](https://github.com/astral-sh/ruff/pull/20863))
+- Improved error recovery for unclosed strings (including f- and t-strings) ([#20848](https://github.com/astral-sh/ruff/pull/20848))
 
-## 0.12.7
+### Contributors
 
-This is a follow-up release to 0.12.6. Because of an issue in the package metadata, 0.12.6 failed to publish fully to PyPI and has been yanked. Similarly, there is no GitHub release or Git tag for 0.12.6. The contents of the 0.12.7 release are identical to 0.12.6, except for the updated metadata.
+- [@ntBre](https://github.com/ntBre)
+- [@Paillat-dev](https://github.com/Paillat-dev)
+- [@terror](https://github.com/terror)
+- [@pieterh-oai](https://github.com/pieterh-oai)
+- [@MichaReiser](https://github.com/MichaReiser)
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@ageorgou](https://github.com/ageorgou)
+- [@danparizher](https://github.com/danparizher)
+- [@mgaitan](https://github.com/mgaitan)
+- [@augustelalande](https://github.com/augustelalande)
+- [@dylwil3](https://github.com/dylwil3)
+- [@Lee-W](https://github.com/Lee-W)
+- [@injust](https://github.com/injust)
+- [@CarrotManMatt](https://github.com/CarrotManMatt)
 
-## 0.12.6
+## 0.14.0
 
-### Preview features
-
-- \[`flake8-commas`\] Add support for trailing comma checks in type parameter lists (`COM812`, `COM819`) ([#19390](https://github.com/astral-sh/ruff/pull/19390))
-- \[`pylint`\] Implement auto-fix for `missing-maxsplit-arg` (`PLC0207`) ([#19387](https://github.com/astral-sh/ruff/pull/19387))
-- \[`ruff`\] Offer fixes for `RUF039` in more cases ([#19065](https://github.com/astral-sh/ruff/pull/19065))
-
-### Bug fixes
-
-- Support `.pyi` files in ruff analyze graph ([#19611](https://github.com/astral-sh/ruff/pull/19611))
-- \[`flake8-pyi`\] Preserve inline comment in ellipsis removal (`PYI013`) ([#19399](https://github.com/astral-sh/ruff/pull/19399))
-- \[`perflint`\] Ignore rule if target is `global` or `nonlocal` (`PERF401`) ([#19539](https://github.com/astral-sh/ruff/pull/19539))
-- \[`pyupgrade`\] Fix `UP030` to avoid modifying double curly braces in format strings ([#19378](https://github.com/astral-sh/ruff/pull/19378))
-- \[`refurb`\] Ignore decorated functions for `FURB118` ([#19339](https://github.com/astral-sh/ruff/pull/19339))
-- \[`refurb`\] Mark `int` and `bool` cases for `Decimal.from_float` as safe fixes (`FURB164`) ([#19468](https://github.com/astral-sh/ruff/pull/19468))
-- \[`ruff`\] Fix `RUF033` for named default expressions ([#19115](https://github.com/astral-sh/ruff/pull/19115))
-
-### Rule changes
-
-- \[`flake8-blind-except`\] Change `BLE001` to permit `logging.critical(..., exc_info=True)` ([#19520](https://github.com/astral-sh/ruff/pull/19520))
-
-### Performance
-
-- Add support for specifying minimum dots in detected string imports ([#19538](https://github.com/astral-sh/ruff/pull/19538))
-
-## 0.12.5
-
-### Preview features
-
-- \[`flake8-use-pathlib`\] Add autofix for `PTH101`, `PTH104`, `PTH105`, `PTH121` ([#19404](https://github.com/astral-sh/ruff/pull/19404))
-- \[`ruff`\] Support byte strings (`RUF055`) ([#18926](https://github.com/astral-sh/ruff/pull/18926))
-
-### Bug fixes
-
-- Fix `unreachable` panic in parser ([#19183](https://github.com/astral-sh/ruff/pull/19183))
-- \[`flake8-pyi`\] Skip fix if all `Union` members are `None` (`PYI016`) ([#19416](https://github.com/astral-sh/ruff/pull/19416))
-- \[`perflint`\] Parenthesize generator expressions (`PERF401`) ([#19325](https://github.com/astral-sh/ruff/pull/19325))
-- \[`pylint`\] Handle empty comments after line continuation (`PLR2044`) ([#19405](https://github.com/astral-sh/ruff/pull/19405))
-
-### Rule changes
-
-- \[`pep8-naming`\] Fix `N802` false positives for `CGIHTTPRequestHandler` and `SimpleHTTPRequestHandler` ([#19432](https://github.com/astral-sh/ruff/pull/19432))
-
-## 0.12.4
-
-### Preview features
-
-- \[`flake8-type-checking`, `pyupgrade`, `ruff`\] Add `from __future__ import annotations` when it would allow new fixes (`TC001`, `TC002`, `TC003`, `UP037`, `RUF013`) ([#19100](https://github.com/astral-sh/ruff/pull/19100))
-- \[`flake8-use-pathlib`\] Add autofix for `PTH109` ([#19245](https://github.com/astral-sh/ruff/pull/19245))
-- \[`pylint`\] Detect indirect `pathlib.Path` usages for `unspecified-encoding` (`PLW1514`) ([#19304](https://github.com/astral-sh/ruff/pull/19304))
-
-### Bug fixes
-
-- \[`flake8-bugbear`\] Fix `B017` false negatives for keyword exception arguments ([#19217](https://github.com/astral-sh/ruff/pull/19217))
-- \[`flake8-use-pathlib`\] Fix false negative on direct `Path()` instantiation (`PTH210`) ([#19388](https://github.com/astral-sh/ruff/pull/19388))
-- \[`flake8-django`\] Fix `DJ008` false positive for abstract models with type-annotated `abstract` field ([#19221](https://github.com/astral-sh/ruff/pull/19221))
-- \[`isort`\] Fix `I002` import insertion after docstring with multiple string statements ([#19222](https://github.com/astral-sh/ruff/pull/19222))
-- \[`isort`\] Treat form feed as valid whitespace before a semicolon ([#19343](https://github.com/astral-sh/ruff/pull/19343))
-- \[`pydoclint`\] Fix `SyntaxError` from fixes with line continuations (`D201`, `D202`) ([#19246](https://github.com/astral-sh/ruff/pull/19246))
-- \[`refurb`\] `FURB164` fix should validate arguments and should usually be marked unsafe ([#19136](https://github.com/astral-sh/ruff/pull/19136))
-
-### Rule changes
-
-- \[`flake8-use-pathlib`\] Skip single dots for `invalid-pathlib-with-suffix` (`PTH210`) on versions >= 3.14 ([#19331](https://github.com/astral-sh/ruff/pull/19331))
-- \[`pep8_naming`\] Avoid false positives on standard library functions with uppercase names (`N802`) ([#18907](https://github.com/astral-sh/ruff/pull/18907))
-- \[`pycodestyle`\] Handle brace escapes for t-strings in logical lines ([#19358](https://github.com/astral-sh/ruff/pull/19358))
-- \[`pylint`\] Extend invalid string character rules to include t-strings ([#19355](https://github.com/astral-sh/ruff/pull/19355))
-- \[`ruff`\] Allow `strict` kwarg when checking for `starmap-zip` (`RUF058`) in Python 3.14+ ([#19333](https://github.com/astral-sh/ruff/pull/19333))
-
-### Documentation
-
-- \[`flake8-type-checking`\] Make `TC010` docs example more realistic ([#19356](https://github.com/astral-sh/ruff/pull/19356))
-- Make more documentation examples error out-of-the-box ([#19288](https://github.com/astral-sh/ruff/pull/19288),[#19272](https://github.com/astral-sh/ruff/pull/19272),[#19291](https://github.com/astral-sh/ruff/pull/19291),[#19296](https://github.com/astral-sh/ruff/pull/19296),[#19292](https://github.com/astral-sh/ruff/pull/19292),[#19295](https://github.com/astral-sh/ruff/pull/19295),[#19297](https://github.com/astral-sh/ruff/pull/19297),[#19309](https://github.com/astral-sh/ruff/pull/19309))
-
-## 0.12.3
-
-### Preview features
-
-- \[`flake8-bugbear`\] Support non-context-manager calls in `B017` ([#19063](https://github.com/astral-sh/ruff/pull/19063))
-- \[`flake8-use-pathlib`\] Add autofixes for `PTH100`, `PTH106`, `PTH107`, `PTH108`, `PTH110`, `PTH111`, `PTH112`, `PTH113`, `PTH114`, `PTH115`, `PTH117`, `PTH119`, `PTH120` ([#19213](https://github.com/astral-sh/ruff/pull/19213))
-- \[`flake8-use-pathlib`\] Add autofixes for `PTH203`, `PTH204`, `PTH205` ([#18922](https://github.com/astral-sh/ruff/pull/18922))
-
-### Bug fixes
-
-- \[`flake8-return`\] Fix false-positive for variables used inside nested functions in `RET504` ([#18433](https://github.com/astral-sh/ruff/pull/18433))
-- Treat form feed as valid whitespace before a line continuation ([#19220](https://github.com/astral-sh/ruff/pull/19220))
-- \[`flake8-type-checking`\] Fix syntax error introduced by fix (`TC008`) ([#19150](https://github.com/astral-sh/ruff/pull/19150))
-- \[`pyupgrade`\] Keyword arguments in `super` should suppress the `UP008` fix ([#19131](https://github.com/astral-sh/ruff/pull/19131))
-
-### Documentation
-
-- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI007`, `PYI008`) ([#19103](https://github.com/astral-sh/ruff/pull/19103))
-- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM116`) ([#19111](https://github.com/astral-sh/ruff/pull/19111))
-- \[`flake8-type-checking`\] Make example error out-of-the-box (`TC001`) ([#19151](https://github.com/astral-sh/ruff/pull/19151))
-- \[`flake8-use-pathlib`\] Make example error out-of-the-box (`PTH210`) ([#19189](https://github.com/astral-sh/ruff/pull/19189))
-- \[`pycodestyle`\] Make example error out-of-the-box (`E272`) ([#19191](https://github.com/astral-sh/ruff/pull/19191))
-- \[`pycodestyle`\] Make example not raise unnecessary `SyntaxError` (`E114`) ([#19190](https://github.com/astral-sh/ruff/pull/19190))
-- \[`pydoclint`\] Make example error out-of-the-box (`DOC501`) ([#19218](https://github.com/astral-sh/ruff/pull/19218))
-- \[`pylint`, `pyupgrade`\] Fix syntax errors in examples (`PLW1501`, `UP028`) ([#19127](https://github.com/astral-sh/ruff/pull/19127))
-- \[`pylint`\] Update `missing-maxsplit-arg` docs and error to suggest proper usage (`PLC0207`) ([#18949](https://github.com/astral-sh/ruff/pull/18949))
-- \[`flake8-bandit`\] Make example error out-of-the-box (`S412`) ([#19241](https://github.com/astral-sh/ruff/pull/19241))
-
-## 0.12.2
-
-### Preview features
-
-- \[`flake8-pyi`\] Expand `Optional[A]` to `A | None` (`PYI016`) ([#18572](https://github.com/astral-sh/ruff/pull/18572))
-- \[`pyupgrade`\] Mark `UP008` fix safe if no comments are in range ([#18683](https://github.com/astral-sh/ruff/pull/18683))
-
-### Bug fixes
-
-- \[`flake8-comprehensions`\] Fix `C420` to prepend whitespace when needed ([#18616](https://github.com/astral-sh/ruff/pull/18616))
-- \[`perflint`\] Fix `PERF403` panic on attribute or subscription loop variable ([#19042](https://github.com/astral-sh/ruff/pull/19042))
-- \[`pydocstyle`\] Fix `D413` infinite loop for parenthesized docstring ([#18930](https://github.com/astral-sh/ruff/pull/18930))
-- \[`pylint`\] Fix `PLW0108` autofix introducing a syntax error when the lambda's body contains an assignment expression ([#18678](https://github.com/astral-sh/ruff/pull/18678))
-- \[`refurb`\] Fix false positive on empty tuples (`FURB168`) ([#19058](https://github.com/astral-sh/ruff/pull/19058))
-- \[`ruff`\] Allow more `field` calls from `attrs` (`RUF009`) ([#19021](https://github.com/astral-sh/ruff/pull/19021))
-- \[`ruff`\] Fix syntax error introduced for an empty string followed by a u-prefixed string (`UP025`) ([#18899](https://github.com/astral-sh/ruff/pull/18899))
-
-### Rule changes
-
-- \[`flake8-executable`\] Allow `uvx` in shebang line (`EXE003`) ([#18967](https://github.com/astral-sh/ruff/pull/18967))
-- \[`pandas`\] Avoid flagging `PD002` if `pandas` is not imported ([#18963](https://github.com/astral-sh/ruff/pull/18963))
-- \[`pyupgrade`\] Avoid PEP-604 unions with `typing.NamedTuple` (`UP007`, `UP045`) ([#18682](https://github.com/astral-sh/ruff/pull/18682))
-
-### Documentation
-
-- Document link between `import-outside-top-level (PLC0415)` and `lint.flake8-tidy-imports.banned-module-level-imports` ([#18733](https://github.com/astral-sh/ruff/pull/18733))
-- Fix description of the `format.skip-magic-trailing-comma` example ([#19095](https://github.com/astral-sh/ruff/pull/19095))
-- \[`airflow`\] Make `AIR302` example error out-of-the-box ([#18988](https://github.com/astral-sh/ruff/pull/18988))
-- \[`airflow`\] Make `AIR312` example error out-of-the-box ([#18989](https://github.com/astral-sh/ruff/pull/18989))
-- \[`flake8-annotations`\] Make `ANN401` example error out-of-the-box ([#18974](https://github.com/astral-sh/ruff/pull/18974))
-- \[`flake8-async`\] Make `ASYNC100` example error out-of-the-box ([#18993](https://github.com/astral-sh/ruff/pull/18993))
-- \[`flake8-async`\] Make `ASYNC105` example error out-of-the-box ([#19002](https://github.com/astral-sh/ruff/pull/19002))
-- \[`flake8-async`\] Make `ASYNC110` example error out-of-the-box ([#18975](https://github.com/astral-sh/ruff/pull/18975))
-- \[`flake8-async`\] Make `ASYNC210` example error out-of-the-box ([#18977](https://github.com/astral-sh/ruff/pull/18977))
-- \[`flake8-async`\] Make `ASYNC220`, `ASYNC221`, and `ASYNC222` examples error out-of-the-box ([#18978](https://github.com/astral-sh/ruff/pull/18978))
-- \[`flake8-async`\] Make `ASYNC251` example error out-of-the-box ([#18990](https://github.com/astral-sh/ruff/pull/18990))
-- \[`flake8-bandit`\] Make `S201` example error out-of-the-box ([#19017](https://github.com/astral-sh/ruff/pull/19017))
-- \[`flake8-bandit`\] Make `S604` and `S609` examples error out-of-the-box ([#19049](https://github.com/astral-sh/ruff/pull/19049))
-- \[`flake8-bugbear`\] Make `B028` example error out-of-the-box ([#19054](https://github.com/astral-sh/ruff/pull/19054))
-- \[`flake8-bugbear`\] Make `B911` example error out-of-the-box ([#19051](https://github.com/astral-sh/ruff/pull/19051))
-- \[`flake8-datetimez`\] Make `DTZ011` example error out-of-the-box ([#19055](https://github.com/astral-sh/ruff/pull/19055))
-- \[`flake8-datetimez`\] Make `DTZ901` example error out-of-the-box ([#19056](https://github.com/astral-sh/ruff/pull/19056))
-- \[`flake8-pyi`\] Make `PYI032` example error out-of-the-box ([#19061](https://github.com/astral-sh/ruff/pull/19061))
-- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI014`, `PYI015`) ([#19097](https://github.com/astral-sh/ruff/pull/19097))
-- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI042`) ([#19101](https://github.com/astral-sh/ruff/pull/19101))
-- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI059`) ([#19080](https://github.com/astral-sh/ruff/pull/19080))
-- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI062`) ([#19079](https://github.com/astral-sh/ruff/pull/19079))
-- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT023`) ([#19104](https://github.com/astral-sh/ruff/pull/19104))
-- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT030`) ([#19105](https://github.com/astral-sh/ruff/pull/19105))
-- \[`flake8-quotes`\] Make example error out-of-the-box (`Q003`) ([#19106](https://github.com/astral-sh/ruff/pull/19106))
-- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM110`) ([#19113](https://github.com/astral-sh/ruff/pull/19113))
-- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM113`) ([#19109](https://github.com/astral-sh/ruff/pull/19109))
-- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM401`) ([#19110](https://github.com/astral-sh/ruff/pull/19110))
-- \[`pyflakes`\] Fix backslash in docs (`F621`) ([#19098](https://github.com/astral-sh/ruff/pull/19098))
-- \[`pylint`\] Fix `PLC0415` example ([#18970](https://github.com/astral-sh/ruff/pull/18970))
-
-## 0.12.1
-
-### Preview features
-
-- \[`flake8-errmsg`\] Extend `EM101` to support byte strings ([#18867](https://github.com/astral-sh/ruff/pull/18867))
-- \[`flake8-use-pathlib`\] Add autofix for `PTH202` ([#18763](https://github.com/astral-sh/ruff/pull/18763))
-- \[`pygrep-hooks`\] Add `AsyncMock` methods to `invalid-mock-access` (`PGH005`) ([#18547](https://github.com/astral-sh/ruff/pull/18547))
-- \[`pylint`\] Ignore `__init__.py` files in (`PLC0414`) ([#18400](https://github.com/astral-sh/ruff/pull/18400))
-- \[`ruff`\] Trigger `RUF037` for empty string and byte strings ([#18862](https://github.com/astral-sh/ruff/pull/18862))
-- [formatter] Fix missing blank lines before decorated classes in `.pyi` files ([#18888](https://github.com/astral-sh/ruff/pull/18888))
-
-### Bug fixes
-
-- Avoid generating diagnostics with per-file ignores ([#18801](https://github.com/astral-sh/ruff/pull/18801))
-- Handle parenthesized arguments in `remove_argument` ([#18805](https://github.com/astral-sh/ruff/pull/18805))
-- \[`flake8-logging`\] Avoid false positive for `exc_info=True` outside `logger.exception` (`LOG014`) ([#18737](https://github.com/astral-sh/ruff/pull/18737))
-- \[`flake8-pytest-style`\] Enforce `pytest` import for decorators ([#18779](https://github.com/astral-sh/ruff/pull/18779))
-- \[`flake8-pytest-style`\] Mark autofix for `PT001` and `PT023` as unsafe if there's comments in the decorator ([#18792](https://github.com/astral-sh/ruff/pull/18792))
-- \[`flake8-pytest-style`\] `PT001`/`PT023` fix makes syntax error on parenthesized decorator ([#18782](https://github.com/astral-sh/ruff/pull/18782))
-- \[`flake8-raise`\] Make fix unsafe if it deletes comments (`RSE102`) ([#18788](https://github.com/astral-sh/ruff/pull/18788))
-- \[`flake8-simplify`\] Fix `SIM911` autofix creating a syntax error ([#18793](https://github.com/astral-sh/ruff/pull/18793))
-- \[`flake8-simplify`\] Fix false negatives for shadowed bindings (`SIM910`, `SIM911`) ([#18794](https://github.com/astral-sh/ruff/pull/18794))
-- \[`flake8-simplify`\] Preserve original behavior for `except ()` and bare `except` (`SIM105`) ([#18213](https://github.com/astral-sh/ruff/pull/18213))
-- \[`flake8-pyi`\] Fix `PYI041`'s fix causing `TypeError` with `None | None | ...` ([#18637](https://github.com/astral-sh/ruff/pull/18637))
-- \[`perflint`\] Fix `PERF101` autofix creating a syntax error and mark autofix as unsafe if there are comments in the `list` call expr ([#18803](https://github.com/astral-sh/ruff/pull/18803))
-- \[`perflint`\] Fix false negative in `PERF401` ([#18866](https://github.com/astral-sh/ruff/pull/18866))
-- \[`pylint`\] Avoid flattening nested `min`/`max` when outer call has single argument (`PLW3301`) ([#16885](https://github.com/astral-sh/ruff/pull/16885))
-- \[`pylint`\] Fix `PLC2801` autofix creating a syntax error ([#18857](https://github.com/astral-sh/ruff/pull/18857))
-- \[`pylint`\] Mark `PLE0241` autofix as unsafe if there's comments in the base classes ([#18832](https://github.com/astral-sh/ruff/pull/18832))
-- \[`pylint`\] Suppress `PLE2510`/`PLE2512`/`PLE2513`/`PLE2514`/`PLE2515` autofix if the text contains an odd number of backslashes ([#18856](https://github.com/astral-sh/ruff/pull/18856))
-- \[`refurb`\] Detect more exotic float literals in `FURB164` ([#18925](https://github.com/astral-sh/ruff/pull/18925))
-- \[`refurb`\] Fix `FURB163` autofix creating a syntax error for `yield` expressions ([#18756](https://github.com/astral-sh/ruff/pull/18756))
-- \[`refurb`\] Mark `FURB129` autofix as unsafe if there's comments in the `readlines` call ([#18858](https://github.com/astral-sh/ruff/pull/18858))
-- \[`ruff`\] Fix false positives and negatives in `RUF010` ([#18690](https://github.com/astral-sh/ruff/pull/18690))
-- Fix casing of `analyze.direction` variant names ([#18892](https://github.com/astral-sh/ruff/pull/18892))
-
-### Rule changes
-
-- Fix f-string interpolation escaping in generated fixes ([#18882](https://github.com/astral-sh/ruff/pull/18882))
-- \[`flake8-return`\] Mark `RET501` fix unsafe if comments are inside ([#18780](https://github.com/astral-sh/ruff/pull/18780))
-- \[`flake8-async`\] Fix detection for large integer sleep durations in `ASYNC116` rule ([#18767](https://github.com/astral-sh/ruff/pull/18767))
-- \[`flake8-async`\] Mark autofix for `ASYNC115` as unsafe if the call expression contains comments ([#18753](https://github.com/astral-sh/ruff/pull/18753))
-- \[`flake8-bugbear`\] Mark autofix for `B004` as unsafe if the `hasattr` call expr contains comments ([#18755](https://github.com/astral-sh/ruff/pull/18755))
-- \[`flake8-comprehension`\] Mark autofix for `C420` as unsafe if there's comments inside the dict comprehension ([#18768](https://github.com/astral-sh/ruff/pull/18768))
-- \[`flake8-comprehensions`\] Handle template strings for comprehension fixes ([#18710](https://github.com/astral-sh/ruff/pull/18710))
-- \[`flake8-future-annotations`\] Add autofix (`FA100`) ([#18903](https://github.com/astral-sh/ruff/pull/18903))
-- \[`pyflakes`\] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect ([#18839](https://github.com/astral-sh/ruff/pull/18839))
-- \[`pylint`\] Allow fix with comments and document performance implications (`PLW3301`) ([#18936](https://github.com/astral-sh/ruff/pull/18936))
-- \[`pylint`\] Detect more exotic `NaN` literals in `PLW0177` ([#18630](https://github.com/astral-sh/ruff/pull/18630))
-- \[`pylint`\] Fix `PLC1802` autofix creating a syntax error and mark autofix as unsafe if there's comments in the `len` call ([#18836](https://github.com/astral-sh/ruff/pull/18836))
-- \[`pyupgrade`\] Extend version detection to include `sys.version_info.major` (`UP036`) ([#18633](https://github.com/astral-sh/ruff/pull/18633))
-- \[`ruff`\] Add lint rule `RUF064` for calling `chmod` with non-octal integers ([#18541](https://github.com/astral-sh/ruff/pull/18541))
-- \[`ruff`\] Added `cls.__dict__.get('__annotations__')` check (`RUF063`) ([#18233](https://github.com/astral-sh/ruff/pull/18233))
-- \[`ruff`\] Frozen `dataclass` default should be valid (`RUF009`) ([#18735](https://github.com/astral-sh/ruff/pull/18735))
-
-### Server
-
-- Consider virtual path for various server actions ([#18910](https://github.com/astral-sh/ruff/pull/18910))
-
-### Documentation
-
-- Add fix safety sections ([#18940](https://github.com/astral-sh/ruff/pull/18940),[#18841](https://github.com/astral-sh/ruff/pull/18841),[#18802](https://github.com/astral-sh/ruff/pull/18802),[#18837](https://github.com/astral-sh/ruff/pull/18837),[#18800](https://github.com/astral-sh/ruff/pull/18800),[#18415](https://github.com/astral-sh/ruff/pull/18415),[#18853](https://github.com/astral-sh/ruff/pull/18853),[#18842](https://github.com/astral-sh/ruff/pull/18842))
-- Use updated pre-commit id ([#18718](https://github.com/astral-sh/ruff/pull/18718))
-- \[`perflint`\] Small docs improvement to `PERF401` ([#18786](https://github.com/astral-sh/ruff/pull/18786))
-- \[`pyupgrade`\]: Use `super()`, not `__super__` in error messages (`UP008`) ([#18743](https://github.com/astral-sh/ruff/pull/18743))
-- \[`flake8-pie`\] Small docs fix to `PIE794` ([#18829](https://github.com/astral-sh/ruff/pull/18829))
-- \[`flake8-pyi`\] Correct `collections-named-tuple` example to use PascalCase assignment ([#16884](https://github.com/astral-sh/ruff/pull/16884))
-- \[`flake8-pie`\] Add note on type checking benefits to `unnecessary-dict-kwargs` (`PIE804`) ([#18666](https://github.com/astral-sh/ruff/pull/18666))
-- \[`pycodestyle`\] Clarify PEP 8 relationship to `whitespace-around-operator` rules ([#18870](https://github.com/astral-sh/ruff/pull/18870))
-
-### Other changes
-
-- Disallow newlines in format specifiers of single quoted f- or t-strings ([#18708](https://github.com/astral-sh/ruff/pull/18708))
-- \[`flake8-logging`\] Add fix safety section to `LOG002` ([#18840](https://github.com/astral-sh/ruff/pull/18840))
-- \[`pyupgrade`\] Add fix safety section to `UP010` ([#18838](https://github.com/astral-sh/ruff/pull/18838))
-
-## 0.12.0
-
-Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
-guide and overview of the changes!
+Released on 2025-10-07.
 
 ### Breaking changes
 
-- **Detection of more syntax errors**
-
-    Ruff now detects version-related syntax errors, such as the use of the `match`
-    statement on Python versions before 3.10, and syntax errors emitted by
-    CPython's compiler, such as irrefutable `match` patterns before the final
-    `case` arm.
-
-- **New default Python version handling for syntax errors**
-
-    Ruff will default to the *latest* supported Python version (3.13) when
-    checking for the version-related syntax errors mentioned above to prevent
-    false positives in projects without a Python version configured. The default
-    in all other cases, like applying lint rules, is unchanged and remains at the
-    minimum supported Python version (3.9).
-
-- **Updated f-string formatting**
-
-    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
-    line break after the format specifier. This addresses a change to the Python
-    grammar in version 3.13.4 that made such a line break a syntax error.
-
-- **`rust-toolchain.toml` is no longer included in source distributions**
-
-    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
-    minimum supported Rust version (MSRV) for development and building release
-    artifacts. However, when present in source distributions, it would also cause
-    downstream package maintainers to pull in the same Rust toolchain, even if
-    their available toolchain was MSRV-compatible.
-
-### Removed Rules
-
-The following rules have been removed:
-
-- [`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
-    (`S320`)
-
-### Deprecated Rules
-
-The following rules have been deprecated:
-
-- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name/)
-
-### Stabilization
-
-The following rules have been stabilized and are no longer in preview:
-
-- [`for-loop-writes`](https://docs.astral.sh/ruff/rules/for-loop-writes) (`FURB122`)
-- [`check-and-remove-from-set`](https://docs.astral.sh/ruff/rules/check-and-remove-from-set) (`FURB132`)
-- [`verbose-decimal-constructor`](https://docs.astral.sh/ruff/rules/verbose-decimal-constructor) (`FURB157`)
-- [`fromisoformat-replace-z`](https://docs.astral.sh/ruff/rules/fromisoformat-replace-z) (`FURB162`)
-- [`int-on-sliced-str`](https://docs.astral.sh/ruff/rules/int-on-sliced-str) (`FURB166`)
-- [`exc-info-outside-except-handler`](https://docs.astral.sh/ruff/rules/exc-info-outside-except-handler) (`LOG014`)
-- [`import-outside-top-level`](https://docs.astral.sh/ruff/rules/import-outside-top-level) (`PLC0415`)
-- [`unnecessary-dict-index-lookup`](https://docs.astral.sh/ruff/rules/unnecessary-dict-index-lookup) (`PLR1733`)
-- [`nan-comparison`](https://docs.astral.sh/ruff/rules/nan-comparison) (`PLW0177`)
-- [`eq-without-hash`](https://docs.astral.sh/ruff/rules/eq-without-hash) (`PLW1641`)
-- [`pytest-parameter-with-default-argument`](https://docs.astral.sh/ruff/rules/pytest-parameter-with-default-argument) (`PT028`)
-- [`pytest-warns-too-broad`](https://docs.astral.sh/ruff/rules/pytest-warns-too-broad) (`PT030`)
-- [`pytest-warns-with-multiple-statements`](https://docs.astral.sh/ruff/rules/pytest-warns-with-multiple-statements) (`PT031`)
-- [`invalid-formatter-suppression-comment`](https://docs.astral.sh/ruff/rules/invalid-formatter-suppression-comment) (`RUF028`)
-- [`dataclass-enum`](https://docs.astral.sh/ruff/rules/dataclass-enum) (`RUF049`)
-- [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
-- [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
-- [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
-- [`non-pep604-annotation-optional`] (`UP045`)
-- [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
-- [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
-- [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)
-
-The following behaviors have been stabilized:
-
-- [`collection-literal-concatenation`] (`RUF005`) now recognizes slices, in
-    addition to list literals and variables.
-- The fix for [`readlines-in-for`] (`FURB129`) is now marked as always safe.
-- [`if-else-block-instead-of-if-exp`] (`SIM108`) will now further simplify
-    expressions to use `or` instead of an `if` expression, where possible.
-- [`unused-noqa`] (`RUF100`) now checks for file-level `noqa` comments as well
-    as inline comments.
-- [`subprocess-without-shell-equals-true`] (`S603`) now accepts literal strings,
-    as well as lists and tuples of literal strings, as trusted input.
-- [`boolean-type-hint-positional-argument`] (`FBT001`) now applies to types that
-    include `bool`, like `bool | int` or `typing.Optional[bool]`, in addition to
-    plain `bool` annotations.
-- [`non-pep604-annotation-union`] (`UP007`) has now been split into two rules.
-    `UP007` now applies only to `typing.Union`, while
-    [`non-pep604-annotation-optional`] (`UP045`) checks for use of
-    `typing.Optional`. `UP045` has also been stabilized in this release, but you
-    may need to update existing `include`, `ignore`, or `noqa` settings to
-    accommodate this change.
+- Update default and latest Python versions for 3.14 ([#20725](https://github.com/astral-sh/ruff/pull/20725))
 
 ### Preview features
 
-- \[`ruff`\] Check for non-context-manager use of `pytest.raises`, `pytest.warns`, and `pytest.deprecated_call` (`RUF061`) ([#17368](https://github.com/astral-sh/ruff/pull/17368))
-- [syntax-errors] Raise unsupported syntax error for template strings prior to Python 3.14 ([#18664](https://github.com/astral-sh/ruff/pull/18664))
+- \[`flake8-bugbear`\] Include certain guaranteed-mutable expressions: tuples, generators, and assignment expressions (`B006`) ([#20024](https://github.com/astral-sh/ruff/pull/20024))
+- \[`refurb`\] Add fixes for `FURB101` and `FURB103` ([#20520](https://github.com/astral-sh/ruff/pull/20520))
+- \[`ruff`\] Extend `FA102` with listed PEP 585-compatible APIs ([#20659](https://github.com/astral-sh/ruff/pull/20659))
 
 ### Bug fixes
 
-- Add syntax error when conversion flag does not immediately follow exclamation mark ([#18706](https://github.com/astral-sh/ruff/pull/18706))
-- Add trailing space around `readlines` ([#18542](https://github.com/astral-sh/ruff/pull/18542))
-- Fix `\r` and `\r\n` handling in t- and f-string debug texts ([#18673](https://github.com/astral-sh/ruff/pull/18673))
-- Hug closing `}` when f-string expression has a format specifier ([#18704](https://github.com/astral-sh/ruff/pull/18704))
-- \[`flake8-pyi`\] Avoid syntax error in the case of starred and keyword arguments (`PYI059`) ([#18611](https://github.com/astral-sh/ruff/pull/18611))
-- \[`flake8-return`\] Fix `RET504` autofix generating a syntax error ([#18428](https://github.com/astral-sh/ruff/pull/18428))
-- \[`pep8-naming`\] Suppress fix for `N804` and `N805` if the recommended name is already used ([#18472](https://github.com/astral-sh/ruff/pull/18472))
-- \[`pycodestyle`\] Avoid causing a syntax error in expressions spanning multiple lines (`E731`) ([#18479](https://github.com/astral-sh/ruff/pull/18479))
-- \[`pyupgrade`\] Suppress `UP008` if `super` is shadowed ([#18688](https://github.com/astral-sh/ruff/pull/18688))
-- \[`refurb`\] Parenthesize lambda and ternary expressions (`FURB122`, `FURB142`) ([#18592](https://github.com/astral-sh/ruff/pull/18592))
-- \[`ruff`\] Handle extra arguments to `deque` (`RUF037`) ([#18614](https://github.com/astral-sh/ruff/pull/18614))
-- \[`ruff`\] Preserve parentheses around `deque` in fix for `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#18598](https://github.com/astral-sh/ruff/pull/18598))
-- \[`ruff`\] Validate arguments before offering a fix (`RUF056`) ([#18631](https://github.com/astral-sh/ruff/pull/18631))
-- \[`ruff`\] Skip fix for `RUF059` if dummy name is already bound ([#18509](https://github.com/astral-sh/ruff/pull/18509))
-- \[`pylint`\] Fix `PLW0128` to check assignment targets in square brackets and after asterisks ([#18665](https://github.com/astral-sh/ruff/pull/18665))
-
-### Rule changes
-
-- Fix false positive on mutations in `return` statements (`B909`) ([#18408](https://github.com/astral-sh/ruff/pull/18408))
-- Treat `ty:` comments as pragma comments ([#18532](https://github.com/astral-sh/ruff/pull/18532))
-- \[`flake8-pyi`\] Apply `custom-typevar-for-self` to string annotations (`PYI019`) ([#18311](https://github.com/astral-sh/ruff/pull/18311))
-- \[`pyupgrade`\] Don't offer a fix for `Optional[None]` (`UP007`, `UP045)` ([#18545](https://github.com/astral-sh/ruff/pull/18545))
-- \[`pyupgrade`\] Fix `super(__class__, self)` detection (`UP008`) ([#18478](https://github.com/astral-sh/ruff/pull/18478))
-- \[`refurb`\] Make the fix for `FURB163` unsafe for `log2`, `log10`, `*args`, and deleted comments ([#18645](https://github.com/astral-sh/ruff/pull/18645))
-
-### Server
-
-- Support cancellation requests ([#18627](https://github.com/astral-sh/ruff/pull/18627))
+- \[`flake8-annotations`\] Fix return type annotations to handle shadowed builtin symbols (`ANN201`, `ANN202`, `ANN204`, `ANN205`, `ANN206`) ([#20612](https://github.com/astral-sh/ruff/pull/20612))
+- \[`flynt`\] Fix f-string quoting for mixed quote joiners (`FLY002`) ([#20662](https://github.com/astral-sh/ruff/pull/20662))
+- \[`isort`\] Fix inserting required imports before future imports (`I002`) ([#20676](https://github.com/astral-sh/ruff/pull/20676))
+- \[`ruff`\] Handle argfile expansion errors gracefully ([#20691](https://github.com/astral-sh/ruff/pull/20691))
+- \[`ruff`\] Skip `RUF051` if `else`/`elif` block is present ([#20705](https://github.com/astral-sh/ruff/pull/20705))
+- \[`ruff`\] Improve handling of intermixed comments inside from-imports ([#20561](https://github.com/astral-sh/ruff/pull/20561))
 
 ### Documentation
 
-- Drop confusing second `*` from glob pattern example for `per-file-target-version` ([#18709](https://github.com/astral-sh/ruff/pull/18709))
-- Update Neovim configuration examples ([#18491](https://github.com/astral-sh/ruff/pull/18491))
-- \[`pylint`\] De-emphasize `__hash__ = Parent.__hash__` (`PLW1641`) ([#18613](https://github.com/astral-sh/ruff/pull/18613))
-- \[`refurb`\] Add a note about float literal handling (`FURB157`) ([#18615](https://github.com/astral-sh/ruff/pull/18615))
+- \[`flake8-comprehensions`\] Clarify fix safety documentation (`C413`) ([#20640](https://github.com/astral-sh/ruff/pull/20640))
+
+### Contributors
+
+- [@danparizher](https://github.com/danparizher)
+- [@terror](https://github.com/terror)
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@ntBre](https://github.com/ntBre)
+- [@njhearp](https://github.com/njhearp)
+- [@amyreese](https://github.com/amyreese)
+- [@IDrokin117](https://github.com/IDrokin117)
+- [@chirizxc](https://github.com/chirizxc)
+
+## 0.13.x
+
+See [changelogs/0.13.x](./changelogs/0.13.x.md)
+
+## 0.12.x
+
+See [changelogs/0.12.x](./changelogs/0.12.x.md)
 
 ## 0.11.x
 
@@ -505,12 +195,3 @@ See [changelogs/0.2.x](./changelogs/0.2.x.md)
 ## 0.1.x
 
 See [changelogs/0.1.x](./changelogs/0.1.x.md)
-
-[`boolean-type-hint-positional-argument`]: https://docs.astral.sh/ruff/rules/boolean-type-hint-positional-argument
-[`collection-literal-concatenation`]: https://docs.astral.sh/ruff/rules/collection-literal-concatenation
-[`if-else-block-instead-of-if-exp`]: https://docs.astral.sh/ruff/rules/if-else-block-instead-of-if-exp
-[`non-pep604-annotation-optional`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional
-[`non-pep604-annotation-union`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-union
-[`readlines-in-for`]: https://docs.astral.sh/ruff/rules/readlines-in-for
-[`subprocess-without-shell-equals-true`]: https://docs.astral.sh/ruff/rules/subprocess-without-shell-equals-true
-[`unused-noqa`]: https://docs.astral.sh/ruff/rules/unused-noqa
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 63bb0ecb66..6c9a99aed0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,22 +7,38 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
 > This guide is for Ruff. If you're looking to contribute to ty, please see [the ty contributing
 > guide](https://github.com/astral-sh/ruff/blob/main/crates/ty/CONTRIBUTING.md).
 
+## Finding ways to help
+
+We label issues that would be good for a first time contributor as
+[`good first issue`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
+These usually do not require significant experience with Rust or the Ruff code base.
+
+We label issues that we think are a good opportunity for subsequent contributions as
+[`help wanted`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
+These require varying levels of experience with Rust and Ruff. Often, we want to accomplish these
+tasks but do not have the resources to do so ourselves.
+
+You don't need our permission to start on an issue we have labeled as appropriate for community
+contribution as described above. However, it's a good idea to indicate that you are going to work on
+an issue to avoid concurrent attempts to solve the same problem.
+
+Please check in with us before starting work on an issue that has not been labeled as appropriate
+for community contribution. We're happy to receive contributions for other issues, but it's
+important to make sure we have consensus on the solution to the problem first.
+
+Outside of issues with the labels above, issues labeled as
+[`bug`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22bug%22) are the
+best candidates for contribution. In contrast, issues labeled with `needs-decision` or
+`needs-design` are _not_ good candidates for contribution. Please do not open pull requests for
+issues with these labels.
+
+Please do not open pull requests for new features without prior discussion. While we appreciate
+exploration of new features, we will often close these pull requests immediately. Adding a
+new feature to ruff creates a long-term maintenance burden and requires strong consensus from the ruff
+team before it is appropriate to begin work on an implementation.
+
 ## The Basics
 
-Ruff welcomes contributions in the form of pull requests.
-
-For small changes (e.g., bug fixes), feel free to submit a PR.
-
-For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
-creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
-You can also join us on [Discord](https://discord.com/invite/astral-sh) to discuss your idea with the
-community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
-and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
-that are ready for contributions.
-
-If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
-
 ### Prerequisites
 
 Ruff is written in Rust. You'll need to install the
@@ -305,10 +321,16 @@ them to [PyPI](https://pypi.org/project/ruff/).
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
 
-### Creating a new release
+### Installing tools
 
 1. Install `uv`: `curl -LsSf https://astral.sh/uv/install.sh | sh`
 
+1. Install `npm`: `brew install npm` or similar
+
+### Creating a new release
+
+Commit each step of this process separately for easier review.
+
 1. Run `./scripts/release.sh`; this command will:
 
     - Generate a temporary virtual environment with `rooster`
@@ -321,6 +343,7 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
 
     - Often labels will be missing from pull requests they will need to be manually organized into the proper section
     - Changes should be edited to be user-facing descriptions, avoiding internal details
+    - Square brackets (eg, `[ruff]` project name) will be automatically escaped by `pre-commit`
 
     Additionally, for minor releases:
 
@@ -360,13 +383,13 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
 
 1. Verify the GitHub release:
 
-    1. The Changelog should match the content of `CHANGELOG.md`
-    1. Append the contributors from the `scripts/release.sh` script
+    1. The changelog should match the content of `CHANGELOG.md`
 
 1. If needed, [update the schemastore](https://github.com/astral-sh/ruff/blob/main/scripts/update_schemastore.py).
 
     1. One can determine if an update is needed when
         `git diff old-version-tag new-version-tag -- ruff.schema.json` returns a non-empty diff.
+    1. Run `uv run --only-dev --no-sync scripts/update_schemastore.py --proto <https|ssh>`
     1. Once run successfully, you should follow the link in the output to create a PR.
 
 1. If needed, update the [`ruff-lsp`](https://github.com/astral-sh/ruff-lsp) and
diff --git a/Cargo.lock b/Cargo.lock
index 768c871516..8a6afb3be2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,12 +23,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[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"
@@ -56,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -71,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-lossy"
@@ -104,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-svg"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc03a770ef506fe1396c0e476120ac0e6523cf14b74218dd5f18cd6833326fa9"
+checksum = "26b9ec8c976eada1b0f9747a3d7cc4eae3bef10613e443746e7487f26c872fde"
 dependencies = [
  "anstyle",
  "anstyle-lossy",
@@ -128,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "approx"
@@ -220,15 +214,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bincode"
 version = "2.0.1"
@@ -249,6 +234,26 @@ dependencies = [
  "virtue",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.9.4",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.10.5",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -257,9 +262,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.2"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 
 [[package]]
 name = "bitvec"
@@ -284,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "boxcar"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c4925bc979b677330a8c7fe7a8c94af2dbb4a2d37b4a20a80d884400f46baa"
+checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
 
 [[package]]
 name = "bstr"
@@ -295,7 +300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "serde",
 ]
 
@@ -322,11 +327,11 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.11"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -346,20 +351,30 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.31"
+version = "1.2.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
+checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
 ]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.1"
+name = "cexpr"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "cfg_aliases"
@@ -369,14 +384,13 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-link",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -407,10 +421,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "clap"
-version = "4.5.45"
+name = "clang-sys"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -418,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.44"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
+checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
 dependencies = [
  "anstream",
  "anstyle",
@@ -431,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.55"
+version = "4.5.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
+checksum = "75bf0b32ad2e152de789bb635ea4d3078f6b838ad7974143e99b99f45a04af4a"
 dependencies = [
  "clap",
 ]
@@ -461,9 +486,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.45"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -485,23 +510,24 @@ checksum = "85a8ab73a1c02b0c15597b22e09c7dc36e63b2f601f9d1e83ac0c3decd38b1ae"
 dependencies = [
  "nix 0.29.0",
  "terminfo",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "which",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "codspeed"
-version = "3.0.5"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35584c5fcba8059780748866387fb97c5a203bcfc563fc3d0790af406727a117"
+checksum = "d0f62ea8934802f8b374bf691eea524c3aa444d7014f604dd4182a3667b69510"
 dependencies = [
  "anyhow",
- "bincode 1.3.3",
+ "bindgen",
+ "cc",
  "colored 2.2.0",
  "glob",
  "libc",
- "nix 0.29.0",
+ "nix 0.30.1",
  "serde",
  "serde_json",
  "statrs",
@@ -510,20 +536,22 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "3.0.5"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f6c1c6bed5fd84d319e8b0889da051daa361c79b7709c9394dfe1a882bba67"
+checksum = "d87efbc015fc0ff1b2001cd87df01c442824de677e01a77230bf091534687abb"
 dependencies = [
+ "clap",
  "codspeed",
  "codspeed-criterion-compat-walltime",
  "colored 2.2.0",
+ "regex",
 ]
 
 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "3.0.5"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c989289ce6b1cbde72ed560496cb8fbf5aa14d5ef5666f168e7f87751038352e"
+checksum = "ae5713ace440123bb4f1f78dd068d46872cb8548bfe61f752e7b2ad2c06d7f00"
 dependencies = [
  "anes",
  "cast",
@@ -546,20 +574,22 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat"
-version = "3.0.5"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf64eda57508448d59efd940bad62ede7c50b0d451a150b8d6a0eca642792a6"
+checksum = "95b4214b974f8f5206497153e89db90274e623f06b00bf4b9143eeb7735d975d"
 dependencies = [
+ "clap",
  "codspeed",
  "codspeed-divan-compat-macros",
  "codspeed-divan-compat-walltime",
+ "regex",
 ]
 
 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "3.0.5"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058167258e819b16a4ba601fdfe270349ef191154758dbce122c62a698f70ba8"
+checksum = "a53f34a16cb70ce4fd9ad57e1db016f0718e434f34179ca652006443b9a39967"
 dependencies = [
  "divan-macros",
  "itertools 0.14.0",
@@ -571,9 +601,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "3.0.5"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f9866ee3a4ef9d2868823ea5811886763af244f2df584ca247f49281c43f1f"
+checksum = "e8a5099050c8948dce488b8eaa2e68dc5cf571cb8f9fce99aaaecbdddb940bcd"
 dependencies = [
  "cfg-if",
  "clap",
@@ -603,7 +633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -612,7 +642,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -650,15 +680,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d"
+checksum = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4"
 dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
  "unicode-width 0.2.1",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -825,20 +855,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "ctrlc"
-version = "3.4.7"
+name = "csv"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ctrlc"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881c5d0a13b2f1498e2306e82cbada78390e152d4b1378fb28a84f4dcd0dc4f3"
+dependencies = [
+ "dispatch",
  "nix 0.30.1",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.11"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -846,9 +898,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.11"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
 dependencies = [
  "fnv",
  "ident_case",
@@ -860,9 +912,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.11"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
@@ -955,9 +1007,15 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -1030,12 +1088,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1046,12 +1104,11 @@ checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
 
 [[package]]
 name = "escargot"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83f351750780493fc33fa0ce8ba3c7d61f9736cfa3b3bb9ee2342643ffe40211"
+checksum = "11c3aea32bc97b500c9ca6a72b768a26e558264303d101d3409cf6d57a9ed0cf"
 dependencies = [
  "log",
- "once_cell",
  "serde",
  "serde_json",
 ]
@@ -1084,16 +1141,22 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+
 [[package]]
 name = "flate2"
 version = "1.1.2"
@@ -1118,9 +1181,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -1161,9 +1224,9 @@ dependencies = [
 
 [[package]]
 name = "get-size-derive2"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a17a226478b2e8294ded60782c03efe54476aa8cd1371d0e5ad9d1071e74e0"
+checksum = "e3814abc7da8ab18d2fd820f5b540b5e39b6af0a32de1bdd7c47576693074843"
 dependencies = [
  "attribute-derive",
  "quote",
@@ -1172,21 +1235,21 @@ dependencies = [
 
 [[package]]
 name = "get-size2"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5697765925a05c9d401dd04a93dfd662d336cc25fdcc3301220385a1ffcfdde5"
+checksum = "5dfe2cec5b5ce8fb94dcdb16a1708baa4d0609cc3ce305ca5d3f6f2ffb59baed"
 dependencies = [
  "compact_str",
  "get-size-derive2",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
  "smallvec",
 ]
 
 [[package]]
 name = "getopts"
-version = "0.2.23"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
+checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
 dependencies = [
  "unicode-width 0.2.1",
 ]
@@ -1199,20 +1262,20 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
@@ -1224,15 +1287,15 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "globset"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
+checksum = "eab69130804d941f8075cfd713bf8848a2c3b3f201a9457a11e6f87e1ab62305"
 dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1241,7 +1304,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "ignore",
  "walkdir",
 ]
@@ -1273,6 +1336,15 @@ dependencies = [
  "foldhash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+dependencies = [
+ "equivalent",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.10.0"
@@ -1314,9 +1386,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1430,9 +1502,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1459,7 +1531,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -1486,13 +1558,14 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.5",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1501,7 +1574,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd"
 dependencies = [
- "console 0.16.0",
+ "console 0.16.1",
  "portable-atomic",
  "unicode-width 0.2.1",
  "unit-prefix",
@@ -1521,7 +1594,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "inotify-sys",
  "libc",
 ]
@@ -1537,9 +1610,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.43.1"
+version = "1.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371"
+checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0"
 dependencies = [
  "console 0.15.11",
  "globset",
@@ -1581,9 +1654,9 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.3.20"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83"
+checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e"
 dependencies = [
  "rustversion",
 ]
@@ -1617,7 +1690,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1681,7 +1754,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1712,11 +1785,11 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
@@ -1728,9 +1801,9 @@ checksum = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24"
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1764,15 +1837,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libcst"
-version = "1.8.2"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae28ddc5b90c3e3146a21d051ca095cbc8d932ad8714cf65ddf71a9abb35684c"
+checksum = "9d56bcd52d9b5e5f43e7fba20eb1f423ccb18c84cdf1cb506b8c1b95776b0b49"
 dependencies = [
  "annotate-snippets",
  "libcst_derive",
@@ -1780,24 +1853,34 @@ dependencies = [
  "paste",
  "peg",
  "regex",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "libcst_derive"
-version = "1.8.2"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2de5c2f62bcf8a4f7290b1854388b262c4b68f1db1a3ee3ef6d4c1319b00a3"
+checksum = "3fcf5a725c4db703660124fe0edb98285f1605d0b87b7ee8684b699764a4f01a"
 dependencies = [
  "quote",
  "syn",
 ]
 
 [[package]]
-name = "libmimalloc-sys"
-version = "0.1.43"
+name = "libloading"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf88cd67e9de251c1781dbe2f641a1a3ad66eaae831b8a2c38fbdc5ddae16d4d"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link 0.2.0",
+]
+
+[[package]]
+name = "libmimalloc-sys"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "667f4fec20f29dfc6bc7357c582d91796c169ad7e2fce709468aefeb2c099870"
 dependencies = [
  "cc",
  "libc",
@@ -1805,11 +1888,11 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "libc",
  "redox_syscall",
 ]
@@ -1828,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
@@ -1850,9 +1933,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "lsp-server"
@@ -1913,11 +1996,11 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1934,9 +2017,9 @@ checksum = "2f926ade0c4e170215ae43342bf13b9310a437609c81f29f86c5df6657582ef9"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -1949,9 +2032,9 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.47"
+version = "0.1.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1791cbe101e95af5764f06f20f6760521f7158f69dbf9d6baf941ee1bf6bc40"
+checksum = "e1ee66a4b64c74f4ef288bcbb9192ad9c3feaad75193129ac8509af543894fd8"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -1989,7 +2072,7 @@ checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.59.0",
 ]
 
@@ -2014,7 +2097,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -2026,7 +2109,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -2054,7 +2137,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -2074,12 +2157,11 @@ checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2127,12 +2209,13 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "ordermap"
-version = "0.5.8"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d6bff06e4a5dc6416bead102d3e63c480dd852ffbb278bf8cfeb4966b329609"
+checksum = "b100f7dd605611822d30e182214d3c02fdefce2d801d23993f6b6ba6ca1392af"
 dependencies = [
  "indexmap",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2154,12 +2237,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -2283,26 +2360,26 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.1"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
+checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8"
 dependencies = [
  "memchr",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.8.1"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc"
+checksum = "bc58706f770acb1dbd0973e6530a3cff4746fb721207feb3a8a6064cd0b6c663"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2310,9 +2387,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.1"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966"
+checksum = "6d4f36811dfe07f7b8573462465d5cb8965fffc2e71ae377a33aecf14c2c9a2f"
 dependencies = [
  "pest",
  "pest_meta",
@@ -2323,9 +2400,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.8.1"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5"
+checksum = "42919b05089acbd0a5dcd5405fb304d17d1053847b81163d09c4ad18ce8e8420"
 dependencies = [
  "pest",
  "sha2",
@@ -2398,9 +2475,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "zerovec",
 ]
@@ -2452,10 +2529,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro-crate"
-version = "3.3.0"
+name = "prettyplease"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
  "toml_edit",
 ]
@@ -2473,25 +2560,25 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.96"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beef09f85ae72cea1ef96ba6870c51e6382ebfa4f0e85b643459331f3daa5be0"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyproject-toml"
-version = "0.13.5"
+version = "0.13.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0f6160dc48298b9260d9b958ad1d7f96f6cd0b9df200b22329204e09334663"
+checksum = "f6d755483ad14b49e76713b52285235461a5b4f73f17612353e11a5de36a5fd2"
 dependencies = [
  "indexmap",
  "pep440_rs",
  "pep508_rs",
  "serde",
- "thiserror 2.0.12",
- "toml 0.8.23",
+ "thiserror 2.0.16",
+ "toml",
 ]
 
 [[package]]
@@ -2505,7 +2592,7 @@ dependencies = [
  "newtype-uuid",
  "quick-xml",
  "strip-ansi-escapes",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "uuid",
 ]
 
@@ -2540,9 +2627,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -2637,14 +2724,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -2652,9 +2739,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2666,7 +2753,7 @@ version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
@@ -2677,58 +2764,63 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
  "getrandom 0.2.16",
  "libredox",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
+]
+
+[[package]]
+name = "ref-cast"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-lite"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "ron"
@@ -2743,13 +2835,13 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.12.9"
+version = "0.14.2"
 dependencies = [
  "anyhow",
  "argfile",
  "assert_fs",
- "bincode 2.0.1",
- "bitflags 2.9.2",
+ "bincode",
+ "bitflags 2.9.4",
  "cachedir",
  "clap",
  "clap_complete_command",
@@ -2782,6 +2874,7 @@ dependencies = [
  "ruff_python_ast",
  "ruff_python_formatter",
  "ruff_python_parser",
+ "ruff_python_trivia",
  "ruff_server",
  "ruff_source_file",
  "ruff_text_size",
@@ -2793,9 +2886,9 @@ dependencies = [
  "strum",
  "tempfile",
  "test-case",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tikv-jemallocator",
- "toml 0.9.5",
+ "toml",
  "tracing",
  "walkdir",
  "wild",
@@ -2811,7 +2904,7 @@ dependencies = [
  "ruff_annotate_snippets",
  "serde",
  "snapbox",
- "toml 0.9.5",
+ "toml",
  "tryfn",
  "unicode-width 0.2.1",
 ]
@@ -2870,6 +2963,7 @@ dependencies = [
  "insta",
  "matchit",
  "path-slash",
+ "pathdiff",
  "quick-junit",
  "ruff_annotate_snippets",
  "ruff_cache",
@@ -2886,8 +2980,9 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
+ "similar",
  "tempfile",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tracing",
  "tracing-subscriber",
  "ty_static",
@@ -2928,12 +3023,13 @@ dependencies = [
  "similar",
  "strum",
  "tempfile",
- "toml 0.9.5",
+ "toml",
  "tracing",
  "tracing-indicatif",
  "tracing-subscriber",
  "ty",
  "ty_project",
+ "ty_python_semantic",
  "ty_static",
  "url",
 ]
@@ -2996,17 +3092,17 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.12.9"
+version = "0.14.2"
 dependencies = [
  "aho-corasick",
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "clap",
  "colored 3.0.0",
  "fern",
  "glob",
  "globset",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
  "imperative",
  "insta",
  "is-macro",
@@ -3018,7 +3114,6 @@ dependencies = [
  "memchr",
  "natord",
  "path-absolutize",
- "pathdiff",
  "pep440_rs",
  "pyproject-toml",
  "regex",
@@ -3029,6 +3124,7 @@ dependencies = [
  "ruff_notebook",
  "ruff_python_ast",
  "ruff_python_codegen",
+ "ruff_python_importer",
  "ruff_python_index",
  "ruff_python_literal",
  "ruff_python_parser",
@@ -3047,8 +3143,8 @@ dependencies = [
  "strum_macros",
  "tempfile",
  "test-case",
- "thiserror 2.0.12",
- "toml 0.9.5",
+ "thiserror 2.0.16",
+ "toml",
  "typed-arena",
  "unicode-normalization",
  "unicode-width 0.2.1",
@@ -3090,7 +3186,7 @@ dependencies = [
  "serde_json",
  "serde_with",
  "test-case",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "uuid",
 ]
 
@@ -3106,7 +3202,7 @@ name = "ruff_python_ast"
 version = "0.0.0"
 dependencies = [
  "aho-corasick",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "compact_str",
  "get-size2",
  "is-macro",
@@ -3121,7 +3217,8 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "thiserror 2.0.12",
+ "serde_json",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -3175,10 +3272,25 @@ dependencies = [
  "similar",
  "smallvec",
  "static_assertions",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tracing",
 ]
 
+[[package]]
+name = "ruff_python_importer"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "insta",
+ "ruff_diagnostics",
+ "ruff_python_ast",
+ "ruff_python_codegen",
+ "ruff_python_parser",
+ "ruff_python_trivia",
+ "ruff_source_file",
+ "ruff_text_size",
+]
+
 [[package]]
 name = "ruff_python_index"
 version = "0.0.0"
@@ -3194,7 +3306,7 @@ dependencies = [
 name = "ruff_python_literal"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "itertools 0.14.0",
  "ruff_python_ast",
  "unic-ucd-category",
@@ -3205,7 +3317,7 @@ name = "ruff_python_parser"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bstr",
  "compact_str",
  "get-size2",
@@ -3230,7 +3342,7 @@ dependencies = [
 name = "ruff_python_semantic"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "insta",
  "is-macro",
  "ruff_cache",
@@ -3251,7 +3363,7 @@ dependencies = [
 name = "ruff_python_stdlib"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "unicode-ident",
 ]
 
@@ -3305,8 +3417,8 @@ dependencies = [
  "serde",
  "serde_json",
  "shellexpand",
- "thiserror 2.0.12",
- "toml 0.9.5",
+ "thiserror 2.0.16",
+ "toml",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
@@ -3335,11 +3447,11 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.12.9"
+version = "0.14.2"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "log",
  "ruff_formatter",
@@ -3393,10 +3505,11 @@ dependencies = [
  "rustc-hash",
  "schemars",
  "serde",
+ "serde_json",
  "shellexpand",
  "strum",
  "tempfile",
- "toml 0.9.5",
+ "toml",
  "unicode-normalization",
 ]
 
@@ -3424,22 +3537,22 @@ checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -3449,8 +3562,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=a3ffa22cb26756473d56f867aedec3fd907c4dd9#a3ffa22cb26756473d56f867aedec3fd907c4dd9"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=d38145c29574758de7ffbe8a13cd4584c3b09161#d38145c29574758de7ffbe8a13cd4584c3b09161"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3473,13 +3586,13 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=a3ffa22cb26756473d56f867aedec3fd907c4dd9#a3ffa22cb26756473d56f867aedec3fd907c4dd9"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=d38145c29574758de7ffbe8a13cd4584c3b09161#d38145c29574758de7ffbe8a13cd4584c3b09161"
 
 [[package]]
 name = "salsa-macros"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=a3ffa22cb26756473d56f867aedec3fd907c4dd9#a3ffa22cb26756473d56f867aedec3fd907c4dd9"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=d38145c29574758de7ffbe8a13cd4584c3b09161#d38145c29574758de7ffbe8a13cd4584c3b09161"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3498,11 +3611,12 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.22"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
 dependencies = [
  "dyn-clone",
+ "ref-cast",
  "schemars_derive",
  "serde",
  "serde_json",
@@ -3510,9 +3624,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.22"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
+checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3534,10 +3648,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -3553,10 +3668,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.219"
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3576,14 +3700,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.142"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -3599,20 +3724,11 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee"
 dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
-dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -3626,9 +3742,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.14.0"
+version = "3.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e"
 dependencies = [
  "serde",
  "serde_derive",
@@ -3637,9 +3753,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.14.0"
+version = "3.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -3702,9 +3818,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "snapbox"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96dcfc4581e3355d70ac2ee14cfdf81dce3d85c85f1ed9e2c1d3013f53b3436b"
+checksum = "805d09a74586d9b17061e5be6ee5f8cc37e5982c349948114ffc5f68093fe5ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3717,7 +3833,7 @@ dependencies = [
  "similar",
  "snapbox-macros",
  "wait-timeout",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -3789,9 +3905,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3817,15 +3933,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3839,12 +3955,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
+checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 dependencies = [
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -3915,11 +4031,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.16",
 ]
 
 [[package]]
@@ -3935,9 +4051,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4004,9 +4120,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4019,26 +4135,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit",
-]
-
-[[package]]
-name = "toml"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned 1.0.0",
- "toml_datetime 0.7.0",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
  "toml_parser",
  "toml_writer",
  "winnow",
@@ -4046,49 +4150,39 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1"
 dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
-dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
+ "toml_datetime",
+ "toml_parser",
  "winnow",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109"
 
 [[package]]
 name = "tracing"
@@ -4136,9 +4230,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-indicatif"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1983afead46ff13a3c93581e0cec31d20b29efdd22cbdaa8b9f850eccf2c352"
+checksum = "04d4e11e0e27acef25a47f27e9435355fecdc488867fa2bc90e75b0700d2823d"
 dependencies = [
  "indicatif",
  "tracing",
@@ -4159,15 +4253,15 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "chrono",
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -4212,7 +4306,7 @@ dependencies = [
  "ruff_python_trivia",
  "salsa",
  "tempfile",
- "toml 0.9.5",
+ "toml",
  "tracing",
  "tracing-flame",
  "tracing-subscriber",
@@ -4234,25 +4328,55 @@ dependencies = [
  "ty_python_semantic",
 ]
 
+[[package]]
+name = "ty_completion_eval"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "bstr",
+ "clap",
+ "csv",
+ "regex",
+ "ruff_db",
+ "ruff_text_size",
+ "serde",
+ "tempfile",
+ "toml",
+ "ty_ide",
+ "ty_project",
+ "ty_python_semantic",
+ "walkdir",
+]
+
 [[package]]
 name = "ty_ide"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
+ "camino",
+ "get-size2",
  "insta",
  "itertools 0.14.0",
+ "rayon",
  "regex",
  "ruff_db",
+ "ruff_diagnostics",
+ "ruff_index",
+ "ruff_memory_usage",
  "ruff_python_ast",
+ "ruff_python_codegen",
+ "ruff_python_importer",
  "ruff_python_parser",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
+ "salsa",
  "smallvec",
  "tracing",
  "ty_project",
  "ty_python_semantic",
+ "ty_vendored",
 ]
 
 [[package]]
@@ -4271,7 +4395,7 @@ dependencies = [
  "pep440_rs",
  "rayon",
  "regex",
- "regex-automata 0.4.9",
+ "regex-automata",
  "ruff_cache",
  "ruff_db",
  "ruff_macros",
@@ -4284,11 +4408,13 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "thiserror 2.0.12",
- "toml 0.9.5",
+ "serde_json",
+ "thiserror 2.0.16",
+ "toml",
  "tracing",
  "ty_combine",
  "ty_python_semantic",
+ "ty_static",
  "ty_vendored",
 ]
 
@@ -4297,7 +4423,7 @@ name = "ty_python_semantic"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bitvec",
  "camino",
  "colored 3.0.0",
@@ -4306,12 +4432,14 @@ dependencies = [
  "drop_bomb",
  "get-size2",
  "glob",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
  "indexmap",
+ "indoc",
  "insta",
  "itertools 0.14.0",
  "memchr",
  "ordermap",
+ "pretty_assertions",
  "quickcheck",
  "quickcheck_macros",
  "ruff_annotate_snippets",
@@ -4330,6 +4458,7 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
+ "serde_json",
  "smallvec",
  "static_assertions",
  "strsim",
@@ -4337,7 +4466,7 @@ dependencies = [
  "strum_macros",
  "tempfile",
  "test-case",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tracing",
  "ty_python_semantic",
  "ty_static",
@@ -4350,7 +4479,7 @@ name = "ty_server"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "crossbeam",
  "dunce",
  "insta",
@@ -4371,14 +4500,13 @@ dependencies = [
  "serde_json",
  "shellexpand",
  "tempfile",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tracing",
  "tracing-subscriber",
  "ty_combine",
  "ty_ide",
  "ty_project",
  "ty_python_semantic",
- "ty_vendored",
 ]
 
 [[package]]
@@ -4393,11 +4521,12 @@ name = "ty_test"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "camino",
  "colored 3.0.0",
  "insta",
  "memchr",
+ "path-slash",
  "regex",
  "ruff_db",
  "ruff_index",
@@ -4412,8 +4541,8 @@ dependencies = [
  "serde",
  "smallvec",
  "tempfile",
- "thiserror 2.0.12",
- "toml 0.9.5",
+ "thiserror 2.0.16",
+ "toml",
  "tracing",
  "ty_python_semantic",
  "ty_static",
@@ -4437,7 +4566,7 @@ version = "0.0.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "log",
  "ruff_db",
@@ -4446,6 +4575,7 @@ dependencies = [
  "ruff_source_file",
  "ruff_text_size",
  "serde-wasm-bindgen",
+ "tracing",
  "ty_ide",
  "ty_project",
  "ty_python_semantic",
@@ -4516,15 +4646,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-id"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
+checksum = "70ba288e709927c043cbe476718d37be306be53fb1fafecd0dbe36d072be2580"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unicode-normalization"
@@ -4589,9 +4719,9 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -4625,11 +4755,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.17.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "rand 0.9.2",
  "uuid-macro-internal",
@@ -4638,9 +4768,9 @@ dependencies = [
 
 [[package]]
 name = "uuid-macro-internal"
-version = "1.17.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b682e8c381995ea03130e381928e0e005b7c9eb483c6c8682f50e07b33c2b7"
+checksum = "d9384a660318abfbd7f8932c34d67e4d1ec511095f95972ddc01e19d7ba8413f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4742,31 +4872,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.100"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c"
 dependencies = [
  "bumpalo",
  "log",
@@ -4778,9 +4909,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4791,9 +4922,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4801,9 +4932,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4814,18 +4945,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.50"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
+checksum = "aee0a0f5343de9221a0d233b04520ed8dc2e6728dce180b1dcd9288ec9d9fa3c"
 dependencies = [
  "js-sys",
  "minicov",
@@ -4836,9 +4967,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.50"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
+checksum = "a369369e4360c2884c3168d22bded735c43cccae97bbc147586d4b480edd138d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4847,9 +4978,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4885,46 +5016,24 @@ dependencies = [
  "glob",
 ]
 
-[[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.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
-[[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-core"
-version = "0.61.2"
+version = "0.62.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link",
+ "windows-link 0.2.0",
  "windows-result",
  "windows-strings",
 ]
@@ -4958,21 +5067,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
-name = "windows-result"
-version = "0.3.4"
+name = "windows-link"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
+[[package]]
+name = "windows-result"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4993,6 +5117,15 @@ dependencies = [
  "windows-targets 0.53.3",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -5015,7 +5148,7 @@ version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -5124,9 +5257,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winnow"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
@@ -5138,13 +5271,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.2",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
@@ -5193,18 +5323,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5299,9 +5429,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index c7ac8d0596..22f4a5cbfd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.88"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -29,6 +29,7 @@ ruff_options_metadata = { path = "crates/ruff_options_metadata" }
 ruff_python_ast = { path = "crates/ruff_python_ast" }
 ruff_python_codegen = { path = "crates/ruff_python_codegen" }
 ruff_python_formatter = { path = "crates/ruff_python_formatter" }
+ruff_python_importer = { path = "crates/ruff_python_importer" }
 ruff_python_index = { path = "crates/ruff_python_index" }
 ruff_python_literal = { path = "crates/ruff_python_literal" }
 ruff_python_parser = { path = "crates/ruff_python_parser" }
@@ -42,6 +43,7 @@ ruff_workspace = { path = "crates/ruff_workspace" }
 
 ty = { path = "crates/ty" }
 ty_combine = { path = "crates/ty_combine" }
+ty_completion_eval = { path = "crates/ty_completion_eval" }
 ty_ide = { path = "crates/ty_ide" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
@@ -68,8 +70,9 @@ camino = { version = "1.1.7" }
 clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
-divan = { package = "codspeed-divan-compat", version = "3.0.2" }
-codspeed-criterion-compat = { version = "3.0.2", default-features = false }
+csv = { version = "1.3.1" }
+divan = { package = "codspeed-divan-compat", version = "4.0.4" }
+codspeed-criterion-compat = { version = "4.0.4", default-features = false }
 colored = { version = "3.0.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
@@ -85,7 +88,7 @@ etcetera = { version = "0.10.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.6.2", features = [
+get-size2 = { version = "0.7.0", features = [
     "derive",
     "smallvec",
     "hashbrown",
@@ -94,7 +97,7 @@ get-size2 = { version = "0.6.2", features = [
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 globwalk = { version = "0.9.1" }
-hashbrown = { version = "0.15.0", default-features = false, features = [
+hashbrown = { version = "0.16.0", default-features = false, features = [
     "raw-entry",
     "equivalent",
     "inline-more",
@@ -115,7 +118,7 @@ jiff = { version = "0.2.0" }
 js-sys = { version = "0.3.69" }
 jod-thread = { version = "1.0.0" }
 libc = { version = "0.2.153" }
-libcst = { version = "1.1.0", default-features = false }
+libcst = { version = "1.8.4", default-features = false }
 log = { version = "0.4.17" }
 lsp-server = { version = "0.7.6" }
 lsp-types = { git = "https://github.com/astral-sh/lsp-types.git", rev = "3512a9f", features = [
@@ -143,13 +146,13 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "a3ffa22cb26756473d56f867aedec3fd907c4dd9", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "d38145c29574758de7ffbe8a13cd4584c3b09161", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",
     "inventory",
 ] }
-schemars = { version = "0.8.16" }
+schemars = { version = "1.0.4" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
 serde-wasm-bindgen = { version = "0.6.4" }
@@ -202,7 +205,7 @@ wild = { version = "2" }
 zip = { version = "0.6.6", default-features = false }
 
 [workspace.metadata.cargo-shear]
-ignored = ["getrandom", "ruff_options_metadata", "uuid"]
+ignored = ["getrandom", "ruff_options_metadata", "uuid", "get-size2", "ty_completion_eval"]
 
 
 [workspace.lints.rust]
@@ -215,6 +218,8 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -2 }
+# Enabled at the crate level
+disallowed_methods = "allow"
 # Allowed pedantic lints
 char_lit_as_u8 = "allow"
 collapsible_else_if = "allow"
@@ -249,17 +254,21 @@ rest_pat_in_fully_bound_structs = "warn"
 redundant_clone = "warn"
 debug_assert_with_mut_call = "warn"
 unused_peekable = "warn"
+# This lint sometimes flags code whose `if` and `else`
+# bodies could be flipped when a `!` operator is removed.
+# While perhaps sometimes a good idea, it is also often
+# not a good idea due to other factors impacting
+# readability. For example, if flipping the bodies results
+# in the `if` being an order of magnitude bigger than the
+# `else`, then some might consider that harder to read.
+if_not_else = "allow"
 
 # Diagnostics are not actionable: Enable once https://github.com/rust-lang/rust-clippy/issues/13774 is resolved.
 large_stack_arrays = "allow"
 
+
 [profile.release]
-# Note that we set these explicitly, and these values
-# were chosen based on a trade-off between compile times
-# and runtime performance[1].
-#
-# [1]: https://github.com/astral-sh/ruff/pull/9031
-lto = "thin"
+lto = "fat"
 codegen-units = 16
 
 # Some crates don't change as much but benefit more from
@@ -269,6 +278,8 @@ codegen-units = 16
 codegen-units = 1
 [profile.release.package.ruff_python_ast]
 codegen-units = 1
+[profile.release.package.salsa]
+codegen-units = 1
 
 [profile.dev.package.insta]
 opt-level = 3
@@ -284,11 +295,30 @@ opt-level = 3
 [profile.dev.package.ruff_python_parser]
 opt-level = 1
 
+# This profile is meant to mimic the `release` profile as closely as
+# possible, but using settings that are more beneficial for iterative
+# development. That is, the `release` profile is intended for actually
+# building the release, where as `profiling` is meant for building ty/ruff
+# for running benchmarks.
+#
+# The main differences here are to avoid stripping debug information
+# and disabling fat lto. This does result in a mismatch between our release
+# configuration and our benchmarking configuration, which is unfortunate.
+# But compile times with `lto = fat` are completely untenable.
+#
+# This setup does risk that we are measuring something in benchmarks
+# that we aren't shipping, but in order to make those two the same, we'd
+# either need to make compile times way worse for development, or take
+# a hit to binary size and a slight hit to runtime performance in our
+# release builds.
+#
 # Use the `--profile profiling` flag to show symbols in release mode.
 # e.g. `cargo build --profile profiling`
 [profile.profiling]
 inherits = "release"
-debug = 1
+strip = false
+debug = "full"
+lto = false
 
 # The profile that 'cargo dist' will build with.
 [profile.dist]
diff --git a/LICENSE b/LICENSE
index f5c3b02bec..655a0c76fc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -25,437 +25,6 @@ end of terms and conditions
 The externally maintained libraries from which parts of the Software is derived
 are:
 
-- flake8-comprehensions, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2017 Adam Johnson
-
-    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-no-pep420, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2020 Adam Johnson
-
-    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-tidy-imports, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2017 Adam Johnson
-
-    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-return, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2019 Afonasev Evgeniy
-
-    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-2020, licensed as follows:
-  """
-    Copyright (c) 2019 Anthony Sottile
-
-    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.
-  """
-
-- pyupgrade, licensed as follows:
-  """
-    Copyright (c) 2017 Anthony Sottile
-
-    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-blind-except, licensed as follows:
-  """
-    The MIT License (MIT)
-
-    Copyright (c) 2014 Elijah Andrews
-
-    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-gettext, licensed as follows:
-  """
-    BSD Zero Clause License
-
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  """
-
-- flake8-implicit-str-concat, licensed as follows:
-  """
-    The MIT License (MIT)
-
-    Copyright (c) 2019 Dylan Turner
-
-    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-debugger, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2016 Joseph Kahn
-
-    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-pyi, licensed as follows:
-  """
-    The MIT License (MIT)
-
-    Copyright (c) 2016 Łukasz Langa
-
-    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-print, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2016 Joseph Kahn
-
-    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-import-conventions, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2021 João Palmeiro
-
-    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-simplify, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2020 Martin Thoma
-
-    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-slots, licensed as follows:
-  """
-    Copyright (c) 2021 Dominic Davis-Foster
-
-    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-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
-
-    Copyright (c) 2019 Nathan Hoad
-
-    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.
-  """
-
-- pygrep-hooks, licensed as follows:
-  """
-    Copyright (c) 2018 Anthony Sottile
-
-    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.
-  """
-
 - autoflake, licensed as follows:
   """
     Copyright (C) 2012-2018 Steven Myint
@@ -530,7 +99,32 @@ are:
     SOFTWARE.
   """
 
-- flake8-bugbear, licensed as follows:
+- flake8-eradicate, licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2018 Nikita Sobolev
+
+    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-pyi, licensed as follows:
   """
     The MIT License (MIT)
 
@@ -555,60 +149,11 @@ are:
     SOFTWARE.
   """
 
-- flake8-commas, licensed as follows:
-  """
-    The MIT License (MIT)
-
-    Copyright (c) 2017 Thomas Grainger.
-
-    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.
-
-
-    Portions of this flake8-commas Software may utilize the following
-    copyrighted material, the use of which is hereby acknowledged.
-
-    Original flake8-commas: https://github.com/trevorcreech/flake8-commas/commit/e8563b71b1d5442e102c8734c11cb5202284293d
-
-    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.
-  """
-
-- flynt, licensed as follows:
+- flake8-simplify, licensed as follows:
   """
     MIT License
 
-    Copyright (c) 2019-2022 Ilya Kamenshchikov
+    Copyright (c) 2020 Martin Thoma
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -654,31 +199,27 @@ are:
     THE SOFTWARE.
   """
 
-- pep8-naming, licensed as follows:
+- pygrep-hooks, licensed as follows:
   """
-    Copyright © 2013 Florent Xicluna <florent.xicluna@gmail.com>
+    Copyright (c) 2018 Anthony Sottile
 
-    Licensed under the terms of the Expat License
+    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:
 
-    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 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.
+    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.
   """
 
 - pycodestyle, licensed as follows:
@@ -762,11 +303,60 @@ are:
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   """
 
-- flake8-use-pathlib, licensed as follows:
+- Pyright, licensed as follows:
   """
     MIT License
 
-    Copyright (c) 2021 Rodolphe Pelloux-Prayer
+    Pyright - A static type checker for the Python language
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    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
+  """
+
+- pyupgrade, licensed as follows:
+  """
+    Copyright (c) 2017 Anthony Sottile
+
+    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.
+  """
+
+- rome/tools, licensed under the MIT license:
+  """
+    MIT License
+
+    Copyright (c) Rome Tools, Inc. and its affiliates.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -812,514 +402,6 @@ are:
     SOFTWARE.
   """
 
-- flake8-annotations, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2019 - Present S. Co1
-
-    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-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
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this
-      list of conditions and the following disclaimer.
-
-    * 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.
-
-    * Neither the name of pytest-{{ cookiecutter.plugin_name }} 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-bandit, licensed as follows:
-  """
-    Copyright (c) 2017 Tyler Wince
-
-    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-eradicate, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2018 Nikita Sobolev
-
-    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-quotes, licensed as follows:
-  """
-    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-logging-format, licensed as follows:
-  """
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-    2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-    3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-    4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-    5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-    6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-    7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-    8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-    9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-    END OF TERMS AND CONDITIONS
-
-    APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-    Copyright {yyyy} {name of copyright owner}
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-  """
-
-- flake8-raise, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2020 Jon Dufresne
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-  """
-
-- flake8-self, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2023 Korijn van Golen
-
-    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-django, licensed under the GPL license.
-
-- perflint, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2022 Anthony Shaw
-
-    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-logging, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2023 Adam Johnson
-
-    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-trio, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2022 Zac Hatfield-Dodds
-
-    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.
-  """
-
-- Pyright, licensed as follows:
-  """
-    MIT License
-
-    Pyright - A static type checker for the Python language
-    Copyright (c) Microsoft Corporation. All rights reserved.
-
-    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
-  """
-
 - rust-analyzer/text-size, licensed under the MIT license:
   """
     Permission is hereby granted, free of charge, to any
@@ -1346,53 +428,3 @@ are:
     IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
   """
-
-- rome/tools, licensed under the MIT license:
-  """
-    MIT License
-
-    Copyright (c) Rome Tools, Inc. and its affiliates.
-
-    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.
-  """
-
-- pydoclint, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2023 jsh9
-
-    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.
-  """
diff --git a/README.md b/README.md
index cca5dbe09c..92d707838a 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ An extremely fast Python linter and code formatter, written in Rust.
 - ⚡️ 10-100x faster than existing linters (like Flake8) and formatters (like Black)
 - 🐍 Installable via `pip`
 - 🛠️ `pyproject.toml` support
-- 🤝 Python 3.13 compatibility
+- 🤝 Python 3.14 compatibility
 - ⚖️ Drop-in parity with [Flake8](https://docs.astral.sh/ruff/faq/#how-does-ruffs-linter-compare-to-flake8), isort, and [Black](https://docs.astral.sh/ruff/faq/#how-does-ruffs-formatter-compare-to-black)
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
@@ -89,8 +89,7 @@ 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.
 
-[**Tim Abbott**](https://github.com/astral-sh/ruff/issues/465#issuecomment-1317400028), lead
-developer of [Zulip](https://github.com/zulip/zulip):
+[**Tim Abbott**](https://github.com/zulip/zulip/pull/23431#issuecomment-1302557034), lead developer of [Zulip](https://github.com/zulip/zulip) (also [here](https://github.com/astral-sh/ruff/issues/465#issuecomment-1317400028)):
 
 > This is just ridiculously fast... `ruff` is amazing.
 
@@ -148,8 +147,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.12.9/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.9/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.2/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.2/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +181,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.9
+  rev: v0.14.2
   hooks:
     # Run the linter.
     - id: ruff-check
@@ -421,7 +420,7 @@ Ruff is released under the MIT license.
 
 Ruff is used by a number of major open-source projects and companies, including:
 
-- [Albumentations](https://github.com/albumentations-team/albumentations)
+- [Albumentations](https://github.com/albumentations-team/AlbumentationsX)
 - Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
 - [Anki](https://apps.ankiweb.net/)
 - Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
diff --git a/_typos.toml b/_typos.toml
index 24406f10bb..c4ff9f6151 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -31,6 +31,7 @@ extend-ignore-re = [
     "typ",
     # TODO: Remove this once the `TYP` redirects are removed from `rule_redirects.rs`
     "TYP",
+    "ntBre"
 ]
 
 [default.extend-identifiers]
diff --git a/changelogs/0.12.x.md b/changelogs/0.12.x.md
new file mode 100644
index 0000000000..4e36f6781b
--- /dev/null
+++ b/changelogs/0.12.x.md
@@ -0,0 +1,551 @@
+# Changelog 0.12.x
+
+## 0.12.0
+
+Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
+guide and overview of the changes!
+
+### Breaking changes
+
+- **Detection of more syntax errors**
+
+    Ruff now detects version-related syntax errors, such as the use of the `match`
+    statement on Python versions before 3.10, and syntax errors emitted by
+    CPython's compiler, such as irrefutable `match` patterns before the final
+    `case` arm.
+
+- **New default Python version handling for syntax errors**
+
+    Ruff will default to the *latest* supported Python version (3.13) when
+    checking for the version-related syntax errors mentioned above to prevent
+    false positives in projects without a Python version configured. The default
+    in all other cases, like applying lint rules, is unchanged and remains at the
+    minimum supported Python version (3.9).
+
+- **Updated f-string formatting**
+
+    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
+    line break after the format specifier. This addresses a change to the Python
+    grammar in version 3.13.4 that made such a line break a syntax error.
+
+- **`rust-toolchain.toml` is no longer included in source distributions**
+
+    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
+    minimum supported Rust version (MSRV) for development and building release
+    artifacts. However, when present in source distributions, it would also cause
+    downstream package maintainers to pull in the same Rust toolchain, even if
+    their available toolchain was MSRV-compatible.
+
+### Removed Rules
+
+The following rules have been removed:
+
+- [`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
+    (`S320`)
+
+### Deprecated Rules
+
+The following rules have been deprecated:
+
+- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name/)
+
+### Stabilization
+
+The following rules have been stabilized and are no longer in preview:
+
+- [`for-loop-writes`](https://docs.astral.sh/ruff/rules/for-loop-writes) (`FURB122`)
+- [`check-and-remove-from-set`](https://docs.astral.sh/ruff/rules/check-and-remove-from-set) (`FURB132`)
+- [`verbose-decimal-constructor`](https://docs.astral.sh/ruff/rules/verbose-decimal-constructor) (`FURB157`)
+- [`fromisoformat-replace-z`](https://docs.astral.sh/ruff/rules/fromisoformat-replace-z) (`FURB162`)
+- [`int-on-sliced-str`](https://docs.astral.sh/ruff/rules/int-on-sliced-str) (`FURB166`)
+- [`exc-info-outside-except-handler`](https://docs.astral.sh/ruff/rules/exc-info-outside-except-handler) (`LOG014`)
+- [`import-outside-top-level`](https://docs.astral.sh/ruff/rules/import-outside-top-level) (`PLC0415`)
+- [`unnecessary-dict-index-lookup`](https://docs.astral.sh/ruff/rules/unnecessary-dict-index-lookup) (`PLR1733`)
+- [`nan-comparison`](https://docs.astral.sh/ruff/rules/nan-comparison) (`PLW0177`)
+- [`eq-without-hash`](https://docs.astral.sh/ruff/rules/eq-without-hash) (`PLW1641`)
+- [`pytest-parameter-with-default-argument`](https://docs.astral.sh/ruff/rules/pytest-parameter-with-default-argument) (`PT028`)
+- [`pytest-warns-too-broad`](https://docs.astral.sh/ruff/rules/pytest-warns-too-broad) (`PT030`)
+- [`pytest-warns-with-multiple-statements`](https://docs.astral.sh/ruff/rules/pytest-warns-with-multiple-statements) (`PT031`)
+- [`invalid-formatter-suppression-comment`](https://docs.astral.sh/ruff/rules/invalid-formatter-suppression-comment) (`RUF028`)
+- [`dataclass-enum`](https://docs.astral.sh/ruff/rules/dataclass-enum) (`RUF049`)
+- [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
+- [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
+- [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
+- [`non-pep604-annotation-optional`] (`UP045`)
+- [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
+- [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
+- [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)
+
+The following behaviors have been stabilized:
+
+- [`collection-literal-concatenation`] (`RUF005`) now recognizes slices, in
+    addition to list literals and variables.
+- The fix for [`readlines-in-for`] (`FURB129`) is now marked as always safe.
+- [`if-else-block-instead-of-if-exp`] (`SIM108`) will now further simplify
+    expressions to use `or` instead of an `if` expression, where possible.
+- [`unused-noqa`] (`RUF100`) now checks for file-level `noqa` comments as well
+    as inline comments.
+- [`subprocess-without-shell-equals-true`] (`S603`) now accepts literal strings,
+    as well as lists and tuples of literal strings, as trusted input.
+- [`boolean-type-hint-positional-argument`] (`FBT001`) now applies to types that
+    include `bool`, like `bool | int` or `typing.Optional[bool]`, in addition to
+    plain `bool` annotations.
+- [`non-pep604-annotation-union`] (`UP007`) has now been split into two rules.
+    `UP007` now applies only to `typing.Union`, while
+    [`non-pep604-annotation-optional`] (`UP045`) checks for use of
+    `typing.Optional`. `UP045` has also been stabilized in this release, but you
+    may need to update existing `include`, `ignore`, or `noqa` settings to
+    accommodate this change.
+
+### Preview features
+
+- \[`ruff`\] Check for non-context-manager use of `pytest.raises`, `pytest.warns`, and `pytest.deprecated_call` (`RUF061`) ([#17368](https://github.com/astral-sh/ruff/pull/17368))
+- [syntax-errors] Raise unsupported syntax error for template strings prior to Python 3.14 ([#18664](https://github.com/astral-sh/ruff/pull/18664))
+
+### Bug fixes
+
+- Add syntax error when conversion flag does not immediately follow exclamation mark ([#18706](https://github.com/astral-sh/ruff/pull/18706))
+- Add trailing space around `readlines` ([#18542](https://github.com/astral-sh/ruff/pull/18542))
+- Fix `\r` and `\r\n` handling in t- and f-string debug texts ([#18673](https://github.com/astral-sh/ruff/pull/18673))
+- Hug closing `}` when f-string expression has a format specifier ([#18704](https://github.com/astral-sh/ruff/pull/18704))
+- \[`flake8-pyi`\] Avoid syntax error in the case of starred and keyword arguments (`PYI059`) ([#18611](https://github.com/astral-sh/ruff/pull/18611))
+- \[`flake8-return`\] Fix `RET504` autofix generating a syntax error ([#18428](https://github.com/astral-sh/ruff/pull/18428))
+- \[`pep8-naming`\] Suppress fix for `N804` and `N805` if the recommended name is already used ([#18472](https://github.com/astral-sh/ruff/pull/18472))
+- \[`pycodestyle`\] Avoid causing a syntax error in expressions spanning multiple lines (`E731`) ([#18479](https://github.com/astral-sh/ruff/pull/18479))
+- \[`pyupgrade`\] Suppress `UP008` if `super` is shadowed ([#18688](https://github.com/astral-sh/ruff/pull/18688))
+- \[`refurb`\] Parenthesize lambda and ternary expressions (`FURB122`, `FURB142`) ([#18592](https://github.com/astral-sh/ruff/pull/18592))
+- \[`ruff`\] Handle extra arguments to `deque` (`RUF037`) ([#18614](https://github.com/astral-sh/ruff/pull/18614))
+- \[`ruff`\] Preserve parentheses around `deque` in fix for `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#18598](https://github.com/astral-sh/ruff/pull/18598))
+- \[`ruff`\] Validate arguments before offering a fix (`RUF056`) ([#18631](https://github.com/astral-sh/ruff/pull/18631))
+- \[`ruff`\] Skip fix for `RUF059` if dummy name is already bound ([#18509](https://github.com/astral-sh/ruff/pull/18509))
+- \[`pylint`\] Fix `PLW0128` to check assignment targets in square brackets and after asterisks ([#18665](https://github.com/astral-sh/ruff/pull/18665))
+
+### Rule changes
+
+- Fix false positive on mutations in `return` statements (`B909`) ([#18408](https://github.com/astral-sh/ruff/pull/18408))
+- Treat `ty:` comments as pragma comments ([#18532](https://github.com/astral-sh/ruff/pull/18532))
+- \[`flake8-pyi`\] Apply `custom-typevar-for-self` to string annotations (`PYI019`) ([#18311](https://github.com/astral-sh/ruff/pull/18311))
+- \[`pyupgrade`\] Don't offer a fix for `Optional[None]` (`UP007`, `UP045)` ([#18545](https://github.com/astral-sh/ruff/pull/18545))
+- \[`pyupgrade`\] Fix `super(__class__, self)` detection (`UP008`) ([#18478](https://github.com/astral-sh/ruff/pull/18478))
+- \[`refurb`\] Make the fix for `FURB163` unsafe for `log2`, `log10`, `*args`, and deleted comments ([#18645](https://github.com/astral-sh/ruff/pull/18645))
+
+### Server
+
+- Support cancellation requests ([#18627](https://github.com/astral-sh/ruff/pull/18627))
+
+### Documentation
+
+- Drop confusing second `*` from glob pattern example for `per-file-target-version` ([#18709](https://github.com/astral-sh/ruff/pull/18709))
+- Update Neovim configuration examples ([#18491](https://github.com/astral-sh/ruff/pull/18491))
+- \[`pylint`\] De-emphasize `__hash__ = Parent.__hash__` (`PLW1641`) ([#18613](https://github.com/astral-sh/ruff/pull/18613))
+- \[`refurb`\] Add a note about float literal handling (`FURB157`) ([#18615](https://github.com/astral-sh/ruff/pull/18615))
+
+## 0.12.1
+
+### Preview features
+
+- \[`flake8-errmsg`\] Extend `EM101` to support byte strings ([#18867](https://github.com/astral-sh/ruff/pull/18867))
+- \[`flake8-use-pathlib`\] Add autofix for `PTH202` ([#18763](https://github.com/astral-sh/ruff/pull/18763))
+- \[`pygrep-hooks`\] Add `AsyncMock` methods to `invalid-mock-access` (`PGH005`) ([#18547](https://github.com/astral-sh/ruff/pull/18547))
+- \[`pylint`\] Ignore `__init__.py` files in (`PLC0414`) ([#18400](https://github.com/astral-sh/ruff/pull/18400))
+- \[`ruff`\] Trigger `RUF037` for empty string and byte strings ([#18862](https://github.com/astral-sh/ruff/pull/18862))
+- [formatter] Fix missing blank lines before decorated classes in `.pyi` files ([#18888](https://github.com/astral-sh/ruff/pull/18888))
+
+### Bug fixes
+
+- Avoid generating diagnostics with per-file ignores ([#18801](https://github.com/astral-sh/ruff/pull/18801))
+- Handle parenthesized arguments in `remove_argument` ([#18805](https://github.com/astral-sh/ruff/pull/18805))
+- \[`flake8-logging`\] Avoid false positive for `exc_info=True` outside `logger.exception` (`LOG014`) ([#18737](https://github.com/astral-sh/ruff/pull/18737))
+- \[`flake8-pytest-style`\] Enforce `pytest` import for decorators ([#18779](https://github.com/astral-sh/ruff/pull/18779))
+- \[`flake8-pytest-style`\] Mark autofix for `PT001` and `PT023` as unsafe if there's comments in the decorator ([#18792](https://github.com/astral-sh/ruff/pull/18792))
+- \[`flake8-pytest-style`\] `PT001`/`PT023` fix makes syntax error on parenthesized decorator ([#18782](https://github.com/astral-sh/ruff/pull/18782))
+- \[`flake8-raise`\] Make fix unsafe if it deletes comments (`RSE102`) ([#18788](https://github.com/astral-sh/ruff/pull/18788))
+- \[`flake8-simplify`\] Fix `SIM911` autofix creating a syntax error ([#18793](https://github.com/astral-sh/ruff/pull/18793))
+- \[`flake8-simplify`\] Fix false negatives for shadowed bindings (`SIM910`, `SIM911`) ([#18794](https://github.com/astral-sh/ruff/pull/18794))
+- \[`flake8-simplify`\] Preserve original behavior for `except ()` and bare `except` (`SIM105`) ([#18213](https://github.com/astral-sh/ruff/pull/18213))
+- \[`flake8-pyi`\] Fix `PYI041`'s fix causing `TypeError` with `None | None | ...` ([#18637](https://github.com/astral-sh/ruff/pull/18637))
+- \[`perflint`\] Fix `PERF101` autofix creating a syntax error and mark autofix as unsafe if there are comments in the `list` call expr ([#18803](https://github.com/astral-sh/ruff/pull/18803))
+- \[`perflint`\] Fix false negative in `PERF401` ([#18866](https://github.com/astral-sh/ruff/pull/18866))
+- \[`pylint`\] Avoid flattening nested `min`/`max` when outer call has single argument (`PLW3301`) ([#16885](https://github.com/astral-sh/ruff/pull/16885))
+- \[`pylint`\] Fix `PLC2801` autofix creating a syntax error ([#18857](https://github.com/astral-sh/ruff/pull/18857))
+- \[`pylint`\] Mark `PLE0241` autofix as unsafe if there's comments in the base classes ([#18832](https://github.com/astral-sh/ruff/pull/18832))
+- \[`pylint`\] Suppress `PLE2510`/`PLE2512`/`PLE2513`/`PLE2514`/`PLE2515` autofix if the text contains an odd number of backslashes ([#18856](https://github.com/astral-sh/ruff/pull/18856))
+- \[`refurb`\] Detect more exotic float literals in `FURB164` ([#18925](https://github.com/astral-sh/ruff/pull/18925))
+- \[`refurb`\] Fix `FURB163` autofix creating a syntax error for `yield` expressions ([#18756](https://github.com/astral-sh/ruff/pull/18756))
+- \[`refurb`\] Mark `FURB129` autofix as unsafe if there's comments in the `readlines` call ([#18858](https://github.com/astral-sh/ruff/pull/18858))
+- \[`ruff`\] Fix false positives and negatives in `RUF010` ([#18690](https://github.com/astral-sh/ruff/pull/18690))
+- Fix casing of `analyze.direction` variant names ([#18892](https://github.com/astral-sh/ruff/pull/18892))
+
+### Rule changes
+
+- Fix f-string interpolation escaping in generated fixes ([#18882](https://github.com/astral-sh/ruff/pull/18882))
+- \[`flake8-return`\] Mark `RET501` fix unsafe if comments are inside ([#18780](https://github.com/astral-sh/ruff/pull/18780))
+- \[`flake8-async`\] Fix detection for large integer sleep durations in `ASYNC116` rule ([#18767](https://github.com/astral-sh/ruff/pull/18767))
+- \[`flake8-async`\] Mark autofix for `ASYNC115` as unsafe if the call expression contains comments ([#18753](https://github.com/astral-sh/ruff/pull/18753))
+- \[`flake8-bugbear`\] Mark autofix for `B004` as unsafe if the `hasattr` call expr contains comments ([#18755](https://github.com/astral-sh/ruff/pull/18755))
+- \[`flake8-comprehension`\] Mark autofix for `C420` as unsafe if there's comments inside the dict comprehension ([#18768](https://github.com/astral-sh/ruff/pull/18768))
+- \[`flake8-comprehensions`\] Handle template strings for comprehension fixes ([#18710](https://github.com/astral-sh/ruff/pull/18710))
+- \[`flake8-future-annotations`\] Add autofix (`FA100`) ([#18903](https://github.com/astral-sh/ruff/pull/18903))
+- \[`pyflakes`\] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect ([#18839](https://github.com/astral-sh/ruff/pull/18839))
+- \[`pylint`\] Allow fix with comments and document performance implications (`PLW3301`) ([#18936](https://github.com/astral-sh/ruff/pull/18936))
+- \[`pylint`\] Detect more exotic `NaN` literals in `PLW0177` ([#18630](https://github.com/astral-sh/ruff/pull/18630))
+- \[`pylint`\] Fix `PLC1802` autofix creating a syntax error and mark autofix as unsafe if there's comments in the `len` call ([#18836](https://github.com/astral-sh/ruff/pull/18836))
+- \[`pyupgrade`\] Extend version detection to include `sys.version_info.major` (`UP036`) ([#18633](https://github.com/astral-sh/ruff/pull/18633))
+- \[`ruff`\] Add lint rule `RUF064` for calling `chmod` with non-octal integers ([#18541](https://github.com/astral-sh/ruff/pull/18541))
+- \[`ruff`\] Added `cls.__dict__.get('__annotations__')` check (`RUF063`) ([#18233](https://github.com/astral-sh/ruff/pull/18233))
+- \[`ruff`\] Frozen `dataclass` default should be valid (`RUF009`) ([#18735](https://github.com/astral-sh/ruff/pull/18735))
+
+### Server
+
+- Consider virtual path for various server actions ([#18910](https://github.com/astral-sh/ruff/pull/18910))
+
+### Documentation
+
+- Add fix safety sections ([#18940](https://github.com/astral-sh/ruff/pull/18940),[#18841](https://github.com/astral-sh/ruff/pull/18841),[#18802](https://github.com/astral-sh/ruff/pull/18802),[#18837](https://github.com/astral-sh/ruff/pull/18837),[#18800](https://github.com/astral-sh/ruff/pull/18800),[#18415](https://github.com/astral-sh/ruff/pull/18415),[#18853](https://github.com/astral-sh/ruff/pull/18853),[#18842](https://github.com/astral-sh/ruff/pull/18842))
+- Use updated pre-commit id ([#18718](https://github.com/astral-sh/ruff/pull/18718))
+- \[`perflint`\] Small docs improvement to `PERF401` ([#18786](https://github.com/astral-sh/ruff/pull/18786))
+- \[`pyupgrade`\]: Use `super()`, not `__super__` in error messages (`UP008`) ([#18743](https://github.com/astral-sh/ruff/pull/18743))
+- \[`flake8-pie`\] Small docs fix to `PIE794` ([#18829](https://github.com/astral-sh/ruff/pull/18829))
+- \[`flake8-pyi`\] Correct `collections-named-tuple` example to use PascalCase assignment ([#16884](https://github.com/astral-sh/ruff/pull/16884))
+- \[`flake8-pie`\] Add note on type checking benefits to `unnecessary-dict-kwargs` (`PIE804`) ([#18666](https://github.com/astral-sh/ruff/pull/18666))
+- \[`pycodestyle`\] Clarify PEP 8 relationship to `whitespace-around-operator` rules ([#18870](https://github.com/astral-sh/ruff/pull/18870))
+
+### Other changes
+
+- Disallow newlines in format specifiers of single quoted f- or t-strings ([#18708](https://github.com/astral-sh/ruff/pull/18708))
+- \[`flake8-logging`\] Add fix safety section to `LOG002` ([#18840](https://github.com/astral-sh/ruff/pull/18840))
+- \[`pyupgrade`\] Add fix safety section to `UP010` ([#18838](https://github.com/astral-sh/ruff/pull/18838))
+
+## 0.12.2
+
+### Preview features
+
+- \[`flake8-pyi`\] Expand `Optional[A]` to `A | None` (`PYI016`) ([#18572](https://github.com/astral-sh/ruff/pull/18572))
+- \[`pyupgrade`\] Mark `UP008` fix safe if no comments are in range ([#18683](https://github.com/astral-sh/ruff/pull/18683))
+
+### Bug fixes
+
+- \[`flake8-comprehensions`\] Fix `C420` to prepend whitespace when needed ([#18616](https://github.com/astral-sh/ruff/pull/18616))
+- \[`perflint`\] Fix `PERF403` panic on attribute or subscription loop variable ([#19042](https://github.com/astral-sh/ruff/pull/19042))
+- \[`pydocstyle`\] Fix `D413` infinite loop for parenthesized docstring ([#18930](https://github.com/astral-sh/ruff/pull/18930))
+- \[`pylint`\] Fix `PLW0108` autofix introducing a syntax error when the lambda's body contains an assignment expression ([#18678](https://github.com/astral-sh/ruff/pull/18678))
+- \[`refurb`\] Fix false positive on empty tuples (`FURB168`) ([#19058](https://github.com/astral-sh/ruff/pull/19058))
+- \[`ruff`\] Allow more `field` calls from `attrs` (`RUF009`) ([#19021](https://github.com/astral-sh/ruff/pull/19021))
+- \[`ruff`\] Fix syntax error introduced for an empty string followed by a u-prefixed string (`UP025`) ([#18899](https://github.com/astral-sh/ruff/pull/18899))
+
+### Rule changes
+
+- \[`flake8-executable`\] Allow `uvx` in shebang line (`EXE003`) ([#18967](https://github.com/astral-sh/ruff/pull/18967))
+- \[`pandas`\] Avoid flagging `PD002` if `pandas` is not imported ([#18963](https://github.com/astral-sh/ruff/pull/18963))
+- \[`pyupgrade`\] Avoid PEP-604 unions with `typing.NamedTuple` (`UP007`, `UP045`) ([#18682](https://github.com/astral-sh/ruff/pull/18682))
+
+### Documentation
+
+- Document link between `import-outside-top-level (PLC0415)` and `lint.flake8-tidy-imports.banned-module-level-imports` ([#18733](https://github.com/astral-sh/ruff/pull/18733))
+- Fix description of the `format.skip-magic-trailing-comma` example ([#19095](https://github.com/astral-sh/ruff/pull/19095))
+- \[`airflow`\] Make `AIR302` example error out-of-the-box ([#18988](https://github.com/astral-sh/ruff/pull/18988))
+- \[`airflow`\] Make `AIR312` example error out-of-the-box ([#18989](https://github.com/astral-sh/ruff/pull/18989))
+- \[`flake8-annotations`\] Make `ANN401` example error out-of-the-box ([#18974](https://github.com/astral-sh/ruff/pull/18974))
+- \[`flake8-async`\] Make `ASYNC100` example error out-of-the-box ([#18993](https://github.com/astral-sh/ruff/pull/18993))
+- \[`flake8-async`\] Make `ASYNC105` example error out-of-the-box ([#19002](https://github.com/astral-sh/ruff/pull/19002))
+- \[`flake8-async`\] Make `ASYNC110` example error out-of-the-box ([#18975](https://github.com/astral-sh/ruff/pull/18975))
+- \[`flake8-async`\] Make `ASYNC210` example error out-of-the-box ([#18977](https://github.com/astral-sh/ruff/pull/18977))
+- \[`flake8-async`\] Make `ASYNC220`, `ASYNC221`, and `ASYNC222` examples error out-of-the-box ([#18978](https://github.com/astral-sh/ruff/pull/18978))
+- \[`flake8-async`\] Make `ASYNC251` example error out-of-the-box ([#18990](https://github.com/astral-sh/ruff/pull/18990))
+- \[`flake8-bandit`\] Make `S201` example error out-of-the-box ([#19017](https://github.com/astral-sh/ruff/pull/19017))
+- \[`flake8-bandit`\] Make `S604` and `S609` examples error out-of-the-box ([#19049](https://github.com/astral-sh/ruff/pull/19049))
+- \[`flake8-bugbear`\] Make `B028` example error out-of-the-box ([#19054](https://github.com/astral-sh/ruff/pull/19054))
+- \[`flake8-bugbear`\] Make `B911` example error out-of-the-box ([#19051](https://github.com/astral-sh/ruff/pull/19051))
+- \[`flake8-datetimez`\] Make `DTZ011` example error out-of-the-box ([#19055](https://github.com/astral-sh/ruff/pull/19055))
+- \[`flake8-datetimez`\] Make `DTZ901` example error out-of-the-box ([#19056](https://github.com/astral-sh/ruff/pull/19056))
+- \[`flake8-pyi`\] Make `PYI032` example error out-of-the-box ([#19061](https://github.com/astral-sh/ruff/pull/19061))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI014`, `PYI015`) ([#19097](https://github.com/astral-sh/ruff/pull/19097))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI042`) ([#19101](https://github.com/astral-sh/ruff/pull/19101))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI059`) ([#19080](https://github.com/astral-sh/ruff/pull/19080))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI062`) ([#19079](https://github.com/astral-sh/ruff/pull/19079))
+- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT023`) ([#19104](https://github.com/astral-sh/ruff/pull/19104))
+- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT030`) ([#19105](https://github.com/astral-sh/ruff/pull/19105))
+- \[`flake8-quotes`\] Make example error out-of-the-box (`Q003`) ([#19106](https://github.com/astral-sh/ruff/pull/19106))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM110`) ([#19113](https://github.com/astral-sh/ruff/pull/19113))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM113`) ([#19109](https://github.com/astral-sh/ruff/pull/19109))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM401`) ([#19110](https://github.com/astral-sh/ruff/pull/19110))
+- \[`pyflakes`\] Fix backslash in docs (`F621`) ([#19098](https://github.com/astral-sh/ruff/pull/19098))
+- \[`pylint`\] Fix `PLC0415` example ([#18970](https://github.com/astral-sh/ruff/pull/18970))
+
+## 0.12.3
+
+### Preview features
+
+- \[`flake8-bugbear`\] Support non-context-manager calls in `B017` ([#19063](https://github.com/astral-sh/ruff/pull/19063))
+- \[`flake8-use-pathlib`\] Add autofixes for `PTH100`, `PTH106`, `PTH107`, `PTH108`, `PTH110`, `PTH111`, `PTH112`, `PTH113`, `PTH114`, `PTH115`, `PTH117`, `PTH119`, `PTH120` ([#19213](https://github.com/astral-sh/ruff/pull/19213))
+- \[`flake8-use-pathlib`\] Add autofixes for `PTH203`, `PTH204`, `PTH205` ([#18922](https://github.com/astral-sh/ruff/pull/18922))
+
+### Bug fixes
+
+- \[`flake8-return`\] Fix false-positive for variables used inside nested functions in `RET504` ([#18433](https://github.com/astral-sh/ruff/pull/18433))
+- Treat form feed as valid whitespace before a line continuation ([#19220](https://github.com/astral-sh/ruff/pull/19220))
+- \[`flake8-type-checking`\] Fix syntax error introduced by fix (`TC008`) ([#19150](https://github.com/astral-sh/ruff/pull/19150))
+- \[`pyupgrade`\] Keyword arguments in `super` should suppress the `UP008` fix ([#19131](https://github.com/astral-sh/ruff/pull/19131))
+
+### Documentation
+
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI007`, `PYI008`) ([#19103](https://github.com/astral-sh/ruff/pull/19103))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM116`) ([#19111](https://github.com/astral-sh/ruff/pull/19111))
+- \[`flake8-type-checking`\] Make example error out-of-the-box (`TC001`) ([#19151](https://github.com/astral-sh/ruff/pull/19151))
+- \[`flake8-use-pathlib`\] Make example error out-of-the-box (`PTH210`) ([#19189](https://github.com/astral-sh/ruff/pull/19189))
+- \[`pycodestyle`\] Make example error out-of-the-box (`E272`) ([#19191](https://github.com/astral-sh/ruff/pull/19191))
+- \[`pycodestyle`\] Make example not raise unnecessary `SyntaxError` (`E114`) ([#19190](https://github.com/astral-sh/ruff/pull/19190))
+- \[`pydoclint`\] Make example error out-of-the-box (`DOC501`) ([#19218](https://github.com/astral-sh/ruff/pull/19218))
+- \[`pylint`, `pyupgrade`\] Fix syntax errors in examples (`PLW1501`, `UP028`) ([#19127](https://github.com/astral-sh/ruff/pull/19127))
+- \[`pylint`\] Update `missing-maxsplit-arg` docs and error to suggest proper usage (`PLC0207`) ([#18949](https://github.com/astral-sh/ruff/pull/18949))
+- \[`flake8-bandit`\] Make example error out-of-the-box (`S412`) ([#19241](https://github.com/astral-sh/ruff/pull/19241))
+
+## 0.12.4
+
+### Preview features
+
+- \[`flake8-type-checking`, `pyupgrade`, `ruff`\] Add `from __future__ import annotations` when it would allow new fixes (`TC001`, `TC002`, `TC003`, `UP037`, `RUF013`) ([#19100](https://github.com/astral-sh/ruff/pull/19100))
+- \[`flake8-use-pathlib`\] Add autofix for `PTH109` ([#19245](https://github.com/astral-sh/ruff/pull/19245))
+- \[`pylint`\] Detect indirect `pathlib.Path` usages for `unspecified-encoding` (`PLW1514`) ([#19304](https://github.com/astral-sh/ruff/pull/19304))
+
+### Bug fixes
+
+- \[`flake8-bugbear`\] Fix `B017` false negatives for keyword exception arguments ([#19217](https://github.com/astral-sh/ruff/pull/19217))
+- \[`flake8-use-pathlib`\] Fix false negative on direct `Path()` instantiation (`PTH210`) ([#19388](https://github.com/astral-sh/ruff/pull/19388))
+- \[`flake8-django`\] Fix `DJ008` false positive for abstract models with type-annotated `abstract` field ([#19221](https://github.com/astral-sh/ruff/pull/19221))
+- \[`isort`\] Fix `I002` import insertion after docstring with multiple string statements ([#19222](https://github.com/astral-sh/ruff/pull/19222))
+- \[`isort`\] Treat form feed as valid whitespace before a semicolon ([#19343](https://github.com/astral-sh/ruff/pull/19343))
+- \[`pydoclint`\] Fix `SyntaxError` from fixes with line continuations (`D201`, `D202`) ([#19246](https://github.com/astral-sh/ruff/pull/19246))
+- \[`refurb`\] `FURB164` fix should validate arguments and should usually be marked unsafe ([#19136](https://github.com/astral-sh/ruff/pull/19136))
+
+### Rule changes
+
+- \[`flake8-use-pathlib`\] Skip single dots for `invalid-pathlib-with-suffix` (`PTH210`) on versions >= 3.14 ([#19331](https://github.com/astral-sh/ruff/pull/19331))
+- \[`pep8_naming`\] Avoid false positives on standard library functions with uppercase names (`N802`) ([#18907](https://github.com/astral-sh/ruff/pull/18907))
+- \[`pycodestyle`\] Handle brace escapes for t-strings in logical lines ([#19358](https://github.com/astral-sh/ruff/pull/19358))
+- \[`pylint`\] Extend invalid string character rules to include t-strings ([#19355](https://github.com/astral-sh/ruff/pull/19355))
+- \[`ruff`\] Allow `strict` kwarg when checking for `starmap-zip` (`RUF058`) in Python 3.14+ ([#19333](https://github.com/astral-sh/ruff/pull/19333))
+
+### Documentation
+
+- \[`flake8-type-checking`\] Make `TC010` docs example more realistic ([#19356](https://github.com/astral-sh/ruff/pull/19356))
+- Make more documentation examples error out-of-the-box ([#19288](https://github.com/astral-sh/ruff/pull/19288),[#19272](https://github.com/astral-sh/ruff/pull/19272),[#19291](https://github.com/astral-sh/ruff/pull/19291),[#19296](https://github.com/astral-sh/ruff/pull/19296),[#19292](https://github.com/astral-sh/ruff/pull/19292),[#19295](https://github.com/astral-sh/ruff/pull/19295),[#19297](https://github.com/astral-sh/ruff/pull/19297),[#19309](https://github.com/astral-sh/ruff/pull/19309))
+
+## 0.12.5
+
+### Preview features
+
+- \[`flake8-use-pathlib`\] Add autofix for `PTH101`, `PTH104`, `PTH105`, `PTH121` ([#19404](https://github.com/astral-sh/ruff/pull/19404))
+- \[`ruff`\] Support byte strings (`RUF055`) ([#18926](https://github.com/astral-sh/ruff/pull/18926))
+
+### Bug fixes
+
+- Fix `unreachable` panic in parser ([#19183](https://github.com/astral-sh/ruff/pull/19183))
+- \[`flake8-pyi`\] Skip fix if all `Union` members are `None` (`PYI016`) ([#19416](https://github.com/astral-sh/ruff/pull/19416))
+- \[`perflint`\] Parenthesize generator expressions (`PERF401`) ([#19325](https://github.com/astral-sh/ruff/pull/19325))
+- \[`pylint`\] Handle empty comments after line continuation (`PLR2044`) ([#19405](https://github.com/astral-sh/ruff/pull/19405))
+
+### Rule changes
+
+- \[`pep8-naming`\] Fix `N802` false positives for `CGIHTTPRequestHandler` and `SimpleHTTPRequestHandler` ([#19432](https://github.com/astral-sh/ruff/pull/19432))
+
+## 0.12.6
+
+### Preview features
+
+- \[`flake8-commas`\] Add support for trailing comma checks in type parameter lists (`COM812`, `COM819`) ([#19390](https://github.com/astral-sh/ruff/pull/19390))
+- \[`pylint`\] Implement auto-fix for `missing-maxsplit-arg` (`PLC0207`) ([#19387](https://github.com/astral-sh/ruff/pull/19387))
+- \[`ruff`\] Offer fixes for `RUF039` in more cases ([#19065](https://github.com/astral-sh/ruff/pull/19065))
+
+### Bug fixes
+
+- Support `.pyi` files in ruff analyze graph ([#19611](https://github.com/astral-sh/ruff/pull/19611))
+- \[`flake8-pyi`\] Preserve inline comment in ellipsis removal (`PYI013`) ([#19399](https://github.com/astral-sh/ruff/pull/19399))
+- \[`perflint`\] Ignore rule if target is `global` or `nonlocal` (`PERF401`) ([#19539](https://github.com/astral-sh/ruff/pull/19539))
+- \[`pyupgrade`\] Fix `UP030` to avoid modifying double curly braces in format strings ([#19378](https://github.com/astral-sh/ruff/pull/19378))
+- \[`refurb`\] Ignore decorated functions for `FURB118` ([#19339](https://github.com/astral-sh/ruff/pull/19339))
+- \[`refurb`\] Mark `int` and `bool` cases for `Decimal.from_float` as safe fixes (`FURB164`) ([#19468](https://github.com/astral-sh/ruff/pull/19468))
+- \[`ruff`\] Fix `RUF033` for named default expressions ([#19115](https://github.com/astral-sh/ruff/pull/19115))
+
+### Rule changes
+
+- \[`flake8-blind-except`\] Change `BLE001` to permit `logging.critical(..., exc_info=True)` ([#19520](https://github.com/astral-sh/ruff/pull/19520))
+
+### Performance
+
+- Add support for specifying minimum dots in detected string imports ([#19538](https://github.com/astral-sh/ruff/pull/19538))
+
+## 0.12.7
+
+This is a follow-up release to 0.12.6. Because of an issue in the package metadata, 0.12.6 failed to publish fully to PyPI and has been yanked. Similarly, there is no GitHub release or Git tag for 0.12.6. The contents of the 0.12.7 release are identical to 0.12.6, except for the updated metadata.
+
+## 0.12.8
+
+### Preview features
+
+- \[`flake8-use-pathlib`\] Expand `PTH201` to check all `PurePath` subclasses ([#19440](https://github.com/astral-sh/ruff/pull/19440))
+
+### Bug fixes
+
+- \[`flake8-blind-except`\] Change `BLE001` to correctly parse exception tuples ([#19747](https://github.com/astral-sh/ruff/pull/19747))
+- \[`flake8-errmsg`\] Exclude `typing.cast` from `EM101` ([#19656](https://github.com/astral-sh/ruff/pull/19656))
+- \[`flake8-simplify`\] Fix raw string handling in `SIM905` for embedded quotes ([#19591](https://github.com/astral-sh/ruff/pull/19591))
+- \[`flake8-import-conventions`\] Avoid false positives for NFKC-normalized `__debug__` import aliases in `ICN001` ([#19411](https://github.com/astral-sh/ruff/pull/19411))
+- \[`isort`\] Fix syntax error after docstring ending with backslash (`I002`) ([#19505](https://github.com/astral-sh/ruff/pull/19505))
+- \[`pylint`\] Mark `PLC0207` fixes as unsafe when `*args` unpacking is present ([#19679](https://github.com/astral-sh/ruff/pull/19679))
+- \[`pyupgrade`\] Prevent infinite loop with `I002` (`UP010`, `UP035`) ([#19413](https://github.com/astral-sh/ruff/pull/19413))
+- \[`ruff`\] Parenthesize generator expressions in f-strings (`RUF010`) ([#19434](https://github.com/astral-sh/ruff/pull/19434))
+
+### Rule changes
+
+- \[`eradicate`\] Don't flag `pyrefly` pragmas as unused code (`ERA001`) ([#19731](https://github.com/astral-sh/ruff/pull/19731))
+
+### Documentation
+
+- Replace "associative" with "commutative" in docs for `RUF036` ([#19706](https://github.com/astral-sh/ruff/pull/19706))
+- Fix copy and line separator colors in dark mode ([#19630](https://github.com/astral-sh/ruff/pull/19630))
+- Fix link to `typing` documentation ([#19648](https://github.com/astral-sh/ruff/pull/19648))
+- \[`refurb`\] Make more examples error out-of-the-box ([#19695](https://github.com/astral-sh/ruff/pull/19695),[#19673](https://github.com/astral-sh/ruff/pull/19673),[#19672](https://github.com/astral-sh/ruff/pull/19672))
+
+### Other changes
+
+- Include column numbers in GitLab output format ([#19708](https://github.com/astral-sh/ruff/pull/19708))
+- Always expand tabs to four spaces in diagnostics ([#19618](https://github.com/astral-sh/ruff/pull/19618))
+- Update pre-commit's `ruff` id ([#19654](https://github.com/astral-sh/ruff/pull/19654))
+
+## 0.12.9
+
+### Preview features
+
+- \[`airflow`\] Add check for `airflow.secrets.cache.SecretCache` (`AIR301`) ([#17707](https://github.com/astral-sh/ruff/pull/17707))
+- \[`ruff`\] Offer a safe fix for multi-digit zeros (`RUF064`) ([#19847](https://github.com/astral-sh/ruff/pull/19847))
+
+### Bug fixes
+
+- \[`flake8-blind-except`\] Fix `BLE001` false-positive on `raise ... from None` ([#19755](https://github.com/astral-sh/ruff/pull/19755))
+- \[`flake8-comprehensions`\] Fix false positive for `C420` with attribute, subscript, or slice assignment targets ([#19513](https://github.com/astral-sh/ruff/pull/19513))
+- \[`flake8-simplify`\] Fix handling of U+001C..U+001F whitespace (`SIM905`) ([#19849](https://github.com/astral-sh/ruff/pull/19849))
+
+### Rule changes
+
+- \[`pylint`\] Use lowercase hex characters to match the formatter (`PLE2513`) ([#19808](https://github.com/astral-sh/ruff/pull/19808))
+
+### Documentation
+
+- Fix `lint.future-annotations` link ([#19876](https://github.com/astral-sh/ruff/pull/19876))
+
+### Other changes
+
+- Build `riscv64` binaries for release ([#19819](https://github.com/astral-sh/ruff/pull/19819))
+
+- Add rule code to error description in GitLab output ([#19896](https://github.com/astral-sh/ruff/pull/19896))
+
+- Improve rendering of the `full` output format ([#19415](https://github.com/astral-sh/ruff/pull/19415))
+
+    Below is an example diff for [`F401`](https://docs.astral.sh/ruff/rules/unused-import/):
+
+    ```diff
+    -unused.py:8:19: F401 [*] `pathlib` imported but unused
+    +F401 [*] `pathlib` imported but unused
+    +  --> unused.py:8:19
+        |
+      7 | # Unused, _not_ marked as required (due to the alias).
+      8 | import pathlib as non_alias
+    -   |                   ^^^^^^^^^ F401
+    +   |                   ^^^^^^^^^
+      9 |
+     10 | # Unused, marked as required.
+        |
+    -   = help: Remove unused import: `pathlib`
+    +help: Remove unused import: `pathlib`
+    ```
+
+    For now, the primary difference is the movement of the filename, line number, and column information to a second line in the header. This new representation will allow us to make further additions to Ruff's diagnostics, such as adding sub-diagnostics and multiple annotations to the same snippet.
+
+## 0.12.10
+
+### Preview features
+
+- \[`flake8-simplify`\] Implement fix for `maxsplit` without separator (`SIM905`) ([#19851](https://github.com/astral-sh/ruff/pull/19851))
+- \[`flake8-use-pathlib`\] Add fixes for `PTH102` and `PTH103` ([#19514](https://github.com/astral-sh/ruff/pull/19514))
+
+### Bug fixes
+
+- \[`isort`\] Handle multiple continuation lines after module docstring (`I002`) ([#19818](https://github.com/astral-sh/ruff/pull/19818))
+- \[`pyupgrade`\] Avoid reporting `__future__` features as unnecessary when they are used (`UP010`) ([#19769](https://github.com/astral-sh/ruff/pull/19769))
+- \[`pyupgrade`\] Handle nested `Optional`s (`UP045`) ([#19770](https://github.com/astral-sh/ruff/pull/19770))
+
+### Rule changes
+
+- \[`pycodestyle`\] Make `E731` fix unsafe instead of display-only for class assignments ([#19700](https://github.com/astral-sh/ruff/pull/19700))
+- \[`pyflakes`\] Add secondary annotation showing previous definition (`F811`) ([#19900](https://github.com/astral-sh/ruff/pull/19900))
+
+### Documentation
+
+- Fix description of global config file discovery strategy ([#19188](https://github.com/astral-sh/ruff/pull/19188))
+- Update outdated links to <https://typing.python.org/en/latest/source/stubs.html> ([#19992](https://github.com/astral-sh/ruff/pull/19992))
+- \[`flake8-annotations`\] Remove unused import in example (`ANN401`) ([#20000](https://github.com/astral-sh/ruff/pull/20000))
+
+## 0.12.11
+
+### Preview features
+
+- \[`airflow`\] Extend `AIR311` and `AIR312` rules ([#20082](https://github.com/astral-sh/ruff/pull/20082))
+- \[`airflow`\] Replace wrong path `airflow.io.storage` with `airflow.io.store` (`AIR311`) ([#20081](https://github.com/astral-sh/ruff/pull/20081))
+- \[`flake8-async`\] Implement `blocking-http-call-httpx-in-async-function` (`ASYNC212`) ([#20091](https://github.com/astral-sh/ruff/pull/20091))
+- \[`flake8-logging-format`\] Add auto-fix for f-string logging calls (`G004`) ([#19303](https://github.com/astral-sh/ruff/pull/19303))
+- \[`flake8-use-pathlib`\] Add autofix for `PTH211` ([#20009](https://github.com/astral-sh/ruff/pull/20009))
+- \[`flake8-use-pathlib`\] Make `PTH100` fix unsafe because it can change behavior ([#20100](https://github.com/astral-sh/ruff/pull/20100))
+
+### Bug fixes
+
+- \[`pyflakes`, `pylint`\] Fix false positives caused by `__class__` cell handling (`F841`, `PLE0117`) ([#20048](https://github.com/astral-sh/ruff/pull/20048))
+- \[`pyflakes`\] Fix `allowed-unused-imports` matching for top-level modules (`F401`) ([#20115](https://github.com/astral-sh/ruff/pull/20115))
+- \[`ruff`\] Fix false positive for t-strings in `default-factory-kwarg` (`RUF026`) ([#20032](https://github.com/astral-sh/ruff/pull/20032))
+- \[`ruff`\] Preserve relative whitespace in multi-line expressions (`RUF033`) ([#19647](https://github.com/astral-sh/ruff/pull/19647))
+
+### Rule changes
+
+- \[`ruff`\] Handle empty t-strings in `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#20045](https://github.com/astral-sh/ruff/pull/20045))
+
+### Documentation
+
+- Fix incorrect `D413` links in docstrings convention FAQ ([#20089](https://github.com/astral-sh/ruff/pull/20089))
+- \[`flake8-use-pathlib`\] Update links to the table showing the correspondence between `os` and `pathlib` ([#20103](https://github.com/astral-sh/ruff/pull/20103))
+
+## 0.12.12
+
+### Preview features
+
+- Show fixes by default ([#19919](https://github.com/astral-sh/ruff/pull/19919))
+- \[`airflow`\] Convert `DatasetOrTimeSchedule(datasets=...)` to `AssetOrTimeSchedule(assets=...)` (`AIR311`) ([#20202](https://github.com/astral-sh/ruff/pull/20202))
+- \[`airflow`\] Improve the `AIR002` error message ([#20173](https://github.com/astral-sh/ruff/pull/20173))
+- \[`airflow`\] Move `airflow.operators.postgres_operator.Mapping` from `AIR302` to `AIR301` ([#20172](https://github.com/astral-sh/ruff/pull/20172))
+- \[`flake8-async`\] Implement `blocking-input` rule (`ASYNC250`) ([#20122](https://github.com/astral-sh/ruff/pull/20122))
+- \[`flake8-use-pathlib`\] Make `PTH119` and `PTH120` fixes unsafe because they can change behavior ([#20118](https://github.com/astral-sh/ruff/pull/20118))
+- \[`pylint`\] Add U+061C to `PLE2502` ([#20106](https://github.com/astral-sh/ruff/pull/20106))
+- \[`ruff`\] Fix false negative for empty f-strings in `deque` calls (`RUF037`) ([#20109](https://github.com/astral-sh/ruff/pull/20109))
+
+### Bug fixes
+
+- Less confidently mark f-strings as empty when inferring truthiness ([#20152](https://github.com/astral-sh/ruff/pull/20152))
+- \[`fastapi`\] Fix false positive for paths with spaces around parameters (`FAST003`) ([#20077](https://github.com/astral-sh/ruff/pull/20077))
+- \[`flake8-comprehensions`\] Skip `C417` when lambda contains `yield`/`yield from` ([#20201](https://github.com/astral-sh/ruff/pull/20201))
+- \[`perflint`\] Handle tuples in dictionary comprehensions (`PERF403`) ([#19934](https://github.com/astral-sh/ruff/pull/19934))
+
+### Rule changes
+
+- \[`pycodestyle`\] Preserve return type annotation for `ParamSpec` (`E731`) ([#20108](https://github.com/astral-sh/ruff/pull/20108))
+
+### Documentation
+
+- Add fix safety sections to docs ([#17490](https://github.com/astral-sh/ruff/pull/17490),[#17499](https://github.com/astral-sh/ruff/pull/17499))
+
+[`boolean-type-hint-positional-argument`]: https://docs.astral.sh/ruff/rules/boolean-type-hint-positional-argument
+[`collection-literal-concatenation`]: https://docs.astral.sh/ruff/rules/collection-literal-concatenation
+[`if-else-block-instead-of-if-exp`]: https://docs.astral.sh/ruff/rules/if-else-block-instead-of-if-exp
+[`non-pep604-annotation-optional`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional
+[`non-pep604-annotation-union`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-union
+[`readlines-in-for`]: https://docs.astral.sh/ruff/rules/readlines-in-for
+[`subprocess-without-shell-equals-true`]: https://docs.astral.sh/ruff/rules/subprocess-without-shell-equals-true
+[`unused-noqa`]: https://docs.astral.sh/ruff/rules/unused-noqa
diff --git a/changelogs/0.13.x.md b/changelogs/0.13.x.md
new file mode 100644
index 0000000000..e242bc5478
--- /dev/null
+++ b/changelogs/0.13.x.md
@@ -0,0 +1,263 @@
+# Changelog 0.13.x
+
+## 0.13.0
+
+Check out the [blog post](https://astral.sh/blog/ruff-v0.13.0) for a migration
+guide and overview of the changes!
+
+### Breaking changes
+
+- **Several rules can now add `from __future__ import annotations` automatically**
+
+    `TC001`, `TC002`, `TC003`, `RUF013`, and `UP037` now add `from __future__ import annotations` as part of their fixes when the
+    `lint.future-annotations` setting is enabled. This allows the rules to move
+    more imports into `TYPE_CHECKING` blocks (`TC001`, `TC002`, and `TC003`),
+    use PEP 604 union syntax on Python versions before 3.10 (`RUF013`), and
+    unquote more annotations (`UP037`).
+
+- **Full module paths are now used to verify first-party modules**
+
+    Ruff now checks that the full path to a module exists on disk before
+    categorizing it as a first-party import. This change makes first-party
+    import detection more accurate, helping to avoid false positives on local
+    directories with the same name as a third-party dependency, for example. See
+    the [FAQ
+    section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) on import categorization for more details.
+
+- **Deprecated rules must now be selected by exact rule code**
+
+    Ruff will no longer activate deprecated rules selected by their group name
+    or prefix. As noted below, the two remaining deprecated rules were also
+    removed in this release, so this won't affect any current rules, but it will
+    still affect any deprecations in the future.
+
+- **The deprecated macOS configuration directory fallback has been removed**
+
+    Ruff will no longer look for a user-level configuration file at
+    `~/Library/Application Support/ruff/ruff.toml` on macOS. This feature was
+    deprecated in v0.5 in favor of using the [XDG
+    specification](https://specifications.freedesktop.org/basedir-spec/latest/)
+    (usually resolving to `~/.config/ruff/ruff.toml`), like on Linux. The
+    fallback and accompanying deprecation warning have now been removed.
+
+### Removed Rules
+
+The following rules have been removed:
+
+- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name) (`PD901`)
+- [`non-pep604-isinstance`](https://docs.astral.sh/ruff/rules/non-pep604-isinstance) (`UP038`)
+
+### Stabilization
+
+The following rules have been stabilized and are no longer in preview:
+
+- [`airflow-dag-no-schedule-argument`](https://docs.astral.sh/ruff/rules/airflow-dag-no-schedule-argument)
+    (`AIR002`)
+- [`airflow3-removal`](https://docs.astral.sh/ruff/rules/airflow3-removal) (`AIR301`)
+- [`airflow3-moved-to-provider`](https://docs.astral.sh/ruff/rules/airflow3-moved-to-provider)
+    (`AIR302`)
+- [`airflow3-suggested-update`](https://docs.astral.sh/ruff/rules/airflow3-suggested-update)
+    (`AIR311`)
+- [`airflow3-suggested-to-move-to-provider`](https://docs.astral.sh/ruff/rules/airflow3-suggested-to-move-to-provider)
+    (`AIR312`)
+- [`long-sleep-not-forever`](https://docs.astral.sh/ruff/rules/long-sleep-not-forever) (`ASYNC116`)
+- [`f-string-number-format`](https://docs.astral.sh/ruff/rules/f-string-number-format) (`FURB116`)
+- [`os-symlink`](https://docs.astral.sh/ruff/rules/os-symlink) (`PTH211`)
+- [`generic-not-last-base-class`](https://docs.astral.sh/ruff/rules/generic-not-last-base-class)
+    (`PYI059`)
+- [`redundant-none-literal`](https://docs.astral.sh/ruff/rules/redundant-none-literal) (`PYI061`)
+- [`pytest-raises-ambiguous-pattern`](https://docs.astral.sh/ruff/rules/pytest-raises-ambiguous-pattern)
+    (`RUF043`)
+- [`unused-unpacked-variable`](https://docs.astral.sh/ruff/rules/unused-unpacked-variable)
+    (`RUF059`)
+- [`useless-class-metaclass-type`](https://docs.astral.sh/ruff/rules/useless-class-metaclass-type)
+    (`UP050`)
+
+The following behaviors have been stabilized:
+
+- [`assert-raises-exception`](https://docs.astral.sh/ruff/rules/assert-raises-exception) (`B017`)
+    now checks for direct calls to `unittest.TestCase.assert_raises` and `pytest.raises` instead of
+    only the context manager forms.
+- [`missing-trailing-comma`](https://docs.astral.sh/ruff/rules/missing-trailing-comma) (`COM812`)
+    and [`prohibited-trailing-comma`](https://docs.astral.sh/ruff/rules/prohibited-trailing-comma)
+    (`COM819`) now check for trailing commas in PEP 695 type parameter lists.
+- [`raw-string-in-exception`](https://docs.astral.sh/ruff/rules/raw-string-in-exception) (`EM101`)
+    now also checks for byte strings in exception messages.
+- [`invalid-mock-access`](https://docs.astral.sh/ruff/rules/invalid-mock-access) (`PGH005`) now
+    checks for `AsyncMock` methods like `not_awaited` in addition to the synchronous variants.
+- [`useless-import-alias`](https://docs.astral.sh/ruff/rules/useless-import-alias) (`PLC0414`) no
+    longer applies to `__init__.py` files, where it conflicted with one of the suggested fixes for
+    [`unused-import`](https://docs.astral.sh/ruff/rules/unused-import) (`F401`).
+- [`bidirectional-unicode`](https://docs.astral.sh/ruff/rules/bidirectional-unicode) (`PLE2502`) now
+    also checks for U+061C (Arabic Letter Mark).
+- The fix for
+    [`multiple-with-statements`](https://docs.astral.sh/ruff/rules/multiple-with-statements)
+    (`SIM117`) is now marked as always safe.
+
+### Preview features
+
+- \[`pyupgrade`\] Enable `UP043` in stub files ([#20027](https://github.com/astral-sh/ruff/pull/20027))
+
+### Bug fixes
+
+- \[`pyupgrade`\] Apply `UP008` only when the `__class__` cell exists ([#19424](https://github.com/astral-sh/ruff/pull/19424))
+- \[`ruff`\] Fix empty f-string detection in `in-empty-collection` (`RUF060`) ([#20249](https://github.com/astral-sh/ruff/pull/20249))
+
+### Server
+
+- Add support for using uv as an alternative formatter backend ([#19665](https://github.com/astral-sh/ruff/pull/19665))
+
+### Documentation
+
+- \[`pep8-naming`\] Fix formatting of `__all__` (`N816`) ([#20301](https://github.com/astral-sh/ruff/pull/20301))
+
+## 0.13.1
+
+Released on 2025-09-18.
+
+### Preview features
+
+- \[`flake8-simplify`\] Detect unnecessary `None` default for additional key expression types (`SIM910`) ([#20343](https://github.com/astral-sh/ruff/pull/20343))
+- \[`flake8-use-pathlib`\] Add fix for `PTH123` ([#20169](https://github.com/astral-sh/ruff/pull/20169))
+- \[`flake8-use-pathlib`\] Fix `PTH101`, `PTH104`, `PTH105`, `PTH121` fixes ([#20143](https://github.com/astral-sh/ruff/pull/20143))
+- \[`flake8-use-pathlib`\] Make `PTH111` fix unsafe because it can change behavior ([#20215](https://github.com/astral-sh/ruff/pull/20215))
+- \[`pycodestyle`\] Fix `E301` to only trigger for functions immediately within a class ([#19768](https://github.com/astral-sh/ruff/pull/19768))
+- \[`refurb`\] Mark `single-item-membership-test` fix as always unsafe (`FURB171`) ([#20279](https://github.com/astral-sh/ruff/pull/20279))
+
+### Bug fixes
+
+- Handle t-strings for token-based rules and suppression comments ([#20357](https://github.com/astral-sh/ruff/pull/20357))
+- \[`flake8-bandit`\] Fix truthiness: dict-only `**` displays not truthy for `shell` (`S602`, `S604`, `S609`) ([#20177](https://github.com/astral-sh/ruff/pull/20177))
+- \[`flake8-simplify`\] Fix diagnostic to show correct method name for `str.rsplit` calls (`SIM905`) ([#20459](https://github.com/astral-sh/ruff/pull/20459))
+- \[`flynt`\] Use triple quotes for joined raw strings with newlines (`FLY002`) ([#20197](https://github.com/astral-sh/ruff/pull/20197))
+- \[`pyupgrade`\] Fix false positive when class name is shadowed by local variable (`UP008`) ([#20427](https://github.com/astral-sh/ruff/pull/20427))
+- \[`pyupgrade`\] Prevent infinite loop with `I002` and `UP026` ([#20327](https://github.com/astral-sh/ruff/pull/20327))
+- \[`ruff`\] Recognize t-strings, generators, and lambdas in `invalid-index-type` (`RUF016`) ([#20213](https://github.com/astral-sh/ruff/pull/20213))
+
+### Rule changes
+
+- \[`RUF102`\] Respect rule redirects in invalid rule code detection ([#20245](https://github.com/astral-sh/ruff/pull/20245))
+- \[`flake8-bugbear`\] Mark the fix for `unreliable-callable-check` as always unsafe (`B004`) ([#20318](https://github.com/astral-sh/ruff/pull/20318))
+- \[`ruff`\] Allow dataclass attribute value instantiation from nested frozen dataclass (`RUF009`) ([#20352](https://github.com/astral-sh/ruff/pull/20352))
+
+### CLI
+
+- Add fixes to `output-format=sarif` ([#20300](https://github.com/astral-sh/ruff/pull/20300))
+- Treat panics as fatal diagnostics, sort panics last ([#20258](https://github.com/astral-sh/ruff/pull/20258))
+
+### Documentation
+
+- \[`ruff`\] Add `analyze.string-imports-min-dots` to settings ([#20375](https://github.com/astral-sh/ruff/pull/20375))
+- Update README.md with Albumentations new repository URL ([#20415](https://github.com/astral-sh/ruff/pull/20415))
+
+### Other changes
+
+- Bump MSRV to Rust 1.88 ([#20470](https://github.com/astral-sh/ruff/pull/20470))
+- Enable inline noqa for multiline strings in playground ([#20442](https://github.com/astral-sh/ruff/pull/20442))
+
+### Contributors
+
+- [@chirizxc](https://github.com/chirizxc)
+- [@danparizher](https://github.com/danparizher)
+- [@IDrokin117](https://github.com/IDrokin117)
+- [@amyreese](https://github.com/amyreese)
+- [@AlexWaygood](https://github.com/AlexWaygood)
+- [@dylwil3](https://github.com/dylwil3)
+- [@njhearp](https://github.com/njhearp)
+- [@woodruffw](https://github.com/woodruffw)
+- [@dcreager](https://github.com/dcreager)
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@BurntSushi](https://github.com/BurntSushi)
+- [@salahelfarissi](https://github.com/salahelfarissi)
+- [@MichaReiser](https://github.com/MichaReiser)
+
+## 0.13.2
+
+Released on 2025-09-25.
+
+### Preview features
+
+- \[`flake8-async`\] Implement `blocking-path-method` (`ASYNC240`) ([#20264](https://github.com/astral-sh/ruff/pull/20264))
+- \[`flake8-bugbear`\] Implement `map-without-explicit-strict` (`B912`) ([#20429](https://github.com/astral-sh/ruff/pull/20429))
+- \[`flake8-bultins`\] Detect class-scope builtin shadowing in decorators, default args, and attribute initializers (`A003`) ([#20178](https://github.com/astral-sh/ruff/pull/20178))
+- \[`ruff`\] Implement `logging-eager-conversion` (`RUF065`) ([#19942](https://github.com/astral-sh/ruff/pull/19942))
+- Include `.pyw` files by default when linting and formatting ([#20458](https://github.com/astral-sh/ruff/pull/20458))
+
+### Bug fixes
+
+- Deduplicate input paths ([#20105](https://github.com/astral-sh/ruff/pull/20105))
+- \[`flake8-comprehensions`\] Preserve trailing commas for single-element lists (`C409`) ([#19571](https://github.com/astral-sh/ruff/pull/19571))
+- \[`flake8-pyi`\] Avoid syntax error from conflict with `PIE790` (`PYI021`) ([#20010](https://github.com/astral-sh/ruff/pull/20010))
+- \[`flake8-simplify`\] Correct fix for positive `maxsplit` without separator (`SIM905`) ([#20056](https://github.com/astral-sh/ruff/pull/20056))
+- \[`pyupgrade`\] Fix `UP008` not to apply when `__class__` is a local variable ([#20497](https://github.com/astral-sh/ruff/pull/20497))
+- \[`ruff`\] Fix `B004` to skip invalid `hasattr`/`getattr` calls ([#20486](https://github.com/astral-sh/ruff/pull/20486))
+- \[`ruff`\] Replace `-nan` with `nan` when using the value to construct a `Decimal` (`FURB164` ) ([#20391](https://github.com/astral-sh/ruff/pull/20391))
+
+### Documentation
+
+- Add 'Finding ways to help' to CONTRIBUTING.md ([#20567](https://github.com/astral-sh/ruff/pull/20567))
+- Update import path to `ruff-wasm-web` ([#20539](https://github.com/astral-sh/ruff/pull/20539))
+- \[`flake8-bandit`\] Clarify the supported hashing functions (`S324`) ([#20534](https://github.com/astral-sh/ruff/pull/20534))
+
+### Other changes
+
+- \[`playground`\] Allow hover quick fixes to appear for overlapping diagnostics ([#20527](https://github.com/astral-sh/ruff/pull/20527))
+- \[`playground`\] Fix non‑BMP code point handling in quick fixes and markers ([#20526](https://github.com/astral-sh/ruff/pull/20526))
+
+### Contributors
+
+- [@BurntSushi](https://github.com/BurntSushi)
+- [@mtshiba](https://github.com/mtshiba)
+- [@second-ed](https://github.com/second-ed)
+- [@danparizher](https://github.com/danparizher)
+- [@ShikChen](https://github.com/ShikChen)
+- [@PieterCK](https://github.com/PieterCK)
+- [@GDYendell](https://github.com/GDYendell)
+- [@RazerM](https://github.com/RazerM)
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@amyreese](https://github.com/amyreese)
+- [@ntbre](https://github.com/ntBre)
+- [@MichaReiser](https://github.com/MichaReiser)
+
+## 0.13.3
+
+Released on 2025-10-02.
+
+### Preview features
+
+- Display diffs for `ruff format --check` and add support for different output formats ([#20443](https://github.com/astral-sh/ruff/pull/20443))
+- \[`pyflakes`\] Handle some common submodule import situations for `unused-import` (`F401`) ([#20200](https://github.com/astral-sh/ruff/pull/20200))
+- \[`ruff`\] Do not flag `%r` + `repr()` combinations (`RUF065`) ([#20600](https://github.com/astral-sh/ruff/pull/20600))
+
+### Bug fixes
+
+- \[`cli`\] Add conflict between `--add-noqa` and `--diff` options ([#20642](https://github.com/astral-sh/ruff/pull/20642))
+- \[`pylint`\] Exempt required imports from `PLR0402` ([#20381](https://github.com/astral-sh/ruff/pull/20381))
+- \[`pylint`\] Fix missing `max-nested-blocks` in settings display ([#20574](https://github.com/astral-sh/ruff/pull/20574))
+- \[`pyupgrade`\] Prevent infinite loop with `I002` and `UP026` ([#20634](https://github.com/astral-sh/ruff/pull/20634))
+
+### Rule changes
+
+- \[`flake8-simplify`\] Improve help message clarity (`SIM105`) ([#20548](https://github.com/astral-sh/ruff/pull/20548))
+
+### Documentation
+
+- Add the *The Basics* title back to CONTRIBUTING.md ([#20624](https://github.com/astral-sh/ruff/pull/20624))
+- Fixed documentation for try_consider_else ([#20587](https://github.com/astral-sh/ruff/pull/20587))
+- \[`isort`\] Clarify dependency between `order-by-type` and `case-sensitive` settings ([#20559](https://github.com/astral-sh/ruff/pull/20559))
+- \[`pylint`\] Clarify fix safety to include left-hand hashability (`PLR6201`) ([#20518](https://github.com/astral-sh/ruff/pull/20518))
+
+### Other changes
+
+- \[`playground`\] Fix quick fixes for empty ranges in playground ([#20599](https://github.com/astral-sh/ruff/pull/20599))
+
+### Contributors
+
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@ntBre](https://github.com/ntBre)
+- [@dylwil3](https://github.com/dylwil3)
+- [@MichaReiser](https://github.com/MichaReiser)
+- [@danparizher](https://github.com/danparizher)
+- [@LilMonk](https://github.com/LilMonk)
+- [@mgiovani](https://github.com/mgiovani)
+- [@IDrokin117](https://github.com/IDrokin117)
diff --git a/clippy.toml b/clippy.toml
index 539d63305b..c11a535aad 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -24,3 +24,20 @@ ignore-interior-mutability = [
     # The expression is read-only.
     "ruff_python_ast::hashable::HashableExpr",
 ]
+
+disallowed-methods = [
+    { path = "std::env::var", reason = "Use System::env_var instead in ty crates" },
+    { path = "std::env::current_dir", reason = "Use System::current_directory instead in ty crates" },
+    { path = "std::fs::read_to_string", reason = "Use System::read_to_string instead in ty crates" },
+    { path = "std::fs::metadata", reason = "Use System::path_metadata instead in ty crates" },
+    { path = "std::fs::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
+    { path = "dunce::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
+    { path = "std::fs::read_dir", reason = "Use System::read_directory instead in ty crates" },
+    { path = "std::fs::write", reason = "Use WritableSystem::write_file instead in ty crates" },
+    { path = "std::fs::create_dir_all", reason = "Use WritableSystem::create_directory_all instead in ty crates" },
+    { path = "std::fs::File::create_new", reason = "Use WritableSystem::create_new_file instead in ty crates" },
+    # Path methods that have System trait equivalents
+    { path = "std::path::Path::exists", reason = "Use System::path_exists instead in ty crates" },
+    { path = "std::path::Path::is_dir", reason = "Use System::is_directory instead in ty crates" },
+    { path = "std::path::Path::is_file", reason = "Use System::is_file instead in ty crates" },
+]
diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml
index 20b44648a3..c1511d805b 100644
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.9"
+version = "0.14.2"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -72,6 +72,7 @@ dunce = { workspace = true }
 indoc = { workspace = true }
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }
+ruff_python_trivia = { workspace = true }
 tempfile = { workspace = true }
 test-case = { workspace = true }
 
diff --git a/crates/ruff/src/args.rs b/crates/ruff/src/args.rs
index aef5280955..eb4bcd0a92 100644
--- a/crates/ruff/src/args.rs
+++ b/crates/ruff/src/args.rs
@@ -416,6 +416,7 @@ pub struct CheckCommand {
         conflicts_with = "stdin_filename",
         conflicts_with = "watch",
         conflicts_with = "fix",
+        conflicts_with = "diff",
     )]
     pub add_noqa: bool,
     /// See the files Ruff will be run against with the current settings.
@@ -537,6 +538,14 @@ pub struct FormatCommand {
     /// Exit with a non-zero status code if any files were modified via format, even if all files were formatted successfully.
     #[arg(long, help_heading = "Miscellaneous", alias = "exit-non-zero-on-fix")]
     pub exit_non_zero_on_format: bool,
+
+    /// Output serialization format for violations, when used with `--check`.
+    /// The default serialization format is "full".
+    ///
+    /// Note that this option is currently only respected in preview mode. A warning will be emitted
+    /// if this flag is used on stable.
+    #[arg(long, value_enum, env = "RUFF_OUTPUT_FORMAT")]
+    pub output_format: Option<OutputFormat>,
 }
 
 #[derive(Copy, Clone, Debug, clap::Parser)]
@@ -784,6 +793,7 @@ impl FormatCommand {
             target_version: self.target_version.map(ast::PythonVersion::from),
             cache_dir: self.cache_dir,
             extension: self.extension,
+            output_format: self.output_format,
             ..ExplicitConfigOverrides::default()
         };
 
diff --git a/crates/ruff/src/commands/check.rs b/crates/ruff/src/commands/check.rs
index 0c0ed5995b..dcdd0f9b18 100644
--- a/crates/ruff/src/commands/check.rs
+++ b/crates/ruff/src/commands/check.rs
@@ -6,9 +6,10 @@ use std::time::Instant;
 use anyhow::Result;
 use colored::Colorize;
 use ignore::Error;
-use log::{debug, error, warn};
+use log::{debug, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
+use ruff_linter::message::create_panic_diagnostic;
 use rustc_hash::FxHashMap;
 
 use ruff_db::diagnostic::Diagnostic;
@@ -193,21 +194,8 @@ fn lint_path(
     match result {
         Ok(inner) => inner,
         Err(error) => {
-            let message = r"This indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-...with the relevant file contents, the `pyproject.toml` settings, and the following stack trace, we'd be very appreciative!
-";
-
-            error!(
-                "{}{}{} {message}\n{error}",
-                "Panicked while linting ".bold(),
-                fs::relativize_path(path).bold(),
-                ":".bold()
-            );
-
-            Ok(Diagnostics::default())
+            let diagnostic = create_panic_diagnostic(&error, Some(path));
+            Ok(Diagnostics::new(vec![diagnostic], FxHashMap::default()))
         }
     }
 }
@@ -222,7 +210,8 @@ mod test {
     use rustc_hash::FxHashMap;
     use tempfile::TempDir;
 
-    use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
+    use ruff_db::diagnostic::{DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics};
+    use ruff_linter::message::EmitterContext;
     use ruff_linter::registry::Rule;
     use ruff_linter::settings::types::UnsafeFixes;
     use ruff_linter::settings::{LinterSettings, flags};
@@ -275,19 +264,16 @@ mod test {
             UnsafeFixes::Enabled,
         )
         .unwrap();
-        let mut output = Vec::new();
 
-        TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_color(false)
-            .emit(
-                &mut output,
-                &diagnostics.inner,
-                &EmitterContext::new(&FxHashMap::default()),
-            )
-            .unwrap();
-
-        let messages = String::from_utf8(output).unwrap();
+        let config = DisplayDiagnosticConfig::default()
+            .format(DiagnosticFormat::Concise)
+            .hide_severity(true);
+        let messages = DisplayDiagnostics::new(
+            &EmitterContext::new(&FxHashMap::default()),
+            &config,
+            &diagnostics.inner,
+        )
+        .to_string();
 
         insta::with_settings!({
             omit_expression => true,
diff --git a/crates/ruff/src/commands/format.rs b/crates/ruff/src/commands/format.rs
index 1006346008..1f79e59339 100644
--- a/crates/ruff/src/commands/format.rs
+++ b/crates/ruff/src/commands/format.rs
@@ -11,13 +11,19 @@ use itertools::Itertools;
 use log::{error, warn};
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use ruff_db::diagnostic::{
+    Annotation, Diagnostic, DiagnosticId, DisplayDiagnosticConfig, Severity, Span,
+};
+use ruff_linter::message::{EmitterContext, create_panic_diagnostic, render_diagnostics};
+use ruff_linter::settings::types::OutputFormat;
+use ruff_notebook::NotebookIndex;
 use ruff_python_parser::ParseError;
-use rustc_hash::FxHashSet;
+use rustc_hash::{FxHashMap, FxHashSet};
 use thiserror::Error;
 use tracing::debug;
 
 use ruff_db::panic::{PanicError, catch_unwind};
-use ruff_diagnostics::SourceMap;
+use ruff_diagnostics::{Edit, Fix, SourceMap};
 use ruff_linter::fs;
 use ruff_linter::logging::{DisplayParseError, LogLevel};
 use ruff_linter::package::PackageRoot;
@@ -27,14 +33,15 @@ use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_python_formatter::{FormatModuleError, QuoteStyle, format_module_source, format_range};
-use ruff_source_file::LineIndex;
+use ruff_source_file::{LineIndex, LineRanges, OneIndexed, SourceFileBuilder};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use ruff_workspace::FormatterSettings;
-use ruff_workspace::resolver::{ResolvedFile, Resolver, match_exclusion, python_files_in_path};
+use ruff_workspace::resolver::{
+    PyprojectConfig, ResolvedFile, Resolver, match_exclusion, python_files_in_path,
+};
 
 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
 use crate::cache::{Cache, FileCacheKey, PackageCacheMap, PackageCaches};
-use crate::resolve::resolve;
 use crate::{ExitStatus, resolve_default_files};
 
 #[derive(Debug, Copy, Clone, is_macro::Is)]
@@ -63,11 +70,14 @@ impl FormatMode {
 pub(crate) fn format(
     cli: FormatArguments,
     config_arguments: &ConfigArguments,
+    pyproject_config: &PyprojectConfig,
 ) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
     let mode = FormatMode::from_cli(&cli);
     let files = resolve_default_files(cli.files, false);
-    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(&files, pyproject_config, config_arguments)?;
+
+    let output_format = pyproject_config.settings.output_format;
+    let preview = pyproject_config.settings.formatter.preview;
 
     if paths.is_empty() {
         warn_user_once!("No Python files found under the given path(s)");
@@ -184,17 +194,26 @@ pub(crate) fn format(
     caches.persist()?;
 
     // Report on any errors.
-    errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));
+    //
+    // We only convert errors to `Diagnostic`s in `Check` mode with preview enabled, otherwise we
+    // fall back on printing simple messages.
+    if !(preview.is_enabled() && mode.is_check()) {
+        errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));
 
-    for error in &errors {
-        error!("{error}");
+        for error in &errors {
+            error!("{error}");
+        }
     }
 
     let results = FormatResults::new(results.as_slice(), mode);
     match mode {
         FormatMode::Write => {}
         FormatMode::Check => {
-            results.write_changed(&mut stdout().lock())?;
+            if preview.is_enabled() {
+                results.write_changed_preview(&mut stdout().lock(), output_format, &errors)?;
+            } else {
+                results.write_changed(&mut stdout().lock())?;
+            }
         }
         FormatMode::Diff => {
             results.write_diff(&mut stdout().lock())?;
@@ -206,7 +225,7 @@ pub(crate) fn format(
         if mode.is_diff() {
             // Allow piping the diff to e.g. a file by writing the summary to stderr
             results.write_summary(&mut stderr().lock())?;
-        } else {
+        } else if !preview.is_enabled() || output_format.is_human_readable() {
             results.write_summary(&mut stdout().lock())?;
         }
     }
@@ -295,8 +314,7 @@ pub(crate) fn format_path(
 
                 FormatResult::Formatted
             }
-            FormatMode::Check => FormatResult::Formatted,
-            FormatMode::Diff => FormatResult::Diff {
+            FormatMode::Check | FormatMode::Diff => FormatResult::Diff {
                 unformatted,
                 formatted,
             },
@@ -329,7 +347,7 @@ pub(crate) enum FormattedSource {
 impl From<FormattedSource> for FormatResult {
     fn from(value: FormattedSource) -> Self {
         match value {
-            FormattedSource::Formatted(_) => FormatResult::Formatted,
+            FormattedSource::Formatted { .. } => FormatResult::Formatted,
             FormattedSource::Unchanged => FormatResult::Unchanged,
         }
     }
@@ -477,10 +495,10 @@ pub(crate) fn format_source(
 /// The result of an individual formatting operation.
 #[derive(Debug, Clone, is_macro::Is)]
 pub(crate) enum FormatResult {
-    /// The file was formatted.
+    /// The file was formatted and written back to disk.
     Formatted,
 
-    /// The file was formatted, [`SourceKind`] contains the formatted code
+    /// The file needs to be formatted, as the `formatted` and `unformatted` contents differ.
     Diff {
         unformatted: SourceKind,
         formatted: SourceKind,
@@ -552,7 +570,7 @@ impl<'a> FormatResults<'a> {
             .results
             .iter()
             .filter_map(|result| {
-                if result.result.is_formatted() {
+                if result.result.is_diff() {
                     Some(result.path.as_path())
                 } else {
                     None
@@ -566,6 +584,30 @@ impl<'a> FormatResults<'a> {
         Ok(())
     }
 
+    /// Write a list of the files that would be changed and any errors to the given writer.
+    fn write_changed_preview(
+        &self,
+        f: &mut impl Write,
+        output_format: OutputFormat,
+        errors: &[FormatCommandError],
+    ) -> io::Result<()> {
+        let mut notebook_index = FxHashMap::default();
+        let diagnostics: Vec<_> = errors
+            .iter()
+            .map(Diagnostic::from)
+            .chain(self.to_diagnostics(&mut notebook_index))
+            .sorted_unstable_by(Diagnostic::ruff_start_ordering)
+            .collect();
+
+        let context = EmitterContext::new(&notebook_index);
+        let config = DisplayDiagnosticConfig::default()
+            .hide_severity(true)
+            .show_fix_diff(true)
+            .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize());
+
+        render_diagnostics(f, output_format, config, &context, &diagnostics)
+    }
+
     /// Write a summary of the formatting results to the given writer.
     fn write_summary(&self, f: &mut impl Write) -> io::Result<()> {
         // Compute the number of changed and unchanged files.
@@ -628,6 +670,155 @@ impl<'a> FormatResults<'a> {
             Ok(())
         }
     }
+
+    /// Convert formatted files into [`Diagnostic`]s.
+    fn to_diagnostics(
+        &self,
+        notebook_index: &mut FxHashMap<String, NotebookIndex>,
+    ) -> impl Iterator<Item = Diagnostic> {
+        /// The number of unmodified context lines rendered in diffs.
+        ///
+        /// Note that this should be kept in sync with the argument to `TextDiff::grouped_ops` in
+        /// the diff rendering in `ruff_db` (currently 3). The `similar` crate uses two times that
+        /// argument as a cutoff for rendering unmodified lines.
+        const CONTEXT_LINES: u32 = 6;
+
+        self.results.iter().filter_map(|result| {
+            let (unformatted, formatted) = match &result.result {
+                FormatResult::Skipped | FormatResult::Unchanged => return None,
+                FormatResult::Diff {
+                    unformatted,
+                    formatted,
+                } => (unformatted, formatted),
+                FormatResult::Formatted => {
+                    debug_assert!(
+                        false,
+                        "Expected `FormatResult::Diff` for changed files in check mode"
+                    );
+                    return None;
+                }
+            };
+
+            let mut diagnostic = Diagnostic::new(
+                DiagnosticId::Unformatted,
+                Severity::Error,
+                "File would be reformatted",
+            );
+
+            // Locate the first and last characters that differ to use as the diagnostic
+            // range and to narrow the `Edit` range.
+            let modified_range = ModifiedRange::new(unformatted, formatted);
+
+            let path = result.path.to_string_lossy();
+            // For scripts, this is a single `Edit` using the `ModifiedRange` above, but notebook
+            // edits must be split by cell in order to render them as diffs.
+            //
+            // We also attempt to estimate the line number width for aligning the
+            // annotate-snippets header. This is only an estimate because we don't actually know
+            // if the maximum line number present in the document will be rendered as part of
+            // the diff, either as a changed line or as an unchanged context line. For
+            // notebooks, we refine our estimate by checking the number of lines in each cell
+            // individually, otherwise we could use `formatted.source_code().count_lines(...)`
+            // in both cases.
+            let (fix, line_count) = if let SourceKind::IpyNotebook(formatted) = formatted
+                && let SourceKind::IpyNotebook(unformatted) = unformatted
+            {
+                notebook_index.insert(path.to_string(), unformatted.index().clone());
+
+                let mut edits = formatted
+                    .cell_offsets()
+                    .ranges()
+                    .zip(unformatted.cell_offsets().ranges())
+                    .filter_map(|(formatted_range, unformatted_range)| {
+                        // Filter out cells that weren't modified. We use `intersect` instead of
+                        // `contains_range` because the full modified range might start or end in
+                        // the middle of a cell:
+                        //
+                        // ```
+                        // | cell 1 | cell 2 | cell 3 |
+                        //     |----------------| modified range
+                        // ```
+                        //
+                        // The intersection will be `Some` for all three cells in this case.
+                        if modified_range
+                            .unformatted
+                            .intersect(unformatted_range)
+                            .is_some()
+                        {
+                            let formatted = &formatted.source_code()[formatted_range];
+                            let edit = if formatted.is_empty() {
+                                Edit::range_deletion(unformatted_range)
+                            } else {
+                                Edit::range_replacement(formatted.to_string(), unformatted_range)
+                            };
+                            Some(edit)
+                        } else {
+                            None
+                        }
+                    });
+
+                let fix = Fix::safe_edits(
+                    edits
+                        .next()
+                        .expect("Formatted files must have at least one edit"),
+                    edits,
+                );
+                let source = formatted.source_code();
+                let line_count = formatted
+                    .cell_offsets()
+                    .ranges()
+                    .filter_map(|range| {
+                        if modified_range.formatted.contains_range(range) {
+                            Some(source.count_lines(range))
+                        } else {
+                            None
+                        }
+                    })
+                    .max()
+                    .unwrap_or_default();
+                (fix, line_count)
+            } else {
+                let formatted_code = &formatted.source_code()[modified_range.formatted];
+                let edit = if formatted_code.is_empty() {
+                    Edit::range_deletion(modified_range.unformatted)
+                } else {
+                    Edit::range_replacement(formatted_code.to_string(), modified_range.unformatted)
+                };
+                let fix = Fix::safe_edit(edit);
+                let line_count = formatted
+                    .source_code()
+                    .count_lines(TextRange::up_to(modified_range.formatted.end()));
+                (fix, line_count)
+            };
+
+            let source_file = SourceFileBuilder::new(path, unformatted.source_code()).finish();
+            let span = Span::from(source_file).with_range(modified_range.unformatted);
+            let mut annotation = Annotation::primary(span);
+            annotation.hide_snippet(true);
+            diagnostic.annotate(annotation);
+            diagnostic.set_fix(fix);
+
+            // TODO(brent) this offset is a hack to get the header of the diagnostic message, which
+            // is rendered by our fork of `annotate-snippets`, to align with our manually-rendered
+            // diff. `annotate-snippets` computes the alignment of the arrow in the header based on
+            // the maximum line number width in its rendered snippet. However, we don't have a
+            // reasonable range to underline in an annotation, so we don't send `annotate-snippets`
+            // a snippet to measure. If we commit to staying on our fork, a more robust way of
+            // handling this would be to move the diff rendering in
+            // `ruff_db::diagnostic::render::full` into `annotate-snippets`, likely as another
+            // `DisplayLine` variant and update the `lineno_width` calculation in
+            // `DisplayList::fmt`. That would handle this offset "automatically."
+            let line_count = (line_count + CONTEXT_LINES).min(
+                formatted
+                    .source_code()
+                    .count_lines(TextRange::up_to(formatted.source_code().text_len())),
+            );
+            let lines = OneIndexed::new(line_count as usize).unwrap_or_default();
+            diagnostic.set_header_offset(lines.digits().get());
+
+            Some(diagnostic)
+        })
+    }
 }
 
 /// An error that can occur while formatting a set of files.
@@ -639,7 +830,6 @@ pub(crate) enum FormatCommandError {
     Read(Option<PathBuf>, SourceError),
     Format(Option<PathBuf>, FormatModuleError),
     Write(Option<PathBuf>, SourceError),
-    Diff(Option<PathBuf>, io::Error),
     RangeFormatNotebook(Option<PathBuf>),
 }
 
@@ -658,12 +848,53 @@ impl FormatCommandError {
             | Self::Read(path, _)
             | Self::Format(path, _)
             | Self::Write(path, _)
-            | Self::Diff(path, _)
             | Self::RangeFormatNotebook(path) => path.as_deref(),
         }
     }
 }
 
+impl From<&FormatCommandError> for Diagnostic {
+    fn from(error: &FormatCommandError) -> Self {
+        let annotation = error.path().map(|path| {
+            let file = SourceFileBuilder::new(path.to_string_lossy(), "").finish();
+            let span = Span::from(file);
+            let mut annotation = Annotation::primary(span);
+            annotation.hide_snippet(true);
+            annotation
+        });
+
+        let mut diagnostic = match error {
+            FormatCommandError::Ignore(error) => {
+                Diagnostic::new(DiagnosticId::Io, Severity::Error, error)
+            }
+            FormatCommandError::Parse(display_parse_error) => Diagnostic::new(
+                DiagnosticId::InvalidSyntax,
+                Severity::Error,
+                &display_parse_error.error().error,
+            ),
+            FormatCommandError::Panic(path, panic_error) => {
+                return create_panic_diagnostic(panic_error, path.as_deref());
+            }
+            FormatCommandError::Read(_, source_error)
+            | FormatCommandError::Write(_, source_error) => {
+                Diagnostic::new(DiagnosticId::Io, Severity::Error, source_error)
+            }
+            FormatCommandError::Format(_, format_module_error) => format_module_error.into(),
+            FormatCommandError::RangeFormatNotebook(_) => Diagnostic::new(
+                DiagnosticId::InvalidCliOption,
+                Severity::Error,
+                "Range formatting isn't supported for notebooks.",
+            ),
+        };
+
+        if let Some(annotation) = annotation {
+            diagnostic.annotate(annotation);
+        }
+
+        diagnostic
+    }
+}
+
 impl Display for FormatCommandError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -731,23 +962,6 @@ impl Display for FormatCommandError {
                     write!(f, "{header} {err}", header = "Failed to format:".bold())
                 }
             }
-            Self::Diff(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to generate diff for ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{header} {err}",
-                        header = "Failed to generate diff:".bold(),
-                    )
-                }
-            }
             Self::RangeFormatNotebook(path) => {
                 if let Some(path) = path {
                     write!(
@@ -792,6 +1006,54 @@ impl Display for FormatCommandError {
     }
 }
 
+#[derive(Debug)]
+struct ModifiedRange {
+    unformatted: TextRange,
+    formatted: TextRange,
+}
+
+impl ModifiedRange {
+    /// Determine the range that differs between `unformatted` and `formatted`.
+    ///
+    /// If the two inputs are equal, the returned ranges will be empty.
+    fn new(unformatted: &SourceKind, formatted: &SourceKind) -> Self {
+        let unformatted = unformatted.source_code();
+        let formatted = formatted.source_code();
+
+        let mut prefix_length = TextSize::ZERO;
+        for (unformatted, formatted) in unformatted.chars().zip(formatted.chars()) {
+            if unformatted != formatted {
+                break;
+            }
+            prefix_length += unformatted.text_len();
+        }
+
+        // For the ends of the ranges, track the length of the common suffix and then subtract that
+        // from each total text length. Unlike for `start`, the character offsets are very unlikely
+        // to be equal, so they need to be treated separately.
+        let mut suffix_length = TextSize::ZERO;
+        for (old, new) in unformatted[prefix_length.to_usize()..]
+            .chars()
+            .rev()
+            .zip(formatted[prefix_length.to_usize()..].chars().rev())
+        {
+            if old != new {
+                break;
+            }
+            suffix_length += old.text_len();
+        }
+
+        let unformatted_range =
+            TextRange::new(prefix_length, unformatted.text_len() - suffix_length);
+        let formatted_range = TextRange::new(prefix_length, formatted.text_len() - suffix_length);
+
+        Self {
+            unformatted: unformatted_range,
+            formatted: formatted_range,
+        }
+    }
+}
+
 pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
     // First, collect all rules that are incompatible regardless of the linter-specific settings.
     let mut incompatible_rules = FxHashSet::default();
@@ -963,3 +1225,144 @@ pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::io;
+    use std::ops::Range;
+    use std::path::PathBuf;
+
+    use ignore::Error;
+    use insta::assert_snapshot;
+
+    use ruff_db::panic::catch_unwind;
+    use ruff_linter::logging::DisplayParseError;
+    use ruff_linter::source_kind::{SourceError, SourceKind};
+    use ruff_python_formatter::FormatModuleError;
+    use ruff_python_parser::{ParseError, ParseErrorType};
+    use ruff_text_size::{TextRange, TextSize};
+    use test_case::test_case;
+
+    use crate::commands::format::{FormatCommandError, FormatMode, FormatResults, ModifiedRange};
+
+    #[test]
+    fn error_diagnostics() -> anyhow::Result<()> {
+        let path = PathBuf::from("test.py");
+        let source_kind = SourceKind::Python("1".to_string());
+
+        let panic_error = catch_unwind(|| {
+            panic!("Test panic for FormatCommandError");
+        })
+        .unwrap_err();
+
+        let errors = [
+            FormatCommandError::Ignore(Error::WithPath {
+                path: path.clone(),
+                err: Box::new(Error::Io(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "Permission denied",
+                ))),
+            }),
+            FormatCommandError::Parse(DisplayParseError::from_source_kind(
+                ParseError {
+                    error: ParseErrorType::UnexpectedIndentation,
+                    location: TextRange::default(),
+                },
+                Some(path.clone()),
+                &source_kind,
+            )),
+            FormatCommandError::Panic(Some(path.clone()), Box::new(panic_error)),
+            FormatCommandError::Read(
+                Some(path.clone()),
+                SourceError::Io(io::Error::new(io::ErrorKind::NotFound, "File not found")),
+            ),
+            FormatCommandError::Format(
+                Some(path.clone()),
+                FormatModuleError::ParseError(ParseError {
+                    error: ParseErrorType::EmptySlice,
+                    location: TextRange::default(),
+                }),
+            ),
+            FormatCommandError::Write(
+                Some(path.clone()),
+                SourceError::Io(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "Cannot write to file",
+                )),
+            ),
+            FormatCommandError::RangeFormatNotebook(Some(path)),
+        ];
+
+        let results = FormatResults::new(&[], FormatMode::Check);
+        let mut buf = Vec::new();
+        results.write_changed_preview(
+            &mut buf,
+            ruff_linter::settings::types::OutputFormat::Full,
+            &errors,
+        )?;
+
+        let mut settings = insta::Settings::clone_current();
+        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
+        let _s = settings.bind_to_scope();
+
+        assert_snapshot!(str::from_utf8(&buf)?, @r"
+        io: test.py: Permission denied
+        --> test.py:1:1
+
+        invalid-syntax: Unexpected indentation
+        --> test.py:1:1
+
+        io: File not found
+        --> test.py:1:1
+
+        internal-error: Expected index or slice expression
+        --> test.py:1:1
+
+        io: Cannot write to file
+        --> test.py:1:1
+
+        invalid-cli-option: Range formatting isn't supported for notebooks.
+        --> test.py:1:1
+
+        panic: Panicked at <location> when checking `test.py`: `Test panic for FormatCommandError`
+        --> test.py:1:1
+        info: This indicates a bug in Ruff.
+        info: If you could open an issue at https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, we'd be very appreciative!
+        info: run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information
+        ");
+
+        Ok(())
+    }
+
+    #[test_case("abcdef", "abcXYdef", 3..3, 3..5; "insertion")]
+    #[test_case("abcXYdef", "abcdef", 3..5, 3..3; "deletion")]
+    #[test_case("abcXdef", "abcYdef", 3..4, 3..4; "modification")]
+    #[test_case("abc", "abcX", 3..3, 3..4; "strict_prefix")]
+    #[test_case("", "", 0..0, 0..0; "empty")]
+    #[test_case("abc", "abc", 3..3, 3..3; "equal")]
+    fn modified_range(
+        unformatted: &str,
+        formatted: &str,
+        expect_unformatted: Range<u32>,
+        expect_formatted: Range<u32>,
+    ) {
+        let mr = ModifiedRange::new(
+            &SourceKind::Python(unformatted.to_string()),
+            &SourceKind::Python(formatted.to_string()),
+        );
+        assert_eq!(
+            mr.unformatted,
+            TextRange::new(
+                TextSize::new(expect_unformatted.start),
+                TextSize::new(expect_unformatted.end)
+            )
+        );
+        assert_eq!(
+            mr.formatted,
+            TextRange::new(
+                TextSize::new(expect_formatted.start),
+                TextSize::new(expect_formatted.end)
+            )
+        );
+    }
+}
diff --git a/crates/ruff/src/commands/format_stdin.rs b/crates/ruff/src/commands/format_stdin.rs
index f5b8ea6c60..015f32fba9 100644
--- a/crates/ruff/src/commands/format_stdin.rs
+++ b/crates/ruff/src/commands/format_stdin.rs
@@ -4,10 +4,10 @@ use std::path::Path;
 use anyhow::Result;
 use log::error;
 
-use ruff_linter::source_kind::SourceKind;
+use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::FormatterSettings;
-use ruff_workspace::resolver::{Resolver, match_exclusion, python_file_at_path};
+use ruff_workspace::resolver::{PyprojectConfig, Resolver, match_exclusion, python_file_at_path};
 
 use crate::ExitStatus;
 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
@@ -15,17 +15,15 @@ use crate::commands::format::{
     FormatCommandError, FormatMode, FormatResult, FormattedSource, format_source,
     warn_incompatible_formatter_settings,
 };
-use crate::resolve::resolve;
 use crate::stdin::{parrot_stdin, read_from_stdin};
 
 /// Run the formatter over a single file, read from `stdin`.
 pub(crate) fn format_stdin(
     cli: &FormatArguments,
     config_arguments: &ConfigArguments,
+    pyproject_config: &PyprojectConfig,
 ) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
-
-    let mut resolver = Resolver::new(&pyproject_config);
+    let mut resolver = Resolver::new(pyproject_config);
     warn_incompatible_formatter_settings(&resolver);
 
     let mode = FormatMode::from_cli(cli);
@@ -124,7 +122,9 @@ fn format_source_code(
                     "{}",
                     source_kind.diff(formatted, path).unwrap()
                 )
-                .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
+                .map_err(|err| {
+                    FormatCommandError::Write(path.map(Path::to_path_buf), SourceError::Io(err))
+                })?;
             }
         },
         FormattedSource::Unchanged => {
diff --git a/crates/ruff/src/commands/rule.rs b/crates/ruff/src/commands/rule.rs
index adc761b3e5..366ee56703 100644
--- a/crates/ruff/src/commands/rule.rs
+++ b/crates/ruff/src/commands/rule.rs
@@ -7,6 +7,7 @@ use serde::{Serialize, Serializer};
 use strum::IntoEnumIterator;
 
 use ruff_linter::FixAvailability;
+use ruff_linter::codes::RuleGroup;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 
 use crate::args::HelpFormat;
@@ -19,9 +20,12 @@ struct Explanation<'a> {
     summary: &'a str,
     message_formats: &'a [&'a str],
     fix: String,
+    fix_availability: FixAvailability,
     #[expect(clippy::struct_field_names)]
     explanation: Option<&'a str>,
     preview: bool,
+    status: RuleGroup,
+    source_location: SourceLocation,
 }
 
 impl<'a> Explanation<'a> {
@@ -36,8 +40,14 @@ impl<'a> Explanation<'a> {
             summary: rule.message_formats()[0],
             message_formats: rule.message_formats(),
             fix,
+            fix_availability: rule.fixable(),
             explanation: rule.explanation(),
             preview: rule.is_preview(),
+            status: rule.group(),
+            source_location: SourceLocation {
+                file: rule.file(),
+                line: rule.line(),
+            },
         }
     }
 }
@@ -122,3 +132,14 @@ pub(crate) fn rules(format: HelpFormat) -> Result<()> {
     }
     Ok(())
 }
+
+/// The location of the rule's implementation in the Ruff source tree, relative to the repository
+/// root.
+///
+/// For most rules this will point to the `#[derive(ViolationMetadata)]` line above the rule's
+/// struct.
+#[derive(Serialize)]
+struct SourceLocation {
+    file: &'static str,
+    line: u32,
+}
diff --git a/crates/ruff/src/diagnostics.rs b/crates/ruff/src/diagnostics.rs
index 3376133ed7..ef7623145a 100644
--- a/crates/ruff/src/diagnostics.rs
+++ b/crates/ruff/src/diagnostics.rs
@@ -13,7 +13,6 @@ use log::{debug, warn};
 use ruff_db::diagnostic::Diagnostic;
 use ruff_linter::codes::Rule;
 use ruff_linter::linter::{FixTable, FixerResult, LinterResult, ParseSource, lint_fix, lint_only};
-use ruff_linter::message::create_syntax_error_diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 use ruff_linter::settings::types::UnsafeFixes;
@@ -103,11 +102,7 @@ impl Diagnostics {
                 let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
                 let dummy = SourceFileBuilder::new(name, "").finish();
                 Self::new(
-                    vec![create_syntax_error_diagnostic(
-                        dummy,
-                        err,
-                        TextRange::default(),
-                    )],
+                    vec![Diagnostic::invalid_syntax(dummy, err, TextRange::default())],
                     FxHashMap::default(),
                 )
             }
diff --git a/crates/ruff/src/lib.rs b/crates/ruff/src/lib.rs
index e91bb0354e..3bd457de8c 100644
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -9,10 +9,11 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use clap::CommandFactory;
 use colored::Colorize;
-use log::warn;
+use log::{error, warn};
 use notify::{RecursiveMode, Watcher, recommended_watcher};
 
 use args::{GlobalConfigArgs, ServerCommand};
+use ruff_db::diagnostic::{Diagnostic, Severity};
 use ruff_linter::logging::{LogLevel, set_up_logging};
 use ruff_linter::settings::flags::FixMode;
 use ruff_linter::settings::types::OutputFormat;
@@ -204,12 +205,18 @@ pub fn run(
 }
 
 fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
+    let cli_output_format_set = args.output_format.is_some();
     let (cli, config_arguments) = args.partition(global_options)?;
-
+    let pyproject_config = resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
+    if cli_output_format_set && !pyproject_config.settings.formatter.preview.is_enabled() {
+        warn_user_once!(
+            "The --output-format flag for the formatter is unstable and requires preview mode to use."
+        );
+    }
     if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
-        commands::format_stdin::format_stdin(&cli, &config_arguments)
+        commands::format_stdin::format_stdin(&cli, &config_arguments, &pyproject_config)
     } else {
-        commands::format::format(cli, &config_arguments)
+        commands::format::format(cli, &config_arguments, &pyproject_config)
     }
 }
 
@@ -444,6 +451,27 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
         }
 
         if !cli.exit_zero {
+            let max_severity = diagnostics
+                .inner
+                .iter()
+                .map(Diagnostic::severity)
+                .max()
+                .unwrap_or(Severity::Info);
+            if max_severity.is_fatal() {
+                // When a panic/fatal error is reported, prompt the user to open an issue on github.
+                // Diagnostics with severity `fatal` will be sorted to the bottom, and printing the
+                // message here instead of attaching it to the diagnostic ensures that we only print
+                // it once instead of repeating it for each diagnostic. Prints to stderr to prevent
+                // the message from being captured by tools parsing the normal output.
+                let message = "Panic during linting indicates a bug in Ruff. If you could open an issue at:
+
+https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
+
+...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
+";
+                error!("{message}");
+                return Ok(ExitStatus::Error);
+            }
             if cli.diff {
                 // If we're printing a diff, we always want to exit non-zero if there are
                 // any fixable violations (since we've printed the diff, but not applied the
diff --git a/crates/ruff/src/main.rs b/crates/ruff/src/main.rs
index 62e4f85b6e..5ec78c9e25 100644
--- a/crates/ruff/src/main.rs
+++ b/crates/ruff/src/main.rs
@@ -1,6 +1,7 @@
 use std::io::Write;
 use std::process::ExitCode;
 
+use anyhow::Context;
 use clap::Parser;
 use colored::Colorize;
 
@@ -39,39 +40,46 @@ pub fn main() -> ExitCode {
     }
 
     let args = wild::args_os();
-    let args = argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX).unwrap();
+    let args = match argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX)
+        .context("Failed to read CLI arguments from files")
+    {
+        Ok(args) => args,
+        Err(err) => return report_error(&err),
+    };
 
     let args = Args::parse_from(args);
 
     match run(args) {
         Ok(code) => code.into(),
-        Err(err) => {
-            {
-                // Exit "gracefully" on broken pipe errors.
-                //
-                // See: https://github.com/BurntSushi/ripgrep/blob/bf63fe8f258afc09bae6caa48f0ae35eaf115005/crates/core/main.rs#L47C1-L61C14
-                for cause in err.chain() {
-                    if let Some(ioerr) = cause.downcast_ref::<std::io::Error>() {
-                        if ioerr.kind() == std::io::ErrorKind::BrokenPipe {
-                            return ExitCode::from(0);
-                        }
-                    }
-                }
-
-                // Use `writeln` instead of `eprintln` to avoid panicking when the stderr pipe is broken.
-                let mut stderr = std::io::stderr().lock();
-
-                // This communicates that this isn't a linter error but ruff itself hard-errored for
-                // some reason (e.g. failed to resolve the configuration)
-                writeln!(stderr, "{}", "ruff failed".red().bold()).ok();
-                // Currently we generally only see one error, but e.g. with io errors when resolving
-                // the configuration it is help to chain errors ("resolving configuration failed" ->
-                // "failed to read file: subdir/pyproject.toml")
-                for cause in err.chain() {
-                    writeln!(stderr, "  {} {cause}", "Cause:".bold()).ok();
-                }
-            }
-            ExitStatus::Error.into()
-        }
+        Err(err) => report_error(&err),
     }
 }
+
+fn report_error(err: &anyhow::Error) -> ExitCode {
+    {
+        // Exit "gracefully" on broken pipe errors.
+        //
+        // See: https://github.com/BurntSushi/ripgrep/blob/bf63fe8f258afc09bae6caa48f0ae35eaf115005/crates/core/main.rs#L47C1-L61C14
+        for cause in err.chain() {
+            if let Some(ioerr) = cause.downcast_ref::<std::io::Error>() {
+                if ioerr.kind() == std::io::ErrorKind::BrokenPipe {
+                    return ExitCode::from(0);
+                }
+            }
+        }
+
+        // Use `writeln` instead of `eprintln` to avoid panicking when the stderr pipe is broken.
+        let mut stderr = std::io::stderr().lock();
+
+        // This communicates that this isn't a linter error but ruff itself hard-errored for
+        // some reason (e.g. failed to resolve the configuration)
+        writeln!(stderr, "{}", "ruff failed".red().bold()).ok();
+        // Currently we generally only see one error, but e.g. with io errors when resolving
+        // the configuration it is help to chain errors ("resolving configuration failed" ->
+        // "failed to read file: subdir/pyproject.toml")
+        for cause in err.chain() {
+            writeln!(stderr, "  {} {cause}", "Cause:".bold()).ok();
+        }
+    }
+    ExitStatus::Error.into()
+}
diff --git a/crates/ruff/src/printer.rs b/crates/ruff/src/printer.rs
index 186c481890..5c1b1d0e6a 100644
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -14,10 +14,7 @@ use ruff_db::diagnostic::{
 };
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
-use ruff_linter::message::{
-    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, SarifEmitter,
-    TextEmitter,
-};
+use ruff_linter::message::{EmitterContext, render_diagnostics};
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
 use ruff_linter::settings::types::{OutputFormat, UnsafeFixes};
@@ -31,8 +28,6 @@ bitflags! {
         const SHOW_VIOLATIONS = 1 << 0;
         /// Whether to show a summary of the fixed violations when emitting diagnostics.
         const SHOW_FIX_SUMMARY = 1 << 1;
-        /// Whether to show a diff of each fixed violation when emitting diagnostics.
-        const SHOW_FIX_DIFF = 1 << 2;
     }
 }
 
@@ -229,92 +224,28 @@ impl Printer {
         let context = EmitterContext::new(&diagnostics.notebook_indexes);
         let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
 
-        match self.format {
-            OutputFormat::Json => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Json)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Rdjson => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Rdjson)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::JsonLines => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::JsonLines)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Junit => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Junit)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Concise | OutputFormat::Full => {
-                TextEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
-                    .with_show_source(self.format == OutputFormat::Full)
-                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .with_preview(preview)
-                    .emit(writer, &diagnostics.inner, &context)?;
+        let config = DisplayDiagnosticConfig::default()
+            .preview(preview)
+            .hide_severity(true)
+            .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
+            .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
+            .with_fix_applicability(self.unsafe_fixes.required_applicability())
+            .show_fix_diff(preview);
 
-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
+        render_diagnostics(writer, self.format, config, &context, &diagnostics.inner)?;
+
+        if matches!(
+            self.format,
+            OutputFormat::Full | OutputFormat::Concise | OutputFormat::Grouped
+        ) {
+            if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
+                if !diagnostics.fixed.is_empty() {
+                    writeln!(writer)?;
+                    print_fix_summary(writer, &diagnostics.fixed)?;
+                    writeln!(writer)?;
                 }
-
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            OutputFormat::Grouped => {
-                GroupedEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .emit(writer, &diagnostics.inner, &context)?;
-
-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
-                }
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            OutputFormat::Github => {
-                GithubEmitter.emit(writer, &diagnostics.inner, &context)?;
-            }
-            OutputFormat::Gitlab => {
-                GitlabEmitter::default().emit(writer, &diagnostics.inner, &context)?;
-            }
-            OutputFormat::Pylint => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Pylint)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Azure => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Azure)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.inner, &context)?;
             }
+            self.write_summary_text(writer, diagnostics)?;
         }
 
         writer.flush()?;
@@ -458,11 +389,22 @@ impl Printer {
             }
 
             let context = EmitterContext::new(&diagnostics.notebook_indexes);
-            TextEmitter::default()
+            let format = if preview {
+                DiagnosticFormat::Full
+            } else {
+                DiagnosticFormat::Concise
+            };
+            let config = DisplayDiagnosticConfig::default()
+                .hide_severity(true)
+                .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
                 .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                .with_show_source(preview)
-                .with_unsafe_fixes(self.unsafe_fixes)
-                .emit(writer, &diagnostics.inner, &context)?;
+                .format(format)
+                .with_fix_applicability(self.unsafe_fixes.required_applicability());
+            write!(
+                writer,
+                "{}",
+                DisplayDiagnostics::new(&context, &config, &diagnostics.inner)
+            )?;
         }
         writer.flush()?;
 
diff --git a/crates/ruff/tests/analyze_graph.rs b/crates/ruff/tests/analyze_graph.rs
index 4d70bf6270..2c300029ea 100644
--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -246,6 +246,59 @@ fn string_detection() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn string_detection_from_config() -> Result<()> {
+    let tempdir = TempDir::new()?;
+
+    let root = ChildPath::new(tempdir.path());
+
+    // Configure string import detection with a lower min-dots via ruff.toml
+    root.child("ruff.toml").write_str(indoc::indoc! {r#"
+        [analyze]
+        detect-string-imports = true
+        string-imports-min-dots = 1
+    "#})?;
+
+    root.child("ruff").child("__init__.py").write_str("")?;
+    root.child("ruff")
+        .child("a.py")
+        .write_str(indoc::indoc! {r#"
+        import ruff.b
+    "#})?;
+    root.child("ruff")
+        .child("b.py")
+        .write_str(indoc::indoc! {r#"
+        import importlib
+
+        importlib.import_module("ruff.c")
+    "#})?;
+    root.child("ruff").child("c.py").write_str("")?;
+
+    insta::with_settings!({
+        filters => INSTA_FILTERS.to_vec(),
+    }, {
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "ruff/__init__.py": [],
+          "ruff/a.py": [
+            "ruff/b.py"
+          ],
+          "ruff/b.py": [
+            "ruff/c.py"
+          ],
+          "ruff/c.py": []
+        }
+
+        ----- stderr -----
+        "#);
+    });
+
+    Ok(())
+}
+
 #[test]
 fn globs() -> Result<()> {
     let tempdir = TempDir::new()?;
diff --git a/crates/ruff/tests/format.rs b/crates/ruff/tests/cli/format.rs
similarity index 67%
rename from crates/ruff/tests/format.rs
rename to crates/ruff/tests/cli/format.rs
index 35443daa23..7ab9e59f26 100644
--- a/crates/ruff/tests/format.rs
+++ b/crates/ruff/tests/cli/format.rs
@@ -2,24 +2,17 @@
 
 use std::fs;
 use std::path::Path;
-use std::process::Command;
-use std::str;
 
 use anyhow::Result;
-use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use regex::escape;
-use tempfile::TempDir;
+use insta_cmd::assert_cmd_snapshot;
 
-const BIN_NAME: &str = "ruff";
-
-fn tempdir_filter(tempdir: &TempDir) -> String {
-    format!(r"{}\\?/?", escape(tempdir.path().to_str().unwrap()))
-}
+use super::{CliTest, tempdir_filter};
 
 #[test]
-fn default_options() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py"])
+fn default_options() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -46,26 +39,19 @@ if condition:
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
 fn default_files() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    fs::write(
-        tempdir.path().join("foo.py"),
-        r#"
-foo =     "needs formatting"
-"#,
-    )?;
-    fs::write(
-        tempdir.path().join("bar.py"),
-        r#"
-bar =     "needs formatting"
-"#,
-    )?;
+    let test = CliTest::with_files([
+        ("foo.py", r#"foo =     "needs formatting""#),
+        ("bar.py", r#"bar =     "needs formatting""#),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--no-cache", "--check"]).current_dir(tempdir.path()), @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .arg("--check"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -80,9 +66,10 @@ bar =     "needs formatting"
 }
 
 #[test]
-fn format_warn_stdin_filename_with_files() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "foo.py"])
+fn format_warn_stdin_filename_with_files() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "foo.py"])
         .arg("foo.py")
         .pass_stdin("foo =     1"), @r"
     success: true
@@ -93,12 +80,14 @@ fn format_warn_stdin_filename_with_files() {
     ----- stderr -----
     warning: Ignoring file foo.py in favor of standard input.
     ");
+    Ok(())
 }
 
 #[test]
-fn nonexistent_config_file() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config", "foo.toml", "."]), @r"
+fn nonexistent_config_file() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--config", "foo.toml", "."]), @r"
     success: false
     exit_code: 2
     ----- stdout -----
@@ -115,12 +104,14 @@ fn nonexistent_config_file() {
 
     For more information, try '--help'.
     ");
+    Ok(())
 }
 
 #[test]
-fn config_override_rejected_if_invalid_toml() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config", "foo = bar", "."]), @r"
+fn config_override_rejected_if_invalid_toml() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--config", "foo = bar", "."]), @r"
     success: false
     exit_code: 2
     ----- stdout -----
@@ -142,84 +133,69 @@ fn config_override_rejected_if_invalid_toml() {
 
     For more information, try '--help'.
     ");
+    Ok(())
 }
 
 #[test]
 fn too_many_config_files() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    let ruff2_dot_toml = tempdir.path().join("ruff2.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    fs::File::create(&ruff2_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
+    let test = CliTest::with_files([("ruff.toml", ""), ("ruff2.toml", "")])?;
+
+    assert_cmd_snapshot!(test.format_command()
         .arg("--config")
-        .arg(&ruff_dot_toml)
+        .arg("ruff.toml")
         .arg("--config")
-        .arg(&ruff2_dot_toml)
+        .arg("ruff2.toml")
         .arg("."), @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
+    success: false
+    exit_code: 2
+    ----- stdout -----
 
-        ----- stderr -----
-        ruff failed
-          Cause: You cannot specify more than one configuration file on the command line.
+    ----- stderr -----
+    ruff failed
+      Cause: You cannot specify more than one configuration file on the command line.
 
-          tip: remove either `--config=[TMP]/ruff.toml` or `--config=[TMP]/ruff2.toml`.
-               For more information, try `--help`.
-        ");
-    });
+      tip: remove either `--config=ruff.toml` or `--config=ruff2.toml`.
+           For more information, try `--help`.
+    ");
     Ok(())
 }
 
 #[test]
 fn config_file_and_isolated() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
-        .arg("--config")
-        .arg(&ruff_dot_toml)
+    let test = CliTest::with_file("ruff.toml", "")?;
+
+    assert_cmd_snapshot!(test.format_command()
         .arg("--isolated")
+        .arg("--config")
+        .arg("ruff.toml")
         .arg("."), @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
+    success: false
+    exit_code: 2
+    ----- stdout -----
 
-        ----- stderr -----
-        ruff failed
-          Cause: The argument `--config=[TMP]/ruff.toml` cannot be used with `--isolated`
+    ----- stderr -----
+    ruff failed
+      Cause: The argument `--config=ruff.toml` cannot be used with `--isolated`
 
-          tip: You cannot specify a configuration file and also specify `--isolated`,
-               as `--isolated` causes ruff to ignore all configuration files.
-               For more information, try `--help`.
-        ");
-    });
+      tip: You cannot specify a configuration file and also specify `--isolated`,
+           as `--isolated` causes ruff to ignore all configuration files.
+           For more information, try `--help`.
+    ");
     Ok(())
 }
 
 #[test]
 fn config_override_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(&ruff_toml, "line-length = 100")?;
+    let test = CliTest::with_file("ruff.toml", "line-length = 70")?;
+
     let fixture = r#"
 def foo():
     print("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong string")
 
     "#;
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
+    assert_cmd_snapshot!(test.format_command()
         .arg("--config")
-        .arg(&ruff_toml)
+        .arg("ruff.toml")
         // This overrides the long line length set in the config file
         .args(["--config", "line-length=80"])
         .arg("-")
@@ -239,18 +215,16 @@ def foo():
 
 #[test]
 fn config_doubly_overridden_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(&ruff_toml, "line-length = 70")?;
+    let test = CliTest::with_file("ruff.toml", "line-length = 70")?;
+
     let fixture = r#"
 def foo():
     print("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong string")
 
     "#;
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
+    assert_cmd_snapshot!(test.format_command()
         .arg("--config")
-        .arg(&ruff_toml)
+        .arg("ruff.toml")
         // This overrides the long line length set in the config file...
         .args(["--config", "line-length=80"])
         // ...but this overrides them both:
@@ -270,10 +244,8 @@ def foo():
 
 #[test]
 fn format_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r#"
 indent-width = 8
 line-length = 84
@@ -286,9 +258,9 @@ line-ending = "cr-lf"
 "#,
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -319,10 +291,8 @@ if condition:
 
 #[test]
 fn docstring_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r"
 [format]
 docstring-code-format = true
@@ -330,9 +300,9 @@ docstring-code-line-length = 20
 ",
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
         .arg("-")
         .pass_stdin(r"
 def f(x):
@@ -406,21 +376,20 @@ def f(x):
 
 #[test]
 fn mixed_line_endings() -> Result<()> {
-    let tempdir = TempDir::new()?;
+    let test = CliTest::with_files([
+        (
+            "main.py",
+            "from test import say_hy\n\nif __name__ == \"__main__\":\n    say_hy(\"dear Ruff contributor\")\n",
+        ),
+        (
+            "test.py",
+            "def say_hy(name: str):\r\n    print(f\"Hy {name}\")\r\n",
+        ),
+    ])?;
 
-    fs::write(
-        tempdir.path().join("main.py"),
-        "from test import say_hy\n\nif __name__ == \"__main__\":\n    say_hy(\"dear Ruff contributor\")\n",
-    )?;
-
-    fs::write(
-        tempdir.path().join("test.py"),
-        "def say_hy(name: str):\r\n    print(f\"Hy {name}\")\r\n",
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--diff", "--isolated"])
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--diff")
+        .arg("--isolated")
         .arg("."), @r"
     success: true
     exit_code: 0
@@ -434,58 +403,48 @@ fn mixed_line_endings() -> Result<()> {
 
 #[test]
 fn exclude() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 extend-exclude = ["out"]
 
 [format]
 exclude = ["test.py", "generated.py"]
 "#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        r#"
+        ),
+        (
+            "main.py",
+            r#"
 from test import say_hy
 
 if __name__ == "__main__":
     say_hy("dear Ruff contributor")
 "#,
-    )?;
-
-    // Excluded file but passed to the CLI directly, should be formatted
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
+        ),
+        // Excluded file but passed to the CLI directly, should be formatted
+        (
+            "test.py",
+            r#"
 def say_hy(name: str):
         print(f"Hy {name}")"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("generated.py"),
-        r#"NUMBERS = [
+        ),
+        (
+            "generated.py",
+            r#"NUMBERS = [
      0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
     10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 ]
 OTHER = "OTHER"
 "#,
-    )?;
+        ),
+        ("out/a.py", "a = a"),
+    ])?;
 
-    let out_dir = tempdir.path().join("out");
-    fs::create_dir(&out_dir)?;
-
-    fs::write(out_dir.join("a.py"), "a = a")?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--check", "--config"])
-        .arg(ruff_toml.file_name().unwrap())
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--check", "--config", "ruff.toml"])
         // Explicitly pass test.py, should be formatted regardless of it being excluded by format.exclude
-        .arg(test_path.file_name().unwrap())
+        .arg("test.py")
         // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
         .arg("."), @r"
     success: false
@@ -500,20 +459,42 @@ OTHER = "OTHER"
     Ok(())
 }
 
+/// Regression test for <https://github.com/astral-sh/ruff/issues/20035>
+#[test]
+fn deduplicate_directory_and_explicit_file() -> Result<()> {
+    let test = CliTest::with_file("main.py", "x   = 1\n")?;
+
+    assert_cmd_snapshot!(
+        test.format_command()
+            .arg("--check")
+            .arg(".")
+            .arg("main.py"),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    Would reformat: main.py
+    1 file would be reformatted
+
+    ----- stderr -----
+    "
+    );
+
+    Ok(())
+}
+
 #[test]
 fn syntax_error() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
+    let test = CliTest::with_file(
+        "main.py",
         r"
 from module import =
 ",
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated", "--check"])
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--check")
+        .arg("--isolated")
         .arg("main.py"), @r"
     success: false
     exit_code: 2
@@ -528,10 +509,8 @@ from module import =
 
 #[test]
 fn messages() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
+    let test = CliTest::with_file(
+        "main.py",
         r#"
 from test import say_hy
 
@@ -540,9 +519,9 @@ if __name__ == "__main__":
 "#,
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated", "--check"])
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .arg("--check")
         .arg("main.py"), @r"
     success: false
     exit_code: 1
@@ -553,9 +532,8 @@ if __name__ == "__main__":
     ----- stderr -----
     ");
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated"])
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
         .arg("main.py"), @r"
     success: true
     exit_code: 0
@@ -565,9 +543,8 @@ if __name__ == "__main__":
     ----- stderr -----
     ");
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated"])
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
         .arg("main.py"), @r"
     success: true
     exit_code: 0
@@ -580,9 +557,107 @@ if __name__ == "__main__":
     Ok(())
 }
 
+#[test_case::test_case("concise")]
+#[test_case::test_case("full")]
+#[test_case::test_case("json")]
+#[test_case::test_case("json-lines")]
+#[test_case::test_case("junit")]
+#[test_case::test_case("grouped")]
+#[test_case::test_case("github")]
+#[test_case::test_case("gitlab")]
+#[test_case::test_case("pylint")]
+#[test_case::test_case("rdjson")]
+#[test_case::test_case("azure")]
+#[test_case::test_case("sarif")]
+fn output_format(output_format: &str) -> Result<()> {
+    const CONTENT: &str = r#"
+from test import say_hy
+
+if __name__ == "__main__":
+    say_hy("dear Ruff contributor")
+"#;
+
+    let test = CliTest::with_settings(|_project_dir, mut settings| {
+        // JSON double escapes backslashes
+        settings.add_filter(r#""[^"]+\\?/?input.py"#, r#""[TMP]/input.py"#);
+
+        settings
+    })?;
+    test.write_file("input.py", CONTENT)?;
+
+    let snapshot = format!("output_format_{output_format}");
+
+    assert_cmd_snapshot!(
+        snapshot,
+        test.format_command().args([
+            "--output-format",
+            output_format,
+            "--preview",
+            "--check",
+            "input.py",
+        ]),
+    );
+
+    Ok(())
+}
+
+#[test]
+fn output_format_notebook() -> Result<()> {
+    let crate_root = Path::new(env!("CARGO_MANIFEST_DIR"));
+    let fixtures = crate_root.join("resources").join("test").join("fixtures");
+    let path = fixtures.join("unformatted.ipynb");
+
+    let test = CliTest::with_settings(|_, mut settings| {
+        settings.add_filter(&tempdir_filter(crate_root.to_str().unwrap()), "CRATE_ROOT/");
+        settings
+    })?;
+
+    assert_cmd_snapshot!(
+        test.format_command().args(["--isolated", "--preview", "--check"]).arg(path),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    unformatted: File would be reformatted
+      --> CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 1:1:1
+     ::: cell 1
+    1 | import numpy
+      - maths = (numpy.arange(100)**2).sum()
+      - stats= numpy.asarray([1,2,3,4]).median()
+    2 + 
+    3 + maths = (numpy.arange(100) ** 2).sum()
+    4 + stats = numpy.asarray([1, 2, 3, 4]).median()
+     ::: cell 3
+    1 | # A cell with IPython escape command
+    2 | def some_function(foo, bar):
+    3 |     pass
+    4 + 
+    5 + 
+    6 | %matplotlib inline
+      ::: cell 4
+    1  | foo = %pwd
+       - def some_function(foo,bar,):
+    2  + 
+    3  + 
+    4  + def some_function(
+    5  +     foo,
+    6  +     bar,
+    7  + ):
+    8  |     # Another cell with IPython escape command
+    9  |     foo = %pwd
+    10 |     print(foo)
+
+    1 file would be reformatted
+
+    ----- stderr -----
+    "
+    );
+    Ok(())
+}
+
 #[test]
 fn exit_non_zero_on_format() -> Result<()> {
-    let tempdir = TempDir::new()?;
+    let test = CliTest::new()?;
 
     let contents = r#"
 from test import say_hy
@@ -591,20 +666,13 @@ if __name__ == "__main__":
     say_hy("dear Ruff contributor")
 "#;
 
-    fs::write(tempdir.path().join("main.py"), contents)?;
-
-    let mut cmd = Command::new(get_cargo_bin(BIN_NAME));
-    cmd.current_dir(tempdir.path())
-        .args([
-            "format",
-            "--no-cache",
-            "--isolated",
-            "--exit-non-zero-on-format",
-        ])
-        .arg("main.py");
+    test.write_file("main.py", contents)?;
 
     // First format should exit with code 1 since the file needed formatting
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .arg("--exit-non-zero-on-format")
+        .arg("main.py"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -614,7 +682,10 @@ if __name__ == "__main__":
     ");
 
     // Second format should exit with code 0 since no files needed formatting
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .arg("--exit-non-zero-on-format")
+        .arg("main.py"), @r"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -624,20 +695,13 @@ if __name__ == "__main__":
     ");
 
     // Repeat the tests above with the --exit-non-zero-on-fix alias
-    fs::write(tempdir.path().join("main.py"), contents)?;
-
-    let mut cmd = Command::new(get_cargo_bin(BIN_NAME));
-    cmd.current_dir(tempdir.path())
-        .args([
-            "format",
-            "--no-cache",
-            "--isolated",
-            "--exit-non-zero-on-fix",
-        ])
-        .arg("main.py");
+    test.write_file("main.py", contents)?;
 
     // First format should exit with code 1 since the file needed formatting
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .arg("--exit-non-zero-on-fix")
+        .arg("main.py"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -647,7 +711,10 @@ if __name__ == "__main__":
     ");
 
     // Second format should exit with code 0 since no files needed formatting
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .arg("--exit-non-zero-on-fix")
+        .arg("main.py"), @r"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -661,58 +728,48 @@ if __name__ == "__main__":
 
 #[test]
 fn force_exclude() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 extend-exclude = ["out"]
 
 [format]
 exclude = ["test.py", "generated.py"]
 "#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        r#"
+        ),
+        (
+            "main.py",
+            r#"
 from test import say_hy
 
 if __name__ == "__main__":
     say_hy("dear Ruff contributor")
 "#,
-    )?;
-
-    // Excluded file but passed to the CLI directly, should be formatted
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
+        ),
+        // Excluded file but passed to the CLI directly, should be formatted
+        (
+            "test.py",
+            r#"
 def say_hy(name: str):
         print(f"Hy {name}")"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("generated.py"),
-        r#"NUMBERS = [
+        ),
+        (
+            "generated.py",
+            r#"NUMBERS = [
      0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
     10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 ]
 OTHER = "OTHER"
 "#,
-    )?;
+        ),
+        ("out/a.py", "a = a"),
+    ])?;
 
-    let out_dir = tempdir.path().join("out");
-    fs::create_dir(&out_dir)?;
-
-    fs::write(out_dir.join("a.py"), "a = a")?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--force-exclude", "--check", "--config"])
-        .arg(ruff_toml.file_name().unwrap())
-        // Explicitly pass test.py, should be respect the `format.exclude` when `--force-exclude` is present
-        .arg(test_path.file_name().unwrap())
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--force-exclude", "--check", "--config", "ruff.toml"])
+        // Explicitly pass test.py, should not be formatted because of --force-exclude
+        .arg("test.py")
         // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
         .arg("."), @r"
     success: false
@@ -728,10 +785,8 @@ OTHER = "OTHER"
 
 #[test]
 fn exclude_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r#"
 extend-select = ["B", "Q"]
 ignore = ["Q000", "Q001", "Q002", "Q003"]
@@ -741,9 +796,8 @@ exclude = ["generated.py"]
 "#,
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--config", &ruff_toml.file_name().unwrap().to_string_lossy(), "--stdin-filename", "generated.py", "-"])
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--config", "ruff.toml", "--stdin-filename", "generated.py", "-"])
         .pass_stdin(r#"
 from test import say_hy
 
@@ -768,10 +822,8 @@ if __name__ == '__main__':
 
 #[test]
 fn force_exclude_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r#"
 extend-select = ["B", "Q"]
 ignore = ["Q000", "Q001", "Q002", "Q003"]
@@ -781,9 +833,8 @@ exclude = ["generated.py"]
 "#,
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--config", &ruff_toml.file_name().unwrap().to_string_lossy(), "--stdin-filename", "generated.py", "--force-exclude", "-"])
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--config", "ruff.toml", "--stdin-filename", "generated.py", "--force-exclude", "-"])
         .pass_stdin(r#"
 from test import say_hy
 
@@ -809,12 +860,10 @@ if __name__ == '__main__':
 
 #[test]
 fn format_option_inheritance() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    let base_toml = tempdir.path().join("base.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 extend = "base.toml"
 
 [lint]
@@ -823,19 +872,19 @@ extend-select = ["COM812"]
 [format]
 quote-style = "single"
 "#,
-    )?;
-
-    fs::write(
-        base_toml,
-        r#"
+        ),
+        (
+            "base.toml",
+            r#"
 [format]
 indent-style = "tab"
 "#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -868,91 +917,79 @@ if condition:
 
 #[test]
 fn deprecated_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r"
 tab-size = 2
 ",
     )?;
 
-    insta::with_settings!({filters => vec![
-        (&*regex::escape(ruff_toml.to_str().unwrap()), "[RUFF-TOML-PATH]"),
-    ]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(["format", "--config"])
-            .arg(&ruff_toml)
+    assert_cmd_snapshot!(test.format_command()
+            .arg("--config")
+            .arg("ruff.toml")
             .arg("-")
             .pass_stdin(r"
 if True:
     pass
     "), @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load configuration `[TMP]/ruff.toml`
+      Cause: Failed to parse [TMP]/ruff.toml
+      Cause: TOML parse error at line 1, column 1
+      |
+    1 | 
+      | ^
+    unknown field `tab-size`
+    ");
 
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load configuration `[RUFF-TOML-PATH]`
-          Cause: Failed to parse [RUFF-TOML-PATH]
-          Cause: TOML parse error at line 1, column 1
-          |
-        1 | 
-          | ^
-        unknown field `tab-size`
-        ");
-    });
     Ok(())
 }
 
 /// Since 0.1.0 the legacy format option is no longer supported
 #[test]
 fn legacy_format_option() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r#"
 format = "json"
 "#,
     )?;
 
-    insta::with_settings!({filters => vec![
-        (&*regex::escape(ruff_toml.to_str().unwrap()), "[RUFF-TOML-PATH]"),
-    ]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+    assert_cmd_snapshot!(test.command()
             .args(["check", "--select", "F401", "--no-cache", "--config"])
-            .arg(&ruff_toml)
+            .arg("ruff.toml")
             .arg("-")
             .pass_stdin(r"
     import os
     "), @r#"
-        success: false
-        exit_code: 2
-        ----- stdout -----
+    success: false
+    exit_code: 2
+    ----- stdout -----
 
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load configuration `[RUFF-TOML-PATH]`
-          Cause: Failed to parse [RUFF-TOML-PATH]
-          Cause: TOML parse error at line 2, column 10
-          |
-        2 | format = "json"
-          |          ^^^^^^
-        invalid type: string "json", expected struct FormatOptions
-        "#);
-    });
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load configuration `[TMP]/ruff.toml`
+      Cause: Failed to parse [TMP]/ruff.toml
+      Cause: TOML parse error at line 2, column 10
+      |
+    2 | format = "json"
+      |          ^^^^^^
+    invalid type: string "json", expected struct FormatOptions
+    "#);
     Ok(())
 }
 
 #[test]
 fn conflicting_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 indent-width = 2
 
 [lint]
@@ -978,20 +1015,19 @@ allow-multiline = false
 skip-magic-trailing-comma = true
 indent-style = "tab"
 "#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
+        ),
+        (
+            "test.py",
+            r#"
 def say_hy(name: str):
         print(f"Hy {name}")"#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r#"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("test.py"), @r#"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1015,10 +1051,8 @@ def say_hy(name: str):
 
 #[test]
 fn conflicting_options_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
+    let test = CliTest::with_file(
+        "ruff.toml",
         r#"
 indent-width = 2
 
@@ -1044,9 +1078,9 @@ indent-style = "tab"
 "#,
     )?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
         .arg("-")
         .pass_stdin(r#"
 def say_hy(name: str):
@@ -1074,11 +1108,10 @@ def say_hy(name: str):
 
 #[test]
 fn valid_linter_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 [lint]
 select = ["ALL"]
 ignore = ["D203", "D212", "COM812", "ISC001"]
@@ -1099,20 +1132,19 @@ multiline-quotes = "double"
 skip-magic-trailing-comma = false
 quote-style = "single"
 "#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
+        ),
+        (
+            "test.py",
+            r#"
 def say_hy(name: str):
         print(f"Hy {name}")"#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("test.py"), @r"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1125,11 +1157,10 @@ def say_hy(name: str):
 
 #[test]
 fn valid_linter_options_preserve() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 [lint]
 select = ["Q"]
 
@@ -1141,20 +1172,19 @@ multiline-quotes = "single"
 [format]
 quote-style = "preserve"
 "#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
+        ),
+        (
+            "test.py",
+            r#"
 def say_hy(name: str):
         print(f"Hy {name}")"#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("test.py"), @r"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1167,29 +1197,26 @@ def say_hy(name: str):
 
 #[test]
 fn all_rules_default_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 [lint]
 select = ["ALL"]
 "#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
+        ),
+        (
+            "test.py",
+            r#"
 def say_hy(name: str):
         print(f"Hy {name}")"#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r"
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("test.py"), @r"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1204,117 +1231,116 @@ def say_hy(name: str):
 }
 
 #[test]
-fn test_diff() {
-    let args = ["format", "--no-cache", "--isolated", "--diff"];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
+fn test_diff() -> Result<()> {
+    let crate_root = Path::new(env!("CARGO_MANIFEST_DIR"));
+    let test = CliTest::with_settings(|_, mut settings| {
+        settings.add_filter(&tempdir_filter(crate_root.to_str().unwrap()), "CRATE_ROOT/");
+        settings
+    })?;
+    let fixtures = crate_root.join("resources").join("test").join("fixtures");
     let paths = [
         fixtures.join("unformatted.py"),
         fixtures.join("formatted.py"),
         fixtures.join("unformatted.ipynb"),
     ];
-    insta::with_settings!({filters => vec![
-        // Replace windows paths
-        (r"\\", "/"),
-    ]}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).args(args).args(paths),
-            @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        --- resources/test/fixtures/unformatted.ipynb:cell 1
-        +++ resources/test/fixtures/unformatted.ipynb:cell 1
-        @@ -1,3 +1,4 @@
-         import numpy
-        -maths = (numpy.arange(100)**2).sum()
-        -stats= numpy.asarray([1,2,3,4]).median()
-        +
-        +maths = (numpy.arange(100) ** 2).sum()
-        +stats = numpy.asarray([1, 2, 3, 4]).median()
-        --- resources/test/fixtures/unformatted.ipynb:cell 3
-        +++ resources/test/fixtures/unformatted.ipynb:cell 3
-        @@ -1,4 +1,6 @@
-         # A cell with IPython escape command
-         def some_function(foo, bar):
-             pass
-        +
-        +
-         %matplotlib inline
-        --- resources/test/fixtures/unformatted.ipynb:cell 4
-        +++ resources/test/fixtures/unformatted.ipynb:cell 4
-        @@ -1,5 +1,10 @@
+
+    assert_cmd_snapshot!(
+        test.format_command().args(["--isolated", "--diff"]).args(paths),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    --- CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 1
+    +++ CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 1
+    @@ -1,3 +1,4 @@
+     import numpy
+    -maths = (numpy.arange(100)**2).sum()
+    -stats= numpy.asarray([1,2,3,4]).median()
+    +
+    +maths = (numpy.arange(100) ** 2).sum()
+    +stats = numpy.asarray([1, 2, 3, 4]).median()
+    --- CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 3
+    +++ CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 3
+    @@ -1,4 +1,6 @@
+     # A cell with IPython escape command
+     def some_function(foo, bar):
+         pass
+    +
+    +
+     %matplotlib inline
+    --- CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 4
+    +++ CRATE_ROOT/resources/test/fixtures/unformatted.ipynb:cell 4
+    @@ -1,5 +1,10 @@
+     foo = %pwd
+    -def some_function(foo,bar,):
+    +
+    +
+    +def some_function(
+    +    foo,
+    +    bar,
+    +):
+         # Another cell with IPython escape command
          foo = %pwd
-        -def some_function(foo,bar,):
-        +
-        +
-        +def some_function(
-        +    foo,
-        +    bar,
-        +):
-             # Another cell with IPython escape command
-             foo = %pwd
-             print(foo)
+         print(foo)
 
-        --- resources/test/fixtures/unformatted.py
-        +++ resources/test/fixtures/unformatted.py
-        @@ -1,3 +1,3 @@
-         x = 1
-        -y=2
-        +y = 2
-         z = 3
+    --- CRATE_ROOT/resources/test/fixtures/unformatted.py
+    +++ CRATE_ROOT/resources/test/fixtures/unformatted.py
+    @@ -1,3 +1,3 @@
+     x = 1
+    -y=2
+    +y = 2
+     z = 3
 
 
-        ----- stderr -----
-        2 files would be reformatted, 1 file already formatted
-        ");
-    });
+    ----- stderr -----
+    2 files would be reformatted, 1 file already formatted
+    ");
+
+    Ok(())
 }
 
 #[test]
-fn test_diff_no_change() {
-    let args = ["format", "--no-cache", "--isolated", "--diff"];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
+fn test_diff_no_change() -> Result<()> {
+    let crate_root = Path::new(env!("CARGO_MANIFEST_DIR"));
+    let test = CliTest::with_settings(|_, mut settings| {
+        settings.add_filter(&tempdir_filter(crate_root.to_str().unwrap()), "CRATE_ROOT/");
+        settings
+    })?;
+
+    let fixtures = crate_root.join("resources").join("test").join("fixtures");
     let paths = [fixtures.join("unformatted.py")];
-    insta::with_settings!({filters => vec![
-        // Replace windows paths
-        (r"\\", "/"),
-    ]}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).args(args).args(paths),
-            @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        --- resources/test/fixtures/unformatted.py
-        +++ resources/test/fixtures/unformatted.py
-        @@ -1,3 +1,3 @@
-         x = 1
-        -y=2
-        +y = 2
-         z = 3
+    assert_cmd_snapshot!(
+        test.format_command().args(["--isolated", "--diff"]).args(paths),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    --- CRATE_ROOT/resources/test/fixtures/unformatted.py
+    +++ CRATE_ROOT/resources/test/fixtures/unformatted.py
+    @@ -1,3 +1,3 @@
+     x = 1
+    -y=2
+    +y = 2
+     z = 3
 
 
-        ----- stderr -----
-        1 file would be reformatted
-        "
-        );
-    });
+    ----- stderr -----
+    1 file would be reformatted
+    "
+    );
+
+    Ok(())
 }
 
 #[test]
-fn test_diff_stdin_unformatted() {
-    let args = [
-        "format",
-        "--isolated",
-        "--diff",
-        "-",
-        "--stdin-filename",
-        "unformatted.py",
-    ];
+fn test_diff_stdin_unformatted() -> Result<()> {
+    let test = CliTest::new()?;
     let fixtures = Path::new("resources").join("test").join("fixtures");
     let unformatted = fs::read(fixtures.join("unformatted.py")).unwrap();
     assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME)).args(args).pass_stdin(unformatted),
+        test.format_command()
+            .args(["--isolated", "--diff", "-", "--stdin-filename", "unformatted.py"])
+            .pass_stdin(unformatted),
         @r"
     success: false
     exit_code: 1
@@ -1330,15 +1356,16 @@ fn test_diff_stdin_unformatted() {
 
     ----- stderr -----
     ");
+    Ok(())
 }
 
 #[test]
-fn test_diff_stdin_formatted() {
-    let args = ["format", "--isolated", "--diff", "-"];
+fn test_diff_stdin_formatted() -> Result<()> {
+    let test = CliTest::new()?;
     let fixtures = Path::new("resources").join("test").join("fixtures");
     let unformatted = fs::read(fixtures.join("formatted.py")).unwrap();
     assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME)).args(args).pass_stdin(unformatted),
+        test.format_command().args(["--isolated", "--diff", "-"]).pass_stdin(unformatted),
         @r"
     success: true
     exit_code: 0
@@ -1346,14 +1373,17 @@ fn test_diff_stdin_formatted() {
 
     ----- stderr -----
     ");
+    Ok(())
 }
 
 #[test]
-fn test_notebook_trailing_semicolon() {
+fn test_notebook_trailing_semicolon() -> Result<()> {
+    let test = CliTest::new()?;
+
     let fixtures = Path::new("resources").join("test").join("fixtures");
     let unformatted = fs::read(fixtures.join("trailing_semicolon.ipynb")).unwrap();
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.ipynb"])
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.ipynb"])
         .arg("-")
         .pass_stdin(unformatted), @r##"
     success: true
@@ -1775,23 +1805,21 @@ fn test_notebook_trailing_semicolon() {
 
     ----- stderr -----
     "##);
+    Ok(())
 }
 
 #[test]
 fn syntax_error_in_notebooks() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 include = ["*.ipy"]
 "#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.ipy"),
-        r#"
+        ),
+        (
+            "main.ipy",
+            r#"
 {
     "cells": [
      {
@@ -1839,13 +1867,11 @@ include = ["*.ipy"]
     "nbformat_minor": 0
    }
 "#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .arg("format")
-        .arg("--no-cache")
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--config", "ruff.toml"])
         .args(["--extension", "ipy:ipynb"])
         .arg("."), @r"
     success: false
@@ -1860,19 +1886,16 @@ include = ["*.ipy"]
 
 #[test]
 fn extension() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
+    let test = CliTest::with_files([
+        (
+            "ruff.toml",
+            r#"
 include = ["*.ipy"]
 "#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.ipy"),
-        r#"
+        ),
+        (
+            "main.ipy",
+            r#"
 {
  "cells": [
   {
@@ -1909,13 +1932,11 @@ include = ["*.ipy"]
  "nbformat_minor": 5
 }
 "#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .arg("format")
-        .arg("--no-cache")
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--config", "ruff.toml"])
         .args(["--extension", "ipy:ipynb"])
         .arg("."), @r"
     success: true
@@ -1929,9 +1950,10 @@ include = ["*.ipy"]
 }
 
 #[test]
-fn range_formatting() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=2:8-2:14"])
+fn range_formatting() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=2:8-2:14"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -1951,12 +1973,14 @@ def foo(arg1, arg2,):
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
-fn range_formatting_unicode() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=2:21-3"])
+fn range_formatting_unicode() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=2:21-3"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1="👋🏽" ): print("Format this" )
@@ -1970,37 +1994,34 @@ def foo(arg1="👋🏽" ): print("Format this" )
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
-fn range_formatting_multiple_files() -> std::io::Result<()> {
-    let tempdir = TempDir::new()?;
-    let file1 = tempdir.path().join("file1.py");
-
-    fs::write(
-        &file1,
-        r#"
+fn range_formatting_multiple_files() -> Result<()> {
+    let test = CliTest::with_files([
+        (
+            "file1.py",
+            r#"
 def file1(arg1, arg2,):
     print("Shouldn't format this" )
 
 "#,
-    )?;
-
-    let file2 = tempdir.path().join("file2.py");
-
-    fs::write(
-        &file2,
-        r#"
+        ),
+        (
+            "file2.py",
+            r#"
 def file2(arg1, arg2,):
     print("Shouldn't format this" )
 
 "#,
-    )?;
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--range=1:8-1:15"])
-        .arg(file1)
-        .arg(file2),  @r"
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--range=1:8-1:15"])
+        .arg("file1.py")
+        .arg("file2.py"),  @r"
     success: false
     exit_code: 2
     ----- stdout -----
@@ -2014,9 +2035,10 @@ def file2(arg1, arg2,):
 }
 
 #[test]
-fn range_formatting_out_of_bounds() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=100:40-200:1"])
+fn range_formatting_out_of_bounds() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=100:40-200:1"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2033,12 +2055,14 @@ def foo(arg1, arg2,):
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
-fn range_start_larger_than_end() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=90-50"])
+fn range_start_larger_than_end() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=90-50"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2055,12 +2079,14 @@ def foo(arg1, arg2,):
 
     For more information, try '--help'.
     ");
+    Ok(())
 }
 
 #[test]
-fn range_line_numbers_only() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=2-3"])
+fn range_line_numbers_only() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=2-3"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2080,12 +2106,14 @@ def foo(arg1, arg2,):
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
-fn range_start_only() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=3"])
+fn range_start_only() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=3"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2101,12 +2129,14 @@ def foo(arg1, arg2,):
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
-fn range_end_only() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=-3"])
+fn range_end_only() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=-3"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2125,12 +2155,14 @@ def foo(arg1, arg2,):
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 #[test]
-fn range_missing_line() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=1-:20"])
+fn range_missing_line() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=1-:20"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2147,12 +2179,14 @@ def foo(arg1, arg2,):
 
     For more information, try '--help'.
     ");
+    Ok(())
 }
 
 #[test]
-fn zero_line_number() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=0:2"])
+fn zero_line_number() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=0:2"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2170,12 +2204,14 @@ def foo(arg1, arg2,):
 
     For more information, try '--help'.
     ");
+    Ok(())
 }
 
 #[test]
-fn column_and_line_zero() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=0:0"])
+fn column_and_line_zero() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--range=0:0"])
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -2193,12 +2229,14 @@ def foo(arg1, arg2,):
 
     For more information, try '--help'.
     ");
+    Ok(())
 }
 
 #[test]
-fn range_formatting_notebook() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--no-cache", "--stdin-filename", "main.ipynb", "--range=1-2"])
+fn range_formatting_notebook() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "main.ipynb", "--range=1-2"])
         .arg("-")
         .pass_stdin(r#"
 {
@@ -2244,6 +2282,7 @@ fn range_formatting_notebook() {
     ----- stderr -----
     error: Failed to format main.ipynb: Range formatting isn't supported for notebooks.
     ");
+    Ok(())
 }
 
 /// Test that the formatter respects `per-file-target-version`. Context managers can't be
@@ -2251,10 +2290,11 @@ fn range_formatting_notebook() {
 ///
 /// Adapted from <https://github.com/python/cpython/issues/56991#issuecomment-1093555135>
 #[test]
-fn per_file_target_version_formatter() {
+fn per_file_target_version_formatter() -> Result<()> {
+    let test = CliTest::new()?;
     // without `per-file-target-version` this should not be reformatted in the same way
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--target-version=py38"])
+    assert_cmd_snapshot!(test.format_command()
+        .args(["--isolated", "--stdin-filename", "test.py", "--target-version=py38"])
         .arg("-")
         .pass_stdin(r#"
 with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a_really_long_baz") as baz:
@@ -2271,8 +2311,9 @@ with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a
     ----- stderr -----
     "#);
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--target-version=py38"])
+    assert_cmd_snapshot!(test.format_command()
+        .arg("--isolated")
+        .args(["--stdin-filename", "test.py", "--target-version=py38"])
         .args(["--config", r#"per-file-target-version = {"test.py" = "py311"}"#])
         .arg("-")
         .pass_stdin(r#"
@@ -2291,6 +2332,7 @@ with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a
 
     ----- stderr -----
     "#);
+    Ok(())
 }
 
 /// Regression test for <https://github.com/astral-sh/ruff/issues/9381> with very helpful
@@ -2301,21 +2343,19 @@ fn cookiecutter_globbing() -> Result<()> {
     // problem is this `{{cookiecutter.repo_name}}` directory containing a config file with a glob.
     // The absolute path of the glob contains the glob metacharacters `{{` and `}}` even though the
     // user's glob does not.
-    let tempdir = TempDir::new()?;
-    let cookiecutter = tempdir.path().join("{{cookiecutter.repo_name}}");
-    let cookiecutter_toml = cookiecutter.join("pyproject.toml");
-    let tests = cookiecutter.join("tests");
-    fs::create_dir_all(&tests)?;
-    fs::write(
-        cookiecutter_toml,
-        r#"tool.ruff.lint.per-file-ignores = { "tests/*" = ["F811"] }"#,
-    )?;
-    let maintest = tests.join("maintest.py");
-    fs::write(maintest, "import foo\nimport bar\nimport foo\n")?;
+    let test = CliTest::with_files([
+        (
+            "{{cookiecutter.repo_name}}/pyproject.toml",
+            r#"tool.ruff.lint.per-file-ignores = { "tests/*" = ["F811"] }"#,
+        ),
+        (
+            "{{cookiecutter.repo_name}}/tests/maintest.py",
+            "import foo\nimport bar\nimport foo\n",
+        ),
+    ])?;
 
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(["format", "--no-cache", "--diff"])
-            .current_dir(tempdir.path()), @r"
+    assert_cmd_snapshot!(test.format_command()
+            .args(["--isolated", "--diff", "."]), @r"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -2326,3 +2366,22 @@ fn cookiecutter_globbing() -> Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn stable_output_format_warning() -> Result<()> {
+    let test = CliTest::new()?;
+    assert_cmd_snapshot!(
+        test.format_command()
+            .args(["--output-format=full", "-"])
+            .pass_stdin(""),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    warning: The --output-format flag for the formatter is unstable and requires preview mode to use.
+    ",
+    );
+    Ok(())
+}
diff --git a/crates/ruff/tests/cli/lint.rs b/crates/ruff/tests/cli/lint.rs
new file mode 100644
index 0000000000..ebd202b052
--- /dev/null
+++ b/crates/ruff/tests/cli/lint.rs
@@ -0,0 +1,3654 @@
+//! Tests the interaction of the `lint` configuration section
+
+use std::fs;
+use std::process::Command;
+use std::str;
+
+use anyhow::Result;
+
+use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
+
+use crate::CliTest;
+
+const BIN_NAME: &str = "ruff";
+const STDIN_BASE_OPTIONS: &[&str] = &["check", "--no-cache", "--output-format", "concise"];
+
+impl CliTest {
+    fn check_command(&self) -> Command {
+        let mut command = self.command();
+        command.args(STDIN_BASE_OPTIONS);
+        command
+    }
+}
+
+#[test]
+fn top_level_options() -> Result<()> {
+    let test = CliTest::new()?;
+    test.write_file(
+        "ruff.toml",
+        r#"
+extend-select = ["B", "Q"]
+
+[flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(test.check_command()
+            .arg("--config")
+            .arg("ruff.toml")
+            .args(["--stdin-filename", "test.py"])
+            .arg("-")
+            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:5: Q000 [*] Double quotes found but single quotes preferred
+    test.py:1:5: B005 Using `.strip()` with multi-character strings is misleading
+    test.py:1:19: Q000 [*] Double quotes found but single quotes preferred
+    Found 3 errors.
+    [*] 2 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'extend-select' -> 'lint.extend-select'
+      - 'flake8-quotes' -> 'lint.flake8-quotes'
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn lint_options() -> Result<()> {
+    let case = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint]
+extend-select = ["B", "Q"]
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        case.check_command()
+            .arg("--config")
+            .arg("ruff.toml")
+            .arg("-")
+            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+        success: false
+        exit_code: 1
+        ----- stdout -----
+        -:1:5: Q000 [*] Double quotes found but single quotes preferred
+        -:1:5: B005 Using `.strip()` with multi-character strings is misleading
+        -:1:19: Q000 [*] Double quotes found but single quotes preferred
+        Found 3 errors.
+        [*] 2 fixable with the `--fix` option.
+
+        ----- stderr -----
+        ");
+
+    Ok(())
+}
+
+/// Tests that configurations from the top-level and `lint` section are merged together.
+#[test]
+fn mixed_levels() -> Result<()> {
+    let test = CliTest::new()?;
+    test.write_file(
+        "ruff.toml",
+        r#"
+extend-select = ["B", "Q"]
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(test.check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:5: Q000 [*] Double quotes found but single quotes preferred
+    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
+    -:1:19: Q000 [*] Double quotes found but single quotes preferred
+    Found 3 errors.
+    [*] 2 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'extend-select' -> 'lint.extend-select'
+    ");
+
+    Ok(())
+}
+
+/// Tests that options in the `lint` section have higher precedence than top-level options (because they are more specific).
+#[test]
+fn precedence() -> Result<()> {
+    let test = CliTest::new()?;
+    test.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+extend-select = ["B", "Q"]
+
+[flake8-quotes]
+inline-quotes = "double"
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(test.check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:5: Q000 [*] Double quotes found but single quotes preferred
+    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
+    -:1:19: Q000 [*] Double quotes found but single quotes preferred
+    Found 3 errors.
+    [*] 2 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'flake8-quotes' -> 'lint.flake8-quotes'
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn exclude() -> Result<()> {
+    let case = CliTest::new()?;
+
+    case.write_file(
+        "ruff.toml",
+        r#"
+extend-select = ["B", "Q"]
+extend-exclude = ["out"]
+
+[lint]
+exclude = ["test.py", "generated.py"]
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    case.write_file(
+        "main.py",
+        r#"from test import say_hy
+
+if __name__ == "__main__":
+    say_hy("dear Ruff contributor")
+"#,
+    )?;
+
+    // Excluded file but passed to the CLI directly, should be linted
+    case.write_file(
+        "test.py",
+        r#"def say_hy(name: str):
+        print(f"Hy {name}")"#,
+    )?;
+
+    case.write_file(
+        "generated.py",
+        r#"NUMBERS = [
+     0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
+    10, 11, 12, 13, 14, 15, 16, 17, 18, 19
+]
+OTHER = "OTHER"
+"#,
+    )?;
+
+    case.write_file("out/a.py", r#"a = "a""#)?;
+
+    assert_cmd_snapshot!(
+        case.check_command()
+            .args(["--config", "ruff.toml"])
+            // Explicitly pass test.py, should be linted regardless of it being excluded by lint.exclude
+            .arg("test.py")
+            // Lint all other files in the directory, should respect the `exclude` and `lint.exclude` options
+            .arg("."), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.py:3:16: Q000 [*] Double quotes found but single quotes preferred
+    main.py:4:12: Q000 [*] Double quotes found but single quotes preferred
+    test.py:2:15: Q000 [*] Double quotes found but single quotes preferred
+    Found 3 errors.
+    [*] 3 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'extend-select' -> 'lint.extend-select'
+    ");
+
+    Ok(())
+}
+
+/// Regression test for <https://github.com/astral-sh/ruff/issues/20035>
+#[test]
+fn deduplicate_directory_and_explicit_file() -> Result<()> {
+    let case = CliTest::new()?;
+
+    case.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+exclude = ["main.py"]
+"#,
+    )?;
+
+    case.write_file("main.py", "import os\n")?;
+
+    assert_cmd_snapshot!(
+        case.check_command()
+            .args(["--config", "ruff.toml"])
+            .arg(".")
+            // Explicitly pass main.py, should be linted regardless of it being excluded by lint.exclude
+            .arg("main.py"),
+        @r"
+        success: false
+        exit_code: 1
+        ----- stdout -----
+        main.py:1:8: F401 [*] `os` imported but unused
+        Found 1 error.
+        [*] 1 fixable with the `--fix` option.
+
+        ----- stderr -----
+        "
+    );
+
+    Ok(())
+}
+
+#[test]
+fn exclude_stdin() -> Result<()> {
+    let case = CliTest::with_file(
+        "ruff.toml",
+        r#"
+extend-select = ["B", "Q"]
+
+[lint]
+exclude = ["generated.py"]
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        case.check_command()
+            .args(["--config", "ruff.toml"])
+            .args(["--stdin-filename", "generated.py"])
+            .arg("-")
+            .pass_stdin(r#"
+from test import say_hy
+
+if __name__ == "__main__":
+    say_hy("dear Ruff contributor")
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    generated.py:4:16: Q000 [*] Double quotes found but single quotes preferred
+    generated.py:5:12: Q000 [*] Double quotes found but single quotes preferred
+    Found 2 errors.
+    [*] 2 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'extend-select' -> 'lint.extend-select'
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn line_too_long_width_override() -> Result<()> {
+    let test = CliTest::new()?;
+    test.write_file(
+        "ruff.toml",
+        r#"
+line-length = 80
+select = ["E501"]
+
+[pycodestyle]
+max-line-length = 100
+"#,
+    )?;
+
+    assert_cmd_snapshot!(test.check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"
+# longer than 80, but less than 100
+_ = "---------------------------------------------------------------------------亜亜亜亜亜亜"
+# longer than 100
+_ = "---------------------------------------------------------------------------亜亜亜亜亜亜亜亜亜亜亜亜亜亜"
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:5:91: E501 Line too long (109 > 100)
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'select' -> 'lint.select'
+      - 'pycodestyle' -> 'lint.pycodestyle'
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn per_file_ignores_stdin() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+extend-select = ["B", "Q"]
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .args(["--stdin-filename", "generated.py"])
+        .args(["--per-file-ignores", "generated.py:Q"])
+        .arg("-")
+        .pass_stdin(r#"
+import os
+
+from test import say_hy
+
+if __name__ == "__main__":
+    say_hy("dear Ruff contributor")
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    generated.py:2:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'extend-select' -> 'lint.extend-select'
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn extend_per_file_ignores_stdin() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+extend-select = ["B", "Q"]
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .args(["--stdin-filename", "generated.py"])
+        .args(["--extend-per-file-ignores", "generated.py:Q"])
+        .arg("-")
+        .pass_stdin(r#"
+import os
+
+from test import say_hy
+
+if __name__ == "__main__":
+    say_hy("dear Ruff contributor")
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    generated.py:2:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+      - 'extend-select' -> 'lint.extend-select'
+    ");
+
+    Ok(())
+}
+
+/// Regression test for [#8858](https://github.com/astral-sh/ruff/issues/8858)
+#[test]
+fn parent_configuration_override() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["ALL"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "subdirectory/ruff.toml",
+        r#"
+[lint]
+ignore = ["D203", "D212"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .current_dir(fixture.root().join("subdirectory"))
+        , @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    warning: No Python files found under the given path(s)
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn nonexistent_config_file() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--config", "foo.toml", "."]), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'foo.toml' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    It looks like you were trying to pass a path to a configuration file.
+    The path `foo.toml` does not point to a configuration file
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn config_override_rejected_if_invalid_toml() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--config", "foo = bar", "."]), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'foo = bar' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    The supplied argument is not valid TOML:
+
+    TOML parse error at line 1, column 7
+      |
+    1 | foo = bar
+      |       ^^^
+    string values must be quoted, expected literal string
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn too_many_config_files() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file("ruff.toml", "")?;
+    fixture.write_file("ruff2.toml", "")?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("--config")
+        .arg("ruff2.toml")
+        .arg("."), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: You cannot specify more than one configuration file on the command line.
+
+      tip: remove either `--config=ruff.toml` or `--config=ruff2.toml`.
+           For more information, try `--help`.
+    ");
+    Ok(())
+}
+
+#[test]
+fn extend_passed_via_config_argument() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--config", "extend = 'foo.toml'", "."]), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'extend = 'foo.toml'' for '--config <CONFIG_OPTION>'
+
+      tip: Cannot include `extend` in a --config flag value
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn nonexistent_extend_file() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+extend = "ruff2.toml"
+"#,
+    )?;
+
+    fixture.write_file(
+        "ruff2.toml",
+        r#"
+extend = "ruff3.toml"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command(), @r"
+        success: false
+        exit_code: 2
+        ----- stdout -----
+
+        ----- stderr -----
+        ruff failed
+          Cause: Failed to load extended configuration `[TMP]/ruff3.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml`)
+          Cause: Failed to read [TMP]/ruff3.toml
+          Cause: No such file or directory (os error 2)
+        ");
+
+    Ok(())
+}
+
+#[test]
+fn circular_extend() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+extend = "ruff2.toml"
+"#,
+    )?;
+    fixture.write_file(
+        "ruff2.toml",
+        r#"
+extend = "ruff3.toml"
+"#,
+    )?;
+    fixture.write_file(
+        "ruff3.toml",
+        r#"
+extend = "ruff.toml"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command(),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Circular configuration detected: `[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml` extends `[TMP]/ruff.toml`
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn parse_error_extends() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+extend = "ruff2.toml"
+"#,
+    )?;
+    fixture.write_file(
+        "ruff2.toml",
+        r#"
+[lint]
+select = [E501]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture.check_command(),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load extended configuration `[TMP]/ruff2.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml`)
+      Cause: Failed to parse [TMP]/ruff2.toml
+      Cause: TOML parse error at line 3, column 11
+      |
+    3 | select = [E501]
+      |           ^^^^
+    string values must be quoted, expected literal string
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn config_file_and_isolated() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file("ruff.toml", "")?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("--isolated")
+        .arg("."), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: The argument `--config=ruff.toml` cannot be used with `--isolated`
+
+      tip: You cannot specify a configuration file and also specify `--isolated`,
+           as `--isolated` causes ruff to ignore all configuration files.
+           For more information, try `--help`.
+    ");
+    Ok(())
+}
+
+#[test]
+fn config_override_via_cli() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+line-length = 100
+
+[lint]
+select = ["I"]
+
+[lint.isort]
+combine-as-imports = true
+        "#,
+    )?;
+    let test_code = r#"
+from foo import (
+    aaaaaaaaaaaaaaaaaaa,
+    bbbbbbbbbbb as bbbbbbbbbbbbbbbb,
+    cccccccccccccccc,
+    ddddddddddd as ddddddddddddd,
+    eeeeeeeeeeeeeee,
+    ffffffffffff as ffffffffffffff,
+    ggggggggggggg,
+    hhhhhhh as hhhhhhhhhhh,
+    iiiiiiiiiiiiii,
+    jjjjjjjjjjjjj as jjjjjj,
+)
+
+x = "longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss"
+"#;
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .args(["--config", "line-length=90"])
+        .args(["--config", "lint.extend-select=['E501', 'F841']"])
+        .args(["--config", "lint.isort.combine-as-imports = false"])
+        .arg("-")
+        .pass_stdin(test_code), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:1: I001 [*] Import block is un-sorted or un-formatted
+    -:15:91: E501 Line too long (97 > 90)
+    Found 2 errors.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+#[test]
+fn valid_toml_but_nonexistent_option_provided_via_config_argument() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args([".", "--config", "extend-select=['F481']"]),  // No such code as F481!
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'extend-select=['F481']' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    Could not parse the supplied argument as a `ruff.toml` configuration option:
+
+    Unknown rule selector: `F481`
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn each_toml_option_requires_a_new_flag_1() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        // commas can't be used to delimit different config overrides;
+        // you need a new --config flag for each override
+        .args([".", "--config", "extend-select=['F841'], line-length=90"]),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'extend-select=['F841'], line-length=90' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    The supplied argument is not valid TOML:
+
+    TOML parse error at line 1, column 23
+      |
+    1 | extend-select=['F841'], line-length=90
+      |                       ^
+    unexpected key or value, expected newline, `#`
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn each_toml_option_requires_a_new_flag_2() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        // spaces *also* can't be used to delimit different config overrides;
+        // you need a new --config flag for each override
+        .args([".", "--config", "extend-select=['F841'] line-length=90"]),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'extend-select=['F841'] line-length=90' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    The supplied argument is not valid TOML:
+
+    TOML parse error at line 1, column 24
+      |
+    1 | extend-select=['F841'] line-length=90
+      |                        ^
+    unexpected key or value, expected newline, `#`
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn value_given_to_table_key_is_not_inline_table_1() {
+    // https://github.com/astral-sh/ruff/issues/13995
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args([".", "--config", r#"lint.flake8-pytest-style="csv""#]),
+        @r#"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'lint.flake8-pytest-style="csv"' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    `lint.flake8-pytest-style` is a table of configuration options.
+    Did you want to override one of the table's subkeys?
+
+    Possible choices:
+
+    - `lint.flake8-pytest-style.fixture-parentheses`
+    - `lint.flake8-pytest-style.parametrize-names-type`
+    - `lint.flake8-pytest-style.parametrize-values-type`
+    - `lint.flake8-pytest-style.parametrize-values-row-type`
+    - `lint.flake8-pytest-style.raises-require-match-for`
+    - `lint.flake8-pytest-style.raises-extend-require-match-for`
+    - `lint.flake8-pytest-style.mark-parentheses`
+    - `lint.flake8-pytest-style.warns-require-match-for`
+    - `lint.flake8-pytest-style.warns-extend-require-match-for`
+
+    For more information, try '--help'.
+    "#);
+}
+
+#[test]
+fn value_given_to_table_key_is_not_inline_table_2() {
+    // https://github.com/astral-sh/ruff/issues/13995
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args([".", "--config", r#"lint=123"#]),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'lint=123' for '--config <CONFIG_OPTION>'
+
+      tip: A `--config` flag must either be a path to a `.toml` configuration file
+           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
+           option
+
+    `lint` is a table of configuration options.
+    Did you want to override one of the table's subkeys?
+
+    Possible choices:
+
+    - `lint.allowed-confusables`
+    - `lint.dummy-variable-rgx`
+    - `lint.extend-ignore`
+    - `lint.extend-select`
+    - `lint.extend-fixable`
+    - `lint.external`
+    - `lint.fixable`
+    - `lint.ignore`
+    - `lint.extend-safe-fixes`
+    - `lint.extend-unsafe-fixes`
+    - `lint.ignore-init-module-imports`
+    - `lint.logger-objects`
+    - `lint.select`
+    - `lint.explicit-preview-rules`
+    - `lint.task-tags`
+    - `lint.typing-modules`
+    - `lint.unfixable`
+    - `lint.per-file-ignores`
+    - `lint.extend-per-file-ignores`
+    - `lint.exclude`
+    - `lint.preview`
+    - `lint.typing-extensions`
+    - `lint.future-annotations`
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn config_doubly_overridden_via_cli() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+line-length = 100
+
+[lint]
+select=["E501"]
+"#,
+    )?;
+    let test_code = "x = 'longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss'";
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        // The --line-length flag takes priority over both the config file
+        // and the `--config="line-length=110"` flag,
+        // despite them both being specified after this flag on the command line:
+        .args(["--line-length", "90"])
+        .arg("--config")
+        .arg("ruff.toml")
+        .args(["--config", "line-length=110"])
+        .arg("-")
+        .pass_stdin(test_code), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:91: E501 Line too long (97 > 90)
+    Found 1 error.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+#[test]
+fn complex_config_setting_overridden_via_cli() -> Result<()> {
+    let fixture = CliTest::with_file("ruff.toml", "lint.select = ['N801']")?;
+    let test_code = "class violates_n801: pass";
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .args(["--config", "lint.per-file-ignores = {'generated.py' = ['N801']}"])
+        .args(["--stdin-filename", "generated.py"])
+        .arg("-")
+        .pass_stdin(test_code), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+#[test]
+fn deprecated_config_option_overridden_via_cli() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--config", "select=['N801']", "-"])
+        .pass_stdin("class lowercase: ..."),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:7: N801 Class name `lowercase` should use CapWords convention
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your `--config` CLI arguments:
+      - 'select' -> 'lint.select'
+    ");
+}
+
+#[test]
+fn extension() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+include = ["*.ipy"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "main.ipy",
+        r#"
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .args(["--extension", "ipy:ipynb"])
+        .arg("."), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.ipy:cell 1:1:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn warn_invalid_noqa_with_no_diagnostics() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .args(["--isolated"])
+            .arg("--select")
+            .arg("F401")
+            .arg("-")
+            .pass_stdin(
+                r#"
+# ruff: noqa: AAA101
+print("Hello world!")
+"#
+            )
+    );
+}
+
+#[test]
+fn file_noqa_external() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint]
+external = ["AAA"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"
+# flake8: noqa: AAA101, BBB102
+import os
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:3:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    warning: Invalid rule code provided to `# ruff: noqa` at -:2: BBB102
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn required_version_exact_mismatch() -> Result<()> {
+    let version = env!("CARGO_PKG_VERSION");
+
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+required-version = "0.1.0"
+"#,
+    )?;
+
+    insta::with_settings!({
+        filters => vec![(version, "[VERSION]")]
+    }, {
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"
+import os
+"#), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Required version `==0.1.0` does not match the running version `[VERSION]`
+    ");
+    });
+
+    Ok(())
+}
+
+#[test]
+fn required_version_exact_match() -> Result<()> {
+    let version = env!("CARGO_PKG_VERSION");
+
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        &format!(
+            r#"
+required-version = "{version}"
+"#
+        ),
+    )?;
+
+    insta::with_settings!({
+        filters => vec![(version, "[VERSION]")]
+    }, {
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"
+import os
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    });
+
+    Ok(())
+}
+
+#[test]
+fn required_version_bound_mismatch() -> Result<()> {
+    let version = env!("CARGO_PKG_VERSION");
+
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        &format!(
+            r#"
+required-version = ">{version}"
+"#
+        ),
+    )?;
+
+    insta::with_settings!({
+        filters => vec![(version, "[VERSION]")]
+    }, {
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"
+import os
+"#), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Required version `>[VERSION]` does not match the running version `[VERSION]`
+    ");
+    });
+
+    Ok(())
+}
+
+#[test]
+fn required_version_bound_match() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+required-version = ">=0.1.0"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin(r#"
+import os
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Expand environment variables in `--config` paths provided via the CLI.
+#[test]
+fn config_expand() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["F"]
+ignore = ["F841"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("${NAME}.toml")
+        .env("NAME", "ruff")
+        .arg("-")
+        .pass_stdin(r#"
+import os
+
+def func():
+    x = 1
+"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Per-file selects via ! negation in per-file-ignores
+#[test]
+fn negated_per_file_ignores() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint.per-file-ignores]
+"!selected.py" = ["RUF"]
+"#,
+    )?;
+    fixture.write_file("selected.py", "")?;
+    fixture.write_file("ignored.py", "")?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("--select")
+        .arg("RUF901")
+        , @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    selected.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+#[test]
+fn negated_per_file_ignores_absolute() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint.per-file-ignores]
+"!src/**.py" = ["RUF"]
+"#,
+    )?;
+    fixture.write_file("src/selected.py", "")?;
+    fixture.write_file("ignored.py", "")?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("--select")
+        .arg("RUF901")
+        , @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    src/selected.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+/// patterns are additive, can't use negative patterns to "un-ignore"
+#[test]
+fn negated_per_file_ignores_overlap() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint.per-file-ignores]
+"*.py" = ["RUF"]
+"!foo.py" = ["RUF"]
+"#,
+    )?;
+    fixture.write_file("foo.py", "")?;
+    fixture.write_file("bar.py", "")?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("--select")
+        .arg("RUF901")
+        , @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+#[test]
+fn unused_interaction() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["F"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("--fix")
+        .arg("-")
+        .pass_stdin(r#"
+import os  # F401
+
+def function():
+    import os  # F811
+    print(os.name)
+"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    import os  # F401
+
+    def function():
+        print(os.name)
+
+    ----- stderr -----
+    Found 1 error (1 fixed, 0 remaining).
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn add_noqa() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["RUF015"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "noqa.py",
+        r#"
+def first_square():
+    return [x * x for x in range(20)][0]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .arg("noqa.py")
+        .args(["--add-noqa"])
+        .arg("-")
+        .pass_stdin(r#"
+
+"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Added 1 noqa directive.
+    ");
+
+    let test_code =
+        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
+
+    insta::assert_snapshot!(test_code, @r"
+    def first_square():
+        return [x * x for x in range(20)][0]  # noqa: RUF015
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn add_noqa_multiple_codes() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["ANN001", "ANN201", "ARG001", "D103"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "noqa.py",
+        r#"
+def unused(x):
+    pass
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .arg("noqa.py")
+        .arg("--preview")
+        .args(["--add-noqa"])
+        .arg("-")
+        .pass_stdin(r#"
+
+"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Added 1 noqa directive.
+    ");
+
+    let test_code =
+        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
+
+    insta::assert_snapshot!(test_code, @r"
+    def unused(x):  # noqa: ANN001, ANN201, D103
+        pass
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn add_noqa_multiline_diagnostic() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["I"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "noqa.py",
+        r#"
+import z
+import c
+import a
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .arg("noqa.py")
+        .args(["--add-noqa"])
+        .arg("-")
+        .pass_stdin(r#"
+
+"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Added 1 noqa directive.
+    ");
+
+    let test_code =
+        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
+
+    insta::assert_snapshot!(test_code, @r"
+    import z  # noqa: I001
+    import c
+    import a
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn add_noqa_existing_noqa() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["ANN001", "ANN201", "ARG001", "D103"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "noqa.py",
+        r#"
+def unused(x):  # noqa: ANN001, ARG001, D103
+    pass
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .arg("noqa.py")
+        .arg("--preview")
+        .args(["--add-noqa"])
+        .arg("-")
+        .pass_stdin(r#"
+
+"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Added 1 noqa directive.
+    ");
+
+    let test_code =
+        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
+
+    insta::assert_snapshot!(test_code, @r"
+    def unused(x):  # noqa: ANN001, ANN201, ARG001, D103
+        pass
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn add_noqa_multiline_comment() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["UP031"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "noqa.py",
+        r#"
+print(
+    """First line
+    second line
+    third line
+      %s"""
+    % name
+)
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--config", "ruff.toml"])
+        .arg("noqa.py")
+        .arg("--preview")
+        .args(["--add-noqa"])
+        .arg("-")
+        .pass_stdin(r#"
+
+"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Added 1 noqa directive.
+    ");
+
+    let test_code =
+        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
+
+    insta::assert_snapshot!(test_code, @r#"
+    print(
+        """First line
+        second line
+        third line
+          %s"""  # noqa: UP031
+        % name
+    )
+    "#);
+
+    Ok(())
+}
+
+#[test]
+fn add_noqa_exclude() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+exclude = ["excluded.py"]
+select = ["RUF015"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "noqa.py",
+        r#"
+def first_square():
+    return [x * x for x in range(20)][0]
+"#,
+    )?;
+
+    fixture.write_file(
+        "excluded.py",
+        r#"
+def first_square():
+    return [x * x for x in range(20)][0]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--add-noqa"]), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Added 1 noqa directive.
+    ");
+
+    Ok(())
+}
+
+/// Regression test for <https://github.com/astral-sh/ruff/issues/2253>
+#[test]
+fn add_noqa_parent() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "noqa.py",
+        r#"
+from foo import (  # noqa: F401
+		bar
+)
+		"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--add-noqa")
+        .arg("--select=F401")
+        .arg("noqa.py"), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Infer `3.11` from `requires-python` in `pyproject.toml`.
+#[test]
+fn requires_python() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+
+[tool.ruff.lint]
+select = ["UP006"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("pyproject.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    let fixture2 = CliTest::with_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.8"
+
+[tool.ruff.lint]
+select = ["UP006"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture2
+        .check_command()
+        .arg("--config")
+        .arg("pyproject.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Infer `3.11` from `requires-python` in `pyproject.toml`.
+#[test]
+fn requires_python_patch() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11.4"
+
+[tool.ruff.lint]
+select = ["UP006"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("pyproject.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Infer `3.11` from `requires-python` in `pyproject.toml`.
+#[test]
+fn requires_python_equals() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = "== 3.11"
+
+[tool.ruff.lint]
+select = ["UP006"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("pyproject.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Infer `3.11` from `requires-python` in `pyproject.toml`.
+#[test]
+fn requires_python_equals_patch() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = "== 3.11.4"
+
+[tool.ruff.lint]
+select = ["UP006"]
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("pyproject.toml")
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml #<--- no `[tool.ruff]`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_no_tool() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"from typing import Union;foo: Union[int, str] = 1"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .args(["--select", "UP007"])
+            .arg("test.py")
+            .arg("-")
+    );
+
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml #<--- no `[tool.ruff]`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_no_tool_preview_enabled() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"from typing import Union;foo: Union[int, str] = 1"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--preview")
+            .arg("--show-settings")
+            .args(["--select", "UP007"])
+            .arg("test.py")
+            .arg("-")
+    );
+
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml #<--- no `[tool.ruff]`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_no_tool_target_version_override() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"from typing import Union;foo: Union[int, str] = 1"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .args(["--select", "UP007"])
+            .args(["--target-version", "py310"])
+            .arg("test.py")
+            .arg("-")
+    );
+
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml #<--- no `[tool.ruff]`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_no_tool_with_check() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"from typing import Union;foo: Union[int, str] = 1"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .args(["--select","UP007"])
+        .arg(".")
+        , @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:31: UP007 [*] Use `X | Y` for type annotations
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    "###);
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml #<-- no [tool.ruff]
+/// ├── ruff.toml #<-- no `target-version`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_ruff_toml_no_target_fallback() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"[lint]
+select = ["UP007"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"
+from typing import Union;foo: Union[int, str] = 1
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("test.py")
+            .arg("--show-settings"),
+    );
+
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml #<-- no [tool.ruff]
+/// ├── ruff.toml #<-- no `target-version`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_ruff_toml_no_target_fallback_check() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"[lint]
+select = ["UP007"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"
+from typing import Union;foo: Union[int, str] = 1"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("test.py")
+        , @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:2:31: UP007 [*] Use `X | Y` for type annotations
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── foo
+/// │  ├── pyproject.toml #<-- no [tool.ruff], no `requires-python`
+/// │  └── test.py
+/// └── pyproject.toml #<-- no [tool.ruff], has `requires-python`
+/// ```
+#[test]
+fn requires_python_pyproject_toml_above() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "foo/pyproject.toml",
+        r#"[project]
+"#,
+    )?;
+
+    fixture.write_file(
+        "foo/test.py",
+        r#"
+from typing import Union;foo: Union[int, str] = 1
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .args(["--select", "UP007"])
+            .arg("foo/test.py"),
+    );
+
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── foo
+/// │  ├── pyproject.toml #<-- has [tool.ruff], no `requires-python`
+/// │  └── test.py
+/// └── pyproject.toml #<-- no [tool.ruff], has `requires-python`
+/// ```
+#[test]
+fn requires_python_pyproject_toml_above_with_tool() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "foo/pyproject.toml",
+        r#"
+[tool.ruff]
+target-version = "py310"
+"#,
+    )?;
+
+    fixture.write_file(
+        "foo/test.py",
+        r#"
+from typing import Union;foo: Union[int, str] = 1
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .args(["--select", "UP007"])
+            .arg("foo/test.py"),
+    );
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── foo
+/// │  ├── pyproject.toml #<-- no [tool.ruff]
+/// │  └── test.py
+/// └── ruff.toml #<-- no `target-version`
+/// ```
+#[test]
+fn requires_python_ruff_toml_above() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+[lint]
+select = ["UP007"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "foo/pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    fixture.write_file(
+        "foo/test.py",
+        r#"
+from typing import Union;foo: Union[int, str] = 1
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .arg("foo/test.py"),
+    );
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .arg("test.py")
+            .current_dir(fixture.root().join("foo")),
+    );
+    Ok(())
+}
+
+/// ```
+/// tmp
+/// ├── pyproject.toml <-- requires >=3.10
+/// ├── ruff.toml <--- extends base
+/// ├── shared
+/// │   └── base_config.toml <-- targets 3.11
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_extend_from_shared_config() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "ruff.toml",
+        r#"
+extend = "./shared/base_config.toml"
+[lint]
+select = ["UP007"]
+"#,
+    )?;
+
+    fixture.write_file(
+        "pyproject.toml",
+        r#"[project]
+requires-python = ">= 3.10"
+"#,
+    )?;
+
+    fixture.write_file(
+        "shared/base_config.toml",
+        r#"
+target-version = "py311"
+"#,
+    )?;
+
+    fixture.write_file(
+        "test.py",
+        r#"
+from typing import Union;foo: Union[int, str] = 1
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture
+            .check_command()
+            .arg("--show-settings")
+            .arg("test.py"),
+    );
+    Ok(())
+}
+
+#[test]
+fn checks_notebooks_in_stable() -> anyhow::Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file(
+        "main.ipynb",
+        r#"
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import random"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--select")
+        .arg("F401")
+        , @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.ipynb:cell 1:1:8: F401 [*] `random` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+/// Verify that implicit namespace packages are detected even when they are nested.
+///
+/// See: <https://github.com/astral-sh/ruff/issues/13519>
+#[test]
+fn nested_implicit_namespace_package() -> Result<()> {
+    let fixture = CliTest::new()?;
+
+    fixture.write_file("foo/__init__.py", "")?;
+    fixture.write_file("foo/bar/baz/__init__.py", "")?;
+    fixture.write_file("foo/bar/baz/bop.py", "")?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--select")
+        .arg("INP")
+        , @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    ");
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--select")
+        .arg("INP")
+        .arg("--preview")
+        , @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    foo/bar/baz/__init__.py:1:1: INP001 File `foo/bar/baz/__init__.py` declares a package, but is nested under an implicit namespace package. Add an `__init__.py` to `foo/bar`.
+    Found 1 error.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn flake8_import_convention_invalid_aliases_config_alias_name() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint.flake8-import-conventions.aliases]
+"module.name" = "invalid.alias"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin("")
+        , @r#"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load configuration `[TMP]/ruff.toml`
+      Cause: Failed to parse [TMP]/ruff.toml
+      Cause: TOML parse error at line 3, column 17
+      |
+    3 | "module.name" = "invalid.alias"
+      |                 ^^^^^^^^^^^^^^^
+    invalid value: string "invalid.alias", expected a Python identifier
+    "#);
+    Ok(())
+}
+
+#[test]
+fn flake8_import_convention_invalid_aliases_config_extend_alias_name() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint.flake8-import-conventions.extend-aliases]
+"module.name" = "__debug__"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin("")
+        , @r#"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load configuration `[TMP]/ruff.toml`
+      Cause: Failed to parse [TMP]/ruff.toml
+      Cause: TOML parse error at line 3, column 17
+      |
+    3 | "module.name" = "__debug__"
+      |                 ^^^^^^^^^^^
+    invalid value: string "__debug__", expected an assignable Python identifier
+    "#);
+    Ok(())
+}
+
+#[test]
+fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint.flake8-import-conventions.aliases]
+"module..invalid" = "alias"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin("")
+        , @r#"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load configuration `[TMP]/ruff.toml`
+      Cause: Failed to parse [TMP]/ruff.toml
+      Cause: TOML parse error at line 3, column 1
+      |
+    3 | "module..invalid" = "alias"
+      | ^^^^^^^^^^^^^^^^^
+    invalid value: string "module..invalid", expected a sequence of Python identifiers delimited by periods
+    "#);
+    Ok(())
+}
+
+#[test]
+fn flake8_import_convention_nfkc_normalization() -> Result<()> {
+    let fixture = CliTest::with_file(
+        "ruff.toml",
+        r#"
+[lint.flake8-import-conventions.aliases]
+"test.module" = "_﹏𝘥𝘦𝘣𝘶𝘨﹏﹏"
+"#,
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--config")
+        .arg("ruff.toml")
+        .arg("-")
+        .pass_stdin("")
+        , @r###"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Invalid alias for module 'test.module': alias normalizes to '__debug__', which is not allowed.
+    "###);
+    Ok(())
+}
+
+#[test]
+fn flake8_import_convention_unused_aliased_import() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .arg("--config")
+            .arg(r#"lint.isort.required-imports = ["import pandas"]"#)
+            .args(["--select", "I002,ICN001,F401"])
+            .args(["--stdin-filename", "test.py"])
+            .arg("--unsafe-fixes")
+            .arg("--fix")
+            .arg("-")
+            .pass_stdin("1")
+    );
+}
+
+#[test]
+fn flake8_import_convention_unused_aliased_import_no_conflict() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .arg("--config")
+            .arg(r#"lint.isort.required-imports = ["import pandas as pd"]"#)
+            .args(["--select", "I002,ICN001,F401"])
+            .args(["--stdin-filename", "test.py"])
+            .arg("--unsafe-fixes")
+            .arg("--fix")
+            .arg("-")
+            .pass_stdin("1")
+    );
+}
+
+// https://github.com/astral-sh/ruff/issues/19842
+#[test]
+fn pyupgrade_up026_respects_isort_required_import_fix() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .arg("--isolated")
+            .arg("check")
+            .arg("-")
+            .args(["--select", "I002,UP026"])
+            .arg("--config")
+            .arg(r#"lint.isort.required-imports=["import mock"]"#)
+            .arg("--fix")
+            .arg("--no-cache")
+            .pass_stdin("1\n"),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    import mock
+    1
+
+    ----- stderr -----
+    Found 1 error (1 fixed, 0 remaining).
+    "
+    );
+}
+
+// https://github.com/astral-sh/ruff/issues/19842
+#[test]
+fn pyupgrade_up026_respects_isort_required_import_from_fix() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .arg("--isolated")
+            .arg("check")
+            .arg("-")
+            .args(["--select", "I002,UP026"])
+            .arg("--config")
+            .arg(r#"lint.isort.required-imports = ["from mock import mock"]"#)
+            .arg("--fix")
+            .arg("--no-cache")
+            .pass_stdin("from mock import mock\n"),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    from mock import mock
+
+    ----- stderr -----
+    All checks passed!
+    "
+    );
+}
+
+// See: https://github.com/astral-sh/ruff/issues/16177
+#[test]
+fn flake8_pyi_redundant_none_literal() {
+    let snippet = r#"
+from typing import Literal
+
+# For each of these expressions, Ruff provides a fix for one of the `Literal[None]` elements
+# but not both, as if both were autofixed it would result in `None | None`,
+# which leads to a `TypeError` at runtime.
+a: Literal[None,] | Literal[None,]
+b: Literal[None] | Literal[None]
+c: Literal[None] | Literal[None,]
+d: Literal[None,] | Literal[None]
+"#;
+
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--select", "PYI061"])
+        .args(["--stdin-filename", "test.py"])
+        .arg("--preview")
+        .arg("--diff")
+        .arg("-")
+        .pass_stdin(snippet), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    --- test.py
+    +++ test.py
+    @@ -4,7 +4,7 @@
+     # For each of these expressions, Ruff provides a fix for one of the `Literal[None]` elements
+     # but not both, as if both were autofixed it would result in `None | None`,
+     # which leads to a `TypeError` at runtime.
+    -a: Literal[None,] | Literal[None,]
+    -b: Literal[None] | Literal[None]
+    -c: Literal[None] | Literal[None,]
+    -d: Literal[None,] | Literal[None]
+    +a: None | Literal[None,]
+    +b: None | Literal[None]
+    +c: None | Literal[None,]
+    +d: None | Literal[None]
+
+
+    ----- stderr -----
+    Would fix 4 errors.
+    ");
+}
+
+/// Test that private, old-style `TypeVar` generics
+/// 1. Get replaced with PEP 695 type parameters (UP046, UP047)
+/// 2. Get renamed to remove leading underscores (UP049)
+/// 3. Emit a warning that the standalone type variable is now unused (PYI018)
+/// 4. Remove the now-unused `Generic` import
+#[test]
+fn pep695_generic_rename() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--select", "F401,PYI018,UP046,UP047,UP049"])
+        .args(["--stdin-filename", "test.py"])
+        .arg("--unsafe-fixes")
+        .arg("--fix")
+        .arg("--preview")
+        .arg("--target-version=py312")
+        .arg("-")
+        .pass_stdin(
+            r#"
+from typing import Generic, TypeVar
+_T = TypeVar("_T")
+
+class OldStyle(Generic[_T]):
+    var: _T
+
+def func(t: _T) -> _T:
+    x: _T
+    return x
+"#
+        ),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+
+    class OldStyle[T]:
+        var: T
+
+    def func[T](t: T) -> T:
+        x: T
+        return x
+
+    ----- stderr -----
+    Found 7 errors (7 fixed, 0 remaining).
+    "
+    );
+}
+
+/// Test that we do not rename two different type parameters to the same name
+/// in one execution of Ruff (autofixing this to `class Foo[T, T]: ...` would
+/// introduce invalid syntax)
+#[test]
+fn type_parameter_rename_isolation() {
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--select", "UP049"])
+        .args(["--stdin-filename", "test.py"])
+        .arg("--unsafe-fixes")
+        .arg("--fix")
+        .arg("--preview")
+        .arg("--target-version=py312")
+        .arg("-")
+        .pass_stdin(
+            r#"
+class Foo[_T, __T]:
+    pass
+"#
+        ),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+
+    class Foo[T, __T]:
+        pass
+
+    ----- stderr -----
+    test.py:2:14: UP049 Generic class uses private type parameters
+    Found 2 errors (1 fixed, 1 remaining).
+    "
+    );
+}
+
+/// construct a directory tree with this structure:
+/// .
+/// ├── abc
+/// │  └── __init__.py
+/// ├── collections
+/// │  ├── __init__.py
+/// │  ├── abc
+/// │  │  └── __init__.py
+/// │  └── foobar
+/// │      └── __init__.py
+/// ├── foobar
+/// │  ├── __init__.py
+/// │  ├── abc
+/// │  │  └── __init__.py
+/// │  └── collections
+/// │      ├── __init__.py
+/// │      ├── abc
+/// │      │  └── __init__.py
+/// │      └── foobar
+/// │          └── __init__.py
+/// ├── ruff.toml
+/// └── urlparse
+///     └── __init__.py
+fn create_a005_module_structure(fixture: &CliTest) -> Result<()> {
+    // Create module structure
+    fixture.write_file("abc/__init__.py", "")?;
+    fixture.write_file("collections/__init__.py", "")?;
+    fixture.write_file("collections/abc/__init__.py", "")?;
+    fixture.write_file("collections/foobar/__init__.py", "")?;
+    fixture.write_file("foobar/__init__.py", "")?;
+    fixture.write_file("foobar/abc/__init__.py", "")?;
+    fixture.write_file("foobar/collections/__init__.py", "")?;
+    fixture.write_file("foobar/collections/abc/__init__.py", "")?;
+    fixture.write_file("urlparse/__init__.py", "")?;
+    // also create a ruff.toml to mark the project root
+    fixture.write_file("ruff.toml", "")?;
+
+    Ok(())
+}
+
+/// Test A005 with `strict-checking = true`
+#[test]
+fn a005_module_shadowing_strict() -> Result<()> {
+    let fixture = CliTest::new()?;
+    create_a005_module_structure(&fixture)?;
+
+    assert_cmd_snapshot!(fixture.check_command()
+        .arg("--config")
+        .arg(r#"lint.flake8-builtins.strict-checking = true"#)
+        .args(["--select", "A005"]),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
+    collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
+    collections/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
+    foobar/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
+    foobar/collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
+    foobar/collections/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
+    Found 6 errors.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Test A005 with `strict-checking = false`
+#[test]
+fn a005_module_shadowing_non_strict() -> Result<()> {
+    let fixture = CliTest::new()?;
+    create_a005_module_structure(&fixture)?;
+
+    assert_cmd_snapshot!(fixture.check_command()
+        .arg("--config")
+        .arg(r#"lint.flake8-builtins.strict-checking = false"#)
+        .args(["--select", "A005"]),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
+    collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
+    Found 2 errors.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Test A005 with `strict-checking` unset
+///
+/// This should match the non-strict version directly above
+/// Test A005 with `strict-checking` default (should be `false`)
+#[test]
+fn a005_module_shadowing_strict_default() -> Result<()> {
+    let fixture = CliTest::new()?;
+    create_a005_module_structure(&fixture)?;
+
+    assert_cmd_snapshot!(fixture.check_command()
+        .args(["--select", "A005"]),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
+    collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
+    Found 2 errors.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Test that the linter respects per-file-target-version.
+#[test]
+fn per_file_target_version_linter() {
+    // without per-file-target-version, there should be one UP046 error
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--target-version", "py312"])
+        .args(["--select", "UP046"]) // only triggers on 3.12+
+        .args(["--stdin-filename", "test.py"])
+        .arg("--preview")
+        .arg("-")
+        .pass_stdin(r#"
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+class A(Generic[T]):
+    var: T
+"#),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:6:9: UP046 Generic class `A` uses `Generic` subclass instead of type parameters
+    Found 1 error.
+    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
+
+    ----- stderr -----
+    "
+    );
+
+    // with per-file-target-version, there should be no errors because the new generic syntax is
+    // unavailable
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--target-version", "py312"])
+        .args(["--config", r#"per-file-target-version = {"test.py" = "py311"}"#])
+        .args(["--select", "UP046"]) // only triggers on 3.12+
+        .args(["--stdin-filename", "test.py"])
+        .arg("--preview")
+        .arg("-")
+        .pass_stdin(r#"
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+class A(Generic[T]):
+    var: T
+"#),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "
+    );
+}
+
+#[test]
+fn walrus_before_py38() {
+    // ok
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--stdin-filename", "test.py"])
+        .arg("--target-version=py38")
+        .arg("-")
+        .pass_stdin(r#"(x := 1)"#),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "
+    );
+
+    // not ok on 3.7 with preview
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--stdin-filename", "test.py"])
+        .arg("--target-version=py37")
+        .arg("--preview")
+        .arg("-")
+        .pass_stdin(r#"(x := 1)"#),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:2: invalid-syntax: Cannot use named assignment expression (`:=`) on Python 3.7 (syntax was added in Python 3.8)
+    Found 1 error.
+
+    ----- stderr -----
+    "
+    );
+}
+
+#[test]
+fn match_before_py310() {
+    // ok on 3.10
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--stdin-filename", "test.py"])
+        .arg("--target-version=py310")
+        .arg("-")
+        .pass_stdin(
+            r#"
+match 2:
+    case 1:
+        print("it's one")
+"#
+        ),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "
+    );
+
+    // ok on 3.9 without preview
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--stdin-filename", "test.py"])
+        .arg("--target-version=py39")
+        .arg("-")
+        .pass_stdin(
+            r#"
+match 2:
+    case 1:
+        print("it's one")
+"#
+        ),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    Found 1 error.
+
+    ----- stderr -----
+    "
+    );
+
+    // syntax error on 3.9 with preview
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .args(["--stdin-filename", "test.py"])
+        .arg("--target-version=py39")
+        .arg("--preview")
+        .arg("-")
+        .pass_stdin(
+            r#"
+match 2:
+    case 1:
+        print("it's one")
+"#
+        ),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    Found 1 error.
+
+    ----- stderr -----
+    "
+    );
+}
+
+/// Regression test for <https://github.com/astral-sh/ruff/issues/16417>
+#[test]
+fn cache_syntax_errors() -> Result<()> {
+    let fixture = CliTest::with_file("main.py", "match 2:\n    case 1: ...")?;
+
+    let mut cmd = fixture.command();
+    // inline STDIN_BASE_OPTIONS to remove --no-cache
+    cmd.args(["check", "--output-format", "concise"])
+        .arg("--target-version=py39")
+        .arg("--preview")
+        .arg("--quiet"); // suppress `debug build without --no-cache` warnings
+
+    assert_cmd_snapshot!(
+        cmd,
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+
+    ----- stderr -----
+    "
+    );
+
+    // this should *not* be cached, like normal parse errors
+    assert_cmd_snapshot!(
+        cmd,
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+
+    ----- stderr -----
+    "
+    );
+
+    Ok(())
+}
+
+/// Regression test for <https://github.com/astral-sh/ruff/issues/9381> with very helpful
+/// reproduction repo here: <https://github.com/lucasfijen/example_ruff_glob_bug>
+#[test]
+fn cookiecutter_globbing() -> Result<()> {
+    // This is a simplified directory structure from the repo linked above. The essence of the
+    // problem is this `{{cookiecutter.repo_name}}` directory containing a config file with a glob.
+    // The absolute path of the glob contains the glob metacharacters `{{` and `}}` even though the
+    // user's glob does not.
+    let fixture = CliTest::new()?;
+
+    fixture.write_file(
+        "{{cookiecutter.repo_name}}/pyproject.toml",
+        r#"tool.ruff.lint.per-file-ignores = { "tests/*" = ["F811"] }"#,
+    )?;
+
+    // F811 example from the docs to ensure the glob still works
+    fixture.write_file(
+        "{{cookiecutter.repo_name}}/tests/maintest.py",
+        "import foo\nimport bar\nimport foo",
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--select=F811"), @r"
+		success: true
+		exit_code: 0
+		----- stdout -----
+		All checks passed!
+
+		----- stderr -----
+		");
+
+    // after removing the config file with the ignore, F811 applies, so the glob worked above
+    fs::remove_file(
+        fixture
+            .root()
+            .join("{{cookiecutter.repo_name}}/pyproject.toml"),
+    )?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .arg("--select=F811"), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    {{cookiecutter.repo_name}}/tests/maintest.py:3:8: F811 [*] Redefinition of unused `foo` from line 1: `foo` redefined here
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+
+    Ok(())
+}
+
+/// Like the test above but exercises the non-absolute path case in `PerFile::new`
+#[test]
+fn cookiecutter_globbing_no_project_root() -> Result<()> {
+    let fixture = CliTest::new()?;
+
+    // Create the nested directory structure
+    fs::create_dir(fixture.root().join("{{cookiecutter.repo_name}}"))?;
+
+    assert_cmd_snapshot!(fixture
+        .check_command()
+        .current_dir(fixture.root().join("{{cookiecutter.repo_name}}"))
+        .args(["--extend-per-file-ignores", "generated.py:Q"]), @r"
+	success: true
+	exit_code: 0
+	----- stdout -----
+	All checks passed!
+
+	----- stderr -----
+	warning: No Python files found under the given path(s)
+	");
+
+    Ok(())
+}
+
+/// Test that semantic syntax errors (1) are emitted, (2) are not cached, (3) don't affect the
+/// reporting of normal diagnostics, and (4) are not suppressed by `select = []` (or otherwise
+/// disabling all AST-based rules).
+#[test]
+fn semantic_syntax_errors() -> Result<()> {
+    let fixture = CliTest::with_file("main.py", "[(x := 1) for x in foo]")?;
+    let contents = "[(x := 1) for x in foo]";
+
+    let mut cmd = fixture.command();
+    // inline STDIN_BASE_OPTIONS to remove --no-cache
+    cmd.args(["check", "--output-format", "concise"])
+        .arg("--preview")
+        .arg("--quiet"); // suppress `debug build without --no-cache` warnings
+
+    assert_cmd_snapshot!(
+        cmd,
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    main.py:1:20: F821 Undefined name `foo`
+
+    ----- stderr -----
+    "
+    );
+
+    // this should *not* be cached, like normal parse errors
+    assert_cmd_snapshot!(
+        cmd,
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    main.py:1:20: F821 Undefined name `foo`
+
+    ----- stderr -----
+    "
+    );
+
+    // ensure semantic errors are caught even without AST-based rules selected
+    assert_cmd_snapshot!(
+        fixture.check_command()
+            .args(["--config", "lint.select = []"])
+            .arg("--preview")
+            .arg("-")
+            .pass_stdin(contents),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    Found 1 error.
+
+    ----- stderr -----
+    "
+    );
+
+    Ok(())
+}
+
+/// Regression test for <https://github.com/astral-sh/ruff/issues/17821>.
+///
+/// `lint.typing-extensions = false` with Python 3.9 should disable the PYI019 lint because it would
+/// try to import `Self` from `typing_extensions`
+#[test]
+fn combine_typing_extensions_config() {
+    let contents = "
+from typing import TypeVar
+T = TypeVar('T')
+class Foo:
+    def f(self: T) -> T: ...
+";
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .args(["--config", "lint.typing-extensions = false"])
+            .arg("--select=PYI019")
+            .arg("--target-version=py39")
+            .arg("-")
+            .pass_stdin(contents),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "
+    );
+}
+
+#[test_case::test_case("concise")]
+#[test_case::test_case("full")]
+#[test_case::test_case("json")]
+#[test_case::test_case("json-lines")]
+#[test_case::test_case("junit")]
+#[test_case::test_case("grouped")]
+#[test_case::test_case("github")]
+#[test_case::test_case("gitlab")]
+#[test_case::test_case("pylint")]
+#[test_case::test_case("rdjson")]
+#[test_case::test_case("azure")]
+#[test_case::test_case("sarif")]
+fn output_format(output_format: &str) -> Result<()> {
+    const CONTENT: &str = "\
+import os  # F401
+x = y      # F821
+match 42:  # invalid-syntax
+    case _: ...
+";
+
+    let fixture = CliTest::with_settings(|_project_dir, mut settings| {
+        // JSON double escapes backslashes
+        settings.add_filter(r#""[^"]+\\?/?input.py"#, r#""[TMP]/input.py"#);
+
+        settings
+    })?;
+
+    fixture.write_file("input.py", CONTENT)?;
+
+    let snapshot = format!("output_format_{output_format}");
+
+    assert_cmd_snapshot!(
+        snapshot,
+        fixture.command().args([
+            "check",
+            "--no-cache",
+            "--output-format",
+            output_format,
+            "--select",
+            "F401,F821",
+            "--target-version",
+            "py39",
+            "input.py",
+        ])
+    );
+
+    Ok(())
+}
+
+#[test_case::test_case("concise"; "concise_show_fixes")]
+#[test_case::test_case("full"; "full_show_fixes")]
+#[test_case::test_case("grouped"; "grouped_show_fixes")]
+fn output_format_show_fixes(output_format: &str) -> Result<()> {
+    let fixture = CliTest::with_file("input.py", "import os  # F401")?;
+    let snapshot = format!("output_format_show_fixes_{output_format}");
+
+    assert_cmd_snapshot!(
+        snapshot,
+        fixture.command().args([
+            "check",
+            "--no-cache",
+            "--output-format",
+            output_format,
+            "--select",
+            "F401",
+            "--fix",
+            "--show-fixes",
+            "input.py",
+        ])
+    );
+
+    Ok(())
+}
+
+#[test]
+fn up045_nested_optional_flatten_all() {
+    let contents = "\
+from typing import Optional
+nested_optional: Optional[Optional[Optional[str]]] = None
+";
+
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
+            .arg("-")
+            .pass_stdin(contents),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    @@ -1,2 +1,2 @@
+     from typing import Optional
+    -nested_optional: Optional[Optional[Optional[str]]] = None
+    +nested_optional: str | None = None
+
+
+    ----- stderr -----
+    Would fix 1 error.
+    ",
+    );
+}
+
+#[test]
+fn show_fixes_in_full_output_with_preview_enabled() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(["check", "--no-cache", "--output-format", "full"])
+            .args(["--select", "F401"])
+            .arg("--preview")
+            .arg("-")
+            .pass_stdin("import math"),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    F401 [*] `math` imported but unused
+     --> -:1:8
+      |
+    1 | import math
+      |        ^^^^
+      |
+    help: Remove unused import: `math`
+      - import math
+
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ",
+    );
+}
+
+#[test]
+fn rule_panic_mixed_results_concise() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file("normal.py", "import os")?;
+    fixture.write_file("panic.py", "print('hello, world!')")?;
+
+    assert_cmd_snapshot!(
+        fixture.check_command()
+            .args(["--select", "RUF9", "--preview"])
+            .args(["normal.py", "panic.py"]),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+    normal.py:1:1: RUF900 Hey this is a stable test rule.
+    normal.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    normal.py:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
+    normal.py:1:1: RUF903 Hey this is a stable test rule with a display only fix.
+    normal.py:1:1: RUF911 Hey this is a preview test rule.
+    normal.py:1:1: RUF950 Hey this is a test rule that was redirected from another.
+    panic.py: panic: Panicked at <location> when checking `[TMP]/panic.py`: `This is a fake panic for testing.`
+    Found 7 errors.
+    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
+
+    ----- stderr -----
+    error: Panic during linting indicates a bug in Ruff. If you could open an issue at:
+
+    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
+
+    ...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
+    ");
+
+    Ok(())
+}
+
+#[test]
+fn rule_panic_mixed_results_full() -> Result<()> {
+    let fixture = CliTest::new()?;
+    fixture.write_file("normal.py", "import os")?;
+    fixture.write_file("panic.py", "print('hello, world!')")?;
+
+    assert_cmd_snapshot!(
+        fixture.command()
+            .args(["check", "--select", "RUF9", "--preview", "--output-format=full", "--no-cache"])
+            .args(["normal.py", "panic.py"]),
+        @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+    RUF900 Hey this is a stable test rule.
+    --> normal.py:1:1
+
+    RUF901 [*] Hey this is a stable test rule with a safe fix.
+    --> normal.py:1:1
+    1 + # fix from stable-test-rule-safe-fix
+    2 | import os
+
+    RUF902 Hey this is a stable test rule with an unsafe fix.
+    --> normal.py:1:1
+
+    RUF903 Hey this is a stable test rule with a display only fix.
+    --> normal.py:1:1
+
+    RUF911 Hey this is a preview test rule.
+    --> normal.py:1:1
+
+    RUF950 Hey this is a test rule that was redirected from another.
+    --> normal.py:1:1
+
+    panic: Panicked at <location> when checking `[TMP]/panic.py`: `This is a fake panic for testing.`
+    --> panic.py:1:1
+    info: This indicates a bug in Ruff.
+    info: If you could open an issue at https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, we'd be very appreciative!
+    info: run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information
+
+    Found 7 errors.
+    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
+
+    ----- stderr -----
+    error: Panic during linting indicates a bug in Ruff. If you could open an issue at:
+
+    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
+
+    ...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
+    ");
+
+    Ok(())
+}
+
+/// Test that the same rule fires across all supported extensions, but not on unsupported files
+#[test]
+fn supported_file_extensions() -> Result<()> {
+    let fixture = CliTest::new()?;
+
+    // Create files of various types
+    // text file
+    fixture.write_file("src/thing.txt", "hello world\n")?;
+    // regular python
+    fixture.write_file("src/thing.py", "import os\nprint('hello world')\n")?;
+    // python typestub
+    fixture.write_file("src/thing.pyi", "import os\nclass foo:\n  ...\n")?;
+    // windows gui
+    fixture.write_file("src/thing.pyw", "import os\nprint('hello world')\n")?;
+    // cython
+    fixture.write_file(
+        "src/thing.pyx",
+        "import os\ncdef int add(int a, int b):\n  return a + b\n",
+    )?;
+    // notebook
+    fixture.write_file(
+        "src/thing.ipynb",
+        r#"
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture.check_command()
+            .args(["--select", "F401"])
+            .arg("src"),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    src/thing.ipynb:cell 1:1:8: F401 [*] `os` imported but unused
+    src/thing.py:1:8: F401 [*] `os` imported but unused
+    src/thing.pyi:1:8: F401 [*] `os` imported but unused
+    Found 3 errors.
+    [*] 3 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
+
+/// Test that the same rule fires across all supported extensions, but not on unsupported files
+#[test]
+fn supported_file_extensions_preview_enabled() -> Result<()> {
+    let fixture = CliTest::new()?;
+
+    // Create files of various types
+    // text file
+    fixture.write_file("src/thing.txt", "hello world\n")?;
+    // regular python
+    fixture.write_file("src/thing.py", "import os\nprint('hello world')\n")?;
+    // python typestub
+    fixture.write_file("src/thing.pyi", "import os\nclass foo:\n  ...\n")?;
+    // windows gui
+    fixture.write_file("src/thing.pyw", "import os\nprint('hello world')\n")?;
+    // cython
+    fixture.write_file(
+        "src/thing.pyx",
+        "import os\ncdef int add(int a, int b):\n  return a + b\n",
+    )?;
+    // notebook
+    fixture.write_file(
+        "src/thing.ipynb",
+        r#"
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"#,
+    )?;
+
+    assert_cmd_snapshot!(
+        fixture.check_command()
+            .args(["--select", "F401", "--preview"])
+            .arg("src"),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    src/thing.ipynb:cell 1:1:8: F401 [*] `os` imported but unused
+    src/thing.py:1:8: F401 [*] `os` imported but unused
+    src/thing.pyi:1:8: F401 [*] `os` imported but unused
+    src/thing.pyw:1:8: F401 [*] `os` imported but unused
+    Found 4 errors.
+    [*] 4 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    Ok(())
+}
diff --git a/crates/ruff/tests/cli/main.rs b/crates/ruff/tests/cli/main.rs
new file mode 100644
index 0000000000..ef7313253e
--- /dev/null
+++ b/crates/ruff/tests/cli/main.rs
@@ -0,0 +1,194 @@
+//! Test fixture utilities for ruff CLI tests
+//!
+//! The core concept is borrowed from ty/tests/cli/main.rs and can be extended
+//! with more functionality from there in the future if needed.
+
+#![cfg(not(target_family = "wasm"))]
+
+use anyhow::{Context as _, Result};
+use insta::internals::SettingsBindDropGuard;
+use insta_cmd::get_cargo_bin;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+    process::Command,
+};
+use tempfile::TempDir;
+
+mod format;
+mod lint;
+
+const BIN_NAME: &str = "ruff";
+
+/// Creates a regex filter for replacing temporary directory paths in snapshots
+pub(crate) fn tempdir_filter(path: impl AsRef<str>) -> String {
+    format!(r"{}[\\/]?", regex::escape(path.as_ref()))
+}
+
+/// A test fixture for running ruff CLI tests with temporary directories and files.
+///
+/// This fixture provides:
+/// - Temporary directory management
+/// - File creation utilities
+/// - Proper snapshot filtering for cross-platform compatibility
+/// - Pre-configured ruff command creation
+///
+/// # Example
+///
+/// ```rust,no_run
+/// use crate::common::RuffTestFixture;
+///
+/// let fixture = RuffTestFixture::with_file("ruff.toml", "select = ['E']")?;
+/// let output = fixture.command().args(["check", "."]).output()?;
+/// ```
+pub(crate) struct CliTest {
+    _temp_dir: TempDir,
+    _settings_scope: SettingsBindDropGuard,
+    project_dir: PathBuf,
+}
+
+impl CliTest {
+    /// Creates a new test fixture with an empty temporary directory.
+    ///
+    /// This sets up:
+    /// - A temporary directory that's automatically cleaned up
+    /// - Insta snapshot filters for cross-platform path compatibility
+    /// - Environment isolation for consistent test behavior
+    pub(crate) fn new() -> Result<Self> {
+        Self::with_settings(|_, settings| settings)
+    }
+
+    pub(crate) fn with_files<'a>(
+        files: impl IntoIterator<Item = (&'a str, &'a str)>,
+    ) -> anyhow::Result<Self> {
+        let case = Self::new()?;
+        for file in files {
+            case.write_file(file.0, file.1)?;
+        }
+        Ok(case)
+    }
+
+    pub(crate) fn with_settings(
+        setup_settings: impl FnOnce(&Path, insta::Settings) -> insta::Settings,
+    ) -> Result<Self> {
+        let temp_dir = TempDir::new()?;
+
+        // Canonicalize the tempdir path because macOS uses symlinks for tempdirs
+        // and that doesn't play well with our snapshot filtering.
+        // Simplify with dunce because otherwise we get UNC paths on Windows.
+        let project_dir = dunce::simplified(
+            &temp_dir
+                .path()
+                .canonicalize()
+                .context("Failed to canonicalize project path")?,
+        )
+        .to_path_buf();
+
+        let mut settings = setup_settings(&project_dir, insta::Settings::clone_current());
+
+        settings.add_filter(&tempdir_filter(project_dir.to_str().unwrap()), "[TMP]/");
+        settings.add_filter(r#"\\([\w&&[^nr"]]\w|\s|\.)"#, "/$1");
+        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
+        settings.add_filter(ruff_linter::VERSION, "[VERSION]");
+        settings.add_filter(
+            r#"The system cannot find the file specified."#,
+            "No such file or directory",
+        );
+
+        let settings_scope = settings.bind_to_scope();
+
+        Ok(Self {
+            project_dir,
+            _temp_dir: temp_dir,
+            _settings_scope: settings_scope,
+        })
+    }
+
+    /// Creates a test fixture with a single file.
+    ///
+    /// # Arguments
+    ///
+    /// * `path` - The relative path for the file
+    /// * `content` - The content to write to the file
+    ///
+    /// # Example
+    ///
+    /// ```rust,no_run
+    /// let fixture = RuffTestFixture::with_file("ruff.toml", "select = ['E']")?;
+    /// ```
+    pub(crate) fn with_file(path: impl AsRef<Path>, content: &str) -> Result<Self> {
+        let fixture = Self::new()?;
+        fixture.write_file(path, content)?;
+        Ok(fixture)
+    }
+
+    /// Ensures that the parent directory of a path exists.
+    fn ensure_parent_directory(path: &Path) -> Result<()> {
+        if let Some(parent) = path.parent() {
+            fs::create_dir_all(parent)
+                .with_context(|| format!("Failed to create directory `{}`", parent.display()))?;
+        }
+        Ok(())
+    }
+
+    /// Writes a file to the test directory.
+    ///
+    /// Parent directories are created automatically if they don't exist.
+    /// Content is dedented to remove common leading whitespace for cleaner test code.
+    ///
+    /// # Arguments
+    ///
+    /// * `path` - The relative path for the file
+    /// * `content` - The content to write to the file
+    pub(crate) fn write_file(&self, path: impl AsRef<Path>, content: &str) -> Result<()> {
+        let path = path.as_ref();
+        let file_path = self.project_dir.join(path);
+
+        Self::ensure_parent_directory(&file_path)?;
+
+        let content = ruff_python_trivia::textwrap::dedent(content);
+        fs::write(&file_path, content.as_ref())
+            .with_context(|| format!("Failed to write file `{}`", file_path.display()))?;
+
+        Ok(())
+    }
+
+    /// Returns the path to the test directory root.
+    pub(crate) fn root(&self) -> &Path {
+        &self.project_dir
+    }
+
+    /// Creates a pre-configured ruff command for testing.
+    ///
+    /// The command is set up with:
+    /// - The correct ruff binary path
+    /// - Working directory set to the test directory
+    /// - Clean environment variables for consistent behavior
+    ///
+    /// You can chain additional arguments and options as needed.
+    ///
+    /// # Example
+    ///
+    /// ```rust,no_run
+    /// let output = fixture
+    ///     .command()
+    ///     .args(["check", "--select", "E"])
+    ///     .arg(".")
+    ///     .output()?;
+    /// ```
+    pub(crate) fn command(&self) -> Command {
+        let mut command = Command::new(get_cargo_bin(BIN_NAME));
+        command.current_dir(&self.project_dir);
+
+        // Unset all environment variables because they can affect test behavior.
+        command.env_clear();
+
+        command
+    }
+
+    pub(crate) fn format_command(&self) -> Command {
+        let mut command = self.command();
+        command.args(["format", "--no-cache"]);
+        command
+    }
+}
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_azure.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_azure.snap
new file mode 100644
index 0000000000..c6401871ae
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_azure.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - azure
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=1;columnnumber=1;code=unformatted;]File would be reformatted
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_concise.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_concise.snap
new file mode 100644
index 0000000000..6e220438c0
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_concise.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+input.py:1:1: unformatted: File would be reformatted
+1 file would be reformatted
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_full.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_full.snap
new file mode 100644
index 0000000000..e48f0b5563
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_full.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - full
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+unformatted: File would be reformatted
+ --> input.py:1:1
+  - 
+1 | from test import say_hy
+2 | 
+3 | if __name__ == "__main__":
+
+1 file would be reformatted
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_github.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_github.snap
new file mode 100644
index 0000000000..92086762b5
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_github.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - github
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_gitlab.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_gitlab.snap
new file mode 100644
index 0000000000..7b0802de73
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_gitlab.snap
@@ -0,0 +1,38 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - gitlab
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+[
+  {
+    "check_name": "unformatted",
+    "description": "unformatted: File would be reformatted",
+    "severity": "major",
+    "fingerprint": "d868d7da11a65fcf",
+    "location": {
+      "path": "input.py",
+      "positions": {
+        "begin": {
+          "line": 1,
+          "column": 1
+        },
+        "end": {
+          "line": 2,
+          "column": 1
+        }
+      }
+    }
+  }
+]
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_grouped.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_grouped.snap
new file mode 100644
index 0000000000..60482d5075
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_grouped.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - grouped
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+input.py:
+  1:1 unformatted: File would be reformatted
+
+1 file would be reformatted
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_json-lines.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_json-lines.snap
new file mode 100644
index 0000000000..10c4622041
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_json-lines.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - json-lines
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+{"cell":null,"code":"unformatted","end_location":{"column":1,"row":2},"filename":"[TMP]/input.py","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":null},"location":{"column":1,"row":1},"message":"File would be reformatted","noqa_row":null,"url":null}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_json.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_json.snap
new file mode 100644
index 0000000000..e1058c41b1
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_json.snap
@@ -0,0 +1,52 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - json
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+[
+  {
+    "cell": null,
+    "code": "unformatted",
+    "end_location": {
+      "column": 1,
+      "row": 2
+    },
+    "filename": "[TMP]/input.py",
+    "fix": {
+      "applicability": "safe",
+      "edits": [
+        {
+          "content": "",
+          "end_location": {
+            "column": 1,
+            "row": 2
+          },
+          "location": {
+            "column": 1,
+            "row": 1
+          }
+        }
+      ],
+      "message": null
+    },
+    "location": {
+      "column": 1,
+      "row": 1
+    },
+    "message": "File would be reformatted",
+    "noqa_row": null,
+    "url": null
+  }
+]
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_junit.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_junit.snap
new file mode 100644
index 0000000000..221b908122
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_junit.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - junit
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="ruff" tests="1" failures="1" errors="0">
+    <testsuite name="[TMP]/input.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
+        <testcase name="org.ruff.unformatted" classname="[TMP]/input" line="1" column="1">
+            <failure message="File would be reformatted">line 1, col 1, File would be reformatted</failure>
+        </testcase>
+    </testsuite>
+</testsuites>
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_pylint.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_pylint.snap
new file mode 100644
index 0000000000..6400bdf265
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_pylint.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - pylint
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+input.py:1: [unformatted] File would be reformatted
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_rdjson.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_rdjson.snap
new file mode 100644
index 0000000000..b9d6dcdce3
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_rdjson.snap
@@ -0,0 +1,60 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - rdjson
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+{
+  "diagnostics": [
+    {
+      "code": {
+        "value": "unformatted"
+      },
+      "location": {
+        "path": "[TMP]/input.py",
+        "range": {
+          "end": {
+            "column": 1,
+            "line": 2
+          },
+          "start": {
+            "column": 1,
+            "line": 1
+          }
+        }
+      },
+      "message": "File would be reformatted",
+      "suggestions": [
+        {
+          "range": {
+            "end": {
+              "column": 1,
+              "line": 2
+            },
+            "start": {
+              "column": 1,
+              "line": 1
+            }
+          },
+          "text": ""
+        }
+      ]
+    }
+  ],
+  "severity": "WARNING",
+  "source": {
+    "name": "ruff",
+    "url": "https://docs.astral.sh/ruff"
+  }
+}
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__format__output_format_sarif.snap b/crates/ruff/tests/cli/snapshots/cli__format__output_format_sarif.snap
new file mode 100644
index 0000000000..e6373198ac
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__format__output_format_sarif.snap
@@ -0,0 +1,81 @@
+---
+source: crates/ruff/tests/cli/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - sarif
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+{
+  "$schema": "https://json.schemastore.org/sarif-2.1.0.json",
+  "runs": [
+    {
+      "results": [
+        {
+          "fixes": [
+            {
+              "artifactChanges": [
+                {
+                  "artifactLocation": {
+                    "uri": "[TMP]/input.py"
+                  },
+                  "replacements": [
+                    {
+                      "deletedRegion": {
+                        "endColumn": 1,
+                        "endLine": 2,
+                        "startColumn": 1,
+                        "startLine": 1
+                      }
+                    }
+                  ]
+                }
+              ],
+              "description": {
+                "text": null
+              }
+            }
+          ],
+          "level": "error",
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "[TMP]/input.py"
+                },
+                "region": {
+                  "endColumn": 1,
+                  "endLine": 2,
+                  "startColumn": 1,
+                  "startLine": 1
+                }
+              }
+            }
+          ],
+          "message": {
+            "text": "File would be reformatted"
+          },
+          "ruleId": "unformatted"
+        }
+      ],
+      "tool": {
+        "driver": {
+          "informationUri": "https://github.com/astral-sh/ruff",
+          "name": "ruff",
+          "rules": [],
+          "version": "[VERSION]"
+        }
+      }
+    }
+  ],
+  "version": "2.1.0"
+}
+----- stderr -----
diff --git a/crates/ruff/tests/snapshots/lint__flake8_import_convention_unused_aliased_import.snap b/crates/ruff/tests/cli/snapshots/cli__lint__flake8_import_convention_unused_aliased_import.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__flake8_import_convention_unused_aliased_import.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__flake8_import_convention_unused_aliased_import.snap
diff --git a/crates/ruff/tests/snapshots/lint__flake8_import_convention_unused_aliased_import_no_conflict.snap b/crates/ruff/tests/cli/snapshots/cli__lint__flake8_import_convention_unused_aliased_import_no_conflict.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__flake8_import_convention_unused_aliased_import_no_conflict.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__flake8_import_convention_unused_aliased_import_no_conflict.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_azure.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_azure.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_azure.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_azure.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_concise.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_concise.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_concise.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_concise.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_full.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_full.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_full.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_full.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_github.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_github.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_github.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_github.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_gitlab.snap
similarity index 76%
rename from crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_gitlab.snap
index 7596f0d086..f16851bb3a 100644
--- a/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_gitlab.snap
@@ -20,59 +20,59 @@ exit_code: 1
   {
     "check_name": "F401",
     "description": "F401: `os` imported but unused",
+    "severity": "major",
     "fingerprint": "4dbad37161e65c72",
     "location": {
       "path": "input.py",
       "positions": {
         "begin": {
-          "column": 8,
-          "line": 1
+          "line": 1,
+          "column": 8
         },
         "end": {
-          "column": 10,
-          "line": 1
+          "line": 1,
+          "column": 10
         }
       }
-    },
-    "severity": "major"
+    }
   },
   {
     "check_name": "F821",
     "description": "F821: Undefined name `y`",
+    "severity": "major",
     "fingerprint": "7af59862a085230",
     "location": {
       "path": "input.py",
       "positions": {
         "begin": {
-          "column": 5,
-          "line": 2
+          "line": 2,
+          "column": 5
         },
         "end": {
-          "column": 6,
-          "line": 2
+          "line": 2,
+          "column": 6
         }
       }
-    },
-    "severity": "major"
+    }
   },
   {
     "check_name": "invalid-syntax",
     "description": "invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
+    "severity": "major",
     "fingerprint": "e558cec859bb66e8",
     "location": {
       "path": "input.py",
       "positions": {
         "begin": {
-          "column": 1,
-          "line": 3
+          "line": 3,
+          "column": 1
         },
         "end": {
-          "column": 6,
-          "line": 3
+          "line": 3,
+          "column": 6
         }
       }
-    },
-    "severity": "major"
+    }
   }
 ]
 ----- stderr -----
diff --git a/crates/ruff/tests/snapshots/lint__output_format_grouped.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_grouped.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_grouped.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_grouped.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_json-lines.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_json-lines.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_json-lines.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_json-lines.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_json.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_json.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_json.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_json.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_junit.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_junit.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_junit.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_junit.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_pylint.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_pylint.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_pylint.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_pylint.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_rdjson.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_rdjson.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__output_format_rdjson.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_rdjson.snap
diff --git a/crates/ruff/tests/snapshots/lint__output_format_sarif.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_sarif.snap
similarity index 58%
rename from crates/ruff/tests/snapshots/lint__output_format_sarif.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__output_format_sarif.snap
index 28f7438945..2d60b432fb 100644
--- a/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_sarif.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
   program: ruff
   args:
@@ -12,6 +12,7 @@ info:
     - "--target-version"
     - py39
     - input.py
+snapshot_kind: text
 ---
 success: false
 exit_code: 1
@@ -22,6 +23,30 @@ exit_code: 1
     {
       "results": [
         {
+          "fixes": [
+            {
+              "artifactChanges": [
+                {
+                  "artifactLocation": {
+                    "uri": "[TMP]/input.py"
+                  },
+                  "replacements": [
+                    {
+                      "deletedRegion": {
+                        "endColumn": 1,
+                        "endLine": 2,
+                        "startColumn": 1,
+                        "startLine": 1
+                      }
+                    }
+                  ]
+                }
+              ],
+              "description": {
+                "text": "Remove unused import: `os`"
+              }
+            }
+          ],
           "level": "error",
           "locations": [
             {
@@ -95,7 +120,7 @@ exit_code: 1
           "rules": [
             {
               "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\n\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n\n[preview]: https://docs.astral.sh/ruff/preview/\n"
               },
               "help": {
                 "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_concise.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_concise.snap
new file mode 100644
index 0000000000..e72b277305
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_concise.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--select"
+    - F401
+    - "--fix"
+    - "--show-fixes"
+    - input.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+Fixed 1 error:
+- input.py:
+    1 × F401 (unused-import)
+
+Found 1 error (1 fixed, 0 remaining).
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_full.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_full.snap
new file mode 100644
index 0000000000..96bbccb76e
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_full.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - full
+    - "--select"
+    - F401
+    - "--fix"
+    - "--show-fixes"
+    - input.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+Fixed 1 error:
+- input.py:
+    1 × F401 (unused-import)
+
+Found 1 error (1 fixed, 0 remaining).
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_grouped.snap b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_grouped.snap
new file mode 100644
index 0000000000..ce0e16ff12
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__output_format_show_fixes_grouped.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - grouped
+    - "--select"
+    - F401
+    - "--fix"
+    - "--show-fixes"
+    - input.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+Fixed 1 error:
+- input.py:
+    1 × F401 (unused-import)
+
+Found 1 error (1 fixed, 0 remaining).
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_extend_from_shared_config.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_extend_from_shared_config.snap
new file mode 100644
index 0000000000..62bde10fe3
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_extend_from_shared_config.snap
@@ -0,0 +1,288 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - test.py
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/test.py"
+Settings path: "[TMP]/ruff.toml"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.10
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.10
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.10
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool.snap
new file mode 100644
index 0000000000..a7b4b2c978
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool.snap
@@ -0,0 +1,290 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - "--select"
+    - UP007
+    - test.py
+    - "-"
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/test.py"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.11
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.11
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.11
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_preview_enabled.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_preview_enabled.snap
new file mode 100644
index 0000000000..4e33c123a4
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_preview_enabled.snap
@@ -0,0 +1,292 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--preview"
+    - "--show-settings"
+    - "--select"
+    - UP007
+    - test.py
+    - "-"
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/test.py"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.pyw",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.11
+linter.per_file_target_version = {}
+linter.preview = enabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.11
+formatter.per_file_target_version = {}
+formatter.preview = enabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = enabled
+analyze.target_version = 3.11
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_target_version_override.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_target_version_override.snap
new file mode 100644
index 0000000000..929943558e
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_target_version_override.snap
@@ -0,0 +1,292 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - "--select"
+    - UP007
+    - "--target-version"
+    - py310
+    - test.py
+    - "-"
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/test.py"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.10
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.10
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.10
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above.snap
new file mode 100644
index 0000000000..291cb62d6e
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above.snap
@@ -0,0 +1,289 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - "--select"
+    - UP007
+    - foo/test.py
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/foo/test.py"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.11
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.11
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.11
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above_with_tool.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above_with_tool.snap
new file mode 100644
index 0000000000..d9f9402895
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above_with_tool.snap
@@ -0,0 +1,289 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - "--select"
+    - UP007
+    - foo/test.py
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/foo/test.py"
+
+# General Settings
+cache_dir = "[TMP]/foo/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/foo"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/foo"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.10
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/foo",
+	"[TMP]/foo/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.10
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.10
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above-2.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above-2.snap
new file mode 100644
index 0000000000..da3eb66afc
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above-2.snap
@@ -0,0 +1,287 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - test.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/foo/test.py"
+Settings path: "[TMP]/ruff.toml"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = none
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.10
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.10
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above.snap
new file mode 100644
index 0000000000..e9ca7bd400
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above.snap
@@ -0,0 +1,287 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--show-settings"
+    - foo/test.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/foo/test.py"
+Settings path: "[TMP]/ruff.toml"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = none
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.10
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.10
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_no_target_fallback.snap b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_no_target_fallback.snap
new file mode 100644
index 0000000000..a3f9343314
--- /dev/null
+++ b/crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_no_target_fallback.snap
@@ -0,0 +1,288 @@
+---
+source: crates/ruff/tests/cli/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - test.py
+    - "--show-settings"
+snapshot_kind: text
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "[TMP]/test.py"
+Settings path: "[TMP]/ruff.toml"
+
+# General Settings
+cache_dir = "[TMP]/.ruff_cache"
+fix = false
+fix_only = false
+output_format = concise
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "[TMP]/"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "[TMP]/"
+linter.rules.enabled = [
+	non-pep604-annotation-union (UP007),
+]
+linter.rules.should_fix = [
+	non-pep604-annotation-union (UP007),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = 3.11
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"[TMP]/",
+	"[TMP]/src",
+]
+linter.tab_size = 4
+linter.line_length = 88
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.functions_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 88
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.11
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 88
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.11
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+
+----- stderr -----
diff --git a/crates/ruff/tests/snapshots/lint__warn_invalid_noqa_with_no_diagnostics.snap b/crates/ruff/tests/cli/snapshots/cli__lint__warn_invalid_noqa_with_no_diagnostics.snap
similarity index 100%
rename from crates/ruff/tests/snapshots/lint__warn_invalid_noqa_with_no_diagnostics.snap
rename to crates/ruff/tests/cli/snapshots/cli__lint__warn_invalid_noqa_with_no_diagnostics.snap
diff --git a/crates/ruff/tests/integration_test.rs b/crates/ruff/tests/integration_test.rs
index f9122e3b5e..48bc689a08 100644
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -951,6 +951,20 @@ fn rule_f401() {
     assert_cmd_snapshot!(ruff_cmd().args(["rule", "F401"]));
 }
 
+#[test]
+fn rule_f401_output_json() {
+    insta::with_settings!({filters => vec![
+        (r#"("file": ")[^"]+(",)"#, "$1<FILE>$2"),
+    ]}, {
+        assert_cmd_snapshot!(ruff_cmd().args(["rule", "F401", "--output-format", "json"]));
+    });
+}
+
+#[test]
+fn rule_f401_output_text() {
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "F401", "--output-format", "text"]));
+}
+
 #[test]
 fn rule_invalid_rule_name() {
     assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @r"
@@ -965,6 +979,34 @@ fn rule_invalid_rule_name() {
     ");
 }
 
+#[test]
+fn rule_invalid_rule_name_output_json() {
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'RUF404' for '[RULE]'
+
+    For more information, try '--help'.
+    ");
+}
+
+#[test]
+fn rule_invalid_rule_name_output_text() {
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: invalid value 'RUF404' for '[RULE]'
+
+    For more information, try '--help'.
+    ");
+}
+
 #[test]
 fn show_statistics() {
     let mut cmd = RuffCheck::default()
@@ -1489,6 +1531,8 @@ fn deprecated_direct() {
 
 #[test]
 fn deprecated_multiple_direct() {
+    // Multiple deprecated rules selected by exact code should be included
+    // but a warning should be displayed
     let mut cmd = RuffCheck::default()
         .args(["--select", "RUF920", "--select", "RUF921"])
         .build();
@@ -1516,16 +1560,10 @@ fn deprecated_indirect() {
     // since it is not a "direct" selection
     let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
     assert_cmd_snapshot!(cmd, @r"
-    success: false
-    exit_code: 1
+    success: true
+    exit_code: 0
     ----- stdout -----
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
-    RUF921 Hey this is another deprecated test rule.
-    --> -:1:1
-
-    Found 2 errors.
+    All checks passed!
 
     ----- stderr -----
     ");
@@ -1692,6 +1730,27 @@ fn check_input_from_argfile() -> Result<()> {
     Ok(())
 }
 
+#[test]
+// Regression test for https://github.com/astral-sh/ruff/issues/20655
+fn missing_argfile_reports_error() {
+    let mut cmd = RuffCheck::default().filename("@!.txt").build();
+    insta::with_settings!({filters => vec![
+        ("The system cannot find the file specified.", "No such file or directory")
+    ]}, {
+        assert_cmd_snapshot!(cmd, @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to read CLI arguments from files
+      Cause: failed to open file `!.txt`
+      Cause: No such file or directory (os error 2)
+    ");
+    });
+}
+
 #[test]
 fn check_hints_hidden_unsafe_fixes() {
     let mut cmd = RuffCheck::default()
@@ -2155,16 +2214,10 @@ extend-safe-fixes = ["RUF9"]
     RUF903 Hey this is a stable test rule with a display only fix.
     --> -:1:1
 
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
-    RUF921 Hey this is another deprecated test rule.
-    --> -:1:1
-
     RUF950 Hey this is a test rule that was redirected from another.
     --> -:1:1
 
-    Found 7 errors.
+    Found 5 errors.
     [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
 
     ----- stderr -----
diff --git a/crates/ruff/tests/lint.rs b/crates/ruff/tests/lint.rs
deleted file mode 100644
index b54e69996d..0000000000
--- a/crates/ruff/tests/lint.rs
+++ /dev/null
@@ -1,5832 +0,0 @@
-//! Tests the interaction of the `lint` configuration section
-
-#![cfg(not(target_family = "wasm"))]
-
-use regex::escape;
-use std::process::Command;
-use std::str;
-use std::{fs, path::Path};
-
-use anyhow::Result;
-use assert_fs::fixture::{ChildPath, FileTouch, PathChild};
-use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use tempfile::TempDir;
-
-const BIN_NAME: &str = "ruff";
-const STDIN_BASE_OPTIONS: &[&str] = &["check", "--no-cache", "--output-format", "concise"];
-
-fn tempdir_filter(path: impl AsRef<Path>) -> String {
-    format!(r"{}\\?/?", escape(path.as_ref().to_str().unwrap()))
-}
-
-#[test]
-fn top_level_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:5: Q000 [*] Double quotes found but single quotes preferred
-        test.py:1:5: B005 Using `.strip()` with multi-character strings is misleading
-        test.py:1:19: Q000 [*] Double quotes found but single quotes preferred
-        Found 3 errors.
-        [*] 2 fixable with the `--fix` option.
-
-        ----- stderr -----
-        warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
-          - 'extend-select' -> 'lint.extend-select'
-          - 'flake8-quotes' -> 'lint.flake8-quotes'
-        ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn lint_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    });
-
-    Ok(())
-}
-
-/// Tests that configurations from the top-level and `lint` section are merged together.
-#[test]
-fn mixed_levels() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
-      - 'extend-select' -> 'lint.extend-select'
-    ");
-    });
-
-    Ok(())
-}
-
-/// Tests that options in the `lint` section have higher precedence than top-level options (because they are more specific).
-#[test]
-fn precedence() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-select = ["B", "Q"]
-
-[flake8-quotes]
-inline-quotes = "double"
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
-      - 'flake8-quotes' -> 'lint.flake8-quotes'
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn exclude() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-extend-exclude = ["out"]
-
-[lint]
-exclude = ["test.py", "generated.py"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#,
-    )?;
-
-    // Excluded file but passed to the CLI directly, should be linted
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("generated.py"),
-        r#"NUMBERS = [
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-]
-OTHER = "OTHER"
-"#,
-    )?;
-
-    let out_dir = tempdir.path().join("out");
-    fs::create_dir(&out_dir)?;
-
-    fs::write(out_dir.join("a.py"), r#"a = "a""#)?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        // Explicitly pass test.py, should be linted regardless of it being excluded by lint.exclude
-        .arg(test_path.file_name().unwrap())
-        // Lint all other files in the directory, should respect the `exclude` and `lint.exclude` options
-        .arg("."), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:4:16: Q000 [*] Double quotes found but single quotes preferred
-    main.py:5:12: Q000 [*] Double quotes found but single quotes preferred
-    test.py:3:15: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 3 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
-      - 'extend-select' -> 'lint.extend-select'
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn exclude_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint]
-exclude = ["generated.py"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .args(["--stdin-filename", "generated.py"])
-        .arg("-")
-        .pass_stdin(r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    generated.py:4:16: Q000 [*] Double quotes found but single quotes preferred
-    generated.py:5:12: Q000 [*] Double quotes found but single quotes preferred
-    Found 2 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
-      - 'extend-select' -> 'lint.extend-select'
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn line_too_long_width_override() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-line-length = 80
-select = ["E501"]
-
-[pycodestyle]
-max-line-length = 100
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--stdin-filename", "test.py"])
-        .arg("-")
-        .pass_stdin(r#"
-# longer than 80, but less than 100
-_ = "---------------------------------------------------------------------------亜亜亜亜亜亜"
-# longer than 100
-_ = "---------------------------------------------------------------------------亜亜亜亜亜亜亜亜亜亜亜亜亜亜"
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    test.py:5:91: E501 Line too long (109 > 100)
-    Found 1 error.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
-      - 'select' -> 'lint.select'
-      - 'pycodestyle' -> 'lint.pycodestyle'
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn per_file_ignores_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .args(["--stdin-filename", "generated.py"])
-        .args(["--per-file-ignores", "generated.py:Q"])
-        .arg("-")
-        .pass_stdin(r#"
-import os
-
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    generated.py:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
-      - 'extend-select' -> 'lint.extend-select'
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn extend_per_file_ignores_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .args(["--stdin-filename", "generated.py"])
-        .args(["--extend-per-file-ignores", "generated.py:Q"])
-        .arg("-")
-        .pass_stdin(r#"
-import os
-
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    generated.py:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
-      - 'extend-select' -> 'lint.extend-select'
-    ");
-    });
-
-    Ok(())
-}
-
-/// Regression test for [#8858](https://github.com/astral-sh/ruff/issues/8858)
-#[test]
-fn parent_configuration_override() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let root_ruff = tempdir.path().join("ruff.toml");
-    fs::write(
-        root_ruff,
-        r#"
-[lint]
-select = ["ALL"]
-"#,
-    )?;
-
-    let sub_dir = tempdir.path().join("subdirectory");
-    fs::create_dir(&sub_dir)?;
-
-    let subdirectory_ruff = sub_dir.join("ruff.toml");
-    fs::write(
-        subdirectory_ruff,
-        r#"
-[lint]
-ignore = ["D203", "D212"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(sub_dir)
-        .args(STDIN_BASE_OPTIONS)
-        , @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    warning: No Python files found under the given path(s)
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn nonexistent_config_file() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo.toml", "."]), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'foo.toml' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    It looks like you were trying to pass a path to a configuration file.
-    The path `foo.toml` does not point to a configuration file
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn config_override_rejected_if_invalid_toml() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo = bar", "."]), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'foo = bar' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 7
-      |
-    1 | foo = bar
-      |       ^^^
-    string values must be quoted, expected literal string
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn too_many_config_files() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    let ruff2_dot_toml = tempdir.path().join("ruff2.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    fs::File::create(&ruff2_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_dot_toml)
-        .arg("--config")
-        .arg(&ruff2_dot_toml)
-        .arg("."), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: You cannot specify more than one configuration file on the command line.
-
-      tip: remove either `--config=[TMP]/ruff.toml` or `--config=[TMP]/ruff2.toml`.
-           For more information, try `--help`.
-    ");
-    });
-    Ok(())
-}
-
-#[test]
-fn extend_passed_via_config_argument() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "extend = 'foo.toml'", "."]), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend = 'foo.toml'' for '--config <CONFIG_OPTION>'
-
-      tip: Cannot include `extend` in a --config flag value
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn nonexistent_extend_file() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    fs::write(
-        project_dir.join("ruff.toml"),
-        r#"
-extend = "ruff2.toml"
-"#,
-    )?;
-
-    fs::write(
-        project_dir.join("ruff2.toml"),
-        r#"
-extend = "ruff3.toml"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&project_dir).as_str(), "[TMP]/"),
-            ("The system cannot find the file specified.", "No such file or directory")
-        ]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check"]).current_dir(project_dir), @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load extended configuration `[TMP]/ruff3.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml`)
-          Cause: Failed to read [TMP]/ruff3.toml
-          Cause: No such file or directory (os error 2)
-        ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn circular_extend() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_path = dunce::canonicalize(tempdir.path())?;
-
-    fs::write(
-        project_path.join("ruff.toml"),
-        r#"
-extend = "ruff2.toml"
-"#,
-    )?;
-    fs::write(
-        project_path.join("ruff2.toml"),
-        r#"
-extend = "ruff3.toml"
-"#,
-    )?;
-    fs::write(
-        project_path.join("ruff3.toml"),
-        r#"
-extend = "ruff.toml"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_path).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check"])
-            .current_dir(project_path),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Circular configuration detected: `[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml` extends `[TMP]/ruff.toml`
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn parse_error_extends() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_path = dunce::canonicalize(tempdir.path())?;
-
-    fs::write(
-        project_path.join("ruff.toml"),
-        r#"
-extend = "ruff2.toml"
-"#,
-    )?;
-    fs::write(
-        project_path.join("ruff2.toml"),
-        r#"
-[lint]
-select = [E501]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_path).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check"])
-            .current_dir(project_path),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Failed to load extended configuration `[TMP]/ruff2.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml`)
-      Cause: Failed to parse [TMP]/ruff2.toml
-      Cause: TOML parse error at line 3, column 11
-      |
-    3 | select = [E501]
-      |           ^^^^
-    string values must be quoted, expected literal string
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn config_file_and_isolated() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_dot_toml)
-        .arg("--isolated")
-        .arg("."), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: The argument `--config=[TMP]/ruff.toml` cannot be used with `--isolated`
-
-      tip: You cannot specify a configuration file and also specify `--isolated`,
-           as `--isolated` causes ruff to ignore all configuration files.
-           For more information, try `--help`.
-    ");
-    });
-    Ok(())
-}
-
-#[test]
-fn config_override_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-line-length = 100
-
-[lint]
-select = ["I"]
-
-[lint.isort]
-combine-as-imports = true
-        "#,
-    )?;
-    let fixture = r#"
-from foo import (
-    aaaaaaaaaaaaaaaaaaa,
-    bbbbbbbbbbb as bbbbbbbbbbbbbbbb,
-    cccccccccccccccc,
-    ddddddddddd as ddddddddddddd,
-    eeeeeeeeeeeeeee,
-    ffffffffffff as ffffffffffffff,
-    ggggggggggggg,
-    hhhhhhh as hhhhhhhhhhh,
-    iiiiiiiiiiiiii,
-    jjjjjjjjjjjjj as jjjjjj,
-)
-
-x = "longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss"
-"#;
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--config", "line-length=90"])
-        .args(["--config", "lint.extend-select=['E501', 'F841']"])
-        .args(["--config", "lint.isort.combine-as-imports = false"])
-        .arg("-")
-        .pass_stdin(fixture), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:1: I001 [*] Import block is un-sorted or un-formatted
-    -:15:91: E501 Line too long (97 > 90)
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    Ok(())
-}
-
-#[test]
-fn valid_toml_but_nonexistent_option_provided_via_config_argument() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args([".", "--config", "extend-select=['F481']"]),  // No such code as F481!
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend-select=['F481']' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    Could not parse the supplied argument as a `ruff.toml` configuration option:
-
-    Unknown rule selector: `F481`
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn each_toml_option_requires_a_new_flag_1() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        // commas can't be used to delimit different config overrides;
-        // you need a new --config flag for each override
-        .args([".", "--config", "extend-select=['F841'], line-length=90"]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend-select=['F841'], line-length=90' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 23
-      |
-    1 | extend-select=['F841'], line-length=90
-      |                       ^
-    unexpected key or value, expected newline, `#`
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn each_toml_option_requires_a_new_flag_2() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        // spaces *also* can't be used to delimit different config overrides;
-        // you need a new --config flag for each override
-        .args([".", "--config", "extend-select=['F841'] line-length=90"]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend-select=['F841'] line-length=90' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 24
-      |
-    1 | extend-select=['F841'] line-length=90
-      |                        ^
-    unexpected key or value, expected newline, `#`
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn value_given_to_table_key_is_not_inline_table_1() {
-    // https://github.com/astral-sh/ruff/issues/13995
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args([".", "--config", r#"lint.flake8-pytest-style="csv""#]),
-        @r#"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'lint.flake8-pytest-style="csv"' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    `lint.flake8-pytest-style` is a table of configuration options.
-    Did you want to override one of the table's subkeys?
-
-    Possible choices:
-
-    - `lint.flake8-pytest-style.fixture-parentheses`
-    - `lint.flake8-pytest-style.parametrize-names-type`
-    - `lint.flake8-pytest-style.parametrize-values-type`
-    - `lint.flake8-pytest-style.parametrize-values-row-type`
-    - `lint.flake8-pytest-style.raises-require-match-for`
-    - `lint.flake8-pytest-style.raises-extend-require-match-for`
-    - `lint.flake8-pytest-style.mark-parentheses`
-    - `lint.flake8-pytest-style.warns-require-match-for`
-    - `lint.flake8-pytest-style.warns-extend-require-match-for`
-
-    For more information, try '--help'.
-    "#);
-}
-
-#[test]
-fn value_given_to_table_key_is_not_inline_table_2() {
-    // https://github.com/astral-sh/ruff/issues/13995
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args([".", "--config", r#"lint=123"#]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'lint=123' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    `lint` is a table of configuration options.
-    Did you want to override one of the table's subkeys?
-
-    Possible choices:
-
-    - `lint.allowed-confusables`
-    - `lint.dummy-variable-rgx`
-    - `lint.extend-ignore`
-    - `lint.extend-select`
-    - `lint.extend-fixable`
-    - `lint.external`
-    - `lint.fixable`
-    - `lint.ignore`
-    - `lint.extend-safe-fixes`
-    - `lint.extend-unsafe-fixes`
-    - `lint.ignore-init-module-imports`
-    - `lint.logger-objects`
-    - `lint.select`
-    - `lint.explicit-preview-rules`
-    - `lint.task-tags`
-    - `lint.typing-modules`
-    - `lint.unfixable`
-    - `lint.per-file-ignores`
-    - `lint.extend-per-file-ignores`
-    - `lint.exclude`
-    - `lint.preview`
-    - `lint.typing-extensions`
-    - `lint.future-annotations`
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn config_doubly_overridden_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-line-length = 100
-
-[lint]
-select=["E501"]
-"#,
-    )?;
-    let fixture = "x = 'longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss'";
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        // The --line-length flag takes priority over both the config file
-        // and the `--config="line-length=110"` flag,
-        // despite them both being specified after this flag on the command line:
-        .args(["--line-length", "90"])
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--config", "line-length=110"])
-        .arg("-")
-        .pass_stdin(fixture), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:91: E501 Line too long (97 > 90)
-    Found 1 error.
-
-    ----- stderr -----
-    ");
-    Ok(())
-}
-
-#[test]
-fn complex_config_setting_overridden_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(&ruff_toml, "lint.select = ['N801']")?;
-    let fixture = "class violates_n801: pass";
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--config", "lint.per-file-ignores = {'generated.py' = ['N801']}"])
-        .args(["--stdin-filename", "generated.py"])
-        .arg("-")
-        .pass_stdin(fixture), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    ");
-    Ok(())
-}
-
-#[test]
-fn deprecated_config_option_overridden_via_cli() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "select=['N801']", "-"])
-        .pass_stdin("class lowercase: ..."),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:7: N801 Class name `lowercase` should use CapWords convention
-    Found 1 error.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your `--config` CLI arguments:
-      - 'select' -> 'lint.select'
-    ");
-}
-
-#[test]
-fn extension() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-include = ["*.ipy"]
-"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.ipy"),
-        r#"
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.0"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.ipy:cell 1:1:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn warn_invalid_noqa_with_no_diagnostics() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--isolated"])
-            .arg("--select")
-            .arg("F401")
-            .arg("-")
-            .pass_stdin(
-                r#"
-# ruff: noqa: AAA101
-print("Hello world!")
-"#
-            )
-    );
-}
-
-#[test]
-fn file_noqa_external() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-external = ["AAA"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-# flake8: noqa: AAA101, BBB102
-import os
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:3:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: Invalid rule code provided to `# ruff: noqa` at -:2: BBB102
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_exact_mismatch() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-required-version = "0.1.0"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Required version `==0.1.0` does not match the running version `[VERSION]`
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_exact_match() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        format!(
-            r#"
-required-version = "{version}"
-"#
-        ),
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_bound_mismatch() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        format!(
-            r#"
-required-version = ">{version}"
-"#
-        ),
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Required version `>[VERSION]` does not match the running version `[VERSION]`
-    ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_bound_match() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-required-version = ">=0.1.0"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    });
-
-    Ok(())
-}
-
-/// Expand environment variables in `--config` paths provided via the CLI.
-#[test]
-fn config_expand() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        ruff_toml,
-        r#"
-[lint]
-select = ["F"]
-ignore = ["F841"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg("${NAME}.toml")
-        .env("NAME", "ruff")
-        .arg("-")
-        .current_dir(tempdir.path())
-        .pass_stdin(r#"
-import os
-
-def func():
-    x = 1
-"#), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-
-    Ok(())
-}
-
-/// Per-file selects via ! negation in per-file-ignores
-#[test]
-fn negated_per_file_ignores() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.per-file-ignores]
-"!selected.py" = ["RUF"]
-"#,
-    )?;
-    let selected = tempdir.path().join("selected.py");
-    fs::write(selected, "")?;
-    let ignored = tempdir.path().join("ignored.py");
-    fs::write(ignored, "")?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("--select")
-        .arg("RUF901")
-        .current_dir(&tempdir)
-        , @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    selected.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    Ok(())
-}
-
-#[test]
-fn negated_per_file_ignores_absolute() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.per-file-ignores]
-"!src/**.py" = ["RUF"]
-"#,
-    )?;
-    let src_dir = tempdir.path().join("src");
-    fs::create_dir(&src_dir)?;
-    let selected = src_dir.join("selected.py");
-    fs::write(selected, "")?;
-    let ignored = tempdir.path().join("ignored.py");
-    fs::write(ignored, "")?;
-
-    insta::with_settings!({filters => vec![(r"\\", "/")]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-            .arg("--select")
-            .arg("RUF901")
-            .current_dir(&tempdir)
-            , @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        src/selected.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        ");
-    });
-    Ok(())
-}
-
-/// patterns are additive, can't use negative patterns to "un-ignore"
-#[test]
-fn negated_per_file_ignores_overlap() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.per-file-ignores]
-"*.py" = ["RUF"]
-"!foo.py" = ["RUF"]
-"#,
-    )?;
-    let foo_file = tempdir.path().join("foo.py");
-    fs::write(foo_file, "")?;
-    let bar_file = tempdir.path().join("bar.py");
-    fs::write(bar_file, "")?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("--select")
-        .arg("RUF901")
-        .current_dir(&tempdir)
-        , @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    ");
-    Ok(())
-}
-
-#[test]
-fn unused_interaction() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["F"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("--fix")
-            .arg("-")
-            .pass_stdin(r#"
-import os  # F401
-
-def function():
-    import os  # F811
-    print(os.name)
-"#), @r"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-
-        import os  # F401
-
-        def function():
-            print(os.name)
-
-        ----- stderr -----
-        Found 1 error (1 fixed, 0 remaining).
-        ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["RUF015"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("noqa.py");
-
-    fs::write(
-        &test_path,
-        r#"
-def first_square():
-    return [x * x for x in range(20)][0]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .arg(&test_path)
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Added 1 noqa directive.
-    ");
-    });
-
-    let test_code = std::fs::read_to_string(&test_path).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r"
-    def first_square():
-        return [x * x for x in range(20)][0]  # noqa: RUF015
-    ");
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa_multiple_codes() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["ANN001", "ANN201", "ARG001", "D103"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("noqa.py");
-
-    fs::write(
-        &test_path,
-        r#"
-def unused(x):
-    pass
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .arg(&test_path)
-        .arg("--preview")
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Added 1 noqa directive.
-    ");
-    });
-
-    let test_code = std::fs::read_to_string(&test_path).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r"
-    def unused(x):  # noqa: ANN001, ANN201, D103
-        pass
-    ");
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa_multiline_diagnostic() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["I"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("noqa.py");
-
-    fs::write(
-        &test_path,
-        r#"
-import z
-import c
-import a
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .arg(&test_path)
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Added 1 noqa directive.
-    ");
-    });
-
-    let test_code = std::fs::read_to_string(&test_path).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r"
-    import z  # noqa: I001
-    import c
-    import a
-    ");
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa_existing_noqa() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["ANN001", "ANN201", "ARG001", "D103"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("noqa.py");
-
-    fs::write(
-        &test_path,
-        r#"
-def unused(x):  # noqa: ANN001, ARG001, D103
-    pass
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .arg(&test_path)
-        .arg("--preview")
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Added 1 noqa directive.
-    ");
-    });
-
-    let test_code = std::fs::read_to_string(&test_path).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r"
-    def unused(x):  # noqa: ANN001, ANN201, ARG001, D103
-        pass
-    ");
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa_multiline_comment() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["UP031"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("noqa.py");
-
-    fs::write(
-        &test_path,
-        r#"
-print(
-    """First line
-    second line
-    third line
-      %s"""
-    % name
-)
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-        .arg(&test_path)
-        .arg("--preview")
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Added 1 noqa directive.
-    ");
-    });
-
-    let test_code = std::fs::read_to_string(&test_path).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r#"
-    print(
-        """First line
-        second line
-        third line
-          %s"""  # noqa: UP031
-        % name
-    )
-    "#);
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa_exclude() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-exclude = ["excluded.py"]
-select = ["RUF015"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("noqa.py");
-
-    fs::write(
-        &test_path,
-        r#"
-def first_square():
-    return [x * x for x in range(20)][0]
-"#,
-    )?;
-
-    let exclude_path = tempdir.path().join("excluded.py");
-
-    fs::write(
-        &exclude_path,
-        r#"
-def first_square():
-    return [x * x for x in range(20)][0]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .current_dir(tempdir.path())
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--add-noqa"]), @r"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-
-        ----- stderr -----
-        Added 1 noqa directive.
-        ");
-    });
-
-    Ok(())
-}
-
-/// Regression test for <https://github.com/astral-sh/ruff/issues/2253>
-#[test]
-fn add_noqa_parent() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let test_path = tempdir.path().join("noqa.py");
-    fs::write(
-        &test_path,
-        r#"
-from foo import (  # noqa: F401
-		bar
-)
-		"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-                .args(STDIN_BASE_OPTIONS)
-                .arg("--add-noqa")
-                .arg("--select=F401")
-                .arg("noqa.py")
-                .current_dir(&tempdir), @r"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// Infer `3.11` from `requires-python` in `pyproject.toml`.
-#[test]
-fn requires_python() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-
-[tool.ruff.lint]
-select = ["UP006"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        ");
-    });
-
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = ">= 3.8"
-
-[tool.ruff.lint]
-select = ["UP006"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&pyproject_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        All checks passed!
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// Infer `3.11` from `requires-python` in `pyproject.toml`.
-#[test]
-fn requires_python_patch() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = ">= 3.11.4"
-
-[tool.ruff.lint]
-select = ["UP006"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&pyproject_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// Infer `3.11` from `requires-python` in `pyproject.toml`.
-#[test]
-fn requires_python_equals() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = "== 3.11"
-
-[tool.ruff.lint]
-select = ["UP006"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&pyproject_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// Infer `3.11` from `requires-python` in `pyproject.toml`.
-#[test]
-fn requires_python_equals_patch() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = "== 3.11.4"
-
-[tool.ruff.lint]
-select = ["UP006"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&pyproject_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:31: UP006 [*] Use `list` instead of `List` for type annotation
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── pyproject.toml #<--- no `[tool.ruff]`
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_no_tool() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"from typing import Union;foo: Union[int, str] = 1"#,
-    )?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .args(["--select","UP007"])
-            .arg("test.py")
-            .arg("-")
-            .current_dir(project_dir)
-            , @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/test.py"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.11
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.11
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.11
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── pyproject.toml #<--- no `[tool.ruff]`
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_no_tool_target_version_override() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"from typing import Union;foo: Union[int, str] = 1"#,
-    )?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .args(["--select","UP007"])
-            .args(["--target-version","py310"])
-            .arg("test.py")
-            .arg("-")
-            .current_dir(project_dir)
-            , @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/test.py"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.10
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.10
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.10
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-/// ```
-/// tmp
-/// ├── pyproject.toml #<--- no `[tool.ruff]`
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_no_tool_with_check() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"from typing import Union;foo: Union[int, str] = 1"#,
-    )?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--select","UP007"])
-            .arg(".")
-            .current_dir(project_dir)
-            , @r###"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:31: UP007 [*] Use `X | Y` for type annotations
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        "###);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── pyproject.toml #<-- no [tool.ruff]
-/// ├── ruff.toml #<-- no `target-version`
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_ruff_toml_no_target_fallback() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[lint]
-select = ["UP007"]
-"#,
-    )?;
-
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"
-from typing import Union;foo: Union[int, str] = 1
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("test.py")
-            .arg("--show-settings")
-            .current_dir(project_dir), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/test.py"
-        Settings path: "[TMP]/ruff.toml"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.11
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.11
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.11
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── pyproject.toml #<-- no [tool.ruff]
-/// ├── ruff.toml #<-- no `target-version`
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_ruff_toml_no_target_fallback_check() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[lint]
-select = ["UP007"]
-"#,
-    )?;
-
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"
-from typing import Union;foo: Union[int, str] = 1
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg(".")
-            .current_dir(project_dir), @r###"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:2:31: UP007 [*] Use `X | Y` for type annotations
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        "###);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── foo
-/// │  ├── pyproject.toml #<-- no [tool.ruff], no `requires-python`
-/// │  └── test.py
-/// └── pyproject.toml #<-- no [tool.ruff], has `requires-python`
-/// ```
-#[test]
-fn requires_python_pyproject_toml_above() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let outer_pyproject = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &outer_pyproject,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let foodir = tempdir.path().join("foo");
-    fs::create_dir(foodir)?;
-
-    let inner_pyproject = tempdir.path().join("foo/pyproject.toml");
-    fs::write(
-        &inner_pyproject,
-        r#"[project]
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("foo/test.py");
-    fs::write(
-        &testpy,
-        r#"
-from typing import Union;foo: Union[int, str] = 1
-"#,
-    )?;
-
-    let testpy_canon = dunce::canonicalize(testpy)?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"(?m)^foo\\test","foo/test")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .args(["--select","UP007"])
-            .arg("foo/test.py")
-            .current_dir(&project_dir), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/foo/test.py"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.11
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.11
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.11
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── foo
-/// │  ├── pyproject.toml #<-- has [tool.ruff], no `requires-python`
-/// │  └── test.py
-/// └── pyproject.toml #<-- no [tool.ruff], has `requires-python`
-/// ```
-#[test]
-fn requires_python_pyproject_toml_above_with_tool() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let outer_pyproject = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &outer_pyproject,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let foodir = tempdir.path().join("foo");
-    fs::create_dir(foodir)?;
-
-    let inner_pyproject = tempdir.path().join("foo/pyproject.toml");
-    fs::write(
-        &inner_pyproject,
-        r#"
-[tool.ruff]
-target-version = "py310"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("foo/test.py");
-    fs::write(
-        &testpy,
-        r#"
-from typing import Union;foo: Union[int, str] = 1
-"#,
-    )?;
-
-    let testpy_canon = dunce::canonicalize(testpy)?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"foo\\","foo/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .args(["--select","UP007"])
-            .arg("foo/test.py")
-            .current_dir(&project_dir), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/foo/test.py"
-
-        # General Settings
-        cache_dir = "[TMP]/foo/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/foo"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/foo"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.10
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/foo",
-        	"[TMP]/foo/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.10
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.10
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── foo
-/// │  ├── pyproject.toml #<-- no [tool.ruff]
-/// │  └── test.py
-/// └── ruff.toml #<-- no `target-version`
-/// ```
-#[test]
-fn requires_python_ruff_toml_above() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["UP007"]
-"#,
-    )?;
-
-    let foodir = tempdir.path().join("foo");
-    fs::create_dir(foodir)?;
-
-    let pyproject_toml = tempdir.path().join("foo/pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("foo/test.py");
-    fs::write(
-        &testpy,
-        r#"
-from typing import Union;foo: Union[int, str] = 1
-"#,
-    )?;
-
-    let testpy_canon = dunce::canonicalize(testpy)?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .arg("foo/test.py")
-            .current_dir(&project_dir), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/foo/test.py"
-        Settings path: "[TMP]/ruff.toml"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = none
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.9
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.9
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .arg("test.py")
-            .current_dir(project_dir.join("foo")), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/foo/test.py"
-        Settings path: "[TMP]/ruff.toml"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = none
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.9
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.9
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-
-/// ```
-/// tmp
-/// ├── pyproject.toml <-- requires >=3.10
-/// ├── ruff.toml <--- extends base
-/// ├── shared
-/// │   └── base_config.toml <-- targets 3.11
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_extend_from_shared_config() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend = "./shared/base_config.toml"
-[lint]
-select = ["UP007"]
-"#,
-    )?;
-
-    let shared_dir = tempdir.path().join("shared");
-    fs::create_dir(shared_dir)?;
-
-    let pyproject_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &pyproject_toml,
-        r#"[project]
-requires-python = ">= 3.10"
-"#,
-    )?;
-
-    let shared_toml = tempdir.path().join("shared/base_config.toml");
-    fs::write(
-        &shared_toml,
-        r#"
-target-version = "py311"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"
-from typing import Union;foo: Union[int, str] = 1
-"#,
-    )?;
-
-    let testpy_canon = dunce::canonicalize(testpy)?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--show-settings")
-            .arg("test.py")
-            .current_dir(&project_dir), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/test.py"
-        Settings path: "[TMP]/ruff.toml"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.10
-        linter.per_file_target_version = {}
-        linter.preview = disabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.10
-        formatter.per_file_target_version = {}
-        formatter.preview = disabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = disabled
-        analyze.target_version = 3.10
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn checks_notebooks_in_stable() -> anyhow::Result<()> {
-    let tempdir = TempDir::new()?;
-    std::fs::write(
-        tempdir.path().join("main.ipynb"),
-        r#"
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import random"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.0"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--select")
-        .arg("F401")
-        .current_dir(&tempdir)
-        , @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.ipynb:cell 1:1:8: F401 [*] `random` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    Ok(())
-}
-
-/// Verify that implicit namespace packages are detected even when they are nested.
-///
-/// See: <https://github.com/astral-sh/ruff/issues/13519>
-#[test]
-fn nested_implicit_namespace_package() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let root = ChildPath::new(tempdir.path());
-
-    root.child("foo").child("__init__.py").touch()?;
-    root.child("foo")
-        .child("bar")
-        .child("baz")
-        .child("__init__.py")
-        .touch()?;
-    root.child("foo")
-        .child("bar")
-        .child("baz")
-        .child("bop.py")
-        .touch()?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--select")
-        .arg("INP")
-        .current_dir(&tempdir)
-        , @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    ");
-
-    insta::with_settings!({filters => vec![(r"\\", "/")]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--select")
-            .arg("INP")
-            .arg("--preview")
-            .current_dir(&tempdir)
-            , @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        foo/bar/baz/__init__.py:1:1: INP001 File `foo/bar/baz/__init__.py` declares a package, but is nested under an implicit namespace package. Add an `__init__.py` to `foo/bar`.
-        Found 1 error.
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-#[test]
-fn flake8_import_convention_invalid_aliases_config_alias_name() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.flake8-import-conventions.aliases]
-"module.name" = "invalid.alias"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-    , @r#"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load configuration `[TMP]/ruff.toml`
-          Cause: Failed to parse [TMP]/ruff.toml
-          Cause: TOML parse error at line 3, column 17
-          |
-        3 | "module.name" = "invalid.alias"
-          |                 ^^^^^^^^^^^^^^^
-        invalid value: string "invalid.alias", expected a Python identifier
-        "#);});
-    Ok(())
-}
-
-#[test]
-fn flake8_import_convention_invalid_aliases_config_extend_alias_name() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.flake8-import-conventions.extend-aliases]
-"module.name" = "__debug__"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-    , @r#"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load configuration `[TMP]/ruff.toml`
-          Cause: Failed to parse [TMP]/ruff.toml
-          Cause: TOML parse error at line 3, column 17
-          |
-        3 | "module.name" = "__debug__"
-          |                 ^^^^^^^^^^^
-        invalid value: string "__debug__", expected an assignable Python identifier
-        "#);});
-    Ok(())
-}
-
-#[test]
-fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.flake8-import-conventions.aliases]
-"module..invalid" = "alias"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-    , @r#"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load configuration `[TMP]/ruff.toml`
-          Cause: Failed to parse [TMP]/ruff.toml
-          Cause: TOML parse error at line 3, column 1
-          |
-        3 | "module..invalid" = "alias"
-          | ^^^^^^^^^^^^^^^^^
-        invalid value: string "module..invalid", expected a sequence of Python identifiers delimited by periods
-        "#);});
-    Ok(())
-}
-
-#[test]
-fn flake8_import_convention_nfkc_normalization() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.flake8-import-conventions.aliases]
-"test.module" = "_﹏𝘥𝘦𝘣𝘶𝘨﹏﹏"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-    , @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Invalid alias for module 'test.module': alias normalizes to '__debug__', which is not allowed.
-        ");});
-    Ok(())
-}
-
-#[test]
-fn flake8_import_convention_unused_aliased_import() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(r#"lint.isort.required-imports = ["import pandas"]"#)
-            .args(["--select", "I002,ICN001,F401"])
-            .args(["--stdin-filename", "test.py"])
-            .arg("--unsafe-fixes")
-            .arg("--fix")
-            .arg("-")
-            .pass_stdin("1")
-    );
-}
-
-#[test]
-fn flake8_import_convention_unused_aliased_import_no_conflict() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(r#"lint.isort.required-imports = ["import pandas as pd"]"#)
-            .args(["--select", "I002,ICN001,F401"])
-            .args(["--stdin-filename", "test.py"])
-            .arg("--unsafe-fixes")
-            .arg("--fix")
-            .arg("-")
-            .pass_stdin("1")
-    );
-}
-
-// See: https://github.com/astral-sh/ruff/issues/16177
-#[test]
-fn flake8_pyi_redundant_none_literal() {
-    let snippet = r#"
-from typing import Literal
-
-# For each of these expressions, Ruff provides a fix for one of the `Literal[None]` elements
-# but not both, as if both were autofixed it would result in `None | None`,
-# which leads to a `TypeError` at runtime.
-a: Literal[None,] | Literal[None,]
-b: Literal[None] | Literal[None]
-c: Literal[None] | Literal[None,]
-d: Literal[None,] | Literal[None]
-"#;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--select", "PYI061"])
-        .args(["--stdin-filename", "test.py"])
-        .arg("--preview")
-        .arg("--diff")
-        .arg("-")
-        .pass_stdin(snippet), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    --- test.py
-    +++ test.py
-    @@ -4,7 +4,7 @@
-     # For each of these expressions, Ruff provides a fix for one of the `Literal[None]` elements
-     # but not both, as if both were autofixed it would result in `None | None`,
-     # which leads to a `TypeError` at runtime.
-    -a: Literal[None,] | Literal[None,]
-    -b: Literal[None] | Literal[None]
-    -c: Literal[None] | Literal[None,]
-    -d: Literal[None,] | Literal[None]
-    +a: None | Literal[None,]
-    +b: None | Literal[None]
-    +c: None | Literal[None,]
-    +d: None | Literal[None]
-
-
-    ----- stderr -----
-    Would fix 4 errors.
-    ");
-}
-
-/// Test that private, old-style `TypeVar` generics
-/// 1. Get replaced with PEP 695 type parameters (UP046, UP047)
-/// 2. Get renamed to remove leading underscores (UP049)
-/// 3. Emit a warning that the standalone type variable is now unused (PYI018)
-/// 4. Remove the now-unused `Generic` import
-#[test]
-fn pep695_generic_rename() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--select", "F401,PYI018,UP046,UP047,UP049"])
-        .args(["--stdin-filename", "test.py"])
-        .arg("--unsafe-fixes")
-        .arg("--fix")
-        .arg("--preview")
-        .arg("--target-version=py312")
-        .arg("-")
-        .pass_stdin(
-            r#"
-from typing import Generic, TypeVar
-_T = TypeVar("_T")
-
-class OldStyle(Generic[_T]):
-    var: _T
-
-def func(t: _T) -> _T:
-    x: _T
-    return x
-"#
-        ),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-
-    class OldStyle[T]:
-        var: T
-
-    def func[T](t: T) -> T:
-        x: T
-        return x
-
-    ----- stderr -----
-    Found 7 errors (7 fixed, 0 remaining).
-    "
-    );
-}
-
-/// Test that we do not rename two different type parameters to the same name
-/// in one execution of Ruff (autofixing this to `class Foo[T, T]: ...` would
-/// introduce invalid syntax)
-#[test]
-fn type_parameter_rename_isolation() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--select", "UP049"])
-        .args(["--stdin-filename", "test.py"])
-        .arg("--unsafe-fixes")
-        .arg("--fix")
-        .arg("--preview")
-        .arg("--target-version=py312")
-        .arg("-")
-        .pass_stdin(
-            r#"
-class Foo[_T, __T]:
-    pass
-"#
-        ),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-
-    class Foo[T, __T]:
-        pass
-
-    ----- stderr -----
-    test.py:2:14: UP049 Generic class uses private type parameters
-    Found 2 errors (1 fixed, 1 remaining).
-    "
-    );
-}
-
-/// construct a directory tree with this structure:
-/// .
-/// ├── abc
-/// │  └── __init__.py
-/// ├── collections
-/// │  ├── __init__.py
-/// │  ├── abc
-/// │  │  └── __init__.py
-/// │  └── foobar
-/// │      └── __init__.py
-/// ├── foobar
-/// │  ├── __init__.py
-/// │  ├── abc
-/// │  │  └── __init__.py
-/// │  └── collections
-/// │      ├── __init__.py
-/// │      ├── abc
-/// │      │  └── __init__.py
-/// │      └── foobar
-/// │          └── __init__.py
-/// ├── ruff.toml
-/// └── urlparse
-///     └── __init__.py
-fn create_a005_module_structure(tempdir: &TempDir) -> Result<()> {
-    fn create_module(path: &Path) -> Result<()> {
-        fs::create_dir(path)?;
-        fs::File::create(path.join("__init__.py"))?;
-        Ok(())
-    }
-
-    let foobar = tempdir.path().join("foobar");
-    create_module(&foobar)?;
-    for base in [&tempdir.path().into(), &foobar] {
-        for dir in ["abc", "collections"] {
-            create_module(&base.join(dir))?;
-        }
-        create_module(&base.join("collections").join("abc"))?;
-        create_module(&base.join("collections").join("foobar"))?;
-    }
-    create_module(&tempdir.path().join("urlparse"))?;
-    // also create a ruff.toml to mark the project root
-    fs::File::create(tempdir.path().join("ruff.toml"))?;
-
-    Ok(())
-}
-
-/// Test A005 with `strict-checking = true`
-#[test]
-fn a005_module_shadowing_strict() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    create_a005_module_structure(&tempdir)?;
-
-    insta::with_settings!({
-        filters => vec![(r"\\", "/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(r#"lint.flake8-builtins.strict-checking = true"#)
-            .args(["--select", "A005"])
-            .current_dir(tempdir.path()),
-            @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
-        collections/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        foobar/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        foobar/collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
-        foobar/collections/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        Found 6 errors.
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// Test A005 with `strict-checking = false`
-#[test]
-fn a005_module_shadowing_non_strict() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    create_a005_module_structure(&tempdir)?;
-
-    insta::with_settings!({
-        filters => vec![(r"\\", "/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(r#"lint.flake8-builtins.strict-checking = false"#)
-            .args(["--select", "A005"])
-            .current_dir(tempdir.path()),
-            @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
-        Found 2 errors.
-
-        ----- stderr -----
-        ");
-
-    });
-
-    Ok(())
-}
-
-/// Test A005 with `strict-checking` unset
-///
-/// This should match the non-strict version directly above
-#[test]
-fn a005_module_shadowing_strict_default() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    create_a005_module_structure(&tempdir)?;
-
-    insta::with_settings!({
-        filters => vec![(r"\\", "/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--select", "A005"])
-            .current_dir(tempdir.path()),
-            @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
-        Found 2 errors.
-
-        ----- stderr -----
-        ");
-    });
-    Ok(())
-}
-
-/// Test that the linter respects per-file-target-version.
-#[test]
-fn per_file_target_version_linter() {
-    // without per-file-target-version, there should be one UP046 error
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--target-version", "py312"])
-        .args(["--select", "UP046"]) // only triggers on 3.12+
-        .args(["--stdin-filename", "test.py"])
-        .arg("--preview")
-        .arg("-")
-        .pass_stdin(r#"
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-class A(Generic[T]):
-    var: T
-"#),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    test.py:6:9: UP046 Generic class `A` uses `Generic` subclass instead of type parameters
-    Found 1 error.
-    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    "
-    );
-
-    // with per-file-target-version, there should be no errors because the new generic syntax is
-    // unavailable
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--target-version", "py312"])
-        .args(["--config", r#"per-file-target-version = {"test.py" = "py311"}"#])
-        .args(["--select", "UP046"]) // only triggers on 3.12+
-        .args(["--stdin-filename", "test.py"])
-        .arg("--preview")
-        .arg("-")
-        .pass_stdin(r#"
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-class A(Generic[T]):
-    var: T
-"#),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    "
-    );
-}
-
-#[test]
-fn walrus_before_py38() {
-    // ok
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--stdin-filename", "test.py"])
-        .arg("--target-version=py38")
-        .arg("-")
-        .pass_stdin(r#"(x := 1)"#),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    "
-    );
-
-    // not ok on 3.7 with preview
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--stdin-filename", "test.py"])
-        .arg("--target-version=py37")
-        .arg("--preview")
-        .arg("-")
-        .pass_stdin(r#"(x := 1)"#),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    test.py:1:2: invalid-syntax: Cannot use named assignment expression (`:=`) on Python 3.7 (syntax was added in Python 3.8)
-    Found 1 error.
-
-    ----- stderr -----
-    "
-    );
-}
-
-#[test]
-fn match_before_py310() {
-    // ok on 3.10
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--stdin-filename", "test.py"])
-        .arg("--target-version=py310")
-        .arg("-")
-        .pass_stdin(
-            r#"
-match 2:
-    case 1:
-        print("it's one")
-"#
-        ),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    "
-    );
-
-    // ok on 3.9 without preview
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--stdin-filename", "test.py"])
-        .arg("--target-version=py39")
-        .arg("-")
-        .pass_stdin(
-            r#"
-match 2:
-    case 1:
-        print("it's one")
-"#
-        ),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-    Found 1 error.
-
-    ----- stderr -----
-    "
-    );
-
-    // syntax error on 3.9 with preview
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--stdin-filename", "test.py"])
-        .arg("--target-version=py39")
-        .arg("--preview")
-        .arg("-")
-        .pass_stdin(
-            r#"
-match 2:
-    case 1:
-        print("it's one")
-"#
-        ),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-    Found 1 error.
-
-    ----- stderr -----
-    "
-    );
-}
-
-/// Regression test for <https://github.com/astral-sh/ruff/issues/16417>
-#[test]
-fn cache_syntax_errors() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    fs::write(tempdir.path().join("main.py"), "match 2:\n    case 1: ...")?;
-
-    let mut cmd = Command::new(get_cargo_bin(BIN_NAME));
-    // inline STDIN_BASE_OPTIONS to remove --no-cache
-    cmd.args(["check", "--output-format", "concise"])
-        .arg("--target-version=py39")
-        .arg("--preview")
-        .arg("--quiet") // suppress `debug build without --no-cache` warnings
-        .current_dir(&tempdir);
-
-    assert_cmd_snapshot!(
-        cmd,
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-
-    ----- stderr -----
-    "
-    );
-
-    // this should *not* be cached, like normal parse errors
-    assert_cmd_snapshot!(
-        cmd,
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-
-    ----- stderr -----
-    "
-    );
-
-    Ok(())
-}
-
-/// Regression test for <https://github.com/astral-sh/ruff/issues/9381> with very helpful
-/// reproduction repo here: <https://github.com/lucasfijen/example_ruff_glob_bug>
-#[test]
-fn cookiecutter_globbing() -> Result<()> {
-    // This is a simplified directory structure from the repo linked above. The essence of the
-    // problem is this `{{cookiecutter.repo_name}}` directory containing a config file with a glob.
-    // The absolute path of the glob contains the glob metacharacters `{{` and `}}` even though the
-    // user's glob does not.
-    let tempdir = TempDir::new()?;
-    let cookiecutter = tempdir.path().join("{{cookiecutter.repo_name}}");
-    let cookiecutter_toml = cookiecutter.join("pyproject.toml");
-    let tests = cookiecutter.join("tests");
-    fs::create_dir_all(&tests)?;
-    fs::write(
-        &cookiecutter_toml,
-        r#"tool.ruff.lint.per-file-ignores = { "tests/*" = ["F811"] }"#,
-    )?;
-    // F811 example from the docs to ensure the glob still works
-    let maintest = tests.join("maintest.py");
-    fs::write(maintest, "import foo\nimport bar\nimport foo")?;
-
-    insta::with_settings!({filters => vec![(r"\\", "/")]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-                .args(STDIN_BASE_OPTIONS)
-                .arg("--select=F811")
-                .current_dir(tempdir.path()), @r"
-			success: true
-			exit_code: 0
-			----- stdout -----
-			All checks passed!
-
-			----- stderr -----
-			");
-    });
-
-    // after removing the config file with the ignore, F811 applies, so the glob worked above
-    fs::remove_file(cookiecutter_toml)?;
-
-    insta::with_settings!({filters => vec![(r"\\", "/")]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-                .args(STDIN_BASE_OPTIONS)
-                .arg("--select=F811")
-                .current_dir(tempdir.path()), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        {{cookiecutter.repo_name}}/tests/maintest.py:3:8: F811 [*] Redefinition of unused `foo` from line 1: `foo` redefined here
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
-
-        ----- stderr -----
-        ");
-    });
-
-    Ok(())
-}
-
-/// Like the test above but exercises the non-absolute path case in `PerFile::new`
-#[test]
-fn cookiecutter_globbing_no_project_root() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let tempdir = tempdir.path().join("{{cookiecutter.repo_name}}");
-    fs::create_dir(&tempdir)?;
-
-    insta::with_settings!({filters => vec![(r"\\", "/")]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .current_dir(&tempdir)
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--extend-per-file-ignores", "generated.py:Q"]), @r"
-		success: true
-		exit_code: 0
-		----- stdout -----
-		All checks passed!
-
-		----- stderr -----
-		warning: No Python files found under the given path(s)
-		");
-    });
-
-    Ok(())
-}
-
-/// Test that semantic syntax errors (1) are emitted, (2) are not cached, (3) don't affect the
-/// reporting of normal diagnostics, and (4) are not suppressed by `select = []` (or otherwise
-/// disabling all AST-based rules).
-#[test]
-fn semantic_syntax_errors() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let contents = "[(x := 1) for x in foo]";
-    fs::write(tempdir.path().join("main.py"), contents)?;
-
-    let mut cmd = Command::new(get_cargo_bin(BIN_NAME));
-    // inline STDIN_BASE_OPTIONS to remove --no-cache
-    cmd.args(["check", "--output-format", "concise"])
-        .arg("--preview")
-        .arg("--quiet") // suppress `debug build without --no-cache` warnings
-        .current_dir(&tempdir);
-
-    assert_cmd_snapshot!(
-        cmd,
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
-    main.py:1:20: F821 Undefined name `foo`
-
-    ----- stderr -----
-    "
-    );
-
-    // this should *not* be cached, like normal parse errors
-    assert_cmd_snapshot!(
-        cmd,
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
-    main.py:1:20: F821 Undefined name `foo`
-
-    ----- stderr -----
-    "
-    );
-
-    // ensure semantic errors are caught even without AST-based rules selected
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--config", "lint.select = []"])
-            .arg("--preview")
-            .arg("-")
-            .pass_stdin(contents),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
-    Found 1 error.
-
-    ----- stderr -----
-    "
-    );
-
-    Ok(())
-}
-
-/// Regression test for <https://github.com/astral-sh/ruff/issues/17821>.
-///
-/// `lint.typing-extensions = false` with Python 3.9 should disable the PYI019 lint because it would
-/// try to import `Self` from `typing_extensions`
-#[test]
-fn combine_typing_extensions_config() {
-    let contents = "
-from typing import TypeVar
-T = TypeVar('T')
-class Foo:
-    def f(self: T) -> T: ...
-";
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--config", "lint.typing-extensions = false"])
-            .arg("--select=PYI019")
-            .arg("--target-version=py39")
-            .arg("-")
-            .pass_stdin(contents),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    "
-    );
-}
-
-#[test_case::test_case("concise")]
-#[test_case::test_case("full")]
-#[test_case::test_case("json")]
-#[test_case::test_case("json-lines")]
-#[test_case::test_case("junit")]
-#[test_case::test_case("grouped")]
-#[test_case::test_case("github")]
-#[test_case::test_case("gitlab")]
-#[test_case::test_case("pylint")]
-#[test_case::test_case("rdjson")]
-#[test_case::test_case("azure")]
-#[test_case::test_case("sarif")]
-fn output_format(output_format: &str) -> Result<()> {
-    const CONTENT: &str = "\
-import os  # F401
-x = y      # F821
-match 42:  # invalid-syntax
-    case _: ...
-";
-
-    let tempdir = TempDir::new()?;
-    let input = tempdir.path().join("input.py");
-    fs::write(&input, CONTENT)?;
-
-    let snapshot = format!("output_format_{output_format}");
-
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&project_dir).as_str(), "[TMP]/"),
-            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
-            (r#""[^"]+\\?/?input.py"#, r#""[TMP]/input.py"#),
-            (ruff_linter::VERSION, "[VERSION]"),
-        ]
-    }, {
-        assert_cmd_snapshot!(
-            snapshot,
-            Command::new(get_cargo_bin(BIN_NAME))
-                .args([
-                    "check",
-                    "--no-cache",
-                    "--output-format",
-                    output_format,
-                    "--select",
-                    "F401,F821",
-                    "--target-version",
-                    "py39",
-                    "input.py",
-                ])
-                .current_dir(&tempdir),
-        );
-    });
-
-    Ok(())
-}
-
-#[test]
-fn future_annotations_preview_warning() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--config", "lint.future-annotations = true"])
-            .args(["--select", "F"])
-            .arg("--no-preview")
-            .arg("-")
-            .pass_stdin("1"),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    warning: The `lint.future-annotations` setting will have no effect because `preview` is disabled
-    ",
-    );
-}
-
-#[test]
-fn up045_nested_optional_flatten_all() {
-    let contents = "\
-from typing import Optional
-nested_optional: Optional[Optional[Optional[str]]] = None
-";
-
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
-            .arg("-")
-            .pass_stdin(contents),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    @@ -1,2 +1,2 @@
-     from typing import Optional
-    -nested_optional: Optional[Optional[Optional[str]]] = None
-    +nested_optional: str | None = None
-
-
-    ----- stderr -----
-    Would fix 1 error.
-    ",
-    );
-}
diff --git a/crates/ruff/tests/snapshots/integration_test__rule_f401.snap b/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
index 20e77e7894..9213ccb0d7 100644
--- a/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
@@ -44,6 +44,43 @@ import some_module
 __all__ = ["some_module"]
 ```
 
+## Preview
+When [preview] is enabled (and certain simplifying assumptions
+are met), we analyze all import statements for a given module
+when determining whether an import is used, rather than simply
+the last of these statements. This can result in both different and
+more import statements being marked as unused.
+
+For example, if a module consists of
+
+```python
+import a
+import a.b
+```
+
+then both statements are marked as unused under [preview], whereas
+only the second is marked as unused under stable behavior.
+
+As another example, if a module consists of
+
+```python
+import a.b
+import a
+
+a.b.foo()
+```
+
+then a diagnostic will only be emitted for the first line under [preview],
+whereas a diagnostic would only be emitted for the second line under
+stable behavior.
+
+Note that this behavior is somewhat subjective and is designed
+to conform to the developer's intuition rather than Python's actual
+execution. To wit, the statement `import a.b` automatically executes
+`import a`, so in some sense `import a` is _always_ redundant
+in the presence of `import a.b`.
+
+
 ## Fix safety
 
 Fixes to remove unused imports are safe, except in `__init__.py` files.
@@ -55,6 +92,10 @@ either a redundant alias or, if already present in the file, an `__all__` entry.
 to remove third-party and standard library imports -- the fix is unsafe because the module's
 interface changes.
 
+See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)
+for more details on how Ruff
+determines whether an import is first or third-party.
+
 ## Example
 
 ```python
@@ -83,11 +124,6 @@ else:
     print("numpy is not installed")
 ```
 
-## Preview
-When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
-the criterion for determining whether an import is first-party
-is stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.
-
 ## Options
 - `lint.ignore-init-module-imports`
 - `lint.pyflakes.allowed-unused-imports`
@@ -97,4 +133,6 @@ is stricter, which could affect the suggested fix. See [this FAQ section](https:
 - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
 - [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
 
+[preview]: https://docs.astral.sh/ruff/preview/
+
 ----- stderr -----
diff --git a/crates/ruff/tests/snapshots/integration_test__rule_f401_output_json.snap b/crates/ruff/tests/snapshots/integration_test__rule_f401_output_json.snap
new file mode 100644
index 0000000000..c206f975d4
--- /dev/null
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401_output_json.snap
@@ -0,0 +1,38 @@
+---
+source: crates/ruff/tests/integration_test.rs
+info:
+  program: ruff
+  args:
+    - rule
+    - F401
+    - "--output-format"
+    - json
+---
+success: true
+exit_code: 0
+----- stdout -----
+{
+  "name": "unused-import",
+  "code": "F401",
+  "linter": "Pyflakes",
+  "summary": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability",
+  "message_formats": [
+    "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability",
+    "`{name}` imported but unused; consider removing, adding to `__all__`, or using a redundant alias",
+    "`{name}` imported but unused"
+  ],
+  "fix": "Fix is sometimes available.",
+  "fix_availability": "Sometimes",
+  "explanation": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\n\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n\n[preview]: https://docs.astral.sh/ruff/preview/\n",
+  "preview": false,
+  "status": {
+    "Stable": {
+      "since": "v0.0.18"
+    }
+  },
+  "source_location": {
+    "file": "<FILE>",
+    "line": 145
+  }
+}
+----- stderr -----
diff --git a/crates/ruff/tests/snapshots/integration_test__rule_f401_output_text.snap b/crates/ruff/tests/snapshots/integration_test__rule_f401_output_text.snap
new file mode 100644
index 0000000000..120e96d9ac
--- /dev/null
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401_output_text.snap
@@ -0,0 +1,140 @@
+---
+source: crates/ruff/tests/integration_test.rs
+info:
+  program: ruff
+  args:
+    - rule
+    - F401
+    - "--output-format"
+    - text
+---
+success: true
+exit_code: 0
+----- stdout -----
+# unused-import (F401)
+
+Derived from the **Pyflakes** linter.
+
+Fix is sometimes available.
+
+## 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.
+
+If an import statement is used to re-export a symbol as part of a module's
+public interface, consider using a "redundant" import alias, which
+instructs Ruff (and other tools) to respect the re-export, and avoid
+marking it as unused, as in:
+
+```python
+from module import member as member
+```
+
+Alternatively, you can use `__all__` to declare a symbol as part of the module's
+interface, as in:
+
+```python
+# __init__.py
+import some_module
+
+__all__ = ["some_module"]
+```
+
+## Preview
+When [preview] is enabled (and certain simplifying assumptions
+are met), we analyze all import statements for a given module
+when determining whether an import is used, rather than simply
+the last of these statements. This can result in both different and
+more import statements being marked as unused.
+
+For example, if a module consists of
+
+```python
+import a
+import a.b
+```
+
+then both statements are marked as unused under [preview], whereas
+only the second is marked as unused under stable behavior.
+
+As another example, if a module consists of
+
+```python
+import a.b
+import a
+
+a.b.foo()
+```
+
+then a diagnostic will only be emitted for the first line under [preview],
+whereas a diagnostic would only be emitted for the second line under
+stable behavior.
+
+Note that this behavior is somewhat subjective and is designed
+to conform to the developer's intuition rather than Python's actual
+execution. To wit, the statement `import a.b` automatically executes
+`import a`, so in some sense `import a` is _always_ redundant
+in the presence of `import a.b`.
+
+
+## Fix safety
+
+Fixes to remove unused imports are safe, except in `__init__.py` files.
+
+Applying fixes to `__init__.py` files is currently in preview. The fix offered depends on the
+type of the unused import. Ruff will suggest a safe fix to export first-party imports with
+either a redundant alias or, if already present in the file, an `__all__` entry. If multiple
+`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix
+to remove third-party and standard library imports -- the fix is unsafe because the module's
+interface changes.
+
+See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)
+for more details on how Ruff
+determines whether an import is first or third-party.
+
+## 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")
+```
+
+## Options
+- `lint.ignore-init-module-imports`
+- `lint.pyflakes.allowed-unused-imports`
+
+## 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)
+- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
+
+[preview]: https://docs.astral.sh/ruff/preview/
+
+----- stderr -----
diff --git a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
index cb94c10332..28a6607816 100644
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -371,6 +371,7 @@ linter.pylint.max_branches = 12
 linter.pylint.max_statements = 50
 linter.pylint.max_public_methods = 20
 linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
 
diff --git a/crates/ruff_annotate_snippets/src/renderer/display_list.rs b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
index 2728cfba7b..fb88a26223 100644
--- a/crates/ruff_annotate_snippets/src/renderer/display_list.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
@@ -56,6 +56,7 @@ pub(crate) struct DisplayList<'a> {
     pub(crate) stylesheet: &'a Stylesheet,
     pub(crate) anonymized_line_numbers: bool,
     pub(crate) cut_indicator: &'static str,
+    pub(crate) lineno_offset: usize,
 }
 
 impl PartialEq for DisplayList<'_> {
@@ -81,13 +82,14 @@ impl Display for DisplayList<'_> {
                 _ => max,
             })
         });
-        let lineno_width = if lineno_width == 0 {
-            lineno_width
-        } else if self.anonymized_line_numbers {
-            ANONYMIZED_LINE_NUM.len()
-        } else {
-            ((lineno_width as f64).log10().floor() as usize) + 1
-        };
+        let lineno_width = self.lineno_offset
+            + if lineno_width == 0 {
+                lineno_width
+            } else if self.anonymized_line_numbers {
+                ANONYMIZED_LINE_NUM.len()
+            } else {
+                ((lineno_width as f64).log10().floor() as usize) + 1
+            };
 
         let multiline_depth = self.body.iter().fold(0, |max, set| {
             set.display_lines.iter().fold(max, |max2, line| match line {
@@ -124,6 +126,7 @@ impl<'a> DisplayList<'a> {
         term_width: usize,
         cut_indicator: &'static str,
     ) -> DisplayList<'a> {
+        let lineno_offset = message.lineno_offset;
         let body = format_message(
             message,
             term_width,
@@ -137,6 +140,7 @@ impl<'a> DisplayList<'a> {
             stylesheet,
             anonymized_line_numbers,
             cut_indicator,
+            lineno_offset,
         }
     }
 
@@ -1088,6 +1092,7 @@ fn format_message<'m>(
         footer,
         snippets,
         is_fixable,
+        lineno_offset: _,
     } = message;
 
     let mut sets = vec![];
diff --git a/crates/ruff_annotate_snippets/src/snippet.rs b/crates/ruff_annotate_snippets/src/snippet.rs
index 339cd3a850..76d615189d 100644
--- a/crates/ruff_annotate_snippets/src/snippet.rs
+++ b/crates/ruff_annotate_snippets/src/snippet.rs
@@ -23,6 +23,7 @@ pub struct Message<'a> {
     pub(crate) snippets: Vec<Snippet<'a>>,
     pub(crate) footer: Vec<Message<'a>>,
     pub(crate) is_fixable: bool,
+    pub(crate) lineno_offset: usize,
 }
 
 impl<'a> Message<'a> {
@@ -59,6 +60,16 @@ impl<'a> Message<'a> {
         self.is_fixable = yes;
         self
     }
+
+    /// Add an offset used for aligning the header sigil (`-->`) with the line number separators.
+    ///
+    /// For normal diagnostics this is computed automatically based on the lines to be rendered.
+    /// This is intended only for use in the formatter, where we don't render a snippet directly but
+    /// still want the header to align with the diff.
+    pub fn lineno_offset(mut self, offset: usize) -> Self {
+        self.lineno_offset = offset;
+        self
+    }
 }
 
 /// Structure containing the slice of text to be annotated and
@@ -144,7 +155,7 @@ impl<'a> Annotation<'a> {
         self
     }
 
-    pub fn is_file_level(mut self, yes: bool) -> Self {
+    pub fn hide_snippet(mut self, yes: bool) -> Self {
         self.is_file_level = yes;
         self
     }
@@ -173,6 +184,7 @@ impl Level {
             snippets: vec![],
             footer: vec![],
             is_fixable: false,
+            lineno_offset: 0,
         }
     }
 
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_eof.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_eof.svg
index bb12aecf29..045b0ef413 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_eof.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_eof.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_insertion.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_insertion.svg
index 1f4b6a24a6..15a178bd9c 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_insertion.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_insertion.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline.svg
index 913069149d..2cb50b1b7d 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="182px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline2.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline2.svg
index 97948a47a9..954d199f67 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline2.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_multiline2.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="164px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_removed_nl.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_removed_nl.svg
index bb12aecf29..045b0ef413 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/ann_removed_nl.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/ann_removed_nl.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/ensure-emoji-highlight-width.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/ensure-emoji-highlight-width.svg
index e5646e61ad..c4b5f2232c 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/ensure-emoji-highlight-width.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/ensure-emoji-highlight-width.svg
@@ -1,7 +1,7 @@
 <svg width="1356px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_ann_multiline.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_ann_multiline.svg
index 6a89c4f75f..5fdcccdb01 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_ann_multiline.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_ann_multiline.svg
@@ -1,7 +1,7 @@
 <svg width="869px" height="236px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .fg-yellow { fill: #AA5500 }
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_bad_origin_line.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_bad_origin_line.svg
index 23f1b646e4..ad21dd984d 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_bad_origin_line.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_bad_origin_line.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .fg-yellow { fill: #AA5500 }
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_leading.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_leading.svg
index e69965e98a..0d113f932b 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_leading.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_leading.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_trailing.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_trailing.svg
index 41bf7c7959..329b2b8322 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/fold_trailing.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/fold_trailing.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/issue_9.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/issue_9.svg
index 80b891e0af..72ccb54163 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/issue_9.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/issue_9.svg
@@ -1,7 +1,7 @@
 <svg width="911px" height="236px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .fg-yellow { fill: #AA5500 }
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/multiple_annotations.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/multiple_annotations.svg
index 84f474950c..de3473406b 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/multiple_annotations.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/multiple_annotations.svg
@@ -1,7 +1,7 @@
 <svg width="768px" height="290px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg
index e666b9076a..fc5eebdae3 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg
index 228ec94551..0ef32853f4 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg
@@ -1,7 +1,7 @@
 <svg width="1196px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/simple.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/simple.svg
index 7b92d238fd..b8939de5b6 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/simple.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/simple.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="182px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .fg-yellow { fill: #AA5500 }
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line.svg
index 9da24fe37b..912699ad25 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_char.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_char.svg
index cbafc78915..c2d2dc2b0d 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_char.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_char.svg
@@ -1,7 +1,7 @@
 <svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg
index 67e2cfd9b2..e3c1667ec2 100644
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg
@@ -1,7 +1,7 @@
 <svg width="1196px" height="164px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-red { fill: #FF5555 }
     .container {
diff --git a/crates/ruff_benchmark/benches/ty.rs b/crates/ruff_benchmark/benches/ty.rs
index 02a10a4100..e932aabd15 100644
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -444,15 +444,12 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
     criterion.bench_function("ty_micro[complex_constrained_attributes_2]", |b| {
         b.iter_batched_ref(
             || {
-                // This is is similar to the case above, but now the attributes are actually defined.
+                // This is similar to the case above, but now the attributes are actually defined.
                 // https://github.com/astral-sh/ty/issues/711
                 setup_micro_case(
                     r#"
                     class C:
                         def f(self: "C"):
-                            self.a = ""
-                            self.b = ""
-
                             if isinstance(self.a, str):
                                 return
 
@@ -466,6 +463,56 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                                 return
                             if isinstance(self.b, str):
                                 return
+                            if isinstance(self.b, str):
+                                return
+                            if isinstance(self.b, str):
+                                return
+
+                            self.a = ""
+                            self.b = ""
+                    "#,
+                )
+            },
+            |case| {
+                let Case { db, .. } = case;
+                let result = db.check();
+                assert_eq!(result.len(), 0);
+            },
+            BatchSize::SmallInput,
+        );
+    });
+}
+
+fn benchmark_complex_constrained_attributes_3(criterion: &mut Criterion) {
+    setup_rayon();
+
+    criterion.bench_function("ty_micro[complex_constrained_attributes_3]", |b| {
+        b.iter_batched_ref(
+            || {
+                // This is a regression test for https://github.com/astral-sh/ty/issues/758
+                setup_micro_case(
+                    r#"
+                    class GridOut:
+                        def __init__(self: "GridOut") -> None:
+                            self._buffer = b""
+
+                        def _read_size_or_line(self: "GridOut", size: int = -1):
+                            if size > self._position:
+                                size = self._position
+                                pass
+                            if size == 0:
+                                return bytes()
+
+                            while size > 0:
+                                if self._buffer:
+                                    buf = self._buffer
+                                    self._buffer = b""
+                                else:
+                                    buf = b""
+
+                                if len(buf) > size:
+                                    self._buffer = buf
+                                    self._position -= len(self._buffer)
                     "#,
                 )
             },
@@ -552,7 +599,7 @@ impl<'a> ProjectBenchmark<'a> {
             self.project
                 .check_paths()
                 .iter()
-                .map(|path| path.to_path_buf())
+                .map(|path| SystemPathBuf::from(*path))
                 .collect(),
         );
 
@@ -598,8 +645,8 @@ fn hydra(criterion: &mut Criterion) {
             name: "hydra-zen",
             repository: "https://github.com/mit-ll-responsible-ai/hydra-zen",
             commit: "dd2b50a9614c6f8c46c5866f283c8f7e7a960aa8",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec!["pydantic", "beartype", "hydra-core"],
+            paths: &["src"],
+            dependencies: &["pydantic", "beartype", "hydra-core"],
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
@@ -615,12 +662,12 @@ fn attrs(criterion: &mut Criterion) {
             name: "attrs",
             repository: "https://github.com/python-attrs/attrs",
             commit: "a6ae894aad9bc09edc7cdad8c416898784ceec9b",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec![],
+            paths: &["src"],
+            dependencies: &[],
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
-        100,
+        110,
     );
 
     bench_project(&benchmark, criterion);
@@ -632,12 +679,12 @@ fn anyio(criterion: &mut Criterion) {
             name: "anyio",
             repository: "https://github.com/agronholm/anyio",
             commit: "561d81270a12f7c6bbafb5bc5fad99a2a13f96be",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec![],
+            paths: &["src"],
+            dependencies: &[],
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
-        100,
+        150,
     );
 
     bench_project(&benchmark, criterion);
@@ -649,8 +696,8 @@ fn datetype(criterion: &mut Criterion) {
             name: "DateType",
             repository: "https://github.com/glyph/DateType",
             commit: "57c9c93cf2468069f72945fc04bf27b64100dad8",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec![],
+            paths: &["src"],
+            dependencies: &[],
             max_dep_date: "2025-07-04",
             python_version: PythonVersion::PY313,
         },
@@ -668,6 +715,7 @@ criterion_group!(
     benchmark_tuple_implicit_instance_attributes,
     benchmark_complex_constrained_attributes_1,
     benchmark_complex_constrained_attributes_2,
+    benchmark_complex_constrained_attributes_3,
     benchmark_many_enum_members,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);
diff --git a/crates/ruff_benchmark/benches/ty_walltime.rs b/crates/ruff_benchmark/benches/ty_walltime.rs
index 97643c304d..be6195d96a 100644
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -1,6 +1,5 @@
-use std::fmt::{Display, Formatter};
-
 use divan::{Bencher, bench};
+use std::fmt::{Display, Formatter};
 
 use rayon::ThreadPoolBuilder;
 use ruff_benchmark::real_world_projects::{InstalledProject, RealWorldProject};
@@ -13,29 +12,39 @@ use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::{Db, ProjectDatabase, ProjectMetadata};
 
 struct Benchmark<'a> {
-    project: InstalledProject<'a>,
+    project: RealWorldProject<'a>,
+    installed_project: std::sync::OnceLock<InstalledProject<'a>>,
     max_diagnostics: usize,
 }
 
 impl<'a> Benchmark<'a> {
-    fn new(project: RealWorldProject<'a>, max_diagnostics: usize) -> Self {
-        let setup_project = project.setup().expect("Failed to setup project");
-
+    const fn new(project: RealWorldProject<'a>, max_diagnostics: usize) -> Self {
         Self {
-            project: setup_project,
+            project,
+            installed_project: std::sync::OnceLock::new(),
             max_diagnostics,
         }
     }
 
+    fn installed_project(&self) -> &InstalledProject<'a> {
+        self.installed_project.get_or_init(|| {
+            self.project
+                .clone()
+                .setup()
+                .expect("Failed to setup project")
+        })
+    }
+
     fn setup_iteration(&self) -> ProjectDatabase {
-        let root = SystemPathBuf::from_path_buf(self.project.path.clone()).unwrap();
+        let installed_project = self.installed_project();
+        let root = SystemPathBuf::from_path_buf(installed_project.path.clone()).unwrap();
         let system = OsSystem::new(&root);
 
         let mut metadata = ProjectMetadata::discover(&root, &system).unwrap();
 
         metadata.apply_options(Options {
             environment: Some(EnvironmentOptions {
-                python_version: Some(RangedValue::cli(self.project.config.python_version)),
+                python_version: Some(RangedValue::cli(installed_project.config.python_version)),
                 python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                 ..EnvironmentOptions::default()
             }),
@@ -46,7 +55,7 @@ impl<'a> Benchmark<'a> {
 
         db.project().set_included_paths(
             &mut db,
-            self.project
+            installed_project
                 .check_paths()
                 .iter()
                 .map(|path| SystemPath::absolute(path, &root))
@@ -58,7 +67,7 @@ impl<'a> Benchmark<'a> {
 
 impl Display for Benchmark<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.project.config.name)
+        self.project.name.fmt(f)
     }
 }
 
@@ -75,166 +84,150 @@ fn check_project(db: &ProjectDatabase, max_diagnostics: usize) {
     );
 }
 
-static ALTAIR: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "altair",
-            repository: "https://github.com/vega/altair",
-            commit: "d1f4a1ef89006e5f6752ef1f6df4b7a509336fba",
-            paths: vec![SystemPath::new("altair")],
-            dependencies: vec![
-                "jinja2",
-                "narwhals",
-                "numpy",
-                "packaging",
-                "pandas-stubs",
-                "pyarrow-stubs",
-                "pytest",
-                "scipy-stubs",
-                "types-jsonschema",
-            ],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY312,
-        },
-        1000,
-    )
-});
+static ALTAIR: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "altair",
+        repository: "https://github.com/vega/altair",
+        commit: "d1f4a1ef89006e5f6752ef1f6df4b7a509336fba",
+        paths: &["altair"],
+        dependencies: &[
+            "jinja2",
+            "narwhals",
+            "numpy",
+            "packaging",
+            "pandas-stubs",
+            "pyarrow-stubs",
+            "pytest",
+            "scipy-stubs",
+            "types-jsonschema",
+        ],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY312,
+    },
+    1000,
+);
 
-static COLOUR_SCIENCE: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "colour-science",
-            repository: "https://github.com/colour-science/colour",
-            commit: "a17e2335c29e7b6f08080aa4c93cfa9b61f84757",
-            paths: vec![SystemPath::new("colour")],
-            dependencies: vec![
-                "matplotlib",
-                "numpy",
-                "pandas-stubs",
-                "pytest",
-                "scipy-stubs",
-            ],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY310,
-        },
-        477,
-    )
-});
+static COLOUR_SCIENCE: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "colour-science",
+        repository: "https://github.com/colour-science/colour",
+        commit: "a17e2335c29e7b6f08080aa4c93cfa9b61f84757",
+        paths: &["colour"],
+        dependencies: &[
+            "matplotlib",
+            "numpy",
+            "pandas-stubs",
+            "pytest",
+            "scipy-stubs",
+        ],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY310,
+    },
+    600,
+);
 
-static FREQTRADE: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "freqtrade",
-            repository: "https://github.com/freqtrade/freqtrade",
-            commit: "2d842ea129e56575852ee0c45383c8c3f706be19",
-            paths: vec![SystemPath::new("freqtrade")],
-            dependencies: vec![
-                "numpy",
-                "pandas-stubs",
-                "pydantic",
-                "sqlalchemy",
-                "types-cachetools",
-                "types-filelock",
-                "types-python-dateutil",
-                "types-requests",
-                "types-tabulate",
-            ],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY312,
-        },
-        400,
-    )
-});
+static FREQTRADE: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "freqtrade",
+        repository: "https://github.com/freqtrade/freqtrade",
+        commit: "2d842ea129e56575852ee0c45383c8c3f706be19",
+        paths: &["freqtrade"],
+        dependencies: &[
+            "numpy",
+            "pandas-stubs",
+            "pydantic",
+            "sqlalchemy",
+            "types-cachetools",
+            "types-filelock",
+            "types-python-dateutil",
+            "types-requests",
+            "types-tabulate",
+        ],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY312,
+    },
+    400,
+);
 
-static PANDAS: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "pandas",
-            repository: "https://github.com/pandas-dev/pandas",
-            commit: "5909621e2267eb67943a95ef5e895e8484c53432",
-            paths: vec![SystemPath::new("pandas")],
-            dependencies: vec![
-                "numpy",
-                "types-python-dateutil",
-                "types-pytz",
-                "types-PyMySQL",
-                "types-setuptools",
-                "pytest",
-            ],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY312,
-        },
-        3000,
-    )
-});
+static PANDAS: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "pandas",
+        repository: "https://github.com/pandas-dev/pandas",
+        commit: "5909621e2267eb67943a95ef5e895e8484c53432",
+        paths: &["pandas"],
+        dependencies: &[
+            "numpy",
+            "types-python-dateutil",
+            "types-pytz",
+            "types-PyMySQL",
+            "types-setuptools",
+            "pytest",
+        ],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY312,
+    },
+    3000,
+);
 
-static PYDANTIC: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "pydantic",
-            repository: "https://github.com/pydantic/pydantic",
-            commit: "0c4a22b64b23dfad27387750cf07487efc45eb05",
-            paths: vec![SystemPath::new("pydantic")],
-            dependencies: vec![
-                "annotated-types",
-                "pydantic-core",
-                "typing-extensions",
-                "typing-inspection",
-            ],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY39,
-        },
-        1000,
-    )
-});
+static PYDANTIC: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "pydantic",
+        repository: "https://github.com/pydantic/pydantic",
+        commit: "0c4a22b64b23dfad27387750cf07487efc45eb05",
+        paths: &["pydantic"],
+        dependencies: &[
+            "annotated-types",
+            "pydantic-core",
+            "typing-extensions",
+            "typing-inspection",
+        ],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY39,
+    },
+    1000,
+);
 
-static SYMPY: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "sympy",
-            repository: "https://github.com/sympy/sympy",
-            commit: "22fc107a94eaabc4f6eb31470b39db65abb7a394",
-            paths: vec![SystemPath::new("sympy")],
-            dependencies: vec!["mpmath"],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY312,
-        },
-        13000,
-    )
-});
+static SYMPY: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "sympy",
+        repository: "https://github.com/sympy/sympy",
+        commit: "22fc107a94eaabc4f6eb31470b39db65abb7a394",
+        paths: &["sympy"],
+        dependencies: &["mpmath"],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY312,
+    },
+    13000,
+);
 
-static TANJUN: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "tanjun",
-            repository: "https://github.com/FasterSpeeding/Tanjun",
-            commit: "69f40db188196bc59516b6c69849c2d85fbc2f4a",
-            paths: vec![SystemPath::new("tanjun")],
-            dependencies: vec!["hikari", "alluka"],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY312,
-        },
-        100,
-    )
-});
+static TANJUN: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "tanjun",
+        repository: "https://github.com/FasterSpeeding/Tanjun",
+        commit: "69f40db188196bc59516b6c69849c2d85fbc2f4a",
+        paths: &["tanjun"],
+        dependencies: &["hikari", "alluka"],
+        max_dep_date: "2025-06-17",
+        python_version: PythonVersion::PY312,
+    },
+    320,
+);
 
-static STATIC_FRAME: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "static-frame",
-            repository: "https://github.com/static-frame/static-frame",
-            commit: "34962b41baca5e7f98f5a758d530bff02748a421",
-            paths: vec![SystemPath::new("static_frame")],
-            // N.B. `arraykit` is installed as a dependency during mypy_primer runs,
-            // but it takes much longer to be installed in a Codspeed run than it does in a mypy_primer run
-            // (seems to be built from source on the Codspeed CI runners for some reason).
-            dependencies: vec!["numpy"],
-            max_dep_date: "2025-08-09",
-            python_version: PythonVersion::PY311,
-        },
-        500,
-    )
-});
+static STATIC_FRAME: Benchmark = Benchmark::new(
+    RealWorldProject {
+        name: "static-frame",
+        repository: "https://github.com/static-frame/static-frame",
+        commit: "34962b41baca5e7f98f5a758d530bff02748a421",
+        paths: &["static_frame"],
+        // N.B. `arraykit` is installed as a dependency during mypy_primer runs,
+        // but it takes much longer to be installed in a Codspeed run than it does in a mypy_primer run
+        // (seems to be built from source on the Codspeed CI runners for some reason).
+        dependencies: &["numpy"],
+        max_dep_date: "2025-08-09",
+        python_version: PythonVersion::PY311,
+    },
+    750,
+);
 
 #[track_caller]
 fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
@@ -245,22 +238,22 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
         });
 }
 
-#[bench(args=[&*ALTAIR, &*FREQTRADE, &*PYDANTIC, &*TANJUN], sample_size=2, sample_count=3)]
+#[bench(args=[&ALTAIR, &FREQTRADE, &PYDANTIC, &TANJUN], sample_size=2, sample_count=3)]
 fn small(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&*COLOUR_SCIENCE, &*PANDAS, &*STATIC_FRAME], sample_size=1, sample_count=3)]
+#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
 fn medium(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&*SYMPY], sample_size=1, sample_count=2)]
+#[bench(args=[&SYMPY], sample_size=1, sample_count=2)]
 fn large(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&*PYDANTIC], sample_size=3, sample_count=8)]
+#[bench(args=[&PYDANTIC], sample_size=3, sample_count=8)]
 fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
     let thread_pool = ThreadPoolBuilder::new().build().unwrap();
 
diff --git a/crates/ruff_benchmark/src/real_world_projects.rs b/crates/ruff_benchmark/src/real_world_projects.rs
index 0e23e67494..c8325e7c5a 100644
--- a/crates/ruff_benchmark/src/real_world_projects.rs
+++ b/crates/ruff_benchmark/src/real_world_projects.rs
@@ -30,9 +30,9 @@ pub struct RealWorldProject<'a> {
     /// Specific commit hash to checkout
     pub commit: &'a str,
     /// List of paths within the project to check (`ty check <paths>`)
-    pub paths: Vec<&'a SystemPath>,
+    pub paths: &'a [&'a str],
     /// Dependencies to install via uv
-    pub dependencies: Vec<&'a str>,
+    pub dependencies: &'a [&'a str],
     /// Limit candidate packages to those that were uploaded prior to a given point in time (ISO 8601 format).
     /// Maps to uv's `exclude-newer`.
     pub max_dep_date: &'a str,
@@ -125,9 +125,9 @@ impl<'a> InstalledProject<'a> {
         &self.config
     }
 
-    /// Get the benchmark paths as `SystemPathBuf`
-    pub fn check_paths(&self) -> &[&SystemPath] {
-        &self.config.paths
+    /// Get the benchmark paths
+    pub fn check_paths(&self) -> &[&str] {
+        self.config.paths
     }
 
     /// Get the virtual environment path
@@ -297,7 +297,7 @@ fn install_dependencies(checkout: &Checkout) -> Result<()> {
         "--exclude-newer",
         checkout.project().max_dep_date,
     ])
-    .args(&checkout.project().dependencies);
+    .args(checkout.project().dependencies);
 
     let output = cmd
         .output()
diff --git a/crates/ruff_db/Cargo.toml b/crates/ruff_db/Cargo.toml
index f3df7fac70..25f0024b80 100644
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -34,12 +34,14 @@ glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
 path-slash = { workspace = true }
+pathdiff = { workspace = true }
 quick-junit = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
+similar = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
@@ -52,7 +54,7 @@ web-time = { version = "1.1.0" }
 etcetera = { workspace = true, optional = true }
 
 [dev-dependencies]
-insta = { workspace = true }
+insta = { workspace = true, features = ["filters"] }
 tempfile = { workspace = true }
 
 [features]
diff --git a/crates/ruff_db/src/diagnostic/mod.rs b/crates/ruff_db/src/diagnostic/mod.rs
index 53b4247adc..9d9ff2dbc3 100644
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -7,7 +7,9 @@ use ruff_annotate_snippets::Level as AnnotateLevel;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 pub use self::render::{
-    DisplayDiagnostic, DisplayDiagnostics, FileResolver, Input, ceil_char_boundary,
+    DisplayDiagnostic, DisplayDiagnostics, DummyFileResolver, FileResolver, Input,
+    ceil_char_boundary,
+    github::{DisplayGithubDiagnostics, GithubRenderer},
 };
 use crate::{Db, files::File};
 
@@ -68,6 +70,7 @@ impl Diagnostic {
             parent: None,
             noqa_offset: None,
             secondary_code: None,
+            header_offset: 0,
         });
         Diagnostic { inner }
     }
@@ -81,17 +84,14 @@ impl Diagnostic {
     /// at time of writing, `ruff_db` depends on `ruff_python_parser` instead of
     /// the other way around. And since we want to do this conversion in a couple
     /// places, it makes sense to centralize it _somewhere_. So it's here for now.
-    ///
-    /// Note that `message` is stored in the primary annotation, _not_ in the primary diagnostic
-    /// message.
     pub fn invalid_syntax(
         span: impl Into<Span>,
         message: impl IntoDiagnosticMessage,
         range: impl Ranged,
     ) -> Diagnostic {
-        let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
+        let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
         let span = span.into().with_range(range.range());
-        diag.annotate(Annotation::primary(span).message(message));
+        diag.annotate(Annotation::primary(span));
         diag
     }
 
@@ -325,6 +325,11 @@ impl Diagnostic {
         self.inner.fix.as_ref()
     }
 
+    #[cfg(test)]
+    pub(crate) fn fix_mut(&mut self) -> Option<&mut Fix> {
+        Arc::make_mut(&mut self.inner).fix.as_mut()
+    }
+
     /// Set the fix for this diagnostic.
     pub fn set_fix(&mut self, fix: Fix) {
         debug_assert!(
@@ -344,6 +349,13 @@ impl Diagnostic {
         self.fix().is_some()
     }
 
+    /// Returns `true` if the diagnostic is [`fixable`](Diagnostic::fixable) and applies at the
+    /// configured applicability level.
+    pub fn has_applicable_fix(&self, config: &DisplayDiagnosticConfig) -> bool {
+        self.fix()
+            .is_some_and(|fix| fix.applies(config.fix_applicability))
+    }
+
     /// Returns the offset of the parent statement for this diagnostic if it exists.
     ///
     /// This is primarily used for checking noqa/secondary code suppressions.
@@ -419,14 +431,23 @@ impl Diagnostic {
 
     /// Returns the URL for the rule documentation, if it exists.
     pub fn to_ruff_url(&self) -> Option<String> {
-        if self.is_invalid_syntax() {
-            None
-        } else {
-            Some(format!(
-                "{}/rules/{}",
-                env!("CARGO_PKG_HOMEPAGE"),
-                self.name()
-            ))
+        match self.id() {
+            DiagnosticId::Panic
+            | DiagnosticId::Io
+            | DiagnosticId::InvalidSyntax
+            | DiagnosticId::RevealedType
+            | DiagnosticId::UnknownRule
+            | DiagnosticId::InvalidGlob
+            | DiagnosticId::EmptyInclude
+            | DiagnosticId::UnnecessaryOverridesSection
+            | DiagnosticId::UselessOverridesSection
+            | DiagnosticId::DeprecatedSetting
+            | DiagnosticId::Unformatted
+            | DiagnosticId::InvalidCliOption
+            | DiagnosticId::InternalError => None,
+            DiagnosticId::Lint(lint_name) => {
+                Some(format!("{}/rules/{lint_name}", env!("CARGO_PKG_HOMEPAGE")))
+            }
         }
     }
 
@@ -442,24 +463,26 @@ impl Diagnostic {
 
     /// Computes the start source location for the message.
     ///
-    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
-    /// span has no range.
-    pub fn expect_ruff_start_location(&self) -> LineColumn {
-        self.expect_primary_span()
-            .expect_ruff_file()
-            .to_source_code()
-            .line_column(self.expect_range().start())
+    /// Returns None if the diagnostic has no primary span, if its file is not a `SourceFile`,
+    /// or if the span has no range.
+    pub fn ruff_start_location(&self) -> Option<LineColumn> {
+        Some(
+            self.ruff_source_file()?
+                .to_source_code()
+                .line_column(self.range()?.start()),
+        )
     }
 
     /// Computes the end source location for the message.
     ///
-    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
-    /// span has no range.
-    pub fn expect_ruff_end_location(&self) -> LineColumn {
-        self.expect_primary_span()
-            .expect_ruff_file()
-            .to_source_code()
-            .line_column(self.expect_range().end())
+    /// Returns None if the diagnostic has no primary span, if its file is not a `SourceFile`,
+    /// or if the span has no range.
+    pub fn ruff_end_location(&self) -> Option<LineColumn> {
+        Some(
+            self.ruff_source_file()?
+                .to_source_code()
+                .line_column(self.range()?.end()),
+        )
     }
 
     /// Returns the [`SourceFile`] which the message belongs to.
@@ -480,22 +503,27 @@ impl Diagnostic {
         self.primary_span()?.range()
     }
 
-    /// Returns the [`TextRange`] for the diagnostic.
-    ///
-    /// Panics if the diagnostic has no primary span or if the span has no range.
-    pub fn expect_range(&self) -> TextRange {
-        self.range().expect("Expected a range for the primary span")
-    }
-
     /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
     ///
-    /// Panics if either diagnostic has no primary span, if the span has no range, or if its file is
-    /// not a `SourceFile`.
+    /// Panics if either diagnostic has no primary span, or if its file is not a `SourceFile`.
     pub fn ruff_start_ordering(&self, other: &Self) -> std::cmp::Ordering {
-        (self.expect_ruff_source_file(), self.expect_range().start()).cmp(&(
+        let a = (
+            self.severity().is_fatal(),
+            self.expect_ruff_source_file(),
+            self.range().map(|r| r.start()),
+        );
+        let b = (
+            other.severity().is_fatal(),
             other.expect_ruff_source_file(),
-            other.expect_range().start(),
-        ))
+            other.range().map(|r| r.start()),
+        );
+
+        a.cmp(&b)
+    }
+
+    /// Add an offset for aligning the header sigil with the line number separators in a diff.
+    pub fn set_header_offset(&mut self, offset: usize) {
+        Arc::make_mut(&mut self.inner).header_offset = offset;
     }
 }
 
@@ -510,6 +538,7 @@ struct DiagnosticInner {
     parent: Option<TextSize>,
     noqa_offset: Option<TextSize>,
     secondary_code: Option<SecondaryCode>,
+    header_offset: usize,
 }
 
 struct RenderingSortKey<'a> {
@@ -727,11 +756,11 @@ pub struct Annotation {
     is_primary: bool,
     /// The diagnostic tags associated with this annotation.
     tags: Vec<DiagnosticTag>,
-    /// Whether this annotation is a file-level or full-file annotation.
+    /// Whether the snippet for this annotation should be hidden.
     ///
     /// When set, rendering will only include the file's name and (optional) range. Everything else
     /// is omitted, including any file snippet or message.
-    is_file_level: bool,
+    hide_snippet: bool,
 }
 
 impl Annotation {
@@ -750,7 +779,7 @@ impl Annotation {
             message: None,
             is_primary: true,
             tags: Vec::new(),
-            is_file_level: false,
+            hide_snippet: false,
         }
     }
 
@@ -767,7 +796,7 @@ impl Annotation {
             message: None,
             is_primary: false,
             tags: Vec::new(),
-            is_file_level: false,
+            hide_snippet: false,
         }
     }
 
@@ -834,19 +863,20 @@ impl Annotation {
         self.tags.push(tag);
     }
 
-    /// Set whether or not this annotation is file-level.
+    /// Set whether or not the snippet on this annotation should be suppressed when rendering.
     ///
-    /// File-level annotations are only rendered with their file name and range, if available. This
-    /// is intended for backwards compatibility with Ruff diagnostics, which historically used
+    /// Such annotations are only rendered with their file name and range, if available. This is
+    /// intended for backwards compatibility with Ruff diagnostics, which historically used
     /// `TextRange::default` to indicate a file-level diagnostic. In the new diagnostic model, a
     /// [`Span`] with a range of `None` should be used instead, as mentioned in the `Span`
     /// documentation.
     ///
     /// TODO(brent) update this usage in Ruff and remove `is_file_level` entirely. See
     /// <https://github.com/astral-sh/ruff/issues/19688>, especially my first comment, for more
-    /// details.
-    pub fn set_file_level(&mut self, yes: bool) {
-        self.is_file_level = yes;
+    /// details. As of 2025-09-26 we also use this to suppress snippet rendering for formatter
+    /// diagnostics, which also need to have a range, so we probably can't eliminate this entirely.
+    pub fn hide_snippet(&mut self, yes: bool) {
+        self.hide_snippet = yes;
     }
 }
 
@@ -1001,6 +1031,17 @@ pub enum DiagnosticId {
 
     /// Use of a deprecated setting.
     DeprecatedSetting,
+
+    /// The code needs to be formatted.
+    Unformatted,
+
+    /// Use of an invalid command-line option.
+    InvalidCliOption,
+
+    /// An internal assumption was violated.
+    ///
+    /// This indicates a bug in the program rather than a user error.
+    InternalError,
 }
 
 impl DiagnosticId {
@@ -1040,6 +1081,9 @@ impl DiagnosticId {
             DiagnosticId::UnnecessaryOverridesSection => "unnecessary-overrides-section",
             DiagnosticId::UselessOverridesSection => "useless-overrides-section",
             DiagnosticId::DeprecatedSetting => "deprecated-setting",
+            DiagnosticId::Unformatted => "unformatted",
+            DiagnosticId::InvalidCliOption => "invalid-cli-option",
+            DiagnosticId::InternalError => "internal-error",
         }
     }
 
@@ -1294,6 +1338,10 @@ pub struct DisplayDiagnosticConfig {
     hide_severity: bool,
     /// Whether to show the availability of a fix in a diagnostic.
     show_fix_status: bool,
+    /// Whether to show the diff for an available fix after the main diagnostic.
+    ///
+    /// This currently only applies to `DiagnosticFormat::Full`.
+    show_fix_diff: bool,
     /// The lowest applicability that should be shown when reporting diagnostics.
     fix_applicability: Applicability,
 }
@@ -1334,25 +1382,41 @@ impl DisplayDiagnosticConfig {
     }
 
     /// Whether to show a fix's availability or not.
-    pub fn show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
+    pub fn with_show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
         DisplayDiagnosticConfig {
             show_fix_status: yes,
             ..self
         }
     }
 
+    /// Whether to show a diff for an available fix after the main diagnostic.
+    pub fn show_fix_diff(self, yes: bool) -> DisplayDiagnosticConfig {
+        DisplayDiagnosticConfig {
+            show_fix_diff: yes,
+            ..self
+        }
+    }
+
     /// Set the lowest fix applicability that should be shown.
     ///
     /// In other words, an applicability of `Safe` (the default) would suppress showing fixes or fix
     /// availability for unsafe or display-only fixes.
     ///
     /// Note that this option is currently ignored when `hide_severity` is false.
-    pub fn fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
+    pub fn with_fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
         DisplayDiagnosticConfig {
             fix_applicability: applicability,
             ..self
         }
     }
+
+    pub fn show_fix_status(&self) -> bool {
+        self.show_fix_status
+    }
+
+    pub fn fix_applicability(&self) -> Applicability {
+        self.fix_applicability
+    }
 }
 
 impl Default for DisplayDiagnosticConfig {
@@ -1364,6 +1428,7 @@ impl Default for DisplayDiagnosticConfig {
             preview: false,
             hide_severity: false,
             show_fix_status: false,
+            show_fix_diff: false,
             fix_applicability: Applicability::Safe,
         }
     }
@@ -1417,6 +1482,16 @@ pub enum DiagnosticFormat {
     /// Print diagnostics in the format expected by JUnit.
     #[cfg(feature = "junit")]
     Junit,
+    /// Print diagnostics in the JSON format used by GitLab [Code Quality] reports.
+    ///
+    /// [Code Quality]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
+    #[cfg(feature = "serde")]
+    Gitlab,
+
+    /// Print diagnostics in the format used by [GitHub Actions] workflow error annotations.
+    ///
+    /// [GitHub Actions]: https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#setting-an-error-message
+    Github,
 }
 
 /// A representation of the kinds of messages inside a diagnostic.
diff --git a/crates/ruff_db/src/diagnostic/render.rs b/crates/ruff_db/src/diagnostic/render.rs
index 2b5230117e..f7c618ae41 100644
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -15,7 +15,6 @@ use crate::{
     Db,
     files::File,
     source::{SourceText, line_index, source_text},
-    system::SystemPath,
 };
 
 use super::{
@@ -25,11 +24,15 @@ use super::{
 
 use azure::AzureRenderer;
 use concise::ConciseRenderer;
+use github::GithubRenderer;
 use pylint::PylintRenderer;
 
 mod azure;
 mod concise;
 mod full;
+pub mod github;
+#[cfg(feature = "serde")]
+mod gitlab;
 #[cfg(feature = "serde")]
 mod json;
 #[cfg(feature = "serde")]
@@ -136,6 +139,13 @@ impl std::fmt::Display for DisplayDiagnostics<'_> {
             DiagnosticFormat::Junit => {
                 junit::JunitRenderer::new(self.resolver).render(f, self.diagnostics)?;
             }
+            #[cfg(feature = "serde")]
+            DiagnosticFormat::Gitlab => {
+                gitlab::GitlabRenderer::new(self.resolver).render(f, self.diagnostics)?;
+            }
+            DiagnosticFormat::Github => {
+                GithubRenderer::new(self.resolver, "ty").render(f, self.diagnostics)?;
+            }
         }
 
         Ok(())
@@ -198,6 +208,7 @@ struct ResolvedDiagnostic<'a> {
     message: String,
     annotations: Vec<ResolvedAnnotation<'a>>,
     is_fixable: bool,
+    header_offset: usize,
 }
 
 impl<'a> ResolvedDiagnostic<'a> {
@@ -248,9 +259,8 @@ impl<'a> ResolvedDiagnostic<'a> {
             id,
             message: diag.inner.message.as_str().to_string(),
             annotations,
-            is_fixable: diag
-                .fix()
-                .is_some_and(|fix| fix.applies(config.fix_applicability)),
+            is_fixable: config.show_fix_status && diag.has_applicable_fix(config),
+            header_offset: diag.inner.header_offset,
         }
     }
 
@@ -280,6 +290,7 @@ impl<'a> ResolvedDiagnostic<'a> {
             message: diag.inner.message.as_str().to_string(),
             annotations,
             is_fixable: false,
+            header_offset: 0,
         }
     }
 
@@ -377,6 +388,7 @@ impl<'a> ResolvedDiagnostic<'a> {
             message: &self.message,
             snippets_by_input,
             is_fixable: self.is_fixable,
+            header_offset: self.header_offset,
         }
     }
 }
@@ -396,7 +408,7 @@ struct ResolvedAnnotation<'a> {
     line_end: OneIndexed,
     message: Option<&'a str>,
     is_primary: bool,
-    is_file_level: bool,
+    hide_snippet: bool,
     notebook_index: Option<NotebookIndex>,
 }
 
@@ -444,7 +456,7 @@ impl<'a> ResolvedAnnotation<'a> {
             line_end,
             message: ann.get_message(),
             is_primary: ann.is_primary,
-            is_file_level: ann.is_file_level,
+            hide_snippet: ann.hide_snippet,
             notebook_index: resolver.notebook_index(&ann.span.file),
         })
     }
@@ -484,6 +496,11 @@ struct RenderableDiagnostic<'r> {
     ///
     /// This is rendered as a `[*]` indicator after the diagnostic ID.
     is_fixable: bool,
+    /// Offset to align the header sigil (`-->`) with the subsequent line number separators.
+    ///
+    /// This is only needed for formatter diagnostics where we don't render a snippet via
+    /// `annotate-snippets` and thus the alignment isn't computed automatically.
+    header_offset: usize,
 }
 
 impl RenderableDiagnostic<'_> {
@@ -496,7 +513,11 @@ impl RenderableDiagnostic<'_> {
                 .iter()
                 .map(|snippet| snippet.to_annotate(path))
         });
-        let mut message = self.level.title(self.message).is_fixable(self.is_fixable);
+        let mut message = self
+            .level
+            .title(self.message)
+            .is_fixable(self.is_fixable)
+            .lineno_offset(self.header_offset);
         if let Some(id) = self.id {
             message = message.id(id);
         }
@@ -701,8 +722,8 @@ struct RenderableAnnotation<'r> {
     message: Option<&'r str>,
     /// Whether this annotation is considered "primary" or not.
     is_primary: bool,
-    /// Whether this annotation applies to an entire file, rather than a snippet within it.
-    is_file_level: bool,
+    /// Whether the snippet for this annotation should be hidden instead of rendered.
+    hide_snippet: bool,
 }
 
 impl<'r> RenderableAnnotation<'r> {
@@ -724,7 +745,7 @@ impl<'r> RenderableAnnotation<'r> {
             range,
             message: ann.message,
             is_primary: ann.is_primary,
-            is_file_level: ann.is_file_level,
+            hide_snippet: ann.hide_snippet,
         }
     }
 
@@ -750,7 +771,7 @@ impl<'r> RenderableAnnotation<'r> {
         if let Some(message) = self.message {
             ann = ann.label(message);
         }
-        ann.is_file_level(self.is_file_level)
+        ann.hide_snippet(self.hide_snippet)
     }
 }
 
@@ -791,7 +812,7 @@ where
     T: Db,
 {
     fn path(&self, file: File) -> &str {
-        relativize_path(self.system().current_directory(), file.path(self).as_str())
+        file.path(self).as_str()
     }
 
     fn input(&self, file: File) -> Input {
@@ -827,7 +848,7 @@ where
 
 impl FileResolver for &dyn Db {
     fn path(&self, file: File) -> &str {
-        relativize_path(self.system().current_directory(), file.path(*self).as_str())
+        file.path(*self).as_str()
     }
 
     fn input(&self, file: File) -> Input {
@@ -946,14 +967,6 @@ fn context_after(
     line
 }
 
-/// Convert an absolute path to be relative to the current working directory.
-fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
-    if let Ok(path) = SystemPath::new(path).strip_prefix(cwd) {
-        return path.as_str();
-    }
-    path
-}
-
 /// Given some source code and annotation ranges, this routine replaces
 /// unprintable characters with printable representations of them.
 ///
@@ -1157,6 +1170,31 @@ pub fn ceil_char_boundary(text: &str, offset: TextSize) -> TextSize {
         .unwrap_or_else(|| TextSize::from(upper_bound))
 }
 
+/// A stub implementation of [`FileResolver`] intended for testing.
+pub struct DummyFileResolver;
+
+impl FileResolver for DummyFileResolver {
+    fn path(&self, _file: File) -> &str {
+        unimplemented!()
+    }
+
+    fn input(&self, _file: File) -> Input {
+        unimplemented!()
+    }
+
+    fn notebook_index(&self, _file: &UnifiedFile) -> Option<NotebookIndex> {
+        None
+    }
+
+    fn is_notebook(&self, _file: &UnifiedFile) -> bool {
+        false
+    }
+
+    fn current_directory(&self) -> &Path {
+        Path::new(".")
+    }
+}
+
 #[cfg(test)]
 mod tests {
 
@@ -2618,14 +2656,21 @@ watermelon
         /// Show fix availability when rendering.
         pub(super) fn show_fix_status(&mut self, yes: bool) {
             let mut config = std::mem::take(&mut self.config);
-            config = config.show_fix_status(yes);
+            config = config.with_show_fix_status(yes);
+            self.config = config;
+        }
+
+        /// Show a diff for the fix when rendering.
+        pub(super) fn show_fix_diff(&mut self, yes: bool) {
+            let mut config = std::mem::take(&mut self.config);
+            config = config.show_fix_diff(yes);
             self.config = config;
         }
 
         /// The lowest fix applicability to show when rendering.
         pub(super) fn fix_applicability(&mut self, applicability: Applicability) {
             let mut config = std::mem::take(&mut self.config);
-            config = config.fix_applicability(applicability);
+            config = config.with_fix_applicability(applicability);
             self.config = config;
         }
 
diff --git a/crates/ruff_db/src/diagnostic/render/concise.rs b/crates/ruff_db/src/diagnostic/render/concise.rs
index fdbbeef59f..4bc8a9735e 100644
--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -77,11 +77,9 @@ impl<'a> ConciseRenderer<'a> {
                     )?;
                 }
                 if self.config.show_fix_status {
-                    if let Some(fix) = diag.fix() {
-                        // Do not display an indicator for inapplicable fixes
-                        if fix.applies(self.config.fix_applicability) {
-                            write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
-                        }
+                    // Do not display an indicator for inapplicable fixes
+                    if diag.has_applicable_fix(self.config) {
+                        write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
                     }
                 }
             } else {
diff --git a/crates/ruff_db/src/diagnostic/render/full.rs b/crates/ruff_db/src/diagnostic/render/full.rs
index 0eee73e543..c87413a84e 100644
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -1,7 +1,17 @@
+use std::borrow::Cow;
+use std::num::NonZeroUsize;
+
+use similar::{ChangeTag, TextDiff};
+
 use ruff_annotate_snippets::Renderer as AnnotateRenderer;
+use ruff_diagnostics::{Applicability, Fix};
+use ruff_notebook::NotebookIndex;
+use ruff_source_file::OneIndexed;
+use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use crate::diagnostic::render::{FileResolver, Resolved};
-use crate::diagnostic::{Diagnostic, DisplayDiagnosticConfig, stylesheet::DiagnosticStylesheet};
+use crate::diagnostic::stylesheet::{DiagnosticStylesheet, fmt_styled};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
 
 pub(super) struct FullRenderer<'a> {
     resolver: &'a dyn FileResolver,
@@ -47,6 +57,14 @@ impl<'a> FullRenderer<'a> {
             for diag in renderable.diagnostics.iter() {
                 writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
             }
+
+            if self.config.show_fix_diff
+                && diag.has_applicable_fix(self.config)
+                && let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver)
+            {
+                write!(f, "{diff}")?;
+            }
+
             writeln!(f)?;
         }
 
@@ -54,9 +72,227 @@ impl<'a> FullRenderer<'a> {
     }
 }
 
+/// Renders a diff that shows the code fixes.
+///
+/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
+/// * Improve layout
+/// * Replace tabs with spaces for a consistent experience across terminals
+/// * Replace zero-width whitespaces
+/// * Print a simpler diff if only a single line has changed
+/// * Compute the diff from the `Edit` because diff calculation is expensive.
+struct Diff<'a> {
+    fix: &'a Fix,
+    diagnostic_source: DiagnosticSource,
+    notebook_index: Option<NotebookIndex>,
+    stylesheet: &'a DiagnosticStylesheet,
+}
+
+impl<'a> Diff<'a> {
+    fn from_diagnostic(
+        diagnostic: &'a Diagnostic,
+        stylesheet: &'a DiagnosticStylesheet,
+        resolver: &'a dyn FileResolver,
+    ) -> Option<Diff<'a>> {
+        let file = &diagnostic.primary_span_ref()?.file;
+        Some(Diff {
+            fix: diagnostic.fix()?,
+            diagnostic_source: file.diagnostic_source(resolver),
+            notebook_index: resolver.notebook_index(file),
+            stylesheet,
+        })
+    }
+}
+
+impl std::fmt::Display for Diff<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let source_code = self.diagnostic_source.as_source_code();
+        let source_text = source_code.text();
+
+        // Partition the source code into end offsets for each cell. If `self.notebook_index` is
+        // `None`, indicating a regular script file, all the lines will be in one "cell" under the
+        // `None` key.
+        let cells = if let Some(notebook_index) = &self.notebook_index {
+            let mut last_cell = OneIndexed::MIN;
+            let mut cells: Vec<(Option<OneIndexed>, TextSize)> = Vec::new();
+            for (row, cell) in notebook_index.iter() {
+                if cell != last_cell {
+                    let offset = source_code.line_start(row);
+                    cells.push((Some(last_cell), offset));
+                    last_cell = cell;
+                }
+            }
+            cells.push((Some(last_cell), source_text.text_len()));
+            cells
+        } else {
+            vec![(None, source_text.text_len())]
+        };
+
+        let mut last_end = TextSize::ZERO;
+        for (cell, offset) in cells {
+            let range = TextRange::new(last_end, offset);
+            last_end = offset;
+            let input = source_code.slice(range);
+
+            let mut output = String::with_capacity(input.len());
+            let mut last_end = range.start();
+
+            let mut applied = 0;
+            for edit in self.fix.edits() {
+                if range.contains_range(edit.range()) {
+                    output.push_str(source_code.slice(TextRange::new(last_end, edit.start())));
+                    output.push_str(edit.content().unwrap_or_default());
+                    last_end = edit.end();
+                    applied += 1;
+                }
+            }
+
+            // No edits were applied, so there's no need to diff.
+            if applied == 0 {
+                continue;
+            }
+
+            output.push_str(&source_text[usize::from(last_end)..usize::from(range.end())]);
+
+            let diff = TextDiff::from_lines(input, &output);
+
+            let grouped_ops = diff.grouped_ops(3);
+
+            // Find the new line number with the largest number of digits to align all of the line
+            // number separators.
+            let last_op = grouped_ops.last().and_then(|group| group.last());
+            let largest_new = last_op.map(|op| op.new_range().end).unwrap_or_default();
+
+            let digit_with = OneIndexed::new(largest_new).unwrap_or_default().digits();
+
+            if let Some(cell) = cell {
+                // Room for 1 digit, 1 space, 1 `|`, and 1 more following space. This centers the
+                // three colons on the pipe.
+                writeln!(f, "{:>1$} cell {cell}", ":::", digit_with.get() + 3)?;
+            }
+
+            for (idx, group) in grouped_ops.iter().enumerate() {
+                if idx > 0 {
+                    writeln!(f, "{:-^1$}", "-", 80)?;
+                }
+                for op in group {
+                    for change in diff.iter_inline_changes(op) {
+                        let (sign, style, line_no_style, index) = match change.tag() {
+                            ChangeTag::Delete => (
+                                "-",
+                                self.stylesheet.deletion,
+                                self.stylesheet.deletion_line_no,
+                                None,
+                            ),
+                            ChangeTag::Insert => (
+                                "+",
+                                self.stylesheet.insertion,
+                                self.stylesheet.insertion_line_no,
+                                change.new_index(),
+                            ),
+                            ChangeTag::Equal => (
+                                "|",
+                                self.stylesheet.none,
+                                self.stylesheet.line_no,
+                                change.new_index(),
+                            ),
+                        };
+
+                        let line = Line {
+                            index: index.map(OneIndexed::from_zero_indexed),
+                            width: digit_with,
+                        };
+
+                        write!(
+                            f,
+                            "{line} {sign} ",
+                            line = fmt_styled(line, self.stylesheet.line_no),
+                            sign = fmt_styled(sign, line_no_style),
+                        )?;
+
+                        for (emphasized, value) in change.iter_strings_lossy() {
+                            let value = show_nonprinting(&value);
+                            let styled = fmt_styled(value, style);
+                            if emphasized {
+                                write!(f, "{}", fmt_styled(styled, self.stylesheet.emphasis))?;
+                            } else {
+                                write!(f, "{styled}")?;
+                            }
+                        }
+                        if change.missing_newline() {
+                            writeln!(f)?;
+                        }
+                    }
+                }
+            }
+        }
+
+        match self.fix.applicability() {
+            Applicability::Safe => {}
+            Applicability::Unsafe => {
+                writeln!(
+                    f,
+                    "{note}: {msg}",
+                    note = fmt_styled("note", self.stylesheet.warning),
+                    msg = fmt_styled(
+                        "This is an unsafe fix and may change runtime behavior",
+                        self.stylesheet.emphasis
+                    )
+                )?;
+            }
+            Applicability::DisplayOnly => {
+                // Note that this is still only used in tests. There's no `--display-only-fixes`
+                // analog to `--unsafe-fixes` for users to activate this or see the styling.
+                writeln!(
+                    f,
+                    "{note}: {msg}",
+                    note = fmt_styled("note", self.stylesheet.error),
+                    msg = fmt_styled(
+                        "This is a display-only fix and is likely to be incorrect",
+                        self.stylesheet.emphasis
+                    )
+                )?;
+            }
+        }
+
+        Ok(())
+    }
+}
+
+struct Line {
+    index: Option<OneIndexed>,
+    width: NonZeroUsize,
+}
+
+impl std::fmt::Display for Line {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.index {
+            None => {
+                for _ in 0..self.width.get() {
+                    f.write_str(" ")?;
+                }
+                Ok(())
+            }
+            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
+        }
+    }
+}
+
+fn show_nonprinting(s: &str) -> Cow<'_, str> {
+    if s.find(['\x07', '\x08', '\x1b', '\x7f']).is_some() {
+        Cow::Owned(
+            s.replace('\x07', "␇")
+                .replace('\x08', "␈")
+                .replace('\x1b', "␛")
+                .replace('\x7f', "␡"),
+        )
+    } else {
+        Cow::Borrowed(s)
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use ruff_diagnostics::Applicability;
+    use ruff_diagnostics::{Applicability, Edit, Fix};
     use ruff_text_size::{TextLen, TextRange, TextSize};
 
     use crate::diagnostic::{
@@ -130,6 +366,7 @@ mod tests {
     fn hide_severity_output() {
         let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Full);
         env.hide_severity(true);
+        env.show_fix_status(true);
         env.fix_applicability(Applicability::DisplayOnly);
 
         insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r#"
@@ -336,7 +573,7 @@ print()
         let mut diagnostic = env.err().build();
         let span = env.path("example.py").with_range(TextRange::default());
         let mut annotation = Annotation::primary(span);
-        annotation.set_file_level(true);
+        annotation.hide_snippet(true);
         diagnostic.annotate(annotation);
 
         insta::assert_snapshot!(env.render(&diagnostic), @r"
@@ -348,7 +585,8 @@ print()
     /// Check that ranges in notebooks are remapped relative to the cells.
     #[test]
     fn notebook_output() {
-        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
+        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
+        env.show_fix_status(true);
         insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
         error[unused-import][*]: `os` imported but unused
          --> notebook.ipynb:cell 1:2:8
@@ -457,6 +695,106 @@ print()
         ");
     }
 
+    /// Test that we remap notebook cell line numbers in the diff as well as the main diagnostic.
+    #[test]
+    fn notebook_output_with_diff() {
+        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
+        env.show_fix_diff(true);
+        env.show_fix_status(true);
+        env.fix_applicability(Applicability::DisplayOnly);
+
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        error[unused-import][*]: `os` imported but unused
+         --> notebook.ipynb:cell 1:2:8
+          |
+        1 | # cell 1
+        2 | import os
+          |        ^^
+          |
+        help: Remove unused import: `os`
+         ::: cell 1
+        1 | # cell 1
+          - import os
+
+        error[unused-import][*]: `math` imported but unused
+         --> notebook.ipynb:cell 2:2:8
+          |
+        1 | # cell 2
+        2 | import math
+          |        ^^^^
+        3 |
+        4 | print('hello world')
+          |
+        help: Remove unused import: `math`
+         ::: cell 2
+        1 | # cell 2
+          - import math
+        2 | 
+        3 | print('hello world')
+
+        error[unused-variable][*]: Local variable `x` is assigned to but never used
+         --> notebook.ipynb:cell 3:4:5
+          |
+        2 | def foo():
+        3 |     print()
+        4 |     x = 1
+          |     ^
+          |
+        help: Remove assignment to unused variable `x`
+         ::: cell 3
+        1 | # cell 3
+        2 | def foo():
+        3 |     print()
+          -     x = 1
+        4 | 
+        note: This is an unsafe fix and may change runtime behavior
+        ");
+    }
+
+    #[test]
+    fn notebook_output_with_diff_spanning_cells() {
+        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
+        env.show_fix_diff(true);
+        env.show_fix_status(true);
+        env.fix_applicability(Applicability::DisplayOnly);
+
+        // Move all of the edits from the later diagnostics to the first diagnostic to simulate a
+        // single diagnostic with edits in different cells.
+        let mut diagnostic = diagnostics.swap_remove(0);
+        let fix = diagnostic.fix_mut().unwrap();
+        let mut edits = fix.edits().to_vec();
+        for diag in diagnostics {
+            edits.extend_from_slice(diag.fix().unwrap().edits());
+        }
+        *fix = Fix::unsafe_edits(edits.remove(0), edits);
+
+        insta::assert_snapshot!(env.render(&diagnostic), @r"
+        error[unused-import][*]: `os` imported but unused
+         --> notebook.ipynb:cell 1:2:8
+          |
+        1 | # cell 1
+        2 | import os
+          |        ^^
+          |
+        help: Remove unused import: `os`
+         ::: cell 1
+        1 | # cell 1
+          - import os
+         ::: cell 2
+        1 | # cell 2
+          - import math
+        2 | 
+        3 | print('hello world')
+         ::: cell 3
+        1 | # cell 3
+        2 | def foo():
+        3 |     print()
+          -     x = 1
+        4 | 
+        note: This is an unsafe fix and may change runtime behavior
+        ");
+    }
+
     /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
     /// line feed (`\n`) for rendering. Otherwise we report a single long line for this case.
     #[test]
@@ -559,4 +897,75 @@ print()
           |
         ");
     }
+
+    /// Test that we handle the width calculation for the line number correctly even for context
+    /// lines at the end of a diff. For example, we want it to render like this:
+    ///
+    /// ```
+    /// 8  |
+    /// 9  |
+    /// 10 |
+    /// ```
+    ///
+    /// and not like this:
+    ///
+    /// ```
+    /// 8 |
+    /// 9 |
+    /// 10 |
+    /// ```
+    #[test]
+    fn longer_line_number_end_of_context() {
+        let mut env = TestEnvironment::new();
+        let contents = "\
+line 1
+line 2
+line 3
+line 4
+line 5
+line 6
+line 7
+line 8
+line 9
+line 10
+        ";
+        env.add("example.py", contents);
+        env.format(DiagnosticFormat::Full);
+        env.show_fix_diff(true);
+        env.show_fix_status(true);
+        env.fix_applicability(Applicability::DisplayOnly);
+
+        let mut diagnostic = env.err().primary("example.py", "3", "3", "label").build();
+        diagnostic.help("Start of diff:");
+        let target = "line 7";
+        let line9 = contents.find(target).unwrap();
+        let range = TextRange::at(TextSize::try_from(line9).unwrap(), target.text_len());
+        diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
+            format!("fixed {target}"),
+            range,
+        )));
+
+        insta::assert_snapshot!(env.render(&diagnostic), @r"
+        error[test-diagnostic][*]: main diagnostic message
+         --> example.py:3:1
+          |
+        1 | line 1
+        2 | line 2
+        3 | line 3
+          | ^^^^^^ label
+        4 | line 4
+        5 | line 5
+          |
+        help: Start of diff:
+        4  | line 4
+        5  | line 5
+        6  | line 6
+           - line 7
+        7  + fixed line 7
+        8  | line 8
+        9  | line 9
+        10 | line 10
+        note: This is an unsafe fix and may change runtime behavior
+        ");
+    }
 }
diff --git a/crates/ruff_db/src/diagnostic/render/github.rs b/crates/ruff_db/src/diagnostic/render/github.rs
new file mode 100644
index 0000000000..77bae347af
--- /dev/null
+++ b/crates/ruff_db/src/diagnostic/render/github.rs
@@ -0,0 +1,136 @@
+use crate::diagnostic::{Diagnostic, FileResolver, Severity};
+
+pub struct GithubRenderer<'a> {
+    resolver: &'a dyn FileResolver,
+    program: &'a str,
+}
+
+impl<'a> GithubRenderer<'a> {
+    pub fn new(resolver: &'a dyn FileResolver, program: &'a str) -> Self {
+        Self { resolver, program }
+    }
+
+    pub(super) fn render(
+        &self,
+        f: &mut std::fmt::Formatter,
+        diagnostics: &[Diagnostic],
+    ) -> std::fmt::Result {
+        for diagnostic in diagnostics {
+            let severity = match diagnostic.severity() {
+                Severity::Info => "notice",
+                Severity::Warning => "warning",
+                Severity::Error | Severity::Fatal => "error",
+            };
+            write!(
+                f,
+                "::{severity} title={program} ({code})",
+                program = self.program,
+                code = diagnostic.secondary_code_or_id()
+            )?;
+
+            if let Some(span) = diagnostic.primary_span() {
+                let file = span.file();
+                write!(f, ",file={file}", file = file.path(self.resolver))?;
+
+                let (start_location, end_location) = if self.resolver.is_notebook(file) {
+                    // We can't give a reasonable location for the structured formats,
+                    // so we show one that's clearly a fallback
+                    None
+                } else {
+                    let diagnostic_source = file.diagnostic_source(self.resolver);
+                    let source_code = diagnostic_source.as_source_code();
+
+                    span.range().map(|range| {
+                        (
+                            source_code.line_column(range.start()),
+                            source_code.line_column(range.end()),
+                        )
+                    })
+                }
+                .unwrap_or_default();
+
+                write!(
+                    f,
+                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                    row = start_location.line,
+                    column = start_location.column,
+                    end_row = end_location.line,
+                    end_column = end_location.column,
+                )?;
+
+                write!(
+                    f,
+                    "{path}:{row}:{column}: ",
+                    path = file.relative_path(self.resolver).display(),
+                    row = start_location.line,
+                    column = start_location.column,
+                )?;
+            } else {
+                write!(f, "::")?;
+            }
+
+            if let Some(code) = diagnostic.secondary_code() {
+                write!(f, "{code}")?;
+            } else {
+                write!(f, "{id}:", id = diagnostic.id())?;
+            }
+
+            writeln!(f, " {}", diagnostic.body())?;
+        }
+
+        Ok(())
+    }
+}
+
+pub struct DisplayGithubDiagnostics<'a> {
+    renderer: &'a GithubRenderer<'a>,
+    diagnostics: &'a [Diagnostic],
+}
+
+impl<'a> DisplayGithubDiagnostics<'a> {
+    pub fn new(renderer: &'a GithubRenderer<'a>, diagnostics: &'a [Diagnostic]) -> Self {
+        Self {
+            renderer,
+            diagnostics,
+        }
+    }
+}
+
+impl std::fmt::Display for DisplayGithubDiagnostics<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.renderer.render(f, self.diagnostics)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::diagnostic::{
+        DiagnosticFormat,
+        render::tests::{TestEnvironment, create_diagnostics, create_syntax_error_diagnostics},
+    };
+
+    #[test]
+    fn output() {
+        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Github);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Github);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn missing_file() {
+        let mut env = TestEnvironment::new();
+        env.format(DiagnosticFormat::Github);
+
+        let diag = env.err().build();
+
+        insta::assert_snapshot!(
+            env.render(&diag),
+            @"::error title=ty (test-diagnostic)::test-diagnostic: main diagnostic message",
+        );
+    }
+}
diff --git a/crates/ruff_db/src/diagnostic/render/gitlab.rs b/crates/ruff_db/src/diagnostic/render/gitlab.rs
new file mode 100644
index 0000000000..0d25da4dc6
--- /dev/null
+++ b/crates/ruff_db/src/diagnostic/render/gitlab.rs
@@ -0,0 +1,205 @@
+use std::{
+    collections::HashSet,
+    hash::{DefaultHasher, Hash, Hasher},
+    path::Path,
+};
+
+use ruff_source_file::LineColumn;
+use serde::{Serialize, Serializer, ser::SerializeSeq};
+
+use crate::diagnostic::{Diagnostic, Severity};
+
+use super::FileResolver;
+
+pub(super) struct GitlabRenderer<'a> {
+    resolver: &'a dyn FileResolver,
+}
+
+impl<'a> GitlabRenderer<'a> {
+    pub(super) fn new(resolver: &'a dyn FileResolver) -> Self {
+        Self { resolver }
+    }
+}
+
+impl GitlabRenderer<'_> {
+    pub(super) fn render(
+        &self,
+        f: &mut std::fmt::Formatter,
+        diagnostics: &[Diagnostic],
+    ) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            serde_json::to_string_pretty(&SerializedMessages {
+                diagnostics,
+                resolver: self.resolver,
+                #[expect(
+                    clippy::disallowed_methods,
+                    reason = "We don't have access to a `System` here, \
+                              and this is only intended for use by GitLab CI, \
+                              which runs on a real `System`."
+                )]
+                project_dir: std::env::var("CI_PROJECT_DIR").ok().as_deref(),
+            })
+            .unwrap()
+        )
+    }
+}
+
+struct SerializedMessages<'a> {
+    diagnostics: &'a [Diagnostic],
+    resolver: &'a dyn FileResolver,
+    project_dir: Option<&'a str>,
+}
+
+impl Serialize for SerializedMessages<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
+        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
+
+        for diagnostic in self.diagnostics {
+            let location = diagnostic
+                .primary_span()
+                .map(|span| {
+                    let file = span.file();
+                    let positions = if self.resolver.is_notebook(file) {
+                        // We can't give a reasonable location for the structured formats,
+                        // so we show one that's clearly a fallback
+                        Default::default()
+                    } else {
+                        let diagnostic_source = file.diagnostic_source(self.resolver);
+                        let source_code = diagnostic_source.as_source_code();
+                        span.range()
+                            .map(|range| Positions {
+                                begin: source_code.line_column(range.start()),
+                                end: source_code.line_column(range.end()),
+                            })
+                            .unwrap_or_default()
+                    };
+
+                    let path = self.project_dir.as_ref().map_or_else(
+                        || file.relative_path(self.resolver).display().to_string(),
+                        |project_dir| relativize_path_to(file.path(self.resolver), project_dir),
+                    );
+
+                    Location { path, positions }
+                })
+                .unwrap_or_default();
+
+            let mut message_fingerprint = fingerprint(diagnostic, &location.path, 0);
+
+            // Make sure that we do not get a fingerprint that is already in use
+            // by adding in the previously generated one.
+            while fingerprints.contains(&message_fingerprint) {
+                message_fingerprint = fingerprint(diagnostic, &location.path, message_fingerprint);
+            }
+            fingerprints.insert(message_fingerprint);
+
+            let description = diagnostic.body();
+            let check_name = diagnostic.secondary_code_or_id();
+            let severity = match diagnostic.severity() {
+                Severity::Info => "info",
+                Severity::Warning => "minor",
+                Severity::Error => "major",
+                // Another option here is `blocker`
+                Severity::Fatal => "critical",
+            };
+
+            let value = Message {
+                check_name,
+                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
+                // so prepend it to the description too.
+                description: format!("{check_name}: {description}"),
+                severity,
+                fingerprint: format!("{:x}", message_fingerprint),
+                location,
+            };
+
+            s.serialize_element(&value)?;
+        }
+
+        s.end()
+    }
+}
+
+#[derive(Serialize)]
+struct Message<'a> {
+    check_name: &'a str,
+    description: String,
+    severity: &'static str,
+    fingerprint: String,
+    location: Location,
+}
+
+/// The place in the source code where the issue was discovered.
+///
+/// According to the CodeClimate report format [specification] linked from the GitLab [docs], this
+/// field is required, so we fall back on a default `path` and position if the diagnostic doesn't
+/// have a primary span.
+///
+/// [specification]: https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#data-types
+/// [docs]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
+#[derive(Default, Serialize)]
+struct Location {
+    path: String,
+    positions: Positions,
+}
+
+#[derive(Default, Serialize)]
+struct Positions {
+    begin: LineColumn,
+    end: LineColumn,
+}
+
+/// Generate a unique fingerprint to identify a violation.
+fn fingerprint(diagnostic: &Diagnostic, project_path: &str, salt: u64) -> u64 {
+    let mut hasher = DefaultHasher::new();
+
+    salt.hash(&mut hasher);
+    diagnostic.name().hash(&mut hasher);
+    project_path.hash(&mut hasher);
+
+    hasher.finish()
+}
+
+/// Convert an absolute path to be relative to the specified project root.
+fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
+    format!(
+        "{}",
+        pathdiff::diff_paths(&path, project_root)
+            .expect("Could not diff paths")
+            .display()
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::diagnostic::{
+        DiagnosticFormat,
+        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
+    };
+
+    const FINGERPRINT_FILTERS: [(&str, &str); 1] = [(
+        r#""fingerprint": "[a-z0-9]+","#,
+        r#""fingerprint": "<redacted>","#,
+    )];
+
+    #[test]
+    fn output() {
+        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Gitlab);
+        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
+            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+        });
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Gitlab);
+        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
+            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+        });
+    }
+}
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__output.snap
index 4ad7b67559..c4b0a97411 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
-##vso[task.logissue type=error;sourcepath=fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
-##vso[task.logissue type=error;sourcepath=undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
+##vso[task.logissue type=error;sourcepath=/fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
+##vso[task.logissue type=error;sourcepath=/fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
+##vso[task.logissue type=error;sourcepath=/undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__syntax_errors.snap
index 76cab4e0c1..c5395d7761 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
+##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
+##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__output.snap
new file mode 100644
index 0000000000..9ec5483c55
--- /dev/null
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__output.snap
@@ -0,0 +1,7 @@
+---
+source: crates/ruff_db/src/diagnostic/render/github.rs
+expression: env.render_diagnostics(&diagnostics)
+---
+::error title=ty (F401),file=/fib.py,line=1,col=8,endLine=1,endColumn=10::fib.py:1:8: F401 `os` imported but unused
+::error title=ty (F841),file=/fib.py,line=6,col=5,endLine=6,endColumn=6::fib.py:6:5: F841 Local variable `x` is assigned to but never used
+::error title=ty (F821),file=/undef.py,line=1,col=4,endLine=1,endColumn=5::undef.py:1:4: F821 Undefined name `a`
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__syntax_errors.snap
new file mode 100644
index 0000000000..227bb0c699
--- /dev/null
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__syntax_errors.snap
@@ -0,0 +1,6 @@
+---
+source: crates/ruff_db/src/diagnostic/render/github.rs
+expression: env.render_diagnostics(&diagnostics)
+---
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__output.snap
similarity index 63%
rename from crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__output.snap
rename to crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__output.snap
index c106eb70ba..a50787f928 100644
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__output.snap
@@ -1,63 +1,63 @@
 ---
-source: crates/ruff_linter/src/message/gitlab.rs
-expression: redact_fingerprint(&content)
+source: crates/ruff_db/src/diagnostic/render/gitlab.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 [
   {
     "check_name": "F401",
     "description": "F401: `os` imported but unused",
+    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "fib.py",
       "positions": {
         "begin": {
-          "column": 8,
-          "line": 1
+          "line": 1,
+          "column": 8
         },
         "end": {
-          "column": 10,
-          "line": 1
+          "line": 1,
+          "column": 10
         }
       }
-    },
-    "severity": "major"
+    }
   },
   {
     "check_name": "F841",
     "description": "F841: Local variable `x` is assigned to but never used",
+    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "fib.py",
       "positions": {
         "begin": {
-          "column": 5,
-          "line": 6
+          "line": 6,
+          "column": 5
         },
         "end": {
-          "column": 6,
-          "line": 6
+          "line": 6,
+          "column": 6
         }
       }
-    },
-    "severity": "major"
+    }
   },
   {
     "check_name": "F821",
     "description": "F821: Undefined name `a`",
+    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "undef.py",
       "positions": {
         "begin": {
-          "column": 4,
-          "line": 1
+          "line": 1,
+          "column": 4
         },
         "end": {
-          "column": 5,
-          "line": 1
+          "line": 1,
+          "column": 5
         }
       }
-    },
-    "severity": "major"
+    }
   }
 ]
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__syntax_errors.snap
similarity index 63%
rename from crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__syntax_errors.snap
rename to crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__syntax_errors.snap
index 7979aa977a..0e2de76453 100644
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__syntax_errors.snap
@@ -1,44 +1,44 @@
 ---
-source: crates/ruff_linter/src/message/gitlab.rs
-expression: redact_fingerprint(&content)
+source: crates/ruff_db/src/diagnostic/render/gitlab.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 [
   {
     "check_name": "invalid-syntax",
     "description": "invalid-syntax: Expected one or more symbol names after import",
+    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "syntax_errors.py",
       "positions": {
         "begin": {
-          "column": 15,
-          "line": 1
+          "line": 1,
+          "column": 15
         },
         "end": {
-          "column": 1,
-          "line": 2
+          "line": 2,
+          "column": 1
         }
       }
-    },
-    "severity": "major"
+    }
   },
   {
     "check_name": "invalid-syntax",
     "description": "invalid-syntax: Expected ')', found newline",
+    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "syntax_errors.py",
       "positions": {
         "begin": {
-          "column": 12,
-          "line": 3
+          "line": 3,
+          "column": 12
         },
         "end": {
-          "column": 1,
-          "line": 4
+          "line": 4,
+          "column": 1
         }
       }
-    },
-    "severity": "major"
+    }
   }
 ]
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__notebook_output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__notebook_output.snap
index ccf202adb2..e8622f7bc9 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__notebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__notebook_output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 10,
       "row": 2
     },
-    "filename": "notebook.ipynb",
+    "filename": "/notebook.ipynb",
     "fix": {
       "applicability": "safe",
       "edits": [
@@ -43,7 +43,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 12,
       "row": 2
     },
-    "filename": "notebook.ipynb",
+    "filename": "/notebook.ipynb",
     "fix": {
       "applicability": "safe",
       "edits": [
@@ -76,7 +76,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 6,
       "row": 4
     },
-    "filename": "notebook.ipynb",
+    "filename": "/notebook.ipynb",
     "fix": {
       "applicability": "unsafe",
       "edits": [
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__output.snap
index 1012d4dca6..3ede6ee332 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 10,
       "row": 1
     },
-    "filename": "fib.py",
+    "filename": "/fib.py",
     "fix": {
       "applicability": "unsafe",
       "edits": [
@@ -43,7 +43,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 6,
       "row": 6
     },
-    "filename": "fib.py",
+    "filename": "/fib.py",
     "fix": {
       "applicability": "unsafe",
       "edits": [
@@ -76,7 +76,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 5,
       "row": 1
     },
-    "filename": "undef.py",
+    "filename": "/undef.py",
     "fix": null,
     "location": {
       "column": 4,
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__syntax_errors.snap
index 131982f428..52b7f91c19 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__syntax_errors.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 1,
       "row": 2
     },
-    "filename": "syntax_errors.py",
+    "filename": "/syntax_errors.py",
     "fix": null,
     "location": {
       "column": 15,
@@ -27,7 +27,7 @@ expression: env.render_diagnostics(&diagnostics)
       "column": 1,
       "row": 4
     },
-    "filename": "syntax_errors.py",
+    "filename": "/syntax_errors.py",
     "fix": null,
     "location": {
       "column": 12,
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__notebook_output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__notebook_output.snap
index 545a85f02d..87666b075c 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__notebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__notebook_output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"/notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"/notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"/notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__output.snap
index 6e46781395..8649d8bcb1 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":null,"code":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
-{"cell":null,"code":"F821","end_location":{"column":5,"row":1},"filename":"undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
+{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"/fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":null,"code":"F841","end_location":{"column":6,"row":6},"filename":"/fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":null,"code":"F821","end_location":{"column":5,"row":1},"filename":"/undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__syntax_errors.snap
index b39dd565bf..498a876d9e 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
+{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"/syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
+{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"/syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__output.snap
index 8b40b484f8..2fdfe64de6 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__output.snap
@@ -4,16 +4,16 @@ expression: env.render_diagnostics(&diagnostics)
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites name="ruff" tests="3" failures="3" errors="0">
-    <testsuite name="fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.F401" classname="fib" line="1" column="8">
+    <testsuite name="/fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
+        <testcase name="org.ruff.F401" classname="/fib" line="1" column="8">
             <failure message="`os` imported but unused">line 1, col 8, `os` imported but unused</failure>
         </testcase>
-        <testcase name="org.ruff.F841" classname="fib" line="6" column="5">
+        <testcase name="org.ruff.F841" classname="/fib" line="6" column="5">
             <failure message="Local variable `x` is assigned to but never used">line 6, col 5, Local variable `x` is assigned to but never used</failure>
         </testcase>
     </testsuite>
-    <testsuite name="undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
-        <testcase name="org.ruff.F821" classname="undef" line="1" column="4">
+    <testsuite name="/undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
+        <testcase name="org.ruff.F821" classname="/undef" line="1" column="4">
             <failure message="Undefined name `a`">line 1, col 4, Undefined name `a`</failure>
         </testcase>
     </testsuite>
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__syntax_errors.snap
index 56af372561..6186551c43 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__junit__tests__syntax_errors.snap
@@ -4,11 +4,11 @@ expression: env.render_diagnostics(&diagnostics)
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites name="ruff" tests="2" failures="2" errors="0">
-    <testsuite name="syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="1" column="15">
+    <testsuite name="/syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
+        <testcase name="org.ruff.invalid-syntax" classname="/syntax_errors" line="1" column="15">
             <failure message="Expected one or more symbol names after import">line 1, col 15, Expected one or more symbol names after import</failure>
         </testcase>
-        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="3" column="12">
+        <testcase name="org.ruff.invalid-syntax" classname="/syntax_errors" line="3" column="12">
             <failure message="Expected &apos;)&apos;, found newline">line 3, col 12, Expected &apos;)&apos;, found newline</failure>
         </testcase>
     </testsuite>
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__output.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__output.snap
index baa169b675..b20cf986d1 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
         "value": "F401"
       },
       "location": {
-        "path": "fib.py",
+        "path": "/fib.py",
         "range": {
           "end": {
             "column": 10,
@@ -45,7 +45,7 @@ expression: env.render_diagnostics(&diagnostics)
         "value": "F841"
       },
       "location": {
-        "path": "fib.py",
+        "path": "/fib.py",
         "range": {
           "end": {
             "column": 6,
@@ -80,7 +80,7 @@ expression: env.render_diagnostics(&diagnostics)
         "value": "F821"
       },
       "location": {
-        "path": "undef.py",
+        "path": "/undef.py",
         "range": {
           "end": {
             "column": 5,
diff --git a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__syntax_errors.snap b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__syntax_errors.snap
index 4f740e1d4a..006ef84a36 100644
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__rdjson__tests__syntax_errors.snap
@@ -9,7 +9,7 @@ expression: env.render_diagnostics(&diagnostics)
         "value": "invalid-syntax"
       },
       "location": {
-        "path": "syntax_errors.py",
+        "path": "/syntax_errors.py",
         "range": {
           "end": {
             "column": 1,
@@ -28,7 +28,7 @@ expression: env.render_diagnostics(&diagnostics)
         "value": "invalid-syntax"
       },
       "location": {
-        "path": "syntax_errors.py",
+        "path": "/syntax_errors.py",
         "range": {
           "end": {
             "column": 1,
diff --git a/crates/ruff_db/src/diagnostic/stylesheet.rs b/crates/ruff_db/src/diagnostic/stylesheet.rs
index 50be7ee41c..488e4352c9 100644
--- a/crates/ruff_db/src/diagnostic/stylesheet.rs
+++ b/crates/ruff_db/src/diagnostic/stylesheet.rs
@@ -43,6 +43,10 @@ pub struct DiagnosticStylesheet {
     pub(crate) none: Style,
     pub(crate) separator: Style,
     pub(crate) secondary_code: Style,
+    pub(crate) insertion: Style,
+    pub(crate) deletion: Style,
+    pub(crate) insertion_line_no: Style,
+    pub(crate) deletion_line_no: Style,
 }
 
 impl Default for DiagnosticStylesheet {
@@ -66,6 +70,10 @@ impl DiagnosticStylesheet {
             none: Style::new(),
             separator: AnsiColor::Cyan.on_default(),
             secondary_code: AnsiColor::Red.on_default().effects(Effects::BOLD),
+            insertion: AnsiColor::Green.on_default(),
+            deletion: AnsiColor::Red.on_default(),
+            insertion_line_no: AnsiColor::Green.on_default().effects(Effects::BOLD),
+            deletion_line_no: AnsiColor::Red.on_default().effects(Effects::BOLD),
         }
     }
 
@@ -81,6 +89,10 @@ impl DiagnosticStylesheet {
             none: Style::new(),
             separator: Style::new(),
             secondary_code: Style::new(),
+            insertion: Style::new(),
+            deletion: Style::new(),
+            insertion_line_no: Style::new(),
+            deletion_line_no: Style::new(),
         }
     }
 }
diff --git a/crates/ruff_db/src/files.rs b/crates/ruff_db/src/files.rs
index ff8c9c8fc3..754b65642a 100644
--- a/crates/ruff_db/src/files.rs
+++ b/crates/ruff_db/src/files.rs
@@ -193,6 +193,17 @@ impl Files {
         roots.at(&absolute)
     }
 
+    /// The same as [`Self::root`] but panics if no root is found.
+    #[track_caller]
+    pub fn expect_root(&self, db: &dyn Db, path: &SystemPath) -> FileRoot {
+        if let Some(root) = self.root(db, path) {
+            return root;
+        }
+
+        let roots = self.inner.roots.read().unwrap();
+        panic!("No root found for path '{path}'. Known roots: {roots:#?}");
+    }
+
     /// Adds a new root for `path` and returns the root.
     ///
     /// The root isn't added nor is the file root's kind updated if a root for `path` already exists.
diff --git a/crates/ruff_db/src/files/file_root.rs b/crates/ruff_db/src/files/file_root.rs
index 7eb948286a..8a1ed08f43 100644
--- a/crates/ruff_db/src/files/file_root.rs
+++ b/crates/ruff_db/src/files/file_root.rs
@@ -81,6 +81,8 @@ impl FileRoots {
             }
         }
 
+        tracing::debug!("Adding new file root '{path}' of kind {kind:?}");
+
         // normalize the path to use `/` separators and escape the '{' and '}' characters,
         // which matchit uses for routing parameters
         let mut route = normalized_path.replace('{', "{{").replace('}', "}}");
@@ -95,7 +97,10 @@ impl FileRoots {
         self.by_path.insert(route.clone(), root).unwrap();
 
         // Insert a path that matches all subdirectories and files
-        route.push_str("/{*filepath}");
+        if !route.ends_with("/") {
+            route.push('/');
+        }
+        route.push_str("{*filepath}");
 
         self.by_path.insert(route, root).unwrap();
         self.roots.push(root);
diff --git a/crates/ruff_db/src/lib.rs b/crates/ruff_db/src/lib.rs
index 2a152ace72..efc5b2c974 100644
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -1,3 +1,8 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods"
+)]
+
 use crate::files::Files;
 use crate::system::System;
 use crate::vendored::VendoredFileSystem;
@@ -65,6 +70,10 @@ pub trait Db: salsa::Database {
 /// to process work in parallel. For example, to index a directory or checking the files of a project.
 /// ty can still spawn more threads for other tasks, e.g. to wait for a Ctrl+C signal or
 /// watching the files for changes.
+#[expect(
+    clippy::disallowed_methods,
+    reason = "We don't have access to System here, but this is also only used by the CLI and the server which always run on a real system."
+)]
 pub fn max_parallelism() -> NonZeroUsize {
     std::env::var(EnvVars::TY_MAX_PARALLELISM)
         .or_else(|_| std::env::var(EnvVars::RAYON_NUM_THREADS))
diff --git a/crates/ruff_db/src/panic.rs b/crates/ruff_db/src/panic.rs
index a6b67f1f1d..d91c1f7fe7 100644
--- a/crates/ruff_db/src/panic.rs
+++ b/crates/ruff_db/src/panic.rs
@@ -31,6 +31,29 @@ impl Payload {
     }
 }
 
+impl PanicError {
+    pub fn to_diagnostic_message(&self, path: Option<impl std::fmt::Display>) -> String {
+        use std::fmt::Write;
+
+        let mut message = String::new();
+        message.push_str("Panicked");
+
+        if let Some(location) = &self.location {
+            let _ = write!(&mut message, " at {location}");
+        }
+
+        if let Some(path) = path {
+            let _ = write!(&mut message, " when checking `{path}`");
+        }
+
+        if let Some(payload) = self.payload.as_str() {
+            let _ = write!(&mut message, ": `{payload}`");
+        }
+
+        message
+    }
+}
+
 impl std::fmt::Display for PanicError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "panicked at")?;
diff --git a/crates/ruff_db/src/parsed.rs b/crates/ruff_db/src/parsed.rs
index 77c71cc516..ad241b3ded 100644
--- a/crates/ruff_db/src/parsed.rs
+++ b/crates/ruff_db/src/parsed.rs
@@ -92,14 +92,14 @@ impl ParsedModule {
         self.inner.store(None);
     }
 
-    /// Returns a pointer for this [`ParsedModule`].
+    /// Returns the pointer address of this [`ParsedModule`].
     ///
     /// The pointer uniquely identifies the module within the current Salsa revision,
     /// regardless of whether particular [`ParsedModuleRef`] instances are garbage collected.
-    pub fn as_ptr(&self) -> *const () {
+    pub fn addr(&self) -> usize {
         // Note that the outer `Arc` in `inner` is stable across garbage collection, while the inner
         // `Arc` within the `ArcSwap` may change.
-        Arc::as_ptr(&self.inner).cast()
+        Arc::as_ptr(&self.inner).addr()
     }
 }
 
@@ -202,9 +202,13 @@ mod indexed {
 
         /// Returns the node at the given index.
         pub fn get_by_index<'ast>(&'ast self, index: NodeIndex) -> AnyRootNodeRef<'ast> {
+            let index = index
+                .as_u32()
+                .expect("attempted to access uninitialized `NodeIndex`");
+
             // Note that this method restores the correct lifetime: the nodes are valid for as
             // long as the reference to `IndexedModule` is alive.
-            self.index[index.as_usize()]
+            self.index[index as usize]
         }
     }
 
@@ -220,7 +224,7 @@ mod indexed {
             T: HasNodeIndex + std::fmt::Debug,
             AnyRootNodeRef<'a>: From<&'a T>,
         {
-            node.node_index().set(self.index);
+            node.node_index().set(NodeIndex::from(self.index));
             self.nodes.push(AnyRootNodeRef::from(node));
             self.index += 1;
         }
diff --git a/crates/ruff_db/src/system.rs b/crates/ruff_db/src/system.rs
index e8b3062f9f..8448cb9acb 100644
--- a/crates/ruff_db/src/system.rs
+++ b/crates/ruff_db/src/system.rs
@@ -46,7 +46,7 @@ pub type Result<T> = std::io::Result<T>;
 ///    * File watching isn't supported.
 ///
 /// Abstracting the system also enables tests to use a more efficient in-memory file system.
-pub trait System: Debug {
+pub trait System: Debug + Sync + Send {
     /// Reads the metadata of the file or directory at `path`.
     ///
     /// This function will traverse symbolic links to query information about the destination file.
@@ -197,6 +197,8 @@ pub trait System: Debug {
     fn as_any(&self) -> &dyn std::any::Any;
 
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any;
+
+    fn dyn_clone(&self) -> Box<dyn System>;
 }
 
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
diff --git a/crates/ruff_db/src/system/os.rs b/crates/ruff_db/src/system/os.rs
index dd6a8eea99..b9f7e6e3db 100644
--- a/crates/ruff_db/src/system/os.rs
+++ b/crates/ruff_db/src/system/os.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::disallowed_methods)]
+
 use super::walk_directory::{
     self, DirectoryWalker, WalkDirectoryBuilder, WalkDirectoryConfiguration,
     WalkDirectoryVisitorBuilder, WalkState,
@@ -255,6 +257,10 @@ impl System for OsSystem {
     fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
         std::env::var(name)
     }
+
+    fn dyn_clone(&self) -> Box<dyn System> {
+        Box::new(self.clone())
+    }
 }
 
 impl OsSystem {
diff --git a/crates/ruff_db/src/system/path.rs b/crates/ruff_db/src/system/path.rs
index d0ff92e5d8..71a92fb4c8 100644
--- a/crates/ruff_db/src/system/path.rs
+++ b/crates/ruff_db/src/system/path.rs
@@ -504,8 +504,8 @@ impl ToOwned for SystemPath {
 pub struct SystemPathBuf(#[cfg_attr(feature = "schemars", schemars(with = "String"))] Utf8PathBuf);
 
 impl get_size2::GetSize for SystemPathBuf {
-    fn get_heap_size(&self) -> usize {
-        self.0.capacity()
+    fn get_heap_size_with_tracker<T: get_size2::GetSizeTracker>(&self, tracker: T) -> (usize, T) {
+        (self.0.capacity(), tracker)
     }
 }
 
diff --git a/crates/ruff_db/src/system/test.rs b/crates/ruff_db/src/system/test.rs
index f595aadca7..73a05ba3d5 100644
--- a/crates/ruff_db/src/system/test.rs
+++ b/crates/ruff_db/src/system/test.rs
@@ -146,6 +146,10 @@ impl System for TestSystem {
     fn case_sensitivity(&self) -> CaseSensitivity {
         self.system().case_sensitivity()
     }
+
+    fn dyn_clone(&self) -> Box<dyn System> {
+        Box::new(self.clone())
+    }
 }
 
 impl Default for TestSystem {
@@ -394,6 +398,13 @@ impl System for InMemorySystem {
     fn case_sensitivity(&self) -> CaseSensitivity {
         CaseSensitivity::CaseSensitive
     }
+
+    fn dyn_clone(&self) -> Box<dyn System> {
+        Box::new(Self {
+            user_config_directory: Mutex::new(self.user_config_directory.lock().unwrap().clone()),
+            memory_fs: self.memory_fs.clone(),
+        })
+    }
 }
 
 impl WritableSystem for InMemorySystem {
diff --git a/crates/ruff_db/src/vendored/path.rs b/crates/ruff_db/src/vendored/path.rs
index f59d093acb..86cdd5057e 100644
--- a/crates/ruff_db/src/vendored/path.rs
+++ b/crates/ruff_db/src/vendored/path.rs
@@ -92,8 +92,8 @@ impl ToOwned for VendoredPath {
 pub struct VendoredPathBuf(Utf8PathBuf);
 
 impl get_size2::GetSize for VendoredPathBuf {
-    fn get_heap_size(&self) -> usize {
-        self.0.capacity()
+    fn get_heap_size_with_tracker<T: get_size2::GetSizeTracker>(&self, tracker: T) -> (usize, T) {
+        (self.0.capacity(), tracker)
     }
 }
 
diff --git a/crates/ruff_dev/Cargo.toml b/crates/ruff_dev/Cargo.toml
index b7068640f5..17d494e4a7 100644
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -13,6 +13,7 @@ license = { workspace = true }
 [dependencies]
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
+ty_python_semantic = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }
diff --git a/crates/ruff_dev/src/generate_docs.rs b/crates/ruff_dev/src/generate_docs.rs
index 5f2309328e..b2d8feb550 100644
--- a/crates/ruff_dev/src/generate_docs.rs
+++ b/crates/ruff_dev/src/generate_docs.rs
@@ -8,6 +8,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use itertools::Itertools;
 use regex::{Captures, Regex};
+use ruff_linter::codes::RuleGroup;
 use strum::IntoEnumIterator;
 
 use ruff_linter::FixAvailability;
@@ -31,6 +32,47 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 
             let _ = writeln!(&mut output, "# {} ({})", rule.name(), rule.noqa_code());
 
+            let status_text = match rule.group() {
+                RuleGroup::Stable { since } => {
+                    format!(
+                        r#"Added in <a href="https://github.com/astral-sh/ruff/releases/tag/{since}">{since}</a>"#
+                    )
+                }
+                RuleGroup::Preview { since } => {
+                    format!(
+                        r#"Preview (since <a href="https://github.com/astral-sh/ruff/releases/tag/{since}">{since}</a>)"#
+                    )
+                }
+                RuleGroup::Deprecated { since } => {
+                    format!(
+                        r#"Deprecated (since <a href="https://github.com/astral-sh/ruff/releases/tag/{since}">{since}</a>)"#
+                    )
+                }
+                RuleGroup::Removed { since } => {
+                    format!(
+                        r#"Removed (since <a href="https://github.com/astral-sh/ruff/releases/tag/{since}">{since}</a>)"#
+                    )
+                }
+            };
+
+            let _ = writeln!(
+                &mut output,
+                r#"<small>
+{status_text} ·
+<a href="https://github.com/astral-sh/ruff/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20(%27{encoded_name}%27%20OR%20{rule_code})" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/{file}#L{line}" target="_blank">View source</a>
+</small>
+
+"#,
+                encoded_name =
+                    url::form_urlencoded::byte_serialize(rule.name().as_str().as_bytes())
+                        .collect::<String>(),
+                rule_code = rule.noqa_code(),
+                file =
+                    url::form_urlencoded::byte_serialize(rule.file().replace('\\', "/").as_bytes())
+                        .collect::<String>(),
+                line = rule.line(),
+            );
             let (linter, _) = Linter::parse_code(&rule.noqa_code().to_string()).unwrap();
             if linter.url().is_some() {
                 let common_prefix: String = match linter.common_prefix() {
diff --git a/crates/ruff_dev/src/generate_json_schema.rs b/crates/ruff_dev/src/generate_json_schema.rs
index 61d616cfb4..239f675828 100644
--- a/crates/ruff_dev/src/generate_json_schema.rs
+++ b/crates/ruff_dev/src/generate_json_schema.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use anyhow::{Result, bail};
 use pretty_assertions::StrComparison;
-use schemars::schema_for;
+use schemars::generate::SchemaSettings;
 
 use crate::ROOT_DIR;
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -17,7 +17,9 @@ pub(crate) struct Args {
 }
 
 pub(crate) fn main(args: &Args) -> Result<()> {
-    let schema = schema_for!(Options);
+    let settings = SchemaSettings::draft07();
+    let generator = settings.into_generator();
+    let schema = generator.into_root_schema_for::<Options>();
     let schema_string = serde_json::to_string_pretty(&schema).unwrap();
     let filename = "ruff.schema.json";
     let schema_path = PathBuf::from(ROOT_DIR).join(filename);
diff --git a/crates/ruff_dev/src/generate_rules_table.rs b/crates/ruff_dev/src/generate_rules_table.rs
index 3255f8f42b..1f6f890076 100644
--- a/crates/ruff_dev/src/generate_rules_table.rs
+++ b/crates/ruff_dev/src/generate_rules_table.rs
@@ -32,20 +32,24 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
     table_out.push('\n');
     for rule in rules {
         let status_token = match rule.group() {
-            RuleGroup::Removed => {
+            RuleGroup::Removed { since } => {
                 format!(
-                    "<span {SYMBOL_STYLE} title='Rule has been removed'>{REMOVED_SYMBOL}</span>"
+                    "<span {SYMBOL_STYLE} title='Rule was removed in {since}'>{REMOVED_SYMBOL}</span>"
                 )
             }
-            RuleGroup::Deprecated => {
+            RuleGroup::Deprecated { since } => {
                 format!(
-                    "<span {SYMBOL_STYLE} title='Rule has been deprecated'>{WARNING_SYMBOL}</span>"
+                    "<span {SYMBOL_STYLE} title='Rule has been deprecated since {since}'>{WARNING_SYMBOL}</span>"
                 )
             }
-            RuleGroup::Preview => {
-                format!("<span {SYMBOL_STYLE} title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
+            RuleGroup::Preview { since } => {
+                format!(
+                    "<span {SYMBOL_STYLE} title='Rule has been in preview since {since}'>{PREVIEW_SYMBOL}</span>"
+                )
+            }
+            RuleGroup::Stable { since } => {
+                format!("<span {SYMBOL_STYLE} title='Rule has been stable since {since}'></span>")
             }
-            RuleGroup::Stable => format!("<span {SYMBOL_STYLE}></span>"),
         };
 
         let fix_token = match rule.fixable() {
diff --git a/crates/ruff_dev/src/generate_ty_rules.rs b/crates/ruff_dev/src/generate_ty_rules.rs
index 1f379b69a3..22394de203 100644
--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/crates/ruff_dev/src/generate_ty_rules.rs
@@ -52,7 +52,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 }
 
 fn generate_markdown() -> String {
-    let registry = &*ty_project::DEFAULT_LINT_REGISTRY;
+    let registry = ty_python_semantic::default_lint_registry();
 
     let mut output = String::new();
 
@@ -93,14 +93,39 @@ fn generate_markdown() -> String {
             })
             .join("\n");
 
+        let status_text = match lint.status() {
+            ty_python_semantic::lint::LintStatus::Stable { since } => {
+                format!(
+                    r#"Added in <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>"#
+                )
+            }
+            ty_python_semantic::lint::LintStatus::Preview { since } => {
+                format!(
+                    r#"Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>)"#
+                )
+            }
+            ty_python_semantic::lint::LintStatus::Deprecated { since, .. } => {
+                format!(
+                    r#"Deprecated (since <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>)"#
+                )
+            }
+            ty_python_semantic::lint::LintStatus::Removed { since, .. } => {
+                format!(
+                    r#"Removed (since <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>)"#
+                )
+            }
+        };
+
         let _ = writeln!(
             &mut output,
             r#"<small>
-Default level: [`{level}`](../rules.md#rule-levels "This lint has a default level of '{level}'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/{file}#L{line})
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
+{status_text} ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/{file}#L{line}" target="_blank">View source</a>
 </small>
 
+
 {documentation}
 "#,
             level = lint.default_level(),
diff --git a/crates/ruff_dev/src/generate_ty_schema.rs b/crates/ruff_dev/src/generate_ty_schema.rs
index eac09963b3..e819e91d10 100644
--- a/crates/ruff_dev/src/generate_ty_schema.rs
+++ b/crates/ruff_dev/src/generate_ty_schema.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use anyhow::{Result, bail};
 use pretty_assertions::StrComparison;
-use schemars::schema_for;
+use schemars::generate::SchemaSettings;
 
 use crate::ROOT_DIR;
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -17,7 +17,9 @@ pub(crate) struct Args {
 }
 
 pub(crate) fn main(args: &Args) -> Result<()> {
-    let schema = schema_for!(Options);
+    let settings = SchemaSettings::draft07();
+    let generator = settings.into_generator();
+    let schema = generator.into_root_schema_for::<Options>();
     let schema_string = serde_json::to_string_pretty(&schema).unwrap();
     let filename = "ty.schema.json";
     let schema_path = PathBuf::from(ROOT_DIR).join(filename);
diff --git a/crates/ruff_diagnostics/Cargo.toml b/crates/ruff_diagnostics/Cargo.toml
index 810364a844..b2241f7423 100644
--- a/crates/ruff_diagnostics/Cargo.toml
+++ b/crates/ruff_diagnostics/Cargo.toml
@@ -14,8 +14,11 @@ license = { workspace = true }
 doctest = false
 
 [dependencies]
-ruff_text_size = { workspace = true }
+ruff_text_size = { workspace = true, features = ["get-size"] }
 
 get-size2 = { workspace = true }
 is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
+
+[features]
+serde = ["dep:serde", "ruff_text_size/serde"]
diff --git a/crates/ruff_formatter/src/diagnostics.rs b/crates/ruff_formatter/src/diagnostics.rs
index eb2f1435b3..08964496ad 100644
--- a/crates/ruff_formatter/src/diagnostics.rs
+++ b/crates/ruff_formatter/src/diagnostics.rs
@@ -38,12 +38,12 @@ impl std::fmt::Display for FormatError {
             ),
             FormatError::InvalidDocument(error) => std::write!(
                 fmt,
-                "Invalid document: {error}\n\n This is an internal Rome error. Please report if necessary."
+                "Invalid document: {error}\n\n This is an internal Ruff error. Please report if necessary."
             ),
             FormatError::PoorLayout => {
                 std::write!(
                     fmt,
-                    "Poor layout: The formatter wasn't able to pick a good layout for your document. This is an internal Rome error. Please report if necessary."
+                    "Poor layout: The formatter wasn't able to pick a good layout for your document. This is an internal Ruff error. Please report if necessary."
                 )
             }
         }
diff --git a/crates/ruff_formatter/src/lib.rs b/crates/ruff_formatter/src/lib.rs
index 65f0bcf8a9..d765af4704 100644
--- a/crates/ruff_formatter/src/lib.rs
+++ b/crates/ruff_formatter/src/lib.rs
@@ -81,14 +81,19 @@ impl IndentStyle {
     pub const fn is_space(&self) -> bool {
         matches!(self, IndentStyle::Space)
     }
+
+    /// Returns the string representation of the indent style.
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            IndentStyle::Tab => "tab",
+            IndentStyle::Space => "space",
+        }
+    }
 }
 
 impl std::fmt::Display for IndentStyle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            IndentStyle::Tab => std::write!(f, "tab"),
-            IndentStyle::Space => std::write!(f, "space"),
-        }
+        f.write_str(self.as_str())
     }
 }
 
diff --git a/crates/ruff_formatter/src/printer/printer_options/mod.rs b/crates/ruff_formatter/src/printer/printer_options/mod.rs
index a8895690f6..a841f85744 100644
--- a/crates/ruff_formatter/src/printer/printer_options/mod.rs
+++ b/crates/ruff_formatter/src/printer/printer_options/mod.rs
@@ -139,4 +139,16 @@ impl LineEnding {
             LineEnding::CarriageReturn => "\r",
         }
     }
+
+    /// Returns the string used to configure this line ending.
+    ///
+    /// See [`LineEnding::as_str`] for the actual string representation of the line ending.
+    #[inline]
+    pub const fn as_setting_str(&self) -> &'static str {
+        match self {
+            LineEnding::LineFeed => "lf",
+            LineEnding::CarriageReturnLineFeed => "crlf",
+            LineEnding::CarriageReturn => "cr",
+        }
+    }
 }
diff --git a/crates/ruff_graph/src/db.rs b/crates/ruff_graph/src/db.rs
index cbca766de6..6c5a6e8121 100644
--- a/crates/ruff_graph/src/db.rs
+++ b/crates/ruff_graph/src/db.rs
@@ -98,6 +98,10 @@ impl Db for ModuleDb {
     fn lint_registry(&self) -> &LintRegistry {
         default_lint_registry()
     }
+
+    fn verbose(&self) -> bool {
+        false
+    }
 }
 
 #[salsa::db]
diff --git a/crates/ruff_linter/Cargo.toml b/crates/ruff_linter/Cargo.toml
index aef2004ab5..bc25d4574f 100644
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.9"
+version = "0.14.2"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -20,6 +20,7 @@ ruff_notebook = { workspace = true }
 ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true, features = ["serde", "cache"] }
 ruff_python_codegen = { workspace = true }
+ruff_python_importer = { workspace = true }
 ruff_python_index = { workspace = true }
 ruff_python_literal = { workspace = true }
 ruff_python_semantic = { workspace = true }
@@ -51,7 +52,6 @@ path-absolutize = { workspace = true, features = [
     "once_cell_cache",
     "use_unix_paths_on_wasm",
 ] }
-pathdiff = { workspace = true }
 pep440_rs = { workspace = true }
 pyproject-toml = { workspace = true }
 regex = { workspace = true }
diff --git a/crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py b/crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py
index 640f855f05..cbf49b061b 100644
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py
@@ -11,7 +11,8 @@ from airflow import (
 )
 from airflow.api_connexion.security import requires_access
 from airflow.contrib.aws_athena_hook import AWSAthenaHook
-from airflow.datasets import DatasetAliasEvent
+from airflow.datasets import DatasetAliasEvent, DatasetEvent
+from airflow.operators.postgres_operator import Mapping
 from airflow.operators.subdag import SubDagOperator
 from airflow.secrets.cache import SecretCache
 from airflow.secrets.local_filesystem import LocalFilesystemBackend
@@ -47,11 +48,14 @@ AWSAthenaHook()
 
 # airflow.datasets
 DatasetAliasEvent()
+DatasetEvent()
 
 
 # airflow.operators.subdag.*
 SubDagOperator()
 
+# airflow.operators.postgres_operator
+Mapping()
 
 # airflow.secrets
 # get_connection
diff --git a/crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py b/crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py
index 47c7b4270d..cfacd90341 100644
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py
@@ -34,7 +34,7 @@ task_group()
 setup()
 from airflow.decorators import teardown
 from airflow.io.path import ObjectStoragePath
-from airflow.io.storage import attach
+from airflow.io.store import attach
 from airflow.models import DAG as DAGFromModel
 from airflow.models import (
     Connection,
@@ -70,7 +70,50 @@ from airflow.timetables.datasets import DatasetOrTimeSchedule
 from airflow.utils.dag_parsing_context import get_parsing_context
 
 # airflow.timetables.datasets
-DatasetOrTimeSchedule()
+DatasetOrTimeSchedule(datasets=[])
 
 # airflow.utils.dag_parsing_context
 get_parsing_context()
+
+from airflow.decorators.base import (
+    DecoratedMappedOperator,
+    DecoratedOperator,
+    TaskDecorator,
+    get_unique_task_id,
+    task_decorator_factory,
+)
+
+# airflow.decorators.base
+DecoratedMappedOperator()
+DecoratedOperator()
+TaskDecorator()
+get_unique_task_id()
+task_decorator_factory()
+
+
+from airflow.models import DagParam, Param, ParamsDict
+
+# airflow.models
+Param()
+DagParam()
+ParamsDict()
+
+
+from airflow.models.param import DagParam, Param, ParamsDict
+
+# airflow.models.param
+Param()
+DagParam()
+ParamsDict()
+
+
+from airflow.sensors.base import (
+    BaseSensorOperator,
+    PokeReturnValue,
+    poke_mode_only,
+)
+
+# airflow.sensors.base
+BaseSensorOperator()
+PokeReturnValue()
+poke_mode_only()
diff --git a/crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py b/crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py
index 0752511706..ae644bf9a5 100644
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py
@@ -9,7 +9,6 @@ from airflow.operators.empty import EmptyOperator
 from airflow.operators.latest_only import LatestOnlyOperator
 from airflow.operators.trigger_dagrun import TriggerDagRunOperator
 from airflow.operators.weekday import BranchDayOfWeekOperator
-from airflow.sensors.date_time import DateTimeSensor
 
 FSHook()
 PackageIndexHook()
@@ -22,7 +21,6 @@ EmptyOperator()
 
 LatestOnlyOperator()
 BranchDayOfWeekOperator()
-DateTimeSensor()
 
 from airflow.operators.python import (
     BranchPythonOperator,
@@ -30,16 +28,23 @@ from airflow.operators.python import (
     PythonVirtualenvOperator,
     ShortCircuitOperator,
 )
+from airflow.sensors.bash import BashSensor
+from airflow.sensors.date_time import DateTimeSensor
+
+BranchPythonOperator()
+PythonOperator()
+PythonVirtualenvOperator()
+ShortCircuitOperator()
+
+BashSensor()
+DateTimeSensor()
 from airflow.sensors.date_time import DateTimeSensorAsync
 from airflow.sensors.external_task import (
     ExternalTaskMarker,
     ExternalTaskSensor,
 )
-from airflow.sensors.time_sensor import (
-    TimeSensor,
-    TimeSensorAsync,
-)
 from airflow.sensors.filesystem import FileSensor
+from airflow.sensors.python import PythonSensor
 
 BranchPythonOperator()
 PythonOperator()
@@ -49,6 +54,13 @@ DateTimeSensorAsync()
 ExternalTaskMarker()
 ExternalTaskSensor()
 FileSensor()
+PythonSensor()
+
+from airflow.sensors.time_sensor import (
+    TimeSensor,
+    TimeSensorAsync,
+)
+
 TimeSensor()
 TimeSensorAsync()
 
diff --git a/crates/ruff_linter/resources/test/fixtures/fastapi/FAST002_2.py b/crates/ruff_linter/resources/test/fixtures/fastapi/FAST002_2.py
new file mode 100644
index 0000000000..aa56943f28
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/fastapi/FAST002_2.py
@@ -0,0 +1,87 @@
+"""Test FAST002 ellipsis handling."""
+
+from fastapi import Body, Cookie, FastAPI, Header, Query
+
+app = FastAPI()
+
+
+# Cases that should be fixed - ellipsis should be removed
+
+
+@app.get("/test1")
+async def test_ellipsis_query(
+    # This should become: param: Annotated[str, Query(description="Test param")]
+    param: str = Query(..., description="Test param"),
+) -> str:
+    return param
+
+
+@app.get("/test2")
+async def test_ellipsis_header(
+    # This should become: auth: Annotated[str, Header(description="Auth header")]
+    auth: str = Header(..., description="Auth header"),
+) -> str:
+    return auth
+
+
+@app.post("/test3")
+async def test_ellipsis_body(
+    # This should become: data: Annotated[dict, Body(description="Request body")]
+    data: dict = Body(..., description="Request body"),
+) -> dict:
+    return data
+
+
+@app.get("/test4")
+async def test_ellipsis_cookie(
+    # This should become: session: Annotated[str, Cookie(description="Session ID")]
+    session: str = Cookie(..., description="Session ID"),
+) -> str:
+    return session
+
+
+@app.get("/test5")
+async def test_simple_ellipsis(
+    # This should become: id: Annotated[str, Query()]
+    id: str = Query(...),
+) -> str:
+    return id
+
+
+@app.get("/test6")
+async def test_multiple_kwargs_with_ellipsis(
+    # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
+    param: str = Query(..., description="Test", min_length=1, max_length=10),
+) -> str:
+    return param
+
+
+# Cases with actual default values - these should preserve the default
+
+
+@app.get("/test7")
+async def test_with_default_value(
+    # This should become: param: Annotated[str, Query(description="Test")] = "default"
+    param: str = Query("default", description="Test"),
+) -> str:
+    return param
+
+
+@app.get("/test8")
+async def test_with_default_none(
+    # This should become: param: Annotated[str | None, Query(description="Test")] = None
+    param: str | None = Query(None, description="Test"),
+) -> str:
+    return param or "empty"
+
+
+@app.get("/test9")
+async def test_mixed_parameters(
+    # First param should be fixed with default preserved  
+    optional_param: str = Query("default", description="Optional"),
+    # Second param should not be fixed because of the preceding default
+    required_param: str = Query(..., description="Required"),
+    # Third param should be fixed with default preserved
+    another_optional_param: int = Query(42, description="Another optional"),
+) -> str:
+    return f"{required_param}-{optional_param}-{another_optional_param}"
diff --git a/crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py b/crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py
index cd8653026c..c91131e7aa 100644
--- a/crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py
+++ b/crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py
@@ -213,3 +213,55 @@ async def get_id_pydantic_full(
 async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
 @app.get("/{my_id}")
 async def get_id_init_not_annotated(params = Depends(InitParams)): ...
+
+@app.get("/things/{ thing_id }")
+async def read_thing(query: str):
+    return {"query": query}
+
+
+@app.get("/things/{ thing_id : path }")
+async def read_thing(query: str):
+    return {"query": query}
+
+
+@app.get("/things/{ thing_id : str }")
+async def read_thing(query: str):
+    return {"query": query}
+
+
+# https://github.com/astral-sh/ruff/issues/20680
+# These should NOT trigger FAST003 because FastAPI doesn't recognize them as path parameters
+
+# Non-ASCII characters in parameter name
+@app.get("/f1/{用户身份}")
+async def f1():
+    return locals()
+
+# Space in parameter name  
+@app.get("/f2/{x: str}")
+async def f2():
+    return locals()
+
+# Non-ASCII converter
+@app.get("/f3/{complex_number:ℂ}")
+async def f3():
+    return locals()
+
+# Mixed non-ASCII characters
+@app.get("/f4/{用户_id}")
+async def f4():
+    return locals()
+
+# Space in parameter name with converter
+@app.get("/f5/{param: int}")
+async def f5():
+    return locals()
+
+# https://github.com/astral-sh/ruff/issues/20941
+@app.get("/imports/{import}")
+async def get_import():
+    ...
+
+@app.get("/debug/{__debug__}")
+async def get_debug():
+    ...
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_annotations/shadowed_builtins.py b/crates/ruff_linter/resources/test/fixtures/flake8_annotations/shadowed_builtins.py
new file mode 100644
index 0000000000..c50f791bb1
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_annotations/shadowed_builtins.py
@@ -0,0 +1,21 @@
+from collections import UserString as str
+from typing import override
+
+def foo():
+    return "!"
+
+def _foo():
+    return "!"
+
+class C:
+    @override
+    def __str__(self):
+        return "!"
+    
+    @staticmethod
+    def foo():
+        return "!"
+    
+    @classmethod
+    def bar(cls):
+        return "!"
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC212.py b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC212.py
new file mode 100644
index 0000000000..d6a798debc
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC212.py
@@ -0,0 +1,75 @@
+from typing import Optional
+
+import httpx
+
+
+def foo():
+    client = httpx.Client()
+    client.close()  # Ok
+    client.delete()  # Ok
+    client.get()  # Ok
+    client.head()  # Ok
+    client.options()  # Ok
+    client.patch()  # Ok
+    client.post()  # Ok
+    client.put()  # Ok
+    client.request()  # Ok
+    client.send()  # Ok
+    client.stream()  # Ok
+
+    client.anything()  # Ok
+    client.build_request()  # Ok
+    client.is_closed  # Ok
+
+
+async def foo():
+    client = httpx.Client()
+    client.close()  # ASYNC212
+    client.delete()  # ASYNC212
+    client.get()  # ASYNC212
+    client.head()  # ASYNC212
+    client.options()  # ASYNC212
+    client.patch()  # ASYNC212
+    client.post()  # ASYNC212
+    client.put()  # ASYNC212
+    client.request()  # ASYNC212
+    client.send()  # ASYNC212
+    client.stream()  # ASYNC212
+
+    client.anything()  # Ok
+    client.build_request()  # Ok
+    client.is_closed  # Ok
+
+
+async def foo(client: httpx.Client):
+    client.request()  # ASYNC212
+    client.anything()  # Ok
+
+
+async def foo(client: httpx.Client | None):
+    client.request()  # ASYNC212
+    client.anything()  # Ok
+
+
+async def foo(client: Optional[httpx.Client]):
+    client.request()  # ASYNC212
+    client.anything()  # Ok
+
+
+async def foo():
+    client: httpx.Client = ...
+    client.request()  # ASYNC212
+    client.anything()  # Ok
+
+
+global_client = httpx.Client()
+
+
+async def foo():
+    global_client.request()  # ASYNC212
+    global_client.anything()  # Ok
+
+
+async def foo():
+    async with httpx.AsyncClient() as client:
+        await client.get()  # Ok
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC240.py b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC240.py
new file mode 100644
index 0000000000..6eff90e56c
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC240.py
@@ -0,0 +1,104 @@
+import os
+from typing import Optional
+from pathlib import Path
+
+## Valid cases:
+
+def os_path_in_foo():
+    file = "file.txt"
+
+    os.path.abspath(file) # OK
+    os.path.exists(file) # OK
+    os.path.split() # OK
+
+async def non_io_os_path_methods():
+    os.path.split() # OK
+    os.path.dirname() # OK
+    os.path.basename() # OK
+    os.path.join() # OK
+
+def pathlib_path_in_foo():
+    path = Path("src/my_text.txt") # OK
+    path.exists() # OK
+    with path.open() as f: # OK
+        ...
+    path = Path("src/my_text.txt").open() # OK
+
+async def non_io_pathlib_path_methods():
+    path = Path("src/my_text.txt")
+    path.is_absolute() # OK
+    path.is_relative_to() # OK
+    path.as_posix() # OK
+    path.relative_to() # OK
+
+def inline_path_method_call():
+    Path("src/my_text.txt").open() # OK
+    Path("src/my_text.txt").open().flush() # OK
+    with Path("src/my_text.txt").open() as f: # OK
+        ...
+
+async def trio_path_in_foo():
+    from trio import Path
+
+    path = Path("src/my_text.txt") # OK
+    await path.absolute() # OK
+    await path.exists() # OK
+    with Path("src/my_text.txt").open() as f: # OK
+        ...
+
+async def anyio_path_in_foo():
+    from anyio import Path
+
+    path = Path("src/my_text.txt") # OK
+    await path.absolute() # OK
+    await path.exists() # OK
+    with Path("src/my_text.txt").open() as f: # OK
+        ...
+
+async def path_open_in_foo():
+    path = Path("src/my_text.txt") # OK
+    path.open() # OK, covered by ASYNC230
+
+## Invalid cases:
+
+async def os_path_in_foo():
+    file = "file.txt"
+
+    os.path.abspath(file) # ASYNC240
+    os.path.exists(file) # ASYNC240
+
+async def pathlib_path_in_foo():
+    path = Path("src/my_text.txt")
+    path.exists() # ASYNC240
+
+async def pathlib_path_in_foo():
+    import pathlib
+
+    path = pathlib.Path("src/my_text.txt")
+    path.exists() # ASYNC240
+
+async def inline_path_method_call():
+    Path("src/my_text.txt").exists() # ASYNC240
+    Path("src/my_text.txt").absolute().exists() # ASYNC240
+
+async def aliased_path_in_foo():
+    from pathlib import Path as PathAlias
+
+    path = PathAlias("src/my_text.txt")
+    path.exists() # ASYNC240
+
+global_path = Path("src/my_text.txt")
+
+async def global_path_in_foo():
+    global_path.exists() # ASYNC240
+
+async def path_as_simple_parameter_type(path: Path):
+    path.exists() # ASYNC240
+
+async def path_as_union_parameter_type(path: Path | None):
+    path.exists() # ASYNC240
+
+async def path_as_optional_parameter_type(path: Optional[Path]):
+    path.exists() # ASYNC240
+
+
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC250.py b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC250.py
new file mode 100644
index 0000000000..c5b3e1fd61
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC250.py
@@ -0,0 +1,22 @@
+def foo():
+    k = input()  # Ok
+    input("hello world")  # Ok
+
+
+async def foo():
+    k = input()  # ASYNC250
+    input("hello world")  # ASYNC250
+
+
+import builtins
+
+import fake
+
+
+def foo():
+    builtins.input("testing")  # Ok
+
+
+async def foo():
+    builtins.input("testing")  # ASYNC250
+    fake.input("whatever")  # Ok
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py
index ef0626986e..a9bab4f122 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py
@@ -18,3 +18,25 @@ var_string = "true"
 Popen(var_string, shell=True)
 Popen([var_string], shell=True)
 Popen([var_string, ""], shell=True)
+
+# Check dict display with only double-starred expressions can be falsey.
+Popen("true", shell={**{}})
+Popen("true", shell={**{**{}}})
+
+# Check pattern with merged defaults/configs
+class ShellConfig:
+    def __init__(self):
+        self.shell_defaults = {}
+
+    def fetch_shell_config(self, username):
+        return {}
+
+    def run(self, username):
+        Popen("true", shell={**self.shell_defaults, **self.fetch_shell_config(username)})
+
+# Additional truthiness cases for generator, lambda, and f-strings
+Popen("true", shell=(i for i in ()))
+Popen("true", shell=lambda: 0)
+Popen("true", shell=f"{b''}")
+x = 1
+Popen("true", shell=f"{x=}")
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py
index 3be26d5495..49d906508b 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py
@@ -3,3 +3,22 @@ def foo(shell):
 
 
 foo(shell=True)
+
+foo(shell={**{}})
+foo(shell={**{**{}}})
+
+# Truthy non-bool values for `shell`
+foo(shell=(i for i in ()))
+foo(shell=lambda: 0)
+
+# f-strings guaranteed non-empty
+foo(shell=f"{b''}")
+x = 1
+foo(shell=f"{x=}")
+
+# Additional truthiness cases for generator, lambda, and f-strings
+foo(shell=(i for i in ()))
+foo(shell=lambda: 0)
+foo(shell=f"{b''}")
+x = 1
+foo(shell=f"{x=}")
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py
index 848eb4a2fc..85de797042 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py
@@ -6,3 +6,13 @@ 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/*")
+
+subprocess.Popen(["chmod", "+w", "*.py"], shell={**{}})
+subprocess.Popen(["chmod", "+w", "*.py"], shell={**{**{}}})
+
+# Additional truthiness cases for generator, lambda, and f-strings
+subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
+subprocess.Popen("chmod +w foo*", shell=lambda: 0)
+subprocess.Popen("chmod +w foo*", shell=f"{b''}")
+x = 1
+subprocess.Popen("chmod +w foo*", shell=f"{x=}")
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B004.py b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B004.py
index 3a81f8c28b..92ec348233 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B004.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B004.py
@@ -39,3 +39,34 @@ hasattr(
     "__call__",  # comment 4
     # comment 5
 )
+
+import operator
+
+assert hasattr(operator, "__call__")
+assert callable(operator) is False
+
+
+class A:
+    def __init__(self): self.__call__ = None
+
+
+assert hasattr(A(), "__call__")
+assert callable(A()) is False
+
+# https://github.com/astral-sh/ruff/issues/20440
+def test_invalid_hasattr_calls():
+    hasattr(0, "__call__", 0)  # 3 args - invalid
+    hasattr(0, "__call__", x=0)  # keyword arg - invalid
+    hasattr(0, "__call__", 0, x=0)  # 3 args + keyword - invalid
+    hasattr()  # no args - invalid
+    hasattr(0)  # 1 arg - invalid
+    hasattr(*(), "__call__", "extra")  # unpacking - invalid
+    hasattr(*())  # unpacking - invalid
+
+def test_invalid_getattr_calls():
+    getattr(0, "__call__", None, "extra")  # 4 args - invalid
+    getattr(0, "__call__", default=None)  # keyword arg - invalid
+    getattr()  # no args - invalid
+    getattr(0)  # 1 arg - invalid
+    getattr(*(), "__call__", None, "extra")  # unpacking - invalid
+    getattr(*())  # unpacking - invalid
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_9.py b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_9.py
new file mode 100644
index 0000000000..c0dcd4008c
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_9.py
@@ -0,0 +1,26 @@
+def f1(x=([],)):
+    print(x)
+
+
+def f2(x=(x for x in "x")):
+    print(x)
+
+
+def f3(x=((x for x in "x"),)):
+    print(x)
+
+
+def f4(x=(z := [1, ])):
+    print(x)
+
+
+def f5(x=([1, ])):
+    print(x)
+
+
+def w1(x=(1,)):
+    print(x)
+
+
+def w2(x=(z := 3)):
+    print(x)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B905.py b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B905.py
index 031773b92e..02ed07daf5 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B905.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B905.py
@@ -1,12 +1,10 @@
 from itertools import count, cycle, repeat
 
 # Errors
-zip()
-zip(range(3))
 zip("a", "b")
 zip("a", "b", *zip("c"))
-zip(zip("a"), strict=False)
-zip(zip("a", strict=True))
+zip(zip("a", "b"), strict=False)
+zip(zip("a", strict=True),"b")
 
 # OK
 zip(range(3), strict=True)
@@ -27,3 +25,10 @@ zip([1, 2, 3], repeat(1, times=4))
 import builtins
 # Still an error even though it uses the qualified name
 builtins.zip([1, 2, 3])
+
+# Regression https://github.com/astral-sh/ruff/issues/20997
+# Ok
+zip()
+zip(range(3))
+# Error
+zip(*lot_of_iterators)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B912.py b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B912.py
new file mode 100644
index 0000000000..72bbf67cb8
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B912.py
@@ -0,0 +1,36 @@
+from itertools import count, cycle, repeat
+
+# Errors
+map(lambda x: x, [1, 2, 3])
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+
+# Errors (limited iterators).
+map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1))
+map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=4))
+
+import builtins
+# Still an error even though it uses the qualified name
+builtins.map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+
+# OK
+map(lambda x: x, [1, 2, 3], strict=True)
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], strict=True)
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], strict=False)
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=True)
+map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True), strict=True)
+
+# OK (single iterable - no strict required)
+map(lambda x: x, [1, 2, 3])
+
+# OK (infinite iterators)
+map(lambda x, y: x + y, [1, 2, 3], cycle([1, 2, 3]))
+map(lambda x, y: x + y, [1, 2, 3], repeat(1))
+map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=None))
+map(lambda x, y: x + y, [1, 2, 3], count())
+
+# Regression https://github.com/astral-sh/ruff/issues/20997
+map(f, *lots_of_iterators)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_builtins/A003.py b/crates/ruff_linter/resources/test/fixtures/flake8_builtins/A003.py
index b2bb8b872f..c7db608f2d 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_builtins/A003.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_builtins/A003.py
@@ -19,3 +19,18 @@ class MyClass:
 
     def attribute_usage(self) -> id:
         pass
+
+
+class C:
+    @staticmethod
+    def property(f):
+        return f
+
+    id = 1
+
+    @[property][0]
+    def f(self, x=[id]):
+        return x
+
+    bin = 2
+    foo = [bin]
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py b/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
index 8c8e368dba..9941fa63cd 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
@@ -663,4 +663,15 @@ class C[
 
 type X[T,] = T
 def f[T,](): pass
-class C[T,]: pass
\ No newline at end of file
+class C[T,]: pass
+
+# t-string examples
+kwargs.pop("remove", t"this {trailing_comma}",)
+kwargs.pop("remove", t"this {f"{trailing_comma}"}",)
+
+t"""This is a test. {
+    "Another sentence."
+    if True else
+    "Don't add a trailing comma here ->"
+}"""
+
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C409.py b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C409.py
index c2c093b253..b8c72773d6 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C409.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C409.py
@@ -42,3 +42,6 @@ tuple(
         x for x in [1,2,3]
     }
 )
+
+t9 = tuple([1],)
+t10 = tuple([1, 2],)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py
index dd7b93f890..7c2cdfbd78 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py
@@ -75,3 +75,7 @@ list(map(lambda x, y: x, [(1, 2), (3, 4)]))
 _ = t"{set(map(lambda x: x % 2 == 0, nums))}"
 _ = t"{dict(map(lambda v: (v, v**2), nums))}"
 
+
+# See https://github.com/astral-sh/ruff/issues/20198
+# No error: lambda contains `yield`, so map() should not be rewritten
+map(lambda x: (yield x), [1, 2, 3])
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_preview_generics.py b/crates/ruff_linter/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_preview_generics.py
new file mode 100644
index 0000000000..23a35a077e
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_preview_generics.py
@@ -0,0 +1,91 @@
+import asyncio
+import collections
+import contextlib
+import dataclasses
+import functools
+import os
+import queue
+import re
+import shelve
+import types
+import weakref
+from collections.abc import (
+    AsyncGenerator,
+    AsyncIterable,
+    AsyncIterator,
+    Awaitable,
+    ByteString,
+    Callable,
+    Collection,
+    Container,
+    Coroutine,
+    Generator,
+    Iterable,
+    Iterator,
+    ItemsView,
+    KeysView,
+    Mapping,
+    MappingView,
+    MutableMapping,
+    MutableSequence,
+    MutableSet,
+    Reversible,
+    Sequence,
+    Set,
+    ValuesView,
+)
+
+
+def takes_preview_generics(
+    future: asyncio.Future[int],
+    task: asyncio.Task[str],
+    deque_object: collections.deque[int],
+    defaultdict_object: collections.defaultdict[str, int],
+    ordered_dict: collections.OrderedDict[str, int],
+    counter_obj: collections.Counter[str],
+    chain_map: collections.ChainMap[str, int],
+    context_manager: contextlib.AbstractContextManager[str],
+    async_context_manager: contextlib.AbstractAsyncContextManager[int],
+    dataclass_field: dataclasses.Field[int],
+    cached_prop: functools.cached_property[int],
+    partial_method: functools.partialmethod[int],
+    path_like: os.PathLike[str],
+    lifo_queue: queue.LifoQueue[int],
+    regular_queue: queue.Queue[int],
+    priority_queue: queue.PriorityQueue[int],
+    simple_queue: queue.SimpleQueue[int],
+    regex_pattern: re.Pattern[str],
+    regex_match: re.Match[str],
+    bsd_db_shelf: shelve.BsdDbShelf[str, int],
+    db_filename_shelf: shelve.DbfilenameShelf[str, int],
+    shelf_obj: shelve.Shelf[str, int],
+    mapping_proxy: types.MappingProxyType[str, int],
+    weak_key_dict: weakref.WeakKeyDictionary[object, int],
+    weak_method: weakref.WeakMethod[int],
+    weak_set: weakref.WeakSet[int],
+    weak_value_dict: weakref.WeakValueDictionary[object, int],
+    awaitable: Awaitable[int],
+    coroutine: Coroutine[int, None, str],
+    async_iterable: AsyncIterable[int],
+    async_iterator: AsyncIterator[int],
+    async_generator: AsyncGenerator[int, None],
+    iterable: Iterable[int],
+    iterator: Iterator[int],
+    generator: Generator[int, None, None],
+    reversible: Reversible[int],
+    container: Container[int],
+    collection: Collection[int],
+    callable_obj: Callable[[int], str],
+    set_obj: Set[int],
+    mutable_set: MutableSet[int],
+    mapping: Mapping[str, int],
+    mutable_mapping: MutableMapping[str, int],
+    sequence: Sequence[int],
+    mutable_sequence: MutableSequence[int],
+    byte_string: ByteString[int],
+    mapping_view: MappingView[str, int],
+    keys_view: KeysView[str],
+    items_view: ItemsView[str, int],
+    values_view: ValuesView[int],
+) -> None:
+    ...
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py
index 240213f485..1203b362f3 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py
@@ -2,3 +2,52 @@ _(f"{'value'}")
 
 # Don't trigger for t-strings
 _(t"{'value'}")
+
+gettext(f"{'value'}")
+ngettext(f"{'value'}", f"{'values'}", 2)
+
+_gettext(f"{'value'}")  # no lint
+gettext_fn(f"{'value'}")  # no lint
+
+
+# https://github.com/astral-sh/ruff/issues/19028 - import aliases
+import gettext as gettext_mod
+from gettext import (
+    gettext as gettext_fn,
+    ngettext as ngettext_fn,
+)
+
+name = "Guido"
+
+gettext_mod.gettext(f"Hello, {name}!")
+gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+gettext_fn(f"Hello, {name}!")
+ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+
+
+# https://github.com/astral-sh/ruff/issues/19028 - deferred translations
+def _(message): return message
+
+animals = [_(f"{'mollusk'}"),
+           _(f"{'albatross'}"),
+           _(f"{'rat'}"),
+           _(f"{'penguin'}"),
+           _(f"{'python'}"),]
+
+del _
+
+for a in animals:
+    print(_(a))
+    print(_(f"{a}"))
+
+
+# https://github.com/astral-sh/ruff/issues/19028
+#  - installed translations/i18n functions dynamically assigned to builtins
+import builtins
+
+gettext_mod.install("domain")
+builtins.__dict__["gettext"] = gettext_fn
+
+builtins._(f"{'value'}")
+builtins.gettext(f"{'value'}")
+builtins.ngettext(f"{'value'}", f"{'values'}", 2)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT002.py b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT002.py
index 80a220aa94..42dcf1453e 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT002.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT002.py
@@ -1 +1,49 @@
 _("{}".format("line"))
+gettext("{}".format("line"))
+ngettext("{}".format("line"), "{}".format("lines"), 2)
+
+_gettext("{}".format("line"))  # no lint
+gettext_fn("{}".format("line"))  # no lint
+
+
+# https://github.com/astral-sh/ruff/issues/19028
+import gettext as gettext_mod
+from gettext import (
+    gettext as gettext_fn,
+    ngettext as ngettext_fn,
+)
+
+name = "Guido"
+
+gettext_mod.gettext("Hello, {}!".format(name))
+gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+gettext_fn("Hello, {}!".format(name))
+ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+
+
+# https://github.com/astral-sh/ruff/issues/19028 - deferred translations
+def _(message): return message
+
+animals = [_("{}".format("mollusk")),
+           _("{}".format("albatross")),
+           _("{}".format("rat")),
+           _("{}".format("penguin")),
+           _("{}".format("python")),]
+
+del _
+
+for a in animals:
+    print(_(a))
+    print(_("{}".format(a)))
+
+
+# https://github.com/astral-sh/ruff/issues/19028
+#  - installed translations/i18n functions dynamically assigned to builtins
+import builtins
+
+gettext_mod.install("domain")
+builtins.__dict__["gettext"] = gettext_fn
+
+builtins._("{}".format("line"))
+builtins.gettext("{}".format("line"))
+builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT003.py b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT003.py
index 3bdc1d052a..11001c5958 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT003.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT003.py
@@ -1 +1,49 @@
 _("%s" % "line")
+gettext("%s" % "line")
+ngettext("%s" % "line", "%s" % "lines", 2)
+
+_gettext("%s" % "line")  # no lint
+gettext_fn("%s" % "line")  # no lint
+
+
+# https://github.com/astral-sh/ruff/issues/19028
+import gettext as gettext_mod
+from gettext import (
+    gettext as gettext_fn,
+    ngettext as ngettext_fn,
+)
+
+name = "Guido"
+
+gettext_mod.gettext("Hello, %s!" % name)
+gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+gettext_fn("Hello, %s!" % name)
+ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+
+
+# https://github.com/astral-sh/ruff/issues/19028 - deferred translations
+def _(message): return message
+
+animals = [_("%s" %"mollusk"),
+           _("%s" %"albatross"),
+           _("%s" %"rat"),
+           _("%s" %"penguin"),
+           _("%s" %"python"),]
+
+del _
+
+for a in animals:
+    print(_(a))
+    print(_("%s" % a))
+
+
+# https://github.com/astral-sh/ruff/issues/19028
+#  - installed translations/i18n functions dynamically assigned to builtins
+import builtins
+
+gettext_mod.install("domain")
+builtins.__dict__["gettext"] = gettext_fn
+
+builtins._("%s" % "line")
+builtins.gettext("%s" % "line")
+builtins.ngettext("%s" % "line", "%s" % "lines", 2)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
index 09fba4a9db..a26864e35e 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
@@ -187,3 +187,24 @@ _ = (
 		# leading comment
     "end"
 )
+
+# https://github.com/astral-sh/ruff/issues/20310
+# ISC001
+t"The quick " t"brown fox."
+
+# ISC002
+t"The quick brown fox jumps over the lazy "\
+t"dog."
+
+# ISC003
+(
+    t"The quick brown fox jumps over the lazy "
+    + t"dog"
+)
+
+# nested examples with both t and f-strings
+_ = "a" f"b {t"c" t"d"} e" "f"
+_ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+_ = f"b {t"abc" \
+    t"def"} g"
+
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC_syntax_error.py b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC_syntax_error.py
index 997c86968d..dae709face 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC_syntax_error.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC_syntax_error.py
@@ -1,10 +1,10 @@
-# The lexer doesn't emit a string token if it's unterminated
+# The lexer emits a string token if it's unterminated
 "a" "b
 "a" "b" "c
 "a" """b
 c""" "d
 
-# For f-strings, the `FStringRanges` won't contain the range for
+# This is also true for
 # unterminated f-strings.
 f"a" f"b
 f"a" f"b" f"c
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
index da05aba630..fcfa953a32 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
@@ -17,3 +17,50 @@ info(f"{__name__}")
 # Don't trigger for t-strings
 info(t"{name}")
 info(t"{__name__}")
+
+count = 5
+total = 9
+directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
+logging.info(f"{count} out of {total} files in {directory_path} checked")
+
+
+
+x = 99
+fmt = "08d"
+logger.info(f"{x:{'08d'}}")
+logger.info(f"{x:>10} {x:{fmt}}")
+
+logging.info(f"")
+logging.info(f"This message doesn't have any variables.")
+
+obj = {"key": "value"}
+logging.info(f"Object: {obj!r}")
+
+items_count = 3
+logging.warning(f"Items: {items_count:d}")
+
+data = {"status": "active"}
+logging.info(f"Processing {len(data)} items")
+logging.info(f"Status: {data.get('status', 'unknown').upper()}")
+
+
+result = 123
+logging.info(f"Calculated result: {result + 100}")
+
+temperature = 123
+logging.info(f"Temperature: {temperature:.1f}°C")
+
+class FilePath:
+    def __init__(self, name: str):
+        self.name = name
+
+logging.info(f"No changes made to {file_path.name}.")
+
+user = "tron"
+balance = 123.45
+logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
+
+import logging
+
+x = 1
+logging.error(f"{x} -> %s", x)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_arg_order.py b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_arg_order.py
new file mode 100644
index 0000000000..44c370bd3d
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_arg_order.py
@@ -0,0 +1,10 @@
+"""Test f-string argument order."""
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+X = 1
+Y = 2
+logger.error(f"{X} -> %s", Y)
+logger.error(f"{Y} -> %s", X)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_implicit_concat.py b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_implicit_concat.py
new file mode 100644
index 0000000000..8beb5cac04
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_implicit_concat.py
@@ -0,0 +1,8 @@
+import logging
+
+variablename = "value"
+
+log = logging.getLogger(__name__)
+log.info(f"a" f"b {variablename}")
+log.info("a " f"b {variablename}")
+log.info("prefix " f"middle {variablename}" f" suffix")
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI021_1.pyi b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI021_1.pyi
new file mode 100644
index 0000000000..59dceece73
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI021_1.pyi
@@ -0,0 +1,18 @@
+from contextlib import nullcontext
+
+
+def check_isolation_level(mode: int) -> None:
+    """Will report both, but only fix the first."""  # ERROR PYI021
+    ...  # ERROR PIE790
+
+
+with nullcontext():
+    """Should not report."""
+    # add something thats not a pass here
+    # to not get a remove unnecessary pass err
+    x = 0
+
+if True:
+    """Should not report."""
+    # same as above
+    y = 1
\ No newline at end of file
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI061.py b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI061.py
index 4bdc3d9879..f3f23663d9 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI061.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI061.py
@@ -78,3 +78,11 @@ b: None | Literal[None] | None
 c: (None | Literal[None]) | None
 d: None | (Literal[None] | None)
 e: None | ((None | Literal[None]) | None) | None
+
+# Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT015.py b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT015.py
index 162a6180a1..57769dcfa4 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT015.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT015.py
@@ -23,3 +23,11 @@ def test_error():
     assert list([])
     assert set(set())
     assert tuple("")
+
+# https://github.com/astral-sh/ruff/issues/19935
+def test_all_ok():
+    assert f"{b""}"
+    assert f"{""=}"
+    assert f"{""!a}"
+    assert f"{""!r}"
+    assert f"{"":1}"
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
index e2f909acf0..e1e299c98e 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
@@ -197,3 +197,10 @@ for x in {**a, **b} or [None]:
 
 # https://github.com/astral-sh/ruff/issues/7127
 def f(a: "'b' or 'c'"): ...
+
+# https://github.com/astral-sh/ruff/issues/20703
+print(f"{b''}" or "bar")  # SIM222
+x = 1
+print(f"{x=}" or "bar")  # SIM222
+(lambda: 1) or True  # SIM222
+(i for i in range(1)) or "bar"  # SIM222
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
index 0d9281cb99..a8dc8fe996 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
@@ -170,6 +170,7 @@ print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
 # leading/trailing whitespace should not count towards maxsplit
 " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
 " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+"a  b".split(maxsplit=1)  # ["a", "b"]
 
 # https://github.com/astral-sh/ruff/issues/19610
 r"1" "\n".split("1")  # [r"", "\n"]
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py
index 550aa2c22c..e5aa9a97ed 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py
@@ -55,3 +55,30 @@ def foo(some_other):
 def foo():
     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
     age = dict.get("Cat", None)
+
+
+# https://github.com/astral-sh/ruff/issues/20341
+# Method call as key
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+key_source = {"Thomas": "Tom"}
+age = ages.get(key_source.get("Thomas", "Tom"), None)
+
+# Property access as key
+class Data:
+    def __init__(self):
+        self.name = "Tom"
+
+data = Data()
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get(data.name, None)
+
+# Complex expression as key
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get("Tom" if True else "Maria", None)
+
+# Function call as key
+def get_key():
+    return "Tom"
+
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get(get_key(), None)
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py
index 3dd52b4139..ee5bed6854 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py
@@ -34,3 +34,7 @@ def foo():
 # https://github.com/astral-sh/ruff/issues/18776
 flag_stars = {}
 for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
+
+# Regression test for https://github.com/astral-sh/ruff/issues/18778
+d = {}
+for country, stars in zip(d.keys(*x), d.values("hello")):...
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH123.py b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH123.py
new file mode 100644
index 0000000000..fccd676321
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH123.py
@@ -0,0 +1,24 @@
+import builtins
+from pathlib import Path
+
+_file = "file.txt"
+_x = ("r+", -1)
+r_plus = "r+"
+
+builtins.open(file=_file)
+
+open(_file, "r+ ", -  1)
+open(mode="wb", file=_file)
+open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+open(_file, "r+", - 1, None, None, None, True, None)
+open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+open(_file, f"  {r_plus}      ", -  1)
+open(buffering=-      1, file=_file, encoding=         "utf-8")
+
+# Only diagnostic
+open()
+open(_file, *_x)
+open(_file, "r+", unknown=True)
+open(_file, "r+", closefd=False)
+open(_file, "r+", None, None, None, None, None, None, None)
\ No newline at end of file
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py
index 5acf2febe2..9668d568b4 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py
@@ -13,3 +13,11 @@ Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True)  # Ok
 fd = os.open(".", os.O_RDONLY)
 os.symlink("source.txt", "link.txt", dir_fd=fd)  # Ok: dir_fd is not supported by pathlib
 os.close(fd)
+
+os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True)
+os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=False)
+
+os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None)
+
+os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=     True    )
+os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory="nonboolean")
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py
index 81dba0e270..0ed75fb834 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py
@@ -125,3 +125,15 @@ os.makedirs("name", 0o777, False)
 os.makedirs(name="name", mode=0o777, exist_ok=False)
 
 os.makedirs("name", unknown_kwarg=True)
+
+# https://github.com/astral-sh/ruff/issues/20134
+os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+
+# Only diagnostic
+os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
+
+os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+
+os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
\ No newline at end of file
diff --git a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/import_from.py b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/import_from.py
index 6f5b08f811..ee6b5484bb 100644
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/import_from.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/import_from.py
@@ -62,4 +62,4 @@ rename(
 
 rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None)
 
-rename(file, "file_2.py", src_dir_fd=1)
\ No newline at end of file
+rename(file, "file_2.py", src_dir_fd=1)
diff --git a/crates/ruff_linter/resources/test/fixtures/flynt/FLY002.py b/crates/ruff_linter/resources/test/fixtures/flynt/FLY002.py
index a73dfcc28a..25d3c65ae8 100644
--- a/crates/ruff_linter/resources/test/fixtures/flynt/FLY002.py
+++ b/crates/ruff_linter/resources/test/fixtures/flynt/FLY002.py
@@ -16,8 +16,16 @@ 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)
-
+# https://github.com/astral-sh/ruff/issues/19887
+nok8 = '\n'.join([r'line1','line2'])
+nok9 = '\n'.join([r"raw string", '<""">', "<'''>"])  # Not OK (both triple-quote delimiters appear; should bail)
 
 # Regression test for: https://github.com/astral-sh/ruff/issues/7197
 def create_file_public_url(url, filename):
     return''.join([url, filename])
+
+# Regression test for: https://github.com/astral-sh/ruff/issues/19837
+nok10 = "".join((foo, '"'))
+nok11 = ''.join((foo, "'"))
+nok12 = ''.join([foo, "'", '"'])
+nok13 = "".join([foo, "'", '"'])
diff --git a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_future_import.py b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_future_import.py
new file mode 100644
index 0000000000..fd1dea942b
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_future_import.py
@@ -0,0 +1,3 @@
+"a docstring"
+from __future__ import annotations
+# EOF
diff --git a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/future_import.py b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/future_import.py
new file mode 100644
index 0000000000..2e6e0107ef
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/future_import.py
@@ -0,0 +1,2 @@
+from __future__ import annotations
+# EOF
diff --git a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skip.py b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skip.py
new file mode 100644
index 0000000000..f2e4666538
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skip.py
@@ -0,0 +1,3 @@
+import concurrent.futures as futures
+
+1
diff --git a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skips_required_import.py b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skips_required_import.py
new file mode 100644
index 0000000000..f2e4666538
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skips_required_import.py
@@ -0,0 +1,3 @@
+import concurrent.futures as futures
+
+1
diff --git a/crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py b/crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py
index 868b268ed1..a393823e61 100644
--- a/crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py
+++ b/crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py
@@ -192,3 +192,24 @@ def issue_19005_3():
     c = {}
     for a[0], a[1] in ():
         c[a[0]] = a[1]
+
+
+def issue_19153_1():
+    v = {}
+    for o, (x,) in ["ox"]:
+        v[x,] = o
+    return v
+
+
+def issue_19153_2():
+    v = {}
+    for (o, p), x in [("op", "x")]:
+        v[x] = o, p
+    return v
+
+
+def issue_19153_3():
+    v = {}
+    for o, (x,) in ["ox"]: 
+        v[(x,)] = o 
+    return v
\ No newline at end of file
diff --git a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.py b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.py
index e134c3e001..df30f0c969 100644
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.py
@@ -974,3 +974,39 @@ BANANA = 100
 APPLE = 200
 
 # end
+
+
+# https://github.com/astral-sh/ruff/issues/19752
+class foo:
+    async def recv(self, *, length=65536):
+        loop = asyncio.get_event_loop()
+        def callback():
+            loop.remove_reader(self._fd)
+        loop.add_reader(self._fd, callback)
+# end
+
+
+# E301
+class Foo:
+    if True:
+        print("conditional")
+        def test():
+            pass
+# end
+
+
+# Test case for nested class scenario
+class Bar:
+    def f():
+        x = 1
+        def g():
+            return 1
+        return 2
+
+    def f():
+        class Baz:
+            x = 1
+            def g():
+                return 1
+            return 2
+# end
diff --git a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E731.py b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E731.py
index a5fab10bf4..ee9c84fd74 100644
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E731.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E731.py
@@ -190,3 +190,12 @@ foo_tooltip = (
     more
 
 )
+
+# https://github.com/astral-sh/ruff/issues/20097
+def scope():
+    from collections.abc import Callable
+    from typing import ParamSpec
+
+    P = ParamSpec("P")
+    f1: Callable[P, str] = lambda x: str(x)
+    f2: Callable[..., str] = lambda x: str(x)
diff --git a/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_google.py b/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_google.py
new file mode 100644
index 0000000000..f61500305e
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_google.py
@@ -0,0 +1,264 @@
+# DOC102
+def add_numbers(b):
+    """
+    Adds two numbers and returns the result.
+
+    Args:
+        a (int): The first number to add.
+        b (int): The second number to add.
+
+    Returns:
+        int: The sum of the two numbers.
+    """
+    return a + b
+
+
+# DOC102
+def multiply_list_elements(lst):
+    """
+    Multiplies each element in a list by a given multiplier.
+
+    Args:
+        lst (list of int): A list of integers.
+        multiplier (int): The multiplier for each element in the list.
+
+    Returns:
+        list of int: A new list with each element multiplied.
+    """
+    return [x * multiplier for x in lst]
+
+
+# DOC102
+def find_max_value():
+    """
+    Finds the maximum value in a list of numbers.
+
+    Args:
+        numbers (list of int): A list of integers to search through.
+
+    Returns:
+        int: The maximum value found in the list.
+    """
+    return max(numbers)
+
+
+# DOC102
+def create_user_profile(location="here"):
+    """
+    Creates a user profile with basic information.
+
+    Args:
+        name (str): The name of the user.
+        age (int): The age of the user.
+        email (str): The user's email address.
+        location (str): The location of the user.
+
+    Returns:
+        dict: A dictionary containing the user's profile.
+    """
+    return {
+        'name': name,
+        'age': age,
+        'email': email,
+        'location': location
+    }
+
+
+# DOC102
+def calculate_total_price(item_prices, discount):
+    """
+    Calculates the total price after applying tax and a discount.
+
+    Args:
+        item_prices (list of float): A list of prices for each item.
+        tax_rate (float): The tax rate to apply.
+        discount (float): The discount to subtract from the total.
+
+    Returns:
+        float: The final total price after tax and discount.
+    """
+    total = sum(item_prices)
+    total_with_tax = total + (total * tax_rate)
+    final_total = total_with_tax - discount
+    return final_total
+
+
+# DOC102
+def send_email(subject, body, bcc_address=None):
+    """
+    Sends an email to the specified recipients.
+
+    Args:
+        subject (str): The subject of the email.
+        body (str): The content of the email.
+        to_address (str): The recipient's email address.
+        cc_address (str, optional): The email address for CC. Defaults to None.
+        bcc_address (str, optional): The email address for BCC. Defaults to None.
+
+    Returns:
+        bool: True if the email was sent successfully, False otherwise.
+    """
+    return True
+
+
+# DOC102
+def concatenate_strings(*args):
+    """
+    Concatenates multiple strings with a specified separator.
+
+    Args:
+        separator (str): The separator to use between strings.
+        *args (str): Variable length argument list of strings to concatenate.
+
+    Returns:
+        str: A single concatenated string.
+    """
+    return separator.join(args)
+
+
+# DOC102
+def process_order(order_id):
+    """
+    Processes an order with a list of items and optional order details.
+
+    Args:
+        order_id (int): The unique identifier for the order.
+        *items (str): Variable length argument list of items in the order.
+        **details (dict): Additional details such as shipping method and address.
+
+    Returns:
+        dict: A dictionary containing the order summary.
+    """
+    return {
+        'order_id': order_id,
+        'items': items,
+        'details': details
+    }
+
+
+class Calculator:
+    """
+    A simple calculator class that can perform basic arithmetic operations.
+    """
+
+    # DOC102
+    def __init__(self):
+        """
+        Initializes the calculator with an initial value.
+
+        Args:
+            value (int, optional): The initial value of the calculator. Defaults to 0.
+        """
+        self.value = value
+
+    # DOC102
+    def add(self, number2):
+        """
+        Adds a number to the current value.
+
+        Args:
+            number (int or float): The number to add to the current value.
+
+        Returns:
+            int or float: The updated value after addition.
+        """
+        self.value += number + number2
+        return self.value
+
+    # DOC102
+    @classmethod
+    def from_string(cls):
+        """
+        Creates a Calculator instance from a string representation of a number.
+
+        Args:
+            value_str (str): The string representing the initial value.
+
+        Returns:
+            Calculator: A new instance of Calculator initialized with the value from the string.
+        """
+        value = float(value_str)
+        return cls(value)
+
+    # DOC102
+    @staticmethod
+    def is_valid_number():
+        """
+        Checks if a given number is valid (int or float).
+
+        Args:
+            number (any): The value to check.
+
+        Returns:
+            bool: True if the number is valid, False otherwise.
+        """
+        return isinstance(number, (int, float))
+
+# OK
+def foo(param1, param2, *args, **kwargs):
+    """Foo.
+
+    Args:
+        param1 (int): The first parameter.
+        param2 (:obj:`str`, optional): The second parameter. Defaults to None.
+            Second line of description: should be indented.
+        *args: Variable length argument list.
+        **kwargs: Arbitrary keyword arguments.
+    """
+    return
+
+# OK
+def on_server_unloaded(self, server_context: ServerContext) -> None:
+    ''' Execute ``on_server_unloaded`` from ``server_lifecycle.py`` (if
+    it is defined) when the server cleanly exits. (Before stopping the
+    server's ``IOLoop``.)
+
+    Args:
+        server_context (ServerContext) :
+
+    .. warning::
+        In practice this code may not run, since servers are often killed
+        by a signal.
+
+
+    '''
+    return self._lifecycle_handler.on_server_unloaded(server_context)
+
+# OK
+def function_with_kwargs(param1, param2, **kwargs):
+    """Function with **kwargs parameter.
+
+    Args:
+        param1 (int): The first parameter.
+        param2 (str): The second parameter.
+        extra_param (str): An extra parameter that may be passed via **kwargs.
+        another_extra (int): Another extra parameter.
+    """
+    return
+
+# OK
+def add_numbers(b):
+    """
+    Adds two numbers and returns the result.
+
+    Args:
+        b: The second number to add.
+
+    Returns:
+        int: The sum of the two numbers.
+    """
+    return
+
+# DOC102
+def add_numbers(b):
+    """
+    Adds two numbers and returns the result.
+
+    Args:
+        a: The first number to add.
+        b: The second number to add.
+
+    Returns:
+        int: The sum of the two numbers.
+    """
+    return a + b
diff --git a/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_numpy.py b/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_numpy.py
new file mode 100644
index 0000000000..fb7f86b25f
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_numpy.py
@@ -0,0 +1,372 @@
+# DOC102
+def add_numbers(b):
+    """
+    Adds two numbers and returns the result.
+
+    Parameters
+    ----------
+    a : int
+        The first number to add.
+    b : int
+        The second number to add.
+
+    Returns
+    -------
+    int
+        The sum of the two numbers.
+    """
+    return a + b
+
+
+# DOC102
+def multiply_list_elements(lst):
+    """
+    Multiplies each element in a list by a given multiplier.
+
+    Parameters
+    ----------
+    lst : list of int
+        A list of integers.
+    multiplier : int
+        The multiplier for each element in the list.
+
+    Returns
+    -------
+    list of int
+        A new list with each element multiplied.
+    """
+    return [x * multiplier for x in lst]
+
+
+# DOC102
+def find_max_value():
+    """
+    Finds the maximum value in a list of numbers.
+
+    Parameters
+    ----------
+    numbers : list of int
+        A list of integers to search through.
+
+    Returns
+    -------
+    int
+        The maximum value found in the list.
+    """
+    return max(numbers)
+
+
+# DOC102
+def create_user_profile(location="here"):
+    """
+    Creates a user profile with basic information.
+
+    Parameters
+    ----------
+    name : str
+        The name of the user.
+    age : int
+        The age of the user.
+    email : str
+        The user's email address.
+    location : str, optional
+        The location of the user, by default "here".
+
+    Returns
+    -------
+    dict
+        A dictionary containing the user's profile.
+    """
+    return {
+        'name': name,
+        'age': age,
+        'email': email,
+        'location': location
+    }
+
+
+# DOC102
+def calculate_total_price(item_prices, discount):
+    """
+    Calculates the total price after applying tax and a discount.
+
+    Parameters
+    ----------
+    item_prices : list of float
+        A list of prices for each item.
+    tax_rate : float
+        The tax rate to apply.
+    discount : float
+        The discount to subtract from the total.
+
+    Returns
+    -------
+    float
+        The final total price after tax and discount.
+    """
+    total = sum(item_prices)
+    total_with_tax = total + (total * tax_rate)
+    final_total = total_with_tax - discount
+    return final_total
+
+
+# DOC102
+def send_email(subject, body, bcc_address=None):
+    """
+    Sends an email to the specified recipients.
+
+    Parameters
+    ----------
+    subject : str
+        The subject of the email.
+    body : str
+        The content of the email.
+    to_address : str
+        The recipient's email address.
+    cc_address : str, optional
+        The email address for CC, by default None.
+    bcc_address : str, optional
+        The email address for BCC, by default None.
+
+    Returns
+    -------
+    bool
+        True if the email was sent successfully, False otherwise.
+    """
+    return True
+
+
+# DOC102
+def concatenate_strings(*args):
+    """
+    Concatenates multiple strings with a specified separator.
+
+    Parameters
+    ----------
+    separator : str
+        The separator to use between strings.
+    *args : str
+        Variable length argument list of strings to concatenate.
+
+    Returns
+    -------
+    str
+        A single concatenated string.
+    """
+    return True
+
+
+# DOC102
+def process_order(order_id):
+    """
+    Processes an order with a list of items and optional order details.
+
+    Parameters
+    ----------
+    order_id : int
+        The unique identifier for the order.
+    *items : str
+        Variable length argument list of items in the order.
+    **details : dict
+        Additional details such as shipping method and address.
+
+    Returns
+    -------
+    dict
+        A dictionary containing the order summary.
+    """
+    return {
+        'order_id': order_id,
+        'items': items,
+        'details': details
+    }
+
+
+class Calculator:
+    """
+    A simple calculator class that can perform basic arithmetic operations.
+    """
+
+    # DOC102
+    def __init__(self):
+        """
+        Initializes the calculator with an initial value.
+
+        Parameters
+        ----------
+        value : int, optional
+            The initial value of the calculator, by default 0.
+        """
+        self.value = value
+
+    # DOC102
+    def add(self, number2):
+        """
+        Adds two numbers to the current value.
+
+        Parameters
+        ----------
+        number : int or float
+            The first number to add.
+        number2 : int or float
+            The second number to add.
+
+        Returns
+        -------
+        int or float
+            The updated value after addition.
+        """
+        self.value += number + number2
+        return self.value
+
+    # DOC102
+    @classmethod
+    def from_string(cls):
+        """
+        Creates a Calculator instance from a string representation of a number.
+
+        Parameters
+        ----------
+        value_str : str
+            The string representing the initial value.
+
+        Returns
+        -------
+        Calculator
+            A new instance of Calculator initialized with the value from the string.
+        """
+        value = float(value_str)
+        return cls(value)
+
+    # DOC102
+    @staticmethod
+    def is_valid_number():
+        """
+        Checks if a given number is valid (int or float).
+
+        Parameters
+        ----------
+        number : any
+            The value to check.
+
+        Returns
+        -------
+        bool
+            True if the number is valid, False otherwise.
+        """
+        return isinstance(number, (int, float))
+
+# OK
+def function_with_kwargs(param1, param2, **kwargs):
+    """Function with **kwargs parameter.
+
+    Parameters
+    ----------
+    param1 : int
+        The first parameter.
+    param2 : str
+        The second parameter.
+    extra_param : str
+        An extra parameter that may be passed via **kwargs.
+    another_extra : int
+        Another extra parameter.
+    """
+    return True
+
+# OK
+def add_numbers(b):
+    """
+    Adds two numbers and returns the result.
+
+    Parameters
+    ----------
+    b
+        The second number to add.
+
+    Returns
+    -------
+    int
+        The sum of the two numbers.
+    """
+    return a + b
+
+# DOC102
+def add_numbers(b):
+    """
+    Adds two numbers and returns the result.
+
+    Parameters
+    ----------
+    a
+        The first number to add.
+    b
+        The second number to add.
+
+    Returns
+    -------
+    int
+        The sum of the two numbers.
+    """
+    return a + b
+
+class Foo:
+    # OK
+    def send_help(self, *args: Any) -> Any:
+        """|coro|
+
+        Shows the help command for the specified entity if given.
+        The entity can be a command or a cog.
+
+        If no entity is given, then it'll show help for the
+        entire bot.
+
+        If the entity is a string, then it looks up whether it's a
+        :class:`Cog` or a :class:`Command`.
+
+        .. note::
+
+            Due to the way this function works, instead of returning
+            something similar to :meth:`~.commands.HelpCommand.command_not_found`
+            this returns :class:`None` on bad input or no help command.
+
+        Parameters
+        ----------
+        entity: Optional[Union[:class:`Command`, :class:`Cog`, :class:`str`]]
+            The entity to show help for.
+
+        Returns
+        -------
+        Any
+            The result of the help command, if any.
+        """
+        return
+
+    # OK
+    @classmethod
+    async def convert(cls, ctx: Context, argument: str) -> Self:
+        """|coro|
+
+        The method that actually converters an argument to the flag mapping.
+
+        Parameters
+        ----------
+        cls: Type[:class:`FlagConverter`]
+            The flag converter class.
+        ctx: :class:`Context`
+            The invocation context.
+        argument: :class:`str`
+            The argument to convert from.
+
+        Raises
+        ------
+        FlagError
+            A flag related parsing error.
+        CommandError
+            A command related error.
+
+        Returns
+        -------
+        :class:`FlagConverter`
+            The flag converter instance with all flags parsed.
+        """
+        return
diff --git a/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_35.py b/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_35.py
new file mode 100644
index 0000000000..0b1cb0644f
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_35.py
@@ -0,0 +1,16 @@
+"""
+Test: allowed-unused-imports-top-level-module
+"""
+
+# No errors
+
+def f():
+    import hvplot
+def f():
+    import hvplot.pandas
+def f():
+    import hvplot.pandas.plots
+def f():
+    from hvplot.pandas import scatter_matrix
+def f():
+    from hvplot.pandas.plots import scatter_matrix
diff --git a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_18.py b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_18.py
index 8576a1d403..eaae5e5ee3 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_18.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_18.py
@@ -14,6 +14,6 @@ class Bar:
     ]
 
 
-# OK: Allow named expressions in annotations.
+# This is no longer allowed on Python 3.14+
 x: (y := 1)
 print(y)
diff --git a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_26.py b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_26.py
index f87819ef80..3eaa0d8a4e 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_26.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_26.py
@@ -13,16 +13,16 @@ CStr2: TypeAlias = Union["C", str]  # always okay
 
 # References to a class from inside the class:
 class C:
-    other: C = ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
+    other: C = ...  # valid in a `.pyi` stub file, and in a `.py` runtime file with deferred annotations
     other2: "C" = ...  # always okay
-    def from_str(self, s: str) -> C: ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
+    def from_str(self, s: str) -> C: ...  # valid in a `.pyi` stub file, and in a `.py` runtime file with deferred annotations
     def from_str2(self, s: str) -> "C": ...  # always okay
 
 # Circular references:
 class A:
-    foo: B  # valid in a `.pyi` stub file, not in a `.py` runtime file
+    foo: B  # valid in a `.pyi` stub file, and in a `.py` runtime file with deferred annotations
     foo2: "B"  # always okay
-    bar: dict[str, B]  # valid in a `.pyi` stub file, not in a `.py` runtime file
+    bar: dict[str, B]  # valid in a `.pyi` stub file, and in a `.py` runtime file with deferred annotations
     bar2: dict[str, "A"]  # always okay
 
 class B:
diff --git a/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py b/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py
index bde7153696..52dd297a0e 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py
@@ -151,3 +151,39 @@ def f():
         pass
     except Exception as _:
         pass
+
+
+# OK, `__class__` in this case is not the special `__class__` cell, so we don't
+# emit a diagnostic. (It has its own special semantics -- see
+# https://github.com/astral-sh/ruff/pull/20048#discussion_r2298338048 -- but
+# those aren't relevant here.)
+class A:
+    __class__ = 1
+
+
+# The following three cases are flagged because they declare local `__class__`
+# variables that don't refer to the special `__class__` cell.
+class A:
+    def set_class(self, cls):
+        __class__ = cls  # F841
+
+
+class A:
+    class B:
+        def set_class(self, cls):
+            __class__ = cls  # F841
+
+
+class A:
+    def foo():
+        class B:
+            print(__class__)
+            def set_class(self, cls):
+                __class__ = cls  # F841
+
+
+# OK, the `__class__` cell is nonlocal and declared as such.
+class NonlocalDunderClass:
+    def foo():
+        nonlocal __class__
+        __class__ = 1
diff --git a/crates/ruff_linter/resources/test/fixtures/pylint/bidirectional_unicode.py b/crates/ruff_linter/resources/test/fixtures/pylint/bidirectional_unicode.py
index 25accb3aad..f72695d0c4 100644
--- a/crates/ruff_linter/resources/test/fixtures/pylint/bidirectional_unicode.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/bidirectional_unicode.py
@@ -4,6 +4,9 @@ print("שלום‬")
 # E2502
 example = "x‏" * 100  #    "‏x" is assigned
 
+# E2502
+another = "x؜" * 50  #    "؜x" is assigned
+
 # E2502
 if access_level != "none‮⁦":  # Check if admin ⁩⁦' and access_level != 'user
     print("You are an admin.")
diff --git a/crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py b/crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py
index 154ee23bec..4a45556a77 100644
--- a/crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py
@@ -44,3 +44,8 @@ def f():
     def g():
         nonlocal x
         x = 2
+
+# OK
+class A:
+    def method(self):
+        nonlocal __class__
diff --git a/crates/ruff_linter/resources/test/fixtures/pylint/stop_iteration_return.py b/crates/ruff_linter/resources/test/fixtures/pylint/stop_iteration_return.py
new file mode 100644
index 0000000000..a35e31a21e
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/stop_iteration_return.py
@@ -0,0 +1,131 @@
+"""Test cases for PLR1708 stop-iteration-return."""
+
+
+# Valid cases - should not trigger the rule
+def normal_function():
+    raise StopIteration  # Not a generator, should not trigger
+
+
+def normal_function_with_value():
+    raise StopIteration("value")  # Not a generator, should not trigger
+
+
+def generator_with_return():
+    yield 1
+    yield 2
+    return "finished"  # This is the correct way
+
+
+def generator_with_yield_from():
+    yield from [1, 2, 3]
+
+
+def generator_without_stop_iteration():
+    yield 1
+    yield 2
+    # No explicit termination
+
+
+def generator_with_other_exception():
+    yield 1
+    raise ValueError("something else")  # Different exception
+
+
+# Invalid cases - should trigger the rule
+def generator_with_stop_iteration():
+    yield 1
+    yield 2
+    raise StopIteration  # Should trigger
+
+
+def generator_with_stop_iteration_value():
+    yield 1
+    yield 2
+    raise StopIteration("finished")  # Should trigger
+
+
+def generator_with_stop_iteration_expr():
+    yield 1
+    yield 2
+    raise StopIteration(1 + 2)  # Should trigger
+
+
+def async_generator_with_stop_iteration():
+    yield 1
+    yield 2
+    raise StopIteration("async")  # Should trigger
+
+
+def nested_generator():
+    def inner_gen():
+        yield 1
+        raise StopIteration("inner")  # Should trigger
+
+    yield from inner_gen()
+
+
+def generator_in_class():
+    class MyClass:
+        def generator_method(self):
+            yield 1
+            raise StopIteration("method")  # Should trigger
+
+    return MyClass
+
+
+# Complex cases
+def complex_generator():
+    try:
+        yield 1
+        yield 2
+        raise StopIteration("complex")  # Should trigger
+    except ValueError:
+        yield 3
+    finally:
+        pass
+
+
+def generator_with_conditional_stop_iteration(condition):
+    yield 1
+    if condition:
+        raise StopIteration("conditional")  # Should trigger
+    yield 2
+
+
+# Edge cases
+def generator_with_bare_stop_iteration():
+    yield 1
+    raise StopIteration  # Should trigger (no arguments)
+
+
+def generator_with_stop_iteration_in_loop():
+    for i in range(5):
+        yield i
+        if i == 3:
+            raise StopIteration("loop")  # Should trigger
+
+
+# Should not trigger - different exceptions
+def generator_with_runtime_error():
+    yield 1
+    raise RuntimeError("not StopIteration")  # Should not trigger
+
+
+def generator_with_custom_exception():
+    yield 1
+    raise CustomException("custom")  # Should not trigger
+
+
+class CustomException(Exception):
+    pass
+
+
+# Generator comprehensions should not be affected
+list_comp = [x for x in range(10)]  # Should not trigger
+
+
+# Lambda in generator context
+def generator_with_lambda():
+    yield 1
+    func = lambda x: x  # Just a regular lambda
+    yield 2
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py
index 7a77087002..96c3acc75d 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py
@@ -141,3 +141,165 @@ class ExampleWithKeywords:
     
     def method3(self):
         super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
+
+# See: https://github.com/astral-sh/ruff/issues/19357
+# Must be detected
+class ParentD:
+    def f(self):
+        print("D")
+
+class ChildD1(ParentD):
+    def f(self):
+        if False: __class__ # Python injects __class__ into scope
+        builtins.super(ChildD1, self).f()
+
+class ChildD2(ParentD):
+    def f(self):
+        if False: super # Python injects __class__ into scope
+        builtins.super(ChildD2, self).f()
+
+class ChildD3(ParentD):
+    def f(self):
+        builtins.super(ChildD3, self).f()
+        super # Python injects __class__ into scope
+
+import builtins as builtins_alias
+class ChildD4(ParentD):
+    def f(self):
+        builtins_alias.super(ChildD4, self).f()
+        super # Python injects __class__ into scope
+
+class ChildD5(ParentD):
+    def f(self):
+        super = 1
+        super # Python injects __class__ into scope
+        builtins.super(ChildD5, self).f()
+
+class ChildD6(ParentD):
+    def f(self):
+        super: "Any"
+        __class__ # Python injects __class__ into scope
+        builtins.super(ChildD6, self).f()
+
+class ChildD7(ParentD):
+    def f(self):
+        def x():
+            __class__ # Python injects __class__ into scope
+        builtins.super(ChildD7, self).f()
+
+class ChildD8(ParentD):
+    def f(self):
+        def x():
+            super = 1
+        super # Python injects __class__ into scope
+        builtins.super(ChildD8, self).f()
+
+class ChildD9(ParentD):
+    def f(self):
+        def x():
+            __class__ = 1
+        __class__ # Python injects __class__ into scope
+        builtins.super(ChildD9, self).f()
+
+class ChildD10(ParentD):
+    def f(self):
+        def x():
+            __class__ = 1
+        super # Python injects __class__ into scope
+        builtins.super(ChildD10, self).f()
+
+
+# Must be ignored
+class ParentI:
+    def f(self):
+        print("I")
+
+class ChildI1(ParentI):
+    def f(self):
+        builtins.super(ChildI1, self).f() # no __class__ in the local scope
+
+
+class ChildI2(ParentI):
+    def b(self):
+        x = __class__
+        if False: super
+
+    def f(self):
+        self.b()
+        builtins.super(ChildI2, self).f() # no __class__ in the local scope
+
+class ChildI3(ParentI):
+    def f(self):
+        if False: super
+        def x(_):
+            builtins.super(ChildI3, self).f() # no __class__ in the local scope
+        x(None)
+
+class ChildI4(ParentI):
+    def f(self):
+        super: "str"
+        builtins.super(ChildI4, self).f() # no __class__ in the local scope
+
+class ChildI5(ParentI):
+    def f(self):
+        super = 1
+        __class__ = 3
+        builtins.super(ChildI5, self).f() # no __class__ in the local scope
+
+class ChildI6(ParentI):
+    def f(self):
+        __class__ = None
+        __class__
+        builtins.super(ChildI6, self).f() # no __class__ in the local scope
+
+class ChildI7(ParentI):
+    def f(self):
+        __class__ = None
+        super
+        builtins.super(ChildI7, self).f()
+
+class ChildI8(ParentI):
+    def f(self):
+        __class__: "Any"
+        super
+        builtins.super(ChildI8, self).f()
+
+class ChildI9(ParentI):
+    def f(self):
+        class A:
+            def foo(self):
+                if False: super
+                if False: __class__
+        builtins.super(ChildI9, self).f()
+
+
+# See: https://github.com/astral-sh/ruff/issues/20422
+# UP008 should not apply when the class variable is shadowed
+class A:
+    def f(self):
+        return 1
+
+class B(A):
+    def f(self):
+        return 2
+
+class C(B):
+    def f(self):
+        C = B  # Local variable C shadows the class name
+        return super(C, self).f()  # Should NOT trigger UP008
+
+
+# See: https://github.com/astral-sh/ruff/issues/20491
+# UP008 should not apply when __class__ is a local variable
+class A:
+    def f(self):
+        return 1
+
+class B(A):
+    def f(self):
+        return 2
+
+class C(B):
+    def f(self):
+        __class__ = B  # Local variable __class__ shadows the implicit __class__
+        return super(__class__, self).f()  # Should NOT trigger UP008
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP019.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP019.py
index 64c616ede5..a89b6ee78a 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP019.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP019.py
@@ -18,3 +18,20 @@ def print_third_word(word: Hello.Text) -> None:
 
 def print_fourth_word(word: Goodbye) -> None:
     print(word)
+    
+
+import typing_extensions
+import typing_extensions as TypingExt
+from typing_extensions import Text as TextAlias
+
+
+def print_fifth_word(word: typing_extensions.Text) -> None:
+    print(word)
+
+
+def print_sixth_word(word: TypingExt.Text) -> None:
+    print(word)
+
+
+def print_seventh_word(word: TextAlias) -> None:
+    print(word)
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_0.py
similarity index 100%
rename from crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029.py
rename to crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_0.py
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_1.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_1.py
new file mode 100644
index 0000000000..a9634d41b9
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_1.py
@@ -0,0 +1 @@
+from builtins import str, int
\ No newline at end of file
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py
index 0fd9a7da2d..53e993795b 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py
@@ -269,3 +269,10 @@ raise ValueError(
 # Not a valid type annotation but this test shouldn't result in a panic.
 # Refer: https://github.com/astral-sh/ruff/issues/11736
 x: "'{} + {}'.format(x, y)"
+
+# Regression https://github.com/astral-sh/ruff/issues/21000
+# Fix should parenthesize walrus
+if __name__ == "__main__":
+    number = 0
+    string = "{}".format(number := number + 1)
+    print(string)
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_2.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_2.py
index 2987164454..9dbc7f385a 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_2.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_2.py
@@ -26,3 +26,8 @@
 "{.real}".format({1, 2})
 "{.real}".format({1: 2, 3: 4})
 "{}".format((i for i in range(2)))
+
+# https://github.com/astral-sh/ruff/issues/21017
+"{.real}".format(1_2)
+"{0.real}".format(1_2)
+"{a.real}".format(a=1_2)
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP040.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP040.py
index f6797167e1..1d7ed4faab 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP040.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP040.py
@@ -43,7 +43,7 @@ class Foo:
 T = typing.TypeVar(*args)
 x: typing.TypeAlias = list[T]
 
-# `default` should be skipped for now, added in Python 3.13
+# `default` was added in Python 3.13
 T = typing.TypeVar("T", default=Any)
 x: typing.TypeAlias = list[T]
 
@@ -90,9 +90,9 @@ PositiveList = TypeAliasType(
     "PositiveList2", list[Annotated[T, Gt(0)]], type_params=(T,)
 )
 
-# `default` should be skipped for now, added in Python 3.13
+# `default` was added in Python 3.13
 T = typing.TypeVar("T", default=Any)
-AnyList = TypeAliasType("AnyList", list[T], typep_params=(T,))
+AnyList = TypeAliasType("AnyList", list[T], type_params=(T,))
 
 # unsafe fix if comments within the fix
 T = TypeVar("T")
@@ -128,3 +128,7 @@ T: TypeAlias = ( # comment0
     str  # comment6
     # comment7
 ) # comment8
+
+# Test case for TypeVar with default - should be converted when preview mode is enabled
+T_default = TypeVar("T_default", default=int)
+DefaultList: TypeAlias = list[T_default]
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP043.pyi b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP043.pyi
new file mode 100644
index 0000000000..5613053d81
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP043.pyi
@@ -0,0 +1,59 @@
+from collections.abc import Generator, AsyncGenerator
+
+
+def func() -> Generator[int, None, None]:
+    yield 42
+
+
+def func() -> Generator[int, None]:
+    yield 42
+
+
+def func() -> Generator[int]:
+    yield 42
+
+
+def func() -> Generator[int, int, int]:
+    foo = yield 42
+    return foo
+
+
+def func() -> Generator[int, int, None]:
+    _ = yield 42
+    return None
+
+
+def func() -> Generator[int, None, int]:
+    yield 42
+    return 42
+
+
+async def func() -> AsyncGenerator[int, None]:
+    yield 42
+
+
+async def func() -> AsyncGenerator[int]:
+    yield 42
+
+
+async def func() -> AsyncGenerator[int, int]:
+    foo = yield 42
+    return foo
+
+
+from typing import Generator, AsyncGenerator
+
+
+def func() -> Generator[str, None, None]:
+    yield "hello"
+
+
+async def func() -> AsyncGenerator[str, None]:
+    yield "hello"
+
+
+async def func() -> AsyncGenerator[  # type: ignore
+    str,
+    None
+]:
+    yield "hello"
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP046_0.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP046_0.py
index 1d3bcc58be..7983ed4756 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP046_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP046_0.py
@@ -122,7 +122,7 @@ class MixedGenerics[U]:
         return (u, t)
 
 
-# TODO(brent) default requires 3.13
+# default requires 3.13
 V = TypeVar("V", default=Any, bound=str)
 
 
@@ -130,6 +130,14 @@ class DefaultTypeVar(Generic[V]):  # -> [V: str = Any]
     var: V
 
 
+# Test case for TypeVar with default but no bound
+W = TypeVar("W", default=int)
+
+
+class DefaultOnlyTypeVar(Generic[W]):  # -> [W = int]
+    var: W
+
+
 # nested classes and functions are skipped
 class Outer:
     class Inner(Generic[T]):
diff --git a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP047.py b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP047.py
index 48b5d431de..e22d79e52e 100644
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP047.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP047.py
@@ -44,9 +44,7 @@ def any_str_param(s: AnyStr) -> AnyStr:
     return s
 
 
-# these cases are not handled
-
-# TODO(brent) default requires 3.13
+# default requires 3.13
 V = TypeVar("V", default=Any, bound=str)
 
 
@@ -54,6 +52,8 @@ def default_var(v: V) -> V:
     return v
 
 
+# these cases are not handled
+
 def outer():
     def inner(t: T) -> T:
         return t
diff --git a/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_0.py b/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_0.py
index 109145cb5c..e021ec9635 100644
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_0.py
@@ -117,3 +117,31 @@ def _():
         # After
     ] and \
         0 < 1: ...
+
+# https://github.com/astral-sh/ruff/issues/20255
+import math
+
+# NaN behavior differences
+if math.nan in [math.nan]:
+    print("This is True")
+
+if math.nan in (math.nan,):
+    print("This is True")
+
+if math.nan in {math.nan}:
+    print("This is True")
+
+# Potential type differences with custom __eq__ methods
+class CustomEq:
+    def __eq__(self, other):
+        return "custom"
+
+obj = CustomEq()
+if obj in [CustomEq()]:
+    pass
+
+if obj in (CustomEq(),):
+    pass
+
+if obj in {CustomEq()}:
+    pass
diff --git a/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_1.py b/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_1.py
index 41109f6cfa..77dfe266c3 100644
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB171_1.py
@@ -51,3 +51,13 @@ if 1 in set(1,2):
 
 if 1 in set((x for x in range(2))):
     pass
+
+# https://github.com/astral-sh/ruff/issues/20255
+import math
+
+# set() and frozenset() with NaN
+if math.nan in set([math.nan]):
+    print("This should be marked unsafe")
+
+if math.nan in frozenset([math.nan]):
+    print("This should be marked unsafe")
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF009.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF009.py
index b8c76574c2..511d20b8ac 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF009.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF009.py
@@ -125,4 +125,13 @@ class D:
 
 @dataclass
 class E:
-    c: C = C()
\ No newline at end of file
+    c: C = C()
+
+# https://github.com/astral-sh/ruff/issues/20266
+@dataclass(frozen=True)
+class C:
+    @dataclass(frozen=True)
+    class D:
+        foo: int = 1
+
+    d: D = D() # OK
\ No newline at end of file
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py
index 38502ef224..765bb412a4 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py
@@ -56,3 +56,11 @@ f"{str(object=3)}"
 f"{str(x for x in [])}"
 
 f"{str((x for x in []))}"
+
+# Debug text cases - should not trigger RUF010
+f"{str(1)=}"
+f"{ascii(1)=}"
+f"{repr(1)=}"
+f"{str('hello')=}"
+f"{ascii('hello')=}"
+f"{repr('hello')=}"
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF016.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF016.py
index 545ad2ec53..815456fc93 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF016.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF016.py
@@ -113,3 +113,18 @@ var = bytearray(b"abc")["x"]
 x = "x"
 var = [1, 2, 3][0:x]
 var = [1, 2, 3][x:1]
+
+# https://github.com/astral-sh/ruff/issues/20204
+
+# Should not emit for boolean index and slice bounds
+var = [1, 2, 3][False]
+var = [1, 2, 3][False:True:True]
+
+# Should emit for invalid access using t-string
+var = [1, 2][t"x"]
+
+# Should emit for invalid access using lambda
+var = [1, 2, 3][lambda: 0]
+
+# Should emit for invalid access using generator
+var = [1, 2, 3][(x for x in ())]
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py
index c607b8b1b3..384d005e9f 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py
@@ -118,3 +118,10 @@ def func():
         return lambda: value
 
     defaultdict(constant_factory("<missing>"))
+
+def func():
+    defaultdict(default_factory=t"")  # OK
+
+
+def func():
+    defaultdict(default_factory=t"hello")  # OK
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py
index b6a98dabf1..f7a72a9dae 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py
@@ -124,3 +124,19 @@ def fun_with_python_syntax():
             ...
 
     return Foo
+
+
+@dataclass
+class C:
+    def __post_init__(self, x: tuple[int, ...] = (
+        1,
+        2,
+    )) -> None:
+        self.x = x
+
+
+@dataclass
+class D:
+    def __post_init__(self, x: int = """
+    """) -> None:
+        self.x = x
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
index 3ee96bd225..ea639e30db 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
@@ -102,3 +102,17 @@ deque("abc") # OK
 deque(b"abc") # OK
 deque(f"" "a")  # OK
 deque(f"{x}" "")  # OK
+
+# https://github.com/astral-sh/ruff/issues/19951
+deque(t"")
+deque(t""  t"")
+deque(t"{""}") # OK
+
+# https://github.com/astral-sh/ruff/issues/20050
+deque(f"{""}")  # RUF037
+
+deque(f"{b""}")
+deque(f"{""=}")
+deque(f"{""!a}")
+deque(f"{""!r}")
+deque(f"{"":1}")
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF051.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF051.py
index 7233bef5b5..d544f76924 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF051.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF051.py
@@ -128,3 +128,15 @@ if f"0" in d:                       # f-string
 
 if k in a.d:                        # Attribute dict
     del a.d[k]
+
+if k in d:                          # else statement
+    del d[k]
+else:
+    pass
+
+if k in d:                          # elif and else statements
+    del d[k]
+elif 0 in d:
+    del d[0]
+else:
+    pass
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF060.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF060.py
index c3b96c6b7b..78b5888207 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF060.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF060.py
@@ -42,3 +42,7 @@ b"a" in bytes("a", "utf-8")
 1 in set(set([1]))
 '' in {""}
 frozenset() in {frozenset()}
+
+# https://github.com/astral-sh/ruff/issues/20238
+"b" in f"" "" # Error
+"b" in f"" "x" # OK
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF065.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF065.py
new file mode 100644
index 0000000000..d7de9df7d2
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF065.py
@@ -0,0 +1,45 @@
+import logging
+
+# %s + str()
+logging.info("Hello %s", str("World!"))
+logging.log(logging.INFO, "Hello %s", str("World!"))
+
+# %s + repr()
+logging.info("Hello %s", repr("World!"))
+logging.log(logging.INFO, "Hello %s", repr("World!"))
+
+# %r + str()
+logging.info("Hello %r", str("World!"))
+logging.log(logging.INFO, "Hello %r", str("World!"))
+
+# %r + repr()
+logging.info("Hello %r", repr("World!"))
+logging.log(logging.INFO, "Hello %r", repr("World!"))
+
+from logging import info, log
+
+# %s + str()
+info("Hello %s", str("World!"))
+log(logging.INFO, "Hello %s", str("World!"))
+
+# %s + repr()
+info("Hello %s", repr("World!"))
+log(logging.INFO, "Hello %s", repr("World!"))
+
+# %r + str()
+info("Hello %r", str("World!"))
+log(logging.INFO, "Hello %r", str("World!"))
+
+# %r + repr()
+info("Hello %r", repr("World!"))
+log(logging.INFO, "Hello %r", repr("World!"))
+
+def str(s): return f"str = {s}"
+# Don't flag this
+logging.info("Hello %s", str("World!"))
+
+logging.info("Debug info: %r", repr("test\nstring"))
+logging.warning("Value: %r", repr(42))
+logging.error("Error: %r", repr([1, 2, 3]))
+logging.info("Debug info: %s", repr("test\nstring"))
+logging.warning("Value: %s", repr(42))
diff --git a/crates/ruff_linter/resources/test/fixtures/ruff/RUF102.py b/crates/ruff_linter/resources/test/fixtures/ruff/RUF102.py
index a7385d177f..607735fb5f 100644
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF102.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF102.py
@@ -16,3 +16,5 @@ from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
 from itertools import chain  # noqa: E402, INVALID300, F401
 # Test for mixed code types
 import json  # noqa: E402, INVALID400, V100
+# Test for rule redirects
+import pandas as pd  # noqa: TCH002
diff --git a/crates/ruff_linter/resources/test/fixtures/syntax_errors/yield_from_in_async_function.py b/crates/ruff_linter/resources/test/fixtures/syntax_errors/yield_from_in_async_function.py
new file mode 100644
index 0000000000..59e11eabe1
--- /dev/null
+++ b/crates/ruff_linter/resources/test/fixtures/syntax_errors/yield_from_in_async_function.py
@@ -0,0 +1 @@
+async def f(): yield from x # error
\ No newline at end of file
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
index 2cf6ec15bb..26cf918731 100644
--- a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
@@ -134,7 +134,7 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                 );
             }
             if checker.is_rule_enabled(Rule::FunctionCallInDataclassDefaultArgument) {
-                ruff::rules::function_call_in_dataclass_default(checker, class_def);
+                ruff::rules::function_call_in_dataclass_default(checker, class_def, scope_id);
             }
             if checker.is_rule_enabled(Rule::MutableClassDefault) {
                 ruff::rules::mutable_class_default(checker, class_def);
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs b/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs
index 9938ba4b33..4a3fe560be 100644
--- a/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs
@@ -81,6 +81,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
         Rule::UndocumentedPublicPackage,
     ]);
     let enforce_pydoclint = checker.any_rule_enabled(&[
+        Rule::DocstringExtraneousParameter,
         Rule::DocstringMissingReturns,
         Rule::DocstringExtraneousReturns,
         Rule::DocstringMissingYields,
@@ -145,9 +146,6 @@ pub(crate) fn definitions(checker: &mut Checker) {
         }
 
         // flake8-pyi
-        if enforce_stubs {
-            flake8_pyi::rules::docstring_in_stubs(checker, definition, docstring);
-        }
         if enforce_stubs_and_runtime {
             flake8_pyi::rules::iter_method_return_iterable(checker, definition);
         }
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
index 51824c3a65..53081e3681 100644
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -8,7 +8,8 @@ use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::preview::{
-    is_assert_raises_exception_call_enabled, is_optional_as_none_in_union_enabled,
+    is_future_required_preview_generics_enabled, is_optional_as_none_in_union_enabled,
+    is_unnecessary_default_type_args_stubs_enabled,
 };
 use crate::registry::Rule;
 use crate::rules::{
@@ -69,7 +70,11 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                     && checker.semantic.in_annotation()
                     && checker.semantic.in_runtime_evaluated_annotation()
                     && !checker.semantic.in_string_type_definition()
-                    && typing::is_pep585_generic(value, &checker.semantic)
+                    && typing::is_pep585_generic(
+                        value,
+                        &checker.semantic,
+                        is_future_required_preview_generics_enabled(checker.settings()),
+                    )
                 {
                     flake8_future_annotations::rules::future_required_type_annotation(
                         checker,
@@ -142,7 +147,10 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             }
 
             if checker.is_rule_enabled(Rule::UnnecessaryDefaultTypeArgs) {
-                if checker.target_version() >= PythonVersion::PY313 {
+                if checker.target_version() >= PythonVersion::PY313
+                    || is_unnecessary_default_type_args_stubs_enabled(checker.settings())
+                        && checker.semantic().in_stub_file()
+                {
                     pyupgrade::rules::unnecessary_default_type_args(checker, expr);
                 }
             }
@@ -209,13 +217,10 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if ctx.is_store() {
                 let check_too_many_expressions =
                     checker.is_rule_enabled(Rule::ExpressionsInStarAssignment);
-                let check_two_starred_expressions =
-                    checker.is_rule_enabled(Rule::MultipleStarredExpressions);
                 pyflakes::rules::starred_expressions(
                     checker,
                     elts,
                     check_too_many_expressions,
-                    check_two_starred_expressions,
                     expr.range(),
                 );
             }
@@ -660,9 +665,15 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::BlockingHttpCallInAsyncFunction) {
                 flake8_async::rules::blocking_http_call(checker, call);
             }
+            if checker.is_rule_enabled(Rule::BlockingHttpCallHttpxInAsyncFunction) {
+                flake8_async::rules::blocking_http_call_httpx(checker, call);
+            }
             if checker.is_rule_enabled(Rule::BlockingOpenCallInAsyncFunction) {
                 flake8_async::rules::blocking_open_call(checker, call);
             }
+            if checker.is_rule_enabled(Rule::BlockingPathMethodInAsyncFunction) {
+                flake8_async::rules::blocking_os_path(checker, call);
+            }
             if checker.any_rule_enabled(&[
                 Rule::CreateSubprocessInAsyncFunction,
                 Rule::RunProcessInAsyncFunction,
@@ -670,6 +681,9 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             ]) {
                 flake8_async::rules::blocking_process_invocation(checker, call);
             }
+            if checker.is_rule_enabled(Rule::BlockingInputInAsyncFunction) {
+                flake8_async::rules::blocking_input(checker, call);
+            }
             if checker.is_rule_enabled(Rule::BlockingSleepInAsyncFunction) {
                 flake8_async::rules::blocking_sleep(checker, call);
             }
@@ -708,7 +722,9 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 flake8_bugbear::rules::re_sub_positional_args(checker, call);
             }
             if checker.is_rule_enabled(Rule::UnreliableCallableCheck) {
-                flake8_bugbear::rules::unreliable_callable_check(checker, expr, func, args);
+                flake8_bugbear::rules::unreliable_callable_check(
+                    checker, expr, func, args, keywords,
+                );
             }
             if checker.is_rule_enabled(Rule::StripWithMultiCharacters) {
                 flake8_bugbear::rules::strip_with_multi_characters(checker, expr, func, args);
@@ -732,6 +748,11 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                     flake8_bugbear::rules::zip_without_explicit_strict(checker, call);
                 }
             }
+            if checker.is_rule_enabled(Rule::MapWithoutExplicitStrict) {
+                if checker.target_version() >= PythonVersion::PY314 {
+                    flake8_bugbear::rules::map_without_explicit_strict(checker, call);
+                }
+            }
             if checker.is_rule_enabled(Rule::NoExplicitStacklevel) {
                 flake8_bugbear::rules::no_explicit_stacklevel(checker, call);
             }
@@ -1013,6 +1034,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::FormatInGetTextFuncCall,
                 Rule::PrintfInGetTextFuncCall,
             ]) && flake8_gettext::is_gettext_func_call(
+                checker,
                 func,
                 &checker.settings().flake8_gettext.functions_names,
             ) {
@@ -1042,11 +1064,9 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::OsStat,
                 Rule::OsPathJoin,
                 Rule::OsPathSplitext,
-                Rule::BuiltinOpen,
                 Rule::PyPath,
                 Rule::Glob,
                 Rule::OsListdir,
-                Rule::OsSymlink,
             ]) {
                 flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
             }
@@ -1124,6 +1144,12 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 if checker.is_rule_enabled(Rule::OsMakedirs) {
                     flake8_use_pathlib::rules::os_makedirs(checker, call, segments);
                 }
+                if checker.is_rule_enabled(Rule::OsSymlink) {
+                    flake8_use_pathlib::rules::os_symlink(checker, call, segments);
+                }
+                if checker.is_rule_enabled(Rule::BuiltinOpen) {
+                    flake8_use_pathlib::rules::builtin_open(checker, call, segments);
+                }
                 if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
                     flake8_use_pathlib::rules::path_constructor_current_directory(
                         checker, call, segments,
@@ -1266,6 +1292,9 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::UnnecessaryEmptyIterableWithinDequeCall) {
                 ruff::rules::unnecessary_literal_within_deque_call(checker, call);
             }
+            if checker.is_rule_enabled(Rule::LoggingEagerConversion) {
+                ruff::rules::logging_eager_conversion(checker, call);
+            }
             if checker.is_rule_enabled(Rule::StarmapZip) {
                 ruff::rules::starmap_zip(checker, call);
             }
@@ -1284,9 +1313,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::NonOctalPermissions) {
                 ruff::rules::non_octal_permissions(checker, call);
             }
-            if checker.is_rule_enabled(Rule::AssertRaisesException)
-                && is_assert_raises_exception_call_enabled(checker.settings())
-            {
+            if checker.is_rule_enabled(Rule::AssertRaisesException) {
                 flake8_bugbear::rules::assert_raises_exception_call(checker, call);
             }
         }
@@ -1311,13 +1338,10 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 pylint::rules::yield_in_init(checker, expr);
             }
         }
-        Expr::YieldFrom(yield_from) => {
+        Expr::YieldFrom(_) => {
             if checker.is_rule_enabled(Rule::YieldInInit) {
                 pylint::rules::yield_in_init(checker, expr);
             }
-            if checker.is_rule_enabled(Rule::YieldFromInAsyncFunction) {
-                pylint::rules::yield_from_in_async_function(checker, yield_from);
-            }
         }
         Expr::FString(f_string_expr @ ast::ExprFString { value, .. }) => {
             if checker.is_rule_enabled(Rule::FStringMissingPlaceholders) {
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
index 164df3846a..7c0037e10d 100644
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -1,7 +1,6 @@
 use ruff_python_ast::helpers;
 use ruff_python_ast::types::Node;
 use ruff_python_ast::{self as ast, Expr, Stmt};
-use ruff_python_semantic::ScopeKind;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -51,24 +50,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::nonlocal_and_global(checker, nonlocal);
             }
         }
-        Stmt::Break(_) => {
-            if checker.is_rule_enabled(Rule::BreakOutsideLoop) {
-                pyflakes::rules::break_outside_loop(
-                    checker,
-                    stmt,
-                    &mut checker.semantic.current_statements().skip(1),
-                );
-            }
-        }
-        Stmt::Continue(_) => {
-            if checker.is_rule_enabled(Rule::ContinueOutsideLoop) {
-                pyflakes::rules::continue_outside_loop(
-                    checker,
-                    stmt,
-                    &mut checker.semantic.current_statements().skip(1),
-                );
-            }
-        }
         Stmt::FunctionDef(
             function_def @ ast::StmtFunctionDef {
                 is_async,
@@ -804,22 +785,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             for alias in names {
-                if let Some("__future__") = module {
-                    if checker.is_rule_enabled(Rule::FutureFeatureNotDefined) {
-                        pyflakes::rules::future_feature_not_defined(checker, alias);
-                    }
-                } else if &alias.name == "*" {
-                    // F406
-                    if checker.is_rule_enabled(Rule::UndefinedLocalWithNestedImportStarUsage) {
-                        if !matches!(checker.semantic.current_scope().kind, ScopeKind::Module) {
-                            checker.report_diagnostic(
-                                pyflakes::rules::UndefinedLocalWithNestedImportStarUsage {
-                                    name: helpers::format_import_from(level, module).to_string(),
-                                },
-                                stmt.range(),
-                            );
-                        }
-                    }
+                if module != Some("__future__") && &alias.name == "*" {
                     // F403
                     checker.report_diagnostic_if_enabled(
                         pyflakes::rules::UndefinedLocalWithImportStar {
@@ -985,6 +951,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.is_rule_enabled(Rule::MisplacedBareRaise) {
                 pylint::rules::misplaced_bare_raise(checker, raise);
             }
+            if checker.is_rule_enabled(Rule::StopIterationReturn) {
+                pylint::rules::stop_iteration_return(checker, raise);
+            }
         }
         Stmt::AugAssign(aug_assign @ ast::StmtAugAssign { target, .. }) => {
             if checker.is_rule_enabled(Rule::GlobalStatement) {
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/suite.rs b/crates/ruff_linter/src/checkers/ast/analyze/suite.rs
index 503a864259..697e485018 100644
--- a/crates/ruff_linter/src/checkers/ast/analyze/suite.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/suite.rs
@@ -2,14 +2,17 @@ use ruff_python_ast::Stmt;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
-use crate::rules::flake8_pie;
 use crate::rules::refurb;
+use crate::rules::{flake8_pie, flake8_pyi};
 
 /// Run lint rules over a suite of [`Stmt`] syntax nodes.
 pub(crate) fn suite(suite: &[Stmt], checker: &Checker) {
     if checker.is_rule_enabled(Rule::UnnecessaryPlaceholder) {
         flake8_pie::rules::unnecessary_placeholder(checker, suite);
     }
+    if checker.source_type.is_stub() && checker.is_rule_enabled(Rule::DocstringInStub) {
+        flake8_pyi::rules::docstring_in_stubs(checker, suite);
+    }
     if checker.is_rule_enabled(Rule::RepeatedGlobal) {
         refurb::rules::repeated_global(checker, suite);
     }
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs b/crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs
index 10ea851457..4a6764a119 100644
--- a/crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs
@@ -13,7 +13,7 @@ pub(crate) fn unresolved_references(checker: &Checker) {
 
     for reference in checker.semantic.unresolved_references() {
         if reference.is_wildcard_import() {
-            // F406
+            // F405
             checker.report_diagnostic_if_enabled(
                 pyflakes::rules::UndefinedLocalWithImportStarUsage {
                     name: reference.name(checker.source()).to_string(),
diff --git a/crates/ruff_linter/src/checkers/ast/mod.rs b/crates/ruff_linter/src/checkers/ast/mod.rs
index 1437b1655d..7750d29f34 100644
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -28,7 +28,7 @@ use itertools::Itertools;
 use log::debug;
 use rustc_hash::{FxHashMap, FxHashSet};
 
-use ruff_db::diagnostic::{Annotation, Diagnostic, IntoDiagnosticMessage, Span};
+use ruff_db::diagnostic::{Annotation, Diagnostic, DiagnosticTag, IntoDiagnosticMessage, Span};
 use ruff_diagnostics::{Applicability, Fix, IsolationLevel};
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
@@ -56,7 +56,7 @@ use ruff_python_semantic::{
     Import, Module, ModuleKind, ModuleSource, NodeId, ScopeId, ScopeKind, SemanticModel,
     SemanticModelFlags, StarImport, SubmoduleImport,
 };
-use ruff_python_stdlib::builtins::{MAGIC_GLOBALS, python_builtins};
+use ruff_python_stdlib::builtins::{python_builtins, python_magic_globals};
 use ruff_python_trivia::CommentRanges;
 use ruff_source_file::{OneIndexed, SourceFile, SourceFileBuilder, SourceRow};
 use ruff_text_size::{Ranged, TextRange, TextSize};
@@ -69,9 +69,12 @@ use crate::package::PackageRoot;
 use crate::preview::is_undefined_export_in_dunder_init_enabled;
 use crate::registry::Rule;
 use crate::rules::pyflakes::rules::{
-    LateFutureImport, ReturnOutsideFunction, YieldOutsideFunction,
+    LateFutureImport, MultipleStarredExpressions, ReturnOutsideFunction,
+    UndefinedLocalWithNestedImportStarUsage, YieldOutsideFunction,
+};
+use crate::rules::pylint::rules::{
+    AwaitOutsideAsync, LoadBeforeGlobalDeclaration, YieldFromInAsyncFunction,
 };
-use crate::rules::pylint::rules::{AwaitOutsideAsync, LoadBeforeGlobalDeclaration};
 use crate::rules::{flake8_pyi, flake8_type_checking, pyflakes, pyupgrade};
 use crate::settings::rule_table::RuleTable;
 use crate::settings::{LinterSettings, TargetVersion, flags};
@@ -84,7 +87,7 @@ mod deferred;
 
 /// State representing whether a docstring is expected or not for the next statement.
 #[derive(Debug, Copy, Clone, PartialEq)]
-enum DocstringState {
+pub(crate) enum DocstringState {
     /// The next statement is expected to be a docstring, but not necessarily so.
     ///
     /// For example, in the following code:
@@ -125,7 +128,7 @@ impl DocstringState {
 
 /// The kind of an expected docstring.
 #[derive(Debug, Copy, Clone, PartialEq)]
-enum ExpectedDocstringKind {
+pub(crate) enum ExpectedDocstringKind {
     /// A module-level docstring.
     ///
     /// For example,
@@ -274,7 +277,7 @@ impl<'a> Checker<'a> {
             locator,
             stylist,
             indexer,
-            importer: Importer::new(parsed, locator, stylist),
+            importer: Importer::new(parsed, locator.contents(), stylist),
             semantic,
             visit: deferred::Visit::default(),
             analyze: deferred::Analyze::default(),
@@ -600,6 +603,11 @@ impl<'a> Checker<'a> {
     pub(crate) const fn context(&self) -> &'a LintContext<'a> {
         self.context
     }
+
+    /// Return the current [`DocstringState`].
+    pub(crate) fn docstring_state(&self) -> DocstringState {
+        self.docstring_state
+    }
 }
 
 pub(crate) struct TypingImporter<'a, 'b> {
@@ -657,6 +665,14 @@ impl SemanticSyntaxContext for Checker<'_> {
                     self.report_diagnostic(YieldOutsideFunction::new(kind), error.range);
                 }
             }
+            SemanticSyntaxErrorKind::NonModuleImportStar(name) => {
+                if self.is_rule_enabled(Rule::UndefinedLocalWithNestedImportStarUsage) {
+                    self.report_diagnostic(
+                        UndefinedLocalWithNestedImportStarUsage { name },
+                        error.range,
+                    );
+                }
+            }
             SemanticSyntaxErrorKind::ReturnOutsideFunction => {
                 // F706
                 if self.is_rule_enabled(Rule::ReturnOutsideFunction) {
@@ -668,13 +684,48 @@ impl SemanticSyntaxContext for Checker<'_> {
                     self.report_diagnostic(AwaitOutsideAsync, error.range);
                 }
             }
+            SemanticSyntaxErrorKind::YieldFromInAsyncFunction => {
+                // PLE1700
+                if self.is_rule_enabled(Rule::YieldFromInAsyncFunction) {
+                    self.report_diagnostic(YieldFromInAsyncFunction, error.range);
+                }
+            }
+            SemanticSyntaxErrorKind::MultipleStarredExpressions => {
+                // F622
+                if self.is_rule_enabled(Rule::MultipleStarredExpressions) {
+                    self.report_diagnostic(MultipleStarredExpressions, error.range);
+                }
+            }
+            SemanticSyntaxErrorKind::FutureFeatureNotDefined(name) => {
+                // F407
+                if self.is_rule_enabled(Rule::FutureFeatureNotDefined) {
+                    self.report_diagnostic(
+                        pyflakes::rules::FutureFeatureNotDefined { name },
+                        error.range,
+                    );
+                }
+            }
+            SemanticSyntaxErrorKind::BreakOutsideLoop => {
+                // F701
+                if self.is_rule_enabled(Rule::BreakOutsideLoop) {
+                    self.report_diagnostic(pyflakes::rules::BreakOutsideLoop, error.range);
+                }
+            }
+            SemanticSyntaxErrorKind::ContinueOutsideLoop => {
+                // F702
+                if self.is_rule_enabled(Rule::ContinueOutsideLoop) {
+                    self.report_diagnostic(pyflakes::rules::ContinueOutsideLoop, error.range);
+                }
+            }
             SemanticSyntaxErrorKind::ReboundComprehensionVariable
             | SemanticSyntaxErrorKind::DuplicateTypeParameter
             | SemanticSyntaxErrorKind::MultipleCaseAssignment(_)
             | SemanticSyntaxErrorKind::IrrefutableCasePattern(_)
             | SemanticSyntaxErrorKind::SingleStarredAssignment
             | SemanticSyntaxErrorKind::WriteToDebug(_)
+            | SemanticSyntaxErrorKind::DifferentMatchPatternBindings
             | SemanticSyntaxErrorKind::InvalidExpression(..)
+            | SemanticSyntaxErrorKind::GlobalParameter(_)
             | SemanticSyntaxErrorKind::DuplicateMatchKey(_)
             | SemanticSyntaxErrorKind::DuplicateMatchClassAttribute(_)
             | SemanticSyntaxErrorKind::InvalidStarExpression
@@ -703,7 +754,10 @@ impl SemanticSyntaxContext for Checker<'_> {
             match scope.kind {
                 ScopeKind::Class(_) | ScopeKind::Lambda(_) => return false,
                 ScopeKind::Function(ast::StmtFunctionDef { is_async, .. }) => return *is_async,
-                ScopeKind::Generator { .. } | ScopeKind::Module | ScopeKind::Type => {}
+                ScopeKind::Generator { .. }
+                | ScopeKind::Module
+                | ScopeKind::Type
+                | ScopeKind::DunderClassCell => {}
             }
         }
         false
@@ -714,7 +768,10 @@ impl SemanticSyntaxContext for Checker<'_> {
             match scope.kind {
                 ScopeKind::Class(_) => return false,
                 ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Generator { .. } | ScopeKind::Module | ScopeKind::Type => {}
+                ScopeKind::Generator { .. }
+                | ScopeKind::Module
+                | ScopeKind::Type
+                | ScopeKind::DunderClassCell => {}
             }
         }
         false
@@ -725,7 +782,7 @@ impl SemanticSyntaxContext for Checker<'_> {
             match scope.kind {
                 ScopeKind::Class(_) | ScopeKind::Generator { .. } => return false,
                 ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Module | ScopeKind::Type => {}
+                ScopeKind::Module | ScopeKind::Type | ScopeKind::DunderClassCell => {}
             }
         }
         false
@@ -769,19 +826,60 @@ impl SemanticSyntaxContext for Checker<'_> {
             }
         )
     }
+
+    fn in_loop_context(&self) -> bool {
+        let mut child = self.semantic.current_statement();
+
+        for parent in self.semantic.current_statements().skip(1) {
+            match parent {
+                Stmt::For(ast::StmtFor { orelse, .. })
+                | Stmt::While(ast::StmtWhile { orelse, .. }) => {
+                    if !orelse.contains(child) {
+                        return true;
+                    }
+                }
+                Stmt::FunctionDef(_) | Stmt::ClassDef(_) => {
+                    break;
+                }
+                _ => {}
+            }
+            child = parent;
+        }
+        false
+    }
+
+    fn is_bound_parameter(&self, name: &str) -> bool {
+        for scope in self.semantic.current_scopes() {
+            match scope.kind {
+                ScopeKind::Class(_) => return false,
+                ScopeKind::Function(ast::StmtFunctionDef { parameters, .. })
+                | ScopeKind::Lambda(ast::ExprLambda {
+                    parameters: Some(parameters),
+                    ..
+                }) => return parameters.includes(name),
+                ScopeKind::Lambda(_)
+                | ScopeKind::Generator { .. }
+                | ScopeKind::Module
+                | ScopeKind::Type
+                | ScopeKind::DunderClassCell => {}
+            }
+        }
+
+        false
+    }
 }
 
 impl<'a> Visitor<'a> for Checker<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
+        // Step 0: Pre-processing
+        self.semantic.push_node(stmt);
+
         // For functions, defer semantic syntax error checks until the body of the function is
         // visited
         if !stmt.is_function_def_stmt() {
             self.with_semantic_checker(|semantic, context| semantic.visit_stmt(stmt, context));
         }
 
-        // Step 0: Pre-processing
-        self.semantic.push_node(stmt);
-
         // For Jupyter Notebooks, we'll reset the `IMPORT_BOUNDARY` flag when
         // we encounter a cell boundary.
         if self.source_type.is_ipynb()
@@ -1092,6 +1190,24 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
 
+                // Here we add the implicit scope surrounding a method which allows code in the
+                // method to access `__class__` at runtime. See the `ScopeKind::DunderClassCell`
+                // docs for more information.
+                let added_dunder_class_scope = if self.semantic.current_scope().kind.is_class() {
+                    self.semantic.push_scope(ScopeKind::DunderClassCell);
+                    let binding_id = self.semantic.push_binding(
+                        TextRange::default(),
+                        BindingKind::DunderClassCell,
+                        BindingFlags::empty(),
+                    );
+                    self.semantic
+                        .current_scope_mut()
+                        .add("__class__", binding_id);
+                    true
+                } else {
+                    false
+                };
+
                 self.semantic.push_scope(ScopeKind::Type);
 
                 if let Some(type_params) = type_params {
@@ -1155,6 +1271,9 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 self.semantic.pop_scope(); // Function scope
                 self.semantic.pop_definition();
                 self.semantic.pop_scope(); // Type parameter scope
+                if added_dunder_class_scope {
+                    self.semantic.pop_scope(); // `__class__` cell closure scope
+                }
                 self.add_binding(
                     name,
                     stmt.identifier(),
@@ -2297,7 +2416,7 @@ impl<'a> Checker<'a> {
         }
     }
 
-    /// Visit an body of [`Stmt`] nodes within a type-checking block.
+    /// Visit a body of [`Stmt`] nodes within a type-checking block.
     fn visit_type_checking_block(&mut self, body: &'a [Stmt]) {
         let snapshot = self.semantic.flags;
         self.semantic.flags |= SemanticModelFlags::TYPE_CHECKING_BLOCK;
@@ -2506,7 +2625,7 @@ impl<'a> Checker<'a> {
         for builtin in standard_builtins {
             bind_builtin(builtin);
         }
-        for builtin in MAGIC_GLOBALS {
+        for builtin in python_magic_globals(target_version.minor) {
             bind_builtin(builtin);
         }
         for builtin in &settings.builtins {
@@ -3231,6 +3350,11 @@ impl<'a> LintContext<'a> {
     pub(crate) const fn settings(&self) -> &LinterSettings {
         self.settings
     }
+
+    #[cfg(any(feature = "test-rules", test))]
+    pub(crate) const fn source_file(&self) -> &SourceFile {
+        &self.source_file
+    }
 }
 
 /// An abstraction for mutating a diagnostic.
@@ -3258,6 +3382,56 @@ impl DiagnosticGuard<'_, '_> {
     pub(crate) fn defuse(mut self) {
         self.diagnostic = None;
     }
+
+    /// Set the message on the primary annotation for this diagnostic.
+    ///
+    /// If a message already exists on the primary annotation, then this
+    /// overwrites the existing message.
+    ///
+    /// This message is associated with the primary annotation created
+    /// for every `Diagnostic` that uses the `DiagnosticGuard` API.
+    /// Specifically, the annotation is derived from the `TextRange` given to
+    /// the `LintContext::report_diagnostic` API.
+    ///
+    /// Callers can add additional primary or secondary annotations via the
+    /// `DerefMut` trait implementation to a `Diagnostic`.
+    pub(crate) fn set_primary_message(&mut self, message: impl IntoDiagnosticMessage) {
+        // N.B. It is normally bad juju to define `self` methods
+        // on types that implement `Deref`. Instead, it's idiomatic
+        // to do `fn foo(this: &mut LintDiagnosticGuard)`, which in
+        // turn forces callers to use
+        // `LintDiagnosticGuard(&mut guard, message)`. But this is
+        // supremely annoying for what is expected to be a common
+        // case.
+        //
+        // Moreover, most of the downside that comes from these sorts
+        // of methods is a semver hazard. Because the deref target type
+        // could also define a method by the same name, and that leads
+        // to confusion. But we own all the code involved here and
+        // there is no semver boundary. So... ¯\_(ツ)_/¯ ---AG
+
+        // OK because we know the diagnostic was constructed with a single
+        // primary annotation that will always come before any other annotation
+        // in the diagnostic. (This relies on the `Diagnostic` API not exposing
+        // any methods for removing annotations or re-ordering them, which is
+        // true as of 2025-04-11.)
+        let ann = self.primary_annotation_mut().unwrap();
+        ann.set_message(message);
+    }
+
+    /// Adds a tag on the primary annotation for this diagnostic.
+    ///
+    /// This tag is associated with the primary annotation created
+    /// for every `Diagnostic` that uses the `DiagnosticGuard` API.
+    /// Specifically, the annotation is derived from the `TextRange` given to
+    /// the `LintContext::report_diagnostic` API.
+    ///
+    /// Callers can add additional primary or secondary annotations via the
+    /// `DerefMut` trait implementation to a `Diagnostic`.
+    pub(crate) fn add_primary_tag(&mut self, tag: DiagnosticTag) {
+        let ann = self.primary_annotation_mut().unwrap();
+        ann.push_tag(tag);
+    }
 }
 
 impl DiagnosticGuard<'_, '_> {
diff --git a/crates/ruff_linter/src/checkers/noqa.rs b/crates/ruff_linter/src/checkers/noqa.rs
index bf411511ce..7cf58a5def 100644
--- a/crates/ruff_linter/src/checkers/noqa.rs
+++ b/crates/ruff_linter/src/checkers/noqa.rs
@@ -6,7 +6,7 @@ use itertools::Itertools;
 use rustc_hash::FxHashSet;
 
 use ruff_python_trivia::CommentRanges;
-use ruff_text_size::Ranged;
+use ruff_text_size::{Ranged, TextRange};
 
 use crate::fix::edits::delete_comment;
 use crate::noqa::{
@@ -68,7 +68,7 @@ pub(crate) fn check_noqa(
         let noqa_offsets = diagnostic
             .parent()
             .into_iter()
-            .chain(std::iter::once(diagnostic.expect_range().start()))
+            .chain(diagnostic.range().map(TextRange::start).into_iter())
             .map(|position| noqa_line_for.resolve(position))
             .unique();
 
@@ -130,6 +130,7 @@ pub(crate) fn check_noqa(
                         let edit = delete_comment(directive.range(), locator);
                         let mut diagnostic = context
                             .report_diagnostic(UnusedNOQA { codes: None }, directive.range());
+                        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
                         diagnostic.set_fix(Fix::safe_edit(edit));
                     }
                 }
@@ -226,6 +227,7 @@ pub(crate) fn check_noqa(
                             },
                             directive.range(),
                         );
+                        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
                         diagnostic.set_fix(Fix::safe_edit(edit));
                     }
                 }
diff --git a/crates/ruff_linter/src/codes.rs b/crates/ruff_linter/src/codes.rs
index d395eed6f2..172841dc7c 100644
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
@@ -5,6 +5,7 @@
 use std::fmt::Formatter;
 
 use ruff_db::diagnostic::SecondaryCode;
+use serde::Serialize;
 use strum_macros::EnumIter;
 
 use crate::registry::Linter;
@@ -74,17 +75,18 @@ impl serde::Serialize for NoqaCode {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Serialize)]
 pub enum RuleGroup {
-    /// The rule is stable.
-    Stable,
-    /// The rule is unstable, and preview mode must be enabled for usage.
-    Preview,
-    /// The rule has been deprecated, warnings will be displayed during selection in stable
-    /// and errors will be raised if used with preview mode enabled.
-    Deprecated,
-    /// The rule has been removed, errors will be displayed on use.
-    Removed,
+    /// The rule is stable since the provided Ruff version.
+    Stable { since: &'static str },
+    /// The rule has been unstable since the provided Ruff version, and preview mode must be enabled
+    /// for usage.
+    Preview { since: &'static str },
+    /// The rule has been deprecated since the provided Ruff version, warnings will be displayed
+    /// during selection in stable and errors will be raised if used with preview mode enabled.
+    Deprecated { since: &'static str },
+    /// The rule was removed in the provided Ruff version, and errors will be displayed on use.
+    Removed { since: &'static str },
 }
 
 #[ruff_macros::map_codes]
@@ -95,1086 +97,1096 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
     #[rustfmt::skip]
     Some(match (linter, code) {
         // pycodestyle errors
-        (Pycodestyle, "E101") => (RuleGroup::Stable, rules::pycodestyle::rules::MixedSpacesAndTabs),
-        (Pycodestyle, "E111") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple),
-        (Pycodestyle, "E112") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),
-        (Pycodestyle, "E113") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::UnexpectedIndentation),
-        (Pycodestyle, "E114") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment),
-        (Pycodestyle, "E115") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment),
-        (Pycodestyle, "E116") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment),
-        (Pycodestyle, "E117") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::OverIndented),
-        (Pycodestyle, "E201") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket),
-        (Pycodestyle, "E202") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket),
-        (Pycodestyle, "E203") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation),
-        (Pycodestyle, "E204") => (RuleGroup::Preview, rules::pycodestyle::rules::WhitespaceAfterDecorator),
-        (Pycodestyle, "E211") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters),
-        (Pycodestyle, "E221") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator),
-        (Pycodestyle, "E222") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator),
-        (Pycodestyle, "E223") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabBeforeOperator),
-        (Pycodestyle, "E224") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabAfterOperator),
-        (Pycodestyle, "E225") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator),
-        (Pycodestyle, "E226") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator),
-        (Pycodestyle, "E227") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator),
-        (Pycodestyle, "E228") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator),
-        (Pycodestyle, "E231") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespace),
-        (Pycodestyle, "E241") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterComma),
-        (Pycodestyle, "E242") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabAfterComma),
-        (Pycodestyle, "E251") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals),
-        (Pycodestyle, "E252") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals),
-        (Pycodestyle, "E261") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment),
-        (Pycodestyle, "E262") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment),
-        (Pycodestyle, "E265") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment),
-        (Pycodestyle, "E266") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment),
-        (Pycodestyle, "E271") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword),
-        (Pycodestyle, "E272") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword),
-        (Pycodestyle, "E273") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabAfterKeyword),
-        (Pycodestyle, "E274") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabBeforeKeyword),
-        (Pycodestyle, "E275") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword),
-        (Pycodestyle, "E301") => (RuleGroup::Preview, rules::pycodestyle::rules::BlankLineBetweenMethods),
-        (Pycodestyle, "E302") => (RuleGroup::Preview, rules::pycodestyle::rules::BlankLinesTopLevel),
-        (Pycodestyle, "E303") => (RuleGroup::Preview, rules::pycodestyle::rules::TooManyBlankLines),
-        (Pycodestyle, "E304") => (RuleGroup::Preview, rules::pycodestyle::rules::BlankLineAfterDecorator),
-        (Pycodestyle, "E305") => (RuleGroup::Preview, rules::pycodestyle::rules::BlankLinesAfterFunctionOrClass),
-        (Pycodestyle, "E306") => (RuleGroup::Preview, rules::pycodestyle::rules::BlankLinesBeforeNestedDefinition),
-        (Pycodestyle, "E401") => (RuleGroup::Stable, rules::pycodestyle::rules::MultipleImportsOnOneLine),
-        (Pycodestyle, "E402") => (RuleGroup::Stable, rules::pycodestyle::rules::ModuleImportNotAtTopOfFile),
-        (Pycodestyle, "E501") => (RuleGroup::Stable, rules::pycodestyle::rules::LineTooLong),
-        (Pycodestyle, "E502") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::RedundantBackslash),
-        (Pycodestyle, "E701") => (RuleGroup::Stable, rules::pycodestyle::rules::MultipleStatementsOnOneLineColon),
-        (Pycodestyle, "E702") => (RuleGroup::Stable, rules::pycodestyle::rules::MultipleStatementsOnOneLineSemicolon),
-        (Pycodestyle, "E703") => (RuleGroup::Stable, rules::pycodestyle::rules::UselessSemicolon),
-        (Pycodestyle, "E711") => (RuleGroup::Stable, rules::pycodestyle::rules::NoneComparison),
-        (Pycodestyle, "E712") => (RuleGroup::Stable, rules::pycodestyle::rules::TrueFalseComparison),
-        (Pycodestyle, "E713") => (RuleGroup::Stable, rules::pycodestyle::rules::NotInTest),
-        (Pycodestyle, "E714") => (RuleGroup::Stable, rules::pycodestyle::rules::NotIsTest),
-        (Pycodestyle, "E721") => (RuleGroup::Stable, rules::pycodestyle::rules::TypeComparison),
-        (Pycodestyle, "E722") => (RuleGroup::Stable, rules::pycodestyle::rules::BareExcept),
-        (Pycodestyle, "E731") => (RuleGroup::Stable, rules::pycodestyle::rules::LambdaAssignment),
-        (Pycodestyle, "E741") => (RuleGroup::Stable, rules::pycodestyle::rules::AmbiguousVariableName),
-        (Pycodestyle, "E742") => (RuleGroup::Stable, rules::pycodestyle::rules::AmbiguousClassName),
-        (Pycodestyle, "E743") => (RuleGroup::Stable, rules::pycodestyle::rules::AmbiguousFunctionName),
-        (Pycodestyle, "E902") => (RuleGroup::Stable, rules::pycodestyle::rules::IOError),
+        (Pycodestyle, "E101") => rules::pycodestyle::rules::MixedSpacesAndTabs,
+        (Pycodestyle, "E111") => rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple,
+        (Pycodestyle, "E112") => rules::pycodestyle::rules::logical_lines::NoIndentedBlock,
+        (Pycodestyle, "E113") => rules::pycodestyle::rules::logical_lines::UnexpectedIndentation,
+        (Pycodestyle, "E114") => rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment,
+        (Pycodestyle, "E115") => rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment,
+        (Pycodestyle, "E116") => rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment,
+        (Pycodestyle, "E117") => rules::pycodestyle::rules::logical_lines::OverIndented,
+        (Pycodestyle, "E201") => rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket,
+        (Pycodestyle, "E202") => rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket,
+        (Pycodestyle, "E203") => rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation,
+        (Pycodestyle, "E204") => rules::pycodestyle::rules::WhitespaceAfterDecorator,
+        (Pycodestyle, "E211") => rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters,
+        (Pycodestyle, "E221") => rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator,
+        (Pycodestyle, "E222") => rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator,
+        (Pycodestyle, "E223") => rules::pycodestyle::rules::logical_lines::TabBeforeOperator,
+        (Pycodestyle, "E224") => rules::pycodestyle::rules::logical_lines::TabAfterOperator,
+        (Pycodestyle, "E225") => rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator,
+        (Pycodestyle, "E226") => rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator,
+        (Pycodestyle, "E227") => rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator,
+        (Pycodestyle, "E228") => rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator,
+        (Pycodestyle, "E231") => rules::pycodestyle::rules::logical_lines::MissingWhitespace,
+        (Pycodestyle, "E241") => rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterComma,
+        (Pycodestyle, "E242") => rules::pycodestyle::rules::logical_lines::TabAfterComma,
+        (Pycodestyle, "E251") => rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals,
+        (Pycodestyle, "E252") => rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals,
+        (Pycodestyle, "E261") => rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment,
+        (Pycodestyle, "E262") => rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment,
+        (Pycodestyle, "E265") => rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment,
+        (Pycodestyle, "E266") => rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment,
+        (Pycodestyle, "E271") => rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword,
+        (Pycodestyle, "E272") => rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword,
+        (Pycodestyle, "E273") => rules::pycodestyle::rules::logical_lines::TabAfterKeyword,
+        (Pycodestyle, "E274") => rules::pycodestyle::rules::logical_lines::TabBeforeKeyword,
+        (Pycodestyle, "E275") => rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword,
+        (Pycodestyle, "E301") => rules::pycodestyle::rules::BlankLineBetweenMethods,
+        (Pycodestyle, "E302") => rules::pycodestyle::rules::BlankLinesTopLevel,
+        (Pycodestyle, "E303") => rules::pycodestyle::rules::TooManyBlankLines,
+        (Pycodestyle, "E304") => rules::pycodestyle::rules::BlankLineAfterDecorator,
+        (Pycodestyle, "E305") => rules::pycodestyle::rules::BlankLinesAfterFunctionOrClass,
+        (Pycodestyle, "E306") => rules::pycodestyle::rules::BlankLinesBeforeNestedDefinition,
+        (Pycodestyle, "E401") => rules::pycodestyle::rules::MultipleImportsOnOneLine,
+        (Pycodestyle, "E402") => rules::pycodestyle::rules::ModuleImportNotAtTopOfFile,
+        (Pycodestyle, "E501") => rules::pycodestyle::rules::LineTooLong,
+        (Pycodestyle, "E502") => rules::pycodestyle::rules::logical_lines::RedundantBackslash,
+        (Pycodestyle, "E701") => rules::pycodestyle::rules::MultipleStatementsOnOneLineColon,
+        (Pycodestyle, "E702") => rules::pycodestyle::rules::MultipleStatementsOnOneLineSemicolon,
+        (Pycodestyle, "E703") => rules::pycodestyle::rules::UselessSemicolon,
+        (Pycodestyle, "E711") => rules::pycodestyle::rules::NoneComparison,
+        (Pycodestyle, "E712") => rules::pycodestyle::rules::TrueFalseComparison,
+        (Pycodestyle, "E713") => rules::pycodestyle::rules::NotInTest,
+        (Pycodestyle, "E714") => rules::pycodestyle::rules::NotIsTest,
+        (Pycodestyle, "E721") => rules::pycodestyle::rules::TypeComparison,
+        (Pycodestyle, "E722") => rules::pycodestyle::rules::BareExcept,
+        (Pycodestyle, "E731") => rules::pycodestyle::rules::LambdaAssignment,
+        (Pycodestyle, "E741") => rules::pycodestyle::rules::AmbiguousVariableName,
+        (Pycodestyle, "E742") => rules::pycodestyle::rules::AmbiguousClassName,
+        (Pycodestyle, "E743") => rules::pycodestyle::rules::AmbiguousFunctionName,
+        (Pycodestyle, "E902") => rules::pycodestyle::rules::IOError,
         #[allow(deprecated)]
-        (Pycodestyle, "E999") => (RuleGroup::Removed, rules::pycodestyle::rules::SyntaxError),
+        (Pycodestyle, "E999") => rules::pycodestyle::rules::SyntaxError,
 
         // pycodestyle warnings
-        (Pycodestyle, "W191") => (RuleGroup::Stable, rules::pycodestyle::rules::TabIndentation),
-        (Pycodestyle, "W291") => (RuleGroup::Stable, rules::pycodestyle::rules::TrailingWhitespace),
-        (Pycodestyle, "W292") => (RuleGroup::Stable, rules::pycodestyle::rules::MissingNewlineAtEndOfFile),
-        (Pycodestyle, "W293") => (RuleGroup::Stable, rules::pycodestyle::rules::BlankLineWithWhitespace),
-        (Pycodestyle, "W391") => (RuleGroup::Preview, rules::pycodestyle::rules::TooManyNewlinesAtEndOfFile),
-        (Pycodestyle, "W505") => (RuleGroup::Stable, rules::pycodestyle::rules::DocLineTooLong),
-        (Pycodestyle, "W605") => (RuleGroup::Stable, rules::pycodestyle::rules::InvalidEscapeSequence),
+        (Pycodestyle, "W191") => rules::pycodestyle::rules::TabIndentation,
+        (Pycodestyle, "W291") => rules::pycodestyle::rules::TrailingWhitespace,
+        (Pycodestyle, "W292") => rules::pycodestyle::rules::MissingNewlineAtEndOfFile,
+        (Pycodestyle, "W293") => rules::pycodestyle::rules::BlankLineWithWhitespace,
+        (Pycodestyle, "W391") => rules::pycodestyle::rules::TooManyNewlinesAtEndOfFile,
+        (Pycodestyle, "W505") => rules::pycodestyle::rules::DocLineTooLong,
+        (Pycodestyle, "W605") => rules::pycodestyle::rules::InvalidEscapeSequence,
 
         // pyflakes
-        (Pyflakes, "401") => (RuleGroup::Stable, rules::pyflakes::rules::UnusedImport),
-        (Pyflakes, "402") => (RuleGroup::Stable, rules::pyflakes::rules::ImportShadowedByLoopVar),
-        (Pyflakes, "403") => (RuleGroup::Stable, rules::pyflakes::rules::UndefinedLocalWithImportStar),
-        (Pyflakes, "404") => (RuleGroup::Stable, rules::pyflakes::rules::LateFutureImport),
-        (Pyflakes, "405") => (RuleGroup::Stable, rules::pyflakes::rules::UndefinedLocalWithImportStarUsage),
-        (Pyflakes, "406") => (RuleGroup::Stable, rules::pyflakes::rules::UndefinedLocalWithNestedImportStarUsage),
-        (Pyflakes, "407") => (RuleGroup::Stable, rules::pyflakes::rules::FutureFeatureNotDefined),
-        (Pyflakes, "501") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatInvalidFormat),
-        (Pyflakes, "502") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatExpectedMapping),
-        (Pyflakes, "503") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatExpectedSequence),
-        (Pyflakes, "504") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatExtraNamedArguments),
-        (Pyflakes, "505") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatMissingArgument),
-        (Pyflakes, "506") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatMixedPositionalAndNamed),
-        (Pyflakes, "507") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatPositionalCountMismatch),
-        (Pyflakes, "508") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatStarRequiresSequence),
-        (Pyflakes, "509") => (RuleGroup::Stable, rules::pyflakes::rules::PercentFormatUnsupportedFormatCharacter),
-        (Pyflakes, "521") => (RuleGroup::Stable, rules::pyflakes::rules::StringDotFormatInvalidFormat),
-        (Pyflakes, "522") => (RuleGroup::Stable, rules::pyflakes::rules::StringDotFormatExtraNamedArguments),
-        (Pyflakes, "523") => (RuleGroup::Stable, rules::pyflakes::rules::StringDotFormatExtraPositionalArguments),
-        (Pyflakes, "524") => (RuleGroup::Stable, rules::pyflakes::rules::StringDotFormatMissingArguments),
-        (Pyflakes, "525") => (RuleGroup::Stable, rules::pyflakes::rules::StringDotFormatMixingAutomatic),
-        (Pyflakes, "541") => (RuleGroup::Stable, rules::pyflakes::rules::FStringMissingPlaceholders),
-        (Pyflakes, "601") => (RuleGroup::Stable, rules::pyflakes::rules::MultiValueRepeatedKeyLiteral),
-        (Pyflakes, "602") => (RuleGroup::Stable, rules::pyflakes::rules::MultiValueRepeatedKeyVariable),
-        (Pyflakes, "621") => (RuleGroup::Stable, rules::pyflakes::rules::ExpressionsInStarAssignment),
-        (Pyflakes, "622") => (RuleGroup::Stable, rules::pyflakes::rules::MultipleStarredExpressions),
-        (Pyflakes, "631") => (RuleGroup::Stable, rules::pyflakes::rules::AssertTuple),
-        (Pyflakes, "632") => (RuleGroup::Stable, rules::pyflakes::rules::IsLiteral),
-        (Pyflakes, "633") => (RuleGroup::Stable, rules::pyflakes::rules::InvalidPrintSyntax),
-        (Pyflakes, "634") => (RuleGroup::Stable, rules::pyflakes::rules::IfTuple),
-        (Pyflakes, "701") => (RuleGroup::Stable, rules::pyflakes::rules::BreakOutsideLoop),
-        (Pyflakes, "702") => (RuleGroup::Stable, rules::pyflakes::rules::ContinueOutsideLoop),
-        (Pyflakes, "704") => (RuleGroup::Stable, rules::pyflakes::rules::YieldOutsideFunction),
-        (Pyflakes, "706") => (RuleGroup::Stable, rules::pyflakes::rules::ReturnOutsideFunction),
-        (Pyflakes, "707") => (RuleGroup::Stable, rules::pyflakes::rules::DefaultExceptNotLast),
-        (Pyflakes, "722") => (RuleGroup::Stable, rules::pyflakes::rules::ForwardAnnotationSyntaxError),
-        (Pyflakes, "811") => (RuleGroup::Stable, rules::pyflakes::rules::RedefinedWhileUnused),
-        (Pyflakes, "821") => (RuleGroup::Stable, rules::pyflakes::rules::UndefinedName),
-        (Pyflakes, "822") => (RuleGroup::Stable, rules::pyflakes::rules::UndefinedExport),
-        (Pyflakes, "823") => (RuleGroup::Stable, rules::pyflakes::rules::UndefinedLocal),
-        (Pyflakes, "841") => (RuleGroup::Stable, rules::pyflakes::rules::UnusedVariable),
-        (Pyflakes, "842") => (RuleGroup::Stable, rules::pyflakes::rules::UnusedAnnotation),
-        (Pyflakes, "901") => (RuleGroup::Stable, rules::pyflakes::rules::RaiseNotImplemented),
+        (Pyflakes, "401") => rules::pyflakes::rules::UnusedImport,
+        (Pyflakes, "402") => rules::pyflakes::rules::ImportShadowedByLoopVar,
+        (Pyflakes, "403") => rules::pyflakes::rules::UndefinedLocalWithImportStar,
+        (Pyflakes, "404") => rules::pyflakes::rules::LateFutureImport,
+        (Pyflakes, "405") => rules::pyflakes::rules::UndefinedLocalWithImportStarUsage,
+        (Pyflakes, "406") => rules::pyflakes::rules::UndefinedLocalWithNestedImportStarUsage,
+        (Pyflakes, "407") => rules::pyflakes::rules::FutureFeatureNotDefined,
+        (Pyflakes, "501") => rules::pyflakes::rules::PercentFormatInvalidFormat,
+        (Pyflakes, "502") => rules::pyflakes::rules::PercentFormatExpectedMapping,
+        (Pyflakes, "503") => rules::pyflakes::rules::PercentFormatExpectedSequence,
+        (Pyflakes, "504") => rules::pyflakes::rules::PercentFormatExtraNamedArguments,
+        (Pyflakes, "505") => rules::pyflakes::rules::PercentFormatMissingArgument,
+        (Pyflakes, "506") => rules::pyflakes::rules::PercentFormatMixedPositionalAndNamed,
+        (Pyflakes, "507") => rules::pyflakes::rules::PercentFormatPositionalCountMismatch,
+        (Pyflakes, "508") => rules::pyflakes::rules::PercentFormatStarRequiresSequence,
+        (Pyflakes, "509") => rules::pyflakes::rules::PercentFormatUnsupportedFormatCharacter,
+        (Pyflakes, "521") => rules::pyflakes::rules::StringDotFormatInvalidFormat,
+        (Pyflakes, "522") => rules::pyflakes::rules::StringDotFormatExtraNamedArguments,
+        (Pyflakes, "523") => rules::pyflakes::rules::StringDotFormatExtraPositionalArguments,
+        (Pyflakes, "524") => rules::pyflakes::rules::StringDotFormatMissingArguments,
+        (Pyflakes, "525") => rules::pyflakes::rules::StringDotFormatMixingAutomatic,
+        (Pyflakes, "541") => rules::pyflakes::rules::FStringMissingPlaceholders,
+        (Pyflakes, "601") => rules::pyflakes::rules::MultiValueRepeatedKeyLiteral,
+        (Pyflakes, "602") => rules::pyflakes::rules::MultiValueRepeatedKeyVariable,
+        (Pyflakes, "621") => rules::pyflakes::rules::ExpressionsInStarAssignment,
+        (Pyflakes, "622") => rules::pyflakes::rules::MultipleStarredExpressions,
+        (Pyflakes, "631") => rules::pyflakes::rules::AssertTuple,
+        (Pyflakes, "632") => rules::pyflakes::rules::IsLiteral,
+        (Pyflakes, "633") => rules::pyflakes::rules::InvalidPrintSyntax,
+        (Pyflakes, "634") => rules::pyflakes::rules::IfTuple,
+        (Pyflakes, "701") => rules::pyflakes::rules::BreakOutsideLoop,
+        (Pyflakes, "702") => rules::pyflakes::rules::ContinueOutsideLoop,
+        (Pyflakes, "704") => rules::pyflakes::rules::YieldOutsideFunction,
+        (Pyflakes, "706") => rules::pyflakes::rules::ReturnOutsideFunction,
+        (Pyflakes, "707") => rules::pyflakes::rules::DefaultExceptNotLast,
+        (Pyflakes, "722") => rules::pyflakes::rules::ForwardAnnotationSyntaxError,
+        (Pyflakes, "811") => rules::pyflakes::rules::RedefinedWhileUnused,
+        (Pyflakes, "821") => rules::pyflakes::rules::UndefinedName,
+        (Pyflakes, "822") => rules::pyflakes::rules::UndefinedExport,
+        (Pyflakes, "823") => rules::pyflakes::rules::UndefinedLocal,
+        (Pyflakes, "841") => rules::pyflakes::rules::UnusedVariable,
+        (Pyflakes, "842") => rules::pyflakes::rules::UnusedAnnotation,
+        (Pyflakes, "901") => rules::pyflakes::rules::RaiseNotImplemented,
 
         // pylint
-        (Pylint, "C0105") => (RuleGroup::Stable, rules::pylint::rules::TypeNameIncorrectVariance),
-        (Pylint, "C0131") => (RuleGroup::Stable, rules::pylint::rules::TypeBivariance),
-        (Pylint, "C0132") => (RuleGroup::Stable, rules::pylint::rules::TypeParamNameMismatch),
-        (Pylint, "C0205") => (RuleGroup::Stable, rules::pylint::rules::SingleStringSlots),
-        (Pylint, "C0206") => (RuleGroup::Stable, rules::pylint::rules::DictIndexMissingItems),
-        (Pylint, "C0207") => (RuleGroup::Preview, rules::pylint::rules::MissingMaxsplitArg),
-        (Pylint, "C0208") => (RuleGroup::Stable, rules::pylint::rules::IterationOverSet),
-        (Pylint, "C0414") => (RuleGroup::Stable, rules::pylint::rules::UselessImportAlias),
-        (Pylint, "C0415") => (RuleGroup::Stable, rules::pylint::rules::ImportOutsideTopLevel),
-        (Pylint, "C1802") => (RuleGroup::Stable, rules::pylint::rules::LenTest),
-        (Pylint, "C1901") => (RuleGroup::Preview, rules::pylint::rules::CompareToEmptyString),
-        (Pylint, "C2401") => (RuleGroup::Stable, rules::pylint::rules::NonAsciiName),
-        (Pylint, "C2403") => (RuleGroup::Stable, rules::pylint::rules::NonAsciiImportName),
-        (Pylint, "C2701") => (RuleGroup::Preview, rules::pylint::rules::ImportPrivateName),
-        (Pylint, "C2801") => (RuleGroup::Preview, rules::pylint::rules::UnnecessaryDunderCall),
-        (Pylint, "C3002") => (RuleGroup::Stable, rules::pylint::rules::UnnecessaryDirectLambdaCall),
-        (Pylint, "E0100") => (RuleGroup::Stable, rules::pylint::rules::YieldInInit),
-        (Pylint, "E0101") => (RuleGroup::Stable, rules::pylint::rules::ReturnInInit),
-        (Pylint, "E0115") => (RuleGroup::Stable, rules::pylint::rules::NonlocalAndGlobal),
-        (Pylint, "E0116") => (RuleGroup::Stable, rules::pylint::rules::ContinueInFinally),
-        (Pylint, "E0117") => (RuleGroup::Stable, rules::pylint::rules::NonlocalWithoutBinding),
-        (Pylint, "E0118") => (RuleGroup::Stable, rules::pylint::rules::LoadBeforeGlobalDeclaration),
-        (Pylint, "E0237") => (RuleGroup::Stable, rules::pylint::rules::NonSlotAssignment),
-        (Pylint, "E0241") => (RuleGroup::Stable, rules::pylint::rules::DuplicateBases),
-        (Pylint, "E0302") => (RuleGroup::Stable, rules::pylint::rules::UnexpectedSpecialMethodSignature),
-        (Pylint, "E0303") => (RuleGroup::Stable, rules::pylint::rules::InvalidLengthReturnType),
-        (Pylint, "E0304") => (RuleGroup::Preview, rules::pylint::rules::InvalidBoolReturnType),
-        (Pylint, "E0305") => (RuleGroup::Stable, rules::pylint::rules::InvalidIndexReturnType),
-        (Pylint, "E0307") => (RuleGroup::Stable, rules::pylint::rules::InvalidStrReturnType),
-        (Pylint, "E0308") => (RuleGroup::Stable, rules::pylint::rules::InvalidBytesReturnType),
-        (Pylint, "E0309") => (RuleGroup::Stable, rules::pylint::rules::InvalidHashReturnType),
-        (Pylint, "E0604") => (RuleGroup::Stable, rules::pylint::rules::InvalidAllObject),
-        (Pylint, "E0605") => (RuleGroup::Stable, rules::pylint::rules::InvalidAllFormat),
-        (Pylint, "E0643") => (RuleGroup::Stable, rules::pylint::rules::PotentialIndexError),
-        (Pylint, "E0704") => (RuleGroup::Stable, rules::pylint::rules::MisplacedBareRaise),
-        (Pylint, "E1132") => (RuleGroup::Stable, rules::pylint::rules::RepeatedKeywordArgument),
-        (Pylint, "E1141") => (RuleGroup::Preview, rules::pylint::rules::DictIterMissingItems),
-        (Pylint, "E1142") => (RuleGroup::Stable, rules::pylint::rules::AwaitOutsideAsync),
-        (Pylint, "E1205") => (RuleGroup::Stable, rules::pylint::rules::LoggingTooManyArgs),
-        (Pylint, "E1206") => (RuleGroup::Stable, rules::pylint::rules::LoggingTooFewArgs),
-        (Pylint, "E1300") => (RuleGroup::Stable, rules::pylint::rules::BadStringFormatCharacter),
-        (Pylint, "E1307") => (RuleGroup::Stable, rules::pylint::rules::BadStringFormatType),
-        (Pylint, "E1310") => (RuleGroup::Stable, rules::pylint::rules::BadStrStripCall),
-        (Pylint, "E1507") => (RuleGroup::Stable, rules::pylint::rules::InvalidEnvvarValue),
-        (Pylint, "E1519") => (RuleGroup::Stable, rules::pylint::rules::SingledispatchMethod),
-        (Pylint, "E1520") => (RuleGroup::Stable, rules::pylint::rules::SingledispatchmethodFunction),
-        (Pylint, "E1700") => (RuleGroup::Stable, rules::pylint::rules::YieldFromInAsyncFunction),
-        (Pylint, "E2502") => (RuleGroup::Stable, rules::pylint::rules::BidirectionalUnicode),
-        (Pylint, "E2510") => (RuleGroup::Stable, rules::pylint::rules::InvalidCharacterBackspace),
-        (Pylint, "E2512") => (RuleGroup::Stable, rules::pylint::rules::InvalidCharacterSub),
-        (Pylint, "E2513") => (RuleGroup::Stable, rules::pylint::rules::InvalidCharacterEsc),
-        (Pylint, "E2514") => (RuleGroup::Stable, rules::pylint::rules::InvalidCharacterNul),
-        (Pylint, "E2515") => (RuleGroup::Stable, rules::pylint::rules::InvalidCharacterZeroWidthSpace),
-        (Pylint, "E4703") => (RuleGroup::Preview, rules::pylint::rules::ModifiedIteratingSet),
-        (Pylint, "R0124") => (RuleGroup::Stable, rules::pylint::rules::ComparisonWithItself),
-        (Pylint, "R0133") => (RuleGroup::Stable, rules::pylint::rules::ComparisonOfConstant),
-        (Pylint, "R0202") => (RuleGroup::Preview, rules::pylint::rules::NoClassmethodDecorator),
-        (Pylint, "R0203") => (RuleGroup::Preview, rules::pylint::rules::NoStaticmethodDecorator),
-        (Pylint, "R0206") => (RuleGroup::Stable, rules::pylint::rules::PropertyWithParameters),
-        (Pylint, "R0402") => (RuleGroup::Stable, rules::pylint::rules::ManualFromImport),
-        (Pylint, "R0904") => (RuleGroup::Preview, rules::pylint::rules::TooManyPublicMethods),
-        (Pylint, "R0911") => (RuleGroup::Stable, rules::pylint::rules::TooManyReturnStatements),
-        (Pylint, "R0912") => (RuleGroup::Stable, rules::pylint::rules::TooManyBranches),
-        (Pylint, "R0913") => (RuleGroup::Stable, rules::pylint::rules::TooManyArguments),
-        (Pylint, "R0914") => (RuleGroup::Preview, rules::pylint::rules::TooManyLocals),
-        (Pylint, "R0915") => (RuleGroup::Stable, rules::pylint::rules::TooManyStatements),
-        (Pylint, "R0916") => (RuleGroup::Preview, rules::pylint::rules::TooManyBooleanExpressions),
-        (Pylint, "R0917") => (RuleGroup::Preview, rules::pylint::rules::TooManyPositionalArguments),
-        (Pylint, "R1701") => (RuleGroup::Removed, rules::pylint::rules::RepeatedIsinstanceCalls),
-        (Pylint, "R1702") => (RuleGroup::Preview, rules::pylint::rules::TooManyNestedBlocks),
-        (Pylint, "R1704") => (RuleGroup::Stable, rules::pylint::rules::RedefinedArgumentFromLocal),
-        (Pylint, "R1706") => (RuleGroup::Removed, rules::pylint::rules::AndOrTernary),
-        (Pylint, "R1711") => (RuleGroup::Stable, rules::pylint::rules::UselessReturn),
-        (Pylint, "R1714") => (RuleGroup::Stable, rules::pylint::rules::RepeatedEqualityComparison),
-        (Pylint, "R1722") => (RuleGroup::Stable, rules::pylint::rules::SysExitAlias),
-        (Pylint, "R1730") => (RuleGroup::Stable, rules::pylint::rules::IfStmtMinMax),
-        (Pylint, "R1716") => (RuleGroup::Stable, rules::pylint::rules::BooleanChainedComparison),
-        (Pylint, "R1733") => (RuleGroup::Stable, rules::pylint::rules::UnnecessaryDictIndexLookup),
-        (Pylint, "R1736") => (RuleGroup::Stable, rules::pylint::rules::UnnecessaryListIndexLookup),
-        (Pylint, "R2004") => (RuleGroup::Stable, rules::pylint::rules::MagicValueComparison),
-        (Pylint, "R2044") => (RuleGroup::Stable, rules::pylint::rules::EmptyComment),
-        (Pylint, "R5501") => (RuleGroup::Stable, rules::pylint::rules::CollapsibleElseIf),
-        (Pylint, "R6104") => (RuleGroup::Preview, rules::pylint::rules::NonAugmentedAssignment),
-        (Pylint, "R6201") => (RuleGroup::Preview, rules::pylint::rules::LiteralMembership),
-        (Pylint, "R6301") => (RuleGroup::Preview, rules::pylint::rules::NoSelfUse),
+        (Pylint, "C0105") => rules::pylint::rules::TypeNameIncorrectVariance,
+        (Pylint, "C0131") => rules::pylint::rules::TypeBivariance,
+        (Pylint, "C0132") => rules::pylint::rules::TypeParamNameMismatch,
+        (Pylint, "C0205") => rules::pylint::rules::SingleStringSlots,
+        (Pylint, "C0206") => rules::pylint::rules::DictIndexMissingItems,
+        (Pylint, "C0207") => rules::pylint::rules::MissingMaxsplitArg,
+        (Pylint, "C0208") => rules::pylint::rules::IterationOverSet,
+        (Pylint, "C0414") => rules::pylint::rules::UselessImportAlias,
+        (Pylint, "C0415") => rules::pylint::rules::ImportOutsideTopLevel,
+        (Pylint, "C1802") => rules::pylint::rules::LenTest,
+        (Pylint, "C1901") => rules::pylint::rules::CompareToEmptyString,
+        (Pylint, "C2401") => rules::pylint::rules::NonAsciiName,
+        (Pylint, "C2403") => rules::pylint::rules::NonAsciiImportName,
+        (Pylint, "C2701") => rules::pylint::rules::ImportPrivateName,
+        (Pylint, "C2801") => rules::pylint::rules::UnnecessaryDunderCall,
+        (Pylint, "C3002") => rules::pylint::rules::UnnecessaryDirectLambdaCall,
+        (Pylint, "E0100") => rules::pylint::rules::YieldInInit,
+        (Pylint, "E0101") => rules::pylint::rules::ReturnInInit,
+        (Pylint, "E0115") => rules::pylint::rules::NonlocalAndGlobal,
+        (Pylint, "E0116") => rules::pylint::rules::ContinueInFinally,
+        (Pylint, "E0117") => rules::pylint::rules::NonlocalWithoutBinding,
+        (Pylint, "E0118") => rules::pylint::rules::LoadBeforeGlobalDeclaration,
+        (Pylint, "E0237") => rules::pylint::rules::NonSlotAssignment,
+        (Pylint, "E0241") => rules::pylint::rules::DuplicateBases,
+        (Pylint, "E0302") => rules::pylint::rules::UnexpectedSpecialMethodSignature,
+        (Pylint, "E0303") => rules::pylint::rules::InvalidLengthReturnType,
+        (Pylint, "E0304") => rules::pylint::rules::InvalidBoolReturnType,
+        (Pylint, "E0305") => rules::pylint::rules::InvalidIndexReturnType,
+        (Pylint, "E0307") => rules::pylint::rules::InvalidStrReturnType,
+        (Pylint, "E0308") => rules::pylint::rules::InvalidBytesReturnType,
+        (Pylint, "E0309") => rules::pylint::rules::InvalidHashReturnType,
+        (Pylint, "E0604") => rules::pylint::rules::InvalidAllObject,
+        (Pylint, "E0605") => rules::pylint::rules::InvalidAllFormat,
+        (Pylint, "E0643") => rules::pylint::rules::PotentialIndexError,
+        (Pylint, "E0704") => rules::pylint::rules::MisplacedBareRaise,
+        (Pylint, "E1132") => rules::pylint::rules::RepeatedKeywordArgument,
+        (Pylint, "E1141") => rules::pylint::rules::DictIterMissingItems,
+        (Pylint, "E1142") => rules::pylint::rules::AwaitOutsideAsync,
+        (Pylint, "E1205") => rules::pylint::rules::LoggingTooManyArgs,
+        (Pylint, "E1206") => rules::pylint::rules::LoggingTooFewArgs,
+        (Pylint, "E1300") => rules::pylint::rules::BadStringFormatCharacter,
+        (Pylint, "E1307") => rules::pylint::rules::BadStringFormatType,
+        (Pylint, "E1310") => rules::pylint::rules::BadStrStripCall,
+        (Pylint, "E1507") => rules::pylint::rules::InvalidEnvvarValue,
+        (Pylint, "E1519") => rules::pylint::rules::SingledispatchMethod,
+        (Pylint, "E1520") => rules::pylint::rules::SingledispatchmethodFunction,
+        (Pylint, "E1700") => rules::pylint::rules::YieldFromInAsyncFunction,
+        (Pylint, "E2502") => rules::pylint::rules::BidirectionalUnicode,
+        (Pylint, "E2510") => rules::pylint::rules::InvalidCharacterBackspace,
+        (Pylint, "E2512") => rules::pylint::rules::InvalidCharacterSub,
+        (Pylint, "E2513") => rules::pylint::rules::InvalidCharacterEsc,
+        (Pylint, "E2514") => rules::pylint::rules::InvalidCharacterNul,
+        (Pylint, "E2515") => rules::pylint::rules::InvalidCharacterZeroWidthSpace,
+        (Pylint, "E4703") => rules::pylint::rules::ModifiedIteratingSet,
+        (Pylint, "R0124") => rules::pylint::rules::ComparisonWithItself,
+        (Pylint, "R0133") => rules::pylint::rules::ComparisonOfConstant,
+        (Pylint, "R0202") => rules::pylint::rules::NoClassmethodDecorator,
+        (Pylint, "R0203") => rules::pylint::rules::NoStaticmethodDecorator,
+        (Pylint, "R0206") => rules::pylint::rules::PropertyWithParameters,
+        (Pylint, "R0402") => rules::pylint::rules::ManualFromImport,
+        (Pylint, "R0904") => rules::pylint::rules::TooManyPublicMethods,
+        (Pylint, "R0911") => rules::pylint::rules::TooManyReturnStatements,
+        (Pylint, "R0912") => rules::pylint::rules::TooManyBranches,
+        (Pylint, "R0913") => rules::pylint::rules::TooManyArguments,
+        (Pylint, "R0914") => rules::pylint::rules::TooManyLocals,
+        (Pylint, "R0915") => rules::pylint::rules::TooManyStatements,
+        (Pylint, "R0916") => rules::pylint::rules::TooManyBooleanExpressions,
+        (Pylint, "R0917") => rules::pylint::rules::TooManyPositionalArguments,
+        (Pylint, "R1701") => rules::pylint::rules::RepeatedIsinstanceCalls,
+        (Pylint, "R1702") => rules::pylint::rules::TooManyNestedBlocks,
+        (Pylint, "R1704") => rules::pylint::rules::RedefinedArgumentFromLocal,
+        (Pylint, "R1706") => rules::pylint::rules::AndOrTernary,
+        (Pylint, "R1708") => rules::pylint::rules::StopIterationReturn,
+        (Pylint, "R1711") => rules::pylint::rules::UselessReturn,
+        (Pylint, "R1714") => rules::pylint::rules::RepeatedEqualityComparison,
+        (Pylint, "R1722") => rules::pylint::rules::SysExitAlias,
+        (Pylint, "R1730") => rules::pylint::rules::IfStmtMinMax,
+        (Pylint, "R1716") => rules::pylint::rules::BooleanChainedComparison,
+        (Pylint, "R1733") => rules::pylint::rules::UnnecessaryDictIndexLookup,
+        (Pylint, "R1736") => rules::pylint::rules::UnnecessaryListIndexLookup,
+        (Pylint, "R2004") => rules::pylint::rules::MagicValueComparison,
+        (Pylint, "R2044") => rules::pylint::rules::EmptyComment,
+        (Pylint, "R5501") => rules::pylint::rules::CollapsibleElseIf,
+        (Pylint, "R6104") => rules::pylint::rules::NonAugmentedAssignment,
+        (Pylint, "R6201") => rules::pylint::rules::LiteralMembership,
+        (Pylint, "R6301") => rules::pylint::rules::NoSelfUse,
         #[cfg(any(feature = "test-rules", test))]
-        (Pylint, "W0101") => (RuleGroup::Preview, rules::pylint::rules::UnreachableCode),
-        (Pylint, "W0108") => (RuleGroup::Preview, rules::pylint::rules::UnnecessaryLambda),
-        (Pylint, "W0177") => (RuleGroup::Stable, rules::pylint::rules::NanComparison),
-        (Pylint, "W0120") => (RuleGroup::Stable, rules::pylint::rules::UselessElseOnLoop),
-        (Pylint, "W0127") => (RuleGroup::Stable, rules::pylint::rules::SelfAssigningVariable),
-        (Pylint, "W0128") => (RuleGroup::Stable, rules::pylint::rules::RedeclaredAssignedName),
-        (Pylint, "W0129") => (RuleGroup::Stable, rules::pylint::rules::AssertOnStringLiteral),
-        (Pylint, "W0131") => (RuleGroup::Stable, rules::pylint::rules::NamedExprWithoutContext),
-        (Pylint, "W0133") => (RuleGroup::Stable, rules::pylint::rules::UselessExceptionStatement),
-        (Pylint, "W0211") => (RuleGroup::Stable, rules::pylint::rules::BadStaticmethodArgument),
-        (Pylint, "W0244") => (RuleGroup::Preview, rules::pylint::rules::RedefinedSlotsInSubclass),
-        (Pylint, "W0245") => (RuleGroup::Stable, rules::pylint::rules::SuperWithoutBrackets),
-        (Pylint, "W0406") => (RuleGroup::Stable, rules::pylint::rules::ImportSelf),
-        (Pylint, "W0602") => (RuleGroup::Stable, rules::pylint::rules::GlobalVariableNotAssigned),
-        (Pylint, "W0603") => (RuleGroup::Stable, rules::pylint::rules::GlobalStatement),
-        (Pylint, "W0604") => (RuleGroup::Stable, rules::pylint::rules::GlobalAtModuleLevel),
-        (Pylint, "W0642") => (RuleGroup::Stable, rules::pylint::rules::SelfOrClsAssignment),
-        (Pylint, "W0711") => (RuleGroup::Stable, rules::pylint::rules::BinaryOpException),
-        (Pylint, "W1501") => (RuleGroup::Stable, rules::pylint::rules::BadOpenMode),
-        (Pylint, "W1507") => (RuleGroup::Stable, rules::pylint::rules::ShallowCopyEnviron),
-        (Pylint, "W1508") => (RuleGroup::Stable, rules::pylint::rules::InvalidEnvvarDefault),
-        (Pylint, "W1509") => (RuleGroup::Stable, rules::pylint::rules::SubprocessPopenPreexecFn),
-        (Pylint, "W1510") => (RuleGroup::Stable, rules::pylint::rules::SubprocessRunWithoutCheck),
-        (Pylint, "W1514") => (RuleGroup::Preview, rules::pylint::rules::UnspecifiedEncoding),
-        (Pylint, "W1641") => (RuleGroup::Stable, rules::pylint::rules::EqWithoutHash),
-        (Pylint, "W2101") => (RuleGroup::Stable, rules::pylint::rules::UselessWithLock),
-        (Pylint, "W2901") => (RuleGroup::Stable, rules::pylint::rules::RedefinedLoopName),
-        (Pylint, "W3201") => (RuleGroup::Preview, rules::pylint::rules::BadDunderMethodName),
-        (Pylint, "W3301") => (RuleGroup::Stable, rules::pylint::rules::NestedMinMax),
+        (Pylint, "W0101") => rules::pylint::rules::UnreachableCode,
+        (Pylint, "W0108") => rules::pylint::rules::UnnecessaryLambda,
+        (Pylint, "W0177") => rules::pylint::rules::NanComparison,
+        (Pylint, "W0120") => rules::pylint::rules::UselessElseOnLoop,
+        (Pylint, "W0127") => rules::pylint::rules::SelfAssigningVariable,
+        (Pylint, "W0128") => rules::pylint::rules::RedeclaredAssignedName,
+        (Pylint, "W0129") => rules::pylint::rules::AssertOnStringLiteral,
+        (Pylint, "W0131") => rules::pylint::rules::NamedExprWithoutContext,
+        (Pylint, "W0133") => rules::pylint::rules::UselessExceptionStatement,
+        (Pylint, "W0211") => rules::pylint::rules::BadStaticmethodArgument,
+        (Pylint, "W0244") => rules::pylint::rules::RedefinedSlotsInSubclass,
+        (Pylint, "W0245") => rules::pylint::rules::SuperWithoutBrackets,
+        (Pylint, "W0406") => rules::pylint::rules::ImportSelf,
+        (Pylint, "W0602") => rules::pylint::rules::GlobalVariableNotAssigned,
+        (Pylint, "W0603") => rules::pylint::rules::GlobalStatement,
+        (Pylint, "W0604") => rules::pylint::rules::GlobalAtModuleLevel,
+        (Pylint, "W0642") => rules::pylint::rules::SelfOrClsAssignment,
+        (Pylint, "W0711") => rules::pylint::rules::BinaryOpException,
+        (Pylint, "W1501") => rules::pylint::rules::BadOpenMode,
+        (Pylint, "W1507") => rules::pylint::rules::ShallowCopyEnviron,
+        (Pylint, "W1508") => rules::pylint::rules::InvalidEnvvarDefault,
+        (Pylint, "W1509") => rules::pylint::rules::SubprocessPopenPreexecFn,
+        (Pylint, "W1510") => rules::pylint::rules::SubprocessRunWithoutCheck,
+        (Pylint, "W1514") => rules::pylint::rules::UnspecifiedEncoding,
+        (Pylint, "W1641") => rules::pylint::rules::EqWithoutHash,
+        (Pylint, "W2101") => rules::pylint::rules::UselessWithLock,
+        (Pylint, "W2901") => rules::pylint::rules::RedefinedLoopName,
+        (Pylint, "W3201") => rules::pylint::rules::BadDunderMethodName,
+        (Pylint, "W3301") => rules::pylint::rules::NestedMinMax,
 
         // flake8-async
-        (Flake8Async, "100") => (RuleGroup::Stable, rules::flake8_async::rules::CancelScopeNoCheckpoint),
-        (Flake8Async, "105") => (RuleGroup::Stable, rules::flake8_async::rules::TrioSyncCall),
-        (Flake8Async, "109") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncFunctionWithTimeout),
-        (Flake8Async, "110") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncBusyWait),
-        (Flake8Async, "115") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncZeroSleep),
-        (Flake8Async, "116") => (RuleGroup::Preview, rules::flake8_async::rules::LongSleepNotForever),
-        (Flake8Async, "210") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingHttpCallInAsyncFunction),
-        (Flake8Async, "220") => (RuleGroup::Stable, rules::flake8_async::rules::CreateSubprocessInAsyncFunction),
-        (Flake8Async, "221") => (RuleGroup::Stable, rules::flake8_async::rules::RunProcessInAsyncFunction),
-        (Flake8Async, "222") => (RuleGroup::Stable, rules::flake8_async::rules::WaitForProcessInAsyncFunction),
-        (Flake8Async, "230") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingOpenCallInAsyncFunction),
-        (Flake8Async, "251") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingSleepInAsyncFunction),
+        (Flake8Async, "100") => rules::flake8_async::rules::CancelScopeNoCheckpoint,
+        (Flake8Async, "105") => rules::flake8_async::rules::TrioSyncCall,
+        (Flake8Async, "109") => rules::flake8_async::rules::AsyncFunctionWithTimeout,
+        (Flake8Async, "110") => rules::flake8_async::rules::AsyncBusyWait,
+        (Flake8Async, "115") => rules::flake8_async::rules::AsyncZeroSleep,
+        (Flake8Async, "116") => rules::flake8_async::rules::LongSleepNotForever,
+        (Flake8Async, "210") => rules::flake8_async::rules::BlockingHttpCallInAsyncFunction,
+        (Flake8Async, "212") => rules::flake8_async::rules::BlockingHttpCallHttpxInAsyncFunction,
+        (Flake8Async, "220") => rules::flake8_async::rules::CreateSubprocessInAsyncFunction,
+        (Flake8Async, "221") => rules::flake8_async::rules::RunProcessInAsyncFunction,
+        (Flake8Async, "222") => rules::flake8_async::rules::WaitForProcessInAsyncFunction,
+        (Flake8Async, "230") => rules::flake8_async::rules::BlockingOpenCallInAsyncFunction,
+        (Flake8Async, "240") => rules::flake8_async::rules::BlockingPathMethodInAsyncFunction,
+        (Flake8Async, "250") => rules::flake8_async::rules::BlockingInputInAsyncFunction,
+        (Flake8Async, "251") => rules::flake8_async::rules::BlockingSleepInAsyncFunction,
 
         // flake8-builtins
-        (Flake8Builtins, "001") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinVariableShadowing),
-        (Flake8Builtins, "002") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinArgumentShadowing),
-        (Flake8Builtins, "003") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinAttributeShadowing),
-        (Flake8Builtins, "004") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinImportShadowing),
-        (Flake8Builtins, "005") => (RuleGroup::Stable, rules::flake8_builtins::rules::StdlibModuleShadowing),
-        (Flake8Builtins, "006") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinLambdaArgumentShadowing),
+        (Flake8Builtins, "001") => rules::flake8_builtins::rules::BuiltinVariableShadowing,
+        (Flake8Builtins, "002") => rules::flake8_builtins::rules::BuiltinArgumentShadowing,
+        (Flake8Builtins, "003") => rules::flake8_builtins::rules::BuiltinAttributeShadowing,
+        (Flake8Builtins, "004") => rules::flake8_builtins::rules::BuiltinImportShadowing,
+        (Flake8Builtins, "005") => rules::flake8_builtins::rules::StdlibModuleShadowing,
+        (Flake8Builtins, "006") => rules::flake8_builtins::rules::BuiltinLambdaArgumentShadowing,
 
         // flake8-bugbear
-        (Flake8Bugbear, "002") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UnaryPrefixIncrementDecrement),
-        (Flake8Bugbear, "003") => (RuleGroup::Stable, rules::flake8_bugbear::rules::AssignmentToOsEnviron),
-        (Flake8Bugbear, "004") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UnreliableCallableCheck),
-        (Flake8Bugbear, "005") => (RuleGroup::Stable, rules::flake8_bugbear::rules::StripWithMultiCharacters),
-        (Flake8Bugbear, "006") => (RuleGroup::Stable, rules::flake8_bugbear::rules::MutableArgumentDefault),
-        (Flake8Bugbear, "007") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UnusedLoopControlVariable),
-        (Flake8Bugbear, "008") => (RuleGroup::Stable, rules::flake8_bugbear::rules::FunctionCallInDefaultArgument),
-        (Flake8Bugbear, "009") => (RuleGroup::Stable, rules::flake8_bugbear::rules::GetAttrWithConstant),
-        (Flake8Bugbear, "010") => (RuleGroup::Stable, rules::flake8_bugbear::rules::SetAttrWithConstant),
-        (Flake8Bugbear, "011") => (RuleGroup::Stable, rules::flake8_bugbear::rules::AssertFalse),
-        (Flake8Bugbear, "012") => (RuleGroup::Stable, rules::flake8_bugbear::rules::JumpStatementInFinally),
-        (Flake8Bugbear, "013") => (RuleGroup::Stable, rules::flake8_bugbear::rules::RedundantTupleInExceptionHandler),
-        (Flake8Bugbear, "014") => (RuleGroup::Stable, rules::flake8_bugbear::rules::DuplicateHandlerException),
-        (Flake8Bugbear, "015") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UselessComparison),
-        (Flake8Bugbear, "016") => (RuleGroup::Stable, rules::flake8_bugbear::rules::RaiseLiteral),
-        (Flake8Bugbear, "017") => (RuleGroup::Stable, rules::flake8_bugbear::rules::AssertRaisesException),
-        (Flake8Bugbear, "018") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UselessExpression),
-        (Flake8Bugbear, "019") => (RuleGroup::Stable, rules::flake8_bugbear::rules::CachedInstanceMethod),
-        (Flake8Bugbear, "020") => (RuleGroup::Stable, rules::flake8_bugbear::rules::LoopVariableOverridesIterator),
-        (Flake8Bugbear, "021") => (RuleGroup::Stable, rules::flake8_bugbear::rules::FStringDocstring),
-        (Flake8Bugbear, "022") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UselessContextlibSuppress),
-        (Flake8Bugbear, "023") => (RuleGroup::Stable, rules::flake8_bugbear::rules::FunctionUsesLoopVariable),
-        (Flake8Bugbear, "024") => (RuleGroup::Stable, rules::flake8_bugbear::rules::AbstractBaseClassWithoutAbstractMethod),
-        (Flake8Bugbear, "025") => (RuleGroup::Stable, rules::flake8_bugbear::rules::DuplicateTryBlockException),
-        (Flake8Bugbear, "026") => (RuleGroup::Stable, rules::flake8_bugbear::rules::StarArgUnpackingAfterKeywordArg),
-        (Flake8Bugbear, "027") => (RuleGroup::Stable, rules::flake8_bugbear::rules::EmptyMethodWithoutAbstractDecorator),
-        (Flake8Bugbear, "028") => (RuleGroup::Stable, rules::flake8_bugbear::rules::NoExplicitStacklevel),
-        (Flake8Bugbear, "029") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ExceptWithEmptyTuple),
-        (Flake8Bugbear, "030") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ExceptWithNonExceptionClasses),
-        (Flake8Bugbear, "031") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ReuseOfGroupbyGenerator),
-        (Flake8Bugbear, "032") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UnintentionalTypeAnnotation),
-        (Flake8Bugbear, "033") => (RuleGroup::Stable, rules::flake8_bugbear::rules::DuplicateValue),
-        (Flake8Bugbear, "034") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ReSubPositionalArgs),
-        (Flake8Bugbear, "035") => (RuleGroup::Stable, rules::flake8_bugbear::rules::StaticKeyDictComprehension),
-        (Flake8Bugbear, "039") => (RuleGroup::Stable, rules::flake8_bugbear::rules::MutableContextvarDefault),
-        (Flake8Bugbear, "901") => (RuleGroup::Preview, rules::flake8_bugbear::rules::ReturnInGenerator),
-        (Flake8Bugbear, "903") => (RuleGroup::Preview, rules::flake8_bugbear::rules::ClassAsDataStructure),
-        (Flake8Bugbear, "904") => (RuleGroup::Stable, rules::flake8_bugbear::rules::RaiseWithoutFromInsideExcept),
-        (Flake8Bugbear, "905") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ZipWithoutExplicitStrict),
-        (Flake8Bugbear, "909") => (RuleGroup::Preview, rules::flake8_bugbear::rules::LoopIteratorMutation),
-        (Flake8Bugbear, "911") => (RuleGroup::Stable, rules::flake8_bugbear::rules::BatchedWithoutExplicitStrict),
+        (Flake8Bugbear, "002") => rules::flake8_bugbear::rules::UnaryPrefixIncrementDecrement,
+        (Flake8Bugbear, "003") => rules::flake8_bugbear::rules::AssignmentToOsEnviron,
+        (Flake8Bugbear, "004") => rules::flake8_bugbear::rules::UnreliableCallableCheck,
+        (Flake8Bugbear, "005") => rules::flake8_bugbear::rules::StripWithMultiCharacters,
+        (Flake8Bugbear, "006") => rules::flake8_bugbear::rules::MutableArgumentDefault,
+        (Flake8Bugbear, "007") => rules::flake8_bugbear::rules::UnusedLoopControlVariable,
+        (Flake8Bugbear, "008") => rules::flake8_bugbear::rules::FunctionCallInDefaultArgument,
+        (Flake8Bugbear, "009") => rules::flake8_bugbear::rules::GetAttrWithConstant,
+        (Flake8Bugbear, "010") => rules::flake8_bugbear::rules::SetAttrWithConstant,
+        (Flake8Bugbear, "011") => rules::flake8_bugbear::rules::AssertFalse,
+        (Flake8Bugbear, "012") => rules::flake8_bugbear::rules::JumpStatementInFinally,
+        (Flake8Bugbear, "013") => rules::flake8_bugbear::rules::RedundantTupleInExceptionHandler,
+        (Flake8Bugbear, "014") => rules::flake8_bugbear::rules::DuplicateHandlerException,
+        (Flake8Bugbear, "015") => rules::flake8_bugbear::rules::UselessComparison,
+        (Flake8Bugbear, "016") => rules::flake8_bugbear::rules::RaiseLiteral,
+        (Flake8Bugbear, "017") => rules::flake8_bugbear::rules::AssertRaisesException,
+        (Flake8Bugbear, "018") => rules::flake8_bugbear::rules::UselessExpression,
+        (Flake8Bugbear, "019") => rules::flake8_bugbear::rules::CachedInstanceMethod,
+        (Flake8Bugbear, "020") => rules::flake8_bugbear::rules::LoopVariableOverridesIterator,
+        (Flake8Bugbear, "021") => rules::flake8_bugbear::rules::FStringDocstring,
+        (Flake8Bugbear, "022") => rules::flake8_bugbear::rules::UselessContextlibSuppress,
+        (Flake8Bugbear, "023") => rules::flake8_bugbear::rules::FunctionUsesLoopVariable,
+        (Flake8Bugbear, "024") => rules::flake8_bugbear::rules::AbstractBaseClassWithoutAbstractMethod,
+        (Flake8Bugbear, "025") => rules::flake8_bugbear::rules::DuplicateTryBlockException,
+        (Flake8Bugbear, "026") => rules::flake8_bugbear::rules::StarArgUnpackingAfterKeywordArg,
+        (Flake8Bugbear, "027") => rules::flake8_bugbear::rules::EmptyMethodWithoutAbstractDecorator,
+        (Flake8Bugbear, "028") => rules::flake8_bugbear::rules::NoExplicitStacklevel,
+        (Flake8Bugbear, "029") => rules::flake8_bugbear::rules::ExceptWithEmptyTuple,
+        (Flake8Bugbear, "030") => rules::flake8_bugbear::rules::ExceptWithNonExceptionClasses,
+        (Flake8Bugbear, "031") => rules::flake8_bugbear::rules::ReuseOfGroupbyGenerator,
+        (Flake8Bugbear, "032") => rules::flake8_bugbear::rules::UnintentionalTypeAnnotation,
+        (Flake8Bugbear, "033") => rules::flake8_bugbear::rules::DuplicateValue,
+        (Flake8Bugbear, "034") => rules::flake8_bugbear::rules::ReSubPositionalArgs,
+        (Flake8Bugbear, "035") => rules::flake8_bugbear::rules::StaticKeyDictComprehension,
+        (Flake8Bugbear, "039") => rules::flake8_bugbear::rules::MutableContextvarDefault,
+        (Flake8Bugbear, "901") => rules::flake8_bugbear::rules::ReturnInGenerator,
+        (Flake8Bugbear, "903") => rules::flake8_bugbear::rules::ClassAsDataStructure,
+        (Flake8Bugbear, "904") => rules::flake8_bugbear::rules::RaiseWithoutFromInsideExcept,
+        (Flake8Bugbear, "905") => rules::flake8_bugbear::rules::ZipWithoutExplicitStrict,
+        (Flake8Bugbear, "909") => rules::flake8_bugbear::rules::LoopIteratorMutation,
+        (Flake8Bugbear, "911") => rules::flake8_bugbear::rules::BatchedWithoutExplicitStrict,
+        (Flake8Bugbear, "912") => rules::flake8_bugbear::rules::MapWithoutExplicitStrict,
 
         // flake8-blind-except
-        (Flake8BlindExcept, "001") => (RuleGroup::Stable, rules::flake8_blind_except::rules::BlindExcept),
+        (Flake8BlindExcept, "001") => rules::flake8_blind_except::rules::BlindExcept,
 
         // flake8-comprehensions
-        (Flake8Comprehensions, "00") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryGeneratorList),
-        (Flake8Comprehensions, "01") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryGeneratorSet),
-        (Flake8Comprehensions, "02") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryGeneratorDict),
-        (Flake8Comprehensions, "03") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryListComprehensionSet),
-        (Flake8Comprehensions, "04") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryListComprehensionDict),
-        (Flake8Comprehensions, "05") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryLiteralSet),
-        (Flake8Comprehensions, "06") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryLiteralDict),
-        (Flake8Comprehensions, "08") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryCollectionCall),
-        (Flake8Comprehensions, "09") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinTupleCall),
-        (Flake8Comprehensions, "10") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinListCall),
-        (Flake8Comprehensions, "11") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryListCall),
-        (Flake8Comprehensions, "13") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryCallAroundSorted),
-        (Flake8Comprehensions, "14") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryDoubleCastOrProcess),
-        (Flake8Comprehensions, "15") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessarySubscriptReversal),
-        (Flake8Comprehensions, "16") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryComprehension),
-        (Flake8Comprehensions, "17") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryMap),
-        (Flake8Comprehensions, "18") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinDictCall),
-        (Flake8Comprehensions, "19") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryComprehensionInCall),
-        (Flake8Comprehensions, "20") => (RuleGroup::Stable, rules::flake8_comprehensions::rules::UnnecessaryDictComprehensionForIterable),
+        (Flake8Comprehensions, "00") => rules::flake8_comprehensions::rules::UnnecessaryGeneratorList,
+        (Flake8Comprehensions, "01") => rules::flake8_comprehensions::rules::UnnecessaryGeneratorSet,
+        (Flake8Comprehensions, "02") => rules::flake8_comprehensions::rules::UnnecessaryGeneratorDict,
+        (Flake8Comprehensions, "03") => rules::flake8_comprehensions::rules::UnnecessaryListComprehensionSet,
+        (Flake8Comprehensions, "04") => rules::flake8_comprehensions::rules::UnnecessaryListComprehensionDict,
+        (Flake8Comprehensions, "05") => rules::flake8_comprehensions::rules::UnnecessaryLiteralSet,
+        (Flake8Comprehensions, "06") => rules::flake8_comprehensions::rules::UnnecessaryLiteralDict,
+        (Flake8Comprehensions, "08") => rules::flake8_comprehensions::rules::UnnecessaryCollectionCall,
+        (Flake8Comprehensions, "09") => rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinTupleCall,
+        (Flake8Comprehensions, "10") => rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinListCall,
+        (Flake8Comprehensions, "11") => rules::flake8_comprehensions::rules::UnnecessaryListCall,
+        (Flake8Comprehensions, "13") => rules::flake8_comprehensions::rules::UnnecessaryCallAroundSorted,
+        (Flake8Comprehensions, "14") => rules::flake8_comprehensions::rules::UnnecessaryDoubleCastOrProcess,
+        (Flake8Comprehensions, "15") => rules::flake8_comprehensions::rules::UnnecessarySubscriptReversal,
+        (Flake8Comprehensions, "16") => rules::flake8_comprehensions::rules::UnnecessaryComprehension,
+        (Flake8Comprehensions, "17") => rules::flake8_comprehensions::rules::UnnecessaryMap,
+        (Flake8Comprehensions, "18") => rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinDictCall,
+        (Flake8Comprehensions, "19") => rules::flake8_comprehensions::rules::UnnecessaryComprehensionInCall,
+        (Flake8Comprehensions, "20") => rules::flake8_comprehensions::rules::UnnecessaryDictComprehensionForIterable,
 
         // flake8-debugger
-        (Flake8Debugger, "0") => (RuleGroup::Stable, rules::flake8_debugger::rules::Debugger),
+        (Flake8Debugger, "0") => rules::flake8_debugger::rules::Debugger,
 
         // mccabe
-        (McCabe, "1") => (RuleGroup::Stable, rules::mccabe::rules::ComplexStructure),
+        (McCabe, "1") => rules::mccabe::rules::ComplexStructure,
 
         // flake8-tidy-imports
-        (Flake8TidyImports, "251") => (RuleGroup::Stable, rules::flake8_tidy_imports::rules::BannedApi),
-        (Flake8TidyImports, "252") => (RuleGroup::Stable, rules::flake8_tidy_imports::rules::RelativeImports),
-        (Flake8TidyImports, "253") => (RuleGroup::Stable, rules::flake8_tidy_imports::rules::BannedModuleLevelImports),
+        (Flake8TidyImports, "251") => rules::flake8_tidy_imports::rules::BannedApi,
+        (Flake8TidyImports, "252") => rules::flake8_tidy_imports::rules::RelativeImports,
+        (Flake8TidyImports, "253") => rules::flake8_tidy_imports::rules::BannedModuleLevelImports,
 
         // flake8-return
-        (Flake8Return, "501") => (RuleGroup::Stable, rules::flake8_return::rules::UnnecessaryReturnNone),
-        (Flake8Return, "502") => (RuleGroup::Stable, rules::flake8_return::rules::ImplicitReturnValue),
-        (Flake8Return, "503") => (RuleGroup::Stable, rules::flake8_return::rules::ImplicitReturn),
-        (Flake8Return, "504") => (RuleGroup::Stable, rules::flake8_return::rules::UnnecessaryAssign),
-        (Flake8Return, "505") => (RuleGroup::Stable, rules::flake8_return::rules::SuperfluousElseReturn),
-        (Flake8Return, "506") => (RuleGroup::Stable, rules::flake8_return::rules::SuperfluousElseRaise),
-        (Flake8Return, "507") => (RuleGroup::Stable, rules::flake8_return::rules::SuperfluousElseContinue),
-        (Flake8Return, "508") => (RuleGroup::Stable, rules::flake8_return::rules::SuperfluousElseBreak),
+        (Flake8Return, "501") => rules::flake8_return::rules::UnnecessaryReturnNone,
+        (Flake8Return, "502") => rules::flake8_return::rules::ImplicitReturnValue,
+        (Flake8Return, "503") => rules::flake8_return::rules::ImplicitReturn,
+        (Flake8Return, "504") => rules::flake8_return::rules::UnnecessaryAssign,
+        (Flake8Return, "505") => rules::flake8_return::rules::SuperfluousElseReturn,
+        (Flake8Return, "506") => rules::flake8_return::rules::SuperfluousElseRaise,
+        (Flake8Return, "507") => rules::flake8_return::rules::SuperfluousElseContinue,
+        (Flake8Return, "508") => rules::flake8_return::rules::SuperfluousElseBreak,
 
         // flake8-gettext
-        (Flake8GetText, "001") => (RuleGroup::Stable, rules::flake8_gettext::rules::FStringInGetTextFuncCall),
-        (Flake8GetText, "002") => (RuleGroup::Stable, rules::flake8_gettext::rules::FormatInGetTextFuncCall),
-        (Flake8GetText, "003") => (RuleGroup::Stable, rules::flake8_gettext::rules::PrintfInGetTextFuncCall),
+        (Flake8GetText, "001") => rules::flake8_gettext::rules::FStringInGetTextFuncCall,
+        (Flake8GetText, "002") => rules::flake8_gettext::rules::FormatInGetTextFuncCall,
+        (Flake8GetText, "003") => rules::flake8_gettext::rules::PrintfInGetTextFuncCall,
 
         // flake8-implicit-str-concat
-        (Flake8ImplicitStrConcat, "001") => (RuleGroup::Stable, rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation),
-        (Flake8ImplicitStrConcat, "002") => (RuleGroup::Stable, rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation),
-        (Flake8ImplicitStrConcat, "003") => (RuleGroup::Stable, rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation),
+        (Flake8ImplicitStrConcat, "001") => rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation,
+        (Flake8ImplicitStrConcat, "002") => rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation,
+        (Flake8ImplicitStrConcat, "003") => rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation,
 
         // flake8-print
-        (Flake8Print, "1") => (RuleGroup::Stable, rules::flake8_print::rules::Print),
-        (Flake8Print, "3") => (RuleGroup::Stable, rules::flake8_print::rules::PPrint),
+        (Flake8Print, "1") => rules::flake8_print::rules::Print,
+        (Flake8Print, "3") => rules::flake8_print::rules::PPrint,
 
         // flake8-quotes
-        (Flake8Quotes, "000") => (RuleGroup::Stable, rules::flake8_quotes::rules::BadQuotesInlineString),
-        (Flake8Quotes, "001") => (RuleGroup::Stable, rules::flake8_quotes::rules::BadQuotesMultilineString),
-        (Flake8Quotes, "002") => (RuleGroup::Stable, rules::flake8_quotes::rules::BadQuotesDocstring),
-        (Flake8Quotes, "003") => (RuleGroup::Stable, rules::flake8_quotes::rules::AvoidableEscapedQuote),
-        (Flake8Quotes, "004") => (RuleGroup::Stable, rules::flake8_quotes::rules::UnnecessaryEscapedQuote),
+        (Flake8Quotes, "000") => rules::flake8_quotes::rules::BadQuotesInlineString,
+        (Flake8Quotes, "001") => rules::flake8_quotes::rules::BadQuotesMultilineString,
+        (Flake8Quotes, "002") => rules::flake8_quotes::rules::BadQuotesDocstring,
+        (Flake8Quotes, "003") => rules::flake8_quotes::rules::AvoidableEscapedQuote,
+        (Flake8Quotes, "004") => rules::flake8_quotes::rules::UnnecessaryEscapedQuote,
 
         // flake8-annotations
-        (Flake8Annotations, "001") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeFunctionArgument),
-        (Flake8Annotations, "002") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeArgs),
-        (Flake8Annotations, "003") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeKwargs),
+        (Flake8Annotations, "001") => rules::flake8_annotations::rules::MissingTypeFunctionArgument,
+        (Flake8Annotations, "002") => rules::flake8_annotations::rules::MissingTypeArgs,
+        (Flake8Annotations, "003") => rules::flake8_annotations::rules::MissingTypeKwargs,
         #[allow(deprecated)]
-        (Flake8Annotations, "101") => (RuleGroup::Removed, rules::flake8_annotations::rules::MissingTypeSelf),
+        (Flake8Annotations, "101") => rules::flake8_annotations::rules::MissingTypeSelf,
         #[allow(deprecated)]
-        (Flake8Annotations, "102") => (RuleGroup::Removed, rules::flake8_annotations::rules::MissingTypeCls),
-        (Flake8Annotations, "201") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypeUndocumentedPublicFunction),
-        (Flake8Annotations, "202") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypePrivateFunction),
-        (Flake8Annotations, "204") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypeSpecialMethod),
-        (Flake8Annotations, "205") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypeStaticMethod),
-        (Flake8Annotations, "206") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypeClassMethod),
-        (Flake8Annotations, "401") => (RuleGroup::Stable, rules::flake8_annotations::rules::AnyType),
+        (Flake8Annotations, "102") => rules::flake8_annotations::rules::MissingTypeCls,
+        (Flake8Annotations, "201") => rules::flake8_annotations::rules::MissingReturnTypeUndocumentedPublicFunction,
+        (Flake8Annotations, "202") => rules::flake8_annotations::rules::MissingReturnTypePrivateFunction,
+        (Flake8Annotations, "204") => rules::flake8_annotations::rules::MissingReturnTypeSpecialMethod,
+        (Flake8Annotations, "205") => rules::flake8_annotations::rules::MissingReturnTypeStaticMethod,
+        (Flake8Annotations, "206") => rules::flake8_annotations::rules::MissingReturnTypeClassMethod,
+        (Flake8Annotations, "401") => rules::flake8_annotations::rules::AnyType,
 
         // flake8-future-annotations
-        (Flake8FutureAnnotations, "100") => (RuleGroup::Stable, rules::flake8_future_annotations::rules::FutureRewritableTypeAnnotation),
-        (Flake8FutureAnnotations, "102") => (RuleGroup::Stable, rules::flake8_future_annotations::rules::FutureRequiredTypeAnnotation),
+        (Flake8FutureAnnotations, "100") => rules::flake8_future_annotations::rules::FutureRewritableTypeAnnotation,
+        (Flake8FutureAnnotations, "102") => rules::flake8_future_annotations::rules::FutureRequiredTypeAnnotation,
 
         // flake8-2020
-        (Flake82020, "101") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionSlice3),
-        (Flake82020, "102") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersion2),
-        (Flake82020, "103") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionCmpStr3),
-        (Flake82020, "201") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionInfo0Eq3),
-        (Flake82020, "202") => (RuleGroup::Stable, rules::flake8_2020::rules::SixPY3),
-        (Flake82020, "203") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionInfo1CmpInt),
-        (Flake82020, "204") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionInfoMinorCmpInt),
-        (Flake82020, "301") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersion0),
-        (Flake82020, "302") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionCmpStr10),
-        (Flake82020, "303") => (RuleGroup::Stable, rules::flake8_2020::rules::SysVersionSlice1),
+        (Flake82020, "101") => rules::flake8_2020::rules::SysVersionSlice3,
+        (Flake82020, "102") => rules::flake8_2020::rules::SysVersion2,
+        (Flake82020, "103") => rules::flake8_2020::rules::SysVersionCmpStr3,
+        (Flake82020, "201") => rules::flake8_2020::rules::SysVersionInfo0Eq3,
+        (Flake82020, "202") => rules::flake8_2020::rules::SixPY3,
+        (Flake82020, "203") => rules::flake8_2020::rules::SysVersionInfo1CmpInt,
+        (Flake82020, "204") => rules::flake8_2020::rules::SysVersionInfoMinorCmpInt,
+        (Flake82020, "301") => rules::flake8_2020::rules::SysVersion0,
+        (Flake82020, "302") => rules::flake8_2020::rules::SysVersionCmpStr10,
+        (Flake82020, "303") => rules::flake8_2020::rules::SysVersionSlice1,
 
         // flake8-simplify
-        (Flake8Simplify, "101") => (RuleGroup::Stable, rules::flake8_simplify::rules::DuplicateIsinstanceCall),
-        (Flake8Simplify, "102") => (RuleGroup::Stable, rules::flake8_simplify::rules::CollapsibleIf),
-        (Flake8Simplify, "103") => (RuleGroup::Stable, rules::flake8_simplify::rules::NeedlessBool),
-        (Flake8Simplify, "105") => (RuleGroup::Stable, rules::flake8_simplify::rules::SuppressibleException),
-        (Flake8Simplify, "107") => (RuleGroup::Stable, rules::flake8_simplify::rules::ReturnInTryExceptFinally),
-        (Flake8Simplify, "108") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfElseBlockInsteadOfIfExp),
-        (Flake8Simplify, "109") => (RuleGroup::Stable, rules::flake8_simplify::rules::CompareWithTuple),
-        (Flake8Simplify, "110") => (RuleGroup::Stable, rules::flake8_simplify::rules::ReimplementedBuiltin),
-        (Flake8Simplify, "112") => (RuleGroup::Stable, rules::flake8_simplify::rules::UncapitalizedEnvironmentVariables),
-        (Flake8Simplify, "113") => (RuleGroup::Stable, rules::flake8_simplify::rules::EnumerateForLoop),
-        (Flake8Simplify, "114") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfWithSameArms),
-        (Flake8Simplify, "115") => (RuleGroup::Stable, rules::flake8_simplify::rules::OpenFileWithContextHandler),
-        (Flake8Simplify, "116") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfElseBlockInsteadOfDictLookup),
-        (Flake8Simplify, "117") => (RuleGroup::Stable, rules::flake8_simplify::rules::MultipleWithStatements),
-        (Flake8Simplify, "118") => (RuleGroup::Stable, rules::flake8_simplify::rules::InDictKeys),
-        (Flake8Simplify, "201") => (RuleGroup::Stable, rules::flake8_simplify::rules::NegateEqualOp),
-        (Flake8Simplify, "202") => (RuleGroup::Stable, rules::flake8_simplify::rules::NegateNotEqualOp),
-        (Flake8Simplify, "208") => (RuleGroup::Stable, rules::flake8_simplify::rules::DoubleNegation),
-        (Flake8Simplify, "210") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfExprWithTrueFalse),
-        (Flake8Simplify, "211") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfExprWithFalseTrue),
-        (Flake8Simplify, "212") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfExprWithTwistedArms),
-        (Flake8Simplify, "220") => (RuleGroup::Stable, rules::flake8_simplify::rules::ExprAndNotExpr),
-        (Flake8Simplify, "221") => (RuleGroup::Stable, rules::flake8_simplify::rules::ExprOrNotExpr),
-        (Flake8Simplify, "222") => (RuleGroup::Stable, rules::flake8_simplify::rules::ExprOrTrue),
-        (Flake8Simplify, "223") => (RuleGroup::Stable, rules::flake8_simplify::rules::ExprAndFalse),
-        (Flake8Simplify, "300") => (RuleGroup::Stable, rules::flake8_simplify::rules::YodaConditions),
-        (Flake8Simplify, "401") => (RuleGroup::Stable, rules::flake8_simplify::rules::IfElseBlockInsteadOfDictGet),
-        (Flake8Simplify, "905") => (RuleGroup::Stable, rules::flake8_simplify::rules::SplitStaticString),
-        (Flake8Simplify, "910") => (RuleGroup::Stable, rules::flake8_simplify::rules::DictGetWithNoneDefault),
-        (Flake8Simplify, "911") => (RuleGroup::Stable, rules::flake8_simplify::rules::ZipDictKeysAndValues),
+        (Flake8Simplify, "101") => rules::flake8_simplify::rules::DuplicateIsinstanceCall,
+        (Flake8Simplify, "102") => rules::flake8_simplify::rules::CollapsibleIf,
+        (Flake8Simplify, "103") => rules::flake8_simplify::rules::NeedlessBool,
+        (Flake8Simplify, "105") => rules::flake8_simplify::rules::SuppressibleException,
+        (Flake8Simplify, "107") => rules::flake8_simplify::rules::ReturnInTryExceptFinally,
+        (Flake8Simplify, "108") => rules::flake8_simplify::rules::IfElseBlockInsteadOfIfExp,
+        (Flake8Simplify, "109") => rules::flake8_simplify::rules::CompareWithTuple,
+        (Flake8Simplify, "110") => rules::flake8_simplify::rules::ReimplementedBuiltin,
+        (Flake8Simplify, "112") => rules::flake8_simplify::rules::UncapitalizedEnvironmentVariables,
+        (Flake8Simplify, "113") => rules::flake8_simplify::rules::EnumerateForLoop,
+        (Flake8Simplify, "114") => rules::flake8_simplify::rules::IfWithSameArms,
+        (Flake8Simplify, "115") => rules::flake8_simplify::rules::OpenFileWithContextHandler,
+        (Flake8Simplify, "116") => rules::flake8_simplify::rules::IfElseBlockInsteadOfDictLookup,
+        (Flake8Simplify, "117") => rules::flake8_simplify::rules::MultipleWithStatements,
+        (Flake8Simplify, "118") => rules::flake8_simplify::rules::InDictKeys,
+        (Flake8Simplify, "201") => rules::flake8_simplify::rules::NegateEqualOp,
+        (Flake8Simplify, "202") => rules::flake8_simplify::rules::NegateNotEqualOp,
+        (Flake8Simplify, "208") => rules::flake8_simplify::rules::DoubleNegation,
+        (Flake8Simplify, "210") => rules::flake8_simplify::rules::IfExprWithTrueFalse,
+        (Flake8Simplify, "211") => rules::flake8_simplify::rules::IfExprWithFalseTrue,
+        (Flake8Simplify, "212") => rules::flake8_simplify::rules::IfExprWithTwistedArms,
+        (Flake8Simplify, "220") => rules::flake8_simplify::rules::ExprAndNotExpr,
+        (Flake8Simplify, "221") => rules::flake8_simplify::rules::ExprOrNotExpr,
+        (Flake8Simplify, "222") => rules::flake8_simplify::rules::ExprOrTrue,
+        (Flake8Simplify, "223") => rules::flake8_simplify::rules::ExprAndFalse,
+        (Flake8Simplify, "300") => rules::flake8_simplify::rules::YodaConditions,
+        (Flake8Simplify, "401") => rules::flake8_simplify::rules::IfElseBlockInsteadOfDictGet,
+        (Flake8Simplify, "905") => rules::flake8_simplify::rules::SplitStaticString,
+        (Flake8Simplify, "910") => rules::flake8_simplify::rules::DictGetWithNoneDefault,
+        (Flake8Simplify, "911") => rules::flake8_simplify::rules::ZipDictKeysAndValues,
 
         // flake8-copyright
-        (Flake8Copyright, "001") => (RuleGroup::Preview, rules::flake8_copyright::rules::MissingCopyrightNotice),
+        (Flake8Copyright, "001") => rules::flake8_copyright::rules::MissingCopyrightNotice,
 
         // pyupgrade
-        (Pyupgrade, "001") => (RuleGroup::Stable, rules::pyupgrade::rules::UselessMetaclassType),
-        (Pyupgrade, "003") => (RuleGroup::Stable, rules::pyupgrade::rules::TypeOfPrimitive),
-        (Pyupgrade, "004") => (RuleGroup::Stable, rules::pyupgrade::rules::UselessObjectInheritance),
-        (Pyupgrade, "005") => (RuleGroup::Stable, rules::pyupgrade::rules::DeprecatedUnittestAlias),
-        (Pyupgrade, "006") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP585Annotation),
-        (Pyupgrade, "007") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP604AnnotationUnion),
-        (Pyupgrade, "008") => (RuleGroup::Stable, rules::pyupgrade::rules::SuperCallWithParameters),
-        (Pyupgrade, "009") => (RuleGroup::Stable, rules::pyupgrade::rules::UTF8EncodingDeclaration),
-        (Pyupgrade, "010") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryFutureImport),
-        (Pyupgrade, "011") => (RuleGroup::Stable, rules::pyupgrade::rules::LRUCacheWithoutParameters),
-        (Pyupgrade, "012") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryEncodeUTF8),
-        (Pyupgrade, "013") => (RuleGroup::Stable, rules::pyupgrade::rules::ConvertTypedDictFunctionalToClass),
-        (Pyupgrade, "014") => (RuleGroup::Stable, rules::pyupgrade::rules::ConvertNamedTupleFunctionalToClass),
-        (Pyupgrade, "015") => (RuleGroup::Stable, rules::pyupgrade::rules::RedundantOpenModes),
-        (Pyupgrade, "017") => (RuleGroup::Stable, rules::pyupgrade::rules::DatetimeTimezoneUTC),
-        (Pyupgrade, "018") => (RuleGroup::Stable, rules::pyupgrade::rules::NativeLiterals),
-        (Pyupgrade, "019") => (RuleGroup::Stable, rules::pyupgrade::rules::TypingTextStrAlias),
-        (Pyupgrade, "020") => (RuleGroup::Stable, rules::pyupgrade::rules::OpenAlias),
-        (Pyupgrade, "021") => (RuleGroup::Stable, rules::pyupgrade::rules::ReplaceUniversalNewlines),
-        (Pyupgrade, "022") => (RuleGroup::Stable, rules::pyupgrade::rules::ReplaceStdoutStderr),
-        (Pyupgrade, "023") => (RuleGroup::Stable, rules::pyupgrade::rules::DeprecatedCElementTree),
-        (Pyupgrade, "024") => (RuleGroup::Stable, rules::pyupgrade::rules::OSErrorAlias),
-        (Pyupgrade, "025") => (RuleGroup::Stable, rules::pyupgrade::rules::UnicodeKindPrefix),
-        (Pyupgrade, "026") => (RuleGroup::Stable, rules::pyupgrade::rules::DeprecatedMockImport),
-        (Pyupgrade, "027") => (RuleGroup::Removed, rules::pyupgrade::rules::UnpackedListComprehension),
-        (Pyupgrade, "028") => (RuleGroup::Stable, rules::pyupgrade::rules::YieldInForLoop),
-        (Pyupgrade, "029") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryBuiltinImport),
-        (Pyupgrade, "030") => (RuleGroup::Stable, rules::pyupgrade::rules::FormatLiterals),
-        (Pyupgrade, "031") => (RuleGroup::Stable, rules::pyupgrade::rules::PrintfStringFormatting),
-        (Pyupgrade, "032") => (RuleGroup::Stable, rules::pyupgrade::rules::FString),
-        (Pyupgrade, "033") => (RuleGroup::Stable, rules::pyupgrade::rules::LRUCacheWithMaxsizeNone),
-        (Pyupgrade, "034") => (RuleGroup::Stable, rules::pyupgrade::rules::ExtraneousParentheses),
-        (Pyupgrade, "035") => (RuleGroup::Stable, rules::pyupgrade::rules::DeprecatedImport),
-        (Pyupgrade, "036") => (RuleGroup::Stable, rules::pyupgrade::rules::OutdatedVersionBlock),
-        (Pyupgrade, "037") => (RuleGroup::Stable, rules::pyupgrade::rules::QuotedAnnotation),
-        (Pyupgrade, "038") => (RuleGroup::Deprecated, rules::pyupgrade::rules::NonPEP604Isinstance),
-        (Pyupgrade, "039") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryClassParentheses),
-        (Pyupgrade, "040") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695TypeAlias),
-        (Pyupgrade, "041") => (RuleGroup::Stable, rules::pyupgrade::rules::TimeoutErrorAlias),
-        (Pyupgrade, "042") => (RuleGroup::Preview, rules::pyupgrade::rules::ReplaceStrEnum),
-        (Pyupgrade, "043") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryDefaultTypeArgs),
-        (Pyupgrade, "044") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP646Unpack),
-        (Pyupgrade, "045") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP604AnnotationOptional),
-        (Pyupgrade, "046") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695GenericClass),
-        (Pyupgrade, "047") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695GenericFunction),
-        (Pyupgrade, "049") => (RuleGroup::Stable, rules::pyupgrade::rules::PrivateTypeParameter),
-        (Pyupgrade, "050") => (RuleGroup::Preview, rules::pyupgrade::rules::UselessClassMetaclassType),
+        (Pyupgrade, "001") => rules::pyupgrade::rules::UselessMetaclassType,
+        (Pyupgrade, "003") => rules::pyupgrade::rules::TypeOfPrimitive,
+        (Pyupgrade, "004") => rules::pyupgrade::rules::UselessObjectInheritance,
+        (Pyupgrade, "005") => rules::pyupgrade::rules::DeprecatedUnittestAlias,
+        (Pyupgrade, "006") => rules::pyupgrade::rules::NonPEP585Annotation,
+        (Pyupgrade, "007") => rules::pyupgrade::rules::NonPEP604AnnotationUnion,
+        (Pyupgrade, "008") => rules::pyupgrade::rules::SuperCallWithParameters,
+        (Pyupgrade, "009") => rules::pyupgrade::rules::UTF8EncodingDeclaration,
+        (Pyupgrade, "010") => rules::pyupgrade::rules::UnnecessaryFutureImport,
+        (Pyupgrade, "011") => rules::pyupgrade::rules::LRUCacheWithoutParameters,
+        (Pyupgrade, "012") => rules::pyupgrade::rules::UnnecessaryEncodeUTF8,
+        (Pyupgrade, "013") => rules::pyupgrade::rules::ConvertTypedDictFunctionalToClass,
+        (Pyupgrade, "014") => rules::pyupgrade::rules::ConvertNamedTupleFunctionalToClass,
+        (Pyupgrade, "015") => rules::pyupgrade::rules::RedundantOpenModes,
+        (Pyupgrade, "017") => rules::pyupgrade::rules::DatetimeTimezoneUTC,
+        (Pyupgrade, "018") => rules::pyupgrade::rules::NativeLiterals,
+        (Pyupgrade, "019") => rules::pyupgrade::rules::TypingTextStrAlias,
+        (Pyupgrade, "020") => rules::pyupgrade::rules::OpenAlias,
+        (Pyupgrade, "021") => rules::pyupgrade::rules::ReplaceUniversalNewlines,
+        (Pyupgrade, "022") => rules::pyupgrade::rules::ReplaceStdoutStderr,
+        (Pyupgrade, "023") => rules::pyupgrade::rules::DeprecatedCElementTree,
+        (Pyupgrade, "024") => rules::pyupgrade::rules::OSErrorAlias,
+        (Pyupgrade, "025") => rules::pyupgrade::rules::UnicodeKindPrefix,
+        (Pyupgrade, "026") => rules::pyupgrade::rules::DeprecatedMockImport,
+        (Pyupgrade, "027") => rules::pyupgrade::rules::UnpackedListComprehension,
+        (Pyupgrade, "028") => rules::pyupgrade::rules::YieldInForLoop,
+        (Pyupgrade, "029") => rules::pyupgrade::rules::UnnecessaryBuiltinImport,
+        (Pyupgrade, "030") => rules::pyupgrade::rules::FormatLiterals,
+        (Pyupgrade, "031") => rules::pyupgrade::rules::PrintfStringFormatting,
+        (Pyupgrade, "032") => rules::pyupgrade::rules::FString,
+        (Pyupgrade, "033") => rules::pyupgrade::rules::LRUCacheWithMaxsizeNone,
+        (Pyupgrade, "034") => rules::pyupgrade::rules::ExtraneousParentheses,
+        (Pyupgrade, "035") => rules::pyupgrade::rules::DeprecatedImport,
+        (Pyupgrade, "036") => rules::pyupgrade::rules::OutdatedVersionBlock,
+        (Pyupgrade, "037") => rules::pyupgrade::rules::QuotedAnnotation,
+        (Pyupgrade, "038") => rules::pyupgrade::rules::NonPEP604Isinstance,
+        (Pyupgrade, "039") => rules::pyupgrade::rules::UnnecessaryClassParentheses,
+        (Pyupgrade, "040") => rules::pyupgrade::rules::NonPEP695TypeAlias,
+        (Pyupgrade, "041") => rules::pyupgrade::rules::TimeoutErrorAlias,
+        (Pyupgrade, "042") => rules::pyupgrade::rules::ReplaceStrEnum,
+        (Pyupgrade, "043") => rules::pyupgrade::rules::UnnecessaryDefaultTypeArgs,
+        (Pyupgrade, "044") => rules::pyupgrade::rules::NonPEP646Unpack,
+        (Pyupgrade, "045") => rules::pyupgrade::rules::NonPEP604AnnotationOptional,
+        (Pyupgrade, "046") => rules::pyupgrade::rules::NonPEP695GenericClass,
+        (Pyupgrade, "047") => rules::pyupgrade::rules::NonPEP695GenericFunction,
+        (Pyupgrade, "049") => rules::pyupgrade::rules::PrivateTypeParameter,
+        (Pyupgrade, "050") => rules::pyupgrade::rules::UselessClassMetaclassType,
 
         // pydocstyle
-        (Pydocstyle, "100") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicModule),
-        (Pydocstyle, "101") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicClass),
-        (Pydocstyle, "102") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicMethod),
-        (Pydocstyle, "103") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicFunction),
-        (Pydocstyle, "104") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicPackage),
-        (Pydocstyle, "105") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedMagicMethod),
-        (Pydocstyle, "106") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicNestedClass),
-        (Pydocstyle, "107") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicInit),
-        (Pydocstyle, "200") => (RuleGroup::Stable, rules::pydocstyle::rules::UnnecessaryMultilineDocstring),
-        (Pydocstyle, "201") => (RuleGroup::Stable, rules::pydocstyle::rules::BlankLineBeforeFunction),
-        (Pydocstyle, "202") => (RuleGroup::Stable, rules::pydocstyle::rules::BlankLineAfterFunction),
-        (Pydocstyle, "203") => (RuleGroup::Stable, rules::pydocstyle::rules::IncorrectBlankLineBeforeClass),
-        (Pydocstyle, "204") => (RuleGroup::Stable, rules::pydocstyle::rules::IncorrectBlankLineAfterClass),
-        (Pydocstyle, "205") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingBlankLineAfterSummary),
-        (Pydocstyle, "206") => (RuleGroup::Stable, rules::pydocstyle::rules::DocstringTabIndentation),
-        (Pydocstyle, "207") => (RuleGroup::Stable, rules::pydocstyle::rules::UnderIndentation),
-        (Pydocstyle, "208") => (RuleGroup::Stable, rules::pydocstyle::rules::OverIndentation),
-        (Pydocstyle, "209") => (RuleGroup::Stable, rules::pydocstyle::rules::NewLineAfterLastParagraph),
-        (Pydocstyle, "210") => (RuleGroup::Stable, rules::pydocstyle::rules::SurroundingWhitespace),
-        (Pydocstyle, "211") => (RuleGroup::Stable, rules::pydocstyle::rules::BlankLineBeforeClass),
-        (Pydocstyle, "212") => (RuleGroup::Stable, rules::pydocstyle::rules::MultiLineSummaryFirstLine),
-        (Pydocstyle, "213") => (RuleGroup::Stable, rules::pydocstyle::rules::MultiLineSummarySecondLine),
-        (Pydocstyle, "214") => (RuleGroup::Stable, rules::pydocstyle::rules::OverindentedSection),
-        (Pydocstyle, "215") => (RuleGroup::Stable, rules::pydocstyle::rules::OverindentedSectionUnderline),
-        (Pydocstyle, "300") => (RuleGroup::Stable, rules::pydocstyle::rules::TripleSingleQuotes),
-        (Pydocstyle, "301") => (RuleGroup::Stable, rules::pydocstyle::rules::EscapeSequenceInDocstring),
-        (Pydocstyle, "400") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingTrailingPeriod),
-        (Pydocstyle, "401") => (RuleGroup::Stable, rules::pydocstyle::rules::NonImperativeMood),
-        (Pydocstyle, "402") => (RuleGroup::Stable, rules::pydocstyle::rules::SignatureInDocstring),
-        (Pydocstyle, "403") => (RuleGroup::Stable, rules::pydocstyle::rules::FirstWordUncapitalized),
-        (Pydocstyle, "404") => (RuleGroup::Stable, rules::pydocstyle::rules::DocstringStartsWithThis),
-        (Pydocstyle, "405") => (RuleGroup::Stable, rules::pydocstyle::rules::NonCapitalizedSectionName),
-        (Pydocstyle, "406") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingNewLineAfterSectionName),
-        (Pydocstyle, "407") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingDashedUnderlineAfterSection),
-        (Pydocstyle, "408") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingSectionUnderlineAfterName),
-        (Pydocstyle, "409") => (RuleGroup::Stable, rules::pydocstyle::rules::MismatchedSectionUnderlineLength),
-        (Pydocstyle, "410") => (RuleGroup::Stable, rules::pydocstyle::rules::NoBlankLineAfterSection),
-        (Pydocstyle, "411") => (RuleGroup::Stable, rules::pydocstyle::rules::NoBlankLineBeforeSection),
-        (Pydocstyle, "412") => (RuleGroup::Stable, rules::pydocstyle::rules::BlankLinesBetweenHeaderAndContent),
-        (Pydocstyle, "413") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingBlankLineAfterLastSection),
-        (Pydocstyle, "414") => (RuleGroup::Stable, rules::pydocstyle::rules::EmptyDocstringSection),
-        (Pydocstyle, "415") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingTerminalPunctuation),
-        (Pydocstyle, "416") => (RuleGroup::Stable, rules::pydocstyle::rules::MissingSectionNameColon),
-        (Pydocstyle, "417") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedParam),
-        (Pydocstyle, "418") => (RuleGroup::Stable, rules::pydocstyle::rules::OverloadWithDocstring),
-        (Pydocstyle, "419") => (RuleGroup::Stable, rules::pydocstyle::rules::EmptyDocstring),
+        (Pydocstyle, "100") => rules::pydocstyle::rules::UndocumentedPublicModule,
+        (Pydocstyle, "101") => rules::pydocstyle::rules::UndocumentedPublicClass,
+        (Pydocstyle, "102") => rules::pydocstyle::rules::UndocumentedPublicMethod,
+        (Pydocstyle, "103") => rules::pydocstyle::rules::UndocumentedPublicFunction,
+        (Pydocstyle, "104") => rules::pydocstyle::rules::UndocumentedPublicPackage,
+        (Pydocstyle, "105") => rules::pydocstyle::rules::UndocumentedMagicMethod,
+        (Pydocstyle, "106") => rules::pydocstyle::rules::UndocumentedPublicNestedClass,
+        (Pydocstyle, "107") => rules::pydocstyle::rules::UndocumentedPublicInit,
+        (Pydocstyle, "200") => rules::pydocstyle::rules::UnnecessaryMultilineDocstring,
+        (Pydocstyle, "201") => rules::pydocstyle::rules::BlankLineBeforeFunction,
+        (Pydocstyle, "202") => rules::pydocstyle::rules::BlankLineAfterFunction,
+        (Pydocstyle, "203") => rules::pydocstyle::rules::IncorrectBlankLineBeforeClass,
+        (Pydocstyle, "204") => rules::pydocstyle::rules::IncorrectBlankLineAfterClass,
+        (Pydocstyle, "205") => rules::pydocstyle::rules::MissingBlankLineAfterSummary,
+        (Pydocstyle, "206") => rules::pydocstyle::rules::DocstringTabIndentation,
+        (Pydocstyle, "207") => rules::pydocstyle::rules::UnderIndentation,
+        (Pydocstyle, "208") => rules::pydocstyle::rules::OverIndentation,
+        (Pydocstyle, "209") => rules::pydocstyle::rules::NewLineAfterLastParagraph,
+        (Pydocstyle, "210") => rules::pydocstyle::rules::SurroundingWhitespace,
+        (Pydocstyle, "211") => rules::pydocstyle::rules::BlankLineBeforeClass,
+        (Pydocstyle, "212") => rules::pydocstyle::rules::MultiLineSummaryFirstLine,
+        (Pydocstyle, "213") => rules::pydocstyle::rules::MultiLineSummarySecondLine,
+        (Pydocstyle, "214") => rules::pydocstyle::rules::OverindentedSection,
+        (Pydocstyle, "215") => rules::pydocstyle::rules::OverindentedSectionUnderline,
+        (Pydocstyle, "300") => rules::pydocstyle::rules::TripleSingleQuotes,
+        (Pydocstyle, "301") => rules::pydocstyle::rules::EscapeSequenceInDocstring,
+        (Pydocstyle, "400") => rules::pydocstyle::rules::MissingTrailingPeriod,
+        (Pydocstyle, "401") => rules::pydocstyle::rules::NonImperativeMood,
+        (Pydocstyle, "402") => rules::pydocstyle::rules::SignatureInDocstring,
+        (Pydocstyle, "403") => rules::pydocstyle::rules::FirstWordUncapitalized,
+        (Pydocstyle, "404") => rules::pydocstyle::rules::DocstringStartsWithThis,
+        (Pydocstyle, "405") => rules::pydocstyle::rules::NonCapitalizedSectionName,
+        (Pydocstyle, "406") => rules::pydocstyle::rules::MissingNewLineAfterSectionName,
+        (Pydocstyle, "407") => rules::pydocstyle::rules::MissingDashedUnderlineAfterSection,
+        (Pydocstyle, "408") => rules::pydocstyle::rules::MissingSectionUnderlineAfterName,
+        (Pydocstyle, "409") => rules::pydocstyle::rules::MismatchedSectionUnderlineLength,
+        (Pydocstyle, "410") => rules::pydocstyle::rules::NoBlankLineAfterSection,
+        (Pydocstyle, "411") => rules::pydocstyle::rules::NoBlankLineBeforeSection,
+        (Pydocstyle, "412") => rules::pydocstyle::rules::BlankLinesBetweenHeaderAndContent,
+        (Pydocstyle, "413") => rules::pydocstyle::rules::MissingBlankLineAfterLastSection,
+        (Pydocstyle, "414") => rules::pydocstyle::rules::EmptyDocstringSection,
+        (Pydocstyle, "415") => rules::pydocstyle::rules::MissingTerminalPunctuation,
+        (Pydocstyle, "416") => rules::pydocstyle::rules::MissingSectionNameColon,
+        (Pydocstyle, "417") => rules::pydocstyle::rules::UndocumentedParam,
+        (Pydocstyle, "418") => rules::pydocstyle::rules::OverloadWithDocstring,
+        (Pydocstyle, "419") => rules::pydocstyle::rules::EmptyDocstring,
 
         // pep8-naming
-        (PEP8Naming, "801") => (RuleGroup::Stable, rules::pep8_naming::rules::InvalidClassName),
-        (PEP8Naming, "802") => (RuleGroup::Stable, rules::pep8_naming::rules::InvalidFunctionName),
-        (PEP8Naming, "803") => (RuleGroup::Stable, rules::pep8_naming::rules::InvalidArgumentName),
-        (PEP8Naming, "804") => (RuleGroup::Stable, rules::pep8_naming::rules::InvalidFirstArgumentNameForClassMethod),
-        (PEP8Naming, "805") => (RuleGroup::Stable, rules::pep8_naming::rules::InvalidFirstArgumentNameForMethod),
-        (PEP8Naming, "806") => (RuleGroup::Stable, rules::pep8_naming::rules::NonLowercaseVariableInFunction),
-        (PEP8Naming, "807") => (RuleGroup::Stable, rules::pep8_naming::rules::DunderFunctionName),
-        (PEP8Naming, "811") => (RuleGroup::Stable, rules::pep8_naming::rules::ConstantImportedAsNonConstant),
-        (PEP8Naming, "812") => (RuleGroup::Stable, rules::pep8_naming::rules::LowercaseImportedAsNonLowercase),
-        (PEP8Naming, "813") => (RuleGroup::Stable, rules::pep8_naming::rules::CamelcaseImportedAsLowercase),
-        (PEP8Naming, "814") => (RuleGroup::Stable, rules::pep8_naming::rules::CamelcaseImportedAsConstant),
-        (PEP8Naming, "815") => (RuleGroup::Stable, rules::pep8_naming::rules::MixedCaseVariableInClassScope),
-        (PEP8Naming, "816") => (RuleGroup::Stable, rules::pep8_naming::rules::MixedCaseVariableInGlobalScope),
-        (PEP8Naming, "817") => (RuleGroup::Stable, rules::pep8_naming::rules::CamelcaseImportedAsAcronym),
-        (PEP8Naming, "818") => (RuleGroup::Stable, rules::pep8_naming::rules::ErrorSuffixOnExceptionName),
-        (PEP8Naming, "999") => (RuleGroup::Stable, rules::pep8_naming::rules::InvalidModuleName),
+        (PEP8Naming, "801") => rules::pep8_naming::rules::InvalidClassName,
+        (PEP8Naming, "802") => rules::pep8_naming::rules::InvalidFunctionName,
+        (PEP8Naming, "803") => rules::pep8_naming::rules::InvalidArgumentName,
+        (PEP8Naming, "804") => rules::pep8_naming::rules::InvalidFirstArgumentNameForClassMethod,
+        (PEP8Naming, "805") => rules::pep8_naming::rules::InvalidFirstArgumentNameForMethod,
+        (PEP8Naming, "806") => rules::pep8_naming::rules::NonLowercaseVariableInFunction,
+        (PEP8Naming, "807") => rules::pep8_naming::rules::DunderFunctionName,
+        (PEP8Naming, "811") => rules::pep8_naming::rules::ConstantImportedAsNonConstant,
+        (PEP8Naming, "812") => rules::pep8_naming::rules::LowercaseImportedAsNonLowercase,
+        (PEP8Naming, "813") => rules::pep8_naming::rules::CamelcaseImportedAsLowercase,
+        (PEP8Naming, "814") => rules::pep8_naming::rules::CamelcaseImportedAsConstant,
+        (PEP8Naming, "815") => rules::pep8_naming::rules::MixedCaseVariableInClassScope,
+        (PEP8Naming, "816") => rules::pep8_naming::rules::MixedCaseVariableInGlobalScope,
+        (PEP8Naming, "817") => rules::pep8_naming::rules::CamelcaseImportedAsAcronym,
+        (PEP8Naming, "818") => rules::pep8_naming::rules::ErrorSuffixOnExceptionName,
+        (PEP8Naming, "999") => rules::pep8_naming::rules::InvalidModuleName,
 
         // isort
-        (Isort, "001") => (RuleGroup::Stable, rules::isort::rules::UnsortedImports),
-        (Isort, "002") => (RuleGroup::Stable, rules::isort::rules::MissingRequiredImport),
+        (Isort, "001") => rules::isort::rules::UnsortedImports,
+        (Isort, "002") => rules::isort::rules::MissingRequiredImport,
 
         // eradicate
-        (Eradicate, "001") => (RuleGroup::Stable, rules::eradicate::rules::CommentedOutCode),
+        (Eradicate, "001") => rules::eradicate::rules::CommentedOutCode,
 
         // flake8-bandit
-        (Flake8Bandit, "101") => (RuleGroup::Stable, rules::flake8_bandit::rules::Assert),
-        (Flake8Bandit, "102") => (RuleGroup::Stable, rules::flake8_bandit::rules::ExecBuiltin),
-        (Flake8Bandit, "103") => (RuleGroup::Stable, rules::flake8_bandit::rules::BadFilePermissions),
-        (Flake8Bandit, "104") => (RuleGroup::Stable, rules::flake8_bandit::rules::HardcodedBindAllInterfaces),
-        (Flake8Bandit, "105") => (RuleGroup::Stable, rules::flake8_bandit::rules::HardcodedPasswordString),
-        (Flake8Bandit, "106") => (RuleGroup::Stable, rules::flake8_bandit::rules::HardcodedPasswordFuncArg),
-        (Flake8Bandit, "107") => (RuleGroup::Stable, rules::flake8_bandit::rules::HardcodedPasswordDefault),
-        (Flake8Bandit, "108") => (RuleGroup::Stable, rules::flake8_bandit::rules::HardcodedTempFile),
-        (Flake8Bandit, "110") => (RuleGroup::Stable, rules::flake8_bandit::rules::TryExceptPass),
-        (Flake8Bandit, "112") => (RuleGroup::Stable, rules::flake8_bandit::rules::TryExceptContinue),
-        (Flake8Bandit, "113") => (RuleGroup::Stable, rules::flake8_bandit::rules::RequestWithoutTimeout),
-        (Flake8Bandit, "201") => (RuleGroup::Stable, rules::flake8_bandit::rules::FlaskDebugTrue),
-        (Flake8Bandit, "202") => (RuleGroup::Stable, rules::flake8_bandit::rules::TarfileUnsafeMembers),
-        (Flake8Bandit, "301") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousPickleUsage),
-        (Flake8Bandit, "302") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousMarshalUsage),
-        (Flake8Bandit, "303") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousInsecureHashUsage),
-        (Flake8Bandit, "304") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousInsecureCipherUsage),
-        (Flake8Bandit, "305") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousInsecureCipherModeUsage),
-        (Flake8Bandit, "306") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousMktempUsage),
-        (Flake8Bandit, "307") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousEvalUsage),
-        (Flake8Bandit, "308") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousMarkSafeUsage),
-        (Flake8Bandit, "310") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousURLOpenUsage),
-        (Flake8Bandit, "311") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousNonCryptographicRandomUsage),
-        (Flake8Bandit, "312") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousTelnetUsage),
-        (Flake8Bandit, "313") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLCElementTreeUsage),
-        (Flake8Bandit, "314") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLElementTreeUsage),
-        (Flake8Bandit, "315") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLExpatReaderUsage),
-        (Flake8Bandit, "316") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLExpatBuilderUsage),
-        (Flake8Bandit, "317") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLSaxUsage),
-        (Flake8Bandit, "318") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLMiniDOMUsage),
-        (Flake8Bandit, "319") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousXMLPullDOMUsage),
-        (Flake8Bandit, "320") => (RuleGroup::Removed, rules::flake8_bandit::rules::SuspiciousXMLETreeUsage),
-        (Flake8Bandit, "321") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousFTPLibUsage),
-        (Flake8Bandit, "323") => (RuleGroup::Stable, rules::flake8_bandit::rules::SuspiciousUnverifiedContextUsage),
-        (Flake8Bandit, "324") => (RuleGroup::Stable, rules::flake8_bandit::rules::HashlibInsecureHashFunction),
-        (Flake8Bandit, "401") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousTelnetlibImport),
-        (Flake8Bandit, "402") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousFtplibImport),
-        (Flake8Bandit, "403") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousPickleImport),
-        (Flake8Bandit, "404") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousSubprocessImport),
-        (Flake8Bandit, "405") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousXmlEtreeImport),
-        (Flake8Bandit, "406") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousXmlSaxImport),
-        (Flake8Bandit, "407") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousXmlExpatImport),
-        (Flake8Bandit, "408") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousXmlMinidomImport),
-        (Flake8Bandit, "409") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousXmlPulldomImport),
-        (Flake8Bandit, "410") => (RuleGroup::Removed, rules::flake8_bandit::rules::SuspiciousLxmlImport),
-        (Flake8Bandit, "411") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousXmlrpcImport),
-        (Flake8Bandit, "412") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousHttpoxyImport),
-        (Flake8Bandit, "413") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousPycryptoImport),
-        (Flake8Bandit, "415") => (RuleGroup::Preview, rules::flake8_bandit::rules::SuspiciousPyghmiImport),
-        (Flake8Bandit, "501") => (RuleGroup::Stable, rules::flake8_bandit::rules::RequestWithNoCertValidation),
-        (Flake8Bandit, "502") => (RuleGroup::Stable, rules::flake8_bandit::rules::SslInsecureVersion),
-        (Flake8Bandit, "503") => (RuleGroup::Stable, rules::flake8_bandit::rules::SslWithBadDefaults),
-        (Flake8Bandit, "504") => (RuleGroup::Stable, rules::flake8_bandit::rules::SslWithNoVersion),
-        (Flake8Bandit, "505") => (RuleGroup::Stable, rules::flake8_bandit::rules::WeakCryptographicKey),
-        (Flake8Bandit, "506") => (RuleGroup::Stable, rules::flake8_bandit::rules::UnsafeYAMLLoad),
-        (Flake8Bandit, "507") => (RuleGroup::Stable, rules::flake8_bandit::rules::SSHNoHostKeyVerification),
-        (Flake8Bandit, "508") => (RuleGroup::Stable, rules::flake8_bandit::rules::SnmpInsecureVersion),
-        (Flake8Bandit, "509") => (RuleGroup::Stable, rules::flake8_bandit::rules::SnmpWeakCryptography),
-        (Flake8Bandit, "601") => (RuleGroup::Stable, rules::flake8_bandit::rules::ParamikoCall),
-        (Flake8Bandit, "602") => (RuleGroup::Stable, rules::flake8_bandit::rules::SubprocessPopenWithShellEqualsTrue),
-        (Flake8Bandit, "603") => (RuleGroup::Stable, rules::flake8_bandit::rules::SubprocessWithoutShellEqualsTrue),
-        (Flake8Bandit, "604") => (RuleGroup::Stable, rules::flake8_bandit::rules::CallWithShellEqualsTrue),
-        (Flake8Bandit, "605") => (RuleGroup::Stable, rules::flake8_bandit::rules::StartProcessWithAShell),
-        (Flake8Bandit, "606") => (RuleGroup::Stable, rules::flake8_bandit::rules::StartProcessWithNoShell),
-        (Flake8Bandit, "607") => (RuleGroup::Stable, rules::flake8_bandit::rules::StartProcessWithPartialPath),
-        (Flake8Bandit, "608") => (RuleGroup::Stable, rules::flake8_bandit::rules::HardcodedSQLExpression),
-        (Flake8Bandit, "609") => (RuleGroup::Stable, rules::flake8_bandit::rules::UnixCommandWildcardInjection),
-        (Flake8Bandit, "610") => (RuleGroup::Stable, rules::flake8_bandit::rules::DjangoExtra),
-        (Flake8Bandit, "611") => (RuleGroup::Stable, rules::flake8_bandit::rules::DjangoRawSql),
-        (Flake8Bandit, "612") => (RuleGroup::Stable, rules::flake8_bandit::rules::LoggingConfigInsecureListen),
-        (Flake8Bandit, "701") => (RuleGroup::Stable, rules::flake8_bandit::rules::Jinja2AutoescapeFalse),
-        (Flake8Bandit, "702") => (RuleGroup::Stable, rules::flake8_bandit::rules::MakoTemplates),
-        (Flake8Bandit, "704") => (RuleGroup::Stable, rules::flake8_bandit::rules::UnsafeMarkupUse),
+        (Flake8Bandit, "101") => rules::flake8_bandit::rules::Assert,
+        (Flake8Bandit, "102") => rules::flake8_bandit::rules::ExecBuiltin,
+        (Flake8Bandit, "103") => rules::flake8_bandit::rules::BadFilePermissions,
+        (Flake8Bandit, "104") => rules::flake8_bandit::rules::HardcodedBindAllInterfaces,
+        (Flake8Bandit, "105") => rules::flake8_bandit::rules::HardcodedPasswordString,
+        (Flake8Bandit, "106") => rules::flake8_bandit::rules::HardcodedPasswordFuncArg,
+        (Flake8Bandit, "107") => rules::flake8_bandit::rules::HardcodedPasswordDefault,
+        (Flake8Bandit, "108") => rules::flake8_bandit::rules::HardcodedTempFile,
+        (Flake8Bandit, "110") => rules::flake8_bandit::rules::TryExceptPass,
+        (Flake8Bandit, "112") => rules::flake8_bandit::rules::TryExceptContinue,
+        (Flake8Bandit, "113") => rules::flake8_bandit::rules::RequestWithoutTimeout,
+        (Flake8Bandit, "201") => rules::flake8_bandit::rules::FlaskDebugTrue,
+        (Flake8Bandit, "202") => rules::flake8_bandit::rules::TarfileUnsafeMembers,
+        (Flake8Bandit, "301") => rules::flake8_bandit::rules::SuspiciousPickleUsage,
+        (Flake8Bandit, "302") => rules::flake8_bandit::rules::SuspiciousMarshalUsage,
+        (Flake8Bandit, "303") => rules::flake8_bandit::rules::SuspiciousInsecureHashUsage,
+        (Flake8Bandit, "304") => rules::flake8_bandit::rules::SuspiciousInsecureCipherUsage,
+        (Flake8Bandit, "305") => rules::flake8_bandit::rules::SuspiciousInsecureCipherModeUsage,
+        (Flake8Bandit, "306") => rules::flake8_bandit::rules::SuspiciousMktempUsage,
+        (Flake8Bandit, "307") => rules::flake8_bandit::rules::SuspiciousEvalUsage,
+        (Flake8Bandit, "308") => rules::flake8_bandit::rules::SuspiciousMarkSafeUsage,
+        (Flake8Bandit, "310") => rules::flake8_bandit::rules::SuspiciousURLOpenUsage,
+        (Flake8Bandit, "311") => rules::flake8_bandit::rules::SuspiciousNonCryptographicRandomUsage,
+        (Flake8Bandit, "312") => rules::flake8_bandit::rules::SuspiciousTelnetUsage,
+        (Flake8Bandit, "313") => rules::flake8_bandit::rules::SuspiciousXMLCElementTreeUsage,
+        (Flake8Bandit, "314") => rules::flake8_bandit::rules::SuspiciousXMLElementTreeUsage,
+        (Flake8Bandit, "315") => rules::flake8_bandit::rules::SuspiciousXMLExpatReaderUsage,
+        (Flake8Bandit, "316") => rules::flake8_bandit::rules::SuspiciousXMLExpatBuilderUsage,
+        (Flake8Bandit, "317") => rules::flake8_bandit::rules::SuspiciousXMLSaxUsage,
+        (Flake8Bandit, "318") => rules::flake8_bandit::rules::SuspiciousXMLMiniDOMUsage,
+        (Flake8Bandit, "319") => rules::flake8_bandit::rules::SuspiciousXMLPullDOMUsage,
+        (Flake8Bandit, "320") => rules::flake8_bandit::rules::SuspiciousXMLETreeUsage,
+        (Flake8Bandit, "321") => rules::flake8_bandit::rules::SuspiciousFTPLibUsage,
+        (Flake8Bandit, "323") => rules::flake8_bandit::rules::SuspiciousUnverifiedContextUsage,
+        (Flake8Bandit, "324") => rules::flake8_bandit::rules::HashlibInsecureHashFunction,
+        (Flake8Bandit, "401") => rules::flake8_bandit::rules::SuspiciousTelnetlibImport,
+        (Flake8Bandit, "402") => rules::flake8_bandit::rules::SuspiciousFtplibImport,
+        (Flake8Bandit, "403") => rules::flake8_bandit::rules::SuspiciousPickleImport,
+        (Flake8Bandit, "404") => rules::flake8_bandit::rules::SuspiciousSubprocessImport,
+        (Flake8Bandit, "405") => rules::flake8_bandit::rules::SuspiciousXmlEtreeImport,
+        (Flake8Bandit, "406") => rules::flake8_bandit::rules::SuspiciousXmlSaxImport,
+        (Flake8Bandit, "407") => rules::flake8_bandit::rules::SuspiciousXmlExpatImport,
+        (Flake8Bandit, "408") => rules::flake8_bandit::rules::SuspiciousXmlMinidomImport,
+        (Flake8Bandit, "409") => rules::flake8_bandit::rules::SuspiciousXmlPulldomImport,
+        (Flake8Bandit, "410") => rules::flake8_bandit::rules::SuspiciousLxmlImport,
+        (Flake8Bandit, "411") => rules::flake8_bandit::rules::SuspiciousXmlrpcImport,
+        (Flake8Bandit, "412") => rules::flake8_bandit::rules::SuspiciousHttpoxyImport,
+        (Flake8Bandit, "413") => rules::flake8_bandit::rules::SuspiciousPycryptoImport,
+        (Flake8Bandit, "415") => rules::flake8_bandit::rules::SuspiciousPyghmiImport,
+        (Flake8Bandit, "501") => rules::flake8_bandit::rules::RequestWithNoCertValidation,
+        (Flake8Bandit, "502") => rules::flake8_bandit::rules::SslInsecureVersion,
+        (Flake8Bandit, "503") => rules::flake8_bandit::rules::SslWithBadDefaults,
+        (Flake8Bandit, "504") => rules::flake8_bandit::rules::SslWithNoVersion,
+        (Flake8Bandit, "505") => rules::flake8_bandit::rules::WeakCryptographicKey,
+        (Flake8Bandit, "506") => rules::flake8_bandit::rules::UnsafeYAMLLoad,
+        (Flake8Bandit, "507") => rules::flake8_bandit::rules::SSHNoHostKeyVerification,
+        (Flake8Bandit, "508") => rules::flake8_bandit::rules::SnmpInsecureVersion,
+        (Flake8Bandit, "509") => rules::flake8_bandit::rules::SnmpWeakCryptography,
+        (Flake8Bandit, "601") => rules::flake8_bandit::rules::ParamikoCall,
+        (Flake8Bandit, "602") => rules::flake8_bandit::rules::SubprocessPopenWithShellEqualsTrue,
+        (Flake8Bandit, "603") => rules::flake8_bandit::rules::SubprocessWithoutShellEqualsTrue,
+        (Flake8Bandit, "604") => rules::flake8_bandit::rules::CallWithShellEqualsTrue,
+        (Flake8Bandit, "605") => rules::flake8_bandit::rules::StartProcessWithAShell,
+        (Flake8Bandit, "606") => rules::flake8_bandit::rules::StartProcessWithNoShell,
+        (Flake8Bandit, "607") => rules::flake8_bandit::rules::StartProcessWithPartialPath,
+        (Flake8Bandit, "608") => rules::flake8_bandit::rules::HardcodedSQLExpression,
+        (Flake8Bandit, "609") => rules::flake8_bandit::rules::UnixCommandWildcardInjection,
+        (Flake8Bandit, "610") => rules::flake8_bandit::rules::DjangoExtra,
+        (Flake8Bandit, "611") => rules::flake8_bandit::rules::DjangoRawSql,
+        (Flake8Bandit, "612") => rules::flake8_bandit::rules::LoggingConfigInsecureListen,
+        (Flake8Bandit, "701") => rules::flake8_bandit::rules::Jinja2AutoescapeFalse,
+        (Flake8Bandit, "702") => rules::flake8_bandit::rules::MakoTemplates,
+        (Flake8Bandit, "704") => rules::flake8_bandit::rules::UnsafeMarkupUse,
 
         // flake8-boolean-trap
-        (Flake8BooleanTrap, "001") => (RuleGroup::Stable, rules::flake8_boolean_trap::rules::BooleanTypeHintPositionalArgument),
-        (Flake8BooleanTrap, "002") => (RuleGroup::Stable, rules::flake8_boolean_trap::rules::BooleanDefaultValuePositionalArgument),
-        (Flake8BooleanTrap, "003") => (RuleGroup::Stable, rules::flake8_boolean_trap::rules::BooleanPositionalValueInCall),
+        (Flake8BooleanTrap, "001") => rules::flake8_boolean_trap::rules::BooleanTypeHintPositionalArgument,
+        (Flake8BooleanTrap, "002") => rules::flake8_boolean_trap::rules::BooleanDefaultValuePositionalArgument,
+        (Flake8BooleanTrap, "003") => rules::flake8_boolean_trap::rules::BooleanPositionalValueInCall,
 
         // flake8-unused-arguments
-        (Flake8UnusedArguments, "001") => (RuleGroup::Stable, rules::flake8_unused_arguments::rules::UnusedFunctionArgument),
-        (Flake8UnusedArguments, "002") => (RuleGroup::Stable, rules::flake8_unused_arguments::rules::UnusedMethodArgument),
-        (Flake8UnusedArguments, "003") => (RuleGroup::Stable, rules::flake8_unused_arguments::rules::UnusedClassMethodArgument),
-        (Flake8UnusedArguments, "004") => (RuleGroup::Stable, rules::flake8_unused_arguments::rules::UnusedStaticMethodArgument),
-        (Flake8UnusedArguments, "005") => (RuleGroup::Stable, rules::flake8_unused_arguments::rules::UnusedLambdaArgument),
+        (Flake8UnusedArguments, "001") => rules::flake8_unused_arguments::rules::UnusedFunctionArgument,
+        (Flake8UnusedArguments, "002") => rules::flake8_unused_arguments::rules::UnusedMethodArgument,
+        (Flake8UnusedArguments, "003") => rules::flake8_unused_arguments::rules::UnusedClassMethodArgument,
+        (Flake8UnusedArguments, "004") => rules::flake8_unused_arguments::rules::UnusedStaticMethodArgument,
+        (Flake8UnusedArguments, "005") => rules::flake8_unused_arguments::rules::UnusedLambdaArgument,
 
         // flake8-import-conventions
-        (Flake8ImportConventions, "001") => (RuleGroup::Stable, rules::flake8_import_conventions::rules::UnconventionalImportAlias),
-        (Flake8ImportConventions, "002") => (RuleGroup::Stable, rules::flake8_import_conventions::rules::BannedImportAlias),
-        (Flake8ImportConventions, "003") => (RuleGroup::Stable, rules::flake8_import_conventions::rules::BannedImportFrom),
+        (Flake8ImportConventions, "001") => rules::flake8_import_conventions::rules::UnconventionalImportAlias,
+        (Flake8ImportConventions, "002") => rules::flake8_import_conventions::rules::BannedImportAlias,
+        (Flake8ImportConventions, "003") => rules::flake8_import_conventions::rules::BannedImportFrom,
 
         // flake8-datetimez
-        (Flake8Datetimez, "001") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeWithoutTzinfo),
-        (Flake8Datetimez, "002") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeToday),
-        (Flake8Datetimez, "003") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeUtcnow),
-        (Flake8Datetimez, "004") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeUtcfromtimestamp),
-        (Flake8Datetimez, "005") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeNowWithoutTzinfo),
-        (Flake8Datetimez, "006") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeFromtimestamp),
-        (Flake8Datetimez, "007") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDatetimeStrptimeWithoutZone),
-        (Flake8Datetimez, "011") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDateToday),
-        (Flake8Datetimez, "012") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDateFromtimestamp),
-        (Flake8Datetimez, "901") => (RuleGroup::Stable, rules::flake8_datetimez::rules::DatetimeMinMax),
+        (Flake8Datetimez, "001") => rules::flake8_datetimez::rules::CallDatetimeWithoutTzinfo,
+        (Flake8Datetimez, "002") => rules::flake8_datetimez::rules::CallDatetimeToday,
+        (Flake8Datetimez, "003") => rules::flake8_datetimez::rules::CallDatetimeUtcnow,
+        (Flake8Datetimez, "004") => rules::flake8_datetimez::rules::CallDatetimeUtcfromtimestamp,
+        (Flake8Datetimez, "005") => rules::flake8_datetimez::rules::CallDatetimeNowWithoutTzinfo,
+        (Flake8Datetimez, "006") => rules::flake8_datetimez::rules::CallDatetimeFromtimestamp,
+        (Flake8Datetimez, "007") => rules::flake8_datetimez::rules::CallDatetimeStrptimeWithoutZone,
+        (Flake8Datetimez, "011") => rules::flake8_datetimez::rules::CallDateToday,
+        (Flake8Datetimez, "012") => rules::flake8_datetimez::rules::CallDateFromtimestamp,
+        (Flake8Datetimez, "901") => rules::flake8_datetimez::rules::DatetimeMinMax,
 
         // pygrep-hooks
-        (PygrepHooks, "001") => (RuleGroup::Removed, rules::pygrep_hooks::rules::Eval),
-        (PygrepHooks, "002") => (RuleGroup::Removed, rules::pygrep_hooks::rules::DeprecatedLogWarn),
-        (PygrepHooks, "003") => (RuleGroup::Stable, rules::pygrep_hooks::rules::BlanketTypeIgnore),
-        (PygrepHooks, "004") => (RuleGroup::Stable, rules::pygrep_hooks::rules::BlanketNOQA),
-        (PygrepHooks, "005") => (RuleGroup::Stable, rules::pygrep_hooks::rules::InvalidMockAccess),
+        (PygrepHooks, "001") => rules::pygrep_hooks::rules::Eval,
+        (PygrepHooks, "002") => rules::pygrep_hooks::rules::DeprecatedLogWarn,
+        (PygrepHooks, "003") => rules::pygrep_hooks::rules::BlanketTypeIgnore,
+        (PygrepHooks, "004") => rules::pygrep_hooks::rules::BlanketNOQA,
+        (PygrepHooks, "005") => rules::pygrep_hooks::rules::InvalidMockAccess,
 
         // pandas-vet
-        (PandasVet, "002") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfInplaceArgument),
-        (PandasVet, "003") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotIsNull),
-        (PandasVet, "004") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotNotNull),
-        (PandasVet, "007") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotIx),
-        (PandasVet, "008") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotAt),
-        (PandasVet, "009") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotIat),
-        (PandasVet, "010") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotPivotOrUnstack),
-        (PandasVet, "011") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotValues),
-        (PandasVet, "012") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotReadTable),
-        (PandasVet, "013") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotStack),
-        (PandasVet, "015") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfPdMerge),
-        (PandasVet, "101") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasNuniqueConstantSeriesCheck),
-        (PandasVet, "901") => (RuleGroup::Deprecated, rules::pandas_vet::rules::PandasDfVariableName),
+        (PandasVet, "002") => rules::pandas_vet::rules::PandasUseOfInplaceArgument,
+        (PandasVet, "003") => rules::pandas_vet::rules::PandasUseOfDotIsNull,
+        (PandasVet, "004") => rules::pandas_vet::rules::PandasUseOfDotNotNull,
+        (PandasVet, "007") => rules::pandas_vet::rules::PandasUseOfDotIx,
+        (PandasVet, "008") => rules::pandas_vet::rules::PandasUseOfDotAt,
+        (PandasVet, "009") => rules::pandas_vet::rules::PandasUseOfDotIat,
+        (PandasVet, "010") => rules::pandas_vet::rules::PandasUseOfDotPivotOrUnstack,
+        (PandasVet, "011") => rules::pandas_vet::rules::PandasUseOfDotValues,
+        (PandasVet, "012") => rules::pandas_vet::rules::PandasUseOfDotReadTable,
+        (PandasVet, "013") => rules::pandas_vet::rules::PandasUseOfDotStack,
+        (PandasVet, "015") => rules::pandas_vet::rules::PandasUseOfPdMerge,
+        (PandasVet, "101") => rules::pandas_vet::rules::PandasNuniqueConstantSeriesCheck,
+        (PandasVet, "901") => rules::pandas_vet::rules::PandasDfVariableName,
 
         // flake8-errmsg
-        (Flake8ErrMsg, "101") => (RuleGroup::Stable, rules::flake8_errmsg::rules::RawStringInException),
-        (Flake8ErrMsg, "102") => (RuleGroup::Stable, rules::flake8_errmsg::rules::FStringInException),
-        (Flake8ErrMsg, "103") => (RuleGroup::Stable, rules::flake8_errmsg::rules::DotFormatInException),
+        (Flake8ErrMsg, "101") => rules::flake8_errmsg::rules::RawStringInException,
+        (Flake8ErrMsg, "102") => rules::flake8_errmsg::rules::FStringInException,
+        (Flake8ErrMsg, "103") => rules::flake8_errmsg::rules::DotFormatInException,
 
         // flake8-pyi
-        (Flake8Pyi, "001") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnprefixedTypeParam),
-        (Flake8Pyi, "002") => (RuleGroup::Stable, rules::flake8_pyi::rules::ComplexIfStatementInStub),
-        (Flake8Pyi, "003") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnrecognizedVersionInfoCheck),
-        (Flake8Pyi, "004") => (RuleGroup::Stable, rules::flake8_pyi::rules::PatchVersionComparison),
-        (Flake8Pyi, "005") => (RuleGroup::Stable, rules::flake8_pyi::rules::WrongTupleLengthVersionComparison),
-        (Flake8Pyi, "006") => (RuleGroup::Stable, rules::flake8_pyi::rules::BadVersionInfoComparison),
-        (Flake8Pyi, "007") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnrecognizedPlatformCheck),
-        (Flake8Pyi, "008") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnrecognizedPlatformName),
-        (Flake8Pyi, "009") => (RuleGroup::Stable, rules::flake8_pyi::rules::PassStatementStubBody),
-        (Flake8Pyi, "010") => (RuleGroup::Stable, rules::flake8_pyi::rules::NonEmptyStubBody),
-        (Flake8Pyi, "011") => (RuleGroup::Stable, rules::flake8_pyi::rules::TypedArgumentDefaultInStub),
-        (Flake8Pyi, "012") => (RuleGroup::Stable, rules::flake8_pyi::rules::PassInClassBody),
-        (Flake8Pyi, "013") => (RuleGroup::Stable, rules::flake8_pyi::rules::EllipsisInNonEmptyClassBody),
-        (Flake8Pyi, "014") => (RuleGroup::Stable, rules::flake8_pyi::rules::ArgumentDefaultInStub),
-        (Flake8Pyi, "015") => (RuleGroup::Stable, rules::flake8_pyi::rules::AssignmentDefaultInStub),
-        (Flake8Pyi, "016") => (RuleGroup::Stable, rules::flake8_pyi::rules::DuplicateUnionMember),
-        (Flake8Pyi, "017") => (RuleGroup::Stable, rules::flake8_pyi::rules::ComplexAssignmentInStub),
-        (Flake8Pyi, "018") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnusedPrivateTypeVar),
-        (Flake8Pyi, "019") => (RuleGroup::Stable, rules::flake8_pyi::rules::CustomTypeVarForSelf),
-        (Flake8Pyi, "020") => (RuleGroup::Stable, rules::flake8_pyi::rules::QuotedAnnotationInStub),
-        (Flake8Pyi, "021") => (RuleGroup::Stable, rules::flake8_pyi::rules::DocstringInStub),
-        (Flake8Pyi, "024") => (RuleGroup::Stable, rules::flake8_pyi::rules::CollectionsNamedTuple),
-        (Flake8Pyi, "025") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnaliasedCollectionsAbcSetImport),
-        (Flake8Pyi, "026") => (RuleGroup::Stable, rules::flake8_pyi::rules::TypeAliasWithoutAnnotation),
-        (Flake8Pyi, "029") => (RuleGroup::Stable, rules::flake8_pyi::rules::StrOrReprDefinedInStub),
-        (Flake8Pyi, "030") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnnecessaryLiteralUnion),
-        (Flake8Pyi, "032") => (RuleGroup::Stable, rules::flake8_pyi::rules::AnyEqNeAnnotation),
-        (Flake8Pyi, "033") => (RuleGroup::Stable, rules::flake8_pyi::rules::TypeCommentInStub),
-        (Flake8Pyi, "034") => (RuleGroup::Stable, rules::flake8_pyi::rules::NonSelfReturnType),
-        (Flake8Pyi, "035") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnassignedSpecialVariableInStub),
-        (Flake8Pyi, "036") => (RuleGroup::Stable, rules::flake8_pyi::rules::BadExitAnnotation),
-        (Flake8Pyi, "041") => (RuleGroup::Stable, rules::flake8_pyi::rules::RedundantNumericUnion),
-        (Flake8Pyi, "042") => (RuleGroup::Stable, rules::flake8_pyi::rules::SnakeCaseTypeAlias),
-        (Flake8Pyi, "043") => (RuleGroup::Stable, rules::flake8_pyi::rules::TSuffixedTypeAlias),
-        (Flake8Pyi, "044") => (RuleGroup::Stable, rules::flake8_pyi::rules::FutureAnnotationsInStub),
-        (Flake8Pyi, "045") => (RuleGroup::Stable, rules::flake8_pyi::rules::IterMethodReturnIterable),
-        (Flake8Pyi, "046") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnusedPrivateProtocol),
-        (Flake8Pyi, "047") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnusedPrivateTypeAlias),
-        (Flake8Pyi, "048") => (RuleGroup::Stable, rules::flake8_pyi::rules::StubBodyMultipleStatements),
-        (Flake8Pyi, "049") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnusedPrivateTypedDict),
-        (Flake8Pyi, "050") => (RuleGroup::Stable, rules::flake8_pyi::rules::NoReturnArgumentAnnotationInStub),
-        (Flake8Pyi, "051") => (RuleGroup::Stable, rules::flake8_pyi::rules::RedundantLiteralUnion),
-        (Flake8Pyi, "052") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnannotatedAssignmentInStub),
-        (Flake8Pyi, "054") => (RuleGroup::Stable, rules::flake8_pyi::rules::NumericLiteralTooLong),
-        (Flake8Pyi, "053") => (RuleGroup::Stable, rules::flake8_pyi::rules::StringOrBytesTooLong),
-        (Flake8Pyi, "055") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnnecessaryTypeUnion),
-        (Flake8Pyi, "056") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnsupportedMethodCallOnAll),
-        (Flake8Pyi, "058") => (RuleGroup::Stable, rules::flake8_pyi::rules::GeneratorReturnFromIterMethod),
-        (Flake8Pyi, "057") => (RuleGroup::Stable, rules::flake8_pyi::rules::ByteStringUsage),
-        (Flake8Pyi, "059") => (RuleGroup::Preview, rules::flake8_pyi::rules::GenericNotLastBaseClass),
-        (Flake8Pyi, "061") => (RuleGroup::Preview, rules::flake8_pyi::rules::RedundantNoneLiteral),
-        (Flake8Pyi, "062") => (RuleGroup::Stable, rules::flake8_pyi::rules::DuplicateLiteralMember),
-        (Flake8Pyi, "063") => (RuleGroup::Stable, rules::flake8_pyi::rules::Pep484StylePositionalOnlyParameter),
-        (Flake8Pyi, "064") => (RuleGroup::Stable, rules::flake8_pyi::rules::RedundantFinalLiteral),
-        (Flake8Pyi, "066") => (RuleGroup::Stable, rules::flake8_pyi::rules::BadVersionInfoOrder),
+        (Flake8Pyi, "001") => rules::flake8_pyi::rules::UnprefixedTypeParam,
+        (Flake8Pyi, "002") => rules::flake8_pyi::rules::ComplexIfStatementInStub,
+        (Flake8Pyi, "003") => rules::flake8_pyi::rules::UnrecognizedVersionInfoCheck,
+        (Flake8Pyi, "004") => rules::flake8_pyi::rules::PatchVersionComparison,
+        (Flake8Pyi, "005") => rules::flake8_pyi::rules::WrongTupleLengthVersionComparison,
+        (Flake8Pyi, "006") => rules::flake8_pyi::rules::BadVersionInfoComparison,
+        (Flake8Pyi, "007") => rules::flake8_pyi::rules::UnrecognizedPlatformCheck,
+        (Flake8Pyi, "008") => rules::flake8_pyi::rules::UnrecognizedPlatformName,
+        (Flake8Pyi, "009") => rules::flake8_pyi::rules::PassStatementStubBody,
+        (Flake8Pyi, "010") => rules::flake8_pyi::rules::NonEmptyStubBody,
+        (Flake8Pyi, "011") => rules::flake8_pyi::rules::TypedArgumentDefaultInStub,
+        (Flake8Pyi, "012") => rules::flake8_pyi::rules::PassInClassBody,
+        (Flake8Pyi, "013") => rules::flake8_pyi::rules::EllipsisInNonEmptyClassBody,
+        (Flake8Pyi, "014") => rules::flake8_pyi::rules::ArgumentDefaultInStub,
+        (Flake8Pyi, "015") => rules::flake8_pyi::rules::AssignmentDefaultInStub,
+        (Flake8Pyi, "016") => rules::flake8_pyi::rules::DuplicateUnionMember,
+        (Flake8Pyi, "017") => rules::flake8_pyi::rules::ComplexAssignmentInStub,
+        (Flake8Pyi, "018") => rules::flake8_pyi::rules::UnusedPrivateTypeVar,
+        (Flake8Pyi, "019") => rules::flake8_pyi::rules::CustomTypeVarForSelf,
+        (Flake8Pyi, "020") => rules::flake8_pyi::rules::QuotedAnnotationInStub,
+        (Flake8Pyi, "021") => rules::flake8_pyi::rules::DocstringInStub,
+        (Flake8Pyi, "024") => rules::flake8_pyi::rules::CollectionsNamedTuple,
+        (Flake8Pyi, "025") => rules::flake8_pyi::rules::UnaliasedCollectionsAbcSetImport,
+        (Flake8Pyi, "026") => rules::flake8_pyi::rules::TypeAliasWithoutAnnotation,
+        (Flake8Pyi, "029") => rules::flake8_pyi::rules::StrOrReprDefinedInStub,
+        (Flake8Pyi, "030") => rules::flake8_pyi::rules::UnnecessaryLiteralUnion,
+        (Flake8Pyi, "032") => rules::flake8_pyi::rules::AnyEqNeAnnotation,
+        (Flake8Pyi, "033") => rules::flake8_pyi::rules::TypeCommentInStub,
+        (Flake8Pyi, "034") => rules::flake8_pyi::rules::NonSelfReturnType,
+        (Flake8Pyi, "035") => rules::flake8_pyi::rules::UnassignedSpecialVariableInStub,
+        (Flake8Pyi, "036") => rules::flake8_pyi::rules::BadExitAnnotation,
+        (Flake8Pyi, "041") => rules::flake8_pyi::rules::RedundantNumericUnion,
+        (Flake8Pyi, "042") => rules::flake8_pyi::rules::SnakeCaseTypeAlias,
+        (Flake8Pyi, "043") => rules::flake8_pyi::rules::TSuffixedTypeAlias,
+        (Flake8Pyi, "044") => rules::flake8_pyi::rules::FutureAnnotationsInStub,
+        (Flake8Pyi, "045") => rules::flake8_pyi::rules::IterMethodReturnIterable,
+        (Flake8Pyi, "046") => rules::flake8_pyi::rules::UnusedPrivateProtocol,
+        (Flake8Pyi, "047") => rules::flake8_pyi::rules::UnusedPrivateTypeAlias,
+        (Flake8Pyi, "048") => rules::flake8_pyi::rules::StubBodyMultipleStatements,
+        (Flake8Pyi, "049") => rules::flake8_pyi::rules::UnusedPrivateTypedDict,
+        (Flake8Pyi, "050") => rules::flake8_pyi::rules::NoReturnArgumentAnnotationInStub,
+        (Flake8Pyi, "051") => rules::flake8_pyi::rules::RedundantLiteralUnion,
+        (Flake8Pyi, "052") => rules::flake8_pyi::rules::UnannotatedAssignmentInStub,
+        (Flake8Pyi, "054") => rules::flake8_pyi::rules::NumericLiteralTooLong,
+        (Flake8Pyi, "053") => rules::flake8_pyi::rules::StringOrBytesTooLong,
+        (Flake8Pyi, "055") => rules::flake8_pyi::rules::UnnecessaryTypeUnion,
+        (Flake8Pyi, "056") => rules::flake8_pyi::rules::UnsupportedMethodCallOnAll,
+        (Flake8Pyi, "058") => rules::flake8_pyi::rules::GeneratorReturnFromIterMethod,
+        (Flake8Pyi, "057") => rules::flake8_pyi::rules::ByteStringUsage,
+        (Flake8Pyi, "059") => rules::flake8_pyi::rules::GenericNotLastBaseClass,
+        (Flake8Pyi, "061") => rules::flake8_pyi::rules::RedundantNoneLiteral,
+        (Flake8Pyi, "062") => rules::flake8_pyi::rules::DuplicateLiteralMember,
+        (Flake8Pyi, "063") => rules::flake8_pyi::rules::Pep484StylePositionalOnlyParameter,
+        (Flake8Pyi, "064") => rules::flake8_pyi::rules::RedundantFinalLiteral,
+        (Flake8Pyi, "066") => rules::flake8_pyi::rules::BadVersionInfoOrder,
 
         // flake8-pytest-style
-        (Flake8PytestStyle, "001") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestFixtureIncorrectParenthesesStyle),
-        (Flake8PytestStyle, "002") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestFixturePositionalArgs),
-        (Flake8PytestStyle, "003") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestExtraneousScopeFunction),
+        (Flake8PytestStyle, "001") => rules::flake8_pytest_style::rules::PytestFixtureIncorrectParenthesesStyle,
+        (Flake8PytestStyle, "002") => rules::flake8_pytest_style::rules::PytestFixturePositionalArgs,
+        (Flake8PytestStyle, "003") => rules::flake8_pytest_style::rules::PytestExtraneousScopeFunction,
         #[allow(deprecated)]
-        (Flake8PytestStyle, "004") => (RuleGroup::Removed, rules::flake8_pytest_style::rules::PytestMissingFixtureNameUnderscore),
+        (Flake8PytestStyle, "004") => rules::flake8_pytest_style::rules::PytestMissingFixtureNameUnderscore,
         #[allow(deprecated)]
-        (Flake8PytestStyle, "005") => (RuleGroup::Removed, rules::flake8_pytest_style::rules::PytestIncorrectFixtureNameUnderscore),
-        (Flake8PytestStyle, "006") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestParametrizeNamesWrongType),
-        (Flake8PytestStyle, "007") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestParametrizeValuesWrongType),
-        (Flake8PytestStyle, "008") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestPatchWithLambda),
-        (Flake8PytestStyle, "009") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestUnittestAssertion),
-        (Flake8PytestStyle, "010") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestRaisesWithoutException),
-        (Flake8PytestStyle, "011") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestRaisesTooBroad),
-        (Flake8PytestStyle, "012") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestRaisesWithMultipleStatements),
-        (Flake8PytestStyle, "013") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestIncorrectPytestImport),
-        (Flake8PytestStyle, "014") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestDuplicateParametrizeTestCases),
-        (Flake8PytestStyle, "015") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestAssertAlwaysFalse),
-        (Flake8PytestStyle, "016") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestFailWithoutMessage),
-        (Flake8PytestStyle, "017") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestAssertInExcept),
-        (Flake8PytestStyle, "018") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestCompositeAssertion),
-        (Flake8PytestStyle, "019") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestFixtureParamWithoutValue),
-        (Flake8PytestStyle, "020") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestDeprecatedYieldFixture),
-        (Flake8PytestStyle, "021") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestFixtureFinalizerCallback),
-        (Flake8PytestStyle, "022") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestUselessYieldFixture),
-        (Flake8PytestStyle, "023") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestIncorrectMarkParenthesesStyle),
-        (Flake8PytestStyle, "024") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestUnnecessaryAsyncioMarkOnFixture),
-        (Flake8PytestStyle, "025") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestErroneousUseFixturesOnFixture),
-        (Flake8PytestStyle, "026") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestUseFixturesWithoutParameters),
-        (Flake8PytestStyle, "027") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestUnittestRaisesAssertion),
-        (Flake8PytestStyle, "028") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestParameterWithDefaultArgument),
-        (Flake8PytestStyle, "029") => (RuleGroup::Preview, rules::flake8_pytest_style::rules::PytestWarnsWithoutWarning),
-        (Flake8PytestStyle, "030") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestWarnsTooBroad),
-        (Flake8PytestStyle, "031") => (RuleGroup::Stable, rules::flake8_pytest_style::rules::PytestWarnsWithMultipleStatements),
+        (Flake8PytestStyle, "005") => rules::flake8_pytest_style::rules::PytestIncorrectFixtureNameUnderscore,
+        (Flake8PytestStyle, "006") => rules::flake8_pytest_style::rules::PytestParametrizeNamesWrongType,
+        (Flake8PytestStyle, "007") => rules::flake8_pytest_style::rules::PytestParametrizeValuesWrongType,
+        (Flake8PytestStyle, "008") => rules::flake8_pytest_style::rules::PytestPatchWithLambda,
+        (Flake8PytestStyle, "009") => rules::flake8_pytest_style::rules::PytestUnittestAssertion,
+        (Flake8PytestStyle, "010") => rules::flake8_pytest_style::rules::PytestRaisesWithoutException,
+        (Flake8PytestStyle, "011") => rules::flake8_pytest_style::rules::PytestRaisesTooBroad,
+        (Flake8PytestStyle, "012") => rules::flake8_pytest_style::rules::PytestRaisesWithMultipleStatements,
+        (Flake8PytestStyle, "013") => rules::flake8_pytest_style::rules::PytestIncorrectPytestImport,
+        (Flake8PytestStyle, "014") => rules::flake8_pytest_style::rules::PytestDuplicateParametrizeTestCases,
+        (Flake8PytestStyle, "015") => rules::flake8_pytest_style::rules::PytestAssertAlwaysFalse,
+        (Flake8PytestStyle, "016") => rules::flake8_pytest_style::rules::PytestFailWithoutMessage,
+        (Flake8PytestStyle, "017") => rules::flake8_pytest_style::rules::PytestAssertInExcept,
+        (Flake8PytestStyle, "018") => rules::flake8_pytest_style::rules::PytestCompositeAssertion,
+        (Flake8PytestStyle, "019") => rules::flake8_pytest_style::rules::PytestFixtureParamWithoutValue,
+        (Flake8PytestStyle, "020") => rules::flake8_pytest_style::rules::PytestDeprecatedYieldFixture,
+        (Flake8PytestStyle, "021") => rules::flake8_pytest_style::rules::PytestFixtureFinalizerCallback,
+        (Flake8PytestStyle, "022") => rules::flake8_pytest_style::rules::PytestUselessYieldFixture,
+        (Flake8PytestStyle, "023") => rules::flake8_pytest_style::rules::PytestIncorrectMarkParenthesesStyle,
+        (Flake8PytestStyle, "024") => rules::flake8_pytest_style::rules::PytestUnnecessaryAsyncioMarkOnFixture,
+        (Flake8PytestStyle, "025") => rules::flake8_pytest_style::rules::PytestErroneousUseFixturesOnFixture,
+        (Flake8PytestStyle, "026") => rules::flake8_pytest_style::rules::PytestUseFixturesWithoutParameters,
+        (Flake8PytestStyle, "027") => rules::flake8_pytest_style::rules::PytestUnittestRaisesAssertion,
+        (Flake8PytestStyle, "028") => rules::flake8_pytest_style::rules::PytestParameterWithDefaultArgument,
+        (Flake8PytestStyle, "029") => rules::flake8_pytest_style::rules::PytestWarnsWithoutWarning,
+        (Flake8PytestStyle, "030") => rules::flake8_pytest_style::rules::PytestWarnsTooBroad,
+        (Flake8PytestStyle, "031") => rules::flake8_pytest_style::rules::PytestWarnsWithMultipleStatements,
 
         // flake8-pie
-        (Flake8Pie, "790") => (RuleGroup::Stable, rules::flake8_pie::rules::UnnecessaryPlaceholder),
-        (Flake8Pie, "794") => (RuleGroup::Stable, rules::flake8_pie::rules::DuplicateClassFieldDefinition),
-        (Flake8Pie, "796") => (RuleGroup::Stable, rules::flake8_pie::rules::NonUniqueEnums),
-        (Flake8Pie, "800") => (RuleGroup::Stable, rules::flake8_pie::rules::UnnecessarySpread),
-        (Flake8Pie, "804") => (RuleGroup::Stable, rules::flake8_pie::rules::UnnecessaryDictKwargs),
-        (Flake8Pie, "807") => (RuleGroup::Stable, rules::flake8_pie::rules::ReimplementedContainerBuiltin),
-        (Flake8Pie, "808") => (RuleGroup::Stable, rules::flake8_pie::rules::UnnecessaryRangeStart),
-        (Flake8Pie, "810") => (RuleGroup::Stable, rules::flake8_pie::rules::MultipleStartsEndsWith),
+        (Flake8Pie, "790") => rules::flake8_pie::rules::UnnecessaryPlaceholder,
+        (Flake8Pie, "794") => rules::flake8_pie::rules::DuplicateClassFieldDefinition,
+        (Flake8Pie, "796") => rules::flake8_pie::rules::NonUniqueEnums,
+        (Flake8Pie, "800") => rules::flake8_pie::rules::UnnecessarySpread,
+        (Flake8Pie, "804") => rules::flake8_pie::rules::UnnecessaryDictKwargs,
+        (Flake8Pie, "807") => rules::flake8_pie::rules::ReimplementedContainerBuiltin,
+        (Flake8Pie, "808") => rules::flake8_pie::rules::UnnecessaryRangeStart,
+        (Flake8Pie, "810") => rules::flake8_pie::rules::MultipleStartsEndsWith,
 
         // flake8-commas
-        (Flake8Commas, "812") => (RuleGroup::Stable, rules::flake8_commas::rules::MissingTrailingComma),
-        (Flake8Commas, "818") => (RuleGroup::Stable, rules::flake8_commas::rules::TrailingCommaOnBareTuple),
-        (Flake8Commas, "819") => (RuleGroup::Stable, rules::flake8_commas::rules::ProhibitedTrailingComma),
+        (Flake8Commas, "812") => rules::flake8_commas::rules::MissingTrailingComma,
+        (Flake8Commas, "818") => rules::flake8_commas::rules::TrailingCommaOnBareTuple,
+        (Flake8Commas, "819") => rules::flake8_commas::rules::ProhibitedTrailingComma,
 
         // flake8-no-pep420
-        (Flake8NoPep420, "001") => (RuleGroup::Stable, rules::flake8_no_pep420::rules::ImplicitNamespacePackage),
+        (Flake8NoPep420, "001") => rules::flake8_no_pep420::rules::ImplicitNamespacePackage,
 
         // flake8-executable
-        (Flake8Executable, "001") => (RuleGroup::Stable, rules::flake8_executable::rules::ShebangNotExecutable),
-        (Flake8Executable, "002") => (RuleGroup::Stable, rules::flake8_executable::rules::ShebangMissingExecutableFile),
-        (Flake8Executable, "003") => (RuleGroup::Stable, rules::flake8_executable::rules::ShebangMissingPython),
-        (Flake8Executable, "004") => (RuleGroup::Stable, rules::flake8_executable::rules::ShebangLeadingWhitespace),
-        (Flake8Executable, "005") => (RuleGroup::Stable, rules::flake8_executable::rules::ShebangNotFirstLine),
+        (Flake8Executable, "001") => rules::flake8_executable::rules::ShebangNotExecutable,
+        (Flake8Executable, "002") => rules::flake8_executable::rules::ShebangMissingExecutableFile,
+        (Flake8Executable, "003") => rules::flake8_executable::rules::ShebangMissingPython,
+        (Flake8Executable, "004") => rules::flake8_executable::rules::ShebangLeadingWhitespace,
+        (Flake8Executable, "005") => rules::flake8_executable::rules::ShebangNotFirstLine,
 
         // flake8-type-checking
-        (Flake8TypeChecking, "001") => (RuleGroup::Stable, rules::flake8_type_checking::rules::TypingOnlyFirstPartyImport),
-        (Flake8TypeChecking, "002") => (RuleGroup::Stable, rules::flake8_type_checking::rules::TypingOnlyThirdPartyImport),
-        (Flake8TypeChecking, "003") => (RuleGroup::Stable, rules::flake8_type_checking::rules::TypingOnlyStandardLibraryImport),
-        (Flake8TypeChecking, "004") => (RuleGroup::Stable, rules::flake8_type_checking::rules::RuntimeImportInTypeCheckingBlock),
-        (Flake8TypeChecking, "005") => (RuleGroup::Stable, rules::flake8_type_checking::rules::EmptyTypeCheckingBlock),
-        (Flake8TypeChecking, "006") => (RuleGroup::Stable, rules::flake8_type_checking::rules::RuntimeCastValue),
-        (Flake8TypeChecking, "007") => (RuleGroup::Stable, rules::flake8_type_checking::rules::UnquotedTypeAlias),
-        (Flake8TypeChecking, "008") => (RuleGroup::Preview, rules::flake8_type_checking::rules::QuotedTypeAlias),
-        (Flake8TypeChecking, "010") => (RuleGroup::Stable, rules::flake8_type_checking::rules::RuntimeStringUnion),
+        (Flake8TypeChecking, "001") => rules::flake8_type_checking::rules::TypingOnlyFirstPartyImport,
+        (Flake8TypeChecking, "002") => rules::flake8_type_checking::rules::TypingOnlyThirdPartyImport,
+        (Flake8TypeChecking, "003") => rules::flake8_type_checking::rules::TypingOnlyStandardLibraryImport,
+        (Flake8TypeChecking, "004") => rules::flake8_type_checking::rules::RuntimeImportInTypeCheckingBlock,
+        (Flake8TypeChecking, "005") => rules::flake8_type_checking::rules::EmptyTypeCheckingBlock,
+        (Flake8TypeChecking, "006") => rules::flake8_type_checking::rules::RuntimeCastValue,
+        (Flake8TypeChecking, "007") => rules::flake8_type_checking::rules::UnquotedTypeAlias,
+        (Flake8TypeChecking, "008") => rules::flake8_type_checking::rules::QuotedTypeAlias,
+        (Flake8TypeChecking, "010") => rules::flake8_type_checking::rules::RuntimeStringUnion,
 
         // tryceratops
-        (Tryceratops, "002") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseVanillaClass),
-        (Tryceratops, "003") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseVanillaArgs),
-        (Tryceratops, "004") => (RuleGroup::Stable, rules::tryceratops::rules::TypeCheckWithoutTypeError),
-        (Tryceratops, "200") => (RuleGroup::Removed, rules::tryceratops::rules::ReraiseNoCause),
-        (Tryceratops, "201") => (RuleGroup::Stable, rules::tryceratops::rules::VerboseRaise),
-        (Tryceratops, "203") => (RuleGroup::Stable, rules::tryceratops::rules::UselessTryExcept),
-        (Tryceratops, "300") => (RuleGroup::Stable, rules::tryceratops::rules::TryConsiderElse),
-        (Tryceratops, "301") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseWithinTry),
-        (Tryceratops, "400") => (RuleGroup::Stable, rules::tryceratops::rules::ErrorInsteadOfException),
-        (Tryceratops, "401") => (RuleGroup::Stable, rules::tryceratops::rules::VerboseLogMessage),
+        (Tryceratops, "002") => rules::tryceratops::rules::RaiseVanillaClass,
+        (Tryceratops, "003") => rules::tryceratops::rules::RaiseVanillaArgs,
+        (Tryceratops, "004") => rules::tryceratops::rules::TypeCheckWithoutTypeError,
+        (Tryceratops, "200") => rules::tryceratops::rules::ReraiseNoCause,
+        (Tryceratops, "201") => rules::tryceratops::rules::VerboseRaise,
+        (Tryceratops, "203") => rules::tryceratops::rules::UselessTryExcept,
+        (Tryceratops, "300") => rules::tryceratops::rules::TryConsiderElse,
+        (Tryceratops, "301") => rules::tryceratops::rules::RaiseWithinTry,
+        (Tryceratops, "400") => rules::tryceratops::rules::ErrorInsteadOfException,
+        (Tryceratops, "401") => rules::tryceratops::rules::VerboseLogMessage,
 
         // flake8-use-pathlib
-        (Flake8UsePathlib, "100") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathAbspath),
-        (Flake8UsePathlib, "101") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsChmod),
-        (Flake8UsePathlib, "102") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsMkdir),
-        (Flake8UsePathlib, "103") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsMakedirs),
-        (Flake8UsePathlib, "104") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRename),
-        (Flake8UsePathlib, "105") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsReplace),
-        (Flake8UsePathlib, "106") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRmdir),
-        (Flake8UsePathlib, "107") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRemove),
-        (Flake8UsePathlib, "108") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsUnlink),
-        (Flake8UsePathlib, "109") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsGetcwd),
-        (Flake8UsePathlib, "110") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathExists),
-        (Flake8UsePathlib, "111") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathExpanduser),
-        (Flake8UsePathlib, "112") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIsdir),
-        (Flake8UsePathlib, "113") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIsfile),
-        (Flake8UsePathlib, "114") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIslink),
-        (Flake8UsePathlib, "115") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsReadlink),
-        (Flake8UsePathlib, "116") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsStat),
-        (Flake8UsePathlib, "117") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIsabs),
-        (Flake8UsePathlib, "118") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathJoin),
-        (Flake8UsePathlib, "119") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathBasename),
-        (Flake8UsePathlib, "120") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathDirname),
-        (Flake8UsePathlib, "121") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathSamefile),
-        (Flake8UsePathlib, "122") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathSplitext),
-        (Flake8UsePathlib, "123") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::BuiltinOpen),
-        (Flake8UsePathlib, "124") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::PyPath),
-        (Flake8UsePathlib, "201") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::PathConstructorCurrentDirectory),
-        (Flake8UsePathlib, "202") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathGetsize),
-        (Flake8UsePathlib, "202") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathGetsize),
-        (Flake8UsePathlib, "203") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathGetatime),
-        (Flake8UsePathlib, "204") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathGetmtime),
-        (Flake8UsePathlib, "205") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathGetctime),
-        (Flake8UsePathlib, "206") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsSepSplit),
-        (Flake8UsePathlib, "207") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::Glob),
-        (Flake8UsePathlib, "208") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsListdir),
-        (Flake8UsePathlib, "210") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::InvalidPathlibWithSuffix),
-        (Flake8UsePathlib, "211") => (RuleGroup::Preview, rules::flake8_use_pathlib::violations::OsSymlink),
+        (Flake8UsePathlib, "100") => rules::flake8_use_pathlib::rules::OsPathAbspath,
+        (Flake8UsePathlib, "101") => rules::flake8_use_pathlib::rules::OsChmod,
+        (Flake8UsePathlib, "102") => rules::flake8_use_pathlib::rules::OsMkdir,
+        (Flake8UsePathlib, "103") => rules::flake8_use_pathlib::rules::OsMakedirs,
+        (Flake8UsePathlib, "104") => rules::flake8_use_pathlib::rules::OsRename,
+        (Flake8UsePathlib, "105") => rules::flake8_use_pathlib::rules::OsReplace,
+        (Flake8UsePathlib, "106") => rules::flake8_use_pathlib::rules::OsRmdir,
+        (Flake8UsePathlib, "107") => rules::flake8_use_pathlib::rules::OsRemove,
+        (Flake8UsePathlib, "108") => rules::flake8_use_pathlib::rules::OsUnlink,
+        (Flake8UsePathlib, "109") => rules::flake8_use_pathlib::rules::OsGetcwd,
+        (Flake8UsePathlib, "110") => rules::flake8_use_pathlib::rules::OsPathExists,
+        (Flake8UsePathlib, "111") => rules::flake8_use_pathlib::rules::OsPathExpanduser,
+        (Flake8UsePathlib, "112") => rules::flake8_use_pathlib::rules::OsPathIsdir,
+        (Flake8UsePathlib, "113") => rules::flake8_use_pathlib::rules::OsPathIsfile,
+        (Flake8UsePathlib, "114") => rules::flake8_use_pathlib::rules::OsPathIslink,
+        (Flake8UsePathlib, "115") => rules::flake8_use_pathlib::rules::OsReadlink,
+        (Flake8UsePathlib, "116") => rules::flake8_use_pathlib::violations::OsStat,
+        (Flake8UsePathlib, "117") => rules::flake8_use_pathlib::rules::OsPathIsabs,
+        (Flake8UsePathlib, "118") => rules::flake8_use_pathlib::violations::OsPathJoin,
+        (Flake8UsePathlib, "119") => rules::flake8_use_pathlib::rules::OsPathBasename,
+        (Flake8UsePathlib, "120") => rules::flake8_use_pathlib::rules::OsPathDirname,
+        (Flake8UsePathlib, "121") => rules::flake8_use_pathlib::rules::OsPathSamefile,
+        (Flake8UsePathlib, "122") => rules::flake8_use_pathlib::violations::OsPathSplitext,
+        (Flake8UsePathlib, "123") => rules::flake8_use_pathlib::rules::BuiltinOpen,
+        (Flake8UsePathlib, "124") => rules::flake8_use_pathlib::violations::PyPath,
+        (Flake8UsePathlib, "201") => rules::flake8_use_pathlib::rules::PathConstructorCurrentDirectory,
+        (Flake8UsePathlib, "202") => rules::flake8_use_pathlib::rules::OsPathGetsize,
+        (Flake8UsePathlib, "202") => rules::flake8_use_pathlib::rules::OsPathGetsize,
+        (Flake8UsePathlib, "203") => rules::flake8_use_pathlib::rules::OsPathGetatime,
+        (Flake8UsePathlib, "204") => rules::flake8_use_pathlib::rules::OsPathGetmtime,
+        (Flake8UsePathlib, "205") => rules::flake8_use_pathlib::rules::OsPathGetctime,
+        (Flake8UsePathlib, "206") => rules::flake8_use_pathlib::rules::OsSepSplit,
+        (Flake8UsePathlib, "207") => rules::flake8_use_pathlib::rules::Glob,
+        (Flake8UsePathlib, "208") => rules::flake8_use_pathlib::violations::OsListdir,
+        (Flake8UsePathlib, "210") => rules::flake8_use_pathlib::rules::InvalidPathlibWithSuffix,
+        (Flake8UsePathlib, "211") => rules::flake8_use_pathlib::rules::OsSymlink,
 
         // flake8-logging-format
-        (Flake8LoggingFormat, "001") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingStringFormat),
-        (Flake8LoggingFormat, "002") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingPercentFormat),
-        (Flake8LoggingFormat, "003") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingStringConcat),
-        (Flake8LoggingFormat, "004") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingFString),
-        (Flake8LoggingFormat, "010") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingWarn),
-        (Flake8LoggingFormat, "101") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingExtraAttrClash),
-        (Flake8LoggingFormat, "201") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingExcInfo),
-        (Flake8LoggingFormat, "202") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingRedundantExcInfo),
+        (Flake8LoggingFormat, "001") => rules::flake8_logging_format::violations::LoggingStringFormat,
+        (Flake8LoggingFormat, "002") => rules::flake8_logging_format::violations::LoggingPercentFormat,
+        (Flake8LoggingFormat, "003") => rules::flake8_logging_format::violations::LoggingStringConcat,
+        (Flake8LoggingFormat, "004") => rules::flake8_logging_format::violations::LoggingFString,
+        (Flake8LoggingFormat, "010") => rules::flake8_logging_format::violations::LoggingWarn,
+        (Flake8LoggingFormat, "101") => rules::flake8_logging_format::violations::LoggingExtraAttrClash,
+        (Flake8LoggingFormat, "201") => rules::flake8_logging_format::violations::LoggingExcInfo,
+        (Flake8LoggingFormat, "202") => rules::flake8_logging_format::violations::LoggingRedundantExcInfo,
 
         // flake8-raise
-        (Flake8Raise, "102") => (RuleGroup::Stable, rules::flake8_raise::rules::UnnecessaryParenOnRaiseException),
+        (Flake8Raise, "102") => rules::flake8_raise::rules::UnnecessaryParenOnRaiseException,
 
         // flake8-self
-        (Flake8Self, "001") => (RuleGroup::Stable, rules::flake8_self::rules::PrivateMemberAccess),
+        (Flake8Self, "001") => rules::flake8_self::rules::PrivateMemberAccess,
 
         // numpy
-        (Numpy, "001") => (RuleGroup::Stable, rules::numpy::rules::NumpyDeprecatedTypeAlias),
-        (Numpy, "002") => (RuleGroup::Stable, rules::numpy::rules::NumpyLegacyRandom),
-        (Numpy, "003") => (RuleGroup::Stable, rules::numpy::rules::NumpyDeprecatedFunction),
-        (Numpy, "201") => (RuleGroup::Stable, rules::numpy::rules::Numpy2Deprecation),
+        (Numpy, "001") => rules::numpy::rules::NumpyDeprecatedTypeAlias,
+        (Numpy, "002") => rules::numpy::rules::NumpyLegacyRandom,
+        (Numpy, "003") => rules::numpy::rules::NumpyDeprecatedFunction,
+        (Numpy, "201") => rules::numpy::rules::Numpy2Deprecation,
 
         // fastapi
-        (FastApi, "001") => (RuleGroup::Stable, rules::fastapi::rules::FastApiRedundantResponseModel),
-        (FastApi, "002") => (RuleGroup::Stable, rules::fastapi::rules::FastApiNonAnnotatedDependency),
-        (FastApi, "003") => (RuleGroup::Stable, rules::fastapi::rules::FastApiUnusedPathParameter),
+        (FastApi, "001") => rules::fastapi::rules::FastApiRedundantResponseModel,
+        (FastApi, "002") => rules::fastapi::rules::FastApiNonAnnotatedDependency,
+        (FastApi, "003") => rules::fastapi::rules::FastApiUnusedPathParameter,
 
         // pydoclint
-        (Pydoclint, "201") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringMissingReturns),
-        (Pydoclint, "202") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringExtraneousReturns),
-        (Pydoclint, "402") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringMissingYields),
-        (Pydoclint, "403") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringExtraneousYields),
-        (Pydoclint, "501") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringMissingException),
-        (Pydoclint, "502") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringExtraneousException),
+        (Pydoclint, "102") => rules::pydoclint::rules::DocstringExtraneousParameter,
+        (Pydoclint, "201") => rules::pydoclint::rules::DocstringMissingReturns,
+        (Pydoclint, "202") => rules::pydoclint::rules::DocstringExtraneousReturns,
+        (Pydoclint, "402") => rules::pydoclint::rules::DocstringMissingYields,
+        (Pydoclint, "403") => rules::pydoclint::rules::DocstringExtraneousYields,
+        (Pydoclint, "501") => rules::pydoclint::rules::DocstringMissingException,
+        (Pydoclint, "502") => rules::pydoclint::rules::DocstringExtraneousException,
 
         // ruff
-        (Ruff, "001") => (RuleGroup::Stable, rules::ruff::rules::AmbiguousUnicodeCharacterString),
-        (Ruff, "002") => (RuleGroup::Stable, rules::ruff::rules::AmbiguousUnicodeCharacterDocstring),
-        (Ruff, "003") => (RuleGroup::Stable, rules::ruff::rules::AmbiguousUnicodeCharacterComment),
-        (Ruff, "005") => (RuleGroup::Stable, rules::ruff::rules::CollectionLiteralConcatenation),
-        (Ruff, "006") => (RuleGroup::Stable, rules::ruff::rules::AsyncioDanglingTask),
-        (Ruff, "007") => (RuleGroup::Stable, rules::ruff::rules::ZipInsteadOfPairwise),
-        (Ruff, "008") => (RuleGroup::Stable, rules::ruff::rules::MutableDataclassDefault),
-        (Ruff, "009") => (RuleGroup::Stable, rules::ruff::rules::FunctionCallInDataclassDefaultArgument),
-        (Ruff, "010") => (RuleGroup::Stable, rules::ruff::rules::ExplicitFStringTypeConversion),
-        (Ruff, "011") => (RuleGroup::Removed, rules::ruff::rules::RuffStaticKeyDictComprehension),
-        (Ruff, "012") => (RuleGroup::Stable, rules::ruff::rules::MutableClassDefault),
-        (Ruff, "013") => (RuleGroup::Stable, rules::ruff::rules::ImplicitOptional),
-        (Ruff, "015") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryIterableAllocationForFirstElement),
-        (Ruff, "016") => (RuleGroup::Stable, rules::ruff::rules::InvalidIndexType),
-        (Ruff, "017") => (RuleGroup::Stable, rules::ruff::rules::QuadraticListSummation),
-        (Ruff, "018") => (RuleGroup::Stable, rules::ruff::rules::AssignmentInAssert),
-        (Ruff, "019") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryKeyCheck),
-        (Ruff, "020") => (RuleGroup::Stable, rules::ruff::rules::NeverUnion),
-        (Ruff, "021") => (RuleGroup::Stable, rules::ruff::rules::ParenthesizeChainedOperators),
-        (Ruff, "022") => (RuleGroup::Stable, rules::ruff::rules::UnsortedDunderAll),
-        (Ruff, "023") => (RuleGroup::Stable, rules::ruff::rules::UnsortedDunderSlots),
-        (Ruff, "024") => (RuleGroup::Stable, rules::ruff::rules::MutableFromkeysValue),
-        (Ruff, "026") => (RuleGroup::Stable, rules::ruff::rules::DefaultFactoryKwarg),
-        (Ruff, "027") => (RuleGroup::Preview, rules::ruff::rules::MissingFStringSyntax),
-        (Ruff, "028") => (RuleGroup::Stable, rules::ruff::rules::InvalidFormatterSuppressionComment),
-        (Ruff, "029") => (RuleGroup::Preview, rules::ruff::rules::UnusedAsync),
-        (Ruff, "030") => (RuleGroup::Stable, rules::ruff::rules::AssertWithPrintMessage),
-        (Ruff, "031") => (RuleGroup::Preview, rules::ruff::rules::IncorrectlyParenthesizedTupleInSubscript),
-        (Ruff, "032") => (RuleGroup::Stable, rules::ruff::rules::DecimalFromFloatLiteral),
-        (Ruff, "033") => (RuleGroup::Stable, rules::ruff::rules::PostInitDefault),
-        (Ruff, "034") => (RuleGroup::Stable, rules::ruff::rules::UselessIfElse),
-        (Ruff, "035") => (RuleGroup::Removed, rules::ruff::rules::RuffUnsafeMarkupUse),
-        (Ruff, "036") => (RuleGroup::Preview, rules::ruff::rules::NoneNotAtEndOfUnion),
-        (Ruff, "037") => (RuleGroup::Preview, rules::ruff::rules::UnnecessaryEmptyIterableWithinDequeCall),
-        (Ruff, "038") => (RuleGroup::Preview, rules::ruff::rules::RedundantBoolLiteral),
-        (Ruff, "039") => (RuleGroup::Preview, rules::ruff::rules::UnrawRePattern),
-        (Ruff, "040") => (RuleGroup::Stable, rules::ruff::rules::InvalidAssertMessageLiteralArgument),
-        (Ruff, "041") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryNestedLiteral),
-        (Ruff, "043") => (RuleGroup::Preview, rules::ruff::rules::PytestRaisesAmbiguousPattern),
-        (Ruff, "045") => (RuleGroup::Preview, rules::ruff::rules::ImplicitClassVarInDataclass),
-        (Ruff, "046") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryCastToInt),
-        (Ruff, "047") => (RuleGroup::Preview, rules::ruff::rules::NeedlessElse),
-        (Ruff, "048") => (RuleGroup::Stable, rules::ruff::rules::MapIntVersionParsing),
-        (Ruff, "049") => (RuleGroup::Stable, rules::ruff::rules::DataclassEnum),
-        (Ruff, "051") => (RuleGroup::Stable, rules::ruff::rules::IfKeyInDictDel),
-        (Ruff, "052") => (RuleGroup::Preview, rules::ruff::rules::UsedDummyVariable),
-        (Ruff, "053") => (RuleGroup::Stable, rules::ruff::rules::ClassWithMixedTypeVars),
-        (Ruff, "054") => (RuleGroup::Preview, rules::ruff::rules::IndentedFormFeed),
-        (Ruff, "055") => (RuleGroup::Preview, rules::ruff::rules::UnnecessaryRegularExpression),
-        (Ruff, "056") => (RuleGroup::Preview, rules::ruff::rules::FalsyDictGetFallback),
-        (Ruff, "057") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryRound),
-        (Ruff, "058") => (RuleGroup::Stable, rules::ruff::rules::StarmapZip),
-        (Ruff, "059") => (RuleGroup::Preview, rules::ruff::rules::UnusedUnpackedVariable),
-        (Ruff, "060") => (RuleGroup::Preview, rules::ruff::rules::InEmptyCollection),
-        (Ruff, "061") => (RuleGroup::Preview, rules::ruff::rules::LegacyFormPytestRaises),
-        (Ruff, "063") => (RuleGroup::Preview, rules::ruff::rules::AccessAnnotationsFromClassDict),
-        (Ruff, "064") => (RuleGroup::Preview, rules::ruff::rules::NonOctalPermissions),
-        (Ruff, "100") => (RuleGroup::Stable, rules::ruff::rules::UnusedNOQA),
-        (Ruff, "101") => (RuleGroup::Stable, rules::ruff::rules::RedirectedNOQA),
-        (Ruff, "102") => (RuleGroup::Preview, rules::ruff::rules::InvalidRuleCode),
+        (Ruff, "001") => rules::ruff::rules::AmbiguousUnicodeCharacterString,
+        (Ruff, "002") => rules::ruff::rules::AmbiguousUnicodeCharacterDocstring,
+        (Ruff, "003") => rules::ruff::rules::AmbiguousUnicodeCharacterComment,
+        (Ruff, "005") => rules::ruff::rules::CollectionLiteralConcatenation,
+        (Ruff, "006") => rules::ruff::rules::AsyncioDanglingTask,
+        (Ruff, "007") => rules::ruff::rules::ZipInsteadOfPairwise,
+        (Ruff, "008") => rules::ruff::rules::MutableDataclassDefault,
+        (Ruff, "009") => rules::ruff::rules::FunctionCallInDataclassDefaultArgument,
+        (Ruff, "010") => rules::ruff::rules::ExplicitFStringTypeConversion,
+        (Ruff, "011") => rules::ruff::rules::RuffStaticKeyDictComprehension,
+        (Ruff, "012") => rules::ruff::rules::MutableClassDefault,
+        (Ruff, "013") => rules::ruff::rules::ImplicitOptional,
+        (Ruff, "015") => rules::ruff::rules::UnnecessaryIterableAllocationForFirstElement,
+        (Ruff, "016") => rules::ruff::rules::InvalidIndexType,
+        (Ruff, "017") => rules::ruff::rules::QuadraticListSummation,
+        (Ruff, "018") => rules::ruff::rules::AssignmentInAssert,
+        (Ruff, "019") => rules::ruff::rules::UnnecessaryKeyCheck,
+        (Ruff, "020") => rules::ruff::rules::NeverUnion,
+        (Ruff, "021") => rules::ruff::rules::ParenthesizeChainedOperators,
+        (Ruff, "022") => rules::ruff::rules::UnsortedDunderAll,
+        (Ruff, "023") => rules::ruff::rules::UnsortedDunderSlots,
+        (Ruff, "024") => rules::ruff::rules::MutableFromkeysValue,
+        (Ruff, "026") => rules::ruff::rules::DefaultFactoryKwarg,
+        (Ruff, "027") => rules::ruff::rules::MissingFStringSyntax,
+        (Ruff, "028") => rules::ruff::rules::InvalidFormatterSuppressionComment,
+        (Ruff, "029") => rules::ruff::rules::UnusedAsync,
+        (Ruff, "030") => rules::ruff::rules::AssertWithPrintMessage,
+        (Ruff, "031") => rules::ruff::rules::IncorrectlyParenthesizedTupleInSubscript,
+        (Ruff, "032") => rules::ruff::rules::DecimalFromFloatLiteral,
+        (Ruff, "033") => rules::ruff::rules::PostInitDefault,
+        (Ruff, "034") => rules::ruff::rules::UselessIfElse,
+        (Ruff, "035") => rules::ruff::rules::RuffUnsafeMarkupUse,
+        (Ruff, "036") => rules::ruff::rules::NoneNotAtEndOfUnion,
+        (Ruff, "037") => rules::ruff::rules::UnnecessaryEmptyIterableWithinDequeCall,
+        (Ruff, "038") => rules::ruff::rules::RedundantBoolLiteral,
+        (Ruff, "039") => rules::ruff::rules::UnrawRePattern,
+        (Ruff, "040") => rules::ruff::rules::InvalidAssertMessageLiteralArgument,
+        (Ruff, "041") => rules::ruff::rules::UnnecessaryNestedLiteral,
+        (Ruff, "043") => rules::ruff::rules::PytestRaisesAmbiguousPattern,
+        (Ruff, "045") => rules::ruff::rules::ImplicitClassVarInDataclass,
+        (Ruff, "046") => rules::ruff::rules::UnnecessaryCastToInt,
+        (Ruff, "047") => rules::ruff::rules::NeedlessElse,
+        (Ruff, "048") => rules::ruff::rules::MapIntVersionParsing,
+        (Ruff, "049") => rules::ruff::rules::DataclassEnum,
+        (Ruff, "051") => rules::ruff::rules::IfKeyInDictDel,
+        (Ruff, "052") => rules::ruff::rules::UsedDummyVariable,
+        (Ruff, "053") => rules::ruff::rules::ClassWithMixedTypeVars,
+        (Ruff, "054") => rules::ruff::rules::IndentedFormFeed,
+        (Ruff, "055") => rules::ruff::rules::UnnecessaryRegularExpression,
+        (Ruff, "056") => rules::ruff::rules::FalsyDictGetFallback,
+        (Ruff, "057") => rules::ruff::rules::UnnecessaryRound,
+        (Ruff, "058") => rules::ruff::rules::StarmapZip,
+        (Ruff, "059") => rules::ruff::rules::UnusedUnpackedVariable,
+        (Ruff, "060") => rules::ruff::rules::InEmptyCollection,
+        (Ruff, "061") => rules::ruff::rules::LegacyFormPytestRaises,
+        (Ruff, "063") => rules::ruff::rules::AccessAnnotationsFromClassDict,
+        (Ruff, "064") => rules::ruff::rules::NonOctalPermissions,
+        (Ruff, "065") => rules::ruff::rules::LoggingEagerConversion,
 
-        (Ruff, "200") => (RuleGroup::Stable, rules::ruff::rules::InvalidPyprojectToml),
+        (Ruff, "100") => rules::ruff::rules::UnusedNOQA,
+        (Ruff, "101") => rules::ruff::rules::RedirectedNOQA,
+        (Ruff, "102") => rules::ruff::rules::InvalidRuleCode,
+
+        (Ruff, "200") => rules::ruff::rules::InvalidPyprojectToml,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "900") => (RuleGroup::Stable, rules::ruff::rules::StableTestRule),
+        (Ruff, "900") => rules::ruff::rules::StableTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "901") => (RuleGroup::Stable, rules::ruff::rules::StableTestRuleSafeFix),
+        (Ruff, "901") => rules::ruff::rules::StableTestRuleSafeFix,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "902") => (RuleGroup::Stable, rules::ruff::rules::StableTestRuleUnsafeFix),
+        (Ruff, "902") => rules::ruff::rules::StableTestRuleUnsafeFix,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "903") => (RuleGroup::Stable, rules::ruff::rules::StableTestRuleDisplayOnlyFix),
+        (Ruff, "903") => rules::ruff::rules::StableTestRuleDisplayOnlyFix,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "911") => (RuleGroup::Preview, rules::ruff::rules::PreviewTestRule),
+        (Ruff, "911") => rules::ruff::rules::PreviewTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "920") => (RuleGroup::Deprecated, rules::ruff::rules::DeprecatedTestRule),
+        (Ruff, "920") => rules::ruff::rules::DeprecatedTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "921") => (RuleGroup::Deprecated, rules::ruff::rules::AnotherDeprecatedTestRule),
+        (Ruff, "921") => rules::ruff::rules::AnotherDeprecatedTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "930") => (RuleGroup::Removed, rules::ruff::rules::RemovedTestRule),
+        (Ruff, "930") => rules::ruff::rules::RemovedTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "931") => (RuleGroup::Removed, rules::ruff::rules::AnotherRemovedTestRule),
+        (Ruff, "931") => rules::ruff::rules::AnotherRemovedTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "940") => (RuleGroup::Removed, rules::ruff::rules::RedirectedFromTestRule),
+        (Ruff, "940") => rules::ruff::rules::RedirectedFromTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "950") => (RuleGroup::Stable, rules::ruff::rules::RedirectedToTestRule),
+        (Ruff, "950") => rules::ruff::rules::RedirectedToTestRule,
         #[cfg(any(feature = "test-rules", test))]
-        (Ruff, "960") => (RuleGroup::Removed, rules::ruff::rules::RedirectedFromPrefixTestRule),
+        (Ruff, "960") => rules::ruff::rules::RedirectedFromPrefixTestRule,
+        #[cfg(any(feature = "test-rules", test))]
+        (Ruff, "990") => rules::ruff::rules::PanicyTestRule,
 
 
         // flake8-django
-        (Flake8Django, "001") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoNullableModelStringField),
-        (Flake8Django, "003") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoLocalsInRenderFunction),
-        (Flake8Django, "006") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoExcludeWithModelForm),
-        (Flake8Django, "007") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoAllWithModelForm),
-        (Flake8Django, "008") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoModelWithoutDunderStr),
-        (Flake8Django, "012") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoUnorderedBodyContentInModel),
-        (Flake8Django, "013") => (RuleGroup::Stable, rules::flake8_django::rules::DjangoNonLeadingReceiverDecorator),
+        (Flake8Django, "001") => rules::flake8_django::rules::DjangoNullableModelStringField,
+        (Flake8Django, "003") => rules::flake8_django::rules::DjangoLocalsInRenderFunction,
+        (Flake8Django, "006") => rules::flake8_django::rules::DjangoExcludeWithModelForm,
+        (Flake8Django, "007") => rules::flake8_django::rules::DjangoAllWithModelForm,
+        (Flake8Django, "008") => rules::flake8_django::rules::DjangoModelWithoutDunderStr,
+        (Flake8Django, "012") => rules::flake8_django::rules::DjangoUnorderedBodyContentInModel,
+        (Flake8Django, "013") => rules::flake8_django::rules::DjangoNonLeadingReceiverDecorator,
 
         // flynt
-        // Reserved: (Flynt, "001") => (RuleGroup::Stable, Rule: :StringConcatenationToFString),
-        (Flynt, "002") => (RuleGroup::Stable, rules::flynt::rules::StaticJoinToFString),
+        // Reserved: (Flynt, "001") => Rule: :StringConcatenationToFString,
+        (Flynt, "002") => rules::flynt::rules::StaticJoinToFString,
 
         // flake8-todos
-        (Flake8Todos, "001") => (RuleGroup::Stable, rules::flake8_todos::rules::InvalidTodoTag),
-        (Flake8Todos, "002") => (RuleGroup::Stable, rules::flake8_todos::rules::MissingTodoAuthor),
-        (Flake8Todos, "003") => (RuleGroup::Stable, rules::flake8_todos::rules::MissingTodoLink),
-        (Flake8Todos, "004") => (RuleGroup::Stable, rules::flake8_todos::rules::MissingTodoColon),
-        (Flake8Todos, "005") => (RuleGroup::Stable, rules::flake8_todos::rules::MissingTodoDescription),
-        (Flake8Todos, "006") => (RuleGroup::Stable, rules::flake8_todos::rules::InvalidTodoCapitalization),
-        (Flake8Todos, "007") => (RuleGroup::Stable, rules::flake8_todos::rules::MissingSpaceAfterTodoColon),
+        (Flake8Todos, "001") => rules::flake8_todos::rules::InvalidTodoTag,
+        (Flake8Todos, "002") => rules::flake8_todos::rules::MissingTodoAuthor,
+        (Flake8Todos, "003") => rules::flake8_todos::rules::MissingTodoLink,
+        (Flake8Todos, "004") => rules::flake8_todos::rules::MissingTodoColon,
+        (Flake8Todos, "005") => rules::flake8_todos::rules::MissingTodoDescription,
+        (Flake8Todos, "006") => rules::flake8_todos::rules::InvalidTodoCapitalization,
+        (Flake8Todos, "007") => rules::flake8_todos::rules::MissingSpaceAfterTodoColon,
 
         // airflow
-        (Airflow, "001") => (RuleGroup::Stable, rules::airflow::rules::AirflowVariableNameTaskIdMismatch),
-        (Airflow, "002") => (RuleGroup::Preview, rules::airflow::rules::AirflowDagNoScheduleArgument),
-        (Airflow, "301") => (RuleGroup::Preview, rules::airflow::rules::Airflow3Removal),
-        (Airflow, "302") => (RuleGroup::Preview, rules::airflow::rules::Airflow3MovedToProvider),
-        (Airflow, "311") => (RuleGroup::Preview, rules::airflow::rules::Airflow3SuggestedUpdate),
-        (Airflow, "312") => (RuleGroup::Preview, rules::airflow::rules::Airflow3SuggestedToMoveToProvider),
+        (Airflow, "001") => rules::airflow::rules::AirflowVariableNameTaskIdMismatch,
+        (Airflow, "002") => rules::airflow::rules::AirflowDagNoScheduleArgument,
+        (Airflow, "301") => rules::airflow::rules::Airflow3Removal,
+        (Airflow, "302") => rules::airflow::rules::Airflow3MovedToProvider,
+        (Airflow, "311") => rules::airflow::rules::Airflow3SuggestedUpdate,
+        (Airflow, "312") => rules::airflow::rules::Airflow3SuggestedToMoveToProvider,
 
         // perflint
-        (Perflint, "101") => (RuleGroup::Stable, rules::perflint::rules::UnnecessaryListCast),
-        (Perflint, "102") => (RuleGroup::Stable, rules::perflint::rules::IncorrectDictIterator),
-        (Perflint, "203") => (RuleGroup::Stable, rules::perflint::rules::TryExceptInLoop),
-        (Perflint, "401") => (RuleGroup::Stable, rules::perflint::rules::ManualListComprehension),
-        (Perflint, "402") => (RuleGroup::Stable, rules::perflint::rules::ManualListCopy),
-        (Perflint, "403") => (RuleGroup::Stable, rules::perflint::rules::ManualDictComprehension),
+        (Perflint, "101") => rules::perflint::rules::UnnecessaryListCast,
+        (Perflint, "102") => rules::perflint::rules::IncorrectDictIterator,
+        (Perflint, "203") => rules::perflint::rules::TryExceptInLoop,
+        (Perflint, "401") => rules::perflint::rules::ManualListComprehension,
+        (Perflint, "402") => rules::perflint::rules::ManualListCopy,
+        (Perflint, "403") => rules::perflint::rules::ManualDictComprehension,
 
         // flake8-fixme
-        (Flake8Fixme, "001") => (RuleGroup::Stable, rules::flake8_fixme::rules::LineContainsFixme),
-        (Flake8Fixme, "002") => (RuleGroup::Stable, rules::flake8_fixme::rules::LineContainsTodo),
-        (Flake8Fixme, "003") => (RuleGroup::Stable, rules::flake8_fixme::rules::LineContainsXxx),
-        (Flake8Fixme, "004") => (RuleGroup::Stable, rules::flake8_fixme::rules::LineContainsHack),
+        (Flake8Fixme, "001") => rules::flake8_fixme::rules::LineContainsFixme,
+        (Flake8Fixme, "002") => rules::flake8_fixme::rules::LineContainsTodo,
+        (Flake8Fixme, "003") => rules::flake8_fixme::rules::LineContainsXxx,
+        (Flake8Fixme, "004") => rules::flake8_fixme::rules::LineContainsHack,
 
         // flake8-slots
-        (Flake8Slots, "000") => (RuleGroup::Stable, rules::flake8_slots::rules::NoSlotsInStrSubclass),
-        (Flake8Slots, "001") => (RuleGroup::Stable, rules::flake8_slots::rules::NoSlotsInTupleSubclass),
-        (Flake8Slots, "002") => (RuleGroup::Stable, rules::flake8_slots::rules::NoSlotsInNamedtupleSubclass),
+        (Flake8Slots, "000") => rules::flake8_slots::rules::NoSlotsInStrSubclass,
+        (Flake8Slots, "001") => rules::flake8_slots::rules::NoSlotsInTupleSubclass,
+        (Flake8Slots, "002") => rules::flake8_slots::rules::NoSlotsInNamedtupleSubclass,
 
         // refurb
-        (Refurb, "101") => (RuleGroup::Preview, rules::refurb::rules::ReadWholeFile),
-        (Refurb, "103") => (RuleGroup::Preview, rules::refurb::rules::WriteWholeFile),
-        (Refurb, "105") => (RuleGroup::Stable, rules::refurb::rules::PrintEmptyString),
-        (Refurb, "110") => (RuleGroup::Preview, rules::refurb::rules::IfExpInsteadOfOrOperator),
-        (Refurb, "113") => (RuleGroup::Preview, rules::refurb::rules::RepeatedAppend),
-        (Refurb, "116") => (RuleGroup::Preview, rules::refurb::rules::FStringNumberFormat),
-        (Refurb, "118") => (RuleGroup::Preview, rules::refurb::rules::ReimplementedOperator),
-        (Refurb, "122") => (RuleGroup::Stable, rules::refurb::rules::ForLoopWrites),
-        (Refurb, "129") => (RuleGroup::Stable, rules::refurb::rules::ReadlinesInFor),
-        (Refurb, "131") => (RuleGroup::Preview, rules::refurb::rules::DeleteFullSlice),
-        (Refurb, "132") => (RuleGroup::Stable, rules::refurb::rules::CheckAndRemoveFromSet),
-        (Refurb, "136") => (RuleGroup::Stable, rules::refurb::rules::IfExprMinMax),
-        (Refurb, "140") => (RuleGroup::Preview, rules::refurb::rules::ReimplementedStarmap),
-        (Refurb, "142") => (RuleGroup::Preview, rules::refurb::rules::ForLoopSetMutations),
-        (Refurb, "145") => (RuleGroup::Preview, rules::refurb::rules::SliceCopy),
-        (Refurb, "148") => (RuleGroup::Preview, rules::refurb::rules::UnnecessaryEnumerate),
-        (Refurb, "152") => (RuleGroup::Preview, rules::refurb::rules::MathConstant),
-        (Refurb, "154") => (RuleGroup::Preview, rules::refurb::rules::RepeatedGlobal),
-        (Refurb, "156") => (RuleGroup::Preview, rules::refurb::rules::HardcodedStringCharset),
-        (Refurb, "157") => (RuleGroup::Stable, rules::refurb::rules::VerboseDecimalConstructor),
-        (Refurb, "161") => (RuleGroup::Stable, rules::refurb::rules::BitCount),
-        (Refurb, "162") => (RuleGroup::Stable, rules::refurb::rules::FromisoformatReplaceZ),
-        (Refurb, "163") => (RuleGroup::Stable, rules::refurb::rules::RedundantLogBase),
-        (Refurb, "164") => (RuleGroup::Preview, rules::refurb::rules::UnnecessaryFromFloat),
-        (Refurb, "166") => (RuleGroup::Stable, rules::refurb::rules::IntOnSlicedStr),
-        (Refurb, "167") => (RuleGroup::Stable, rules::refurb::rules::RegexFlagAlias),
-        (Refurb, "168") => (RuleGroup::Stable, rules::refurb::rules::IsinstanceTypeNone),
-        (Refurb, "169") => (RuleGroup::Stable, rules::refurb::rules::TypeNoneComparison),
-        (Refurb, "171") => (RuleGroup::Preview, rules::refurb::rules::SingleItemMembershipTest),
-        (Refurb, "177") => (RuleGroup::Stable, rules::refurb::rules::ImplicitCwd),
-        (Refurb, "180") => (RuleGroup::Preview, rules::refurb::rules::MetaClassABCMeta),
-        (Refurb, "181") => (RuleGroup::Stable, rules::refurb::rules::HashlibDigestHex),
-        (Refurb, "187") => (RuleGroup::Stable, rules::refurb::rules::ListReverseCopy),
-        (Refurb, "188") => (RuleGroup::Stable, rules::refurb::rules::SliceToRemovePrefixOrSuffix),
-        (Refurb, "189") => (RuleGroup::Preview, rules::refurb::rules::SubclassBuiltin),
-        (Refurb, "192") => (RuleGroup::Preview, rules::refurb::rules::SortedMinMax),
+        (Refurb, "101") => rules::refurb::rules::ReadWholeFile,
+        (Refurb, "103") => rules::refurb::rules::WriteWholeFile,
+        (Refurb, "105") => rules::refurb::rules::PrintEmptyString,
+        (Refurb, "110") => rules::refurb::rules::IfExpInsteadOfOrOperator,
+        (Refurb, "113") => rules::refurb::rules::RepeatedAppend,
+        (Refurb, "116") => rules::refurb::rules::FStringNumberFormat,
+        (Refurb, "118") => rules::refurb::rules::ReimplementedOperator,
+        (Refurb, "122") => rules::refurb::rules::ForLoopWrites,
+        (Refurb, "129") => rules::refurb::rules::ReadlinesInFor,
+        (Refurb, "131") => rules::refurb::rules::DeleteFullSlice,
+        (Refurb, "132") => rules::refurb::rules::CheckAndRemoveFromSet,
+        (Refurb, "136") => rules::refurb::rules::IfExprMinMax,
+        (Refurb, "140") => rules::refurb::rules::ReimplementedStarmap,
+        (Refurb, "142") => rules::refurb::rules::ForLoopSetMutations,
+        (Refurb, "145") => rules::refurb::rules::SliceCopy,
+        (Refurb, "148") => rules::refurb::rules::UnnecessaryEnumerate,
+        (Refurb, "152") => rules::refurb::rules::MathConstant,
+        (Refurb, "154") => rules::refurb::rules::RepeatedGlobal,
+        (Refurb, "156") => rules::refurb::rules::HardcodedStringCharset,
+        (Refurb, "157") => rules::refurb::rules::VerboseDecimalConstructor,
+        (Refurb, "161") => rules::refurb::rules::BitCount,
+        (Refurb, "162") => rules::refurb::rules::FromisoformatReplaceZ,
+        (Refurb, "163") => rules::refurb::rules::RedundantLogBase,
+        (Refurb, "164") => rules::refurb::rules::UnnecessaryFromFloat,
+        (Refurb, "166") => rules::refurb::rules::IntOnSlicedStr,
+        (Refurb, "167") => rules::refurb::rules::RegexFlagAlias,
+        (Refurb, "168") => rules::refurb::rules::IsinstanceTypeNone,
+        (Refurb, "169") => rules::refurb::rules::TypeNoneComparison,
+        (Refurb, "171") => rules::refurb::rules::SingleItemMembershipTest,
+        (Refurb, "177") => rules::refurb::rules::ImplicitCwd,
+        (Refurb, "180") => rules::refurb::rules::MetaClassABCMeta,
+        (Refurb, "181") => rules::refurb::rules::HashlibDigestHex,
+        (Refurb, "187") => rules::refurb::rules::ListReverseCopy,
+        (Refurb, "188") => rules::refurb::rules::SliceToRemovePrefixOrSuffix,
+        (Refurb, "189") => rules::refurb::rules::SubclassBuiltin,
+        (Refurb, "192") => rules::refurb::rules::SortedMinMax,
 
         // flake8-logging
-        (Flake8Logging, "001") => (RuleGroup::Stable, rules::flake8_logging::rules::DirectLoggerInstantiation),
-        (Flake8Logging, "002") => (RuleGroup::Stable, rules::flake8_logging::rules::InvalidGetLoggerArgument),
-        (Flake8Logging, "004") => (RuleGroup::Preview, rules::flake8_logging::rules::LogExceptionOutsideExceptHandler),
-        (Flake8Logging, "007") => (RuleGroup::Stable, rules::flake8_logging::rules::ExceptionWithoutExcInfo),
-        (Flake8Logging, "009") => (RuleGroup::Stable, rules::flake8_logging::rules::UndocumentedWarn),
-        (Flake8Logging, "014") => (RuleGroup::Stable, rules::flake8_logging::rules::ExcInfoOutsideExceptHandler),
-        (Flake8Logging, "015") => (RuleGroup::Stable, rules::flake8_logging::rules::RootLoggerCall),
+        (Flake8Logging, "001") => rules::flake8_logging::rules::DirectLoggerInstantiation,
+        (Flake8Logging, "002") => rules::flake8_logging::rules::InvalidGetLoggerArgument,
+        (Flake8Logging, "004") => rules::flake8_logging::rules::LogExceptionOutsideExceptHandler,
+        (Flake8Logging, "007") => rules::flake8_logging::rules::ExceptionWithoutExcInfo,
+        (Flake8Logging, "009") => rules::flake8_logging::rules::UndocumentedWarn,
+        (Flake8Logging, "014") => rules::flake8_logging::rules::ExcInfoOutsideExceptHandler,
+        (Flake8Logging, "015") => rules::flake8_logging::rules::RootLoggerCall,
 
         _ => return None,
     })
diff --git a/crates/ruff_linter/src/directives.rs b/crates/ruff_linter/src/directives.rs
index bded1a8f2b..a642d57271 100644
--- a/crates/ruff_linter/src/directives.rs
+++ b/crates/ruff_linter/src/directives.rs
@@ -125,26 +125,27 @@ fn extract_noqa_line_for(tokens: &Tokens, locator: &Locator, indexer: &Indexer)
     }
 
     // The capacity allocated here might be more than we need if there are
-    // nested f-strings.
-    let mut fstring_mappings = Vec::with_capacity(indexer.fstring_ranges().len());
+    // nested interpolated strings.
+    let mut interpolated_string_mappings =
+        Vec::with_capacity(indexer.interpolated_string_ranges().len());
 
-    // For nested f-strings, we expect `noqa` directives on the last line of the
-    // outermost f-string. The last f-string range will be used to skip over
-    // the inner f-strings.
-    let mut last_fstring_range: TextRange = TextRange::default();
-    for fstring_range in indexer.fstring_ranges().values() {
-        if !locator.contains_line_break(*fstring_range) {
+    // For nested interpolated strings, we expect `noqa` directives on the last line of the
+    // outermost interpolated string. The last interpolated string range will be used to skip over
+    // the inner interpolated strings.
+    let mut last_interpolated_string_range: TextRange = TextRange::default();
+    for interpolated_string_range in indexer.interpolated_string_ranges().values() {
+        if !locator.contains_line_break(*interpolated_string_range) {
             continue;
         }
-        if last_fstring_range.contains_range(*fstring_range) {
+        if last_interpolated_string_range.contains_range(*interpolated_string_range) {
             continue;
         }
         let new_range = TextRange::new(
-            locator.line_start(fstring_range.start()),
-            fstring_range.end(),
+            locator.line_start(interpolated_string_range.start()),
+            interpolated_string_range.end(),
         );
-        fstring_mappings.push(new_range);
-        last_fstring_range = new_range;
+        interpolated_string_mappings.push(new_range);
+        last_interpolated_string_range = new_range;
     }
 
     let mut continuation_mappings = Vec::new();
@@ -172,11 +173,11 @@ fn extract_noqa_line_for(tokens: &Tokens, locator: &Locator, indexer: &Indexer)
 
     // Merge the mappings in sorted order
     let mut mappings = NoqaMapping::with_capacity(
-        continuation_mappings.len() + string_mappings.len() + fstring_mappings.len(),
+        continuation_mappings.len() + string_mappings.len() + interpolated_string_mappings.len(),
     );
 
     let string_mappings = SortedMergeIter {
-        left: fstring_mappings.into_iter().peekable(),
+        left: interpolated_string_mappings.into_iter().peekable(),
         right: string_mappings.into_iter().peekable(),
     };
     let all_mappings = SortedMergeIter {
@@ -497,12 +498,35 @@ end'''
             NoqaMapping::from_iter([TextRange::new(TextSize::from(6), TextSize::from(70))])
         );
 
+        let contents = "x = 1
+y = t'''abc
+def {f'''nested
+interpolated string''' f'another nested'}
+end'''
+";
+        assert_eq!(
+            noqa_mappings(contents),
+            NoqaMapping::from_iter([TextRange::new(TextSize::from(6), TextSize::from(82))])
+        );
+
         let contents = "x = 1
 y = f'normal'
 z = f'another but {f'nested but {f'still single line'} nested'}'
 ";
         assert_eq!(noqa_mappings(contents), NoqaMapping::default());
 
+        let contents = "x = 1
+y = t'normal'
+z = t'another but {t'nested but {t'still single line'} nested'}'
+";
+        assert_eq!(noqa_mappings(contents), NoqaMapping::default());
+
+        let contents = "x = 1
+y = f'normal'
+z = f'another but {t'nested but {f'still single line'} nested'}'
+";
+        assert_eq!(noqa_mappings(contents), NoqaMapping::default());
+
         let contents = r"x = \
     1";
         assert_eq!(
diff --git a/crates/ruff_linter/src/fix/codemods.rs b/crates/ruff_linter/src/fix/codemods.rs
index 29db53fed1..3d181dfeb7 100644
--- a/crates/ruff_linter/src/fix/codemods.rs
+++ b/crates/ruff_linter/src/fix/codemods.rs
@@ -14,6 +14,7 @@ use unicode_normalization::UnicodeNormalization;
 use ruff_python_ast::Stmt;
 use ruff_python_ast::name::UnqualifiedName;
 use ruff_python_codegen::Stylist;
+use ruff_text_size::Ranged;
 
 use crate::Locator;
 use crate::cst::matchers::match_statement;
@@ -64,7 +65,7 @@ pub(crate) fn remove_imports<'a>(
                     if member == "*" {
                         found_star = true;
                     } else {
-                        bail!("Expected \"*\" for unused import (got: \"{}\")", member);
+                        bail!("Expected \"*\" for unused import (got: \"{member}\")");
                     }
                 }
                 if !found_star {
@@ -127,10 +128,10 @@ pub(crate) fn remove_imports<'a>(
 pub(crate) fn retain_imports(
     member_names: &[&str],
     stmt: &Stmt,
-    locator: &Locator,
+    contents: &str,
     stylist: &Stylist,
 ) -> Result<String> {
-    let module_text = locator.slice(stmt);
+    let module_text = &contents[stmt.range()];
     let mut tree = match_statement(module_text)?;
 
     let Statement::Simple(body) = &mut tree else {
diff --git a/crates/ruff_linter/src/fix/edits.rs b/crates/ruff_linter/src/fix/edits.rs
index e4ac1b5d0f..05e90519eb 100644
--- a/crates/ruff_linter/src/fix/edits.rs
+++ b/crates/ruff_linter/src/fix/edits.rs
@@ -370,8 +370,8 @@ pub(crate) fn adjust_indentation(
 
     // If the range includes a multi-line string, use LibCST to ensure that we don't adjust the
     // whitespace _within_ the string.
-    let contains_multiline_string =
-        indexer.multiline_ranges().intersects(range) || indexer.fstring_ranges().intersects(range);
+    let contains_multiline_string = indexer.multiline_ranges().intersects(range)
+        || indexer.interpolated_string_ranges().intersects(range);
 
     // If the range has mixed indentation, we will use LibCST as well.
     let mixed_indentation = contents.universal_newlines().any(|line| {
diff --git a/crates/ruff_linter/src/fs.rs b/crates/ruff_linter/src/fs.rs
index 37fbf36bc6..5543d9a569 100644
--- a/crates/ruff_linter/src/fs.rs
+++ b/crates/ruff_linter/src/fs.rs
@@ -11,8 +11,7 @@ use crate::settings::types::CompiledPerFileIgnoreList;
 pub fn get_cwd() -> &'static Path {
     #[cfg(target_arch = "wasm32")]
     {
-        static CWD: std::sync::LazyLock<PathBuf> = std::sync::LazyLock::new(|| PathBuf::from("."));
-        &CWD
+        Path::new(".")
     }
     #[cfg(not(target_arch = "wasm32"))]
     path_absolutize::path_dedot::CWD.as_path()
@@ -58,13 +57,3 @@ pub fn relativize_path<P: AsRef<Path>>(path: P) -> String {
     }
     format!("{}", path.display())
 }
-
-/// Convert an absolute path to be relative to the specified project root.
-pub fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
-    format!(
-        "{}",
-        pathdiff::diff_paths(&path, project_root)
-            .expect("Could not diff paths")
-            .display()
-    )
-}
diff --git a/crates/ruff_linter/src/importer/mod.rs b/crates/ruff_linter/src/importer/mod.rs
index f4939a63d3..4ab9f7af13 100644
--- a/crates/ruff_linter/src/importer/mod.rs
+++ b/crates/ruff_linter/src/importer/mod.rs
@@ -6,10 +6,12 @@
 use std::error::Error;
 
 use anyhow::Result;
-use libcst_native::{ImportAlias, Name as cstName, NameOrAttribute};
+use libcst_native as cst;
 
+use ruff_diagnostics::Edit;
 use ruff_python_ast::{self as ast, Expr, ModModule, Stmt};
 use ruff_python_codegen::Stylist;
+use ruff_python_importer::Insertion;
 use ruff_python_parser::{Parsed, Tokens};
 use ruff_python_semantic::{
     ImportedName, MemberNameImport, ModuleNameImport, NameImport, SemanticModel,
@@ -17,22 +19,17 @@ use ruff_python_semantic::{
 use ruff_python_trivia::textwrap::indent;
 use ruff_text_size::{Ranged, TextSize};
 
-use crate::Edit;
-use crate::Locator;
 use crate::cst::matchers::{match_aliases, match_import_from, match_statement};
 use crate::fix;
 use crate::fix::codemods::CodegenStylist;
-use crate::importer::insertion::Insertion;
-
-mod insertion;
 
 pub(crate) struct Importer<'a> {
     /// The Python AST to which we are adding imports.
     python_ast: &'a [Stmt],
     /// The tokens representing the Python AST.
     tokens: &'a Tokens,
-    /// The [`Locator`] for the Python AST.
-    locator: &'a Locator<'a>,
+    /// The source code text for `python_ast`.
+    source: &'a str,
     /// The [`Stylist`] for the Python AST.
     stylist: &'a Stylist<'a>,
     /// The list of visited, top-level runtime imports in the Python AST.
@@ -44,13 +41,13 @@ pub(crate) struct Importer<'a> {
 impl<'a> Importer<'a> {
     pub(crate) fn new(
         parsed: &'a Parsed<ModModule>,
-        locator: &'a Locator<'a>,
+        source: &'a str,
         stylist: &'a Stylist<'a>,
     ) -> Self {
         Self {
             python_ast: parsed.suite(),
             tokens: parsed.tokens(),
-            locator,
+            source,
             stylist,
             runtime_imports: Vec::default(),
             type_checking_blocks: Vec::default(),
@@ -70,18 +67,25 @@ impl<'a> Importer<'a> {
     /// 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.
+    /// of the file. If there are future imports, the new import will be added
+    /// after the last future import. Otherwise, it will be added after the most
+    /// recent top-level import statement.
     pub(crate) fn add_import(&self, import: &NameImport, 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)
+            Insertion::end_of_statement(stmt, self.source, 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)
+            // Check if there are any future imports that we need to respect
+            if let Some(last_future_import) = self.find_last_future_import() {
+                // Insert after the last future import
+                Insertion::end_of_statement(last_future_import, self.source, self.stylist)
+                    .into_edit(&required_import)
+            } else {
+                // Insert at the start of the file.
+                Insertion::start_of_file(self.python_ast, self.source, self.stylist)
+                    .into_edit(&required_import)
+            }
         }
     }
 
@@ -99,17 +103,17 @@ impl<'a> Importer<'a> {
         let content = fix::codemods::retain_imports(
             &import.names,
             import.statement,
-            self.locator,
+            self.source,
             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)
+            Insertion::end_of_statement(stmt, self.source, self.stylist)
         } else {
             // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
+            Insertion::start_of_file(self.python_ast, self.source, self.stylist)
         };
         let add_import_edit = insertion.into_edit(&content);
 
@@ -131,7 +135,7 @@ impl<'a> Importer<'a> {
         let content = fix::codemods::retain_imports(
             &import.names,
             import.statement,
-            self.locator,
+            self.source,
             self.stylist,
         )?;
 
@@ -155,7 +159,7 @@ impl<'a> Importer<'a> {
                         None
                     } else {
                         Some(Edit::range_replacement(
-                            self.locator.slice(statement.range()).to_string(),
+                            self.source[statement.range()].to_string(),
                             statement.range(),
                         ))
                     }
@@ -186,7 +190,7 @@ impl<'a> Importer<'a> {
                     None
                 } else {
                     Some(Edit::range_replacement(
-                        self.locator.slice(type_checking.range()).to_string(),
+                        self.source[type_checking.range()].to_string(),
                         type_checking.range(),
                     ))
                 };
@@ -362,7 +366,7 @@ impl<'a> Importer<'a> {
         // 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(),
+            self.source[imported_name.range()].to_string(),
             imported_name.range(),
         );
         Ok(Some((import_edit, imported_name.into_name())))
@@ -469,11 +473,11 @@ impl<'a> Importer<'a> {
 
     /// 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))?;
+        let mut statement = match_statement(&self.source[stmt.range()])?;
         let import_from = match_import_from(&mut statement)?;
         let aliases = match_aliases(import_from)?;
-        aliases.push(ImportAlias {
-            name: NameOrAttribute::N(Box::new(cstName {
+        aliases.push(cst::ImportAlias {
+            name: cst::NameOrAttribute::N(Box::new(cst::Name {
                 value: member,
                 lpar: vec![],
                 rpar: vec![],
@@ -491,10 +495,10 @@ impl<'a> Importer<'a> {
     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)
+            Insertion::end_of_statement(stmt, self.source, self.stylist)
         } else {
             // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
+            Insertion::start_of_file(self.python_ast, self.source, self.stylist)
         };
         if insertion.is_inline() {
             Err(anyhow::anyhow!(
@@ -507,7 +511,7 @@ impl<'a> Importer<'a> {
 
     /// 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, self.tokens).into_edit(content)
+        Insertion::start_of_block(at, self.source, self.stylist, self.tokens).into_edit(content)
     }
 
     /// Return the import statement that precedes the given position, if any.
@@ -528,6 +532,18 @@ impl<'a> Importer<'a> {
         }
     }
 
+    /// Find the last `from __future__` import statement in the AST.
+    fn find_last_future_import(&self) -> Option<&'a Stmt> {
+        let mut body = self.python_ast.iter().peekable();
+        let _docstring = body.next_if(|stmt| ast::helpers::is_docstring_stmt(stmt));
+
+        body.take_while(|stmt| {
+            stmt.as_import_from_stmt()
+                .is_some_and(|import_from| import_from.module.as_deref() == Some("__future__"))
+        })
+        .last()
+    }
+
     /// Add a `from __future__ import annotations` import.
     pub(crate) fn add_future_import(&self) -> Edit {
         let import = &NameImport::ImportFrom(MemberNameImport::member(
diff --git a/crates/ruff_linter/src/linter.rs b/crates/ruff_linter/src/linter.rs
index e6dc3f3658..3503a69c25 100644
--- a/crates/ruff_linter/src/linter.rs
+++ b/crates/ruff_linter/src/linter.rs
@@ -24,17 +24,15 @@ use crate::checkers::tokens::check_tokens;
 use crate::directives::Directives;
 use crate::doc_lines::{doc_lines_from_ast, doc_lines_from_tokens};
 use crate::fix::{FixResult, fix_file};
-use crate::message::create_syntax_error_diagnostic;
 use crate::noqa::add_noqa;
 use crate::package::PackageRoot;
-use crate::preview::is_py314_support_enabled;
 use crate::registry::Rule;
 #[cfg(any(feature = "test-rules", test))]
 use crate::rules::ruff::rules::test_rules::{self, TEST_RULES, TestRule};
 use crate::settings::types::UnsafeFixes;
 use crate::settings::{LinterSettings, TargetVersion, flags};
 use crate::source_kind::SourceKind;
-use crate::{Locator, directives, fs, warn_user_once};
+use crate::{Locator, directives, fs};
 
 pub(crate) mod float;
 
@@ -319,6 +317,9 @@ pub fn check_path(
                         &context,
                     );
                 }
+                Rule::PanicyTestRule => {
+                    test_rules::PanicyTestRule::diagnostic(locator, comment_ranges, &context);
+                }
                 _ => unreachable!("All test rules must have an implementation"),
             }
         }
@@ -439,14 +440,6 @@ pub fn lint_only(
 ) -> LinterResult {
     let target_version = settings.resolve_target_version(path);
 
-    if matches!(target_version, TargetVersion(Some(PythonVersion::PY314)))
-        && !is_py314_support_enabled(settings)
-    {
-        warn_user_once!(
-            "Support for Python 3.14 is in preview and may undergo breaking changes. Enable `preview` to remove this warning."
-        );
-    }
-
     let parsed = source.into_parsed(source_kind, source_type, target_version.parser_version());
 
     // Map row and column locations to byte slices (lazily).
@@ -502,21 +495,20 @@ fn diagnostics_to_messages(
     parse_errors
         .iter()
         .map(|parse_error| {
-            create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
+            Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
         })
         .chain(unsupported_syntax_errors.iter().map(|syntax_error| {
-            create_syntax_error_diagnostic(source_file.clone(), syntax_error, syntax_error)
+            Diagnostic::invalid_syntax(source_file.clone(), syntax_error, syntax_error)
         }))
         .chain(
             semantic_syntax_errors
                 .iter()
-                .map(|error| create_syntax_error_diagnostic(source_file.clone(), error, error)),
+                .map(|error| Diagnostic::invalid_syntax(source_file.clone(), error, error)),
         )
         .chain(diagnostics.into_iter().map(|mut diagnostic| {
-            let noqa_offset = directives
-                .noqa_line_for
-                .resolve(diagnostic.expect_range().start());
-            diagnostic.set_noqa_offset(noqa_offset);
+            if let Some(range) = diagnostic.range() {
+                diagnostic.set_noqa_offset(directives.noqa_line_for.resolve(range.start()));
+            }
             diagnostic
         }))
         .collect()
@@ -549,14 +541,6 @@ pub fn lint_fix<'a>(
 
     let target_version = settings.resolve_target_version(path);
 
-    if matches!(target_version, TargetVersion(Some(PythonVersion::PY314)))
-        && !is_py314_support_enabled(settings)
-    {
-        warn_user_once!(
-            "Support for Python 3.14 is in preview and may undergo breaking changes. Enable `preview` to remove this warning."
-        );
-    }
-
     // Continuously fix until the source code stabilizes.
     loop {
         // Parse once.
@@ -983,7 +967,7 @@ mod tests {
             &parsed,
             target_version,
         );
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
+        diagnostics.sort_by(Diagnostic::ruff_start_ordering);
         diagnostics
     }
 
@@ -1056,6 +1040,42 @@ mod tests {
         PythonVersion::PY310,
         "DuplicateMatchKey"
     )]
+    #[test_case(
+        "global_parameter",
+        "
+        def f(a):
+            global a
+
+        def g(a):
+            if True:
+                global a 
+
+        def h(a):
+            def inner():
+                global a 
+
+        def i(a):
+            try:
+                global a 
+            except Exception:
+                pass
+
+        def f(a):
+            a = 1
+            global a
+        
+        def f(a):
+            a = 1
+            a = 2
+            global a
+        
+        def f(a):
+            class Inner:
+                global a   # ok
+        ",
+        PythonVersion::PY310,
+        "GlobalParameter"
+    )]
     #[test_case(
         "duplicate_match_class_attribute",
         "
@@ -1231,6 +1251,10 @@ mod tests {
     )]
     #[test_case(Rule::AwaitOutsideAsync, Path::new("await_outside_async_function.py"))]
     #[test_case(Rule::AwaitOutsideAsync, Path::new("async_comprehension.py"))]
+    #[test_case(
+        Rule::YieldFromInAsyncFunction,
+        Path::new("yield_from_in_async_function.py")
+    )]
     fn test_syntax_errors(rule: Rule, path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy().to_string();
         let path = Path::new("resources/test/fixtures/syntax_errors").join(path);
diff --git a/crates/ruff_linter/src/logging.rs b/crates/ruff_linter/src/logging.rs
index 5b293c797b..9dba2228b0 100644
--- a/crates/ruff_linter/src/logging.rs
+++ b/crates/ruff_linter/src/logging.rs
@@ -223,6 +223,11 @@ impl DisplayParseError {
     pub fn path(&self) -> Option<&Path> {
         self.path.as_deref()
     }
+
+    /// Return the underlying [`ParseError`].
+    pub fn error(&self) -> &ParseError {
+        &self.error
+    }
 }
 
 impl std::error::Error for DisplayParseError {}
diff --git a/crates/ruff_linter/src/message/diff.rs b/crates/ruff_linter/src/message/diff.rs
deleted file mode 100644
index 437fc0a830..0000000000
--- a/crates/ruff_linter/src/message/diff.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use std::fmt::{Display, Formatter};
-use std::num::NonZeroUsize;
-
-use colored::{Color, ColoredString, Colorize, Styles};
-use similar::{ChangeTag, TextDiff};
-
-use ruff_db::diagnostic::Diagnostic;
-use ruff_source_file::{OneIndexed, SourceFile};
-use ruff_text_size::{Ranged, TextRange, TextSize};
-
-use crate::text_helpers::ShowNonprinting;
-use crate::{Applicability, Fix};
-
-/// Renders a diff that shows the code fixes.
-///
-/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
-/// * Improve layout
-/// * Replace tabs with spaces for a consistent experience across terminals
-/// * Replace zero-width whitespaces
-/// * Print a simpler diff if only a single line has changed
-/// * Compute the diff from the [`Edit`] because diff calculation is expensive.
-pub(super) struct Diff<'a> {
-    fix: &'a Fix,
-    source_code: &'a SourceFile,
-}
-
-impl<'a> Diff<'a> {
-    pub(crate) fn from_message(message: &'a Diagnostic) -> Option<Diff<'a>> {
-        message.fix().map(|fix| Diff {
-            source_code: message.expect_ruff_source_file(),
-            fix,
-        })
-    }
-}
-
-impl Display for Diff<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        // TODO(dhruvmanila): Add support for Notebook cells once it's user-facing
-        let mut output = String::with_capacity(self.source_code.source_text().len());
-        let mut last_end = TextSize::default();
-
-        for edit in self.fix.edits() {
-            output.push_str(
-                self.source_code
-                    .slice(TextRange::new(last_end, edit.start())),
-            );
-            output.push_str(edit.content().unwrap_or_default());
-            last_end = edit.end();
-        }
-
-        output.push_str(&self.source_code.source_text()[usize::from(last_end)..]);
-
-        let diff = TextDiff::from_lines(self.source_code.source_text(), &output);
-
-        let message = match self.fix.applicability() {
-            // TODO(zanieb): Adjust this messaging once it's user-facing
-            Applicability::Safe => "Safe fix",
-            Applicability::Unsafe => "Unsafe fix",
-            Applicability::DisplayOnly => "Display-only fix",
-        };
-        writeln!(f, "ℹ {}", message.blue())?;
-
-        let (largest_old, largest_new) = diff
-            .ops()
-            .last()
-            .map(|op| (op.old_range().start, op.new_range().start))
-            .unwrap_or_default();
-
-        let digit_with =
-            calculate_print_width(OneIndexed::from_zero_indexed(largest_new.max(largest_old)));
-
-        for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
-            if idx > 0 {
-                writeln!(f, "{:-^1$}", "-", 80)?;
-            }
-            for op in group {
-                for change in diff.iter_inline_changes(op) {
-                    let sign = match change.tag() {
-                        ChangeTag::Delete => "-",
-                        ChangeTag::Insert => "+",
-                        ChangeTag::Equal => " ",
-                    };
-
-                    let line_style = LineStyle::from(change.tag());
-
-                    let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
-                    let new_index = change.new_index().map(OneIndexed::from_zero_indexed);
-
-                    write!(
-                        f,
-                        "{} {} |{}",
-                        Line {
-                            index: old_index,
-                            width: digit_with
-                        },
-                        Line {
-                            index: new_index,
-                            width: digit_with
-                        },
-                        line_style.apply_to(sign).bold()
-                    )?;
-
-                    for (emphasized, value) in change.iter_strings_lossy() {
-                        let value = value.show_nonprinting();
-                        if emphasized {
-                            write!(f, "{}", line_style.apply_to(&value).underline().on_black())?;
-                        } else {
-                            write!(f, "{}", line_style.apply_to(&value))?;
-                        }
-                    }
-                    if change.missing_newline() {
-                        writeln!(f)?;
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct LineStyle {
-    fgcolor: Option<Color>,
-    style: Option<Styles>,
-}
-
-impl LineStyle {
-    fn apply_to(&self, input: &str) -> ColoredString {
-        let mut colored = ColoredString::from(input);
-        if let Some(color) = self.fgcolor {
-            colored = colored.color(color);
-        }
-
-        if let Some(style) = self.style {
-            match style {
-                Styles::Clear => colored.clear(),
-                Styles::Bold => colored.bold(),
-                Styles::Dimmed => colored.dimmed(),
-                Styles::Underline => colored.underline(),
-                Styles::Reversed => colored.reversed(),
-                Styles::Italic => colored.italic(),
-                Styles::Blink => colored.blink(),
-                Styles::Hidden => colored.hidden(),
-                Styles::Strikethrough => colored.strikethrough(),
-            }
-        } else {
-            colored
-        }
-    }
-}
-
-impl From<ChangeTag> for LineStyle {
-    fn from(value: ChangeTag) -> Self {
-        match value {
-            ChangeTag::Equal => LineStyle {
-                fgcolor: None,
-                style: Some(Styles::Dimmed),
-            },
-            ChangeTag::Delete => LineStyle {
-                fgcolor: Some(Color::Red),
-                style: None,
-            },
-            ChangeTag::Insert => LineStyle {
-                fgcolor: Some(Color::Green),
-                style: None,
-            },
-        }
-    }
-}
-
-struct Line {
-    index: Option<OneIndexed>,
-    width: NonZeroUsize,
-}
-
-impl Display for Line {
-    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        match self.index {
-            None => {
-                for _ in 0..self.width.get() {
-                    f.write_str(" ")?;
-                }
-                Ok(())
-            }
-            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
-        }
-    }
-}
-
-/// Calculate the length of the string representation of `value`
-pub(super) fn calculate_print_width(mut value: OneIndexed) -> NonZeroUsize {
-    const TEN: OneIndexed = OneIndexed::from_zero_indexed(9);
-
-    let mut width = OneIndexed::ONE;
-
-    while value >= TEN {
-        value = OneIndexed::new(value.get() / 10).unwrap_or(OneIndexed::MIN);
-        width = width.checked_add(1).unwrap();
-    }
-
-    width
-}
diff --git a/crates/ruff_linter/src/message/github.rs b/crates/ruff_linter/src/message/github.rs
deleted file mode 100644
index 7c775e17cc..0000000000
--- a/crates/ruff_linter/src/message/github.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::io::Write;
-
-use ruff_db::diagnostic::Diagnostic;
-use ruff_source_file::LineColumn;
-
-use crate::fs::relativize_path;
-use crate::message::{Emitter, EmitterContext};
-
-/// Generate error workflow command in GitHub Actions format.
-/// See: [GitHub documentation](https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message)
-#[derive(Default)]
-pub struct GithubEmitter;
-
-impl Emitter for GithubEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        for diagnostic in diagnostics {
-            let source_location = diagnostic.expect_ruff_start_location();
-            let filename = diagnostic.expect_ruff_filename();
-            let location = if context.is_notebook(&filename) {
-                // We can't give a reasonable location for the structured formats,
-                // so we show one that's clearly a fallback
-                LineColumn::default()
-            } else {
-                source_location
-            };
-
-            let end_location = diagnostic.expect_ruff_end_location();
-
-            write!(
-                writer,
-                "::error title=Ruff ({code}),file={file},line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                code = diagnostic.secondary_code_or_id(),
-                file = filename,
-                row = source_location.line,
-                column = source_location.column,
-                end_row = end_location.line,
-                end_column = end_location.column,
-            )?;
-
-            write!(
-                writer,
-                "{path}:{row}:{column}:",
-                path = relativize_path(&filename),
-                row = location.line,
-                column = location.column,
-            )?;
-
-            if let Some(code) = diagnostic.secondary_code() {
-                write!(writer, " {code}")?;
-            } else {
-                write!(writer, " {id}:", id = diagnostic.id())?;
-            }
-
-            writeln!(writer, " {}", diagnostic.body())?;
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-
-    use crate::message::GithubEmitter;
-    use crate::message::tests::{
-        capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
-    };
-
-    #[test]
-    fn output() {
-        let mut emitter = GithubEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = GithubEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(content);
-    }
-}
diff --git a/crates/ruff_linter/src/message/gitlab.rs b/crates/ruff_linter/src/message/gitlab.rs
deleted file mode 100644
index fbf5643697..0000000000
--- a/crates/ruff_linter/src/message/gitlab.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use std::collections::HashSet;
-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_db::diagnostic::Diagnostic;
-
-use crate::fs::{relativize_path, relativize_path_to};
-use crate::message::{Emitter, EmitterContext};
-
-/// Generate JSON with violations in GitLab CI format
-//  https://docs.gitlab.com/ee/ci/testing/code_quality.html#implement-a-custom-tool
-pub struct GitlabEmitter {
-    project_dir: Option<String>,
-}
-
-impl Default for GitlabEmitter {
-    fn default() -> Self {
-        Self {
-            project_dir: std::env::var("CI_PROJECT_DIR").ok(),
-        }
-    }
-}
-
-impl Emitter for GitlabEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        serde_json::to_writer_pretty(
-            writer,
-            &SerializedMessages {
-                diagnostics,
-                context,
-                project_dir: self.project_dir.as_deref(),
-            },
-        )?;
-
-        Ok(())
-    }
-}
-
-struct SerializedMessages<'a> {
-    diagnostics: &'a [Diagnostic],
-    context: &'a EmitterContext<'a>,
-    project_dir: Option<&'a str>,
-}
-
-impl Serialize for SerializedMessages<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
-        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
-
-        for diagnostic in self.diagnostics {
-            let filename = diagnostic.expect_ruff_filename();
-
-            let (start_location, end_location) = if self.context.is_notebook(&filename) {
-                // We can't give a reasonable location for the structured formats,
-                // so we show one that's clearly a fallback
-                Default::default()
-            } else {
-                (
-                    diagnostic.expect_ruff_start_location(),
-                    diagnostic.expect_ruff_end_location(),
-                )
-            };
-
-            let path = self.project_dir.as_ref().map_or_else(
-                || relativize_path(&filename),
-                |project_dir| relativize_path_to(&filename, project_dir),
-            );
-
-            let mut message_fingerprint = fingerprint(diagnostic, &path, 0);
-
-            // Make sure that we do not get a fingerprint that is already in use
-            // by adding in the previously generated one.
-            while fingerprints.contains(&message_fingerprint) {
-                message_fingerprint = fingerprint(diagnostic, &path, message_fingerprint);
-            }
-            fingerprints.insert(message_fingerprint);
-
-            let description = diagnostic.body();
-            let check_name = diagnostic.secondary_code_or_id();
-
-            let value = json!({
-                "check_name": check_name,
-                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
-                // so prepend it to the description too.
-                "description": format!("{check_name}: {description}"),
-                "severity": "major",
-                "fingerprint": format!("{:x}", message_fingerprint),
-                "location": {
-                    "path": path,
-                    "positions": {
-                        "begin": start_location,
-                        "end": end_location,
-                    },
-                },
-            });
-
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-/// Generate a unique fingerprint to identify a violation.
-fn fingerprint(message: &Diagnostic, project_path: &str, salt: u64) -> u64 {
-    let mut hasher = DefaultHasher::new();
-
-    salt.hash(&mut hasher);
-    message.name().hash(&mut hasher);
-    project_path.hash(&mut hasher);
-
-    hasher.finish()
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-
-    use crate::message::GitlabEmitter;
-    use crate::message::tests::{
-        capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
-    };
-
-    #[test]
-    fn output() {
-        let mut emitter = GitlabEmitter::default();
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(redact_fingerprint(&content));
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = GitlabEmitter::default();
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(redact_fingerprint(&content));
-    }
-
-    // Redact the fingerprint because the default hasher isn't stable across platforms.
-    fn redact_fingerprint(content: &str) -> String {
-        static FINGERPRINT_HAY_KEY: &str = r#""fingerprint": ""#;
-
-        let mut output = String::with_capacity(content.len());
-        let mut last = 0;
-
-        for (start, _) in content.match_indices(FINGERPRINT_HAY_KEY) {
-            let fingerprint_hash_start = start + FINGERPRINT_HAY_KEY.len();
-            output.push_str(&content[last..fingerprint_hash_start]);
-            output.push_str("<redacted>");
-            last = fingerprint_hash_start
-                + content[fingerprint_hash_start..]
-                    .find('"')
-                    .expect("Expected terminating quote");
-        }
-
-        output.push_str(&content[last..]);
-
-        output
-    }
-}
diff --git a/crates/ruff_linter/src/message/grouped.rs b/crates/ruff_linter/src/message/grouped.rs
index 0a7de26b2d..0426697728 100644
--- a/crates/ruff_linter/src/message/grouped.rs
+++ b/crates/ruff_linter/src/message/grouped.rs
@@ -6,18 +6,25 @@ use std::num::NonZeroUsize;
 use colored::Colorize;
 
 use ruff_db::diagnostic::Diagnostic;
+use ruff_diagnostics::Applicability;
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 
 use crate::fs::relativize_path;
-use crate::message::diff::calculate_print_width;
 use crate::message::{Emitter, EmitterContext};
-use crate::settings::types::UnsafeFixes;
 
-#[derive(Default)]
 pub struct GroupedEmitter {
     show_fix_status: bool,
-    unsafe_fixes: UnsafeFixes,
+    applicability: Applicability,
+}
+
+impl Default for GroupedEmitter {
+    fn default() -> Self {
+        Self {
+            show_fix_status: false,
+            applicability: Applicability::Safe,
+        }
+    }
 }
 
 impl GroupedEmitter {
@@ -28,8 +35,8 @@ impl GroupedEmitter {
     }
 
     #[must_use]
-    pub fn with_unsafe_fixes(mut self, unsafe_fixes: UnsafeFixes) -> Self {
-        self.unsafe_fixes = unsafe_fixes;
+    pub fn with_applicability(mut self, applicability: Applicability) -> Self {
+        self.applicability = applicability;
         self
     }
 }
@@ -53,8 +60,8 @@ impl Emitter for GroupedEmitter {
                 max_column_length = max_column_length.max(message.start_location.column);
             }
 
-            let row_length = calculate_print_width(max_row_length);
-            let column_length = calculate_print_width(max_column_length);
+            let row_length = max_row_length.digits();
+            let column_length = max_column_length.digits();
 
             // Print the filename.
             writeln!(writer, "{}:", relativize_path(&*filename).underline())?;
@@ -68,7 +75,7 @@ impl Emitter for GroupedEmitter {
                         notebook_index: context.notebook_index(&message.expect_ruff_filename()),
                         message,
                         show_fix_status: self.show_fix_status,
-                        unsafe_fixes: self.unsafe_fixes,
+                        applicability: self.applicability,
                         row_length,
                         column_length,
                     }
@@ -106,7 +113,7 @@ fn group_diagnostics_by_filename(
             .or_insert_with(Vec::new)
             .push(MessageWithLocation {
                 message: diagnostic,
-                start_location: diagnostic.expect_ruff_start_location(),
+                start_location: diagnostic.ruff_start_location().unwrap_or_default(),
             });
     }
     grouped_messages
@@ -115,7 +122,7 @@ fn group_diagnostics_by_filename(
 struct DisplayGroupedMessage<'a> {
     message: MessageWithLocation<'a>,
     show_fix_status: bool,
-    unsafe_fixes: UnsafeFixes,
+    applicability: Applicability,
     row_length: NonZeroUsize,
     column_length: NonZeroUsize,
     notebook_index: Option<&'a NotebookIndex>,
@@ -131,8 +138,7 @@ impl Display for DisplayGroupedMessage<'_> {
         write!(
             f,
             "  {row_padding}",
-            row_padding = " "
-                .repeat(self.row_length.get() - calculate_print_width(start_location.line).get())
+            row_padding = " ".repeat(self.row_length.get() - start_location.line.digits().get())
         )?;
 
         // Check if we're working on a jupyter notebook and translate positions with cell accordingly
@@ -159,13 +165,12 @@ impl Display for DisplayGroupedMessage<'_> {
             f,
             "{row}{sep}{col}{col_padding} {code_and_body}",
             sep = ":".cyan(),
-            col_padding = " ".repeat(
-                self.column_length.get() - calculate_print_width(start_location.column).get()
-            ),
+            col_padding =
+                " ".repeat(self.column_length.get() - start_location.column.digits().get()),
             code_and_body = RuleCodeAndBody {
                 message,
                 show_fix_status: self.show_fix_status,
-                unsafe_fixes: self.unsafe_fixes
+                applicability: self.applicability
             },
         )?;
 
@@ -176,7 +181,7 @@ impl Display for DisplayGroupedMessage<'_> {
 pub(super) struct RuleCodeAndBody<'a> {
     pub(crate) message: &'a Diagnostic,
     pub(crate) show_fix_status: bool,
-    pub(crate) unsafe_fixes: UnsafeFixes,
+    pub(crate) applicability: Applicability,
 }
 
 impl Display for RuleCodeAndBody<'_> {
@@ -184,7 +189,7 @@ impl Display for RuleCodeAndBody<'_> {
         if self.show_fix_status {
             if let Some(fix) = self.message.fix() {
                 // Do not display an indicator for inapplicable fixes
-                if fix.applies(self.unsafe_fixes.required_applicability()) {
+                if fix.applies(self.applicability) {
                     if let Some(code) = self.message.secondary_code() {
                         write!(f, "{} ", code.red().bold())?;
                     }
@@ -220,11 +225,12 @@ impl Display for RuleCodeAndBody<'_> {
 mod tests {
     use insta::assert_snapshot;
 
+    use ruff_diagnostics::Applicability;
+
     use crate::message::GroupedEmitter;
     use crate::message::tests::{
         capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
     };
-    use crate::settings::types::UnsafeFixes;
 
     #[test]
     fn default() {
@@ -254,7 +260,7 @@ mod tests {
     fn fix_status_unsafe() {
         let mut emitter = GroupedEmitter::default()
             .with_show_fix_status(true)
-            .with_unsafe_fixes(UnsafeFixes::Enabled);
+            .with_applicability(Applicability::Unsafe);
         let content = capture_emitter_output(&mut emitter, &create_diagnostics());
 
         assert_snapshot!(content);
diff --git a/crates/ruff_linter/src/message/mod.rs b/crates/ruff_linter/src/message/mod.rs
index b6328c686b..2525322fd9 100644
--- a/crates/ruff_linter/src/message/mod.rs
+++ b/crates/ruff_linter/src/message/mod.rs
@@ -1,49 +1,78 @@
+use std::backtrace::BacktraceStatus;
 use std::fmt::Display;
 use std::io::Write;
+use std::path::Path;
 
+use ruff_db::panic::PanicError;
 use rustc_hash::FxHashMap;
 
 use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, FileResolver, Input, LintName, SecondaryCode, Severity,
-    Span, UnifiedFile,
+    Annotation, Diagnostic, DiagnosticFormat, DiagnosticId, DisplayDiagnosticConfig,
+    DisplayDiagnostics, DisplayGithubDiagnostics, FileResolver, GithubRenderer, Input, LintName,
+    SecondaryCode, Severity, Span, SubDiagnostic, SubDiagnosticSeverity, UnifiedFile,
 };
 use ruff_db::files::File;
 
-pub use github::GithubEmitter;
-pub use gitlab::GitlabEmitter;
 pub use grouped::GroupedEmitter;
 use ruff_notebook::NotebookIndex;
-use ruff_source_file::SourceFile;
-use ruff_text_size::{Ranged, TextRange, TextSize};
+use ruff_source_file::{SourceFile, SourceFileBuilder};
+use ruff_text_size::{TextRange, TextSize};
 pub use sarif::SarifEmitter;
-pub use text::TextEmitter;
 
 use crate::Fix;
 use crate::registry::Rule;
+use crate::settings::types::{OutputFormat, RuffOutputFormat};
 
-mod diff;
-mod github;
-mod gitlab;
 mod grouped;
 mod sarif;
-mod text;
 
-/// Creates a `Diagnostic` from a syntax error, with the format expected by Ruff.
-///
-/// This is almost identical to `ruff_db::diagnostic::create_syntax_error_diagnostic`, except the
-/// `message` is stored as the primary diagnostic message instead of on the primary annotation.
-///
-/// TODO(brent) These should be unified at some point, but we keep them separate for now to avoid a
-/// ton of snapshot changes while combining ruff's diagnostic type with `Diagnostic`.
-pub fn create_syntax_error_diagnostic(
-    span: impl Into<Span>,
-    message: impl std::fmt::Display,
-    range: impl Ranged,
-) -> Diagnostic {
-    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
-    let span = span.into().with_range(range.range());
-    diag.annotate(Annotation::primary(span));
-    diag
+/// Create a `Diagnostic` from a panic.
+pub fn create_panic_diagnostic(error: &PanicError, path: Option<&Path>) -> Diagnostic {
+    let mut diagnostic = Diagnostic::new(
+        DiagnosticId::Panic,
+        Severity::Fatal,
+        error.to_diagnostic_message(path.as_ref().map(|path| path.display())),
+    );
+
+    diagnostic.sub(SubDiagnostic::new(
+        SubDiagnosticSeverity::Info,
+        "This indicates a bug in Ruff.",
+    ));
+    let report_message = "If you could open an issue at \
+                            https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, \
+                            we'd be very appreciative!";
+    diagnostic.sub(SubDiagnostic::new(
+        SubDiagnosticSeverity::Info,
+        report_message,
+    ));
+
+    if let Some(backtrace) = &error.backtrace {
+        match backtrace.status() {
+            BacktraceStatus::Disabled => {
+                diagnostic.sub(SubDiagnostic::new(
+                            SubDiagnosticSeverity::Info,
+                            "run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information",
+                        ));
+            }
+            BacktraceStatus::Captured => {
+                diagnostic.sub(SubDiagnostic::new(
+                    SubDiagnosticSeverity::Info,
+                    format!("Backtrace:\n{backtrace}"),
+                ));
+            }
+            _ => {}
+        }
+    }
+
+    if let Some(path) = path {
+        let file = SourceFileBuilder::new(path.to_string_lossy(), "").finish();
+        let span = Span::from(file);
+        let mut annotation = Annotation::primary(span);
+        annotation.hide_snippet(true);
+        diagnostic.annotate(annotation);
+    }
+
+    diagnostic
 }
 
 #[expect(clippy::too_many_arguments)]
@@ -75,7 +104,7 @@ where
     // actually need it, but we need to be able to cache the new diagnostic model first. See
     // https://github.com/astral-sh/ruff/issues/19688.
     if range == TextRange::default() {
-        annotation.set_file_level(true);
+        annotation.hide_snippet(true);
     }
     diagnostic.annotate(annotation);
 
@@ -165,22 +194,54 @@ impl<'a> EmitterContext<'a> {
     }
 }
 
+pub fn render_diagnostics(
+    writer: &mut dyn Write,
+    format: OutputFormat,
+    config: DisplayDiagnosticConfig,
+    context: &EmitterContext<'_>,
+    diagnostics: &[Diagnostic],
+) -> std::io::Result<()> {
+    match DiagnosticFormat::try_from(format) {
+        Ok(format) => {
+            let config = config.format(format);
+            let value = DisplayDiagnostics::new(context, &config, diagnostics);
+            write!(writer, "{value}")?;
+        }
+        Err(RuffOutputFormat::Github) => {
+            let renderer = GithubRenderer::new(context, "Ruff");
+            let value = DisplayGithubDiagnostics::new(&renderer, diagnostics);
+            write!(writer, "{value}")?;
+        }
+        Err(RuffOutputFormat::Grouped) => {
+            GroupedEmitter::default()
+                .with_show_fix_status(config.show_fix_status())
+                .with_applicability(config.fix_applicability())
+                .emit(writer, diagnostics, context)
+                .map_err(std::io::Error::other)?;
+        }
+        Err(RuffOutputFormat::Sarif) => {
+            SarifEmitter
+                .emit(writer, diagnostics, context)
+                .map_err(std::io::Error::other)?;
+        }
+    }
+
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
     use rustc_hash::FxHashMap;
 
     use ruff_db::diagnostic::Diagnostic;
-    use ruff_notebook::NotebookIndex;
     use ruff_python_parser::{Mode, ParseOptions, parse_unchecked};
-    use ruff_source_file::{OneIndexed, SourceFileBuilder};
+    use ruff_source_file::SourceFileBuilder;
     use ruff_text_size::{TextRange, TextSize};
 
     use crate::codes::Rule;
     use crate::message::{Emitter, EmitterContext, create_lint_diagnostic};
     use crate::{Edit, Fix};
 
-    use super::create_syntax_error_diagnostic;
-
     pub(super) fn create_syntax_error_diagnostics() -> Vec<Diagnostic> {
         let source = r"from os import
 
@@ -193,7 +254,7 @@ if call(foo
             .errors()
             .iter()
             .map(|parse_error| {
-                create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
+                Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
             })
             .collect()
     }
@@ -262,104 +323,6 @@ def fibonacci(n):
         vec![unused_import, unused_variable, undefined_name]
     }
 
-    pub(super) fn create_notebook_diagnostics()
-    -> (Vec<Diagnostic>, FxHashMap<String, NotebookIndex>) {
-        let notebook = r"# cell 1
-import os
-# cell 2
-import math
-
-print('hello world')
-# cell 3
-def foo():
-    print()
-    x = 1
-";
-
-        let notebook_source = SourceFileBuilder::new("notebook.ipynb", notebook).finish();
-
-        let unused_import_os_start = TextSize::from(16);
-        let unused_import_os = create_lint_diagnostic(
-            "`os` imported but unused",
-            Some("Remove unused import: `os`"),
-            TextRange::new(unused_import_os_start, TextSize::from(18)),
-            Some(Fix::safe_edit(Edit::range_deletion(TextRange::new(
-                TextSize::from(9),
-                TextSize::from(19),
-            )))),
-            None,
-            notebook_source.clone(),
-            Some(unused_import_os_start),
-            Rule::UnusedImport,
-        );
-
-        let unused_import_math_start = TextSize::from(35);
-        let unused_import_math = create_lint_diagnostic(
-            "`math` imported but unused",
-            Some("Remove unused import: `math`"),
-            TextRange::new(unused_import_math_start, TextSize::from(39)),
-            Some(Fix::safe_edit(Edit::range_deletion(TextRange::new(
-                TextSize::from(28),
-                TextSize::from(40),
-            )))),
-            None,
-            notebook_source.clone(),
-            Some(unused_import_math_start),
-            Rule::UnusedImport,
-        );
-
-        let unused_variable_start = TextSize::from(98);
-        let unused_variable = create_lint_diagnostic(
-            "Local variable `x` is assigned to but never used",
-            Some("Remove assignment to unused variable `x`"),
-            TextRange::new(unused_variable_start, TextSize::from(99)),
-            Some(Fix::unsafe_edit(Edit::deletion(
-                TextSize::from(94),
-                TextSize::from(104),
-            ))),
-            None,
-            notebook_source,
-            Some(unused_variable_start),
-            Rule::UnusedVariable,
-        );
-
-        let mut notebook_indexes = FxHashMap::default();
-        notebook_indexes.insert(
-            "notebook.ipynb".to_string(),
-            NotebookIndex::new(
-                vec![
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(2),
-                ],
-                vec![
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(3),
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(3),
-                ],
-            ),
-        );
-
-        (
-            vec![unused_import_os, unused_import_math, unused_variable],
-            notebook_indexes,
-        )
-    }
-
     pub(super) fn capture_emitter_output(
         emitter: &mut dyn Emitter,
         diagnostics: &[Diagnostic],
@@ -371,16 +334,4 @@ def foo():
 
         String::from_utf8(output).expect("Output to be valid UTF-8")
     }
-
-    pub(super) fn capture_emitter_notebook_output(
-        emitter: &mut dyn Emitter,
-        diagnostics: &[Diagnostic],
-        notebook_indexes: &FxHashMap<String, NotebookIndex>,
-    ) -> String {
-        let context = EmitterContext::new(notebook_indexes);
-        let mut output: Vec<u8> = Vec::new();
-        emitter.emit(&mut output, diagnostics, &context).unwrap();
-
-        String::from_utf8(output).expect("Output to be valid UTF-8")
-    }
 }
diff --git a/crates/ruff_linter/src/message/sarif.rs b/crates/ruff_linter/src/message/sarif.rs
index cf738b875d..78c316b130 100644
--- a/crates/ruff_linter/src/message/sarif.rs
+++ b/crates/ruff_linter/src/message/sarif.rs
@@ -2,17 +2,24 @@ use std::collections::HashSet;
 use std::io::Write;
 
 use anyhow::Result;
+use log::warn;
 use serde::{Serialize, Serializer};
 use serde_json::json;
 
 use ruff_db::diagnostic::{Diagnostic, SecondaryCode};
-use ruff_source_file::OneIndexed;
+use ruff_source_file::{OneIndexed, SourceFile};
+use ruff_text_size::{Ranged, TextRange};
 
 use crate::VERSION;
 use crate::fs::normalize_path;
 use crate::message::{Emitter, EmitterContext};
 use crate::registry::{Linter, RuleNamespace};
 
+/// An emitter for producing SARIF 2.1.0-compliant JSON output.
+///
+/// Static Analysis Results Interchange Format (SARIF) is a standard format
+/// for static analysis results. For full specfification, see:
+/// [SARIF 2.1.0](https://docs.oasis-open.org/sarif/sarif/v2.1.0/sarif-v2.1.0.html)
 pub struct SarifEmitter;
 
 impl Emitter for SarifEmitter {
@@ -29,7 +36,7 @@ impl Emitter for SarifEmitter {
 
         let unique_rules: HashSet<_> = results
             .iter()
-            .filter_map(|result| result.code.as_secondary_code())
+            .filter_map(|result| result.rule_id.as_secondary_code())
             .collect();
         let mut rules: Vec<SarifRule> = unique_rules.into_iter().map(SarifRule::from).collect();
         rules.sort_by(|a, b| a.code.cmp(b.code));
@@ -134,6 +141,15 @@ impl RuleCode<'_> {
     }
 }
 
+impl Serialize for RuleCode<'_> {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
 impl<'a> From<&'a Diagnostic> for RuleCode<'a> {
     fn from(code: &'a Diagnostic) -> Self {
         match code.secondary_code() {
@@ -143,12 +159,83 @@ impl<'a> From<&'a Diagnostic> for RuleCode<'a> {
     }
 }
 
-#[derive(Debug)]
+/// Represents a single result in a SARIF 2.1.0 report.
+///
+/// See the SARIF 2.1.0 specification for details:
+/// [SARIF 2.1.0](https://docs.oasis-open.org/sarif/sarif/v2.1.0/sarif-v2.1.0.html)
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
 struct SarifResult<'a> {
-    code: RuleCode<'a>,
+    rule_id: RuleCode<'a>,
     level: String,
-    message: String,
+    message: SarifMessage,
+    locations: Vec<SarifLocation>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    fixes: Vec<SarifFix>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifMessage {
+    text: String,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifPhysicalLocation {
+    artifact_location: SarifArtifactLocation,
+    region: SarifRegion,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifLocation {
+    physical_location: SarifPhysicalLocation,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifFix {
+    description: RuleDescription,
+    artifact_changes: Vec<SarifArtifactChange>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct RuleDescription {
+    text: Option<String>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifArtifactChange {
+    artifact_location: SarifArtifactLocation,
+    replacements: Vec<SarifReplacement>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifArtifactLocation {
     uri: String,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SarifReplacement {
+    deleted_region: SarifRegion,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    inserted_content: Option<InsertedContent>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct InsertedContent {
+    text: String,
+}
+
+#[derive(Debug, Serialize, Clone, Copy)]
+#[serde(rename_all = "camelCase")]
+struct SarifRegion {
     start_line: OneIndexed,
     start_column: OneIndexed,
     end_line: OneIndexed,
@@ -156,70 +243,107 @@ struct SarifResult<'a> {
 }
 
 impl<'a> SarifResult<'a> {
-    #[cfg(not(target_arch = "wasm32"))]
-    fn from_message(message: &'a Diagnostic) -> Result<Self> {
-        let start_location = message.expect_ruff_start_location();
-        let end_location = message.expect_ruff_end_location();
-        let path = normalize_path(&*message.expect_ruff_filename());
-        Ok(Self {
-            code: RuleCode::from(message),
-            level: "error".to_string(),
-            message: message.body().to_string(),
-            uri: url::Url::from_file_path(&path)
-                .map_err(|()| anyhow::anyhow!("Failed to convert path to URL: {}", path.display()))?
-                .to_string(),
+    fn range_to_sarif_region(source_file: &SourceFile, range: TextRange) -> SarifRegion {
+        let source_code = source_file.to_source_code();
+        let start_location = source_code.line_column(range.start());
+        let end_location = source_code.line_column(range.end());
+
+        SarifRegion {
             start_line: start_location.line,
             start_column: start_location.column,
             end_line: end_location.line,
             end_column: end_location.column,
-        })
+        }
     }
 
-    #[cfg(target_arch = "wasm32")]
-    #[expect(clippy::unnecessary_wraps)]
-    fn from_message(message: &'a Diagnostic) -> Result<Self> {
-        let start_location = message.expect_ruff_start_location();
-        let end_location = message.expect_ruff_end_location();
-        let path = normalize_path(&*message.expect_ruff_filename());
-        Ok(Self {
-            code: RuleCode::from(message),
-            level: "error".to_string(),
-            message: message.body().to_string(),
-            uri: path.display().to_string(),
-            start_line: start_location.line,
-            start_column: start_location.column,
-            end_line: end_location.line,
-            end_column: end_location.column,
-        })
-    }
-}
+    fn fix(diagnostic: &'a Diagnostic, uri: &str) -> Option<SarifFix> {
+        let fix = diagnostic.fix()?;
 
-impl Serialize for SarifResult<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        json!({
-            "level": self.level,
-            "message": {
-                "text": self.message,
-            },
-            "locations": [{
-                "physicalLocation": {
-                    "artifactLocation": {
-                        "uri": self.uri,
-                    },
-                    "region": {
-                        "startLine": self.start_line,
-                        "startColumn": self.start_column,
-                        "endLine": self.end_line,
-                        "endColumn": self.end_column,
-                    }
+        let Some(source_file) = diagnostic.ruff_source_file() else {
+            debug_assert!(
+                false,
+                "Omitting the fix for diagnostic with id `{}` because the source file is missing. This is a bug in Ruff, please report an issue.",
+                diagnostic.id()
+            );
+
+            warn!(
+                "Omitting the fix for diagnostic with id `{}` because the source file is missing. This is a bug in Ruff, please report an issue.",
+                diagnostic.id()
+            );
+            return None;
+        };
+
+        let fix_description = diagnostic
+            .first_help_text()
+            .map(std::string::ToString::to_string);
+
+        let replacements: Vec<SarifReplacement> = fix
+            .edits()
+            .iter()
+            .map(|edit| {
+                let range = edit.range();
+                let deleted_region = Self::range_to_sarif_region(source_file, range);
+                SarifReplacement {
+                    deleted_region,
+                    inserted_content: edit.content().map(|content| InsertedContent {
+                        text: content.to_string(),
+                    }),
                 }
-            }],
-            "ruleId": self.code.as_str(),
+            })
+            .collect();
+
+        let artifact_changes = vec![SarifArtifactChange {
+            artifact_location: SarifArtifactLocation {
+                uri: uri.to_string(),
+            },
+            replacements,
+        }];
+
+        Some(SarifFix {
+            description: RuleDescription {
+                text: fix_description,
+            },
+            artifact_changes,
+        })
+    }
+
+    #[allow(clippy::unnecessary_wraps)]
+    fn uri(diagnostic: &Diagnostic) -> Result<String> {
+        let path = normalize_path(&*diagnostic.expect_ruff_filename());
+        #[cfg(not(target_arch = "wasm32"))]
+        return url::Url::from_file_path(&path)
+            .map_err(|()| anyhow::anyhow!("Failed to convert path to URL: {}", path.display()))
+            .map(|u| u.to_string());
+        #[cfg(target_arch = "wasm32")]
+        return Ok(format!("file://{}", path.display()));
+    }
+
+    fn from_message(diagnostic: &'a Diagnostic) -> Result<Self> {
+        let start_location = diagnostic.ruff_start_location().unwrap_or_default();
+        let end_location = diagnostic.ruff_end_location().unwrap_or_default();
+        let region = SarifRegion {
+            start_line: start_location.line,
+            start_column: start_location.column,
+            end_line: end_location.line,
+            end_column: end_location.column,
+        };
+
+        let uri = Self::uri(diagnostic)?;
+
+        Ok(Self {
+            rule_id: RuleCode::from(diagnostic),
+            level: "error".to_string(),
+            message: SarifMessage {
+                text: diagnostic.body().to_string(),
+            },
+            fixes: Self::fix(diagnostic, &uri).into_iter().collect(),
+            locations: vec![SarifLocation {
+                physical_location: SarifPhysicalLocation {
+                    artifact_location: SarifArtifactLocation { uri },
+                    region,
+                },
+            }],
         })
-        .serialize(serializer)
     }
 }
 
@@ -256,6 +380,7 @@ mod tests {
         insta::assert_json_snapshot!(value, {
             ".runs[0].tool.driver.version" => "[VERSION]",
             ".runs[0].results[].locations[].physicalLocation.artifactLocation.uri" => "[URI]",
+            ".runs[0].results[].fixes[].artifactChanges[].artifactLocation.uri" => "[URI]",
         });
     }
 }
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__github__tests__output.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__github__tests__output.snap
deleted file mode 100644
index c816059368..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__github__tests__output.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: crates/ruff_linter/src/message/github.rs
-expression: content
-snapshot_kind: text
----
-::error title=Ruff (F401),file=fib.py,line=1,col=8,endLine=1,endColumn=10::fib.py:1:8: F401 `os` imported but unused
-::error title=Ruff (F841),file=fib.py,line=6,col=5,endLine=6,endColumn=6::fib.py:6:5: F841 Local variable `x` is assigned to but never used
-::error title=Ruff (F821),file=undef.py,line=1,col=4,endLine=1,endColumn=5::undef.py:1:4: F821 Undefined name `a`
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__github__tests__syntax_errors.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__github__tests__syntax_errors.snap
deleted file mode 100644
index 55436236c1..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__github__tests__syntax_errors.snap
+++ /dev/null
@@ -1,6 +0,0 @@
----
-source: crates/ruff_linter/src/message/github.rs
-expression: content
----
-::error title=Ruff (invalid-syntax),file=syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=Ruff (invalid-syntax),file=syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__sarif__tests__results.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__sarif__tests__results.snap
index a4ddc029fb..c8c125c6a5 100644
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__sarif__tests__results.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__sarif__tests__results.snap
@@ -8,6 +8,30 @@ expression: value
     {
       "results": [
         {
+          "fixes": [
+            {
+              "artifactChanges": [
+                {
+                  "artifactLocation": {
+                    "uri": "[URI]"
+                  },
+                  "replacements": [
+                    {
+                      "deletedRegion": {
+                        "endColumn": 1,
+                        "endLine": 2,
+                        "startColumn": 1,
+                        "startLine": 1
+                      }
+                    }
+                  ]
+                }
+              ],
+              "description": {
+                "text": "Remove unused import: `os`"
+              }
+            }
+          ],
           "level": "error",
           "locations": [
             {
@@ -30,6 +54,30 @@ expression: value
           "ruleId": "F401"
         },
         {
+          "fixes": [
+            {
+              "artifactChanges": [
+                {
+                  "artifactLocation": {
+                    "uri": "[URI]"
+                  },
+                  "replacements": [
+                    {
+                      "deletedRegion": {
+                        "endColumn": 10,
+                        "endLine": 6,
+                        "startColumn": 5,
+                        "startLine": 6
+                      }
+                    }
+                  ]
+                }
+              ],
+              "description": {
+                "text": "Remove assignment to unused variable `x`"
+              }
+            }
+          ],
           "level": "error",
           "locations": [
             {
@@ -81,7 +129,7 @@ expression: value
           "rules": [
             {
               "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\n\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n\n[preview]: https://docs.astral.sh/ruff/preview/\n"
               },
               "help": {
                 "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
@@ -119,7 +167,7 @@ expression: value
             },
             {
               "fullDescription": {
-                "text": "## What it does\nChecks for the presence of unused variables in function scopes.\n\n## Why is this bad?\nA variable that is defined but not used is likely a mistake, and should\nbe removed to avoid confusion.\n\nIf a variable is intentionally defined-but-not-used, it should be\nprefixed with an underscore, or some other value that adheres to the\n[`lint.dummy-variable-rgx`] pattern.\n\n## Example\n```python\ndef foo():\n    x = 1\n    y = 2\n    return x\n```\n\nUse instead:\n```python\ndef foo():\n    x = 1\n    return x\n```\n\n## Fix safety\n\nThis rule's fix is marked as unsafe because removing an unused variable assignment may\ndelete comments that are attached to the assignment.\n\n## Options\n- `lint.dummy-variable-rgx`\n"
+                "text": "## What it does\nChecks for the presence of unused variables in function scopes.\n\n## Why is this bad?\nA variable that is defined but not used is likely a mistake, and should\nbe removed to avoid confusion.\n\nIf a variable is intentionally defined-but-not-used, it should be\nprefixed with an underscore, or some other value that adheres to the\n[`lint.dummy-variable-rgx`] pattern.\n\n## Example\n```python\ndef foo():\n    x = 1\n    y = 2\n    return x\n```\n\nUse instead:\n```python\ndef foo():\n    x = 1\n    return x\n```\n\n## Fix safety\n\nThis rule's fix is marked as unsafe because removing an unused variable assignment may\ndelete comments that are attached to the assignment.\n\n## See also\n\nThis rule does not apply to bindings in unpacked assignments (e.g. `x, y = 1, 2`). See\n[`unused-unpacked-variable`][RUF059] for this case.\n\n## Options\n- `lint.dummy-variable-rgx`\n\n[RUF059]: https://docs.astral.sh/ruff/rules/unused-unpacked-variable/\n"
               },
               "help": {
                 "text": "Local variable `{name}` is assigned to but never used"
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__default.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__default.snap
deleted file mode 100644
index 480dd582a7..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__default.snap
+++ /dev/null
@@ -1,30 +0,0 @@
----
-source: crates/ruff_linter/src/message/text.rs
-expression: content
----
-F401 `os` imported but unused
- --> fib.py:1:8
-  |
-1 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F841 Local variable `x` is assigned to but never used
- --> fib.py:6:5
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^
-7 |     if n == 0:
-8 |         return 0
-  |
-help: Remove assignment to unused variable `x`
-
-F821 Undefined name `a`
- --> undef.py:1:4
-  |
-1 | if a == 1: pass
-  |    ^
-  |
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__fix_status.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__fix_status.snap
deleted file mode 100644
index 480dd582a7..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__fix_status.snap
+++ /dev/null
@@ -1,30 +0,0 @@
----
-source: crates/ruff_linter/src/message/text.rs
-expression: content
----
-F401 `os` imported but unused
- --> fib.py:1:8
-  |
-1 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F841 Local variable `x` is assigned to but never used
- --> fib.py:6:5
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^
-7 |     if n == 0:
-8 |         return 0
-  |
-help: Remove assignment to unused variable `x`
-
-F821 Undefined name `a`
- --> undef.py:1:4
-  |
-1 | if a == 1: pass
-  |    ^
-  |
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__fix_status_unsafe.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__fix_status_unsafe.snap
deleted file mode 100644
index adee375b6c..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__fix_status_unsafe.snap
+++ /dev/null
@@ -1,30 +0,0 @@
----
-source: crates/ruff_linter/src/message/text.rs
-expression: content
----
-F401 [*] `os` imported but unused
- --> fib.py:1:8
-  |
-1 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F841 [*] Local variable `x` is assigned to but never used
- --> fib.py:6:5
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^
-7 |     if n == 0:
-8 |         return 0
-  |
-help: Remove assignment to unused variable `x`
-
-F821 Undefined name `a`
- --> undef.py:1:4
-  |
-1 | if a == 1: pass
-  |    ^
-  |
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__notebook_output.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__notebook_output.snap
deleted file mode 100644
index 969d44dc7e..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__notebook_output.snap
+++ /dev/null
@@ -1,33 +0,0 @@
----
-source: crates/ruff_linter/src/message/text.rs
-expression: content
----
-F401 [*] `os` imported but unused
- --> notebook.ipynb:cell 1:2:8
-  |
-1 | # cell 1
-2 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F401 [*] `math` imported but unused
- --> notebook.ipynb:cell 2:2:8
-  |
-1 | # cell 2
-2 | import math
-  |        ^^^^
-3 |
-4 | print('hello world')
-  |
-help: Remove unused import: `math`
-
-F841 [*] Local variable `x` is assigned to but never used
- --> notebook.ipynb:cell 3:4:5
-  |
-2 | def foo():
-3 |     print()
-4 |     x = 1
-  |     ^
-  |
-help: Remove assignment to unused variable `x`
diff --git a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__syntax_errors.snap b/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__syntax_errors.snap
deleted file mode 100644
index af19a135dd..0000000000
--- a/crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__syntax_errors.snap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-source: crates/ruff_linter/src/message/text.rs
-expression: content
----
-invalid-syntax: Expected one or more symbol names after import
- --> syntax_errors.py:1:15
-  |
-1 | from os import
-  |               ^
-2 |
-3 | if call(foo
-  |
-
-invalid-syntax: Expected ')', found newline
- --> syntax_errors.py:3:12
-  |
-1 | from os import
-2 |
-3 | if call(foo
-  |            ^
-4 |     def bar():
-5 |         pass
-  |
diff --git a/crates/ruff_linter/src/message/text.rs b/crates/ruff_linter/src/message/text.rs
deleted file mode 100644
index 610a7a750c..0000000000
--- a/crates/ruff_linter/src/message/text.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::io::Write;
-
-use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};
-
-use crate::message::diff::Diff;
-use crate::message::{Emitter, EmitterContext};
-use crate::settings::types::UnsafeFixes;
-
-pub struct TextEmitter {
-    /// Whether to show the diff of a fix, for diagnostics that have a fix.
-    ///
-    /// Note that this is not currently exposed in the CLI (#7352) and is only used in tests.
-    show_fix_diff: bool,
-    config: DisplayDiagnosticConfig,
-}
-
-impl Default for TextEmitter {
-    fn default() -> Self {
-        Self {
-            show_fix_diff: false,
-            config: DisplayDiagnosticConfig::default()
-                .format(DiagnosticFormat::Concise)
-                .hide_severity(true)
-                .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize()),
-        }
-    }
-}
-
-impl TextEmitter {
-    #[must_use]
-    pub fn with_show_fix_status(mut self, show_fix_status: bool) -> Self {
-        self.config = self.config.show_fix_status(show_fix_status);
-        self
-    }
-
-    #[must_use]
-    pub fn with_show_fix_diff(mut self, show_fix_diff: bool) -> Self {
-        self.show_fix_diff = show_fix_diff;
-        self
-    }
-
-    #[must_use]
-    pub fn with_show_source(mut self, show_source: bool) -> Self {
-        self.config = self.config.format(if show_source {
-            DiagnosticFormat::Full
-        } else {
-            DiagnosticFormat::Concise
-        });
-        self
-    }
-
-    #[must_use]
-    pub fn with_unsafe_fixes(mut self, unsafe_fixes: UnsafeFixes) -> Self {
-        self.config = self
-            .config
-            .fix_applicability(unsafe_fixes.required_applicability());
-        self
-    }
-
-    #[must_use]
-    pub fn with_preview(mut self, preview: bool) -> Self {
-        self.config = self.config.preview(preview);
-        self
-    }
-
-    #[must_use]
-    pub fn with_color(mut self, color: bool) -> Self {
-        self.config = self.config.color(color);
-        self
-    }
-}
-
-impl Emitter for TextEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        for message in diagnostics {
-            write!(writer, "{}", message.display(context, &self.config))?;
-
-            if self.show_fix_diff {
-                if let Some(diff) = Diff::from_message(message) {
-                    writeln!(writer, "{diff}")?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-
-    use crate::message::TextEmitter;
-    use crate::message::tests::{
-        capture_emitter_notebook_output, capture_emitter_output, create_diagnostics,
-        create_notebook_diagnostics, create_syntax_error_diagnostics,
-    };
-    use crate::settings::types::UnsafeFixes;
-
-    #[test]
-    fn default() {
-        let mut emitter = TextEmitter::default().with_show_source(true);
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn fix_status() {
-        let mut emitter = TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_show_source(true);
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn fix_status_unsafe() {
-        let mut emitter = TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_show_source(true)
-            .with_unsafe_fixes(UnsafeFixes::Enabled);
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn notebook_output() {
-        let mut emitter = TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_show_source(true)
-            .with_unsafe_fixes(UnsafeFixes::Enabled);
-        let (messages, notebook_indexes) = create_notebook_diagnostics();
-        let content = capture_emitter_notebook_output(&mut emitter, &messages, &notebook_indexes);
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = TextEmitter::default().with_show_source(true);
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(content);
-    }
-}
diff --git a/crates/ruff_linter/src/noqa.rs b/crates/ruff_linter/src/noqa.rs
index 7ff082acdd..606ac5ad3b 100644
--- a/crates/ruff_linter/src/noqa.rs
+++ b/crates/ruff_linter/src/noqa.rs
@@ -886,7 +886,10 @@ fn find_noqa_comments<'a>(
             }
         }
 
-        let noqa_offset = noqa_line_for.resolve(message.expect_range().start());
+        let noqa_offset = message
+            .range()
+            .map(|range| noqa_line_for.resolve(range.start()))
+            .unwrap_or_default();
 
         // Or ignored by the directive itself?
         if let Some(directive_line) = directives.find_line_with_directive(noqa_offset) {
diff --git a/crates/ruff_linter/src/preview.rs b/crates/ruff_linter/src/preview.rs
index 64c185989f..d84035c762 100644
--- a/crates/ruff_linter/src/preview.rs
+++ b/crates/ruff_linter/src/preview.rs
@@ -7,15 +7,6 @@
 
 use crate::settings::LinterSettings;
 
-pub(crate) const fn is_py314_support_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/16565
-pub(crate) const fn is_full_path_match_source_strategy_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // Rule-specific behavior
 
 // https://github.com/astral-sh/ruff/pull/15541
@@ -40,6 +31,11 @@ pub(crate) const fn is_bad_version_info_in_non_stub_enabled(settings: &LinterSet
     settings.preview.is_enabled()
 }
 
+/// <https://github.com/astral-sh/ruff/pull/19303>
+pub(crate) const fn is_fix_f_string_logging_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
 // https://github.com/astral-sh/ruff/pull/16719
 pub(crate) const fn is_fix_manual_dict_comprehension_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
@@ -169,6 +165,11 @@ pub(crate) const fn is_fix_os_makedirs_enabled(settings: &LinterSettings) -> boo
     settings.preview.is_enabled()
 }
 
+// https://github.com/astral-sh/ruff/pull/20009
+pub(crate) const fn is_fix_os_symlink_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
 // https://github.com/astral-sh/ruff/pull/11436
 // https://github.com/astral-sh/ruff/pull/11168
 pub(crate) const fn is_dunder_init_fix_unused_import_enabled(settings: &LinterSettings) -> bool {
@@ -190,32 +191,13 @@ pub(crate) const fn is_allow_nested_roots_enabled(settings: &LinterSettings) ->
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/18208
-pub(crate) const fn is_multiple_with_statements_fix_safe_enabled(
-    settings: &LinterSettings,
-) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/18400
-pub(crate) const fn is_ignore_init_files_in_useless_alias_enabled(
-    settings: &LinterSettings,
-) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/18572
 pub(crate) const fn is_optional_as_none_in_union_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/18547
-pub(crate) const fn is_invalid_async_mock_access_check_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/18867
-pub(crate) const fn is_raise_exception_byte_string_enabled(settings: &LinterSettings) -> bool {
+// https://github.com/astral-sh/ruff/pull/20659
+pub(crate) const fn is_future_required_preview_generics_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
 
@@ -226,22 +208,74 @@ pub(crate) const fn is_safe_super_call_with_parameters_fix_enabled(
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/19063
-pub(crate) const fn is_assert_raises_exception_call_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19100
-pub(crate) const fn is_add_future_annotations_imports_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19390
-pub(crate) const fn is_trailing_comma_type_params_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/19851
 pub(crate) const fn is_maxsplit_without_separator_fix_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
+
+// https://github.com/astral-sh/ruff/pull/20027
+pub(crate) const fn is_unnecessary_default_type_args_stubs_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20343
+pub(crate) const fn is_sim910_expanded_key_support_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20169
+pub(crate) const fn is_fix_builtin_open_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20178
+pub(crate) const fn is_a003_class_scope_shadowing_expansion_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20200
+pub(crate) const fn is_refined_submodule_import_match_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20660
+pub(crate) const fn is_type_var_default_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// github.com/astral-sh/ruff/issues/20004
+pub(crate) const fn is_b006_check_guaranteed_mutable_expr_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
+// github.com/astral-sh/ruff/issues/20004
+pub(crate) const fn is_b006_unsafe_fix_preserve_assignment_expr_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20520
+pub(crate) const fn is_fix_read_whole_file_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/20520
+pub(crate) const fn is_fix_write_whole_file_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+pub(crate) const fn is_typing_extensions_str_alias_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/19045
+pub(crate) const fn is_extended_i18n_function_matching_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
diff --git a/crates/ruff_linter/src/renamer.rs b/crates/ruff_linter/src/renamer.rs
index d31793dc74..d4c587142d 100644
--- a/crates/ruff_linter/src/renamer.rs
+++ b/crates/ruff_linter/src/renamer.rs
@@ -354,7 +354,10 @@ impl Renamer {
                 ))
             }
             // Avoid renaming builtins and other "special" bindings.
-            BindingKind::FutureImport | BindingKind::Builtin | BindingKind::Export(_) => None,
+            BindingKind::FutureImport
+            | BindingKind::Builtin
+            | BindingKind::Export(_)
+            | BindingKind::DunderClassCell => None,
             // By default, replace the binding's name with the target name.
             BindingKind::Annotation
             | BindingKind::Argument
diff --git a/crates/ruff_linter/src/rule_redirects.rs b/crates/ruff_linter/src/rule_redirects.rs
index 953074e10d..b85523c6a1 100644
--- a/crates/ruff_linter/src/rule_redirects.rs
+++ b/crates/ruff_linter/src/rule_redirects.rs
@@ -150,7 +150,7 @@ mod tests {
         for rule in Rule::iter() {
             let (code, group) = (rule.noqa_code(), rule.group());
 
-            if matches!(group, RuleGroup::Removed) {
+            if matches!(group, RuleGroup::Removed { .. }) {
                 continue;
             }
 
diff --git a/crates/ruff_linter/src/rule_selector.rs b/crates/ruff_linter/src/rule_selector.rs
index 74f069b976..b3eee0d837 100644
--- a/crates/ruff_linter/src/rule_selector.rs
+++ b/crates/ruff_linter/src/rule_selector.rs
@@ -209,17 +209,15 @@ impl RuleSelector {
         self.all_rules().filter(move |rule| {
             match rule.group() {
                 // Always include stable rules
-                RuleGroup::Stable => true,
+                RuleGroup::Stable { .. } => true,
                 // Enabling preview includes all preview rules unless explicit selection is turned on
-                RuleGroup::Preview => {
+                RuleGroup::Preview { .. } => {
                     preview_enabled && (self.is_exact() || !preview_require_explicit)
                 }
-                // Deprecated rules are excluded in preview mode and with 'All' option unless explicitly selected
-                RuleGroup::Deprecated => {
-                    (!preview_enabled || self.is_exact()) && !matches!(self, RuleSelector::All)
-                }
+                // Deprecated rules are excluded by default unless explicitly selected
+                RuleGroup::Deprecated { .. } => !preview_enabled && self.is_exact(),
                 // Removed rules are included if explicitly selected but will error downstream
-                RuleGroup::Removed => self.is_exact(),
+                RuleGroup::Removed { .. } => self.is_exact(),
             }
         })
     }
@@ -259,9 +257,8 @@ pub struct PreviewOptions {
 #[cfg(feature = "schemars")]
 mod schema {
     use itertools::Itertools;
-    use schemars::_serde_json::Value;
-    use schemars::JsonSchema;
-    use schemars::schema::{InstanceType, Schema, SchemaObject};
+    use schemars::{JsonSchema, Schema, SchemaGenerator};
+    use serde_json::Value;
     use strum::IntoEnumIterator;
 
     use crate::RuleSelector;
@@ -269,64 +266,65 @@ mod schema {
     use crate::rule_selector::{Linter, RuleCodePrefix};
 
     impl JsonSchema for RuleSelector {
-        fn schema_name() -> String {
-            "RuleSelector".to_string()
+        fn schema_name() -> std::borrow::Cow<'static, str> {
+            std::borrow::Cow::Borrowed("RuleSelector")
         }
 
-        fn json_schema(_gen: &mut schemars::r#gen::SchemaGenerator) -> Schema {
-            Schema::Object(SchemaObject {
-                instance_type: Some(InstanceType::String.into()),
-                enum_values: Some(
-                    [
-                        // Include the non-standard "ALL" selectors.
-                        "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())
-                            })),
-                    )
-                    .filter(|p| {
-                        // Exclude any prefixes where all of the rules are removed
-                        if let Ok(Self::Rule { prefix, .. } | Self::Prefix { prefix, .. }) =
-                            RuleSelector::parse_no_redirect(p)
-                        {
-                            !prefix.rules().all(|rule| rule.is_removed())
-                        } else {
-                            true
-                        }
+        fn json_schema(_gen: &mut SchemaGenerator) -> Schema {
+            let enum_values: Vec<String> = [
+                // Include the non-standard "ALL" selectors.
+                "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}")
                     })
-                    .filter(|_rule| {
-                        // Filter out all test-only rules
-                        #[cfg(any(feature = "test-rules", test))]
-                        #[expect(clippy::used_underscore_binding)]
-                        if _rule.starts_with("RUF9") || _rule == "PLW0101" {
-                            return false;
-                        }
-
-                        true
-                    })
-                    .sorted()
-                    .map(Value::String)
-                    .collect(),
-                ),
-                ..SchemaObject::default()
+                    .chain(Linter::iter().filter_map(|l| {
+                        let prefix = l.common_prefix();
+                        (!prefix.is_empty()).then(|| prefix.to_string())
+                    })),
+            )
+            .filter(|p| {
+                // Exclude any prefixes where all of the rules are removed
+                if let Ok(Self::Rule { prefix, .. } | Self::Prefix { prefix, .. }) =
+                    RuleSelector::parse_no_redirect(p)
+                {
+                    !prefix.rules().all(|rule| rule.is_removed())
+                } else {
+                    true
+                }
             })
+            .filter(|_rule| {
+                // Filter out all test-only rules
+                #[cfg(any(feature = "test-rules", test))]
+                #[expect(clippy::used_underscore_binding)]
+                if _rule.starts_with("RUF9") || _rule == "PLW0101" {
+                    return false;
+                }
+
+                true
+            })
+            .sorted()
+            .collect();
+
+            let mut schema = schemars::json_schema!({ "type": "string" });
+            schema.ensure_object().insert(
+                "enum".to_string(),
+                Value::Array(enum_values.into_iter().map(Value::String).collect()),
+            );
+
+            schema
         }
     }
 }
diff --git a/crates/ruff_linter/src/rules/airflow/helpers.rs b/crates/ruff_linter/src/rules/airflow/helpers.rs
index b5997e916f..4b2c25f93f 100644
--- a/crates/ruff_linter/src/rules/airflow/helpers.rs
+++ b/crates/ruff_linter/src/rules/airflow/helpers.rs
@@ -17,13 +17,13 @@ use ruff_text_size::TextRange;
 pub(crate) enum Replacement {
     // There's no replacement or suggestion other than removal
     None,
+    // Additional information. Used when there's no direct maaping replacement.
+    Message(&'static str),
     // The attribute name of a class has been changed.
     AttrName(&'static str),
-    // Additional information. Used when there's replacement but they're not direct mapping.
-    Message(&'static str),
     // Symbols updated in Airflow 3 with replacement
     // e.g., `airflow.datasets.Dataset` to `airflow.sdk.Asset`
-    AutoImport {
+    Rename {
         module: &'static str,
         name: &'static str,
     },
@@ -37,8 +37,7 @@ pub(crate) enum Replacement {
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub(crate) enum ProviderReplacement {
-    None,
-    AutoImport {
+    Rename {
         module: &'static str,
         name: &'static str,
         provider: &'static str,
diff --git a/crates/ruff_linter/src/rules/airflow/rules/dag_schedule_argument.rs b/crates/ruff_linter/src/rules/airflow/rules/dag_schedule_argument.rs
index c89071f120..c06c86a955 100644
--- a/crates/ruff_linter/src/rules/airflow/rules/dag_schedule_argument.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/dag_schedule_argument.rs
@@ -41,12 +41,13 @@ use crate::checkers::ast::Checker;
 /// dag = DAG(dag_id="my_dag", schedule=timedelta(days=1))
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct AirflowDagNoScheduleArgument;
 
 impl Violation for AirflowDagNoScheduleArgument {
     #[derive_message_formats]
     fn message(&self) -> String {
-        "DAG should have an explicit `schedule` argument".to_string()
+        "`DAG` or `@dag` should have an explicit `schedule` argument".to_string()
     }
 }
 
diff --git a/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs b/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
index e22d6fbd62..d420c25a6d 100644
--- a/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
@@ -13,13 +13,13 @@ use ruff_text_size::TextRange;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
-/// Checks for uses of Airflow functions and values that have been moved to it providers.
-/// (e.g., apache-airflow-providers-fab)
+/// Checks for uses of Airflow functions and values that have been moved to its providers
+/// (e.g., `apache-airflow-providers-fab`).
 ///
 /// ## Why is this bad?
 /// Airflow 3.0 moved various deprecated functions, members, and other
 /// values to its providers. The user needs to install the corresponding provider and replace
-/// the original usage with the one in the provider
+/// the original usage with the one in the provider.
 ///
 /// ## Example
 /// ```python
@@ -35,6 +35,7 @@ use crate::{FixAvailability, Violation};
 /// fab_auth_manager_app = FabAuthManager().get_fastapi_app()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct Airflow3MovedToProvider<'a> {
     deprecated: QualifiedName<'a>,
     replacement: ProviderReplacement,
@@ -50,10 +51,7 @@ impl Violation for Airflow3MovedToProvider<'_> {
             replacement,
         } = self;
         match replacement {
-            ProviderReplacement::None => {
-                format!("`{deprecated}` is removed in Airflow 3.0")
-            }
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 name: _,
                 module: _,
                 provider,
@@ -73,7 +71,7 @@ impl Violation for Airflow3MovedToProvider<'_> {
     fn fix_title(&self) -> Option<String> {
         let Airflow3MovedToProvider { replacement, .. } = self;
         if let Some((module, name, provider, version)) = match &replacement {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module,
                 name,
                 provider,
@@ -85,7 +83,6 @@ impl Violation for Airflow3MovedToProvider<'_> {
                 provider,
                 version,
             } => Some((module, name.as_str(), provider, version)),
-            ProviderReplacement::None => None,
         } {
             Some(format!(
                 "Install `apache-airflow-providers-{provider}>={version}` and use `{name}` from `{module}` instead."
@@ -129,20 +126,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "amazon",
             version: "1.0.0",
         },
-        ["airflow", "operators", "gcs_to_s3", "GCSToS3Operator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.amazon.aws.transfers.gcs_to_s3",
-                name: "GCSToS3Operator",
-                provider: "amazon",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "operators", "gcs_to_s3", "GCSToS3Operator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.amazon.aws.transfers.gcs_to_s3",
+            name: "GCSToS3Operator",
+            provider: "amazon",
+            version: "1.0.0",
+        },
         [
             "airflow",
             "operators",
             "google_api_to_s3_transfer",
             "GoogleApiToS3Operator" | "GoogleApiToS3Transfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.amazon.aws.transfers.google_api_to_s3",
             name: "GoogleApiToS3Operator",
             provider: "amazon",
@@ -153,7 +148,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "redshift_to_s3_operator",
             "RedshiftToS3Operator" | "RedshiftToS3Transfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.amazon.aws.transfers.redshift_to_s3",
             name: "RedshiftToS3Operator",
             provider: "amazon",
@@ -164,7 +159,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "s3_file_transform_operator",
             "S3FileTransformOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.amazon.aws.operators.s3",
             name: "S3FileTransformOperator",
             provider: "amazon",
@@ -175,13 +170,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "s3_to_redshift_operator",
             "S3ToRedshiftOperator" | "S3ToRedshiftTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.amazon.aws.transfers.s3_to_redshift",
             name: "S3ToRedshiftOperator",
             provider: "amazon",
             version: "1.0.0",
         },
-        ["airflow", "sensors", "s3_key_sensor", "S3KeySensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "s3_key_sensor", "S3KeySensor"] => ProviderReplacement::Rename {
             module: "airflow.providers.amazon.aws.sensors.s3",
             name: "S3KeySensor",
             provider: "amazon",
@@ -194,20 +189,20 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "config_templates",
             "default_celery",
             "DEFAULT_CELERY_CONFIG",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.celery.executors.default_celery",
             name: "DEFAULT_CELERY_CONFIG",
             provider: "celery",
             version: "3.3.0",
         },
         ["airflow", "executors", "celery_executor", rest] => match *rest {
-            "app" => ProviderReplacement::AutoImport {
+            "app" => ProviderReplacement::Rename {
                 module: "airflow.providers.celery.executors.celery_executor_utils",
                 name: "app",
                 provider: "celery",
                 version: "3.3.0",
             },
-            "CeleryExecutor" => ProviderReplacement::AutoImport {
+            "CeleryExecutor" => ProviderReplacement::Rename {
                 module: "airflow.providers.celery.executors.celery_executor",
                 name: "CeleryExecutor",
                 provider: "celery",
@@ -220,7 +215,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "executors",
             "celery_kubernetes_executor",
             "CeleryKubernetesExecutor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.celery.executors.celery_kubernetes_executor",
             name: "CeleryKubernetesExecutor",
             provider: "celery",
@@ -239,7 +234,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "common-sql",
             version: "1.0.0",
         },
-        ["airflow", "hooks", "dbapi_hook", "DbApiHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "dbapi_hook", "DbApiHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.common.sql.hooks.sql",
             name: "DbApiHook",
             provider: "common-sql",
@@ -256,7 +251,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "check_operator" | "druid_check_operator" | "presto_check_operator",
             "CheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.common.sql.operators.sql",
             name: "SQLCheckOperator",
             provider: "common-sql",
@@ -273,7 +268,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "presto_check_operator",
             "PrestoCheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.common.sql.operators.sql",
             name: "SQLCheckOperator",
             provider: "common-sql",
@@ -292,7 +287,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "IntervalCheckOperator",
         ]
         | ["airflow", "operators", "sql", "SQLIntervalCheckOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.common.sql.operators.sql",
                 name: "SQLIntervalCheckOperator",
                 provider: "common-sql",
@@ -304,7 +299,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "presto_check_operator",
             "PrestoIntervalCheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.common.sql.operators.sql",
             name: "SQLIntervalCheckOperator",
             provider: "common-sql",
@@ -317,7 +312,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "SQLThresholdCheckOperator" | "ThresholdCheckOperator",
         ]
         | ["airflow", "operators", "sql", "SQLThresholdCheckOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.common.sql.operators.sql",
                 name: "SQLThresholdCheckOperator",
                 provider: "common-sql",
@@ -336,20 +331,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "presto_check_operator",
             "ValueCheckOperator",
         ]
-        | ["airflow", "operators", "sql", "SQLValueCheckOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.common.sql.operators.sql",
-                name: "SQLValueCheckOperator",
-                provider: "common-sql",
-                version: "1.1.0",
-            }
-        }
+        | ["airflow", "operators", "sql", "SQLValueCheckOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.common.sql.operators.sql",
+            name: "SQLValueCheckOperator",
+            provider: "common-sql",
+            version: "1.1.0",
+        },
         [
             "airflow",
             "operators",
             "presto_check_operator",
             "PrestoValueCheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.common.sql.operators.sql",
             name: "SQLValueCheckOperator",
             provider: "common-sql",
@@ -374,14 +367,12 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             }
             _ => return,
         },
-        ["airflow", "sensors", "sql" | "sql_sensor", "SqlSensor"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.common.sql.sensors.sql",
-                name: "SqlSensor",
-                provider: "common-sql",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "sensors", "sql" | "sql_sensor", "SqlSensor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.common.sql.sensors.sql",
+            name: "SqlSensor",
+            provider: "common-sql",
+            version: "1.0.0",
+        },
         ["airflow", "operators", "jdbc_operator", "JdbcOperator"]
         | ["airflow", "operators", "mssql_operator", "MsSqlOperator"]
         | ["airflow", "operators", "mysql_operator", "MySqlOperator"]
@@ -393,7 +384,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "PostgresOperator",
         ]
         | ["airflow", "operators", "sqlite_operator", "SqliteOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.common.sql.operators.sql",
                 name: "SQLExecuteQueryOperator",
                 provider: "common-sql",
@@ -402,24 +393,22 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         }
 
         // apache-airflow-providers-daskexecutor
-        ["airflow", "executors", "dask_executor", "DaskExecutor"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.daskexecutor.executors.dask_executor",
-                name: "DaskExecutor",
-                provider: "daskexecutor",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "executors", "dask_executor", "DaskExecutor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.daskexecutor.executors.dask_executor",
+            name: "DaskExecutor",
+            provider: "daskexecutor",
+            version: "1.0.0",
+        },
 
         // apache-airflow-providers-docker
-        ["airflow", "hooks", "docker_hook", "DockerHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "docker_hook", "DockerHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.docker.hooks.docker",
             name: "DockerHook",
             provider: "docker",
             version: "1.0.0",
         },
         ["airflow", "operators", "docker_operator", "DockerOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.docker.operators.docker",
                 name: "DockerOperator",
                 provider: "docker",
@@ -444,7 +433,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "hive_to_druid",
             "HiveToDruidOperator" | "HiveToDruidTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.druid.transfers.hive_to_druid",
             name: "HiveToDruidOperator",
             provider: "apache-druid",
@@ -501,7 +490,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "fab",
             "fab_auth_manager",
             "FabAuthManager",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.fab.auth_manager.fab_auth_manager",
             name: "FabAuthManager",
             provider: "fab",
@@ -515,7 +504,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "security_manager",
             "override",
             "MAX_NUM_DATABASE_USER_SESSIONS",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.fab.auth_manager.security_manager.override",
             name: "MAX_NUM_DATABASE_USER_SESSIONS",
             provider: "fab",
@@ -535,7 +524,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "www",
             "security",
             "FabAirflowSecurityManagerOverride",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.fab.auth_manager.security_manager.override",
             name: "FabAirflowSecurityManagerOverride",
             provider: "fab",
@@ -543,20 +532,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-apache-hdfs
-        ["airflow", "hooks", "webhdfs_hook", "WebHDFSHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "webhdfs_hook", "WebHDFSHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hdfs.hooks.webhdfs",
             name: "WebHDFSHook",
             provider: "apache-hdfs",
             version: "1.0.0",
         },
-        ["airflow", "sensors", "web_hdfs_sensor", "WebHdfsSensor"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.apache.hdfs.sensors.web_hdfs",
-                name: "WebHdfsSensor",
-                provider: "apache-hdfs",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "sensors", "web_hdfs_sensor", "WebHdfsSensor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.apache.hdfs.sensors.web_hdfs",
+            name: "WebHdfsSensor",
+            provider: "apache-hdfs",
+            version: "1.0.0",
+        },
 
         // apache-airflow-providers-apache-hive
         [
@@ -584,20 +571,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "apache-hive",
             version: "5.1.0",
         },
-        ["airflow", "operators", "hive_operator", "HiveOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.apache.hive.operators.hive",
-                name: "HiveOperator",
-                provider: "apache-hive",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "operators", "hive_operator", "HiveOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.apache.hive.operators.hive",
+            name: "HiveOperator",
+            provider: "apache-hive",
+            version: "1.0.0",
+        },
         [
             "airflow",
             "operators",
             "hive_stats_operator",
             "HiveStatsCollectionOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.operators.hive_stats",
             name: "HiveStatsCollectionOperator",
             provider: "apache-hive",
@@ -608,7 +593,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "hive_to_mysql",
             "HiveToMySqlOperator" | "HiveToMySqlTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.transfers.hive_to_mysql",
             name: "HiveToMySqlOperator",
             provider: "apache-hive",
@@ -619,7 +604,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "hive_to_samba_operator",
             "HiveToSambaOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.transfers.hive_to_samba",
             name: "HiveToSambaOperator",
             provider: "apache-hive",
@@ -630,7 +615,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "mssql_to_hive",
             "MsSqlToHiveOperator" | "MsSqlToHiveTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.transfers.mssql_to_hive",
             name: "MsSqlToHiveOperator",
             provider: "apache-hive",
@@ -641,7 +626,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "mysql_to_hive",
             "MySqlToHiveOperator" | "MySqlToHiveTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.transfers.mysql_to_hive",
             name: "MySqlToHiveOperator",
             provider: "apache-hive",
@@ -652,7 +637,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "s3_to_hive_operator",
             "S3ToHiveOperator" | "S3ToHiveTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.transfers.s3_to_hive",
             name: "S3ToHiveOperator",
             provider: "apache-hive",
@@ -663,7 +648,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "sensors",
             "hive_partition_sensor",
             "HivePartitionSensor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.sensors.hive_partition",
             name: "HivePartitionSensor",
             provider: "apache-hive",
@@ -674,7 +659,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "sensors",
             "metastore_partition_sensor",
             "MetastorePartitionSensor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.sensors.metastore_partition",
             name: "MetastorePartitionSensor",
             provider: "apache-hive",
@@ -685,7 +670,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "sensors",
             "named_hive_partition_sensor",
             "NamedHivePartitionSensor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.hive.sensors.named_hive_partition",
             name: "NamedHivePartitionSensor",
             provider: "apache-hive",
@@ -693,7 +678,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-http
-        ["airflow", "hooks", "http_hook", "HttpHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "http_hook", "HttpHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.http.hooks.http",
             name: "HttpHook",
             provider: "http",
@@ -704,13 +689,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "http_operator",
             "SimpleHttpOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.http.operators.http",
             name: "HttpOperator",
             provider: "http",
             version: "5.0.0",
         },
-        ["airflow", "sensors", "http_sensor", "HttpSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "http_sensor", "HttpSensor"] => ProviderReplacement::Rename {
             module: "airflow.providers.http.sensors.http",
             name: "HttpSensor",
             provider: "http",
@@ -769,7 +754,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "kubernetes_helper_functions",
             "add_pod_suffix",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.cncf.kubernetes.kubernetes_helper_functions",
             name: "add_unique_suffix",
             provider: "cncf-kubernetes",
@@ -780,7 +765,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "kubernetes_helper_functions",
             "create_pod_id",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.cncf.kubernetes.kubernetes_helper_functions",
             name: "create_unique_id",
             provider: "cncf-kubernetes",
@@ -801,13 +786,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             version: "7.4.0",
         },
         ["airflow", "kubernetes", "pod", rest] => match *rest {
-            "Port" => ProviderReplacement::AutoImport {
+            "Port" => ProviderReplacement::Rename {
                 module: "kubernetes.client.models",
                 name: "V1ContainerPort",
                 provider: "cncf-kubernetes",
                 version: "7.4.0",
             },
-            "Resources" => ProviderReplacement::AutoImport {
+            "Resources" => ProviderReplacement::Rename {
                 module: "kubernetes.client.models",
                 name: "V1ResourceRequirements",
                 provider: "cncf-kubernetes",
@@ -827,19 +812,19 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
                 provider: "cncf-kubernetes",
                 version: "7.4.0",
             },
-            "PodDefaults" => ProviderReplacement::AutoImport {
+            "PodDefaults" => ProviderReplacement::Rename {
                 module: "airflow.providers.cncf.kubernetes.utils.xcom_sidecar",
                 name: "PodDefaults",
                 provider: "cncf-kubernetes",
                 version: "7.4.0",
             },
-            "PodGeneratorDeprecated" => ProviderReplacement::AutoImport {
+            "PodGeneratorDeprecated" => ProviderReplacement::Rename {
                 module: "airflow.providers.cncf.kubernetes.pod_generator",
                 name: "PodGenerator",
                 provider: "cncf-kubernetes",
                 version: "7.4.0",
             },
-            "add_pod_suffix" => ProviderReplacement::AutoImport {
+            "add_pod_suffix" => ProviderReplacement::Rename {
                 module: "airflow.providers.cncf.kubernetes.kubernetes_helper_functions",
                 name: "add_unique_suffix",
                 provider: "cncf-kubernetes",
@@ -869,7 +854,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "pod_generator_deprecated" | "pod_launcher_deprecated",
             "PodDefaults",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.cncf.kubernetes.utils.xcom_sidecar",
             name: "PodDefaults",
             provider: "cncf-kubernetes",
@@ -880,7 +865,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "pod_launcher_deprecated",
             "get_kube_client",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.cncf.kubernetes.kube_client",
             name: "get_kube_client",
             provider: "cncf-kubernetes",
@@ -891,7 +876,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "pod_launcher" | "pod_launcher_deprecated",
             "PodLauncher",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.cncf.kubernetes.utils.pod_manager",
             name: "PodManager",
             provider: "cncf-kubernetes",
@@ -902,7 +887,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "pod_launcher" | "pod_launcher_deprecated",
             "PodStatus",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: " airflow.providers.cncf.kubernetes.utils.pod_manager",
             name: "PodPhase",
             provider: "cncf-kubernetes",
@@ -913,20 +898,20 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "kubernetes",
             "pod_runtime_info_env",
             "PodRuntimeInfoEnv",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "kubernetes.client.models",
             name: "V1EnvVar",
             provider: "cncf-kubernetes",
             version: "7.4.0",
         },
         ["airflow", "kubernetes", "secret", rest] => match *rest {
-            "K8SModel" => ProviderReplacement::AutoImport {
+            "K8SModel" => ProviderReplacement::Rename {
                 module: "airflow.providers.cncf.kubernetes.k8s_model",
                 name: "K8SModel",
                 provider: "cncf-kubernetes",
                 version: "7.4.0",
             },
-            "Secret" => ProviderReplacement::AutoImport {
+            "Secret" => ProviderReplacement::Rename {
                 module: "airflow.providers.cncf.kubernetes.secret",
                 name: "Secret",
                 provider: "cncf-kubernetes",
@@ -934,23 +919,21 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             },
             _ => return,
         },
-        ["airflow", "kubernetes", "volume", "Volume"] => ProviderReplacement::AutoImport {
+        ["airflow", "kubernetes", "volume", "Volume"] => ProviderReplacement::Rename {
             module: "kubernetes.client.models",
             name: "V1Volume",
             provider: "cncf-kubernetes",
             version: "7.4.0",
         },
-        ["airflow", "kubernetes", "volume_mount", "VolumeMount"] => {
-            ProviderReplacement::AutoImport {
-                module: "kubernetes.client.models",
-                name: "V1VolumeMount",
-                provider: "cncf-kubernetes",
-                version: "7.4.0",
-            }
-        }
+        ["airflow", "kubernetes", "volume_mount", "VolumeMount"] => ProviderReplacement::Rename {
+            module: "kubernetes.client.models",
+            name: "V1VolumeMount",
+            provider: "cncf-kubernetes",
+            version: "7.4.0",
+        },
 
         // apache-airflow-providers-microsoft-mssql
-        ["airflow", "hooks", "mssql_hook", "MsSqlHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "mssql_hook", "MsSqlHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.microsoft.mssql.hooks.mssql",
             name: "MsSqlHook",
             provider: "microsoft-mssql",
@@ -958,7 +941,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-mysql
-        ["airflow", "hooks", "mysql_hook", "MySqlHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "mysql_hook", "MySqlHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.mysql.hooks.mysql",
             name: "MySqlHook",
             provider: "mysql",
@@ -969,7 +952,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "presto_to_mysql",
             "PrestoToMySqlOperator" | "PrestoToMySqlTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.mysql.transfers.presto_to_mysql",
             name: "PrestoToMySqlOperator",
             provider: "mysql",
@@ -977,7 +960,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-oracle
-        ["airflow", "hooks", "oracle_hook", "OracleHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "oracle_hook", "OracleHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.oracle.hooks.oracle",
             name: "OracleHook",
             provider: "oracle",
@@ -990,7 +973,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "papermill_operator",
             "PapermillOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.papermill.operators.papermill",
             name: "PapermillOperator",
             provider: "papermill",
@@ -998,32 +981,29 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-apache-pig
-        ["airflow", "hooks", "pig_hook", "PigCliHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "pig_hook", "PigCliHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.apache.pig.hooks.pig",
             name: "PigCliHook",
             provider: "apache-pig",
             version: "1.0.0",
         },
-        ["airflow", "operators", "pig_operator", "PigOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.apache.pig.operators.pig",
-                name: "PigOperator",
-                provider: "apache-pig",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "operators", "pig_operator", "PigOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.apache.pig.operators.pig",
+            name: "PigOperator",
+            provider: "apache-pig",
+            version: "1.0.0",
+        },
 
         // apache-airflow-providers-postgres
-        ["airflow", "hooks", "postgres_hook", "PostgresHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "postgres_hook", "PostgresHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.postgres.hooks.postgres",
             name: "PostgresHook",
             provider: "postgres",
             version: "1.0.0",
         },
-        ["airflow", "operators", "postgres_operator", "Mapping"] => ProviderReplacement::None,
 
         // apache-airflow-providers-presto
-        ["airflow", "hooks", "presto_hook", "PrestoHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "presto_hook", "PrestoHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.presto.hooks.presto",
             name: "PrestoHook",
             provider: "presto",
@@ -1031,7 +1011,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-samba
-        ["airflow", "hooks", "samba_hook", "SambaHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "samba_hook", "SambaHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.samba.hooks.samba",
             name: "SambaHook",
             provider: "samba",
@@ -1039,7 +1019,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-slack
-        ["airflow", "hooks", "slack_hook", "SlackHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "slack_hook", "SlackHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.slack.hooks.slack",
             name: "SlackHook",
             provider: "slack",
@@ -1063,7 +1043,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "email_operator" | "email",
             "EmailOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.smtp.operators.smtp",
             name: "EmailOperator",
             provider: "smtp",
@@ -1071,7 +1051,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-sqlite
-        ["airflow", "hooks", "sqlite_hook", "SqliteHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "sqlite_hook", "SqliteHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.sqlite.hooks.sqlite",
             name: "SqliteHook",
             provider: "sqlite",
@@ -1079,7 +1059,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         },
 
         // apache-airflow-providers-zendesk
-        ["airflow", "hooks", "zendesk_hook", "ZendeskHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "zendesk_hook", "ZendeskHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.zendesk.hooks.zendesk",
             name: "ZendeskHook",
             provider: "zendesk",
@@ -1098,14 +1078,12 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "standard",
             version: "0.0.3",
         },
-        ["airflow", "operators", "bash_operator", "BashOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.standard.operators.bash",
-                name: "BashOperator",
-                provider: "standard",
-                version: "0.0.1",
-            }
-        }
+        ["airflow", "operators", "bash_operator", "BashOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.standard.operators.bash",
+            name: "BashOperator",
+            provider: "standard",
+            version: "0.0.1",
+        },
         [
             "airflow",
             "operators",
@@ -1122,14 +1100,14 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "trigger_dagrun",
             "TriggerDagRunLink",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.operators.trigger_dagrun",
             name: "TriggerDagRunLink",
             provider: "standard",
             version: "0.0.2",
         },
         ["airflow", "operators", "datetime", "target_times_as_dates"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.standard.operators.datetime",
                 name: "target_times_as_dates",
                 provider: "standard",
@@ -1141,7 +1119,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "dummy" | "dummy_operator",
             "EmptyOperator" | "DummyOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.operators.empty",
             name: "EmptyOperator",
             provider: "standard",
@@ -1152,7 +1130,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "latest_only_operator",
             "LatestOnlyOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.operators.latest_only",
             name: "LatestOnlyOperator",
             provider: "standard",
@@ -1177,7 +1155,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "sensors",
             "external_task" | "external_task_sensor",
             "ExternalTaskSensorLink",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.sensors.external_task",
             name: "ExternalDagLink",
             provider: "standard",
@@ -1194,7 +1172,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "standard",
             version: "0.0.3",
         },
-        ["airflow", "sensors", "time_delta", "WaitSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "time_delta", "WaitSensor"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.sensors.time_delta",
             name: "WaitSensor",
             provider: "standard",
@@ -1205,20 +1183,10 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
     };
 
     let (module, name) = match &replacement {
-        ProviderReplacement::AutoImport { module, name, .. } => (module, *name),
+        ProviderReplacement::Rename { module, name, .. } => (module, *name),
         ProviderReplacement::SourceModuleMovedToProvider { module, name, .. } => {
             (module, name.as_str())
         }
-        ProviderReplacement::None => {
-            checker.report_diagnostic(
-                Airflow3MovedToProvider {
-                    deprecated: qualified_name,
-                    replacement,
-                },
-                ranged,
-            );
-            return;
-        }
     };
 
     if is_guarded_by_try_except(expr, module, name, checker.semantic()) {
diff --git a/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs b/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
index 4d822812c0..df09b37e81 100644
--- a/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
@@ -23,7 +23,7 @@ use ruff_text_size::TextRange;
 /// ## Why is this bad?
 /// Airflow 3.0 removed various deprecated functions, members, and other
 /// values. Some have more modern replacements. Others are considered too niche
-/// and not worth to be maintained in Airflow.
+/// and not worth continued maintenance in Airflow.
 ///
 /// ## Example
 /// ```python
@@ -41,6 +41,7 @@ use ruff_text_size::TextRange;
 /// yesterday = today - timedelta(days=1)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct Airflow3Removal {
     deprecated: String,
     replacement: Replacement,
@@ -59,7 +60,7 @@ impl Violation for Airflow3Removal {
             Replacement::None
             | Replacement::AttrName(_)
             | Replacement::Message(_)
-            | Replacement::AutoImport { module: _, name: _ }
+            | Replacement::Rename { module: _, name: _ }
             | Replacement::SourceModuleMoved { module: _, name: _ } => {
                 format!("`{deprecated}` is removed in Airflow 3.0")
             }
@@ -72,7 +73,7 @@ impl Violation for Airflow3Removal {
             Replacement::None => None,
             Replacement::AttrName(name) => Some(format!("Use `{name}` instead")),
             Replacement::Message(message) => Some((*message).to_string()),
-            Replacement::AutoImport { module, name } => {
+            Replacement::Rename { module, name } => {
                 Some(format!("Use `{name}` from `{module}` instead."))
             }
             Replacement::SourceModuleMoved { module, name } => {
@@ -593,7 +594,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "api_connexion",
             "security",
             "requires_access_dataset",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.api_fastapi.core_api.security",
             name: "requires_access_asset",
         },
@@ -605,7 +606,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "managers",
             "base_auth_manager",
             "BaseAuthManager",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.api_fastapi.auth.managers.base_auth_manager",
             name: "BaseAuthManager",
         },
@@ -616,7 +617,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "models",
             "resource_details",
             "DatasetDetails",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.api_fastapi.auth.managers.models.resource_details",
             name: "AssetDetails",
         },
@@ -639,15 +640,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
 
         // airflow.datasets.manager
         ["airflow", "datasets", "manager", rest] => match *rest {
-            "DatasetManager" => Replacement::AutoImport {
+            "DatasetManager" => Replacement::Rename {
                 module: "airflow.assets.manager",
                 name: "AssetManager",
             },
-            "dataset_manager" => Replacement::AutoImport {
+            "dataset_manager" => Replacement::Rename {
                 module: "airflow.assets.manager",
                 name: "asset_manager",
             },
-            "resolve_dataset_manager" => Replacement::AutoImport {
+            "resolve_dataset_manager" => Replacement::Rename {
                 module: "airflow.assets.manager",
                 name: "resolve_asset_manager",
             },
@@ -655,26 +656,31 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         },
         // airflow.datasets
         ["airflow", "datasets", "DatasetAliasEvent"] => Replacement::None,
+        ["airflow", "datasets", "DatasetEvent"] => Replacement::Message(
+            "`DatasetEvent` has been made private in Airflow 3. \
+             Use `dict[str, Any]` for the time being. \
+             An `AssetEvent` type will be added to the apache-airflow-task-sdk in a future version.",
+        ),
 
         // airflow.hooks
-        ["airflow", "hooks", "base_hook", "BaseHook"] => Replacement::AutoImport {
+        ["airflow", "hooks", "base_hook", "BaseHook"] => Replacement::Rename {
             module: "airflow.hooks.base",
             name: "BaseHook",
         },
 
         // airflow.lineage.hook
-        ["airflow", "lineage", "hook", "DatasetLineageInfo"] => Replacement::AutoImport {
+        ["airflow", "lineage", "hook", "DatasetLineageInfo"] => Replacement::Rename {
             module: "airflow.lineage.hook",
             name: "AssetLineageInfo",
         },
 
         // airflow.listeners.spec
         ["airflow", "listeners", "spec", "dataset", rest] => match *rest {
-            "on_dataset_created" => Replacement::AutoImport {
+            "on_dataset_created" => Replacement::Rename {
                 module: "airflow.listeners.spec.asset",
                 name: "on_asset_created",
             },
-            "on_dataset_changed" => Replacement::AutoImport {
+            "on_dataset_changed" => Replacement::Rename {
                 module: "airflow.listeners.spec.asset",
                 name: "on_asset_changed",
             },
@@ -683,11 +689,11 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
 
         // airflow.metrics.validators
         ["airflow", "metrics", "validators", rest] => match *rest {
-            "AllowListValidator" => Replacement::AutoImport {
+            "AllowListValidator" => Replacement::Rename {
                 module: "airflow.metrics.validators",
                 name: "PatternAllowListValidator",
             },
-            "BlockListValidator" => Replacement::AutoImport {
+            "BlockListValidator" => Replacement::Rename {
                 module: "airflow.metrics.validators",
                 name: "PatternBlockListValidator",
             },
@@ -695,7 +701,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         },
 
         // airflow.notifications
-        ["airflow", "notifications", "basenotifier", "BaseNotifier"] => Replacement::AutoImport {
+        ["airflow", "notifications", "basenotifier", "BaseNotifier"] => Replacement::Rename {
             module: "airflow.sdk.bases.notifier",
             name: "BaseNotifier",
         },
@@ -704,23 +710,24 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         ["airflow", "operators", "subdag", ..] => {
             Replacement::Message("The whole `airflow.subdag` module has been removed.")
         }
-        ["airflow", "operators", "python", "get_current_context"] => Replacement::AutoImport {
+        ["airflow", "operators", "postgres_operator", "Mapping"] => Replacement::None,
+        ["airflow", "operators", "python", "get_current_context"] => Replacement::Rename {
             module: "airflow.sdk",
             name: "get_current_context",
         },
 
         // airflow.secrets
-        ["airflow", "secrets", "cache", "SecretCache"] => Replacement::AutoImport {
+        ["airflow", "secrets", "cache", "SecretCache"] => Replacement::Rename {
             module: "airflow.sdk",
             name: "SecretCache",
         },
-        ["airflow", "secrets", "local_filesystem", "load_connections"] => Replacement::AutoImport {
+        ["airflow", "secrets", "local_filesystem", "load_connections"] => Replacement::Rename {
             module: "airflow.secrets.local_filesystem",
             name: "load_connections_dict",
         },
 
         // airflow.security
-        ["airflow", "security", "permissions", "RESOURCE_DATASET"] => Replacement::AutoImport {
+        ["airflow", "security", "permissions", "RESOURCE_DATASET"] => Replacement::Rename {
             module: "airflow.security.permissions",
             name: "RESOURCE_ASSET",
         },
@@ -731,7 +738,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "sensors",
             "base_sensor_operator",
             "BaseSensorOperator",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.sdk.bases.sensor",
             name: "BaseSensorOperator",
         },
@@ -742,7 +749,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "timetables",
             "simple",
             "DatasetTriggeredTimetable",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.timetables.simple",
             name: "AssetTriggeredTimetable",
         },
@@ -774,25 +781,25 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             ] => Replacement::None,
 
             // airflow.utils.file
-            ["file", "TemporaryDirectory"] => Replacement::AutoImport {
+            ["file", "TemporaryDirectory"] => Replacement::Rename {
                 module: "tempfile",
                 name: "TemporaryDirectory",
             },
             ["file", "mkdirs"] => Replacement::Message("Use `pathlib.Path({path}).mkdir` instead"),
 
             // airflow.utils.helpers
-            ["helpers", "chain"] => Replacement::AutoImport {
+            ["helpers", "chain"] => Replacement::Rename {
                 module: "airflow.sdk",
                 name: "chain",
             },
-            ["helpers", "cross_downstream"] => Replacement::AutoImport {
+            ["helpers", "cross_downstream"] => Replacement::Rename {
                 module: "airflow.sdk",
                 name: "cross_downstream",
             },
 
             // TODO: update it as SourceModuleMoved
             // airflow.utils.log.secrets_masker
-            ["log", "secrets_masker"] => Replacement::AutoImport {
+            ["log", "secrets_masker"] => Replacement::Rename {
                 module: "airflow.sdk.execution_time",
                 name: "secrets_masker",
             },
@@ -833,15 +840,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "s3",
             rest,
         ] => match *rest {
-            "create_dataset" => Replacement::AutoImport {
+            "create_dataset" => Replacement::Rename {
                 module: "airflow.providers.amazon.aws.assets.s3",
                 name: "create_asset",
             },
-            "convert_dataset_to_openlineage" => Replacement::AutoImport {
+            "convert_dataset_to_openlineage" => Replacement::Rename {
                 module: "airflow.providers.amazon.aws.assets.s3",
                 name: "convert_asset_to_openlineage",
             },
-            "sanitize_uri" => Replacement::AutoImport {
+            "sanitize_uri" => Replacement::Rename {
                 module: "airflow.providers.amazon.aws.assets.s3",
                 name: "sanitize_uri",
             },
@@ -857,7 +864,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "entities",
             "AvpEntities",
             "DATASET",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.providers.amazon.aws.auth_manager.avp.entities",
             name: "AvpEntities.ASSET",
         },
@@ -873,15 +880,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "file",
             rest,
         ] => match *rest {
-            "create_dataset" => Replacement::AutoImport {
+            "create_dataset" => Replacement::Rename {
                 module: "airflow.providers.common.io.assets.file",
                 name: "create_asset",
             },
-            "convert_dataset_to_openlineage" => Replacement::AutoImport {
+            "convert_dataset_to_openlineage" => Replacement::Rename {
                 module: "airflow.providers.common.io.assets.file",
                 name: "convert_asset_to_openlineage",
             },
-            "sanitize_uri" => Replacement::AutoImport {
+            "sanitize_uri" => Replacement::Rename {
                 module: "airflow.providers.common.io.assets.file",
                 name: "sanitize_uri",
             },
@@ -891,19 +898,19 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         // airflow.providers.google
         // airflow.providers.google.datasets
         ["airflow", "providers", "google", "datasets", rest @ ..] => match &rest {
-            ["bigquery", "create_dataset"] => Replacement::AutoImport {
+            ["bigquery", "create_dataset"] => Replacement::Rename {
                 module: "airflow.providers.google.assets.bigquery",
                 name: "create_asset",
             },
-            ["gcs", "create_dataset"] => Replacement::AutoImport {
+            ["gcs", "create_dataset"] => Replacement::Rename {
                 module: "airflow.providers.google.assets.gcs",
                 name: "create_asset",
             },
-            ["gcs", "convert_dataset_to_openlineage"] => Replacement::AutoImport {
+            ["gcs", "convert_dataset_to_openlineage"] => Replacement::Rename {
                 module: "airflow.providers.google.assets.gcs",
                 name: "convert_asset_to_openlineage",
             },
-            ["gcs", "sanitize_uri"] => Replacement::AutoImport {
+            ["gcs", "sanitize_uri"] => Replacement::Rename {
                 module: "airflow.providers.google.assets.gcs",
                 name: "sanitize_uri",
             },
@@ -919,7 +926,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "datasets",
             "mysql",
             "sanitize_uri",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.providers.mysql.assets.mysql",
             name: "sanitize_uri",
         },
@@ -932,7 +939,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "datasets",
             "postgres",
             "sanitize_uri",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.providers.postgres.assets.postgres",
             name: "sanitize_uri",
         },
@@ -947,12 +954,12 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "utils",
             rest,
         ] => match *rest {
-            "DatasetInfo" => Replacement::AutoImport {
+            "DatasetInfo" => Replacement::Rename {
                 module: "airflow.providers.openlineage.utils.utils",
                 name: "AssetInfo",
             },
 
-            "translate_airflow_dataset" => Replacement::AutoImport {
+            "translate_airflow_dataset" => Replacement::Rename {
                 module: "airflow.providers.openlineage.utils.utils",
                 name: "translate_airflow_asset",
             },
@@ -967,7 +974,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "datasets",
             "trino",
             "sanitize_uri",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.providers.trino.assets.trino",
             name: "sanitize_uri",
         },
@@ -976,7 +983,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
     };
 
     let (module, name) = match &replacement {
-        Replacement::AutoImport { module, name } => (module, *name),
+        Replacement::Rename { module, name } => (module, *name),
         Replacement::SourceModuleMoved { module, name } => (module, name.as_str()),
         _ => {
             checker.report_diagnostic(
diff --git a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
index 9963635c2e..bb31ef7b98 100644
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
@@ -51,6 +51,7 @@ use ruff_text_size::TextRange;
 /// )
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct Airflow3SuggestedToMoveToProvider<'a> {
     deprecated: QualifiedName<'a>,
     replacement: ProviderReplacement,
@@ -65,10 +66,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider<'_> {
             replacement,
         } = self;
         match replacement {
-            ProviderReplacement::None => {
-                format!("`{deprecated}` is removed in Airflow 3.0")
-            }
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 name: _,
                 module: _,
                 provider,
@@ -91,8 +89,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider<'_> {
     fn fix_title(&self) -> Option<String> {
         let Airflow3SuggestedToMoveToProvider { replacement, .. } = self;
         match replacement {
-            ProviderReplacement::None => None,
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module,
                 name,
                 provider,
@@ -134,34 +131,32 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
 
     let replacement = match qualified_name.segments() {
         // apache-airflow-providers-standard
-        ["airflow", "hooks", "filesystem", "FSHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "filesystem", "FSHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.hooks.filesystem",
             name: "FSHook",
             provider: "standard",
             version: "0.0.1",
         },
-        ["airflow", "hooks", "package_index", "PackageIndexHook"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.standard.hooks.package_index",
-                name: "PackageIndexHook",
-                provider: "standard",
-                version: "0.0.1",
-            }
-        }
-        ["airflow", "hooks", "subprocess", "SubprocessHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "package_index", "PackageIndexHook"] => ProviderReplacement::Rename {
+            module: "airflow.providers.standard.hooks.package_index",
+            name: "PackageIndexHook",
+            provider: "standard",
+            version: "0.0.1",
+        },
+        ["airflow", "hooks", "subprocess", "SubprocessHook"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.hooks.subprocess",
             name: "SubprocessHook",
             provider: "standard",
             version: "0.0.3",
         },
-        ["airflow", "operators", "bash", "BashOperator"] => ProviderReplacement::AutoImport {
+        ["airflow", "operators", "bash", "BashOperator"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.operators.bash",
             name: "BashOperator",
             provider: "standard",
             version: "0.0.1",
         },
         ["airflow", "operators", "datetime", "BranchDateTimeOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.standard.operators.datetime",
                 name: "BranchDateTimeOperator",
                 provider: "standard",
@@ -173,20 +168,20 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             "operators",
             "trigger_dagrun",
             "TriggerDagRunOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.operators.trigger_dagrun",
             name: "TriggerDagRunOperator",
             provider: "standard",
             version: "0.0.2",
         },
-        ["airflow", "operators", "empty", "EmptyOperator"] => ProviderReplacement::AutoImport {
+        ["airflow", "operators", "empty", "EmptyOperator"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.operators.empty",
             name: "EmptyOperator",
             provider: "standard",
             version: "0.0.2",
         },
         ["airflow", "operators", "latest_only", "LatestOnlyOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.standard.operators.latest_only",
                 name: "LatestOnlyOperator",
                 provider: "standard",
@@ -208,13 +203,19 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             version: "0.0.1",
         },
         ["airflow", "operators", "weekday", "BranchDayOfWeekOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                 module: "airflow.providers.standard.operators.weekday",
                 name: "BranchDayOfWeekOperator",
                 provider: "standard",
                 version: "0.0.1",
             }
         }
+        ["airflow", "sensors", "bash", "BashSensor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.standard.sensor.bash",
+            name: "BashSensor",
+            provider: "standard",
+            version: "0.0.1",
+        },
         [
             "airflow",
             "sensors",
@@ -237,12 +238,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "standard",
             version: "0.0.3",
         },
-        ["airflow", "sensors", "filesystem", "FileSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "filesystem", "FileSensor"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.sensors.filesystem",
             name: "FileSensor",
             provider: "standard",
             version: "0.0.2",
         },
+        ["airflow", "sensors", "python", "PythonSensor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.standard.sensors.python",
+            name: "PythonSensor",
+            provider: "standard",
+            version: "0.0.1",
+        },
         [
             "airflow",
             "sensors",
@@ -265,7 +272,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "standard",
             version: "0.0.1",
         },
-        ["airflow", "sensors", "weekday", "DayOfWeekSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "weekday", "DayOfWeekSensor"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.sensors.weekday",
             name: "DayOfWeekSensor",
             provider: "standard",
@@ -282,7 +289,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "standard",
             version: "0.0.3",
         },
-        ["airflow", "triggers", "file", "FileTrigger"] => ProviderReplacement::AutoImport {
+        ["airflow", "triggers", "file", "FileTrigger"] => ProviderReplacement::Rename {
             module: "airflow.providers.standard.triggers.file",
             name: "FileTrigger",
             provider: "standard",
@@ -303,20 +310,10 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
     };
 
     let (module, name) = match &replacement {
-        ProviderReplacement::AutoImport { module, name, .. } => (module, *name),
+        ProviderReplacement::Rename { module, name, .. } => (module, *name),
         ProviderReplacement::SourceModuleMovedToProvider { module, name, .. } => {
             (module, name.as_str())
         }
-        ProviderReplacement::None => {
-            checker.report_diagnostic(
-                Airflow3SuggestedToMoveToProvider {
-                    deprecated: qualified_name,
-                    replacement: replacement.clone(),
-                },
-                ranged.range(),
-            );
-            return;
-        }
     };
 
     if is_guarded_by_try_except(expr, module, name, checker.semantic()) {
diff --git a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
index b5e26ea2ab..7f19161797 100644
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
@@ -17,9 +17,9 @@ use ruff_text_size::TextRange;
 /// ## Why is this bad?
 /// Airflow 3.0 removed various deprecated functions, members, and other
 /// values. Some have more modern replacements. Others are considered too niche
-/// and not worth to be maintained in Airflow.
+/// and not worth continued maintenance in Airflow.
 /// Even though these symbols still work fine on Airflow 3.0, they are expected to be removed in a future version.
-/// The user is suggested to replace the original usage with the new ones.
+/// Where available, users should replace the removed functionality with the new alternatives.
 ///
 /// ## Example
 /// ```python
@@ -37,6 +37,7 @@ use ruff_text_size::TextRange;
 /// Asset(uri="test://test/")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct Airflow3SuggestedUpdate {
     deprecated: String,
     replacement: Replacement,
@@ -55,7 +56,7 @@ impl Violation for Airflow3SuggestedUpdate {
             Replacement::None
             | Replacement::AttrName(_)
             | Replacement::Message(_)
-            | Replacement::AutoImport { module: _, name: _ }
+            | Replacement::Rename { module: _, name: _ }
             | Replacement::SourceModuleMoved { module: _, name: _ } => {
                 format!(
                     "`{deprecated}` is removed in Airflow 3.0; \
@@ -71,7 +72,7 @@ impl Violation for Airflow3SuggestedUpdate {
             Replacement::None => None,
             Replacement::AttrName(name) => Some(format!("Use `{name}` instead")),
             Replacement::Message(message) => Some((*message).to_string()),
-            Replacement::AutoImport { module, name } => {
+            Replacement::Rename { module, name } => {
                 Some(format!("Use `{name}` from `{module}` instead."))
             }
             Replacement::SourceModuleMoved { module, name } => {
@@ -157,6 +158,9 @@ fn check_call_arguments(checker: &Checker, qualified_name: &QualifiedName, argum
         ["airflow", .., "DAG" | "dag"] => {
             diagnostic_for_argument(checker, arguments, "sla_miss_callback", None);
         }
+        ["airflow", "timetables", "datasets", "DatasetOrTimeSchedule"] => {
+            diagnostic_for_argument(checker, arguments, "datasets", Some("assets"));
+        }
         segments => {
             if is_airflow_builtin_or_provider(segments, "operators", "Operator") {
                 diagnostic_for_argument(checker, arguments, "sla", None);
@@ -188,30 +192,30 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
 
     let replacement = match qualified_name.segments() {
         // airflow.datasets.metadata
-        ["airflow", "datasets", "metadata", "Metadata"] => Replacement::AutoImport {
+        ["airflow", "datasets", "metadata", "Metadata"] => Replacement::Rename {
             module: "airflow.sdk",
             name: "Metadata",
         },
         // airflow.datasets
-        ["airflow", "Dataset"] | ["airflow", "datasets", "Dataset"] => Replacement::AutoImport {
+        ["airflow", "Dataset"] | ["airflow", "datasets", "Dataset"] => Replacement::Rename {
             module: "airflow.sdk",
             name: "Asset",
         },
         ["airflow", "datasets", rest] => match *rest {
             "DatasetAliasEvent" => Replacement::None,
-            "DatasetAlias" => Replacement::AutoImport {
+            "DatasetAlias" => Replacement::Rename {
                 module: "airflow.sdk",
                 name: "AssetAlias",
             },
-            "DatasetAll" => Replacement::AutoImport {
+            "DatasetAll" => Replacement::Rename {
                 module: "airflow.sdk",
                 name: "AssetAll",
             },
-            "DatasetAny" => Replacement::AutoImport {
+            "DatasetAny" => Replacement::Rename {
                 module: "airflow.sdk",
                 name: "AssetAny",
             },
-            "expand_alias_to_datasets" => Replacement::AutoImport {
+            "expand_alias_to_datasets" => Replacement::Rename {
                 module: "airflow.models.asset",
                 name: "expand_alias_to_assets",
             },
@@ -227,13 +231,26 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             module: "airflow.sdk",
             name: (*rest).to_string(),
         },
+        [
+            "airflow",
+            "decorators",
+            "base",
+            rest @ ("DecoratedMappedOperator"
+            | "DecoratedOperator"
+            | "TaskDecorator"
+            | "get_unique_task_id"
+            | "task_decorator_factory"),
+        ] => Replacement::SourceModuleMoved {
+            module: "airflow.sdk.bases.decorator",
+            name: (*rest).to_string(),
+        },
 
         // airflow.io
         ["airflow", "io", "path", "ObjectStoragePath"] => Replacement::SourceModuleMoved {
             module: "airflow.sdk",
             name: "ObjectStoragePath".to_string(),
         },
-        ["airflow", "io", "storage", "attach"] => Replacement::SourceModuleMoved {
+        ["airflow", "io", "store", "attach"] => Replacement::SourceModuleMoved {
             module: "airflow.sdk.io",
             name: "attach".to_string(),
         },
@@ -245,6 +262,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
                 name: (*rest).to_string(),
             }
         }
+        [
+            "airflow",
+            "models",
+            ..,
+            rest @ ("Param" | "ParamsDict" | "DagParam"),
+        ] => Replacement::SourceModuleMoved {
+            module: "airflow.sdk.definitions.param",
+            name: (*rest).to_string(),
+        },
 
         // airflow.models.baseoperator
         [
@@ -256,27 +282,41 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             module: "airflow.sdk",
             name: (*rest).to_string(),
         },
-        ["airflow", "models", "baseoperatorlink", "BaseOperatorLink"] => Replacement::AutoImport {
+        ["airflow", "models", "baseoperatorlink", "BaseOperatorLink"] => Replacement::Rename {
             module: "airflow.sdk",
             name: "BaseOperatorLink",
         },
+
         // airflow.model..DAG
         ["airflow", "models", .., "DAG"] => Replacement::SourceModuleMoved {
             module: "airflow.sdk",
             name: "DAG".to_string(),
         },
+
+        // airflow.sensors.base
+        [
+            "airflow",
+            "sensors",
+            "base",
+            rest @ ("BaseSensorOperator" | "PokeReturnValue" | "poke_mode_only"),
+        ] => Replacement::SourceModuleMoved {
+            module: "airflow.sdk",
+            name: (*rest).to_string(),
+        },
+
         // airflow.timetables
-        ["airflow", "timetables", "datasets", "DatasetOrTimeSchedule"] => Replacement::AutoImport {
+        ["airflow", "timetables", "datasets", "DatasetOrTimeSchedule"] => Replacement::Rename {
             module: "airflow.timetables.assets",
             name: "AssetOrTimeSchedule",
         },
+
         // airflow.utils
         [
             "airflow",
             "utils",
             "dag_parsing_context",
             "get_parsing_context",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
             module: "airflow.sdk",
             name: "get_parsing_context",
         },
@@ -285,7 +325,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
     };
 
     let (module, name) = match &replacement {
-        Replacement::AutoImport { module, name } => (module, *name),
+        Replacement::Rename { module, name } => (module, *name),
         Replacement::SourceModuleMoved { module, name } => (module, name.as_str()),
         _ => {
             checker.report_diagnostic(
diff --git a/crates/ruff_linter/src/rules/airflow/rules/task_variable_name.rs b/crates/ruff_linter/src/rules/airflow/rules/task_variable_name.rs
index 8fcd6da8c1..af30a832e3 100644
--- a/crates/ruff_linter/src/rules/airflow/rules/task_variable_name.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/task_variable_name.rs
@@ -32,6 +32,7 @@ use crate::checkers::ast::Checker;
 /// my_task = PythonOperator(task_id="my_task")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct AirflowVariableNameTaskIdMismatch {
     task_id: String,
 }
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR002_AIR002.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR002_AIR002.py.snap
index 2ca71e8bfa..9b13f0b310 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR002_AIR002.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR002_AIR002.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/airflow/mod.rs
 ---
-AIR002 DAG should have an explicit `schedule` argument
+AIR002 `DAG` or `@dag` should have an explicit `schedule` argument
  --> AIR002.py:4:1
   |
 2 | from airflow.timetables.simple import NullTimetable
@@ -12,7 +12,7 @@ AIR002 DAG should have an explicit `schedule` argument
 6 | DAG(dag_id="class_schedule", schedule="@hourly")
   |
 
-AIR002 DAG should have an explicit `schedule` argument
+AIR002 `DAG` or `@dag` should have an explicit `schedule` argument
   --> AIR002.py:13:2
    |
 13 | @dag()
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap
index 1142bee4af..6f783edc9f 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap
@@ -12,16 +12,14 @@ AIR301 [*] `schedule_interval` is removed in Airflow 3.0
 23 | DAG(dag_id="class_timetable", timetable=NullTimetable())
    |
 help: Use `schedule` instead
-
-ℹ Safe fix
-18 18 | 
-19 19 | DAG(dag_id="class_schedule", schedule="@hourly")
-20 20 | 
-21    |-DAG(dag_id="class_schedule_interval", schedule_interval="@hourly")
-   21 |+DAG(dag_id="class_schedule_interval", schedule="@hourly")
-22 22 | 
-23 23 | DAG(dag_id="class_timetable", timetable=NullTimetable())
-24 24 | 
+18 | 
+19 | DAG(dag_id="class_schedule", schedule="@hourly")
+20 | 
+   - DAG(dag_id="class_schedule_interval", schedule_interval="@hourly")
+21 + DAG(dag_id="class_schedule_interval", schedule="@hourly")
+22 | 
+23 | DAG(dag_id="class_timetable", timetable=NullTimetable())
+24 | 
 
 AIR301 [*] `timetable` is removed in Airflow 3.0
   --> AIR301_args.py:23:31
@@ -32,16 +30,14 @@ AIR301 [*] `timetable` is removed in Airflow 3.0
    |                               ^^^^^^^^^
    |
 help: Use `schedule` instead
-
-ℹ Safe fix
-20 20 | 
-21 21 | DAG(dag_id="class_schedule_interval", schedule_interval="@hourly")
-22 22 | 
-23    |-DAG(dag_id="class_timetable", timetable=NullTimetable())
-   23 |+DAG(dag_id="class_timetable", schedule=NullTimetable())
-24 24 | 
-25 25 | 
-26 26 | DAG(dag_id="class_fail_stop", fail_stop=True)
+20 | 
+21 | DAG(dag_id="class_schedule_interval", schedule_interval="@hourly")
+22 | 
+   - DAG(dag_id="class_timetable", timetable=NullTimetable())
+23 + DAG(dag_id="class_timetable", schedule=NullTimetable())
+24 | 
+25 | 
+26 | DAG(dag_id="class_fail_stop", fail_stop=True)
 
 AIR301 [*] `fail_stop` is removed in Airflow 3.0
   --> AIR301_args.py:26:31
@@ -52,16 +48,14 @@ AIR301 [*] `fail_stop` is removed in Airflow 3.0
 28 | DAG(dag_id="class_default_view", default_view="dag_default_view")
    |
 help: Use `fail_fast` instead
-
-ℹ Safe fix
-23 23 | DAG(dag_id="class_timetable", timetable=NullTimetable())
-24 24 | 
-25 25 | 
-26    |-DAG(dag_id="class_fail_stop", fail_stop=True)
-   26 |+DAG(dag_id="class_fail_stop", fail_fast=True)
-27 27 | 
-28 28 | DAG(dag_id="class_default_view", default_view="dag_default_view")
-29 29 | 
+23 | DAG(dag_id="class_timetable", timetable=NullTimetable())
+24 | 
+25 | 
+   - DAG(dag_id="class_fail_stop", fail_stop=True)
+26 + DAG(dag_id="class_fail_stop", fail_fast=True)
+27 | 
+28 | DAG(dag_id="class_default_view", default_view="dag_default_view")
+29 | 
 
 AIR301 `default_view` is removed in Airflow 3.0
   --> AIR301_args.py:28:34
@@ -94,16 +88,14 @@ AIR301 [*] `schedule_interval` is removed in Airflow 3.0
 43 |     pass
    |
 help: Use `schedule` instead
-
-ℹ Safe fix
-38 38 |     pass
-39 39 | 
-40 40 | 
-41    |-@dag(schedule_interval="0 * * * *")
-   41 |+@dag(schedule="0 * * * *")
-42 42 | def decorator_schedule_interval():
-43 43 |     pass
-44 44 | 
+38 |     pass
+39 | 
+40 | 
+   - @dag(schedule_interval="0 * * * *")
+41 + @dag(schedule="0 * * * *")
+42 | def decorator_schedule_interval():
+43 |     pass
+44 | 
 
 AIR301 [*] `timetable` is removed in Airflow 3.0
   --> AIR301_args.py:46:6
@@ -114,16 +106,14 @@ AIR301 [*] `timetable` is removed in Airflow 3.0
 48 |     pass
    |
 help: Use `schedule` instead
-
-ℹ Safe fix
-43 43 |     pass
-44 44 | 
-45 45 | 
-46    |-@dag(timetable=NullTimetable())
-   46 |+@dag(schedule=NullTimetable())
-47 47 | def decorator_timetable():
-48 48 |     pass
-49 49 | 
+43 |     pass
+44 | 
+45 | 
+   - @dag(timetable=NullTimetable())
+46 + @dag(schedule=NullTimetable())
+47 | def decorator_timetable():
+48 |     pass
+49 | 
 
 AIR301 [*] `execution_date` is removed in Airflow 3.0
   --> AIR301_args.py:54:62
@@ -136,16 +126,14 @@ AIR301 [*] `execution_date` is removed in Airflow 3.0
 56 |     trigger_dagrun_op2 = TriggerDagRunOperator(
    |
 help: Use `logical_date` instead
-
-ℹ Safe fix
-51 51 | @dag()
-52 52 | def decorator_deprecated_operator_args():
-53 53 |     trigger_dagrun_op = trigger_dagrun.TriggerDagRunOperator(
-54    |-        task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04"
-   54 |+        task_id="trigger_dagrun_op1", trigger_dag_id="test", logical_date="2024-12-04"
-55 55 |     )
-56 56 |     trigger_dagrun_op2 = TriggerDagRunOperator(
-57 57 |         task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04"
+51 | @dag()
+52 | def decorator_deprecated_operator_args():
+53 |     trigger_dagrun_op = trigger_dagrun.TriggerDagRunOperator(
+   -         task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04"
+54 +         task_id="trigger_dagrun_op1", trigger_dag_id="test", logical_date="2024-12-04"
+55 |     )
+56 |     trigger_dagrun_op2 = TriggerDagRunOperator(
+57 |         task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04"
 
 AIR301 [*] `execution_date` is removed in Airflow 3.0
   --> AIR301_args.py:57:62
@@ -157,16 +145,14 @@ AIR301 [*] `execution_date` is removed in Airflow 3.0
 58 |     )
    |
 help: Use `logical_date` instead
-
-ℹ Safe fix
-54 54 |         task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04"
-55 55 |     )
-56 56 |     trigger_dagrun_op2 = TriggerDagRunOperator(
-57    |-        task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04"
-   57 |+        task_id="trigger_dagrun_op2", trigger_dag_id="test", logical_date="2024-12-04"
-58 58 |     )
-59 59 | 
-60 60 |     branch_dt_op = datetime.BranchDateTimeOperator(
+54 |         task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04"
+55 |     )
+56 |     trigger_dagrun_op2 = TriggerDagRunOperator(
+   -         task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04"
+57 +         task_id="trigger_dagrun_op2", trigger_dag_id="test", logical_date="2024-12-04"
+58 |     )
+59 | 
+60 |     branch_dt_op = datetime.BranchDateTimeOperator(
 
 AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0
   --> AIR301_args.py:61:33
@@ -178,16 +164,14 @@ AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0
 63 |     branch_dt_op2 = BranchDateTimeOperator(
    |
 help: Use `use_task_logical_date` instead
-
-ℹ Safe fix
-58 58 |     )
-59 59 | 
-60 60 |     branch_dt_op = datetime.BranchDateTimeOperator(
-61    |-        task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5
-   61 |+        task_id="branch_dt_op", use_task_logical_date=True, task_concurrency=5
-62 62 |     )
-63 63 |     branch_dt_op2 = BranchDateTimeOperator(
-64 64 |         task_id="branch_dt_op2",
+58 |     )
+59 | 
+60 |     branch_dt_op = datetime.BranchDateTimeOperator(
+   -         task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5
+61 +         task_id="branch_dt_op", use_task_logical_date=True, task_concurrency=5
+62 |     )
+63 |     branch_dt_op2 = BranchDateTimeOperator(
+64 |         task_id="branch_dt_op2",
 
 AIR301 [*] `task_concurrency` is removed in Airflow 3.0
   --> AIR301_args.py:61:62
@@ -199,16 +183,14 @@ AIR301 [*] `task_concurrency` is removed in Airflow 3.0
 63 |     branch_dt_op2 = BranchDateTimeOperator(
    |
 help: Use `max_active_tis_per_dag` instead
-
-ℹ Safe fix
-58 58 |     )
-59 59 | 
-60 60 |     branch_dt_op = datetime.BranchDateTimeOperator(
-61    |-        task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5
-   61 |+        task_id="branch_dt_op", use_task_execution_day=True, max_active_tis_per_dag=5
-62 62 |     )
-63 63 |     branch_dt_op2 = BranchDateTimeOperator(
-64 64 |         task_id="branch_dt_op2",
+58 |     )
+59 | 
+60 |     branch_dt_op = datetime.BranchDateTimeOperator(
+   -         task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5
+61 +         task_id="branch_dt_op", use_task_execution_day=True, max_active_tis_per_dag=5
+62 |     )
+63 |     branch_dt_op2 = BranchDateTimeOperator(
+64 |         task_id="branch_dt_op2",
 
 AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0
   --> AIR301_args.py:65:9
@@ -221,16 +203,14 @@ AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0
 67 |     )
    |
 help: Use `use_task_logical_date` instead
-
-ℹ Safe fix
-62 62 |     )
-63 63 |     branch_dt_op2 = BranchDateTimeOperator(
-64 64 |         task_id="branch_dt_op2",
-65    |-        use_task_execution_day=True,
-   65 |+        use_task_logical_date=True,
-66 66 |         sla=timedelta(seconds=10),
-67 67 |     )
-68 68 | 
+62 |     )
+63 |     branch_dt_op2 = BranchDateTimeOperator(
+64 |         task_id="branch_dt_op2",
+   -         use_task_execution_day=True,
+65 +         use_task_logical_date=True,
+66 |         sla=timedelta(seconds=10),
+67 |     )
+68 | 
 
 AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0
   --> AIR301_args.py:92:9
@@ -242,16 +222,14 @@ AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0
 93 |     )
    |
 help: Use `use_task_logical_date` instead
-
-ℹ Safe fix
-89 89 |         follow_task_ids_if_false=None,
-90 90 |         follow_task_ids_if_true=None,
-91 91 |         week_day=1,
-92    |-        use_task_execution_day=True,
-   92 |+        use_task_logical_date=True,
-93 93 |     )
-94 94 | 
-95 95 |     trigger_dagrun_op >> trigger_dagrun_op2
+89 |         follow_task_ids_if_false=None,
+90 |         follow_task_ids_if_true=None,
+91 |         week_day=1,
+   -         use_task_execution_day=True,
+92 +         use_task_logical_date=True,
+93 |     )
+94 | 
+95 |     trigger_dagrun_op >> trigger_dagrun_op2
 
 AIR301 `filename_template` is removed in Airflow 3.0
    --> AIR301_args.py:102:15
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap
index 8bd2cd6bbb..1c235414df 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap
@@ -11,16 +11,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0
 26 | dataset_from_root.iter_dataset_aliases()
    |
 help: Use `iter_assets` instead
-
-ℹ Safe fix
-22 22 | 
-23 23 | # airflow.Dataset
-24 24 | dataset_from_root = DatasetFromRoot()
-25    |-dataset_from_root.iter_datasets()
-   25 |+dataset_from_root.iter_assets()
-26 26 | dataset_from_root.iter_dataset_aliases()
-27 27 | 
-28 28 | # airflow.datasets
+22 | 
+23 | # airflow.Dataset
+24 | dataset_from_root = DatasetFromRoot()
+   - dataset_from_root.iter_datasets()
+25 + dataset_from_root.iter_assets()
+26 | dataset_from_root.iter_dataset_aliases()
+27 | 
+28 | # airflow.datasets
 
 AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:26:19
@@ -33,16 +31,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
 28 | # airflow.datasets
    |
 help: Use `iter_asset_aliases` instead
-
-ℹ Safe fix
-23 23 | # airflow.Dataset
-24 24 | dataset_from_root = DatasetFromRoot()
-25 25 | dataset_from_root.iter_datasets()
-26    |-dataset_from_root.iter_dataset_aliases()
-   26 |+dataset_from_root.iter_asset_aliases()
-27 27 | 
-28 28 | # airflow.datasets
-29 29 | dataset_to_test_method_call = Dataset()
+23 | # airflow.Dataset
+24 | dataset_from_root = DatasetFromRoot()
+25 | dataset_from_root.iter_datasets()
+   - dataset_from_root.iter_dataset_aliases()
+26 + dataset_from_root.iter_asset_aliases()
+27 | 
+28 | # airflow.datasets
+29 | dataset_to_test_method_call = Dataset()
 
 AIR301 [*] `iter_datasets` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:30:29
@@ -54,16 +50,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0
 31 | dataset_to_test_method_call.iter_dataset_aliases()
    |
 help: Use `iter_assets` instead
-
-ℹ Safe fix
-27 27 | 
-28 28 | # airflow.datasets
-29 29 | dataset_to_test_method_call = Dataset()
-30    |-dataset_to_test_method_call.iter_datasets()
-   30 |+dataset_to_test_method_call.iter_assets()
-31 31 | dataset_to_test_method_call.iter_dataset_aliases()
-32 32 | 
-33 33 | alias_to_test_method_call = DatasetAlias()
+27 | 
+28 | # airflow.datasets
+29 | dataset_to_test_method_call = Dataset()
+   - dataset_to_test_method_call.iter_datasets()
+30 + dataset_to_test_method_call.iter_assets()
+31 | dataset_to_test_method_call.iter_dataset_aliases()
+32 | 
+33 | alias_to_test_method_call = DatasetAlias()
 
 AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:31:29
@@ -76,16 +70,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
 33 | alias_to_test_method_call = DatasetAlias()
    |
 help: Use `iter_asset_aliases` instead
-
-ℹ Safe fix
-28 28 | # airflow.datasets
-29 29 | dataset_to_test_method_call = Dataset()
-30 30 | dataset_to_test_method_call.iter_datasets()
-31    |-dataset_to_test_method_call.iter_dataset_aliases()
-   31 |+dataset_to_test_method_call.iter_asset_aliases()
-32 32 | 
-33 33 | alias_to_test_method_call = DatasetAlias()
-34 34 | alias_to_test_method_call.iter_datasets()
+28 | # airflow.datasets
+29 | dataset_to_test_method_call = Dataset()
+30 | dataset_to_test_method_call.iter_datasets()
+   - dataset_to_test_method_call.iter_dataset_aliases()
+31 + dataset_to_test_method_call.iter_asset_aliases()
+32 | 
+33 | alias_to_test_method_call = DatasetAlias()
+34 | alias_to_test_method_call.iter_datasets()
 
 AIR301 [*] `iter_datasets` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:34:27
@@ -96,16 +88,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0
 35 | alias_to_test_method_call.iter_dataset_aliases()
    |
 help: Use `iter_assets` instead
-
-ℹ Safe fix
-31 31 | dataset_to_test_method_call.iter_dataset_aliases()
-32 32 | 
-33 33 | alias_to_test_method_call = DatasetAlias()
-34    |-alias_to_test_method_call.iter_datasets()
-   34 |+alias_to_test_method_call.iter_assets()
-35 35 | alias_to_test_method_call.iter_dataset_aliases()
-36 36 | 
-37 37 | any_to_test_method_call = DatasetAny()
+31 | dataset_to_test_method_call.iter_dataset_aliases()
+32 | 
+33 | alias_to_test_method_call = DatasetAlias()
+   - alias_to_test_method_call.iter_datasets()
+34 + alias_to_test_method_call.iter_assets()
+35 | alias_to_test_method_call.iter_dataset_aliases()
+36 | 
+37 | any_to_test_method_call = DatasetAny()
 
 AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:35:27
@@ -118,16 +108,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
 37 | any_to_test_method_call = DatasetAny()
    |
 help: Use `iter_asset_aliases` instead
-
-ℹ Safe fix
-32 32 | 
-33 33 | alias_to_test_method_call = DatasetAlias()
-34 34 | alias_to_test_method_call.iter_datasets()
-35    |-alias_to_test_method_call.iter_dataset_aliases()
-   35 |+alias_to_test_method_call.iter_asset_aliases()
-36 36 | 
-37 37 | any_to_test_method_call = DatasetAny()
-38 38 | any_to_test_method_call.iter_datasets()
+32 | 
+33 | alias_to_test_method_call = DatasetAlias()
+34 | alias_to_test_method_call.iter_datasets()
+   - alias_to_test_method_call.iter_dataset_aliases()
+35 + alias_to_test_method_call.iter_asset_aliases()
+36 | 
+37 | any_to_test_method_call = DatasetAny()
+38 | any_to_test_method_call.iter_datasets()
 
 AIR301 [*] `iter_datasets` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:38:25
@@ -138,16 +126,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0
 39 | any_to_test_method_call.iter_dataset_aliases()
    |
 help: Use `iter_assets` instead
-
-ℹ Safe fix
-35 35 | alias_to_test_method_call.iter_dataset_aliases()
-36 36 | 
-37 37 | any_to_test_method_call = DatasetAny()
-38    |-any_to_test_method_call.iter_datasets()
-   38 |+any_to_test_method_call.iter_assets()
-39 39 | any_to_test_method_call.iter_dataset_aliases()
-40 40 | 
-41 41 | # airflow.datasets.manager
+35 | alias_to_test_method_call.iter_dataset_aliases()
+36 | 
+37 | any_to_test_method_call = DatasetAny()
+   - any_to_test_method_call.iter_datasets()
+38 + any_to_test_method_call.iter_assets()
+39 | any_to_test_method_call.iter_dataset_aliases()
+40 | 
+41 | # airflow.datasets.manager
 
 AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:39:25
@@ -160,16 +146,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0
 41 | # airflow.datasets.manager
    |
 help: Use `iter_asset_aliases` instead
-
-ℹ Safe fix
-36 36 | 
-37 37 | any_to_test_method_call = DatasetAny()
-38 38 | any_to_test_method_call.iter_datasets()
-39    |-any_to_test_method_call.iter_dataset_aliases()
-   39 |+any_to_test_method_call.iter_asset_aliases()
-40 40 | 
-41 41 | # airflow.datasets.manager
-42 42 | dm = DatasetManager()
+36 | 
+37 | any_to_test_method_call = DatasetAny()
+38 | any_to_test_method_call.iter_datasets()
+   - any_to_test_method_call.iter_dataset_aliases()
+39 + any_to_test_method_call.iter_asset_aliases()
+40 | 
+41 | # airflow.datasets.manager
+42 | dm = DatasetManager()
 
 AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:42:6
@@ -181,24 +165,22 @@ AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0
 44 | dm.create_datasets()
    |
 help: Use `AssetManager` from `airflow.assets.manager` instead.
-
-ℹ Safe fix
-19 19 | from airflow.providers_manager import ProvidersManager
-20 20 | from airflow.secrets.base_secrets import BaseSecretsBackend
-21 21 | from airflow.secrets.local_filesystem import LocalFilesystemBackend
-   22 |+from airflow.assets.manager import AssetManager
-22 23 | 
-23 24 | # airflow.Dataset
-24 25 | dataset_from_root = DatasetFromRoot()
+19 | from airflow.providers_manager import ProvidersManager
+20 | from airflow.secrets.base_secrets import BaseSecretsBackend
+21 | from airflow.secrets.local_filesystem import LocalFilesystemBackend
+22 + from airflow.assets.manager import AssetManager
+23 | 
+24 | # airflow.Dataset
+25 | dataset_from_root = DatasetFromRoot()
 --------------------------------------------------------------------------------
-39 40 | any_to_test_method_call.iter_dataset_aliases()
-40 41 | 
-41 42 | # airflow.datasets.manager
-42    |-dm = DatasetManager()
-   43 |+dm = AssetManager()
-43 44 | dm.register_dataset_change()
-44 45 | dm.create_datasets()
-45 46 | dm.notify_dataset_created()
+40 | any_to_test_method_call.iter_dataset_aliases()
+41 | 
+42 | # airflow.datasets.manager
+   - dm = DatasetManager()
+43 + dm = AssetManager()
+44 | dm.register_dataset_change()
+45 | dm.create_datasets()
+46 | dm.notify_dataset_created()
 
 AIR301 [*] `register_dataset_change` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:43:4
@@ -211,16 +193,14 @@ AIR301 [*] `register_dataset_change` is removed in Airflow 3.0
 45 | dm.notify_dataset_created()
    |
 help: Use `register_asset_change` instead
-
-ℹ Safe fix
-40 40 | 
-41 41 | # airflow.datasets.manager
-42 42 | dm = DatasetManager()
-43    |-dm.register_dataset_change()
-   43 |+dm.register_asset_change()
-44 44 | dm.create_datasets()
-45 45 | dm.notify_dataset_created()
-46 46 | dm.notify_dataset_changed()
+40 | 
+41 | # airflow.datasets.manager
+42 | dm = DatasetManager()
+   - dm.register_dataset_change()
+43 + dm.register_asset_change()
+44 | dm.create_datasets()
+45 | dm.notify_dataset_created()
+46 | dm.notify_dataset_changed()
 
 AIR301 [*] `create_datasets` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:44:4
@@ -233,16 +213,14 @@ AIR301 [*] `create_datasets` is removed in Airflow 3.0
 46 | dm.notify_dataset_changed()
    |
 help: Use `create_assets` instead
-
-ℹ Safe fix
-41 41 | # airflow.datasets.manager
-42 42 | dm = DatasetManager()
-43 43 | dm.register_dataset_change()
-44    |-dm.create_datasets()
-   44 |+dm.create_assets()
-45 45 | dm.notify_dataset_created()
-46 46 | dm.notify_dataset_changed()
-47 47 | dm.notify_dataset_alias_created()
+41 | # airflow.datasets.manager
+42 | dm = DatasetManager()
+43 | dm.register_dataset_change()
+   - dm.create_datasets()
+44 + dm.create_assets()
+45 | dm.notify_dataset_created()
+46 | dm.notify_dataset_changed()
+47 | dm.notify_dataset_alias_created()
 
 AIR301 [*] `notify_dataset_created` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:45:4
@@ -255,16 +233,14 @@ AIR301 [*] `notify_dataset_created` is removed in Airflow 3.0
 47 | dm.notify_dataset_alias_created()
    |
 help: Use `notify_asset_created` instead
-
-ℹ Safe fix
-42 42 | dm = DatasetManager()
-43 43 | dm.register_dataset_change()
-44 44 | dm.create_datasets()
-45    |-dm.notify_dataset_created()
-   45 |+dm.notify_asset_created()
-46 46 | dm.notify_dataset_changed()
-47 47 | dm.notify_dataset_alias_created()
-48 48 | 
+42 | dm = DatasetManager()
+43 | dm.register_dataset_change()
+44 | dm.create_datasets()
+   - dm.notify_dataset_created()
+45 + dm.notify_asset_created()
+46 | dm.notify_dataset_changed()
+47 | dm.notify_dataset_alias_created()
+48 | 
 
 AIR301 [*] `notify_dataset_changed` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:46:4
@@ -276,16 +252,14 @@ AIR301 [*] `notify_dataset_changed` is removed in Airflow 3.0
 47 | dm.notify_dataset_alias_created()
    |
 help: Use `notify_asset_changed` instead
-
-ℹ Safe fix
-43 43 | dm.register_dataset_change()
-44 44 | dm.create_datasets()
-45 45 | dm.notify_dataset_created()
-46    |-dm.notify_dataset_changed()
-   46 |+dm.notify_asset_changed()
-47 47 | dm.notify_dataset_alias_created()
-48 48 | 
-49 49 | # airflow.lineage.hook
+43 | dm.register_dataset_change()
+44 | dm.create_datasets()
+45 | dm.notify_dataset_created()
+   - dm.notify_dataset_changed()
+46 + dm.notify_asset_changed()
+47 | dm.notify_dataset_alias_created()
+48 | 
+49 | # airflow.lineage.hook
 
 AIR301 [*] `notify_dataset_alias_created` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:47:4
@@ -298,16 +272,14 @@ AIR301 [*] `notify_dataset_alias_created` is removed in Airflow 3.0
 49 | # airflow.lineage.hook
    |
 help: Use `notify_asset_alias_created` instead
-
-ℹ Safe fix
-44 44 | dm.create_datasets()
-45 45 | dm.notify_dataset_created()
-46 46 | dm.notify_dataset_changed()
-47    |-dm.notify_dataset_alias_created()
-   47 |+dm.notify_asset_alias_created()
-48 48 | 
-49 49 | # airflow.lineage.hook
-50 50 | dl_info = DatasetLineageInfo()
+44 | dm.create_datasets()
+45 | dm.notify_dataset_created()
+46 | dm.notify_dataset_changed()
+   - dm.notify_dataset_alias_created()
+47 + dm.notify_asset_alias_created()
+48 | 
+49 | # airflow.lineage.hook
+50 | dl_info = DatasetLineageInfo()
 
 AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:50:11
@@ -318,25 +290,23 @@ AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0
 51 | dl_info.dataset
    |
 help: Use `AssetLineageInfo` from `airflow.lineage.hook` instead.
-
-ℹ Safe fix
-9  9  |     DatasetAny,
-10 10 | )
-11 11 | from airflow.datasets.manager import DatasetManager
-12    |-from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector
-   12 |+from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector, AssetLineageInfo
-13 13 | from airflow.providers.amazon.aws.auth_manager.aws_auth_manager import AwsAuthManager
-14 14 | from airflow.providers.apache.beam.hooks import BeamHook, NotAir302HookError
-15 15 | from airflow.providers.google.cloud.secrets.secret_manager import (
+9  |     DatasetAny,
+10 | )
+11 | from airflow.datasets.manager import DatasetManager
+   - from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector
+12 + from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector, AssetLineageInfo
+13 | from airflow.providers.amazon.aws.auth_manager.aws_auth_manager import AwsAuthManager
+14 | from airflow.providers.apache.beam.hooks import BeamHook, NotAir302HookError
+15 | from airflow.providers.google.cloud.secrets.secret_manager import (
 --------------------------------------------------------------------------------
-47 47 | dm.notify_dataset_alias_created()
-48 48 | 
-49 49 | # airflow.lineage.hook
-50    |-dl_info = DatasetLineageInfo()
-   50 |+dl_info = AssetLineageInfo()
-51 51 | dl_info.dataset
-52 52 | 
-53 53 | hlc = HookLineageCollector()
+47 | dm.notify_dataset_alias_created()
+48 | 
+49 | # airflow.lineage.hook
+   - dl_info = DatasetLineageInfo()
+50 + dl_info = AssetLineageInfo()
+51 | dl_info.dataset
+52 | 
+53 | hlc = HookLineageCollector()
 
 AIR301 [*] `dataset` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:51:9
@@ -349,16 +319,14 @@ AIR301 [*] `dataset` is removed in Airflow 3.0
 53 | hlc = HookLineageCollector()
    |
 help: Use `asset` instead
-
-ℹ Safe fix
-48 48 | 
-49 49 | # airflow.lineage.hook
-50 50 | dl_info = DatasetLineageInfo()
-51    |-dl_info.dataset
-   51 |+dl_info.asset
-52 52 | 
-53 53 | hlc = HookLineageCollector()
-54 54 | hlc.create_dataset()
+48 | 
+49 | # airflow.lineage.hook
+50 | dl_info = DatasetLineageInfo()
+   - dl_info.dataset
+51 + dl_info.asset
+52 | 
+53 | hlc = HookLineageCollector()
+54 | hlc.create_dataset()
 
 AIR301 [*] `create_dataset` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:54:5
@@ -370,16 +338,14 @@ AIR301 [*] `create_dataset` is removed in Airflow 3.0
 56 | hlc.add_output_dataset()
    |
 help: Use `create_asset` instead
-
-ℹ Safe fix
-51 51 | dl_info.dataset
-52 52 | 
-53 53 | hlc = HookLineageCollector()
-54    |-hlc.create_dataset()
-   54 |+hlc.create_asset()
-55 55 | hlc.add_input_dataset()
-56 56 | hlc.add_output_dataset()
-57 57 | hlc.collected_datasets()
+51 | dl_info.dataset
+52 | 
+53 | hlc = HookLineageCollector()
+   - hlc.create_dataset()
+54 + hlc.create_asset()
+55 | hlc.add_input_dataset()
+56 | hlc.add_output_dataset()
+57 | hlc.collected_datasets()
 
 AIR301 [*] `add_input_dataset` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:55:5
@@ -392,16 +358,14 @@ AIR301 [*] `add_input_dataset` is removed in Airflow 3.0
 57 | hlc.collected_datasets()
    |
 help: Use `add_input_asset` instead
-
-ℹ Safe fix
-52 52 | 
-53 53 | hlc = HookLineageCollector()
-54 54 | hlc.create_dataset()
-55    |-hlc.add_input_dataset()
-   55 |+hlc.add_input_asset()
-56 56 | hlc.add_output_dataset()
-57 57 | hlc.collected_datasets()
-58 58 | 
+52 | 
+53 | hlc = HookLineageCollector()
+54 | hlc.create_dataset()
+   - hlc.add_input_dataset()
+55 + hlc.add_input_asset()
+56 | hlc.add_output_dataset()
+57 | hlc.collected_datasets()
+58 | 
 
 AIR301 [*] `add_output_dataset` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:56:5
@@ -413,16 +377,14 @@ AIR301 [*] `add_output_dataset` is removed in Airflow 3.0
 57 | hlc.collected_datasets()
    |
 help: Use `add_output_asset` instead
-
-ℹ Safe fix
-53 53 | hlc = HookLineageCollector()
-54 54 | hlc.create_dataset()
-55 55 | hlc.add_input_dataset()
-56    |-hlc.add_output_dataset()
-   56 |+hlc.add_output_asset()
-57 57 | hlc.collected_datasets()
-58 58 | 
-59 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
+53 | hlc = HookLineageCollector()
+54 | hlc.create_dataset()
+55 | hlc.add_input_dataset()
+   - hlc.add_output_dataset()
+56 + hlc.add_output_asset()
+57 | hlc.collected_datasets()
+58 | 
+59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
 
 AIR301 [*] `collected_datasets` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:57:5
@@ -435,16 +397,14 @@ AIR301 [*] `collected_datasets` is removed in Airflow 3.0
 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
    |
 help: Use `collected_assets` instead
-
-ℹ Safe fix
-54 54 | hlc.create_dataset()
-55 55 | hlc.add_input_dataset()
-56 56 | hlc.add_output_dataset()
-57    |-hlc.collected_datasets()
-   57 |+hlc.collected_assets()
-58 58 | 
-59 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
-60 60 | aam = AwsAuthManager()
+54 | hlc.create_dataset()
+55 | hlc.add_input_dataset()
+56 | hlc.add_output_dataset()
+   - hlc.collected_datasets()
+57 + hlc.collected_assets()
+58 | 
+59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
+60 | aam = AwsAuthManager()
 
 AIR301 [*] `is_authorized_dataset` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:61:5
@@ -457,16 +417,14 @@ AIR301 [*] `is_authorized_dataset` is removed in Airflow 3.0
 63 | # airflow.providers.apache.beam.hooks
    |
 help: Use `is_authorized_asset` instead
-
-ℹ Safe fix
-58 58 | 
-59 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
-60 60 | aam = AwsAuthManager()
-61    |-aam.is_authorized_dataset()
-   61 |+aam.is_authorized_asset()
-62 62 | 
-63 63 | # airflow.providers.apache.beam.hooks
-64 64 | # check get_conn_uri is caught if the class inherits from an airflow hook
+58 | 
+59 | # airflow.providers.amazon.auth_manager.aws_auth_manager
+60 | aam = AwsAuthManager()
+   - aam.is_authorized_dataset()
+61 + aam.is_authorized_asset()
+62 | 
+63 | # airflow.providers.apache.beam.hooks
+64 | # check get_conn_uri is caught if the class inherits from an airflow hook
 
 AIR301 [*] `get_conn_uri` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:73:13
@@ -478,16 +436,14 @@ AIR301 [*] `get_conn_uri` is removed in Airflow 3.0
 74 | csm_backend.get_connections()
    |
 help: Use `get_conn_value` instead
-
-ℹ Safe fix
-70 70 | 
-71 71 | # airflow.providers.google.cloud.secrets.secret_manager
-72 72 | csm_backend = CloudSecretManagerBackend()
-73    |-csm_backend.get_conn_uri()
-   73 |+csm_backend.get_conn_value()
-74 74 | csm_backend.get_connections()
-75 75 | 
-76 76 | # airflow.providers.hashicorp.secrets.vault
+70 | 
+71 | # airflow.providers.google.cloud.secrets.secret_manager
+72 | csm_backend = CloudSecretManagerBackend()
+   - csm_backend.get_conn_uri()
+73 + csm_backend.get_conn_value()
+74 | csm_backend.get_connections()
+75 | 
+76 | # airflow.providers.hashicorp.secrets.vault
 
 AIR301 [*] `get_connections` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:74:13
@@ -500,16 +456,14 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0
 76 | # airflow.providers.hashicorp.secrets.vault
    |
 help: Use `get_connection` instead
-
-ℹ Safe fix
-71 71 | # airflow.providers.google.cloud.secrets.secret_manager
-72 72 | csm_backend = CloudSecretManagerBackend()
-73 73 | csm_backend.get_conn_uri()
-74    |-csm_backend.get_connections()
-   74 |+csm_backend.get_connection()
-75 75 | 
-76 76 | # airflow.providers.hashicorp.secrets.vault
-77 77 | vault_backend = VaultBackend()
+71 | # airflow.providers.google.cloud.secrets.secret_manager
+72 | csm_backend = CloudSecretManagerBackend()
+73 | csm_backend.get_conn_uri()
+   - csm_backend.get_connections()
+74 + csm_backend.get_connection()
+75 | 
+76 | # airflow.providers.hashicorp.secrets.vault
+77 | vault_backend = VaultBackend()
 
 AIR301 [*] `get_conn_uri` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:78:15
@@ -521,16 +475,14 @@ AIR301 [*] `get_conn_uri` is removed in Airflow 3.0
 79 | vault_backend.get_connections()
    |
 help: Use `get_conn_value` instead
-
-ℹ Safe fix
-75 75 | 
-76 76 | # airflow.providers.hashicorp.secrets.vault
-77 77 | vault_backend = VaultBackend()
-78    |-vault_backend.get_conn_uri()
-   78 |+vault_backend.get_conn_value()
-79 79 | vault_backend.get_connections()
-80 80 | 
-81 81 | not_an_error = NotAir302SecretError()
+75 | 
+76 | # airflow.providers.hashicorp.secrets.vault
+77 | vault_backend = VaultBackend()
+   - vault_backend.get_conn_uri()
+78 + vault_backend.get_conn_value()
+79 | vault_backend.get_connections()
+80 | 
+81 | not_an_error = NotAir302SecretError()
 
 AIR301 [*] `get_connections` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:79:15
@@ -543,16 +495,14 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0
 81 | not_an_error = NotAir302SecretError()
    |
 help: Use `get_connection` instead
-
-ℹ Safe fix
-76 76 | # airflow.providers.hashicorp.secrets.vault
-77 77 | vault_backend = VaultBackend()
-78 78 | vault_backend.get_conn_uri()
-79    |-vault_backend.get_connections()
-   79 |+vault_backend.get_connection()
-80 80 | 
-81 81 | not_an_error = NotAir302SecretError()
-82 82 | not_an_error.get_conn_uri()
+76 | # airflow.providers.hashicorp.secrets.vault
+77 | vault_backend = VaultBackend()
+78 | vault_backend.get_conn_uri()
+   - vault_backend.get_connections()
+79 + vault_backend.get_connection()
+80 | 
+81 | not_an_error = NotAir302SecretError()
+82 | not_an_error.get_conn_uri()
 
 AIR301 [*] `initialize_providers_dataset_uri_resources` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:86:4
@@ -565,16 +515,14 @@ AIR301 [*] `initialize_providers_dataset_uri_resources` is removed in Airflow 3.
 88 | pm.dataset_uri_handlers
    |
 help: Use `initialize_providers_asset_uri_resources` instead
-
-ℹ Safe fix
-83 83 | 
-84 84 | # airflow.providers_manager
-85 85 | pm = ProvidersManager()
-86    |-pm.initialize_providers_dataset_uri_resources()
-   86 |+pm.initialize_providers_asset_uri_resources()
-87 87 | pm.dataset_factories
-88 88 | pm.dataset_uri_handlers
-89 89 | pm.dataset_to_openlineage_converters
+83 | 
+84 | # airflow.providers_manager
+85 | pm = ProvidersManager()
+   - pm.initialize_providers_dataset_uri_resources()
+86 + pm.initialize_providers_asset_uri_resources()
+87 | pm.dataset_factories
+88 | pm.dataset_uri_handlers
+89 | pm.dataset_to_openlineage_converters
 
 AIR301 [*] `dataset_factories` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:87:4
@@ -587,16 +535,14 @@ AIR301 [*] `dataset_factories` is removed in Airflow 3.0
 89 | pm.dataset_to_openlineage_converters
    |
 help: Use `asset_factories` instead
-
-ℹ Safe fix
-84 84 | # airflow.providers_manager
-85 85 | pm = ProvidersManager()
-86 86 | pm.initialize_providers_dataset_uri_resources()
-87    |-pm.dataset_factories
-   87 |+pm.asset_factories
-88 88 | pm.dataset_uri_handlers
-89 89 | pm.dataset_to_openlineage_converters
-90 90 | 
+84 | # airflow.providers_manager
+85 | pm = ProvidersManager()
+86 | pm.initialize_providers_dataset_uri_resources()
+   - pm.dataset_factories
+87 + pm.asset_factories
+88 | pm.dataset_uri_handlers
+89 | pm.dataset_to_openlineage_converters
+90 | 
 
 AIR301 [*] `dataset_uri_handlers` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:88:4
@@ -608,16 +554,14 @@ AIR301 [*] `dataset_uri_handlers` is removed in Airflow 3.0
 89 | pm.dataset_to_openlineage_converters
    |
 help: Use `asset_uri_handlers` instead
-
-ℹ Safe fix
-85 85 | pm = ProvidersManager()
-86 86 | pm.initialize_providers_dataset_uri_resources()
-87 87 | pm.dataset_factories
-88    |-pm.dataset_uri_handlers
-   88 |+pm.asset_uri_handlers
-89 89 | pm.dataset_to_openlineage_converters
-90 90 | 
-91 91 | # airflow.secrets.base_secrets
+85 | pm = ProvidersManager()
+86 | pm.initialize_providers_dataset_uri_resources()
+87 | pm.dataset_factories
+   - pm.dataset_uri_handlers
+88 + pm.asset_uri_handlers
+89 | pm.dataset_to_openlineage_converters
+90 | 
+91 | # airflow.secrets.base_secrets
 
 AIR301 [*] `dataset_to_openlineage_converters` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:89:4
@@ -630,16 +574,14 @@ AIR301 [*] `dataset_to_openlineage_converters` is removed in Airflow 3.0
 91 | # airflow.secrets.base_secrets
    |
 help: Use `asset_to_openlineage_converters` instead
-
-ℹ Safe fix
-86 86 | pm.initialize_providers_dataset_uri_resources()
-87 87 | pm.dataset_factories
-88 88 | pm.dataset_uri_handlers
-89    |-pm.dataset_to_openlineage_converters
-   89 |+pm.asset_to_openlineage_converters
-90 90 | 
-91 91 | # airflow.secrets.base_secrets
-92 92 | base_secret_backend = BaseSecretsBackend()
+86 | pm.initialize_providers_dataset_uri_resources()
+87 | pm.dataset_factories
+88 | pm.dataset_uri_handlers
+   - pm.dataset_to_openlineage_converters
+89 + pm.asset_to_openlineage_converters
+90 | 
+91 | # airflow.secrets.base_secrets
+92 | base_secret_backend = BaseSecretsBackend()
 
 AIR301 [*] `get_conn_uri` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:93:21
@@ -651,16 +593,14 @@ AIR301 [*] `get_conn_uri` is removed in Airflow 3.0
 94 | base_secret_backend.get_connections()
    |
 help: Use `get_conn_value` instead
-
-ℹ Safe fix
-90 90 | 
-91 91 | # airflow.secrets.base_secrets
-92 92 | base_secret_backend = BaseSecretsBackend()
-93    |-base_secret_backend.get_conn_uri()
-   93 |+base_secret_backend.get_conn_value()
-94 94 | base_secret_backend.get_connections()
-95 95 | 
-96 96 | # airflow.secrets.local_filesystem
+90 | 
+91 | # airflow.secrets.base_secrets
+92 | base_secret_backend = BaseSecretsBackend()
+   - base_secret_backend.get_conn_uri()
+93 + base_secret_backend.get_conn_value()
+94 | base_secret_backend.get_connections()
+95 | 
+96 | # airflow.secrets.local_filesystem
 
 AIR301 [*] `get_connections` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:94:21
@@ -673,16 +613,14 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0
 96 | # airflow.secrets.local_filesystem
    |
 help: Use `get_connection` instead
-
-ℹ Safe fix
-91 91 | # airflow.secrets.base_secrets
-92 92 | base_secret_backend = BaseSecretsBackend()
-93 93 | base_secret_backend.get_conn_uri()
-94    |-base_secret_backend.get_connections()
-   94 |+base_secret_backend.get_connection()
-95 95 | 
-96 96 | # airflow.secrets.local_filesystem
-97 97 | lfb = LocalFilesystemBackend()
+91 | # airflow.secrets.base_secrets
+92 | base_secret_backend = BaseSecretsBackend()
+93 | base_secret_backend.get_conn_uri()
+   - base_secret_backend.get_connections()
+94 + base_secret_backend.get_connection()
+95 | 
+96 | # airflow.secrets.local_filesystem
+97 | lfb = LocalFilesystemBackend()
 
 AIR301 [*] `get_connections` is removed in Airflow 3.0
   --> AIR301_class_attribute.py:98:5
@@ -693,10 +631,8 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0
    |     ^^^^^^^^^^^^^^^
    |
 help: Use `get_connection` instead
-
-ℹ Safe fix
-95 95 | 
-96 96 | # airflow.secrets.local_filesystem
-97 97 | lfb = LocalFilesystemBackend()
-98    |-lfb.get_connections()
-   98 |+lfb.get_connection()
+95 | 
+96 | # airflow.secrets.local_filesystem
+97 | lfb = LocalFilesystemBackend()
+   - lfb.get_connections()
+98 + lfb.get_connection()
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap
index b72ae18913..a6ff6da66e 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap
@@ -337,16 +337,14 @@ AIR301 [*] `schedule_interval` is removed in Airflow 3.0
 113 |     template_searchpath=["/templates"],
     |
 help: Use `schedule` instead
-
-ℹ Safe fix
-108 108 | 
-109 109 | with DAG(
-110 110 |     dag_id="example_dag",
-111     |-    schedule_interval="@daily",
-    111 |+    schedule="@daily",
-112 112 |     start_date=datetime(2023, 1, 1),
-113 113 |     template_searchpath=["/templates"],
-114 114 | ) as dag:
+108 | 
+109 | with DAG(
+110 |     dag_id="example_dag",
+    -     schedule_interval="@daily",
+111 +     schedule="@daily",
+112 |     start_date=datetime(2023, 1, 1),
+113 |     template_searchpath=["/templates"],
+114 | ) as dag:
 
 AIR301 `next_ds` is removed in Airflow 3.0
    --> AIR301_context.py:135:23
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap
index a5b36b1d7d..38603d1067 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap
@@ -2,351 +2,373 @@
 source: crates/ruff_linter/src/rules/airflow/mod.rs
 ---
 AIR301 `airflow.PY36` is removed in Airflow 3.0
-  --> AIR301_names.py:39:1
+  --> AIR301_names.py:40:1
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    | ^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.PY37` is removed in Airflow 3.0
-  --> AIR301_names.py:39:7
+  --> AIR301_names.py:40:7
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    |       ^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.PY38` is removed in Airflow 3.0
-  --> AIR301_names.py:39:13
+  --> AIR301_names.py:40:13
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    |             ^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.PY39` is removed in Airflow 3.0
-  --> AIR301_names.py:39:19
+  --> AIR301_names.py:40:19
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    |                   ^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.PY310` is removed in Airflow 3.0
-  --> AIR301_names.py:39:25
+  --> AIR301_names.py:40:25
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    |                         ^^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.PY311` is removed in Airflow 3.0
-  --> AIR301_names.py:39:32
+  --> AIR301_names.py:40:32
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    |                                ^^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.PY312` is removed in Airflow 3.0
-  --> AIR301_names.py:39:39
+  --> AIR301_names.py:40:39
    |
-38 | # airflow root
-39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
    |                                       ^^^^^
-40 |
-41 | # airflow.api_connexion.security
+41 |
+42 | # airflow.api_connexion.security
    |
 help: Use `sys.version_info` instead
 
 AIR301 `airflow.api_connexion.security.requires_access` is removed in Airflow 3.0
-  --> AIR301_names.py:42:1
+  --> AIR301_names.py:43:1
    |
-41 | # airflow.api_connexion.security
-42 | requires_access
+42 | # airflow.api_connexion.security
+43 | requires_access
    | ^^^^^^^^^^^^^^^
-43 |
-44 | # airflow.contrib.*
+44 |
+45 | # airflow.contrib.*
    |
 help: Use `airflow.api_fastapi.core_api.security.requires_access_*` instead
 
 AIR301 `airflow.contrib.aws_athena_hook.AWSAthenaHook` is removed in Airflow 3.0
-  --> AIR301_names.py:45:1
+  --> AIR301_names.py:46:1
    |
-44 | # airflow.contrib.*
-45 | AWSAthenaHook()
+45 | # airflow.contrib.*
+46 | AWSAthenaHook()
    | ^^^^^^^^^^^^^
    |
 help: The whole `airflow.contrib` module has been removed.
 
 AIR301 `airflow.datasets.DatasetAliasEvent` is removed in Airflow 3.0
-  --> AIR301_names.py:49:1
+  --> AIR301_names.py:50:1
    |
-48 | # airflow.datasets
-49 | DatasetAliasEvent()
+49 | # airflow.datasets
+50 | DatasetAliasEvent()
    | ^^^^^^^^^^^^^^^^^
+51 | DatasetEvent()
    |
 
-AIR301 `airflow.operators.subdag.SubDagOperator` is removed in Airflow 3.0
-  --> AIR301_names.py:53:1
+AIR301 `airflow.datasets.DatasetEvent` is removed in Airflow 3.0
+  --> AIR301_names.py:51:1
    |
-52 | # airflow.operators.subdag.*
-53 | SubDagOperator()
+49 | # airflow.datasets
+50 | DatasetAliasEvent()
+51 | DatasetEvent()
+   | ^^^^^^^^^^^^
+   |
+help: `DatasetEvent` has been made private in Airflow 3. Use `dict[str, Any]` for the time being. An `AssetEvent` type will be added to the apache-airflow-task-sdk in a future version.
+
+AIR301 `airflow.operators.subdag.SubDagOperator` is removed in Airflow 3.0
+  --> AIR301_names.py:55:1
+   |
+54 | # airflow.operators.subdag.*
+55 | SubDagOperator()
    | ^^^^^^^^^^^^^^
+56 |
+57 | # airflow.operators.postgres_operator
    |
 help: The whole `airflow.subdag` module has been removed.
 
-AIR301 [*] `airflow.secrets.cache.SecretCache` is removed in Airflow 3.0
-  --> AIR301_names.py:61:1
+AIR301 `airflow.operators.postgres_operator.Mapping` is removed in Airflow 3.0
+  --> AIR301_names.py:58:1
    |
-60 | # airflow.secrets.cache
-61 | SecretCache()
+57 | # airflow.operators.postgres_operator
+58 | Mapping()
+   | ^^^^^^^
+59 |
+60 | # airflow.secrets
+   |
+
+AIR301 [*] `airflow.secrets.cache.SecretCache` is removed in Airflow 3.0
+  --> AIR301_names.py:65:1
+   |
+64 | # airflow.secrets.cache
+65 | SecretCache()
    | ^^^^^^^^^^^
    |
 help: Use `SecretCache` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-13 13 | from airflow.contrib.aws_athena_hook import AWSAthenaHook
-14 14 | from airflow.datasets import DatasetAliasEvent
-15 15 | from airflow.operators.subdag import SubDagOperator
-16    |-from airflow.secrets.cache import SecretCache
-17 16 | from airflow.secrets.local_filesystem import LocalFilesystemBackend
-18 17 | from airflow.triggers.external_task import TaskStateTrigger
-19 18 | from airflow.utils import dates
+14 | from airflow.datasets import DatasetAliasEvent, DatasetEvent
+15 | from airflow.operators.postgres_operator import Mapping
+16 | from airflow.operators.subdag import SubDagOperator
+   - from airflow.secrets.cache import SecretCache
+17 | from airflow.secrets.local_filesystem import LocalFilesystemBackend
+18 | from airflow.triggers.external_task import TaskStateTrigger
+19 | from airflow.utils import dates
 --------------------------------------------------------------------------------
-34 33 | from airflow.utils.trigger_rule import TriggerRule
-35 34 | from airflow.www.auth import has_access, has_access_dataset
-36 35 | from airflow.www.utils import get_sensitive_variables_fields, should_hide_value_for_key
-   36 |+from airflow.sdk import SecretCache
-37 37 | 
-38 38 | # airflow root
-39 39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+34 | from airflow.utils.trigger_rule import TriggerRule
+35 | from airflow.www.auth import has_access, has_access_dataset
+36 | from airflow.www.utils import get_sensitive_variables_fields, should_hide_value_for_key
+37 + from airflow.sdk import SecretCache
+38 | 
+39 | # airflow root
+40 | PY36, PY37, PY38, PY39, PY310, PY311, PY312
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 `airflow.triggers.external_task.TaskStateTrigger` is removed in Airflow 3.0
-  --> AIR301_names.py:65:1
+  --> AIR301_names.py:69:1
    |
-64 | # airflow.triggers.external_task
-65 | TaskStateTrigger()
+68 | # airflow.triggers.external_task
+69 | TaskStateTrigger()
    | ^^^^^^^^^^^^^^^^
-66 |
-67 | # airflow.utils.date
+70 |
+71 | # airflow.utils.date
    |
 
 AIR301 `airflow.utils.dates.date_range` is removed in Airflow 3.0
-  --> AIR301_names.py:68:1
+  --> AIR301_names.py:72:1
    |
-67 | # airflow.utils.date
-68 | dates.date_range
+71 | # airflow.utils.date
+72 | dates.date_range
    | ^^^^^^^^^^^^^^^^
-69 | dates.days_ago
+73 | dates.days_ago
    |
 
 AIR301 `airflow.utils.dates.days_ago` is removed in Airflow 3.0
-  --> AIR301_names.py:69:1
+  --> AIR301_names.py:73:1
    |
-67 | # airflow.utils.date
-68 | dates.date_range
-69 | dates.days_ago
+71 | # airflow.utils.date
+72 | dates.date_range
+73 | dates.days_ago
    | ^^^^^^^^^^^^^^
-70 |
-71 | date_range
+74 |
+75 | date_range
    |
 help: Use `pendulum.today('UTC').add(days=-N, ...)` instead
 
 AIR301 `airflow.utils.dates.date_range` is removed in Airflow 3.0
-  --> AIR301_names.py:71:1
+  --> AIR301_names.py:75:1
    |
-69 | dates.days_ago
-70 |
-71 | date_range
+73 | dates.days_ago
+74 |
+75 | date_range
    | ^^^^^^^^^^
-72 | days_ago
-73 | infer_time_unit
+76 | days_ago
+77 | infer_time_unit
    |
 
 AIR301 `airflow.utils.dates.days_ago` is removed in Airflow 3.0
-  --> AIR301_names.py:72:1
+  --> AIR301_names.py:76:1
    |
-71 | date_range
-72 | days_ago
+75 | date_range
+76 | days_ago
    | ^^^^^^^^
-73 | infer_time_unit
-74 | parse_execution_date
+77 | infer_time_unit
+78 | parse_execution_date
    |
 help: Use `pendulum.today('UTC').add(days=-N, ...)` instead
 
 AIR301 `airflow.utils.dates.infer_time_unit` is removed in Airflow 3.0
-  --> AIR301_names.py:73:1
+  --> AIR301_names.py:77:1
    |
-71 | date_range
-72 | days_ago
-73 | infer_time_unit
+75 | date_range
+76 | days_ago
+77 | infer_time_unit
    | ^^^^^^^^^^^^^^^
-74 | parse_execution_date
-75 | round_time
+78 | parse_execution_date
+79 | round_time
    |
 
 AIR301 `airflow.utils.dates.parse_execution_date` is removed in Airflow 3.0
-  --> AIR301_names.py:74:1
+  --> AIR301_names.py:78:1
    |
-72 | days_ago
-73 | infer_time_unit
-74 | parse_execution_date
+76 | days_ago
+77 | infer_time_unit
+78 | parse_execution_date
    | ^^^^^^^^^^^^^^^^^^^^
-75 | round_time
-76 | scale_time_units
+79 | round_time
+80 | scale_time_units
    |
 
 AIR301 `airflow.utils.dates.round_time` is removed in Airflow 3.0
-  --> AIR301_names.py:75:1
+  --> AIR301_names.py:79:1
    |
-73 | infer_time_unit
-74 | parse_execution_date
-75 | round_time
+77 | infer_time_unit
+78 | parse_execution_date
+79 | round_time
    | ^^^^^^^^^^
-76 | scale_time_units
+80 | scale_time_units
    |
 
 AIR301 `airflow.utils.dates.scale_time_units` is removed in Airflow 3.0
-  --> AIR301_names.py:76:1
+  --> AIR301_names.py:80:1
    |
-74 | parse_execution_date
-75 | round_time
-76 | scale_time_units
+78 | parse_execution_date
+79 | round_time
+80 | scale_time_units
    | ^^^^^^^^^^^^^^^^
-77 |
-78 | # This one was not deprecated.
+81 |
+82 | # This one was not deprecated.
    |
 
 AIR301 `airflow.utils.dag_cycle_tester.test_cycle` is removed in Airflow 3.0
-  --> AIR301_names.py:83:1
+  --> AIR301_names.py:87:1
    |
-82 | # airflow.utils.dag_cycle_tester
-83 | test_cycle
+86 | # airflow.utils.dag_cycle_tester
+87 | test_cycle
    | ^^^^^^^^^^
    |
 
 AIR301 `airflow.utils.db.create_session` is removed in Airflow 3.0
-  --> AIR301_names.py:87:1
+  --> AIR301_names.py:91:1
    |
-86 | # airflow.utils.db
-87 | create_session
+90 | # airflow.utils.db
+91 | create_session
    | ^^^^^^^^^^^^^^
-88 |
-89 | # airflow.utils.decorators
+92 |
+93 | # airflow.utils.decorators
    |
 
 AIR301 `airflow.utils.decorators.apply_defaults` is removed in Airflow 3.0
-  --> AIR301_names.py:90:1
+  --> AIR301_names.py:94:1
    |
-89 | # airflow.utils.decorators
-90 | apply_defaults
+93 | # airflow.utils.decorators
+94 | apply_defaults
    | ^^^^^^^^^^^^^^
-91 |
-92 | # airflow.utils.file
+95 |
+96 | # airflow.utils.file
    |
 help: `apply_defaults` is now unconditionally done and can be safely removed.
 
 AIR301 `airflow.utils.file.mkdirs` is removed in Airflow 3.0
-  --> AIR301_names.py:93:1
+  --> AIR301_names.py:97:1
    |
-92 | # airflow.utils.file
-93 | mkdirs
+96 | # airflow.utils.file
+97 | mkdirs
    | ^^^^^^
    |
 help: Use `pathlib.Path({path}).mkdir` instead
 
 AIR301 `airflow.utils.state.SHUTDOWN` is removed in Airflow 3.0
-  --> AIR301_names.py:97:1
-   |
-96 | # airflow.utils.state
-97 | SHUTDOWN
-   | ^^^^^^^^
-98 | terminating_states
-   |
+   --> AIR301_names.py:101:1
+    |
+100 | # airflow.utils.state
+101 | SHUTDOWN
+    | ^^^^^^^^
+102 | terminating_states
+    |
 
 AIR301 `airflow.utils.state.terminating_states` is removed in Airflow 3.0
-   --> AIR301_names.py:98:1
+   --> AIR301_names.py:102:1
     |
- 96 | # airflow.utils.state
- 97 | SHUTDOWN
- 98 | terminating_states
+100 | # airflow.utils.state
+101 | SHUTDOWN
+102 | terminating_states
     | ^^^^^^^^^^^^^^^^^^
- 99 |
-100 | #  airflow.utils.trigger_rule
+103 |
+104 | #  airflow.utils.trigger_rule
     |
 
 AIR301 `airflow.utils.trigger_rule.TriggerRule.DUMMY` is removed in Airflow 3.0
-   --> AIR301_names.py:101:1
+   --> AIR301_names.py:105:1
     |
-100 | #  airflow.utils.trigger_rule
-101 | TriggerRule.DUMMY
+104 | #  airflow.utils.trigger_rule
+105 | TriggerRule.DUMMY
     | ^^^^^^^^^^^^^^^^^
-102 | TriggerRule.NONE_FAILED_OR_SKIPPED
+106 | TriggerRule.NONE_FAILED_OR_SKIPPED
     |
 
 AIR301 `airflow.utils.trigger_rule.TriggerRule.NONE_FAILED_OR_SKIPPED` is removed in Airflow 3.0
-   --> AIR301_names.py:102:1
+   --> AIR301_names.py:106:1
     |
-100 | #  airflow.utils.trigger_rule
-101 | TriggerRule.DUMMY
-102 | TriggerRule.NONE_FAILED_OR_SKIPPED
+104 | #  airflow.utils.trigger_rule
+105 | TriggerRule.DUMMY
+106 | TriggerRule.NONE_FAILED_OR_SKIPPED
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 
 AIR301 `airflow.www.auth.has_access` is removed in Airflow 3.0
-   --> AIR301_names.py:106:1
+   --> AIR301_names.py:110:1
     |
-105 | # airflow.www.auth
-106 | has_access
+109 | # airflow.www.auth
+110 | has_access
     | ^^^^^^^^^^
-107 | has_access_dataset
+111 | has_access_dataset
     |
 
 AIR301 `airflow.www.auth.has_access_dataset` is removed in Airflow 3.0
-   --> AIR301_names.py:107:1
+   --> AIR301_names.py:111:1
     |
-105 | # airflow.www.auth
-106 | has_access
-107 | has_access_dataset
+109 | # airflow.www.auth
+110 | has_access
+111 | has_access_dataset
     | ^^^^^^^^^^^^^^^^^^
-108 |
-109 | # airflow.www.utils
+112 |
+113 | # airflow.www.utils
     |
 
 AIR301 `airflow.www.utils.get_sensitive_variables_fields` is removed in Airflow 3.0
-   --> AIR301_names.py:110:1
+   --> AIR301_names.py:114:1
     |
-109 | # airflow.www.utils
-110 | get_sensitive_variables_fields
+113 | # airflow.www.utils
+114 | get_sensitive_variables_fields
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-111 | should_hide_value_for_key
+115 | should_hide_value_for_key
     |
 
 AIR301 `airflow.www.utils.should_hide_value_for_key` is removed in Airflow 3.0
-   --> AIR301_names.py:111:1
+   --> AIR301_names.py:115:1
     |
-109 | # airflow.www.utils
-110 | get_sensitive_variables_fields
-111 | should_hide_value_for_key
+113 | # airflow.www.utils
+114 | get_sensitive_variables_fields
+115 | should_hide_value_for_key
     | ^^^^^^^^^^^^^^^^^^^^^^^^^
     |
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap
index 09537f148b..d1a368b70d 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap
@@ -12,18 +12,16 @@ AIR301 [*] `airflow.api_connexion.security.requires_access_dataset` is removed i
 19 | DatasetDetails()
    |
 help: Use `requires_access_asset` from `airflow.api_fastapi.core_api.security` instead.
-
-ℹ Safe fix
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-   16 |+from airflow.api_fastapi.core_api.security import requires_access_asset
-16 17 | 
-17    |-requires_access_dataset()
-   18 |+requires_access_asset()
-18 19 | 
-19 20 | DatasetDetails()
-20 21 | 
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 + from airflow.api_fastapi.core_api.security import requires_access_asset
+17 | 
+   - requires_access_dataset()
+18 + requires_access_asset()
+19 | 
+20 | DatasetDetails()
+21 | 
 
 AIR301 [*] `airflow.auth.managers.models.resource_details.DatasetDetails` is removed in Airflow 3.0
   --> AIR301_names_fix.py:19:1
@@ -36,20 +34,18 @@ AIR301 [*] `airflow.auth.managers.models.resource_details.DatasetDetails` is rem
 21 | DatasetManager()
    |
 help: Use `AssetDetails` from `airflow.api_fastapi.auth.managers.models.resource_details` instead.
-
-ℹ Safe fix
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-   16 |+from airflow.api_fastapi.auth.managers.models.resource_details import AssetDetails
-16 17 | 
-17 18 | requires_access_dataset()
-18 19 | 
-19    |-DatasetDetails()
-   20 |+AssetDetails()
-20 21 | 
-21 22 | DatasetManager()
-22 23 | dataset_manager()
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 + from airflow.api_fastapi.auth.managers.models.resource_details import AssetDetails
+17 | 
+18 | requires_access_dataset()
+19 | 
+   - DatasetDetails()
+20 + AssetDetails()
+21 | 
+22 | DatasetManager()
+23 | dataset_manager()
 
 AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0
   --> AIR301_names_fix.py:21:1
@@ -62,22 +58,20 @@ AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0
 23 | resolve_dataset_manager()
    |
 help: Use `AssetManager` from `airflow.assets.manager` instead.
-
-ℹ Safe fix
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-   16 |+from airflow.assets.manager import AssetManager
-16 17 | 
-17 18 | requires_access_dataset()
-18 19 | 
-19 20 | DatasetDetails()
-20 21 | 
-21    |-DatasetManager()
-   22 |+AssetManager()
-22 23 | dataset_manager()
-23 24 | resolve_dataset_manager()
-24 25 | 
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 + from airflow.assets.manager import AssetManager
+17 | 
+18 | requires_access_dataset()
+19 | 
+20 | DatasetDetails()
+21 | 
+   - DatasetManager()
+22 + AssetManager()
+23 | dataset_manager()
+24 | resolve_dataset_manager()
+25 | 
 
 AIR301 [*] `airflow.datasets.manager.dataset_manager` is removed in Airflow 3.0
   --> AIR301_names_fix.py:22:1
@@ -88,23 +82,21 @@ AIR301 [*] `airflow.datasets.manager.dataset_manager` is removed in Airflow 3.0
 23 | resolve_dataset_manager()
    |
 help: Use `asset_manager` from `airflow.assets.manager` instead.
-
-ℹ Safe fix
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-   16 |+from airflow.assets.manager import asset_manager
-16 17 | 
-17 18 | requires_access_dataset()
-18 19 | 
-19 20 | DatasetDetails()
-20 21 | 
-21 22 | DatasetManager()
-22    |-dataset_manager()
-   23 |+asset_manager()
-23 24 | resolve_dataset_manager()
-24 25 | 
-25 26 | DatasetLineageInfo()
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 + from airflow.assets.manager import asset_manager
+17 | 
+18 | requires_access_dataset()
+19 | 
+20 | DatasetDetails()
+21 | 
+22 | DatasetManager()
+   - dataset_manager()
+23 + asset_manager()
+24 | resolve_dataset_manager()
+25 | 
+26 | DatasetLineageInfo()
 
 AIR301 [*] `airflow.datasets.manager.resolve_dataset_manager` is removed in Airflow 3.0
   --> AIR301_names_fix.py:23:1
@@ -117,24 +109,22 @@ AIR301 [*] `airflow.datasets.manager.resolve_dataset_manager` is removed in Airf
 25 | DatasetLineageInfo()
    |
 help: Use `resolve_asset_manager` from `airflow.assets.manager` instead.
-
-ℹ Safe fix
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-   16 |+from airflow.assets.manager import resolve_asset_manager
-16 17 | 
-17 18 | requires_access_dataset()
-18 19 | 
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 + from airflow.assets.manager import resolve_asset_manager
+17 | 
+18 | requires_access_dataset()
+19 | 
 --------------------------------------------------------------------------------
-20 21 | 
-21 22 | DatasetManager()
-22 23 | dataset_manager()
-23    |-resolve_dataset_manager()
-   24 |+resolve_asset_manager()
-24 25 | 
-25 26 | DatasetLineageInfo()
-26 27 | 
+21 | 
+22 | DatasetManager()
+23 | dataset_manager()
+   - resolve_dataset_manager()
+24 + resolve_asset_manager()
+25 | 
+26 | DatasetLineageInfo()
+27 | 
 
 AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0
   --> AIR301_names_fix.py:25:1
@@ -147,25 +137,23 @@ AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0
 27 | AllowListValidator()
    |
 help: Use `AssetLineageInfo` from `airflow.lineage.hook` instead.
-
-ℹ Safe fix
-9  9  |     dataset_manager,
-10 10 |     resolve_dataset_manager,
-11 11 | )
-12    |-from airflow.lineage.hook import DatasetLineageInfo
-   12 |+from airflow.lineage.hook import DatasetLineageInfo, AssetLineageInfo
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
+9  |     dataset_manager,
+10 |     resolve_dataset_manager,
+11 | )
+   - from airflow.lineage.hook import DatasetLineageInfo
+12 + from airflow.lineage.hook import DatasetLineageInfo, AssetLineageInfo
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
 --------------------------------------------------------------------------------
-22 22 | dataset_manager()
-23 23 | resolve_dataset_manager()
-24 24 | 
-25    |-DatasetLineageInfo()
-   25 |+AssetLineageInfo()
-26 26 | 
-27 27 | AllowListValidator()
-28 28 | BlockListValidator()
+22 | dataset_manager()
+23 | resolve_dataset_manager()
+24 | 
+   - DatasetLineageInfo()
+25 + AssetLineageInfo()
+26 | 
+27 | AllowListValidator()
+28 | BlockListValidator()
 
 AIR301 [*] `airflow.metrics.validators.AllowListValidator` is removed in Airflow 3.0
   --> AIR301_names_fix.py:27:1
@@ -177,25 +165,23 @@ AIR301 [*] `airflow.metrics.validators.AllowListValidator` is removed in Airflow
 28 | BlockListValidator()
    |
 help: Use `PatternAllowListValidator` from `airflow.metrics.validators` instead.
-
-ℹ Safe fix
-10 10 |     resolve_dataset_manager,
-11 11 | )
-12 12 | from airflow.lineage.hook import DatasetLineageInfo
-13    |-from airflow.metrics.validators import AllowListValidator, BlockListValidator
-   13 |+from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternAllowListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-16 16 | 
+10 |     resolve_dataset_manager,
+11 | )
+12 | from airflow.lineage.hook import DatasetLineageInfo
+   - from airflow.metrics.validators import AllowListValidator, BlockListValidator
+13 + from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternAllowListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 | 
 --------------------------------------------------------------------------------
-24 24 | 
-25 25 | DatasetLineageInfo()
-26 26 | 
-27    |-AllowListValidator()
-   27 |+PatternAllowListValidator()
-28 28 | BlockListValidator()
-29 29 | 
-30 30 | load_connections()
+24 | 
+25 | DatasetLineageInfo()
+26 | 
+   - AllowListValidator()
+27 + PatternAllowListValidator()
+28 | BlockListValidator()
+29 | 
+30 | load_connections()
 
 AIR301 [*] `airflow.metrics.validators.BlockListValidator` is removed in Airflow 3.0
   --> AIR301_names_fix.py:28:1
@@ -207,25 +193,23 @@ AIR301 [*] `airflow.metrics.validators.BlockListValidator` is removed in Airflow
 30 | load_connections()
    |
 help: Use `PatternBlockListValidator` from `airflow.metrics.validators` instead.
-
-ℹ Safe fix
-10 10 |     resolve_dataset_manager,
-11 11 | )
-12 12 | from airflow.lineage.hook import DatasetLineageInfo
-13    |-from airflow.metrics.validators import AllowListValidator, BlockListValidator
-   13 |+from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternBlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-16 16 | 
+10 |     resolve_dataset_manager,
+11 | )
+12 | from airflow.lineage.hook import DatasetLineageInfo
+   - from airflow.metrics.validators import AllowListValidator, BlockListValidator
+13 + from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternBlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 | 
 --------------------------------------------------------------------------------
-25 25 | DatasetLineageInfo()
-26 26 | 
-27 27 | AllowListValidator()
-28    |-BlockListValidator()
-   28 |+PatternBlockListValidator()
-29 29 | 
-30 30 | load_connections()
-31 31 | 
+25 | DatasetLineageInfo()
+26 | 
+27 | AllowListValidator()
+   - BlockListValidator()
+28 + PatternBlockListValidator()
+29 | 
+30 | load_connections()
+31 | 
 
 AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Airflow 3.0
   --> AIR301_names_fix.py:30:1
@@ -238,25 +222,23 @@ AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Air
 32 | RESOURCE_DATASET
    |
 help: Use `load_connections_dict` from `airflow.secrets.local_filesystem` instead.
-
-ℹ Safe fix
-11 11 | )
-12 12 | from airflow.lineage.hook import DatasetLineageInfo
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14    |-from airflow.secrets.local_filesystem import load_connections
-   14 |+from airflow.secrets.local_filesystem import load_connections, load_connections_dict
-15 15 | from airflow.security.permissions import RESOURCE_DATASET
-16 16 | 
-17 17 | requires_access_dataset()
+11 | )
+12 | from airflow.lineage.hook import DatasetLineageInfo
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+   - from airflow.secrets.local_filesystem import load_connections
+14 + from airflow.secrets.local_filesystem import load_connections, load_connections_dict
+15 | from airflow.security.permissions import RESOURCE_DATASET
+16 | 
+17 | requires_access_dataset()
 --------------------------------------------------------------------------------
-27 27 | AllowListValidator()
-28 28 | BlockListValidator()
-29 29 | 
-30    |-load_connections()
-   30 |+load_connections_dict()
-31 31 | 
-32 32 | RESOURCE_DATASET
-33 33 | 
+27 | AllowListValidator()
+28 | BlockListValidator()
+29 | 
+   - load_connections()
+30 + load_connections_dict()
+31 | 
+32 | RESOURCE_DATASET
+33 | 
 
 AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow 3.0
   --> AIR301_names_fix.py:32:1
@@ -267,25 +249,23 @@ AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow
    | ^^^^^^^^^^^^^^^^
    |
 help: Use `RESOURCE_ASSET` from `airflow.security.permissions` instead.
-
-ℹ Safe fix
-12 12 | from airflow.lineage.hook import DatasetLineageInfo
-13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
-14 14 | from airflow.secrets.local_filesystem import load_connections
-15    |-from airflow.security.permissions import RESOURCE_DATASET
-   15 |+from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET
-16 16 | 
-17 17 | requires_access_dataset()
-18 18 | 
+12 | from airflow.lineage.hook import DatasetLineageInfo
+13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator
+14 | from airflow.secrets.local_filesystem import load_connections
+   - from airflow.security.permissions import RESOURCE_DATASET
+15 + from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET
+16 | 
+17 | requires_access_dataset()
+18 | 
 --------------------------------------------------------------------------------
-29 29 | 
-30 30 | load_connections()
-31 31 | 
-32    |-RESOURCE_DATASET
-   32 |+RESOURCE_ASSET
-33 33 | 
-34 34 | 
-35 35 | from airflow.listeners.spec.dataset import (
+29 | 
+30 | load_connections()
+31 | 
+   - RESOURCE_DATASET
+32 + RESOURCE_ASSET
+33 | 
+34 | 
+35 | from airflow.listeners.spec.dataset import (
 
 AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_created` is removed in Airflow 3.0
   --> AIR301_names_fix.py:40:1
@@ -297,18 +277,16 @@ AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_created` is removed in Air
 41 | on_dataset_changed()
    |
 help: Use `on_asset_created` from `airflow.listeners.spec.asset` instead.
-
-ℹ Safe fix
-36 36 |     on_dataset_changed,
-37 37 |     on_dataset_created,
-38 38 | )
-   39 |+from airflow.listeners.spec.asset import on_asset_created
-39 40 | 
-40    |-on_dataset_created()
-   41 |+on_asset_created()
-41 42 | on_dataset_changed()
-42 43 | 
-43 44 | 
+36 |     on_dataset_changed,
+37 |     on_dataset_created,
+38 | )
+39 + from airflow.listeners.spec.asset import on_asset_created
+40 | 
+   - on_dataset_created()
+41 + on_asset_created()
+42 | on_dataset_changed()
+43 | 
+44 | 
 
 AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_changed` is removed in Airflow 3.0
   --> AIR301_names_fix.py:41:1
@@ -318,19 +296,17 @@ AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_changed` is removed in Air
    | ^^^^^^^^^^^^^^^^^^
    |
 help: Use `on_asset_changed` from `airflow.listeners.spec.asset` instead.
-
-ℹ Safe fix
-36 36 |     on_dataset_changed,
-37 37 |     on_dataset_created,
-38 38 | )
-   39 |+from airflow.listeners.spec.asset import on_asset_changed
-39 40 | 
-40 41 | on_dataset_created()
-41    |-on_dataset_changed()
-   42 |+on_asset_changed()
-42 43 | 
-43 44 | 
-44 45 | # airflow.operators.python
+36 |     on_dataset_changed,
+37 |     on_dataset_created,
+38 | )
+39 + from airflow.listeners.spec.asset import on_asset_changed
+40 | 
+41 | on_dataset_created()
+   - on_dataset_changed()
+42 + on_asset_changed()
+43 | 
+44 | 
+45 | # airflow.operators.python
 
 AIR301 [*] `airflow.operators.python.get_current_context` is removed in Airflow 3.0
   --> AIR301_names_fix.py:47:1
@@ -343,16 +319,15 @@ AIR301 [*] `airflow.operators.python.get_current_context` is removed in Airflow
 49 | # airflow.providers.mysql
    |
 help: Use `get_current_context` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | 
-44 44 | # airflow.operators.python
-45    |-from airflow.operators.python import get_current_context
-   45 |+from airflow.sdk import get_current_context
-46 46 | 
-47 47 | get_current_context()
-48 48 | 
+42 | 
+43 | 
+44 | # airflow.operators.python
+   - from airflow.operators.python import get_current_context
+45 + from airflow.sdk import get_current_context
+46 | 
+47 | get_current_context()
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.providers.mysql.datasets.mysql.sanitize_uri` is removed in Airflow 3.0
   --> AIR301_names_fix.py:52:1
@@ -365,16 +340,15 @@ AIR301 [*] `airflow.providers.mysql.datasets.mysql.sanitize_uri` is removed in A
 54 | # airflow.providers.postgres
    |
 help: Use `sanitize_uri` from `airflow.providers.mysql.assets.mysql` instead.
-
-ℹ Unsafe fix
-47 47 | get_current_context()
-48 48 | 
-49 49 | # airflow.providers.mysql
-50    |-from airflow.providers.mysql.datasets.mysql import sanitize_uri
-   50 |+from airflow.providers.mysql.assets.mysql import sanitize_uri
-51 51 | 
-52 52 | sanitize_uri
-53 53 | 
+47 | get_current_context()
+48 | 
+49 | # airflow.providers.mysql
+   - from airflow.providers.mysql.datasets.mysql import sanitize_uri
+50 + from airflow.providers.mysql.assets.mysql import sanitize_uri
+51 | 
+52 | sanitize_uri
+53 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.providers.postgres.datasets.postgres.sanitize_uri` is removed in Airflow 3.0
   --> AIR301_names_fix.py:57:1
@@ -387,16 +361,15 @@ AIR301 [*] `airflow.providers.postgres.datasets.postgres.sanitize_uri` is remove
 59 | # airflow.providers.trino
    |
 help: Use `sanitize_uri` from `airflow.providers.postgres.assets.postgres` instead.
-
-ℹ Unsafe fix
-52 52 | sanitize_uri
-53 53 | 
-54 54 | # airflow.providers.postgres
-55    |-from airflow.providers.postgres.datasets.postgres import sanitize_uri
-   55 |+from airflow.providers.postgres.assets.postgres import sanitize_uri
-56 56 | 
-57 57 | sanitize_uri
-58 58 | 
+52 | sanitize_uri
+53 | 
+54 | # airflow.providers.postgres
+   - from airflow.providers.postgres.datasets.postgres import sanitize_uri
+55 + from airflow.providers.postgres.assets.postgres import sanitize_uri
+56 | 
+57 | sanitize_uri
+58 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.providers.trino.datasets.trino.sanitize_uri` is removed in Airflow 3.0
   --> AIR301_names_fix.py:62:1
@@ -409,16 +382,15 @@ AIR301 [*] `airflow.providers.trino.datasets.trino.sanitize_uri` is removed in A
 64 | # airflow.notifications.basenotifier
    |
 help: Use `sanitize_uri` from `airflow.providers.trino.assets.trino` instead.
-
-ℹ Unsafe fix
-57 57 | sanitize_uri
-58 58 | 
-59 59 | # airflow.providers.trino
-60    |-from airflow.providers.trino.datasets.trino import sanitize_uri
-   60 |+from airflow.providers.trino.assets.trino import sanitize_uri
-61 61 | 
-62 62 | sanitize_uri
-63 63 | 
+57 | sanitize_uri
+58 | 
+59 | # airflow.providers.trino
+   - from airflow.providers.trino.datasets.trino import sanitize_uri
+60 + from airflow.providers.trino.assets.trino import sanitize_uri
+61 | 
+62 | sanitize_uri
+63 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.notifications.basenotifier.BaseNotifier` is removed in Airflow 3.0
   --> AIR301_names_fix.py:67:1
@@ -431,16 +403,15 @@ AIR301 [*] `airflow.notifications.basenotifier.BaseNotifier` is removed in Airfl
 69 | # airflow.auth.manager
    |
 help: Use `BaseNotifier` from `airflow.sdk.bases.notifier` instead.
-
-ℹ Unsafe fix
-62 62 | sanitize_uri
-63 63 | 
-64 64 | # airflow.notifications.basenotifier
-65    |-from airflow.notifications.basenotifier import BaseNotifier
-   65 |+from airflow.sdk.bases.notifier import BaseNotifier
-66 66 | 
-67 67 | BaseNotifier()
-68 68 | 
+62 | sanitize_uri
+63 | 
+64 | # airflow.notifications.basenotifier
+   - from airflow.notifications.basenotifier import BaseNotifier
+65 + from airflow.sdk.bases.notifier import BaseNotifier
+66 | 
+67 | BaseNotifier()
+68 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.auth.managers.base_auth_manager.BaseAuthManager` is removed in Airflow 3.0
   --> AIR301_names_fix.py:72:1
@@ -451,16 +422,15 @@ AIR301 [*] `airflow.auth.managers.base_auth_manager.BaseAuthManager` is removed
    | ^^^^^^^^^^^^^^^
    |
 help: Use `BaseAuthManager` from `airflow.api_fastapi.auth.managers.base_auth_manager` instead.
-
-ℹ Unsafe fix
-67 67 | BaseNotifier()
-68 68 | 
-69 69 | # airflow.auth.manager
-70    |-from airflow.auth.managers.base_auth_manager import BaseAuthManager
-   70 |+from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager
-71 71 | 
-72 72 | BaseAuthManager()
-73 73 | 
+67 | BaseNotifier()
+68 | 
+69 | # airflow.auth.manager
+   - from airflow.auth.managers.base_auth_manager import BaseAuthManager
+70 + from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager
+71 | 
+72 | BaseAuthManager()
+73 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.configuration.get` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:1
@@ -471,20 +441,18 @@ AIR301 [*] `airflow.configuration.get` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.get` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+conf, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + conf, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.getboolean` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:6
@@ -495,20 +463,18 @@ AIR301 [*] `airflow.configuration.getboolean` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.getboolean` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, conf, getfloat, getint, has_option, remove_option, as_dict, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, conf, getfloat, getint, has_option, remove_option, as_dict, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.getfloat` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:18
@@ -519,20 +485,18 @@ AIR301 [*] `airflow.configuration.getfloat` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.getfloat` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, getboolean, conf, getint, has_option, remove_option, as_dict, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, getboolean, conf, getint, has_option, remove_option, as_dict, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.getint` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:28
@@ -543,20 +507,18 @@ AIR301 [*] `airflow.configuration.getint` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.getint` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, getboolean, getfloat, conf, has_option, remove_option, as_dict, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, getboolean, getfloat, conf, has_option, remove_option, as_dict, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.has_option` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:36
@@ -567,20 +529,18 @@ AIR301 [*] `airflow.configuration.has_option` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.has_option` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, getboolean, getfloat, getint, conf, remove_option, as_dict, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, getboolean, getfloat, getint, conf, remove_option, as_dict, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.remove_option` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:48
@@ -591,20 +551,18 @@ AIR301 [*] `airflow.configuration.remove_option` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.remove_option` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, getboolean, getfloat, getint, has_option, conf, as_dict, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, getboolean, getfloat, getint, has_option, conf, as_dict, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.as_dict` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:63
@@ -615,20 +573,18 @@ AIR301 [*] `airflow.configuration.as_dict` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.as_dict` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, getboolean, getfloat, getint, has_option, remove_option, conf, set
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, getboolean, getfloat, getint, has_option, remove_option, conf, set
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.configuration.set` is removed in Airflow 3.0
   --> AIR301_names_fix.py:87:72
@@ -639,20 +595,18 @@ AIR301 [*] `airflow.configuration.set` is removed in Airflow 3.0
 88 | from airflow.hooks.base_hook import BaseHook
    |
 help: Use `conf.set` from `airflow.configuration` instead.
-
-ℹ Safe fix
-81 81 |     has_option,
-82 82 |     remove_option,
-83 83 |     set,
-   84 |+conf,
-84 85 | )
-85 86 | 
-86 87 | # airflow.configuration
-87    |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-   88 |+get, getboolean, getfloat, getint, has_option, remove_option, as_dict, conf
-88 89 | from airflow.hooks.base_hook import BaseHook
-89 90 | 
-90 91 | # airflow.hooks
+81 |     has_option,
+82 |     remove_option,
+83 |     set,
+84 + conf,
+85 | )
+86 | 
+87 | # airflow.configuration
+   - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+88 + get, getboolean, getfloat, getint, has_option, remove_option, as_dict, conf
+89 | from airflow.hooks.base_hook import BaseHook
+90 | 
+91 | # airflow.hooks
 
 AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0
   --> AIR301_names_fix.py:91:1
@@ -664,16 +618,15 @@ AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0
 93 | from airflow.sensors.base_sensor_operator import BaseSensorOperator
    |
 help: Use `BaseHook` from `airflow.hooks.base` instead.
-
-ℹ Unsafe fix
-85 85 | 
-86 86 | # airflow.configuration
-87 87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-88    |-from airflow.hooks.base_hook import BaseHook
-   88 |+from airflow.hooks.base import BaseHook
-89 89 | 
-90 90 | # airflow.hooks
-91 91 | BaseHook()
+85 | 
+86 | # airflow.configuration
+87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+   - from airflow.hooks.base_hook import BaseHook
+88 + from airflow.hooks.base import BaseHook
+89 | 
+90 | # airflow.hooks
+91 | BaseHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.sensors.base_sensor_operator.BaseSensorOperator` is removed in Airflow 3.0
   --> AIR301_names_fix.py:96:1
@@ -684,16 +637,15 @@ AIR301 [*] `airflow.sensors.base_sensor_operator.BaseSensorOperator` is removed
 97 | BaseHook()
    |
 help: Use `BaseSensorOperator` from `airflow.sdk.bases.sensor` instead.
-
-ℹ Unsafe fix
-90 90 | # airflow.hooks
-91 91 | BaseHook()
-92 92 | 
-93    |-from airflow.sensors.base_sensor_operator import BaseSensorOperator
-   93 |+from airflow.sdk.bases.sensor import BaseSensorOperator
-94 94 | 
-95 95 | # airflow.sensors.base_sensor_operator
-96 96 | BaseSensorOperator()
+90 | # airflow.hooks
+91 | BaseHook()
+92 | 
+   - from airflow.sensors.base_sensor_operator import BaseSensorOperator
+93 + from airflow.sdk.bases.sensor import BaseSensorOperator
+94 | 
+95 | # airflow.sensors.base_sensor_operator
+96 | BaseSensorOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0
   --> AIR301_names_fix.py:97:1
@@ -706,21 +658,20 @@ AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0
 99 | from airflow.utils.helpers import chain as helper_chain
    |
 help: Use `BaseHook` from `airflow.hooks.base` instead.
-
-ℹ Unsafe fix
-85 85 | 
-86 86 | # airflow.configuration
-87 87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-88    |-from airflow.hooks.base_hook import BaseHook
-89 88 | 
-90 89 | # airflow.hooks
-91 90 | BaseHook()
-92 91 | 
-93 92 | from airflow.sensors.base_sensor_operator import BaseSensorOperator
-   93 |+from airflow.hooks.base import BaseHook
-94 94 | 
-95 95 | # airflow.sensors.base_sensor_operator
-96 96 | BaseSensorOperator()
+85 | 
+86 | # airflow.configuration
+87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+   - from airflow.hooks.base_hook import BaseHook
+88 | 
+89 | # airflow.hooks
+90 | BaseHook()
+91 | 
+92 | from airflow.sensors.base_sensor_operator import BaseSensorOperator
+93 + from airflow.hooks.base import BaseHook
+94 | 
+95 | # airflow.sensors.base_sensor_operator
+96 | BaseSensorOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.utils.helpers.chain` is removed in Airflow 3.0
    --> AIR301_names_fix.py:103:1
@@ -731,19 +682,17 @@ AIR301 [*] `airflow.utils.helpers.chain` is removed in Airflow 3.0
 104 | helper_cross_downstream
     |
 help: Use `chain` from `airflow.sdk` instead.
-
-ℹ Safe fix
-98  98  | 
-99  99  | from airflow.utils.helpers import chain as helper_chain
-100 100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream
-    101 |+from airflow.sdk import chain
-101 102 | 
-102 103 | #  airflow.utils.helpers
-103     |-helper_chain
-    104 |+chain
-104 105 | helper_cross_downstream
-105 106 | 
-106 107 | # airflow.utils.file
+98  | 
+99  | from airflow.utils.helpers import chain as helper_chain
+100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream
+101 + from airflow.sdk import chain
+102 | 
+103 | #  airflow.utils.helpers
+    - helper_chain
+104 + chain
+105 | helper_cross_downstream
+106 | 
+107 | # airflow.utils.file
 
 AIR301 [*] `airflow.utils.helpers.cross_downstream` is removed in Airflow 3.0
    --> AIR301_names_fix.py:104:1
@@ -756,20 +705,18 @@ AIR301 [*] `airflow.utils.helpers.cross_downstream` is removed in Airflow 3.0
 106 | # airflow.utils.file
     |
 help: Use `cross_downstream` from `airflow.sdk` instead.
-
-ℹ Safe fix
-98  98  | 
-99  99  | from airflow.utils.helpers import chain as helper_chain
-100 100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream
-    101 |+from airflow.sdk import cross_downstream
-101 102 | 
-102 103 | #  airflow.utils.helpers
-103 104 | helper_chain
-104     |-helper_cross_downstream
-    105 |+cross_downstream
-105 106 | 
-106 107 | # airflow.utils.file
-107 108 | from airflow.utils.file import TemporaryDirectory
+98  | 
+99  | from airflow.utils.helpers import chain as helper_chain
+100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream
+101 + from airflow.sdk import cross_downstream
+102 | 
+103 | #  airflow.utils.helpers
+104 | helper_chain
+    - helper_cross_downstream
+105 + cross_downstream
+106 | 
+107 | # airflow.utils.file
+108 | from airflow.utils.file import TemporaryDirectory
 
 AIR301 [*] `airflow.utils.file.TemporaryDirectory` is removed in Airflow 3.0
    --> AIR301_names_fix.py:109:1
@@ -782,16 +729,15 @@ AIR301 [*] `airflow.utils.file.TemporaryDirectory` is removed in Airflow 3.0
 111 | from airflow.utils.log import secrets_masker
     |
 help: Use `TemporaryDirectory` from `tempfile` instead.
-
-ℹ Unsafe fix
-104 104 | helper_cross_downstream
-105 105 | 
-106 106 | # airflow.utils.file
-107     |-from airflow.utils.file import TemporaryDirectory
-    107 |+from tempfile import TemporaryDirectory
-108 108 | 
-109 109 | TemporaryDirectory()
-110 110 | 
+104 | helper_cross_downstream
+105 | 
+106 | # airflow.utils.file
+    - from airflow.utils.file import TemporaryDirectory
+107 + from tempfile import TemporaryDirectory
+108 | 
+109 | TemporaryDirectory()
+110 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR301 [*] `airflow.utils.log.secrets_masker` is removed in Airflow 3.0
    --> AIR301_names_fix.py:114:1
@@ -801,13 +747,12 @@ AIR301 [*] `airflow.utils.log.secrets_masker` is removed in Airflow 3.0
     | ^^^^^^^^^^^^^^
     |
 help: Use `secrets_masker` from `airflow.sdk.execution_time` instead.
-
-ℹ Unsafe fix
-108 108 | 
-109 109 | TemporaryDirectory()
-110 110 | 
-111     |-from airflow.utils.log import secrets_masker
-    111 |+from airflow.sdk.execution_time import secrets_masker
-112 112 | 
-113 113 | #  airflow.utils.log
-114 114 | secrets_masker
+108 | 
+109 | TemporaryDirectory()
+110 | 
+    - from airflow.utils.log import secrets_masker
+111 + from airflow.sdk.execution_time import secrets_masker
+112 | 
+113 | #  airflow.utils.log
+114 | secrets_masker
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap
index 825dad7e21..baba2f5e69 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap
@@ -12,16 +12,14 @@ AIR301 [*] `airflow.providers.amazon.aws.auth_manager.avp.entities.AvpEntities.D
 13 | # airflow.providers.openlineage.utils.utils
    |
 help: Use `AvpEntities.ASSET` from `airflow.providers.amazon.aws.auth_manager.avp.entities` instead.
-
-ℹ Safe fix
-8  8  | from airflow.secrets.local_filesystem import load_connections
-9  9  | from airflow.security.permissions import RESOURCE_DATASET
-10 10 | 
-11    |-AvpEntities.DATASET
-   11 |+AvpEntities
-12 12 | 
-13 13 | # airflow.providers.openlineage.utils.utils
-14 14 | DatasetInfo()
+8  | from airflow.secrets.local_filesystem import load_connections
+9  | from airflow.security.permissions import RESOURCE_DATASET
+10 | 
+   - AvpEntities.DATASET
+11 + AvpEntities
+12 | 
+13 | # airflow.providers.openlineage.utils.utils
+14 | DatasetInfo()
 
 AIR301 [*] `airflow.providers.openlineage.utils.utils.DatasetInfo` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:14:1
@@ -32,24 +30,22 @@ AIR301 [*] `airflow.providers.openlineage.utils.utils.DatasetInfo` is removed in
 15 | translate_airflow_dataset()
    |
 help: Use `AssetInfo` from `airflow.providers.openlineage.utils.utils` instead.
-
-ℹ Safe fix
-4  4  | from airflow.providers.openlineage.utils.utils import (
-5  5  |     DatasetInfo,
-6  6  |     translate_airflow_dataset,
-   7  |+AssetInfo,
-7  8  | )
-8  9  | from airflow.secrets.local_filesystem import load_connections
-9  10 | from airflow.security.permissions import RESOURCE_DATASET
+4  | from airflow.providers.openlineage.utils.utils import (
+5  |     DatasetInfo,
+6  |     translate_airflow_dataset,
+7  + AssetInfo,
+8  | )
+9  | from airflow.secrets.local_filesystem import load_connections
+10 | from airflow.security.permissions import RESOURCE_DATASET
 --------------------------------------------------------------------------------
-11 12 | AvpEntities.DATASET
-12 13 | 
-13 14 | # airflow.providers.openlineage.utils.utils
-14    |-DatasetInfo()
-   15 |+AssetInfo()
-15 16 | translate_airflow_dataset()
-16 17 | 
-17 18 | # airflow.secrets.local_filesystem
+12 | AvpEntities.DATASET
+13 | 
+14 | # airflow.providers.openlineage.utils.utils
+   - DatasetInfo()
+15 + AssetInfo()
+16 | translate_airflow_dataset()
+17 | 
+18 | # airflow.secrets.local_filesystem
 
 AIR301 [*] `airflow.providers.openlineage.utils.utils.translate_airflow_dataset` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:15:1
@@ -62,24 +58,22 @@ AIR301 [*] `airflow.providers.openlineage.utils.utils.translate_airflow_dataset`
 17 | # airflow.secrets.local_filesystem
    |
 help: Use `translate_airflow_asset` from `airflow.providers.openlineage.utils.utils` instead.
-
-ℹ Safe fix
-4  4  | from airflow.providers.openlineage.utils.utils import (
-5  5  |     DatasetInfo,
-6  6  |     translate_airflow_dataset,
-   7  |+translate_airflow_asset,
-7  8  | )
-8  9  | from airflow.secrets.local_filesystem import load_connections
-9  10 | from airflow.security.permissions import RESOURCE_DATASET
+4  | from airflow.providers.openlineage.utils.utils import (
+5  |     DatasetInfo,
+6  |     translate_airflow_dataset,
+7  + translate_airflow_asset,
+8  | )
+9  | from airflow.secrets.local_filesystem import load_connections
+10 | from airflow.security.permissions import RESOURCE_DATASET
 --------------------------------------------------------------------------------
-12 13 | 
-13 14 | # airflow.providers.openlineage.utils.utils
-14 15 | DatasetInfo()
-15    |-translate_airflow_dataset()
-   16 |+translate_airflow_asset()
-16 17 | 
-17 18 | # airflow.secrets.local_filesystem
-18 19 | load_connections()
+13 | 
+14 | # airflow.providers.openlineage.utils.utils
+15 | DatasetInfo()
+   - translate_airflow_dataset()
+16 + translate_airflow_asset()
+17 | 
+18 | # airflow.secrets.local_filesystem
+19 | load_connections()
 
 AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:18:1
@@ -91,25 +85,23 @@ AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Air
 20 | # airflow.security.permissions
    |
 help: Use `load_connections_dict` from `airflow.secrets.local_filesystem` instead.
-
-ℹ Safe fix
-5  5  |     DatasetInfo,
-6  6  |     translate_airflow_dataset,
-7  7  | )
-8     |-from airflow.secrets.local_filesystem import load_connections
-   8  |+from airflow.secrets.local_filesystem import load_connections, load_connections_dict
-9  9  | from airflow.security.permissions import RESOURCE_DATASET
-10 10 | 
-11 11 | AvpEntities.DATASET
+5  |     DatasetInfo,
+6  |     translate_airflow_dataset,
+7  | )
+   - from airflow.secrets.local_filesystem import load_connections
+8  + from airflow.secrets.local_filesystem import load_connections, load_connections_dict
+9  | from airflow.security.permissions import RESOURCE_DATASET
+10 | 
+11 | AvpEntities.DATASET
 --------------------------------------------------------------------------------
-15 15 | translate_airflow_dataset()
-16 16 | 
-17 17 | # airflow.secrets.local_filesystem
-18    |-load_connections()
-   18 |+load_connections_dict()
-19 19 | 
-20 20 | # airflow.security.permissions
-21 21 | RESOURCE_DATASET
+15 | translate_airflow_dataset()
+16 | 
+17 | # airflow.secrets.local_filesystem
+   - load_connections()
+18 + load_connections_dict()
+19 | 
+20 | # airflow.security.permissions
+21 | RESOURCE_DATASET
 
 AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:21:1
@@ -121,25 +113,23 @@ AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow
 23 | from airflow.providers.amazon.aws.datasets.s3 import (
    |
 help: Use `RESOURCE_ASSET` from `airflow.security.permissions` instead.
-
-ℹ Safe fix
-6  6  |     translate_airflow_dataset,
-7  7  | )
-8  8  | from airflow.secrets.local_filesystem import load_connections
-9     |-from airflow.security.permissions import RESOURCE_DATASET
-   9  |+from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET
-10 10 | 
-11 11 | AvpEntities.DATASET
-12 12 | 
+6  |     translate_airflow_dataset,
+7  | )
+8  | from airflow.secrets.local_filesystem import load_connections
+   - from airflow.security.permissions import RESOURCE_DATASET
+9  + from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET
+10 | 
+11 | AvpEntities.DATASET
+12 | 
 --------------------------------------------------------------------------------
-18 18 | load_connections()
-19 19 | 
-20 20 | # airflow.security.permissions
-21    |-RESOURCE_DATASET
-   21 |+RESOURCE_ASSET
-22 22 | 
-23 23 | from airflow.providers.amazon.aws.datasets.s3 import (
-24 24 |     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
+18 | load_connections()
+19 | 
+20 | # airflow.security.permissions
+   - RESOURCE_DATASET
+21 + RESOURCE_ASSET
+22 | 
+23 | from airflow.providers.amazon.aws.datasets.s3 import (
+24 |     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
 
 AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.create_dataset` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:28:1
@@ -151,18 +141,16 @@ AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.create_dataset` is removed
 29 | s3_convert_dataset_to_openlineage()
    |
 help: Use `create_asset` from `airflow.providers.amazon.aws.assets.s3` instead.
-
-ℹ Safe fix
-24 24 |     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
-25 25 | )
-26 26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset
-   27 |+from airflow.providers.amazon.aws.assets.s3 import create_asset
-27 28 | 
-28    |-s3_create_dataset()
-   29 |+create_asset()
-29 30 | s3_convert_dataset_to_openlineage()
-30 31 | 
-31 32 | from airflow.providers.common.io.dataset.file import (
+24 |     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
+25 | )
+26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset
+27 + from airflow.providers.amazon.aws.assets.s3 import create_asset
+28 | 
+   - s3_create_dataset()
+29 + create_asset()
+30 | s3_convert_dataset_to_openlineage()
+31 | 
+32 | from airflow.providers.common.io.dataset.file import (
 
 AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.convert_dataset_to_openlineage` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:29:1
@@ -174,19 +162,17 @@ AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.convert_dataset_to_openline
 31 | from airflow.providers.common.io.dataset.file import (
    |
 help: Use `convert_asset_to_openlineage` from `airflow.providers.amazon.aws.assets.s3` instead.
-
-ℹ Safe fix
-24 24 |     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
-25 25 | )
-26 26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset
-   27 |+from airflow.providers.amazon.aws.assets.s3 import convert_asset_to_openlineage
-27 28 | 
-28 29 | s3_create_dataset()
-29    |-s3_convert_dataset_to_openlineage()
-   30 |+convert_asset_to_openlineage()
-30 31 | 
-31 32 | from airflow.providers.common.io.dataset.file import (
-32 33 |     convert_dataset_to_openlineage as io_convert_dataset_to_openlineage,
+24 |     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
+25 | )
+26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset
+27 + from airflow.providers.amazon.aws.assets.s3 import convert_asset_to_openlineage
+28 | 
+29 | s3_create_dataset()
+   - s3_convert_dataset_to_openlineage()
+30 + convert_asset_to_openlineage()
+31 | 
+32 | from airflow.providers.common.io.dataset.file import (
+33 |     convert_dataset_to_openlineage as io_convert_dataset_to_openlineage,
 
 AIR301 [*] `airflow.providers.google.datasets.bigquery.create_dataset` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:45:1
@@ -199,18 +185,16 @@ AIR301 [*] `airflow.providers.google.datasets.bigquery.create_dataset` is remove
 47 | # airflow.providers.google.datasets.gcs
    |
 help: Use `create_asset` from `airflow.providers.google.assets.bigquery` instead.
-
-ℹ Safe fix
-41 41 | from airflow.providers.google.datasets.bigquery import (
-42 42 |     create_dataset as bigquery_create_dataset,
-43 43 | )
-   44 |+from airflow.providers.google.assets.bigquery import create_asset
-44 45 | 
-45    |-bigquery_create_dataset()
-   46 |+create_asset()
-46 47 | 
-47 48 | # airflow.providers.google.datasets.gcs
-48 49 | from airflow.providers.google.datasets.gcs import (
+41 | from airflow.providers.google.datasets.bigquery import (
+42 |     create_dataset as bigquery_create_dataset,
+43 | )
+44 + from airflow.providers.google.assets.bigquery import create_asset
+45 | 
+   - bigquery_create_dataset()
+46 + create_asset()
+47 | 
+48 | # airflow.providers.google.datasets.gcs
+49 | from airflow.providers.google.datasets.gcs import (
 
 AIR301 [*] `airflow.providers.google.datasets.gcs.create_dataset` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:53:1
@@ -222,16 +206,14 @@ AIR301 [*] `airflow.providers.google.datasets.gcs.create_dataset` is removed in
 54 | gcs_convert_dataset_to_openlineage()
    |
 help: Use `create_asset` from `airflow.providers.google.assets.gcs` instead.
-
-ℹ Safe fix
-49 49 |     convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage,
-50 50 | )
-51 51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset
-   52 |+from airflow.providers.google.assets.gcs import create_asset
-52 53 | 
-53    |-gcs_create_dataset()
-   54 |+create_asset()
-54 55 | gcs_convert_dataset_to_openlineage()
+49 |     convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage,
+50 | )
+51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset
+52 + from airflow.providers.google.assets.gcs import create_asset
+53 | 
+   - gcs_create_dataset()
+54 + create_asset()
+55 | gcs_convert_dataset_to_openlineage()
 
 AIR301 [*] `airflow.providers.google.datasets.gcs.convert_dataset_to_openlineage` is removed in Airflow 3.0
   --> AIR301_provider_names_fix.py:54:1
@@ -241,13 +223,11 @@ AIR301 [*] `airflow.providers.google.datasets.gcs.convert_dataset_to_openlineage
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `convert_asset_to_openlineage` from `airflow.providers.google.assets.gcs` instead.
-
-ℹ Safe fix
-49 49 |     convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage,
-50 50 | )
-51 51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset
-   52 |+from airflow.providers.google.assets.gcs import convert_asset_to_openlineage
-52 53 | 
-53 54 | gcs_create_dataset()
-54    |-gcs_convert_dataset_to_openlineage()
-   55 |+convert_asset_to_openlineage()
+49 |     convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage,
+50 | )
+51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset
+52 + from airflow.providers.google.assets.gcs import convert_asset_to_openlineage
+53 | 
+54 | gcs_create_dataset()
+   - gcs_convert_dataset_to_openlineage()
+55 + convert_asset_to_openlineage()
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap
index f7dd72b481..636c775298 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap
@@ -11,23 +11,22 @@ AIR302 [*] `airflow.hooks.S3_hook.S3Hook` is moved into `amazon` provider in Air
 15 | provide_bucket_name()
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3Hook` from `airflow.providers.amazon.aws.hooks.s3` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3  3  | from airflow.hooks.S3_hook import (
-4     |-    S3Hook,
-5  4  |     provide_bucket_name,
-6  5  | )
-7  6  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
+1  | from __future__ import annotations
+2  | 
+3  | from airflow.hooks.S3_hook import (
+   -     S3Hook,
+4  |     provide_bucket_name,
+5  | )
+6  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
 --------------------------------------------------------------------------------
-10 9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.hooks.s3 import S3Hook
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.hooks.s3 import S3Hook
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.S3_hook.provide_bucket_name` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:15:1
@@ -39,23 +38,22 @@ AIR302 [*] `airflow.hooks.S3_hook.provide_bucket_name` is moved into `amazon` pr
 17 | GCSToS3Operator()
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `provide_bucket_name` from `airflow.providers.amazon.aws.hooks.s3` instead.
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from airflow.hooks.S3_hook import (
-4  4  |     S3Hook,
-5     |-    provide_bucket_name,
-6  5  | )
-7  6  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
-8  7  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
+2  | 
+3  | from airflow.hooks.S3_hook import (
+4  |     S3Hook,
+   -     provide_bucket_name,
+5  | )
+6  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
+7  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
 --------------------------------------------------------------------------------
-10 9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.hooks.s3 import provide_bucket_name
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.hooks.s3 import provide_bucket_name
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.gcs_to_s3.GCSToS3Operator` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:17:1
@@ -68,21 +66,20 @@ AIR302 [*] `airflow.operators.gcs_to_s3.GCSToS3Operator` is moved into `amazon`
 19 | RedshiftToS3Operator()
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GCSToS3Operator` from `airflow.providers.amazon.aws.transfers.gcs_to_s3` instead.
-
-ℹ Unsafe fix
-4  4  |     S3Hook,
-5  5  |     provide_bucket_name,
-6  6  | )
-7     |-from airflow.operators.gcs_to_s3 import GCSToS3Operator
-8  7  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
-9  8  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
-10 9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.transfers.gcs_to_s3 import GCSToS3Operator
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+4  |     S3Hook,
+5  |     provide_bucket_name,
+6  | )
+   - from airflow.operators.gcs_to_s3 import GCSToS3Operator
+7  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
+8  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.transfers.gcs_to_s3 import GCSToS3Operator
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Operator` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:18:1
@@ -94,20 +91,19 @@ AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Operator` i
 20 | S3FileTransformOperator()
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GoogleApiToS3Operator` from `airflow.providers.amazon.aws.transfers.google_api_to_s3` instead.
-
-ℹ Unsafe fix
-5  5  |     provide_bucket_name,
-6  6  | )
-7  7  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
-8     |-from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
-9  8  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
-10 9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+5  |     provide_bucket_name,
+6  | )
+7  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
+   - from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
+8  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Operator` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:19:1
@@ -120,19 +116,18 @@ AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Operator` is m
 21 | S3ToRedshiftOperator()
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `RedshiftToS3Operator` from `airflow.providers.amazon.aws.transfers.redshift_to_s3` instead.
-
-ℹ Unsafe fix
-6  6  | )
-7  7  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
-8  8  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
-9     |-from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
-10 9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+6  | )
+7  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
+8  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
+   - from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+9  | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.s3_file_transform_operator.S3FileTransformOperator` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:20:1
@@ -145,18 +140,17 @@ AIR302 [*] `airflow.operators.s3_file_transform_operator.S3FileTransformOperator
 22 | S3KeySensor()
    |
 help: Install `apache-airflow-providers-amazon>=3.0.0` and use `S3FileTransformOperator` from `airflow.providers.amazon.aws.operators.s3` instead.
-
-ℹ Unsafe fix
-7  7  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
-8  8  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
-9  9  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
-10    |-from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.operators.s3 import S3FileTransformOperator
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+7  | from airflow.operators.gcs_to_s3 import GCSToS3Operator
+8  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
+9  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+   - from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.operators.s3 import S3FileTransformOperator
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftOperator` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:21:1
@@ -168,17 +162,16 @@ AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftOperator` is m
 22 | S3KeySensor()
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3ToRedshiftOperator` from `airflow.providers.amazon.aws.transfers.s3_to_redshift` instead.
-
-ℹ Unsafe fix
-8  8  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
-9  9  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
-10 10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11    |-from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+8  | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
+9  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+   - from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+11 | from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.s3_key_sensor.S3KeySensor` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:22:1
@@ -191,16 +184,15 @@ AIR302 [*] `airflow.sensors.s3_key_sensor.S3KeySensor` is moved into `amazon` pr
 24 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3KeySensor` from `airflow.providers.amazon.aws.sensors.s3` instead.
-
-ℹ Unsafe fix
-9  9  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
-10 10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-11 11 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
-12    |-from airflow.sensors.s3_key_sensor import S3KeySensor
-   12 |+from airflow.providers.amazon.aws.sensors.s3 import S3KeySensor
-13 13 | 
-14 14 | S3Hook()
-15 15 | provide_bucket_name()
+9  | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
+11 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+   - from airflow.sensors.s3_key_sensor import S3KeySensor
+12 + from airflow.providers.amazon.aws.sensors.s3 import S3KeySensor
+13 | 
+14 | S3Hook()
+15 | provide_bucket_name()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Transfer` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:26:1
@@ -213,15 +205,14 @@ AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Transfer` i
 28 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GoogleApiToS3Operator` from `airflow.providers.amazon.aws.transfers.google_api_to_s3` instead.
-
-ℹ Unsafe fix
-22 22 | S3KeySensor()
-23 23 | 
-24 24 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer
-   25 |+from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator
-25 26 | 
-26 27 | GoogleApiToS3Transfer()
-27 28 | 
+22 | S3KeySensor()
+23 | 
+24 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer
+25 + from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator
+26 | 
+27 | GoogleApiToS3Transfer()
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Transfer` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:30:1
@@ -234,15 +225,14 @@ AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Transfer` is m
 32 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `RedshiftToS3Operator` from `airflow.providers.amazon.aws.transfers.redshift_to_s3` instead.
-
-ℹ Unsafe fix
-26 26 | GoogleApiToS3Transfer()
-27 27 | 
-28 28 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer
-   29 |+from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator
-29 30 | 
-30 31 | RedshiftToS3Transfer()
-31 32 | 
+26 | GoogleApiToS3Transfer()
+27 | 
+28 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer
+29 + from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator
+30 | 
+31 | RedshiftToS3Transfer()
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftTransfer` is moved into `amazon` provider in Airflow 3.0;
   --> AIR302_amazon.py:34:1
@@ -253,11 +243,10 @@ AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftTransfer` is m
    | ^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3ToRedshiftOperator` from `airflow.providers.amazon.aws.transfers.s3_to_redshift` instead.
-
-ℹ Unsafe fix
-30 30 | RedshiftToS3Transfer()
-31 31 | 
-32 32 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer
-   33 |+from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator
-33 34 | 
-34 35 | S3ToRedshiftTransfer()
+30 | RedshiftToS3Transfer()
+31 | 
+32 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer
+33 + from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator
+34 | 
+35 | S3ToRedshiftTransfer()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap
index 8339afac1f..25d9eff300 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap
@@ -12,19 +12,18 @@ AIR302 [*] `airflow.config_templates.default_celery.DEFAULT_CELERY_CONFIG` is mo
 11 | app
    |
 help: Install `apache-airflow-providers-celery>=3.3.0` and use `DEFAULT_CELERY_CONFIG` from `airflow.providers.celery.executors.default_celery` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG
-4 3 | from airflow.executors.celery_executor import (
-5 4 |     CeleryExecutor,
-6 5 |     app,
-7 6 | )
-  7 |+from airflow.providers.celery.executors.default_celery import DEFAULT_CELERY_CONFIG
-8 8 | 
-9 9 | DEFAULT_CELERY_CONFIG
-10 10 | 
+1  | from __future__ import annotations
+2  | 
+   - from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG
+3  | from airflow.executors.celery_executor import (
+4  |     CeleryExecutor,
+5  |     app,
+6  | )
+7  + from airflow.providers.celery.executors.default_celery import DEFAULT_CELERY_CONFIG
+8  | 
+9  | DEFAULT_CELERY_CONFIG
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.executors.celery_executor.app` is moved into `celery` provider in Airflow 3.0;
   --> AIR302_celery.py:11:1
@@ -36,17 +35,16 @@ AIR302 [*] `airflow.executors.celery_executor.app` is moved into `celery` provid
 12 | CeleryExecutor()
    |
 help: Install `apache-airflow-providers-celery>=3.3.0` and use `app` from `airflow.providers.celery.executors.celery_executor_utils` instead.
-
-ℹ Unsafe fix
-3 3 | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG
-4 4 | from airflow.executors.celery_executor import (
-5 5 |     CeleryExecutor,
-6   |-    app,
-7 6 | )
-  7 |+from airflow.providers.celery.executors.celery_executor_utils import app
-8 8 | 
-9 9 | DEFAULT_CELERY_CONFIG
-10 10 | 
+3  | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG
+4  | from airflow.executors.celery_executor import (
+5  |     CeleryExecutor,
+   -     app,
+6  | )
+7  + from airflow.providers.celery.executors.celery_executor_utils import app
+8  | 
+9  | DEFAULT_CELERY_CONFIG
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.executors.celery_executor.CeleryExecutor` is moved into `celery` provider in Airflow 3.0;
   --> AIR302_celery.py:12:1
@@ -56,15 +54,14 @@ AIR302 [*] `airflow.executors.celery_executor.CeleryExecutor` is moved into `cel
    | ^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-celery>=3.3.0` and use `CeleryExecutor` from `airflow.providers.celery.executors.celery_executor` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG
-4 4 | from airflow.executors.celery_executor import (
-5   |-    CeleryExecutor,
-6 5 |     app,
-7 6 | )
-  7 |+from airflow.providers.celery.executors.celery_executor import CeleryExecutor
-8 8 | 
-9 9 | DEFAULT_CELERY_CONFIG
-10 10 |
+2  | 
+3  | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG
+4  | from airflow.executors.celery_executor import (
+   -     CeleryExecutor,
+5  |     app,
+6  | )
+7  + from airflow.providers.celery.executors.celery_executor import CeleryExecutor
+8  | 
+9  | DEFAULT_CELERY_CONFIG
+10 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap
index 992829cd41..dfd39575e6 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap
@@ -11,18 +11,17 @@ AIR302 [*] `airflow.hooks.dbapi.ConnectorProtocol` is moved into `common-sql` pr
 9 | DbApiHook()
   |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `ConnectorProtocol` from `airflow.providers.common.sql.hooks.sql` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.hooks.dbapi import (
-4   |-    ConnectorProtocol,
-5 4 |     DbApiHook,
-6 5 | )
-  6 |+from airflow.providers.common.sql.hooks.sql import ConnectorProtocol
-7 7 | 
-8 8 | ConnectorProtocol()
-9 9 | DbApiHook()
+1 | from __future__ import annotations
+2 | 
+3 | from airflow.hooks.dbapi import (
+  -     ConnectorProtocol,
+4 |     DbApiHook,
+5 | )
+6 + from airflow.providers.common.sql.hooks.sql import ConnectorProtocol
+7 | 
+8 | ConnectorProtocol()
+9 | DbApiHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.dbapi.DbApiHook` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:9:1
@@ -34,17 +33,16 @@ AIR302 [*] `airflow.hooks.dbapi.DbApiHook` is moved into `common-sql` provider i
 11 | from airflow.hooks.dbapi_hook import DbApiHook
    |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `DbApiHook` from `airflow.providers.common.sql.hooks.sql` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.hooks.dbapi import (
-4 4 |     ConnectorProtocol,
-5   |-    DbApiHook,
-6 5 | )
-  6 |+from airflow.providers.common.sql.hooks.sql import DbApiHook
-7 7 | 
-8 8 | ConnectorProtocol()
-9 9 | DbApiHook()
+2 | 
+3 | from airflow.hooks.dbapi import (
+4 |     ConnectorProtocol,
+  -     DbApiHook,
+5 | )
+6 + from airflow.providers.common.sql.hooks.sql import DbApiHook
+7 | 
+8 | ConnectorProtocol()
+9 | DbApiHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.dbapi_hook.DbApiHook` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:14:1
@@ -56,17 +54,16 @@ AIR302 [*] `airflow.hooks.dbapi_hook.DbApiHook` is moved into `common-sql` provi
 15 | SQLCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `DbApiHook` from `airflow.providers.common.sql.hooks.sql` instead.
-
-ℹ Unsafe fix
-8  8  | ConnectorProtocol()
-9  9  | DbApiHook()
-10 10 | 
-11    |-from airflow.hooks.dbapi_hook import DbApiHook
-12 11 | from airflow.operators.check_operator import SQLCheckOperator
-   12 |+from airflow.providers.common.sql.hooks.sql import DbApiHook
-13 13 | 
-14 14 | DbApiHook()
-15 15 | SQLCheckOperator()
+8  | ConnectorProtocol()
+9  | DbApiHook()
+10 | 
+   - from airflow.hooks.dbapi_hook import DbApiHook
+11 | from airflow.operators.check_operator import SQLCheckOperator
+12 + from airflow.providers.common.sql.hooks.sql import DbApiHook
+13 | 
+14 | DbApiHook()
+15 | SQLCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.SQLCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:15:1
@@ -76,16 +73,15 @@ AIR302 [*] `airflow.operators.check_operator.SQLCheckOperator` is moved into `co
    | ^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-9  9  | DbApiHook()
-10 10 | 
-11 11 | from airflow.hooks.dbapi_hook import DbApiHook
-12    |-from airflow.operators.check_operator import SQLCheckOperator
-   12 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-13 13 | 
-14 14 | DbApiHook()
-15 15 | SQLCheckOperator()
+9  | DbApiHook()
+10 | 
+11 | from airflow.hooks.dbapi_hook import DbApiHook
+   - from airflow.operators.check_operator import SQLCheckOperator
+12 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+13 | 
+14 | DbApiHook()
+15 | SQLCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.SQLCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:21:1
@@ -97,16 +93,15 @@ AIR302 [*] `airflow.operators.sql.SQLCheckOperator` is moved into `common-sql` p
 22 | CheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | 
-18 18 | from airflow.operators.check_operator import CheckOperator
-19    |-from airflow.operators.sql import SQLCheckOperator
-   19 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-20 20 | 
-21 21 | SQLCheckOperator()
-22 22 | CheckOperator()
+16 | 
+17 | 
+18 | from airflow.operators.check_operator import CheckOperator
+   - from airflow.operators.sql import SQLCheckOperator
+19 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+20 | 
+21 | SQLCheckOperator()
+22 | CheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:22:1
@@ -116,15 +111,14 @@ AIR302 [*] `airflow.operators.check_operator.CheckOperator` is moved into `commo
    | ^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | from airflow.operators.check_operator import CheckOperator
-19 19 | from airflow.operators.sql import SQLCheckOperator
-   20 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-20 21 | 
-21 22 | SQLCheckOperator()
-22 23 | CheckOperator()
+17 | 
+18 | from airflow.operators.check_operator import CheckOperator
+19 | from airflow.operators.sql import SQLCheckOperator
+20 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+21 | 
+22 | SQLCheckOperator()
+23 | CheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.druid_check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:27:1
@@ -135,15 +129,14 @@ AIR302 [*] `airflow.operators.druid_check_operator.CheckOperator` is moved into
    | ^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | 
-25 25 | from airflow.operators.druid_check_operator import CheckOperator
-   26 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-26 27 | 
-27 28 | CheckOperator()
-28 29 | 
+23 | 
+24 | 
+25 | from airflow.operators.druid_check_operator import CheckOperator
+26 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+27 | 
+28 | CheckOperator()
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:32:1
@@ -154,15 +147,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.CheckOperator` is moved into
    | ^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | 
-30 30 | from airflow.operators.presto_check_operator import CheckOperator
-   31 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-31 32 | 
-32 33 | CheckOperator()
-33 34 | 
+28 | 
+29 | 
+30 | from airflow.operators.presto_check_operator import CheckOperator
+31 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+32 | 
+33 | CheckOperator()
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.druid_check_operator.DruidCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:42:1
@@ -175,15 +167,14 @@ AIR302 [*] `airflow.operators.druid_check_operator.DruidCheckOperator` is moved
 44 | IntervalCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-38 38 | )
-39 39 | from airflow.operators.druid_check_operator import DruidCheckOperator
-40 40 | from airflow.operators.presto_check_operator import PrestoCheckOperator
-   41 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-41 42 | 
-42 43 | DruidCheckOperator()
-43 44 | PrestoCheckOperator()
+38 | )
+39 | from airflow.operators.druid_check_operator import DruidCheckOperator
+40 | from airflow.operators.presto_check_operator import PrestoCheckOperator
+41 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+42 | 
+43 | DruidCheckOperator()
+44 | PrestoCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_check_operator.PrestoCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:43:1
@@ -195,15 +186,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.PrestoCheckOperator` is move
 45 | SQLIntervalCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-38 38 | )
-39 39 | from airflow.operators.druid_check_operator import DruidCheckOperator
-40 40 | from airflow.operators.presto_check_operator import PrestoCheckOperator
-   41 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator
-41 42 | 
-42 43 | DruidCheckOperator()
-43 44 | PrestoCheckOperator()
+38 | )
+39 | from airflow.operators.druid_check_operator import DruidCheckOperator
+40 | from airflow.operators.presto_check_operator import PrestoCheckOperator
+41 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator
+42 | 
+43 | DruidCheckOperator()
+44 | PrestoCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.IntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:44:1
@@ -215,19 +205,18 @@ AIR302 [*] `airflow.operators.check_operator.IntervalCheckOperator` is moved int
 45 | SQLIntervalCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-34 34 | 
-35 35 | from airflow.operators.check_operator import (
-36 36 |     IntervalCheckOperator,
-37    |-    SQLIntervalCheckOperator,
-38 37 | )
-39 38 | from airflow.operators.druid_check_operator import DruidCheckOperator
-40 39 | from airflow.operators.presto_check_operator import PrestoCheckOperator
-   40 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
-41 41 | 
-42 42 | DruidCheckOperator()
-43 43 | PrestoCheckOperator()
+34 | 
+35 | from airflow.operators.check_operator import (
+36 |     IntervalCheckOperator,
+   -     SQLIntervalCheckOperator,
+37 | )
+38 | from airflow.operators.druid_check_operator import DruidCheckOperator
+39 | from airflow.operators.presto_check_operator import PrestoCheckOperator
+40 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
+41 | 
+42 | DruidCheckOperator()
+43 | PrestoCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.SQLIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:45:1
@@ -238,19 +227,18 @@ AIR302 [*] `airflow.operators.check_operator.SQLIntervalCheckOperator` is moved
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-34 34 | 
-35 35 | from airflow.operators.check_operator import (
-36 36 |     IntervalCheckOperator,
-37    |-    SQLIntervalCheckOperator,
-38 37 | )
-39 38 | from airflow.operators.druid_check_operator import DruidCheckOperator
-40 39 | from airflow.operators.presto_check_operator import PrestoCheckOperator
-   40 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
-41 41 | 
-42 42 | DruidCheckOperator()
-43 43 | PrestoCheckOperator()
+34 | 
+35 | from airflow.operators.check_operator import (
+36 |     IntervalCheckOperator,
+   -     SQLIntervalCheckOperator,
+37 | )
+38 | from airflow.operators.druid_check_operator import DruidCheckOperator
+39 | from airflow.operators.presto_check_operator import PrestoCheckOperator
+40 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
+41 | 
+42 | DruidCheckOperator()
+43 | PrestoCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_check_operator.IntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:54:1
@@ -263,15 +251,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.IntervalCheckOperator` is mo
 56 | PrestoIntervalCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-50 50 |     PrestoIntervalCheckOperator,
-51 51 | )
-52 52 | from airflow.operators.sql import SQLIntervalCheckOperator
-   53 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
-53 54 | 
-54 55 | IntervalCheckOperator()
-55 56 | SQLIntervalCheckOperator()
+50 |     PrestoIntervalCheckOperator,
+51 | )
+52 | from airflow.operators.sql import SQLIntervalCheckOperator
+53 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
+54 | 
+55 | IntervalCheckOperator()
+56 | SQLIntervalCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.SQLIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:55:1
@@ -282,16 +269,15 @@ AIR302 [*] `airflow.operators.sql.SQLIntervalCheckOperator` is moved into `commo
 56 | PrestoIntervalCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-49 49 |     IntervalCheckOperator,
-50 50 |     PrestoIntervalCheckOperator,
-51 51 | )
-52    |-from airflow.operators.sql import SQLIntervalCheckOperator
-   52 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
-53 53 | 
-54 54 | IntervalCheckOperator()
-55 55 | SQLIntervalCheckOperator()
+49 |     IntervalCheckOperator,
+50 |     PrestoIntervalCheckOperator,
+51 | )
+   - from airflow.operators.sql import SQLIntervalCheckOperator
+52 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
+53 | 
+54 | IntervalCheckOperator()
+55 | SQLIntervalCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_check_operator.PrestoIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:56:1
@@ -302,15 +288,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.PrestoIntervalCheckOperator`
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-50 50 |     PrestoIntervalCheckOperator,
-51 51 | )
-52 52 | from airflow.operators.sql import SQLIntervalCheckOperator
-   53 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
-53 54 | 
-54 55 | IntervalCheckOperator()
-55 56 | SQLIntervalCheckOperator()
+50 |     PrestoIntervalCheckOperator,
+51 | )
+52 | from airflow.operators.sql import SQLIntervalCheckOperator
+53 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator
+54 | 
+55 | IntervalCheckOperator()
+56 | SQLIntervalCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.SQLThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:64:1
@@ -322,18 +307,17 @@ AIR302 [*] `airflow.operators.check_operator.SQLThresholdCheckOperator` is moved
 65 | ThresholdCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | 
-59 59 | from airflow.operators.check_operator import (
-60    |-    SQLThresholdCheckOperator,
-61 60 |     ThresholdCheckOperator,
-62 61 | )
-   62 |+from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator
-63 63 | 
-64 64 | SQLThresholdCheckOperator()
-65 65 | ThresholdCheckOperator()
+57 | 
+58 | 
+59 | from airflow.operators.check_operator import (
+   -     SQLThresholdCheckOperator,
+60 |     ThresholdCheckOperator,
+61 | )
+62 + from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator
+63 | 
+64 | SQLThresholdCheckOperator()
+65 | ThresholdCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.ThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:65:1
@@ -343,18 +327,17 @@ AIR302 [*] `airflow.operators.check_operator.ThresholdCheckOperator` is moved in
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | 
-59 59 | from airflow.operators.check_operator import (
-60    |-    SQLThresholdCheckOperator,
-61 60 |     ThresholdCheckOperator,
-62 61 | )
-   62 |+from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator
-63 63 | 
-64 64 | SQLThresholdCheckOperator()
-65 65 | ThresholdCheckOperator()
+57 | 
+58 | 
+59 | from airflow.operators.check_operator import (
+   -     SQLThresholdCheckOperator,
+60 |     ThresholdCheckOperator,
+61 | )
+62 + from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator
+63 | 
+64 | SQLThresholdCheckOperator()
+65 | ThresholdCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.SQLThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:70:1
@@ -365,16 +348,15 @@ AIR302 [*] `airflow.operators.sql.SQLThresholdCheckOperator` is moved into `comm
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-65 65 | ThresholdCheckOperator()
-66 66 | 
-67 67 | 
-68    |-from airflow.operators.sql import SQLThresholdCheckOperator
-   68 |+from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator
-69 69 | 
-70 70 | SQLThresholdCheckOperator()
-71 71 | 
+65 | ThresholdCheckOperator()
+66 | 
+67 | 
+   - from airflow.operators.sql import SQLThresholdCheckOperator
+68 + from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator
+69 | 
+70 | SQLThresholdCheckOperator()
+71 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.SQLValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:78:1
@@ -386,18 +368,17 @@ AIR302 [*] `airflow.operators.check_operator.SQLValueCheckOperator` is moved int
 79 | ValueCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-71 71 | 
-72 72 | 
-73 73 | from airflow.operators.check_operator import (
-74    |-    SQLValueCheckOperator,
-75 74 |     ValueCheckOperator,
-76 75 | )
-   76 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
-77 77 | 
-78 78 | SQLValueCheckOperator()
-79 79 | ValueCheckOperator()
+71 | 
+72 | 
+73 | from airflow.operators.check_operator import (
+   -     SQLValueCheckOperator,
+74 |     ValueCheckOperator,
+75 | )
+76 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
+77 | 
+78 | SQLValueCheckOperator()
+79 | ValueCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.check_operator.ValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:79:1
@@ -407,18 +388,17 @@ AIR302 [*] `airflow.operators.check_operator.ValueCheckOperator` is moved into `
    | ^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-71 71 | 
-72 72 | 
-73 73 | from airflow.operators.check_operator import (
-74    |-    SQLValueCheckOperator,
-75 74 |     ValueCheckOperator,
-76 75 | )
-   76 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
-77 77 | 
-78 78 | SQLValueCheckOperator()
-79 79 | ValueCheckOperator()
+71 | 
+72 | 
+73 | from airflow.operators.check_operator import (
+   -     SQLValueCheckOperator,
+74 |     ValueCheckOperator,
+75 | )
+76 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
+77 | 
+78 | SQLValueCheckOperator()
+79 | ValueCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.SQLValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:88:1
@@ -431,16 +411,15 @@ AIR302 [*] `airflow.operators.sql.SQLValueCheckOperator` is moved into `common-s
 90 | PrestoValueCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-83 83 |     PrestoValueCheckOperator,
-84 84 |     ValueCheckOperator,
-85 85 | )
-86    |-from airflow.operators.sql import SQLValueCheckOperator
-   86 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
-87 87 | 
-88 88 | SQLValueCheckOperator()
-89 89 | ValueCheckOperator()
+83 |     PrestoValueCheckOperator,
+84 |     ValueCheckOperator,
+85 | )
+   - from airflow.operators.sql import SQLValueCheckOperator
+86 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
+87 | 
+88 | SQLValueCheckOperator()
+89 | ValueCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_check_operator.ValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:89:1
@@ -451,15 +430,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.ValueCheckOperator` is moved
 90 | PrestoValueCheckOperator()
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-84 84 |     ValueCheckOperator,
-85 85 | )
-86 86 | from airflow.operators.sql import SQLValueCheckOperator
-   87 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
-87 88 | 
-88 89 | SQLValueCheckOperator()
-89 90 | ValueCheckOperator()
+84 |     ValueCheckOperator,
+85 | )
+86 | from airflow.operators.sql import SQLValueCheckOperator
+87 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
+88 | 
+89 | SQLValueCheckOperator()
+90 | ValueCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_check_operator.PrestoValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   --> AIR302_common_sql.py:90:1
@@ -470,15 +448,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.PrestoValueCheckOperator` is
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-84 84 |     ValueCheckOperator,
-85 85 | )
-86 86 | from airflow.operators.sql import SQLValueCheckOperator
-   87 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
-87 88 | 
-88 89 | SQLValueCheckOperator()
-89 90 | ValueCheckOperator()
+84 |     ValueCheckOperator,
+85 | )
+86 | from airflow.operators.sql import SQLValueCheckOperator
+87 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator
+88 | 
+89 | SQLValueCheckOperator()
+90 | ValueCheckOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.BaseSQLOperator` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:102:1
@@ -491,22 +468,21 @@ AIR302 [*] `airflow.operators.sql.BaseSQLOperator` is moved into `common-sql` pr
 104 | SQLTableCheckOperator()
     |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `BaseSQLOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-91  91  | 
-92  92  | 
-93  93  | from airflow.operators.sql import (
-94      |-    BaseSQLOperator,
-95  94  |     BranchSQLOperator,
-96  95  |     SQLColumnCheckOperator,
-97  96  |     SQLTableCheckOperator,
-98  97  |     _convert_to_float_if_possible,
-99  98  |     parse_boolean,
-100 99  | )
-    100 |+from airflow.providers.common.sql.operators.sql import BaseSQLOperator
-101 101 | 
-102 102 | BaseSQLOperator()
-103 103 | BranchSQLOperator()
+91  | 
+92  | 
+93  | from airflow.operators.sql import (
+    -     BaseSQLOperator,
+94  |     BranchSQLOperator,
+95  |     SQLColumnCheckOperator,
+96  |     SQLTableCheckOperator,
+97  |     _convert_to_float_if_possible,
+98  |     parse_boolean,
+99  | )
+100 + from airflow.providers.common.sql.operators.sql import BaseSQLOperator
+101 | 
+102 | BaseSQLOperator()
+103 | BranchSQLOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.BranchSQLOperator` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:103:1
@@ -518,21 +494,20 @@ AIR302 [*] `airflow.operators.sql.BranchSQLOperator` is moved into `common-sql`
 105 | SQLColumnCheckOperator()
     |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `BranchSQLOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-92  92  | 
-93  93  | from airflow.operators.sql import (
-94  94  |     BaseSQLOperator,
-95      |-    BranchSQLOperator,
-96  95  |     SQLColumnCheckOperator,
-97  96  |     SQLTableCheckOperator,
-98  97  |     _convert_to_float_if_possible,
-99  98  |     parse_boolean,
-100 99  | )
-    100 |+from airflow.providers.common.sql.operators.sql import BranchSQLOperator
-101 101 | 
-102 102 | BaseSQLOperator()
-103 103 | BranchSQLOperator()
+92  | 
+93  | from airflow.operators.sql import (
+94  |     BaseSQLOperator,
+    -     BranchSQLOperator,
+95  |     SQLColumnCheckOperator,
+96  |     SQLTableCheckOperator,
+97  |     _convert_to_float_if_possible,
+98  |     parse_boolean,
+99  | )
+100 + from airflow.providers.common.sql.operators.sql import BranchSQLOperator
+101 | 
+102 | BaseSQLOperator()
+103 | BranchSQLOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.SQLTableCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:104:1
@@ -545,19 +520,18 @@ AIR302 [*] `airflow.operators.sql.SQLTableCheckOperator` is moved into `common-s
 106 | _convert_to_float_if_possible()
     |
 help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLTableCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-94  94  |     BaseSQLOperator,
-95  95  |     BranchSQLOperator,
-96  96  |     SQLColumnCheckOperator,
-97      |-    SQLTableCheckOperator,
-98  97  |     _convert_to_float_if_possible,
-99  98  |     parse_boolean,
-100 99  | )
-    100 |+from airflow.providers.common.sql.operators.sql import SQLTableCheckOperator
-101 101 | 
-102 102 | BaseSQLOperator()
-103 103 | BranchSQLOperator()
+94  |     BaseSQLOperator,
+95  |     BranchSQLOperator,
+96  |     SQLColumnCheckOperator,
+    -     SQLTableCheckOperator,
+97  |     _convert_to_float_if_possible,
+98  |     parse_boolean,
+99  | )
+100 + from airflow.providers.common.sql.operators.sql import SQLTableCheckOperator
+101 | 
+102 | BaseSQLOperator()
+103 | BranchSQLOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.SQLColumnCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:105:1
@@ -570,20 +544,19 @@ AIR302 [*] `airflow.operators.sql.SQLColumnCheckOperator` is moved into `common-
 107 | parse_boolean()
     |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SQLColumnCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-93  93  | from airflow.operators.sql import (
-94  94  |     BaseSQLOperator,
-95  95  |     BranchSQLOperator,
-96      |-    SQLColumnCheckOperator,
-97  96  |     SQLTableCheckOperator,
-98  97  |     _convert_to_float_if_possible,
-99  98  |     parse_boolean,
-100 99  | )
-    100 |+from airflow.providers.common.sql.operators.sql import SQLColumnCheckOperator
-101 101 | 
-102 102 | BaseSQLOperator()
-103 103 | BranchSQLOperator()
+93  | from airflow.operators.sql import (
+94  |     BaseSQLOperator,
+95  |     BranchSQLOperator,
+    -     SQLColumnCheckOperator,
+96  |     SQLTableCheckOperator,
+97  |     _convert_to_float_if_possible,
+98  |     parse_boolean,
+99  | )
+100 + from airflow.providers.common.sql.operators.sql import SQLColumnCheckOperator
+101 | 
+102 | BaseSQLOperator()
+103 | BranchSQLOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql._convert_to_float_if_possible` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:106:1
@@ -595,18 +568,17 @@ AIR302 [*] `airflow.operators.sql._convert_to_float_if_possible` is moved into `
 107 | parse_boolean()
     |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `_convert_to_float_if_possible` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-95  95  |     BranchSQLOperator,
-96  96  |     SQLColumnCheckOperator,
-97  97  |     SQLTableCheckOperator,
-98      |-    _convert_to_float_if_possible,
-99  98  |     parse_boolean,
-100 99  | )
-    100 |+from airflow.providers.common.sql.operators.sql import _convert_to_float_if_possible
-101 101 | 
-102 102 | BaseSQLOperator()
-103 103 | BranchSQLOperator()
+95  |     BranchSQLOperator,
+96  |     SQLColumnCheckOperator,
+97  |     SQLTableCheckOperator,
+    -     _convert_to_float_if_possible,
+98  |     parse_boolean,
+99  | )
+100 + from airflow.providers.common.sql.operators.sql import _convert_to_float_if_possible
+101 | 
+102 | BaseSQLOperator()
+103 | BranchSQLOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.sql.parse_boolean` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:107:1
@@ -617,17 +589,16 @@ AIR302 [*] `airflow.operators.sql.parse_boolean` is moved into `common-sql` prov
     | ^^^^^^^^^^^^^
     |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `parse_boolean` from `airflow.providers.common.sql.operators.sql` instead.
-
-ℹ Unsafe fix
-96  96  |     SQLColumnCheckOperator,
-97  97  |     SQLTableCheckOperator,
-98  98  |     _convert_to_float_if_possible,
-99      |-    parse_boolean,
-100 99  | )
-    100 |+from airflow.providers.common.sql.operators.sql import parse_boolean
-101 101 | 
-102 102 | BaseSQLOperator()
-103 103 | BranchSQLOperator()
+96  |     SQLColumnCheckOperator,
+97  |     SQLTableCheckOperator,
+98  |     _convert_to_float_if_possible,
+    -     parse_boolean,
+99  | )
+100 + from airflow.providers.common.sql.operators.sql import parse_boolean
+101 | 
+102 | BaseSQLOperator()
+103 | BranchSQLOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.sql.SqlSensor` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:112:1
@@ -638,16 +609,15 @@ AIR302 [*] `airflow.sensors.sql.SqlSensor` is moved into `common-sql` provider i
     | ^^^^^^^^^
     |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SqlSensor` from `airflow.providers.common.sql.sensors.sql` instead.
-
-ℹ Unsafe fix
-107 107 | parse_boolean()
-108 108 | 
-109 109 | 
-110     |-from airflow.sensors.sql import SqlSensor
-    110 |+from airflow.providers.common.sql.sensors.sql import SqlSensor
-111 111 | 
-112 112 | SqlSensor()
-113 113 | 
+107 | parse_boolean()
+108 | 
+109 | 
+    - from airflow.sensors.sql import SqlSensor
+110 + from airflow.providers.common.sql.sensors.sql import SqlSensor
+111 | 
+112 | SqlSensor()
+113 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.sql_sensor.SqlSensor` is moved into `common-sql` provider in Airflow 3.0;
    --> AIR302_common_sql.py:117:1
@@ -658,13 +628,12 @@ AIR302 [*] `airflow.sensors.sql_sensor.SqlSensor` is moved into `common-sql` pro
     | ^^^^^^^^^
     |
 help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SqlSensor` from `airflow.providers.common.sql.sensors.sql` instead.
-
-ℹ Unsafe fix
-112 112 | SqlSensor()
-113 113 | 
-114 114 | 
-115     |-from airflow.sensors.sql_sensor import SqlSensor
-    115 |+from airflow.providers.common.sql.sensors.sql import SqlSensor
-116 116 | 
-117 117 | SqlSensor()
-118 118 |
+112 | SqlSensor()
+113 | 
+114 | 
+    - from airflow.sensors.sql_sensor import SqlSensor
+115 + from airflow.providers.common.sql.sensors.sql import SqlSensor
+116 | 
+117 | SqlSensor()
+118 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap
index 2c066e1f07..3adb95a02a 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.executors.dask_executor.DaskExecutor` is moved into `daskexe
   | ^^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-daskexecutor>=1.0.0` and use `DaskExecutor` from `airflow.providers.daskexecutor.executors.dask_executor` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.executors.dask_executor import DaskExecutor
-  3 |+from airflow.providers.daskexecutor.executors.dask_executor import DaskExecutor
-4 4 | 
-5 5 | DaskExecutor()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.executors.dask_executor import DaskExecutor
+3 + from airflow.providers.daskexecutor.executors.dask_executor import DaskExecutor
+4 | 
+5 | DaskExecutor()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap
index 16512766a5..347cbde113 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap
@@ -11,22 +11,21 @@ AIR302 [*] `airflow.hooks.druid_hook.DruidDbApiHook` is moved into `apache-druid
 13 | DruidHook()
    |
 help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `DruidDbApiHook` from `airflow.providers.apache.druid.hooks.druid` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3  3  | from airflow.hooks.druid_hook import (
-4     |-    DruidDbApiHook,
-5  4  |     DruidHook,
-6  5  | )
-7  6  | from airflow.operators.hive_to_druid import (
-8  7  |     HiveToDruidOperator,
-9  8  |     HiveToDruidTransfer,
-10 9  | )
-   10 |+from airflow.providers.apache.druid.hooks.druid import DruidDbApiHook
-11 11 | 
-12 12 | DruidDbApiHook()
-13 13 | DruidHook()
+1  | from __future__ import annotations
+2  | 
+3  | from airflow.hooks.druid_hook import (
+   -     DruidDbApiHook,
+4  |     DruidHook,
+5  | )
+6  | from airflow.operators.hive_to_druid import (
+7  |     HiveToDruidOperator,
+8  |     HiveToDruidTransfer,
+9  | )
+10 + from airflow.providers.apache.druid.hooks.druid import DruidDbApiHook
+11 | 
+12 | DruidDbApiHook()
+13 | DruidHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.druid_hook.DruidHook` is moved into `apache-druid` provider in Airflow 3.0;
   --> AIR302_druid.py:13:1
@@ -38,21 +37,20 @@ AIR302 [*] `airflow.hooks.druid_hook.DruidHook` is moved into `apache-druid` pro
 15 | HiveToDruidOperator()
    |
 help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `DruidHook` from `airflow.providers.apache.druid.hooks.druid` instead.
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from airflow.hooks.druid_hook import (
-4  4  |     DruidDbApiHook,
-5     |-    DruidHook,
-6  5  | )
-7  6  | from airflow.operators.hive_to_druid import (
-8  7  |     HiveToDruidOperator,
-9  8  |     HiveToDruidTransfer,
-10 9  | )
-   10 |+from airflow.providers.apache.druid.hooks.druid import DruidHook
-11 11 | 
-12 12 | DruidDbApiHook()
-13 13 | DruidHook()
+2  | 
+3  | from airflow.hooks.druid_hook import (
+4  |     DruidDbApiHook,
+   -     DruidHook,
+5  | )
+6  | from airflow.operators.hive_to_druid import (
+7  |     HiveToDruidOperator,
+8  |     HiveToDruidTransfer,
+9  | )
+10 + from airflow.providers.apache.druid.hooks.druid import DruidHook
+11 | 
+12 | DruidDbApiHook()
+13 | DruidHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidOperator` is moved into `apache-druid` provider in Airflow 3.0;
   --> AIR302_druid.py:15:1
@@ -64,18 +62,17 @@ AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidOperator` is moved into `
 16 | HiveToDruidTransfer()
    |
 help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `HiveToDruidOperator` from `airflow.providers.apache.druid.transfers.hive_to_druid` instead.
-
-ℹ Unsafe fix
-5  5  |     DruidHook,
-6  6  | )
-7  7  | from airflow.operators.hive_to_druid import (
-8     |-    HiveToDruidOperator,
-9  8  |     HiveToDruidTransfer,
-10 9  | )
-   10 |+from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator
-11 11 | 
-12 12 | DruidDbApiHook()
-13 13 | DruidHook()
+5  |     DruidHook,
+6  | )
+7  | from airflow.operators.hive_to_druid import (
+   -     HiveToDruidOperator,
+8  |     HiveToDruidTransfer,
+9  | )
+10 + from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator
+11 | 
+12 | DruidDbApiHook()
+13 | DruidHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidTransfer` is moved into `apache-druid` provider in Airflow 3.0;
   --> AIR302_druid.py:16:1
@@ -85,15 +82,14 @@ AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidTransfer` is moved into `
    | ^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `HiveToDruidOperator` from `airflow.providers.apache.druid.transfers.hive_to_druid` instead.
-
-ℹ Unsafe fix
-5  5  |     DruidHook,
-6  6  | )
-7  7  | from airflow.operators.hive_to_druid import (
-8     |-    HiveToDruidOperator,
-9  8  |     HiveToDruidTransfer,
-10 9  | )
-   10 |+from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator
-11 11 | 
-12 12 | DruidDbApiHook()
-13 13 | DruidHook()
+5  |     DruidHook,
+6  | )
+7  | from airflow.operators.hive_to_druid import (
+   -     HiveToDruidOperator,
+8  |     HiveToDruidTransfer,
+9  | )
+10 + from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator
+11 | 
+12 | DruidDbApiHook()
+13 | DruidHook()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap
index 96eaaef6f0..72eef3f204 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap
@@ -12,20 +12,19 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.CLIENT_AUTH` is moved into `fab`
 12 | auth_current_user()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.api.auth.backend.basic_auth import (
-4   |-    CLIENT_AUTH,
-5 4 |     auth_current_user,
-6 5 |     init_app,
-7 6 |     requires_authentication,
-8 7 | )
-  8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import CLIENT_AUTH
-9 9 | 
-10 10 | CLIENT_AUTH
-11 11 | init_app()
+1  | from __future__ import annotations
+2  | 
+3  | from airflow.api.auth.backend.basic_auth import (
+   -     CLIENT_AUTH,
+4  |     auth_current_user,
+5  |     init_app,
+6  |     requires_authentication,
+7  | )
+8  + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import CLIENT_AUTH
+9  | 
+10 | CLIENT_AUTH
+11 | init_app()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.basic_auth.init_app` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:11:1
@@ -37,18 +36,17 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.init_app` is moved into `fab` pr
 13 | requires_authentication()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
-
-ℹ Unsafe fix
-3 3 | from airflow.api.auth.backend.basic_auth import (
-4 4 |     CLIENT_AUTH,
-5 5 |     auth_current_user,
-6   |-    init_app,
-7 6 |     requires_authentication,
-8 7 | )
-  8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import init_app
-9 9 | 
-10 10 | CLIENT_AUTH
-11 11 | init_app()
+3  | from airflow.api.auth.backend.basic_auth import (
+4  |     CLIENT_AUTH,
+5  |     auth_current_user,
+   -     init_app,
+6  |     requires_authentication,
+7  | )
+8  + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import init_app
+9  | 
+10 | CLIENT_AUTH
+11 | init_app()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.basic_auth.auth_current_user` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:12:1
@@ -60,19 +58,18 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.auth_current_user` is moved into
 13 | requires_authentication()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `auth_current_user` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.api.auth.backend.basic_auth import (
-4 4 |     CLIENT_AUTH,
-5   |-    auth_current_user,
-6 5 |     init_app,
-7 6 |     requires_authentication,
-8 7 | )
-  8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import auth_current_user
-9 9 | 
-10 10 | CLIENT_AUTH
-11 11 | init_app()
+2  | 
+3  | from airflow.api.auth.backend.basic_auth import (
+4  |     CLIENT_AUTH,
+   -     auth_current_user,
+5  |     init_app,
+6  |     requires_authentication,
+7  | )
+8  + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import auth_current_user
+9  | 
+10 | CLIENT_AUTH
+11 | init_app()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.basic_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:13:1
@@ -85,17 +82,16 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.requires_authentication` is move
 15 | from airflow.api.auth.backend.kerberos_auth import (
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
-
-ℹ Unsafe fix
-4 4 |     CLIENT_AUTH,
-5 5 |     auth_current_user,
-6 6 |     init_app,
-7   |-    requires_authentication,
-8 7 | )
-  8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import requires_authentication
-9 9 | 
-10 10 | CLIENT_AUTH
-11 11 | init_app()
+4  |     CLIENT_AUTH,
+5  |     auth_current_user,
+6  |     init_app,
+   -     requires_authentication,
+7  | )
+8  + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import requires_authentication
+9  | 
+10 | CLIENT_AUTH
+11 | init_app()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.kerberos_auth.log` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:23:1
@@ -108,18 +104,17 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.log` is moved into `fab` prov
 25 | find_user()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `log` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-16 16 |     CLIENT_AUTH,
-17 17 |     find_user,
-18 18 |     init_app,
-19    |-    log,
-20 19 |     requires_authentication,
-21 20 | )
-   21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log
-22 22 | 
-23 23 | log()
-24 24 | CLIENT_AUTH
+16 |     CLIENT_AUTH,
+17 |     find_user,
+18 |     init_app,
+   -     log,
+19 |     requires_authentication,
+20 | )
+21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log
+22 | 
+23 | log()
+24 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:24:1
@@ -131,21 +126,20 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `f
 26 | init_app()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-13 13 | requires_authentication()
-14 14 | 
-15 15 | from airflow.api.auth.backend.kerberos_auth import (
-16    |-    CLIENT_AUTH,
-17 16 |     find_user,
-18 17 |     init_app,
-19 18 |     log,
-20 19 |     requires_authentication,
-21 20 | )
-   21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH
-22 22 | 
-23 23 | log()
-24 24 | CLIENT_AUTH
+13 | requires_authentication()
+14 | 
+15 | from airflow.api.auth.backend.kerberos_auth import (
+   -     CLIENT_AUTH,
+16 |     find_user,
+17 |     init_app,
+18 |     log,
+19 |     requires_authentication,
+20 | )
+21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH
+22 | 
+23 | log()
+24 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.kerberos_auth.find_user` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:25:1
@@ -158,20 +152,19 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.find_user` is moved into `fab
 27 | requires_authentication()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `find_user` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | from airflow.api.auth.backend.kerberos_auth import (
-16 16 |     CLIENT_AUTH,
-17    |-    find_user,
-18 17 |     init_app,
-19 18 |     log,
-20 19 |     requires_authentication,
-21 20 | )
-   21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user
-22 22 | 
-23 23 | log()
-24 24 | CLIENT_AUTH
+14 | 
+15 | from airflow.api.auth.backend.kerberos_auth import (
+16 |     CLIENT_AUTH,
+   -     find_user,
+17 |     init_app,
+18 |     log,
+19 |     requires_authentication,
+20 | )
+21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user
+22 | 
+23 | log()
+24 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.kerberos_auth.init_app` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:26:1
@@ -183,19 +176,18 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.init_app` is moved into `fab`
 27 | requires_authentication()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-15 15 | from airflow.api.auth.backend.kerberos_auth import (
-16 16 |     CLIENT_AUTH,
-17 17 |     find_user,
-18    |-    init_app,
-19 18 |     log,
-20 19 |     requires_authentication,
-21 20 | )
-   21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app
-22 22 | 
-23 23 | log()
-24 24 | CLIENT_AUTH
+15 | from airflow.api.auth.backend.kerberos_auth import (
+16 |     CLIENT_AUTH,
+17 |     find_user,
+   -     init_app,
+18 |     log,
+19 |     requires_authentication,
+20 | )
+21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app
+22 | 
+23 | log()
+24 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.api.auth.backend.kerberos_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:27:1
@@ -208,17 +200,16 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.requires_authentication` is m
 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-17 17 |     find_user,
-18 18 |     init_app,
-19 19 |     log,
-20    |-    requires_authentication,
-21 20 | )
-   21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication
-22 22 | 
-23 23 | log()
-24 24 | CLIENT_AUTH
+17 |     find_user,
+18 |     init_app,
+19 |     log,
+   -     requires_authentication,
+20 | )
+21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication
+22 | 
+23 | log()
+24 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.log` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:37:1
@@ -231,18 +222,17 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.log` is mov
 39 | find_user()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `log` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-30 30 |     CLIENT_AUTH,
-31 31 |     find_user,
-32 32 |     init_app,
-33    |-    log,
-34 33 |     requires_authentication,
-35 34 | )
-   35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log
-36 36 | 
-37 37 | log()
-38 38 | CLIENT_AUTH
+30 |     CLIENT_AUTH,
+31 |     find_user,
+32 |     init_app,
+   -     log,
+33 |     requires_authentication,
+34 | )
+35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log
+36 | 
+37 | log()
+38 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:38:1
@@ -254,21 +244,20 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.CLIENT_AUTH
 40 | init_app()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-27 27 | requires_authentication()
-28 28 | 
-29 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
-30    |-    CLIENT_AUTH,
-31 30 |     find_user,
-32 31 |     init_app,
-33 32 |     log,
-34 33 |     requires_authentication,
-35 34 | )
-   35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH
-36 36 | 
-37 37 | log()
-38 38 | CLIENT_AUTH
+27 | requires_authentication()
+28 | 
+29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
+   -     CLIENT_AUTH,
+30 |     find_user,
+31 |     init_app,
+32 |     log,
+33 |     requires_authentication,
+34 | )
+35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH
+36 | 
+37 | log()
+38 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.find_user` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:39:1
@@ -281,20 +270,19 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.find_user`
 41 | requires_authentication()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `find_user` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
-30 30 |     CLIENT_AUTH,
-31    |-    find_user,
-32 31 |     init_app,
-33 32 |     log,
-34 33 |     requires_authentication,
-35 34 | )
-   35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user
-36 36 | 
-37 37 | log()
-38 38 | CLIENT_AUTH
+28 | 
+29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
+30 |     CLIENT_AUTH,
+   -     find_user,
+31 |     init_app,
+32 |     log,
+33 |     requires_authentication,
+34 | )
+35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user
+36 | 
+37 | log()
+38 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.init_app` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:40:1
@@ -306,19 +294,18 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.init_app` i
 41 | requires_authentication()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-29 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
-30 30 |     CLIENT_AUTH,
-31 31 |     find_user,
-32    |-    init_app,
-33 32 |     log,
-34 33 |     requires_authentication,
-35 34 | )
-   35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app
-36 36 | 
-37 37 | log()
-38 38 | CLIENT_AUTH
+29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
+30 |     CLIENT_AUTH,
+31 |     find_user,
+   -     init_app,
+32 |     log,
+33 |     requires_authentication,
+34 | )
+35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app
+36 | 
+37 | log()
+38 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:41:1
@@ -331,17 +318,16 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.requires_au
 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
-
-ℹ Unsafe fix
-31 31 |     find_user,
-32 32 |     init_app,
-33 33 |     log,
-34    |-    requires_authentication,
-35 34 | )
-   35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication
-36 36 | 
-37 37 | log()
-38 38 | CLIENT_AUTH
+31 |     find_user,
+32 |     init_app,
+33 |     log,
+   -     requires_authentication,
+34 | )
+35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication
+36 | 
+37 | log()
+38 | CLIENT_AUTH
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.fab_auth_manager.FabAuthManager` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:49:1
@@ -354,20 +340,19 @@ AIR302 [*] `airflow.auth.managers.fab.fab_auth_manager.FabAuthManager` is moved
 51 | FabAirflowSecurityManagerOverride()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAuthManager` from `airflow.providers.fab.auth_manager.fab_auth_manager` instead.
-
-ℹ Unsafe fix
-40 40 | init_app()
-41 41 | requires_authentication()
-42 42 | 
-43    |-from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
-44 43 | from airflow.auth.managers.fab.security_manager.override import (
-45 44 |     MAX_NUM_DATABASE_USER_SESSIONS,
-46 45 |     FabAirflowSecurityManagerOverride,
-47 46 | )
-   47 |+from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager
-48 48 | 
-49 49 | FabAuthManager()
-50 50 | MAX_NUM_DATABASE_USER_SESSIONS
+40 | init_app()
+41 | requires_authentication()
+42 | 
+   - from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
+43 | from airflow.auth.managers.fab.security_manager.override import (
+44 |     MAX_NUM_DATABASE_USER_SESSIONS,
+45 |     FabAirflowSecurityManagerOverride,
+46 | )
+47 + from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager
+48 | 
+49 | FabAuthManager()
+50 | MAX_NUM_DATABASE_USER_SESSIONS
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.security_manager.override.MAX_NUM_DATABASE_USER_SESSIONS` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:50:1
@@ -378,18 +363,17 @@ AIR302 [*] `airflow.auth.managers.fab.security_manager.override.MAX_NUM_DATABASE
 51 | FabAirflowSecurityManagerOverride()
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `MAX_NUM_DATABASE_USER_SESSIONS` from `airflow.providers.fab.auth_manager.security_manager.override` instead.
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
-44 44 | from airflow.auth.managers.fab.security_manager.override import (
-45    |-    MAX_NUM_DATABASE_USER_SESSIONS,
-46 45 |     FabAirflowSecurityManagerOverride,
-47 46 | )
-   47 |+from airflow.providers.fab.auth_manager.security_manager.override import MAX_NUM_DATABASE_USER_SESSIONS
-48 48 | 
-49 49 | FabAuthManager()
-50 50 | MAX_NUM_DATABASE_USER_SESSIONS
+42 | 
+43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
+44 | from airflow.auth.managers.fab.security_manager.override import (
+   -     MAX_NUM_DATABASE_USER_SESSIONS,
+45 |     FabAirflowSecurityManagerOverride,
+46 | )
+47 + from airflow.providers.fab.auth_manager.security_manager.override import MAX_NUM_DATABASE_USER_SESSIONS
+48 | 
+49 | FabAuthManager()
+50 | MAX_NUM_DATABASE_USER_SESSIONS
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.auth.managers.fab.security_manager.override.FabAirflowSecurityManagerOverride` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:51:1
@@ -402,17 +386,16 @@ AIR302 [*] `airflow.auth.managers.fab.security_manager.override.FabAirflowSecuri
 53 | from airflow.www.security import FabAirflowSecurityManagerOverride
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAirflowSecurityManagerOverride` from `airflow.providers.fab.auth_manager.security_manager.override` instead.
-
-ℹ Unsafe fix
-43 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
-44 44 | from airflow.auth.managers.fab.security_manager.override import (
-45 45 |     MAX_NUM_DATABASE_USER_SESSIONS,
-46    |-    FabAirflowSecurityManagerOverride,
-47 46 | )
-   47 |+from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
-48 48 | 
-49 49 | FabAuthManager()
-50 50 | MAX_NUM_DATABASE_USER_SESSIONS
+43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
+44 | from airflow.auth.managers.fab.security_manager.override import (
+45 |     MAX_NUM_DATABASE_USER_SESSIONS,
+   -     FabAirflowSecurityManagerOverride,
+46 | )
+47 + from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
+48 | 
+49 | FabAuthManager()
+50 | MAX_NUM_DATABASE_USER_SESSIONS
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.www.security.FabAirflowSecurityManagerOverride` is moved into `fab` provider in Airflow 3.0;
   --> AIR302_fab.py:55:1
@@ -423,12 +406,11 @@ AIR302 [*] `airflow.www.security.FabAirflowSecurityManagerOverride` is moved int
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAirflowSecurityManagerOverride` from `airflow.providers.fab.auth_manager.security_manager.override` instead.
-
-ℹ Unsafe fix
-50 50 | MAX_NUM_DATABASE_USER_SESSIONS
-51 51 | FabAirflowSecurityManagerOverride()
-52 52 | 
-53    |-from airflow.www.security import FabAirflowSecurityManagerOverride
-   53 |+from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
-54 54 | 
-55 55 | FabAirflowSecurityManagerOverride()
+50 | MAX_NUM_DATABASE_USER_SESSIONS
+51 | FabAirflowSecurityManagerOverride()
+52 | 
+   - from airflow.www.security import FabAirflowSecurityManagerOverride
+53 + from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
+54 | 
+55 | FabAirflowSecurityManagerOverride()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap
index ad7950f7e3..e2e1b7cff2 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap
@@ -11,16 +11,15 @@ AIR302 [*] `airflow.hooks.webhdfs_hook.WebHDFSHook` is moved into `apache-hdfs`
 7 | WebHdfsSensor()
   |
 help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `WebHDFSHook` from `airflow.providers.apache.hdfs.hooks.webhdfs` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.webhdfs_hook import WebHDFSHook
-4 3 | from airflow.sensors.web_hdfs_sensor import WebHdfsSensor
-  4 |+from airflow.providers.apache.hdfs.hooks.webhdfs import WebHDFSHook
-5 5 | 
-6 6 | WebHDFSHook()
-7 7 | WebHdfsSensor()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.webhdfs_hook import WebHDFSHook
+3 | from airflow.sensors.web_hdfs_sensor import WebHdfsSensor
+4 + from airflow.providers.apache.hdfs.hooks.webhdfs import WebHDFSHook
+5 | 
+6 | WebHDFSHook()
+7 | WebHdfsSensor()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.web_hdfs_sensor.WebHdfsSensor` is moved into `apache-hdfs` provider in Airflow 3.0;
  --> AIR302_hdfs.py:7:1
@@ -30,13 +29,12 @@ AIR302 [*] `airflow.sensors.web_hdfs_sensor.WebHdfsSensor` is moved into `apache
   | ^^^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `WebHdfsSensor` from `airflow.providers.apache.hdfs.sensors.web_hdfs` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.hooks.webhdfs_hook import WebHDFSHook
-4   |-from airflow.sensors.web_hdfs_sensor import WebHdfsSensor
-  4 |+from airflow.providers.apache.hdfs.sensors.web_hdfs import WebHdfsSensor
-5 5 | 
-6 6 | WebHDFSHook()
-7 7 | WebHdfsSensor()
+1 | from __future__ import annotations
+2 | 
+3 | from airflow.hooks.webhdfs_hook import WebHDFSHook
+  - from airflow.sensors.web_hdfs_sensor import WebHdfsSensor
+4 + from airflow.providers.apache.hdfs.sensors.web_hdfs import WebHdfsSensor
+5 | 
+6 | WebHDFSHook()
+7 | WebHdfsSensor()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap
index 9783310e59..088c40c560 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap
@@ -12,23 +12,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HIVE_QUEUE_PRIORITIES` is moved into `apach
 20 | HiveMetastoreHook()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HIVE_QUEUE_PRIORITIES` from `airflow.providers.apache.hive.hooks.hive` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3  3  | from airflow.hooks.hive_hooks import (
-4     |-    HIVE_QUEUE_PRIORITIES,
-5  4  |     HiveCliHook,
-6  5  |     HiveMetastoreHook,
-7  6  |     HiveServer2Hook,
+1  | from __future__ import annotations
+2  | 
+3  | from airflow.hooks.hive_hooks import (
+   -     HIVE_QUEUE_PRIORITIES,
+4  |     HiveCliHook,
+5  |     HiveMetastoreHook,
+6  |     HiveServer2Hook,
 --------------------------------------------------------------------------------
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.hooks.hive import HIVE_QUEUE_PRIORITIES
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.hooks.hive import HIVE_QUEUE_PRIORITIES
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.hive_hooks.HiveCliHook` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:19:1
@@ -40,23 +39,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HiveCliHook` is moved into `apache-hive` pr
 21 | HiveServer2Hook()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveCliHook` from `airflow.providers.apache.hive.hooks.hive` instead.
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from airflow.hooks.hive_hooks import (
-4  4  |     HIVE_QUEUE_PRIORITIES,
-5     |-    HiveCliHook,
-6  5  |     HiveMetastoreHook,
-7  6  |     HiveServer2Hook,
-8  7  | )
+2  | 
+3  | from airflow.hooks.hive_hooks import (
+4  |     HIVE_QUEUE_PRIORITIES,
+   -     HiveCliHook,
+5  |     HiveMetastoreHook,
+6  |     HiveServer2Hook,
+7  | )
 --------------------------------------------------------------------------------
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.hooks.hive import HiveCliHook
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.hooks.hive import HiveCliHook
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.hive_hooks.HiveMetastoreHook` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:20:1
@@ -68,23 +66,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HiveMetastoreHook` is moved into `apache-hi
 21 | HiveServer2Hook()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveMetastoreHook` from `airflow.providers.apache.hive.hooks.hive` instead.
-
-ℹ Unsafe fix
-3  3  | from airflow.hooks.hive_hooks import (
-4  4  |     HIVE_QUEUE_PRIORITIES,
-5  5  |     HiveCliHook,
-6     |-    HiveMetastoreHook,
-7  6  |     HiveServer2Hook,
-8  7  | )
-9  8  | from airflow.macros.hive import (
+3  | from airflow.hooks.hive_hooks import (
+4  |     HIVE_QUEUE_PRIORITIES,
+5  |     HiveCliHook,
+   -     HiveMetastoreHook,
+6  |     HiveServer2Hook,
+7  | )
+8  | from airflow.macros.hive import (
 --------------------------------------------------------------------------------
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.hooks.hive import HiveMetastoreHook
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.hooks.hive import HiveMetastoreHook
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.hive_hooks.HiveServer2Hook` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:21:1
@@ -97,23 +94,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HiveServer2Hook` is moved into `apache-hive
 23 | closest_ds_partition()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveServer2Hook` from `airflow.providers.apache.hive.hooks.hive` instead.
-
-ℹ Unsafe fix
-4  4  |     HIVE_QUEUE_PRIORITIES,
-5  5  |     HiveCliHook,
-6  6  |     HiveMetastoreHook,
-7     |-    HiveServer2Hook,
-8  7  | )
-9  8  | from airflow.macros.hive import (
-10 9  |     closest_ds_partition,
+4  |     HIVE_QUEUE_PRIORITIES,
+5  |     HiveCliHook,
+6  |     HiveMetastoreHook,
+   -     HiveServer2Hook,
+7  | )
+8  | from airflow.macros.hive import (
+9  |     closest_ds_partition,
 --------------------------------------------------------------------------------
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.hooks.hive import HiveServer2Hook
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.hooks.hive import HiveServer2Hook
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.macros.hive.closest_ds_partition` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:23:1
@@ -125,22 +121,21 @@ AIR302 [*] `airflow.macros.hive.closest_ds_partition` is moved into `apache-hive
 24 | max_partition()
    |
 help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `closest_ds_partition` from `airflow.providers.apache.hive.macros.hive` instead.
-
-ℹ Unsafe fix
-7  7  |     HiveServer2Hook,
-8  8  | )
-9  9  | from airflow.macros.hive import (
-10    |-    closest_ds_partition,
-11 10 |     max_partition,
-12 11 | )
-13 12 | from airflow.operators.hive_operator import HiveOperator
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.macros.hive import closest_ds_partition
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+7  |     HiveServer2Hook,
+8  | )
+9  | from airflow.macros.hive import (
+   -     closest_ds_partition,
+10 |     max_partition,
+11 | )
+12 | from airflow.operators.hive_operator import HiveOperator
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.macros.hive import closest_ds_partition
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.macros.hive.max_partition` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:24:1
@@ -152,21 +147,20 @@ AIR302 [*] `airflow.macros.hive.max_partition` is moved into `apache-hive` provi
 26 | HiveOperator()
    |
 help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `max_partition` from `airflow.providers.apache.hive.macros.hive` instead.
-
-ℹ Unsafe fix
-8  8  | )
-9  9  | from airflow.macros.hive import (
-10 10 |     closest_ds_partition,
-11    |-    max_partition,
-12 11 | )
-13 12 | from airflow.operators.hive_operator import HiveOperator
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.macros.hive import max_partition
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+8  | )
+9  | from airflow.macros.hive import (
+10 |     closest_ds_partition,
+   -     max_partition,
+11 | )
+12 | from airflow.operators.hive_operator import HiveOperator
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.macros.hive import max_partition
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_operator.HiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:26:1
@@ -179,19 +173,18 @@ AIR302 [*] `airflow.operators.hive_operator.HiveOperator` is moved into `apache-
 28 | HiveToMySqlOperator()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveOperator` from `airflow.providers.apache.hive.operators.hive` instead.
-
-ℹ Unsafe fix
-10 10 |     closest_ds_partition,
-11 11 |     max_partition,
-12 12 | )
-13    |-from airflow.operators.hive_operator import HiveOperator
-14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.operators.hive import HiveOperator
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+10 |     closest_ds_partition,
+11 |     max_partition,
+12 | )
+   - from airflow.operators.hive_operator import HiveOperator
+13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.operators.hive import HiveOperator
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_stats_operator.HiveStatsCollectionOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:27:1
@@ -203,18 +196,17 @@ AIR302 [*] `airflow.operators.hive_stats_operator.HiveStatsCollectionOperator` i
 29 | HiveToSambaOperator()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveStatsCollectionOperator` from `airflow.providers.apache.hive.operators.hive_stats` instead.
-
-ℹ Unsafe fix
-11 11 |     max_partition,
-12 12 | )
-13 13 | from airflow.operators.hive_operator import HiveOperator
-14    |-from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.operators.hive_stats import HiveStatsCollectionOperator
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+11 |     max_partition,
+12 | )
+13 | from airflow.operators.hive_operator import HiveOperator
+   - from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.operators.hive_stats import HiveStatsCollectionOperator
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:28:1
@@ -226,17 +218,16 @@ AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlOperator` is moved into `
 29 | HiveToSambaOperator()
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToMySqlOperator` from `airflow.providers.apache.hive.transfers.hive_to_mysql` instead.
-
-ℹ Unsafe fix
-12 12 | )
-13 13 | from airflow.operators.hive_operator import HiveOperator
-14 14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15    |-from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+12 | )
+13 | from airflow.operators.hive_operator import HiveOperator
+14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+   - from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_to_samba_operator.HiveToSambaOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:29:1
@@ -247,16 +238,15 @@ AIR302 [*] `airflow.operators.hive_to_samba_operator.HiveToSambaOperator` is mov
    | ^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToSambaOperator` from `airflow.providers.apache.hive.transfers.hive_to_samba` instead.
-
-ℹ Unsafe fix
-13 13 | from airflow.operators.hive_operator import HiveOperator
-14 14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-15 15 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
-16    |-from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-   16 |+from airflow.providers.apache.hive.transfers.hive_to_samba import HiveToSambaOperator
-17 17 | 
-18 18 | HIVE_QUEUE_PRIORITIES
-19 19 | HiveCliHook()
+13 | from airflow.operators.hive_operator import HiveOperator
+14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
+15 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+   - from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
+16 + from airflow.providers.apache.hive.transfers.hive_to_samba import HiveToSambaOperator
+17 | 
+18 | HIVE_QUEUE_PRIORITIES
+19 | HiveCliHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:34:1
@@ -269,15 +259,14 @@ AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlTransfer` is moved into `
 36 | from airflow.operators.mysql_to_hive import MySqlToHiveOperator
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToMySqlOperator` from `airflow.providers.apache.hive.transfers.hive_to_mysql` instead.
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | 
-32 32 | from airflow.operators.hive_to_mysql import HiveToMySqlTransfer
-   33 |+from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator
-33 34 | 
-34 35 | HiveToMySqlTransfer()
-35 36 | 
+30 | 
+31 | 
+32 | from airflow.operators.hive_to_mysql import HiveToMySqlTransfer
+33 + from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator
+34 | 
+35 | HiveToMySqlTransfer()
+36 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:38:1
@@ -290,16 +279,15 @@ AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveOperator` is moved into `
 40 | from airflow.operators.mysql_to_hive import MySqlToHiveTransfer
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MySqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mysql_to_hive` instead.
-
-ℹ Unsafe fix
-33 33 | 
-34 34 | HiveToMySqlTransfer()
-35 35 | 
-36    |-from airflow.operators.mysql_to_hive import MySqlToHiveOperator
-   36 |+from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator
-37 37 | 
-38 38 | MySqlToHiveOperator()
-39 39 | 
+33 | 
+34 | HiveToMySqlTransfer()
+35 | 
+   - from airflow.operators.mysql_to_hive import MySqlToHiveOperator
+36 + from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator
+37 | 
+38 | MySqlToHiveOperator()
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:42:1
@@ -312,15 +300,14 @@ AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveTransfer` is moved into `
 44 | from airflow.operators.mssql_to_hive import MsSqlToHiveOperator
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MySqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mysql_to_hive` instead.
-
-ℹ Unsafe fix
-38 38 | MySqlToHiveOperator()
-39 39 | 
-40 40 | from airflow.operators.mysql_to_hive import MySqlToHiveTransfer
-   41 |+from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator
-41 42 | 
-42 43 | MySqlToHiveTransfer()
-43 44 | 
+38 | MySqlToHiveOperator()
+39 | 
+40 | from airflow.operators.mysql_to_hive import MySqlToHiveTransfer
+41 + from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator
+42 | 
+43 | MySqlToHiveTransfer()
+44 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:46:1
@@ -333,16 +320,15 @@ AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveOperator` is moved into `
 48 | from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MsSqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mssql_to_hive` instead.
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | MySqlToHiveTransfer()
-43 43 | 
-44    |-from airflow.operators.mssql_to_hive import MsSqlToHiveOperator
-   44 |+from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator
-45 45 | 
-46 46 | MsSqlToHiveOperator()
-47 47 | 
+41 | 
+42 | MySqlToHiveTransfer()
+43 | 
+   - from airflow.operators.mssql_to_hive import MsSqlToHiveOperator
+44 + from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator
+45 | 
+46 | MsSqlToHiveOperator()
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:50:1
@@ -355,15 +341,14 @@ AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveTransfer` is moved into `
 52 | from airflow.operators.s3_to_hive_operator import S3ToHiveOperator
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MsSqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mssql_to_hive` instead.
-
-ℹ Unsafe fix
-46 46 | MsSqlToHiveOperator()
-47 47 | 
-48 48 | from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer
-   49 |+from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator
-49 50 | 
-50 51 | MsSqlToHiveTransfer()
-51 52 | 
+46 | MsSqlToHiveOperator()
+47 | 
+48 | from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer
+49 + from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator
+50 | 
+51 | MsSqlToHiveTransfer()
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:54:1
@@ -376,16 +361,15 @@ AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveOperator` is moved int
 56 | from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `S3ToHiveOperator` from `airflow.providers.apache.hive.transfers.s3_to_hive` instead.
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | MsSqlToHiveTransfer()
-51 51 | 
-52    |-from airflow.operators.s3_to_hive_operator import S3ToHiveOperator
-   52 |+from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator
-53 53 | 
-54 54 | S3ToHiveOperator()
-55 55 | 
+49 | 
+50 | MsSqlToHiveTransfer()
+51 | 
+   - from airflow.operators.s3_to_hive_operator import S3ToHiveOperator
+52 + from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator
+53 | 
+54 | S3ToHiveOperator()
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:58:1
@@ -398,15 +382,14 @@ AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveTransfer` is moved int
 60 | from airflow.sensors.hive_partition_sensor import HivePartitionSensor
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `S3ToHiveOperator` from `airflow.providers.apache.hive.transfers.s3_to_hive` instead.
-
-ℹ Unsafe fix
-54 54 | S3ToHiveOperator()
-55 55 | 
-56 56 | from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer
-   57 |+from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator
-57 58 | 
-58 59 | S3ToHiveTransfer()
-59 60 | 
+54 | S3ToHiveOperator()
+55 | 
+56 | from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer
+57 + from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator
+58 | 
+59 | S3ToHiveTransfer()
+60 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.hive_partition_sensor.HivePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:62:1
@@ -419,16 +402,15 @@ AIR302 [*] `airflow.sensors.hive_partition_sensor.HivePartitionSensor` is moved
 64 | from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HivePartitionSensor` from `airflow.providers.apache.hive.sensors.hive_partition` instead.
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | S3ToHiveTransfer()
-59 59 | 
-60    |-from airflow.sensors.hive_partition_sensor import HivePartitionSensor
-   60 |+from airflow.providers.apache.hive.sensors.hive_partition import HivePartitionSensor
-61 61 | 
-62 62 | HivePartitionSensor()
-63 63 | 
+57 | 
+58 | S3ToHiveTransfer()
+59 | 
+   - from airflow.sensors.hive_partition_sensor import HivePartitionSensor
+60 + from airflow.providers.apache.hive.sensors.hive_partition import HivePartitionSensor
+61 | 
+62 | HivePartitionSensor()
+63 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.metastore_partition_sensor.MetastorePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:66:1
@@ -441,16 +423,15 @@ AIR302 [*] `airflow.sensors.metastore_partition_sensor.MetastorePartitionSensor`
 68 | from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MetastorePartitionSensor` from `airflow.providers.apache.hive.sensors.metastore_partition` instead.
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | HivePartitionSensor()
-63 63 | 
-64    |-from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor
-   64 |+from airflow.providers.apache.hive.sensors.metastore_partition import MetastorePartitionSensor
-65 65 | 
-66 66 | MetastorePartitionSensor()
-67 67 | 
+61 | 
+62 | HivePartitionSensor()
+63 | 
+   - from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor
+64 + from airflow.providers.apache.hive.sensors.metastore_partition import MetastorePartitionSensor
+65 | 
+66 | MetastorePartitionSensor()
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.named_hive_partition_sensor.NamedHivePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0;
   --> AIR302_hive.py:70:1
@@ -461,12 +442,11 @@ AIR302 [*] `airflow.sensors.named_hive_partition_sensor.NamedHivePartitionSensor
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `NamedHivePartitionSensor` from `airflow.providers.apache.hive.sensors.named_hive_partition` instead.
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | MetastorePartitionSensor()
-67 67 | 
-68    |-from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor
-   68 |+from airflow.providers.apache.hive.sensors.named_hive_partition import NamedHivePartitionSensor
-69 69 | 
-70 70 | NamedHivePartitionSensor()
+65 | 
+66 | MetastorePartitionSensor()
+67 | 
+   - from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor
+68 + from airflow.providers.apache.hive.sensors.named_hive_partition import NamedHivePartitionSensor
+69 | 
+70 | NamedHivePartitionSensor()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap
index 0010d981b8..91391eb3ad 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap
@@ -12,17 +12,16 @@ AIR302 [*] `airflow.hooks.http_hook.HttpHook` is moved into `http` provider in A
 9 | HttpSensor()
   |
 help: Install `apache-airflow-providers-http>=1.0.0` and use `HttpHook` from `airflow.providers.http.hooks.http` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.http_hook import HttpHook
-4 3 | from airflow.operators.http_operator import SimpleHttpOperator
-5 4 | from airflow.sensors.http_sensor import HttpSensor
-  5 |+from airflow.providers.http.hooks.http import HttpHook
-6 6 | 
-7 7 | HttpHook()
-8 8 | SimpleHttpOperator()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.http_hook import HttpHook
+3 | from airflow.operators.http_operator import SimpleHttpOperator
+4 | from airflow.sensors.http_sensor import HttpSensor
+5 + from airflow.providers.http.hooks.http import HttpHook
+6 | 
+7 | HttpHook()
+8 | SimpleHttpOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.http_operator.SimpleHttpOperator` is moved into `http` provider in Airflow 3.0;
  --> AIR302_http.py:8:1
@@ -33,17 +32,15 @@ AIR302 [*] `airflow.operators.http_operator.SimpleHttpOperator` is moved into `h
 9 | HttpSensor()
   |
 help: Install `apache-airflow-providers-http>=5.0.0` and use `HttpOperator` from `airflow.providers.http.operators.http` instead.
-
-ℹ Safe fix
-3  3  | from airflow.hooks.http_hook import HttpHook
-4  4  | from airflow.operators.http_operator import SimpleHttpOperator
-5  5  | from airflow.sensors.http_sensor import HttpSensor
-   6  |+from airflow.providers.http.operators.http import HttpOperator
-6  7  | 
-7  8  | HttpHook()
-8     |-SimpleHttpOperator()
-   9  |+HttpOperator()
-9  10 | HttpSensor()
+3  | from airflow.hooks.http_hook import HttpHook
+4  | from airflow.operators.http_operator import SimpleHttpOperator
+5  | from airflow.sensors.http_sensor import HttpSensor
+6  + from airflow.providers.http.operators.http import HttpOperator
+7  | 
+8  | HttpHook()
+   - SimpleHttpOperator()
+9  + HttpOperator()
+10 | HttpSensor()
 
 AIR302 [*] `airflow.sensors.http_sensor.HttpSensor` is moved into `http` provider in Airflow 3.0;
  --> AIR302_http.py:9:1
@@ -54,13 +51,12 @@ AIR302 [*] `airflow.sensors.http_sensor.HttpSensor` is moved into `http` provide
   | ^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-http>=1.0.0` and use `HttpSensor` from `airflow.providers.http.sensors.http` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.hooks.http_hook import HttpHook
-4 4 | from airflow.operators.http_operator import SimpleHttpOperator
-5   |-from airflow.sensors.http_sensor import HttpSensor
-  5 |+from airflow.providers.http.sensors.http import HttpSensor
-6 6 | 
-7 7 | HttpHook()
-8 8 | SimpleHttpOperator()
+2 | 
+3 | from airflow.hooks.http_hook import HttpHook
+4 | from airflow.operators.http_operator import SimpleHttpOperator
+  - from airflow.sensors.http_sensor import HttpSensor
+5 + from airflow.providers.http.sensors.http import HttpSensor
+6 | 
+7 | HttpHook()
+8 | SimpleHttpOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap
index 337e988991..0ba1b660b7 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap
@@ -11,18 +11,17 @@ AIR302 [*] `airflow.hooks.jdbc_hook.JdbcHook` is moved into `jdbc` provider in A
 9 | jaydebeapi()
   |
 help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `JdbcHook` from `airflow.providers.jdbc.hooks.jdbc` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.hooks.jdbc_hook import (
-4   |-    JdbcHook,
-5 4 |     jaydebeapi,
-6 5 | )
-  6 |+from airflow.providers.jdbc.hooks.jdbc import JdbcHook
-7 7 | 
-8 8 | JdbcHook()
-9 9 | jaydebeapi()
+1 | from __future__ import annotations
+2 | 
+3 | from airflow.hooks.jdbc_hook import (
+  -     JdbcHook,
+4 |     jaydebeapi,
+5 | )
+6 + from airflow.providers.jdbc.hooks.jdbc import JdbcHook
+7 | 
+8 | JdbcHook()
+9 | jaydebeapi()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.jdbc_hook.jaydebeapi` is moved into `jdbc` provider in Airflow 3.0;
  --> AIR302_jdbc.py:9:1
@@ -32,14 +31,13 @@ AIR302 [*] `airflow.hooks.jdbc_hook.jaydebeapi` is moved into `jdbc` provider in
   | ^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `jaydebeapi` from `airflow.providers.jdbc.hooks.jdbc` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.hooks.jdbc_hook import (
-4 4 |     JdbcHook,
-5   |-    jaydebeapi,
-6 5 | )
-  6 |+from airflow.providers.jdbc.hooks.jdbc import jaydebeapi
-7 7 | 
-8 8 | JdbcHook()
-9 9 | jaydebeapi()
+2 | 
+3 | from airflow.hooks.jdbc_hook import (
+4 |     JdbcHook,
+  -     jaydebeapi,
+5 | )
+6 + from airflow.providers.jdbc.hooks.jdbc import jaydebeapi
+7 | 
+8 | JdbcHook()
+9 | jaydebeapi()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap
index d594255c68..cdd6c814c4 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap
@@ -11,23 +11,22 @@ AIR302 [*] `airflow.executors.kubernetes_executor_types.ALL_NAMESPACES` is moved
 23 | POD_EXECUTOR_DONE_KEY
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `ALL_NAMESPACES` from `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3  3  | from airflow.executors.kubernetes_executor_types import (
-4     |-    ALL_NAMESPACES,
-5  4  |     POD_EXECUTOR_DONE_KEY,
-6  5  | )
-7  6  | from airflow.kubernetes.k8s_model import (
+1  | from __future__ import annotations
+2  | 
+3  | from airflow.executors.kubernetes_executor_types import (
+   -     ALL_NAMESPACES,
+4  |     POD_EXECUTOR_DONE_KEY,
+5  | )
+6  | from airflow.kubernetes.k8s_model import (
 --------------------------------------------------------------------------------
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import ALL_NAMESPACES
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import ALL_NAMESPACES
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.executors.kubernetes_executor_types.POD_EXECUTOR_DONE_KEY` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:23:1
@@ -39,23 +38,22 @@ AIR302 [*] `airflow.executors.kubernetes_executor_types.POD_EXECUTOR_DONE_KEY` i
 25 | K8SModel()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `POD_EXECUTOR_DONE_KEY` from `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types` instead.
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from airflow.executors.kubernetes_executor_types import (
-4  4  |     ALL_NAMESPACES,
-5     |-    POD_EXECUTOR_DONE_KEY,
-6  5  | )
-7  6  | from airflow.kubernetes.k8s_model import (
-8  7  |     K8SModel,
+2  | 
+3  | from airflow.executors.kubernetes_executor_types import (
+4  |     ALL_NAMESPACES,
+   -     POD_EXECUTOR_DONE_KEY,
+5  | )
+6  | from airflow.kubernetes.k8s_model import (
+7  |     K8SModel,
 --------------------------------------------------------------------------------
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import POD_EXECUTOR_DONE_KEY
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import POD_EXECUTOR_DONE_KEY
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.k8s_model.K8SModel` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:25:1
@@ -67,23 +65,22 @@ AIR302 [*] `airflow.kubernetes.k8s_model.K8SModel` is moved into `cncf-kubernete
 26 | append_to_pod()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `K8SModel` from `airflow.providers.cncf.kubernetes.k8s_model` instead.
-
-ℹ Unsafe fix
-5  5  |     POD_EXECUTOR_DONE_KEY,
-6  6  | )
-7  7  | from airflow.kubernetes.k8s_model import (
-8     |-    K8SModel,
-9  8  |     append_to_pod,
-10 9  | )
-11 10 | from airflow.kubernetes.kube_client import (
+5  |     POD_EXECUTOR_DONE_KEY,
+6  | )
+7  | from airflow.kubernetes.k8s_model import (
+   -     K8SModel,
+8  |     append_to_pod,
+9  | )
+10 | from airflow.kubernetes.kube_client import (
 --------------------------------------------------------------------------------
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.k8s_model import K8SModel
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.k8s_model import K8SModel
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.k8s_model.append_to_pod` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:26:1
@@ -95,23 +92,22 @@ AIR302 [*] `airflow.kubernetes.k8s_model.append_to_pod` is moved into `cncf-kube
 28 | _disable_verify_ssl()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `append_to_pod` from `airflow.providers.cncf.kubernetes.k8s_model` instead.
-
-ℹ Unsafe fix
-6  6  | )
-7  7  | from airflow.kubernetes.k8s_model import (
-8  8  |     K8SModel,
-9     |-    append_to_pod,
-10 9  | )
-11 10 | from airflow.kubernetes.kube_client import (
-12 11 |     _disable_verify_ssl,
+6  | )
+7  | from airflow.kubernetes.k8s_model import (
+8  |     K8SModel,
+   -     append_to_pod,
+9  | )
+10 | from airflow.kubernetes.kube_client import (
+11 |     _disable_verify_ssl,
 --------------------------------------------------------------------------------
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.k8s_model import append_to_pod
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.k8s_model import append_to_pod
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kube_client._disable_verify_ssl` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:28:1
@@ -124,23 +120,22 @@ AIR302 [*] `airflow.kubernetes.kube_client._disable_verify_ssl` is moved into `c
 30 | get_kube_client()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `_disable_verify_ssl` from `airflow.providers.cncf.kubernetes.kube_client` instead.
-
-ℹ Unsafe fix
-9  9  |     append_to_pod,
-10 10 | )
-11 11 | from airflow.kubernetes.kube_client import (
-12    |-    _disable_verify_ssl,
-13 12 |     _enable_tcp_keepalive,
-14 13 |     get_kube_client,
-15 14 | )
+9  |     append_to_pod,
+10 | )
+11 | from airflow.kubernetes.kube_client import (
+   -     _disable_verify_ssl,
+12 |     _enable_tcp_keepalive,
+13 |     get_kube_client,
+14 | )
 --------------------------------------------------------------------------------
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.kube_client import _disable_verify_ssl
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.kube_client import _disable_verify_ssl
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kube_client._enable_tcp_keepalive` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:29:1
@@ -151,23 +146,22 @@ AIR302 [*] `airflow.kubernetes.kube_client._enable_tcp_keepalive` is moved into
 30 | get_kube_client()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `_enable_tcp_keepalive` from `airflow.providers.cncf.kubernetes.kube_client` instead.
-
-ℹ Unsafe fix
-10 10 | )
-11 11 | from airflow.kubernetes.kube_client import (
-12 12 |     _disable_verify_ssl,
-13    |-    _enable_tcp_keepalive,
-14 13 |     get_kube_client,
-15 14 | )
-16 15 | from airflow.kubernetes.kubernetes_helper_functions import (
+10 | )
+11 | from airflow.kubernetes.kube_client import (
+12 |     _disable_verify_ssl,
+   -     _enable_tcp_keepalive,
+13 |     get_kube_client,
+14 | )
+15 | from airflow.kubernetes.kubernetes_helper_functions import (
 --------------------------------------------------------------------------------
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.kube_client import _enable_tcp_keepalive
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.kube_client import _enable_tcp_keepalive
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kube_client.get_kube_client` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:30:1
@@ -180,22 +174,21 @@ AIR302 [*] `airflow.kubernetes.kube_client.get_kube_client` is moved into `cncf-
 32 | add_pod_suffix()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_kube_client` from `airflow.providers.cncf.kubernetes.kube_client` instead.
-
-ℹ Unsafe fix
-11 11 | from airflow.kubernetes.kube_client import (
-12 12 |     _disable_verify_ssl,
-13 13 |     _enable_tcp_keepalive,
-14    |-    get_kube_client,
-15 14 | )
-16 15 | from airflow.kubernetes.kubernetes_helper_functions import (
-17 16 |     add_pod_suffix,
-18 17 |     annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.kube_client import get_kube_client
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+11 | from airflow.kubernetes.kube_client import (
+12 |     _disable_verify_ssl,
+13 |     _enable_tcp_keepalive,
+   -     get_kube_client,
+14 | )
+15 | from airflow.kubernetes.kubernetes_helper_functions import (
+16 |     add_pod_suffix,
+17 |     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.kube_client import get_kube_client
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.add_pod_suffix` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:32:1
@@ -208,24 +201,22 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.add_pod_suffix` is mo
 34 | create_pod_id()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `add_unique_suffix` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Safe fix
-18 18 |     annotations_for_logging_task_metadata,
-19 19 |     create_pod_id,
-20 20 | )
-   21 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix
-21 22 | 
-22 23 | ALL_NAMESPACES
-23 24 | POD_EXECUTOR_DONE_KEY
+18 |     annotations_for_logging_task_metadata,
+19 |     create_pod_id,
+20 | )
+21 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix
+22 | 
+23 | ALL_NAMESPACES
+24 | POD_EXECUTOR_DONE_KEY
 --------------------------------------------------------------------------------
-29 30 | _enable_tcp_keepalive()
-30 31 | get_kube_client()
-31 32 | 
-32    |-add_pod_suffix()
-   33 |+add_unique_suffix()
-33 34 | annotations_for_logging_task_metadata()
-34 35 | create_pod_id()
-35 36 | 
+30 | _enable_tcp_keepalive()
+31 | get_kube_client()
+32 | 
+   - add_pod_suffix()
+33 + add_unique_suffix()
+34 | annotations_for_logging_task_metadata()
+35 | create_pod_id()
+36 | 
 
 AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_for_logging_task_metadata` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:33:1
@@ -236,18 +227,17 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_for_loggi
 34 | create_pod_id()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `annotations_for_logging_task_metadata` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Unsafe fix
-15 15 | )
-16 16 | from airflow.kubernetes.kubernetes_helper_functions import (
-17 17 |     add_pod_suffix,
-18    |-    annotations_for_logging_task_metadata,
-19 18 |     create_pod_id,
-20 19 | )
-   20 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_for_logging_task_metadata
-21 21 | 
-22 22 | ALL_NAMESPACES
-23 23 | POD_EXECUTOR_DONE_KEY
+15 | )
+16 | from airflow.kubernetes.kubernetes_helper_functions import (
+17 |     add_pod_suffix,
+   -     annotations_for_logging_task_metadata,
+18 |     create_pod_id,
+19 | )
+20 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_for_logging_task_metadata
+21 | 
+22 | ALL_NAMESPACES
+23 | POD_EXECUTOR_DONE_KEY
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.create_pod_id` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:34:1
@@ -258,24 +248,22 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.create_pod_id` is mov
    | ^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `create_unique_id` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Safe fix
-18 18 |     annotations_for_logging_task_metadata,
-19 19 |     create_pod_id,
-20 20 | )
-   21 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import create_unique_id
-21 22 | 
-22 23 | ALL_NAMESPACES
-23 24 | POD_EXECUTOR_DONE_KEY
+18 |     annotations_for_logging_task_metadata,
+19 |     create_pod_id,
+20 | )
+21 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import create_unique_id
+22 | 
+23 | ALL_NAMESPACES
+24 | POD_EXECUTOR_DONE_KEY
 --------------------------------------------------------------------------------
-31 32 | 
-32 33 | add_pod_suffix()
-33 34 | annotations_for_logging_task_metadata()
-34    |-create_pod_id()
-   35 |+create_unique_id()
-35 36 | 
-36 37 | 
-37 38 | from airflow.kubernetes.pod_generator import (
+32 | 
+33 | add_pod_suffix()
+34 | annotations_for_logging_task_metadata()
+   - create_pod_id()
+35 + create_unique_id()
+36 | 
+37 | 
+38 | from airflow.kubernetes.pod_generator import (
 
 AIR302 [*] `airflow.kubernetes.pod_generator.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:49:1
@@ -288,23 +276,22 @@ AIR302 [*] `airflow.kubernetes.pod_generator.PodDefaults` is moved into `cncf-ku
 51 | add_pod_suffix()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead.
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | 
-37 37 | from airflow.kubernetes.pod_generator import (
-38    |-    PodDefaults,
-39 38 |     PodGenerator,
-40 39 |     add_pod_suffix,
-41 40 |     datetime_to_label_safe_datestring,
+35 | 
+36 | 
+37 | from airflow.kubernetes.pod_generator import (
+   -     PodDefaults,
+38 |     PodGenerator,
+39 |     add_pod_suffix,
+40 |     datetime_to_label_safe_datestring,
 --------------------------------------------------------------------------------
-45 44 |     merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+44 |     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.PodGenerator` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:50:1
@@ -316,23 +303,22 @@ AIR302 [*] `airflow.kubernetes.pod_generator.PodGenerator` is moved into `cncf-k
 52 | datetime_to_label_safe_datestring()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-36 36 | 
-37 37 | from airflow.kubernetes.pod_generator import (
-38 38 |     PodDefaults,
-39    |-    PodGenerator,
-40 39 |     add_pod_suffix,
-41 40 |     datetime_to_label_safe_datestring,
-42 41 |     extend_object_field,
+36 | 
+37 | from airflow.kubernetes.pod_generator import (
+38 |     PodDefaults,
+   -     PodGenerator,
+39 |     add_pod_suffix,
+40 |     datetime_to_label_safe_datestring,
+41 |     extend_object_field,
 --------------------------------------------------------------------------------
-45 44 |     merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+44 |     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.add_pod_suffix` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:51:1
@@ -345,20 +331,18 @@ AIR302 [*] `airflow.kubernetes.pod_generator.add_pod_suffix` is moved into `cncf
 53 | extend_object_field()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `add_unique_suffix` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Safe fix
-45 45 |     merge_objects,
-46 46 |     rand_str,
-47 47 | )
-   48 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix
-48 49 | 
-49 50 | PodDefaults()
-50 51 | PodGenerator()
-51    |-add_pod_suffix()
-   52 |+add_unique_suffix()
-52 53 | datetime_to_label_safe_datestring()
-53 54 | extend_object_field()
-54 55 | label_safe_datestring_to_datetime()
+45 |     merge_objects,
+46 |     rand_str,
+47 | )
+48 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix
+49 | 
+50 | PodDefaults()
+51 | PodGenerator()
+   - add_pod_suffix()
+52 + add_unique_suffix()
+53 | datetime_to_label_safe_datestring()
+54 | extend_object_field()
+55 | label_safe_datestring_to_datetime()
 
 AIR302 [*] `airflow.kubernetes.pod_generator.datetime_to_label_safe_datestring` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:52:1
@@ -371,22 +355,21 @@ AIR302 [*] `airflow.kubernetes.pod_generator.datetime_to_label_safe_datestring`
 54 | label_safe_datestring_to_datetime()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `datetime_to_label_safe_datestring` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-38 38 |     PodDefaults,
-39 39 |     PodGenerator,
-40 40 |     add_pod_suffix,
-41    |-    datetime_to_label_safe_datestring,
-42 41 |     extend_object_field,
-43 42 |     label_safe_datestring_to_datetime,
-44 43 |     make_safe_label_value,
-45 44 |     merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.pod_generator import datetime_to_label_safe_datestring
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+38 |     PodDefaults,
+39 |     PodGenerator,
+40 |     add_pod_suffix,
+   -     datetime_to_label_safe_datestring,
+41 |     extend_object_field,
+42 |     label_safe_datestring_to_datetime,
+43 |     make_safe_label_value,
+44 |     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.pod_generator import datetime_to_label_safe_datestring
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.extend_object_field` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:53:1
@@ -399,21 +382,20 @@ AIR302 [*] `airflow.kubernetes.pod_generator.extend_object_field` is moved into
 55 | make_safe_label_value()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `extend_object_field` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-39 39 |     PodGenerator,
-40 40 |     add_pod_suffix,
-41 41 |     datetime_to_label_safe_datestring,
-42    |-    extend_object_field,
-43 42 |     label_safe_datestring_to_datetime,
-44 43 |     make_safe_label_value,
-45 44 |     merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.pod_generator import extend_object_field
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+39 |     PodGenerator,
+40 |     add_pod_suffix,
+41 |     datetime_to_label_safe_datestring,
+   -     extend_object_field,
+42 |     label_safe_datestring_to_datetime,
+43 |     make_safe_label_value,
+44 |     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.pod_generator import extend_object_field
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.label_safe_datestring_to_datetime` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:54:1
@@ -426,20 +408,19 @@ AIR302 [*] `airflow.kubernetes.pod_generator.label_safe_datestring_to_datetime`
 56 | merge_objects()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `label_safe_datestring_to_datetime` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-40 40 |     add_pod_suffix,
-41 41 |     datetime_to_label_safe_datestring,
-42 42 |     extend_object_field,
-43    |-    label_safe_datestring_to_datetime,
-44 43 |     make_safe_label_value,
-45 44 |     merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.pod_generator import label_safe_datestring_to_datetime
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+40 |     add_pod_suffix,
+41 |     datetime_to_label_safe_datestring,
+42 |     extend_object_field,
+   -     label_safe_datestring_to_datetime,
+43 |     make_safe_label_value,
+44 |     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.pod_generator import label_safe_datestring_to_datetime
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.make_safe_label_value` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:55:1
@@ -452,19 +433,18 @@ AIR302 [*] `airflow.kubernetes.pod_generator.make_safe_label_value` is moved int
 57 | rand_str()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `make_safe_label_value` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-41 41 |     datetime_to_label_safe_datestring,
-42 42 |     extend_object_field,
-43 43 |     label_safe_datestring_to_datetime,
-44    |-    make_safe_label_value,
-45 44 |     merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+41 |     datetime_to_label_safe_datestring,
+42 |     extend_object_field,
+43 |     label_safe_datestring_to_datetime,
+   -     make_safe_label_value,
+44 |     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.merge_objects` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:56:1
@@ -476,18 +456,17 @@ AIR302 [*] `airflow.kubernetes.pod_generator.merge_objects` is moved into `cncf-
 57 | rand_str()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `merge_objects` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-42 42 |     extend_object_field,
-43 43 |     label_safe_datestring_to_datetime,
-44 44 |     make_safe_label_value,
-45    |-    merge_objects,
-46 45 |     rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.pod_generator import merge_objects
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+42 |     extend_object_field,
+43 |     label_safe_datestring_to_datetime,
+44 |     make_safe_label_value,
+   -     merge_objects,
+45 |     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.pod_generator import merge_objects
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.rand_str` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:57:1
@@ -500,17 +479,16 @@ AIR302 [*] `airflow.kubernetes.pod_generator.rand_str` is moved into `cncf-kuber
 59 | from airflow.kubernetes.pod_generator_deprecated import (
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `rand_str` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Unsafe fix
-43 43 |     label_safe_datestring_to_datetime,
-44 44 |     make_safe_label_value,
-45 45 |     merge_objects,
-46    |-    rand_str,
-47 46 | )
-   47 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str
-48 48 | 
-49 49 | PodDefaults()
-50 50 | PodGenerator()
+43 |     label_safe_datestring_to_datetime,
+44 |     make_safe_label_value,
+45 |     merge_objects,
+   -     rand_str,
+46 | )
+47 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str
+48 | 
+49 | PodDefaults()
+50 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:69:1
@@ -523,23 +501,22 @@ AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodDefaults` is moved in
 71 | make_safe_label_value()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead.
-
-ℹ Unsafe fix
-57 57 | rand_str()
-58 58 | 
-59 59 | from airflow.kubernetes.pod_generator_deprecated import (
-60    |-    PodDefaults,
-61 60 |     PodGenerator,
-62 61 |     make_safe_label_value,
-63 62 | )
+57 | rand_str()
+58 | 
+59 | from airflow.kubernetes.pod_generator_deprecated import (
+   -     PodDefaults,
+60 |     PodGenerator,
+61 |     make_safe_label_value,
+62 | )
 --------------------------------------------------------------------------------
-65 64 |     PodLauncher,
-66 65 |     PodStatus,
-67 66 | )
-   67 |+from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults
-68 68 | 
-69 69 | PodDefaults()
-70 70 | PodGenerator()
+64 |     PodLauncher,
+65 |     PodStatus,
+66 | )
+67 + from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults
+68 | 
+69 | PodDefaults()
+70 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodGenerator` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:70:1
@@ -550,22 +527,21 @@ AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodGenerator` is moved i
 71 | make_safe_label_value()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-58 58 | 
-59 59 | from airflow.kubernetes.pod_generator_deprecated import (
-60 60 |     PodDefaults,
-61    |-    PodGenerator,
-62 61 |     make_safe_label_value,
-63 62 | )
-64 63 | from airflow.kubernetes.pod_launcher import (
-65 64 |     PodLauncher,
-66 65 |     PodStatus,
-67 66 | )
-   67 |+from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
-68 68 | 
-69 69 | PodDefaults()
-70 70 | PodGenerator()
+58 | 
+59 | from airflow.kubernetes.pod_generator_deprecated import (
+60 |     PodDefaults,
+   -     PodGenerator,
+61 |     make_safe_label_value,
+62 | )
+63 | from airflow.kubernetes.pod_launcher import (
+64 |     PodLauncher,
+65 |     PodStatus,
+66 | )
+67 + from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
+68 | 
+69 | PodDefaults()
+70 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.make_safe_label_value` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:71:1
@@ -578,21 +554,20 @@ AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.make_safe_label_value` i
 73 | PodLauncher()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `make_safe_label_value` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-59 59 | from airflow.kubernetes.pod_generator_deprecated import (
-60 60 |     PodDefaults,
-61 61 |     PodGenerator,
-62    |-    make_safe_label_value,
-63 62 | )
-64 63 | from airflow.kubernetes.pod_launcher import (
-65 64 |     PodLauncher,
-66 65 |     PodStatus,
-67 66 | )
-   67 |+from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value
-68 68 | 
-69 69 | PodDefaults()
-70 70 | PodGenerator()
+59 | from airflow.kubernetes.pod_generator_deprecated import (
+60 |     PodDefaults,
+61 |     PodGenerator,
+   -     make_safe_label_value,
+62 | )
+63 | from airflow.kubernetes.pod_launcher import (
+64 |     PodLauncher,
+65 |     PodStatus,
+66 | )
+67 + from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value
+68 | 
+69 | PodDefaults()
+70 | PodGenerator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_launcher.PodLauncher` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:73:1
@@ -604,22 +579,20 @@ AIR302 [*] `airflow.kubernetes.pod_launcher.PodLauncher` is moved into `cncf-kub
 74 | PodStatus()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodManager` from `airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
-
-ℹ Safe fix
-65 65 |     PodLauncher,
-66 66 |     PodStatus,
-67 67 | )
-   68 |+from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager
-68 69 | 
-69 70 | PodDefaults()
-70 71 | PodGenerator()
-71 72 | make_safe_label_value()
-72 73 | 
-73    |-PodLauncher()
-   74 |+PodManager()
-74 75 | PodStatus()
-75 76 | 
-76 77 | from airflow.kubernetes.pod_launcher_deprecated import (
+65 |     PodLauncher,
+66 |     PodStatus,
+67 | )
+68 + from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager
+69 | 
+70 | PodDefaults()
+71 | PodGenerator()
+72 | make_safe_label_value()
+73 | 
+   - PodLauncher()
+74 + PodManager()
+75 | PodStatus()
+76 | 
+77 | from airflow.kubernetes.pod_launcher_deprecated import (
 
 AIR302 [*] `airflow.kubernetes.pod_launcher.PodStatus` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:74:1
@@ -631,23 +604,21 @@ AIR302 [*] `airflow.kubernetes.pod_launcher.PodStatus` is moved into `cncf-kuber
 76 | from airflow.kubernetes.pod_launcher_deprecated import (
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodPhase` from ` airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
-
-ℹ Safe fix
-65 65 |     PodLauncher,
-66 66 |     PodStatus,
-67 67 | )
-   68 |+from  airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase
-68 69 | 
-69 70 | PodDefaults()
-70 71 | PodGenerator()
-71 72 | make_safe_label_value()
-72 73 | 
-73 74 | PodLauncher()
-74    |-PodStatus()
-   75 |+PodPhase()
-75 76 | 
-76 77 | from airflow.kubernetes.pod_launcher_deprecated import (
-77 78 |     PodDefaults,
+65 |     PodLauncher,
+66 |     PodStatus,
+67 | )
+68 + from  airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase
+69 | 
+70 | PodDefaults()
+71 | PodGenerator()
+72 | make_safe_label_value()
+73 | 
+74 | PodLauncher()
+   - PodStatus()
+75 + PodPhase()
+76 | 
+77 | from airflow.kubernetes.pod_launcher_deprecated import (
+78 |     PodDefaults,
 
 AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:90:1
@@ -660,23 +631,22 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodDefaults` is moved int
 92 | PodStatus()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead.
-
-ℹ Unsafe fix
-74 74 | PodStatus()
-75 75 | 
-76 76 | from airflow.kubernetes.pod_launcher_deprecated import (
-77    |-    PodDefaults,
-78 77 |     PodLauncher,
-79 78 |     PodStatus,
-80 79 |     get_kube_client,
+74 | PodStatus()
+75 | 
+76 | from airflow.kubernetes.pod_launcher_deprecated import (
+   -     PodDefaults,
+77 |     PodLauncher,
+78 |     PodStatus,
+79 |     get_kube_client,
 --------------------------------------------------------------------------------
-86 85 | )
-87 86 | from airflow.kubernetes.volume import Volume
-88 87 | from airflow.kubernetes.volume_mount import VolumeMount
-   88 |+from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults
-89 89 | 
-90 90 | PodDefaults()
-91 91 | PodLauncher()
+85 | )
+86 | from airflow.kubernetes.volume import Volume
+87 | from airflow.kubernetes.volume_mount import VolumeMount
+88 + from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults
+89 | 
+90 | PodDefaults()
+91 | PodLauncher()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodLauncher` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:91:1
@@ -688,19 +658,17 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodLauncher` is moved int
 93 | get_kube_client()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodManager` from `airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
-
-ℹ Safe fix
-86 86 | )
-87 87 | from airflow.kubernetes.volume import Volume
-88 88 | from airflow.kubernetes.volume_mount import VolumeMount
-   89 |+from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager
-89 90 | 
-90 91 | PodDefaults()
-91    |-PodLauncher()
-   92 |+PodManager()
-92 93 | PodStatus()
-93 94 | get_kube_client()
-94 95 | 
+86 | )
+87 | from airflow.kubernetes.volume import Volume
+88 | from airflow.kubernetes.volume_mount import VolumeMount
+89 + from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager
+90 | 
+91 | PodDefaults()
+   - PodLauncher()
+92 + PodManager()
+93 | PodStatus()
+94 | get_kube_client()
+95 | 
 
 AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodStatus` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:92:1
@@ -712,20 +680,18 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodStatus` is moved into
 93 | get_kube_client()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodPhase` from ` airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
-
-ℹ Safe fix
-86 86 | )
-87 87 | from airflow.kubernetes.volume import Volume
-88 88 | from airflow.kubernetes.volume_mount import VolumeMount
-   89 |+from  airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase
-89 90 | 
-90 91 | PodDefaults()
-91 92 | PodLauncher()
-92    |-PodStatus()
-   93 |+PodPhase()
-93 94 | get_kube_client()
-94 95 | 
-95 96 | PodRuntimeInfoEnv()
+86 | )
+87 | from airflow.kubernetes.volume import Volume
+88 | from airflow.kubernetes.volume_mount import VolumeMount
+89 + from  airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase
+90 | 
+91 | PodDefaults()
+92 | PodLauncher()
+   - PodStatus()
+93 + PodPhase()
+94 | get_kube_client()
+95 | 
+96 | PodRuntimeInfoEnv()
 
 AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.get_kube_client` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:93:1
@@ -738,23 +704,22 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.get_kube_client` is moved
 95 | PodRuntimeInfoEnv()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_kube_client` from `airflow.providers.cncf.kubernetes.kube_client` instead.
-
-ℹ Unsafe fix
-77 77 |     PodDefaults,
-78 78 |     PodLauncher,
-79 79 |     PodStatus,
-80    |-    get_kube_client,
-81 80 | )
-82 81 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv
-83 82 | from airflow.kubernetes.secret import (
+77 |     PodDefaults,
+78 |     PodLauncher,
+79 |     PodStatus,
+   -     get_kube_client,
+80 | )
+81 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv
+82 | from airflow.kubernetes.secret import (
 --------------------------------------------------------------------------------
-86 85 | )
-87 86 | from airflow.kubernetes.volume import Volume
-88 87 | from airflow.kubernetes.volume_mount import VolumeMount
-   88 |+from airflow.providers.cncf.kubernetes.kube_client import get_kube_client
-89 89 | 
-90 90 | PodDefaults()
-91 91 | PodLauncher()
+85 | )
+86 | from airflow.kubernetes.volume import Volume
+87 | from airflow.kubernetes.volume_mount import VolumeMount
+88 + from airflow.providers.cncf.kubernetes.kube_client import get_kube_client
+89 | 
+90 | PodDefaults()
+91 | PodLauncher()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_runtime_info_env.PodRuntimeInfoEnv` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:95:1
@@ -767,23 +732,21 @@ AIR302 [*] `airflow.kubernetes.pod_runtime_info_env.PodRuntimeInfoEnv` is moved
 97 | Secret()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1EnvVar` from `kubernetes.client.models` instead.
-
-ℹ Safe fix
-86 86 | )
-87 87 | from airflow.kubernetes.volume import Volume
-88 88 | from airflow.kubernetes.volume_mount import VolumeMount
-   89 |+from kubernetes.client.models import V1EnvVar
-89 90 | 
-90 91 | PodDefaults()
-91 92 | PodLauncher()
-92 93 | PodStatus()
-93 94 | get_kube_client()
-94 95 | 
-95    |-PodRuntimeInfoEnv()
-   96 |+V1EnvVar()
-96 97 | K8SModel()
-97 98 | Secret()
-98 99 | Volume()
+86 | )
+87 | from airflow.kubernetes.volume import Volume
+88 | from airflow.kubernetes.volume_mount import VolumeMount
+89 + from kubernetes.client.models import V1EnvVar
+90 | 
+91 | PodDefaults()
+92 | PodLauncher()
+93 | PodStatus()
+94 | get_kube_client()
+95 | 
+   - PodRuntimeInfoEnv()
+96 + V1EnvVar()
+97 | K8SModel()
+98 | Secret()
+99 | Volume()
 
 AIR302 [*] `airflow.kubernetes.secret.K8SModel` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:96:1
@@ -795,20 +758,19 @@ AIR302 [*] `airflow.kubernetes.secret.K8SModel` is moved into `cncf-kubernetes`
 98 | Volume()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `K8SModel` from `airflow.providers.cncf.kubernetes.k8s_model` instead.
-
-ℹ Unsafe fix
-81 81 | )
-82 82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv
-83 83 | from airflow.kubernetes.secret import (
-84    |-    K8SModel,
-85 84 |     Secret,
-86 85 | )
-87 86 | from airflow.kubernetes.volume import Volume
-88 87 | from airflow.kubernetes.volume_mount import VolumeMount
-   88 |+from airflow.providers.cncf.kubernetes.k8s_model import K8SModel
-89 89 | 
-90 90 | PodDefaults()
-91 91 | PodLauncher()
+81 | )
+82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv
+83 | from airflow.kubernetes.secret import (
+   -     K8SModel,
+84 |     Secret,
+85 | )
+86 | from airflow.kubernetes.volume import Volume
+87 | from airflow.kubernetes.volume_mount import VolumeMount
+88 + from airflow.providers.cncf.kubernetes.k8s_model import K8SModel
+89 | 
+90 | PodDefaults()
+91 | PodLauncher()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.secret.Secret` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:97:1
@@ -821,19 +783,18 @@ AIR302 [*] `airflow.kubernetes.secret.Secret` is moved into `cncf-kubernetes` pr
 99 | VolumeMount()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `Secret` from `airflow.providers.cncf.kubernetes.secret` instead.
-
-ℹ Unsafe fix
-82 82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv
-83 83 | from airflow.kubernetes.secret import (
-84 84 |     K8SModel,
-85    |-    Secret,
-86 85 | )
-87 86 | from airflow.kubernetes.volume import Volume
-88 87 | from airflow.kubernetes.volume_mount import VolumeMount
-   88 |+from airflow.providers.cncf.kubernetes.secret import Secret
-89 89 | 
-90 90 | PodDefaults()
-91 91 | PodLauncher()
+82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv
+83 | from airflow.kubernetes.secret import (
+84 |     K8SModel,
+   -     Secret,
+85 | )
+86 | from airflow.kubernetes.volume import Volume
+87 | from airflow.kubernetes.volume_mount import VolumeMount
+88 + from airflow.providers.cncf.kubernetes.secret import Secret
+89 | 
+90 | PodDefaults()
+91 | PodLauncher()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.volume.Volume` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   --> AIR302_kubernetes.py:98:1
@@ -845,24 +806,22 @@ AIR302 [*] `airflow.kubernetes.volume.Volume` is moved into `cncf-kubernetes` pr
 99 | VolumeMount()
    |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1Volume` from `kubernetes.client.models` instead.
-
-ℹ Safe fix
-86  86  | )
-87  87  | from airflow.kubernetes.volume import Volume
-88  88  | from airflow.kubernetes.volume_mount import VolumeMount
-    89  |+from kubernetes.client.models import V1Volume
-89  90  | 
-90  91  | PodDefaults()
-91  92  | PodLauncher()
+86  | )
+87  | from airflow.kubernetes.volume import Volume
+88  | from airflow.kubernetes.volume_mount import VolumeMount
+89  + from kubernetes.client.models import V1Volume
+90  | 
+91  | PodDefaults()
+92  | PodLauncher()
 --------------------------------------------------------------------------------
-95  96  | PodRuntimeInfoEnv()
-96  97  | K8SModel()
-97  98  | Secret()
-98      |-Volume()
-    99  |+V1Volume()
-99  100 | VolumeMount()
-100 101 | 
-101 102 | from airflow.kubernetes.kubernetes_helper_functions import (
+96  | PodRuntimeInfoEnv()
+97  | K8SModel()
+98  | Secret()
+    - Volume()
+99  + V1Volume()
+100 | VolumeMount()
+101 | 
+102 | from airflow.kubernetes.kubernetes_helper_functions import (
 
 AIR302 [*] `airflow.kubernetes.volume_mount.VolumeMount` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    --> AIR302_kubernetes.py:99:1
@@ -875,24 +834,22 @@ AIR302 [*] `airflow.kubernetes.volume_mount.VolumeMount` is moved into `cncf-kub
 101 | from airflow.kubernetes.kubernetes_helper_functions import (
     |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1VolumeMount` from `kubernetes.client.models` instead.
-
-ℹ Safe fix
-86  86  | )
-87  87  | from airflow.kubernetes.volume import Volume
-88  88  | from airflow.kubernetes.volume_mount import VolumeMount
-    89  |+from kubernetes.client.models import V1VolumeMount
-89  90  | 
-90  91  | PodDefaults()
-91  92  | PodLauncher()
+86  | )
+87  | from airflow.kubernetes.volume import Volume
+88  | from airflow.kubernetes.volume_mount import VolumeMount
+89  + from kubernetes.client.models import V1VolumeMount
+90  | 
+91  | PodDefaults()
+92  | PodLauncher()
 --------------------------------------------------------------------------------
-96  97  | K8SModel()
-97  98  | Secret()
-98  99  | Volume()
-99      |-VolumeMount()
-    100 |+V1VolumeMount()
-100 101 | 
-101 102 | from airflow.kubernetes.kubernetes_helper_functions import (
-102 103 |     annotations_to_key,
+97  | K8SModel()
+98  | Secret()
+99  | Volume()
+    - VolumeMount()
+100 + V1VolumeMount()
+101 | 
+102 | from airflow.kubernetes.kubernetes_helper_functions import (
+103 |     annotations_to_key,
 
 AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_to_key` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    --> AIR302_kubernetes.py:107:1
@@ -905,19 +862,18 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_to_key` i
 109 | rand_str()
     |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `annotations_to_key` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Unsafe fix
-99  99  | VolumeMount()
-100 100 | 
-101 101 | from airflow.kubernetes.kubernetes_helper_functions import (
-102     |-    annotations_to_key,
-103 102 |     get_logs_task_metadata,
-104 103 |     rand_str,
-105 104 | )
-    105 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_to_key
-106 106 | 
-107 107 | annotations_to_key()
-108 108 | get_logs_task_metadata()
+99  | VolumeMount()
+100 | 
+101 | from airflow.kubernetes.kubernetes_helper_functions import (
+    -     annotations_to_key,
+102 |     get_logs_task_metadata,
+103 |     rand_str,
+104 | )
+105 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_to_key
+106 | 
+107 | annotations_to_key()
+108 | get_logs_task_metadata()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.get_logs_task_metadata` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    --> AIR302_kubernetes.py:108:1
@@ -928,18 +884,17 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.get_logs_task_metadat
 109 | rand_str()
     |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_logs_task_metadata` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | from airflow.kubernetes.kubernetes_helper_functions import (
-102 102 |     annotations_to_key,
-103     |-    get_logs_task_metadata,
-104 103 |     rand_str,
-105 104 | )
-    105 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import get_logs_task_metadata
-106 106 | 
-107 107 | annotations_to_key()
-108 108 | get_logs_task_metadata()
+100 | 
+101 | from airflow.kubernetes.kubernetes_helper_functions import (
+102 |     annotations_to_key,
+    -     get_logs_task_metadata,
+103 |     rand_str,
+104 | )
+105 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import get_logs_task_metadata
+106 | 
+107 | annotations_to_key()
+108 | get_logs_task_metadata()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.rand_str` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    --> AIR302_kubernetes.py:109:1
@@ -952,17 +907,16 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.rand_str` is moved in
 111 | from airflow.kubernetes.pod_generator import PodGeneratorDeprecated
     |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `rand_str` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
-
-ℹ Unsafe fix
-101 101 | from airflow.kubernetes.kubernetes_helper_functions import (
-102 102 |     annotations_to_key,
-103 103 |     get_logs_task_metadata,
-104     |-    rand_str,
-105 104 | )
-    105 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str
-106 106 | 
-107 107 | annotations_to_key()
-108 108 | get_logs_task_metadata()
+101 | from airflow.kubernetes.kubernetes_helper_functions import (
+102 |     annotations_to_key,
+103 |     get_logs_task_metadata,
+    -     rand_str,
+104 | )
+105 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str
+106 | 
+107 | annotations_to_key()
+108 | get_logs_task_metadata()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.kubernetes.pod_generator.PodGeneratorDeprecated` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    --> AIR302_kubernetes.py:113:1
@@ -973,11 +927,10 @@ AIR302 [*] `airflow.kubernetes.pod_generator.PodGeneratorDeprecated` is moved in
     | ^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
-
-ℹ Unsafe fix
-109 109 | rand_str()
-110 110 | 
-111 111 | from airflow.kubernetes.pod_generator import PodGeneratorDeprecated
-    112 |+from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
-112 113 | 
-113 114 | PodGeneratorDeprecated()
+109 | rand_str()
+110 | 
+111 | from airflow.kubernetes.pod_generator import PodGeneratorDeprecated
+112 + from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
+113 | 
+114 | PodGeneratorDeprecated()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap
index be6bb3af6c..2cc5b98f2b 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap
@@ -12,19 +12,18 @@ AIR302 [*] `airflow.hooks.mysql_hook.MySqlHook` is moved into `mysql` provider i
 11 | PrestoToMySqlTransfer()
    |
 help: Install `apache-airflow-providers-mysql>=1.0.0` and use `MySqlHook` from `airflow.providers.mysql.hooks.mysql` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.mysql_hook import MySqlHook
-4 3 | from airflow.operators.presto_to_mysql import (
-5 4 |     PrestoToMySqlOperator,
-6 5 |     PrestoToMySqlTransfer,
-7 6 | )
-  7 |+from airflow.providers.mysql.hooks.mysql import MySqlHook
-8 8 | 
-9 9 | MySqlHook()
-10 10 | PrestoToMySqlOperator()
+1  | from __future__ import annotations
+2  | 
+   - from airflow.hooks.mysql_hook import MySqlHook
+3  | from airflow.operators.presto_to_mysql import (
+4  |     PrestoToMySqlOperator,
+5  |     PrestoToMySqlTransfer,
+6  | )
+7  + from airflow.providers.mysql.hooks.mysql import MySqlHook
+8  | 
+9  | MySqlHook()
+10 | PrestoToMySqlOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlOperator` is moved into `mysql` provider in Airflow 3.0;
   --> AIR302_mysql.py:10:1
@@ -35,18 +34,17 @@ AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlOperator` is moved in
 11 | PrestoToMySqlTransfer()
    |
 help: Install `apache-airflow-providers-mysql>=1.0.0` and use `PrestoToMySqlOperator` from `airflow.providers.mysql.transfers.presto_to_mysql` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.hooks.mysql_hook import MySqlHook
-4 4 | from airflow.operators.presto_to_mysql import (
-5   |-    PrestoToMySqlOperator,
-6 5 |     PrestoToMySqlTransfer,
-7 6 | )
-  7 |+from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator
-8 8 | 
-9 9 | MySqlHook()
-10 10 | PrestoToMySqlOperator()
+2  | 
+3  | from airflow.hooks.mysql_hook import MySqlHook
+4  | from airflow.operators.presto_to_mysql import (
+   -     PrestoToMySqlOperator,
+5  |     PrestoToMySqlTransfer,
+6  | )
+7  + from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator
+8  | 
+9  | MySqlHook()
+10 | PrestoToMySqlOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlTransfer` is moved into `mysql` provider in Airflow 3.0;
   --> AIR302_mysql.py:11:1
@@ -57,15 +55,14 @@ AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlTransfer` is moved in
    | ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-mysql>=1.0.0` and use `PrestoToMySqlOperator` from `airflow.providers.mysql.transfers.presto_to_mysql` instead.
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from airflow.hooks.mysql_hook import MySqlHook
-4 4 | from airflow.operators.presto_to_mysql import (
-5   |-    PrestoToMySqlOperator,
-6 5 |     PrestoToMySqlTransfer,
-7 6 | )
-  7 |+from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator
-8 8 | 
-9 9 | MySqlHook()
-10 10 | PrestoToMySqlOperator()
+2  | 
+3  | from airflow.hooks.mysql_hook import MySqlHook
+4  | from airflow.operators.presto_to_mysql import (
+   -     PrestoToMySqlOperator,
+5  |     PrestoToMySqlTransfer,
+6  | )
+7  + from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator
+8  | 
+9  | MySqlHook()
+10 | PrestoToMySqlOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap
index 8dc85d21cc..fc2e27d763 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.oracle_hook.OracleHook` is moved into `oracle` provide
   | ^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-oracle>=1.0.0` and use `OracleHook` from `airflow.providers.oracle.hooks.oracle` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.oracle_hook import OracleHook
-  3 |+from airflow.providers.oracle.hooks.oracle import OracleHook
-4 4 | 
-5 5 | OracleHook()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.oracle_hook import OracleHook
+3 + from airflow.providers.oracle.hooks.oracle import OracleHook
+4 | 
+5 | OracleHook()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap
index 52fdb8d0c4..6373853d33 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.operators.papermill_operator.PapermillOperator` is moved int
   | ^^^^^^^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-papermill>=1.0.0` and use `PapermillOperator` from `airflow.providers.papermill.operators.papermill` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.operators.papermill_operator import PapermillOperator
-  3 |+from airflow.providers.papermill.operators.papermill import PapermillOperator
-4 4 | 
-5 5 | PapermillOperator()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.operators.papermill_operator import PapermillOperator
+3 + from airflow.providers.papermill.operators.papermill import PapermillOperator
+4 | 
+5 | PapermillOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap
index 7f3d08abfd..51e77b1fa0 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap
@@ -11,16 +11,15 @@ AIR302 [*] `airflow.hooks.pig_hook.PigCliHook` is moved into `apache-pig` provid
 7 | PigOperator()
   |
 help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `PigCliHook` from `airflow.providers.apache.pig.hooks.pig` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.pig_hook import PigCliHook
-4 3 | from airflow.operators.pig_operator import PigOperator
-  4 |+from airflow.providers.apache.pig.hooks.pig import PigCliHook
-5 5 | 
-6 6 | PigCliHook()
-7 7 | PigOperator()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.pig_hook import PigCliHook
+3 | from airflow.operators.pig_operator import PigOperator
+4 + from airflow.providers.apache.pig.hooks.pig import PigCliHook
+5 | 
+6 | PigCliHook()
+7 | PigOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.pig_operator.PigOperator` is moved into `apache-pig` provider in Airflow 3.0;
  --> AIR302_pig.py:7:1
@@ -30,13 +29,12 @@ AIR302 [*] `airflow.operators.pig_operator.PigOperator` is moved into `apache-pi
   | ^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `PigOperator` from `airflow.providers.apache.pig.operators.pig` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.hooks.pig_hook import PigCliHook
-4   |-from airflow.operators.pig_operator import PigOperator
-  4 |+from airflow.providers.apache.pig.operators.pig import PigOperator
-5 5 | 
-6 6 | PigCliHook()
-7 7 | PigOperator()
+1 | from __future__ import annotations
+2 | 
+3 | from airflow.hooks.pig_hook import PigCliHook
+  - from airflow.operators.pig_operator import PigOperator
+4 + from airflow.providers.apache.pig.operators.pig import PigOperator
+5 | 
+6 | PigCliHook()
+7 | PigOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap
index a3fc68d859..b3d3f529e7 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap
@@ -11,21 +11,12 @@ AIR302 [*] `airflow.hooks.postgres_hook.PostgresHook` is moved into `postgres` p
 7 | Mapping()
   |
 help: Install `apache-airflow-providers-postgres>=1.0.0` and use `PostgresHook` from `airflow.providers.postgres.hooks.postgres` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.postgres_hook import PostgresHook
-4 3 | from airflow.operators.postgres_operator import Mapping
-  4 |+from airflow.providers.postgres.hooks.postgres import PostgresHook
-5 5 | 
-6 6 | PostgresHook()
-7 7 | Mapping()
-
-AIR302 `airflow.operators.postgres_operator.Mapping` is removed in Airflow 3.0
- --> AIR302_postgres.py:7:1
-  |
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.postgres_hook import PostgresHook
+3 | from airflow.operators.postgres_operator import Mapping
+4 + from airflow.providers.postgres.hooks.postgres import PostgresHook
+5 | 
 6 | PostgresHook()
 7 | Mapping()
-  | ^^^^^^^
-  |
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap
index fcf52b13db..9058a08c77 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.presto_hook.PrestoHook` is moved into `presto` provide
   | ^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-presto>=1.0.0` and use `PrestoHook` from `airflow.providers.presto.hooks.presto` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.presto_hook import PrestoHook
-  3 |+from airflow.providers.presto.hooks.presto import PrestoHook
-4 4 | 
-5 5 | PrestoHook()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.presto_hook import PrestoHook
+3 + from airflow.providers.presto.hooks.presto import PrestoHook
+4 | 
+5 | PrestoHook()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap
index 715985d795..5ca5ae1c9a 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.samba_hook.SambaHook` is moved into `samba` provider i
   | ^^^^^^^^^
   |
 help: Install `apache-airflow-providers-samba>=1.0.0` and use `SambaHook` from `airflow.providers.samba.hooks.samba` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.samba_hook import SambaHook
-  3 |+from airflow.providers.samba.hooks.samba import SambaHook
-4 4 | 
-5 5 | SambaHook()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.samba_hook import SambaHook
+3 + from airflow.providers.samba.hooks.samba import SambaHook
+4 | 
+5 | SambaHook()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap
index 018cc38991..b275aeab0e 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap
@@ -12,16 +12,15 @@ AIR302 [*] `airflow.hooks.slack_hook.SlackHook` is moved into `slack` provider i
 8 | SlackAPIPostOperator()
   |
 help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackHook` from `airflow.providers.slack.hooks.slack` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.slack_hook import SlackHook
-4 3 | from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator
-  4 |+from airflow.providers.slack.hooks.slack import SlackHook
-5 5 | 
-6 6 | SlackHook()
-7 7 | SlackAPIOperator()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.slack_hook import SlackHook
+3 | from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator
+4 + from airflow.providers.slack.hooks.slack import SlackHook
+5 | 
+6 | SlackHook()
+7 | SlackAPIOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.slack_operator.SlackAPIOperator` is moved into `slack` provider in Airflow 3.0;
  --> AIR302_slack.py:7:1
@@ -32,17 +31,16 @@ AIR302 [*] `airflow.operators.slack_operator.SlackAPIOperator` is moved into `sl
 8 | SlackAPIPostOperator()
   |
 help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackAPIOperator` from `airflow.providers.slack.operators.slack` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.hooks.slack_hook import SlackHook
-4   |-from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator
-  4 |+from airflow.operators.slack_operator import SlackAPIPostOperator
-  5 |+from airflow.providers.slack.operators.slack import SlackAPIOperator
-5 6 | 
-6 7 | SlackHook()
-7 8 | SlackAPIOperator()
+1 | from __future__ import annotations
+2 | 
+3 | from airflow.hooks.slack_hook import SlackHook
+  - from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator
+4 + from airflow.operators.slack_operator import SlackAPIPostOperator
+5 + from airflow.providers.slack.operators.slack import SlackAPIOperator
+6 | 
+7 | SlackHook()
+8 | SlackAPIOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.slack_operator.SlackAPIPostOperator` is moved into `slack` provider in Airflow 3.0;
  --> AIR302_slack.py:8:1
@@ -53,14 +51,13 @@ AIR302 [*] `airflow.operators.slack_operator.SlackAPIPostOperator` is moved into
   | ^^^^^^^^^^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackAPIPostOperator` from `airflow.providers.slack.operators.slack` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from airflow.hooks.slack_hook import SlackHook
-4   |-from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator
-  4 |+from airflow.operators.slack_operator import SlackAPIOperator
-  5 |+from airflow.providers.slack.operators.slack import SlackAPIPostOperator
-5 6 | 
-6 7 | SlackHook()
-7 8 | SlackAPIOperator()
+1 | from __future__ import annotations
+2 | 
+3 | from airflow.hooks.slack_hook import SlackHook
+  - from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator
+4 + from airflow.operators.slack_operator import SlackAPIOperator
+5 + from airflow.providers.slack.operators.slack import SlackAPIPostOperator
+6 | 
+7 | SlackHook()
+8 | SlackAPIOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap
index 14e55dc53c..0103600d16 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap
@@ -12,15 +12,14 @@ AIR302 [*] `airflow.operators.email_operator.EmailOperator` is moved into `smtp`
 7 | from airflow.operators.email import EmailOperator
   |
 help: Install `apache-airflow-providers-smtp>=1.0.0` and use `EmailOperator` from `airflow.providers.smtp.operators.smtp` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.operators.email_operator import EmailOperator
-  3 |+from airflow.providers.smtp.operators.smtp import EmailOperator
-4 4 | 
-5 5 | EmailOperator()
-6 6 | 
+1 | from __future__ import annotations
+2 | 
+  - from airflow.operators.email_operator import EmailOperator
+3 + from airflow.providers.smtp.operators.smtp import EmailOperator
+4 | 
+5 | EmailOperator()
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.email.EmailOperator` is moved into `smtp` provider in Airflow 3.0;
  --> AIR302_smtp.py:9:1
@@ -31,12 +30,11 @@ AIR302 [*] `airflow.operators.email.EmailOperator` is moved into `smtp` provider
   | ^^^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-smtp>=1.0.0` and use `EmailOperator` from `airflow.providers.smtp.operators.smtp` instead.
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | EmailOperator()
-6 6 | 
-7   |-from airflow.operators.email import EmailOperator
-  7 |+from airflow.providers.smtp.operators.smtp import EmailOperator
-8 8 | 
-9 9 | EmailOperator()
+4 | 
+5 | EmailOperator()
+6 | 
+  - from airflow.operators.email import EmailOperator
+7 + from airflow.providers.smtp.operators.smtp import EmailOperator
+8 | 
+9 | EmailOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap
index 114f5101a3..029ff88d86 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.sqlite_hook.SqliteHook` is moved into `sqlite` provide
   | ^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-sqlite>=1.0.0` and use `SqliteHook` from `airflow.providers.sqlite.hooks.sqlite` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.sqlite_hook import SqliteHook
-  3 |+from airflow.providers.sqlite.hooks.sqlite import SqliteHook
-4 4 | 
-5 5 | SqliteHook()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.sqlite_hook import SqliteHook
+3 + from airflow.providers.sqlite.hooks.sqlite import SqliteHook
+4 | 
+5 | SqliteHook()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap
index 5b3da4538e..fe0d17fe54 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap
@@ -12,22 +12,21 @@ AIR302 [*] `airflow.operators.bash_operator.BashOperator` is moved into `standar
 22 | TriggerDagRunLink()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashOperator` from `airflow.providers.standard.operators.bash` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3     |-from airflow.operators.bash_operator import BashOperator
-4  3  | from airflow.operators.dagrun_operator import (
-5  4  |     TriggerDagRunLink,
-6  5  |     TriggerDagRunOperator,
+1  | from __future__ import annotations
+2  | 
+   - from airflow.operators.bash_operator import BashOperator
+3  | from airflow.operators.dagrun_operator import (
+4  |     TriggerDagRunLink,
+5  |     TriggerDagRunOperator,
 --------------------------------------------------------------------------------
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.bash import BashOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.bash import BashOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunLink` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:22:1
@@ -39,23 +38,22 @@ AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunLink` is moved into `
 23 | TriggerDagRunOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunLink` from `airflow.providers.standard.operators.trigger_dagrun` instead.
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from airflow.operators.bash_operator import BashOperator
-4  4  | from airflow.operators.dagrun_operator import (
-5     |-    TriggerDagRunLink,
-6  5  |     TriggerDagRunOperator,
-7  6  | )
-8  7  | from airflow.operators.latest_only_operator import LatestOnlyOperator
+2  | 
+3  | from airflow.operators.bash_operator import BashOperator
+4  | from airflow.operators.dagrun_operator import (
+   -     TriggerDagRunLink,
+5  |     TriggerDagRunOperator,
+6  | )
+7  | from airflow.operators.latest_only_operator import LatestOnlyOperator
 --------------------------------------------------------------------------------
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:23:1
@@ -67,23 +65,22 @@ AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunOperator` is moved in
 25 | LatestOnlyOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunOperator` from `airflow.providers.standard.operators.trigger_dagrun` instead.
-
-ℹ Unsafe fix
-3  3  | from airflow.operators.bash_operator import BashOperator
-4  4  | from airflow.operators.dagrun_operator import (
-5  5  |     TriggerDagRunLink,
-6     |-    TriggerDagRunOperator,
-7  6  | )
-8  7  | from airflow.operators.latest_only_operator import LatestOnlyOperator
-9  8  | from airflow.operators.python_operator import (
+3  | from airflow.operators.bash_operator import BashOperator
+4  | from airflow.operators.dagrun_operator import (
+5  |     TriggerDagRunLink,
+   -     TriggerDagRunOperator,
+6  | )
+7  | from airflow.operators.latest_only_operator import LatestOnlyOperator
+8  | from airflow.operators.python_operator import (
 --------------------------------------------------------------------------------
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.latest_only_operator.LatestOnlyOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:25:1
@@ -96,23 +93,22 @@ AIR302 [*] `airflow.operators.latest_only_operator.LatestOnlyOperator` is moved
 27 | BranchPythonOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `LatestOnlyOperator` from `airflow.providers.standard.operators.latest_only` instead.
-
-ℹ Unsafe fix
-5  5  |     TriggerDagRunLink,
-6  6  |     TriggerDagRunOperator,
-7  7  | )
-8     |-from airflow.operators.latest_only_operator import LatestOnlyOperator
-9  8  | from airflow.operators.python_operator import (
-10 9  |     BranchPythonOperator,
-11 10 |     PythonOperator,
+5  |     TriggerDagRunLink,
+6  |     TriggerDagRunOperator,
+7  | )
+   - from airflow.operators.latest_only_operator import LatestOnlyOperator
+8  | from airflow.operators.python_operator import (
+9  |     BranchPythonOperator,
+10 |     PythonOperator,
 --------------------------------------------------------------------------------
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.latest_only import LatestOnlyOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.latest_only import LatestOnlyOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.python_operator.BranchPythonOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:27:1
@@ -125,23 +121,22 @@ AIR302 [*] `airflow.operators.python_operator.BranchPythonOperator` is moved int
 29 | PythonVirtualenvOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-7  7  | )
-8  8  | from airflow.operators.latest_only_operator import LatestOnlyOperator
-9  9  | from airflow.operators.python_operator import (
-10    |-    BranchPythonOperator,
-11 10 |     PythonOperator,
-12 11 |     PythonVirtualenvOperator,
-13 12 |     ShortCircuitOperator,
+7  | )
+8  | from airflow.operators.latest_only_operator import LatestOnlyOperator
+9  | from airflow.operators.python_operator import (
+   -     BranchPythonOperator,
+10 |     PythonOperator,
+11 |     PythonVirtualenvOperator,
+12 |     ShortCircuitOperator,
 --------------------------------------------------------------------------------
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.python import BranchPythonOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.python import BranchPythonOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.python_operator.PythonOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:28:1
@@ -153,23 +148,22 @@ AIR302 [*] `airflow.operators.python_operator.PythonOperator` is moved into `sta
 30 | ShortCircuitOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-8  8  | from airflow.operators.latest_only_operator import LatestOnlyOperator
-9  9  | from airflow.operators.python_operator import (
-10 10 |     BranchPythonOperator,
-11    |-    PythonOperator,
-12 11 |     PythonVirtualenvOperator,
-13 12 |     ShortCircuitOperator,
-14 13 | )
+8  | from airflow.operators.latest_only_operator import LatestOnlyOperator
+9  | from airflow.operators.python_operator import (
+10 |     BranchPythonOperator,
+   -     PythonOperator,
+11 |     PythonVirtualenvOperator,
+12 |     ShortCircuitOperator,
+13 | )
 --------------------------------------------------------------------------------
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.python import PythonOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.python import PythonOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.python_operator.PythonVirtualenvOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:29:1
@@ -181,22 +175,21 @@ AIR302 [*] `airflow.operators.python_operator.PythonVirtualenvOperator` is moved
 30 | ShortCircuitOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-9  9  | from airflow.operators.python_operator import (
-10 10 |     BranchPythonOperator,
-11 11 |     PythonOperator,
-12    |-    PythonVirtualenvOperator,
-13 12 |     ShortCircuitOperator,
-14 13 | )
-15 14 | from airflow.sensors.external_task_sensor import (
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.python import PythonVirtualenvOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+9  | from airflow.operators.python_operator import (
+10 |     BranchPythonOperator,
+11 |     PythonOperator,
+   -     PythonVirtualenvOperator,
+12 |     ShortCircuitOperator,
+13 | )
+14 | from airflow.sensors.external_task_sensor import (
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.python import PythonVirtualenvOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.python_operator.ShortCircuitOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:30:1
@@ -209,21 +202,20 @@ AIR302 [*] `airflow.operators.python_operator.ShortCircuitOperator` is moved int
 32 | ExternalTaskMarker()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-10 10 |     BranchPythonOperator,
-11 11 |     PythonOperator,
-12 12 |     PythonVirtualenvOperator,
-13    |-    ShortCircuitOperator,
-14 13 | )
-15 14 | from airflow.sensors.external_task_sensor import (
-16 15 |     ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.operators.python import ShortCircuitOperator
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+10 |     BranchPythonOperator,
+11 |     PythonOperator,
+12 |     PythonVirtualenvOperator,
+   -     ShortCircuitOperator,
+13 | )
+14 | from airflow.sensors.external_task_sensor import (
+15 |     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.operators.python import ShortCircuitOperator
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskMarker` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:32:1
@@ -235,18 +227,17 @@ AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskMarker` is moved in
 33 | ExternalTaskSensor()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead.
-
-ℹ Unsafe fix
-13 13 |     ShortCircuitOperator,
-14 14 | )
-15 15 | from airflow.sensors.external_task_sensor import (
-16    |-    ExternalTaskMarker,
-17 16 |     ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.sensors.external_task import ExternalTaskMarker
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+13 |     ShortCircuitOperator,
+14 | )
+15 | from airflow.sensors.external_task_sensor import (
+   -     ExternalTaskMarker,
+16 |     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.sensors.external_task import ExternalTaskMarker
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensor` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:33:1
@@ -256,17 +247,16 @@ AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensor` is moved in
    | ^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead.
-
-ℹ Unsafe fix
-14 14 | )
-15 15 | from airflow.sensors.external_task_sensor import (
-16 16 |     ExternalTaskMarker,
-17    |-    ExternalTaskSensor,
-18 17 | )
-   18 |+from airflow.providers.standard.sensors.external_task import ExternalTaskSensor
-19 19 | 
-20 20 | BashOperator()
-21 21 | 
+14 | )
+15 | from airflow.sensors.external_task_sensor import (
+16 |     ExternalTaskMarker,
+   -     ExternalTaskSensor,
+17 | )
+18 + from airflow.providers.standard.sensors.external_task import ExternalTaskSensor
+19 | 
+20 | BashOperator()
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.subprocess.SubprocessResult` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:38:1
@@ -279,16 +269,15 @@ AIR302 [*] `airflow.hooks.subprocess.SubprocessResult` is moved into `standard`
 40 | from airflow.hooks.subprocess import working_directory
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `SubprocessResult` from `airflow.providers.standard.hooks.subprocess` instead.
-
-ℹ Unsafe fix
-33 33 | ExternalTaskSensor()
-34 34 | 
-35 35 | 
-36    |-from airflow.hooks.subprocess import SubprocessResult
-   36 |+from airflow.providers.standard.hooks.subprocess import SubprocessResult
-37 37 | 
-38 38 | SubprocessResult()
-39 39 | 
+33 | ExternalTaskSensor()
+34 | 
+35 | 
+   - from airflow.hooks.subprocess import SubprocessResult
+36 + from airflow.providers.standard.hooks.subprocess import SubprocessResult
+37 | 
+38 | SubprocessResult()
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.hooks.subprocess.working_directory` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:42:1
@@ -301,16 +290,15 @@ AIR302 [*] `airflow.hooks.subprocess.working_directory` is moved into `standard`
 44 | from airflow.operators.datetime import target_times_as_dates
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `working_directory` from `airflow.providers.standard.hooks.subprocess` instead.
-
-ℹ Unsafe fix
-37 37 | 
-38 38 | SubprocessResult()
-39 39 | 
-40    |-from airflow.hooks.subprocess import working_directory
-   40 |+from airflow.providers.standard.hooks.subprocess import working_directory
-41 41 | 
-42 42 | working_directory()
-43 43 | 
+37 | 
+38 | SubprocessResult()
+39 | 
+   - from airflow.hooks.subprocess import working_directory
+40 + from airflow.providers.standard.hooks.subprocess import working_directory
+41 | 
+42 | working_directory()
+43 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.datetime.target_times_as_dates` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:46:1
@@ -323,16 +311,15 @@ AIR302 [*] `airflow.operators.datetime.target_times_as_dates` is moved into `sta
 48 | from airflow.operators.trigger_dagrun import TriggerDagRunLink
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `target_times_as_dates` from `airflow.providers.standard.operators.datetime` instead.
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | working_directory()
-43 43 | 
-44    |-from airflow.operators.datetime import target_times_as_dates
-   44 |+from airflow.providers.standard.operators.datetime import target_times_as_dates
-45 45 | 
-46 46 | target_times_as_dates()
-47 47 | 
+41 | 
+42 | working_directory()
+43 | 
+   - from airflow.operators.datetime import target_times_as_dates
+44 + from airflow.providers.standard.operators.datetime import target_times_as_dates
+45 | 
+46 | target_times_as_dates()
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.trigger_dagrun.TriggerDagRunLink` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:50:1
@@ -345,16 +332,15 @@ AIR302 [*] `airflow.operators.trigger_dagrun.TriggerDagRunLink` is moved into `s
 52 | from airflow.sensors.external_task import ExternalTaskSensorLink
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunLink` from `airflow.providers.standard.operators.trigger_dagrun` instead.
-
-ℹ Unsafe fix
-45 45 | 
-46 46 | target_times_as_dates()
-47 47 | 
-48    |-from airflow.operators.trigger_dagrun import TriggerDagRunLink
-   48 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink
-49 49 | 
-50 50 | TriggerDagRunLink()
-51 51 | 
+45 | 
+46 | target_times_as_dates()
+47 | 
+   - from airflow.operators.trigger_dagrun import TriggerDagRunLink
+48 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink
+49 | 
+50 | TriggerDagRunLink()
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.external_task.ExternalTaskSensorLink` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:54:1
@@ -367,18 +353,16 @@ AIR302 [*] `airflow.sensors.external_task.ExternalTaskSensorLink` is moved into
 56 | from airflow.sensors.time_delta import WaitSensor
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalDagLink` from `airflow.providers.standard.sensors.external_task` instead.
-
-ℹ Safe fix
-50 50 | TriggerDagRunLink()
-51 51 | 
-52 52 | from airflow.sensors.external_task import ExternalTaskSensorLink
-   53 |+from airflow.providers.standard.sensors.external_task import ExternalDagLink
-53 54 | 
-54    |-ExternalTaskSensorLink()
-   55 |+ExternalDagLink()
-55 56 | 
-56 57 | from airflow.sensors.time_delta import WaitSensor
-57 58 | 
+50 | TriggerDagRunLink()
+51 | 
+52 | from airflow.sensors.external_task import ExternalTaskSensorLink
+53 + from airflow.providers.standard.sensors.external_task import ExternalDagLink
+54 | 
+   - ExternalTaskSensorLink()
+55 + ExternalDagLink()
+56 | 
+57 | from airflow.sensors.time_delta import WaitSensor
+58 | 
 
 AIR302 [*] `airflow.sensors.time_delta.WaitSensor` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:58:1
@@ -391,16 +375,15 @@ AIR302 [*] `airflow.sensors.time_delta.WaitSensor` is moved into `standard` prov
 60 | from airflow.operators.dummy import DummyOperator
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `WaitSensor` from `airflow.providers.standard.sensors.time_delta` instead.
-
-ℹ Unsafe fix
-53 53 | 
-54 54 | ExternalTaskSensorLink()
-55 55 | 
-56    |-from airflow.sensors.time_delta import WaitSensor
-   56 |+from airflow.providers.standard.sensors.time_delta import WaitSensor
-57 57 | 
-58 58 | WaitSensor()
-59 59 | 
+53 | 
+54 | ExternalTaskSensorLink()
+55 | 
+   - from airflow.sensors.time_delta import WaitSensor
+56 + from airflow.providers.standard.sensors.time_delta import WaitSensor
+57 | 
+58 | WaitSensor()
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.dummy.DummyOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:62:1
@@ -413,18 +396,16 @@ AIR302 [*] `airflow.operators.dummy.DummyOperator` is moved into `standard` prov
 64 | from airflow.operators.dummy import EmptyOperator
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
-
-ℹ Safe fix
-58 58 | WaitSensor()
-59 59 | 
-60 60 | from airflow.operators.dummy import DummyOperator
-   61 |+from airflow.providers.standard.operators.empty import EmptyOperator
-61 62 | 
-62    |-DummyOperator()
-   63 |+EmptyOperator()
-63 64 | 
-64 65 | from airflow.operators.dummy import EmptyOperator
-65 66 | 
+58 | WaitSensor()
+59 | 
+60 | from airflow.operators.dummy import DummyOperator
+61 + from airflow.providers.standard.operators.empty import EmptyOperator
+62 | 
+   - DummyOperator()
+63 + EmptyOperator()
+64 | 
+65 | from airflow.operators.dummy import EmptyOperator
+66 | 
 
 AIR302 [*] `airflow.operators.dummy.EmptyOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:66:1
@@ -437,16 +418,15 @@ AIR302 [*] `airflow.operators.dummy.EmptyOperator` is moved into `standard` prov
 68 | from airflow.operators.dummy_operator import DummyOperator
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | DummyOperator()
-63 63 | 
-64    |-from airflow.operators.dummy import EmptyOperator
-   64 |+from airflow.providers.standard.operators.empty import EmptyOperator
-65 65 | 
-66 66 | EmptyOperator()
-67 67 | 
+61 | 
+62 | DummyOperator()
+63 | 
+   - from airflow.operators.dummy import EmptyOperator
+64 + from airflow.providers.standard.operators.empty import EmptyOperator
+65 | 
+66 | EmptyOperator()
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.dummy_operator.DummyOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:70:1
@@ -459,15 +439,14 @@ AIR302 [*] `airflow.operators.dummy_operator.DummyOperator` is moved into `stand
 72 | from airflow.operators.dummy_operator import EmptyOperator
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
-
-ℹ Unsafe fix
-66 66 | EmptyOperator()
-67 67 | 
-68 68 | from airflow.operators.dummy_operator import DummyOperator
-   69 |+from airflow.providers.standard.operators.empty import EmptyOperator
-69 70 | 
-70 71 | DummyOperator()
-71 72 | 
+66 | EmptyOperator()
+67 | 
+68 | from airflow.operators.dummy_operator import DummyOperator
+69 + from airflow.providers.standard.operators.empty import EmptyOperator
+70 | 
+71 | DummyOperator()
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.operators.dummy_operator.EmptyOperator` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:74:1
@@ -480,16 +459,15 @@ AIR302 [*] `airflow.operators.dummy_operator.EmptyOperator` is moved into `stand
 76 | from airflow.sensors.external_task_sensor import ExternalTaskSensorLink
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
-
-ℹ Unsafe fix
-69 69 | 
-70 70 | DummyOperator()
-71 71 | 
-72    |-from airflow.operators.dummy_operator import EmptyOperator
-   72 |+from airflow.providers.standard.operators.empty import EmptyOperator
-73 73 | 
-74 74 | EmptyOperator()
-75 75 | 
+69 | 
+70 | DummyOperator()
+71 | 
+   - from airflow.operators.dummy_operator import EmptyOperator
+72 + from airflow.providers.standard.operators.empty import EmptyOperator
+73 | 
+74 | EmptyOperator()
+75 | 
+note: This is an unsafe fix and may change runtime behavior
 
 AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensorLink` is moved into `standard` provider in Airflow 3.0;
   --> AIR302_standard.py:78:1
@@ -500,12 +478,10 @@ AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensorLink` is move
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalDagLink` from `airflow.providers.standard.sensors.external_task` instead.
-
-ℹ Safe fix
-74 74 | EmptyOperator()
-75 75 | 
-76 76 | from airflow.sensors.external_task_sensor import ExternalTaskSensorLink
-   77 |+from airflow.providers.standard.sensors.external_task import ExternalDagLink
-77 78 | 
-78    |-ExternalTaskSensorLink()
-   79 |+ExternalDagLink()
+74 | EmptyOperator()
+75 | 
+76 | from airflow.sensors.external_task_sensor import ExternalTaskSensorLink
+77 + from airflow.providers.standard.sensors.external_task import ExternalDagLink
+78 | 
+   - ExternalTaskSensorLink()
+79 + ExternalDagLink()
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap
index c6213da3a5..746c5f28b9 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap
@@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.zendesk_hook.ZendeskHook` is moved into `zendesk` prov
   | ^^^^^^^^^^^
   |
 help: Install `apache-airflow-providers-zendesk>=1.0.0` and use `ZendeskHook` from `airflow.providers.zendesk.hooks.zendesk` instead.
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from airflow.hooks.zendesk_hook import ZendeskHook
-  3 |+from airflow.providers.zendesk.hooks.zendesk import ZendeskHook
-4 4 | 
-5 5 | ZendeskHook()
+1 | from __future__ import annotations
+2 | 
+  - from airflow.hooks.zendesk_hook import ZendeskHook
+3 + from airflow.providers.zendesk.hooks.zendesk import ZendeskHook
+4 | 
+5 | ZendeskHook()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap
index 1477d7e535..ef5a2957c1 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap
@@ -11,19 +11,17 @@ AIR311 [*] `airflow.Dataset` is removed in Airflow 3.0; It still works in Airflo
 22 | # airflow.datasets
    |
 help: Use `Asset` from `airflow.sdk` instead.
-
-ℹ Safe fix
-15 15 |     task,
-16 16 |     task_group,
-17 17 | )
-   18 |+from airflow.sdk import Asset
-18 19 | 
-19 20 | # airflow
-20    |-DatasetFromRoot()
-   21 |+Asset()
-21 22 | 
-22 23 | # airflow.datasets
-23 24 | Dataset()
+15 |     task,
+16 |     task_group,
+17 | )
+18 + from airflow.sdk import Asset
+19 | 
+20 | # airflow
+   - DatasetFromRoot()
+21 + Asset()
+22 | 
+23 | # airflow.datasets
+24 | Dataset()
 
 AIR311 [*] `airflow.datasets.Dataset` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:23:1
@@ -35,22 +33,20 @@ AIR311 [*] `airflow.datasets.Dataset` is removed in Airflow 3.0; It still works
 25 | DatasetAll()
    |
 help: Use `Asset` from `airflow.sdk` instead.
-
-ℹ Safe fix
-15 15 |     task,
-16 16 |     task_group,
-17 17 | )
-   18 |+from airflow.sdk import Asset
-18 19 | 
-19 20 | # airflow
-20 21 | DatasetFromRoot()
-21 22 | 
-22 23 | # airflow.datasets
-23    |-Dataset()
-   24 |+Asset()
-24 25 | DatasetAlias()
-25 26 | DatasetAll()
-26 27 | DatasetAny()
+15 |     task,
+16 |     task_group,
+17 | )
+18 + from airflow.sdk import Asset
+19 | 
+20 | # airflow
+21 | DatasetFromRoot()
+22 | 
+23 | # airflow.datasets
+   - Dataset()
+24 + Asset()
+25 | DatasetAlias()
+26 | DatasetAll()
+27 | DatasetAny()
 
 AIR311 [*] `airflow.datasets.DatasetAlias` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:24:1
@@ -63,23 +59,21 @@ AIR311 [*] `airflow.datasets.DatasetAlias` is removed in Airflow 3.0; It still w
 26 | DatasetAny()
    |
 help: Use `AssetAlias` from `airflow.sdk` instead.
-
-ℹ Safe fix
-15 15 |     task,
-16 16 |     task_group,
-17 17 | )
-   18 |+from airflow.sdk import AssetAlias
-18 19 | 
-19 20 | # airflow
-20 21 | DatasetFromRoot()
-21 22 | 
-22 23 | # airflow.datasets
-23 24 | Dataset()
-24    |-DatasetAlias()
-   25 |+AssetAlias()
-25 26 | DatasetAll()
-26 27 | DatasetAny()
-27 28 | Metadata()
+15 |     task,
+16 |     task_group,
+17 | )
+18 + from airflow.sdk import AssetAlias
+19 | 
+20 | # airflow
+21 | DatasetFromRoot()
+22 | 
+23 | # airflow.datasets
+24 | Dataset()
+   - DatasetAlias()
+25 + AssetAlias()
+26 | DatasetAll()
+27 | DatasetAny()
+28 | Metadata()
 
 AIR311 [*] `airflow.datasets.DatasetAll` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:25:1
@@ -92,24 +86,22 @@ AIR311 [*] `airflow.datasets.DatasetAll` is removed in Airflow 3.0; It still wor
 27 | Metadata()
    |
 help: Use `AssetAll` from `airflow.sdk` instead.
-
-ℹ Safe fix
-15 15 |     task,
-16 16 |     task_group,
-17 17 | )
-   18 |+from airflow.sdk import AssetAll
-18 19 | 
-19 20 | # airflow
-20 21 | DatasetFromRoot()
+15 |     task,
+16 |     task_group,
+17 | )
+18 + from airflow.sdk import AssetAll
+19 | 
+20 | # airflow
+21 | DatasetFromRoot()
 --------------------------------------------------------------------------------
-22 23 | # airflow.datasets
-23 24 | Dataset()
-24 25 | DatasetAlias()
-25    |-DatasetAll()
-   26 |+AssetAll()
-26 27 | DatasetAny()
-27 28 | Metadata()
-28 29 | expand_alias_to_datasets()
+23 | # airflow.datasets
+24 | Dataset()
+25 | DatasetAlias()
+   - DatasetAll()
+26 + AssetAll()
+27 | DatasetAny()
+28 | Metadata()
+29 | expand_alias_to_datasets()
 
 AIR311 [*] `airflow.datasets.DatasetAny` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:26:1
@@ -122,24 +114,22 @@ AIR311 [*] `airflow.datasets.DatasetAny` is removed in Airflow 3.0; It still wor
 28 | expand_alias_to_datasets()
    |
 help: Use `AssetAny` from `airflow.sdk` instead.
-
-ℹ Safe fix
-15 15 |     task,
-16 16 |     task_group,
-17 17 | )
-   18 |+from airflow.sdk import AssetAny
-18 19 | 
-19 20 | # airflow
-20 21 | DatasetFromRoot()
+15 |     task,
+16 |     task_group,
+17 | )
+18 + from airflow.sdk import AssetAny
+19 | 
+20 | # airflow
+21 | DatasetFromRoot()
 --------------------------------------------------------------------------------
-23 24 | Dataset()
-24 25 | DatasetAlias()
-25 26 | DatasetAll()
-26    |-DatasetAny()
-   27 |+AssetAny()
-27 28 | Metadata()
-28 29 | expand_alias_to_datasets()
-29 30 | 
+24 | Dataset()
+25 | DatasetAlias()
+26 | DatasetAll()
+   - DatasetAny()
+27 + AssetAny()
+28 | Metadata()
+29 | expand_alias_to_datasets()
+30 | 
 
 AIR311 [*] `airflow.datasets.metadata.Metadata` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:27:1
@@ -151,22 +141,21 @@ AIR311 [*] `airflow.datasets.metadata.Metadata` is removed in Airflow 3.0; It st
 28 | expand_alias_to_datasets()
    |
 help: Use `Metadata` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-8  8  |     DatasetAny,
-9  9  |     expand_alias_to_datasets,
-10 10 | )
-11    |-from airflow.datasets.metadata import Metadata
-12 11 | from airflow.decorators import (
-13 12 |     dag,
-14 13 |     setup,
-15 14 |     task,
-16 15 |     task_group,
-17 16 | )
-   17 |+from airflow.sdk import Metadata
-18 18 | 
-19 19 | # airflow
-20 20 | DatasetFromRoot()
+8  |     DatasetAny,
+9  |     expand_alias_to_datasets,
+10 | )
+   - from airflow.datasets.metadata import Metadata
+11 | from airflow.decorators import (
+12 |     dag,
+13 |     setup,
+14 |     task,
+15 |     task_group,
+16 | )
+17 + from airflow.sdk import Metadata
+18 | 
+19 | # airflow
+20 | DatasetFromRoot()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.datasets.expand_alias_to_datasets` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:28:1
@@ -179,24 +168,22 @@ AIR311 [*] `airflow.datasets.expand_alias_to_datasets` is removed in Airflow 3.0
 30 | # airflow.decorators
    |
 help: Use `expand_alias_to_assets` from `airflow.models.asset` instead.
-
-ℹ Safe fix
-15 15 |     task,
-16 16 |     task_group,
-17 17 | )
-   18 |+from airflow.models.asset import expand_alias_to_assets
-18 19 | 
-19 20 | # airflow
-20 21 | DatasetFromRoot()
+15 |     task,
+16 |     task_group,
+17 | )
+18 + from airflow.models.asset import expand_alias_to_assets
+19 | 
+20 | # airflow
+21 | DatasetFromRoot()
 --------------------------------------------------------------------------------
-25 26 | DatasetAll()
-26 27 | DatasetAny()
-27 28 | Metadata()
-28    |-expand_alias_to_datasets()
-   29 |+expand_alias_to_assets()
-29 30 | 
-30 31 | # airflow.decorators
-31 32 | dag()
+26 | DatasetAll()
+27 | DatasetAny()
+28 | Metadata()
+   - expand_alias_to_datasets()
+29 + expand_alias_to_assets()
+30 | 
+31 | # airflow.decorators
+32 | dag()
 
 AIR311 [*] `airflow.decorators.dag` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:31:1
@@ -208,20 +195,19 @@ AIR311 [*] `airflow.decorators.dag` is removed in Airflow 3.0; It still works in
 33 | task_group()
    |
 help: Use `dag` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-10 10 | )
-11 11 | from airflow.datasets.metadata import Metadata
-12 12 | from airflow.decorators import (
-13    |-    dag,
-14 13 |     setup,
-15 14 |     task,
-16 15 |     task_group,
-17 16 | )
-   17 |+from airflow.sdk import dag
-18 18 | 
-19 19 | # airflow
-20 20 | DatasetFromRoot()
+10 | )
+11 | from airflow.datasets.metadata import Metadata
+12 | from airflow.decorators import (
+   -     dag,
+13 |     setup,
+14 |     task,
+15 |     task_group,
+16 | )
+17 + from airflow.sdk import dag
+18 | 
+19 | # airflow
+20 | DatasetFromRoot()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.decorators.task` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:32:1
@@ -234,18 +220,17 @@ AIR311 [*] `airflow.decorators.task` is removed in Airflow 3.0; It still works i
 34 | setup()
    |
 help: Use `task` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-12 12 | from airflow.decorators import (
-13 13 |     dag,
-14 14 |     setup,
-15    |-    task,
-16 15 |     task_group,
-17 16 | )
-   17 |+from airflow.sdk import task
-18 18 | 
-19 19 | # airflow
-20 20 | DatasetFromRoot()
+12 | from airflow.decorators import (
+13 |     dag,
+14 |     setup,
+   -     task,
+15 |     task_group,
+16 | )
+17 + from airflow.sdk import task
+18 | 
+19 | # airflow
+20 | DatasetFromRoot()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.decorators.task_group` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:33:1
@@ -258,17 +243,16 @@ AIR311 [*] `airflow.decorators.task_group` is removed in Airflow 3.0; It still w
 35 | from airflow.decorators import teardown
    |
 help: Use `task_group` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-13 13 |     dag,
-14 14 |     setup,
-15 15 |     task,
-16    |-    task_group,
-17 16 | )
-   17 |+from airflow.sdk import task_group
-18 18 | 
-19 19 | # airflow
-20 20 | DatasetFromRoot()
+13 |     dag,
+14 |     setup,
+15 |     task,
+   -     task_group,
+16 | )
+17 + from airflow.sdk import task_group
+18 | 
+19 | # airflow
+20 | DatasetFromRoot()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.decorators.setup` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:34:1
@@ -281,19 +265,18 @@ AIR311 [*] `airflow.decorators.setup` is removed in Airflow 3.0; It still works
 36 | from airflow.io.path import ObjectStoragePath
    |
 help: Use `setup` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-11 11 | from airflow.datasets.metadata import Metadata
-12 12 | from airflow.decorators import (
-13 13 |     dag,
-14    |-    setup,
-15 14 |     task,
-16 15 |     task_group,
-17 16 | )
-   17 |+from airflow.sdk import setup
-18 18 | 
-19 19 | # airflow
-20 20 | DatasetFromRoot()
+11 | from airflow.datasets.metadata import Metadata
+12 | from airflow.decorators import (
+13 |     dag,
+   -     setup,
+14 |     task,
+15 |     task_group,
+16 | )
+17 + from airflow.sdk import setup
+18 | 
+19 | # airflow
+20 | DatasetFromRoot()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.decorators.teardown` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:48:1
@@ -305,23 +288,22 @@ AIR311 [*] `airflow.decorators.teardown` is removed in Airflow 3.0; It still wor
 50 | # # airflow.io
    |
 help: Use `teardown` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-32 32 | task()
-33 33 | task_group()
-34 34 | setup()
-35    |-from airflow.decorators import teardown
-36 35 | from airflow.io.path import ObjectStoragePath
-37 36 | from airflow.io.storage import attach
-38 37 | from airflow.models import DAG as DAGFromModel
+32 | task()
+33 | task_group()
+34 | setup()
+   - from airflow.decorators import teardown
+35 | from airflow.io.path import ObjectStoragePath
+36 | from airflow.io.store import attach
+37 | from airflow.models import DAG as DAGFromModel
 --------------------------------------------------------------------------------
-43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 44 | from airflow.models.dag import DAG as DAGFromDag
-   45 |+from airflow.sdk import teardown
-46 46 | 
-47 47 | # airflow.decorators
-48 48 | teardown()
+42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 | from airflow.models.baseoperatorlink import BaseOperatorLink
+44 | from airflow.models.dag import DAG as DAGFromDag
+45 + from airflow.sdk import teardown
+46 | 
+47 | # airflow.decorators
+48 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.io.path.ObjectStoragePath` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:51:1
@@ -332,25 +314,24 @@ AIR311 [*] `airflow.io.path.ObjectStoragePath` is removed in Airflow 3.0; It sti
 52 | attach()
    |
 help: Use `ObjectStoragePath` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-33 33 | task_group()
-34 34 | setup()
-35 35 | from airflow.decorators import teardown
-36    |-from airflow.io.path import ObjectStoragePath
-37 36 | from airflow.io.storage import attach
-38 37 | from airflow.models import DAG as DAGFromModel
-39 38 | from airflow.models import (
+33 | task_group()
+34 | setup()
+35 | from airflow.decorators import teardown
+   - from airflow.io.path import ObjectStoragePath
+36 | from airflow.io.store import attach
+37 | from airflow.models import DAG as DAGFromModel
+38 | from airflow.models import (
 --------------------------------------------------------------------------------
-43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 44 | from airflow.models.dag import DAG as DAGFromDag
-   45 |+from airflow.sdk import ObjectStoragePath
-46 46 | 
-47 47 | # airflow.decorators
-48 48 | teardown()
+42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 | from airflow.models.baseoperatorlink import BaseOperatorLink
+44 | from airflow.models.dag import DAG as DAGFromDag
+45 + from airflow.sdk import ObjectStoragePath
+46 | 
+47 | # airflow.decorators
+48 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
-AIR311 [*] `airflow.io.storage.attach` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR311 [*] `airflow.io.store.attach` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:52:1
    |
 50 | # # airflow.io
@@ -361,23 +342,22 @@ AIR311 [*] `airflow.io.storage.attach` is removed in Airflow 3.0; It still works
 54 | # airflow.models
    |
 help: Use `attach` from `airflow.sdk.io` instead.
-
-ℹ Unsafe fix
-34 34 | setup()
-35 35 | from airflow.decorators import teardown
-36 36 | from airflow.io.path import ObjectStoragePath
-37    |-from airflow.io.storage import attach
-38 37 | from airflow.models import DAG as DAGFromModel
-39 38 | from airflow.models import (
-40 39 |     Connection,
+34 | setup()
+35 | from airflow.decorators import teardown
+36 | from airflow.io.path import ObjectStoragePath
+   - from airflow.io.store import attach
+37 | from airflow.models import DAG as DAGFromModel
+38 | from airflow.models import (
+39 |     Connection,
 --------------------------------------------------------------------------------
-43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 44 | from airflow.models.dag import DAG as DAGFromDag
-   45 |+from airflow.sdk.io import attach
-46 46 | 
-47 47 | # airflow.decorators
-48 48 | teardown()
+42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 | from airflow.models.baseoperatorlink import BaseOperatorLink
+44 | from airflow.models.dag import DAG as DAGFromDag
+45 + from airflow.sdk.io import attach
+46 | 
+47 | # airflow.decorators
+48 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.Connection` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:55:1
@@ -389,21 +369,20 @@ AIR311 [*] `airflow.models.Connection` is removed in Airflow 3.0; It still works
 57 | Variable()
    |
 help: Use `Connection` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-37 37 | from airflow.io.storage import attach
-38 38 | from airflow.models import DAG as DAGFromModel
-39 39 | from airflow.models import (
-40    |-    Connection,
-41 40 |     Variable,
-42 41 | )
-43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 44 | from airflow.models.dag import DAG as DAGFromDag
-   45 |+from airflow.sdk import Connection
-46 46 | 
-47 47 | # airflow.decorators
-48 48 | teardown()
+37 | from airflow.io.store import attach
+38 | from airflow.models import DAG as DAGFromModel
+39 | from airflow.models import (
+   -     Connection,
+40 |     Variable,
+41 | )
+42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 | from airflow.models.baseoperatorlink import BaseOperatorLink
+44 | from airflow.models.dag import DAG as DAGFromDag
+45 + from airflow.sdk import Connection
+46 | 
+47 | # airflow.decorators
+48 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.DAG` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:56:1
@@ -415,24 +394,22 @@ AIR311 [*] `airflow.models.DAG` is removed in Airflow 3.0; It still works in Air
 57 | Variable()
    |
 help: Use `DAG` from `airflow.sdk` instead.
-
-ℹ Safe fix
-43 43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 45 | from airflow.models.dag import DAG as DAGFromDag
-   46 |+from airflow.sdk import DAG
-46 47 | 
-47 48 | # airflow.decorators
-48 49 | teardown()
+43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+44 | from airflow.models.baseoperatorlink import BaseOperatorLink
+45 | from airflow.models.dag import DAG as DAGFromDag
+46 + from airflow.sdk import DAG
+47 | 
+48 | # airflow.decorators
+49 | teardown()
 --------------------------------------------------------------------------------
-53 54 | 
-54 55 | # airflow.models
-55 56 | Connection()
-56    |-DAGFromModel()
-   57 |+DAG()
-57 58 | Variable()
-58 59 | 
-59 60 | # airflow.models.baseoperator
+54 | 
+55 | # airflow.models
+56 | Connection()
+   - DAGFromModel()
+57 + DAG()
+58 | Variable()
+59 | 
+60 | # airflow.models.baseoperator
 
 AIR311 [*] `airflow.models.Variable` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:57:1
@@ -445,20 +422,19 @@ AIR311 [*] `airflow.models.Variable` is removed in Airflow 3.0; It still works i
 59 | # airflow.models.baseoperator
    |
 help: Use `Variable` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-38 38 | from airflow.models import DAG as DAGFromModel
-39 39 | from airflow.models import (
-40 40 |     Connection,
-41    |-    Variable,
-42 41 | )
-43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 44 | from airflow.models.dag import DAG as DAGFromDag
-   45 |+from airflow.sdk import Variable
-46 46 | 
-47 47 | # airflow.decorators
-48 48 | teardown()
+38 | from airflow.models import DAG as DAGFromModel
+39 | from airflow.models import (
+40 |     Connection,
+   -     Variable,
+41 | )
+42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 | from airflow.models.baseoperatorlink import BaseOperatorLink
+44 | from airflow.models.dag import DAG as DAGFromDag
+45 + from airflow.sdk import Variable
+46 | 
+47 | # airflow.decorators
+48 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.baseoperator.chain` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:60:1
@@ -470,19 +446,18 @@ AIR311 [*] `airflow.models.baseoperator.chain` is removed in Airflow 3.0; It sti
 62 | cross_downstream()
    |
 help: Use `chain` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-40 40 |     Connection,
-41 41 |     Variable,
-42 42 | )
-43    |-from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-   43 |+from airflow.models.baseoperator import chain_linear, cross_downstream
-44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 45 | from airflow.models.dag import DAG as DAGFromDag
-   46 |+from airflow.sdk import chain
-46 47 | 
-47 48 | # airflow.decorators
-48 49 | teardown()
+40 |     Connection,
+41 |     Variable,
+42 | )
+   - from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 + from airflow.models.baseoperator import chain_linear, cross_downstream
+44 | from airflow.models.baseoperatorlink import BaseOperatorLink
+45 | from airflow.models.dag import DAG as DAGFromDag
+46 + from airflow.sdk import chain
+47 | 
+48 | # airflow.decorators
+49 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.baseoperator.chain_linear` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:61:1
@@ -494,19 +469,18 @@ AIR311 [*] `airflow.models.baseoperator.chain_linear` is removed in Airflow 3.0;
 62 | cross_downstream()
    |
 help: Use `chain_linear` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-40 40 |     Connection,
-41 41 |     Variable,
-42 42 | )
-43    |-from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-   43 |+from airflow.models.baseoperator import chain, cross_downstream
-44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 45 | from airflow.models.dag import DAG as DAGFromDag
-   46 |+from airflow.sdk import chain_linear
-46 47 | 
-47 48 | # airflow.decorators
-48 49 | teardown()
+40 |     Connection,
+41 |     Variable,
+42 | )
+   - from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 + from airflow.models.baseoperator import chain, cross_downstream
+44 | from airflow.models.baseoperatorlink import BaseOperatorLink
+45 | from airflow.models.dag import DAG as DAGFromDag
+46 + from airflow.sdk import chain_linear
+47 | 
+48 | # airflow.decorators
+49 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.baseoperator.cross_downstream` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:62:1
@@ -519,19 +493,18 @@ AIR311 [*] `airflow.models.baseoperator.cross_downstream` is removed in Airflow
 64 | # airflow.models.baseoperatolinker
    |
 help: Use `cross_downstream` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-40 40 |     Connection,
-41 41 |     Variable,
-42 42 | )
-43    |-from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-   43 |+from airflow.models.baseoperator import chain, chain_linear
-44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 45 | from airflow.models.dag import DAG as DAGFromDag
-   46 |+from airflow.sdk import cross_downstream
-46 47 | 
-47 48 | # airflow.decorators
-48 49 | teardown()
+40 |     Connection,
+41 |     Variable,
+42 | )
+   - from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+43 + from airflow.models.baseoperator import chain, chain_linear
+44 | from airflow.models.baseoperatorlink import BaseOperatorLink
+45 | from airflow.models.dag import DAG as DAGFromDag
+46 + from airflow.sdk import cross_downstream
+47 | 
+48 | # airflow.decorators
+49 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.baseoperatorlink.BaseOperatorLink` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:65:1
@@ -543,17 +516,16 @@ AIR311 [*] `airflow.models.baseoperatorlink.BaseOperatorLink` is removed in Airf
 67 | # airflow.models.dag
    |
 help: Use `BaseOperatorLink` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-41 41 |     Variable,
-42 42 | )
-43 43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44    |-from airflow.models.baseoperatorlink import BaseOperatorLink
-45 44 | from airflow.models.dag import DAG as DAGFromDag
-   45 |+from airflow.sdk import BaseOperatorLink
-46 46 | 
-47 47 | # airflow.decorators
-48 48 | teardown()
+41 |     Variable,
+42 | )
+43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+   - from airflow.models.baseoperatorlink import BaseOperatorLink
+44 | from airflow.models.dag import DAG as DAGFromDag
+45 + from airflow.sdk import BaseOperatorLink
+46 | 
+47 | # airflow.decorators
+48 | teardown()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR311 [*] `airflow.models.dag.DAG` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:68:1
@@ -565,48 +537,63 @@ AIR311 [*] `airflow.models.dag.DAG` is removed in Airflow 3.0; It still works in
 70 | from airflow.utils.dag_parsing_context import get_parsing_context
    |
 help: Use `DAG` from `airflow.sdk` instead.
-
-ℹ Safe fix
-43 43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink
-45 45 | from airflow.models.dag import DAG as DAGFromDag
-   46 |+from airflow.sdk import DAG
-46 47 | 
-47 48 | # airflow.decorators
-48 49 | teardown()
+43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+44 | from airflow.models.baseoperatorlink import BaseOperatorLink
+45 | from airflow.models.dag import DAG as DAGFromDag
+46 + from airflow.sdk import DAG
+47 | 
+48 | # airflow.decorators
+49 | teardown()
 --------------------------------------------------------------------------------
-65 66 | BaseOperatorLink()
-66 67 | 
-67 68 | # airflow.models.dag
-68    |-DAGFromDag()
-   69 |+DAG()
-69 70 | from airflow.timetables.datasets import DatasetOrTimeSchedule
-70 71 | from airflow.utils.dag_parsing_context import get_parsing_context
-71 72 | 
+66 | BaseOperatorLink()
+67 | 
+68 | # airflow.models.dag
+   - DAGFromDag()
+69 + DAG()
+70 | from airflow.timetables.datasets import DatasetOrTimeSchedule
+71 | from airflow.utils.dag_parsing_context import get_parsing_context
+72 | 
 
 AIR311 [*] `airflow.timetables.datasets.DatasetOrTimeSchedule` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:73:1
    |
 72 | # airflow.timetables.datasets
-73 | DatasetOrTimeSchedule()
+73 | DatasetOrTimeSchedule(datasets=[])
    | ^^^^^^^^^^^^^^^^^^^^^
 74 |
 75 | # airflow.utils.dag_parsing_context
    |
 help: Use `AssetOrTimeSchedule` from `airflow.timetables.assets` instead.
+68 | DAGFromDag()
+69 | from airflow.timetables.datasets import DatasetOrTimeSchedule
+70 | from airflow.utils.dag_parsing_context import get_parsing_context
+71 + from airflow.timetables.assets import AssetOrTimeSchedule
+72 | 
+73 | # airflow.timetables.datasets
+   - DatasetOrTimeSchedule(datasets=[])
+74 + AssetOrTimeSchedule(datasets=[])
+75 | 
+76 | # airflow.utils.dag_parsing_context
+77 | get_parsing_context()
 
-ℹ Safe fix
-68 68 | DAGFromDag()
-69 69 | from airflow.timetables.datasets import DatasetOrTimeSchedule
-70 70 | from airflow.utils.dag_parsing_context import get_parsing_context
-   71 |+from airflow.timetables.assets import AssetOrTimeSchedule
-71 72 | 
-72 73 | # airflow.timetables.datasets
-73    |-DatasetOrTimeSchedule()
-   74 |+AssetOrTimeSchedule()
-74 75 | 
-75 76 | # airflow.utils.dag_parsing_context
-76 77 | get_parsing_context()
+AIR311 [*] `datasets` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:73:23
+   |
+72 | # airflow.timetables.datasets
+73 | DatasetOrTimeSchedule(datasets=[])
+   |                       ^^^^^^^^
+74 |
+75 | # airflow.utils.dag_parsing_context
+   |
+help: Use `assets` instead
+70 | from airflow.utils.dag_parsing_context import get_parsing_context
+71 | 
+72 | # airflow.timetables.datasets
+   - DatasetOrTimeSchedule(datasets=[])
+73 + DatasetOrTimeSchedule(assets=[])
+74 | 
+75 | # airflow.utils.dag_parsing_context
+76 | get_parsing_context()
 
 AIR311 [*] `airflow.utils.dag_parsing_context.get_parsing_context` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR311_names.py:76:1
@@ -614,15 +601,321 @@ AIR311 [*] `airflow.utils.dag_parsing_context.get_parsing_context` is removed in
 75 | # airflow.utils.dag_parsing_context
 76 | get_parsing_context()
    | ^^^^^^^^^^^^^^^^^^^
+77 |
+78 | from airflow.decorators.base import (
    |
 help: Use `get_parsing_context` from `airflow.sdk` instead.
+67 | # airflow.models.dag
+68 | DAGFromDag()
+69 | from airflow.timetables.datasets import DatasetOrTimeSchedule
+   - from airflow.utils.dag_parsing_context import get_parsing_context
+70 + from airflow.sdk import get_parsing_context
+71 | 
+72 | # airflow.timetables.datasets
+73 | DatasetOrTimeSchedule(datasets=[])
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-67 67 | # airflow.models.dag
-68 68 | DAGFromDag()
-69 69 | from airflow.timetables.datasets import DatasetOrTimeSchedule
-70    |-from airflow.utils.dag_parsing_context import get_parsing_context
-   70 |+from airflow.sdk import get_parsing_context
-71 71 | 
-72 72 | # airflow.timetables.datasets
-73 73 | DatasetOrTimeSchedule()
+AIR311 [*] `airflow.decorators.base.DecoratedMappedOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:87:1
+   |
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+88 | DecoratedOperator()
+89 | TaskDecorator()
+   |
+help: Use `DecoratedMappedOperator` from `airflow.sdk.bases.decorator` instead.
+76 | get_parsing_context()
+77 | 
+78 | from airflow.decorators.base import (
+   -     DecoratedMappedOperator,
+79 |     DecoratedOperator,
+80 |     TaskDecorator,
+81 |     get_unique_task_id,
+82 |     task_decorator_factory,
+83 | )
+84 + from airflow.sdk.bases.decorator import DecoratedMappedOperator
+85 | 
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.decorators.base.DecoratedOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:88:1
+   |
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+88 | DecoratedOperator()
+   | ^^^^^^^^^^^^^^^^^
+89 | TaskDecorator()
+90 | get_unique_task_id()
+   |
+help: Use `DecoratedOperator` from `airflow.sdk.bases.decorator` instead.
+77 | 
+78 | from airflow.decorators.base import (
+79 |     DecoratedMappedOperator,
+   -     DecoratedOperator,
+80 |     TaskDecorator,
+81 |     get_unique_task_id,
+82 |     task_decorator_factory,
+83 | )
+84 + from airflow.sdk.bases.decorator import DecoratedOperator
+85 | 
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.decorators.base.TaskDecorator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:89:1
+   |
+87 | DecoratedMappedOperator()
+88 | DecoratedOperator()
+89 | TaskDecorator()
+   | ^^^^^^^^^^^^^
+90 | get_unique_task_id()
+91 | task_decorator_factory()
+   |
+help: Use `TaskDecorator` from `airflow.sdk.bases.decorator` instead.
+78 | from airflow.decorators.base import (
+79 |     DecoratedMappedOperator,
+80 |     DecoratedOperator,
+   -     TaskDecorator,
+81 |     get_unique_task_id,
+82 |     task_decorator_factory,
+83 | )
+84 + from airflow.sdk.bases.decorator import TaskDecorator
+85 | 
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.decorators.base.get_unique_task_id` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:90:1
+   |
+88 | DecoratedOperator()
+89 | TaskDecorator()
+90 | get_unique_task_id()
+   | ^^^^^^^^^^^^^^^^^^
+91 | task_decorator_factory()
+   |
+help: Use `get_unique_task_id` from `airflow.sdk.bases.decorator` instead.
+79 |     DecoratedMappedOperator,
+80 |     DecoratedOperator,
+81 |     TaskDecorator,
+   -     get_unique_task_id,
+82 |     task_decorator_factory,
+83 | )
+84 + from airflow.sdk.bases.decorator import get_unique_task_id
+85 | 
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.decorators.base.task_decorator_factory` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:91:1
+   |
+89 | TaskDecorator()
+90 | get_unique_task_id()
+91 | task_decorator_factory()
+   | ^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Use `task_decorator_factory` from `airflow.sdk.bases.decorator` instead.
+80 |     DecoratedOperator,
+81 |     TaskDecorator,
+82 |     get_unique_task_id,
+   -     task_decorator_factory,
+83 | )
+84 + from airflow.sdk.bases.decorator import task_decorator_factory
+85 | 
+86 | # airflow.decorators.base
+87 | DecoratedMappedOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.models.Param` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:97:1
+   |
+96 | # airflow.models
+97 | Param()
+   | ^^^^^
+98 | DagParam()
+99 | ParamsDict()
+   |
+help: Use `Param` from `airflow.sdk.definitions.param` instead.
+91 | task_decorator_factory()
+92 | 
+93 | 
+   - from airflow.models import DagParam, Param, ParamsDict
+94 + from airflow.models import DagParam, ParamsDict
+95 + from airflow.sdk.definitions.param import Param
+96 | 
+97 | # airflow.models
+98 | Param()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.models.DagParam` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:98:1
+   |
+96 | # airflow.models
+97 | Param()
+98 | DagParam()
+   | ^^^^^^^^
+99 | ParamsDict()
+   |
+help: Use `DagParam` from `airflow.sdk.definitions.param` instead.
+91 | task_decorator_factory()
+92 | 
+93 | 
+   - from airflow.models import DagParam, Param, ParamsDict
+94 + from airflow.models import Param, ParamsDict
+95 + from airflow.sdk.definitions.param import DagParam
+96 | 
+97 | # airflow.models
+98 | Param()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.models.ParamsDict` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR311_names.py:99:1
+   |
+97 | Param()
+98 | DagParam()
+99 | ParamsDict()
+   | ^^^^^^^^^^
+   |
+help: Use `ParamsDict` from `airflow.sdk.definitions.param` instead.
+91 | task_decorator_factory()
+92 | 
+93 | 
+   - from airflow.models import DagParam, Param, ParamsDict
+94 + from airflow.models import DagParam, Param
+95 + from airflow.sdk.definitions.param import ParamsDict
+96 | 
+97 | # airflow.models
+98 | Param()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.models.param.Param` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+   --> AIR311_names.py:105:1
+    |
+104 | # airflow.models.param
+105 | Param()
+    | ^^^^^
+106 | DagParam()
+107 | ParamsDict()
+    |
+help: Use `Param` from `airflow.sdk.definitions.param` instead.
+99  | ParamsDict()
+100 | 
+101 | 
+    - from airflow.models.param import DagParam, Param, ParamsDict
+102 + from airflow.models.param import DagParam, ParamsDict
+103 + from airflow.sdk.definitions.param import Param
+104 | 
+105 | # airflow.models.param
+106 | Param()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.models.param.DagParam` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+   --> AIR311_names.py:106:1
+    |
+104 | # airflow.models.param
+105 | Param()
+106 | DagParam()
+    | ^^^^^^^^
+107 | ParamsDict()
+    |
+help: Use `DagParam` from `airflow.sdk.definitions.param` instead.
+99  | ParamsDict()
+100 | 
+101 | 
+    - from airflow.models.param import DagParam, Param, ParamsDict
+102 + from airflow.models.param import Param, ParamsDict
+103 + from airflow.sdk.definitions.param import DagParam
+104 | 
+105 | # airflow.models.param
+106 | Param()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.models.param.ParamsDict` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+   --> AIR311_names.py:107:1
+    |
+105 | Param()
+106 | DagParam()
+107 | ParamsDict()
+    | ^^^^^^^^^^
+    |
+help: Use `ParamsDict` from `airflow.sdk.definitions.param` instead.
+99  | ParamsDict()
+100 | 
+101 | 
+    - from airflow.models.param import DagParam, Param, ParamsDict
+102 + from airflow.models.param import DagParam, Param
+103 + from airflow.sdk.definitions.param import ParamsDict
+104 | 
+105 | # airflow.models.param
+106 | Param()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.sensors.base.BaseSensorOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+   --> AIR311_names.py:117:1
+    |
+116 | # airflow.sensors.base
+117 | BaseSensorOperator()
+    | ^^^^^^^^^^^^^^^^^^
+118 | PokeReturnValue()
+119 | poke_mode_only()
+    |
+help: Use `BaseSensorOperator` from `airflow.sdk` instead.
+108 | 
+109 | 
+110 | from airflow.sensors.base import (
+    -     BaseSensorOperator,
+111 |     PokeReturnValue,
+112 |     poke_mode_only,
+113 | )
+114 + from airflow.sdk import BaseSensorOperator
+115 | 
+116 | # airflow.sensors.base
+117 | BaseSensorOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.sensors.base.PokeReturnValue` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+   --> AIR311_names.py:118:1
+    |
+116 | # airflow.sensors.base
+117 | BaseSensorOperator()
+118 | PokeReturnValue()
+    | ^^^^^^^^^^^^^^^
+119 | poke_mode_only()
+    |
+help: Use `PokeReturnValue` from `airflow.sdk` instead.
+109 | 
+110 | from airflow.sensors.base import (
+111 |     BaseSensorOperator,
+    -     PokeReturnValue,
+112 |     poke_mode_only,
+113 | )
+114 + from airflow.sdk import PokeReturnValue
+115 | 
+116 | # airflow.sensors.base
+117 | BaseSensorOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR311 [*] `airflow.sensors.base.poke_mode_only` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+   --> AIR311_names.py:119:1
+    |
+117 | BaseSensorOperator()
+118 | PokeReturnValue()
+119 | poke_mode_only()
+    | ^^^^^^^^^^^^^^
+    |
+help: Use `poke_mode_only` from `airflow.sdk` instead.
+110 | from airflow.sensors.base import (
+111 |     BaseSensorOperator,
+112 |     PokeReturnValue,
+    -     poke_mode_only,
+113 | )
+114 + from airflow.sdk import poke_mode_only
+115 | 
+116 | # airflow.sensors.base
+117 | BaseSensorOperator()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap
index 628ffe31dc..cbc9c30010 100644
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap
@@ -2,740 +2,837 @@
 source: crates/ruff_linter/src/rules/airflow/mod.rs
 ---
 AIR312 [*] `airflow.hooks.filesystem.FSHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:14:1
+  --> AIR312.py:13:1
    |
-12 | from airflow.sensors.date_time import DateTimeSensor
-13 |
-14 | FSHook()
+11 | from airflow.operators.weekday import BranchDayOfWeekOperator
+12 |
+13 | FSHook()
    | ^^^^^^
-15 | PackageIndexHook()
-16 | SubprocessHook()
+14 | PackageIndexHook()
+15 | SubprocessHook()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `FSHook` from `airflow.providers.standard.hooks.filesystem` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3     |-from airflow.hooks.filesystem import FSHook
-4  3  | from airflow.hooks.package_index import PackageIndexHook
-5  4  | from airflow.hooks.subprocess import SubprocessHook
-6  5  | from airflow.operators.bash import BashOperator
+1  | from __future__ import annotations
+2  | 
+   - from airflow.hooks.filesystem import FSHook
+3  | from airflow.hooks.package_index import PackageIndexHook
+4  | from airflow.hooks.subprocess import SubprocessHook
+5  | from airflow.operators.bash import BashOperator
 --------------------------------------------------------------------------------
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.hooks.filesystem import FSHook
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+8  | from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.hooks.filesystem import FSHook
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.hooks.package_index.PackageIndexHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:15:1
+  --> AIR312.py:14:1
    |
-14 | FSHook()
-15 | PackageIndexHook()
+13 | FSHook()
+14 | PackageIndexHook()
    | ^^^^^^^^^^^^^^^^
-16 | SubprocessHook()
+15 | SubprocessHook()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `PackageIndexHook` from `airflow.providers.standard.hooks.package_index` instead.
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3  3  | from airflow.hooks.filesystem import FSHook
-4     |-from airflow.hooks.package_index import PackageIndexHook
-5  4  | from airflow.hooks.subprocess import SubprocessHook
-6  5  | from airflow.operators.bash import BashOperator
-7  6  | from airflow.operators.datetime import BranchDateTimeOperator
+1  | from __future__ import annotations
+2  | 
+3  | from airflow.hooks.filesystem import FSHook
+   - from airflow.hooks.package_index import PackageIndexHook
+4  | from airflow.hooks.subprocess import SubprocessHook
+5  | from airflow.operators.bash import BashOperator
+6  | from airflow.operators.datetime import BranchDateTimeOperator
 --------------------------------------------------------------------------------
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.hooks.package_index import PackageIndexHook
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+8  | from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.hooks.package_index import PackageIndexHook
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.hooks.subprocess.SubprocessHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:16:1
+  --> AIR312.py:15:1
    |
-14 | FSHook()
-15 | PackageIndexHook()
-16 | SubprocessHook()
+13 | FSHook()
+14 | PackageIndexHook()
+15 | SubprocessHook()
    | ^^^^^^^^^^^^^^
-17 |
-18 | BashOperator()
+16 |
+17 | BashOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `SubprocessHook` from `airflow.providers.standard.hooks.subprocess` instead.
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from airflow.hooks.filesystem import FSHook
-4  4  | from airflow.hooks.package_index import PackageIndexHook
-5     |-from airflow.hooks.subprocess import SubprocessHook
-6  5  | from airflow.operators.bash import BashOperator
-7  6  | from airflow.operators.datetime import BranchDateTimeOperator
-8  7  | from airflow.operators.empty import EmptyOperator
---------------------------------------------------------------------------------
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.hooks.subprocess import SubprocessHook
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+2  | 
+3  | from airflow.hooks.filesystem import FSHook
+4  | from airflow.hooks.package_index import PackageIndexHook
+   - from airflow.hooks.subprocess import SubprocessHook
+5  | from airflow.operators.bash import BashOperator
+6  | from airflow.operators.datetime import BranchDateTimeOperator
+7  | from airflow.operators.empty import EmptyOperator
+8  | from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.hooks.subprocess import SubprocessHook
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.bash.BashOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:18:1
+  --> AIR312.py:17:1
    |
-16 | SubprocessHook()
-17 |
-18 | BashOperator()
+15 | SubprocessHook()
+16 |
+17 | BashOperator()
    | ^^^^^^^^^^^^
-19 | BranchDateTimeOperator()
-20 | TriggerDagRunOperator()
+18 | BranchDateTimeOperator()
+19 | TriggerDagRunOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashOperator` from `airflow.providers.standard.operators.bash` instead.
-
-ℹ Unsafe fix
-3  3  | from airflow.hooks.filesystem import FSHook
-4  4  | from airflow.hooks.package_index import PackageIndexHook
-5  5  | from airflow.hooks.subprocess import SubprocessHook
-6     |-from airflow.operators.bash import BashOperator
-7  6  | from airflow.operators.datetime import BranchDateTimeOperator
-8  7  | from airflow.operators.empty import EmptyOperator
-9  8  | from airflow.operators.latest_only import LatestOnlyOperator
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.operators.bash import BashOperator
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+3  | from airflow.hooks.filesystem import FSHook
+4  | from airflow.hooks.package_index import PackageIndexHook
+5  | from airflow.hooks.subprocess import SubprocessHook
+   - from airflow.operators.bash import BashOperator
+6  | from airflow.operators.datetime import BranchDateTimeOperator
+7  | from airflow.operators.empty import EmptyOperator
+8  | from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.operators.bash import BashOperator
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.datetime.BranchDateTimeOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:19:1
+  --> AIR312.py:18:1
    |
-18 | BashOperator()
-19 | BranchDateTimeOperator()
+17 | BashOperator()
+18 | BranchDateTimeOperator()
    | ^^^^^^^^^^^^^^^^^^^^^^
-20 | TriggerDagRunOperator()
-21 | EmptyOperator()
+19 | TriggerDagRunOperator()
+20 | EmptyOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchDateTimeOperator` from `airflow.providers.standard.operators.datetime` instead.
-
-ℹ Unsafe fix
-4  4  | from airflow.hooks.package_index import PackageIndexHook
-5  5  | from airflow.hooks.subprocess import SubprocessHook
-6  6  | from airflow.operators.bash import BashOperator
-7     |-from airflow.operators.datetime import BranchDateTimeOperator
-8  7  | from airflow.operators.empty import EmptyOperator
-9  8  | from airflow.operators.latest_only import LatestOnlyOperator
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.operators.datetime import BranchDateTimeOperator
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+4  | from airflow.hooks.package_index import PackageIndexHook
+5  | from airflow.hooks.subprocess import SubprocessHook
+6  | from airflow.operators.bash import BashOperator
+   - from airflow.operators.datetime import BranchDateTimeOperator
+7  | from airflow.operators.empty import EmptyOperator
+8  | from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.operators.datetime import BranchDateTimeOperator
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.trigger_dagrun.TriggerDagRunOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:20:1
+  --> AIR312.py:19:1
    |
-18 | BashOperator()
-19 | BranchDateTimeOperator()
-20 | TriggerDagRunOperator()
+17 | BashOperator()
+18 | BranchDateTimeOperator()
+19 | TriggerDagRunOperator()
    | ^^^^^^^^^^^^^^^^^^^^^
-21 | EmptyOperator()
+20 | EmptyOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunOperator` from `airflow.providers.standard.operators.trigger_dagrun` instead.
-
-ℹ Unsafe fix
-7  7  | from airflow.operators.datetime import BranchDateTimeOperator
-8  8  | from airflow.operators.empty import EmptyOperator
-9  9  | from airflow.operators.latest_only import LatestOnlyOperator
-10    |-from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+7  | from airflow.operators.datetime import BranchDateTimeOperator
+8  | from airflow.operators.empty import EmptyOperator
+9  | from airflow.operators.latest_only import LatestOnlyOperator
+   - from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.empty.EmptyOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:21:1
+  --> AIR312.py:20:1
    |
-19 | BranchDateTimeOperator()
-20 | TriggerDagRunOperator()
-21 | EmptyOperator()
+18 | BranchDateTimeOperator()
+19 | TriggerDagRunOperator()
+20 | EmptyOperator()
    | ^^^^^^^^^^^^^
-22 |
-23 | LatestOnlyOperator()
+21 |
+22 | LatestOnlyOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
-
-ℹ Unsafe fix
-5  5  | from airflow.hooks.subprocess import SubprocessHook
-6  6  | from airflow.operators.bash import BashOperator
-7  7  | from airflow.operators.datetime import BranchDateTimeOperator
-8     |-from airflow.operators.empty import EmptyOperator
-9  8  | from airflow.operators.latest_only import LatestOnlyOperator
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.operators.empty import EmptyOperator
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+5  | from airflow.hooks.subprocess import SubprocessHook
+6  | from airflow.operators.bash import BashOperator
+7  | from airflow.operators.datetime import BranchDateTimeOperator
+   - from airflow.operators.empty import EmptyOperator
+8  | from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.operators.empty import EmptyOperator
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.latest_only.LatestOnlyOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:23:1
+  --> AIR312.py:22:1
    |
-21 | EmptyOperator()
-22 |
-23 | LatestOnlyOperator()
+20 | EmptyOperator()
+21 |
+22 | LatestOnlyOperator()
    | ^^^^^^^^^^^^^^^^^^
-24 | BranchDayOfWeekOperator()
-25 | DateTimeSensor()
+23 | BranchDayOfWeekOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `LatestOnlyOperator` from `airflow.providers.standard.operators.latest_only` instead.
-
-ℹ Unsafe fix
-6  6  | from airflow.operators.bash import BashOperator
-7  7  | from airflow.operators.datetime import BranchDateTimeOperator
-8  8  | from airflow.operators.empty import EmptyOperator
-9     |-from airflow.operators.latest_only import LatestOnlyOperator
-10 9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.operators.latest_only import LatestOnlyOperator
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+6  | from airflow.operators.bash import BashOperator
+7  | from airflow.operators.datetime import BranchDateTimeOperator
+8  | from airflow.operators.empty import EmptyOperator
+   - from airflow.operators.latest_only import LatestOnlyOperator
+9  | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+10 | from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.operators.latest_only import LatestOnlyOperator
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.weekday.BranchDayOfWeekOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:24:1
+  --> AIR312.py:23:1
    |
-23 | LatestOnlyOperator()
-24 | BranchDayOfWeekOperator()
+22 | LatestOnlyOperator()
+23 | BranchDayOfWeekOperator()
    | ^^^^^^^^^^^^^^^^^^^^^^^
-25 | DateTimeSensor()
+24 |
+25 | from airflow.operators.python import (
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchDayOfWeekOperator` from `airflow.providers.standard.operators.weekday` instead.
-
-ℹ Unsafe fix
-8  8  | from airflow.operators.empty import EmptyOperator
-9  9  | from airflow.operators.latest_only import LatestOnlyOperator
-10 10 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11    |-from airflow.operators.weekday import BranchDayOfWeekOperator
-12 11 | from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.operators.weekday import BranchDayOfWeekOperator
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
-
-AIR312 [*] `airflow.sensors.date_time.DateTimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:25:1
-   |
-23 | LatestOnlyOperator()
-24 | BranchDayOfWeekOperator()
-25 | DateTimeSensor()
-   | ^^^^^^^^^^^^^^
-26 |
-27 | from airflow.operators.python import (
-   |
-help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensor` from `airflow.providers.standard.sensors.date_time` instead.
-
-ℹ Unsafe fix
-9  9  | from airflow.operators.latest_only import LatestOnlyOperator
-10 10 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-11 11 | from airflow.operators.weekday import BranchDayOfWeekOperator
-12    |-from airflow.sensors.date_time import DateTimeSensor
-   12 |+from airflow.providers.standard.sensors.date_time import DateTimeSensor
-13 13 | 
-14 14 | FSHook()
-15 15 | PackageIndexHook()
+8  | from airflow.operators.empty import EmptyOperator
+9  | from airflow.operators.latest_only import LatestOnlyOperator
+10 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+   - from airflow.operators.weekday import BranchDayOfWeekOperator
+11 + from airflow.providers.standard.operators.weekday import BranchDayOfWeekOperator
+12 | 
+13 | FSHook()
+14 | PackageIndexHook()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.python.BranchPythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:44:1
+  --> AIR312.py:34:1
    |
-42 | from airflow.sensors.filesystem import FileSensor
-43 |
-44 | BranchPythonOperator()
+32 | from airflow.sensors.date_time import DateTimeSensor
+33 |
+34 | BranchPythonOperator()
    | ^^^^^^^^^^^^^^^^^^^^
-45 | PythonOperator()
-46 | PythonVirtualenvOperator()
+35 | PythonOperator()
+36 | PythonVirtualenvOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-25 25 | DateTimeSensor()
-26 26 | 
-27 27 | from airflow.operators.python import (
-28    |-    BranchPythonOperator,
-29 28 |     PythonOperator,
-30 29 |     PythonVirtualenvOperator,
-31 30 |     ShortCircuitOperator,
---------------------------------------------------------------------------------
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.operators.python import BranchPythonOperator
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
+23 | BranchDayOfWeekOperator()
+24 | 
+25 | from airflow.operators.python import (
+   -     BranchPythonOperator,
+26 |     PythonOperator,
+27 |     PythonVirtualenvOperator,
+28 |     ShortCircuitOperator,
+29 | )
+30 | from airflow.sensors.bash import BashSensor
+31 | from airflow.sensors.date_time import DateTimeSensor
+32 + from airflow.providers.standard.operators.python import BranchPythonOperator
+33 | 
+34 | BranchPythonOperator()
+35 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.python.PythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:45:1
+  --> AIR312.py:35:1
    |
-44 | BranchPythonOperator()
-45 | PythonOperator()
+34 | BranchPythonOperator()
+35 | PythonOperator()
    | ^^^^^^^^^^^^^^
-46 | PythonVirtualenvOperator()
-47 | ShortCircuitOperator()
+36 | PythonVirtualenvOperator()
+37 | ShortCircuitOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-26 26 | 
-27 27 | from airflow.operators.python import (
-28 28 |     BranchPythonOperator,
-29    |-    PythonOperator,
-30 29 |     PythonVirtualenvOperator,
-31 30 |     ShortCircuitOperator,
-32 31 | )
---------------------------------------------------------------------------------
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.operators.python import PythonOperator
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
+24 | 
+25 | from airflow.operators.python import (
+26 |     BranchPythonOperator,
+   -     PythonOperator,
+27 |     PythonVirtualenvOperator,
+28 |     ShortCircuitOperator,
+29 | )
+30 | from airflow.sensors.bash import BashSensor
+31 | from airflow.sensors.date_time import DateTimeSensor
+32 + from airflow.providers.standard.operators.python import PythonOperator
+33 | 
+34 | BranchPythonOperator()
+35 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.python.PythonVirtualenvOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:46:1
+  --> AIR312.py:36:1
    |
-44 | BranchPythonOperator()
-45 | PythonOperator()
-46 | PythonVirtualenvOperator()
+34 | BranchPythonOperator()
+35 | PythonOperator()
+36 | PythonVirtualenvOperator()
    | ^^^^^^^^^^^^^^^^^^^^^^^^
-47 | ShortCircuitOperator()
-48 | DateTimeSensorAsync()
+37 | ShortCircuitOperator()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead.
-
-ℹ Unsafe fix
-27 27 | from airflow.operators.python import (
-28 28 |     BranchPythonOperator,
-29 29 |     PythonOperator,
-30    |-    PythonVirtualenvOperator,
-31 30 |     ShortCircuitOperator,
-32 31 | )
-33 32 | from airflow.sensors.date_time import DateTimeSensorAsync
---------------------------------------------------------------------------------
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.operators.python import PythonVirtualenvOperator
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
+25 | from airflow.operators.python import (
+26 |     BranchPythonOperator,
+27 |     PythonOperator,
+   -     PythonVirtualenvOperator,
+28 |     ShortCircuitOperator,
+29 | )
+30 | from airflow.sensors.bash import BashSensor
+31 | from airflow.sensors.date_time import DateTimeSensor
+32 + from airflow.providers.standard.operators.python import PythonVirtualenvOperator
+33 | 
+34 | BranchPythonOperator()
+35 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.operators.python.ShortCircuitOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:47:1
+  --> AIR312.py:37:1
    |
-45 | PythonOperator()
-46 | PythonVirtualenvOperator()
-47 | ShortCircuitOperator()
+35 | PythonOperator()
+36 | PythonVirtualenvOperator()
+37 | ShortCircuitOperator()
    | ^^^^^^^^^^^^^^^^^^^^
-48 | DateTimeSensorAsync()
-49 | ExternalTaskMarker()
+38 |
+39 | BashSensor()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead.
+26 |     BranchPythonOperator,
+27 |     PythonOperator,
+28 |     PythonVirtualenvOperator,
+   -     ShortCircuitOperator,
+29 | )
+30 | from airflow.sensors.bash import BashSensor
+31 | from airflow.sensors.date_time import DateTimeSensor
+32 + from airflow.providers.standard.operators.python import ShortCircuitOperator
+33 | 
+34 | BranchPythonOperator()
+35 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-28 28 |     BranchPythonOperator,
-29 29 |     PythonOperator,
-30 30 |     PythonVirtualenvOperator,
-31    |-    ShortCircuitOperator,
-32 31 | )
-33 32 | from airflow.sensors.date_time import DateTimeSensorAsync
-34 33 | from airflow.sensors.external_task import (
---------------------------------------------------------------------------------
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.operators.python import ShortCircuitOperator
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
-
-AIR312 [*] `airflow.sensors.date_time.DateTimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:48:1
+AIR312 [*] `airflow.sensors.bash.BashSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:39:1
    |
-46 | PythonVirtualenvOperator()
-47 | ShortCircuitOperator()
-48 | DateTimeSensorAsync()
-   | ^^^^^^^^^^^^^^^^^^^
-49 | ExternalTaskMarker()
-50 | ExternalTaskSensor()
+37 | ShortCircuitOperator()
+38 |
+39 | BashSensor()
+   | ^^^^^^^^^^
+40 | DateTimeSensor()
+41 | from airflow.sensors.date_time import DateTimeSensorAsync
    |
-help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensorAsync` from `airflow.providers.standard.sensors.date_time` instead.
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashSensor` from `airflow.providers.standard.sensor.bash` instead.
+28 |     PythonVirtualenvOperator,
+29 |     ShortCircuitOperator,
+30 | )
+   - from airflow.sensors.bash import BashSensor
+31 | from airflow.sensors.date_time import DateTimeSensor
+32 + from airflow.providers.standard.sensor.bash import BashSensor
+33 | 
+34 | BranchPythonOperator()
+35 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-30 30 |     PythonVirtualenvOperator,
-31 31 |     ShortCircuitOperator,
-32 32 | )
-33    |-from airflow.sensors.date_time import DateTimeSensorAsync
-34 33 | from airflow.sensors.external_task import (
-35 34 |     ExternalTaskMarker,
-36 35 |     ExternalTaskSensor,
---------------------------------------------------------------------------------
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.sensors.date_time import DateTimeSensorAsync
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
+AIR312 [*] `airflow.sensors.date_time.DateTimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:40:1
+   |
+39 | BashSensor()
+40 | DateTimeSensor()
+   | ^^^^^^^^^^^^^^
+41 | from airflow.sensors.date_time import DateTimeSensorAsync
+42 | from airflow.sensors.external_task import (
+   |
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensor` from `airflow.providers.standard.sensors.date_time` instead.
+29 |     ShortCircuitOperator,
+30 | )
+31 | from airflow.sensors.bash import BashSensor
+   - from airflow.sensors.date_time import DateTimeSensor
+32 + from airflow.providers.standard.sensors.date_time import DateTimeSensor
+33 | 
+34 | BranchPythonOperator()
+35 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-AIR312 [*] `airflow.sensors.external_task.ExternalTaskMarker` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR312 [*] `airflow.operators.python.BranchPythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR312.py:49:1
    |
-47 | ShortCircuitOperator()
-48 | DateTimeSensorAsync()
-49 | ExternalTaskMarker()
-   | ^^^^^^^^^^^^^^^^^^
-50 | ExternalTaskSensor()
-51 | FileSensor()
+47 | from airflow.sensors.python import PythonSensor
+48 |
+49 | BranchPythonOperator()
+   | ^^^^^^^^^^^^^^^^^^^^
+50 | PythonOperator()
+51 | PythonVirtualenvOperator()
    |
-help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead.
-
-ℹ Unsafe fix
-32 32 | )
-33 33 | from airflow.sensors.date_time import DateTimeSensorAsync
-34 34 | from airflow.sensors.external_task import (
-35    |-    ExternalTaskMarker,
-36 35 |     ExternalTaskSensor,
-37 36 | )
-38 37 | from airflow.sensors.time_sensor import (
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead.
+23 | BranchDayOfWeekOperator()
+24 | 
+25 | from airflow.operators.python import (
+   -     BranchPythonOperator,
+26 |     PythonOperator,
+27 |     PythonVirtualenvOperator,
+28 |     ShortCircuitOperator,
 --------------------------------------------------------------------------------
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.sensors.external_task import ExternalTaskMarker
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.operators.python import BranchPythonOperator
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-AIR312 [*] `airflow.sensors.external_task.ExternalTaskSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR312 [*] `airflow.operators.python.PythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR312.py:50:1
    |
-48 | DateTimeSensorAsync()
-49 | ExternalTaskMarker()
-50 | ExternalTaskSensor()
-   | ^^^^^^^^^^^^^^^^^^
-51 | FileSensor()
-52 | TimeSensor()
+49 | BranchPythonOperator()
+50 | PythonOperator()
+   | ^^^^^^^^^^^^^^
+51 | PythonVirtualenvOperator()
+52 | ShortCircuitOperator()
    |
-help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead.
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead.
+24 | 
+25 | from airflow.operators.python import (
+26 |     BranchPythonOperator,
+   -     PythonOperator,
+27 |     PythonVirtualenvOperator,
+28 |     ShortCircuitOperator,
+29 | )
+--------------------------------------------------------------------------------
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.operators.python import PythonOperator
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-33 33 | from airflow.sensors.date_time import DateTimeSensorAsync
-34 34 | from airflow.sensors.external_task import (
-35 35 |     ExternalTaskMarker,
-36    |-    ExternalTaskSensor,
-37 36 | )
-38 37 | from airflow.sensors.time_sensor import (
-39 38 |     TimeSensor,
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.sensors.external_task import ExternalTaskSensor
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
-
-AIR312 [*] `airflow.sensors.filesystem.FileSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR312 [*] `airflow.operators.python.PythonVirtualenvOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR312.py:51:1
    |
-49 | ExternalTaskMarker()
-50 | ExternalTaskSensor()
-51 | FileSensor()
-   | ^^^^^^^^^^
-52 | TimeSensor()
-53 | TimeSensorAsync()
+49 | BranchPythonOperator()
+50 | PythonOperator()
+51 | PythonVirtualenvOperator()
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
+52 | ShortCircuitOperator()
+53 | DateTimeSensorAsync()
    |
-help: Install `apache-airflow-providers-standard>=0.0.2` and use `FileSensor` from `airflow.providers.standard.sensors.filesystem` instead.
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead.
+25 | from airflow.operators.python import (
+26 |     BranchPythonOperator,
+27 |     PythonOperator,
+   -     PythonVirtualenvOperator,
+28 |     ShortCircuitOperator,
+29 | )
+30 | from airflow.sensors.bash import BashSensor
+--------------------------------------------------------------------------------
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.operators.python import PythonVirtualenvOperator
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-39 39 |     TimeSensor,
-40 40 |     TimeSensorAsync,
-41 41 | )
-42    |-from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.sensors.filesystem import FileSensor
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
-
-AIR312 [*] `airflow.sensors.time_sensor.TimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR312 [*] `airflow.operators.python.ShortCircuitOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR312.py:52:1
    |
-50 | ExternalTaskSensor()
-51 | FileSensor()
-52 | TimeSensor()
-   | ^^^^^^^^^^
-53 | TimeSensorAsync()
+50 | PythonOperator()
+51 | PythonVirtualenvOperator()
+52 | ShortCircuitOperator()
+   | ^^^^^^^^^^^^^^^^^^^^
+53 | DateTimeSensorAsync()
+54 | ExternalTaskMarker()
    |
-help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensor` from `airflow.providers.standard.sensors.time` instead.
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead.
+26 |     BranchPythonOperator,
+27 |     PythonOperator,
+28 |     PythonVirtualenvOperator,
+   -     ShortCircuitOperator,
+29 | )
+30 | from airflow.sensors.bash import BashSensor
+31 | from airflow.sensors.date_time import DateTimeSensor
+--------------------------------------------------------------------------------
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.operators.python import ShortCircuitOperator
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-36 36 |     ExternalTaskSensor,
-37 37 | )
-38 38 | from airflow.sensors.time_sensor import (
-39    |-    TimeSensor,
-40 39 |     TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.sensors.time import TimeSensor
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
-
-AIR312 [*] `airflow.sensors.time_sensor.TimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR312 [*] `airflow.sensors.date_time.DateTimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   --> AIR312.py:53:1
    |
-51 | FileSensor()
-52 | TimeSensor()
-53 | TimeSensorAsync()
+51 | PythonVirtualenvOperator()
+52 | ShortCircuitOperator()
+53 | DateTimeSensorAsync()
+   | ^^^^^^^^^^^^^^^^^^^
+54 | ExternalTaskMarker()
+55 | ExternalTaskSensor()
+   |
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensorAsync` from `airflow.providers.standard.sensors.date_time` instead.
+38 | 
+39 | BashSensor()
+40 | DateTimeSensor()
+   - from airflow.sensors.date_time import DateTimeSensorAsync
+41 | from airflow.sensors.external_task import (
+42 |     ExternalTaskMarker,
+43 |     ExternalTaskSensor,
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.sensors.date_time import DateTimeSensorAsync
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR312 [*] `airflow.sensors.external_task.ExternalTaskMarker` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:54:1
+   |
+52 | ShortCircuitOperator()
+53 | DateTimeSensorAsync()
+54 | ExternalTaskMarker()
+   | ^^^^^^^^^^^^^^^^^^
+55 | ExternalTaskSensor()
+56 | FileSensor()
+   |
+help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead.
+40 | DateTimeSensor()
+41 | from airflow.sensors.date_time import DateTimeSensorAsync
+42 | from airflow.sensors.external_task import (
+   -     ExternalTaskMarker,
+43 |     ExternalTaskSensor,
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.sensors.external_task import ExternalTaskMarker
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR312 [*] `airflow.sensors.external_task.ExternalTaskSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:55:1
+   |
+53 | DateTimeSensorAsync()
+54 | ExternalTaskMarker()
+55 | ExternalTaskSensor()
+   | ^^^^^^^^^^^^^^^^^^
+56 | FileSensor()
+57 | PythonSensor()
+   |
+help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead.
+41 | from airflow.sensors.date_time import DateTimeSensorAsync
+42 | from airflow.sensors.external_task import (
+43 |     ExternalTaskMarker,
+   -     ExternalTaskSensor,
+44 | )
+45 | from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.sensors.external_task import ExternalTaskSensor
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR312 [*] `airflow.sensors.filesystem.FileSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:56:1
+   |
+54 | ExternalTaskMarker()
+55 | ExternalTaskSensor()
+56 | FileSensor()
+   | ^^^^^^^^^^
+57 | PythonSensor()
+   |
+help: Install `apache-airflow-providers-standard>=0.0.2` and use `FileSensor` from `airflow.providers.standard.sensors.filesystem` instead.
+43 |     ExternalTaskMarker,
+44 |     ExternalTaskSensor,
+45 | )
+   - from airflow.sensors.filesystem import FileSensor
+46 | from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.sensors.filesystem import FileSensor
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR312 [*] `airflow.sensors.python.PythonSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:57:1
+   |
+55 | ExternalTaskSensor()
+56 | FileSensor()
+57 | PythonSensor()
+   | ^^^^^^^^^^^^
+58 |
+59 | from airflow.sensors.time_sensor import (
+   |
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonSensor` from `airflow.providers.standard.sensors.python` instead.
+44 |     ExternalTaskSensor,
+45 | )
+46 | from airflow.sensors.filesystem import FileSensor
+   - from airflow.sensors.python import PythonSensor
+47 + from airflow.providers.standard.sensors.python import PythonSensor
+48 | 
+49 | BranchPythonOperator()
+50 | PythonOperator()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR312 [*] `airflow.sensors.time_sensor.TimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:64:1
+   |
+62 | )
+63 |
+64 | TimeSensor()
+   | ^^^^^^^^^^
+65 | TimeSensorAsync()
+   |
+help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensor` from `airflow.providers.standard.sensors.time` instead.
+57 | PythonSensor()
+58 | 
+59 | from airflow.sensors.time_sensor import (
+   -     TimeSensor,
+60 |     TimeSensorAsync,
+61 | )
+62 + from airflow.providers.standard.sensors.time import TimeSensor
+63 | 
+64 | TimeSensor()
+65 | TimeSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
+
+AIR312 [*] `airflow.sensors.time_sensor.TimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+  --> AIR312.py:65:1
+   |
+64 | TimeSensor()
+65 | TimeSensorAsync()
    | ^^^^^^^^^^^^^^^
-54 |
-55 | from airflow.sensors.time_delta import (
+66 |
+67 | from airflow.sensors.time_delta import (
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensorAsync` from `airflow.providers.standard.sensors.time` instead.
-
-ℹ Unsafe fix
-37 37 | )
-38 38 | from airflow.sensors.time_sensor import (
-39 39 |     TimeSensor,
-40    |-    TimeSensorAsync,
-41 40 | )
-42 41 | from airflow.sensors.filesystem import FileSensor
-   42 |+from airflow.providers.standard.sensors.time import TimeSensorAsync
-43 43 | 
-44 44 | BranchPythonOperator()
-45 45 | PythonOperator()
+58 | 
+59 | from airflow.sensors.time_sensor import (
+60 |     TimeSensor,
+   -     TimeSensorAsync,
+61 | )
+62 + from airflow.providers.standard.sensors.time import TimeSensorAsync
+63 | 
+64 | TimeSensor()
+65 | TimeSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.sensors.time_delta.TimeDeltaSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:70:1
+  --> AIR312.py:82:1
    |
-68 | )
-69 |
-70 | TimeDeltaSensor()
+80 | )
+81 |
+82 | TimeDeltaSensor()
    | ^^^^^^^^^^^^^^^
-71 | TimeDeltaSensorAsync()
-72 | DayOfWeekSensor()
+83 | TimeDeltaSensorAsync()
+84 | DayOfWeekSensor()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeDeltaSensor` from `airflow.providers.standard.sensors.time_delta` instead.
-
-ℹ Unsafe fix
-53 53 | TimeSensorAsync()
-54 54 | 
-55 55 | from airflow.sensors.time_delta import (
-56    |-    TimeDeltaSensor,
-57 56 |     TimeDeltaSensorAsync,
-58 57 | )
-59 58 | from airflow.sensors.weekday import DayOfWeekSensor
+65 | TimeSensorAsync()
+66 | 
+67 | from airflow.sensors.time_delta import (
+   -     TimeDeltaSensor,
+68 |     TimeDeltaSensorAsync,
+69 | )
+70 | from airflow.sensors.weekday import DayOfWeekSensor
 --------------------------------------------------------------------------------
-66 65 |     DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.sensors.time_delta import TimeDeltaSensor
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+77 |     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.sensors.time_delta import TimeDeltaSensor
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.sensors.time_delta.TimeDeltaSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:71:1
+  --> AIR312.py:83:1
    |
-70 | TimeDeltaSensor()
-71 | TimeDeltaSensorAsync()
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
    | ^^^^^^^^^^^^^^^^^^^^
-72 | DayOfWeekSensor()
-73 | DagStateTrigger()
+84 | DayOfWeekSensor()
+85 | DagStateTrigger()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeDeltaSensorAsync` from `airflow.providers.standard.sensors.time_delta` instead.
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | from airflow.sensors.time_delta import (
-56 56 |     TimeDeltaSensor,
-57    |-    TimeDeltaSensorAsync,
-58 57 | )
-59 58 | from airflow.sensors.weekday import DayOfWeekSensor
-60 59 | from airflow.triggers.external_task import (
+66 | 
+67 | from airflow.sensors.time_delta import (
+68 |     TimeDeltaSensor,
+   -     TimeDeltaSensorAsync,
+69 | )
+70 | from airflow.sensors.weekday import DayOfWeekSensor
+71 | from airflow.triggers.external_task import (
 --------------------------------------------------------------------------------
-66 65 |     DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.sensors.time_delta import TimeDeltaSensorAsync
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+77 |     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.sensors.time_delta import TimeDeltaSensorAsync
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.sensors.weekday.DayOfWeekSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:72:1
+  --> AIR312.py:84:1
    |
-70 | TimeDeltaSensor()
-71 | TimeDeltaSensorAsync()
-72 | DayOfWeekSensor()
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+84 | DayOfWeekSensor()
    | ^^^^^^^^^^^^^^^
-73 | DagStateTrigger()
-74 | WorkflowTrigger()
+85 | DagStateTrigger()
+86 | WorkflowTrigger()
    |
 help: Install `apache-airflow-providers-standard>=0.0.1` and use `DayOfWeekSensor` from `airflow.providers.standard.sensors.weekday` instead.
-
-ℹ Unsafe fix
-56 56 |     TimeDeltaSensor,
-57 57 |     TimeDeltaSensorAsync,
-58 58 | )
-59    |-from airflow.sensors.weekday import DayOfWeekSensor
-60 59 | from airflow.triggers.external_task import (
-61 60 |     DagStateTrigger,
-62 61 |     WorkflowTrigger,
+68 |     TimeDeltaSensor,
+69 |     TimeDeltaSensorAsync,
+70 | )
+   - from airflow.sensors.weekday import DayOfWeekSensor
+71 | from airflow.triggers.external_task import (
+72 |     DagStateTrigger,
+73 |     WorkflowTrigger,
 --------------------------------------------------------------------------------
-66 65 |     DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.sensors.weekday import DayOfWeekSensor
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+77 |     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.sensors.weekday import DayOfWeekSensor
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.triggers.external_task.DagStateTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:73:1
+  --> AIR312.py:85:1
    |
-71 | TimeDeltaSensorAsync()
-72 | DayOfWeekSensor()
-73 | DagStateTrigger()
+83 | TimeDeltaSensorAsync()
+84 | DayOfWeekSensor()
+85 | DagStateTrigger()
    | ^^^^^^^^^^^^^^^
-74 | WorkflowTrigger()
-75 | FileTrigger()
+86 | WorkflowTrigger()
+87 | FileTrigger()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `DagStateTrigger` from `airflow.providers.standard.triggers.external_task` instead.
-
-ℹ Unsafe fix
-58 58 | )
-59 59 | from airflow.sensors.weekday import DayOfWeekSensor
-60 60 | from airflow.triggers.external_task import (
-61    |-    DagStateTrigger,
-62 61 |     WorkflowTrigger,
-63 62 | )
-64 63 | from airflow.triggers.file import FileTrigger
+70 | )
+71 | from airflow.sensors.weekday import DayOfWeekSensor
+72 | from airflow.triggers.external_task import (
+   -     DagStateTrigger,
+73 |     WorkflowTrigger,
+74 | )
+75 | from airflow.triggers.file import FileTrigger
 --------------------------------------------------------------------------------
-66 65 |     DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.triggers.external_task import DagStateTrigger
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+77 |     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.triggers.external_task import DagStateTrigger
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.triggers.external_task.WorkflowTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:74:1
+  --> AIR312.py:86:1
    |
-72 | DayOfWeekSensor()
-73 | DagStateTrigger()
-74 | WorkflowTrigger()
+84 | DayOfWeekSensor()
+85 | DagStateTrigger()
+86 | WorkflowTrigger()
    | ^^^^^^^^^^^^^^^
-75 | FileTrigger()
-76 | DateTimeTrigger()
+87 | FileTrigger()
+88 | DateTimeTrigger()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `WorkflowTrigger` from `airflow.providers.standard.triggers.external_task` instead.
-
-ℹ Unsafe fix
-59 59 | from airflow.sensors.weekday import DayOfWeekSensor
-60 60 | from airflow.triggers.external_task import (
-61 61 |     DagStateTrigger,
-62    |-    WorkflowTrigger,
-63 62 | )
-64 63 | from airflow.triggers.file import FileTrigger
-65 64 | from airflow.triggers.temporal import (
-66 65 |     DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.triggers.external_task import WorkflowTrigger
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+71 | from airflow.sensors.weekday import DayOfWeekSensor
+72 | from airflow.triggers.external_task import (
+73 |     DagStateTrigger,
+   -     WorkflowTrigger,
+74 | )
+75 | from airflow.triggers.file import FileTrigger
+76 | from airflow.triggers.temporal import (
+77 |     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.triggers.external_task import WorkflowTrigger
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.triggers.file.FileTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:75:1
+  --> AIR312.py:87:1
    |
-73 | DagStateTrigger()
-74 | WorkflowTrigger()
-75 | FileTrigger()
+85 | DagStateTrigger()
+86 | WorkflowTrigger()
+87 | FileTrigger()
    | ^^^^^^^^^^^
-76 | DateTimeTrigger()
-77 | TimeDeltaTrigger()
+88 | DateTimeTrigger()
+89 | TimeDeltaTrigger()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `FileTrigger` from `airflow.providers.standard.triggers.file` instead.
-
-ℹ Unsafe fix
-61 61 |     DagStateTrigger,
-62 62 |     WorkflowTrigger,
-63 63 | )
-64    |-from airflow.triggers.file import FileTrigger
-65 64 | from airflow.triggers.temporal import (
-66 65 |     DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.triggers.file import FileTrigger
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+73 |     DagStateTrigger,
+74 |     WorkflowTrigger,
+75 | )
+   - from airflow.triggers.file import FileTrigger
+76 | from airflow.triggers.temporal import (
+77 |     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.triggers.file import FileTrigger
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.triggers.temporal.DateTimeTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:76:1
+  --> AIR312.py:88:1
    |
-74 | WorkflowTrigger()
-75 | FileTrigger()
-76 | DateTimeTrigger()
+86 | WorkflowTrigger()
+87 | FileTrigger()
+88 | DateTimeTrigger()
    | ^^^^^^^^^^^^^^^
-77 | TimeDeltaTrigger()
+89 | TimeDeltaTrigger()
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `DateTimeTrigger` from `airflow.providers.standard.triggers.temporal` instead.
-
-ℹ Unsafe fix
-63 63 | )
-64 64 | from airflow.triggers.file import FileTrigger
-65 65 | from airflow.triggers.temporal import (
-66    |-    DateTimeTrigger,
-67 66 |     TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.triggers.temporal import DateTimeTrigger
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+75 | )
+76 | from airflow.triggers.file import FileTrigger
+77 | from airflow.triggers.temporal import (
+   -     DateTimeTrigger,
+78 |     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.triggers.temporal import DateTimeTrigger
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
 
 AIR312 [*] `airflow.triggers.temporal.TimeDeltaTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR312.py:77:1
+  --> AIR312.py:89:1
    |
-75 | FileTrigger()
-76 | DateTimeTrigger()
-77 | TimeDeltaTrigger()
+87 | FileTrigger()
+88 | DateTimeTrigger()
+89 | TimeDeltaTrigger()
    | ^^^^^^^^^^^^^^^^
    |
 help: Install `apache-airflow-providers-standard>=0.0.3` and use `TimeDeltaTrigger` from `airflow.providers.standard.triggers.temporal` instead.
-
-ℹ Unsafe fix
-64 64 | from airflow.triggers.file import FileTrigger
-65 65 | from airflow.triggers.temporal import (
-66 66 |     DateTimeTrigger,
-67    |-    TimeDeltaTrigger,
-68 67 | )
-   68 |+from airflow.providers.standard.triggers.temporal import TimeDeltaTrigger
-69 69 | 
-70 70 | TimeDeltaSensor()
-71 71 | TimeDeltaSensorAsync()
+76 | from airflow.triggers.file import FileTrigger
+77 | from airflow.triggers.temporal import (
+78 |     DateTimeTrigger,
+   -     TimeDeltaTrigger,
+79 | )
+80 + from airflow.providers.standard.triggers.temporal import TimeDeltaTrigger
+81 | 
+82 | TimeDeltaSensor()
+83 | TimeDeltaSensorAsync()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/eradicate/rules/commented_out_code.rs b/crates/ruff_linter/src/rules/eradicate/rules/commented_out_code.rs
index a6a93a4514..a26d64d0ea 100644
--- a/crates/ruff_linter/src/rules/eradicate/rules/commented_out_code.rs
+++ b/crates/ruff_linter/src/rules/eradicate/rules/commented_out_code.rs
@@ -30,6 +30,7 @@ use crate::rules::eradicate::detection::comment_contains_code;
 ///
 /// [#4845]: https://github.com/astral-sh/ruff/issues/4845
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.145")]
 pub(crate) struct CommentedOutCode;
 
 impl Violation for CommentedOutCode {
diff --git a/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap b/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap
index 395f946062..60931a7b69 100644
--- a/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap
+++ b/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/eradicate/mod.rs
 ---
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
  --> ERA001.py:1:1
   |
 1 | #import os
@@ -10,14 +10,13 @@ ERA001 Found commented-out code
 3 | #a = 3
   |
 help: Remove commented-out code
+  - #import os
+1 | # from foo import junk
+2 | #a = 3
+3 | a = 4
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1   |-#import os
-2 1 | # from foo import junk
-3 2 | #a = 3
-4 3 | a = 4
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
  --> ERA001.py:2:1
   |
 1 | #import os
@@ -27,15 +26,14 @@ ERA001 Found commented-out code
 4 | a = 4
   |
 help: Remove commented-out code
+1 | #import os
+  - # from foo import junk
+2 | #a = 3
+3 | a = 4
+4 | #foo(1, 2, 3)
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1 1 | #import os
-2   |-# from foo import junk
-3 2 | #a = 3
-4 3 | a = 4
-5 4 | #foo(1, 2, 3)
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
  --> ERA001.py:3:1
   |
 1 | #import os
@@ -46,16 +44,15 @@ ERA001 Found commented-out code
 5 | #foo(1, 2, 3)
   |
 help: Remove commented-out code
+1 | #import os
+2 | # from foo import junk
+  - #a = 3
+3 | a = 4
+4 | #foo(1, 2, 3)
+5 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1 1 | #import os
-2 2 | # from foo import junk
-3   |-#a = 3
-4 3 | a = 4
-5 4 | #foo(1, 2, 3)
-6 5 | 
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
  --> ERA001.py:5:1
   |
 3 | #a = 3
@@ -66,17 +63,16 @@ ERA001 Found commented-out code
 7 | def foo(x, y, z):
   |
 help: Remove commented-out code
+2 | # from foo import junk
+3 | #a = 3
+4 | a = 4
+  - #foo(1, 2, 3)
+5 | 
+6 | def foo(x, y, z):
+7 |     content = 1 # print('hello')
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-2 2 | # from foo import junk
-3 3 | #a = 3
-4 4 | a = 4
-5   |-#foo(1, 2, 3)
-6 5 | 
-7 6 | def foo(x, y, z):
-8 7 |     content = 1 # print('hello')
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:13:5
    |
 11 |     # This is a real comment.
@@ -86,17 +82,16 @@ ERA001 Found commented-out code
 14 |     return False
    |
 help: Remove commented-out code
+10 | 
+11 |     # This is a real comment.
+12 |     # # This is a (nested) comment.
+   -     #return True
+13 |     return False
+14 | 
+15 | #import os  # noqa: ERA001
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-10 10 | 
-11 11 |     # This is a real comment.
-12 12 |     # # This is a (nested) comment.
-13    |-    #return True
-14 13 |     return False
-15 14 | 
-16 15 | #import os  # noqa: ERA001
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:21:5
    |
 19 | class A():
@@ -105,17 +100,16 @@ ERA001 Found commented-out code
    |     ^^^^^^^
    |
 help: Remove commented-out code
+18 | 
+19 | class A():
+20 |     pass
+   -     # b = c
+21 | 
+22 | 
+23 | dictionary = {
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-18 18 | 
-19 19 | class A():
-20 20 |     pass
-21    |-    # b = c
-22 21 | 
-23 22 | 
-24 23 | dictionary = {
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:26:5
    |
 24 | dictionary = {
@@ -126,17 +120,16 @@ ERA001 Found commented-out code
 28 | }
    |
 help: Remove commented-out code
+23 | 
+24 | dictionary = {
+25 |     # "key1": 123,  # noqa: ERA001
+   -     # "key2": 456,
+26 |     # "key3": 789,  # test
+27 | }
+28 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-23 23 | 
-24 24 | dictionary = {
-25 25 |     # "key1": 123,  # noqa: ERA001
-26    |-    # "key2": 456,
-27 26 |     # "key3": 789,  # test
-28 27 | }
-29 28 | 
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:27:5
    |
 25 |     # "key1": 123,  # noqa: ERA001
@@ -146,17 +139,16 @@ ERA001 Found commented-out code
 28 | }
    |
 help: Remove commented-out code
+24 | dictionary = {
+25 |     # "key1": 123,  # noqa: ERA001
+26 |     # "key2": 456,
+   -     # "key3": 789,  # test
+27 | }
+28 | 
+29 | #import os  # noqa
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-24 24 | dictionary = {
-25 25 |     # "key1": 123,  # noqa: ERA001
-26 26 |     # "key2": 456,
-27    |-    # "key3": 789,  # test
-28 27 | }
-29 28 | 
-30 29 | #import os  # noqa
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:32:1
    |
 30 | #import os  # noqa
@@ -167,17 +159,16 @@ ERA001 Found commented-out code
 34 | # try:  # with comment
    |
 help: Remove commented-out code
+29 | 
+30 | #import os  # noqa
+31 | 
+   - # case 1:
+32 | # try:
+33 | # try:  # with comment
+34 | # try: print()
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-29 29 | 
-30 30 | #import os  # noqa
-31 31 | 
-32    |-# case 1:
-33 32 | # try:
-34 33 | # try:  # with comment
-35 34 | # try: print()
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:33:1
    |
 32 | # case 1:
@@ -187,17 +178,16 @@ ERA001 Found commented-out code
 35 | # try: print()
    |
 help: Remove commented-out code
+30 | #import os  # noqa
+31 | 
+32 | # case 1:
+   - # try:
+33 | # try:  # with comment
+34 | # try: print()
+35 | # except:
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-30 30 | #import os  # noqa
-31 31 | 
-32 32 | # case 1:
-33    |-# try:
-34 33 | # try:  # with comment
-35 34 | # try: print()
-36 35 | # except:
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:34:1
    |
 32 | # case 1:
@@ -208,17 +198,16 @@ ERA001 Found commented-out code
 36 | # except:
    |
 help: Remove commented-out code
+31 | 
+32 | # case 1:
+33 | # try:
+   - # try:  # with comment
+34 | # try: print()
+35 | # except:
+36 | # except Foo:
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-31 31 | 
-32 32 | # case 1:
-33 33 | # try:
-34    |-# try:  # with comment
-35 34 | # try: print()
-36 35 | # except:
-37 36 | # except Foo:
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:35:1
    |
 33 | # try:
@@ -229,17 +218,16 @@ ERA001 Found commented-out code
 37 | # except Foo:
    |
 help: Remove commented-out code
+32 | # case 1:
+33 | # try:
+34 | # try:  # with comment
+   - # try: print()
+35 | # except:
+36 | # except Foo:
+37 | # except Exception as e: print(e)
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-32 32 | # case 1:
-33 33 | # try:
-34 34 | # try:  # with comment
-35    |-# try: print()
-36 35 | # except:
-37 36 | # except Foo:
-38 37 | # except Exception as e: print(e)
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:36:1
    |
 34 | # try:  # with comment
@@ -250,17 +238,16 @@ ERA001 Found commented-out code
 38 | # except Exception as e: print(e)
    |
 help: Remove commented-out code
+33 | # try:
+34 | # try:  # with comment
+35 | # try: print()
+   - # except:
+36 | # except Foo:
+37 | # except Exception as e: print(e)
+38 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-33 33 | # try:
-34 34 | # try:  # with comment
-35 35 | # try: print()
-36    |-# except:
-37 36 | # except Foo:
-38 37 | # except Exception as e: print(e)
-39 38 | 
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:37:1
    |
 35 | # try: print()
@@ -270,17 +257,16 @@ ERA001 Found commented-out code
 38 | # except Exception as e: print(e)
    |
 help: Remove commented-out code
+34 | # try:  # with comment
+35 | # try: print()
+36 | # except:
+   - # except Foo:
+37 | # except Exception as e: print(e)
+38 | 
+39 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-34 34 | # try:  # with comment
-35 35 | # try: print()
-36 36 | # except:
-37    |-# except Foo:
-38 37 | # except Exception as e: print(e)
-39 38 | 
-40 39 | 
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:38:1
    |
 36 | # except:
@@ -289,17 +275,16 @@ ERA001 Found commented-out code
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove commented-out code
+35 | # try: print()
+36 | # except:
+37 | # except Foo:
+   - # except Exception as e: print(e)
+38 | 
+39 | 
+40 | # Script tag without an opening tag (Error)
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-35 35 | # try: print()
-36 36 | # except:
-37 37 | # except Foo:
-38    |-# except Exception as e: print(e)
-39 38 | 
-40 39 | 
-41 40 | # Script tag without an opening tag (Error)
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:44:1
    |
 43 | # requires-python = ">=3.11"
@@ -309,17 +294,16 @@ ERA001 Found commented-out code
 46 | #   "rich",
    |
 help: Remove commented-out code
+41 | # Script tag without an opening tag (Error)
+42 | 
+43 | # requires-python = ">=3.11"
+   - # dependencies = [
+44 | #   "requests<3",
+45 | #   "rich",
+46 | # ]
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-41 41 | # Script tag without an opening tag (Error)
-42 42 | 
-43 43 | # requires-python = ">=3.11"
-44    |-# dependencies = [
-45 44 | #   "requests<3",
-46 45 | #   "rich",
-47 46 | # ]
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:47:1
    |
 45 | #   "requests<3",
@@ -329,17 +313,16 @@ ERA001 Found commented-out code
 48 | # ///
    |
 help: Remove commented-out code
+44 | # dependencies = [
+45 | #   "requests<3",
+46 | #   "rich",
+   - # ]
+47 | # ///
+48 | 
+49 | # Script tag (OK)
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-44 44 | # dependencies = [
-45 45 | #   "requests<3",
-46 46 | #   "rich",
-47    |-# ]
-48 47 | # ///
-49 48 | 
-50 49 | # Script tag (OK)
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:75:1
    |
 73 | # /// script
@@ -350,17 +333,16 @@ ERA001 Found commented-out code
 77 | #   "rich",
    |
 help: Remove commented-out code
+72 | 
+73 | # /// script
+74 | # requires-python = ">=3.11"
+   - # dependencies = [
+75 | #   "requests<3",
+76 | #   "rich",
+77 | # ]
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-72 72 | 
-73 73 | # /// script
-74 74 | # requires-python = ">=3.11"
-75    |-# dependencies = [
-76 75 | #   "requests<3",
-77 76 | #   "rich",
-78 77 | # ]
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> ERA001.py:78:1
    |
 76 | #   "requests<3",
@@ -371,12 +353,11 @@ ERA001 Found commented-out code
 80 | # Script tag block followed by normal block (Ok)
    |
 help: Remove commented-out code
-
-ℹ Display-only fix
-75 75 | # dependencies = [
-76 76 | #   "requests<3",
-77 77 | #   "rich",
-78    |-# ]
-79 78 | 
-80 79 | # Script tag block followed by normal block (Ok)
-81 80 |
+75 | # dependencies = [
+76 | #   "requests<3",
+77 | #   "rich",
+   - # ]
+78 | 
+79 | # Script tag block followed by normal block (Ok)
+80 | 
+note: This is a display-only fix and is likely to be incorrect
diff --git a/crates/ruff_linter/src/rules/fastapi/mod.rs b/crates/ruff_linter/src/rules/fastapi/mod.rs
index f6e48dd4ad..51ff84c5bc 100644
--- a/crates/ruff_linter/src/rules/fastapi/mod.rs
+++ b/crates/ruff_linter/src/rules/fastapi/mod.rs
@@ -8,35 +8,63 @@ mod tests {
     use anyhow::Result;
     use test_case::test_case;
 
+    use ruff_python_ast::PythonVersion;
+
     use crate::registry::Rule;
+    use crate::settings::LinterSettings;
     use crate::test::test_path;
-    use crate::{assert_diagnostics, settings};
+    use crate::{assert_diagnostics, assert_diagnostics_diff};
 
     #[test_case(Rule::FastApiRedundantResponseModel, Path::new("FAST001.py"))]
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_0.py"))]
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_1.py"))]
+    #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_2.py"))]
     #[test_case(Rule::FastApiUnusedPathParameter, Path::new("FAST003.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.name(), path.to_string_lossy());
         let diagnostics = test_path(
             Path::new("fastapi").join(path).as_path(),
-            &settings::LinterSettings::for_rule(rule_code),
+            &LinterSettings::for_rule(rule_code),
         )?;
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
 
+    #[test_case(Rule::FastApiRedundantResponseModel, Path::new("FAST001.py"))]
+    #[test_case(Rule::FastApiUnusedPathParameter, Path::new("FAST003.py"))]
+    fn deferred_annotations_diff(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "deferred_annotations_diff_{}_{}",
+            rule_code.name(),
+            path.to_string_lossy()
+        );
+        assert_diagnostics_diff!(
+            snapshot,
+            Path::new("fastapi").join(path).as_path(),
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY313.into(),
+                ..LinterSettings::for_rule(rule_code)
+            },
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY314.into(),
+                ..LinterSettings::for_rule(rule_code)
+            },
+        );
+        Ok(())
+    }
+
     // FAST002 autofixes use `typing_extensions` on Python 3.8,
     // since `typing.Annotated` was added in Python 3.9
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_0.py"))]
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_1.py"))]
+    #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_2.py"))]
     fn rules_py38(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}_py38", rule_code.name(), path.to_string_lossy());
         let diagnostics = test_path(
             Path::new("fastapi").join(path).as_path(),
-            &settings::LinterSettings {
-                unresolved_target_version: ruff_python_ast::PythonVersion::PY38.into(),
-                ..settings::LinterSettings::for_rule(rule_code)
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY38.into(),
+                ..LinterSettings::for_rule(rule_code)
             },
         )?;
         assert_diagnostics!(snapshot, diagnostics);
diff --git a/crates/ruff_linter/src/rules/fastapi/rules/fastapi_non_annotated_dependency.rs b/crates/ruff_linter/src/rules/fastapi/rules/fastapi_non_annotated_dependency.rs
index 8d0fa8b280..3de94ad67e 100644
--- a/crates/ruff_linter/src/rules/fastapi/rules/fastapi_non_annotated_dependency.rs
+++ b/crates/ruff_linter/src/rules/fastapi/rules/fastapi_non_annotated_dependency.rs
@@ -79,6 +79,7 @@ use ruff_python_ast::PythonVersion;
 /// [typing-annotated]: https://docs.python.org/3/library/typing.html#typing.Annotated
 /// [typing-extensions]: https://typing-extensions.readthedocs.io/en/stable/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct FastApiNonAnnotatedDependency {
     py_version: PythonVersion,
 }
@@ -275,19 +276,42 @@ fn create_diagnostic(
                     .collect::<Vec<_>>()
                     .join(", ");
 
-                seen_default = true;
-                format!(
-                    "{parameter_name}: {binding}[{annotation}, {default_}({kwarg_list})] \
-                            = {default_value}",
+                // Check if the default argument is ellipsis (...), which in FastAPI means "required"
+                let is_default_argument_ellipsis = matches!(
+                    dependency_call.default_argument.value(),
+                    ast::Expr::EllipsisLiteral(_)
+                );
+
+                if is_default_argument_ellipsis && seen_default {
+                    // For ellipsis after a parameter with default, can't remove the default
+                    return Ok(None);
+                }
+
+                if !is_default_argument_ellipsis {
+                    // For actual default values, mark that we've seen a default
+                    seen_default = true;
+                }
+
+                let base_format = format!(
+                    "{parameter_name}: {binding}[{annotation}, {default_}({kwarg_list})]",
                     parameter_name = parameter.name,
                     annotation = checker.locator().slice(parameter.annotation.range()),
                     default_ = checker
                         .locator()
                         .slice(map_callable(parameter.default).range()),
-                    default_value = checker
+                );
+
+                if is_default_argument_ellipsis {
+                    // For ellipsis, don't add a default value since the parameter
+                    // should remain required after conversion to Annotated
+                    base_format
+                } else {
+                    // For actual default values, preserve them
+                    let default_value = checker
                         .locator()
-                        .slice(dependency_call.default_argument.value().range()),
-                )
+                        .slice(dependency_call.default_argument.value().range());
+                    format!("{base_format} = {default_value}")
+                }
             }
             _ => {
                 if seen_default {
diff --git a/crates/ruff_linter/src/rules/fastapi/rules/fastapi_redundant_response_model.rs b/crates/ruff_linter/src/rules/fastapi/rules/fastapi_redundant_response_model.rs
index a6707d1ea1..440be901a7 100644
--- a/crates/ruff_linter/src/rules/fastapi/rules/fastapi_redundant_response_model.rs
+++ b/crates/ruff_linter/src/rules/fastapi/rules/fastapi_redundant_response_model.rs
@@ -59,6 +59,7 @@ use crate::{AlwaysFixableViolation, Fix};
 ///     return item
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct FastApiRedundantResponseModel;
 
 impl AlwaysFixableViolation for FastApiRedundantResponseModel {
diff --git a/crates/ruff_linter/src/rules/fastapi/rules/fastapi_unused_path_parameter.rs b/crates/ruff_linter/src/rules/fastapi/rules/fastapi_unused_path_parameter.rs
index e0d215b45c..92a04f11e5 100644
--- a/crates/ruff_linter/src/rules/fastapi/rules/fastapi_unused_path_parameter.rs
+++ b/crates/ruff_linter/src/rules/fastapi/rules/fastapi_unused_path_parameter.rs
@@ -1,6 +1,7 @@
-use std::iter::Peekable;
 use std::ops::Range;
-use std::str::CharIndices;
+use std::sync::LazyLock;
+
+use regex::{CaptureMatches, Regex};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
@@ -63,6 +64,7 @@ use crate::{FixAvailability, Violation};
 /// This rule's fix is marked as unsafe, as modifying a function signature can
 /// change the behavior of the code.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct FastApiUnusedPathParameter {
     arg_name: String,
     function_name: String,
@@ -79,7 +81,6 @@ impl Violation for FastApiUnusedPathParameter {
             function_name,
             is_positional,
         } = self;
-        #[expect(clippy::if_not_else)]
         if !is_positional {
             format!(
                 "Parameter `{arg_name}` appears in route path, but not in `{function_name}` signature"
@@ -166,11 +167,6 @@ pub(crate) fn fastapi_unused_path_parameter(
 
     // Check if any of the path parameters are not in the function signature.
     for (path_param, range) in path_params {
-        // Ignore invalid identifiers (e.g., `user-id`, as opposed to `user_id`)
-        if !is_identifier(path_param) {
-            continue;
-        }
-
         // If the path parameter is already in the function or the dependency signature,
         // we don't need to do anything.
         if named_args.contains(&path_param) {
@@ -197,7 +193,7 @@ pub(crate) fn fastapi_unused_path_parameter(
                 .add_start(TextSize::from(range.start as u32 + 1))
                 .sub_end(TextSize::from((path.len() - range.end + 1) as u32)),
         );
-        if !is_positional {
+        if !is_positional && is_identifier(path_param) && path_param != "__debug__" {
             diagnostic.set_fix(Fix::unsafe_edit(add_parameter(
                 path_param,
                 &function_def.parameters,
@@ -457,17 +453,24 @@ fn parameter_alias<'a>(parameter: &'a Parameter, semantic: &SemanticModel) -> Op
 ///
 /// The iterator yields tuples of the parameter name and the range of the parameter in the input,
 /// inclusive of curly braces.
+///
+/// FastAPI only recognizes path parameters when there are no leading or trailing spaces around
+/// the parameter name. For example, `/{x}` is a valid parameter, but `/{ x }` is treated literally.
 #[derive(Debug)]
 struct PathParamIterator<'a> {
-    input: &'a str,
-    chars: Peekable<CharIndices<'a>>,
+    inner: CaptureMatches<'a, 'a>,
 }
 
 impl<'a> PathParamIterator<'a> {
     fn new(input: &'a str) -> Self {
-        PathParamIterator {
-            input,
-            chars: input.char_indices().peekable(),
+        /// Matches the Starlette pattern for path parameters with optional converters from
+        /// <https://github.com/Kludex/starlette/blob/e18637c68e36d112b1983bc0c8b663681e6a4c50/starlette/routing.py#L121>
+        static FASTAPI_PATH_PARAM_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+            Regex::new(r"\{([a-zA-Z_][a-zA-Z0-9_]*)(?::[a-zA-Z_][a-zA-Z0-9_]*)?\}").unwrap()
+        });
+
+        Self {
+            inner: FASTAPI_PATH_PARAM_REGEX.captures_iter(input),
         }
     }
 }
@@ -476,20 +479,10 @@ impl<'a> Iterator for PathParamIterator<'a> {
     type Item = (&'a str, Range<usize>);
 
     fn next(&mut self) -> Option<Self::Item> {
-        while let Some((start, c)) = self.chars.next() {
-            if c == '{' {
-                if let Some((end, _)) = self.chars.by_ref().find(|&(_, ch)| ch == '}') {
-                    let param_content = &self.input[start + 1..end];
-                    // We ignore text after a colon, since those are path converters
-                    // See also: https://fastapi.tiangolo.com/tutorial/path-params/?h=path#path-convertor
-                    let param_name_end = param_content.find(':').unwrap_or(param_content.len());
-                    let param_name = &param_content[..param_name_end].trim();
-
-                    #[expect(clippy::range_plus_one)]
-                    return Some((param_name, start..end + 1));
-                }
-            }
-        }
-        None
+        self.inner
+            .next()
+            // Extract the first capture group (the path parameter), but return the range of the
+            // whole match (everything in braces and including the braces themselves).
+            .and_then(|capture| Some((capture.get(1)?.as_str(), capture.get(0)?.range())))
     }
 }
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__deferred_annotations_diff_fast-api-redundant-response-model_FAST001.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__deferred_annotations_diff_fast-api-redundant-response-model_FAST001.py.snap
new file mode 100644
index 0000000000..fc36a819d1
--- /dev/null
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__deferred_annotations_diff_fast-api-redundant-response-model_FAST001.py.snap
@@ -0,0 +1,213 @@
+---
+source: crates/ruff_linter/src/rules/fastapi/mod.rs
+---
+--- Linter settings ---
+-linter.unresolved_target_version = 3.13
++linter.unresolved_target_version = 3.14
+
+--- Summary ---
+Removed: 10
+Added: 0
+
+--- Removed ---
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:17:22
+   |
+17 | @app.post("/items/", response_model=Item)
+   |                      ^^^^^^^^^^^^^^^^^^^
+18 | async def create_item(item: Item) -> Item:
+19 |     return item
+   |
+help: Remove argument
+14 | # Errors
+15 | 
+16 | 
+   - @app.post("/items/", response_model=Item)
+17 + @app.post("/items/")
+18 | async def create_item(item: Item) -> Item:
+19 |     return item
+20 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:22:22
+   |
+22 | @app.post("/items/", response_model=list[Item])
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
+23 | async def create_item(item: Item) -> list[Item]:
+24 |     return item
+   |
+help: Remove argument
+19 |     return item
+20 | 
+21 | 
+   - @app.post("/items/", response_model=list[Item])
+22 + @app.post("/items/")
+23 | async def create_item(item: Item) -> list[Item]:
+24 |     return item
+25 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:27:22
+   |
+27 | @app.post("/items/", response_model=List[Item])
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
+28 | async def create_item(item: Item) -> List[Item]:
+29 |     return item
+   |
+help: Remove argument
+24 |     return item
+25 | 
+26 | 
+   - @app.post("/items/", response_model=List[Item])
+27 + @app.post("/items/")
+28 | async def create_item(item: Item) -> List[Item]:
+29 |     return item
+30 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:32:22
+   |
+32 | @app.post("/items/", response_model=Dict[str, Item])
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+33 | async def create_item(item: Item) -> Dict[str, Item]:
+34 |     return item
+   |
+help: Remove argument
+29 |     return item
+30 | 
+31 | 
+   - @app.post("/items/", response_model=Dict[str, Item])
+32 + @app.post("/items/")
+33 | async def create_item(item: Item) -> Dict[str, Item]:
+34 |     return item
+35 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:37:22
+   |
+37 | @app.post("/items/", response_model=str)
+   |                      ^^^^^^^^^^^^^^^^^^
+38 | async def create_item(item: Item) -> str:
+39 |     return item
+   |
+help: Remove argument
+34 |     return item
+35 | 
+36 | 
+   - @app.post("/items/", response_model=str)
+37 + @app.post("/items/")
+38 | async def create_item(item: Item) -> str:
+39 |     return item
+40 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:42:21
+   |
+42 | @app.get("/items/", response_model=Item)
+   |                     ^^^^^^^^^^^^^^^^^^^
+43 | async def create_item(item: Item) -> Item:
+44 |     return item
+   |
+help: Remove argument
+39 |     return item
+40 | 
+41 | 
+   - @app.get("/items/", response_model=Item)
+42 + @app.get("/items/")
+43 | async def create_item(item: Item) -> Item:
+44 |     return item
+45 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:47:21
+   |
+47 | @app.get("/items/", response_model=Item)
+   |                     ^^^^^^^^^^^^^^^^^^^
+48 | @app.post("/items/", response_model=Item)
+49 | async def create_item(item: Item) -> Item:
+   |
+help: Remove argument
+44 |     return item
+45 | 
+46 | 
+   - @app.get("/items/", response_model=Item)
+47 + @app.get("/items/")
+48 | @app.post("/items/", response_model=Item)
+49 | async def create_item(item: Item) -> Item:
+50 |     return item
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:48:22
+   |
+47 | @app.get("/items/", response_model=Item)
+48 | @app.post("/items/", response_model=Item)
+   |                      ^^^^^^^^^^^^^^^^^^^
+49 | async def create_item(item: Item) -> Item:
+50 |     return item
+   |
+help: Remove argument
+45 | 
+46 | 
+47 | @app.get("/items/", response_model=Item)
+   - @app.post("/items/", response_model=Item)
+48 + @app.post("/items/")
+49 | async def create_item(item: Item) -> Item:
+50 |     return item
+51 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+  --> FAST001.py:53:24
+   |
+53 | @router.get("/items/", response_model=Item)
+   |                        ^^^^^^^^^^^^^^^^^^^
+54 | async def create_item(item: Item) -> Item:
+55 |     return item
+   |
+help: Remove argument
+50 |     return item
+51 | 
+52 | 
+   - @router.get("/items/", response_model=Item)
+53 + @router.get("/items/")
+54 | async def create_item(item: Item) -> Item:
+55 |     return item
+56 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST001 [*] FastAPI route with redundant `response_model` argument
+   --> FAST001.py:118:23
+    |
+116 | def setup_app(app_arg: FastAPI, non_app: str) -> None:
+117 |     # Error
+118 |     @app_arg.get("/", response_model=str)
+    |                       ^^^^^^^^^^^^^^^^^^
+119 |     async def get_root() -> str:
+120 |         return "Hello World!"
+    |
+help: Remove argument
+115 | 
+116 | def setup_app(app_arg: FastAPI, non_app: str) -> None:
+117 |     # Error
+    -     @app_arg.get("/", response_model=str)
+118 +     @app_arg.get("/")
+119 |     async def get_root() -> str:
+120 |         return "Hello World!"
+121 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__deferred_annotations_diff_fast-api-unused-path-parameter_FAST003.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__deferred_annotations_diff_fast-api-unused-path-parameter_FAST003.py.snap
new file mode 100644
index 0000000000..2feae227db
--- /dev/null
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__deferred_annotations_diff_fast-api-unused-path-parameter_FAST003.py.snap
@@ -0,0 +1,74 @@
+---
+source: crates/ruff_linter/src/rules/fastapi/mod.rs
+---
+--- Linter settings ---
+-linter.unresolved_target_version = 3.13
++linter.unresolved_target_version = 3.14
+
+--- Summary ---
+Removed: 3
+Added: 0
+
+--- Removed ---
+FAST003 [*] Parameter `thing_id` appears in route path, but not in `single` signature
+   --> FAST003.py:158:19
+    |
+157 | ### Errors
+158 | @app.get("/things/{thing_id}")
+    |                   ^^^^^^^^^^
+159 | async def single(other: Annotated[str, Depends(something_else)]): ...
+160 | @app.get("/things/{thing_id}")
+    |
+help: Add `thing_id` to function signature
+156 | 
+157 | ### Errors
+158 | @app.get("/things/{thing_id}")
+    - async def single(other: Annotated[str, Depends(something_else)]): ...
+159 + async def single(other: Annotated[str, Depends(something_else)], thing_id): ...
+160 | @app.get("/things/{thing_id}")
+161 | async def default(other: str = Depends(something_else)): ...
+162 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_full` signature
+   --> FAST003.py:197:12
+    |
+196 | # Errors
+197 | @app.get("/{id}")
+    |            ^^^^
+198 | async def get_id_pydantic_full(
+199 |     params: Annotated[PydanticParams, Depends(PydanticParams)],
+    |
+help: Add `id` to function signature
+196 | # Errors
+197 | @app.get("/{id}")
+198 | async def get_id_pydantic_full(
+    -     params: Annotated[PydanticParams, Depends(PydanticParams)],
+199 +     params: Annotated[PydanticParams, Depends(PydanticParams)], id,
+200 | ): ...
+201 | @app.get("/{id}")
+202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
+note: This is an unsafe fix and may change runtime behavior
+
+
+FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_short` signature
+   --> FAST003.py:201:12
+    |
+199 |     params: Annotated[PydanticParams, Depends(PydanticParams)],
+200 | ): ...
+201 | @app.get("/{id}")
+    |            ^^^^
+202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
+203 | @app.get("/{id}")
+    |
+help: Add `id` to function signature
+199 |     params: Annotated[PydanticParams, Depends(PydanticParams)],
+200 | ): ...
+201 | @app.get("/{id}")
+    - async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
+202 + async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()], id): ...
+203 | @app.get("/{id}")
+204 | async def get_id_init_not_annotated(params = Depends(InitParams)): ...
+205 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap
index cc586b5dad..6ef955da5a 100644
--- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap
@@ -12,24 +12,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 26 | ):
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-21 22 | 
-22 23 | @app.get("/items/")
-23 24 | def get_items(
-24    |-    current_user: User = Depends(get_current_user),
-   25 |+    current_user: Annotated[User, Depends(get_current_user)],
-25 26 |     some_security_param: str = Security(get_oauth2_user),
-26 27 | ):
-27 28 |     pass
+22 | 
+23 | @app.get("/items/")
+24 | def get_items(
+   -     current_user: User = Depends(get_current_user),
+25 +     current_user: Annotated[User, Depends(get_current_user)],
+26 |     some_security_param: str = Security(get_oauth2_user),
+27 | ):
+28 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:25:5
@@ -42,24 +41,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 27 |     pass
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-22 23 | @app.get("/items/")
-23 24 | def get_items(
-24 25 |     current_user: User = Depends(get_current_user),
-25    |-    some_security_param: str = Security(get_oauth2_user),
-   26 |+    some_security_param: Annotated[str, Security(get_oauth2_user)],
-26 27 | ):
-27 28 |     pass
-28 29 | 
+23 | @app.get("/items/")
+24 | def get_items(
+25 |     current_user: User = Depends(get_current_user),
+   -     some_security_param: str = Security(get_oauth2_user),
+26 +     some_security_param: Annotated[str, Security(get_oauth2_user)],
+27 | ):
+28 |     pass
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:32:5
@@ -72,24 +70,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 34 |     some_file_param: UploadFile = File(),
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-29 30 | 
-30 31 | @app.post("/stuff/")
-31 32 | def do_stuff(
-32    |-    some_path_param: str = Path(),
-   33 |+    some_path_param: Annotated[str, Path()],
-33 34 |     some_cookie_param: str = Cookie(),
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
+30 | 
+31 | @app.post("/stuff/")
+32 | def do_stuff(
+   -     some_path_param: str = Path(),
+33 +     some_path_param: Annotated[str, Path()],
+34 |     some_cookie_param: str = Cookie(),
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:33:5
@@ -102,24 +99,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 35 |     some_form_param: str = Form(),
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-30 31 | @app.post("/stuff/")
-31 32 | def do_stuff(
-32 33 |     some_path_param: str = Path(),
-33    |-    some_cookie_param: str = Cookie(),
-   34 |+    some_cookie_param: Annotated[str, Cookie()],
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
+31 | @app.post("/stuff/")
+32 | def do_stuff(
+33 |     some_path_param: str = Path(),
+   -     some_cookie_param: str = Cookie(),
+34 +     some_cookie_param: Annotated[str, Cookie()],
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:34:5
@@ -132,24 +128,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 36 |     some_query_param: str | None = Query(default=None),
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-31 32 | def do_stuff(
-32 33 |     some_path_param: str = Path(),
-33 34 |     some_cookie_param: str = Cookie(),
-34    |-    some_file_param: UploadFile = File(),
-   35 |+    some_file_param: Annotated[UploadFile, File()],
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
-37 38 |     some_body_param: str = Body("foo"),
+32 | def do_stuff(
+33 |     some_path_param: str = Path(),
+34 |     some_cookie_param: str = Cookie(),
+   -     some_file_param: UploadFile = File(),
+35 +     some_file_param: Annotated[UploadFile, File()],
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+38 |     some_body_param: str = Body("foo"),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:35:5
@@ -162,24 +157,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 37 |     some_body_param: str = Body("foo"),
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-32 33 |     some_path_param: str = Path(),
-33 34 |     some_cookie_param: str = Cookie(),
-34 35 |     some_file_param: UploadFile = File(),
-35    |-    some_form_param: str = Form(),
-   36 |+    some_form_param: Annotated[str, Form()],
-36 37 |     some_query_param: str | None = Query(default=None),
-37 38 |     some_body_param: str = Body("foo"),
-38 39 |     some_header_param: int = Header(default=5),
+33 |     some_path_param: str = Path(),
+34 |     some_cookie_param: str = Cookie(),
+35 |     some_file_param: UploadFile = File(),
+   -     some_form_param: str = Form(),
+36 +     some_form_param: Annotated[str, Form()],
+37 |     some_query_param: str | None = Query(default=None),
+38 |     some_body_param: str = Body("foo"),
+39 |     some_header_param: int = Header(default=5),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:36:5
@@ -192,24 +186,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 38 |     some_header_param: int = Header(default=5),
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-33 34 |     some_cookie_param: str = Cookie(),
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
-36    |-    some_query_param: str | None = Query(default=None),
-   37 |+    some_query_param: Annotated[str | None, Query()] = None,
-37 38 |     some_body_param: str = Body("foo"),
-38 39 |     some_header_param: int = Header(default=5),
-39 40 | ):
+34 |     some_cookie_param: str = Cookie(),
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+   -     some_query_param: str | None = Query(default=None),
+37 +     some_query_param: Annotated[str | None, Query()] = None,
+38 |     some_body_param: str = Body("foo"),
+39 |     some_header_param: int = Header(default=5),
+40 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:37:5
@@ -222,24 +215,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 39 | ):
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
-37    |-    some_body_param: str = Body("foo"),
-   38 |+    some_body_param: Annotated[str, Body()] = "foo",
-38 39 |     some_header_param: int = Header(default=5),
-39 40 | ):
-40 41 |     # do stuff
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+   -     some_body_param: str = Body("foo"),
+38 +     some_body_param: Annotated[str, Body()] = "foo",
+39 |     some_header_param: int = Header(default=5),
+40 | ):
+41 |     # do stuff
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:38:5
@@ -252,24 +244,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 40 |     # do stuff
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
-37 38 |     some_body_param: str = Body("foo"),
-38    |-    some_header_param: int = Header(default=5),
-   39 |+    some_header_param: Annotated[int, Header()] = 5,
-39 40 | ):
-40 41 |     # do stuff
-41 42 |     pass
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+38 |     some_body_param: str = Body("foo"),
+   -     some_header_param: int = Header(default=5),
+39 +     some_header_param: Annotated[int, Header()] = 5,
+40 | ):
+41 |     # do stuff
+42 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:47:5
@@ -282,24 +273,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 49 |     pass
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-44 45 | def get_users(
-45 46 |     skip: int,
-46 47 |     limit: int,
-47    |-    current_user: User = Depends(get_current_user),
-   48 |+    current_user: Annotated[User, Depends(get_current_user)],
-48 49 | ):
-49 50 |     pass
-50 51 | 
+45 | def get_users(
+46 |     skip: int,
+47 |     limit: int,
+   -     current_user: User = Depends(get_current_user),
+48 +     current_user: Annotated[User, Depends(get_current_user)],
+49 | ):
+50 |     pass
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:53:5
@@ -312,24 +302,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 55 |     limit: int = 10,
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-50 51 | 
-51 52 | @app.get("/users/")
-52 53 | def get_users(
-53    |-    current_user: User = Depends(get_current_user),
-   54 |+    current_user: Annotated[User, Depends(get_current_user)],
-54 55 |     skip: int = 0,
-55 56 |     limit: int = 10,
-56 57 | ):
+51 | 
+52 | @app.get("/users/")
+53 | def get_users(
+   -     current_user: User = Depends(get_current_user),
+54 +     current_user: Annotated[User, Depends(get_current_user)],
+55 |     skip: int = 0,
+56 |     limit: int = 10,
+57 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:61:25
@@ -340,24 +329,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 62 |     pass
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-58 59 | 
-59 60 | 
-60 61 | @app.get("/items/{item_id}")
-61    |-async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str):
-   62 |+async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str):
-62 63 |     pass
-63 64 | 
-64 65 | # Non fixable errors
+59 | 
+60 | 
+61 | @app.get("/items/{item_id}")
+   - async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str):
+62 + async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str):
+63 |     pass
+64 | 
+65 | # Non fixable errors
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 FastAPI dependency without `Annotated`
   --> FAST002_0.py:70:5
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap
index 31a2121a47..140f353c19 100644
--- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap
@@ -12,24 +12,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 26 | ):
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-21 22 | 
-22 23 | @app.get("/items/")
-23 24 | def get_items(
-24    |-    current_user: User = Depends(get_current_user),
-   25 |+    current_user: Annotated[User, Depends(get_current_user)],
-25 26 |     some_security_param: str = Security(get_oauth2_user),
-26 27 | ):
-27 28 |     pass
+22 | 
+23 | @app.get("/items/")
+24 | def get_items(
+   -     current_user: User = Depends(get_current_user),
+25 +     current_user: Annotated[User, Depends(get_current_user)],
+26 |     some_security_param: str = Security(get_oauth2_user),
+27 | ):
+28 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:25:5
@@ -42,24 +41,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 27 |     pass
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-22 23 | @app.get("/items/")
-23 24 | def get_items(
-24 25 |     current_user: User = Depends(get_current_user),
-25    |-    some_security_param: str = Security(get_oauth2_user),
-   26 |+    some_security_param: Annotated[str, Security(get_oauth2_user)],
-26 27 | ):
-27 28 |     pass
-28 29 | 
+23 | @app.get("/items/")
+24 | def get_items(
+25 |     current_user: User = Depends(get_current_user),
+   -     some_security_param: str = Security(get_oauth2_user),
+26 +     some_security_param: Annotated[str, Security(get_oauth2_user)],
+27 | ):
+28 |     pass
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:32:5
@@ -72,24 +70,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 34 |     some_file_param: UploadFile = File(),
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-29 30 | 
-30 31 | @app.post("/stuff/")
-31 32 | def do_stuff(
-32    |-    some_path_param: str = Path(),
-   33 |+    some_path_param: Annotated[str, Path()],
-33 34 |     some_cookie_param: str = Cookie(),
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
+30 | 
+31 | @app.post("/stuff/")
+32 | def do_stuff(
+   -     some_path_param: str = Path(),
+33 +     some_path_param: Annotated[str, Path()],
+34 |     some_cookie_param: str = Cookie(),
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:33:5
@@ -102,24 +99,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 35 |     some_form_param: str = Form(),
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-30 31 | @app.post("/stuff/")
-31 32 | def do_stuff(
-32 33 |     some_path_param: str = Path(),
-33    |-    some_cookie_param: str = Cookie(),
-   34 |+    some_cookie_param: Annotated[str, Cookie()],
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
+31 | @app.post("/stuff/")
+32 | def do_stuff(
+33 |     some_path_param: str = Path(),
+   -     some_cookie_param: str = Cookie(),
+34 +     some_cookie_param: Annotated[str, Cookie()],
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:34:5
@@ -132,24 +128,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 36 |     some_query_param: str | None = Query(default=None),
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-31 32 | def do_stuff(
-32 33 |     some_path_param: str = Path(),
-33 34 |     some_cookie_param: str = Cookie(),
-34    |-    some_file_param: UploadFile = File(),
-   35 |+    some_file_param: Annotated[UploadFile, File()],
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
-37 38 |     some_body_param: str = Body("foo"),
+32 | def do_stuff(
+33 |     some_path_param: str = Path(),
+34 |     some_cookie_param: str = Cookie(),
+   -     some_file_param: UploadFile = File(),
+35 +     some_file_param: Annotated[UploadFile, File()],
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+38 |     some_body_param: str = Body("foo"),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:35:5
@@ -162,24 +157,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 37 |     some_body_param: str = Body("foo"),
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-32 33 |     some_path_param: str = Path(),
-33 34 |     some_cookie_param: str = Cookie(),
-34 35 |     some_file_param: UploadFile = File(),
-35    |-    some_form_param: str = Form(),
-   36 |+    some_form_param: Annotated[str, Form()],
-36 37 |     some_query_param: str | None = Query(default=None),
-37 38 |     some_body_param: str = Body("foo"),
-38 39 |     some_header_param: int = Header(default=5),
+33 |     some_path_param: str = Path(),
+34 |     some_cookie_param: str = Cookie(),
+35 |     some_file_param: UploadFile = File(),
+   -     some_form_param: str = Form(),
+36 +     some_form_param: Annotated[str, Form()],
+37 |     some_query_param: str | None = Query(default=None),
+38 |     some_body_param: str = Body("foo"),
+39 |     some_header_param: int = Header(default=5),
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:36:5
@@ -192,24 +186,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 38 |     some_header_param: int = Header(default=5),
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-33 34 |     some_cookie_param: str = Cookie(),
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
-36    |-    some_query_param: str | None = Query(default=None),
-   37 |+    some_query_param: Annotated[str | None, Query()] = None,
-37 38 |     some_body_param: str = Body("foo"),
-38 39 |     some_header_param: int = Header(default=5),
-39 40 | ):
+34 |     some_cookie_param: str = Cookie(),
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+   -     some_query_param: str | None = Query(default=None),
+37 +     some_query_param: Annotated[str | None, Query()] = None,
+38 |     some_body_param: str = Body("foo"),
+39 |     some_header_param: int = Header(default=5),
+40 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:37:5
@@ -222,24 +215,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 39 | ):
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-34 35 |     some_file_param: UploadFile = File(),
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
-37    |-    some_body_param: str = Body("foo"),
-   38 |+    some_body_param: Annotated[str, Body()] = "foo",
-38 39 |     some_header_param: int = Header(default=5),
-39 40 | ):
-40 41 |     # do stuff
+35 |     some_file_param: UploadFile = File(),
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+   -     some_body_param: str = Body("foo"),
+38 +     some_body_param: Annotated[str, Body()] = "foo",
+39 |     some_header_param: int = Header(default=5),
+40 | ):
+41 |     # do stuff
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:38:5
@@ -252,24 +244,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 40 |     # do stuff
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-35 36 |     some_form_param: str = Form(),
-36 37 |     some_query_param: str | None = Query(default=None),
-37 38 |     some_body_param: str = Body("foo"),
-38    |-    some_header_param: int = Header(default=5),
-   39 |+    some_header_param: Annotated[int, Header()] = 5,
-39 40 | ):
-40 41 |     # do stuff
-41 42 |     pass
+36 |     some_form_param: str = Form(),
+37 |     some_query_param: str | None = Query(default=None),
+38 |     some_body_param: str = Body("foo"),
+   -     some_header_param: int = Header(default=5),
+39 +     some_header_param: Annotated[int, Header()] = 5,
+40 | ):
+41 |     # do stuff
+42 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:47:5
@@ -282,24 +273,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 49 |     pass
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-44 45 | def get_users(
-45 46 |     skip: int,
-46 47 |     limit: int,
-47    |-    current_user: User = Depends(get_current_user),
-   48 |+    current_user: Annotated[User, Depends(get_current_user)],
-48 49 | ):
-49 50 |     pass
-50 51 | 
+45 | def get_users(
+46 |     skip: int,
+47 |     limit: int,
+   -     current_user: User = Depends(get_current_user),
+48 +     current_user: Annotated[User, Depends(get_current_user)],
+49 | ):
+50 |     pass
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:53:5
@@ -312,24 +302,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 55 |     limit: int = 10,
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-50 51 | 
-51 52 | @app.get("/users/")
-52 53 | def get_users(
-53    |-    current_user: User = Depends(get_current_user),
-   54 |+    current_user: Annotated[User, Depends(get_current_user)],
-54 55 |     skip: int = 0,
-55 56 |     limit: int = 10,
-56 57 | ):
+51 | 
+52 | @app.get("/users/")
+53 | def get_users(
+   -     current_user: User = Depends(get_current_user),
+54 +     current_user: Annotated[User, Depends(get_current_user)],
+55 |     skip: int = 0,
+56 |     limit: int = 10,
+57 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_0.py:61:25
@@ -340,24 +329,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 62 |     pass
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-12 12 |     Security,
-13 13 | )
-14 14 | from pydantic import BaseModel
-   15 |+from typing_extensions import Annotated
-15 16 | 
-16 17 | app = FastAPI()
-17 18 | router = APIRouter()
+12 |     Security,
+13 | )
+14 | from pydantic import BaseModel
+15 + from typing_extensions import Annotated
+16 | 
+17 | app = FastAPI()
+18 | router = APIRouter()
 --------------------------------------------------------------------------------
-58 59 | 
-59 60 | 
-60 61 | @app.get("/items/{item_id}")
-61    |-async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str):
-   62 |+async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str):
-62 63 |     pass
-63 64 | 
-64 65 | # Non fixable errors
+59 | 
+60 | 
+61 | @app.get("/items/{item_id}")
+   - async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str):
+62 + async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str):
+63 |     pass
+64 | 
+65 | # Non fixable errors
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 FastAPI dependency without `Annotated`
   --> FAST002_0.py:70:5
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap
index 90cef9a1a3..27e4efefd5 100644
--- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap
@@ -10,22 +10,21 @@ FAST002 [*] FastAPI dependency without `Annotated`
 11 |     return echo
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-2  2  | values. See #15043 for more details."""
-3  3  | 
-4  4  | from fastapi import FastAPI, Query
-   5  |+from typing import Annotated
-5  6  | 
-6  7  | app = FastAPI()
-7  8  | 
-8  9  | 
-9  10 | @app.get("/test")
-10    |-def handler(echo: str = Query("")):
-   11 |+def handler(echo: Annotated[str, Query()] = ""):
-11 12 |     return echo
-12 13 | 
-13 14 | 
+2  | values. See #15043 for more details."""
+3  | 
+4  | from fastapi import FastAPI, Query
+5  + from typing import Annotated
+6  | 
+7  | app = FastAPI()
+8  | 
+9  | 
+10 | @app.get("/test")
+   - def handler(echo: str = Query("")):
+11 + def handler(echo: Annotated[str, Query()] = ""):
+12 |     return echo
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_1.py:15:14
@@ -36,24 +35,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 16 |     return echo
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-2  2  | values. See #15043 for more details."""
-3  3  | 
-4  4  | from fastapi import FastAPI, Query
-   5  |+from typing import Annotated
-5  6  | 
-6  7  | app = FastAPI()
-7  8  | 
+2  | values. See #15043 for more details."""
+3  | 
+4  | from fastapi import FastAPI, Query
+5  + from typing import Annotated
+6  | 
+7  | app = FastAPI()
+8  | 
 --------------------------------------------------------------------------------
-12 13 | 
-13 14 | 
-14 15 | @app.get("/test")
-15    |-def handler2(echo: str = Query(default="")):
-   16 |+def handler2(echo: Annotated[str, Query()] = ""):
-16 17 |     return echo
-17 18 | 
-18 19 | 
+13 | 
+14 | 
+15 | @app.get("/test")
+   - def handler2(echo: str = Query(default="")):
+16 + def handler2(echo: Annotated[str, Query()] = ""):
+17 |     return echo
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_1.py:20:14
@@ -64,19 +62,18 @@ FAST002 [*] FastAPI dependency without `Annotated`
 21 |     return echo
    |
 help: Replace with `typing.Annotated`
-
-ℹ Unsafe fix
-2  2  | values. See #15043 for more details."""
-3  3  | 
-4  4  | from fastapi import FastAPI, Query
-   5  |+from typing import Annotated
-5  6  | 
-6  7  | app = FastAPI()
-7  8  | 
+2  | values. See #15043 for more details."""
+3  | 
+4  | from fastapi import FastAPI, Query
+5  + from typing import Annotated
+6  | 
+7  | app = FastAPI()
+8  | 
 --------------------------------------------------------------------------------
-17 18 | 
-18 19 | 
-19 20 | @app.get("/test")
-20    |-def handler3(echo: str = Query("123", min_length=3, max_length=50)):
-   21 |+def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"):
-21 22 |     return echo
+18 | 
+19 | 
+20 | @app.get("/test")
+   - def handler3(echo: str = Query("123", min_length=3, max_length=50)):
+21 + def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"):
+22 |     return echo
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap
index d67640cbc7..b254e53376 100644
--- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap
@@ -10,22 +10,21 @@ FAST002 [*] FastAPI dependency without `Annotated`
 11 |     return echo
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-2  2  | values. See #15043 for more details."""
-3  3  | 
-4  4  | from fastapi import FastAPI, Query
-   5  |+from typing_extensions import Annotated
-5  6  | 
-6  7  | app = FastAPI()
-7  8  | 
-8  9  | 
-9  10 | @app.get("/test")
-10    |-def handler(echo: str = Query("")):
-   11 |+def handler(echo: Annotated[str, Query()] = ""):
-11 12 |     return echo
-12 13 | 
-13 14 | 
+2  | values. See #15043 for more details."""
+3  | 
+4  | from fastapi import FastAPI, Query
+5  + from typing_extensions import Annotated
+6  | 
+7  | app = FastAPI()
+8  | 
+9  | 
+10 | @app.get("/test")
+   - def handler(echo: str = Query("")):
+11 + def handler(echo: Annotated[str, Query()] = ""):
+12 |     return echo
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_1.py:15:14
@@ -36,24 +35,23 @@ FAST002 [*] FastAPI dependency without `Annotated`
 16 |     return echo
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-2  2  | values. See #15043 for more details."""
-3  3  | 
-4  4  | from fastapi import FastAPI, Query
-   5  |+from typing_extensions import Annotated
-5  6  | 
-6  7  | app = FastAPI()
-7  8  | 
+2  | values. See #15043 for more details."""
+3  | 
+4  | from fastapi import FastAPI, Query
+5  + from typing_extensions import Annotated
+6  | 
+7  | app = FastAPI()
+8  | 
 --------------------------------------------------------------------------------
-12 13 | 
-13 14 | 
-14 15 | @app.get("/test")
-15    |-def handler2(echo: str = Query(default="")):
-   16 |+def handler2(echo: Annotated[str, Query()] = ""):
-16 17 |     return echo
-17 18 | 
-18 19 | 
+13 | 
+14 | 
+15 | @app.get("/test")
+   - def handler2(echo: str = Query(default="")):
+16 + def handler2(echo: Annotated[str, Query()] = ""):
+17 |     return echo
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST002 [*] FastAPI dependency without `Annotated`
   --> FAST002_1.py:20:14
@@ -64,19 +62,18 @@ FAST002 [*] FastAPI dependency without `Annotated`
 21 |     return echo
    |
 help: Replace with `typing_extensions.Annotated`
-
-ℹ Unsafe fix
-2  2  | values. See #15043 for more details."""
-3  3  | 
-4  4  | from fastapi import FastAPI, Query
-   5  |+from typing_extensions import Annotated
-5  6  | 
-6  7  | app = FastAPI()
-7  8  | 
+2  | values. See #15043 for more details."""
+3  | 
+4  | from fastapi import FastAPI, Query
+5  + from typing_extensions import Annotated
+6  | 
+7  | app = FastAPI()
+8  | 
 --------------------------------------------------------------------------------
-17 18 | 
-18 19 | 
-19 20 | @app.get("/test")
-20    |-def handler3(echo: str = Query("123", min_length=3, max_length=50)):
-   21 |+def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"):
-21 22 |     return echo
+18 | 
+19 | 
+20 | @app.get("/test")
+   - def handler3(echo: str = Query("123", min_length=3, max_length=50)):
+21 + def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"):
+22 |     return echo
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py.snap
new file mode 100644
index 0000000000..24f2a87c00
--- /dev/null
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py.snap
@@ -0,0 +1,303 @@
+---
+source: crates/ruff_linter/src/rules/fastapi/mod.rs
+---
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:14:5
+   |
+12 | async def test_ellipsis_query(
+13 |     # This should become: param: Annotated[str, Query(description="Test param")]
+14 |     param: str = Query(..., description="Test param"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 | ) -> str:
+16 |     return param
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+12 | @app.get("/test1")
+13 | async def test_ellipsis_query(
+14 |     # This should become: param: Annotated[str, Query(description="Test param")]
+   -     param: str = Query(..., description="Test param"),
+15 +     param: Annotated[str, Query(description="Test param")],
+16 | ) -> str:
+17 |     return param
+18 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:22:5
+   |
+20 | async def test_ellipsis_header(
+21 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
+22 |     auth: str = Header(..., description="Auth header"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+23 | ) -> str:
+24 |     return auth
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+20 | @app.get("/test2")
+21 | async def test_ellipsis_header(
+22 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
+   -     auth: str = Header(..., description="Auth header"),
+23 +     auth: Annotated[str, Header(description="Auth header")],
+24 | ) -> str:
+25 |     return auth
+26 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:30:5
+   |
+28 | async def test_ellipsis_body(
+29 |     # This should become: data: Annotated[dict, Body(description="Request body")]
+30 |     data: dict = Body(..., description="Request body"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+31 | ) -> dict:
+32 |     return data
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+28 | @app.post("/test3")
+29 | async def test_ellipsis_body(
+30 |     # This should become: data: Annotated[dict, Body(description="Request body")]
+   -     data: dict = Body(..., description="Request body"),
+31 +     data: Annotated[dict, Body(description="Request body")],
+32 | ) -> dict:
+33 |     return data
+34 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:38:5
+   |
+36 | async def test_ellipsis_cookie(
+37 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
+38 |     session: str = Cookie(..., description="Session ID"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+39 | ) -> str:
+40 |     return session
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+36 | @app.get("/test4")
+37 | async def test_ellipsis_cookie(
+38 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
+   -     session: str = Cookie(..., description="Session ID"),
+39 +     session: Annotated[str, Cookie(description="Session ID")],
+40 | ) -> str:
+41 |     return session
+42 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:46:5
+   |
+44 | async def test_simple_ellipsis(
+45 |     # This should become: id: Annotated[str, Query()]
+46 |     id: str = Query(...),
+   |     ^^^^^^^^^^^^^^^^^^^^
+47 | ) -> str:
+48 |     return id
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+44 | @app.get("/test5")
+45 | async def test_simple_ellipsis(
+46 |     # This should become: id: Annotated[str, Query()]
+   -     id: str = Query(...),
+47 +     id: Annotated[str, Query()],
+48 | ) -> str:
+49 |     return id
+50 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:54:5
+   |
+52 | async def test_multiple_kwargs_with_ellipsis(
+53 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
+54 |     param: str = Query(..., description="Test", min_length=1, max_length=10),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+55 | ) -> str:
+56 |     return param
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+52 | @app.get("/test6")
+53 | async def test_multiple_kwargs_with_ellipsis(
+54 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
+   -     param: str = Query(..., description="Test", min_length=1, max_length=10),
+55 +     param: Annotated[str, Query(description="Test", min_length=1, max_length=10)],
+56 | ) -> str:
+57 |     return param
+58 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:65:5
+   |
+63 | async def test_with_default_value(
+64 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
+65 |     param: str = Query("default", description="Test"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+66 | ) -> str:
+67 |     return param
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+63 | @app.get("/test7")
+64 | async def test_with_default_value(
+65 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
+   -     param: str = Query("default", description="Test"),
+66 +     param: Annotated[str, Query(description="Test")] = "default",
+67 | ) -> str:
+68 |     return param
+69 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:73:5
+   |
+71 | async def test_with_default_none(
+72 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
+73 |     param: str | None = Query(None, description="Test"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+74 | ) -> str:
+75 |     return param or "empty"
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+71 | @app.get("/test8")
+72 | async def test_with_default_none(
+73 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
+   -     param: str | None = Query(None, description="Test"),
+74 +     param: Annotated[str | None, Query(description="Test")] = None,
+75 | ) -> str:
+76 |     return param or "empty"
+77 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:81:5
+   |
+79 | async def test_mixed_parameters(
+80 |     # First param should be fixed with default preserved  
+81 |     optional_param: str = Query("default", description="Optional"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+82 |     # Second param should not be fixed because of the preceding default
+83 |     required_param: str = Query(..., description="Required"),
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+79 | @app.get("/test9")
+80 | async def test_mixed_parameters(
+81 |     # First param should be fixed with default preserved  
+   -     optional_param: str = Query("default", description="Optional"),
+82 +     optional_param: Annotated[str, Query(description="Optional")] = "default",
+83 |     # Second param should not be fixed because of the preceding default
+84 |     required_param: str = Query(..., description="Required"),
+85 |     # Third param should be fixed with default preserved
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 FastAPI dependency without `Annotated`
+  --> FAST002_2.py:83:5
+   |
+81 |     optional_param: str = Query("default", description="Optional"),
+82 |     # Second param should not be fixed because of the preceding default
+83 |     required_param: str = Query(..., description="Required"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+84 |     # Third param should be fixed with default preserved
+85 |     another_optional_param: int = Query(42, description="Another optional"),
+   |
+help: Replace with `typing.Annotated`
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:85:5
+   |
+83 |     required_param: str = Query(..., description="Required"),
+84 |     # Third param should be fixed with default preserved
+85 |     another_optional_param: int = Query(42, description="Another optional"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+86 | ) -> str:
+87 |     return f"{required_param}-{optional_param}-{another_optional_param}"
+   |
+help: Replace with `typing.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+83 |     # Second param should not be fixed because of the preceding default
+84 |     required_param: str = Query(..., description="Required"),
+85 |     # Third param should be fixed with default preserved
+   -     another_optional_param: int = Query(42, description="Another optional"),
+86 +     another_optional_param: Annotated[int, Query(description="Another optional")] = 42,
+87 | ) -> str:
+88 |     return f"{required_param}-{optional_param}-{another_optional_param}"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py_py38.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py_py38.snap
new file mode 100644
index 0000000000..3adcae1955
--- /dev/null
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py_py38.snap
@@ -0,0 +1,303 @@
+---
+source: crates/ruff_linter/src/rules/fastapi/mod.rs
+---
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:14:5
+   |
+12 | async def test_ellipsis_query(
+13 |     # This should become: param: Annotated[str, Query(description="Test param")]
+14 |     param: str = Query(..., description="Test param"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 | ) -> str:
+16 |     return param
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+12 | @app.get("/test1")
+13 | async def test_ellipsis_query(
+14 |     # This should become: param: Annotated[str, Query(description="Test param")]
+   -     param: str = Query(..., description="Test param"),
+15 +     param: Annotated[str, Query(description="Test param")],
+16 | ) -> str:
+17 |     return param
+18 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:22:5
+   |
+20 | async def test_ellipsis_header(
+21 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
+22 |     auth: str = Header(..., description="Auth header"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+23 | ) -> str:
+24 |     return auth
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+20 | @app.get("/test2")
+21 | async def test_ellipsis_header(
+22 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
+   -     auth: str = Header(..., description="Auth header"),
+23 +     auth: Annotated[str, Header(description="Auth header")],
+24 | ) -> str:
+25 |     return auth
+26 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:30:5
+   |
+28 | async def test_ellipsis_body(
+29 |     # This should become: data: Annotated[dict, Body(description="Request body")]
+30 |     data: dict = Body(..., description="Request body"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+31 | ) -> dict:
+32 |     return data
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+28 | @app.post("/test3")
+29 | async def test_ellipsis_body(
+30 |     # This should become: data: Annotated[dict, Body(description="Request body")]
+   -     data: dict = Body(..., description="Request body"),
+31 +     data: Annotated[dict, Body(description="Request body")],
+32 | ) -> dict:
+33 |     return data
+34 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:38:5
+   |
+36 | async def test_ellipsis_cookie(
+37 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
+38 |     session: str = Cookie(..., description="Session ID"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+39 | ) -> str:
+40 |     return session
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+36 | @app.get("/test4")
+37 | async def test_ellipsis_cookie(
+38 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
+   -     session: str = Cookie(..., description="Session ID"),
+39 +     session: Annotated[str, Cookie(description="Session ID")],
+40 | ) -> str:
+41 |     return session
+42 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:46:5
+   |
+44 | async def test_simple_ellipsis(
+45 |     # This should become: id: Annotated[str, Query()]
+46 |     id: str = Query(...),
+   |     ^^^^^^^^^^^^^^^^^^^^
+47 | ) -> str:
+48 |     return id
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+44 | @app.get("/test5")
+45 | async def test_simple_ellipsis(
+46 |     # This should become: id: Annotated[str, Query()]
+   -     id: str = Query(...),
+47 +     id: Annotated[str, Query()],
+48 | ) -> str:
+49 |     return id
+50 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:54:5
+   |
+52 | async def test_multiple_kwargs_with_ellipsis(
+53 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
+54 |     param: str = Query(..., description="Test", min_length=1, max_length=10),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+55 | ) -> str:
+56 |     return param
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+52 | @app.get("/test6")
+53 | async def test_multiple_kwargs_with_ellipsis(
+54 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
+   -     param: str = Query(..., description="Test", min_length=1, max_length=10),
+55 +     param: Annotated[str, Query(description="Test", min_length=1, max_length=10)],
+56 | ) -> str:
+57 |     return param
+58 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:65:5
+   |
+63 | async def test_with_default_value(
+64 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
+65 |     param: str = Query("default", description="Test"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+66 | ) -> str:
+67 |     return param
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+63 | @app.get("/test7")
+64 | async def test_with_default_value(
+65 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
+   -     param: str = Query("default", description="Test"),
+66 +     param: Annotated[str, Query(description="Test")] = "default",
+67 | ) -> str:
+68 |     return param
+69 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:73:5
+   |
+71 | async def test_with_default_none(
+72 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
+73 |     param: str | None = Query(None, description="Test"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+74 | ) -> str:
+75 |     return param or "empty"
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+71 | @app.get("/test8")
+72 | async def test_with_default_none(
+73 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
+   -     param: str | None = Query(None, description="Test"),
+74 +     param: Annotated[str | None, Query(description="Test")] = None,
+75 | ) -> str:
+76 |     return param or "empty"
+77 | 
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:81:5
+   |
+79 | async def test_mixed_parameters(
+80 |     # First param should be fixed with default preserved  
+81 |     optional_param: str = Query("default", description="Optional"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+82 |     # Second param should not be fixed because of the preceding default
+83 |     required_param: str = Query(..., description="Required"),
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+79 | @app.get("/test9")
+80 | async def test_mixed_parameters(
+81 |     # First param should be fixed with default preserved  
+   -     optional_param: str = Query("default", description="Optional"),
+82 +     optional_param: Annotated[str, Query(description="Optional")] = "default",
+83 |     # Second param should not be fixed because of the preceding default
+84 |     required_param: str = Query(..., description="Required"),
+85 |     # Third param should be fixed with default preserved
+note: This is an unsafe fix and may change runtime behavior
+
+FAST002 FastAPI dependency without `Annotated`
+  --> FAST002_2.py:83:5
+   |
+81 |     optional_param: str = Query("default", description="Optional"),
+82 |     # Second param should not be fixed because of the preceding default
+83 |     required_param: str = Query(..., description="Required"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+84 |     # Third param should be fixed with default preserved
+85 |     another_optional_param: int = Query(42, description="Another optional"),
+   |
+help: Replace with `typing_extensions.Annotated`
+
+FAST002 [*] FastAPI dependency without `Annotated`
+  --> FAST002_2.py:85:5
+   |
+83 |     required_param: str = Query(..., description="Required"),
+84 |     # Third param should be fixed with default preserved
+85 |     another_optional_param: int = Query(42, description="Another optional"),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+86 | ) -> str:
+87 |     return f"{required_param}-{optional_param}-{another_optional_param}"
+   |
+help: Replace with `typing_extensions.Annotated`
+1  | """Test FAST002 ellipsis handling."""
+2  | 
+3  | from fastapi import Body, Cookie, FastAPI, Header, Query
+4  + from typing_extensions import Annotated
+5  | 
+6  | app = FastAPI()
+7  | 
+--------------------------------------------------------------------------------
+83 |     # Second param should not be fixed because of the preceding default
+84 |     required_param: str = Query(..., description="Required"),
+85 |     # Third param should be fixed with default preserved
+   -     another_optional_param: int = Query(42, description="Another optional"),
+86 +     another_optional_param: Annotated[int, Query(description="Another optional")] = 42,
+87 | ) -> str:
+88 |     return f"{required_param}-{optional_param}-{another_optional_param}"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap
index 16221a6d45..e3843a16cd 100644
--- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap
@@ -1,205 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/fastapi/mod.rs
 ---
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:17:22
-   |
-17 | @app.post("/items/", response_model=Item)
-   |                      ^^^^^^^^^^^^^^^^^^^
-18 | async def create_item(item: Item) -> Item:
-19 |     return item
-   |
-help: Remove argument
 
-ℹ Unsafe fix
-14 14 | # Errors
-15 15 | 
-16 16 | 
-17    |-@app.post("/items/", response_model=Item)
-   17 |+@app.post("/items/")
-18 18 | async def create_item(item: Item) -> Item:
-19 19 |     return item
-20 20 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:22:22
-   |
-22 | @app.post("/items/", response_model=list[Item])
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
-23 | async def create_item(item: Item) -> list[Item]:
-24 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-19 19 |     return item
-20 20 | 
-21 21 | 
-22    |-@app.post("/items/", response_model=list[Item])
-   22 |+@app.post("/items/")
-23 23 | async def create_item(item: Item) -> list[Item]:
-24 24 |     return item
-25 25 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:27:22
-   |
-27 | @app.post("/items/", response_model=List[Item])
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
-28 | async def create_item(item: Item) -> List[Item]:
-29 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-24 24 |     return item
-25 25 | 
-26 26 | 
-27    |-@app.post("/items/", response_model=List[Item])
-   27 |+@app.post("/items/")
-28 28 | async def create_item(item: Item) -> List[Item]:
-29 29 |     return item
-30 30 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:32:22
-   |
-32 | @app.post("/items/", response_model=Dict[str, Item])
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-33 | async def create_item(item: Item) -> Dict[str, Item]:
-34 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-29 29 |     return item
-30 30 | 
-31 31 | 
-32    |-@app.post("/items/", response_model=Dict[str, Item])
-   32 |+@app.post("/items/")
-33 33 | async def create_item(item: Item) -> Dict[str, Item]:
-34 34 |     return item
-35 35 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:37:22
-   |
-37 | @app.post("/items/", response_model=str)
-   |                      ^^^^^^^^^^^^^^^^^^
-38 | async def create_item(item: Item) -> str:
-39 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-34 34 |     return item
-35 35 | 
-36 36 | 
-37    |-@app.post("/items/", response_model=str)
-   37 |+@app.post("/items/")
-38 38 | async def create_item(item: Item) -> str:
-39 39 |     return item
-40 40 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:42:21
-   |
-42 | @app.get("/items/", response_model=Item)
-   |                     ^^^^^^^^^^^^^^^^^^^
-43 | async def create_item(item: Item) -> Item:
-44 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-39 39 |     return item
-40 40 | 
-41 41 | 
-42    |-@app.get("/items/", response_model=Item)
-   42 |+@app.get("/items/")
-43 43 | async def create_item(item: Item) -> Item:
-44 44 |     return item
-45 45 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:47:21
-   |
-47 | @app.get("/items/", response_model=Item)
-   |                     ^^^^^^^^^^^^^^^^^^^
-48 | @app.post("/items/", response_model=Item)
-49 | async def create_item(item: Item) -> Item:
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-44 44 |     return item
-45 45 | 
-46 46 | 
-47    |-@app.get("/items/", response_model=Item)
-   47 |+@app.get("/items/")
-48 48 | @app.post("/items/", response_model=Item)
-49 49 | async def create_item(item: Item) -> Item:
-50 50 |     return item
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:48:22
-   |
-47 | @app.get("/items/", response_model=Item)
-48 | @app.post("/items/", response_model=Item)
-   |                      ^^^^^^^^^^^^^^^^^^^
-49 | async def create_item(item: Item) -> Item:
-50 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-45 45 | 
-46 46 | 
-47 47 | @app.get("/items/", response_model=Item)
-48    |-@app.post("/items/", response_model=Item)
-   48 |+@app.post("/items/")
-49 49 | async def create_item(item: Item) -> Item:
-50 50 |     return item
-51 51 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-  --> FAST001.py:53:24
-   |
-53 | @router.get("/items/", response_model=Item)
-   |                        ^^^^^^^^^^^^^^^^^^^
-54 | async def create_item(item: Item) -> Item:
-55 |     return item
-   |
-help: Remove argument
-
-ℹ Unsafe fix
-50 50 |     return item
-51 51 | 
-52 52 | 
-53    |-@router.get("/items/", response_model=Item)
-   53 |+@router.get("/items/")
-54 54 | async def create_item(item: Item) -> Item:
-55 55 |     return item
-56 56 | 
-
-FAST001 [*] FastAPI route with redundant `response_model` argument
-   --> FAST001.py:118:23
-    |
-116 | def setup_app(app_arg: FastAPI, non_app: str) -> None:
-117 |     # Error
-118 |     @app_arg.get("/", response_model=str)
-    |                       ^^^^^^^^^^^^^^^^^^
-119 |     async def get_root() -> str:
-120 |         return "Hello World!"
-    |
-help: Remove argument
-
-ℹ Unsafe fix
-115 115 | 
-116 116 | def setup_app(app_arg: FastAPI, non_app: str) -> None:
-117 117 |     # Error
-118     |-    @app_arg.get("/", response_model=str)
-    118 |+    @app_arg.get("/")
-119 119 |     async def get_root() -> str:
-120 120 |         return "Hello World!"
-121 121 |
diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap
index bbd030304c..9faee4de2b 100644
--- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap
+++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap
@@ -11,16 +11,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing`
 11 |     return {"query": query}
    |
 help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | # Errors
-9  9  | @app.get("/things/{thing_id}")
-10    |-async def read_thing(query: str):
-   10 |+async def read_thing(query: str, thing_id):
-11 11 |     return {"query": query}
-12 12 | 
-13 13 | 
+7  | 
+8  | # Errors
+9  | @app.get("/things/{thing_id}")
+   - async def read_thing(query: str):
+10 + async def read_thing(query: str, thing_id):
+11 |     return {"query": query}
+12 | 
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `isbn` appears in route path, but not in `read_thing` signature
   --> FAST003.py:14:23
@@ -31,16 +30,15 @@ FAST003 [*] Parameter `isbn` appears in route path, but not in `read_thing` sign
 16 |     ...
    |
 help: Add `isbn` to function signature
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | 
-14 14 | @app.get("/books/isbn-{isbn}")
-15    |-async def read_thing():
-   15 |+async def read_thing(isbn):
-16 16 |     ...
-17 17 | 
-18 18 | 
+12 | 
+13 | 
+14 | @app.get("/books/isbn-{isbn}")
+   - async def read_thing():
+15 + async def read_thing(isbn):
+16 |     ...
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature
   --> FAST003.py:19:19
@@ -51,36 +49,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing`
 21 |     return {"query": query}
    |
 help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | @app.get("/things/{thing_id:path}")
-20    |-async def read_thing(query: str):
-   20 |+async def read_thing(query: str, thing_id):
-21 21 |     return {"query": query}
-22 22 | 
-23 23 | 
-
-FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature
-  --> FAST003.py:24:19
-   |
-24 | @app.get("/things/{thing_id : path}")
-   |                   ^^^^^^^^^^^^^^^^^
-25 | async def read_thing(query: str):
-26 |     return {"query": query}
-   |
-help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | 
-24 24 | @app.get("/things/{thing_id : path}")
-25    |-async def read_thing(query: str):
-   25 |+async def read_thing(query: str, thing_id):
-26 26 |     return {"query": query}
-27 27 | 
-28 28 | 
+17 | 
+18 | 
+19 | @app.get("/things/{thing_id:path}")
+   - async def read_thing(query: str):
+20 + async def read_thing(query: str, thing_id):
+21 |     return {"query": query}
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature
   --> FAST003.py:29:27
@@ -91,16 +68,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig
 31 |     return {"author": author}
    |
 help: Add `title` to function signature
-
-ℹ Unsafe fix
-27 27 | 
-28 28 | 
-29 29 | @app.get("/books/{author}/{title}")
-30    |-async def read_thing(author: str):
-   30 |+async def read_thing(author: str, title):
-31 31 |     return {"author": author}
-32 32 | 
-33 33 | 
+27 | 
+28 | 
+29 | @app.get("/books/{author}/{title}")
+   - async def read_thing(author: str):
+30 + async def read_thing(author: str, title):
+31 |     return {"author": author}
+32 | 
+33 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `author_name` appears in route path, but not in `read_thing` signature
   --> FAST003.py:34:18
@@ -111,16 +87,15 @@ FAST003 [*] Parameter `author_name` appears in route path, but not in `read_thin
 36 |     ...
    |
 help: Add `author_name` to function signature
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | 
-34 34 | @app.get("/books/{author_name}/{title}")
-35    |-async def read_thing():
-   35 |+async def read_thing(author_name):
-36 36 |     ...
-37 37 | 
-38 38 | 
+32 | 
+33 | 
+34 | @app.get("/books/{author_name}/{title}")
+   - async def read_thing():
+35 + async def read_thing(author_name):
+36 |     ...
+37 | 
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature
   --> FAST003.py:34:32
@@ -131,16 +106,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig
 36 |     ...
    |
 help: Add `title` to function signature
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | 
-34 34 | @app.get("/books/{author_name}/{title}")
-35    |-async def read_thing():
-   35 |+async def read_thing(title):
-36 36 |     ...
-37 37 | 
-38 38 | 
+32 | 
+33 | 
+34 | @app.get("/books/{author_name}/{title}")
+   - async def read_thing():
+35 + async def read_thing(title):
+36 |     ...
+37 | 
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 Parameter `author` appears in route path, but only as a positional-only argument in `read_thing` signature
   --> FAST003.py:39:18
@@ -169,16 +143,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig
 46 |     author: str,
    |
 help: Add `title` to function signature
-
-ℹ Unsafe fix
-44 44 | @app.get("/books/{author}/{title}/{page}")
-45 45 | async def read_thing(
-46 46 |     author: str,
-47    |-    query: str,
-   47 |+    query: str, title,
-48 48 | ): ...
-49 49 | 
-50 50 | 
+44 | @app.get("/books/{author}/{title}/{page}")
+45 | async def read_thing(
+46 |     author: str,
+   -     query: str,
+47 +     query: str, title,
+48 | ): ...
+49 | 
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `page` appears in route path, but not in `read_thing` signature
   --> FAST003.py:44:35
@@ -189,16 +162,15 @@ FAST003 [*] Parameter `page` appears in route path, but not in `read_thing` sign
 46 |     author: str,
    |
 help: Add `page` to function signature
-
-ℹ Unsafe fix
-44 44 | @app.get("/books/{author}/{title}/{page}")
-45 45 | async def read_thing(
-46 46 |     author: str,
-47    |-    query: str,
-   47 |+    query: str, page,
-48 48 | ): ...
-49 49 | 
-50 50 | 
+44 | @app.get("/books/{author}/{title}/{page}")
+45 | async def read_thing(
+46 |     author: str,
+   -     query: str,
+47 +     query: str, page,
+48 | ): ...
+49 | 
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `author` appears in route path, but not in `read_thing` signature
   --> FAST003.py:51:18
@@ -209,16 +181,15 @@ FAST003 [*] Parameter `author` appears in route path, but not in `read_thing` si
 53 |     ...
    |
 help: Add `author` to function signature
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | 
-51 51 | @app.get("/books/{author}/{title}")
-52    |-async def read_thing():
-   52 |+async def read_thing(author):
-53 53 |     ...
-54 54 | 
-55 55 | 
+49 | 
+50 | 
+51 | @app.get("/books/{author}/{title}")
+   - async def read_thing():
+52 + async def read_thing(author):
+53 |     ...
+54 | 
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature
   --> FAST003.py:51:27
@@ -229,16 +200,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig
 53 |     ...
    |
 help: Add `title` to function signature
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | 
-51 51 | @app.get("/books/{author}/{title}")
-52    |-async def read_thing():
-   52 |+async def read_thing(title):
-53 53 |     ...
-54 54 | 
-55 55 | 
+49 | 
+50 | 
+51 | @app.get("/books/{author}/{title}")
+   - async def read_thing():
+52 + async def read_thing(title):
+53 |     ...
+54 | 
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature
   --> FAST003.py:56:27
@@ -249,16 +219,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig
 58 |     ...
    |
 help: Add `title` to function signature
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | 
-56 56 | @app.get("/books/{author}/{title}")
-57    |-async def read_thing(*, author: str):
-   57 |+async def read_thing(title, *, author: str):
-58 58 |     ...
-59 59 | 
-60 60 | 
+54 | 
+55 | 
+56 | @app.get("/books/{author}/{title}")
+   - async def read_thing(*, author: str):
+57 + async def read_thing(title, *, author: str):
+58 |     ...
+59 | 
+60 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature
   --> FAST003.py:61:27
@@ -269,16 +238,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig
 63 |     ...
    |
 help: Add `title` to function signature
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | 
-61 61 | @app.get("/books/{author}/{title}")
-62    |-async def read_thing(hello, /, *, author: str):
-   62 |+async def read_thing(hello, /, title, *, author: str):
-63 63 |     ...
-64 64 | 
-65 65 | 
+59 | 
+60 | 
+61 | @app.get("/books/{author}/{title}")
+   - async def read_thing(hello, /, *, author: str):
+62 + async def read_thing(hello, /, title, *, author: str):
+63 |     ...
+64 | 
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature
   --> FAST003.py:66:19
@@ -289,16 +257,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing`
 68 |         query: str,
    |
 help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | @app.get("/things/{thing_id}")
-67 67 | async def read_thing(
-68    |-        query: str,
-   68 |+        query: str, thing_id,
-69 69 | ):
-70 70 |     return {"query": query}
-71 71 | 
+65 | 
+66 | @app.get("/things/{thing_id}")
+67 | async def read_thing(
+   -         query: str,
+68 +         query: str, thing_id,
+69 | ):
+70 |     return {"query": query}
+71 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature
   --> FAST003.py:73:19
@@ -309,16 +276,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing`
 75 |         query: str = "default",
    |
 help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-72 72 | 
-73 73 | @app.get("/things/{thing_id}")
-74 74 | async def read_thing(
-75    |-        query: str = "default",
-   75 |+        thing_id, query: str = "default",
-76 76 | ):
-77 77 |     return {"query": query}
-78 78 | 
+72 | 
+73 | @app.get("/things/{thing_id}")
+74 | async def read_thing(
+   -         query: str = "default",
+75 +         thing_id, query: str = "default",
+76 | ):
+77 |     return {"query": query}
+78 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature
   --> FAST003.py:80:19
@@ -329,16 +295,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing`
 82 |         *, query: str = "default",
    |
 help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-79 79 | 
-80 80 | @app.get("/things/{thing_id}")
-81 81 | async def read_thing(
-82    |-        *, query: str = "default",
-   82 |+        thing_id, *, query: str = "default",
-83 83 | ):
-84 84 |     return {"query": query}
-85 85 | 
+79 | 
+80 | @app.get("/things/{thing_id}")
+81 | async def read_thing(
+   -         *, query: str = "default",
+82 +         thing_id, *, query: str = "default",
+83 | ):
+84 |     return {"query": query}
+85 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `name` appears in route path, but not in `read_thing` signature
   --> FAST003.py:87:18
@@ -349,37 +314,15 @@ FAST003 [*] Parameter `name` appears in route path, but not in `read_thing` sign
 89 |     return {"author": author, "title": title}
    |
 help: Add `name` to function signature
-
-ℹ Unsafe fix
-85 85 | 
-86 86 | 
-87 87 | @app.get("/books/{name}/{title}")
-88    |-async def read_thing(*, author: Annotated[str, Path(alias="author_name")], title: str):
-   88 |+async def read_thing(name, *, author: Annotated[str, Path(alias="author_name")], title: str):
-89 89 |     return {"author": author, "title": title}
-90 90 | 
-91 91 | 
-
-FAST003 [*] Parameter `thing_id` appears in route path, but not in `single` signature
-   --> FAST003.py:158:19
-    |
-157 | ### Errors
-158 | @app.get("/things/{thing_id}")
-    |                   ^^^^^^^^^^
-159 | async def single(other: Annotated[str, Depends(something_else)]): ...
-160 | @app.get("/things/{thing_id}")
-    |
-help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-156 156 | 
-157 157 | ### Errors
-158 158 | @app.get("/things/{thing_id}")
-159     |-async def single(other: Annotated[str, Depends(something_else)]): ...
-    159 |+async def single(other: Annotated[str, Depends(something_else)], thing_id): ...
-160 160 | @app.get("/things/{thing_id}")
-161 161 | async def default(other: str = Depends(something_else)): ...
-162 162 | 
+85 | 
+86 | 
+87 | @app.get("/books/{name}/{title}")
+   - async def read_thing(*, author: Annotated[str, Path(alias="author_name")], title: str):
+88 + async def read_thing(name, *, author: Annotated[str, Path(alias="author_name")], title: str):
+89 |     return {"author": author, "title": title}
+90 | 
+91 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `thing_id` appears in route path, but not in `default` signature
    --> FAST003.py:160:19
@@ -391,59 +334,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `default` sig
 161 | async def default(other: str = Depends(something_else)): ...
     |
 help: Add `thing_id` to function signature
-
-ℹ Unsafe fix
-158 158 | @app.get("/things/{thing_id}")
-159 159 | async def single(other: Annotated[str, Depends(something_else)]): ...
-160 160 | @app.get("/things/{thing_id}")
-161     |-async def default(other: str = Depends(something_else)): ...
-    161 |+async def default(thing_id, other: str = Depends(something_else)): ...
-162 162 | 
-163 163 | 
-164 164 | ### No errors
-
-FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_full` signature
-   --> FAST003.py:197:12
-    |
-196 | # Errors
-197 | @app.get("/{id}")
-    |            ^^^^
-198 | async def get_id_pydantic_full(
-199 |     params: Annotated[PydanticParams, Depends(PydanticParams)],
-    |
-help: Add `id` to function signature
-
-ℹ Unsafe fix
-196 196 | # Errors
-197 197 | @app.get("/{id}")
-198 198 | async def get_id_pydantic_full(
-199     |-    params: Annotated[PydanticParams, Depends(PydanticParams)],
-    199 |+    params: Annotated[PydanticParams, Depends(PydanticParams)], id,
-200 200 | ): ...
-201 201 | @app.get("/{id}")
-202 202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
-
-FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_short` signature
-   --> FAST003.py:201:12
-    |
-199 |     params: Annotated[PydanticParams, Depends(PydanticParams)],
-200 | ): ...
-201 | @app.get("/{id}")
-    |            ^^^^
-202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
-203 | @app.get("/{id}")
-    |
-help: Add `id` to function signature
-
-ℹ Unsafe fix
-199 199 |     params: Annotated[PydanticParams, Depends(PydanticParams)],
-200 200 | ): ...
-201 201 | @app.get("/{id}")
-202     |-async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
-    202 |+async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()], id): ...
-203 203 | @app.get("/{id}")
-204 204 | async def get_id_init_not_annotated(params = Depends(InitParams)): ...
-205 205 | 
+158 | @app.get("/things/{thing_id}")
+159 | async def single(other: Annotated[str, Depends(something_else)]): ...
+160 | @app.get("/things/{thing_id}")
+    - async def default(other: str = Depends(something_else)): ...
+161 + async def default(thing_id, other: str = Depends(something_else)): ...
+162 | 
+163 | 
+164 | ### No errors
+note: This is an unsafe fix and may change runtime behavior
 
 FAST003 [*] Parameter `id` appears in route path, but not in `get_id_init_not_annotated` signature
    --> FAST003.py:203:12
@@ -455,13 +354,35 @@ FAST003 [*] Parameter `id` appears in route path, but not in `get_id_init_not_an
 204 | async def get_id_init_not_annotated(params = Depends(InitParams)): ...
     |
 help: Add `id` to function signature
+201 | @app.get("/{id}")
+202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
+203 | @app.get("/{id}")
+    - async def get_id_init_not_annotated(params = Depends(InitParams)): ...
+204 + async def get_id_init_not_annotated(id, params = Depends(InitParams)): ...
+205 | 
+206 | 
+207 | # No errors
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-201 201 | @app.get("/{id}")
-202 202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
-203 203 | @app.get("/{id}")
-204     |-async def get_id_init_not_annotated(params = Depends(InitParams)): ...
-    204 |+async def get_id_init_not_annotated(id, params = Depends(InitParams)): ...
-205 205 | 
-206 206 | 
-207 207 | # No errors
+FAST003 Parameter `import` appears in route path, but not in `get_import` signature
+   --> FAST003.py:261:20
+    |
+260 | # https://github.com/astral-sh/ruff/issues/20941
+261 | @app.get("/imports/{import}")
+    |                    ^^^^^^^^
+262 | async def get_import():
+263 |     ...
+    |
+help: Add `import` to function signature
+
+FAST003 Parameter `__debug__` appears in route path, but not in `get_debug` signature
+   --> FAST003.py:265:18
+    |
+263 |     ...
+264 |
+265 | @app.get("/debug/{__debug__}")
+    |                  ^^^^^^^^^^^
+266 | async def get_debug():
+267 |     ...
+    |
+help: Add `__debug__` to function signature
diff --git a/crates/ruff_linter/src/rules/flake8_2020/rules/compare.rs b/crates/ruff_linter/src/rules/flake8_2020/rules/compare.rs
index 12c18a2dd7..0fb5e5ce8d 100644
--- a/crates/ruff_linter/src/rules/flake8_2020/rules/compare.rs
+++ b/crates/ruff_linter/src/rules/flake8_2020/rules/compare.rs
@@ -41,6 +41,7 @@ use crate::rules::flake8_2020::helpers::is_sys;
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionCmpStr3;
 
 impl Violation for SysVersionCmpStr3 {
@@ -91,6 +92,7 @@ impl Violation for SysVersionCmpStr3 {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionInfo0Eq3 {
     eq: bool,
 }
@@ -137,6 +139,7 @@ impl Violation for SysVersionInfo0Eq3 {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionInfo1CmpInt;
 
 impl Violation for SysVersionInfo1CmpInt {
@@ -179,6 +182,7 @@ impl Violation for SysVersionInfo1CmpInt {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionInfoMinorCmpInt;
 
 impl Violation for SysVersionInfoMinorCmpInt {
@@ -222,6 +226,7 @@ impl Violation for SysVersionInfoMinorCmpInt {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionCmpStr10;
 
 impl Violation for SysVersionCmpStr10 {
diff --git a/crates/ruff_linter/src/rules/flake8_2020/rules/name_or_attribute.rs b/crates/ruff_linter/src/rules/flake8_2020/rules/name_or_attribute.rs
index e310dd24b5..10fc95a7c4 100644
--- a/crates/ruff_linter/src/rules/flake8_2020/rules/name_or_attribute.rs
+++ b/crates/ruff_linter/src/rules/flake8_2020/rules/name_or_attribute.rs
@@ -36,6 +36,7 @@ use crate::checkers::ast::Checker;
 /// - [Six documentation: `six.PY2`](https://six.readthedocs.io/#six.PY2)
 /// - [Six documentation: `six.PY3`](https://six.readthedocs.io/#six.PY3)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SixPY3;
 
 impl Violation for SixPY3 {
diff --git a/crates/ruff_linter/src/rules/flake8_2020/rules/subscript.rs b/crates/ruff_linter/src/rules/flake8_2020/rules/subscript.rs
index 5b5d4d6e00..591b8a529c 100644
--- a/crates/ruff_linter/src/rules/flake8_2020/rules/subscript.rs
+++ b/crates/ruff_linter/src/rules/flake8_2020/rules/subscript.rs
@@ -38,6 +38,7 @@ use crate::rules::flake8_2020::helpers::is_sys;
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionSlice3;
 
 impl Violation for SysVersionSlice3 {
@@ -78,6 +79,7 @@ impl Violation for SysVersionSlice3 {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersion2;
 
 impl Violation for SysVersion2 {
@@ -118,6 +120,7 @@ impl Violation for SysVersion2 {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersion0;
 
 impl Violation for SysVersion0 {
@@ -158,6 +161,7 @@ impl Violation for SysVersion0 {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.113")]
 pub(crate) struct SysVersionSlice1;
 
 impl Violation for SysVersionSlice1 {
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs b/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs
index c0289225f1..1d7047da77 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs
@@ -137,28 +137,30 @@ impl AutoPythonType {
                 let expr = Expr::Name(ast::ExprName {
                     id: Name::from(binding),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     ctx: ExprContext::Load,
                 });
                 Some((expr, vec![no_return_edit]))
             }
-            AutoPythonType::Atom(python_type) => {
-                let expr = type_expr(python_type)?;
-                Some((expr, vec![]))
-            }
+            AutoPythonType::Atom(python_type) => type_expr(python_type, checker, at),
             AutoPythonType::Union(python_types) => {
                 if target_version >= PythonVersion::PY310 {
                     // Aggregate all the individual types (e.g., `int`, `float`).
+                    let mut all_edits = Vec::new();
                     let names = python_types
                         .iter()
                         .sorted_unstable()
-                        .map(|python_type| type_expr(*python_type))
+                        .map(|python_type| {
+                            let (expr, mut edits) = type_expr(*python_type, checker, at)?;
+                            all_edits.append(&mut edits);
+                            Some(expr)
+                        })
                         .collect::<Option<Vec<_>>>()?;
 
                     // Wrap in a bitwise union (e.g., `int | float`).
                     let expr = pep_604_union(&names);
 
-                    Some((expr, vec![]))
+                    Some((expr, all_edits))
                 } else {
                     let python_types = python_types
                         .into_iter()
@@ -167,7 +169,7 @@ impl AutoPythonType {
 
                     match python_types.as_slice() {
                         [python_type, PythonType::None] | [PythonType::None, python_type] => {
-                            let element = type_expr(*python_type)?;
+                            let (element, mut edits) = type_expr(*python_type, checker, at)?;
 
                             // Ex) `Optional[int]`
                             let (optional_edit, binding) = checker
@@ -175,12 +177,18 @@ impl AutoPythonType {
                                 .import(at)
                                 .ok()?;
                             let expr = typing_optional(element, Name::from(binding));
-                            Some((expr, vec![optional_edit]))
+                            edits.push(optional_edit);
+                            Some((expr, edits))
                         }
                         _ => {
+                            let mut all_edits = Vec::new();
                             let elements = python_types
                                 .into_iter()
-                                .map(type_expr)
+                                .map(|python_type| {
+                                    let (expr, mut edits) = type_expr(python_type, checker, at)?;
+                                    all_edits.append(&mut edits);
+                                    Some(expr)
+                                })
                                 .collect::<Option<Vec<_>>>()?;
 
                             // Ex) `Union[int, str]`
@@ -189,7 +197,8 @@ impl AutoPythonType {
                                 .import(at)
                                 .ok()?;
                             let expr = typing_union(&elements, Name::from(binding));
-                            Some((expr, vec![union_edit]))
+                            all_edits.push(union_edit);
+                            Some((expr, all_edits))
                         }
                     }
                 }
@@ -199,26 +208,44 @@ impl AutoPythonType {
 }
 
 /// Given a [`PythonType`], return an [`Expr`] that resolves to that type.
-fn type_expr(python_type: PythonType) -> Option<Expr> {
-    fn name(name: &str) -> Expr {
-        Expr::Name(ast::ExprName {
-            id: name.into(),
+///
+/// If the [`Expr`] relies on importing any external symbols, those imports will be returned as
+/// additional edits.
+pub(crate) fn type_expr(
+    python_type: PythonType,
+    checker: &Checker,
+    at: TextSize,
+) -> Option<(Expr, Vec<Edit>)> {
+    fn name(name: &str, checker: &Checker, at: TextSize) -> Option<(Expr, Vec<Edit>)> {
+        let (edit, binding) = checker
+            .importer()
+            .get_or_import_builtin_symbol(name, at, checker.semantic())
+            .ok()?;
+        let expr = Expr::Name(ast::ExprName {
+            id: binding.into(),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
-        })
+        });
+        Some((expr, edit.map_or_else(Vec::new, |edit| vec![edit])))
     }
 
     match python_type {
-        PythonType::String => Some(name("str")),
-        PythonType::Bytes => Some(name("bytes")),
-        PythonType::Number(number) => match number {
-            NumberLike::Integer => Some(name("int")),
-            NumberLike::Float => Some(name("float")),
-            NumberLike::Complex => Some(name("complex")),
-            NumberLike::Bool => Some(name("bool")),
-        },
-        PythonType::None => Some(name("None")),
+        PythonType::String => name("str", checker, at),
+        PythonType::Bytes => name("bytes", checker, at),
+        PythonType::Number(number) => {
+            let symbol = match number {
+                NumberLike::Integer => "int",
+                NumberLike::Float => "float",
+                NumberLike::Complex => "complex",
+                NumberLike::Bool => "bool",
+            };
+            name(symbol, checker, at)
+        }
+        PythonType::None => {
+            let expr = Expr::NoneLiteral(ast::ExprNoneLiteral::default());
+            Some((expr, vec![]))
+        }
         PythonType::Ellipsis => None,
         PythonType::Dict => None,
         PythonType::List => None,
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/mod.rs b/crates/ruff_linter/src/rules/flake8_annotations/mod.rs
index 7fcd00c78d..0b0ec4f5f5 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_annotations/mod.rs
@@ -229,4 +229,20 @@ mod tests {
         assert_diagnostics!(diagnostics);
         Ok(())
     }
+
+    #[test]
+    fn shadowed_builtins() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_annotations/shadowed_builtins.py"),
+            &LinterSettings::for_rules(vec![
+                Rule::MissingReturnTypeUndocumentedPublicFunction,
+                Rule::MissingReturnTypePrivateFunction,
+                Rule::MissingReturnTypeSpecialMethod,
+                Rule::MissingReturnTypeStaticMethod,
+                Rule::MissingReturnTypeClassMethod,
+            ]),
+        )?;
+        assert_diagnostics!(diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs b/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs
index 04159eaadc..a70659f99e 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs
+++ b/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs
@@ -4,13 +4,14 @@ use ruff_python_ast::identifier::Identifier;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{self as ast, Expr, Stmt};
 use ruff_python_semantic::Definition;
+use ruff_python_semantic::analyze::type_inference::{NumberLike, PythonType};
 use ruff_python_semantic::analyze::visibility;
 use ruff_python_stdlib::typing::simple_magic_return_type;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::{Checker, DiagnosticGuard};
 use crate::registry::Rule;
-use crate::rules::flake8_annotations::helpers::auto_return_type;
+use crate::rules::flake8_annotations::helpers::{auto_return_type, type_expr};
 use crate::rules::ruff::typing::type_hint_resolves_to_any;
 use crate::{Edit, Fix, FixAvailability, Violation};
 
@@ -37,6 +38,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## Options
 /// - `lint.flake8-annotations.suppress-dummy-args`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingTypeFunctionArgument {
     name: String,
 }
@@ -72,6 +74,7 @@ impl Violation for MissingTypeFunctionArgument {
 /// ## Options
 /// - `lint.flake8-annotations.suppress-dummy-args`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingTypeArgs {
     name: String,
 }
@@ -107,6 +110,7 @@ impl Violation for MissingTypeArgs {
 /// ## Options
 /// - `lint.flake8-annotations.suppress-dummy-args`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingTypeKwargs {
     name: String,
 }
@@ -148,6 +152,7 @@ impl Violation for MissingTypeKwargs {
 /// ```
 #[derive(ViolationMetadata)]
 #[deprecated(note = "ANN101 has been removed")]
+#[violation_metadata(removed_since = "0.8.0")]
 pub(crate) struct MissingTypeSelf;
 
 #[expect(deprecated)]
@@ -192,6 +197,7 @@ impl Violation for MissingTypeSelf {
 /// ```
 #[derive(ViolationMetadata)]
 #[deprecated(note = "ANN102 has been removed")]
+#[violation_metadata(removed_since = "0.8.0")]
 pub(crate) struct MissingTypeCls;
 
 #[expect(deprecated)]
@@ -235,6 +241,7 @@ impl Violation for MissingTypeCls {
 ///
 /// - `lint.typing-extensions`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingReturnTypeUndocumentedPublicFunction {
     name: String,
     annotation: Option<String>,
@@ -288,6 +295,7 @@ impl Violation for MissingReturnTypeUndocumentedPublicFunction {
 ///
 /// - `lint.typing-extensions`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingReturnTypePrivateFunction {
     name: String,
     annotation: Option<String>,
@@ -344,6 +352,7 @@ impl Violation for MissingReturnTypePrivateFunction {
 ///         self.x = x
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingReturnTypeSpecialMethod {
     name: String,
     annotation: Option<String>,
@@ -391,6 +400,7 @@ impl Violation for MissingReturnTypeSpecialMethod {
 ///         return 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingReturnTypeStaticMethod {
     name: String,
     annotation: Option<String>,
@@ -438,6 +448,7 @@ impl Violation for MissingReturnTypeStaticMethod {
 ///         return 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.105")]
 pub(crate) struct MissingReturnTypeClassMethod {
     name: String,
     annotation: Option<String>,
@@ -507,6 +518,7 @@ impl Violation for MissingReturnTypeClassMethod {
 /// - [Python documentation: `typing.Any`](https://docs.python.org/3/library/typing.html#typing.Any)
 /// - [Mypy documentation: The Any type](https://mypy.readthedocs.io/en/stable/kinds_of_types.html#the-any-type)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.108")]
 pub(crate) struct AnyType {
     name: String,
 }
@@ -825,11 +837,31 @@ pub(crate) fn definition(
                     },
                     function.identifier(),
                 );
-                if let Some(return_type) = return_type {
-                    diagnostic.set_fix(Fix::unsafe_edit(Edit::insertion(
-                        format!(" -> {return_type}"),
-                        function.parameters.end(),
-                    )));
+                if let Some(return_type_str) = return_type {
+                    // Convert the simple return type to a proper expression that handles shadowed builtins
+                    let python_type = match return_type_str {
+                        "str" => PythonType::String,
+                        "bytes" => PythonType::Bytes,
+                        "int" => PythonType::Number(NumberLike::Integer),
+                        "float" => PythonType::Number(NumberLike::Float),
+                        "complex" => PythonType::Number(NumberLike::Complex),
+                        "bool" => PythonType::Number(NumberLike::Bool),
+                        "None" => PythonType::None,
+                        _ => return, // Unknown type, skip
+                    };
+
+                    if let Some((expr, edits)) =
+                        type_expr(python_type, checker, function.parameters.start())
+                    {
+                        let return_type_expr = checker.generator().expr(&expr);
+                        diagnostic.set_fix(Fix::unsafe_edits(
+                            Edit::insertion(
+                                format!(" -> {return_type_expr}"),
+                                function.parameters.end(),
+                            ),
+                            edits,
+                        ));
+                    }
                 }
                 diagnostics.push(diagnostic);
             }
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap
index b3ddc0faa2..5fd1020126 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap
@@ -9,13 +9,12 @@ ANN201 [*] Missing return type annotation for public function `func`
 2 |     return 1
   |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-1   |-def func():
-  1 |+def func() -> int:
-2 2 |     return 1
-3 3 | 
-4 4 | 
+  - def func():
+1 + def func() -> int:
+2 |     return 1
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
  --> auto_return_type.py:5:5
@@ -25,16 +24,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 6 |     return 1.5
   |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-2 2 |     return 1
-3 3 | 
-4 4 | 
-5   |-def func():
-  5 |+def func() -> float:
-6 6 |     return 1.5
-7 7 | 
-8 8 | 
+2 |     return 1
+3 | 
+4 | 
+  - def func():
+5 + def func() -> float:
+6 |     return 1.5
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:9:5
@@ -45,16 +43,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 11 |         return 1
    |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-6  6  |     return 1.5
-7  7  | 
-8  8  | 
-9     |-def func(x: int):
-   9  |+def func(x: int) -> float:
-10 10 |     if x > 0:
-11 11 |         return 1
-12 12 |     else:
+6  |     return 1.5
+7  | 
+8  | 
+   - def func(x: int):
+9  + def func(x: int) -> float:
+10 |     if x > 0:
+11 |         return 1
+12 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:16:5
@@ -64,16 +61,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 17 |     return True
    |
 help: Add return type annotation: `bool`
-
-ℹ Unsafe fix
-13 13 |         return 1.5
-14 14 | 
-15 15 | 
-16    |-def func():
-   16 |+def func() -> bool:
-17 17 |     return True
-18 18 | 
-19 19 | 
+13 |         return 1.5
+14 | 
+15 | 
+   - def func():
+16 + def func() -> bool:
+17 |     return True
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:20:5
@@ -84,16 +80,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 22 |         return None
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-17 17 |     return True
-18 18 | 
-19 19 | 
-20    |-def func(x: int):
-   20 |+def func(x: int) -> None:
-21 21 |     if x > 0:
-22 22 |         return None
-23 23 |     else:
+17 |     return True
+18 | 
+19 | 
+   - def func(x: int):
+20 + def func(x: int) -> None:
+21 |     if x > 0:
+22 |         return None
+23 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:27:5
@@ -103,16 +98,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 28 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
    |
 help: Add return type annotation: `str | float`
-
-ℹ Unsafe fix
-24 24 |         return
-25 25 | 
-26 26 | 
-27    |-def func(x: int):
-   27 |+def func(x: int) -> str | float:
-28 28 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
-29 29 | 
-30 30 | 
+24 |         return
+25 | 
+26 | 
+   - def func(x: int):
+27 + def func(x: int) -> str | float:
+28 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
+29 | 
+30 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:31:5
@@ -122,16 +116,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 32 |     return 1 + 2.5 if x > 0 else 1.5 or "str"
    |
 help: Add return type annotation: `str | float`
-
-ℹ Unsafe fix
-28 28 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
-29 29 | 
-30 30 | 
-31    |-def func(x: int):
-   31 |+def func(x: int) -> str | float:
-32 32 |     return 1 + 2.5 if x > 0 else 1.5 or "str"
-33 33 | 
-34 34 | 
+28 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
+29 | 
+30 | 
+   - def func(x: int):
+31 + def func(x: int) -> str | float:
+32 |     return 1 + 2.5 if x > 0 else 1.5 or "str"
+33 | 
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 Missing return type annotation for public function `func`
   --> auto_return_type.py:35:5
@@ -161,16 +154,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 47 |         return 1
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-42 42 |     return {"foo": 1}
-43 43 | 
-44 44 | 
-45    |-def func(x: int):
-   45 |+def func(x: int) -> int:
-46 46 |     if not x:
-47 47 |         return 1
-48 48 |     else:
+42 |     return {"foo": 1}
+43 | 
+44 | 
+   - def func(x: int):
+45 + def func(x: int) -> int:
+46 |     if not x:
+47 |         return 1
+48 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:52:5
@@ -181,16 +173,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 54 |         return 1
    |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-49 49 |         return True
-50 50 | 
-51 51 | 
-52    |-def func(x: int):
-   52 |+def func(x: int) -> int | None:
-53 53 |     if not x:
-54 54 |         return 1
-55 55 |     else:
+49 |         return True
+50 | 
+51 | 
+   - def func(x: int):
+52 + def func(x: int) -> int | None:
+53 |     if not x:
+54 |         return 1
+55 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:59:5
@@ -201,16 +192,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 61 |         return 1
    |
 help: Add return type annotation: `str | int | None`
-
-ℹ Unsafe fix
-56 56 |         return None
-57 57 | 
-58 58 | 
-59    |-def func(x: int):
-   59 |+def func(x: int) -> str | int | None:
-60 60 |     if not x:
-61 61 |         return 1
-62 62 |     elif x > 5:
+56 |         return None
+57 | 
+58 | 
+   - def func(x: int):
+59 + def func(x: int) -> str | int | None:
+60 |     if not x:
+61 |         return 1
+62 |     elif x > 5:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:68:5
@@ -221,16 +211,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 70 |         return 1
    |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-65 65 |         return None
-66 66 | 
-67 67 | 
-68    |-def func(x: int):
-   68 |+def func(x: int) -> int | None:
-69 69 |     if x:
-70 70 |         return 1
-71 71 | 
+65 |         return None
+66 | 
+67 | 
+   - def func(x: int):
+68 + def func(x: int) -> int | None:
+69 |     if x:
+70 |         return 1
+71 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:73:5
@@ -240,16 +229,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 74 |     x = 1
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-70 70 |         return 1
-71 71 | 
-72 72 | 
-73    |-def func():
-   73 |+def func() -> None:
-74 74 |     x = 1
-75 75 | 
-76 76 | 
+70 |         return 1
+71 | 
+72 | 
+   - def func():
+73 + def func() -> None:
+74 |     x = 1
+75 | 
+76 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:77:5
@@ -260,16 +248,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 79 |         return 1
    |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-74 74 |     x = 1
-75 75 | 
-76 76 | 
-77    |-def func(x: int):
-   77 |+def func(x: int) -> int | None:
-78 78 |     if x > 0:
-79 79 |         return 1
-80 80 | 
+74 |     x = 1
+75 | 
+76 | 
+   - def func(x: int):
+77 + def func(x: int) -> int | None:
+78 |     if x > 0:
+79 |         return 1
+80 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:82:5
@@ -280,16 +267,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 84 |         case [1, 2, 3]:
    |
 help: Add return type annotation: `str | int | None`
-
-ℹ Unsafe fix
-79 79 |         return 1
-80 80 | 
-81 81 | 
-82    |-def func(x: int):
-   82 |+def func(x: int) -> str | int | None:
-83 83 |     match x:
-84 84 |         case [1, 2, 3]:
-85 85 |             return 1
+79 |         return 1
+80 | 
+81 | 
+   - def func(x: int):
+82 + def func(x: int) -> str | int | None:
+83 |     match x:
+84 |         case [1, 2, 3]:
+85 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:90:5
@@ -300,16 +286,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 92 |         if i > 0:
    |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-87 87 |             return "foo"
-88 88 | 
-89 89 | 
-90    |-def func(x: int):
-   90 |+def func(x: int) -> int | None:
-91 91 |     for i in range(5):
-92 92 |         if i > 0:
-93 93 |             return 1
+87 |             return "foo"
+88 | 
+89 | 
+   - def func(x: int):
+90 + def func(x: int) -> int | None:
+91 |     for i in range(5):
+92 |         if i > 0:
+93 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:96:5
@@ -320,16 +305,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 98 |         if i > 0:
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-93 93 |             return 1
-94 94 | 
-95 95 | 
-96    |-def func(x: int):
-   96 |+def func(x: int) -> int:
-97 97 |     for i in range(5):
-98 98 |         if i > 0:
-99 99 |             return 1
+93 |             return 1
+94 | 
+95 | 
+   - def func(x: int):
+96 + def func(x: int) -> int:
+97 |     for i in range(5):
+98 |         if i > 0:
+99 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:104:5
@@ -340,16 +324,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 106 |         if i > 0:
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-101 101 |         return 4
-102 102 | 
-103 103 | 
-104     |-def func(x: int):
-    104 |+def func(x: int) -> int | None:
-105 105 |     for i in range(5):
-106 106 |         if i > 0:
-107 107 |             break
+101 |         return 4
+102 | 
+103 | 
+    - def func(x: int):
+104 + def func(x: int) -> int | None:
+105 |     for i in range(5):
+106 |         if i > 0:
+107 |             break
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:112:5
@@ -360,16 +343,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 114 |         pass
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-109 109 |         return 4
-110 110 | 
-111 111 | 
-112     |-def func(x: int):
-    112 |+def func(x: int) -> int | None:
-113 113 |     try:
-114 114 |         pass
-115 115 |     except:
+109 |         return 4
+110 | 
+111 | 
+    - def func(x: int):
+112 + def func(x: int) -> int | None:
+113 |     try:
+114 |         pass
+115 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:119:5
@@ -380,16 +362,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 121 |         pass
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-116 116 |         return 1
-117 117 | 
-118 118 | 
-119     |-def func(x: int):
-    119 |+def func(x: int) -> int:
-120 120 |     try:
-121 121 |         pass
-122 122 |     except:
+116 |         return 1
+117 | 
+118 | 
+    - def func(x: int):
+119 + def func(x: int) -> int:
+120 |     try:
+121 |         pass
+122 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:128:5
@@ -400,16 +381,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 130 |         pass
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-125 125 |         return 2
-126 126 | 
-127 127 | 
-128     |-def func(x: int):
-    128 |+def func(x: int) -> int:
-129 129 |     try:
-130 130 |         pass
-131 131 |     except:
+125 |         return 2
+126 | 
+127 | 
+    - def func(x: int):
+128 + def func(x: int) -> int:
+129 |     try:
+130 |         pass
+131 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:137:5
@@ -420,16 +400,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 139 |         return 1
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-134 134 |         return 2
-135 135 | 
-136 136 | 
-137     |-def func(x: int):
-    137 |+def func(x: int) -> int | None:
-138 138 |     try:
-139 139 |         return 1
-140 140 |     except:
+134 |         return 2
+135 | 
+136 | 
+    - def func(x: int):
+137 + def func(x: int) -> int | None:
+138 |     try:
+139 |         return 1
+140 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:146:5
@@ -440,16 +419,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 148 |         break
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-143 143 |         pass
-144 144 | 
-145 145 | 
-146     |-def func(x: int):
-    146 |+def func(x: int) -> int | None:
-147 147 |     while x > 0:
-148 148 |         break
-149 149 |         return 1
+143 |         pass
+144 | 
+145 | 
+    - def func(x: int):
+146 + def func(x: int) -> int | None:
+147 |     while x > 0:
+148 |         break
+149 |         return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 Missing return type annotation for public function `method`
    --> auto_return_type.py:158:9
@@ -514,16 +492,15 @@ ANN201 [*] Missing return type annotation for public function `method`
 182 |             return 1
     |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-177 177 |         pass
-178 178 | 
-179 179 |     @abstractmethod
-180     |-    def method(self):
-    180 |+    def method(self) -> float:
-181 181 |         if self.x > 0:
-182 182 |             return 1
-183 183 |         else:
+177 |         pass
+178 | 
+179 |     @abstractmethod
+    -     def method(self):
+180 +     def method(self) -> float:
+181 |         if self.x > 0:
+182 |             return 1
+183 |         else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:187:5
@@ -534,16 +511,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 189 |         pass
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-184 184 |             return 1.5
-185 185 | 
-186 186 | 
-187     |-def func(x: int):
-    187 |+def func(x: int) -> int | None:
-188 188 |     try:
-189 189 |         pass
-190 190 |     except:
+184 |             return 1.5
+185 | 
+186 | 
+    - def func(x: int):
+187 + def func(x: int) -> int | None:
+188 |     try:
+189 |         pass
+190 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:194:5
@@ -554,16 +530,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 196 |         pass
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-191 191 |         return 2
-192 192 | 
-193 193 | 
-194     |-def func(x: int):
-    194 |+def func(x: int) -> int:
-195 195 |     try:
-196 196 |         pass
-197 197 |     except:
+191 |         return 2
+192 | 
+193 | 
+    - def func(x: int):
+194 + def func(x: int) -> int:
+195 |     try:
+196 |         pass
+197 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:203:5
@@ -574,24 +549,23 @@ ANN201 [*] Missing return type annotation for public function `func`
 205 |         raise ValueError
     |
 help: Add return type annotation: `Never`
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | import abc
-153 153 | from abc import abstractmethod
-    154 |+from typing import Never
-154 155 | 
-155 156 | 
-156 157 | class Foo(abc.ABC):
+151 | 
+152 | import abc
+153 | from abc import abstractmethod
+154 + from typing import Never
+155 | 
+156 | 
+157 | class Foo(abc.ABC):
 --------------------------------------------------------------------------------
-200 201 |         return 3
-201 202 | 
-202 203 | 
-203     |-def func(x: int):
-    204 |+def func(x: int) -> Never:
-204 205 |     if not x:
-205 206 |         raise ValueError
-206 207 |     else:
+201 |         return 3
+202 | 
+203 | 
+    - def func(x: int):
+204 + def func(x: int) -> Never:
+205 |     if not x:
+206 |         raise ValueError
+207 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:210:5
@@ -602,16 +576,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 212 |         raise ValueError
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-207 207 |         raise TypeError
-208 208 | 
-209 209 | 
-210     |-def func(x: int):
-    210 |+def func(x: int) -> int:
-211 211 |     if not x:
-212 212 |         raise ValueError
-213 213 |     else:
+207 |         raise TypeError
+208 | 
+209 | 
+    - def func(x: int):
+210 + def func(x: int) -> int:
+211 |     if not x:
+212 |         raise ValueError
+213 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:234:5
@@ -622,16 +595,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 236 |         return 1
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-231 231 |     return i
-232 232 | 
-233 233 | 
-234     |-def func(x: int):
-    234 |+def func(x: int) -> int:
-235 235 |     if not x:
-236 236 |         return 1
-237 237 |     raise ValueError
+231 |     return i
+232 | 
+233 | 
+    - def func(x: int):
+234 + def func(x: int) -> int:
+235 |     if not x:
+236 |         return 1
+237 |     raise ValueError
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:240:5
@@ -642,16 +614,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 242 |         return 1
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-237 237 |     raise ValueError
-238 238 | 
-239 239 | 
-240     |-def func(x: int):
-    240 |+def func(x: int) -> int:
-241 241 |     if not x:
-242 242 |         return 1
-243 243 |     else:
+237 |     raise ValueError
+238 | 
+239 | 
+    - def func(x: int):
+240 + def func(x: int) -> int:
+241 |     if not x:
+242 |         return 1
+243 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:248:5
@@ -662,16 +633,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 250 |         raise ValueError
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-245 245 |     raise ValueError
-246 246 | 
-247 247 | 
-248     |-def func():
-    248 |+def func() -> int | None:
-249 249 |     try:
-250 250 |         raise ValueError
-251 251 |     except:
+245 |     raise ValueError
+246 | 
+247 | 
+    - def func():
+248 + def func() -> int | None:
+249 |     try:
+250 |         raise ValueError
+251 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:255:5
@@ -682,16 +652,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 257 |         return 1
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-252 252 |         return 2
-253 253 | 
-254 254 | 
-255     |-def func():
-    255 |+def func() -> int | None:
-256 256 |     try:
-257 257 |         return 1
-258 258 |     except:
+252 |         return 2
+253 | 
+254 | 
+    - def func():
+255 + def func() -> int | None:
+256 |     try:
+257 |         return 1
+258 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:262:5
@@ -702,16 +671,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 264 |         if x > 0:
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-259 259 |         pass
-260 260 | 
-261 261 | 
-262     |-def func(x: int):
-    262 |+def func(x: int) -> int:
-263 263 |     for _ in range(3):
-264 264 |         if x > 0:
-265 265 |             return 1
+259 |         pass
+260 | 
+261 | 
+    - def func(x: int):
+262 + def func(x: int) -> int:
+263 |     for _ in range(3):
+264 |         if x > 0:
+265 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:269:5
@@ -722,16 +690,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 271 |         raise ValueError
     |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-266 266 |     raise ValueError
-267 267 | 
-268 268 | 
-269     |-def func(x: int):
-    269 |+def func(x: int) -> None:
-270 270 |     if x > 5:
-271 271 |         raise ValueError
-272 272 |     else:
+266 |     raise ValueError
+267 | 
+268 | 
+    - def func(x: int):
+269 + def func(x: int) -> None:
+270 |     if x > 5:
+271 |         raise ValueError
+272 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:276:5
@@ -742,16 +709,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 278 |         raise ValueError
     |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-273 273 |         pass
-274 274 | 
-275 275 | 
-276     |-def func(x: int):
-    276 |+def func(x: int) -> None:
-277 277 |     if x > 5:
-278 278 |         raise ValueError
-279 279 |     elif x > 10:
+273 |         pass
+274 | 
+275 | 
+    - def func(x: int):
+276 + def func(x: int) -> None:
+277 |     if x > 5:
+278 |         raise ValueError
+279 |     elif x > 10:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:283:5
@@ -762,16 +728,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 285 |         raise ValueError
     |
 help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-280 280 |         pass
-281 281 | 
-282 282 | 
-283     |-def func(x: int):
-    283 |+def func(x: int) -> int | None:
-284 284 |     if x > 5:
-285 285 |         raise ValueError
-286 286 |     elif x > 10:
+280 |         pass
+281 | 
+282 | 
+    - def func(x: int):
+283 + def func(x: int) -> int | None:
+284 |     if x > 5:
+285 |         raise ValueError
+286 |     elif x > 10:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:290:5
@@ -782,16 +747,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 292 |         return 5
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-287 287 |         return 5
-288 288 | 
-289 289 | 
-290     |-def func():
-    290 |+def func() -> int:
-291 291 |     try:
-292 292 |         return 5
-293 293 |     except:
+287 |         return 5
+288 | 
+289 | 
+    - def func():
+290 + def func() -> int:
+291 |     try:
+292 |         return 5
+293 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:299:5
@@ -802,13 +766,12 @@ ANN201 [*] Missing return type annotation for public function `func`
 301 |         case [1, 2, 3]:
     |
 help: Add return type annotation: `str | int`
-
-ℹ Unsafe fix
-296 296 |     raise ValueError
-297 297 | 
-298 298 | 
-299     |-def func(x: int):
-    299 |+def func(x: int) -> str | int:
-300 300 |     match x:
-301 301 |         case [1, 2, 3]:
-302 302 |             return 1
+296 |     raise ValueError
+297 | 
+298 | 
+    - def func(x: int):
+299 + def func(x: int) -> str | int:
+300 |     match x:
+301 |         case [1, 2, 3]:
+302 |             return 1
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap
index 1e30ffef69..65f71dd345 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap
@@ -9,13 +9,12 @@ ANN201 [*] Missing return type annotation for public function `func`
 2 |     return 1
   |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-1   |-def func():
-  1 |+def func() -> int:
-2 2 |     return 1
-3 3 | 
-4 4 | 
+  - def func():
+1 + def func() -> int:
+2 |     return 1
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
  --> auto_return_type.py:5:5
@@ -25,16 +24,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 6 |     return 1.5
   |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-2 2 |     return 1
-3 3 | 
-4 4 | 
-5   |-def func():
-  5 |+def func() -> float:
-6 6 |     return 1.5
-7 7 | 
-8 8 | 
+2 |     return 1
+3 | 
+4 | 
+  - def func():
+5 + def func() -> float:
+6 |     return 1.5
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:9:5
@@ -45,16 +43,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 11 |         return 1
    |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-6  6  |     return 1.5
-7  7  | 
-8  8  | 
-9     |-def func(x: int):
-   9  |+def func(x: int) -> float:
-10 10 |     if x > 0:
-11 11 |         return 1
-12 12 |     else:
+6  |     return 1.5
+7  | 
+8  | 
+   - def func(x: int):
+9  + def func(x: int) -> float:
+10 |     if x > 0:
+11 |         return 1
+12 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:16:5
@@ -64,16 +61,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 17 |     return True
    |
 help: Add return type annotation: `bool`
-
-ℹ Unsafe fix
-13 13 |         return 1.5
-14 14 | 
-15 15 | 
-16    |-def func():
-   16 |+def func() -> bool:
-17 17 |     return True
-18 18 | 
-19 19 | 
+13 |         return 1.5
+14 | 
+15 | 
+   - def func():
+16 + def func() -> bool:
+17 |     return True
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:20:5
@@ -84,16 +80,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 22 |         return None
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-17 17 |     return True
-18 18 | 
-19 19 | 
-20    |-def func(x: int):
-   20 |+def func(x: int) -> None:
-21 21 |     if x > 0:
-22 22 |         return None
-23 23 |     else:
+17 |     return True
+18 | 
+19 | 
+   - def func(x: int):
+20 + def func(x: int) -> None:
+21 |     if x > 0:
+22 |         return None
+23 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:27:5
@@ -103,21 +98,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 28 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
    |
 help: Add return type annotation: `Union[str, float]`
-
-ℹ Unsafe fix
-   1  |+from typing import Union
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Union
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-24 25 |         return
-25 26 | 
-26 27 | 
-27    |-def func(x: int):
-   28 |+def func(x: int) -> Union[str, float]:
-28 29 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
-29 30 | 
-30 31 | 
+25 |         return
+26 | 
+27 | 
+   - def func(x: int):
+28 + def func(x: int) -> Union[str, float]:
+29 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
+30 | 
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:31:5
@@ -127,21 +121,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 32 |     return 1 + 2.5 if x > 0 else 1.5 or "str"
    |
 help: Add return type annotation: `Union[str, float]`
-
-ℹ Unsafe fix
-   1  |+from typing import Union
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Union
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-28 29 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
-29 30 | 
-30 31 | 
-31    |-def func(x: int):
-   32 |+def func(x: int) -> Union[str, float]:
-32 33 |     return 1 + 2.5 if x > 0 else 1.5 or "str"
-33 34 | 
-34 35 | 
+29 |     return 1 or 2.5 if x > 0 else 1.5 or "str"
+30 | 
+31 | 
+   - def func(x: int):
+32 + def func(x: int) -> Union[str, float]:
+33 |     return 1 + 2.5 if x > 0 else 1.5 or "str"
+34 | 
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 Missing return type annotation for public function `func`
   --> auto_return_type.py:35:5
@@ -171,16 +164,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 47 |         return 1
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-42 42 |     return {"foo": 1}
-43 43 | 
-44 44 | 
-45    |-def func(x: int):
-   45 |+def func(x: int) -> int:
-46 46 |     if not x:
-47 47 |         return 1
-48 48 |     else:
+42 |     return {"foo": 1}
+43 | 
+44 | 
+   - def func(x: int):
+45 + def func(x: int) -> int:
+46 |     if not x:
+47 |         return 1
+48 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:52:5
@@ -191,21 +183,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 54 |         return 1
    |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-   1  |+from typing import Optional
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Optional
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-49 50 |         return True
-50 51 | 
-51 52 | 
-52    |-def func(x: int):
-   53 |+def func(x: int) -> Optional[int]:
-53 54 |     if not x:
-54 55 |         return 1
-55 56 |     else:
+50 |         return True
+51 | 
+52 | 
+   - def func(x: int):
+53 + def func(x: int) -> Optional[int]:
+54 |     if not x:
+55 |         return 1
+56 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:59:5
@@ -216,21 +207,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 61 |         return 1
    |
 help: Add return type annotation: `Union[str, int, None]`
-
-ℹ Unsafe fix
-   1  |+from typing import Union
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Union
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-56 57 |         return None
-57 58 | 
-58 59 | 
-59    |-def func(x: int):
-   60 |+def func(x: int) -> Union[str, int, None]:
-60 61 |     if not x:
-61 62 |         return 1
-62 63 |     elif x > 5:
+57 |         return None
+58 | 
+59 | 
+   - def func(x: int):
+60 + def func(x: int) -> Union[str, int, None]:
+61 |     if not x:
+62 |         return 1
+63 |     elif x > 5:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:68:5
@@ -241,21 +231,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 70 |         return 1
    |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-   1  |+from typing import Optional
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Optional
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-65 66 |         return None
-66 67 | 
-67 68 | 
-68    |-def func(x: int):
-   69 |+def func(x: int) -> Optional[int]:
-69 70 |     if x:
-70 71 |         return 1
-71 72 | 
+66 |         return None
+67 | 
+68 | 
+   - def func(x: int):
+69 + def func(x: int) -> Optional[int]:
+70 |     if x:
+71 |         return 1
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:73:5
@@ -265,16 +254,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 74 |     x = 1
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-70 70 |         return 1
-71 71 | 
-72 72 | 
-73    |-def func():
-   73 |+def func() -> None:
-74 74 |     x = 1
-75 75 | 
-76 76 | 
+70 |         return 1
+71 | 
+72 | 
+   - def func():
+73 + def func() -> None:
+74 |     x = 1
+75 | 
+76 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:77:5
@@ -285,21 +273,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 79 |         return 1
    |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-   1  |+from typing import Optional
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Optional
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-74 75 |     x = 1
-75 76 | 
-76 77 | 
-77    |-def func(x: int):
-   78 |+def func(x: int) -> Optional[int]:
-78 79 |     if x > 0:
-79 80 |         return 1
-80 81 | 
+75 |     x = 1
+76 | 
+77 | 
+   - def func(x: int):
+78 + def func(x: int) -> Optional[int]:
+79 |     if x > 0:
+80 |         return 1
+81 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:82:5
@@ -310,21 +297,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 84 |         case [1, 2, 3]:
    |
 help: Add return type annotation: `Union[str, int, None]`
-
-ℹ Unsafe fix
-   1  |+from typing import Union
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Union
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-79 80 |         return 1
-80 81 | 
-81 82 | 
-82    |-def func(x: int):
-   83 |+def func(x: int) -> Union[str, int, None]:
-83 84 |     match x:
-84 85 |         case [1, 2, 3]:
-85 86 |             return 1
+80 |         return 1
+81 | 
+82 | 
+   - def func(x: int):
+83 + def func(x: int) -> Union[str, int, None]:
+84 |     match x:
+85 |         case [1, 2, 3]:
+86 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:90:5
@@ -335,21 +321,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 92 |         if i > 0:
    |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-   1  |+from typing import Optional
-1  2  | def func():
-2  3  |     return 1
-3  4  | 
+1  + from typing import Optional
+2  | def func():
+3  |     return 1
+4  | 
 --------------------------------------------------------------------------------
-87 88 |             return "foo"
-88 89 | 
-89 90 | 
-90    |-def func(x: int):
-   91 |+def func(x: int) -> Optional[int]:
-91 92 |     for i in range(5):
-92 93 |         if i > 0:
-93 94 |             return 1
+88 |             return "foo"
+89 | 
+90 | 
+   - def func(x: int):
+91 + def func(x: int) -> Optional[int]:
+92 |     for i in range(5):
+93 |         if i > 0:
+94 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
   --> auto_return_type.py:96:5
@@ -360,16 +345,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 98 |         if i > 0:
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-93 93 |             return 1
-94 94 | 
-95 95 | 
-96    |-def func(x: int):
-   96 |+def func(x: int) -> int:
-97 97 |     for i in range(5):
-98 98 |         if i > 0:
-99 99 |             return 1
+93 |             return 1
+94 | 
+95 | 
+   - def func(x: int):
+96 + def func(x: int) -> int:
+97 |     for i in range(5):
+98 |         if i > 0:
+99 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:104:5
@@ -380,21 +364,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 106 |         if i > 0:
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-    1   |+from typing import Optional
-1   2   | def func():
-2   3   |     return 1
-3   4   | 
+1   + from typing import Optional
+2   | def func():
+3   |     return 1
+4   | 
 --------------------------------------------------------------------------------
-101 102 |         return 4
-102 103 | 
-103 104 | 
-104     |-def func(x: int):
-    105 |+def func(x: int) -> Optional[int]:
-105 106 |     for i in range(5):
-106 107 |         if i > 0:
-107 108 |             break
+102 |         return 4
+103 | 
+104 | 
+    - def func(x: int):
+105 + def func(x: int) -> Optional[int]:
+106 |     for i in range(5):
+107 |         if i > 0:
+108 |             break
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:112:5
@@ -405,21 +388,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 114 |         pass
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-    1   |+from typing import Optional
-1   2   | def func():
-2   3   |     return 1
-3   4   | 
+1   + from typing import Optional
+2   | def func():
+3   |     return 1
+4   | 
 --------------------------------------------------------------------------------
-109 110 |         return 4
-110 111 | 
-111 112 | 
-112     |-def func(x: int):
-    113 |+def func(x: int) -> Optional[int]:
-113 114 |     try:
-114 115 |         pass
-115 116 |     except:
+110 |         return 4
+111 | 
+112 | 
+    - def func(x: int):
+113 + def func(x: int) -> Optional[int]:
+114 |     try:
+115 |         pass
+116 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:119:5
@@ -430,16 +412,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 121 |         pass
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-116 116 |         return 1
-117 117 | 
-118 118 | 
-119     |-def func(x: int):
-    119 |+def func(x: int) -> int:
-120 120 |     try:
-121 121 |         pass
-122 122 |     except:
+116 |         return 1
+117 | 
+118 | 
+    - def func(x: int):
+119 + def func(x: int) -> int:
+120 |     try:
+121 |         pass
+122 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:128:5
@@ -450,16 +431,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 130 |         pass
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-125 125 |         return 2
-126 126 | 
-127 127 | 
-128     |-def func(x: int):
-    128 |+def func(x: int) -> int:
-129 129 |     try:
-130 130 |         pass
-131 131 |     except:
+125 |         return 2
+126 | 
+127 | 
+    - def func(x: int):
+128 + def func(x: int) -> int:
+129 |     try:
+130 |         pass
+131 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:137:5
@@ -470,21 +450,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 139 |         return 1
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-    1   |+from typing import Optional
-1   2   | def func():
-2   3   |     return 1
-3   4   | 
+1   + from typing import Optional
+2   | def func():
+3   |     return 1
+4   | 
 --------------------------------------------------------------------------------
-134 135 |         return 2
-135 136 | 
-136 137 | 
-137     |-def func(x: int):
-    138 |+def func(x: int) -> Optional[int]:
-138 139 |     try:
-139 140 |         return 1
-140 141 |     except:
+135 |         return 2
+136 | 
+137 | 
+    - def func(x: int):
+138 + def func(x: int) -> Optional[int]:
+139 |     try:
+140 |         return 1
+141 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:146:5
@@ -495,21 +474,20 @@ ANN201 [*] Missing return type annotation for public function `func`
 148 |         break
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-    1   |+from typing import Optional
-1   2   | def func():
-2   3   |     return 1
-3   4   | 
+1   + from typing import Optional
+2   | def func():
+3   |     return 1
+4   | 
 --------------------------------------------------------------------------------
-143 144 |         pass
-144 145 | 
-145 146 | 
-146     |-def func(x: int):
-    147 |+def func(x: int) -> Optional[int]:
-147 148 |     while x > 0:
-148 149 |         break
-149 150 |         return 1
+144 |         pass
+145 | 
+146 | 
+    - def func(x: int):
+147 + def func(x: int) -> Optional[int]:
+148 |     while x > 0:
+149 |         break
+150 |         return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 Missing return type annotation for public function `method`
    --> auto_return_type.py:158:9
@@ -574,16 +552,15 @@ ANN201 [*] Missing return type annotation for public function `method`
 182 |             return 1
     |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-177 177 |         pass
-178 178 | 
-179 179 |     @abstractmethod
-180     |-    def method(self):
-    180 |+    def method(self) -> float:
-181 181 |         if self.x > 0:
-182 182 |             return 1
-183 183 |         else:
+177 |         pass
+178 | 
+179 |     @abstractmethod
+    -     def method(self):
+180 +     def method(self) -> float:
+181 |         if self.x > 0:
+182 |             return 1
+183 |         else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:187:5
@@ -594,24 +571,23 @@ ANN201 [*] Missing return type annotation for public function `func`
 189 |         pass
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | import abc
-153 153 | from abc import abstractmethod
-    154 |+from typing import Optional
-154 155 | 
-155 156 | 
-156 157 | class Foo(abc.ABC):
+151 | 
+152 | import abc
+153 | from abc import abstractmethod
+154 + from typing import Optional
+155 | 
+156 | 
+157 | class Foo(abc.ABC):
 --------------------------------------------------------------------------------
-184 185 |             return 1.5
-185 186 | 
-186 187 | 
-187     |-def func(x: int):
-    188 |+def func(x: int) -> Optional[int]:
-188 189 |     try:
-189 190 |         pass
-190 191 |     except:
+185 |             return 1.5
+186 | 
+187 | 
+    - def func(x: int):
+188 + def func(x: int) -> Optional[int]:
+189 |     try:
+190 |         pass
+191 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:194:5
@@ -622,16 +598,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 196 |         pass
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-191 191 |         return 2
-192 192 | 
-193 193 | 
-194     |-def func(x: int):
-    194 |+def func(x: int) -> int:
-195 195 |     try:
-196 196 |         pass
-197 197 |     except:
+191 |         return 2
+192 | 
+193 | 
+    - def func(x: int):
+194 + def func(x: int) -> int:
+195 |     try:
+196 |         pass
+197 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:203:5
@@ -642,24 +617,23 @@ ANN201 [*] Missing return type annotation for public function `func`
 205 |         raise ValueError
     |
 help: Add return type annotation: `NoReturn`
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | import abc
-153 153 | from abc import abstractmethod
-    154 |+from typing import NoReturn
-154 155 | 
-155 156 | 
-156 157 | class Foo(abc.ABC):
+151 | 
+152 | import abc
+153 | from abc import abstractmethod
+154 + from typing import NoReturn
+155 | 
+156 | 
+157 | class Foo(abc.ABC):
 --------------------------------------------------------------------------------
-200 201 |         return 3
-201 202 | 
-202 203 | 
-203     |-def func(x: int):
-    204 |+def func(x: int) -> NoReturn:
-204 205 |     if not x:
-205 206 |         raise ValueError
-206 207 |     else:
+201 |         return 3
+202 | 
+203 | 
+    - def func(x: int):
+204 + def func(x: int) -> NoReturn:
+205 |     if not x:
+206 |         raise ValueError
+207 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:210:5
@@ -670,16 +644,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 212 |         raise ValueError
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-207 207 |         raise TypeError
-208 208 | 
-209 209 | 
-210     |-def func(x: int):
-    210 |+def func(x: int) -> int:
-211 211 |     if not x:
-212 212 |         raise ValueError
-213 213 |     else:
+207 |         raise TypeError
+208 | 
+209 | 
+    - def func(x: int):
+210 + def func(x: int) -> int:
+211 |     if not x:
+212 |         raise ValueError
+213 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:234:5
@@ -690,16 +663,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 236 |         return 1
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-231 231 |     return i
-232 232 | 
-233 233 | 
-234     |-def func(x: int):
-    234 |+def func(x: int) -> int:
-235 235 |     if not x:
-236 236 |         return 1
-237 237 |     raise ValueError
+231 |     return i
+232 | 
+233 | 
+    - def func(x: int):
+234 + def func(x: int) -> int:
+235 |     if not x:
+236 |         return 1
+237 |     raise ValueError
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:240:5
@@ -710,16 +682,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 242 |         return 1
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-237 237 |     raise ValueError
-238 238 | 
-239 239 | 
-240     |-def func(x: int):
-    240 |+def func(x: int) -> int:
-241 241 |     if not x:
-242 242 |         return 1
-243 243 |     else:
+237 |     raise ValueError
+238 | 
+239 | 
+    - def func(x: int):
+240 + def func(x: int) -> int:
+241 |     if not x:
+242 |         return 1
+243 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:248:5
@@ -730,25 +701,24 @@ ANN201 [*] Missing return type annotation for public function `func`
 250 |         raise ValueError
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-214 214 |         return 1
-215 215 | 
-216 216 | 
-217     |-from typing import overload
-    217 |+from typing import overload, Optional
-218 218 | 
-219 219 | 
-220 220 | @overload
+214 |         return 1
+215 | 
+216 | 
+    - from typing import overload
+217 + from typing import overload, Optional
+218 | 
+219 | 
+220 | @overload
 --------------------------------------------------------------------------------
-245 245 |     raise ValueError
-246 246 | 
-247 247 | 
-248     |-def func():
-    248 |+def func() -> Optional[int]:
-249 249 |     try:
-250 250 |         raise ValueError
-251 251 |     except:
+245 |     raise ValueError
+246 | 
+247 | 
+    - def func():
+248 + def func() -> Optional[int]:
+249 |     try:
+250 |         raise ValueError
+251 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:255:5
@@ -759,25 +729,24 @@ ANN201 [*] Missing return type annotation for public function `func`
 257 |         return 1
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-214 214 |         return 1
-215 215 | 
-216 216 | 
-217     |-from typing import overload
-    217 |+from typing import overload, Optional
-218 218 | 
-219 219 | 
-220 220 | @overload
+214 |         return 1
+215 | 
+216 | 
+    - from typing import overload
+217 + from typing import overload, Optional
+218 | 
+219 | 
+220 | @overload
 --------------------------------------------------------------------------------
-252 252 |         return 2
-253 253 | 
-254 254 | 
-255     |-def func():
-    255 |+def func() -> Optional[int]:
-256 256 |     try:
-257 257 |         return 1
-258 258 |     except:
+252 |         return 2
+253 | 
+254 | 
+    - def func():
+255 + def func() -> Optional[int]:
+256 |     try:
+257 |         return 1
+258 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:262:5
@@ -788,16 +757,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 264 |         if x > 0:
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-259 259 |         pass
-260 260 | 
-261 261 | 
-262     |-def func(x: int):
-    262 |+def func(x: int) -> int:
-263 263 |     for _ in range(3):
-264 264 |         if x > 0:
-265 265 |             return 1
+259 |         pass
+260 | 
+261 | 
+    - def func(x: int):
+262 + def func(x: int) -> int:
+263 |     for _ in range(3):
+264 |         if x > 0:
+265 |             return 1
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:269:5
@@ -808,16 +776,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 271 |         raise ValueError
     |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-266 266 |     raise ValueError
-267 267 | 
-268 268 | 
-269     |-def func(x: int):
-    269 |+def func(x: int) -> None:
-270 270 |     if x > 5:
-271 271 |         raise ValueError
-272 272 |     else:
+266 |     raise ValueError
+267 | 
+268 | 
+    - def func(x: int):
+269 + def func(x: int) -> None:
+270 |     if x > 5:
+271 |         raise ValueError
+272 |     else:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:276:5
@@ -828,16 +795,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 278 |         raise ValueError
     |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-273 273 |         pass
-274 274 | 
-275 275 | 
-276     |-def func(x: int):
-    276 |+def func(x: int) -> None:
-277 277 |     if x > 5:
-278 278 |         raise ValueError
-279 279 |     elif x > 10:
+273 |         pass
+274 | 
+275 | 
+    - def func(x: int):
+276 + def func(x: int) -> None:
+277 |     if x > 5:
+278 |         raise ValueError
+279 |     elif x > 10:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:283:5
@@ -848,25 +814,24 @@ ANN201 [*] Missing return type annotation for public function `func`
 285 |         raise ValueError
     |
 help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-214 214 |         return 1
-215 215 | 
-216 216 | 
-217     |-from typing import overload
-    217 |+from typing import overload, Optional
-218 218 | 
-219 219 | 
-220 220 | @overload
+214 |         return 1
+215 | 
+216 | 
+    - from typing import overload
+217 + from typing import overload, Optional
+218 | 
+219 | 
+220 | @overload
 --------------------------------------------------------------------------------
-280 280 |         pass
-281 281 | 
-282 282 | 
-283     |-def func(x: int):
-    283 |+def func(x: int) -> Optional[int]:
-284 284 |     if x > 5:
-285 285 |         raise ValueError
-286 286 |     elif x > 10:
+280 |         pass
+281 | 
+282 | 
+    - def func(x: int):
+283 + def func(x: int) -> Optional[int]:
+284 |     if x > 5:
+285 |         raise ValueError
+286 |     elif x > 10:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:290:5
@@ -877,16 +842,15 @@ ANN201 [*] Missing return type annotation for public function `func`
 292 |         return 5
     |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-287 287 |         return 5
-288 288 | 
-289 289 | 
-290     |-def func():
-    290 |+def func() -> int:
-291 291 |     try:
-292 292 |         return 5
-293 293 |     except:
+287 |         return 5
+288 | 
+289 | 
+    - def func():
+290 + def func() -> int:
+291 |     try:
+292 |         return 5
+293 |     except:
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `func`
    --> auto_return_type.py:299:5
@@ -897,22 +861,21 @@ ANN201 [*] Missing return type annotation for public function `func`
 301 |         case [1, 2, 3]:
     |
 help: Add return type annotation: `Union[str, int]`
-
-ℹ Unsafe fix
-214 214 |         return 1
-215 215 | 
-216 216 | 
-217     |-from typing import overload
-    217 |+from typing import overload, Union
-218 218 | 
-219 219 | 
-220 220 | @overload
+214 |         return 1
+215 | 
+216 | 
+    - from typing import overload
+217 + from typing import overload, Union
+218 | 
+219 | 
+220 | @overload
 --------------------------------------------------------------------------------
-296 296 |     raise ValueError
-297 297 | 
-298 298 | 
-299     |-def func(x: int):
-    299 |+def func(x: int) -> Union[str, int]:
-300 300 |     match x:
-301 301 |         case [1, 2, 3]:
-302 302 |             return 1
+296 |     raise ValueError
+297 | 
+298 | 
+    - def func(x: int):
+299 + def func(x: int) -> Union[str, int]:
+300 |     match x:
+301 |         case [1, 2, 3]:
+302 |             return 1
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap
index a9b1798e2e..80b35c0a76 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap
@@ -10,16 +10,15 @@ ANN201 [*] Missing return type annotation for public function `foo`
 6 |     pass
   |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-2 2 | from typing_extensions import override
-3 3 | 
-4 4 | # Error
-5   |-def foo(a, b):
-  5 |+def foo(a, b) -> None:
-6 6 |     pass
-7 7 | 
-8 8 | 
+2 | from typing_extensions import override
+3 | 
+4 | # Error
+  - def foo(a, b):
+5 + def foo(a, b) -> None:
+6 |     pass
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN001 Missing type annotation for function argument `a`
  --> annotation_presence.py:5:9
@@ -48,16 +47,15 @@ ANN201 [*] Missing return type annotation for public function `foo`
 11 |     pass
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | 
-9  9  | # Error
-10    |-def foo(a: int, b):
-   10 |+def foo(a: int, b) -> None:
-11 11 |     pass
-12 12 | 
-13 13 | 
+7  | 
+8  | 
+9  | # Error
+   - def foo(a: int, b):
+10 + def foo(a: int, b) -> None:
+11 |     pass
+12 | 
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN001 Missing type annotation for function argument `b`
   --> annotation_presence.py:10:17
@@ -86,16 +84,15 @@ ANN201 [*] Missing return type annotation for public function `foo`
 21 |     pass
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | # Error
-20    |-def foo(a: int, b: int):
-   20 |+def foo(a: int, b: int) -> None:
-21 21 |     pass
-22 22 | 
-23 23 | 
+17 | 
+18 | 
+19 | # Error
+   - def foo(a: int, b: int):
+20 + def foo(a: int, b: int) -> None:
+21 |     pass
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `foo`
   --> annotation_presence.py:25:5
@@ -106,16 +103,15 @@ ANN201 [*] Missing return type annotation for public function `foo`
 26 |     pass
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | 
-24 24 | # Error
-25    |-def foo():
-   25 |+def foo() -> None:
-26 26 |     pass
-27 27 | 
-28 28 | 
+22 | 
+23 | 
+24 | # Error
+   - def foo():
+25 + def foo() -> None:
+26 |     pass
+27 | 
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
   --> annotation_presence.py:45:12
@@ -297,16 +293,15 @@ ANN204 [*] Missing return type annotation for special method `__init__`
 160 |        ...
     |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-156 156 | 
-157 157 | class Foo:
-158 158 |     @decorator()
-159     |-    def __init__(self: "Foo", foo: int):
-    159 |+    def __init__(self: "Foo", foo: int) -> None:
-160 160 |        ...
-161 161 | 
-162 162 | 
+156 | 
+157 | class Foo:
+158 |     @decorator()
+    -     def __init__(self: "Foo", foo: int):
+159 +     def __init__(self: "Foo", foo: int) -> None:
+160 |        ...
+161 | 
+162 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__init__`
    --> annotation_presence.py:165:9
@@ -318,11 +313,10 @@ ANN204 [*] Missing return type annotation for special method `__init__`
 166 |         print(f"{self.attr=}")
     |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-162 162 | 
-163 163 | # Regression test for: https://github.com/astral-sh/ruff/issues/7711
-164 164 | class Class:
-165     |-    def __init__(self):
-    165 |+    def __init__(self) -> None:
-166 166 |         print(f"{self.attr=}")
+162 | 
+163 | # Regression test for: https://github.com/astral-sh/ruff/issues/7711
+164 | class Class:
+    -     def __init__(self):
+165 +     def __init__(self) -> None:
+166 |         print(f"{self.attr=}")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap
index b6f926aa7a..2205211101 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap
@@ -9,16 +9,15 @@ ANN201 [*] Missing return type annotation for public function `error_partially_t
 25 |     pass
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-21 21 |     pass
-22 22 | 
-23 23 | 
-24    |-def error_partially_typed_1(a: int, b):
-   24 |+def error_partially_typed_1(a: int, b) -> None:
-25 25 |     pass
-26 26 | 
-27 27 | 
+21 |     pass
+22 | 
+23 | 
+   - def error_partially_typed_1(a: int, b):
+24 + def error_partially_typed_1(a: int, b) -> None:
+25 |     pass
+26 | 
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN001 Missing type annotation for function argument `b`
   --> ignore_fully_untyped.py:24:37
@@ -44,16 +43,15 @@ ANN201 [*] Missing return type annotation for public function `error_partially_t
 33 |     pass
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-29 29 |     pass
-30 30 | 
-31 31 | 
-32    |-def error_partially_typed_3(a: int, b: int):
-   32 |+def error_partially_typed_3(a: int, b: int) -> None:
-33 33 |     pass
-34 34 | 
-35 35 | 
+29 |     pass
+30 | 
+31 | 
+   - def error_partially_typed_3(a: int, b: int):
+32 + def error_partially_typed_3(a: int, b: int) -> None:
+33 |     pass
+34 | 
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `error_typed_self`
   --> ignore_fully_untyped.py:43:9
@@ -65,11 +63,10 @@ ANN201 [*] Missing return type annotation for public function `error_typed_self`
 44 |         pass
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-40 40 |     def ok_untyped_method(self):
-41 41 |         pass
-42 42 | 
-43    |-    def error_typed_self(self: X):
-   43 |+    def error_typed_self(self: X) -> None:
-44 44 |         pass
+40 |     def ok_untyped_method(self):
+41 |         pass
+42 | 
+   -     def error_typed_self(self: X):
+43 +     def error_typed_self(self: X) -> None:
+44 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap
index 5a937ee087..0e8165797c 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap
@@ -11,16 +11,15 @@ ANN204 [*] Missing return type annotation for special method `__init__`
 6 |         ...
   |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | # Error
-4 4 | class Foo:
-5   |-    def __init__(self):
-  5 |+    def __init__(self) -> None:
-6 6 |         ...
-7 7 | 
-8 8 | 
+2 | 
+3 | # Error
+4 | class Foo:
+  -     def __init__(self):
+5 +     def __init__(self) -> None:
+6 |         ...
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__init__`
   --> mypy_init_return.py:11:9
@@ -32,16 +31,15 @@ ANN204 [*] Missing return type annotation for special method `__init__`
 12 |         ...
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | # Error
-10 10 | class Foo:
-11    |-    def __init__(self, foo):
-   11 |+    def __init__(self, foo) -> None:
-12 12 |         ...
-13 13 | 
-14 14 | 
+8  | 
+9  | # Error
+10 | class Foo:
+   -     def __init__(self, foo):
+11 +     def __init__(self, foo) -> None:
+12 |         ...
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN202 [*] Missing return type annotation for private function `__init__`
   --> mypy_init_return.py:40:5
@@ -52,16 +50,15 @@ ANN202 [*] Missing return type annotation for private function `__init__`
 41 |     ...
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-37 37 | 
-38 38 | 
-39 39 | # Error
-40    |-def __init__(self, foo: int):
-   40 |+def __init__(self, foo: int) -> None:
-41 41 |     ...
-42 42 | 
-43 43 | 
+37 | 
+38 | 
+39 | # Error
+   - def __init__(self, foo: int):
+40 + def __init__(self, foo: int) -> None:
+41 |     ...
+42 | 
+43 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__init__`
   --> mypy_init_return.py:47:9
@@ -73,11 +70,10 @@ ANN204 [*] Missing return type annotation for special method `__init__`
 48 |         ...
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-44 44 | # Error – used to be ok for a moment since the mere presence
-45 45 | # of a vararg falsely indicated that the function has a typed argument.
-46 46 | class Foo:
-47    |-    def __init__(self, *arg):
-   47 |+    def __init__(self, *arg) -> None:
-48 48 |         ...
+44 | # Error – used to be ok for a moment since the mere presence
+45 | # of a vararg falsely indicated that the function has a typed argument.
+46 | class Foo:
+   -     def __init__(self, *arg):
+47 +     def __init__(self, *arg) -> None:
+48 |         ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__shadowed_builtins.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__shadowed_builtins.snap
new file mode 100644
index 0000000000..badd951022
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__shadowed_builtins.snap
@@ -0,0 +1,124 @@
+---
+source: crates/ruff_linter/src/rules/flake8_annotations/mod.rs
+---
+ANN201 [*] Missing return type annotation for public function `foo`
+ --> shadowed_builtins.py:4:5
+  |
+2 | from typing import override
+3 |
+4 | def foo():
+  |     ^^^
+5 |     return "!"
+  |
+help: Add return type annotation: `builtins.str`
+1 | from collections import UserString as str
+2 | from typing import override
+3 + import builtins
+4 | 
+  - def foo():
+5 + def foo() -> builtins.str:
+6 |     return "!"
+7 | 
+8 | def _foo():
+note: This is an unsafe fix and may change runtime behavior
+
+ANN202 [*] Missing return type annotation for private function `_foo`
+ --> shadowed_builtins.py:7:5
+  |
+5 |     return "!"
+6 |
+7 | def _foo():
+  |     ^^^^
+8 |     return "!"
+  |
+help: Add return type annotation: `builtins.str`
+1  | from collections import UserString as str
+2  | from typing import override
+3  + import builtins
+4  | 
+5  | def foo():
+6  |     return "!"
+7  | 
+   - def _foo():
+8  + def _foo() -> builtins.str:
+9  |     return "!"
+10 | 
+11 | class C:
+note: This is an unsafe fix and may change runtime behavior
+
+ANN204 [*] Missing return type annotation for special method `__str__`
+  --> shadowed_builtins.py:12:9
+   |
+10 | class C:
+11 |     @override
+12 |     def __str__(self):
+   |         ^^^^^^^
+13 |         return "!"
+   |
+help: Add return type annotation: `str`
+1  | from collections import UserString as str
+2  | from typing import override
+3  + import builtins
+4  | 
+5  | def foo():
+6  |     return "!"
+--------------------------------------------------------------------------------
+10 | 
+11 | class C:
+12 |     @override
+   -     def __str__(self):
+13 +     def __str__(self) -> builtins.str:
+14 |         return "!"
+15 |     
+16 |     @staticmethod
+note: This is an unsafe fix and may change runtime behavior
+
+ANN205 [*] Missing return type annotation for staticmethod `foo`
+  --> shadowed_builtins.py:16:9
+   |
+15 |     @staticmethod
+16 |     def foo():
+   |         ^^^
+17 |         return "!"
+   |
+help: Add return type annotation: `builtins.str`
+1  | from collections import UserString as str
+2  | from typing import override
+3  + import builtins
+4  | 
+5  | def foo():
+6  |     return "!"
+--------------------------------------------------------------------------------
+14 |         return "!"
+15 |     
+16 |     @staticmethod
+   -     def foo():
+17 +     def foo() -> builtins.str:
+18 |         return "!"
+19 |     
+20 |     @classmethod
+note: This is an unsafe fix and may change runtime behavior
+
+ANN206 [*] Missing return type annotation for classmethod `bar`
+  --> shadowed_builtins.py:20:9
+   |
+19 |     @classmethod
+20 |     def bar(cls):
+   |         ^^^
+21 |         return "!"
+   |
+help: Add return type annotation: `builtins.str`
+1  | from collections import UserString as str
+2  | from typing import override
+3  + import builtins
+4  | 
+5  | def foo():
+6  |     return "!"
+--------------------------------------------------------------------------------
+18 |         return "!"
+19 |     
+20 |     @classmethod
+   -     def bar(cls):
+21 +     def bar(cls) -> builtins.str:
+22 |         return "!"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap
index b824397f1a..031e4e7524 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap
@@ -10,14 +10,13 @@ ANN204 [*] Missing return type annotation for special method `__str__`
 3 |         ...
   |
 help: Add return type annotation: `str`
-
-ℹ Unsafe fix
-1 1 | class Foo:
-2   |-    def __str__(self):
-  2 |+    def __str__(self) -> str:
-3 3 |         ...
-4 4 | 
-5 5 |     def __repr__(self):
+1 | class Foo:
+  -     def __str__(self):
+2 +     def __str__(self) -> str:
+3 |         ...
+4 | 
+5 |     def __repr__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__repr__`
  --> simple_magic_methods.py:5:9
@@ -29,16 +28,15 @@ ANN204 [*] Missing return type annotation for special method `__repr__`
 6 |         ...
   |
 help: Add return type annotation: `str`
-
-ℹ Unsafe fix
-2 2 |     def __str__(self):
-3 3 |         ...
-4 4 | 
-5   |-    def __repr__(self):
-  5 |+    def __repr__(self) -> str:
-6 6 |         ...
-7 7 | 
-8 8 |     def __len__(self):
+2 |     def __str__(self):
+3 |         ...
+4 | 
+  -     def __repr__(self):
+5 +     def __repr__(self) -> str:
+6 |         ...
+7 | 
+8 |     def __len__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__len__`
  --> simple_magic_methods.py:8:9
@@ -50,16 +48,15 @@ ANN204 [*] Missing return type annotation for special method `__len__`
 9 |         ...
   |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-5 5 |     def __repr__(self):
-6 6 |         ...
-7 7 | 
-8   |-    def __len__(self):
-  8 |+    def __len__(self) -> int:
-9 9 |         ...
-10 10 | 
-11 11 |     def __length_hint__(self):
+5  |     def __repr__(self):
+6  |         ...
+7  | 
+   -     def __len__(self):
+8  +     def __len__(self) -> int:
+9  |         ...
+10 | 
+11 |     def __length_hint__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__length_hint__`
   --> simple_magic_methods.py:11:9
@@ -71,16 +68,15 @@ ANN204 [*] Missing return type annotation for special method `__length_hint__`
 12 |         ...
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-8  8  |     def __len__(self):
-9  9  |         ...
-10 10 | 
-11    |-    def __length_hint__(self):
-   11 |+    def __length_hint__(self) -> int:
-12 12 |         ...
-13 13 | 
-14 14 |     def __init__(self):
+8  |     def __len__(self):
+9  |         ...
+10 | 
+   -     def __length_hint__(self):
+11 +     def __length_hint__(self) -> int:
+12 |         ...
+13 | 
+14 |     def __init__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__init__`
   --> simple_magic_methods.py:14:9
@@ -92,16 +88,15 @@ ANN204 [*] Missing return type annotation for special method `__init__`
 15 |         ...
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-11 11 |     def __length_hint__(self):
-12 12 |         ...
-13 13 | 
-14    |-    def __init__(self):
-   14 |+    def __init__(self) -> None:
-15 15 |         ...
-16 16 | 
-17 17 |     def __del__(self):
+11 |     def __length_hint__(self):
+12 |         ...
+13 | 
+   -     def __init__(self):
+14 +     def __init__(self) -> None:
+15 |         ...
+16 | 
+17 |     def __del__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__del__`
   --> simple_magic_methods.py:17:9
@@ -113,16 +108,15 @@ ANN204 [*] Missing return type annotation for special method `__del__`
 18 |         ...
    |
 help: Add return type annotation: `None`
-
-ℹ Unsafe fix
-14 14 |     def __init__(self):
-15 15 |         ...
-16 16 | 
-17    |-    def __del__(self):
-   17 |+    def __del__(self) -> None:
-18 18 |         ...
-19 19 | 
-20 20 |     def __bool__(self):
+14 |     def __init__(self):
+15 |         ...
+16 | 
+   -     def __del__(self):
+17 +     def __del__(self) -> None:
+18 |         ...
+19 | 
+20 |     def __bool__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__bool__`
   --> simple_magic_methods.py:20:9
@@ -134,16 +128,15 @@ ANN204 [*] Missing return type annotation for special method `__bool__`
 21 |         ...
    |
 help: Add return type annotation: `bool`
-
-ℹ Unsafe fix
-17 17 |     def __del__(self):
-18 18 |         ...
-19 19 | 
-20    |-    def __bool__(self):
-   20 |+    def __bool__(self) -> bool:
-21 21 |         ...
-22 22 | 
-23 23 |     def __bytes__(self):
+17 |     def __del__(self):
+18 |         ...
+19 | 
+   -     def __bool__(self):
+20 +     def __bool__(self) -> bool:
+21 |         ...
+22 | 
+23 |     def __bytes__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__bytes__`
   --> simple_magic_methods.py:23:9
@@ -155,16 +148,15 @@ ANN204 [*] Missing return type annotation for special method `__bytes__`
 24 |         ...
    |
 help: Add return type annotation: `bytes`
-
-ℹ Unsafe fix
-20 20 |     def __bool__(self):
-21 21 |         ...
-22 22 | 
-23    |-    def __bytes__(self):
-   23 |+    def __bytes__(self) -> bytes:
-24 24 |         ...
-25 25 | 
-26 26 |     def __format__(self, format_spec):
+20 |     def __bool__(self):
+21 |         ...
+22 | 
+   -     def __bytes__(self):
+23 +     def __bytes__(self) -> bytes:
+24 |         ...
+25 | 
+26 |     def __format__(self, format_spec):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__format__`
   --> simple_magic_methods.py:26:9
@@ -176,16 +168,15 @@ ANN204 [*] Missing return type annotation for special method `__format__`
 27 |         ...
    |
 help: Add return type annotation: `str`
-
-ℹ Unsafe fix
-23 23 |     def __bytes__(self):
-24 24 |         ...
-25 25 | 
-26    |-    def __format__(self, format_spec):
-   26 |+    def __format__(self, format_spec) -> str:
-27 27 |         ...
-28 28 | 
-29 29 |     def __contains__(self, item):
+23 |     def __bytes__(self):
+24 |         ...
+25 | 
+   -     def __format__(self, format_spec):
+26 +     def __format__(self, format_spec) -> str:
+27 |         ...
+28 | 
+29 |     def __contains__(self, item):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__contains__`
   --> simple_magic_methods.py:29:9
@@ -197,16 +188,15 @@ ANN204 [*] Missing return type annotation for special method `__contains__`
 30 |         ...
    |
 help: Add return type annotation: `bool`
-
-ℹ Unsafe fix
-26 26 |     def __format__(self, format_spec):
-27 27 |         ...
-28 28 | 
-29    |-    def __contains__(self, item):
-   29 |+    def __contains__(self, item) -> bool:
-30 30 |         ...
-31 31 | 
-32 32 |     def __complex__(self):
+26 |     def __format__(self, format_spec):
+27 |         ...
+28 | 
+   -     def __contains__(self, item):
+29 +     def __contains__(self, item) -> bool:
+30 |         ...
+31 | 
+32 |     def __complex__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__complex__`
   --> simple_magic_methods.py:32:9
@@ -218,16 +208,15 @@ ANN204 [*] Missing return type annotation for special method `__complex__`
 33 |         ...
    |
 help: Add return type annotation: `complex`
-
-ℹ Unsafe fix
-29 29 |     def __contains__(self, item):
-30 30 |         ...
-31 31 | 
-32    |-    def __complex__(self):
-   32 |+    def __complex__(self) -> complex:
-33 33 |         ...
-34 34 | 
-35 35 |     def __int__(self):
+29 |     def __contains__(self, item):
+30 |         ...
+31 | 
+   -     def __complex__(self):
+32 +     def __complex__(self) -> complex:
+33 |         ...
+34 | 
+35 |     def __int__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__int__`
   --> simple_magic_methods.py:35:9
@@ -239,16 +228,15 @@ ANN204 [*] Missing return type annotation for special method `__int__`
 36 |         ...
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-32 32 |     def __complex__(self):
-33 33 |         ...
-34 34 | 
-35    |-    def __int__(self):
-   35 |+    def __int__(self) -> int:
-36 36 |         ...
-37 37 | 
-38 38 |     def __float__(self):
+32 |     def __complex__(self):
+33 |         ...
+34 | 
+   -     def __int__(self):
+35 +     def __int__(self) -> int:
+36 |         ...
+37 | 
+38 |     def __float__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__float__`
   --> simple_magic_methods.py:38:9
@@ -260,16 +248,15 @@ ANN204 [*] Missing return type annotation for special method `__float__`
 39 |         ...
    |
 help: Add return type annotation: `float`
-
-ℹ Unsafe fix
-35 35 |     def __int__(self):
-36 36 |         ...
-37 37 | 
-38    |-    def __float__(self):
-   38 |+    def __float__(self) -> float:
-39 39 |         ...
-40 40 | 
-41 41 |     def __index__(self):
+35 |     def __int__(self):
+36 |         ...
+37 | 
+   -     def __float__(self):
+38 +     def __float__(self) -> float:
+39 |         ...
+40 | 
+41 |     def __index__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 ANN204 [*] Missing return type annotation for special method `__index__`
   --> simple_magic_methods.py:41:9
@@ -281,11 +268,10 @@ ANN204 [*] Missing return type annotation for special method `__index__`
 42 |         ...
    |
 help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-38 38 |     def __float__(self):
-39 39 |         ...
-40 40 | 
-41    |-    def __index__(self):
-   41 |+    def __index__(self) -> int:
-42 42 |         ...
+38 |     def __float__(self):
+39 |         ...
+40 | 
+   -     def __index__(self):
+41 +     def __index__(self) -> int:
+42 |         ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap
index ee8a25dae0..236339d126 100644
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap
@@ -10,16 +10,15 @@ ANN201 [*] Missing return type annotation for public function `foo`
 46 |     return True
    |
 help: Add return type annotation: `bool`
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | 
-44 44 | # Error
-45    |-def foo():
-   45 |+def foo() -> bool:
-46 46 |     return True
-47 47 | 
-48 48 | 
+42 | 
+43 | 
+44 | # Error
+   - def foo():
+45 + def foo() -> bool:
+46 |     return True
+47 | 
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ANN201 [*] Missing return type annotation for public function `foo`
   --> suppress_none_returning.py:50:5
@@ -31,16 +30,15 @@ ANN201 [*] Missing return type annotation for public function `foo`
 52 |     if a == 4:
    |
 help: Add return type annotation: `bool | None`
-
-ℹ Unsafe fix
-47 47 | 
-48 48 | 
-49 49 | # Error
-50    |-def foo():
-   50 |+def foo() -> bool | None:
-51 51 |     a = 2 + 2
-52 52 |     if a == 4:
-53 53 |         return True
+47 | 
+48 | 
+49 | # Error
+   - def foo():
+50 + def foo() -> bool | None:
+51 |     a = 2 + 2
+52 |     if a == 4:
+53 |         return True
+note: This is an unsafe fix and may change runtime behavior
 
 ANN001 Missing type annotation for function argument `a`
   --> suppress_none_returning.py:59:9
diff --git a/crates/ruff_linter/src/rules/flake8_async/mod.rs b/crates/ruff_linter/src/rules/flake8_async/mod.rs
index b7346e2429..1c92fe8358 100644
--- a/crates/ruff_linter/src/rules/flake8_async/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/mod.rs
@@ -23,10 +23,13 @@ mod tests {
     #[test_case(Rule::AsyncZeroSleep, Path::new("ASYNC115.py"))]
     #[test_case(Rule::LongSleepNotForever, Path::new("ASYNC116.py"))]
     #[test_case(Rule::BlockingHttpCallInAsyncFunction, Path::new("ASYNC210.py"))]
+    #[test_case(Rule::BlockingHttpCallHttpxInAsyncFunction, Path::new("ASYNC212.py"))]
     #[test_case(Rule::CreateSubprocessInAsyncFunction, Path::new("ASYNC22x.py"))]
     #[test_case(Rule::RunProcessInAsyncFunction, Path::new("ASYNC22x.py"))]
     #[test_case(Rule::WaitForProcessInAsyncFunction, Path::new("ASYNC22x.py"))]
     #[test_case(Rule::BlockingOpenCallInAsyncFunction, Path::new("ASYNC230.py"))]
+    #[test_case(Rule::BlockingPathMethodInAsyncFunction, Path::new("ASYNC240.py"))]
+    #[test_case(Rule::BlockingInputInAsyncFunction, Path::new("ASYNC250.py"))]
     #[test_case(Rule::BlockingSleepInAsyncFunction, Path::new("ASYNC251.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/async_busy_wait.rs b/crates/ruff_linter/src/rules/flake8_async/rules/async_busy_wait.rs
index 9b4fab75c4..3cbb3e992b 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/async_busy_wait.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/async_busy_wait.rs
@@ -42,6 +42,7 @@ use crate::rules::flake8_async::helpers::AsyncModule;
 /// - [`anyio` events](https://anyio.readthedocs.io/en/latest/api.html#anyio.Event)
 /// - [`trio` events](https://trio.readthedocs.io/en/latest/reference-core.html#trio.Event)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct AsyncBusyWait {
     module: AsyncModule,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/async_function_with_timeout.rs b/crates/ruff_linter/src/rules/flake8_async/rules/async_function_with_timeout.rs
index 74c19a734a..0593f2e1e8 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/async_function_with_timeout.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/async_function_with_timeout.rs
@@ -65,6 +65,7 @@ use ruff_python_ast::PythonVersion;
 ///
 /// ["structured concurrency"]: https://vorpus.org/blog/some-thoughts-on-asynchronous-api-design-in-a-post-asyncawait-world/#timeouts-and-cancellation
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct AsyncFunctionWithTimeout {
     module: AsyncModule,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/async_zero_sleep.rs b/crates/ruff_linter/src/rules/flake8_async/rules/async_zero_sleep.rs
index ec4a70d266..aee5788ae4 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/async_zero_sleep.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/async_zero_sleep.rs
@@ -49,6 +49,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     )
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct AsyncZeroSleep {
     module: AsyncModule,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call.rs
index b6e9d045ad..7f68504da4 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call.rs
@@ -38,6 +38,7 @@ use crate::checkers::ast::Checker;
 ///             ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct BlockingHttpCallInAsyncFunction;
 
 impl Violation for BlockingHttpCallInAsyncFunction {
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call_httpx.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call_httpx.rs
new file mode 100644
index 0000000000..ee36eb4bd4
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call_httpx.rs
@@ -0,0 +1,146 @@
+use ruff_python_ast::{self as ast, Expr, ExprCall};
+
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_semantic::analyze::typing::{TypeChecker, check_type, traverse_union_and_optional};
+use ruff_text_size::Ranged;
+
+use crate::Violation;
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks that async functions do not use blocking httpx clients.
+///
+/// ## 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 using the blocking `httpx` client, use the asynchronous client.
+///
+/// ## Example
+/// ```python
+/// import httpx
+///
+///
+/// async def fetch():
+///     client = httpx.Client()
+///     response = client.get(...)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import httpx
+///
+///
+/// async def fetch():
+///     async with httpx.AsyncClient() as client:
+///         response = await client.get(...)
+/// ```
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.12.11")]
+pub(crate) struct BlockingHttpCallHttpxInAsyncFunction {
+    name: String,
+    call: String,
+}
+
+impl Violation for BlockingHttpCallHttpxInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "Blocking httpx method {name}.{call}() in async context, use httpx.AsyncClient",
+            name = self.name,
+            call = self.call,
+        )
+    }
+}
+
+struct HttpxClientChecker;
+
+impl TypeChecker for HttpxClientChecker {
+    fn match_annotation(
+        annotation: &ruff_python_ast::Expr,
+        semantic: &ruff_python_semantic::SemanticModel,
+    ) -> bool {
+        // match base annotation directly
+        if semantic
+            .resolve_qualified_name(annotation)
+            .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["httpx", "Client"]))
+        {
+            return true;
+        }
+
+        // otherwise traverse any union or optional annotation
+        let mut found = false;
+        traverse_union_and_optional(
+            &mut |inner_expr, _| {
+                if semantic
+                    .resolve_qualified_name(inner_expr)
+                    .is_some_and(|qualified_name| {
+                        matches!(qualified_name.segments(), ["httpx", "Client"])
+                    })
+                {
+                    found = true;
+                }
+            },
+            semantic,
+            annotation,
+        );
+        found
+    }
+
+    fn match_initializer(
+        initializer: &ruff_python_ast::Expr,
+        semantic: &ruff_python_semantic::SemanticModel,
+    ) -> bool {
+        let Expr::Call(ExprCall { func, .. }) = initializer else {
+            return false;
+        };
+
+        semantic
+            .resolve_qualified_name(func)
+            .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["httpx", "Client"]))
+    }
+}
+
+/// ASYNC212
+pub(crate) fn blocking_http_call_httpx(checker: &Checker, call: &ExprCall) {
+    let semantic = checker.semantic();
+    if !semantic.in_async_context() {
+        return;
+    }
+
+    let Some(ast::ExprAttribute { value, attr, .. }) = call.func.as_attribute_expr() else {
+        return;
+    };
+    let Some(name) = value.as_name_expr() else {
+        return;
+    };
+    let Some(binding) = semantic.only_binding(name).map(|id| semantic.binding(id)) else {
+        return;
+    };
+
+    if check_type::<HttpxClientChecker>(binding, semantic) {
+        if matches!(
+            attr.id.as_str(),
+            "close"
+                | "delete"
+                | "get"
+                | "head"
+                | "options"
+                | "patch"
+                | "post"
+                | "put"
+                | "request"
+                | "send"
+                | "stream"
+        ) {
+            checker.report_diagnostic(
+                BlockingHttpCallHttpxInAsyncFunction {
+                    name: name.id.to_string(),
+                    call: attr.id.to_string(),
+                },
+                call.func.range(),
+            );
+        }
+    }
+}
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_input.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_input.rs
new file mode 100644
index 0000000000..c4c2cc85d6
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_input.rs
@@ -0,0 +1,53 @@
+use ruff_python_ast::ExprCall;
+
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_text_size::Ranged;
+
+use crate::Violation;
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks that async functions do not contain blocking usage of input from user.
+///
+/// ## Why is this bad?
+/// Blocking an async function via a blocking input call will block the entire
+/// event loop, preventing it from executing other tasks while waiting for user
+/// input, negating the benefits of asynchronous programming.
+///
+/// Instead of making a blocking input call directly, wrap the input call in
+/// an executor to execute the blocking call on another thread.
+///
+/// ## Example
+/// ```python
+/// async def foo():
+///     username = input("Username:")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import asyncio
+///
+///
+/// async def foo():
+///     loop = asyncio.get_running_loop()
+///     username = await loop.run_in_executor(None, input, "Username:")
+/// ```
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.12.12")]
+pub(crate) struct BlockingInputInAsyncFunction;
+
+impl Violation for BlockingInputInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        "Blocking call to input() in async context".to_string()
+    }
+}
+
+/// ASYNC250
+pub(crate) fn blocking_input(checker: &Checker, call: &ExprCall) {
+    if checker.semantic().in_async_context() {
+        if checker.semantic().match_builtin_expr(&call.func, "input") {
+            checker.report_diagnostic(BlockingInputInAsyncFunction, call.func.range());
+        }
+    }
+}
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs
index daf84df349..0b1427c781 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 ///         contents = await f.read()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct BlockingOpenCallInAsyncFunction;
 
 impl Violation for BlockingOpenCallInAsyncFunction {
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_path_methods.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_path_methods.rs
new file mode 100644
index 0000000000..c158e4a309
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_path_methods.rs
@@ -0,0 +1,247 @@
+use crate::Violation;
+use crate::checkers::ast::Checker;
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{self as ast, Expr, ExprCall};
+use ruff_python_semantic::analyze::typing::{TypeChecker, check_type, traverse_union_and_optional};
+use ruff_text_size::Ranged;
+
+/// ## What it does
+/// Checks that async functions do not call blocking `os.path` or `pathlib.Path`
+/// methods.
+///
+/// ## Why is this bad?
+/// Calling some `os.path` or `pathlib.Path` methods in an async function will block
+/// the entire event loop, preventing it from executing other tasks while waiting
+/// for the operation. This negates the benefits of asynchronous programming.
+///
+/// Instead, use the methods' async equivalents from `trio.Path` or `anyio.Path`.
+///
+/// ## Example
+/// ```python
+/// import os
+///
+///
+/// async def func():
+///     path = "my_file.txt"
+///     file_exists = os.path.exists(path)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import trio
+///
+///
+/// async def func():
+///     path = trio.Path("my_file.txt")
+///     file_exists = await path.exists()
+/// ```
+///
+/// Non-blocking methods are OK to use:
+/// ```python
+/// import pathlib
+///
+///
+/// async def func():
+///     path = pathlib.Path("my_file.txt")
+///     file_dirname = path.dirname()
+///     new_path = os.path.join("/tmp/src/", path)
+/// ```
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.13.2")]
+pub(crate) struct BlockingPathMethodInAsyncFunction {
+    path_library: String,
+}
+
+impl Violation for BlockingPathMethodInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "Async functions should not use {path_library} methods, use trio.Path or anyio.path",
+            path_library = self.path_library
+        )
+    }
+}
+
+/// ASYNC240
+pub(crate) fn blocking_os_path(checker: &Checker, call: &ExprCall) {
+    let semantic = checker.semantic();
+    if !semantic.in_async_context() {
+        return;
+    }
+
+    // Check if an expression is calling I/O related os.path method.
+    // Just initializing pathlib.Path object is OK, we can return
+    // early in that scenario.
+    if let Some(qualified_name) = semantic.resolve_qualified_name(call.func.as_ref()) {
+        let segments = qualified_name.segments();
+        if !matches!(segments, ["os", "path", _]) {
+            return;
+        }
+
+        let Some(os_path_method) = segments.last() else {
+            return;
+        };
+
+        if maybe_calling_io_operation(os_path_method) {
+            checker.report_diagnostic(
+                BlockingPathMethodInAsyncFunction {
+                    path_library: "os.path".to_string(),
+                },
+                call.func.range(),
+            );
+        }
+        return;
+    }
+
+    let Some(ast::ExprAttribute { value, attr, .. }) = call.func.as_attribute_expr() else {
+        return;
+    };
+
+    if !maybe_calling_io_operation(attr.id.as_str()) {
+        return;
+    }
+
+    // Check if an expression is a pathlib.Path constructor that directly
+    // calls an I/O method.
+    if PathlibPathChecker::match_initializer(value, semantic) {
+        checker.report_diagnostic(
+            BlockingPathMethodInAsyncFunction {
+                path_library: "pathlib.Path".to_string(),
+            },
+            call.func.range(),
+        );
+        return;
+    }
+
+    // Lastly, check if a variable is a pathlib.Path instance and it's
+    // calling an I/O method.
+    let Some(name) = value.as_name_expr() else {
+        return;
+    };
+
+    let Some(binding) = semantic.only_binding(name).map(|id| semantic.binding(id)) else {
+        return;
+    };
+
+    if check_type::<PathlibPathChecker>(binding, semantic) {
+        checker.report_diagnostic(
+            BlockingPathMethodInAsyncFunction {
+                path_library: "pathlib.Path".to_string(),
+            },
+            call.func.range(),
+        );
+    }
+}
+struct PathlibPathChecker;
+
+impl PathlibPathChecker {
+    fn is_pathlib_path_constructor(
+        semantic: &ruff_python_semantic::SemanticModel,
+        expr: &Expr,
+    ) -> bool {
+        let Some(qualified_name) = semantic.resolve_qualified_name(expr) else {
+            return false;
+        };
+
+        matches!(
+            qualified_name.segments(),
+            [
+                "pathlib",
+                "Path"
+                    | "PosixPath"
+                    | "PurePath"
+                    | "PurePosixPath"
+                    | "PureWindowsPath"
+                    | "WindowsPath"
+            ]
+        )
+    }
+}
+
+impl TypeChecker for PathlibPathChecker {
+    fn match_annotation(annotation: &Expr, semantic: &ruff_python_semantic::SemanticModel) -> bool {
+        if Self::is_pathlib_path_constructor(semantic, annotation) {
+            return true;
+        }
+
+        let mut found = false;
+        traverse_union_and_optional(
+            &mut |inner_expr, _| {
+                if Self::is_pathlib_path_constructor(semantic, inner_expr) {
+                    found = true;
+                }
+            },
+            semantic,
+            annotation,
+        );
+        found
+    }
+
+    fn match_initializer(
+        initializer: &Expr,
+        semantic: &ruff_python_semantic::SemanticModel,
+    ) -> bool {
+        let Expr::Call(ast::ExprCall { func, .. }) = initializer else {
+            return false;
+        };
+
+        Self::is_pathlib_path_constructor(semantic, func)
+    }
+}
+
+fn maybe_calling_io_operation(attr: &str) -> bool {
+    // ".open()" is added to the allow list to let ASYNC 230 handle
+    // that case.
+    !matches!(
+        attr,
+        "ALLOW_MISSING"
+            | "altsep"
+            | "anchor"
+            | "as_posix"
+            | "as_uri"
+            | "basename"
+            | "commonpath"
+            | "commonprefix"
+            | "curdir"
+            | "defpath"
+            | "devnull"
+            | "dirname"
+            | "drive"
+            | "expandvars"
+            | "extsep"
+            | "genericpath"
+            | "is_absolute"
+            | "is_relative_to"
+            | "is_reserved"
+            | "isabs"
+            | "join"
+            | "joinpath"
+            | "match"
+            | "name"
+            | "normcase"
+            | "os"
+            | "open"
+            | "pardir"
+            | "parent"
+            | "parents"
+            | "parts"
+            | "pathsep"
+            | "relative_to"
+            | "root"
+            | "samestat"
+            | "sep"
+            | "split"
+            | "splitdrive"
+            | "splitext"
+            | "splitroot"
+            | "stem"
+            | "suffix"
+            | "suffixes"
+            | "supports_unicode_filenames"
+            | "sys"
+            | "with_name"
+            | "with_segments"
+            | "with_stem"
+            | "with_suffix"
+    )
+}
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_process_invocation.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_process_invocation.rs
index 2995ab0e3c..8ea20eb2b0 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_process_invocation.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_process_invocation.rs
@@ -37,6 +37,7 @@ use crate::checkers::ast::Checker;
 ///     asyncio.create_subprocess_shell(cmd)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct CreateSubprocessInAsyncFunction;
 
 impl Violation for CreateSubprocessInAsyncFunction {
@@ -76,6 +77,7 @@ impl Violation for CreateSubprocessInAsyncFunction {
 ///     asyncio.create_subprocess_shell(cmd)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct RunProcessInAsyncFunction;
 
 impl Violation for RunProcessInAsyncFunction {
@@ -120,6 +122,7 @@ impl Violation for RunProcessInAsyncFunction {
 ///     await asyncio.loop.run_in_executor(None, wait_for_process)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct WaitForProcessInAsyncFunction;
 
 impl Violation for WaitForProcessInAsyncFunction {
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_sleep.rs b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_sleep.rs
index a3ef530bc0..a06ed76f6c 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_sleep.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_sleep.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 ///     await asyncio.sleep(1)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct BlockingSleepInAsyncFunction;
 
 impl Violation for BlockingSleepInAsyncFunction {
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/cancel_scope_no_checkpoint.rs b/crates/ruff_linter/src/rules/flake8_async/rules/cancel_scope_no_checkpoint.rs
index 80d9101948..6eedc05514 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/cancel_scope_no_checkpoint.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/cancel_scope_no_checkpoint.rs
@@ -45,6 +45,7 @@ use crate::rules::flake8_async::helpers::MethodName;
 /// - [`anyio` timeouts](https://anyio.readthedocs.io/en/stable/cancellation.html)
 /// - [`trio` timeouts](https://trio.readthedocs.io/en/stable/reference-core.html#cancellation-and-timeouts)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct CancelScopeNoCheckpoint {
     method_name: MethodName,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/long_sleep_not_forever.rs b/crates/ruff_linter/src/rules/flake8_async/rules/long_sleep_not_forever.rs
index 8680dce16b..e64e9644a3 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/long_sleep_not_forever.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/long_sleep_not_forever.rs
@@ -39,6 +39,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// This fix is marked as unsafe as it changes program behavior.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct LongSleepNotForever {
     module: AsyncModule,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/mod.rs b/crates/ruff_linter/src/rules/flake8_async/rules/mod.rs
index 1b115a3c8b..3e12ea360c 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/mod.rs
@@ -2,7 +2,10 @@ pub(crate) use async_busy_wait::*;
 pub(crate) use async_function_with_timeout::*;
 pub(crate) use async_zero_sleep::*;
 pub(crate) use blocking_http_call::*;
+pub(crate) use blocking_http_call_httpx::*;
+pub(crate) use blocking_input::*;
 pub(crate) use blocking_open_call::*;
+pub(crate) use blocking_path_methods::*;
 pub(crate) use blocking_process_invocation::*;
 pub(crate) use blocking_sleep::*;
 pub(crate) use cancel_scope_no_checkpoint::*;
@@ -13,7 +16,10 @@ mod async_busy_wait;
 mod async_function_with_timeout;
 mod async_zero_sleep;
 mod blocking_http_call;
+mod blocking_http_call_httpx;
+mod blocking_input;
 mod blocking_open_call;
+mod blocking_path_methods;
 mod blocking_process_invocation;
 mod blocking_sleep;
 mod cancel_scope_no_checkpoint;
diff --git a/crates/ruff_linter/src/rules/flake8_async/rules/sync_call.rs b/crates/ruff_linter/src/rules/flake8_async/rules/sync_call.rs
index dc4e40e68e..48a8f573a2 100644
--- a/crates/ruff_linter/src/rules/flake8_async/rules/sync_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/sync_call.rs
@@ -38,6 +38,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// This rule's fix is marked as unsafe, as adding an `await` to a function
 /// call changes its semantics and runtime behavior.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct TrioSyncCall {
     method_name: MethodName,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap
index 74bfb836ba..eff490466c 100644
--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap
@@ -11,16 +11,15 @@ ASYNC105 [*] Call to `trio.aclose_forcefully` is not immediately awaited
 32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-27 27 |     await trio.lowlevel.wait_writable(foo)
-28 28 | 
-29 29 |     # ASYNC105
-30    |-    trio.aclose_forcefully(foo)
-   30 |+    await trio.aclose_forcefully(foo)
-31 31 |     trio.open_file(foo)
-32 32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
-33 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+27 |     await trio.lowlevel.wait_writable(foo)
+28 | 
+29 |     # ASYNC105
+   -     trio.aclose_forcefully(foo)
+30 +     await trio.aclose_forcefully(foo)
+31 |     trio.open_file(foo)
+32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
+33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_file` is not immediately awaited
   --> ASYNC105.py:31:5
@@ -33,16 +32,15 @@ ASYNC105 [*] Call to `trio.open_file` is not immediately awaited
 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-28 28 | 
-29 29 |     # ASYNC105
-30 30 |     trio.aclose_forcefully(foo)
-31    |-    trio.open_file(foo)
-   31 |+    await trio.open_file(foo)
-32 32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
-33 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
-34 34 |     trio.open_tcp_listeners(foo)
+28 | 
+29 |     # ASYNC105
+30 |     trio.aclose_forcefully(foo)
+   -     trio.open_file(foo)
+31 +     await trio.open_file(foo)
+32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
+33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+34 |     trio.open_tcp_listeners(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_ssl_over_tcp_listeners` is not immediately awaited
   --> ASYNC105.py:32:5
@@ -55,16 +53,15 @@ ASYNC105 [*] Call to `trio.open_ssl_over_tcp_listeners` is not immediately await
 34 |     trio.open_tcp_listeners(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-29 29 |     # ASYNC105
-30 30 |     trio.aclose_forcefully(foo)
-31 31 |     trio.open_file(foo)
-32    |-    trio.open_ssl_over_tcp_listeners(foo, foo)
-   32 |+    await trio.open_ssl_over_tcp_listeners(foo, foo)
-33 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
-34 34 |     trio.open_tcp_listeners(foo)
-35 35 |     trio.open_tcp_stream(foo, foo)
+29 |     # ASYNC105
+30 |     trio.aclose_forcefully(foo)
+31 |     trio.open_file(foo)
+   -     trio.open_ssl_over_tcp_listeners(foo, foo)
+32 +     await trio.open_ssl_over_tcp_listeners(foo, foo)
+33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+34 |     trio.open_tcp_listeners(foo)
+35 |     trio.open_tcp_stream(foo, foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_ssl_over_tcp_stream` is not immediately awaited
   --> ASYNC105.py:33:5
@@ -77,16 +74,15 @@ ASYNC105 [*] Call to `trio.open_ssl_over_tcp_stream` is not immediately awaited
 35 |     trio.open_tcp_stream(foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-30 30 |     trio.aclose_forcefully(foo)
-31 31 |     trio.open_file(foo)
-32 32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
-33    |-    trio.open_ssl_over_tcp_stream(foo, foo)
-   33 |+    await trio.open_ssl_over_tcp_stream(foo, foo)
-34 34 |     trio.open_tcp_listeners(foo)
-35 35 |     trio.open_tcp_stream(foo, foo)
-36 36 |     trio.open_unix_socket(foo)
+30 |     trio.aclose_forcefully(foo)
+31 |     trio.open_file(foo)
+32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
+   -     trio.open_ssl_over_tcp_stream(foo, foo)
+33 +     await trio.open_ssl_over_tcp_stream(foo, foo)
+34 |     trio.open_tcp_listeners(foo)
+35 |     trio.open_tcp_stream(foo, foo)
+36 |     trio.open_unix_socket(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_tcp_listeners` is not immediately awaited
   --> ASYNC105.py:34:5
@@ -99,16 +95,15 @@ ASYNC105 [*] Call to `trio.open_tcp_listeners` is not immediately awaited
 36 |     trio.open_unix_socket(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-31 31 |     trio.open_file(foo)
-32 32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
-33 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
-34    |-    trio.open_tcp_listeners(foo)
-   34 |+    await trio.open_tcp_listeners(foo)
-35 35 |     trio.open_tcp_stream(foo, foo)
-36 36 |     trio.open_unix_socket(foo)
-37 37 |     trio.run_process(foo)
+31 |     trio.open_file(foo)
+32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
+33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+   -     trio.open_tcp_listeners(foo)
+34 +     await trio.open_tcp_listeners(foo)
+35 |     trio.open_tcp_stream(foo, foo)
+36 |     trio.open_unix_socket(foo)
+37 |     trio.run_process(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_tcp_stream` is not immediately awaited
   --> ASYNC105.py:35:5
@@ -121,16 +116,15 @@ ASYNC105 [*] Call to `trio.open_tcp_stream` is not immediately awaited
 37 |     trio.run_process(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-32 32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
-33 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
-34 34 |     trio.open_tcp_listeners(foo)
-35    |-    trio.open_tcp_stream(foo, foo)
-   35 |+    await trio.open_tcp_stream(foo, foo)
-36 36 |     trio.open_unix_socket(foo)
-37 37 |     trio.run_process(foo)
-38 38 |     trio.serve_listeners(foo, foo)
+32 |     trio.open_ssl_over_tcp_listeners(foo, foo)
+33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+34 |     trio.open_tcp_listeners(foo)
+   -     trio.open_tcp_stream(foo, foo)
+35 +     await trio.open_tcp_stream(foo, foo)
+36 |     trio.open_unix_socket(foo)
+37 |     trio.run_process(foo)
+38 |     trio.serve_listeners(foo, foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_unix_socket` is not immediately awaited
   --> ASYNC105.py:36:5
@@ -143,16 +137,15 @@ ASYNC105 [*] Call to `trio.open_unix_socket` is not immediately awaited
 38 |     trio.serve_listeners(foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-33 33 |     trio.open_ssl_over_tcp_stream(foo, foo)
-34 34 |     trio.open_tcp_listeners(foo)
-35 35 |     trio.open_tcp_stream(foo, foo)
-36    |-    trio.open_unix_socket(foo)
-   36 |+    await trio.open_unix_socket(foo)
-37 37 |     trio.run_process(foo)
-38 38 |     trio.serve_listeners(foo, foo)
-39 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+33 |     trio.open_ssl_over_tcp_stream(foo, foo)
+34 |     trio.open_tcp_listeners(foo)
+35 |     trio.open_tcp_stream(foo, foo)
+   -     trio.open_unix_socket(foo)
+36 +     await trio.open_unix_socket(foo)
+37 |     trio.run_process(foo)
+38 |     trio.serve_listeners(foo, foo)
+39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.run_process` is not immediately awaited
   --> ASYNC105.py:37:5
@@ -165,16 +158,15 @@ ASYNC105 [*] Call to `trio.run_process` is not immediately awaited
 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-34 34 |     trio.open_tcp_listeners(foo)
-35 35 |     trio.open_tcp_stream(foo, foo)
-36 36 |     trio.open_unix_socket(foo)
-37    |-    trio.run_process(foo)
-   37 |+    await trio.run_process(foo)
-38 38 |     trio.serve_listeners(foo, foo)
-39 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
-40 40 |     trio.serve_tcp(foo, foo)
+34 |     trio.open_tcp_listeners(foo)
+35 |     trio.open_tcp_stream(foo, foo)
+36 |     trio.open_unix_socket(foo)
+   -     trio.run_process(foo)
+37 +     await trio.run_process(foo)
+38 |     trio.serve_listeners(foo, foo)
+39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+40 |     trio.serve_tcp(foo, foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.serve_listeners` is not immediately awaited
   --> ASYNC105.py:38:5
@@ -187,16 +179,15 @@ ASYNC105 [*] Call to `trio.serve_listeners` is not immediately awaited
 40 |     trio.serve_tcp(foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-35 35 |     trio.open_tcp_stream(foo, foo)
-36 36 |     trio.open_unix_socket(foo)
-37 37 |     trio.run_process(foo)
-38    |-    trio.serve_listeners(foo, foo)
-   38 |+    await trio.serve_listeners(foo, foo)
-39 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
-40 40 |     trio.serve_tcp(foo, foo)
-41 41 |     trio.sleep(foo)
+35 |     trio.open_tcp_stream(foo, foo)
+36 |     trio.open_unix_socket(foo)
+37 |     trio.run_process(foo)
+   -     trio.serve_listeners(foo, foo)
+38 +     await trio.serve_listeners(foo, foo)
+39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+40 |     trio.serve_tcp(foo, foo)
+41 |     trio.sleep(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.serve_ssl_over_tcp` is not immediately awaited
   --> ASYNC105.py:39:5
@@ -209,16 +200,15 @@ ASYNC105 [*] Call to `trio.serve_ssl_over_tcp` is not immediately awaited
 41 |     trio.sleep(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-36 36 |     trio.open_unix_socket(foo)
-37 37 |     trio.run_process(foo)
-38 38 |     trio.serve_listeners(foo, foo)
-39    |-    trio.serve_ssl_over_tcp(foo, foo, foo)
-   39 |+    await trio.serve_ssl_over_tcp(foo, foo, foo)
-40 40 |     trio.serve_tcp(foo, foo)
-41 41 |     trio.sleep(foo)
-42 42 |     trio.sleep_forever()
+36 |     trio.open_unix_socket(foo)
+37 |     trio.run_process(foo)
+38 |     trio.serve_listeners(foo, foo)
+   -     trio.serve_ssl_over_tcp(foo, foo, foo)
+39 +     await trio.serve_ssl_over_tcp(foo, foo, foo)
+40 |     trio.serve_tcp(foo, foo)
+41 |     trio.sleep(foo)
+42 |     trio.sleep_forever()
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.serve_tcp` is not immediately awaited
   --> ASYNC105.py:40:5
@@ -231,16 +221,15 @@ ASYNC105 [*] Call to `trio.serve_tcp` is not immediately awaited
 42 |     trio.sleep_forever()
    |
 help: Add `await`
-
-ℹ Unsafe fix
-37 37 |     trio.run_process(foo)
-38 38 |     trio.serve_listeners(foo, foo)
-39 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
-40    |-    trio.serve_tcp(foo, foo)
-   40 |+    await trio.serve_tcp(foo, foo)
-41 41 |     trio.sleep(foo)
-42 42 |     trio.sleep_forever()
-43 43 |     trio.sleep_until(foo)
+37 |     trio.run_process(foo)
+38 |     trio.serve_listeners(foo, foo)
+39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+   -     trio.serve_tcp(foo, foo)
+40 +     await trio.serve_tcp(foo, foo)
+41 |     trio.sleep(foo)
+42 |     trio.sleep_forever()
+43 |     trio.sleep_until(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.sleep` is not immediately awaited
   --> ASYNC105.py:41:5
@@ -253,16 +242,15 @@ ASYNC105 [*] Call to `trio.sleep` is not immediately awaited
 43 |     trio.sleep_until(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-38 38 |     trio.serve_listeners(foo, foo)
-39 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
-40 40 |     trio.serve_tcp(foo, foo)
-41    |-    trio.sleep(foo)
-   41 |+    await trio.sleep(foo)
-42 42 |     trio.sleep_forever()
-43 43 |     trio.sleep_until(foo)
-44 44 |     trio.lowlevel.cancel_shielded_checkpoint()
+38 |     trio.serve_listeners(foo, foo)
+39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+40 |     trio.serve_tcp(foo, foo)
+   -     trio.sleep(foo)
+41 +     await trio.sleep(foo)
+42 |     trio.sleep_forever()
+43 |     trio.sleep_until(foo)
+44 |     trio.lowlevel.cancel_shielded_checkpoint()
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.sleep_forever` is not immediately awaited
   --> ASYNC105.py:42:5
@@ -275,16 +263,15 @@ ASYNC105 [*] Call to `trio.sleep_forever` is not immediately awaited
 44 |     trio.lowlevel.cancel_shielded_checkpoint()
    |
 help: Add `await`
-
-ℹ Unsafe fix
-39 39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
-40 40 |     trio.serve_tcp(foo, foo)
-41 41 |     trio.sleep(foo)
-42    |-    trio.sleep_forever()
-   42 |+    await trio.sleep_forever()
-43 43 |     trio.sleep_until(foo)
-44 44 |     trio.lowlevel.cancel_shielded_checkpoint()
-45 45 |     trio.lowlevel.checkpoint()
+39 |     trio.serve_ssl_over_tcp(foo, foo, foo)
+40 |     trio.serve_tcp(foo, foo)
+41 |     trio.sleep(foo)
+   -     trio.sleep_forever()
+42 +     await trio.sleep_forever()
+43 |     trio.sleep_until(foo)
+44 |     trio.lowlevel.cancel_shielded_checkpoint()
+45 |     trio.lowlevel.checkpoint()
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.cancel_shielded_checkpoint` is not immediately awaited
   --> ASYNC105.py:44:5
@@ -297,16 +284,15 @@ ASYNC105 [*] Call to `trio.lowlevel.cancel_shielded_checkpoint` is not immediate
 46 |     trio.lowlevel.checkpoint_if_cancelled()
    |
 help: Add `await`
-
-ℹ Unsafe fix
-41 41 |     trio.sleep(foo)
-42 42 |     trio.sleep_forever()
-43 43 |     trio.sleep_until(foo)
-44    |-    trio.lowlevel.cancel_shielded_checkpoint()
-   44 |+    await trio.lowlevel.cancel_shielded_checkpoint()
-45 45 |     trio.lowlevel.checkpoint()
-46 46 |     trio.lowlevel.checkpoint_if_cancelled()
-47 47 |     trio.lowlevel.open_process()
+41 |     trio.sleep(foo)
+42 |     trio.sleep_forever()
+43 |     trio.sleep_until(foo)
+   -     trio.lowlevel.cancel_shielded_checkpoint()
+44 +     await trio.lowlevel.cancel_shielded_checkpoint()
+45 |     trio.lowlevel.checkpoint()
+46 |     trio.lowlevel.checkpoint_if_cancelled()
+47 |     trio.lowlevel.open_process()
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.checkpoint` is not immediately awaited
   --> ASYNC105.py:45:5
@@ -319,16 +305,15 @@ ASYNC105 [*] Call to `trio.lowlevel.checkpoint` is not immediately awaited
 47 |     trio.lowlevel.open_process()
    |
 help: Add `await`
-
-ℹ Unsafe fix
-42 42 |     trio.sleep_forever()
-43 43 |     trio.sleep_until(foo)
-44 44 |     trio.lowlevel.cancel_shielded_checkpoint()
-45    |-    trio.lowlevel.checkpoint()
-   45 |+    await trio.lowlevel.checkpoint()
-46 46 |     trio.lowlevel.checkpoint_if_cancelled()
-47 47 |     trio.lowlevel.open_process()
-48 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+42 |     trio.sleep_forever()
+43 |     trio.sleep_until(foo)
+44 |     trio.lowlevel.cancel_shielded_checkpoint()
+   -     trio.lowlevel.checkpoint()
+45 +     await trio.lowlevel.checkpoint()
+46 |     trio.lowlevel.checkpoint_if_cancelled()
+47 |     trio.lowlevel.open_process()
+48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.checkpoint_if_cancelled` is not immediately awaited
   --> ASYNC105.py:46:5
@@ -341,16 +326,15 @@ ASYNC105 [*] Call to `trio.lowlevel.checkpoint_if_cancelled` is not immediately
 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-43 43 |     trio.sleep_until(foo)
-44 44 |     trio.lowlevel.cancel_shielded_checkpoint()
-45 45 |     trio.lowlevel.checkpoint()
-46    |-    trio.lowlevel.checkpoint_if_cancelled()
-   46 |+    await trio.lowlevel.checkpoint_if_cancelled()
-47 47 |     trio.lowlevel.open_process()
-48 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
-49 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+43 |     trio.sleep_until(foo)
+44 |     trio.lowlevel.cancel_shielded_checkpoint()
+45 |     trio.lowlevel.checkpoint()
+   -     trio.lowlevel.checkpoint_if_cancelled()
+46 +     await trio.lowlevel.checkpoint_if_cancelled()
+47 |     trio.lowlevel.open_process()
+48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.open_process` is not immediately awaited
   --> ASYNC105.py:47:5
@@ -363,16 +347,15 @@ ASYNC105 [*] Call to `trio.lowlevel.open_process` is not immediately awaited
 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-44 44 |     trio.lowlevel.cancel_shielded_checkpoint()
-45 45 |     trio.lowlevel.checkpoint()
-46 46 |     trio.lowlevel.checkpoint_if_cancelled()
-47    |-    trio.lowlevel.open_process()
-   47 |+    await trio.lowlevel.open_process()
-48 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
-49 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-50 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+44 |     trio.lowlevel.cancel_shielded_checkpoint()
+45 |     trio.lowlevel.checkpoint()
+46 |     trio.lowlevel.checkpoint_if_cancelled()
+   -     trio.lowlevel.open_process()
+47 +     await trio.lowlevel.open_process()
+48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.permanently_detach_coroutine_object` is not immediately awaited
   --> ASYNC105.py:48:5
@@ -385,16 +368,15 @@ ASYNC105 [*] Call to `trio.lowlevel.permanently_detach_coroutine_object` is not
 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-45 45 |     trio.lowlevel.checkpoint()
-46 46 |     trio.lowlevel.checkpoint_if_cancelled()
-47 47 |     trio.lowlevel.open_process()
-48    |-    trio.lowlevel.permanently_detach_coroutine_object(foo)
-   48 |+    await trio.lowlevel.permanently_detach_coroutine_object(foo)
-49 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-50 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
-51 51 |     trio.lowlevel.wait_readable(foo)
+45 |     trio.lowlevel.checkpoint()
+46 |     trio.lowlevel.checkpoint_if_cancelled()
+47 |     trio.lowlevel.open_process()
+   -     trio.lowlevel.permanently_detach_coroutine_object(foo)
+48 +     await trio.lowlevel.permanently_detach_coroutine_object(foo)
+49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+51 |     trio.lowlevel.wait_readable(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.reattach_detached_coroutine_object` is not immediately awaited
   --> ASYNC105.py:49:5
@@ -407,16 +389,15 @@ ASYNC105 [*] Call to `trio.lowlevel.reattach_detached_coroutine_object` is not i
 51 |     trio.lowlevel.wait_readable(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-46 46 |     trio.lowlevel.checkpoint_if_cancelled()
-47 47 |     trio.lowlevel.open_process()
-48 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
-49    |-    trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-   49 |+    await trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-50 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
-51 51 |     trio.lowlevel.wait_readable(foo)
-52 52 |     trio.lowlevel.wait_task_rescheduled(foo)
+46 |     trio.lowlevel.checkpoint_if_cancelled()
+47 |     trio.lowlevel.open_process()
+48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+   -     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+49 +     await trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+51 |     trio.lowlevel.wait_readable(foo)
+52 |     trio.lowlevel.wait_task_rescheduled(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.temporarily_detach_coroutine_object` is not immediately awaited
   --> ASYNC105.py:50:5
@@ -429,16 +410,15 @@ ASYNC105 [*] Call to `trio.lowlevel.temporarily_detach_coroutine_object` is not
 52 |     trio.lowlevel.wait_task_rescheduled(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-47 47 |     trio.lowlevel.open_process()
-48 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
-49 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-50    |-    trio.lowlevel.temporarily_detach_coroutine_object(foo)
-   50 |+    await trio.lowlevel.temporarily_detach_coroutine_object(foo)
-51 51 |     trio.lowlevel.wait_readable(foo)
-52 52 |     trio.lowlevel.wait_task_rescheduled(foo)
-53 53 |     trio.lowlevel.wait_writable(foo)
+47 |     trio.lowlevel.open_process()
+48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+   -     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+50 +     await trio.lowlevel.temporarily_detach_coroutine_object(foo)
+51 |     trio.lowlevel.wait_readable(foo)
+52 |     trio.lowlevel.wait_task_rescheduled(foo)
+53 |     trio.lowlevel.wait_writable(foo)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.wait_readable` is not immediately awaited
   --> ASYNC105.py:51:5
@@ -451,16 +431,15 @@ ASYNC105 [*] Call to `trio.lowlevel.wait_readable` is not immediately awaited
 53 |     trio.lowlevel.wait_writable(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-48 48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
-49 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-50 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
-51    |-    trio.lowlevel.wait_readable(foo)
-   51 |+    await trio.lowlevel.wait_readable(foo)
-52 52 |     trio.lowlevel.wait_task_rescheduled(foo)
-53 53 |     trio.lowlevel.wait_writable(foo)
-54 54 | 
+48 |     trio.lowlevel.permanently_detach_coroutine_object(foo)
+49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+   -     trio.lowlevel.wait_readable(foo)
+51 +     await trio.lowlevel.wait_readable(foo)
+52 |     trio.lowlevel.wait_task_rescheduled(foo)
+53 |     trio.lowlevel.wait_writable(foo)
+54 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.wait_task_rescheduled` is not immediately awaited
   --> ASYNC105.py:52:5
@@ -472,16 +451,15 @@ ASYNC105 [*] Call to `trio.lowlevel.wait_task_rescheduled` is not immediately aw
 53 |     trio.lowlevel.wait_writable(foo)
    |
 help: Add `await`
-
-ℹ Unsafe fix
-49 49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-50 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
-51 51 |     trio.lowlevel.wait_readable(foo)
-52    |-    trio.lowlevel.wait_task_rescheduled(foo)
-   52 |+    await trio.lowlevel.wait_task_rescheduled(foo)
-53 53 |     trio.lowlevel.wait_writable(foo)
-54 54 | 
-55 55 |     async with await trio.open_file(foo):  # Ok
+49 |     trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
+50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+51 |     trio.lowlevel.wait_readable(foo)
+   -     trio.lowlevel.wait_task_rescheduled(foo)
+52 +     await trio.lowlevel.wait_task_rescheduled(foo)
+53 |     trio.lowlevel.wait_writable(foo)
+54 | 
+55 |     async with await trio.open_file(foo):  # Ok
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.lowlevel.wait_writable` is not immediately awaited
   --> ASYNC105.py:53:5
@@ -494,16 +472,15 @@ ASYNC105 [*] Call to `trio.lowlevel.wait_writable` is not immediately awaited
 55 |     async with await trio.open_file(foo):  # Ok
    |
 help: Add `await`
-
-ℹ Unsafe fix
-50 50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
-51 51 |     trio.lowlevel.wait_readable(foo)
-52 52 |     trio.lowlevel.wait_task_rescheduled(foo)
-53    |-    trio.lowlevel.wait_writable(foo)
-   53 |+    await trio.lowlevel.wait_writable(foo)
-54 54 | 
-55 55 |     async with await trio.open_file(foo):  # Ok
-56 56 |         pass
+50 |     trio.lowlevel.temporarily_detach_coroutine_object(foo)
+51 |     trio.lowlevel.wait_readable(foo)
+52 |     trio.lowlevel.wait_task_rescheduled(foo)
+   -     trio.lowlevel.wait_writable(foo)
+53 +     await trio.lowlevel.wait_writable(foo)
+54 | 
+55 |     async with await trio.open_file(foo):  # Ok
+56 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 [*] Call to `trio.open_file` is not immediately awaited
   --> ASYNC105.py:58:16
@@ -515,16 +492,15 @@ ASYNC105 [*] Call to `trio.open_file` is not immediately awaited
 59 |         pass
    |
 help: Add `await`
-
-ℹ Unsafe fix
-55 55 |     async with await trio.open_file(foo):  # Ok
-56 56 |         pass
-57 57 | 
-58    |-    async with trio.open_file(foo):  # ASYNC105
-   58 |+    async with await trio.open_file(foo):  # ASYNC105
-59 59 |         pass
-60 60 | 
-61 61 | 
+55 |     async with await trio.open_file(foo):  # Ok
+56 |         pass
+57 | 
+   -     async with trio.open_file(foo):  # ASYNC105
+58 +     async with await trio.open_file(foo):  # ASYNC105
+59 |         pass
+60 | 
+61 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC105 Call to `trio.open_file` is not immediately awaited
   --> ASYNC105.py:64:5
diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap
index 89ff8a9eaf..32607804bd 100644
--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap
@@ -12,16 +12,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
 7 |     await trio.sleep(0, 1)  # OK
   |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-2 2 |     import trio
-3 3 |     from trio import sleep
-4 4 | 
-5   |-    await trio.sleep(0)  # ASYNC115
-  5 |+    await trio.lowlevel.checkpoint()  # ASYNC115
-6 6 |     await trio.sleep(1)  # OK
-7 7 |     await trio.sleep(0, 1)  # OK
-8 8 |     await trio.sleep(...)  # OK
+2 |     import trio
+3 |     from trio import sleep
+4 | 
+  -     await trio.sleep(0)  # ASYNC115
+5 +     await trio.lowlevel.checkpoint()  # ASYNC115
+6 |     await trio.sleep(1)  # OK
+7 |     await trio.sleep(0, 1)  # OK
+8 |     await trio.sleep(...)  # OK
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   --> ASYNC115.py:11:5
@@ -34,16 +32,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
 13 |     trio.sleep(foo)  # OK
    |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-8  8  |     await trio.sleep(...)  # OK
-9  9  |     await trio.sleep()  # OK
-10 10 | 
-11    |-    trio.sleep(0)  # ASYNC115
-   11 |+    trio.lowlevel.checkpoint()  # ASYNC115
-12 12 |     foo = 0
-13 13 |     trio.sleep(foo)  # OK
-14 14 |     trio.sleep(1)  # OK
+8  |     await trio.sleep(...)  # OK
+9  |     await trio.sleep()  # OK
+10 | 
+   -     trio.sleep(0)  # ASYNC115
+11 +     trio.lowlevel.checkpoint()  # ASYNC115
+12 |     foo = 0
+13 |     trio.sleep(foo)  # OK
+14 |     trio.sleep(1)  # OK
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   --> ASYNC115.py:17:5
@@ -56,16 +52,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
 19 |     bar = "bar"
    |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-14 14 |     trio.sleep(1)  # OK
-15 15 |     time.sleep(0)  # OK
-16 16 | 
-17    |-    sleep(0)  # ASYNC115
-   17 |+    trio.lowlevel.checkpoint()  # ASYNC115
-18 18 | 
-19 19 |     bar = "bar"
-20 20 |     trio.sleep(bar)
+14 |     trio.sleep(1)  # OK
+15 |     time.sleep(0)  # OK
+16 | 
+   -     sleep(0)  # ASYNC115
+17 +     trio.lowlevel.checkpoint()  # ASYNC115
+18 | 
+19 |     bar = "bar"
+20 |     trio.sleep(bar)
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   --> ASYNC115.py:48:14
@@ -76,16 +70,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
    |              ^^^^^^^^^^^^^
    |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-45 45 | def func():
-46 46 |     import trio
-47 47 | 
-48    |-    trio.run(trio.sleep(0))  # ASYNC115
-   48 |+    trio.run(trio.lowlevel.checkpoint())  # ASYNC115
-49 49 | 
-50 50 | 
-51 51 | from trio import Event, sleep
+45 | def func():
+46 |     import trio
+47 | 
+   -     trio.run(trio.sleep(0))  # ASYNC115
+48 +     trio.run(trio.lowlevel.checkpoint())  # ASYNC115
+49 | 
+50 | 
+51 | from trio import Event, sleep
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   --> ASYNC115.py:55:5
@@ -95,21 +87,19 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
    |     ^^^^^^^^
    |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-48 48 |     trio.run(trio.sleep(0))  # ASYNC115
-49 49 | 
-50 50 | 
-51    |-from trio import Event, sleep
-   51 |+from trio import Event, sleep, lowlevel
-52 52 | 
-53 53 | 
-54 54 | def func():
-55    |-    sleep(0)  # ASYNC115
-   55 |+    lowlevel.checkpoint()  # ASYNC115
-56 56 | 
-57 57 | 
-58 58 | async def func():
+48 |     trio.run(trio.sleep(0))  # ASYNC115
+49 | 
+50 | 
+   - from trio import Event, sleep
+51 + from trio import Event, sleep, lowlevel
+52 | 
+53 | 
+54 | def func():
+   -     sleep(0)  # ASYNC115
+55 +     lowlevel.checkpoint()  # ASYNC115
+56 | 
+57 | 
+58 | async def func():
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   --> ASYNC115.py:59:11
@@ -119,25 +109,23 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
    |           ^^^^^^^^^^^^^^^^
    |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-48 48 |     trio.run(trio.sleep(0))  # ASYNC115
-49 49 | 
-50 50 | 
-51    |-from trio import Event, sleep
-   51 |+from trio import Event, sleep, lowlevel
-52 52 | 
-53 53 | 
-54 54 | def func():
+48 |     trio.run(trio.sleep(0))  # ASYNC115
+49 | 
+50 | 
+   - from trio import Event, sleep
+51 + from trio import Event, sleep, lowlevel
+52 | 
+53 | 
+54 | def func():
 --------------------------------------------------------------------------------
-56 56 | 
-57 57 | 
-58 58 | async def func():
-59    |-    await sleep(seconds=0)  # ASYNC115
-   59 |+    await lowlevel.checkpoint()  # ASYNC115
-60 60 | 
-61 61 | 
-62 62 | def func():
+56 | 
+57 | 
+58 | async def func():
+   -     await sleep(seconds=0)  # ASYNC115
+59 +     await lowlevel.checkpoint()  # ASYNC115
+60 | 
+61 | 
+62 | def func():
 
 ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
   --> ASYNC115.py:85:11
@@ -150,16 +138,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
 87 |     await anyio.sleep(0, 1)  # OK
    |
 help: Replace with `anyio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-82 82 |     import anyio
-83 83 |     from anyio import sleep
-84 84 | 
-85    |-    await anyio.sleep(0)  # ASYNC115
-   85 |+    await anyio.lowlevel.checkpoint()  # ASYNC115
-86 86 |     await anyio.sleep(1)  # OK
-87 87 |     await anyio.sleep(0, 1)  # OK
-88 88 |     await anyio.sleep(...)  # OK
+82 |     import anyio
+83 |     from anyio import sleep
+84 | 
+   -     await anyio.sleep(0)  # ASYNC115
+85 +     await anyio.lowlevel.checkpoint()  # ASYNC115
+86 |     await anyio.sleep(1)  # OK
+87 |     await anyio.sleep(0, 1)  # OK
+88 |     await anyio.sleep(...)  # OK
 
 ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
   --> ASYNC115.py:91:5
@@ -172,16 +158,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
 93 |     anyio.sleep(foo)  # OK
    |
 help: Replace with `anyio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-88 88 |     await anyio.sleep(...)  # OK
-89 89 |     await anyio.sleep()  # OK
-90 90 | 
-91    |-    anyio.sleep(0)  # ASYNC115
-   91 |+    anyio.lowlevel.checkpoint()  # ASYNC115
-92 92 |     foo = 0
-93 93 |     anyio.sleep(foo)  # OK
-94 94 |     anyio.sleep(1)  # OK
+88 |     await anyio.sleep(...)  # OK
+89 |     await anyio.sleep()  # OK
+90 | 
+   -     anyio.sleep(0)  # ASYNC115
+91 +     anyio.lowlevel.checkpoint()  # ASYNC115
+92 |     foo = 0
+93 |     anyio.sleep(foo)  # OK
+94 |     anyio.sleep(1)  # OK
 
 ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
   --> ASYNC115.py:97:5
@@ -194,16 +178,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
 99 |     bar = "bar"
    |
 help: Replace with `anyio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-94 94 |     anyio.sleep(1)  # OK
-95 95 |     time.sleep(0)  # OK
-96 96 | 
-97    |-    sleep(0)  # ASYNC115
-   97 |+    anyio.lowlevel.checkpoint()  # ASYNC115
-98 98 | 
-99 99 |     bar = "bar"
-100 100 |     anyio.sleep(bar)
+94  |     anyio.sleep(1)  # OK
+95  |     time.sleep(0)  # OK
+96  | 
+    -     sleep(0)  # ASYNC115
+97  +     anyio.lowlevel.checkpoint()  # ASYNC115
+98  | 
+99  |     bar = "bar"
+100 |     anyio.sleep(bar)
 
 ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
    --> ASYNC115.py:128:15
@@ -214,16 +196,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
     |               ^^^^^^^^^^^^^^
     |
 help: Replace with `anyio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-125 125 | def func():
-126 126 |     import anyio
-127 127 | 
-128     |-    anyio.run(anyio.sleep(0))  # ASYNC115
-    128 |+    anyio.run(anyio.lowlevel.checkpoint())  # ASYNC115
-129 129 | 
-130 130 | 
-131 131 | def func():
+125 | def func():
+126 |     import anyio
+127 | 
+    -     anyio.run(anyio.sleep(0))  # ASYNC115
+128 +     anyio.run(anyio.lowlevel.checkpoint())  # ASYNC115
+129 | 
+130 | 
+131 | def func():
 
 ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
    --> ASYNC115.py:156:11
@@ -235,16 +215,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
 157 |     await anyio.sleep(seconds=0)  # OK
     |
 help: Replace with `anyio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-153 153 |     await anyio.sleep(delay=1)  # OK
-154 154 |     await anyio.sleep(seconds=1)  # OK
-155 155 | 
-156     |-    await anyio.sleep(delay=0)  # ASYNC115
-    156 |+    await anyio.lowlevel.checkpoint()  # ASYNC115
-157 157 |     await anyio.sleep(seconds=0)  # OK
-158 158 | 
-159 159 | 
+153 |     await anyio.sleep(delay=1)  # OK
+154 |     await anyio.sleep(seconds=1)  # OK
+155 | 
+    -     await anyio.sleep(delay=0)  # ASYNC115
+156 +     await anyio.lowlevel.checkpoint()  # ASYNC115
+157 |     await anyio.sleep(seconds=0)  # OK
+158 | 
+159 | 
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
    --> ASYNC115.py:166:11
@@ -256,16 +234,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
 167 |     await trio.sleep(delay=0)  # OK
     |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-163 163 |     await trio.sleep(seconds=1)  # OK
-164 164 |     await trio.sleep(delay=1)  # OK
-165 165 | 
-166     |-    await trio.sleep(seconds=0)  # ASYNC115
-    166 |+    await trio.lowlevel.checkpoint()  # ASYNC115
-167 167 |     await trio.sleep(delay=0)  # OK
-168 168 | 
-169 169 | # https://github.com/astral-sh/ruff/issues/18740
+163 |     await trio.sleep(seconds=1)  # OK
+164 |     await trio.sleep(delay=1)  # OK
+165 | 
+    -     await trio.sleep(seconds=0)  # ASYNC115
+166 +     await trio.lowlevel.checkpoint()  # ASYNC115
+167 |     await trio.sleep(delay=0)  # OK
+168 | 
+169 | # https://github.com/astral-sh/ruff/issues/18740
 
 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
    --> ASYNC115.py:175:5
@@ -279,14 +255,13 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
 179 |       )
     |
 help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Unsafe fix
-172 172 |     import trio
-173 173 | 
-174 174 |     await (
-175     |-    trio # comment
-176     |-    .sleep( # comment
-177     |-    0 # comment
-178     |-    )
-    175 |+    trio.lowlevel.checkpoint()
-179 176 |     )
+172 |     import trio
+173 | 
+174 |     await (
+    -     trio # comment
+    -     .sleep( # comment
+    -     0 # comment
+    -     )
+175 +     trio.lowlevel.checkpoint()
+176 |     )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap
index 12e4d43158..cf190cf8a0 100644
--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap
@@ -11,16 +11,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 13 |     # 'inf literal' overflow trick
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-8  8  |     import trio
-9  9  | 
-10 10 |     # These examples are probably not meant to ever wake up:
-11    |-    await trio.sleep(100000)  # error: 116, "async"
-   11 |+    await trio.sleep_forever()  # error: 116, "async"
-12 12 | 
-13 13 |     # 'inf literal' overflow trick
-14 14 |     await trio.sleep(1e999)  # error: 116, "async"
+8  |     import trio
+9  | 
+10 |     # These examples are probably not meant to ever wake up:
+   -     await trio.sleep(100000)  # error: 116, "async"
+11 +     await trio.sleep_forever()  # error: 116, "async"
+12 | 
+13 |     # 'inf literal' overflow trick
+14 |     await trio.sleep(1e999)  # error: 116, "async"
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
   --> ASYNC116.py:14:11
@@ -32,16 +31,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 16 |     await trio.sleep(86399)
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-11 11 |     await trio.sleep(100000)  # error: 116, "async"
-12 12 | 
-13 13 |     # 'inf literal' overflow trick
-14    |-    await trio.sleep(1e999)  # error: 116, "async"
-   14 |+    await trio.sleep_forever()  # error: 116, "async"
-15 15 | 
-16 16 |     await trio.sleep(86399)
-17 17 |     await trio.sleep(86400)
+11 |     await trio.sleep(100000)  # error: 116, "async"
+12 | 
+13 |     # 'inf literal' overflow trick
+   -     await trio.sleep(1e999)  # error: 116, "async"
+14 +     await trio.sleep_forever()  # error: 116, "async"
+15 | 
+16 |     await trio.sleep(86399)
+17 |     await trio.sleep(86400)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
   --> ASYNC116.py:18:11
@@ -53,16 +51,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 19 |     await trio.sleep(86401)  # error: 116, "async"
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-15 15 | 
-16 16 |     await trio.sleep(86399)
-17 17 |     await trio.sleep(86400)
-18    |-    await trio.sleep(86400.01)  # error: 116, "async"
-   18 |+    await trio.sleep_forever()  # error: 116, "async"
-19 19 |     await trio.sleep(86401)  # error: 116, "async"
-20 20 | 
-21 21 |     await trio.sleep(-1)  # will raise a runtime error
+15 | 
+16 |     await trio.sleep(86399)
+17 |     await trio.sleep(86400)
+   -     await trio.sleep(86400.01)  # error: 116, "async"
+18 +     await trio.sleep_forever()  # error: 116, "async"
+19 |     await trio.sleep(86401)  # error: 116, "async"
+20 | 
+21 |     await trio.sleep(-1)  # will raise a runtime error
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
   --> ASYNC116.py:19:11
@@ -75,16 +72,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 21 |     await trio.sleep(-1)  # will raise a runtime error
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-16 16 |     await trio.sleep(86399)
-17 17 |     await trio.sleep(86400)
-18 18 |     await trio.sleep(86400.01)  # error: 116, "async"
-19    |-    await trio.sleep(86401)  # error: 116, "async"
-   19 |+    await trio.sleep_forever()  # error: 116, "async"
-20 20 | 
-21 21 |     await trio.sleep(-1)  # will raise a runtime error
-22 22 |     await trio.sleep(0)  # handled by different check
+16 |     await trio.sleep(86399)
+17 |     await trio.sleep(86400)
+18 |     await trio.sleep(86400.01)  # error: 116, "async"
+   -     await trio.sleep(86401)  # error: 116, "async"
+19 +     await trio.sleep_forever()  # error: 116, "async"
+20 | 
+21 |     await trio.sleep(-1)  # will raise a runtime error
+22 |     await trio.sleep(0)  # handled by different check
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
   --> ASYNC116.py:48:5
@@ -96,16 +92,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 50 |     trio.run(trio.sleep(86401))  # error: 116, "async"
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-45 45 |     import trio
-46 46 | 
-47 47 |     # does not require the call to be awaited, nor in an async fun
-48    |-    trio.sleep(86401)  # error: 116, "async"
-   48 |+    trio.sleep_forever()  # error: 116, "async"
-49 49 |     # also checks that we don't break visit_Call
-50 50 |     trio.run(trio.sleep(86401))  # error: 116, "async"
-51 51 | 
+45 |     import trio
+46 | 
+47 |     # does not require the call to be awaited, nor in an async fun
+   -     trio.sleep(86401)  # error: 116, "async"
+48 +     trio.sleep_forever()  # error: 116, "async"
+49 |     # also checks that we don't break visit_Call
+50 |     trio.run(trio.sleep(86401))  # error: 116, "async"
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
   --> ASYNC116.py:50:14
@@ -116,16 +111,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
    |              ^^^^^^^^^^^^^^^^^
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-47 47 |     # does not require the call to be awaited, nor in an async fun
-48 48 |     trio.sleep(86401)  # error: 116, "async"
-49 49 |     # also checks that we don't break visit_Call
-50    |-    trio.run(trio.sleep(86401))  # error: 116, "async"
-   50 |+    trio.run(trio.sleep_forever())  # error: 116, "async"
-51 51 | 
-52 52 | 
-53 53 | async def import_from_trio():
+47 |     # does not require the call to be awaited, nor in an async fun
+48 |     trio.sleep(86401)  # error: 116, "async"
+49 |     # also checks that we don't break visit_Call
+   -     trio.run(trio.sleep(86401))  # error: 116, "async"
+50 +     trio.run(trio.sleep_forever())  # error: 116, "async"
+51 | 
+52 | 
+53 | async def import_from_trio():
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
   --> ASYNC116.py:57:11
@@ -135,24 +129,23 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
    |           ^^^^^^^^^^^^
    |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-2  2  | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger.
-3  3  | import math
-4  4  | from math import inf
-   5  |+from trio import sleep_forever
-5  6  | 
-6  7  | 
-7  8  | async def import_trio():
+2  | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger.
+3  | import math
+4  | from math import inf
+5  + from trio import sleep_forever
+6  | 
+7  | 
+8  | async def import_trio():
 --------------------------------------------------------------------------------
-54 55 |     from trio import sleep
-55 56 | 
-56 57 |     # catch from import
-57    |-    await sleep(86401)  # error: 116, "async"
-   58 |+    await sleep_forever()  # error: 116, "async"
-58 59 | 
-59 60 | 
-60 61 | async def import_anyio():
+55 |     from trio import sleep
+56 | 
+57 |     # catch from import
+   -     await sleep(86401)  # error: 116, "async"
+58 +     await sleep_forever()  # error: 116, "async"
+59 | 
+60 | 
+61 | async def import_anyio():
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
   --> ASYNC116.py:64:11
@@ -164,16 +157,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
 66 |     # 'inf literal' overflow trick
    |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-61 61 |     import anyio
-62 62 | 
-63 63 |     # These examples are probably not meant to ever wake up:
-64    |-    await anyio.sleep(100000)  # error: 116, "async"
-   64 |+    await anyio.sleep_forever()  # error: 116, "async"
-65 65 | 
-66 66 |     # 'inf literal' overflow trick
-67 67 |     await anyio.sleep(1e999)  # error: 116, "async"
+61 |     import anyio
+62 | 
+63 |     # These examples are probably not meant to ever wake up:
+   -     await anyio.sleep(100000)  # error: 116, "async"
+64 +     await anyio.sleep_forever()  # error: 116, "async"
+65 | 
+66 |     # 'inf literal' overflow trick
+67 |     await anyio.sleep(1e999)  # error: 116, "async"
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
   --> ASYNC116.py:67:11
@@ -185,16 +177,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
 69 |     await anyio.sleep(86399)
    |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-64 64 |     await anyio.sleep(100000)  # error: 116, "async"
-65 65 | 
-66 66 |     # 'inf literal' overflow trick
-67    |-    await anyio.sleep(1e999)  # error: 116, "async"
-   67 |+    await anyio.sleep_forever()  # error: 116, "async"
-68 68 | 
-69 69 |     await anyio.sleep(86399)
-70 70 |     await anyio.sleep(86400)
+64 |     await anyio.sleep(100000)  # error: 116, "async"
+65 | 
+66 |     # 'inf literal' overflow trick
+   -     await anyio.sleep(1e999)  # error: 116, "async"
+67 +     await anyio.sleep_forever()  # error: 116, "async"
+68 | 
+69 |     await anyio.sleep(86399)
+70 |     await anyio.sleep(86400)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
   --> ASYNC116.py:71:11
@@ -206,16 +197,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
 72 |     await anyio.sleep(86401)  # error: 116, "async"
    |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-68 68 | 
-69 69 |     await anyio.sleep(86399)
-70 70 |     await anyio.sleep(86400)
-71    |-    await anyio.sleep(86400.01)  # error: 116, "async"
-   71 |+    await anyio.sleep_forever()  # error: 116, "async"
-72 72 |     await anyio.sleep(86401)  # error: 116, "async"
-73 73 | 
-74 74 |     await anyio.sleep(-1)  # will raise a runtime error
+68 | 
+69 |     await anyio.sleep(86399)
+70 |     await anyio.sleep(86400)
+   -     await anyio.sleep(86400.01)  # error: 116, "async"
+71 +     await anyio.sleep_forever()  # error: 116, "async"
+72 |     await anyio.sleep(86401)  # error: 116, "async"
+73 | 
+74 |     await anyio.sleep(-1)  # will raise a runtime error
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
   --> ASYNC116.py:72:11
@@ -228,16 +218,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
 74 |     await anyio.sleep(-1)  # will raise a runtime error
    |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-69 69 |     await anyio.sleep(86399)
-70 70 |     await anyio.sleep(86400)
-71 71 |     await anyio.sleep(86400.01)  # error: 116, "async"
-72    |-    await anyio.sleep(86401)  # error: 116, "async"
-   72 |+    await anyio.sleep_forever()  # error: 116, "async"
-73 73 | 
-74 74 |     await anyio.sleep(-1)  # will raise a runtime error
-75 75 |     await anyio.sleep(0)  # handled by different check
+69 |     await anyio.sleep(86399)
+70 |     await anyio.sleep(86400)
+71 |     await anyio.sleep(86400.01)  # error: 116, "async"
+   -     await anyio.sleep(86401)  # error: 116, "async"
+72 +     await anyio.sleep_forever()  # error: 116, "async"
+73 | 
+74 |     await anyio.sleep(-1)  # will raise a runtime error
+75 |     await anyio.sleep(0)  # handled by different check
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
    --> ASYNC116.py:101:5
@@ -249,16 +238,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
 103 |     anyio.run(anyio.sleep(86401))  # error: 116, "async"
     |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-98  98  |     import anyio
-99  99  | 
-100 100 |     # does not require the call to be awaited, nor in an async fun
-101     |-    anyio.sleep(86401)  # error: 116, "async"
-    101 |+    anyio.sleep_forever()  # error: 116, "async"
-102 102 |     # also checks that we don't break visit_Call
-103 103 |     anyio.run(anyio.sleep(86401))  # error: 116, "async"
-104 104 | 
+98  |     import anyio
+99  | 
+100 |     # does not require the call to be awaited, nor in an async fun
+    -     anyio.sleep(86401)  # error: 116, "async"
+101 +     anyio.sleep_forever()  # error: 116, "async"
+102 |     # also checks that we don't break visit_Call
+103 |     anyio.run(anyio.sleep(86401))  # error: 116, "async"
+104 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
    --> ASYNC116.py:103:15
@@ -269,16 +257,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
     |               ^^^^^^^^^^^^^^^^^^
     |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-100 100 |     # does not require the call to be awaited, nor in an async fun
-101 101 |     anyio.sleep(86401)  # error: 116, "async"
-102 102 |     # also checks that we don't break visit_Call
-103     |-    anyio.run(anyio.sleep(86401))  # error: 116, "async"
-    103 |+    anyio.run(anyio.sleep_forever())  # error: 116, "async"
-104 104 | 
-105 105 | 
-106 106 | async def import_from_anyio():
+100 |     # does not require the call to be awaited, nor in an async fun
+101 |     anyio.sleep(86401)  # error: 116, "async"
+102 |     # also checks that we don't break visit_Call
+    -     anyio.run(anyio.sleep(86401))  # error: 116, "async"
+103 +     anyio.run(anyio.sleep_forever())  # error: 116, "async"
+104 | 
+105 | 
+106 | async def import_from_anyio():
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
    --> ASYNC116.py:110:11
@@ -288,24 +275,23 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
     |           ^^^^^^^^^^^^
     |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-2   2   | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger.
-3   3   | import math
-4   4   | from math import inf
-    5   |+from anyio import sleep_forever
-5   6   | 
-6   7   | 
-7   8   | async def import_trio():
+2   | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger.
+3   | import math
+4   | from math import inf
+5   + from anyio import sleep_forever
+6   | 
+7   | 
+8   | async def import_trio():
 --------------------------------------------------------------------------------
-107 108 |     from anyio import sleep
-108 109 | 
-109 110 |     # catch from import
-110     |-    await sleep(86401)  # error: 116, "async"
-    111 |+    await sleep_forever()  # error: 116, "async"
-111 112 | 
-112 113 | 
-113 114 | async def test_anyio_async116_helpers():
+108 |     from anyio import sleep
+109 | 
+110 |     # catch from import
+    -     await sleep(86401)  # error: 116, "async"
+111 +     await sleep_forever()  # error: 116, "async"
+112 | 
+113 | 
+114 | async def test_anyio_async116_helpers():
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
    --> ASYNC116.py:119:11
@@ -317,16 +303,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle
 120 |     await anyio.sleep(seconds=86401)  # OK
     |
 help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-116 116 |     await anyio.sleep(delay=1)  # OK
-117 117 |     await anyio.sleep(seconds=1)  # OK
-118 118 | 
-119     |-    await anyio.sleep(delay=86401)  # ASYNC116
-    119 |+    await anyio.sleep_forever()  # ASYNC116
-120 120 |     await anyio.sleep(seconds=86401)  # OK
-121 121 | 
-122 122 | 
+116 |     await anyio.sleep(delay=1)  # OK
+117 |     await anyio.sleep(seconds=1)  # OK
+118 | 
+    -     await anyio.sleep(delay=86401)  # ASYNC116
+119 +     await anyio.sleep_forever()  # ASYNC116
+120 |     await anyio.sleep(seconds=86401)  # OK
+121 | 
+122 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
    --> ASYNC116.py:129:11
@@ -338,16 +323,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 130 |     await trio.sleep(delay=86401)  # OK
     |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-126 126 |     await trio.sleep(seconds=1)  # OK
-127 127 |     await trio.sleep(delay=1)  # OK
-128 128 | 
-129     |-    await trio.sleep(seconds=86401)  # ASYNC116
-    129 |+    await trio.sleep_forever()  # ASYNC116
-130 130 |     await trio.sleep(delay=86401)  # OK
-131 131 | 
-132 132 | 
+126 |     await trio.sleep(seconds=1)  # OK
+127 |     await trio.sleep(delay=1)  # OK
+128 | 
+    -     await trio.sleep(seconds=86401)  # ASYNC116
+129 +     await trio.sleep_forever()  # ASYNC116
+130 |     await trio.sleep(delay=86401)  # OK
+131 | 
+132 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
    --> ASYNC116.py:137:11
@@ -359,14 +343,13 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
 138 |     await trio.sleep(99999999999999999999)
     |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-134 134 |     import trio
-135 135 |     from trio import sleep
-136 136 | 
-137     |-    await sleep(18446744073709551616)
-    137 |+    await trio.sleep_forever()
-138 138 |     await trio.sleep(99999999999999999999)
+134 |     import trio
+135 |     from trio import sleep
+136 | 
+    -     await sleep(18446744073709551616)
+137 +     await trio.sleep_forever()
+138 |     await trio.sleep(99999999999999999999)
+note: This is an unsafe fix and may change runtime behavior
 
 ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
    --> ASYNC116.py:138:11
@@ -376,10 +359,9 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep
     |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-135 135 |     from trio import sleep
-136 136 | 
-137 137 |     await sleep(18446744073709551616)
-138     |-    await trio.sleep(99999999999999999999)
-    138 |+    await trio.sleep_forever()
+135 |     from trio import sleep
+136 | 
+137 |     await sleep(18446744073709551616)
+    -     await trio.sleep(99999999999999999999)
+138 +     await trio.sleep_forever()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC212_ASYNC212.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC212_ASYNC212.py.snap
new file mode 100644
index 0000000000..9e641816a3
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC212_ASYNC212.py.snap
@@ -0,0 +1,168 @@
+---
+source: crates/ruff_linter/src/rules/flake8_async/mod.rs
+---
+ASYNC212 Blocking httpx method client.close() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:27:5
+   |
+25 | async def foo():
+26 |     client = httpx.Client()
+27 |     client.close()  # ASYNC212
+   |     ^^^^^^^^^^^^
+28 |     client.delete()  # ASYNC212
+29 |     client.get()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.delete() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:28:5
+   |
+26 |     client = httpx.Client()
+27 |     client.close()  # ASYNC212
+28 |     client.delete()  # ASYNC212
+   |     ^^^^^^^^^^^^^
+29 |     client.get()  # ASYNC212
+30 |     client.head()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.get() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:29:5
+   |
+27 |     client.close()  # ASYNC212
+28 |     client.delete()  # ASYNC212
+29 |     client.get()  # ASYNC212
+   |     ^^^^^^^^^^
+30 |     client.head()  # ASYNC212
+31 |     client.options()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.head() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:30:5
+   |
+28 |     client.delete()  # ASYNC212
+29 |     client.get()  # ASYNC212
+30 |     client.head()  # ASYNC212
+   |     ^^^^^^^^^^^
+31 |     client.options()  # ASYNC212
+32 |     client.patch()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.options() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:31:5
+   |
+29 |     client.get()  # ASYNC212
+30 |     client.head()  # ASYNC212
+31 |     client.options()  # ASYNC212
+   |     ^^^^^^^^^^^^^^
+32 |     client.patch()  # ASYNC212
+33 |     client.post()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.patch() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:32:5
+   |
+30 |     client.head()  # ASYNC212
+31 |     client.options()  # ASYNC212
+32 |     client.patch()  # ASYNC212
+   |     ^^^^^^^^^^^^
+33 |     client.post()  # ASYNC212
+34 |     client.put()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.post() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:33:5
+   |
+31 |     client.options()  # ASYNC212
+32 |     client.patch()  # ASYNC212
+33 |     client.post()  # ASYNC212
+   |     ^^^^^^^^^^^
+34 |     client.put()  # ASYNC212
+35 |     client.request()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.put() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:34:5
+   |
+32 |     client.patch()  # ASYNC212
+33 |     client.post()  # ASYNC212
+34 |     client.put()  # ASYNC212
+   |     ^^^^^^^^^^
+35 |     client.request()  # ASYNC212
+36 |     client.send()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:35:5
+   |
+33 |     client.post()  # ASYNC212
+34 |     client.put()  # ASYNC212
+35 |     client.request()  # ASYNC212
+   |     ^^^^^^^^^^^^^^
+36 |     client.send()  # ASYNC212
+37 |     client.stream()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.send() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:36:5
+   |
+34 |     client.put()  # ASYNC212
+35 |     client.request()  # ASYNC212
+36 |     client.send()  # ASYNC212
+   |     ^^^^^^^^^^^
+37 |     client.stream()  # ASYNC212
+   |
+
+ASYNC212 Blocking httpx method client.stream() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:37:5
+   |
+35 |     client.request()  # ASYNC212
+36 |     client.send()  # ASYNC212
+37 |     client.stream()  # ASYNC212
+   |     ^^^^^^^^^^^^^
+38 |
+39 |     client.anything()  # Ok
+   |
+
+ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:45:5
+   |
+44 | async def foo(client: httpx.Client):
+45 |     client.request()  # ASYNC212
+   |     ^^^^^^^^^^^^^^
+46 |     client.anything()  # Ok
+   |
+
+ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:50:5
+   |
+49 | async def foo(client: httpx.Client | None):
+50 |     client.request()  # ASYNC212
+   |     ^^^^^^^^^^^^^^
+51 |     client.anything()  # Ok
+   |
+
+ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:55:5
+   |
+54 | async def foo(client: Optional[httpx.Client]):
+55 |     client.request()  # ASYNC212
+   |     ^^^^^^^^^^^^^^
+56 |     client.anything()  # Ok
+   |
+
+ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:61:5
+   |
+59 | async def foo():
+60 |     client: httpx.Client = ...
+61 |     client.request()  # ASYNC212
+   |     ^^^^^^^^^^^^^^
+62 |     client.anything()  # Ok
+   |
+
+ASYNC212 Blocking httpx method global_client.request() in async context, use httpx.AsyncClient
+  --> ASYNC212.py:69:5
+   |
+68 | async def foo():
+69 |     global_client.request()  # ASYNC212
+   |     ^^^^^^^^^^^^^^^^^^^^^
+70 |     global_client.anything()  # Ok
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC240_ASYNC240.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC240_ASYNC240.py.snap
new file mode 100644
index 0000000000..888905aed7
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC240_ASYNC240.py.snap
@@ -0,0 +1,111 @@
+---
+source: crates/ruff_linter/src/rules/flake8_async/mod.rs
+---
+ASYNC240 Async functions should not use os.path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:67:5
+   |
+65 |     file = "file.txt"
+66 |
+67 |     os.path.abspath(file) # ASYNC240
+   |     ^^^^^^^^^^^^^^^
+68 |     os.path.exists(file) # ASYNC240
+   |
+
+ASYNC240 Async functions should not use os.path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:68:5
+   |
+67 |     os.path.abspath(file) # ASYNC240
+68 |     os.path.exists(file) # ASYNC240
+   |     ^^^^^^^^^^^^^^
+69 |
+70 | async def pathlib_path_in_foo():
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:72:5
+   |
+70 | async def pathlib_path_in_foo():
+71 |     path = Path("src/my_text.txt")
+72 |     path.exists() # ASYNC240
+   |     ^^^^^^^^^^^
+73 |
+74 | async def pathlib_path_in_foo():
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:78:5
+   |
+77 |     path = pathlib.Path("src/my_text.txt")
+78 |     path.exists() # ASYNC240
+   |     ^^^^^^^^^^^
+79 |
+80 | async def inline_path_method_call():
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:81:5
+   |
+80 | async def inline_path_method_call():
+81 |     Path("src/my_text.txt").exists() # ASYNC240
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+82 |     Path("src/my_text.txt").absolute().exists() # ASYNC240
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:82:5
+   |
+80 | async def inline_path_method_call():
+81 |     Path("src/my_text.txt").exists() # ASYNC240
+82 |     Path("src/my_text.txt").absolute().exists() # ASYNC240
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+83 |
+84 | async def aliased_path_in_foo():
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:88:5
+   |
+87 |     path = PathAlias("src/my_text.txt")
+88 |     path.exists() # ASYNC240
+   |     ^^^^^^^^^^^
+89 |
+90 | global_path = Path("src/my_text.txt")
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:93:5
+   |
+92 | async def global_path_in_foo():
+93 |     global_path.exists() # ASYNC240
+   |     ^^^^^^^^^^^^^^^^^^
+94 |
+95 | async def path_as_simple_parameter_type(path: Path):
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+  --> ASYNC240.py:96:5
+   |
+95 | async def path_as_simple_parameter_type(path: Path):
+96 |     path.exists() # ASYNC240
+   |     ^^^^^^^^^^^
+97 |
+98 | async def path_as_union_parameter_type(path: Path | None):
+   |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+   --> ASYNC240.py:99:5
+    |
+ 98 | async def path_as_union_parameter_type(path: Path | None):
+ 99 |     path.exists() # ASYNC240
+    |     ^^^^^^^^^^^
+100 |
+101 | async def path_as_optional_parameter_type(path: Optional[Path]):
+    |
+
+ASYNC240 Async functions should not use pathlib.Path methods, use trio.Path or anyio.path
+   --> ASYNC240.py:102:5
+    |
+101 | async def path_as_optional_parameter_type(path: Optional[Path]):
+102 |     path.exists() # ASYNC240
+    |     ^^^^^^^^^^^
+    |
diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC250_ASYNC250.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC250_ASYNC250.py.snap
new file mode 100644
index 0000000000..d65458efbd
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC250_ASYNC250.py.snap
@@ -0,0 +1,29 @@
+---
+source: crates/ruff_linter/src/rules/flake8_async/mod.rs
+---
+ASYNC250 Blocking call to input() in async context
+ --> ASYNC250.py:7:9
+  |
+6 | async def foo():
+7 |     k = input()  # ASYNC250
+  |         ^^^^^
+8 |     input("hello world")  # ASYNC250
+  |
+
+ASYNC250 Blocking call to input() in async context
+ --> ASYNC250.py:8:5
+  |
+6 | async def foo():
+7 |     k = input()  # ASYNC250
+8 |     input("hello world")  # ASYNC250
+  |     ^^^^^
+  |
+
+ASYNC250 Blocking call to input() in async context
+  --> ASYNC250.py:21:5
+   |
+20 | async def foo():
+21 |     builtins.input("testing")  # ASYNC250
+   |     ^^^^^^^^^^^^^^
+22 |     fake.input("whatever")  # Ok
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/assert_used.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/assert_used.rs
index 1366cb7ac7..606630bccb 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/assert_used.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/assert_used.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 ///     raise ValueError("Expected positive value.")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct Assert;
 
 impl Violation for Assert {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/bad_file_permissions.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/bad_file_permissions.rs
index dab899b43a..511c7b4341 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/bad_file_permissions.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/bad_file_permissions.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `stat`](https://docs.python.org/3/library/stat.html)
 /// - [Common Weakness Enumeration: CWE-732](https://cwe.mitre.org/data/definitions/732.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct BadFilePermissions {
     reason: Reason,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/django_extra.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/django_extra.rs
index 0ad0de23d5..3c33e38e9f 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/django_extra.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/django_extra.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 /// - [Django documentation: SQL injection protection](https://docs.djangoproject.com/en/dev/topics/security/#sql-injection-protection)
 /// - [Common Weakness Enumeration: CWE-89](https://cwe.mitre.org/data/definitions/89.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct DjangoExtra;
 
 impl Violation for DjangoExtra {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/django_raw_sql.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/django_raw_sql.rs
index 13c3556d23..16611b8e38 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/django_raw_sql.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/django_raw_sql.rs
@@ -25,6 +25,7 @@ use crate::checkers::ast::Checker;
 /// - [Django documentation: SQL injection protection](https://docs.djangoproject.com/en/dev/topics/security/#sql-injection-protection)
 /// - [Common Weakness Enumeration: CWE-89](https://cwe.mitre.org/data/definitions/89.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct DjangoRawSql;
 
 impl Violation for DjangoRawSql {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/exec_used.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/exec_used.rs
index f66347d6f4..442e322b93 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/exec_used.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/exec_used.rs
@@ -22,6 +22,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `exec`](https://docs.python.org/3/library/functions.html#exec)
 /// - [Common Weakness Enumeration: CWE-78](https://cwe.mitre.org/data/definitions/78.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct ExecBuiltin;
 
 impl Violation for ExecBuiltin {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/flask_debug_true.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/flask_debug_true.rs
index 9f147c6eec..df51a33599 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/flask_debug_true.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/flask_debug_true.rs
@@ -39,6 +39,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Flask documentation: Debug Mode](https://flask.palletsprojects.com/en/latest/quickstart/#debug-mode)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct FlaskDebugTrue;
 
 impl Violation for FlaskDebugTrue {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
index 843dd5c3b6..91994a042e 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
@@ -27,6 +27,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Common Weakness Enumeration: CWE-200](https://cwe.mitre.org/data/definitions/200.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct HardcodedBindAllInterfaces;
 
 impl Violation for HardcodedBindAllInterfaces {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_default.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
index 872ef4b7a9..db23388252 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
@@ -39,6 +39,7 @@ use crate::rules::flake8_bandit::helpers::{matches_password_name, string_literal
 /// ## References
 /// - [Common Weakness Enumeration: CWE-259](https://cwe.mitre.org/data/definitions/259.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct HardcodedPasswordDefault {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs
index f3cf884655..995c80e656 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs
@@ -35,6 +35,7 @@ use crate::rules::flake8_bandit::helpers::{matches_password_name, string_literal
 /// ## References
 /// - [Common Weakness Enumeration: CWE-259](https://cwe.mitre.org/data/definitions/259.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct HardcodedPasswordFuncArg {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_string.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
index 3711376801..e3c0b27ed6 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
@@ -34,6 +34,7 @@ use crate::rules::flake8_bandit::helpers::{matches_password_name, string_literal
 /// ## References
 /// - [Common Weakness Enumeration: CWE-259](https://cwe.mitre.org/data/definitions/259.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct HardcodedPasswordString {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
index 76baa9c479..34134d96c7 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
@@ -45,6 +45,7 @@ static SQL_REGEX: LazyLock<Regex> = LazyLock::new(|| {
 /// - [B608: Test for SQL injection](https://bandit.readthedocs.io/en/latest/plugins/b608_hardcoded_sql_expressions.html)
 /// - [psycopg3: Server-side binding](https://www.psycopg.org/psycopg3/docs/basic/from_pg2.html#server-side-binding)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct HardcodedSQLExpression;
 
 impl Violation for HardcodedSQLExpression {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
index 77893289e3..055f16a5f6 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// - [Common Weakness Enumeration: CWE-379](https://cwe.mitre.org/data/definitions/379.html)
 /// - [Python documentation: `tempfile`](https://docs.python.org/3/library/tempfile.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct HardcodedTempFile {
     string: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs
index 1de990e0e5..9268e39e2f 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs
@@ -23,6 +23,17 @@ use crate::rules::flake8_bandit::helpers::string_literal;
 /// Avoid using weak or broken cryptographic hash functions in security
 /// contexts. Instead, use a known secure hash function such as SHA256.
 ///
+/// Note: This rule targets the following weak algorithm names in `hashlib`:
+/// `md4`, `md5`, `sha`, and `sha1`. It also flags uses of `crypt.crypt` and
+/// `crypt.mksalt` when configured with `METHOD_CRYPT`, `METHOD_MD5`, or
+/// `METHOD_BLOWFISH`.
+///
+/// It does not attempt to lint OpenSSL- or platform-specific aliases and OIDs
+/// (for example: `"sha-1"`, `"ssl3-sha1"`, `"ssl3-md5"`, or
+/// `"1.3.14.3.2.26"`), nor variations with trailing spaces, as the set of
+/// accepted aliases depends on the underlying OpenSSL version and varies across
+/// platforms and Python builds.
+///
 /// ## Example
 /// ```python
 /// import hashlib
@@ -63,6 +74,7 @@ use crate::rules::flake8_bandit::helpers::string_literal;
 /// - [Common Weakness Enumeration: CWE-328](https://cwe.mitre.org/data/definitions/328.html)
 /// - [Common Weakness Enumeration: CWE-916](https://cwe.mitre.org/data/definitions/916.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.212")]
 pub(crate) struct HashlibInsecureHashFunction {
     library: String,
     string: String,
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
index 475a24dfae..17aca8105f 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// - [Jinja documentation: API](https://jinja.palletsprojects.com/en/latest/api/#autoescaping)
 /// - [Common Weakness Enumeration: CWE-94](https://cwe.mitre.org/data/definitions/94.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.220")]
 pub(crate) struct Jinja2AutoescapeFalse {
     value: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs
index 16d9b307b5..54ad45d645 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs
@@ -25,6 +25,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `logging.config.listen()`](https://docs.python.org/3/library/logging.config.html#logging.config.listen)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct LoggingConfigInsecureListen;
 
 impl Violation for LoggingConfigInsecureListen {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/mako_templates.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/mako_templates.rs
index b62a0b39e7..32f695263c 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/mako_templates.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/mako_templates.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 /// - [OpenStack security: Cross site scripting XSS](https://security.openstack.org/guidelines/dg_cross-site-scripting-xss.html)
 /// - [Common Weakness Enumeration: CWE-80](https://cwe.mitre.org/data/definitions/80.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct MakoTemplates;
 
 impl Violation for MakoTemplates {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/paramiko_calls.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/paramiko_calls.rs
index 8eb8ec0bfc..ea85c1ea20 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/paramiko_calls.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/paramiko_calls.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// - [Common Weakness Enumeration: CWE-78](https://cwe.mitre.org/data/definitions/78.html)
 /// - [Paramiko documentation: `SSHClient.exec_command()`](https://docs.paramiko.org/en/stable/api/client.html#paramiko.client.SSHClient.exec_command)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.270")]
 pub(crate) struct ParamikoCall;
 
 impl Violation for ParamikoCall {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs
index c22bf55168..dadd8bde40 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs
@@ -31,6 +31,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Common Weakness Enumeration: CWE-295](https://cwe.mitre.org/data/definitions/295.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct RequestWithNoCertValidation {
     string: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/request_without_timeout.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/request_without_timeout.rs
index b6d3352177..f9ae386b02 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/request_without_timeout.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/request_without_timeout.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 /// - [Requests documentation: Timeouts](https://requests.readthedocs.io/en/latest/user/advanced/#timeouts)
 /// - [httpx documentation: Timeouts](https://www.python-httpx.org/advanced/timeouts/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct RequestWithoutTimeout {
     implicit: bool,
     module: String,
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/shell_injection.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/shell_injection.rs
index 1e3a1c6fd1..038d1492bc 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/shell_injection.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/shell_injection.rs
@@ -37,6 +37,7 @@ use crate::{
 /// - [Python documentation: `subprocess` — Subprocess management](https://docs.python.org/3/library/subprocess.html)
 /// - [Common Weakness Enumeration: CWE-78](https://cwe.mitre.org/data/definitions/78.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct SubprocessPopenWithShellEqualsTrue {
     safety: Safety,
     is_exact: bool,
@@ -79,6 +80,7 @@ impl Violation for SubprocessPopenWithShellEqualsTrue {
 ///
 /// [#4045]: https://github.com/astral-sh/ruff/issues/4045
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct SubprocessWithoutShellEqualsTrue;
 
 impl Violation for SubprocessWithoutShellEqualsTrue {
@@ -117,6 +119,7 @@ impl Violation for SubprocessWithoutShellEqualsTrue {
 /// ## References
 /// - [Python documentation: Security Considerations](https://docs.python.org/3/library/subprocess.html#security-considerations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct CallWithShellEqualsTrue {
     is_exact: bool,
 }
@@ -169,6 +172,7 @@ impl Violation for CallWithShellEqualsTrue {
 /// ## References
 /// - [Python documentation: `subprocess`](https://docs.python.org/3/library/subprocess.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct StartProcessWithAShell {
     safety: Safety,
 }
@@ -210,6 +214,7 @@ impl Violation for StartProcessWithAShell {
 ///
 /// [S605]: https://docs.astral.sh/ruff/rules/start-process-with-a-shell
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct StartProcessWithNoShell;
 
 impl Violation for StartProcessWithNoShell {
@@ -245,6 +250,7 @@ impl Violation for StartProcessWithNoShell {
 /// - [Python documentation: `subprocess.Popen()`](https://docs.python.org/3/library/subprocess.html#subprocess.Popen)
 /// - [Common Weakness Enumeration: CWE-426](https://cwe.mitre.org/data/definitions/426.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct StartProcessWithPartialPath;
 
 impl Violation for StartProcessWithPartialPath {
@@ -278,6 +284,7 @@ impl Violation for StartProcessWithPartialPath {
 /// ## References
 /// - [Common Weakness Enumeration: CWE-78](https://cwe.mitre.org/data/definitions/78.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct UnixCommandWildcardInjection;
 
 impl Violation for UnixCommandWildcardInjection {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_insecure_version.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_insecure_version.rs
index c7e6affb48..b490efdfc5 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_insecure_version.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_insecure_version.rs
@@ -31,6 +31,7 @@ use crate::checkers::ast::Checker;
 /// - [Cybersecurity and Infrastructure Security Agency (CISA): Alert TA17-156A](https://www.cisa.gov/news-events/alerts/2017/06/05/reducing-risk-snmp-abuse)
 /// - [Common Weakness Enumeration: CWE-319](https://cwe.mitre.org/data/definitions/319.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.218")]
 pub(crate) struct SnmpInsecureVersion;
 
 impl Violation for SnmpInsecureVersion {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs
index f7453cae1e..9f067e2c4e 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs
@@ -29,6 +29,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Common Weakness Enumeration: CWE-319](https://cwe.mitre.org/data/definitions/319.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.218")]
 pub(crate) struct SnmpWeakCryptography;
 
 impl Violation for SnmpWeakCryptography {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssh_no_host_key_verification.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssh_no_host_key_verification.rs
index b09cd8e4ac..626da50782 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssh_no_host_key_verification.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssh_no_host_key_verification.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Paramiko documentation: set_missing_host_key_policy](https://docs.paramiko.org/en/latest/api/client.html#paramiko.client.SSHClient.set_missing_host_key_policy)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct SSHNoHostKeyVerification;
 
 impl Violation for SSHNoHostKeyVerification {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_insecure_version.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_insecure_version.rs
index d022d1711a..a423fe5233 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_insecure_version.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_insecure_version.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// ssl.wrap_socket(ssl_version=ssl.PROTOCOL_TLSv1_2)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct SslInsecureVersion {
     protocol: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_bad_defaults.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_bad_defaults.rs
index 1acb8d4ef4..4d8f8f3045 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_bad_defaults.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_bad_defaults.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// def func(version=ssl.PROTOCOL_TLSv1_2): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct SslWithBadDefaults {
     protocol: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_no_version.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_no_version.rs
index 20cea65ce7..a5cfccaf6c 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_no_version.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_no_version.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// ssl.wrap_socket(ssl_version=ssl.PROTOCOL_TLSv1_2)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct SslWithNoVersion;
 
 impl Violation for SslWithNoVersion {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs
index 4e2a1dc35c..0cc1ebe4ed 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs
@@ -51,6 +51,7 @@ use crate::preview::is_suspicious_function_reference_enabled;
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousPickleUsage;
 
 impl Violation for SuspiciousPickleUsage {
@@ -100,6 +101,7 @@ impl Violation for SuspiciousPickleUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousMarshalUsage;
 
 impl Violation for SuspiciousMarshalUsage {
@@ -150,6 +152,7 @@ impl Violation for SuspiciousMarshalUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousInsecureHashUsage;
 
 impl Violation for SuspiciousInsecureHashUsage {
@@ -192,6 +195,7 @@ impl Violation for SuspiciousInsecureHashUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousInsecureCipherUsage;
 
 impl Violation for SuspiciousInsecureCipherUsage {
@@ -236,6 +240,7 @@ impl Violation for SuspiciousInsecureCipherUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousInsecureCipherModeUsage;
 
 impl Violation for SuspiciousInsecureCipherModeUsage {
@@ -285,6 +290,7 @@ impl Violation for SuspiciousInsecureCipherModeUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousMktempUsage;
 
 impl Violation for SuspiciousMktempUsage {
@@ -325,6 +331,7 @@ impl Violation for SuspiciousMktempUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousEvalUsage;
 
 impl Violation for SuspiciousEvalUsage {
@@ -378,6 +385,7 @@ impl Violation for SuspiciousEvalUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousMarkSafeUsage;
 
 impl Violation for SuspiciousMarkSafeUsage {
@@ -430,6 +438,7 @@ impl Violation for SuspiciousMarkSafeUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousURLOpenUsage;
 
 impl Violation for SuspiciousURLOpenUsage {
@@ -472,6 +481,7 @@ impl Violation for SuspiciousURLOpenUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousNonCryptographicRandomUsage;
 
 impl Violation for SuspiciousNonCryptographicRandomUsage {
@@ -516,6 +526,7 @@ impl Violation for SuspiciousNonCryptographicRandomUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLCElementTreeUsage;
 
 impl Violation for SuspiciousXMLCElementTreeUsage {
@@ -560,6 +571,7 @@ impl Violation for SuspiciousXMLCElementTreeUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLElementTreeUsage;
 
 impl Violation for SuspiciousXMLElementTreeUsage {
@@ -604,6 +616,7 @@ impl Violation for SuspiciousXMLElementTreeUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLExpatReaderUsage;
 
 impl Violation for SuspiciousXMLExpatReaderUsage {
@@ -648,6 +661,7 @@ impl Violation for SuspiciousXMLExpatReaderUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLExpatBuilderUsage;
 
 impl Violation for SuspiciousXMLExpatBuilderUsage {
@@ -692,6 +706,7 @@ impl Violation for SuspiciousXMLExpatBuilderUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLSaxUsage;
 
 impl Violation for SuspiciousXMLSaxUsage {
@@ -736,6 +751,7 @@ impl Violation for SuspiciousXMLSaxUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLMiniDOMUsage;
 
 impl Violation for SuspiciousXMLMiniDOMUsage {
@@ -780,6 +796,7 @@ impl Violation for SuspiciousXMLMiniDOMUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousXMLPullDOMUsage;
 
 impl Violation for SuspiciousXMLPullDOMUsage {
@@ -821,6 +838,7 @@ impl Violation for SuspiciousXMLPullDOMUsage {
 /// [preview]: https://docs.astral.sh/ruff/preview/
 /// [deprecated]: https://pypi.org/project/defusedxml/0.8.0rc2/#defusedxml-lxml
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.12.0")]
 pub(crate) struct SuspiciousXMLETreeUsage;
 
 impl Violation for SuspiciousXMLETreeUsage {
@@ -867,6 +885,7 @@ impl Violation for SuspiciousXMLETreeUsage {
 /// [PEP 476]: https://peps.python.org/pep-0476/
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousUnverifiedContextUsage;
 
 impl Violation for SuspiciousUnverifiedContextUsage {
@@ -892,6 +911,7 @@ impl Violation for SuspiciousUnverifiedContextUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousTelnetUsage;
 
 impl Violation for SuspiciousTelnetUsage {
@@ -917,6 +937,7 @@ impl Violation for SuspiciousTelnetUsage {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct SuspiciousFTPLibUsage;
 
 impl Violation for SuspiciousFTPLibUsage {
@@ -1091,9 +1112,12 @@ fn suspicious_function(
         ] => checker.report_diagnostic_if_enabled(SuspiciousInsecureCipherModeUsage, range),
 
         // Mktemp
-        ["tempfile", "mktemp"] => {
-            checker.report_diagnostic_if_enabled(SuspiciousMktempUsage, range)
-        }
+        ["tempfile", "mktemp"] => checker
+            .report_diagnostic_if_enabled(SuspiciousMktempUsage, range)
+            .map(|mut diagnostic| {
+                diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
+                diagnostic
+            }),
 
         // Eval
         ["" | "builtins", "eval"] => {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_imports.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_imports.rs
index f83087c43e..acc978d054 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_imports.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_imports.rs
@@ -25,6 +25,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `telnetlib` - Telnet client](https://docs.python.org/3.12/library/telnetlib.html#module-telnetlib)
 /// - [PEP 594: `telnetlib`](https://peps.python.org/pep-0594/#telnetlib)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousTelnetlibImport;
 
 impl Violation for SuspiciousTelnetlibImport {
@@ -49,6 +50,7 @@ impl Violation for SuspiciousTelnetlibImport {
 /// ## References
 /// - [Python documentation: `ftplib` - FTP protocol client](https://docs.python.org/3/library/ftplib.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousFtplibImport;
 
 impl Violation for SuspiciousFtplibImport {
@@ -74,6 +76,7 @@ impl Violation for SuspiciousFtplibImport {
 /// ## References
 /// - [Python documentation: `pickle` — Python object serialization](https://docs.python.org/3/library/pickle.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousPickleImport;
 
 impl Violation for SuspiciousPickleImport {
@@ -95,6 +98,7 @@ impl Violation for SuspiciousPickleImport {
 /// import subprocess
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousSubprocessImport;
 
 impl Violation for SuspiciousSubprocessImport {
@@ -118,6 +122,7 @@ impl Violation for SuspiciousSubprocessImport {
 /// import xml.etree.cElementTree
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousXmlEtreeImport;
 
 impl Violation for SuspiciousXmlEtreeImport {
@@ -141,6 +146,7 @@ impl Violation for SuspiciousXmlEtreeImport {
 /// import xml.sax
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousXmlSaxImport;
 
 impl Violation for SuspiciousXmlSaxImport {
@@ -164,6 +170,7 @@ impl Violation for SuspiciousXmlSaxImport {
 /// import xml.dom.expatbuilder
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousXmlExpatImport;
 
 impl Violation for SuspiciousXmlExpatImport {
@@ -187,6 +194,7 @@ impl Violation for SuspiciousXmlExpatImport {
 /// import xml.dom.minidom
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousXmlMinidomImport;
 
 impl Violation for SuspiciousXmlMinidomImport {
@@ -210,6 +218,7 @@ impl Violation for SuspiciousXmlMinidomImport {
 /// import xml.dom.pulldom
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousXmlPulldomImport;
 
 impl Violation for SuspiciousXmlPulldomImport {
@@ -240,6 +249,7 @@ impl Violation for SuspiciousXmlPulldomImport {
 ///
 /// [deprecated]: https://github.com/tiran/defusedxml/blob/c7445887f5e1bcea470a16f61369d29870cfcfe1/README.md#defusedxmllxml
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "v0.3.0")]
 pub(crate) struct SuspiciousLxmlImport;
 
 impl Violation for SuspiciousLxmlImport {
@@ -263,6 +273,7 @@ impl Violation for SuspiciousLxmlImport {
 /// import xmlrpc
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousXmlrpcImport;
 
 impl Violation for SuspiciousXmlrpcImport {
@@ -289,6 +300,7 @@ impl Violation for SuspiciousXmlrpcImport {
 /// ## References
 /// - [httpoxy website](https://httpoxy.org/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousHttpoxyImport;
 
 impl Violation for SuspiciousHttpoxyImport {
@@ -314,6 +326,7 @@ impl Violation for SuspiciousHttpoxyImport {
 /// ## References
 /// - [Buffer Overflow Issue](https://github.com/pycrypto/pycrypto/issues/176)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousPycryptoImport;
 
 impl Violation for SuspiciousPycryptoImport {
@@ -339,6 +352,7 @@ impl Violation for SuspiciousPycryptoImport {
 /// ## References
 /// - [Buffer Overflow Issue](https://github.com/pycrypto/pycrypto/issues/176)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct SuspiciousPyghmiImport;
 
 impl Violation for SuspiciousPyghmiImport {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/tarfile_unsafe_members.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/tarfile_unsafe_members.rs
index 8e816ee21d..92d58e8448 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/tarfile_unsafe_members.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/tarfile_unsafe_members.rs
@@ -38,6 +38,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 706]: https://peps.python.org/pep-0706/#backporting-forward-compatibility
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct TarfileUnsafeMembers;
 
 impl Violation for TarfileUnsafeMembers {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_continue.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_continue.rs
index 5bd4632853..85e7e4cdb6 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_continue.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_continue.rs
@@ -45,6 +45,7 @@ use crate::rules::flake8_bandit::helpers::is_untyped_exception;
 /// - [Common Weakness Enumeration: CWE-703](https://cwe.mitre.org/data/definitions/703.html)
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct TryExceptContinue;
 
 impl Violation for TryExceptContinue {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_pass.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_pass.rs
index 56dcaff1e0..383f51f957 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_pass.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/try_except_pass.rs
@@ -41,6 +41,7 @@ use crate::rules::flake8_bandit::helpers::is_untyped_exception;
 /// - [Common Weakness Enumeration: CWE-703](https://cwe.mitre.org/data/definitions/703.html)
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.237")]
 pub(crate) struct TryExceptPass;
 
 impl Violation for TryExceptPass {
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_markup_use.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_markup_use.rs
index 25cd68d58b..7dd043ea11 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_markup_use.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_markup_use.rs
@@ -75,6 +75,7 @@ use crate::{checkers::ast::Checker, settings::LinterSettings};
 /// [markupsafe-markup]: https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup
 /// [flake8-markupsafe]: https://github.com/vmagamedov/flake8-markupsafe
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct UnsafeMarkupUse {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs
index dae9564053..593f5e01da 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// - [PyYAML documentation: Loading YAML](https://pyyaml.org/wiki/PyYAMLDocumentation)
 /// - [Common Weakness Enumeration: CWE-20](https://cwe.mitre.org/data/definitions/20.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.212")]
 pub(crate) struct UnsafeYAMLLoad {
     pub loader: Option<String>,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/weak_cryptographic_key.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/weak_cryptographic_key.rs
index 63b709fc32..956d90f2ae 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/weak_cryptographic_key.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/weak_cryptographic_key.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [CSRC: Transitioning the Use of Cryptographic Algorithms and Key Lengths](https://csrc.nist.gov/pubs/sp/800/131/a/r2/final)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct WeakCryptographicKey {
     cryptographic_key: CryptographicKey,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S602_S602.py.snap b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S602_S602.py.snap
index 75f4454ebf..4115627c2d 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S602_S602.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S602_S602.py.snap
@@ -124,4 +124,47 @@ S602 `subprocess` call with `shell=True` identified, security issue
 19 | Popen([var_string], shell=True)
 20 | Popen([var_string, ""], shell=True)
    | ^^^^^
+21 |
+22 | # Check dict display with only double-starred expressions can be falsey.
+   |
+
+S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
+  --> S602.py:38:1
+   |
+37 | # Additional truthiness cases for generator, lambda, and f-strings
+38 | Popen("true", shell=(i for i in ()))
+   | ^^^^^
+39 | Popen("true", shell=lambda: 0)
+40 | Popen("true", shell=f"{b''}")
+   |
+
+S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
+  --> S602.py:39:1
+   |
+37 | # Additional truthiness cases for generator, lambda, and f-strings
+38 | Popen("true", shell=(i for i in ()))
+39 | Popen("true", shell=lambda: 0)
+   | ^^^^^
+40 | Popen("true", shell=f"{b''}")
+41 | x = 1
+   |
+
+S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
+  --> S602.py:40:1
+   |
+38 | Popen("true", shell=(i for i in ()))
+39 | Popen("true", shell=lambda: 0)
+40 | Popen("true", shell=f"{b''}")
+   | ^^^^^
+41 | x = 1
+42 | Popen("true", shell=f"{x=}")
+   |
+
+S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
+  --> S602.py:42:1
+   |
+40 | Popen("true", shell=f"{b''}")
+41 | x = 1
+42 | Popen("true", shell=f"{x=}")
+   | ^^^^^
    |
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S604_S604.py.snap b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S604_S604.py.snap
index 85cd9d2583..798e916ba6 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S604_S604.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S604_S604.py.snap
@@ -6,4 +6,88 @@ S604 Function call with `shell=True` parameter identified, security issue
   |
 5 | foo(shell=True)
   | ^^^
+6 |
+7 | foo(shell={**{}})
   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:11:1
+   |
+10 | # Truthy non-bool values for `shell`
+11 | foo(shell=(i for i in ()))
+   | ^^^
+12 | foo(shell=lambda: 0)
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:12:1
+   |
+10 | # Truthy non-bool values for `shell`
+11 | foo(shell=(i for i in ()))
+12 | foo(shell=lambda: 0)
+   | ^^^
+13 |
+14 | # f-strings guaranteed non-empty
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:15:1
+   |
+14 | # f-strings guaranteed non-empty
+15 | foo(shell=f"{b''}")
+   | ^^^
+16 | x = 1
+17 | foo(shell=f"{x=}")
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:17:1
+   |
+15 | foo(shell=f"{b''}")
+16 | x = 1
+17 | foo(shell=f"{x=}")
+   | ^^^
+18 |
+19 | # Additional truthiness cases for generator, lambda, and f-strings
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:20:1
+   |
+19 | # Additional truthiness cases for generator, lambda, and f-strings
+20 | foo(shell=(i for i in ()))
+   | ^^^
+21 | foo(shell=lambda: 0)
+22 | foo(shell=f"{b''}")
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:21:1
+   |
+19 | # Additional truthiness cases for generator, lambda, and f-strings
+20 | foo(shell=(i for i in ()))
+21 | foo(shell=lambda: 0)
+   | ^^^
+22 | foo(shell=f"{b''}")
+23 | x = 1
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:22:1
+   |
+20 | foo(shell=(i for i in ()))
+21 | foo(shell=lambda: 0)
+22 | foo(shell=f"{b''}")
+   | ^^^
+23 | x = 1
+24 | foo(shell=f"{x=}")
+   |
+
+S604 Function call with truthy `shell` parameter identified, security issue
+  --> S604.py:24:1
+   |
+22 | foo(shell=f"{b''}")
+23 | x = 1
+24 | foo(shell=f"{x=}")
+   | ^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S609_S609.py.snap b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S609_S609.py.snap
index 1891b78f00..07c3f3b970 100644
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S609_S609.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S609_S609.py.snap
@@ -34,10 +34,53 @@ S609 Possible wildcard injection in call due to `*` usage
   |
 
 S609 Possible wildcard injection in call due to `*` usage
- --> S609.py:8:11
-  |
-6 | subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
-7 | subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
-8 | os.system("tar cf foo.tar bar/*")
-  |           ^^^^^^^^^^^^^^^^^^^^^^
-  |
+  --> S609.py:8:11
+   |
+ 6 | subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+ 7 | subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
+ 8 | os.system("tar cf foo.tar bar/*")
+   |           ^^^^^^^^^^^^^^^^^^^^^^
+ 9 |
+10 | subprocess.Popen(["chmod", "+w", "*.py"], shell={**{}})
+   |
+
+S609 Possible wildcard injection in call due to `*` usage
+  --> S609.py:14:18
+   |
+13 | # Additional truthiness cases for generator, lambda, and f-strings
+14 | subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
+   |                  ^^^^^^^^^^^^^^^
+15 | subprocess.Popen("chmod +w foo*", shell=lambda: 0)
+16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
+   |
+
+S609 Possible wildcard injection in call due to `*` usage
+  --> S609.py:15:18
+   |
+13 | # Additional truthiness cases for generator, lambda, and f-strings
+14 | subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
+15 | subprocess.Popen("chmod +w foo*", shell=lambda: 0)
+   |                  ^^^^^^^^^^^^^^^
+16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
+17 | x = 1
+   |
+
+S609 Possible wildcard injection in call due to `*` usage
+  --> S609.py:16:18
+   |
+14 | subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
+15 | subprocess.Popen("chmod +w foo*", shell=lambda: 0)
+16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
+   |                  ^^^^^^^^^^^^^^^
+17 | x = 1
+18 | subprocess.Popen("chmod +w foo*", shell=f"{x=}")
+   |
+
+S609 Possible wildcard injection in call due to `*` usage
+  --> S609.py:18:18
+   |
+16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
+17 | x = 1
+18 | subprocess.Popen("chmod +w foo*", shell=f"{x=}")
+   |                  ^^^^^^^^^^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_blind_except/rules/blind_except.rs b/crates/ruff_linter/src/rules/flake8_blind_except/rules/blind_except.rs
index ac512dee04..704b628abf 100644
--- a/crates/ruff_linter/src/rules/flake8_blind_except/rules/blind_except.rs
+++ b/crates/ruff_linter/src/rules/flake8_blind_except/rules/blind_except.rs
@@ -63,6 +63,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: Exception hierarchy](https://docs.python.org/3/library/exceptions.html#exception-hierarchy)
 /// - [PEP 8: Programming Recommendations on bare `except`](https://peps.python.org/pep-0008/#programming-recommendations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct BlindExcept {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_default_value_positional_argument.rs b/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_default_value_positional_argument.rs
index 84f47e1e96..361f1df069 100644
--- a/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_default_value_positional_argument.rs
+++ b/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_default_value_positional_argument.rs
@@ -90,6 +90,7 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// - [Python documentation: Calls](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/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct BooleanDefaultValuePositionalArgument;
 
 impl Violation for BooleanDefaultValuePositionalArgument {
diff --git a/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_positional_value_in_call.rs b/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_positional_value_in_call.rs
index b3a97c1d9a..4a62e65923 100644
--- a/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_positional_value_in_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_positional_value_in_call.rs
@@ -42,6 +42,7 @@ use crate::rules::flake8_boolean_trap::helpers::allow_boolean_trap;
 /// - [Python documentation: Calls](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/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct BooleanPositionalValueInCall;
 
 impl Violation for BooleanPositionalValueInCall {
diff --git a/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs b/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs
index 24dff35099..4bc72d0f26 100644
--- a/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs
+++ b/crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs
@@ -94,6 +94,7 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// - [Python documentation: Calls](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/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct BooleanTypeHintPositionalArgument;
 
 impl Violation for BooleanTypeHintPositionalArgument {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/helpers.rs b/crates/ruff_linter/src/rules/flake8_bugbear/helpers.rs
index 51015eb63a..090658de7d 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/helpers.rs
@@ -4,6 +4,7 @@ use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::Locator;
+use ruff_python_ast::{self as ast, Arguments, Expr};
 
 /// Return `true` if the statement containing the current expression is the last
 /// top-level expression in the cell. This assumes that the source is a Jupyter
@@ -27,3 +28,54 @@ pub(super) fn at_last_top_level_expression_in_cell(
             .all(|token| token.kind() == SimpleTokenKind::Semi || token.kind().is_trivia())
         })
 }
+
+/// Return `true` if the [`Expr`] appears to be an infinite iterator (e.g., a call to
+/// `itertools.cycle` or similar).
+pub(crate) fn is_infinite_iterable(arg: &Expr, semantic: &SemanticModel) -> bool {
+    let Expr::Call(ast::ExprCall {
+        func,
+        arguments: Arguments { args, keywords, .. },
+        ..
+    }) = &arg
+    else {
+        return false;
+    };
+
+    semantic
+        .resolve_qualified_name(func)
+        .is_some_and(|qualified_name| match qualified_name.segments() {
+            ["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 && args[1].is_none_literal_expr() {
+                    return true;
+                }
+
+                // Ex) `itertools.repeat(1, times=None)`
+                for keyword in keywords {
+                    if keyword.arg.as_ref().is_some_and(|name| name == "times")
+                        && keyword.value.is_none_literal_expr()
+                    {
+                        return true;
+                    }
+                }
+
+                false
+            }
+            _ => false,
+        })
+}
+
+/// Return `true` if any expression in the iterator appears to be an infinite iterator.
+pub(crate) fn any_infinite_iterables<'a>(
+    iter: impl IntoIterator<Item = &'a Expr>,
+    semantic: &SemanticModel,
+) -> bool {
+    iter.into_iter()
+        .any(|arg| is_infinite_iterable(arg, semantic))
+}
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/mod.rs b/crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
index 53f3ce51e3..163d175872 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
@@ -17,7 +17,6 @@ mod tests {
     use crate::test::test_path;
 
     use crate::settings::types::PreviewMode;
-
     use ruff_python_ast::PythonVersion;
 
     #[test_case(Rule::AbstractBaseClassWithoutAbstractMethod, Path::new("B024.py"))]
@@ -48,6 +47,7 @@ mod tests {
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_6.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_7.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_8.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_9.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.pyi"))]
     #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"))]
@@ -83,11 +83,46 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::MapWithoutExplicitStrict, Path::new("B912.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_2.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_3.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_4.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_5.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_6.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_7.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_8.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_9.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.pyi"))]
+    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "preview__{}_{}",
+            rule_code.noqa_code(),
+            path.to_string_lossy()
+        );
+        let diagnostics = test_path(
+            Path::new("flake8_bugbear").join(path).as_path(),
+            &LinterSettings {
+                preview: PreviewMode::Enabled,
+                unresolved_target_version: PythonVersion::PY314.into(),
+                ..LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
+
     #[test_case(
         Rule::ClassAsDataStructure,
         Path::new("class_as_data_structure.py"),
         PythonVersion::PY39
     )]
+    #[test_case(
+        Rule::MapWithoutExplicitStrict,
+        Path::new("B912.py"),
+        PythonVersion::PY313
+    )]
     fn rules_with_target_version(
         rule_code: Rule,
         path: &Path,
@@ -177,23 +212,4 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
-
-    #[test_case(Rule::AssertRaisesException, Path::new("B017_0.py"))]
-    #[test_case(Rule::AssertRaisesException, Path::new("B017_1.py"))]
-    fn rules_preview(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("flake8_bugbear").join(path).as_path(),
-            &LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_diagnostics!(snapshot, diagnostics);
-        Ok(())
-    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/abstract_base_class.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/abstract_base_class.rs
index 2d14a917e7..2b57ee35e1 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/abstract_base_class.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/abstract_base_class.rs
@@ -54,6 +54,7 @@ use crate::registry::Rule;
 /// - [Python documentation: `abc`](https://docs.python.org/3/library/abc.html)
 /// - [Python documentation: `typing.ClassVar`](https://docs.python.org/3/library/typing.html#typing.ClassVar)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.118")]
 pub(crate) struct AbstractBaseClassWithoutAbstractMethod {
     name: String,
 }
@@ -99,6 +100,7 @@ impl Violation for AbstractBaseClassWithoutAbstractMethod {
 /// ## References
 /// - [Python documentation: `abc`](https://docs.python.org/3/library/abc.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.118")]
 pub(crate) struct EmptyMethodWithoutAbstractDecorator {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs
index 8708e4c487..d114cc2432 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs
@@ -35,6 +35,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `assert`](https://docs.python.org/3/reference/simple_stmts.html#the-assert-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.67")]
 pub(crate) struct AssertFalse;
 
 impl AlwaysFixableViolation for AssertFalse {
@@ -52,13 +53,13 @@ impl AlwaysFixableViolation for AssertFalse {
 fn assertion_error(msg: Option<&Expr>) -> Stmt {
     Stmt::Raise(ast::StmtRaise {
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         exc: Some(Box::new(Expr::Call(ast::ExprCall {
             func: Box::new(Expr::Name(ast::ExprName {
                 id: "AssertionError".into(),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             })),
             arguments: Arguments {
                 args: if let Some(msg) = msg {
@@ -68,10 +69,10 @@ fn assertion_error(msg: Option<&Expr>) -> Stmt {
                 },
                 keywords: Box::from([]),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             },
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         }))),
         cause: None,
     })
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
index 9702cad266..5eab2482ec 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
@@ -29,6 +29,7 @@ use crate::checkers::ast::Checker;
 /// self.assertRaises(SomeSpecificException, foo)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.83")]
 pub(crate) struct AssertRaisesException {
     exception: ExceptionKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
index b96a5d91fa..f0ca244999 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `os.environ`](https://docs.python.org/3/library/os.html#os.environ)
 /// - [Python documentation: `subprocess.Popen`](https://docs.python.org/3/library/subprocess.html#subprocess.Popen)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.102")]
 pub(crate) struct AssignmentToOsEnviron;
 
 impl Violation for AssignmentToOsEnviron {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/batched_without_explicit_strict.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/batched_without_explicit_strict.rs
index e7c467ca84..4091b13c80 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/batched_without_explicit_strict.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/batched_without_explicit_strict.rs
@@ -3,7 +3,7 @@ use ruff_python_ast::ExprCall;
 use ruff_python_ast::PythonVersion;
 
 use crate::checkers::ast::Checker;
-use crate::rules::flake8_bugbear::rules::is_infinite_iterable;
+use crate::rules::flake8_bugbear::helpers::is_infinite_iterable;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -49,6 +49,7 @@ use crate::{FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `batched`](https://docs.python.org/3/library/itertools.html#batched)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct BatchedWithoutExplicitStrict;
 
 impl Violation for BatchedWithoutExplicitStrict {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/cached_instance_method.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/cached_instance_method.rs
index 9849cdf816..c059d9b5b9 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/cached_instance_method.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/cached_instance_method.rs
@@ -63,6 +63,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `functools.cache`](https://docs.python.org/3/library/functools.html#functools.cache)
 /// - [don't lru_cache methods!](https://www.youtube.com/watch?v=sVjtp6tGo0g)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.114")]
 pub(crate) struct CachedInstanceMethod;
 
 impl Violation for CachedInstanceMethod {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/class_as_data_structure.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/class_as_data_structure.rs
index 1ed8395147..5a0e2025b4 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/class_as_data_structure.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/class_as_data_structure.rs
@@ -34,6 +34,7 @@ use ruff_python_ast::PythonVersion;
 ///     y: float
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.0")]
 pub(crate) struct ClassAsDataStructure;
 
 impl Violation for ClassAsDataStructure {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
index f753152e4d..04a0c3c552 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
@@ -40,6 +40,7 @@ use crate::{Edit, Fix};
 /// ## References
 /// - [Python documentation: `except` clause](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.67")]
 pub(crate) struct DuplicateTryBlockException {
     name: String,
     is_star: bool,
@@ -87,6 +88,7 @@ impl Violation for DuplicateTryBlockException {
 /// - [Python documentation: `except` clause](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 /// - [Python documentation: Exception hierarchy](https://docs.python.org/3/library/exceptions.html#exception-hierarchy)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.67")]
 pub(crate) struct DuplicateHandlerException {
     pub names: Vec<String>,
 }
@@ -113,7 +115,7 @@ fn type_pattern(elts: Vec<&Expr>) -> Expr {
         elts: elts.into_iter().cloned().collect(),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         parenthesized: true,
     }
     .into()
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_value.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_value.rs
index 643b2c0c5e..2d6c79e804 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_value.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_value.rs
@@ -29,6 +29,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// {1, 2, 3}
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct DuplicateValue {
     value: String,
     existing: String,
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs
index d3f5aba2bb..0609669a68 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `except` clause](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.250")]
 pub(crate) struct ExceptWithEmptyTuple {
     is_star: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs
index 66df64700d..3da20df439 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `except` clause](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 /// - [Python documentation: Built-in Exceptions](https://docs.python.org/3/library/exceptions.html#built-in-exceptions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.255")]
 pub(crate) struct ExceptWithNonExceptionClasses {
     is_star: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/f_string_docstring.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/f_string_docstring.rs
index 8b4d9527f9..bfccc9f0d6 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/f_string_docstring.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/f_string_docstring.rs
@@ -31,6 +31,7 @@ use crate::checkers::ast::Checker;
 /// - [PEP 257 – Docstring Conventions](https://peps.python.org/pep-0257/)
 /// - [Python documentation: Formatted string literals](https://docs.python.org/3/reference/lexical_analysis.html#f-strings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct FStringDocstring;
 
 impl Violation for FStringDocstring {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs
index 54faca1174..47b57d56fd 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs
@@ -62,6 +62,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.flake8-bugbear.extend-immutable-calls`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.102")]
 pub(crate) struct FunctionCallInDefaultArgument {
     name: Option<String>,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
index a4cbba7cc7..f19a43e633 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
@@ -42,6 +42,7 @@ use crate::checkers::ast::Checker;
 /// - [The Hitchhiker's Guide to Python: Late Binding Closures](https://docs.python-guide.org/writing/gotchas/#late-binding-closures)
 /// - [Python documentation: `functools.partial`](https://docs.python.org/3/library/functools.html#functools.partial)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.139")]
 pub(crate) struct FunctionUsesLoopVariable {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/getattr_with_constant.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
index ef108b77f5..7905de14ca 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `getattr`](https://docs.python.org/3/library/functions.html#getattr)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.110")]
 pub(crate) struct GetAttrWithConstant;
 
 impl AlwaysFixableViolation for GetAttrWithConstant {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs
index 87fc151c90..944efa0432 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `try` statement](https://docs.python.org/3/reference/compound_stmts.html#the-try-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.116")]
 pub(crate) struct JumpStatementInFinally {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs
index 6a617a147d..14456024bb 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs
@@ -36,6 +36,7 @@ use crate::fix::snippet::SourceCodeSnippet;
 /// ## References
 /// - [Python documentation: Mutable Sequence Types](https://docs.python.org/3/library/stdtypes.html#typesseq-mutable)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.7")]
 pub(crate) struct LoopIteratorMutation {
     name: Option<SourceCodeSnippet>,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
index f0a12e755a..1ac5e45f1c 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
@@ -37,6 +37,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `for` statement](https://docs.python.org/3/reference/compound_stmts.html#the-for-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.121")]
 pub(crate) struct LoopVariableOverridesIterator {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/map_without_explicit_strict.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/map_without_explicit_strict.rs
new file mode 100644
index 0000000000..cd268f610b
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/map_without_explicit_strict.rs
@@ -0,0 +1,86 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+
+use ruff_python_ast::{self as ast};
+use ruff_text_size::Ranged;
+
+use crate::checkers::ast::Checker;
+use crate::fix::edits::add_argument;
+use crate::rules::flake8_bugbear::helpers::any_infinite_iterables;
+use crate::{AlwaysFixableViolation, Applicability, Fix};
+
+/// ## What it does
+/// Checks for `map` calls without an explicit `strict` parameter when called with two or more iterables, or any starred argument.
+///
+/// This rule applies to Python 3.14 and later, where `map` accepts a `strict` keyword
+/// argument. For details, see: [What’s New in Python 3.14](https://docs.python.org/dev/whatsnew/3.14.html).
+///
+/// ## Why is this bad?
+/// By default, if the iterables passed to `map` are of different lengths, the
+/// resulting iterator will be silently truncated to the length of the shortest
+/// iterable. This can lead to subtle bugs.
+///
+/// Pass `strict=True` to raise a `ValueError` if the iterables are of
+/// non-uniform length. Alternatively, if the iterables are deliberately of
+/// different lengths, pass `strict=False` to make the intention explicit.
+///
+/// ## Example
+/// ```python
+/// map(f, a, b)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// map(f, a, b, strict=True)
+/// ```
+///
+/// ## Fix safety
+/// This rule's fix is marked as unsafe. While adding `strict=False` preserves
+/// the runtime behavior, it can obscure situations where the iterables are of
+/// unequal length. Ruff prefers to alert users so they can choose the intended
+/// behavior themselves.
+///
+/// ## References
+/// - [Python documentation: `map`](https://docs.python.org/3/library/functions.html#map)
+/// - [What’s New in Python 3.14](https://docs.python.org/dev/whatsnew/3.14.html)
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.13.2")]
+pub(crate) struct MapWithoutExplicitStrict;
+
+impl AlwaysFixableViolation for MapWithoutExplicitStrict {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        "`map()` without an explicit `strict=` parameter".to_string()
+    }
+
+    fn fix_title(&self) -> String {
+        "Add explicit value for parameter `strict=`".to_string()
+    }
+}
+
+/// B912
+pub(crate) fn map_without_explicit_strict(checker: &Checker, call: &ast::ExprCall) {
+    let semantic = checker.semantic();
+
+    if semantic.match_builtin_expr(&call.func, "map")
+        && call.arguments.find_keyword("strict").is_none()
+        && (
+            // at least 2 iterables (+ 1 function)
+            call.arguments.args.len() >= 3
+            // or a starred argument
+            || call.arguments.args.iter().any(ast::Expr::is_starred_expr)
+        )
+        && !any_infinite_iterables(call.arguments.args.iter().skip(1), semantic)
+    {
+        checker
+            .report_diagnostic(MapWithoutExplicitStrict, call.range())
+            .set_fix(Fix::applicable_edit(
+                add_argument(
+                    "strict=False",
+                    &call.arguments,
+                    checker.comment_ranges(),
+                    checker.locator().contents(),
+                ),
+                Applicability::Unsafe,
+            ));
+    }
+}
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mod.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mod.rs
index dcf29d0fc1..e0beabd7cb 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mod.rs
@@ -16,6 +16,7 @@ pub(crate) use getattr_with_constant::*;
 pub(crate) use jump_statement_in_finally::*;
 pub(crate) use loop_iterator_mutation::*;
 pub(crate) use loop_variable_overrides_iterator::*;
+pub(crate) use map_without_explicit_strict::*;
 pub(crate) use mutable_argument_default::*;
 pub(crate) use mutable_contextvar_default::*;
 pub(crate) use no_explicit_stacklevel::*;
@@ -56,6 +57,7 @@ mod getattr_with_constant;
 mod jump_statement_in_finally;
 mod loop_iterator_mutation;
 mod loop_variable_overrides_iterator;
+mod map_without_explicit_strict;
 mod mutable_argument_default;
 mod mutable_contextvar_default;
 mod no_explicit_stacklevel;
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
index 960ddbfdfb..94098831b8 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
@@ -3,9 +3,8 @@ use std::fmt::Write;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::is_docstring_stmt;
 use ruff_python_ast::name::QualifiedName;
-use ruff_python_ast::{self as ast, Expr, Parameter};
-use ruff_python_codegen::{Generator, Stylist};
-use ruff_python_index::Indexer;
+use ruff_python_ast::parenthesize::parenthesized_range;
+use ruff_python_ast::{self as ast, Expr, ParameterWithDefault};
 use ruff_python_semantic::SemanticModel;
 use ruff_python_semantic::analyze::function_type::is_stub;
 use ruff_python_semantic::analyze::typing::{is_immutable_annotation, is_mutable_expr};
@@ -13,8 +12,11 @@ use ruff_python_trivia::{indentation_at_offset, textwrap};
 use ruff_source_file::LineRanges;
 use ruff_text_size::Ranged;
 
-use crate::Locator;
 use crate::checkers::ast::Checker;
+use crate::preview::{
+    is_b006_check_guaranteed_mutable_expr_enabled,
+    is_b006_unsafe_fix_preserve_assignment_expr_enabled,
+};
 use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
@@ -77,6 +79,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Default Argument Values](https://docs.python.org/3/tutorial/controlflow.html#default-argument-values)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.92")]
 pub(crate) struct MutableArgumentDefault;
 
 impl Violation for MutableArgumentDefault {
@@ -111,8 +114,12 @@ pub(crate) fn mutable_argument_default(checker: &Checker, function_def: &ast::St
             .iter()
             .map(|target| QualifiedName::from_dotted_name(target))
             .collect();
-
-        if is_mutable_expr(default, checker.semantic())
+        let is_mut_expr = if is_b006_check_guaranteed_mutable_expr_enabled(checker.settings()) {
+            is_guaranteed_mutable_expr(default, checker.semantic())
+        } else {
+            is_mutable_expr(default, checker.semantic())
+        };
+        if is_mut_expr
             && !parameter.annotation().is_some_and(|expr| {
                 is_immutable_annotation(expr, checker.semantic(), extend_immutable_calls.as_slice())
             })
@@ -120,35 +127,37 @@ pub(crate) fn mutable_argument_default(checker: &Checker, function_def: &ast::St
             let mut diagnostic = checker.report_diagnostic(MutableArgumentDefault, default.range());
 
             // If the function body is on the same line as the function def, do not fix
-            if let Some(fix) = move_initialization(
-                function_def,
-                &parameter.parameter,
-                default,
-                checker.semantic(),
-                checker.locator(),
-                checker.stylist(),
-                checker.indexer(),
-                checker.generator(),
-            ) {
+            if let Some(fix) = move_initialization(function_def, parameter, default, checker) {
                 diagnostic.set_fix(fix);
             }
         }
     }
 }
 
+/// Returns `true` if the expression is guaranteed to create a mutable object.
+fn is_guaranteed_mutable_expr(expr: &Expr, semantic: &SemanticModel) -> bool {
+    match expr {
+        Expr::Generator(_) => true,
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => {
+            elts.iter().any(|e| is_guaranteed_mutable_expr(e, semantic))
+        }
+        Expr::Named(ast::ExprNamed { value, .. }) => is_guaranteed_mutable_expr(value, semantic),
+        _ => is_mutable_expr(expr, semantic),
+    }
+}
+
 /// Generate a [`Fix`] to move a mutable argument default initialization
 /// into the function body.
-#[expect(clippy::too_many_arguments)]
 fn move_initialization(
     function_def: &ast::StmtFunctionDef,
-    parameter: &Parameter,
+    parameter: &ParameterWithDefault,
     default: &Expr,
-    semantic: &SemanticModel,
-    locator: &Locator,
-    stylist: &Stylist,
-    indexer: &Indexer,
-    generator: Generator,
+    checker: &Checker,
 ) -> Option<Fix> {
+    let indexer = checker.indexer();
+    let locator = checker.locator();
+    let stylist = checker.stylist();
+
     let mut body = function_def.body.iter().peekable();
 
     // Avoid attempting to fix single-line functions.
@@ -157,25 +166,52 @@ fn move_initialization(
         return None;
     }
 
+    let range = match parenthesized_range(
+        default.into(),
+        parameter.into(),
+        checker.comment_ranges(),
+        checker.source(),
+    ) {
+        Some(range) => range,
+        None => default.range(),
+    };
     // Set the default argument value to `None`.
-    let default_edit = Edit::range_replacement("None".to_string(), default.range());
+    let default_edit = Edit::range_replacement("None".to_string(), range);
 
     // If the function is a stub, this is the only necessary edit.
-    if is_stub(function_def, semantic) {
+    if is_stub(function_def, checker.semantic()) {
         return Some(Fix::unsafe_edit(default_edit));
     }
 
     // Add an `if`, to set the argument to its original value if still `None`.
     let mut content = String::new();
-    let _ = write!(&mut content, "if {} is None:", parameter.name());
+    let _ = write!(&mut content, "if {} is None:", parameter.parameter.name());
     content.push_str(stylist.line_ending().as_str());
     content.push_str(stylist.indentation());
-    let _ = write!(
-        &mut content,
-        "{} = {}",
-        parameter.name(),
-        generator.expr(default)
-    );
+    if is_b006_unsafe_fix_preserve_assignment_expr_enabled(checker.settings()) {
+        let _ = write!(
+            &mut content,
+            "{} = {}",
+            parameter.parameter.name(),
+            locator.slice(
+                parenthesized_range(
+                    default.into(),
+                    parameter.into(),
+                    checker.comment_ranges(),
+                    checker.source()
+                )
+                .unwrap_or(default.range())
+            )
+        );
+    } else {
+        let _ = write!(
+            &mut content,
+            "{} = {}",
+            parameter.name(),
+            checker.generator().expr(default)
+        );
+    }
+
     content.push_str(stylist.line_ending().as_str());
 
     // Determine the indentation depth of the function body.
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_contextvar_default.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_contextvar_default.rs
index a6d3879d42..a81e1b2c3f 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_contextvar_default.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_contextvar_default.rs
@@ -54,6 +54,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `contextvars` — Context Variables](https://docs.python.org/3/library/contextvars.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct MutableContextvarDefault;
 
 impl Violation for MutableContextvarDefault {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs
index ed2b3e98cd..f737e781ef 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs
@@ -41,6 +41,7 @@ use crate::{checkers::ast::Checker, fix::edits::add_argument};
 /// ## References
 /// - [Python documentation: `warnings.warn`](https://docs.python.org/3/library/warnings.html#warnings.warn)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct NoExplicitStacklevel;
 
 impl AlwaysFixableViolation for NoExplicitStacklevel {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_literal.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_literal.rs
index bfe131f98e..1fd6b3123a 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_literal.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_literal.rs
@@ -27,6 +27,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `raise` statement](https://docs.python.org/3/reference/simple_stmts.html#the-raise-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.102")]
 pub(crate) struct RaiseLiteral;
 
 impl Violation for RaiseLiteral {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
index a9b6c674f7..41bc2ebdf8 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
@@ -47,6 +47,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `raise` statement](https://docs.python.org/3/reference/simple_stmts.html#the-raise-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.138")]
 pub(crate) struct RaiseWithoutFromInsideExcept {
     is_star: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/re_sub_positional_args.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/re_sub_positional_args.rs
index 4f38947c77..0b7845fa39 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/re_sub_positional_args.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/re_sub_positional_args.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `re.subn`](https://docs.python.org/3/library/re.html#re.subn)
 /// - [Python documentation: `re.split`](https://docs.python.org/3/library/re.html#re.split)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.278")]
 pub(crate) struct ReSubPositionalArgs {
     method: Method,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
index 3d5e383430..2ace373d4e 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
@@ -36,6 +36,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `except` clause](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.89")]
 pub(crate) struct RedundantTupleInExceptionHandler {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/return_in_generator.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/return_in_generator.rs
index 8b8f529df4..f7584dd4bb 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/return_in_generator.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/return_in_generator.rs
@@ -79,6 +79,7 @@ use crate::checkers::ast::Checker;
 ///             yield from dir_path.glob(f"*.{file_type}")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.4.8")]
 pub(crate) struct ReturnInGenerator;
 
 impl Violation for ReturnInGenerator {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
index 7643b2846e..6e88ccca40 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 ///         do_something_with_the_group(values)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.260")]
 pub(crate) struct ReuseOfGroupbyGenerator;
 
 impl Violation for ReuseOfGroupbyGenerator {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
index 6244634ffa..d3ba5b953e 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `setattr`](https://docs.python.org/3/library/functions.html#setattr)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.111")]
 pub(crate) struct SetAttrWithConstant;
 
 impl AlwaysFixableViolation for SetAttrWithConstant {
@@ -53,11 +54,11 @@ fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> Str
             attr: Identifier::new(name.to_string(), TextRange::default()),
             ctx: ExprContext::Store,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })],
         value: Box::new(value.clone()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     });
     generator.stmt(&stmt)
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs
index 570ac00660..cf79b66502 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs
@@ -46,6 +46,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: Calls](https://docs.python.org/3/reference/expressions.html#calls)
 /// - [Disallow iterable argument unpacking after a keyword argument?](https://github.com/python/cpython/issues/82741)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.109")]
 pub(crate) struct StarArgUnpackingAfterKeywordArg;
 
 impl Violation for StarArgUnpackingAfterKeywordArg {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/static_key_dict_comprehension.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/static_key_dict_comprehension.rs
index ace25f1f55..7847820525 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/static_key_dict_comprehension.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/static_key_dict_comprehension.rs
@@ -31,6 +31,7 @@ use crate::fix::snippet::SourceCodeSnippet;
 /// {value: value.upper() for value in data}
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct StaticKeyDictComprehension {
     key: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
index 4c6ef9ef5e..e50661e8b9 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
@@ -45,6 +45,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `str.strip`](https://docs.python.org/3/library/stdtypes.html#str.strip)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.106")]
 pub(crate) struct StripWithMultiCharacters;
 
 impl Violation for StripWithMultiCharacters {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unary_prefix_increment_decrement.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unary_prefix_increment_decrement.rs
index f9c868226b..3bfcb06125 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unary_prefix_increment_decrement.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unary_prefix_increment_decrement.rs
@@ -31,6 +31,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: Unary arithmetic and bitwise operations](https://docs.python.org/3/reference/expressions.html#unary-arithmetic-and-bitwise-operations)
 /// - [Python documentation: Augmented assignment statements](https://docs.python.org/3/reference/simple_stmts.html#augmented-assignment-statements)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.83")]
 pub(crate) struct UnaryPrefixIncrementDecrement {
     operator: UnaryPrefixOperatorType,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
index 5588b4c343..d58d345a12 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
@@ -23,6 +23,7 @@ use crate::checkers::ast::Checker;
 /// a["b"] = 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.250")]
 pub(crate) struct UnintentionalTypeAnnotation;
 
 impl Violation for UnintentionalTypeAnnotation {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
index fbeea00d97..b3bcbf5ba9 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
@@ -28,10 +28,29 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ```
 ///
 /// ## Fix safety
-/// This rule's fix is marked as unsafe if there's comments in the `hasattr` call
-/// expression, as comments may be removed.
+/// This rule's fix is marked as unsafe because the replacement may not be semantically
+/// equivalent to the original expression, potentially changing the behavior of the code.
 ///
-/// For example, the fix would be marked as unsafe in the following case:
+/// For example, an imported module may have a `__call__` attribute but is not considered
+/// a callable object:
+/// ```python
+/// import operator
+///
+/// assert hasattr(operator, "__call__")
+/// assert callable(operator) is False
+/// ```
+/// Additionally, `__call__` may be defined only as an instance method:
+/// ```python
+/// class A:
+///     def __init__(self):
+///         self.__call__ = None
+///
+///
+/// assert hasattr(A(), "__call__")
+/// assert callable(A()) is False
+/// ```
+///
+/// Additionally, if there are comments in the `hasattr` call expression, they may be removed:
 /// ```python
 /// hasattr(
 ///     # comment 1
@@ -48,6 +67,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `__getattr__`](https://docs.python.org/3/reference/datamodel.html#object.__getattr__)
 /// - [Python documentation: `__call__`](https://docs.python.org/3/reference/datamodel.html#object.__call__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.106")]
 pub(crate) struct UnreliableCallableCheck;
 
 impl Violation for UnreliableCallableCheck {
@@ -71,7 +91,11 @@ pub(crate) fn unreliable_callable_check(
     expr: &Expr,
     func: &Expr,
     args: &[Expr],
+    keywords: &[ast::Keyword],
 ) {
+    if !keywords.is_empty() {
+        return;
+    }
     let [obj, attr, ..] = args else {
         return;
     };
@@ -84,7 +108,21 @@ pub(crate) fn unreliable_callable_check(
     let Some(builtins_function) = checker.semantic().resolve_builtin_symbol(func) else {
         return;
     };
-    if !matches!(builtins_function, "hasattr" | "getattr") {
+
+    // Validate function arguments based on function name
+    let valid_args = match builtins_function {
+        "hasattr" => {
+            // hasattr should have exactly 2 positional arguments and no keywords
+            args.len() == 2
+        }
+        "getattr" => {
+            // getattr should have 2 or 3 positional arguments and no keywords
+            args.len() == 2 || args.len() == 3
+        }
+        _ => return,
+    };
+
+    if !valid_args {
         return;
     }
 
@@ -103,11 +141,7 @@ pub(crate) fn unreliable_callable_check(
             Ok(Fix::applicable_edits(
                 binding_edit,
                 import_edit,
-                if checker.comment_ranges().intersects(expr.range()) {
-                    Applicability::Unsafe
-                } else {
-                    Applicability::Safe
-                },
+                Applicability::Unsafe,
             ))
         });
     }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
index 4b0a48ac16..e530b5d794 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
@@ -35,6 +35,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [PEP 8: Naming Conventions](https://peps.python.org/pep-0008/#naming-conventions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.84")]
 pub(crate) struct UnusedLoopControlVariable {
     /// The name of the loop control variable.
     name: String,
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_comparison.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_comparison.rs
index 25d373357c..00f4beb283 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_comparison.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_comparison.rs
@@ -34,6 +34,7 @@ use crate::rules::flake8_bugbear::helpers::at_last_top_level_expression_in_cell;
 /// ## References
 /// - [Python documentation: `assert` statement](https://docs.python.org/3/reference/simple_stmts.html#the-assert-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.102")]
 pub(crate) struct UselessComparison {
     at: ComparisonLocationAt,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs
index 4ec3e85d1f..8e07bbd96c 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs
@@ -37,6 +37,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `contextlib.suppress`](https://docs.python.org/3/library/contextlib.html#contextlib.suppress)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.118")]
 pub(crate) struct UselessContextlibSuppress;
 
 impl Violation for UselessContextlibSuppress {
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_expression.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_expression.rs
index 2c9f74dc75..1bcd6f638b 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_expression.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/useless_expression.rs
@@ -51,6 +51,7 @@ use crate::rules::flake8_bugbear::helpers::at_last_top_level_expression_in_cell;
 ///     _ = obj.attribute
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.100")]
 pub(crate) struct UselessExpression {
     kind: Kind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
index 73134c65b6..136715b981 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
@@ -1,15 +1,15 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 
-use ruff_python_ast::{self as ast, Arguments, Expr};
-use ruff_python_semantic::SemanticModel;
+use ruff_python_ast::{self as ast};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::fix::edits::add_argument;
+use crate::rules::flake8_bugbear::helpers::any_infinite_iterables;
 use crate::{AlwaysFixableViolation, Applicability, Fix};
 
 /// ## What it does
-/// Checks for `zip` calls without an explicit `strict` parameter.
+/// Checks for `zip` calls without an explicit `strict` parameter when called with two or more iterables, or any starred argument.
 ///
 /// ## Why is this bad?
 /// By default, if the iterables passed to `zip` are of different lengths, the
@@ -31,13 +31,15 @@ use crate::{AlwaysFixableViolation, Applicability, Fix};
 /// ```
 ///
 /// ## Fix safety
-/// This rule's fix is marked as unsafe for `zip` calls that contain
-/// `**kwargs`, as adding a `strict` keyword argument to such a call may lead
-/// to a duplicate keyword argument error.
+/// This rule's fix is marked as unsafe. While adding `strict=False` preserves
+/// the runtime behavior, it can obscure situations where the iterables are of
+/// unequal length. Ruff prefers to alert users so they can choose the intended
+/// behavior themselves.
 ///
 /// ## References
 /// - [Python documentation: `zip`](https://docs.python.org/3/library/functions.html#zip)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.167")]
 pub(crate) struct ZipWithoutExplicitStrict;
 
 impl AlwaysFixableViolation for ZipWithoutExplicitStrict {
@@ -57,11 +59,13 @@ pub(crate) fn zip_without_explicit_strict(checker: &Checker, call: &ast::ExprCal
 
     if semantic.match_builtin_expr(&call.func, "zip")
         && call.arguments.find_keyword("strict").is_none()
-        && !call
-            .arguments
-            .args
-            .iter()
-            .any(|arg| is_infinite_iterable(arg, semantic))
+        && (
+            // at least 2 iterables
+            call.arguments.args.len() >= 2
+            // or a starred argument
+            || call.arguments.args.iter().any(ast::Expr::is_starred_expr)
+        )
+        && !any_infinite_iterables(call.arguments.args.iter(), semantic)
     {
         checker
             .report_diagnostic(ZipWithoutExplicitStrict, call.range())
@@ -72,61 +76,7 @@ pub(crate) fn zip_without_explicit_strict(checker: &Checker, call: &ast::ExprCal
                     checker.comment_ranges(),
                     checker.locator().contents(),
                 ),
-                // If the function call contains `**kwargs`, mark the fix as unsafe.
-                if call
-                    .arguments
-                    .keywords
-                    .iter()
-                    .any(|keyword| keyword.arg.is_none())
-                {
-                    Applicability::Unsafe
-                } else {
-                    Applicability::Safe
-                },
+                Applicability::Unsafe,
             ));
     }
 }
-
-/// Return `true` if the [`Expr`] appears to be an infinite iterator (e.g., a call to
-/// `itertools.cycle` or similar).
-pub(crate) fn is_infinite_iterable(arg: &Expr, semantic: &SemanticModel) -> bool {
-    let Expr::Call(ast::ExprCall {
-        func,
-        arguments: Arguments { args, keywords, .. },
-        ..
-    }) = &arg
-    else {
-        return false;
-    };
-
-    semantic
-        .resolve_qualified_name(func)
-        .is_some_and(|qualified_name| {
-            match qualified_name.segments() {
-                ["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 && args[1].is_none_literal_expr() {
-                        return true;
-                    }
-
-                    // Ex) `iterools.repeat(1, times=None)`
-                    for keyword in keywords {
-                        if keyword.arg.as_ref().is_some_and(|name| name == "times") {
-                            if keyword.value.is_none_literal_expr() {
-                                return true;
-                            }
-                        }
-                    }
-
-                    false
-                }
-                _ => false,
-            }
-        })
-}
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap
index 38f99c7fd6..c640290817 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap
@@ -12,15 +12,14 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable.
 5 |     if getattr(o, "__call__", False):
   |
 help: Replace with `callable()`
-
-ℹ Safe fix
-1 1 | def this_is_a_bug():
-2 2 |     o = object()
-3   |-    if hasattr(o, "__call__"):
-  3 |+    if callable(o):
-4 4 |         print("Ooh, callable! Or is it?")
-5 5 |     if getattr(o, "__call__", False):
-6 6 |         print("Ooh, callable! Or is it?")
+1 | def this_is_a_bug():
+2 |     o = object()
+  -     if hasattr(o, "__call__"):
+3 +     if callable(o):
+4 |         print("Ooh, callable! Or is it?")
+5 |     if getattr(o, "__call__", False):
+6 |         print("Ooh, callable! Or is it?")
+note: This is an unsafe fix and may change runtime behavior
 
 B004 Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results.
  --> B004.py:5:8
@@ -44,16 +43,15 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable.
 14 |     if builtins.getattr(o, "__call__", False):
    |
 help: Replace with `callable()`
-
-ℹ Safe fix
-9  9  | def still_a_bug():
-10 10 |     import builtins
-11 11 |     o = object()
-12    |-    if builtins.hasattr(o, "__call__"):
-   12 |+    if callable(o):
-13 13 |         print("B U G")
-14 14 |     if builtins.getattr(o, "__call__", False):
-15 15 |         print("B   U   G")
+9  | def still_a_bug():
+10 |     import builtins
+11 |     o = object()
+   -     if builtins.hasattr(o, "__call__"):
+12 +     if callable(o):
+13 |         print("B U G")
+14 |     if builtins.getattr(o, "__call__", False):
+15 |         print("B   U   G")
+note: This is an unsafe fix and may change runtime behavior
 
 B004 Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results.
   --> B004.py:14:8
@@ -76,21 +74,20 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable.
 25 |         print("STILL a bug!")
    |
 help: Replace with `callable()`
-
-ℹ Safe fix
-   1  |+import builtins
-1  2  | def this_is_a_bug():
-2  3  |     o = object()
-3  4  |     if hasattr(o, "__call__"):
+1  + import builtins
+2  | def this_is_a_bug():
+3  |     o = object()
+4  |     if hasattr(o, "__call__"):
 --------------------------------------------------------------------------------
-21 22 |     def callable(x):
-22 23 |         return True
-23 24 | 
-24    |-    if hasattr(o, "__call__"):
-   25 |+    if builtins.callable(o):
-25 26 |         print("STILL a bug!")
-26 27 | 
-27 28 | 
+22 |     def callable(x):
+23 |         return True
+24 | 
+   -     if hasattr(o, "__call__"):
+25 +     if builtins.callable(o):
+26 |         print("STILL a bug!")
+27 | 
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results.
   --> B004.py:35:1
@@ -105,18 +102,60 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable.
 40 | |     # comment 5
 41 | | )
    | |_^
+42 |
+43 |   import operator
    |
 help: Replace with `callable()`
+32 | 
+33 | # https://github.com/astral-sh/ruff/issues/18741
+34 | # The autofix for this is unsafe due to the comments.
+   - hasattr(
+   -     # comment 1
+   -     obj,  # comment 2
+   -     # comment 3
+   -     "__call__",  # comment 4
+   -     # comment 5
+   - )
+35 + callable(obj)
+36 | 
+37 | import operator
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-32 32 | 
-33 33 | # https://github.com/astral-sh/ruff/issues/18741
-34 34 | # The autofix for this is unsafe due to the comments.
-35    |-hasattr(
-36    |-    # comment 1
-37    |-    obj,  # comment 2
-38    |-    # comment 3
-39    |-    "__call__",  # comment 4
-40    |-    # comment 5
-41    |-)
-   35 |+callable(obj)
+B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results.
+  --> B004.py:45:8
+   |
+43 | import operator
+44 |
+45 | assert hasattr(operator, "__call__")
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+46 | assert callable(operator) is False
+   |
+help: Replace with `callable()`
+42 | 
+43 | import operator
+44 | 
+   - assert hasattr(operator, "__call__")
+45 + assert callable(operator)
+46 | assert callable(operator) is False
+47 | 
+48 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results.
+  --> B004.py:53:8
+   |
+53 | assert hasattr(A(), "__call__")
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^
+54 | assert callable(A()) is False
+   |
+help: Replace with `callable()`
+50 |     def __init__(self): self.__call__ = None
+51 | 
+52 | 
+   - assert hasattr(A(), "__call__")
+53 + assert callable(A())
+54 | assert callable(A()) is False
+55 | 
+56 | # https://github.com/astral-sh/ruff/issues/20440
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap
index 8f30bc0137..af07dc5476 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap
@@ -12,11 +12,10 @@ B006 [*] Do not use mutable data structures for argument defaults
 5 |     """
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-1 1 | # Docstring followed by a newline
-2 2 | 
-3   |-def foobar(foor, bar={}):    
-  3 |+def foobar(foor, bar=None):    
-4 4 |     """
-5 5 |     """
+1 | # Docstring followed by a newline
+2 | 
+  - def foobar(foor, bar={}):    
+3 + def foobar(foor, bar=None):    
+4 |     """
+5 |     """
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap
index 0ec81d0153..9c1184adae 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap
@@ -12,12 +12,11 @@ B006 [*] Do not use mutable data structures for argument defaults
 6 |     """                    
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-1 1 | # Docstring followed by whitespace with no newline
-2 2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
-3 3 | 
-4   |-def foobar(foor, bar={}):    
-  4 |+def foobar(foor, bar=None):    
-5 5 |     """
-6 6 |     """
+1 | # Docstring followed by whitespace with no newline
+2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
+3 | 
+  - def foobar(foor, bar={}):    
+4 + def foobar(foor, bar=None):    
+5 |     """
+6 |     """                    
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap
index 5887696daa..acf948afd7 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap
@@ -10,12 +10,11 @@ B006 [*] Do not use mutable data structures for argument defaults
 6 |     """
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-1 1 | # Docstring with no newline
-2 2 | 
-3 3 | 
-4   |-def foobar(foor, bar={}):    
-  4 |+def foobar(foor, bar=None):    
-5 5 |     """
-6 6 |     """
+1 | # Docstring with no newline
+2 | 
+3 | 
+  - def foobar(foor, bar={}):    
+4 + def foobar(foor, bar=None):    
+5 |     """
+6 |     """
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap
index 8ba3e00cc1..98d4e56b34 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap
@@ -10,14 +10,13 @@ B006 [*] Do not use mutable data structures for argument defaults
 8 |         print(a)
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-4  4  | 
-5  5  | 
-6  6  | class FormFeedIndent:
-7     |-   def __init__(self, a=[]):
-   7  |+   def __init__(self, a=None):
-   8  |+        if a is None:
-   9  |+         a = []
-8  10 |         print(a)
-9  11 |
+4  | 
+5  | 
+6  | class FormFeedIndent:
+   -    def __init__(self, a=[]):
+7  +    def __init__(self, a=None):
+8  +         if a is None:
+9  +          a = []
+10 |         print(a)
+11 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap
index 1be1295fe3..b1e6c26783 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap
@@ -9,19 +9,18 @@ B006 [*] Do not use mutable data structures for argument defaults
 6 |     import os
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-2 2 | # https://github.com/astral-sh/ruff/issues/7616
-3 3 | 
-4 4 | 
-5   |-def import_module_wrong(value: dict[str, str] = {}):
-  5 |+def import_module_wrong(value: dict[str, str] = None):
-6 6 |     import os
-  7 |+    if value is None:
-  8 |+        value = {}
-7 9 | 
-8 10 | 
-9 11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
+2  | # https://github.com/astral-sh/ruff/issues/7616
+3  | 
+4  | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+5  + def import_module_wrong(value: dict[str, str] = None):
+6  |     import os
+7  +     if value is None:
+8  +         value = {}
+9  | 
+10 | 
+11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:9:61
@@ -31,20 +30,19 @@ B006 [*] Do not use mutable data structures for argument defaults
 10 |     import os
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-6  6  |     import os
-7  7  | 
-8  8  | 
-9     |-def import_module_with_values_wrong(value: dict[str, str] = {}):
-   9  |+def import_module_with_values_wrong(value: dict[str, str] = None):
-10 10 |     import os
-11 11 | 
-   12 |+    if value is None:
-   13 |+        value = {}
-12 14 |     return 2
-13 15 | 
-14 16 | 
+6  |     import os
+7  | 
+8  | 
+   - def import_module_with_values_wrong(value: dict[str, str] = {}):
+9  + def import_module_with_values_wrong(value: dict[str, str] = None):
+10 |     import os
+11 | 
+12 +     if value is None:
+13 +         value = {}
+14 |     return 2
+15 | 
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:15:50
@@ -55,21 +53,20 @@ B006 [*] Do not use mutable data structures for argument defaults
 17 |     import sys
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-12 12 |     return 2
-13 13 | 
-14 14 | 
-15    |-def import_modules_wrong(value: dict[str, str] = {}):
-   15 |+def import_modules_wrong(value: dict[str, str] = None):
-16 16 |     import os
-17 17 |     import sys
-18 18 |     import itertools
-   19 |+    if value is None:
-   20 |+        value = {}
-19 21 | 
-20 22 | 
-21 23 | def from_import_module_wrong(value: dict[str, str] = {}):
+12 |     return 2
+13 | 
+14 | 
+   - def import_modules_wrong(value: dict[str, str] = {}):
+15 + def import_modules_wrong(value: dict[str, str] = None):
+16 |     import os
+17 |     import sys
+18 |     import itertools
+19 +     if value is None:
+20 +         value = {}
+21 | 
+22 | 
+23 | def from_import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:21:54
@@ -79,19 +76,18 @@ B006 [*] Do not use mutable data structures for argument defaults
 22 |     from os import path
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-18 18 |     import itertools
-19 19 | 
-20 20 | 
-21    |-def from_import_module_wrong(value: dict[str, str] = {}):
-   21 |+def from_import_module_wrong(value: dict[str, str] = None):
-22 22 |     from os import path
-   23 |+    if value is None:
-   24 |+        value = {}
-23 25 | 
-24 26 | 
-25 27 | def from_imports_module_wrong(value: dict[str, str] = {}):
+18 |     import itertools
+19 | 
+20 | 
+   - def from_import_module_wrong(value: dict[str, str] = {}):
+21 + def from_import_module_wrong(value: dict[str, str] = None):
+22 |     from os import path
+23 +     if value is None:
+24 +         value = {}
+25 | 
+26 | 
+27 | def from_imports_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:25:55
@@ -102,20 +98,19 @@ B006 [*] Do not use mutable data structures for argument defaults
 27 |     from sys import version_info
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-22 22 |     from os import path
-23 23 | 
-24 24 | 
-25    |-def from_imports_module_wrong(value: dict[str, str] = {}):
-   25 |+def from_imports_module_wrong(value: dict[str, str] = None):
-26 26 |     from os import path
-27 27 |     from sys import version_info
-   28 |+    if value is None:
-   29 |+        value = {}
-28 30 | 
-29 31 | 
-30 32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
+22 |     from os import path
+23 | 
+24 | 
+   - def from_imports_module_wrong(value: dict[str, str] = {}):
+25 + def from_imports_module_wrong(value: dict[str, str] = None):
+26 |     from os import path
+27 |     from sys import version_info
+28 +     if value is None:
+29 +         value = {}
+30 | 
+31 | 
+32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:30:66
@@ -126,20 +121,19 @@ B006 [*] Do not use mutable data structures for argument defaults
 32 |     from sys import version_info
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-27 27 |     from sys import version_info
-28 28 | 
-29 29 | 
-30    |-def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
-   30 |+def import_and_from_imports_module_wrong(value: dict[str, str] = None):
-31 31 |     import os
-32 32 |     from sys import version_info
-   33 |+    if value is None:
-   34 |+        value = {}
-33 35 | 
-34 36 | 
-35 37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
+27 |     from sys import version_info
+28 | 
+29 | 
+   - def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
+30 + def import_and_from_imports_module_wrong(value: dict[str, str] = None):
+31 |     import os
+32 |     from sys import version_info
+33 +     if value is None:
+34 +         value = {}
+35 | 
+36 | 
+37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:35:59
@@ -150,20 +144,19 @@ B006 [*] Do not use mutable data structures for argument defaults
 37 |     import os
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-32 32 |     from sys import version_info
-33 33 | 
-34 34 | 
-35    |-def import_docstring_module_wrong(value: dict[str, str] = {}):
-   35 |+def import_docstring_module_wrong(value: dict[str, str] = None):
-36 36 |     """Docstring"""
-37 37 |     import os
-   38 |+    if value is None:
-   39 |+        value = {}
-38 40 | 
-39 41 | 
-40 42 | def import_module_wrong(value: dict[str, str] = {}):
+32 |     from sys import version_info
+33 | 
+34 | 
+   - def import_docstring_module_wrong(value: dict[str, str] = {}):
+35 + def import_docstring_module_wrong(value: dict[str, str] = None):
+36 |     """Docstring"""
+37 |     import os
+38 +     if value is None:
+39 +         value = {}
+40 | 
+41 | 
+42 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:40:49
@@ -174,20 +167,19 @@ B006 [*] Do not use mutable data structures for argument defaults
 42 |     import os; import sys
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-37 37 |     import os
-38 38 | 
-39 39 | 
-40    |-def import_module_wrong(value: dict[str, str] = {}):
-   40 |+def import_module_wrong(value: dict[str, str] = None):
-41 41 |     """Docstring"""
-42 42 |     import os; import sys
-   43 |+    if value is None:
-   44 |+        value = {}
-43 45 | 
-44 46 | 
-45 47 | def import_module_wrong(value: dict[str, str] = {}):
+37 |     import os
+38 | 
+39 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+40 + def import_module_wrong(value: dict[str, str] = None):
+41 |     """Docstring"""
+42 |     import os; import sys
+43 +     if value is None:
+44 +         value = {}
+45 | 
+46 | 
+47 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:45:49
@@ -198,19 +190,18 @@ B006 [*] Do not use mutable data structures for argument defaults
 47 |     import os; import sys; x = 1
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-42 42 |     import os; import sys
-43 43 | 
-44 44 | 
-45    |-def import_module_wrong(value: dict[str, str] = {}):
-   45 |+def import_module_wrong(value: dict[str, str] = None):
-46 46 |     """Docstring"""
-   47 |+    if value is None:
-   48 |+        value = {}
-47 49 |     import os; import sys; x = 1
-48 50 | 
-49 51 | 
+42 |     import os; import sys
+43 | 
+44 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+45 + def import_module_wrong(value: dict[str, str] = None):
+46 |     """Docstring"""
+47 +     if value is None:
+48 +         value = {}
+49 |     import os; import sys; x = 1
+50 | 
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:50:49
@@ -221,20 +212,19 @@ B006 [*] Do not use mutable data structures for argument defaults
 52 |     import os; import sys
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-47 47 |     import os; import sys; x = 1
-48 48 | 
-49 49 | 
-50    |-def import_module_wrong(value: dict[str, str] = {}):
-   50 |+def import_module_wrong(value: dict[str, str] = None):
-51 51 |     """Docstring"""
-52 52 |     import os; import sys
-   53 |+    if value is None:
-   54 |+        value = {}
-53 55 | 
-54 56 | 
-55 57 | def import_module_wrong(value: dict[str, str] = {}):
+47 |     import os; import sys; x = 1
+48 | 
+49 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+50 + def import_module_wrong(value: dict[str, str] = None):
+51 |     """Docstring"""
+52 |     import os; import sys
+53 +     if value is None:
+54 +         value = {}
+55 | 
+56 | 
+57 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:55:49
@@ -244,19 +234,18 @@ B006 [*] Do not use mutable data structures for argument defaults
 56 |     import os; import sys
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-52 52 |     import os; import sys
-53 53 | 
-54 54 | 
-55    |-def import_module_wrong(value: dict[str, str] = {}):
-   55 |+def import_module_wrong(value: dict[str, str] = None):
-56 56 |     import os; import sys
-   57 |+    if value is None:
-   58 |+        value = {}
-57 59 | 
-58 60 | 
-59 61 | def import_module_wrong(value: dict[str, str] = {}):
+52 |     import os; import sys
+53 | 
+54 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+55 + def import_module_wrong(value: dict[str, str] = None):
+56 |     import os; import sys
+57 +     if value is None:
+58 +         value = {}
+59 | 
+60 | 
+61 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:59:49
@@ -266,18 +255,17 @@ B006 [*] Do not use mutable data structures for argument defaults
 60 |     import os; import sys; x = 1
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-56 56 |     import os; import sys
-57 57 | 
-58 58 | 
-59    |-def import_module_wrong(value: dict[str, str] = {}):
-   59 |+def import_module_wrong(value: dict[str, str] = None):
-   60 |+    if value is None:
-   61 |+        value = {}
-60 62 |     import os; import sys; x = 1
-61 63 | 
-62 64 | 
+56 |     import os; import sys
+57 | 
+58 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+59 + def import_module_wrong(value: dict[str, str] = None):
+60 +     if value is None:
+61 +         value = {}
+62 |     import os; import sys; x = 1
+63 | 
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_5.py:63:49
@@ -287,19 +275,18 @@ B006 [*] Do not use mutable data structures for argument defaults
 64 |     import os; import sys
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-60 60 |     import os; import sys; x = 1
-61 61 | 
-62 62 | 
-63    |-def import_module_wrong(value: dict[str, str] = {}):
-   63 |+def import_module_wrong(value: dict[str, str] = None):
-64 64 |     import os; import sys
-   65 |+    if value is None:
-   66 |+        value = {}
-65 67 | 
-66 68 | 
-67 69 | def import_module_wrong(value: dict[str, str] = {}): import os
+60 |     import os; import sys; x = 1
+61 | 
+62 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+63 + def import_module_wrong(value: dict[str, str] = None):
+64 |     import os; import sys
+65 +     if value is None:
+66 +         value = {}
+67 | 
+68 | 
+69 | def import_module_wrong(value: dict[str, str] = {}): import os
+note: This is an unsafe fix and may change runtime behavior
 
 B006 Do not use mutable data structures for argument defaults
   --> B006_5.py:67:49
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap
index 0a8c9fc903..40e631db6c 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap
@@ -11,14 +11,13 @@ B006 [*] Do not use mutable data structures for argument defaults
 5 |     import os                    
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-1 1 | # Import followed by whitespace with no newline
-2 2 | # Same as B006_2.py, but import instead of docstring
-3 3 | 
-4   |-def foobar(foor, bar={}):    
-5   |-    import os                    
-  4 |+def foobar(foor, bar=None):    
-  5 |+    import os                    
-  6 |+    if bar is None:
-  7 |+        bar = {}
+1 | # Import followed by whitespace with no newline
+2 | # Same as B006_2.py, but import instead of docstring
+3 | 
+  - def foobar(foor, bar={}):    
+  -     import os                    
+4 + def foobar(foor, bar=None):    
+5 +     import os                    
+6 +     if bar is None:
+7 +         bar = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap
index ab308b3660..b5dc7a5d76 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap
@@ -11,14 +11,13 @@ B006 [*] Do not use mutable data structures for argument defaults
 5 |     import os
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-1 1 | # Import with no newline
-2 2 | # Same as B006_3.py, but import instead of docstring
-3 3 | 
-4   |-def foobar(foor, bar={}):    
-5   |-    import os
-  4 |+def foobar(foor, bar=None):    
-  5 |+    import os
-  6 |+    if bar is None:
-  7 |+        bar = {}
+1 | # Import with no newline
+2 | # Same as B006_3.py, but import instead of docstring
+3 | 
+  - def foobar(foor, bar={}):    
+  -     import os
+4 + def foobar(foor, bar=None):    
+5 +     import os
+6 +     if bar is None:
+7 +         bar = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap
index 7528607254..f06b24cbab 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap
@@ -9,13 +9,12 @@ B006 [*] Do not use mutable data structures for argument defaults
 2 |     raise NotImplementedError("")
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-1   |-def foo(a: list = []):
-  1 |+def foo(a: list = None):
-2 2 |     raise NotImplementedError("")
-3 3 | 
-4 4 | 
+  - def foo(a: list = []):
+1 + def foo(a: list = None):
+2 |     raise NotImplementedError("")
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
  --> B006_8.py:5:19
@@ -26,16 +25,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 7 |     raise NotImplementedError("and has some text in here")
   |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-2 2 |     raise NotImplementedError("")
-3 3 | 
-4 4 | 
-5   |-def bar(a: dict = {}):
-  5 |+def bar(a: dict = None):
-6 6 |     """ This one also has a docstring"""
-7 7 |     raise NotImplementedError("and has some text in here")
-8 8 | 
+2 |     raise NotImplementedError("")
+3 | 
+4 | 
+  - def bar(a: dict = {}):
+5 + def bar(a: dict = None):
+6 |     """ This one also has a docstring"""
+7 |     raise NotImplementedError("and has some text in here")
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_8.py:10:19
@@ -46,19 +44,18 @@ B006 [*] Do not use mutable data structures for argument defaults
 12 |     raise IndexError()
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-7  7  |     raise NotImplementedError("and has some text in here")
-8  8  | 
-9  9  | 
-10    |-def baz(a: list = []):
-   10 |+def baz(a: list = None):
-11 11 |     """This one raises a different exception"""
-   12 |+    if a is None:
-   13 |+        a = []
-12 14 |     raise IndexError()
-13 15 | 
-14 16 | 
+7  |     raise NotImplementedError("and has some text in here")
+8  | 
+9  | 
+   - def baz(a: list = []):
+10 + def baz(a: list = None):
+11 |     """This one raises a different exception"""
+12 +     if a is None:
+13 +         a = []
+14 |     raise IndexError()
+15 | 
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_8.py:15:19
@@ -68,16 +65,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 16 |     raise NotImplementedError
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-12 12 |     raise IndexError()
-13 13 | 
-14 14 | 
-15    |-def qux(a: list = []):
-   15 |+def qux(a: list = None):
-16 16 |     raise NotImplementedError
-17 17 | 
-18 18 | 
+12 |     raise IndexError()
+13 | 
+14 | 
+   - def qux(a: list = []):
+15 + def qux(a: list = None):
+16 |     raise NotImplementedError
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_8.py:19:20
@@ -87,11 +83,10 @@ B006 [*] Do not use mutable data structures for argument defaults
 20 |     raise NotImplemented
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-16 16 |     raise NotImplementedError
-17 17 | 
-18 18 | 
-19    |-def quux(a: list = []):
-   19 |+def quux(a: list = None):
-20 20 |     raise NotImplemented
+16 |     raise NotImplementedError
+17 | 
+18 | 
+   - def quux(a: list = []):
+19 + def quux(a: list = None):
+20 |     raise NotImplemented
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_9.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_9.py.snap
new file mode 100644
index 0000000000..259771063d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_9.py.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_9.py:17:11
+   |
+17 | def f5(x=([1, ])):
+   |           ^^^^^
+18 |     print(x)
+   |
+help: Replace with `None`; initialize within function
+14 |     print(x)
+15 | 
+16 | 
+   - def f5(x=([1, ])):
+17 + def f5(x=None):
+18 +     if x is None:
+19 +         x = [1]
+20 |     print(x)
+21 | 
+22 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap
index f73a7920c6..e3f42e2da7 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap
@@ -9,16 +9,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 64 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-60 60 | # Flag mutable literals/comprehensions
-61 61 | 
-62 62 | 
-63    |-def this_is_wrong(value=[1, 2, 3]):
-   63 |+def this_is_wrong(value=None):
-64 64 |     ...
-65 65 | 
-66 66 | 
+60 | # Flag mutable literals/comprehensions
+61 | 
+62 | 
+   - def this_is_wrong(value=[1, 2, 3]):
+63 + def this_is_wrong(value=None):
+64 |     ...
+65 | 
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_B008.py:67:30
@@ -28,16 +27,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 68 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-64 64 |     ...
-65 65 | 
-66 66 | 
-67    |-def this_is_also_wrong(value={}):
-   67 |+def this_is_also_wrong(value=None):
-68 68 |     ...
-69 69 | 
-70 70 | 
+64 |     ...
+65 | 
+66 | 
+   - def this_is_also_wrong(value={}):
+67 + def this_is_also_wrong(value=None):
+68 |     ...
+69 | 
+70 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_B008.py:73:52
@@ -49,16 +47,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 74 |         pass
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-70 70 | 
-71 71 | class Foo:
-72 72 |     @staticmethod
-73    |-    def this_is_also_wrong_and_more_indented(value={}):
-   73 |+    def this_is_also_wrong_and_more_indented(value=None):
-74 74 |         pass
-75 75 | 
-76 76 | 
+70 | 
+71 | class Foo:
+72 |     @staticmethod
+   -     def this_is_also_wrong_and_more_indented(value={}):
+73 +     def this_is_also_wrong_and_more_indented(value=None):
+74 |         pass
+75 | 
+76 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_B008.py:77:31
@@ -71,18 +68,17 @@ B006 [*] Do not use mutable data structures for argument defaults
 80 |       ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-74 74 |         pass
-75 75 | 
-76 76 | 
-77    |-def multiline_arg_wrong(value={
-78    |-
-79    |-}):
-   77 |+def multiline_arg_wrong(value=None):
-80 78 |     ...
-81 79 | 
-82 80 | def single_line_func_wrong(value = {}): ...
+74 |         pass
+75 | 
+76 | 
+   - def multiline_arg_wrong(value={
+   - 
+   - }):
+77 + def multiline_arg_wrong(value=None):
+78 |     ...
+79 | 
+80 | def single_line_func_wrong(value = {}): ...
+note: This is an unsafe fix and may change runtime behavior
 
 B006 Do not use mutable data structures for argument defaults
   --> B006_B008.py:82:36
@@ -102,16 +98,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 86 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-82 82 | def single_line_func_wrong(value = {}): ...
-83 83 | 
-84 84 | 
-85    |-def and_this(value=set()):
-   85 |+def and_this(value=None):
-86 86 |     ...
-87 87 | 
-88 88 | 
+82 | def single_line_func_wrong(value = {}): ...
+83 | 
+84 | 
+   - def and_this(value=set()):
+85 + def and_this(value=None):
+86 |     ...
+87 | 
+88 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_B008.py:89:20
@@ -121,16 +116,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 90 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-86 86 |     ...
-87 87 | 
-88 88 | 
-89    |-def this_too(value=collections.OrderedDict()):
-   89 |+def this_too(value=None):
-90 90 |     ...
-91 91 | 
-92 92 | 
+86 |     ...
+87 | 
+88 | 
+   - def this_too(value=collections.OrderedDict()):
+89 + def this_too(value=None):
+90 |     ...
+91 | 
+92 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_B008.py:93:32
@@ -140,16 +134,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 94 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-90 90 |     ...
-91 91 | 
-92 92 | 
-93    |-async def async_this_too(value=collections.defaultdict()):
-   93 |+async def async_this_too(value=None):
-94 94 |     ...
-95 95 | 
-96 96 | 
+90 |     ...
+91 | 
+92 | 
+   - async def async_this_too(value=collections.defaultdict()):
+93 + async def async_this_too(value=None):
+94 |     ...
+95 | 
+96 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
   --> B006_B008.py:97:26
@@ -159,16 +152,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 98 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-94 94 |     ...
-95 95 | 
-96 96 | 
-97    |-def dont_forget_me(value=collections.deque()):
-   97 |+def dont_forget_me(value=None):
-98 98 |     ...
-99 99 | 
-100 100 | 
+94  |     ...
+95  | 
+96  | 
+    - def dont_forget_me(value=collections.deque()):
+97  + def dont_forget_me(value=None):
+98  |     ...
+99  | 
+100 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:102:46
@@ -179,16 +171,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 103 |     pass
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-99  99  | 
-100 100 | 
-101 101 | # N.B. we're also flagging the function call in the comprehension
-102     |-def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
-    102 |+def list_comprehension_also_not_okay(default=None):
-103 103 |     pass
-104 104 | 
-105 105 | 
+99  | 
+100 | 
+101 | # N.B. we're also flagging the function call in the comprehension
+    - def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
+102 + def list_comprehension_also_not_okay(default=None):
+103 |     pass
+104 | 
+105 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:106:46
@@ -198,16 +189,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 107 |     pass
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-103 103 |     pass
-104 104 | 
-105 105 | 
-106     |-def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
-    106 |+def dict_comprehension_also_not_okay(default=None):
-107 107 |     pass
-108 108 | 
-109 109 | 
+103 |     pass
+104 | 
+105 | 
+    - def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
+106 + def dict_comprehension_also_not_okay(default=None):
+107 |     pass
+108 | 
+109 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:110:45
@@ -217,16 +207,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 111 |     pass
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-107 107 |     pass
-108 108 | 
-109 109 | 
-110     |-def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
-    110 |+def set_comprehension_also_not_okay(default=None):
-111 111 |     pass
-112 112 | 
-113 113 | 
+107 |     pass
+108 | 
+109 | 
+    - def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
+110 + def set_comprehension_also_not_okay(default=None):
+111 |     pass
+112 | 
+113 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:114:33
@@ -236,16 +225,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 115 |     ...
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-111 111 |     pass
-112 112 | 
-113 113 | 
-114     |-def kwonlyargs_mutable(*, value=[]):
-    114 |+def kwonlyargs_mutable(*, value=None):
-115 115 |     ...
-116 116 | 
-117 117 | 
+111 |     pass
+112 | 
+113 | 
+    - def kwonlyargs_mutable(*, value=[]):
+114 + def kwonlyargs_mutable(*, value=None):
+115 |     ...
+116 | 
+117 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:239:20
@@ -257,16 +245,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 240 |     pass
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-236 236 | 
-237 237 | # B006 and B008
-238 238 | # We should handle arbitrary nesting of these B008.
-239     |-def nested_combo(a=[float(3), dt.datetime.now()]):
-    239 |+def nested_combo(a=None):
-240 240 |     pass
-241 241 | 
-242 242 | 
+236 | 
+237 | # B006 and B008
+238 | # We should handle arbitrary nesting of these B008.
+    - def nested_combo(a=[float(3), dt.datetime.now()]):
+239 + def nested_combo(a=None):
+240 |     pass
+241 | 
+242 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:276:27
@@ -278,16 +265,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-273 273 | 
-274 274 | 
-275 275 | def mutable_annotations(
-276     |-    a: list[int] | None = [],
-    276 |+    a: list[int] | None = None,
-277 277 |     b: Optional[Dict[int, int]] = {},
-278 278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-279 279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+273 | 
+274 | 
+275 | def mutable_annotations(
+    -     a: list[int] | None = [],
+276 +     a: list[int] | None = None,
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:277:35
@@ -300,16 +286,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-274 274 | 
-275 275 | def mutable_annotations(
-276 276 |     a: list[int] | None = [],
-277     |-    b: Optional[Dict[int, int]] = {},
-    277 |+    b: Optional[Dict[int, int]] = None,
-278 278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-279 279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-280 280 | ):
+274 | 
+275 | def mutable_annotations(
+276 |     a: list[int] | None = [],
+    -     b: Optional[Dict[int, int]] = {},
+277 +     b: Optional[Dict[int, int]] = None,
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+280 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:278:62
@@ -322,16 +307,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 280 | ):
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-275 275 | def mutable_annotations(
-276 276 |     a: list[int] | None = [],
-277 277 |     b: Optional[Dict[int, int]] = {},
-278     |-    c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-    278 |+    c: Annotated[Union[Set[str], abc.Sized], "annotation"] = None,
-279 279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-280 280 | ):
-281 281 |     pass
+275 | def mutable_annotations(
+276 |     a: list[int] | None = [],
+277 |     b: Optional[Dict[int, int]] = {},
+    -     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+278 +     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = None,
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+280 | ):
+281 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:279:80
@@ -344,16 +328,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 281 |     pass
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-276 276 |     a: list[int] | None = [],
-277 277 |     b: Optional[Dict[int, int]] = {},
-278 278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-279     |-    d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-    279 |+    d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = None,
-280 280 | ):
-281 281 |     pass
-282 282 | 
+276 |     a: list[int] | None = [],
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+    -     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 +     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = None,
+280 | ):
+281 |     pass
+282 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:284:52
@@ -363,16 +346,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 285 |     """Docstring"""
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-281 281 |     pass
-282 282 | 
-283 283 | 
-284     |-def single_line_func_wrong(value: dict[str, str] = {}):
-    284 |+def single_line_func_wrong(value: dict[str, str] = None):
-285 285 |     """Docstring"""
-286 286 | 
-287 287 | 
+281 |     pass
+282 | 
+283 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+284 + def single_line_func_wrong(value: dict[str, str] = None):
+285 |     """Docstring"""
+286 | 
+287 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:288:52
@@ -383,16 +365,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 290 |     ...
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-285 285 |     """Docstring"""
-286 286 | 
-287 287 | 
-288     |-def single_line_func_wrong(value: dict[str, str] = {}):
-    288 |+def single_line_func_wrong(value: dict[str, str] = None):
-289 289 |     """Docstring"""
-290 290 |     ...
-291 291 | 
+285 |     """Docstring"""
+286 | 
+287 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+288 + def single_line_func_wrong(value: dict[str, str] = None):
+289 |     """Docstring"""
+290 |     ...
+291 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:293:52
@@ -402,16 +383,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 294 |     """Docstring"""; ...
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-290 290 |     ...
-291 291 | 
-292 292 | 
-293     |-def single_line_func_wrong(value: dict[str, str] = {}):
-    293 |+def single_line_func_wrong(value: dict[str, str] = None):
-294 294 |     """Docstring"""; ...
-295 295 | 
-296 296 | 
+290 |     ...
+291 | 
+292 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+293 + def single_line_func_wrong(value: dict[str, str] = None):
+294 |     """Docstring"""; ...
+295 | 
+296 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:297:52
@@ -422,16 +402,15 @@ B006 [*] Do not use mutable data structures for argument defaults
 299 |         ...
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-294 294 |     """Docstring"""; ...
-295 295 | 
-296 296 | 
-297     |-def single_line_func_wrong(value: dict[str, str] = {}):
-    297 |+def single_line_func_wrong(value: dict[str, str] = None):
-298 298 |     """Docstring"""; \
-299 299 |         ...
-300 300 | 
+294 |     """Docstring"""; ...
+295 | 
+296 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+297 + def single_line_func_wrong(value: dict[str, str] = None):
+298 |     """Docstring"""; \
+299 |         ...
+300 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 [*] Do not use mutable data structures for argument defaults
    --> B006_B008.py:302:52
@@ -444,18 +423,17 @@ B006 [*] Do not use mutable data structures for argument defaults
 305 |       """Docstring"""
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-299 299 |         ...
-300 300 | 
-301 301 | 
-302     |-def single_line_func_wrong(value: dict[str, str] = {
-303     |-    # This is a comment
-304     |-}):
-    302 |+def single_line_func_wrong(value: dict[str, str] = None):
-305 303 |     """Docstring"""
-306 304 | 
-307 305 | 
+299 |         ...
+300 | 
+301 | 
+    - def single_line_func_wrong(value: dict[str, str] = {
+    -     # This is a comment
+    - }):
+302 + def single_line_func_wrong(value: dict[str, str] = None):
+303 |     """Docstring"""
+304 | 
+305 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B006 Do not use mutable data structures for argument defaults
    --> B006_B008.py:308:52
@@ -475,11 +453,10 @@ B006 [*] Do not use mutable data structures for argument defaults
 314 |     """Docstring without newline"""
     |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-310 310 |     """Docstring"""
-311 311 | 
-312 312 | 
-313     |-def single_line_func_wrong(value: dict[str, str] = {}):
-    313 |+def single_line_func_wrong(value: dict[str, str] = None):
-314 314 |     """Docstring without newline"""
+310 |     """Docstring"""
+311 | 
+312 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+313 + def single_line_func_wrong(value: dict[str, str] = None):
+314 |     """Docstring without newline"""
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap
index 3deddf5fb4..159d6978d3 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap
@@ -22,16 +22,15 @@ B007 [*] Loop control variable `k` not used within loop body
 19 |             print(i + j)
    |
 help: Rename unused `k` to `_k`
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | for i in range(10):
-17 17 |     for j in range(10):
-18    |-        for k in range(10):  # k not used, i and j used transitively
-   18 |+        for _k in range(10):  # k not used, i and j used transitively
-19 19 |             print(i + j)
-20 20 | 
-21 21 | 
+15 | 
+16 | for i in range(10):
+17 |     for j in range(10):
+   -         for k in range(10):  # k not used, i and j used transitively
+18 +         for _k in range(10):  # k not used, i and j used transitively
+19 |             print(i + j)
+20 | 
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B007 Loop control variable `i` not used within loop body
   --> B007.py:30:5
@@ -50,16 +49,15 @@ B007 [*] Loop control variable `k` not used within loop body
 31 |     print(j, l)
    |
 help: Rename unused `k` to `_k`
-
-ℹ Unsafe fix
-27 27 |                     yield i, (j, (k, l))
-28 28 | 
-29 29 | 
-30    |-for i, (j, (k, l)) in strange_generator():  # i, k not used
-   30 |+for i, (j, (_k, l)) in strange_generator():  # i, k not used
-31 31 |     print(j, l)
-32 32 | 
-33 33 | FMT = "{foo} {bar}"
+27 |                     yield i, (j, (k, l))
+28 | 
+29 | 
+   - for i, (j, (k, l)) in strange_generator():  # i, k not used
+30 + for i, (j, (_k, l)) in strange_generator():  # i, k not used
+31 |     print(j, l)
+32 | 
+33 | FMT = "{foo} {bar}"
+note: This is an unsafe fix and may change runtime behavior
 
 B007 Loop control variable `bar` may not be used within loop body
   --> B007.py:34:10
@@ -118,16 +116,15 @@ B007 [*] Loop control variable `bar` not used within loop body
 54 |             break
    |
 help: Rename unused `bar` to `_bar`
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | def f():
-51 51 |     # Fixable.
-52    |-    for foo, bar, baz in (["1", "2", "3"],):
-   52 |+    for foo, _bar, baz in (["1", "2", "3"],):
-53 53 |         if foo or baz:
-54 54 |             break
-55 55 | 
+49 | 
+50 | def f():
+51 |     # Fixable.
+   -     for foo, bar, baz in (["1", "2", "3"],):
+52 +     for foo, _bar, baz in (["1", "2", "3"],):
+53 |         if foo or baz:
+54 |             break
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B007 Loop control variable `bar` not used within loop body
   --> B007.py:59:14
@@ -152,16 +149,15 @@ B007 [*] Loop control variable `bar` not used within loop body
 70 |             break
    |
 help: Rename unused `bar` to `_bar`
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | def f():
-67 67 |     # Fixable.
-68    |-    for foo, bar, baz in (["1", "2", "3"],):
-   68 |+    for foo, _bar, baz in (["1", "2", "3"],):
-69 69 |         if foo or baz:
-70 70 |             break
-71 71 | 
+65 | 
+66 | def f():
+67 |     # Fixable.
+   -     for foo, bar, baz in (["1", "2", "3"],):
+68 +     for foo, _bar, baz in (["1", "2", "3"],):
+69 |         if foo or baz:
+70 |             break
+71 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B007 Loop control variable `bar` not used within loop body
   --> B007.py:77:14
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap
index e733defa73..ab05bd0966 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap
@@ -11,16 +11,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 21 | getattr(foo, "__123abc__")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-16 16 | getattr(foo, "__123abc")
-17 17 | 
-18 18 | # Invalid usage
-19    |-getattr(foo, "bar")
-   19 |+foo.bar
-20 20 | getattr(foo, "_123abc")
-21 21 | getattr(foo, "__123abc__")
-22 22 | getattr(foo, "abc123")
+16 | getattr(foo, "__123abc")
+17 | 
+18 | # Invalid usage
+   - getattr(foo, "bar")
+19 + foo.bar
+20 | getattr(foo, "_123abc")
+21 | getattr(foo, "__123abc__")
+22 | getattr(foo, "abc123")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:20:1
@@ -33,16 +31,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 22 | getattr(foo, "abc123")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-17 17 | 
-18 18 | # Invalid usage
-19 19 | getattr(foo, "bar")
-20    |-getattr(foo, "_123abc")
-   20 |+foo._123abc
-21 21 | getattr(foo, "__123abc__")
-22 22 | getattr(foo, "abc123")
-23 23 | getattr(foo, r"abc123")
+17 | 
+18 | # Invalid usage
+19 | getattr(foo, "bar")
+   - getattr(foo, "_123abc")
+20 + foo._123abc
+21 | getattr(foo, "__123abc__")
+22 | getattr(foo, "abc123")
+23 | getattr(foo, r"abc123")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:21:1
@@ -55,16 +51,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 23 | getattr(foo, r"abc123")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-18 18 | # Invalid usage
-19 19 | getattr(foo, "bar")
-20 20 | getattr(foo, "_123abc")
-21    |-getattr(foo, "__123abc__")
-   21 |+foo.__123abc__
-22 22 | getattr(foo, "abc123")
-23 23 | getattr(foo, r"abc123")
-24 24 | _ = lambda x: getattr(x, "bar")
+18 | # Invalid usage
+19 | getattr(foo, "bar")
+20 | getattr(foo, "_123abc")
+   - getattr(foo, "__123abc__")
+21 + foo.__123abc__
+22 | getattr(foo, "abc123")
+23 | getattr(foo, r"abc123")
+24 | _ = lambda x: getattr(x, "bar")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:22:1
@@ -77,16 +71,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 24 | _ = lambda x: getattr(x, "bar")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-19 19 | getattr(foo, "bar")
-20 20 | getattr(foo, "_123abc")
-21 21 | getattr(foo, "__123abc__")
-22    |-getattr(foo, "abc123")
-   22 |+foo.abc123
-23 23 | getattr(foo, r"abc123")
-24 24 | _ = lambda x: getattr(x, "bar")
-25 25 | if getattr(x, "bar"):
+19 | getattr(foo, "bar")
+20 | getattr(foo, "_123abc")
+21 | getattr(foo, "__123abc__")
+   - getattr(foo, "abc123")
+22 + foo.abc123
+23 | getattr(foo, r"abc123")
+24 | _ = lambda x: getattr(x, "bar")
+25 | if getattr(x, "bar"):
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:23:1
@@ -99,16 +91,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 25 | if getattr(x, "bar"):
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-20 20 | getattr(foo, "_123abc")
-21 21 | getattr(foo, "__123abc__")
-22 22 | getattr(foo, "abc123")
-23    |-getattr(foo, r"abc123")
-   23 |+foo.abc123
-24 24 | _ = lambda x: getattr(x, "bar")
-25 25 | if getattr(x, "bar"):
-26 26 |     pass
+20 | getattr(foo, "_123abc")
+21 | getattr(foo, "__123abc__")
+22 | getattr(foo, "abc123")
+   - getattr(foo, r"abc123")
+23 + foo.abc123
+24 | _ = lambda x: getattr(x, "bar")
+25 | if getattr(x, "bar"):
+26 |     pass
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:24:15
@@ -121,16 +111,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 26 |     pass
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-21 21 | getattr(foo, "__123abc__")
-22 22 | getattr(foo, "abc123")
-23 23 | getattr(foo, r"abc123")
-24    |-_ = lambda x: getattr(x, "bar")
-   24 |+_ = lambda x: x.bar
-25 25 | if getattr(x, "bar"):
-26 26 |     pass
-27 27 | getattr(1, "real")
+21 | getattr(foo, "__123abc__")
+22 | getattr(foo, "abc123")
+23 | getattr(foo, r"abc123")
+   - _ = lambda x: getattr(x, "bar")
+24 + _ = lambda x: x.bar
+25 | if getattr(x, "bar"):
+26 |     pass
+27 | getattr(1, "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:25:4
@@ -143,16 +131,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 27 | getattr(1, "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-22 22 | getattr(foo, "abc123")
-23 23 | getattr(foo, r"abc123")
-24 24 | _ = lambda x: getattr(x, "bar")
-25    |-if getattr(x, "bar"):
-   25 |+if x.bar:
-26 26 |     pass
-27 27 | getattr(1, "real")
-28 28 | getattr(1., "real")
+22 | getattr(foo, "abc123")
+23 | getattr(foo, r"abc123")
+24 | _ = lambda x: getattr(x, "bar")
+   - if getattr(x, "bar"):
+25 + if x.bar:
+26 |     pass
+27 | getattr(1, "real")
+28 | getattr(1., "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:27:1
@@ -165,16 +151,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 29 | getattr(1.0, "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-24 24 | _ = lambda x: getattr(x, "bar")
-25 25 | if getattr(x, "bar"):
-26 26 |     pass
-27    |-getattr(1, "real")
-   27 |+(1).real
-28 28 | getattr(1., "real")
-29 29 | getattr(1.0, "real")
-30 30 | getattr(1j, "real")
+24 | _ = lambda x: getattr(x, "bar")
+25 | if getattr(x, "bar"):
+26 |     pass
+   - getattr(1, "real")
+27 + (1).real
+28 | getattr(1., "real")
+29 | getattr(1.0, "real")
+30 | getattr(1j, "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:28:1
@@ -187,16 +171,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 30 | getattr(1j, "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-25 25 | if getattr(x, "bar"):
-26 26 |     pass
-27 27 | getattr(1, "real")
-28    |-getattr(1., "real")
-   28 |+(1.).real
-29 29 | getattr(1.0, "real")
-30 30 | getattr(1j, "real")
-31 31 | getattr(True, "real")
+25 | if getattr(x, "bar"):
+26 |     pass
+27 | getattr(1, "real")
+   - getattr(1., "real")
+28 + (1.).real
+29 | getattr(1.0, "real")
+30 | getattr(1j, "real")
+31 | getattr(True, "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:29:1
@@ -209,16 +191,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 31 | getattr(True, "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-26 26 |     pass
-27 27 | getattr(1, "real")
-28 28 | getattr(1., "real")
-29    |-getattr(1.0, "real")
-   29 |+(1.0).real
-30 30 | getattr(1j, "real")
-31 31 | getattr(True, "real")
-32 32 | getattr(x := 1, "real")
+26 |     pass
+27 | getattr(1, "real")
+28 | getattr(1., "real")
+   - getattr(1.0, "real")
+29 + (1.0).real
+30 | getattr(1j, "real")
+31 | getattr(True, "real")
+32 | getattr(x := 1, "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:30:1
@@ -231,16 +211,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 32 | getattr(x := 1, "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-27 27 | getattr(1, "real")
-28 28 | getattr(1., "real")
-29 29 | getattr(1.0, "real")
-30    |-getattr(1j, "real")
-   30 |+(1j).real
-31 31 | getattr(True, "real")
-32 32 | getattr(x := 1, "real")
-33 33 | getattr(x + y, "real")
+27 | getattr(1, "real")
+28 | getattr(1., "real")
+29 | getattr(1.0, "real")
+   - getattr(1j, "real")
+30 + (1j).real
+31 | getattr(True, "real")
+32 | getattr(x := 1, "real")
+33 | getattr(x + y, "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:31:1
@@ -253,16 +231,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 33 | getattr(x + y, "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-28 28 | getattr(1., "real")
-29 29 | getattr(1.0, "real")
-30 30 | getattr(1j, "real")
-31    |-getattr(True, "real")
-   31 |+(True).real
-32 32 | getattr(x := 1, "real")
-33 33 | getattr(x + y, "real")
-34 34 | getattr("foo"
+28 | getattr(1., "real")
+29 | getattr(1.0, "real")
+30 | getattr(1j, "real")
+   - getattr(True, "real")
+31 + (True).real
+32 | getattr(x := 1, "real")
+33 | getattr(x + y, "real")
+34 | getattr("foo"
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:32:1
@@ -275,16 +251,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 34 | getattr("foo"
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-29 29 | getattr(1.0, "real")
-30 30 | getattr(1j, "real")
-31 31 | getattr(True, "real")
-32    |-getattr(x := 1, "real")
-   32 |+(x := 1).real
-33 33 | getattr(x + y, "real")
-34 34 | getattr("foo"
-35 35 |         "bar", "real")
+29 | getattr(1.0, "real")
+30 | getattr(1j, "real")
+31 | getattr(True, "real")
+   - getattr(x := 1, "real")
+32 + (x := 1).real
+33 | getattr(x + y, "real")
+34 | getattr("foo"
+35 |         "bar", "real")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:33:1
@@ -297,16 +271,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 35 |         "bar", "real")
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-30 30 | getattr(1j, "real")
-31 31 | getattr(True, "real")
-32 32 | getattr(x := 1, "real")
-33    |-getattr(x + y, "real")
-   33 |+(x + y).real
-34 34 | getattr("foo"
-35 35 |         "bar", "real")
-36 36 | 
+30 | getattr(1j, "real")
+31 | getattr(True, "real")
+32 | getattr(x := 1, "real")
+   - getattr(x + y, "real")
+33 + (x + y).real
+34 | getattr("foo"
+35 |         "bar", "real")
+36 | 
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:34:1
@@ -318,18 +290,16 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
    | |______________________^
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-31 31 | getattr(True, "real")
-32 32 | getattr(x := 1, "real")
-33 33 | getattr(x + y, "real")
-34    |-getattr("foo"
-35    |-        "bar", "real")
-   34 |+("foo"
-   35 |+        "bar").real
-36 36 | 
-37 37 | 
-38 38 | # Valid setattr usage
+31 | getattr(True, "real")
+32 | getattr(x := 1, "real")
+33 | getattr(x + y, "real")
+   - getattr("foo"
+   -         "bar", "real")
+34 + ("foo"
+35 +         "bar").real
+36 | 
+37 | 
+38 | # Valid setattr usage
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:58:8
@@ -341,16 +311,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 60 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-55 55 | setattr(foo.bar, r"baz", None)
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-58    |-assert getattr(func, '_rpc')is True
-   58 |+assert func._rpc is True
-59 59 | 
-60 60 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247
-61 61 | getattr(*foo, "bar")
+55 | setattr(foo.bar, r"baz", None)
+56 | 
+57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
+   - assert getattr(func, '_rpc')is True
+58 + assert func._rpc is True
+59 | 
+60 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247
+61 | getattr(*foo, "bar")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:65:1
@@ -363,18 +331,16 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 68 |   import builtins
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-62 62 | setattr(*foo, "bar", None)
-63 63 | 
-64 64 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739800901
-65    |-getattr(self.
-66    |-   registration.registry, '__name__')
-   65 |+(self.
-   66 |+   registration.registry).__name__
-67 67 | 
-68 68 | import builtins
-69 69 | builtins.getattr(foo, "bar")
+62 | setattr(*foo, "bar", None)
+63 | 
+64 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739800901
+   - getattr(self.
+   -    registration.registry, '__name__')
+65 + (self.
+66 +    registration.registry).__name__
+67 | 
+68 | import builtins
+69 | builtins.getattr(foo, "bar")
 
 B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:69:1
@@ -386,13 +352,11 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa
 71 | # Regression test for: https://github.com/astral-sh/ruff/issues/18353
    |
 help: Replace `getattr` with attribute access
-
-ℹ Safe fix
-66 66 |    registration.registry, '__name__')
-67 67 | 
-68 68 | import builtins
-69    |-builtins.getattr(foo, "bar")
-   69 |+foo.bar
-70 70 | 
-71 71 | # Regression test for: https://github.com/astral-sh/ruff/issues/18353
-72 72 | setattr(foo, "__debug__", 0)
+66 |    registration.registry, '__name__')
+67 | 
+68 | import builtins
+   - builtins.getattr(foo, "bar")
+69 + foo.bar
+70 | 
+71 | # Regression test for: https://github.com/astral-sh/ruff/issues/18353
+72 | setattr(foo, "__debug__", 0)
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap
index 59365d0da4..87c2f01bfe 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap
@@ -11,16 +11,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa
 52 | setattr(foo, "__123abc__", None)
    |
 help: Replace `setattr` with assignment
-
-ℹ Safe fix
-47 47 |     pass
-48 48 | 
-49 49 | # Invalid usage
-50    |-setattr(foo, "bar", None)
-   50 |+foo.bar = None
-51 51 | setattr(foo, "_123abc", None)
-52 52 | setattr(foo, "__123abc__", None)
-53 53 | setattr(foo, "abc123", None)
+47 |     pass
+48 | 
+49 | # Invalid usage
+   - setattr(foo, "bar", None)
+50 + foo.bar = None
+51 | setattr(foo, "_123abc", None)
+52 | setattr(foo, "__123abc__", None)
+53 | setattr(foo, "abc123", None)
 
 B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:51:1
@@ -33,16 +31,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa
 53 | setattr(foo, "abc123", None)
    |
 help: Replace `setattr` with assignment
-
-ℹ Safe fix
-48 48 | 
-49 49 | # Invalid usage
-50 50 | setattr(foo, "bar", None)
-51    |-setattr(foo, "_123abc", None)
-   51 |+foo._123abc = None
-52 52 | setattr(foo, "__123abc__", None)
-53 53 | setattr(foo, "abc123", None)
-54 54 | setattr(foo, r"abc123", None)
+48 | 
+49 | # Invalid usage
+50 | setattr(foo, "bar", None)
+   - setattr(foo, "_123abc", None)
+51 + foo._123abc = None
+52 | setattr(foo, "__123abc__", None)
+53 | setattr(foo, "abc123", None)
+54 | setattr(foo, r"abc123", None)
 
 B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:52:1
@@ -55,16 +51,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa
 54 | setattr(foo, r"abc123", None)
    |
 help: Replace `setattr` with assignment
-
-ℹ Safe fix
-49 49 | # Invalid usage
-50 50 | setattr(foo, "bar", None)
-51 51 | setattr(foo, "_123abc", None)
-52    |-setattr(foo, "__123abc__", None)
-   52 |+foo.__123abc__ = None
-53 53 | setattr(foo, "abc123", None)
-54 54 | setattr(foo, r"abc123", None)
-55 55 | setattr(foo.bar, r"baz", None)
+49 | # Invalid usage
+50 | setattr(foo, "bar", None)
+51 | setattr(foo, "_123abc", None)
+   - setattr(foo, "__123abc__", None)
+52 + foo.__123abc__ = None
+53 | setattr(foo, "abc123", None)
+54 | setattr(foo, r"abc123", None)
+55 | setattr(foo.bar, r"baz", None)
 
 B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:53:1
@@ -77,16 +71,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa
 55 | setattr(foo.bar, r"baz", None)
    |
 help: Replace `setattr` with assignment
-
-ℹ Safe fix
-50 50 | setattr(foo, "bar", None)
-51 51 | setattr(foo, "_123abc", None)
-52 52 | setattr(foo, "__123abc__", None)
-53    |-setattr(foo, "abc123", None)
-   53 |+foo.abc123 = None
-54 54 | setattr(foo, r"abc123", None)
-55 55 | setattr(foo.bar, r"baz", None)
-56 56 | 
+50 | setattr(foo, "bar", None)
+51 | setattr(foo, "_123abc", None)
+52 | setattr(foo, "__123abc__", None)
+   - setattr(foo, "abc123", None)
+53 + foo.abc123 = None
+54 | setattr(foo, r"abc123", None)
+55 | setattr(foo.bar, r"baz", None)
+56 | 
 
 B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:54:1
@@ -98,16 +90,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa
 55 | setattr(foo.bar, r"baz", None)
    |
 help: Replace `setattr` with assignment
-
-ℹ Safe fix
-51 51 | setattr(foo, "_123abc", None)
-52 52 | setattr(foo, "__123abc__", None)
-53 53 | setattr(foo, "abc123", None)
-54    |-setattr(foo, r"abc123", None)
-   54 |+foo.abc123 = None
-55 55 | setattr(foo.bar, r"baz", None)
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
+51 | setattr(foo, "_123abc", None)
+52 | setattr(foo, "__123abc__", None)
+53 | setattr(foo, "abc123", None)
+   - setattr(foo, r"abc123", None)
+54 + foo.abc123 = None
+55 | setattr(foo.bar, r"baz", None)
+56 | 
+57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
 
 B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
   --> B009_B010.py:55:1
@@ -120,13 +110,11 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa
 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
    |
 help: Replace `setattr` with assignment
-
-ℹ Safe fix
-52 52 | setattr(foo, "__123abc__", None)
-53 53 | setattr(foo, "abc123", None)
-54 54 | setattr(foo, r"abc123", None)
-55    |-setattr(foo.bar, r"baz", None)
-   55 |+foo.bar.baz = None
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-58 58 | assert getattr(func, '_rpc')is True
+52 | setattr(foo, "__123abc__", None)
+53 | setattr(foo, "abc123", None)
+54 | setattr(foo, r"abc123", None)
+   - setattr(foo.bar, r"baz", None)
+55 + foo.bar.baz = None
+56 | 
+57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
+58 | assert getattr(func, '_rpc')is True
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap
index 3af2078bac..57d6992e70 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap
@@ -11,15 +11,14 @@ B011 [*] Do not `assert False` (`python -O` removes these calls), raise `Asserti
 10 | assert False, "message"
    |
 help: Replace `assert False`
-
-ℹ Unsafe fix
-5 5 | """
-6 6 | 
-7 7 | assert 1 != 2
-8   |-assert False
-  8 |+raise AssertionError()
-9 9 | assert 1 != 2, "message"
-10 10 | assert False, "message"
+5  | """
+6  | 
+7  | assert 1 != 2
+   - assert False
+8  + raise AssertionError()
+9  | assert 1 != 2, "message"
+10 | assert False, "message"
+note: This is an unsafe fix and may change runtime behavior
 
 B011 [*] Do not `assert False` (`python -O` removes these calls), raise `AssertionError()`
   --> B011.py:10:8
@@ -30,10 +29,9 @@ B011 [*] Do not `assert False` (`python -O` removes these calls), raise `Asserti
    |        ^^^^^
    |
 help: Replace `assert False`
-
-ℹ Unsafe fix
-7  7  | assert 1 != 2
-8  8  | assert False
-9  9  | assert 1 != 2, "message"
-10    |-assert False, "message"
-   10 |+raise AssertionError("message")
+7  | assert 1 != 2
+8  | assert False
+9  | assert 1 != 2, "message"
+   - assert False, "message"
+10 + raise AssertionError("message")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap
index a1443d6b03..558df83a88 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap
@@ -12,16 +12,14 @@ B013 [*] A length-one tuple literal is redundant in exception handlers
 7 | except AttributeError:
   |
 help: Replace with `except ValueError`
-
-ℹ Safe fix
-2 2 | 
-3 3 | try:
-4 4 |     pass
-5   |-except (ValueError,):
-  5 |+except ValueError:
-6 6 |     pass
-7 7 | except AttributeError:
-8 8 |     pass
+2 | 
+3 | try:
+4 |     pass
+  - except (ValueError,):
+5 + except ValueError:
+6 |     pass
+7 | except AttributeError:
+8 |     pass
 
 B013 [*] A length-one tuple literal is redundant in exception handlers
   --> B013.py:13:7
@@ -33,13 +31,11 @@ B013 [*] A length-one tuple literal is redundant in exception handlers
 14 |     pass
    |
 help: Replace with `except ValueError`
-
-ℹ Safe fix
-10 10 |     pass
-11 11 | except (*retriable_exceptions,):
-12 12 |     pass
-13    |-except(ValueError,):
-   13 |+except ValueError:
-14 14 |     pass
-15 15 | 
-16 16 | list_exceptions = [FileExistsError, FileNotFoundError]
+10 |     pass
+11 | except (*retriable_exceptions,):
+12 |     pass
+   - except(ValueError,):
+13 + except ValueError:
+14 |     pass
+15 | 
+16 | list_exceptions = [FileExistsError, FileNotFoundError]
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap
index fd18e4d076..e4bd89d12e 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap
@@ -12,16 +12,14 @@ B014 [*] Exception handler with duplicate exception: `OSError`
 19 |     pass
    |
 help: De-duplicate exceptions
-
-ℹ Safe fix
-14 14 | 
-15 15 | try:
-16 16 |     pass
-17    |-except (OSError, OSError) as err:
-   17 |+except OSError as err:
-18 18 |     # Duplicate exception types are useless
-19 19 |     pass
-20 20 | 
+14 | 
+15 | try:
+16 |     pass
+   - except (OSError, OSError) as err:
+17 + except OSError as err:
+18 |     # Duplicate exception types are useless
+19 |     pass
+20 | 
 
 B014 [*] Exception handler with duplicate exception: `MyError`
   --> B014.py:28:8
@@ -34,16 +32,14 @@ B014 [*] Exception handler with duplicate exception: `MyError`
 30 |     pass
    |
 help: De-duplicate exceptions
-
-ℹ Safe fix
-25 25 | 
-26 26 | try:
-27 27 |     pass
-28    |-except (MyError, MyError):
-   28 |+except MyError:
-29 29 |     # Detect duplicate non-builtin errors
-30 30 |     pass
-31 31 | 
+25 | 
+26 | try:
+27 |     pass
+   - except (MyError, MyError):
+28 + except MyError:
+29 |     # Detect duplicate non-builtin errors
+30 |     pass
+31 | 
 
 B014 [*] Exception handler with duplicate exception: `re.error`
   --> B014.py:49:8
@@ -56,16 +52,14 @@ B014 [*] Exception handler with duplicate exception: `re.error`
 51 |     pass
    |
 help: De-duplicate exceptions
-
-ℹ Safe fix
-46 46 | 
-47 47 | try:
-48 48 |     pass
-49    |-except (re.error, re.error):
-   49 |+except re.error:
-50 50 |     # Duplicate exception types as attributes
-51 51 |     pass
-52 52 | 
+46 | 
+47 | try:
+48 |     pass
+   - except (re.error, re.error):
+49 + except re.error:
+50 |     # Duplicate exception types as attributes
+51 |     pass
+52 | 
 
 B014 [*] Exception handler with duplicate exception: `ValueError`
   --> B014.py:82:8
@@ -77,16 +71,14 @@ B014 [*] Exception handler with duplicate exception: `ValueError`
 83 |     pass
    |
 help: De-duplicate exceptions
-
-ℹ Safe fix
-79 79 | # Regression test for: https://github.com/astral-sh/ruff/issues/6412
-80 80 | try:
-81 81 |     pass
-82    |-except (ValueError, ValueError, TypeError):
-   82 |+except (ValueError, TypeError):
-83 83 |     pass
-84 84 | 
-85 85 | 
+79 | # Regression test for: https://github.com/astral-sh/ruff/issues/6412
+80 | try:
+81 |     pass
+   - except (ValueError, ValueError, TypeError):
+82 + except (ValueError, TypeError):
+83 |     pass
+84 | 
+85 | 
 
 B014 [*] Exception handler with duplicate exception: `re.error`
   --> B014.py:89:7
@@ -98,11 +90,9 @@ B014 [*] Exception handler with duplicate exception: `re.error`
 90 |     p
    |
 help: De-duplicate exceptions
-
-ℹ Safe fix
-86 86 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739801758
-87 87 | try:
-88 88 |     pas
-89    |-except(re.error, re.error):
-   89 |+except re.error:
-90 90 |     p
+86 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739801758
+87 | try:
+88 |     pas
+   - except(re.error, re.error):
+89 + except re.error:
+90 |     p
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B017_B017_1.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B017_B017_1.py.snap
index 967e60a4f9..5b0767019c 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B017_B017_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B017_B017_1.py.snap
@@ -1,4 +1,41 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
+B017 Do not assert blind exception: `Exception`
+  --> B017_1.py:20:9
+   |
+18 | class Foobar(unittest.TestCase):
+19 |     def call_form_raises(self) -> None:
+20 |         self.assertRaises(Exception, something_else)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21 |         self.assertRaises(BaseException, something_else)
+   |
 
+B017 Do not assert blind exception: `BaseException`
+  --> B017_1.py:21:9
+   |
+19 |     def call_form_raises(self) -> None:
+20 |         self.assertRaises(Exception, something_else)
+21 |         self.assertRaises(BaseException, something_else)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+
+B017 Do not assert blind exception: `Exception`
+  --> B017_1.py:25:5
+   |
+24 | def test_pytest_call_form() -> None:
+25 |     pytest.raises(Exception, something_else)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+26 |     pytest.raises(BaseException, something_else)
+   |
+
+B017 Do not assert blind exception: `BaseException`
+  --> B017_1.py:26:5
+   |
+24 | def test_pytest_call_form() -> None:
+25 |     pytest.raises(Exception, something_else)
+26 |     pytest.raises(BaseException, something_else)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+27 |
+28 |     pytest.raises(Exception, something_else, match="hello")
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap
index 30b4edf861..c31af3bf6d 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap
@@ -12,16 +12,15 @@ B028 [*] No explicit `stacklevel` keyword argument found
 10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2)
    |
 help: Set `stacklevel=2`
-
-ℹ Unsafe fix
-5 5 | B028 - on lines 8 and 9
-6 6 | """
-7 7 | 
-8   |-warnings.warn("test", DeprecationWarning)
-  8 |+warnings.warn("test", DeprecationWarning, stacklevel=2)
-9 9 | warnings.warn("test", DeprecationWarning, source=None)
-10 10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2)
-11 11 | warnings.warn("test", DeprecationWarning, stacklevel=1)
+5  | B028 - on lines 8 and 9
+6  | """
+7  | 
+   - warnings.warn("test", DeprecationWarning)
+8  + warnings.warn("test", DeprecationWarning, stacklevel=2)
+9  | warnings.warn("test", DeprecationWarning, source=None)
+10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2)
+11 | warnings.warn("test", DeprecationWarning, stacklevel=1)
+note: This is an unsafe fix and may change runtime behavior
 
 B028 [*] No explicit `stacklevel` keyword argument found
   --> B028.py:9:1
@@ -33,16 +32,15 @@ B028 [*] No explicit `stacklevel` keyword argument found
 11 | warnings.warn("test", DeprecationWarning, stacklevel=1)
    |
 help: Set `stacklevel=2`
-
-ℹ Unsafe fix
-6  6  | """
-7  7  | 
-8  8  | warnings.warn("test", DeprecationWarning)
-9     |-warnings.warn("test", DeprecationWarning, source=None)
-   9  |+warnings.warn("test", DeprecationWarning, stacklevel=2, source=None)
-10 10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2)
-11 11 | warnings.warn("test", DeprecationWarning, stacklevel=1)
-12 12 | warnings.warn("test", DeprecationWarning, 1)
+6  | """
+7  | 
+8  | warnings.warn("test", DeprecationWarning)
+   - warnings.warn("test", DeprecationWarning, source=None)
+9  + warnings.warn("test", DeprecationWarning, stacklevel=2, source=None)
+10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2)
+11 | warnings.warn("test", DeprecationWarning, stacklevel=1)
+12 | warnings.warn("test", DeprecationWarning, 1)
+note: This is an unsafe fix and may change runtime behavior
 
 B028 [*] No explicit `stacklevel` keyword argument found
   --> B028.py:22:1
@@ -55,16 +53,15 @@ B028 [*] No explicit `stacklevel` keyword argument found
 24 |         DeprecationWarning,
    |
 help: Set `stacklevel=2`
-
-ℹ Unsafe fix
-23 23 |         "test",
-24 24 |         DeprecationWarning,
-25 25 |         # some comments here
-26    |-        source = None # no trailing comma
-   26 |+        stacklevel=2, source = None # no trailing comma
-27 27 |     )
-28 28 | 
-29 29 | # https://github.com/astral-sh/ruff/issues/18011
+23 |         "test",
+24 |         DeprecationWarning,
+25 |         # some comments here
+   -         source = None # no trailing comma
+26 +         stacklevel=2, source = None # no trailing comma
+27 |     )
+28 | 
+29 | # https://github.com/astral-sh/ruff/issues/18011
+note: This is an unsafe fix and may change runtime behavior
 
 B028 [*] No explicit `stacklevel` keyword argument found
   --> B028.py:32:1
@@ -77,13 +74,12 @@ B028 [*] No explicit `stacklevel` keyword argument found
 34 | _my_prefixes = ("this","that")
    |
 help: Set `stacklevel=2`
-
-ℹ Unsafe fix
-29 29 | # https://github.com/astral-sh/ruff/issues/18011
-30 30 | warnings.warn("test", skip_file_prefixes=(os.path.dirname(__file__),))
-31 31 | # trigger diagnostic if `skip_file_prefixes` is present and set to the default value
-32    |-warnings.warn("test", skip_file_prefixes=())
-   32 |+warnings.warn("test", stacklevel=2, skip_file_prefixes=())
-33 33 | 
-34 34 | _my_prefixes = ("this","that")
-35 35 | warnings.warn("test", skip_file_prefixes = _my_prefixes)
+29 | # https://github.com/astral-sh/ruff/issues/18011
+30 | warnings.warn("test", skip_file_prefixes=(os.path.dirname(__file__),))
+31 | # trigger diagnostic if `skip_file_prefixes` is present and set to the default value
+   - warnings.warn("test", skip_file_prefixes=())
+32 + warnings.warn("test", stacklevel=2, skip_file_prefixes=())
+33 | 
+34 | _my_prefixes = ("this","that")
+35 | warnings.warn("test", skip_file_prefixes = _my_prefixes)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap
index 78dde5f27a..817a97b1b3 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap
@@ -12,16 +12,14 @@ B033 [*] Sets should not contain duplicate item `"value1"`
 6 | incorrect_set_multiline = {
   |
 help: Remove duplicate item
-
-ℹ Safe fix
-1 1 | ###
-2 2 | # Errors.
-3 3 | ###
-4   |-incorrect_set = {"value1", 23, 5, "value1"}
-  4 |+incorrect_set = {"value1", 23, 5}
-5 5 | incorrect_set = {1, 1, 2}
-6 6 | incorrect_set_multiline = {
-7 7 |     "value1",
+1 | ###
+2 | # Errors.
+3 | ###
+  - incorrect_set = {"value1", 23, 5, "value1"}
+4 + incorrect_set = {"value1", 23, 5}
+5 | incorrect_set = {1, 1, 2}
+6 | incorrect_set_multiline = {
+7 |     "value1",
 
 B033 [*] Sets should not contain duplicate item `1`
  --> B033.py:5:21
@@ -34,16 +32,14 @@ B033 [*] Sets should not contain duplicate item `1`
 7 |     "value1",
   |
 help: Remove duplicate item
-
-ℹ Safe fix
-2 2 | # Errors.
-3 3 | ###
-4 4 | incorrect_set = {"value1", 23, 5, "value1"}
-5   |-incorrect_set = {1, 1, 2}
-  5 |+incorrect_set = {1, 2}
-6 6 | incorrect_set_multiline = {
-7 7 |     "value1",
-8 8 |     23,
+2 | # Errors.
+3 | ###
+4 | incorrect_set = {"value1", 23, 5, "value1"}
+  - incorrect_set = {1, 1, 2}
+5 + incorrect_set = {1, 2}
+6 | incorrect_set_multiline = {
+7 |     "value1",
+8 |     23,
 
 B033 [*] Sets should not contain duplicate item `"value1"`
   --> B033.py:10:5
@@ -56,15 +52,13 @@ B033 [*] Sets should not contain duplicate item `"value1"`
 12 | }
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-7  7  |     "value1",
-8  8  |     23,
-9  9  |     5,
-10    |-    "value1",
-11 10 |     # B033
-12 11 | }
-13 12 | incorrect_set = {1, 1}
+7  |     "value1",
+8  |     23,
+9  |     5,
+   -     "value1",
+10 |     # B033
+11 | }
+12 | incorrect_set = {1, 1}
 
 B033 [*] Sets should not contain duplicate item `1`
   --> B033.py:13:21
@@ -77,16 +71,14 @@ B033 [*] Sets should not contain duplicate item `1`
 15 | incorrect_set = {0, 1, 1,}
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-10 10 |     "value1",
-11 11 |     # B033
-12 12 | }
-13    |-incorrect_set = {1, 1}
-   13 |+incorrect_set = {1}
-14 14 | incorrect_set = {1, 1,}
-15 15 | incorrect_set = {0, 1, 1,}
-16 16 | incorrect_set = {0, 1, 1}
+10 |     "value1",
+11 |     # B033
+12 | }
+   - incorrect_set = {1, 1}
+13 + incorrect_set = {1}
+14 | incorrect_set = {1, 1,}
+15 | incorrect_set = {0, 1, 1,}
+16 | incorrect_set = {0, 1, 1}
 
 B033 [*] Sets should not contain duplicate item `1`
   --> B033.py:14:21
@@ -99,16 +91,14 @@ B033 [*] Sets should not contain duplicate item `1`
 16 | incorrect_set = {0, 1, 1}
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-11 11 |     # B033
-12 12 | }
-13 13 | incorrect_set = {1, 1}
-14    |-incorrect_set = {1, 1,}
-   14 |+incorrect_set = {1,}
-15 15 | incorrect_set = {0, 1, 1,}
-16 16 | incorrect_set = {0, 1, 1}
-17 17 | incorrect_set = {
+11 |     # B033
+12 | }
+13 | incorrect_set = {1, 1}
+   - incorrect_set = {1, 1,}
+14 + incorrect_set = {1,}
+15 | incorrect_set = {0, 1, 1,}
+16 | incorrect_set = {0, 1, 1}
+17 | incorrect_set = {
 
 B033 [*] Sets should not contain duplicate item `1`
   --> B033.py:15:24
@@ -121,16 +111,14 @@ B033 [*] Sets should not contain duplicate item `1`
 17 | incorrect_set = {
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-12 12 | }
-13 13 | incorrect_set = {1, 1}
-14 14 | incorrect_set = {1, 1,}
-15    |-incorrect_set = {0, 1, 1,}
-   15 |+incorrect_set = {0, 1,}
-16 16 | incorrect_set = {0, 1, 1}
-17 17 | incorrect_set = {
-18 18 |     0,
+12 | }
+13 | incorrect_set = {1, 1}
+14 | incorrect_set = {1, 1,}
+   - incorrect_set = {0, 1, 1,}
+15 + incorrect_set = {0, 1,}
+16 | incorrect_set = {0, 1, 1}
+17 | incorrect_set = {
+18 |     0,
 
 B033 [*] Sets should not contain duplicate item `1`
   --> B033.py:16:24
@@ -143,16 +131,14 @@ B033 [*] Sets should not contain duplicate item `1`
 18 |     0,
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-13 13 | incorrect_set = {1, 1}
-14 14 | incorrect_set = {1, 1,}
-15 15 | incorrect_set = {0, 1, 1,}
-16    |-incorrect_set = {0, 1, 1}
-   16 |+incorrect_set = {0, 1}
-17 17 | incorrect_set = {
-18 18 |     0,
-19 19 |     1,
+13 | incorrect_set = {1, 1}
+14 | incorrect_set = {1, 1,}
+15 | incorrect_set = {0, 1, 1,}
+   - incorrect_set = {0, 1, 1}
+16 + incorrect_set = {0, 1}
+17 | incorrect_set = {
+18 |     0,
+19 |     1,
 
 B033 [*] Sets should not contain duplicate item `1`
   --> B033.py:20:5
@@ -165,15 +151,13 @@ B033 [*] Sets should not contain duplicate item `1`
 22 | incorrect_set = {False, 1, 0}
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-17 17 | incorrect_set = {
-18 18 |     0,
-19 19 |     1,
-20    |-    1,
-21 20 | }
-22 21 | incorrect_set = {False, 1, 0}
-23 22 | 
+17 | incorrect_set = {
+18 |     0,
+19 |     1,
+   -     1,
+20 | }
+21 | incorrect_set = {False, 1, 0}
+22 | 
 
 B033 [*] Sets should not contain duplicate items, but `False` and `0` has the same value
   --> B033.py:22:28
@@ -186,13 +170,11 @@ B033 [*] Sets should not contain duplicate items, but `False` and `0` has the sa
 24 | ###
    |
 help: Remove duplicate item
-
-ℹ Safe fix
-19 19 |     1,
-20 20 |     1,
-21 21 | }
-22    |-incorrect_set = {False, 1, 0}
-   22 |+incorrect_set = {False, 1}
-23 23 | 
-24 24 | ###
-25 25 | # Non-errors.
+19 |     1,
+20 |     1,
+21 | }
+   - incorrect_set = {False, 1, 0}
+22 + incorrect_set = {False, 1}
+23 | 
+24 | ###
+25 | # Non-errors.
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap
index c3b396af36..b6b4640583 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap
@@ -5,209 +5,136 @@ B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:4:1
   |
 3 | # Errors
-4 | zip()
-  | ^^^^^
-5 | zip(range(3))
-6 | zip("a", "b")
+4 | zip("a", "b")
+  | ^^^^^^^^^^^^^
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
   |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-1 1 | from itertools import count, cycle, repeat
-2 2 | 
-3 3 | # Errors
-4   |-zip()
-  4 |+zip(strict=False)
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7 7 | zip("a", "b", *zip("c"))
+1 | from itertools import count, cycle, repeat
+2 | 
+3 | # Errors
+  - zip("a", "b")
+4 + zip("a", "b", strict=False)
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
+7 | zip(zip("a", strict=True),"b")
+note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:5:1
   |
 3 | # Errors
-4 | zip()
-5 | zip(range(3))
-  | ^^^^^^^^^^^^^
-6 | zip("a", "b")
-7 | zip("a", "b", *zip("c"))
+4 | zip("a", "b")
+5 | zip("a", "b", *zip("c"))
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+6 | zip(zip("a", "b"), strict=False)
+7 | zip(zip("a", strict=True),"b")
   |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-2 2 | 
-3 3 | # Errors
-4 4 | zip()
-5   |-zip(range(3))
-  5 |+zip(range(3), strict=False)
-6 6 | zip("a", "b")
-7 7 | zip("a", "b", *zip("c"))
-8 8 | zip(zip("a"), strict=False)
+2 | 
+3 | # Errors
+4 | zip("a", "b")
+  - zip("a", "b", *zip("c"))
+5 + zip("a", "b", *zip("c"), strict=False)
+6 | zip(zip("a", "b"), strict=False)
+7 | zip(zip("a", strict=True),"b")
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
- --> B905.py:6:1
+ --> B905.py:6:5
   |
-4 | zip()
-5 | zip(range(3))
-6 | zip("a", "b")
-  | ^^^^^^^^^^^^^
-7 | zip("a", "b", *zip("c"))
-8 | zip(zip("a"), strict=False)
+4 | zip("a", "b")
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
+  |     ^^^^^^^^^^^^^
+7 | zip(zip("a", strict=True),"b")
   |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-3 3 | # Errors
-4 4 | zip()
-5 5 | zip(range(3))
-6   |-zip("a", "b")
-  6 |+zip("a", "b", strict=False)
-7 7 | zip("a", "b", *zip("c"))
-8 8 | zip(zip("a"), strict=False)
-9 9 | zip(zip("a", strict=True))
+3 | # Errors
+4 | zip("a", "b")
+5 | zip("a", "b", *zip("c"))
+  - zip(zip("a", "b"), strict=False)
+6 + zip(zip("a", "b", strict=False), strict=False)
+7 | zip(zip("a", strict=True),"b")
+8 | 
+9 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:7:1
   |
-5 | zip(range(3))
-6 | zip("a", "b")
-7 | zip("a", "b", *zip("c"))
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
-8 | zip(zip("a"), strict=False)
-9 | zip(zip("a", strict=True))
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
+7 | zip(zip("a", strict=True),"b")
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 |
+9 | # OK
   |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-4 4 | zip()
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7   |-zip("a", "b", *zip("c"))
-  7 |+zip("a", "b", *zip("c"), strict=False)
-8 8 | zip(zip("a"), strict=False)
-9 9 | zip(zip("a", strict=True))
-10 10 | 
+4  | zip("a", "b")
+5  | zip("a", "b", *zip("c"))
+6  | zip(zip("a", "b"), strict=False)
+   - zip(zip("a", strict=True),"b")
+7  + zip(zip("a", strict=True),"b", strict=False)
+8  | 
+9  | # OK
+10 | zip(range(3), strict=True)
+note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
- --> B905.py:7:16
-  |
-5 | zip(range(3))
-6 | zip("a", "b")
-7 | zip("a", "b", *zip("c"))
-  |                ^^^^^^^^
-8 | zip(zip("a"), strict=False)
-9 | zip(zip("a", strict=True))
-  |
-help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-4 4 | zip()
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7   |-zip("a", "b", *zip("c"))
-  7 |+zip("a", "b", *zip("c", strict=False))
-8 8 | zip(zip("a"), strict=False)
-9 9 | zip(zip("a", strict=True))
-10 10 | 
-
-B905 [*] `zip()` without an explicit `strict=` parameter
- --> B905.py:8:5
-  |
-6 | zip("a", "b")
-7 | zip("a", "b", *zip("c"))
-8 | zip(zip("a"), strict=False)
-  |     ^^^^^^^^
-9 | zip(zip("a", strict=True))
-  |
-help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7 7 | zip("a", "b", *zip("c"))
-8   |-zip(zip("a"), strict=False)
-  8 |+zip(zip("a", strict=False), strict=False)
-9 9 | zip(zip("a", strict=True))
-10 10 | 
-11 11 | # OK
-
-B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:9:1
+  --> B905.py:22:1
    |
- 7 | zip("a", "b", *zip("c"))
- 8 | zip(zip("a"), strict=False)
- 9 | zip(zip("a", strict=True))
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-10 |
-11 | # OK
-   |
-help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-6  6  | zip("a", "b")
-7  7  | zip("a", "b", *zip("c"))
-8  8  | zip(zip("a"), strict=False)
-9     |-zip(zip("a", strict=True))
-   9  |+zip(zip("a", strict=True), strict=False)
-10 10 | 
-11 11 | # OK
-12 12 | zip(range(3), strict=True)
-
-B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:24:1
-   |
-23 | # Errors (limited iterators).
-24 | zip([1, 2, 3], repeat(1, 1))
+21 | # Errors (limited iterators).
+22 | zip([1, 2, 3], repeat(1, 1))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-25 | zip([1, 2, 3], repeat(1, times=4))
+23 | zip([1, 2, 3], repeat(1, times=4))
    |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-21 21 | zip([1, 2, 3], repeat(1, times=None))
-22 22 | 
-23 23 | # Errors (limited iterators).
-24    |-zip([1, 2, 3], repeat(1, 1))
-   24 |+zip([1, 2, 3], repeat(1, 1), strict=False)
-25 25 | zip([1, 2, 3], repeat(1, times=4))
-26 26 | 
-27 27 | import builtins
+19 | zip([1, 2, 3], repeat(1, times=None))
+20 | 
+21 | # Errors (limited iterators).
+   - zip([1, 2, 3], repeat(1, 1))
+22 + zip([1, 2, 3], repeat(1, 1), strict=False)
+23 | zip([1, 2, 3], repeat(1, times=4))
+24 | 
+25 | import builtins
+note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:25:1
+  --> B905.py:23:1
    |
-23 | # Errors (limited iterators).
-24 | zip([1, 2, 3], repeat(1, 1))
-25 | zip([1, 2, 3], repeat(1, times=4))
+21 | # Errors (limited iterators).
+22 | zip([1, 2, 3], repeat(1, 1))
+23 | zip([1, 2, 3], repeat(1, times=4))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-26 |
-27 | import builtins
+24 |
+25 | import builtins
    |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-22 22 | 
-23 23 | # Errors (limited iterators).
-24 24 | zip([1, 2, 3], repeat(1, 1))
-25    |-zip([1, 2, 3], repeat(1, times=4))
-   25 |+zip([1, 2, 3], repeat(1, times=4), strict=False)
-26 26 | 
-27 27 | import builtins
-28 28 | # Still an error even though it uses the qualified name
+20 | 
+21 | # Errors (limited iterators).
+22 | zip([1, 2, 3], repeat(1, 1))
+   - zip([1, 2, 3], repeat(1, times=4))
+23 + zip([1, 2, 3], repeat(1, times=4), strict=False)
+24 | 
+25 | import builtins
+26 | # Still an error even though it uses the qualified name
+note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:29:1
+  --> B905.py:34:1
    |
-27 | import builtins
-28 | # Still an error even though it uses the qualified name
-29 | builtins.zip([1, 2, 3])
-   | ^^^^^^^^^^^^^^^^^^^^^^^
+32 | zip(range(3))
+33 | # Error
+34 | zip(*lot_of_iterators)
+   | ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add explicit value for parameter `strict=`
-
-ℹ Safe fix
-26 26 | 
-27 27 | import builtins
-28 28 | # Still an error even though it uses the qualified name
-29    |-builtins.zip([1, 2, 3])
-   29 |+builtins.zip([1, 2, 3], strict=False)
+31 | zip()
+32 | zip(range(3))
+33 | # Error
+   - zip(*lot_of_iterators)
+34 + zip(*lot_of_iterators, strict=False)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B912_py313_B912.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B912_py313_B912.py.snap
new file mode 100644
index 0000000000..967e60a4f9
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B912_py313_B912.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap
index 9de5085c02..f03aa73f1f 100644
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap
@@ -9,11 +9,10 @@ B006 [*] Do not use mutable data structures for argument defaults
 18 |     ...
    |
 help: Replace with `None`; initialize within function
-
-ℹ Unsafe fix
-14 14 |     ...
-15 15 | 
-16 16 | 
-17    |-def error_due_to_missing_import(foo: ImmutableTypeA = []):
-   17 |+def error_due_to_missing_import(foo: ImmutableTypeA = None):
-18 18 |     ...
+14 |     ...
+15 | 
+16 | 
+   - def error_due_to_missing_import(foo: ImmutableTypeA = []):
+17 + def error_due_to_missing_import(foo: ImmutableTypeA = None):
+18 |     ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_1.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_1.py.snap
new file mode 100644
index 0000000000..af07dc5476
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_1.py.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_1.py:3:22
+  |
+1 | # Docstring followed by a newline
+2 |
+3 | def foobar(foor, bar={}):    
+  |                      ^^
+4 |     """
+5 |     """
+  |
+help: Replace with `None`; initialize within function
+1 | # Docstring followed by a newline
+2 | 
+  - def foobar(foor, bar={}):    
+3 + def foobar(foor, bar=None):    
+4 |     """
+5 |     """
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_1.pyi.snap
new file mode 100644
index 0000000000..967e60a4f9
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_1.pyi.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_2.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_2.py.snap
new file mode 100644
index 0000000000..9c1184adae
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_2.py.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_2.py:4:22
+  |
+2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
+3 |
+4 | def foobar(foor, bar={}):    
+  |                      ^^
+5 |     """
+6 |     """                    
+  |
+help: Replace with `None`; initialize within function
+1 | # Docstring followed by whitespace with no newline
+2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
+3 | 
+  - def foobar(foor, bar={}):    
+4 + def foobar(foor, bar=None):    
+5 |     """
+6 |     """                    
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_3.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_3.py.snap
new file mode 100644
index 0000000000..acf948afd7
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_3.py.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_3.py:4:22
+  |
+4 | def foobar(foor, bar={}):    
+  |                      ^^
+5 |     """
+6 |     """
+  |
+help: Replace with `None`; initialize within function
+1 | # Docstring with no newline
+2 | 
+3 | 
+  - def foobar(foor, bar={}):    
+4 + def foobar(foor, bar=None):    
+5 |     """
+6 |     """
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_4.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_4.py.snap
new file mode 100644
index 0000000000..98d4e56b34
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_4.py.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_4.py:7:26
+  |
+6 | class FormFeedIndent:
+7 |    def __init__(self, a=[]):
+  |                         ^^
+8 |         print(a)
+  |
+help: Replace with `None`; initialize within function
+4  | 
+5  | 
+6  | class FormFeedIndent:
+   -    def __init__(self, a=[]):
+7  +    def __init__(self, a=None):
+8  +         if a is None:
+9  +          a = []
+10 |         print(a)
+11 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_5.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_5.py.snap
new file mode 100644
index 0000000000..b1e6c26783
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_5.py.snap
@@ -0,0 +1,314 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_5.py:5:49
+  |
+5 | def import_module_wrong(value: dict[str, str] = {}):
+  |                                                 ^^
+6 |     import os
+  |
+help: Replace with `None`; initialize within function
+2  | # https://github.com/astral-sh/ruff/issues/7616
+3  | 
+4  | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+5  + def import_module_wrong(value: dict[str, str] = None):
+6  |     import os
+7  +     if value is None:
+8  +         value = {}
+9  | 
+10 | 
+11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:9:61
+   |
+ 9 | def import_module_with_values_wrong(value: dict[str, str] = {}):
+   |                                                             ^^
+10 |     import os
+   |
+help: Replace with `None`; initialize within function
+6  |     import os
+7  | 
+8  | 
+   - def import_module_with_values_wrong(value: dict[str, str] = {}):
+9  + def import_module_with_values_wrong(value: dict[str, str] = None):
+10 |     import os
+11 | 
+12 +     if value is None:
+13 +         value = {}
+14 |     return 2
+15 | 
+16 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:15:50
+   |
+15 | def import_modules_wrong(value: dict[str, str] = {}):
+   |                                                  ^^
+16 |     import os
+17 |     import sys
+   |
+help: Replace with `None`; initialize within function
+12 |     return 2
+13 | 
+14 | 
+   - def import_modules_wrong(value: dict[str, str] = {}):
+15 + def import_modules_wrong(value: dict[str, str] = None):
+16 |     import os
+17 |     import sys
+18 |     import itertools
+19 +     if value is None:
+20 +         value = {}
+21 | 
+22 | 
+23 | def from_import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:21:54
+   |
+21 | def from_import_module_wrong(value: dict[str, str] = {}):
+   |                                                      ^^
+22 |     from os import path
+   |
+help: Replace with `None`; initialize within function
+18 |     import itertools
+19 | 
+20 | 
+   - def from_import_module_wrong(value: dict[str, str] = {}):
+21 + def from_import_module_wrong(value: dict[str, str] = None):
+22 |     from os import path
+23 +     if value is None:
+24 +         value = {}
+25 | 
+26 | 
+27 | def from_imports_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:25:55
+   |
+25 | def from_imports_module_wrong(value: dict[str, str] = {}):
+   |                                                       ^^
+26 |     from os import path
+27 |     from sys import version_info
+   |
+help: Replace with `None`; initialize within function
+22 |     from os import path
+23 | 
+24 | 
+   - def from_imports_module_wrong(value: dict[str, str] = {}):
+25 + def from_imports_module_wrong(value: dict[str, str] = None):
+26 |     from os import path
+27 |     from sys import version_info
+28 +     if value is None:
+29 +         value = {}
+30 | 
+31 | 
+32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:30:66
+   |
+30 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
+   |                                                                  ^^
+31 |     import os
+32 |     from sys import version_info
+   |
+help: Replace with `None`; initialize within function
+27 |     from sys import version_info
+28 | 
+29 | 
+   - def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
+30 + def import_and_from_imports_module_wrong(value: dict[str, str] = None):
+31 |     import os
+32 |     from sys import version_info
+33 +     if value is None:
+34 +         value = {}
+35 | 
+36 | 
+37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:35:59
+   |
+35 | def import_docstring_module_wrong(value: dict[str, str] = {}):
+   |                                                           ^^
+36 |     """Docstring"""
+37 |     import os
+   |
+help: Replace with `None`; initialize within function
+32 |     from sys import version_info
+33 | 
+34 | 
+   - def import_docstring_module_wrong(value: dict[str, str] = {}):
+35 + def import_docstring_module_wrong(value: dict[str, str] = None):
+36 |     """Docstring"""
+37 |     import os
+38 +     if value is None:
+39 +         value = {}
+40 | 
+41 | 
+42 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:40:49
+   |
+40 | def import_module_wrong(value: dict[str, str] = {}):
+   |                                                 ^^
+41 |     """Docstring"""
+42 |     import os; import sys
+   |
+help: Replace with `None`; initialize within function
+37 |     import os
+38 | 
+39 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+40 + def import_module_wrong(value: dict[str, str] = None):
+41 |     """Docstring"""
+42 |     import os; import sys
+43 +     if value is None:
+44 +         value = {}
+45 | 
+46 | 
+47 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:45:49
+   |
+45 | def import_module_wrong(value: dict[str, str] = {}):
+   |                                                 ^^
+46 |     """Docstring"""
+47 |     import os; import sys; x = 1
+   |
+help: Replace with `None`; initialize within function
+42 |     import os; import sys
+43 | 
+44 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+45 + def import_module_wrong(value: dict[str, str] = None):
+46 |     """Docstring"""
+47 +     if value is None:
+48 +         value = {}
+49 |     import os; import sys; x = 1
+50 | 
+51 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:50:49
+   |
+50 | def import_module_wrong(value: dict[str, str] = {}):
+   |                                                 ^^
+51 |     """Docstring"""
+52 |     import os; import sys
+   |
+help: Replace with `None`; initialize within function
+47 |     import os; import sys; x = 1
+48 | 
+49 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+50 + def import_module_wrong(value: dict[str, str] = None):
+51 |     """Docstring"""
+52 |     import os; import sys
+53 +     if value is None:
+54 +         value = {}
+55 | 
+56 | 
+57 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:55:49
+   |
+55 | def import_module_wrong(value: dict[str, str] = {}):
+   |                                                 ^^
+56 |     import os; import sys
+   |
+help: Replace with `None`; initialize within function
+52 |     import os; import sys
+53 | 
+54 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+55 + def import_module_wrong(value: dict[str, str] = None):
+56 |     import os; import sys
+57 +     if value is None:
+58 +         value = {}
+59 | 
+60 | 
+61 | def import_module_wrong(value: dict[str, str] = {}):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:59:49
+   |
+59 | def import_module_wrong(value: dict[str, str] = {}):
+   |                                                 ^^
+60 |     import os; import sys; x = 1
+   |
+help: Replace with `None`; initialize within function
+56 |     import os; import sys
+57 | 
+58 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+59 + def import_module_wrong(value: dict[str, str] = None):
+60 +     if value is None:
+61 +         value = {}
+62 |     import os; import sys; x = 1
+63 | 
+64 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_5.py:63:49
+   |
+63 | def import_module_wrong(value: dict[str, str] = {}):
+   |                                                 ^^
+64 |     import os; import sys
+   |
+help: Replace with `None`; initialize within function
+60 |     import os; import sys; x = 1
+61 | 
+62 | 
+   - def import_module_wrong(value: dict[str, str] = {}):
+63 + def import_module_wrong(value: dict[str, str] = None):
+64 |     import os; import sys
+65 +     if value is None:
+66 +         value = {}
+67 | 
+68 | 
+69 | def import_module_wrong(value: dict[str, str] = {}): import os
+note: This is an unsafe fix and may change runtime behavior
+
+B006 Do not use mutable data structures for argument defaults
+  --> B006_5.py:67:49
+   |
+67 | def import_module_wrong(value: dict[str, str] = {}): import os
+   |                                                 ^^
+   |
+help: Replace with `None`; initialize within function
+
+B006 Do not use mutable data structures for argument defaults
+  --> B006_5.py:70:49
+   |
+70 | def import_module_wrong(value: dict[str, str] = {}): import os; import sys
+   |                                                 ^^
+   |
+help: Replace with `None`; initialize within function
+
+B006 Do not use mutable data structures for argument defaults
+  --> B006_5.py:73:49
+   |
+73 | def import_module_wrong(value: dict[str, str] = {}): \
+   |                                                 ^^
+74 |     import os
+   |
+help: Replace with `None`; initialize within function
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_6.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_6.py.snap
new file mode 100644
index 0000000000..40e631db6c
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_6.py.snap
@@ -0,0 +1,23 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_6.py:4:22
+  |
+2 | # Same as B006_2.py, but import instead of docstring
+3 |
+4 | def foobar(foor, bar={}):    
+  |                      ^^
+5 |     import os                    
+  |
+help: Replace with `None`; initialize within function
+1 | # Import followed by whitespace with no newline
+2 | # Same as B006_2.py, but import instead of docstring
+3 | 
+  - def foobar(foor, bar={}):    
+  -     import os                    
+4 + def foobar(foor, bar=None):    
+5 +     import os                    
+6 +     if bar is None:
+7 +         bar = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_7.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_7.py.snap
new file mode 100644
index 0000000000..b5dc7a5d76
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_7.py.snap
@@ -0,0 +1,23 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_7.py:4:22
+  |
+2 | # Same as B006_3.py, but import instead of docstring
+3 |
+4 | def foobar(foor, bar={}):    
+  |                      ^^
+5 |     import os
+  |
+help: Replace with `None`; initialize within function
+1 | # Import with no newline
+2 | # Same as B006_3.py, but import instead of docstring
+3 | 
+  - def foobar(foor, bar={}):    
+  -     import os
+4 + def foobar(foor, bar=None):    
+5 +     import os
+6 +     if bar is None:
+7 +         bar = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_8.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_8.py.snap
new file mode 100644
index 0000000000..f06b24cbab
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_8.py.snap
@@ -0,0 +1,92 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_8.py:1:19
+  |
+1 | def foo(a: list = []):
+  |                   ^^
+2 |     raise NotImplementedError("")
+  |
+help: Replace with `None`; initialize within function
+  - def foo(a: list = []):
+1 + def foo(a: list = None):
+2 |     raise NotImplementedError("")
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_8.py:5:19
+  |
+5 | def bar(a: dict = {}):
+  |                   ^^
+6 |     """ This one also has a docstring"""
+7 |     raise NotImplementedError("and has some text in here")
+  |
+help: Replace with `None`; initialize within function
+2 |     raise NotImplementedError("")
+3 | 
+4 | 
+  - def bar(a: dict = {}):
+5 + def bar(a: dict = None):
+6 |     """ This one also has a docstring"""
+7 |     raise NotImplementedError("and has some text in here")
+8 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_8.py:10:19
+   |
+10 | def baz(a: list = []):
+   |                   ^^
+11 |     """This one raises a different exception"""
+12 |     raise IndexError()
+   |
+help: Replace with `None`; initialize within function
+7  |     raise NotImplementedError("and has some text in here")
+8  | 
+9  | 
+   - def baz(a: list = []):
+10 + def baz(a: list = None):
+11 |     """This one raises a different exception"""
+12 +     if a is None:
+13 +         a = []
+14 |     raise IndexError()
+15 | 
+16 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_8.py:15:19
+   |
+15 | def qux(a: list = []):
+   |                   ^^
+16 |     raise NotImplementedError
+   |
+help: Replace with `None`; initialize within function
+12 |     raise IndexError()
+13 | 
+14 | 
+   - def qux(a: list = []):
+15 + def qux(a: list = None):
+16 |     raise NotImplementedError
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_8.py:19:20
+   |
+19 | def quux(a: list = []):
+   |                    ^^
+20 |     raise NotImplemented
+   |
+help: Replace with `None`; initialize within function
+16 |     raise NotImplementedError
+17 | 
+18 | 
+   - def quux(a: list = []):
+19 + def quux(a: list = None):
+20 |     raise NotImplemented
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_9.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_9.py.snap
new file mode 100644
index 0000000000..a94f89a9c5
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_9.py.snap
@@ -0,0 +1,99 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_9.py:1:10
+  |
+1 | def f1(x=([],)):
+  |          ^^^^^
+2 |     print(x)
+  |
+help: Replace with `None`; initialize within function
+  - def f1(x=([],)):
+1 + def f1(x=None):
+2 +     if x is None:
+3 +         x = ([],)
+4 |     print(x)
+5 | 
+6 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+ --> B006_9.py:5:10
+  |
+5 | def f2(x=(x for x in "x")):
+  |          ^^^^^^^^^^^^^^^^
+6 |     print(x)
+  |
+help: Replace with `None`; initialize within function
+2  |     print(x)
+3  | 
+4  | 
+   - def f2(x=(x for x in "x")):
+5  + def f2(x=None):
+6  +     if x is None:
+7  +         x = (x for x in "x")
+8  |     print(x)
+9  | 
+10 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_9.py:9:10
+   |
+ 9 | def f3(x=((x for x in "x"),)):
+   |          ^^^^^^^^^^^^^^^^^^^
+10 |     print(x)
+   |
+help: Replace with `None`; initialize within function
+6  |     print(x)
+7  | 
+8  | 
+   - def f3(x=((x for x in "x"),)):
+9  + def f3(x=None):
+10 +     if x is None:
+11 +         x = ((x for x in "x"),)
+12 |     print(x)
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_9.py:13:11
+   |
+13 | def f4(x=(z := [1, ])):
+   |           ^^^^^^^^^^
+14 |     print(x)
+   |
+help: Replace with `None`; initialize within function
+10 |     print(x)
+11 | 
+12 | 
+   - def f4(x=(z := [1, ])):
+13 + def f4(x=None):
+14 +     if x is None:
+15 +         x = (z := [1, ])
+16 |     print(x)
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_9.py:17:11
+   |
+17 | def f5(x=([1, ])):
+   |           ^^^^^
+18 |     print(x)
+   |
+help: Replace with `None`; initialize within function
+14 |     print(x)
+15 | 
+16 | 
+   - def f5(x=([1, ])):
+17 + def f5(x=None):
+18 +     if x is None:
+19 +         x = ([1, ])
+20 |     print(x)
+21 | 
+22 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_B008.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_B008.py.snap
new file mode 100644
index 0000000000..e3f42e2da7
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_B008.py.snap
@@ -0,0 +1,462 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:63:25
+   |
+63 | def this_is_wrong(value=[1, 2, 3]):
+   |                         ^^^^^^^^^
+64 |     ...
+   |
+help: Replace with `None`; initialize within function
+60 | # Flag mutable literals/comprehensions
+61 | 
+62 | 
+   - def this_is_wrong(value=[1, 2, 3]):
+63 + def this_is_wrong(value=None):
+64 |     ...
+65 | 
+66 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:67:30
+   |
+67 | def this_is_also_wrong(value={}):
+   |                              ^^
+68 |     ...
+   |
+help: Replace with `None`; initialize within function
+64 |     ...
+65 | 
+66 | 
+   - def this_is_also_wrong(value={}):
+67 + def this_is_also_wrong(value=None):
+68 |     ...
+69 | 
+70 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:73:52
+   |
+71 | class Foo:
+72 |     @staticmethod
+73 |     def this_is_also_wrong_and_more_indented(value={}):
+   |                                                    ^^
+74 |         pass
+   |
+help: Replace with `None`; initialize within function
+70 | 
+71 | class Foo:
+72 |     @staticmethod
+   -     def this_is_also_wrong_and_more_indented(value={}):
+73 +     def this_is_also_wrong_and_more_indented(value=None):
+74 |         pass
+75 | 
+76 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:77:31
+   |
+77 |   def multiline_arg_wrong(value={
+   |  _______________________________^
+78 | |
+79 | | }):
+   | |_^
+80 |       ...
+   |
+help: Replace with `None`; initialize within function
+74 |         pass
+75 | 
+76 | 
+   - def multiline_arg_wrong(value={
+   - 
+   - }):
+77 + def multiline_arg_wrong(value=None):
+78 |     ...
+79 | 
+80 | def single_line_func_wrong(value = {}): ...
+note: This is an unsafe fix and may change runtime behavior
+
+B006 Do not use mutable data structures for argument defaults
+  --> B006_B008.py:82:36
+   |
+80 |     ...
+81 |
+82 | def single_line_func_wrong(value = {}): ...
+   |                                    ^^
+   |
+help: Replace with `None`; initialize within function
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:85:20
+   |
+85 | def and_this(value=set()):
+   |                    ^^^^^
+86 |     ...
+   |
+help: Replace with `None`; initialize within function
+82 | def single_line_func_wrong(value = {}): ...
+83 | 
+84 | 
+   - def and_this(value=set()):
+85 + def and_this(value=None):
+86 |     ...
+87 | 
+88 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:89:20
+   |
+89 | def this_too(value=collections.OrderedDict()):
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^
+90 |     ...
+   |
+help: Replace with `None`; initialize within function
+86 |     ...
+87 | 
+88 | 
+   - def this_too(value=collections.OrderedDict()):
+89 + def this_too(value=None):
+90 |     ...
+91 | 
+92 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:93:32
+   |
+93 | async def async_this_too(value=collections.defaultdict()):
+   |                                ^^^^^^^^^^^^^^^^^^^^^^^^^
+94 |     ...
+   |
+help: Replace with `None`; initialize within function
+90 |     ...
+91 | 
+92 | 
+   - async def async_this_too(value=collections.defaultdict()):
+93 + async def async_this_too(value=None):
+94 |     ...
+95 | 
+96 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+  --> B006_B008.py:97:26
+   |
+97 | def dont_forget_me(value=collections.deque()):
+   |                          ^^^^^^^^^^^^^^^^^^^
+98 |     ...
+   |
+help: Replace with `None`; initialize within function
+94  |     ...
+95  | 
+96  | 
+    - def dont_forget_me(value=collections.deque()):
+97  + def dont_forget_me(value=None):
+98  |     ...
+99  | 
+100 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:102:46
+    |
+101 | # N.B. we're also flagging the function call in the comprehension
+102 | def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
+    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^
+103 |     pass
+    |
+help: Replace with `None`; initialize within function
+99  | 
+100 | 
+101 | # N.B. we're also flagging the function call in the comprehension
+    - def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
+102 + def list_comprehension_also_not_okay(default=None):
+103 |     pass
+104 | 
+105 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:106:46
+    |
+106 | def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
+    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+107 |     pass
+    |
+help: Replace with `None`; initialize within function
+103 |     pass
+104 | 
+105 | 
+    - def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
+106 + def dict_comprehension_also_not_okay(default=None):
+107 |     pass
+108 | 
+109 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:110:45
+    |
+110 | def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
+    |                                             ^^^^^^^^^^^^^^^^^^^^^^^^
+111 |     pass
+    |
+help: Replace with `None`; initialize within function
+107 |     pass
+108 | 
+109 | 
+    - def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
+110 + def set_comprehension_also_not_okay(default=None):
+111 |     pass
+112 | 
+113 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:114:33
+    |
+114 | def kwonlyargs_mutable(*, value=[]):
+    |                                 ^^
+115 |     ...
+    |
+help: Replace with `None`; initialize within function
+111 |     pass
+112 | 
+113 | 
+    - def kwonlyargs_mutable(*, value=[]):
+114 + def kwonlyargs_mutable(*, value=None):
+115 |     ...
+116 | 
+117 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:239:20
+    |
+237 | # B006 and B008
+238 | # We should handle arbitrary nesting of these B008.
+239 | def nested_combo(a=[float(3), dt.datetime.now()]):
+    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+240 |     pass
+    |
+help: Replace with `None`; initialize within function
+236 | 
+237 | # B006 and B008
+238 | # We should handle arbitrary nesting of these B008.
+    - def nested_combo(a=[float(3), dt.datetime.now()]):
+239 + def nested_combo(a=None):
+240 |     pass
+241 | 
+242 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:276:27
+    |
+275 | def mutable_annotations(
+276 |     a: list[int] | None = [],
+    |                           ^^
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+    |
+help: Replace with `None`; initialize within function
+273 | 
+274 | 
+275 | def mutable_annotations(
+    -     a: list[int] | None = [],
+276 +     a: list[int] | None = None,
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:277:35
+    |
+275 | def mutable_annotations(
+276 |     a: list[int] | None = [],
+277 |     b: Optional[Dict[int, int]] = {},
+    |                                   ^^
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+    |
+help: Replace with `None`; initialize within function
+274 | 
+275 | def mutable_annotations(
+276 |     a: list[int] | None = [],
+    -     b: Optional[Dict[int, int]] = {},
+277 +     b: Optional[Dict[int, int]] = None,
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+280 | ):
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:278:62
+    |
+276 |     a: list[int] | None = [],
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+    |                                                              ^^^^^
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+280 | ):
+    |
+help: Replace with `None`; initialize within function
+275 | def mutable_annotations(
+276 |     a: list[int] | None = [],
+277 |     b: Optional[Dict[int, int]] = {},
+    -     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+278 +     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = None,
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+280 | ):
+281 |     pass
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:279:80
+    |
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 |     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+    |                                                                                ^^^^^
+280 | ):
+281 |     pass
+    |
+help: Replace with `None`; initialize within function
+276 |     a: list[int] | None = [],
+277 |     b: Optional[Dict[int, int]] = {},
+278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+    -     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+279 +     d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = None,
+280 | ):
+281 |     pass
+282 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:284:52
+    |
+284 | def single_line_func_wrong(value: dict[str, str] = {}):
+    |                                                    ^^
+285 |     """Docstring"""
+    |
+help: Replace with `None`; initialize within function
+281 |     pass
+282 | 
+283 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+284 + def single_line_func_wrong(value: dict[str, str] = None):
+285 |     """Docstring"""
+286 | 
+287 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:288:52
+    |
+288 | def single_line_func_wrong(value: dict[str, str] = {}):
+    |                                                    ^^
+289 |     """Docstring"""
+290 |     ...
+    |
+help: Replace with `None`; initialize within function
+285 |     """Docstring"""
+286 | 
+287 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+288 + def single_line_func_wrong(value: dict[str, str] = None):
+289 |     """Docstring"""
+290 |     ...
+291 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:293:52
+    |
+293 | def single_line_func_wrong(value: dict[str, str] = {}):
+    |                                                    ^^
+294 |     """Docstring"""; ...
+    |
+help: Replace with `None`; initialize within function
+290 |     ...
+291 | 
+292 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+293 + def single_line_func_wrong(value: dict[str, str] = None):
+294 |     """Docstring"""; ...
+295 | 
+296 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:297:52
+    |
+297 | def single_line_func_wrong(value: dict[str, str] = {}):
+    |                                                    ^^
+298 |     """Docstring"""; \
+299 |         ...
+    |
+help: Replace with `None`; initialize within function
+294 |     """Docstring"""; ...
+295 | 
+296 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+297 + def single_line_func_wrong(value: dict[str, str] = None):
+298 |     """Docstring"""; \
+299 |         ...
+300 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:302:52
+    |
+302 |   def single_line_func_wrong(value: dict[str, str] = {
+    |  ____________________________________________________^
+303 | |     # This is a comment
+304 | | }):
+    | |_^
+305 |       """Docstring"""
+    |
+help: Replace with `None`; initialize within function
+299 |         ...
+300 | 
+301 | 
+    - def single_line_func_wrong(value: dict[str, str] = {
+    -     # This is a comment
+    - }):
+302 + def single_line_func_wrong(value: dict[str, str] = None):
+303 |     """Docstring"""
+304 | 
+305 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B006 Do not use mutable data structures for argument defaults
+   --> B006_B008.py:308:52
+    |
+308 | def single_line_func_wrong(value: dict[str, str] = {}) \
+    |                                                    ^^
+309 |     : \
+310 |     """Docstring"""
+    |
+help: Replace with `None`; initialize within function
+
+B006 [*] Do not use mutable data structures for argument defaults
+   --> B006_B008.py:313:52
+    |
+313 | def single_line_func_wrong(value: dict[str, str] = {}):
+    |                                                    ^^
+314 |     """Docstring without newline"""
+    |
+help: Replace with `None`; initialize within function
+310 |     """Docstring"""
+311 | 
+312 | 
+    - def single_line_func_wrong(value: dict[str, str] = {}):
+313 + def single_line_func_wrong(value: dict[str, str] = None):
+314 |     """Docstring without newline"""
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_0.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_0.py.snap
deleted file mode 100644
index 4c8bb4e6d6..0000000000
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_0.py.snap
+++ /dev/null
@@ -1,79 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
----
-B017 Do not assert blind exception: `Exception`
-  --> B017_0.py:23:14
-   |
-21 | class Foobar(unittest.TestCase):
-22 |     def evil_raises(self) -> None:
-23 |         with self.assertRaises(Exception):
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-24 |             raise Exception("Evil I say!")
-   |
-
-B017 Do not assert blind exception: `BaseException`
-  --> B017_0.py:27:14
-   |
-26 |     def also_evil_raises(self) -> None:
-27 |         with self.assertRaises(BaseException):
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-28 |             raise Exception("Evil I say!")
-   |
-
-B017 Do not assert blind exception: `Exception`
-  --> B017_0.py:45:10
-   |
-44 | def test_pytest_raises():
-45 |     with pytest.raises(Exception):
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^
-46 |         raise ValueError("Hello")
-   |
-
-B017 Do not assert blind exception: `Exception`
-  --> B017_0.py:48:10
-   |
-46 |         raise ValueError("Hello")
-47 |
-48 |     with pytest.raises(Exception), pytest.raises(ValueError):
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^
-49 |         raise ValueError("Hello")
-   |
-
-B017 Do not assert blind exception: `Exception`
-  --> B017_0.py:57:36
-   |
-55 |         raise ValueError("This is also fine")
-56 |
-57 |     with contextlib.nullcontext(), pytest.raises(Exception):
-   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^
-58 |         raise ValueError("Multiple context managers")
-   |
-
-B017 Do not assert blind exception: `Exception`
-  --> B017_0.py:62:10
-   |
-61 | def test_pytest_raises_keyword():
-62 |     with pytest.raises(expected_exception=Exception):
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-63 |         raise ValueError("Should be flagged")
-   |
-
-B017 Do not assert blind exception: `Exception`
-  --> B017_0.py:68:18
-   |
-66 |     class TestKwargs(unittest.TestCase):
-67 |         def test_method(self):
-68 |             with self.assertRaises(exception=Exception):
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-69 |                 raise ValueError("Should be flagged")
-   |
-
-B017 Do not assert blind exception: `BaseException`
-  --> B017_0.py:71:18
-   |
-69 |                 raise ValueError("Should be flagged")
-70 |
-71 |             with self.assertRaises(exception=BaseException):
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-72 |                 raise ValueError("Should be flagged")
-   |
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_1.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_1.py.snap
deleted file mode 100644
index 5b0767019c..0000000000
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_1.py.snap
+++ /dev/null
@@ -1,41 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
----
-B017 Do not assert blind exception: `Exception`
-  --> B017_1.py:20:9
-   |
-18 | class Foobar(unittest.TestCase):
-19 |     def call_form_raises(self) -> None:
-20 |         self.assertRaises(Exception, something_else)
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-21 |         self.assertRaises(BaseException, something_else)
-   |
-
-B017 Do not assert blind exception: `BaseException`
-  --> B017_1.py:21:9
-   |
-19 |     def call_form_raises(self) -> None:
-20 |         self.assertRaises(Exception, something_else)
-21 |         self.assertRaises(BaseException, something_else)
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-
-B017 Do not assert blind exception: `Exception`
-  --> B017_1.py:25:5
-   |
-24 | def test_pytest_call_form() -> None:
-25 |     pytest.raises(Exception, something_else)
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-26 |     pytest.raises(BaseException, something_else)
-   |
-
-B017 Do not assert blind exception: `BaseException`
-  --> B017_1.py:26:5
-   |
-24 | def test_pytest_call_form() -> None:
-25 |     pytest.raises(Exception, something_else)
-26 |     pytest.raises(BaseException, something_else)
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-27 |
-28 |     pytest.raises(Exception, something_else, match="hello")
-   |
diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B912_B912.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B912_B912.py.snap
new file mode 100644
index 0000000000..32047fa101
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B912_B912.py.snap
@@ -0,0 +1,163 @@
+---
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+---
+B912 [*] `map()` without an explicit `strict=` parameter
+ --> B912.py:5:1
+  |
+3 | # Errors
+4 | map(lambda x: x, [1, 2, 3])
+5 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 | map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+7 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+  |
+help: Add explicit value for parameter `strict=`
+2 | 
+3 | # Errors
+4 | map(lambda x: x, [1, 2, 3])
+  - map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+5 + map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], strict=False)
+6 | map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+7 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+8 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+ --> B912.py:6:1
+  |
+4 | map(lambda x: x, [1, 2, 3])
+5 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+6 | map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+8 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+  |
+help: Add explicit value for parameter `strict=`
+3 | # Errors
+4 | map(lambda x: x, [1, 2, 3])
+5 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+  - map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+6 + map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9], strict=False)
+7 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+8 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+9 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+ --> B912.py:7:1
+  |
+5 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+6 | map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+7 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+9 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+  |
+help: Add explicit value for parameter `strict=`
+4  | map(lambda x: x, [1, 2, 3])
+5  | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+6  | map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+   - map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+7  | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+8  + map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+9  | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+10 | 
+11 | # Errors (limited iterators).
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+  --> B912.py:9:1
+   |
+ 7 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+ 8 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+ 9 | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10 |
+11 | # Errors (limited iterators).
+   |
+help: Add explicit value for parameter `strict=`
+6  | map(lambda x, y, z: x + y + z, [1, 2, 3], [4, 5, 6], [7, 8, 9])
+7  | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]))
+8  | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9]), strict=False)
+   - map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+9  + map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True), strict=False)
+10 | 
+11 | # Errors (limited iterators).
+12 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1))
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+  --> B912.py:12:1
+   |
+11 | # Errors (limited iterators).
+12 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=4))
+   |
+help: Add explicit value for parameter `strict=`
+9  | map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], *map(lambda x: x, [7, 8, 9], strict=True))
+10 | 
+11 | # Errors (limited iterators).
+   - map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1))
+12 + map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1), strict=False)
+13 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=4))
+14 | 
+15 | import builtins
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+  --> B912.py:13:1
+   |
+11 | # Errors (limited iterators).
+12 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1))
+13 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=4))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14 |
+15 | import builtins
+   |
+help: Add explicit value for parameter `strict=`
+10 | 
+11 | # Errors (limited iterators).
+12 | map(lambda x, y: x + y, [1, 2, 3], repeat(1, 1))
+   - map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=4))
+13 + map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=4), strict=False)
+14 | 
+15 | import builtins
+16 | # Still an error even though it uses the qualified name
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+  --> B912.py:17:1
+   |
+15 | import builtins
+16 | # Still an error even though it uses the qualified name
+17 | builtins.map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18 |
+19 | # OK
+   |
+help: Add explicit value for parameter `strict=`
+14 | 
+15 | import builtins
+16 | # Still an error even though it uses the qualified name
+   - builtins.map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6])
+17 + builtins.map(lambda x, y: x + y, [1, 2, 3], [4, 5, 6], strict=False)
+18 | 
+19 | # OK
+20 | map(lambda x: x, [1, 2, 3], strict=True)
+note: This is an unsafe fix and may change runtime behavior
+
+B912 [*] `map()` without an explicit `strict=` parameter
+  --> B912.py:36:1
+   |
+35 | # Regression https://github.com/astral-sh/ruff/issues/20997
+36 | map(f, *lots_of_iterators)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Add explicit value for parameter `strict=`
+33 | map(lambda x, y: x + y, [1, 2, 3], count())
+34 | 
+35 | # Regression https://github.com/astral-sh/ruff/issues/20997
+   - map(f, *lots_of_iterators)
+36 + map(f, *lots_of_iterators, strict=False)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/mod.rs b/crates/ruff_linter/src/rules/flake8_builtins/mod.rs
index 6f863dc2e3..0ab2764765 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/mod.rs
@@ -10,11 +10,12 @@ mod tests {
     use anyhow::Result;
     use test_case::test_case;
 
-    use crate::assert_diagnostics;
     use crate::registry::Rule;
     use crate::rules::flake8_builtins;
     use crate::settings::LinterSettings;
+    use crate::settings::types::PreviewMode;
     use crate::test::{test_path, test_resource_path};
+    use crate::{assert_diagnostics, assert_diagnostics_diff};
     use ruff_python_ast::PythonVersion;
 
     #[test_case(Rule::BuiltinVariableShadowing, Path::new("A001.py"))]
@@ -63,6 +64,50 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::BuiltinAttributeShadowing, Path::new("A003.py"))]
+    fn deferred_annotations_diff(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "deferred_annotations_diff_{}_{}",
+            rule_code.name(),
+            path.to_string_lossy()
+        );
+        assert_diagnostics_diff!(
+            snapshot,
+            Path::new("flake8_builtins").join(path).as_path(),
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY313.into(),
+                ..LinterSettings::for_rule(rule_code)
+            },
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY314.into(),
+                ..LinterSettings::for_rule(rule_code)
+            },
+        );
+        Ok(())
+    }
+
+    #[test_case(Rule::BuiltinAttributeShadowing, Path::new("A003.py"))]
+    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "preview__{}_{}",
+            rule_code.noqa_code(),
+            path.to_string_lossy()
+        );
+        let diagnostics = test_path(
+            Path::new("flake8_builtins").join(path).as_path(),
+            &LinterSettings {
+                preview: PreviewMode::Enabled,
+                flake8_builtins: flake8_builtins::settings::Settings {
+                    strict_checking: true,
+                    ..Default::default()
+                },
+                ..LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
+
     #[test_case(
         Rule::StdlibModuleShadowing,
         Path::new("A005/modules/utils/logging.py"),
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs
index c600059c11..766e4b4561 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs
@@ -49,6 +49,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// - [_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)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.48")]
 pub(crate) struct BuiltinArgumentShadowing {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs
index b0e5c4979c..20f599484f 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs
@@ -6,6 +6,7 @@ use ruff_text_size::Ranged;
 
 use crate::Violation;
 use crate::checkers::ast::Checker;
+use crate::preview::is_a003_class_scope_shadowing_expansion_enabled;
 use crate::rules::flake8_builtins::helpers::shadows_builtin;
 
 /// ## What it does
@@ -56,6 +57,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ## Options
 /// - `lint.flake8-builtins.ignorelist`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.48")]
 pub(crate) struct BuiltinAttributeShadowing {
     kind: Kind,
     name: String,
@@ -123,16 +125,26 @@ pub(crate) fn builtin_attribute_shadowing(
             //     def repeat(value: int, times: int) -> list[int]:
             //         return [value] * times
             // ```
+            // In stable, only consider references whose first non-type parent scope is the class
+            // scope (e.g., decorators, default args, and attribute initializers).
+            // In preview, also consider references from within the class scope.
+            let consider_reference = |reference_scope_id: ScopeId| {
+                if is_a003_class_scope_shadowing_expansion_enabled(checker.settings()) {
+                    if reference_scope_id == scope_id {
+                        return true;
+                    }
+                }
+                checker
+                    .semantic()
+                    .first_non_type_parent_scope_id(reference_scope_id)
+                    == Some(scope_id)
+            };
+
             for reference in binding
                 .references
                 .iter()
                 .map(|reference_id| checker.semantic().reference(*reference_id))
-                .filter(|reference| {
-                    checker
-                        .semantic()
-                        .first_non_type_parent_scope_id(reference.scope_id())
-                        == Some(scope_id)
-                })
+                .filter(|reference| consider_reference(reference.scope_id()))
             {
                 checker.report_diagnostic(
                     BuiltinAttributeShadowing {
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_import_shadowing.rs b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_import_shadowing.rs
index 6dae6ea8bd..29bcf1d034 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_import_shadowing.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_import_shadowing.rs
@@ -41,6 +41,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// - `lint.flake8-builtins.ignorelist`
 /// - `target-version`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct BuiltinImportShadowing {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_lambda_argument_shadowing.rs b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_lambda_argument_shadowing.rs
index ef9ef4a5d0..b9314e842f 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_lambda_argument_shadowing.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_lambda_argument_shadowing.rs
@@ -21,6 +21,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ## Options
 /// - `lint.flake8-builtins.ignorelist`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct BuiltinLambdaArgumentShadowing {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs
index 31708157dd..5b8f937a2a 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs
@@ -44,6 +44,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ## References
 /// - [_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)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.48")]
 pub(crate) struct BuiltinVariableShadowing {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/rules/stdlib_module_shadowing.rs b/crates/ruff_linter/src/rules/flake8_builtins/rules/stdlib_module_shadowing.rs
index 66f9e6f657..55ea5e72d8 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/rules/stdlib_module_shadowing.rs
+++ b/crates/ruff_linter/src/rules/flake8_builtins/rules/stdlib_module_shadowing.rs
@@ -53,6 +53,7 @@ use crate::settings::LinterSettings;
 /// - `lint.flake8-builtins.allowed-modules`
 /// - `lint.flake8-builtins.strict-checking`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct StdlibModuleShadowing {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py.snap b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py.snap
index 1444cc7d6a..df35fcb66a 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py.snap
@@ -1,22 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
 ---
-A003 Python builtin is shadowed by method `str` from line 14
-  --> A003.py:17:31
-   |
-15 |         pass
-16 |
-17 |     def method_usage(self) -> str:
-   |                               ^^^
-18 |         pass
-   |
 
-A003 Python builtin is shadowed by class attribute `id` from line 3
-  --> A003.py:20:34
-   |
-18 |         pass
-19 |
-20 |     def attribute_usage(self) -> id:
-   |                                  ^^
-21 |         pass
-   |
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap
index ad43e1b0fc..df35fcb66a 100644
--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap
@@ -1,12 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
 ---
-A003 Python builtin is shadowed by method `str` from line 14
-  --> A003.py:17:31
-   |
-15 |         pass
-16 |
-17 |     def method_usage(self) -> str:
-   |                               ^^^
-18 |         pass
-   |
+
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__deferred_annotations_diff_builtin-attribute-shadowing_A003.py.snap b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__deferred_annotations_diff_builtin-attribute-shadowing_A003.py.snap
new file mode 100644
index 0000000000..ed283ed65a
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__deferred_annotations_diff_builtin-attribute-shadowing_A003.py.snap
@@ -0,0 +1,32 @@
+---
+source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
+---
+--- Linter settings ---
+-linter.unresolved_target_version = 3.13
++linter.unresolved_target_version = 3.14
+
+--- Summary ---
+Removed: 2
+Added: 0
+
+--- Removed ---
+A003 Python builtin is shadowed by method `str` from line 14
+  --> A003.py:17:31
+   |
+15 |         pass
+16 |
+17 |     def method_usage(self) -> str:
+   |                               ^^^
+18 |         pass
+   |
+
+
+A003 Python builtin is shadowed by class attribute `id` from line 3
+  --> A003.py:20:34
+   |
+18 |         pass
+19 |
+20 |     def attribute_usage(self) -> id:
+   |                                  ^^
+21 |         pass
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__preview__A003_A003.py.snap b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__preview__A003_A003.py.snap
new file mode 100644
index 0000000000..537a64433c
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linter__rules__flake8_builtins__tests__preview__A003_A003.py.snap
@@ -0,0 +1,30 @@
+---
+source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
+---
+A003 Python builtin is shadowed by method `property` from line 26
+  --> A003.py:31:7
+   |
+29 |     id = 1
+30 |
+31 |     @[property][0]
+   |       ^^^^^^^^
+32 |     def f(self, x=[id]):
+33 |         return x
+   |
+
+A003 Python builtin is shadowed by class attribute `id` from line 29
+  --> A003.py:32:20
+   |
+31 |     @[property][0]
+32 |     def f(self, x=[id]):
+   |                    ^^
+33 |         return x
+   |
+
+A003 Python builtin is shadowed by class attribute `bin` from line 35
+  --> A003.py:36:12
+   |
+35 |     bin = 2
+36 |     foo = [bin]
+   |            ^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_commas/mod.rs b/crates/ruff_linter/src/rules/flake8_commas/mod.rs
index 97010705a7..54f225de81 100644
--- a/crates/ruff_linter/src/rules/flake8_commas/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_commas/mod.rs
@@ -27,23 +27,4 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
-
-    #[test_case(Path::new("COM81.py"))]
-    #[test_case(Path::new("COM81_syntax_error.py"))]
-    fn preview_rules(path: &Path) -> Result<()> {
-        let snapshot = format!("preview__{}", path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("flake8_commas").join(path).as_path(),
-            &settings::LinterSettings {
-                preview: crate::settings::types::PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rules(vec![
-                    Rule::MissingTrailingComma,
-                    Rule::TrailingCommaOnBareTuple,
-                    Rule::ProhibitedTrailingComma,
-                ])
-            },
-        )?;
-        assert_diagnostics!(snapshot, diagnostics);
-        Ok(())
-    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_commas/rules/trailing_commas.rs b/crates/ruff_linter/src/rules/flake8_commas/rules/trailing_commas.rs
index b75ccc157d..220c15fbed 100644
--- a/crates/ruff_linter/src/rules/flake8_commas/rules/trailing_commas.rs
+++ b/crates/ruff_linter/src/rules/flake8_commas/rules/trailing_commas.rs
@@ -5,8 +5,6 @@ use ruff_text_size::{Ranged, TextRange};
 
 use crate::Locator;
 use crate::checkers::ast::LintContext;
-use crate::preview::is_trailing_comma_type_params_enabled;
-use crate::settings::LinterSettings;
 use crate::{AlwaysFixableViolation, Violation};
 use crate::{Edit, Fix};
 
@@ -155,6 +153,7 @@ impl Context {
 ///
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.223")]
 pub(crate) struct MissingTrailingComma;
 
 impl AlwaysFixableViolation for MissingTrailingComma {
@@ -200,6 +199,7 @@ impl AlwaysFixableViolation for MissingTrailingComma {
 /// foo = (json.dumps({"bar": 1}),)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.223")]
 pub(crate) struct TrailingCommaOnBareTuple;
 
 impl Violation for TrailingCommaOnBareTuple {
@@ -232,6 +232,7 @@ impl Violation for TrailingCommaOnBareTuple {
 ///
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.223")]
 pub(crate) struct ProhibitedTrailingComma;
 
 impl AlwaysFixableViolation for ProhibitedTrailingComma {
@@ -252,23 +253,23 @@ pub(crate) fn trailing_commas(
     locator: &Locator,
     indexer: &Indexer,
 ) {
-    let mut fstrings = 0u32;
+    let mut interpolated_strings = 0u32;
     let simple_tokens = tokens.iter().filter_map(|token| {
         match token.kind() {
             // Completely ignore comments -- they just interfere with the logic.
             TokenKind::Comment => None,
-            // F-strings are handled as `String` token type with the complete range
-            // of the outermost f-string. This means that the expression inside the
-            // f-string is not checked for trailing commas.
-            TokenKind::FStringStart => {
-                fstrings = fstrings.saturating_add(1);
+            // F-strings and t-strings are handled as `String` token type with the complete range
+            // of the outermost interpolated string. This means that the expression inside the
+            // interpolated string is not checked for trailing commas.
+            TokenKind::FStringStart | TokenKind::TStringStart => {
+                interpolated_strings = interpolated_strings.saturating_add(1);
                 None
             }
-            TokenKind::FStringEnd => {
-                fstrings = fstrings.saturating_sub(1);
-                if fstrings == 0 {
+            TokenKind::FStringEnd | TokenKind::TStringEnd => {
+                interpolated_strings = interpolated_strings.saturating_sub(1);
+                if interpolated_strings == 0 {
                     indexer
-                        .fstring_ranges()
+                        .interpolated_string_ranges()
                         .outermost(token.start())
                         .map(|range| SimpleToken::new(TokenType::String, range))
                 } else {
@@ -276,7 +277,7 @@ pub(crate) fn trailing_commas(
                 }
             }
             _ => {
-                if fstrings == 0 {
+                if interpolated_strings == 0 {
                     Some(SimpleToken::from(token.as_tuple()))
                 } else {
                     None
@@ -298,7 +299,7 @@ pub(crate) fn trailing_commas(
         }
 
         // Update the comma context stack.
-        let context = update_context(token, prev, prev_prev, &mut stack, lint_context.settings());
+        let context = update_context(token, prev, prev_prev, &mut stack);
 
         check_token(token, prev, prev_prev, context, locator, lint_context);
 
@@ -364,8 +365,7 @@ fn check_token(
         if let Some(mut diagnostic) =
             lint_context.report_diagnostic_if_enabled(ProhibitedTrailingComma, prev.range())
         {
-            let range = diagnostic.expect_range();
-            diagnostic.set_fix(Fix::safe_edit(Edit::range_deletion(range)));
+            diagnostic.set_fix(Fix::safe_edit(Edit::range_deletion(prev.range)));
             return;
         }
     }
@@ -417,7 +417,6 @@ fn update_context(
     prev: SimpleToken,
     prev_prev: SimpleToken,
     stack: &mut Vec<Context>,
-    settings: &LinterSettings,
 ) -> Context {
     let new_context = match token.ty {
         TokenType::OpeningBracket => match (prev.ty, prev_prev.ty) {
@@ -427,19 +426,11 @@ fn update_context(
             }
             _ => Context::new(ContextType::Tuple),
         },
-        TokenType::OpeningSquareBracket if is_trailing_comma_type_params_enabled(settings) => {
-            match (prev.ty, prev_prev.ty) {
-                (TokenType::Named, TokenType::Def | TokenType::Class | TokenType::Type) => {
-                    Context::new(ContextType::TypeParameters)
-                }
-                (TokenType::ClosingBracket | TokenType::Named | TokenType::String, _) => {
-                    Context::new(ContextType::Subscript)
-                }
-                _ => Context::new(ContextType::List),
+        TokenType::OpeningSquareBracket => match (prev.ty, prev_prev.ty) {
+            (TokenType::Named, TokenType::Def | TokenType::Class | TokenType::Type) => {
+                Context::new(ContextType::TypeParameters)
             }
-        }
-        TokenType::OpeningSquareBracket => match prev.ty {
-            TokenType::ClosingBracket | TokenType::Named | TokenType::String => {
+            (TokenType::ClosingBracket | TokenType::Named | TokenType::String, _) => {
                 Context::new(ContextType::Subscript)
             }
             _ => Context::new(ContextType::List),
diff --git a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap
index f34fdab573..cc315df9bb 100644
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap
@@ -12,16 +12,14 @@ COM812 [*] Trailing comma missing
 6 | # ==> bad_list.py <==
   |
 help: Add trailing comma
-
-ℹ Safe fix
-1 1 | # ==> bad_function_call.py <==
-2 2 | bad_function_call(
-3 3 |     param1='test',
-4   |-    param2='test'
-  4 |+    param2='test',
-5 5 | )
-6 6 | # ==> bad_list.py <==
-7 7 | bad_list = [
+1 | # ==> bad_function_call.py <==
+2 | bad_function_call(
+3 |     param1='test',
+  -     param2='test'
+4 +     param2='test',
+5 | )
+6 | # ==> bad_list.py <==
+7 | bad_list = [
 
 COM812 [*] Trailing comma missing
   --> COM81.py:10:6
@@ -33,16 +31,14 @@ COM812 [*] Trailing comma missing
 11 | ]
    |
 help: Add trailing comma
-
-ℹ Safe fix
-7  7  | bad_list = [
-8  8  |     1,
-9  9  |     2,
-10    |-    3
-   10 |+    3,
-11 11 | ]
-12 12 | 
-13 13 | bad_list_with_comment = [
+7  | bad_list = [
+8  |     1,
+9  |     2,
+   -     3
+10 +     3,
+11 | ]
+12 | 
+13 | bad_list_with_comment = [
 
 COM812 [*] Trailing comma missing
   --> COM81.py:16:6
@@ -55,16 +51,14 @@ COM812 [*] Trailing comma missing
 18 | ]
    |
 help: Add trailing comma
-
-ℹ Safe fix
-13 13 | bad_list_with_comment = [
-14 14 |     1,
-15 15 |     2,
-16    |-    3
-   16 |+    3,
-17 17 |     # still needs a comma!
-18 18 | ]
-19 19 | 
+13 | bad_list_with_comment = [
+14 |     1,
+15 |     2,
+   -     3
+16 +     3,
+17 |     # still needs a comma!
+18 | ]
+19 | 
 
 COM812 [*] Trailing comma missing
   --> COM81.py:23:6
@@ -75,16 +69,14 @@ COM812 [*] Trailing comma missing
    |      ^
    |
 help: Add trailing comma
-
-ℹ Safe fix
-20 20 | bad_list_with_extra_empty = [
-21 21 |     1,
-22 22 |     2,
-23    |-    3
-   23 |+    3,
-24 24 | 
-25 25 | 
-26 26 | 
+20 | bad_list_with_extra_empty = [
+21 |     1,
+22 |     2,
+   -     3
+23 +     3,
+24 | 
+25 | 
+26 | 
 
 COM818 Trailing comma on bare tuple prohibited
   --> COM81.py:36:8
@@ -170,16 +162,14 @@ COM812 [*] Trailing comma missing
 71 | )
    |
 help: Add trailing comma
-
-ℹ Safe fix
-67 67 |     pass
-68 68 | 
-69 69 | {'foo': foo}['foo'](
-70    |-    bar
-   70 |+    bar,
-71 71 | )
-72 72 | 
-73 73 | {'foo': foo}['foo'](
+67 |     pass
+68 | 
+69 | {'foo': foo}['foo'](
+   -     bar
+70 +     bar,
+71 | )
+72 | 
+73 | {'foo': foo}['foo'](
 
 COM812 [*] Trailing comma missing
   --> COM81.py:78:8
@@ -190,16 +180,14 @@ COM812 [*] Trailing comma missing
 79 | )
    |
 help: Add trailing comma
-
-ℹ Safe fix
-75 75 | )
-76 76 | 
-77 77 | (foo)(
-78    |-    bar
-   78 |+    bar,
-79 79 | )
-80 80 | 
-81 81 | (foo)[0](
+75 | )
+76 | 
+77 | (foo)(
+   -     bar
+78 +     bar,
+79 | )
+80 | 
+81 | (foo)[0](
 
 COM812 [*] Trailing comma missing
   --> COM81.py:86:8
@@ -210,16 +198,14 @@ COM812 [*] Trailing comma missing
 87 | )
    |
 help: Add trailing comma
-
-ℹ Safe fix
-83 83 | )
-84 84 | 
-85 85 | [foo][0](
-86    |-    bar
-   86 |+    bar,
-87 87 | )
-88 88 | 
-89 89 | [foo][0](
+83 | )
+84 | 
+85 | [foo][0](
+   -     bar
+86 +     bar,
+87 | )
+88 | 
+89 | [foo][0](
 
 COM812 [*] Trailing comma missing
    --> COM81.py:152:6
@@ -231,16 +217,14 @@ COM812 [*] Trailing comma missing
 153 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-149 149 | 
-150 150 | # ==> keyword_before_parenth_form/base_bad.py <==
-151 151 | from x import (
-152     |-    y
-    152 |+    y,
-153 153 | )
-154 154 | 
-155 155 | assert(
+149 | 
+150 | # ==> keyword_before_parenth_form/base_bad.py <==
+151 | from x import (
+    -     y
+152 +     y,
+153 | )
+154 | 
+155 | assert(
 
 COM812 [*] Trailing comma missing
    --> COM81.py:158:11
@@ -252,16 +236,14 @@ COM812 [*] Trailing comma missing
 159 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-155 155 | assert(
-156 156 |     SyntaxWarning,
-157 157 |     ThrownHere,
-158     |-    Anyway
-    158 |+    Anyway,
-159 159 | )
-160 160 | 
-161 161 | # async await is fine outside an async def
+155 | assert(
+156 |     SyntaxWarning,
+157 |     ThrownHere,
+    -     Anyway
+158 +     Anyway,
+159 | )
+160 | 
+161 | # async await is fine outside an async def
 
 COM812 [*] Trailing comma missing
    --> COM81.py:293:15
@@ -274,16 +256,14 @@ COM812 [*] Trailing comma missing
 295 | # ==> multiline_bad_function_def.py <==
     |
 help: Add trailing comma
-
-ℹ Safe fix
-290 290 | 
-291 291 | # ==> multiline_bad_dict.py <==
-292 292 | multiline_bad_dict = {
-293     |-    "bad": 123
-    293 |+    "bad": 123,
-294 294 | }
-295 295 | # ==> multiline_bad_function_def.py <==
-296 296 | def func_good(
+290 | 
+291 | # ==> multiline_bad_dict.py <==
+292 | multiline_bad_dict = {
+    -     "bad": 123
+293 +     "bad": 123,
+294 | }
+295 | # ==> multiline_bad_function_def.py <==
+296 | def func_good(
 
 COM812 [*] Trailing comma missing
    --> COM81.py:304:14
@@ -296,16 +276,14 @@ COM812 [*] Trailing comma missing
 306 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-301 301 | 
-302 302 | def func_bad(
-303 303 |         a = 3,
-304     |-        b = 2
-    304 |+        b = 2,
-305 305 |     ):
-306 306 |     pass
-307 307 | 
+301 | 
+302 | def func_bad(
+303 |         a = 3,
+    -         b = 2
+304 +         b = 2,
+305 |     ):
+306 |     pass
+307 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:310:14
@@ -318,16 +296,14 @@ COM812 [*] Trailing comma missing
 312 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-307 307 | 
-308 308 | # ==> multiline_bad_function_one_param.py <==
-309 309 | def func(
-310     |-        a = 3
-    310 |+        a = 3,
-311 311 |     ):
-312 312 |     pass
-313 313 | 
+307 | 
+308 | # ==> multiline_bad_function_one_param.py <==
+309 | def func(
+    -         a = 3
+310 +         a = 3,
+311 |     ):
+312 |     pass
+313 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:316:10
@@ -338,16 +314,14 @@ COM812 [*] Trailing comma missing
 317 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-313 313 | 
-314 314 | 
-315 315 | func(
-316     |-    a = 3
-    316 |+    a = 3,
-317 317 | )
-318 318 | 
-319 319 | # ==> multiline_bad_or_dict.py <==
+313 | 
+314 | 
+315 | func(
+    -     a = 3
+316 +     a = 3,
+317 | )
+318 | 
+319 | # ==> multiline_bad_or_dict.py <==
 
 COM812 [*] Trailing comma missing
    --> COM81.py:322:15
@@ -359,16 +333,14 @@ COM812 [*] Trailing comma missing
 323 | }
     |
 help: Add trailing comma
-
-ℹ Safe fix
-319 319 | # ==> multiline_bad_or_dict.py <==
-320 320 | multiline_bad_or_dict = {
-321 321 |     "good": True or False,
-322     |-    "bad": 123
-    322 |+    "bad": 123,
-323 323 | }
-324 324 | 
-325 325 | # ==> multiline_good_dict.py <==
+319 | # ==> multiline_bad_or_dict.py <==
+320 | multiline_bad_or_dict = {
+321 |     "good": True or False,
+    -     "bad": 123
+322 +     "bad": 123,
+323 | }
+324 | 
+325 | # ==> multiline_good_dict.py <==
 
 COM812 [*] Trailing comma missing
    --> COM81.py:368:15
@@ -380,16 +352,14 @@ COM812 [*] Trailing comma missing
 369 | ]
     |
 help: Add trailing comma
-
-ℹ Safe fix
-365 365 | 
-366 366 | multiline_index_access[
-367 367 |     "probably fine",
-368     |-    "not good"
-    368 |+    "not good",
-369 369 | ]
-370 370 | 
-371 371 | multiline_index_access[
+365 | 
+366 | multiline_index_access[
+367 |     "probably fine",
+    -     "not good"
+368 +     "not good",
+369 | ]
+370 | 
+371 | multiline_index_access[
 
 COM812 [*] Trailing comma missing
    --> COM81.py:375:15
@@ -401,16 +371,14 @@ COM812 [*] Trailing comma missing
 376 | ]
     |
 help: Add trailing comma
-
-ℹ Safe fix
-372 372 |     "fine",
-373 373 |     "fine",
-374 374 |     :
-375     |-    "not good"
-    375 |+    "not good",
-376 376 | ]
-377 377 | 
-378 378 | # ==> multiline_string.py <==
+372 |     "fine",
+373 |     "fine",
+374 |     :
+    -     "not good"
+375 +     "not good",
+376 | ]
+377 | 
+378 | # ==> multiline_string.py <==
 
 COM812 [*] Trailing comma missing
    --> COM81.py:404:15
@@ -422,16 +390,14 @@ COM812 [*] Trailing comma missing
 405 | ]
     |
 help: Add trailing comma
-
-ℹ Safe fix
-401 401 |     "fine",
-402 402 |     "fine"
-403 403 |     :
-404     |-    "not fine"
-    404 |+    "not fine",
-405 405 | ]
-406 406 | 
-407 407 | multiline_index_access[
+401 |     "fine",
+402 |     "fine"
+403 |     :
+    -     "not fine"
+404 +     "not fine",
+405 | ]
+406 | 
+407 | multiline_index_access[
 
 COM812 [*] Trailing comma missing
    --> COM81.py:432:15
@@ -443,16 +409,14 @@ COM812 [*] Trailing comma missing
 433 | ]
     |
 help: Add trailing comma
-
-ℹ Safe fix
-429 429 |     "fine"
-430 430 |     :
-431 431 |     "fine",
-432     |-    "not fine"
-    432 |+    "not fine",
-433 433 | ]
-434 434 | 
-435 435 | multiline_index_access[
+429 |     "fine"
+430 |     :
+431 |     "fine",
+    -     "not fine"
+432 +     "not fine",
+433 | ]
+434 | 
+435 | multiline_index_access[
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:485:21
@@ -464,16 +428,14 @@ COM819 [*] Trailing comma prohibited
 487 | bar = { a: b,}
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-482 482 | )
-483 483 | 
-484 484 | # ==> prohibited.py <==
-485     |-foo = ['a', 'b', 'c',]
-    485 |+foo = ['a', 'b', 'c']
-486 486 | 
-487 487 | bar = { a: b,}
-488 488 | 
+482 | )
+483 | 
+484 | # ==> prohibited.py <==
+    - foo = ['a', 'b', 'c',]
+485 + foo = ['a', 'b', 'c']
+486 | 
+487 | bar = { a: b,}
+488 | 
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:487:13
@@ -486,16 +448,14 @@ COM819 [*] Trailing comma prohibited
 489 | def bah(ham, spam,):
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-484 484 | # ==> prohibited.py <==
-485 485 | foo = ['a', 'b', 'c',]
-486 486 | 
-487     |-bar = { a: b,}
-    487 |+bar = { a: b}
-488 488 | 
-489 489 | def bah(ham, spam,):
-490 490 |     pass
+484 | # ==> prohibited.py <==
+485 | foo = ['a', 'b', 'c',]
+486 | 
+    - bar = { a: b,}
+487 + bar = { a: b}
+488 | 
+489 | def bah(ham, spam,):
+490 |     pass
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:489:18
@@ -507,16 +467,14 @@ COM819 [*] Trailing comma prohibited
 490 |     pass
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-486 486 | 
-487 487 | bar = { a: b,}
-488 488 | 
-489     |-def bah(ham, spam,):
-    489 |+def bah(ham, spam):
-490 490 |     pass
-491 491 | 
-492 492 | (0,)
+486 | 
+487 | bar = { a: b,}
+488 | 
+    - def bah(ham, spam,):
+489 + def bah(ham, spam):
+490 |     pass
+491 | 
+492 | (0,)
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:494:6
@@ -529,16 +487,14 @@ COM819 [*] Trailing comma prohibited
 496 | foo = ['a', 'b', 'c', ]
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-491 491 | 
-492 492 | (0,)
-493 493 | 
-494     |-(0, 1,)
-    494 |+(0, 1)
-495 495 | 
-496 496 | foo = ['a', 'b', 'c', ]
-497 497 | 
+491 | 
+492 | (0,)
+493 | 
+    - (0, 1,)
+494 + (0, 1)
+495 | 
+496 | foo = ['a', 'b', 'c', ]
+497 | 
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:496:21
@@ -551,16 +507,14 @@ COM819 [*] Trailing comma prohibited
 498 | bar = { a: b, }
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-493 493 | 
-494 494 | (0, 1,)
-495 495 | 
-496     |-foo = ['a', 'b', 'c', ]
-    496 |+foo = ['a', 'b', 'c' ]
-497 497 | 
-498 498 | bar = { a: b, }
-499 499 | 
+493 | 
+494 | (0, 1,)
+495 | 
+    - foo = ['a', 'b', 'c', ]
+496 + foo = ['a', 'b', 'c' ]
+497 | 
+498 | bar = { a: b, }
+499 | 
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:498:13
@@ -573,16 +527,14 @@ COM819 [*] Trailing comma prohibited
 500 | def bah(ham, spam, ):
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-495 495 | 
-496 496 | foo = ['a', 'b', 'c', ]
-497 497 | 
-498     |-bar = { a: b, }
-    498 |+bar = { a: b }
-499 499 | 
-500 500 | def bah(ham, spam, ):
-501 501 |     pass
+495 | 
+496 | foo = ['a', 'b', 'c', ]
+497 | 
+    - bar = { a: b, }
+498 + bar = { a: b }
+499 | 
+500 | def bah(ham, spam, ):
+501 |     pass
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:500:18
@@ -594,16 +546,14 @@ COM819 [*] Trailing comma prohibited
 501 |     pass
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-497 497 | 
-498 498 | bar = { a: b, }
-499 499 | 
-500     |-def bah(ham, spam, ):
-    500 |+def bah(ham, spam ):
-501 501 |     pass
-502 502 | 
-503 503 | (0, )
+497 | 
+498 | bar = { a: b, }
+499 | 
+    - def bah(ham, spam, ):
+500 + def bah(ham, spam ):
+501 |     pass
+502 | 
+503 | (0, )
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:505:6
@@ -616,16 +566,14 @@ COM819 [*] Trailing comma prohibited
 507 | image[:, :, 0]
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-502 502 | 
-503 503 | (0, )
-504 504 | 
-505     |-(0, 1, )
-    505 |+(0, 1 )
-506 506 | 
-507 507 | image[:, :, 0]
-508 508 | 
+502 | 
+503 | (0, )
+504 | 
+    - (0, 1, )
+505 + (0, 1 )
+506 | 
+507 | image[:, :, 0]
+508 | 
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:511:10
@@ -638,16 +586,14 @@ COM819 [*] Trailing comma prohibited
 513 | lambda x, : x
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-508 508 | 
-509 509 | image[:,]
-510 510 | 
-511     |-image[:,:,]
-    511 |+image[:,:]
-512 512 | 
-513 513 | lambda x, : x
-514 514 | 
+508 | 
+509 | image[:,]
+510 | 
+    - image[:,:,]
+511 + image[:,:]
+512 | 
+513 | lambda x, : x
+514 | 
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:513:9
@@ -660,16 +606,14 @@ COM819 [*] Trailing comma prohibited
 515 | # ==> unpack.py <==
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-510 510 | 
-511 511 | image[:,:,]
-512 512 | 
-513     |-lambda x, : x
-    513 |+lambda x : x
-514 514 | 
-515 515 | # ==> unpack.py <==
-516 516 | def function(
+510 | 
+511 | image[:,:,]
+512 | 
+    - lambda x, : x
+513 + lambda x : x
+514 | 
+515 | # ==> unpack.py <==
+516 | def function(
 
 COM812 [*] Trailing comma missing
    --> COM81.py:519:13
@@ -682,16 +626,14 @@ COM812 [*] Trailing comma missing
 521 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-516 516 | def function(
-517 517 |     foo,
-518 518 |     bar,
-519     |-    **kwargs
-    519 |+    **kwargs,
-520 520 | ):
-521 521 |     pass
-522 522 | 
+516 | def function(
+517 |     foo,
+518 |     bar,
+    -     **kwargs
+519 +     **kwargs,
+520 | ):
+521 |     pass
+522 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:526:10
@@ -704,16 +646,14 @@ COM812 [*] Trailing comma missing
 528 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-523 523 | def function(
-524 524 |     foo,
-525 525 |     bar,
-526     |-    *args
-    526 |+    *args,
-527 527 | ):
-528 528 |     pass
-529 529 | 
+523 | def function(
+524 |     foo,
+525 |     bar,
+    -     *args
+526 +     *args,
+527 | ):
+528 |     pass
+529 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:534:16
@@ -726,16 +666,14 @@ COM812 [*] Trailing comma missing
 536 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-531 531 |     foo,
-532 532 |     bar,
-533 533 |     *args,
-534     |-    extra_kwarg
-    534 |+    extra_kwarg,
-535 535 |     ):
-536 536 |     pass
-537 537 | 
+531 |     foo,
+532 |     bar,
+533 |     *args,
+    -     extra_kwarg
+534 +     extra_kwarg,
+535 |     ):
+536 |     pass
+537 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:541:13
@@ -747,16 +685,14 @@ COM812 [*] Trailing comma missing
 542 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-538 538 | result = function(
-539 539 |     foo,
-540 540 |     bar,
-541     |-    **kwargs
-    541 |+    **kwargs,
-542 542 | )
-543 543 | 
-544 544 | result = function(
+538 | result = function(
+539 |     foo,
+540 |     bar,
+    -     **kwargs
+541 +     **kwargs,
+542 | )
+543 | 
+544 | result = function(
 
 COM812 [*] Trailing comma missing
    --> COM81.py:547:24
@@ -768,16 +704,14 @@ COM812 [*] Trailing comma missing
 548 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-544 544 | result = function(
-545 545 |     foo,
-546 546 |     bar,
-547     |-    **not_called_kwargs
-    547 |+    **not_called_kwargs,
-548 548 | )
-549 549 | 
-550 550 | def foo(
+544 | result = function(
+545 |     foo,
+546 |     bar,
+    -     **not_called_kwargs
+547 +     **not_called_kwargs,
+548 | )
+549 | 
+550 | def foo(
 
 COM812 [*] Trailing comma missing
    --> COM81.py:554:15
@@ -790,16 +724,14 @@ COM812 [*] Trailing comma missing
 556 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-551 551 |     ham,
-552 552 |     spam,
-553 553 |     *args,
-554     |-    kwarg_only
-    554 |+    kwarg_only,
-555 555 |     ):
-556 556 |     pass
-557 557 | 
+551 |     ham,
+552 |     spam,
+553 |     *args,
+    -     kwarg_only
+554 +     kwarg_only,
+555 |     ):
+556 |     pass
+557 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:561:13
@@ -810,16 +742,14 @@ COM812 [*] Trailing comma missing
 562 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-558 558 | # In python 3.5 if it's not a function def, commas are mandatory.
-559 559 | 
-560 560 | foo(
-561     |-    **kwargs
-    561 |+    **kwargs,
-562 562 | )
-563 563 | 
-564 564 | {
+558 | # In python 3.5 if it's not a function def, commas are mandatory.
+559 | 
+560 | foo(
+    -     **kwargs
+561 +     **kwargs,
+562 | )
+563 | 
+564 | {
 
 COM812 [*] Trailing comma missing
    --> COM81.py:565:13
@@ -830,16 +760,14 @@ COM812 [*] Trailing comma missing
 566 | }
     |
 help: Add trailing comma
-
-ℹ Safe fix
-562 562 | )
-563 563 | 
-564 564 | {
-565     |-    **kwargs
-    565 |+    **kwargs,
-566 566 | }
-567 567 | 
-568 568 | {
+562 | )
+563 | 
+564 | {
+    -     **kwargs
+565 +     **kwargs,
+566 | }
+567 | 
+568 | {
 
 COM812 [*] Trailing comma missing
    --> COM81.py:569:10
@@ -850,16 +778,14 @@ COM812 [*] Trailing comma missing
 570 | }
     |
 help: Add trailing comma
-
-ℹ Safe fix
-566 566 | }
-567 567 | 
-568 568 | {
-569     |-    *args
-    569 |+    *args,
-570 570 | }
-571 571 | 
-572 572 | [
+566 | }
+567 | 
+568 | {
+    -     *args
+569 +     *args,
+570 | }
+571 | 
+572 | [
 
 COM812 [*] Trailing comma missing
    --> COM81.py:573:10
@@ -870,16 +796,14 @@ COM812 [*] Trailing comma missing
 574 | ]
     |
 help: Add trailing comma
-
-ℹ Safe fix
-570 570 | }
-571 571 | 
-572 572 | [
-573     |-    *args
-    573 |+    *args,
-574 574 | ]
-575 575 | 
-576 576 | def foo(
+570 | }
+571 | 
+572 | [
+    -     *args
+573 +     *args,
+574 | ]
+575 | 
+576 | def foo(
 
 COM812 [*] Trailing comma missing
    --> COM81.py:579:10
@@ -892,16 +816,14 @@ COM812 [*] Trailing comma missing
 581 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-576 576 | def foo(
-577 577 |     ham,
-578 578 |     spam,
-579     |-    *args
-    579 |+    *args,
-580 580 |     ):
-581 581 |     pass
-582 582 | 
+576 | def foo(
+577 |     ham,
+578 |     spam,
+    -     *args
+579 +     *args,
+580 |     ):
+581 |     pass
+582 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:586:13
@@ -914,16 +836,14 @@ COM812 [*] Trailing comma missing
 588 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-583 583 | def foo(
-584 584 |     ham,
-585 585 |     spam,
-586     |-    **kwargs
-    586 |+    **kwargs,
-587 587 |     ):
-588 588 |     pass
-589 589 | 
+583 | def foo(
+584 |     ham,
+585 |     spam,
+    -     **kwargs
+586 +     **kwargs,
+587 |     ):
+588 |     pass
+589 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:594:15
@@ -936,16 +856,14 @@ COM812 [*] Trailing comma missing
 596 |     pass
     |
 help: Add trailing comma
-
-ℹ Safe fix
-591 591 |     ham,
-592 592 |     spam,
-593 593 |     *args,
-594     |-    kwarg_only
-    594 |+    kwarg_only,
-595 595 |     ):
-596 596 |     pass
-597 597 | 
+591 |     ham,
+592 |     spam,
+593 |     *args,
+    -     kwarg_only
+594 +     kwarg_only,
+595 |     ):
+596 |     pass
+597 | 
 
 COM812 [*] Trailing comma missing
    --> COM81.py:623:20
@@ -957,16 +875,14 @@ COM812 [*] Trailing comma missing
 624 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-620 620 | result = function(
-621 621 |     foo,
-622 622 |     bar,
-623     |-    **{'ham': spam}
-    623 |+    **{'ham': spam},
-624 624 | )
-625 625 | 
-626 626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
+620 | result = function(
+621 |     foo,
+622 |     bar,
+    -     **{'ham': spam}
+623 +     **{'ham': spam},
+624 | )
+625 | 
+626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
 
 COM812 [*] Trailing comma missing
    --> COM81.py:628:42
@@ -978,16 +894,14 @@ COM812 [*] Trailing comma missing
 629 | )
     |
 help: Add trailing comma
-
-ℹ Safe fix
-625 625 | 
-626 626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
-627 627 | the_first_one = next(
-628     |-    (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
-    628 |+    (i for i in range(10) if i // 2 == 0),  # COM812 fix should include the final bracket
-629 629 | )
-630 630 | 
-631 631 | foo = namedtuple(
+625 | 
+626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
+627 | the_first_one = next(
+    -     (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
+628 +     (i for i in range(10) if i // 2 == 0),  # COM812 fix should include the final bracket
+629 | )
+630 | 
+631 | foo = namedtuple(
 
 COM819 [*] Trailing comma prohibited
    --> COM81.py:640:46
@@ -999,16 +913,14 @@ COM819 [*] Trailing comma prohibited
 642 | raise Exception(
     |
 help: Remove trailing comma
-
-ℹ Safe fix
-637 637 | )
-638 638 | 
-639 639 | # F-strings
-640     |-kwargs.pop("remove", f"this {trailing_comma}",)
-    640 |+kwargs.pop("remove", f"this {trailing_comma}")
-641 641 | 
-642 642 | raise Exception(
-643 643 |     "first", extra=f"Add trailing comma here ->"
+637 | )
+638 | 
+639 | # F-strings
+    - kwargs.pop("remove", f"this {trailing_comma}",)
+640 + kwargs.pop("remove", f"this {trailing_comma}")
+641 | 
+642 | raise Exception(
+643 |     "first", extra=f"Add trailing comma here ->"
 
 COM812 [*] Trailing comma missing
    --> COM81.py:643:49
@@ -1019,13 +931,165 @@ COM812 [*] Trailing comma missing
 644 | )
     |
 help: Add trailing comma
+640 | kwargs.pop("remove", f"this {trailing_comma}",)
+641 | 
+642 | raise Exception(
+    -     "first", extra=f"Add trailing comma here ->"
+643 +     "first", extra=f"Add trailing comma here ->",
+644 | )
+645 | 
+646 | assert False, f"<- This is not a trailing comma"
 
-ℹ Safe fix
-640 640 | kwargs.pop("remove", f"this {trailing_comma}",)
-641 641 | 
-642 642 | raise Exception(
-643     |-    "first", extra=f"Add trailing comma here ->"
-    643 |+    "first", extra=f"Add trailing comma here ->",
-644 644 | )
-645 645 | 
-646 646 | assert False, f"<- This is not a trailing comma"
+COM812 [*] Trailing comma missing
+   --> COM81.py:655:6
+    |
+654 | type X[
+655 |     T
+    |      ^
+656 | ] = T
+657 | def f[
+    |
+help: Add trailing comma
+652 | }"""
+653 | 
+654 | type X[
+    -     T
+655 +     T,
+656 | ] = T
+657 | def f[
+658 |     T
+
+COM812 [*] Trailing comma missing
+   --> COM81.py:658:6
+    |
+656 | ] = T
+657 | def f[
+658 |     T
+    |      ^
+659 | ](): pass
+660 | class C[
+    |
+help: Add trailing comma
+655 |     T
+656 | ] = T
+657 | def f[
+    -     T
+658 +     T,
+659 | ](): pass
+660 | class C[
+661 |     T
+
+COM812 [*] Trailing comma missing
+   --> COM81.py:661:6
+    |
+659 | ](): pass
+660 | class C[
+661 |     T
+    |      ^
+662 | ]: pass
+    |
+help: Add trailing comma
+658 |     T
+659 | ](): pass
+660 | class C[
+    -     T
+661 +     T,
+662 | ]: pass
+663 | 
+664 | type X[T,] = T
+
+COM819 [*] Trailing comma prohibited
+   --> COM81.py:664:9
+    |
+662 | ]: pass
+663 |
+664 | type X[T,] = T
+    |         ^
+665 | def f[T,](): pass
+666 | class C[T,]: pass
+    |
+help: Remove trailing comma
+661 |     T
+662 | ]: pass
+663 | 
+    - type X[T,] = T
+664 + type X[T] = T
+665 | def f[T,](): pass
+666 | class C[T,]: pass
+667 | 
+
+COM819 [*] Trailing comma prohibited
+   --> COM81.py:665:8
+    |
+664 | type X[T,] = T
+665 | def f[T,](): pass
+    |        ^
+666 | class C[T,]: pass
+    |
+help: Remove trailing comma
+662 | ]: pass
+663 | 
+664 | type X[T,] = T
+    - def f[T,](): pass
+665 + def f[T](): pass
+666 | class C[T,]: pass
+667 | 
+668 | # t-string examples
+
+COM819 [*] Trailing comma prohibited
+   --> COM81.py:666:10
+    |
+664 | type X[T,] = T
+665 | def f[T,](): pass
+666 | class C[T,]: pass
+    |          ^
+667 |
+668 | # t-string examples
+    |
+help: Remove trailing comma
+663 | 
+664 | type X[T,] = T
+665 | def f[T,](): pass
+    - class C[T,]: pass
+666 + class C[T]: pass
+667 | 
+668 | # t-string examples
+669 | kwargs.pop("remove", t"this {trailing_comma}",)
+
+COM819 [*] Trailing comma prohibited
+   --> COM81.py:669:46
+    |
+668 | # t-string examples
+669 | kwargs.pop("remove", t"this {trailing_comma}",)
+    |                                              ^
+670 | kwargs.pop("remove", t"this {f"{trailing_comma}"}",)
+    |
+help: Remove trailing comma
+666 | class C[T,]: pass
+667 | 
+668 | # t-string examples
+    - kwargs.pop("remove", t"this {trailing_comma}",)
+669 + kwargs.pop("remove", t"this {trailing_comma}")
+670 | kwargs.pop("remove", t"this {f"{trailing_comma}"}",)
+671 | 
+672 | t"""This is a test. {
+
+COM819 [*] Trailing comma prohibited
+   --> COM81.py:670:51
+    |
+668 | # t-string examples
+669 | kwargs.pop("remove", t"this {trailing_comma}",)
+670 | kwargs.pop("remove", t"this {f"{trailing_comma}"}",)
+    |                                                   ^
+671 |
+672 | t"""This is a test. {
+    |
+help: Remove trailing comma
+667 | 
+668 | # t-string examples
+669 | kwargs.pop("remove", t"this {trailing_comma}",)
+    - kwargs.pop("remove", t"this {f"{trailing_comma}"}",)
+670 + kwargs.pop("remove", t"this {f"{trailing_comma}"}")
+671 | 
+672 | t"""This is a test. {
+673 |     "Another sentence."
diff --git a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview__COM81.py.snap b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview__COM81.py.snap
deleted file mode 100644
index 209e784a94..0000000000
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview__COM81.py.snap
+++ /dev/null
@@ -1,1151 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_commas/mod.rs
----
-COM812 [*] Trailing comma missing
- --> COM81.py:4:18
-  |
-2 | bad_function_call(
-3 |     param1='test',
-4 |     param2='test'
-  |                  ^
-5 | )
-6 | # ==> bad_list.py <==
-  |
-help: Add trailing comma
-
-ℹ Safe fix
-1 1 | # ==> bad_function_call.py <==
-2 2 | bad_function_call(
-3 3 |     param1='test',
-4   |-    param2='test'
-  4 |+    param2='test',
-5 5 | )
-6 6 | # ==> bad_list.py <==
-7 7 | bad_list = [
-
-COM812 [*] Trailing comma missing
-  --> COM81.py:10:6
-   |
- 8 |     1,
- 9 |     2,
-10 |     3
-   |      ^
-11 | ]
-   |
-help: Add trailing comma
-
-ℹ Safe fix
-7  7  | bad_list = [
-8  8  |     1,
-9  9  |     2,
-10    |-    3
-   10 |+    3,
-11 11 | ]
-12 12 | 
-13 13 | bad_list_with_comment = [
-
-COM812 [*] Trailing comma missing
-  --> COM81.py:16:6
-   |
-14 |     1,
-15 |     2,
-16 |     3
-   |      ^
-17 |     # still needs a comma!
-18 | ]
-   |
-help: Add trailing comma
-
-ℹ Safe fix
-13 13 | bad_list_with_comment = [
-14 14 |     1,
-15 15 |     2,
-16    |-    3
-   16 |+    3,
-17 17 |     # still needs a comma!
-18 18 | ]
-19 19 | 
-
-COM812 [*] Trailing comma missing
-  --> COM81.py:23:6
-   |
-21 |     1,
-22 |     2,
-23 |     3
-   |      ^
-   |
-help: Add trailing comma
-
-ℹ Safe fix
-20 20 | bad_list_with_extra_empty = [
-21 21 |     1,
-22 22 |     2,
-23    |-    3
-   23 |+    3,
-24 24 | 
-25 25 | 
-26 26 | 
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:36:8
-   |
-34 | foo = (1,)
-35 |
-36 | foo = 1,
-   |        ^
-37 |
-38 | bar = 1; foo = bar,
-   |
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:38:19
-   |
-36 | foo = 1,
-37 |
-38 | bar = 1; foo = bar,
-   |                   ^
-39 |
-40 | foo = (
-   |
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:45:8
-   |
-43 | )
-44 |
-45 | foo = 3,
-   |        ^
-46 |
-47 | class A(object):
-   |
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:49:10
-   |
-47 | class A(object):
-48 |  foo = 3
-49 |  bar = 10,
-   |          ^
-50 |  foo_bar = 2
-   |
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:56:32
-   |
-54 | from foo import bar, baz
-55 |
-56 | group_by = function_call('arg'),
-   |                                ^
-57 |
-58 | group_by = ('foobar' * 3),
-   |
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:58:26
-   |
-56 | group_by = function_call('arg'),
-57 |
-58 | group_by = ('foobar' * 3),
-   |                          ^
-59 |
-60 | def foo():
-   |
-
-COM818 Trailing comma on bare tuple prohibited
-  --> COM81.py:61:17
-   |
-60 | def foo():
-61 |     return False,
-   |                 ^
-62 |
-63 | # ==> callable_before_parenth_form.py <==
-   |
-
-COM812 [*] Trailing comma missing
-  --> COM81.py:70:8
-   |
-69 | {'foo': foo}['foo'](
-70 |     bar
-   |        ^
-71 | )
-   |
-help: Add trailing comma
-
-ℹ Safe fix
-67 67 |     pass
-68 68 | 
-69 69 | {'foo': foo}['foo'](
-70    |-    bar
-   70 |+    bar,
-71 71 | )
-72 72 | 
-73 73 | {'foo': foo}['foo'](
-
-COM812 [*] Trailing comma missing
-  --> COM81.py:78:8
-   |
-77 | (foo)(
-78 |     bar
-   |        ^
-79 | )
-   |
-help: Add trailing comma
-
-ℹ Safe fix
-75 75 | )
-76 76 | 
-77 77 | (foo)(
-78    |-    bar
-   78 |+    bar,
-79 79 | )
-80 80 | 
-81 81 | (foo)[0](
-
-COM812 [*] Trailing comma missing
-  --> COM81.py:86:8
-   |
-85 | [foo][0](
-86 |     bar
-   |        ^
-87 | )
-   |
-help: Add trailing comma
-
-ℹ Safe fix
-83 83 | )
-84 84 | 
-85 85 | [foo][0](
-86    |-    bar
-   86 |+    bar,
-87 87 | )
-88 88 | 
-89 89 | [foo][0](
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:152:6
-    |
-150 | # ==> keyword_before_parenth_form/base_bad.py <==
-151 | from x import (
-152 |     y
-    |      ^
-153 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-149 149 | 
-150 150 | # ==> keyword_before_parenth_form/base_bad.py <==
-151 151 | from x import (
-152     |-    y
-    152 |+    y,
-153 153 | )
-154 154 | 
-155 155 | assert(
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:158:11
-    |
-156 |     SyntaxWarning,
-157 |     ThrownHere,
-158 |     Anyway
-    |           ^
-159 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-155 155 | assert(
-156 156 |     SyntaxWarning,
-157 157 |     ThrownHere,
-158     |-    Anyway
-    158 |+    Anyway,
-159 159 | )
-160 160 | 
-161 161 | # async await is fine outside an async def
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:293:15
-    |
-291 | # ==> multiline_bad_dict.py <==
-292 | multiline_bad_dict = {
-293 |     "bad": 123
-    |               ^
-294 | }
-295 | # ==> multiline_bad_function_def.py <==
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-290 290 | 
-291 291 | # ==> multiline_bad_dict.py <==
-292 292 | multiline_bad_dict = {
-293     |-    "bad": 123
-    293 |+    "bad": 123,
-294 294 | }
-295 295 | # ==> multiline_bad_function_def.py <==
-296 296 | def func_good(
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:304:14
-    |
-302 | def func_bad(
-303 |         a = 3,
-304 |         b = 2
-    |              ^
-305 |     ):
-306 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-301 301 | 
-302 302 | def func_bad(
-303 303 |         a = 3,
-304     |-        b = 2
-    304 |+        b = 2,
-305 305 |     ):
-306 306 |     pass
-307 307 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:310:14
-    |
-308 | # ==> multiline_bad_function_one_param.py <==
-309 | def func(
-310 |         a = 3
-    |              ^
-311 |     ):
-312 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-307 307 | 
-308 308 | # ==> multiline_bad_function_one_param.py <==
-309 309 | def func(
-310     |-        a = 3
-    310 |+        a = 3,
-311 311 |     ):
-312 312 |     pass
-313 313 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:316:10
-    |
-315 | func(
-316 |     a = 3
-    |          ^
-317 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-313 313 | 
-314 314 | 
-315 315 | func(
-316     |-    a = 3
-    316 |+    a = 3,
-317 317 | )
-318 318 | 
-319 319 | # ==> multiline_bad_or_dict.py <==
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:322:15
-    |
-320 | multiline_bad_or_dict = {
-321 |     "good": True or False,
-322 |     "bad": 123
-    |               ^
-323 | }
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-319 319 | # ==> multiline_bad_or_dict.py <==
-320 320 | multiline_bad_or_dict = {
-321 321 |     "good": True or False,
-322     |-    "bad": 123
-    322 |+    "bad": 123,
-323 323 | }
-324 324 | 
-325 325 | # ==> multiline_good_dict.py <==
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:368:15
-    |
-366 | multiline_index_access[
-367 |     "probably fine",
-368 |     "not good"
-    |               ^
-369 | ]
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-365 365 | 
-366 366 | multiline_index_access[
-367 367 |     "probably fine",
-368     |-    "not good"
-    368 |+    "not good",
-369 369 | ]
-370 370 | 
-371 371 | multiline_index_access[
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:375:15
-    |
-373 |     "fine",
-374 |     :
-375 |     "not good"
-    |               ^
-376 | ]
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-372 372 |     "fine",
-373 373 |     "fine",
-374 374 |     :
-375     |-    "not good"
-    375 |+    "not good",
-376 376 | ]
-377 377 | 
-378 378 | # ==> multiline_string.py <==
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:404:15
-    |
-402 |     "fine"
-403 |     :
-404 |     "not fine"
-    |               ^
-405 | ]
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-401 401 |     "fine",
-402 402 |     "fine"
-403 403 |     :
-404     |-    "not fine"
-    404 |+    "not fine",
-405 405 | ]
-406 406 | 
-407 407 | multiline_index_access[
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:432:15
-    |
-430 |     :
-431 |     "fine",
-432 |     "not fine"
-    |               ^
-433 | ]
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-429 429 |     "fine"
-430 430 |     :
-431 431 |     "fine",
-432     |-    "not fine"
-    432 |+    "not fine",
-433 433 | ]
-434 434 | 
-435 435 | multiline_index_access[
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:485:21
-    |
-484 | # ==> prohibited.py <==
-485 | foo = ['a', 'b', 'c',]
-    |                     ^
-486 |
-487 | bar = { a: b,}
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-482 482 | )
-483 483 | 
-484 484 | # ==> prohibited.py <==
-485     |-foo = ['a', 'b', 'c',]
-    485 |+foo = ['a', 'b', 'c']
-486 486 | 
-487 487 | bar = { a: b,}
-488 488 | 
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:487:13
-    |
-485 | foo = ['a', 'b', 'c',]
-486 |
-487 | bar = { a: b,}
-    |             ^
-488 |
-489 | def bah(ham, spam,):
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-484 484 | # ==> prohibited.py <==
-485 485 | foo = ['a', 'b', 'c',]
-486 486 | 
-487     |-bar = { a: b,}
-    487 |+bar = { a: b}
-488 488 | 
-489 489 | def bah(ham, spam,):
-490 490 |     pass
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:489:18
-    |
-487 | bar = { a: b,}
-488 |
-489 | def bah(ham, spam,):
-    |                  ^
-490 |     pass
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-486 486 | 
-487 487 | bar = { a: b,}
-488 488 | 
-489     |-def bah(ham, spam,):
-    489 |+def bah(ham, spam):
-490 490 |     pass
-491 491 | 
-492 492 | (0,)
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:494:6
-    |
-492 | (0,)
-493 |
-494 | (0, 1,)
-    |      ^
-495 |
-496 | foo = ['a', 'b', 'c', ]
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-491 491 | 
-492 492 | (0,)
-493 493 | 
-494     |-(0, 1,)
-    494 |+(0, 1)
-495 495 | 
-496 496 | foo = ['a', 'b', 'c', ]
-497 497 | 
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:496:21
-    |
-494 | (0, 1,)
-495 |
-496 | foo = ['a', 'b', 'c', ]
-    |                     ^
-497 |
-498 | bar = { a: b, }
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-493 493 | 
-494 494 | (0, 1,)
-495 495 | 
-496     |-foo = ['a', 'b', 'c', ]
-    496 |+foo = ['a', 'b', 'c' ]
-497 497 | 
-498 498 | bar = { a: b, }
-499 499 | 
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:498:13
-    |
-496 | foo = ['a', 'b', 'c', ]
-497 |
-498 | bar = { a: b, }
-    |             ^
-499 |
-500 | def bah(ham, spam, ):
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-495 495 | 
-496 496 | foo = ['a', 'b', 'c', ]
-497 497 | 
-498     |-bar = { a: b, }
-    498 |+bar = { a: b }
-499 499 | 
-500 500 | def bah(ham, spam, ):
-501 501 |     pass
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:500:18
-    |
-498 | bar = { a: b, }
-499 |
-500 | def bah(ham, spam, ):
-    |                  ^
-501 |     pass
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-497 497 | 
-498 498 | bar = { a: b, }
-499 499 | 
-500     |-def bah(ham, spam, ):
-    500 |+def bah(ham, spam ):
-501 501 |     pass
-502 502 | 
-503 503 | (0, )
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:505:6
-    |
-503 | (0, )
-504 |
-505 | (0, 1, )
-    |      ^
-506 |
-507 | image[:, :, 0]
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-502 502 | 
-503 503 | (0, )
-504 504 | 
-505     |-(0, 1, )
-    505 |+(0, 1 )
-506 506 | 
-507 507 | image[:, :, 0]
-508 508 | 
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:511:10
-    |
-509 | image[:,]
-510 |
-511 | image[:,:,]
-    |          ^
-512 |
-513 | lambda x, : x
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-508 508 | 
-509 509 | image[:,]
-510 510 | 
-511     |-image[:,:,]
-    511 |+image[:,:]
-512 512 | 
-513 513 | lambda x, : x
-514 514 | 
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:513:9
-    |
-511 | image[:,:,]
-512 |
-513 | lambda x, : x
-    |         ^
-514 |
-515 | # ==> unpack.py <==
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-510 510 | 
-511 511 | image[:,:,]
-512 512 | 
-513     |-lambda x, : x
-    513 |+lambda x : x
-514 514 | 
-515 515 | # ==> unpack.py <==
-516 516 | def function(
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:519:13
-    |
-517 |     foo,
-518 |     bar,
-519 |     **kwargs
-    |             ^
-520 | ):
-521 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-516 516 | def function(
-517 517 |     foo,
-518 518 |     bar,
-519     |-    **kwargs
-    519 |+    **kwargs,
-520 520 | ):
-521 521 |     pass
-522 522 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:526:10
-    |
-524 |     foo,
-525 |     bar,
-526 |     *args
-    |          ^
-527 | ):
-528 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-523 523 | def function(
-524 524 |     foo,
-525 525 |     bar,
-526     |-    *args
-    526 |+    *args,
-527 527 | ):
-528 528 |     pass
-529 529 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:534:16
-    |
-532 |     bar,
-533 |     *args,
-534 |     extra_kwarg
-    |                ^
-535 |     ):
-536 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-531 531 |     foo,
-532 532 |     bar,
-533 533 |     *args,
-534     |-    extra_kwarg
-    534 |+    extra_kwarg,
-535 535 |     ):
-536 536 |     pass
-537 537 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:541:13
-    |
-539 |     foo,
-540 |     bar,
-541 |     **kwargs
-    |             ^
-542 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-538 538 | result = function(
-539 539 |     foo,
-540 540 |     bar,
-541     |-    **kwargs
-    541 |+    **kwargs,
-542 542 | )
-543 543 | 
-544 544 | result = function(
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:547:24
-    |
-545 |     foo,
-546 |     bar,
-547 |     **not_called_kwargs
-    |                        ^
-548 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-544 544 | result = function(
-545 545 |     foo,
-546 546 |     bar,
-547     |-    **not_called_kwargs
-    547 |+    **not_called_kwargs,
-548 548 | )
-549 549 | 
-550 550 | def foo(
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:554:15
-    |
-552 |     spam,
-553 |     *args,
-554 |     kwarg_only
-    |               ^
-555 |     ):
-556 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-551 551 |     ham,
-552 552 |     spam,
-553 553 |     *args,
-554     |-    kwarg_only
-    554 |+    kwarg_only,
-555 555 |     ):
-556 556 |     pass
-557 557 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:561:13
-    |
-560 | foo(
-561 |     **kwargs
-    |             ^
-562 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-558 558 | # In python 3.5 if it's not a function def, commas are mandatory.
-559 559 | 
-560 560 | foo(
-561     |-    **kwargs
-    561 |+    **kwargs,
-562 562 | )
-563 563 | 
-564 564 | {
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:565:13
-    |
-564 | {
-565 |     **kwargs
-    |             ^
-566 | }
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-562 562 | )
-563 563 | 
-564 564 | {
-565     |-    **kwargs
-    565 |+    **kwargs,
-566 566 | }
-567 567 | 
-568 568 | {
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:569:10
-    |
-568 | {
-569 |     *args
-    |          ^
-570 | }
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-566 566 | }
-567 567 | 
-568 568 | {
-569     |-    *args
-    569 |+    *args,
-570 570 | }
-571 571 | 
-572 572 | [
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:573:10
-    |
-572 | [
-573 |     *args
-    |          ^
-574 | ]
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-570 570 | }
-571 571 | 
-572 572 | [
-573     |-    *args
-    573 |+    *args,
-574 574 | ]
-575 575 | 
-576 576 | def foo(
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:579:10
-    |
-577 |     ham,
-578 |     spam,
-579 |     *args
-    |          ^
-580 |     ):
-581 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-576 576 | def foo(
-577 577 |     ham,
-578 578 |     spam,
-579     |-    *args
-    579 |+    *args,
-580 580 |     ):
-581 581 |     pass
-582 582 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:586:13
-    |
-584 |     ham,
-585 |     spam,
-586 |     **kwargs
-    |             ^
-587 |     ):
-588 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-583 583 | def foo(
-584 584 |     ham,
-585 585 |     spam,
-586     |-    **kwargs
-    586 |+    **kwargs,
-587 587 |     ):
-588 588 |     pass
-589 589 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:594:15
-    |
-592 |     spam,
-593 |     *args,
-594 |     kwarg_only
-    |               ^
-595 |     ):
-596 |     pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-591 591 |     ham,
-592 592 |     spam,
-593 593 |     *args,
-594     |-    kwarg_only
-    594 |+    kwarg_only,
-595 595 |     ):
-596 596 |     pass
-597 597 | 
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:623:20
-    |
-621 |     foo,
-622 |     bar,
-623 |     **{'ham': spam}
-    |                    ^
-624 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-620 620 | result = function(
-621 621 |     foo,
-622 622 |     bar,
-623     |-    **{'ham': spam}
-    623 |+    **{'ham': spam},
-624 624 | )
-625 625 | 
-626 626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:628:42
-    |
-626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
-627 | the_first_one = next(
-628 |     (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
-    |                                          ^
-629 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-625 625 | 
-626 626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
-627 627 | the_first_one = next(
-628     |-    (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
-    628 |+    (i for i in range(10) if i // 2 == 0),  # COM812 fix should include the final bracket
-629 629 | )
-630 630 | 
-631 631 | foo = namedtuple(
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:640:46
-    |
-639 | # F-strings
-640 | kwargs.pop("remove", f"this {trailing_comma}",)
-    |                                              ^
-641 |
-642 | raise Exception(
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-637 637 | )
-638 638 | 
-639 639 | # F-strings
-640     |-kwargs.pop("remove", f"this {trailing_comma}",)
-    640 |+kwargs.pop("remove", f"this {trailing_comma}")
-641 641 | 
-642 642 | raise Exception(
-643 643 |     "first", extra=f"Add trailing comma here ->"
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:643:49
-    |
-642 | raise Exception(
-643 |     "first", extra=f"Add trailing comma here ->"
-    |                                                 ^
-644 | )
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-640 640 | kwargs.pop("remove", f"this {trailing_comma}",)
-641 641 | 
-642 642 | raise Exception(
-643     |-    "first", extra=f"Add trailing comma here ->"
-    643 |+    "first", extra=f"Add trailing comma here ->",
-644 644 | )
-645 645 | 
-646 646 | assert False, f"<- This is not a trailing comma"
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:655:6
-    |
-654 | type X[
-655 |     T
-    |      ^
-656 | ] = T
-657 | def f[
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-652 652 | }"""
-653 653 | 
-654 654 | type X[
-655     |-    T
-    655 |+    T,
-656 656 | ] = T
-657 657 | def f[
-658 658 |     T
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:658:6
-    |
-656 | ] = T
-657 | def f[
-658 |     T
-    |      ^
-659 | ](): pass
-660 | class C[
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-655 655 |     T
-656 656 | ] = T
-657 657 | def f[
-658     |-    T
-    658 |+    T,
-659 659 | ](): pass
-660 660 | class C[
-661 661 |     T
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:661:6
-    |
-659 | ](): pass
-660 | class C[
-661 |     T
-    |      ^
-662 | ]: pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-658 658 |     T
-659 659 | ](): pass
-660 660 | class C[
-661     |-    T
-    661 |+    T,
-662 662 | ]: pass
-663 663 | 
-664 664 | type X[T,] = T
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:664:9
-    |
-662 | ]: pass
-663 |
-664 | type X[T,] = T
-    |         ^
-665 | def f[T,](): pass
-666 | class C[T,]: pass
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-661 661 |     T
-662 662 | ]: pass
-663 663 | 
-664     |-type X[T,] = T
-    664 |+type X[T] = T
-665 665 | def f[T,](): pass
-666 666 | class C[T,]: pass
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:665:8
-    |
-664 | type X[T,] = T
-665 | def f[T,](): pass
-    |        ^
-666 | class C[T,]: pass
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-662 662 | ]: pass
-663 663 | 
-664 664 | type X[T,] = T
-665     |-def f[T,](): pass
-    665 |+def f[T](): pass
-666 666 | class C[T,]: pass
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:666:10
-    |
-664 | type X[T,] = T
-665 | def f[T,](): pass
-666 | class C[T,]: pass
-    |          ^
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-663 663 | 
-664 664 | type X[T,] = T
-665 665 | def f[T,](): pass
-666     |-class C[T,]: pass
-    666 |+class C[T]: pass
diff --git a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview__COM81_syntax_error.py.snap b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview__COM81_syntax_error.py.snap
deleted file mode 100644
index be64c5452f..0000000000
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview__COM81_syntax_error.py.snap
+++ /dev/null
@@ -1,33 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_commas/mod.rs
----
-invalid-syntax: Starred expression cannot be used here
- --> COM81_syntax_error.py:3:5
-  |
-1 | # Check for `flake8-commas` violation for a file containing syntax errors.
-2 | (
-3 |     *args
-  |     ^^^^^
-4 | )
-  |
-
-invalid-syntax: Type parameter list cannot be empty
- --> COM81_syntax_error.py:6:9
-  |
-4 | )
-5 |
-6 | def foo[(param1='test', param2='test',):
-  |         ^
-7 |     pass
-  |
-
-COM819 Trailing comma prohibited
- --> COM81_syntax_error.py:6:38
-  |
-4 | )
-5 |
-6 | def foo[(param1='test', param2='test',):
-  |                                      ^
-7 |     pass
-  |
-help: Remove trailing comma
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
index 08395c5ea3..a36ef72ec0 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
@@ -32,13 +32,17 @@ use crate::rules::flake8_comprehensions::fixes;
 /// ```
 ///
 /// ## Fix safety
-/// This rule's fix is marked as unsafe, as `reversed()` and `reverse=True` will
-/// yield different results in the event of custom sort keys or equality
-/// functions. Specifically, `reversed()` will reverse the order of the
-/// collection, while `sorted()` with `reverse=True` will perform a stable
+/// This rule's fix is marked as unsafe for `reversed()` cases, as `reversed()`
+/// and `reverse=True` will yield different results in the event of custom sort
+/// keys or equality functions. Specifically, `reversed()` will reverse the order
+/// of the collection, while `sorted()` with `reverse=True` will perform a stable
 /// reverse sort, which will preserve the order of elements that compare as
 /// equal.
+///
+/// The fix is marked as safe for `list()` cases, as removing `list()` around
+/// `sorted()` does not change the behavior.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.73")]
 pub(crate) struct UnnecessaryCallAroundSorted {
     func: UnnecessaryFunction,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
index ac9f666410..ca01f07e54 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
@@ -40,6 +40,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## Options
 /// - `lint.flake8-comprehensions.allow-dict-calls-with-keyword-arguments`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct UnnecessaryCollectionCall {
     kind: Collection,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs
index 558f2ace4f..f384b32e6e 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs
@@ -57,6 +57,7 @@ use crate::rules::flake8_comprehensions::fixes;
 ///
 /// Additionally, this fix may drop comments when rewriting the comprehension.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.73")]
 pub(crate) struct UnnecessaryComprehension {
     kind: ComprehensionKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_in_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_in_call.rs
index 6565131796..5be7f7f974 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_in_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_in_call.rs
@@ -67,6 +67,7 @@ use crate::{Edit, Fix, Violation};
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct UnnecessaryComprehensionInCall {
     comprehension_kind: ComprehensionKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs
index 0ae136c25e..09c0c3dcbd 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs
@@ -49,6 +49,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `dict.fromkeys`](https://docs.python.org/3/library/stdtypes.html#dict.fromkeys)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct UnnecessaryDictComprehensionForIterable {
     is_value_none_literal: bool,
 }
@@ -209,18 +210,18 @@ fn fix_unnecessary_dict_comprehension(value: &Expr, generator: &Comprehension) -
         },
         keywords: Box::from([]),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     Expr::Call(ExprCall {
         func: Box::new(Expr::Name(ExprName {
             id: "dict.fromkeys".into(),
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })),
         arguments: args,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     })
 }
 
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
index c0811cdb06..8a94a0f423 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
@@ -48,6 +48,7 @@ use crate::rules::flake8_comprehensions::fixes;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UnnecessaryDoubleCastOrProcess {
     inner: String,
     outer: String,
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs
index 7cf15ff401..547f5bd8e0 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs
@@ -32,6 +32,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct UnnecessaryGeneratorDict;
 
 impl AlwaysFixableViolation for UnnecessaryGeneratorDict {
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
index eba4c76c60..d2b088fadf 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
@@ -42,6 +42,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct UnnecessaryGeneratorList {
     short_circuit: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs
index 0cbad1d806..b2ed05c925 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs
@@ -43,6 +43,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct UnnecessaryGeneratorSet {
     short_circuit: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs
index 422081814a..00ed691551 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs
@@ -29,6 +29,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.73")]
 pub(crate) struct UnnecessaryListCall;
 
 impl AlwaysFixableViolation for UnnecessaryListCall {
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs
index 6ea4747748..e0b523c17b 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs
@@ -29,6 +29,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.58")]
 pub(crate) struct UnnecessaryListComprehensionDict;
 
 impl AlwaysFixableViolation for UnnecessaryListComprehensionDict {
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs
index 966b51c388..fd171a58b2 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs
@@ -31,6 +31,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.58")]
 pub(crate) struct UnnecessaryListComprehensionSet;
 
 impl AlwaysFixableViolation for UnnecessaryListComprehensionSet {
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs
index d23a74582b..cea5f9c2f9 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs
@@ -33,6 +33,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct UnnecessaryLiteralDict {
     obj_type: LiteralKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs
index e89f3e2fda..f06964f33d 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs
@@ -34,6 +34,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct UnnecessaryLiteralSet {
     kind: UnnecessaryLiteral,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs
index 1f1c04ccc7..e6f374f88d 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs
@@ -35,6 +35,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct UnnecessaryLiteralWithinDictCall {
     kind: DictKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs
index 5d4a9d7a4c..2861e19174 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs
@@ -35,6 +35,7 @@ use crate::rules::flake8_comprehensions::helpers;
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.66")]
 pub(crate) struct UnnecessaryLiteralWithinListCall {
     kind: LiteralKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs
index b2d3af263f..c932878d1b 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs
@@ -48,6 +48,7 @@ use crate::rules::flake8_comprehensions::helpers;
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.66")]
 pub(crate) struct UnnecessaryLiteralWithinTupleCall {
     literal_kind: TupleLiteralKind,
 }
@@ -124,7 +125,7 @@ pub(crate) fn unnecessary_literal_within_tuple_call(
                 let needs_trailing_comma = if let [item] = elts.as_slice() {
                     SimpleTokenizer::new(
                         checker.locator().contents(),
-                        TextRange::new(item.end(), call.end()),
+                        TextRange::new(item.end(), argument.end()),
                     )
                     .all(|token| token.kind != SimpleTokenKind::Comma)
                 } else {
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
index e31c4b15a0..64b373c6ba 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
@@ -44,6 +44,7 @@ use crate::{FixAvailability, Violation};
 /// This rule's fix is marked as unsafe, as it may occasionally drop comments
 /// when rewriting the call. In most cases, though, comments will be preserved.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.74")]
 pub(crate) struct UnnecessaryMap {
     object_type: ObjectType,
 }
@@ -122,6 +123,13 @@ pub(crate) fn unnecessary_map(checker: &Checker, call: &ast::ExprCall) {
         }
     };
 
+    // If the lambda body contains a `yield` or `yield from`, rewriting `map(lambda ...)` to a
+    // generator expression or any comprehension is invalid Python syntax
+    // (e.g., `yield` is not allowed inside generator or comprehension expressions). In such cases, skip.
+    if lambda_contains_yield(&lambda.body) {
+        return;
+    }
+
     for iterable in iterables {
         // For example, (x+1 for x in (c:=a)) is invalid syntax
         // so we can't suggest it.
@@ -183,6 +191,13 @@ fn map_lambda_and_iterables<'a>(
     Some((lambda, iterables))
 }
 
+/// Returns true if the expression tree contains a `yield` or `yield from` expression.
+fn lambda_contains_yield(expr: &Expr) -> bool {
+    any_over_expr(expr, &|expr| {
+        matches!(expr, Expr::Yield(_) | Expr::YieldFrom(_))
+    })
+}
+
 /// A lambda as the first argument to `map()` has the "expected" arity when:
 ///
 /// * It has exactly one parameter
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
index 5357daf99f..72e11829ec 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
@@ -27,6 +27,7 @@ use crate::checkers::ast::Checker;
 /// iterable
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.64")]
 pub(crate) struct UnnecessarySubscriptReversal {
     func: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap
index 1be1ac0752..3933a74ae0 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap
@@ -11,14 +11,13 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
 4 |     2 * x + 1 for x in range(3)
   |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-1 1 | # Cannot combine with C416. Should use list comprehension here.
-2   |-even_nums = list(2 * x for x in range(3))
-  2 |+even_nums = [2 * x for x in range(3)]
-3 3 | odd_nums = list(
-4 4 |     2 * x + 1 for x in range(3)
-5 5 | )
+1 | # Cannot combine with C416. Should use list comprehension here.
+  - even_nums = list(2 * x for x in range(3))
+2 + even_nums = [2 * x for x in range(3)]
+3 | odd_nums = list(
+4 |     2 * x + 1 for x in range(3)
+5 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite as a list comprehension)
  --> C400.py:3:12
@@ -32,18 +31,17 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
   | |_^
   |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-1 1 | # Cannot combine with C416. Should use list comprehension here.
-2 2 | even_nums = list(2 * x for x in range(3))
-3   |-odd_nums = list(
-  3 |+odd_nums = [
-4 4 |     2 * x + 1 for x in range(3)
-5   |-)
-  5 |+]
-6 6 | 
-7 7 | 
-8 8 | # Short-circuit case, combine with C416 and should produce x = list(range(3))
+1 | # Cannot combine with C416. Should use list comprehension here.
+2 | even_nums = list(2 * x for x in range(3))
+  - odd_nums = list(
+3 + odd_nums = [
+4 |     2 * x + 1 for x in range(3)
+  - )
+5 + ]
+6 | 
+7 | 
+8 | # Short-circuit case, combine with C416 and should produce x = list(range(3))
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite using `list()`)
   --> C400.py:9:5
@@ -55,16 +53,15 @@ C400 [*] Unnecessary generator (rewrite using `list()`)
 11 |     x for x in range(3)
    |
 help: Rewrite using `list()`
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | 
-8  8  | # Short-circuit case, combine with C416 and should produce x = list(range(3))
-9     |-x = list(x for x in range(3))
-   9  |+x = list(range(3))
-10 10 | x = list(
-11 11 |     x for x in range(3)
-12 12 | )
+6  | 
+7  | 
+8  | # Short-circuit case, combine with C416 and should produce x = list(range(3))
+   - x = list(x for x in range(3))
+9  + x = list(range(3))
+10 | x = list(
+11 |     x for x in range(3)
+12 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite using `list()`)
   --> C400.py:10:5
@@ -80,18 +77,17 @@ C400 [*] Unnecessary generator (rewrite using `list()`)
 14 |   # Strip parentheses from inner generators.
    |
 help: Rewrite using `list()`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | # Short-circuit case, combine with C416 and should produce x = list(range(3))
-9  9  | x = list(x for x in range(3))
-10    |-x = list(
-11    |-    x for x in range(3)
-12    |-)
-   10 |+x = list(range(3))
-13 11 | 
-14 12 | # Strip parentheses from inner generators.
-15 13 | list((2 * x for x in range(3)))
+7  | 
+8  | # Short-circuit case, combine with C416 and should produce x = list(range(3))
+9  | x = list(x for x in range(3))
+   - x = list(
+   -     x for x in range(3)
+   - )
+10 + x = list(range(3))
+11 | 
+12 | # Strip parentheses from inner generators.
+13 | list((2 * x for x in range(3)))
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite as a list comprehension)
   --> C400.py:15:1
@@ -103,16 +99,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
 17 | list((((2 * x for x in range(3)))))
    |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-12 12 | )
-13 13 | 
-14 14 | # Strip parentheses from inner generators.
-15    |-list((2 * x for x in range(3)))
-   15 |+[2 * x for x in range(3)]
-16 16 | list(((2 * x for x in range(3))))
-17 17 | list((((2 * x for x in range(3)))))
-18 18 | 
+12 | )
+13 | 
+14 | # Strip parentheses from inner generators.
+   - list((2 * x for x in range(3)))
+15 + [2 * x for x in range(3)]
+16 | list(((2 * x for x in range(3))))
+17 | list((((2 * x for x in range(3)))))
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite as a list comprehension)
   --> C400.py:16:1
@@ -124,16 +119,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
 17 | list((((2 * x for x in range(3)))))
    |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | # Strip parentheses from inner generators.
-15 15 | list((2 * x for x in range(3)))
-16    |-list(((2 * x for x in range(3))))
-   16 |+[2 * x for x in range(3)]
-17 17 | list((((2 * x for x in range(3)))))
-18 18 | 
-19 19 | # Account for trailing comma in fix
+13 | 
+14 | # Strip parentheses from inner generators.
+15 | list((2 * x for x in range(3)))
+   - list(((2 * x for x in range(3))))
+16 + [2 * x for x in range(3)]
+17 | list((((2 * x for x in range(3)))))
+18 | 
+19 | # Account for trailing comma in fix
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite as a list comprehension)
   --> C400.py:17:1
@@ -146,16 +140,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
 19 | # Account for trailing comma in fix
    |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-14 14 | # Strip parentheses from inner generators.
-15 15 | list((2 * x for x in range(3)))
-16 16 | list(((2 * x for x in range(3))))
-17    |-list((((2 * x for x in range(3)))))
-   17 |+[2 * x for x in range(3)]
-18 18 | 
-19 19 | # Account for trailing comma in fix
-20 20 | # See https://github.com/astral-sh/ruff/issues/15852
+14 | # Strip parentheses from inner generators.
+15 | list((2 * x for x in range(3)))
+16 | list(((2 * x for x in range(3))))
+   - list((((2 * x for x in range(3)))))
+17 + [2 * x for x in range(3)]
+18 | 
+19 | # Account for trailing comma in fix
+20 | # See https://github.com/astral-sh/ruff/issues/15852
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite as a list comprehension)
   --> C400.py:21:1
@@ -168,16 +161,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
 23 |      (0 for _ in [])
    |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | # Account for trailing comma in fix
-20 20 | # See https://github.com/astral-sh/ruff/issues/15852
-21    |-list((0 for _ in []),)
-   21 |+[0 for _ in []]
-22 22 | list(
-23 23 |      (0 for _ in [])
-24 24 |      # some comments
+18 | 
+19 | # Account for trailing comma in fix
+20 | # See https://github.com/astral-sh/ruff/issues/15852
+   - list((0 for _ in []),)
+21 + [0 for _ in []]
+22 | list(
+23 |      (0 for _ in [])
+24 |      # some comments
+note: This is an unsafe fix and may change runtime behavior
 
 C400 [*] Unnecessary generator (rewrite as a list comprehension)
   --> C400.py:22:1
@@ -193,20 +185,19 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension)
    | |__^
    |
 help: Rewrite as a list comprehension
-
-ℹ Unsafe fix
-19 19 | # Account for trailing comma in fix
-20 20 | # See https://github.com/astral-sh/ruff/issues/15852
-21 21 | list((0 for _ in []),)
-22    |-list(
-23    |-     (0 for _ in [])
-   22 |+[
-   23 |+     0 for _ in []
-24 24 |      # some comments
-25    |-     ,
-26    |-     # some more
-27    |- )
-   25 |+     ]
-28 26 | 
-29 27 | 
-30 28 | # Not built-in list.
+19 | # Account for trailing comma in fix
+20 | # See https://github.com/astral-sh/ruff/issues/15852
+21 | list((0 for _ in []),)
+   - list(
+   -      (0 for _ in [])
+22 + [
+23 +      0 for _ in []
+24 |      # some comments
+   -      ,
+   -      # some more
+   -  )
+25 +      ]
+26 | 
+27 | 
+28 | # Not built-in list.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap
index 32db38fff8..64851d0563 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap
@@ -11,14 +11,13 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 4 |     2 * x + 1 for x in range(3)
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-1 1 | # Cannot combine with C416. Should use set comprehension here.
-2   |-even_nums = set(2 * x for x in range(3))
-  2 |+even_nums = {2 * x for x in range(3)}
-3 3 | odd_nums = set(
-4 4 |     2 * x + 1 for x in range(3)
-5 5 | )
+1 | # Cannot combine with C416. Should use set comprehension here.
+  - even_nums = set(2 * x for x in range(3))
+2 + even_nums = {2 * x for x in range(3)}
+3 | odd_nums = set(
+4 |     2 * x + 1 for x in range(3)
+5 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
  --> C401.py:3:12
@@ -33,18 +32,17 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 6 |   small_nums = f"{set(a if a < 6 else 0 for a in range(3))}"
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-1 1 | # Cannot combine with C416. Should use set comprehension here.
-2 2 | even_nums = set(2 * x for x in range(3))
-3   |-odd_nums = set(
-  3 |+odd_nums = {
-4 4 |     2 * x + 1 for x in range(3)
-5   |-)
-  5 |+}
-6 6 | small_nums = f"{set(a if a < 6 else 0 for a in range(3))}"
-7 7 | 
-8 8 | def f(x):
+1 | # Cannot combine with C416. Should use set comprehension here.
+2 | even_nums = set(2 * x for x in range(3))
+  - odd_nums = set(
+3 + odd_nums = {
+4 |     2 * x + 1 for x in range(3)
+  - )
+5 + }
+6 | small_nums = f"{set(a if a < 6 else 0 for a in range(3))}"
+7 | 
+8 | def f(x):
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
  --> C401.py:6:17
@@ -57,16 +55,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 8 | def f(x):
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-3 3 | odd_nums = set(
-4 4 |     2 * x + 1 for x in range(3)
-5 5 | )
-6   |-small_nums = f"{set(a if a < 6 else 0 for a in range(3))}"
-  6 |+small_nums = f"{ {a if a < 6 else 0 for a in range(3)} }"
-7 7 | 
-8 8 | def f(x):
-9 9 |     return x
+3 | odd_nums = set(
+4 |     2 * x + 1 for x in range(3)
+5 | )
+  - small_nums = f"{set(a if a < 6 else 0 for a in range(3))}"
+6 + small_nums = f"{ {a if a < 6 else 0 for a in range(3)} }"
+7 | 
+8 | def f(x):
+9 |     return x
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:11:16
@@ -78,16 +75,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 12 | print(f"Hello { set(f(a) for a in 'abc') } World")
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-8  8  | def f(x):
-9  9  |     return x
-10 10 | 
-11    |-print(f"Hello {set(f(a) for a in 'abc')} World")
-   11 |+print(f"Hello { {f(a) for a in 'abc'} } World")
-12 12 | print(f"Hello { set(f(a) for a in 'abc') } World")
-13 13 | 
-14 14 | 
+8  | def f(x):
+9  |     return x
+10 | 
+   - print(f"Hello {set(f(a) for a in 'abc')} World")
+11 + print(f"Hello { {f(a) for a in 'abc'} } World")
+12 | print(f"Hello { set(f(a) for a in 'abc') } World")
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:12:17
@@ -97,16 +93,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-9  9  |     return x
-10 10 | 
-11 11 | print(f"Hello {set(f(a) for a in 'abc')} World")
-12    |-print(f"Hello { set(f(a) for a in 'abc') } World")
-   12 |+print(f"Hello { {f(a) for a in 'abc'} } World")
-13 13 | 
-14 14 | 
-15 15 | # Short-circuit case, combine with C416 and should produce x = set(range(3))
+9  |     return x
+10 | 
+11 | print(f"Hello {set(f(a) for a in 'abc')} World")
+   - print(f"Hello { set(f(a) for a in 'abc') } World")
+12 + print(f"Hello { {f(a) for a in 'abc'} } World")
+13 | 
+14 | 
+15 | # Short-circuit case, combine with C416 and should produce x = set(range(3))
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:16:5
@@ -118,16 +113,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 18 |     x for x in range(3)
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | # Short-circuit case, combine with C416 and should produce x = set(range(3))
-16    |-x = set(x for x in range(3))
-   16 |+x = set(range(3))
-17 17 | x = set(
-18 18 |     x for x in range(3)
-19 19 | )
+13 | 
+14 | 
+15 | # Short-circuit case, combine with C416 and should produce x = set(range(3))
+   - x = set(x for x in range(3))
+16 + x = set(range(3))
+17 | x = set(
+18 |     x for x in range(3)
+19 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:17:5
@@ -143,18 +137,17 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 21 |   print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | # Short-circuit case, combine with C416 and should produce x = set(range(3))
-16 16 | x = set(x for x in range(3))
-17    |-x = set(
-18    |-    x for x in range(3)
-19    |-)
-   17 |+x = set(range(3))
-20 18 | print(f"Hello {set(a for a in range(3))} World")
-21 19 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-22 20 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+14 | 
+15 | # Short-circuit case, combine with C416 and should produce x = set(range(3))
+16 | x = set(x for x in range(3))
+   - x = set(
+   -     x for x in range(3)
+   - )
+17 + x = set(range(3))
+18 | print(f"Hello {set(a for a in range(3))} World")
+19 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
+20 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:20:16
@@ -167,16 +160,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-17 17 | x = set(
-18 18 |     x for x in range(3)
-19 19 | )
-20    |-print(f"Hello {set(a for a in range(3))} World")
-   20 |+print(f"Hello {set(range(3))} World")
-21 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-23 23 | 
+17 | x = set(
+18 |     x for x in range(3)
+19 | )
+   - print(f"Hello {set(a for a in range(3))} World")
+20 + print(f"Hello {set(range(3))} World")
+21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
+22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:21:10
@@ -188,16 +180,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-18 18 |     x for x in range(3)
-19 19 | )
-20 20 | print(f"Hello {set(a for a in range(3))} World")
-21    |-print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-   21 |+print(f"{set('abc') - set(a for a in 'ab')}")
-22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-23 23 | 
-24 24 | # Strip parentheses from inner generators.
+18 |     x for x in range(3)
+19 | )
+20 | print(f"Hello {set(a for a in range(3))} World")
+   - print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
+21 + print(f"{set('abc') - set(a for a in 'ab')}")
+22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+23 | 
+24 | # Strip parentheses from inner generators.
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:21:34
@@ -209,16 +200,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-18 18 |     x for x in range(3)
-19 19 | )
-20 20 | print(f"Hello {set(a for a in range(3))} World")
-21    |-print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-   21 |+print(f"{set(a for a in 'abc') - set('ab')}")
-22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-23 23 | 
-24 24 | # Strip parentheses from inner generators.
+18 |     x for x in range(3)
+19 | )
+20 | print(f"Hello {set(a for a in range(3))} World")
+   - print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
+21 + print(f"{set(a for a in 'abc') - set('ab')}")
+22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+23 | 
+24 | # Strip parentheses from inner generators.
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:22:11
@@ -231,16 +221,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 24 | # Strip parentheses from inner generators.
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-19 19 | )
-20 20 | print(f"Hello {set(a for a in range(3))} World")
-21 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-22    |-print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-   22 |+print(f"{ set('abc') - set(a for a in 'ab') }")
-23 23 | 
-24 24 | # Strip parentheses from inner generators.
-25 25 | set((2 * x for x in range(3)))
+19 | )
+20 | print(f"Hello {set(a for a in range(3))} World")
+21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
+   - print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+22 + print(f"{ set('abc') - set(a for a in 'ab') }")
+23 | 
+24 | # Strip parentheses from inner generators.
+25 | set((2 * x for x in range(3)))
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:22:35
@@ -253,16 +242,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 24 | # Strip parentheses from inner generators.
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-19 19 | )
-20 20 | print(f"Hello {set(a for a in range(3))} World")
-21 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-22    |-print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-   22 |+print(f"{ set(a for a in 'abc') - set('ab') }")
-23 23 | 
-24 24 | # Strip parentheses from inner generators.
-25 25 | set((2 * x for x in range(3)))
+19 | )
+20 | print(f"Hello {set(a for a in range(3))} World")
+21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
+   - print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+22 + print(f"{ set(a for a in 'abc') - set('ab') }")
+23 | 
+24 | # Strip parentheses from inner generators.
+25 | set((2 * x for x in range(3)))
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:25:1
@@ -274,16 +262,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 27 | set((((2 * x for x in range(3)))))
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-23 23 | 
-24 24 | # Strip parentheses from inner generators.
-25    |-set((2 * x for x in range(3)))
-   25 |+{2 * x for x in range(3)}
-26 26 | set(((2 * x for x in range(3))))
-27 27 | set((((2 * x for x in range(3)))))
-28 28 | 
+22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+23 | 
+24 | # Strip parentheses from inner generators.
+   - set((2 * x for x in range(3)))
+25 + {2 * x for x in range(3)}
+26 | set(((2 * x for x in range(3))))
+27 | set((((2 * x for x in range(3)))))
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:26:1
@@ -295,16 +282,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 27 | set((((2 * x for x in range(3)))))
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | # Strip parentheses from inner generators.
-25 25 | set((2 * x for x in range(3)))
-26    |-set(((2 * x for x in range(3))))
-   26 |+{2 * x for x in range(3)}
-27 27 | set((((2 * x for x in range(3)))))
-28 28 | 
-29 29 | # Account for trailing comma in fix
+23 | 
+24 | # Strip parentheses from inner generators.
+25 | set((2 * x for x in range(3)))
+   - set(((2 * x for x in range(3))))
+26 + {2 * x for x in range(3)}
+27 | set((((2 * x for x in range(3)))))
+28 | 
+29 | # Account for trailing comma in fix
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:27:1
@@ -317,16 +303,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 29 | # Account for trailing comma in fix
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-24 24 | # Strip parentheses from inner generators.
-25 25 | set((2 * x for x in range(3)))
-26 26 | set(((2 * x for x in range(3))))
-27    |-set((((2 * x for x in range(3)))))
-   27 |+{2 * x for x in range(3)}
-28 28 | 
-29 29 | # Account for trailing comma in fix
-30 30 | # See https://github.com/astral-sh/ruff/issues/15852
+24 | # Strip parentheses from inner generators.
+25 | set((2 * x for x in range(3)))
+26 | set(((2 * x for x in range(3))))
+   - set((((2 * x for x in range(3)))))
+27 + {2 * x for x in range(3)}
+28 | 
+29 | # Account for trailing comma in fix
+30 | # See https://github.com/astral-sh/ruff/issues/15852
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:31:1
@@ -339,16 +324,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 33 |     (0 for _ in [])
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | # Account for trailing comma in fix
-30 30 | # See https://github.com/astral-sh/ruff/issues/15852
-31    |-set((0 for _ in []),)
-   31 |+{0 for _ in []}
-32 32 | set(
-33 33 |     (0 for _ in [])
-34 34 |     # some comments
+28 | 
+29 | # Account for trailing comma in fix
+30 | # See https://github.com/astral-sh/ruff/issues/15852
+   - set((0 for _ in []),)
+31 + {0 for _ in []}
+32 | set(
+33 |     (0 for _ in [])
+34 |     # some comments
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:32:1
@@ -366,23 +350,22 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 39 |   # t-strings
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-29 29 | # Account for trailing comma in fix
-30 30 | # See https://github.com/astral-sh/ruff/issues/15852
-31 31 | set((0 for _ in []),)
-32    |-set(
-33    |-    (0 for _ in [])
-   32 |+{
-   33 |+    0 for _ in []
-34 34 |     # some comments
-35    |-    ,
-36    |-    # some more
-37    |-)
-   35 |+    }
-38 36 | 
-39 37 | # t-strings
-40 38 | print(t"Hello {set(f(a) for a in 'abc')} World")
+29 | # Account for trailing comma in fix
+30 | # See https://github.com/astral-sh/ruff/issues/15852
+31 | set((0 for _ in []),)
+   - set(
+   -     (0 for _ in [])
+32 + {
+33 +     0 for _ in []
+34 |     # some comments
+   -     ,
+   -     # some more
+   - )
+35 +     }
+36 | 
+37 | # t-strings
+38 | print(t"Hello {set(f(a) for a in 'abc')} World")
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:40:16
@@ -394,16 +377,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-37 37 | )
-38 38 | 
-39 39 | # t-strings
-40    |-print(t"Hello {set(f(a) for a in 'abc')} World")
-   40 |+print(t"Hello { {f(a) for a in 'abc'} } World")
-41 41 | print(t"Hello { set(f(a) for a in 'abc') } World")
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
+37 | )
+38 | 
+39 | # t-strings
+   - print(t"Hello {set(f(a) for a in 'abc')} World")
+40 + print(t"Hello { {f(a) for a in 'abc'} } World")
+41 | print(t"Hello { set(f(a) for a in 'abc') } World")
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+43 | print(t"Hello {set(a for a in range(3))} World")
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:41:17
@@ -416,16 +398,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 43 | print(t"Hello {set(a for a in range(3))} World")
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-38 38 | 
-39 39 | # t-strings
-40 40 | print(t"Hello {set(f(a) for a in 'abc')} World")
-41    |-print(t"Hello { set(f(a) for a in 'abc') } World")
-   41 |+print(t"Hello { {f(a) for a in 'abc'} } World")
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
-44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+38 | 
+39 | # t-strings
+40 | print(t"Hello {set(f(a) for a in 'abc')} World")
+   - print(t"Hello { set(f(a) for a in 'abc') } World")
+41 + print(t"Hello { {f(a) for a in 'abc'} } World")
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+43 | print(t"Hello {set(a for a in range(3))} World")
+44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite as a set comprehension)
   --> C401.py:42:17
@@ -438,16 +419,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension)
 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-39 39 | # t-strings
-40 40 | print(t"Hello {set(f(a) for a in 'abc')} World")
-41 41 | print(t"Hello { set(f(a) for a in 'abc') } World")
-42    |-small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-   42 |+small_nums = t"{ {a if a < 6 else 0 for a in range(3)} }"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
-44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+39 | # t-strings
+40 | print(t"Hello {set(f(a) for a in 'abc')} World")
+41 | print(t"Hello { set(f(a) for a in 'abc') } World")
+   - small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+42 + small_nums = t"{ {a if a < 6 else 0 for a in range(3)} }"
+43 | print(t"Hello {set(a for a in range(3))} World")
+44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:43:16
@@ -460,16 +440,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-40 40 | print(t"Hello {set(f(a) for a in 'abc')} World")
-41 41 | print(t"Hello { set(f(a) for a in 'abc') } World")
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43    |-print(t"Hello {set(a for a in range(3))} World")
-   43 |+print(t"Hello {set(range(3))} World")
-44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-46 46 | 
+40 | print(t"Hello {set(f(a) for a in 'abc')} World")
+41 | print(t"Hello { set(f(a) for a in 'abc') } World")
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+   - print(t"Hello {set(a for a in range(3))} World")
+43 + print(t"Hello {set(range(3))} World")
+44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+46 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:44:10
@@ -481,16 +460,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-41 41 | print(t"Hello { set(f(a) for a in 'abc') } World")
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
-44    |-print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-   44 |+print(t"{set('abc') - set(a for a in 'ab')}")
-45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-46 46 | 
-47 47 | 
+41 | print(t"Hello { set(f(a) for a in 'abc') } World")
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+43 | print(t"Hello {set(a for a in range(3))} World")
+   - print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+44 + print(t"{set('abc') - set(a for a in 'ab')}")
+45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+46 | 
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:44:34
@@ -502,16 +480,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-41 41 | print(t"Hello { set(f(a) for a in 'abc') } World")
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
-44    |-print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-   44 |+print(t"{set(a for a in 'abc') - set('ab')}")
-45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-46 46 | 
-47 47 | 
+41 | print(t"Hello { set(f(a) for a in 'abc') } World")
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+43 | print(t"Hello {set(a for a in range(3))} World")
+   - print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+44 + print(t"{set(a for a in 'abc') - set('ab')}")
+45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+46 | 
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:45:11
@@ -522,16 +499,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
    |           ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
-44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-45    |-print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-   45 |+print(t"{ set('abc') - set(a for a in 'ab') }")
-46 46 | 
-47 47 | 
-48 48 | # Not built-in set.
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+43 | print(t"Hello {set(a for a in range(3))} World")
+44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+   - print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+45 + print(t"{ set('abc') - set(a for a in 'ab') }")
+46 | 
+47 | 
+48 | # Not built-in set.
+note: This is an unsafe fix and may change runtime behavior
 
 C401 [*] Unnecessary generator (rewrite using `set()`)
   --> C401.py:45:35
@@ -542,13 +518,12 @@ C401 [*] Unnecessary generator (rewrite using `set()`)
    |                                   ^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-43 43 | print(t"Hello {set(a for a in range(3))} World")
-44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-45    |-print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-   45 |+print(t"{ set(a for a in 'abc') - set('ab') }")
-46 46 | 
-47 47 | 
-48 48 | # Not built-in set.
+42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
+43 | print(t"Hello {set(a for a in range(3))} World")
+44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
+   - print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
+45 + print(t"{ set(a for a in 'abc') - set('ab') }")
+46 | 
+47 | 
+48 | # Not built-in set.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap
index 749545c7fc..38cda40530 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap
@@ -10,13 +10,12 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 3 |     (x, x) for x in range(3)
   |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-1   |-dict((x, x) for x in range(3))
-  1 |+{x: x for x in range(3)}
-2 2 | dict(
-3 3 |     (x, x) for x in range(3)
-4 4 | )
+  - dict((x, x) for x in range(3))
+1 + {x: x for x in range(3)}
+2 | dict(
+3 |     (x, x) for x in range(3)
+4 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
  --> C402.py:2:1
@@ -30,18 +29,17 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 6 |   y = f'{dict((x, x) for x in range(3))}'
   |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-1 1 | dict((x, x) for x in range(3))
-2   |-dict(
-3   |-    (x, x) for x in range(3)
-4   |-)
-  2 |+{
-  3 |+    x: x for x in range(3)
-  4 |+}
-5 5 | dict(((x, x) for x in range(3)), z=3)
-6 6 | y = f'{dict((x, x) for x in range(3))}'
-7 7 | print(f'Hello {dict((x, x) for x in range(3))} World')
+1 | dict((x, x) for x in range(3))
+  - dict(
+  -     (x, x) for x in range(3)
+  - )
+2 + {
+3 +     x: x for x in range(3)
+4 + }
+5 | dict(((x, x) for x in range(3)), z=3)
+6 | y = f'{dict((x, x) for x in range(3))}'
+7 | print(f'Hello {dict((x, x) for x in range(3))} World')
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
  --> C402.py:6:8
@@ -54,16 +52,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 8 | print(f"Hello {dict((x, x) for x in 'abc')} World")
   |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-3 3 |     (x, x) for x in range(3)
-4 4 | )
-5 5 | dict(((x, x) for x in range(3)), z=3)
-6   |-y = f'{dict((x, x) for x in range(3))}'
-  6 |+y = f'{ {x: x for x in range(3)} }'
-7 7 | print(f'Hello {dict((x, x) for x in range(3))} World')
-8 8 | print(f"Hello {dict((x, x) for x in 'abc')} World")
-9 9 | print(f'Hello {dict((x, x) for x in "abc")} World')
+3 |     (x, x) for x in range(3)
+4 | )
+5 | dict(((x, x) for x in range(3)), z=3)
+  - y = f'{dict((x, x) for x in range(3))}'
+6 + y = f'{ {x: x for x in range(3)} }'
+7 | print(f'Hello {dict((x, x) for x in range(3))} World')
+8 | print(f"Hello {dict((x, x) for x in 'abc')} World")
+9 | print(f'Hello {dict((x, x) for x in "abc")} World')
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
  --> C402.py:7:16
@@ -76,16 +73,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 9 | print(f'Hello {dict((x, x) for x in "abc")} World')
   |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-4 4 | )
-5 5 | dict(((x, x) for x in range(3)), z=3)
-6 6 | y = f'{dict((x, x) for x in range(3))}'
-7   |-print(f'Hello {dict((x, x) for x in range(3))} World')
-  7 |+print(f'Hello { {x: x for x in range(3)} } World')
-8 8 | print(f"Hello {dict((x, x) for x in 'abc')} World")
-9 9 | print(f'Hello {dict((x, x) for x in "abc")} World')
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+4  | )
+5  | dict(((x, x) for x in range(3)), z=3)
+6  | y = f'{dict((x, x) for x in range(3))}'
+   - print(f'Hello {dict((x, x) for x in range(3))} World')
+7  + print(f'Hello { {x: x for x in range(3)} } World')
+8  | print(f"Hello {dict((x, x) for x in 'abc')} World")
+9  | print(f'Hello {dict((x, x) for x in "abc")} World')
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:8:16
@@ -98,16 +94,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-5 5 | dict(((x, x) for x in range(3)), z=3)
-6 6 | y = f'{dict((x, x) for x in range(3))}'
-7 7 | print(f'Hello {dict((x, x) for x in range(3))} World')
-8   |-print(f"Hello {dict((x, x) for x in 'abc')} World")
-  8 |+print(f"Hello { {x: x for x in 'abc'} } World")
-9 9 | print(f'Hello {dict((x, x) for x in "abc")} World')
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
-11 11 | 
+5  | dict(((x, x) for x in range(3)), z=3)
+6  | y = f'{dict((x, x) for x in range(3))}'
+7  | print(f'Hello {dict((x, x) for x in range(3))} World')
+   - print(f"Hello {dict((x, x) for x in 'abc')} World")
+8  + print(f"Hello { {x: x for x in 'abc'} } World")
+9  | print(f'Hello {dict((x, x) for x in "abc")} World')
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:9:16
@@ -119,16 +114,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-6  6  | y = f'{dict((x, x) for x in range(3))}'
-7  7  | print(f'Hello {dict((x, x) for x in range(3))} World')
-8  8  | print(f"Hello {dict((x, x) for x in 'abc')} World")
-9     |-print(f'Hello {dict((x, x) for x in "abc")} World')
-   9  |+print(f'Hello { {x: x for x in "abc"} } World')
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
-11 11 | 
-12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+6  | y = f'{dict((x, x) for x in range(3))}'
+7  | print(f'Hello {dict((x, x) for x in range(3))} World')
+8  | print(f"Hello {dict((x, x) for x in 'abc')} World")
+   - print(f'Hello {dict((x, x) for x in "abc")} World')
+9  + print(f'Hello { {x: x for x in "abc"} } World')
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+11 | 
+12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:10:16
@@ -141,16 +135,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-7  7  | print(f'Hello {dict((x, x) for x in range(3))} World')
-8  8  | print(f"Hello {dict((x, x) for x in 'abc')} World")
-9  9  | print(f'Hello {dict((x, x) for x in "abc")} World')
-10    |-print(f'Hello {dict((x,x) for x in "abc")} World')
-   10 |+print(f'Hello { {x: x for x in "abc"} } World')
-11 11 | 
-12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
-13 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
+7  | print(f'Hello {dict((x, x) for x in range(3))} World')
+8  | print(f"Hello {dict((x, x) for x in 'abc')} World")
+9  | print(f'Hello {dict((x, x) for x in "abc")} World')
+   - print(f'Hello {dict((x,x) for x in "abc")} World')
+10 + print(f'Hello { {x: x for x in "abc"} } World')
+11 | 
+12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:12:4
@@ -162,16 +155,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-9  9  | print(f'Hello {dict((x, x) for x in "abc")} World')
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
-11 11 | 
-12    |-f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
-   12 |+f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3))}'
-13 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
-14 14 | 
-15 15 | def f(x):
+9  | print(f'Hello {dict((x, x) for x in "abc")} World')
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+11 | 
+   - f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+12 + f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3))}'
+13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
+14 | 
+15 | def f(x):
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:12:37
@@ -183,16 +175,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-9  9  | print(f'Hello {dict((x, x) for x in "abc")} World')
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
-11 11 | 
-12    |-f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
-   12 |+f'{dict((x, x) for x in range(3)) | {x: x for x in range(3)} }'
-13 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
-14 14 | 
-15 15 | def f(x):
+9  | print(f'Hello {dict((x, x) for x in "abc")} World')
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+11 | 
+   - f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+12 + f'{dict((x, x) for x in range(3)) | {x: x for x in range(3)} }'
+13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
+14 | 
+15 | def f(x):
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:13:5
@@ -204,16 +195,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 15 | def f(x):
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
-11 11 | 
-12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
-13    |-f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
-   13 |+f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3)) }'
-14 14 | 
-15 15 | def f(x):
-16 16 |     return x
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+11 | 
+12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+   - f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
+13 + f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3)) }'
+14 | 
+15 | def f(x):
+16 |     return x
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:13:38
@@ -225,16 +215,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 15 | def f(x):
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-10 10 | print(f'Hello {dict((x,x) for x in "abc")} World')
-11 11 | 
-12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
-13    |-f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
-   13 |+f'{ dict((x, x) for x in range(3)) | {x: x for x in range(3)} }'
-14 14 | 
-15 15 | def f(x):
-16 16 |     return x
+10 | print(f'Hello {dict((x,x) for x in "abc")} World')
+11 | 
+12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
+   - f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
+13 + f'{ dict((x, x) for x in range(3)) | {x: x for x in range(3)} }'
+14 | 
+15 | def f(x):
+16 |     return x
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:18:16
@@ -247,16 +236,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-15 15 | def f(x):
-16 16 |     return x
-17 17 | 
-18    |-print(f'Hello {dict((x,f(x)) for x in "abc")} World')
-   18 |+print(f'Hello { {x: f(x) for x in "abc"} } World')
-19 19 | 
-20 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
-21 21 | dict((k,v)for k,v in d.iteritems() if k in only_args)
+15 | def f(x):
+16 |     return x
+17 | 
+   - print(f'Hello {dict((x,f(x)) for x in "abc")} World')
+18 + print(f'Hello { {x: f(x) for x in "abc"} } World')
+19 | 
+20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
+21 | dict((k,v)for k,v in d.iteritems() if k in only_args)
+note: This is an unsafe fix and may change runtime behavior
 
 C402 [*] Unnecessary generator (rewrite as a dict comprehension)
   --> C402.py:21:1
@@ -268,13 +256,12 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension)
 23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-18 18 | print(f'Hello {dict((x,f(x)) for x in "abc")} World')
-19 19 | 
-20 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
-21    |-dict((k,v)for k,v in d.iteritems() if k in only_args)
-   21 |+{k: v for k,v in d.iteritems() if k in only_args}
-22 22 | 
-23 23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
-24 24 | dict((*v, k) for k, v in enumerate(calendar.month_abbr))
+18 | print(f'Hello {dict((x,f(x)) for x in "abc")} World')
+19 | 
+20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
+   - dict((k,v)for k,v in d.iteritems() if k in only_args)
+21 + {k: v for k,v in d.iteritems() if k in only_args}
+22 | 
+23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
+24 | dict((*v, k) for k, v in enumerate(calendar.month_abbr))
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap
index 531b3168cf..f6e5ec6c53 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap
@@ -10,13 +10,12 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 3 |     [x for x in range(3)]
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-1   |-s = set([x for x in range(3)])
-  1 |+s = {x for x in range(3)}
-2 2 | s = set(
-3 3 |     [x for x in range(3)]
-4 4 | )
+  - s = set([x for x in range(3)])
+1 + s = {x for x in range(3)}
+2 | s = set(
+3 |     [x for x in range(3)]
+4 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
  --> C403.py:2:5
@@ -31,18 +30,17 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 6 |   s = f"{set([x for x in 'ab'])}"
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-1 1 | s = set([x for x in range(3)])
-2   |-s = set(
-3   |-    [x for x in range(3)]
-4   |-)
-  2 |+s = {
-  3 |+    x for x in range(3)
-  4 |+}
-5 5 | 
-6 6 | s = f"{set([x for x in 'ab'])}"
-7 7 | s = f'{set([x for x in "ab"])}'
+1 | s = set([x for x in range(3)])
+  - s = set(
+  -     [x for x in range(3)]
+  - )
+2 + s = {
+3 +     x for x in range(3)
+4 + }
+5 | 
+6 | s = f"{set([x for x in 'ab'])}"
+7 | s = f'{set([x for x in "ab"])}'
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
  --> C403.py:6:8
@@ -54,16 +52,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 7 | s = f'{set([x for x in "ab"])}'
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-3 3 |     [x for x in range(3)]
-4 4 | )
-5 5 | 
-6   |-s = f"{set([x for x in 'ab'])}"
-  6 |+s = f"{ {x for x in 'ab'} }"
-7 7 | s = f'{set([x for x in "ab"])}'
-8 8 | 
-9 9 | def f(x):
+3 |     [x for x in range(3)]
+4 | )
+5 | 
+  - s = f"{set([x for x in 'ab'])}"
+6 + s = f"{ {x for x in 'ab'} }"
+7 | s = f'{set([x for x in "ab"])}'
+8 | 
+9 | def f(x):
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
  --> C403.py:7:8
@@ -75,16 +72,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 9 | def f(x):
   |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-4 4 | )
-5 5 | 
-6 6 | s = f"{set([x for x in 'ab'])}"
-7   |-s = f'{set([x for x in "ab"])}'
-  7 |+s = f'{ {x for x in "ab"} }'
-8 8 | 
-9 9 | def f(x):
-10 10 |     return x
+4  | )
+5  | 
+6  | s = f"{set([x for x in 'ab'])}"
+   - s = f'{set([x for x in "ab"])}'
+7  + s = f'{ {x for x in "ab"} }'
+8  | 
+9  | def f(x):
+10 |     return x
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:12:8
@@ -97,16 +93,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-9  9  | def f(x):
-10 10 |     return x
-11 11 | 
-12    |-s = f"{set([f(x) for x in 'ab'])}"
-   12 |+s = f"{ {f(x) for x in 'ab'} }"
-13 13 | 
-14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+9  | def f(x):
+10 |     return x
+11 | 
+   - s = f"{set([f(x) for x in 'ab'])}"
+12 + s = f"{ {f(x) for x in 'ab'} }"
+13 | 
+14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:14:9
@@ -118,16 +113,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | s = f"{set([f(x) for x in 'ab'])}"
-13 13 | 
-14    |-s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-   14 |+s = f"{ {x for x in 'ab'} | set([x for x in 'ab']) }"
-15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-16 16 | 
-17 17 | s = set(  # comment
+11 | 
+12 | s = f"{set([f(x) for x in 'ab'])}"
+13 | 
+   - s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+14 + s = f"{ {x for x in 'ab'} | set([x for x in 'ab']) }"
+15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+16 | 
+17 | s = set(  # comment
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:14:34
@@ -139,16 +133,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | s = f"{set([f(x) for x in 'ab'])}"
-13 13 | 
-14    |-s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-   14 |+s = f"{ set([x for x in 'ab']) | {x for x in 'ab'} }"
-15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-16 16 | 
-17 17 | s = set(  # comment
+11 | 
+12 | s = f"{set([f(x) for x in 'ab'])}"
+13 | 
+   - s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+14 + s = f"{ set([x for x in 'ab']) | {x for x in 'ab'} }"
+15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+16 | 
+17 | s = set(  # comment
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:15:8
@@ -160,16 +153,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 17 | s = set(  # comment
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-12 12 | s = f"{set([f(x) for x in 'ab'])}"
-13 13 | 
-14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-15    |-s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-   15 |+s = f"{ {x for x in 'ab'} | set([x for x in 'ab'])}"
-16 16 | 
-17 17 | s = set(  # comment
-18 18 |     [x for x in range(3)]
+12 | s = f"{set([f(x) for x in 'ab'])}"
+13 | 
+14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+   - s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+15 + s = f"{ {x for x in 'ab'} | set([x for x in 'ab'])}"
+16 | 
+17 | s = set(  # comment
+18 |     [x for x in range(3)]
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:15:33
@@ -181,16 +173,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 17 | s = set(  # comment
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-12 12 | s = f"{set([f(x) for x in 'ab'])}"
-13 13 | 
-14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-15    |-s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-   15 |+s = f"{set([x for x in 'ab']) | {x for x in 'ab'} }"
-16 16 | 
-17 17 | s = set(  # comment
-18 18 |     [x for x in range(3)]
+12 | s = f"{set([f(x) for x in 'ab'])}"
+13 | 
+14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+   - s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+15 + s = f"{set([x for x in 'ab']) | {x for x in 'ab'} }"
+16 | 
+17 | s = set(  # comment
+18 |     [x for x in range(3)]
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:17:5
@@ -206,20 +197,19 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 21 |   s = set([  # comment
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-16 16 | 
-17    |-s = set(  # comment
-18    |-    [x for x in range(3)]
-19    |-)
-   17 |+s = {  # comment
-   18 |+    x for x in range(3)
-   19 |+}
-20 20 | 
-21 21 | s = set([  # comment
-22 22 |     x for x in range(3)
+14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+16 | 
+   - s = set(  # comment
+   -     [x for x in range(3)]
+   - )
+17 + s = {  # comment
+18 +     x for x in range(3)
+19 + }
+20 | 
+21 | s = set([  # comment
+22 |     x for x in range(3)
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:21:5
@@ -235,19 +225,18 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 25 |   s = set(([x for x in range(3)]))
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-18 18 |     [x for x in range(3)]
-19 19 | )
-20 20 | 
-21    |-s = set([  # comment
-   21 |+s = {  # comment
-22 22 |     x for x in range(3)
-23    |-])
-   23 |+}
-24 24 | 
-25 25 | s = set(([x for x in range(3)]))
-26 26 | 
+18 |     [x for x in range(3)]
+19 | )
+20 | 
+   - s = set([  # comment
+21 + s = {  # comment
+22 |     x for x in range(3)
+   - ])
+23 + }
+24 | 
+25 | s = set(([x for x in range(3)]))
+26 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:25:5
@@ -260,16 +249,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 27 | s = set(((([x for x in range(3)]))))
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-22 22 |     x for x in range(3)
-23 23 | ])
-24 24 | 
-25    |-s = set(([x for x in range(3)]))
-   25 |+s = {x for x in range(3)}
-26 26 | 
-27 27 | s = set(((([x for x in range(3)]))))
-28 28 | 
+22 |     x for x in range(3)
+23 | ])
+24 | 
+   - s = set(([x for x in range(3)]))
+25 + s = {x for x in range(3)}
+26 | 
+27 | s = set(((([x for x in range(3)]))))
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:27:5
@@ -282,16 +270,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 29 | s = set( # outer set comment
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | s = set(([x for x in range(3)]))
-26 26 | 
-27    |-s = set(((([x for x in range(3)]))))
-   27 |+s = {x for x in range(3)}
-28 28 | 
-29 29 | s = set( # outer set comment
-30 30 | ( # inner paren comment - not preserved
+24 | 
+25 | s = set(([x for x in range(3)]))
+26 | 
+   - s = set(((([x for x in range(3)]))))
+27 + s = {x for x in range(3)}
+28 | 
+29 | s = set( # outer set comment
+30 | ( # inner paren comment - not preserved
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:29:5
@@ -310,23 +297,22 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 36 |   # Test trailing comma case
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-26 26 | 
-27 27 | s = set(((([x for x in range(3)]))))
-28 28 | 
-29    |-s = set( # outer set comment
-30    |-( # inner paren comment - not preserved
-31    |-((
-32    |-[ # comprehension comment
-33    |- x for x in range(3)]
-34    |- ))))
-   29 |+s = { # outer set comment
-   30 |+ # comprehension comment
-   31 |+ x for x in range(3)}
-35 32 | 
-36 33 | # Test trailing comma case
-37 34 | s = set([x for x in range(3)],)
+26 | 
+27 | s = set(((([x for x in range(3)]))))
+28 | 
+   - s = set( # outer set comment
+   - ( # inner paren comment - not preserved
+   - ((
+   - [ # comprehension comment
+   -  x for x in range(3)]
+   -  ))))
+29 + s = { # outer set comment
+30 +  # comprehension comment
+31 +  x for x in range(3)}
+32 | 
+33 | # Test trailing comma case
+34 | s = set([x for x in range(3)],)
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:37:5
@@ -338,16 +324,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 39 | s = t"{set([x for x in 'ab'])}"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-34 34 |  ))))
-35 35 | 
-36 36 | # Test trailing comma case
-37    |-s = set([x for x in range(3)],)
-   37 |+s = {x for x in range(3)}
-38 38 | 
-39 39 | s = t"{set([x for x in 'ab'])}"
-40 40 | s = t'{set([x for x in "ab"])}'
+34 |  ))))
+35 | 
+36 | # Test trailing comma case
+   - s = set([x for x in range(3)],)
+37 + s = {x for x in range(3)}
+38 | 
+39 | s = t"{set([x for x in 'ab'])}"
+40 | s = t'{set([x for x in "ab"])}'
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:39:8
@@ -359,16 +344,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 40 | s = t'{set([x for x in "ab"])}'
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-36 36 | # Test trailing comma case
-37 37 | s = set([x for x in range(3)],)
-38 38 | 
-39    |-s = t"{set([x for x in 'ab'])}"
-   39 |+s = t"{ {x for x in 'ab'} }"
-40 40 | s = t'{set([x for x in "ab"])}'
-41 41 | 
-42 42 | def f(x):
+36 | # Test trailing comma case
+37 | s = set([x for x in range(3)],)
+38 | 
+   - s = t"{set([x for x in 'ab'])}"
+39 + s = t"{ {x for x in 'ab'} }"
+40 | s = t'{set([x for x in "ab"])}'
+41 | 
+42 | def f(x):
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:40:8
@@ -380,16 +364,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 42 | def f(x):
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-37 37 | s = set([x for x in range(3)],)
-38 38 | 
-39 39 | s = t"{set([x for x in 'ab'])}"
-40    |-s = t'{set([x for x in "ab"])}'
-   40 |+s = t'{ {x for x in "ab"} }'
-41 41 | 
-42 42 | def f(x):
-43 43 |     return x
+37 | s = set([x for x in range(3)],)
+38 | 
+39 | s = t"{set([x for x in 'ab'])}"
+   - s = t'{set([x for x in "ab"])}'
+40 + s = t'{ {x for x in "ab"} }'
+41 | 
+42 | def f(x):
+43 |     return x
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:45:8
@@ -402,16 +385,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-42 42 | def f(x):
-43 43 |     return x
-44 44 | 
-45    |-s = t"{set([f(x) for x in 'ab'])}"
-   45 |+s = t"{ {f(x) for x in 'ab'} }"
-46 46 | 
-47 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-48 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+42 | def f(x):
+43 |     return x
+44 | 
+   - s = t"{set([f(x) for x in 'ab'])}"
+45 + s = t"{ {f(x) for x in 'ab'} }"
+46 | 
+47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:47:9
@@ -423,15 +405,14 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-44 44 | 
-45 45 | s = t"{set([f(x) for x in 'ab'])}"
-46 46 | 
-47    |-s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-   47 |+s = t"{ {x for x in 'ab'} | set([x for x in 'ab']) }"
-48 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-49 49 | 
+44 | 
+45 | s = t"{set([f(x) for x in 'ab'])}"
+46 | 
+   - s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+47 + s = t"{ {x for x in 'ab'} | set([x for x in 'ab']) }"
+48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+49 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:47:34
@@ -443,15 +424,14 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-44 44 | 
-45 45 | s = t"{set([f(x) for x in 'ab'])}"
-46 46 | 
-47    |-s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-   47 |+s = t"{ set([x for x in 'ab']) | {x for x in 'ab'} }"
-48 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-49 49 | 
+44 | 
+45 | s = t"{set([f(x) for x in 'ab'])}"
+46 | 
+   - s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+47 + s = t"{ set([x for x in 'ab']) | {x for x in 'ab'} }"
+48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+49 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:48:8
@@ -461,14 +441,13 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
    |        ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-45 45 | s = t"{set([f(x) for x in 'ab'])}"
-46 46 | 
-47 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-48    |-s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-   48 |+s = t"{ {x for x in 'ab'} | set([x for x in 'ab'])}"
-49 49 | 
+45 | s = t"{set([f(x) for x in 'ab'])}"
+46 | 
+47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+   - s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+48 + s = t"{ {x for x in 'ab'} | set([x for x in 'ab'])}"
+49 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
   --> C403.py:48:33
@@ -478,11 +457,10 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension)
    |                                 ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite as a set comprehension
-
-ℹ Unsafe fix
-45 45 | s = t"{set([f(x) for x in 'ab'])}"
-46 46 | 
-47 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-48    |-s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-   48 |+s = t"{set([x for x in 'ab']) | {x for x in 'ab'} }"
-49 49 |
+45 | s = t"{set([f(x) for x in 'ab'])}"
+46 | 
+47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
+   - s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
+48 + s = t"{set([x for x in 'ab']) | {x for x in 'ab'} }"
+49 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap
index efc2bb6328..a913b6fbe7 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap
@@ -9,13 +9,12 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 2 | dict([(i, i) for i in range(3)], z=4)
   |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-1   |-dict([(i, i) for i in range(3)])
-  1 |+{i: i for i in range(3)}
-2 2 | dict([(i, i) for i in range(3)], z=4)
-3 3 | 
-4 4 | def f(x):
+  - dict([(i, i) for i in range(3)])
+1 + {i: i for i in range(3)}
+2 | dict([(i, i) for i in range(3)], z=4)
+3 | 
+4 | def f(x):
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
  --> C404.py:7:4
@@ -28,16 +27,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 9 | f"{dict([(s, s) for s in 'ab'])}"
   |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-4 4 | def f(x):
-5 5 |     return x
-6 6 | 
-7   |-f'{dict([(s,s) for s in "ab"])}'
-  7 |+f'{ {s: s for s in "ab"} }'
-8 8 | f"{dict([(s,s) for s in 'ab'])}"
-9 9 | f"{dict([(s, s) for s in 'ab'])}"
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+4  | def f(x):
+5  |     return x
+6  | 
+   - f'{dict([(s,s) for s in "ab"])}'
+7  + f'{ {s: s for s in "ab"} }'
+8  | f"{dict([(s,s) for s in 'ab'])}"
+9  | f"{dict([(s, s) for s in 'ab'])}"
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:8:4
@@ -49,16 +47,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-5 5 |     return x
-6 6 | 
-7 7 | f'{dict([(s,s) for s in "ab"])}'
-8   |-f"{dict([(s,s) for s in 'ab'])}"
-  8 |+f"{ {s: s for s in 'ab'} }"
-9 9 | f"{dict([(s, s) for s in 'ab'])}"
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
-11 11 | 
+5  |     return x
+6  | 
+7  | f'{dict([(s,s) for s in "ab"])}'
+   - f"{dict([(s,s) for s in 'ab'])}"
+8  + f"{ {s: s for s in 'ab'} }"
+9  | f"{dict([(s, s) for s in 'ab'])}"
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:9:4
@@ -70,16 +67,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | f'{dict([(s,s) for s in "ab"])}'
-8  8  | f"{dict([(s,s) for s in 'ab'])}"
-9     |-f"{dict([(s, s) for s in 'ab'])}"
-   9  |+f"{ {s: s for s in 'ab'} }"
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
-11 11 | 
-12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+6  | 
+7  | f'{dict([(s,s) for s in "ab"])}'
+8  | f"{dict([(s,s) for s in 'ab'])}"
+   - f"{dict([(s, s) for s in 'ab'])}"
+9  + f"{ {s: s for s in 'ab'} }"
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+11 | 
+12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:10:4
@@ -92,16 +88,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-7  7  | f'{dict([(s,s) for s in "ab"])}'
-8  8  | f"{dict([(s,s) for s in 'ab'])}"
-9  9  | f"{dict([(s, s) for s in 'ab'])}"
-10    |-f"{dict([(s,f(s)) for s in 'ab'])}"
-   10 |+f"{ {s: f(s) for s in 'ab'} }"
-11 11 | 
-12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
-13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+7  | f'{dict([(s,s) for s in "ab"])}'
+8  | f"{dict([(s,s) for s in 'ab'])}"
+9  | f"{dict([(s, s) for s in 'ab'])}"
+   - f"{dict([(s,f(s)) for s in 'ab'])}"
+10 + f"{ {s: f(s) for s in 'ab'} }"
+11 | 
+12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:12:4
@@ -113,16 +108,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-9  9  | f"{dict([(s, s) for s in 'ab'])}"
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
-11 11 | 
-12    |-f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
-   12 |+f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"])}'
-13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-14 14 | 
-15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+9  | f"{dict([(s, s) for s in 'ab'])}"
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+11 | 
+   - f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+12 + f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"])}'
+13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+14 | 
+15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:12:34
@@ -134,16 +128,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-9  9  | f"{dict([(s, s) for s in 'ab'])}"
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
-11 11 | 
-12    |-f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
-   12 |+f'{dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }'
-13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-14 14 | 
-15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+9  | f"{dict([(s, s) for s in 'ab'])}"
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+11 | 
+   - f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+12 + f'{dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }'
+13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+14 | 
+15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:13:5
@@ -155,16 +148,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
-11 11 | 
-12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
-13    |-f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-   13 |+f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"]) }'
-14 14 | 
-15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
-16 16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+11 | 
+12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+   - f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+13 + f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"]) }'
+14 | 
+15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:13:35
@@ -176,16 +168,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-10 10 | f"{dict([(s,f(s)) for s in 'ab'])}"
-11 11 | 
-12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
-13    |-f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-   13 |+f'{ dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }'
-14 14 | 
-15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
-16 16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))
+10 | f"{dict([(s,f(s)) for s in 'ab'])}"
+11 | 
+12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
+   - f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+13 + f'{ dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }'
+14 | 
+15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))
+note: This is an unsafe fix and may change runtime behavior
 
 C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
   --> C404.py:16:14
@@ -195,10 +186,9 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension)
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite as a dict comprehension
-
-ℹ Unsafe fix
-13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-14 14 | 
-15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
-16    |-saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))
-   16 |+saved.append({k: v for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]})
+13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
+14 | 
+15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087
+   - saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))
+16 + saved.append({k: v for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]})
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap
index 5dbd827589..aac9c50c1f 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap
@@ -10,13 +10,12 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 3 | set([])
   |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-1   |-set([1, 2])
-  1 |+{1, 2}
-2 2 | set((1, 2))
-3 3 | set([])
-4 4 | set(())
+  - set([1, 2])
+1 + {1, 2}
+2 | set((1, 2))
+3 | set([])
+4 | set(())
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary tuple literal (rewrite as a set literal)
  --> C405.py:2:1
@@ -28,14 +27,13 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal)
 4 | set(())
   |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-1 1 | set([1, 2])
-2   |-set((1, 2))
-  2 |+{1, 2}
-3 3 | set([])
-4 4 | set(())
-5 5 | set()
+1 | set([1, 2])
+  - set((1, 2))
+2 + {1, 2}
+3 | set([])
+4 | set(())
+5 | set()
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
  --> C405.py:3:1
@@ -48,15 +46,14 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 5 | set()
   |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-1 1 | set([1, 2])
-2 2 | set((1, 2))
-3   |-set([])
-  3 |+set()
-4 4 | set(())
-5 5 | set()
-6 6 | set((1,))
+1 | set([1, 2])
+2 | set((1, 2))
+  - set([])
+3 + set()
+4 | set(())
+5 | set()
+6 | set((1,))
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary tuple literal (rewrite as a set literal)
  --> C405.py:4:1
@@ -69,17 +66,16 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal)
 6 | set((1,))
   |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-1 1 | set([1, 2])
-2 2 | set((1, 2))
-3 3 | set([])
-4   |-set(())
-5 4 | set()
-  5 |+set()
-6 6 | set((1,))
-7 7 | set((
-8 8 |     1,
+1 | set([1, 2])
+2 | set((1, 2))
+3 | set([])
+  - set(())
+4 | set()
+5 + set()
+6 | set((1,))
+7 | set((
+8 |     1,
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary tuple literal (rewrite as a set literal)
  --> C405.py:6:1
@@ -92,16 +88,15 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal)
 8 |     1,
   |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-3 3 | set([])
-4 4 | set(())
-5 5 | set()
-6   |-set((1,))
-  6 |+{1}
-7 7 | set((
-8 8 |     1,
-9 9 | ))
+3 | set([])
+4 | set(())
+5 | set()
+  - set((1,))
+6 + {1}
+7 | set((
+8 |     1,
+9 | ))
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary tuple literal (rewrite as a set literal)
   --> C405.py:7:1
@@ -116,19 +111,18 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal)
 11 |       1,
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-4  4  | set(())
-5  5  | set()
-6  6  | set((1,))
-7     |-set((
-   7  |+{
-8  8  |     1,
-9     |-))
-   9  |+}
-10 10 | set([
-11 11 |     1,
-12 12 | ])
+4  | set(())
+5  | set()
+6  | set((1,))
+   - set((
+7  + {
+8  |     1,
+   - ))
+9  + }
+10 | set([
+11 |     1,
+12 | ])
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:10:1
@@ -143,19 +137,18 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 14 |       (1,)
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-7  7  | set((
-8  8  |     1,
-9  9  | ))
-10    |-set([
-   10 |+{
-11 11 |     1,
-12    |-])
-   12 |+}
-13 13 | set(
-14 14 |     (1,)
-15 15 | )
+7  | set((
+8  |     1,
+9  | ))
+   - set([
+10 + {
+11 |     1,
+   - ])
+12 + }
+13 | set(
+14 |     (1,)
+15 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary tuple literal (rewrite as a set literal)
   --> C405.py:13:1
@@ -170,18 +163,17 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal)
 17 |       [1,]
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-10 10 | set([
-11 11 |     1,
-12 12 | ])
-13    |-set(
-14    |-    (1,)
-15    |-)
-   13 |+{1}
-16 14 | set(
-17 15 |     [1,]
-18 16 | )
+10 | set([
+11 |     1,
+12 | ])
+   - set(
+   -     (1,)
+   - )
+13 + {1}
+14 | set(
+15 |     [1,]
+16 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:16:1
@@ -196,18 +188,17 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 20 |   f"{set(['a', 'b'])}"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-13 13 | set(
-14 14 |     (1,)
-15 15 | )
-16    |-set(
-17    |-    [1,]
-18    |-)
-   16 |+{1,}
-19 17 | f"{set([1,2,3])}"
-20 18 | f"{set(['a', 'b'])}"
-21 19 | f'{set(["a", "b"])}'
+13 | set(
+14 |     (1,)
+15 | )
+   - set(
+   -     [1,]
+   - )
+16 + {1,}
+17 | f"{set([1,2,3])}"
+18 | f"{set(['a', 'b'])}"
+19 | f'{set(["a", "b"])}'
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:19:4
@@ -220,16 +211,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 21 | f'{set(["a", "b"])}'
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-16 16 | set(
-17 17 |     [1,]
-18 18 | )
-19    |-f"{set([1,2,3])}"
-   19 |+f"{ {1,2,3} }"
-20 20 | f"{set(['a', 'b'])}"
-21 21 | f'{set(["a", "b"])}'
-22 22 | 
+16 | set(
+17 |     [1,]
+18 | )
+   - f"{set([1,2,3])}"
+19 + f"{ {1,2,3} }"
+20 | f"{set(['a', 'b'])}"
+21 | f'{set(["a", "b"])}'
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:20:4
@@ -241,16 +231,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 21 | f'{set(["a", "b"])}'
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-17 17 |     [1,]
-18 18 | )
-19 19 | f"{set([1,2,3])}"
-20    |-f"{set(['a', 'b'])}"
-   20 |+f"{ {'a', 'b'} }"
-21 21 | f'{set(["a", "b"])}'
-22 22 | 
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
+17 |     [1,]
+18 | )
+19 | f"{set([1,2,3])}"
+   - f"{set(['a', 'b'])}"
+20 + f"{ {'a', 'b'} }"
+21 | f'{set(["a", "b"])}'
+22 | 
+23 | f"{set(['a', 'b']) - set(['a'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:21:4
@@ -263,16 +252,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 23 | f"{set(['a', 'b']) - set(['a'])}"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-18 18 | )
-19 19 | f"{set([1,2,3])}"
-20 20 | f"{set(['a', 'b'])}"
-21    |-f'{set(["a", "b"])}'
-   21 |+f'{ {"a", "b"} }'
-22 22 | 
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
+18 | )
+19 | f"{set([1,2,3])}"
+20 | f"{set(['a', 'b'])}"
+   - f'{set(["a", "b"])}'
+21 + f'{ {"a", "b"} }'
+22 | 
+23 | f"{set(['a', 'b']) - set(['a'])}"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:23:4
@@ -285,16 +273,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 25 | f"a {set(['a', 'b']) - set(['a'])} b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-20 20 | f"{set(['a', 'b'])}"
-21 21 | f'{set(["a", "b"])}'
-22 22 | 
-23    |-f"{set(['a', 'b']) - set(['a'])}"
-   23 |+f"{ {'a', 'b'} - set(['a'])}"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
+20 | f"{set(['a', 'b'])}"
+21 | f'{set(["a", "b"])}'
+22 | 
+   - f"{set(['a', 'b']) - set(['a'])}"
+23 + f"{ {'a', 'b'} - set(['a'])}"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:23:22
@@ -307,16 +294,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 25 | f"a {set(['a', 'b']) - set(['a'])} b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-20 20 | f"{set(['a', 'b'])}"
-21 21 | f'{set(["a", "b"])}'
-22 22 | 
-23    |-f"{set(['a', 'b']) - set(['a'])}"
-   23 |+f"{set(['a', 'b']) - {'a'} }"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
+20 | f"{set(['a', 'b'])}"
+21 | f'{set(["a", "b"])}'
+22 | 
+   - f"{set(['a', 'b']) - set(['a'])}"
+23 + f"{set(['a', 'b']) - {'a'} }"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:24:5
@@ -328,16 +314,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 26 | f"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-21 21 | f'{set(["a", "b"])}'
-22 22 | 
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24    |-f"{ set(['a', 'b']) - set(['a']) }"
-   24 |+f"{ {'a', 'b'} - set(['a']) }"
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
-27 27 | 
+21 | f'{set(["a", "b"])}'
+22 | 
+23 | f"{set(['a', 'b']) - set(['a'])}"
+   - f"{ set(['a', 'b']) - set(['a']) }"
+24 + f"{ {'a', 'b'} - set(['a']) }"
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:24:23
@@ -349,16 +334,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 26 | f"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-21 21 | f'{set(["a", "b"])}'
-22 22 | 
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24    |-f"{ set(['a', 'b']) - set(['a']) }"
-   24 |+f"{ set(['a', 'b']) - {'a'} }"
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
-27 27 | 
+21 | f'{set(["a", "b"])}'
+22 | 
+23 | f"{set(['a', 'b']) - set(['a'])}"
+   - f"{ set(['a', 'b']) - set(['a']) }"
+24 + f"{ set(['a', 'b']) - {'a'} }"
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:25:6
@@ -370,16 +354,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 26 | f"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
-25    |-f"a {set(['a', 'b']) - set(['a'])} b"
-   25 |+f"a { {'a', 'b'} - set(['a'])} b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
-27 27 | 
-28 28 | t"{set([1,2,3])}"
+22 | 
+23 | f"{set(['a', 'b']) - set(['a'])}"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+   - f"a {set(['a', 'b']) - set(['a'])} b"
+25 + f"a { {'a', 'b'} - set(['a'])} b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+27 | 
+28 | t"{set([1,2,3])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:25:24
@@ -391,16 +374,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 26 | f"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
-25    |-f"a {set(['a', 'b']) - set(['a'])} b"
-   25 |+f"a {set(['a', 'b']) - {'a'} } b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
-27 27 | 
-28 28 | t"{set([1,2,3])}"
+22 | 
+23 | f"{set(['a', 'b']) - set(['a'])}"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+   - f"a {set(['a', 'b']) - set(['a'])} b"
+25 + f"a {set(['a', 'b']) - {'a'} } b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+27 | 
+28 | t"{set([1,2,3])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:26:7
@@ -413,16 +395,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 28 | t"{set([1,2,3])}"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26    |-f"a { set(['a', 'b']) - set(['a']) } b"
-   26 |+f"a { {'a', 'b'} - set(['a']) } b"
-27 27 | 
-28 28 | t"{set([1,2,3])}"
-29 29 | t"{set(['a', 'b'])}"
+23 | f"{set(['a', 'b']) - set(['a'])}"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+   - f"a { set(['a', 'b']) - set(['a']) } b"
+26 + f"a { {'a', 'b'} - set(['a']) } b"
+27 | 
+28 | t"{set([1,2,3])}"
+29 | t"{set(['a', 'b'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:26:25
@@ -435,16 +416,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 28 | t"{set([1,2,3])}"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-23 23 | f"{set(['a', 'b']) - set(['a'])}"
-24 24 | f"{ set(['a', 'b']) - set(['a']) }"
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26    |-f"a { set(['a', 'b']) - set(['a']) } b"
-   26 |+f"a { set(['a', 'b']) - {'a'} } b"
-27 27 | 
-28 28 | t"{set([1,2,3])}"
-29 29 | t"{set(['a', 'b'])}"
+23 | f"{set(['a', 'b']) - set(['a'])}"
+24 | f"{ set(['a', 'b']) - set(['a']) }"
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+   - f"a { set(['a', 'b']) - set(['a']) } b"
+26 + f"a { set(['a', 'b']) - {'a'} } b"
+27 | 
+28 | t"{set([1,2,3])}"
+29 | t"{set(['a', 'b'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:28:4
@@ -457,16 +437,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 30 | t'{set(["a", "b"])}'
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-25 25 | f"a {set(['a', 'b']) - set(['a'])} b"
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
-27 27 | 
-28    |-t"{set([1,2,3])}"
-   28 |+t"{ {1,2,3} }"
-29 29 | t"{set(['a', 'b'])}"
-30 30 | t'{set(["a", "b"])}'
-31 31 | 
+25 | f"a {set(['a', 'b']) - set(['a'])} b"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+27 | 
+   - t"{set([1,2,3])}"
+28 + t"{ {1,2,3} }"
+29 | t"{set(['a', 'b'])}"
+30 | t'{set(["a", "b"])}'
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:29:4
@@ -477,16 +456,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 30 | t'{set(["a", "b"])}'
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-26 26 | f"a { set(['a', 'b']) - set(['a']) } b"
-27 27 | 
-28 28 | t"{set([1,2,3])}"
-29    |-t"{set(['a', 'b'])}"
-   29 |+t"{ {'a', 'b'} }"
-30 30 | t'{set(["a", "b"])}'
-31 31 | 
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
+26 | f"a { set(['a', 'b']) - set(['a']) } b"
+27 | 
+28 | t"{set([1,2,3])}"
+   - t"{set(['a', 'b'])}"
+29 + t"{ {'a', 'b'} }"
+30 | t'{set(["a", "b"])}'
+31 | 
+32 | t"{set(['a', 'b']) - set(['a'])}"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:30:4
@@ -499,16 +477,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 32 | t"{set(['a', 'b']) - set(['a'])}"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-27 27 | 
-28 28 | t"{set([1,2,3])}"
-29 29 | t"{set(['a', 'b'])}"
-30    |-t'{set(["a", "b"])}'
-   30 |+t'{ {"a", "b"} }'
-31 31 | 
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
+27 | 
+28 | t"{set([1,2,3])}"
+29 | t"{set(['a', 'b'])}"
+   - t'{set(["a", "b"])}'
+30 + t'{ {"a", "b"} }'
+31 | 
+32 | t"{set(['a', 'b']) - set(['a'])}"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:32:4
@@ -521,16 +498,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 34 | t"a {set(['a', 'b']) - set(['a'])} b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-29 29 | t"{set(['a', 'b'])}"
-30 30 | t'{set(["a", "b"])}'
-31 31 | 
-32    |-t"{set(['a', 'b']) - set(['a'])}"
-   32 |+t"{ {'a', 'b'} - set(['a'])}"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
-34 34 | t"a {set(['a', 'b']) - set(['a'])} b"
-35 35 | t"a { set(['a', 'b']) - set(['a']) } b"
+29 | t"{set(['a', 'b'])}"
+30 | t'{set(["a", "b"])}'
+31 | 
+   - t"{set(['a', 'b']) - set(['a'])}"
+32 + t"{ {'a', 'b'} - set(['a'])}"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+34 | t"a {set(['a', 'b']) - set(['a'])} b"
+35 | t"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:32:22
@@ -543,16 +519,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 34 | t"a {set(['a', 'b']) - set(['a'])} b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-29 29 | t"{set(['a', 'b'])}"
-30 30 | t'{set(["a", "b"])}'
-31 31 | 
-32    |-t"{set(['a', 'b']) - set(['a'])}"
-   32 |+t"{set(['a', 'b']) - {'a'} }"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
-34 34 | t"a {set(['a', 'b']) - set(['a'])} b"
-35 35 | t"a { set(['a', 'b']) - set(['a']) } b"
+29 | t"{set(['a', 'b'])}"
+30 | t'{set(["a", "b"])}'
+31 | 
+   - t"{set(['a', 'b']) - set(['a'])}"
+32 + t"{set(['a', 'b']) - {'a'} }"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+34 | t"a {set(['a', 'b']) - set(['a'])} b"
+35 | t"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:33:5
@@ -564,15 +539,14 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 35 | t"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-30 30 | t'{set(["a", "b"])}'
-31 31 | 
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33    |-t"{ set(['a', 'b']) - set(['a']) }"
-   33 |+t"{ {'a', 'b'} - set(['a']) }"
-34 34 | t"a {set(['a', 'b']) - set(['a'])} b"
-35 35 | t"a { set(['a', 'b']) - set(['a']) } b"
+30 | t'{set(["a", "b"])}'
+31 | 
+32 | t"{set(['a', 'b']) - set(['a'])}"
+   - t"{ set(['a', 'b']) - set(['a']) }"
+33 + t"{ {'a', 'b'} - set(['a']) }"
+34 | t"a {set(['a', 'b']) - set(['a'])} b"
+35 | t"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:33:23
@@ -584,15 +558,14 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 35 | t"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-30 30 | t'{set(["a", "b"])}'
-31 31 | 
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33    |-t"{ set(['a', 'b']) - set(['a']) }"
-   33 |+t"{ set(['a', 'b']) - {'a'} }"
-34 34 | t"a {set(['a', 'b']) - set(['a'])} b"
-35 35 | t"a { set(['a', 'b']) - set(['a']) } b"
+30 | t'{set(["a", "b"])}'
+31 | 
+32 | t"{set(['a', 'b']) - set(['a'])}"
+   - t"{ set(['a', 'b']) - set(['a']) }"
+33 + t"{ set(['a', 'b']) - {'a'} }"
+34 | t"a {set(['a', 'b']) - set(['a'])} b"
+35 | t"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:34:6
@@ -604,14 +577,13 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 35 | t"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-31 31 | 
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
-34    |-t"a {set(['a', 'b']) - set(['a'])} b"
-   34 |+t"a { {'a', 'b'} - set(['a'])} b"
-35 35 | t"a { set(['a', 'b']) - set(['a']) } b"
+31 | 
+32 | t"{set(['a', 'b']) - set(['a'])}"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+   - t"a {set(['a', 'b']) - set(['a'])} b"
+34 + t"a { {'a', 'b'} - set(['a'])} b"
+35 | t"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:34:24
@@ -623,14 +595,13 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
 35 | t"a { set(['a', 'b']) - set(['a']) } b"
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-31 31 | 
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
-34    |-t"a {set(['a', 'b']) - set(['a'])} b"
-   34 |+t"a {set(['a', 'b']) - {'a'} } b"
-35 35 | t"a { set(['a', 'b']) - set(['a']) } b"
+31 | 
+32 | t"{set(['a', 'b']) - set(['a'])}"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+   - t"a {set(['a', 'b']) - set(['a'])} b"
+34 + t"a {set(['a', 'b']) - {'a'} } b"
+35 | t"a { set(['a', 'b']) - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:35:7
@@ -641,13 +612,12 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
    |       ^^^^^^^^^^^^^^^
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
-34 34 | t"a {set(['a', 'b']) - set(['a'])} b"
-35    |-t"a { set(['a', 'b']) - set(['a']) } b"
-   35 |+t"a { {'a', 'b'} - set(['a']) } b"
+32 | t"{set(['a', 'b']) - set(['a'])}"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+34 | t"a {set(['a', 'b']) - set(['a'])} b"
+   - t"a { set(['a', 'b']) - set(['a']) } b"
+35 + t"a { {'a', 'b'} - set(['a']) } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C405 [*] Unnecessary list literal (rewrite as a set literal)
   --> C405.py:35:25
@@ -658,10 +628,9 @@ C405 [*] Unnecessary list literal (rewrite as a set literal)
    |                         ^^^^^^^^^^
    |
 help: Rewrite as a set literal
-
-ℹ Unsafe fix
-32 32 | t"{set(['a', 'b']) - set(['a'])}"
-33 33 | t"{ set(['a', 'b']) - set(['a']) }"
-34 34 | t"a {set(['a', 'b']) - set(['a'])} b"
-35    |-t"a { set(['a', 'b']) - set(['a']) } b"
-   35 |+t"a { set(['a', 'b']) - {'a'} } b"
+32 | t"{set(['a', 'b']) - set(['a'])}"
+33 | t"{ set(['a', 'b']) - set(['a']) }"
+34 | t"a {set(['a', 'b']) - set(['a'])} b"
+   - t"a { set(['a', 'b']) - set(['a']) } b"
+35 + t"a { set(['a', 'b']) - {'a'} } b"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap
index f5bbcf7cab..a2a29e2483 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap
@@ -10,13 +10,12 @@ C406 [*] Unnecessary list literal (rewrite as a dict literal)
 3 | d3 = dict([])
   |
 help: Rewrite as a dict literal
-
-ℹ Unsafe fix
-1   |-d1 = dict([(1, 2)])
-  1 |+d1 = {1: 2}
-2 2 | d2 = dict(((1, 2),))
-3 3 | d3 = dict([])
-4 4 | d4 = dict(())
+  - d1 = dict([(1, 2)])
+1 + d1 = {1: 2}
+2 | d2 = dict(((1, 2),))
+3 | d3 = dict([])
+4 | d4 = dict(())
+note: This is an unsafe fix and may change runtime behavior
 
 C406 [*] Unnecessary tuple literal (rewrite as a dict literal)
  --> C406.py:2:6
@@ -28,14 +27,13 @@ C406 [*] Unnecessary tuple literal (rewrite as a dict literal)
 4 | d4 = dict(())
   |
 help: Rewrite as a dict literal
-
-ℹ Unsafe fix
-1 1 | d1 = dict([(1, 2)])
-2   |-d2 = dict(((1, 2),))
-  2 |+d2 = {1: 2,}
-3 3 | d3 = dict([])
-4 4 | d4 = dict(())
-5 5 | d5 = dict()
+1 | d1 = dict([(1, 2)])
+  - d2 = dict(((1, 2),))
+2 + d2 = {1: 2,}
+3 | d3 = dict([])
+4 | d4 = dict(())
+5 | d5 = dict()
+note: This is an unsafe fix and may change runtime behavior
 
 C406 [*] Unnecessary list literal (rewrite as a dict literal)
  --> C406.py:3:6
@@ -48,14 +46,13 @@ C406 [*] Unnecessary list literal (rewrite as a dict literal)
 5 | d5 = dict()
   |
 help: Rewrite as a dict literal
-
-ℹ Unsafe fix
-1 1 | d1 = dict([(1, 2)])
-2 2 | d2 = dict(((1, 2),))
-3   |-d3 = dict([])
-  3 |+d3 = {}
-4 4 | d4 = dict(())
-5 5 | d5 = dict()
+1 | d1 = dict([(1, 2)])
+2 | d2 = dict(((1, 2),))
+  - d3 = dict([])
+3 + d3 = {}
+4 | d4 = dict(())
+5 | d5 = dict()
+note: This is an unsafe fix and may change runtime behavior
 
 C406 [*] Unnecessary tuple literal (rewrite as a dict literal)
  --> C406.py:4:6
@@ -67,11 +64,10 @@ C406 [*] Unnecessary tuple literal (rewrite as a dict literal)
 5 | d5 = dict()
   |
 help: Rewrite as a dict literal
-
-ℹ Unsafe fix
-1 1 | d1 = dict([(1, 2)])
-2 2 | d2 = dict(((1, 2),))
-3 3 | d3 = dict([])
-4   |-d4 = dict(())
-  4 |+d4 = {}
-5 5 | d5 = dict()
+1 | d1 = dict([(1, 2)])
+2 | d2 = dict(((1, 2),))
+3 | d3 = dict([])
+  - d4 = dict(())
+4 + d4 = {}
+5 | d5 = dict()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap
index 7b3de16c91..1c79c52fb3 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap
@@ -10,13 +10,12 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal)
 3 | d1 = dict()
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1   |-t = tuple()
-  1 |+t = ()
-2 2 | l = list()
-3 3 | d1 = dict()
-4 4 | d2 = dict(a=1)
+  - t = tuple()
+1 + t = ()
+2 | l = list()
+3 | d1 = dict()
+4 | d2 = dict(a=1)
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `list()` call (rewrite as a literal)
  --> C408.py:2:5
@@ -28,14 +27,13 @@ C408 [*] Unnecessary `list()` call (rewrite as a literal)
 4 | d2 = dict(a=1)
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1 1 | t = tuple()
-2   |-l = list()
-  2 |+l = []
-3 3 | d1 = dict()
-4 4 | d2 = dict(a=1)
-5 5 | d3 = dict(**d2)
+1 | t = tuple()
+  - l = list()
+2 + l = []
+3 | d1 = dict()
+4 | d2 = dict(a=1)
+5 | d3 = dict(**d2)
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
  --> C408.py:3:6
@@ -48,15 +46,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 5 | d3 = dict(**d2)
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1 1 | t = tuple()
-2 2 | l = list()
-3   |-d1 = dict()
-  3 |+d1 = {}
-4 4 | d2 = dict(a=1)
-5 5 | d3 = dict(**d2)
-6 6 | 
+1 | t = tuple()
+2 | l = list()
+  - d1 = dict()
+3 + d1 = {}
+4 | d2 = dict(a=1)
+5 | d3 = dict(**d2)
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
  --> C408.py:4:6
@@ -68,16 +65,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 5 | d3 = dict(**d2)
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1 1 | t = tuple()
-2 2 | l = list()
-3 3 | d1 = dict()
-4   |-d2 = dict(a=1)
-  4 |+d2 = {"a": 1}
-5 5 | d3 = dict(**d2)
-6 6 | 
-7 7 | 
+1 | t = tuple()
+2 | l = list()
+3 | d1 = dict()
+  - d2 = dict(a=1)
+4 + d2 = {"a": 1}
+5 | d3 = dict(**d2)
+6 | 
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:14:4
@@ -90,16 +86,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 16 | f"{dict()}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | a = list()
-13 13 | 
-14    |-f"{dict(x='y')}"
-   14 |+f"{ {'x': 'y'} }"
-15 15 | f'{dict(x="y")}'
-16 16 | f"{dict()}"
-17 17 | f"a {dict()} b"
+11 | 
+12 | a = list()
+13 | 
+   - f"{dict(x='y')}"
+14 + f"{ {'x': 'y'} }"
+15 | f'{dict(x="y")}'
+16 | f"{dict()}"
+17 | f"a {dict()} b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:15:4
@@ -111,16 +106,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 17 | f"a {dict()} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-12 12 | a = list()
-13 13 | 
-14 14 | f"{dict(x='y')}"
-15    |-f'{dict(x="y")}'
-   15 |+f'{ {"x": "y"} }'
-16 16 | f"{dict()}"
-17 17 | f"a {dict()} b"
-18 18 | 
+12 | a = list()
+13 | 
+14 | f"{dict(x='y')}"
+   - f'{dict(x="y")}'
+15 + f'{ {"x": "y"} }'
+16 | f"{dict()}"
+17 | f"a {dict()} b"
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:16:4
@@ -132,16 +126,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 17 | f"a {dict()} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | f"{dict(x='y')}"
-15 15 | f'{dict(x="y")}'
-16    |-f"{dict()}"
-   16 |+f"{ {} }"
-17 17 | f"a {dict()} b"
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
+13 | 
+14 | f"{dict(x='y')}"
+15 | f'{dict(x="y")}'
+   - f"{dict()}"
+16 + f"{ {} }"
+17 | f"a {dict()} b"
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:17:6
@@ -154,16 +147,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 19 | f"{dict(x='y') | dict(y='z')}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-14 14 | f"{dict(x='y')}"
-15 15 | f'{dict(x="y")}'
-16 16 | f"{dict()}"
-17    |-f"a {dict()} b"
-   17 |+f"a { {} } b"
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
+14 | f"{dict(x='y')}"
+15 | f'{dict(x="y")}'
+16 | f"{dict()}"
+   - f"a {dict()} b"
+17 + f"a { {} } b"
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:19:4
@@ -176,16 +168,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 21 | f"a {dict(x='y') | dict(y='z')} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-16 16 | f"{dict()}"
-17 17 | f"a {dict()} b"
-18 18 | 
-19    |-f"{dict(x='y') | dict(y='z')}"
-   19 |+f"{ {'x': 'y'} | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
+16 | f"{dict()}"
+17 | f"a {dict()} b"
+18 | 
+   - f"{dict(x='y') | dict(y='z')}"
+19 + f"{ {'x': 'y'} | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+21 | f"a {dict(x='y') | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:19:18
@@ -198,16 +189,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 21 | f"a {dict(x='y') | dict(y='z')} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-16 16 | f"{dict()}"
-17 17 | f"a {dict()} b"
-18 18 | 
-19    |-f"{dict(x='y') | dict(y='z')}"
-   19 |+f"{dict(x='y') | {'y': 'z'} }"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
+16 | f"{dict()}"
+17 | f"a {dict()} b"
+18 | 
+   - f"{dict(x='y') | dict(y='z')}"
+19 + f"{dict(x='y') | {'y': 'z'} }"
+20 | f"{ dict(x='y') | dict(y='z') }"
+21 | f"a {dict(x='y') | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:20:5
@@ -219,16 +209,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 22 | f"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-17 17 | f"a {dict()} b"
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20    |-f"{ dict(x='y') | dict(y='z') }"
-   20 |+f"{ {'x': 'y'} | dict(y='z') }"
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
-23 23 | 
+17 | f"a {dict()} b"
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+   - f"{ dict(x='y') | dict(y='z') }"
+20 + f"{ {'x': 'y'} | dict(y='z') }"
+21 | f"a {dict(x='y') | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:20:19
@@ -240,16 +229,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 22 | f"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-17 17 | f"a {dict()} b"
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20    |-f"{ dict(x='y') | dict(y='z') }"
-   20 |+f"{ dict(x='y') | {'y': 'z'} }"
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
-23 23 | 
+17 | f"a {dict()} b"
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+   - f"{ dict(x='y') | dict(y='z') }"
+20 + f"{ dict(x='y') | {'y': 'z'} }"
+21 | f"a {dict(x='y') | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:21:6
@@ -261,16 +249,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 22 | f"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
-21    |-f"a {dict(x='y') | dict(y='z')} b"
-   21 |+f"a { {'x': 'y'} | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
-23 23 | 
-24 24 | dict(
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+   - f"a {dict(x='y') | dict(y='z')} b"
+21 + f"a { {'x': 'y'} | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+23 | 
+24 | dict(
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:21:20
@@ -282,16 +269,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 22 | f"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
-21    |-f"a {dict(x='y') | dict(y='z')} b"
-   21 |+f"a {dict(x='y') | {'y': 'z'} } b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
-23 23 | 
-24 24 | dict(
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+   - f"a {dict(x='y') | dict(y='z')} b"
+21 + f"a {dict(x='y') | {'y': 'z'} } b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+23 | 
+24 | dict(
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:22:7
@@ -304,16 +290,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 24 | dict(
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22    |-f"a { dict(x='y') | dict(y='z') } b"
-   22 |+f"a { {'x': 'y'} | dict(y='z') } b"
-23 23 | 
-24 24 | dict(
-25 25 |     # comment
+19 | f"{dict(x='y') | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+21 | f"a {dict(x='y') | dict(y='z')} b"
+   - f"a { dict(x='y') | dict(y='z') } b"
+22 + f"a { {'x': 'y'} | dict(y='z') } b"
+23 | 
+24 | dict(
+25 |     # comment
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:22:21
@@ -326,16 +311,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 24 | dict(
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22    |-f"a { dict(x='y') | dict(y='z') } b"
-   22 |+f"a { dict(x='y') | {'y': 'z'} } b"
-23 23 | 
-24 24 | dict(
-25 25 |     # comment
+19 | f"{dict(x='y') | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+21 | f"a {dict(x='y') | dict(y='z')} b"
+   - f"a { dict(x='y') | dict(y='z') } b"
+22 + f"a { dict(x='y') | {'y': 'z'} } b"
+23 | 
+24 | dict(
+25 |     # comment
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:24:1
@@ -350,19 +334,18 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 28 |   tuple(  # comment
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
-23 23 | 
-24    |-dict(
-   24 |+{
-25 25 |     # comment
-26    |-)
-   26 |+}
-27 27 | 
-28 28 | tuple(  # comment
-29 29 | )
+21 | f"a {dict(x='y') | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+23 | 
+   - dict(
+24 + {
+25 |     # comment
+   - )
+26 + }
+27 | 
+28 | tuple(  # comment
+29 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `tuple()` call (rewrite as a literal)
   --> C408.py:28:1
@@ -376,16 +359,15 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal)
 31 |   t"{dict(x='y')}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-25 25 |     # comment
-26 26 | )
-27 27 | 
-28    |-tuple(  # comment
-   28 |+(  # comment
-29 29 | )
-30 30 | 
-31 31 | t"{dict(x='y')}"
+25 |     # comment
+26 | )
+27 | 
+   - tuple(  # comment
+28 + (  # comment
+29 | )
+30 | 
+31 | t"{dict(x='y')}"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:31:4
@@ -398,16 +380,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 33 | t"{dict()}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-28 28 | tuple(  # comment
-29 29 | )
-30 30 | 
-31    |-t"{dict(x='y')}"
-   31 |+t"{ {'x': 'y'} }"
-32 32 | t'{dict(x="y")}'
-33 33 | t"{dict()}"
-34 34 | t"a {dict()} b"
+28 | tuple(  # comment
+29 | )
+30 | 
+   - t"{dict(x='y')}"
+31 + t"{ {'x': 'y'} }"
+32 | t'{dict(x="y")}'
+33 | t"{dict()}"
+34 | t"a {dict()} b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:32:4
@@ -419,16 +400,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 34 | t"a {dict()} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-29 29 | )
-30 30 | 
-31 31 | t"{dict(x='y')}"
-32    |-t'{dict(x="y")}'
-   32 |+t'{ {"x": "y"} }'
-33 33 | t"{dict()}"
-34 34 | t"a {dict()} b"
-35 35 | 
+29 | )
+30 | 
+31 | t"{dict(x='y')}"
+   - t'{dict(x="y")}'
+32 + t'{ {"x": "y"} }'
+33 | t"{dict()}"
+34 | t"a {dict()} b"
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:33:4
@@ -440,16 +420,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 34 | t"a {dict()} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | t"{dict(x='y')}"
-32 32 | t'{dict(x="y")}'
-33    |-t"{dict()}"
-   33 |+t"{ {} }"
-34 34 | t"a {dict()} b"
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
+30 | 
+31 | t"{dict(x='y')}"
+32 | t'{dict(x="y")}'
+   - t"{dict()}"
+33 + t"{ {} }"
+34 | t"a {dict()} b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:34:6
@@ -462,16 +441,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 36 | t"{dict(x='y') | dict(y='z')}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-31 31 | t"{dict(x='y')}"
-32 32 | t'{dict(x="y")}'
-33 33 | t"{dict()}"
-34    |-t"a {dict()} b"
-   34 |+t"a { {} } b"
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
+31 | t"{dict(x='y')}"
+32 | t'{dict(x="y")}'
+33 | t"{dict()}"
+   - t"a {dict()} b"
+34 + t"a { {} } b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:36:4
@@ -484,16 +462,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 38 | t"a {dict(x='y') | dict(y='z')} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-33 33 | t"{dict()}"
-34 34 | t"a {dict()} b"
-35 35 | 
-36    |-t"{dict(x='y') | dict(y='z')}"
-   36 |+t"{ {'x': 'y'} | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
-38 38 | t"a {dict(x='y') | dict(y='z')} b"
-39 39 | t"a { dict(x='y') | dict(y='z') } b"
+33 | t"{dict()}"
+34 | t"a {dict()} b"
+35 | 
+   - t"{dict(x='y') | dict(y='z')}"
+36 + t"{ {'x': 'y'} | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+38 | t"a {dict(x='y') | dict(y='z')} b"
+39 | t"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:36:18
@@ -506,16 +483,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 38 | t"a {dict(x='y') | dict(y='z')} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-33 33 | t"{dict()}"
-34 34 | t"a {dict()} b"
-35 35 | 
-36    |-t"{dict(x='y') | dict(y='z')}"
-   36 |+t"{dict(x='y') | {'y': 'z'} }"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
-38 38 | t"a {dict(x='y') | dict(y='z')} b"
-39 39 | t"a { dict(x='y') | dict(y='z') } b"
+33 | t"{dict()}"
+34 | t"a {dict()} b"
+35 | 
+   - t"{dict(x='y') | dict(y='z')}"
+36 + t"{dict(x='y') | {'y': 'z'} }"
+37 | t"{ dict(x='y') | dict(y='z') }"
+38 | t"a {dict(x='y') | dict(y='z')} b"
+39 | t"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:37:5
@@ -527,15 +503,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 39 | t"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-34 34 | t"a {dict()} b"
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37    |-t"{ dict(x='y') | dict(y='z') }"
-   37 |+t"{ {'x': 'y'} | dict(y='z') }"
-38 38 | t"a {dict(x='y') | dict(y='z')} b"
-39 39 | t"a { dict(x='y') | dict(y='z') } b"
+34 | t"a {dict()} b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+   - t"{ dict(x='y') | dict(y='z') }"
+37 + t"{ {'x': 'y'} | dict(y='z') }"
+38 | t"a {dict(x='y') | dict(y='z')} b"
+39 | t"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:37:19
@@ -547,15 +522,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 39 | t"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-34 34 | t"a {dict()} b"
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37    |-t"{ dict(x='y') | dict(y='z') }"
-   37 |+t"{ dict(x='y') | {'y': 'z'} }"
-38 38 | t"a {dict(x='y') | dict(y='z')} b"
-39 39 | t"a { dict(x='y') | dict(y='z') } b"
+34 | t"a {dict()} b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+   - t"{ dict(x='y') | dict(y='z') }"
+37 + t"{ dict(x='y') | {'y': 'z'} }"
+38 | t"a {dict(x='y') | dict(y='z')} b"
+39 | t"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:38:6
@@ -567,14 +541,13 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 39 | t"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
-38    |-t"a {dict(x='y') | dict(y='z')} b"
-   38 |+t"a { {'x': 'y'} | dict(y='z')} b"
-39 39 | t"a { dict(x='y') | dict(y='z') } b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+   - t"a {dict(x='y') | dict(y='z')} b"
+38 + t"a { {'x': 'y'} | dict(y='z')} b"
+39 | t"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:38:20
@@ -586,14 +559,13 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 39 | t"a { dict(x='y') | dict(y='z') } b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
-38    |-t"a {dict(x='y') | dict(y='z')} b"
-   38 |+t"a {dict(x='y') | {'y': 'z'} } b"
-39 39 | t"a { dict(x='y') | dict(y='z') } b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+   - t"a {dict(x='y') | dict(y='z')} b"
+38 + t"a {dict(x='y') | {'y': 'z'} } b"
+39 | t"a { dict(x='y') | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:39:7
@@ -604,13 +576,12 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
    |       ^^^^^^^^^^^
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
-38 38 | t"a {dict(x='y') | dict(y='z')} b"
-39    |-t"a { dict(x='y') | dict(y='z') } b"
-   39 |+t"a { {'x': 'y'} | dict(y='z') } b"
+36 | t"{dict(x='y') | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+38 | t"a {dict(x='y') | dict(y='z')} b"
+   - t"a { dict(x='y') | dict(y='z') } b"
+39 + t"a { {'x': 'y'} | dict(y='z') } b"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:39:21
@@ -621,10 +592,9 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
    |                     ^^^^^^^^^^^
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
-38 38 | t"a {dict(x='y') | dict(y='z')} b"
-39    |-t"a { dict(x='y') | dict(y='z') } b"
-   39 |+t"a { dict(x='y') | {'y': 'z'} } b"
+36 | t"{dict(x='y') | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+38 | t"a {dict(x='y') | dict(y='z')} b"
+   - t"a { dict(x='y') | dict(y='z') } b"
+39 + t"a { dict(x='y') | {'y': 'z'} } b"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap
index 463e737348..ce243f6faa 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap
@@ -10,13 +10,12 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal)
 3 | d1 = dict()
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1   |-t = tuple()
-  1 |+t = ()
-2 2 | l = list()
-3 3 | d1 = dict()
-4 4 | d2 = dict(a=1)
+  - t = tuple()
+1 + t = ()
+2 | l = list()
+3 | d1 = dict()
+4 | d2 = dict(a=1)
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `list()` call (rewrite as a literal)
  --> C408.py:2:5
@@ -28,14 +27,13 @@ C408 [*] Unnecessary `list()` call (rewrite as a literal)
 4 | d2 = dict(a=1)
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1 1 | t = tuple()
-2   |-l = list()
-  2 |+l = []
-3 3 | d1 = dict()
-4 4 | d2 = dict(a=1)
-5 5 | d3 = dict(**d2)
+1 | t = tuple()
+  - l = list()
+2 + l = []
+3 | d1 = dict()
+4 | d2 = dict(a=1)
+5 | d3 = dict(**d2)
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
  --> C408.py:3:6
@@ -48,15 +46,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 5 | d3 = dict(**d2)
   |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-1 1 | t = tuple()
-2 2 | l = list()
-3   |-d1 = dict()
-  3 |+d1 = {}
-4 4 | d2 = dict(a=1)
-5 5 | d3 = dict(**d2)
-6 6 | 
+1 | t = tuple()
+2 | l = list()
+  - d1 = dict()
+3 + d1 = {}
+4 | d2 = dict(a=1)
+5 | d3 = dict(**d2)
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:16:4
@@ -68,16 +65,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 17 | f"a {dict()} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | f"{dict(x='y')}"
-15 15 | f'{dict(x="y")}'
-16    |-f"{dict()}"
-   16 |+f"{ {} }"
-17 17 | f"a {dict()} b"
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
+13 | 
+14 | f"{dict(x='y')}"
+15 | f'{dict(x="y")}'
+   - f"{dict()}"
+16 + f"{ {} }"
+17 | f"a {dict()} b"
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:17:6
@@ -90,16 +86,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 19 | f"{dict(x='y') | dict(y='z')}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-14 14 | f"{dict(x='y')}"
-15 15 | f'{dict(x="y")}'
-16 16 | f"{dict()}"
-17    |-f"a {dict()} b"
-   17 |+f"a { {} } b"
-18 18 | 
-19 19 | f"{dict(x='y') | dict(y='z')}"
-20 20 | f"{ dict(x='y') | dict(y='z') }"
+14 | f"{dict(x='y')}"
+15 | f'{dict(x="y")}'
+16 | f"{dict()}"
+   - f"a {dict()} b"
+17 + f"a { {} } b"
+18 | 
+19 | f"{dict(x='y') | dict(y='z')}"
+20 | f"{ dict(x='y') | dict(y='z') }"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:24:1
@@ -114,19 +109,18 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 28 |   tuple(  # comment
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-21 21 | f"a {dict(x='y') | dict(y='z')} b"
-22 22 | f"a { dict(x='y') | dict(y='z') } b"
-23 23 | 
-24    |-dict(
-   24 |+{
-25 25 |     # comment
-26    |-)
-   26 |+}
-27 27 | 
-28 28 | tuple(  # comment
-29 29 | )
+21 | f"a {dict(x='y') | dict(y='z')} b"
+22 | f"a { dict(x='y') | dict(y='z') } b"
+23 | 
+   - dict(
+24 + {
+25 |     # comment
+   - )
+26 + }
+27 | 
+28 | tuple(  # comment
+29 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `tuple()` call (rewrite as a literal)
   --> C408.py:28:1
@@ -140,16 +134,15 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal)
 31 |   t"{dict(x='y')}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-25 25 |     # comment
-26 26 | )
-27 27 | 
-28    |-tuple(  # comment
-   28 |+(  # comment
-29 29 | )
-30 30 | 
-31 31 | t"{dict(x='y')}"
+25 |     # comment
+26 | )
+27 | 
+   - tuple(  # comment
+28 + (  # comment
+29 | )
+30 | 
+31 | t"{dict(x='y')}"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:33:4
@@ -161,16 +154,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 34 | t"a {dict()} b"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | t"{dict(x='y')}"
-32 32 | t'{dict(x="y")}'
-33    |-t"{dict()}"
-   33 |+t"{ {} }"
-34 34 | t"a {dict()} b"
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
+30 | 
+31 | t"{dict(x='y')}"
+32 | t'{dict(x="y")}'
+   - t"{dict()}"
+33 + t"{ {} }"
+34 | t"a {dict()} b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+note: This is an unsafe fix and may change runtime behavior
 
 C408 [*] Unnecessary `dict()` call (rewrite as a literal)
   --> C408.py:34:6
@@ -183,13 +175,12 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal)
 36 | t"{dict(x='y') | dict(y='z')}"
    |
 help: Rewrite as a literal
-
-ℹ Unsafe fix
-31 31 | t"{dict(x='y')}"
-32 32 | t'{dict(x="y")}'
-33 33 | t"{dict()}"
-34    |-t"a {dict()} b"
-   34 |+t"a { {} } b"
-35 35 | 
-36 36 | t"{dict(x='y') | dict(y='z')}"
-37 37 | t"{ dict(x='y') | dict(y='z') }"
+31 | t"{dict(x='y')}"
+32 | t'{dict(x="y")}'
+33 | t"{dict()}"
+   - t"a {dict()} b"
+34 + t"a { {} } b"
+35 | 
+36 | t"{dict(x='y') | dict(y='z')}"
+37 | t"{ dict(x='y') | dict(y='z') }"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap
index c4b3f267d2..f8c7534525 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap
@@ -10,13 +10,12 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 3 | t3 = tuple((1, 2))
   |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-1   |-t1 = tuple([])
-  1 |+t1 = ()
-2 2 | t2 = tuple([1, 2])
-3 3 | t3 = tuple((1, 2))
-4 4 | t4 = tuple([
+  - t1 = tuple([])
+1 + t1 = ()
+2 | t2 = tuple([1, 2])
+3 | t3 = tuple((1, 2))
+4 | t4 = tuple([
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
  --> C409.py:2:6
@@ -28,14 +27,13 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 4 | t4 = tuple([
   |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-1 1 | t1 = tuple([])
-2   |-t2 = tuple([1, 2])
-  2 |+t2 = (1, 2)
-3 3 | t3 = tuple((1, 2))
-4 4 | t4 = tuple([
-5 5 |     1,
+1 | t1 = tuple([])
+  - t2 = tuple([1, 2])
+2 + t2 = (1, 2)
+3 | t3 = tuple((1, 2))
+4 | t4 = tuple([
+5 |     1,
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
  --> C409.py:3:6
@@ -48,15 +46,14 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 5 |     1,
   |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-1 1 | t1 = tuple([])
-2 2 | t2 = tuple([1, 2])
-3   |-t3 = tuple((1, 2))
-  3 |+t3 = (1, 2)
-4 4 | t4 = tuple([
-5 5 |     1,
-6 6 |     2
+1 | t1 = tuple([])
+2 | t2 = tuple([1, 2])
+  - t3 = tuple((1, 2))
+3 + t3 = (1, 2)
+4 | t4 = tuple([
+5 |     1,
+6 |     2
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
  --> C409.py:4:6
@@ -73,20 +70,19 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 9 |       (1, 2)
   |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-1 1 | t1 = tuple([])
-2 2 | t2 = tuple([1, 2])
-3 3 | t3 = tuple((1, 2))
-4   |-t4 = tuple([
-  4 |+t4 = (
-5 5 |     1,
-6 6 |     2
-7   |-])
-  7 |+)
-8 8 | t5 = tuple(
-9 9 |     (1, 2)
-10 10 | )
+1  | t1 = tuple([])
+2  | t2 = tuple([1, 2])
+3  | t3 = tuple((1, 2))
+   - t4 = tuple([
+4  + t4 = (
+5  |     1,
+6  |     2
+   - ])
+7  + )
+8  | t5 = tuple(
+9  |     (1, 2)
+10 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
   --> C409.py:8:6
@@ -102,18 +98,17 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 12 |   tuple(  # comment
    |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-5  5  |     1,
-6  6  |     2
-7  7  | ])
-8     |-t5 = tuple(
-9     |-    (1, 2)
-10    |-)
-   8  |+t5 = (1, 2)
-11 9  | 
-12 10 | tuple(  # comment
-13 11 |     [1, 2]
+5  |     1,
+6  |     2
+7  | ])
+   - t5 = tuple(
+   -     (1, 2)
+   - )
+8  + t5 = (1, 2)
+9  | 
+10 | tuple(  # comment
+11 |     [1, 2]
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:12:1
@@ -128,18 +123,17 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 16 |   tuple([  # comment
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-9  9  |     (1, 2)
-10 10 | )
-11 11 | 
-12    |-tuple(  # comment
-13    |-    [1, 2]
-14    |-)
-   12 |+(1, 2)
-15 13 | 
-16 14 | tuple([  # comment
-17 15 |     1, 2
+9  |     (1, 2)
+10 | )
+11 | 
+   - tuple(  # comment
+   -     [1, 2]
+   - )
+12 + (1, 2)
+13 | 
+14 | tuple([  # comment
+15 |     1, 2
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:16:1
@@ -154,19 +148,18 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 20 |   tuple((
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-13 13 |     [1, 2]
-14 14 | )
-15 15 | 
-16    |-tuple([  # comment
-   16 |+(  # comment
-17 17 |     1, 2
-18    |-])
-   18 |+)
-19 19 | 
-20 20 | tuple((
-21 21 |     1,
+13 |     [1, 2]
+14 | )
+15 | 
+   - tuple([  # comment
+16 + (  # comment
+17 |     1, 2
+   - ])
+18 + )
+19 | 
+20 | tuple((
+21 |     1,
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
   --> C409.py:20:1
@@ -181,19 +174,18 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 24 |   t6 = tuple([1])
    |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-17 17 |     1, 2
-18 18 | ])
-19 19 | 
-20    |-tuple((
-   20 |+(
-21 21 |     1,
-22    |-))
-   22 |+)
-23 23 | 
-24 24 | t6 = tuple([1])
-25 25 | t7 = tuple((1,))
+17 |     1, 2
+18 | ])
+19 | 
+   - tuple((
+20 + (
+21 |     1,
+   - ))
+22 + )
+23 | 
+24 | t6 = tuple([1])
+25 | t7 = tuple((1,))
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:24:6
@@ -206,16 +198,15 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 26 | t8 = tuple([1,])
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-21 21 |     1,
-22 22 | ))
-23 23 | 
-24    |-t6 = tuple([1])
-   24 |+t6 = (1,)
-25 25 | t7 = tuple((1,))
-26 26 | t8 = tuple([1,])
-27 27 | 
+21 |     1,
+22 | ))
+23 | 
+   - t6 = tuple([1])
+24 + t6 = (1,)
+25 | t7 = tuple((1,))
+26 | t8 = tuple([1,])
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
   --> C409.py:25:6
@@ -226,16 +217,15 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 26 | t8 = tuple([1,])
    |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-22 22 | ))
-23 23 | 
-24 24 | t6 = tuple([1])
-25    |-t7 = tuple((1,))
-   25 |+t7 = (1,)
-26 26 | t8 = tuple([1,])
-27 27 | 
-28 28 | tuple([x for x in range(5)])
+22 | ))
+23 | 
+24 | t6 = tuple([1])
+   - t7 = tuple((1,))
+25 + t7 = (1,)
+26 | t8 = tuple([1,])
+27 | 
+28 | tuple([x for x in range(5)])
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:26:6
@@ -248,13 +238,45 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 28 | tuple([x for x in range(5)])
    |
 help: Rewrite as a tuple literal
+23 | 
+24 | t6 = tuple([1])
+25 | t7 = tuple((1,))
+   - t8 = tuple([1,])
+26 + t8 = (1,)
+27 | 
+28 | tuple([x for x in range(5)])
+29 | tuple({x for x in range(10)})
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-23 23 | 
-24 24 | t6 = tuple([1])
-25 25 | t7 = tuple((1,))
-26    |-t8 = tuple([1,])
-   26 |+t8 = (1,)
-27 27 | 
-28 28 | tuple([x for x in range(5)])
-29 29 | tuple({x for x in range(10)})
+C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
+  --> C409.py:46:6
+   |
+44 | )
+45 |
+46 | t9 = tuple([1],)
+   |      ^^^^^^^^^^^
+47 | t10 = tuple([1, 2],)
+   |
+help: Rewrite as a tuple literal
+43 |     }
+44 | )
+45 | 
+   - t9 = tuple([1],)
+46 + t9 = (1,)
+47 | t10 = tuple([1, 2],)
+note: This is an unsafe fix and may change runtime behavior
+
+C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
+  --> C409.py:47:7
+   |
+46 | t9 = tuple([1],)
+47 | t10 = tuple([1, 2],)
+   |       ^^^^^^^^^^^^^^
+   |
+help: Rewrite as a tuple literal
+44 | )
+45 | 
+46 | t9 = tuple([1],)
+   - t10 = tuple([1, 2],)
+47 + t10 = (1, 2)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap
index 007c0a28f3..a8f904bd5f 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap
@@ -10,13 +10,12 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `
 3 | l3 = list([])
   |
 help: Remove outer `list()` call
-
-ℹ Unsafe fix
-1   |-l1 = list([1, 2])
-  1 |+l1 = [1, 2]
-2 2 | l2 = list((1, 2))
-3 3 | l3 = list([])
-4 4 | l4 = list(())
+  - l1 = list([1, 2])
+1 + l1 = [1, 2]
+2 | l2 = list((1, 2))
+3 | l3 = list([])
+4 | l4 = list(())
+note: This is an unsafe fix and may change runtime behavior
 
 C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list literal)
  --> C410.py:2:6
@@ -28,14 +27,13 @@ C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list
 4 | l4 = list(())
   |
 help: Rewrite as a single list literal
-
-ℹ Unsafe fix
-1 1 | l1 = list([1, 2])
-2   |-l2 = list((1, 2))
-  2 |+l2 = [1, 2]
-3 3 | l3 = list([])
-4 4 | l4 = list(())
-5 5 | 
+1 | l1 = list([1, 2])
+  - l2 = list((1, 2))
+2 + l2 = [1, 2]
+3 | l3 = list([])
+4 | l4 = list(())
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `list()`)
  --> C410.py:3:6
@@ -47,15 +45,14 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `
 4 | l4 = list(())
   |
 help: Remove outer `list()` call
-
-ℹ Unsafe fix
-1 1 | l1 = list([1, 2])
-2 2 | l2 = list((1, 2))
-3   |-l3 = list([])
-  3 |+l3 = []
-4 4 | l4 = list(())
-5 5 | 
-6 6 | 
+1 | l1 = list([1, 2])
+2 | l2 = list((1, 2))
+  - l3 = list([])
+3 + l3 = []
+4 | l4 = list(())
+5 | 
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list literal)
  --> C410.py:4:6
@@ -66,16 +63,15 @@ C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list
   |      ^^^^^^^^
   |
 help: Rewrite as a single list literal
-
-ℹ Unsafe fix
-1 1 | l1 = list([1, 2])
-2 2 | l2 = list((1, 2))
-3 3 | l3 = list([])
-4   |-l4 = list(())
-  4 |+l4 = []
-5 5 | 
-6 6 | 
-7 7 | list(  # comment
+1 | l1 = list([1, 2])
+2 | l2 = list((1, 2))
+3 | l3 = list([])
+  - l4 = list(())
+4 + l4 = []
+5 | 
+6 | 
+7 | list(  # comment
+note: This is an unsafe fix and may change runtime behavior
 
 C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `list()`)
   --> C410.py:7:1
@@ -88,18 +84,17 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `
 11 |   list([  # comment
    |
 help: Remove outer `list()` call
-
-ℹ Unsafe fix
-4  4  | l4 = list(())
-5  5  | 
-6  6  | 
-7     |-list(  # comment
-8     |-    [1, 2]
-9     |-)
-   7  |+[1, 2]
-10 8  | 
-11 9  | list([  # comment
-12 10 |     1, 2
+4  | l4 = list(())
+5  | 
+6  | 
+   - list(  # comment
+   -     [1, 2]
+   - )
+7  + [1, 2]
+8  | 
+9  | list([  # comment
+10 |     1, 2
+note: This is an unsafe fix and may change runtime behavior
 
 C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `list()`)
   --> C410.py:11:1
@@ -114,16 +109,15 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `
 15 |   # Skip when too many positional arguments
    |
 help: Remove outer `list()` call
-
-ℹ Unsafe fix
-8  8  |     [1, 2]
-9  9  | )
-10 10 | 
-11    |-list([  # comment
-   11 |+[  # comment
-12 12 |     1, 2
-13    |-])
-   13 |+]
-14 14 | 
-15 15 | # Skip when too many positional arguments
-16 16 | # See https://github.com/astral-sh/ruff/issues/15810
+8  |     [1, 2]
+9  | )
+10 | 
+   - list([  # comment
+11 + [  # comment
+12 |     1, 2
+   - ])
+13 + ]
+14 | 
+15 | # Skip when too many positional arguments
+16 | # See https://github.com/astral-sh/ruff/issues/15810
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap
index 97a9e26e57..dc3353fefd 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap
@@ -11,11 +11,10 @@ C411 [*] Unnecessary `list()` call (remove the outer call to `list()`)
 4 | # Skip when too many positional arguments
   |
 help: Remove outer `list()` call
-
-ℹ Unsafe fix
-1 1 | x = [1, 2, 3]
-2   |-list([i for i in x])
-  2 |+[i for i in x]
-3 3 | 
-4 4 | # Skip when too many positional arguments
-5 5 | # or keyword argument present.
+1 | x = [1, 2, 3]
+  - list([i for i in x])
+2 + [i for i in x]
+3 | 
+4 | # Skip when too many positional arguments
+5 | # or keyword argument present.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap
index ac89c788b0..e52995335c 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap
@@ -12,15 +12,13 @@ C413 [*] Unnecessary `list()` call around `sorted()`
 5 | reversed(sorted(x, key=lambda e: e))
   |
 help: Remove unnecessary `list()` call
-
-ℹ Safe fix
-1 1 | x = [2, 3, 1]
-2 2 | list(x)
-3   |-list(sorted(x))
-  3 |+sorted(x)
-4 4 | reversed(sorted(x))
-5 5 | reversed(sorted(x, key=lambda e: e))
-6 6 | reversed(sorted(x, reverse=True))
+1 | x = [2, 3, 1]
+2 | list(x)
+  - list(sorted(x))
+3 + sorted(x)
+4 | reversed(sorted(x))
+5 | reversed(sorted(x, key=lambda e: e))
+6 | reversed(sorted(x, reverse=True))
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
  --> C413.py:4:1
@@ -33,16 +31,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 6 | reversed(sorted(x, reverse=True))
   |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-1 1 | x = [2, 3, 1]
-2 2 | list(x)
-3 3 | list(sorted(x))
-4   |-reversed(sorted(x))
-  4 |+sorted(x, reverse=True)
-5 5 | reversed(sorted(x, key=lambda e: e))
-6 6 | reversed(sorted(x, reverse=True))
-7 7 | reversed(sorted(x, key=lambda e: e, reverse=True))
+1 | x = [2, 3, 1]
+2 | list(x)
+3 | list(sorted(x))
+  - reversed(sorted(x))
+4 + sorted(x, reverse=True)
+5 | reversed(sorted(x, key=lambda e: e))
+6 | reversed(sorted(x, reverse=True))
+7 | reversed(sorted(x, key=lambda e: e, reverse=True))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
  --> C413.py:5:1
@@ -55,16 +52,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 7 | reversed(sorted(x, key=lambda e: e, reverse=True))
   |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-2 2 | list(x)
-3 3 | list(sorted(x))
-4 4 | reversed(sorted(x))
-5   |-reversed(sorted(x, key=lambda e: e))
-  5 |+sorted(x, key=lambda e: e, reverse=True)
-6 6 | reversed(sorted(x, reverse=True))
-7 7 | reversed(sorted(x, key=lambda e: e, reverse=True))
-8 8 | reversed(sorted(x, reverse=True, key=lambda e: e))
+2 | list(x)
+3 | list(sorted(x))
+4 | reversed(sorted(x))
+  - reversed(sorted(x, key=lambda e: e))
+5 + sorted(x, key=lambda e: e, reverse=True)
+6 | reversed(sorted(x, reverse=True))
+7 | reversed(sorted(x, key=lambda e: e, reverse=True))
+8 | reversed(sorted(x, reverse=True, key=lambda e: e))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
  --> C413.py:6:1
@@ -77,16 +73,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 8 | reversed(sorted(x, reverse=True, key=lambda e: e))
   |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-3 3 | list(sorted(x))
-4 4 | reversed(sorted(x))
-5 5 | reversed(sorted(x, key=lambda e: e))
-6   |-reversed(sorted(x, reverse=True))
-  6 |+sorted(x, reverse=False)
-7 7 | reversed(sorted(x, key=lambda e: e, reverse=True))
-8 8 | reversed(sorted(x, reverse=True, key=lambda e: e))
-9 9 | reversed(sorted(x, reverse=False))
+3 | list(sorted(x))
+4 | reversed(sorted(x))
+5 | reversed(sorted(x, key=lambda e: e))
+  - reversed(sorted(x, reverse=True))
+6 + sorted(x, reverse=False)
+7 | reversed(sorted(x, key=lambda e: e, reverse=True))
+8 | reversed(sorted(x, reverse=True, key=lambda e: e))
+9 | reversed(sorted(x, reverse=False))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
  --> C413.py:7:1
@@ -99,16 +94,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 9 | reversed(sorted(x, reverse=False))
   |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-4 4 | reversed(sorted(x))
-5 5 | reversed(sorted(x, key=lambda e: e))
-6 6 | reversed(sorted(x, reverse=True))
-7   |-reversed(sorted(x, key=lambda e: e, reverse=True))
-  7 |+sorted(x, key=lambda e: e, reverse=False)
-8 8 | reversed(sorted(x, reverse=True, key=lambda e: e))
-9 9 | reversed(sorted(x, reverse=False))
-10 10 | reversed(sorted(x, reverse=x))
+4  | reversed(sorted(x))
+5  | reversed(sorted(x, key=lambda e: e))
+6  | reversed(sorted(x, reverse=True))
+   - reversed(sorted(x, key=lambda e: e, reverse=True))
+7  + sorted(x, key=lambda e: e, reverse=False)
+8  | reversed(sorted(x, reverse=True, key=lambda e: e))
+9  | reversed(sorted(x, reverse=False))
+10 | reversed(sorted(x, reverse=x))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:8:1
@@ -121,16 +115,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 10 | reversed(sorted(x, reverse=x))
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-5 5 | reversed(sorted(x, key=lambda e: e))
-6 6 | reversed(sorted(x, reverse=True))
-7 7 | reversed(sorted(x, key=lambda e: e, reverse=True))
-8   |-reversed(sorted(x, reverse=True, key=lambda e: e))
-  8 |+sorted(x, reverse=False, key=lambda e: e)
-9 9 | reversed(sorted(x, reverse=False))
-10 10 | reversed(sorted(x, reverse=x))
-11 11 | reversed(sorted(x, reverse=not x))
+5  | reversed(sorted(x, key=lambda e: e))
+6  | reversed(sorted(x, reverse=True))
+7  | reversed(sorted(x, key=lambda e: e, reverse=True))
+   - reversed(sorted(x, reverse=True, key=lambda e: e))
+8  + sorted(x, reverse=False, key=lambda e: e)
+9  | reversed(sorted(x, reverse=False))
+10 | reversed(sorted(x, reverse=x))
+11 | reversed(sorted(x, reverse=not x))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:9:1
@@ -143,16 +136,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 11 | reversed(sorted(x, reverse=not x))
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-6  6  | reversed(sorted(x, reverse=True))
-7  7  | reversed(sorted(x, key=lambda e: e, reverse=True))
-8  8  | reversed(sorted(x, reverse=True, key=lambda e: e))
-9     |-reversed(sorted(x, reverse=False))
-   9  |+sorted(x, reverse=True)
-10 10 | reversed(sorted(x, reverse=x))
-11 11 | reversed(sorted(x, reverse=not x))
-12 12 | 
+6  | reversed(sorted(x, reverse=True))
+7  | reversed(sorted(x, key=lambda e: e, reverse=True))
+8  | reversed(sorted(x, reverse=True, key=lambda e: e))
+   - reversed(sorted(x, reverse=False))
+9  + sorted(x, reverse=True)
+10 | reversed(sorted(x, reverse=x))
+11 | reversed(sorted(x, reverse=not x))
+12 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:10:1
@@ -164,16 +156,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 11 | reversed(sorted(x, reverse=not x))
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-7  7  | reversed(sorted(x, key=lambda e: e, reverse=True))
-8  8  | reversed(sorted(x, reverse=True, key=lambda e: e))
-9  9  | reversed(sorted(x, reverse=False))
-10    |-reversed(sorted(x, reverse=x))
-   10 |+sorted(x, reverse=not x)
-11 11 | reversed(sorted(x, reverse=not x))
-12 12 | 
-13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
+7  | reversed(sorted(x, key=lambda e: e, reverse=True))
+8  | reversed(sorted(x, reverse=True, key=lambda e: e))
+9  | reversed(sorted(x, reverse=False))
+   - reversed(sorted(x, reverse=x))
+10 + sorted(x, reverse=not x)
+11 | reversed(sorted(x, reverse=not x))
+12 | 
+13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:11:1
@@ -186,16 +177,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-8  8  | reversed(sorted(x, reverse=True, key=lambda e: e))
-9  9  | reversed(sorted(x, reverse=False))
-10 10 | reversed(sorted(x, reverse=x))
-11    |-reversed(sorted(x, reverse=not x))
-   11 |+sorted(x, reverse=x)
-12 12 | 
-13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
-14 14 | reversed(sorted(i for i in range(42)))
+8  | reversed(sorted(x, reverse=True, key=lambda e: e))
+9  | reversed(sorted(x, reverse=False))
+10 | reversed(sorted(x, reverse=x))
+   - reversed(sorted(x, reverse=not x))
+11 + sorted(x, reverse=x)
+12 | 
+13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
+14 | reversed(sorted(i for i in range(42)))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:14:1
@@ -206,16 +196,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 15 | reversed(sorted((i for i in range(42)), reverse=True))
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-11 11 | reversed(sorted(x, reverse=not x))
-12 12 | 
-13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
-14    |-reversed(sorted(i for i in range(42)))
-   14 |+sorted((i for i in range(42)), reverse=True)
-15 15 | reversed(sorted((i for i in range(42)), reverse=True))
-16 16 | 
-17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
+11 | reversed(sorted(x, reverse=not x))
+12 | 
+13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
+   - reversed(sorted(i for i in range(42)))
+14 + sorted((i for i in range(42)), reverse=True)
+15 | reversed(sorted((i for i in range(42)), reverse=True))
+16 | 
+17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:15:1
@@ -228,16 +217,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
-14 14 | reversed(sorted(i for i in range(42)))
-15    |-reversed(sorted((i for i in range(42)), reverse=True))
-   15 |+sorted((i for i in range(42)), reverse=False)
-16 16 | 
-17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
-18 18 | reversed(sorted([1, 2, 3], reverse=False or True))
+12 | 
+13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289
+14 | reversed(sorted(i for i in range(42)))
+   - reversed(sorted((i for i in range(42)), reverse=True))
+15 + sorted((i for i in range(42)), reverse=False)
+16 | 
+17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
+18 | reversed(sorted([1, 2, 3], reverse=False or True))
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:18:1
@@ -248,16 +236,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 19 | reversed(sorted([1, 2, 3], reverse=(False or True)))
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-15 15 | reversed(sorted((i for i in range(42)), reverse=True))
-16 16 | 
-17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
-18    |-reversed(sorted([1, 2, 3], reverse=False or True))
-   18 |+sorted([1, 2, 3], reverse=not (False or True))
-19 19 | reversed(sorted([1, 2, 3], reverse=(False or True)))
-20 20 | 
-21 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
+15 | reversed(sorted((i for i in range(42)), reverse=True))
+16 | 
+17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
+   - reversed(sorted([1, 2, 3], reverse=False or True))
+18 + sorted([1, 2, 3], reverse=not (False or True))
+19 | reversed(sorted([1, 2, 3], reverse=(False or True)))
+20 | 
+21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:19:1
@@ -270,16 +257,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
-18 18 | reversed(sorted([1, 2, 3], reverse=False or True))
-19    |-reversed(sorted([1, 2, 3], reverse=(False or True)))
-   19 |+sorted([1, 2, 3], reverse=not (False or True))
-20 20 | 
-21 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
-22 22 | # changes.
+16 | 
+17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335
+18 | reversed(sorted([1, 2, 3], reverse=False or True))
+   - reversed(sorted([1, 2, 3], reverse=(False or True)))
+19 + sorted([1, 2, 3], reverse=not (False or True))
+20 | 
+21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
+22 | # changes.
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `reversed()` call around `sorted()`
   --> C413.py:24:1
@@ -293,18 +279,17 @@ C413 [*] Unnecessary `reversed()` call around `sorted()`
 27 |       (""))
    |
 help: Remove unnecessary `reversed()` call
-
-ℹ Unsafe fix
-21 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
-22 22 | # changes.
-23 23 | # See https://github.com/astral-sh/ruff/issues/15789
-24    |-reversed(sorted
-25    |-(""))
-   24 |+(sorted
-   25 |+("", reverse=True))
-26 26 | list(sorted
-27 27 |     (""))
-28 28 | list(sorted
+21 | # These fixes need to be parenthesized to avoid syntax errors and behavior
+22 | # changes.
+23 | # See https://github.com/astral-sh/ruff/issues/15789
+   - reversed(sorted
+   - (""))
+24 + (sorted
+25 + ("", reverse=True))
+26 | list(sorted
+27 |     (""))
+28 | list(sorted
+note: This is an unsafe fix and may change runtime behavior
 
 C413 [*] Unnecessary `list()` call around `sorted()`
   --> C413.py:26:1
@@ -318,16 +303,14 @@ C413 [*] Unnecessary `list()` call around `sorted()`
 29 |   ("xy"))
    |
 help: Remove unnecessary `list()` call
-
-ℹ Safe fix
-23 23 | # See https://github.com/astral-sh/ruff/issues/15789
-24 24 | reversed(sorted
-25 25 | (""))
-26    |-list(sorted
-   26 |+(sorted
-27 27 |     (""))
-28 28 | list(sorted
-29 29 | ("xy"))
+23 | # See https://github.com/astral-sh/ruff/issues/15789
+24 | reversed(sorted
+25 | (""))
+   - list(sorted
+26 + (sorted
+27 |     (""))
+28 | list(sorted
+29 | ("xy"))
 
 C413 [*] Unnecessary `list()` call around `sorted()`
   --> C413.py:28:1
@@ -339,11 +322,9 @@ C413 [*] Unnecessary `list()` call around `sorted()`
    | |_______^
    |
 help: Remove unnecessary `list()` call
-
-ℹ Safe fix
-25 25 | (""))
-26 26 | list(sorted
-27 27 |     (""))
-28    |-list(sorted
-   28 |+(sorted
-29 29 | ("xy"))
+25 | (""))
+26 | list(sorted
+27 |     (""))
+   - list(sorted
+28 + (sorted
+29 | ("xy"))
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap
index 322fd197f9..8205a3921d 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap
@@ -11,14 +11,13 @@ C414 [*] Unnecessary `list()` call within `list()`
 4 | tuple(list(x))
   |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-1 1 | x = [1, 2, 3]
-2   |-list(list(x))
-  2 |+list(x)
-3 3 | list(tuple(x))
-4 4 | tuple(list(x))
-5 5 | tuple(tuple(x))
+1 | x = [1, 2, 3]
+  - list(list(x))
+2 + list(x)
+3 | list(tuple(x))
+4 | tuple(list(x))
+5 | tuple(tuple(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `tuple()` call within `list()`
  --> C414.py:3:1
@@ -31,15 +30,14 @@ C414 [*] Unnecessary `tuple()` call within `list()`
 5 | tuple(tuple(x))
   |
 help: Remove the inner `tuple()` call
-
-ℹ Unsafe fix
-1 1 | x = [1, 2, 3]
-2 2 | list(list(x))
-3   |-list(tuple(x))
-  3 |+list(x)
-4 4 | tuple(list(x))
-5 5 | tuple(tuple(x))
-6 6 | set(set(x))
+1 | x = [1, 2, 3]
+2 | list(list(x))
+  - list(tuple(x))
+3 + list(x)
+4 | tuple(list(x))
+5 | tuple(tuple(x))
+6 | set(set(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `tuple()`
  --> C414.py:4:1
@@ -52,16 +50,15 @@ C414 [*] Unnecessary `list()` call within `tuple()`
 6 | set(set(x))
   |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-1 1 | x = [1, 2, 3]
-2 2 | list(list(x))
-3 3 | list(tuple(x))
-4   |-tuple(list(x))
-  4 |+tuple(x)
-5 5 | tuple(tuple(x))
-6 6 | set(set(x))
-7 7 | set(list(x))
+1 | x = [1, 2, 3]
+2 | list(list(x))
+3 | list(tuple(x))
+  - tuple(list(x))
+4 + tuple(x)
+5 | tuple(tuple(x))
+6 | set(set(x))
+7 | set(list(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `tuple()` call within `tuple()`
  --> C414.py:5:1
@@ -74,16 +71,15 @@ C414 [*] Unnecessary `tuple()` call within `tuple()`
 7 | set(list(x))
   |
 help: Remove the inner `tuple()` call
-
-ℹ Unsafe fix
-2 2 | list(list(x))
-3 3 | list(tuple(x))
-4 4 | tuple(list(x))
-5   |-tuple(tuple(x))
-  5 |+tuple(x)
-6 6 | set(set(x))
-7 7 | set(list(x))
-8 8 | set(tuple(x))
+2 | list(list(x))
+3 | list(tuple(x))
+4 | tuple(list(x))
+  - tuple(tuple(x))
+5 + tuple(x)
+6 | set(set(x))
+7 | set(list(x))
+8 | set(tuple(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `set()` call within `set()`
  --> C414.py:6:1
@@ -96,16 +92,15 @@ C414 [*] Unnecessary `set()` call within `set()`
 8 | set(tuple(x))
   |
 help: Remove the inner `set()` call
-
-ℹ Unsafe fix
-3 3 | list(tuple(x))
-4 4 | tuple(list(x))
-5 5 | tuple(tuple(x))
-6   |-set(set(x))
-  6 |+set(x)
-7 7 | set(list(x))
-8 8 | set(tuple(x))
-9 9 | set(sorted(x))
+3 | list(tuple(x))
+4 | tuple(list(x))
+5 | tuple(tuple(x))
+  - set(set(x))
+6 + set(x)
+7 | set(list(x))
+8 | set(tuple(x))
+9 | set(sorted(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `set()`
  --> C414.py:7:1
@@ -118,16 +113,15 @@ C414 [*] Unnecessary `list()` call within `set()`
 9 | set(sorted(x))
   |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-4 4 | tuple(list(x))
-5 5 | tuple(tuple(x))
-6 6 | set(set(x))
-7   |-set(list(x))
-  7 |+set(x)
-8 8 | set(tuple(x))
-9 9 | set(sorted(x))
-10 10 | set(sorted(x, key=lambda y: y))
+4  | tuple(list(x))
+5  | tuple(tuple(x))
+6  | set(set(x))
+   - set(list(x))
+7  + set(x)
+8  | set(tuple(x))
+9  | set(sorted(x))
+10 | set(sorted(x, key=lambda y: y))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `tuple()` call within `set()`
   --> C414.py:8:1
@@ -140,16 +134,15 @@ C414 [*] Unnecessary `tuple()` call within `set()`
 10 | set(sorted(x, key=lambda y: y))
    |
 help: Remove the inner `tuple()` call
-
-ℹ Unsafe fix
-5 5 | tuple(tuple(x))
-6 6 | set(set(x))
-7 7 | set(list(x))
-8   |-set(tuple(x))
-  8 |+set(x)
-9 9 | set(sorted(x))
-10 10 | set(sorted(x, key=lambda y: y))
-11 11 | set(reversed(x))
+5  | tuple(tuple(x))
+6  | set(set(x))
+7  | set(list(x))
+   - set(tuple(x))
+8  + set(x)
+9  | set(sorted(x))
+10 | set(sorted(x, key=lambda y: y))
+11 | set(reversed(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `sorted()` call within `set()`
   --> C414.py:9:1
@@ -162,16 +155,15 @@ C414 [*] Unnecessary `sorted()` call within `set()`
 11 | set(reversed(x))
    |
 help: Remove the inner `sorted()` call
-
-ℹ Unsafe fix
-6  6  | set(set(x))
-7  7  | set(list(x))
-8  8  | set(tuple(x))
-9     |-set(sorted(x))
-   9  |+set(x)
-10 10 | set(sorted(x, key=lambda y: y))
-11 11 | set(reversed(x))
-12 12 | sorted(list(x))
+6  | set(set(x))
+7  | set(list(x))
+8  | set(tuple(x))
+   - set(sorted(x))
+9  + set(x)
+10 | set(sorted(x, key=lambda y: y))
+11 | set(reversed(x))
+12 | sorted(list(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `sorted()` call within `set()`
   --> C414.py:10:1
@@ -184,16 +176,15 @@ C414 [*] Unnecessary `sorted()` call within `set()`
 12 | sorted(list(x))
    |
 help: Remove the inner `sorted()` call
-
-ℹ Unsafe fix
-7  7  | set(list(x))
-8  8  | set(tuple(x))
-9  9  | set(sorted(x))
-10    |-set(sorted(x, key=lambda y: y))
-   10 |+set(x)
-11 11 | set(reversed(x))
-12 12 | sorted(list(x))
-13 13 | sorted(tuple(x))
+7  | set(list(x))
+8  | set(tuple(x))
+9  | set(sorted(x))
+   - set(sorted(x, key=lambda y: y))
+10 + set(x)
+11 | set(reversed(x))
+12 | sorted(list(x))
+13 | sorted(tuple(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `reversed()` call within `set()`
   --> C414.py:11:1
@@ -206,16 +197,15 @@ C414 [*] Unnecessary `reversed()` call within `set()`
 13 | sorted(tuple(x))
    |
 help: Remove the inner `reversed()` call
-
-ℹ Unsafe fix
-8  8  | set(tuple(x))
-9  9  | set(sorted(x))
-10 10 | set(sorted(x, key=lambda y: y))
-11    |-set(reversed(x))
-   11 |+set(x)
-12 12 | sorted(list(x))
-13 13 | sorted(tuple(x))
-14 14 | sorted(sorted(x))
+8  | set(tuple(x))
+9  | set(sorted(x))
+10 | set(sorted(x, key=lambda y: y))
+   - set(reversed(x))
+11 + set(x)
+12 | sorted(list(x))
+13 | sorted(tuple(x))
+14 | sorted(sorted(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `sorted()`
   --> C414.py:12:1
@@ -228,16 +218,15 @@ C414 [*] Unnecessary `list()` call within `sorted()`
 14 | sorted(sorted(x))
    |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-9  9  | set(sorted(x))
-10 10 | set(sorted(x, key=lambda y: y))
-11 11 | set(reversed(x))
-12    |-sorted(list(x))
-   12 |+sorted(x)
-13 13 | sorted(tuple(x))
-14 14 | sorted(sorted(x))
-15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+9  | set(sorted(x))
+10 | set(sorted(x, key=lambda y: y))
+11 | set(reversed(x))
+   - sorted(list(x))
+12 + sorted(x)
+13 | sorted(tuple(x))
+14 | sorted(sorted(x))
+15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `tuple()` call within `sorted()`
   --> C414.py:13:1
@@ -250,16 +239,15 @@ C414 [*] Unnecessary `tuple()` call within `sorted()`
 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
    |
 help: Remove the inner `tuple()` call
-
-ℹ Unsafe fix
-10 10 | set(sorted(x, key=lambda y: y))
-11 11 | set(reversed(x))
-12 12 | sorted(list(x))
-13    |-sorted(tuple(x))
-   13 |+sorted(x)
-14 14 | sorted(sorted(x))
-15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-16 16 | sorted(sorted(x, reverse=True), reverse=True)
+10 | set(sorted(x, key=lambda y: y))
+11 | set(reversed(x))
+12 | sorted(list(x))
+   - sorted(tuple(x))
+13 + sorted(x)
+14 | sorted(sorted(x))
+15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+16 | sorted(sorted(x, reverse=True), reverse=True)
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `sorted()` call within `sorted()`
   --> C414.py:14:1
@@ -272,16 +260,15 @@ C414 [*] Unnecessary `sorted()` call within `sorted()`
 16 | sorted(sorted(x, reverse=True), reverse=True)
    |
 help: Remove the inner `sorted()` call
-
-ℹ Unsafe fix
-11 11 | set(reversed(x))
-12 12 | sorted(list(x))
-13 13 | sorted(tuple(x))
-14    |-sorted(sorted(x))
-   14 |+sorted(x)
-15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-16 16 | sorted(sorted(x, reverse=True), reverse=True)
-17 17 | sorted(reversed(x))
+11 | set(reversed(x))
+12 | sorted(list(x))
+13 | sorted(tuple(x))
+   - sorted(sorted(x))
+14 + sorted(x)
+15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+16 | sorted(sorted(x, reverse=True), reverse=True)
+17 | sorted(reversed(x))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `sorted()` call within `sorted()`
   --> C414.py:15:1
@@ -294,16 +281,15 @@ C414 [*] Unnecessary `sorted()` call within `sorted()`
 17 | sorted(reversed(x))
    |
 help: Remove the inner `sorted()` call
-
-ℹ Unsafe fix
-12 12 | sorted(list(x))
-13 13 | sorted(tuple(x))
-14 14 | sorted(sorted(x))
-15    |-sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-   15 |+sorted(x, reverse=False, key=foo)
-16 16 | sorted(sorted(x, reverse=True), reverse=True)
-17 17 | sorted(reversed(x))
-18 18 | sorted(list(x), key=lambda y: y)
+12 | sorted(list(x))
+13 | sorted(tuple(x))
+14 | sorted(sorted(x))
+   - sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+15 + sorted(x, reverse=False, key=foo)
+16 | sorted(sorted(x, reverse=True), reverse=True)
+17 | sorted(reversed(x))
+18 | sorted(list(x), key=lambda y: y)
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `sorted()` call within `sorted()`
   --> C414.py:16:1
@@ -316,16 +302,15 @@ C414 [*] Unnecessary `sorted()` call within `sorted()`
 18 | sorted(list(x), key=lambda y: y)
    |
 help: Remove the inner `sorted()` call
-
-ℹ Unsafe fix
-13 13 | sorted(tuple(x))
-14 14 | sorted(sorted(x))
-15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-16    |-sorted(sorted(x, reverse=True), reverse=True)
-   16 |+sorted(x, reverse=True)
-17 17 | sorted(reversed(x))
-18 18 | sorted(list(x), key=lambda y: y)
-19 19 | tuple(
+13 | sorted(tuple(x))
+14 | sorted(sorted(x))
+15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+   - sorted(sorted(x, reverse=True), reverse=True)
+16 + sorted(x, reverse=True)
+17 | sorted(reversed(x))
+18 | sorted(list(x), key=lambda y: y)
+19 | tuple(
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `reversed()` call within `sorted()`
   --> C414.py:17:1
@@ -338,16 +323,15 @@ C414 [*] Unnecessary `reversed()` call within `sorted()`
 19 | tuple(
    |
 help: Remove the inner `reversed()` call
-
-ℹ Unsafe fix
-14 14 | sorted(sorted(x))
-15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-16 16 | sorted(sorted(x, reverse=True), reverse=True)
-17    |-sorted(reversed(x))
-   17 |+sorted(x)
-18 18 | sorted(list(x), key=lambda y: y)
-19 19 | tuple(
-20 20 |     list(
+14 | sorted(sorted(x))
+15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+16 | sorted(sorted(x, reverse=True), reverse=True)
+   - sorted(reversed(x))
+17 + sorted(x)
+18 | sorted(list(x), key=lambda y: y)
+19 | tuple(
+20 |     list(
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `sorted()`
   --> C414.py:18:1
@@ -360,16 +344,15 @@ C414 [*] Unnecessary `list()` call within `sorted()`
 20 |     list(
    |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-16 16 | sorted(sorted(x, reverse=True), reverse=True)
-17 17 | sorted(reversed(x))
-18    |-sorted(list(x), key=lambda y: y)
-   18 |+sorted(x, key=lambda y: y)
-19 19 | tuple(
-20 20 |     list(
-21 21 |         [x, 3, "hell"\
+15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
+16 | sorted(sorted(x, reverse=True), reverse=True)
+17 | sorted(reversed(x))
+   - sorted(list(x), key=lambda y: y)
+18 + sorted(x, key=lambda y: y)
+19 | tuple(
+20 |     list(
+21 |         [x, 3, "hell"\
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `tuple()`
   --> C414.py:19:1
@@ -387,19 +370,18 @@ C414 [*] Unnecessary `list()` call within `tuple()`
 26 |   set(list())
    |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-17 17 | sorted(reversed(x))
-18 18 | sorted(list(x), key=lambda y: y)
-19 19 | tuple(
-20    |-    list(
-21    |-        [x, 3, "hell"\
-   20 |+    [x, 3, "hell"\
-22 21 |         "o"]
-23    |-    )
-24 22 | )
-25 23 | set(set())
-26 24 | set(list())
+17 | sorted(reversed(x))
+18 | sorted(list(x), key=lambda y: y)
+19 | tuple(
+   -     list(
+   -         [x, 3, "hell"\
+20 +     [x, 3, "hell"\
+21 |         "o"]
+   -     )
+22 | )
+23 | set(set())
+24 | set(list())
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `set()` call within `set()`
   --> C414.py:25:1
@@ -412,16 +394,15 @@ C414 [*] Unnecessary `set()` call within `set()`
 27 | set(tuple())
    |
 help: Remove the inner `set()` call
-
-ℹ Unsafe fix
-22 22 |         "o"]
-23 23 |     )
-24 24 | )
-25    |-set(set())
-   25 |+set()
-26 26 | set(list())
-27 27 | set(tuple())
-28 28 | sorted(reversed())
+22 |         "o"]
+23 |     )
+24 | )
+   - set(set())
+25 + set()
+26 | set(list())
+27 | set(tuple())
+28 | sorted(reversed())
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `set()`
   --> C414.py:26:1
@@ -434,16 +415,15 @@ C414 [*] Unnecessary `list()` call within `set()`
 28 | sorted(reversed())
    |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-23 23 |     )
-24 24 | )
-25 25 | set(set())
-26    |-set(list())
-   26 |+set()
-27 27 | set(tuple())
-28 28 | sorted(reversed())
-29 29 | 
+23 |     )
+24 | )
+25 | set(set())
+   - set(list())
+26 + set()
+27 | set(tuple())
+28 | sorted(reversed())
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `tuple()` call within `set()`
   --> C414.py:27:1
@@ -455,16 +435,15 @@ C414 [*] Unnecessary `tuple()` call within `set()`
 28 | sorted(reversed())
    |
 help: Remove the inner `tuple()` call
-
-ℹ Unsafe fix
-24 24 | )
-25 25 | set(set())
-26 26 | set(list())
-27    |-set(tuple())
-   27 |+set()
-28 28 | sorted(reversed())
-29 29 | 
-30 30 | # Nested sorts with differing keyword arguments. Not flagged.
+24 | )
+25 | set(set())
+26 | set(list())
+   - set(tuple())
+27 + set()
+28 | sorted(reversed())
+29 | 
+30 | # Nested sorts with differing keyword arguments. Not flagged.
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `reversed()` call within `sorted()`
   --> C414.py:28:1
@@ -477,16 +456,15 @@ C414 [*] Unnecessary `reversed()` call within `sorted()`
 30 | # Nested sorts with differing keyword arguments. Not flagged.
    |
 help: Remove the inner `reversed()` call
-
-ℹ Unsafe fix
-25 25 | set(set())
-26 26 | set(list())
-27 27 | set(tuple())
-28    |-sorted(reversed())
-   28 |+sorted()
-29 29 | 
-30 30 | # Nested sorts with differing keyword arguments. Not flagged.
-31 31 | sorted(sorted(x, key=lambda y: y))
+25 | set(set())
+26 | set(list())
+27 | set(tuple())
+   - sorted(reversed())
+28 + sorted()
+29 | 
+30 | # Nested sorts with differing keyword arguments. Not flagged.
+31 | sorted(sorted(x, key=lambda y: y))
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `sorted()`
   --> C414.py:37:27
@@ -504,16 +482,15 @@ C414 [*] Unnecessary `list()` call within `sorted()`
 44 |   xxxxxxxxxxx_xxxxx_xxxxx = sorted(
    |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | # Preserve trailing comments.
-37 37 | xxxxxxxxxxx_xxxxx_xxxxx = sorted(
-38    |-    list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()),
-   38 |+    x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(),
-39 39 |     # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx, xxx xxxxxx3 xxxxxxxxx xx
-40 40 |     # xx xxxx xxxxxxx xxxx xxx xxxxxxxx Nxxx
-41 41 |     key=lambda xxxxx: xxxxx or "",
+35 | 
+36 | # Preserve trailing comments.
+37 | xxxxxxxxxxx_xxxxx_xxxxx = sorted(
+   -     list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()),
+38 +     x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(),
+39 |     # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx, xxx xxxxxx3 xxxxxxxxx xx
+40 |     # xx xxxx xxxxxxx xxxx xxx xxxxxxxx Nxxx
+41 |     key=lambda xxxxx: xxxxx or "",
+note: This is an unsafe fix and may change runtime behavior
 
 C414 [*] Unnecessary `list()` call within `sorted()`
   --> C414.py:44:27
@@ -528,12 +505,11 @@ C414 [*] Unnecessary `list()` call within `sorted()`
    | |_^
    |
 help: Remove the inner `list()` call
-
-ℹ Unsafe fix
-42 42 | )
-43 43 | 
-44 44 | xxxxxxxxxxx_xxxxx_xxxxx = sorted(
-45    |-    list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()),  # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx
-   45 |+    x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(),  # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx
-46 46 |     key=lambda xxxxx: xxxxx or "",
-47 47 | )
+42 | )
+43 | 
+44 | xxxxxxxxxxx_xxxxx_xxxxx = sorted(
+   -     list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()),  # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx
+45 +     x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(),  # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx
+46 |     key=lambda xxxxx: xxxxx or "",
+47 | )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap
index 71cbe567e4..49fde775dc 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap
@@ -12,16 +12,15 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`)
 8 | {k: v for k, v in y}
   |
 help: Rewrite using `list()`
-
-ℹ Unsafe fix
-3 3 | z = [(1,), (2,), (3,)]
-4 4 | d = {"a": 1, "b": 2, "c": 3}
-5 5 | 
-6   |-[i for i in x]
-  6 |+list(x)
-7 7 | {i for i in x}
-8 8 | {k: v for k, v in y}
-9 9 | {k: v for k, v in d.items()}
+3 | z = [(1,), (2,), (3,)]
+4 | d = {"a": 1, "b": 2, "c": 3}
+5 | 
+  - [i for i in x]
+6 + list(x)
+7 | {i for i in x}
+8 | {k: v for k, v in y}
+9 | {k: v for k, v in d.items()}
+note: This is an unsafe fix and may change runtime behavior
 
 C416 [*] Unnecessary set comprehension (rewrite using `set()`)
  --> C416.py:7:1
@@ -33,16 +32,15 @@ C416 [*] Unnecessary set comprehension (rewrite using `set()`)
 9 | {k: v for k, v in d.items()}
   |
 help: Rewrite using `set()`
-
-ℹ Unsafe fix
-4 4 | d = {"a": 1, "b": 2, "c": 3}
-5 5 | 
-6 6 | [i for i in x]
-7   |-{i for i in x}
-  7 |+set(x)
-8 8 | {k: v for k, v in y}
-9 9 | {k: v for k, v in d.items()}
-10 10 | [(k, v) for k, v in d.items()]
+4  | d = {"a": 1, "b": 2, "c": 3}
+5  | 
+6  | [i for i in x]
+   - {i for i in x}
+7  + set(x)
+8  | {k: v for k, v in y}
+9  | {k: v for k, v in d.items()}
+10 | [(k, v) for k, v in d.items()]
+note: This is an unsafe fix and may change runtime behavior
 
 C416 [*] Unnecessary dict comprehension (rewrite using `dict()`)
   --> C416.py:8:1
@@ -55,16 +53,15 @@ C416 [*] Unnecessary dict comprehension (rewrite using `dict()`)
 10 | [(k, v) for k, v in d.items()]
    |
 help: Rewrite using `dict()`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | [i for i in x]
-7 7 | {i for i in x}
-8   |-{k: v for k, v in y}
-  8 |+dict(y)
-9 9 | {k: v for k, v in d.items()}
-10 10 | [(k, v) for k, v in d.items()]
-11 11 | [(k, v) for [k, v] in d.items()]
+5  | 
+6  | [i for i in x]
+7  | {i for i in x}
+   - {k: v for k, v in y}
+8  + dict(y)
+9  | {k: v for k, v in d.items()}
+10 | [(k, v) for k, v in d.items()]
+11 | [(k, v) for [k, v] in d.items()]
+note: This is an unsafe fix and may change runtime behavior
 
 C416 [*] Unnecessary dict comprehension (rewrite using `dict()`)
   --> C416.py:9:1
@@ -77,16 +74,15 @@ C416 [*] Unnecessary dict comprehension (rewrite using `dict()`)
 11 | [(k, v) for [k, v] in d.items()]
    |
 help: Rewrite using `dict()`
-
-ℹ Unsafe fix
-6  6  | [i for i in x]
-7  7  | {i for i in x}
-8  8  | {k: v for k, v in y}
-9     |-{k: v for k, v in d.items()}
-   9  |+dict(d.items())
-10 10 | [(k, v) for k, v in d.items()]
-11 11 | [(k, v) for [k, v] in d.items()]
-12 12 | {k: (a, b) for k, (a, b) in d.items()}
+6  | [i for i in x]
+7  | {i for i in x}
+8  | {k: v for k, v in y}
+   - {k: v for k, v in d.items()}
+9  + dict(d.items())
+10 | [(k, v) for k, v in d.items()]
+11 | [(k, v) for [k, v] in d.items()]
+12 | {k: (a, b) for k, (a, b) in d.items()}
+note: This is an unsafe fix and may change runtime behavior
 
 C416 [*] Unnecessary list comprehension (rewrite using `list()`)
   --> C416.py:10:1
@@ -99,16 +95,15 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`)
 12 | {k: (a, b) for k, (a, b) in d.items()}
    |
 help: Rewrite using `list()`
-
-ℹ Unsafe fix
-7  7  | {i for i in x}
-8  8  | {k: v for k, v in y}
-9  9  | {k: v for k, v in d.items()}
-10    |-[(k, v) for k, v in d.items()]
-   10 |+list(d.items())
-11 11 | [(k, v) for [k, v] in d.items()]
-12 12 | {k: (a, b) for k, (a, b) in d.items()}
-13 13 | 
+7  | {i for i in x}
+8  | {k: v for k, v in y}
+9  | {k: v for k, v in d.items()}
+   - [(k, v) for k, v in d.items()]
+10 + list(d.items())
+11 | [(k, v) for [k, v] in d.items()]
+12 | {k: (a, b) for k, (a, b) in d.items()}
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C416 [*] Unnecessary list comprehension (rewrite using `list()`)
   --> C416.py:11:1
@@ -120,16 +115,15 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`)
 12 | {k: (a, b) for k, (a, b) in d.items()}
    |
 help: Rewrite using `list()`
-
-ℹ Unsafe fix
-8  8  | {k: v for k, v in y}
-9  9  | {k: v for k, v in d.items()}
-10 10 | [(k, v) for k, v in d.items()]
-11    |-[(k, v) for [k, v] in d.items()]
-   11 |+list(d.items())
-12 12 | {k: (a, b) for k, (a, b) in d.items()}
-13 13 | 
-14 14 | [i for i, in z]
+8  | {k: v for k, v in y}
+9  | {k: v for k, v in d.items()}
+10 | [(k, v) for k, v in d.items()]
+   - [(k, v) for [k, v] in d.items()]
+11 + list(d.items())
+12 | {k: (a, b) for k, (a, b) in d.items()}
+13 | 
+14 | [i for i, in z]
+note: This is an unsafe fix and may change runtime behavior
 
 C416 [*] Unnecessary list comprehension (rewrite using `list()`)
   --> C416.py:25:70
@@ -141,13 +135,12 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`)
 27 | zz = [[1], [2], [3]]
    |
 help: Rewrite using `list()`
-
-ℹ Unsafe fix
-22 22 | {k: v if v else None for k, v in y}
-23 23 | 
-24 24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196
-25    |-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])
-   25 |+any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in list(SymbolType))
-26 26 | 
-27 27 | zz = [[1], [2], [3]]
-28 28 | [(i,) for (i,) in zz]  # != list(zz)
+22 | {k: v if v else None for k, v in y}
+23 | 
+24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196
+   - any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])
+25 + any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in list(SymbolType))
+26 | 
+27 | zz = [[1], [2], [3]]
+28 | [(i,) for (i,) in zz]  # != list(zz)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap
index a8bb7cfc8c..31d0647726 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap
@@ -12,15 +12,14 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 5 | list(map(lambda x: x * 2, nums))
   |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-1 1 | # Errors.
-2 2 | nums = [1, 2, 3]
-3   |-map(lambda x: x + 1, nums)
-  3 |+(x + 1 for x in nums)
-4 4 | map(lambda x: str(x), nums)
-5 5 | list(map(lambda x: x * 2, nums))
-6 6 | set(map(lambda x: x % 2 == 0, nums))
+1 | # Errors.
+2 | nums = [1, 2, 3]
+  - map(lambda x: x + 1, nums)
+3 + (x + 1 for x in nums)
+4 | map(lambda x: str(x), nums)
+5 | list(map(lambda x: x * 2, nums))
+6 | set(map(lambda x: x % 2 == 0, nums))
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
  --> C417.py:4:1
@@ -33,16 +32,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 6 | set(map(lambda x: x % 2 == 0, nums))
   |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-1 1 | # Errors.
-2 2 | nums = [1, 2, 3]
-3 3 | map(lambda x: x + 1, nums)
-4   |-map(lambda x: str(x), nums)
-  4 |+(str(x) for x in nums)
-5 5 | list(map(lambda x: x * 2, nums))
-6 6 | set(map(lambda x: x % 2 == 0, nums))
-7 7 | dict(map(lambda v: (v, v**2), nums))
+1 | # Errors.
+2 | nums = [1, 2, 3]
+3 | map(lambda x: x + 1, nums)
+  - map(lambda x: str(x), nums)
+4 + (str(x) for x in nums)
+5 | list(map(lambda x: x * 2, nums))
+6 | set(map(lambda x: x % 2 == 0, nums))
+7 | dict(map(lambda v: (v, v**2), nums))
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a list comprehension)
  --> C417.py:5:1
@@ -55,16 +53,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a list comprehension)
 7 | dict(map(lambda v: (v, v**2), nums))
   |
 help: Replace `map()` with a list comprehension
-
-ℹ Unsafe fix
-2 2 | nums = [1, 2, 3]
-3 3 | map(lambda x: x + 1, nums)
-4 4 | map(lambda x: str(x), nums)
-5   |-list(map(lambda x: x * 2, nums))
-  5 |+[x * 2 for x in nums]
-6 6 | set(map(lambda x: x % 2 == 0, nums))
-7 7 | dict(map(lambda v: (v, v**2), nums))
-8 8 | dict(map(lambda v: [v, v**2], nums))
+2 | nums = [1, 2, 3]
+3 | map(lambda x: x + 1, nums)
+4 | map(lambda x: str(x), nums)
+  - list(map(lambda x: x * 2, nums))
+5 + [x * 2 for x in nums]
+6 | set(map(lambda x: x % 2 == 0, nums))
+7 | dict(map(lambda v: (v, v**2), nums))
+8 | dict(map(lambda v: [v, v**2], nums))
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension)
  --> C417.py:6:1
@@ -77,16 +74,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension)
 8 | dict(map(lambda v: [v, v**2], nums))
   |
 help: Replace `map()` with a set comprehension
-
-ℹ Unsafe fix
-3 3 | map(lambda x: x + 1, nums)
-4 4 | map(lambda x: str(x), nums)
-5 5 | list(map(lambda x: x * 2, nums))
-6   |-set(map(lambda x: x % 2 == 0, nums))
-  6 |+{x % 2 == 0 for x in nums}
-7 7 | dict(map(lambda v: (v, v**2), nums))
-8 8 | dict(map(lambda v: [v, v**2], nums))
-9 9 | 
+3 | map(lambda x: x + 1, nums)
+4 | map(lambda x: str(x), nums)
+5 | list(map(lambda x: x * 2, nums))
+  - set(map(lambda x: x % 2 == 0, nums))
+6 + {x % 2 == 0 for x in nums}
+7 | dict(map(lambda v: (v, v**2), nums))
+8 | dict(map(lambda v: [v, v**2], nums))
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
  --> C417.py:7:1
@@ -98,16 +94,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
 8 | dict(map(lambda v: [v, v**2], nums))
   |
 help: Replace `map()` with a dict comprehension
-
-ℹ Unsafe fix
-4 4 | map(lambda x: str(x), nums)
-5 5 | list(map(lambda x: x * 2, nums))
-6 6 | set(map(lambda x: x % 2 == 0, nums))
-7   |-dict(map(lambda v: (v, v**2), nums))
-  7 |+{v: v**2 for v in nums}
-8 8 | dict(map(lambda v: [v, v**2], nums))
-9 9 | 
-10 10 | map(lambda _: 3.0, nums)
+4  | map(lambda x: str(x), nums)
+5  | list(map(lambda x: x * 2, nums))
+6  | set(map(lambda x: x % 2 == 0, nums))
+   - dict(map(lambda v: (v, v**2), nums))
+7  + {v: v**2 for v in nums}
+8  | dict(map(lambda v: [v, v**2], nums))
+9  | 
+10 | map(lambda _: 3.0, nums)
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
   --> C417.py:8:1
@@ -120,16 +115,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
 10 | map(lambda _: 3.0, nums)
    |
 help: Replace `map()` with a dict comprehension
-
-ℹ Unsafe fix
-5 5 | list(map(lambda x: x * 2, nums))
-6 6 | set(map(lambda x: x % 2 == 0, nums))
-7 7 | dict(map(lambda v: (v, v**2), nums))
-8   |-dict(map(lambda v: [v, v**2], nums))
-  8 |+{v: v**2 for v in nums}
-9 9 | 
-10 10 | map(lambda _: 3.0, nums)
-11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
+5  | list(map(lambda x: x * 2, nums))
+6  | set(map(lambda x: x % 2 == 0, nums))
+7  | dict(map(lambda v: (v, v**2), nums))
+   - dict(map(lambda v: [v, v**2], nums))
+8  + {v: v**2 for v in nums}
+9  | 
+10 | map(lambda _: 3.0, nums)
+11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:10:1
@@ -142,16 +136,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 12 | all(map(lambda v: isinstance(v, dict), nums))
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-7  7  | dict(map(lambda v: (v, v**2), nums))
-8  8  | dict(map(lambda v: [v, v**2], nums))
-9  9  | 
-10    |-map(lambda _: 3.0, nums)
-   10 |+(3.0 for _ in nums)
-11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
-12 12 | all(map(lambda v: isinstance(v, dict), nums))
-13 13 | filter(func, map(lambda v: v, nums))
+7  | dict(map(lambda v: (v, v**2), nums))
+8  | dict(map(lambda v: [v, v**2], nums))
+9  | 
+   - map(lambda _: 3.0, nums)
+10 + (3.0 for _ in nums)
+11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
+12 | all(map(lambda v: isinstance(v, dict), nums))
+13 | filter(func, map(lambda v: v, nums))
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:11:13
@@ -163,16 +156,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 13 | filter(func, map(lambda v: v, nums))
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-8  8  | dict(map(lambda v: [v, v**2], nums))
-9  9  | 
-10 10 | map(lambda _: 3.0, nums)
-11    |-_ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
-   11 |+_ = "".join((x in nums and "1" or "0" for x in range(123)))
-12 12 | all(map(lambda v: isinstance(v, dict), nums))
-13 13 | filter(func, map(lambda v: v, nums))
-14 14 | 
+8  | dict(map(lambda v: [v, v**2], nums))
+9  | 
+10 | map(lambda _: 3.0, nums)
+   - _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
+11 + _ = "".join((x in nums and "1" or "0" for x in range(123)))
+12 | all(map(lambda v: isinstance(v, dict), nums))
+13 | filter(func, map(lambda v: v, nums))
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:12:5
@@ -184,16 +176,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 13 | filter(func, map(lambda v: v, nums))
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | map(lambda _: 3.0, nums)
-11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
-12    |-all(map(lambda v: isinstance(v, dict), nums))
-   12 |+all((isinstance(v, dict) for v in nums))
-13 13 | filter(func, map(lambda v: v, nums))
-14 14 | 
-15 15 | 
+9  | 
+10 | map(lambda _: 3.0, nums)
+11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
+   - all(map(lambda v: isinstance(v, dict), nums))
+12 + all((isinstance(v, dict) for v in nums))
+13 | filter(func, map(lambda v: v, nums))
+14 | 
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:13:14
@@ -204,16 +195,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
    |              ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-10 10 | map(lambda _: 3.0, nums)
-11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
-12 12 | all(map(lambda v: isinstance(v, dict), nums))
-13    |-filter(func, map(lambda v: v, nums))
-   13 |+filter(func, (v for v in nums))
-14 14 | 
-15 15 | 
-16 16 | # When inside f-string, then the fix should be surrounded by whitespace
+10 | map(lambda _: 3.0, nums)
+11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
+12 | all(map(lambda v: isinstance(v, dict), nums))
+   - filter(func, map(lambda v: v, nums))
+13 + filter(func, (v for v in nums))
+14 | 
+15 | 
+16 | # When inside f-string, then the fix should be surrounded by whitespace
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension)
   --> C417.py:17:8
@@ -224,16 +214,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension)
 18 | _ = f"{dict(map(lambda v: (v, v**2), nums))}"
    |
 help: Replace `map()` with a set comprehension
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | 
-16 16 | # When inside f-string, then the fix should be surrounded by whitespace
-17    |-_ = f"{set(map(lambda x: x % 2 == 0, nums))}"
-   17 |+_ = f"{ {x % 2 == 0 for x in nums} }"
-18 18 | _ = f"{dict(map(lambda v: (v, v**2), nums))}"
-19 19 | 
-20 20 | # False negatives.
+14 | 
+15 | 
+16 | # When inside f-string, then the fix should be surrounded by whitespace
+   - _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
+17 + _ = f"{ {x % 2 == 0 for x in nums} }"
+18 | _ = f"{dict(map(lambda v: (v, v**2), nums))}"
+19 | 
+20 | # False negatives.
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
   --> C417.py:18:8
@@ -246,16 +235,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
 20 | # False negatives.
    |
 help: Replace `map()` with a dict comprehension
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | # When inside f-string, then the fix should be surrounded by whitespace
-17 17 | _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
-18    |-_ = f"{dict(map(lambda v: (v, v**2), nums))}"
-   18 |+_ = f"{ {v: v**2 for v in nums} }"
-19 19 | 
-20 20 | # False negatives.
-21 21 | map(lambda x=2, y=1: x + y, nums, nums)
+15 | 
+16 | # When inside f-string, then the fix should be surrounded by whitespace
+17 | _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
+   - _ = f"{dict(map(lambda v: (v, v**2), nums))}"
+18 + _ = f"{ {v: v**2 for v in nums} }"
+19 | 
+20 | # False negatives.
+21 | map(lambda x=2, y=1: x + y, nums, nums)
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:36:1
@@ -267,16 +255,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 38 | # Ok because of the default parameters, and variadic arguments.
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-33 33 | map(lambda x: lambda: x, range(4))
-34 34 | 
-35 35 | # Error: the `x` is overridden by the inner lambda.
-36    |-map(lambda x: lambda x: x, range(4))
-   36 |+(lambda x: x for x in range(4))
-37 37 | 
-38 38 | # Ok because of the default parameters, and variadic arguments.
-39 39 | map(lambda x=1: x, nums)
+33 | map(lambda x: lambda: x, range(4))
+34 | 
+35 | # Error: the `x` is overridden by the inner lambda.
+   - map(lambda x: lambda x: x, range(4))
+36 + (lambda x: x for x in range(4))
+37 | 
+38 | # Ok because of the default parameters, and variadic arguments.
+39 | map(lambda x=1: x, nums)
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:47:1
@@ -288,16 +275,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 49 | map(lambda x: x, (x, y, z))
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-44 44 | dict(map(lambda k, v: (k, v), keys, values))
-45 45 | 
-46 46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121
-47    |-map(lambda x: x, y if y else z)
-   47 |+(x for x in (y if y else z))
-48 48 | map(lambda x: x, (y if y else z))
-49 49 | map(lambda x: x, (x, y, z))
-50 50 | 
+44 | dict(map(lambda k, v: (k, v), keys, values))
+45 | 
+46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121
+   - map(lambda x: x, y if y else z)
+47 + (x for x in (y if y else z))
+48 | map(lambda x: x, (y if y else z))
+49 | map(lambda x: x, (x, y, z))
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:48:1
@@ -309,16 +295,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 49 | map(lambda x: x, (x, y, z))
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-45 45 | 
-46 46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121
-47 47 | map(lambda x: x, y if y else z)
-48    |-map(lambda x: x, (y if y else z))
-   48 |+(x for x in (y if y else z))
-49 49 | map(lambda x: x, (x, y, z))
-50 50 | 
-51 51 | # See https://github.com/astral-sh/ruff/issues/14808
+45 | 
+46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121
+47 | map(lambda x: x, y if y else z)
+   - map(lambda x: x, (y if y else z))
+48 + (x for x in (y if y else z))
+49 | map(lambda x: x, (x, y, z))
+50 | 
+51 | # See https://github.com/astral-sh/ruff/issues/14808
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   --> C417.py:49:1
@@ -331,16 +316,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
 51 | # See https://github.com/astral-sh/ruff/issues/14808
    |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-46 46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121
-47 47 | map(lambda x: x, y if y else z)
-48 48 | map(lambda x: x, (y if y else z))
-49    |-map(lambda x: x, (x, y, z))
-   49 |+(x for x in (x, y, z))
-50 50 | 
-51 51 | # See https://github.com/astral-sh/ruff/issues/14808
-52 52 | # The following should be Ok since
+46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121
+47 | map(lambda x: x, y if y else z)
+48 | map(lambda x: x, (y if y else z))
+   - map(lambda x: x, (x, y, z))
+49 + (x for x in (x, y, z))
+50 | 
+51 | # See https://github.com/astral-sh/ruff/issues/14808
+52 | # The following should be Ok since
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension)
   --> C417.py:75:8
@@ -351,15 +335,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension)
 76 | _ = t"{dict(map(lambda v: (v, v**2), nums))}"
    |
 help: Replace `map()` with a set comprehension
-
-ℹ Unsafe fix
-72 72 | list(map(lambda x, y: x, [(1, 2), (3, 4)]))
-73 73 | 
-74 74 | # When inside t-string, then the fix should be surrounded by whitespace
-75    |-_ = t"{set(map(lambda x: x % 2 == 0, nums))}"
-   75 |+_ = t"{ {x % 2 == 0 for x in nums} }"
-76 76 | _ = t"{dict(map(lambda v: (v, v**2), nums))}"
-77 77 | 
+72 | list(map(lambda x, y: x, [(1, 2), (3, 4)]))
+73 | 
+74 | # When inside t-string, then the fix should be surrounded by whitespace
+   - _ = t"{set(map(lambda x: x % 2 == 0, nums))}"
+75 + _ = t"{ {x % 2 == 0 for x in nums} }"
+76 | _ = t"{dict(map(lambda v: (v, v**2), nums))}"
+77 | 
+78 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
   --> C417.py:76:8
@@ -370,11 +354,12 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension)
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace `map()` with a dict comprehension
-
-ℹ Unsafe fix
-73 73 | 
-74 74 | # When inside t-string, then the fix should be surrounded by whitespace
-75 75 | _ = t"{set(map(lambda x: x % 2 == 0, nums))}"
-76    |-_ = t"{dict(map(lambda v: (v, v**2), nums))}"
-   76 |+_ = t"{ {v: v**2 for v in nums} }"
-77 77 |
+73 | 
+74 | # When inside t-string, then the fix should be surrounded by whitespace
+75 | _ = t"{set(map(lambda x: x % 2 == 0, nums))}"
+   - _ = t"{dict(map(lambda v: (v, v**2), nums))}"
+76 + _ = t"{ {v: v**2 for v in nums} }"
+77 | 
+78 | 
+79 | # See https://github.com/astral-sh/ruff/issues/20198
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap
index 1861b55ba8..b6a26b5914 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap
@@ -10,13 +10,12 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression)
   |          ^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace `map()` with a generator expression
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | def overshadowed_list():
-6 6 |     list = ...
-7   |-    list(map(lambda x: x, []))
-  7 |+    list((x for x in []))
-8 8 | 
-9 9 | 
-10 10 | ### No errors
+4  | 
+5  | def overshadowed_list():
+6  |     list = ...
+   -     list(map(lambda x: x, []))
+7  +     list((x for x in []))
+8  | 
+9  | 
+10 | ### No errors
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap
index 48178c70e9..1c6c180b74 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap
@@ -10,13 +10,12 @@ C418 [*] Unnecessary dict literal passed to `dict()` (remove the outer call to `
 3 | dict({'x': 1 for x in range(10)})
   |
 help: Remove outer `dict()` call
-
-ℹ Unsafe fix
-1   |-dict({})
-  1 |+{}
-2 2 | dict({'a': 1})
-3 3 | dict({'x': 1 for x in range(10)})
-4 4 | dict(
+  - dict({})
+1 + {}
+2 | dict({'a': 1})
+3 | dict({'x': 1 for x in range(10)})
+4 | dict(
+note: This is an unsafe fix and may change runtime behavior
 
 C418 [*] Unnecessary dict literal passed to `dict()` (remove the outer call to `dict()`)
  --> C418.py:2:1
@@ -28,14 +27,13 @@ C418 [*] Unnecessary dict literal passed to `dict()` (remove the outer call to `
 4 | dict(
   |
 help: Remove outer `dict()` call
-
-ℹ Unsafe fix
-1 1 | dict({})
-2   |-dict({'a': 1})
-  2 |+{'a': 1}
-3 3 | dict({'x': 1 for x in range(10)})
-4 4 | dict(
-5 5 |     {'x': 1 for x in range(10)}
+1 | dict({})
+  - dict({'a': 1})
+2 + {'a': 1}
+3 | dict({'x': 1 for x in range(10)})
+4 | dict(
+5 |     {'x': 1 for x in range(10)}
+note: This is an unsafe fix and may change runtime behavior
 
 C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer call to `dict()`)
  --> C418.py:3:1
@@ -48,15 +46,14 @@ C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer cal
 5 |     {'x': 1 for x in range(10)}
   |
 help: Remove outer `dict()` call
-
-ℹ Unsafe fix
-1 1 | dict({})
-2 2 | dict({'a': 1})
-3   |-dict({'x': 1 for x in range(10)})
-  3 |+{'x': 1 for x in range(10)}
-4 4 | dict(
-5 5 |     {'x': 1 for x in range(10)}
-6 6 | )
+1 | dict({})
+2 | dict({'a': 1})
+  - dict({'x': 1 for x in range(10)})
+3 + {'x': 1 for x in range(10)}
+4 | dict(
+5 |     {'x': 1 for x in range(10)}
+6 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer call to `dict()`)
  --> C418.py:4:1
@@ -71,15 +68,14 @@ C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer cal
 8 |   dict({}, a=1)
   |
 help: Remove outer `dict()` call
-
-ℹ Unsafe fix
-1 1 | dict({})
-2 2 | dict({'a': 1})
-3 3 | dict({'x': 1 for x in range(10)})
-4   |-dict(
-5   |-    {'x': 1 for x in range(10)}
-6   |-)
-  4 |+{'x': 1 for x in range(10)}
-7 5 | 
-8 6 | dict({}, a=1)
-9 7 | dict({x: 1 for x in range(1)}, a=1)
+1 | dict({})
+2 | dict({'a': 1})
+3 | dict({'x': 1 for x in range(10)})
+  - dict(
+  -     {'x': 1 for x in range(10)}
+  - )
+4 + {'x': 1 for x in range(10)}
+5 | 
+6 | dict({}, a=1)
+7 | dict({x: 1 for x in range(1)}, a=1)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap
index e6e08ba2c4..1be1031220 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap
@@ -10,13 +10,12 @@ C419 [*] Unnecessary list comprehension
 3 | any(  # first comment
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1   |-any([x.id for x in bar])
-  1 |+any(x.id for x in bar)
-2 2 | all([x.id for x in bar])
-3 3 | any(  # first comment
-4 4 |     [x.id for x in bar],  # second comment
+  - any([x.id for x in bar])
+1 + any(x.id for x in bar)
+2 | all([x.id for x in bar])
+3 | any(  # first comment
+4 |     [x.id for x in bar],  # second comment
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
  --> C419.py:2:5
@@ -28,14 +27,13 @@ C419 [*] Unnecessary list comprehension
 4 |     [x.id for x in bar],  # second comment
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1 1 | any([x.id for x in bar])
-2   |-all([x.id for x in bar])
-  2 |+all(x.id for x in bar)
-3 3 | any(  # first comment
-4 4 |     [x.id for x in bar],  # second comment
-5 5 | )  # third comment
+1 | any([x.id for x in bar])
+  - all([x.id for x in bar])
+2 + all(x.id for x in bar)
+3 | any(  # first comment
+4 |     [x.id for x in bar],  # second comment
+5 | )  # third comment
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
  --> C419.py:4:5
@@ -48,16 +46,15 @@ C419 [*] Unnecessary list comprehension
 6 | all(  # first comment
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1 1 | any([x.id for x in bar])
-2 2 | all([x.id for x in bar])
-3 3 | any(  # first comment
-4   |-    [x.id for x in bar],  # second comment
-  4 |+    x.id for x in bar  # second comment
-5 5 | )  # third comment
-6 6 | all(  # first comment
-7 7 |     [x.id for x in bar],  # second comment
+1 | any([x.id for x in bar])
+2 | all([x.id for x in bar])
+3 | any(  # first comment
+  -     [x.id for x in bar],  # second comment
+4 +     x.id for x in bar  # second comment
+5 | )  # third comment
+6 | all(  # first comment
+7 |     [x.id for x in bar],  # second comment
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
  --> C419.py:7:5
@@ -70,16 +67,15 @@ C419 [*] Unnecessary list comprehension
 9 | any({x.id for x in bar})
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-4 4 |     [x.id for x in bar],  # second comment
-5 5 | )  # third comment
-6 6 | all(  # first comment
-7   |-    [x.id for x in bar],  # second comment
-  7 |+    x.id for x in bar  # second comment
-8 8 | )  # third comment
-9 9 | any({x.id for x in bar})
-10 10 | 
+4  |     [x.id for x in bar],  # second comment
+5  | )  # third comment
+6  | all(  # first comment
+   -     [x.id for x in bar],  # second comment
+7  +     x.id for x in bar  # second comment
+8  | )  # third comment
+9  | any({x.id for x in bar})
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary set comprehension
   --> C419.py:9:5
@@ -92,16 +88,15 @@ C419 [*] Unnecessary set comprehension
 11 | # OK
    |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-6  6  | all(  # first comment
-7  7  |     [x.id for x in bar],  # second comment
-8  8  | )  # third comment
-9     |-any({x.id for x in bar})
-   9  |+any(x.id for x in bar)
-10 10 | 
-11 11 | # OK
-12 12 | all(x.id for x in bar)
+6  | all(  # first comment
+7  |     [x.id for x in bar],  # second comment
+8  | )  # third comment
+   - any({x.id for x in bar})
+9  + any(x.id for x in bar)
+10 | 
+11 | # OK
+12 | all(x.id for x in bar)
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
   --> C419.py:28:5
@@ -119,24 +114,23 @@ C419 [*] Unnecessary list comprehension
 35 |   )
    |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-25 25 | 
-26 26 | # Special comment handling
-27 27 | any(
-28    |-    [  # lbracket comment
-29    |-        # second line comment
-30    |-        i.bit_count()
-   28 |+    # lbracket comment
-   29 |+    # second line comment
-   30 |+    i.bit_count()
-31 31 |         # random middle comment
-32    |-        for i in range(5)  # rbracket comment
-33    |-    ]  # rpar comment
-   32 |+        for i in range(5)  # rbracket comment  # rpar comment
-34 33 |     # trailing comment
-35 34 | )
-36 35 | 
+25 | 
+26 | # Special comment handling
+27 | any(
+   -     [  # lbracket comment
+   -         # second line comment
+   -         i.bit_count()
+28 +     # lbracket comment
+29 +     # second line comment
+30 +     i.bit_count()
+31 |         # random middle comment
+   -         for i in range(5)  # rbracket comment
+   -     ]  # rpar comment
+32 +         for i in range(5)  # rbracket comment  # rpar comment
+33 |     # trailing comment
+34 | )
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
   --> C419.py:39:5
@@ -152,22 +146,21 @@ C419 [*] Unnecessary list comprehension
 43 |   )
    |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-36 36 | 
-37 37 | # Weird case where the function call, opening bracket, and comment are all
-38 38 | # on the same line.
-39    |-any([  # lbracket comment
-40    |-        # second line comment
-41    |-        i.bit_count() for i in range(5)  # rbracket comment
-42    |-    ]  # rpar comment
-   39 |+any(
-   40 |+# lbracket comment
-   41 |+# second line comment
-   42 |+i.bit_count() for i in range(5)  # rbracket comment  # rpar comment
-43 43 | )
-44 44 | 
-45 45 | ## Set comprehensions should only be linted
+36 | 
+37 | # Weird case where the function call, opening bracket, and comment are all
+38 | # on the same line.
+   - any([  # lbracket comment
+   -         # second line comment
+   -         i.bit_count() for i in range(5)  # rbracket comment
+   -     ]  # rpar comment
+39 + any(
+40 + # lbracket comment
+41 + # second line comment
+42 + i.bit_count() for i in range(5)  # rbracket comment  # rpar comment
+43 | )
+44 | 
+45 | ## Set comprehensions should only be linted
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary set comprehension
   --> C419.py:49:5
@@ -178,16 +171,15 @@ C419 [*] Unnecessary set comprehension
 50 | all({x.id for x in bar})
    |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-46 46 | ## when function is invariant under duplication of inputs
-47 47 | 
-48 48 | # should be linted...
-49    |-any({x.id for x in bar})
-   49 |+any(x.id for x in bar)
-50 50 | all({x.id for x in bar})
-51 51 | 
-52 52 | # should be linted in preview...
+46 | ## when function is invariant under duplication of inputs
+47 | 
+48 | # should be linted...
+   - any({x.id for x in bar})
+49 + any(x.id for x in bar)
+50 | all({x.id for x in bar})
+51 | 
+52 | # should be linted in preview...
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary set comprehension
   --> C419.py:50:5
@@ -200,13 +192,12 @@ C419 [*] Unnecessary set comprehension
 52 | # should be linted in preview...
    |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-47 47 | 
-48 48 | # should be linted...
-49 49 | any({x.id for x in bar})
-50    |-all({x.id for x in bar})
-   50 |+all(x.id for x in bar)
-51 51 | 
-52 52 | # should be linted in preview...
-53 53 | min({x.id for x in bar})
+47 | 
+48 | # should be linted...
+49 | any({x.id for x in bar})
+   - all({x.id for x in bar})
+50 + all(x.id for x in bar)
+51 | 
+52 | # should be linted in preview...
+53 | min({x.id for x in bar})
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap
index 1fd0017534..9cfb3561be 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap
@@ -10,16 +10,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `dict.fromkeys(iterable, value)`)
-
-ℹ Safe fix
-3 3 | 
-4 4 | def func():
-5 5 |     numbers = [1, 2, 3]
-6   |-    {n: None for n in numbers}  # RUF025
-  6 |+    dict.fromkeys(numbers)  # RUF025
-7 7 | 
-8 8 | 
-9 9 | def func():
+3 | 
+4 | def func():
+5 |     numbers = [1, 2, 3]
+  -     {n: None for n in numbers}  # RUF025
+6 +     dict.fromkeys(numbers)  # RUF025
+7 | 
+8 | 
+9 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:10:23
@@ -30,16 +28,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
 11 |         pass
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-7  7  | 
-8  8  | 
-9  9  | def func():
-10    |-    for key, value in {n: 1 for n in [1, 2, 3]}.items():  # RUF025
-   10 |+    for key, value in dict.fromkeys([1, 2, 3], 1).items():  # RUF025
-11 11 |         pass
-12 12 | 
-13 13 | 
+7  | 
+8  | 
+9  | def func():
+   -     for key, value in {n: 1 for n in [1, 2, 3]}.items():  # RUF025
+10 +     for key, value in dict.fromkeys([1, 2, 3], 1).items():  # RUF025
+11 |         pass
+12 | 
+13 | 
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:15:5
@@ -49,16 +45,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-12 12 | 
-13 13 | 
-14 14 | def func():
-15    |-    {n: 1.1 for n in [1, 2, 3]}  # RUF025
-   15 |+    dict.fromkeys([1, 2, 3], 1.1)  # RUF025
-16 16 | 
-17 17 | 
-18 18 | def func():
+12 | 
+13 | 
+14 | def func():
+   -     {n: 1.1 for n in [1, 2, 3]}  # RUF025
+15 +     dict.fromkeys([1, 2, 3], 1.1)  # RUF025
+16 | 
+17 | 
+18 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:26:7
@@ -69,16 +63,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-23 23 |     def f(data):
-24 24 |         return data
-25 25 | 
-26    |-    f({c: "a" for c in "12345"})  # RUF025
-   26 |+    f(dict.fromkeys("12345", "a"))  # RUF025
-27 27 | 
-28 28 | 
-29 29 | def func():
+23 |     def f(data):
+24 |         return data
+25 | 
+   -     f({c: "a" for c in "12345"})  # RUF025
+26 +     f(dict.fromkeys("12345", "a"))  # RUF025
+27 | 
+28 | 
+29 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:30:5
@@ -88,16 +80,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-27 27 | 
-28 28 | 
-29 29 | def func():
-30    |-    {n: True for n in [1, 2, 2]}  # RUF025
-   30 |+    dict.fromkeys([1, 2, 2], True)  # RUF025
-31 31 | 
-32 32 | 
-33 33 | def func():
+27 | 
+28 | 
+29 | def func():
+   -     {n: True for n in [1, 2, 2]}  # RUF025
+30 +     dict.fromkeys([1, 2, 2], True)  # RUF025
+31 | 
+32 | 
+33 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:34:5
@@ -107,16 +97,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-31 31 | 
-32 32 | 
-33 33 | def func():
-34    |-    {n: b"hello" for n in (1, 2, 2)}  # RUF025
-   34 |+    dict.fromkeys((1, 2, 2), b"hello")  # RUF025
-35 35 | 
-36 36 | 
-37 37 | def func():
+31 | 
+32 | 
+33 | def func():
+   -     {n: b"hello" for n in (1, 2, 2)}  # RUF025
+34 +     dict.fromkeys((1, 2, 2), b"hello")  # RUF025
+35 | 
+36 | 
+37 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:38:5
@@ -126,16 +114,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-35 35 | 
-36 36 | 
-37 37 | def func():
-38    |-    {n: ... for n in [1, 2, 3]}  # RUF025
-   38 |+    dict.fromkeys([1, 2, 3], ...)  # RUF025
-39 39 | 
-40 40 | 
-41 41 | def func():
+35 | 
+36 | 
+37 | def func():
+   -     {n: ... for n in [1, 2, 3]}  # RUF025
+38 +     dict.fromkeys([1, 2, 3], ...)  # RUF025
+39 | 
+40 | 
+41 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:42:5
@@ -145,16 +131,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-39 39 | 
-40 40 | 
-41 41 | def func():
-42    |-    {n: False for n in {1: "a", 2: "b"}}  # RUF025
-   42 |+    dict.fromkeys({1: "a", 2: "b"}, False)  # RUF025
-43 43 | 
-44 44 | 
-45 45 | def func():
+39 | 
+40 | 
+41 | def func():
+   -     {n: False for n in {1: "a", 2: "b"}}  # RUF025
+42 +     dict.fromkeys({1: "a", 2: "b"}, False)  # RUF025
+43 | 
+44 | 
+45 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:46:5
@@ -164,16 +148,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-43 43 | 
-44 44 | 
-45 45 | def func():
-46    |-    {(a, b): 1 for (a, b) in [(1, 2), (3, 4)]}  # RUF025
-   46 |+    dict.fromkeys([(1, 2), (3, 4)], 1)  # RUF025
-47 47 | 
-48 48 | 
-49 49 | def func():
+43 | 
+44 | 
+45 | def func():
+   -     {(a, b): 1 for (a, b) in [(1, 2), (3, 4)]}  # RUF025
+46 +     dict.fromkeys([(1, 2), (3, 4)], 1)  # RUF025
+47 | 
+48 | 
+49 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:54:5
@@ -183,16 +165,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-51 51 |         return 1
-52 52 | 
-53 53 |     a = f()
-54    |-    {n: a for n in [1, 2, 3]}  # RUF025
-   54 |+    dict.fromkeys([1, 2, 3], a)  # RUF025
-55 55 | 
-56 56 | 
-57 57 | def func():
+51 |         return 1
+52 | 
+53 |     a = f()
+   -     {n: a for n in [1, 2, 3]}  # RUF025
+54 +     dict.fromkeys([1, 2, 3], a)  # RUF025
+55 | 
+56 | 
+57 | def func():
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
   --> C420.py:59:6
@@ -203,16 +183,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-56 56 | 
-57 57 | def func():
-58 58 |     values = ["a", "b", "c"]
-59    |-    [{n: values for n in [1, 2, 3]}]  # RUF025
-   59 |+    [dict.fromkeys([1, 2, 3], values)]  # RUF025
-60 60 | 
-61 61 | 
-62 62 | # Non-violation cases: RUF025
+56 | 
+57 | def func():
+58 |     values = ["a", "b", "c"]
+   -     [{n: values for n in [1, 2, 3]}]  # RUF025
+59 +     [dict.fromkeys([1, 2, 3], values)]  # RUF025
+60 | 
+61 | 
+62 | # Non-violation cases: RUF025
 
 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead
    --> C420.py:95:1
@@ -230,18 +208,17 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
     | |_^
     |
 help: Replace with `dict.fromkeys(iterable, value)`)
-
-ℹ Unsafe fix
-92 92 |     {(a, b): a + b for (a, b) in [(1, 2), (3, 4)]}  # OK
-93 93 | 
-94 94 | # https://github.com/astral-sh/ruff/issues/18764
-95    |-{ # 1
-96    |-a # 2
-97    |-: # 3
-98    |-None # 4
-99    |-for # 5
-100    |-a # 6
-101    |-in # 7
-102    |-iterable # 8
-103    |-} # 9
-   95 |+dict.fromkeys(iterable) # 9
+92 |     {(a, b): a + b for (a, b) in [(1, 2), (3, 4)]}  # OK
+93 | 
+94 | # https://github.com/astral-sh/ruff/issues/18764
+   - { # 1
+   - a # 2
+   - : # 3
+   - None # 4
+   - for # 5
+   - a # 6
+   - in # 7
+   - iterable # 8
+   - } # 9
+95 + dict.fromkeys(iterable) # 9
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap
index e8287c0ae1..cc54075046 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap
@@ -8,10 +8,8 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `dict.fromkeys(iterable)`)
-
-ℹ Safe fix
-1   |-{x: NotImplemented for x in "XY"}
-  1 |+dict.fromkeys("XY", NotImplemented)
-2 2 | 
-3 3 | 
-4 4 | # Builtin bindings are placed at top of file, but should not count as
+  - {x: NotImplemented for x in "XY"}
+1 + dict.fromkeys("XY", NotImplemented)
+2 | 
+3 | 
+4 | # Builtin bindings are placed at top of file, but should not count as
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap
index 0ff4e0d6ac..f609d02469 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap
@@ -8,10 +8,8 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea
   |       ^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `dict.fromkeys(iterable, value)`)
-
-ℹ Safe fix
-1   |-foo or{x: None for x in bar}
-  1 |+foo or dict.fromkeys(bar)
-2 2 | 
-3 3 | 
-4 4 | # C420 fix must make sure to insert a leading space if needed,
+  - foo or{x: None for x in bar}
+1 + foo or dict.fromkeys(bar)
+2 | 
+3 | 
+4 | # C420 fix must make sure to insert a leading space if needed,
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap
index 68bb872982..23657a1310 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap
@@ -10,13 +10,12 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 3 | t3 = tuple((1, 2))
   |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-1   |-t1 = tuple([])
-  1 |+t1 = ()
-2 2 | t2 = tuple([1, 2])
-3 3 | t3 = tuple((1, 2))
-4 4 | t4 = tuple([
+  - t1 = tuple([])
+1 + t1 = ()
+2 | t2 = tuple([1, 2])
+3 | t3 = tuple((1, 2))
+4 | t4 = tuple([
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
  --> C409.py:2:6
@@ -28,14 +27,13 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 4 | t4 = tuple([
   |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-1 1 | t1 = tuple([])
-2   |-t2 = tuple([1, 2])
-  2 |+t2 = (1, 2)
-3 3 | t3 = tuple((1, 2))
-4 4 | t4 = tuple([
-5 5 |     1,
+1 | t1 = tuple([])
+  - t2 = tuple([1, 2])
+2 + t2 = (1, 2)
+3 | t3 = tuple((1, 2))
+4 | t4 = tuple([
+5 |     1,
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
  --> C409.py:3:6
@@ -48,15 +46,14 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 5 |     1,
   |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-1 1 | t1 = tuple([])
-2 2 | t2 = tuple([1, 2])
-3   |-t3 = tuple((1, 2))
-  3 |+t3 = (1, 2)
-4 4 | t4 = tuple([
-5 5 |     1,
-6 6 |     2
+1 | t1 = tuple([])
+2 | t2 = tuple([1, 2])
+  - t3 = tuple((1, 2))
+3 + t3 = (1, 2)
+4 | t4 = tuple([
+5 |     1,
+6 |     2
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
  --> C409.py:4:6
@@ -73,20 +70,19 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 9 |       (1, 2)
   |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-1 1 | t1 = tuple([])
-2 2 | t2 = tuple([1, 2])
-3 3 | t3 = tuple((1, 2))
-4   |-t4 = tuple([
-  4 |+t4 = (
-5 5 |     1,
-6 6 |     2
-7   |-])
-  7 |+)
-8 8 | t5 = tuple(
-9 9 |     (1, 2)
-10 10 | )
+1  | t1 = tuple([])
+2  | t2 = tuple([1, 2])
+3  | t3 = tuple((1, 2))
+   - t4 = tuple([
+4  + t4 = (
+5  |     1,
+6  |     2
+   - ])
+7  + )
+8  | t5 = tuple(
+9  |     (1, 2)
+10 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
   --> C409.py:8:6
@@ -102,18 +98,17 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 12 |   tuple(  # comment
    |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-5  5  |     1,
-6  6  |     2
-7  7  | ])
-8     |-t5 = tuple(
-9     |-    (1, 2)
-10    |-)
-   8  |+t5 = (1, 2)
-11 9  | 
-12 10 | tuple(  # comment
-13 11 |     [1, 2]
+5  |     1,
+6  |     2
+7  | ])
+   - t5 = tuple(
+   -     (1, 2)
+   - )
+8  + t5 = (1, 2)
+9  | 
+10 | tuple(  # comment
+11 |     [1, 2]
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:12:1
@@ -128,18 +123,17 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 16 |   tuple([  # comment
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-9  9  |     (1, 2)
-10 10 | )
-11 11 | 
-12    |-tuple(  # comment
-13    |-    [1, 2]
-14    |-)
-   12 |+(1, 2)
-15 13 | 
-16 14 | tuple([  # comment
-17 15 |     1, 2
+9  |     (1, 2)
+10 | )
+11 | 
+   - tuple(  # comment
+   -     [1, 2]
+   - )
+12 + (1, 2)
+13 | 
+14 | tuple([  # comment
+15 |     1, 2
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:16:1
@@ -154,19 +148,18 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 20 |   tuple((
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-13 13 |     [1, 2]
-14 14 | )
-15 15 | 
-16    |-tuple([  # comment
-   16 |+(  # comment
-17 17 |     1, 2
-18    |-])
-   18 |+)
-19 19 | 
-20 20 | tuple((
-21 21 |     1,
+13 |     [1, 2]
+14 | )
+15 | 
+   - tuple([  # comment
+16 + (  # comment
+17 |     1, 2
+   - ])
+18 + )
+19 | 
+20 | tuple((
+21 |     1,
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
   --> C409.py:20:1
@@ -181,19 +174,18 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 24 |   t6 = tuple([1])
    |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-17 17 |     1, 2
-18 18 | ])
-19 19 | 
-20    |-tuple((
-   20 |+(
-21 21 |     1,
-22    |-))
-   22 |+)
-23 23 | 
-24 24 | t6 = tuple([1])
-25 25 | t7 = tuple((1,))
+17 |     1, 2
+18 | ])
+19 | 
+   - tuple((
+20 + (
+21 |     1,
+   - ))
+22 + )
+23 | 
+24 | t6 = tuple([1])
+25 | t7 = tuple((1,))
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:24:6
@@ -206,16 +198,15 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 26 | t8 = tuple([1,])
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-21 21 |     1,
-22 22 | ))
-23 23 | 
-24    |-t6 = tuple([1])
-   24 |+t6 = (1,)
-25 25 | t7 = tuple((1,))
-26 26 | t8 = tuple([1,])
-27 27 | 
+21 |     1,
+22 | ))
+23 | 
+   - t6 = tuple([1])
+24 + t6 = (1,)
+25 | t7 = tuple((1,))
+26 | t8 = tuple([1,])
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`)
   --> C409.py:25:6
@@ -226,16 +217,15 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to
 26 | t8 = tuple([1,])
    |
 help: Remove the outer call to `tuple()`
-
-ℹ Unsafe fix
-22 22 | ))
-23 23 | 
-24 24 | t6 = tuple([1])
-25    |-t7 = tuple((1,))
-   25 |+t7 = (1,)
-26 26 | t8 = tuple([1,])
-27 27 | 
-28 28 | tuple([x for x in range(5)])
+22 | ))
+23 | 
+24 | t6 = tuple([1])
+   - t7 = tuple((1,))
+25 + t7 = (1,)
+26 | t8 = tuple([1,])
+27 | 
+28 | tuple([x for x in range(5)])
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
   --> C409.py:26:6
@@ -248,16 +238,15 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera
 28 | tuple([x for x in range(5)])
    |
 help: Rewrite as a tuple literal
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | t6 = tuple([1])
-25 25 | t7 = tuple((1,))
-26    |-t8 = tuple([1,])
-   26 |+t8 = (1,)
-27 27 | 
-28 28 | tuple([x for x in range(5)])
-29 29 | tuple({x for x in range(10)})
+23 | 
+24 | t6 = tuple([1])
+25 | t7 = tuple((1,))
+   - t8 = tuple([1,])
+26 + t8 = (1,)
+27 | 
+28 | tuple([x for x in range(5)])
+29 | tuple({x for x in range(10)})
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator)
   --> C409.py:28:1
@@ -270,16 +259,15 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera
 30 | tuple(x for x in range(5))
    |
 help: Rewrite as a generator
-
-ℹ Unsafe fix
-25 25 | t7 = tuple((1,))
-26 26 | t8 = tuple([1,])
-27 27 | 
-28    |-tuple([x for x in range(5)])
-   28 |+tuple(x for x in range(5))
-29 29 | tuple({x for x in range(10)})
-30 30 | tuple(x for x in range(5))
-31 31 | tuple([
+25 | t7 = tuple((1,))
+26 | t8 = tuple([1,])
+27 | 
+   - tuple([x for x in range(5)])
+28 + tuple(x for x in range(5))
+29 | tuple({x for x in range(10)})
+30 | tuple(x for x in range(5))
+31 | tuple([
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator)
   --> C409.py:31:1
@@ -294,18 +282,17 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera
 35 |       [x for x in [1,2,3]]
    |
 help: Rewrite as a generator
-
-ℹ Unsafe fix
-28 28 | tuple([x for x in range(5)])
-29 29 | tuple({x for x in range(10)})
-30 30 | tuple(x for x in range(5))
-31    |-tuple([
-32    |-    x for x in [1,2,3]
-33    |-])
-   31 |+tuple(x for x in [1,2,3])
-34 32 | tuple( # comment
-35 33 |     [x for x in [1,2,3]]
-36 34 | )
+28 | tuple([x for x in range(5)])
+29 | tuple({x for x in range(10)})
+30 | tuple(x for x in range(5))
+   - tuple([
+   -     x for x in [1,2,3]
+   - ])
+31 + tuple(x for x in [1,2,3])
+32 | tuple( # comment
+33 |     [x for x in [1,2,3]]
+34 | )
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator)
   --> C409.py:34:1
@@ -320,16 +307,15 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera
 38 |       x for x in range(10)
    |
 help: Rewrite as a generator
-
-ℹ Unsafe fix
-32 32 |     x for x in [1,2,3]
-33 33 | ])
-34 34 | tuple( # comment
-35    |-    [x for x in [1,2,3]]
-   35 |+    x for x in [1,2,3]
-36 36 | )
-37 37 | tuple([ # comment
-38 38 |     x for x in range(10)
+32 |     x for x in [1,2,3]
+33 | ])
+34 | tuple( # comment
+   -     [x for x in [1,2,3]]
+35 +     x for x in [1,2,3]
+36 | )
+37 | tuple([ # comment
+38 |     x for x in range(10)
+note: This is an unsafe fix and may change runtime behavior
 
 C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator)
   --> C409.py:37:1
@@ -344,18 +330,50 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera
 41 |       {
    |
 help: Rewrite as a generator
+34 | tuple( # comment
+35 |     [x for x in [1,2,3]]
+36 | )
+   - tuple([ # comment
+   -     x for x in range(10)
+   - ])
+37 | tuple(
+38 + # comment
+39 + x for x in range(10))
+40 + tuple(
+41 |     {
+42 |         x for x in [1,2,3]
+43 |     }
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-34 34 | tuple( # comment
-35 35 |     [x for x in [1,2,3]]
-36 36 | )
-37    |-tuple([ # comment
-38    |-    x for x in range(10)
-39    |-])
-40 37 | tuple(
-   38 |+# comment
-   39 |+x for x in range(10))
-   40 |+tuple(
-41 41 |     {
-42 42 |         x for x in [1,2,3]
-43 43 |     }
+C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
+  --> C409.py:46:6
+   |
+44 | )
+45 |
+46 | t9 = tuple([1],)
+   |      ^^^^^^^^^^^
+47 | t10 = tuple([1, 2],)
+   |
+help: Rewrite as a tuple literal
+43 |     }
+44 | )
+45 | 
+   - t9 = tuple([1],)
+46 + t9 = (1,)
+47 | t10 = tuple([1, 2],)
+note: This is an unsafe fix and may change runtime behavior
+
+C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal)
+  --> C409.py:47:7
+   |
+46 | t9 = tuple([1],)
+47 | t10 = tuple([1, 2],)
+   |       ^^^^^^^^^^^^^^
+   |
+help: Rewrite as a tuple literal
+44 | )
+45 | 
+46 | t9 = tuple([1],)
+   - t10 = tuple([1, 2],)
+47 + t10 = (1, 2)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap
index 33b991397a..ce7e603bbb 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap
@@ -10,13 +10,12 @@ C419 [*] Unnecessary list comprehension
 3 | max([x.val for x in bar])
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1   |-sum([x.val for x in bar])
-  1 |+sum(x.val for x in bar)
-2 2 | min([x.val for x in bar])
-3 3 | max([x.val for x in bar])
-4 4 | sum([x.val for x in bar], 0)
+  - sum([x.val for x in bar])
+1 + sum(x.val for x in bar)
+2 | min([x.val for x in bar])
+3 | max([x.val for x in bar])
+4 | sum([x.val for x in bar], 0)
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
  --> C419_1.py:2:5
@@ -28,14 +27,13 @@ C419 [*] Unnecessary list comprehension
 4 | sum([x.val for x in bar], 0)
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1 1 | sum([x.val for x in bar])
-2   |-min([x.val for x in bar])
-  2 |+min(x.val for x in bar)
-3 3 | max([x.val for x in bar])
-4 4 | sum([x.val for x in bar], 0)
-5 5 | 
+1 | sum([x.val for x in bar])
+  - min([x.val for x in bar])
+2 + min(x.val for x in bar)
+3 | max([x.val for x in bar])
+4 | sum([x.val for x in bar], 0)
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
  --> C419_1.py:3:5
@@ -47,15 +45,14 @@ C419 [*] Unnecessary list comprehension
 4 | sum([x.val for x in bar], 0)
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1 1 | sum([x.val for x in bar])
-2 2 | min([x.val for x in bar])
-3   |-max([x.val for x in bar])
-  3 |+max(x.val for x in bar)
-4 4 | sum([x.val for x in bar], 0)
-5 5 | 
-6 6 | # OK
+1 | sum([x.val for x in bar])
+2 | min([x.val for x in bar])
+  - max([x.val for x in bar])
+3 + max(x.val for x in bar)
+4 | sum([x.val for x in bar], 0)
+5 | 
+6 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
  --> C419_1.py:4:5
@@ -68,16 +65,15 @@ C419 [*] Unnecessary list comprehension
 6 | # OK
   |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-1 1 | sum([x.val for x in bar])
-2 2 | min([x.val for x in bar])
-3 3 | max([x.val for x in bar])
-4   |-sum([x.val for x in bar], 0)
-  4 |+sum((x.val for x in bar), 0)
-5 5 | 
-6 6 | # OK
-7 7 | sum(x.val for x in bar)
+1 | sum([x.val for x in bar])
+2 | min([x.val for x in bar])
+3 | max([x.val for x in bar])
+  - sum([x.val for x in bar], 0)
+4 + sum((x.val for x in bar), 0)
+5 | 
+6 | # OK
+7 | sum(x.val for x in bar)
+note: This is an unsafe fix and may change runtime behavior
 
 C419 [*] Unnecessary list comprehension
   --> C419_1.py:14:5
@@ -94,17 +90,16 @@ C419 [*] Unnecessary list comprehension
 20 |   )
    |
 help: Remove unnecessary comprehension
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | # Multi-line
-13 13 | sum(
-14    |-    [
-   14 |+    (
-15 15 |         delta
-16 16 |         for delta in timedelta_list
-17 17 |         if delta
-18    |-    ],
-   18 |+    ),
-19 19 |     dt.timedelta(),
-20 20 | )
+11 | 
+12 | # Multi-line
+13 | sum(
+   -     [
+14 +     (
+15 |         delta
+16 |         for delta in timedelta_list
+17 |         if delta
+   -     ],
+18 +     ),
+19 |     dt.timedelta(),
+20 | )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_copyright/rules/missing_copyright_notice.rs b/crates/ruff_linter/src/rules/flake8_copyright/rules/missing_copyright_notice.rs
index f2c578036c..b3f70a7f88 100644
--- a/crates/ruff_linter/src/rules/flake8_copyright/rules/missing_copyright_notice.rs
+++ b/crates/ruff_linter/src/rules/flake8_copyright/rules/missing_copyright_notice.rs
@@ -20,6 +20,7 @@ use crate::settings::LinterSettings;
 /// - `lint.flake8-copyright.min-file-size`
 /// - `lint.flake8-copyright.notice-rgx`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.273")]
 pub(crate) struct MissingCopyrightNotice;
 
 impl Violation for MissingCopyrightNotice {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs
index 97b76d57fc..8cdc1a7a46 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs
@@ -11,15 +11,15 @@ use crate::checkers::ast::Checker;
 /// Checks for usage of `datetime.date.fromtimestamp()`.
 ///
 /// ## Why is this bad?
-/// Python datetime objects can be naive or timezone-aware. While an aware
+/// Python date objects are naive, that is, not timezone-aware. While an aware
 /// object represents a specific moment in time, a naive object does not
 /// contain enough information to unambiguously locate itself relative to other
 /// datetime objects. Since this can lead to errors, it is recommended to
 /// always use timezone-aware objects.
 ///
-/// `datetime.date.fromtimestamp(ts)` returns a naive datetime object.
-/// Instead, use `datetime.datetime.fromtimestamp(ts, tz=...)` to create a
-/// timezone-aware object.
+/// `datetime.date.fromtimestamp(ts)` returns a naive date object.
+/// Instead, use `datetime.datetime.fromtimestamp(ts, tz=...).date()` to
+/// create a timezone-aware datetime object and retrieve its date component.
 ///
 /// ## Example
 /// ```python
@@ -32,19 +32,20 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// import datetime
 ///
-/// datetime.datetime.fromtimestamp(946684800, tz=datetime.timezone.utc)
+/// datetime.datetime.fromtimestamp(946684800, tz=datetime.timezone.utc).date()
 /// ```
 ///
 /// Or, for Python 3.11 and later:
 /// ```python
 /// import datetime
 ///
-/// datetime.datetime.fromtimestamp(946684800, tz=datetime.UTC)
+/// datetime.datetime.fromtimestamp(946684800, tz=datetime.UTC).date()
 /// ```
 ///
 /// ## References
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDateFromtimestamp;
 
 impl Violation for CallDateFromtimestamp {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_today.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_today.rs
index 533d5bf0e3..8b84a68625 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_today.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_today.rs
@@ -11,14 +11,15 @@ use crate::checkers::ast::Checker;
 /// Checks for usage of `datetime.date.today()`.
 ///
 /// ## Why is this bad?
-/// Python datetime objects can be naive or timezone-aware. While an aware
+/// Python date objects are naive, that is, not timezone-aware. While an aware
 /// object represents a specific moment in time, a naive object does not
 /// contain enough information to unambiguously locate itself relative to other
 /// datetime objects. Since this can lead to errors, it is recommended to
 /// always use timezone-aware objects.
 ///
-/// `datetime.date.today` returns a naive datetime object. Instead, use
-/// `datetime.datetime.now(tz=...).date()` to create a timezone-aware object.
+/// `datetime.date.today` returns a naive date object without taking timezones
+/// into account. Instead, use `datetime.datetime.now(tz=...).date()` to
+/// create a timezone-aware object and retrieve its date component.
 ///
 /// ## Example
 /// ```python
@@ -44,6 +45,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDateToday;
 
 impl Violation for CallDateToday {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs
index 7e443efe74..36c8d9831d 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs
@@ -48,6 +48,7 @@ use crate::rules::flake8_datetimez::helpers::{self, DatetimeModuleAntipattern};
 /// ## References
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeFromtimestamp(DatetimeModuleAntipattern);
 
 impl Violation for CallDatetimeFromtimestamp {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs
index ceea7e2d84..5827cad81c 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs
@@ -46,6 +46,7 @@ use crate::rules::flake8_datetimez::helpers::{self, DatetimeModuleAntipattern};
 /// ## References
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeNowWithoutTzinfo(DatetimeModuleAntipattern);
 
 impl Violation for CallDatetimeNowWithoutTzinfo {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs
index 93e2a37b90..534ca9cb4a 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs
@@ -51,6 +51,7 @@ use crate::rules::flake8_datetimez::helpers::DatetimeModuleAntipattern;
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 /// - [Python documentation: `strftime()` and `strptime()` Behavior](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeStrptimeWithoutZone(DatetimeModuleAntipattern);
 
 impl Violation for CallDatetimeStrptimeWithoutZone {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_today.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_today.rs
index f748b8d832..4545302ba0 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_today.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_today.rs
@@ -42,7 +42,11 @@ use crate::rules::flake8_datetimez::helpers;
 ///
 /// datetime.datetime.now(tz=datetime.UTC)
 /// ```
+///
+/// ## References
+/// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeToday;
 
 impl Violation for CallDatetimeToday {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs
index 4f6210e026..3441ecd6b5 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs
@@ -47,6 +47,7 @@ use crate::rules::flake8_datetimez::helpers;
 /// ## References
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeUtcfromtimestamp;
 
 impl Violation for CallDatetimeUtcfromtimestamp {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs
index 552ebbce5f..c1dfd21a42 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs
@@ -46,6 +46,7 @@ use crate::rules::flake8_datetimez::helpers;
 /// ## References
 /// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeUtcnow;
 
 impl Violation for CallDatetimeUtcnow {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs
index d4c53cf324..a621ad202b 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs
@@ -41,7 +41,11 @@ use crate::rules::flake8_datetimez::helpers::{self, DatetimeModuleAntipattern};
 ///
 /// datetime.datetime(2000, 1, 1, 0, 0, 0, tzinfo=datetime.UTC)
 /// ```
+///
+/// ## References
+/// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct CallDatetimeWithoutTzinfo(DatetimeModuleAntipattern);
 
 impl Violation for CallDatetimeWithoutTzinfo {
diff --git a/crates/ruff_linter/src/rules/flake8_datetimez/rules/datetime_min_max.rs b/crates/ruff_linter/src/rules/flake8_datetimez/rules/datetime_min_max.rs
index a55a91f762..a1428c9a77 100644
--- a/crates/ruff_linter/src/rules/flake8_datetimez/rules/datetime_min_max.rs
+++ b/crates/ruff_linter/src/rules/flake8_datetimez/rules/datetime_min_max.rs
@@ -38,7 +38,11 @@ use crate::checkers::ast::Checker;
 ///
 /// datetime.datetime.max.replace(tzinfo=datetime.UTC)
 /// ```
+///
+/// ## References
+/// - [Python documentation: Aware and Naive Objects](https://docs.python.org/3/library/datetime.html#aware-and-naive-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct DatetimeMinMax {
     min_max: MinMax,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_debugger/rules/debugger.rs b/crates/ruff_linter/src/rules/flake8_debugger/rules/debugger.rs
index a068ff4387..f7ce0eb580 100644
--- a/crates/ruff_linter/src/rules/flake8_debugger/rules/debugger.rs
+++ b/crates/ruff_linter/src/rules/flake8_debugger/rules/debugger.rs
@@ -31,6 +31,7 @@ use crate::rules::flake8_debugger::types::DebuggerUsingType;
 /// - [Python documentation: `pdb` — The Python Debugger](https://docs.python.org/3/library/pdb.html)
 /// - [Python documentation: `logging` — Logging facility for Python](https://docs.python.org/3/library/logging.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.141")]
 pub(crate) struct Debugger {
     using_type: DebuggerUsingType,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs b/crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs
index 13a1209f84..9a752afd92 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs
@@ -38,6 +38,7 @@ use crate::rules::flake8_django::helpers::is_model_form;
 ///         fields = ["title", "content"]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct DjangoAllWithModelForm;
 
 impl Violation for DjangoAllWithModelForm {
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs b/crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs
index 4f5fe15f7a..2b1142f7bb 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs
@@ -36,6 +36,7 @@ use crate::rules::flake8_django::helpers::is_model_form;
 ///         fields = ["title", "content"]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct DjangoExcludeWithModelForm;
 
 impl Violation for DjangoExcludeWithModelForm {
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/locals_in_render_function.rs b/crates/ruff_linter/src/rules/flake8_django/rules/locals_in_render_function.rs
index 4f5ad2ca42..6f239ffe65 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/locals_in_render_function.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/locals_in_render_function.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 ///     return render(request, "app/index.html", context)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct DjangoLocalsInRenderFunction;
 
 impl Violation for DjangoLocalsInRenderFunction {
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs b/crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs
index 0141c77f22..e1cf9fda3f 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs
@@ -41,6 +41,7 @@ use crate::rules::flake8_django::helpers;
 ///         return f"{self.field}"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.246")]
 pub(crate) struct DjangoModelWithoutDunderStr;
 
 impl Violation for DjangoModelWithoutDunderStr {
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs b/crates/ruff_linter/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs
index 3a854e9756..289b4a45e2 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 ///     pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.246")]
 pub(crate) struct DjangoNonLeadingReceiverDecorator;
 
 impl Violation for DjangoNonLeadingReceiverDecorator {
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/nullable_model_string_field.rs b/crates/ruff_linter/src/rules/flake8_django/rules/nullable_model_string_field.rs
index 3157e6f4fb..47e463d5df 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/nullable_model_string_field.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/nullable_model_string_field.rs
@@ -41,6 +41,7 @@ use crate::rules::flake8_django::helpers;
 ///     field = models.CharField(max_length=255, default="")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.246")]
 pub(crate) struct DjangoNullableModelStringField {
     field_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs b/crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
index b6492136ac..b3a0127343 100644
--- a/crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
@@ -63,6 +63,7 @@ use crate::rules::flake8_django::helpers;
 ///
 /// [Django Style Guide]: https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#model-style
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct DjangoUnorderedBodyContentInModel {
     element_type: ContentType,
     prev_element_type: ContentType,
diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/mod.rs b/crates/ruff_linter/src/rules/flake8_errmsg/mod.rs
index ffaba36917..c9d452de51 100644
--- a/crates/ruff_linter/src/rules/flake8_errmsg/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/mod.rs
@@ -9,7 +9,6 @@ mod tests {
     use anyhow::Result;
 
     use crate::registry::Rule;
-    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
@@ -47,15 +46,14 @@ mod tests {
     }
 
     #[test]
-    fn preview_string_exception() -> Result<()> {
+    fn string_exception() -> Result<()> {
         let diagnostics = test_path(
             Path::new("flake8_errmsg/EM101_byte_string.py"),
             &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
                 ..settings::LinterSettings::for_rule(Rule::RawStringInException)
             },
         )?;
-        assert_diagnostics!("preview", diagnostics);
+        assert_diagnostics!(diagnostics);
         Ok(())
     }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs b/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs
index 62b981b5b8..474ff585ea 100644
--- a/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs
@@ -7,16 +7,12 @@ use ruff_text_size::Ranged;
 
 use crate::Locator;
 use crate::checkers::ast::Checker;
-use crate::preview::is_raise_exception_byte_string_enabled;
 use crate::registry::Rule;
 use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
 /// Checks for the use of string literals in exception constructors.
 ///
-/// In [preview], this rule checks for byte string literals in
-/// exception constructors.
-///
 /// ## Why is this bad?
 /// Python includes the `raise` in the default traceback (and formatters
 /// like Rich and IPython do too).
@@ -51,9 +47,8 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///     raise RuntimeError(msg)
 /// RuntimeError: 'Some value' is incorrect
 /// ```
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.183")]
 pub(crate) struct RawStringInException;
 
 impl Violation for RawStringInException {
@@ -109,6 +104,7 @@ impl Violation for RawStringInException {
 /// RuntimeError: 'Some value' is incorrect
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.183")]
 pub(crate) struct FStringInException;
 
 impl Violation for FStringInException {
@@ -165,6 +161,7 @@ impl Violation for FStringInException {
 /// RuntimeError: 'Some value' is incorrect
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.183")]
 pub(crate) struct DotFormatInException;
 
 impl Violation for DotFormatInException {
@@ -218,9 +215,7 @@ pub(crate) fn string_in_exception(checker: &Checker, stmt: &Stmt, exc: &Expr) {
             // Check for byte string literals.
             Expr::BytesLiteral(ast::ExprBytesLiteral { value: bytes, .. }) => {
                 if checker.settings().rules.enabled(Rule::RawStringInException) {
-                    if bytes.len() >= checker.settings().flake8_errmsg.max_string_length
-                        && is_raise_exception_byte_string_enabled(checker.settings())
-                    {
+                    if bytes.len() >= checker.settings().flake8_errmsg.max_string_length {
                         let mut diagnostic =
                             checker.report_diagnostic(RawStringInException, first.range());
                         if let Some(indentation) = whitespace::indentation(checker.source(), stmt) {
diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap
index 0f3efc172f..7ca04ac460 100644
--- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap
@@ -9,17 +9,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | 
-4 4 | def f_a():
-5   |-    raise RuntimeError("This is an example exception")
-  5 |+    msg = "This is an example exception"
-  6 |+    raise RuntimeError(msg)
-6 7 | 
-7 8 | 
-8 9 | def f_a_short():
+2 | 
+3 | 
+4 | def f_a():
+  -     raise RuntimeError("This is an example exception")
+5 +     msg = "This is an example exception"
+6 +     raise RuntimeError(msg)
+7 | 
+8 | 
+9 | def f_a_short():
+note: This is an unsafe fix and may change runtime behavior
 
 EM102 [*] Exception must not use an f-string literal, assign to variable first
   --> EM.py:18:24
@@ -30,17 +29,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove f-string literal
-
-ℹ Unsafe fix
-15 15 | 
-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_c():
+15 | 
+16 | def f_b():
+17 |     example = "example"
+   -     raise RuntimeError(f"This is an {example} exception")
+18 +     msg = f"This is an {example} exception"
+19 +     raise RuntimeError(msg)
+20 | 
+21 | 
+22 | def f_c():
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:22:24
@@ -50,17 +48,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe 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():
+19 | 
+20 | 
+21 | def f_c():
+   -     raise RuntimeError("This is an {example} exception".format(example="example"))
+22 +     msg = "This is an {example} exception".format(example="example")
+23 +     raise RuntimeError(msg)
+24 | 
+25 | 
+26 | def f_ok():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:32:24
@@ -71,17 +68,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-29 29 | 
-30 30 | def f_msg_defined():
-31 31 |     msg = "hello"
-32    |-    raise RuntimeError("This is an example exception")
-   32 |+    msg = "This is an example exception"
-   33 |+    raise RuntimeError(msg)
-33 34 | 
-34 35 | 
-35 36 | def f_msg_in_nested_scope():
+29 | 
+30 | def f_msg_defined():
+31 |     msg = "hello"
+   -     raise RuntimeError("This is an example exception")
+32 +     msg = "This is an example exception"
+33 +     raise RuntimeError(msg)
+34 | 
+35 | 
+36 | def f_msg_in_nested_scope():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:39:24
@@ -92,17 +88,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-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():
+36 |     def nested():
+37 |         msg = "hello"
+38 | 
+   -     raise RuntimeError("This is an example exception")
+39 +     msg = "This is an example exception"
+40 +     raise RuntimeError(msg)
+41 | 
+42 | 
+43 | def f_msg_in_parent_scope():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:46:28
@@ -112,17 +107,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-43 43 |     msg = "hello"
-44 44 | 
-45 45 |     def nested():
-46    |-        raise RuntimeError("This is an example exception")
-   46 |+        msg = "This is an example exception"
-   47 |+        raise RuntimeError(msg)
-47 48 | 
-48 49 | 
-49 50 | def f_fix_indentation_check(foo):
+43 |     msg = "hello"
+44 | 
+45 |     def nested():
+   -         raise RuntimeError("This is an example exception")
+46 +         msg = "This is an example exception"
+47 +         raise RuntimeError(msg)
+48 | 
+49 | 
+50 | def f_fix_indentation_check(foo):
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:51:28
@@ -135,17 +129,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
 53 |         if foo == "foo":
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-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}")
+48 | 
+49 | def f_fix_indentation_check(foo):
+50 |     if foo:
+   -         raise RuntimeError("This is an example exception")
+51 +         msg = "This is an example exception"
+52 +         raise RuntimeError(msg)
+53 |     else:
+54 |         if foo == "foo":
+55 |             raise RuntimeError(f"This is an exception: {foo}")
+note: This is an unsafe fix and may change runtime behavior
 
 EM102 [*] Exception must not use an f-string literal, assign to variable first
   --> EM.py:54:32
@@ -157,17 +150,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first
 55 |     raise RuntimeError("This is an exception: {}".format(foo))
    |
 help: Assign to variable; remove f-string literal
-
-ℹ Unsafe fix
-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 | 
+51 |         raise RuntimeError("This is an example exception")
+52 |     else:
+53 |         if foo == "foo":
+   -             raise RuntimeError(f"This is an exception: {foo}")
+54 +             msg = f"This is an exception: {foo}"
+55 +             raise RuntimeError(msg)
+56 |     raise RuntimeError("This is an exception: {}".format(foo))
+57 | 
+58 | 
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:55:24
@@ -178,17 +170,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe fix
-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
+52 |     else:
+53 |         if foo == "foo":
+54 |             raise RuntimeError(f"This is an exception: {foo}")
+   -     raise RuntimeError("This is an exception: {}".format(foo))
+55 +     msg = "This is an exception: {}".format(foo)
+56 +     raise RuntimeError(msg)
+57 | 
+58 | 
+59 | # Report these, but don't fix them
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 Exception must not use a string literal, assign to variable first
   --> EM.py:59:28
@@ -218,17 +209,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove f-string literal
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | 
-63 63 | def f_triple_quoted_string():
-64    |-    raise RuntimeError(f"""This is an {"example"} exception""")
-   64 |+    msg = f"""This is an {"example"} exception"""
-   65 |+    raise RuntimeError(msg)
-65 66 | 
-66 67 | 
-67 68 | def f_multi_line_string():
+61 | 
+62 | 
+63 | def f_triple_quoted_string():
+   -     raise RuntimeError(f"""This is an {"example"} exception""")
+64 +     msg = f"""This is an {"example"} exception"""
+65 +     raise RuntimeError(msg)
+66 | 
+67 | 
+68 | def f_multi_line_string():
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:76:9
@@ -242,23 +232,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
 79 |       )
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe fix
-72 72 | 
-73 73 | 
-74 74 | def f_multi_line_string2():
-75    |-    raise RuntimeError(
-   75 |+    msg = (
-76 76 |         "This is an {example} exception".format(
-77 77 |             example="example"
-78 78 |         )
-79 79 |     )
-   80 |+    raise RuntimeError(
-   81 |+        msg
-   82 |+    )
-80 83 | 
-81 84 | 
-82 85 | def f_multi_line_string2():
+72 | 
+73 | 
+74 | def f_multi_line_string2():
+   -     raise RuntimeError(
+75 +     msg = (
+76 |         "This is an {example} exception".format(
+77 |             example="example"
+78 |         )
+79 |     )
+80 +     raise RuntimeError(
+81 +         msg
+82 +     )
+83 | 
+84 | 
+85 | def f_multi_line_string2():
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:84:9
@@ -275,23 +264,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
 90 |       )
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | 
-82 82 | def f_multi_line_string2():
-83    |-    raise RuntimeError(
-   83 |+    msg = (
-84 84 |         (
-85 85 |             "This is an "
-86 86 |             "{example} exception"
+80 | 
+81 | 
+82 | def f_multi_line_string2():
+   -     raise RuntimeError(
+83 +     msg = (
+84 |         (
+85 |             "This is an "
+86 |             "{example} exception"
 --------------------------------------------------------------------------------
-88 88 |             example="example"
-89 89 |         )
-90 90 |     )
-   91 |+    raise RuntimeError(
-   92 |+        msg
-   93 |+    )
-91 94 | 
-92 95 | 
-93 96 | def raise_typing_cast_exception():
+88 |             example="example"
+89 |         )
+90 |     )
+91 +     raise RuntimeError(
+92 +         msg
+93 +     )
+94 | 
+95 | 
+96 | def raise_typing_cast_exception():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap
index d470bd5028..2ad5c0ac1c 100644
--- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap
@@ -9,17 +9,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | 
-4 4 | def f_a():
-5   |-    raise RuntimeError("This is an example exception")
-  5 |+    msg = "This is an example exception"
-  6 |+    raise RuntimeError(msg)
-6 7 | 
-7 8 | 
-8 9 | def f_a_short():
+2 | 
+3 | 
+4 | def f_a():
+  -     raise RuntimeError("This is an example exception")
+5 +     msg = "This is an example exception"
+6 +     raise RuntimeError(msg)
+7 | 
+8 | 
+9 | def f_a_short():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
  --> EM.py:9:24
@@ -29,17 +28,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
   |                        ^^^^^^^
   |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | 
-8  8  | def f_a_short():
-9     |-    raise RuntimeError("Error")
-   9  |+    msg = "Error"
-   10 |+    raise RuntimeError(msg)
-10 11 | 
-11 12 | 
-12 13 | def f_a_empty():
+6  | 
+7  | 
+8  | def f_a_short():
+   -     raise RuntimeError("Error")
+9  +     msg = "Error"
+10 +     raise RuntimeError(msg)
+11 | 
+12 | 
+13 | def f_a_empty():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:13:24
@@ -49,17 +47,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                        ^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-10 10 | 
-11 11 | 
-12 12 | def f_a_empty():
-13    |-    raise RuntimeError("")
-   13 |+    msg = ""
-   14 |+    raise RuntimeError(msg)
-14 15 | 
-15 16 | 
-16 17 | def f_b():
+10 | 
+11 | 
+12 | def f_a_empty():
+   -     raise RuntimeError("")
+13 +     msg = ""
+14 +     raise RuntimeError(msg)
+15 | 
+16 | 
+17 | def f_b():
+note: This is an unsafe fix and may change runtime behavior
 
 EM102 [*] Exception must not use an f-string literal, assign to variable first
   --> EM.py:18:24
@@ -70,17 +67,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove f-string literal
-
-ℹ Unsafe fix
-15 15 | 
-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_c():
+15 | 
+16 | def f_b():
+17 |     example = "example"
+   -     raise RuntimeError(f"This is an {example} exception")
+18 +     msg = f"This is an {example} exception"
+19 +     raise RuntimeError(msg)
+20 | 
+21 | 
+22 | def f_c():
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:22:24
@@ -90,17 +86,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe 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():
+19 | 
+20 | 
+21 | def f_c():
+   -     raise RuntimeError("This is an {example} exception".format(example="example"))
+22 +     msg = "This is an {example} exception".format(example="example")
+23 +     raise RuntimeError(msg)
+24 | 
+25 | 
+26 | def f_ok():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:32:24
@@ -111,17 +106,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-29 29 | 
-30 30 | def f_msg_defined():
-31 31 |     msg = "hello"
-32    |-    raise RuntimeError("This is an example exception")
-   32 |+    msg = "This is an example exception"
-   33 |+    raise RuntimeError(msg)
-33 34 | 
-34 35 | 
-35 36 | def f_msg_in_nested_scope():
+29 | 
+30 | def f_msg_defined():
+31 |     msg = "hello"
+   -     raise RuntimeError("This is an example exception")
+32 +     msg = "This is an example exception"
+33 +     raise RuntimeError(msg)
+34 | 
+35 | 
+36 | def f_msg_in_nested_scope():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:39:24
@@ -132,17 +126,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-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():
+36 |     def nested():
+37 |         msg = "hello"
+38 | 
+   -     raise RuntimeError("This is an example exception")
+39 +     msg = "This is an example exception"
+40 +     raise RuntimeError(msg)
+41 | 
+42 | 
+43 | def f_msg_in_parent_scope():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:46:28
@@ -152,17 +145,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-43 43 |     msg = "hello"
-44 44 | 
-45 45 |     def nested():
-46    |-        raise RuntimeError("This is an example exception")
-   46 |+        msg = "This is an example exception"
-   47 |+        raise RuntimeError(msg)
-47 48 | 
-48 49 | 
-49 50 | def f_fix_indentation_check(foo):
+43 |     msg = "hello"
+44 | 
+45 |     def nested():
+   -         raise RuntimeError("This is an example exception")
+46 +         msg = "This is an example exception"
+47 +         raise RuntimeError(msg)
+48 | 
+49 | 
+50 | def f_fix_indentation_check(foo):
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:51:28
@@ -175,17 +167,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first
 53 |         if foo == "foo":
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-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}")
+48 | 
+49 | def f_fix_indentation_check(foo):
+50 |     if foo:
+   -         raise RuntimeError("This is an example exception")
+51 +         msg = "This is an example exception"
+52 +         raise RuntimeError(msg)
+53 |     else:
+54 |         if foo == "foo":
+55 |             raise RuntimeError(f"This is an exception: {foo}")
+note: This is an unsafe fix and may change runtime behavior
 
 EM102 [*] Exception must not use an f-string literal, assign to variable first
   --> EM.py:54:32
@@ -197,17 +188,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first
 55 |     raise RuntimeError("This is an exception: {}".format(foo))
    |
 help: Assign to variable; remove f-string literal
-
-ℹ Unsafe fix
-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 | 
+51 |         raise RuntimeError("This is an example exception")
+52 |     else:
+53 |         if foo == "foo":
+   -             raise RuntimeError(f"This is an exception: {foo}")
+54 +             msg = f"This is an exception: {foo}"
+55 +             raise RuntimeError(msg)
+56 |     raise RuntimeError("This is an exception: {}".format(foo))
+57 | 
+58 | 
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:55:24
@@ -218,17 +208,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe fix
-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
+52 |     else:
+53 |         if foo == "foo":
+54 |             raise RuntimeError(f"This is an exception: {foo}")
+   -     raise RuntimeError("This is an exception: {}".format(foo))
+55 +     msg = "This is an exception: {}".format(foo)
+56 +     raise RuntimeError(msg)
+57 | 
+58 | 
+59 | # Report these, but don't fix them
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 Exception must not use a string literal, assign to variable first
   --> EM.py:59:28
@@ -258,17 +247,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Assign to variable; remove f-string literal
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | 
-63 63 | def f_triple_quoted_string():
-64    |-    raise RuntimeError(f"""This is an {"example"} exception""")
-   64 |+    msg = f"""This is an {"example"} exception"""
-   65 |+    raise RuntimeError(msg)
-65 66 | 
-66 67 | 
-67 68 | def f_multi_line_string():
+61 | 
+62 | 
+63 | def f_triple_quoted_string():
+   -     raise RuntimeError(f"""This is an {"example"} exception""")
+64 +     msg = f"""This is an {"example"} exception"""
+65 +     raise RuntimeError(msg)
+66 | 
+67 | 
+68 | def f_multi_line_string():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
   --> EM.py:69:9
@@ -281,22 +269,21 @@ EM101 [*] Exception must not use a string literal, assign to variable first
 71 |       )
    |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | 
-67 67 | def f_multi_line_string():
-68    |-    raise RuntimeError(
-   68 |+    msg = (
-69 69 |         "first"
-70 70 |         "second"
-71 71 |     )
-   72 |+    raise RuntimeError(
-   73 |+        msg
-   74 |+    )
-72 75 | 
-73 76 | 
-74 77 | def f_multi_line_string2():
+65 | 
+66 | 
+67 | def f_multi_line_string():
+   -     raise RuntimeError(
+68 +     msg = (
+69 |         "first"
+70 |         "second"
+71 |     )
+72 +     raise RuntimeError(
+73 +         msg
+74 +     )
+75 | 
+76 | 
+77 | def f_multi_line_string2():
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:76:9
@@ -310,23 +297,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
 79 |       )
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe fix
-72 72 | 
-73 73 | 
-74 74 | def f_multi_line_string2():
-75    |-    raise RuntimeError(
-   75 |+    msg = (
-76 76 |         "This is an {example} exception".format(
-77 77 |             example="example"
-78 78 |         )
-79 79 |     )
-   80 |+    raise RuntimeError(
-   81 |+        msg
-   82 |+    )
-80 83 | 
-81 84 | 
-82 85 | def f_multi_line_string2():
+72 | 
+73 | 
+74 | def f_multi_line_string2():
+   -     raise RuntimeError(
+75 +     msg = (
+76 |         "This is an {example} exception".format(
+77 |             example="example"
+78 |         )
+79 |     )
+80 +     raise RuntimeError(
+81 +         msg
+82 +     )
+83 | 
+84 | 
+85 | def f_multi_line_string2():
+note: This is an unsafe fix and may change runtime behavior
 
 EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
   --> EM.py:84:9
@@ -343,23 +329,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab
 90 |       )
    |
 help: Assign to variable; remove `.format()` string
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | 
-82 82 | def f_multi_line_string2():
-83    |-    raise RuntimeError(
-   83 |+    msg = (
-84 84 |         (
-85 85 |             "This is an "
-86 86 |             "{example} exception"
+80 | 
+81 | 
+82 | def f_multi_line_string2():
+   -     raise RuntimeError(
+83 +     msg = (
+84 |         (
+85 |             "This is an "
+86 |             "{example} exception"
 --------------------------------------------------------------------------------
-88 88 |             example="example"
-89 89 |         )
-90 90 |     )
-   91 |+    raise RuntimeError(
-   92 |+        msg
-   93 |+    )
-91 94 | 
-92 95 | 
-93 96 | def raise_typing_cast_exception():
+88 |             example="example"
+89 |         )
+90 |     )
+91 +     raise RuntimeError(
+92 +         msg
+93 +     )
+94 | 
+95 | 
+96 | def raise_typing_cast_exception():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__string_exception.snap
similarity index 59%
rename from crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap
rename to crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__string_exception.snap
index 56a0a67bce..d2763d0898 100644
--- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__string_exception.snap
@@ -9,15 +9,14 @@ EM101 [*] Exception must not use a string literal, assign to variable first
   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-1 1 | def f_byte():
-2   |-    raise RuntimeError(b"This is an example exception")
-  2 |+    msg = b"This is an example exception"
-  3 |+    raise RuntimeError(msg)
-3 4 | 
-4 5 | 
-5 6 | def f_byte_empty():
+1 | def f_byte():
+  -     raise RuntimeError(b"This is an example exception")
+2 +     msg = b"This is an example exception"
+3 +     raise RuntimeError(msg)
+4 | 
+5 | 
+6 | def f_byte_empty():
+note: This is an unsafe fix and may change runtime behavior
 
 EM101 [*] Exception must not use a string literal, assign to variable first
  --> EM101_byte_string.py:6:24
@@ -27,11 +26,10 @@ EM101 [*] Exception must not use a string literal, assign to variable first
   |                        ^^^
   |
 help: Assign to variable; remove string literal
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | 
-5 5 | def f_byte_empty():
-6   |-    raise RuntimeError(b"")
-  6 |+    msg = b""
-  7 |+    raise RuntimeError(msg)
+3 | 
+4 | 
+5 | def f_byte_empty():
+  -     raise RuntimeError(b"")
+6 +     msg = b""
+7 +     raise RuntimeError(msg)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_leading_whitespace.rs b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_leading_whitespace.rs
index 5fe7a072d2..8285746933 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_leading_whitespace.rs
+++ b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_leading_whitespace.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: Executable Python Scripts](https://docs.python.org/3/tutorial/appendix.html#executable-python-scripts)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.229")]
 pub(crate) struct ShebangLeadingWhitespace;
 
 impl AlwaysFixableViolation for ShebangLeadingWhitespace {
diff --git a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_executable_file.rs b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_executable_file.rs
index 1d13b3815f..301ea999d0 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_executable_file.rs
+++ b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_executable_file.rs
@@ -34,6 +34,7 @@ use crate::rules::flake8_executable::helpers::is_executable;
 /// - [Python documentation: Executable Python Scripts](https://docs.python.org/3/tutorial/appendix.html#executable-python-scripts)
 /// - [Git documentation: `git update-index --chmod`](https://git-scm.com/docs/git-update-index#Documentation/git-update-index.txt---chmod-x)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.233")]
 pub(crate) struct ShebangMissingExecutableFile;
 
 impl Violation for ShebangMissingExecutableFile {
diff --git a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_python.rs b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_python.rs
index 13d6b13158..968e5340ca 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_python.rs
+++ b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_missing_python.rs
@@ -32,6 +32,7 @@ use crate::comments::shebang::ShebangDirective;
 /// ## References
 /// - [Python documentation: Executable Python Scripts](https://docs.python.org/3/tutorial/appendix.html#executable-python-scripts)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.229")]
 pub(crate) struct ShebangMissingPython;
 
 impl Violation for ShebangMissingPython {
diff --git a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_executable.rs b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_executable.rs
index afff2a41f3..c9ea74d86b 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_executable.rs
+++ b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_executable.rs
@@ -38,6 +38,7 @@ use crate::rules::flake8_executable::helpers::is_executable;
 /// - [Python documentation: Executable Python Scripts](https://docs.python.org/3/tutorial/appendix.html#executable-python-scripts)
 /// - [Git documentation: `git update-index --chmod`](https://git-scm.com/docs/git-update-index#Documentation/git-update-index.txt---chmod-x)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.233")]
 pub(crate) struct ShebangNotExecutable;
 
 impl Violation for ShebangNotExecutable {
diff --git a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_first_line.rs b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_first_line.rs
index 4f5168e24d..4d1732cd7c 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_first_line.rs
+++ b/crates/ruff_linter/src/rules/flake8_executable/rules/shebang_not_first_line.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::LintContext;
 /// ## References
 /// - [Python documentation: Executable Python Scripts](https://docs.python.org/3/tutorial/appendix.html#executable-python-scripts)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.229")]
 pub(crate) struct ShebangNotFirstLine;
 
 impl Violation for ShebangNotFirstLine {
diff --git a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap
index df337e1b7a..520b32887f 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap
@@ -8,7 +8,5 @@ EXE004 [*] Avoid whitespace before shebang
   | ^^^^
   |
 help: Remove whitespace before shebang
-
-ℹ Safe fix
-1   |-    #!/usr/bin/python
-  1 |+#!/usr/bin/python
+  -     #!/usr/bin/python
+1 + #!/usr/bin/python
diff --git a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap
index 08eb0fdf1d..2730c24a5f 100644
--- a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap
@@ -9,8 +9,6 @@ EXE004 [*] Avoid whitespace before shebang
   | |____^
   |
 help: Remove whitespace before shebang
-
-ℹ Safe fix
-1   |-
-2   |-    #!/usr/bin/env python
-  1 |+#!/usr/bin/env python
+  - 
+  -     #!/usr/bin/env python
+1 + #!/usr/bin/env python
diff --git a/crates/ruff_linter/src/rules/flake8_fixme/rules/todos.rs b/crates/ruff_linter/src/rules/flake8_fixme/rules/todos.rs
index e17deced80..5ca86e42b9 100644
--- a/crates/ruff_linter/src/rules/flake8_fixme/rules/todos.rs
+++ b/crates/ruff_linter/src/rules/flake8_fixme/rules/todos.rs
@@ -23,6 +23,7 @@ use crate::directives::{TodoComment, TodoDirectiveKind};
 ///     return f"Hello, {name}!"  # TODO: Add support for custom greetings.
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.272")]
 pub(crate) struct LineContainsTodo;
 impl Violation for LineContainsTodo {
     #[derive_message_formats]
@@ -49,6 +50,7 @@ impl Violation for LineContainsTodo {
 ///     return distance / time  # FIXME: Raises ZeroDivisionError for time = 0.
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.272")]
 pub(crate) struct LineContainsFixme;
 impl Violation for LineContainsFixme {
     #[derive_message_formats]
@@ -72,6 +74,7 @@ impl Violation for LineContainsFixme {
 ///     return distance / time  # XXX: Raises ZeroDivisionError for time = 0.
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.272")]
 pub(crate) struct LineContainsXxx;
 impl Violation for LineContainsXxx {
     #[derive_message_formats]
@@ -107,6 +110,7 @@ impl Violation for LineContainsXxx {
 ///         return False
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.272")]
 pub(crate) struct LineContainsHack;
 impl Violation for LineContainsHack {
     #[derive_message_formats]
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs b/crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
index 1350b0578d..6612ee086f 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
@@ -9,6 +9,7 @@ mod tests {
     use test_case::test_case;
 
     use crate::registry::Rule;
+    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
     use ruff_python_ast::PythonVersion;
@@ -39,6 +40,7 @@ mod tests {
     }
 
     #[test_case(Path::new("no_future_import_uses_lowercase.py"))]
+    #[test_case(Path::new("no_future_import_uses_preview_generics.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"))]
@@ -56,4 +58,19 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[test_case(Path::new("no_future_import_uses_preview_generics.py"))]
+    fn fa102_preview(path: &Path) -> Result<()> {
+        let snapshot = format!("fa102_preview_{}", path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flake8_future_annotations").join(path).as_path(),
+            &settings::LinterSettings {
+                unresolved_target_version: PythonVersion::PY37.into(),
+                preview: PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rule(Rule::FutureRequiredTypeAnnotation)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs b/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs
index 99571bb802..593a42b368 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs
@@ -49,6 +49,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## Options
 /// - `target-version`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct FutureRequiredTypeAnnotation {
     reason: Reason,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs b/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs
index 66ca69cafa..26ae39ffce 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs
@@ -68,6 +68,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## Options
 /// - `target-version`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct FutureRewritableTypeAnnotation {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap
index 9e5186ee8d..5d72a8965e 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap
@@ -10,12 +10,11 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
 7 |     a_list.append("hello")
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | from typing import List
-2 3 | import typing as t
-3 4 | 
+1 + from __future__ import annotations
+2 | from typing import List
+3 | import typing as t
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
  --> edge_case.py:6:13
@@ -26,9 +25,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
 7 |     a_list.append("hello")
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | from typing import List
-2 3 | import typing as t
-3 4 |
+1 + from __future__ import annotations
+2 | from typing import List
+3 | import typing as t
+4 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap
index da4fb7fd56..4c715e326a 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap
@@ -9,9 +9,8 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collect
 7 |     del y
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | def main() -> None:
-2 3 |     a_list: list[str] = []
-3 4 |     a_list.append("hello")
+1 + from __future__ import annotations
+2 | def main() -> None:
+3 |     a_list: list[str] = []
+4 |     a_list.append("hello")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_preview_generics.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_preview_generics.py.snap
new file mode 100644
index 0000000000..8b775ebb51
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_preview_generics.py.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
+---
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:42:19
+   |
+40 |     future: asyncio.Future[int],
+41 |     task: asyncio.Task[str],
+42 |     deque_object: collections.deque[int],
+   |                   ^^^^^^^^^^^^^^^^^^^^^^
+43 |     defaultdict_object: collections.defaultdict[str, int],
+44 |     ordered_dict: collections.OrderedDict[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:43:25
+   |
+41 |     task: asyncio.Task[str],
+42 |     deque_object: collections.deque[int],
+43 |     defaultdict_object: collections.defaultdict[str, int],
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+44 |     ordered_dict: collections.OrderedDict[str, int],
+45 |     counter_obj: collections.Counter[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap
index d6bc243ef3..5a4bae7b01 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap
@@ -9,12 +9,11 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collect
 7 |     del y
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | def main() -> None:
-2 3 |     a_list: list[str] | None = []
-3 4 |     a_list.append("hello")
+1 + from __future__ import annotations
+2 | def main() -> None:
+3 |     a_list: list[str] | None = []
+4 |     a_list.append("hello")
+note: This is an unsafe fix and may change runtime behavior
 
 FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union
  --> no_future_import_uses_union.py:6:14
@@ -24,9 +23,8 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union
 7 |     del y
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | def main() -> None:
-2 3 |     a_list: list[str] | None = []
-3 4 |     a_list.append("hello")
+1 + from __future__ import annotations
+2 | def main() -> None:
+3 |     a_list: list[str] | None = []
+4 |     a_list.append("hello")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap
index a50c50085c..de68087031 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap
@@ -10,12 +10,11 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collect
 8 |     del z
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | def main() -> None:
-2 3 |     a_list: list[str | None] = []
-3 4 |     a_list.append("hello")
+1 + from __future__ import annotations
+2 | def main() -> None:
+3 |     a_list: list[str | None] = []
+4 |     a_list.append("hello")
+note: This is an unsafe fix and may change runtime behavior
 
 FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union
  --> no_future_import_uses_union_inner.py:6:19
@@ -26,9 +25,8 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union
 8 |     del z
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | def main() -> None:
-2 3 |     a_list: list[str | None] = []
-3 4 |     a_list.append("hello")
+1 + from __future__ import annotations
+2 | def main() -> None:
+3 |     a_list: list[str | None] = []
+4 |     a_list.append("hello")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_preview_no_future_import_uses_preview_generics.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_preview_no_future_import_uses_preview_generics.py.snap
new file mode 100644
index 0000000000..c93dcda3dc
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_preview_no_future_import_uses_preview_generics.py.snap
@@ -0,0 +1,851 @@
+---
+source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
+---
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:40:13
+   |
+39 | def takes_preview_generics(
+40 |     future: asyncio.Future[int],
+   |             ^^^^^^^^^^^^^^^^^^^
+41 |     task: asyncio.Task[str],
+42 |     deque_object: collections.deque[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:41:11
+   |
+39 | def takes_preview_generics(
+40 |     future: asyncio.Future[int],
+41 |     task: asyncio.Task[str],
+   |           ^^^^^^^^^^^^^^^^^
+42 |     deque_object: collections.deque[int],
+43 |     defaultdict_object: collections.defaultdict[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:42:19
+   |
+40 |     future: asyncio.Future[int],
+41 |     task: asyncio.Task[str],
+42 |     deque_object: collections.deque[int],
+   |                   ^^^^^^^^^^^^^^^^^^^^^^
+43 |     defaultdict_object: collections.defaultdict[str, int],
+44 |     ordered_dict: collections.OrderedDict[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:43:25
+   |
+41 |     task: asyncio.Task[str],
+42 |     deque_object: collections.deque[int],
+43 |     defaultdict_object: collections.defaultdict[str, int],
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+44 |     ordered_dict: collections.OrderedDict[str, int],
+45 |     counter_obj: collections.Counter[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:44:19
+   |
+42 |     deque_object: collections.deque[int],
+43 |     defaultdict_object: collections.defaultdict[str, int],
+44 |     ordered_dict: collections.OrderedDict[str, int],
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+45 |     counter_obj: collections.Counter[str],
+46 |     chain_map: collections.ChainMap[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:45:18
+   |
+43 |     defaultdict_object: collections.defaultdict[str, int],
+44 |     ordered_dict: collections.OrderedDict[str, int],
+45 |     counter_obj: collections.Counter[str],
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^
+46 |     chain_map: collections.ChainMap[str, int],
+47 |     context_manager: contextlib.AbstractContextManager[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:46:16
+   |
+44 |     ordered_dict: collections.OrderedDict[str, int],
+45 |     counter_obj: collections.Counter[str],
+46 |     chain_map: collections.ChainMap[str, int],
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+47 |     context_manager: contextlib.AbstractContextManager[str],
+48 |     async_context_manager: contextlib.AbstractAsyncContextManager[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:47:22
+   |
+45 |     counter_obj: collections.Counter[str],
+46 |     chain_map: collections.ChainMap[str, int],
+47 |     context_manager: contextlib.AbstractContextManager[str],
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+48 |     async_context_manager: contextlib.AbstractAsyncContextManager[int],
+49 |     dataclass_field: dataclasses.Field[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:48:28
+   |
+46 |     chain_map: collections.ChainMap[str, int],
+47 |     context_manager: contextlib.AbstractContextManager[str],
+48 |     async_context_manager: contextlib.AbstractAsyncContextManager[int],
+   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+49 |     dataclass_field: dataclasses.Field[int],
+50 |     cached_prop: functools.cached_property[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:49:22
+   |
+47 |     context_manager: contextlib.AbstractContextManager[str],
+48 |     async_context_manager: contextlib.AbstractAsyncContextManager[int],
+49 |     dataclass_field: dataclasses.Field[int],
+   |                      ^^^^^^^^^^^^^^^^^^^^^^
+50 |     cached_prop: functools.cached_property[int],
+51 |     partial_method: functools.partialmethod[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:50:18
+   |
+48 |     async_context_manager: contextlib.AbstractAsyncContextManager[int],
+49 |     dataclass_field: dataclasses.Field[int],
+50 |     cached_prop: functools.cached_property[int],
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+51 |     partial_method: functools.partialmethod[int],
+52 |     path_like: os.PathLike[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:51:21
+   |
+49 |     dataclass_field: dataclasses.Field[int],
+50 |     cached_prop: functools.cached_property[int],
+51 |     partial_method: functools.partialmethod[int],
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+52 |     path_like: os.PathLike[str],
+53 |     lifo_queue: queue.LifoQueue[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:52:16
+   |
+50 |     cached_prop: functools.cached_property[int],
+51 |     partial_method: functools.partialmethod[int],
+52 |     path_like: os.PathLike[str],
+   |                ^^^^^^^^^^^^^^^^
+53 |     lifo_queue: queue.LifoQueue[int],
+54 |     regular_queue: queue.Queue[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:53:17
+   |
+51 |     partial_method: functools.partialmethod[int],
+52 |     path_like: os.PathLike[str],
+53 |     lifo_queue: queue.LifoQueue[int],
+   |                 ^^^^^^^^^^^^^^^^^^^^
+54 |     regular_queue: queue.Queue[int],
+55 |     priority_queue: queue.PriorityQueue[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:54:20
+   |
+52 |     path_like: os.PathLike[str],
+53 |     lifo_queue: queue.LifoQueue[int],
+54 |     regular_queue: queue.Queue[int],
+   |                    ^^^^^^^^^^^^^^^^
+55 |     priority_queue: queue.PriorityQueue[int],
+56 |     simple_queue: queue.SimpleQueue[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:55:21
+   |
+53 |     lifo_queue: queue.LifoQueue[int],
+54 |     regular_queue: queue.Queue[int],
+55 |     priority_queue: queue.PriorityQueue[int],
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^
+56 |     simple_queue: queue.SimpleQueue[int],
+57 |     regex_pattern: re.Pattern[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:56:19
+   |
+54 |     regular_queue: queue.Queue[int],
+55 |     priority_queue: queue.PriorityQueue[int],
+56 |     simple_queue: queue.SimpleQueue[int],
+   |                   ^^^^^^^^^^^^^^^^^^^^^^
+57 |     regex_pattern: re.Pattern[str],
+58 |     regex_match: re.Match[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:57:20
+   |
+55 |     priority_queue: queue.PriorityQueue[int],
+56 |     simple_queue: queue.SimpleQueue[int],
+57 |     regex_pattern: re.Pattern[str],
+   |                    ^^^^^^^^^^^^^^^
+58 |     regex_match: re.Match[str],
+59 |     bsd_db_shelf: shelve.BsdDbShelf[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:58:18
+   |
+56 |     simple_queue: queue.SimpleQueue[int],
+57 |     regex_pattern: re.Pattern[str],
+58 |     regex_match: re.Match[str],
+   |                  ^^^^^^^^^^^^^
+59 |     bsd_db_shelf: shelve.BsdDbShelf[str, int],
+60 |     db_filename_shelf: shelve.DbfilenameShelf[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:59:19
+   |
+57 |     regex_pattern: re.Pattern[str],
+58 |     regex_match: re.Match[str],
+59 |     bsd_db_shelf: shelve.BsdDbShelf[str, int],
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+60 |     db_filename_shelf: shelve.DbfilenameShelf[str, int],
+61 |     shelf_obj: shelve.Shelf[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:60:24
+   |
+58 |     regex_match: re.Match[str],
+59 |     bsd_db_shelf: shelve.BsdDbShelf[str, int],
+60 |     db_filename_shelf: shelve.DbfilenameShelf[str, int],
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+61 |     shelf_obj: shelve.Shelf[str, int],
+62 |     mapping_proxy: types.MappingProxyType[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:61:16
+   |
+59 |     bsd_db_shelf: shelve.BsdDbShelf[str, int],
+60 |     db_filename_shelf: shelve.DbfilenameShelf[str, int],
+61 |     shelf_obj: shelve.Shelf[str, int],
+   |                ^^^^^^^^^^^^^^^^^^^^^^
+62 |     mapping_proxy: types.MappingProxyType[str, int],
+63 |     weak_key_dict: weakref.WeakKeyDictionary[object, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:62:20
+   |
+60 |     db_filename_shelf: shelve.DbfilenameShelf[str, int],
+61 |     shelf_obj: shelve.Shelf[str, int],
+62 |     mapping_proxy: types.MappingProxyType[str, int],
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+63 |     weak_key_dict: weakref.WeakKeyDictionary[object, int],
+64 |     weak_method: weakref.WeakMethod[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:63:20
+   |
+61 |     shelf_obj: shelve.Shelf[str, int],
+62 |     mapping_proxy: types.MappingProxyType[str, int],
+63 |     weak_key_dict: weakref.WeakKeyDictionary[object, int],
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+64 |     weak_method: weakref.WeakMethod[int],
+65 |     weak_set: weakref.WeakSet[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:64:18
+   |
+62 |     mapping_proxy: types.MappingProxyType[str, int],
+63 |     weak_key_dict: weakref.WeakKeyDictionary[object, int],
+64 |     weak_method: weakref.WeakMethod[int],
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^
+65 |     weak_set: weakref.WeakSet[int],
+66 |     weak_value_dict: weakref.WeakValueDictionary[object, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:65:15
+   |
+63 |     weak_key_dict: weakref.WeakKeyDictionary[object, int],
+64 |     weak_method: weakref.WeakMethod[int],
+65 |     weak_set: weakref.WeakSet[int],
+   |               ^^^^^^^^^^^^^^^^^^^^
+66 |     weak_value_dict: weakref.WeakValueDictionary[object, int],
+67 |     awaitable: Awaitable[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:66:22
+   |
+64 |     weak_method: weakref.WeakMethod[int],
+65 |     weak_set: weakref.WeakSet[int],
+66 |     weak_value_dict: weakref.WeakValueDictionary[object, int],
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+67 |     awaitable: Awaitable[int],
+68 |     coroutine: Coroutine[int, None, str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:67:16
+   |
+65 |     weak_set: weakref.WeakSet[int],
+66 |     weak_value_dict: weakref.WeakValueDictionary[object, int],
+67 |     awaitable: Awaitable[int],
+   |                ^^^^^^^^^^^^^^
+68 |     coroutine: Coroutine[int, None, str],
+69 |     async_iterable: AsyncIterable[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:68:16
+   |
+66 |     weak_value_dict: weakref.WeakValueDictionary[object, int],
+67 |     awaitable: Awaitable[int],
+68 |     coroutine: Coroutine[int, None, str],
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+69 |     async_iterable: AsyncIterable[int],
+70 |     async_iterator: AsyncIterator[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:69:21
+   |
+67 |     awaitable: Awaitable[int],
+68 |     coroutine: Coroutine[int, None, str],
+69 |     async_iterable: AsyncIterable[int],
+   |                     ^^^^^^^^^^^^^^^^^^
+70 |     async_iterator: AsyncIterator[int],
+71 |     async_generator: AsyncGenerator[int, None],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:70:21
+   |
+68 |     coroutine: Coroutine[int, None, str],
+69 |     async_iterable: AsyncIterable[int],
+70 |     async_iterator: AsyncIterator[int],
+   |                     ^^^^^^^^^^^^^^^^^^
+71 |     async_generator: AsyncGenerator[int, None],
+72 |     iterable: Iterable[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:71:22
+   |
+69 |     async_iterable: AsyncIterable[int],
+70 |     async_iterator: AsyncIterator[int],
+71 |     async_generator: AsyncGenerator[int, None],
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
+72 |     iterable: Iterable[int],
+73 |     iterator: Iterator[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:72:15
+   |
+70 |     async_iterator: AsyncIterator[int],
+71 |     async_generator: AsyncGenerator[int, None],
+72 |     iterable: Iterable[int],
+   |               ^^^^^^^^^^^^^
+73 |     iterator: Iterator[int],
+74 |     generator: Generator[int, None, None],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:73:15
+   |
+71 |     async_generator: AsyncGenerator[int, None],
+72 |     iterable: Iterable[int],
+73 |     iterator: Iterator[int],
+   |               ^^^^^^^^^^^^^
+74 |     generator: Generator[int, None, None],
+75 |     reversible: Reversible[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:74:16
+   |
+72 |     iterable: Iterable[int],
+73 |     iterator: Iterator[int],
+74 |     generator: Generator[int, None, None],
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^
+75 |     reversible: Reversible[int],
+76 |     container: Container[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:75:17
+   |
+73 |     iterator: Iterator[int],
+74 |     generator: Generator[int, None, None],
+75 |     reversible: Reversible[int],
+   |                 ^^^^^^^^^^^^^^^
+76 |     container: Container[int],
+77 |     collection: Collection[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:76:16
+   |
+74 |     generator: Generator[int, None, None],
+75 |     reversible: Reversible[int],
+76 |     container: Container[int],
+   |                ^^^^^^^^^^^^^^
+77 |     collection: Collection[int],
+78 |     callable_obj: Callable[[int], str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:77:17
+   |
+75 |     reversible: Reversible[int],
+76 |     container: Container[int],
+77 |     collection: Collection[int],
+   |                 ^^^^^^^^^^^^^^^
+78 |     callable_obj: Callable[[int], str],
+79 |     set_obj: Set[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:78:19
+   |
+76 |     container: Container[int],
+77 |     collection: Collection[int],
+78 |     callable_obj: Callable[[int], str],
+   |                   ^^^^^^^^^^^^^^^^^^^^
+79 |     set_obj: Set[int],
+80 |     mutable_set: MutableSet[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:79:14
+   |
+77 |     collection: Collection[int],
+78 |     callable_obj: Callable[[int], str],
+79 |     set_obj: Set[int],
+   |              ^^^^^^^^
+80 |     mutable_set: MutableSet[int],
+81 |     mapping: Mapping[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:80:18
+   |
+78 |     callable_obj: Callable[[int], str],
+79 |     set_obj: Set[int],
+80 |     mutable_set: MutableSet[int],
+   |                  ^^^^^^^^^^^^^^^
+81 |     mapping: Mapping[str, int],
+82 |     mutable_mapping: MutableMapping[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:81:14
+   |
+79 |     set_obj: Set[int],
+80 |     mutable_set: MutableSet[int],
+81 |     mapping: Mapping[str, int],
+   |              ^^^^^^^^^^^^^^^^^
+82 |     mutable_mapping: MutableMapping[str, int],
+83 |     sequence: Sequence[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:82:22
+   |
+80 |     mutable_set: MutableSet[int],
+81 |     mapping: Mapping[str, int],
+82 |     mutable_mapping: MutableMapping[str, int],
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^
+83 |     sequence: Sequence[int],
+84 |     mutable_sequence: MutableSequence[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:83:15
+   |
+81 |     mapping: Mapping[str, int],
+82 |     mutable_mapping: MutableMapping[str, int],
+83 |     sequence: Sequence[int],
+   |               ^^^^^^^^^^^^^
+84 |     mutable_sequence: MutableSequence[int],
+85 |     byte_string: ByteString[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:84:23
+   |
+82 |     mutable_mapping: MutableMapping[str, int],
+83 |     sequence: Sequence[int],
+84 |     mutable_sequence: MutableSequence[int],
+   |                       ^^^^^^^^^^^^^^^^^^^^
+85 |     byte_string: ByteString[int],
+86 |     mapping_view: MappingView[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:85:18
+   |
+83 |     sequence: Sequence[int],
+84 |     mutable_sequence: MutableSequence[int],
+85 |     byte_string: ByteString[int],
+   |                  ^^^^^^^^^^^^^^^
+86 |     mapping_view: MappingView[str, int],
+87 |     keys_view: KeysView[str],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:86:19
+   |
+84 |     mutable_sequence: MutableSequence[int],
+85 |     byte_string: ByteString[int],
+86 |     mapping_view: MappingView[str, int],
+   |                   ^^^^^^^^^^^^^^^^^^^^^
+87 |     keys_view: KeysView[str],
+88 |     items_view: ItemsView[str, int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:87:16
+   |
+85 |     byte_string: ByteString[int],
+86 |     mapping_view: MappingView[str, int],
+87 |     keys_view: KeysView[str],
+   |                ^^^^^^^^^^^^^
+88 |     items_view: ItemsView[str, int],
+89 |     values_view: ValuesView[int],
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:88:17
+   |
+86 |     mapping_view: MappingView[str, int],
+87 |     keys_view: KeysView[str],
+88 |     items_view: ItemsView[str, int],
+   |                 ^^^^^^^^^^^^^^^^^^^
+89 |     values_view: ValuesView[int],
+90 | ) -> None:
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
+
+FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collection
+  --> no_future_import_uses_preview_generics.py:89:18
+   |
+87 |     keys_view: KeysView[str],
+88 |     items_view: ItemsView[str, int],
+89 |     values_view: ValuesView[int],
+   |                  ^^^^^^^^^^^^^^^
+90 | ) -> None:
+91 |     ...
+   |
+help: Add `from __future__ import annotations`
+1 + from __future__ import annotations
+2 | import asyncio
+3 | import collections
+4 | import contextlib
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap
index 7e9efe8130..cda1f54742 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap
@@ -10,9 +10,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
 6 |     a_list.append("hello")
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | from typing import List
-2 3 | 
-3 4 |
+1 + from __future__ import annotations
+2 | from typing import List
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap
index 7eac7667be..4949536020 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap
@@ -11,12 +11,11 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
 7 |     a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {})
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | from typing import Dict, List, Optional, Set, Union, cast
-2 3 | 
-3 4 | 
+1 + from __future__ import annotations
+2 | from typing import Dict, List, Optional, Set, Union, cast
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FA100 [*] Add `from __future__ import annotations` to simplify `typing.Optional`
  --> from_typing_import_many.py:5:18
@@ -28,9 +27,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.Optional`
 7 |     a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {})
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | from typing import Dict, List, Optional, Set, Union, cast
-2 3 | 
-3 4 |
+1 + from __future__ import annotations
+2 | from typing import Dict, List, Optional, Set, Union, cast
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap
index d0fb70fded..adaccdcc10 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap
@@ -10,9 +10,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
 6 |     a_list.append("hello")
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | import typing
-2 3 | 
-3 4 |
+1 + from __future__ import annotations
+2 | import typing
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap
index 4de6371b70..ce51176f1e 100644
--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap
@@ -10,9 +10,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List`
 6 |     a_list.append("hello")
   |
 help: Add `from __future__ import annotations`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | import typing as t
-2 3 | 
-3 4 |
+1 + from __future__ import annotations
+2 | import typing as t
+3 | 
+4 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/mod.rs b/crates/ruff_linter/src/rules/flake8_gettext/mod.rs
index 6f0eb09ea3..d4c5f7fb72 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_gettext/mod.rs
@@ -1,17 +1,50 @@
 //! Rules from [flake8-gettext](https://pypi.org/project/flake8-gettext/).
+use crate::checkers::ast::Checker;
+use crate::preview::is_extended_i18n_function_matching_enabled;
 use ruff_python_ast::name::Name;
 use ruff_python_ast::{self as ast, Expr};
+use ruff_python_semantic::Modules;
 
 pub(crate) mod rules;
 pub mod settings;
 
 /// Returns true if the [`Expr`] is an internationalization function call.
-pub(crate) fn is_gettext_func_call(func: &Expr, functions_names: &[Name]) -> bool {
-    if let Expr::Name(ast::ExprName { id, .. }) = func {
-        functions_names.contains(id)
-    } else {
-        false
+pub(crate) fn is_gettext_func_call(
+    checker: &Checker,
+    func: &Expr,
+    functions_names: &[Name],
+) -> bool {
+    if func
+        .as_name_expr()
+        .map(ast::ExprName::id)
+        .is_some_and(|id| functions_names.contains(id))
+    {
+        return true;
     }
+
+    if !is_extended_i18n_function_matching_enabled(checker.settings()) {
+        return false;
+    }
+
+    let semantic = checker.semantic();
+
+    let Some(qualified_name) = semantic.resolve_qualified_name(func) else {
+        return false;
+    };
+
+    if semantic.seen_module(Modules::BUILTINS)
+        && matches!(
+            qualified_name.segments(),
+            ["builtins", id] if functions_names.contains(&Name::new(id)),
+        )
+    {
+        return true;
+    }
+
+    matches!(
+        qualified_name.segments(),
+        ["gettext", "gettext" | "ngettext"]
+    )
 }
 
 #[cfg(test)]
@@ -22,6 +55,7 @@ mod tests {
     use test_case::test_case;
 
     use crate::registry::Rule;
+    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
@@ -37,4 +71,20 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[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_preview(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("preview__{}_{}", rule_code.name(), path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flake8_gettext").join(path).as_path(),
+            &settings::LinterSettings {
+                preview: PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs b/crates/ruff_linter/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs
index 13f3544768..2cc9ca51a1 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `gettext` — Multilingual internationalization services](https://docs.python.org/3/library/gettext.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.260")]
 pub(crate) struct FStringInGetTextFuncCall;
 
 impl Violation for FStringInGetTextFuncCall {
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs b/crates/ruff_linter/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs
index 9d53d48abf..ad584804d0 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `gettext` — Multilingual internationalization services](https://docs.python.org/3/library/gettext.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.260")]
 pub(crate) struct FormatInGetTextFuncCall;
 
 impl Violation for FormatInGetTextFuncCall {
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs b/crates/ruff_linter/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs
index 22c8a4b737..22172a8005 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `gettext` — Multilingual internationalization services](https://docs.python.org/3/library/gettext.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.260")]
 pub(crate) struct PrintfInGetTextFuncCall;
 
 impl Violation for PrintfInGetTextFuncCall {
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__f-string-in-get-text-func-call_INT001.py.snap b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__f-string-in-get-text-func-call_INT001.py.snap
index c4da6ace3c..0285458057 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__f-string-in-get-text-func-call_INT001.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__f-string-in-get-text-func-call_INT001.py.snap
@@ -9,3 +9,85 @@ INT001 f-string is resolved before function call; consider `_("string %s") % arg
 2 |
 3 | # Don't trigger for t-strings
   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:6:9
+  |
+4 | _(t"{'value'}")
+5 |
+6 | gettext(f"{'value'}")
+  |         ^^^^^^^^^^^^
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:7:10
+  |
+6 | gettext(f"{'value'}")
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |          ^^^^^^^^^^^^
+8 |
+9 | _gettext(f"{'value'}")  # no lint
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:31:14
+   |
+29 | def _(message): return message
+30 |
+31 | animals = [_(f"{'mollusk'}"),
+   |              ^^^^^^^^^^^^^^
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:32:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+   |              ^^^^^^^^^^^^^^^^
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:33:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |              ^^^^^^^^^^
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:34:14
+   |
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |              ^^^^^^^^^^^^^^
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:35:14
+   |
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |              ^^^^^^^^^^^^^
+36 |
+37 | del _
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:41:13
+   |
+39 | for a in animals:
+40 |     print(_(a))
+41 |     print(_(f"{a}"))
+   |             ^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__format-in-get-text-func-call_INT002.py.snap b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__format-in-get-text-func-call_INT002.py.snap
index d029e52667..b1edf104de 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__format-in-get-text-func-call_INT002.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__format-in-get-text-func-call_INT002.py.snap
@@ -6,4 +6,88 @@ INT002 `format` method argument is resolved before function call; consider `_("s
   |
 1 | _("{}".format("line"))
   |   ^^^^^^^^^^^^^^^^^^^
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:2:9
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+  |         ^^^^^^^^^^^^^^^^^^^
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:3:10
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |          ^^^^^^^^^^^^^^^^^^^
+4 |
+5 | _gettext("{}".format("line"))  # no lint
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("{}".format("mollusk")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:28:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:29:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |              ^^^^^^^^^^^^^^^^^^
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:30:14
+   |
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:31:14
+   |
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |              ^^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("{}".format(a)))
+   |             ^^^^^^^^^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__f-string-in-get-text-func-call_INT001.py.snap b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__f-string-in-get-text-func-call_INT001.py.snap
new file mode 100644
index 0000000000..9cfb1b5242
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__f-string-in-get-text-func-call_INT001.py.snap
@@ -0,0 +1,162 @@
+---
+source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+---
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:1:3
+  |
+1 | _(f"{'value'}")
+  |   ^^^^^^^^^^^^
+2 |
+3 | # Don't trigger for t-strings
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:6:9
+  |
+4 | _(t"{'value'}")
+5 |
+6 | gettext(f"{'value'}")
+  |         ^^^^^^^^^^^^
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:7:10
+  |
+6 | gettext(f"{'value'}")
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |          ^^^^^^^^^^^^
+8 |
+9 | _gettext(f"{'value'}")  # no lint
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:22:21
+   |
+20 | name = "Guido"
+21 |
+22 | gettext_mod.gettext(f"Hello, {name}!")
+   |                     ^^^^^^^^^^^^^^^^^
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+24 | gettext_fn(f"Hello, {name}!")
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:23:22
+   |
+22 | gettext_mod.gettext(f"Hello, {name}!")
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |                      ^^^^^^^^^^^^^^^^^
+24 | gettext_fn(f"Hello, {name}!")
+25 | ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:24:12
+   |
+22 | gettext_mod.gettext(f"Hello, {name}!")
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+24 | gettext_fn(f"Hello, {name}!")
+   |            ^^^^^^^^^^^^^^^^^
+25 | ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:25:13
+   |
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+24 | gettext_fn(f"Hello, {name}!")
+25 | ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |             ^^^^^^^^^^^^^^^^^
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:31:14
+   |
+29 | def _(message): return message
+30 |
+31 | animals = [_(f"{'mollusk'}"),
+   |              ^^^^^^^^^^^^^^
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:32:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+   |              ^^^^^^^^^^^^^^^^
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:33:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |              ^^^^^^^^^^
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:34:14
+   |
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |              ^^^^^^^^^^^^^^
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:35:14
+   |
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |              ^^^^^^^^^^^^^
+36 |
+37 | del _
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:41:13
+   |
+39 | for a in animals:
+40 |     print(_(a))
+41 |     print(_(f"{a}"))
+   |             ^^^^^^
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:51:12
+   |
+49 | builtins.__dict__["gettext"] = gettext_fn
+50 |
+51 | builtins._(f"{'value'}")
+   |            ^^^^^^^^^^^^
+52 | builtins.gettext(f"{'value'}")
+53 | builtins.ngettext(f"{'value'}", f"{'values'}", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:52:18
+   |
+51 | builtins._(f"{'value'}")
+52 | builtins.gettext(f"{'value'}")
+   |                  ^^^^^^^^^^^^
+53 | builtins.ngettext(f"{'value'}", f"{'values'}", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:53:19
+   |
+51 | builtins._(f"{'value'}")
+52 | builtins.gettext(f"{'value'}")
+53 | builtins.ngettext(f"{'value'}", f"{'values'}", 2)
+   |                   ^^^^^^^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__format-in-get-text-func-call_INT002.py.snap b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__format-in-get-text-func-call_INT002.py.snap
new file mode 100644
index 0000000000..b368f71065
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__format-in-get-text-func-call_INT002.py.snap
@@ -0,0 +1,162 @@
+---
+source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+---
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:1:3
+  |
+1 | _("{}".format("line"))
+  |   ^^^^^^^^^^^^^^^^^^^
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:2:9
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+  |         ^^^^^^^^^^^^^^^^^^^
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:3:10
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |          ^^^^^^^^^^^^^^^^^^^
+4 |
+5 | _gettext("{}".format("line"))  # no lint
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:18:21
+   |
+16 | name = "Guido"
+17 |
+18 | gettext_mod.gettext("Hello, {}!".format(name))
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+20 | gettext_fn("Hello, {}!".format(name))
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:19:22
+   |
+18 | gettext_mod.gettext("Hello, {}!".format(name))
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
+20 | gettext_fn("Hello, {}!".format(name))
+21 | ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:20:12
+   |
+18 | gettext_mod.gettext("Hello, {}!".format(name))
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+20 | gettext_fn("Hello, {}!".format(name))
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^
+21 | ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:21:13
+   |
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+20 | gettext_fn("Hello, {}!".format(name))
+21 | ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("{}".format("mollusk")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:28:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:29:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |              ^^^^^^^^^^^^^^^^^^
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:30:14
+   |
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:31:14
+   |
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |              ^^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("{}".format(a)))
+   |             ^^^^^^^^^^^^^^
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:47:12
+   |
+45 | builtins.__dict__["gettext"] = gettext_fn
+46 |
+47 | builtins._("{}".format("line"))
+   |            ^^^^^^^^^^^^^^^^^^^
+48 | builtins.gettext("{}".format("line"))
+49 | builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:48:18
+   |
+47 | builtins._("{}".format("line"))
+48 | builtins.gettext("{}".format("line"))
+   |                  ^^^^^^^^^^^^^^^^^^^
+49 | builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:49:19
+   |
+47 | builtins._("{}".format("line"))
+48 | builtins.gettext("{}".format("line"))
+49 | builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
+   |                   ^^^^^^^^^^^^^^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__printf-in-get-text-func-call_INT003.py.snap b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__printf-in-get-text-func-call_INT003.py.snap
new file mode 100644
index 0000000000..496422c556
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__printf-in-get-text-func-call_INT003.py.snap
@@ -0,0 +1,162 @@
+---
+source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+---
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:1:3
+  |
+1 | _("%s" % "line")
+  |   ^^^^^^^^^^^^^
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:2:9
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+  |         ^^^^^^^^^^^^^
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:3:10
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |          ^^^^^^^^^^^^^
+4 |
+5 | _gettext("%s" % "line")  # no lint
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:18:21
+   |
+16 | name = "Guido"
+17 |
+18 | gettext_mod.gettext("Hello, %s!" % name)
+   |                     ^^^^^^^^^^^^^^^^^^^
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+20 | gettext_fn("Hello, %s!" % name)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:19:22
+   |
+18 | gettext_mod.gettext("Hello, %s!" % name)
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |                      ^^^^^^^^^^^^^^^^^^^
+20 | gettext_fn("Hello, %s!" % name)
+21 | ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:20:12
+   |
+18 | gettext_mod.gettext("Hello, %s!" % name)
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+20 | gettext_fn("Hello, %s!" % name)
+   |            ^^^^^^^^^^^^^^^^^^^
+21 | ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:21:13
+   |
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+20 | gettext_fn("Hello, %s!" % name)
+21 | ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |             ^^^^^^^^^^^^^^^^^^^
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("%s" %"mollusk"),
+   |              ^^^^^^^^^^^^^^^
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:28:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+   |              ^^^^^^^^^^^^^^^^^
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:29:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |              ^^^^^^^^^^^
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:30:14
+   |
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |              ^^^^^^^^^^^^^^^
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:31:14
+   |
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |              ^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("%s" % a))
+   |             ^^^^^^^^
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:47:12
+   |
+45 | builtins.__dict__["gettext"] = gettext_fn
+46 |
+47 | builtins._("%s" % "line")
+   |            ^^^^^^^^^^^^^
+48 | builtins.gettext("%s" % "line")
+49 | builtins.ngettext("%s" % "line", "%s" % "lines", 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:48:18
+   |
+47 | builtins._("%s" % "line")
+48 | builtins.gettext("%s" % "line")
+   |                  ^^^^^^^^^^^^^
+49 | builtins.ngettext("%s" % "line", "%s" % "lines", 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:49:19
+   |
+47 | builtins._("%s" % "line")
+48 | builtins.gettext("%s" % "line")
+49 | builtins.ngettext("%s" % "line", "%s" % "lines", 2)
+   |                   ^^^^^^^^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__printf-in-get-text-func-call_INT003.py.snap b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__printf-in-get-text-func-call_INT003.py.snap
index 51a29c1734..91260001b7 100644
--- a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__printf-in-get-text-func-call_INT003.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__printf-in-get-text-func-call_INT003.py.snap
@@ -6,4 +6,88 @@ INT003 printf-style format is resolved before function call; consider `_("string
   |
 1 | _("%s" % "line")
   |   ^^^^^^^^^^^^^
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:2:9
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+  |         ^^^^^^^^^^^^^
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:3:10
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |          ^^^^^^^^^^^^^
+4 |
+5 | _gettext("%s" % "line")  # no lint
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("%s" %"mollusk"),
+   |              ^^^^^^^^^^^^^^^
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:28:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+   |              ^^^^^^^^^^^^^^^^^
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:29:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |              ^^^^^^^^^^^
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:30:14
+   |
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |              ^^^^^^^^^^^^^^^
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:31:14
+   |
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |              ^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("%s" % a))
+   |             ^^^^^^^^
+   |
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs
index ba2a9f61a0..60a65d46e5 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs
@@ -33,6 +33,7 @@ use crate::{Edit, Fix};
 /// )
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.201")]
 pub(crate) struct ExplicitStringConcatenation;
 
 impl AlwaysFixableViolation for ExplicitStringConcatenation {
@@ -74,6 +75,7 @@ pub(crate) fn explicit(checker: &Checker, expr: &Expr) {
                     Expr::StringLiteral(_) | Expr::FString(_),
                     Expr::StringLiteral(_) | Expr::FString(_)
                 ) | (Expr::BytesLiteral(_), Expr::BytesLiteral(_))
+                    | (Expr::TString(_), Expr::TString(_))
             );
             if concatable
                 && checker
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs
index b7db8fcdfe..c9cc873667 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs
@@ -35,6 +35,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// z = "The quick brown fox."
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.201")]
 pub(crate) struct SingleLineImplicitStringConcatenation;
 
 impl Violation for SingleLineImplicitStringConcatenation {
@@ -92,6 +93,7 @@ impl Violation for SingleLineImplicitStringConcatenation {
 /// [PEP 8]: https://peps.python.org/pep-0008/#maximum-line-length
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.201")]
 pub(crate) struct MultiLineImplicitStringConcatenation;
 
 impl Violation for MultiLineImplicitStringConcatenation {
@@ -123,21 +125,32 @@ pub(crate) fn implicit(
         let (a_range, b_range) = match (a_token.kind(), b_token.kind()) {
             (TokenKind::String, TokenKind::String) => (a_token.range(), b_token.range()),
             (TokenKind::String, TokenKind::FStringStart) => {
-                match indexer.fstring_ranges().innermost(b_token.start()) {
+                match indexer
+                    .interpolated_string_ranges()
+                    .innermost(b_token.start())
+                {
                     Some(b_range) => (a_token.range(), b_range),
                     None => continue,
                 }
             }
             (TokenKind::FStringEnd, TokenKind::String) => {
-                match indexer.fstring_ranges().innermost(a_token.start()) {
+                match indexer
+                    .interpolated_string_ranges()
+                    .innermost(a_token.start())
+                {
                     Some(a_range) => (a_range, b_token.range()),
                     None => continue,
                 }
             }
-            (TokenKind::FStringEnd, TokenKind::FStringStart) => {
+            (TokenKind::FStringEnd, TokenKind::FStringStart)
+            | (TokenKind::TStringEnd, TokenKind::TStringStart) => {
                 match (
-                    indexer.fstring_ranges().innermost(a_token.start()),
-                    indexer.fstring_ranges().innermost(b_token.start()),
+                    indexer
+                        .interpolated_string_ranges()
+                        .innermost(a_token.start()),
+                    indexer
+                        .interpolated_string_ranges()
+                        .innermost(b_token.start()),
                 ) {
                     (Some(a_range), Some(b_range)) => (a_range, b_range),
                     _ => continue,
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap
index f6a411fcb3..b416434247 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap
@@ -10,13 +10,11 @@ ISC001 [*] Implicitly concatenated string literals on one line
 3 | _ = "abc" + "def"
   |
 help: Combine string literals
-
-ℹ Safe fix
-1   |-_ = "a" "b" "c"
-  1 |+_ = "ab" "c"
-2 2 | 
-3 3 | _ = "abc" + "def"
-4 4 | 
+  - _ = "a" "b" "c"
+1 + _ = "ab" "c"
+2 | 
+3 | _ = "abc" + "def"
+4 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
  --> ISC.py:1:9
@@ -27,13 +25,11 @@ ISC001 [*] Implicitly concatenated string literals on one line
 3 | _ = "abc" + "def"
   |
 help: Combine string literals
-
-ℹ Safe fix
-1   |-_ = "a" "b" "c"
-  1 |+_ = "a" "bc"
-2 2 | 
-3 3 | _ = "abc" + "def"
-4 4 | 
+  - _ = "a" "b" "c"
+1 + _ = "a" "bc"
+2 | 
+3 | _ = "abc" + "def"
+4 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:38:5
@@ -46,16 +42,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 40 | _ = """a
    |
 help: Combine string literals
-
-ℹ Safe fix
-35 35 |   b"def"
-36 36 | )
-37 37 | 
-38    |-_ = """a""" """b"""
-   38 |+_ = """ab"""
-39 39 | 
-40 40 | _ = """a
-41 41 | b""" """c
+35 |   b"def"
+36 | )
+37 | 
+   - _ = """a""" """b"""
+38 + _ = """ab"""
+39 | 
+40 | _ = """a
+41 | b""" """c
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:40:5
@@ -71,16 +65,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 44 |   _ = f"""a""" f"""b"""
    |
 help: Combine string literals
-
-ℹ Safe fix
-38 38 | _ = """a""" """b"""
-39 39 | 
-40 40 | _ = """a
-41    |-b""" """c
-   41 |+bc
-42 42 | d"""
-43 43 | 
-44 44 | _ = f"""a""" f"""b"""
+38 | _ = """a""" """b"""
+39 | 
+40 | _ = """a
+   - b""" """c
+41 + bc
+42 | d"""
+43 | 
+44 | _ = f"""a""" f"""b"""
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:44:5
@@ -93,16 +85,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 46 | _ = f"a" "b"
    |
 help: Combine string literals
-
-ℹ Safe fix
-41 41 | b""" """c
-42 42 | d"""
-43 43 | 
-44    |-_ = f"""a""" f"""b"""
-   44 |+_ = f"""ab"""
-45 45 | 
-46 46 | _ = f"a" "b"
-47 47 | 
+41 | b""" """c
+42 | d"""
+43 | 
+   - _ = f"""a""" f"""b"""
+44 + _ = f"""ab"""
+45 | 
+46 | _ = f"a" "b"
+47 | 
 
 ISC001 Implicitly concatenated string literals on one line
   --> ISC.py:46:5
@@ -151,16 +141,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 54 | # Single-line explicit concatenation should be ignored.
    |
 help: Combine string literals
-
-ℹ Safe fix
-49 49 | 
-50 50 | _ = 'a' "b"
-51 51 | 
-52    |-_ = rf"a" rf"b"
-   52 |+_ = rf"ab"
-53 53 | 
-54 54 | # Single-line explicit concatenation should be ignored.
-55 55 | _ = "abc" + "def" + "ghi"
+49 | 
+50 | _ = 'a' "b"
+51 | 
+   - _ = rf"a" rf"b"
+52 + _ = rf"ab"
+53 | 
+54 | # Single-line explicit concatenation should be ignored.
+55 | _ = "abc" + "def" + "ghi"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:64:10
@@ -172,16 +160,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 66 | _ = f"""abc {
    |
 help: Combine string literals
-
-ℹ Safe fix
-61 61 | _ = foo + "abc" + bar
-62 62 | 
-63 63 | # Multiple strings nested inside a f-string
-64    |-_ = f"a {'b' 'c' 'd'} e"
-   64 |+_ = f"a {'bc' 'd'} e"
-65 65 | _ = f"""abc {"def" "ghi"} jkl"""
-66 66 | _ = f"""abc {
-67 67 |     "def"
+61 | _ = foo + "abc" + bar
+62 | 
+63 | # Multiple strings nested inside a f-string
+   - _ = f"a {'b' 'c' 'd'} e"
+64 + _ = f"a {'bc' 'd'} e"
+65 | _ = f"""abc {"def" "ghi"} jkl"""
+66 | _ = f"""abc {
+67 |     "def"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:64:14
@@ -193,16 +179,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 66 | _ = f"""abc {
    |
 help: Combine string literals
-
-ℹ Safe fix
-61 61 | _ = foo + "abc" + bar
-62 62 | 
-63 63 | # Multiple strings nested inside a f-string
-64    |-_ = f"a {'b' 'c' 'd'} e"
-   64 |+_ = f"a {'b' 'cd'} e"
-65 65 | _ = f"""abc {"def" "ghi"} jkl"""
-66 66 | _ = f"""abc {
-67 67 |     "def"
+61 | _ = foo + "abc" + bar
+62 | 
+63 | # Multiple strings nested inside a f-string
+   - _ = f"a {'b' 'c' 'd'} e"
+64 + _ = f"a {'b' 'cd'} e"
+65 | _ = f"""abc {"def" "ghi"} jkl"""
+66 | _ = f"""abc {
+67 |     "def"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:65:14
@@ -215,16 +199,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 67 |     "def"
    |
 help: Combine string literals
-
-ℹ Safe fix
-62 62 | 
-63 63 | # Multiple strings nested inside a f-string
-64 64 | _ = f"a {'b' 'c' 'd'} e"
-65    |-_ = f"""abc {"def" "ghi"} jkl"""
-   65 |+_ = f"""abc {"defghi"} jkl"""
-66 66 | _ = f"""abc {
-67 67 |     "def"
-68 68 |     "ghi"
+62 | 
+63 | # Multiple strings nested inside a f-string
+64 | _ = f"a {'b' 'c' 'd'} e"
+   - _ = f"""abc {"def" "ghi"} jkl"""
+65 + _ = f"""abc {"defghi"} jkl"""
+66 | _ = f"""abc {
+67 |     "def"
+68 |     "ghi"
 
 ISC001 Implicitly concatenated string literals on one line
   --> ISC.py:72:5
@@ -258,16 +240,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 74 | _ = f"b {f"abc" \
    |
 help: Combine string literals
-
-ℹ Safe fix
-69 69 | } jkl"""
-70 70 | 
-71 71 | # Nested f-strings
-72    |-_ = "a" f"b {f"c" f"d"} e" "f"
-   72 |+_ = "a" f"b {f"cd"} e" "f"
-73 73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-74 74 | _ = f"b {f"abc" \
-75 75 |     f"def"} g"
+69 | } jkl"""
+70 | 
+71 | # Nested f-strings
+   - _ = "a" f"b {f"c" f"d"} e" "f"
+72 + _ = "a" f"b {f"cd"} e" "f"
+73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
+74 | _ = f"b {f"abc" \
+75 |     f"def"} g"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:73:10
@@ -280,16 +260,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 75 |     f"def"} g"
    |
 help: Combine string literals
-
-ℹ Safe fix
-70 70 | 
-71 71 | # Nested f-strings
-72 72 | _ = "a" f"b {f"c" f"d"} e" "f"
-73    |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-   73 |+_ = f"b {f"cd {f"e" f"f"} g"} h"
-74 74 | _ = f"b {f"abc" \
-75 75 |     f"def"} g"
-76 76 | 
+70 | 
+71 | # Nested f-strings
+72 | _ = "a" f"b {f"c" f"d"} e" "f"
+   - _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
+73 + _ = f"b {f"cd {f"e" f"f"} g"} h"
+74 | _ = f"b {f"abc" \
+75 |     f"def"} g"
+76 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:73:20
@@ -302,16 +280,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 75 |     f"def"} g"
    |
 help: Combine string literals
-
-ℹ Safe fix
-70 70 | 
-71 71 | # Nested f-strings
-72 72 | _ = "a" f"b {f"c" f"d"} e" "f"
-73    |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-   73 |+_ = f"b {f"c" f"d {f"ef"} g"} h"
-74 74 | _ = f"b {f"abc" \
-75 75 |     f"def"} g"
-76 76 | 
+70 | 
+71 | # Nested f-strings
+72 | _ = "a" f"b {f"c" f"d"} e" "f"
+   - _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
+73 + _ = f"b {f"c" f"d {f"ef"} g"} h"
+74 | _ = f"b {f"abc" \
+75 |     f"def"} g"
+76 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:84:5
@@ -323,16 +299,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 86 | _ = "\\\12""0" # fix should be "\\\0120"
    |
 help: Combine string literals
-
-ℹ Safe fix
-81 81 |     + f"second"} d"
-82 82 | 
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84    |-_ = "\12""0" # fix should be "\0120"
-   84 |+_ = "\0120" # fix should be "\0120"
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
+81 |     + f"second"} d"
+82 | 
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+   - _ = "\12""0" # fix should be "\0120"
+84 + _ = "\0120" # fix should be "\0120"
+85 | _ = "\\12""0" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:85:5
@@ -345,16 +319,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 87 | _ = "\12 0""0" # fix should be "\12 00"
    |
 help: Combine string literals
-
-ℹ Safe fix
-82 82 | 
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84 84 | _ = "\12""0" # fix should be "\0120"
-85    |-_ = "\\12""0" # fix should be "\\120"
-   85 |+_ = "\\120" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
+82 | 
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+84 | _ = "\12""0" # fix should be "\0120"
+   - _ = "\\12""0" # fix should be "\\120"
+85 + _ = "\\120" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:86:5
@@ -367,16 +339,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 88 | _ = r"\12"r"0" # fix should be r"\120"
    |
 help: Combine string literals
-
-ℹ Safe fix
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84 84 | _ = "\12""0" # fix should be "\0120"
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86    |-_ = "\\\12""0" # fix should be "\\\0120"
-   86 |+_ = "\\\0120" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+84 | _ = "\12""0" # fix should be "\0120"
+85 | _ = "\\12""0" # fix should be "\\120"
+   - _ = "\\\12""0" # fix should be "\\\0120"
+86 + _ = "\\\0120" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:87:5
@@ -389,16 +359,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
    |
 help: Combine string literals
-
-ℹ Safe fix
-84 84 | _ = "\12""0" # fix should be "\0120"
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87    |-_ = "\12 0""0" # fix should be "\12 00"
-   87 |+_ = "\12 00" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
+84 | _ = "\12""0" # fix should be "\0120"
+85 | _ = "\\12""0" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+   - _ = "\12 0""0" # fix should be "\12 00"
+87 + _ = "\12 00" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:88:5
@@ -411,16 +379,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 90 | _ = "\8""0" # fix should be "\80"
    |
 help: Combine string literals
-
-ℹ Safe fix
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88    |-_ = r"\12"r"0" # fix should be r"\120"
-   88 |+_ = r"\120" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
+85 | _ = "\\12""0" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+   - _ = r"\12"r"0" # fix should be r"\120"
+88 + _ = r"\120" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:89:5
@@ -433,16 +399,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 91 | _ = "\12""8" # fix should be "\128"
    |
 help: Combine string literals
-
-ℹ Safe fix
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89    |-_ = "\12 and more""0" # fix should be "\12 and more0"
-   89 |+_ = "\12 and more0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+   - _ = "\12 and more""0" # fix should be "\12 and more0"
+89 + _ = "\12 and more0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:90:5
@@ -455,16 +419,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 92 | _ = "\12""foo" # fix should be "\12foo"
    |
 help: Combine string literals
-
-ℹ Safe fix
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90    |-_ = "\8""0" # fix should be "\80"
-   90 |+_ = "\80" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
-93 93 | _ = "\12" ""  # fix should be "\12"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+   - _ = "\8""0" # fix should be "\80"
+90 + _ = "\80" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
+93 | _ = "\12" ""  # fix should be "\12"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:91:5
@@ -477,16 +439,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 93 | _ = "\12" ""  # fix should be "\12"
    |
 help: Combine string literals
-
-ℹ Safe fix
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91    |-_ = "\12""8" # fix should be "\128"
-   91 |+_ = "\128" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
-93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+   - _ = "\12""8" # fix should be "\128"
+91 + _ = "\128" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
+93 | _ = "\12" ""  # fix should be "\12"
+94 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:92:5
@@ -498,16 +458,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 93 | _ = "\12" ""  # fix should be "\12"
    |
 help: Combine string literals
-
-ℹ Safe fix
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92    |-_ = "\12""foo" # fix should be "\12foo"
-   92 |+_ = "\12foo" # fix should be "\12foo"
-93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 
-95 95 | 
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+   - _ = "\12""foo" # fix should be "\12foo"
+92 + _ = "\12foo" # fix should be "\12foo"
+93 | _ = "\12" ""  # fix should be "\12"
+94 | 
+95 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:93:5
@@ -518,13 +476,112 @@ ISC001 [*] Implicitly concatenated string literals on one line
    |     ^^^^^^^^
    |
 help: Combine string literals
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
+   - _ = "\12" ""  # fix should be "\12"
+93 + _ = "\12"  # fix should be "\12"
+94 | 
+95 | 
+96 | # Mixed literal + non-literal scenarios
 
-ℹ Safe fix
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
-93    |-_ = "\12" ""  # fix should be "\12"
-   93 |+_ = "\12"  # fix should be "\12"
-94 94 | 
-95 95 | 
-96 96 | # Mixed literal + non-literal scenarios
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:193:1
+    |
+191 | # https://github.com/astral-sh/ruff/issues/20310
+192 | # ISC001
+193 | t"The quick " t"brown fox."
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+194 |
+195 | # ISC002
+    |
+help: Combine string literals
+190 | 
+191 | # https://github.com/astral-sh/ruff/issues/20310
+192 | # ISC001
+    - t"The quick " t"brown fox."
+193 + t"The quick brown fox."
+194 | 
+195 | # ISC002
+196 | t"The quick brown fox jumps over the lazy "\
+
+ISC001 Implicitly concatenated string literals on one line
+   --> ISC.py:206:5
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    |     ^^^^^^^^^^^^^^^^^^^^^^
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+    |
+help: Combine string literals
+
+ISC001 Implicitly concatenated string literals on one line
+   --> ISC.py:206:9
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    |         ^^^^^^^^^^^^^^^^^^^^^^
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+    |
+help: Combine string literals
+
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:206:14
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    |              ^^^^^^^^^
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+    |
+help: Combine string literals
+203 | )
+204 | 
+205 | # nested examples with both t and f-strings
+    - _ = "a" f"b {t"c" t"d"} e" "f"
+206 + _ = "a" f"b {t"cd"} e" "f"
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:207:10
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+    |          ^^^^^^^^^^^^^^^^^^^^^^^
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+    |
+help: Combine string literals
+204 | 
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    - _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+207 + _ = t"b {f"cd {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+210 | 
+
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:207:20
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+    |                    ^^^^^^^^^
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+    |
+help: Combine string literals
+204 | 
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    - _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+207 + _ = t"b {f"c" f"d {t"ef"} g"} h"
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+210 |
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC_syntax_error.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC_syntax_error.py.snap
index 0b61838958..ac74361ae5 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC_syntax_error.py.snap
@@ -1,22 +1,23 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
 ---
-invalid-syntax: missing closing quote in string literal
- --> ISC_syntax_error.py:2:5
+ISC001 Implicitly concatenated string literals on one line
+ --> ISC_syntax_error.py:2:1
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
-  |     ^^
+  | ^^^^^^
 3 | "a" "b" "c
 4 | "a" """b
   |
+help: Combine string literals
 
-invalid-syntax: Expected a statement
- --> ISC_syntax_error.py:2:7
+invalid-syntax: missing closing quote in string literal
+ --> ISC_syntax_error.py:2:5
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
-  |       ^
+  |     ^^
 3 | "a" "b" "c
 4 | "a" """b
   |
@@ -24,7 +25,7 @@ invalid-syntax: Expected a statement
 ISC001 Implicitly concatenated string literals on one line
  --> ISC_syntax_error.py:3:1
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
   | ^^^^^^^
@@ -33,24 +34,25 @@ ISC001 Implicitly concatenated string literals on one line
   |
 help: Combine string literals
 
-invalid-syntax: missing closing quote in string literal
- --> ISC_syntax_error.py:3:9
+ISC001 Implicitly concatenated string literals on one line
+ --> ISC_syntax_error.py:3:5
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
-  |         ^^
+  |     ^^^^^^
 4 | "a" """b
 5 | c""" "d
   |
+help: Combine string literals
 
-invalid-syntax: Expected a statement
- --> ISC_syntax_error.py:3:11
+invalid-syntax: missing closing quote in string literal
+ --> ISC_syntax_error.py:3:9
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
-  |           ^
+  |         ^^
 4 | "a" """b
 5 | c""" "d
   |
@@ -64,7 +66,21 @@ ISC001 Implicitly concatenated string literals on one line
 5 | | c""" "d
   | |____^
 6 |
-7 |   # For f-strings, the `FStringRanges` won't contain the range for
+7 |   # This is also true for
+  |
+help: Combine string literals
+
+ISC001 Implicitly concatenated string literals on one line
+ --> ISC_syntax_error.py:4:5
+  |
+2 |   "a" "b
+3 |   "a" "b" "c
+4 |   "a" """b
+  |  _____^
+5 | | c""" "d
+  | |_______^
+6 |
+7 |   # This is also true for
   |
 help: Combine string literals
 
@@ -76,24 +92,13 @@ invalid-syntax: missing closing quote in string literal
 5 | c""" "d
   |      ^^
 6 |
-7 | # For f-strings, the `FStringRanges` won't contain the range for
-  |
-
-invalid-syntax: Expected a statement
- --> ISC_syntax_error.py:5:8
-  |
-3 | "a" "b" "c
-4 | "a" """b
-5 | c""" "d
-  |        ^
-6 |
-7 | # For f-strings, the `FStringRanges` won't contain the range for
+7 | # This is also true for
   |
 
 invalid-syntax: f-string: unterminated string
   --> ISC_syntax_error.py:9:8
    |
- 7 | # For f-strings, the `FStringRanges` won't contain the range for
+ 7 | # This is also true for
  8 | # unterminated f-strings.
  9 | f"a" f"b
    |        ^
@@ -104,7 +109,7 @@ invalid-syntax: f-string: unterminated string
 invalid-syntax: Expected FStringEnd, found newline
   --> ISC_syntax_error.py:9:9
    |
- 7 | # For f-strings, the `FStringRanges` won't contain the range for
+ 7 | # This is also true for
  8 | # unterminated f-strings.
  9 | f"a" f"b
    |         ^
@@ -183,14 +188,6 @@ invalid-syntax: f-string: unterminated triple-quoted string
    | |__^
    |
 
-invalid-syntax: unexpected EOF while parsing
-  --> ISC_syntax_error.py:30:1
-   |
-28 |     "i" "j"
-29 | )
-   |  ^
-   |
-
 invalid-syntax: f-string: unterminated string
   --> ISC_syntax_error.py:30:1
    |
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC.py.snap
index fc84adef37..290691d0a7 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC.py.snap
@@ -26,3 +26,25 @@ ISC002 Implicitly concatenated string literals over multiple lines
 76 |
 77 |   # Explicitly concatenated nested f-strings
    |
+
+ISC002 Implicitly concatenated string literals over multiple lines
+   --> ISC.py:196:1
+    |
+195 |   # ISC002
+196 | / t"The quick brown fox jumps over the lazy "\
+197 | | t"dog."
+    | |_______^
+198 |
+199 |   # ISC003
+    |
+
+ISC002 Implicitly concatenated string literals over multiple lines
+   --> ISC.py:208:10
+    |
+206 |   _ = "a" f"b {t"c" t"d"} e" "f"
+207 |   _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 |   _ = f"b {t"abc" \
+    |  __________^
+209 | |     t"def"} g"
+    | |__________^
+    |
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC_syntax_error.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC_syntax_error.py.snap
index 1cbcf596b3..6c645ec5d1 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC002_ISC_syntax_error.py.snap
@@ -4,27 +4,17 @@ source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
 invalid-syntax: missing closing quote in string literal
  --> ISC_syntax_error.py:2:5
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
   |     ^^
 3 | "a" "b" "c
 4 | "a" """b
   |
 
-invalid-syntax: Expected a statement
- --> ISC_syntax_error.py:2:7
-  |
-1 | # The lexer doesn't emit a string token if it's unterminated
-2 | "a" "b
-  |       ^
-3 | "a" "b" "c
-4 | "a" """b
-  |
-
 invalid-syntax: missing closing quote in string literal
  --> ISC_syntax_error.py:3:9
   |
-1 | # The lexer doesn't emit a string token if it's unterminated
+1 | # The lexer emits a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
   |         ^^
@@ -32,17 +22,6 @@ invalid-syntax: missing closing quote in string literal
 5 | c""" "d
   |
 
-invalid-syntax: Expected a statement
- --> ISC_syntax_error.py:3:11
-  |
-1 | # The lexer doesn't emit a string token if it's unterminated
-2 | "a" "b
-3 | "a" "b" "c
-  |           ^
-4 | "a" """b
-5 | c""" "d
-  |
-
 invalid-syntax: missing closing quote in string literal
  --> ISC_syntax_error.py:5:6
   |
@@ -51,24 +30,13 @@ invalid-syntax: missing closing quote in string literal
 5 | c""" "d
   |      ^^
 6 |
-7 | # For f-strings, the `FStringRanges` won't contain the range for
-  |
-
-invalid-syntax: Expected a statement
- --> ISC_syntax_error.py:5:8
-  |
-3 | "a" "b" "c
-4 | "a" """b
-5 | c""" "d
-  |        ^
-6 |
-7 | # For f-strings, the `FStringRanges` won't contain the range for
+7 | # This is also true for
   |
 
 invalid-syntax: f-string: unterminated string
   --> ISC_syntax_error.py:9:8
    |
- 7 | # For f-strings, the `FStringRanges` won't contain the range for
+ 7 | # This is also true for
  8 | # unterminated f-strings.
  9 | f"a" f"b
    |        ^
@@ -79,7 +47,7 @@ invalid-syntax: f-string: unterminated string
 invalid-syntax: Expected FStringEnd, found newline
   --> ISC_syntax_error.py:9:9
    |
- 7 | # For f-strings, the `FStringRanges` won't contain the range for
+ 7 | # This is also true for
  8 | # unterminated f-strings.
  9 | f"a" f"b
    |         ^
@@ -133,14 +101,6 @@ invalid-syntax: f-string: unterminated triple-quoted string
    | |__^
    |
 
-invalid-syntax: unexpected EOF while parsing
-  --> ISC_syntax_error.py:30:1
-   |
-28 |     "i" "j"
-29 | )
-   |  ^
-   |
-
 invalid-syntax: f-string: unterminated string
   --> ISC_syntax_error.py:30:1
    |
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap
index 795ab86e8a..7e142fef36 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap
@@ -11,16 +11,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 11 |   )
    |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-6  6  |     "def"
-7  7  | 
-8  8  | _ = (
-9     |-  "abc" +
-   9  |+  "abc"
-10 10 |   "def"
-11 11 | )
-12 12 | 
+6  |     "def"
+7  | 
+8  | _ = (
+   -   "abc" +
+9  +   "abc"
+10 |   "def"
+11 | )
+12 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
   --> ISC.py:14:3
@@ -32,16 +30,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 16 |   )
    |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-11 11 | )
-12 12 | 
-13 13 | _ = (
-14    |-  f"abc" +
-   14 |+  f"abc"
-15 15 |   "def"
-16 16 | )
-17 17 | 
+11 | )
+12 | 
+13 | _ = (
+   -   f"abc" +
+14 +   f"abc"
+15 |   "def"
+16 | )
+17 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
   --> ISC.py:19:3
@@ -53,16 +49,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 21 |   )
    |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-16 16 | )
-17 17 | 
-18 18 | _ = (
-19    |-  b"abc" +
-   19 |+  b"abc"
-20 20 |   b"def"
-21 21 | )
-22 22 | 
+16 | )
+17 | 
+18 | _ = (
+   -   b"abc" +
+19 +   b"abc"
+20 |   b"def"
+21 | )
+22 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
   --> ISC.py:78:10
@@ -76,16 +70,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 81 |       + f"second"} d"
    |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-76 76 | 
-77 77 | # Explicitly concatenated nested f-strings
-78 78 | _ = f"a {f"first"
-79    |-    + f"second"} d"
-   79 |+     f"second"} d"
-80 80 | _ = f"a {f"first {f"middle"}"
-81 81 |     + f"second"} d"
-82 82 | 
+76 | 
+77 | # Explicitly concatenated nested f-strings
+78 | _ = f"a {f"first"
+   -     + f"second"} d"
+79 +      f"second"} d"
+80 | _ = f"a {f"first {f"middle"}"
+81 |     + f"second"} d"
+82 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
   --> ISC.py:80:10
@@ -100,16 +92,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 83 |   # See https://github.com/astral-sh/ruff/issues/12936
    |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-78 78 | _ = f"a {f"first"
-79 79 |     + f"second"} d"
-80 80 | _ = f"a {f"first {f"middle"}"
-81    |-    + f"second"} d"
-   81 |+     f"second"} d"
-82 82 | 
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84 84 | _ = "\12""0" # fix should be "\0120"
+78 | _ = f"a {f"first"
+79 |     + f"second"} d"
+80 | _ = f"a {f"first {f"middle"}"
+   -     + f"second"} d"
+81 +      f"second"} d"
+82 | 
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+84 | _ = "\12""0" # fix should be "\0120"
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:110:5
@@ -121,16 +111,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 112 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-107 107 | )
-108 108 | 
-109 109 | _ = (
-110     |-    rf"raw_f{x}" +
-    110 |+    rf"raw_f{x}"
-111 111 |     r"raw_normal"
-112 112 | )
-113 113 | 
+107 | )
+108 | 
+109 | _ = (
+    -     rf"raw_f{x}" +
+110 +     rf"raw_f{x}"
+111 |     r"raw_normal"
+112 | )
+113 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:117:5
@@ -143,16 +131,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 119 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-114 114 | 
-115 115 | # Different prefix combinations
-116 116 | _ = (
-117     |-    u"unicode" +
-    117 |+    u"unicode"
-118 118 |     r"raw"
-119 119 | )
-120 120 | 
+114 | 
+115 | # Different prefix combinations
+116 | _ = (
+    -     u"unicode" +
+117 +     u"unicode"
+118 |     r"raw"
+119 | )
+120 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:122:5
@@ -164,16 +150,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 124 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-119 119 | )
-120 120 | 
-121 121 | _ = (
-122     |-    rb"raw_bytes" +
-    122 |+    rb"raw_bytes"
-123 123 |     b"normal_bytes"
-124 124 | )
-125 125 | 
+119 | )
+120 | 
+121 | _ = (
+    -     rb"raw_bytes" +
+122 +     rb"raw_bytes"
+123 |     b"normal_bytes"
+124 | )
+125 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:127:5
@@ -185,16 +169,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 129 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-124 124 | )
-125 125 | 
-126 126 | _ = (
-127     |-    b"bytes" +
-    127 |+    b"bytes"
-128 128 |     b"with_bytes"
-129 129 | )
-130 130 | 
+124 | )
+125 | 
+126 | _ = (
+    -     b"bytes" +
+127 +     b"bytes"
+128 |     b"with_bytes"
+129 | )
+130 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:133:6
@@ -209,16 +191,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 136 |       "d" + "e"
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-130 130 | 
-131 131 | # Repeated concatenation
-132 132 | 
-133     |-_ = ("a" +
-    133 |+_ = ("a"
-134 134 |     "b" +
-135 135 |     "c" +
-136 136 |     "d" + "e"
+130 | 
+131 | # Repeated concatenation
+132 | 
+    - _ = ("a" +
+133 + _ = ("a"
+134 |     "b" +
+135 |     "c" +
+136 |     "d" + "e"
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:139:6
@@ -233,16 +213,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 142 |       + "d"
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-137 137 | )
-138 138 | 
-139 139 | _ = ("a"
-140     |-    + "b"
-    140 |+     "b"
-141 141 |     + "c"
-142 142 |     + "d"
-143 143 |     + "e"
+137 | )
+138 | 
+139 | _ = ("a"
+    -     + "b"
+140 +      "b"
+141 |     + "c"
+142 |     + "d"
+143 |     + "e"
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:160:5
@@ -254,16 +232,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 162 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-158 158 | 
-159 159 | _ = (
-160 160 |     "first"
-161     |-    +    "second"  # extra spaces around +
-    161 |+        "second"  # extra spaces around +
-162 162 | )
-163 163 | 
-164 164 | _ = (
+158 | 
+159 | _ = (
+160 |     "first"
+    -     +    "second"  # extra spaces around +
+161 +         "second"  # extra spaces around +
+162 | )
+163 | 
+164 | _ = (
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:165:5
@@ -275,16 +251,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 167 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-162 162 | )
-163 163 | 
-164 164 | _ = (
-165     |-    "first"    +  # trailing spaces before +
-    165 |+    "first"  # trailing spaces before +
-166 166 |     "second"
-167 167 | )
-168 168 | 
+162 | )
+163 | 
+164 | _ = (
+    -     "first"    +  # trailing spaces before +
+165 +     "first"  # trailing spaces before +
+166 |     "second"
+167 | )
+168 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:170:5
@@ -296,16 +270,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 172 |   ))
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-167 167 | )
-168 168 | 
-169 169 | _ = ((
-170     |-    "deep" +
-    170 |+    "deep"
-171 171 |     "nesting"
-172 172 | ))
-173 173 | 
+167 | )
+168 | 
+169 | _ = ((
+    -     "deep" +
+170 +     "deep"
+171 |     "nesting"
+172 | ))
+173 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:175:5
@@ -317,16 +289,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 177 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-172 172 | ))
-173 173 | 
-174 174 | _ = (
-175     |-    "contains + plus" +
-    175 |+    "contains + plus"
-176 176 |     "another string"
-177 177 | )
-178 178 | 
+172 | ))
+173 | 
+174 | _ = (
+    -     "contains + plus" +
+175 +     "contains + plus"
+176 |     "another string"
+177 | )
+178 | 
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:180:5
@@ -339,16 +309,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 183 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-179 179 | _ = (
-180 180 |     "start"
-181 181 | 		# leading comment
-182     |-    + "end"
-    182 |+     "end"
-183 183 | )
-184 184 | 
-185 185 | _ = (
+179 | _ = (
+180 |     "start"
+181 | 		# leading comment
+    -     + "end"
+182 +      "end"
+183 | )
+184 | 
+185 | _ = (
 
 ISC003 [*] Explicitly concatenated string should be implicitly concatenated
    --> ISC.py:186:5
@@ -361,13 +329,31 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated
 189 |   )
     |
 help: Remove redundant '+' operator to implicitly concatenate
+183 | )
+184 | 
+185 | _ = (
+    -     "start" +
+186 +     "start"
+187 | 		# leading comment
+188 |     "end"
+189 | )
 
-ℹ Safe fix
-183 183 | )
-184 184 | 
-185 185 | _ = (
-186     |-    "start" +
-    186 |+    "start"
-187 187 | 		# leading comment
-188 188 |     "end"
-189 189 | )
+ISC003 [*] Explicitly concatenated string should be implicitly concatenated
+   --> ISC.py:201:5
+    |
+199 |   # ISC003
+200 |   (
+201 | /     t"The quick brown fox jumps over the lazy "
+202 | |     + t"dog"
+    | |____________^
+203 |   )
+    |
+help: Remove redundant '+' operator to implicitly concatenate
+199 | # ISC003
+200 | (
+201 |     t"The quick brown fox jumps over the lazy "
+    -     + t"dog"
+202 +      t"dog"
+203 | )
+204 | 
+205 | # nested examples with both t and f-strings
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap
index f6a411fcb3..b416434247 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap
@@ -10,13 +10,11 @@ ISC001 [*] Implicitly concatenated string literals on one line
 3 | _ = "abc" + "def"
   |
 help: Combine string literals
-
-ℹ Safe fix
-1   |-_ = "a" "b" "c"
-  1 |+_ = "ab" "c"
-2 2 | 
-3 3 | _ = "abc" + "def"
-4 4 | 
+  - _ = "a" "b" "c"
+1 + _ = "ab" "c"
+2 | 
+3 | _ = "abc" + "def"
+4 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
  --> ISC.py:1:9
@@ -27,13 +25,11 @@ ISC001 [*] Implicitly concatenated string literals on one line
 3 | _ = "abc" + "def"
   |
 help: Combine string literals
-
-ℹ Safe fix
-1   |-_ = "a" "b" "c"
-  1 |+_ = "a" "bc"
-2 2 | 
-3 3 | _ = "abc" + "def"
-4 4 | 
+  - _ = "a" "b" "c"
+1 + _ = "a" "bc"
+2 | 
+3 | _ = "abc" + "def"
+4 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:38:5
@@ -46,16 +42,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 40 | _ = """a
    |
 help: Combine string literals
-
-ℹ Safe fix
-35 35 |   b"def"
-36 36 | )
-37 37 | 
-38    |-_ = """a""" """b"""
-   38 |+_ = """ab"""
-39 39 | 
-40 40 | _ = """a
-41 41 | b""" """c
+35 |   b"def"
+36 | )
+37 | 
+   - _ = """a""" """b"""
+38 + _ = """ab"""
+39 | 
+40 | _ = """a
+41 | b""" """c
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:40:5
@@ -71,16 +65,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 44 |   _ = f"""a""" f"""b"""
    |
 help: Combine string literals
-
-ℹ Safe fix
-38 38 | _ = """a""" """b"""
-39 39 | 
-40 40 | _ = """a
-41    |-b""" """c
-   41 |+bc
-42 42 | d"""
-43 43 | 
-44 44 | _ = f"""a""" f"""b"""
+38 | _ = """a""" """b"""
+39 | 
+40 | _ = """a
+   - b""" """c
+41 + bc
+42 | d"""
+43 | 
+44 | _ = f"""a""" f"""b"""
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:44:5
@@ -93,16 +85,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 46 | _ = f"a" "b"
    |
 help: Combine string literals
-
-ℹ Safe fix
-41 41 | b""" """c
-42 42 | d"""
-43 43 | 
-44    |-_ = f"""a""" f"""b"""
-   44 |+_ = f"""ab"""
-45 45 | 
-46 46 | _ = f"a" "b"
-47 47 | 
+41 | b""" """c
+42 | d"""
+43 | 
+   - _ = f"""a""" f"""b"""
+44 + _ = f"""ab"""
+45 | 
+46 | _ = f"a" "b"
+47 | 
 
 ISC001 Implicitly concatenated string literals on one line
   --> ISC.py:46:5
@@ -151,16 +141,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 54 | # Single-line explicit concatenation should be ignored.
    |
 help: Combine string literals
-
-ℹ Safe fix
-49 49 | 
-50 50 | _ = 'a' "b"
-51 51 | 
-52    |-_ = rf"a" rf"b"
-   52 |+_ = rf"ab"
-53 53 | 
-54 54 | # Single-line explicit concatenation should be ignored.
-55 55 | _ = "abc" + "def" + "ghi"
+49 | 
+50 | _ = 'a' "b"
+51 | 
+   - _ = rf"a" rf"b"
+52 + _ = rf"ab"
+53 | 
+54 | # Single-line explicit concatenation should be ignored.
+55 | _ = "abc" + "def" + "ghi"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:64:10
@@ -172,16 +160,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 66 | _ = f"""abc {
    |
 help: Combine string literals
-
-ℹ Safe fix
-61 61 | _ = foo + "abc" + bar
-62 62 | 
-63 63 | # Multiple strings nested inside a f-string
-64    |-_ = f"a {'b' 'c' 'd'} e"
-   64 |+_ = f"a {'bc' 'd'} e"
-65 65 | _ = f"""abc {"def" "ghi"} jkl"""
-66 66 | _ = f"""abc {
-67 67 |     "def"
+61 | _ = foo + "abc" + bar
+62 | 
+63 | # Multiple strings nested inside a f-string
+   - _ = f"a {'b' 'c' 'd'} e"
+64 + _ = f"a {'bc' 'd'} e"
+65 | _ = f"""abc {"def" "ghi"} jkl"""
+66 | _ = f"""abc {
+67 |     "def"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:64:14
@@ -193,16 +179,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 66 | _ = f"""abc {
    |
 help: Combine string literals
-
-ℹ Safe fix
-61 61 | _ = foo + "abc" + bar
-62 62 | 
-63 63 | # Multiple strings nested inside a f-string
-64    |-_ = f"a {'b' 'c' 'd'} e"
-   64 |+_ = f"a {'b' 'cd'} e"
-65 65 | _ = f"""abc {"def" "ghi"} jkl"""
-66 66 | _ = f"""abc {
-67 67 |     "def"
+61 | _ = foo + "abc" + bar
+62 | 
+63 | # Multiple strings nested inside a f-string
+   - _ = f"a {'b' 'c' 'd'} e"
+64 + _ = f"a {'b' 'cd'} e"
+65 | _ = f"""abc {"def" "ghi"} jkl"""
+66 | _ = f"""abc {
+67 |     "def"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:65:14
@@ -215,16 +199,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 67 |     "def"
    |
 help: Combine string literals
-
-ℹ Safe fix
-62 62 | 
-63 63 | # Multiple strings nested inside a f-string
-64 64 | _ = f"a {'b' 'c' 'd'} e"
-65    |-_ = f"""abc {"def" "ghi"} jkl"""
-   65 |+_ = f"""abc {"defghi"} jkl"""
-66 66 | _ = f"""abc {
-67 67 |     "def"
-68 68 |     "ghi"
+62 | 
+63 | # Multiple strings nested inside a f-string
+64 | _ = f"a {'b' 'c' 'd'} e"
+   - _ = f"""abc {"def" "ghi"} jkl"""
+65 + _ = f"""abc {"defghi"} jkl"""
+66 | _ = f"""abc {
+67 |     "def"
+68 |     "ghi"
 
 ISC001 Implicitly concatenated string literals on one line
   --> ISC.py:72:5
@@ -258,16 +240,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 74 | _ = f"b {f"abc" \
    |
 help: Combine string literals
-
-ℹ Safe fix
-69 69 | } jkl"""
-70 70 | 
-71 71 | # Nested f-strings
-72    |-_ = "a" f"b {f"c" f"d"} e" "f"
-   72 |+_ = "a" f"b {f"cd"} e" "f"
-73 73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-74 74 | _ = f"b {f"abc" \
-75 75 |     f"def"} g"
+69 | } jkl"""
+70 | 
+71 | # Nested f-strings
+   - _ = "a" f"b {f"c" f"d"} e" "f"
+72 + _ = "a" f"b {f"cd"} e" "f"
+73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
+74 | _ = f"b {f"abc" \
+75 |     f"def"} g"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:73:10
@@ -280,16 +260,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 75 |     f"def"} g"
    |
 help: Combine string literals
-
-ℹ Safe fix
-70 70 | 
-71 71 | # Nested f-strings
-72 72 | _ = "a" f"b {f"c" f"d"} e" "f"
-73    |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-   73 |+_ = f"b {f"cd {f"e" f"f"} g"} h"
-74 74 | _ = f"b {f"abc" \
-75 75 |     f"def"} g"
-76 76 | 
+70 | 
+71 | # Nested f-strings
+72 | _ = "a" f"b {f"c" f"d"} e" "f"
+   - _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
+73 + _ = f"b {f"cd {f"e" f"f"} g"} h"
+74 | _ = f"b {f"abc" \
+75 |     f"def"} g"
+76 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:73:20
@@ -302,16 +280,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 75 |     f"def"} g"
    |
 help: Combine string literals
-
-ℹ Safe fix
-70 70 | 
-71 71 | # Nested f-strings
-72 72 | _ = "a" f"b {f"c" f"d"} e" "f"
-73    |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-   73 |+_ = f"b {f"c" f"d {f"ef"} g"} h"
-74 74 | _ = f"b {f"abc" \
-75 75 |     f"def"} g"
-76 76 | 
+70 | 
+71 | # Nested f-strings
+72 | _ = "a" f"b {f"c" f"d"} e" "f"
+   - _ = f"b {f"c" f"d {f"e" f"f"} g"} h"
+73 + _ = f"b {f"c" f"d {f"ef"} g"} h"
+74 | _ = f"b {f"abc" \
+75 |     f"def"} g"
+76 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:84:5
@@ -323,16 +299,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 86 | _ = "\\\12""0" # fix should be "\\\0120"
    |
 help: Combine string literals
-
-ℹ Safe fix
-81 81 |     + f"second"} d"
-82 82 | 
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84    |-_ = "\12""0" # fix should be "\0120"
-   84 |+_ = "\0120" # fix should be "\0120"
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
+81 |     + f"second"} d"
+82 | 
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+   - _ = "\12""0" # fix should be "\0120"
+84 + _ = "\0120" # fix should be "\0120"
+85 | _ = "\\12""0" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:85:5
@@ -345,16 +319,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 87 | _ = "\12 0""0" # fix should be "\12 00"
    |
 help: Combine string literals
-
-ℹ Safe fix
-82 82 | 
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84 84 | _ = "\12""0" # fix should be "\0120"
-85    |-_ = "\\12""0" # fix should be "\\120"
-   85 |+_ = "\\120" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
+82 | 
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+84 | _ = "\12""0" # fix should be "\0120"
+   - _ = "\\12""0" # fix should be "\\120"
+85 + _ = "\\120" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:86:5
@@ -367,16 +339,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 88 | _ = r"\12"r"0" # fix should be r"\120"
    |
 help: Combine string literals
-
-ℹ Safe fix
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84 84 | _ = "\12""0" # fix should be "\0120"
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86    |-_ = "\\\12""0" # fix should be "\\\0120"
-   86 |+_ = "\\\0120" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+83 | # See https://github.com/astral-sh/ruff/issues/12936
+84 | _ = "\12""0" # fix should be "\0120"
+85 | _ = "\\12""0" # fix should be "\\120"
+   - _ = "\\\12""0" # fix should be "\\\0120"
+86 + _ = "\\\0120" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:87:5
@@ -389,16 +359,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
    |
 help: Combine string literals
-
-ℹ Safe fix
-84 84 | _ = "\12""0" # fix should be "\0120"
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87    |-_ = "\12 0""0" # fix should be "\12 00"
-   87 |+_ = "\12 00" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
+84 | _ = "\12""0" # fix should be "\0120"
+85 | _ = "\\12""0" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+   - _ = "\12 0""0" # fix should be "\12 00"
+87 + _ = "\12 00" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:88:5
@@ -411,16 +379,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 90 | _ = "\8""0" # fix should be "\80"
    |
 help: Combine string literals
-
-ℹ Safe fix
-85 85 | _ = "\\12""0" # fix should be "\\120"
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88    |-_ = r"\12"r"0" # fix should be r"\120"
-   88 |+_ = r"\120" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
+85 | _ = "\\12""0" # fix should be "\\120"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+   - _ = r"\12"r"0" # fix should be r"\120"
+88 + _ = r"\120" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:89:5
@@ -433,16 +399,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 91 | _ = "\12""8" # fix should be "\128"
    |
 help: Combine string literals
-
-ℹ Safe fix
-86 86 | _ = "\\\12""0" # fix should be "\\\0120"
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89    |-_ = "\12 and more""0" # fix should be "\12 and more0"
-   89 |+_ = "\12 and more0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
+86 | _ = "\\\12""0" # fix should be "\\\0120"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+   - _ = "\12 and more""0" # fix should be "\12 and more0"
+89 + _ = "\12 and more0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:90:5
@@ -455,16 +419,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 92 | _ = "\12""foo" # fix should be "\12foo"
    |
 help: Combine string literals
-
-ℹ Safe fix
-87 87 | _ = "\12 0""0" # fix should be "\12 00"
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90    |-_ = "\8""0" # fix should be "\80"
-   90 |+_ = "\80" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
-93 93 | _ = "\12" ""  # fix should be "\12"
+87 | _ = "\12 0""0" # fix should be "\12 00"
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+   - _ = "\8""0" # fix should be "\80"
+90 + _ = "\80" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
+93 | _ = "\12" ""  # fix should be "\12"
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:91:5
@@ -477,16 +439,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 93 | _ = "\12" ""  # fix should be "\12"
    |
 help: Combine string literals
-
-ℹ Safe fix
-88 88 | _ = r"\12"r"0" # fix should be r"\120"
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91    |-_ = "\12""8" # fix should be "\128"
-   91 |+_ = "\128" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
-93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 
+88 | _ = r"\12"r"0" # fix should be r"\120"
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+   - _ = "\12""8" # fix should be "\128"
+91 + _ = "\128" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
+93 | _ = "\12" ""  # fix should be "\12"
+94 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:92:5
@@ -498,16 +458,14 @@ ISC001 [*] Implicitly concatenated string literals on one line
 93 | _ = "\12" ""  # fix should be "\12"
    |
 help: Combine string literals
-
-ℹ Safe fix
-89 89 | _ = "\12 and more""0" # fix should be "\12 and more0"
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92    |-_ = "\12""foo" # fix should be "\12foo"
-   92 |+_ = "\12foo" # fix should be "\12foo"
-93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 
-95 95 | 
+89 | _ = "\12 and more""0" # fix should be "\12 and more0"
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+   - _ = "\12""foo" # fix should be "\12foo"
+92 + _ = "\12foo" # fix should be "\12foo"
+93 | _ = "\12" ""  # fix should be "\12"
+94 | 
+95 | 
 
 ISC001 [*] Implicitly concatenated string literals on one line
   --> ISC.py:93:5
@@ -518,13 +476,112 @@ ISC001 [*] Implicitly concatenated string literals on one line
    |     ^^^^^^^^
    |
 help: Combine string literals
+90 | _ = "\8""0" # fix should be "\80"
+91 | _ = "\12""8" # fix should be "\128"
+92 | _ = "\12""foo" # fix should be "\12foo"
+   - _ = "\12" ""  # fix should be "\12"
+93 + _ = "\12"  # fix should be "\12"
+94 | 
+95 | 
+96 | # Mixed literal + non-literal scenarios
 
-ℹ Safe fix
-90 90 | _ = "\8""0" # fix should be "\80"
-91 91 | _ = "\12""8" # fix should be "\128"
-92 92 | _ = "\12""foo" # fix should be "\12foo"
-93    |-_ = "\12" ""  # fix should be "\12"
-   93 |+_ = "\12"  # fix should be "\12"
-94 94 | 
-95 95 | 
-96 96 | # Mixed literal + non-literal scenarios
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:193:1
+    |
+191 | # https://github.com/astral-sh/ruff/issues/20310
+192 | # ISC001
+193 | t"The quick " t"brown fox."
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+194 |
+195 | # ISC002
+    |
+help: Combine string literals
+190 | 
+191 | # https://github.com/astral-sh/ruff/issues/20310
+192 | # ISC001
+    - t"The quick " t"brown fox."
+193 + t"The quick brown fox."
+194 | 
+195 | # ISC002
+196 | t"The quick brown fox jumps over the lazy "\
+
+ISC001 Implicitly concatenated string literals on one line
+   --> ISC.py:206:5
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    |     ^^^^^^^^^^^^^^^^^^^^^^
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+    |
+help: Combine string literals
+
+ISC001 Implicitly concatenated string literals on one line
+   --> ISC.py:206:9
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    |         ^^^^^^^^^^^^^^^^^^^^^^
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+    |
+help: Combine string literals
+
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:206:14
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    |              ^^^^^^^^^
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+    |
+help: Combine string literals
+203 | )
+204 | 
+205 | # nested examples with both t and f-strings
+    - _ = "a" f"b {t"c" t"d"} e" "f"
+206 + _ = "a" f"b {t"cd"} e" "f"
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:207:10
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+    |          ^^^^^^^^^^^^^^^^^^^^^^^
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+    |
+help: Combine string literals
+204 | 
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    - _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+207 + _ = t"b {f"cd {t"e" t"f"} g"} h"
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+210 | 
+
+ISC001 [*] Implicitly concatenated string literals on one line
+   --> ISC.py:207:20
+    |
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+207 | _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+    |                    ^^^^^^^^^
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+    |
+help: Combine string literals
+204 | 
+205 | # nested examples with both t and f-strings
+206 | _ = "a" f"b {t"c" t"d"} e" "f"
+    - _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+207 + _ = t"b {f"c" f"d {t"ef"} g"} h"
+208 | _ = f"b {t"abc" \
+209 |     t"def"} g"
+210 |
diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC002_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC002_ISC.py.snap
index c0a1f8995f..30b777f4e0 100644
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC002_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC002_ISC.py.snap
@@ -67,3 +67,25 @@ ISC002 Implicitly concatenated string literals over multiple lines
 76 |
 77 |   # Explicitly concatenated nested f-strings
    |
+
+ISC002 Implicitly concatenated string literals over multiple lines
+   --> ISC.py:196:1
+    |
+195 |   # ISC002
+196 | / t"The quick brown fox jumps over the lazy "\
+197 | | t"dog."
+    | |_______^
+198 |
+199 |   # ISC003
+    |
+
+ISC002 Implicitly concatenated string literals over multiple lines
+   --> ISC.py:208:10
+    |
+206 |   _ = "a" f"b {t"c" t"d"} e" "f"
+207 |   _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
+208 |   _ = f"b {t"abc" \
+    |  __________^
+209 | |     t"def"} g"
+    | |__________^
+    |
diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_alias.rs b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_alias.rs
index 6fc205699a..080e5f3977 100644
--- a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_alias.rs
+++ b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_alias.rs
@@ -34,6 +34,7 @@ use crate::rules::flake8_import_conventions::settings::BannedAliases;
 /// ## Options
 /// - `lint.flake8-import-conventions.banned-aliases`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct BannedImportAlias {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_from.rs b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_from.rs
index c5a64ea82a..e27123fe71 100644
--- a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_from.rs
+++ b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_from.rs
@@ -33,6 +33,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## Options
 /// - `lint.flake8-import-conventions.banned-from`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.263")]
 pub(crate) struct BannedImportFrom {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs
index 90970ae343..e0684056dc 100644
--- a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs
+++ b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs
@@ -35,6 +35,7 @@ use crate::renamer::Renamer;
 /// - `lint.flake8-import-conventions.aliases`
 /// - `lint.flake8-import-conventions.extend-aliases`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.166")]
 pub(crate) struct UnconventionalImportAlias {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap
index acd73a4fd1..52708a8b47 100644
--- a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap
+++ b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap
@@ -11,16 +11,15 @@ ICN001 [*] `altair` should be imported as `alt`
 8 |     import numpy
   |
 help: Alias `altair` to `alt`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | 
-5 5 | def unconventional():
-6   |-    import altair
-  6 |+    import altair as alt
-7 7 |     import matplotlib.pyplot
-8 8 |     import numpy
-9 9 |     import pandas
+3 | 
+4 | 
+5 | def unconventional():
+  -     import altair
+6 +     import altair as alt
+7 |     import matplotlib.pyplot
+8 |     import numpy
+9 |     import pandas
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 `matplotlib.pyplot` should be imported as `plt`
  --> defaults.py:7:12
@@ -45,16 +44,15 @@ ICN001 [*] `numpy` should be imported as `np`
 10 |     import seaborn
    |
 help: Alias `numpy` to `np`
-
-ℹ Unsafe fix
-5 5 | def unconventional():
-6 6 |     import altair
-7 7 |     import matplotlib.pyplot
-8   |-    import numpy
-  8 |+    import numpy as np
-9 9 |     import pandas
-10 10 |     import seaborn
-11 11 |     import tkinter
+5  | def unconventional():
+6  |     import altair
+7  |     import matplotlib.pyplot
+   -     import numpy
+8  +     import numpy as np
+9  |     import pandas
+10 |     import seaborn
+11 |     import tkinter
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `pandas` should be imported as `pd`
   --> defaults.py:9:12
@@ -67,16 +65,15 @@ ICN001 [*] `pandas` should be imported as `pd`
 11 |     import tkinter
    |
 help: Alias `pandas` to `pd`
-
-ℹ Unsafe fix
-6  6  |     import altair
-7  7  |     import matplotlib.pyplot
-8  8  |     import numpy
-9     |-    import pandas
-   9  |+    import pandas as pd
-10 10 |     import seaborn
-11 11 |     import tkinter
-12 12 |     import networkx
+6  |     import altair
+7  |     import matplotlib.pyplot
+8  |     import numpy
+   -     import pandas
+9  +     import pandas as pd
+10 |     import seaborn
+11 |     import tkinter
+12 |     import networkx
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `seaborn` should be imported as `sns`
   --> defaults.py:10:12
@@ -89,16 +86,15 @@ ICN001 [*] `seaborn` should be imported as `sns`
 12 |     import networkx
    |
 help: Alias `seaborn` to `sns`
-
-ℹ Unsafe fix
-7  7  |     import matplotlib.pyplot
-8  8  |     import numpy
-9  9  |     import pandas
-10    |-    import seaborn
-   10 |+    import seaborn as sns
-11 11 |     import tkinter
-12 12 |     import networkx
-13 13 | 
+7  |     import matplotlib.pyplot
+8  |     import numpy
+9  |     import pandas
+   -     import seaborn
+10 +     import seaborn as sns
+11 |     import tkinter
+12 |     import networkx
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `tkinter` should be imported as `tk`
   --> defaults.py:11:12
@@ -110,16 +106,15 @@ ICN001 [*] `tkinter` should be imported as `tk`
 12 |     import networkx
    |
 help: Alias `tkinter` to `tk`
-
-ℹ Unsafe fix
-8  8  |     import numpy
-9  9  |     import pandas
-10 10 |     import seaborn
-11    |-    import tkinter
-   11 |+    import tkinter as tk
-12 12 |     import networkx
-13 13 | 
-14 14 | 
+8  |     import numpy
+9  |     import pandas
+10 |     import seaborn
+   -     import tkinter
+11 +     import tkinter as tk
+12 |     import networkx
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `networkx` should be imported as `nx`
   --> defaults.py:12:12
@@ -130,16 +125,15 @@ ICN001 [*] `networkx` should be imported as `nx`
    |            ^^^^^^^^
    |
 help: Alias `networkx` to `nx`
-
-ℹ Unsafe fix
-9  9  |     import pandas
-10 10 |     import seaborn
-11 11 |     import tkinter
-12    |-    import networkx
-   12 |+    import networkx as nx
-13 13 | 
-14 14 | 
-15 15 | def unconventional_aliases():
+9  |     import pandas
+10 |     import seaborn
+11 |     import tkinter
+   -     import networkx
+12 +     import networkx as nx
+13 | 
+14 | 
+15 | def unconventional_aliases():
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `altair` should be imported as `alt`
   --> defaults.py:16:22
@@ -151,16 +145,15 @@ ICN001 [*] `altair` should be imported as `alt`
 18 |     import numpy as nmp
    |
 help: Alias `altair` to `alt`
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | def unconventional_aliases():
-16    |-    import altair as altr
-   16 |+    import altair as alt
-17 17 |     import matplotlib.pyplot as plot
-18 18 |     import numpy as nmp
-19 19 |     import pandas as pdas
+13 | 
+14 | 
+15 | def unconventional_aliases():
+   -     import altair as altr
+16 +     import altair as alt
+17 |     import matplotlib.pyplot as plot
+18 |     import numpy as nmp
+19 |     import pandas as pdas
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `matplotlib.pyplot` should be imported as `plt`
   --> defaults.py:17:33
@@ -173,16 +166,15 @@ ICN001 [*] `matplotlib.pyplot` should be imported as `plt`
 19 |     import pandas as pdas
    |
 help: Alias `matplotlib.pyplot` to `plt`
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | def unconventional_aliases():
-16 16 |     import altair as altr
-17    |-    import matplotlib.pyplot as plot
-   17 |+    import matplotlib.pyplot as plt
-18 18 |     import numpy as nmp
-19 19 |     import pandas as pdas
-20 20 |     import seaborn as sbrn
+14 | 
+15 | def unconventional_aliases():
+16 |     import altair as altr
+   -     import matplotlib.pyplot as plot
+17 +     import matplotlib.pyplot as plt
+18 |     import numpy as nmp
+19 |     import pandas as pdas
+20 |     import seaborn as sbrn
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `numpy` should be imported as `np`
   --> defaults.py:18:21
@@ -195,16 +187,15 @@ ICN001 [*] `numpy` should be imported as `np`
 20 |     import seaborn as sbrn
    |
 help: Alias `numpy` to `np`
-
-ℹ Unsafe fix
-15 15 | def unconventional_aliases():
-16 16 |     import altair as altr
-17 17 |     import matplotlib.pyplot as plot
-18    |-    import numpy as nmp
-   18 |+    import numpy as np
-19 19 |     import pandas as pdas
-20 20 |     import seaborn as sbrn
-21 21 |     import tkinter as tkr
+15 | def unconventional_aliases():
+16 |     import altair as altr
+17 |     import matplotlib.pyplot as plot
+   -     import numpy as nmp
+18 +     import numpy as np
+19 |     import pandas as pdas
+20 |     import seaborn as sbrn
+21 |     import tkinter as tkr
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `pandas` should be imported as `pd`
   --> defaults.py:19:22
@@ -217,16 +208,15 @@ ICN001 [*] `pandas` should be imported as `pd`
 21 |     import tkinter as tkr
    |
 help: Alias `pandas` to `pd`
-
-ℹ Unsafe fix
-16 16 |     import altair as altr
-17 17 |     import matplotlib.pyplot as plot
-18 18 |     import numpy as nmp
-19    |-    import pandas as pdas
-   19 |+    import pandas as pd
-20 20 |     import seaborn as sbrn
-21 21 |     import tkinter as tkr
-22 22 |     import networkx as nxy
+16 |     import altair as altr
+17 |     import matplotlib.pyplot as plot
+18 |     import numpy as nmp
+   -     import pandas as pdas
+19 +     import pandas as pd
+20 |     import seaborn as sbrn
+21 |     import tkinter as tkr
+22 |     import networkx as nxy
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `seaborn` should be imported as `sns`
   --> defaults.py:20:23
@@ -239,16 +229,15 @@ ICN001 [*] `seaborn` should be imported as `sns`
 22 |     import networkx as nxy
    |
 help: Alias `seaborn` to `sns`
-
-ℹ Unsafe fix
-17 17 |     import matplotlib.pyplot as plot
-18 18 |     import numpy as nmp
-19 19 |     import pandas as pdas
-20    |-    import seaborn as sbrn
-   20 |+    import seaborn as sns
-21 21 |     import tkinter as tkr
-22 22 |     import networkx as nxy
-23 23 | 
+17 |     import matplotlib.pyplot as plot
+18 |     import numpy as nmp
+19 |     import pandas as pdas
+   -     import seaborn as sbrn
+20 +     import seaborn as sns
+21 |     import tkinter as tkr
+22 |     import networkx as nxy
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `tkinter` should be imported as `tk`
   --> defaults.py:21:23
@@ -260,16 +249,15 @@ ICN001 [*] `tkinter` should be imported as `tk`
 22 |     import networkx as nxy
    |
 help: Alias `tkinter` to `tk`
-
-ℹ Unsafe fix
-18 18 |     import numpy as nmp
-19 19 |     import pandas as pdas
-20 20 |     import seaborn as sbrn
-21    |-    import tkinter as tkr
-   21 |+    import tkinter as tk
-22 22 |     import networkx as nxy
-23 23 | 
-24 24 | 
+18 |     import numpy as nmp
+19 |     import pandas as pdas
+20 |     import seaborn as sbrn
+   -     import tkinter as tkr
+21 +     import tkinter as tk
+22 |     import networkx as nxy
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 ICN001 [*] `networkx` should be imported as `nx`
   --> defaults.py:22:24
@@ -280,13 +268,12 @@ ICN001 [*] `networkx` should be imported as `nx`
    |                        ^^^
    |
 help: Alias `networkx` to `nx`
-
-ℹ Unsafe fix
-19 19 |     import pandas as pdas
-20 20 |     import seaborn as sbrn
-21 21 |     import tkinter as tkr
-22    |-    import networkx as nxy
-   22 |+    import networkx as nx
-23 23 | 
-24 24 | 
-25 25 | def conventional_aliases():
+19 |     import pandas as pdas
+20 |     import seaborn as sbrn
+21 |     import tkinter as tkr
+   -     import networkx as nxy
+22 +     import networkx as nx
+23 | 
+24 | 
+25 | def conventional_aliases():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap
index 8d7e143a25..5e6eba5474 100644
--- a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap
+++ b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap
@@ -9,10 +9,9 @@ ICN001 [*] `django.conf.settings` should be imported as `settings`
    |                                         ^
    |
 help: Alias `django.conf.settings` to `settings`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | 
-9  9  | def unconventional_alias():
-10    |-    from django.conf import settings as s
-   10 |+    from django.conf import settings as settings
+7  | 
+8  | 
+9  | def unconventional_alias():
+   -     from django.conf import settings as s
+10 +     from django.conf import settings as settings
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap
index 620a9275cc..42215754d7 100644
--- a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap
+++ b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap
@@ -12,14 +12,13 @@ ICN001 [*] `pandas` should be imported as `pd`
 9 |         return False
   |
 help: Alias `pandas` to `pd`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | def rename_global():
-5 5 |     try:
-6   |-        global pandas
-7   |-        import pandas
-  6 |+        global pd
-  7 |+        import pandas as pd
-8 8 |     except ImportError:
-9 9 |         return False
+3 | 
+4 | def rename_global():
+5 |     try:
+  -         global pandas
+  -         import pandas
+6 +         global pd
+7 +         import pandas as pd
+8 |     except ImportError:
+9 |         return False
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs
index 501953d980..29519be884 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs
@@ -42,6 +42,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [Logger Objects]: https://docs.python.org/3/library/logging.html#logger-objects
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct DirectLoggerInstantiation;
 
 impl Violation for DirectLoggerInstantiation {
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/exc_info_outside_except_handler.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/exc_info_outside_except_handler.rs
index d1768b4254..1172e40893 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/exc_info_outside_except_handler.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/exc_info_outside_except_handler.rs
@@ -44,6 +44,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// ## Fix safety
 /// The fix is always marked as unsafe, as it changes runtime behavior.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct ExcInfoOutsideExceptHandler;
 
 impl Violation for ExcInfoOutsideExceptHandler {
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/exception_without_exc_info.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/exception_without_exc_info.rs
index 4724239d56..8d5c954277 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/exception_without_exc_info.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/exception_without_exc_info.rs
@@ -31,6 +31,7 @@ use crate::checkers::ast::Checker;
 /// logging.error("...")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct ExceptionWithoutExcInfo;
 
 impl Violation for ExceptionWithoutExcInfo {
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs
index 368bdfa5d0..948d55f16d 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs
@@ -45,6 +45,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [logging documentation]: https://docs.python.org/3/library/logging.html#logger-objects
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct InvalidGetLoggerArgument;
 
 impl Violation for InvalidGetLoggerArgument {
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/log_exception_outside_except_handler.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/log_exception_outside_except_handler.rs
index 00c099014e..4f2b852a2b 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/log_exception_outside_except_handler.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/log_exception_outside_except_handler.rs
@@ -44,6 +44,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [The documentation]: https://docs.python.org/3/library/logging.html#logging.exception
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.5")]
 pub(crate) struct LogExceptionOutsideExceptHandler;
 
 impl Violation for LogExceptionOutsideExceptHandler {
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/root_logger_call.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/root_logger_call.rs
index 6c174b39e3..f7b6a55706 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/root_logger_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/root_logger_call.rs
@@ -28,6 +28,7 @@ use crate::checkers::ast::Checker;
 /// logger.info("Foobar")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct RootLoggerCall {
     attr: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs
index 2287a217b3..213e9f7c60 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs
@@ -33,6 +33,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// logging.basicConfig(level=logging.WARNING)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct UndocumentedWarn;
 
 impl Violation for UndocumentedWarn {
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap
index dd0717c4e4..bf8f2feac6 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap
@@ -12,14 +12,13 @@ LOG001 [*] Use `logging.getLogger()` to instantiate loggers
 5 | logging.getLogger(__name__)
   |
 help: Replace with `logging.getLogger()`
-
-ℹ Unsafe fix
-1 1 | import logging
-2 2 | 
-3   |-logging.Logger(__name__)
-  3 |+logging.getLogger(__name__)
-4 4 | logging.Logger()
-5 5 | logging.getLogger(__name__)
+1 | import logging
+2 | 
+  - logging.Logger(__name__)
+3 + logging.getLogger(__name__)
+4 | logging.Logger()
+5 | logging.getLogger(__name__)
+note: This is an unsafe fix and may change runtime behavior
 
 LOG001 [*] Use `logging.getLogger()` to instantiate loggers
  --> LOG001.py:4:1
@@ -30,11 +29,10 @@ LOG001 [*] Use `logging.getLogger()` to instantiate loggers
 5 | logging.getLogger(__name__)
   |
 help: Replace with `logging.getLogger()`
-
-ℹ Unsafe fix
-1 1 | import logging
-2 2 | 
-3 3 | logging.Logger(__name__)
-4   |-logging.Logger()
-  4 |+logging.getLogger()
-5 5 | logging.getLogger(__name__)
+1 | import logging
+2 | 
+3 | logging.Logger(__name__)
+  - logging.Logger()
+4 + logging.getLogger()
+5 | logging.getLogger(__name__)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap
index d1ef1cb3af..4d0ddd8d3d 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap
@@ -10,16 +10,15 @@ LOG002 [*] Use `__name__` with `logging.getLogger()`
 12 | logging.getLogger(name=__file__)
    |
 help: Replace with `__name__`
-
-ℹ Unsafe fix
-8  8  | logging.getLogger(name="custom")
-9  9  | 
-10 10 | # LOG002
-11    |-getLogger(__file__)
-   11 |+getLogger(__name__)
-12 12 | logging.getLogger(name=__file__)
-13 13 | 
-14 14 | logging.getLogger(__cached__)
+8  | logging.getLogger(name="custom")
+9  | 
+10 | # LOG002
+   - getLogger(__file__)
+11 + getLogger(__name__)
+12 | logging.getLogger(name=__file__)
+13 | 
+14 | logging.getLogger(__cached__)
+note: This is an unsafe fix and may change runtime behavior
 
 LOG002 [*] Use `__name__` with `logging.getLogger()`
   --> LOG002.py:12:24
@@ -32,16 +31,15 @@ LOG002 [*] Use `__name__` with `logging.getLogger()`
 14 | logging.getLogger(__cached__)
    |
 help: Replace with `__name__`
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | # LOG002
-11 11 | getLogger(__file__)
-12    |-logging.getLogger(name=__file__)
-   12 |+logging.getLogger(name=__name__)
-13 13 | 
-14 14 | logging.getLogger(__cached__)
-15 15 | getLogger(name=__cached__)
+9  | 
+10 | # LOG002
+11 | getLogger(__file__)
+   - logging.getLogger(name=__file__)
+12 + logging.getLogger(name=__name__)
+13 | 
+14 | logging.getLogger(__cached__)
+15 | getLogger(name=__cached__)
+note: This is an unsafe fix and may change runtime behavior
 
 LOG002 [*] Use `__name__` with `logging.getLogger()`
   --> LOG002.py:14:19
@@ -53,16 +51,15 @@ LOG002 [*] Use `__name__` with `logging.getLogger()`
 15 | getLogger(name=__cached__)
    |
 help: Replace with `__name__`
-
-ℹ Unsafe fix
-11 11 | getLogger(__file__)
-12 12 | logging.getLogger(name=__file__)
-13 13 | 
-14    |-logging.getLogger(__cached__)
-   14 |+logging.getLogger(__name__)
-15 15 | getLogger(name=__cached__)
-16 16 | 
-17 17 | 
+11 | getLogger(__file__)
+12 | logging.getLogger(name=__file__)
+13 | 
+   - logging.getLogger(__cached__)
+14 + logging.getLogger(__name__)
+15 | getLogger(name=__cached__)
+16 | 
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG002 [*] Use `__name__` with `logging.getLogger()`
   --> LOG002.py:15:16
@@ -72,13 +69,12 @@ LOG002 [*] Use `__name__` with `logging.getLogger()`
    |                ^^^^^^^^^^
    |
 help: Replace with `__name__`
-
-ℹ Unsafe fix
-12 12 | logging.getLogger(name=__file__)
-13 13 | 
-14 14 | logging.getLogger(__cached__)
-15    |-getLogger(name=__cached__)
-   15 |+getLogger(name=__name__)
-16 16 | 
-17 17 | 
-18 18 | # Override `logging.getLogger`
+12 | logging.getLogger(name=__file__)
+13 | 
+14 | logging.getLogger(__cached__)
+   - getLogger(name=__cached__)
+15 + getLogger(name=__name__)
+16 | 
+17 | 
+18 | # Override `logging.getLogger`
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap
index 7bc2eb098a..1a17d40da6 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap
@@ -12,16 +12,15 @@ LOG004 [*] `.exception()` call outside exception handlers
 15 | exc("")
    |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-10 10 | 
-11 11 | ### Errors
-12 12 | 
-13    |-logging.exception("")
-   13 |+logging.error("")
-14 14 | logger.exception("")
-15 15 | exc("")
-16 16 | 
+10 | 
+11 | ### Errors
+12 | 
+   - logging.exception("")
+13 + logging.error("")
+14 | logger.exception("")
+15 | exc("")
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG004 [*] `.exception()` call outside exception handlers
   --> LOG004_0.py:14:1
@@ -32,16 +31,15 @@ LOG004 [*] `.exception()` call outside exception handlers
 15 | exc("")
    |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-11 11 | ### Errors
-12 12 | 
-13 13 | logging.exception("")
-14    |-logger.exception("")
-   14 |+logger.error("")
-15 15 | exc("")
-16 16 | 
-17 17 | 
+11 | ### Errors
+12 | 
+13 | logging.exception("")
+   - logger.exception("")
+14 + logger.error("")
+15 | exc("")
+16 | 
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG004 `.exception()` call outside exception handlers
   --> LOG004_0.py:15:1
@@ -63,16 +61,15 @@ LOG004 [*] `.exception()` call outside exception handlers
 21 |     exc("")
    |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | 
-18 18 | def _():
-19    |-    logging.exception("")
-   19 |+    logging.error("")
-20 20 |     logger.exception("")
-21 21 |     exc("")
-22 22 | 
+16 | 
+17 | 
+18 | def _():
+   -     logging.exception("")
+19 +     logging.error("")
+20 |     logger.exception("")
+21 |     exc("")
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG004 [*] `.exception()` call outside exception handlers
   --> LOG004_0.py:20:5
@@ -84,16 +81,15 @@ LOG004 [*] `.exception()` call outside exception handlers
 21 |     exc("")
    |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | def _():
-19 19 |     logging.exception("")
-20    |-    logger.exception("")
-   20 |+    logger.error("")
-21 21 |     exc("")
-22 22 | 
-23 23 | 
+17 | 
+18 | def _():
+19 |     logging.exception("")
+   -     logger.exception("")
+20 +     logger.error("")
+21 |     exc("")
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG004 `.exception()` call outside exception handlers
   --> LOG004_0.py:21:5
@@ -116,16 +112,15 @@ LOG004 [*] `.exception()` call outside exception handlers
 30 |         exc("")
    |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-25 25 |     ...
-26 26 | except ...:
-27 27 |     def _():
-28    |-        logging.exception("")
-   28 |+        logging.error("")
-29 29 |         logger.exception("")
-30 30 |         exc("")
-31 31 | 
+25 |     ...
+26 | except ...:
+27 |     def _():
+   -         logging.exception("")
+28 +         logging.error("")
+29 |         logger.exception("")
+30 |         exc("")
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG004 [*] `.exception()` call outside exception handlers
   --> LOG004_0.py:29:9
@@ -137,16 +132,15 @@ LOG004 [*] `.exception()` call outside exception handlers
 30 |         exc("")
    |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-26 26 | except ...:
-27 27 |     def _():
-28 28 |         logging.exception("")
-29    |-        logger.exception("")
-   29 |+        logger.error("")
-30 30 |         exc("")
-31 31 | 
-32 32 | 
+26 | except ...:
+27 |     def _():
+28 |         logging.exception("")
+   -         logger.exception("")
+29 +         logger.error("")
+30 |         exc("")
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG004 `.exception()` call outside exception handlers
   --> LOG004_0.py:30:9
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap
index 758e9a1eac..19591ff044 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap
@@ -8,10 +8,9 @@ LOG004 [*] `.exception()` call outside exception handlers
   | ^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `.error()`
-
-ℹ Unsafe fix
-1 1 | _ = (logger := __import__("somewhere").logger)
-2 2 | 
-3 3 | 
-4   |-logger.exception("")
-  4 |+logger.error("")
+1 | _ = (logger := __import__("somewhere").logger)
+2 | 
+3 | 
+  - logger.exception("")
+4 + logger.error("")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap
index 0fcadb03cc..854860a4c6 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap
@@ -11,16 +11,14 @@ LOG009 [*] Use of undocumented `logging.WARN` constant
 5 |     logging.WARNING  # OK
   |
 help: Replace `logging.WARN` with `logging.WARNING`
-
-ℹ Safe fix
-1 1 | def func():
-2 2 |     import logging
-3 3 | 
-4   |-    logging.WARN  # LOG009
-  4 |+    logging.WARNING  # LOG009
-5 5 |     logging.WARNING  # OK
-6 6 | 
-7 7 | 
+1 | def func():
+2 |     import logging
+3 | 
+  -     logging.WARN  # LOG009
+4 +     logging.WARNING  # LOG009
+5 |     logging.WARNING  # OK
+6 | 
+7 | 
 
 LOG009 [*] Use of undocumented `logging.WARN` constant
   --> LOG009.py:11:5
@@ -32,11 +30,9 @@ LOG009 [*] Use of undocumented `logging.WARN` constant
 12 |     WARNING  # OK
    |
 help: Replace `logging.WARN` with `logging.WARNING`
-
-ℹ Safe fix
-8  8  | def func():
-9  9  |     from logging import WARN, WARNING
-10 10 | 
-11    |-    WARN  # LOG009
-   11 |+    WARNING  # LOG009
-12 12 |     WARNING  # OK
+8  | def func():
+9  |     from logging import WARN, WARNING
+10 | 
+   -     WARN  # LOG009
+11 +     WARNING  # LOG009
+12 |     WARNING  # OK
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap
index 873b766eb9..49a5d0fd1f 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap
@@ -11,16 +11,15 @@ LOG014 [*] `exc_info=` outside exception handlers
 13 | logger.info("", exc_info=True)
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | ### Errors
-11 11 | 
-12    |-logging.info("", exc_info=True)
-   12 |+logging.info("")
-13 13 | logger.info("", exc_info=True)
-14 14 | 
-15 15 | 
+9  | 
+10 | ### Errors
+11 | 
+   - logging.info("", exc_info=True)
+12 + logging.info("")
+13 | logger.info("", exc_info=True)
+14 | 
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:13:17
@@ -30,16 +29,15 @@ LOG014 [*] `exc_info=` outside exception handlers
    |                 ^^^^^^^^^^^^^
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-10 10 | ### Errors
-11 11 | 
-12 12 | logging.info("", exc_info=True)
-13    |-logger.info("", exc_info=True)
-   13 |+logger.info("")
-14 14 | 
-15 15 | 
-16 16 | logging.info("", exc_info=1)
+10 | ### Errors
+11 | 
+12 | logging.info("", exc_info=True)
+   - logger.info("", exc_info=True)
+13 + logger.info("")
+14 | 
+15 | 
+16 | logging.info("", exc_info=1)
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:16:18
@@ -49,16 +47,15 @@ LOG014 [*] `exc_info=` outside exception handlers
 17 | logger.info("", exc_info=1)
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-13 13 | logger.info("", exc_info=True)
-14 14 | 
-15 15 | 
-16    |-logging.info("", exc_info=1)
-   16 |+logging.info("")
-17 17 | logger.info("", exc_info=1)
-18 18 | 
-19 19 | 
+13 | logger.info("", exc_info=True)
+14 | 
+15 | 
+   - logging.info("", exc_info=1)
+16 + logging.info("")
+17 | logger.info("", exc_info=1)
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:17:17
@@ -68,16 +65,15 @@ LOG014 [*] `exc_info=` outside exception handlers
    |                 ^^^^^^^^^^
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | 
-16 16 | logging.info("", exc_info=1)
-17    |-logger.info("", exc_info=1)
-   17 |+logger.info("")
-18 18 | 
-19 19 | 
-20 20 | def _():
+14 | 
+15 | 
+16 | logging.info("", exc_info=1)
+   - logger.info("", exc_info=1)
+17 + logger.info("")
+18 | 
+19 | 
+20 | def _():
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:21:22
@@ -88,16 +84,15 @@ LOG014 [*] `exc_info=` outside exception handlers
 22 |     logger.info("", exc_info=True)
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | 
-20 20 | def _():
-21    |-    logging.info("", exc_info=True)
-   21 |+    logging.info("")
-22 22 |     logger.info("", exc_info=True)
-23 23 | 
-24 24 | 
+18 | 
+19 | 
+20 | def _():
+   -     logging.info("", exc_info=True)
+21 +     logging.info("")
+22 |     logger.info("", exc_info=True)
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:22:21
@@ -108,16 +103,15 @@ LOG014 [*] `exc_info=` outside exception handlers
    |                     ^^^^^^^^^^^^^
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | def _():
-21 21 |     logging.info("", exc_info=True)
-22    |-    logger.info("", exc_info=True)
-   22 |+    logger.info("")
-23 23 | 
-24 24 | 
-25 25 | try:
+19 | 
+20 | def _():
+21 |     logging.info("", exc_info=True)
+   -     logger.info("", exc_info=True)
+22 +     logger.info("")
+23 | 
+24 | 
+25 | try:
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:29:26
@@ -129,16 +123,15 @@ LOG014 [*] `exc_info=` outside exception handlers
 30 |         logger.info("", exc_info=True)
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-26 26 |     ...
-27 27 | except ...:
-28 28 |     def _():
-29    |-        logging.info("", exc_info=True)
-   29 |+        logging.info("")
-30 30 |         logger.info("", exc_info=True)
-31 31 | 
-32 32 | 
+26 |     ...
+27 | except ...:
+28 |     def _():
+   -         logging.info("", exc_info=True)
+29 +         logging.info("")
+30 |         logger.info("", exc_info=True)
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 LOG014 [*] `exc_info=` outside exception handlers
   --> LOG014_0.py:30:25
@@ -149,13 +142,12 @@ LOG014 [*] `exc_info=` outside exception handlers
    |                         ^^^^^^^^^^^^^
    |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-27 27 | except ...:
-28 28 |     def _():
-29 29 |         logging.info("", exc_info=True)
-30    |-        logger.info("", exc_info=True)
-   30 |+        logger.info("")
-31 31 | 
-32 32 | 
-33 33 | ### No errors
+27 | except ...:
+28 |     def _():
+29 |         logging.info("", exc_info=True)
+   -         logger.info("", exc_info=True)
+30 +         logger.info("")
+31 | 
+32 | 
+33 | ### No errors
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap
index 95284f7c23..44b718029d 100644
--- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap
@@ -8,10 +8,9 @@ LOG014 [*] `exc_info=` outside exception handlers
   |                 ^^^^^^^^^^^^^
   |
 help: Remove `exc_info=`
-
-ℹ Unsafe fix
-1 1 | _ = (logger := __import__("somewhere").logger)
-2 2 | 
-3 3 | 
-4   |-logger.info("", exc_info=True)
-  4 |+logger.info("")
+1 | _ = (logger := __import__("somewhere").logger)
+2 | 
+3 | 
+  - logger.info("", exc_info=True)
+4 + logger.info("")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/mod.rs b/crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
index 1dc2b536a6..77c62b4861 100644
--- a/crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
@@ -22,6 +22,8 @@ mod tests {
     #[test_case(Path::new("G002.py"))]
     #[test_case(Path::new("G003.py"))]
     #[test_case(Path::new("G004.py"))]
+    #[test_case(Path::new("G004_arg_order.py"))]
+    #[test_case(Path::new("G004_implicit_concat.py"))]
     #[test_case(Path::new("G010.py"))]
     #[test_case(Path::new("G101_1.py"))]
     #[test_case(Path::new("G101_2.py"))]
@@ -48,4 +50,25 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[test_case(Rule::LoggingFString, Path::new("G004.py"))]
+    #[test_case(Rule::LoggingFString, Path::new("G004_arg_order.py"))]
+    #[test_case(Rule::LoggingFString, Path::new("G004_implicit_concat.py"))]
+    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "preview__{}_{}",
+            rule_code.noqa_code(),
+            path.to_string_lossy()
+        );
+        let diagnostics = test_path(
+            Path::new("flake8_logging_format").join(path).as_path(),
+            &settings::LinterSettings {
+                logger_objects: vec!["logging_setup.logger".to_string()],
+                preview: settings::types::PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/rules/logging_call.rs b/crates/ruff_linter/src/rules/flake8_logging_format/rules/logging_call.rs
index 3372741154..23d842efeb 100644
--- a/crates/ruff_linter/src/rules/flake8_logging_format/rules/logging_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/rules/logging_call.rs
@@ -1,9 +1,12 @@
-use ruff_python_ast::{self as ast, Arguments, Expr, Keyword, Operator};
+use ruff_python_ast::InterpolatedStringElement;
+use ruff_python_ast::{self as ast, Arguments, Expr, Keyword, Operator, StringFlags};
+
 use ruff_python_semantic::analyze::logging;
 use ruff_python_stdlib::logging::LoggingLevel;
-use ruff_text_size::Ranged;
+use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
+use crate::preview::is_fix_f_string_logging_enabled;
 use crate::registry::Rule;
 use crate::rules::flake8_logging_format::violations::{
     LoggingExcInfo, LoggingExtraAttrClash, LoggingFString, LoggingPercentFormat,
@@ -11,6 +14,101 @@ use crate::rules::flake8_logging_format::violations::{
 };
 use crate::{Edit, Fix};
 
+fn logging_f_string(
+    checker: &Checker,
+    msg: &Expr,
+    f_string: &ast::ExprFString,
+    arguments: &Arguments,
+    msg_pos: usize,
+) {
+    // Report the diagnostic up-front so we can attach a fix later only when preview is enabled.
+    let mut diagnostic = checker.report_diagnostic(LoggingFString, msg.range());
+
+    // Preview gate for the automatic fix.
+    if !is_fix_f_string_logging_enabled(checker.settings()) {
+        return;
+    }
+
+    // If there are existing positional arguments after the message, bail out.
+    // This could indicate a mistake or complex usage we shouldn't try to fix.
+    if arguments.args.len() > msg_pos + 1 {
+        return;
+    }
+
+    let mut format_string = String::new();
+    let mut args: Vec<&str> = Vec::new();
+
+    // Try to reuse the first part's quote style when building the replacement.
+    // Default to double quotes if we can't determine it.
+    let quote_str = f_string
+        .value
+        .iter()
+        .map(|part| match part {
+            ast::FStringPart::Literal(literal) => literal.flags.quote_str(),
+            ast::FStringPart::FString(f) => f.flags.quote_str(),
+        })
+        .next()
+        .unwrap_or("\"");
+
+    for part in &f_string.value {
+        match part {
+            ast::FStringPart::Literal(literal) => {
+                let literal_text = literal.as_str();
+                if literal_text.contains('%') {
+                    return;
+                }
+                format_string.push_str(literal_text);
+            }
+            ast::FStringPart::FString(f) => {
+                for element in &f.elements {
+                    match element {
+                        InterpolatedStringElement::Literal(lit) => {
+                            // If the literal text contains a '%' placeholder, bail out: mixing
+                            // f-string interpolation with '%' placeholders is ambiguous for our
+                            // automatic conversion, so don't offer a fix for this case.
+                            if lit.value.as_ref().contains('%') {
+                                return;
+                            }
+                            format_string.push_str(lit.value.as_ref());
+                        }
+                        InterpolatedStringElement::Interpolation(interpolated) => {
+                            if interpolated.format_spec.is_some()
+                                || !matches!(
+                                    interpolated.conversion,
+                                    ruff_python_ast::ConversionFlag::None
+                                )
+                            {
+                                return;
+                            }
+                            match interpolated.expression.as_ref() {
+                                Expr::Name(name) => {
+                                    format_string.push_str("%s");
+                                    args.push(name.id.as_str());
+                                }
+                                _ => return,
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if args.is_empty() {
+        return;
+    }
+
+    let replacement = format!(
+        "{q}{format_string}{q}, {args}",
+        q = quote_str,
+        format_string = format_string,
+        args = args.join(", ")
+    );
+
+    let fix = Fix::safe_edit(Edit::range_replacement(replacement, msg.range()));
+    diagnostic.set_fix(fix);
+}
+
 /// Returns `true` if the attribute is a reserved attribute on the `logging` module's `LogRecord`
 /// class.
 fn is_reserved_attr(attr: &str) -> bool {
@@ -42,7 +140,7 @@ fn is_reserved_attr(attr: &str) -> bool {
 }
 
 /// Check logging messages for violations.
-fn check_msg(checker: &Checker, msg: &Expr) {
+fn check_msg(checker: &Checker, msg: &Expr, arguments: &Arguments, msg_pos: usize) {
     match msg {
         // Check for string concatenation and percent format.
         Expr::BinOp(ast::ExprBinOp { op, .. }) => match op {
@@ -55,8 +153,10 @@ fn check_msg(checker: &Checker, msg: &Expr) {
             _ => {}
         },
         // Check for f-strings.
-        Expr::FString(_) => {
-            checker.report_diagnostic_if_enabled(LoggingFString, msg.range());
+        Expr::FString(f_string) => {
+            if checker.is_rule_enabled(Rule::LoggingFString) {
+                logging_f_string(checker, msg, f_string, arguments, msg_pos);
+            }
         }
         // Check for .format() calls.
         Expr::Call(ast::ExprCall { func, .. }) => {
@@ -113,7 +213,7 @@ fn check_log_record_attr_clash(checker: &Checker, extra: &Keyword) {
 }
 
 #[derive(Debug, Copy, Clone)]
-enum LoggingCallType {
+pub(crate) enum LoggingCallType {
     /// Logging call with a level method, e.g., `logging.info`.
     LevelCall(LoggingLevel),
     /// Logging call with an integer level as an argument, e.g., `logger.log(level, ...)`.
@@ -130,45 +230,47 @@ impl LoggingCallType {
     }
 }
 
-/// Check logging calls for violations.
-pub(crate) fn logging_call(checker: &Checker, call: &ast::ExprCall) {
+pub(crate) fn find_logging_call(
+    checker: &Checker,
+    call: &ast::ExprCall,
+) -> Option<(LoggingCallType, TextRange)> {
     // Determine the call type (e.g., `info` vs. `exception`) and the range of the attribute.
-    let (logging_call_type, range) = match call.func.as_ref() {
+    match call.func.as_ref() {
         Expr::Attribute(ast::ExprAttribute { value: _, attr, .. }) => {
-            let Some(call_type) = LoggingCallType::from_attribute(attr.as_str()) else {
-                return;
-            };
+            let call_type = LoggingCallType::from_attribute(attr.as_str())?;
             if !logging::is_logger_candidate(
                 &call.func,
                 checker.semantic(),
                 &checker.settings().logger_objects,
             ) {
-                return;
+                return None;
             }
-            (call_type, attr.range())
+            Some((call_type, attr.range()))
         }
         Expr::Name(_) => {
-            let Some(qualified_name) = checker
+            let qualified_name = checker
                 .semantic()
-                .resolve_qualified_name(call.func.as_ref())
-            else {
-                return;
-            };
+                .resolve_qualified_name(call.func.as_ref())?;
             let ["logging", attribute] = qualified_name.segments() else {
-                return;
+                return None;
             };
-            let Some(call_type) = LoggingCallType::from_attribute(attribute) else {
-                return;
-            };
-            (call_type, call.func.range())
+            let call_type = LoggingCallType::from_attribute(attribute)?;
+            Some((call_type, call.func.range()))
         }
-        _ => return,
+        _ => None,
+    }
+}
+
+/// Check logging calls for violations.
+pub(crate) fn logging_call(checker: &Checker, call: &ast::ExprCall) {
+    let Some((logging_call_type, range)) = find_logging_call(checker, call) else {
+        return;
     };
 
     // G001, G002, G003, G004
     let msg_pos = usize::from(matches!(logging_call_type, LoggingCallType::LogCall));
     if let Some(format_arg) = call.arguments.find_argument_value("msg", msg_pos) {
-        check_msg(checker, format_arg);
+        check_msg(checker, format_arg, &call.arguments, msg_pos);
     }
 
     // G010
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004.py.snap
index 10a31007b8..f02d019ad5 100644
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004.py.snap
@@ -9,6 +9,7 @@ G004 Logging statement uses f-string
   |              ^^^^^^^^^^^^^^^
 5 | logging.log(logging.INFO, f"Hello {name}")
   |
+help: Convert to lazy `%` formatting
 
 G004 Logging statement uses f-string
  --> G004.py:5:27
@@ -20,6 +21,7 @@ G004 Logging statement uses f-string
 6 |
 7 | _LOGGER = logging.getLogger()
   |
+help: Convert to lazy `%` formatting
 
 G004 Logging statement uses f-string
   --> G004.py:8:14
@@ -30,6 +32,7 @@ G004 Logging statement uses f-string
  9 |
 10 | logging.getLogger().info(f"{name}")
    |
+help: Convert to lazy `%` formatting
 
 G004 Logging statement uses f-string
   --> G004.py:10:26
@@ -41,6 +44,7 @@ G004 Logging statement uses f-string
 11 |
 12 | from logging import info
    |
+help: Convert to lazy `%` formatting
 
 G004 Logging statement uses f-string
   --> G004.py:14:6
@@ -51,6 +55,7 @@ G004 Logging statement uses f-string
    |      ^^^^^^^^^
 15 | info(f"{__name__}")
    |
+help: Convert to lazy `%` formatting
 
 G004 Logging statement uses f-string
   --> G004.py:15:6
@@ -61,3 +66,156 @@ G004 Logging statement uses f-string
 16 |
 17 | # Don't trigger for t-strings
    |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:24:14
+   |
+22 | total = 9
+23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
+24 | logging.info(f"{count} out of {total} files in {directory_path} checked")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:30:13
+   |
+28 | x = 99
+29 | fmt = "08d"
+30 | logger.info(f"{x:{'08d'}}")
+   |             ^^^^^^^^^^^^^^
+31 | logger.info(f"{x:>10} {x:{fmt}}")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:31:13
+   |
+29 | fmt = "08d"
+30 | logger.info(f"{x:{'08d'}}")
+31 | logger.info(f"{x:>10} {x:{fmt}}")
+   |             ^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | logging.info(f"")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:33:14
+   |
+31 | logger.info(f"{x:>10} {x:{fmt}}")
+32 |
+33 | logging.info(f"")
+   |              ^^^
+34 | logging.info(f"This message doesn't have any variables.")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:34:14
+   |
+33 | logging.info(f"")
+34 | logging.info(f"This message doesn't have any variables.")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+35 |
+36 | obj = {"key": "value"}
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:37:14
+   |
+36 | obj = {"key": "value"}
+37 | logging.info(f"Object: {obj!r}")
+   |              ^^^^^^^^^^^^^^^^^^
+38 |
+39 | items_count = 3
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:40:17
+   |
+39 | items_count = 3
+40 | logging.warning(f"Items: {items_count:d}")
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^
+41 |
+42 | data = {"status": "active"}
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:43:14
+   |
+42 | data = {"status": "active"}
+43 | logging.info(f"Processing {len(data)} items")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:44:14
+   |
+42 | data = {"status": "active"}
+43 | logging.info(f"Processing {len(data)} items")
+44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:48:14
+   |
+47 | result = 123
+48 | logging.info(f"Calculated result: {result + 100}")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+49 |
+50 | temperature = 123
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:51:14
+   |
+50 | temperature = 123
+51 | logging.info(f"Temperature: {temperature:.1f}°C")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+52 |
+53 | class FilePath:
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:57:14
+   |
+55 |         self.name = name
+56 |
+57 | logging.info(f"No changes made to {file_path.name}.")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+58 |
+59 | user = "tron"
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:61:15
+   |
+59 | user = "tron"
+60 | balance = 123.45
+61 | logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+62 |
+63 | import logging
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:66:15
+   |
+65 | x = 1
+66 | logging.error(f"{x} -> %s", x)
+   |               ^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004_arg_order.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004_arg_order.py.snap
new file mode 100644
index 0000000000..cb976e768a
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004_arg_order.py.snap
@@ -0,0 +1,23 @@
+---
+source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+---
+G004 Logging statement uses f-string
+  --> G004_arg_order.py:9:14
+   |
+ 7 | X = 1
+ 8 | Y = 2
+ 9 | logger.error(f"{X} -> %s", Y)
+   |              ^^^^^^^^^^^^
+10 | logger.error(f"{Y} -> %s", X)
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004_arg_order.py:10:14
+   |
+ 8 | Y = 2
+ 9 | logger.error(f"{X} -> %s", Y)
+10 | logger.error(f"{Y} -> %s", X)
+   |              ^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004_implicit_concat.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004_implicit_concat.py.snap
new file mode 100644
index 0000000000..d12abeb8be
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G004_implicit_concat.py.snap
@@ -0,0 +1,35 @@
+---
+source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+assertion_line: 50
+---
+G004 Logging statement uses f-string
+ --> G004_implicit_concat.py:6:10
+  |
+5 | log = logging.getLogger(__name__)
+6 | log.info(f"a" f"b {variablename}")
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^
+7 | log.info("a " f"b {variablename}")
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+  |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+ --> G004_implicit_concat.py:7:10
+  |
+5 | log = logging.getLogger(__name__)
+6 | log.info(f"a" f"b {variablename}")
+7 | log.info("a " f"b {variablename}")
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+  |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+ --> G004_implicit_concat.py:8:10
+  |
+6 | log.info(f"a" f"b {variablename}")
+7 | log.info("a " f"b {variablename}")
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+help: Convert to lazy `%` formatting
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap
index af3076efbd..9dde1ed37a 100644
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap
@@ -12,16 +12,14 @@ G010 [*] Logging statement uses `warn` instead of `warning`
 8 | logger.warn("Hello world!")
   |
 help: Convert to `warning`
-
-ℹ Safe fix
-3 3 | 
-4 4 | from logging_setup import logger
-5 5 | 
-6   |-logging.warn("Hello World!")
-  6 |+logging.warning("Hello World!")
-7 7 | log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
-8 8 | logger.warn("Hello world!")
-9 9 | 
+3 | 
+4 | from logging_setup import logger
+5 | 
+  - logging.warn("Hello World!")
+6 + logging.warning("Hello World!")
+7 | log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
+8 | logger.warn("Hello world!")
+9 | 
 
 G010 [*] Logging statement uses `warn` instead of `warning`
   --> G010.py:8:8
@@ -34,16 +32,14 @@ G010 [*] Logging statement uses `warn` instead of `warning`
 10 | logging . warn("Hello World!")
    |
 help: Convert to `warning`
-
-ℹ Safe fix
-5 5 | 
-6 6 | logging.warn("Hello World!")
-7 7 | log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
-8   |-logger.warn("Hello world!")
-  8 |+logger.warning("Hello world!")
-9 9 | 
-10 10 | logging . warn("Hello World!")
-11 11 | 
+5  | 
+6  | logging.warn("Hello World!")
+7  | log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
+   - logger.warn("Hello world!")
+8  + logger.warning("Hello world!")
+9  | 
+10 | logging . warn("Hello World!")
+11 | 
 
 G010 [*] Logging statement uses `warn` instead of `warning`
   --> G010.py:10:11
@@ -56,16 +52,14 @@ G010 [*] Logging statement uses `warn` instead of `warning`
 12 | from logging import warn, warning, exception
    |
 help: Convert to `warning`
-
-ℹ Safe fix
-7  7  | log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
-8  8  | logger.warn("Hello world!")
-9  9  | 
-10    |-logging . warn("Hello World!")
-   10 |+logging . warning("Hello World!")
-11 11 | 
-12 12 | from logging import warn, warning, exception
-13 13 | warn("foo")
+7  | log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
+8  | logger.warn("Hello world!")
+9  | 
+   - logging . warn("Hello World!")
+10 + logging . warning("Hello World!")
+11 | 
+12 | from logging import warn, warning, exception
+13 | warn("foo")
 
 G010 [*] Logging statement uses `warn` instead of `warning`
   --> G010.py:13:1
@@ -77,12 +71,10 @@ G010 [*] Logging statement uses `warn` instead of `warning`
 15 | exception("foo")
    |
 help: Convert to `warning`
-
-ℹ Safe fix
-10 10 | logging . warn("Hello World!")
-11 11 | 
-12 12 | from logging import warn, warning, exception
-13    |-warn("foo")
-14 13 | warning("foo")
-   14 |+warning("foo")
-15 15 | exception("foo")
+10 | logging . warn("Hello World!")
+11 | 
+12 | from logging import warn, warning, exception
+   - warn("foo")
+13 | warning("foo")
+14 + warning("foo")
+15 | exception("foo")
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap
new file mode 100644
index 0000000000..92a9ff3139
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap
@@ -0,0 +1,277 @@
+---
+source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+---
+G004 [*] Logging statement uses f-string
+ --> G004.py:4:14
+  |
+3 | name = "world"
+4 | logging.info(f"Hello {name}")
+  |              ^^^^^^^^^^^^^^^
+5 | logging.log(logging.INFO, f"Hello {name}")
+  |
+help: Convert to lazy `%` formatting
+1 | import logging
+2 | 
+3 | name = "world"
+  - logging.info(f"Hello {name}")
+4 + logging.info("Hello %s", name)
+5 | logging.log(logging.INFO, f"Hello {name}")
+6 | 
+7 | _LOGGER = logging.getLogger()
+
+G004 [*] Logging statement uses f-string
+ --> G004.py:5:27
+  |
+3 | name = "world"
+4 | logging.info(f"Hello {name}")
+5 | logging.log(logging.INFO, f"Hello {name}")
+  |                           ^^^^^^^^^^^^^^^
+6 |
+7 | _LOGGER = logging.getLogger()
+  |
+help: Convert to lazy `%` formatting
+2 | 
+3 | name = "world"
+4 | logging.info(f"Hello {name}")
+  - logging.log(logging.INFO, f"Hello {name}")
+5 + logging.log(logging.INFO, "Hello %s", name)
+6 | 
+7 | _LOGGER = logging.getLogger()
+8 | _LOGGER.info(f"{__name__}")
+
+G004 [*] Logging statement uses f-string
+  --> G004.py:8:14
+   |
+ 7 | _LOGGER = logging.getLogger()
+ 8 | _LOGGER.info(f"{__name__}")
+   |              ^^^^^^^^^^^^^
+ 9 |
+10 | logging.getLogger().info(f"{name}")
+   |
+help: Convert to lazy `%` formatting
+5  | logging.log(logging.INFO, f"Hello {name}")
+6  | 
+7  | _LOGGER = logging.getLogger()
+   - _LOGGER.info(f"{__name__}")
+8  + _LOGGER.info("%s", __name__)
+9  | 
+10 | logging.getLogger().info(f"{name}")
+11 | 
+
+G004 [*] Logging statement uses f-string
+  --> G004.py:10:26
+   |
+ 8 | _LOGGER.info(f"{__name__}")
+ 9 |
+10 | logging.getLogger().info(f"{name}")
+   |                          ^^^^^^^^^
+11 |
+12 | from logging import info
+   |
+help: Convert to lazy `%` formatting
+7  | _LOGGER = logging.getLogger()
+8  | _LOGGER.info(f"{__name__}")
+9  | 
+   - logging.getLogger().info(f"{name}")
+10 + logging.getLogger().info("%s", name)
+11 | 
+12 | from logging import info
+13 | 
+
+G004 [*] Logging statement uses f-string
+  --> G004.py:14:6
+   |
+12 | from logging import info
+13 |
+14 | info(f"{name}")
+   |      ^^^^^^^^^
+15 | info(f"{__name__}")
+   |
+help: Convert to lazy `%` formatting
+11 | 
+12 | from logging import info
+13 | 
+   - info(f"{name}")
+14 + info("%s", name)
+15 | info(f"{__name__}")
+16 | 
+17 | # Don't trigger for t-strings
+
+G004 [*] Logging statement uses f-string
+  --> G004.py:15:6
+   |
+14 | info(f"{name}")
+15 | info(f"{__name__}")
+   |      ^^^^^^^^^^^^^
+16 |
+17 | # Don't trigger for t-strings
+   |
+help: Convert to lazy `%` formatting
+12 | from logging import info
+13 | 
+14 | info(f"{name}")
+   - info(f"{__name__}")
+15 + info("%s", __name__)
+16 | 
+17 | # Don't trigger for t-strings
+18 | info(t"{name}")
+
+G004 [*] Logging statement uses f-string
+  --> G004.py:24:14
+   |
+22 | total = 9
+23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
+24 | logging.info(f"{count} out of {total} files in {directory_path} checked")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
+21 | count = 5
+22 | total = 9
+23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
+   - logging.info(f"{count} out of {total} files in {directory_path} checked")
+24 + logging.info("%s out of %s files in %s checked", count, total, directory_path)
+25 | 
+26 | 
+27 | 
+
+G004 Logging statement uses f-string
+  --> G004.py:30:13
+   |
+28 | x = 99
+29 | fmt = "08d"
+30 | logger.info(f"{x:{'08d'}}")
+   |             ^^^^^^^^^^^^^^
+31 | logger.info(f"{x:>10} {x:{fmt}}")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:31:13
+   |
+29 | fmt = "08d"
+30 | logger.info(f"{x:{'08d'}}")
+31 | logger.info(f"{x:>10} {x:{fmt}}")
+   |             ^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | logging.info(f"")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:33:14
+   |
+31 | logger.info(f"{x:>10} {x:{fmt}}")
+32 |
+33 | logging.info(f"")
+   |              ^^^
+34 | logging.info(f"This message doesn't have any variables.")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:34:14
+   |
+33 | logging.info(f"")
+34 | logging.info(f"This message doesn't have any variables.")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+35 |
+36 | obj = {"key": "value"}
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:37:14
+   |
+36 | obj = {"key": "value"}
+37 | logging.info(f"Object: {obj!r}")
+   |              ^^^^^^^^^^^^^^^^^^
+38 |
+39 | items_count = 3
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:40:17
+   |
+39 | items_count = 3
+40 | logging.warning(f"Items: {items_count:d}")
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^
+41 |
+42 | data = {"status": "active"}
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:43:14
+   |
+42 | data = {"status": "active"}
+43 | logging.info(f"Processing {len(data)} items")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:44:14
+   |
+42 | data = {"status": "active"}
+43 | logging.info(f"Processing {len(data)} items")
+44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:48:14
+   |
+47 | result = 123
+48 | logging.info(f"Calculated result: {result + 100}")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+49 |
+50 | temperature = 123
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:51:14
+   |
+50 | temperature = 123
+51 | logging.info(f"Temperature: {temperature:.1f}°C")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+52 |
+53 | class FilePath:
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:57:14
+   |
+55 |         self.name = name
+56 |
+57 | logging.info(f"No changes made to {file_path.name}.")
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+58 |
+59 | user = "tron"
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:61:15
+   |
+59 | user = "tron"
+60 | balance = 123.45
+61 | logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+62 |
+63 | import logging
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004.py:66:15
+   |
+65 | x = 1
+66 | logging.error(f"{x} -> %s", x)
+   |               ^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004_arg_order.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004_arg_order.py.snap
new file mode 100644
index 0000000000..cb976e768a
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004_arg_order.py.snap
@@ -0,0 +1,23 @@
+---
+source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+---
+G004 Logging statement uses f-string
+  --> G004_arg_order.py:9:14
+   |
+ 7 | X = 1
+ 8 | Y = 2
+ 9 | logger.error(f"{X} -> %s", Y)
+   |              ^^^^^^^^^^^^
+10 | logger.error(f"{Y} -> %s", X)
+   |
+help: Convert to lazy `%` formatting
+
+G004 Logging statement uses f-string
+  --> G004_arg_order.py:10:14
+   |
+ 8 | Y = 2
+ 9 | logger.error(f"{X} -> %s", Y)
+10 | logger.error(f"{Y} -> %s", X)
+   |              ^^^^^^^^^^^^
+   |
+help: Convert to lazy `%` formatting
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004_implicit_concat.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004_implicit_concat.py.snap
new file mode 100644
index 0000000000..8d0f79f8e5
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004_implicit_concat.py.snap
@@ -0,0 +1,53 @@
+---
+source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+assertion_line: 71
+---
+G004 [*] Logging statement uses f-string
+ --> G004_implicit_concat.py:6:10
+  |
+5 | log = logging.getLogger(__name__)
+6 | log.info(f"a" f"b {variablename}")
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^
+7 | log.info("a " f"b {variablename}")
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+  |
+help: Convert to lazy `%` formatting
+3 | variablename = "value"
+4 | 
+5 | log = logging.getLogger(__name__)
+  - log.info(f"a" f"b {variablename}")
+6 + log.info("ab %s", variablename)
+7 | log.info("a " f"b {variablename}")
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+
+G004 [*] Logging statement uses f-string
+ --> G004_implicit_concat.py:7:10
+  |
+5 | log = logging.getLogger(__name__)
+6 | log.info(f"a" f"b {variablename}")
+7 | log.info("a " f"b {variablename}")
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+  |
+help: Convert to lazy `%` formatting
+4 | 
+5 | log = logging.getLogger(__name__)
+6 | log.info(f"a" f"b {variablename}")
+  - log.info("a " f"b {variablename}")
+7 + log.info("a b %s", variablename)
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+
+G004 [*] Logging statement uses f-string
+ --> G004_implicit_concat.py:8:10
+  |
+6 | log.info(f"a" f"b {variablename}")
+7 | log.info("a " f"b {variablename}")
+8 | log.info("prefix " f"middle {variablename}" f" suffix")
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+help: Convert to lazy `%` formatting
+5 | log = logging.getLogger(__name__)
+6 | log.info(f"a" f"b {variablename}")
+7 | log.info("a " f"b {variablename}")
+  - log.info("prefix " f"middle {variablename}" f" suffix")
+8 + log.info("prefix middle %s suffix", variablename)
diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/violations.rs b/crates/ruff_linter/src/rules/flake8_logging_format/violations.rs
index 51cc9f436f..9a2c378e57 100644
--- a/crates/ruff_linter/src/rules/flake8_logging_format/violations.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/violations.rs
@@ -75,6 +75,7 @@ use crate::{AlwaysFixableViolation, Violation};
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
 /// - [Python documentation: Optimization](https://docs.python.org/3/howto/logging.html#optimization)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingStringFormat;
 
 impl Violation for LoggingStringFormat {
@@ -159,6 +160,7 @@ impl Violation for LoggingStringFormat {
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
 /// - [Python documentation: Optimization](https://docs.python.org/3/howto/logging.html#optimization)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingPercentFormat;
 
 impl Violation for LoggingPercentFormat {
@@ -242,6 +244,7 @@ impl Violation for LoggingPercentFormat {
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
 /// - [Python documentation: Optimization](https://docs.python.org/3/howto/logging.html#optimization)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingStringConcat;
 
 impl Violation for LoggingStringConcat {
@@ -324,13 +327,20 @@ impl Violation for LoggingStringConcat {
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
 /// - [Python documentation: Optimization](https://docs.python.org/3/howto/logging.html#optimization)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingFString;
 
 impl Violation for LoggingFString {
+    const FIX_AVAILABILITY: crate::FixAvailability = crate::FixAvailability::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         "Logging statement uses f-string".to_string()
     }
+
+    fn fix_title(&self) -> Option<String> {
+        Some("Convert to lazy `%` formatting".to_string())
+    }
 }
 
 /// ## What it does
@@ -375,6 +385,7 @@ impl Violation for LoggingFString {
 /// - [Python documentation: `logging.warning`](https://docs.python.org/3/library/logging.html#logging.warning)
 /// - [Python documentation: `logging.Logger.warning`](https://docs.python.org/3/library/logging.html#logging.Logger.warning)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingWarn;
 
 impl AlwaysFixableViolation for LoggingWarn {
@@ -442,6 +453,7 @@ impl AlwaysFixableViolation for LoggingWarn {
 /// ## References
 /// - [Python documentation: LogRecord attributes](https://docs.python.org/3/library/logging.html#logrecord-attributes)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingExtraAttrClash(pub String);
 
 impl Violation for LoggingExtraAttrClash {
@@ -504,6 +516,7 @@ impl Violation for LoggingExtraAttrClash {
 /// - [Python documentation: `logging.error`](https://docs.python.org/3/library/logging.html#logging.error)
 /// - [Python documentation: `error`](https://docs.python.org/3/library/logging.html#logging.Logger.error)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingExcInfo;
 
 impl Violation for LoggingExcInfo {
@@ -566,6 +579,7 @@ impl Violation for LoggingExcInfo {
 /// - [Python documentation: `logging.error`](https://docs.python.org/3/library/logging.html#logging.error)
 /// - [Python documentation: `error`](https://docs.python.org/3/library/logging.html#logging.Logger.error)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct LoggingRedundantExcInfo;
 
 impl Violation for LoggingRedundantExcInfo {
diff --git a/crates/ruff_linter/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs b/crates/ruff_linter/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs
index 0e78057e95..92a7a211cc 100644
--- a/crates/ruff_linter/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs
+++ b/crates/ruff_linter/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs
@@ -32,6 +32,7 @@ use crate::package::PackageRoot;
 /// ## Options
 /// - `namespace-packages`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.225")]
 pub(crate) struct ImplicitNamespacePackage {
     filename: String,
     parent: Option<String>,
@@ -71,6 +72,8 @@ pub(crate) fn implicit_namespace_package(
     if package.is_none()
         // Ignore non-`.py` files, which don't require an `__init__.py`.
         && PySourceType::try_from_path(path).is_some_and(PySourceType::is_py_file)
+        // Ignore `.pyw` files that are also PySourceType::Python but aren't importable namespaces
+        && path.extension().is_some_and(|ext| ext == "py")
         // Ignore any files that are direct children of the project root.
         && path
             .parent()
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs
index 7049a2814d..ed6777c0d4 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs
@@ -35,6 +35,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// This fix is always marked as unsafe since we cannot know
 /// for certain which assignment was intended.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct DuplicateClassFieldDefinition {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
index 27c0868332..e39693d754 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
@@ -49,6 +49,7 @@ use crate::{Edit, Fix};
 /// - [Python documentation: `str.startswith`](https://docs.python.org/3/library/stdtypes.html#str.startswith)
 /// - [Python documentation: `str.endswith`](https://docs.python.org/3/library/stdtypes.html#str.endswith)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.243")]
 pub(crate) struct MultipleStartsEndsWith {
     attr: String,
 }
@@ -178,21 +179,21 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) {
                     .collect(),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 parenthesized: true,
             });
             let node1 = Expr::Name(ast::ExprName {
                 id: arg_name.into(),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let node2 = Expr::Attribute(ast::ExprAttribute {
                 value: Box::new(node1),
                 attr: Identifier::new(attr_name.to_string(), TextRange::default()),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let node3 = Expr::Call(ast::ExprCall {
                 func: Box::new(node2),
@@ -200,10 +201,10 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) {
                     args: Box::from([node]),
                     keywords: Box::from([]),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 },
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let call = node3;
 
@@ -223,7 +224,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) {
                     })
                     .collect(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let bool_op = node;
             diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/non_unique_enums.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/non_unique_enums.rs
index 21464f148f..c36234283b 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/non_unique_enums.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/non_unique_enums.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `enum.Enum`](https://docs.python.org/3/library/enum.html#enum.Enum)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.224")]
 pub(crate) struct NonUniqueEnums {
     value: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_container_builtin.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_container_builtin.rs
index ad817929c9..4de59dd383 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_container_builtin.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_container_builtin.rs
@@ -38,6 +38,7 @@ use crate::{FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `list`](https://docs.python.org/3/library/functions.html#func-list)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct ReimplementedContainerBuiltin {
     container: Container,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
index 09bf37474c..cc436d258a 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
@@ -70,6 +70,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: Dictionary displays](https://docs.python.org/3/reference/expressions.html#dictionary-displays)
 /// - [Python documentation: Calls](https://docs.python.org/3/reference/expressions.html#calls)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct UnnecessaryDictKwargs;
 
 impl Violation for UnnecessaryDictKwargs {
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_placeholder.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_placeholder.rs
index 1a64d0f971..3d446f68b0 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_placeholder.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_placeholder.rs
@@ -59,6 +59,7 @@ use crate::{Edit, Fix};
 /// ## References
 /// - [Python documentation: The `pass` statement](https://docs.python.org/3/reference/simple_stmts.html#the-pass-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct UnnecessaryPlaceholder {
     kind: Placeholder,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_range_start.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_range_start.rs
index 5c9d4c4be6..6e6b10b206 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_range_start.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_range_start.rs
@@ -27,6 +27,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## References
 /// - [Python documentation: `range`](https://docs.python.org/3/library/stdtypes.html#range)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.286")]
 pub(crate) struct UnnecessaryRangeStart;
 
 impl AlwaysFixableViolation for UnnecessaryRangeStart {
diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_spread.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_spread.rs
index b5aefbfa5e..4b99f4e887 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_spread.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_spread.rs
@@ -28,6 +28,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Dictionary displays](https://docs.python.org/3/reference/expressions.html#dictionary-displays)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct UnnecessarySpread;
 
 impl Violation for UnnecessarySpread {
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap
index 69d5e5041f..4fd56fcdf0 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap
@@ -10,15 +10,13 @@ PIE790 [*] Unnecessary `pass` statement
   |     ^^^^
   |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-1 1 | class Foo:
-2 2 |     """buzz"""
-3 3 | 
-4   |-    pass
-5 4 | 
-6 5 | 
-7 6 | if foo:
+1 | class Foo:
+2 |     """buzz"""
+3 | 
+  -     pass
+4 | 
+5 | 
+6 | if foo:
 
 PIE790 [*] Unnecessary `pass` statement
  --> PIE790.py:9:5
@@ -29,15 +27,13 @@ PIE790 [*] Unnecessary `pass` statement
   |     ^^^^
   |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-6  6  | 
-7  7  | if foo:
-8  8  |     """foo"""
-9     |-    pass
-10 9  | 
-11 10 | 
-12 11 | def multi_statement() -> None:
+6  | 
+7  | if foo:
+8  |     """foo"""
+   -     pass
+9  | 
+10 | 
+11 | def multi_statement() -> None:
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:14:5
@@ -48,16 +44,14 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-11 11 | 
-12 12 | def multi_statement() -> None:
-13 13 |     """This is a function."""
-14    |-    pass; print("hello")
-   14 |+    print("hello")
-15 15 | 
-16 16 | 
-17 17 | if foo:
+11 | 
+12 | def multi_statement() -> None:
+13 |     """This is a function."""
+   -     pass; print("hello")
+14 +     print("hello")
+15 | 
+16 | 
+17 | if foo:
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:21:5
@@ -68,15 +62,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-18 18 |     pass
-19 19 | else:
-20 20 |     """bar"""
-21    |-    pass
-22 21 | 
-23 22 | 
-24 23 | while True:
+18 |     pass
+19 | else:
+20 |     """bar"""
+   -     pass
+21 | 
+22 | 
+23 | while True:
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:28:5
@@ -87,15 +79,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-25 25 |     pass
-26 26 | else:
-27 27 |     """bar"""
-28    |-    pass
-29 28 | 
-30 29 | 
-31 30 | for _ in range(10):
+25 |     pass
+26 | else:
+27 |     """bar"""
+   -     pass
+28 | 
+29 | 
+30 | for _ in range(10):
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:35:5
@@ -106,15 +96,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-32 32 |     pass
-33 33 | else:
-34 34 |     """bar"""
-35    |-    pass
-36 35 | 
-37 36 | 
-38 37 | async for _ in range(10):
+32 |     pass
+33 | else:
+34 |     """bar"""
+   -     pass
+35 | 
+36 | 
+37 | async for _ in range(10):
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:42:5
@@ -125,15 +113,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-39 39 |     pass
-40 40 | else:
-41 41 |     """bar"""
-42    |-    pass
-43 42 | 
-44 43 | 
-45 44 | def foo() -> None:
+39 |     pass
+40 | else:
+41 |     """bar"""
+   -     pass
+42 | 
+43 | 
+44 | def foo() -> None:
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:50:5
@@ -144,15 +130,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-47 47 |     buzz
-48 48 |     """
-49 49 | 
-50    |-    pass
-51 50 | 
-52 51 | 
-53 52 | async def foo():
+47 |     buzz
+48 |     """
+49 | 
+   -     pass
+50 | 
+51 | 
+52 | async def foo():
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:58:5
@@ -163,15 +147,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-55 55 |     buzz
-56 56 |     """
-57 57 | 
-58    |-    pass
-59 58 | 
-60 59 | 
-61 60 | try:
+55 |     buzz
+56 |     """
+57 | 
+   -     pass
+58 | 
+59 | 
+60 | try:
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:65:5
@@ -184,15 +166,13 @@ PIE790 [*] Unnecessary `pass` statement
 67 |     pass
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-62 62 |     """
-63 63 |     buzz
-64 64 |     """
-65    |-    pass
-66 65 | except ValueError:
-67 66 |     pass
-68 67 | 
+62 |     """
+63 |     buzz
+64 |     """
+   -     pass
+65 | except ValueError:
+66 |     pass
+67 | 
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:74:5
@@ -203,15 +183,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-71 71 |     bar()
-72 72 | except ValueError:
-73 73 |     """bar"""
-74    |-    pass
-75 74 | 
-76 75 | 
-77 76 | for _ in range(10):
+71 |     bar()
+72 | except ValueError:
+73 |     """bar"""
+   -     pass
+74 | 
+75 | 
+76 | for _ in range(10):
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:79:5
@@ -224,15 +202,13 @@ PIE790 [*] Unnecessary `pass` statement
 81 | async for _ in range(10):
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-76 76 | 
-77 77 | for _ in range(10):
-78 78 |     """buzz"""
-79    |-    pass
-80 79 | 
-81 80 | async for _ in range(10):
-82 81 |     """buzz"""
+76 | 
+77 | for _ in range(10):
+78 |     """buzz"""
+   -     pass
+79 | 
+80 | async for _ in range(10):
+81 |     """buzz"""
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:83:5
@@ -245,15 +221,13 @@ PIE790 [*] Unnecessary `pass` statement
 85 | while cond:
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-80 80 | 
-81 81 | async for _ in range(10):
-82 82 |     """buzz"""
-83    |-    pass
-84 83 | 
-85 84 | while cond:
-86 85 |     """buzz"""
+80 | 
+81 | async for _ in range(10):
+82 |     """buzz"""
+   -     pass
+83 | 
+84 | while cond:
+85 |     """buzz"""
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:87:5
@@ -264,15 +238,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-84 84 | 
-85 85 | while cond:
-86 86 |     """buzz"""
-87    |-    pass
-88 87 | 
-89 88 | 
-90 89 | with bar:
+84 | 
+85 | while cond:
+86 |     """buzz"""
+   -     pass
+87 | 
+88 | 
+89 | with bar:
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:92:5
@@ -285,15 +257,13 @@ PIE790 [*] Unnecessary `pass` statement
 94 | async with bar:
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-89 89 | 
-90 90 | with bar:
-91 91 |     """buzz"""
-92    |-    pass
-93 92 | 
-94 93 | async with bar:
-95 94 |     """buzz"""
+89 | 
+90 | with bar:
+91 |     """buzz"""
+   -     pass
+92 | 
+93 | async with bar:
+94 |     """buzz"""
 
 PIE790 [*] Unnecessary `pass` statement
   --> PIE790.py:96:5
@@ -304,15 +274,13 @@ PIE790 [*] Unnecessary `pass` statement
    |     ^^^^
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-93 93 | 
-94 94 | async with bar:
-95 95 |     """buzz"""
-96    |-    pass
-97 96 | 
-98 97 | 
-99 98 | def foo() -> None:
+93 | 
+94 | async with bar:
+95 |     """buzz"""
+   -     pass
+96 | 
+97 | 
+98 | def foo() -> None:
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:101:5
@@ -323,16 +291,14 @@ PIE790 [*] Unnecessary `pass` statement
     |     ^^^^
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-98  98  | 
-99  99  | def foo() -> None:
-100 100 |     """buzz"""
-101     |-    pass  # bar
-    101 |+    # bar
-102 102 | 
-103 103 | 
-104 104 | class Foo:
+98  | 
+99  | def foo() -> None:
+100 |     """buzz"""
+    -     pass  # bar
+101 +     # bar
+102 | 
+103 | 
+104 | class Foo:
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:130:5
@@ -343,15 +309,13 @@ PIE790 [*] Unnecessary `pass` statement
     |     ^^^^
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-127 127 | 
-128 128 | def foo():
-129 129 |     print("foo")
-130     |-    pass
-131 130 | 
-132 131 | 
-133 132 | def foo():
+127 | 
+128 | def foo():
+129 |     print("foo")
+    -     pass
+130 | 
+131 | 
+132 | def foo():
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:136:5
@@ -362,15 +326,13 @@ PIE790 [*] Unnecessary `pass` statement
     |     ^^^^
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-133 133 | def foo():
-134 134 |     """A docstring."""
-135 135 |     print("foo")
-136     |-    pass
-137 136 | 
-138 137 | 
-139 138 | for i in range(10):
+133 | def foo():
+134 |     """A docstring."""
+135 |     print("foo")
+    -     pass
+136 | 
+137 | 
+138 | for i in range(10):
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:140:5
@@ -381,15 +343,13 @@ PIE790 [*] Unnecessary `pass` statement
 141 |     pass
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-138 138 | 
-139 139 | for i in range(10):
-140 140 |     pass
-141     |-    pass
-142 141 | 
-143 142 | for i in range(10):
-144 143 |     pass
+138 | 
+139 | for i in range(10):
+140 |     pass
+    -     pass
+141 | 
+142 | for i in range(10):
+143 |     pass
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:141:5
@@ -402,15 +362,13 @@ PIE790 [*] Unnecessary `pass` statement
 143 | for i in range(10):
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-138 138 | 
-139 139 | for i in range(10):
-140 140 |     pass
-141     |-    pass
-142 141 | 
-143 142 | for i in range(10):
-144 143 |     pass
+138 | 
+139 | for i in range(10):
+140 |     pass
+    -     pass
+141 | 
+142 | for i in range(10):
+143 |     pass
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:144:5
@@ -422,15 +380,13 @@ PIE790 [*] Unnecessary `pass` statement
 146 |     pass
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-141 141 |     pass
-142 142 | 
-143 143 | for i in range(10):
-144     |-    pass
-145 144 | 
-146 145 |     pass
-147 146 | 
+141 |     pass
+142 | 
+143 | for i in range(10):
+    -     pass
+144 | 
+145 |     pass
+146 | 
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:146:5
@@ -443,15 +399,13 @@ PIE790 [*] Unnecessary `pass` statement
 148 | for i in range(10):
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-143 143 | for i in range(10):
-144 144 |     pass
-145 145 | 
-146     |-    pass
-147 146 | 
-148 147 | for i in range(10):
-149 148 |     pass  # comment
+143 | for i in range(10):
+144 |     pass
+145 | 
+    -     pass
+146 | 
+147 | for i in range(10):
+148 |     pass  # comment
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:149:5
@@ -462,16 +416,14 @@ PIE790 [*] Unnecessary `pass` statement
 150 |     pass
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-146 146 |     pass
-147 147 | 
-148 148 | for i in range(10):
-149     |-    pass  # comment
-    149 |+    # comment
-150 150 |     pass
-151 151 | 
-152 152 | 
+146 |     pass
+147 | 
+148 | for i in range(10):
+    -     pass  # comment
+149 +     # comment
+150 |     pass
+151 | 
+152 | 
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:150:5
@@ -482,15 +434,13 @@ PIE790 [*] Unnecessary `pass` statement
     |     ^^^^
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-147 147 | 
-148 148 | for i in range(10):
-149 149 |     pass  # comment
-150     |-    pass
-151 150 | 
-152 151 | 
-153 152 | def foo():
+147 | 
+148 | for i in range(10):
+149 |     pass  # comment
+    -     pass
+150 | 
+151 | 
+152 | def foo():
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:155:5
@@ -501,15 +451,13 @@ PIE790 [*] Unnecessary `...` literal
     |     ^^^
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-152 152 | 
-153 153 | def foo():
-154 154 |     print("foo")
-155     |-    ...
-156 155 | 
-157 156 | 
-158 157 | def foo():
+152 | 
+153 | def foo():
+154 |     print("foo")
+    -     ...
+155 | 
+156 | 
+157 | def foo():
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:161:5
@@ -520,15 +468,13 @@ PIE790 [*] Unnecessary `...` literal
     |     ^^^
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-158 158 | def foo():
-159 159 |     """A docstring."""
-160 160 |     print("foo")
-161     |-    ...
-162 161 | 
-163 162 | 
-164 163 | for i in range(10):
+158 | def foo():
+159 |     """A docstring."""
+160 |     print("foo")
+    -     ...
+161 | 
+162 | 
+163 | for i in range(10):
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:165:5
@@ -539,15 +485,13 @@ PIE790 [*] Unnecessary `...` literal
 166 |     ...
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-163 163 | 
-164 164 | for i in range(10):
-165 165 |     ...
-166     |-    ...
-167 166 | 
-168 167 | for i in range(10):
-169 168 |     ...
+163 | 
+164 | for i in range(10):
+165 |     ...
+    -     ...
+166 | 
+167 | for i in range(10):
+168 |     ...
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:166:5
@@ -560,15 +504,13 @@ PIE790 [*] Unnecessary `...` literal
 168 | for i in range(10):
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-163 163 | 
-164 164 | for i in range(10):
-165 165 |     ...
-166     |-    ...
-167 166 | 
-168 167 | for i in range(10):
-169 168 |     ...
+163 | 
+164 | for i in range(10):
+165 |     ...
+    -     ...
+166 | 
+167 | for i in range(10):
+168 |     ...
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:169:5
@@ -580,15 +522,13 @@ PIE790 [*] Unnecessary `...` literal
 171 |     ...
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-166 166 |     ...
-167 167 | 
-168 168 | for i in range(10):
-169     |-    ...
-170 169 | 
-171 170 |     ...
-172 171 | 
+166 |     ...
+167 | 
+168 | for i in range(10):
+    -     ...
+169 | 
+170 |     ...
+171 | 
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:171:5
@@ -601,15 +541,13 @@ PIE790 [*] Unnecessary `...` literal
 173 | for i in range(10):
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-168 168 | for i in range(10):
-169 169 |     ...
-170 170 | 
-171     |-    ...
-172 171 | 
-173 172 | for i in range(10):
-174 173 |     ...  # comment
+168 | for i in range(10):
+169 |     ...
+170 | 
+    -     ...
+171 | 
+172 | for i in range(10):
+173 |     ...  # comment
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:174:5
@@ -620,16 +558,14 @@ PIE790 [*] Unnecessary `...` literal
 175 |     ...
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-171 171 |     ...
-172 172 | 
-173 173 | for i in range(10):
-174     |-    ...  # comment
-    174 |+    # comment
-175 175 |     ...
-176 176 | 
-177 177 | for i in range(10):
+171 |     ...
+172 | 
+173 | for i in range(10):
+    -     ...  # comment
+174 +     # comment
+175 |     ...
+176 | 
+177 | for i in range(10):
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:175:5
@@ -642,15 +578,13 @@ PIE790 [*] Unnecessary `...` literal
 177 | for i in range(10):
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-172 172 | 
-173 173 | for i in range(10):
-174 174 |     ...  # comment
-175     |-    ...
-176 175 | 
-177 176 | for i in range(10):
-178 177 |     ...
+172 | 
+173 | for i in range(10):
+174 |     ...  # comment
+    -     ...
+175 | 
+176 | for i in range(10):
+177 |     ...
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:178:5
@@ -661,15 +595,13 @@ PIE790 [*] Unnecessary `...` literal
 179 |     pass
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-175 175 |     ...
-176 176 | 
-177 177 | for i in range(10):
-178     |-    ...
-179 178 |     pass
-180 179 | 
-181 180 | from typing import Protocol
+175 |     ...
+176 | 
+177 | for i in range(10):
+    -     ...
+178 |     pass
+179 | 
+180 | from typing import Protocol
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:179:5
@@ -682,15 +614,13 @@ PIE790 [*] Unnecessary `pass` statement
 181 | from typing import Protocol
     |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-176 176 | 
-177 177 | for i in range(10):
-178 178 |     ...
-179     |-    pass
-180 179 | 
-181 180 | from typing import Protocol
-182 181 | 
+176 | 
+177 | for i in range(10):
+178 |     ...
+    -     pass
+179 | 
+180 | from typing import Protocol
+181 | 
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:209:9
@@ -701,15 +631,13 @@ PIE790 [*] Unnecessary `...` literal
     |         ^^^
     |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-206 206 | 
-207 207 |     def stub(self) -> str:
-208 208 |         """Docstring"""
-209     |-        ...
-210 209 | 
-211 210 | 
-212 211 | class Repro(Protocol[int]):
+206 | 
+207 |     def stub(self) -> str:
+208 |         """Docstring"""
+    -         ...
+209 | 
+210 | 
+211 | class Repro(Protocol[int]):
 
 PIE790 [*] Unnecessary `pass` statement
    --> PIE790.py:241:5
@@ -722,15 +650,14 @@ PIE790 [*] Unnecessary `pass` statement
 243 |     Lorem ipsum dolor sit amet.
     |
 help: Remove unnecessary `pass`
-
-ℹ Unsafe fix
-238 238 | 
-239 239 | # https://github.com/astral-sh/ruff/issues/12616
-240 240 | class PotentialDocstring1:
-241     |-    pass
-242 241 |     """
-243 242 |     Lorem ipsum dolor sit amet.
-244 243 |     """
+238 | 
+239 | # https://github.com/astral-sh/ruff/issues/12616
+240 | class PotentialDocstring1:
+    -     pass
+241 |     """
+242 |     Lorem ipsum dolor sit amet.
+243 |     """
+note: This is an unsafe fix and may change runtime behavior
 
 PIE790 [*] Unnecessary `...` literal
    --> PIE790.py:248:5
@@ -741,10 +668,9 @@ PIE790 [*] Unnecessary `...` literal
 249 |     'Lorem ipsum dolor sit amet.'
     |
 help: Remove unnecessary `...`
-
-ℹ Unsafe fix
-245 245 | 
-246 246 | 
-247 247 | class PotentialDocstring2:
-248     |-    ...
-249 248 |     'Lorem ipsum dolor sit amet.'
+245 | 
+246 | 
+247 | class PotentialDocstring2:
+    -     ...
+248 |     'Lorem ipsum dolor sit amet.'
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap
index 0988b138f7..3a8a341d46 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap
@@ -12,15 +12,14 @@ PIE794 [*] Class field `name` is defined multiple times
 6 |     def remove(self) -> None:
   |
 help: Remove duplicate field definition for `name`
-
-ℹ Unsafe fix
-1 1 | class Foo(BaseModel):
-2 2 |     name = StringField()
-3 3 |     # ....
-4   |-    name = StringField()  # PIE794
-5 4 | 
-6 5 |     def remove(self) -> None:
-7 6 |         ...
+1 | class Foo(BaseModel):
+2 |     name = StringField()
+3 |     # ....
+  -     name = StringField()  # PIE794
+4 | 
+5 |     def remove(self) -> None:
+6 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 PIE794 [*] Class field `name` is defined multiple times
   --> PIE794.py:13:5
@@ -33,15 +32,14 @@ PIE794 [*] Class field `name` is defined multiple times
 15 |     def foo(self) -> None:
    |
 help: Remove duplicate field definition for `name`
-
-ℹ Unsafe fix
-10 10 | class Foo(BaseModel):
-11 11 |     name: str = StringField()
-12 12 |     # ....
-13    |-    name = StringField()  # PIE794
-14 13 | 
-15 14 |     def foo(self) -> None:
-16 15 |         ...
+10 | class Foo(BaseModel):
+11 |     name: str = StringField()
+12 |     # ....
+   -     name = StringField()  # PIE794
+13 | 
+14 |     def foo(self) -> None:
+15 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 PIE794 [*] Class field `bar` is defined multiple times
   --> PIE794.py:23:5
@@ -52,15 +50,14 @@ PIE794 [*] Class field `bar` is defined multiple times
    |     ^^^^^^^^^^^^^^^^^^^
    |
 help: Remove duplicate field definition for `bar`
-
-ℹ Unsafe fix
-20 20 |     bar: str = StringField()
-21 21 |     foo: bool = BooleanField()
-22 22 |     # ...
-23    |-    bar = StringField()  # PIE794
-24 23 | 
-25 24 | 
-26 25 | class User(BaseModel):
+20 |     bar: str = StringField()
+21 |     foo: bool = BooleanField()
+22 |     # ...
+   -     bar = StringField()  # PIE794
+23 | 
+24 | 
+25 | class User(BaseModel):
+note: This is an unsafe fix and may change runtime behavior
 
 PIE794 [*] Class field `bar` is defined multiple times
   --> PIE794.py:40:5
@@ -71,15 +68,14 @@ PIE794 [*] Class field `bar` is defined multiple times
    |     ^^^^^^^^^^^^^^^^^^^
    |
 help: Remove duplicate field definition for `bar`
-
-ℹ Unsafe fix
-37 37 |     bar: str = StringField()
-38 38 |     foo: bool = BooleanField()
-39 39 |     # ...
-40    |-    bar = StringField()  # PIE794
-41 40 | 
-42 41 | 
-43 42 | class Person:
+37 |     bar: str = StringField()
+38 |     foo: bool = BooleanField()
+39 |     # ...
+   -     bar = StringField()  # PIE794
+40 | 
+41 | 
+42 | class Person:
+note: This is an unsafe fix and may change runtime behavior
 
 PIE794 [*] Class field `name` is defined multiple times
   --> PIE794.py:46:5
@@ -90,15 +86,14 @@ PIE794 [*] Class field `name` is defined multiple times
    |     ^^^^^^^^^^^^
    |
 help: Remove duplicate field definition for `name`
-
-ℹ Unsafe fix
-43 43 | class Person:
-44 44 |     name = "Foo"
-45 45 |     name = name + " Bar"
-46    |-    name = "Bar"  # PIE794
-47 46 | 
-48 47 | 
-49 48 | class Person:
+43 | class Person:
+44 |     name = "Foo"
+45 |     name = name + " Bar"
+   -     name = "Bar"  # PIE794
+46 | 
+47 | 
+48 | class Person:
+note: This is an unsafe fix and may change runtime behavior
 
 PIE794 [*] Class field `name` is defined multiple times
   --> PIE794.py:52:5
@@ -109,9 +104,8 @@ PIE794 [*] Class field `name` is defined multiple times
    |     ^^^^^^^^^^^^^^^^^
    |
 help: Remove duplicate field definition for `name`
-
-ℹ Unsafe fix
-49 49 | class Person:
-50 50 |     name: str = "Foo"
-51 51 |     name: str = name + " Bar"
-52    |-    name: str = "Bar"  # PIE794
+49 | class Person:
+50 |     name: str = "Foo"
+51 |     name: str = name + " Bar"
+   -     name: str = "Bar"  # PIE794
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap
index 9d522c0a7c..1a8437526e 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap
@@ -10,13 +10,11 @@ PIE800 [*] Unnecessary spread `**`
 3 | {**{"bar": 10}, "a": "b"}  # PIE800
   |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-1   |-{"foo": 1, **{"bar": 1}}  # PIE800
-  1 |+{"foo": 1, "bar": 1}  # PIE800
-2 2 | 
-3 3 | {**{"bar": 10}, "a": "b"}  # PIE800
-4 4 | 
+  - {"foo": 1, **{"bar": 1}}  # PIE800
+1 + {"foo": 1, "bar": 1}  # PIE800
+2 | 
+3 | {**{"bar": 10}, "a": "b"}  # PIE800
+4 | 
 
 PIE800 [*] Unnecessary spread `**`
  --> PIE800.py:3:4
@@ -29,15 +27,13 @@ PIE800 [*] Unnecessary spread `**`
 5 | foo({**foo, **{"bar": True}})  # PIE800
   |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-1 1 | {"foo": 1, **{"bar": 1}}  # PIE800
-2 2 | 
-3   |-{**{"bar": 10}, "a": "b"}  # PIE800
-  3 |+{"bar": 10, "a": "b"}  # PIE800
-4 4 | 
-5 5 | foo({**foo, **{"bar": True}})  # PIE800
-6 6 | 
+1 | {"foo": 1, **{"bar": 1}}  # PIE800
+2 | 
+  - {**{"bar": 10}, "a": "b"}  # PIE800
+3 + {"bar": 10, "a": "b"}  # PIE800
+4 | 
+5 | foo({**foo, **{"bar": True}})  # PIE800
+6 | 
 
 PIE800 [*] Unnecessary spread `**`
  --> PIE800.py:5:15
@@ -50,16 +46,14 @@ PIE800 [*] Unnecessary spread `**`
 7 | {**foo, **{"bar": 10}}  # PIE800
   |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-2 2 | 
-3 3 | {**{"bar": 10}, "a": "b"}  # PIE800
-4 4 | 
-5   |-foo({**foo, **{"bar": True}})  # PIE800
-  5 |+foo({**foo, "bar": True})  # PIE800
-6 6 | 
-7 7 | {**foo, **{"bar": 10}}  # PIE800
-8 8 | 
+2 | 
+3 | {**{"bar": 10}, "a": "b"}  # PIE800
+4 | 
+  - foo({**foo, **{"bar": True}})  # PIE800
+5 + foo({**foo, "bar": True})  # PIE800
+6 | 
+7 | {**foo, **{"bar": 10}}  # PIE800
+8 | 
 
 PIE800 [*] Unnecessary spread `**`
  --> PIE800.py:7:11
@@ -72,16 +66,14 @@ PIE800 [*] Unnecessary spread `**`
 9 | { # PIE800
   |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-4 4 | 
-5 5 | foo({**foo, **{"bar": True}})  # PIE800
-6 6 | 
-7   |-{**foo, **{"bar": 10}}  # PIE800
-  7 |+{**foo, "bar": 10}  # PIE800
-8 8 | 
-9 9 | { # PIE800
-10 10 |     "a": "b",
+4  | 
+5  | foo({**foo, **{"bar": True}})  # PIE800
+6  | 
+   - {**foo, **{"bar": 10}}  # PIE800
+7  + {**foo, "bar": 10}  # PIE800
+8  | 
+9  | { # PIE800
+10 |     "a": "b",
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:12:7
@@ -98,22 +90,20 @@ PIE800 [*] Unnecessary spread `**`
 17 |   }
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-9  9  | { # PIE800
-10 10 |     "a": "b",
-11 11 |     # Preserve
-12    |-    **{
-   12 |+    
-13 13 |         # all
-14    |-        "bar": 10,  # the
-   14 |+        "bar": 10  # the
-15 15 |         # comments
-16    |-    },
-   16 |+    ,
-17 17 | }
-18 18 | 
-19 19 | {**foo, **buzz, **{bar: 10}}  # PIE800
+9  | { # PIE800
+10 |     "a": "b",
+11 |     # Preserve
+   -     **{
+12 +     
+13 |         # all
+   -         "bar": 10,  # the
+14 +         "bar": 10  # the
+15 |         # comments
+   -     },
+16 +     ,
+17 | }
+18 | 
+19 | {**foo, **buzz, **{bar: 10}}  # PIE800
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:19:19
@@ -126,16 +116,14 @@ PIE800 [*] Unnecessary spread `**`
 21 | # https://github.com/astral-sh/ruff/issues/15366
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-16 16 |     },
-17 17 | }
-18 18 | 
-19    |-{**foo, **buzz, **{bar: 10}}  # PIE800
-   19 |+{**foo, **buzz, bar: 10}  # PIE800
-20 20 | 
-21 21 | # https://github.com/astral-sh/ruff/issues/15366
-22 22 | {
+16 |     },
+17 | }
+18 | 
+   - {**foo, **buzz, **{bar: 10}}  # PIE800
+19 + {**foo, **buzz, bar: 10}  # PIE800
+20 | 
+21 | # https://github.com/astral-sh/ruff/issues/15366
+22 | {
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:24:8
@@ -147,16 +135,14 @@ PIE800 [*] Unnecessary spread `**`
 25 | }
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-21 21 | # https://github.com/astral-sh/ruff/issues/15366
-22 22 | {
-23 23 |     "data": [],
-24    |-    **({"count": 1 if include_count else {}}),
-   24 |+    "count": 1 if include_count else {},
-25 25 | }
-26 26 | 
-27 27 | {
+21 | # https://github.com/astral-sh/ruff/issues/15366
+22 | {
+23 |     "data": [],
+   -     **({"count": 1 if include_count else {}}),
+24 +     "count": 1 if include_count else {},
+25 | }
+26 | 
+27 | {
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:30:9
@@ -169,20 +155,18 @@ PIE800 [*] Unnecessary spread `**`
 32 |   }
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-26 26 | 
-27 27 | {
-28 28 |     "data": [],
-29    |-    **(  # Comment
-30    |-        {  # Comment
-31    |-            "count": 1 if include_count else {}}),
-   29 |+      # Comment
-   30 |+          # Comment
-   31 |+            "count": 1 if include_count else {},
-32 32 | }
-33 33 | 
-34 34 | {
+26 | 
+27 | {
+28 |     "data": [],
+   -     **(  # Comment
+   -         {  # Comment
+   -             "count": 1 if include_count else {}}),
+29 +       # Comment
+30 +           # Comment
+31 +             "count": 1 if include_count else {},
+32 | }
+33 | 
+34 | {
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:37:9
@@ -195,20 +179,18 @@ PIE800 [*] Unnecessary spread `**`
 39 |   }
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-33 33 | 
-34 34 | {
-35 35 |     "data": [],
-36    |-    **(
-37    |-        {
-38    |-            "count": (a := 1),}),
-   36 |+    
-   37 |+        
-   38 |+            "count": (a := 1),
-39 39 | }
-40 40 | 
-41 41 | {
+33 | 
+34 | {
+35 |     "data": [],
+   -     **(
+   -         {
+   -             "count": (a := 1),}),
+36 +     
+37 +         
+38 +             "count": (a := 1),
+39 | }
+40 | 
+41 | {
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:44:9
@@ -223,23 +205,21 @@ PIE800 [*] Unnecessary spread `**`
 48 |       ,
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-40 40 | 
-41 41 | {
-42 42 |     "data": [],
-43    |-    **(
-44    |-        {
-   43 |+    
-   44 |+        
-45 45 |             "count": (a := 1)
-46    |-            }
-47    |-    )
-   46 |+            
-   47 |+    
-48 48 |     ,
-49 49 | }
-50 50 | 
+40 | 
+41 | {
+42 |     "data": [],
+   -     **(
+   -         {
+43 +     
+44 +         
+45 |             "count": (a := 1)
+   -             }
+   -     )
+46 +             
+47 +     
+48 |     ,
+49 | }
+50 | 
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:54:9
@@ -254,24 +234,22 @@ PIE800 [*] Unnecessary spread `**`
 58 |       ,
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-50 50 | 
-51 51 | {
-52 52 |     "data": [],
-53    |-    **(
-54    |-        {
-55    |-            "count": (a := 1),  # Comment
-56    |-            }  # Comment
-57    |-    ) # Comment
-   53 |+    
-   54 |+        
-   55 |+            "count": (a := 1)  # Comment
-   56 |+              # Comment
-   57 |+     # Comment
-58 58 |     ,
-59 59 | }
-60 60 | 
+50 | 
+51 | {
+52 |     "data": [],
+   -     **(
+   -         {
+   -             "count": (a := 1),  # Comment
+   -             }  # Comment
+   -     ) # Comment
+53 +     
+54 +         
+55 +             "count": (a := 1)  # Comment
+56 +               # Comment
+57 +      # Comment
+58 |     ,
+59 | }
+60 | 
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:65:1
@@ -286,28 +264,26 @@ PIE800 [*] Unnecessary spread `**`
 69 |       ) # Comment
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-60 60 | 
-61 61 | ({
-62 62 |     "data": [],
-63    |-    **(  # Comment
-64    |-        (   # Comment
-65    |-{ # Comment
-66    |-            "count": (a := 1),  # Comment
-67    |-        }  # Comment
-68    |-            )
-69    |-    ) # Comment
-   63 |+      # Comment
-   64 |+           # Comment
-   65 |+ # Comment
-   66 |+            "count": (a := 1)  # Comment
-   67 |+          # Comment
-   68 |+            
-   69 |+     # Comment
-70 70 |     ,
-71 71 | })
-72 72 | 
+60 | 
+61 | ({
+62 |     "data": [],
+   -     **(  # Comment
+   -         (   # Comment
+   - { # Comment
+   -             "count": (a := 1),  # Comment
+   -         }  # Comment
+   -             )
+   -     ) # Comment
+63 +       # Comment
+64 +            # Comment
+65 +  # Comment
+66 +             "count": (a := 1)  # Comment
+67 +           # Comment
+68 +             
+69 +      # Comment
+70 |     ,
+71 | })
+72 | 
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:77:9
@@ -322,25 +298,23 @@ PIE800 [*] Unnecessary spread `**`
 81 |       c: 9,
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-72 72 | 
-73 73 | {
-74 74 |     "data": [],
-75    |-    ** # Foo
-76    |-    (  # Comment
-77    |-        { "a": b,
-   75 |+     # Foo
-   76 |+      # Comment
-   77 |+         "a": b
-78 78 |           # Comment
-79    |-          }
-80    |-    ) ,
-   79 |+          
-   80 |+     ,
-81 81 |     c: 9,
-82 82 | }
-83 83 | 
+72 | 
+73 | {
+74 |     "data": [],
+   -     ** # Foo
+   -     (  # Comment
+   -         { "a": b,
+75 +      # Foo
+76 +       # Comment
+77 +          "a": b
+78 |           # Comment
+   -           }
+   -     ) ,
+79 +           
+80 +      ,
+81 |     c: 9,
+82 | }
+83 | 
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:86:13
@@ -351,16 +325,14 @@ PIE800 [*] Unnecessary spread `**`
 87 | {"a": [], **({}),}
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-83 83 | 
-84 84 | 
-85 85 | # https://github.com/astral-sh/ruff/issues/15997
-86    |-{"a": [], **{},}
-   86 |+{"a": [], }
-87 87 | {"a": [], **({}),}
-88 88 | 
-89 89 | {"a": [], **{}, 6: 3}
+83 | 
+84 | 
+85 | # https://github.com/astral-sh/ruff/issues/15997
+   - {"a": [], **{},}
+86 + {"a": [], }
+87 | {"a": [], **({}),}
+88 | 
+89 | {"a": [], **{}, 6: 3}
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:87:14
@@ -373,16 +345,14 @@ PIE800 [*] Unnecessary spread `**`
 89 | {"a": [], **{}, 6: 3}
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-84 84 | 
-85 85 | # https://github.com/astral-sh/ruff/issues/15997
-86 86 | {"a": [], **{},}
-87    |-{"a": [], **({}),}
-   87 |+{"a": [], }
-88 88 | 
-89 89 | {"a": [], **{}, 6: 3}
-90 90 | {"a": [], **({}), 6: 3}
+84 | 
+85 | # https://github.com/astral-sh/ruff/issues/15997
+86 | {"a": [], **{},}
+   - {"a": [], **({}),}
+87 + {"a": [], }
+88 | 
+89 | {"a": [], **{}, 6: 3}
+90 | {"a": [], **({}), 6: 3}
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:89:13
@@ -394,16 +364,14 @@ PIE800 [*] Unnecessary spread `**`
 90 | {"a": [], **({}), 6: 3}
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-86 86 | {"a": [], **{},}
-87 87 | {"a": [], **({}),}
-88 88 | 
-89    |-{"a": [], **{}, 6: 3}
-   89 |+{"a": [],  6: 3}
-90 90 | {"a": [], **({}), 6: 3}
-91 91 | 
-92 92 | {"a": [], **{
+86 | {"a": [], **{},}
+87 | {"a": [], **({}),}
+88 | 
+   - {"a": [], **{}, 6: 3}
+89 + {"a": [],  6: 3}
+90 | {"a": [], **({}), 6: 3}
+91 | 
+92 | {"a": [], **{
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:90:14
@@ -415,16 +383,14 @@ PIE800 [*] Unnecessary spread `**`
 92 | {"a": [], **{
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-87 87 | {"a": [], **({}),}
-88 88 | 
-89 89 | {"a": [], **{}, 6: 3}
-90    |-{"a": [], **({}), 6: 3}
-   90 |+{"a": [],  6: 3}
-91 91 | 
-92 92 | {"a": [], **{
-93 93 |     # Comment
+87 | {"a": [], **({}),}
+88 | 
+89 | {"a": [], **{}, 6: 3}
+   - {"a": [], **({}), 6: 3}
+90 + {"a": [],  6: 3}
+91 | 
+92 | {"a": [], **{
+93 |     # Comment
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:92:13
@@ -440,19 +406,17 @@ PIE800 [*] Unnecessary spread `**`
 96 |       # Comment
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-89 89 | {"a": [], **{}, 6: 3}
-90 90 | {"a": [], **({}), 6: 3}
-91 91 | 
-92    |-{"a": [], **{
-   92 |+{"a": [], 
-93 93 |     # Comment
-94    |-}, 6: 3}
-   94 |+ 6: 3}
-95 95 | {"a": [], **({
-96 96 |     # Comment
-97 97 | }), 6: 3}
+89 | {"a": [], **{}, 6: 3}
+90 | {"a": [], **({}), 6: 3}
+91 | 
+   - {"a": [], **{
+92 + {"a": [], 
+93 |     # Comment
+   - }, 6: 3}
+94 +  6: 3}
+95 | {"a": [], **({
+96 |     # Comment
+97 | }), 6: 3}
 
 PIE800 [*] Unnecessary spread `**`
   --> PIE800.py:95:14
@@ -466,16 +430,14 @@ PIE800 [*] Unnecessary spread `**`
    | |_^
    |
 help: Remove unnecessary dict
-
-ℹ Safe fix
-92 92 | {"a": [], **{
-93 93 |     # Comment
-94 94 | }, 6: 3}
-95    |-{"a": [], **({
-   95 |+{"a": [], 
-96 96 |     # Comment
-97    |-}), 6: 3}
-   97 |+ 6: 3}
-98 98 | 
-99 99 | 
-100 100 | {**foo,    "bar": True  }  # OK
+92  | {"a": [], **{
+93  |     # Comment
+94  | }, 6: 3}
+    - {"a": [], **({
+95  + {"a": [], 
+96  |     # Comment
+    - }), 6: 3}
+97  +  6: 3}
+98  | 
+99  | 
+100 | {**foo,    "bar": True  }  # OK
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap
index 6b0e88fd27..63dfd24b39 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap
@@ -10,13 +10,11 @@ PIE804 [*] Unnecessary `dict` kwargs
 3 | foo(**{"r2d2": True})  # PIE804
   |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-1   |-foo(**{"bar": True})  # PIE804
-  1 |+foo(bar=True)  # PIE804
-2 2 | 
-3 3 | foo(**{"r2d2": True})  # PIE804
-4 4 | 
+  - foo(**{"bar": True})  # PIE804
+1 + foo(bar=True)  # PIE804
+2 | 
+3 | foo(**{"r2d2": True})  # PIE804
+4 | 
 
 PIE804 [*] Unnecessary `dict` kwargs
  --> PIE804.py:3:5
@@ -29,15 +27,13 @@ PIE804 [*] Unnecessary `dict` kwargs
 5 | Foo.objects.create(**{"bar": True})  # PIE804
   |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-1 1 | foo(**{"bar": True})  # PIE804
-2 2 | 
-3   |-foo(**{"r2d2": True})  # PIE804
-  3 |+foo(r2d2=True)  # PIE804
-4 4 | 
-5 5 | Foo.objects.create(**{"bar": True})  # PIE804
-6 6 | 
+1 | foo(**{"bar": True})  # PIE804
+2 | 
+  - foo(**{"r2d2": True})  # PIE804
+3 + foo(r2d2=True)  # PIE804
+4 | 
+5 | Foo.objects.create(**{"bar": True})  # PIE804
+6 | 
 
 PIE804 [*] Unnecessary `dict` kwargs
  --> PIE804.py:5:20
@@ -50,16 +46,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 7 | Foo.objects.create(**{"_id": some_id})  # PIE804
   |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-2 2 | 
-3 3 | foo(**{"r2d2": True})  # PIE804
-4 4 | 
-5   |-Foo.objects.create(**{"bar": True})  # PIE804
-  5 |+Foo.objects.create(bar=True)  # PIE804
-6 6 | 
-7 7 | Foo.objects.create(**{"_id": some_id})  # PIE804
-8 8 | 
+2 | 
+3 | foo(**{"r2d2": True})  # PIE804
+4 | 
+  - Foo.objects.create(**{"bar": True})  # PIE804
+5 + Foo.objects.create(bar=True)  # PIE804
+6 | 
+7 | Foo.objects.create(**{"_id": some_id})  # PIE804
+8 | 
 
 PIE804 [*] Unnecessary `dict` kwargs
  --> PIE804.py:7:20
@@ -72,16 +66,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 9 | Foo.objects.create(**{**bar})  # PIE804
   |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-4 4 | 
-5 5 | Foo.objects.create(**{"bar": True})  # PIE804
-6 6 | 
-7   |-Foo.objects.create(**{"_id": some_id})  # PIE804
-  7 |+Foo.objects.create(_id=some_id)  # PIE804
-8 8 | 
-9 9 | Foo.objects.create(**{**bar})  # PIE804
-10 10 | 
+4  | 
+5  | Foo.objects.create(**{"bar": True})  # PIE804
+6  | 
+   - Foo.objects.create(**{"_id": some_id})  # PIE804
+7  + Foo.objects.create(_id=some_id)  # PIE804
+8  | 
+9  | Foo.objects.create(**{**bar})  # PIE804
+10 | 
 
 PIE804 [*] Unnecessary `dict` kwargs
   --> PIE804.py:9:20
@@ -94,16 +86,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 11 | foo(**{})
    |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-6  6  | 
-7  7  | Foo.objects.create(**{"_id": some_id})  # PIE804
-8  8  | 
-9     |-Foo.objects.create(**{**bar})  # PIE804
-   9  |+Foo.objects.create(**bar)  # PIE804
-10 10 | 
-11 11 | foo(**{})
-12 12 | 
+6  | 
+7  | Foo.objects.create(**{"_id": some_id})  # PIE804
+8  | 
+   - Foo.objects.create(**{**bar})  # PIE804
+9  + Foo.objects.create(**bar)  # PIE804
+10 | 
+11 | foo(**{})
+12 | 
 
 PIE804 [*] Unnecessary `dict` kwargs
   --> PIE804.py:11:5
@@ -116,16 +106,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 13 | foo(**{**data, "foo": "buzz"})
    |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-8  8  | 
-9  9  | Foo.objects.create(**{**bar})  # PIE804
-10 10 | 
-11    |-foo(**{})
-   11 |+foo()
-12 12 | 
-13 13 | foo(**{**data, "foo": "buzz"})
-14 14 | foo(**buzz)
+8  | 
+9  | Foo.objects.create(**{**bar})  # PIE804
+10 | 
+   - foo(**{})
+11 + foo()
+12 | 
+13 | foo(**{**data, "foo": "buzz"})
+14 | foo(**buzz)
 
 PIE804 [*] Unnecessary `dict` kwargs
   --> PIE804.py:22:5
@@ -138,16 +126,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 24 | # Duplicated key names won't be fixed, to avoid syntax errors.
    |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-19 19 | foo(**{"": True})
-20 20 | foo(**{f"buzz__{bar}": True})
-21 21 | abc(**{"for": 3})
-22    |-foo(**{},)
-   22 |+foo()
-23 23 | 
-24 24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 25 | abc(**{'a': b}, **{'a': c})  # PIE804
+19 | foo(**{"": True})
+20 | foo(**{f"buzz__{bar}": True})
+21 | abc(**{"for": 3})
+   - foo(**{},)
+22 + foo()
+23 | 
+24 | # Duplicated key names won't be fixed, to avoid syntax errors.
+25 | abc(**{'a': b}, **{'a': c})  # PIE804
 
 PIE804 Unnecessary `dict` kwargs
   --> PIE804.py:25:5
@@ -192,16 +178,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 28 | # Some values need to be parenthesized.
    |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-23 23 | 
-24 24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 25 | abc(**{'a': b}, **{'a': c})  # PIE804
-26    |-abc(a=1, **{'a': c}, **{'b': c})  # PIE804
-   26 |+abc(a=1, **{'a': c}, b=c)  # PIE804
-27 27 | 
-28 28 | # Some values need to be parenthesized.
-29 29 | def foo():
+23 | 
+24 | # Duplicated key names won't be fixed, to avoid syntax errors.
+25 | abc(**{'a': b}, **{'a': c})  # PIE804
+   - abc(a=1, **{'a': c}, **{'b': c})  # PIE804
+26 + abc(a=1, **{'a': c}, b=c)  # PIE804
+27 | 
+28 | # Some values need to be parenthesized.
+29 | def foo():
 
 PIE804 [*] Unnecessary `dict` kwargs
   --> PIE804.py:30:16
@@ -213,16 +197,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 31 |     abc(foo=1, **{'bar': (yield 1)})  # PIE804
    |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-27 27 | 
-28 28 | # Some values need to be parenthesized.
-29 29 | def foo():
-30    |-    abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-   30 |+    abc(foo=1, bar=(bar := 1))  # PIE804
-31 31 |     abc(foo=1, **{'bar': (yield 1)})  # PIE804
-32 32 | 
-33 33 | # https://github.com/astral-sh/ruff/issues/18036
+27 | 
+28 | # Some values need to be parenthesized.
+29 | def foo():
+   -     abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+30 +     abc(foo=1, bar=(bar := 1))  # PIE804
+31 |     abc(foo=1, **{'bar': (yield 1)})  # PIE804
+32 | 
+33 | # https://github.com/astral-sh/ruff/issues/18036
 
 PIE804 [*] Unnecessary `dict` kwargs
   --> PIE804.py:31:16
@@ -235,16 +217,14 @@ PIE804 [*] Unnecessary `dict` kwargs
 33 | # https://github.com/astral-sh/ruff/issues/18036
    |
 help: Remove unnecessary kwargs
-
-ℹ Safe fix
-28 28 | # Some values need to be parenthesized.
-29 29 | def foo():
-30 30 |     abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-31    |-    abc(foo=1, **{'bar': (yield 1)})  # PIE804
-   31 |+    abc(foo=1, bar=(yield 1))  # PIE804
-32 32 | 
-33 33 | # https://github.com/astral-sh/ruff/issues/18036
-34 34 | # The autofix for this is unsafe due to the comments inside the dictionary.
+28 | # Some values need to be parenthesized.
+29 | def foo():
+30 |     abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+   -     abc(foo=1, **{'bar': (yield 1)})  # PIE804
+31 +     abc(foo=1, bar=(yield 1))  # PIE804
+32 | 
+33 | # https://github.com/astral-sh/ruff/issues/18036
+34 | # The autofix for this is unsafe due to the comments inside the dictionary.
 
 PIE804 [*] Unnecessary `dict` kwargs
   --> PIE804.py:36:5
@@ -261,16 +241,15 @@ PIE804 [*] Unnecessary `dict` kwargs
 42 |   )
    |
 help: Remove unnecessary kwargs
-
-ℹ Unsafe fix
-33 33 | # https://github.com/astral-sh/ruff/issues/18036
-34 34 | # The autofix for this is unsafe due to the comments inside the dictionary.
-35 35 | foo(
-36    |-    **{
-37    |-        # Comment 1
-38    |-        "x": 1.0,
-39    |-        # Comment 2
-40    |-        "y": 2.0,
-41    |-    }
-   36 |+    x=1.0, y=2.0
-42 37 | )
+33 | # https://github.com/astral-sh/ruff/issues/18036
+34 | # The autofix for this is unsafe due to the comments inside the dictionary.
+35 | foo(
+   -     **{
+   -         # Comment 1
+   -         "x": 1.0,
+   -         # Comment 2
+   -         "y": 2.0,
+   -     }
+36 +     x=1.0, y=2.0
+37 | )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap
index 38cb78b806..63d875d446 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap
@@ -11,15 +11,13 @@ PIE807 [*] Prefer `list` over useless lambda
 4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
   |
 help: Replace with `lambda` with `list`
-
-ℹ Safe fix
-1 1 | @dataclass
-2 2 | class Foo:
-3   |-    foo: List[str] = field(default_factory=lambda: [])  # PIE807
-  3 |+    foo: List[str] = field(default_factory=list)  # PIE807
-4 4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
-5 5 | 
-6 6 | 
+1 | @dataclass
+2 | class Foo:
+  -     foo: List[str] = field(default_factory=lambda: [])  # PIE807
+3 +     foo: List[str] = field(default_factory=list)  # PIE807
+4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
+5 | 
+6 | 
 
 PIE807 [*] Prefer `dict` over useless lambda
  --> PIE807.py:4:49
@@ -30,16 +28,14 @@ PIE807 [*] Prefer `dict` over useless lambda
   |                                                 ^^^^^^^^^^
   |
 help: Replace with `lambda` with `dict`
-
-ℹ Safe fix
-1 1 | @dataclass
-2 2 | class Foo:
-3 3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
-4   |-    bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
-  4 |+    bar: Dict[str, int] = field(default_factory=dict)  # PIE807
-5 5 | 
-6 6 | 
-7 7 | class FooTable(BaseTable):
+1 | @dataclass
+2 | class Foo:
+3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
+  -     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
+4 +     bar: Dict[str, int] = field(default_factory=dict)  # PIE807
+5 | 
+6 | 
+7 | class FooTable(BaseTable):
 
 PIE807 [*] Prefer `list` over useless lambda
  --> PIE807.py:8:36
@@ -50,16 +46,14 @@ PIE807 [*] Prefer `list` over useless lambda
 9 |     bar = fields.ListField(default=lambda: {})  # PIE807
   |
 help: Replace with `lambda` with `list`
-
-ℹ Safe fix
-5 5 | 
-6 6 | 
-7 7 | class FooTable(BaseTable):
-8   |-    foo = fields.ListField(default=lambda: [])  # PIE807
-  8 |+    foo = fields.ListField(default=list)  # PIE807
-9 9 |     bar = fields.ListField(default=lambda: {})  # PIE807
-10 10 | 
-11 11 | 
+5  | 
+6  | 
+7  | class FooTable(BaseTable):
+   -     foo = fields.ListField(default=lambda: [])  # PIE807
+8  +     foo = fields.ListField(default=list)  # PIE807
+9  |     bar = fields.ListField(default=lambda: {})  # PIE807
+10 | 
+11 | 
 
 PIE807 [*] Prefer `dict` over useless lambda
  --> PIE807.py:9:36
@@ -70,16 +64,14 @@ PIE807 [*] Prefer `dict` over useless lambda
   |                                    ^^^^^^^^^^
   |
 help: Replace with `lambda` with `dict`
-
-ℹ Safe fix
-6  6  | 
-7  7  | class FooTable(BaseTable):
-8  8  |     foo = fields.ListField(default=lambda: [])  # PIE807
-9     |-    bar = fields.ListField(default=lambda: {})  # PIE807
-   9  |+    bar = fields.ListField(default=dict)  # PIE807
-10 10 | 
-11 11 | 
-12 12 | class FooTable(BaseTable):
+6  | 
+7  | class FooTable(BaseTable):
+8  |     foo = fields.ListField(default=lambda: [])  # PIE807
+   -     bar = fields.ListField(default=lambda: {})  # PIE807
+9  +     bar = fields.ListField(default=dict)  # PIE807
+10 | 
+11 | 
+12 | class FooTable(BaseTable):
 
 PIE807 [*] Prefer `list` over useless lambda
   --> PIE807.py:13:28
@@ -90,16 +82,14 @@ PIE807 [*] Prefer `list` over useless lambda
 14 |     bar = fields.ListField(default=lambda: {})  # PIE807
    |
 help: Replace with `lambda` with `list`
-
-ℹ Safe fix
-10 10 | 
-11 11 | 
-12 12 | class FooTable(BaseTable):
-13    |-    foo = fields.ListField(lambda: [])  # PIE807
-   13 |+    foo = fields.ListField(list)  # PIE807
-14 14 |     bar = fields.ListField(default=lambda: {})  # PIE807
-15 15 | 
-16 16 | 
+10 | 
+11 | 
+12 | class FooTable(BaseTable):
+   -     foo = fields.ListField(lambda: [])  # PIE807
+13 +     foo = fields.ListField(list)  # PIE807
+14 |     bar = fields.ListField(default=lambda: {})  # PIE807
+15 | 
+16 | 
 
 PIE807 [*] Prefer `dict` over useless lambda
   --> PIE807.py:14:36
@@ -110,13 +100,11 @@ PIE807 [*] Prefer `dict` over useless lambda
    |                                    ^^^^^^^^^^
    |
 help: Replace with `lambda` with `dict`
-
-ℹ Safe fix
-11 11 | 
-12 12 | class FooTable(BaseTable):
-13 13 |     foo = fields.ListField(lambda: [])  # PIE807
-14    |-    bar = fields.ListField(default=lambda: {})  # PIE807
-   14 |+    bar = fields.ListField(default=dict)  # PIE807
-15 15 | 
-16 16 | 
-17 17 | @dataclass
+11 | 
+12 | class FooTable(BaseTable):
+13 |     foo = fields.ListField(lambda: [])  # PIE807
+   -     bar = fields.ListField(default=lambda: {})  # PIE807
+14 +     bar = fields.ListField(default=dict)  # PIE807
+15 | 
+16 | 
+17 | @dataclass
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap
index 1ac8dcf635..cf62619996 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap
@@ -11,14 +11,12 @@ PIE808 [*] Unnecessary `start` argument in `range`
 4 | import builtins
   |
 help: Remove `start` argument
-
-ℹ Safe fix
-1 1 | # PIE808
-2   |-range(0, 10)
-  2 |+range(10)
-3 3 | 
-4 4 | import builtins
-5 5 | builtins.range(0, 10)
+1 | # PIE808
+  - range(0, 10)
+2 + range(10)
+3 | 
+4 | import builtins
+5 | builtins.range(0, 10)
 
 PIE808 [*] Unnecessary `start` argument in `range`
  --> PIE808.py:5:16
@@ -30,16 +28,14 @@ PIE808 [*] Unnecessary `start` argument in `range`
 7 | # OK
   |
 help: Remove `start` argument
-
-ℹ Safe fix
-2 2 | range(0, 10)
-3 3 | 
-4 4 | import builtins
-5   |-builtins.range(0, 10)
-  5 |+builtins.range(10)
-6 6 | 
-7 7 | # OK
-8 8 | range(x, 10)
+2 | range(0, 10)
+3 | 
+4 | import builtins
+  - builtins.range(0, 10)
+5 + builtins.range(10)
+6 | 
+7 | # OK
+8 | range(x, 10)
 
 PIE808 [*] Unnecessary `start` argument in `range`
   --> PIE808.py:19:8
@@ -49,10 +45,8 @@ PIE808 [*] Unnecessary `start` argument in `range`
    |        ^
    |
 help: Remove `start` argument
-
-ℹ Safe fix
-16 16 | range(0, stop=10)
-17 17 | 
-18 18 | # regression test for https://github.com/astral-sh/ruff/pull/18805
-19    |-range((0), 42)
-   19 |+range(42)
+16 | range(0, stop=10)
+17 | 
+18 | # regression test for https://github.com/astral-sh/ruff/pull/18805
+   - range((0), 42)
+19 + range(42)
diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap
index 3fe1aacb7d..de487a9f14 100644
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap
@@ -11,14 +11,13 @@ PIE810 [*] Call `startswith` once with a `tuple`
 4 | obj.endswith("foo") or obj.endswith("bar")
   |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-1 1 | # error
-2   |-obj.startswith("foo") or obj.startswith("bar")
-  2 |+obj.startswith(("foo", "bar"))
-3 3 | # error
-4 4 | obj.endswith("foo") or obj.endswith("bar")
-5 5 | # error
+1 | # error
+  - obj.startswith("foo") or obj.startswith("bar")
+2 + obj.startswith(("foo", "bar"))
+3 | # error
+4 | obj.endswith("foo") or obj.endswith("bar")
+5 | # error
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `endswith` once with a `tuple`
  --> PIE810.py:4:1
@@ -31,16 +30,15 @@ PIE810 [*] Call `endswith` once with a `tuple`
 6 | obj.startswith(foo) or obj.startswith(bar)
   |
 help: Merge into a single `endswith` call
-
-ℹ Unsafe fix
-1 1 | # error
-2 2 | obj.startswith("foo") or obj.startswith("bar")
-3 3 | # error
-4   |-obj.endswith("foo") or obj.endswith("bar")
-  4 |+obj.endswith(("foo", "bar"))
-5 5 | # error
-6 6 | obj.startswith(foo) or obj.startswith(bar)
-7 7 | # error
+1 | # error
+2 | obj.startswith("foo") or obj.startswith("bar")
+3 | # error
+  - obj.endswith("foo") or obj.endswith("bar")
+4 + obj.endswith(("foo", "bar"))
+5 | # error
+6 | obj.startswith(foo) or obj.startswith(bar)
+7 | # error
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `startswith` once with a `tuple`
  --> PIE810.py:6:1
@@ -53,16 +51,15 @@ PIE810 [*] Call `startswith` once with a `tuple`
 8 | obj.startswith(foo) or obj.startswith("foo")
   |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-3 3 | # error
-4 4 | obj.endswith("foo") or obj.endswith("bar")
-5 5 | # error
-6   |-obj.startswith(foo) or obj.startswith(bar)
-  6 |+obj.startswith((foo, bar))
-7 7 | # error
-8 8 | obj.startswith(foo) or obj.startswith("foo")
-9 9 | # error
+3 | # error
+4 | obj.endswith("foo") or obj.endswith("bar")
+5 | # error
+  - obj.startswith(foo) or obj.startswith(bar)
+6 + obj.startswith((foo, bar))
+7 | # error
+8 | obj.startswith(foo) or obj.startswith("foo")
+9 | # error
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `startswith` once with a `tuple`
   --> PIE810.py:8:1
@@ -75,16 +72,15 @@ PIE810 [*] Call `startswith` once with a `tuple`
 10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
    |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-5 5 | # error
-6 6 | obj.startswith(foo) or obj.startswith(bar)
-7 7 | # error
-8   |-obj.startswith(foo) or obj.startswith("foo")
-  8 |+obj.startswith((foo, "foo"))
-9 9 | # error
-10 10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
-11 11 | 
+5  | # error
+6  | obj.startswith(foo) or obj.startswith(bar)
+7  | # error
+   - obj.startswith(foo) or obj.startswith("foo")
+8  + obj.startswith((foo, "foo"))
+9  | # error
+10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `startswith` once with a `tuple`
   --> PIE810.py:10:1
@@ -97,16 +93,15 @@ PIE810 [*] Call `startswith` once with a `tuple`
 12 | def func():
    |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-7  7  | # error
-8  8  | obj.startswith(foo) or obj.startswith("foo")
-9  9  | # error
-10    |-obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
-   10 |+obj.endswith(foo) or obj.startswith((foo, "foo"))
-11 11 | 
-12 12 | def func():
-13 13 |     msg = "hello world"
+7  | # error
+8  | obj.startswith(foo) or obj.startswith("foo")
+9  | # error
+   - obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
+10 + obj.endswith(foo) or obj.startswith((foo, "foo"))
+11 | 
+12 | def func():
+13 |     msg = "hello world"
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `startswith` once with a `tuple`
   --> PIE810.py:19:8
@@ -118,16 +113,15 @@ PIE810 [*] Call `startswith` once with a `tuple`
 20 |         print("yes") 
    |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-16 16 |     y = ("h", "e", "l", "l", "o")  
-17 17 |     z = "w"
-18 18 | 
-19    |-    if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error
-   19 |+    if msg.startswith((x, z)) or msg.startswith(y): # Error
-20 20 |         print("yes") 
-21 21 | 
-22 22 | def func():
+16 |     y = ("h", "e", "l", "l", "o")  
+17 |     z = "w"
+18 | 
+   -     if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error
+19 +     if msg.startswith((x, z)) or msg.startswith(y): # Error
+20 |         print("yes") 
+21 | 
+22 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `startswith` once with a `tuple`
   --> PIE810.py:25:8
@@ -139,16 +133,15 @@ PIE810 [*] Call `startswith` once with a `tuple`
 26 |         print("yes") 
    |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-22 22 | def func():
-23 23 |     msg = "hello world"
-24 24 | 
-25    |-    if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error
-   25 |+    if msg.startswith(("h", "e", "l", "l", "o", "h", "w")): # Error
-26 26 |         print("yes") 
-27 27 | 
-28 28 | # ok
+22 | def func():
+23 |     msg = "hello world"
+24 | 
+   -     if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error
+25 +     if msg.startswith(("h", "e", "l", "l", "o", "h", "w")): # Error
+26 |         print("yes") 
+27 | 
+28 | # ok
+note: This is an unsafe fix and may change runtime behavior
 
 PIE810 [*] Call `startswith` once with a `tuple`
   --> PIE810.py:83:8
@@ -160,11 +153,10 @@ PIE810 [*] Call `startswith` once with a `tuple`
 84 |         print("yes")
    |
 help: Merge into a single `startswith` call
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | def func():
-82 82 |     "Regression test for https://github.com/astral-sh/ruff/issues/9663"
-83    |-    if x.startswith("a") or x.startswith("b") or re.match(r"a\.b", x):
-   83 |+    if x.startswith(("a", "b")) or re.match(r"a\.b", x):
-84 84 |         print("yes")
+80 | 
+81 | def func():
+82 |     "Regression test for https://github.com/astral-sh/ruff/issues/9663"
+   -     if x.startswith("a") or x.startswith("b") or re.match(r"a\.b", x):
+83 +     if x.startswith(("a", "b")) or re.match(r"a\.b", x):
+84 |         print("yes")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_print/rules/print_call.rs b/crates/ruff_linter/src/rules/flake8_print/rules/print_call.rs
index c5a851aaf8..82db18a2fc 100644
--- a/crates/ruff_linter/src/rules/flake8_print/rules/print_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_print/rules/print_call.rs
@@ -48,6 +48,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// This rule's fix is marked as unsafe, as it will remove `print` statements
 /// that are used beyond debugging purposes.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.57")]
 pub(crate) struct Print;
 
 impl Violation for Print {
@@ -97,6 +98,7 @@ impl Violation for Print {
 /// This rule's fix is marked as unsafe, as it will remove `pprint` statements
 /// that are used beyond debugging purposes.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.57")]
 pub(crate) struct PPrint;
 
 impl Violation for PPrint {
diff --git a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap
index 62d5112a6a..9b929f4163 100644
--- a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap
@@ -12,15 +12,14 @@ T201 [*] `print` found
 6 | print("Hello, world!", file=sys.stdout)  # T201
   |
 help: Remove `print`
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | import tempfile
-3 3 | 
-4   |-print("Hello, world!")  # T201
-5 4 | print("Hello, world!", file=None)  # T201
-6 5 | print("Hello, world!", file=sys.stdout)  # T201
-7 6 | print("Hello, world!", file=sys.stderr)  # T201
+1 | import sys
+2 | import tempfile
+3 | 
+  - print("Hello, world!")  # T201
+4 | print("Hello, world!", file=None)  # T201
+5 | print("Hello, world!", file=sys.stdout)  # T201
+6 | print("Hello, world!", file=sys.stderr)  # T201
+note: This is an unsafe fix and may change runtime behavior
 
 T201 [*] `print` found
  --> T201.py:5:1
@@ -32,15 +31,14 @@ T201 [*] `print` found
 7 | print("Hello, world!", file=sys.stderr)  # T201
   |
 help: Remove `print`
-
-ℹ Unsafe fix
-2 2 | import tempfile
-3 3 | 
-4 4 | print("Hello, world!")  # T201
-5   |-print("Hello, world!", file=None)  # T201
-6 5 | print("Hello, world!", file=sys.stdout)  # T201
-7 6 | print("Hello, world!", file=sys.stderr)  # T201
-8 7 | 
+2 | import tempfile
+3 | 
+4 | print("Hello, world!")  # T201
+  - print("Hello, world!", file=None)  # T201
+5 | print("Hello, world!", file=sys.stdout)  # T201
+6 | print("Hello, world!", file=sys.stderr)  # T201
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 T201 [*] `print` found
  --> T201.py:6:1
@@ -52,15 +50,14 @@ T201 [*] `print` found
 7 | print("Hello, world!", file=sys.stderr)  # T201
   |
 help: Remove `print`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | print("Hello, world!")  # T201
-5 5 | print("Hello, world!", file=None)  # T201
-6   |-print("Hello, world!", file=sys.stdout)  # T201
-7 6 | print("Hello, world!", file=sys.stderr)  # T201
-8 7 | 
-9 8 | with tempfile.NamedTemporaryFile() as fp:
+3 | 
+4 | print("Hello, world!")  # T201
+5 | print("Hello, world!", file=None)  # T201
+  - print("Hello, world!", file=sys.stdout)  # T201
+6 | print("Hello, world!", file=sys.stderr)  # T201
+7 | 
+8 | with tempfile.NamedTemporaryFile() as fp:
+note: This is an unsafe fix and may change runtime behavior
 
 T201 [*] `print` found
  --> T201.py:7:1
@@ -73,12 +70,11 @@ T201 [*] `print` found
 9 | with tempfile.NamedTemporaryFile() as fp:
   |
 help: Remove `print`
-
-ℹ Unsafe fix
-4 4 | print("Hello, world!")  # T201
-5 5 | print("Hello, world!", file=None)  # T201
-6 6 | print("Hello, world!", file=sys.stdout)  # T201
-7   |-print("Hello, world!", file=sys.stderr)  # T201
-8 7 | 
-9 8 | with tempfile.NamedTemporaryFile() as fp:
-10 9 |     print("Hello, world!", file=fp)  # OK
+4 | print("Hello, world!")  # T201
+5 | print("Hello, world!", file=None)  # T201
+6 | print("Hello, world!", file=sys.stdout)  # T201
+  - print("Hello, world!", file=sys.stderr)  # T201
+7 | 
+8 | with tempfile.NamedTemporaryFile() as fp:
+9 |     print("Hello, world!", file=fp)  # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap
index 04e2c9fd2e..0013e8aec6 100644
--- a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap
@@ -12,14 +12,13 @@ T203 [*] `pprint` found
 5 | import pprint
   |
 help: Remove `pprint`
-
-ℹ Unsafe fix
-1 1 | from pprint import pprint
-2 2 | 
-3   |-pprint("Hello, world!")  # T203
-4 3 | 
-5 4 | import pprint
-6 5 | 
+1 | from pprint import pprint
+2 | 
+  - pprint("Hello, world!")  # T203
+3 | 
+4 | import pprint
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 T203 [*] `pprint` found
  --> T203.py:7:1
@@ -32,11 +31,10 @@ T203 [*] `pprint` found
 9 | pprint.pformat("Hello, world!")
   |
 help: Remove `pprint`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | import pprint
-6 6 | 
-7   |-pprint.pprint("Hello, world!")  # T203
-8 7 | 
-9 8 | pprint.pformat("Hello, world!")
+4 | 
+5 | import pprint
+6 | 
+  - pprint.pprint("Hello, world!")  # T203
+7 | 
+8 | pprint.pformat("Hello, world!")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/mod.rs b/crates/ruff_linter/src/rules/flake8_pyi/mod.rs
index a065946483..1248e3c029 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/mod.rs
@@ -192,4 +192,17 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[test_case(Path::new("PYI021_1.pyi"))]
+    fn pyi021_pie790_isolation_check(path: &Path) -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_pyi").join(path).as_path(),
+            &settings::LinterSettings::for_rules([
+                Rule::DocstringInStub,
+                Rule::UnnecessaryPlaceholder,
+            ]),
+        )?;
+        assert_diagnostics!(diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs
index bebf9aee83..aeff638af2 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs
@@ -44,6 +44,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python documentation: The `Any` type](https://docs.python.org/3/library/typing.html#the-any-type)
 /// - [Mypy documentation: Any vs. object](https://mypy.readthedocs.io/en/latest/dynamic_typing.html#any-vs-object)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct AnyEqNeAnnotation {
     method_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_generator_return_type.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_generator_return_type.rs
index 0524b69af6..b836c4de7f 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_generator_return_type.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_generator_return_type.rs
@@ -59,6 +59,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// unsafe for any `__iter__` or `__aiter__` method in a `.py` file that has
 /// more than two statements (including docstrings) in its body.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct GeneratorReturnFromIterMethod {
     return_type: Iterator,
     method: Method,
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
index 6ac4235e64..630e267142 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
@@ -51,6 +51,7 @@ use crate::registry::Rule;
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.254")]
 pub(crate) struct BadVersionInfoComparison;
 
 impl Violation for BadVersionInfoComparison {
@@ -100,6 +101,7 @@ impl Violation for BadVersionInfoComparison {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct BadVersionInfoOrder;
 
 impl Violation for BadVersionInfoOrder {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/bytestring_usage.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/bytestring_usage.rs
index 264d650548..c87c669ab7 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/bytestring_usage.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/bytestring_usage.rs
@@ -28,6 +28,7 @@ use crate::{FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: The `ByteString` type](https://docs.python.org/3/library/typing.html#typing.ByteString)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct ByteStringUsage {
     origin: ByteStringOrigin,
 }
@@ -74,7 +75,8 @@ pub(crate) fn bytestring_attribute(checker: &Checker, attribute: &Expr) {
         ["collections", "abc", "ByteString"] => ByteStringOrigin::CollectionsAbc,
         _ => return,
     };
-    checker.report_diagnostic(ByteStringUsage { origin }, attribute.range());
+    let mut diagnostic = checker.report_diagnostic(ByteStringUsage { origin }, attribute.range());
+    diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
 }
 
 /// PYI057
@@ -94,7 +96,9 @@ pub(crate) fn bytestring_import(checker: &Checker, import_from: &ast::StmtImport
 
     for name in names {
         if name.name.as_str() == "ByteString" {
-            checker.report_diagnostic(ByteStringUsage { origin }, name.range());
+            let mut diagnostic =
+                checker.report_diagnostic(ByteStringUsage { origin }, name.range());
+            diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         }
     }
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/collections_named_tuple.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/collections_named_tuple.rs
index 5c2a4de600..e6735a6921 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/collections_named_tuple.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/collections_named_tuple.rs
@@ -36,6 +36,7 @@ use crate::checkers::ast::Checker;
 ///     age: int
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct CollectionsNamedTuple;
 
 impl Violation for CollectionsNamedTuple {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_assignment_in_stub.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_assignment_in_stub.rs
index 0f38dfe8e6..f5dd22a140 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_assignment_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_assignment_in_stub.rs
@@ -42,6 +42,7 @@ use crate::checkers::ast::Checker;
 ///     X: TypeAlias = int
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct ComplexAssignmentInStub;
 
 impl Violation for ComplexAssignmentInStub {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_if_statement_in_stub.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_if_statement_in_stub.rs
index 010753a0bc..d097df3b34 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_if_statement_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/complex_if_statement_in_stub.rs
@@ -32,6 +32,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Typing documentation: Version and platform checking](https://typing.python.org/en/latest/spec/directives.html#version-and-platform-checks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct ComplexIfStatementInStub;
 
 impl Violation for ComplexIfStatementInStub {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/custom_type_var_for_self.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/custom_type_var_for_self.rs
index aaa182b4e0..b22a050ad0 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/custom_type_var_for_self.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/custom_type_var_for_self.rs
@@ -89,6 +89,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// [typing_TypeVar]: https://docs.python.org/3/library/typing.html#typing.TypeVar
 /// [typing_extensions]: https://typing-extensions.readthedocs.io/en/latest/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.283")]
 pub(crate) struct CustomTypeVarForSelf {
     typevar_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/docstring_in_stubs.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/docstring_in_stubs.rs
index 5921058fbe..abaf7035b5 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/docstring_in_stubs.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/docstring_in_stubs.rs
@@ -1,9 +1,9 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprStringLiteral;
-use ruff_python_semantic::Definition;
+use ruff_python_ast::{ExprStringLiteral, Stmt};
 use ruff_text_size::Ranged;
 
-use crate::checkers::ast::Checker;
+use crate::checkers::ast::{Checker, DocstringState, ExpectedDocstringKind};
+use crate::docstrings::extraction::docstring_from;
 use crate::{AlwaysFixableViolation, Edit, Fix};
 
 /// ## What it does
@@ -27,6 +27,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// def func(param: int) -> str: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct DocstringInStub;
 
 impl AlwaysFixableViolation for DocstringInStub {
@@ -41,26 +42,34 @@ impl AlwaysFixableViolation for DocstringInStub {
 }
 
 /// PYI021
-pub(crate) fn docstring_in_stubs(
-    checker: &Checker,
-    definition: &Definition,
-    docstring: Option<&ExprStringLiteral>,
-) {
+pub(crate) fn docstring_in_stubs(checker: &Checker, body: &[Stmt]) {
+    if !matches!(
+        checker.docstring_state(),
+        DocstringState::Expected(
+            ExpectedDocstringKind::Module
+                | ExpectedDocstringKind::Class
+                | ExpectedDocstringKind::Function
+        )
+    ) {
+        return;
+    }
+
+    let docstring = docstring_from(body);
+
     let Some(docstring_range) = docstring.map(ExprStringLiteral::range) else {
         return;
     };
 
-    let statements = match definition {
-        Definition::Module(module) => module.python_ast,
-        Definition::Member(member) => member.body(),
-    };
-
-    let edit = if statements.len() == 1 {
+    let edit = if body.len() == 1 {
         Edit::range_replacement("...".to_string(), docstring_range)
     } else {
         Edit::range_deletion(docstring_range)
     };
 
-    let mut diagnostic = checker.report_diagnostic(DocstringInStub, docstring_range);
-    diagnostic.set_fix(Fix::unsafe_edit(edit));
+    let isolation_level = Checker::isolation(checker.semantic().current_statement_id());
+    let fix = Fix::unsafe_edit(edit).isolate(isolation_level);
+
+    checker
+        .report_diagnostic(DocstringInStub, docstring_range)
+        .set_fix(fix);
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs
index fea4985036..9ccdfd92db 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs
@@ -40,6 +40,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// ## References
 /// - [Python documentation: `typing.Literal`](https://docs.python.org/3/library/typing.html#typing.Literal)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct DuplicateLiteralMember {
     duplicate_name: String,
 }
@@ -92,14 +93,14 @@ pub(crate) fn duplicate_literal_member<'a>(checker: &Checker, expr: &'a Expr) {
                 Expr::Tuple(ast::ExprTuple {
                     elts: unique_nodes.into_iter().cloned().collect(),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     ctx: ExprContext::Load,
                     parenthesized: false,
                 })
             }),
             value: subscript.value.clone(),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
         });
         let fix = Fix::applicable_edit(
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs
index 2fefb8e01d..cc909a7267 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs
@@ -37,6 +37,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `typing.Union`](https://docs.python.org/3/library/typing.html#typing.Union)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct DuplicateUnionMember {
     duplicate_name: String,
 }
@@ -187,7 +188,7 @@ fn generate_pep604_fix(
                     op: Operator::BitOr,
                     right: Box::new(right.clone()),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 }))
             } else {
                 Some(right.clone())
@@ -202,7 +203,7 @@ fn generate_pep604_fix(
 }
 
 static VIRTUAL_NONE_LITERAL: Expr = Expr::NoneLiteral(ExprNoneLiteral {
-    node_index: AtomicNodeIndex::dummy(),
+    node_index: AtomicNodeIndex::NONE,
     range: TextRange::new(TextSize::new(0), TextSize::new(0)),
 });
 
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs
index 4c1497fe93..d261c9aef7 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs
@@ -28,6 +28,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///     value: int
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.270")]
 pub(crate) struct EllipsisInNonEmptyClassBody;
 
 impl Violation for EllipsisInNonEmptyClassBody {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs
index 3127f3d411..670ad6b891 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs
@@ -47,6 +47,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///     ) -> None: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct BadExitAnnotation {
     func_kind: FuncKind,
     error_kind: ErrorKind,
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/future_annotations_in_stub.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/future_annotations_in_stub.rs
index b85059e756..cd3703c718 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/future_annotations_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/future_annotations_in_stub.rs
@@ -18,6 +18,7 @@ use crate::{checkers::ast::Checker, fix};
 /// ## References
 /// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#language-features)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct FutureAnnotationsInStub;
 
 impl Violation for FutureAnnotationsInStub {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/generic_not_last_base_class.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/generic_not_last_base_class.rs
index 19565abd56..4cd5035693 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/generic_not_last_base_class.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/generic_not_last_base_class.rs
@@ -84,6 +84,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// [1]: https://github.com/python/cpython/issues/106102
 /// [MRO]: https://docs.python.org/3/glossary.html#term-method-resolution-order
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct GenericNotLastBaseClass;
 
 impl Violation for GenericNotLastBaseClass {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs
index b72a0ce0cc..b6f6359014 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs
@@ -69,6 +69,7 @@ use crate::checkers::ast::Checker;
 ///     def __iter__(self) -> collections.abc.Iterator[str]: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct IterMethodReturnIterable {
     is_async: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs
index 77e902da12..beba88b70a 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs
@@ -133,17 +133,17 @@ fn generate_union_fix(
     // Construct the expression as `Subscript[typing.Union, Tuple[expr, [expr, ...]]]`
     let new_expr = Expr::Subscript(ExprSubscript {
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         value: Box::new(Expr::Name(ExprName {
             id: Name::new(binding),
             ctx: ExprContext::Store,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })),
         slice: Box::new(Expr::Tuple(ExprTuple {
             elts: nodes.into_iter().cloned().collect(),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
             parenthesized: false,
         })),
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs
index c129ae33f7..1fa1d645ba 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs
@@ -41,6 +41,7 @@ use ruff_python_ast::PythonVersion;
 ///
 /// [bottom type]: https://en.wikipedia.org/wiki/Bottom_type
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.272")]
 pub(crate) struct NoReturnArgumentAnnotationInStub {
     module: TypingModule,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/non_empty_stub_body.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/non_empty_stub_body.rs
index 3e3efd8c66..36d2fc11b5 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/non_empty_stub_body.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/non_empty_stub_body.rs
@@ -28,6 +28,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Typing documentation - Writing and Maintaining Stub Files](https://typing.python.org/en/latest/guides/writing_stubs.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct NonEmptyStubBody;
 
 impl AlwaysFixableViolation for NonEmptyStubBody {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/non_self_return_type.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/non_self_return_type.rs
index 9e823d11d5..59d01ff834 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/non_self_return_type.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/non_self_return_type.rs
@@ -88,6 +88,7 @@ use ruff_text_size::Ranged;
 /// ## References
 /// - [Python documentation: `typing.Self`](https://docs.python.org/3/library/typing.html#typing.Self)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct NonSelfReturnType {
     class_name: String,
     method_name: String,
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs
index 739778f4cf..83b48e677a 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs
@@ -30,6 +30,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// def foo(arg: int = ...) -> None: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct NumericLiteralTooLong;
 
 impl AlwaysFixableViolation for NumericLiteralTooLong {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_in_class_body.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_in_class_body.rs
index 2177f92e78..336d2664f7 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_in_class_body.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_in_class_body.rs
@@ -27,6 +27,7 @@ use crate::{AlwaysFixableViolation, Fix};
 ///     x: int
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.260")]
 pub(crate) struct PassInClassBody;
 
 impl AlwaysFixableViolation for PassInClassBody {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs
index f4a7f64538..6aa512ca15 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs
@@ -25,6 +25,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Typing documentation - Writing and Maintaining Stub Files](https://typing.python.org/en/latest/guides/writing_stubs.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct PassStatementStubBody;
 
 impl AlwaysFixableViolation for PassStatementStubBody {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/pre_pep570_positional_argument.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/pre_pep570_positional_argument.rs
index ec5fd871bb..507a1b9808 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/pre_pep570_positional_argument.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/pre_pep570_positional_argument.rs
@@ -1,6 +1,6 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast as ast;
 use ruff_python_ast::identifier::Identifier;
-use ruff_python_ast::{self as ast, ParameterWithDefault};
 use ruff_python_semantic::analyze::function_type;
 
 use crate::Violation;
@@ -40,6 +40,7 @@ use ruff_python_ast::PythonVersion;
 /// [PEP 484]: https://peps.python.org/pep-0484/#positional-only-arguments
 /// [PEP 570]: https://peps.python.org/pep-0570
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct Pep484StylePositionalOnlyParameter;
 
 impl Violation for Pep484StylePositionalOnlyParameter {
@@ -85,16 +86,9 @@ pub(crate) fn pep_484_positional_parameter(checker: &Checker, function_def: &ast
         function_type::FunctionType::Method | function_type::FunctionType::ClassMethod
     ));
 
-    if let Some(arg) = function_def.parameters.args.get(skip) {
-        if is_old_style_positional_only(arg) {
-            checker.report_diagnostic(Pep484StylePositionalOnlyParameter, arg.identifier());
+    if let Some(param) = function_def.parameters.args.get(skip) {
+        if param.uses_pep_484_positional_only_convention() {
+            checker.report_diagnostic(Pep484StylePositionalOnlyParameter, param.identifier());
         }
     }
 }
-
-/// Returns `true` if the [`ParameterWithDefault`] is an old-style positional-only parameter (i.e.,
-/// its name starts with `__` and does not end with `__`).
-fn is_old_style_positional_only(param: &ParameterWithDefault) -> bool {
-    let arg_name = param.name();
-    arg_name.starts_with("__") && !arg_name.ends_with("__")
-}
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/prefix_type_params.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/prefix_type_params.rs
index 152c54671b..22f14f043e 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/prefix_type_params.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/prefix_type_params.rs
@@ -46,6 +46,7 @@ impl fmt::Display for VarKind {
 /// _T = TypeVar("_T")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct UnprefixedTypeParam {
     kind: VarKind,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs
index 63b610408b..86bdf32a98 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs
@@ -29,6 +29,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Typing documentation - Writing and Maintaining Stub Files](https://typing.python.org/en/latest/guides/writing_stubs.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.265")]
 pub(crate) struct QuotedAnnotationInStub;
 
 impl AlwaysFixableViolation for QuotedAnnotationInStub {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_final_literal.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_final_literal.rs
index d710b4823f..8b44eab1ce 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_final_literal.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_final_literal.rs
@@ -34,6 +34,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// y: Final = 42
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct RedundantFinalLiteral {
     literal: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_literal_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_literal_union.rs
index 512849b70d..d4d018c748 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_literal_union.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_literal_union.rs
@@ -37,6 +37,7 @@ use crate::fix::snippet::SourceCodeSnippet;
 /// x: Literal[b"B"] | str
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.283")]
 pub(crate) struct RedundantLiteralUnion {
     literal: SourceCodeSnippet,
     builtin_type: ExprType,
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs
index 12c4b01fb9..14145229fc 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs
@@ -4,6 +4,8 @@ use ruff_python_ast::{
     self as ast, Expr, ExprBinOp, ExprContext, ExprNoneLiteral, Operator, PythonVersion,
     helpers::{pep_604_union, typing_optional},
     name::Name,
+    operator_precedence::OperatorPrecedence,
+    parenthesize::parenthesized_range,
 };
 use ruff_python_semantic::analyze::typing::{traverse_literal, traverse_union};
 use ruff_text_size::{Ranged, TextRange};
@@ -47,6 +49,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Typing documentation: Legal parameters for `Literal` at type check time](https://typing.python.org/en/latest/spec/literal.html#legal-parameters-for-literal-at-type-check-time)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct RedundantNoneLiteral {
     union_kind: UnionKind,
 }
@@ -205,13 +208,13 @@ fn create_fix(
     let new_literal_expr = Expr::Subscript(ast::ExprSubscript {
         value: Box::new(literal_subscript.clone()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         ctx: ExprContext::Load,
         slice: Box::new(if literal_elements.len() > 1 {
             Expr::Tuple(ast::ExprTuple {
                 elts: literal_elements.into_iter().cloned().collect(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 ctx: ExprContext::Load,
                 parenthesized: true,
             })
@@ -235,10 +238,22 @@ fn create_fix(
         UnionKind::BitOr => {
             let none_expr = Expr::NoneLiteral(ExprNoneLiteral {
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let union_expr = pep_604_union(&[new_literal_expr, none_expr]);
-            let content = checker.generator().expr(&union_expr);
+
+            // Check if we need parentheses to preserve operator precedence
+            let content = if needs_parentheses_for_precedence(
+                semantic,
+                literal_expr,
+                checker.comment_ranges(),
+                checker.source(),
+            ) {
+                format!("({})", checker.generator().expr(&union_expr))
+            } else {
+                checker.generator().expr(&union_expr)
+            };
+
             let union_edit = Edit::range_replacement(content, literal_expr.range());
             Fix::applicable_edit(union_edit, applicability)
         }
@@ -256,3 +271,37 @@ enum UnionKind {
     TypingOptional,
     BitOr,
 }
+
+/// Check if the union expression needs parentheses to preserve operator precedence.
+/// This is needed when the union is part of a larger expression where the `|` operator
+/// has lower precedence than the surrounding operations (like attribute access).
+fn needs_parentheses_for_precedence(
+    semantic: &ruff_python_semantic::SemanticModel,
+    literal_expr: &Expr,
+    comment_ranges: &ruff_python_trivia::CommentRanges,
+    source: &str,
+) -> bool {
+    // Get the parent expression to check if we're in a context that needs parentheses
+    let Some(parent_expr) = semantic.current_expression_parent() else {
+        return false;
+    };
+
+    // Check if the literal expression is already parenthesized
+    if parenthesized_range(
+        literal_expr.into(),
+        parent_expr.into(),
+        comment_ranges,
+        source,
+    )
+    .is_some()
+    {
+        return false; // Already parenthesized, don't add more
+    }
+
+    // Check if the parent expression has higher precedence than the `|` operator
+    let union_precedence = OperatorPrecedence::BitOr;
+    let parent_precedence = OperatorPrecedence::from(parent_expr);
+
+    // If the parent operation has higher precedence than `|`, we need parentheses
+    parent_precedence > union_precedence
+}
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs
index b493474929..1e4583f312 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs
@@ -53,6 +53,7 @@ use super::generate_union_fix;
 ///
 /// [typing specification]: https://typing.python.org/en/latest/spec/special-types.html#special-cases-for-float-and-complex
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct RedundantNumericUnion {
     redundancy: Redundancy,
 }
@@ -261,7 +262,7 @@ fn generate_pep604_fix(
                     op: Operator::BitOr,
                     right: Box::new(right.clone()),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 }))
             } else {
                 Some(right.clone())
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs
index 32059594db..32b83754be 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs
@@ -41,6 +41,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix, Violation};
 /// ## References
 /// - [`flake8-pyi`](https://github.com/PyCQA/flake8-pyi/blob/main/ERRORCODES.md)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct TypedArgumentDefaultInStub;
 
 impl AlwaysFixableViolation for TypedArgumentDefaultInStub {
@@ -87,6 +88,7 @@ impl AlwaysFixableViolation for TypedArgumentDefaultInStub {
 /// ## References
 /// - [`flake8-pyi`](https://github.com/PyCQA/flake8-pyi/blob/main/ERRORCODES.md)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct ArgumentDefaultInStub;
 
 impl AlwaysFixableViolation for ArgumentDefaultInStub {
@@ -131,6 +133,7 @@ impl AlwaysFixableViolation for ArgumentDefaultInStub {
 /// ## References
 /// - [`flake8-pyi`](https://github.com/PyCQA/flake8-pyi/blob/main/ERRORCODES.md)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.260")]
 pub(crate) struct AssignmentDefaultInStub;
 
 impl AlwaysFixableViolation for AssignmentDefaultInStub {
@@ -151,6 +154,7 @@ impl AlwaysFixableViolation for AssignmentDefaultInStub {
 /// Stub files exist to provide type hints, and are never executed. As such,
 /// all assignments in stub files should be annotated with a type.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct UnannotatedAssignmentInStub {
     name: String,
 }
@@ -182,6 +186,7 @@ impl Violation for UnannotatedAssignmentInStub {
 /// __all__: list[str] = ["foo", "bar"]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct UnassignedSpecialVariableInStub {
     name: String,
 }
@@ -230,6 +235,7 @@ impl Violation for UnassignedSpecialVariableInStub {
 ///
 /// - `lint.typing-extensions`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct TypeAliasWithoutAnnotation {
     module: TypingModule,
     name: String,
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs
index 6cb7ceaa2e..0bc8f55eec 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs
@@ -24,6 +24,7 @@ use crate::{AlwaysFixableViolation, Fix};
 ///     def __repr__(self) -> str: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct StrOrReprDefinedInStub {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
index a739f91d36..0b0580663b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
@@ -33,6 +33,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// def foo(arg: str = ...) -> None: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct StringOrBytesTooLong;
 
 impl AlwaysFixableViolation for StringOrBytesTooLong {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs
index 06b428d7d3..e0e26b055d 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs
@@ -29,6 +29,7 @@ use crate::checkers::ast::Checker;
 /// def function(): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct StubBodyMultipleStatements;
 
 impl Violation for StubBodyMultipleStatements {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/type_alias_naming.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/type_alias_naming.rs
index 7a2aba860b..a7d5d4b387 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/type_alias_naming.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/type_alias_naming.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// TypeAliasName: TypeAlias = int
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.265")]
 pub(crate) struct SnakeCaseTypeAlias {
     name: String,
 }
@@ -65,6 +66,7 @@ impl Violation for SnakeCaseTypeAlias {
 /// ## References
 /// - [PEP 484: Type Aliases](https://peps.python.org/pep-0484/#type-aliases)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.265")]
 pub(crate) struct TSuffixedTypeAlias {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/type_comment_in_stub.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/type_comment_in_stub.rs
index 2fe79461ed..de345707b9 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/type_comment_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/type_comment_in_stub.rs
@@ -28,6 +28,7 @@ use crate::checkers::ast::LintContext;
 /// x: int = 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.254")]
 pub(crate) struct TypeCommentInStub;
 
 impl Violation for TypeCommentInStub {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs
index ba3c63ac2f..47b111f97e 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs
@@ -40,6 +40,7 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 /// `import foo as foo` alias, or are imported via a `*` import. As such, the
 /// fix is marked as safe in more cases for `.pyi` files.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct UnaliasedCollectionsAbcSetImport;
 
 impl Violation for UnaliasedCollectionsAbcSetImport {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs
index 0765eeb48d..cf5cd71932 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs
@@ -47,6 +47,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `typing.Literal`](https://docs.python.org/3/library/typing.html#typing.Literal)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.278")]
 pub(crate) struct UnnecessaryLiteralUnion {
     members: Vec<String>,
 }
@@ -140,12 +141,12 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &Checker, expr: &'a Expr) {
             slice: Box::new(Expr::Tuple(ast::ExprTuple {
                 elts: literal_exprs.into_iter().cloned().collect(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 ctx: ExprContext::Load,
                 parenthesized: true,
             })),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
         });
 
@@ -164,12 +165,12 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &Checker, expr: &'a Expr) {
                         slice: Box::new(Expr::Tuple(ast::ExprTuple {
                             elts,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             ctx: ExprContext::Load,
                             parenthesized: true,
                         })),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         ctx: ExprContext::Load,
                     }))
             } else {
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs
index 56d838b950..2e07aeb84d 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs
@@ -32,6 +32,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// Note that while the fix may flatten nested unions into a single top-level union,
 /// the semantics of the annotation will remain unchanged.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.283")]
 pub(crate) struct UnnecessaryTypeUnion {
     members: Vec<Name>,
     union_kind: UnionKind,
@@ -134,12 +135,12 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) {
                         id: Name::new_static("type"),
                         ctx: ExprContext::Load,
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     })),
                     slice: Box::new(pep_604_union(&elts)),
                     ctx: ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 });
 
                 if other_exprs.is_empty() {
@@ -159,7 +160,7 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) {
                         id: Name::new_static("type"),
                         ctx: ExprContext::Load,
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     })),
                     slice: Box::new(Expr::Subscript(ast::ExprSubscript {
                         value: subscript.value.clone(),
@@ -171,22 +172,22 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) {
                                         id: type_member,
                                         ctx: ExprContext::Load,
                                         range: TextRange::default(),
-                                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                                     })
                                 })
                                 .collect(),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             parenthesized: true,
                         })),
                         ctx: ExprContext::Load,
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     })),
                     ctx: ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 });
 
                 if other_exprs.is_empty() {
@@ -202,12 +203,12 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) {
                             elts: exprs.into_iter().cloned().collect(),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             parenthesized: true,
                         })),
                         ctx: ExprContext::Load,
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     });
 
                     checker.generator().expr(&union)
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_platform.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_platform.rs
index d9183c0966..d7a22d0940 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_platform.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_platform.rs
@@ -46,6 +46,7 @@ use crate::registry::Rule;
 /// ## References
 /// - [Typing documentation: Version and Platform checking](https://typing.python.org/en/latest/spec/directives.html#version-and-platform-checks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.246")]
 pub(crate) struct UnrecognizedPlatformCheck;
 
 impl Violation for UnrecognizedPlatformCheck {
@@ -84,6 +85,7 @@ impl Violation for UnrecognizedPlatformCheck {
 /// ## References
 /// - [Typing documentation: Version and Platform checking](https://typing.python.org/en/latest/spec/directives.html#version-and-platform-checks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.246")]
 pub(crate) struct UnrecognizedPlatformName {
     platform: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_version_info.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_version_info.rs
index 9188e865a8..3fe1fa58ff 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_version_info.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_version_info.rs
@@ -33,6 +33,7 @@ use crate::registry::Rule;
 /// ## References
 /// - [Typing documentation: Version and Platform checking](https://typing.python.org/en/latest/spec/directives.html#version-and-platform-checks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct UnrecognizedVersionInfoCheck;
 
 impl Violation for UnrecognizedVersionInfoCheck {
@@ -72,6 +73,7 @@ impl Violation for UnrecognizedVersionInfoCheck {
 /// ## References
 /// - [Typing documentation: Version and Platform checking](https://typing.python.org/en/latest/spec/directives.html#version-and-platform-checks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct PatchVersionComparison;
 
 impl Violation for PatchVersionComparison {
@@ -108,6 +110,7 @@ impl Violation for PatchVersionComparison {
 /// ## References
 /// - [Typing documentation: Version and Platform checking](https://typing.python.org/en/latest/spec/directives.html#version-and-platform-checks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct WrongTupleLengthVersionComparison {
     expected_length: usize,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unsupported_method_call_on_all.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unsupported_method_call_on_all.rs
index e745f67210..fb55360533 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unsupported_method_call_on_all.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unsupported_method_call_on_all.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 ///     __all__ += ["C"]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct UnsupportedMethodCallOnAll {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unused_private_type_definition.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unused_private_type_definition.rs
index d5e6645642..82f3d93519 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unused_private_type_definition.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unused_private_type_definition.rs
@@ -30,6 +30,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// The fix is always marked as unsafe, as it would break your code if the type
 /// variable is imported by another module.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct UnusedPrivateTypeVar {
     type_var_like_name: String,
     type_var_like_kind: String,
@@ -86,6 +87,7 @@ impl Violation for UnusedPrivateTypeVar {
 /// def func(arg: _PrivateProtocol) -> None: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct UnusedPrivateProtocol {
     name: String,
 }
@@ -124,6 +126,7 @@ impl Violation for UnusedPrivateProtocol {
 /// def func(arg: _UsedTypeAlias) -> _UsedTypeAlias: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct UnusedPrivateTypeAlias {
     name: String,
 }
@@ -164,6 +167,7 @@ impl Violation for UnusedPrivateTypeAlias {
 /// def func(arg: _UsedPrivateTypedDict) -> _UsedPrivateTypedDict: ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct UnusedPrivateTypedDict {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap
index 4f421dfbec..21117270c5 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap
@@ -12,15 +12,13 @@ PYI009 [*] Empty body should contain `...`, not `pass`
 5 | class Bar: ...  # OK
   |
 help: Replace `pass` with `...`
-
-ℹ Safe 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 | 
+1 | def bar(): ...  # OK
+2 | def foo():
+  -     pass  # ERROR PYI009, since we're in a stub file
+3 +     ...  # ERROR PYI009, since we're in a stub file
+4 | 
+5 | class Bar: ...  # OK
+6 | 
 
 PYI009 [*] Empty body should contain `...`, not `pass`
  --> PYI009.pyi:8:5
@@ -30,10 +28,8 @@ PYI009 [*] Empty body should contain `...`, not `pass`
   |     ^^^^
   |
 help: Replace `pass` with `...`
-
-ℹ Safe 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
+5 | class Bar: ...  # OK
+6 | 
+7 | class Foo:
+  -     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_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap
index cbee721ffd..5e08248e09 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap
@@ -11,16 +11,14 @@ PYI010 [*] Function body must contain only `...`
 8 | def foo2():
   |
 help: Replace function body with `...`
-
-ℹ Safe fix
-3 3 |     """foo"""  # OK, docstrings 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
+3 |     """foo"""  # OK, docstrings are handled by another rule
+4 | 
+5 | def buzz():
+  -     print("buzz")  # ERROR PYI010
+6 +     ...  # ERROR PYI010
+7 | 
+8 | def foo2():
+9 |     123  # ERROR PYI010
 
 PYI010 [*] Function body must contain only `...`
   --> PYI010.pyi:9:5
@@ -32,16 +30,14 @@ PYI010 [*] Function body must contain only `...`
 11 | def bizz():
    |
 help: Replace function body with `...`
-
-ℹ Safe 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
+6  |     print("buzz")  # ERROR PYI010
+7  | 
+8  | def foo2():
+   -     123  # ERROR PYI010
+9  +     ...  # ERROR PYI010
+10 | 
+11 | def bizz():
+12 |     x = 123  # ERROR PYI010
 
 PYI010 [*] Function body must contain only `...`
   --> PYI010.pyi:12:5
@@ -53,13 +49,11 @@ PYI010 [*] Function body must contain only `...`
 14 | def foo3():
    |
 help: Replace function body with `...`
-
-ℹ Safe fix
-9  9  |     123  # ERROR PYI010
-10 10 | 
-11 11 | def bizz():
-12    |-    x = 123  # ERROR PYI010
-   12 |+    ...  # ERROR PYI010
-13 13 | 
-14 14 | def foo3():
-15 15 |     pass  # OK, pass is handled by another rule
+9  |     123  # ERROR PYI010
+10 | 
+11 | def bizz():
+   -     x = 123  # ERROR PYI010
+12 +     ...  # ERROR PYI010
+13 | 
+14 | def foo3():
+15 |     pass  # OK, pass is handled by another rule
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap
index 010b4f26d8..cb774917e3 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap
@@ -12,16 +12,14 @@ PYI011 [*] Only simple default values allowed for typed arguments
 12 | def f11(*, x: str = "x") -> None: ...  # OK
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-7  7  | 
-8  8  | def f12(
-9  9  |     x,
-10    |-    y: str = os.pathsep,  # Error PYI011 Only simple default values allowed for typed arguments
-   10 |+    y: str = ...,  # Error PYI011 Only simple default values allowed for typed arguments
-11 11 | ) -> None: ...
-12 12 | def f11(*, x: str = "x") -> None: ...  # OK
-13 13 | def f13(
+7  | 
+8  | def f12(
+9  |     x,
+   -     y: str = os.pathsep,  # Error PYI011 Only simple default values allowed for typed arguments
+10 +     y: str = ...,  # Error PYI011 Only simple default values allowed for typed arguments
+11 | ) -> None: ...
+12 | def f11(*, x: str = "x") -> None: ...  # OK
+13 | def f13(
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:38:9
@@ -38,19 +36,17 @@ PYI011 [*] Only simple default values allowed for typed arguments
 43 |   def f153(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-35 35 | def f152(
-36 36 |     x: dict[
-37 37 |         int, int
-38    |-    ] = {  # Error PYI011 Only simple default values allowed for typed arguments
-39    |-        1: 2,
-40    |-        **{3: 4},
-41    |-    }
-   38 |+    ] = ...
-42 39 | ) -> None: ...
-43 40 | def f153(
-44 41 |     x: list[
+35 | def f152(
+36 |     x: dict[
+37 |         int, int
+   -     ] = {  # Error PYI011 Only simple default values allowed for typed arguments
+   -         1: 2,
+   -         **{3: 4},
+   -     }
+38 +     ] = ...
+39 | ) -> None: ...
+40 | def f153(
+41 |     x: list[
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:46:9
@@ -76,28 +72,26 @@ PYI011 [*] Only simple default values allowed for typed arguments
 60 |   def f154(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-43 43 | def f153(
-44 44 |     x: list[
-45 45 |         int
-46    |-    ] = [  # Error PYI011 Only simple default values allowed for typed arguments
-47    |-        1,
-48    |-        2,
-49    |-        3,
-50    |-        4,
-51    |-        5,
-52    |-        6,
-53    |-        7,
-54    |-        8,
-55    |-        9,
-56    |-        10,
-57    |-        11,
-58    |-    ]
-   46 |+    ] = ...
-59 47 | ) -> None: ...
-60 48 | def f154(
-61 49 |     x: tuple[
+43 | def f153(
+44 |     x: list[
+45 |         int
+   -     ] = [  # Error PYI011 Only simple default values allowed for typed arguments
+   -         1,
+   -         2,
+   -         3,
+   -         4,
+   -         5,
+   -         6,
+   -         7,
+   -         8,
+   -         9,
+   -         10,
+   -         11,
+   -     ]
+46 +     ] = ...
+47 | ) -> None: ...
+48 | def f154(
+49 |     x: tuple[
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:63:9
@@ -114,19 +108,17 @@ PYI011 [*] Only simple default values allowed for typed arguments
 68 |   def f141(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-60 60 | def f154(
-61 61 |     x: tuple[
-62 62 |         str, tuple[str, ...]
-63    |-    ] = (  # Error PYI011 Only simple default values allowed for typed arguments
-64    |-        "foo",
-65    |-        ("bar", "baz"),
-66    |-    )
-   63 |+    ] = ...
-67 64 | ) -> None: ...
-68 65 | def f141(
-69 66 |     x: list[
+60 | def f154(
+61 |     x: tuple[
+62 |         str, tuple[str, ...]
+   -     ] = (  # Error PYI011 Only simple default values allowed for typed arguments
+   -         "foo",
+   -         ("bar", "baz"),
+   -     )
+63 +     ] = ...
+64 | ) -> None: ...
+65 | def f141(
+66 |     x: list[
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:71:9
@@ -142,18 +134,16 @@ PYI011 [*] Only simple default values allowed for typed arguments
 75 |   def f142(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-68 68 | def f141(
-69 69 |     x: list[
-70 70 |         int
-71    |-    ] = [  # Error PYI011 Only simple default values allowed for typed arguments
-72    |-        *range(10)
-73    |-    ],
-   71 |+    ] = ...,
-74 72 | ) -> None: ...
-75 73 | def f142(
-76 74 |     x: list[
+68 | def f141(
+69 |     x: list[
+70 |         int
+   -     ] = [  # Error PYI011 Only simple default values allowed for typed arguments
+   -         *range(10)
+   -     ],
+71 +     ] = ...,
+72 | ) -> None: ...
+73 | def f142(
+74 |     x: list[
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:78:9
@@ -169,18 +159,16 @@ PYI011 [*] Only simple default values allowed for typed arguments
 82 |   def f16(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-75 75 | def f142(
-76 76 |     x: list[
-77 77 |         int
-78    |-    ] = list(  # Error PYI011 Only simple default values allowed for typed arguments
-79    |-        range(10)
-80    |-    ),
-   78 |+    ] = ...,
-81 79 | ) -> None: ...
-82 80 | def f16(
-83 81 |     x: frozenset[
+75 | def f142(
+76 |     x: list[
+77 |         int
+   -     ] = list(  # Error PYI011 Only simple default values allowed for typed arguments
+   -         range(10)
+   -     ),
+78 +     ] = ...,
+79 | ) -> None: ...
+80 | def f16(
+81 |     x: frozenset[
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:85:9
@@ -196,18 +184,16 @@ PYI011 [*] Only simple default values allowed for typed arguments
 89 |   def f17(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-82 82 | def f16(
-83 83 |     x: frozenset[
-84 84 |         bytes
-85    |-    ] = frozenset(  # Error PYI011 Only simple default values allowed for typed arguments
-86    |-        {b"foo", b"bar", b"baz"}
-87    |-    )
-   85 |+    ] = ...
-88 86 | ) -> None: ...
-89 87 | def f17(
-90 88 |     x: str = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
+82 | def f16(
+83 |     x: frozenset[
+84 |         bytes
+   -     ] = frozenset(  # Error PYI011 Only simple default values allowed for typed arguments
+   -         {b"foo", b"bar", b"baz"}
+   -     )
+85 +     ] = ...
+86 | ) -> None: ...
+87 | def f17(
+88 |     x: str = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:90:14
@@ -222,17 +208,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 93 |   def f18(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-87 87 |     )
-88 88 | ) -> None: ...
-89 89 | def f17(
-90    |-    x: str = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
-91    |-    + "bar",
-   90 |+    x: str = ...,
-92 91 | ) -> None: ...
-93 92 | def f18(
-94 93 |     x: str = b"foo"  # Error PYI011 Only simple default values allowed for typed arguments
+87 |     )
+88 | ) -> None: ...
+89 | def f17(
+   -     x: str = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
+   -     + "bar",
+90 +     x: str = ...,
+91 | ) -> None: ...
+92 | def f18(
+93 |     x: str = b"foo"  # Error PYI011 Only simple default values allowed for typed arguments
 
 PYI011 [*] Only simple default values allowed for typed arguments
   --> PYI011.pyi:94:14
@@ -247,17 +231,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 97 |   def f19(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-91 91 |     + "bar",
-92 92 | ) -> None: ...
-93 93 | def f18(
-94    |-    x: str = b"foo"  # Error PYI011 Only simple default values allowed for typed arguments
-95    |-    + b"bar",
-   94 |+    x: str = ...,
-96 95 | ) -> None: ...
-97 96 | def f19(
-98 97 |     x: object = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
+91 |     + "bar",
+92 | ) -> None: ...
+93 | def f18(
+   -     x: str = b"foo"  # Error PYI011 Only simple default values allowed for typed arguments
+   -     + b"bar",
+94 +     x: str = ...,
+95 | ) -> None: ...
+96 | def f19(
+97 |     x: object = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:98:17
@@ -272,17 +254,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 101 |   def f20(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-95  95  |     + b"bar",
-96  96  | ) -> None: ...
-97  97  | def f19(
-98      |-    x: object = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
-99      |-    + 4,
-    98  |+    x: object = ...,
-100 99  | ) -> None: ...
-101 100 | def f20(
-102 101 |     x: int = 5
+95  |     + b"bar",
+96  | ) -> None: ...
+97  | def f19(
+    -     x: object = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
+    -     + 4,
+98  +     x: object = ...,
+99  | ) -> None: ...
+100 | def f20(
+101 |     x: int = 5
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:102:14
@@ -297,17 +277,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 105 |   def f21(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-99  99  |     + 4,
-100 100 | ) -> None: ...
-101 101 | def f20(
-102     |-    x: int = 5
-103     |-    + 5,  # Error PYI011 Only simple default values allowed for typed arguments
-    102 |+    x: int = ...,  # Error PYI011 Only simple default values allowed for typed arguments
-104 103 | ) -> None: ...
-105 104 | def f21(
-106 105 |     x: complex = 3j
+99  |     + 4,
+100 | ) -> None: ...
+101 | def f20(
+    -     x: int = 5
+    -     + 5,  # Error PYI011 Only simple default values allowed for typed arguments
+102 +     x: int = ...,  # Error PYI011 Only simple default values allowed for typed arguments
+103 | ) -> None: ...
+104 | def f21(
+105 |     x: complex = 3j
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:106:18
@@ -322,17 +300,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 109 |   def f22(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-103 103 |     + 5,  # Error PYI011 Only simple default values allowed for typed arguments
-104 104 | ) -> None: ...
-105 105 | def f21(
-106     |-    x: complex = 3j
-107     |-    - 3j,  # Error PYI011 Only simple default values allowed for typed arguments
-    106 |+    x: complex = ...,  # Error PYI011 Only simple default values allowed for typed arguments
-108 107 | ) -> None: ...
-109 108 | def f22(
-110 109 |     x: complex = -42.5j  # Error PYI011 Only simple default values allowed for typed arguments
+103 |     + 5,  # Error PYI011 Only simple default values allowed for typed arguments
+104 | ) -> None: ...
+105 | def f21(
+    -     x: complex = 3j
+    -     - 3j,  # Error PYI011 Only simple default values allowed for typed arguments
+106 +     x: complex = ...,  # Error PYI011 Only simple default values allowed for typed arguments
+107 | ) -> None: ...
+108 | def f22(
+109 |     x: complex = -42.5j  # Error PYI011 Only simple default values allowed for typed arguments
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:110:18
@@ -347,17 +323,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 113 |   def f23(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-107 107 |     - 3j,  # Error PYI011 Only simple default values allowed for typed arguments
-108 108 | ) -> None: ...
-109 109 | def f22(
-110     |-    x: complex = -42.5j  # Error PYI011 Only simple default values allowed for typed arguments
-111     |-    + 4.3j,
-    110 |+    x: complex = ...,
-112 111 | ) -> None: ...
-113 112 | def f23(
-114 113 |     x: bool = True,  # OK
+107 |     - 3j,  # Error PYI011 Only simple default values allowed for typed arguments
+108 | ) -> None: ...
+109 | def f22(
+    -     x: complex = -42.5j  # Error PYI011 Only simple default values allowed for typed arguments
+    -     + 4.3j,
+110 +     x: complex = ...,
+111 | ) -> None: ...
+112 | def f23(
+113 |     x: bool = True,  # OK
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:138:16
@@ -370,16 +344,14 @@ PYI011 [*] Only simple default values allowed for typed arguments
 140 | def f32(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-135 135 |     x: float = -math.inf,  # OK
-136 136 | ) -> None: ...
-137 137 | def f31(
-138     |-    x: float = inf,  # Error PYI011 Only simple default values allowed for typed arguments
-    138 |+    x: float = ...,  # Error PYI011 Only simple default values allowed for typed arguments
-139 139 | ) -> None: ...
-140 140 | def f32(
-141 141 |     x: float = np.inf,  # Error PYI011 Only simple default values allowed for typed arguments
+135 |     x: float = -math.inf,  # OK
+136 | ) -> None: ...
+137 | def f31(
+    -     x: float = inf,  # Error PYI011 Only simple default values allowed for typed arguments
+138 +     x: float = ...,  # Error PYI011 Only simple default values allowed for typed arguments
+139 | ) -> None: ...
+140 | def f32(
+141 |     x: float = np.inf,  # Error PYI011 Only simple default values allowed for typed arguments
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:141:16
@@ -392,16 +364,14 @@ PYI011 [*] Only simple default values allowed for typed arguments
 143 | def f33(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-138 138 |     x: float = inf,  # Error PYI011 Only simple default values allowed for typed arguments
-139 139 | ) -> None: ...
-140 140 | def f32(
-141     |-    x: float = np.inf,  # Error PYI011 Only simple default values allowed for typed arguments
-    141 |+    x: float = ...,  # Error PYI011 Only simple default values allowed for typed arguments
-142 142 | ) -> None: ...
-143 143 | def f33(
-144 144 |     x: float = math.nan,  # OK
+138 |     x: float = inf,  # Error PYI011 Only simple default values allowed for typed arguments
+139 | ) -> None: ...
+140 | def f32(
+    -     x: float = np.inf,  # Error PYI011 Only simple default values allowed for typed arguments
+141 +     x: float = ...,  # Error PYI011 Only simple default values allowed for typed arguments
+142 | ) -> None: ...
+143 | def f33(
+144 |     x: float = math.nan,  # OK
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:147:16
@@ -414,16 +384,14 @@ PYI011 [*] Only simple default values allowed for typed arguments
 149 | def f35(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-144 144 |     x: float = math.nan,  # OK
-145 145 | ) -> None: ...
-146 146 | def f34(
-147     |-    x: float = -math.nan,  # Error PYI011 Only simple default values allowed for typed arguments
-    147 |+    x: float = ...,  # Error PYI011 Only simple default values allowed for typed arguments
-148 148 | ) -> None: ...
-149 149 | def f35(
-150 150 |     x: complex = math.inf  # Error PYI011 Only simple default values allowed for typed arguments
+144 |     x: float = math.nan,  # OK
+145 | ) -> None: ...
+146 | def f34(
+    -     x: float = -math.nan,  # Error PYI011 Only simple default values allowed for typed arguments
+147 +     x: float = ...,  # Error PYI011 Only simple default values allowed for typed arguments
+148 | ) -> None: ...
+149 | def f35(
+150 |     x: complex = math.inf  # Error PYI011 Only simple default values allowed for typed arguments
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:150:18
@@ -438,17 +406,15 @@ PYI011 [*] Only simple default values allowed for typed arguments
 153 |   def f36(
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-147 147 |     x: float = -math.nan,  # Error PYI011 Only simple default values allowed for typed arguments
-148 148 | ) -> None: ...
-149 149 | def f35(
-150     |-    x: complex = math.inf  # Error PYI011 Only simple default values allowed for typed arguments
-151     |-    + 1j,
-    150 |+    x: complex = ...,
-152 151 | ) -> None: ...
-153 152 | def f36(
-154 153 |     *,
+147 |     x: float = -math.nan,  # Error PYI011 Only simple default values allowed for typed arguments
+148 | ) -> None: ...
+149 | def f35(
+    -     x: complex = math.inf  # Error PYI011 Only simple default values allowed for typed arguments
+    -     + 1j,
+150 +     x: complex = ...,
+151 | ) -> None: ...
+152 | def f36(
+153 |     *,
 
 PYI011 [*] Only simple default values allowed for typed arguments
    --> PYI011.pyi:159:14
@@ -462,12 +428,10 @@ PYI011 [*] Only simple default values allowed for typed arguments
 161 |   ) -> None: ...
     |
 help: Replace default value with `...`
-
-ℹ Safe fix
-156 156 | ) -> None: ...
-157 157 | def f37(
-158 158 |     *,
-159     |-    x: str = ""  # Error PYI011 Only simple default values allowed for typed arguments
-160     |-    + "",
-    159 |+    x: str = ...,
-161 160 | ) -> None: ...
+156 | ) -> None: ...
+157 | def f37(
+158 |     *,
+    -     x: str = ""  # Error PYI011 Only simple default values allowed for typed arguments
+    -     + "",
+159 +     x: str = ...,
+160 | ) -> None: ...
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap
index 874cc0c640..510e70a09b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap
@@ -12,15 +12,13 @@ PYI012 [*] Class body must not contain `pass`
 7 | class OneAttributeClassRev:
   |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-2 2 | 
-3 3 | class OneAttributeClass:
-4 4 |     value: int
-5   |-    pass  # PYI012 Class body must not contain `pass`
-6 5 | 
-7 6 | class OneAttributeClassRev:
-8 7 |     pass  # PYI012 Class body must not contain `pass`
+2 | 
+3 | class OneAttributeClass:
+4 |     value: int
+  -     pass  # PYI012 Class body must not contain `pass`
+5 | 
+6 | class OneAttributeClassRev:
+7 |     pass  # PYI012 Class body must not contain `pass`
 
 PYI012 [*] Class body must not contain `pass`
  --> PYI012.pyi:8:5
@@ -31,15 +29,13 @@ PYI012 [*] Class body must not contain `pass`
 9 |     value: int
   |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-5 5 |     pass  # PYI012 Class body must not contain `pass`
-6 6 | 
-7 7 | class OneAttributeClassRev:
-8   |-    pass  # PYI012 Class body must not contain `pass`
-9 8 |     value: int
-10 9 | 
-11 10 | class DocstringClass:
+5  |     pass  # PYI012 Class body must not contain `pass`
+6  | 
+7  | class OneAttributeClassRev:
+   -     pass  # PYI012 Class body must not contain `pass`
+8  |     value: int
+9  | 
+10 | class DocstringClass:
 
 PYI012 [*] Class body must not contain `pass`
   --> PYI012.pyi:16:5
@@ -52,15 +48,13 @@ PYI012 [*] Class body must not contain `pass`
 18 | class NonEmptyChild(Exception):
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-13 13 |     My body only contains pass.
-14 14 |     """
-15 15 | 
-16    |-    pass  # PYI012 Class body must not contain `pass`
-17 16 | 
-18 17 | class NonEmptyChild(Exception):
-19 18 |     value: int
+13 |     My body only contains pass.
+14 |     """
+15 | 
+   -     pass  # PYI012 Class body must not contain `pass`
+16 | 
+17 | class NonEmptyChild(Exception):
+18 |     value: int
 
 PYI012 [*] Class body must not contain `pass`
   --> PYI012.pyi:20:5
@@ -73,15 +67,13 @@ PYI012 [*] Class body must not contain `pass`
 22 | class NonEmptyChild2(Exception):
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-17 17 | 
-18 18 | class NonEmptyChild(Exception):
-19 19 |     value: int
-20    |-    pass  # PYI012 Class body must not contain `pass`
-21 20 | 
-22 21 | class NonEmptyChild2(Exception):
-23 22 |     pass  # PYI012 Class body must not contain `pass`
+17 | 
+18 | class NonEmptyChild(Exception):
+19 |     value: int
+   -     pass  # PYI012 Class body must not contain `pass`
+20 | 
+21 | class NonEmptyChild2(Exception):
+22 |     pass  # PYI012 Class body must not contain `pass`
 
 PYI012 [*] Class body must not contain `pass`
   --> PYI012.pyi:23:5
@@ -92,15 +84,13 @@ PYI012 [*] Class body must not contain `pass`
 24 |     value: int
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-20 20 |     pass  # PYI012 Class body must not contain `pass`
-21 21 | 
-22 22 | class NonEmptyChild2(Exception):
-23    |-    pass  # PYI012 Class body must not contain `pass`
-24 23 |     value: int
-25 24 | 
-26 25 | class NonEmptyWithInit:
+20 |     pass  # PYI012 Class body must not contain `pass`
+21 | 
+22 | class NonEmptyChild2(Exception):
+   -     pass  # PYI012 Class body must not contain `pass`
+23 |     value: int
+24 | 
+25 | class NonEmptyWithInit:
 
 PYI012 [*] Class body must not contain `pass`
   --> PYI012.pyi:28:5
@@ -113,12 +103,10 @@ PYI012 [*] Class body must not contain `pass`
 30 |     def __init__():
    |
 help: Remove unnecessary `pass`
-
-ℹ Safe fix
-25 25 | 
-26 26 | class NonEmptyWithInit:
-27 27 |     value: int
-28    |-    pass  # PYI012 Class body must not contain `pass`
-29 28 | 
-30 29 |     def __init__():
-31 30 |         pass
+25 | 
+26 | class NonEmptyWithInit:
+27 |     value: int
+   -     pass  # PYI012 Class body must not contain `pass`
+28 | 
+29 |     def __init__():
+30 |         pass
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap
index c9e96ca5b3..154ca7681b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap
@@ -10,14 +10,12 @@ PYI013 [*] Non-empty class body must not contain `...`
   |     ^^^
   |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-1 1 | class OneAttributeClass:
-2 2 |     value: int
-3   |-    ...
-4 3 | 
-5 4 | 
-6 5 | class OneAttributeClass2:
+1 | class OneAttributeClass:
+2 |     value: int
+  -     ...
+3 | 
+4 | 
+5 | class OneAttributeClass2:
 
 PYI013 [*] Non-empty class body must not contain `...`
  --> PYI013.py:7:5
@@ -28,15 +26,13 @@ PYI013 [*] Non-empty class body must not contain `...`
 8 |     value: int
   |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | class OneAttributeClass2:
-7   |-    ...
-8 7 |     value: int
-9 8 | 
-10 9 | 
+4 | 
+5 | 
+6 | class OneAttributeClass2:
+  -     ...
+7 |     value: int
+8 | 
+9 | 
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:12:5
@@ -47,15 +43,13 @@ PYI013 [*] Non-empty class body must not contain `...`
 13 |     ...
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-10 10 | 
-11 11 | class TwoEllipsesClass:
-12 12 |     ...
-13    |-    ...
-14 13 | 
-15 14 | 
-16 15 | class DocstringClass:
+10 | 
+11 | class TwoEllipsesClass:
+12 |     ...
+   -     ...
+13 | 
+14 | 
+15 | class DocstringClass:
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:13:5
@@ -66,15 +60,13 @@ PYI013 [*] Non-empty class body must not contain `...`
    |     ^^^
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-10 10 | 
-11 11 | class TwoEllipsesClass:
-12 12 |     ...
-13    |-    ...
-14 13 | 
-15 14 | 
-16 15 | class DocstringClass:
+10 | 
+11 | class TwoEllipsesClass:
+12 |     ...
+   -     ...
+13 | 
+14 | 
+15 | class DocstringClass:
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:21:5
@@ -85,15 +77,13 @@ PYI013 [*] Non-empty class body must not contain `...`
    |     ^^^
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-18 18 |     My body only contains an ellipsis.
-19 19 |     """
-20 20 | 
-21    |-    ...
-22 21 | 
-23 22 | 
-24 23 | class NonEmptyChild(Exception):
+18 |     My body only contains an ellipsis.
+19 |     """
+20 | 
+   -     ...
+21 | 
+22 | 
+23 | class NonEmptyChild(Exception):
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:26:5
@@ -104,15 +94,13 @@ PYI013 [*] Non-empty class body must not contain `...`
    |     ^^^
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-23 23 | 
-24 24 | class NonEmptyChild(Exception):
-25 25 |     value: int
-26    |-    ...
-27 26 | 
-28 27 | 
-29 28 | class NonEmptyChild2(Exception):
+23 | 
+24 | class NonEmptyChild(Exception):
+25 |     value: int
+   -     ...
+26 | 
+27 | 
+28 | class NonEmptyChild2(Exception):
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:30:5
@@ -123,15 +111,13 @@ PYI013 [*] Non-empty class body must not contain `...`
 31 |     value: int
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-27 27 | 
-28 28 | 
-29 29 | class NonEmptyChild2(Exception):
-30    |-    ...
-31 30 |     value: int
-32 31 | 
-33 32 | 
+27 | 
+28 | 
+29 | class NonEmptyChild2(Exception):
+   -     ...
+30 |     value: int
+31 | 
+32 | 
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:36:5
@@ -144,15 +130,13 @@ PYI013 [*] Non-empty class body must not contain `...`
 38 |     def __init__():
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-33 33 | 
-34 34 | class NonEmptyWithInit:
-35 35 |     value: int
-36    |-    ...
-37 36 | 
-38 37 |     def __init__():
-39 38 |         pass
+33 | 
+34 | class NonEmptyWithInit:
+35 |     value: int
+   -     ...
+36 | 
+37 |     def __init__():
+38 |         pass
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.py:44:5
@@ -163,13 +147,11 @@ PYI013 [*] Non-empty class body must not contain `...`
    |     ^^^
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-41 41 | 
-42 42 | class NonEmptyChildWithInlineComment:
-43 43 |     value: int
-44    |-    ... # preserve me
-   44 |+    # preserve me
-45 45 | 
-46 46 | 
-47 47 | class EmptyClass:
+41 | 
+42 | class NonEmptyChildWithInlineComment:
+43 |     value: int
+   -     ... # preserve me
+44 +     # preserve me
+45 | 
+46 | 
+47 | class EmptyClass:
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap
index 0c8e65f7bf..ccb21f6962 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap
@@ -12,16 +12,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 7 | class OneAttributeClass2:
   |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-2 2 | 
-3 3 | class OneAttributeClass:
-4 4 |     value: int
-5   |-    ...  # Error
-  5 |+    # Error
-6 6 | 
-7 7 | class OneAttributeClass2:
-8 8 |     ...  # Error
+2 | 
+3 | class OneAttributeClass:
+4 |     value: int
+  -     ...  # Error
+5 +     # Error
+6 | 
+7 | class OneAttributeClass2:
+8 |     ...  # Error
 
 PYI013 [*] Non-empty class body must not contain `...`
  --> PYI013.pyi:8:5
@@ -32,16 +30,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 9 |     value: int
   |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-5 5 |     ...  # Error
-6 6 | 
-7 7 | class OneAttributeClass2:
-8   |-    ...  # Error
-  8 |+    # Error
-9 9 |     value: int
-10 10 | 
-11 11 | class MyClass:
+5  |     ...  # Error
+6  | 
+7  | class OneAttributeClass2:
+   -     ...  # Error
+8  +     # Error
+9  |     value: int
+10 | 
+11 | class MyClass:
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:12:5
@@ -52,15 +48,13 @@ PYI013 [*] Non-empty class body must not contain `...`
 13 |     value: int
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-9  9  |     value: int
-10 10 | 
-11 11 | class MyClass:
-12    |-    ...
-13 12 |     value: int
-14 13 | 
-15 14 | class TwoEllipsesClass:
+9  |     value: int
+10 | 
+11 | class MyClass:
+   -     ...
+12 |     value: int
+13 | 
+14 | class TwoEllipsesClass:
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:16:5
@@ -71,15 +65,13 @@ PYI013 [*] Non-empty class body must not contain `...`
 17 |     ...  # Error
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-13 13 |     value: int
-14 14 | 
-15 15 | class TwoEllipsesClass:
-16    |-    ...
-17 16 |     ...  # Error
-18 17 | 
-19 18 | class DocstringClass:
+13 |     value: int
+14 | 
+15 | class TwoEllipsesClass:
+   -     ...
+16 |     ...  # Error
+17 | 
+18 | class DocstringClass:
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:17:5
@@ -92,16 +84,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 19 | class DocstringClass:
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-14 14 | 
-15 15 | class TwoEllipsesClass:
-16 16 |     ...
-17    |-    ...  # Error
-   17 |+    # Error
-18 18 | 
-19 19 | class DocstringClass:
-20 20 |     """
+14 | 
+15 | class TwoEllipsesClass:
+16 |     ...
+   -     ...  # Error
+17 +     # Error
+18 | 
+19 | class DocstringClass:
+20 |     """
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:24:5
@@ -114,16 +104,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 26 | class NonEmptyChild(Exception):
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-21 21 |     My body only contains an ellipsis.
-22 22 |     """
-23 23 | 
-24    |-    ...  # Error
-   24 |+    # Error
-25 25 | 
-26 26 | class NonEmptyChild(Exception):
-27 27 |     value: int
+21 |     My body only contains an ellipsis.
+22 |     """
+23 | 
+   -     ...  # Error
+24 +     # Error
+25 | 
+26 | class NonEmptyChild(Exception):
+27 |     value: int
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:28:5
@@ -136,16 +124,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 30 | class NonEmptyChild2(Exception):
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-25 25 | 
-26 26 | class NonEmptyChild(Exception):
-27 27 |     value: int
-28    |-    ...  # Error
-   28 |+    # Error
-29 29 | 
-30 30 | class NonEmptyChild2(Exception):
-31 31 |     ...  # Error
+25 | 
+26 | class NonEmptyChild(Exception):
+27 |     value: int
+   -     ...  # Error
+28 +     # Error
+29 | 
+30 | class NonEmptyChild2(Exception):
+31 |     ...  # Error
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:31:5
@@ -156,16 +142,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 32 |     value: int
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-28 28 |     ...  # Error
-29 29 | 
-30 30 | class NonEmptyChild2(Exception):
-31    |-    ...  # Error
-   31 |+    # Error
-32 32 |     value: int
-33 33 | 
-34 34 | class NonEmptyWithInit:
+28 |     ...  # Error
+29 | 
+30 | class NonEmptyChild2(Exception):
+   -     ...  # Error
+31 +     # Error
+32 |     value: int
+33 | 
+34 | class NonEmptyWithInit:
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:36:5
@@ -178,16 +162,14 @@ PYI013 [*] Non-empty class body must not contain `...`
 38 |     def __init__():
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-33 33 | 
-34 34 | class NonEmptyWithInit:
-35 35 |     value: int
-36    |-    ...  # Error
-   36 |+    # Error
-37 37 | 
-38 38 |     def __init__():
-39 39 |         pass
+33 | 
+34 | class NonEmptyWithInit:
+35 |     value: int
+   -     ...  # Error
+36 +     # Error
+37 | 
+38 |     def __init__():
+39 |         pass
 
 PYI013 [*] Non-empty class body must not contain `...`
   --> PYI013.pyi:43:5
@@ -200,13 +182,11 @@ PYI013 [*] Non-empty class body must not contain `...`
 45 | # Not violations
    |
 help: Remove unnecessary `...`
-
-ℹ Safe fix
-40 40 | 
-41 41 | class NonEmptyChildWithInlineComment:
-42 42 |     value: int
-43    |-    ... # preserve me
-   43 |+    # preserve me
-44 44 | 
-45 45 | # Not violations
-46 46 |
+40 | 
+41 | class NonEmptyChildWithInlineComment:
+42 |     value: int
+   -     ... # preserve me
+43 +     # preserve me
+44 | 
+45 | # Not violations
+46 |
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap
index d236b3a61a..6e479272d5 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap
@@ -12,15 +12,13 @@ PYI014 [*] Only simple default values allowed for arguments
 5 | def f11(*, x="x") -> None: ...  # OK
   |
 help: Replace default value with `...`
-
-ℹ Safe fix
-1 1 | def f12(
-2 2 |     x,
-3   |-    y=os.pathsep,  # Error PYI014
-  3 |+    y=...,  # Error PYI014
-4 4 | ) -> None: ...
-5 5 | def f11(*, x="x") -> None: ...  # OK
-6 6 | def f13(
+1 | def f12(
+2 |     x,
+  -     y=os.pathsep,  # Error PYI014
+3 +     y=...,  # Error PYI014
+4 | ) -> None: ...
+5 | def f11(*, x="x") -> None: ...  # OK
+6 | def f13(
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:29:7
@@ -37,19 +35,17 @@ PYI014 [*] Only simple default values allowed for arguments
 34 |   def f153(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-26 26 | ) -> None: ...
-27 27 | def f151(x={1: 2}) -> None: ...
-28 28 | def f152(
-29    |-    x={  # Error PYI014
-30    |-        1: 2,
-31    |-        **{3: 4},
-32    |-    }
-   29 |+    x=...
-33 30 | ) -> None: ...
-34 31 | def f153(
-35 32 |     x=[  # Error PYI014
+26 | ) -> None: ...
+27 | def f151(x={1: 2}) -> None: ...
+28 | def f152(
+   -     x={  # Error PYI014
+   -         1: 2,
+   -         **{3: 4},
+   -     }
+29 +     x=...
+30 | ) -> None: ...
+31 | def f153(
+32 |     x=[  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:35:7
@@ -75,28 +71,26 @@ PYI014 [*] Only simple default values allowed for arguments
 49 |   def f154(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-32 32 |     }
-33 33 | ) -> None: ...
-34 34 | def f153(
-35    |-    x=[  # Error PYI014
-36    |-        1,
-37    |-        2,
-38    |-        3,
-39    |-        4,
-40    |-        5,
-41    |-        6,
-42    |-        7,
-43    |-        8,
-44    |-        9,
-45    |-        10,
-46    |-        11,
-47    |-    ]
-   35 |+    x=...
-48 36 | ) -> None: ...
-49 37 | def f154(
-50 38 |     x=(  # Error PYI014
+32 |     }
+33 | ) -> None: ...
+34 | def f153(
+   -     x=[  # Error PYI014
+   -         1,
+   -         2,
+   -         3,
+   -         4,
+   -         5,
+   -         6,
+   -         7,
+   -         8,
+   -         9,
+   -         10,
+   -         11,
+   -     ]
+35 +     x=...
+36 | ) -> None: ...
+37 | def f154(
+38 |     x=(  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:50:7
@@ -113,19 +107,17 @@ PYI014 [*] Only simple default values allowed for arguments
 55 |   def f141(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-47 47 |     ]
-48 48 | ) -> None: ...
-49 49 | def f154(
-50    |-    x=(  # Error PYI014
-51    |-        "foo",
-52    |-        ("bar", "baz"),
-53    |-    )
-   50 |+    x=...
-54 51 | ) -> None: ...
-55 52 | def f141(
-56 53 |     x=[*range(10)],  # Error PYI014
+47 |     ]
+48 | ) -> None: ...
+49 | def f154(
+   -     x=(  # Error PYI014
+   -         "foo",
+   -         ("bar", "baz"),
+   -     )
+50 +     x=...
+51 | ) -> None: ...
+52 | def f141(
+53 |     x=[*range(10)],  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:56:7
@@ -138,16 +130,14 @@ PYI014 [*] Only simple default values allowed for arguments
 58 | def f142(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-53 53 |     )
-54 54 | ) -> None: ...
-55 55 | def f141(
-56    |-    x=[*range(10)],  # Error PYI014
-   56 |+    x=...,  # Error PYI014
-57 57 | ) -> None: ...
-58 58 | def f142(
-59 59 |     x=list(range(10)),  # Error PYI014
+53 |     )
+54 | ) -> None: ...
+55 | def f141(
+   -     x=[*range(10)],  # Error PYI014
+56 +     x=...,  # Error PYI014
+57 | ) -> None: ...
+58 | def f142(
+59 |     x=list(range(10)),  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:59:7
@@ -160,16 +150,14 @@ PYI014 [*] Only simple default values allowed for arguments
 61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-56 56 |     x=[*range(10)],  # Error PYI014
-57 57 | ) -> None: ...
-58 58 | def f142(
-59    |-    x=list(range(10)),  # Error PYI014
-   59 |+    x=...,  # Error PYI014
-60 60 | ) -> None: ...
-61 61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
-62 62 | def f17(
+56 |     x=[*range(10)],  # Error PYI014
+57 | ) -> None: ...
+58 | def f142(
+   -     x=list(range(10)),  # Error PYI014
+59 +     x=...,  # Error PYI014
+60 | ) -> None: ...
+61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
+62 | def f17(
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:61:11
@@ -182,16 +170,14 @@ PYI014 [*] Only simple default values allowed for arguments
 63 |     x="foo" + "bar",  # Error PYI014
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-58 58 | def f142(
-59 59 |     x=list(range(10)),  # Error PYI014
-60 60 | ) -> None: ...
-61    |-def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
-   61 |+def f16(x=...) -> None: ...  # Error PYI014
-62 62 | def f17(
-63 63 |     x="foo" + "bar",  # Error PYI014
-64 64 | ) -> None: ...
+58 | def f142(
+59 |     x=list(range(10)),  # Error PYI014
+60 | ) -> None: ...
+   - def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
+61 + def f16(x=...) -> None: ...  # Error PYI014
+62 | def f17(
+63 |     x="foo" + "bar",  # Error PYI014
+64 | ) -> None: ...
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:63:7
@@ -204,16 +190,14 @@ PYI014 [*] Only simple default values allowed for arguments
 65 | def f18(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-60 60 | ) -> None: ...
-61 61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
-62 62 | def f17(
-63    |-    x="foo" + "bar",  # Error PYI014
-   63 |+    x=...,  # Error PYI014
-64 64 | ) -> None: ...
-65 65 | def f18(
-66 66 |     x=b"foo" + b"bar",  # Error PYI014
+60 | ) -> None: ...
+61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
+62 | def f17(
+   -     x="foo" + "bar",  # Error PYI014
+63 +     x=...,  # Error PYI014
+64 | ) -> None: ...
+65 | def f18(
+66 |     x=b"foo" + b"bar",  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:66:7
@@ -226,16 +210,14 @@ PYI014 [*] Only simple default values allowed for arguments
 68 | def f19(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-63 63 |     x="foo" + "bar",  # Error PYI014
-64 64 | ) -> None: ...
-65 65 | def f18(
-66    |-    x=b"foo" + b"bar",  # Error PYI014
-   66 |+    x=...,  # Error PYI014
-67 67 | ) -> None: ...
-68 68 | def f19(
-69 69 |     x="foo" + 4,  # Error PYI014
+63 |     x="foo" + "bar",  # Error PYI014
+64 | ) -> None: ...
+65 | def f18(
+   -     x=b"foo" + b"bar",  # Error PYI014
+66 +     x=...,  # Error PYI014
+67 | ) -> None: ...
+68 | def f19(
+69 |     x="foo" + 4,  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:69:7
@@ -248,16 +230,14 @@ PYI014 [*] Only simple default values allowed for arguments
 71 | def f20(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-66 66 |     x=b"foo" + b"bar",  # Error PYI014
-67 67 | ) -> None: ...
-68 68 | def f19(
-69    |-    x="foo" + 4,  # Error PYI014
-   69 |+    x=...,  # Error PYI014
-70 70 | ) -> None: ...
-71 71 | def f20(
-72 72 |     x=5 + 5,  # Error PYI014
+66 |     x=b"foo" + b"bar",  # Error PYI014
+67 | ) -> None: ...
+68 | def f19(
+   -     x="foo" + 4,  # Error PYI014
+69 +     x=...,  # Error PYI014
+70 | ) -> None: ...
+71 | def f20(
+72 |     x=5 + 5,  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:72:7
@@ -270,16 +250,14 @@ PYI014 [*] Only simple default values allowed for arguments
 74 | def f21(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-69 69 |     x="foo" + 4,  # Error PYI014
-70 70 | ) -> None: ...
-71 71 | def f20(
-72    |-    x=5 + 5,  # Error PYI014
-   72 |+    x=...,  # Error PYI014
-73 73 | ) -> None: ...
-74 74 | def f21(
-75 75 |     x=3j - 3j,  # Error PYI014
+69 |     x="foo" + 4,  # Error PYI014
+70 | ) -> None: ...
+71 | def f20(
+   -     x=5 + 5,  # Error PYI014
+72 +     x=...,  # Error PYI014
+73 | ) -> None: ...
+74 | def f21(
+75 |     x=3j - 3j,  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:75:7
@@ -292,16 +270,14 @@ PYI014 [*] Only simple default values allowed for arguments
 77 | def f22(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-72 72 |     x=5 + 5,  # Error PYI014
-73 73 | ) -> None: ...
-74 74 | def f21(
-75    |-    x=3j - 3j,  # Error PYI014
-   75 |+    x=...,  # Error PYI014
-76 76 | ) -> None: ...
-77 77 | def f22(
-78 78 |     x=-42.5j + 4.3j,  # Error PYI014
+72 |     x=5 + 5,  # Error PYI014
+73 | ) -> None: ...
+74 | def f21(
+   -     x=3j - 3j,  # Error PYI014
+75 +     x=...,  # Error PYI014
+76 | ) -> None: ...
+77 | def f22(
+78 |     x=-42.5j + 4.3j,  # Error PYI014
 
 PYI014 [*] Only simple default values allowed for arguments
   --> PYI014.pyi:78:7
@@ -314,13 +290,11 @@ PYI014 [*] Only simple default values allowed for arguments
 80 | def f23(
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-75 75 |     x=3j - 3j,  # Error PYI014
-76 76 | ) -> None: ...
-77 77 | def f22(
-78    |-    x=-42.5j + 4.3j,  # Error PYI014
-   78 |+    x=...,  # Error PYI014
-79 79 | ) -> None: ...
-80 80 | def f23(
-81 81 |     x=True,  # OK
+75 |     x=3j - 3j,  # Error PYI014
+76 | ) -> None: ...
+77 | def f22(
+   -     x=-42.5j + 4.3j,  # Error PYI014
+78 +     x=...,  # Error PYI014
+79 | ) -> None: ...
+80 | def f23(
+81 |     x=True,  # OK
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap
index 6bdd007b88..f919f48b08 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap
@@ -11,16 +11,14 @@ PYI015 [*] Only simple default values allowed for assignments
 46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-41 41 | field22: Final = {"foo": 5}
-42 42 | 
-43 43 | # We *should* emit Y015 for more complex default values
-44    |-field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
-   44 |+field221: list[int] = ...  # Y015 Only simple default values are allowed for assignments
-45 45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
-46 46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
-47 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+41 | field22: Final = {"foo": 5}
+42 | 
+43 | # 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
+44 + field221: list[int] = ...  # Y015 Only simple default values are allowed for assignments
+45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
+46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
+47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:45:23
@@ -33,16 +31,14 @@ PYI015 [*] Only simple default values allowed for assignments
 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-42 42 | 
-43 43 | # We *should* emit Y015 for more complex default values
-44 44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
-45    |-field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
-   45 |+field223: list[int] = ...  # Y015 Only simple default values are allowed for assignments
-46 46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
-47 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
-48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
+42 | 
+43 | # We *should* emit Y015 for more complex default values
+44 | 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
+45 + field223: list[int] = ...  # Y015 Only simple default values are allowed for assignments
+46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
+47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:46:23
@@ -55,16 +51,14 @@ PYI015 [*] Only simple default values allowed for assignments
 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-43 43 | # We *should* emit Y015 for more complex default values
-44 44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
-45 45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
-46    |-field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
-   46 |+field224: list[int] = ...  # Y015 Only simple default values are allowed for assignments
-47 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
-48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
-49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
+43 | # We *should* emit Y015 for more complex default values
+44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
+45 | 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
+46 + field224: list[int] = ...  # Y015 Only simple default values are allowed for assignments
+47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
+49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:47:26
@@ -77,16 +71,14 @@ PYI015 [*] Only simple default values allowed for assignments
 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-44 44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
-45 45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
-46 46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
-47    |-field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
-   47 |+field225: list[object] = ...  # Y015 Only simple default values are allowed for assignments
-48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
-49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
-50 50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
+45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
+46 | 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
+47 + field225: list[object] = ...  # Y015 Only simple default values are allowed for assignments
+48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
+49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
+50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:48:47
@@ -99,16 +91,14 @@ PYI015 [*] Only simple default values allowed for assignments
 50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-45 45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
-46 46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
-47 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
-48    |-field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
-   48 |+field226: tuple[str | tuple[str, ...], ...] = ...  # Y015 Only simple default values are allowed for assignments
-49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
-50 50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
-51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+45 | field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
+46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
+47 | 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
+48 + field226: tuple[str | tuple[str, ...], ...] = ...  # Y015 Only simple default values are allowed for assignments
+49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
+50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:49:31
@@ -121,16 +111,14 @@ PYI015 [*] Only simple default values allowed for assignments
 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-46 46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
-47 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
-48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
-49    |-field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
-   49 |+field227: dict[str, object] = ...  # Y015 Only simple default values are allowed for assignments
-50 50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
-51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
-52 52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
+46 | field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
+47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+48 | 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
+49 + field227: dict[str, object] = ...  # Y015 Only simple default values are allowed for assignments
+50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:50:37
@@ -143,16 +131,14 @@ PYI015 [*] Only simple default values allowed for assignments
 52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-47 47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
-48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
-49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
-50    |-field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
-   50 |+field228: dict[str, list[object]] = ...  # Y015 Only simple default values are allowed for assignments
-51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
-52 52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
-53 53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
+47 | field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
+49 | 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
+50 + field228: dict[str, list[object]] = ...  # Y015 Only simple default values are allowed for assignments
+51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
+53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:52:28
@@ -165,16 +151,14 @@ PYI015 [*] Only simple default values allowed for assignments
 54 | field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
-50 50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
-51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
-52    |-field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
-   52 |+field229: dict[int, int] = ...  # Y015 Only simple default values are allowed for assignments
-53 53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
-54 54 | field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
-55 55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
+49 | field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
+50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+51 | # 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
+52 + field229: dict[int, int] = ...  # Y015 Only simple default values are allowed for assignments
+53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
+54 | field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
+55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:53:11
@@ -187,16 +171,14 @@ PYI015 [*] Only simple default values allowed for assignments
 55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-50 50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
-51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
-52 52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
-53    |-field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
-   53 |+field23 = ...  # Y015 Only simple default values are allowed for assignments
-54 54 | field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
-55 55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
-56 56 | 
+50 | field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+52 | 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
+53 + field23 = ...  # Y015 Only simple default values are allowed for assignments
+54 | field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
+55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
+56 | 
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:54:11
@@ -208,16 +190,14 @@ PYI015 [*] Only simple default values allowed for assignments
 55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
-52 52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
-53 53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
-54    |-field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
-   54 |+field24 = ...  # Y015 Only simple default values are allowed for assignments
-55 55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
-56 56 | 
-57 57 | # We shouldn't emit Y015 within functions
+51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
+53 | 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
+54 + field24 = ...  # Y015 Only simple default values are allowed for assignments
+55 | field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
+56 | 
+57 | # We shouldn't emit Y015 within functions
 
 PYI015 [*] Only simple default values allowed for assignments
   --> PYI015.pyi:55:11
@@ -230,13 +210,11 @@ PYI015 [*] Only simple default values allowed for assignments
 57 | # We shouldn't emit Y015 within functions
    |
 help: Replace default value with `...`
-
-ℹ Safe fix
-52 52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
-53 53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
-54 54 | field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
-55    |-field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
-   55 |+field25 = ...  # Y015 Only simple default values are allowed for assignments
-56 56 | 
-57 57 | # We shouldn't emit Y015 within functions
-58 58 | def f():
+52 | field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
+53 | field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
+54 | 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
+55 + field25 = ...  # Y015 Only simple default values are allowed for assignments
+56 | 
+57 | # We shouldn't emit Y015 within functions
+58 | def f():
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap
index ad83ac3daa..f6cc519c39 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap
@@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str`
 9 | # Should emit for union types in arguments.
   |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-4 4 | field1: str
-5 5 | 
-6 6 | # Should emit for duplicate field types.
-7   |-field2: str | str  # PYI016: Duplicate union member `str`
-  7 |+field2: str  # PYI016: Duplicate union member `str`
-8 8 | 
-9 9 | # Should emit for union types in arguments.
-10 10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+4  | field1: str
+5  | 
+6  | # Should emit for duplicate field types.
+   - field2: str | str  # PYI016: Duplicate union member `str`
+7  + field2: str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:10:23
@@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int`
 11 |     print(arg1)
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-7  7  | field2: str | str  # PYI016: Duplicate union member `str`
-8  8  | 
-9  9  | # Should emit for union types in arguments.
-10    |-def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
-   10 |+def func1(arg1: int):  # PYI016: Duplicate union member `int`
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
+7  | field2: str | str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+   - def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+10 + def func1(arg1: int):  # PYI016: Duplicate union member `int`
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:14:22
@@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str`
 15 |     return "my string"
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
-14    |-def func2() -> str | str:  # PYI016: Duplicate union member `str`
-   14 |+def func2() -> str:  # PYI016: Duplicate union member `str`
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
+   - def func2() -> str | str:  # PYI016: Duplicate union member `str`
+14 + def func2() -> str:  # PYI016: Duplicate union member `str`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:18:15
@@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str`
 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18    |-field3: str | str | int  # PYI016: Duplicate union member `str`
-   18 |+field3: str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+   - field3: str | str | int  # PYI016: Duplicate union member `str`
+18 + field3: str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:19:15
@@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19    |-field4: int | int | str  # PYI016: Duplicate union member `int`
-   19 |+field4: int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+   - field4: int | int | str  # PYI016: Duplicate union member `int`
+19 + field4: int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:20:21
@@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20    |-field5: str | int | str  # PYI016: Duplicate union member `str`
-   20 |+field5: str | int  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+   - field5: str | int | str  # PYI016: Duplicate union member `str`
+20 + field5: str | int  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:21:28
@@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int`
 23 | # Shouldn't emit for non-type unions.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21    |-field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-   21 |+field6: int | bool | str  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
-24 24 | field7 = str | str
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+   - field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+21 + field6: int | bool | str  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
+24 | field7 = str | str
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:27:22
@@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int`
 29 | # Should handle user brackets when fixing.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-24 24 | field7 = str | str
-25 25 | 
-26 26 | # Should emit for strangely-bracketed unions.
-27    |-field8: int | (str | int)  # PYI016: Duplicate union member `int`
-   27 |+field8: int | str  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+24 | field7 = str | str
+25 | 
+26 | # Should emit for strangely-bracketed unions.
+   - field8: int | (str | int)  # PYI016: Duplicate union member `int`
+27 + field8: int | str  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:30:16
@@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int`
 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-27 27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30    |-field9: int | (int | str)  # PYI016: Duplicate union member `int`
-   30 |+field9: int | str  # PYI016: Duplicate union member `int`
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
+27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+   - field9: int | (int | str)  # PYI016: Duplicate union member `int`
+30 + field9: int | str  # PYI016: Duplicate union member `int`
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:31:24
@@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str`
 33 | # Should emit for nested unions.
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
-31    |-field10: (str | int) | str  # PYI016: Duplicate union member `str`
-   31 |+field10: str | int  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34 34 | field11: dict[int | int, str]
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+   - field10: (str | int) | str  # PYI016: Duplicate union member `str`
+31 + field10: str | int  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+34 | field11: dict[int | int, str]
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:34:21
@@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int`
 36 | # Should emit for unions with more than two cases
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34    |-field11: dict[int | int, str]
-   34 |+field11: dict[int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+   - field11: dict[int | int, str]
+34 + field11: dict[int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:37:16
@@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:37:22
@@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:38:16
@@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:38:22
@@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:38:28
@@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:41:16
@@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:41:28
@@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `typing.Literal[1]`
   --> PYI016.py:44:30
@@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]`
 46 | # Shouldn't emit if in new parent type
    |
 help: Remove duplicate union member `typing.Literal[1]`
-
-ℹ Safe fix
-41 41 | field14: int | int | str | int  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44    |-field15: typing.Literal[1] | typing.Literal[1]  # Error
-   44 |+field15: typing.Literal[1]  # Error
-45 45 | 
-46 46 | # Shouldn't emit if in new parent type
-47 47 | field16: int | dict[int, str]  # OK
+41 | field14: int | int | str | int  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+   - field15: typing.Literal[1] | typing.Literal[1]  # Error
+44 + field15: typing.Literal[1]  # Error
+45 | 
+46 | # Shouldn't emit if in new parent type
+47 | field16: int | dict[int, str]  # OK
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.py:57:5
@@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]`
 60 |   ]  # Error, newline and comment will not be emitted in message
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-50 50 | field17: dict[int, int]  # OK
-51 51 | 
-52 52 | # Should emit in cases with newlines
-53    |-field18: typing.Union[
-54    |-    set[
-55    |-        int  # foo
-56    |-    ],
-57    |-    set[
-58    |-        int  # bar
-59    |-    ],
-60    |-]  # Error, newline and comment will not be emitted in message
-   53 |+field18: set[int]  # Error, newline and comment will not be emitted in message
-61 54 | 
-62 55 | # Should emit in cases with `typing.Union` instead of `|`
-63 56 | field19: typing.Union[int, int]  # Error
+50 | field17: dict[int, int]  # OK
+51 | 
+52 | # Should emit in cases with newlines
+   - field18: typing.Union[
+   -     set[
+   -         int  # foo
+   -     ],
+   -     set[
+   -         int  # bar
+   -     ],
+   - ]  # Error, newline and comment will not be emitted in message
+53 + field18: set[int]  # Error, newline and comment will not be emitted in message
+54 | 
+55 | # Should emit in cases with `typing.Union` instead of `|`
+56 | field19: typing.Union[int, int]  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:63:28
@@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int`
 65 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-60 60 | ]  # Error, newline and comment will not be emitted in message
-61 61 | 
-62 62 | # Should emit in cases with `typing.Union` instead of `|`
-63    |-field19: typing.Union[int, int]  # Error
-   63 |+field19: int  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+60 | ]  # Error, newline and comment will not be emitted in message
+61 | 
+62 | # Should emit in cases with `typing.Union` instead of `|`
+   - field19: typing.Union[int, int]  # Error
+63 + field19: int  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:66:41
@@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int`
 68 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-63 63 | field19: typing.Union[int, int]  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66    |-field20: typing.Union[int, typing.Union[int, str]]  # Error
-   66 |+field20: typing.Union[int, str]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69 69 | field21: typing.Union[int, int | str]  # Error
+63 | field19: typing.Union[int, int]  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+   - field20: typing.Union[int, typing.Union[int, str]]  # Error
+66 + field20: typing.Union[int, str]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+69 | field21: typing.Union[int, int | str]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:69:28
@@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int`
 71 | # Should emit only once in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69    |-field21: typing.Union[int, int | str]  # Error
-   69 |+field21: int | str  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field21: typing.Union[int, int | str]  # Error
+69 + field21: int | str  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:72:41
@@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:72:59
@@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:72:64
@@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.py:76:12
@@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]`
 78 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75    |-field23: set[  # foo
-76    |-    int] | set[int]
-   75 |+field23: set[int]
-77 76 | 
-78 77 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 78 | # duplicates of the outer `int`), but not three times (which would indicate that
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+73 | 
+74 | # Should emit in cases with newlines
+   - field23: set[  # foo
+   -     int] | set[int]
+75 + field23: set[int]
+76 | 
+77 | # Should emit twice (once for each `int` in the nested union, both of which are
+78 | # duplicates of the outer `int`), but not three times (which would indicate that
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:81:41
@@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:81:46
@@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:86:28
@@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:86:34
@@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:89:41
@@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int`
 91 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-86 86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89    |-field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   89 |+field26: int  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+   - field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+89 + field26: int  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:92:54
@@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int`
 94 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92    |-field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-   92 |+field27: int  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95 95 | field28: typing.Union[int | int]  # Error
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+   - field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+92 + field27: int  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+95 | field28: typing.Union[int | int]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:95:29
@@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int`
 97 | # Should emit twice in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95    |-field28: typing.Union[int | int]  # Error
-   95 |+field28: int  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field28: typing.Union[int | int]  # Error
+95 + field28: int  # Error
+96 | 
+97 | # Should emit twice in cases with multiple nested `typing.Union`
+98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:98:54
@@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:98:59
@@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:101:54
@@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int`
 103 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-98  98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-99  99  | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101     |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-    101 |+field30: typing.Union[int, str]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+    - field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+101 + field30: typing.Union[int, str]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:104:49
@@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int`
 106 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104     |-field31: typing.Union[float, typing.Union[int | int]]  # Error
-    104 |+field31: float | int  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field31: typing.Union[float, typing.Union[int | int]]  # Error
+104 + field31: float | int  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:107:49
@@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:107:55
@@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:110:42
@@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:110:62
@@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:110:68
@@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `list[int]`
    --> PYI016.py:113:61
@@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]`
 115 | field35: "int | str | int"  # Error
     |
 help: Remove duplicate union member `list[int]`
-
-ℹ Safe fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113     |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-    113 |+field34: typing.Union[list[int], str, bytes]  # Error
-114 114 | 
-115 115 | field35: "int | str | int"  # Error
-116 116 | 
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+111 | 
+112 | # Test case for mixed union type
+    - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+113 + field34: typing.Union[list[int], str, bytes]  # Error
+114 | 
+115 | field35: "int | str | int"  # Error
+116 | 
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:115:23
@@ -950,16 +864,14 @@ PYI016 [*] Duplicate union member `int`
     |                       ^^^
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-114 114 | 
-115     |-field35: "int | str | int"  # Error
-    115 |+field35: "int | str"  # Error
-116 116 | 
-117 117 | 
-118 118 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+114 | 
+    - field35: "int | str | int"  # Error
+115 + field35: "int | str"  # Error
+116 | 
+117 | 
+118 | 
 
 PYI016 [*] Duplicate union member `typing.Optional[int]`
    --> PYI016.py:134:45
@@ -972,16 +884,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]`
 136 | field44: typing.Optional[int | None]
     |
 help: Remove duplicate union member `typing.Optional[int]`
-
-ℹ Safe fix
-131 131 | # equivalent to int | None
-132 132 | field40: typing.Union[typing.Optional[int], None]
-133 133 | field41: typing.Optional[typing.Union[int, None]]
-134     |-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-    134 |+field42: typing.Optional[int]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
+131 | # equivalent to int | None
+132 | field40: typing.Union[typing.Optional[int], None]
+133 | field41: typing.Optional[typing.Union[int, None]]
+    - field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+134 + field42: typing.Optional[int]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
+137 | field45: typing.Optional[int] | typing.Optional[int]
 
 PYI016 [*] Duplicate union member `typing.Optional[int]`
    --> PYI016.py:137:33
@@ -994,16 +904,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]`
 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
     |
 help: Remove duplicate union member `typing.Optional[int]`
-
-ℹ Safe fix
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
-137     |-field45: typing.Optional[int] | typing.Optional[int]
-    137 |+field45: typing.Optional[int]
-138 138 | # equivalent to int | dict | None
-139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
+    - field45: typing.Optional[int] | typing.Optional[int]
+137 + field45: typing.Optional[int]
+138 | # equivalent to int | dict | None
+139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+140 | field47: typing.Optional[int] | typing.Optional[dict]
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.py:143:61
@@ -1014,16 +922,14 @@ PYI016 [*] Duplicate union member `complex`
 144 | field49: typing.Optional[complex | complex] | complex
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
-141 141 | 
-142 142 | # avoid reporting twice
-143     |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-    143 |+field48: typing.Union[typing.Optional[complex], complex]
-144 144 | field49: typing.Optional[complex | complex] | complex
-145 145 | 
-146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
+140 | field47: typing.Optional[int] | typing.Optional[dict]
+141 | 
+142 | # avoid reporting twice
+    - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+143 + field48: typing.Union[typing.Optional[complex], complex]
+144 | field49: typing.Optional[complex | complex] | complex
+145 | 
+146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.py:144:36
@@ -1036,16 +942,14 @@ PYI016 [*] Duplicate union member `complex`
 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-141 141 | 
-142 142 | # avoid reporting twice
-143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-144     |-field49: typing.Optional[complex | complex] | complex
-    144 |+field49: typing.Optional[complex] | complex
-145 145 | 
-146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
-147 147 | # Should throw duplicate union member but not fix
+141 | 
+142 | # avoid reporting twice
+143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+    - field49: typing.Optional[complex | complex] | complex
+144 + field49: typing.Optional[complex] | complex
+145 | 
+146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
+147 | # Should throw duplicate union member but not fix
 
 PYI016 Duplicate union member `None`
    --> PYI016.py:148:37
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap
index a90d84ca63..21ae9d7404 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap
@@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str`
 9 | # Should emit for union types in arguments.
   |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-4 4 | field1: str
-5 5 | 
-6 6 | # Should emit for duplicate field types.
-7   |-field2: str | str  # PYI016: Duplicate union member `str`
-  7 |+field2: str  # PYI016: Duplicate union member `str`
-8 8 | 
-9 9 | # Should emit for union types in arguments.
-10 10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+4  | field1: str
+5  | 
+6  | # Should emit for duplicate field types.
+   - field2: str | str  # PYI016: Duplicate union member `str`
+7  + field2: str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:10:23
@@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int`
 11 |     print(arg1)
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-7  7  | field2: str | str  # PYI016: Duplicate union member `str`
-8  8  | 
-9  9  | # Should emit for union types in arguments.
-10    |-def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
-   10 |+def func1(arg1: int):  # PYI016: Duplicate union member `int`
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
+7  | field2: str | str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+   - def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+10 + def func1(arg1: int):  # PYI016: Duplicate union member `int`
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:14:22
@@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str`
 15 |     return "my string"
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
-14    |-def func2() -> str | str:  # PYI016: Duplicate union member `str`
-   14 |+def func2() -> str:  # PYI016: Duplicate union member `str`
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
+   - def func2() -> str | str:  # PYI016: Duplicate union member `str`
+14 + def func2() -> str:  # PYI016: Duplicate union member `str`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:18:15
@@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str`
 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18    |-field3: str | str | int  # PYI016: Duplicate union member `str`
-   18 |+field3: str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+   - field3: str | str | int  # PYI016: Duplicate union member `str`
+18 + field3: str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:19:15
@@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19    |-field4: int | int | str  # PYI016: Duplicate union member `int`
-   19 |+field4: int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+   - field4: int | int | str  # PYI016: Duplicate union member `int`
+19 + field4: int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:20:21
@@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20    |-field5: str | int | str  # PYI016: Duplicate union member `str`
-   20 |+field5: str | int  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+   - field5: str | int | str  # PYI016: Duplicate union member `str`
+20 + field5: str | int  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:21:28
@@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int`
 23 | # Shouldn't emit for non-type unions.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21    |-field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-   21 |+field6: int | bool | str  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
-24 24 | field7 = str | str
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+   - field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+21 + field6: int | bool | str  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
+24 | field7 = str | str
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:27:22
@@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int`
 29 | # Should handle user brackets when fixing.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-24 24 | field7 = str | str
-25 25 | 
-26 26 | # Should emit for strangely-bracketed unions.
-27    |-field8: int | (str | int)  # PYI016: Duplicate union member `int`
-   27 |+field8: int | str  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+24 | field7 = str | str
+25 | 
+26 | # Should emit for strangely-bracketed unions.
+   - field8: int | (str | int)  # PYI016: Duplicate union member `int`
+27 + field8: int | str  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:30:16
@@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int`
 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-27 27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30    |-field9: int | (int | str)  # PYI016: Duplicate union member `int`
-   30 |+field9: int | str  # PYI016: Duplicate union member `int`
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
+27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+   - field9: int | (int | str)  # PYI016: Duplicate union member `int`
+30 + field9: int | str  # PYI016: Duplicate union member `int`
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:31:24
@@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str`
 33 | # Should emit for nested unions.
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
-31    |-field10: (str | int) | str  # PYI016: Duplicate union member `str`
-   31 |+field10: str | int  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34 34 | field11: dict[int | int, str]
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+   - field10: (str | int) | str  # PYI016: Duplicate union member `str`
+31 + field10: str | int  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+34 | field11: dict[int | int, str]
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:34:21
@@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int`
 36 | # Should emit for unions with more than two cases
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34    |-field11: dict[int | int, str]
-   34 |+field11: dict[int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+   - field11: dict[int | int, str]
+34 + field11: dict[int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:37:16
@@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:37:22
@@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:38:16
@@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:38:22
@@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:38:28
@@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:41:16
@@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:41:28
@@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `typing.Literal[1]`
   --> PYI016.pyi:44:30
@@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]`
 46 | # Shouldn't emit if in new parent type
    |
 help: Remove duplicate union member `typing.Literal[1]`
-
-ℹ Safe fix
-41 41 | field14: int | int | str | int  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44    |-field15: typing.Literal[1] | typing.Literal[1]  # Error
-   44 |+field15: typing.Literal[1]  # Error
-45 45 | 
-46 46 | # Shouldn't emit if in new parent type
-47 47 | field16: int | dict[int, str]  # OK
+41 | field14: int | int | str | int  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+   - field15: typing.Literal[1] | typing.Literal[1]  # Error
+44 + field15: typing.Literal[1]  # Error
+45 | 
+46 | # Shouldn't emit if in new parent type
+47 | field16: int | dict[int, str]  # OK
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.pyi:57:5
@@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]`
 60 |   ]  # Error, newline and comment will not be emitted in message
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-50 50 | field17: dict[int, int]  # OK
-51 51 | 
-52 52 | # Should emit in cases with newlines
-53    |-field18: typing.Union[
-54    |-    set[
-55    |-        int  # foo
-56    |-    ],
-57    |-    set[
-58    |-        int  # bar
-59    |-    ],
-60    |-]  # Error, newline and comment will not be emitted in message
-   53 |+field18: set[int]  # Error, newline and comment will not be emitted in message
-61 54 | 
-62 55 | # Should emit in cases with `typing.Union` instead of `|`
-63 56 | field19: typing.Union[int, int]  # Error
+50 | field17: dict[int, int]  # OK
+51 | 
+52 | # Should emit in cases with newlines
+   - field18: typing.Union[
+   -     set[
+   -         int  # foo
+   -     ],
+   -     set[
+   -         int  # bar
+   -     ],
+   - ]  # Error, newline and comment will not be emitted in message
+53 + field18: set[int]  # Error, newline and comment will not be emitted in message
+54 | 
+55 | # Should emit in cases with `typing.Union` instead of `|`
+56 | field19: typing.Union[int, int]  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:63:28
@@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int`
 65 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-60 60 | ]  # Error, newline and comment will not be emitted in message
-61 61 | 
-62 62 | # Should emit in cases with `typing.Union` instead of `|`
-63    |-field19: typing.Union[int, int]  # Error
-   63 |+field19: int  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+60 | ]  # Error, newline and comment will not be emitted in message
+61 | 
+62 | # Should emit in cases with `typing.Union` instead of `|`
+   - field19: typing.Union[int, int]  # Error
+63 + field19: int  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:66:41
@@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int`
 68 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-63 63 | field19: typing.Union[int, int]  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66    |-field20: typing.Union[int, typing.Union[int, str]]  # Error
-   66 |+field20: typing.Union[int, str]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69 69 | field21: typing.Union[int, int | str]  # Error
+63 | field19: typing.Union[int, int]  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+   - field20: typing.Union[int, typing.Union[int, str]]  # Error
+66 + field20: typing.Union[int, str]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+69 | field21: typing.Union[int, int | str]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:69:28
@@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int`
 71 | # Should emit only once in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69    |-field21: typing.Union[int, int | str]  # Error
-   69 |+field21: int | str  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field21: typing.Union[int, int | str]  # Error
+69 + field21: int | str  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:72:41
@@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:72:59
@@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:72:64
@@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.pyi:76:12
@@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]`
 78 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75    |-field23: set[  # foo
-76    |-    int] | set[int]
-   75 |+field23: set[int]
-77 76 | 
-78 77 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 78 | # duplicates of the outer `int`), but not three times (which would indicate that
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+73 | 
+74 | # Should emit in cases with newlines
+   - field23: set[  # foo
+   -     int] | set[int]
+75 + field23: set[int]
+76 | 
+77 | # Should emit twice (once for each `int` in the nested union, both of which are
+78 | # duplicates of the outer `int`), but not three times (which would indicate that
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:81:41
@@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:81:46
@@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:86:28
@@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:86:34
@@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:89:41
@@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int`
 91 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-86 86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89    |-field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   89 |+field26: int  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+   - field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+89 + field26: int  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:92:54
@@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int`
 94 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92    |-field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-   92 |+field27: int  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95 95 | field28: typing.Union[int | int]  # Error
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+   - field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+92 + field27: int  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+95 | field28: typing.Union[int | int]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:95:29
@@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int`
 97 | # Should emit twice in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95    |-field28: typing.Union[int | int]  # Error
-   95 |+field28: int  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field28: typing.Union[int | int]  # Error
+95 + field28: int  # Error
+96 | 
+97 | # Should emit twice in cases with multiple nested `typing.Union`
+98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:98:54
@@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:98:59
@@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:101:54
@@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int`
 103 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-98  98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-99  99  | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101     |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-    101 |+field30: typing.Union[int, str]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+    - field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+101 + field30: typing.Union[int, str]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:104:49
@@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int`
 106 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104     |-field31: typing.Union[float, typing.Union[int | int]]  # Error
-    104 |+field31: float | int  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field31: typing.Union[float, typing.Union[int | int]]  # Error
+104 + field31: float | int  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:107:49
@@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:107:55
@@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:110:42
@@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:110:62
@@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:110:68
@@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `list[int]`
    --> PYI016.pyi:113:61
@@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]`
 115 | # https://github.com/astral-sh/ruff/issues/18546
     |
 help: Remove duplicate union member `list[int]`
-
-ℹ Safe fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113     |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-    113 |+field34: typing.Union[list[int], str, bytes]  # Error
-114 114 | 
-115 115 | # https://github.com/astral-sh/ruff/issues/18546
-116 116 | # Expand Optional[T] to Union[T, None]
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+111 | 
+112 | # Test case for mixed union type
+    - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+113 + field34: typing.Union[list[int], str, bytes]  # Error
+114 | 
+115 | # https://github.com/astral-sh/ruff/issues/18546
+116 | # Expand Optional[T] to Union[T, None]
 
 PYI016 [*] Duplicate union member `typing.Optional[int]`
    --> PYI016.pyi:125:45
@@ -952,16 +866,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]`
 127 | field44: typing.Optional[int | None]
     |
 help: Remove duplicate union member `typing.Optional[int]`
-
-ℹ Safe fix
-122 122 | # equivalent to int | None
-123 123 | field40: typing.Union[typing.Optional[int], None]
-124 124 | field41: typing.Optional[typing.Union[int, None]]
-125     |-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-    125 |+field42: typing.Optional[int]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
+122 | # equivalent to int | None
+123 | field40: typing.Union[typing.Optional[int], None]
+124 | field41: typing.Optional[typing.Union[int, None]]
+    - field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+125 + field42: typing.Optional[int]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
+128 | field45: typing.Optional[int] | typing.Optional[int]
 
 PYI016 [*] Duplicate union member `typing.Optional[int]`
    --> PYI016.pyi:128:33
@@ -974,16 +886,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]`
 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
     |
 help: Remove duplicate union member `typing.Optional[int]`
-
-ℹ Safe fix
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
-128     |-field45: typing.Optional[int] | typing.Optional[int]
-    128 |+field45: typing.Optional[int]
-129 129 | # equivalent to int | dict | None
-130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
+    - field45: typing.Optional[int] | typing.Optional[int]
+128 + field45: typing.Optional[int]
+129 | # equivalent to int | dict | None
+130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+131 | field47: typing.Optional[int] | typing.Optional[dict]
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.pyi:134:61
@@ -994,14 +904,12 @@ PYI016 [*] Duplicate union member `complex`
 135 | field49: typing.Optional[complex | complex] | complex
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
-132 132 | 
-133 133 | # avoid reporting twice
-134     |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-    134 |+field48: typing.Union[typing.Optional[complex], complex]
-135 135 | field49: typing.Optional[complex | complex] | complex
+131 | field47: typing.Optional[int] | typing.Optional[dict]
+132 | 
+133 | # avoid reporting twice
+    - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+134 + field48: typing.Union[typing.Optional[complex], complex]
+135 | field49: typing.Optional[complex | complex] | complex
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.pyi:135:36
@@ -1012,10 +920,8 @@ PYI016 [*] Duplicate union member `complex`
     |                                    ^^^^^^^
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-132 132 | 
-133 133 | # avoid reporting twice
-134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-135     |-field49: typing.Optional[complex | complex] | complex
-    135 |+field49: typing.Optional[complex] | complex
+132 | 
+133 | # avoid reporting twice
+134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+    - field49: typing.Optional[complex | complex] | complex
+135 + field49: typing.Optional[complex] | complex
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap
index df9aec8da1..51bee8e111 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap
@@ -12,15 +12,14 @@ PYI018 [*] Private TypeVar `_T` is never used
 8 | _P = ParamSpec("_P")
   |
 help: Remove unused private TypeVar `_T`
-
-ℹ Unsafe fix
-3 3 | from typing import TypeVar
-4 4 | from typing_extensions import ParamSpec, TypeVarTuple
-5 5 | 
-6   |-_T = typing.TypeVar("_T")
-7 6 | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8 7 | _P = ParamSpec("_P")
-9 8 | _P2 = typing.ParamSpec("_P2")
+3 | from typing import TypeVar
+4 | from typing_extensions import ParamSpec, TypeVarTuple
+5 | 
+  - _T = typing.TypeVar("_T")
+6 | _Ts = typing_extensions.TypeVarTuple("_Ts")
+7 | _P = ParamSpec("_P")
+8 | _P2 = typing.ParamSpec("_P2")
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private TypeVarTuple `_Ts` is never used
  --> PYI018.py:7:1
@@ -32,15 +31,14 @@ PYI018 [*] Private TypeVarTuple `_Ts` is never used
 9 | _P2 = typing.ParamSpec("_P2")
   |
 help: Remove unused private TypeVarTuple `_Ts`
-
-ℹ Unsafe fix
-4 4 | from typing_extensions import ParamSpec, TypeVarTuple
-5 5 | 
-6 6 | _T = typing.TypeVar("_T")
-7   |-_Ts = typing_extensions.TypeVarTuple("_Ts")
-8 7 | _P = ParamSpec("_P")
-9 8 | _P2 = typing.ParamSpec("_P2")
-10 9 | _Ts2 = TypeVarTuple("_Ts2")
+4 | from typing_extensions import ParamSpec, TypeVarTuple
+5 | 
+6 | _T = typing.TypeVar("_T")
+  - _Ts = typing_extensions.TypeVarTuple("_Ts")
+7 | _P = ParamSpec("_P")
+8 | _P2 = typing.ParamSpec("_P2")
+9 | _Ts2 = TypeVarTuple("_Ts2")
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private ParamSpec `_P` is never used
   --> PYI018.py:8:1
@@ -53,15 +51,14 @@ PYI018 [*] Private ParamSpec `_P` is never used
 10 | _Ts2 = TypeVarTuple("_Ts2")
    |
 help: Remove unused private ParamSpec `_P`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | _T = typing.TypeVar("_T")
-7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8   |-_P = ParamSpec("_P")
-9 8 | _P2 = typing.ParamSpec("_P2")
-10 9 | _Ts2 = TypeVarTuple("_Ts2")
-11 10 | 
+5  | 
+6  | _T = typing.TypeVar("_T")
+7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
+   - _P = ParamSpec("_P")
+8  | _P2 = typing.ParamSpec("_P2")
+9  | _Ts2 = TypeVarTuple("_Ts2")
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private ParamSpec `_P2` is never used
   --> PYI018.py:9:1
@@ -73,15 +70,14 @@ PYI018 [*] Private ParamSpec `_P2` is never used
 10 | _Ts2 = TypeVarTuple("_Ts2")
    |
 help: Remove unused private ParamSpec `_P2`
-
-ℹ Unsafe fix
-6  6  | _T = typing.TypeVar("_T")
-7  7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8  8  | _P = ParamSpec("_P")
-9     |-_P2 = typing.ParamSpec("_P2")
-10 9  | _Ts2 = TypeVarTuple("_Ts2")
-11 10 | 
-12 11 | # OK
+6  | _T = typing.TypeVar("_T")
+7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
+8  | _P = ParamSpec("_P")
+   - _P2 = typing.ParamSpec("_P2")
+9  | _Ts2 = TypeVarTuple("_Ts2")
+10 | 
+11 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private TypeVarTuple `_Ts2` is never used
   --> PYI018.py:10:1
@@ -94,12 +90,11 @@ PYI018 [*] Private TypeVarTuple `_Ts2` is never used
 12 | # OK
    |
 help: Remove unused private TypeVarTuple `_Ts2`
-
-ℹ Unsafe fix
-7  7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8  8  | _P = ParamSpec("_P")
-9  9  | _P2 = typing.ParamSpec("_P2")
-10    |-_Ts2 = TypeVarTuple("_Ts2")
-11 10 | 
-12 11 | # OK
-13 12 | _UsedTypeVar = TypeVar("_UsedTypeVar")
+7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
+8  | _P = ParamSpec("_P")
+9  | _P2 = typing.ParamSpec("_P2")
+   - _Ts2 = TypeVarTuple("_Ts2")
+10 | 
+11 | # OK
+12 | _UsedTypeVar = TypeVar("_UsedTypeVar")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap
index 48d81cf3cd..4bc1337bf5 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap
@@ -12,15 +12,14 @@ PYI018 [*] Private TypeVar `_T` is never used
 8 | _P = ParamSpec("_P")
   |
 help: Remove unused private TypeVar `_T`
-
-ℹ Unsafe fix
-3 3 | from typing import TypeVar
-4 4 | from typing_extensions import ParamSpec, TypeVarTuple
-5 5 | 
-6   |-_T = typing.TypeVar("_T")
-7 6 | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8 7 | _P = ParamSpec("_P")
-9 8 | _P2 = typing.ParamSpec("_P2")
+3 | from typing import TypeVar
+4 | from typing_extensions import ParamSpec, TypeVarTuple
+5 | 
+  - _T = typing.TypeVar("_T")
+6 | _Ts = typing_extensions.TypeVarTuple("_Ts")
+7 | _P = ParamSpec("_P")
+8 | _P2 = typing.ParamSpec("_P2")
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private TypeVarTuple `_Ts` is never used
  --> PYI018.pyi:7:1
@@ -32,15 +31,14 @@ PYI018 [*] Private TypeVarTuple `_Ts` is never used
 9 | _P2 = typing.ParamSpec("_P2")
   |
 help: Remove unused private TypeVarTuple `_Ts`
-
-ℹ Unsafe fix
-4 4 | from typing_extensions import ParamSpec, TypeVarTuple
-5 5 | 
-6 6 | _T = typing.TypeVar("_T")
-7   |-_Ts = typing_extensions.TypeVarTuple("_Ts")
-8 7 | _P = ParamSpec("_P")
-9 8 | _P2 = typing.ParamSpec("_P2")
-10 9 | _Ts2 = TypeVarTuple("_Ts2")
+4 | from typing_extensions import ParamSpec, TypeVarTuple
+5 | 
+6 | _T = typing.TypeVar("_T")
+  - _Ts = typing_extensions.TypeVarTuple("_Ts")
+7 | _P = ParamSpec("_P")
+8 | _P2 = typing.ParamSpec("_P2")
+9 | _Ts2 = TypeVarTuple("_Ts2")
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private ParamSpec `_P` is never used
   --> PYI018.pyi:8:1
@@ -53,15 +51,14 @@ PYI018 [*] Private ParamSpec `_P` is never used
 10 | _Ts2 = TypeVarTuple("_Ts2")
    |
 help: Remove unused private ParamSpec `_P`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | _T = typing.TypeVar("_T")
-7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8   |-_P = ParamSpec("_P")
-9 8 | _P2 = typing.ParamSpec("_P2")
-10 9 | _Ts2 = TypeVarTuple("_Ts2")
-11 10 | 
+5  | 
+6  | _T = typing.TypeVar("_T")
+7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
+   - _P = ParamSpec("_P")
+8  | _P2 = typing.ParamSpec("_P2")
+9  | _Ts2 = TypeVarTuple("_Ts2")
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private ParamSpec `_P2` is never used
   --> PYI018.pyi:9:1
@@ -73,15 +70,14 @@ PYI018 [*] Private ParamSpec `_P2` is never used
 10 | _Ts2 = TypeVarTuple("_Ts2")
    |
 help: Remove unused private ParamSpec `_P2`
-
-ℹ Unsafe fix
-6  6  | _T = typing.TypeVar("_T")
-7  7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8  8  | _P = ParamSpec("_P")
-9     |-_P2 = typing.ParamSpec("_P2")
-10 9  | _Ts2 = TypeVarTuple("_Ts2")
-11 10 | 
-12 11 | # OK
+6  | _T = typing.TypeVar("_T")
+7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
+8  | _P = ParamSpec("_P")
+   - _P2 = typing.ParamSpec("_P2")
+9  | _Ts2 = TypeVarTuple("_Ts2")
+10 | 
+11 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 PYI018 [*] Private TypeVarTuple `_Ts2` is never used
   --> PYI018.pyi:10:1
@@ -94,12 +90,11 @@ PYI018 [*] Private TypeVarTuple `_Ts2` is never used
 12 | # OK
    |
 help: Remove unused private TypeVarTuple `_Ts2`
-
-ℹ Unsafe fix
-7  7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
-8  8  | _P = ParamSpec("_P")
-9  9  | _P2 = typing.ParamSpec("_P2")
-10    |-_Ts2 = TypeVarTuple("_Ts2")
-11 10 | 
-12 11 | # OK
-13 12 | _UsedTypeVar = TypeVar("_UsedTypeVar")
+7  | _Ts = typing_extensions.TypeVarTuple("_Ts")
+8  | _P = ParamSpec("_P")
+9  | _P2 = typing.ParamSpec("_P2")
+   - _Ts2 = TypeVarTuple("_Ts2")
+10 | 
+11 | # OK
+12 | _UsedTypeVar = TypeVar("_UsedTypeVar")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap
index 5c3f8a0e18..a6ddc2b669 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap
@@ -9,16 +9,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-4 4 | _S2 = TypeVar("_S2", BadClass, GoodClass)
-5 5 | 
-6 6 | class BadClass:
-7   |-    def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
-  7 |+    def __new__(cls, *args: str, **kwargs: int) -> Self: ...  # PYI019
-8 8 | 
-9 9 | 
-10 10 |     def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
+4  | _S2 = TypeVar("_S2", BadClass, GoodClass)
+5  | 
+6  | class BadClass:
+   -     def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
+7  +     def __new__(cls, *args: str, **kwargs: int) -> Self: ...  # PYI019
+8  | 
+9  | 
+10 |     def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   --> PYI019_0.py:10:28
@@ -27,16 +25,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-7  7  |     def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
-8  8  | 
-9  9  | 
-10    |-    def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
-   10 |+    def bad_instance_method(self, arg: bytes) -> Self: ...  # PYI019
-11 11 | 
-12 12 | 
-13 13 |     @classmethod
+7  |     def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
+8  | 
+9  | 
+   -     def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
+10 +     def bad_instance_method(self, arg: bytes) -> Self: ...  # PYI019
+11 | 
+12 | 
+13 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   --> PYI019_0.py:14:25
@@ -46,16 +42,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 |     @classmethod
-14    |-    def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
-   14 |+    def bad_class_method(cls, arg: int) -> Self: ...  # PYI019
-15 15 | 
-16 16 | 
-17 17 |     @classmethod
+11 | 
+12 | 
+13 |     @classmethod
+   -     def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
+14 +     def bad_class_method(cls, arg: int) -> Self: ...  # PYI019
+15 | 
+16 | 
+17 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   --> PYI019_0.py:18:33
@@ -65,16 +59,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-15 15 | 
-16 16 | 
-17 17 |     @classmethod
-18    |-    def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
-   18 |+    def bad_posonly_class_method(cls, /) -> Self: ...  # PYI019
-19 19 | 
-20 20 | 
-21 21 |     @classmethod
+15 | 
+16 | 
+17 |     @classmethod
+   -     def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
+18 +     def bad_posonly_class_method(cls, /) -> Self: ...  # PYI019
+19 | 
+20 | 
+21 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:39:14
@@ -85,16 +77,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-36 36 | 
-37 37 | # Python > 3.12
-38 38 | class PEP695BadDunderNew[T]:
-39    |-  def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
-   39 |+  def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ...  # PYI019
-40 40 | 
-41 41 | 
-42 42 |   def generic_instance_method[S](self: S) -> S: ...  # PYI019
+36 | 
+37 | # Python > 3.12
+38 | class PEP695BadDunderNew[T]:
+   -   def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
+39 +   def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ...  # PYI019
+40 | 
+41 | 
+42 |   def generic_instance_method[S](self: S) -> S: ...  # PYI019
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:42:30
@@ -103,16 +93,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
    |                              ^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-39 39 |   def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
-40 40 | 
-41 41 | 
-42    |-  def generic_instance_method[S](self: S) -> S: ...  # PYI019
-   42 |+  def generic_instance_method(self) -> Self: ...  # PYI019
-43 43 | 
-44 44 | 
-45 45 | class PEP695GoodDunderNew[T]:
+39 |   def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
+40 | 
+41 | 
+   -   def generic_instance_method[S](self: S) -> S: ...  # PYI019
+42 +   def generic_instance_method(self) -> Self: ...  # PYI019
+43 | 
+44 | 
+45 | class PEP695GoodDunderNew[T]:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:54:11
@@ -123,16 +111,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
    |           ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-51 51 |    # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators`
-52 52 |    # in the settings for this test:
-53 53 |    @foo_classmethod
-54    |-   def foo[S](cls: type[S]) -> S: ...  # PYI019
-   54 |+   def foo(cls) -> Self: ...  # PYI019
-55 55 | 
-56 56 | 
-57 57 | _S695 = TypeVar("_S695", bound="PEP695Fix")
+51 |    # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators`
+52 |    # in the settings for this test:
+53 |    @foo_classmethod
+   -    def foo[S](cls: type[S]) -> S: ...  # PYI019
+54 +    def foo(cls) -> Self: ...  # PYI019
+55 | 
+56 | 
+57 | _S695 = TypeVar("_S695", bound="PEP695Fix")
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:61:16
@@ -144,16 +130,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-58 58 | 
-59 59 | 
-60 60 | class PEP695Fix:
-61    |-    def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
-   61 |+    def __new__(cls) -> Self: ...
-62 62 | 
-63 63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
-64 64 | 
+58 | 
+59 | 
+60 | class PEP695Fix:
+   -     def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
+61 +     def __new__(cls) -> Self: ...
+62 | 
+63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
+64 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:63:26
@@ -166,16 +150,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-60 60 | class PEP695Fix:
-61 61 |     def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
-62 62 | 
-63    |-    def __init_subclass__[S](cls: type[S]) -> S: ...
-   63 |+    def __init_subclass__(cls) -> Self: ...
-64 64 | 
-65 65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
-66 66 | 
+60 | class PEP695Fix:
+61 |     def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
+62 | 
+   -     def __init_subclass__[S](cls: type[S]) -> S: ...
+63 +     def __init_subclass__(cls) -> Self: ...
+64 | 
+65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
+66 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:65:16
@@ -188,16 +170,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 67 |     def __pos__[S](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-62 62 | 
-63 63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
-64 64 | 
-65    |-    def __neg__[S: PEP695Fix](self: S) -> S: ...
-   65 |+    def __neg__(self) -> Self: ...
-66 66 | 
-67 67 |     def __pos__[S](self: S) -> S: ...
-68 68 | 
+62 | 
+63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
+64 | 
+   -     def __neg__[S: PEP695Fix](self: S) -> S: ...
+65 +     def __neg__(self) -> Self: ...
+66 | 
+67 |     def __pos__[S](self: S) -> S: ...
+68 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:67:16
@@ -210,16 +190,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-64 64 | 
-65 65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
-66 66 | 
-67    |-    def __pos__[S](self: S) -> S: ...
-   67 |+    def __pos__(self) -> Self: ...
-68 68 | 
-69 69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
-70 70 | 
+64 | 
+65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
+66 | 
+   -     def __pos__[S](self: S) -> S: ...
+67 +     def __pos__(self) -> Self: ...
+68 | 
+69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
+70 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:69:16
@@ -232,16 +210,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 71 |     def __sub__[S](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-66 66 | 
-67 67 |     def __pos__[S](self: S) -> S: ...
-68 68 | 
-69    |-    def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
-   69 |+    def __add__(self, other: Self) -> Self: ...
-70 70 | 
-71 71 |     def __sub__[S](self: S, other: S) -> S: ...
-72 72 | 
+66 | 
+67 |     def __pos__[S](self: S) -> S: ...
+68 | 
+   -     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
+69 +     def __add__(self, other: Self) -> Self: ...
+70 | 
+71 |     def __sub__[S](self: S, other: S) -> S: ...
+72 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:71:16
@@ -254,16 +230,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 73 |     @classmethod
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-68 68 | 
-69 69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
-70 70 | 
-71    |-    def __sub__[S](self: S, other: S) -> S: ...
-   71 |+    def __sub__(self, other: Self) -> Self: ...
-72 72 | 
-73 73 |     @classmethod
-74 74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
+68 | 
+69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
+70 | 
+   -     def __sub__[S](self: S, other: S) -> S: ...
+71 +     def __sub__(self, other: Self) -> Self: ...
+72 | 
+73 |     @classmethod
+74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:74:27
@@ -275,16 +249,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 76 |     @classmethod
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-71 71 |     def __sub__[S](self: S, other: S) -> S: ...
-72 72 | 
-73 73 |     @classmethod
-74    |-    def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
-   74 |+    def class_method_bound(cls) -> Self: ...
-75 75 | 
-76 76 |     @classmethod
-77 77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
+71 |     def __sub__[S](self: S, other: S) -> S: ...
+72 | 
+73 |     @classmethod
+   -     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
+74 +     def class_method_bound(cls) -> Self: ...
+75 | 
+76 |     @classmethod
+77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:77:29
@@ -296,16 +268,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-74 74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
-75 75 | 
-76 76 |     @classmethod
-77    |-    def class_method_unbound[S](cls: type[S]) -> S: ...
-   77 |+    def class_method_unbound(cls) -> Self: ...
-78 78 | 
-79 79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
-80 80 | 
+74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
+75 | 
+76 |     @classmethod
+   -     def class_method_unbound[S](cls: type[S]) -> S: ...
+77 +     def class_method_unbound(cls) -> Self: ...
+78 | 
+79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
+80 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:79:30
@@ -318,16 +288,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 81 |     def instance_method_unbound[S](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-76 76 |     @classmethod
-77 77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
-78 78 | 
-79    |-    def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
-   79 |+    def instance_method_bound(self) -> Self: ...
-80 80 | 
-81 81 |     def instance_method_unbound[S](self: S) -> S: ...
-82 82 | 
+76 |     @classmethod
+77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
+78 | 
+   -     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
+79 +     def instance_method_bound(self) -> Self: ...
+80 | 
+81 |     def instance_method_unbound[S](self: S) -> S: ...
+82 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:81:32
@@ -340,16 +308,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-78 78 | 
-79 79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
-80 80 | 
-81    |-    def instance_method_unbound[S](self: S) -> S: ...
-   81 |+    def instance_method_unbound(self) -> Self: ...
-82 82 | 
-83 83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
-84 84 | 
+78 | 
+79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
+80 | 
+   -     def instance_method_unbound[S](self: S) -> S: ...
+81 +     def instance_method_unbound(self) -> Self: ...
+82 | 
+83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
+84 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:83:53
@@ -362,16 +328,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-80 80 | 
-81 81 |     def instance_method_unbound[S](self: S) -> S: ...
-82 82 | 
-83    |-    def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
-   83 |+    def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ...
-84 84 | 
-85 85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
-86 86 | 
+80 | 
+81 |     def instance_method_unbound[S](self: S) -> S: ...
+82 | 
+   -     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
+83 +     def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ...
+84 | 
+85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
+86 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:85:55
@@ -384,16 +348,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-82 82 | 
-83 83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
-84 84 | 
-85    |-    def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
-   85 |+    def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ...
-86 86 | 
-87 87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
-88 88 | 
+82 | 
+83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
+84 | 
+   -     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
+85 +     def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ...
+86 | 
+87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
+88 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:87:27
@@ -406,16 +368,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 89 |     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-84 84 | 
-85 85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
-86 86 | 
-87    |-    def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
-   87 |+    def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ...
-88 88 | 
-89 89 |     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
-90 90 | 
+84 | 
+85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
+86 | 
+   -     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
+87 +     def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ...
+88 | 
+89 |     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
+90 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S695`
   --> PYI019_0.py:89:43
@@ -426,16 +386,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S695`
    |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S695` with `Self`
-
-ℹ Safe fix
-86 86 | 
-87 87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
-88 88 | 
-89    |-    def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
-   89 |+    def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ...
-90 90 | 
-91 91 | 
-92 92 | class InvalidButWeDoNotPanic:
+86 | 
+87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
+88 | 
+   -     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
+89 +     def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ...
+90 | 
+91 | 
+92 | class InvalidButWeDoNotPanic:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.py:94:10
@@ -447,16 +405,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 95 |     def n(self: S) -> S[int]: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-91 91 | 
-92 92 | class InvalidButWeDoNotPanic:
-93 93 |     @classmethod
-94    |-    def m[S](cls: type[S], /) -> S[int]: ...
-   94 |+    def m(cls, /) -> Self[int]: ...
-95 95 |     def n(self: S) -> S[int]: ...
-96 96 | 
-97 97 | 
+91 | 
+92 | class InvalidButWeDoNotPanic:
+93 |     @classmethod
+   -     def m[S](cls: type[S], /) -> S[int]: ...
+94 +     def m(cls, /) -> Self[int]: ...
+95 |     def n(self: S) -> S[int]: ...
+96 | 
+97 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:114:10
@@ -467,16 +423,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-111 111 | 
-112 112 | class SubscriptReturnType:
-113 113 |     @classmethod
-114     |-    def m[S](cls: type[S]) -> type[S]: ...  # PYI019
-    114 |+    def m(cls) -> type[Self]: ...  # PYI019
-115 115 | 
-116 116 | 
-117 117 | class SelfNotUsedInReturnAnnotation:
+111 | 
+112 | class SubscriptReturnType:
+113 |     @classmethod
+    -     def m[S](cls: type[S]) -> type[S]: ...  # PYI019
+114 +     def m(cls) -> type[Self]: ...  # PYI019
+115 | 
+116 | 
+117 | class SelfNotUsedInReturnAnnotation:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:118:10
@@ -488,16 +442,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 120 |     def n[S](cls: type[S], other: S) -> int: ...
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-115 115 | 
-116 116 | 
-117 117 | class SelfNotUsedInReturnAnnotation:
-118     |-    def m[S](self: S, other: S) -> int: ...
-    118 |+    def m(self, other: Self) -> int: ...
-119 119 |     @classmethod
-120 120 |     def n[S](cls: type[S], other: S) -> int: ...
-121 121 | 
+115 | 
+116 | 
+117 | class SelfNotUsedInReturnAnnotation:
+    -     def m[S](self: S, other: S) -> int: ...
+118 +     def m(self, other: Self) -> int: ...
+119 |     @classmethod
+120 |     def n[S](cls: type[S], other: S) -> int: ...
+121 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:120:10
@@ -508,16 +460,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-117 117 | class SelfNotUsedInReturnAnnotation:
-118 118 |     def m[S](self: S, other: S) -> int: ...
-119 119 |     @classmethod
-120     |-    def n[S](cls: type[S], other: S) -> int: ...
-    120 |+    def n(cls, other: Self) -> int: ...
-121 121 | 
-122 122 | 
-123 123 | class _NotATypeVar: ...
+117 | class SelfNotUsedInReturnAnnotation:
+118 |     def m[S](self: S, other: S) -> int: ...
+119 |     @classmethod
+    -     def n[S](cls: type[S], other: S) -> int: ...
+120 +     def n(cls, other: Self) -> int: ...
+121 | 
+122 | 
+123 | class _NotATypeVar: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:135:10
@@ -529,16 +479,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 137 |     def n[S](cls: type[S], other: S): ...
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-132 132 | 
-133 133 | 
-134 134 | class NoReturnAnnotations:
-135     |-    def m[S](self: S, other: S): ...
-    135 |+    def m(self, other: Self): ...
-136 136 |     @classmethod
-137 137 |     def n[S](cls: type[S], other: S): ...
-138 138 | 
+132 | 
+133 | 
+134 | class NoReturnAnnotations:
+    -     def m[S](self: S, other: S): ...
+135 +     def m(self, other: Self): ...
+136 |     @classmethod
+137 |     def n[S](cls: type[S], other: S): ...
+138 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:137:10
@@ -551,16 +499,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 139 | class MultipleBoundParameters:
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-134 134 | class NoReturnAnnotations:
-135 135 |     def m[S](self: S, other: S): ...
-136 136 |     @classmethod
-137     |-    def n[S](cls: type[S], other: S): ...
-    137 |+    def n(cls, other: Self): ...
-138 138 | 
-139 139 | class MultipleBoundParameters:
-140 140 |     def m[S: int, T: int](self: S, other: T) -> S: ...
+134 | class NoReturnAnnotations:
+135 |     def m[S](self: S, other: S): ...
+136 |     @classmethod
+    -     def n[S](cls: type[S], other: S): ...
+137 +     def n(cls, other: Self): ...
+138 | 
+139 | class MultipleBoundParameters:
+140 |     def m[S: int, T: int](self: S, other: T) -> S: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:140:10
@@ -571,16 +517,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 141 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-137 137 |     def n[S](cls: type[S], other: S): ...
-138 138 | 
-139 139 | class MultipleBoundParameters:
-140     |-    def m[S: int, T: int](self: S, other: T) -> S: ...
-    140 |+    def m[T: int](self, other: T) -> Self: ...
-141 141 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
-142 142 | 
-143 143 | class MethodsWithBody:
+137 |     def n[S](cls: type[S], other: S): ...
+138 | 
+139 | class MultipleBoundParameters:
+    -     def m[S: int, T: int](self: S, other: T) -> S: ...
+140 +     def m[T: int](self, other: T) -> Self: ...
+141 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
+142 | 
+143 | class MethodsWithBody:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:141:10
@@ -593,16 +537,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 143 | class MethodsWithBody:
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-138 138 | 
-139 139 | class MultipleBoundParameters:
-140 140 |     def m[S: int, T: int](self: S, other: T) -> S: ...
-141     |-    def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
-    141 |+    def n[T: (int, str)](self, other: T) -> Self: ...
-142 142 | 
-143 143 | class MethodsWithBody:
-144 144 |     def m[S](self: S, other: S) -> S:
+138 | 
+139 | class MultipleBoundParameters:
+140 |     def m[S: int, T: int](self: S, other: T) -> S: ...
+    -     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
+141 +     def n[T: (int, str)](self, other: T) -> Self: ...
+142 | 
+143 | class MethodsWithBody:
+144 |     def m[S](self: S, other: S) -> S:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:144:10
@@ -614,18 +556,16 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 146 |         return x
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-141 141 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
-142 142 | 
-143 143 | class MethodsWithBody:
-144     |-    def m[S](self: S, other: S) -> S:
-145     |-        x: S = other
-    144 |+    def m(self, other: Self) -> Self:
-    145 |+        x: Self = other
-146 146 |         return x
-147 147 | 
-148 148 |     @classmethod
+141 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
+142 | 
+143 | class MethodsWithBody:
+    -     def m[S](self: S, other: S) -> S:
+    -         x: S = other
+144 +     def m(self, other: Self) -> Self:
+145 +         x: Self = other
+146 |         return x
+147 | 
+148 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:149:10
@@ -637,18 +577,16 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 151 |         return x()
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-146 146 |         return x
-147 147 | 
-148 148 |     @classmethod
-149     |-    def n[S](cls: type[S], other: S) -> S:
-150     |-        x: type[S] = type(other)
-    149 |+    def n(cls, other: Self) -> Self:
-    150 |+        x: type[Self] = type(other)
-151 151 |         return x()
-152 152 | 
-153 153 | class StringizedReferencesCanBeFixed:
+146 |         return x
+147 | 
+148 |     @classmethod
+    -     def n[S](cls: type[S], other: S) -> S:
+    -         x: type[S] = type(other)
+149 +     def n(cls, other: Self) -> Self:
+150 +         x: type[Self] = type(other)
+151 |         return x()
+152 | 
+153 | class StringizedReferencesCanBeFixed:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:154:10
@@ -660,18 +598,16 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 156 |         return x
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-151 151 |         return x()
-152 152 | 
-153 153 | class StringizedReferencesCanBeFixed:
-154     |-    def m[S](self: S) -> S:
-155     |-        x = cast("list[tuple[S, S]]", self)
-    154 |+    def m(self) -> Self:
-    155 |+        x = cast("list[tuple[Self, Self]]", self)
-156 156 |         return x
-157 157 | 
-158 158 | class ButStrangeStringizedReferencesCannotBeFixed:
+151 |         return x()
+152 | 
+153 | class StringizedReferencesCanBeFixed:
+    -     def m[S](self: S) -> S:
+    -         x = cast("list[tuple[S, S]]", self)
+154 +     def m(self) -> Self:
+155 +         x = cast("list[tuple[Self, Self]]", self)
+156 |         return x
+157 | 
+158 | class ButStrangeStringizedReferencesCannotBeFixed:
 
 PYI019 Use `Self` instead of custom TypeVar `_T`
    --> PYI019_0.py:159:10
@@ -694,16 +630,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 166 |         # so `del S` here is not actually a reference to the type variable `S`.
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-161 161 |         return x
-162 162 | 
-163 163 | class DeletionsAreNotTouched:
-164     |-    def m[S](self: S) -> S:
-    164 |+    def m(self) -> Self:
-165 165 |         # `S` is not a local variable here, and `del` can only be used with local variables,
-166 166 |         # so `del S` here is not actually a reference to the type variable `S`.
-167 167 |         # This `del` statement is therefore not touched by the autofix (it raises `UnboundLocalError`
+161 |         return x
+162 | 
+163 | class DeletionsAreNotTouched:
+    -     def m[S](self: S) -> S:
+164 +     def m(self) -> Self:
+165 |         # `S` is not a local variable here, and `del` can only be used with local variables,
+166 |         # so `del S` here is not actually a reference to the type variable `S`.
+167 |         # This `del` statement is therefore not touched by the autofix (it raises `UnboundLocalError`
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:173:10
@@ -715,16 +649,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 175 |         print(S)  # not a reference to the type variable, so not touched by the autofix
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-170 170 |         return self
-171 171 | 
-172 172 | class NamesShadowingTypeVarAreNotTouched:
-173     |-    def m[S](self: S) -> S:
-    173 |+    def m(self) -> Self:
-174 174 |         type S = int
-175 175 |         print(S)  # not a reference to the type variable, so not touched by the autofix
-176 176 |         return 42
+170 |         return self
+171 | 
+172 | class NamesShadowingTypeVarAreNotTouched:
+    -     def m[S](self: S) -> S:
+173 +     def m(self) -> Self:
+174 |         type S = int
+175 |         print(S)  # not a reference to the type variable, so not touched by the autofix
+176 |         return 42
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.py:189:52
@@ -736,16 +668,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
 191 |     @classmethod
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-186 186 | from __future__ import annotations
-187 187 | 
-188 188 | class BadClassWithStringTypeHints:
-189     |-    def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
-    189 |+    def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019
-190 190 | 
-191 191 |     @classmethod
-192 192 |     def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
+186 | from __future__ import annotations
+187 | 
+188 | class BadClassWithStringTypeHints:
+    -     def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
+189 +     def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019
+190 | 
+191 |     @classmethod
+192 |     def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.py:192:49
@@ -755,16 +685,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
     |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-189 189 |     def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
-190 190 | 
-191 191 |     @classmethod
-192     |-    def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
-    192 |+    def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019
-193 193 | 
-194 194 | 
-195 195 |     @classmethod
+189 |     def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
+190 | 
+191 |     @classmethod
+    -     def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
+192 +     def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019
+193 | 
+194 | 
+195 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.py:196:50
@@ -774,16 +702,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
     |                                                  ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-193 193 | 
-194 194 | 
-195 195 |     @classmethod
-196     |-    def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019
-    196 |+    def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019
-197 197 | 
-198 198 | 
-199 199 |     @classmethod
+193 | 
+194 | 
+195 |     @classmethod
+    -     def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019
+196 +     def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019
+197 | 
+198 | 
+199 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.py:200:50
@@ -793,16 +719,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
     |                                                  ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-197 197 | 
-198 198 | 
-199 199 |     @classmethod
-200     |-    def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019
-    200 |+    def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019
-201 201 | 
-202 202 | 
-203 203 | class BadSubscriptReturnTypeWithStringTypeHints:
+197 | 
+198 | 
+199 |     @classmethod
+    -     def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019
+200 +     def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019
+201 | 
+202 | 
+203 | class BadSubscriptReturnTypeWithStringTypeHints:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.py:205:10
@@ -813,13 +737,11 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-202 202 | 
-203 203 | class BadSubscriptReturnTypeWithStringTypeHints:
-204 204 |     @classmethod
-205     |-    def m[S](cls: "type[S]") -> "type[S]": ...  # PYI019
-    205 |+    def m(cls) -> "type[Self]": ...  # PYI019
-206 206 | 
-207 207 | 
-208 208 | class GoodClassWiStringTypeHints:
+202 | 
+203 | class BadSubscriptReturnTypeWithStringTypeHints:
+204 |     @classmethod
+    -     def m[S](cls: "type[S]") -> "type[S]": ...  # PYI019
+205 +     def m(cls) -> "type[Self]": ...  # PYI019
+206 | 
+207 | 
+208 | class GoodClassWiStringTypeHints:
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap
index fcd0d9b54a..28baa8bd92 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap
@@ -9,16 +9,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-4 4 | _S2 = TypeVar("_S2", BadClass, GoodClass)
-5 5 | 
-6 6 | class BadClass:
-7   |-    def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
-  7 |+    def __new__(cls, *args: str, **kwargs: int) -> Self: ...  # PYI019
-8 8 | 
-9 9 | 
-10 10 |     def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
+4  | _S2 = TypeVar("_S2", BadClass, GoodClass)
+5  | 
+6  | class BadClass:
+   -     def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
+7  +     def __new__(cls, *args: str, **kwargs: int) -> Self: ...  # PYI019
+8  | 
+9  | 
+10 |     def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   --> PYI019_0.pyi:10:28
@@ -27,16 +25,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-7  7  |     def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
-8  8  | 
-9  9  | 
-10    |-    def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
-   10 |+    def bad_instance_method(self, arg: bytes) -> Self: ...  # PYI019
-11 11 | 
-12 12 | 
-13 13 |     @classmethod
+7  |     def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
+8  | 
+9  | 
+   -     def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
+10 +     def bad_instance_method(self, arg: bytes) -> Self: ...  # PYI019
+11 | 
+12 | 
+13 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   --> PYI019_0.pyi:14:25
@@ -46,16 +42,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 |     @classmethod
-14    |-    def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
-   14 |+    def bad_class_method(cls, arg: int) -> Self: ...  # PYI019
-15 15 | 
-16 16 | 
-17 17 |     @classmethod
+11 | 
+12 | 
+13 |     @classmethod
+   -     def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
+14 +     def bad_class_method(cls, arg: int) -> Self: ...  # PYI019
+15 | 
+16 | 
+17 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
   --> PYI019_0.pyi:18:33
@@ -65,16 +59,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-15 15 | 
-16 16 | 
-17 17 |     @classmethod
-18    |-    def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
-   18 |+    def bad_posonly_class_method(cls, /) -> Self: ...  # PYI019
-19 19 | 
-20 20 | 
-21 21 |     @classmethod
+15 | 
+16 | 
+17 |     @classmethod
+   -     def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
+18 +     def bad_posonly_class_method(cls, /) -> Self: ...  # PYI019
+19 | 
+20 | 
+21 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:39:14
@@ -85,16 +77,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-36 36 | 
-37 37 | # Python > 3.12
-38 38 | class PEP695BadDunderNew[T]:
-39    |-  def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
-   39 |+  def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ...  # PYI019
-40 40 | 
-41 41 | 
-42 42 |   def generic_instance_method[S](self: S) -> S: ...  # PYI019
+36 | 
+37 | # Python > 3.12
+38 | class PEP695BadDunderNew[T]:
+   -   def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
+39 +   def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ...  # PYI019
+40 | 
+41 | 
+42 |   def generic_instance_method[S](self: S) -> S: ...  # PYI019
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:42:30
@@ -103,16 +93,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
    |                              ^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-39 39 |   def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
-40 40 | 
-41 41 | 
-42    |-  def generic_instance_method[S](self: S) -> S: ...  # PYI019
-   42 |+  def generic_instance_method(self) -> Self: ...  # PYI019
-43 43 | 
-44 44 | 
-45 45 | class PEP695GoodDunderNew[T]:
+39 |   def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
+40 | 
+41 | 
+   -   def generic_instance_method[S](self: S) -> S: ...  # PYI019
+42 +   def generic_instance_method(self) -> Self: ...  # PYI019
+43 | 
+44 | 
+45 | class PEP695GoodDunderNew[T]:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:54:11
@@ -123,16 +111,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
    |           ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-51 51 |    # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators`
-52 52 |    # in the settings for this test:
-53 53 |    @foo_classmethod
-54    |-   def foo[S](cls: type[S]) -> S: ...  # PYI019
-   54 |+   def foo(cls) -> Self: ...  # PYI019
-55 55 | 
-56 56 | 
-57 57 | _S695 = TypeVar("_S695", bound="PEP695Fix")
+51 |    # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators`
+52 |    # in the settings for this test:
+53 |    @foo_classmethod
+   -    def foo[S](cls: type[S]) -> S: ...  # PYI019
+54 +    def foo(cls) -> Self: ...  # PYI019
+55 | 
+56 | 
+57 | _S695 = TypeVar("_S695", bound="PEP695Fix")
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:61:16
@@ -144,16 +130,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-58 58 | 
-59 59 | 
-60 60 | class PEP695Fix:
-61    |-    def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
-   61 |+    def __new__(cls) -> Self: ...
-62 62 | 
-63 63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
-64 64 | 
+58 | 
+59 | 
+60 | class PEP695Fix:
+   -     def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
+61 +     def __new__(cls) -> Self: ...
+62 | 
+63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
+64 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:63:26
@@ -166,16 +150,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-60 60 | class PEP695Fix:
-61 61 |     def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
-62 62 | 
-63    |-    def __init_subclass__[S](cls: type[S]) -> S: ...
-   63 |+    def __init_subclass__(cls) -> Self: ...
-64 64 | 
-65 65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
-66 66 | 
+60 | class PEP695Fix:
+61 |     def __new__[S: PEP695Fix](cls: type[S]) -> S: ...
+62 | 
+   -     def __init_subclass__[S](cls: type[S]) -> S: ...
+63 +     def __init_subclass__(cls) -> Self: ...
+64 | 
+65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
+66 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:65:16
@@ -188,16 +170,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 67 |     def __pos__[S](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-62 62 | 
-63 63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
-64 64 | 
-65    |-    def __neg__[S: PEP695Fix](self: S) -> S: ...
-   65 |+    def __neg__(self) -> Self: ...
-66 66 | 
-67 67 |     def __pos__[S](self: S) -> S: ...
-68 68 | 
+62 | 
+63 |     def __init_subclass__[S](cls: type[S]) -> S: ...
+64 | 
+   -     def __neg__[S: PEP695Fix](self: S) -> S: ...
+65 +     def __neg__(self) -> Self: ...
+66 | 
+67 |     def __pos__[S](self: S) -> S: ...
+68 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:67:16
@@ -210,16 +190,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-64 64 | 
-65 65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
-66 66 | 
-67    |-    def __pos__[S](self: S) -> S: ...
-   67 |+    def __pos__(self) -> Self: ...
-68 68 | 
-69 69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
-70 70 | 
+64 | 
+65 |     def __neg__[S: PEP695Fix](self: S) -> S: ...
+66 | 
+   -     def __pos__[S](self: S) -> S: ...
+67 +     def __pos__(self) -> Self: ...
+68 | 
+69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
+70 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:69:16
@@ -232,16 +210,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 71 |     def __sub__[S](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-66 66 | 
-67 67 |     def __pos__[S](self: S) -> S: ...
-68 68 | 
-69    |-    def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
-   69 |+    def __add__(self, other: Self) -> Self: ...
-70 70 | 
-71 71 |     def __sub__[S](self: S, other: S) -> S: ...
-72 72 | 
+66 | 
+67 |     def __pos__[S](self: S) -> S: ...
+68 | 
+   -     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
+69 +     def __add__(self, other: Self) -> Self: ...
+70 | 
+71 |     def __sub__[S](self: S, other: S) -> S: ...
+72 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:71:16
@@ -254,16 +230,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 73 |     @classmethod
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-68 68 | 
-69 69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
-70 70 | 
-71    |-    def __sub__[S](self: S, other: S) -> S: ...
-   71 |+    def __sub__(self, other: Self) -> Self: ...
-72 72 | 
-73 73 |     @classmethod
-74 74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
+68 | 
+69 |     def __add__[S: PEP695Fix](self: S, other: S) -> S: ...
+70 | 
+   -     def __sub__[S](self: S, other: S) -> S: ...
+71 +     def __sub__(self, other: Self) -> Self: ...
+72 | 
+73 |     @classmethod
+74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:74:27
@@ -275,16 +249,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 76 |     @classmethod
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-71 71 |     def __sub__[S](self: S, other: S) -> S: ...
-72 72 | 
-73 73 |     @classmethod
-74    |-    def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
-   74 |+    def class_method_bound(cls) -> Self: ...
-75 75 | 
-76 76 |     @classmethod
-77 77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
+71 |     def __sub__[S](self: S, other: S) -> S: ...
+72 | 
+73 |     @classmethod
+   -     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
+74 +     def class_method_bound(cls) -> Self: ...
+75 | 
+76 |     @classmethod
+77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:77:29
@@ -296,16 +268,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-74 74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
-75 75 | 
-76 76 |     @classmethod
-77    |-    def class_method_unbound[S](cls: type[S]) -> S: ...
-   77 |+    def class_method_unbound(cls) -> Self: ...
-78 78 | 
-79 79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
-80 80 | 
+74 |     def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ...
+75 | 
+76 |     @classmethod
+   -     def class_method_unbound[S](cls: type[S]) -> S: ...
+77 +     def class_method_unbound(cls) -> Self: ...
+78 | 
+79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
+80 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:79:30
@@ -318,16 +288,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 81 |     def instance_method_unbound[S](self: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-76 76 |     @classmethod
-77 77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
-78 78 | 
-79    |-    def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
-   79 |+    def instance_method_bound(self) -> Self: ...
-80 80 | 
-81 81 |     def instance_method_unbound[S](self: S) -> S: ...
-82 82 | 
+76 |     @classmethod
+77 |     def class_method_unbound[S](cls: type[S]) -> S: ...
+78 | 
+   -     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
+79 +     def instance_method_bound(self) -> Self: ...
+80 | 
+81 |     def instance_method_unbound[S](self: S) -> S: ...
+82 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:81:32
@@ -340,16 +308,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-78 78 | 
-79 79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
-80 80 | 
-81    |-    def instance_method_unbound[S](self: S) -> S: ...
-   81 |+    def instance_method_unbound(self) -> Self: ...
-82 82 | 
-83 83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
-84 84 | 
+78 | 
+79 |     def instance_method_bound[S: PEP695Fix](self: S) -> S: ...
+80 | 
+   -     def instance_method_unbound[S](self: S) -> S: ...
+81 +     def instance_method_unbound(self) -> Self: ...
+82 | 
+83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
+84 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:83:53
@@ -362,16 +328,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-80 80 | 
-81 81 |     def instance_method_unbound[S](self: S) -> S: ...
-82 82 | 
-83    |-    def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
-   83 |+    def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ...
-84 84 | 
-85 85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
-86 86 | 
+80 | 
+81 |     def instance_method_unbound[S](self: S) -> S: ...
+82 | 
+   -     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
+83 +     def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ...
+84 | 
+85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
+86 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:85:55
@@ -384,16 +348,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-82 82 | 
-83 83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
-84 84 | 
-85    |-    def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
-   85 |+    def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ...
-86 86 | 
-87 87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
-88 88 | 
+82 | 
+83 |     def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ...
+84 | 
+   -     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
+85 +     def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ...
+86 | 
+87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
+88 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:87:27
@@ -406,16 +368,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 89 |     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-84 84 | 
-85 85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
-86 86 | 
-87    |-    def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
-   87 |+    def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ...
-88 88 | 
-89 89 |     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
-90 90 | 
+84 | 
+85 |     def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ...
+86 | 
+   -     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
+87 +     def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ...
+88 | 
+89 |     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
+90 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S695`
   --> PYI019_0.pyi:89:43
@@ -426,16 +386,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S695`
    |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace TypeVar `_S695` with `Self`
-
-ℹ Safe fix
-86 86 | 
-87 87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
-88 88 | 
-89    |-    def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
-   89 |+    def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ...
-90 90 | 
-91 91 | 
-92 92 | class InvalidButWeDoNotPanic:
+86 | 
+87 |     def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ...
+88 | 
+   -     def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ...
+89 +     def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ...
+90 | 
+91 | 
+92 | class InvalidButWeDoNotPanic:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
   --> PYI019_0.pyi:94:10
@@ -447,16 +405,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 95 |     def n(self: S) -> S[int]: ...
    |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-91 91 | 
-92 92 | class InvalidButWeDoNotPanic:
-93 93 |     @classmethod
-94    |-    def m[S](cls: type[S], /) -> S[int]: ...
-   94 |+    def m(cls, /) -> Self[int]: ...
-95 95 |     def n(self: S) -> S[int]: ...
-96 96 | 
-97 97 | 
+91 | 
+92 | class InvalidButWeDoNotPanic:
+93 |     @classmethod
+   -     def m[S](cls: type[S], /) -> S[int]: ...
+94 +     def m(cls, /) -> Self[int]: ...
+95 |     def n(self: S) -> S[int]: ...
+96 | 
+97 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:114:10
@@ -467,16 +423,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-111 111 | 
-112 112 | class SubscriptReturnType:
-113 113 |     @classmethod
-114     |-    def m[S](cls: type[S]) -> type[S]: ...  # PYI019
-    114 |+    def m(cls) -> type[Self]: ...  # PYI019
-115 115 | 
-116 116 | 
-117 117 | class PEP695TypeParameterAtTheVeryEndOfTheList:
+111 | 
+112 | class SubscriptReturnType:
+113 |     @classmethod
+    -     def m[S](cls: type[S]) -> type[S]: ...  # PYI019
+114 +     def m(cls) -> type[Self]: ...  # PYI019
+115 | 
+116 | 
+117 | class PEP695TypeParameterAtTheVeryEndOfTheList:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:118:10
@@ -486,16 +440,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-115 115 | 
-116 116 | 
-117 117 | class PEP695TypeParameterAtTheVeryEndOfTheList:
-118     |-    def f[T, S](self: S) -> S: ...
-    118 |+    def f[T](self) -> Self: ...
-119 119 | 
-120 120 | 
-121 121 | class PEP695Again:
+115 | 
+116 | 
+117 | class PEP695TypeParameterAtTheVeryEndOfTheList:
+    -     def f[T, S](self: S) -> S: ...
+118 +     def f[T](self) -> Self: ...
+119 | 
+120 | 
+121 | class PEP695Again:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S695`
    --> PYI019_0.pyi:122:26
@@ -506,16 +458,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S695`
 123 |     def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ...
     |
 help: Replace TypeVar `_S695` with `Self`
-
-ℹ Safe fix
-119 119 | 
-120 120 | 
-121 121 | class PEP695Again:
-122     |-    def mixing_and_nested[T](self: _S695, a: list[_S695], b: dict[_S695, str | T | set[_S695]]) -> _S695: ...
-    122 |+    def mixing_and_nested[T](self, a: list[Self], b: dict[Self, str | T | set[Self]]) -> Self: ...
-123 123 |     def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ...
-124 124 | 
-125 125 |     @classmethod
+119 | 
+120 | 
+121 | class PEP695Again:
+    -     def mixing_and_nested[T](self: _S695, a: list[_S695], b: dict[_S695, str | T | set[_S695]]) -> _S695: ...
+122 +     def mixing_and_nested[T](self, a: list[Self], b: dict[Self, str | T | set[Self]]) -> Self: ...
+123 |     def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ...
+124 | 
+125 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:126:29
@@ -534,25 +484,24 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 134 |       def comment_outside_fix_range[T, S](
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Unsafe fix
-123 123 |     def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ...
-124 124 | 
-125 125 |     @classmethod
-126     |-    def comment_in_fix_range[T, S](
-127     |-        cls: type[  # Lorem ipsum
-128     |-            S
-129     |-        ],
-    126 |+    def comment_in_fix_range[T](
-    127 |+        cls,
-130 128 |         a: T,
-131     |-        b: tuple[S, T]
-132     |-    ) -> S: ...
-    129 |+        b: tuple[Self, T]
-    130 |+    ) -> Self: ...
-133 131 | 
-134 132 |     def comment_outside_fix_range[T, S](
-135 133 |         self: S,
+123 |     def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ...
+124 | 
+125 |     @classmethod
+    -     def comment_in_fix_range[T, S](
+    -         cls: type[  # Lorem ipsum
+    -             S
+    -         ],
+126 +     def comment_in_fix_range[T](
+127 +         cls,
+128 |         a: T,
+    -         b: tuple[S, T]
+    -     ) -> S: ...
+129 +         b: tuple[Self, T]
+130 +     ) -> Self: ...
+131 | 
+132 |     def comment_outside_fix_range[T, S](
+133 |         self: S,
+note: This is an unsafe fix and may change runtime behavior
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:134:34
@@ -571,26 +520,24 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     | |__________^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-131 131 |         b: tuple[S, T]
-132 132 |     ) -> S: ...
-133 133 | 
-134     |-    def comment_outside_fix_range[T, S](
-135     |-        self: S,
-    134 |+    def comment_outside_fix_range[T](
-    135 |+        self,
-136 136 |         a: T,
-137 137 |         b: tuple[
-138 138 |             # Lorem ipsum
-139     |-            S, T
-    139 |+            Self, T
-140 140 |         ]
-141     |-    ) -> S: ...
-    141 |+    ) -> Self: ...
-142 142 | 
-143 143 | 
-144 144 | class SelfNotUsedInReturnAnnotation:
+131 |         b: tuple[S, T]
+132 |     ) -> S: ...
+133 | 
+    -     def comment_outside_fix_range[T, S](
+    -         self: S,
+134 +     def comment_outside_fix_range[T](
+135 +         self,
+136 |         a: T,
+137 |         b: tuple[
+138 |             # Lorem ipsum
+    -             S, T
+139 +             Self, T
+140 |         ]
+    -     ) -> S: ...
+141 +     ) -> Self: ...
+142 | 
+143 | 
+144 | class SelfNotUsedInReturnAnnotation:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:145:10
@@ -602,16 +549,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 147 |     def n[S](cls: type[S], other: S) -> int: ...
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-142 142 | 
-143 143 | 
-144 144 | class SelfNotUsedInReturnAnnotation:
-145     |-    def m[S](self: S, other: S) -> int: ...
-    145 |+    def m(self, other: Self) -> int: ...
-146 146 |     @classmethod
-147 147 |     def n[S](cls: type[S], other: S) -> int: ...
-148 148 | 
+142 | 
+143 | 
+144 | class SelfNotUsedInReturnAnnotation:
+    -     def m[S](self: S, other: S) -> int: ...
+145 +     def m(self, other: Self) -> int: ...
+146 |     @classmethod
+147 |     def n[S](cls: type[S], other: S) -> int: ...
+148 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:147:10
@@ -622,16 +567,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-144 144 | class SelfNotUsedInReturnAnnotation:
-145 145 |     def m[S](self: S, other: S) -> int: ...
-146 146 |     @classmethod
-147     |-    def n[S](cls: type[S], other: S) -> int: ...
-    147 |+    def n(cls, other: Self) -> int: ...
-148 148 | 
-149 149 | 
-150 150 | class _NotATypeVar: ...
+144 | class SelfNotUsedInReturnAnnotation:
+145 |     def m[S](self: S, other: S) -> int: ...
+146 |     @classmethod
+    -     def n[S](cls: type[S], other: S) -> int: ...
+147 +     def n(cls, other: Self) -> int: ...
+148 | 
+149 | 
+150 | class _NotATypeVar: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:161:10
@@ -643,16 +586,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 163 |     def n[S](cls: type[S], other: S): ...
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-158 158 |     def y(self: type[_NotATypeVar]) -> _NotATypeVar: ...
-159 159 | 
-160 160 | class NoReturnAnnotations:
-161     |-    def m[S](self: S, other: S): ...
-    161 |+    def m(self, other: Self): ...
-162 162 |     @classmethod
-163 163 |     def n[S](cls: type[S], other: S): ...
-164 164 | 
+158 |     def y(self: type[_NotATypeVar]) -> _NotATypeVar: ...
+159 | 
+160 | class NoReturnAnnotations:
+    -     def m[S](self: S, other: S): ...
+161 +     def m(self, other: Self): ...
+162 |     @classmethod
+163 |     def n[S](cls: type[S], other: S): ...
+164 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:163:10
@@ -665,16 +606,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 165 | class MultipleBoundParameters:
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-160 160 | class NoReturnAnnotations:
-161 161 |     def m[S](self: S, other: S): ...
-162 162 |     @classmethod
-163     |-    def n[S](cls: type[S], other: S): ...
-    163 |+    def n(cls, other: Self): ...
-164 164 | 
-165 165 | class MultipleBoundParameters:
-166 166 |     def m[S: int, T: int](self: S, other: T) -> S: ...
+160 | class NoReturnAnnotations:
+161 |     def m[S](self: S, other: S): ...
+162 |     @classmethod
+    -     def n[S](cls: type[S], other: S): ...
+163 +     def n(cls, other: Self): ...
+164 | 
+165 | class MultipleBoundParameters:
+166 |     def m[S: int, T: int](self: S, other: T) -> S: ...
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:166:10
@@ -685,16 +624,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
 167 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-163 163 |     def n[S](cls: type[S], other: S): ...
-164 164 | 
-165 165 | class MultipleBoundParameters:
-166     |-    def m[S: int, T: int](self: S, other: T) -> S: ...
-    166 |+    def m[T: int](self, other: T) -> Self: ...
-167 167 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
-168 168 | 
-169 169 | 
+163 |     def n[S](cls: type[S], other: S): ...
+164 | 
+165 | class MultipleBoundParameters:
+    -     def m[S: int, T: int](self: S, other: T) -> S: ...
+166 +     def m[T: int](self, other: T) -> Self: ...
+167 |     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
+168 | 
+169 | 
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:167:10
@@ -705,16 +642,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-164 164 | 
-165 165 | class MultipleBoundParameters:
-166 166 |     def m[S: int, T: int](self: S, other: T) -> S: ...
-167     |-    def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
-    167 |+    def n[T: (int, str)](self, other: T) -> Self: ...
-168 168 | 
-169 169 | 
-170 170 | MetaType = TypeVar("MetaType")
+164 | 
+165 | class MultipleBoundParameters:
+166 |     def m[S: int, T: int](self: S, other: T) -> S: ...
+    -     def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ...
+167 +     def n[T: (int, str)](self, other: T) -> Self: ...
+168 | 
+169 | 
+170 | MetaType = TypeVar("MetaType")
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.pyi:181:52
@@ -726,16 +661,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
 183 |     @classmethod
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-178 178 | 
-179 179 | 
-180 180 | class BadClassWithStringTypeHints:
-181     |-    def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
-    181 |+    def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019
-182 182 | 
-183 183 |     @classmethod
-184 184 |     def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
+178 | 
+179 | 
+180 | class BadClassWithStringTypeHints:
+    -     def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
+181 +     def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019
+182 | 
+183 |     @classmethod
+184 |     def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.pyi:184:49
@@ -745,16 +678,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
     |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-181 181 |     def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
-182 182 | 
-183 183 |     @classmethod
-184     |-    def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
-    184 |+    def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019
-185 185 | 
-186 186 | 
-187 187 |     @classmethod
+181 |     def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
+182 | 
+183 |     @classmethod
+    -     def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
+184 +     def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019
+185 | 
+186 | 
+187 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.pyi:188:50
@@ -764,16 +695,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
     |                                                  ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-185 185 | 
-186 186 | 
-187 187 |     @classmethod
-188     |-    def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019
-    188 |+    def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019
-189 189 | 
-190 190 | 
-191 191 |     @classmethod
+185 | 
+186 | 
+187 |     @classmethod
+    -     def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019
+188 +     def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019
+189 | 
+190 | 
+191 |     @classmethod
 
 PYI019 [*] Use `Self` instead of custom TypeVar `_S`
    --> PYI019_0.pyi:192:50
@@ -783,16 +712,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S`
     |                                                  ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `_S` with `Self`
-
-ℹ Safe fix
-189 189 | 
-190 190 | 
-191 191 |     @classmethod
-192     |-    def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019
-    192 |+    def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019
-193 193 | 
-194 194 | 
-195 195 | class BadSubscriptReturnTypeWithStringTypeHints:
+189 | 
+190 | 
+191 |     @classmethod
+    -     def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019
+192 +     def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019
+193 | 
+194 | 
+195 | class BadSubscriptReturnTypeWithStringTypeHints:
 
 PYI019 [*] Use `Self` instead of custom TypeVar `S`
    --> PYI019_0.pyi:197:10
@@ -803,13 +730,11 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-194 194 | 
-195 195 | class BadSubscriptReturnTypeWithStringTypeHints:
-196 196 |     @classmethod
-197     |-    def m[S](cls: "type[S]") -> "type[S]": ...  # PYI019
-    197 |+    def m(cls) -> "type[Self]": ...  # PYI019
-198 198 | 
-199 199 | 
-200 200 | class GoodClassWithStringTypeHints:
+194 | 
+195 | class BadSubscriptReturnTypeWithStringTypeHints:
+196 |     @classmethod
+    -     def m[S](cls: "type[S]") -> "type[S]": ...  # PYI019
+197 +     def m(cls) -> "type[Self]": ...  # PYI019
+198 | 
+199 | 
+200 | class GoodClassWithStringTypeHints:
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap
index 6a606ef108..7b701cee68 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap
@@ -9,10 +9,8 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S`
   |          ^^^^^^^^^^^^^^^^^
   |
 help: Replace TypeVar `S` with `Self`
-
-ℹ Safe fix
-1 1 | import typing
-2 2 | 
-3 3 | class F:
-4   |-    def m[S](self: S) -> S: ...
-  4 |+    def m(self) -> typing.Self: ...
+1 | import typing
+2 | 
+3 | class F:
+  -     def m[S](self: S) -> S: ...
+4 +     def m(self) -> typing.Self: ...
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap
index 2398a9f453..e86115650c 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap
@@ -12,16 +12,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 9 | _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
   |
 help: Remove quotes
-
-ℹ Safe fix
-4 4 | 
-5 5 | import typing_extensions
-6 6 | 
-7   |-def f(x: "int"): ...  # Y020 Quoted annotations should never be used in stubs
-  7 |+def f(x: int): ...  # Y020 Quoted annotations should never be used in stubs
-8 8 | def g(x: list["int"]): ...  # Y020 Quoted annotations should never be used in stubs
-9 9 | _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
-10 10 | 
+4  | 
+5  | import typing_extensions
+6  | 
+   - def f(x: "int"): ...  # Y020 Quoted annotations should never be used in stubs
+7  + def f(x: int): ...  # Y020 Quoted annotations should never be used in stubs
+8  | def g(x: list["int"]): ...  # Y020 Quoted annotations should never be used in stubs
+9  | _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
+10 | 
 
 PYI020 [*] Quoted annotations should not be included in stubs
  --> PYI020.pyi:8:15
@@ -32,16 +30,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 9 | _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
   |
 help: Remove quotes
-
-ℹ Safe fix
-5 5 | import typing_extensions
-6 6 | 
-7 7 | def f(x: "int"): ...  # Y020 Quoted annotations should never be used in stubs
-8   |-def g(x: list["int"]): ...  # Y020 Quoted annotations should never be used in stubs
-  8 |+def g(x: list[int]): ...  # Y020 Quoted annotations should never be used in stubs
-9 9 | _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
-10 10 | 
-11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
+5  | import typing_extensions
+6  | 
+7  | def f(x: "int"): ...  # Y020 Quoted annotations should never be used in stubs
+   - def g(x: list["int"]): ...  # Y020 Quoted annotations should never be used in stubs
+8  + def g(x: list[int]): ...  # Y020 Quoted annotations should never be used in stubs
+9  | _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
+10 | 
+11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:9:26
@@ -54,16 +50,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
    |
 help: Remove quotes
-
-ℹ Safe fix
-6  6  | 
-7  7  | def f(x: "int"): ...  # Y020 Quoted annotations should never be used in stubs
-8  8  | def g(x: list["int"]): ...  # Y020 Quoted annotations should never be used in stubs
-9     |-_T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
-   9  |+_T = TypeVar("_T", bound=int)  # Y020 Quoted annotations should never be used in stubs
-10 10 | 
-11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
-12 12 | 
+6  | 
+7  | def f(x: "int"): ...  # Y020 Quoted annotations should never be used in stubs
+8  | def g(x: list["int"]): ...  # Y020 Quoted annotations should never be used in stubs
+   - _T = TypeVar("_T", bound="int")  # Y020 Quoted annotations should never be used in stubs
+9  + _T = TypeVar("_T", bound=int)  # Y020 Quoted annotations should never be used in stubs
+10 | 
+11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
+12 | 
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:13:12
@@ -75,16 +69,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 14 | Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
    |
 help: Remove quotes
-
-ℹ Safe fix
-10 10 | 
-11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
-12 12 | 
-13    |-def j() -> "int": ...  # Y020 Quoted annotations should never be used in stubs
-   13 |+def j() -> int: ...  # Y020 Quoted annotations should never be used in stubs
-14 14 | Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
-15 15 | 
-16 16 | class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
+10 | 
+11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
+12 | 
+   - def j() -> "int": ...  # Y020 Quoted annotations should never be used in stubs
+13 + def j() -> int: ...  # Y020 Quoted annotations should never be used in stubs
+14 | Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
+15 | 
+16 | class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:14:25
@@ -96,16 +88,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 16 | class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
    |
 help: Remove quotes
-
-ℹ Safe fix
-11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
-12 12 | 
-13 13 | def j() -> "int": ...  # Y020 Quoted annotations should never be used in stubs
-14    |-Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
-   14 |+Alias: TypeAlias = list[int]  # Y020 Quoted annotations should never be used in stubs
-15 15 | 
-16 16 | class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
-17 17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
+11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ...
+12 | 
+13 | def j() -> "int": ...  # Y020 Quoted annotations should never be used in stubs
+   - Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
+14 + Alias: TypeAlias = list[int]  # Y020 Quoted annotations should never be used in stubs
+15 | 
+16 | class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
+17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:16:18
@@ -117,16 +107,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
    |
 help: Remove quotes
-
-ℹ Safe fix
-13 13 | def j() -> "int": ...  # Y020 Quoted annotations should never be used in stubs
-14 14 | Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
-15 15 | 
-16    |-class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
-   16 |+class Child(list[int]):  # Y020 Quoted annotations should never be used in stubs
-17 17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
-18 18 | 
-19 19 | if sys.platform == "linux":
+13 | def j() -> "int": ...  # Y020 Quoted annotations should never be used in stubs
+14 | Alias: TypeAlias = list["int"]  # Y020 Quoted annotations should never be used in stubs
+15 | 
+   - class Child(list["int"]):  # Y020 Quoted annotations should never be used in stubs
+16 + class Child(list[int]):  # Y020 Quoted annotations should never be used in stubs
+17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
+18 | 
+19 | if sys.platform == "linux":
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:20:8
@@ -138,16 +126,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 22 |     f: "str"  # Y020 Quoted annotations should never be used in stubs
    |
 help: Remove quotes
-
-ℹ Safe fix
-17 17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
-18 18 | 
-19 19 | if sys.platform == "linux":
-20    |-    f: "int"  # Y020 Quoted annotations should never be used in stubs
-   20 |+    f: int  # Y020 Quoted annotations should never be used in stubs
-21 21 | elif sys.platform == "win32":
-22 22 |     f: "str"  # Y020 Quoted annotations should never be used in stubs
-23 23 | else:
+17 |     """Documented and guaranteed useful."""  # Y021 Docstrings should not be included in stubs
+18 | 
+19 | if sys.platform == "linux":
+   -     f: "int"  # Y020 Quoted annotations should never be used in stubs
+20 +     f: int  # Y020 Quoted annotations should never be used in stubs
+21 | elif sys.platform == "win32":
+22 |     f: "str"  # Y020 Quoted annotations should never be used in stubs
+23 | else:
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:22:8
@@ -160,16 +146,14 @@ PYI020 [*] Quoted annotations should not be included in stubs
 24 |     f: "bytes"  # Y020 Quoted annotations should never be used in stubs
    |
 help: Remove quotes
-
-ℹ Safe fix
-19 19 | if sys.platform == "linux":
-20 20 |     f: "int"  # Y020 Quoted annotations should never be used in stubs
-21 21 | elif sys.platform == "win32":
-22    |-    f: "str"  # Y020 Quoted annotations should never be used in stubs
-   22 |+    f: str  # Y020 Quoted annotations should never be used in stubs
-23 23 | else:
-24 24 |     f: "bytes"  # Y020 Quoted annotations should never be used in stubs
-25 25 | 
+19 | if sys.platform == "linux":
+20 |     f: "int"  # Y020 Quoted annotations should never be used in stubs
+21 | elif sys.platform == "win32":
+   -     f: "str"  # Y020 Quoted annotations should never be used in stubs
+22 +     f: str  # Y020 Quoted annotations should never be used in stubs
+23 | else:
+24 |     f: "bytes"  # Y020 Quoted annotations should never be used in stubs
+25 | 
 
 PYI020 [*] Quoted annotations should not be included in stubs
   --> PYI020.pyi:24:8
@@ -182,13 +166,11 @@ PYI020 [*] Quoted annotations should not be included in stubs
 26 | # These two shouldn't trigger Y020 -- empty strings can't be "quoted annotations"
    |
 help: Remove quotes
-
-ℹ Safe fix
-21 21 | elif sys.platform == "win32":
-22 22 |     f: "str"  # Y020 Quoted annotations should never be used in stubs
-23 23 | else:
-24    |-    f: "bytes"  # Y020 Quoted annotations should never be used in stubs
-   24 |+    f: bytes  # Y020 Quoted annotations should never be used in stubs
-25 25 | 
-26 26 | # These two shouldn't trigger Y020 -- empty strings can't be "quoted annotations"
-27 27 | k = ""  # Y052 Need type annotation for "k"
+21 | elif sys.platform == "win32":
+22 |     f: "str"  # Y020 Quoted annotations should never be used in stubs
+23 | else:
+   -     f: "bytes"  # Y020 Quoted annotations should never be used in stubs
+24 +     f: bytes  # Y020 Quoted annotations should never be used in stubs
+25 | 
+26 | # These two shouldn't trigger Y020 -- empty strings can't be "quoted annotations"
+27 | k = ""  # Y052 Need type annotation for "k"
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap
index 1813232fb8..fec14111e2 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap
@@ -10,13 +10,12 @@ PYI021 [*] Docstrings should not be included in stubs
 3 | def foo():
   |
 help: Remove docstring
-
-ℹ Unsafe fix
-1   |-"""foo"""  # ERROR PYI021
-  1 |+  # ERROR PYI021
-2 2 | 
-3 3 | def foo():
-4 4 |     """foo"""  # ERROR PYI021
+  - """foo"""  # ERROR PYI021
+1 +   # ERROR PYI021
+2 | 
+3 | def foo():
+4 |     """foo"""  # ERROR PYI021
+note: This is an unsafe fix and may change runtime behavior
 
 PYI021 [*] Docstrings should not be included in stubs
  --> PYI021.pyi:4:5
@@ -28,16 +27,15 @@ PYI021 [*] Docstrings should not be included in stubs
 6 | class Bar:
   |
 help: Remove docstring
-
-ℹ Unsafe fix
-1 1 | """foo"""  # ERROR PYI021
-2 2 | 
-3 3 | def foo():
-4   |-    """foo"""  # ERROR PYI021
-  4 |+    ...  # ERROR PYI021
-5 5 | 
-6 6 | class Bar:
-7 7 |     """bar"""  # ERROR PYI021
+1 | """foo"""  # ERROR PYI021
+2 | 
+3 | def foo():
+  -     """foo"""  # ERROR PYI021
+4 +     ...  # ERROR PYI021
+5 | 
+6 | class Bar:
+7 |     """bar"""  # ERROR PYI021
+note: This is an unsafe fix and may change runtime behavior
 
 PYI021 [*] Docstrings should not be included in stubs
  --> PYI021.pyi:7:5
@@ -49,16 +47,15 @@ PYI021 [*] Docstrings should not be included in stubs
 9 | class Qux:
   |
 help: Remove docstring
-
-ℹ Unsafe fix
-4 4 |     """foo"""  # ERROR PYI021
-5 5 | 
-6 6 | class Bar:
-7   |-    """bar"""  # ERROR PYI021
-  7 |+    ...  # ERROR PYI021
-8 8 | 
-9 9 | class Qux:
-10 10 |     """qux"""  # ERROR PYI021
+4  |     """foo"""  # ERROR PYI021
+5  | 
+6  | class Bar:
+   -     """bar"""  # ERROR PYI021
+7  +     ...  # ERROR PYI021
+8  | 
+9  | class Qux:
+10 |     """qux"""  # ERROR PYI021
+note: This is an unsafe fix and may change runtime behavior
 
 PYI021 [*] Docstrings should not be included in stubs
   --> PYI021.pyi:10:5
@@ -70,16 +67,15 @@ PYI021 [*] Docstrings should not be included in stubs
 12 |     def __init__(self) -> None: ...
    |
 help: Remove docstring
-
-ℹ Unsafe fix
-7  7  |     """bar"""  # ERROR PYI021
-8  8  | 
-9  9  | class Qux:
-10    |-    """qux"""  # ERROR PYI021
-   10 |+      # ERROR PYI021
-11 11 | 
-12 12 |     def __init__(self) -> None: ...
-13 13 | 
+7  |     """bar"""  # ERROR PYI021
+8  | 
+9  | class Qux:
+   -     """qux"""  # ERROR PYI021
+10 +       # ERROR PYI021
+11 | 
+12 |     def __init__(self) -> None: ...
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI021 [*] Docstrings should not be included in stubs
   --> PYI021.pyi:15:5
@@ -94,16 +90,15 @@ PYI021 [*] Docstrings should not be included in stubs
 20 |       def __init__(self) -> None: ...
    |
 help: Remove docstring
-
-ℹ Unsafe fix
-12 12 |     def __init__(self) -> None: ...
-13 13 | 
-14 14 | class Baz:
-15    |-    """Multiline docstring
-16    |-
-17    |-    Lorem ipsum dolor sit amet
-18    |-    """
-   15 |+    
-19 16 | 
-20 17 |     def __init__(self) -> None: ...
-21 18 |
+12 |     def __init__(self) -> None: ...
+13 | 
+14 | class Baz:
+   -     """Multiline docstring
+   - 
+   -     Lorem ipsum dolor sit amet
+   -     """
+15 +     
+16 | 
+17 |     def __init__(self) -> None: ...
+18 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap
index 1e5b623529..12f30669a9 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap
@@ -9,16 +9,14 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
    |                                 ^^^
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-7  7  | 
-8  8  | 
-9  9  | def f():
-10    |-    from collections.abc import Set  # PYI025
-   10 |+    from collections.abc import Set as AbstractSet  # PYI025
-11 11 | 
-12 12 | 
-13 13 | def f():
+7  | 
+8  | 
+9  | def f():
+   -     from collections.abc import Set  # PYI025
+10 +     from collections.abc import Set as AbstractSet  # PYI025
+11 | 
+12 | 
+13 | def f():
 
 PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
   --> PYI025_1.py:14:51
@@ -30,17 +28,15 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 16 |     GLOBAL: Set[int] = set()
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 | def f():
-14    |-    from collections.abc import Container, Sized, Set, ValuesView  # PYI025
-   14 |+    from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # PYI025
-15 15 | 
-16    |-    GLOBAL: Set[int] = set()
-   16 |+    GLOBAL: AbstractSet[int] = set()
-17 17 | 
-18 18 |     class Class:
-19    |-        member: Set[int]
-   19 |+        member: AbstractSet[int]
+11 | 
+12 | 
+13 | def f():
+   -     from collections.abc import Container, Sized, Set, ValuesView  # PYI025
+14 +     from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # PYI025
+15 | 
+   -     GLOBAL: Set[int] = set()
+16 +     GLOBAL: AbstractSet[int] = set()
+17 | 
+18 |     class Class:
+   -         member: Set[int]
+19 +         member: AbstractSet[int]
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap
index e8148d3b21..0f54a8cf79 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap
@@ -11,16 +11,14 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 10 | def f():
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-5 5 |     from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # Ok
-6 6 | 
-7 7 | def f():
-8   |-    from collections.abc import Set  # PYI025
-  8 |+    from collections.abc import Set as AbstractSet  # PYI025
-9 9 | 
-10 10 | def f():
-11 11 |     from collections.abc import Container, Sized, Set, ValuesView  # PYI025
+5  |     from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # Ok
+6  | 
+7  | def f():
+   -     from collections.abc import Set  # PYI025
+8  +     from collections.abc import Set as AbstractSet  # PYI025
+9  | 
+10 | def f():
+11 |     from collections.abc import Container, Sized, Set, ValuesView  # PYI025
 
 PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
   --> PYI025_1.pyi:11:51
@@ -32,16 +30,14 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 13 | def f():
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-8  8  |     from collections.abc import Set  # PYI025
-9  9  | 
-10 10 | def f():
-11    |-    from collections.abc import Container, Sized, Set, ValuesView  # PYI025
-   11 |+    from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # PYI025
-12 12 | 
-13 13 | def f():
-14 14 |     """Test: local symbol renaming."""
+8  |     from collections.abc import Set  # PYI025
+9  | 
+10 | def f():
+   -     from collections.abc import Container, Sized, Set, ValuesView  # PYI025
+11 +     from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # PYI025
+12 | 
+13 | def f():
+14 |     """Test: local symbol renaming."""
 
 PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
   --> PYI025_1.pyi:16:37
@@ -54,30 +50,28 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 18 |         Set = 1
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-13 13 | def f():
-14 14 |     """Test: local symbol renaming."""
-15 15 |     if True:
-16    |-        from collections.abc import Set
-   16 |+        from collections.abc import Set as AbstractSet
-17 17 |     else:
-18    |-        Set = 1
-   18 |+        AbstractSet = 1
-19 19 | 
-20 20 |     x: Set = set()
-21 21 | 
-22 22 |     x: Set
-23 23 | 
-24    |-    del Set
-   24 |+    del AbstractSet
-25 25 | 
-26 26 |     def f():
-27    |-        print(Set)
-   27 |+        print(AbstractSet)
-28 28 | 
-29 29 |         def Set():
-30 30 |             pass
+13 | def f():
+14 |     """Test: local symbol renaming."""
+15 |     if True:
+   -         from collections.abc import Set
+16 +         from collections.abc import Set as AbstractSet
+17 |     else:
+   -         Set = 1
+18 +         AbstractSet = 1
+19 | 
+20 |     x: Set = set()
+21 | 
+22 |     x: Set
+23 | 
+   -     del Set
+24 +     del AbstractSet
+25 | 
+26 |     def f():
+   -         print(Set)
+27 +         print(AbstractSet)
+28 | 
+29 |         def Set():
+30 |             pass
 
 PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
   --> PYI025_1.pyi:33:29
@@ -90,38 +84,36 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 35 | def f():
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-17 17 |     else:
-18 18 |         Set = 1
-19 19 | 
-20    |-    x: Set = set()
-   20 |+    x: AbstractSet = set()
-21 21 | 
-22    |-    x: Set
-   22 |+    x: AbstractSet
-23 23 | 
-24 24 |     del Set
-25 25 | 
+17 |     else:
+18 |         Set = 1
+19 | 
+   -     x: Set = set()
+20 +     x: AbstractSet = set()
+21 | 
+   -     x: Set
+22 +     x: AbstractSet
+23 | 
+24 |     del Set
+25 | 
 --------------------------------------------------------------------------------
-30 30 |             pass
-31 31 |         print(Set)
-32 32 | 
-33    |-from collections.abc import Set
-   33 |+from collections.abc import Set as AbstractSet
-34 34 | 
-35 35 | def f():
-36 36 |     """Test: global symbol renaming."""
-37    |-    global Set
-   37 |+    global AbstractSet
-38 38 | 
-39    |-    Set = 1
-40    |-    print(Set)
-   39 |+    AbstractSet = 1
-   40 |+    print(AbstractSet)
-41 41 | 
-42 42 | def f():
-43 43 |     """Test: nonlocal symbol renaming."""
+30 |             pass
+31 |         print(Set)
+32 | 
+   - from collections.abc import Set
+33 + from collections.abc import Set as AbstractSet
+34 | 
+35 | def f():
+36 |     """Test: global symbol renaming."""
+   -     global Set
+37 +     global AbstractSet
+38 | 
+   -     Set = 1
+   -     print(Set)
+39 +     AbstractSet = 1
+40 +     print(AbstractSet)
+41 | 
+42 | def f():
+43 |     """Test: nonlocal symbol renaming."""
 
 PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
   --> PYI025_1.pyi:44:33
@@ -134,19 +126,17 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 46 |     def g():
    |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Safe fix
-41 41 | 
-42 42 | def f():
-43 43 |     """Test: nonlocal symbol renaming."""
-44    |-    from collections.abc import Set
-   44 |+    from collections.abc import Set as AbstractSet
-45 45 | 
-46 46 |     def g():
-47    |-        nonlocal Set
-   47 |+        nonlocal AbstractSet
-48 48 | 
-49    |-        Set = 1
-50    |-        print(Set)
-   49 |+        AbstractSet = 1
-   50 |+        print(AbstractSet)
+41 | 
+42 | def f():
+43 |     """Test: nonlocal symbol renaming."""
+   -     from collections.abc import Set
+44 +     from collections.abc import Set as AbstractSet
+45 | 
+46 |     def g():
+   -         nonlocal Set
+47 +         nonlocal AbstractSet
+48 | 
+   -         Set = 1
+   -         print(Set)
+49 +         AbstractSet = 1
+50 +         print(AbstractSet)
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap
index ef5a7584bb..3a46a06d38 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap
@@ -12,24 +12,23 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 5 | __all__ = ["Set"]
   |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Unsafe fix
-1  1  | """Tests to ensure we correctly rename references inside `__all__`"""
-2  2  | 
-3     |-from collections.abc import Set
-   3  |+from collections.abc import Set as AbstractSet
-4  4  | 
-5     |-__all__ = ["Set"]
-   5  |+__all__ = ["AbstractSet"]
-6  6  | 
-7  7  | if True:
-8     |-    __all__ += [r'''Set''']
-   8  |+    __all__ += ["AbstractSet"]
-9  9  | 
-10 10 | if 1:
-11    |-    __all__ += ["S" "e" "t"]
-   11 |+    __all__ += ["AbstractSet"]
-12 12 | 
-13 13 | if not False:
-14    |-    __all__ += ["Se" 't']
-   14 |+    __all__ += ["AbstractSet"]
+1  | """Tests to ensure we correctly rename references inside `__all__`"""
+2  | 
+   - from collections.abc import Set
+3  + from collections.abc import Set as AbstractSet
+4  | 
+   - __all__ = ["Set"]
+5  + __all__ = ["AbstractSet"]
+6  | 
+7  | if True:
+   -     __all__ += [r'''Set''']
+8  +     __all__ += ["AbstractSet"]
+9  | 
+10 | if 1:
+   -     __all__ += ["S" "e" "t"]
+11 +     __all__ += ["AbstractSet"]
+12 | 
+13 | if not False:
+   -     __all__ += ["Se" 't']
+14 +     __all__ += ["AbstractSet"]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap
index 16ad7a6cc6..711a53b3b8 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap
@@ -12,24 +12,23 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
 5 | __all__ = ["Set"]
   |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Unsafe fix
-1  1  | """Tests to ensure we correctly rename references inside `__all__`"""
-2  2  | 
-3     |-from collections.abc import Set
-   3  |+from collections.abc import Set as AbstractSet
-4  4  | 
-5     |-__all__ = ["Set"]
-   5  |+__all__ = ["AbstractSet"]
-6  6  | 
-7  7  | if True:
-8     |-    __all__ += [r'''Set''']
-   8  |+    __all__ += ["AbstractSet"]
-9  9  | 
-10 10 | if 1:
-11    |-    __all__ += ["S" "e" "t"]
-   11 |+    __all__ += ["AbstractSet"]
-12 12 | 
-13 13 | if not False:
-14    |-    __all__ += ["Se" 't']
-   14 |+    __all__ += ["AbstractSet"]
+1  | """Tests to ensure we correctly rename references inside `__all__`"""
+2  | 
+   - from collections.abc import Set
+3  + from collections.abc import Set as AbstractSet
+4  | 
+   - __all__ = ["Set"]
+5  + __all__ = ["AbstractSet"]
+6  | 
+7  | if True:
+   -     __all__ += [r'''Set''']
+8  +     __all__ += ["AbstractSet"]
+9  | 
+10 | if 1:
+   -     __all__ += ["S" "e" "t"]
+11 +     __all__ += ["AbstractSet"]
+12 | 
+13 | if not False:
+   -     __all__ += ["Se" 't']
+14 +     __all__ += ["AbstractSet"]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap
index ae989e3db5..4c11e4a4a1 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap
@@ -10,10 +10,9 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
   |                                    ^^^
   |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Unsafe fix
-3 3 | through usage of a "redundant" `import Set as Set` alias
-4 4 | """
-5 5 | 
-6   |-from collections.abc import Set as Set  # PYI025 triggered but fix is not marked as safe
-  6 |+from collections.abc import Set as AbstractSet  # PYI025 triggered but fix is not marked as safe
+3 | through usage of a "redundant" `import Set as Set` alias
+4 | """
+5 | 
+  - from collections.abc import Set as Set  # PYI025 triggered but fix is not marked as safe
+6 + from collections.abc import Set as AbstractSet  # PYI025 triggered but fix is not marked as safe
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap
index c277b2ce9e..68b225df67 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap
@@ -10,10 +10,9 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi
   |                                    ^^^
   |
 help: Alias `Set` to `AbstractSet`
-
-ℹ Unsafe fix
-3 3 | through usage of a "redundant" `import Set as Set` alias
-4 4 | """
-5 5 | 
-6   |-from collections.abc import Set as Set  # PYI025 triggered but fix is not marked as safe
-  6 |+from collections.abc import Set as AbstractSet  # PYI025 triggered but fix is not marked as safe
+3 | through usage of a "redundant" `import Set as Set` alias
+4 | """
+5 | 
+  - from collections.abc import Set as Set  # PYI025 triggered but fix is not marked as safe
+6 + from collections.abc import Set as AbstractSet  # PYI025 triggered but fix is not marked as safe
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap
index 5c772f1030..e6e31f6e57 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap
@@ -12,16 +12,14 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `NewAny: TypeAlias = Any
 5 | Foo = Literal["foo"]
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1   |-from typing import Literal, Any
-  1 |+from typing import Literal, Any, TypeAlias
-2 2 | 
-3   |-NewAny = Any
-  3 |+NewAny: TypeAlias = Any
-4 4 | OptionalStr = typing.Optional[str]
-5 5 | Foo = Literal["foo"]
-6 6 | IntOrStr = int | str
+  - from typing import Literal, Any
+1 + from typing import Literal, Any, TypeAlias
+2 | 
+  - NewAny = Any
+3 + NewAny: TypeAlias = Any
+4 | OptionalStr = typing.Optional[str]
+5 | Foo = Literal["foo"]
+6 | IntOrStr = int | str
 
 PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `OptionalStr: TypeAlias = typing.Optional[str]`
  --> PYI026.pyi:4:1
@@ -33,17 +31,15 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `OptionalStr: TypeAlias
 6 | IntOrStr = int | str
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1   |-from typing import Literal, Any
-  1 |+from typing import Literal, Any, TypeAlias
-2 2 | 
-3 3 | NewAny = Any
-4   |-OptionalStr = typing.Optional[str]
-  4 |+OptionalStr: TypeAlias = typing.Optional[str]
-5 5 | Foo = Literal["foo"]
-6 6 | IntOrStr = int | str
-7 7 | AliasNone = None
+  - from typing import Literal, Any
+1 + from typing import Literal, Any, TypeAlias
+2 | 
+3 | NewAny = Any
+  - OptionalStr = typing.Optional[str]
+4 + OptionalStr: TypeAlias = typing.Optional[str]
+5 | Foo = Literal["foo"]
+6 | IntOrStr = int | str
+7 | AliasNone = None
 
 PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `Foo: TypeAlias = Literal["foo"]`
  --> PYI026.pyi:5:1
@@ -56,18 +52,16 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `Foo: TypeAlias = Litera
 7 | AliasNone = None
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1   |-from typing import Literal, Any
-  1 |+from typing import Literal, Any, TypeAlias
-2 2 | 
-3 3 | NewAny = Any
-4 4 | OptionalStr = typing.Optional[str]
-5   |-Foo = Literal["foo"]
-  5 |+Foo: TypeAlias = Literal["foo"]
-6 6 | IntOrStr = int | str
-7 7 | AliasNone = None
-8 8 | 
+  - from typing import Literal, Any
+1 + from typing import Literal, Any, TypeAlias
+2 | 
+3 | NewAny = Any
+4 | OptionalStr = typing.Optional[str]
+  - Foo = Literal["foo"]
+5 + Foo: TypeAlias = Literal["foo"]
+6 | IntOrStr = int | str
+7 | AliasNone = None
+8 | 
 
 PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `IntOrStr: TypeAlias = int | str`
  --> PYI026.pyi:6:1
@@ -79,19 +73,17 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `IntOrStr: TypeAlias = i
 7 | AliasNone = None
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1   |-from typing import Literal, Any
-  1 |+from typing import Literal, Any, TypeAlias
-2 2 | 
-3 3 | NewAny = Any
-4 4 | OptionalStr = typing.Optional[str]
-5 5 | Foo = Literal["foo"]
-6   |-IntOrStr = int | str
-  6 |+IntOrStr: TypeAlias = int | str
-7 7 | AliasNone = None
-8 8 | 
-9 9 | NewAny: typing.TypeAlias = Any
+  - from typing import Literal, Any
+1 + from typing import Literal, Any, TypeAlias
+2 | 
+3 | NewAny = Any
+4 | OptionalStr = typing.Optional[str]
+5 | Foo = Literal["foo"]
+  - IntOrStr = int | str
+6 + IntOrStr: TypeAlias = int | str
+7 | AliasNone = None
+8 | 
+9 | NewAny: typing.TypeAlias = Any
 
 PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `AliasNone: TypeAlias = None`
  --> PYI026.pyi:7:1
@@ -104,20 +96,18 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `AliasNone: TypeAlias =
 9 | NewAny: typing.TypeAlias = Any
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1   |-from typing import Literal, Any
-  1 |+from typing import Literal, Any, TypeAlias
-2 2 | 
-3 3 | NewAny = Any
-4 4 | OptionalStr = typing.Optional[str]
-5 5 | Foo = Literal["foo"]
-6 6 | IntOrStr = int | str
-7   |-AliasNone = None
-  7 |+AliasNone: TypeAlias = None
-8 8 | 
-9 9 | NewAny: typing.TypeAlias = Any
-10 10 | OptionalStr: TypeAlias = typing.Optional[str]
+   - from typing import Literal, Any
+1  + from typing import Literal, Any, TypeAlias
+2  | 
+3  | NewAny = Any
+4  | OptionalStr = typing.Optional[str]
+5  | Foo = Literal["foo"]
+6  | IntOrStr = int | str
+   - AliasNone = None
+7  + AliasNone: TypeAlias = None
+8  | 
+9  | NewAny: typing.TypeAlias = Any
+10 | OptionalStr: TypeAlias = typing.Optional[str]
 
 PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `FLAG_THIS: TypeAlias = None`
   --> PYI026.pyi:17:5
@@ -129,19 +119,17 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `FLAG_THIS: TypeAlias =
 19 | # these are ok
    |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1     |-from typing import Literal, Any
-   1  |+from typing import Literal, Any, TypeAlias
-2  2  | 
-3  3  | NewAny = Any
-4  4  | OptionalStr = typing.Optional[str]
+   - from typing import Literal, Any
+1  + from typing import Literal, Any, TypeAlias
+2  | 
+3  | NewAny = Any
+4  | OptionalStr = typing.Optional[str]
 --------------------------------------------------------------------------------
-14 14 | AliasNone: typing.TypeAlias = None
-15 15 | 
-16 16 | class NotAnEnum:
-17    |-    FLAG_THIS = None
-   17 |+    FLAG_THIS: TypeAlias = None
-18 18 | 
-19 19 | # these are ok
-20 20 | from enum import Enum
+14 | AliasNone: typing.TypeAlias = None
+15 | 
+16 | class NotAnEnum:
+   -     FLAG_THIS = None
+17 +     FLAG_THIS: TypeAlias = None
+18 | 
+19 | # these are ok
+20 | from enum import Enum
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap
index 23fbe27ce2..4e03c21410 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap
@@ -11,16 +11,14 @@ PYI029 [*] Defining `__str__` in a stub is almost always redundant
 12 | class ShouldRemove:
    |
 help: Remove definition of `__str__`
-
-ℹ Safe 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
+7  | def __repr__(self, *, foo) -> str: ...
+8  | 
+9  | class ShouldRemoveSingle:
+   -     def __str__(self) -> builtins.str: ...  # Error: PYI029
+10 +     pass  # Error: PYI029
+11 | 
+12 | class ShouldRemove:
+13 |     def __repr__(self) -> str: ...  # Error: PYI029
 
 PYI029 [*] Defining `__repr__` in a stub is almost always redundant
   --> PYI029.pyi:13:9
@@ -31,15 +29,13 @@ PYI029 [*] Defining `__repr__` in a stub is almost always redundant
 14 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
    |
 help: Remove definition of `__repr__`
-
-ℹ Safe 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:
+10 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+11 | 
+12 | class ShouldRemove:
+   -     def __repr__(self) -> str: ...  # Error: PYI029
+13 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+14 | 
+15 | class NoReturnSpecified:
 
 PYI029 [*] Defining `__str__` in a stub is almost always redundant
   --> PYI029.pyi:14:9
@@ -52,12 +48,10 @@ PYI029 [*] Defining `__str__` in a stub is almost always redundant
 16 | class NoReturnSpecified:
    |
 help: Remove definition of `__str__`
-
-ℹ Safe 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): ...
+11 | 
+12 | class ShouldRemove:
+13 |     def __repr__(self) -> str: ...  # Error: PYI029
+   -     def __str__(self) -> builtins.str: ...  # Error: PYI029
+14 | 
+15 | class NoReturnSpecified:
+16 |     def __str__(self): ...
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap
index 1d3b52f3b9..3768ab0bea 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap
@@ -11,16 +11,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 11 | # Should emit for union types in arguments.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-6  6  | field1: Literal[1]  # OK
-7  7  | 
-8  8  | # Should emit for duplicate field types.
-9     |-field2: Literal[1] | Literal[2]  # Error
-   9  |+field2: Literal[1, 2]  # Error
-10 10 | 
-11 11 | # Should emit for union types in arguments.
-12 12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
+6  | field1: Literal[1]  # OK
+7  | 
+8  | # Should emit for duplicate field types.
+   - field2: Literal[1] | Literal[2]  # Error
+9  + field2: Literal[1, 2]  # Error
+10 | 
+11 | # Should emit for union types in arguments.
+12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:12:17
@@ -31,16 +29,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 13 |     print(arg1)
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-9  9  | field2: Literal[1] | Literal[2]  # Error
-10 10 | 
-11 11 | # Should emit for union types in arguments.
-12    |-def func1(arg1: Literal[1] | Literal[2]):  # Error
-   12 |+def func1(arg1: Literal[1, 2]):  # Error
-13 13 |     print(arg1)
-14 14 | 
-15 15 | 
+9  | field2: Literal[1] | Literal[2]  # Error
+10 | 
+11 | # Should emit for union types in arguments.
+   - def func1(arg1: Literal[1] | Literal[2]):  # Error
+12 + def func1(arg1: Literal[1, 2]):  # Error
+13 |     print(arg1)
+14 | 
+15 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:17:16
@@ -51,16 +47,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 18 |     return "my Literal[1]ing"
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-14 14 | 
-15 15 | 
-16 16 | # Should emit for unions in return types.
-17    |-def func2() -> Literal[1] | Literal[2]:  # Error
-   17 |+def func2() -> Literal[1, 2]:  # Error
-18 18 |     return "my Literal[1]ing"
-19 19 | 
-20 20 | 
+14 | 
+15 | 
+16 | # Should emit for unions in return types.
+   - def func2() -> Literal[1] | Literal[2]:  # Error
+17 + def func2() -> Literal[1, 2]:  # Error
+18 |     return "my Literal[1]ing"
+19 | 
+20 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:22:9
@@ -72,16 +66,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 24 | field5: Literal[1] | str | Literal[2]  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | # Should emit in longer unions, even if not directly adjacent.
-22    |-field3: Literal[1] | Literal[2] | str  # Error
-   22 |+field3: Literal[1, 2] | str  # Error
-23 23 | field4: str | Literal[1] | Literal[2]  # Error
-24 24 | field5: Literal[1] | str | Literal[2]  # Error
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+19 | 
+20 | 
+21 | # Should emit in longer unions, even if not directly adjacent.
+   - field3: Literal[1] | Literal[2] | str  # Error
+22 + field3: Literal[1, 2] | str  # Error
+23 | field4: str | Literal[1] | Literal[2]  # Error
+24 | field5: Literal[1] | str | Literal[2]  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:23:9
@@ -94,16 +86,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-20 20 | 
-21 21 | # Should emit in longer unions, even if not directly adjacent.
-22 22 | field3: Literal[1] | Literal[2] | str  # Error
-23    |-field4: str | Literal[1] | Literal[2]  # Error
-   23 |+field4: Literal[1, 2] | str  # Error
-24 24 | field5: Literal[1] | str | Literal[2]  # Error
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
-26 26 | 
+20 | 
+21 | # Should emit in longer unions, even if not directly adjacent.
+22 | field3: Literal[1] | Literal[2] | str  # Error
+   - field4: str | Literal[1] | Literal[2]  # Error
+23 + field4: Literal[1, 2] | str  # Error
+24 | field5: Literal[1] | str | Literal[2]  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:24:9
@@ -115,16 +105,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-21 21 | # Should emit in longer unions, even if not directly adjacent.
-22 22 | field3: Literal[1] | Literal[2] | str  # Error
-23 23 | field4: str | Literal[1] | Literal[2]  # Error
-24    |-field5: Literal[1] | str | Literal[2]  # Error
-   24 |+field5: Literal[1, 2] | str  # Error
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
-26 26 | 
-27 27 | # Should emit for non-type unions.
+21 | # Should emit in longer unions, even if not directly adjacent.
+22 | field3: Literal[1] | Literal[2] | str  # Error
+23 | field4: str | Literal[1] | Literal[2]  # Error
+   - field5: Literal[1] | str | Literal[2]  # Error
+24 + field5: Literal[1, 2] | str  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 | 
+27 | # Should emit for non-type unions.
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:25:9
@@ -137,16 +125,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 27 | # Should emit for non-type unions.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-22 22 | field3: Literal[1] | Literal[2] | str  # Error
-23 23 | field4: str | Literal[1] | Literal[2]  # Error
-24 24 | field5: Literal[1] | str | Literal[2]  # Error
-25    |-field6: Literal[1] | bool | Literal[2] | str  # Error
-   25 |+field6: Literal[1, 2] | bool | str  # Error
-26 26 | 
-27 27 | # Should emit for non-type unions.
-28 28 | field7 = Literal[1] | Literal[2]  # Error
+22 | field3: Literal[1] | Literal[2] | str  # Error
+23 | field4: str | Literal[1] | Literal[2]  # Error
+24 | field5: Literal[1] | str | Literal[2]  # Error
+   - field6: Literal[1] | bool | Literal[2] | str  # Error
+25 + field6: Literal[1, 2] | bool | str  # Error
+26 | 
+27 | # Should emit for non-type unions.
+28 | field7 = Literal[1] | Literal[2]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:28:10
@@ -158,16 +144,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 30 | # Should emit for parenthesized unions.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
-26 26 | 
-27 27 | # Should emit for non-type unions.
-28    |-field7 = Literal[1] | Literal[2]  # Error
-   28 |+field7 = Literal[1, 2]  # Error
-29 29 | 
-30 30 | # Should emit for parenthesized unions.
-31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 | 
+27 | # Should emit for non-type unions.
+   - field7 = Literal[1] | Literal[2]  # Error
+28 + field7 = Literal[1, 2]  # Error
+29 | 
+30 | # Should emit for parenthesized unions.
+31 | field8: Literal[1] | (Literal[2] | str)  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:31:9
@@ -179,16 +163,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 33 | # Should handle user parentheses when fixing.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-28 28 | field7 = Literal[1] | Literal[2]  # Error
-29 29 | 
-30 30 | # Should emit for parenthesized unions.
-31    |-field8: Literal[1] | (Literal[2] | str)  # Error
-   31 |+field8: Literal[1, 2] | str  # Error
-32 32 | 
-33 33 | # Should handle user parentheses when fixing.
-34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
+28 | field7 = Literal[1] | Literal[2]  # Error
+29 | 
+30 | # Should emit for parenthesized unions.
+   - field8: Literal[1] | (Literal[2] | str)  # Error
+31 + field8: Literal[1, 2] | str  # Error
+32 | 
+33 | # Should handle user parentheses when fixing.
+34 | field9: Literal[1] | (Literal[2] | str)  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:34:9
@@ -199,16 +181,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 35 | field10: (Literal[1] | str) | Literal[2]  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
-32 32 | 
-33 33 | # Should handle user parentheses when fixing.
-34    |-field9: Literal[1] | (Literal[2] | str)  # Error
-   34 |+field9: Literal[1, 2] | str  # Error
-35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
-36 36 | 
-37 37 | # Should emit for union in generic parent type.
+31 | field8: Literal[1] | (Literal[2] | str)  # Error
+32 | 
+33 | # Should handle user parentheses when fixing.
+   - field9: Literal[1] | (Literal[2] | str)  # Error
+34 + field9: Literal[1, 2] | str  # Error
+35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 | 
+37 | # Should emit for union in generic parent type.
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:35:10
@@ -221,16 +201,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 37 | # Should emit for union in generic parent type.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-32 32 | 
-33 33 | # Should handle user parentheses when fixing.
-34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
-35    |-field10: (Literal[1] | str) | Literal[2]  # Error
-   35 |+field10: Literal[1, 2] | str  # Error
-36 36 | 
-37 37 | # Should emit for union in generic parent type.
-38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+32 | 
+33 | # Should handle user parentheses when fixing.
+34 | field9: Literal[1] | (Literal[2] | str)  # Error
+   - field10: (Literal[1] | str) | Literal[2]  # Error
+35 + field10: Literal[1, 2] | str  # Error
+36 | 
+37 | # Should emit for union in generic parent type.
+38 | field11: dict[Literal[1] | Literal[2], str]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:38:15
@@ -242,16 +220,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 40 | # Should emit for unions with more than two cases
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
-36 36 | 
-37 37 | # Should emit for union in generic parent type.
-38    |-field11: dict[Literal[1] | Literal[2], str]  # Error
-   38 |+field11: dict[Literal[1, 2], str]  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases
-41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 | 
+37 | # Should emit for union in generic parent type.
+   - field11: dict[Literal[1] | Literal[2], str]  # Error
+38 + field11: dict[Literal[1, 2], str]  # Error
+39 | 
+40 | # Should emit for unions with more than two cases
+41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
   --> PYI030.py:41:10
@@ -262,16 +238,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases
-41    |-field12: Literal[1] | Literal[2] | Literal[3]  # Error
-   41 |+field12: Literal[1, 2, 3]  # Error
-42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-43 43 | 
-44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+39 | 
+40 | # Should emit for unions with more than two cases
+   - field12: Literal[1] | Literal[2] | Literal[3]  # Error
+41 + field12: Literal[1, 2, 3]  # Error
+42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 | 
+44 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.py:42:10
@@ -284,16 +258,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 44 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-39 39 | 
-40 40 | # Should emit for unions with more than two cases
-41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
-42    |-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-   42 |+field13: Literal[1, 2, 3, 4]  # Error
-43 43 | 
-44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
-45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+39 | 
+40 | # Should emit for unions with more than two cases
+41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+   - field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+42 + field13: Literal[1, 2, 3, 4]  # Error
+43 | 
+44 | # Should emit for unions with more than two cases, even if not directly adjacent
+45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
   --> PYI030.py:45:10
@@ -305,16 +277,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 47 | # Should emit for unions with mixed literal internal types
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-43 43 | 
-44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
-45    |-field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
-   45 |+field14: Literal[1, 2, 3] | str  # Error
-46 46 | 
-47 47 | # Should emit for unions with mixed literal internal types
-48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 | 
+44 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+45 + field14: Literal[1, 2, 3] | str  # Error
+46 | 
+47 | # Should emit for unions with mixed literal internal types
+48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]`
   --> PYI030.py:48:10
@@ -326,16 +296,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
-46 46 | 
-47 47 | # Should emit for unions with mixed literal internal types
-48    |-field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
-   48 |+field15: Literal[1, "foo", True]  # Error
-49 49 | 
-50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
-51 51 | field16: Literal[1] | Literal[1]  # OK
+45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+46 | 
+47 | # Should emit for unions with mixed literal internal types
+   - field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+48 + field15: Literal[1, "foo", True]  # Error
+49 | 
+50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+51 | field16: Literal[1] | Literal[1]  # OK
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]`
   --> PYI030.py:51:10
@@ -347,16 +315,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 53 | # Shouldn't emit if in new parent type
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
-49 49 | 
-50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
-51    |-field16: Literal[1] | Literal[1]  # OK
-   51 |+field16: Literal[1, 1]  # OK
-52 52 | 
-53 53 | # Shouldn't emit if in new parent type
-54 54 | field17: Literal[1] | dict[Literal[2], str]  # OK
+48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+49 | 
+50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+   - field16: Literal[1] | Literal[1]  # OK
+51 + field16: Literal[1, 1]  # OK
+52 | 
+53 | # Shouldn't emit if in new parent type
+54 | field17: Literal[1] | dict[Literal[2], str]  # OK
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:60:10
@@ -368,16 +334,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 62 | # Should emit in cases with newlines
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-57 57 | field18: dict[Literal[1], Literal[2]]  # OK
-58 58 | 
-59 59 | # Should respect name of literal type used
-60    |-field19: typing.Literal[1] | typing.Literal[2]  # Error
-   60 |+field19: typing.Literal[1, 2]  # Error
-61 61 | 
-62 62 | # Should emit in cases with newlines
-63 63 | field20: typing.Union[
+57 | field18: dict[Literal[1], Literal[2]]  # OK
+58 | 
+59 | # Should respect name of literal type used
+   - field19: typing.Literal[1] | typing.Literal[2]  # Error
+60 + field19: typing.Literal[1, 2]  # Error
+61 | 
+62 | # Should emit in cases with newlines
+63 | field20: typing.Union[
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:63:10
@@ -395,21 +359,20 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 70 |   # Should handle multiple unions with multiple members
    |
 help: Replace with a single `Literal`
-
-ℹ Unsafe fix
-60 60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
-61 61 | 
-62 62 | # Should emit in cases with newlines
-63    |-field20: typing.Union[
-64    |-    Literal[
-65    |-        1  # test
-66    |-    ],
-67    |-    Literal[2],
-68    |-]  # Error, newline and comment will not be emitted in message
-   63 |+field20: Literal[1, 2]  # Error, newline and comment will not be emitted in message
-69 64 | 
-70 65 | # Should handle multiple unions with multiple members
-71 66 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
+61 | 
+62 | # Should emit in cases with newlines
+   - field20: typing.Union[
+   -     Literal[
+   -         1  # test
+   -     ],
+   -     Literal[2],
+   - ]  # Error, newline and comment will not be emitted in message
+63 + field20: Literal[1, 2]  # Error, newline and comment will not be emitted in message
+64 | 
+65 | # Should handle multiple unions with multiple members
+66 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.py:71:10
@@ -421,16 +384,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 73 | # Should emit in cases with `typing.Union` instead of `|`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-68 68 | ]  # Error, newline and comment will not be emitted in message
-69 69 | 
-70 70 | # Should handle multiple unions with multiple members
-71    |-field21: Literal[1, 2] | Literal[3, 4]  # Error
-   71 |+field21: Literal[1, 2, 3, 4]  # Error
-72 72 | 
-73 73 | # Should emit in cases with `typing.Union` instead of `|`
-74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+68 | ]  # Error, newline and comment will not be emitted in message
+69 | 
+70 | # Should handle multiple unions with multiple members
+   - field21: Literal[1, 2] | Literal[3, 4]  # Error
+71 + field21: Literal[1, 2, 3, 4]  # Error
+72 | 
+73 | # Should emit in cases with `typing.Union` instead of `|`
+74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:74:10
@@ -442,16 +403,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 76 | # Should emit in cases with `typing_extensions.Literal`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-71 71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
-72 72 | 
-73 73 | # Should emit in cases with `typing.Union` instead of `|`
-74    |-field22: typing.Union[Literal[1], Literal[2]]  # Error
-   74 |+field22: Literal[1, 2]  # Error
-75 75 | 
-76 76 | # Should emit in cases with `typing_extensions.Literal`
-77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+72 | 
+73 | # Should emit in cases with `typing.Union` instead of `|`
+   - field22: typing.Union[Literal[1], Literal[2]]  # Error
+74 + field22: Literal[1, 2]  # Error
+75 | 
+76 | # Should emit in cases with `typing_extensions.Literal`
+77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:77:10
@@ -463,16 +422,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 79 | # Should emit in cases with nested `typing.Union`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
-75 75 | 
-76 76 | # Should emit in cases with `typing_extensions.Literal`
-77    |-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
-   77 |+field23: typing_extensions.Literal[1, 2]  # Error
-78 78 | 
-79 79 | # Should emit in cases with nested `typing.Union`
-80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+75 | 
+76 | # Should emit in cases with `typing_extensions.Literal`
+   - field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+77 + field23: typing_extensions.Literal[1, 2]  # Error
+78 | 
+79 | # Should emit in cases with nested `typing.Union`
+80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:80:10
@@ -484,16 +441,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 82 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
-78 78 | 
-79 79 | # Should emit in cases with nested `typing.Union`
-80    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
-   80 |+field24: typing.Union[Literal[1, 2], str]  # Error
-81 81 | 
-82 82 | # Should emit in cases with mixed `typing.Union` and `|`
-83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+78 | 
+79 | # Should emit in cases with nested `typing.Union`
+   - field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+80 + field24: typing.Union[Literal[1, 2], str]  # Error
+81 | 
+82 | # Should emit in cases with mixed `typing.Union` and `|`
+83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.py:83:10
@@ -505,16 +460,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 85 | # Should emit only once in cases with multiple nested `typing.Union`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
-81 81 | 
-82 82 | # Should emit in cases with mixed `typing.Union` and `|`
-83    |-field25: typing.Union[Literal[1], Literal[2] | str]  # Error
-   83 |+field25: typing.Union[Literal[1, 2], str]  # Error
-84 84 | 
-85 85 | # Should emit only once in cases with multiple nested `typing.Union`
-86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+81 | 
+82 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+83 + field25: typing.Union[Literal[1, 2], str]  # Error
+84 | 
+85 | # Should emit only once in cases with multiple nested `typing.Union`
+86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.py:86:10
@@ -526,16 +479,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 88 | # Should use the first literal subscript attribute when fixing
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
-84 84 | 
-85 85 | # Should emit only once in cases with multiple nested `typing.Union`
-86    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
-   86 |+field24: Literal[1, 2, 3, 4]  # Error
-87 87 | 
-88 88 | # Should use the first literal subscript attribute when fixing
-89 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+84 | 
+85 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+86 + field24: Literal[1, 2, 3, 4]  # Error
+87 | 
+88 | # Should use the first literal subscript attribute when fixing
+89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.py:89:10
@@ -547,16 +498,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 91 | from typing import IO, Literal
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
-87 87 | 
-88 88 | # Should use the first literal subscript attribute when fixing
-89    |-field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
-   89 |+field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str]  # Error
-90 90 | 
-91 91 | from typing import IO, Literal
-92 92 | 
+86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+87 | 
+88 | # Should use the first literal subscript attribute when fixing
+   - field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+89 + field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str]  # Error
+90 | 
+91 | from typing import IO, Literal
+92 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b"]`
   --> PYI030.py:93:16
@@ -569,16 +518,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 95 | # Should use unsafe fix when comments are deleted
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-90 90 | 
-91 91 | from typing import IO, Literal
-92 92 | 
-93    |-InlineOption = Literal["a"] | Literal["b"] | IO[str]
-   93 |+InlineOption = Literal["a", "b"] | IO[str]
-94 94 | 
-95 95 | # Should use unsafe fix when comments are deleted
-96 96 | field26: (
+90 | 
+91 | from typing import IO, Literal
+92 | 
+   - InlineOption = Literal["a"] | Literal["b"] | IO[str]
+93 + InlineOption = Literal["a", "b"] | IO[str]
+94 | 
+95 | # Should use unsafe fix when comments are deleted
+96 | field26: (
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]`
    --> PYI030.py:98:5
@@ -593,18 +540,17 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 102 |   field27: (
     |
 help: Replace with a single `Literal`
-
-ℹ Unsafe fix
-95  95  | # Should use unsafe fix when comments are deleted
-96  96  | field26: (
-97  97  |     # First comment
-98      |-    Literal["a", "b"]
-99      |-    # Second comment
-100     |-    | Literal["c", "d"]
-    98  |+    Literal["a", "b", "c", "d"]
-101 99  | )
-102 100 | field27: (
-103 101 |     Literal["a", "b"]  # First comment
+95  | # Should use unsafe fix when comments are deleted
+96  | field26: (
+97  |     # First comment
+    -     Literal["a", "b"]
+    -     # Second comment
+    -     | Literal["c", "d"]
+98  +     Literal["a", "b", "c", "d"]
+99  | )
+100 | field27: (
+101 |     Literal["a", "b"]  # First comment
+note: This is an unsafe fix and may change runtime behavior
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]`
    --> PYI030.py:103:5
@@ -617,12 +563,11 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 105 |   )
     |
 help: Replace with a single `Literal`
-
-ℹ Unsafe fix
-100 100 |     | Literal["c", "d"]
-101 101 | )
-102 102 | field27: (
-103     |-    Literal["a", "b"]  # First comment
-104     |-    | Literal["c", "d"]  # Second comment
-    103 |+    Literal["a", "b", "c", "d"]  # Second comment
-105 104 | )
+100 |     | Literal["c", "d"]
+101 | )
+102 | field27: (
+    -     Literal["a", "b"]  # First comment
+    -     | Literal["c", "d"]  # Second comment
+103 +     Literal["a", "b", "c", "d"]  # Second comment
+104 | )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap
index 7236f6b59d..652a41654c 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap
@@ -11,16 +11,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 11 | # Should emit for union types in arguments.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-6  6  | field1: Literal[1]  # OK
-7  7  | 
-8  8  | # Should emit for duplicate field types.
-9     |-field2: Literal[1] | Literal[2]  # Error
-   9  |+field2: Literal[1, 2]  # Error
-10 10 | 
-11 11 | # Should emit for union types in arguments.
-12 12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
+6  | field1: Literal[1]  # OK
+7  | 
+8  | # Should emit for duplicate field types.
+   - field2: Literal[1] | Literal[2]  # Error
+9  + field2: Literal[1, 2]  # Error
+10 | 
+11 | # Should emit for union types in arguments.
+12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:12:17
@@ -31,16 +29,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 13 |     print(arg1)
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-9  9  | field2: Literal[1] | Literal[2]  # Error
-10 10 | 
-11 11 | # Should emit for union types in arguments.
-12    |-def func1(arg1: Literal[1] | Literal[2]):  # Error
-   12 |+def func1(arg1: Literal[1, 2]):  # Error
-13 13 |     print(arg1)
-14 14 | 
-15 15 | 
+9  | field2: Literal[1] | Literal[2]  # Error
+10 | 
+11 | # Should emit for union types in arguments.
+   - def func1(arg1: Literal[1] | Literal[2]):  # Error
+12 + def func1(arg1: Literal[1, 2]):  # Error
+13 |     print(arg1)
+14 | 
+15 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:17:16
@@ -51,16 +47,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 18 |     return "my Literal[1]ing"
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-14 14 | 
-15 15 | 
-16 16 | # Should emit for unions in return types.
-17    |-def func2() -> Literal[1] | Literal[2]:  # Error
-   17 |+def func2() -> Literal[1, 2]:  # Error
-18 18 |     return "my Literal[1]ing"
-19 19 | 
-20 20 | 
+14 | 
+15 | 
+16 | # Should emit for unions in return types.
+   - def func2() -> Literal[1] | Literal[2]:  # Error
+17 + def func2() -> Literal[1, 2]:  # Error
+18 |     return "my Literal[1]ing"
+19 | 
+20 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:22:9
@@ -72,16 +66,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 24 | field5: Literal[1] | str | Literal[2]  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | # Should emit in longer unions, even if not directly adjacent.
-22    |-field3: Literal[1] | Literal[2] | str  # Error
-   22 |+field3: Literal[1, 2] | str  # Error
-23 23 | field4: str | Literal[1] | Literal[2]  # Error
-24 24 | field5: Literal[1] | str | Literal[2]  # Error
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+19 | 
+20 | 
+21 | # Should emit in longer unions, even if not directly adjacent.
+   - field3: Literal[1] | Literal[2] | str  # Error
+22 + field3: Literal[1, 2] | str  # Error
+23 | field4: str | Literal[1] | Literal[2]  # Error
+24 | field5: Literal[1] | str | Literal[2]  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:23:9
@@ -94,16 +86,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-20 20 | 
-21 21 | # Should emit in longer unions, even if not directly adjacent.
-22 22 | field3: Literal[1] | Literal[2] | str  # Error
-23    |-field4: str | Literal[1] | Literal[2]  # Error
-   23 |+field4: Literal[1, 2] | str  # Error
-24 24 | field5: Literal[1] | str | Literal[2]  # Error
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
-26 26 | 
+20 | 
+21 | # Should emit in longer unions, even if not directly adjacent.
+22 | field3: Literal[1] | Literal[2] | str  # Error
+   - field4: str | Literal[1] | Literal[2]  # Error
+23 + field4: Literal[1, 2] | str  # Error
+24 | field5: Literal[1] | str | Literal[2]  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 | 
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:24:9
@@ -115,16 +105,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-21 21 | # Should emit in longer unions, even if not directly adjacent.
-22 22 | field3: Literal[1] | Literal[2] | str  # Error
-23 23 | field4: str | Literal[1] | Literal[2]  # Error
-24    |-field5: Literal[1] | str | Literal[2]  # Error
-   24 |+field5: Literal[1, 2] | str  # Error
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
-26 26 | 
-27 27 | # Should emit for non-type unions.
+21 | # Should emit in longer unions, even if not directly adjacent.
+22 | field3: Literal[1] | Literal[2] | str  # Error
+23 | field4: str | Literal[1] | Literal[2]  # Error
+   - field5: Literal[1] | str | Literal[2]  # Error
+24 + field5: Literal[1, 2] | str  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 | 
+27 | # Should emit for non-type unions.
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:25:9
@@ -137,16 +125,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 27 | # Should emit for non-type unions.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-22 22 | field3: Literal[1] | Literal[2] | str  # Error
-23 23 | field4: str | Literal[1] | Literal[2]  # Error
-24 24 | field5: Literal[1] | str | Literal[2]  # Error
-25    |-field6: Literal[1] | bool | Literal[2] | str  # Error
-   25 |+field6: Literal[1, 2] | bool | str  # Error
-26 26 | 
-27 27 | # Should emit for non-type unions.
-28 28 | field7 = Literal[1] | Literal[2]  # Error
+22 | field3: Literal[1] | Literal[2] | str  # Error
+23 | field4: str | Literal[1] | Literal[2]  # Error
+24 | field5: Literal[1] | str | Literal[2]  # Error
+   - field6: Literal[1] | bool | Literal[2] | str  # Error
+25 + field6: Literal[1, 2] | bool | str  # Error
+26 | 
+27 | # Should emit for non-type unions.
+28 | field7 = Literal[1] | Literal[2]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:28:10
@@ -158,16 +144,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 30 | # Should emit for parenthesized unions.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
-26 26 | 
-27 27 | # Should emit for non-type unions.
-28    |-field7 = Literal[1] | Literal[2]  # Error
-   28 |+field7 = Literal[1, 2]  # Error
-29 29 | 
-30 30 | # Should emit for parenthesized unions.
-31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
+25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 | 
+27 | # Should emit for non-type unions.
+   - field7 = Literal[1] | Literal[2]  # Error
+28 + field7 = Literal[1, 2]  # Error
+29 | 
+30 | # Should emit for parenthesized unions.
+31 | field8: Literal[1] | (Literal[2] | str)  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:31:9
@@ -179,16 +163,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 33 | # Should handle user parentheses when fixing.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-28 28 | field7 = Literal[1] | Literal[2]  # Error
-29 29 | 
-30 30 | # Should emit for parenthesized unions.
-31    |-field8: Literal[1] | (Literal[2] | str)  # Error
-   31 |+field8: Literal[1, 2] | str  # Error
-32 32 | 
-33 33 | # Should handle user parentheses when fixing.
-34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
+28 | field7 = Literal[1] | Literal[2]  # Error
+29 | 
+30 | # Should emit for parenthesized unions.
+   - field8: Literal[1] | (Literal[2] | str)  # Error
+31 + field8: Literal[1, 2] | str  # Error
+32 | 
+33 | # Should handle user parentheses when fixing.
+34 | field9: Literal[1] | (Literal[2] | str)  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:34:9
@@ -199,16 +181,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 35 | field10: (Literal[1] | str) | Literal[2]  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
-32 32 | 
-33 33 | # Should handle user parentheses when fixing.
-34    |-field9: Literal[1] | (Literal[2] | str)  # Error
-   34 |+field9: Literal[1, 2] | str  # Error
-35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
-36 36 | 
-37 37 | # Should emit for union in generic parent type.
+31 | field8: Literal[1] | (Literal[2] | str)  # Error
+32 | 
+33 | # Should handle user parentheses when fixing.
+   - field9: Literal[1] | (Literal[2] | str)  # Error
+34 + field9: Literal[1, 2] | str  # Error
+35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 | 
+37 | # Should emit for union in generic parent type.
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:35:10
@@ -221,16 +201,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 37 | # Should emit for union in generic parent type.
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-32 32 | 
-33 33 | # Should handle user parentheses when fixing.
-34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
-35    |-field10: (Literal[1] | str) | Literal[2]  # Error
-   35 |+field10: Literal[1, 2] | str  # Error
-36 36 | 
-37 37 | # Should emit for union in generic parent type.
-38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+32 | 
+33 | # Should handle user parentheses when fixing.
+34 | field9: Literal[1] | (Literal[2] | str)  # Error
+   - field10: (Literal[1] | str) | Literal[2]  # Error
+35 + field10: Literal[1, 2] | str  # Error
+36 | 
+37 | # Should emit for union in generic parent type.
+38 | field11: dict[Literal[1] | Literal[2], str]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:38:15
@@ -242,16 +220,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 40 | # Should emit for unions with more than two cases
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
-36 36 | 
-37 37 | # Should emit for union in generic parent type.
-38    |-field11: dict[Literal[1] | Literal[2], str]  # Error
-   38 |+field11: dict[Literal[1, 2], str]  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases
-41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 | 
+37 | # Should emit for union in generic parent type.
+   - field11: dict[Literal[1] | Literal[2], str]  # Error
+38 + field11: dict[Literal[1, 2], str]  # Error
+39 | 
+40 | # Should emit for unions with more than two cases
+41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
   --> PYI030.pyi:41:10
@@ -262,16 +238,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases
-41    |-field12: Literal[1] | Literal[2] | Literal[3]  # Error
-   41 |+field12: Literal[1, 2, 3]  # Error
-42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-43 43 | 
-44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+39 | 
+40 | # Should emit for unions with more than two cases
+   - field12: Literal[1] | Literal[2] | Literal[3]  # Error
+41 + field12: Literal[1, 2, 3]  # Error
+42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 | 
+44 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.pyi:42:10
@@ -284,16 +258,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 44 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-39 39 | 
-40 40 | # Should emit for unions with more than two cases
-41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
-42    |-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-   42 |+field13: Literal[1, 2, 3, 4]  # Error
-43 43 | 
-44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
-45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+39 | 
+40 | # Should emit for unions with more than two cases
+41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+   - field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+42 + field13: Literal[1, 2, 3, 4]  # Error
+43 | 
+44 | # Should emit for unions with more than two cases, even if not directly adjacent
+45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
   --> PYI030.pyi:45:10
@@ -305,16 +277,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 47 | # Should emit for unions with mixed literal internal types
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-43 43 | 
-44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
-45    |-field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
-   45 |+field14: Literal[1, 2, 3] | str  # Error
-46 46 | 
-47 47 | # Should emit for unions with mixed literal internal types
-48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 | 
+44 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+45 + field14: Literal[1, 2, 3] | str  # Error
+46 | 
+47 | # Should emit for unions with mixed literal internal types
+48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]`
   --> PYI030.pyi:48:10
@@ -326,16 +296,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
-46 46 | 
-47 47 | # Should emit for unions with mixed literal internal types
-48    |-field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
-   48 |+field15: Literal[1, "foo", True]  # Error
-49 49 | 
-50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
-51 51 | field16: Literal[1] | Literal[1]  # OK
+45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+46 | 
+47 | # Should emit for unions with mixed literal internal types
+   - field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+48 + field15: Literal[1, "foo", True]  # Error
+49 | 
+50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+51 | field16: Literal[1] | Literal[1]  # OK
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]`
   --> PYI030.pyi:51:10
@@ -347,16 +315,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 53 | # Shouldn't emit if in new parent type
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
-49 49 | 
-50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
-51    |-field16: Literal[1] | Literal[1]  # OK
-   51 |+field16: Literal[1, 1]  # OK
-52 52 | 
-53 53 | # Shouldn't emit if in new parent type
-54 54 | field17: Literal[1] | dict[Literal[2], str]  # OK
+48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+49 | 
+50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+   - field16: Literal[1] | Literal[1]  # OK
+51 + field16: Literal[1, 1]  # OK
+52 | 
+53 | # Shouldn't emit if in new parent type
+54 | field17: Literal[1] | dict[Literal[2], str]  # OK
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:60:10
@@ -368,16 +334,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 62 | # Should emit in cases with newlines
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-57 57 | field18: dict[Literal[1], Literal[2]]  # OK
-58 58 | 
-59 59 | # Should respect name of literal type used
-60    |-field19: typing.Literal[1] | typing.Literal[2]  # Error
-   60 |+field19: typing.Literal[1, 2]  # Error
-61 61 | 
-62 62 | # Should emit in cases with newlines
-63 63 | field20: typing.Union[
+57 | field18: dict[Literal[1], Literal[2]]  # OK
+58 | 
+59 | # Should respect name of literal type used
+   - field19: typing.Literal[1] | typing.Literal[2]  # Error
+60 + field19: typing.Literal[1, 2]  # Error
+61 | 
+62 | # Should emit in cases with newlines
+63 | field20: typing.Union[
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:63:10
@@ -395,21 +359,20 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 70 |   # Should handle multiple unions with multiple members
    |
 help: Replace with a single `Literal`
-
-ℹ Unsafe fix
-60 60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
-61 61 | 
-62 62 | # Should emit in cases with newlines
-63    |-field20: typing.Union[
-64    |-    Literal[
-65    |-        1  # test
-66    |-    ],
-67    |-    Literal[2],
-68    |-]  # Error, newline and comment will not be emitted in message
-   63 |+field20: Literal[1, 2]  # Error, newline and comment will not be emitted in message
-69 64 | 
-70 65 | # Should handle multiple unions with multiple members
-71 66 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
+61 | 
+62 | # Should emit in cases with newlines
+   - field20: typing.Union[
+   -     Literal[
+   -         1  # test
+   -     ],
+   -     Literal[2],
+   - ]  # Error, newline and comment will not be emitted in message
+63 + field20: Literal[1, 2]  # Error, newline and comment will not be emitted in message
+64 | 
+65 | # Should handle multiple unions with multiple members
+66 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.pyi:71:10
@@ -421,16 +384,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 73 | # Should emit in cases with `typing.Union` instead of `|`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-68 68 | ]  # Error, newline and comment will not be emitted in message
-69 69 | 
-70 70 | # Should handle multiple unions with multiple members
-71    |-field21: Literal[1, 2] | Literal[3, 4]  # Error
-   71 |+field21: Literal[1, 2, 3, 4]  # Error
-72 72 | 
-73 73 | # Should emit in cases with `typing.Union` instead of `|`
-74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+68 | ]  # Error, newline and comment will not be emitted in message
+69 | 
+70 | # Should handle multiple unions with multiple members
+   - field21: Literal[1, 2] | Literal[3, 4]  # Error
+71 + field21: Literal[1, 2, 3, 4]  # Error
+72 | 
+73 | # Should emit in cases with `typing.Union` instead of `|`
+74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:74:10
@@ -442,16 +403,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 76 | # Should emit in cases with `typing_extensions.Literal`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-71 71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
-72 72 | 
-73 73 | # Should emit in cases with `typing.Union` instead of `|`
-74    |-field22: typing.Union[Literal[1], Literal[2]]  # Error
-   74 |+field22: Literal[1, 2]  # Error
-75 75 | 
-76 76 | # Should emit in cases with `typing_extensions.Literal`
-77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+72 | 
+73 | # Should emit in cases with `typing.Union` instead of `|`
+   - field22: typing.Union[Literal[1], Literal[2]]  # Error
+74 + field22: Literal[1, 2]  # Error
+75 | 
+76 | # Should emit in cases with `typing_extensions.Literal`
+77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:77:10
@@ -463,16 +422,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 79 | # Should emit in cases with nested `typing.Union`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
-75 75 | 
-76 76 | # Should emit in cases with `typing_extensions.Literal`
-77    |-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
-   77 |+field23: typing_extensions.Literal[1, 2]  # Error
-78 78 | 
-79 79 | # Should emit in cases with nested `typing.Union`
-80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+75 | 
+76 | # Should emit in cases with `typing_extensions.Literal`
+   - field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+77 + field23: typing_extensions.Literal[1, 2]  # Error
+78 | 
+79 | # Should emit in cases with nested `typing.Union`
+80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:80:10
@@ -484,16 +441,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 82 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
-78 78 | 
-79 79 | # Should emit in cases with nested `typing.Union`
-80    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
-   80 |+field24: typing.Union[Literal[1, 2], str]  # Error
-81 81 | 
-82 82 | # Should emit in cases with mixed `typing.Union` and `|`
-83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+78 | 
+79 | # Should emit in cases with nested `typing.Union`
+   - field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+80 + field24: typing.Union[Literal[1, 2], str]  # Error
+81 | 
+82 | # Should emit in cases with mixed `typing.Union` and `|`
+83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
   --> PYI030.pyi:83:10
@@ -505,16 +460,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 85 | # Should emit only once in cases with multiple nested `typing.Union`
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
-81 81 | 
-82 82 | # Should emit in cases with mixed `typing.Union` and `|`
-83    |-field25: typing.Union[Literal[1], Literal[2] | str]  # Error
-   83 |+field25: typing.Union[Literal[1, 2], str]  # Error
-84 84 | 
-85 85 | # Should emit only once in cases with multiple nested `typing.Union`
-86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+81 | 
+82 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+83 + field25: typing.Union[Literal[1, 2], str]  # Error
+84 | 
+85 | # Should emit only once in cases with multiple nested `typing.Union`
+86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.pyi:86:10
@@ -526,16 +479,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 88 | # Should use the first literal subscript attribute when fixing
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
-84 84 | 
-85 85 | # Should emit only once in cases with multiple nested `typing.Union`
-86    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
-   86 |+field24: Literal[1, 2, 3, 4]  # Error
-87 87 | 
-88 88 | # Should use the first literal subscript attribute when fixing
-89 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+84 | 
+85 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+86 + field24: Literal[1, 2, 3, 4]  # Error
+87 | 
+88 | # Should use the first literal subscript attribute when fixing
+89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
   --> PYI030.pyi:89:10
@@ -547,16 +498,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 91 | # Should use unsafe fix when comments are deleted
    |
 help: Replace with a single `Literal`
-
-ℹ Safe fix
-86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
-87 87 | 
-88 88 | # Should use the first literal subscript attribute when fixing
-89    |-field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
-   89 |+field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str]  # Error
-90 90 | 
-91 91 | # Should use unsafe fix when comments are deleted
-92 92 | field26: (
+86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+87 | 
+88 | # Should use the first literal subscript attribute when fixing
+   - field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+89 + field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str]  # Error
+90 | 
+91 | # Should use unsafe fix when comments are deleted
+92 | field26: (
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]`
   --> PYI030.pyi:94:5
@@ -571,18 +520,17 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 98 |   field27: (
    |
 help: Replace with a single `Literal`
-
-ℹ Unsafe fix
-91 91 | # Should use unsafe fix when comments are deleted
-92 92 | field26: (
-93 93 |     # First comment
-94    |-    Literal["a", "b"]
-95    |-    # Second comment
-96    |-    | Literal["c", "d"]
-   94 |+    Literal["a", "b", "c", "d"]
-97 95 | )
-98 96 | field27: (
-99 97 |     Literal["a", "b"]  # First comment
+91 | # Should use unsafe fix when comments are deleted
+92 | field26: (
+93 |     # First comment
+   -     Literal["a", "b"]
+   -     # Second comment
+   -     | Literal["c", "d"]
+94 +     Literal["a", "b", "c", "d"]
+95 | )
+96 | field27: (
+97 |     Literal["a", "b"]  # First comment
+note: This is an unsafe fix and may change runtime behavior
 
 PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]`
    --> PYI030.pyi:99:5
@@ -595,12 +543,11 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite
 101 |   )
     |
 help: Replace with a single `Literal`
-
-ℹ Unsafe fix
-96  96  |     | Literal["c", "d"]
-97  97  | )
-98  98  | field27: (
-99      |-    Literal["a", "b"]  # First comment
-100     |-    | Literal["c", "d"]  # Second comment
-    99  |+    Literal["a", "b", "c", "d"]  # Second comment
-101 100 | )
+96  |     | Literal["c", "d"]
+97  | )
+98  | field27: (
+    -     Literal["a", "b"]  # First comment
+    -     | Literal["c", "d"]  # Second comment
+99  +     Literal["a", "b", "c", "d"]  # Second comment
+100 | )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap
index 142d812fa7..019b0568cb 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap
@@ -10,16 +10,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
 7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
   |
 help: Replace with `object`
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | class Bad:
-6   |-    def __eq__(self, other: Any) -> bool: ...  # PYI032
-  6 |+    def __eq__(self, other: object) -> bool: ...  # PYI032
-7 7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
-8 8 | 
-9 9 | 
+3 | 
+4 | 
+5 | class Bad:
+  -     def __eq__(self, other: Any) -> bool: ...  # PYI032
+6 +     def __eq__(self, other: object) -> bool: ...  # PYI032
+7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
+8 | 
+9 | 
 
 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
  --> PYI032.py:7:29
@@ -30,16 +28,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
   |                             ^^^^^^^^^^
   |
 help: Replace with `object`
-
-ℹ Safe fix
-4 4 | 
-5 5 | class Bad:
-6 6 |     def __eq__(self, other: Any) -> bool: ...  # PYI032
-7   |-    def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
-  7 |+    def __ne__(self, other: object) -> typing.Any: ...  # PYI032
-8 8 | 
-9 9 | 
-10 10 | class Good:
+4  | 
+5  | class Bad:
+6  |     def __eq__(self, other: Any) -> bool: ...  # PYI032
+   -     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
+7  +     def __ne__(self, other: object) -> typing.Any: ...  # PYI032
+8  | 
+9  | 
+10 | class Good:
 
 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
   --> PYI032.py:27:28
@@ -50,14 +46,12 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
 28 |    def __ne__(self, other: "Any") -> bool: ...  # PYI032
    |
 help: Replace with `object`
-
-ℹ Safe fix
-24 24 | 
-25 25 | 
-26 26 | class BadStringized:
-27    |-   def __eq__(self, other: "Any") -> bool: ...  # PYI032
-   27 |+   def __eq__(self, other: object) -> bool: ...  # PYI032
-28 28 |    def __ne__(self, other: "Any") -> bool: ...  # PYI032
+24 | 
+25 | 
+26 | class BadStringized:
+   -    def __eq__(self, other: "Any") -> bool: ...  # PYI032
+27 +    def __eq__(self, other: object) -> bool: ...  # PYI032
+28 |    def __ne__(self, other: "Any") -> bool: ...  # PYI032
 
 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
   --> PYI032.py:28:28
@@ -68,10 +62,8 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
    |                            ^^^^^
    |
 help: Replace with `object`
-
-ℹ Safe fix
-25 25 | 
-26 26 | class BadStringized:
-27 27 |    def __eq__(self, other: "Any") -> bool: ...  # PYI032
-28    |-   def __ne__(self, other: "Any") -> bool: ...  # PYI032
-   28 |+   def __ne__(self, other: object) -> bool: ...  # PYI032
+25 | 
+26 | class BadStringized:
+27 |    def __eq__(self, other: "Any") -> bool: ...  # PYI032
+   -    def __ne__(self, other: "Any") -> bool: ...  # PYI032
+28 +    def __ne__(self, other: object) -> bool: ...  # PYI032
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap
index 41bd9881af..598c88fb95 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap
@@ -10,16 +10,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
 7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
   |
 help: Replace with `object`
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | class Bad:
-6   |-    def __eq__(self, other: Any) -> bool: ...  # PYI032
-  6 |+    def __eq__(self, other: object) -> bool: ...  # PYI032
-7 7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
-8 8 | 
-9 9 | 
+3 | 
+4 | 
+5 | class Bad:
+  -     def __eq__(self, other: Any) -> bool: ...  # PYI032
+6 +     def __eq__(self, other: object) -> bool: ...  # PYI032
+7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
+8 | 
+9 | 
 
 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
  --> PYI032.pyi:7:29
@@ -30,16 +28,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
   |                             ^^^^^^^^^^
   |
 help: Replace with `object`
-
-ℹ Safe fix
-4 4 | 
-5 5 | class Bad:
-6 6 |     def __eq__(self, other: Any) -> bool: ...  # PYI032
-7   |-    def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
-  7 |+    def __ne__(self, other: object) -> typing.Any: ...  # PYI032
-8 8 | 
-9 9 | 
-10 10 | class Good:
+4  | 
+5  | class Bad:
+6  |     def __eq__(self, other: Any) -> bool: ...  # PYI032
+   -     def __ne__(self, other: typing.Any) -> typing.Any: ...  # PYI032
+7  +     def __ne__(self, other: object) -> typing.Any: ...  # PYI032
+8  | 
+9  | 
+10 | class Good:
 
 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
   --> PYI032.pyi:26:28
@@ -50,14 +46,12 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
 27 |    def __ne__(self, other: "Any") -> bool: ...  # PYI032
    |
 help: Replace with `object`
-
-ℹ Safe fix
-23 23 |   def __ne__(self) -> bool: ...
-24 24 | 
-25 25 | class BadStringized:
-26    |-   def __eq__(self, other: "Any") -> bool: ...  # PYI032
-   26 |+   def __eq__(self, other: object) -> bool: ...  # PYI032
-27 27 |    def __ne__(self, other: "Any") -> bool: ...  # PYI032
+23 |   def __ne__(self) -> bool: ...
+24 | 
+25 | class BadStringized:
+   -    def __eq__(self, other: "Any") -> bool: ...  # PYI032
+26 +    def __eq__(self, other: object) -> bool: ...  # PYI032
+27 |    def __ne__(self, other: "Any") -> bool: ...  # PYI032
 
 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
   --> PYI032.pyi:27:28
@@ -68,10 +62,8 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
    |                            ^^^^^
    |
 help: Replace with `object`
-
-ℹ Safe fix
-24 24 | 
-25 25 | class BadStringized:
-26 26 |    def __eq__(self, other: "Any") -> bool: ...  # PYI032
-27    |-   def __ne__(self, other: "Any") -> bool: ...  # PYI032
-   27 |+   def __ne__(self, other: object) -> bool: ...  # PYI032
+24 | 
+25 | class BadStringized:
+26 |    def __eq__(self, other: "Any") -> bool: ...  # PYI032
+   -    def __ne__(self, other: "Any") -> bool: ...  # PYI032
+27 +    def __ne__(self, other: object) -> bool: ...  # PYI032
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap
index d9837eff5d..fd92d1055d 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap
@@ -11,16 +11,15 @@ PYI034 [*] `__new__` methods in classes like `Bad` usually return `self` at runt
 22 |         ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g.…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-18 18 | class Bad(
-19 19 |     object
-20 20 | ):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
-21    |-    def __new__(cls, *args: Any, **kwargs: Any) -> Bad:
-   21 |+    def __new__(cls, *args: Any, **kwargs: Any) -> typing.Self:
-22 22 |         ...  # 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: ..."
-23 23 | 
-24 24 |     def __repr__(self) -> str:
+18 | class Bad(
+19 |     object
+20 | ):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+   -     def __new__(cls, *args: Any, **kwargs: Any) -> Bad:
+21 +     def __new__(cls, *args: Any, **kwargs: Any) -> typing.Self:
+22 |         ...  # 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: ..."
+23 | 
+24 |     def __repr__(self) -> str:
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at runtime
   --> PYI034.py:36:9
@@ -32,16 +31,15 @@ PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at ru
 37 |         ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-33 33 |     def __ne__(self, other: typing.Any) -> typing.Any:
-34 34 |         ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
-35 35 | 
-36    |-    def __enter__(self) -> Bad:
-   36 |+    def __enter__(self) -> typing.Self:
-37 37 |         ...  # 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 38 | 
-39 39 |     async def __aenter__(self) -> Bad:
+33 |     def __ne__(self, other: typing.Any) -> typing.Any:
+34 |         ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+35 | 
+   -     def __enter__(self) -> Bad:
+36 +     def __enter__(self) -> typing.Self:
+37 |         ...  # 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 | 
+39 |     async def __aenter__(self) -> Bad:
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at runtime
   --> PYI034.py:39:15
@@ -53,16 +51,15 @@ PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at r
 40 |         ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Sel…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-36 36 |     def __enter__(self) -> Bad:
-37 37 |         ...  # 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 38 | 
-39    |-    async def __aenter__(self) -> Bad:
-   39 |+    async def __aenter__(self) -> typing.Self:
-40 40 |         ...  # 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 41 | 
-42 42 |     def __iadd__(self, other: Bad) -> Bad:
+36 |     def __enter__(self) -> Bad:
+37 |         ...  # 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__(self) -> Bad:
+39 +     async def __aenter__(self) -> typing.Self:
+40 |         ...  # 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 | 
+42 |     def __iadd__(self, other: Bad) -> Bad:
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at runtime
   --> PYI034.py:42:9
@@ -74,16 +71,15 @@ PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at run
 43 |         ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self"…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-39 39 |     async def __aenter__(self) -> Bad:
-40 40 |         ...  # 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 41 | 
-42    |-    def __iadd__(self, other: Bad) -> Bad:
-   42 |+    def __iadd__(self, other: Bad) -> typing.Self:
-43 43 |         ...  # 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: ..."
-44 44 | 
-45 45 | 
+39 |     async def __aenter__(self) -> Bad:
+40 |         ...  # 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__(self, other: Bad) -> Bad:
+42 +     def __iadd__(self, other: Bad) -> typing.Self:
+43 |         ...  # 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: ..."
+44 | 
+45 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `self` at runtime
    --> PYI034.py:165:9
@@ -94,16 +90,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `sel
 166 |         ...  # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extens…
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-162 162 | 
-163 163 | 
-164 164 | class BadIterator1(Iterator[int]):
-165     |-    def __iter__(self) -> Iterator[int]:
-    165 |+    def __iter__(self) -> typing.Self:
-166 166 |         ...  # 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: ..."
-167 167 | 
-168 168 | 
+162 | 
+163 | 
+164 | class BadIterator1(Iterator[int]):
+    -     def __iter__(self) -> Iterator[int]:
+165 +     def __iter__(self) -> typing.Self:
+166 |         ...  # 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: ..."
+167 | 
+168 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `self` at runtime
    --> PYI034.py:172:9
@@ -115,16 +110,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `sel
 173 |         ...  # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extens…
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-169 169 | class BadIterator2(
-170 170 |     typing.Iterator[int]
-171 171 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
-172     |-    def __iter__(self) -> Iterator[int]:
-    172 |+    def __iter__(self) -> typing.Self:
-173 173 |         ...  # 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: ..."
-174 174 | 
-175 175 | 
+169 | class BadIterator2(
+170 |     typing.Iterator[int]
+171 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    -     def __iter__(self) -> Iterator[int]:
+172 +     def __iter__(self) -> typing.Self:
+173 |         ...  # 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: ..."
+174 | 
+175 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `self` at runtime
    --> PYI034.py:179:9
@@ -136,16 +130,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `sel
 180 |         ...  # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extens…
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-176 176 | class BadIterator3(
-177 177 |     typing.Iterator[int]
-178 178 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
-179     |-    def __iter__(self) -> collections.abc.Iterator[int]:
-    179 |+    def __iter__(self) -> typing.Self:
-180 180 |         ...  # 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: ..."
-181 181 | 
-182 182 | 
+176 | class BadIterator3(
+177 |     typing.Iterator[int]
+178 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    -     def __iter__(self) -> collections.abc.Iterator[int]:
+179 +     def __iter__(self) -> typing.Self:
+180 |         ...  # 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: ..."
+181 | 
+182 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `self` at runtime
    --> PYI034.py:185:9
@@ -157,16 +150,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `sel
 186 |         ...  # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extens…
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-182 182 | 
-183 183 | class BadIterator4(Iterator[int]):
-184 184 |     # Note: *Iterable*, not *Iterator*, returned!
-185     |-    def __iter__(self) -> Iterable[int]:
-    185 |+    def __iter__(self) -> typing.Self:
-186 186 |         ...  # 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: ..."
-187 187 | 
-188 188 | 
+182 | 
+183 | class BadIterator4(Iterator[int]):
+184 |     # Note: *Iterable*, not *Iterator*, returned!
+    -     def __iter__(self) -> Iterable[int]:
+185 +     def __iter__(self) -> typing.Self:
+186 |         ...  # 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: ..."
+187 | 
+188 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return `self` at runtime
    --> PYI034.py:195:9
@@ -177,16 +169,15 @@ PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return
 196 |         ...  # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_e…
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-192 192 | 
-193 193 | 
-194 194 | class BadAsyncIterator(collections.abc.AsyncIterator[str]):
-195     |-    def __aiter__(self) -> typing.AsyncIterator[str]:
-    195 |+    def __aiter__(self) -> typing.Self:
-196 196 |         ...  # 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)
-197 197 | 
-198 198 | class SubclassOfBadIterator3(BadIterator3):
+192 | 
+193 | 
+194 | class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+    -     def __aiter__(self) -> typing.AsyncIterator[str]:
+195 +     def __aiter__(self) -> typing.Self:
+196 |         ...  # 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)
+197 | 
+198 | class SubclassOfBadIterator3(BadIterator3):
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `SubclassOfBadIterator3` usually return `self` at runtime
    --> PYI034.py:199:9
@@ -197,16 +188,15 @@ PYI034 [*] `__iter__` methods in classes like `SubclassOfBadIterator3` usually r
 200 |         ...
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-196 196 |         ...  # 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)
-197 197 | 
-198 198 | class SubclassOfBadIterator3(BadIterator3):
-199     |-    def __iter__(self) -> Iterator[int]:  # Y034
-    199 |+    def __iter__(self) -> typing.Self:  # Y034
-200 200 |         ...
-201 201 | 
-202 202 | class SubclassOfBadAsyncIterator(BadAsyncIterator):
+196 |         ...  # 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)
+197 | 
+198 | class SubclassOfBadIterator3(BadIterator3):
+    -     def __iter__(self) -> Iterator[int]:  # Y034
+199 +     def __iter__(self) -> typing.Self:  # Y034
+200 |         ...
+201 | 
+202 | class SubclassOfBadAsyncIterator(BadAsyncIterator):
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__aiter__` methods in classes like `SubclassOfBadAsyncIterator` usually return `self` at runtime
    --> PYI034.py:203:9
@@ -217,16 +207,15 @@ PYI034 [*] `__aiter__` methods in classes like `SubclassOfBadAsyncIterator` usua
 204 |         ...
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-200 200 |         ...
-201 201 | 
-202 202 | class SubclassOfBadAsyncIterator(BadAsyncIterator):
-203     |-    def __aiter__(self) -> collections.abc.AsyncIterator[str]:  # Y034
-    203 |+    def __aiter__(self) -> typing.Self:  # Y034
-204 204 |         ...
-205 205 | 
-206 206 | class AsyncIteratorReturningAsyncIterable:
+200 |         ...
+201 | 
+202 | class SubclassOfBadAsyncIterator(BadAsyncIterator):
+    -     def __aiter__(self) -> collections.abc.AsyncIterator[str]:  # Y034
+203 +     def __aiter__(self) -> typing.Self:  # Y034
+204 |         ...
+205 | 
+206 | class AsyncIteratorReturningAsyncIterable:
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self` at runtime
    --> PYI034.py:327:9
@@ -237,16 +226,15 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self`
 328 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-324 324 | 
-325 325 | 
-326 326 | class NonGeneric1(tuple):
-327     |-    def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
-    327 |+    def __new__(cls, *args, **kwargs) -> typing.Self: ...
-328 328 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
-329 329 | 
-330 330 | class NonGeneric2(tuple):
+324 | 
+325 | 
+326 | class NonGeneric1(tuple):
+    -     def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
+327 +     def __new__(cls, *args, **kwargs) -> typing.Self: ...
+328 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
+329 | 
+330 | class NonGeneric2(tuple):
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `self` at runtime
    --> PYI034.py:328:9
@@ -259,16 +247,15 @@ PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `sel
 330 | class NonGeneric2(tuple):
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-325 325 | 
-326 326 | class NonGeneric1(tuple):
-327 327 |     def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
-328     |-    def __enter__(self: NonGeneric1) -> NonGeneric1: ...
-    328 |+    def __enter__(self) -> typing.Self: ...
-329 329 | 
-330 330 | class NonGeneric2(tuple):
-331 331 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+325 | 
+326 | class NonGeneric1(tuple):
+327 |     def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
+    -     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
+328 +     def __enter__(self) -> typing.Self: ...
+329 | 
+330 | class NonGeneric2(tuple):
+331 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self` at runtime
    --> PYI034.py:331:9
@@ -280,18 +267,17 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self`
 333 | class Generic1[T](list):
     |
 help: Use `Self` as return type
+328 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
+329 | 
+330 | class NonGeneric2(tuple):
+    -     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+331 +     def __new__(cls) -> typing.Self: ...
+332 | 
+333 | class Generic1[T](list):
+334 |     def __new__(cls: type[Generic1]) -> Generic1: ...
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-328 328 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
-329 329 | 
-330 330 | class NonGeneric2(tuple):
-331     |-    def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
-    331 |+    def __new__(cls) -> typing.Self: ...
-332 332 | 
-333 333 | class Generic1[T](list):
-334 334 |     def __new__(cls: type[Generic1]) -> Generic1: ...
-
-PYI034 `__new__` methods in classes like `Generic1` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic1` usually return `self` at runtime
    --> PYI034.py:334:9
     |
 333 | class Generic1[T](list):
@@ -300,18 +286,17 @@ PYI034 `__new__` methods in classes like `Generic1` usually return `self` at run
 335 |     def __enter__(self: Generic1) -> Generic1: ...
     |
 help: Use `Self` as return type
+331 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+332 | 
+333 | class Generic1[T](list):
+    -     def __new__(cls: type[Generic1]) -> Generic1: ...
+334 +     def __new__(cls) -> typing.Self: ...
+335 |     def __enter__(self: Generic1) -> Generic1: ...
+336 | 
+337 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-331 331 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
-332 332 | 
-333 333 | class Generic1[T](list):
-334     |-    def __new__(cls: type[Generic1]) -> Generic1: ...
-    334 |+    def __new__(cls) -> typing.Self: ...
-335 335 |     def __enter__(self: Generic1) -> Generic1: ...
-336 336 | 
-337 337 | 
-
-PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic1` usually return `self` at runtime
    --> PYI034.py:335:9
     |
 333 | class Generic1[T](list):
@@ -320,18 +305,17 @@ PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at r
     |         ^^^^^^^^^
     |
 help: Use `Self` as return type
+332 | 
+333 | class Generic1[T](list):
+334 |     def __new__(cls: type[Generic1]) -> Generic1: ...
+    -     def __enter__(self: Generic1) -> Generic1: ...
+335 +     def __enter__(self) -> typing.Self: ...
+336 | 
+337 | 
+338 | ### Correctness of typevar-likes are not verified.
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-332 332 | 
-333 333 | class Generic1[T](list):
-334 334 |     def __new__(cls: type[Generic1]) -> Generic1: ...
-335     |-    def __enter__(self: Generic1) -> Generic1: ...
-    335 |+    def __enter__(self) -> typing.Self: ...
-336 336 | 
-337 337 | 
-338 338 | ### Correctness of typevar-likes are not verified.
-
-PYI034 `__new__` methods in classes like `Generic2` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic2` usually return `self` at runtime
    --> PYI034.py:345:9
     |
 344 | class Generic2(Generic[T]):
@@ -340,18 +324,17 @@ PYI034 `__new__` methods in classes like `Generic2` usually return `self` at run
 346 |     def __enter__(self: Generic2) -> Generic2: ...
     |
 help: Use `Self` as return type
+342 | Ts = TypeVarTuple('foo')
+343 | 
+344 | class Generic2(Generic[T]):
+    -     def __new__(cls: type[Generic2]) -> Generic2: ...
+345 +     def __new__(cls) -> typing.Self: ...
+346 |     def __enter__(self: Generic2) -> Generic2: ...
+347 | 
+348 | class Generic3(tuple[*Ts]):
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-342 342 | Ts = TypeVarTuple('foo')
-343 343 | 
-344 344 | class Generic2(Generic[T]):
-345     |-    def __new__(cls: type[Generic2]) -> Generic2: ...
-    345 |+    def __new__(cls) -> typing.Self: ...
-346 346 |     def __enter__(self: Generic2) -> Generic2: ...
-347 347 | 
-348 348 | class Generic3(tuple[*Ts]):
-
-PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic2` usually return `self` at runtime
    --> PYI034.py:346:9
     |
 344 | class Generic2(Generic[T]):
@@ -362,18 +345,17 @@ PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at r
 348 | class Generic3(tuple[*Ts]):
     |
 help: Use `Self` as return type
+343 | 
+344 | class Generic2(Generic[T]):
+345 |     def __new__(cls: type[Generic2]) -> Generic2: ...
+    -     def __enter__(self: Generic2) -> Generic2: ...
+346 +     def __enter__(self) -> typing.Self: ...
+347 | 
+348 | class Generic3(tuple[*Ts]):
+349 |     def __new__(cls: type[Generic3]) -> Generic3: ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-343 343 | 
-344 344 | class Generic2(Generic[T]):
-345 345 |     def __new__(cls: type[Generic2]) -> Generic2: ...
-346     |-    def __enter__(self: Generic2) -> Generic2: ...
-    346 |+    def __enter__(self) -> typing.Self: ...
-347 347 | 
-348 348 | class Generic3(tuple[*Ts]):
-349 349 |     def __new__(cls: type[Generic3]) -> Generic3: ...
-
-PYI034 `__new__` methods in classes like `Generic3` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic3` usually return `self` at runtime
    --> PYI034.py:349:9
     |
 348 | class Generic3(tuple[*Ts]):
@@ -382,18 +364,17 @@ PYI034 `__new__` methods in classes like `Generic3` usually return `self` at run
 350 |     def __enter__(self: Generic3) -> Generic3: ...
     |
 help: Use `Self` as return type
+346 |     def __enter__(self: Generic2) -> Generic2: ...
+347 | 
+348 | class Generic3(tuple[*Ts]):
+    -     def __new__(cls: type[Generic3]) -> Generic3: ...
+349 +     def __new__(cls) -> typing.Self: ...
+350 |     def __enter__(self: Generic3) -> Generic3: ...
+351 | 
+352 | class Generic4(collections.abc.Callable[P, ...]):
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-346 346 |     def __enter__(self: Generic2) -> Generic2: ...
-347 347 | 
-348 348 | class Generic3(tuple[*Ts]):
-349     |-    def __new__(cls: type[Generic3]) -> Generic3: ...
-    349 |+    def __new__(cls) -> typing.Self: ...
-350 350 |     def __enter__(self: Generic3) -> Generic3: ...
-351 351 | 
-352 352 | class Generic4(collections.abc.Callable[P, ...]):
-
-PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic3` usually return `self` at runtime
    --> PYI034.py:350:9
     |
 348 | class Generic3(tuple[*Ts]):
@@ -404,18 +385,17 @@ PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at r
 352 | class Generic4(collections.abc.Callable[P, ...]):
     |
 help: Use `Self` as return type
+347 | 
+348 | class Generic3(tuple[*Ts]):
+349 |     def __new__(cls: type[Generic3]) -> Generic3: ...
+    -     def __enter__(self: Generic3) -> Generic3: ...
+350 +     def __enter__(self) -> typing.Self: ...
+351 | 
+352 | class Generic4(collections.abc.Callable[P, ...]):
+353 |     def __new__(cls: type[Generic4]) -> Generic4: ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-347 347 | 
-348 348 | class Generic3(tuple[*Ts]):
-349 349 |     def __new__(cls: type[Generic3]) -> Generic3: ...
-350     |-    def __enter__(self: Generic3) -> Generic3: ...
-    350 |+    def __enter__(self) -> typing.Self: ...
-351 351 | 
-352 352 | class Generic4(collections.abc.Callable[P, ...]):
-353 353 |     def __new__(cls: type[Generic4]) -> Generic4: ...
-
-PYI034 `__new__` methods in classes like `Generic4` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic4` usually return `self` at runtime
    --> PYI034.py:353:9
     |
 352 | class Generic4(collections.abc.Callable[P, ...]):
@@ -424,18 +404,17 @@ PYI034 `__new__` methods in classes like `Generic4` usually return `self` at run
 354 |     def __enter__(self: Generic4) -> Generic4: ...
     |
 help: Use `Self` as return type
+350 |     def __enter__(self: Generic3) -> Generic3: ...
+351 | 
+352 | class Generic4(collections.abc.Callable[P, ...]):
+    -     def __new__(cls: type[Generic4]) -> Generic4: ...
+353 +     def __new__(cls) -> typing.Self: ...
+354 |     def __enter__(self: Generic4) -> Generic4: ...
+355 | 
+356 | from some_module import PotentialTypeVar
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-350 350 |     def __enter__(self: Generic3) -> Generic3: ...
-351 351 | 
-352 352 | class Generic4(collections.abc.Callable[P, ...]):
-353     |-    def __new__(cls: type[Generic4]) -> Generic4: ...
-    353 |+    def __new__(cls) -> typing.Self: ...
-354 354 |     def __enter__(self: Generic4) -> Generic4: ...
-355 355 | 
-356 356 | from some_module import PotentialTypeVar
-
-PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic4` usually return `self` at runtime
    --> PYI034.py:354:9
     |
 352 | class Generic4(collections.abc.Callable[P, ...]):
@@ -446,16 +425,15 @@ PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at r
 356 | from some_module import PotentialTypeVar
     |
 help: Use `Self` as return type
-
-ℹ Display-only fix
-351 351 | 
-352 352 | class Generic4(collections.abc.Callable[P, ...]):
-353 353 |     def __new__(cls: type[Generic4]) -> Generic4: ...
-354     |-    def __enter__(self: Generic4) -> Generic4: ...
-    354 |+    def __enter__(self) -> typing.Self: ...
-355 355 | 
-356 356 | from some_module import PotentialTypeVar
-357 357 | 
+351 | 
+352 | class Generic4(collections.abc.Callable[P, ...]):
+353 |     def __new__(cls: type[Generic4]) -> Generic4: ...
+    -     def __enter__(self: Generic4) -> Generic4: ...
+354 +     def __enter__(self) -> typing.Self: ...
+355 | 
+356 | from some_module import PotentialTypeVar
+357 | 
+note: This is a display-only fix and is likely to be incorrect
 
 PYI034 [*] `__new__` methods in classes like `Generic5` usually return `self` at runtime
    --> PYI034.py:359:9
@@ -466,15 +444,14 @@ PYI034 [*] `__new__` methods in classes like `Generic5` usually return `self` at
 360 |     def __enter__(self: Generic5) -> Generic5: ...
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-356 356 | from some_module import PotentialTypeVar
-357 357 | 
-358 358 | class Generic5(list[PotentialTypeVar]):
-359     |-    def __new__(cls: type[Generic5]) -> Generic5: ...
-    359 |+    def __new__(cls) -> typing.Self: ...
-360 360 |     def __enter__(self: Generic5) -> Generic5: ...
-361 361 | 
+356 | from some_module import PotentialTypeVar
+357 | 
+358 | class Generic5(list[PotentialTypeVar]):
+    -     def __new__(cls: type[Generic5]) -> Generic5: ...
+359 +     def __new__(cls) -> typing.Self: ...
+360 |     def __enter__(self: Generic5) -> Generic5: ...
+361 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__enter__` methods in classes like `Generic5` usually return `self` at runtime
    --> PYI034.py:360:9
@@ -485,11 +462,10 @@ PYI034 [*] `__enter__` methods in classes like `Generic5` usually return `self`
     |         ^^^^^^^^^
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-357 357 | 
-358 358 | class Generic5(list[PotentialTypeVar]):
-359 359 |     def __new__(cls: type[Generic5]) -> Generic5: ...
-360     |-    def __enter__(self: Generic5) -> Generic5: ...
-    360 |+    def __enter__(self) -> typing.Self: ...
-361 361 |
+357 | 
+358 | class Generic5(list[PotentialTypeVar]):
+359 |     def __new__(cls: type[Generic5]) -> Generic5: ...
+    -     def __enter__(self: Generic5) -> Generic5: ...
+360 +     def __enter__(self) -> typing.Self: ...
+361 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap
index 294587cb6d..2018bb04f2 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap
@@ -12,16 +12,15 @@ PYI034 [*] `__new__` methods in classes like `Bad` usually return `self` at runt
 22 |     ) -> Bad: ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__"…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-19 19 | ):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
-20 20 |     def __new__(
-21 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: ..."
-   22 |+    ) -> typing.Self: ...  # 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: ..."
-23 23 |     def __repr__(
-24 24 |         self,
-25 25 |     ) -> str: ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+19 | ):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+20 |     def __new__(
+21 |         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: ..."
+22 +     ) -> typing.Self: ...  # 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: ..."
+23 |     def __repr__(
+24 |         self,
+25 |     ) -> str: ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at runtime
   --> PYI034.pyi:35:9
@@ -34,16 +33,15 @@ PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at ru
 37 |     ) -> Bad: ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extension…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-34 34 |     ) -> typing.Any: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
-35 35 |     def __enter__(
-36 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: ..."
-   37 |+    ) -> typing.Self: ...  # 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 38 |     async def __aenter__(
-39 39 |         self,
-40 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: ..."
+34 |     ) -> typing.Any: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+35 |     def __enter__(
+36 |         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: ..."
+37 +     ) -> typing.Self: ...  # 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__(
+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: ..."
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at runtime
   --> PYI034.pyi:38:15
@@ -56,16 +54,15 @@ PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at r
 40 |     ) -> Bad: ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensio…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-37 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 38 |     async def __aenter__(
-39 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: ..."
-   40 |+    ) -> typing.Self: ...  # 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 41 |     def __iadd__(
-42 42 |         self, other: Bad
-43 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: ..."
+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__(
+39 |         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: ..."
+40 +     ) -> typing.Self: ...  # 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__(
+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: ..."
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at runtime
   --> PYI034.pyi:41:9
@@ -78,16 +75,15 @@ PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at run
 43 |     ) -> Bad: ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions…
    |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-40 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 41 |     def __iadd__(
-42 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: ..."
-   43 |+    ) -> typing.Self: ...  # 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: ..."
-44 44 | 
-45 45 | class AlsoBad(
-46 46 |     int, builtins.object
+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__(
+42 |         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: ..."
+43 +     ) -> typing.Self: ...  # 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: ..."
+44 | 
+45 | class AlsoBad(
+46 |     int, builtins.object
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `self` at runtime
    --> PYI034.pyi:104:9
@@ -99,18 +95,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `sel
 106 |     ) -> Iterator[
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-103 103 | class BadIterator1(Iterator[int]):
-104 104 |     def __iter__(
-105 105 |         self,
-106     |-    ) -> Iterator[
-107     |-        int
-108     |-    ]: ...  # 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: ..."
-    106 |+    ) -> typing.Self: ...  # 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: ..."
-109 107 | 
-110 108 | class BadIterator2(
-111 109 |     typing.Iterator[int]
+103 | class BadIterator1(Iterator[int]):
+104 |     def __iter__(
+105 |         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: ..."
+106 +     ) -> typing.Self: ...  # 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: ..."
+107 | 
+108 | class BadIterator2(
+109 |     typing.Iterator[int]
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `self` at runtime
    --> PYI034.pyi:113:9
@@ -123,18 +118,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `sel
 115 |     ) -> Iterator[
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-112 112 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
-113 113 |     def __iter__(
-114 114 |         self,
-115     |-    ) -> Iterator[
-116     |-        int
-117     |-    ]: ...  # 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: ..."
-    115 |+    ) -> typing.Self: ...  # 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: ..."
-118 116 | 
-119 117 | class BadIterator3(
-120 118 |     typing.Iterator[int]
+112 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+113 |     def __iter__(
+114 |         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: ..."
+115 +     ) -> typing.Self: ...  # 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: ..."
+116 | 
+117 | class BadIterator3(
+118 |     typing.Iterator[int]
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `self` at runtime
    --> PYI034.pyi:122:9
@@ -147,18 +141,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `sel
 124 |     ) -> collections.abc.Iterator[
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-121 121 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
-122 122 |     def __iter__(
-123 123 |         self,
-124     |-    ) -> collections.abc.Iterator[
-125     |-        int
-126     |-    ]: ...  # 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: ..."
-    124 |+    ) -> typing.Self: ...  # 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: ..."
-127 125 | 
-128 126 | class BadIterator4(Iterator[int]):
-129 127 |     # Note: *Iterable*, not *Iterator*, returned!
+121 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+122 |     def __iter__(
+123 |         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: ..."
+124 +     ) -> typing.Self: ...  # 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: ..."
+125 | 
+126 | class BadIterator4(Iterator[int]):
+127 |     # Note: *Iterable*, not *Iterator*, returned!
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `self` at runtime
    --> PYI034.pyi:130:9
@@ -171,18 +164,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `sel
 132 |     ) -> Iterable[
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-129 129 |     # Note: *Iterable*, not *Iterator*, returned!
-130 130 |     def __iter__(
-131 131 |         self,
-132     |-    ) -> Iterable[
-133     |-        int
-134     |-    ]: ...  # 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: ..."
-    132 |+    ) -> typing.Self: ...  # 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: ..."
-135 133 | 
-136 134 | class IteratorReturningIterable:
-137 135 |     def __iter__(
+129 |     # Note: *Iterable*, not *Iterator*, returned!
+130 |     def __iter__(
+131 |         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: ..."
+132 +     ) -> typing.Self: ...  # 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: ..."
+133 | 
+134 | class IteratorReturningIterable:
+135 |     def __iter__(
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return `self` at runtime
    --> PYI034.pyi:144:9
@@ -194,18 +186,17 @@ PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return
 146 |     ) -> typing.AsyncIterator[
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-143 143 | class BadAsyncIterator(collections.abc.AsyncIterator[str]):
-144 144 |     def __aiter__(
-145 145 |         self,
-146     |-    ) -> typing.AsyncIterator[
-147     |-        str
-148     |-    ]: ...  # 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)
-    146 |+    ) -> typing.Self: ...  # 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)
-149 147 | 
-150 148 | class AsyncIteratorReturningAsyncIterable:
-151 149 |     def __aiter__(
+143 | class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+144 |     def __aiter__(
+145 |         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)
+146 +     ) -> typing.Self: ...  # 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)
+147 | 
+148 | class AsyncIteratorReturningAsyncIterable:
+149 |     def __aiter__(
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self` at runtime
    --> PYI034.pyi:221:9
@@ -216,16 +207,15 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self`
 222 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-218 218 | 
-219 219 | 
-220 220 | class NonGeneric1(tuple):
-221     |-    def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
-    221 |+    def __new__(cls, *args, **kwargs) -> typing.Self: ...
-222 222 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
-223 223 | 
-224 224 | class NonGeneric2(tuple):
+218 | 
+219 | 
+220 | class NonGeneric1(tuple):
+    -     def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
+221 +     def __new__(cls, *args, **kwargs) -> typing.Self: ...
+222 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
+223 | 
+224 | class NonGeneric2(tuple):
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `self` at runtime
    --> PYI034.pyi:222:9
@@ -238,16 +228,15 @@ PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `sel
 224 | class NonGeneric2(tuple):
     |
 help: Use `Self` as return type
-
-ℹ Unsafe fix
-219 219 | 
-220 220 | class NonGeneric1(tuple):
-221 221 |     def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
-222     |-    def __enter__(self: NonGeneric1) -> NonGeneric1: ...
-    222 |+    def __enter__(self) -> typing.Self: ...
-223 223 | 
-224 224 | class NonGeneric2(tuple):
-225 225 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+219 | 
+220 | class NonGeneric1(tuple):
+221 |     def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ...
+    -     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
+222 +     def __enter__(self) -> typing.Self: ...
+223 | 
+224 | class NonGeneric2(tuple):
+225 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+note: This is an unsafe fix and may change runtime behavior
 
 PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self` at runtime
    --> PYI034.pyi:225:9
@@ -259,18 +248,17 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self`
 227 | class Generic1[T](list):
     |
 help: Use `Self` as return type
+222 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
+223 | 
+224 | class NonGeneric2(tuple):
+    -     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+225 +     def __new__(cls) -> typing.Self: ...
+226 | 
+227 | class Generic1[T](list):
+228 |     def __new__(cls: type[Generic1]) -> Generic1: ...
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-222 222 |     def __enter__(self: NonGeneric1) -> NonGeneric1: ...
-223 223 | 
-224 224 | class NonGeneric2(tuple):
-225     |-    def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
-    225 |+    def __new__(cls) -> typing.Self: ...
-226 226 | 
-227 227 | class Generic1[T](list):
-228 228 |     def __new__(cls: type[Generic1]) -> Generic1: ...
-
-PYI034 `__new__` methods in classes like `Generic1` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic1` usually return `self` at runtime
    --> PYI034.pyi:228:9
     |
 227 | class Generic1[T](list):
@@ -279,18 +267,17 @@ PYI034 `__new__` methods in classes like `Generic1` usually return `self` at run
 229 |     def __enter__(self: Generic1) -> Generic1: ...
     |
 help: Use `Self` as return type
+225 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
+226 | 
+227 | class Generic1[T](list):
+    -     def __new__(cls: type[Generic1]) -> Generic1: ...
+228 +     def __new__(cls) -> typing.Self: ...
+229 |     def __enter__(self: Generic1) -> Generic1: ...
+230 | 
+231 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-225 225 |     def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ...
-226 226 | 
-227 227 | class Generic1[T](list):
-228     |-    def __new__(cls: type[Generic1]) -> Generic1: ...
-    228 |+    def __new__(cls) -> typing.Self: ...
-229 229 |     def __enter__(self: Generic1) -> Generic1: ...
-230 230 | 
-231 231 | 
-
-PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic1` usually return `self` at runtime
    --> PYI034.pyi:229:9
     |
 227 | class Generic1[T](list):
@@ -299,18 +286,17 @@ PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at r
     |         ^^^^^^^^^
     |
 help: Use `Self` as return type
+226 | 
+227 | class Generic1[T](list):
+228 |     def __new__(cls: type[Generic1]) -> Generic1: ...
+    -     def __enter__(self: Generic1) -> Generic1: ...
+229 +     def __enter__(self) -> typing.Self: ...
+230 | 
+231 | 
+232 | ### Correctness of typevar-likes are not verified.
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-226 226 | 
-227 227 | class Generic1[T](list):
-228 228 |     def __new__(cls: type[Generic1]) -> Generic1: ...
-229     |-    def __enter__(self: Generic1) -> Generic1: ...
-    229 |+    def __enter__(self) -> typing.Self: ...
-230 230 | 
-231 231 | 
-232 232 | ### Correctness of typevar-likes are not verified.
-
-PYI034 `__new__` methods in classes like `Generic2` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic2` usually return `self` at runtime
    --> PYI034.pyi:239:9
     |
 238 | class Generic2(Generic[T]):
@@ -319,18 +305,17 @@ PYI034 `__new__` methods in classes like `Generic2` usually return `self` at run
 240 |     def __enter__(self: Generic2) -> Generic2: ...
     |
 help: Use `Self` as return type
+236 | Ts = TypeVarTuple('foo')
+237 | 
+238 | class Generic2(Generic[T]):
+    -     def __new__(cls: type[Generic2]) -> Generic2: ...
+239 +     def __new__(cls) -> typing.Self: ...
+240 |     def __enter__(self: Generic2) -> Generic2: ...
+241 | 
+242 | class Generic3(tuple[*Ts]):
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-236 236 | Ts = TypeVarTuple('foo')
-237 237 | 
-238 238 | class Generic2(Generic[T]):
-239     |-    def __new__(cls: type[Generic2]) -> Generic2: ...
-    239 |+    def __new__(cls) -> typing.Self: ...
-240 240 |     def __enter__(self: Generic2) -> Generic2: ...
-241 241 | 
-242 242 | class Generic3(tuple[*Ts]):
-
-PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic2` usually return `self` at runtime
    --> PYI034.pyi:240:9
     |
 238 | class Generic2(Generic[T]):
@@ -341,18 +326,17 @@ PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at r
 242 | class Generic3(tuple[*Ts]):
     |
 help: Use `Self` as return type
+237 | 
+238 | class Generic2(Generic[T]):
+239 |     def __new__(cls: type[Generic2]) -> Generic2: ...
+    -     def __enter__(self: Generic2) -> Generic2: ...
+240 +     def __enter__(self) -> typing.Self: ...
+241 | 
+242 | class Generic3(tuple[*Ts]):
+243 |     def __new__(cls: type[Generic3]) -> Generic3: ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-237 237 | 
-238 238 | class Generic2(Generic[T]):
-239 239 |     def __new__(cls: type[Generic2]) -> Generic2: ...
-240     |-    def __enter__(self: Generic2) -> Generic2: ...
-    240 |+    def __enter__(self) -> typing.Self: ...
-241 241 | 
-242 242 | class Generic3(tuple[*Ts]):
-243 243 |     def __new__(cls: type[Generic3]) -> Generic3: ...
-
-PYI034 `__new__` methods in classes like `Generic3` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic3` usually return `self` at runtime
    --> PYI034.pyi:243:9
     |
 242 | class Generic3(tuple[*Ts]):
@@ -361,18 +345,17 @@ PYI034 `__new__` methods in classes like `Generic3` usually return `self` at run
 244 |     def __enter__(self: Generic3) -> Generic3: ...
     |
 help: Use `Self` as return type
+240 |     def __enter__(self: Generic2) -> Generic2: ...
+241 | 
+242 | class Generic3(tuple[*Ts]):
+    -     def __new__(cls: type[Generic3]) -> Generic3: ...
+243 +     def __new__(cls) -> typing.Self: ...
+244 |     def __enter__(self: Generic3) -> Generic3: ...
+245 | 
+246 | class Generic4(collections.abc.Callable[P, ...]):
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-240 240 |     def __enter__(self: Generic2) -> Generic2: ...
-241 241 | 
-242 242 | class Generic3(tuple[*Ts]):
-243     |-    def __new__(cls: type[Generic3]) -> Generic3: ...
-    243 |+    def __new__(cls) -> typing.Self: ...
-244 244 |     def __enter__(self: Generic3) -> Generic3: ...
-245 245 | 
-246 246 | class Generic4(collections.abc.Callable[P, ...]):
-
-PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic3` usually return `self` at runtime
    --> PYI034.pyi:244:9
     |
 242 | class Generic3(tuple[*Ts]):
@@ -383,18 +366,17 @@ PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at r
 246 | class Generic4(collections.abc.Callable[P, ...]):
     |
 help: Use `Self` as return type
+241 | 
+242 | class Generic3(tuple[*Ts]):
+243 |     def __new__(cls: type[Generic3]) -> Generic3: ...
+    -     def __enter__(self: Generic3) -> Generic3: ...
+244 +     def __enter__(self) -> typing.Self: ...
+245 | 
+246 | class Generic4(collections.abc.Callable[P, ...]):
+247 |     def __new__(cls: type[Generic4]) -> Generic4: ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-241 241 | 
-242 242 | class Generic3(tuple[*Ts]):
-243 243 |     def __new__(cls: type[Generic3]) -> Generic3: ...
-244     |-    def __enter__(self: Generic3) -> Generic3: ...
-    244 |+    def __enter__(self) -> typing.Self: ...
-245 245 | 
-246 246 | class Generic4(collections.abc.Callable[P, ...]):
-247 247 |     def __new__(cls: type[Generic4]) -> Generic4: ...
-
-PYI034 `__new__` methods in classes like `Generic4` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic4` usually return `self` at runtime
    --> PYI034.pyi:247:9
     |
 246 | class Generic4(collections.abc.Callable[P, ...]):
@@ -403,18 +385,17 @@ PYI034 `__new__` methods in classes like `Generic4` usually return `self` at run
 248 |     def __enter__(self: Generic4) -> Generic4: ...
     |
 help: Use `Self` as return type
+244 |     def __enter__(self: Generic3) -> Generic3: ...
+245 | 
+246 | class Generic4(collections.abc.Callable[P, ...]):
+    -     def __new__(cls: type[Generic4]) -> Generic4: ...
+247 +     def __new__(cls) -> typing.Self: ...
+248 |     def __enter__(self: Generic4) -> Generic4: ...
+249 | 
+250 | from some_module import PotentialTypeVar
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-244 244 |     def __enter__(self: Generic3) -> Generic3: ...
-245 245 | 
-246 246 | class Generic4(collections.abc.Callable[P, ...]):
-247     |-    def __new__(cls: type[Generic4]) -> Generic4: ...
-    247 |+    def __new__(cls) -> typing.Self: ...
-248 248 |     def __enter__(self: Generic4) -> Generic4: ...
-249 249 | 
-250 250 | from some_module import PotentialTypeVar
-
-PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic4` usually return `self` at runtime
    --> PYI034.pyi:248:9
     |
 246 | class Generic4(collections.abc.Callable[P, ...]):
@@ -425,18 +406,17 @@ PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at r
 250 | from some_module import PotentialTypeVar
     |
 help: Use `Self` as return type
+245 | 
+246 | class Generic4(collections.abc.Callable[P, ...]):
+247 |     def __new__(cls: type[Generic4]) -> Generic4: ...
+    -     def __enter__(self: Generic4) -> Generic4: ...
+248 +     def __enter__(self) -> typing.Self: ...
+249 | 
+250 | from some_module import PotentialTypeVar
+251 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-245 245 | 
-246 246 | class Generic4(collections.abc.Callable[P, ...]):
-247 247 |     def __new__(cls: type[Generic4]) -> Generic4: ...
-248     |-    def __enter__(self: Generic4) -> Generic4: ...
-    248 |+    def __enter__(self) -> typing.Self: ...
-249 249 | 
-250 250 | from some_module import PotentialTypeVar
-251 251 | 
-
-PYI034 `__new__` methods in classes like `Generic5` usually return `self` at runtime
+PYI034 [*] `__new__` methods in classes like `Generic5` usually return `self` at runtime
    --> PYI034.pyi:253:9
     |
 252 | class Generic5(list[PotentialTypeVar]):
@@ -445,16 +425,15 @@ PYI034 `__new__` methods in classes like `Generic5` usually return `self` at run
 254 |     def __enter__(self: Generic5) -> Generic5: ...
     |
 help: Use `Self` as return type
+250 | from some_module import PotentialTypeVar
+251 | 
+252 | class Generic5(list[PotentialTypeVar]):
+    -     def __new__(cls: type[Generic5]) -> Generic5: ...
+253 +     def __new__(cls) -> typing.Self: ...
+254 |     def __enter__(self: Generic5) -> Generic5: ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-250 250 | from some_module import PotentialTypeVar
-251 251 | 
-252 252 | class Generic5(list[PotentialTypeVar]):
-253     |-    def __new__(cls: type[Generic5]) -> Generic5: ...
-    253 |+    def __new__(cls) -> typing.Self: ...
-254 254 |     def __enter__(self: Generic5) -> Generic5: ...
-
-PYI034 `__enter__` methods in classes like `Generic5` usually return `self` at runtime
+PYI034 [*] `__enter__` methods in classes like `Generic5` usually return `self` at runtime
    --> PYI034.pyi:254:9
     |
 252 | class Generic5(list[PotentialTypeVar]):
@@ -463,10 +442,9 @@ PYI034 `__enter__` methods in classes like `Generic5` usually return `self` at r
     |         ^^^^^^^^^
     |
 help: Use `Self` as return type
-
-ℹ Display-only fix
-251 251 | 
-252 252 | class Generic5(list[PotentialTypeVar]):
-253 253 |     def __new__(cls: type[Generic5]) -> Generic5: ...
-254     |-    def __enter__(self: Generic5) -> Generic5: ...
-    254 |+    def __enter__(self) -> typing.Self: ...
+251 | 
+252 | class Generic5(list[PotentialTypeVar]):
+253 |     def __new__(cls: type[Generic5]) -> Generic5: ...
+    -     def __enter__(self: Generic5) -> Generic5: ...
+254 +     def __enter__(self) -> typing.Self: ...
+note: This is a display-only fix and is likely to be incorrect
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap
index 15a8ed0a74..7762ae8004 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap
@@ -10,16 +10,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object`
 55 |     async def __aexit__(self) -> None: ... # PYI036: Missing args
    |
 help: Annotate star-args with `object`
-
-ℹ Safe fix
-51 51 | 
-52 52 | 
-53 53 | class BadOne:
-54    |-    def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation
-   54 |+    def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation
-55 55 |     async def __aexit__(self) -> None: ... # PYI036: Missing args
-56 56 | 
-57 57 | class BadTwo:
+51 | 
+52 | 
+53 | class BadOne:
+   -     def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation
+54 +     def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation
+55 |     async def __aexit__(self) -> None: ... # PYI036: Missing args
+56 | 
+57 | class BadTwo:
 
 PYI036 If there are no star-args, `__aexit__` should have at least 3 non-keyword-only args (excluding `self`)
   --> PYI036.py:55:24
@@ -121,16 +119,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object`
 71 |     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotati…
    |
 help: Annotate star-args with `object`
-
-ℹ Safe fix
-67 67 |     async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation
-68 68 | 
-69 69 | class BadFive:
-70    |-    def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
-   70 |+    def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation
-71 71 |     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
-72 72 | 
-73 73 | class BadSix:
+67 |     async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation
+68 | 
+69 | class BadFive:
+   -     def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
+70 +     def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation
+71 |     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
+72 | 
+73 | class BadSix:
 
 PYI036 [*] Star-args in `__aexit__` should be annotated with `object`
   --> PYI036.py:71:74
@@ -143,16 +139,14 @@ PYI036 [*] Star-args in `__aexit__` should be annotated with `object`
 73 | class BadSix:
    |
 help: Annotate star-args with `object`
-
-ℹ Safe fix
-68 68 | 
-69 69 | class BadFive:
-70 70 |     def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
-71    |-    async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
-   71 |+    async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
-72 72 | 
-73 73 | class BadSix:
-74 74 |     def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default
+68 | 
+69 | class BadFive:
+70 |     def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
+   -     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
+71 +     async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
+72 | 
+73 | class BadSix:
+74 |     def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default
 
 PYI036 All arguments after the first four in `__exit__` must have a default value
   --> PYI036.py:74:38
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap
index aad7a9348e..0c74e34826 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap
@@ -10,16 +10,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object`
 55 |     async def __aexit__(self) -> None: ... # PYI036: Missing args
    |
 help: Annotate star-args with `object`
-
-ℹ Safe fix
-51 51 | 
-52 52 | 
-53 53 | class BadOne:
-54    |-    def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation
-   54 |+    def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation
-55 55 |     async def __aexit__(self) -> None: ... # PYI036: Missing args
-56 56 | 
-57 57 | class BadTwo:
+51 | 
+52 | 
+53 | class BadOne:
+   -     def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation
+54 +     def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation
+55 |     async def __aexit__(self) -> None: ... # PYI036: Missing args
+56 | 
+57 | class BadTwo:
 
 PYI036 If there are no star-args, `__aexit__` should have at least 3 non-keyword-only args (excluding `self`)
   --> PYI036.pyi:55:24
@@ -132,16 +130,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object`
 71 |     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotati…
    |
 help: Annotate star-args with `object`
-
-ℹ Safe fix
-67 67 |     async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation
-68 68 | 
-69 69 | class BadFive:
-70    |-    def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
-   70 |+    def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation
-71 71 |     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
-72 72 | 
-73 73 | class BadSix:
+67 |     async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation
+68 | 
+69 | class BadFive:
+   -     def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
+70 +     def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation
+71 |     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
+72 | 
+73 | class BadSix:
 
 PYI036 [*] Star-args in `__aexit__` should be annotated with `object`
   --> PYI036.pyi:71:74
@@ -154,16 +150,14 @@ PYI036 [*] Star-args in `__aexit__` should be annotated with `object`
 73 | class BadSix:
    |
 help: Annotate star-args with `object`
-
-ℹ Safe fix
-68 68 | 
-69 69 | class BadFive:
-70 70 |     def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
-71    |-    async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
-   71 |+    async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
-72 72 | 
-73 73 | class BadSix:
-74 74 |     def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default
+68 | 
+69 | class BadFive:
+70 |     def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation
+   -     async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
+71 +     async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation
+72 | 
+73 | class BadSix:
+74 |     def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default
 
 PYI036 All arguments after the first four in `__exit__` must have a default value
   --> PYI036.pyi:74:38
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap
index 6f1d026f5c..85d1d40c22 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap
@@ -9,16 +9,14 @@ PYI041 [*] Use `float` instead of `int | float`
 24 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-20 20 |     ...
-21 21 | 
-22 22 | 
-23    |-def f0(arg1: float | int) -> None:
-   23 |+def f0(arg1: float) -> None:
-24 24 |     ...
-25 25 | 
-26 26 | 
+20 |     ...
+21 | 
+22 | 
+   - def f0(arg1: float | int) -> None:
+23 + def f0(arg1: float) -> None:
+24 |     ...
+25 | 
+26 | 
 
 PYI041 [*] Use `complex` instead of `float | complex`
   --> PYI041_1.py:27:30
@@ -28,16 +26,14 @@ PYI041 [*] Use `complex` instead of `float | complex`
 28 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-24 24 |     ...
-25 25 | 
-26 26 | 
-27    |-def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None:
-   27 |+def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None:
-28 28 |     ...
-29 29 | 
-30 30 | 
+24 |     ...
+25 | 
+26 | 
+   - def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None:
+27 + def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None:
+28 |     ...
+29 | 
+30 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:31:28
@@ -47,16 +43,14 @@ PYI041 [*] Use `float` instead of `int | float`
 32 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-28 28 |     ...
-29 29 | 
-30 30 | 
-31    |-def f2(arg1: int, /, arg2: int | int | float) -> None:
-   31 |+def f2(arg1: int, /, arg2: float) -> None:
-32 32 |     ...
-33 33 | 
-34 34 | 
+28 |     ...
+29 | 
+30 | 
+   - def f2(arg1: int, /, arg2: int | int | float) -> None:
+31 + def f2(arg1: int, /, arg2: float) -> None:
+32 |     ...
+33 | 
+34 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:35:26
@@ -66,16 +60,14 @@ PYI041 [*] Use `float` instead of `int | float`
 36 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-32 32 |     ...
-33 33 | 
-34 34 | 
-35    |-def f3(arg1: int, *args: Union[int | int | float]) -> None:
-   35 |+def f3(arg1: int, *args: float) -> None:
-36 36 |     ...
-37 37 | 
-38 38 | 
+32 |     ...
+33 | 
+34 | 
+   - def f3(arg1: int, *args: Union[int | int | float]) -> None:
+35 + def f3(arg1: int, *args: float) -> None:
+36 |     ...
+37 | 
+38 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:39:24
@@ -85,16 +77,14 @@ PYI041 [*] Use `float` instead of `int | float`
 40 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-36 36 |     ...
-37 37 | 
-38 38 | 
-39    |-async def f4(**kwargs: int | int | float) -> None:
-   39 |+async def f4(**kwargs: float) -> None:
-40 40 |     ...
-41 41 | 
-42 42 | 
+36 |     ...
+37 | 
+38 | 
+   - async def f4(**kwargs: int | int | float) -> None:
+39 + async def f4(**kwargs: float) -> None:
+40 |     ...
+41 | 
+42 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:43:26
@@ -104,16 +94,14 @@ PYI041 [*] Use `float` instead of `int | float`
 44 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-40 40 |     ...
-41 41 | 
-42 42 | 
-43    |-def f5(arg1: int, *args: Union[int, int, float]) -> None: 
-   43 |+def f5(arg1: int, *args: float) -> None: 
-44 44 |     ...
-45 45 | 
-46 46 | 
+40 |     ...
+41 | 
+42 | 
+   - def f5(arg1: int, *args: Union[int, int, float]) -> None: 
+43 + def f5(arg1: int, *args: float) -> None: 
+44 |     ...
+45 | 
+46 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:47:26
@@ -123,16 +111,14 @@ PYI041 [*] Use `float` instead of `int | float`
 48 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-44 44 |     ...
-45 45 | 
-46 46 | 
-47    |-def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: 
-   47 |+def f6(arg1: int, *args: float) -> None: 
-48 48 |     ...
-49 49 | 
-50 50 | 
+44 |     ...
+45 | 
+46 | 
+   - def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: 
+47 + def f6(arg1: int, *args: float) -> None: 
+48 |     ...
+49 | 
+50 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:51:26
@@ -142,16 +128,14 @@ PYI041 [*] Use `float` instead of `int | float`
 52 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-48 48 |     ...
-49 49 | 
-50 50 | 
-51    |-def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: 
-   51 |+def f7(arg1: int, *args: float) -> None: 
-52 52 |     ...
-53 53 | 
-54 54 | 
+48 |     ...
+49 | 
+50 | 
+   - def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: 
+51 + def f7(arg1: int, *args: float) -> None: 
+52 |     ...
+53 | 
+54 | 
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.py:55:26
@@ -161,16 +145,14 @@ PYI041 [*] Use `float` instead of `int | float`
 56 |     ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-52 52 |     ...
-53 53 | 
-54 54 | 
-55    |-def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: 
-   55 |+def f8(arg1: int, *args: float) -> None: 
-56 56 |     ...
-57 57 | 
-58 58 | 
+52 |     ...
+53 | 
+54 | 
+   - def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: 
+55 + def f8(arg1: int, *args: float) -> None: 
+56 |     ...
+57 | 
+58 | 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:60:10
@@ -185,18 +167,17 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 64 |       ...
    |
 help: Remove redundant type
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | 
-59 59 | def f9(
-60    |-    arg: Union[  # comment 
-61    |-        float, # another
-62    |-        complex, int]
-   60 |+    arg: complex
-63 61 |     ) -> None: 
-64 62 |     ...
-65 63 | 
+57 | 
+58 | 
+59 | def f9(
+   -     arg: Union[  # comment 
+   -         float, # another
+   -         complex, int]
+60 +     arg: complex
+61 |     ) -> None: 
+62 |     ...
+63 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:68:9
@@ -211,16 +192,15 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 72 |       ) -> None: 
    |
 help: Remove redundant type
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | def f10(
-67 67 |     arg: (
-68    |-        int | # comment
-69    |-        float |  # another
-70 68 |         complex
-71 69 |     )    
-72 70 |     ) -> None: 
+65 | 
+66 | def f10(
+67 |     arg: (
+   -         int | # comment
+   -         float |  # another
+68 |         complex
+69 |     )    
+70 |     ) -> None: 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:80:24
@@ -232,16 +212,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 81 |         ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-77 77 |     def good(self, arg: int) -> None:
-78 78 |         ...
-79 79 | 
-80    |-    def bad(self, arg: int | float | complex) -> None:
-   80 |+    def bad(self, arg: complex) -> None:
-81 81 |         ...
-82 82 | 
-83 83 |     def bad2(self, arg: int | Union[float, complex]) -> None: 
+77 |     def good(self, arg: int) -> None:
+78 |         ...
+79 | 
+   -     def bad(self, arg: int | float | complex) -> None:
+80 +     def bad(self, arg: complex) -> None:
+81 |         ...
+82 | 
+83 |     def bad2(self, arg: int | Union[float, complex]) -> None: 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:83:25
@@ -253,16 +231,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 84 |         ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-80 80 |     def bad(self, arg: int | float | complex) -> None:
-81 81 |         ...
-82 82 | 
-83    |-    def bad2(self, arg: int | Union[float, complex]) -> None: 
-   83 |+    def bad2(self, arg: complex) -> None: 
-84 84 |         ...
-85 85 | 
-86 86 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: 
+80 |     def bad(self, arg: int | float | complex) -> None:
+81 |         ...
+82 | 
+   -     def bad2(self, arg: int | Union[float, complex]) -> None: 
+83 +     def bad2(self, arg: complex) -> None: 
+84 |         ...
+85 | 
+86 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:86:25
@@ -274,16 +250,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 87 |         ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-83 83 |     def bad2(self, arg: int | Union[float, complex]) -> None: 
-84 84 |         ...
-85 85 | 
-86    |-    def bad3(self, arg: Union[Union[float, complex], int]) -> None: 
-   86 |+    def bad3(self, arg: complex) -> None: 
-87 87 |         ...
-88 88 | 
-89 89 |     def bad4(self, arg: Union[float | complex, int]) -> None: 
+83 |     def bad2(self, arg: int | Union[float, complex]) -> None: 
+84 |         ...
+85 | 
+   -     def bad3(self, arg: Union[Union[float, complex], int]) -> None: 
+86 +     def bad3(self, arg: complex) -> None: 
+87 |         ...
+88 | 
+89 |     def bad4(self, arg: Union[float | complex, int]) -> None: 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:89:25
@@ -295,16 +269,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 90 |         ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-86 86 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: 
-87 87 |         ...
-88 88 | 
-89    |-    def bad4(self, arg: Union[float | complex, int]) -> None: 
-   89 |+    def bad4(self, arg: complex) -> None: 
-90 90 |         ...
-91 91 | 
-92 92 |     def bad5(self, arg: int | (float | complex)) -> None: 
+86 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: 
+87 |         ...
+88 | 
+   -     def bad4(self, arg: Union[float | complex, int]) -> None: 
+89 +     def bad4(self, arg: complex) -> None: 
+90 |         ...
+91 | 
+92 |     def bad5(self, arg: int | (float | complex)) -> None: 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.py:92:25
@@ -316,16 +288,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 93 |         ...
    |
 help: Remove redundant type
-
-ℹ Safe fix
-89 89 |     def bad4(self, arg: Union[float | complex, int]) -> None: 
-90 90 |         ...
-91 91 | 
-92    |-    def bad5(self, arg: int | (float | complex)) -> None: 
-   92 |+    def bad5(self, arg: complex) -> None: 
-93 93 |         ...
-94 94 | 
-95 95 | 
+89 |     def bad4(self, arg: Union[float | complex, int]) -> None: 
+90 |         ...
+91 | 
+   -     def bad5(self, arg: int | (float | complex)) -> None: 
+92 +     def bad5(self, arg: complex) -> None: 
+93 |         ...
+94 | 
+95 | 
 
 PYI041 Use `float` instead of `int | float`
    --> PYI041_1.py:99:23
@@ -349,16 +319,14 @@ PYI041 [*] Use `float` instead of `int | float`
 106 |     else:
     |
 help: Remove redundant type
-
-ℹ Safe fix
-101 101 | 
-102 102 |     if TYPE_CHECKING:
-103 103 | 
-104     |-        def f2(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
-    104 |+        def f2(self, arg: None | None | float = None) -> None: ...  # PYI041 - with fix
-105 105 | 
-106 106 |     else:
-107 107 | 
+101 | 
+102 |     if TYPE_CHECKING:
+103 | 
+    -         def f2(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
+104 +         def f2(self, arg: None | None | float = None) -> None: ...  # PYI041 - with fix
+105 | 
+106 |     else:
+107 | 
 
 PYI041 [*] Use `float` instead of `int | float`
    --> PYI041_1.py:111:23
@@ -370,11 +338,9 @@ PYI041 [*] Use `float` instead of `int | float`
 112 |         pass
     |
 help: Remove redundant type
-
-ℹ Safe fix
-108 108 |         def f2(self, arg=None) -> None:
-109 109 |             pass
-110 110 | 
-111     |-    def f3(self, arg: None | float | None | int | None = None) -> None:  # PYI041 - with fix
-    111 |+    def f3(self, arg: None | float | None | None = None) -> None:  # PYI041 - with fix
-112 112 |         pass
+108 |         def f2(self, arg=None) -> None:
+109 |             pass
+110 | 
+    -     def f3(self, arg: None | float | None | int | None = None) -> None:  # PYI041 - with fix
+111 +     def f3(self, arg: None | float | None | None = None) -> None:  # PYI041 - with fix
+112 |         pass
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap
index a3cdaa28f9..4c65f472d8 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap
@@ -8,16 +8,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |              ^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-18 18 | def good2(arg: int, arg2: int | bool) -> None: ...
-19 19 | 
-20 20 | 
-21    |-def f0(arg1: float | int) -> None: ...  # PYI041
-   21 |+def f0(arg1: float) -> None: ...  # PYI041
-22 22 | 
-23 23 | 
-24 24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ...  # PYI041
+18 | def good2(arg: int, arg2: int | bool) -> None: ...
+19 | 
+20 | 
+   - def f0(arg1: float | int) -> None: ...  # PYI041
+21 + def f0(arg1: float) -> None: ...  # PYI041
+22 | 
+23 | 
+24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ...  # PYI041
 
 PYI041 [*] Use `complex` instead of `float | complex`
   --> PYI041_1.pyi:24:30
@@ -26,16 +24,14 @@ PYI041 [*] Use `complex` instead of `float | complex`
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-21 21 | def f0(arg1: float | int) -> None: ...  # PYI041
-22 22 | 
-23 23 | 
-24    |-def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ...  # PYI041
-   24 |+def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None: ...  # PYI041
-25 25 | 
-26 26 | 
-27 27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ...  # PYI041
+21 | def f0(arg1: float | int) -> None: ...  # PYI041
+22 | 
+23 | 
+   - def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ...  # PYI041
+24 + def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None: ...  # PYI041
+25 | 
+26 | 
+27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ...  # PYI041
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:27:28
@@ -44,16 +40,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |                            ^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-24 24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ...  # PYI041
-25 25 | 
-26 26 | 
-27    |-def f2(arg1: int, /, arg2: int | int | float) -> None: ...  # PYI041
-   27 |+def f2(arg1: int, /, arg2: float) -> None: ...  # PYI041
-28 28 | 
-29 29 | 
-30 30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ...  # PYI041
+24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ...  # PYI041
+25 | 
+26 | 
+   - def f2(arg1: int, /, arg2: int | int | float) -> None: ...  # PYI041
+27 + def f2(arg1: int, /, arg2: float) -> None: ...  # PYI041
+28 | 
+29 | 
+30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ...  # PYI041
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:30:26
@@ -62,16 +56,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-27 27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ...  # PYI041
-28 28 | 
-29 29 | 
-30    |-def f3(arg1: int, *args: Union[int | int | float]) -> None: ...  # PYI041
-   30 |+def f3(arg1: int, *args: float) -> None: ...  # PYI041
-31 31 | 
-32 32 | 
-33 33 | async def f4(**kwargs: int | int | float) -> None: ...  # PYI041
+27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ...  # PYI041
+28 | 
+29 | 
+   - def f3(arg1: int, *args: Union[int | int | float]) -> None: ...  # PYI041
+30 + def f3(arg1: int, *args: float) -> None: ...  # PYI041
+31 | 
+32 | 
+33 | async def f4(**kwargs: int | int | float) -> None: ...  # PYI041
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:33:24
@@ -82,16 +74,14 @@ PYI041 [*] Use `float` instead of `int | float`
 35 | def f5(
    |
 help: Remove redundant type
-
-ℹ Safe fix
-30 30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ...  # PYI041
-31 31 | 
-32 32 | 
-33    |-async def f4(**kwargs: int | int | float) -> None: ...  # PYI041
-   33 |+async def f4(**kwargs: float) -> None: ...  # PYI041
-34 34 | 
-35 35 | def f5(
-36 36 |     arg: Union[  # comment 
+30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ...  # PYI041
+31 | 
+32 | 
+   - async def f4(**kwargs: int | int | float) -> None: ...  # PYI041
+33 + async def f4(**kwargs: float) -> None: ...  # PYI041
+34 | 
+35 | def f5(
+36 |     arg: Union[  # comment 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:36:10
@@ -105,18 +95,17 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 39 |       ) -> None: ...  # PYI041
    |
 help: Remove redundant type
-
-ℹ Unsafe fix
-33 33 | async def f4(**kwargs: int | int | float) -> None: ...  # PYI041
-34 34 | 
-35 35 | def f5(
-36    |-    arg: Union[  # comment 
-37    |-        float, # another
-38    |-        complex, int]
-   36 |+    arg: complex
-39 37 |     ) -> None: ...  # PYI041
-40 38 | 
-41 39 | def f6(
+33 | async def f4(**kwargs: int | int | float) -> None: ...  # PYI041
+34 | 
+35 | def f5(
+   -     arg: Union[  # comment 
+   -         float, # another
+   -         complex, int]
+36 +     arg: complex
+37 |     ) -> None: ...  # PYI041
+38 | 
+39 | def f6(
+note: This is an unsafe fix and may change runtime behavior
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:43:9
@@ -131,16 +120,15 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 47 |       ) -> None: ... # PYI041
    |
 help: Remove redundant type
-
-ℹ Unsafe fix
-40 40 | 
-41 41 | def f6(
-42 42 |     arg: (
-43    |-        int | # comment
-44    |-        float |  # another
-45 43 |         complex
-46 44 |     )    
-47 45 |     ) -> None: ... # PYI041
+40 | 
+41 | def f6(
+42 |     arg: (
+   -         int | # comment
+   -         float |  # another
+43 |         complex
+44 |     )    
+45 |     ) -> None: ... # PYI041
+note: This is an unsafe fix and may change runtime behavior
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:49:26
@@ -151,16 +139,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |                          ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-46 46 |     )    
-47 47 |     ) -> None: ... # PYI041
-48 48 | 
-49    |-def f5(arg1: int, *args: Union[int, int, float]) -> None: ...  # PYI041
-   49 |+def f5(arg1: int, *args: float) -> None: ...  # PYI041
-50 50 | 
-51 51 | 
-52 52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ...  # PYI041
+46 |     )    
+47 |     ) -> None: ... # PYI041
+48 | 
+   - def f5(arg1: int, *args: Union[int, int, float]) -> None: ...  # PYI041
+49 + def f5(arg1: int, *args: float) -> None: ...  # PYI041
+50 | 
+51 | 
+52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ...  # PYI041
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:52:26
@@ -169,16 +155,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-49 49 | def f5(arg1: int, *args: Union[int, int, float]) -> None: ...  # PYI041
-50 50 | 
-51 51 | 
-52    |-def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ...  # PYI041
-   52 |+def f6(arg1: int, *args: float) -> None: ...  # PYI041
-53 53 | 
-54 54 | 
-55 55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ...  # PYI041
+49 | def f5(arg1: int, *args: Union[int, int, float]) -> None: ...  # PYI041
+50 | 
+51 | 
+   - def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ...  # PYI041
+52 + def f6(arg1: int, *args: float) -> None: ...  # PYI041
+53 | 
+54 | 
+55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ...  # PYI041
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:55:26
@@ -187,16 +171,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-52 52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ...  # PYI041
-53 53 | 
-54 54 | 
-55    |-def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ...  # PYI041
-   55 |+def f7(arg1: int, *args: float) -> None: ...  # PYI041
-56 56 | 
-57 57 | 
-58 58 | def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ...  # PYI041
+52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ...  # PYI041
+53 | 
+54 | 
+   - def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ...  # PYI041
+55 + def f7(arg1: int, *args: float) -> None: ...  # PYI041
+56 | 
+57 | 
+58 | def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ...  # PYI041
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:58:26
@@ -205,16 +187,14 @@ PYI041 [*] Use `float` instead of `int | float`
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-55 55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ...  # PYI041
-56 56 | 
-57 57 | 
-58    |-def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ...  # PYI041
-   58 |+def f8(arg1: int, *args: float) -> None: ...  # PYI041
-59 59 | 
-60 60 | 
-61 61 | class Foo:
+55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ...  # PYI041
+56 | 
+57 | 
+   - def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ...  # PYI041
+58 + def f8(arg1: int, *args: float) -> None: ...  # PYI041
+59 | 
+60 | 
+61 | class Foo:
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:64:24
@@ -227,16 +207,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 66 |     def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
    |
 help: Remove redundant type
-
-ℹ Safe fix
-61 61 | class Foo:
-62 62 |     def good(self, arg: int) -> None: ...
-63 63 | 
-64    |-    def bad(self, arg: int | float | complex) -> None: ...  # PYI041
-   64 |+    def bad(self, arg: complex) -> None: ...  # PYI041
-65 65 | 
-66 66 |     def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
-67 67 | 
+61 | class Foo:
+62 |     def good(self, arg: int) -> None: ...
+63 | 
+   -     def bad(self, arg: int | float | complex) -> None: ...  # PYI041
+64 +     def bad(self, arg: complex) -> None: ...  # PYI041
+65 | 
+66 |     def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
+67 | 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:66:25
@@ -249,16 +227,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 68 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
    |
 help: Remove redundant type
-
-ℹ Safe fix
-63 63 | 
-64 64 |     def bad(self, arg: int | float | complex) -> None: ...  # PYI041
-65 65 | 
-66    |-    def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
-   66 |+    def bad2(self, arg: complex) -> None: ...  # PYI041
-67 67 | 
-68 68 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
-69 69 | 
+63 | 
+64 |     def bad(self, arg: int | float | complex) -> None: ...  # PYI041
+65 | 
+   -     def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
+66 +     def bad2(self, arg: complex) -> None: ...  # PYI041
+67 | 
+68 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
+69 | 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:68:25
@@ -271,16 +247,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 70 |     def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
    |
 help: Remove redundant type
-
-ℹ Safe fix
-65 65 | 
-66 66 |     def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
-67 67 | 
-68    |-    def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
-   68 |+    def bad3(self, arg: complex) -> None: ...  # PYI041
-69 69 | 
-70 70 |     def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
-71 71 | 
+65 | 
+66 |     def bad2(self, arg: int | Union[float, complex]) -> None: ...  # PYI041
+67 | 
+   -     def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
+68 +     def bad3(self, arg: complex) -> None: ...  # PYI041
+69 | 
+70 |     def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
+71 | 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:70:25
@@ -293,16 +267,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
 72 |     def bad5(self, arg: int | (float | complex)) -> None: ...  # PYI041
    |
 help: Remove redundant type
-
-ℹ Safe fix
-67 67 | 
-68 68 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
-69 69 | 
-70    |-    def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
-   70 |+    def bad4(self, arg: complex) -> None: ...  # PYI041
-71 71 | 
-72 72 |     def bad5(self, arg: int | (float | complex)) -> None: ...  # PYI041
-73 73 | 
+67 | 
+68 |     def bad3(self, arg: Union[Union[float, complex], int]) -> None: ...  # PYI041
+69 | 
+   -     def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
+70 +     def bad4(self, arg: complex) -> None: ...  # PYI041
+71 | 
+72 |     def bad5(self, arg: int | (float | complex)) -> None: ...  # PYI041
+73 | 
 
 PYI041 [*] Use `complex` instead of `int | float | complex`
   --> PYI041_1.pyi:72:25
@@ -313,16 +285,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex`
    |                         ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-69 69 | 
-70 70 |     def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
-71 71 | 
-72    |-    def bad5(self, arg: int | (float | complex)) -> None: ...  # PYI041
-   72 |+    def bad5(self, arg: complex) -> None: ...  # PYI041
-73 73 | 
-74 74 | 
-75 75 | # https://github.com/astral-sh/ruff/issues/18298
+69 | 
+70 |     def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041
+71 | 
+   -     def bad5(self, arg: int | (float | complex)) -> None: ...  # PYI041
+72 +     def bad5(self, arg: complex) -> None: ...  # PYI041
+73 | 
+74 | 
+75 | # https://github.com/astral-sh/ruff/issues/18298
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:78:23
@@ -335,15 +305,13 @@ PYI041 [*] Use `float` instead of `int | float`
 80 |     def f3(self, arg: None | float | None | int | None = None) -> None: ...  # PYI041 - with fix
    |
 help: Remove redundant type
-
-ℹ Safe fix
-75 75 | # https://github.com/astral-sh/ruff/issues/18298
-76 76 | # fix must not yield runtime `None | None | ...` (TypeError)
-77 77 | class Issue18298:
-78    |-    def f1(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
-   78 |+    def f1(self, arg: None | None | float = None) -> None: ...  # PYI041 - with fix
-79 79 | 
-80 80 |     def f3(self, arg: None | float | None | int | None = None) -> None: ...  # PYI041 - with fix
+75 | # https://github.com/astral-sh/ruff/issues/18298
+76 | # fix must not yield runtime `None | None | ...` (TypeError)
+77 | class Issue18298:
+   -     def f1(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
+78 +     def f1(self, arg: None | None | float = None) -> None: ...  # PYI041 - with fix
+79 | 
+80 |     def f3(self, arg: None | float | None | int | None = None) -> None: ...  # PYI041 - with fix
 
 PYI041 [*] Use `float` instead of `int | float`
   --> PYI041_1.pyi:80:23
@@ -354,10 +322,8 @@ PYI041 [*] Use `float` instead of `int | float`
    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove redundant type
-
-ℹ Safe fix
-77 77 | class Issue18298:
-78 78 |     def f1(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
-79 79 | 
-80    |-    def f3(self, arg: None | float | None | int | None = None) -> None: ...  # PYI041 - with fix
-   80 |+    def f3(self, arg: None | float | None | None = None) -> None: ...  # PYI041 - with fix
+77 | class Issue18298:
+78 |     def f1(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
+79 | 
+   -     def f3(self, arg: None | float | None | int | None = None) -> None: ...  # PYI041 - with fix
+80 +     def f3(self, arg: None | float | None | None = None) -> None: ...  # PYI041 - with fix
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap
index bf7da8eb1f..a135b05380 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap
@@ -10,13 +10,11 @@ PYI044 [*] `from __future__ import annotations` has no effect in stub files, sin
 3 | from __future__ import annotations, with_statement # PYI044.
   |
 help: Remove `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | # Bad import.
-2   |-from __future__ import annotations # PYI044.
-3 2 | from __future__ import annotations, with_statement # PYI044.
-4 3 | 
-5 4 | # Good imports.
+1 | # Bad import.
+  - from __future__ import annotations # PYI044.
+2 | from __future__ import annotations, with_statement # PYI044.
+3 | 
+4 | # Good imports.
 
 PYI044 [*] `from __future__ import annotations` has no effect in stub files, since type checkers automatically treat stubs as having those semantics
  --> PYI044.pyi:3:1
@@ -29,12 +27,10 @@ PYI044 [*] `from __future__ import annotations` has no effect in stub files, sin
 5 | # Good imports.
   |
 help: Remove `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | # Bad import.
-2 2 | from __future__ import annotations # PYI044.
-3   |-from __future__ import annotations, with_statement # PYI044.
-  3 |+from __future__ import with_statement # PYI044.
-4 4 | 
-5 5 | # Good imports.
-6 6 | from __future__ import with_statement
+1 | # Bad import.
+2 | from __future__ import annotations # PYI044.
+  - from __future__ import annotations, with_statement # PYI044.
+3 + from __future__ import with_statement # PYI044.
+4 | 
+5 | # Good imports.
+6 | from __future__ import with_statement
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap
index 0bd6da014d..3ec1a18844 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap
@@ -12,16 +12,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 9 | def f3(
   |
 help: Replace with `...`
-
-ℹ Safe fix
-4 4 | 
-5 5 | def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ...  # OK
-6 6 | def f2(
-7   |-    x: str = "51 character stringgggggggggggggggggggggggggggggggg",  # Error: PYI053
-  7 |+    x: str = ...,  # Error: PYI053
-8 8 | ) -> None: ...
-9 9 | def f3(
-10 10 |     x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
+4  | 
+5  | def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ...  # OK
+6  | def f2(
+   -     x: str = "51 character stringgggggggggggggggggggggggggggggggg",  # Error: PYI053
+7  +     x: str = ...,  # Error: PYI053
+8  | ) -> None: ...
+9  | def f3(
+10 |     x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:13:14
@@ -34,16 +32,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 15 | def f5(
    |
 help: Replace with `...`
-
-ℹ Safe fix
-10 10 |     x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
-11 11 | ) -> None: ...
-12 12 | def f4(
-13    |-    x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600",  # Error: PYI053
-   13 |+    x: str = ...,  # Error: PYI053
-14 14 | ) -> None: ...
-15 15 | def f5(
-16 16 |     x: bytes = b"50 character byte stringgggggggggggggggggggggggggg",  # OK
+10 |     x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
+11 | ) -> None: ...
+12 | def f4(
+   -     x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600",  # Error: PYI053
+13 +     x: str = ...,  # Error: PYI053
+14 | ) -> None: ...
+15 | def f5(
+16 |     x: bytes = b"50 character byte stringgggggggggggggggggggggggggg",  # OK
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:25:16
@@ -55,16 +51,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 26 | ) -> None: ...
    |
 help: Replace with `...`
-
-ℹ Safe fix
-22 22 |     x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff",  # OK
-23 23 | ) -> None: ...
-24 24 | def f8(
-25    |-    x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff",  # Error: PYI053
-   25 |+    x: bytes = ...,  # Error: PYI053
-26 26 | ) -> None: ...
-27 27 | 
-28 28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+22 |     x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff",  # OK
+23 | ) -> None: ...
+24 | def f8(
+   -     x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff",  # Error: PYI053
+25 +     x: bytes = ...,  # Error: PYI053
+26 | ) -> None: ...
+27 | 
+28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:30:12
@@ -77,16 +71,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
    |
 help: Replace with `...`
-
-ℹ Safe fix
-27 27 | 
-28 28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
-29 29 | 
-30    |-bar: str = "51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
-   30 |+bar: str = ...  # Error: PYI053
-31 31 | 
-32 32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
-33 33 | 
+27 | 
+28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+29 | 
+   - bar: str = "51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
+30 + bar: str = ...  # Error: PYI053
+31 | 
+32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+33 | 
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:34:14
@@ -99,16 +91,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
    |
 help: Replace with `...`
-
-ℹ Safe fix
-31 31 | 
-32 32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
-33 33 | 
-34    |-qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
-   34 |+qux: bytes = ...  # Error: PYI053
-35 35 | 
-36 36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-37 37 | 
+31 | 
+32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+33 | 
+   - qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
+34 + qux: bytes = ...  # Error: PYI053
+35 | 
+36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
+37 | 
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:38:13
@@ -121,16 +111,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 40 | class Demo:
    |
 help: Replace with `...`
-
-ℹ Safe fix
-35 35 | 
-36 36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-37 37 | 
-38    |-fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
-   38 |+fbar: str = ...  # Error: PYI053
-39 39 | 
-40 40 | class Demo:
-41 41 |     """Docstrings are excluded from this rule. Some padding."""  # OK
+35 | 
+36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
+37 | 
+   - fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
+38 + fbar: str = ...  # Error: PYI053
+39 | 
+40 | class Demo:
+41 |     """Docstrings are excluded from this rule. Some padding."""  # OK
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:64:5
@@ -142,16 +130,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 66 | def not_a_deprecated_function() -> None: ...
    |
 help: Replace with `...`
-
-ℹ Safe fix
-61 61 | ) -> Callable[[Callable[[], None]], Callable[[], None]]: ...
-62 62 | 
-63 63 | @not_warnings_dot_deprecated(
-64    |-    "Not warnings.deprecated, so this one *should* lead to PYI053 in a stub!"  # Error: PYI053
-   64 |+    ...  # Error: PYI053
-65 65 | )
-66 66 | def not_a_deprecated_function() -> None: ...
-67 67 | 
+61 | ) -> Callable[[Callable[[], None]], Callable[[], None]]: ...
+62 | 
+63 | @not_warnings_dot_deprecated(
+   -     "Not warnings.deprecated, so this one *should* lead to PYI053 in a stub!"  # Error: PYI053
+64 +     ...  # Error: PYI053
+65 | )
+66 | def not_a_deprecated_function() -> None: ...
+67 | 
 
 PYI053 [*] String and bytes literals longer than 50 characters are not permitted
   --> PYI053.pyi:68:13
@@ -164,13 +150,11 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted
 70 | from typing import TypeAlias, Literal, Annotated
    |
 help: Replace with `...`
-
-ℹ Safe fix
-65 65 | )
-66 66 | def not_a_deprecated_function() -> None: ...
-67 67 | 
-68    |-fbaz: str = f"51 character {foo} stringgggggggggggggggggggggggggg"  # Error: PYI053
-   68 |+fbaz: str = ...  # Error: PYI053
-69 69 | 
-70 70 | from typing import TypeAlias, Literal, Annotated
-71 71 |
+65 | )
+66 | def not_a_deprecated_function() -> None: ...
+67 | 
+   - fbaz: str = f"51 character {foo} stringgggggggggggggggggggggggggg"  # Error: PYI053
+68 + fbaz: str = ...  # Error: PYI053
+69 | 
+70 | from typing import TypeAlias, Literal, Annotated
+71 |
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap
index 2b9d8538c0..813cf43e37 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap
@@ -11,14 +11,12 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 4 | field04: int = -0xFFFFFFFFF  # Error: PYI054
   |
 help: Replace with `...`
-
-ℹ Safe 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 | 
+1 | field01: int = 0xFFFFFFFF
+  - field02: int = 0xFFFFFFFFF  # Error: PYI054
+2 + field02: int = ...  # Error: PYI054
+3 | field03: int = -0xFFFFFFFF
+4 | field04: int = -0xFFFFFFFFF  # Error: PYI054
+5 | 
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
  --> PYI054.pyi:4:17
@@ -31,16 +29,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 6 | field05: int = 1234567890
   |
 help: Replace with `...`
-
-ℹ Safe 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
+1 | field01: int = 0xFFFFFFFF
+2 | field02: int = 0xFFFFFFFFF  # Error: PYI054
+3 | field03: int = -0xFFFFFFFF
+  - field04: int = -0xFFFFFFFFF  # Error: PYI054
+4 + field04: int = -...  # Error: PYI054
+5 | 
+6 | field05: int = 1234567890
+7 | field06: int = 12_456_890
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
   --> PYI054.pyi:8:16
@@ -53,16 +49,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 10 | field09: int = -234_567_890  # Error: PYI054
    |
 help: Replace with `...`
-
-ℹ Safe 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 | 
+5  | 
+6  | field05: int = 1234567890
+7  | field06: int = 12_456_890
+   - field07: int = 12345678901  # Error: PYI054
+8  + field07: int = ...  # Error: PYI054
+9  | field08: int = -1234567801
+10 | field09: int = -234_567_890  # Error: PYI054
+11 | 
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
   --> PYI054.pyi:10:17
@@ -75,16 +69,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 12 | field10: float = 123.456789
    |
 help: Replace with `...`
-
-ℹ Safe 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
+7  | field06: int = 12_456_890
+8  | field07: int = 12345678901  # Error: PYI054
+9  | field08: int = -1234567801
+   - field09: int = -234_567_890  # Error: PYI054
+10 + field09: int = -...  # Error: PYI054
+11 | 
+12 | field10: float = 123.456789
+13 | field11: float = 123.4567890  # Error: PYI054
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
   --> PYI054.pyi:13:18
@@ -96,16 +88,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 15 | field13: float = -123.567_890  # Error: PYI054
    |
 help: Replace with `...`
-
-ℹ Safe 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 | 
+10 | field09: int = -234_567_890  # Error: PYI054
+11 | 
+12 | field10: float = 123.456789
+   - field11: float = 123.4567890  # Error: PYI054
+13 + field11: float = ...  # Error: PYI054
+14 | field12: float = -123.456789
+15 | field13: float = -123.567_890  # Error: PYI054
+16 | 
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
   --> PYI054.pyi:15:19
@@ -118,16 +108,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 17 | field14: complex = 1e1234567j
    |
 help: Replace with `...`
-
-ℹ Safe 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
+12 | field10: float = 123.456789
+13 | field11: float = 123.4567890  # Error: PYI054
+14 | field12: float = -123.456789
+   - field13: float = -123.567_890  # Error: PYI054
+15 + field13: float = -...  # Error: PYI054
+16 | 
+17 | field14: complex = 1e1234567j
+18 | field15: complex = 1e12345678j  # Error: PYI054
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
   --> PYI054.pyi:18:20
@@ -139,15 +127,13 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
 20 | field17: complex = 1e123456789j  # Error: PYI054
    |
 help: Replace with `...`
-
-ℹ Safe 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
+15 | field13: float = -123.567_890  # Error: PYI054
+16 | 
+17 | field14: complex = 1e1234567j
+   - field15: complex = 1e12345678j  # Error: PYI054
+18 + field15: complex = ...  # Error: PYI054
+19 | field16: complex = -1e1234567j
+20 | field17: complex = 1e123456789j  # Error: PYI054
 
 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
   --> PYI054.pyi:20:20
@@ -158,10 +144,8 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact
    |                    ^^^^^^^^^^^^
    |
 help: Replace with `...`
-
-ℹ Safe 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
+17 | field14: complex = 1e1234567j
+18 | field15: complex = 1e12345678j  # Error: PYI054
+19 | field16: complex = -1e1234567j
+   - field17: complex = 1e123456789j  # Error: PYI054
+20 + field17: complex = ...  # Error: PYI054
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap
index a1ec7eed26..8192743812 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap
@@ -1,6 +1,196 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pyi/mod.rs
 ---
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | complex]`.
+ --> PYI055.py:4:4
+  |
+2 | from typing import Union
+3 |
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 | t: type[int] | type[str] | type[float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+  |
+help: Combine multiple `type` members
+1 | import builtins
+2 | from typing import Union
+3 | 
+  - s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+4 + s: type[int | str | complex]
+5 | t: type[int] | type[str] | type[float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+7 | v: Union[type[float], type[complex]]
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | float]`.
+ --> PYI055.py:5:4
+  |
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+5 | t: type[int] | type[str] | type[float]
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+7 | v: Union[type[float], type[complex]]
+  |
+help: Combine multiple `type` members
+2 | from typing import Union
+3 | 
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+  - t: type[int] | type[str] | type[float]
+5 + t: type[int | str | float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+7 | v: Union[type[float], type[complex]]
+8 | w: Union[type[float | int], type[complex]]
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | complex]`.
+ --> PYI055.py:6:4
+  |
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+5 | t: type[int] | type[str] | type[float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 | v: Union[type[float], type[complex]]
+8 | w: Union[type[float | int], type[complex]]
+  |
+help: Combine multiple `type` members
+3 | 
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+5 | t: type[int] | type[str] | type[float]
+  - u: builtins.type[int] | type[str] | builtins.type[complex]
+6 + u: type[int | str | complex]
+7 | v: Union[type[float], type[complex]]
+8 | w: Union[type[float | int], type[complex]]
+9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[float, complex]]`.
+ --> PYI055.py:7:4
+  |
+5 | t: type[int] | type[str] | type[float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+7 | v: Union[type[float], type[complex]]
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 | w: Union[type[float | int], type[complex]]
+9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+  |
+help: Combine multiple `type` members
+4  | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+5  | t: type[int] | type[str] | type[float]
+6  | u: builtins.type[int] | type[str] | builtins.type[complex]
+   - v: Union[type[float], type[complex]]
+7  + v: type[Union[float, complex]]
+8  | w: Union[type[float | int], type[complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[float | int, complex]]`.
+  --> PYI055.py:8:4
+   |
+ 6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+ 7 | v: Union[type[float], type[complex]]
+ 8 | w: Union[type[float | int], type[complex]]
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+   |
+help: Combine multiple `type` members
+5  | t: type[int] | type[str] | type[float]
+6  | u: builtins.type[int] | type[str] | builtins.type[complex]
+7  | v: Union[type[float], type[complex]]
+   - w: Union[type[float | int], type[complex]]
+8  + w: type[Union[float | int, complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`.
+  --> PYI055.py:9:4
+   |
+ 7 | v: Union[type[float], type[complex]]
+ 8 | w: Union[type[float | int], type[complex]]
+ 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+   |
+help: Combine multiple `type` members
+6  | u: builtins.type[int] | type[str] | builtins.type[complex]
+7  | v: Union[type[float], type[complex]]
+8  | w: Union[type[float | int], type[complex]]
+   - x: Union[Union[type[Union[float, int]], type[complex]]]
+9  + x: type[Union[Union[float, int], complex]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+12 | 
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[float | int, complex]]`.
+  --> PYI055.py:10:4
+   |
+ 8 | w: Union[type[float | int], type[complex]]
+ 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+   |
+help: Combine multiple `type` members
+7  | v: Union[type[float], type[complex]]
+8  | w: Union[type[float | int], type[complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+   - y: Union[Union[Union[type[float | int], type[complex]]]]
+10 + y: type[Union[float | int, complex]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+12 | 
+13 | 
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[complex, Union[float, int]]]`.
+  --> PYI055.py:11:4
+   |
+ 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Combine multiple `type` members
+8  | w: Union[type[float | int], type[complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[float | int], type[complex]]]]
+   - z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+11 + z: type[Union[complex, Union[float, int]]]
+12 | 
+13 | 
+14 | def func(arg: type[int] | str | type[float]) -> None:
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | float]`.
+  --> PYI055.py:14:15
+   |
+14 | def func(arg: type[int] | str | type[float]) -> None:
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 |     ...
+   |
+help: Combine multiple `type` members
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+12 | 
+13 | 
+   - def func(arg: type[int] | str | type[float]) -> None:
+14 + def func(arg: type[int | float] | str) -> None:
+15 |     ...
+16 | 
+17 | 
+
+PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[requests_mock.Mocker | httpretty]`.
+  --> PYI055.py:29:7
+   |
+28 | # OK
+29 | item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Combine multiple `type` members
+26 | 
+27 | 
+28 | # OK
+   - item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
+29 + item: type[requests_mock.Mocker | httpretty] = requests_mock.Mocker
+30 | 
+31 | 
+32 | def func():
+
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[requests_mock.Mocker | httpretty | str]`.
   --> PYI055.py:34:8
    |
@@ -12,16 +202,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 36 |     z: Union[  # comment
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-31 31 | 
-32 32 | def func():
-33 33 |     # PYI055
-34    |-    x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
-   34 |+    x: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker
-35 35 |     y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-36 36 |     z: Union[  # comment
-37 37 |         type[requests_mock.Mocker], # another comment
+31 | 
+32 | def func():
+33 |     # PYI055
+   -     x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
+34 +     x: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker
+35 |     y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+36 |     z: Union[  # comment
+37 |         type[requests_mock.Mocker], # another comment
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`.
   --> PYI055.py:35:8
@@ -34,16 +222,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 37 |         type[requests_mock.Mocker], # another comment
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-32 32 | def func():
-33 33 |     # PYI055
-34 34 |     x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
-35    |-    y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-   35 |+    y: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
-36 36 |     z: Union[  # comment
-37 37 |         type[requests_mock.Mocker], # another comment
-38 38 |         type[httpretty], type[str]] = requests_mock.Mocker
+32 | def func():
+33 |     # PYI055
+34 |     x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
+   -     y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+35 +     y: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
+36 |     z: Union[  # comment
+37 |         type[requests_mock.Mocker], # another comment
+38 |         type[httpretty], type[str]] = requests_mock.Mocker
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`.
   --> PYI055.py:36:8
@@ -57,18 +243,17 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
    | |___________________________________^
    |
 help: Combine multiple `type` members
-
-ℹ Unsafe fix
-33 33 |     # PYI055
-34 34 |     x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
-35 35 |     y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-36    |-    z: Union[  # comment
-37    |-        type[requests_mock.Mocker], # another comment
-38    |-        type[httpretty], type[str]] = requests_mock.Mocker
-   36 |+    z: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
-39 37 | 
-40 38 | 
-41 39 | def func():
+33 |     # PYI055
+34 |     x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
+35 |     y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+   -     z: Union[  # comment
+   -         type[requests_mock.Mocker], # another comment
+   -         type[httpretty], type[str]] = requests_mock.Mocker
+36 +     z: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
+37 | 
+38 | 
+39 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`.
   --> PYI055.py:45:8
@@ -78,16 +263,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-42 42 |     from typing import Union as U
-43 43 | 
-44 44 |     # PYI055
-45    |-    x: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-   45 |+    x: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
-46 46 | 
-47 47 | 
-48 48 | def convert_union(union: UnionType) -> _T | None:
+42 |     from typing import Union as U
+43 | 
+44 |     # PYI055
+   -     x: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+45 +     x: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
+46 | 
+47 | 
+48 | def convert_union(union: UnionType) -> _T | None:
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`.
   --> PYI055.py:50:9
@@ -100,16 +283,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 52 |     ...
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-47 47 | 
-48 48 | def convert_union(union: UnionType) -> _T | None:
-49 49 |     converters: tuple[
-50    |-        type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-   50 |+        type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-51 51 |     ] = union.__args__
-52 52 |     ...
-53 53 | 
+47 | 
+48 | def convert_union(union: UnionType) -> _T | None:
+49 |     converters: tuple[
+   -         type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
+50 +         type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
+51 |     ] = union.__args__
+52 |     ...
+53 | 
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`.
   --> PYI055.py:56:9
@@ -122,16 +303,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 58 |     ...
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-53 53 | 
-54 54 | def convert_union(union: UnionType) -> _T | None:
-55 55 |     converters: tuple[
-56    |-        Union[type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T]], ...  # PYI055
-   56 |+        type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-57 57 |     ] = union.__args__
-58 58 |     ...
-59 59 | 
+53 | 
+54 | def convert_union(union: UnionType) -> _T | None:
+55 |     converters: tuple[
+   -         Union[type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T]], ...  # PYI055
+56 +         type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
+57 |     ] = union.__args__
+58 |     ...
+59 | 
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`.
   --> PYI055.py:62:9
@@ -144,16 +323,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 64 |     ...
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-59 59 | 
-60 60 | def convert_union(union: UnionType) -> _T | None:
-61 61 |     converters: tuple[
-62    |-        Union[type[_T] | type[Converter[_T]]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-   62 |+        type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-63 63 |     ] = union.__args__
-64 64 |     ...
-65 65 | 
+59 | 
+60 | def convert_union(union: UnionType) -> _T | None:
+61 |     converters: tuple[
+   -         Union[type[_T] | type[Converter[_T]]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
+62 +         type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
+63 |     ] = union.__args__
+64 |     ...
+65 | 
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`.
   --> PYI055.py:68:9
@@ -166,13 +343,11 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 70 |     ...
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-65 65 | 
-66 66 | def convert_union(union: UnionType) -> _T | None:
-67 67 |     converters: tuple[
-68    |-        Union[type[_T] | type[Converter[_T]] | str] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-   68 |+        type[_T | Converter[_T]] | str | Converter[_T] | Callable[[str], _T], ...  # PYI055
-69 69 |     ] = union.__args__
-70 70 |     ...
-71 71 |
+65 | 
+66 | def convert_union(union: UnionType) -> _T | None:
+67 |     converters: tuple[
+   -         Union[type[_T] | type[Converter[_T]] | str] | Converter[_T] | Callable[[str], _T], ...  # PYI055
+68 +         type[_T | Converter[_T]] | str | Converter[_T] | Callable[[str], _T], ...  # PYI055
+69 |     ] = union.__args__
+70 |     ...
+71 |
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap
index d921242df6..e86808c585 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap
@@ -12,16 +12,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 6 | u: builtins.type[int] | type[str] | builtins.type[complex]
   |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-1 1 | import builtins
-2 2 | from typing import Union
-3 3 | 
-4   |-s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
-  4 |+s: type[int | str | complex]
-5 5 | t: type[int] | type[str] | type[float]
-6 6 | u: builtins.type[int] | type[str] | builtins.type[complex]
-7 7 | v: Union[type[float], type[complex]]
+1 | import builtins
+2 | from typing import Union
+3 | 
+  - s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+4 + s: type[int | str | complex]
+5 | t: type[int] | type[str] | type[float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+7 | v: Union[type[float], type[complex]]
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | float]`.
  --> PYI055.pyi:5:4
@@ -33,16 +31,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 7 | v: Union[type[float], type[complex]]
   |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-2 2 | from typing import Union
-3 3 | 
-4 4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
-5   |-t: type[int] | type[str] | type[float]
-  5 |+t: type[int | str | float]
-6 6 | u: builtins.type[int] | type[str] | builtins.type[complex]
-7 7 | v: Union[type[float], type[complex]]
-8 8 | w: Union[type[Union[float, int]], type[complex]]
+2 | from typing import Union
+3 | 
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+  - t: type[int] | type[str] | type[float]
+5 + t: type[int | str | float]
+6 | u: builtins.type[int] | type[str] | builtins.type[complex]
+7 | v: Union[type[float], type[complex]]
+8 | w: Union[type[Union[float, int]], type[complex]]
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | complex]`.
  --> PYI055.pyi:6:4
@@ -55,16 +51,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 8 | w: Union[type[Union[float, int]], type[complex]]
   |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-3 3 | 
-4 4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
-5 5 | t: type[int] | type[str] | type[float]
-6   |-u: builtins.type[int] | type[str] | builtins.type[complex]
-  6 |+u: type[int | str | complex]
-7 7 | v: Union[type[float], type[complex]]
-8 8 | w: Union[type[Union[float, int]], type[complex]]
-9 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
+3 | 
+4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+5 | t: type[int] | type[str] | type[float]
+  - u: builtins.type[int] | type[str] | builtins.type[complex]
+6 + u: type[int | str | complex]
+7 | v: Union[type[float], type[complex]]
+8 | w: Union[type[Union[float, int]], type[complex]]
+9 | x: Union[Union[type[Union[float, int]], type[complex]]]
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[float, complex]]`.
  --> PYI055.pyi:7:4
@@ -77,16 +71,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
   |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-4 4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
-5 5 | t: type[int] | type[str] | type[float]
-6 6 | u: builtins.type[int] | type[str] | builtins.type[complex]
-7   |-v: Union[type[float], type[complex]]
-  7 |+v: type[Union[float, complex]]
-8 8 | w: Union[type[Union[float, int]], type[complex]]
-9 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
-10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
+4  | s: builtins.type[int] | builtins.type[str] | builtins.type[complex]
+5  | t: type[int] | type[str] | type[float]
+6  | u: builtins.type[int] | type[str] | builtins.type[complex]
+   - v: Union[type[float], type[complex]]
+7  + v: type[Union[float, complex]]
+8  | w: Union[type[Union[float, int]], type[complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`.
   --> PYI055.pyi:8:4
@@ -99,16 +91,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-5 5 | t: type[int] | type[str] | type[float]
-6 6 | u: builtins.type[int] | type[str] | builtins.type[complex]
-7 7 | v: Union[type[float], type[complex]]
-8   |-w: Union[type[Union[float, int]], type[complex]]
-  8 |+w: type[Union[Union[float, int], complex]]
-9 9 | x: Union[Union[type[Union[float, int]], type[complex]]]
-10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
-11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+5  | t: type[int] | type[str] | type[float]
+6  | u: builtins.type[int] | type[str] | builtins.type[complex]
+7  | v: Union[type[float], type[complex]]
+   - w: Union[type[Union[float, int]], type[complex]]
+8  + w: type[Union[Union[float, int], complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`.
   --> PYI055.pyi:9:4
@@ -121,16 +111,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-6  6  | u: builtins.type[int] | type[str] | builtins.type[complex]
-7  7  | v: Union[type[float], type[complex]]
-8  8  | w: Union[type[Union[float, int]], type[complex]]
-9     |-x: Union[Union[type[Union[float, int]], type[complex]]]
-   9  |+x: type[Union[Union[float, int], complex]]
-10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
-11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
-12 12 | 
+6  | u: builtins.type[int] | type[str] | builtins.type[complex]
+7  | v: Union[type[float], type[complex]]
+8  | w: Union[type[Union[float, int]], type[complex]]
+   - x: Union[Union[type[Union[float, int]], type[complex]]]
+9  + x: type[Union[Union[float, int], complex]]
+10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+12 | 
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`.
   --> PYI055.pyi:10:4
@@ -142,16 +130,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-7  7  | v: Union[type[float], type[complex]]
-8  8  | w: Union[type[Union[float, int]], type[complex]]
-9  9  | x: Union[Union[type[Union[float, int]], type[complex]]]
-10    |-y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
-   10 |+y: type[Union[Union[float, int], complex]]
-11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
-12 12 | 
-13 13 | def func(arg: type[int] | str | type[float]) -> None: ...
+7  | v: Union[type[float], type[complex]]
+8  | w: Union[type[Union[float, int]], type[complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+   - y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
+10 + y: type[Union[Union[float, int], complex]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+12 | 
+13 | def func(arg: type[int] | str | type[float]) -> None: ...
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[complex, Union[float, int]]]`.
   --> PYI055.pyi:11:4
@@ -164,16 +150,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 13 | def func(arg: type[int] | str | type[float]) -> None: ...
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-8  8  | w: Union[type[Union[float, int]], type[complex]]
-9  9  | x: Union[Union[type[Union[float, int]], type[complex]]]
-10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
-11    |-z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
-   11 |+z: type[Union[complex, Union[float, int]]]
-12 12 | 
-13 13 | def func(arg: type[int] | str | type[float]) -> None: ...
-14 14 | 
+8  | w: Union[type[Union[float, int]], type[complex]]
+9  | x: Union[Union[type[Union[float, int]], type[complex]]]
+10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
+   - z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+11 + z: type[Union[complex, Union[float, int]]]
+12 | 
+13 | def func(arg: type[int] | str | type[float]) -> None: ...
+14 | 
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | float]`.
   --> PYI055.pyi:13:15
@@ -186,16 +170,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 15 | # OK
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
-11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
-12 12 | 
-13    |-def func(arg: type[int] | str | type[float]) -> None: ...
-   13 |+def func(arg: type[int | float] | str) -> None: ...
-14 14 | 
-15 15 | # OK
-16 16 | x: type[int | str | float]
+10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]]
+11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]]
+12 | 
+   - def func(arg: type[int] | str | type[float]) -> None: ...
+13 + def func(arg: type[int | float] | str) -> None: ...
+14 | 
+15 | # OK
+16 | x: type[int | str | float]
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[requests_mock.Mocker | httpretty]`.
   --> PYI055.pyi:23:7
@@ -207,16 +189,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 25 | def func():
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-20 20 | def func(arg: type[int, float] | str) -> None: ...
-21 21 | 
-22 22 | # PYI055
-23    |-item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
-   23 |+item: type[requests_mock.Mocker | httpretty] = requests_mock.Mocker
-24 24 | 
-25 25 | def func():
-26 26 |     # PYI055
+20 | def func(arg: type[int, float] | str) -> None: ...
+21 | 
+22 | # PYI055
+   - item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
+23 + item: type[requests_mock.Mocker | httpretty] = requests_mock.Mocker
+24 | 
+25 | def func():
+26 |     # PYI055
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[requests_mock.Mocker | httpretty | str]`.
   --> PYI055.pyi:27:11
@@ -229,16 +209,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 29 |     item3: Union[  # comment
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-24 24 | 
-25 25 | def func():
-26 26 |     # PYI055
-27    |-    item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
-   27 |+    item: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker
-28 28 |     item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-29 29 |     item3: Union[  # comment
-30 30 |         type[requests_mock.Mocker], # another comment
+24 | 
+25 | def func():
+26 |     # PYI055
+   -     item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
+27 +     item: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker
+28 |     item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+29 |     item3: Union[  # comment
+30 |         type[requests_mock.Mocker], # another comment
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`.
   --> PYI055.pyi:28:12
@@ -251,16 +229,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
 30 |         type[requests_mock.Mocker], # another comment
    |
 help: Combine multiple `type` members
-
-ℹ Safe fix
-25 25 | def func():
-26 26 |     # PYI055
-27 27 |     item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
-28    |-    item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-   28 |+    item2: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
-29 29 |     item3: Union[  # comment
-30 30 |         type[requests_mock.Mocker], # another comment
-31 31 |         type[httpretty], type[str]] = requests_mock.Mocker
+25 | def func():
+26 |     # PYI055
+27 |     item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
+   -     item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+28 +     item2: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
+29 |     item3: Union[  # comment
+30 |         type[requests_mock.Mocker], # another comment
+31 |         type[httpretty], type[str]] = requests_mock.Mocker
 
 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`.
   --> PYI055.pyi:29:12
@@ -274,15 +250,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ
    | |___________________________________^
    |
 help: Combine multiple `type` members
-
-ℹ Unsafe fix
-26 26 |     # PYI055
-27 27 |     item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
-28 28 |     item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-29    |-    item3: Union[  # comment
-30    |-        type[requests_mock.Mocker], # another comment
-31    |-        type[httpretty], type[str]] = requests_mock.Mocker
-   29 |+    item3: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
-32 30 | 
-33 31 | 
-34 32 | # OK
+26 |     # PYI055
+27 |     item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker
+28 |     item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
+   -     item3: Union[  # comment
+   -         type[requests_mock.Mocker], # another comment
+   -         type[httpretty], type[str]] = requests_mock.Mocker
+29 +     item3: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker
+30 | 
+31 | 
+32 | # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap
index 19d08064d6..b4668d648b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap
@@ -10,18 +10,16 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 6 |             ...  # PYI058 (use `Iterator`)
   |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-  1 |+from collections.abc import Iterator
-1 2 | def scope():
-2 3 |     from collections.abc import Generator
-3 4 | 
-4 5 |     class IteratorReturningSimpleGenerator1:
-5   |-        def __iter__(self) -> Generator:
-  6 |+        def __iter__(self) -> Iterator:
-6 7 |             ...  # PYI058 (use `Iterator`)
-7 8 | 
-8 9 | 
+1 + from collections.abc import Iterator
+2 | def scope():
+3 |     from collections.abc import Generator
+4 | 
+5 |     class IteratorReturningSimpleGenerator1:
+  -         def __iter__(self) -> Generator:
+6 +         def __iter__(self) -> Iterator:
+7 |             ...  # PYI058 (use `Iterator`)
+8 | 
+9 | 
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.py:13:13
@@ -32,16 +30,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 14 |             ...  # PYI058 (use `Iterator`)
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-10 10 |     import typing
-11 11 | 
-12 12 |     class IteratorReturningSimpleGenerator2:
-13    |-        def __iter__(self) -> typing.Generator:
-   13 |+        def __iter__(self) -> typing.Iterator:
-14 14 |             ...  # PYI058 (use `Iterator`)
-15 15 | 
-16 16 | 
+10 |     import typing
+11 | 
+12 |     class IteratorReturningSimpleGenerator2:
+   -         def __iter__(self) -> typing.Generator:
+13 +         def __iter__(self) -> typing.Iterator:
+14 |             ...  # PYI058 (use `Iterator`)
+15 | 
+16 | 
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.py:21:13
@@ -52,16 +48,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 22 |             ...  # PYI058 (use `Iterator`)
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-18 18 |     import collections.abc
-19 19 | 
-20 20 |     class IteratorReturningSimpleGenerator3:
-21    |-        def __iter__(self) -> collections.abc.Generator:
-   21 |+        def __iter__(self) -> collections.abc.Iterator:
-22 22 |             ...  # PYI058 (use `Iterator`)
-23 23 | 
-24 24 | 
+18 |     import collections.abc
+19 | 
+20 |     class IteratorReturningSimpleGenerator3:
+   -         def __iter__(self) -> collections.abc.Generator:
+21 +         def __iter__(self) -> collections.abc.Iterator:
+22 |             ...  # PYI058 (use `Iterator`)
+23 | 
+24 | 
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.py:30:13
@@ -72,16 +66,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 31 |             ...  # PYI058 (use `Iterator`)
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-27 27 |     from typing import Any
-28 28 | 
-29 29 |     class IteratorReturningSimpleGenerator4:
-30    |-        def __iter__(self, /) -> collections.abc.Generator[str, Any, None]:
-   30 |+        def __iter__(self, /) -> collections.abc.Iterator[str]:
-31 31 |             ...  # PYI058 (use `Iterator`)
-32 32 | 
-33 33 | 
+27 |     from typing import Any
+28 | 
+29 |     class IteratorReturningSimpleGenerator4:
+   -         def __iter__(self, /) -> collections.abc.Generator[str, Any, None]:
+30 +         def __iter__(self, /) -> collections.abc.Iterator[str]:
+31 |             ...  # PYI058 (use `Iterator`)
+32 | 
+33 | 
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.py:39:13
@@ -92,16 +84,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 40 |             ...  # PYI058 (use `Iterator`)
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-36 36 |     import typing
-37 37 | 
-38 38 |     class IteratorReturningSimpleGenerator5:
-39    |-        def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]:
-   39 |+        def __iter__(self, /) -> collections.abc.Iterator[str]:
-40 40 |             ...  # PYI058 (use `Iterator`)
-41 41 | 
-42 42 | 
+36 |     import typing
+37 | 
+38 |     class IteratorReturningSimpleGenerator5:
+   -         def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]:
+39 +         def __iter__(self, /) -> collections.abc.Iterator[str]:
+40 |             ...  # PYI058 (use `Iterator`)
+41 | 
+42 | 
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.py:47:13
@@ -112,21 +102,19 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 48 |             ...  # PYI058 (use `Iterator`)
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-   1  |+from collections.abc import Iterator
-1  2  | def scope():
-2  3  |     from collections.abc import Generator
-3  4  | 
+1  + from collections.abc import Iterator
+2  | def scope():
+3  |     from collections.abc import Generator
+4  | 
 --------------------------------------------------------------------------------
-44 45 |     from collections.abc import Generator
-45 46 | 
-46 47 |     class IteratorReturningSimpleGenerator6:
-47    |-        def __iter__(self, /) -> Generator[str, None, None]:
-   48 |+        def __iter__(self, /) -> Iterator[str]:
-48 49 |             ...  # PYI058 (use `Iterator`)
-49 50 | 
-50 51 | 
+45 |     from collections.abc import Generator
+46 | 
+47 |     class IteratorReturningSimpleGenerator6:
+   -         def __iter__(self, /) -> Generator[str, None, None]:
+48 +         def __iter__(self, /) -> Iterator[str]:
+49 |             ...  # PYI058 (use `Iterator`)
+50 | 
+51 | 
 
 PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods
   --> PYI058.py:55:13
@@ -138,16 +126,14 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method
 57 |         ) -> typing_extensions.AsyncGenerator:
    |
 help: Convert the return annotation of your `__aiter__` method to `AsyncIterator`
-
-ℹ Safe fix
-54 54 |     class AsyncIteratorReturningSimpleAsyncGenerator1:
-55 55 |         def __aiter__(
-56 56 |             self,
-57    |-        ) -> typing_extensions.AsyncGenerator:
-   57 |+        ) -> typing_extensions.AsyncIterator:
-58 58 |             ...  # PYI058 (Use `AsyncIterator`)
-59 59 | 
-60 60 | 
+54 |     class AsyncIteratorReturningSimpleAsyncGenerator1:
+55 |         def __aiter__(
+56 |             self,
+   -         ) -> typing_extensions.AsyncGenerator:
+57 +         ) -> typing_extensions.AsyncIterator:
+58 |             ...  # PYI058 (Use `AsyncIterator`)
+59 | 
+60 | 
 
 PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods
   --> PYI058.py:73:13
@@ -158,13 +144,11 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method
 74 |             ...  # PYI058 (Use `AsyncIterator`)
    |
 help: Convert the return annotation of your `__aiter__` method to `AsyncIterator`
-
-ℹ Safe fix
-70 70 |     import collections.abc
-71 71 | 
-72 72 |     class AsyncIteratorReturningSimpleAsyncGenerator3:
-73    |-        def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]:
-   73 |+        def __aiter__(self, /) -> collections.abc.AsyncIterator[str]:
-74 74 |             ...  # PYI058 (Use `AsyncIterator`)
-75 75 | 
-76 76 |
+70 |     import collections.abc
+71 | 
+72 |     class AsyncIteratorReturningSimpleAsyncGenerator3:
+   -         def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]:
+73 +         def __aiter__(self, /) -> collections.abc.AsyncIterator[str]:
+74 |             ...  # PYI058 (Use `AsyncIterator`)
+75 | 
+76 |
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap
index bb0d2ac135..6c5cf0e577 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap
@@ -11,18 +11,16 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 7 | def scope():
   |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-  1 |+from collections.abc import Iterator
-1 2 | def scope():
-2 3 |     from collections.abc import Generator
-3 4 | 
-4 5 |     class IteratorReturningSimpleGenerator1:
-5   |-        def __iter__(self) -> Generator: ...  # PYI058 (use `Iterator`)
-  6 |+        def __iter__(self) -> Iterator: ...  # PYI058 (use `Iterator`)
-6 7 | 
-7 8 | def scope():
-8 9 |     import typing
+1 + from collections.abc import Iterator
+2 | def scope():
+3 |     from collections.abc import Generator
+4 | 
+5 |     class IteratorReturningSimpleGenerator1:
+  -         def __iter__(self) -> Generator: ...  # PYI058 (use `Iterator`)
+6 +         def __iter__(self) -> Iterator: ...  # PYI058 (use `Iterator`)
+7 | 
+8 | def scope():
+9 |     import typing
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.pyi:11:13
@@ -34,16 +32,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 13 | def scope():
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-8  8  |     import typing
-9  9  | 
-10 10 |     class IteratorReturningSimpleGenerator2:
-11    |-        def __iter__(self) -> typing.Generator: ...  # PYI058 (use `Iterator`)
-   11 |+        def __iter__(self) -> typing.Iterator: ...  # PYI058 (use `Iterator`)
-12 12 | 
-13 13 | def scope():
-14 14 |     import collections.abc
+8  |     import typing
+9  | 
+10 |     class IteratorReturningSimpleGenerator2:
+   -         def __iter__(self) -> typing.Generator: ...  # PYI058 (use `Iterator`)
+11 +         def __iter__(self) -> typing.Iterator: ...  # PYI058 (use `Iterator`)
+12 | 
+13 | def scope():
+14 |     import collections.abc
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.pyi:17:13
@@ -55,16 +51,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 19 | def scope():
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-14 14 |     import collections.abc
-15 15 | 
-16 16 |     class IteratorReturningSimpleGenerator3:
-17    |-        def __iter__(self) -> collections.abc.Generator: ...  # PYI058 (use `Iterator`)
-   17 |+        def __iter__(self) -> collections.abc.Iterator: ...  # PYI058 (use `Iterator`)
-18 18 | 
-19 19 | def scope():
-20 20 |     import collections.abc
+14 |     import collections.abc
+15 | 
+16 |     class IteratorReturningSimpleGenerator3:
+   -         def __iter__(self) -> collections.abc.Generator: ...  # PYI058 (use `Iterator`)
+17 +         def __iter__(self) -> collections.abc.Iterator: ...  # PYI058 (use `Iterator`)
+18 | 
+19 | def scope():
+20 |     import collections.abc
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.pyi:24:13
@@ -76,16 +70,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 26 | def scope():
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-21 21 |     from typing import Any
-22 22 | 
-23 23 |     class IteratorReturningSimpleGenerator4:
-24    |-        def __iter__(self, /) -> collections.abc.Generator[str, Any, None]: ...  # PYI058 (use `Iterator`)
-   24 |+        def __iter__(self, /) -> collections.abc.Iterator[str]: ...  # PYI058 (use `Iterator`)
-25 25 | 
-26 26 | def scope():
-27 27 |     import collections.abc
+21 |     from typing import Any
+22 | 
+23 |     class IteratorReturningSimpleGenerator4:
+   -         def __iter__(self, /) -> collections.abc.Generator[str, Any, None]: ...  # PYI058 (use `Iterator`)
+24 +         def __iter__(self, /) -> collections.abc.Iterator[str]: ...  # PYI058 (use `Iterator`)
+25 | 
+26 | def scope():
+27 |     import collections.abc
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.pyi:31:13
@@ -97,16 +89,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 33 | def scope():
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-28 28 |     import typing
-29 29 | 
-30 30 |     class IteratorReturningSimpleGenerator5:
-31    |-        def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]: ...  # PYI058 (use `Iterator`)
-   31 |+        def __iter__(self, /) -> collections.abc.Iterator[str]: ...  # PYI058 (use `Iterator`)
-32 32 | 
-33 33 | def scope():
-34 34 |     from collections.abc import Generator
+28 |     import typing
+29 | 
+30 |     class IteratorReturningSimpleGenerator5:
+   -         def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]: ...  # PYI058 (use `Iterator`)
+31 +         def __iter__(self, /) -> collections.abc.Iterator[str]: ...  # PYI058 (use `Iterator`)
+32 | 
+33 | def scope():
+34 |     from collections.abc import Generator
 
 PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
   --> PYI058.pyi:37:13
@@ -118,21 +108,19 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods
 39 | def scope():
    |
 help: Convert the return annotation of your `__iter__` method to `Iterator`
-
-ℹ Safe fix
-   1  |+from collections.abc import Iterator
-1  2  | def scope():
-2  3  |     from collections.abc import Generator
-3  4  | 
+1  + from collections.abc import Iterator
+2  | def scope():
+3  |     from collections.abc import Generator
+4  | 
 --------------------------------------------------------------------------------
-34 35 |     from collections.abc import Generator
-35 36 | 
-36 37 |     class IteratorReturningSimpleGenerator6:
-37    |-        def __iter__(self, /) -> Generator[str, None, None]: ...  # PYI058 (use `Iterator`)
-   38 |+        def __iter__(self, /) -> Iterator[str]: ...  # PYI058 (use `Iterator`)
-38 39 | 
-39 40 | def scope():
-40 41 |     import typing_extensions
+35 |     from collections.abc import Generator
+36 | 
+37 |     class IteratorReturningSimpleGenerator6:
+   -         def __iter__(self, /) -> Generator[str, None, None]: ...  # PYI058 (use `Iterator`)
+38 +         def __iter__(self, /) -> Iterator[str]: ...  # PYI058 (use `Iterator`)
+39 | 
+40 | def scope():
+41 |     import typing_extensions
 
 PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods
   --> PYI058.pyi:43:13
@@ -144,16 +132,14 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method
 45 | def scope():
    |
 help: Convert the return annotation of your `__aiter__` method to `AsyncIterator`
-
-ℹ Safe fix
-40 40 |     import typing_extensions
-41 41 | 
-42 42 |     class AsyncIteratorReturningSimpleAsyncGenerator1:
-43    |-        def __aiter__(self,) -> typing_extensions.AsyncGenerator: ...  # PYI058 (Use `AsyncIterator`)
-   43 |+        def __aiter__(self,) -> typing_extensions.AsyncIterator: ...  # PYI058 (Use `AsyncIterator`)
-44 44 | 
-45 45 | def scope():
-46 46 |     import collections.abc
+40 |     import typing_extensions
+41 | 
+42 |     class AsyncIteratorReturningSimpleAsyncGenerator1:
+   -         def __aiter__(self,) -> typing_extensions.AsyncGenerator: ...  # PYI058 (Use `AsyncIterator`)
+43 +         def __aiter__(self,) -> typing_extensions.AsyncIterator: ...  # PYI058 (Use `AsyncIterator`)
+44 | 
+45 | def scope():
+46 |     import collections.abc
 
 PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods
   --> PYI058.pyi:49:13
@@ -164,16 +150,14 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method
 50 |             ...  # PYI058 (Use `AsyncIterator`)
    |
 help: Convert the return annotation of your `__aiter__` method to `AsyncIterator`
-
-ℹ Safe fix
-46 46 |     import collections.abc
-47 47 | 
-48 48 |     class AsyncIteratorReturningSimpleAsyncGenerator3:
-49    |-        def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]:
-   49 |+        def __aiter__(self, /) -> collections.abc.AsyncIterator[str]:
-50 50 |             ...  # PYI058 (Use `AsyncIterator`)
-51 51 | 
-52 52 | def scope():
+46 |     import collections.abc
+47 | 
+48 |     class AsyncIteratorReturningSimpleAsyncGenerator3:
+   -         def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]:
+49 +         def __aiter__(self, /) -> collections.abc.AsyncIterator[str]:
+50 |             ...  # PYI058 (Use `AsyncIterator`)
+51 | 
+52 | def scope():
 
 PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods
   --> PYI058.pyi:56:13
@@ -185,13 +169,11 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method
 58 | def scope():
    |
 help: Convert the return annotation of your `__aiter__` method to `AsyncIterator`
-
-ℹ Safe fix
-53 53 |     import collections.abc
-54 54 | 
-55 55 |     class AsyncIteratorReturningSimpleAsyncGenerator3:
-56    |-        def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: ...  # PYI058 (Use `AsyncIterator`)
-   56 |+        def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: ...  # PYI058 (Use `AsyncIterator`)
-57 57 | 
-58 58 | def scope():
-59 59 |     from typing import Iterator
+53 |     import collections.abc
+54 | 
+55 |     class AsyncIteratorReturningSimpleAsyncGenerator3:
+   -         def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: ...  # PYI058 (Use `AsyncIterator`)
+56 +         def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: ...  # PYI058 (Use `AsyncIterator`)
+57 | 
+58 | def scope():
+59 |     from typing import Iterator
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap
index ccf22bb545..0ac7627e7f 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap
@@ -12,16 +12,15 @@ PYI059 [*] `Generic[]` should always be the last base class
 10 |         self._items: List[T] = []
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-5 5 | K = TypeVar('K')
-6 6 | V = TypeVar('V')
-7 7 | 
-8   |-class LinkedList(Generic[T], Sized):  # PYI059
-  8 |+class LinkedList(Sized, Generic[T]):  # PYI059
-9 9 |     def __init__(self) -> None:
-10 10 |         self._items: List[T] = []
-11 11 | 
+5  | K = TypeVar('K')
+6  | V = TypeVar('V')
+7  | 
+   - class LinkedList(Generic[T], Sized):  # PYI059
+8  + class LinkedList(Sized, Generic[T]):  # PYI059
+9  |     def __init__(self) -> None:
+10 |         self._items: List[T] = []
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.py:15:16
@@ -38,18 +37,17 @@ PYI059 [*] `Generic[]` should always be the last base class
 20 |       ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-13 13 |         self._items.append(item)
-14 14 | 
-15 15 | class MyMapping(  # PYI059
-16    |-    t.Generic[K, V],
-17 16 |     Iterable[Tuple[K, V]],
-18    |-    Container[Tuple[K, V]],
-   17 |+    Container[Tuple[K, V]], t.Generic[K, V],
-19 18 | ):
-20 19 |     ...
-21 20 | 
+13 |         self._items.append(item)
+14 | 
+15 | class MyMapping(  # PYI059
+   -     t.Generic[K, V],
+16 |     Iterable[Tuple[K, V]],
+   -     Container[Tuple[K, V]],
+17 +     Container[Tuple[K, V]], t.Generic[K, V],
+18 | ):
+19 |     ...
+20 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.py:26:10
@@ -61,16 +59,15 @@ PYI059 [*] `Generic[]` should always be the last base class
 27 |     pass
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-23 23 | # Inheriting from just `Generic` is a TypeError, but it's probably fine
-24 24 | # to flag this issue in this case as well, since after fixing the error
-25 25 | # the Generic's position issue persists.
-26    |-class Foo(Generic, LinkedList):  # PYI059
-   26 |+class Foo(LinkedList, Generic):  # PYI059
-27 27 |     pass
-28 28 | 
-29 29 | 
+23 | # Inheriting from just `Generic` is a TypeError, but it's probably fine
+24 | # to flag this issue in this case as well, since after fixing the error
+25 | # the Generic's position issue persists.
+   - class Foo(Generic, LinkedList):  # PYI059
+26 + class Foo(LinkedList, Generic):  # PYI059
+27 |     pass
+28 | 
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.py:30:10
@@ -91,22 +88,21 @@ PYI059 [*] `Generic[]` should always be the last base class
 41 |       ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-30 30 | class Foo(  # comment about the bracket
-31 31 |     # Part 1 of multiline comment 1
-32 32 |     # Part 2 of multiline comment 1
-33    |-    Generic[T]  # comment about Generic[T]  # PYI059
-34    |-    # another comment?
-35    |-    ,  # comment about the comma?
-   33 |+    # comment about the comma?
-36 34 |     # part 1 of multiline comment 2
-37 35 |     # part 2 of multiline comment 2
-38    |-    int,  # comment about int
-   36 |+    int, Generic[T],  # comment about int
-39 37 |     # yet another comment?
-40 38 | ):  # and another one for good measure
-41 39 |     ...
+30 | class Foo(  # comment about the bracket
+31 |     # Part 1 of multiline comment 1
+32 |     # Part 2 of multiline comment 1
+   -     Generic[T]  # comment about Generic[T]  # PYI059
+   -     # another comment?
+   -     ,  # comment about the comma?
+33 +     # comment about the comma?
+34 |     # part 1 of multiline comment 2
+35 |     # part 2 of multiline comment 2
+   -     int,  # comment about int
+36 +     int, Generic[T],  # comment about int
+37 |     # yet another comment?
+38 | ):  # and another one for good measure
+39 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 `Generic[]` should always be the last base class
   --> PYI059.py:45:8
@@ -127,16 +123,15 @@ PYI059 [*] `Generic[]` should always be the last base class
 60 |     ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-56 56 | 
-57 57 | # syntax errors with starred and keyword arguments from
-58 58 | # https://github.com/astral-sh/ruff/issues/18602
-59    |-class C1(Generic[T], str, **{"metaclass": type}):  # PYI059
-   59 |+class C1(str, Generic[T], **{"metaclass": type}):  # PYI059
-60 60 |     ...
-61 61 | 
-62 62 | class C2(Generic[T], str, metaclass=type):  # PYI059
+56 | 
+57 | # syntax errors with starred and keyword arguments from
+58 | # https://github.com/astral-sh/ruff/issues/18602
+   - class C1(Generic[T], str, **{"metaclass": type}):  # PYI059
+59 + class C1(str, Generic[T], **{"metaclass": type}):  # PYI059
+60 |     ...
+61 | 
+62 | class C2(Generic[T], str, metaclass=type):  # PYI059
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.py:62:9
@@ -148,16 +143,15 @@ PYI059 [*] `Generic[]` should always be the last base class
 63 |     ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-59 59 | class C1(Generic[T], str, **{"metaclass": type}):  # PYI059
-60 60 |     ...
-61 61 | 
-62    |-class C2(Generic[T], str, metaclass=type):  # PYI059
-   62 |+class C2(str, Generic[T], metaclass=type):  # PYI059
-63 63 |     ...
-64 64 | 
-65 65 | class C3(Generic[T], metaclass=type, *[str]):  # PYI059 but no fix
+59 | class C1(Generic[T], str, **{"metaclass": type}):  # PYI059
+60 |     ...
+61 | 
+   - class C2(Generic[T], str, metaclass=type):  # PYI059
+62 + class C2(str, Generic[T], metaclass=type):  # PYI059
+63 |     ...
+64 | 
+65 | class C3(Generic[T], metaclass=type, *[str]):  # PYI059 but no fix
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 `Generic[]` should always be the last base class
   --> PYI059.py:65:9
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap
index 318b646903..6a4c3e3f9f 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap
@@ -12,16 +12,15 @@ PYI059 [*] `Generic[]` should always be the last base class
 10 |     def push(self, item: T) -> None: ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-5 5 | K = TypeVar('K')
-6 6 | V = TypeVar('V')
-7 7 | 
-8   |-class LinkedList(Generic[T], Sized):  # PYI059
-  8 |+class LinkedList(Sized, Generic[T]):  # PYI059
-9 9 |     def __init__(self) -> None: ...
-10 10 |     def push(self, item: T) -> None: ...
-11 11 | 
+5  | K = TypeVar('K')
+6  | V = TypeVar('V')
+7  | 
+   - class LinkedList(Generic[T], Sized):  # PYI059
+8  + class LinkedList(Sized, Generic[T]):  # PYI059
+9  |     def __init__(self) -> None: ...
+10 |     def push(self, item: T) -> None: ...
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.pyi:12:16
@@ -38,18 +37,17 @@ PYI059 [*] `Generic[]` should always be the last base class
 17 |       ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-10 10 |     def push(self, item: T) -> None: ...
-11 11 | 
-12 12 | class MyMapping(  # PYI059
-13    |-    t.Generic[K, V],
-14 13 |     Iterable[Tuple[K, V]],
-15    |-    Container[Tuple[K, V]],
-   14 |+    Container[Tuple[K, V]], t.Generic[K, V],
-16 15 | ):
-17 16 |     ...
-18 17 | 
+10 |     def push(self, item: T) -> None: ...
+11 | 
+12 | class MyMapping(  # PYI059
+   -     t.Generic[K, V],
+13 |     Iterable[Tuple[K, V]],
+   -     Container[Tuple[K, V]],
+14 +     Container[Tuple[K, V]], t.Generic[K, V],
+15 | ):
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.pyi:22:10
@@ -60,16 +58,15 @@ PYI059 [*] `Generic[]` should always be the last base class
    |          ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-19 19 | # Inheriting from just `Generic` is a TypeError, but it's probably fine
-20 20 | # to flag this issue in this case as well, since after fixing the error
-21 21 | # the Generic's position issue persists.
-22    |-class Foo(Generic, LinkedList): ...  # PYI059
-   22 |+class Foo(LinkedList, Generic): ...  # PYI059
-23 23 | 
-24 24 | 
-25 25 | class Foo(  # comment about the bracket
+19 | # Inheriting from just `Generic` is a TypeError, but it's probably fine
+20 | # to flag this issue in this case as well, since after fixing the error
+21 | # the Generic's position issue persists.
+   - class Foo(Generic, LinkedList): ...  # PYI059
+22 + class Foo(LinkedList, Generic): ...  # PYI059
+23 | 
+24 | 
+25 | class Foo(  # comment about the bracket
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 [*] `Generic[]` should always be the last base class
   --> PYI059.pyi:25:10
@@ -90,22 +87,21 @@ PYI059 [*] `Generic[]` should always be the last base class
 36 |       ...
    |
 help: Move `Generic[]` to the end
-
-ℹ Unsafe fix
-25 25 | class Foo(  # comment about the bracket
-26 26 |     # Part 1 of multiline comment 1
-27 27 |     # Part 2 of multiline comment 1
-28    |-    Generic[T]  # comment about Generic[T]  # PYI059
-29    |-    # another comment?
-30    |-    ,  # comment about the comma?
-   28 |+    # comment about the comma?
-31 29 |     # part 1 of multiline comment 2
-32 30 |     # part 2 of multiline comment 2
-33    |-    int,  # comment about int
-   31 |+    int, Generic[T],  # comment about int
-34 32 |     # yet another comment?
-35 33 | ):  # and another one for good measure
-36 34 |     ...
+25 | class Foo(  # comment about the bracket
+26 |     # Part 1 of multiline comment 1
+27 |     # Part 2 of multiline comment 1
+   -     Generic[T]  # comment about Generic[T]  # PYI059
+   -     # another comment?
+   -     ,  # comment about the comma?
+28 +     # comment about the comma?
+29 |     # part 1 of multiline comment 2
+30 |     # part 2 of multiline comment 2
+   -     int,  # comment about int
+31 +     int, Generic[T],  # comment about int
+32 |     # yet another comment?
+33 | ):  # and another one for good measure
+34 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PYI059 `Generic[]` should always be the last base class
   --> PYI059.pyi:40:8
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap
index 524844413e..42a4d5de5d 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap
@@ -9,16 +9,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 5 |     ...
   |
 help: Replace with `None`
-
-ℹ Safe fix
-1 1 | from typing import Literal, Union
-2 2 | 
-3 3 | 
-4   |-def func1(arg1: Literal[None]):
-  4 |+def func1(arg1: None):
-5 5 |     ...
-6 6 | 
-7 7 | 
+1 | from typing import Literal, Union
+2 | 
+3 | 
+  - def func1(arg1: Literal[None]):
+4 + def func1(arg1: None):
+5 |     ...
+6 | 
+7 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
  --> PYI061.py:8:25
@@ -28,16 +26,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 9 |     ...
   |
 help: Replace with `None`
-
-ℹ Safe fix
-5 5 |     ...
-6 6 | 
-7 7 | 
-8   |-def func2(arg1: Literal[None] | int):
-  8 |+def func2(arg1: None | int):
-9 9 |     ...
-10 10 | 
-11 11 | 
+5  |     ...
+6  | 
+7  | 
+   - def func2(arg1: Literal[None] | int):
+8  + def func2(arg1: None | int):
+9  |     ...
+10 | 
+11 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:12:24
@@ -47,16 +43,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 13 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-9  9  |     ...
-10 10 | 
-11 11 | 
-12    |-def func3() -> Literal[None]:
-   12 |+def func3() -> None:
-13 13 |     ...
-14 14 | 
-15 15 | 
+9  |     ...
+10 | 
+11 | 
+   - def func3() -> Literal[None]:
+12 + def func3() -> None:
+13 |     ...
+14 | 
+15 | 
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:16:30
@@ -66,16 +60,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 17 |     ...
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-13 13 |     ...
-14 14 | 
-15 15 | 
-16    |-def func4(arg1: Literal[int, None, float]):
-   16 |+def func4(arg1: Literal[int, float] | None):
-17 17 |     ...
-18 18 | 
-19 19 | 
+13 |     ...
+14 | 
+15 | 
+   - def func4(arg1: Literal[int, None, float]):
+16 + def func4(arg1: Literal[int, float] | None):
+17 |     ...
+18 | 
+19 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:20:25
@@ -85,16 +77,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 21 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-17 17 |     ...
-18 18 | 
-19 19 | 
-20    |-def func5(arg1: Literal[None, None]):
-   20 |+def func5(arg1: None):
-21 21 |     ...
-22 22 | 
-23 23 | 
+17 |     ...
+18 | 
+19 | 
+   - def func5(arg1: Literal[None, None]):
+20 + def func5(arg1: None):
+21 |     ...
+22 | 
+23 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:20:31
@@ -104,16 +94,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 21 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-17 17 |     ...
-18 18 | 
-19 19 | 
-20    |-def func5(arg1: Literal[None, None]):
-   20 |+def func5(arg1: None):
-21 21 |     ...
-22 22 | 
-23 23 | 
+17 |     ...
+18 | 
+19 | 
+   - def func5(arg1: Literal[None, None]):
+20 + def func5(arg1: None):
+21 |     ...
+22 | 
+23 | 
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:26:5
@@ -126,20 +114,19 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 28 |     ]):
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Unsafe fix
-21 21 |     ...
-22 22 | 
-23 23 | 
-24    |-def func6(arg1: Literal[
-25    |-    "hello",
-26    |-    None  # Comment 1
-27    |-    , "world"
-28    |-    ]):
-   24 |+def func6(arg1: Literal["hello", "world"] | None):
-29 25 |     ...
-30 26 | 
-31 27 | 
+21 |     ...
+22 | 
+23 | 
+   - def func6(arg1: Literal[
+   -     "hello",
+   -     None  # Comment 1
+   -     , "world"
+   -     ]):
+24 + def func6(arg1: Literal["hello", "world"] | None):
+25 |     ...
+26 | 
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:33:5
@@ -151,18 +138,17 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 35 |     ...
    |
 help: Replace with `None`
-
-ℹ Unsafe fix
-29 29 |     ...
-30 30 | 
-31 31 | 
-32    |-def func7(arg1: Literal[
-33    |-    None  # Comment 1
-34    |-    ]):
-   32 |+def func7(arg1: None):
-35 33 |     ...
-36 34 | 
-37 35 | 
+29 |     ...
+30 | 
+31 | 
+   - def func7(arg1: Literal[
+   -     None  # Comment 1
+   -     ]):
+32 + def func7(arg1: None):
+33 |     ...
+34 | 
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.py:38:25
@@ -181,16 +167,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 43 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-39 39 |     ...
-40 40 | 
-41 41 | 
-42    |-def func9(arg1: Union[Literal[None], None]):
-   42 |+def func9(arg1: Union[None, None]):
-43 43 |     ...
-44 44 | 
-45 45 | 
+39 |     ...
+40 | 
+41 | 
+   - def func9(arg1: Union[Literal[None], None]):
+42 + def func9(arg1: Union[None, None]):
+43 |     ...
+44 | 
+45 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:52:9
@@ -201,16 +185,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 53 | Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-49 49 | 
-50 50 | 
-51 51 | # From flake8-pyi
-52    |-Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-   52 |+None  # Y061 None inside "Literal[]" expression. Replace with "None"
-53 53 | Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-54 54 | 
-55 55 | ###
+49 | 
+50 | 
+51 | # From flake8-pyi
+   - Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+52 + None  # Y061 None inside "Literal[]" expression. Replace with "None"
+53 | Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+54 | 
+55 | ###
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:53:15
@@ -223,16 +205,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 55 | ###
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-50 50 | 
-51 51 | # From flake8-pyi
-52 52 | Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-53    |-Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-   53 |+Literal[True] | None  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-54 54 | 
-55 55 | ###
-56 56 | # The following rules here are slightly subtle,
+50 | 
+51 | # From flake8-pyi
+52 | Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+53 + Literal[True] | None  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+54 | 
+55 | ###
+56 | # The following rules here are slightly subtle,
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:62:9
@@ -244,16 +224,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-59 59 | 
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62    |-Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-   62 |+None  # Y061 None inside "Literal[]" expression. Replace with "None"
-63 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
+59 | 
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+   - Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+62 + None  # Y061 None inside "Literal[]" expression. Replace with "None"
+63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:62:15
@@ -265,16 +243,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-59 59 | 
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62    |-Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-   62 |+None  # Y061 None inside "Literal[]" expression. Replace with "None"
-63 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
+59 | 
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+   - Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+62 + None  # Y061 None inside "Literal[]" expression. Replace with "None"
+63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:63:12
@@ -287,16 +263,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 65 | # ... but if Y061 and Y062 both apply
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62 62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-63    |-Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-   63 |+Literal[1, "foo"] | None  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+63 + Literal[1, "foo"] | None  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:63:25
@@ -309,16 +283,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 65 | # ... but if Y061 and Y062 both apply
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62 62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-63    |-Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-   63 |+Literal[1, "foo"] | None  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+63 + Literal[1, "foo"] | None  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:68:9
@@ -329,16 +301,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
    |         ^^^^
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
-67 67 | # only emit Y062:
-68    |-Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
-   68 |+Literal[True, True] | None  # Y062 Duplicate "Literal[]" member "True"
-69 69 | 
-70 70 | 
-71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
+67 | # only emit Y062:
+   - Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
+68 + Literal[True, True] | None  # Y062 Duplicate "Literal[]" member "True"
+69 | 
+70 | 
+71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.py:68:21
@@ -349,16 +319,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
    |                     ^^^^
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
-67 67 | # only emit Y062:
-68    |-Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
-   68 |+Literal[True, True] | None  # Y062 Duplicate "Literal[]" member "True"
-69 69 | 
-70 70 | 
-71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
+67 | # only emit Y062:
+   - Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
+68 + Literal[True, True] | None  # Y062 Duplicate "Literal[]" member "True"
+69 | 
+70 | 
+71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.py:72:12
@@ -393,16 +361,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 76 | a: int | Literal[None] | None
    |
 help: Replace with `None`
-
-ℹ Safe fix
-71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
-72 72 | x: Literal[None] | None
-73 73 | y: None | Literal[None]
-74    |-z: Union[Literal[None], None]
-   74 |+z: Union[None, None]
-75 75 | 
-76 76 | a: int | Literal[None] | None
-77 77 | b: None | Literal[None] | None
+71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+72 | x: Literal[None] | None
+73 | y: None | Literal[None]
+   - z: Union[Literal[None], None]
+74 + z: Union[None, None]
+75 | 
+76 | a: int | Literal[None] | None
+77 | b: None | Literal[None] | None
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.py:76:18
@@ -457,5 +423,117 @@ PYI061 Use `None` rather than `Literal[None]`
 79 | d: None | (Literal[None] | None)
 80 | e: None | ((None | Literal[None]) | None) | None
    |                            ^^^^
+81 |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
    |
 help: Replace with `None`
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:83:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   |                  ^^^^
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |
+help: Replace with `Literal[...] | None`
+80 | e: None | ((None | Literal[None]) | None) | None
+81 | 
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+   - print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+83 + print((Literal[1] | None).__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:84:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   |                  ^^^^
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |
+help: Replace with `Literal[...] | None`
+81 | 
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   - print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+84 + print((Literal[1] | None).method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:85:18
+   |
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |                  ^^^^
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |
+help: Replace with `Literal[...] | None`
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   - print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+85 + print((Literal[1] | None)[0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:86:18
+   |
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |                  ^^^^
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Literal[...] | None`
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   - print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+86 + print((Literal[1] | None) + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:87:18
+   |
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |                  ^^^^
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Literal[...] | None`
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   - print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+87 + print((Literal[1] | None) * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:88:19
+   |
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |                   ^^^^
+   |
+help: Replace with `Literal[...] | None`
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   - print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+88 + print((Literal[1] | None).__dict__)  # Should become ((Literal[1] | None)).__dict__
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap
index 181432a325..34fbd2eb2b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap
@@ -8,16 +8,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
   |                         ^^^^
   |
 help: Replace with `None`
-
-ℹ Safe fix
-1 1 | from typing import Literal, Union
-2 2 | 
-3 3 | 
-4   |-def func1(arg1: Literal[None]): ...
-  4 |+def func1(arg1: None): ...
-5 5 | 
-6 6 | 
-7 7 | def func2(arg1: Literal[None] | int): ...
+1 | from typing import Literal, Union
+2 | 
+3 | 
+  - def func1(arg1: Literal[None]): ...
+4 + def func1(arg1: None): ...
+5 | 
+6 | 
+7 | def func2(arg1: Literal[None] | int): ...
 
 PYI061 [*] Use `None` rather than `Literal[None]`
  --> PYI061.pyi:7:25
@@ -26,16 +24,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
   |                         ^^^^
   |
 help: Replace with `None`
-
-ℹ Safe fix
-4 4 | def func1(arg1: Literal[None]): ...
-5 5 | 
-6 6 | 
-7   |-def func2(arg1: Literal[None] | int): ...
-  7 |+def func2(arg1: None | int): ...
-8 8 | 
-9 9 | 
-10 10 | def func3() -> Literal[None]: ...
+4  | def func1(arg1: Literal[None]): ...
+5  | 
+6  | 
+   - def func2(arg1: Literal[None] | int): ...
+7  + def func2(arg1: None | int): ...
+8  | 
+9  | 
+10 | def func3() -> Literal[None]: ...
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:10:24
@@ -44,16 +40,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                        ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-7  7  | def func2(arg1: Literal[None] | int): ...
-8  8  | 
-9  9  | 
-10    |-def func3() -> Literal[None]: ...
-   10 |+def func3() -> None: ...
-11 11 | 
-12 12 | 
-13 13 | def func4(arg1: Literal[int, None, float]): ...
+7  | def func2(arg1: Literal[None] | int): ...
+8  | 
+9  | 
+   - def func3() -> Literal[None]: ...
+10 + def func3() -> None: ...
+11 | 
+12 | 
+13 | def func4(arg1: Literal[int, None, float]): ...
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.pyi:13:30
@@ -62,16 +56,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
    |                              ^^^^
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-10 10 | def func3() -> Literal[None]: ...
-11 11 | 
-12 12 | 
-13    |-def func4(arg1: Literal[int, None, float]): ...
-   13 |+def func4(arg1: Literal[int, float] | None): ...
-14 14 | 
-15 15 | 
-16 16 | def func5(arg1: Literal[None, None]): ...
+10 | def func3() -> Literal[None]: ...
+11 | 
+12 | 
+   - def func4(arg1: Literal[int, None, float]): ...
+13 + def func4(arg1: Literal[int, float] | None): ...
+14 | 
+15 | 
+16 | def func5(arg1: Literal[None, None]): ...
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:16:25
@@ -80,16 +72,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                         ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-13 13 | def func4(arg1: Literal[int, None, float]): ...
-14 14 | 
-15 15 | 
-16    |-def func5(arg1: Literal[None, None]): ...
-   16 |+def func5(arg1: None): ...
-17 17 | 
-18 18 | 
-19 19 | def func6(arg1: Literal[
+13 | def func4(arg1: Literal[int, None, float]): ...
+14 | 
+15 | 
+   - def func5(arg1: Literal[None, None]): ...
+16 + def func5(arg1: None): ...
+17 | 
+18 | 
+19 | def func6(arg1: Literal[
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:16:31
@@ -98,16 +88,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                               ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-13 13 | def func4(arg1: Literal[int, None, float]): ...
-14 14 | 
-15 15 | 
-16    |-def func5(arg1: Literal[None, None]): ...
-   16 |+def func5(arg1: None): ...
-17 17 | 
-18 18 | 
-19 19 | def func6(arg1: Literal[
+13 | def func4(arg1: Literal[int, None, float]): ...
+14 | 
+15 | 
+   - def func5(arg1: Literal[None, None]): ...
+16 + def func5(arg1: None): ...
+17 | 
+18 | 
+19 | def func6(arg1: Literal[
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.pyi:21:5
@@ -120,20 +108,19 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 23 | ]): ...
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Unsafe fix
-16 16 | def func5(arg1: Literal[None, None]): ...
-17 17 | 
-18 18 | 
-19    |-def func6(arg1: Literal[
-20    |-    "hello",
-21    |-    None  # Comment 1
-22    |-    , "world"
-23    |-]): ...
-   19 |+def func6(arg1: Literal["hello", "world"] | None): ...
-24 20 | 
-25 21 | 
-26 22 | def func7(arg1: Literal[
+16 | def func5(arg1: Literal[None, None]): ...
+17 | 
+18 | 
+   - def func6(arg1: Literal[
+   -     "hello",
+   -     None  # Comment 1
+   -     , "world"
+   - ]): ...
+19 + def func6(arg1: Literal["hello", "world"] | None): ...
+20 | 
+21 | 
+22 | def func7(arg1: Literal[
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:27:5
@@ -144,18 +131,17 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 28 | ]): ...
    |
 help: Replace with `None`
-
-ℹ Unsafe fix
-23 23 | ]): ...
-24 24 | 
-25 25 | 
-26    |-def func7(arg1: Literal[
-27    |-    None  # Comment 1
-28    |-]): ...
-   26 |+def func7(arg1: None): ...
-29 27 | 
-30 28 | 
-31 29 | def func8(arg1: Literal[None] | None):...
+23 | ]): ...
+24 | 
+25 | 
+   - def func7(arg1: Literal[
+   -     None  # Comment 1
+   - ]): ...
+26 + def func7(arg1: None): ...
+27 | 
+28 | 
+29 | def func8(arg1: Literal[None] | None):...
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.pyi:31:25
@@ -172,16 +158,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                               ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-31 31 | def func8(arg1: Literal[None] | None):...
-32 32 | 
-33 33 | 
-34    |-def func9(arg1: Union[Literal[None], None]): ...
-   34 |+def func9(arg1: Union[None, None]): ...
-35 35 | 
-36 36 | 
-37 37 | # OK
+31 | def func8(arg1: Literal[None] | None):...
+32 | 
+33 | 
+   - def func9(arg1: Union[Literal[None], None]): ...
+34 + def func9(arg1: Union[None, None]): ...
+35 | 
+36 | 
+37 | # OK
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:42:9
@@ -192,16 +176,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 43 | Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-39 39 | 
-40 40 | 
-41 41 | # From flake8-pyi
-42    |-Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
-   42 |+None  # PYI061 None inside "Literal[]" expression. Replace with "None"
-43 43 | Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-44 44 | 
-45 45 | 
+39 | 
+40 | 
+41 | # From flake8-pyi
+   - Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
+42 + None  # PYI061 None inside "Literal[]" expression. Replace with "None"
+43 | Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+44 | 
+45 | 
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.pyi:43:15
@@ -212,16 +194,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
    |               ^^^^
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-40 40 | 
-41 41 | # From flake8-pyi
-42 42 | Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
-43    |-Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-   43 |+Literal[True] | None  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-44 44 | 
-45 45 | 
-46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+40 | 
+41 | # From flake8-pyi
+42 | Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+43 + Literal[True] | None  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+44 | 
+45 | 
+46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.pyi:47:12
@@ -256,16 +236,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 51 | a: int | Literal[None] | None
    |
 help: Replace with `None`
-
-ℹ Safe fix
-46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
-47 47 | x: Literal[None] | None
-48 48 | y: None | Literal[None]
-49    |-z: Union[Literal[None], None]
-   49 |+z: Union[None, None]
-50 50 | 
-51 51 | a: int | Literal[None] | None
-52 52 | b: None | Literal[None] | None
+46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+47 | x: Literal[None] | None
+48 | y: None | Literal[None]
+   - z: Union[Literal[None], None]
+49 + z: Union[None, None]
+50 | 
+51 | a: int | Literal[None] | None
+52 | b: None | Literal[None] | None
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.pyi:51:18
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap
index 879572b57b..bc1421e4db 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap
@@ -12,16 +12,14 @@ PYI062 [*] Duplicate literal member `True`
 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
   |
 help: Remove duplicates
-
-ℹ Safe fix
-2 2 | import typing as t
-3 3 | import typing_extensions
-4 4 | 
-5   |-x: Literal[True, False, True, False]  # PYI062 twice here
-  5 |+x: Literal[True, False]  # PYI062 twice here
-6 6 | 
-7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-8 8 | 
+2 | import typing as t
+3 | import typing_extensions
+4 | 
+  - x: Literal[True, False, True, False]  # PYI062 twice here
+5 + x: Literal[True, False]  # PYI062 twice here
+6 | 
+7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+8 | 
 
 PYI062 [*] Duplicate literal member `False`
  --> PYI062.py:5:31
@@ -34,16 +32,14 @@ PYI062 [*] Duplicate literal member `False`
 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
   |
 help: Remove duplicates
-
-ℹ Safe fix
-2 2 | import typing as t
-3 3 | import typing_extensions
-4 4 | 
-5   |-x: Literal[True, False, True, False]  # PYI062 twice here
-  5 |+x: Literal[True, False]  # PYI062 twice here
-6 6 | 
-7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-8 8 | 
+2 | import typing as t
+3 | import typing_extensions
+4 | 
+  - x: Literal[True, False, True, False]  # PYI062 twice here
+5 + x: Literal[True, False]  # PYI062 twice here
+6 | 
+7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+8 | 
 
 PYI062 [*] Duplicate literal member `1`
  --> PYI062.py:7:45
@@ -56,16 +52,14 @@ PYI062 [*] Duplicate literal member `1`
 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
   |
 help: Remove duplicates
-
-ℹ Safe fix
-4 4 | 
-5 5 | x: Literal[True, False, True, False]  # PYI062 twice here
-6 6 | 
-7   |-y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-  7 |+y: Literal[1, print("hello"), 3, 4]  # PYI062 on the last 1
-8 8 | 
-9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
+4  | 
+5  | x: Literal[True, False, True, False]  # PYI062 twice here
+6  | 
+   - y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+7  + y: Literal[1, print("hello"), 3, 4]  # PYI062 on the last 1
+8  | 
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
 
 PYI062 [*] Duplicate literal member `{1, 3, 5}`
   --> PYI062.py:9:33
@@ -78,16 +72,14 @@ PYI062 [*] Duplicate literal member `{1, 3, 5}`
 11 | Literal[1, Literal[1]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-6  6  | 
-7  7  | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-8  8  | 
-9     |-z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-   9  |+z: Literal[{1, 3, 5}, "foobar"]  # PYI062 on the set literal
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
+6  | 
+7  | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+8  | 
+   - z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+9  + z: Literal[{1, 3, 5}, "foobar"]  # PYI062 on the set literal
+10 | 
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:11:20
@@ -100,16 +92,14 @@ PYI062 [*] Duplicate literal member `1`
 13 | Literal[1, Literal[1], Literal[1]]  # twice
    |
 help: Remove duplicates
-
-ℹ Safe fix
-8  8  | 
-9  9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
-11    |-Literal[1, Literal[1]]  # once
-   11 |+Literal[1]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
+8  | 
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
+   - Literal[1, Literal[1]]  # once
+11 + Literal[1]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:12:23
@@ -121,16 +111,14 @@ PYI062 [*] Duplicate literal member `1`
 14 | Literal[1, Literal[2], Literal[2]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-9  9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12    |-Literal[1, 2, Literal[1, 2]]  # twice
-   12 |+Literal[1, 2]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
+11 | Literal[1, Literal[1]]  # once
+   - Literal[1, 2, Literal[1, 2]]  # twice
+12 + Literal[1, 2]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
 
 PYI062 [*] Duplicate literal member `2`
   --> PYI062.py:12:26
@@ -142,16 +130,14 @@ PYI062 [*] Duplicate literal member `2`
 14 | Literal[1, Literal[2], Literal[2]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-9  9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12    |-Literal[1, 2, Literal[1, 2]]  # twice
-   12 |+Literal[1, 2]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
+11 | Literal[1, Literal[1]]  # once
+   - Literal[1, 2, Literal[1, 2]]  # twice
+12 + Literal[1, 2]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:13:20
@@ -164,16 +150,14 @@ PYI062 [*] Duplicate literal member `1`
 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13    |-Literal[1, Literal[1], Literal[1]]  # twice
-   13 |+Literal[1]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
+10 | 
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+   - Literal[1, Literal[1], Literal[1]]  # twice
+13 + Literal[1]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:13:32
@@ -186,16 +170,14 @@ PYI062 [*] Duplicate literal member `1`
 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13    |-Literal[1, Literal[1], Literal[1]]  # twice
-   13 |+Literal[1]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
+10 | 
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+   - Literal[1, Literal[1], Literal[1]]  # twice
+13 + Literal[1]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
 
 PYI062 [*] Duplicate literal member `2`
   --> PYI062.py:14:32
@@ -208,16 +190,14 @@ PYI062 [*] Duplicate literal member `2`
 16 | typing_extensions.Literal[1, 1, 1]  # twice
    |
 help: Remove duplicates
-
-ℹ Safe fix
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14    |-Literal[1, Literal[2], Literal[2]]  # once
-   14 |+Literal[1, 2]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
-17 17 | Literal[
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+   - Literal[1, Literal[2], Literal[2]]  # once
+14 + Literal[1, 2]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
+17 | Literal[
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:15:37
@@ -230,16 +210,14 @@ PYI062 [*] Duplicate literal member `1`
 17 | Literal[
    |
 help: Remove duplicates
-
-ℹ Safe fix
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15    |-t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-   15 |+t.Literal[1, 2]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
-17 17 | Literal[
-18 18 |     1, # comment
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+   - t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+15 + t.Literal[1, 2]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
+17 | Literal[
+18 |     1, # comment
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:16:30
@@ -252,16 +230,14 @@ PYI062 [*] Duplicate literal member `1`
 18 |     1, # comment
    |
 help: Remove duplicates
-
-ℹ Safe fix
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16    |-typing_extensions.Literal[1, 1, 1]  # twice
-   16 |+typing_extensions.Literal[1]  # twice
-17 17 | Literal[
-18 18 |     1, # comment
-19 19 |     Literal[ # another comment
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+   - typing_extensions.Literal[1, 1, 1]  # twice
+16 + typing_extensions.Literal[1]  # twice
+17 | Literal[
+18 |     1, # comment
+19 |     Literal[ # another comment
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:16:33
@@ -274,16 +250,14 @@ PYI062 [*] Duplicate literal member `1`
 18 |     1, # comment
    |
 help: Remove duplicates
-
-ℹ Safe fix
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16    |-typing_extensions.Literal[1, 1, 1]  # twice
-   16 |+typing_extensions.Literal[1]  # twice
-17 17 | Literal[
-18 18 |     1, # comment
-19 19 |     Literal[ # another comment
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+   - typing_extensions.Literal[1, 1, 1]  # twice
+16 + typing_extensions.Literal[1]  # twice
+17 | Literal[
+18 |     1, # comment
+19 |     Literal[ # another comment
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:20:9
@@ -296,21 +270,20 @@ PYI062 [*] Duplicate literal member `1`
 22 | ]  # once
    |
 help: Remove duplicates
-
-ℹ Unsafe fix
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
-17    |-Literal[
-18    |-    1, # comment
-19    |-    Literal[ # another comment
-20    |-        1
-21    |-    ]
-22    |-]  # once
-   17 |+Literal[1]  # once
-23 18 | 
-24 19 | # Ensure issue is only raised once, even on nested literals
-25 20 | MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
+   - Literal[
+   -     1, # comment
+   -     Literal[ # another comment
+   -         1
+   -     ]
+   - ]  # once
+17 + Literal[1]  # once
+18 | 
+19 | # Ensure issue is only raised once, even on nested literals
+20 | MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
+note: This is an unsafe fix and may change runtime behavior
 
 PYI062 [*] Duplicate literal member `True`
   --> PYI062.py:25:46
@@ -322,16 +295,14 @@ PYI062 [*] Duplicate literal member `True`
 27 | n: Literal["No", "duplicates", "here", 1, "1"]
    |
 help: Remove duplicates
-
-ℹ Safe fix
-22 22 | ]  # once
-23 23 | 
-24 24 | # Ensure issue is only raised once, even on nested literals
-25    |-MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
-   25 |+MyType = Literal["foo", True, False, "bar"]  # PYI062
-26 26 | 
-27 27 | n: Literal["No", "duplicates", "here", 1, "1"]
-28 28 | 
+22 | ]  # once
+23 | 
+24 | # Ensure issue is only raised once, even on nested literals
+   - MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
+25 + MyType = Literal["foo", True, False, "bar"]  # PYI062
+26 | 
+27 | n: Literal["No", "duplicates", "here", 1, "1"]
+28 | 
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:32:37
@@ -343,14 +314,12 @@ PYI062 [*] Duplicate literal member `1`
 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-29 29 | 
-30 30 | # nested literals, all equivalent to `Literal[1]`
-31 31 | Literal[Literal[1]]  # no duplicate
-32    |-Literal[Literal[Literal[1], Literal[1]]]  # once
-   32 |+Literal[1]  # once
-33 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
+29 | 
+30 | # nested literals, all equivalent to `Literal[1]`
+31 | Literal[Literal[1]]  # no duplicate
+   - Literal[Literal[Literal[1], Literal[1]]]  # once
+32 + Literal[1]  # once
+33 | Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.py:33:45
@@ -361,10 +330,8 @@ PYI062 [*] Duplicate literal member `1`
    |                                             ^
    |
 help: Remove duplicates
-
-ℹ Safe fix
-30 30 | # nested literals, all equivalent to `Literal[1]`
-31 31 | Literal[Literal[1]]  # no duplicate
-32 32 | Literal[Literal[Literal[1], Literal[1]]]  # once
-33    |-Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
-   33 |+Literal[1]  # once
+30 | # nested literals, all equivalent to `Literal[1]`
+31 | Literal[Literal[1]]  # no duplicate
+32 | Literal[Literal[Literal[1], Literal[1]]]  # once
+   - Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
+33 + Literal[1]  # once
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap
index c94781a8b4..9592eddfbe 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap
@@ -12,16 +12,14 @@ PYI062 [*] Duplicate literal member `True`
 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
   |
 help: Remove duplicates
-
-ℹ Safe fix
-2 2 | import typing as t
-3 3 | import typing_extensions
-4 4 | 
-5   |-x: Literal[True, False, True, False]  # PYI062 twice here
-  5 |+x: Literal[True, False]  # PYI062 twice here
-6 6 | 
-7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-8 8 | 
+2 | import typing as t
+3 | import typing_extensions
+4 | 
+  - x: Literal[True, False, True, False]  # PYI062 twice here
+5 + x: Literal[True, False]  # PYI062 twice here
+6 | 
+7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+8 | 
 
 PYI062 [*] Duplicate literal member `False`
  --> PYI062.pyi:5:31
@@ -34,16 +32,14 @@ PYI062 [*] Duplicate literal member `False`
 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
   |
 help: Remove duplicates
-
-ℹ Safe fix
-2 2 | import typing as t
-3 3 | import typing_extensions
-4 4 | 
-5   |-x: Literal[True, False, True, False]  # PYI062 twice here
-  5 |+x: Literal[True, False]  # PYI062 twice here
-6 6 | 
-7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-8 8 | 
+2 | import typing as t
+3 | import typing_extensions
+4 | 
+  - x: Literal[True, False, True, False]  # PYI062 twice here
+5 + x: Literal[True, False]  # PYI062 twice here
+6 | 
+7 | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+8 | 
 
 PYI062 [*] Duplicate literal member `1`
  --> PYI062.pyi:7:45
@@ -56,16 +52,14 @@ PYI062 [*] Duplicate literal member `1`
 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
   |
 help: Remove duplicates
-
-ℹ Safe fix
-4 4 | 
-5 5 | x: Literal[True, False, True, False]  # PYI062 twice here
-6 6 | 
-7   |-y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-  7 |+y: Literal[1, print("hello"), 3, 4]  # PYI062 on the last 1
-8 8 | 
-9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
+4  | 
+5  | x: Literal[True, False, True, False]  # PYI062 twice here
+6  | 
+   - y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+7  + y: Literal[1, print("hello"), 3, 4]  # PYI062 on the last 1
+8  | 
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
 
 PYI062 [*] Duplicate literal member `{1, 3, 5}`
   --> PYI062.pyi:9:33
@@ -78,16 +72,14 @@ PYI062 [*] Duplicate literal member `{1, 3, 5}`
 11 | Literal[1, Literal[1]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-6  6  | 
-7  7  | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
-8  8  | 
-9     |-z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-   9  |+z: Literal[{1, 3, 5}, "foobar"]  # PYI062 on the set literal
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
+6  | 
+7  | y: Literal[1, print("hello"), 3, Literal[4, 1]]  # PYI062 on the last 1
+8  | 
+   - z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+9  + z: Literal[{1, 3, 5}, "foobar"]  # PYI062 on the set literal
+10 | 
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:11:20
@@ -100,16 +92,14 @@ PYI062 [*] Duplicate literal member `1`
 13 | Literal[1, Literal[1], Literal[1]]  # twice
    |
 help: Remove duplicates
-
-ℹ Safe fix
-8  8  | 
-9  9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
-11    |-Literal[1, Literal[1]]  # once
-   11 |+Literal[1]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
+8  | 
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
+   - Literal[1, Literal[1]]  # once
+11 + Literal[1]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:12:23
@@ -121,16 +111,14 @@ PYI062 [*] Duplicate literal member `1`
 14 | Literal[1, Literal[2], Literal[2]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-9  9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12    |-Literal[1, 2, Literal[1, 2]]  # twice
-   12 |+Literal[1, 2]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
+11 | Literal[1, Literal[1]]  # once
+   - Literal[1, 2, Literal[1, 2]]  # twice
+12 + Literal[1, 2]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
 
 PYI062 [*] Duplicate literal member `2`
   --> PYI062.pyi:12:26
@@ -142,16 +130,14 @@ PYI062 [*] Duplicate literal member `2`
 14 | Literal[1, Literal[2], Literal[2]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-9  9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12    |-Literal[1, 2, Literal[1, 2]]  # twice
-   12 |+Literal[1, 2]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+9  | z: Literal[{1, 3, 5}, "foobar", {1,3,5}]  # PYI062 on the set literal
+10 | 
+11 | Literal[1, Literal[1]]  # once
+   - Literal[1, 2, Literal[1, 2]]  # twice
+12 + Literal[1, 2]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:13:20
@@ -164,16 +150,14 @@ PYI062 [*] Duplicate literal member `1`
 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13    |-Literal[1, Literal[1], Literal[1]]  # twice
-   13 |+Literal[1]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
+10 | 
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+   - Literal[1, Literal[1], Literal[1]]  # twice
+13 + Literal[1]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:13:32
@@ -186,16 +170,14 @@ PYI062 [*] Duplicate literal member `1`
 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-10 10 | 
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13    |-Literal[1, Literal[1], Literal[1]]  # twice
-   13 |+Literal[1]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
+10 | 
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+   - Literal[1, Literal[1], Literal[1]]  # twice
+13 + Literal[1]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
 
 PYI062 [*] Duplicate literal member `2`
   --> PYI062.pyi:14:32
@@ -208,16 +190,14 @@ PYI062 [*] Duplicate literal member `2`
 16 | typing_extensions.Literal[1, 1, 1]  # twice
    |
 help: Remove duplicates
-
-ℹ Safe fix
-11 11 | Literal[1, Literal[1]]  # once
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14    |-Literal[1, Literal[2], Literal[2]]  # once
-   14 |+Literal[1, 2]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
-17 17 | Literal[
+11 | Literal[1, Literal[1]]  # once
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+   - Literal[1, Literal[2], Literal[2]]  # once
+14 + Literal[1, 2]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
+17 | Literal[
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:15:37
@@ -230,16 +210,14 @@ PYI062 [*] Duplicate literal member `1`
 17 | Literal[
    |
 help: Remove duplicates
-
-ℹ Safe fix
-12 12 | Literal[1, 2, Literal[1, 2]]  # twice
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15    |-t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-   15 |+t.Literal[1, 2]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
-17 17 | Literal[
-18 18 |     1, # comment
+12 | Literal[1, 2, Literal[1, 2]]  # twice
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+   - t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+15 + t.Literal[1, 2]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
+17 | Literal[
+18 |     1, # comment
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:16:30
@@ -252,16 +230,14 @@ PYI062 [*] Duplicate literal member `1`
 18 |     1, # comment
    |
 help: Remove duplicates
-
-ℹ Safe fix
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16    |-typing_extensions.Literal[1, 1, 1]  # twice
-   16 |+typing_extensions.Literal[1]  # twice
-17 17 | Literal[
-18 18 |     1, # comment
-19 19 |     Literal[ # another comment
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+   - typing_extensions.Literal[1, 1, 1]  # twice
+16 + typing_extensions.Literal[1]  # twice
+17 | Literal[
+18 |     1, # comment
+19 |     Literal[ # another comment
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:16:33
@@ -274,16 +250,14 @@ PYI062 [*] Duplicate literal member `1`
 18 |     1, # comment
    |
 help: Remove duplicates
-
-ℹ Safe fix
-13 13 | Literal[1, Literal[1], Literal[1]]  # twice
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16    |-typing_extensions.Literal[1, 1, 1]  # twice
-   16 |+typing_extensions.Literal[1]  # twice
-17 17 | Literal[
-18 18 |     1, # comment
-19 19 |     Literal[ # another comment
+13 | Literal[1, Literal[1], Literal[1]]  # twice
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+   - typing_extensions.Literal[1, 1, 1]  # twice
+16 + typing_extensions.Literal[1]  # twice
+17 | Literal[
+18 |     1, # comment
+19 |     Literal[ # another comment
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:20:9
@@ -296,21 +270,20 @@ PYI062 [*] Duplicate literal member `1`
 22 | ]  # once
    |
 help: Remove duplicates
-
-ℹ Unsafe fix
-14 14 | Literal[1, Literal[2], Literal[2]]  # once
-15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
-16 16 | typing_extensions.Literal[1, 1, 1]  # twice
-17    |-Literal[
-18    |-    1, # comment
-19    |-    Literal[ # another comment
-20    |-        1
-21    |-    ]
-22    |-]  # once
-   17 |+Literal[1]  # once
-23 18 | 
-24 19 | # Ensure issue is only raised once, even on nested literals
-25 20 | MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
+14 | Literal[1, Literal[2], Literal[2]]  # once
+15 | t.Literal[1, t.Literal[2, t.Literal[1]]]  # once
+16 | typing_extensions.Literal[1, 1, 1]  # twice
+   - Literal[
+   -     1, # comment
+   -     Literal[ # another comment
+   -         1
+   -     ]
+   - ]  # once
+17 + Literal[1]  # once
+18 | 
+19 | # Ensure issue is only raised once, even on nested literals
+20 | MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
+note: This is an unsafe fix and may change runtime behavior
 
 PYI062 [*] Duplicate literal member `True`
   --> PYI062.pyi:25:46
@@ -322,16 +295,14 @@ PYI062 [*] Duplicate literal member `True`
 27 | n: Literal["No", "duplicates", "here", 1, "1"]
    |
 help: Remove duplicates
-
-ℹ Safe fix
-22 22 | ]  # once
-23 23 | 
-24 24 | # Ensure issue is only raised once, even on nested literals
-25    |-MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
-   25 |+MyType = Literal["foo", True, False, "bar"]  # PYI062
-26 26 | 
-27 27 | n: Literal["No", "duplicates", "here", 1, "1"]
-28 28 | 
+22 | ]  # once
+23 | 
+24 | # Ensure issue is only raised once, even on nested literals
+   - MyType = Literal["foo", Literal[True, False, True], "bar"]  # PYI062
+25 + MyType = Literal["foo", True, False, "bar"]  # PYI062
+26 | 
+27 | n: Literal["No", "duplicates", "here", 1, "1"]
+28 | 
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:32:37
@@ -343,14 +314,12 @@ PYI062 [*] Duplicate literal member `1`
 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
    |
 help: Remove duplicates
-
-ℹ Safe fix
-29 29 | 
-30 30 | # nested literals, all equivalent to `Literal[1]`
-31 31 | Literal[Literal[1]]  # no duplicate
-32    |-Literal[Literal[Literal[1], Literal[1]]]  # once
-   32 |+Literal[1]  # once
-33 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
+29 | 
+30 | # nested literals, all equivalent to `Literal[1]`
+31 | Literal[Literal[1]]  # no duplicate
+   - Literal[Literal[Literal[1], Literal[1]]]  # once
+32 + Literal[1]  # once
+33 | Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
 
 PYI062 [*] Duplicate literal member `1`
   --> PYI062.pyi:33:45
@@ -361,10 +330,8 @@ PYI062 [*] Duplicate literal member `1`
    |                                             ^
    |
 help: Remove duplicates
-
-ℹ Safe fix
-30 30 | # nested literals, all equivalent to `Literal[1]`
-31 31 | Literal[Literal[1]]  # no duplicate
-32 32 | Literal[Literal[Literal[1], Literal[1]]]  # once
-33    |-Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
-   33 |+Literal[1]  # once
+30 | # nested literals, all equivalent to `Literal[1]`
+31 | Literal[Literal[1]]  # no duplicate
+32 | Literal[Literal[Literal[1], Literal[1]]]  # once
+   - Literal[Literal[1], Literal[Literal[Literal[1]]]]  # once
+33 + Literal[1]  # once
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap
index 397440ade2..6a80897cad 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap
@@ -12,15 +12,13 @@ PYI064 [*] `Final[Literal[True]]` can be replaced with a bare `Final`
 5 | z: Final[Literal[  # PYI064
   |
 help: Replace with `Final`
-
-ℹ Safe fix
-1 1 | from typing import Final, Literal
-2 2 | 
-3   |-x: Final[Literal[True]] = True  # PYI064
-  3 |+x: Final = True  # PYI064
-4 4 | y: Final[Literal[None]] = None  # PYI064
-5 5 | z: Final[Literal[  # PYI064
-6 6 |     "this is a really long literal, that won't be rendered in the issue text"
+1 | from typing import Final, Literal
+2 | 
+  - x: Final[Literal[True]] = True  # PYI064
+3 + x: Final = True  # PYI064
+4 | y: Final[Literal[None]] = None  # PYI064
+5 | z: Final[Literal[  # PYI064
+6 |     "this is a really long literal, that won't be rendered in the issue text"
 
 PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final`
  --> PYI064.py:4:1
@@ -32,16 +30,14 @@ PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final`
 6 |     "this is a really long literal, that won't be rendered in the issue text"
   |
 help: Replace with `Final`
-
-ℹ Safe fix
-1 1 | from typing import Final, Literal
-2 2 | 
-3 3 | x: Final[Literal[True]] = True  # PYI064
-4   |-y: Final[Literal[None]] = None  # PYI064
-  4 |+y: Final = None  # PYI064
-5 5 | z: Final[Literal[  # PYI064
-6 6 |     "this is a really long literal, that won't be rendered in the issue text"
-7 7 | ]] = "this is a really long literal, that won't be rendered in the issue text"
+1 | from typing import Final, Literal
+2 | 
+3 | x: Final[Literal[True]] = True  # PYI064
+  - y: Final[Literal[None]] = None  # PYI064
+4 + y: Final = None  # PYI064
+5 | z: Final[Literal[  # PYI064
+6 |     "this is a really long literal, that won't be rendered in the issue text"
+7 | ]] = "this is a really long literal, that won't be rendered in the issue text"
 
 PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final`
  --> PYI064.py:5:1
@@ -56,18 +52,16 @@ PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final`
 9 |   # This should be fixable, and marked as safe
   |
 help: Replace with `Final`
-
-ℹ Safe fix
-2 2 | 
-3 3 | x: Final[Literal[True]] = True  # PYI064
-4 4 | y: Final[Literal[None]] = None  # PYI064
-5   |-z: Final[Literal[  # PYI064
-6   |-    "this is a really long literal, that won't be rendered in the issue text"
-7   |-]] = "this is a really long literal, that won't be rendered in the issue text"
-  5 |+z: Final = "this is a really long literal, that won't be rendered in the issue text"
-8 6 | 
-9 7 | # This should be fixable, and marked as safe
-10 8 | w1: Final[Literal[123]]  # PYI064
+2 | 
+3 | x: Final[Literal[True]] = True  # PYI064
+4 | y: Final[Literal[None]] = None  # PYI064
+  - z: Final[Literal[  # PYI064
+  -     "this is a really long literal, that won't be rendered in the issue text"
+  - ]] = "this is a really long literal, that won't be rendered in the issue text"
+5 + z: Final = "this is a really long literal, that won't be rendered in the issue text"
+6 | 
+7 | # This should be fixable, and marked as safe
+8 | w1: Final[Literal[123]]  # PYI064
 
 PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final`
   --> PYI064.py:10:1
@@ -79,16 +73,14 @@ PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final`
 12 | # This should not be fixable
    |
 help: Replace with `Final`
-
-ℹ Safe fix
-7  7  | ]] = "this is a really long literal, that won't be rendered in the issue text"
-8  8  | 
-9  9  | # This should be fixable, and marked as safe
-10    |-w1: Final[Literal[123]]  # PYI064
-   10 |+w1: Final = 123  # PYI064
-11 11 | 
-12 12 | # This should not be fixable
-13 13 | w2: Final[Literal[123]] = "random value"  # PYI064
+7  | ]] = "this is a really long literal, that won't be rendered in the issue text"
+8  | 
+9  | # This should be fixable, and marked as safe
+   - w1: Final[Literal[123]]  # PYI064
+10 + w1: Final = 123  # PYI064
+11 | 
+12 | # This should not be fixable
+13 | w2: Final[Literal[123]] = "random value"  # PYI064
 
 PYI064 `Final[Literal[123]]` can be replaced with a bare `Final`
   --> PYI064.py:13:1
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap
index 03f7f83dbd..babf17ca3f 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap
@@ -12,15 +12,13 @@ PYI064 [*] `Final[Literal[True]]` can be replaced with a bare `Final`
 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
   |
 help: Replace with `Final`
-
-ℹ Safe fix
-1 1 | from typing import Final, Literal
-2 2 | 
-3   |-x: Final[Literal[True]]  # PYI064
-  3 |+x: Final = True  # PYI064
-4 4 | y: Final[Literal[None]] = None  # PYI064
-5 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
-6 6 | 
+1 | from typing import Final, Literal
+2 | 
+  - x: Final[Literal[True]]  # PYI064
+3 + x: Final = True  # PYI064
+4 | y: Final[Literal[None]] = None  # PYI064
+5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
+6 | 
 
 PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final`
  --> PYI064.pyi:4:1
@@ -31,16 +29,14 @@ PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final`
 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
   |
 help: Replace with `Final`
-
-ℹ Safe fix
-1 1 | from typing import Final, Literal
-2 2 | 
-3 3 | x: Final[Literal[True]]  # PYI064
-4   |-y: Final[Literal[None]] = None  # PYI064
-  4 |+y: Final = None  # PYI064
-5 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
-6 6 | 
-7 7 | # This should be fixable, and marked as safe
+1 | from typing import Final, Literal
+2 | 
+3 | x: Final[Literal[True]]  # PYI064
+  - y: Final[Literal[None]] = None  # PYI064
+4 + y: Final = None  # PYI064
+5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
+6 | 
+7 | # This should be fixable, and marked as safe
 
 PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final`
  --> PYI064.pyi:5:1
@@ -53,16 +49,14 @@ PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final`
 7 | # This should be fixable, and marked as safe
   |
 help: Replace with `Final`
-
-ℹ Safe fix
-2 2 | 
-3 3 | x: Final[Literal[True]]  # PYI064
-4 4 | y: Final[Literal[None]] = None  # PYI064
-5   |-z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
-  5 |+z: Final = "this is a really long literal, that won't be rendered in the issue text"  # PYI064
-6 6 | 
-7 7 | # This should be fixable, and marked as safe
-8 8 | w1: Final[Literal[123]]  # PYI064
+2 | 
+3 | x: Final[Literal[True]]  # PYI064
+4 | y: Final[Literal[None]] = None  # PYI064
+  - z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
+5 + z: Final = "this is a really long literal, that won't be rendered in the issue text"  # PYI064
+6 | 
+7 | # This should be fixable, and marked as safe
+8 | w1: Final[Literal[123]]  # PYI064
 
 PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final`
   --> PYI064.pyi:8:1
@@ -74,16 +68,14 @@ PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final`
 10 | # This should not be fixable
    |
 help: Replace with `Final`
-
-ℹ Safe fix
-5 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
-6 6 | 
-7 7 | # This should be fixable, and marked as safe
-8   |-w1: Final[Literal[123]]  # PYI064
-  8 |+w1: Final = 123  # PYI064
-9 9 | 
-10 10 | # This should not be fixable
-11 11 | w2: Final[Literal[123]] = "random value"  # PYI064
+5  | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]]  # PYI064
+6  | 
+7  | # This should be fixable, and marked as safe
+   - w1: Final[Literal[123]]  # PYI064
+8  + w1: Final = 123  # PYI064
+9  | 
+10 | # This should not be fixable
+11 | w2: Final[Literal[123]] = "random value"  # PYI064
 
 PYI064 `Final[Literal[123]]` can be replaced with a bare `Final`
   --> PYI064.pyi:11:1
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap
index 15f4e54dd8..bfab666867 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap
@@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str`
 9 | # Should emit for union types in arguments.
   |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-4 4 | field1: str
-5 5 | 
-6 6 | # Should emit for duplicate field types.
-7   |-field2: str | str  # PYI016: Duplicate union member `str`
-  7 |+field2: str  # PYI016: Duplicate union member `str`
-8 8 | 
-9 9 | # Should emit for union types in arguments.
-10 10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+4  | field1: str
+5  | 
+6  | # Should emit for duplicate field types.
+   - field2: str | str  # PYI016: Duplicate union member `str`
+7  + field2: str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:10:23
@@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int`
 11 |     print(arg1)
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-7  7  | field2: str | str  # PYI016: Duplicate union member `str`
-8  8  | 
-9  9  | # Should emit for union types in arguments.
-10    |-def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
-   10 |+def func1(arg1: int):  # PYI016: Duplicate union member `int`
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
+7  | field2: str | str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+   - def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+10 + def func1(arg1: int):  # PYI016: Duplicate union member `int`
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:14:22
@@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str`
 15 |     return "my string"
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
-14    |-def func2() -> str | str:  # PYI016: Duplicate union member `str`
-   14 |+def func2() -> str:  # PYI016: Duplicate union member `str`
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
+   - def func2() -> str | str:  # PYI016: Duplicate union member `str`
+14 + def func2() -> str:  # PYI016: Duplicate union member `str`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:18:15
@@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str`
 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18    |-field3: str | str | int  # PYI016: Duplicate union member `str`
-   18 |+field3: str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+   - field3: str | str | int  # PYI016: Duplicate union member `str`
+18 + field3: str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:19:15
@@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19    |-field4: int | int | str  # PYI016: Duplicate union member `int`
-   19 |+field4: int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+   - field4: int | int | str  # PYI016: Duplicate union member `int`
+19 + field4: int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:20:21
@@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20    |-field5: str | int | str  # PYI016: Duplicate union member `str`
-   20 |+field5: str | int  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+   - field5: str | int | str  # PYI016: Duplicate union member `str`
+20 + field5: str | int  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:21:28
@@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int`
 23 | # Shouldn't emit for non-type unions.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21    |-field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-   21 |+field6: int | bool | str  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
-24 24 | field7 = str | str
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+   - field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+21 + field6: int | bool | str  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
+24 | field7 = str | str
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:27:22
@@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int`
 29 | # Should handle user brackets when fixing.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-24 24 | field7 = str | str
-25 25 | 
-26 26 | # Should emit for strangely-bracketed unions.
-27    |-field8: int | (str | int)  # PYI016: Duplicate union member `int`
-   27 |+field8: int | str  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+24 | field7 = str | str
+25 | 
+26 | # Should emit for strangely-bracketed unions.
+   - field8: int | (str | int)  # PYI016: Duplicate union member `int`
+27 + field8: int | str  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:30:16
@@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int`
 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-27 27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30    |-field9: int | (int | str)  # PYI016: Duplicate union member `int`
-   30 |+field9: int | str  # PYI016: Duplicate union member `int`
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
+27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+   - field9: int | (int | str)  # PYI016: Duplicate union member `int`
+30 + field9: int | str  # PYI016: Duplicate union member `int`
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.py:31:24
@@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str`
 33 | # Should emit for nested unions.
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
-31    |-field10: (str | int) | str  # PYI016: Duplicate union member `str`
-   31 |+field10: str | int  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34 34 | field11: dict[int | int, str]
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+   - field10: (str | int) | str  # PYI016: Duplicate union member `str`
+31 + field10: str | int  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+34 | field11: dict[int | int, str]
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:34:21
@@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int`
 36 | # Should emit for unions with more than two cases
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34    |-field11: dict[int | int, str]
-   34 |+field11: dict[int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+   - field11: dict[int | int, str]
+34 + field11: dict[int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:37:16
@@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:37:22
@@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:38:16
@@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:38:22
@@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:38:28
@@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:41:16
@@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:41:28
@@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `typing.Literal[1]`
   --> PYI016.py:44:30
@@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]`
 46 | # Shouldn't emit if in new parent type
    |
 help: Remove duplicate union member `typing.Literal[1]`
-
-ℹ Safe fix
-41 41 | field14: int | int | str | int  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44    |-field15: typing.Literal[1] | typing.Literal[1]  # Error
-   44 |+field15: typing.Literal[1]  # Error
-45 45 | 
-46 46 | # Shouldn't emit if in new parent type
-47 47 | field16: int | dict[int, str]  # OK
+41 | field14: int | int | str | int  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+   - field15: typing.Literal[1] | typing.Literal[1]  # Error
+44 + field15: typing.Literal[1]  # Error
+45 | 
+46 | # Shouldn't emit if in new parent type
+47 | field16: int | dict[int, str]  # OK
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.py:57:5
@@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]`
 60 |   ]  # Error, newline and comment will not be emitted in message
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-50 50 | field17: dict[int, int]  # OK
-51 51 | 
-52 52 | # Should emit in cases with newlines
-53    |-field18: typing.Union[
-54    |-    set[
-55    |-        int  # foo
-56    |-    ],
-57    |-    set[
-58    |-        int  # bar
-59    |-    ],
-60    |-]  # Error, newline and comment will not be emitted in message
-   53 |+field18: set[int]  # Error, newline and comment will not be emitted in message
-61 54 | 
-62 55 | # Should emit in cases with `typing.Union` instead of `|`
-63 56 | field19: typing.Union[int, int]  # Error
+50 | field17: dict[int, int]  # OK
+51 | 
+52 | # Should emit in cases with newlines
+   - field18: typing.Union[
+   -     set[
+   -         int  # foo
+   -     ],
+   -     set[
+   -         int  # bar
+   -     ],
+   - ]  # Error, newline and comment will not be emitted in message
+53 + field18: set[int]  # Error, newline and comment will not be emitted in message
+54 | 
+55 | # Should emit in cases with `typing.Union` instead of `|`
+56 | field19: typing.Union[int, int]  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:63:28
@@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int`
 65 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-60 60 | ]  # Error, newline and comment will not be emitted in message
-61 61 | 
-62 62 | # Should emit in cases with `typing.Union` instead of `|`
-63    |-field19: typing.Union[int, int]  # Error
-   63 |+field19: int  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+60 | ]  # Error, newline and comment will not be emitted in message
+61 | 
+62 | # Should emit in cases with `typing.Union` instead of `|`
+   - field19: typing.Union[int, int]  # Error
+63 + field19: int  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:66:41
@@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int`
 68 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-63 63 | field19: typing.Union[int, int]  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66    |-field20: typing.Union[int, typing.Union[int, str]]  # Error
-   66 |+field20: typing.Union[int, str]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69 69 | field21: typing.Union[int, int | str]  # Error
+63 | field19: typing.Union[int, int]  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+   - field20: typing.Union[int, typing.Union[int, str]]  # Error
+66 + field20: typing.Union[int, str]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+69 | field21: typing.Union[int, int | str]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:69:28
@@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int`
 71 | # Should emit only once in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69    |-field21: typing.Union[int, int | str]  # Error
-   69 |+field21: int | str  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field21: typing.Union[int, int | str]  # Error
+69 + field21: int | str  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:72:41
@@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:72:59
@@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:72:64
@@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.py:76:12
@@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]`
 78 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75    |-field23: set[  # foo
-76    |-    int] | set[int]
-   75 |+field23: set[int]
-77 76 | 
-78 77 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 78 | # duplicates of the outer `int`), but not three times (which would indicate that
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+73 | 
+74 | # Should emit in cases with newlines
+   - field23: set[  # foo
+   -     int] | set[int]
+75 + field23: set[int]
+76 | 
+77 | # Should emit twice (once for each `int` in the nested union, both of which are
+78 | # duplicates of the outer `int`), but not three times (which would indicate that
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:81:41
@@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:81:46
@@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:86:28
@@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:86:34
@@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:89:41
@@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int`
 91 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-86 86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89    |-field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   89 |+field26: int  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+   - field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+89 + field26: int  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:92:54
@@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int`
 94 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92    |-field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-   92 |+field27: int  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95 95 | field28: typing.Union[int | int]  # Error
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+   - field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+92 + field27: int  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+95 | field28: typing.Union[int | int]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.py:95:29
@@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int`
 97 | # Should emit twice in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95    |-field28: typing.Union[int | int]  # Error
-   95 |+field28: int  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field28: typing.Union[int | int]  # Error
+95 + field28: int  # Error
+96 | 
+97 | # Should emit twice in cases with multiple nested `typing.Union`
+98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:98:54
@@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:98:59
@@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:101:54
@@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int`
 103 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-98  98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-99  99  | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101     |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-    101 |+field30: typing.Union[int, str]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+    - field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+101 + field30: typing.Union[int, str]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:104:49
@@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int`
 106 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104     |-field31: typing.Union[float, typing.Union[int | int]]  # Error
-    104 |+field31: float | int  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field31: typing.Union[float, typing.Union[int | int]]  # Error
+104 + field31: float | int  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:107:49
@@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:107:55
@@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:110:42
@@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:110:62
@@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:110:68
@@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `list[int]`
    --> PYI016.py:113:61
@@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]`
 115 | field35: "int | str | int"  # Error
     |
 help: Remove duplicate union member `list[int]`
-
-ℹ Safe fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113     |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-    113 |+field34: typing.Union[list[int], str, bytes]  # Error
-114 114 | 
-115 115 | field35: "int | str | int"  # Error
-116 116 | 
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+111 | 
+112 | # Test case for mixed union type
+    - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+113 + field34: typing.Union[list[int], str, bytes]  # Error
+114 | 
+115 | field35: "int | str | int"  # Error
+116 | 
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:115:23
@@ -950,16 +864,14 @@ PYI016 [*] Duplicate union member `int`
     |                       ^^^
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-114 114 | 
-115     |-field35: "int | str | int"  # Error
-    115 |+field35: "int | str"  # Error
-116 116 | 
-117 117 | 
-118 118 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+114 | 
+    - field35: "int | str | int"  # Error
+115 + field35: "int | str"  # Error
+116 | 
+117 | 
+118 | 
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:130:26
@@ -972,16 +884,14 @@ PYI016 [*] Duplicate union member `None`
 132 | field40: typing.Union[typing.Optional[int], None]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-127 127 | field37: typing.Optional[int]
-128 128 | field38: typing.Union[int, None]
-129 129 | # equivalent to None
-130     |-field39: typing.Optional[None]
-    130 |+field39: None
-131 131 | # equivalent to int | None
-132 132 | field40: typing.Union[typing.Optional[int], None]
-133 133 | field41: typing.Optional[typing.Union[int, None]]
+127 | field37: typing.Optional[int]
+128 | field38: typing.Union[int, None]
+129 | # equivalent to None
+    - field39: typing.Optional[None]
+130 + field39: None
+131 | # equivalent to int | None
+132 | field40: typing.Union[typing.Optional[int], None]
+133 | field41: typing.Optional[typing.Union[int, None]]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:132:45
@@ -994,16 +904,14 @@ PYI016 [*] Duplicate union member `None`
 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-129 129 | # equivalent to None
-130 130 | field39: typing.Optional[None]
-131 131 | # equivalent to int | None
-132     |-field40: typing.Union[typing.Optional[int], None]
-    132 |+field40: typing.Union[None, int]
-133 133 | field41: typing.Optional[typing.Union[int, None]]
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135 135 | field43: typing.Optional[int] | None
+129 | # equivalent to None
+130 | field39: typing.Optional[None]
+131 | # equivalent to int | None
+    - field40: typing.Union[typing.Optional[int], None]
+132 + field40: typing.Union[None, int]
+133 | field41: typing.Optional[typing.Union[int, None]]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+135 | field43: typing.Optional[int] | None
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:133:44
@@ -1016,16 +924,14 @@ PYI016 [*] Duplicate union member `None`
 135 | field43: typing.Optional[int] | None
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-130 130 | field39: typing.Optional[None]
-131 131 | # equivalent to int | None
-132 132 | field40: typing.Union[typing.Optional[int], None]
-133     |-field41: typing.Optional[typing.Union[int, None]]
-    133 |+field41: typing.Union[None, int]
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
+130 | field39: typing.Optional[None]
+131 | # equivalent to int | None
+132 | field40: typing.Union[typing.Optional[int], None]
+    - field41: typing.Optional[typing.Union[int, None]]
+133 + field41: typing.Union[None, int]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:134:45
@@ -1038,16 +944,14 @@ PYI016 [*] Duplicate union member `None`
 136 | field44: typing.Optional[int | None]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-131 131 | # equivalent to int | None
-132 132 | field40: typing.Union[typing.Optional[int], None]
-133 133 | field41: typing.Optional[typing.Union[int, None]]
-134     |-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-    134 |+field42: typing.Union[None, int]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
+131 | # equivalent to int | None
+132 | field40: typing.Union[typing.Optional[int], None]
+133 | field41: typing.Optional[typing.Union[int, None]]
+    - field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+134 + field42: typing.Union[None, int]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
+137 | field45: typing.Optional[int] | typing.Optional[int]
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:134:61
@@ -1060,16 +964,14 @@ PYI016 [*] Duplicate union member `int`
 136 | field44: typing.Optional[int | None]
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-131 131 | # equivalent to int | None
-132 132 | field40: typing.Union[typing.Optional[int], None]
-133 133 | field41: typing.Optional[typing.Union[int, None]]
-134     |-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-    134 |+field42: typing.Union[None, int]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
+131 | # equivalent to int | None
+132 | field40: typing.Union[typing.Optional[int], None]
+133 | field41: typing.Optional[typing.Union[int, None]]
+    - field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+134 + field42: typing.Union[None, int]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
+137 | field45: typing.Optional[int] | typing.Optional[int]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:135:33
@@ -1082,16 +984,14 @@ PYI016 [*] Duplicate union member `None`
 137 | field45: typing.Optional[int] | typing.Optional[int]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-132 132 | field40: typing.Union[typing.Optional[int], None]
-133 133 | field41: typing.Optional[typing.Union[int, None]]
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135     |-field43: typing.Optional[int] | None
-    135 |+field43: None | int
-136 136 | field44: typing.Optional[int | None]
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
-138 138 | # equivalent to int | dict | None
+132 | field40: typing.Union[typing.Optional[int], None]
+133 | field41: typing.Optional[typing.Union[int, None]]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+    - field43: typing.Optional[int] | None
+135 + field43: None | int
+136 | field44: typing.Optional[int | None]
+137 | field45: typing.Optional[int] | typing.Optional[int]
+138 | # equivalent to int | dict | None
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:136:32
@@ -1104,16 +1004,14 @@ PYI016 [*] Duplicate union member `None`
 138 | # equivalent to int | dict | None
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-133 133 | field41: typing.Optional[typing.Union[int, None]]
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135 135 | field43: typing.Optional[int] | None
-136     |-field44: typing.Optional[int | None]
-    136 |+field44: None | int
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
-138 138 | # equivalent to int | dict | None
-139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+133 | field41: typing.Optional[typing.Union[int, None]]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+135 | field43: typing.Optional[int] | None
+    - field44: typing.Optional[int | None]
+136 + field44: None | int
+137 | field45: typing.Optional[int] | typing.Optional[int]
+138 | # equivalent to int | dict | None
+139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:137:33
@@ -1126,16 +1024,14 @@ PYI016 [*] Duplicate union member `None`
 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
-137     |-field45: typing.Optional[int] | typing.Optional[int]
-    137 |+field45: typing.Union[None, int]
-138 138 | # equivalent to int | dict | None
-139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
+    - field45: typing.Optional[int] | typing.Optional[int]
+137 + field45: typing.Union[None, int]
+138 | # equivalent to int | dict | None
+139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+140 | field47: typing.Optional[int] | typing.Optional[dict]
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.py:137:49
@@ -1148,16 +1044,14 @@ PYI016 [*] Duplicate union member `int`
 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-135 135 | field43: typing.Optional[int] | None
-136 136 | field44: typing.Optional[int | None]
-137     |-field45: typing.Optional[int] | typing.Optional[int]
-    137 |+field45: typing.Union[None, int]
-138 138 | # equivalent to int | dict | None
-139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
+134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+135 | field43: typing.Optional[int] | None
+136 | field44: typing.Optional[int | None]
+    - field45: typing.Optional[int] | typing.Optional[int]
+137 + field45: typing.Union[None, int]
+138 | # equivalent to int | dict | None
+139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+140 | field47: typing.Optional[int] | typing.Optional[dict]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:139:45
@@ -1169,16 +1063,14 @@ PYI016 [*] Duplicate union member `None`
 140 | field47: typing.Optional[int] | typing.Optional[dict]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-136 136 | field44: typing.Optional[int | None]
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
-138 138 | # equivalent to int | dict | None
-139     |-field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-    139 |+field46: typing.Union[None, int, dict]
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
-141 141 | 
-142 142 | # avoid reporting twice
+136 | field44: typing.Optional[int | None]
+137 | field45: typing.Optional[int] | typing.Optional[int]
+138 | # equivalent to int | dict | None
+    - field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+139 + field46: typing.Union[None, int, dict]
+140 | field47: typing.Optional[int] | typing.Optional[dict]
+141 | 
+142 | # avoid reporting twice
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.py:140:33
@@ -1191,16 +1083,14 @@ PYI016 [*] Duplicate union member `None`
 142 | # avoid reporting twice
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-137 137 | field45: typing.Optional[int] | typing.Optional[int]
-138 138 | # equivalent to int | dict | None
-139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-140     |-field47: typing.Optional[int] | typing.Optional[dict]
-    140 |+field47: typing.Union[None, int, dict]
-141 141 | 
-142 142 | # avoid reporting twice
-143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+137 | field45: typing.Optional[int] | typing.Optional[int]
+138 | # equivalent to int | dict | None
+139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+    - field47: typing.Optional[int] | typing.Optional[dict]
+140 + field47: typing.Union[None, int, dict]
+141 | 
+142 | # avoid reporting twice
+143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.py:143:61
@@ -1211,16 +1101,14 @@ PYI016 [*] Duplicate union member `complex`
 144 | field49: typing.Optional[complex | complex] | complex
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
-141 141 | 
-142 142 | # avoid reporting twice
-143     |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-    143 |+field48: typing.Union[None, complex]
-144 144 | field49: typing.Optional[complex | complex] | complex
-145 145 | 
-146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
+140 | field47: typing.Optional[int] | typing.Optional[dict]
+141 | 
+142 | # avoid reporting twice
+    - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+143 + field48: typing.Union[None, complex]
+144 | field49: typing.Optional[complex | complex] | complex
+145 | 
+146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.py:143:72
@@ -1231,16 +1119,14 @@ PYI016 [*] Duplicate union member `complex`
 144 | field49: typing.Optional[complex | complex] | complex
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-140 140 | field47: typing.Optional[int] | typing.Optional[dict]
-141 141 | 
-142 142 | # avoid reporting twice
-143     |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-    143 |+field48: typing.Union[None, complex]
-144 144 | field49: typing.Optional[complex | complex] | complex
-145 145 | 
-146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
+140 | field47: typing.Optional[int] | typing.Optional[dict]
+141 | 
+142 | # avoid reporting twice
+    - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+143 + field48: typing.Union[None, complex]
+144 | field49: typing.Optional[complex | complex] | complex
+145 | 
+146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.py:144:36
@@ -1253,16 +1139,14 @@ PYI016 [*] Duplicate union member `complex`
 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-141 141 | 
-142 142 | # avoid reporting twice
-143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-144     |-field49: typing.Optional[complex | complex] | complex
-    144 |+field49: None | complex
-145 145 | 
-146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
-147 147 | # Should throw duplicate union member but not fix
+141 | 
+142 | # avoid reporting twice
+143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+    - field49: typing.Optional[complex | complex] | complex
+144 + field49: None | complex
+145 | 
+146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
+147 | # Should throw duplicate union member but not fix
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.py:144:47
@@ -1275,16 +1159,14 @@ PYI016 [*] Duplicate union member `complex`
 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-141 141 | 
-142 142 | # avoid reporting twice
-143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-144     |-field49: typing.Optional[complex | complex] | complex
-    144 |+field49: None | complex
-145 145 | 
-146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
-147 147 | # Should throw duplicate union member but not fix
+141 | 
+142 | # avoid reporting twice
+143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+    - field49: typing.Optional[complex | complex] | complex
+144 + field49: None | complex
+145 | 
+146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403
+147 | # Should throw duplicate union member but not fix
 
 PYI016 Duplicate union member `None`
    --> PYI016.py:148:37
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap
index 4d970dddd1..55114a857e 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap
@@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str`
 9 | # Should emit for union types in arguments.
   |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-4 4 | field1: str
-5 5 | 
-6 6 | # Should emit for duplicate field types.
-7   |-field2: str | str  # PYI016: Duplicate union member `str`
-  7 |+field2: str  # PYI016: Duplicate union member `str`
-8 8 | 
-9 9 | # Should emit for union types in arguments.
-10 10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+4  | field1: str
+5  | 
+6  | # Should emit for duplicate field types.
+   - field2: str | str  # PYI016: Duplicate union member `str`
+7  + field2: str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+10 | def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:10:23
@@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int`
 11 |     print(arg1)
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-7  7  | field2: str | str  # PYI016: Duplicate union member `str`
-8  8  | 
-9  9  | # Should emit for union types in arguments.
-10    |-def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
-   10 |+def func1(arg1: int):  # PYI016: Duplicate union member `int`
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
+7  | field2: str | str  # PYI016: Duplicate union member `str`
+8  | 
+9  | # Should emit for union types in arguments.
+   - def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
+10 + def func1(arg1: int):  # PYI016: Duplicate union member `int`
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:14:22
@@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str`
 15 |     return "my string"
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-11 11 |     print(arg1)
-12 12 | 
-13 13 | # Should emit for unions in return types.
-14    |-def func2() -> str | str:  # PYI016: Duplicate union member `str`
-   14 |+def func2() -> str:  # PYI016: Duplicate union member `str`
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
+11 |     print(arg1)
+12 | 
+13 | # Should emit for unions in return types.
+   - def func2() -> str | str:  # PYI016: Duplicate union member `str`
+14 + def func2() -> str:  # PYI016: Duplicate union member `str`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:18:15
@@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str`
 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-15 15 |     return "my string"
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18    |-field3: str | str | int  # PYI016: Duplicate union member `str`
-   18 |+field3: str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+15 |     return "my string"
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+   - field3: str | str | int  # PYI016: Duplicate union member `str`
+18 + field3: str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:19:15
@@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-16 16 | 
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19    |-field4: int | int | str  # PYI016: Duplicate union member `int`
-   19 |+field4: int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
+16 | 
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+   - field4: int | int | str  # PYI016: Duplicate union member `int`
+19 + field4: int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:20:21
@@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str`
 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-17 17 | # Should emit in longer unions, even if not directly adjacent.
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20    |-field5: str | int | str  # PYI016: Duplicate union member `str`
-   20 |+field5: str | int  # PYI016: Duplicate union member `str`
-21 21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
+17 | # Should emit in longer unions, even if not directly adjacent.
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+   - field5: str | int | str  # PYI016: Duplicate union member `str`
+20 + field5: str | int  # PYI016: Duplicate union member `str`
+21 | field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:21:28
@@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int`
 23 | # Shouldn't emit for non-type unions.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-18 18 | field3: str | str | int  # PYI016: Duplicate union member `str`
-19 19 | field4: int | int | str  # PYI016: Duplicate union member `int`
-20 20 | field5: str | int | str  # PYI016: Duplicate union member `str`
-21    |-field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-   21 |+field6: int | bool | str  # PYI016: Duplicate union member `int`
-22 22 | 
-23 23 | # Shouldn't emit for non-type unions.
-24 24 | field7 = str | str
+18 | field3: str | str | int  # PYI016: Duplicate union member `str`
+19 | field4: int | int | str  # PYI016: Duplicate union member `int`
+20 | field5: str | int | str  # PYI016: Duplicate union member `str`
+   - field6: int | bool | str | int  # PYI016: Duplicate union member `int`
+21 + field6: int | bool | str  # PYI016: Duplicate union member `int`
+22 | 
+23 | # Shouldn't emit for non-type unions.
+24 | field7 = str | str
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:27:22
@@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int`
 29 | # Should handle user brackets when fixing.
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-24 24 | field7 = str | str
-25 25 | 
-26 26 | # Should emit for strangely-bracketed unions.
-27    |-field8: int | (str | int)  # PYI016: Duplicate union member `int`
-   27 |+field8: int | str  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+24 | field7 = str | str
+25 | 
+26 | # Should emit for strangely-bracketed unions.
+   - field8: int | (str | int)  # PYI016: Duplicate union member `int`
+27 + field8: int | str  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:30:16
@@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int`
 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-27 27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30    |-field9: int | (int | str)  # PYI016: Duplicate union member `int`
-   30 |+field9: int | str  # PYI016: Duplicate union member `int`
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
+27 | field8: int | (str | int)  # PYI016: Duplicate union member `int`
+28 | 
+29 | # Should handle user brackets when fixing.
+   - field9: int | (int | str)  # PYI016: Duplicate union member `int`
+30 + field9: int | str  # PYI016: Duplicate union member `int`
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
 
 PYI016 [*] Duplicate union member `str`
   --> PYI016.pyi:31:24
@@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str`
 33 | # Should emit for nested unions.
    |
 help: Remove duplicate union member `str`
-
-ℹ Safe fix
-28 28 | 
-29 29 | # Should handle user brackets when fixing.
-30 30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
-31    |-field10: (str | int) | str  # PYI016: Duplicate union member `str`
-   31 |+field10: str | int  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34 34 | field11: dict[int | int, str]
+28 | 
+29 | # Should handle user brackets when fixing.
+30 | field9: int | (int | str)  # PYI016: Duplicate union member `int`
+   - field10: (str | int) | str  # PYI016: Duplicate union member `str`
+31 + field10: str | int  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+34 | field11: dict[int | int, str]
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:34:21
@@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int`
 36 | # Should emit for unions with more than two cases
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-31 31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
-32 32 | 
-33 33 | # Should emit for nested unions.
-34    |-field11: dict[int | int, str]
-   34 |+field11: dict[int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
+31 | field10: (str | int) | str  # PYI016: Duplicate union member `str`
+32 | 
+33 | # Should emit for nested unions.
+   - field11: dict[int | int, str]
+34 + field11: dict[int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:37:16
@@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:37:22
@@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int`
 38 | field13: int | int | int | int  # Error
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-34 34 | field11: dict[int | int, str]
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37    |-field12: int | int | int  # Error
-   37 |+field12: int  # Error
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
+34 | field11: dict[int | int, str]
+35 | 
+36 | # Should emit for unions with more than two cases
+   - field12: int | int | int  # Error
+37 + field12: int  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:38:16
@@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:38:22
@@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:38:28
@@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int`
 40 | # Should emit for unions with more than two cases, even if not directly adjacent
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-35 35 | 
-36 36 | # Should emit for unions with more than two cases
-37 37 | field12: int | int | int  # Error
-38    |-field13: int | int | int | int  # Error
-   38 |+field13: int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41 41 | field14: int | int | str | int  # Error
+35 | 
+36 | # Should emit for unions with more than two cases
+37 | field12: int | int | int  # Error
+   - field13: int | int | int | int  # Error
+38 + field13: int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+41 | field14: int | int | str | int  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:41:16
@@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:41:28
@@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int`
 43 | # Should emit for duplicate literal types; also covered by PYI030
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-38 38 | field13: int | int | int | int  # Error
-39 39 | 
-40 40 | # Should emit for unions with more than two cases, even if not directly adjacent
-41    |-field14: int | int | str | int  # Error
-   41 |+field14: int | str  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44 44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
+38 | field13: int | int | int | int  # Error
+39 | 
+40 | # Should emit for unions with more than two cases, even if not directly adjacent
+   - field14: int | int | str | int  # Error
+41 + field14: int | str  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+44 | field15: typing.Literal[1] | typing.Literal[1]  # Error
 
 PYI016 [*] Duplicate union member `typing.Literal[1]`
   --> PYI016.pyi:44:30
@@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]`
 46 | # Shouldn't emit if in new parent type
    |
 help: Remove duplicate union member `typing.Literal[1]`
-
-ℹ Safe fix
-41 41 | field14: int | int | str | int  # Error
-42 42 | 
-43 43 | # Should emit for duplicate literal types; also covered by PYI030
-44    |-field15: typing.Literal[1] | typing.Literal[1]  # Error
-   44 |+field15: typing.Literal[1]  # Error
-45 45 | 
-46 46 | # Shouldn't emit if in new parent type
-47 47 | field16: int | dict[int, str]  # OK
+41 | field14: int | int | str | int  # Error
+42 | 
+43 | # Should emit for duplicate literal types; also covered by PYI030
+   - field15: typing.Literal[1] | typing.Literal[1]  # Error
+44 + field15: typing.Literal[1]  # Error
+45 | 
+46 | # Shouldn't emit if in new parent type
+47 | field16: int | dict[int, str]  # OK
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.pyi:57:5
@@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]`
 60 |   ]  # Error, newline and comment will not be emitted in message
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-50 50 | field17: dict[int, int]  # OK
-51 51 | 
-52 52 | # Should emit in cases with newlines
-53    |-field18: typing.Union[
-54    |-    set[
-55    |-        int  # foo
-56    |-    ],
-57    |-    set[
-58    |-        int  # bar
-59    |-    ],
-60    |-]  # Error, newline and comment will not be emitted in message
-   53 |+field18: set[int]  # Error, newline and comment will not be emitted in message
-61 54 | 
-62 55 | # Should emit in cases with `typing.Union` instead of `|`
-63 56 | field19: typing.Union[int, int]  # Error
+50 | field17: dict[int, int]  # OK
+51 | 
+52 | # Should emit in cases with newlines
+   - field18: typing.Union[
+   -     set[
+   -         int  # foo
+   -     ],
+   -     set[
+   -         int  # bar
+   -     ],
+   - ]  # Error, newline and comment will not be emitted in message
+53 + field18: set[int]  # Error, newline and comment will not be emitted in message
+54 | 
+55 | # Should emit in cases with `typing.Union` instead of `|`
+56 | field19: typing.Union[int, int]  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:63:28
@@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int`
 65 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-60 60 | ]  # Error, newline and comment will not be emitted in message
-61 61 | 
-62 62 | # Should emit in cases with `typing.Union` instead of `|`
-63    |-field19: typing.Union[int, int]  # Error
-   63 |+field19: int  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+60 | ]  # Error, newline and comment will not be emitted in message
+61 | 
+62 | # Should emit in cases with `typing.Union` instead of `|`
+   - field19: typing.Union[int, int]  # Error
+63 + field19: int  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:66:41
@@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int`
 68 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-63 63 | field19: typing.Union[int, int]  # Error
-64 64 | 
-65 65 | # Should emit in cases with nested `typing.Union`
-66    |-field20: typing.Union[int, typing.Union[int, str]]  # Error
-   66 |+field20: typing.Union[int, str]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69 69 | field21: typing.Union[int, int | str]  # Error
+63 | field19: typing.Union[int, int]  # Error
+64 | 
+65 | # Should emit in cases with nested `typing.Union`
+   - field20: typing.Union[int, typing.Union[int, str]]  # Error
+66 + field20: typing.Union[int, str]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+69 | field21: typing.Union[int, int | str]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:69:28
@@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int`
 71 | # Should emit only once in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-66 66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
-67 67 | 
-68 68 | # Should emit in cases with mixed `typing.Union` and `|`
-69    |-field21: typing.Union[int, int | str]  # Error
-   69 |+field21: int | str  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+66 | field20: typing.Union[int, typing.Union[int, str]]  # Error
+67 | 
+68 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field21: typing.Union[int, int | str]  # Error
+69 + field21: int | str  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:72:41
@@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:72:59
@@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:72:64
@@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int`
 74 | # Should emit in cases with newlines
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-69 69 | field21: typing.Union[int, int | str]  # Error
-70 70 | 
-71 71 | # Should emit only once in cases with multiple nested `typing.Union`
-72    |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-   72 |+field22: int  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75 75 | field23: set[  # foo
+69 | field21: typing.Union[int, int | str]  # Error
+70 | 
+71 | # Should emit only once in cases with multiple nested `typing.Union`
+   - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+72 + field22: int  # Error
+73 | 
+74 | # Should emit in cases with newlines
+75 | field23: set[  # foo
 
 PYI016 [*] Duplicate union member `set[int]`
   --> PYI016.pyi:76:12
@@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]`
 78 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `set[int]`
-
-ℹ Unsafe fix
-72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-73 73 | 
-74 74 | # Should emit in cases with newlines
-75    |-field23: set[  # foo
-76    |-    int] | set[int]
-   75 |+field23: set[int]
-77 76 | 
-78 77 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 78 | # duplicates of the outer `int`), but not three times (which would indicate that
+72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
+73 | 
+74 | # Should emit in cases with newlines
+   - field23: set[  # foo
+   -     int] | set[int]
+75 + field23: set[int]
+76 | 
+77 | # Should emit twice (once for each `int` in the nested union, both of which are
+78 | # duplicates of the outer `int`), but not three times (which would indicate that
+note: This is an unsafe fix and may change runtime behavior
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:81:41
@@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:81:46
@@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int`
 83 | # Should emit twice (once for each `int` in the nested union, both of which are
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-78 78 | # Should emit twice (once for each `int` in the nested union, both of which are
-79 79 | # duplicates of the outer `int`), but not three times (which would indicate that
-80 80 | # we incorrectly re-checked the nested union).
-81    |-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   81 |+field24: int  # PYI016: Duplicate union member `int`
-82 82 | 
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
+78 | # Should emit twice (once for each `int` in the nested union, both of which are
+79 | # duplicates of the outer `int`), but not three times (which would indicate that
+80 | # we incorrectly re-checked the nested union).
+   - field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+81 + field24: int  # PYI016: Duplicate union member `int`
+82 | 
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:86:28
@@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:86:34
@@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int`
 88 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-83 83 | # Should emit twice (once for each `int` in the nested union, both of which are
-84 84 | # duplicates of the outer `int`), but not three times (which would indicate that
-85 85 | # we incorrectly re-checked the nested union).
-86    |-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-   86 |+field25: int  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+83 | # Should emit twice (once for each `int` in the nested union, both of which are
+84 | # duplicates of the outer `int`), but not three times (which would indicate that
+85 | # we incorrectly re-checked the nested union).
+   - field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+86 + field25: int  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:89:41
@@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int`
 91 | # Should emit in cases with nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-86 86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
-87 87 | 
-88 88 | # Should emit in cases with nested `typing.Union`
-89    |-field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-   89 |+field26: int  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+86 | field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`
+87 | 
+88 | # Should emit in cases with nested `typing.Union`
+   - field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+89 + field26: int  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:92:54
@@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int`
 94 | # Should emit in cases with mixed `typing.Union` and `|`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-89 89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-90 90 | 
-91 91 | # Should emit in cases with nested `typing.Union`
-92    |-field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-   92 |+field27: int  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95 95 | field28: typing.Union[int | int]  # Error
+89 | field26: typing.Union[typing.Union[int, int]]  # PYI016: Duplicate union member `int`
+90 | 
+91 | # Should emit in cases with nested `typing.Union`
+   - field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+92 + field27: int  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+95 | field28: typing.Union[int | int]  # Error
 
 PYI016 [*] Duplicate union member `int`
   --> PYI016.pyi:95:29
@@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int`
 97 | # Should emit twice in cases with multiple nested `typing.Union`
    |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
-93 93 | 
-94 94 | # Should emit in cases with mixed `typing.Union` and `|`
-95    |-field28: typing.Union[int | int]  # Error
-   95 |+field28: int  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+92 | field27: typing.Union[typing.Union[typing.Union[int, int]]]  # PYI016: Duplicate union member `int`
+93 | 
+94 | # Should emit in cases with mixed `typing.Union` and `|`
+   - field28: typing.Union[int | int]  # Error
+95 + field28: int  # Error
+96 | 
+97 | # Should emit twice in cases with multiple nested `typing.Union`
+98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:98:54
@@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:98:59
@@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int`
 100 | # Should emit once in cases with multiple nested `typing.Union`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-95 95 | field28: typing.Union[int | int]  # Error
-96 96 | 
-97 97 | # Should emit twice in cases with multiple nested `typing.Union`
-98    |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-   98 |+field29: int  # Error
-99 99 | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+95  | field28: typing.Union[int | int]  # Error
+96  | 
+97  | # Should emit twice in cases with multiple nested `typing.Union`
+    - field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+98  + field29: int  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:101:54
@@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int`
 103 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-98  98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
-99  99  | 
-100 100 | # Should emit once in cases with multiple nested `typing.Union`
-101     |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-    101 |+field30: typing.Union[int, str]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+98  | field29: typing.Union[int, typing.Union[typing.Union[int, int]]]  # Error
+99  | 
+100 | # Should emit once in cases with multiple nested `typing.Union`
+    - field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+101 + field30: typing.Union[int, str]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:104:49
@@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int`
 106 | # Should emit once, and fix to `typing.Union[float, int]`
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
-102 102 | 
-103 103 | # Should emit once, and fix to `typing.Union[float, int]`
-104     |-field31: typing.Union[float, typing.Union[int | int]]  # Error
-    104 |+field31: float | int  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]]  # Error
+102 | 
+103 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field31: typing.Union[float, typing.Union[int | int]]  # Error
+104 + field31: float | int  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:107:49
@@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:107:55
@@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int`
 109 | # Test case for mixed union type fix
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-104 104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
-105 105 | 
-106 106 | # Should emit once, and fix to `typing.Union[float, int]`
-107     |-field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-    107 |+field32: float | int  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+104 | field31: typing.Union[float, typing.Union[int | int]]  # Error
+105 | 
+106 | # Should emit once, and fix to `typing.Union[float, int]`
+    - field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+107 + field32: float | int  # Error
+108 | 
+109 | # Test case for mixed union type fix
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:110:42
@@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:110:62
@@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:110:68
@@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int`
 112 | # Test case for mixed union type
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-107 107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
-108 108 | 
-109 109 | # Test case for mixed union type fix
-110     |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-    110 |+field33: int # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+107 | field32: typing.Union[float, typing.Union[int | int | int]]  # Error
+108 | 
+109 | # Test case for mixed union type fix
+    - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+110 + field33: int # Error
+111 | 
+112 | # Test case for mixed union type
+113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
 
 PYI016 [*] Duplicate union member `list[int]`
    --> PYI016.pyi:113:61
@@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]`
 115 | # https://github.com/astral-sh/ruff/issues/18546
     |
 help: Remove duplicate union member `list[int]`
-
-ℹ Safe fix
-110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
-111 111 | 
-112 112 | # Test case for mixed union type
-113     |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-    113 |+field34: typing.Union[list[int], str, bytes]  # Error
-114 114 | 
-115 115 | # https://github.com/astral-sh/ruff/issues/18546
-116 116 | # Expand Optional[T] to Union[T, None]
+110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
+111 | 
+112 | # Test case for mixed union type
+    - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
+113 + field34: typing.Union[list[int], str, bytes]  # Error
+114 | 
+115 | # https://github.com/astral-sh/ruff/issues/18546
+116 | # Expand Optional[T] to Union[T, None]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:121:26
@@ -952,16 +866,14 @@ PYI016 [*] Duplicate union member `None`
 123 | field40: typing.Union[typing.Optional[int], None]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-118 118 | field37: typing.Optional[int]
-119 119 | field38: typing.Union[int, None]
-120 120 | # equivalent to None
-121     |-field39: typing.Optional[None]
-    121 |+field39: None
-122 122 | # equivalent to int | None
-123 123 | field40: typing.Union[typing.Optional[int], None]
-124 124 | field41: typing.Optional[typing.Union[int, None]]
+118 | field37: typing.Optional[int]
+119 | field38: typing.Union[int, None]
+120 | # equivalent to None
+    - field39: typing.Optional[None]
+121 + field39: None
+122 | # equivalent to int | None
+123 | field40: typing.Union[typing.Optional[int], None]
+124 | field41: typing.Optional[typing.Union[int, None]]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:123:45
@@ -974,16 +886,14 @@ PYI016 [*] Duplicate union member `None`
 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-120 120 | # equivalent to None
-121 121 | field39: typing.Optional[None]
-122 122 | # equivalent to int | None
-123     |-field40: typing.Union[typing.Optional[int], None]
-    123 |+field40: typing.Union[None, int]
-124 124 | field41: typing.Optional[typing.Union[int, None]]
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126 126 | field43: typing.Optional[int] | None
+120 | # equivalent to None
+121 | field39: typing.Optional[None]
+122 | # equivalent to int | None
+    - field40: typing.Union[typing.Optional[int], None]
+123 + field40: typing.Union[None, int]
+124 | field41: typing.Optional[typing.Union[int, None]]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+126 | field43: typing.Optional[int] | None
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:124:44
@@ -996,16 +906,14 @@ PYI016 [*] Duplicate union member `None`
 126 | field43: typing.Optional[int] | None
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-121 121 | field39: typing.Optional[None]
-122 122 | # equivalent to int | None
-123 123 | field40: typing.Union[typing.Optional[int], None]
-124     |-field41: typing.Optional[typing.Union[int, None]]
-    124 |+field41: typing.Union[None, int]
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
+121 | field39: typing.Optional[None]
+122 | # equivalent to int | None
+123 | field40: typing.Union[typing.Optional[int], None]
+    - field41: typing.Optional[typing.Union[int, None]]
+124 + field41: typing.Union[None, int]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:125:45
@@ -1018,16 +926,14 @@ PYI016 [*] Duplicate union member `None`
 127 | field44: typing.Optional[int | None]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-122 122 | # equivalent to int | None
-123 123 | field40: typing.Union[typing.Optional[int], None]
-124 124 | field41: typing.Optional[typing.Union[int, None]]
-125     |-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-    125 |+field42: typing.Union[None, int]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
+122 | # equivalent to int | None
+123 | field40: typing.Union[typing.Optional[int], None]
+124 | field41: typing.Optional[typing.Union[int, None]]
+    - field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+125 + field42: typing.Union[None, int]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
+128 | field45: typing.Optional[int] | typing.Optional[int]
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:125:61
@@ -1040,16 +946,14 @@ PYI016 [*] Duplicate union member `int`
 127 | field44: typing.Optional[int | None]
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-122 122 | # equivalent to int | None
-123 123 | field40: typing.Union[typing.Optional[int], None]
-124 124 | field41: typing.Optional[typing.Union[int, None]]
-125     |-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-    125 |+field42: typing.Union[None, int]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
+122 | # equivalent to int | None
+123 | field40: typing.Union[typing.Optional[int], None]
+124 | field41: typing.Optional[typing.Union[int, None]]
+    - field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+125 + field42: typing.Union[None, int]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
+128 | field45: typing.Optional[int] | typing.Optional[int]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:126:33
@@ -1062,16 +966,14 @@ PYI016 [*] Duplicate union member `None`
 128 | field45: typing.Optional[int] | typing.Optional[int]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-123 123 | field40: typing.Union[typing.Optional[int], None]
-124 124 | field41: typing.Optional[typing.Union[int, None]]
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126     |-field43: typing.Optional[int] | None
-    126 |+field43: None | int
-127 127 | field44: typing.Optional[int | None]
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
-129 129 | # equivalent to int | dict | None
+123 | field40: typing.Union[typing.Optional[int], None]
+124 | field41: typing.Optional[typing.Union[int, None]]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+    - field43: typing.Optional[int] | None
+126 + field43: None | int
+127 | field44: typing.Optional[int | None]
+128 | field45: typing.Optional[int] | typing.Optional[int]
+129 | # equivalent to int | dict | None
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:127:32
@@ -1084,16 +986,14 @@ PYI016 [*] Duplicate union member `None`
 129 | # equivalent to int | dict | None
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-124 124 | field41: typing.Optional[typing.Union[int, None]]
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126 126 | field43: typing.Optional[int] | None
-127     |-field44: typing.Optional[int | None]
-    127 |+field44: None | int
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
-129 129 | # equivalent to int | dict | None
-130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+124 | field41: typing.Optional[typing.Union[int, None]]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+126 | field43: typing.Optional[int] | None
+    - field44: typing.Optional[int | None]
+127 + field44: None | int
+128 | field45: typing.Optional[int] | typing.Optional[int]
+129 | # equivalent to int | dict | None
+130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:128:33
@@ -1106,16 +1006,14 @@ PYI016 [*] Duplicate union member `None`
 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
-128     |-field45: typing.Optional[int] | typing.Optional[int]
-    128 |+field45: typing.Union[None, int]
-129 129 | # equivalent to int | dict | None
-130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
+    - field45: typing.Optional[int] | typing.Optional[int]
+128 + field45: typing.Union[None, int]
+129 | # equivalent to int | dict | None
+130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+131 | field47: typing.Optional[int] | typing.Optional[dict]
 
 PYI016 [*] Duplicate union member `int`
    --> PYI016.pyi:128:49
@@ -1128,16 +1026,14 @@ PYI016 [*] Duplicate union member `int`
 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
     |
 help: Remove duplicate union member `int`
-
-ℹ Safe fix
-125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-126 126 | field43: typing.Optional[int] | None
-127 127 | field44: typing.Optional[int | None]
-128     |-field45: typing.Optional[int] | typing.Optional[int]
-    128 |+field45: typing.Union[None, int]
-129 129 | # equivalent to int | dict | None
-130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
+125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]]
+126 | field43: typing.Optional[int] | None
+127 | field44: typing.Optional[int | None]
+    - field45: typing.Optional[int] | typing.Optional[int]
+128 + field45: typing.Union[None, int]
+129 | # equivalent to int | dict | None
+130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+131 | field47: typing.Optional[int] | typing.Optional[dict]
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:130:45
@@ -1149,16 +1045,14 @@ PYI016 [*] Duplicate union member `None`
 131 | field47: typing.Optional[int] | typing.Optional[dict]
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-127 127 | field44: typing.Optional[int | None]
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
-129 129 | # equivalent to int | dict | None
-130     |-field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-    130 |+field46: typing.Union[None, int, dict]
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
-132 132 | 
-133 133 | # avoid reporting twice
+127 | field44: typing.Optional[int | None]
+128 | field45: typing.Optional[int] | typing.Optional[int]
+129 | # equivalent to int | dict | None
+    - field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+130 + field46: typing.Union[None, int, dict]
+131 | field47: typing.Optional[int] | typing.Optional[dict]
+132 | 
+133 | # avoid reporting twice
 
 PYI016 [*] Duplicate union member `None`
    --> PYI016.pyi:131:33
@@ -1171,16 +1065,14 @@ PYI016 [*] Duplicate union member `None`
 133 | # avoid reporting twice
     |
 help: Remove duplicate union member `None`
-
-ℹ Safe fix
-128 128 | field45: typing.Optional[int] | typing.Optional[int]
-129 129 | # equivalent to int | dict | None
-130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-131     |-field47: typing.Optional[int] | typing.Optional[dict]
-    131 |+field47: typing.Union[None, int, dict]
-132 132 | 
-133 133 | # avoid reporting twice
-134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+128 | field45: typing.Optional[int] | typing.Optional[int]
+129 | # equivalent to int | dict | None
+130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
+    - field47: typing.Optional[int] | typing.Optional[dict]
+131 + field47: typing.Union[None, int, dict]
+132 | 
+133 | # avoid reporting twice
+134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.pyi:134:61
@@ -1191,14 +1083,12 @@ PYI016 [*] Duplicate union member `complex`
 135 | field49: typing.Optional[complex | complex] | complex
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
-132 132 | 
-133 133 | # avoid reporting twice
-134     |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-    134 |+field48: typing.Union[None, complex]
-135 135 | field49: typing.Optional[complex | complex] | complex
+131 | field47: typing.Optional[int] | typing.Optional[dict]
+132 | 
+133 | # avoid reporting twice
+    - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+134 + field48: typing.Union[None, complex]
+135 | field49: typing.Optional[complex | complex] | complex
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.pyi:134:72
@@ -1209,14 +1099,12 @@ PYI016 [*] Duplicate union member `complex`
 135 | field49: typing.Optional[complex | complex] | complex
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-131 131 | field47: typing.Optional[int] | typing.Optional[dict]
-132 132 | 
-133 133 | # avoid reporting twice
-134     |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-    134 |+field48: typing.Union[None, complex]
-135 135 | field49: typing.Optional[complex | complex] | complex
+131 | field47: typing.Optional[int] | typing.Optional[dict]
+132 | 
+133 | # avoid reporting twice
+    - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+134 + field48: typing.Union[None, complex]
+135 | field49: typing.Optional[complex | complex] | complex
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.pyi:135:36
@@ -1227,13 +1115,11 @@ PYI016 [*] Duplicate union member `complex`
     |                                    ^^^^^^^
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-132 132 | 
-133 133 | # avoid reporting twice
-134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-135     |-field49: typing.Optional[complex | complex] | complex
-    135 |+field49: None | complex
+132 | 
+133 | # avoid reporting twice
+134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+    - field49: typing.Optional[complex | complex] | complex
+135 + field49: None | complex
 
 PYI016 [*] Duplicate union member `complex`
    --> PYI016.pyi:135:47
@@ -1244,10 +1130,8 @@ PYI016 [*] Duplicate union member `complex`
     |                                               ^^^^^^^
     |
 help: Remove duplicate union member `complex`
-
-ℹ Safe fix
-132 132 | 
-133 133 | # avoid reporting twice
-134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-135     |-field49: typing.Optional[complex | complex] | complex
-    135 |+field49: None | complex
+132 | 
+133 | # avoid reporting twice
+134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
+    - field49: typing.Optional[complex | complex] | complex
+135 + field49: None | complex
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap
index aca6cc9120..eeb5df4a57 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap
@@ -12,16 +12,14 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `NewAny: Type
 5 | Foo = Literal["foo"]
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1 1 | from typing import Literal, Any
-  2 |+from typing_extensions import TypeAlias
-2 3 | 
-3   |-NewAny = Any
-  4 |+NewAny: TypeAlias = Any
-4 5 | OptionalStr = typing.Optional[str]
-5 6 | Foo = Literal["foo"]
-6 7 | IntOrStr = int | str
+1 | from typing import Literal, Any
+2 + from typing_extensions import TypeAlias
+3 | 
+  - NewAny = Any
+4 + NewAny: TypeAlias = Any
+5 | OptionalStr = typing.Optional[str]
+6 | Foo = Literal["foo"]
+7 | IntOrStr = int | str
 
 PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `OptionalStr: TypeAlias = typing.Optional[str]`
  --> PYI026.pyi:4:1
@@ -33,17 +31,15 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `OptionalStr:
 6 | IntOrStr = int | str
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1 1 | from typing import Literal, Any
-  2 |+from typing_extensions import TypeAlias
-2 3 | 
-3 4 | NewAny = Any
-4   |-OptionalStr = typing.Optional[str]
-  5 |+OptionalStr: TypeAlias = typing.Optional[str]
-5 6 | Foo = Literal["foo"]
-6 7 | IntOrStr = int | str
-7 8 | AliasNone = None
+1 | from typing import Literal, Any
+2 + from typing_extensions import TypeAlias
+3 | 
+4 | NewAny = Any
+  - OptionalStr = typing.Optional[str]
+5 + OptionalStr: TypeAlias = typing.Optional[str]
+6 | Foo = Literal["foo"]
+7 | IntOrStr = int | str
+8 | AliasNone = None
 
 PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `Foo: TypeAlias = Literal["foo"]`
  --> PYI026.pyi:5:1
@@ -56,18 +52,16 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `Foo: TypeAli
 7 | AliasNone = None
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1 1 | from typing import Literal, Any
-  2 |+from typing_extensions import TypeAlias
-2 3 | 
-3 4 | NewAny = Any
-4 5 | OptionalStr = typing.Optional[str]
-5   |-Foo = Literal["foo"]
-  6 |+Foo: TypeAlias = Literal["foo"]
-6 7 | IntOrStr = int | str
-7 8 | AliasNone = None
-8 9 | 
+1 | from typing import Literal, Any
+2 + from typing_extensions import TypeAlias
+3 | 
+4 | NewAny = Any
+5 | OptionalStr = typing.Optional[str]
+  - Foo = Literal["foo"]
+6 + Foo: TypeAlias = Literal["foo"]
+7 | IntOrStr = int | str
+8 | AliasNone = None
+9 | 
 
 PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `IntOrStr: TypeAlias = int | str`
  --> PYI026.pyi:6:1
@@ -79,19 +73,17 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `IntOrStr: Ty
 7 | AliasNone = None
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1 1 | from typing import Literal, Any
-  2 |+from typing_extensions import TypeAlias
-2 3 | 
-3 4 | NewAny = Any
-4 5 | OptionalStr = typing.Optional[str]
-5 6 | Foo = Literal["foo"]
-6   |-IntOrStr = int | str
-  7 |+IntOrStr: TypeAlias = int | str
-7 8 | AliasNone = None
-8 9 | 
-9 10 | NewAny: typing.TypeAlias = Any
+1  | from typing import Literal, Any
+2  + from typing_extensions import TypeAlias
+3  | 
+4  | NewAny = Any
+5  | OptionalStr = typing.Optional[str]
+6  | Foo = Literal["foo"]
+   - IntOrStr = int | str
+7  + IntOrStr: TypeAlias = int | str
+8  | AliasNone = None
+9  | 
+10 | NewAny: typing.TypeAlias = Any
 
 PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `AliasNone: TypeAlias = None`
  --> PYI026.pyi:7:1
@@ -104,20 +96,18 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `AliasNone: T
 9 | NewAny: typing.TypeAlias = Any
   |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1 1 | from typing import Literal, Any
-  2 |+from typing_extensions import TypeAlias
-2 3 | 
-3 4 | NewAny = Any
-4 5 | OptionalStr = typing.Optional[str]
-5 6 | Foo = Literal["foo"]
-6 7 | IntOrStr = int | str
-7   |-AliasNone = None
-  8 |+AliasNone: TypeAlias = None
-8 9 | 
-9 10 | NewAny: typing.TypeAlias = Any
-10 11 | OptionalStr: TypeAlias = typing.Optional[str]
+1  | from typing import Literal, Any
+2  + from typing_extensions import TypeAlias
+3  | 
+4  | NewAny = Any
+5  | OptionalStr = typing.Optional[str]
+6  | Foo = Literal["foo"]
+7  | IntOrStr = int | str
+   - AliasNone = None
+8  + AliasNone: TypeAlias = None
+9  | 
+10 | NewAny: typing.TypeAlias = Any
+11 | OptionalStr: TypeAlias = typing.Optional[str]
 
 PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `FLAG_THIS: TypeAlias = None`
   --> PYI026.pyi:17:5
@@ -129,19 +119,17 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `FLAG_THIS: T
 19 | # these are ok
    |
 help: Add `TypeAlias` annotation
-
-ℹ Safe fix
-1  1  | from typing import Literal, Any
-   2  |+from typing_extensions import TypeAlias
-2  3  | 
-3  4  | NewAny = Any
-4  5  | OptionalStr = typing.Optional[str]
+1  | from typing import Literal, Any
+2  + from typing_extensions import TypeAlias
+3  | 
+4  | NewAny = Any
+5  | OptionalStr = typing.Optional[str]
 --------------------------------------------------------------------------------
-14 15 | AliasNone: typing.TypeAlias = None
-15 16 | 
-16 17 | class NotAnEnum:
-17    |-    FLAG_THIS = None
-   18 |+    FLAG_THIS: TypeAlias = None
-18 19 | 
-19 20 | # these are ok
-20 21 | from enum import Enum
+15 | AliasNone: typing.TypeAlias = None
+16 | 
+17 | class NotAnEnum:
+   -     FLAG_THIS = None
+18 +     FLAG_THIS: TypeAlias = None
+19 | 
+20 | # these are ok
+21 | from enum import Enum
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap
index dc91e6c77a..7419d8db9b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap
@@ -9,16 +9,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 5 |     ...
   |
 help: Replace with `None`
-
-ℹ Safe fix
-1 1 | from typing import Literal, Union
-2 2 | 
-3 3 | 
-4   |-def func1(arg1: Literal[None]):
-  4 |+def func1(arg1: None):
-5 5 |     ...
-6 6 | 
-7 7 | 
+1 | from typing import Literal, Union
+2 | 
+3 | 
+  - def func1(arg1: Literal[None]):
+4 + def func1(arg1: None):
+5 |     ...
+6 | 
+7 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
  --> PYI061.py:8:25
@@ -28,16 +26,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 9 |     ...
   |
 help: Replace with `None`
-
-ℹ Safe fix
-5 5 |     ...
-6 6 | 
-7 7 | 
-8   |-def func2(arg1: Literal[None] | int):
-  8 |+def func2(arg1: None | int):
-9 9 |     ...
-10 10 | 
-11 11 | 
+5  |     ...
+6  | 
+7  | 
+   - def func2(arg1: Literal[None] | int):
+8  + def func2(arg1: None | int):
+9  |     ...
+10 | 
+11 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:12:24
@@ -47,16 +43,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 13 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-9  9  |     ...
-10 10 | 
-11 11 | 
-12    |-def func3() -> Literal[None]:
-   12 |+def func3() -> None:
-13 13 |     ...
-14 14 | 
-15 15 | 
+9  |     ...
+10 | 
+11 | 
+   - def func3() -> Literal[None]:
+12 + def func3() -> None:
+13 |     ...
+14 | 
+15 | 
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:16:30
@@ -66,22 +60,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
 17 |     ...
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Safe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-13 13 |     ...
-14 14 | 
-15 15 | 
-16    |-def func4(arg1: Literal[int, None, float]):
-   16 |+def func4(arg1: Optional[Literal[int, float]]):
-17 17 |     ...
-18 18 | 
-19 19 | 
+13 |     ...
+14 | 
+15 | 
+   - def func4(arg1: Literal[int, None, float]):
+16 + def func4(arg1: Optional[Literal[int, float]]):
+17 |     ...
+18 | 
+19 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:20:25
@@ -91,16 +83,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 21 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-17 17 |     ...
-18 18 | 
-19 19 | 
-20    |-def func5(arg1: Literal[None, None]):
-   20 |+def func5(arg1: None):
-21 21 |     ...
-22 22 | 
-23 23 | 
+17 |     ...
+18 | 
+19 | 
+   - def func5(arg1: Literal[None, None]):
+20 + def func5(arg1: None):
+21 |     ...
+22 | 
+23 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:20:31
@@ -110,16 +100,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 21 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-17 17 |     ...
-18 18 | 
-19 19 | 
-20    |-def func5(arg1: Literal[None, None]):
-   20 |+def func5(arg1: None):
-21 21 |     ...
-22 22 | 
-23 23 | 
+17 |     ...
+18 | 
+19 | 
+   - def func5(arg1: Literal[None, None]):
+20 + def func5(arg1: None):
+21 |     ...
+22 | 
+23 | 
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:26:5
@@ -132,26 +120,25 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
 28 |     ]):
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Unsafe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-21 21 |     ...
-22 22 | 
-23 23 | 
-24    |-def func6(arg1: Literal[
-25    |-    "hello",
-26    |-    None  # Comment 1
-27    |-    , "world"
-28    |-    ]):
-   24 |+def func6(arg1: Optional[Literal["hello", "world"]]):
-29 25 |     ...
-30 26 | 
-31 27 | 
+21 |     ...
+22 | 
+23 | 
+   - def func6(arg1: Literal[
+   -     "hello",
+   -     None  # Comment 1
+   -     , "world"
+   -     ]):
+24 + def func6(arg1: Optional[Literal["hello", "world"]]):
+25 |     ...
+26 | 
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:33:5
@@ -163,18 +150,17 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 35 |     ...
    |
 help: Replace with `None`
-
-ℹ Unsafe fix
-29 29 |     ...
-30 30 | 
-31 31 | 
-32    |-def func7(arg1: Literal[
-33    |-    None  # Comment 1
-34    |-    ]):
-   32 |+def func7(arg1: None):
-35 33 |     ...
-36 34 | 
-37 35 | 
+29 |     ...
+30 | 
+31 | 
+   - def func7(arg1: Literal[
+   -     None  # Comment 1
+   -     ]):
+32 + def func7(arg1: None):
+33 |     ...
+34 | 
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.py:38:25
@@ -193,16 +179,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 43 |     ...
    |
 help: Replace with `None`
-
-ℹ Safe fix
-39 39 |     ...
-40 40 | 
-41 41 | 
-42    |-def func9(arg1: Union[Literal[None], None]):
-   42 |+def func9(arg1: Union[None, None]):
-43 43 |     ...
-44 44 | 
-45 45 | 
+39 |     ...
+40 | 
+41 | 
+   - def func9(arg1: Union[Literal[None], None]):
+42 + def func9(arg1: Union[None, None]):
+43 |     ...
+44 | 
+45 | 
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:52:9
@@ -213,16 +197,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 53 | Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-49 49 | 
-50 50 | 
-51 51 | # From flake8-pyi
-52    |-Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-   52 |+None  # Y061 None inside "Literal[]" expression. Replace with "None"
-53 53 | Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-54 54 | 
-55 55 | ###
+49 | 
+50 | 
+51 | # From flake8-pyi
+   - Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+52 + None  # Y061 None inside "Literal[]" expression. Replace with "None"
+53 | Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+54 | 
+55 | ###
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:53:15
@@ -235,22 +217,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
 55 | ###
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Safe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-50 50 | 
-51 51 | # From flake8-pyi
-52 52 | Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-53    |-Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-   53 |+Optional[Literal[True]]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-54 54 | 
-55 55 | ###
-56 56 | # The following rules here are slightly subtle,
+50 | 
+51 | # From flake8-pyi
+52 | Literal[None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[True, None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+53 + Optional[Literal[True]]  # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+54 | 
+55 | ###
+56 | # The following rules here are slightly subtle,
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:62:9
@@ -262,16 +242,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-59 59 | 
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62    |-Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-   62 |+None  # Y061 None inside "Literal[]" expression. Replace with "None"
-63 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
+59 | 
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+   - Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+62 + None  # Y061 None inside "Literal[]" expression. Replace with "None"
+63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.py:62:15
@@ -283,16 +261,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-59 59 | 
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62    |-Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-   62 |+None  # Y061 None inside "Literal[]" expression. Replace with "None"
-63 63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
+59 | 
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+   - Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+62 + None  # Y061 None inside "Literal[]" expression. Replace with "None"
+63 | Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:63:12
@@ -305,22 +281,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
 65 | # ... but if Y061 and Y062 both apply
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Safe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62 62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-63    |-Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-   63 |+Optional[Literal[1, "foo"]]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+63 + Optional[Literal[1, "foo"]]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:63:25
@@ -333,22 +307,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
 65 | # ... but if Y061 and Y062 both apply
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Safe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
-61 61 | # only emit Y061...
-62 62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
-63    |-Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-   63 |+Optional[Literal[1, "foo"]]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
-64 64 | 
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
+60 | # If Y061 and Y062 both apply, but all the duplicate members are None,
+61 | # only emit Y061...
+62 | Literal[None, None]  # Y061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[1, None, "foo", None]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+63 + Optional[Literal[1, "foo"]]  # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None"
+64 | 
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:68:9
@@ -359,22 +331,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
    |         ^^^^
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Safe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
-67 67 | # only emit Y062:
-68    |-Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
-   68 |+Optional[Literal[True, True]]  # Y062 Duplicate "Literal[]" member "True"
-69 69 | 
-70 70 | 
-71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
+67 | # only emit Y062:
+   - Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
+68 + Optional[Literal[True, True]]  # Y062 Duplicate "Literal[]" member "True"
+69 | 
+70 | 
+71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
   --> PYI061.py:68:21
@@ -385,22 +355,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]`
    |                     ^^^^
    |
 help: Replace with `Optional[Literal[...]]`
-
-ℹ Safe fix
-1     |-from typing import Literal, Union
-   1  |+from typing import Literal, Union, Optional
-2  2  | 
-3  3  | 
-4  4  | def func1(arg1: Literal[None]):
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
 --------------------------------------------------------------------------------
-65 65 | # ... but if Y061 and Y062 both apply
-66 66 | # and there are no None members in the Literal[] slice,
-67 67 | # only emit Y062:
-68    |-Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
-   68 |+Optional[Literal[True, True]]  # Y062 Duplicate "Literal[]" member "True"
-69 69 | 
-70 70 | 
-71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+65 | # ... but if Y061 and Y062 both apply
+66 | # and there are no None members in the Literal[] slice,
+67 | # only emit Y062:
+   - Literal[None, True, None, True]  # Y062 Duplicate "Literal[]" member "True"
+68 + Optional[Literal[True, True]]  # Y062 Duplicate "Literal[]" member "True"
+69 | 
+70 | 
+71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.py:72:12
@@ -435,16 +403,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 76 | a: int | Literal[None] | None
    |
 help: Replace with `None`
-
-ℹ Safe fix
-71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
-72 72 | x: Literal[None] | None
-73 73 | y: None | Literal[None]
-74    |-z: Union[Literal[None], None]
-   74 |+z: Union[None, None]
-75 75 | 
-76 76 | a: int | Literal[None] | None
-77 77 | b: None | Literal[None] | None
+71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+72 | x: Literal[None] | None
+73 | y: None | Literal[None]
+   - z: Union[Literal[None], None]
+74 + z: Union[None, None]
+75 | 
+76 | a: int | Literal[None] | None
+77 | b: None | Literal[None] | None
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.py:76:18
@@ -499,5 +465,153 @@ PYI061 Use `None` rather than `Literal[None]`
 79 | d: None | (Literal[None] | None)
 80 | e: None | ((None | Literal[None]) | None) | None
    |                            ^^^^
+81 |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
    |
 help: Replace with `None`
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:83:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   |                  ^^^^
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+80 | e: None | ((None | Literal[None]) | None) | None
+81 | 
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+   - print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+83 + print(Optional[Literal[1]].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:84:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   |                  ^^^^
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+81 | 
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   - print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+84 + print(Optional[Literal[1]].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:85:18
+   |
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |                  ^^^^
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   - print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+85 + print(Optional[Literal[1]][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:86:18
+   |
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |                  ^^^^
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   - print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+86 + print(Optional[Literal[1]] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:87:18
+   |
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |                  ^^^^
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   - print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+87 + print(Optional[Literal[1]] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:88:19
+   |
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |                   ^^^^
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   - print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+88 + print((Optional[Literal[1]]).__dict__)  # Should become ((Literal[1] | None)).__dict__
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap
index 181432a325..34fbd2eb2b 100644
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap
@@ -8,16 +8,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
   |                         ^^^^
   |
 help: Replace with `None`
-
-ℹ Safe fix
-1 1 | from typing import Literal, Union
-2 2 | 
-3 3 | 
-4   |-def func1(arg1: Literal[None]): ...
-  4 |+def func1(arg1: None): ...
-5 5 | 
-6 6 | 
-7 7 | def func2(arg1: Literal[None] | int): ...
+1 | from typing import Literal, Union
+2 | 
+3 | 
+  - def func1(arg1: Literal[None]): ...
+4 + def func1(arg1: None): ...
+5 | 
+6 | 
+7 | def func2(arg1: Literal[None] | int): ...
 
 PYI061 [*] Use `None` rather than `Literal[None]`
  --> PYI061.pyi:7:25
@@ -26,16 +24,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
   |                         ^^^^
   |
 help: Replace with `None`
-
-ℹ Safe fix
-4 4 | def func1(arg1: Literal[None]): ...
-5 5 | 
-6 6 | 
-7   |-def func2(arg1: Literal[None] | int): ...
-  7 |+def func2(arg1: None | int): ...
-8 8 | 
-9 9 | 
-10 10 | def func3() -> Literal[None]: ...
+4  | def func1(arg1: Literal[None]): ...
+5  | 
+6  | 
+   - def func2(arg1: Literal[None] | int): ...
+7  + def func2(arg1: None | int): ...
+8  | 
+9  | 
+10 | def func3() -> Literal[None]: ...
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:10:24
@@ -44,16 +40,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                        ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-7  7  | def func2(arg1: Literal[None] | int): ...
-8  8  | 
-9  9  | 
-10    |-def func3() -> Literal[None]: ...
-   10 |+def func3() -> None: ...
-11 11 | 
-12 12 | 
-13 13 | def func4(arg1: Literal[int, None, float]): ...
+7  | def func2(arg1: Literal[None] | int): ...
+8  | 
+9  | 
+   - def func3() -> Literal[None]: ...
+10 + def func3() -> None: ...
+11 | 
+12 | 
+13 | def func4(arg1: Literal[int, None, float]): ...
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.pyi:13:30
@@ -62,16 +56,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
    |                              ^^^^
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-10 10 | def func3() -> Literal[None]: ...
-11 11 | 
-12 12 | 
-13    |-def func4(arg1: Literal[int, None, float]): ...
-   13 |+def func4(arg1: Literal[int, float] | None): ...
-14 14 | 
-15 15 | 
-16 16 | def func5(arg1: Literal[None, None]): ...
+10 | def func3() -> Literal[None]: ...
+11 | 
+12 | 
+   - def func4(arg1: Literal[int, None, float]): ...
+13 + def func4(arg1: Literal[int, float] | None): ...
+14 | 
+15 | 
+16 | def func5(arg1: Literal[None, None]): ...
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:16:25
@@ -80,16 +72,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                         ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-13 13 | def func4(arg1: Literal[int, None, float]): ...
-14 14 | 
-15 15 | 
-16    |-def func5(arg1: Literal[None, None]): ...
-   16 |+def func5(arg1: None): ...
-17 17 | 
-18 18 | 
-19 19 | def func6(arg1: Literal[
+13 | def func4(arg1: Literal[int, None, float]): ...
+14 | 
+15 | 
+   - def func5(arg1: Literal[None, None]): ...
+16 + def func5(arg1: None): ...
+17 | 
+18 | 
+19 | def func6(arg1: Literal[
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:16:31
@@ -98,16 +88,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                               ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-13 13 | def func4(arg1: Literal[int, None, float]): ...
-14 14 | 
-15 15 | 
-16    |-def func5(arg1: Literal[None, None]): ...
-   16 |+def func5(arg1: None): ...
-17 17 | 
-18 18 | 
-19 19 | def func6(arg1: Literal[
+13 | def func4(arg1: Literal[int, None, float]): ...
+14 | 
+15 | 
+   - def func5(arg1: Literal[None, None]): ...
+16 + def func5(arg1: None): ...
+17 | 
+18 | 
+19 | def func6(arg1: Literal[
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.pyi:21:5
@@ -120,20 +108,19 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
 23 | ]): ...
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Unsafe fix
-16 16 | def func5(arg1: Literal[None, None]): ...
-17 17 | 
-18 18 | 
-19    |-def func6(arg1: Literal[
-20    |-    "hello",
-21    |-    None  # Comment 1
-22    |-    , "world"
-23    |-]): ...
-   19 |+def func6(arg1: Literal["hello", "world"] | None): ...
-24 20 | 
-25 21 | 
-26 22 | def func7(arg1: Literal[
+16 | def func5(arg1: Literal[None, None]): ...
+17 | 
+18 | 
+   - def func6(arg1: Literal[
+   -     "hello",
+   -     None  # Comment 1
+   -     , "world"
+   - ]): ...
+19 + def func6(arg1: Literal["hello", "world"] | None): ...
+20 | 
+21 | 
+22 | def func7(arg1: Literal[
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:27:5
@@ -144,18 +131,17 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 28 | ]): ...
    |
 help: Replace with `None`
-
-ℹ Unsafe fix
-23 23 | ]): ...
-24 24 | 
-25 25 | 
-26    |-def func7(arg1: Literal[
-27    |-    None  # Comment 1
-28    |-]): ...
-   26 |+def func7(arg1: None): ...
-29 27 | 
-30 28 | 
-31 29 | def func8(arg1: Literal[None] | None):...
+23 | ]): ...
+24 | 
+25 | 
+   - def func7(arg1: Literal[
+   -     None  # Comment 1
+   - ]): ...
+26 + def func7(arg1: None): ...
+27 | 
+28 | 
+29 | def func8(arg1: Literal[None] | None):...
+note: This is an unsafe fix and may change runtime behavior
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.pyi:31:25
@@ -172,16 +158,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
    |                               ^^^^
    |
 help: Replace with `None`
-
-ℹ Safe fix
-31 31 | def func8(arg1: Literal[None] | None):...
-32 32 | 
-33 33 | 
-34    |-def func9(arg1: Union[Literal[None], None]): ...
-   34 |+def func9(arg1: Union[None, None]): ...
-35 35 | 
-36 36 | 
-37 37 | # OK
+31 | def func8(arg1: Literal[None] | None):...
+32 | 
+33 | 
+   - def func9(arg1: Union[Literal[None], None]): ...
+34 + def func9(arg1: Union[None, None]): ...
+35 | 
+36 | 
+37 | # OK
 
 PYI061 [*] Use `None` rather than `Literal[None]`
   --> PYI061.pyi:42:9
@@ -192,16 +176,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 43 | Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
    |
 help: Replace with `None`
-
-ℹ Safe fix
-39 39 | 
-40 40 | 
-41 41 | # From flake8-pyi
-42    |-Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
-   42 |+None  # PYI061 None inside "Literal[]" expression. Replace with "None"
-43 43 | Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-44 44 | 
-45 45 | 
+39 | 
+40 | 
+41 | # From flake8-pyi
+   - Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
+42 + None  # PYI061 None inside "Literal[]" expression. Replace with "None"
+43 | Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+44 | 
+45 | 
 
 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
   --> PYI061.pyi:43:15
@@ -212,16 +194,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]`
    |               ^^^^
    |
 help: Replace with `Literal[...] | None`
-
-ℹ Safe fix
-40 40 | 
-41 41 | # From flake8-pyi
-42 42 | Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
-43    |-Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-   43 |+Literal[True] | None  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
-44 44 | 
-45 45 | 
-46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+40 | 
+41 | # From flake8-pyi
+42 | Literal[None]  # PYI061 None inside "Literal[]" expression. Replace with "None"
+   - Literal[True, None]  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+43 + Literal[True] | None  # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None"
+44 | 
+45 | 
+46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.pyi:47:12
@@ -256,16 +236,14 @@ PYI061 [*] Use `None` rather than `Literal[None]`
 51 | a: int | Literal[None] | None
    |
 help: Replace with `None`
-
-ℹ Safe fix
-46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
-47 47 | x: Literal[None] | None
-48 48 | y: None | Literal[None]
-49    |-z: Union[Literal[None], None]
-   49 |+z: Union[None, None]
-50 50 | 
-51 51 | a: int | Literal[None] | None
-52 52 | b: None | Literal[None] | None
+46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+47 | x: Literal[None] | None
+48 | y: None | Literal[None]
+   - z: Union[Literal[None], None]
+49 + z: Union[None, None]
+50 | 
+51 | a: int | Literal[None] | None
+52 | b: None | Literal[None] | None
 
 PYI061 Use `None` rather than `Literal[None]`
   --> PYI061.pyi:51:18
diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__pyi021_pie790_isolation_check.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__pyi021_pie790_isolation_check.snap
new file mode 100644
index 0000000000..dc2d6688d9
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__pyi021_pie790_isolation_check.snap
@@ -0,0 +1,39 @@
+---
+source: crates/ruff_linter/src/rules/flake8_pyi/mod.rs
+---
+PYI021 [*] Docstrings should not be included in stubs
+ --> PYI021_1.pyi:5:5
+  |
+4 | def check_isolation_level(mode: int) -> None:
+5 |     """Will report both, but only fix the first."""  # ERROR PYI021
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 |     ...  # ERROR PIE790
+  |
+help: Remove docstring
+2 | 
+3 | 
+4 | def check_isolation_level(mode: int) -> None:
+  -     """Will report both, but only fix the first."""  # ERROR PYI021
+5 +       # ERROR PYI021
+6 |     ...  # ERROR PIE790
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
+
+PIE790 [*] Unnecessary `...` literal
+ --> PYI021_1.pyi:6:5
+  |
+4 | def check_isolation_level(mode: int) -> None:
+5 |     """Will report both, but only fix the first."""  # ERROR PYI021
+6 |     ...  # ERROR PIE790
+  |     ^^^
+  |
+help: Remove unnecessary `...`
+3 | 
+4 | def check_isolation_level(mode: int) -> None:
+5 |     """Will report both, but only fix the first."""  # ERROR PYI021
+  -     ...  # ERROR PIE790
+6 +     # ERROR PIE790
+7 | 
+8 | 
+9 | with nullcontext():
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
index 599decd57b..545372dd6c 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
@@ -61,6 +61,7 @@ use super::unittest_assert::UnittestAssert;
 ///     assert not something_else
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestCompositeAssertion;
 
 impl Violation for PytestCompositeAssertion {
@@ -108,6 +109,7 @@ impl Violation for PytestCompositeAssertion {
 /// ## References
 /// - [`pytest` documentation: `pytest.raises`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-raises)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestAssertInExcept {
     name: String,
 }
@@ -149,6 +151,7 @@ impl Violation for PytestAssertInExcept {
 /// ## References
 /// - [`pytest` documentation: `pytest.fail`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-fail)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestAssertAlwaysFalse;
 
 impl Violation for PytestAssertAlwaysFalse {
@@ -188,6 +191,7 @@ impl Violation for PytestAssertAlwaysFalse {
 /// ## References
 /// - [`pytest` documentation: Assertion introspection details](https://docs.pytest.org/en/7.1.x/how-to/assert.html#assertion-introspection-details)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestUnittestAssertion {
     assertion: String,
 }
@@ -343,6 +347,7 @@ pub(crate) fn unittest_assertion(
 /// ## References
 /// - [`pytest` documentation: Assertions about expected exceptions](https://docs.pytest.org/en/latest/how-to/assert.html#assertions-about-expected-exceptions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.285")]
 pub(crate) struct PytestUnittestRaisesAssertion {
     assertion: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fail.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fail.rs
index cc95dd837a..e30fcee3bc 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fail.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fail.rs
@@ -46,6 +46,7 @@ use crate::rules::flake8_pytest_style::helpers::{is_empty_or_null_string, is_pyt
 /// ## References
 /// - [`pytest` documentation: `pytest.fail`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-fail)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestFailWithoutMessage;
 
 impl Violation for PytestFailWithoutMessage {
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs
index 128b3b06e3..49be564b48 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs
@@ -80,6 +80,7 @@ use crate::rules::flake8_pytest_style::helpers::{
 /// ## References
 /// - [`pytest` documentation: API Reference: Fixtures](https://docs.pytest.org/en/latest/reference/reference.html#fixtures-api)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestFixtureIncorrectParenthesesStyle {
     expected: Parentheses,
     actual: Parentheses,
@@ -131,6 +132,7 @@ impl AlwaysFixableViolation for PytestFixtureIncorrectParenthesesStyle {
 /// ## References
 /// - [`pytest` documentation: `@pytest.fixture` functions](https://docs.pytest.org/en/latest/reference/reference.html#pytest-fixture)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestFixturePositionalArgs {
     function: String,
 }
@@ -172,6 +174,7 @@ impl Violation for PytestFixturePositionalArgs {
 /// ## References
 /// - [`pytest` documentation: `@pytest.fixture` functions](https://docs.pytest.org/en/latest/reference/reference.html#pytest-fixture)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestExtraneousScopeFunction;
 
 impl AlwaysFixableViolation for PytestExtraneousScopeFunction {
@@ -235,6 +238,7 @@ impl AlwaysFixableViolation for PytestExtraneousScopeFunction {
 /// - [`pytest` documentation: `@pytest.fixture` functions](https://docs.pytest.org/en/latest/reference/reference.html#pytest-fixture)
 #[derive(ViolationMetadata)]
 #[deprecated(note = "PT004 has been removed")]
+#[violation_metadata(removed_since = "0.8.0")]
 pub(crate) struct PytestMissingFixtureNameUnderscore;
 
 #[expect(deprecated)]
@@ -300,6 +304,7 @@ impl Violation for PytestMissingFixtureNameUnderscore {
 /// - [`pytest` documentation: `@pytest.fixture` functions](https://docs.pytest.org/en/latest/reference/reference.html#pytest-fixture)
 #[derive(ViolationMetadata)]
 #[deprecated(note = "PT005 has been removed")]
+#[violation_metadata(removed_since = "0.8.0")]
 pub(crate) struct PytestIncorrectFixtureNameUnderscore;
 
 #[expect(deprecated)]
@@ -359,6 +364,7 @@ impl Violation for PytestIncorrectFixtureNameUnderscore {
 /// ## References
 /// - [`pytest` documentation: `pytest.mark.usefixtures`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-mark-usefixtures)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestFixtureParamWithoutValue {
     name: String,
 }
@@ -407,6 +413,7 @@ impl Violation for PytestFixtureParamWithoutValue {
 /// ## References
 /// - [`pytest` documentation: `yield_fixture` functions](https://docs.pytest.org/en/latest/yieldfixture.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestDeprecatedYieldFixture;
 
 impl Violation for PytestDeprecatedYieldFixture {
@@ -466,6 +473,7 @@ impl Violation for PytestDeprecatedYieldFixture {
 /// - [`pytest` documentation: Adding finalizers directly](https://docs.pytest.org/en/latest/how-to/fixtures.html#adding-finalizers-directly)
 /// - [`pytest` documentation: Factories as fixtures](https://docs.pytest.org/en/latest/how-to/fixtures.html#factories-as-fixtures)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestFixtureFinalizerCallback;
 
 impl Violation for PytestFixtureFinalizerCallback {
@@ -514,6 +522,7 @@ impl Violation for PytestFixtureFinalizerCallback {
 /// ## References
 /// - [`pytest` documentation: Teardown/Cleanup](https://docs.pytest.org/en/latest/how-to/fixtures.html#teardown-cleanup-aka-fixture-finalization)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestUselessYieldFixture {
     name: String,
 }
@@ -571,6 +580,7 @@ impl AlwaysFixableViolation for PytestUselessYieldFixture {
 /// ## References
 /// - [`pytest` documentation: `pytest.mark.usefixtures`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-mark-usefixtures)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestErroneousUseFixturesOnFixture;
 
 impl AlwaysFixableViolation for PytestErroneousUseFixturesOnFixture {
@@ -614,6 +624,7 @@ impl AlwaysFixableViolation for PytestErroneousUseFixturesOnFixture {
 /// ## References
 /// - [PyPI: `pytest-asyncio`](https://pypi.org/project/pytest-asyncio/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestUnnecessaryAsyncioMarkOnFixture;
 
 impl AlwaysFixableViolation for PytestUnnecessaryAsyncioMarkOnFixture {
@@ -898,7 +909,9 @@ fn check_test_function_args(checker: &Checker, parameters: &Parameters, decorato
 /// PT020
 fn check_fixture_decorator_name(checker: &Checker, decorator: &Decorator) {
     if is_pytest_yield_fixture(decorator, checker.semantic()) {
-        checker.report_diagnostic(PytestDeprecatedYieldFixture, decorator.range());
+        let mut diagnostic =
+            checker.report_diagnostic(PytestDeprecatedYieldFixture, decorator.range());
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
     }
 }
 
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/imports.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/imports.rs
index 2b6c126185..e1cff65749 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/imports.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/imports.rs
@@ -23,6 +23,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// import pytest
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestIncorrectPytestImport;
 
 impl Violation for PytestIncorrectPytestImport {
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/marks.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/marks.rs
index 4931a24c9d..1981f8e586 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/marks.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/marks.rs
@@ -64,6 +64,7 @@ use crate::rules::flake8_pytest_style::helpers::{Parentheses, get_mark_decorator
 /// ## References
 /// - [`pytest` documentation: Marks](https://docs.pytest.org/en/latest/reference/reference.html#marks)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestIncorrectMarkParenthesesStyle {
     mark_name: String,
     expected_parens: Parentheses,
@@ -119,6 +120,7 @@ impl AlwaysFixableViolation for PytestIncorrectMarkParenthesesStyle {
 /// ## References
 /// - [`pytest` documentation: `pytest.mark.usefixtures`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-mark-usefixtures)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestUseFixturesWithoutParameters;
 
 impl AlwaysFixableViolation for PytestUseFixturesWithoutParameters {
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs
index bd3059e430..20b14399f9 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs
@@ -66,6 +66,7 @@ use crate::rules::flake8_pytest_style::types;
 /// ## References
 /// - [`pytest` documentation: How to parametrize fixtures and test functions](https://docs.pytest.org/en/latest/how-to/parametrize.html#pytest-mark-parametrize)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestParametrizeNamesWrongType {
     single_argument: bool,
     expected: types::ParametrizeNameType,
@@ -200,6 +201,7 @@ impl Violation for PytestParametrizeNamesWrongType {
 /// ## References
 /// - [`pytest` documentation: How to parametrize fixtures and test functions](https://docs.pytest.org/en/latest/how-to/parametrize.html#pytest-mark-parametrize)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestParametrizeValuesWrongType {
     values: types::ParametrizeValuesType,
     row: types::ParametrizeValuesRowType,
@@ -264,6 +266,7 @@ impl Violation for PytestParametrizeValuesWrongType {
 /// ## References
 /// - [`pytest` documentation: How to parametrize fixtures and test functions](https://docs.pytest.org/en/latest/how-to/parametrize.html#pytest-mark-parametrize)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.285")]
 pub(crate) struct PytestDuplicateParametrizeTestCases {
     index: usize,
 }
@@ -301,7 +304,7 @@ fn elts_to_csv(elts: &[Expr], generator: Generator, flags: StringLiteralFlags) -
             })
             .into_boxed_str(),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         flags,
     });
     Some(generator.expr(&node))
@@ -367,14 +370,14 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr
                                     Expr::from(ast::StringLiteral {
                                         value: Box::from(*name),
                                         range: TextRange::default(),
-                                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                                         flags: checker.default_string_flags(),
                                     })
                                 })
                                 .collect(),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             parenthesized: true,
                         });
                         diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
@@ -404,14 +407,14 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr
                                     Expr::from(ast::StringLiteral {
                                         value: Box::from(*name),
                                         range: TextRange::default(),
-                                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                                         flags: checker.default_string_flags(),
                                     })
                                 })
                                 .collect(),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         });
                         diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
                             checker.generator().expr(&node),
@@ -440,7 +443,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr
                             elts: elts.clone(),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         });
                         diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
                             checker.generator().expr(&node),
@@ -485,7 +488,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr
                             elts: elts.clone(),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             parenthesized: true,
                         });
                         diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/patch.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/patch.rs
index fef3f695eb..8fa6dc83fd 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/patch.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/patch.rs
@@ -42,6 +42,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `unittest.mock.patch`](https://docs.python.org/3/library/unittest.mock.html#unittest.mock.patch)
 /// - [PyPI: `pytest-mock`](https://pypi.org/project/pytest-mock/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestPatchWithLambda;
 
 impl Violation for PytestPatchWithLambda {
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs
index feacfbe937..04c9a8c372 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs
@@ -51,6 +51,7 @@ use crate::rules::flake8_pytest_style::helpers::is_empty_or_null_string;
 /// ## References
 /// - [`pytest` documentation: `pytest.raises`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-raises)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestRaisesWithMultipleStatements;
 
 impl Violation for PytestRaisesWithMultipleStatements {
@@ -102,6 +103,7 @@ impl Violation for PytestRaisesWithMultipleStatements {
 /// ## References
 /// - [`pytest` documentation: `pytest.raises`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-raises)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestRaisesTooBroad {
     exception: String,
 }
@@ -147,6 +149,7 @@ impl Violation for PytestRaisesTooBroad {
 /// ## References
 /// - [`pytest` documentation: `pytest.raises`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-raises)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct PytestRaisesWithoutException;
 
 impl Violation for PytestRaisesWithoutException {
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/test_functions.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/test_functions.rs
index 810e783a2c..f092b67ff7 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/test_functions.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/test_functions.rs
@@ -31,6 +31,7 @@ use ruff_text_size::Ranged;
 /// ## References
 /// - [Original Pytest issue](https://github.com/pytest-dev/pytest/issues/12693)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct PytestParameterWithDefaultArgument {
     parameter_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs
index 650452c6a0..6a5f89a6af 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs
@@ -166,7 +166,7 @@ fn assert(expr: &Expr, msg: Option<&Expr>) -> Stmt {
         test: Box::new(expr.clone()),
         msg: msg.map(|msg| Box::new(msg.clone())),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     })
 }
 
@@ -176,7 +176,7 @@ fn compare(left: &Expr, cmp_op: CmpOp, right: &Expr) -> Expr {
         ops: Box::from([cmp_op]),
         comparators: Box::from([right.clone()]),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     })
 }
 
@@ -296,7 +296,7 @@ impl UnittestAssert {
                                 op: UnaryOp::Not,
                                 operand: Box::new(expr.clone()),
                                 range: TextRange::default(),
-                                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             }),
                             msg,
                         )
@@ -370,7 +370,7 @@ impl UnittestAssert {
                 };
                 let node = Expr::NoneLiteral(ast::ExprNoneLiteral {
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 });
                 let expr = compare(expr, cmp_op, &node);
                 Ok(assert(&expr, msg))
@@ -387,7 +387,7 @@ impl UnittestAssert {
                     id: Name::new_static("isinstance"),
                     ctx: ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 };
                 let node1 = ast::ExprCall {
                     func: Box::new(node.into()),
@@ -395,10 +395,10 @@ impl UnittestAssert {
                         args: Box::from([(**obj).clone(), (**cls).clone()]),
                         keywords: Box::from([]),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     },
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 };
                 let isinstance = node1.into();
                 if matches!(self, UnittestAssert::IsInstance) {
@@ -408,7 +408,7 @@ impl UnittestAssert {
                         op: UnaryOp::Not,
                         operand: Box::new(isinstance),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     };
                     let expr = node.into();
                     Ok(assert(&expr, msg))
@@ -429,14 +429,14 @@ impl UnittestAssert {
                     id: Name::new_static("re"),
                     ctx: ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 };
                 let node1 = ast::ExprAttribute {
                     value: Box::new(node.into()),
                     attr: Identifier::new("search".to_string(), TextRange::default()),
                     ctx: ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 };
                 let node2 = ast::ExprCall {
                     func: Box::new(node1.into()),
@@ -444,10 +444,10 @@ impl UnittestAssert {
                         args: Box::from([(**regex).clone(), (**text).clone()]),
                         keywords: Box::from([]),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     },
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 };
                 let re_search = node2.into();
                 if matches!(self, UnittestAssert::Regex | UnittestAssert::RegexpMatches) {
@@ -457,7 +457,7 @@ impl UnittestAssert {
                         op: UnaryOp::Not,
                         operand: Box::new(re_search),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     };
                     Ok(assert(&node.into(), msg))
                 }
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/warns.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/warns.rs
index 55e1a7bb48..3ee1436118 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/warns.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/warns.rs
@@ -50,6 +50,7 @@ use crate::rules::flake8_pytest_style::helpers::is_empty_or_null_string;
 /// ## References
 /// - [`pytest` documentation: `pytest.warns`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-warns)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct PytestWarnsWithMultipleStatements;
 
 impl Violation for PytestWarnsWithMultipleStatements {
@@ -101,6 +102,7 @@ impl Violation for PytestWarnsWithMultipleStatements {
 /// ## References
 /// - [`pytest` documentation: `pytest.warns`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-warns)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct PytestWarnsTooBroad {
     warning: String,
 }
@@ -146,6 +148,7 @@ impl Violation for PytestWarnsTooBroad {
 /// ## References
 /// - [`pytest` documentation: `pytest.warns`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-warns)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.2")]
 pub(crate) struct PytestWarnsWithoutWarning;
 
 impl Violation for PytestWarnsWithoutWarning {
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap
index d362d1787e..bb9555c212 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap
@@ -10,16 +10,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 16 |     return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-11 11 |     return 42
-12 12 | 
-13 13 | 
-14    |-@pytest.fixture()
-   14 |+@pytest.fixture
-15 15 | def parentheses_no_params():
-16 16 |     return 42
-17 17 | 
+11 |     return 42
+12 | 
+13 | 
+   - @pytest.fixture()
+14 + @pytest.fixture
+15 | def parentheses_no_params():
+16 |     return 42
+17 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:24:1
@@ -32,18 +30,16 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 28 |       return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-21 21 |     return 42
-22 22 | 
-23 23 | 
-24    |-@pytest.fixture(
-25    |-
-26    |-)
-   24 |+@pytest.fixture
-27 25 | def parentheses_no_params_multiline():
-28 26 |     return 42
-29 27 | 
+21 |     return 42
+22 | 
+23 | 
+   - @pytest.fixture(
+   - 
+   - )
+24 + @pytest.fixture
+25 | def parentheses_no_params_multiline():
+26 |     return 42
+27 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:39:1
@@ -54,16 +50,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 41 |     return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-36 36 |     return 42
-37 37 | 
-38 38 | 
-39    |-@fixture()
-   39 |+@fixture
-40 40 | def imported_from_parentheses_no_params():
-41 41 |     return 42
-42 42 | 
+36 |     return 42
+37 | 
+38 | 
+   - @fixture()
+39 + @fixture
+40 | def imported_from_parentheses_no_params():
+41 |     return 42
+42 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:49:1
@@ -76,18 +70,16 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 53 |       return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-46 46 |     return 42
-47 47 | 
-48 48 | 
-49    |-@fixture(
-50    |-
-51    |-)
-   49 |+@fixture
-52 50 | def imported_from_parentheses_no_params_multiline():
-53 51 |     return 42
-54 52 | 
+46 |     return 42
+47 | 
+48 | 
+   - @fixture(
+   - 
+   - )
+49 + @fixture
+50 | def imported_from_parentheses_no_params_multiline():
+51 |     return 42
+52 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:64:1
@@ -98,16 +90,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 66 |     return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-61 61 |     return 42
-62 62 | 
-63 63 | 
-64    |-@aliased()
-   64 |+@aliased
-65 65 | def aliased_parentheses_no_params():
-66 66 |     return 42
-67 67 | 
+61 |     return 42
+62 | 
+63 | 
+   - @aliased()
+64 + @aliased
+65 | def aliased_parentheses_no_params():
+66 |     return 42
+67 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:74:1
@@ -120,18 +110,16 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 78 |       return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-71 71 |     return 42
-72 72 | 
-73 73 | 
-74    |-@aliased(
-75    |-
-76    |-)
-   74 |+@aliased
-77 75 | def aliased_parentheses_no_params_multiline():
-78 76 |     return 42
-79 77 | 
+71 |     return 42
+72 | 
+73 | 
+   - @aliased(
+   - 
+   - )
+74 + @aliased
+75 | def aliased_parentheses_no_params_multiline():
+76 |     return 42
+77 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:81:1
@@ -145,19 +133,18 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 85 |   def my_fixture(): ...
    |
 help: Remove parentheses
-
-ℹ Unsafe fix
-78 78 |     return 42
-79 79 | 
-80 80 | # https://github.com/astral-sh/ruff/issues/18770
-81    |-@pytest.fixture(
-82    |-    # TODO: use module scope
-83    |-    # scope="module"
-84    |-)
-   81 |+@pytest.fixture
-85 82 | def my_fixture(): ...
-86 83 | 
-87 84 | 
+78 |     return 42
+79 | 
+80 | # https://github.com/astral-sh/ruff/issues/18770
+   - @pytest.fixture(
+   -     # TODO: use module scope
+   -     # scope="module"
+   - )
+81 + @pytest.fixture
+82 | def my_fixture(): ...
+83 | 
+84 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:88:1
@@ -168,16 +155,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 90 |     return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-85 85 | def my_fixture(): ...
-86 86 | 
-87 87 | 
-88    |-@(pytest.fixture())
-   88 |+@(pytest.fixture)
-89 89 | def outer_paren_fixture_no_params():
-90 90 |     return 42
-91 91 | 
+85 | def my_fixture(): ...
+86 | 
+87 | 
+   - @(pytest.fixture())
+88 + @(pytest.fixture)
+89 | def outer_paren_fixture_no_params():
+90 |     return 42
+91 | 
 
 PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
   --> PT001.py:93:1
@@ -188,12 +173,10 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 95 |     return 42
    |
 help: Remove parentheses
-
-ℹ Safe fix
-90 90 |     return 42
-91 91 | 
-92 92 | 
-93    |-@(fixture())
-   93 |+@(fixture)
-94 94 | def outer_paren_imported_fixture_no_params():
-95 95 |     return 42
+90 |     return 42
+91 | 
+92 | 
+   - @(fixture())
+93 + @(fixture)
+94 | def outer_paren_imported_fixture_no_params():
+95 |     return 42
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap
index 1ed682df4c..52c9042aba 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap
@@ -10,16 +10,14 @@ PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
 11 |     return 42
    |
 help: Add parentheses
-
-ℹ Safe fix
-6  6  | # `import pytest`
-7  7  | 
-8  8  | 
-9     |-@pytest.fixture
-   9  |+@pytest.fixture()
-10 10 | def no_parentheses():
-11 11 |     return 42
-12 12 | 
+6  | # `import pytest`
+7  | 
+8  | 
+   - @pytest.fixture
+9  + @pytest.fixture()
+10 | def no_parentheses():
+11 |     return 42
+12 | 
 
 PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
   --> PT001.py:34:1
@@ -30,16 +28,14 @@ PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
 36 |     return 42
    |
 help: Add parentheses
-
-ℹ Safe fix
-31 31 | # `from pytest import fixture`
-32 32 | 
-33 33 | 
-34    |-@fixture
-   34 |+@fixture()
-35 35 | def imported_from_no_parentheses():
-36 36 |     return 42
-37 37 | 
+31 | # `from pytest import fixture`
+32 | 
+33 | 
+   - @fixture
+34 + @fixture()
+35 | def imported_from_no_parentheses():
+36 |     return 42
+37 | 
 
 PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
   --> PT001.py:59:1
@@ -50,13 +46,11 @@ PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
 61 |     return 42
    |
 help: Add parentheses
-
-ℹ Safe fix
-56 56 | # `from pytest import fixture as aliased`
-57 57 | 
-58 58 | 
-59    |-@aliased
-   59 |+@aliased()
-60 60 | def aliased_no_parentheses():
-61 61 |     return 42
-62 62 |
+56 | # `from pytest import fixture as aliased`
+57 | 
+58 | 
+   - @aliased
+59 + @aliased()
+60 | def aliased_no_parentheses():
+61 |     return 42
+62 |
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap
index 3ad32a399f..478048f99f 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap
@@ -10,16 +10,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 16 |     ...
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-11 11 |     ...
-12 12 | 
-13 13 | 
-14    |-@pytest.fixture(scope="function")
-   14 |+@pytest.fixture()
-15 15 | def error():
-16 16 |     ...
-17 17 | 
+11 |     ...
+12 | 
+13 | 
+   - @pytest.fixture(scope="function")
+14 + @pytest.fixture()
+15 | def error():
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:19:17
@@ -30,16 +29,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 21 |     ...
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-16 16 |     ...
-17 17 | 
-18 18 | 
-19    |-@pytest.fixture(scope="function", name="my_fixture")
-   19 |+@pytest.fixture(name="my_fixture")
-20 20 | def error_multiple_args():
-21 21 |     ...
-22 22 | 
+16 |     ...
+17 | 
+18 | 
+   - @pytest.fixture(scope="function", name="my_fixture")
+19 + @pytest.fixture(name="my_fixture")
+20 | def error_multiple_args():
+21 |     ...
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:24:36
@@ -50,16 +48,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 26 |     ...
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-21 21 |     ...
-22 22 | 
-23 23 | 
-24    |-@pytest.fixture(name="my_fixture", scope="function")
-   24 |+@pytest.fixture(name="my_fixture")
-25 25 | def error_multiple_args():
-26 26 |     ...
-27 27 | 
+21 |     ...
+22 | 
+23 | 
+   - @pytest.fixture(name="my_fixture", scope="function")
+24 + @pytest.fixture(name="my_fixture")
+25 | def error_multiple_args():
+26 |     ...
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:29:36
@@ -70,16 +67,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 31 |     ...
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-@pytest.fixture(name="my_fixture", scope="function", **kwargs)
-   29 |+@pytest.fixture(name="my_fixture", **kwargs)
-30 30 | def error_second_arg():
-31 31 |     ...
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - @pytest.fixture(name="my_fixture", scope="function", **kwargs)
+29 + @pytest.fixture(name="my_fixture", **kwargs)
+30 | def error_second_arg():
+31 |     ...
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:37:31
@@ -92,16 +88,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 39 |     ...
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-34 34 | # pytest.fixture does not take positional arguments, however this 
-35 35 | # tests the general case as we use a helper function that should
-36 36 | # work for all cases.
-37    |-@pytest.fixture("my_fixture", scope="function")
-   37 |+@pytest.fixture("my_fixture")
-38 38 | def error_arg():
-39 39 |     ...
-40 40 | 
+34 | # pytest.fixture does not take positional arguments, however this 
+35 | # tests the general case as we use a helper function that should
+36 | # work for all cases.
+   - @pytest.fixture("my_fixture", scope="function")
+37 + @pytest.fixture("my_fixture")
+38 | def error_arg():
+39 |     ...
+40 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:43:5
@@ -113,15 +108,14 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 45 | )
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-40 40 | 
-41 41 | 
-42 42 | @pytest.fixture(
-43    |-    scope="function",
-44 43 |     name="my_fixture",
-45 44 | )
-46 45 | def error_multiple_args():
+40 | 
+41 | 
+42 | @pytest.fixture(
+   -     scope="function",
+43 |     name="my_fixture",
+44 | )
+45 | def error_multiple_args():
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:52:5
@@ -134,15 +128,14 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 54 | def error_multiple_args():
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | @pytest.fixture(
-51 51 |     name="my_fixture",
-52    |-    scope="function",
-53 52 | )
-54 53 | def error_multiple_args():
-55 54 |     ...
+49 | 
+50 | @pytest.fixture(
+51 |     name="my_fixture",
+   -     scope="function",
+52 | )
+53 | def error_multiple_args():
+54 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
   --> PT003.py:66:5
@@ -155,15 +148,14 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()`
 68 |       ,
    |
 help: Remove implied `scope` argument
-
-ℹ Unsafe fix
-63 63 | 
-64 64 |     # another comment ,)
-65 65 |     
-66    |-    scope=\
-67    |-        "function"  # some comment ),
-68    |-    ,
-69    |-    
-70 66 |     name2=name, name3="my_fixture", **kwargs
-71 67 | )
-72 68 | def error_multiple_args():
+63 | 
+64 |     # another comment ,)
+65 |     
+   -     scope=\
+   -         "function"  # some comment ),
+   -     ,
+   -     
+66 |     name2=name, name3="my_fixture", **kwargs
+67 | )
+68 | def error_multiple_args():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap
index f8419f3b59..4792979b82 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap
@@ -12,14 +12,12 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 5 |     ...
   |
 help: Use a string for the first argument
-
-ℹ Safe fix
-1 1 | import pytest
-2 2 | 
-3   |-@pytest.mark.parametrize(("param",), [[1], [2]])
-  3 |+@pytest.mark.parametrize("param", [1, 2])
-4 4 | def test_PT006_and_PT007_do_not_conflict(param):
-5 5 |     ...
+1 | import pytest
+2 | 
+  - @pytest.mark.parametrize(("param",), [[1], [2]])
+3 + @pytest.mark.parametrize("param", [1, 2])
+4 | def test_PT006_and_PT007_do_not_conflict(param):
+5 |     ...
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
  --> PT006_and_PT007.py:3:39
@@ -32,14 +30,13 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 5 |     ...
   |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-1 1 | import pytest
-2 2 | 
-3   |-@pytest.mark.parametrize(("param",), [[1], [2]])
-  3 |+@pytest.mark.parametrize(("param",), [(1,), [2]])
-4 4 | def test_PT006_and_PT007_do_not_conflict(param):
-5 5 |     ...
+1 | import pytest
+2 | 
+  - @pytest.mark.parametrize(("param",), [[1], [2]])
+3 + @pytest.mark.parametrize(("param",), [(1,), [2]])
+4 | def test_PT006_and_PT007_do_not_conflict(param):
+5 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
  --> PT006_and_PT007.py:3:44
@@ -52,11 +49,10 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 5 |     ...
   |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-1 1 | import pytest
-2 2 | 
-3   |-@pytest.mark.parametrize(("param",), [[1], [2]])
-  3 |+@pytest.mark.parametrize(("param",), [[1], (2,)])
-4 4 | def test_PT006_and_PT007_do_not_conflict(param):
-5 5 |     ...
+1 | import pytest
+2 | 
+  - @pytest.mark.parametrize(("param",), [[1], [2]])
+3 + @pytest.mark.parametrize(("param",), [[1], (2,)])
+4 | def test_PT006_and_PT007_do_not_conflict(param):
+5 |     ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap
index def0e46f71..ba76432fe1 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap
@@ -10,16 +10,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 26 |     ...
    |
 help: Use a string of comma-separated values for the first argument
-
-ℹ Unsafe fix
-21 21 |     ...
-22 22 | 
-23 23 | 
-24    |-@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-   24 |+@pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)])
-25 25 | def test_tuple(param1, param2):
-26 26 |     ...
-27 27 | 
+21 |     ...
+22 | 
+23 | 
+   - @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+24 + @pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)])
+25 | def test_tuple(param1, param2):
+26 |     ...
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:29:26
@@ -30,16 +29,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 31 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-@pytest.mark.parametrize(("param1",), [1, 2, 3])
-   29 |+@pytest.mark.parametrize("param1", [1, 2, 3])
-30 30 | def test_tuple_one_elem(param1, param2):
-31 31 |     ...
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - @pytest.mark.parametrize(("param1",), [1, 2, 3])
+29 + @pytest.mark.parametrize("param1", [1, 2, 3])
+30 | def test_tuple_one_elem(param1, param2):
+31 |     ...
+32 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected a string of comma-separated values
   --> PT006.py:34:26
@@ -50,16 +47,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 36 |     ...
    |
 help: Use a string of comma-separated values for the first argument
-
-ℹ Unsafe fix
-31 31 |     ...
-32 32 | 
-33 33 | 
-34    |-@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-   34 |+@pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)])
-35 35 | def test_list(param1, param2):
-36 36 |     ...
-37 37 | 
+31 |     ...
+32 | 
+33 | 
+   - @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+34 + @pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)])
+35 | def test_list(param1, param2):
+36 |     ...
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:39:26
@@ -70,16 +66,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 41 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-36 36 |     ...
-37 37 | 
-38 38 | 
-39    |-@pytest.mark.parametrize(["param1"], [1, 2, 3])
-   39 |+@pytest.mark.parametrize("param1", [1, 2, 3])
-40 40 | def test_list_one_elem(param1, param2):
-41 41 |     ...
-42 42 | 
+36 |     ...
+37 | 
+38 | 
+   - @pytest.mark.parametrize(["param1"], [1, 2, 3])
+39 + @pytest.mark.parametrize("param1", [1, 2, 3])
+40 | def test_list_one_elem(param1, param2):
+41 |     ...
+42 | 
 
 PT006 Wrong type passed to first argument of `pytest.mark.parametrize`; expected a string of comma-separated values
   --> PT006.py:44:26
@@ -110,16 +104,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 88 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-83 83 |     ...
-84 84 | 
-85 85 | 
-86    |-@pytest.mark.parametrize(("param",), [(1,), (2,)])
-   86 |+@pytest.mark.parametrize("param", [1, 2])
-87 87 | def test_single_element_tuple(param):
-88 88 |     ...
-89 89 | 
+83 |     ...
+84 | 
+85 | 
+   - @pytest.mark.parametrize(("param",), [(1,), (2,)])
+86 + @pytest.mark.parametrize("param", [1, 2])
+87 | def test_single_element_tuple(param):
+88 |     ...
+89 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:91:26
@@ -130,16 +122,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 93 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-88 88 |     ...
-89 89 | 
-90 90 | 
-91    |-@pytest.mark.parametrize(("param",), [[1], [2]])
-   91 |+@pytest.mark.parametrize("param", [1, 2])
-92 92 | def test_single_element_list(param):
-93 93 |     ...
-94 94 | 
+88 |     ...
+89 | 
+90 | 
+   - @pytest.mark.parametrize(("param",), [[1], [2]])
+91 + @pytest.mark.parametrize("param", [1, 2])
+92 | def test_single_element_list(param):
+93 |     ...
+94 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:96:26
@@ -150,16 +140,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 98 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-93 93 |     ...
-94 94 | 
-95 95 | 
-96    |-@pytest.mark.parametrize(("param",), [[1], [2]])
-   96 |+@pytest.mark.parametrize("param", [1, 2])
-97 97 | def test_single_element_list(param):
-98 98 |     ...
-99 99 | 
+93 |     ...
+94 | 
+95 | 
+   - @pytest.mark.parametrize(("param",), [[1], [2]])
+96 + @pytest.mark.parametrize("param", [1, 2])
+97 | def test_single_element_list(param):
+98 |     ...
+99 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:103:5
@@ -175,21 +163,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 108 |   )
     |
 help: Use a string for the first argument
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | # Unsafe fix
-102 102 | @pytest.mark.parametrize(
-103     |-    (
-104     |-        # comment
-105     |-        "param",
-106     |-    ),
-107     |-    [[1], [2]],
-    103 |+    "param",
-    104 |+    [1, 2],
-108 105 | )
-109 106 | def test_comment_in_argnames(param):
-110 107 |     ...
+100 | 
+101 | # Unsafe fix
+102 | @pytest.mark.parametrize(
+    -     (
+    -         # comment
+    -         "param",
+    -     ),
+    -     [[1], [2]],
+103 +     "param",
+104 +     [1, 2],
+105 | )
+106 | def test_comment_in_argnames(param):
+107 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:114:5
@@ -202,24 +189,23 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 116 |         (
     |
 help: Use a string for the first argument
-
-ℹ Unsafe fix
-111 111 | 
-112 112 | # Unsafe fix
-113 113 | @pytest.mark.parametrize(
-114     |-    ("param",),
-    114 |+    "param",
-115 115 |     [
-116     |-        (
-117     |-            # comment
-118     |-            1,
-119     |-        ),
-120     |-        (2,),
-    116 |+        1,
-    117 |+        2,
-121 118 |     ],
-122 119 | )
-123 120 | def test_comment_in_argvalues(param):
+111 | 
+112 | # Unsafe fix
+113 | @pytest.mark.parametrize(
+    -     ("param",),
+114 +     "param",
+115 |     [
+    -         (
+    -             # comment
+    -             1,
+    -         ),
+    -         (2,),
+116 +         1,
+117 +         2,
+118 |     ],
+119 | )
+120 | def test_comment_in_argvalues(param):
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:129:5
@@ -232,22 +218,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 131 |         (1,),
     |
 help: Use a string for the first argument
-
-ℹ Safe fix
-126 126 | 
-127 127 | # Safe fix
-128 128 | @pytest.mark.parametrize(
-129     |-    ("param",),
-    129 |+    "param",
-130 130 |     [
-131     |-        (1,),
-    131 |+        1,
-132 132 |         # comment
-133     |-        (2,),
-    133 |+        2,
-134 134 |     ],
-135 135 | )
-136 136 | def test_comment_between_argvalues_items(param):
+126 | 
+127 | # Safe fix
+128 | @pytest.mark.parametrize(
+    -     ("param",),
+129 +     "param",
+130 |     [
+    -         (1,),
+131 +         1,
+132 |         # comment
+    -         (2,),
+133 +         2,
+134 |     ],
+135 | )
+136 | def test_comment_between_argvalues_items(param):
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:142:5
@@ -260,13 +244,11 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 144 |         (1,),
     |
 help: Use a string for the first argument
-
-ℹ Safe fix
-139 139 | 
-140 140 | # A fix should be suggested for `argnames`, but not for `argvalues`.
-141 141 | @pytest.mark.parametrize(
-142     |-    ("param",),
-    142 |+    "param",
-143 143 |     [
-144 144 |         (1,),
-145 145 |         (2, 3),
+139 | 
+140 | # A fix should be suggested for `argnames`, but not for `argvalues`.
+141 | @pytest.mark.parametrize(
+    -     ("param",),
+142 +     "param",
+143 |     [
+144 |         (1,),
+145 |         (2, 3),
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap
index c444562708..518ee826db 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap
@@ -10,16 +10,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 11 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
-   9  |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-10 10 | def test_csv(param1, param2):
-11 11 |     ...
-12 12 | 
+6  |     ...
+7  | 
+8  | 
+   - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
+9  + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+10 | def test_csv(param1, param2):
+11 |     ...
+12 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:14:26
@@ -30,16 +29,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 16 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-11 11 |     ...
-12 12 | 
-13 13 | 
-14    |-@pytest.mark.parametrize("   param1,   ,    param2   , ", [(1, 2), (3, 4)])
-   14 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-15 15 | def test_csv_with_whitespace(param1, param2):
-16 16 |     ...
-17 17 | 
+11 |     ...
+12 | 
+13 | 
+   - @pytest.mark.parametrize("   param1,   ,    param2   , ", [(1, 2), (3, 4)])
+14 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+15 | def test_csv_with_whitespace(param1, param2):
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:19:26
@@ -50,16 +48,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 21 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-16 16 |     ...
-17 17 | 
-18 18 | 
-19    |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
-   19 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-20 20 | def test_csv_bad_quotes(param1, param2):
-21 21 |     ...
-22 22 | 
+16 |     ...
+17 | 
+18 | 
+   - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
+19 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+20 | def test_csv_bad_quotes(param1, param2):
+21 |     ...
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:29:26
@@ -70,16 +67,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 31 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-@pytest.mark.parametrize(("param1",), [1, 2, 3])
-   29 |+@pytest.mark.parametrize("param1", [1, 2, 3])
-30 30 | def test_tuple_one_elem(param1, param2):
-31 31 |     ...
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - @pytest.mark.parametrize(("param1",), [1, 2, 3])
+29 + @pytest.mark.parametrize("param1", [1, 2, 3])
+30 | def test_tuple_one_elem(param1, param2):
+31 |     ...
+32 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:34:26
@@ -90,16 +85,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 36 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-31 31 |     ...
-32 32 | 
-33 33 | 
-34    |-@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-   34 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-35 35 | def test_list(param1, param2):
-36 36 |     ...
-37 37 | 
+31 |     ...
+32 | 
+33 | 
+   - @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+34 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+35 | def test_list(param1, param2):
+36 |     ...
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:39:26
@@ -110,16 +104,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 41 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-36 36 |     ...
-37 37 | 
-38 38 | 
-39    |-@pytest.mark.parametrize(["param1"], [1, 2, 3])
-   39 |+@pytest.mark.parametrize("param1", [1, 2, 3])
-40 40 | def test_list_one_elem(param1, param2):
-41 41 |     ...
-42 42 | 
+36 |     ...
+37 | 
+38 | 
+   - @pytest.mark.parametrize(["param1"], [1, 2, 3])
+39 + @pytest.mark.parametrize("param1", [1, 2, 3])
+40 | def test_list_one_elem(param1, param2):
+41 |     ...
+42 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:44:26
@@ -130,16 +122,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 46 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-41 41 |     ...
-42 42 | 
-43 43 | 
-44    |-@pytest.mark.parametrize([some_expr, another_expr], [1, 2, 3])
-   44 |+@pytest.mark.parametrize((some_expr, another_expr), [1, 2, 3])
-45 45 | def test_list_expressions(param1, param2):
-46 46 |     ...
-47 47 | 
+41 |     ...
+42 | 
+43 | 
+   - @pytest.mark.parametrize([some_expr, another_expr], [1, 2, 3])
+44 + @pytest.mark.parametrize((some_expr, another_expr), [1, 2, 3])
+45 | def test_list_expressions(param1, param2):
+46 |     ...
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:49:26
@@ -150,16 +141,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 51 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-46 46 |     ...
-47 47 | 
-48 48 | 
-49    |-@pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3])
-   49 |+@pytest.mark.parametrize((some_expr, "param2"), [1, 2, 3])
-50 50 | def test_list_mixed_expr_literal(param1, param2):
-51 51 |     ...
-52 52 | 
+46 |     ...
+47 | 
+48 | 
+   - @pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3])
+49 + @pytest.mark.parametrize((some_expr, "param2"), [1, 2, 3])
+50 | def test_list_mixed_expr_literal(param1, param2):
+51 |     ...
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:54:26
@@ -170,16 +160,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 56 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-51 51 |     ...
-52 52 | 
-53 53 | 
-54    |-@pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)])
-   54 |+@pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)])
-55 55 | def test_implicit_str_concat_with_parens(param1, param2, param3):
-56 56 |     ...
-57 57 | 
+51 |     ...
+52 | 
+53 | 
+   - @pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)])
+54 + @pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)])
+55 | def test_implicit_str_concat_with_parens(param1, param2, param3):
+56 |     ...
+57 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:59:26
@@ -190,16 +179,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 61 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-56 56 |     ...
-57 57 | 
-58 58 | 
-59    |-@pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)])
-   59 |+@pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)])
-60 60 | def test_implicit_str_concat_no_parens(param1, param2, param3):
-61 61 |     ...
-62 62 | 
+56 |     ...
+57 | 
+58 | 
+   - @pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)])
+59 + @pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)])
+60 | def test_implicit_str_concat_no_parens(param1, param2, param3):
+61 |     ...
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:64:26
@@ -210,16 +198,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 66 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-61 61 |     ...
-62 62 | 
-63 63 | 
-64    |-@pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
-   64 |+@pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)])
-65 65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
-66 66 |     ...
-67 67 | 
+61 |     ...
+62 | 
+63 | 
+   - @pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
+64 + @pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)])
+65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
+66 |     ...
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:69:26
@@ -230,16 +217,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 71 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-66 66 |     ...
-67 67 | 
-68 68 | 
-69    |-@pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
-   69 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-70 70 | def test_csv_with_parens(param1, param2):
-71 71 |     ...
-72 72 | 
+66 |     ...
+67 | 
+68 | 
+   - @pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
+69 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+70 | def test_csv_with_parens(param1, param2):
+71 |     ...
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:74:39
@@ -250,16 +236,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 76 | @parametrize
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-71 71 |     ...
-72 72 | 
-73 73 | 
-74    |-parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
-   74 |+parametrize = pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-75 75 | 
-76 76 | @parametrize
-77 77 | def test_not_decorator(param1, param2):
+71 |     ...
+72 | 
+73 | 
+   - parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
+74 + parametrize = pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+75 | 
+76 | @parametrize
+77 | def test_not_decorator(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
   --> PT006.py:81:35
@@ -270,16 +255,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 83 |     ...
    |
 help: Use a `tuple` for the first argument
-
-ℹ Unsafe fix
-78 78 |     ...
-79 79 | 
-80 80 | 
-81    |-@pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)])
-   81 |+@pytest.mark.parametrize(argnames=("param1", "param2"), argvalues=[(1, 2), (3, 4)])
-82 82 | def test_keyword_arguments(param1, param2):
-83 83 |     ...
-84 84 | 
+78 |     ...
+79 | 
+80 | 
+   - @pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)])
+81 + @pytest.mark.parametrize(argnames=("param1", "param2"), argvalues=[(1, 2), (3, 4)])
+82 | def test_keyword_arguments(param1, param2):
+83 |     ...
+84 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:86:26
@@ -290,16 +274,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 88 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-83 83 |     ...
-84 84 | 
-85 85 | 
-86    |-@pytest.mark.parametrize(("param",), [(1,), (2,)])
-   86 |+@pytest.mark.parametrize("param", [1, 2])
-87 87 | def test_single_element_tuple(param):
-88 88 |     ...
-89 89 | 
+83 |     ...
+84 | 
+85 | 
+   - @pytest.mark.parametrize(("param",), [(1,), (2,)])
+86 + @pytest.mark.parametrize("param", [1, 2])
+87 | def test_single_element_tuple(param):
+88 |     ...
+89 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:91:26
@@ -310,16 +292,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 93 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-88 88 |     ...
-89 89 | 
-90 90 | 
-91    |-@pytest.mark.parametrize(("param",), [[1], [2]])
-   91 |+@pytest.mark.parametrize("param", [1, 2])
-92 92 | def test_single_element_list(param):
-93 93 |     ...
-94 94 | 
+88 |     ...
+89 | 
+90 | 
+   - @pytest.mark.parametrize(("param",), [[1], [2]])
+91 + @pytest.mark.parametrize("param", [1, 2])
+92 | def test_single_element_list(param):
+93 |     ...
+94 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:96:26
@@ -330,16 +310,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 98 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-93 93 |     ...
-94 94 | 
-95 95 | 
-96    |-@pytest.mark.parametrize(("param",), [[1], [2]])
-   96 |+@pytest.mark.parametrize("param", [1, 2])
-97 97 | def test_single_element_list(param):
-98 98 |     ...
-99 99 | 
+93 |     ...
+94 | 
+95 | 
+   - @pytest.mark.parametrize(("param",), [[1], [2]])
+96 + @pytest.mark.parametrize("param", [1, 2])
+97 | def test_single_element_list(param):
+98 |     ...
+99 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:103:5
@@ -355,21 +333,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 108 |   )
     |
 help: Use a string for the first argument
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | # Unsafe fix
-102 102 | @pytest.mark.parametrize(
-103     |-    (
-104     |-        # comment
-105     |-        "param",
-106     |-    ),
-107     |-    [[1], [2]],
-    103 |+    "param",
-    104 |+    [1, 2],
-108 105 | )
-109 106 | def test_comment_in_argnames(param):
-110 107 |     ...
+100 | 
+101 | # Unsafe fix
+102 | @pytest.mark.parametrize(
+    -     (
+    -         # comment
+    -         "param",
+    -     ),
+    -     [[1], [2]],
+103 +     "param",
+104 +     [1, 2],
+105 | )
+106 | def test_comment_in_argnames(param):
+107 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:114:5
@@ -382,24 +359,23 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 116 |         (
     |
 help: Use a string for the first argument
-
-ℹ Unsafe fix
-111 111 | 
-112 112 | # Unsafe fix
-113 113 | @pytest.mark.parametrize(
-114     |-    ("param",),
-    114 |+    "param",
-115 115 |     [
-116     |-        (
-117     |-            # comment
-118     |-            1,
-119     |-        ),
-120     |-        (2,),
-    116 |+        1,
-    117 |+        2,
-121 118 |     ],
-122 119 | )
-123 120 | def test_comment_in_argvalues(param):
+111 | 
+112 | # Unsafe fix
+113 | @pytest.mark.parametrize(
+    -     ("param",),
+114 +     "param",
+115 |     [
+    -         (
+    -             # comment
+    -             1,
+    -         ),
+    -         (2,),
+116 +         1,
+117 +         2,
+118 |     ],
+119 | )
+120 | def test_comment_in_argvalues(param):
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:129:5
@@ -412,22 +388,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 131 |         (1,),
     |
 help: Use a string for the first argument
-
-ℹ Safe fix
-126 126 | 
-127 127 | # Safe fix
-128 128 | @pytest.mark.parametrize(
-129     |-    ("param",),
-    129 |+    "param",
-130 130 |     [
-131     |-        (1,),
-    131 |+        1,
-132 132 |         # comment
-133     |-        (2,),
-    133 |+        2,
-134 134 |     ],
-135 135 | )
-136 136 | def test_comment_between_argvalues_items(param):
+126 | 
+127 | # Safe fix
+128 | @pytest.mark.parametrize(
+    -     ("param",),
+129 +     "param",
+130 |     [
+    -         (1,),
+131 +         1,
+132 |         # comment
+    -         (2,),
+133 +         2,
+134 |     ],
+135 | )
+136 | def test_comment_between_argvalues_items(param):
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:142:5
@@ -440,13 +414,11 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 144 |         (1,),
     |
 help: Use a string for the first argument
-
-ℹ Safe fix
-139 139 | 
-140 140 | # A fix should be suggested for `argnames`, but not for `argvalues`.
-141 141 | @pytest.mark.parametrize(
-142     |-    ("param",),
-    142 |+    "param",
-143 143 |     [
-144 144 |         (1,),
-145 145 |         (2, 3),
+139 | 
+140 | # A fix should be suggested for `argnames`, but not for `argvalues`.
+141 | @pytest.mark.parametrize(
+    -     ("param",),
+142 +     "param",
+143 |     [
+144 |         (1,),
+145 |         (2, 3),
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap
index 9ff3aaeb43..9c6fa17b1f 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap
@@ -10,16 +10,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 11 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
-   9  |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-10 10 | def test_csv(param1, param2):
-11 11 |     ...
-12 12 | 
+6  |     ...
+7  | 
+8  | 
+   - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
+9  + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+10 | def test_csv(param1, param2):
+11 |     ...
+12 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:14:26
@@ -30,16 +29,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 16 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-11 11 |     ...
-12 12 | 
-13 13 | 
-14    |-@pytest.mark.parametrize("   param1,   ,    param2   , ", [(1, 2), (3, 4)])
-   14 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-15 15 | def test_csv_with_whitespace(param1, param2):
-16 16 |     ...
-17 17 | 
+11 |     ...
+12 | 
+13 | 
+   - @pytest.mark.parametrize("   param1,   ,    param2   , ", [(1, 2), (3, 4)])
+14 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+15 | def test_csv_with_whitespace(param1, param2):
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:19:26
@@ -50,16 +48,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 21 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-16 16 |     ...
-17 17 | 
-18 18 | 
-19    |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
-   19 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-20 20 | def test_csv_bad_quotes(param1, param2):
-21 21 |     ...
-22 22 | 
+16 |     ...
+17 | 
+18 | 
+   - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
+19 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+20 | def test_csv_bad_quotes(param1, param2):
+21 |     ...
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:24:26
@@ -70,16 +67,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 26 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-21 21 |     ...
-22 22 | 
-23 23 | 
-24    |-@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
-   24 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-25 25 | def test_tuple(param1, param2):
-26 26 |     ...
-27 27 | 
+21 |     ...
+22 | 
+23 | 
+   - @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+24 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+25 | def test_tuple(param1, param2):
+26 |     ...
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:29:26
@@ -90,16 +86,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 31 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-@pytest.mark.parametrize(("param1",), [1, 2, 3])
-   29 |+@pytest.mark.parametrize("param1", [1, 2, 3])
-30 30 | def test_tuple_one_elem(param1, param2):
-31 31 |     ...
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - @pytest.mark.parametrize(("param1",), [1, 2, 3])
+29 + @pytest.mark.parametrize("param1", [1, 2, 3])
+30 | def test_tuple_one_elem(param1, param2):
+31 |     ...
+32 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:39:26
@@ -110,16 +104,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 41 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-36 36 |     ...
-37 37 | 
-38 38 | 
-39    |-@pytest.mark.parametrize(["param1"], [1, 2, 3])
-   39 |+@pytest.mark.parametrize("param1", [1, 2, 3])
-40 40 | def test_list_one_elem(param1, param2):
-41 41 |     ...
-42 42 | 
+36 |     ...
+37 | 
+38 | 
+   - @pytest.mark.parametrize(["param1"], [1, 2, 3])
+39 + @pytest.mark.parametrize("param1", [1, 2, 3])
+40 | def test_list_one_elem(param1, param2):
+41 |     ...
+42 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:54:26
@@ -130,16 +122,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 56 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-51 51 |     ...
-52 52 | 
-53 53 | 
-54    |-@pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)])
-   54 |+@pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)])
-55 55 | def test_implicit_str_concat_with_parens(param1, param2, param3):
-56 56 |     ...
-57 57 | 
+51 |     ...
+52 | 
+53 | 
+   - @pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)])
+54 + @pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)])
+55 | def test_implicit_str_concat_with_parens(param1, param2, param3):
+56 |     ...
+57 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:59:26
@@ -150,16 +141,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 61 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-56 56 |     ...
-57 57 | 
-58 58 | 
-59    |-@pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)])
-   59 |+@pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)])
-60 60 | def test_implicit_str_concat_no_parens(param1, param2, param3):
-61 61 |     ...
-62 62 | 
+56 |     ...
+57 | 
+58 | 
+   - @pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)])
+59 + @pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)])
+60 | def test_implicit_str_concat_no_parens(param1, param2, param3):
+61 |     ...
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:64:26
@@ -170,16 +160,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 66 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-61 61 |     ...
-62 62 | 
-63 63 | 
-64    |-@pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
-   64 |+@pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)])
-65 65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
-66 66 |     ...
-67 67 | 
+61 |     ...
+62 | 
+63 | 
+   - @pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
+64 + @pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)])
+65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
+66 |     ...
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:69:26
@@ -190,16 +179,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 71 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-66 66 |     ...
-67 67 | 
-68 68 | 
-69    |-@pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
-   69 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-70 70 | def test_csv_with_parens(param1, param2):
-71 71 |     ...
-72 72 | 
+66 |     ...
+67 | 
+68 | 
+   - @pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
+69 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+70 | def test_csv_with_parens(param1, param2):
+71 |     ...
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:74:39
@@ -210,16 +198,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 76 | @parametrize
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-71 71 |     ...
-72 72 | 
-73 73 | 
-74    |-parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
-   74 |+parametrize = pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
-75 75 | 
-76 76 | @parametrize
-77 77 | def test_not_decorator(param1, param2):
+71 |     ...
+72 | 
+73 | 
+   - parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
+74 + parametrize = pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+75 | 
+76 | @parametrize
+77 | def test_not_decorator(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list`
   --> PT006.py:81:35
@@ -230,16 +217,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 83 |     ...
    |
 help: Use a `list` for the first argument
-
-ℹ Unsafe fix
-78 78 |     ...
-79 79 | 
-80 80 | 
-81    |-@pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)])
-   81 |+@pytest.mark.parametrize(argnames=["param1", "param2"], argvalues=[(1, 2), (3, 4)])
-82 82 | def test_keyword_arguments(param1, param2):
-83 83 |     ...
-84 84 | 
+78 |     ...
+79 | 
+80 | 
+   - @pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)])
+81 + @pytest.mark.parametrize(argnames=["param1", "param2"], argvalues=[(1, 2), (3, 4)])
+82 | def test_keyword_arguments(param1, param2):
+83 |     ...
+84 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:86:26
@@ -250,16 +236,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 88 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-83 83 |     ...
-84 84 | 
-85 85 | 
-86    |-@pytest.mark.parametrize(("param",), [(1,), (2,)])
-   86 |+@pytest.mark.parametrize("param", [1, 2])
-87 87 | def test_single_element_tuple(param):
-88 88 |     ...
-89 89 | 
+83 |     ...
+84 | 
+85 | 
+   - @pytest.mark.parametrize(("param",), [(1,), (2,)])
+86 + @pytest.mark.parametrize("param", [1, 2])
+87 | def test_single_element_tuple(param):
+88 |     ...
+89 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:91:26
@@ -270,16 +254,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 93 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-88 88 |     ...
-89 89 | 
-90 90 | 
-91    |-@pytest.mark.parametrize(("param",), [[1], [2]])
-   91 |+@pytest.mark.parametrize("param", [1, 2])
-92 92 | def test_single_element_list(param):
-93 93 |     ...
-94 94 | 
+88 |     ...
+89 | 
+90 | 
+   - @pytest.mark.parametrize(("param",), [[1], [2]])
+91 + @pytest.mark.parametrize("param", [1, 2])
+92 | def test_single_element_list(param):
+93 |     ...
+94 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
   --> PT006.py:96:26
@@ -290,16 +272,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 98 |     ...
    |
 help: Use a string for the first argument
-
-ℹ Safe fix
-93 93 |     ...
-94 94 | 
-95 95 | 
-96    |-@pytest.mark.parametrize(("param",), [[1], [2]])
-   96 |+@pytest.mark.parametrize("param", [1, 2])
-97 97 | def test_single_element_list(param):
-98 98 |     ...
-99 99 | 
+93 |     ...
+94 | 
+95 | 
+   - @pytest.mark.parametrize(("param",), [[1], [2]])
+96 + @pytest.mark.parametrize("param", [1, 2])
+97 | def test_single_element_list(param):
+98 |     ...
+99 | 
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:103:5
@@ -315,21 +295,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 108 |   )
     |
 help: Use a string for the first argument
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | # Unsafe fix
-102 102 | @pytest.mark.parametrize(
-103     |-    (
-104     |-        # comment
-105     |-        "param",
-106     |-    ),
-107     |-    [[1], [2]],
-    103 |+    "param",
-    104 |+    [1, 2],
-108 105 | )
-109 106 | def test_comment_in_argnames(param):
-110 107 |     ...
+100 | 
+101 | # Unsafe fix
+102 | @pytest.mark.parametrize(
+    -     (
+    -         # comment
+    -         "param",
+    -     ),
+    -     [[1], [2]],
+103 +     "param",
+104 +     [1, 2],
+105 | )
+106 | def test_comment_in_argnames(param):
+107 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:114:5
@@ -342,24 +321,23 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 116 |         (
     |
 help: Use a string for the first argument
-
-ℹ Unsafe fix
-111 111 | 
-112 112 | # Unsafe fix
-113 113 | @pytest.mark.parametrize(
-114     |-    ("param",),
-    114 |+    "param",
-115 115 |     [
-116     |-        (
-117     |-            # comment
-118     |-            1,
-119     |-        ),
-120     |-        (2,),
-    116 |+        1,
-    117 |+        2,
-121 118 |     ],
-122 119 | )
-123 120 | def test_comment_in_argvalues(param):
+111 | 
+112 | # Unsafe fix
+113 | @pytest.mark.parametrize(
+    -     ("param",),
+114 +     "param",
+115 |     [
+    -         (
+    -             # comment
+    -             1,
+    -         ),
+    -         (2,),
+116 +         1,
+117 +         2,
+118 |     ],
+119 | )
+120 | def test_comment_in_argvalues(param):
+note: This is an unsafe fix and may change runtime behavior
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:129:5
@@ -372,22 +350,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 131 |         (1,),
     |
 help: Use a string for the first argument
-
-ℹ Safe fix
-126 126 | 
-127 127 | # Safe fix
-128 128 | @pytest.mark.parametrize(
-129     |-    ("param",),
-    129 |+    "param",
-130 130 |     [
-131     |-        (1,),
-    131 |+        1,
-132 132 |         # comment
-133     |-        (2,),
-    133 |+        2,
-134 134 |     ],
-135 135 | )
-136 136 | def test_comment_between_argvalues_items(param):
+126 | 
+127 | # Safe fix
+128 | @pytest.mark.parametrize(
+    -     ("param",),
+129 +     "param",
+130 |     [
+    -         (1,),
+131 +         1,
+132 |         # comment
+    -         (2,),
+133 +         2,
+134 |     ],
+135 | )
+136 | def test_comment_between_argvalues_items(param):
 
 PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str`
    --> PT006.py:142:5
@@ -400,13 +376,11 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe
 144 |         (1,),
     |
 help: Use a string for the first argument
-
-ℹ Safe fix
-139 139 | 
-140 140 | # A fix should be suggested for `argnames`, but not for `argvalues`.
-141 141 | @pytest.mark.parametrize(
-142     |-    ("param",),
-    142 |+    "param",
-143 143 |     [
-144 144 |         (1,),
-145 145 |         (2, 3),
+139 | 
+140 | # A fix should be suggested for `argnames`, but not for `argvalues`.
+141 | @pytest.mark.parametrize(
+    -     ("param",),
+142 +     "param",
+143 |     [
+144 |         (1,),
+145 |         (2, 3),
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap
index 41e4434970..e96f855c7b 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap
@@ -10,16 +10,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 6 |     ...
   |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-1 1 | import pytest
-2 2 | 
-3 3 | 
-4   |-@pytest.mark.parametrize("param", (1, 2))
-  4 |+@pytest.mark.parametrize("param", [1, 2])
-5 5 | def test_tuple(param):
-6 6 |     ...
-7 7 | 
+1 | import pytest
+2 | 
+3 | 
+  - @pytest.mark.parametrize("param", (1, 2))
+4 + @pytest.mark.parametrize("param", [1, 2])
+5 | def test_tuple(param):
+6 |     ...
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:11:5
@@ -35,20 +34,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 16 |   def test_tuple_of_tuples(param1, param2):
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | @pytest.mark.parametrize(
-10 10 |     ("param1", "param2"),
-11    |-    (
-   11 |+    [
-12 12 |         (1, 2),
-13 13 |         (3, 4),
-14    |-    ),
-   14 |+    ],
-15 15 | )
-16 16 | def test_tuple_of_tuples(param1, param2):
-17 17 |     ...
+8  | 
+9  | @pytest.mark.parametrize(
+10 |     ("param1", "param2"),
+   -     (
+11 +     [
+12 |         (1, 2),
+13 |         (3, 4),
+   -     ),
+14 +     ],
+15 | )
+16 | def test_tuple_of_tuples(param1, param2):
+17 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:12:9
@@ -61,16 +59,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 14 |     ),
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-9  9  | @pytest.mark.parametrize(
-10 10 |     ("param1", "param2"),
-11 11 |     (
-12    |-        (1, 2),
-   12 |+        [1, 2],
-13 13 |         (3, 4),
-14 14 |     ),
-15 15 | )
+9  | @pytest.mark.parametrize(
+10 |     ("param1", "param2"),
+11 |     (
+   -         (1, 2),
+12 +         [1, 2],
+13 |         (3, 4),
+14 |     ),
+15 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:13:9
@@ -83,16 +80,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 15 | )
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-10 10 |     ("param1", "param2"),
-11 11 |     (
-12 12 |         (1, 2),
-13    |-        (3, 4),
-   13 |+        [3, 4],
-14 14 |     ),
-15 15 | )
-16 16 | def test_tuple_of_tuples(param1, param2):
+10 |     ("param1", "param2"),
+11 |     (
+12 |         (1, 2),
+   -         (3, 4),
+13 +         [3, 4],
+14 |     ),
+15 | )
+16 | def test_tuple_of_tuples(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:22:5
@@ -108,20 +104,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 27 |   def test_tuple_of_lists(param1, param2):
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | @pytest.mark.parametrize(
-21 21 |     ("param1", "param2"),
-22    |-    (
-   22 |+    [
-23 23 |         [1, 2],
-24 24 |         [3, 4],
-25    |-    ),
-   25 |+    ],
-26 26 | )
-27 27 | def test_tuple_of_lists(param1, param2):
-28 28 |     ...
+19 | 
+20 | @pytest.mark.parametrize(
+21 |     ("param1", "param2"),
+   -     (
+22 +     [
+23 |         [1, 2],
+24 |         [3, 4],
+   -     ),
+25 +     ],
+26 | )
+27 | def test_tuple_of_lists(param1, param2):
+28 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:39:9
@@ -134,16 +129,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 41 |     ],
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-36 36 | @pytest.mark.parametrize(
-37 37 |     ("param1", "param2"),
-38 38 |     [
-39    |-        (1, 2),
-   39 |+        [1, 2],
-40 40 |         (3, 4),
-41 41 |     ],
-42 42 | )
+36 | @pytest.mark.parametrize(
+37 |     ("param1", "param2"),
+38 |     [
+   -         (1, 2),
+39 +         [1, 2],
+40 |         (3, 4),
+41 |     ],
+42 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:40:9
@@ -156,16 +150,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 42 | )
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-37 37 |     ("param1", "param2"),
-38 38 |     [
-39 39 |         (1, 2),
-40    |-        (3, 4),
-   40 |+        [3, 4],
-41 41 |     ],
-42 42 | )
-43 43 | def test_list_of_tuples(param1, param2):
+37 |     ("param1", "param2"),
+38 |     [
+39 |         (1, 2),
+   -         (3, 4),
+40 +         [3, 4],
+41 |     ],
+42 | )
+43 | def test_list_of_tuples(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:81:38
@@ -177,16 +170,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 83 | @pytest.mark.parametrize(
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81    |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-   81 |+@pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)])
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
+78 | 
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+   - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+81 + @pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)])
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:81:39
@@ -198,16 +190,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 83 | @pytest.mark.parametrize(
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81    |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-   81 |+@pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6)))
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
+78 | 
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+   - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+81 + @pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6)))
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list`
   --> PT007.py:81:47
@@ -219,13 +210,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis
 83 | @pytest.mark.parametrize(
    |
 help: Use `list` of `list` for parameter values
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81    |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-   81 |+@pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6]))
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
+78 | 
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+   - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+81 + @pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6]))
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap
index 1791c79d03..d9cd93b399 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap
@@ -10,16 +10,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 6 |     ...
   |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-1 1 | import pytest
-2 2 | 
-3 3 | 
-4   |-@pytest.mark.parametrize("param", (1, 2))
-  4 |+@pytest.mark.parametrize("param", [1, 2])
-5 5 | def test_tuple(param):
-6 6 |     ...
-7 7 | 
+1 | import pytest
+2 | 
+3 | 
+  - @pytest.mark.parametrize("param", (1, 2))
+4 + @pytest.mark.parametrize("param", [1, 2])
+5 | def test_tuple(param):
+6 |     ...
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:11:5
@@ -35,20 +34,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 16 |   def test_tuple_of_tuples(param1, param2):
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | @pytest.mark.parametrize(
-10 10 |     ("param1", "param2"),
-11    |-    (
-   11 |+    [
-12 12 |         (1, 2),
-13 13 |         (3, 4),
-14    |-    ),
-   14 |+    ],
-15 15 | )
-16 16 | def test_tuple_of_tuples(param1, param2):
-17 17 |     ...
+8  | 
+9  | @pytest.mark.parametrize(
+10 |     ("param1", "param2"),
+   -     (
+11 +     [
+12 |         (1, 2),
+13 |         (3, 4),
+   -     ),
+14 +     ],
+15 | )
+16 | def test_tuple_of_tuples(param1, param2):
+17 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:22:5
@@ -64,20 +62,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 27 |   def test_tuple_of_lists(param1, param2):
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | @pytest.mark.parametrize(
-21 21 |     ("param1", "param2"),
-22    |-    (
-   22 |+    [
-23 23 |         [1, 2],
-24 24 |         [3, 4],
-25    |-    ),
-   25 |+    ],
-26 26 | )
-27 27 | def test_tuple_of_lists(param1, param2):
-28 28 |     ...
+19 | 
+20 | @pytest.mark.parametrize(
+21 |     ("param1", "param2"),
+   -     (
+22 +     [
+23 |         [1, 2],
+24 |         [3, 4],
+   -     ),
+25 +     ],
+26 | )
+27 | def test_tuple_of_lists(param1, param2):
+28 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:23:9
@@ -90,16 +87,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 25 |     ),
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-20 20 | @pytest.mark.parametrize(
-21 21 |     ("param1", "param2"),
-22 22 |     (
-23    |-        [1, 2],
-   23 |+        (1, 2),
-24 24 |         [3, 4],
-25 25 |     ),
-26 26 | )
+20 | @pytest.mark.parametrize(
+21 |     ("param1", "param2"),
+22 |     (
+   -         [1, 2],
+23 +         (1, 2),
+24 |         [3, 4],
+25 |     ),
+26 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:24:9
@@ -112,16 +108,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 26 | )
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-21 21 |     ("param1", "param2"),
-22 22 |     (
-23 23 |         [1, 2],
-24    |-        [3, 4],
-   24 |+        (3, 4),
-25 25 |     ),
-26 26 | )
-27 27 | def test_tuple_of_lists(param1, param2):
+21 |     ("param1", "param2"),
+22 |     (
+23 |         [1, 2],
+   -         [3, 4],
+24 +         (3, 4),
+25 |     ),
+26 | )
+27 | def test_tuple_of_lists(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:50:9
@@ -134,16 +129,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 52 |     ],
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-47 47 | @pytest.mark.parametrize(
-48 48 |     ("param1", "param2"),
-49 49 |     [
-50    |-        [1, 2],
-   50 |+        (1, 2),
-51 51 |         [3, 4],
-52 52 |     ],
-53 53 | )
+47 | @pytest.mark.parametrize(
+48 |     ("param1", "param2"),
+49 |     [
+   -         [1, 2],
+50 +         (1, 2),
+51 |         [3, 4],
+52 |     ],
+53 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:51:9
@@ -156,16 +150,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 53 | )
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-48 48 |     ("param1", "param2"),
-49 49 |     [
-50 50 |         [1, 2],
-51    |-        [3, 4],
-   51 |+        (3, 4),
-52 52 |     ],
-53 53 | )
-54 54 | def test_list_of_lists(param1, param2):
+48 |     ("param1", "param2"),
+49 |     [
+50 |         [1, 2],
+   -         [3, 4],
+51 +         (3, 4),
+52 |     ],
+53 | )
+54 | def test_list_of_lists(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:61:9
@@ -178,16 +171,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 63 |     ],
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-58 58 | @pytest.mark.parametrize(
-59 59 |     "param1,param2",
-60 60 |     [
-61    |-        [1, 2],
-   61 |+        (1, 2),
-62 62 |         [3, 4],
-63 63 |     ],
-64 64 | )
+58 | @pytest.mark.parametrize(
+59 |     "param1,param2",
+60 |     [
+   -         [1, 2],
+61 +         (1, 2),
+62 |         [3, 4],
+63 |     ],
+64 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:62:9
@@ -200,16 +192,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 64 | )
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-59 59 |     "param1,param2",
-60 60 |     [
-61 61 |         [1, 2],
-62    |-        [3, 4],
-   62 |+        (3, 4),
-63 63 |     ],
-64 64 | )
-65 65 | def test_csv_name_list_of_lists(param1, param2):
+59 |     "param1,param2",
+60 |     [
+61 |         [1, 2],
+   -         [3, 4],
+62 +         (3, 4),
+63 |     ],
+64 | )
+65 | def test_csv_name_list_of_lists(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple`
   --> PT007.py:81:38
@@ -221,13 +212,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup
 83 | @pytest.mark.parametrize(
    |
 help: Use `list` of `tuple` for parameter values
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81    |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-   81 |+@pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)])
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
+78 | 
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+   - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+81 + @pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)])
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap
index 9e6b515935..70ac21a8e8 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap
@@ -12,16 +12,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 14 |     ),
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-9  9  | @pytest.mark.parametrize(
-10 10 |     ("param1", "param2"),
-11 11 |     (
-12    |-        (1, 2),
-   12 |+        [1, 2],
-13 13 |         (3, 4),
-14 14 |     ),
-15 15 | )
+9  | @pytest.mark.parametrize(
+10 |     ("param1", "param2"),
+11 |     (
+   -         (1, 2),
+12 +         [1, 2],
+13 |         (3, 4),
+14 |     ),
+15 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:13:9
@@ -34,16 +33,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 15 | )
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-10 10 |     ("param1", "param2"),
-11 11 |     (
-12 12 |         (1, 2),
-13    |-        (3, 4),
-   13 |+        [3, 4],
-14 14 |     ),
-15 15 | )
-16 16 | def test_tuple_of_tuples(param1, param2):
+10 |     ("param1", "param2"),
+11 |     (
+12 |         (1, 2),
+   -         (3, 4),
+13 +         [3, 4],
+14 |     ),
+15 | )
+16 | def test_tuple_of_tuples(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:31:35
@@ -54,16 +52,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 33 |     ...
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-28 28 |     ...
-29 29 | 
-30 30 | 
-31    |-@pytest.mark.parametrize("param", [1, 2])
-   31 |+@pytest.mark.parametrize("param", (1, 2))
-32 32 | def test_list(param):
-33 33 |     ...
-34 34 | 
+28 |     ...
+29 | 
+30 | 
+   - @pytest.mark.parametrize("param", [1, 2])
+31 + @pytest.mark.parametrize("param", (1, 2))
+32 | def test_list(param):
+33 |     ...
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:38:5
@@ -79,20 +76,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 43 |   def test_list_of_tuples(param1, param2):
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | @pytest.mark.parametrize(
-37 37 |     ("param1", "param2"),
-38    |-    [
-   38 |+    (
-39 39 |         (1, 2),
-40 40 |         (3, 4),
-41    |-    ],
-   41 |+    ),
-42 42 | )
-43 43 | def test_list_of_tuples(param1, param2):
-44 44 |     ...
+35 | 
+36 | @pytest.mark.parametrize(
+37 |     ("param1", "param2"),
+   -     [
+38 +     (
+39 |         (1, 2),
+40 |         (3, 4),
+   -     ],
+41 +     ),
+42 | )
+43 | def test_list_of_tuples(param1, param2):
+44 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:39:9
@@ -105,16 +101,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 41 |     ],
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-36 36 | @pytest.mark.parametrize(
-37 37 |     ("param1", "param2"),
-38 38 |     [
-39    |-        (1, 2),
-   39 |+        [1, 2],
-40 40 |         (3, 4),
-41 41 |     ],
-42 42 | )
+36 | @pytest.mark.parametrize(
+37 |     ("param1", "param2"),
+38 |     [
+   -         (1, 2),
+39 +         [1, 2],
+40 |         (3, 4),
+41 |     ],
+42 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:40:9
@@ -127,16 +122,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 42 | )
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-37 37 |     ("param1", "param2"),
-38 38 |     [
-39 39 |         (1, 2),
-40    |-        (3, 4),
-   40 |+        [3, 4],
-41 41 |     ],
-42 42 | )
-43 43 | def test_list_of_tuples(param1, param2):
+37 |     ("param1", "param2"),
+38 |     [
+39 |         (1, 2),
+   -         (3, 4),
+40 +         [3, 4],
+41 |     ],
+42 | )
+43 | def test_list_of_tuples(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:49:5
@@ -152,20 +146,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 54 |   def test_list_of_lists(param1, param2):
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-46 46 | 
-47 47 | @pytest.mark.parametrize(
-48 48 |     ("param1", "param2"),
-49    |-    [
-   49 |+    (
-50 50 |         [1, 2],
-51 51 |         [3, 4],
-52    |-    ],
-   52 |+    ),
-53 53 | )
-54 54 | def test_list_of_lists(param1, param2):
-55 55 |     ...
+46 | 
+47 | @pytest.mark.parametrize(
+48 |     ("param1", "param2"),
+   -     [
+49 +     (
+50 |         [1, 2],
+51 |         [3, 4],
+   -     ],
+52 +     ),
+53 | )
+54 | def test_list_of_lists(param1, param2):
+55 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:60:5
@@ -181,20 +174,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 65 |   def test_csv_name_list_of_lists(param1, param2):
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | @pytest.mark.parametrize(
-59 59 |     "param1,param2",
-60    |-    [
-   60 |+    (
-61 61 |         [1, 2],
-62 62 |         [3, 4],
-63    |-    ],
-   63 |+    ),
-64 64 | )
-65 65 | def test_csv_name_list_of_lists(param1, param2):
-66 66 |     ...
+57 | 
+58 | @pytest.mark.parametrize(
+59 |     "param1,param2",
+   -     [
+60 +     (
+61 |         [1, 2],
+62 |         [3, 4],
+   -     ],
+63 +     ),
+64 | )
+65 | def test_csv_name_list_of_lists(param1, param2):
+66 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:71:5
@@ -210,20 +202,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 76 |   def test_single_list_of_lists(param):
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-68 68 | 
-69 69 | @pytest.mark.parametrize(
-70 70 |     "param",
-71    |-    [
-   71 |+    (
-72 72 |         [1, 2],
-73 73 |         [3, 4],
-74    |-    ],
-   74 |+    ),
-75 75 | )
-76 76 | def test_single_list_of_lists(param):
-77 77 |     ...
+68 | 
+69 | @pytest.mark.parametrize(
+70 |     "param",
+   -     [
+71 +     (
+72 |         [1, 2],
+73 |         [3, 4],
+   -     ],
+74 +     ),
+75 | )
+76 | def test_single_list_of_lists(param):
+77 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:80:31
@@ -234,16 +225,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 82 | @pytest.mark.parametrize("d", [3,])
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-77 77 |     ...
-78 78 | 
-79 79 | 
-80    |-@pytest.mark.parametrize("a", [1, 2])
-   80 |+@pytest.mark.parametrize("a", (1, 2))
-81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
+77 |     ...
+78 | 
+79 | 
+   - @pytest.mark.parametrize("a", [1, 2])
+80 + @pytest.mark.parametrize("a", (1, 2))
+81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:81:39
@@ -255,16 +245,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 83 | @pytest.mark.parametrize(
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81    |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-   81 |+@pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6)))
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
+78 | 
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+   - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+81 + @pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6)))
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:81:47
@@ -276,16 +265,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 83 | @pytest.mark.parametrize(
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81    |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-   81 |+@pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6]))
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
+78 | 
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+   - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+81 + @pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6]))
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:82:31
@@ -298,16 +286,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 84 |     "d",
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-82    |-@pytest.mark.parametrize("d", [3,])
-   82 |+@pytest.mark.parametrize("d", (3,))
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
-85 85 |     [("3", "4")],
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+   - @pytest.mark.parametrize("d", [3,])
+82 + @pytest.mark.parametrize("d", (3,))
+83 | @pytest.mark.parametrize(
+84 |     "d",
+85 |     [("3", "4")],
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:85:5
@@ -320,16 +307,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 87 | @pytest.mark.parametrize(
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
-85    |-    [("3", "4")],
-   85 |+    (("3", "4"),),
-86 86 | )
-87 87 | @pytest.mark.parametrize(
-88 88 |     "e",
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+   -     [("3", "4")],
+85 +     (("3", "4"),),
+86 | )
+87 | @pytest.mark.parametrize(
+88 |     "e",
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list`
   --> PT007.py:89:5
@@ -342,13 +328,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li
 91 | def test_multiple_decorators(a, b, c, d, e):
    |
 help: Use `tuple` of `list` for parameter values
-
-ℹ Unsafe fix
-86 86 | )
-87 87 | @pytest.mark.parametrize(
-88 88 |     "e",
-89    |-    [("3", "4"),],
-   89 |+    (("3", "4"),),
-90 90 | )
-91 91 | def test_multiple_decorators(a, b, c, d, e):
-92 92 |     pass
+86 | )
+87 | @pytest.mark.parametrize(
+88 |     "e",
+   -     [("3", "4"),],
+89 +     (("3", "4"),),
+90 | )
+91 | def test_multiple_decorators(a, b, c, d, e):
+92 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap
index fda908e395..3619922a75 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap
@@ -12,16 +12,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 25 |     ),
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-20 20 | @pytest.mark.parametrize(
-21 21 |     ("param1", "param2"),
-22 22 |     (
-23    |-        [1, 2],
-   23 |+        (1, 2),
-24 24 |         [3, 4],
-25 25 |     ),
-26 26 | )
+20 | @pytest.mark.parametrize(
+21 |     ("param1", "param2"),
+22 |     (
+   -         [1, 2],
+23 +         (1, 2),
+24 |         [3, 4],
+25 |     ),
+26 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:24:9
@@ -34,16 +33,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 26 | )
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-21 21 |     ("param1", "param2"),
-22 22 |     (
-23 23 |         [1, 2],
-24    |-        [3, 4],
-   24 |+        (3, 4),
-25 25 |     ),
-26 26 | )
-27 27 | def test_tuple_of_lists(param1, param2):
+21 |     ("param1", "param2"),
+22 |     (
+23 |         [1, 2],
+   -         [3, 4],
+24 +         (3, 4),
+25 |     ),
+26 | )
+27 | def test_tuple_of_lists(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:31:35
@@ -54,16 +52,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 33 |     ...
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-28 28 |     ...
-29 29 | 
-30 30 | 
-31    |-@pytest.mark.parametrize("param", [1, 2])
-   31 |+@pytest.mark.parametrize("param", (1, 2))
-32 32 | def test_list(param):
-33 33 |     ...
-34 34 | 
+28 |     ...
+29 | 
+30 | 
+   - @pytest.mark.parametrize("param", [1, 2])
+31 + @pytest.mark.parametrize("param", (1, 2))
+32 | def test_list(param):
+33 |     ...
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:38:5
@@ -79,20 +76,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 43 |   def test_list_of_tuples(param1, param2):
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | @pytest.mark.parametrize(
-37 37 |     ("param1", "param2"),
-38    |-    [
-   38 |+    (
-39 39 |         (1, 2),
-40 40 |         (3, 4),
-41    |-    ],
-   41 |+    ),
-42 42 | )
-43 43 | def test_list_of_tuples(param1, param2):
-44 44 |     ...
+35 | 
+36 | @pytest.mark.parametrize(
+37 |     ("param1", "param2"),
+   -     [
+38 +     (
+39 |         (1, 2),
+40 |         (3, 4),
+   -     ],
+41 +     ),
+42 | )
+43 | def test_list_of_tuples(param1, param2):
+44 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:49:5
@@ -108,20 +104,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 54 |   def test_list_of_lists(param1, param2):
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-46 46 | 
-47 47 | @pytest.mark.parametrize(
-48 48 |     ("param1", "param2"),
-49    |-    [
-   49 |+    (
-50 50 |         [1, 2],
-51 51 |         [3, 4],
-52    |-    ],
-   52 |+    ),
-53 53 | )
-54 54 | def test_list_of_lists(param1, param2):
-55 55 |     ...
+46 | 
+47 | @pytest.mark.parametrize(
+48 |     ("param1", "param2"),
+   -     [
+49 +     (
+50 |         [1, 2],
+51 |         [3, 4],
+   -     ],
+52 +     ),
+53 | )
+54 | def test_list_of_lists(param1, param2):
+55 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:50:9
@@ -134,16 +129,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 52 |     ],
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-47 47 | @pytest.mark.parametrize(
-48 48 |     ("param1", "param2"),
-49 49 |     [
-50    |-        [1, 2],
-   50 |+        (1, 2),
-51 51 |         [3, 4],
-52 52 |     ],
-53 53 | )
+47 | @pytest.mark.parametrize(
+48 |     ("param1", "param2"),
+49 |     [
+   -         [1, 2],
+50 +         (1, 2),
+51 |         [3, 4],
+52 |     ],
+53 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:51:9
@@ -156,16 +150,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 53 | )
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-48 48 |     ("param1", "param2"),
-49 49 |     [
-50 50 |         [1, 2],
-51    |-        [3, 4],
-   51 |+        (3, 4),
-52 52 |     ],
-53 53 | )
-54 54 | def test_list_of_lists(param1, param2):
+48 |     ("param1", "param2"),
+49 |     [
+50 |         [1, 2],
+   -         [3, 4],
+51 +         (3, 4),
+52 |     ],
+53 | )
+54 | def test_list_of_lists(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:60:5
@@ -181,20 +174,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 65 |   def test_csv_name_list_of_lists(param1, param2):
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | @pytest.mark.parametrize(
-59 59 |     "param1,param2",
-60    |-    [
-   60 |+    (
-61 61 |         [1, 2],
-62 62 |         [3, 4],
-63    |-    ],
-   63 |+    ),
-64 64 | )
-65 65 | def test_csv_name_list_of_lists(param1, param2):
-66 66 |     ...
+57 | 
+58 | @pytest.mark.parametrize(
+59 |     "param1,param2",
+   -     [
+60 +     (
+61 |         [1, 2],
+62 |         [3, 4],
+   -     ],
+63 +     ),
+64 | )
+65 | def test_csv_name_list_of_lists(param1, param2):
+66 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:61:9
@@ -207,16 +199,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 63 |     ],
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-58 58 | @pytest.mark.parametrize(
-59 59 |     "param1,param2",
-60 60 |     [
-61    |-        [1, 2],
-   61 |+        (1, 2),
-62 62 |         [3, 4],
-63 63 |     ],
-64 64 | )
+58 | @pytest.mark.parametrize(
+59 |     "param1,param2",
+60 |     [
+   -         [1, 2],
+61 +         (1, 2),
+62 |         [3, 4],
+63 |     ],
+64 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:62:9
@@ -229,16 +220,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 64 | )
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-59 59 |     "param1,param2",
-60 60 |     [
-61 61 |         [1, 2],
-62    |-        [3, 4],
-   62 |+        (3, 4),
-63 63 |     ],
-64 64 | )
-65 65 | def test_csv_name_list_of_lists(param1, param2):
+59 |     "param1,param2",
+60 |     [
+61 |         [1, 2],
+   -         [3, 4],
+62 +         (3, 4),
+63 |     ],
+64 | )
+65 | def test_csv_name_list_of_lists(param1, param2):
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:71:5
@@ -254,20 +244,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 76 |   def test_single_list_of_lists(param):
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-68 68 | 
-69 69 | @pytest.mark.parametrize(
-70 70 |     "param",
-71    |-    [
-   71 |+    (
-72 72 |         [1, 2],
-73 73 |         [3, 4],
-74    |-    ],
-   74 |+    ),
-75 75 | )
-76 76 | def test_single_list_of_lists(param):
-77 77 |     ...
+68 | 
+69 | @pytest.mark.parametrize(
+70 |     "param",
+   -     [
+71 +     (
+72 |         [1, 2],
+73 |         [3, 4],
+   -     ],
+74 +     ),
+75 | )
+76 | def test_single_list_of_lists(param):
+77 |     ...
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:80:31
@@ -278,16 +267,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 82 | @pytest.mark.parametrize("d", [3,])
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-77 77 |     ...
-78 78 | 
-79 79 | 
-80    |-@pytest.mark.parametrize("a", [1, 2])
-   80 |+@pytest.mark.parametrize("a", (1, 2))
-81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
+77 |     ...
+78 | 
+79 | 
+   - @pytest.mark.parametrize("a", [1, 2])
+80 + @pytest.mark.parametrize("a", (1, 2))
+81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:82:31
@@ -300,16 +288,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 84 |     "d",
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-79 79 | 
-80 80 | @pytest.mark.parametrize("a", [1, 2])
-81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-82    |-@pytest.mark.parametrize("d", [3,])
-   82 |+@pytest.mark.parametrize("d", (3,))
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
-85 85 |     [("3", "4")],
+79 | 
+80 | @pytest.mark.parametrize("a", [1, 2])
+81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+   - @pytest.mark.parametrize("d", [3,])
+82 + @pytest.mark.parametrize("d", (3,))
+83 | @pytest.mark.parametrize(
+84 |     "d",
+85 |     [("3", "4")],
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:85:5
@@ -322,16 +309,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 87 | @pytest.mark.parametrize(
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-82 82 | @pytest.mark.parametrize("d", [3,])
-83 83 | @pytest.mark.parametrize(
-84 84 |     "d",
-85    |-    [("3", "4")],
-   85 |+    (("3", "4"),),
-86 86 | )
-87 87 | @pytest.mark.parametrize(
-88 88 |     "e",
+82 | @pytest.mark.parametrize("d", [3,])
+83 | @pytest.mark.parametrize(
+84 |     "d",
+   -     [("3", "4")],
+85 +     (("3", "4"),),
+86 | )
+87 | @pytest.mark.parametrize(
+88 |     "e",
+note: This is an unsafe fix and may change runtime behavior
 
 PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple`
   --> PT007.py:89:5
@@ -344,13 +330,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu
 91 | def test_multiple_decorators(a, b, c, d, e):
    |
 help: Use `tuple` of `tuple` for parameter values
-
-ℹ Unsafe fix
-86 86 | )
-87 87 | @pytest.mark.parametrize(
-88 88 |     "e",
-89    |-    [("3", "4"),],
-   89 |+    (("3", "4"),),
-90 90 | )
-91 91 | def test_multiple_decorators(a, b, c, d, e):
-92 92 |     pass
+86 | )
+87 | @pytest.mark.parametrize(
+88 |     "e",
+   -     [("3", "4"),],
+89 +     (("3", "4"),),
+90 | )
+91 | def test_multiple_decorators(a, b, c, d, e):
+92 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap
index 513a58b588..b3a8446f0b 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap
@@ -12,16 +12,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
 13 |         self.assertTrue(expr, msg)  # Error
    |
 help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Unsafe fix
-8  8  |     def test_assert_true(self):
-9  9  |         expr = 1
-10 10 |         msg = "Must be True"
-11    |-        self.assertTrue(expr)  # Error
-   11 |+        assert expr  # Error
-12 12 |         self.assertTrue(expr=expr)  # Error
-13 13 |         self.assertTrue(expr, msg)  # Error
-14 14 |         self.assertTrue(expr=expr, msg=msg)  # Error
+8  |     def test_assert_true(self):
+9  |         expr = 1
+10 |         msg = "Must be True"
+   -         self.assertTrue(expr)  # Error
+11 +         assert expr  # Error
+12 |         self.assertTrue(expr=expr)  # Error
+13 |         self.assertTrue(expr, msg)  # Error
+14 |         self.assertTrue(expr=expr, msg=msg)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
   --> PT009.py:12:9
@@ -34,16 +33,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
 14 |         self.assertTrue(expr=expr, msg=msg)  # Error
    |
 help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Unsafe fix
-9  9  |         expr = 1
-10 10 |         msg = "Must be True"
-11 11 |         self.assertTrue(expr)  # Error
-12    |-        self.assertTrue(expr=expr)  # Error
-   12 |+        assert expr  # Error
-13 13 |         self.assertTrue(expr, msg)  # Error
-14 14 |         self.assertTrue(expr=expr, msg=msg)  # Error
-15 15 |         self.assertTrue(msg=msg, expr=expr)  # Error
+9  |         expr = 1
+10 |         msg = "Must be True"
+11 |         self.assertTrue(expr)  # Error
+   -         self.assertTrue(expr=expr)  # Error
+12 +         assert expr  # Error
+13 |         self.assertTrue(expr, msg)  # Error
+14 |         self.assertTrue(expr=expr, msg=msg)  # Error
+15 |         self.assertTrue(msg=msg, expr=expr)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
   --> PT009.py:13:9
@@ -56,16 +54,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
 15 |         self.assertTrue(msg=msg, expr=expr)  # Error
    |
 help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Unsafe fix
-10 10 |         msg = "Must be True"
-11 11 |         self.assertTrue(expr)  # Error
-12 12 |         self.assertTrue(expr=expr)  # Error
-13    |-        self.assertTrue(expr, msg)  # Error
-   13 |+        assert expr, msg  # Error
-14 14 |         self.assertTrue(expr=expr, msg=msg)  # Error
-15 15 |         self.assertTrue(msg=msg, expr=expr)  # Error
-16 16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
+10 |         msg = "Must be True"
+11 |         self.assertTrue(expr)  # Error
+12 |         self.assertTrue(expr=expr)  # Error
+   -         self.assertTrue(expr, msg)  # Error
+13 +         assert expr, msg  # Error
+14 |         self.assertTrue(expr=expr, msg=msg)  # Error
+15 |         self.assertTrue(msg=msg, expr=expr)  # Error
+16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
   --> PT009.py:14:9
@@ -78,16 +75,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
 16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
    |
 help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Unsafe fix
-11 11 |         self.assertTrue(expr)  # Error
-12 12 |         self.assertTrue(expr=expr)  # Error
-13 13 |         self.assertTrue(expr, msg)  # Error
-14    |-        self.assertTrue(expr=expr, msg=msg)  # Error
-   14 |+        assert expr, msg  # Error
-15 15 |         self.assertTrue(msg=msg, expr=expr)  # Error
-16 16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
-17 17 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
+11 |         self.assertTrue(expr)  # Error
+12 |         self.assertTrue(expr=expr)  # Error
+13 |         self.assertTrue(expr, msg)  # Error
+   -         self.assertTrue(expr=expr, msg=msg)  # Error
+14 +         assert expr, msg  # Error
+15 |         self.assertTrue(msg=msg, expr=expr)  # Error
+16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
+17 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
   --> PT009.py:15:9
@@ -100,16 +96,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
 17 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
    |
 help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Unsafe fix
-12 12 |         self.assertTrue(expr=expr)  # Error
-13 13 |         self.assertTrue(expr, msg)  # Error
-14 14 |         self.assertTrue(expr=expr, msg=msg)  # Error
-15    |-        self.assertTrue(msg=msg, expr=expr)  # Error
-   15 |+        assert expr, msg  # Error
-16 16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
-17 17 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
-18 18 |         self.assertTrue(msg=msg, expr=expr, unexpected_arg=False)  # Error, unfixable
+12 |         self.assertTrue(expr=expr)  # Error
+13 |         self.assertTrue(expr, msg)  # Error
+14 |         self.assertTrue(expr=expr, msg=msg)  # Error
+   -         self.assertTrue(msg=msg, expr=expr)  # Error
+15 +         assert expr, msg  # Error
+16 |         self.assertTrue(*(expr, msg))  # Error, unfixable
+17 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
+18 |         self.assertTrue(msg=msg, expr=expr, unexpected_arg=False)  # Error, unfixable
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 Use a regular `assert` instead of unittest-style `assertTrue`
   --> PT009.py:16:9
@@ -205,16 +200,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertFalse`
 30 |     def test_assert_equal(self):
    |
 help: Replace `assertFalse(...)` with `assert ...`
-
-ℹ Unsafe fix
-25 25 |         return self.assertEqual(True,  False)  # Error, unfixable
-26 26 | 
-27 27 |     def test_assert_false(self):
-28    |-        self.assertFalse(True)  # Error
-   28 |+        assert not True  # Error
-29 29 | 
-30 30 |     def test_assert_equal(self):
-31 31 |         self.assertEqual(1, 2)  # Error
+25 |         return self.assertEqual(True,  False)  # Error, unfixable
+26 | 
+27 |     def test_assert_false(self):
+   -         self.assertFalse(True)  # Error
+28 +         assert not True  # Error
+29 | 
+30 |     def test_assert_equal(self):
+31 |         self.assertEqual(1, 2)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertEqual`
   --> PT009.py:31:9
@@ -226,16 +220,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertEqual`
 33 |     def test_assert_not_equal(self):
    |
 help: Replace `assertEqual(...)` with `assert ...`
-
-ℹ Unsafe fix
-28 28 |         self.assertFalse(True)  # Error
-29 29 | 
-30 30 |     def test_assert_equal(self):
-31    |-        self.assertEqual(1, 2)  # Error
-   31 |+        assert 1 == 2  # Error
-32 32 | 
-33 33 |     def test_assert_not_equal(self):
-34 34 |         self.assertNotEqual(1, 1)  # Error
+28 |         self.assertFalse(True)  # Error
+29 | 
+30 |     def test_assert_equal(self):
+   -         self.assertEqual(1, 2)  # Error
+31 +         assert 1 == 2  # Error
+32 | 
+33 |     def test_assert_not_equal(self):
+34 |         self.assertNotEqual(1, 1)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertNotEqual`
   --> PT009.py:34:9
@@ -247,16 +240,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotEqual`
 36 |     def test_assert_greater(self):
    |
 help: Replace `assertNotEqual(...)` with `assert ...`
-
-ℹ Unsafe fix
-31 31 |         self.assertEqual(1, 2)  # Error
-32 32 | 
-33 33 |     def test_assert_not_equal(self):
-34    |-        self.assertNotEqual(1, 1)  # Error
-   34 |+        assert 1 != 1  # Error
-35 35 | 
-36 36 |     def test_assert_greater(self):
-37 37 |         self.assertGreater(1, 2)  # Error
+31 |         self.assertEqual(1, 2)  # Error
+32 | 
+33 |     def test_assert_not_equal(self):
+   -         self.assertNotEqual(1, 1)  # Error
+34 +         assert 1 != 1  # Error
+35 | 
+36 |     def test_assert_greater(self):
+37 |         self.assertGreater(1, 2)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertGreater`
   --> PT009.py:37:9
@@ -268,16 +260,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertGreater`
 39 |     def test_assert_greater_equal(self):
    |
 help: Replace `assertGreater(...)` with `assert ...`
-
-ℹ Unsafe fix
-34 34 |         self.assertNotEqual(1, 1)  # Error
-35 35 | 
-36 36 |     def test_assert_greater(self):
-37    |-        self.assertGreater(1, 2)  # Error
-   37 |+        assert 1 > 2  # Error
-38 38 | 
-39 39 |     def test_assert_greater_equal(self):
-40 40 |         self.assertGreaterEqual(1, 2)  # Error
+34 |         self.assertNotEqual(1, 1)  # Error
+35 | 
+36 |     def test_assert_greater(self):
+   -         self.assertGreater(1, 2)  # Error
+37 +         assert 1 > 2  # Error
+38 | 
+39 |     def test_assert_greater_equal(self):
+40 |         self.assertGreaterEqual(1, 2)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertGreaterEqual`
   --> PT009.py:40:9
@@ -289,16 +280,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertGreaterEqual`
 42 |     def test_assert_less(self):
    |
 help: Replace `assertGreaterEqual(...)` with `assert ...`
-
-ℹ Unsafe fix
-37 37 |         self.assertGreater(1, 2)  # Error
-38 38 | 
-39 39 |     def test_assert_greater_equal(self):
-40    |-        self.assertGreaterEqual(1, 2)  # Error
-   40 |+        assert 1 >= 2  # Error
-41 41 | 
-42 42 |     def test_assert_less(self):
-43 43 |         self.assertLess(2, 1)  # Error
+37 |         self.assertGreater(1, 2)  # Error
+38 | 
+39 |     def test_assert_greater_equal(self):
+   -         self.assertGreaterEqual(1, 2)  # Error
+40 +         assert 1 >= 2  # Error
+41 | 
+42 |     def test_assert_less(self):
+43 |         self.assertLess(2, 1)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertLess`
   --> PT009.py:43:9
@@ -310,16 +300,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertLess`
 45 |     def test_assert_less_equal(self):
    |
 help: Replace `assertLess(...)` with `assert ...`
-
-ℹ Unsafe fix
-40 40 |         self.assertGreaterEqual(1, 2)  # Error
-41 41 | 
-42 42 |     def test_assert_less(self):
-43    |-        self.assertLess(2, 1)  # Error
-   43 |+        assert 2 < 1  # Error
-44 44 | 
-45 45 |     def test_assert_less_equal(self):
-46 46 |         self.assertLessEqual(1, 2)  # Error
+40 |         self.assertGreaterEqual(1, 2)  # Error
+41 | 
+42 |     def test_assert_less(self):
+   -         self.assertLess(2, 1)  # Error
+43 +         assert 2 < 1  # Error
+44 | 
+45 |     def test_assert_less_equal(self):
+46 |         self.assertLessEqual(1, 2)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertLessEqual`
   --> PT009.py:46:9
@@ -331,16 +320,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertLessEqual`
 48 |     def test_assert_in(self):
    |
 help: Replace `assertLessEqual(...)` with `assert ...`
-
-ℹ Unsafe fix
-43 43 |         self.assertLess(2, 1)  # Error
-44 44 | 
-45 45 |     def test_assert_less_equal(self):
-46    |-        self.assertLessEqual(1, 2)  # Error
-   46 |+        assert 1 <= 2  # Error
-47 47 | 
-48 48 |     def test_assert_in(self):
-49 49 |         self.assertIn(1, [2, 3])  # Error
+43 |         self.assertLess(2, 1)  # Error
+44 | 
+45 |     def test_assert_less_equal(self):
+   -         self.assertLessEqual(1, 2)  # Error
+46 +         assert 1 <= 2  # Error
+47 | 
+48 |     def test_assert_in(self):
+49 |         self.assertIn(1, [2, 3])  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertIn`
   --> PT009.py:49:9
@@ -352,16 +340,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIn`
 51 |     def test_assert_not_in(self):
    |
 help: Replace `assertIn(...)` with `assert ...`
-
-ℹ Unsafe fix
-46 46 |         self.assertLessEqual(1, 2)  # Error
-47 47 | 
-48 48 |     def test_assert_in(self):
-49    |-        self.assertIn(1, [2, 3])  # Error
-   49 |+        assert 1 in [2, 3]  # Error
-50 50 | 
-51 51 |     def test_assert_not_in(self):
-52 52 |         self.assertNotIn(2, [2, 3])  # Error
+46 |         self.assertLessEqual(1, 2)  # Error
+47 | 
+48 |     def test_assert_in(self):
+   -         self.assertIn(1, [2, 3])  # Error
+49 +         assert 1 in [2, 3]  # Error
+50 | 
+51 |     def test_assert_not_in(self):
+52 |         self.assertNotIn(2, [2, 3])  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIn`
   --> PT009.py:52:9
@@ -373,16 +360,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIn`
 54 |     def test_assert_is_none(self):
    |
 help: Replace `assertNotIn(...)` with `assert ...`
-
-ℹ Unsafe fix
-49 49 |         self.assertIn(1, [2, 3])  # Error
-50 50 | 
-51 51 |     def test_assert_not_in(self):
-52    |-        self.assertNotIn(2, [2, 3])  # Error
-   52 |+        assert 2 not in [2, 3]  # Error
-53 53 | 
-54 54 |     def test_assert_is_none(self):
-55 55 |         self.assertIsNone(0)  # Error
+49 |         self.assertIn(1, [2, 3])  # Error
+50 | 
+51 |     def test_assert_not_in(self):
+   -         self.assertNotIn(2, [2, 3])  # Error
+52 +         assert 2 not in [2, 3]  # Error
+53 | 
+54 |     def test_assert_is_none(self):
+55 |         self.assertIsNone(0)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNone`
   --> PT009.py:55:9
@@ -394,16 +380,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNone`
 57 |     def test_assert_is_not_none(self):
    |
 help: Replace `assertIsNone(...)` with `assert ...`
-
-ℹ Unsafe fix
-52 52 |         self.assertNotIn(2, [2, 3])  # Error
-53 53 | 
-54 54 |     def test_assert_is_none(self):
-55    |-        self.assertIsNone(0)  # Error
-   55 |+        assert 0 is None  # Error
-56 56 | 
-57 57 |     def test_assert_is_not_none(self):
-58 58 |         self.assertIsNotNone(0)  # Error
+52 |         self.assertNotIn(2, [2, 3])  # Error
+53 | 
+54 |     def test_assert_is_none(self):
+   -         self.assertIsNone(0)  # Error
+55 +         assert 0 is None  # Error
+56 | 
+57 |     def test_assert_is_not_none(self):
+58 |         self.assertIsNotNone(0)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNotNone`
   --> PT009.py:58:9
@@ -415,16 +400,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNotNone`
 60 |     def test_assert_is(self):
    |
 help: Replace `assertIsNotNone(...)` with `assert ...`
-
-ℹ Unsafe fix
-55 55 |         self.assertIsNone(0)  # Error
-56 56 | 
-57 57 |     def test_assert_is_not_none(self):
-58    |-        self.assertIsNotNone(0)  # Error
-   58 |+        assert 0 is not None  # Error
-59 59 | 
-60 60 |     def test_assert_is(self):
-61 61 |         self.assertIs([], [])  # Error
+55 |         self.assertIsNone(0)  # Error
+56 | 
+57 |     def test_assert_is_not_none(self):
+   -         self.assertIsNotNone(0)  # Error
+58 +         assert 0 is not None  # Error
+59 | 
+60 |     def test_assert_is(self):
+61 |         self.assertIs([], [])  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertIs`
   --> PT009.py:61:9
@@ -436,16 +420,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIs`
 63 |     def test_assert_is_not(self):
    |
 help: Replace `assertIs(...)` with `assert ...`
-
-ℹ Unsafe fix
-58 58 |         self.assertIsNotNone(0)  # Error
-59 59 | 
-60 60 |     def test_assert_is(self):
-61    |-        self.assertIs([], [])  # Error
-   61 |+        assert [] is []  # Error
-62 62 | 
-63 63 |     def test_assert_is_not(self):
-64 64 |         self.assertIsNot(1, 1)  # Error
+58 |         self.assertIsNotNone(0)  # Error
+59 | 
+60 |     def test_assert_is(self):
+   -         self.assertIs([], [])  # Error
+61 +         assert [] is []  # Error
+62 | 
+63 |     def test_assert_is_not(self):
+64 |         self.assertIsNot(1, 1)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNot`
   --> PT009.py:64:9
@@ -457,16 +440,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNot`
 66 |     def test_assert_is_instance(self):
    |
 help: Replace `assertIsNot(...)` with `assert ...`
-
-ℹ Unsafe fix
-61 61 |         self.assertIs([], [])  # Error
-62 62 | 
-63 63 |     def test_assert_is_not(self):
-64    |-        self.assertIsNot(1, 1)  # Error
-   64 |+        assert 1 is not 1  # Error
-65 65 | 
-66 66 |     def test_assert_is_instance(self):
-67 67 |         self.assertIsInstance(1, str)  # Error
+61 |         self.assertIs([], [])  # Error
+62 | 
+63 |     def test_assert_is_not(self):
+   -         self.assertIsNot(1, 1)  # Error
+64 +         assert 1 is not 1  # Error
+65 | 
+66 |     def test_assert_is_instance(self):
+67 |         self.assertIsInstance(1, str)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertIsInstance`
   --> PT009.py:67:9
@@ -478,16 +460,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsInstance`
 69 |     def test_assert_is_not_instance(self):
    |
 help: Replace `assertIsInstance(...)` with `assert ...`
-
-ℹ Unsafe fix
-64 64 |         self.assertIsNot(1, 1)  # Error
-65 65 | 
-66 66 |     def test_assert_is_instance(self):
-67    |-        self.assertIsInstance(1, str)  # Error
-   67 |+        assert isinstance(1, str)  # Error
-68 68 | 
-69 69 |     def test_assert_is_not_instance(self):
-70 70 |         self.assertNotIsInstance(1, int)  # Error
+64 |         self.assertIsNot(1, 1)  # Error
+65 | 
+66 |     def test_assert_is_instance(self):
+   -         self.assertIsInstance(1, str)  # Error
+67 +         assert isinstance(1, str)  # Error
+68 | 
+69 |     def test_assert_is_not_instance(self):
+70 |         self.assertNotIsInstance(1, int)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIsInstance`
   --> PT009.py:70:9
@@ -499,16 +480,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIsInstance`
 72 |     def test_assert_regex(self):
    |
 help: Replace `assertNotIsInstance(...)` with `assert ...`
-
-ℹ Unsafe fix
-67 67 |         self.assertIsInstance(1, str)  # Error
-68 68 | 
-69 69 |     def test_assert_is_not_instance(self):
-70    |-        self.assertNotIsInstance(1, int)  # Error
-   70 |+        assert not isinstance(1, int)  # Error
-71 71 | 
-72 72 |     def test_assert_regex(self):
-73 73 |         self.assertRegex("abc", r"def")  # Error
+67 |         self.assertIsInstance(1, str)  # Error
+68 | 
+69 |     def test_assert_is_not_instance(self):
+   -         self.assertNotIsInstance(1, int)  # Error
+70 +         assert not isinstance(1, int)  # Error
+71 | 
+72 |     def test_assert_regex(self):
+73 |         self.assertRegex("abc", r"def")  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertRegex`
   --> PT009.py:73:9
@@ -520,16 +500,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertRegex`
 75 |     def test_assert_not_regex(self):
    |
 help: Replace `assertRegex(...)` with `assert ...`
-
-ℹ Unsafe fix
-70 70 |         self.assertNotIsInstance(1, int)  # Error
-71 71 | 
-72 72 |     def test_assert_regex(self):
-73    |-        self.assertRegex("abc", r"def")  # Error
-   73 |+        assert re.search(r"def", "abc")  # Error
-74 74 | 
-75 75 |     def test_assert_not_regex(self):
-76 76 |         self.assertNotRegex("abc", r"abc")  # Error
+70 |         self.assertNotIsInstance(1, int)  # Error
+71 | 
+72 |     def test_assert_regex(self):
+   -         self.assertRegex("abc", r"def")  # Error
+73 +         assert re.search(r"def", "abc")  # Error
+74 | 
+75 |     def test_assert_not_regex(self):
+76 |         self.assertNotRegex("abc", r"abc")  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex`
   --> PT009.py:76:9
@@ -541,16 +520,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex`
 78 |     def test_assert_regexp_matches(self):
    |
 help: Replace `assertNotRegex(...)` with `assert ...`
-
-ℹ Unsafe fix
-73 73 |         self.assertRegex("abc", r"def")  # Error
-74 74 | 
-75 75 |     def test_assert_not_regex(self):
-76    |-        self.assertNotRegex("abc", r"abc")  # Error
-   76 |+        assert not re.search(r"abc", "abc")  # Error
-77 77 | 
-78 78 |     def test_assert_regexp_matches(self):
-79 79 |         self.assertRegexpMatches("abc", r"def")  # Error
+73 |         self.assertRegex("abc", r"def")  # Error
+74 | 
+75 |     def test_assert_not_regex(self):
+   -         self.assertNotRegex("abc", r"abc")  # Error
+76 +         assert not re.search(r"abc", "abc")  # Error
+77 | 
+78 |     def test_assert_regexp_matches(self):
+79 |         self.assertRegexpMatches("abc", r"def")  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertRegexpMatches`
   --> PT009.py:79:9
@@ -562,16 +540,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertRegexpMatches`
 81 |     def test_assert_not_regexp_matches(self):
    |
 help: Replace `assertRegexpMatches(...)` with `assert ...`
-
-ℹ Unsafe fix
-76 76 |         self.assertNotRegex("abc", r"abc")  # Error
-77 77 | 
-78 78 |     def test_assert_regexp_matches(self):
-79    |-        self.assertRegexpMatches("abc", r"def")  # Error
-   79 |+        assert re.search(r"def", "abc")  # Error
-80 80 | 
-81 81 |     def test_assert_not_regexp_matches(self):
-82 82 |         self.assertNotRegex("abc", r"abc")  # Error
+76 |         self.assertNotRegex("abc", r"abc")  # Error
+77 | 
+78 |     def test_assert_regexp_matches(self):
+   -         self.assertRegexpMatches("abc", r"def")  # Error
+79 +         assert re.search(r"def", "abc")  # Error
+80 | 
+81 |     def test_assert_not_regexp_matches(self):
+82 |         self.assertNotRegex("abc", r"abc")  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex`
   --> PT009.py:82:9
@@ -583,16 +560,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex`
 84 |     def test_fail_if(self):
    |
 help: Replace `assertNotRegex(...)` with `assert ...`
-
-ℹ Unsafe fix
-79 79 |         self.assertRegexpMatches("abc", r"def")  # Error
-80 80 | 
-81 81 |     def test_assert_not_regexp_matches(self):
-82    |-        self.assertNotRegex("abc", r"abc")  # Error
-   82 |+        assert not re.search(r"abc", "abc")  # Error
-83 83 | 
-84 84 |     def test_fail_if(self):
-85 85 |         self.failIf("abc")  # Error
+79 |         self.assertRegexpMatches("abc", r"def")  # Error
+80 | 
+81 |     def test_assert_not_regexp_matches(self):
+   -         self.assertNotRegex("abc", r"abc")  # Error
+82 +         assert not re.search(r"abc", "abc")  # Error
+83 | 
+84 |     def test_fail_if(self):
+85 |         self.failIf("abc")  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `failIf`
   --> PT009.py:85:9
@@ -604,16 +580,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failIf`
 87 |     def test_fail_unless(self):
    |
 help: Replace `failIf(...)` with `assert ...`
-
-ℹ Unsafe fix
-82 82 |         self.assertNotRegex("abc", r"abc")  # Error
-83 83 | 
-84 84 |     def test_fail_if(self):
-85    |-        self.failIf("abc")  # Error
-   85 |+        assert not "abc"  # Error
-86 86 | 
-87 87 |     def test_fail_unless(self):
-88 88 |         self.failUnless("abc")  # Error
+82 |         self.assertNotRegex("abc", r"abc")  # Error
+83 | 
+84 |     def test_fail_if(self):
+   -         self.failIf("abc")  # Error
+85 +         assert not "abc"  # Error
+86 | 
+87 |     def test_fail_unless(self):
+88 |         self.failUnless("abc")  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `failUnless`
   --> PT009.py:88:9
@@ -625,16 +600,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failUnless`
 90 |     def test_fail_unless_equal(self):
    |
 help: Replace `failUnless(...)` with `assert ...`
-
-ℹ Unsafe fix
-85 85 |         self.failIf("abc")  # Error
-86 86 | 
-87 87 |     def test_fail_unless(self):
-88    |-        self.failUnless("abc")  # Error
-   88 |+        assert "abc"  # Error
-89 89 | 
-90 90 |     def test_fail_unless_equal(self):
-91 91 |         self.failUnlessEqual(1, 2)  # Error
+85 |         self.failIf("abc")  # Error
+86 | 
+87 |     def test_fail_unless(self):
+   -         self.failUnless("abc")  # Error
+88 +         assert "abc"  # Error
+89 | 
+90 |     def test_fail_unless_equal(self):
+91 |         self.failUnlessEqual(1, 2)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `failUnlessEqual`
   --> PT009.py:91:9
@@ -646,16 +620,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failUnlessEqual`
 93 |     def test_fail_if_equal(self):
    |
 help: Replace `failUnlessEqual(...)` with `assert ...`
-
-ℹ Unsafe fix
-88 88 |         self.failUnless("abc")  # Error
-89 89 | 
-90 90 |     def test_fail_unless_equal(self):
-91    |-        self.failUnlessEqual(1, 2)  # Error
-   91 |+        assert 1 == 2  # Error
-92 92 | 
-93 93 |     def test_fail_if_equal(self):
-94 94 |         self.failIfEqual(1, 2)  # Error
+88 |         self.failUnless("abc")  # Error
+89 | 
+90 |     def test_fail_unless_equal(self):
+   -         self.failUnlessEqual(1, 2)  # Error
+91 +         assert 1 == 2  # Error
+92 | 
+93 |     def test_fail_if_equal(self):
+94 |         self.failIfEqual(1, 2)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `failIfEqual`
   --> PT009.py:94:9
@@ -665,16 +638,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failIfEqual`
    |         ^^^^^^^^^^^^^^^^
    |
 help: Replace `failIfEqual(...)` with `assert ...`
-
-ℹ Unsafe fix
-91 91 |         self.failUnlessEqual(1, 2)  # Error
-92 92 | 
-93 93 |     def test_fail_if_equal(self):
-94    |-        self.failIfEqual(1, 2)  # Error
-   94 |+        assert 1 != 2  # Error
-95 95 | 
-96 96 | 
-97 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
+91 |         self.failUnlessEqual(1, 2)  # Error
+92 | 
+93 |     def test_fail_if_equal(self):
+   -         self.failIfEqual(1, 2)  # Error
+94 +         assert 1 != 2  # Error
+95 | 
+96 | 
+97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
+note: This is an unsafe fix and may change runtime behavior
 
 PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
    --> PT009.py:98:2
@@ -686,12 +658,11 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
 100 |         self.model.piAx_piAy_beta[r][x][y])))
     |
 help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Unsafe fix
-95 95 | 
-96 96 | 
-97 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
-98    |-(self.assertTrue(
-99    |-    "piAx_piAy_beta[r][x][y] = {17}".format(
-100    |-        self.model.piAx_piAy_beta[r][x][y])))
-   98 |+assert "piAx_piAy_beta[r][x][y] = {17}".format(self.model.piAx_piAy_beta[r][x][y])
+95 | 
+96 | 
+97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
+   - (self.assertTrue(
+   -     "piAx_piAy_beta[r][x][y] = {17}".format(
+   -         self.model.piAx_piAy_beta[r][x][y])))
+98 + assert "piAx_piAy_beta[r][x][y] = {17}".format(self.model.piAx_piAy_beta[r][x][y])
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap
index 9b185de803..8d1ca47175 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap
@@ -10,16 +10,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 6 |     ...
   |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-1 1 | import pytest
-2 2 | 
-3 3 | 
-4   |-@pytest.mark.parametrize("x", [1, 1, 2])
-  4 |+@pytest.mark.parametrize("x", [1, 2])
-5 5 | def test_error_literal(x):
-6 6 |     ...
-7 7 | 
+1 | import pytest
+2 | 
+3 | 
+  - @pytest.mark.parametrize("x", [1, 1, 2])
+4 + @pytest.mark.parametrize("x", [1, 2])
+5 | def test_error_literal(x):
+6 |     ...
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
   --> PT014.py:14:35
@@ -30,16 +29,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 16 |     ...
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-11 11 | c = 3
-12 12 | 
-13 13 | 
-14    |-@pytest.mark.parametrize("x", [a, a, b, b, b, c])
-   14 |+@pytest.mark.parametrize("x", [a, b, b, b, c])
-15 15 | def test_error_expr_simple(x):
-16 16 |     ...
-17 17 | 
+11 | c = 3
+12 | 
+13 | 
+   - @pytest.mark.parametrize("x", [a, a, b, b, b, c])
+14 + @pytest.mark.parametrize("x", [a, b, b, b, c])
+15 | def test_error_expr_simple(x):
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize`
   --> PT014.py:14:41
@@ -50,16 +48,15 @@ PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize`
 16 |     ...
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-11 11 | c = 3
-12 12 | 
-13 13 | 
-14    |-@pytest.mark.parametrize("x", [a, a, b, b, b, c])
-   14 |+@pytest.mark.parametrize("x", [a, a, b, b, c])
-15 15 | def test_error_expr_simple(x):
-16 16 |     ...
-17 17 | 
+11 | c = 3
+12 | 
+13 | 
+   - @pytest.mark.parametrize("x", [a, a, b, b, b, c])
+14 + @pytest.mark.parametrize("x", [a, a, b, b, c])
+15 | def test_error_expr_simple(x):
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize`
   --> PT014.py:14:44
@@ -70,16 +67,15 @@ PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize`
 16 |     ...
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-11 11 | c = 3
-12 12 | 
-13 13 | 
-14    |-@pytest.mark.parametrize("x", [a, a, b, b, b, c])
-   14 |+@pytest.mark.parametrize("x", [a, a, b, b, c])
-15 15 | def test_error_expr_simple(x):
-16 16 |     ...
-17 17 | 
+11 | c = 3
+12 | 
+13 | 
+   - @pytest.mark.parametrize("x", [a, a, b, b, b, c])
+14 + @pytest.mark.parametrize("x", [a, a, b, b, c])
+15 | def test_error_expr_simple(x):
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 Duplicate of test case at index 0 in `pytest.mark.parametrize`
   --> PT014.py:24:9
@@ -102,16 +98,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 34 |     ...
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-29 29 |     ...
-30 30 | 
-31 31 | 
-32    |-@pytest.mark.parametrize("x", [a, b, (a), c, ((a))])
-   32 |+@pytest.mark.parametrize("x", [a, b, c, ((a))])
-33 33 | def test_error_parentheses(x):
-34 34 |     ...
-35 35 | 
+29 |     ...
+30 | 
+31 | 
+   - @pytest.mark.parametrize("x", [a, b, (a), c, ((a))])
+32 + @pytest.mark.parametrize("x", [a, b, c, ((a))])
+33 | def test_error_parentheses(x):
+34 |     ...
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
   --> PT014.py:32:48
@@ -122,16 +117,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 34 |     ...
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-29 29 |     ...
-30 30 | 
-31 31 | 
-32    |-@pytest.mark.parametrize("x", [a, b, (a), c, ((a))])
-   32 |+@pytest.mark.parametrize("x", [a, b, (a), c])
-33 33 | def test_error_parentheses(x):
-34 34 |     ...
-35 35 | 
+29 |     ...
+30 | 
+31 | 
+   - @pytest.mark.parametrize("x", [a, b, (a), c, ((a))])
+32 + @pytest.mark.parametrize("x", [a, b, (a), c])
+33 | def test_error_parentheses(x):
+34 |     ...
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
   --> PT014.py:42:10
@@ -144,15 +138,14 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 44 |         ((a)),
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-39 39 |     [
-40 40 |         a,
-41 41 |         b,
-42    |-        (a),
-43 42 |         c,
-44 43 |         ((a)),
-45 44 |     ],
+39 |     [
+40 |         a,
+41 |         b,
+   -         (a),
+42 |         c,
+43 |         ((a)),
+44 |     ],
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
   --> PT014.py:44:11
@@ -165,15 +158,14 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 46 | )
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-41 41 |         b,
-42 42 |         (a),
-43 43 |         c,
-44    |-        ((a)),
-45 44 |     ],
-46 45 | )
-47 46 | def test_error_parentheses_trailing_comma(x):
+41 |         b,
+42 |         (a),
+43 |         c,
+   -         ((a)),
+44 |     ],
+45 | )
+46 | def test_error_parentheses_trailing_comma(x):
+note: This is an unsafe fix and may change runtime behavior
 
 PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
   --> PT014.py:56:53
@@ -184,12 +176,11 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize`
 58 |     ...
    |
 help: Remove duplicate test case
-
-ℹ Unsafe fix
-53 53 |     ...
-54 54 | 
-55 55 | 
-56    |-@pytest.mark.parametrize('data, spec', [(1.0, 1.0), (1.0, 1.0)])
-   56 |+@pytest.mark.parametrize('data, spec', [(1.0, 1.0)])
-57 57 | def test_numbers(data, spec):
-58 58 |     ...
+53 |     ...
+54 | 
+55 | 
+   - @pytest.mark.parametrize('data, spec', [(1.0, 1.0), (1.0, 1.0)])
+56 + @pytest.mark.parametrize('data, spec', [(1.0, 1.0)])
+57 | def test_numbers(data, spec):
+58 |     ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT015.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT015.snap
index 88a035bada..51ddc586d5 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT015.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT015.snap
@@ -182,4 +182,6 @@ PT015 Assertion always fails, replace with `pytest.fail()`
 24 |     assert set(set())
 25 |     assert tuple("")
    |     ^^^^^^^^^^^^^^^^
+26 |
+27 | # https://github.com/astral-sh/ruff/issues/19935
    |
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap
index 5cc41f4ecd..6f1f36fe00 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap
@@ -11,17 +11,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 16 |     assert something and not something_else
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | 
-13 13 | def test_error():
-14    |-    assert something and something_else
-   14 |+    assert something
-   15 |+    assert something_else
-15 16 |     assert something and something_else and something_third
-16 17 |     assert something and not something_else
-17 18 |     assert something and (something_else or something_third)
+11 | 
+12 | 
+13 | def test_error():
+   -     assert something and something_else
+14 +     assert something
+15 +     assert something_else
+16 |     assert something and something_else and something_third
+17 |     assert something and not something_else
+18 |     assert something and (something_else or something_third)
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:15:5
@@ -34,17 +33,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 17 |     assert something and (something_else or something_third)
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | def test_error():
-14 14 |     assert something and something_else
-15    |-    assert something and something_else and something_third
-   15 |+    assert something and something_else
-   16 |+    assert something_third
-16 17 |     assert something and not something_else
-17 18 |     assert something and (something_else or something_third)
-18 19 |     assert not something and something_else
+12 | 
+13 | def test_error():
+14 |     assert something and something_else
+   -     assert something and something_else and something_third
+15 +     assert something and something_else
+16 +     assert something_third
+17 |     assert something and not something_else
+18 |     assert something and (something_else or something_third)
+19 |     assert not something and something_else
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:16:5
@@ -57,17 +55,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 18 |     assert not something and something_else
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-13 13 | def test_error():
-14 14 |     assert something and something_else
-15 15 |     assert something and something_else and something_third
-16    |-    assert something and not something_else
-   16 |+    assert something
-   17 |+    assert not something_else
-17 18 |     assert something and (something_else or something_third)
-18 19 |     assert not something and something_else
-19 20 |     assert not (something or something_else)
+13 | def test_error():
+14 |     assert something and something_else
+15 |     assert something and something_else and something_third
+   -     assert something and not something_else
+16 +     assert something
+17 +     assert not something_else
+18 |     assert something and (something_else or something_third)
+19 |     assert not something and something_else
+20 |     assert not (something or something_else)
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:17:5
@@ -80,17 +77,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 19 |     assert not (something or something_else)
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-14 14 |     assert something and something_else
-15 15 |     assert something and something_else and something_third
-16 16 |     assert something and not something_else
-17    |-    assert something and (something_else or something_third)
-   17 |+    assert something
-   18 |+    assert (something_else or something_third)
-18 19 |     assert not something and something_else
-19 20 |     assert not (something or something_else)
-20 21 |     assert not (something or something_else or something_third)
+14 |     assert something and something_else
+15 |     assert something and something_else and something_third
+16 |     assert something and not something_else
+   -     assert something and (something_else or something_third)
+17 +     assert something
+18 +     assert (something_else or something_third)
+19 |     assert not something and something_else
+20 |     assert not (something or something_else)
+21 |     assert not (something or something_else or something_third)
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:18:5
@@ -103,17 +99,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 20 |     assert not (something or something_else or something_third)
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-15 15 |     assert something and something_else and something_third
-16 16 |     assert something and not something_else
-17 17 |     assert something and (something_else or something_third)
-18    |-    assert not something and something_else
-   18 |+    assert not something
-   19 |+    assert something_else
-19 20 |     assert not (something or something_else)
-20 21 |     assert not (something or something_else or something_third)
-21 22 |     assert something and something_else == """error
+15 |     assert something and something_else and something_third
+16 |     assert something and not something_else
+17 |     assert something and (something_else or something_third)
+   -     assert not something and something_else
+18 +     assert not something
+19 +     assert something_else
+20 |     assert not (something or something_else)
+21 |     assert not (something or something_else or something_third)
+22 |     assert something and something_else == """error
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:19:5
@@ -126,17 +121,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 21 |     assert something and something_else == """error
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-16 16 |     assert something and not something_else
-17 17 |     assert something and (something_else or something_third)
-18 18 |     assert not something and something_else
-19    |-    assert not (something or something_else)
-   19 |+    assert not something
-   20 |+    assert not something_else
-20 21 |     assert not (something or something_else or something_third)
-21 22 |     assert something and something_else == """error
-22 23 |     message
+16 |     assert something and not something_else
+17 |     assert something and (something_else or something_third)
+18 |     assert not something and something_else
+   -     assert not (something or something_else)
+19 +     assert not something
+20 +     assert not something_else
+21 |     assert not (something or something_else or something_third)
+22 |     assert something and something_else == """error
+23 |     message
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:20:5
@@ -149,17 +143,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 22 |     message
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-17 17 |     assert something and (something_else or something_third)
-18 18 |     assert not something and something_else
-19 19 |     assert not (something or something_else)
-20    |-    assert not (something or something_else or something_third)
-   20 |+    assert not (something or something_else)
-   21 |+    assert not something_third
-21 22 |     assert something and something_else == """error
-22 23 |     message
-23 24 |     """
+17 |     assert something and (something_else or something_third)
+18 |     assert not something and something_else
+19 |     assert not (something or something_else)
+   -     assert not (something or something_else or something_third)
+20 +     assert not (something or something_else)
+21 +     assert not something_third
+22 |     assert something and something_else == """error
+23 |     message
+24 |     """
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:21:5
@@ -174,17 +167,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 25 |           something
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-18 18 |     assert not something and something_else
-19 19 |     assert not (something or something_else)
-20 20 |     assert not (something or something_else or something_third)
-21    |-    assert something and something_else == """error
-   21 |+    assert something
-   22 |+    assert something_else == """error
-22 23 |     message
-23 24 |     """
-24 25 |     assert (
+18 |     assert not something and something_else
+19 |     assert not (something or something_else)
+20 |     assert not (something or something_else or something_third)
+   -     assert something and something_else == """error
+21 +     assert something
+22 +     assert something_else == """error
+23 |     message
+24 |     """
+25 |     assert (
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:24:5
@@ -203,19 +195,18 @@ PT018 [*] Assertion should be broken down into multiple parts
 32 |       # recursive case
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-21 21 |     assert something and something_else == """error
-22 22 |     message
-23 23 |     """
-   24 |+    assert something
-24 25 |     assert (
-25    |-        something
-26    |-        and something_else
-   26 |+        something_else
-27 27 |         == """error
-28 28 | message
-29 29 | """
+21 |     assert something and something_else == """error
+22 |     message
+23 |     """
+24 +     assert something
+25 |     assert (
+   -         something
+   -         and something_else
+26 +         something_else
+27 |         == """error
+28 | message
+29 | """
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:33:5
@@ -226,17 +217,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 34 |     assert not (a or not (b and c))
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-30 30 |     )
-31 31 | 
-32 32 |     # recursive case
-33    |-    assert not (a or not (b or c))
-   33 |+    assert not a
-   34 |+    assert (b or c)
-34 35 |     assert not (a or not (b and c))
-35 36 | 
-36 37 |     # detected, but no fix for messages
+30 |     )
+31 | 
+32 |     # recursive case
+   -     assert not (a or not (b or c))
+33 +     assert not a
+34 +     assert (b or c)
+35 |     assert not (a or not (b and c))
+36 | 
+37 |     # detected, but no fix for messages
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:34:5
@@ -249,17 +239,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 36 |     # detected, but no fix for messages
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-31 31 | 
-32 32 |     # recursive case
-33 33 |     assert not (a or not (b or c))
-34    |-    assert not (a or not (b and c))
-   34 |+    assert not a
-   35 |+    assert (b and c)
-35 36 | 
-36 37 |     # detected, but no fix for messages
-37 38 |     assert something and something_else, "error message"
+31 | 
+32 |     # recursive case
+33 |     assert not (a or not (b or c))
+   -     assert not (a or not (b and c))
+34 +     assert not a
+35 +     assert (b and c)
+36 | 
+37 |     # detected, but no fix for messages
+38 |     assert something and something_else, "error message"
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 Assertion should be broken down into multiple parts
   --> PT018.py:37:5
@@ -303,17 +292,16 @@ PT018 [*] Assertion should be broken down into multiple parts
 45 | assert something and something_else and something_third  # Error
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | 
-43 43 | assert something  # OK
-44    |-assert something and something_else  # Error
-   44 |+assert something
-   45 |+assert something_else
-45 46 | assert something and something_else and something_third  # Error
-46 47 | 
-47 48 | 
+41 | 
+42 | 
+43 | assert something  # OK
+   - assert something and something_else  # Error
+44 + assert something
+45 + assert something_else
+46 | assert something and something_else and something_third  # Error
+47 | 
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:45:1
@@ -324,17 +312,16 @@ PT018 [*] Assertion should be broken down into multiple parts
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | assert something  # OK
-44 44 | assert something and something_else  # Error
-45    |-assert something and something_else and something_third  # Error
-   45 |+assert something and something_else
-   46 |+assert something_third
-46 47 | 
-47 48 | 
-48 49 | def test_multiline():
+42 | 
+43 | assert something  # OK
+44 | assert something and something_else  # Error
+   - assert something and something_else and something_third  # Error
+45 + assert something and something_else
+46 + assert something_third
+47 | 
+48 | 
+49 | def test_multiline():
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 Assertion should be broken down into multiple parts
   --> PT018.py:49:5
@@ -383,19 +370,18 @@ PT018 [*] Assertion should be broken down into multiple parts
 65 |       assert (not (
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-59 59 |     assert not (
-60 60 |         self.find_graph_output(node.output[0])
-61 61 |         or self.find_graph_input(node.input[0])
-62    |-        or self.find_graph_output(node.input[0])
-63 62 |     )
-   63 |+    assert not (
-   64 |+        self.find_graph_output(node.input[0])
-   65 |+    )
-64 66 | 
-65 67 |     assert (not (
-66 68 |         self.find_graph_output(node.output[0])
+59 |     assert not (
+60 |         self.find_graph_output(node.output[0])
+61 |         or self.find_graph_input(node.input[0])
+   -         or self.find_graph_output(node.input[0])
+62 |     )
+63 +     assert not (
+64 +         self.find_graph_output(node.input[0])
+65 +     )
+66 | 
+67 |     assert (not (
+68 |         self.find_graph_output(node.output[0])
+note: This is an unsafe fix and may change runtime behavior
 
 PT018 [*] Assertion should be broken down into multiple parts
   --> PT018.py:65:5
@@ -412,21 +398,20 @@ PT018 [*] Assertion should be broken down into multiple parts
 71 |       assert (not self.find_graph_output(node.output[0]) or
    |
 help: Break down assertion into multiple parts
-
-ℹ Unsafe fix
-62 62 |         or self.find_graph_output(node.input[0])
-63 63 |     )
-64 64 | 
-65    |-    assert (not (
-   65 |+    assert not (
-66 66 |         self.find_graph_output(node.output[0])
-67 67 |         or self.find_graph_input(node.input[0])
-68    |-        or self.find_graph_output(node.input[0])
-69    |-    ))
-   68 |+    )
-   69 |+    assert not (
-   70 |+        self.find_graph_output(node.input[0])
-   71 |+    )
-70 72 | 
-71 73 |     assert (not self.find_graph_output(node.output[0]) or
-72 74 |             self.find_graph_input(node.input[0]))
+62 |         or self.find_graph_output(node.input[0])
+63 |     )
+64 | 
+   -     assert (not (
+65 +     assert not (
+66 |         self.find_graph_output(node.output[0])
+67 |         or self.find_graph_input(node.input[0])
+   -         or self.find_graph_output(node.input[0])
+   -     ))
+68 +     )
+69 +     assert not (
+70 +         self.find_graph_output(node.input[0])
+71 +     )
+72 | 
+73 |     assert (not self.find_graph_output(node.output[0]) or
+74 |             self.find_graph_input(node.input[0]))
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap
index 9fd4aa5ea5..5357296de9 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap
@@ -10,16 +10,14 @@ PT022 [*] No teardown in fixture `error`, use `return` instead of `yield`
    |     ^^^^^^^^^^^^^^
    |
 help: Replace `yield` with `return`
-
-ℹ Safe fix
-14 14 | @pytest.fixture()
-15 15 | def error():
-16 16 |     resource = acquire_resource()
-17    |-    yield resource
-   17 |+    return resource
-18 18 | 
-19 19 | 
-20 20 | import typing
+14 | @pytest.fixture()
+15 | def error():
+16 |     resource = acquire_resource()
+   -     yield resource
+17 +     return resource
+18 | 
+19 | 
+20 | import typing
 
 PT022 [*] No teardown in fixture `error`, use `return` instead of `yield`
   --> PT022.py:37:5
@@ -30,19 +28,17 @@ PT022 [*] No teardown in fixture `error`, use `return` instead of `yield`
    |     ^^^^^^^^^^^^^^
    |
 help: Replace `yield` with `return`
-
-ℹ Safe fix
-32 32 | 
-33 33 | 
-34 34 | @pytest.fixture()
-35    |-def error() -> typing.Generator[typing.Any, None, None]:
-   35 |+def error() -> typing.Any:
-36 36 |     resource = acquire_resource()
-37    |-    yield resource
-   37 |+    return resource
-38 38 | 
-39 39 | 
-40 40 | @pytest.fixture()
+32 | 
+33 | 
+34 | @pytest.fixture()
+   - def error() -> typing.Generator[typing.Any, None, None]:
+35 + def error() -> typing.Any:
+36 |     resource = acquire_resource()
+   -     yield resource
+37 +     return resource
+38 | 
+39 | 
+40 | @pytest.fixture()
 
 PT022 [*] No teardown in fixture `error`, use `return` instead of `yield`
   --> PT022.py:43:5
@@ -53,13 +49,11 @@ PT022 [*] No teardown in fixture `error`, use `return` instead of `yield`
    |     ^^^^^^^^^^^^^^
    |
 help: Replace `yield` with `return`
-
-ℹ Safe fix
-38 38 | 
-39 39 | 
-40 40 | @pytest.fixture()
-41    |-def error() -> Generator[Resource, None, None]:
-   41 |+def error() -> Resource:
-42 42 |     resource = acquire_resource()
-43    |-    yield resource
-   43 |+    return resource
+38 | 
+39 | 
+40 | @pytest.fixture()
+   - def error() -> Generator[Resource, None, None]:
+41 + def error() -> Resource:
+42 |     resource = acquire_resource()
+   -     yield resource
+43 +     return resource
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap
index da2feb3179..b51af3ecc7 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap
@@ -10,16 +10,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 53 |     pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-48 48 | # With parentheses
-49 49 | 
-50 50 | 
-51    |-@pytest.mark.foo()
-   51 |+@pytest.mark.foo
-52 52 | def test_something():
-53 53 |     pass
-54 54 | 
+48 | # With parentheses
+49 | 
+50 | 
+   - @pytest.mark.foo()
+51 + @pytest.mark.foo
+52 | def test_something():
+53 |     pass
+54 | 
 
 PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
   --> PT023.py:56:1
@@ -30,16 +28,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 58 |     def test_something():
    |
 help: Remove parentheses
-
-ℹ Safe fix
-53 53 |     pass
-54 54 | 
-55 55 | 
-56    |-@pytest.mark.foo()
-   56 |+@pytest.mark.foo
-57 57 | class TestClass:
-58 58 |     def test_something():
-59 59 |         pass
+53 |     pass
+54 | 
+55 | 
+   - @pytest.mark.foo()
+56 + @pytest.mark.foo
+57 | class TestClass:
+58 |     def test_something():
+59 |         pass
 
 PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
   --> PT023.py:63:5
@@ -51,16 +47,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 65 |         pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-60 60 | 
-61 61 | 
-62 62 | class TestClass:
-63    |-    @pytest.mark.foo()
-   63 |+    @pytest.mark.foo
-64 64 |     def test_something():
-65 65 |         pass
-66 66 | 
+60 | 
+61 | 
+62 | class TestClass:
+   -     @pytest.mark.foo()
+63 +     @pytest.mark.foo
+64 |     def test_something():
+65 |         pass
+66 | 
 
 PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
   --> PT023.py:69:5
@@ -72,16 +66,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 71 |         def test_something():
    |
 help: Remove parentheses
-
-ℹ Safe fix
-66 66 | 
-67 67 | 
-68 68 | class TestClass:
-69    |-    @pytest.mark.foo()
-   69 |+    @pytest.mark.foo
-70 70 |     class TestNestedClass:
-71 71 |         def test_something():
-72 72 |             pass
+66 | 
+67 | 
+68 | class TestClass:
+   -     @pytest.mark.foo()
+69 +     @pytest.mark.foo
+70 |     class TestNestedClass:
+71 |         def test_something():
+72 |             pass
 
 PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
   --> PT023.py:77:9
@@ -94,16 +86,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 79 |             pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-74 74 | 
-75 75 | class TestClass:
-76 76 |     class TestNestedClass:
-77    |-        @pytest.mark.foo()
-   77 |+        @pytest.mark.foo
-78 78 |         def test_something():
-79 79 |             pass
-80 80 | 
+74 | 
+75 | class TestClass:
+76 |     class TestNestedClass:
+   -         @pytest.mark.foo()
+77 +         @pytest.mark.foo
+78 |         def test_something():
+79 |             pass
+80 | 
 
 PT023 [*] Use `@pytest.mark.parametrize` over `@pytest.mark.parametrize()`
   --> PT023.py:82:1
@@ -121,23 +111,22 @@ PT023 [*] Use `@pytest.mark.parametrize` over `@pytest.mark.parametrize()`
 90 |   def test_bar(param1, param2): ...
    |
 help: Remove parentheses
-
-ℹ Unsafe fix
-79 79 |             pass
-80 80 | 
-81 81 | # https://github.com/astral-sh/ruff/issues/18770
-82    |-@pytest.mark.parametrize(
-83    |-    # TODO: fix later
-84    |-    # ("param1", "param2"),
-85    |-    # (
-86    |-    #     (1, 2),
-87    |-    #     (3, 4),
-88    |-    # ),
-89    |-)
-   82 |+@pytest.mark.parametrize
-90 83 | def test_bar(param1, param2): ...
-91 84 | 
-92 85 | 
+79 |             pass
+80 | 
+81 | # https://github.com/astral-sh/ruff/issues/18770
+   - @pytest.mark.parametrize(
+   -     # TODO: fix later
+   -     # ("param1", "param2"),
+   -     # (
+   -     #     (1, 2),
+   -     #     (3, 4),
+   -     # ),
+   - )
+82 + @pytest.mark.parametrize
+83 | def test_bar(param1, param2): ...
+84 | 
+85 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
   --> PT023.py:93:1
@@ -148,16 +137,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 95 |     pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-90 90 | def test_bar(param1, param2): ...
-91 91 | 
-92 92 | 
-93    |-@(pytest.mark.foo())
-   93 |+@(pytest.mark.foo)
-94 94 | def test_outer_paren_mark_function():
-95 95 |     pass
-96 96 | 
+90 | def test_bar(param1, param2): ...
+91 | 
+92 | 
+   - @(pytest.mark.foo())
+93 + @(pytest.mark.foo)
+94 | def test_outer_paren_mark_function():
+95 |     pass
+96 | 
 
 PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
    --> PT023.py:99:5
@@ -169,12 +156,10 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
 101 |         pass
     |
 help: Remove parentheses
-
-ℹ Safe fix
-96  96  | 
-97  97  | 
-98  98  | class TestClass:
-99      |-    @(pytest.mark.foo())
-    99  |+    @(pytest.mark.foo)
-100 100 |     def test_method_outer_paren():
-101 101 |         pass
+96  | 
+97  | 
+98  | class TestClass:
+    -     @(pytest.mark.foo())
+99  +     @(pytest.mark.foo)
+100 |     def test_method_outer_paren():
+101 |         pass
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap
index ea28de9fa3..0aa1e719af 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap
@@ -10,16 +10,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
 19 |     pass
    |
 help: Add parentheses
-
-ℹ Safe fix
-14 14 | # Without parentheses
-15 15 | 
-16 16 | 
-17    |-@pytest.mark.foo
-   17 |+@pytest.mark.foo()
-18 18 | def test_something():
-19 19 |     pass
-20 20 | 
+14 | # Without parentheses
+15 | 
+16 | 
+   - @pytest.mark.foo
+17 + @pytest.mark.foo()
+18 | def test_something():
+19 |     pass
+20 | 
 
 PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
   --> PT023.py:22:1
@@ -30,16 +28,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
 24 |     def test_something():
    |
 help: Add parentheses
-
-ℹ Safe fix
-19 19 |     pass
-20 20 | 
-21 21 | 
-22    |-@pytest.mark.foo
-   22 |+@pytest.mark.foo()
-23 23 | class TestClass:
-24 24 |     def test_something():
-25 25 |         pass
+19 |     pass
+20 | 
+21 | 
+   - @pytest.mark.foo
+22 + @pytest.mark.foo()
+23 | class TestClass:
+24 |     def test_something():
+25 |         pass
 
 PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
   --> PT023.py:29:5
@@ -51,16 +47,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
 31 |         pass
    |
 help: Add parentheses
-
-ℹ Safe fix
-26 26 | 
-27 27 | 
-28 28 | class TestClass:
-29    |-    @pytest.mark.foo
-   29 |+    @pytest.mark.foo()
-30 30 |     def test_something():
-31 31 |         pass
-32 32 | 
+26 | 
+27 | 
+28 | class TestClass:
+   -     @pytest.mark.foo
+29 +     @pytest.mark.foo()
+30 |     def test_something():
+31 |         pass
+32 | 
 
 PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
   --> PT023.py:35:5
@@ -72,16 +66,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
 37 |         def test_something():
    |
 help: Add parentheses
-
-ℹ Safe fix
-32 32 | 
-33 33 | 
-34 34 | class TestClass:
-35    |-    @pytest.mark.foo
-   35 |+    @pytest.mark.foo()
-36 36 |     class TestNestedClass:
-37 37 |         def test_something():
-38 38 |             pass
+32 | 
+33 | 
+34 | class TestClass:
+   -     @pytest.mark.foo
+35 +     @pytest.mark.foo()
+36 |     class TestNestedClass:
+37 |         def test_something():
+38 |             pass
 
 PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
   --> PT023.py:43:9
@@ -94,13 +86,11 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
 45 |             pass
    |
 help: Add parentheses
-
-ℹ Safe fix
-40 40 | 
-41 41 | class TestClass:
-42 42 |     class TestNestedClass:
-43    |-        @pytest.mark.foo
-   43 |+        @pytest.mark.foo()
-44 44 |         def test_something():
-45 45 |             pass
-46 46 |
+40 | 
+41 | class TestClass:
+42 |     class TestNestedClass:
+   -         @pytest.mark.foo
+43 +         @pytest.mark.foo()
+44 |         def test_something():
+45 |             pass
+46 |
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap
index fa977bf675..d031f59879 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap
@@ -10,15 +10,13 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
 16 | async def my_fixture():  # Error before
    |
 help: Remove `pytest.mark.asyncio`
-
-ℹ Safe fix
-11 11 |     pass
-12 12 | 
-13 13 | 
-14    |-@pytest.mark.asyncio()
-15 14 | @pytest.fixture()
-16 15 | async def my_fixture():  # Error before
-17 16 |     return 0
+11 |     pass
+12 | 
+13 | 
+   - @pytest.mark.asyncio()
+14 | @pytest.fixture()
+15 | async def my_fixture():  # Error before
+16 |     return 0
 
 PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
   --> PT024.py:20:1
@@ -29,15 +27,13 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
 22 | async def my_fixture():  # Error before no parens
    |
 help: Remove `pytest.mark.asyncio`
-
-ℹ Safe fix
-17 17 |     return 0
-18 18 | 
-19 19 | 
-20    |-@pytest.mark.asyncio
-21 20 | @pytest.fixture()
-22 21 | async def my_fixture():  # Error before no parens
-23 22 |     return 0
+17 |     return 0
+18 | 
+19 | 
+   - @pytest.mark.asyncio
+20 | @pytest.fixture()
+21 | async def my_fixture():  # Error before no parens
+22 |     return 0
 
 PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
   --> PT024.py:27:1
@@ -49,15 +45,13 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
 29 |     return 0
    |
 help: Remove `pytest.mark.asyncio`
-
-ℹ Safe fix
-24 24 | 
-25 25 | 
-26 26 | @pytest.fixture()
-27    |-@pytest.mark.asyncio()
-28 27 | async def my_fixture():  # Error after
-29 28 |     return 0
-30 29 | 
+24 | 
+25 | 
+26 | @pytest.fixture()
+   - @pytest.mark.asyncio()
+27 | async def my_fixture():  # Error after
+28 |     return 0
+29 | 
 
 PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
   --> PT024.py:33:1
@@ -69,11 +63,9 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures
 35 |     return 0
    |
 help: Remove `pytest.mark.asyncio`
-
-ℹ Safe fix
-30 30 | 
-31 31 | 
-32 32 | @pytest.fixture()
-33    |-@pytest.mark.asyncio
-34 33 | async def my_fixture():  # Error after no parens
-35 34 |     return 0
+30 | 
+31 | 
+32 | @pytest.fixture()
+   - @pytest.mark.asyncio
+33 | async def my_fixture():  # Error after no parens
+34 |     return 0
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap
index f7b1fcc698..7cf1605386 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap
@@ -10,15 +10,13 @@ PT025 [*] `pytest.mark.usefixtures` has no effect on fixtures
 11 | def my_fixture():  # Error before
    |
 help: Remove `pytest.mark.usefixtures`
-
-ℹ Safe fix
-6  6  |     pass
-7  7  | 
-8  8  | 
-9     |-@pytest.mark.usefixtures("a")
-10 9  | @pytest.fixture()
-11 10 | def my_fixture():  # Error before
-12 11 |     return 0
+6  |     pass
+7  | 
+8  | 
+   - @pytest.mark.usefixtures("a")
+9  | @pytest.fixture()
+10 | def my_fixture():  # Error before
+11 |     return 0
 
 PT025 [*] `pytest.mark.usefixtures` has no effect on fixtures
   --> PT025.py:16:1
@@ -30,11 +28,9 @@ PT025 [*] `pytest.mark.usefixtures` has no effect on fixtures
 18 |     return 0
    |
 help: Remove `pytest.mark.usefixtures`
-
-ℹ Safe fix
-13 13 | 
-14 14 | 
-15 15 | @pytest.fixture()
-16    |-@pytest.mark.usefixtures("a")
-17 16 | def my_fixture():  # Error after
-18 17 |     return 0
+13 | 
+14 | 
+15 | @pytest.fixture()
+   - @pytest.mark.usefixtures("a")
+16 | def my_fixture():  # Error after
+17 |     return 0
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap
index 7ecf7d42de..58441fefe2 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap
@@ -10,16 +10,15 @@ PT026 [*] Useless `pytest.mark.usefixtures` without parameters
 21 |     pass
    |
 help: Remove `usefixtures` decorator or pass parameters
-
-ℹ Unsafe fix
-16 16 |     pass
-17 17 | 
-18 18 | 
-19    |-@pytest.mark.usefixtures()
-   19 |+
-20 20 | def test_error_with_parens():
-21 21 |     pass
-22 22 | 
+16 |     pass
+17 | 
+18 | 
+   - @pytest.mark.usefixtures()
+19 + 
+20 | def test_error_with_parens():
+21 |     pass
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PT026 [*] Useless `pytest.mark.usefixtures` without parameters
   --> PT026.py:24:1
@@ -30,12 +29,11 @@ PT026 [*] Useless `pytest.mark.usefixtures` without parameters
 26 |     pass
    |
 help: Remove `usefixtures` decorator or pass parameters
-
-ℹ Unsafe fix
-21 21 |     pass
-22 22 | 
-23 23 | 
-24    |-@pytest.mark.usefixtures
-   24 |+
-25 25 | def test_error_no_parens():
-26 26 |     pass
+21 |     pass
+22 | 
+23 | 
+   - @pytest.mark.usefixtures
+24 + 
+25 | def test_error_no_parens():
+26 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap
index 616ea019da..0cdcfb9fb9 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap
@@ -12,19 +12,18 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 8 |         with self.assertRaises(expected_exception=ValueError):
   |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-1 1 | import unittest
-  2 |+import pytest
-2 3 | 
-3 4 | 
-4 5 | class Test(unittest.TestCase):
-5 6 |     def test_errors(self):
-6   |-        with self.assertRaises(ValueError):
-  7 |+        with pytest.raises(ValueError):
-7 8 |             raise ValueError
-8 9 |         with self.assertRaises(expected_exception=ValueError):
-9 10 |             raise ValueError
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
+6  |     def test_errors(self):
+   -         with self.assertRaises(ValueError):
+7  +         with pytest.raises(ValueError):
+8  |             raise ValueError
+9  |         with self.assertRaises(expected_exception=ValueError):
+10 |             raise ValueError
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
  --> PT027_0.py:8:14
@@ -36,21 +35,20 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 9 |             raise ValueError
   |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
-5  6  |     def test_errors(self):
-6  7  |         with self.assertRaises(ValueError):
-7  8  |             raise ValueError
-8     |-        with self.assertRaises(expected_exception=ValueError):
-   9  |+        with pytest.raises(ValueError):
-9  10 |             raise ValueError
-10 11 | 
-11 12 |         with self.failUnlessRaises(ValueError):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
+6  |     def test_errors(self):
+7  |         with self.assertRaises(ValueError):
+8  |             raise ValueError
+   -         with self.assertRaises(expected_exception=ValueError):
+9  +         with pytest.raises(ValueError):
+10 |             raise ValueError
+11 | 
+12 |         with self.failUnlessRaises(ValueError):
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `failUnlessRaises`
   --> PT027_0.py:11:14
@@ -62,22 +60,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `failUnlessRaises`
 12 |             raise ValueError
    |
 help: Replace `failUnlessRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
 --------------------------------------------------------------------------------
-8  9  |         with self.assertRaises(expected_exception=ValueError):
-9  10 |             raise ValueError
-10 11 | 
-11    |-        with self.failUnlessRaises(ValueError):
-   12 |+        with pytest.raises(ValueError):
-12 13 |             raise ValueError
-13 14 | 
-14 15 |         with self.assertRaisesRegex(ValueError, "test"):
+9  |         with self.assertRaises(expected_exception=ValueError):
+10 |             raise ValueError
+11 | 
+   -         with self.failUnlessRaises(ValueError):
+12 +         with pytest.raises(ValueError):
+13 |             raise ValueError
+14 | 
+15 |         with self.assertRaisesRegex(ValueError, "test"):
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
   --> PT027_0.py:14:14
@@ -89,22 +86,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
 15 |             raise ValueError("test")
    |
 help: Replace `assertRaisesRegex` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
 --------------------------------------------------------------------------------
-11 12 |         with self.failUnlessRaises(ValueError):
-12 13 |             raise ValueError
-13 14 | 
-14    |-        with self.assertRaisesRegex(ValueError, "test"):
-   15 |+        with pytest.raises(ValueError, match="test"):
-15 16 |             raise ValueError("test")
-16 17 | 
-17 18 |         with self.assertRaisesRegex(ValueError, expected_regex="test"):
+12 |         with self.failUnlessRaises(ValueError):
+13 |             raise ValueError
+14 | 
+   -         with self.assertRaisesRegex(ValueError, "test"):
+15 +         with pytest.raises(ValueError, match="test"):
+16 |             raise ValueError("test")
+17 | 
+18 |         with self.assertRaisesRegex(ValueError, expected_regex="test"):
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
   --> PT027_0.py:17:14
@@ -116,22 +112,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
 18 |             raise ValueError("test")
    |
 help: Replace `assertRaisesRegex` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
 --------------------------------------------------------------------------------
-14 15 |         with self.assertRaisesRegex(ValueError, "test"):
-15 16 |             raise ValueError("test")
-16 17 | 
-17    |-        with self.assertRaisesRegex(ValueError, expected_regex="test"):
-   18 |+        with pytest.raises(ValueError, match="test"):
-18 19 |             raise ValueError("test")
-19 20 | 
-20 21 |         with self.assertRaisesRegex(
+15 |         with self.assertRaisesRegex(ValueError, "test"):
+16 |             raise ValueError("test")
+17 | 
+   -         with self.assertRaisesRegex(ValueError, expected_regex="test"):
+18 +         with pytest.raises(ValueError, match="test"):
+19 |             raise ValueError("test")
+20 | 
+21 |         with self.assertRaisesRegex(
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
   --> PT027_0.py:20:14
@@ -144,24 +139,23 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
 22 |         ):
    |
 help: Replace `assertRaisesRegex` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
 --------------------------------------------------------------------------------
-17 18 |         with self.assertRaisesRegex(ValueError, expected_regex="test"):
-18 19 |             raise ValueError("test")
-19 20 | 
-20    |-        with self.assertRaisesRegex(
-21    |-            expected_exception=ValueError, expected_regex="test"
-22    |-        ):
-   21 |+        with pytest.raises(ValueError, match="test"):
-23 22 |             raise ValueError("test")
-24 23 | 
-25 24 |         with self.assertRaisesRegex(
+18 |         with self.assertRaisesRegex(ValueError, expected_regex="test"):
+19 |             raise ValueError("test")
+20 | 
+   -         with self.assertRaisesRegex(
+   -             expected_exception=ValueError, expected_regex="test"
+   -         ):
+21 +         with pytest.raises(ValueError, match="test"):
+22 |             raise ValueError("test")
+23 | 
+24 |         with self.assertRaisesRegex(
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
   --> PT027_0.py:25:14
@@ -174,24 +168,23 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex`
 27 |         ):
    |
 help: Replace `assertRaisesRegex` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
 --------------------------------------------------------------------------------
-22 23 |         ):
-23 24 |             raise ValueError("test")
-24 25 | 
-25    |-        with self.assertRaisesRegex(
-26    |-            expected_regex="test", expected_exception=ValueError
-27    |-        ):
-   26 |+        with pytest.raises(ValueError, match="test"):
-28 27 |             raise ValueError("test")
-29 28 | 
-30 29 |         with self.assertRaisesRegexp(ValueError, "test"):
+23 |         ):
+24 |             raise ValueError("test")
+25 | 
+   -         with self.assertRaisesRegex(
+   -             expected_regex="test", expected_exception=ValueError
+   -         ):
+26 +         with pytest.raises(ValueError, match="test"):
+27 |             raise ValueError("test")
+28 | 
+29 |         with self.assertRaisesRegexp(ValueError, "test"):
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegexp`
   --> PT027_0.py:30:14
@@ -203,22 +196,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegexp`
 31 |             raise ValueError("test")
    |
 help: Replace `assertRaisesRegexp` with `pytest.raises`
-
-ℹ Unsafe fix
-1  1  | import unittest
-   2  |+import pytest
-2  3  | 
-3  4  | 
-4  5  | class Test(unittest.TestCase):
+1  | import unittest
+2  + import pytest
+3  | 
+4  | 
+5  | class Test(unittest.TestCase):
 --------------------------------------------------------------------------------
-27 28 |         ):
-28 29 |             raise ValueError("test")
-29 30 | 
-30    |-        with self.assertRaisesRegexp(ValueError, "test"):
-   31 |+        with pytest.raises(ValueError, match="test"):
-31 32 |             raise ValueError("test")
-32 33 | 
-33 34 |     def test_unfixable_errors(self):
+28 |         ):
+29 |             raise ValueError("test")
+30 | 
+   -         with self.assertRaisesRegexp(ValueError, "test"):
+31 +         with pytest.raises(ValueError, match="test"):
+32 |             raise ValueError("test")
+33 | 
+34 |     def test_unfixable_errors(self):
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 Use `pytest.raises` instead of unittest-style `assertRaises`
   --> PT027_0.py:34:14
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap
index 4003cfd7a4..0dcf40a6f4 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap
@@ -10,16 +10,15 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 12 |             raise ValueError
    |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-8  8  |             raise ValueError
-9  9  | 
-10 10 |     def test_errors(self):
-11    |-        with self.assertRaises(ValueError):
-   11 |+        with pytest.raises(ValueError):
-12 12 |             raise ValueError
-13 13 | 
-14 14 |     def test_rewrite_references(self):
+8  |             raise ValueError
+9  | 
+10 |     def test_errors(self):
+   -         with self.assertRaises(ValueError):
+11 +         with pytest.raises(ValueError):
+12 |             raise ValueError
+13 | 
+14 |     def test_rewrite_references(self):
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
   --> PT027_1.py:15:14
@@ -30,21 +29,20 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 16 |             raise ValueError
    |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-12 12 |             raise ValueError
-13 13 | 
-14 14 |     def test_rewrite_references(self):
-15    |-        with self.assertRaises(ValueError) as e:
-   15 |+        with pytest.raises(ValueError) as e:
-16 16 |             raise ValueError
-17 17 | 
-18 18 |         print(e.foo)
-19    |-        print(e.exception)
-   19 |+        print(e.value)
-20 20 | 
-21 21 |     def test_rewrite_references_multiple_items(self):
-22 22 |         with self.assertRaises(ValueError) as e1, \
+12 |             raise ValueError
+13 | 
+14 |     def test_rewrite_references(self):
+   -         with self.assertRaises(ValueError) as e:
+15 +         with pytest.raises(ValueError) as e:
+16 |             raise ValueError
+17 | 
+18 |         print(e.foo)
+   -         print(e.exception)
+19 +         print(e.value)
+20 | 
+21 |     def test_rewrite_references_multiple_items(self):
+22 |         with self.assertRaises(ValueError) as e1, \
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
   --> PT027_1.py:22:14
@@ -56,22 +54,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 24 |             raise ValueError
    |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-19 19 |         print(e.exception)
-20 20 | 
-21 21 |     def test_rewrite_references_multiple_items(self):
-22    |-        with self.assertRaises(ValueError) as e1, \
-   22 |+        with pytest.raises(ValueError) as e1, \
-23 23 |             self.assertRaises(ValueError) as e2:
-24 24 |             raise ValueError
-25 25 | 
-26 26 |         print(e1.foo)
-27    |-        print(e1.exception)
-   27 |+        print(e1.value)
-28 28 | 
-29 29 |         print(e2.foo)
-30 30 |         print(e2.exception)
+19 |         print(e.exception)
+20 | 
+21 |     def test_rewrite_references_multiple_items(self):
+   -         with self.assertRaises(ValueError) as e1, \
+22 +         with pytest.raises(ValueError) as e1, \
+23 |             self.assertRaises(ValueError) as e2:
+24 |             raise ValueError
+25 | 
+26 |         print(e1.foo)
+   -         print(e1.exception)
+27 +         print(e1.value)
+28 | 
+29 |         print(e2.foo)
+30 |         print(e2.exception)
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
   --> PT027_1.py:23:13
@@ -83,24 +80,23 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 24 |             raise ValueError
    |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-20 20 | 
-21 21 |     def test_rewrite_references_multiple_items(self):
-22 22 |         with self.assertRaises(ValueError) as e1, \
-23    |-            self.assertRaises(ValueError) as e2:
-   23 |+            pytest.raises(ValueError) as e2:
-24 24 |             raise ValueError
-25 25 | 
-26 26 |         print(e1.foo)
-27 27 |         print(e1.exception)
-28 28 | 
-29 29 |         print(e2.foo)
-30    |-        print(e2.exception)
-   30 |+        print(e2.value)
-31 31 | 
-32 32 |     def test_rewrite_references_multiple_items_nested(self):
-33 33 |         with self.assertRaises(ValueError) as e1, \
+20 | 
+21 |     def test_rewrite_references_multiple_items(self):
+22 |         with self.assertRaises(ValueError) as e1, \
+   -             self.assertRaises(ValueError) as e2:
+23 +             pytest.raises(ValueError) as e2:
+24 |             raise ValueError
+25 | 
+26 |         print(e1.foo)
+27 |         print(e1.exception)
+28 | 
+29 |         print(e2.foo)
+   -         print(e2.exception)
+30 +         print(e2.value)
+31 | 
+32 |     def test_rewrite_references_multiple_items_nested(self):
+33 |         with self.assertRaises(ValueError) as e1, \
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
   --> PT027_1.py:33:14
@@ -112,22 +108,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 35 |             raise ValueError
    |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-30 30 |         print(e2.exception)
-31 31 | 
-32 32 |     def test_rewrite_references_multiple_items_nested(self):
-33    |-        with self.assertRaises(ValueError) as e1, \
-   33 |+        with pytest.raises(ValueError) as e1, \
-34 34 |             foo(self.assertRaises(ValueError)) as e2:
-35 35 |             raise ValueError
-36 36 | 
-37 37 |         print(e1.foo)
-38    |-        print(e1.exception)
-   38 |+        print(e1.value)
-39 39 | 
-40 40 |         print(e2.foo)
-41 41 |         print(e2.exception)
+30 |         print(e2.exception)
+31 | 
+32 |     def test_rewrite_references_multiple_items_nested(self):
+   -         with self.assertRaises(ValueError) as e1, \
+33 +         with pytest.raises(ValueError) as e1, \
+34 |             foo(self.assertRaises(ValueError)) as e2:
+35 |             raise ValueError
+36 | 
+37 |         print(e1.foo)
+   -         print(e1.exception)
+38 +         print(e1.value)
+39 | 
+40 |         print(e2.foo)
+41 |         print(e2.exception)
+note: This is an unsafe fix and may change runtime behavior
 
 PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
   --> PT027_1.py:34:17
@@ -139,13 +134,12 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises`
 35 |             raise ValueError
    |
 help: Replace `assertRaises` with `pytest.raises`
-
-ℹ Unsafe fix
-31 31 | 
-32 32 |     def test_rewrite_references_multiple_items_nested(self):
-33 33 |         with self.assertRaises(ValueError) as e1, \
-34    |-            foo(self.assertRaises(ValueError)) as e2:
-   34 |+            foo(pytest.raises(ValueError)) as e2:
-35 35 |             raise ValueError
-36 36 | 
-37 37 |         print(e1.foo)
+31 | 
+32 |     def test_rewrite_references_multiple_items_nested(self):
+33 |         with self.assertRaises(ValueError) as e1, \
+   -             foo(self.assertRaises(ValueError)) as e2:
+34 +             foo(pytest.raises(ValueError)) as e2:
+35 |             raise ValueError
+36 | 
+37 |         print(e1.foo)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap
index 8b2d5c395f..e6a3ad72e0 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pytest_style/mod.rs
 ---
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> PT028.py:3:16
   |
 1 | # Errors
@@ -12,17 +12,16 @@ PT028 Test function parameter `a` has default argument
 5 | def test_foo(a = (1)): ...
   |
 help: Remove default argument
+1 | # Errors
+2 | 
+  - def test_foo(a=1): ...
+3 + def test_foo(a): ...
+4 | def test_foo(a = 1): ...
+5 | def test_foo(a = (1)): ...
+6 | def test_foo(a: int=1): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1 1 | # Errors
-2 2 | 
-3   |-def test_foo(a=1): ...
-  3 |+def test_foo(a): ...
-4 4 | def test_foo(a = 1): ...
-5 5 | def test_foo(a = (1)): ...
-6 6 | def test_foo(a: int=1): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> PT028.py:4:18
   |
 3 | def test_foo(a=1): ...
@@ -32,18 +31,17 @@ PT028 Test function parameter `a` has default argument
 6 | def test_foo(a: int=1): ...
   |
 help: Remove default argument
+1 | # Errors
+2 | 
+3 | def test_foo(a=1): ...
+  - def test_foo(a = 1): ...
+4 + def test_foo(a): ...
+5 | def test_foo(a = (1)): ...
+6 | def test_foo(a: int=1): ...
+7 | def test_foo(a: int = 1): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1 1 | # Errors
-2 2 | 
-3 3 | def test_foo(a=1): ...
-4   |-def test_foo(a = 1): ...
-  4 |+def test_foo(a): ...
-5 5 | def test_foo(a = (1)): ...
-6 6 | def test_foo(a: int=1): ...
-7 7 | def test_foo(a: int = 1): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> PT028.py:5:19
   |
 3 | def test_foo(a=1): ...
@@ -54,18 +52,17 @@ PT028 Test function parameter `a` has default argument
 7 | def test_foo(a: int = 1): ...
   |
 help: Remove default argument
+2 | 
+3 | def test_foo(a=1): ...
+4 | def test_foo(a = 1): ...
+  - def test_foo(a = (1)): ...
+5 + def test_foo(a): ...
+6 | def test_foo(a: int=1): ...
+7 | def test_foo(a: int = 1): ...
+8 | def test_foo(a: (int) = 1): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-2 2 | 
-3 3 | def test_foo(a=1): ...
-4 4 | def test_foo(a = 1): ...
-5   |-def test_foo(a = (1)): ...
-  5 |+def test_foo(a): ...
-6 6 | def test_foo(a: int=1): ...
-7 7 | def test_foo(a: int = 1): ...
-8 8 | def test_foo(a: (int) = 1): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> PT028.py:6:21
   |
 4 | def test_foo(a = 1): ...
@@ -76,18 +73,17 @@ PT028 Test function parameter `a` has default argument
 8 | def test_foo(a: (int) = 1): ...
   |
 help: Remove default argument
+3 | def test_foo(a=1): ...
+4 | def test_foo(a = 1): ...
+5 | def test_foo(a = (1)): ...
+  - def test_foo(a: int=1): ...
+6 + def test_foo(a: int): ...
+7 | def test_foo(a: int = 1): ...
+8 | def test_foo(a: (int) = 1): ...
+9 | def test_foo(a: int = (1)): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-3 3 | def test_foo(a=1): ...
-4 4 | def test_foo(a = 1): ...
-5 5 | def test_foo(a = (1)): ...
-6   |-def test_foo(a: int=1): ...
-  6 |+def test_foo(a: int): ...
-7 7 | def test_foo(a: int = 1): ...
-8 8 | def test_foo(a: (int) = 1): ...
-9 9 | def test_foo(a: int = (1)): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> PT028.py:7:23
   |
 5 | def test_foo(a = (1)): ...
@@ -98,18 +94,17 @@ PT028 Test function parameter `a` has default argument
 9 | def test_foo(a: int = (1)): ...
   |
 help: Remove default argument
+4  | def test_foo(a = 1): ...
+5  | def test_foo(a = (1)): ...
+6  | def test_foo(a: int=1): ...
+   - def test_foo(a: int = 1): ...
+7  + def test_foo(a: int): ...
+8  | def test_foo(a: (int) = 1): ...
+9  | def test_foo(a: int = (1)): ...
+10 | def test_foo(a: (int) = (1)): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-4 4 | def test_foo(a = 1): ...
-5 5 | def test_foo(a = (1)): ...
-6 6 | def test_foo(a: int=1): ...
-7   |-def test_foo(a: int = 1): ...
-  7 |+def test_foo(a: int): ...
-8 8 | def test_foo(a: (int) = 1): ...
-9 9 | def test_foo(a: int = (1)): ...
-10 10 | def test_foo(a: (int) = (1)): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
   --> PT028.py:8:25
    |
  6 | def test_foo(a: int=1): ...
@@ -120,18 +115,17 @@ PT028 Test function parameter `a` has default argument
 10 | def test_foo(a: (int) = (1)): ...
    |
 help: Remove default argument
+5  | def test_foo(a = (1)): ...
+6  | def test_foo(a: int=1): ...
+7  | def test_foo(a: int = 1): ...
+   - def test_foo(a: (int) = 1): ...
+8  + def test_foo(a: (int)): ...
+9  | def test_foo(a: int = (1)): ...
+10 | def test_foo(a: (int) = (1)): ...
+11 | def test_foo(a=1, /, b=2, *, c=3): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-5 5 | def test_foo(a = (1)): ...
-6 6 | def test_foo(a: int=1): ...
-7 7 | def test_foo(a: int = 1): ...
-8   |-def test_foo(a: (int) = 1): ...
-  8 |+def test_foo(a: (int)): ...
-9 9 | def test_foo(a: int = (1)): ...
-10 10 | def test_foo(a: (int) = (1)): ...
-11 11 | def test_foo(a=1, /, b=2, *, c=3): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
   --> PT028.py:9:24
    |
  7 | def test_foo(a: int = 1): ...
@@ -142,18 +136,17 @@ PT028 Test function parameter `a` has default argument
 11 | def test_foo(a=1, /, b=2, *, c=3): ...
    |
 help: Remove default argument
+6  | def test_foo(a: int=1): ...
+7  | def test_foo(a: int = 1): ...
+8  | def test_foo(a: (int) = 1): ...
+   - def test_foo(a: int = (1)): ...
+9  + def test_foo(a: int): ...
+10 | def test_foo(a: (int) = (1)): ...
+11 | def test_foo(a=1, /, b=2, *, c=3): ...
+12 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-6  6  | def test_foo(a: int=1): ...
-7  7  | def test_foo(a: int = 1): ...
-8  8  | def test_foo(a: (int) = 1): ...
-9     |-def test_foo(a: int = (1)): ...
-   9  |+def test_foo(a: int): ...
-10 10 | def test_foo(a: (int) = (1)): ...
-11 11 | def test_foo(a=1, /, b=2, *, c=3): ...
-12 12 | 
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
   --> PT028.py:10:26
    |
  8 | def test_foo(a: (int) = 1): ...
@@ -163,18 +156,17 @@ PT028 Test function parameter `a` has default argument
 11 | def test_foo(a=1, /, b=2, *, c=3): ...
    |
 help: Remove default argument
+7  | def test_foo(a: int = 1): ...
+8  | def test_foo(a: (int) = 1): ...
+9  | def test_foo(a: int = (1)): ...
+   - def test_foo(a: (int) = (1)): ...
+10 + def test_foo(a: (int)): ...
+11 | def test_foo(a=1, /, b=2, *, c=3): ...
+12 | 
+13 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-7  7  | def test_foo(a: int = 1): ...
-8  8  | def test_foo(a: (int) = 1): ...
-9  9  | def test_foo(a: int = (1)): ...
-10    |-def test_foo(a: (int) = (1)): ...
-   10 |+def test_foo(a: (int)): ...
-11 11 | def test_foo(a=1, /, b=2, *, c=3): ...
-12 12 | 
-13 13 | 
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
   --> PT028.py:11:16
    |
  9 | def test_foo(a: int = (1)): ...
@@ -183,18 +175,17 @@ PT028 Test function parameter `a` has default argument
    |                ^
    |
 help: Remove default argument
+8  | def test_foo(a: (int) = 1): ...
+9  | def test_foo(a: int = (1)): ...
+10 | def test_foo(a: (int) = (1)): ...
+   - def test_foo(a=1, /, b=2, *, c=3): ...
+11 + def test_foo(a, /, b=2, *, c=3): ...
+12 | 
+13 | 
+14 | # No errors
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-8  8  | def test_foo(a: (int) = 1): ...
-9  9  | def test_foo(a: int = (1)): ...
-10 10 | def test_foo(a: (int) = (1)): ...
-11    |-def test_foo(a=1, /, b=2, *, c=3): ...
-   11 |+def test_foo(a, /, b=2, *, c=3): ...
-12 12 | 
-13 13 | 
-14 14 | # No errors
-
-PT028 Test function parameter `b` has default argument
+PT028 [*] Test function parameter `b` has default argument
   --> PT028.py:11:24
    |
  9 | def test_foo(a: int = (1)): ...
@@ -203,18 +194,17 @@ PT028 Test function parameter `b` has default argument
    |                        ^
    |
 help: Remove default argument
+8  | def test_foo(a: (int) = 1): ...
+9  | def test_foo(a: int = (1)): ...
+10 | def test_foo(a: (int) = (1)): ...
+   - def test_foo(a=1, /, b=2, *, c=3): ...
+11 + def test_foo(a=1, /, b, *, c=3): ...
+12 | 
+13 | 
+14 | # No errors
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-8  8  | def test_foo(a: (int) = 1): ...
-9  9  | def test_foo(a: int = (1)): ...
-10 10 | def test_foo(a: (int) = (1)): ...
-11    |-def test_foo(a=1, /, b=2, *, c=3): ...
-   11 |+def test_foo(a=1, /, b, *, c=3): ...
-12 12 | 
-13 13 | 
-14 14 | # No errors
-
-PT028 Test function parameter `c` has default argument
+PT028 [*] Test function parameter `c` has default argument
   --> PT028.py:11:32
    |
  9 | def test_foo(a: int = (1)): ...
@@ -223,13 +213,12 @@ PT028 Test function parameter `c` has default argument
    |                                ^
    |
 help: Remove default argument
-
-ℹ Display-only fix
-8  8  | def test_foo(a: (int) = 1): ...
-9  9  | def test_foo(a: int = (1)): ...
-10 10 | def test_foo(a: (int) = (1)): ...
-11    |-def test_foo(a=1, /, b=2, *, c=3): ...
-   11 |+def test_foo(a=1, /, b=2, *, c): ...
-12 12 | 
-13 13 | 
-14 14 | # No errors
+8  | def test_foo(a: (int) = 1): ...
+9  | def test_foo(a: int = (1)): ...
+10 | def test_foo(a: (int) = (1)): ...
+   - def test_foo(a=1, /, b=2, *, c=3): ...
+11 + def test_foo(a=1, /, b=2, *, c): ...
+12 | 
+13 | 
+14 | # No errors
+note: This is a display-only fix and is likely to be incorrect
diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap
index 9543b3f3d0..f5b4eb2748 100644
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pytest_style/mod.rs
 ---
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> is_pytest_test.py:3:27
   |
 1 | # Errors
@@ -11,17 +11,16 @@ PT028 Test function parameter `a` has default argument
 4 | def testThisIsAlsoATest(a=1): ...
   |
 help: Remove default argument
+1 | # Errors
+2 | 
+  - def test_this_is_a_test(a=1): ...
+3 + def test_this_is_a_test(a): ...
+4 | def testThisIsAlsoATest(a=1): ...
+5 | 
+6 | class TestClass:
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1 1 | # Errors
-2 2 | 
-3   |-def test_this_is_a_test(a=1): ...
-  3 |+def test_this_is_a_test(a): ...
-4 4 | def testThisIsAlsoATest(a=1): ...
-5 5 | 
-6 6 | class TestClass:
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> is_pytest_test.py:4:27
   |
 3 | def test_this_is_a_test(a=1): ...
@@ -31,18 +30,17 @@ PT028 Test function parameter `a` has default argument
 6 | class TestClass:
   |
 help: Remove default argument
+1 | # Errors
+2 | 
+3 | def test_this_is_a_test(a=1): ...
+  - def testThisIsAlsoATest(a=1): ...
+4 + def testThisIsAlsoATest(a): ...
+5 | 
+6 | class TestClass:
+7 |     def test_this_too_is_a_test(self, a=1): ...
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-1 1 | # Errors
-2 2 | 
-3 3 | def test_this_is_a_test(a=1): ...
-4   |-def testThisIsAlsoATest(a=1): ...
-  4 |+def testThisIsAlsoATest(a): ...
-5 5 | 
-6 6 | class TestClass:
-7 7 |     def test_this_too_is_a_test(self, a=1): ...
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> is_pytest_test.py:7:41
   |
 6 | class TestClass:
@@ -51,18 +49,17 @@ PT028 Test function parameter `a` has default argument
 8 |     def testAndOfCourseThis(self, a=1): ...
   |
 help: Remove default argument
+4  | def testThisIsAlsoATest(a=1): ...
+5  | 
+6  | class TestClass:
+   -     def test_this_too_is_a_test(self, a=1): ...
+7  +     def test_this_too_is_a_test(self, a): ...
+8  |     def testAndOfCourseThis(self, a=1): ...
+9  | 
+10 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-4 4 | def testThisIsAlsoATest(a=1): ...
-5 5 | 
-6 6 | class TestClass:
-7   |-    def test_this_too_is_a_test(self, a=1): ...
-  7 |+    def test_this_too_is_a_test(self, a): ...
-8 8 |     def testAndOfCourseThis(self, a=1): ...
-9 9 | 
-10 10 | 
-
-PT028 Test function parameter `a` has default argument
+PT028 [*] Test function parameter `a` has default argument
  --> is_pytest_test.py:8:37
   |
 6 | class TestClass:
@@ -71,13 +68,12 @@ PT028 Test function parameter `a` has default argument
   |                                     ^
   |
 help: Remove default argument
-
-ℹ Display-only fix
-5 5 | 
-6 6 | class TestClass:
-7 7 |     def test_this_too_is_a_test(self, a=1): ...
-8   |-    def testAndOfCourseThis(self, a=1): ...
-  8 |+    def testAndOfCourseThis(self, a): ...
-9 9 | 
-10 10 | 
-11 11 | # No errors
+5  | 
+6  | class TestClass:
+7  |     def test_this_too_is_a_test(self, a=1): ...
+   -     def testAndOfCourseThis(self, a=1): ...
+8  +     def testAndOfCourseThis(self, a): ...
+9  | 
+10 | 
+11 | # No errors
+note: This is a display-only fix and is likely to be incorrect
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/rules/avoidable_escaped_quote.rs b/crates/ruff_linter/src/rules/flake8_quotes/rules/avoidable_escaped_quote.rs
index 3a15f45154..59dfdf857e 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/rules/avoidable_escaped_quote.rs
+++ b/crates/ruff_linter/src/rules/flake8_quotes/rules/avoidable_escaped_quote.rs
@@ -34,6 +34,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.88")]
 pub(crate) struct AvoidableEscapedQuote;
 
 impl AlwaysFixableViolation for AvoidableEscapedQuote {
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/rules/check_string_quotes.rs b/crates/ruff_linter/src/rules/flake8_quotes/rules/check_string_quotes.rs
index aae3f18480..43fbf7ad6d 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/rules/check_string_quotes.rs
+++ b/crates/ruff_linter/src/rules/flake8_quotes/rules/check_string_quotes.rs
@@ -37,6 +37,7 @@ use crate::rules::flake8_quotes::settings::Quote;
 ///
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.88")]
 pub(crate) struct BadQuotesInlineString {
     preferred_quote: Quote,
 }
@@ -94,6 +95,7 @@ impl Violation for BadQuotesInlineString {
 ///
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.88")]
 pub(crate) struct BadQuotesMultilineString {
     preferred_quote: Quote,
 }
@@ -149,6 +151,7 @@ impl AlwaysFixableViolation for BadQuotesMultilineString {
 ///
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.88")]
 pub(crate) struct BadQuotesDocstring {
     preferred_quote: Quote,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/rules/unnecessary_escaped_quote.rs b/crates/ruff_linter/src/rules/flake8_quotes/rules/unnecessary_escaped_quote.rs
index 4100097e03..6b76f4b617 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/rules/unnecessary_escaped_quote.rs
+++ b/crates/ruff_linter/src/rules/flake8_quotes/rules/unnecessary_escaped_quote.rs
@@ -33,6 +33,7 @@ use crate::rules::flake8_quotes::helpers::{contains_escaped_quote, raw_contents,
 ///
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct UnnecessaryEscapedQuote;
 
 impl AlwaysFixableViolation for UnnecessaryEscapedQuote {
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap
index 62729525e2..ee38f7c4d3 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap
@@ -10,10 +10,8 @@ Q002 [*] Double quote docstring found but single quotes preferred
 3 | this_is_an_inline_string = "double quote string"
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1   |-"""This is a docstring."""
-  1 |+'''This is a docstring.'''
-2 2 | 
-3 3 | this_is_an_inline_string = "double quote string"
-4 4 |
+  - """This is a docstring."""
+1 + '''This is a docstring.'''
+2 | 
+3 | this_is_an_inline_string = "double quote string"
+4 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap
index a0edc0e992..faf6a2a98b 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap
@@ -12,12 +12,10 @@ Q000 [*] Double quotes found but single quotes preferred
 5 | this_is_a_multiline_string = """
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | """This is a docstring."""
-2 2 | 
-3   |-this_is_an_inline_string = "double quote string"
-  3 |+this_is_an_inline_string = 'double quote string'
-4 4 | 
-5 5 | this_is_a_multiline_string = """
-6 6 | double quote string
+1 | """This is a docstring."""
+2 | 
+  - this_is_an_inline_string = "double quote string"
+3 + this_is_an_inline_string = 'double quote string'
+4 | 
+5 | this_is_a_multiline_string = """
+6 | double quote string
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap
index 67c0fe2790..bc95bbd79c 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap
@@ -13,13 +13,11 @@ Q001 [*] Double quote multiline found but single quotes preferred
   | |___^
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-2 2 | 
-3 3 | this_is_an_inline_string = "double quote string"
-4 4 | 
-5   |-this_is_a_multiline_string = """
-  5 |+this_is_a_multiline_string = '''
-6 6 | double quote string
-7   |-"""
-  7 |+'''
+2 | 
+3 | this_is_an_inline_string = "double quote string"
+4 | 
+  - this_is_a_multiline_string = """
+5 + this_is_a_multiline_string = '''
+6 | double quote string
+  - """
+7 + '''
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap
index 030181a37c..f04e36618b 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap
@@ -14,19 +14,17 @@ Q001 [*] Double quote multiline found but single quotes preferred
 9 |   l = []
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-2 2 | Double quotes multiline module docstring
-3 3 | """
-4 4 | 
-5   |-"""
-  5 |+'''
-6 6 | this is not a docstring
-7   |-"""
-  7 |+'''
-8 8 | 
-9 9 | l = []
-10 10 | 
+2  | Double quotes multiline module docstring
+3  | """
+4  | 
+   - """
+5  + '''
+6  | this is not a docstring
+   - """
+7  + '''
+8  | 
+9  | l = []
+10 | 
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles.py:16:5
@@ -41,19 +39,17 @@ Q001 [*] Double quote multiline found but single quotes preferred
 20 |       # The colon in the list indexing below is an edge case for the docstring scanner
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-13 13 |     Double quotes multiline class docstring
-14 14 |     """
-15 15 | 
-16    |-    """
-   16 |+    '''
-17 17 |     this is not a docstring
-18    |-    """
-   18 |+    '''
-19 19 | 
-20 20 |     # The colon in the list indexing below is an edge case for the docstring scanner
-21 21 |     def f(self, bar="""
+13 |     Double quotes multiline class docstring
+14 |     """
+15 | 
+   -     """
+16 +     '''
+17 |     this is not a docstring
+   -     """
+18 +     '''
+19 | 
+20 |     # The colon in the list indexing below is an edge case for the docstring scanner
+21 |     def f(self, bar="""
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles.py:21:21
@@ -67,18 +63,16 @@ Q001 [*] Double quote multiline found but single quotes preferred
 24 |           """
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-18 18 |     """
-19 19 | 
-20 20 |     # The colon in the list indexing below is an edge case for the docstring scanner
-21    |-    def f(self, bar="""
-22    |-        definitely not a docstring""",
-   21 |+    def f(self, bar='''
-   22 |+        definitely not a docstring''',
-23 23 |         val=l[Cls():3]):
-24 24 |         """
-25 25 |         Double quotes multiline function docstring
+18 |     """
+19 | 
+20 |     # The colon in the list indexing below is an edge case for the docstring scanner
+   -     def f(self, bar="""
+   -         definitely not a docstring""",
+21 +     def f(self, bar='''
+22 +         definitely not a docstring''',
+23 |         val=l[Cls():3]):
+24 |         """
+25 |         Double quotes multiline function docstring
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles.py:30:9
@@ -93,19 +87,17 @@ Q001 [*] Double quote multiline found but single quotes preferred
 34 |           if l:
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-27 27 | 
-28 28 |         some_expression = 'hello world'
-29 29 | 
-30    |-        """
-   30 |+        '''
-31 31 |         this is not a docstring
-32    |-        """
-   32 |+        '''
-33 33 | 
-34 34 |         if l:
-35 35 |             """
+27 | 
+28 |         some_expression = 'hello world'
+29 | 
+   -         """
+30 +         '''
+31 |         this is not a docstring
+   -         """
+32 +         '''
+33 | 
+34 |         if l:
+35 |             """
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles.py:35:13
@@ -118,14 +110,12 @@ Q001 [*] Double quote multiline found but single quotes preferred
 38 |               pass
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-32 32 |         """
-33 33 | 
-34 34 |         if l:
-35    |-            """
-   35 |+            '''
-36 36 |             Looks like a docstring, but in reality it isn't - only modules, classes and functions
-37    |-            """
-   37 |+            '''
-38 38 |             pass
+32 |         """
+33 | 
+34 |         if l:
+   -             """
+35 +             '''
+36 |             Looks like a docstring, but in reality it isn't - only modules, classes and functions
+   -             """
+37 +             '''
+38 |             pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap
index c210842afe..f697f21f1a 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap
@@ -12,15 +12,13 @@ Q001 [*] Double quote multiline found but single quotes preferred
 5 |     def foo(self, bar="""not a docstring"""):
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2 2 |     """ Double quotes single line class docstring """
-3   |-    """ Not a docstring """
-  3 |+    ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar="""not a docstring"""):
-6 6 |         """ Double quotes single line method docstring"""
+1 | class SingleLineDocstrings():
+2 |     """ Double quotes single line class docstring """
+  -     """ Not a docstring """
+3 +     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar="""not a docstring"""):
+6 |         """ Double quotes single line method docstring"""
 
 Q001 [*] Double quote multiline found but single quotes preferred
  --> docstring_doubles_class.py:5:23
@@ -33,13 +31,11 @@ Q001 [*] Double quote multiline found but single quotes preferred
 7 |         pass
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-2 2 |     """ Double quotes single line class docstring """
-3 3 |     """ Not a docstring """
-4 4 | 
-5   |-    def foo(self, bar="""not a docstring"""):
-  5 |+    def foo(self, bar='''not a docstring'''):
-6 6 |         """ Double quotes single line method docstring"""
-7 7 |         pass
-8 8 |
+2 |     """ Double quotes single line class docstring """
+3 |     """ Not a docstring """
+4 | 
+  -     def foo(self, bar="""not a docstring"""):
+5 +     def foo(self, bar='''not a docstring'''):
+6 |         """ Double quotes single line method docstring"""
+7 |         pass
+8 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap
index 0384d64108..f542b722f0 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap
@@ -11,15 +11,13 @@ Q001 [*] Double quote multiline found but single quotes preferred
 4 |     return
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-1 1 | def foo():
-2 2 |     """function without params, single line docstring"""
-3   |-    """ not a docstring"""
-  3 |+    ''' not a docstring'''
-4 4 |     return
-5 5 | 
-6 6 | 
+1 | def foo():
+2 |     """function without params, single line docstring"""
+  -     """ not a docstring"""
+3 +     ''' not a docstring'''
+4 |     return
+5 | 
+6 | 
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles_function.py:11:5
@@ -31,16 +29,14 @@ Q001 [*] Double quote multiline found but single quotes preferred
 12 |     return
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-8  8  |     """
-9  9  |         function without params, multiline docstring
-10 10 |     """
-11    |-    """ not a docstring"""
-   11 |+    ''' not a docstring'''
-12 12 |     return
-13 13 | 
-14 14 | 
+8  |     """
+9  |         function without params, multiline docstring
+10 |     """
+   -     """ not a docstring"""
+11 +     ''' not a docstring'''
+12 |     return
+13 | 
+14 | 
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles_function.py:15:39
@@ -53,19 +49,17 @@ Q001 [*] Double quote multiline found but single quotes preferred
 18 |       pass
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-12 12 |     return
-13 13 | 
-14 14 | 
-15    |-def fun_with_params_no_docstring(a, b="""
-   15 |+def fun_with_params_no_docstring(a, b='''
-16 16 |     not a
-17    |-""" """docstring"""):
-   17 |+''' """docstring"""):
-18 18 |     pass
-19 19 | 
-20 20 | 
+12 |     return
+13 | 
+14 | 
+   - def fun_with_params_no_docstring(a, b="""
+15 + def fun_with_params_no_docstring(a, b='''
+16 |     not a
+   - """ """docstring"""):
+17 + ''' """docstring"""):
+18 |     pass
+19 | 
+20 | 
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles_function.py:17:5
@@ -77,16 +71,14 @@ Q001 [*] Double quote multiline found but single quotes preferred
 18 |     pass
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-14 14 | 
-15 15 | def fun_with_params_no_docstring(a, b="""
-16 16 |     not a
-17    |-""" """docstring"""):
-   17 |+""" '''docstring'''):
-18 18 |     pass
-19 19 | 
-20 20 | 
+14 | 
+15 | def fun_with_params_no_docstring(a, b="""
+16 |     not a
+   - """ """docstring"""):
+17 + """ '''docstring'''):
+18 |     pass
+19 | 
+20 | 
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles_function.py:22:5
@@ -97,13 +89,11 @@ Q001 [*] Double quote multiline found but single quotes preferred
 23 |     pass
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\
-22    |-    """ not a docstring """):
-   22 |+    ''' not a docstring '''):
-23 23 |     pass
-24 24 | 
-25 25 |
+19 | 
+20 | 
+21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\
+   -     """ not a docstring """):
+22 +     ''' not a docstring '''):
+23 |     pass
+24 | 
+25 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap
index 1c56a4705a..4239218bbe 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap
@@ -14,19 +14,17 @@ Q001 [*] Double quote multiline found but single quotes preferred
 8 |       pass
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-1 1 | """
-2 2 | Double quotes multiline module docstring
-3 3 | """
-4   |-"""
-  4 |+'''
-5 5 | this is not a docstring
-6   |-"""
-  6 |+'''
-7 7 | def foo():
-8 8 |     pass
-9 9 | """
+1 | """
+2 | Double quotes multiline module docstring
+3 | """
+  - """
+4 + '''
+5 | this is not a docstring
+  - """
+6 + '''
+7 | def foo():
+8 |     pass
+9 | """
 
 Q001 [*] Double quote multiline found but single quotes preferred
   --> docstring_doubles_module_multiline.py:9:1
@@ -39,13 +37,11 @@ Q001 [*] Double quote multiline found but single quotes preferred
    | |___^
    |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-6  6  | """
-7  7  | def foo():
-8  8  |     pass
-9     |-"""
-   9  |+'''
-10 10 | this is not a docstring
-11    |-"""
-   11 |+'''
+6  | """
+7  | def foo():
+8  |     pass
+   - """
+9  + '''
+10 | this is not a docstring
+   - """
+11 + '''
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap
index a979eb5f39..452e723975 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap
@@ -11,14 +11,12 @@ Q001 [*] Double quote multiline found but single quotes preferred
 4 | def foo():
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-1 1 | """ Double quotes singleline module docstring """
-2   |-""" this is not a docstring """
-  2 |+''' this is not a docstring '''
-3 3 | 
-4 4 | def foo():
-5 5 |     pass
+1 | """ Double quotes singleline module docstring """
+  - """ this is not a docstring """
+2 + ''' this is not a docstring '''
+3 | 
+4 | def foo():
+5 |     pass
 
 Q001 [*] Double quote multiline found but single quotes preferred
  --> docstring_doubles_module_singleline.py:6:1
@@ -29,10 +27,8 @@ Q001 [*] Double quote multiline found but single quotes preferred
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-3 3 | 
-4 4 | def foo():
-5 5 |     pass
-6   |-""" this is not a docstring """
-  6 |+''' this is not a docstring '''
+3 | 
+4 | def foo():
+5 |     pass
+  - """ this is not a docstring """
+6 + ''' this is not a docstring '''
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap
index 22c1903a00..c54061dd14 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap
@@ -12,16 +12,14 @@ Q002 [*] Single quote docstring found but double quotes preferred
 5 |   '''
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1   |-'''
-  1 |+"""
-2 2 | Single quotes multiline module docstring
-3   |-'''
-  3 |+"""
-4 4 | 
-5 5 | '''
-6 6 | this is not a docstring
+  - '''
+1 + """
+2 | Single quotes multiline module docstring
+  - '''
+3 + """
+4 | 
+5 | '''
+6 | this is not a docstring
 
 Q002 [*] Single quote docstring found but double quotes preferred
   --> docstring_singles.py:14:5
@@ -36,19 +34,17 @@ Q002 [*] Single quote docstring found but double quotes preferred
 18 |       '''
    |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-11 11 | class Cls(MakeKlass('''
-12 12 |     class params \t not a docstring
-13 13 | ''')):
-14    |-    '''
-   14 |+    """
-15 15 |     Single quotes multiline class docstring
-16    |-    '''
-   16 |+    """
-17 17 | 
-18 18 |     '''
-19 19 |     this is not a docstring
+11 | class Cls(MakeKlass('''
+12 |     class params \t not a docstring
+13 | ''')):
+   -     '''
+14 +     """
+15 |     Single quotes multiline class docstring
+   -     '''
+16 +     """
+17 | 
+18 |     '''
+19 |     this is not a docstring
 
 Q002 [*] Single quote docstring found but double quotes preferred
   --> docstring_singles.py:26:9
@@ -63,16 +59,14 @@ Q002 [*] Single quote docstring found but double quotes preferred
 30 |           some_expression = 'hello world'
    |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-23 23 |     def f(self, bar='''
-24 24 |         definitely not a docstring''',
-25 25 |         val=l[Cls():3]):
-26    |-        '''
-   26 |+        """
-27 27 |         Single quotes multiline function docstring
-28    |-        '''
-   28 |+        """
-29 29 | 
-30 30 |         some_expression = 'hello world'
-31 31 |
+23 |     def f(self, bar='''
+24 |         definitely not a docstring''',
+25 |         val=l[Cls():3]):
+   -         '''
+26 +         """
+27 |         Single quotes multiline function docstring
+   -         '''
+28 +         """
+29 | 
+30 |         some_expression = 'hello world'
+31 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap
index 395b9a33c2..32f2ead096 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap
@@ -10,14 +10,12 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 |     ''' Not a docstring '''
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2   |-    ''' Double quotes single line class docstring '''
-  2 |+    """ Double quotes single line class docstring """
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
+1 | class SingleLineDocstrings():
+  -     ''' Double quotes single line class docstring '''
+2 +     """ Double quotes single line class docstring """
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_class.py:6:9
@@ -28,16 +26,14 @@ Q002 [*] Single quote docstring found but double quotes preferred
 7 |         pass
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
-6   |-        ''' Double quotes single line method docstring'''
-  6 |+        """ Double quotes single line method docstring"""
-7 7 |         pass
-8 8 | 
-9 9 |     class Nested(foo()[:]): ''' inline docstring '''; pass
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
+  -         ''' Double quotes single line method docstring'''
+6 +         """ Double quotes single line method docstring"""
+7 |         pass
+8 | 
+9 |     class Nested(foo()[:]): ''' inline docstring '''; pass
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_class.py:9:29
@@ -48,10 +44,8 @@ Q002 [*] Single quote docstring found but double quotes preferred
   |                             ^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-6 6 |         ''' Double quotes single line method docstring'''
-7 7 |         pass
-8 8 | 
-9   |-    class Nested(foo()[:]): ''' inline docstring '''; pass
-  9 |+    class Nested(foo()[:]): """ inline docstring """; pass
+6 |         ''' Double quotes single line method docstring'''
+7 |         pass
+8 | 
+  -     class Nested(foo()[:]): ''' inline docstring '''; pass
+9 +     class Nested(foo()[:]): """ inline docstring """; pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap
index 1b6cea3816..31f2a574d8 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap
@@ -11,14 +11,12 @@ Q002 [*] Single quote docstring found but double quotes preferred
 4 |     return
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1 1 | def foo():
-2   |-    '''function without params, single line docstring'''
-  2 |+    """function without params, single line docstring"""
-3 3 |     ''' not a docstring'''
-4 4 |     return
-5 5 | 
+1 | def foo():
+  -     '''function without params, single line docstring'''
+2 +     """function without params, single line docstring"""
+3 |     ''' not a docstring'''
+4 |     return
+5 | 
 
 Q002 [*] Single quote docstring found but double quotes preferred
   --> docstring_singles_function.py:8:5
@@ -32,19 +30,17 @@ Q002 [*] Single quote docstring found but double quotes preferred
 12 |       return
    |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-5  5  | 
-6  6  | 
-7  7  | def foo2():
-8     |-    '''
-   8  |+    """
-9  9  |         function without params, multiline docstring
-10    |-    '''
-   10 |+    """
-11 11 |     ''' not a docstring'''
-12 12 |     return
-13 13 | 
+5  | 
+6  | 
+7  | def foo2():
+   -     '''
+8  +     """
+9  |         function without params, multiline docstring
+   -     '''
+10 +     """
+11 |     ''' not a docstring'''
+12 |     return
+13 | 
 
 Q002 [*] Single quote docstring found but double quotes preferred
   --> docstring_singles_function.py:27:5
@@ -54,13 +50,11 @@ Q002 [*] Single quote docstring found but double quotes preferred
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-24 24 | 
-25 25 | 
-26 26 | def function_with_single_docstring(a):
-27    |-    'Single line docstring'
-   27 |+    "Single line docstring"
-28 28 | 
-29 29 | 
-30 30 | def double_inside_single(a):
+24 | 
+25 | 
+26 | def function_with_single_docstring(a):
+   -     'Single line docstring'
+27 +     "Single line docstring"
+28 | 
+29 | 
+30 | def double_inside_single(a):
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap
index 1f3455801f..cd38b7f8d2 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap
@@ -20,14 +20,12 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 |     ''' Not a docstring '''
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2   |-    ''"Start with empty string" ' and lint docstring safely'
-  2 |+    ''"Start with empty string" " and lint docstring safely"
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
+1 | class SingleLineDocstrings():
+  -     ''"Start with empty string" ' and lint docstring safely'
+2 +     ''"Start with empty string" " and lint docstring safely"
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
 
 Q002 Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_1.py:6:9
@@ -48,16 +46,14 @@ Q002 [*] Single quote docstring found but double quotes preferred
 7 |         pass
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
-6   |-        ''"Start with empty string" ' and lint docstring safely'
-  6 |+        ''"Start with empty string" " and lint docstring safely"
-7 7 |         pass
-8 8 | 
-9 9 |     class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
+  -         ''"Start with empty string" ' and lint docstring safely'
+6 +         ''"Start with empty string" " and lint docstring safely"
+7 |         pass
+8 | 
+9 |     class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass
 
 Q002 Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_1.py:9:29
@@ -78,10 +74,8 @@ Q002 [*] Single quote docstring found but double quotes preferred
   |                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-6 6 |         ''"Start with empty string" ' and lint docstring safely'
-7 7 |         pass
-8 8 | 
-9   |-    class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass
-  9 |+    class Nested(foo()[:]): ''"Start with empty string" " and lint docstring safely"; pass
+6 |         ''"Start with empty string" ' and lint docstring safely'
+7 |         pass
+8 | 
+  -     class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass
+9 +     class Nested(foo()[:]): ''"Start with empty string" " and lint docstring safely"; pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap
index a5bbb5620e..a0ef1e3951 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap
@@ -10,14 +10,12 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 |     ''' Not a docstring '''
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2   |-    'Do not'" start with empty string" ' and lint docstring safely'
-  2 |+    "Do not"" start with empty string" ' and lint docstring safely'
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
+1 | class SingleLineDocstrings():
+  -     'Do not'" start with empty string" ' and lint docstring safely'
+2 +     "Do not"" start with empty string" ' and lint docstring safely'
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_2.py:2:40
@@ -28,14 +26,12 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 |     ''' Not a docstring '''
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2   |-    'Do not'" start with empty string" ' and lint docstring safely'
-  2 |+    'Do not'" start with empty string" " and lint docstring safely"
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
+1 | class SingleLineDocstrings():
+  -     'Do not'" start with empty string" ' and lint docstring safely'
+2 +     'Do not'" start with empty string" " and lint docstring safely"
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_2.py:6:9
@@ -46,16 +42,14 @@ Q002 [*] Single quote docstring found but double quotes preferred
 7 |         pass
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
-6   |-        'Do not'" start with empty string" ' and lint docstring safely'
-  6 |+        "Do not"" start with empty string" ' and lint docstring safely'
-7 7 |         pass
-8 8 | 
-9 9 |     class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
+  -         'Do not'" start with empty string" ' and lint docstring safely'
+6 +         "Do not"" start with empty string" ' and lint docstring safely'
+7 |         pass
+8 | 
+9 |     class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_2.py:6:44
@@ -66,16 +60,14 @@ Q002 [*] Single quote docstring found but double quotes preferred
 7 |         pass
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
-6   |-        'Do not'" start with empty string" ' and lint docstring safely'
-  6 |+        'Do not'" start with empty string" " and lint docstring safely"
-7 7 |         pass
-8 8 | 
-9 9 |     class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
+3 |     ''' Not a docstring '''
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
+  -         'Do not'" start with empty string" ' and lint docstring safely'
+6 +         'Do not'" start with empty string" " and lint docstring safely"
+7 |         pass
+8 | 
+9 |     class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_2.py:9:29
@@ -86,13 +78,11 @@ Q002 [*] Single quote docstring found but double quotes preferred
   |                             ^^^^^^^^
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-6 6 |         'Do not'" start with empty string" ' and lint docstring safely'
-7 7 |         pass
-8 8 | 
-9   |-    class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
-  9 |+    class Nested(foo()[:]): "Do not"" start with empty string" ' and lint docstring safely'; pass
+6 |         'Do not'" start with empty string" ' and lint docstring safely'
+7 |         pass
+8 | 
+  -     class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
+9 +     class Nested(foo()[:]): "Do not"" start with empty string" ' and lint docstring safely'; pass
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_class_var_2.py:9:64
@@ -103,10 +93,8 @@ Q002 [*] Single quote docstring found but double quotes preferred
   |                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-6 6 |         'Do not'" start with empty string" ' and lint docstring safely'
-7 7 |         pass
-8 8 | 
-9   |-    class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
-  9 |+    class Nested(foo()[:]): 'Do not'" start with empty string" " and lint docstring safely"; pass
+6 |         'Do not'" start with empty string" ' and lint docstring safely'
+7 |         pass
+8 | 
+  -     class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass
+9 +     class Nested(foo()[:]): 'Do not'" start with empty string" " and lint docstring safely"; pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap
index 5b079058ba..ebb41da86e 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap
@@ -20,13 +20,11 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 | def foo():
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1   |-''"Start with empty string" ' and lint docstring safely'
-  1 |+''"Start with empty string" " and lint docstring safely"
-2 2 | 
-3 3 | def foo():
-4 4 |     pass
+  - ''"Start with empty string" ' and lint docstring safely'
+1 + ''"Start with empty string" " and lint docstring safely"
+2 | 
+3 | def foo():
+4 |     pass
 
 Q001 [*] Double quote multiline found but single quotes preferred
  --> docstring_singles_mixed_quotes_module_singleline_var_1.py:5:1
@@ -37,10 +35,8 @@ Q001 [*] Double quote multiline found but single quotes preferred
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-2 2 | 
-3 3 | def foo():
-4 4 |     pass
-5   |-""" this is not a docstring """
-  5 |+''' this is not a docstring '''
+2 | 
+3 | def foo():
+4 |     pass
+  - """ this is not a docstring """
+5 + ''' this is not a docstring '''
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap
index ad3726d457..ac377de8c3 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap
@@ -10,13 +10,11 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 | def foo():
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1   |-'Do not'" start with empty string" ' and lint docstring safely'
-  1 |+"Do not"" start with empty string" ' and lint docstring safely'
-2 2 | 
-3 3 | def foo():
-4 4 |     pass
+  - 'Do not'" start with empty string" ' and lint docstring safely'
+1 + "Do not"" start with empty string" ' and lint docstring safely'
+2 | 
+3 | def foo():
+4 |     pass
 
 Q002 [*] Single quote docstring found but double quotes preferred
  --> docstring_singles_mixed_quotes_module_singleline_var_2.py:1:36
@@ -27,13 +25,11 @@ Q002 [*] Single quote docstring found but double quotes preferred
 3 | def foo():
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1   |-'Do not'" start with empty string" ' and lint docstring safely'
-  1 |+'Do not'" start with empty string" " and lint docstring safely"
-2 2 | 
-3 3 | def foo():
-4 4 |     pass
+  - 'Do not'" start with empty string" ' and lint docstring safely'
+1 + 'Do not'" start with empty string" " and lint docstring safely"
+2 | 
+3 | def foo():
+4 |     pass
 
 Q001 [*] Double quote multiline found but single quotes preferred
  --> docstring_singles_mixed_quotes_module_singleline_var_2.py:5:1
@@ -44,10 +40,8 @@ Q001 [*] Double quote multiline found but single quotes preferred
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-2 2 | 
-3 3 | def foo():
-4 4 |     pass
-5   |-""" this is not a docstring """
-  5 |+''' this is not a docstring '''
+2 | 
+3 | def foo():
+4 |     pass
+  - """ this is not a docstring """
+5 + ''' this is not a docstring '''
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap
index b570d042b5..2282db0c6b 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap
@@ -12,13 +12,11 @@ Q002 [*] Single quote docstring found but double quotes preferred
 5 |   this is not a docstring
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1   |-'''
-  1 |+"""
-2 2 | Double quotes multiline module docstring
-3   |-'''
-  3 |+"""
-4 4 | '''
-5 5 | this is not a docstring
-6 6 | '''
+  - '''
+1 + """
+2 | Double quotes multiline module docstring
+  - '''
+3 + """
+4 | '''
+5 | this is not a docstring
+6 | '''
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap
index b0ed1bc769..450bd6127d 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap
@@ -9,10 +9,8 @@ Q002 [*] Single quote docstring found but double quotes preferred
 2 | ''' this is not a docstring '''
   |
 help: Replace single quotes docstring with double quotes
-
-ℹ Safe fix
-1   |-''' Double quotes singleline module docstring '''
-  1 |+""" Double quotes singleline module docstring """
-2 2 | ''' this is not a docstring '''
-3 3 | 
-4 4 | def foo():
+  - ''' Double quotes singleline module docstring '''
+1 + """ Double quotes singleline module docstring """
+2 | ''' this is not a docstring '''
+3 | 
+4 | def foo():
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap
index 3d976112e3..0b1d9ef7c8 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap
@@ -12,16 +12,14 @@ Q002 [*] Double quote docstring found but single quotes preferred
 5 |   """
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1   |-"""
-  1 |+'''
-2 2 | Double quotes multiline module docstring
-3   |-"""
-  3 |+'''
-4 4 | 
-5 5 | """
-6 6 | this is not a docstring
+  - """
+1 + '''
+2 | Double quotes multiline module docstring
+  - """
+3 + '''
+4 | 
+5 | """
+6 | this is not a docstring
 
 Q002 [*] Double quote docstring found but single quotes preferred
   --> docstring_doubles.py:12:5
@@ -35,19 +33,17 @@ Q002 [*] Double quote docstring found but single quotes preferred
 16 |       """
    |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-9  9  | l = []
-10 10 | 
-11 11 | class Cls:
-12    |-    """
-   12 |+    '''
-13 13 |     Double quotes multiline class docstring
-14    |-    """
-   14 |+    '''
-15 15 | 
-16 16 |     """
-17 17 |     this is not a docstring
+9  | l = []
+10 | 
+11 | class Cls:
+   -     """
+12 +     '''
+13 |     Double quotes multiline class docstring
+   -     """
+14 +     '''
+15 | 
+16 |     """
+17 |     this is not a docstring
 
 Q002 [*] Double quote docstring found but single quotes preferred
   --> docstring_doubles.py:24:9
@@ -62,16 +58,14 @@ Q002 [*] Double quote docstring found but single quotes preferred
 28 |           some_expression = 'hello world'
    |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-21 21 |     def f(self, bar="""
-22 22 |         definitely not a docstring""",
-23 23 |         val=l[Cls():3]):
-24    |-        """
-   24 |+        '''
-25 25 |         Double quotes multiline function docstring
-26    |-        """
-   26 |+        '''
-27 27 | 
-28 28 |         some_expression = 'hello world'
-29 29 |
+21 |     def f(self, bar="""
+22 |         definitely not a docstring""",
+23 |         val=l[Cls():3]):
+   -         """
+24 +         '''
+25 |         Double quotes multiline function docstring
+   -         """
+26 +         '''
+27 | 
+28 |         some_expression = 'hello world'
+29 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap
index 8cebae5756..9de744f4b8 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap
@@ -10,14 +10,12 @@ Q002 [*] Double quote docstring found but single quotes preferred
 3 |     """ Not a docstring """
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2   |-    """ Double quotes single line class docstring """
-  2 |+    ''' Double quotes single line class docstring '''
-3 3 |     """ Not a docstring """
-4 4 | 
-5 5 |     def foo(self, bar="""not a docstring"""):
+1 | class SingleLineDocstrings():
+  -     """ Double quotes single line class docstring """
+2 +     ''' Double quotes single line class docstring '''
+3 |     """ Not a docstring """
+4 | 
+5 |     def foo(self, bar="""not a docstring"""):
 
 Q002 [*] Double quote docstring found but single quotes preferred
  --> docstring_doubles_class.py:6:9
@@ -28,16 +26,14 @@ Q002 [*] Double quote docstring found but single quotes preferred
 7 |         pass
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-3 3 |     """ Not a docstring """
-4 4 | 
-5 5 |     def foo(self, bar="""not a docstring"""):
-6   |-        """ Double quotes single line method docstring"""
-  6 |+        ''' Double quotes single line method docstring'''
-7 7 |         pass
-8 8 | 
-9 9 |     class Nested(foo()[:]): """ inline docstring """; pass
+3 |     """ Not a docstring """
+4 | 
+5 |     def foo(self, bar="""not a docstring"""):
+  -         """ Double quotes single line method docstring"""
+6 +         ''' Double quotes single line method docstring'''
+7 |         pass
+8 | 
+9 |     class Nested(foo()[:]): """ inline docstring """; pass
 
 Q002 [*] Double quote docstring found but single quotes preferred
  --> docstring_doubles_class.py:9:29
@@ -48,10 +44,8 @@ Q002 [*] Double quote docstring found but single quotes preferred
   |                             ^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-6 6 |         """ Double quotes single line method docstring"""
-7 7 |         pass
-8 8 | 
-9   |-    class Nested(foo()[:]): """ inline docstring """; pass
-  9 |+    class Nested(foo()[:]): ''' inline docstring '''; pass
+6 |         """ Double quotes single line method docstring"""
+7 |         pass
+8 | 
+  -     class Nested(foo()[:]): """ inline docstring """; pass
+9 +     class Nested(foo()[:]): ''' inline docstring '''; pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap
index 8eb0509992..0d2edb6497 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap
@@ -11,14 +11,12 @@ Q002 [*] Double quote docstring found but single quotes preferred
 4 |     return
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1 1 | def foo():
-2   |-    """function without params, single line docstring"""
-  2 |+    '''function without params, single line docstring'''
-3 3 |     """ not a docstring"""
-4 4 |     return
-5 5 | 
+1 | def foo():
+  -     """function without params, single line docstring"""
+2 +     '''function without params, single line docstring'''
+3 |     """ not a docstring"""
+4 |     return
+5 | 
 
 Q002 [*] Double quote docstring found but single quotes preferred
   --> docstring_doubles_function.py:8:5
@@ -32,19 +30,17 @@ Q002 [*] Double quote docstring found but single quotes preferred
 12 |       return
    |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-5  5  | 
-6  6  | 
-7  7  | def foo2():
-8     |-    """
-   8  |+    '''
-9  9  |         function without params, multiline docstring
-10    |-    """
-   10 |+    '''
-11 11 |     """ not a docstring"""
-12 12 |     return
-13 13 | 
+5  | 
+6  | 
+7  | def foo2():
+   -     """
+8  +     '''
+9  |         function without params, multiline docstring
+   -     """
+10 +     '''
+11 |     """ not a docstring"""
+12 |     return
+13 | 
 
 Q002 [*] Double quote docstring found but single quotes preferred
   --> docstring_doubles_function.py:27:5
@@ -54,13 +50,11 @@ Q002 [*] Double quote docstring found but single quotes preferred
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-24 24 | 
-25 25 | 
-26 26 | def function_with_single_docstring(a):
-27    |-    "Single line docstring"
-   27 |+    'Single line docstring'
-28 28 | 
-29 29 | 
-30 30 | def double_inside_single(a):
+24 | 
+25 | 
+26 | def function_with_single_docstring(a):
+   -     "Single line docstring"
+27 +     'Single line docstring'
+28 | 
+29 | 
+30 | def double_inside_single(a):
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap
index 5855c8253e..c7788569c5 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap
@@ -10,14 +10,12 @@ Q002 [*] Double quote docstring found but single quotes preferred
 3 |     """ Not a docstring """
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2   |-    "Do not"' start with empty string' ' and lint docstring safely'
-  2 |+    'Do not'' start with empty string' ' and lint docstring safely'
-3 3 |     """ Not a docstring """
-4 4 | 
-5 5 |     def foo(self, bar="""not a docstring"""):
+1 | class SingleLineDocstrings():
+  -     "Do not"' start with empty string' ' and lint docstring safely'
+2 +     'Do not'' start with empty string' ' and lint docstring safely'
+3 |     """ Not a docstring """
+4 | 
+5 |     def foo(self, bar="""not a docstring"""):
 
 Q002 [*] Double quote docstring found but single quotes preferred
  --> docstring_doubles_mixed_quotes_class_var_2.py:6:9
@@ -28,16 +26,14 @@ Q002 [*] Double quote docstring found but single quotes preferred
 7 |         pass
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-3 3 |     """ Not a docstring """
-4 4 | 
-5 5 |     def foo(self, bar="""not a docstring"""):
-6   |-        "Do not"' start with empty string' ' and lint docstring safely'
-  6 |+        'Do not'' start with empty string' ' and lint docstring safely'
-7 7 |         pass
-8 8 | 
-9 9 |     class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass
+3 |     """ Not a docstring """
+4 | 
+5 |     def foo(self, bar="""not a docstring"""):
+  -         "Do not"' start with empty string' ' and lint docstring safely'
+6 +         'Do not'' start with empty string' ' and lint docstring safely'
+7 |         pass
+8 | 
+9 |     class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass
 
 Q002 [*] Double quote docstring found but single quotes preferred
  --> docstring_doubles_mixed_quotes_class_var_2.py:9:29
@@ -48,10 +44,8 @@ Q002 [*] Double quote docstring found but single quotes preferred
   |                             ^^^^^^^^
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-6 6 |         "Do not"' start with empty string' ' and lint docstring safely'
-7 7 |         pass
-8 8 | 
-9   |-    class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass
-  9 |+    class Nested(foo()[:]): 'Do not'' start with empty string' ' and lint docstring safely'; pass
+6 |         "Do not"' start with empty string' ' and lint docstring safely'
+7 |         pass
+8 | 
+  -     class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass
+9 +     class Nested(foo()[:]): 'Do not'' start with empty string' ' and lint docstring safely'; pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap
index 9314ac3afc..6856dcea9a 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap
@@ -10,10 +10,8 @@ Q002 [*] Double quote docstring found but single quotes preferred
 3 | def foo():
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1   |-"Do not"' start with empty string' ' and lint docstring safely'
-  1 |+'Do not'' start with empty string' ' and lint docstring safely'
-2 2 | 
-3 3 | def foo():
-4 4 |     pass
+  - "Do not"' start with empty string' ' and lint docstring safely'
+1 + 'Do not'' start with empty string' ' and lint docstring safely'
+2 | 
+3 | def foo():
+4 |     pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap
index 8de5e00a7c..564d62c34e 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap
@@ -12,13 +12,11 @@ Q002 [*] Double quote docstring found but single quotes preferred
 5 |   this is not a docstring
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1   |-"""
-  1 |+'''
-2 2 | Double quotes multiline module docstring
-3   |-"""
-  3 |+'''
-4 4 | """
-5 5 | this is not a docstring
-6 6 | """
+  - """
+1 + '''
+2 | Double quotes multiline module docstring
+  - """
+3 + '''
+4 | """
+5 | this is not a docstring
+6 | """
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap
index 81dac4b5a0..73b8d3e483 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap
@@ -9,10 +9,8 @@ Q002 [*] Double quote docstring found but single quotes preferred
 2 | """ this is not a docstring """
   |
 help: Replace double quotes docstring with single quotes
-
-ℹ Safe fix
-1   |-""" Double quotes singleline module docstring """
-  1 |+''' Double quotes singleline module docstring '''
-2 2 | """ this is not a docstring """
-3 3 | 
-4 4 | def foo():
+  - """ Double quotes singleline module docstring """
+1 + ''' Double quotes singleline module docstring '''
+2 | """ this is not a docstring """
+3 | 
+4 | def foo():
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap
index 8c17b17455..9ddd470b70 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap
@@ -14,19 +14,17 @@ Q001 [*] Single quote multiline found but double quotes preferred
 9 |   l = []
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-2 2 | Single quotes multiline module docstring
-3 3 | '''
-4 4 | 
-5   |-'''
-  5 |+"""
-6 6 | this is not a docstring
-7   |-'''
-  7 |+"""
-8 8 | 
-9 9 | l = []
-10 10 | 
+2  | Single quotes multiline module docstring
+3  | '''
+4  | 
+   - '''
+5  + """
+6  | this is not a docstring
+   - '''
+7  + """
+8  | 
+9  | l = []
+10 | 
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles.py:11:21
@@ -42,19 +40,17 @@ Q001 [*] Single quote multiline found but double quotes preferred
 15 |       Single quotes multiline class docstring
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-8  8  | 
-9  9  | l = []
-10 10 | 
-11    |-class Cls(MakeKlass('''
-   11 |+class Cls(MakeKlass("""
-12 12 |     class params \t not a docstring
-13    |-''')):
-   13 |+""")):
-14 14 |     '''
-15 15 |     Single quotes multiline class docstring
-16 16 |     '''
+8  | 
+9  | l = []
+10 | 
+   - class Cls(MakeKlass('''
+11 + class Cls(MakeKlass("""
+12 |     class params \t not a docstring
+   - ''')):
+13 + """)):
+14 |     '''
+15 |     Single quotes multiline class docstring
+16 |     '''
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles.py:18:5
@@ -69,19 +65,17 @@ Q001 [*] Single quote multiline found but double quotes preferred
 22 |       # The colon in the list indexing below is an edge case for the docstring scanner
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-15 15 |     Single quotes multiline class docstring
-16 16 |     '''
-17 17 | 
-18    |-    '''
-   18 |+    """
-19 19 |     this is not a docstring
-20    |-    '''
-   20 |+    """
-21 21 | 
-22 22 |     # The colon in the list indexing below is an edge case for the docstring scanner
-23 23 |     def f(self, bar='''
+15 |     Single quotes multiline class docstring
+16 |     '''
+17 | 
+   -     '''
+18 +     """
+19 |     this is not a docstring
+   -     '''
+20 +     """
+21 | 
+22 |     # The colon in the list indexing below is an edge case for the docstring scanner
+23 |     def f(self, bar='''
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles.py:23:21
@@ -95,18 +89,16 @@ Q001 [*] Single quote multiline found but double quotes preferred
 26 |           '''
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-20 20 |     '''
-21 21 | 
-22 22 |     # The colon in the list indexing below is an edge case for the docstring scanner
-23    |-    def f(self, bar='''
-24    |-        definitely not a docstring''',
-   23 |+    def f(self, bar="""
-   24 |+        definitely not a docstring""",
-25 25 |         val=l[Cls():3]):
-26 26 |         '''
-27 27 |         Single quotes multiline function docstring
+20 |     '''
+21 | 
+22 |     # The colon in the list indexing below is an edge case for the docstring scanner
+   -     def f(self, bar='''
+   -         definitely not a docstring''',
+23 +     def f(self, bar="""
+24 +         definitely not a docstring""",
+25 |         val=l[Cls():3]):
+26 |         '''
+27 |         Single quotes multiline function docstring
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles.py:32:9
@@ -121,19 +113,17 @@ Q001 [*] Single quote multiline found but double quotes preferred
 36 |           if l:
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-29 29 | 
-30 30 |         some_expression = 'hello world'
-31 31 | 
-32    |-        '''
-   32 |+        """
-33 33 |         this is not a docstring
-34    |-        '''
-   34 |+        """
-35 35 | 
-36 36 |         if l:
-37 37 |             '''
+29 | 
+30 |         some_expression = 'hello world'
+31 | 
+   -         '''
+32 +         """
+33 |         this is not a docstring
+   -         '''
+34 +         """
+35 | 
+36 |         if l:
+37 |             '''
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles.py:37:13
@@ -146,14 +136,12 @@ Q001 [*] Single quote multiline found but double quotes preferred
 40 |               pass
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-34 34 |         '''
-35 35 | 
-36 36 |         if l:
-37    |-            '''
-   37 |+            """
-38 38 |             Looks like a docstring, but in reality it isn't - only modules, classes and functions
-39    |-            '''
-   39 |+            """
-40 40 |             pass
+34 |         '''
+35 | 
+36 |         if l:
+   -             '''
+37 +             """
+38 |             Looks like a docstring, but in reality it isn't - only modules, classes and functions
+   -             '''
+39 +             """
+40 |             pass
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap
index 5cd192eba7..cb016a7f1c 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap
@@ -12,15 +12,13 @@ Q001 [*] Single quote multiline found but double quotes preferred
 5 |     def foo(self, bar='''not a docstring'''):
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-1 1 | class SingleLineDocstrings():
-2 2 |     ''' Double quotes single line class docstring '''
-3   |-    ''' Not a docstring '''
-  3 |+    """ Not a docstring """
-4 4 | 
-5 5 |     def foo(self, bar='''not a docstring'''):
-6 6 |         ''' Double quotes single line method docstring'''
+1 | class SingleLineDocstrings():
+2 |     ''' Double quotes single line class docstring '''
+  -     ''' Not a docstring '''
+3 +     """ Not a docstring """
+4 | 
+5 |     def foo(self, bar='''not a docstring'''):
+6 |         ''' Double quotes single line method docstring'''
 
 Q001 [*] Single quote multiline found but double quotes preferred
  --> docstring_singles_class.py:5:23
@@ -33,13 +31,11 @@ Q001 [*] Single quote multiline found but double quotes preferred
 7 |         pass
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-2 2 |     ''' Double quotes single line class docstring '''
-3 3 |     ''' Not a docstring '''
-4 4 | 
-5   |-    def foo(self, bar='''not a docstring'''):
-  5 |+    def foo(self, bar="""not a docstring"""):
-6 6 |         ''' Double quotes single line method docstring'''
-7 7 |         pass
-8 8 |
+2 |     ''' Double quotes single line class docstring '''
+3 |     ''' Not a docstring '''
+4 | 
+  -     def foo(self, bar='''not a docstring'''):
+5 +     def foo(self, bar="""not a docstring"""):
+6 |         ''' Double quotes single line method docstring'''
+7 |         pass
+8 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap
index 455a32f692..b41bcd7c14 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap
@@ -11,15 +11,13 @@ Q001 [*] Single quote multiline found but double quotes preferred
 4 |     return
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-1 1 | def foo():
-2 2 |     '''function without params, single line docstring'''
-3   |-    ''' not a docstring'''
-  3 |+    """ not a docstring"""
-4 4 |     return
-5 5 | 
-6 6 | 
+1 | def foo():
+2 |     '''function without params, single line docstring'''
+  -     ''' not a docstring'''
+3 +     """ not a docstring"""
+4 |     return
+5 | 
+6 | 
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles_function.py:11:5
@@ -31,16 +29,14 @@ Q001 [*] Single quote multiline found but double quotes preferred
 12 |     return
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-8  8  |     '''
-9  9  |         function without params, multiline docstring
-10 10 |     '''
-11    |-    ''' not a docstring'''
-   11 |+    """ not a docstring"""
-12 12 |     return
-13 13 | 
-14 14 | 
+8  |     '''
+9  |         function without params, multiline docstring
+10 |     '''
+   -     ''' not a docstring'''
+11 +     """ not a docstring"""
+12 |     return
+13 | 
+14 | 
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles_function.py:15:39
@@ -53,19 +49,17 @@ Q001 [*] Single quote multiline found but double quotes preferred
 18 |       pass
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-12 12 |     return
-13 13 | 
-14 14 | 
-15    |-def fun_with_params_no_docstring(a, b='''
-   15 |+def fun_with_params_no_docstring(a, b="""
-16 16 |     not a
-17    |-''' '''docstring'''):
-   17 |+""" '''docstring'''):
-18 18 |     pass
-19 19 | 
-20 20 | 
+12 |     return
+13 | 
+14 | 
+   - def fun_with_params_no_docstring(a, b='''
+15 + def fun_with_params_no_docstring(a, b="""
+16 |     not a
+   - ''' '''docstring'''):
+17 + """ '''docstring'''):
+18 |     pass
+19 | 
+20 | 
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles_function.py:17:5
@@ -77,16 +71,14 @@ Q001 [*] Single quote multiline found but double quotes preferred
 18 |     pass
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-14 14 | 
-15 15 | def fun_with_params_no_docstring(a, b='''
-16 16 |     not a
-17    |-''' '''docstring'''):
-   17 |+''' """docstring"""):
-18 18 |     pass
-19 19 | 
-20 20 | 
+14 | 
+15 | def fun_with_params_no_docstring(a, b='''
+16 |     not a
+   - ''' '''docstring'''):
+17 + ''' """docstring"""):
+18 |     pass
+19 | 
+20 | 
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles_function.py:22:5
@@ -97,13 +89,11 @@ Q001 [*] Single quote multiline found but double quotes preferred
 23 |     pass
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\
-22    |-    ''' not a docstring '''):
-   22 |+    """ not a docstring """):
-23 23 |     pass
-24 24 | 
-25 25 |
+19 | 
+20 | 
+21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\
+   -     ''' not a docstring '''):
+22 +     """ not a docstring """):
+23 |     pass
+24 | 
+25 |
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap
index 8003cada09..149c82d40a 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap
@@ -14,19 +14,17 @@ Q001 [*] Single quote multiline found but double quotes preferred
 8 |       pass
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-1 1 | '''
-2 2 | Double quotes multiline module docstring
-3 3 | '''
-4   |-'''
-  4 |+"""
-5 5 | this is not a docstring
-6   |-'''
-  6 |+"""
-7 7 | def foo():
-8 8 |     pass
-9 9 | '''
+1 | '''
+2 | Double quotes multiline module docstring
+3 | '''
+  - '''
+4 + """
+5 | this is not a docstring
+  - '''
+6 + """
+7 | def foo():
+8 |     pass
+9 | '''
 
 Q001 [*] Single quote multiline found but double quotes preferred
   --> docstring_singles_module_multiline.py:9:1
@@ -39,13 +37,11 @@ Q001 [*] Single quote multiline found but double quotes preferred
    | |___^
    |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-6  6  | '''
-7  7  | def foo():
-8  8  |     pass
-9     |-'''
-   9  |+"""
-10 10 | this is not a docstring
-11    |-'''
-   11 |+"""
+6  | '''
+7  | def foo():
+8  |     pass
+   - '''
+9  + """
+10 | this is not a docstring
+   - '''
+11 + """
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap
index 72809993e9..823cbd2326 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap
@@ -11,14 +11,12 @@ Q001 [*] Single quote multiline found but double quotes preferred
 4 | def foo():
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-1 1 | ''' Double quotes singleline module docstring '''
-2   |-''' this is not a docstring '''
-  2 |+""" this is not a docstring """
-3 3 | 
-4 4 | def foo():
-5 5 |     pass
+1 | ''' Double quotes singleline module docstring '''
+  - ''' this is not a docstring '''
+2 + """ this is not a docstring """
+3 | 
+4 | def foo():
+5 |     pass
 
 Q001 [*] Single quote multiline found but double quotes preferred
  --> docstring_singles_module_singleline.py:6:1
@@ -29,10 +27,8 @@ Q001 [*] Single quote multiline found but double quotes preferred
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-3 3 | 
-4 4 | def foo():
-5 5 |     pass
-6   |-''' this is not a docstring '''
-  6 |+""" this is not a docstring """
+3 | 
+4 | def foo():
+5 |     pass
+  - ''' this is not a docstring '''
+6 + """ this is not a docstring """
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap
index 0732cb70c1..4c6e4f4d73 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap
@@ -10,13 +10,11 @@ Q000 [*] Single quotes found but double quotes preferred
 3 | this_should_be_linted = f'double quote string'
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1   |-this_should_be_linted = 'single quote string'
-  1 |+this_should_be_linted = "single quote string"
-2 2 | this_should_be_linted = u'double quote string'
-3 3 | this_should_be_linted = f'double quote string'
-4 4 | this_should_be_linted = f'double {"quote"} string'
+  - this_should_be_linted = 'single quote string'
+1 + this_should_be_linted = "single quote string"
+2 | this_should_be_linted = u'double quote string'
+3 | this_should_be_linted = f'double quote string'
+4 | this_should_be_linted = f'double {"quote"} string'
 
 Q000 [*] Single quotes found but double quotes preferred
  --> singles.py:2:25
@@ -28,14 +26,12 @@ Q000 [*] Single quotes found but double quotes preferred
 4 | this_should_be_linted = f'double {"quote"} string'
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | this_should_be_linted = 'single quote string'
-2   |-this_should_be_linted = u'double quote string'
-  2 |+this_should_be_linted = u"double quote string"
-3 3 | this_should_be_linted = f'double quote string'
-4 4 | this_should_be_linted = f'double {"quote"} string'
-5 5 | 
+1 | this_should_be_linted = 'single quote string'
+  - this_should_be_linted = u'double quote string'
+2 + this_should_be_linted = u"double quote string"
+3 | this_should_be_linted = f'double quote string'
+4 | this_should_be_linted = f'double {"quote"} string'
+5 | 
 
 Q000 [*] Single quotes found but double quotes preferred
  --> singles.py:3:25
@@ -47,12 +43,10 @@ Q000 [*] Single quotes found but double quotes preferred
 4 | this_should_be_linted = f'double {"quote"} string'
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | this_should_be_linted = 'single quote string'
-2 2 | this_should_be_linted = u'double quote string'
-3   |-this_should_be_linted = f'double quote string'
-  3 |+this_should_be_linted = f"double quote string"
-4 4 | this_should_be_linted = f'double {"quote"} string'
-5 5 | 
-6 6 | # https://github.com/astral-sh/ruff/issues/10546
+1 | this_should_be_linted = 'single quote string'
+2 | this_should_be_linted = u'double quote string'
+  - this_should_be_linted = f'double quote string'
+3 + this_should_be_linted = f"double quote string"
+4 | this_should_be_linted = f'double {"quote"} string'
+5 | 
+6 | # https://github.com/astral-sh/ruff/issues/10546
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap
index 506d6d4953..8e93365420 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap
@@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 3 | this_is_fine = 'This is a "string"'
   |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-1   |-this_should_raise_Q003 = "This is a \"string\""
-  1 |+this_should_raise_Q003 = 'This is a "string"'
-2 2 | this_is_fine = "'This' is a \"string\""
-3 3 | this_is_fine = 'This is a "string"'
-4 4 | this_is_fine = '\'This\' is a "string"'
+  - this_should_raise_Q003 = "This is a \"string\""
+1 + this_should_raise_Q003 = 'This is a "string"'
+2 | this_is_fine = "'This' is a \"string\""
+3 | this_is_fine = 'This is a "string"'
+4 | this_is_fine = '\'This\' is a "string"'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:9:5
@@ -28,16 +26,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 10 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-6  6  | this_is_fine = R"This is a \"string\""
-7  7  | this_should_raise = (
-8  8  |     "This is a"
-9     |-    "\"string\""
-   9  |+    '"string"'
-10 10 | )
-11 11 | 
-12 12 | # Same as above, but with f-strings
+6  | this_is_fine = R"This is a \"string\""
+7  | this_should_raise = (
+8  |     "This is a"
+   -     "\"string\""
+9  +     '"string"'
+10 | )
+11 | 
+12 | # Same as above, but with f-strings
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:13:1
@@ -49,16 +45,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 15 | f'This is a "string"'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-10 10 | )
-11 11 | 
-12 12 | # Same as above, but with f-strings
-13    |-f"This is a \"string\""
-   13 |+f'This is a "string"'
-14 14 | f"'This' is a \"string\""
-15 15 | f'This is a "string"'
-16 16 | f'\'This\' is a "string"'
+10 | )
+11 | 
+12 | # Same as above, but with f-strings
+   - f"This is a \"string\""
+13 + f'This is a "string"'
+14 | f"'This' is a \"string\""
+15 | f'This is a "string"'
+16 | f'\'This\' is a "string"'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:21:5
@@ -70,16 +64,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 22 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-18 18 | fR"This is a \"string\""
-19 19 | foo = (
-20 20 |     f"This is a"
-21    |-    f"\"string\""
-   21 |+    f'"string"'
-22 22 | )
-23 23 | 
-24 24 | # Nested f-strings (Python 3.12+)
+18 | fR"This is a \"string\""
+19 | foo = (
+20 |     f"This is a"
+   -     f"\"string\""
+21 +     f'"string"'
+22 | )
+23 | 
+24 | # Nested f-strings (Python 3.12+)
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:31:1
@@ -92,16 +84,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-28 28 | #   f'"foo" {"nested"}'
-29 29 | #
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31    |-f"\"foo\" {"foo"}"  # Q003
-   31 |+f'"foo" {"foo"}'  # Q003
-32 32 | f"\"foo\" {f"foo"}"  # Q003
-33 33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
-34 34 | 
+28 | #   f'"foo" {"nested"}'
+29 | #
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+   - f"\"foo\" {"foo"}"  # Q003
+31 + f'"foo" {"foo"}'  # Q003
+32 | f"\"foo\" {f"foo"}"  # Q003
+33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
+34 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:32:1
@@ -113,16 +103,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-29 29 | #
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31 31 | f"\"foo\" {"foo"}"  # Q003
-32    |-f"\"foo\" {f"foo"}"  # Q003
-   32 |+f'"foo" {f"foo"}'  # Q003
-33 33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
+29 | #
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+31 | f"\"foo\" {"foo"}"  # Q003
+   - f"\"foo\" {f"foo"}"  # Q003
+32 + f'"foo" {f"foo"}'  # Q003
+33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
+34 | 
+35 | f"normal {f"nested"} normal"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:33:1
@@ -135,16 +123,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 35 | f"normal {f"nested"} normal"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31 31 | f"\"foo\" {"foo"}"  # Q003
-32 32 | f"\"foo\" {f"foo"}"  # Q003
-33    |-f"\"foo\" {f"\"foo\""} \"\""  # Q003
-   33 |+f'"foo" {f"\"foo\""} ""'  # Q003
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\"normal\" {f"nested"} normal"  # Q003
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+31 | f"\"foo\" {"foo"}"  # Q003
+32 | f"\"foo\" {f"foo"}"  # Q003
+   - f"\"foo\" {f"\"foo\""} \"\""  # Q003
+33 + f'"foo" {f"\"foo\""} ""'  # Q003
+34 | 
+35 | f"normal {f"nested"} normal"
+36 | f"\"normal\" {f"nested"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:33:12
@@ -157,16 +143,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 35 | f"normal {f"nested"} normal"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31 31 | f"\"foo\" {"foo"}"  # Q003
-32 32 | f"\"foo\" {f"foo"}"  # Q003
-33    |-f"\"foo\" {f"\"foo\""} \"\""  # Q003
-   33 |+f"\"foo\" {f'"foo"'} \"\""  # Q003
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\"normal\" {f"nested"} normal"  # Q003
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+31 | f"\"foo\" {"foo"}"  # Q003
+32 | f"\"foo\" {f"foo"}"  # Q003
+   - f"\"foo\" {f"\"foo\""} \"\""  # Q003
+33 + f"\"foo\" {f'"foo"'} \"\""  # Q003
+34 | 
+35 | f"normal {f"nested"} normal"
+36 | f"\"normal\" {f"nested"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:36:1
@@ -178,16 +162,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-33 33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36    |-f"\"normal\" {f"nested"} normal"  # Q003
-   36 |+f'"normal" {f"nested"} normal'  # Q003
-37 37 | f"\"normal\" {f"nested"} 'single quotes'"
-38 38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-39 39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+33 | f"\"foo\" {f"\"foo\""} \"\""  # Q003
+34 | 
+35 | f"normal {f"nested"} normal"
+   - f"\"normal\" {f"nested"} normal"  # Q003
+36 + f'"normal" {f"nested"} normal'  # Q003
+37 | f"\"normal\" {f"nested"} 'single quotes'"
+38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:38:15
@@ -199,16 +181,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\"normal\" {f"nested"} normal"  # Q003
-37 37 | f"\"normal\" {f"nested"} 'single quotes'"
-38    |-f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-   38 |+f"\"normal\" {f'"nested" {"other"} normal'} 'single quotes'"  # Q003
-39 39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
-40 40 | 
-41 41 | 
+35 | f"normal {f"nested"} normal"
+36 | f"\"normal\" {f"nested"} normal"  # Q003
+37 | f"\"normal\" {f"nested"} 'single quotes'"
+   - f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+38 + f"\"normal\" {f'"nested" {"other"} normal'} 'single quotes'"  # Q003
+39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+40 | 
+41 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:39:1
@@ -219,16 +199,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-36 36 | f"\"normal\" {f"nested"} normal"  # Q003
-37 37 | f"\"normal\" {f"nested"} 'single quotes'"
-38 38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-39    |-f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
-   39 |+f'"normal" {f"\"nested\" {"other"} 'single quotes'"} normal'  # Q003
-40 40 | 
-41 41 | 
-42 42 | # Same as above, but with t-strings
+36 | f"\"normal\" {f"nested"} normal"  # Q003
+37 | f"\"normal\" {f"nested"} 'single quotes'"
+38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+   - f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+39 + f'"normal" {f"\"nested\" {"other"} 'single quotes'"} normal'  # Q003
+40 | 
+41 | 
+42 | # Same as above, but with t-strings
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:43:1
@@ -240,16 +218,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 45 | f'This is a "string"'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-40 40 | 
-41 41 | 
-42 42 | # Same as above, but with t-strings
-43    |-t"This is a \"string\""
-   43 |+t'This is a "string"'
-44 44 | t"'This' is a \"string\""
-45 45 | f'This is a "string"'
-46 46 | f'\'This\' is a "string"'
+40 | 
+41 | 
+42 | # Same as above, but with t-strings
+   - t"This is a \"string\""
+43 + t'This is a "string"'
+44 | t"'This' is a \"string\""
+45 | f'This is a "string"'
+46 | f'\'This\' is a "string"'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:51:5
@@ -262,16 +238,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 53 | t"\"foo\" {"foo"}"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-48 48 | fR"This is a \"string\""
-49 49 | foo = (
-50 50 |     t"This is a"
-51    |-    t"\"string\""
-   51 |+    t'"string"'
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
+48 | fR"This is a \"string\""
+49 | foo = (
+50 |     t"This is a"
+   -     t"\"string\""
+51 +     t'"string"'
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:53:1
@@ -284,16 +258,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-50 50 |     t"This is a"
-51 51 |     t"\"string\""
-52 52 | )
-53    |-t"\"foo\" {"foo"}"  # Q003
-   53 |+t'"foo" {"foo"}'  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
-55 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
-56 56 | 
+50 |     t"This is a"
+51 |     t"\"string\""
+52 | )
+   - t"\"foo\" {"foo"}"  # Q003
+53 + t'"foo" {"foo"}'  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
+55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
+56 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:54:1
@@ -305,16 +277,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-51 51 |     t"\"string\""
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54    |-t"\"foo\" {t"foo"}"  # Q003
-   54 |+t'"foo" {t"foo"}'  # Q003
-55 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
+51 |     t"\"string\""
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+   - t"\"foo\" {t"foo"}"  # Q003
+54 + t'"foo" {t"foo"}'  # Q003
+55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:55:1
@@ -327,16 +297,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 57 | t"normal {t"nested"} normal"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
-55    |-t"\"foo\" {t"\"foo\""} \"\""  # Q003
-   55 |+t'"foo" {t"\"foo\""} ""'  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
+   - t"\"foo\" {t"\"foo\""} \"\""  # Q003
+55 + t'"foo" {t"\"foo\""} ""'  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
+58 | t"\"normal\" {t"nested"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:55:12
@@ -349,16 +317,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 57 | t"normal {t"nested"} normal"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
-55    |-t"\"foo\" {t"\"foo\""} \"\""  # Q003
-   55 |+t"\"foo\" {t'"foo"'} \"\""  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
+   - t"\"foo\" {t"\"foo\""} \"\""  # Q003
+55 + t"\"foo\" {t'"foo"'} \"\""  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
+58 | t"\"normal\" {t"nested"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:58:1
@@ -370,16 +336,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-55 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
-58    |-t"\"normal\" {t"nested"} normal"  # Q003
-   58 |+t'"normal" {t"nested"} normal'  # Q003
-59 59 | t"\"normal\" {t"nested"} 'single quotes'"
-60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
+   - t"\"normal\" {t"nested"} normal"  # Q003
+58 + t'"normal" {t"nested"} normal'  # Q003
+59 | t"\"normal\" {t"nested"} 'single quotes'"
+60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:60:15
@@ -391,14 +355,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-57 57 | t"normal {t"nested"} normal"
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
-59 59 | t"\"normal\" {t"nested"} 'single quotes'"
-60    |-t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-   60 |+t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'"  # Q003
-61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+57 | t"normal {t"nested"} normal"
+58 | t"\"normal\" {t"nested"} normal"  # Q003
+59 | t"\"normal\" {t"nested"} 'single quotes'"
+   - t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+60 + t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'"  # Q003
+61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:61:1
@@ -409,10 +371,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
-59 59 | t"\"normal\" {t"nested"} 'single quotes'"
-60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-61    |-t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
-   61 |+t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal'  # Q003
+58 | t"\"normal\" {t"nested"} normal"  # Q003
+59 | t"\"normal\" {t"nested"} 'single quotes'"
+60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+   - t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+61 + t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal'  # Q003
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap
index a80c1353da..cca4d62c10 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap
@@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 3 | this_is_fine = 'This is a "string"'
   |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-1   |-this_should_raise_Q003 = "This is a \"string\""
-  1 |+this_should_raise_Q003 = 'This is a "string"'
-2 2 | this_is_fine = "'This' is a \"string\""
-3 3 | this_is_fine = 'This is a "string"'
-4 4 | this_is_fine = '\'This\' is a "string"'
+  - this_should_raise_Q003 = "This is a \"string\""
+1 + this_should_raise_Q003 = 'This is a "string"'
+2 | this_is_fine = "'This' is a \"string\""
+3 | this_is_fine = 'This is a "string"'
+4 | this_is_fine = '\'This\' is a "string"'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:9:5
@@ -28,16 +26,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 10 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-6  6  | this_is_fine = R"This is a \"string\""
-7  7  | this_should_raise = (
-8  8  |     "This is a"
-9     |-    "\"string\""
-   9  |+    '"string"'
-10 10 | )
-11 11 | 
-12 12 | # Same as above, but with f-strings
+6  | this_is_fine = R"This is a \"string\""
+7  | this_should_raise = (
+8  |     "This is a"
+   -     "\"string\""
+9  +     '"string"'
+10 | )
+11 | 
+12 | # Same as above, but with f-strings
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:13:1
@@ -49,16 +45,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 15 | f'This is a "string"'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-10 10 | )
-11 11 | 
-12 12 | # Same as above, but with f-strings
-13    |-f"This is a \"string\""
-   13 |+f'This is a "string"'
-14 14 | f"'This' is a \"string\""
-15 15 | f'This is a "string"'
-16 16 | f'\'This\' is a "string"'
+10 | )
+11 | 
+12 | # Same as above, but with f-strings
+   - f"This is a \"string\""
+13 + f'This is a "string"'
+14 | f"'This' is a \"string\""
+15 | f'This is a "string"'
+16 | f'\'This\' is a "string"'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:21:5
@@ -70,16 +64,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 22 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-18 18 | fR"This is a \"string\""
-19 19 | foo = (
-20 20 |     f"This is a"
-21    |-    f"\"string\""
-   21 |+    f'"string"'
-22 22 | )
-23 23 | 
-24 24 | # Nested f-strings (Python 3.12+)
+18 | fR"This is a \"string\""
+19 | foo = (
+20 |     f"This is a"
+   -     f"\"string\""
+21 +     f'"string"'
+22 | )
+23 | 
+24 | # Nested f-strings (Python 3.12+)
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:43:1
@@ -91,16 +83,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 45 | f'This is a "string"'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-40 40 | 
-41 41 | 
-42 42 | # Same as above, but with t-strings
-43    |-t"This is a \"string\""
-   43 |+t'This is a "string"'
-44 44 | t"'This' is a \"string\""
-45 45 | f'This is a "string"'
-46 46 | f'\'This\' is a "string"'
+40 | 
+41 | 
+42 | # Same as above, but with t-strings
+   - t"This is a \"string\""
+43 + t'This is a "string"'
+44 | t"'This' is a \"string\""
+45 | f'This is a "string"'
+46 | f'\'This\' is a "string"'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:51:5
@@ -113,16 +103,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 53 | t"\"foo\" {"foo"}"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-48 48 | fR"This is a \"string\""
-49 49 | foo = (
-50 50 |     t"This is a"
-51    |-    t"\"string\""
-   51 |+    t'"string"'
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
+48 | fR"This is a \"string\""
+49 | foo = (
+50 |     t"This is a"
+   -     t"\"string\""
+51 +     t'"string"'
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:53:1
@@ -135,16 +123,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-50 50 |     t"This is a"
-51 51 |     t"\"string\""
-52 52 | )
-53    |-t"\"foo\" {"foo"}"  # Q003
-   53 |+t'"foo" {"foo"}'  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
-55 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
-56 56 | 
+50 |     t"This is a"
+51 |     t"\"string\""
+52 | )
+   - t"\"foo\" {"foo"}"  # Q003
+53 + t'"foo" {"foo"}'  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
+55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
+56 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:54:1
@@ -156,16 +142,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-51 51 |     t"\"string\""
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54    |-t"\"foo\" {t"foo"}"  # Q003
-   54 |+t'"foo" {t"foo"}'  # Q003
-55 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
+51 |     t"\"string\""
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+   - t"\"foo\" {t"foo"}"  # Q003
+54 + t'"foo" {t"foo"}'  # Q003
+55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:55:1
@@ -178,16 +162,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 57 | t"normal {t"nested"} normal"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
-55    |-t"\"foo\" {t"\"foo\""} \"\""  # Q003
-   55 |+t'"foo" {t"\"foo\""} ""'  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
+   - t"\"foo\" {t"\"foo\""} \"\""  # Q003
+55 + t'"foo" {t"\"foo\""} ""'  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
+58 | t"\"normal\" {t"nested"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:55:12
@@ -200,16 +182,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 57 | t"normal {t"nested"} normal"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-52 52 | )
-53 53 | t"\"foo\" {"foo"}"  # Q003
-54 54 | t"\"foo\" {t"foo"}"  # Q003
-55    |-t"\"foo\" {t"\"foo\""} \"\""  # Q003
-   55 |+t"\"foo\" {t'"foo"'} \"\""  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
+52 | )
+53 | t"\"foo\" {"foo"}"  # Q003
+54 | t"\"foo\" {t"foo"}"  # Q003
+   - t"\"foo\" {t"\"foo\""} \"\""  # Q003
+55 + t"\"foo\" {t'"foo"'} \"\""  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
+58 | t"\"normal\" {t"nested"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:58:1
@@ -221,16 +201,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-55 55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
-56 56 | 
-57 57 | t"normal {t"nested"} normal"
-58    |-t"\"normal\" {t"nested"} normal"  # Q003
-   58 |+t'"normal" {t"nested"} normal'  # Q003
-59 59 | t"\"normal\" {t"nested"} 'single quotes'"
-60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+55 | t"\"foo\" {t"\"foo\""} \"\""  # Q003
+56 | 
+57 | t"normal {t"nested"} normal"
+   - t"\"normal\" {t"nested"} normal"  # Q003
+58 + t'"normal" {t"nested"} normal'  # Q003
+59 | t"\"normal\" {t"nested"} 'single quotes'"
+60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:60:15
@@ -242,14 +220,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-57 57 | t"normal {t"nested"} normal"
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
-59 59 | t"\"normal\" {t"nested"} 'single quotes'"
-60    |-t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-   60 |+t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'"  # Q003
-61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+57 | t"normal {t"nested"} normal"
+58 | t"\"normal\" {t"nested"} normal"  # Q003
+59 | t"\"normal\" {t"nested"} 'single quotes'"
+   - t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+60 + t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'"  # Q003
+61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> singles_escaped.py:61:1
@@ -260,10 +236,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-58 58 | t"\"normal\" {t"nested"} normal"  # Q003
-59 59 | t"\"normal\" {t"nested"} 'single quotes'"
-60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-61    |-t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
-   61 |+t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal'  # Q003
+58 | t"\"normal\" {t"nested"} normal"  # Q003
+59 | t"\"normal\" {t"nested"} 'single quotes'"
+60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
+   - t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
+61 + t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal'  # Q003
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap
index 01c794ca9c..01d927befa 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap
@@ -10,13 +10,11 @@ Q004 [*] Unnecessary escape on inner quote character
 3 | this_is_fine = 'This is a "string"'
   |
 help: Remove backslash
-
-ℹ Safe fix
-1   |-this_should_raise_Q004 = "This is a \'string\'"
-  1 |+this_should_raise_Q004 = "This is a 'string'"
-2 2 | this_should_raise_Q004 = "'This' is a \'string\'"
-3 3 | this_is_fine = 'This is a "string"'
-4 4 | this_is_fine = '\'This\' is a "string"'
+  - this_should_raise_Q004 = "This is a \'string\'"
+1 + this_should_raise_Q004 = "This is a 'string'"
+2 | this_should_raise_Q004 = "'This' is a \'string\'"
+3 | this_is_fine = 'This is a "string"'
+4 | this_is_fine = '\'This\' is a "string"'
 
 Q004 [*] Unnecessary escape on inner quote character
  --> singles_escaped_unnecessary.py:2:26
@@ -28,14 +26,12 @@ Q004 [*] Unnecessary escape on inner quote character
 4 | this_is_fine = '\'This\' is a "string"'
   |
 help: Remove backslash
-
-ℹ Safe fix
-1 1 | this_should_raise_Q004 = "This is a \'string\'"
-2   |-this_should_raise_Q004 = "'This' is a \'string\'"
-  2 |+this_should_raise_Q004 = "'This' is a 'string'"
-3 3 | this_is_fine = 'This is a "string"'
-4 4 | this_is_fine = '\'This\' is a "string"'
-5 5 | this_is_fine = r"This is a \'string\'"
+1 | this_should_raise_Q004 = "This is a \'string\'"
+  - this_should_raise_Q004 = "'This' is a \'string\'"
+2 + this_should_raise_Q004 = "'This' is a 'string'"
+3 | this_is_fine = 'This is a "string"'
+4 | this_is_fine = '\'This\' is a "string"'
+5 | this_is_fine = r"This is a \'string\'"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:9:5
@@ -47,16 +43,14 @@ Q004 [*] Unnecessary escape on inner quote character
 10 | )
    |
 help: Remove backslash
-
-ℹ Safe fix
-6  6  | this_is_fine = R"This is a \'string\'"
-7  7  | this_should_raise_Q004 = (
-8  8  |     "This is a"
-9     |-    "\'string\'"
-   9  |+    "'string'"
-10 10 | )
-11 11 | 
-12 12 | # Same as above, but with f-strings
+6  | this_is_fine = R"This is a \'string\'"
+7  | this_should_raise_Q004 = (
+8  |     "This is a"
+   -     "\'string\'"
+9  +     "'string'"
+10 | )
+11 | 
+12 | # Same as above, but with f-strings
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:13:1
@@ -68,16 +62,14 @@ Q004 [*] Unnecessary escape on inner quote character
 15 | f'This is a "string"'
    |
 help: Remove backslash
-
-ℹ Safe fix
-10 10 | )
-11 11 | 
-12 12 | # Same as above, but with f-strings
-13    |-f"This is a \'string\'"  # Q004
-   13 |+f"This is a 'string'"  # Q004
-14 14 | f"'This' is a \'string\'"  # Q004
-15 15 | f'This is a "string"'
-16 16 | f'\'This\' is a "string"'
+10 | )
+11 | 
+12 | # Same as above, but with f-strings
+   - f"This is a \'string\'"  # Q004
+13 + f"This is a 'string'"  # Q004
+14 | f"'This' is a \'string\'"  # Q004
+15 | f'This is a "string"'
+16 | f'\'This\' is a "string"'
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:14:1
@@ -90,16 +82,14 @@ Q004 [*] Unnecessary escape on inner quote character
 16 | f'\'This\' is a "string"'
    |
 help: Remove backslash
-
-ℹ Safe fix
-11 11 | 
-12 12 | # Same as above, but with f-strings
-13 13 | f"This is a \'string\'"  # Q004
-14    |-f"'This' is a \'string\'"  # Q004
-   14 |+f"'This' is a 'string'"  # Q004
-15 15 | f'This is a "string"'
-16 16 | f'\'This\' is a "string"'
-17 17 | fr"This is a \'string\'"
+11 | 
+12 | # Same as above, but with f-strings
+13 | f"This is a \'string\'"  # Q004
+   - f"'This' is a \'string\'"  # Q004
+14 + f"'This' is a 'string'"  # Q004
+15 | f'This is a "string"'
+16 | f'\'This\' is a "string"'
+17 | fr"This is a \'string\'"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:21:5
@@ -111,16 +101,14 @@ Q004 [*] Unnecessary escape on inner quote character
 22 | )
    |
 help: Remove backslash
-
-ℹ Safe fix
-18 18 | fR"This is a \'string\'"
-19 19 | this_should_raise_Q004 = (
-20 20 |     f"This is a"
-21    |-    f"\'string\'"  # Q004
-   21 |+    f"'string'"  # Q004
-22 22 | )
-23 23 | 
-24 24 | # Nested f-strings (Python 3.12+)
+18 | fR"This is a \'string\'"
+19 | this_should_raise_Q004 = (
+20 |     f"This is a"
+   -     f"\'string\'"  # Q004
+21 +     f"'string'"  # Q004
+22 | )
+23 | 
+24 | # Nested f-strings (Python 3.12+)
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:31:1
@@ -133,16 +121,14 @@ Q004 [*] Unnecessary escape on inner quote character
 33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-28 28 | #   f'"foo" {"nested"}'
-29 29 | #
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31    |-f"\'foo\' {"foo"}"  # Q004
-   31 |+f"'foo' {"foo"}"  # Q004
-32 32 | f"\'foo\' {f"foo"}"  # Q004
-33 33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
-34 34 | 
+28 | #   f'"foo" {"nested"}'
+29 | #
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+   - f"\'foo\' {"foo"}"  # Q004
+31 + f"'foo' {"foo"}"  # Q004
+32 | f"\'foo\' {f"foo"}"  # Q004
+33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
+34 | 
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:32:1
@@ -154,16 +140,14 @@ Q004 [*] Unnecessary escape on inner quote character
 33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-29 29 | #
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31 31 | f"\'foo\' {"foo"}"  # Q004
-32    |-f"\'foo\' {f"foo"}"  # Q004
-   32 |+f"'foo' {f"foo"}"  # Q004
-33 33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
+29 | #
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+31 | f"\'foo\' {"foo"}"  # Q004
+   - f"\'foo\' {f"foo"}"  # Q004
+32 + f"'foo' {f"foo"}"  # Q004
+33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
+34 | 
+35 | f"normal {f"nested"} normal"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:33:1
@@ -176,16 +160,14 @@ Q004 [*] Unnecessary escape on inner quote character
 35 | f"normal {f"nested"} normal"
    |
 help: Remove backslash
-
-ℹ Safe fix
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31 31 | f"\'foo\' {"foo"}"  # Q004
-32 32 | f"\'foo\' {f"foo"}"  # Q004
-33    |-f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
-   33 |+f"'foo' {f"\'foo\'"} ''"  # Q004
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+31 | f"\'foo\' {"foo"}"  # Q004
+32 | f"\'foo\' {f"foo"}"  # Q004
+   - f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
+33 + f"'foo' {f"\'foo\'"} ''"  # Q004
+34 | 
+35 | f"normal {f"nested"} normal"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:33:12
@@ -198,16 +180,14 @@ Q004 [*] Unnecessary escape on inner quote character
 35 | f"normal {f"nested"} normal"
    |
 help: Remove backslash
-
-ℹ Safe fix
-30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-31 31 | f"\'foo\' {"foo"}"  # Q004
-32 32 | f"\'foo\' {f"foo"}"  # Q004
-33    |-f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
-   33 |+f"\'foo\' {f"'foo'"} \'\'"  # Q004
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
+30 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+31 | f"\'foo\' {"foo"}"  # Q004
+32 | f"\'foo\' {f"foo"}"  # Q004
+   - f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
+33 + f"\'foo\' {f"'foo'"} \'\'"  # Q004
+34 | 
+35 | f"normal {f"nested"} normal"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:36:1
@@ -219,16 +199,14 @@ Q004 [*] Unnecessary escape on inner quote character
 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-33 33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36    |-f"\'normal\' {f"nested"} normal"  # Q004
-   36 |+f"'normal' {f"nested"} normal"  # Q004
-37 37 | f"\'normal\' {f"nested"} 'single quotes'"
-38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+33 | f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
+34 | 
+35 | f"normal {f"nested"} normal"
+   - f"\'normal\' {f"nested"} normal"  # Q004
+36 + f"'normal' {f"nested"} normal"  # Q004
+37 | f"\'normal\' {f"nested"} 'single quotes'"
+38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:37:1
@@ -241,16 +219,14 @@ Q004 [*] Unnecessary escape on inner quote character
 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-34 34 | 
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
-37    |-f"\'normal\' {f"nested"} 'single quotes'"
-   37 |+f"'normal' {f"nested"} 'single quotes'"
-38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-40 40 | 
+34 | 
+35 | f"normal {f"nested"} normal"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
+   - f"\'normal\' {f"nested"} 'single quotes'"
+37 + f"'normal' {f"nested"} 'single quotes'"
+38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+40 | 
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:38:1
@@ -262,16 +238,14 @@ Q004 [*] Unnecessary escape on inner quote character
 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
-37 37 | f"\'normal\' {f"nested"} 'single quotes'"
-38    |-f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-   38 |+f"'normal' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-40 40 | 
-41 41 | # Make sure we do not unescape quotes
+35 | f"normal {f"nested"} normal"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
+37 | f"\'normal\' {f"nested"} 'single quotes'"
+   - f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+38 + f"'normal' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+40 | 
+41 | # Make sure we do not unescape quotes
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:38:15
@@ -283,16 +257,14 @@ Q004 [*] Unnecessary escape on inner quote character
 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-35 35 | f"normal {f"nested"} normal"
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
-37 37 | f"\'normal\' {f"nested"} 'single quotes'"
-38    |-f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-   38 |+f"\'normal\' {f"'nested' {"other"} normal"} 'single quotes'"  # Q004
-39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-40 40 | 
-41 41 | # Make sure we do not unescape quotes
+35 | f"normal {f"nested"} normal"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
+37 | f"\'normal\' {f"nested"} 'single quotes'"
+   - f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+38 + f"\'normal\' {f"'nested' {"other"} normal"} 'single quotes'"  # Q004
+39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+40 | 
+41 | # Make sure we do not unescape quotes
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:39:1
@@ -305,16 +277,14 @@ Q004 [*] Unnecessary escape on inner quote character
 41 | # Make sure we do not unescape quotes
    |
 help: Remove backslash
-
-ℹ Safe fix
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
-37 37 | f"\'normal\' {f"nested"} 'single quotes'"
-38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-39    |-f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-   39 |+f"'normal' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-40 40 | 
-41 41 | # Make sure we do not unescape quotes
-42 42 | this_is_fine = "This is an \\'escaped\\' quote"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
+37 | f"\'normal\' {f"nested"} 'single quotes'"
+38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+   - f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+39 + f"'normal' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+40 | 
+41 | # Make sure we do not unescape quotes
+42 | this_is_fine = "This is an \\'escaped\\' quote"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:39:15
@@ -327,16 +297,14 @@ Q004 [*] Unnecessary escape on inner quote character
 41 | # Make sure we do not unescape quotes
    |
 help: Remove backslash
-
-ℹ Safe fix
-36 36 | f"\'normal\' {f"nested"} normal"  # Q004
-37 37 | f"\'normal\' {f"nested"} 'single quotes'"
-38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-39    |-f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-   39 |+f"\'normal\' {f"'nested' {"other"} 'single quotes'"} normal"  # Q004
-40 40 | 
-41 41 | # Make sure we do not unescape quotes
-42 42 | this_is_fine = "This is an \\'escaped\\' quote"
+36 | f"\'normal\' {f"nested"} normal"  # Q004
+37 | f"\'normal\' {f"nested"} 'single quotes'"
+38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
+   - f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
+39 + f"\'normal\' {f"'nested' {"other"} 'single quotes'"} normal"  # Q004
+40 | 
+41 | # Make sure we do not unescape quotes
+42 | this_is_fine = "This is an \\'escaped\\' quote"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:43:26
@@ -349,16 +317,14 @@ Q004 [*] Unnecessary escape on inner quote character
 45 | # Invalid escapes in bytestrings are also triggered:
    |
 help: Remove backslash
-
-ℹ Safe fix
-40 40 | 
-41 41 | # Make sure we do not unescape quotes
-42 42 | this_is_fine = "This is an \\'escaped\\' quote"
-43    |-this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"  # Q004
-   43 |+this_should_raise_Q004 = "This is an \\'escaped\\' quote with an extra backslash"  # Q004
-44 44 | 
-45 45 | # Invalid escapes in bytestrings are also triggered:
-46 46 | x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
+40 | 
+41 | # Make sure we do not unescape quotes
+42 | this_is_fine = "This is an \\'escaped\\' quote"
+   - this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"  # Q004
+43 + this_should_raise_Q004 = "This is an \\'escaped\\' quote with an extra backslash"  # Q004
+44 | 
+45 | # Invalid escapes in bytestrings are also triggered:
+46 | x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> singles_escaped_unnecessary.py:46:5
@@ -368,10 +334,8 @@ Q004 [*] Unnecessary escape on inner quote character
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove backslash
-
-ℹ Safe fix
-43 43 | this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"  # Q004
-44 44 | 
-45 45 | # Invalid escapes in bytestrings are also triggered:
-46    |-x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
-   46 |+x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
+43 | this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"  # Q004
+44 | 
+45 | # Invalid escapes in bytestrings are also triggered:
+   - x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
+46 + x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap
index cde1de341b..44bf434055 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap
@@ -11,14 +11,12 @@ Q000 [*] Single quotes found but double quotes preferred
 4 |     'not'
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | x = (
-2   |-    'This'
-  2 |+    "This"
-3 3 |     'is'
-4 4 |     'not'
-5 5 | )
+1 | x = (
+  -     'This'
+2 +     "This"
+3 |     'is'
+4 |     'not'
+5 | )
 
 Q000 [*] Single quotes found but double quotes preferred
  --> singles_implicit.py:3:5
@@ -31,15 +29,13 @@ Q000 [*] Single quotes found but double quotes preferred
 5 | )
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | x = (
-2 2 |     'This'
-3   |-    'is'
-  3 |+    "is"
-4 4 |     'not'
-5 5 | )
-6 6 | 
+1 | x = (
+2 |     'This'
+  -     'is'
+3 +     "is"
+4 |     'not'
+5 | )
+6 | 
 
 Q000 [*] Single quotes found but double quotes preferred
  --> singles_implicit.py:4:5
@@ -51,16 +47,14 @@ Q000 [*] Single quotes found but double quotes preferred
 5 | )
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | x = (
-2 2 |     'This'
-3 3 |     'is'
-4   |-    'not'
-  4 |+    "not"
-5 5 | )
-6 6 | 
-7 7 | x = (
+1 | x = (
+2 |     'This'
+3 |     'is'
+  -     'not'
+4 +     "not"
+5 | )
+6 | 
+7 | x = (
 
 Q000 [*] Single quotes found but double quotes preferred
   --> singles_implicit.py:8:5
@@ -72,16 +66,14 @@ Q000 [*] Single quotes found but double quotes preferred
 10 |     'not'
    |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-5 5 | )
-6 6 | 
-7 7 | x = (
-8   |-    'This' \
-  8 |+    "This" \
-9 9 |     'is' \
-10 10 |     'not'
-11 11 | )
+5  | )
+6  | 
+7  | x = (
+   -     'This' \
+8  +     "This" \
+9  |     'is' \
+10 |     'not'
+11 | )
 
 Q000 [*] Single quotes found but double quotes preferred
   --> singles_implicit.py:9:5
@@ -94,16 +86,14 @@ Q000 [*] Single quotes found but double quotes preferred
 11 | )
    |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-6  6  | 
-7  7  | x = (
-8  8  |     'This' \
-9     |-    'is' \
-   9  |+    "is" \
-10 10 |     'not'
-11 11 | )
-12 12 | 
+6  | 
+7  | x = (
+8  |     'This' \
+   -     'is' \
+9  +     "is" \
+10 |     'not'
+11 | )
+12 | 
 
 Q000 [*] Single quotes found but double quotes preferred
   --> singles_implicit.py:10:5
@@ -115,16 +105,14 @@ Q000 [*] Single quotes found but double quotes preferred
 11 | )
    |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-7  7  | x = (
-8  8  |     'This' \
-9  9  |     'is' \
-10    |-    'not'
-   10 |+    "not"
-11 11 | )
-12 12 | 
-13 13 | x = (
+7  | x = (
+8  |     'This' \
+9  |     'is' \
+   -     'not'
+10 +     "not"
+11 | )
+12 | 
+13 | x = (
 
 Q000 [*] Single quotes found but double quotes preferred
   --> singles_implicit.py:27:1
@@ -135,10 +123,8 @@ Q000 [*] Single quotes found but double quotes preferred
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-24 24 | 
-25 25 | if True:
-26 26 |     'This can use "single" quotes'
-27    |-'But this needs to be changed'
-   27 |+"But this needs to be changed"
+24 | 
+25 | if True:
+26 |     'This can use "single" quotes'
+   - 'But this needs to be changed'
+27 + "But this needs to be changed"
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap
index 81c1440f4c..4721f42264 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap
@@ -13,13 +13,11 @@ Q001 [*] Single quote multiline found but double quotes preferred
 5 |   s = """ This 'should'
   |
 help: Replace single multiline quotes with double quotes
-
-ℹ Safe fix
-1   |-s = ''' This 'should'
-  1 |+s = """ This 'should'
-2 2 | be
-3   |-'linted' '''
-  3 |+'linted' """
-4 4 | 
-5 5 | s = """ This 'should'
-6 6 | 'not' be
+  - s = ''' This 'should'
+1 + s = """ This 'should'
+2 | be
+  - 'linted' '''
+3 + 'linted' """
+4 | 
+5 | s = """ This 'should'
+6 | 'not' be
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap
index 84cb0501e2..d667e33863 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap
@@ -18,11 +18,9 @@ Q000 [*] Single quotes found but double quotes preferred
 2 | s = 'Do not'" start with empty string" ' and lint docstring safely'
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1   |-s = ''"Start with empty string" ' and lint docstring safely'
-  1 |+s = ''"Start with empty string" " and lint docstring safely"
-2 2 | s = 'Do not'" start with empty string" ' and lint docstring safely'
+  - s = ''"Start with empty string" ' and lint docstring safely'
+1 + s = ''"Start with empty string" " and lint docstring safely"
+2 | s = 'Do not'" start with empty string" ' and lint docstring safely'
 
 Q000 [*] Single quotes found but double quotes preferred
  --> singles_would_be_triple_quotes.py:2:5
@@ -32,11 +30,9 @@ Q000 [*] Single quotes found but double quotes preferred
   |     ^^^^^^^^
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | s = ''"Start with empty string" ' and lint docstring safely'
-2   |-s = 'Do not'" start with empty string" ' and lint docstring safely'
-  2 |+s = "Do not"" start with empty string" ' and lint docstring safely'
+1 | s = ''"Start with empty string" ' and lint docstring safely'
+  - s = 'Do not'" start with empty string" ' and lint docstring safely'
+2 + s = "Do not"" start with empty string" ' and lint docstring safely'
 
 Q000 [*] Single quotes found but double quotes preferred
  --> singles_would_be_triple_quotes.py:2:40
@@ -46,8 +42,6 @@ Q000 [*] Single quotes found but double quotes preferred
   |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace single quotes with double quotes
-
-ℹ Safe fix
-1 1 | s = ''"Start with empty string" ' and lint docstring safely'
-2   |-s = 'Do not'" start with empty string" ' and lint docstring safely'
-  2 |+s = 'Do not'" start with empty string" " and lint docstring safely"
+1 | s = ''"Start with empty string" ' and lint docstring safely'
+  - s = 'Do not'" start with empty string" ' and lint docstring safely'
+2 + s = 'Do not'" start with empty string" " and lint docstring safely"
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap
index 655e2a0943..180e3687f5 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap
@@ -10,13 +10,11 @@ Q000 [*] Double quotes found but single quotes preferred
 3 | this_should_be_linted = f"double quote string"
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1   |-this_should_be_linted = "double quote string"
-  1 |+this_should_be_linted = 'double quote string'
-2 2 | this_should_be_linted = u"double quote string"
-3 3 | this_should_be_linted = f"double quote string"
-4 4 | this_should_be_linted = f"double {'quote'} string"
+  - this_should_be_linted = "double quote string"
+1 + this_should_be_linted = 'double quote string'
+2 | this_should_be_linted = u"double quote string"
+3 | this_should_be_linted = f"double quote string"
+4 | this_should_be_linted = f"double {'quote'} string"
 
 Q000 [*] Double quotes found but single quotes preferred
  --> doubles.py:2:25
@@ -28,13 +26,11 @@ Q000 [*] Double quotes found but single quotes preferred
 4 | this_should_be_linted = f"double {'quote'} string"
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | this_should_be_linted = "double quote string"
-2   |-this_should_be_linted = u"double quote string"
-  2 |+this_should_be_linted = u'double quote string'
-3 3 | this_should_be_linted = f"double quote string"
-4 4 | this_should_be_linted = f"double {'quote'} string"
+1 | this_should_be_linted = "double quote string"
+  - this_should_be_linted = u"double quote string"
+2 + this_should_be_linted = u'double quote string'
+3 | this_should_be_linted = f"double quote string"
+4 | this_should_be_linted = f"double {'quote'} string"
 
 Q000 [*] Double quotes found but single quotes preferred
  --> doubles.py:3:25
@@ -46,10 +42,8 @@ Q000 [*] Double quotes found but single quotes preferred
 4 | this_should_be_linted = f"double {'quote'} string"
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | this_should_be_linted = "double quote string"
-2 2 | this_should_be_linted = u"double quote string"
-3   |-this_should_be_linted = f"double quote string"
-  3 |+this_should_be_linted = f'double quote string'
-4 4 | this_should_be_linted = f"double {'quote'} string"
+1 | this_should_be_linted = "double quote string"
+2 | this_should_be_linted = u"double quote string"
+  - this_should_be_linted = f"double quote string"
+3 + this_should_be_linted = f'double quote string'
+4 | this_should_be_linted = f"double {'quote'} string"
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap
index 39a71b82a2..c45230db10 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap
@@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 3 | this_is_fine = '"This" is a \'string\''
   |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-1   |-this_should_raise_Q003 = 'This is a \'string\''
-  1 |+this_should_raise_Q003 = "This is a 'string'"
-2 2 | this_should_raise_Q003 = 'This is \\ a \\\'string\''
-3 3 | this_is_fine = '"This" is a \'string\''
-4 4 | this_is_fine = "This is a 'string'"
+  - this_should_raise_Q003 = 'This is a \'string\''
+1 + this_should_raise_Q003 = "This is a 'string'"
+2 | this_should_raise_Q003 = 'This is \\ a \\\'string\''
+3 | this_is_fine = '"This" is a \'string\''
+4 | this_is_fine = "This is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
  --> doubles_escaped.py:2:26
@@ -28,14 +26,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 4 | this_is_fine = "This is a 'string'"
   |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-1 1 | this_should_raise_Q003 = 'This is a \'string\''
-2   |-this_should_raise_Q003 = 'This is \\ a \\\'string\''
-  2 |+this_should_raise_Q003 = "This is \\ a \\'string'"
-3 3 | this_is_fine = '"This" is a \'string\''
-4 4 | this_is_fine = "This is a 'string'"
-5 5 | this_is_fine = "\"This\" is a 'string'"
+1 | this_should_raise_Q003 = 'This is a \'string\''
+  - this_should_raise_Q003 = 'This is \\ a \\\'string\''
+2 + this_should_raise_Q003 = "This is \\ a \\'string'"
+3 | this_is_fine = '"This" is a \'string\''
+4 | this_is_fine = "This is a 'string'"
+5 | this_is_fine = "\"This\" is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:10:5
@@ -47,16 +43,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 11 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-7  7  | this_is_fine = R'This is a \'string\''
-8  8  | this_should_raise = (
-9  9  |     'This is a'
-10    |-    '\'string\''
-   10 |+    "'string'"
-11 11 | )
-12 12 | 
-13 13 | # Same as above, but with f-strings
+7  | this_is_fine = R'This is a \'string\''
+8  | this_should_raise = (
+9  |     'This is a'
+   -     '\'string\''
+10 +     "'string'"
+11 | )
+12 | 
+13 | # Same as above, but with f-strings
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:14:1
@@ -68,16 +62,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 16 | f'"This" is a \'string\''
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-11 11 | )
-12 12 | 
-13 13 | # Same as above, but with f-strings
-14    |-f'This is a \'string\''  # Q003
-   14 |+f"This is a 'string'"  # Q003
-15 15 | f'This is \\ a \\\'string\''  # Q003
-16 16 | f'"This" is a \'string\''
-17 17 | f"This is a 'string'"
+11 | )
+12 | 
+13 | # Same as above, but with f-strings
+   - f'This is a \'string\''  # Q003
+14 + f"This is a 'string'"  # Q003
+15 | f'This is \\ a \\\'string\''  # Q003
+16 | f'"This" is a \'string\''
+17 | f"This is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:15:1
@@ -90,16 +82,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 17 | f"This is a 'string'"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-12 12 | 
-13 13 | # Same as above, but with f-strings
-14 14 | f'This is a \'string\''  # Q003
-15    |-f'This is \\ a \\\'string\''  # Q003
-   15 |+f"This is \\ a \\'string'"  # Q003
-16 16 | f'"This" is a \'string\''
-17 17 | f"This is a 'string'"
-18 18 | f"\"This\" is a 'string'"
+12 | 
+13 | # Same as above, but with f-strings
+14 | f'This is a \'string\''  # Q003
+   - f'This is \\ a \\\'string\''  # Q003
+15 + f"This is \\ a \\'string'"  # Q003
+16 | f'"This" is a \'string\''
+17 | f"This is a 'string'"
+18 | f"\"This\" is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:23:5
@@ -111,16 +101,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 24 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-20 20 | fR'This is a \'string\''
-21 21 | foo = (
-22 22 |     f'This is a'
-23    |-    f'\'string\''  # Q003
-   23 |+    f"'string'"  # Q003
-24 24 | )
-25 25 | 
-26 26 | # Nested f-strings (Python 3.12+)
+20 | fR'This is a \'string\''
+21 | foo = (
+22 |     f'This is a'
+   -     f'\'string\''  # Q003
+23 +     f"'string'"  # Q003
+24 | )
+25 | 
+26 | # Nested f-strings (Python 3.12+)
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:33:1
@@ -133,16 +121,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-30 30 | #   f"'foo' {'nested'}"
-31 31 | #
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33    |-f'\'foo\' {'nested'}'  # Q003
-   33 |+f"'foo' {'nested'}"  # Q003
-34 34 | f'\'foo\' {f'nested'}'  # Q003
-35 35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
-36 36 | 
+30 | #   f"'foo' {'nested'}"
+31 | #
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+   - f'\'foo\' {'nested'}'  # Q003
+33 + f"'foo' {'nested'}"  # Q003
+34 | f'\'foo\' {f'nested'}'  # Q003
+35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
+36 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:34:1
@@ -154,16 +140,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-31 31 | #
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33 33 | f'\'foo\' {'nested'}'  # Q003
-34    |-f'\'foo\' {f'nested'}'  # Q003
-   34 |+f"'foo' {f'nested'}"  # Q003
-35 35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
+31 | #
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+33 | f'\'foo\' {'nested'}'  # Q003
+   - f'\'foo\' {f'nested'}'  # Q003
+34 + f"'foo' {f'nested'}"  # Q003
+35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
+36 | 
+37 | f'normal {f'nested'} normal'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:35:1
@@ -176,16 +160,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 37 | f'normal {f'nested'} normal'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33 33 | f'\'foo\' {'nested'}'  # Q003
-34 34 | f'\'foo\' {f'nested'}'  # Q003
-35    |-f'\'foo\' {f'\'nested\''} \'\''  # Q003
-   35 |+f"'foo' {f'\'nested\''} ''"  # Q003
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\'normal\' {f'nested'} normal'  # Q003
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+33 | f'\'foo\' {'nested'}'  # Q003
+34 | f'\'foo\' {f'nested'}'  # Q003
+   - f'\'foo\' {f'\'nested\''} \'\''  # Q003
+35 + f"'foo' {f'\'nested\''} ''"  # Q003
+36 | 
+37 | f'normal {f'nested'} normal'
+38 | f'\'normal\' {f'nested'} normal'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:35:12
@@ -198,16 +180,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 37 | f'normal {f'nested'} normal'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33 33 | f'\'foo\' {'nested'}'  # Q003
-34 34 | f'\'foo\' {f'nested'}'  # Q003
-35    |-f'\'foo\' {f'\'nested\''} \'\''  # Q003
-   35 |+f'\'foo\' {f"'nested'"} \'\''  # Q003
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\'normal\' {f'nested'} normal'  # Q003
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+33 | f'\'foo\' {'nested'}'  # Q003
+34 | f'\'foo\' {f'nested'}'  # Q003
+   - f'\'foo\' {f'\'nested\''} \'\''  # Q003
+35 + f'\'foo\' {f"'nested'"} \'\''  # Q003
+36 | 
+37 | f'normal {f'nested'} normal'
+38 | f'\'normal\' {f'nested'} normal'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:38:1
@@ -219,16 +199,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-35 35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38    |-f'\'normal\' {f'nested'} normal'  # Q003
-   38 |+f"'normal' {f'nested'} normal"  # Q003
-39 39 | f'\'normal\' {f'nested'} "double quotes"'
-40 40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-41 41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+35 | f'\'foo\' {f'\'nested\''} \'\''  # Q003
+36 | 
+37 | f'normal {f'nested'} normal'
+   - f'\'normal\' {f'nested'} normal'  # Q003
+38 + f"'normal' {f'nested'} normal"  # Q003
+39 | f'\'normal\' {f'nested'} "double quotes"'
+40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:40:15
@@ -240,16 +218,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\'normal\' {f'nested'} normal'  # Q003
-39 39 | f'\'normal\' {f'nested'} "double quotes"'
-40    |-f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-   40 |+f'\'normal\' {f"'nested' {'other'} normal"} "double quotes"'  # Q003
-41 41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
-42 42 | 
-43 43 | 
+37 | f'normal {f'nested'} normal'
+38 | f'\'normal\' {f'nested'} normal'  # Q003
+39 | f'\'normal\' {f'nested'} "double quotes"'
+   - f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+40 + f'\'normal\' {f"'nested' {'other'} normal"} "double quotes"'  # Q003
+41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+42 | 
+43 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:41:1
@@ -260,16 +236,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-38 38 | f'\'normal\' {f'nested'} normal'  # Q003
-39 39 | f'\'normal\' {f'nested'} "double quotes"'
-40 40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-41    |-f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
-   41 |+f"'normal' {f'\'nested\' {'other'} "double quotes"'} normal"  # Q00l
-42 42 | 
-43 43 | 
-44 44 | 
+38 | f'\'normal\' {f'nested'} normal'  # Q003
+39 | f'\'normal\' {f'nested'} "double quotes"'
+40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+   - f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+41 + f"'normal' {f'\'nested\' {'other'} "double quotes"'} normal"  # Q00l
+42 | 
+43 | 
+44 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:46:1
@@ -281,16 +255,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 48 | t'"This" is a \'string\''
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-43 43 | 
-44 44 | 
-45 45 | # Same as above, but with t-strings
-46    |-t'This is a \'string\''  # Q003
-   46 |+t"This is a 'string'"  # Q003
-47 47 | t'This is \\ a \\\'string\''  # Q003
-48 48 | t'"This" is a \'string\''
-49 49 | f"This is a 'string'"
+43 | 
+44 | 
+45 | # Same as above, but with t-strings
+   - t'This is a \'string\''  # Q003
+46 + t"This is a 'string'"  # Q003
+47 | t'This is \\ a \\\'string\''  # Q003
+48 | t'"This" is a \'string\''
+49 | f"This is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:47:1
@@ -303,16 +275,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 49 | f"This is a 'string'"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-44 44 | 
-45 45 | # Same as above, but with t-strings
-46 46 | t'This is a \'string\''  # Q003
-47    |-t'This is \\ a \\\'string\''  # Q003
-   47 |+t"This is \\ a \\'string'"  # Q003
-48 48 | t'"This" is a \'string\''
-49 49 | f"This is a 'string'"
-50 50 | f"\"This\" is a 'string'"
+44 | 
+45 | # Same as above, but with t-strings
+46 | t'This is a \'string\''  # Q003
+   - t'This is \\ a \\\'string\''  # Q003
+47 + t"This is \\ a \\'string'"  # Q003
+48 | t'"This" is a \'string\''
+49 | f"This is a 'string'"
+50 | f"\"This\" is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:55:5
@@ -325,16 +295,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 57 | t'\'foo\' {'nested'}'  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-52 52 | fR'This is a \'string\''
-53 53 | foo = (
-54 54 |     t'This is a'
-55    |-    t'\'string\''  # Q003
-   55 |+    t"'string'"  # Q003
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
+52 | fR'This is a \'string\''
+53 | foo = (
+54 |     t'This is a'
+   -     t'\'string\''  # Q003
+55 +     t"'string'"  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:57:1
@@ -347,16 +315,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-54 54 |     t'This is a'
-55 55 |     t'\'string\''  # Q003
-56 56 | )
-57    |-t'\'foo\' {'nested'}'  # Q003
-   57 |+t"'foo' {'nested'}"  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
-59 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
-60 60 | 
+54 |     t'This is a'
+55 |     t'\'string\''  # Q003
+56 | )
+   - t'\'foo\' {'nested'}'  # Q003
+57 + t"'foo' {'nested'}"  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
+59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
+60 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:58:1
@@ -368,16 +334,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-55 55 |     t'\'string\''  # Q003
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58    |-t'\'foo\' {t'nested'}'  # Q003
-   58 |+t"'foo' {t'nested'}"  # Q003
-59 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
+55 |     t'\'string\''  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+   - t'\'foo\' {t'nested'}'  # Q003
+58 + t"'foo' {t'nested'}"  # Q003
+59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:59:1
@@ -390,16 +354,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 61 | t'normal {t'nested'} normal'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
-59    |-t'\'foo\' {t'\'nested\''} \'\''  # Q003
-   59 |+t"'foo' {t'\'nested\''} ''"  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
+   - t'\'foo\' {t'\'nested\''} \'\''  # Q003
+59 + t"'foo' {t'\'nested\''} ''"  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
+62 | t'\'normal\' {t'nested'} normal'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:59:12
@@ -412,16 +374,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 61 | t'normal {t'nested'} normal'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
-59    |-t'\'foo\' {t'\'nested\''} \'\''  # Q003
-   59 |+t'\'foo\' {t"'nested'"} \'\''  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
+   - t'\'foo\' {t'\'nested\''} \'\''  # Q003
+59 + t'\'foo\' {t"'nested'"} \'\''  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
+62 | t'\'normal\' {t'nested'} normal'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:62:1
@@ -433,16 +393,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-59 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
-62    |-t'\'normal\' {t'nested'} normal'  # Q003
-   62 |+t"'normal' {t'nested'} normal"  # Q003
-63 63 | t'\'normal\' {t'nested'} "double quotes"'
-64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
+   - t'\'normal\' {t'nested'} normal'  # Q003
+62 + t"'normal' {t'nested'} normal"  # Q003
+63 | t'\'normal\' {t'nested'} "double quotes"'
+64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:64:15
@@ -454,14 +412,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-61 61 | t'normal {t'nested'} normal'
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
-63 63 | t'\'normal\' {t'nested'} "double quotes"'
-64    |-t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-   64 |+t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"'  # Q003
-65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+61 | t'normal {t'nested'} normal'
+62 | t'\'normal\' {t'nested'} normal'  # Q003
+63 | t'\'normal\' {t'nested'} "double quotes"'
+   - t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+64 + t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"'  # Q003
+65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:65:1
@@ -472,10 +428,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
-63 63 | t'\'normal\' {t'nested'} "double quotes"'
-64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-65    |-t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
-   65 |+t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal"  # Q00l
+62 | t'\'normal\' {t'nested'} normal'  # Q003
+63 | t'\'normal\' {t'nested'} "double quotes"'
+64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+   - t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+65 + t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal"  # Q00l
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap
index 57bcec82b5..a965c9b855 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap
@@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 3 | this_is_fine = '"This" is a \'string\''
   |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-1   |-this_should_raise_Q003 = 'This is a \'string\''
-  1 |+this_should_raise_Q003 = "This is a 'string'"
-2 2 | this_should_raise_Q003 = 'This is \\ a \\\'string\''
-3 3 | this_is_fine = '"This" is a \'string\''
-4 4 | this_is_fine = "This is a 'string'"
+  - this_should_raise_Q003 = 'This is a \'string\''
+1 + this_should_raise_Q003 = "This is a 'string'"
+2 | this_should_raise_Q003 = 'This is \\ a \\\'string\''
+3 | this_is_fine = '"This" is a \'string\''
+4 | this_is_fine = "This is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
  --> doubles_escaped.py:2:26
@@ -28,14 +26,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 4 | this_is_fine = "This is a 'string'"
   |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-1 1 | this_should_raise_Q003 = 'This is a \'string\''
-2   |-this_should_raise_Q003 = 'This is \\ a \\\'string\''
-  2 |+this_should_raise_Q003 = "This is \\ a \\'string'"
-3 3 | this_is_fine = '"This" is a \'string\''
-4 4 | this_is_fine = "This is a 'string'"
-5 5 | this_is_fine = "\"This\" is a 'string'"
+1 | this_should_raise_Q003 = 'This is a \'string\''
+  - this_should_raise_Q003 = 'This is \\ a \\\'string\''
+2 + this_should_raise_Q003 = "This is \\ a \\'string'"
+3 | this_is_fine = '"This" is a \'string\''
+4 | this_is_fine = "This is a 'string'"
+5 | this_is_fine = "\"This\" is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:10:5
@@ -47,16 +43,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 11 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-7  7  | this_is_fine = R'This is a \'string\''
-8  8  | this_should_raise = (
-9  9  |     'This is a'
-10    |-    '\'string\''
-   10 |+    "'string'"
-11 11 | )
-12 12 | 
-13 13 | # Same as above, but with f-strings
+7  | this_is_fine = R'This is a \'string\''
+8  | this_should_raise = (
+9  |     'This is a'
+   -     '\'string\''
+10 +     "'string'"
+11 | )
+12 | 
+13 | # Same as above, but with f-strings
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:14:1
@@ -68,16 +62,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 16 | f'"This" is a \'string\''
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-11 11 | )
-12 12 | 
-13 13 | # Same as above, but with f-strings
-14    |-f'This is a \'string\''  # Q003
-   14 |+f"This is a 'string'"  # Q003
-15 15 | f'This is \\ a \\\'string\''  # Q003
-16 16 | f'"This" is a \'string\''
-17 17 | f"This is a 'string'"
+11 | )
+12 | 
+13 | # Same as above, but with f-strings
+   - f'This is a \'string\''  # Q003
+14 + f"This is a 'string'"  # Q003
+15 | f'This is \\ a \\\'string\''  # Q003
+16 | f'"This" is a \'string\''
+17 | f"This is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:15:1
@@ -90,16 +82,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 17 | f"This is a 'string'"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-12 12 | 
-13 13 | # Same as above, but with f-strings
-14 14 | f'This is a \'string\''  # Q003
-15    |-f'This is \\ a \\\'string\''  # Q003
-   15 |+f"This is \\ a \\'string'"  # Q003
-16 16 | f'"This" is a \'string\''
-17 17 | f"This is a 'string'"
-18 18 | f"\"This\" is a 'string'"
+12 | 
+13 | # Same as above, but with f-strings
+14 | f'This is a \'string\''  # Q003
+   - f'This is \\ a \\\'string\''  # Q003
+15 + f"This is \\ a \\'string'"  # Q003
+16 | f'"This" is a \'string\''
+17 | f"This is a 'string'"
+18 | f"\"This\" is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:23:5
@@ -111,16 +101,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 24 | )
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-20 20 | fR'This is a \'string\''
-21 21 | foo = (
-22 22 |     f'This is a'
-23    |-    f'\'string\''  # Q003
-   23 |+    f"'string'"  # Q003
-24 24 | )
-25 25 | 
-26 26 | # Nested f-strings (Python 3.12+)
+20 | fR'This is a \'string\''
+21 | foo = (
+22 |     f'This is a'
+   -     f'\'string\''  # Q003
+23 +     f"'string'"  # Q003
+24 | )
+25 | 
+26 | # Nested f-strings (Python 3.12+)
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:46:1
@@ -132,16 +120,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 48 | t'"This" is a \'string\''
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-43 43 | 
-44 44 | 
-45 45 | # Same as above, but with t-strings
-46    |-t'This is a \'string\''  # Q003
-   46 |+t"This is a 'string'"  # Q003
-47 47 | t'This is \\ a \\\'string\''  # Q003
-48 48 | t'"This" is a \'string\''
-49 49 | f"This is a 'string'"
+43 | 
+44 | 
+45 | # Same as above, but with t-strings
+   - t'This is a \'string\''  # Q003
+46 + t"This is a 'string'"  # Q003
+47 | t'This is \\ a \\\'string\''  # Q003
+48 | t'"This" is a \'string\''
+49 | f"This is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:47:1
@@ -154,16 +140,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 49 | f"This is a 'string'"
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-44 44 | 
-45 45 | # Same as above, but with t-strings
-46 46 | t'This is a \'string\''  # Q003
-47    |-t'This is \\ a \\\'string\''  # Q003
-   47 |+t"This is \\ a \\'string'"  # Q003
-48 48 | t'"This" is a \'string\''
-49 49 | f"This is a 'string'"
-50 50 | f"\"This\" is a 'string'"
+44 | 
+45 | # Same as above, but with t-strings
+46 | t'This is a \'string\''  # Q003
+   - t'This is \\ a \\\'string\''  # Q003
+47 + t"This is \\ a \\'string'"  # Q003
+48 | t'"This" is a \'string\''
+49 | f"This is a 'string'"
+50 | f"\"This\" is a 'string'"
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:55:5
@@ -176,16 +160,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 57 | t'\'foo\' {'nested'}'  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-52 52 | fR'This is a \'string\''
-53 53 | foo = (
-54 54 |     t'This is a'
-55    |-    t'\'string\''  # Q003
-   55 |+    t"'string'"  # Q003
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
+52 | fR'This is a \'string\''
+53 | foo = (
+54 |     t'This is a'
+   -     t'\'string\''  # Q003
+55 +     t"'string'"  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:57:1
@@ -198,16 +180,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-54 54 |     t'This is a'
-55 55 |     t'\'string\''  # Q003
-56 56 | )
-57    |-t'\'foo\' {'nested'}'  # Q003
-   57 |+t"'foo' {'nested'}"  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
-59 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
-60 60 | 
+54 |     t'This is a'
+55 |     t'\'string\''  # Q003
+56 | )
+   - t'\'foo\' {'nested'}'  # Q003
+57 + t"'foo' {'nested'}"  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
+59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
+60 | 
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:58:1
@@ -219,16 +199,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-55 55 |     t'\'string\''  # Q003
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58    |-t'\'foo\' {t'nested'}'  # Q003
-   58 |+t"'foo' {t'nested'}"  # Q003
-59 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
+55 |     t'\'string\''  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+   - t'\'foo\' {t'nested'}'  # Q003
+58 + t"'foo' {t'nested'}"  # Q003
+59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:59:1
@@ -241,16 +219,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 61 | t'normal {t'nested'} normal'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
-59    |-t'\'foo\' {t'\'nested\''} \'\''  # Q003
-   59 |+t"'foo' {t'\'nested\''} ''"  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
+   - t'\'foo\' {t'\'nested\''} \'\''  # Q003
+59 + t"'foo' {t'\'nested\''} ''"  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
+62 | t'\'normal\' {t'nested'} normal'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:59:12
@@ -263,16 +239,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 61 | t'normal {t'nested'} normal'
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-56 56 | )
-57 57 | t'\'foo\' {'nested'}'  # Q003
-58 58 | t'\'foo\' {t'nested'}'  # Q003
-59    |-t'\'foo\' {t'\'nested\''} \'\''  # Q003
-   59 |+t'\'foo\' {t"'nested'"} \'\''  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
+56 | )
+57 | t'\'foo\' {'nested'}'  # Q003
+58 | t'\'foo\' {t'nested'}'  # Q003
+   - t'\'foo\' {t'\'nested\''} \'\''  # Q003
+59 + t'\'foo\' {t"'nested'"} \'\''  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
+62 | t'\'normal\' {t'nested'} normal'  # Q003
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:62:1
@@ -284,16 +258,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-59 59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
-60 60 | 
-61 61 | t'normal {t'nested'} normal'
-62    |-t'\'normal\' {t'nested'} normal'  # Q003
-   62 |+t"'normal' {t'nested'} normal"  # Q003
-63 63 | t'\'normal\' {t'nested'} "double quotes"'
-64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+59 | t'\'foo\' {t'\'nested\''} \'\''  # Q003
+60 | 
+61 | t'normal {t'nested'} normal'
+   - t'\'normal\' {t'nested'} normal'  # Q003
+62 + t"'normal' {t'nested'} normal"  # Q003
+63 | t'\'normal\' {t'nested'} "double quotes"'
+64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:64:15
@@ -305,14 +277,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-61 61 | t'normal {t'nested'} normal'
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
-63 63 | t'\'normal\' {t'nested'} "double quotes"'
-64    |-t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-   64 |+t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"'  # Q003
-65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+61 | t'normal {t'nested'} normal'
+62 | t'\'normal\' {t'nested'} normal'  # Q003
+63 | t'\'normal\' {t'nested'} "double quotes"'
+   - t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+64 + t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"'  # Q003
+65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
 
 Q003 [*] Change outer quotes to avoid escaping inner quotes
   --> doubles_escaped.py:65:1
@@ -323,10 +293,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Change outer quotes to avoid escaping inner quotes
-
-ℹ Safe fix
-62 62 | t'\'normal\' {t'nested'} normal'  # Q003
-63 63 | t'\'normal\' {t'nested'} "double quotes"'
-64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-65    |-t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
-   65 |+t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal"  # Q00l
+62 | t'\'normal\' {t'nested'} normal'  # Q003
+63 | t'\'normal\' {t'nested'} "double quotes"'
+64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
+   - t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
+65 + t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal"  # Q00l
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap
index 5acb1b7482..58e2b3b4dd 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap
@@ -10,13 +10,11 @@ Q004 [*] Unnecessary escape on inner quote character
 3 | this_is_fine = '"This" is a \"string\"'
   |
 help: Remove backslash
-
-ℹ Safe fix
-1   |-this_should_raise_Q004 = 'This is a \"string\"'
-  1 |+this_should_raise_Q004 = 'This is a "string"'
-2 2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"'
-3 3 | this_is_fine = '"This" is a \"string\"'
-4 4 | this_is_fine = "This is a 'string'"
+  - this_should_raise_Q004 = 'This is a \"string\"'
+1 + this_should_raise_Q004 = 'This is a "string"'
+2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"'
+3 | this_is_fine = '"This" is a \"string\"'
+4 | this_is_fine = "This is a 'string'"
 
 Q004 [*] Unnecessary escape on inner quote character
  --> doubles_escaped_unnecessary.py:2:26
@@ -28,14 +26,12 @@ Q004 [*] Unnecessary escape on inner quote character
 4 | this_is_fine = "This is a 'string'"
   |
 help: Remove backslash
-
-ℹ Safe fix
-1 1 | this_should_raise_Q004 = 'This is a \"string\"'
-2   |-this_should_raise_Q004 = 'This is \\ a \\\"string\"'
-  2 |+this_should_raise_Q004 = 'This is \\ a \\"string"'
-3 3 | this_is_fine = '"This" is a \"string\"'
-4 4 | this_is_fine = "This is a 'string'"
-5 5 | this_is_fine = "\"This\" is a 'string'"
+1 | this_should_raise_Q004 = 'This is a \"string\"'
+  - this_should_raise_Q004 = 'This is \\ a \\\"string\"'
+2 + this_should_raise_Q004 = 'This is \\ a \\"string"'
+3 | this_is_fine = '"This" is a \"string\"'
+4 | this_is_fine = "This is a 'string'"
+5 | this_is_fine = "\"This\" is a 'string'"
 
 Q004 [*] Unnecessary escape on inner quote character
  --> doubles_escaped_unnecessary.py:3:16
@@ -48,15 +44,13 @@ Q004 [*] Unnecessary escape on inner quote character
 5 | this_is_fine = "\"This\" is a 'string'"
   |
 help: Remove backslash
-
-ℹ Safe fix
-1 1 | this_should_raise_Q004 = 'This is a \"string\"'
-2 2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"'
-3   |-this_is_fine = '"This" is a \"string\"'
-  3 |+this_is_fine = '"This" is a "string"'
-4 4 | this_is_fine = "This is a 'string'"
-5 5 | this_is_fine = "\"This\" is a 'string'"
-6 6 | this_is_fine = r'This is a \"string\"'
+1 | this_should_raise_Q004 = 'This is a \"string\"'
+2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"'
+  - this_is_fine = '"This" is a \"string\"'
+3 + this_is_fine = '"This" is a "string"'
+4 | this_is_fine = "This is a 'string'"
+5 | this_is_fine = "\"This\" is a 'string'"
+6 | this_is_fine = r'This is a \"string\"'
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:10:5
@@ -68,16 +62,14 @@ Q004 [*] Unnecessary escape on inner quote character
 11 | )
    |
 help: Remove backslash
-
-ℹ Safe fix
-7  7  | this_is_fine = R'This is a \"string\"'
-8  8  | this_should_raise_Q004 = (
-9  9  |     'This is a'
-10    |-    '\"string\"'
-   10 |+    '"string"'
-11 11 | )
-12 12 | 
-13 13 | # Same as above, but with f-strings
+7  | this_is_fine = R'This is a \"string\"'
+8  | this_should_raise_Q004 = (
+9  |     'This is a'
+   -     '\"string\"'
+10 +     '"string"'
+11 | )
+12 | 
+13 | # Same as above, but with f-strings
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:14:1
@@ -89,16 +81,14 @@ Q004 [*] Unnecessary escape on inner quote character
 16 | f'"This" is a \"string\"'
    |
 help: Remove backslash
-
-ℹ Safe fix
-11 11 | )
-12 12 | 
-13 13 | # Same as above, but with f-strings
-14    |-f'This is a \"string\"'  # Q004
-   14 |+f'This is a "string"'  # Q004
-15 15 | f'This is \\ a \\\"string\"'  # Q004
-16 16 | f'"This" is a \"string\"'
-17 17 | f"This is a 'string'"
+11 | )
+12 | 
+13 | # Same as above, but with f-strings
+   - f'This is a \"string\"'  # Q004
+14 + f'This is a "string"'  # Q004
+15 | f'This is \\ a \\\"string\"'  # Q004
+16 | f'"This" is a \"string\"'
+17 | f"This is a 'string'"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:15:1
@@ -111,16 +101,14 @@ Q004 [*] Unnecessary escape on inner quote character
 17 | f"This is a 'string'"
    |
 help: Remove backslash
-
-ℹ Safe fix
-12 12 | 
-13 13 | # Same as above, but with f-strings
-14 14 | f'This is a \"string\"'  # Q004
-15    |-f'This is \\ a \\\"string\"'  # Q004
-   15 |+f'This is \\ a \\"string"'  # Q004
-16 16 | f'"This" is a \"string\"'
-17 17 | f"This is a 'string'"
-18 18 | f"\"This\" is a 'string'"
+12 | 
+13 | # Same as above, but with f-strings
+14 | f'This is a \"string\"'  # Q004
+   - f'This is \\ a \\\"string\"'  # Q004
+15 + f'This is \\ a \\"string"'  # Q004
+16 | f'"This" is a \"string\"'
+17 | f"This is a 'string'"
+18 | f"\"This\" is a 'string'"
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:16:1
@@ -133,16 +121,14 @@ Q004 [*] Unnecessary escape on inner quote character
 18 | f"\"This\" is a 'string'"
    |
 help: Remove backslash
-
-ℹ Safe fix
-13 13 | # Same as above, but with f-strings
-14 14 | f'This is a \"string\"'  # Q004
-15 15 | f'This is \\ a \\\"string\"'  # Q004
-16    |-f'"This" is a \"string\"'
-   16 |+f'"This" is a "string"'
-17 17 | f"This is a 'string'"
-18 18 | f"\"This\" is a 'string'"
-19 19 | fr'This is a \"string\"'
+13 | # Same as above, but with f-strings
+14 | f'This is a \"string\"'  # Q004
+15 | f'This is \\ a \\\"string\"'  # Q004
+   - f'"This" is a \"string\"'
+16 + f'"This" is a "string"'
+17 | f"This is a 'string'"
+18 | f"\"This\" is a 'string'"
+19 | fr'This is a \"string\"'
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:23:5
@@ -154,16 +140,14 @@ Q004 [*] Unnecessary escape on inner quote character
 24 | )
    |
 help: Remove backslash
-
-ℹ Safe fix
-20 20 | fR'This is a \"string\"'
-21 21 | this_should_raise_Q004 = (
-22 22 |     f'This is a'
-23    |-    f'\"string\"'  # Q004
-   23 |+    f'"string"'  # Q004
-24 24 | )
-25 25 | 
-26 26 | # Nested f-strings (Python 3.12+)
+20 | fR'This is a \"string\"'
+21 | this_should_raise_Q004 = (
+22 |     f'This is a'
+   -     f'\"string\"'  # Q004
+23 +     f'"string"'  # Q004
+24 | )
+25 | 
+26 | # Nested f-strings (Python 3.12+)
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:33:1
@@ -176,16 +160,14 @@ Q004 [*] Unnecessary escape on inner quote character
 35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-30 30 | #   f"'foo' {'nested'}"
-31 31 | #
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33    |-f'\"foo\" {'nested'}'  # Q004
-   33 |+f'"foo" {'nested'}'  # Q004
-34 34 | f'\"foo\" {f'nested'}'  # Q004
-35 35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
-36 36 | 
+30 | #   f"'foo' {'nested'}"
+31 | #
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+   - f'\"foo\" {'nested'}'  # Q004
+33 + f'"foo" {'nested'}'  # Q004
+34 | f'\"foo\" {f'nested'}'  # Q004
+35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
+36 | 
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:34:1
@@ -197,16 +179,14 @@ Q004 [*] Unnecessary escape on inner quote character
 35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-31 31 | #
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33 33 | f'\"foo\" {'nested'}'  # Q004
-34    |-f'\"foo\" {f'nested'}'  # Q004
-   34 |+f'"foo" {f'nested'}'  # Q004
-35 35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
+31 | #
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+33 | f'\"foo\" {'nested'}'  # Q004
+   - f'\"foo\" {f'nested'}'  # Q004
+34 + f'"foo" {f'nested'}'  # Q004
+35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
+36 | 
+37 | f'normal {f'nested'} normal'
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:35:1
@@ -219,16 +199,14 @@ Q004 [*] Unnecessary escape on inner quote character
 37 | f'normal {f'nested'} normal'
    |
 help: Remove backslash
-
-ℹ Safe fix
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33 33 | f'\"foo\" {'nested'}'  # Q004
-34 34 | f'\"foo\" {f'nested'}'  # Q004
-35    |-f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
-   35 |+f'"foo" {f'\"nested\"'} ""'  # Q004
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+33 | f'\"foo\" {'nested'}'  # Q004
+34 | f'\"foo\" {f'nested'}'  # Q004
+   - f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
+35 + f'"foo" {f'\"nested\"'} ""'  # Q004
+36 | 
+37 | f'normal {f'nested'} normal'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:35:12
@@ -241,16 +219,14 @@ Q004 [*] Unnecessary escape on inner quote character
 37 | f'normal {f'nested'} normal'
    |
 help: Remove backslash
-
-ℹ Safe fix
-32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
-33 33 | f'\"foo\" {'nested'}'  # Q004
-34 34 | f'\"foo\" {f'nested'}'  # Q004
-35    |-f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
-   35 |+f'\"foo\" {f'"nested"'} \"\"'  # Q004
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
+32 | # but as the actual string itself is invalid pre 3.12, we don't catch it.
+33 | f'\"foo\" {'nested'}'  # Q004
+34 | f'\"foo\" {f'nested'}'  # Q004
+   - f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
+35 + f'\"foo\" {f'"nested"'} \"\"'  # Q004
+36 | 
+37 | f'normal {f'nested'} normal'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:38:1
@@ -262,16 +238,14 @@ Q004 [*] Unnecessary escape on inner quote character
 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-35 35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38    |-f'\"normal\" {f'nested'} normal'  # Q004
-   38 |+f'"normal" {f'nested'} normal'  # Q004
-39 39 | f'\"normal\" {f'nested'} "double quotes"'
-40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+35 | f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
+36 | 
+37 | f'normal {f'nested'} normal'
+   - f'\"normal\" {f'nested'} normal'  # Q004
+38 + f'"normal" {f'nested'} normal'  # Q004
+39 | f'\"normal\" {f'nested'} "double quotes"'
+40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:39:1
@@ -284,16 +258,14 @@ Q004 [*] Unnecessary escape on inner quote character
 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-36 36 | 
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
-39    |-f'\"normal\" {f'nested'} "double quotes"'
-   39 |+f'"normal" {f'nested'} "double quotes"'
-40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-42 42 | 
+36 | 
+37 | f'normal {f'nested'} normal'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
+   - f'\"normal\" {f'nested'} "double quotes"'
+39 + f'"normal" {f'nested'} "double quotes"'
+40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+42 | 
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:40:1
@@ -305,16 +277,14 @@ Q004 [*] Unnecessary escape on inner quote character
 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
-39 39 | f'\"normal\" {f'nested'} "double quotes"'
-40    |-f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-   40 |+f'"normal" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-42 42 | 
-43 43 | # Make sure we do not unescape quotes
+37 | f'normal {f'nested'} normal'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
+39 | f'\"normal\" {f'nested'} "double quotes"'
+   - f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+40 + f'"normal" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+42 | 
+43 | # Make sure we do not unescape quotes
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:40:15
@@ -326,16 +296,14 @@ Q004 [*] Unnecessary escape on inner quote character
 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
    |
 help: Remove backslash
-
-ℹ Safe fix
-37 37 | f'normal {f'nested'} normal'
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
-39 39 | f'\"normal\" {f'nested'} "double quotes"'
-40    |-f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-   40 |+f'\"normal\" {f'"nested" {'other'} normal'} "double quotes"'  # Q004
-41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-42 42 | 
-43 43 | # Make sure we do not unescape quotes
+37 | f'normal {f'nested'} normal'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
+39 | f'\"normal\" {f'nested'} "double quotes"'
+   - f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+40 + f'\"normal\" {f'"nested" {'other'} normal'} "double quotes"'  # Q004
+41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+42 | 
+43 | # Make sure we do not unescape quotes
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:41:1
@@ -348,16 +316,14 @@ Q004 [*] Unnecessary escape on inner quote character
 43 | # Make sure we do not unescape quotes
    |
 help: Remove backslash
-
-ℹ Safe fix
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
-39 39 | f'\"normal\" {f'nested'} "double quotes"'
-40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-41    |-f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-   41 |+f'"normal" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-42 42 | 
-43 43 | # Make sure we do not unescape quotes
-44 44 | this_is_fine = 'This is an \\"escaped\\" quote'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
+39 | f'\"normal\" {f'nested'} "double quotes"'
+40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+   - f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+41 + f'"normal" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+42 | 
+43 | # Make sure we do not unescape quotes
+44 | this_is_fine = 'This is an \\"escaped\\" quote'
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:41:15
@@ -370,16 +336,14 @@ Q004 [*] Unnecessary escape on inner quote character
 43 | # Make sure we do not unescape quotes
    |
 help: Remove backslash
-
-ℹ Safe fix
-38 38 | f'\"normal\" {f'nested'} normal'  # Q004
-39 39 | f'\"normal\" {f'nested'} "double quotes"'
-40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-41    |-f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-   41 |+f'\"normal\" {f'"nested" {'other'} "double quotes"'} normal'  # Q004
-42 42 | 
-43 43 | # Make sure we do not unescape quotes
-44 44 | this_is_fine = 'This is an \\"escaped\\" quote'
+38 | f'\"normal\" {f'nested'} normal'  # Q004
+39 | f'\"normal\" {f'nested'} "double quotes"'
+40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
+   - f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
+41 + f'\"normal\" {f'"nested" {'other'} "double quotes"'} normal'  # Q004
+42 | 
+43 | # Make sure we do not unescape quotes
+44 | this_is_fine = 'This is an \\"escaped\\" quote'
 
 Q004 [*] Unnecessary escape on inner quote character
   --> doubles_escaped_unnecessary.py:45:26
@@ -390,10 +354,8 @@ Q004 [*] Unnecessary escape on inner quote character
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove backslash
-
-ℹ Safe fix
-42 42 | 
-43 43 | # Make sure we do not unescape quotes
-44 44 | this_is_fine = 'This is an \\"escaped\\" quote'
-45    |-this_should_raise_Q004 = 'This is an \\\"escaped\\\" quote with an extra backslash'
-   45 |+this_should_raise_Q004 = 'This is an \\"escaped\\" quote with an extra backslash'
+42 | 
+43 | # Make sure we do not unescape quotes
+44 | this_is_fine = 'This is an \\"escaped\\" quote'
+   - this_should_raise_Q004 = 'This is an \\\"escaped\\\" quote with an extra backslash'
+45 + this_should_raise_Q004 = 'This is an \\"escaped\\" quote with an extra backslash'
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap
index 4779f6fd3a..22ebcdbbe3 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap
@@ -11,14 +11,12 @@ Q000 [*] Double quotes found but single quotes preferred
 4 |     "not"
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | x = (
-2   |-    "This"
-  2 |+    'This'
-3 3 |     "is"
-4 4 |     "not"
-5 5 | )
+1 | x = (
+  -     "This"
+2 +     'This'
+3 |     "is"
+4 |     "not"
+5 | )
 
 Q000 [*] Double quotes found but single quotes preferred
  --> doubles_implicit.py:3:5
@@ -31,15 +29,13 @@ Q000 [*] Double quotes found but single quotes preferred
 5 | )
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | x = (
-2 2 |     "This"
-3   |-    "is"
-  3 |+    'is'
-4 4 |     "not"
-5 5 | )
-6 6 | 
+1 | x = (
+2 |     "This"
+  -     "is"
+3 +     'is'
+4 |     "not"
+5 | )
+6 | 
 
 Q000 [*] Double quotes found but single quotes preferred
  --> doubles_implicit.py:4:5
@@ -51,16 +47,14 @@ Q000 [*] Double quotes found but single quotes preferred
 5 | )
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | x = (
-2 2 |     "This"
-3 3 |     "is"
-4   |-    "not"
-  4 |+    'not'
-5 5 | )
-6 6 | 
-7 7 | x = (
+1 | x = (
+2 |     "This"
+3 |     "is"
+  -     "not"
+4 +     'not'
+5 | )
+6 | 
+7 | x = (
 
 Q000 [*] Double quotes found but single quotes preferred
   --> doubles_implicit.py:8:5
@@ -72,16 +66,14 @@ Q000 [*] Double quotes found but single quotes preferred
 10 |     "not"
    |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-5 5 | )
-6 6 | 
-7 7 | x = (
-8   |-    "This" \
-  8 |+    'This' \
-9 9 |     "is" \
-10 10 |     "not"
-11 11 | )
+5  | )
+6  | 
+7  | x = (
+   -     "This" \
+8  +     'This' \
+9  |     "is" \
+10 |     "not"
+11 | )
 
 Q000 [*] Double quotes found but single quotes preferred
   --> doubles_implicit.py:9:5
@@ -94,16 +86,14 @@ Q000 [*] Double quotes found but single quotes preferred
 11 | )
    |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-6  6  | 
-7  7  | x = (
-8  8  |     "This" \
-9     |-    "is" \
-   9  |+    'is' \
-10 10 |     "not"
-11 11 | )
-12 12 | 
+6  | 
+7  | x = (
+8  |     "This" \
+   -     "is" \
+9  +     'is' \
+10 |     "not"
+11 | )
+12 | 
 
 Q000 [*] Double quotes found but single quotes preferred
   --> doubles_implicit.py:10:5
@@ -115,16 +105,14 @@ Q000 [*] Double quotes found but single quotes preferred
 11 | )
    |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-7  7  | x = (
-8  8  |     "This" \
-9  9  |     "is" \
-10    |-    "not"
-   10 |+    'not'
-11 11 | )
-12 12 | 
-13 13 | x = (
+7  | x = (
+8  |     "This" \
+9  |     "is" \
+   -     "not"
+10 +     'not'
+11 | )
+12 | 
+13 | x = (
 
 Q000 [*] Double quotes found but single quotes preferred
   --> doubles_implicit.py:27:1
@@ -135,10 +123,8 @@ Q000 [*] Double quotes found but single quotes preferred
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-24 24 | 
-25 25 | if True:
-26 26 |     "This can use 'double' quotes"
-27    |-"But this needs to be changed"
-   27 |+'But this needs to be changed'
+24 | 
+25 | if True:
+26 |     "This can use 'double' quotes"
+   - "But this needs to be changed"
+27 + 'But this needs to be changed'
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap
index f5e48ab14d..0d196f0df5 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap
@@ -13,13 +13,11 @@ Q001 [*] Double quote multiline found but single quotes preferred
 5 |   s = ''' This "should"
   |
 help: Replace double multiline quotes with single quotes
-
-ℹ Safe fix
-1   |-s = """ This "should"
-  1 |+s = ''' This "should"
-2 2 | be
-3   |-"linted" """
-  3 |+"linted" '''
-4 4 | 
-5 5 | s = ''' This "should"
-6 6 | "not" be
+  - s = """ This "should"
+1 + s = ''' This "should"
+2 | be
+  - "linted" """
+3 + "linted" '''
+4 | 
+5 | s = ''' This "should"
+6 | "not" be
diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap
index 95e36269b3..c07457668d 100644
--- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap
@@ -18,8 +18,6 @@ Q000 [*] Double quotes found but single quotes preferred
   |     ^^^^^^^^
   |
 help: Replace double quotes with single quotes
-
-ℹ Safe fix
-1 1 | s = ""'Start with empty string' ' and lint docstring safely'
-2   |-s = "Do not"' start with empty string' ' and lint docstring safely'
-  2 |+s = 'Do not'' start with empty string' ' and lint docstring safely'
+1 | s = ""'Start with empty string' ' and lint docstring safely'
+  - s = "Do not"' start with empty string' ' and lint docstring safely'
+2 + s = 'Do not'' start with empty string' ' and lint docstring safely'
diff --git a/crates/ruff_linter/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs b/crates/ruff_linter/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs
index e3a66cf35b..07ca59a9a2 100644
--- a/crates/ruff_linter/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs
+++ b/crates/ruff_linter/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs
@@ -43,6 +43,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// ## References
 /// - [Python documentation: The `raise` statement](https://docs.python.org/3/reference/simple_stmts.html#the-raise-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.239")]
 pub(crate) struct UnnecessaryParenOnRaiseException;
 
 impl AlwaysFixableViolation for UnnecessaryParenOnRaiseException {
diff --git a/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap b/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap
index 2ff56deeef..ecc30477db 100644
--- a/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap
@@ -12,16 +12,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 7 | try:
   |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-2 2 |     y = 6 + "7"
-3 3 | except TypeError:
-4 4 |     # RSE102
-5   |-    raise ValueError()
-  5 |+    raise ValueError
-6 6 | 
-7 7 | try:
-8 8 |     x = 1 / 0
+2 |     y = 6 + "7"
+3 | except TypeError:
+4 |     # RSE102
+  -     raise ValueError()
+5 +     raise ValueError
+6 | 
+7 | try:
+8 |     x = 1 / 0
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:13:16
@@ -33,16 +31,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 15 | # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-10 10 |     raise
-11 11 | 
-12 12 | # RSE102
-13    |-raise TypeError()
-   13 |+raise TypeError
-14 14 | 
-15 15 | # RSE102
-16 16 | raise TypeError ()
+10 |     raise
+11 | 
+12 | # RSE102
+   - raise TypeError()
+13 + raise TypeError
+14 | 
+15 | # RSE102
+16 | raise TypeError ()
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:16:17
@@ -54,16 +50,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 18 | # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-13 13 | raise TypeError()
-14 14 | 
-15 15 | # RSE102
-16    |-raise TypeError ()
-   16 |+raise TypeError 
-17 17 | 
-18 18 | # RSE102
-19 19 | raise TypeError \
+13 | raise TypeError()
+14 | 
+15 | # RSE102
+   - raise TypeError ()
+16 + raise TypeError 
+17 | 
+18 | # RSE102
+19 | raise TypeError \
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:20:5
@@ -76,16 +70,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 22 | # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-17 17 | 
-18 18 | # RSE102
-19 19 | raise TypeError \
-20    |-    ()
-   20 |+    
-21 21 | 
-22 22 | # RSE102
-23 23 | raise TypeError \
+17 | 
+18 | # RSE102
+19 | raise TypeError \
+   -     ()
+20 +     
+21 | 
+22 | # RSE102
+23 | raise TypeError \
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:24:5
@@ -98,16 +90,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 26 | # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-21 21 | 
-22 22 | # RSE102
-23 23 | raise TypeError \
-24    |-    ();
-   24 |+    ;
-25 25 | 
-26 26 | # RSE102
-27 27 | raise TypeError(
+21 | 
+22 | # RSE102
+23 | raise TypeError \
+   -     ();
+24 +     ;
+25 | 
+26 | # RSE102
+27 | raise TypeError(
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:27:16
@@ -122,18 +112,16 @@ RSE102 [*] Unnecessary parentheses on raised exception
 31 |   # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-24 24 |     ();
-25 25 | 
-26 26 | # RSE102
-27    |-raise TypeError(
-28    |-
-29    |-)
-   27 |+raise TypeError
-30 28 | 
-31 29 | # RSE102
-32 30 | raise (TypeError) (
+24 |     ();
+25 | 
+26 | # RSE102
+   - raise TypeError(
+   - 
+   - )
+27 + raise TypeError
+28 | 
+29 | # RSE102
+30 | raise (TypeError) (
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:32:19
@@ -148,18 +136,16 @@ RSE102 [*] Unnecessary parentheses on raised exception
 36 |   # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-29 29 | )
-30 30 | 
-31 31 | # RSE102
-32    |-raise (TypeError) (
-33    |-
-34    |-)
-   32 |+raise (TypeError) 
-35 33 | 
-36 34 | # RSE102
-37 35 | raise TypeError(
+29 | )
+30 | 
+31 | # RSE102
+   - raise (TypeError) (
+   - 
+   - )
+32 + raise (TypeError) 
+33 | 
+34 | # RSE102
+35 | raise TypeError(
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:37:16
@@ -174,18 +160,17 @@ RSE102 [*] Unnecessary parentheses on raised exception
 41 |   # OK
    |
 help: Remove unnecessary parentheses
-
-ℹ Unsafe fix
-34 34 | )
-35 35 | 
-36 36 | # RSE102
-37    |-raise TypeError(
-38    |-    # Hello, world!
-39    |-)
-   37 |+raise TypeError
-40 38 | 
-41 39 | # OK
-42 40 | raise AssertionError
+34 | )
+35 | 
+36 | # RSE102
+   - raise TypeError(
+   -     # Hello, world!
+   - )
+37 + raise TypeError
+38 | 
+39 | # OK
+40 | raise AssertionError
+note: This is an unsafe fix and may change runtime behavior
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:74:17
@@ -197,16 +182,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 76 | raise IndexError()\
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-71 71 | 
-72 72 | 
-73 73 | # RSE102
-74    |-raise IndexError()from ZeroDivisionError
-   74 |+raise IndexError from ZeroDivisionError
-75 75 | 
-76 76 | raise IndexError()\
-77 77 | from ZeroDivisionError
+71 | 
+72 | 
+73 | # RSE102
+   - raise IndexError()from ZeroDivisionError
+74 + raise IndexError from ZeroDivisionError
+75 | 
+76 | raise IndexError()\
+77 | from ZeroDivisionError
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:76:17
@@ -218,16 +201,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 77 | from ZeroDivisionError
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-73 73 | # RSE102
-74 74 | raise IndexError()from ZeroDivisionError
-75 75 | 
-76    |-raise IndexError()\
-   76 |+raise IndexError\
-77 77 | from ZeroDivisionError
-78 78 | 
-79 79 | raise IndexError() from ZeroDivisionError
+73 | # RSE102
+74 | raise IndexError()from ZeroDivisionError
+75 | 
+   - raise IndexError()\
+76 + raise IndexError\
+77 | from ZeroDivisionError
+78 | 
+79 | raise IndexError() from ZeroDivisionError
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:79:17
@@ -240,16 +221,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 81 | raise IndexError();
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-76 76 | raise IndexError()\
-77 77 | from ZeroDivisionError
-78 78 | 
-79    |-raise IndexError() from ZeroDivisionError
-   79 |+raise IndexError from ZeroDivisionError
-80 80 | 
-81 81 | raise IndexError();
-82 82 | 
+76 | raise IndexError()\
+77 | from ZeroDivisionError
+78 | 
+   - raise IndexError() from ZeroDivisionError
+79 + raise IndexError from ZeroDivisionError
+80 | 
+81 | raise IndexError();
+82 | 
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:81:17
@@ -262,16 +241,14 @@ RSE102 [*] Unnecessary parentheses on raised exception
 83 | # RSE102
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-78 78 | 
-79 79 | raise IndexError() from ZeroDivisionError
-80 80 | 
-81    |-raise IndexError();
-   81 |+raise IndexError;
-82 82 | 
-83 83 | # RSE102
-84 84 | raise Foo()
+78 | 
+79 | raise IndexError() from ZeroDivisionError
+80 | 
+   - raise IndexError();
+81 + raise IndexError;
+82 | 
+83 | # RSE102
+84 | raise Foo()
 
 RSE102 [*] Unnecessary parentheses on raised exception
   --> RSE102.py:84:10
@@ -283,16 +260,15 @@ RSE102 [*] Unnecessary parentheses on raised exception
 86 | # OK
    |
 help: Remove unnecessary parentheses
-
-ℹ Unsafe fix
-81 81 | raise IndexError();
-82 82 | 
-83 83 | # RSE102
-84    |-raise Foo()
-   84 |+raise Foo
-85 85 | 
-86 86 | # OK
-87 87 | raise ctypes.WinError()
+81 | raise IndexError();
+82 | 
+83 | # RSE102
+   - raise Foo()
+84 + raise Foo
+85 | 
+86 | # OK
+87 | raise ctypes.WinError()
+note: This is an unsafe fix and may change runtime behavior
 
 RSE102 [*] Unnecessary parentheses on raised exception
    --> RSE102.py:107:27
@@ -303,16 +279,15 @@ RSE102 [*] Unnecessary parentheses on raised exception
     |                           ^^
     |
 help: Remove unnecessary parentheses
-
-ℹ Unsafe fix
-104 104 | # RSE102
-105 105 | future = executor.submit(float, "a")
-106 106 | if future.exception():
-107     |-    raise future.Exception()
-    107 |+    raise future.Exception
-108 108 | 
-109 109 | 
-110 110 | raise TypeError(
+104 | # RSE102
+105 | future = executor.submit(float, "a")
+106 | if future.exception():
+    -     raise future.Exception()
+107 +     raise future.Exception
+108 | 
+109 | 
+110 | raise TypeError(
+note: This is an unsafe fix and may change runtime behavior
 
 RSE102 [*] Unnecessary parentheses on raised exception
    --> RSE102.py:110:16
@@ -324,12 +299,11 @@ RSE102 [*] Unnecessary parentheses on raised exception
     | |_^
     |
 help: Remove unnecessary parentheses
-
-ℹ Unsafe fix
-107 107 |     raise future.Exception()
-108 108 | 
-109 109 | 
-110     |-raise TypeError(
-111     |-    # comment
-112     |-)
-    110 |+raise TypeError
+107 |     raise future.Exception()
+108 | 
+109 | 
+    - raise TypeError(
+    -     # comment
+    - )
+110 + raise TypeError
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_return/rules/function.rs b/crates/ruff_linter/src/rules/flake8_return/rules/function.rs
index 8fd3ae0b44..018ddd925b 100644
--- a/crates/ruff_linter/src/rules/flake8_return/rules/function.rs
+++ b/crates/ruff_linter/src/rules/flake8_return/rules/function.rs
@@ -56,6 +56,7 @@ use crate::rules::flake8_return::visitor::{ReturnVisitor, Stack};
 /// This rule's fix is marked as unsafe for cases in which comments would be
 /// dropped from the `return` statement.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct UnnecessaryReturnNone;
 
 impl AlwaysFixableViolation for UnnecessaryReturnNone {
@@ -97,6 +98,7 @@ impl AlwaysFixableViolation for UnnecessaryReturnNone {
 ///     return 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct ImplicitReturnValue;
 
 impl AlwaysFixableViolation for ImplicitReturnValue {
@@ -135,6 +137,7 @@ impl AlwaysFixableViolation for ImplicitReturnValue {
 ///     return None
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct ImplicitReturn;
 
 impl AlwaysFixableViolation for ImplicitReturn {
@@ -170,6 +173,7 @@ impl AlwaysFixableViolation for ImplicitReturn {
 ///     return 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct UnnecessaryAssign {
     name: String,
 }
@@ -212,6 +216,7 @@ impl AlwaysFixableViolation for UnnecessaryAssign {
 ///     return baz
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct SuperfluousElseReturn {
     branch: Branch,
 }
@@ -256,6 +261,7 @@ impl Violation for SuperfluousElseReturn {
 ///     raise Exception(baz)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct SuperfluousElseRaise {
     branch: Branch,
 }
@@ -302,6 +308,7 @@ impl Violation for SuperfluousElseRaise {
 ///         x = 0
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct SuperfluousElseContinue {
     branch: Branch,
 }
@@ -348,6 +355,7 @@ impl Violation for SuperfluousElseContinue {
 ///         x = 0
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.154")]
 pub(crate) struct SuperfluousElseBreak {
     branch: Branch,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap
index a1076f9ab8..5ad0c466eb 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap
@@ -10,16 +10,14 @@ RET501 [*] Do not explicitly `return None` in function if it is the only possibl
   |     ^^^^^^^^^^^
   |
 help: Remove explicit `return None`
-
-ℹ Safe fix
-1 1 | def x(y):
-2 2 |     if not y:
-3 3 |         return
-4   |-    return None  # error
-  4 |+    return  # error
-5 5 | 
-6 6 | 
-7 7 | class BaseCache:
+1 | def x(y):
+2 |     if not y:
+3 |         return
+  -     return None  # error
+4 +     return  # error
+5 | 
+6 | 
+7 | class BaseCache:
 
 RET501 [*] Do not explicitly `return None` in function if it is the only possible return value
   --> RET501.py:14:9
@@ -32,16 +30,14 @@ RET501 [*] Do not explicitly `return None` in function if it is the only possibl
 16 |     @property
    |
 help: Remove explicit `return None`
-
-ℹ Safe fix
-11 11 | 
-12 12 |     def get(self, key: str) -> None:
-13 13 |         print(f"{key} not found")
-14    |-        return None
-   14 |+        return
-15 15 | 
-16 16 |     @property
-17 17 |     def prop(self) -> None:
+11 | 
+12 |     def get(self, key: str) -> None:
+13 |         print(f"{key} not found")
+   -         return None
+14 +         return
+15 | 
+16 |     @property
+17 |     def prop(self) -> None:
 
 RET501 [*] Do not explicitly `return None` in function if it is the only possible return value
   --> RET501.py:59:9
@@ -54,12 +50,11 @@ RET501 [*] Do not explicitly `return None` in function if it is the only possibl
    | |_________^
    |
 help: Remove explicit `return None`
-
-ℹ Unsafe fix
-56 56 |     def foo(bar):
-57 57 |         if not bar:
-58 58 |             return
-59    |-        return (
-60    |-            None # comment
-61    |-        )
-   59 |+        return
+56 |     def foo(bar):
+57 |         if not bar:
+58 |             return
+   -         return (
+   -             None # comment
+   -         )
+59 +         return
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap
index fcff245de3..5c597905e6 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap
@@ -11,12 +11,10 @@ RET502 [*] Do not implicitly `return None` in function able to return non-`None`
 4 |     return 1
   |
 help: Add explicit `None` return value
-
-ℹ Safe fix
-1 1 | def x(y):
-2 2 |     if not y:
-3   |-        return  # error
-  3 |+        return None  # error
-4 4 |     return 1
-5 5 | 
-6 6 |
+1 | def x(y):
+2 |     if not y:
+  -         return  # error
+3 +         return None  # error
+4 |     return 1
+5 | 
+6 |
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap
index 5d6e25f2b4..23ee1b737b 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap
@@ -12,15 +12,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
 23 |       # error
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-20 20 | def x(y):
-21 21 |     if not y:
-22 22 |         return 1
-   23 |+    return None
-23 24 |     # error
-24 25 | 
-25 26 | 
+20 | def x(y):
+21 |     if not y:
+22 |         return 1
+23 +     return None
+24 |     # error
+25 | 
+26 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:26:1
@@ -33,15 +32,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
    | |________________^
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-28 28 |         print()  # error
-29 29 |     else:
-30 30 |         return 2
-   31 |+    return None
-31 32 | 
-32 33 | 
-33 34 | def x(y):
+28 |         print()  # error
+29 |     else:
+30 |         return 2
+31 +     return None
+32 | 
+33 | 
+34 | def x(y):
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:33:1
@@ -54,15 +52,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
    | |___________^
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-35 35 |         return 1
-36 36 | 
-37 37 |     print()  # error
-   38 |+    return None
-38 39 | 
-39 40 | 
-40 41 | # for
+35 |         return 1
+36 | 
+37 |     print()  # error
+38 +     return None
+39 | 
+40 | 
+41 | # for
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:41:1
@@ -76,15 +73,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
 45 |       # error
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-42 42 |     for i in range(10):
-43 43 |         if i > 10:
-44 44 |             return i
-   45 |+    return None
-45 46 |     # error
-46 47 | 
-47 48 | 
+42 |     for i in range(10):
+43 |         if i > 10:
+44 |             return i
+45 +     return None
+46 |     # error
+47 | 
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:48:1
@@ -98,15 +94,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
    | |_______________^
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-51 51 |             return i
-52 52 |     else:
-53 53 |         print()  # error
-   54 |+    return None
-54 55 | 
-55 56 | 
-56 57 | # A nonexistent function
+51 |             return i
+52 |     else:
+53 |         print()  # error
+54 +     return None
+55 | 
+56 | 
+57 | # A nonexistent function
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:57:1
@@ -119,15 +114,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
    | |______________________^
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-58 58 |     if x > 0:
-59 59 |         return False
-60 60 |     no_such_function()  # error
-   61 |+    return None
-61 62 | 
-62 63 | 
-63 64 | # A function that does return the control
+58 |     if x > 0:
+59 |         return False
+60 |     no_such_function()  # error
+61 +     return None
+62 | 
+63 | 
+64 | # A function that does return the control
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:64:1
@@ -140,15 +134,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
    | |_____________________^
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-65 65 |     if x > 0:
-66 66 |         return False
-67 67 |     print("", end="")  # error
-   68 |+    return None
-68 69 | 
-69 70 | 
-70 71 | ###
+65 |     if x > 0:
+66 |         return False
+67 |     print("", end="")  # error
+68 +     return None
+69 | 
+70 | 
+71 | ###
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
   --> RET503.py:82:1
@@ -162,15 +155,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
    | |______________^
    |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-84 84 |         if y > 0:
-85 85 |             return 1
-86 86 |         y += 1
-   87 |+    return None
-87 88 | 
-88 89 | 
-89 90 | # exclude empty functions
+84 |         if y > 0:
+85 |             return 1
+86 |         y += 1
+87 +     return None
+88 | 
+89 | 
+90 | # exclude empty functions
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:113:1
@@ -184,15 +176,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-115 115 |         if i > y:
-116 116 |             break
-117 117 |         return z
-    118 |+    return None
-118 119 | 
-119 120 | 
-120 121 | def bar3(x, y, z):
+115 |         if i > y:
+116 |             break
+117 |         return z
+118 +     return None
+119 | 
+120 | 
+121 | def bar3(x, y, z):
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:120:1
@@ -208,15 +199,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |___________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-125 125 |         else:
-126 126 |             return z
-127 127 |         return None
-    128 |+    return None
-128 129 | 
-129 130 | 
-130 131 | def bar1(x, y, z):
+125 |         else:
+126 |             return z
+127 |         return None
+128 +     return None
+129 | 
+130 | 
+131 | def bar1(x, y, z):
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:130:1
@@ -229,15 +219,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-132 132 |         if i < y:
-133 133 |             continue
-134 134 |         return z
-    135 |+    return None
-135 136 | 
-136 137 | 
-137 138 | def bar3(x, y, z):
+132 |         if i < y:
+133 |             continue
+134 |         return z
+135 +     return None
+136 | 
+137 | 
+138 | def bar3(x, y, z):
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:137:1
@@ -253,15 +242,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |___________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-142 142 |         else:
-143 143 |             return z
-144 144 |         return None
-    145 |+    return None
-145 146 | 
-146 147 | 
-147 148 | def prompts(self, foo):
+142 |         else:
+143 |             return z
+144 |         return None
+145 +     return None
+146 | 
+147 | 
+148 | def prompts(self, foo):
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:271:1
@@ -275,15 +263,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |____________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-274 274 | 
-275 275 |     for value in values:
-276 276 |         print(value)
-    277 |+    return None
-277 278 | 
-278 279 | 
-279 280 | def while_true():
+274 | 
+275 |     for value in values:
+276 |         print(value)
+277 +     return None
+278 | 
+279 | 
+280 | def while_true():
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:287:1
@@ -298,15 +285,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |___________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-290 290 |             return 1
-291 291 |         case 1:
-292 292 |             print()  # error
-    293 |+    return None
-293 294 | 
-294 295 | 
-295 296 | def foo(baz: str) -> str:
+290 |             return 1
+291 |         case 1:
+292 |             print()  # error
+293 +     return None
+294 | 
+295 | 
+296 | def foo(baz: str) -> str:
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:300:5
@@ -318,15 +304,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_____________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-300 300 |     def example():
-301 301 |         if True:
-302 302 |             return ""
-    303 |+        return None
-303 304 | 
-304 305 | 
-305 306 |     def example():
+300 |     def example():
+301 |         if True:
+302 |             return ""
+303 +         return None
+304 | 
+305 | 
+306 |     def example():
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:305:5
@@ -337,15 +322,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_____________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-305 305 |     def example():
-306 306 |         if True:
-307 307 |             return ""
-    308 |+        return None
-308 309 | 
-309 310 | 
-310 311 |     def example():
+305 |     def example():
+306 |         if True:
+307 |             return ""
+308 +         return None
+309 | 
+310 | 
+311 |     def example():
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:310:5
@@ -356,15 +340,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_____________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-310 310 |     def example():
-311 311 |         if True:
-312 312 |             return ""  # type: ignore
-    313 |+        return None
-313 314 | 
-314 315 | 
-315 316 |     def example():
+310 |     def example():
+311 |         if True:
+312 |             return ""  # type: ignore
+313 +         return None
+314 | 
+315 | 
+316 |     def example():
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:315:5
@@ -375,15 +358,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_____________________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-315 315 |     def example():
-316 316 |         if True:
-317 317 |             return ""  ;
-    318 |+        return None
-318 319 | 
-319 320 | 
-320 321 |     def example():
+315 |     def example():
+316 |         if True:
+317 |             return ""  ;
+318 +         return None
+319 | 
+320 | 
+321 |     def example():
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:320:5
@@ -395,15 +377,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
 323 |                   ;  # type: ignore
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-321 321 |         if True:
-322 322 |             return "" \
-323 323 |                 ;  # type: ignore
-    324 |+        return None
-324 325 | 
-325 326 | 
-326 327 | def end_of_file():
+321 |         if True:
+322 |             return "" \
+323 |                 ;  # type: ignore
+324 +         return None
+325 | 
+326 | 
+327 | def end_of_file():
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:326:1
@@ -415,15 +396,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-328 328 |         return 1
-329 329 |     x = 2 \
-330 330 | 
-    331 |+    return None
-331 332 | 
-332 333 | 
-333 334 | # function return type annotation NoReturn
+328 |         return 1
+329 |     x = 2 \
+330 | 
+331 +     return None
+332 | 
+333 | 
+334 | # function return type annotation NoReturn
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:398:1
@@ -437,15 +417,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_____________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-401 401 |     else:
-402 402 |         with c:
-403 403 |             d
-    404 |+    return None
-404 405 | 
-405 406 | 
-406 407 | 
+401 |     else:
+402 |         with c:
+403 |             d
+404 +     return None
+405 | 
+406 | 
+407 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value
    --> RET503.py:413:1
@@ -461,11 +440,10 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-`
     | |_________^
     |
 help: Add explicit `return` statement
-
-ℹ Unsafe fix
-415 415 |         abort()
-416 416 |     if x == 5:
-417 417 |         return 5
-418     |-    bar()
-    418 |+    bar()
-    419 |+    return None
+415 |         abort()
+416 |     if x == 5:
+417 |         return 5
+    -     bar()
+418 +     bar()
+419 +     return None
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap
index 0aef5af4ed..24a1daf1b3 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap
@@ -10,17 +10,16 @@ RET504 [*] Unnecessary assignment to `a` before `return` statement
   |            ^
   |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-2 2 | # Errors
-3 3 | ###
-4 4 | def x():
-5   |-    a = 1
-6   |-    return a  # RET504
-  5 |+    return 1
-7 6 | 
-8 7 | 
-9 8 | # Can be refactored false positives
+2 | # Errors
+3 | ###
+4 | def x():
+  -     a = 1
+  -     return a  # RET504
+5 +     return 1
+6 | 
+7 | 
+8 | # Can be refactored false positives
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `formatted` before `return` statement
   --> RET504.py:23:12
@@ -31,17 +30,16 @@ RET504 [*] Unnecessary assignment to `formatted` before `return` statement
    |            ^^^^^^^^^
    |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-19 19 | def x():
-20 20 |     formatted = _USER_AGENT_FORMATTER.format(format_string, **values)
-21 21 |     # clean up after any blank components
-22    |-    formatted = formatted.replace("()", "").replace("  ", " ").strip()
-23    |-    return formatted
-   22 |+    return formatted.replace("()", "").replace("  ", " ").strip()
-24 23 | 
-25 24 | 
-26 25 | # https://github.com/afonasev/flake8-return/issues/47#issue-641117366
+19 | def x():
+20 |     formatted = _USER_AGENT_FORMATTER.format(format_string, **values)
+21 |     # clean up after any blank components
+   -     formatted = formatted.replace("()", "").replace("  ", " ").strip()
+   -     return formatted
+22 +     return formatted.replace("()", "").replace("  ", " ").strip()
+23 | 
+24 | 
+25 | # https://github.com/afonasev/flake8-return/issues/47#issue-641117366
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `queryset` before `return` statement
    --> RET504.py:246:12
@@ -52,17 +50,16 @@ RET504 [*] Unnecessary assignment to `queryset` before `return` statement
     |            ^^^^^^^^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-242 242 | 
-243 243 | def get_queryset():
-244 244 |     queryset = Model.filter(a=1)
-245     |-    queryset = queryset.filter(c=3)
-246     |-    return queryset
-    245 |+    return queryset.filter(c=3)
-247 246 | 
-248 247 | 
-249 248 | def get_queryset():
+242 | 
+243 | def get_queryset():
+244 |     queryset = Model.filter(a=1)
+    -     queryset = queryset.filter(c=3)
+    -     return queryset
+245 +     return queryset.filter(c=3)
+246 | 
+247 | 
+248 | def get_queryset():
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `queryset` before `return` statement
    --> RET504.py:251:12
@@ -73,17 +70,16 @@ RET504 [*] Unnecessary assignment to `queryset` before `return` statement
     |            ^^^^^^^^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-247 247 | 
-248 248 | 
-249 249 | def get_queryset():
-250     |-    queryset = Model.filter(a=1)
-251     |-    return queryset  # RET504
-    250 |+    return Model.filter(a=1)
-252 251 | 
-253 252 | 
-254 253 | # Function arguments
+247 | 
+248 | 
+249 | def get_queryset():
+    -     queryset = Model.filter(a=1)
+    -     return queryset  # RET504
+250 +     return Model.filter(a=1)
+251 | 
+252 | 
+253 | # Function arguments
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `val` before `return` statement
    --> RET504.py:269:12
@@ -94,17 +90,16 @@ RET504 [*] Unnecessary assignment to `val` before `return` statement
     |            ^^^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-265 265 | def str_to_bool(val):
-266 266 |     if isinstance(val, bool):
-267 267 |         return val
-268     |-    val = 1
-269     |-    return val  # RET504
-    268 |+    return 1
-270 269 | 
-271 270 | 
-272 271 | def str_to_bool(val):
+265 | def str_to_bool(val):
+266 |     if isinstance(val, bool):
+267 |         return val
+    -     val = 1
+    -     return val  # RET504
+268 +     return 1
+269 | 
+270 | 
+271 | def str_to_bool(val):
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `x` before `return` statement
    --> RET504.py:321:12
@@ -115,17 +110,16 @@ RET504 [*] Unnecessary assignment to `x` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-317 317 | # `with` statements
-318 318 | def foo():
-319 319 |     with open("foo.txt", "r") as f:
-320     |-        x = f.read()
-321     |-    return x  # RET504
-    320 |+        return f.read()
-322 321 | 
-323 322 | 
-324 323 | def foo():
+317 | # `with` statements
+318 | def foo():
+319 |     with open("foo.txt", "r") as f:
+    -         x = f.read()
+    -     return x  # RET504
+320 +         return f.read()
+321 | 
+322 | 
+323 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `b` before `return` statement
    --> RET504.py:342:12
@@ -136,17 +130,16 @@ RET504 [*] Unnecessary assignment to `b` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-338 338 | # Fix cases
-339 339 | def foo():
-340 340 |     a = 1
-341     |-    b=a
-342     |-    return b  # RET504
-    341 |+    return a
-343 342 | 
-344 343 | 
-345 344 | def foo():
+338 | # Fix cases
+339 | def foo():
+340 |     a = 1
+    -     b=a
+    -     return b  # RET504
+341 +     return a
+342 | 
+343 | 
+344 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `b` before `return` statement
    --> RET504.py:348:12
@@ -157,17 +150,16 @@ RET504 [*] Unnecessary assignment to `b` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-344 344 | 
-345 345 | def foo():
-346 346 |     a = 1
-347     |-    b =a
-348     |-    return b  # RET504
-    347 |+    return a
-349 348 | 
-350 349 | 
-351 350 | def foo():
+344 | 
+345 | def foo():
+346 |     a = 1
+    -     b =a
+    -     return b  # RET504
+347 +     return a
+348 | 
+349 | 
+350 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `b` before `return` statement
    --> RET504.py:354:12
@@ -178,17 +170,16 @@ RET504 [*] Unnecessary assignment to `b` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-350 350 | 
-351 351 | def foo():
-352 352 |     a = 1
-353     |-    b= a
-354     |-    return b  # RET504
-    353 |+    return a
-355 354 | 
-356 355 | 
-357 356 | def foo():
+350 | 
+351 | def foo():
+352 |     a = 1
+    -     b= a
+    -     return b  # RET504
+353 +     return a
+354 | 
+355 | 
+356 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `a` before `return` statement
    --> RET504.py:359:12
@@ -199,17 +190,16 @@ RET504 [*] Unnecessary assignment to `a` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-355 355 | 
-356 356 | 
-357 357 | def foo():
-358     |-    a = 1  # Comment
-359     |-    return a
-    358 |+    return 1  # Comment
-360 359 | 
-361 360 | 
-362 361 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098
+355 | 
+356 | 
+357 | def foo():
+    -     a = 1  # Comment
+    -     return a
+358 +     return 1  # Comment
+359 | 
+360 | 
+361 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `D` before `return` statement
    --> RET504.py:365:12
@@ -220,17 +210,16 @@ RET504 [*] Unnecessary assignment to `D` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-361 361 | 
-362 362 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098
-363 363 | def mavko_debari(P_kbar):
-364     |-    D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
-365     |-    return D
-    364 |+    return 0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
-366 365 | 
-367 366 | 
-368 367 | # contextlib suppress in with statement
+361 | 
+362 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098
+363 | def mavko_debari(P_kbar):
+    -     D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
+    -     return D
+364 +     return 0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
+365 | 
+366 | 
+367 | # contextlib suppress in with statement
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `y` before `return` statement
    --> RET504.py:400:12
@@ -241,17 +230,16 @@ RET504 [*] Unnecessary assignment to `y` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-396 396 |     x = 2
-397 397 |     with contextlib.suppress(Exception):
-398 398 |         x = 1
-399     |-    y = y + 2
-400     |-    return y  # RET504
-    399 |+    return y + 2
-401 400 | 
-402 401 | 
-403 402 | def foo():
+396 |     x = 2
+397 |     with contextlib.suppress(Exception):
+398 |         x = 1
+    -     y = y + 2
+    -     return y  # RET504
+399 +     return y + 2
+400 | 
+401 | 
+402 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `services` before `return` statement
    --> RET504.py:423:16
@@ -262,17 +250,16 @@ RET504 [*] Unnecessary assignment to `services` before `return` statement
     |                ^^^^^^^^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-419 419 | # See: https://github.com/astral-sh/ruff/issues/10732
-420 420 | def func(a: dict[str, int]) -> list[dict[str, int]]:
-421 421 |     if "services" in a:
-422     |-        services = a["services"]
-423     |-        return services
-    422 |+        return a["services"]
-424 423 | 
-425 424 | 
-426 425 | # See: https://github.com/astral-sh/ruff/issues/14052
+419 | # See: https://github.com/astral-sh/ruff/issues/10732
+420 | def func(a: dict[str, int]) -> list[dict[str, int]]:
+421 |     if "services" in a:
+    -         services = a["services"]
+    -         return services
+422 +         return a["services"]
+423 | 
+424 | 
+425 | # See: https://github.com/astral-sh/ruff/issues/14052
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `x` before `return` statement
    --> RET504.py:458:12
@@ -285,18 +272,17 @@ RET504 [*] Unnecessary assignment to `x` before `return` statement
 460 | def f():
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-453 453 | 
-454 454 | # See: https://github.com/astral-sh/ruff/issues/18411
-455 455 | def f():
-456     |-    (#=
-457     |-    x) = 1
-458     |-    return x
-    456 |+    return 1
-459 457 | 
-460 458 | def f():
-461 459 |     x = (1
+453 | 
+454 | # See: https://github.com/astral-sh/ruff/issues/18411
+455 | def f():
+    -     (#=
+    -     x) = 1
+    -     return x
+456 +     return 1
+457 | 
+458 | def f():
+459 |     x = (1
+note: This is an unsafe fix and may change runtime behavior
 
 RET504 [*] Unnecessary assignment to `x` before `return` statement
    --> RET504.py:463:12
@@ -307,12 +293,11 @@ RET504 [*] Unnecessary assignment to `x` before `return` statement
     |            ^
     |
 help: Remove unnecessary assignment
-
-ℹ Unsafe fix
-458 458 |     return x
-459 459 | 
-460 460 | def f():
-461     |-    x = (1
-    461 |+    return (1
-462 462 |               )
-463     |-    return x
+458 |     return x
+459 | 
+460 | def f():
+    -     x = (1
+461 +     return (1
+462 |               )
+    -     return x
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap
index e67b72a86f..e0241da6e7 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap
@@ -12,16 +12,14 @@ RET505 [*] Unnecessary `elif` after `return` statement
 10 |         return w
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-5 5 |     if x:  # [no-else-return]
-6 6 |         a = 1
-7 7 |         return y
-8   |-    elif z:
-  8 |+    if z:
-9 9 |         b = 2
-10 10 |         return w
-11 11 |     else:
+5  |     if x:  # [no-else-return]
+6  |         a = 1
+7  |         return y
+   -     elif z:
+8  +     if z:
+9  |         b = 2
+10 |         return w
+11 |     else:
 
 RET505 [*] Unnecessary `elif` after `return` statement
   --> RET505.py:23:5
@@ -34,16 +32,14 @@ RET505 [*] Unnecessary `elif` after `return` statement
 25 |     else:
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-20 20 |         else:
-21 21 |             b = 2
-22 22 |         return
-23    |-    elif z:
-   23 |+    if z:
-24 24 |         c = 2
-25 25 |     else:
-26 26 |         c = 3
+20 |         else:
+21 |             b = 2
+22 |         return
+   -     elif z:
+23 +     if z:
+24 |         c = 2
+25 |     else:
+26 |         c = 3
 
 RET505 [*] Unnecessary `elif` after `return` statement
   --> RET505.py:41:5
@@ -56,16 +52,14 @@ RET505 [*] Unnecessary `elif` after `return` statement
 43 |         return w
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-38 38 |     if x:  # [no-else-return]
-39 39 |         a = 1
-40 40 |         return y
-41    |-    elif z:
-   41 |+    if z:
-42 42 |         b = 2
-43 43 |         return w
-44 44 |     else:
+38 |     if x:  # [no-else-return]
+39 |         a = 1
+40 |         return y
+   -     elif z:
+41 +     if z:
+42 |         b = 2
+43 |         return w
+44 |     else:
 
 RET505 [*] Unnecessary `else` after `return` statement
   --> RET505.py:53:5
@@ -78,19 +72,17 @@ RET505 [*] Unnecessary `else` after `return` statement
 55 |         return z
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-50 50 |     if x:  # [no-else-return]
-51 51 |         a = 1
-52 52 |         return y
-53    |-    else:
-54    |-        b = 2
-55    |-        return z
-   53 |+    b = 2
-   54 |+    return z
-56 55 | 
-57 56 | 
-58 57 | def foo3(x, y, z):
+50 |     if x:  # [no-else-return]
+51 |         a = 1
+52 |         return y
+   -     else:
+   -         b = 2
+   -         return z
+53 +     b = 2
+54 +     return z
+55 | 
+56 | 
+57 | def foo3(x, y, z):
 
 RET505 [*] Unnecessary `else` after `return` statement
   --> RET505.py:64:9
@@ -103,19 +95,17 @@ RET505 [*] Unnecessary `else` after `return` statement
 66 |             return x
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-61 61 |         if y:  # [no-else-return]
-62 62 |             b = 2
-63 63 |             return y
-64    |-        else:
-65    |-            c = 3
-66    |-            return x
-   64 |+        c = 3
-   65 |+        return x
-67 66 |     else:
-68 67 |         d = 4
-69 68 |         return z
+61 |         if y:  # [no-else-return]
+62 |             b = 2
+63 |             return y
+   -         else:
+   -             c = 3
+   -             return x
+64 +         c = 3
+65 +         return x
+66 |     else:
+67 |         d = 4
+68 |         return z
 
 RET505 [*] Unnecessary `else` after `return` statement
   --> RET505.py:79:5
@@ -128,17 +118,15 @@ RET505 [*] Unnecessary `else` after `return` statement
 81 |     return
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-76 76 |         else:
-77 77 |             b = 2
-78 78 |         return
-79    |-    else:
-80    |-        c = 3
-   79 |+    c = 3
-81 80 |     return
-82 81 | 
-83 82 | 
+76 |         else:
+77 |             b = 2
+78 |         return
+   -     else:
+   -         c = 3
+79 +     c = 3
+80 |     return
+81 | 
+82 | 
 
 RET505 [*] Unnecessary `else` after `return` statement
   --> RET505.py:89:9
@@ -151,17 +139,15 @@ RET505 [*] Unnecessary `else` after `return` statement
 91 |     else:
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-86 86 |         if y:  # [no-else-return]
-87 87 |             a = 4
-88 88 |             return
-89    |-        else:
-90    |-            b = 2
-   89 |+        b = 2
-91 90 |     else:
-92 91 |         c = 3
-93 92 |     return
+86 |         if y:  # [no-else-return]
+87 |             a = 4
+88 |             return
+   -         else:
+   -             b = 2
+89 +         b = 2
+90 |     else:
+91 |         c = 3
+92 |     return
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:99:5
@@ -174,23 +160,21 @@ RET505 [*] Unnecessary `else` after `return` statement
 101 |             return False
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-96  96  | def bar4(x):
-97  97  |     if x:  # [no-else-return]
-98  98  |         return True
-99      |-    else:
-100     |-        try:
-101     |-            return False
-102     |-        except ValueError:
-103     |-            return None
-    99  |+    try:
-    100 |+        return False
-    101 |+    except ValueError:
-    102 |+        return None
-104 103 | 
-105 104 | 
-106 105 | def fibo(n):
+96  | def bar4(x):
+97  |     if x:  # [no-else-return]
+98  |         return True
+    -     else:
+    -         try:
+    -             return False
+    -         except ValueError:
+    -             return None
+99  +     try:
+100 +         return False
+101 +     except ValueError:
+102 +         return None
+103 | 
+104 | 
+105 | def fibo(n):
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:109:5
@@ -203,19 +187,17 @@ RET505 [*] Unnecessary `else` after `return` statement
 111 |         last2 = 0;
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-106 106 | def fibo(n):
-107 107 |     if n<2:
-108 108 |         return n;
-109     |-    else:
-110     |-        last = 1;
-111     |-        last2 = 0;
-    109 |+    last = 1;
-    110 |+    last2 = 0;
-112 111 | 
-113 112 | 
-114 113 | ###
+106 | def fibo(n):
+107 |     if n<2:
+108 |         return n;
+    -     else:
+    -         last = 1;
+    -         last2 = 0;
+109 +     last = 1;
+110 +     last2 = 0;
+111 | 
+112 | 
+113 | ###
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:145:5
@@ -228,19 +210,17 @@ RET505 [*] Unnecessary `else` after `return` statement
 147 |         pass
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-142 142 | def bar4(x):
-143 143 |     if True:
-144 144 |         return
-145     |-    else:
-146     |-        # comment
-147     |-        pass
-    145 |+    # comment
-    146 |+    pass
-148 147 | 
-149 148 | 
-150 149 | def bar5():
+142 | def bar4(x):
+143 |     if True:
+144 |         return
+    -     else:
+    -         # comment
+    -         pass
+145 +     # comment
+146 +     pass
+147 | 
+148 | 
+149 | def bar5():
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:153:5
@@ -252,18 +232,16 @@ RET505 [*] Unnecessary `else` after `return` statement
 154 |         pass
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-150 150 | def bar5():
-151 151 |     if True:
-152 152 |         return
-153     |-    else:  # comment
-154     |-        pass
-    153 |+    # comment
-    154 |+    pass
-155 155 | 
-156 156 | 
-157 157 | def bar6():
+150 | def bar5():
+151 |     if True:
+152 |         return
+    -     else:  # comment
+    -         pass
+153 +     # comment
+154 +     pass
+155 | 
+156 | 
+157 | def bar6():
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:160:5
@@ -276,20 +254,18 @@ RET505 [*] Unnecessary `else` after `return` statement
 162 |         # comment
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-157 157 | def bar6():
-158 158 |     if True:
-159 159 |         return
-160     |-    else\
-161     |-        :\
-162     |-        # comment
-163     |-        pass
-    160 |+    # comment
-    161 |+    pass
-164 162 | 
-165 163 | 
-166 164 | def bar7():
+157 | def bar6():
+158 |     if True:
+159 |         return
+    -     else\
+    -         :\
+    -         # comment
+    -         pass
+160 +     # comment
+161 +     pass
+162 | 
+163 | 
+164 | def bar7():
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:169:5
@@ -302,19 +278,17 @@ RET505 [*] Unnecessary `else` after `return` statement
 171 |         pass
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-166 166 | def bar7():
-167 167 |     if True:
-168 168 |         return
-169     |-    else\
-170     |-        :  # comment
-171     |-        pass
-    169 |+    # comment
-    170 |+    pass
-172 171 | 
-173 172 | 
-174 173 | def bar8():
+166 | def bar7():
+167 |     if True:
+168 |         return
+    -     else\
+    -         :  # comment
+    -         pass
+169 +     # comment
+170 +     pass
+171 | 
+172 | 
+173 | def bar8():
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:177:5
@@ -325,16 +299,14 @@ RET505 [*] Unnecessary `else` after `return` statement
     |     ^^^^
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-174 174 | def bar8():
-175 175 |     if True:
-176 176 |         return
-177     |-    else: pass
-    177 |+    pass
-178 178 | 
-179 179 | 
-180 180 | def bar9():
+174 | def bar8():
+175 |     if True:
+176 |         return
+    -     else: pass
+177 +     pass
+178 | 
+179 | 
+180 | def bar9():
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:183:5
@@ -346,17 +318,15 @@ RET505 [*] Unnecessary `else` after `return` statement
 184 |         pass
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-180 180 | def bar9():
-181 181 |     if True:
-182 182 |         return
-183     |-    else:\
-184     |-        pass
-    183 |+    pass
-185 184 | 
-186 185 | 
-187 186 | x = 0
+180 | def bar9():
+181 |     if True:
+182 |         return
+    -     else:\
+    -         pass
+183 +     pass
+184 | 
+185 | 
+186 | x = 0
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:200:5
@@ -367,16 +337,14 @@ RET505 [*] Unnecessary `else` after `return` statement
     |     ^^^^
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-197 197 | # Regression test for: https://github.com/astral-sh/ruff/issues/9732
-198 198 | def sb(self):
-199 199 |     if self._sb is not None: return self._sb
-200     |-    else: self._sb = '\033[01;%dm'; self._sa = '\033[0;0m';
-    200 |+    self._sb = '\033[01;%dm'; self._sa = '\033[0;0m';
-201 201 | 
-202 202 | 
-203 203 | def indent(x, y, w, z):
+197 | # Regression test for: https://github.com/astral-sh/ruff/issues/9732
+198 | def sb(self):
+199 |     if self._sb is not None: return self._sb
+    -     else: self._sb = '\033[01;%dm'; self._sa = '\033[0;0m';
+200 +     self._sb = '\033[01;%dm'; self._sa = '\033[0;0m';
+201 | 
+202 | 
+203 | def indent(x, y, w, z):
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:207:5
@@ -389,20 +357,18 @@ RET505 [*] Unnecessary `else` after `return` statement
 209 |         c = 3
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-204 204 |     if x:  # [no-else-return]
-205 205 |         a = 1
-206 206 |         return y
-207     |-    else:
-208 207 | 
-209     |-        c = 3
-210     |-        return z
-    208 |+    c = 3
-    209 |+    return z
-211 210 | 
-212 211 | 
-213 212 | def indent(x, y, w, z):
+204 |     if x:  # [no-else-return]
+205 |         a = 1
+206 |         return y
+    -     else:
+207 | 
+    -         c = 3
+    -         return z
+208 +     c = 3
+209 +     return z
+210 | 
+211 | 
+212 | def indent(x, y, w, z):
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:217:5
@@ -415,21 +381,19 @@ RET505 [*] Unnecessary `else` after `return` statement
 219 |         c = 3
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-214 214 |     if x:  # [no-else-return]
-215 215 |         a = 1
-216 216 |         return y
-217     |-    else:
-218     |-        # comment
-219     |-        c = 3
-220     |-        return z
-    217 |+    # comment
-    218 |+    c = 3
-    219 |+    return z
-221 220 | 
-222 221 | 
-223 222 | def indent(x, y, w, z):
+214 |     if x:  # [no-else-return]
+215 |         a = 1
+216 |         return y
+    -     else:
+    -         # comment
+    -         c = 3
+    -         return z
+217 +     # comment
+218 +     c = 3
+219 +     return z
+220 | 
+221 | 
+222 | def indent(x, y, w, z):
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:227:5
@@ -442,21 +406,19 @@ RET505 [*] Unnecessary `else` after `return` statement
 229 |         c = 3
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-224 224 |     if x:  # [no-else-return]
-225 225 |         a = 1
-226 226 |         return y
-227     |-    else:
-228     |-          # comment
-229     |-        c = 3
-230     |-        return z
-    227 |+      # comment
-    228 |+    c = 3
-    229 |+    return z
-231 230 | 
-232 231 | 
-233 232 | def indent(x, y, w, z):
+224 |     if x:  # [no-else-return]
+225 |         a = 1
+226 |         return y
+    -     else:
+    -           # comment
+    -         c = 3
+    -         return z
+227 +       # comment
+228 +     c = 3
+229 +     return z
+230 | 
+231 | 
+232 | def indent(x, y, w, z):
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:237:5
@@ -469,20 +431,18 @@ RET505 [*] Unnecessary `else` after `return` statement
 239 |         c = 3
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-234 234 |     if x:  # [no-else-return]
-235 235 |         a = 1
-236 236 |         return y
-237     |-    else:
-238 237 |   # comment
-239     |-        c = 3
-240     |-        return z
-    238 |+    c = 3
-    239 |+    return z
-241 240 | 
-242 241 | def f():
-243 242 | 	if True:
+234 |     if x:  # [no-else-return]
+235 |         a = 1
+236 |         return y
+    -     else:
+237 |   # comment
+    -         c = 3
+    -         return z
+238 +     c = 3
+239 +     return z
+240 | 
+241 | def f():
+242 | 	if True:
 
 RET505 [*] Unnecessary `else` after `return` statement
    --> RET505.py:245:2
@@ -494,17 +454,15 @@ RET505 [*] Unnecessary `else` after `return` statement
 246 |      return False
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-242 242 | def f():
-243 243 | 	if True:
-244 244 | 	 return True
-245     |-	else:
-246     |-	 return False
-    245 |+	return False
-247 246 | 
-248 247 | 
-249 248 | def has_untracted_files():
+242 | def f():
+243 | 	if True:
+244 | 	 return True
+    - 	else:
+    - 	 return False
+245 + 	return False
+246 | 
+247 | 
+248 | def has_untracted_files():
 
 RET505 Unnecessary `else` after `return` statement
    --> RET505.py:252:5
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap
index 30781b52ad..41fc1cec19 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap
@@ -12,16 +12,14 @@ RET506 [*] Unnecessary `elif` after `raise` statement
 10 |         raise Exception(w)
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-5 5 |     if x:  # [no-else-raise]
-6 6 |         a = 1
-7 7 |         raise Exception(y)
-8   |-    elif z:
-  8 |+    if z:
-9 9 |         b = 2
-10 10 |         raise Exception(w)
-11 11 |     else:
+5  |     if x:  # [no-else-raise]
+6  |         a = 1
+7  |         raise Exception(y)
+   -     elif z:
+8  +     if z:
+9  |         b = 2
+10 |         raise Exception(w)
+11 |     else:
 
 RET506 [*] Unnecessary `elif` after `raise` statement
   --> RET506.py:23:5
@@ -34,16 +32,14 @@ RET506 [*] Unnecessary `elif` after `raise` statement
 25 |     else:
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-20 20 |         else:
-21 21 |             b = 2
-22 22 |         raise Exception(x)
-23    |-    elif z:
-   23 |+    if z:
-24 24 |         raise Exception(y)
-25 25 |     else:
-26 26 |         c = 3
+20 |         else:
+21 |             b = 2
+22 |         raise Exception(x)
+   -     elif z:
+23 +     if z:
+24 |         raise Exception(y)
+25 |     else:
+26 |         c = 3
 
 RET506 [*] Unnecessary `else` after `raise` statement
   --> RET506.py:34:5
@@ -56,19 +52,17 @@ RET506 [*] Unnecessary `else` after `raise` statement
 36 |         raise Exception(z)
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-31 31 |     if x:  # [no-else-raise]
-32 32 |         a = 1
-33 33 |         raise Exception(y)
-34    |-    else:
-35    |-        b = 2
-36    |-        raise Exception(z)
-   34 |+    b = 2
-   35 |+    raise Exception(z)
-37 36 | 
-38 37 | 
-39 38 | def foo3(x, y, z):
+31 |     if x:  # [no-else-raise]
+32 |         a = 1
+33 |         raise Exception(y)
+   -     else:
+   -         b = 2
+   -         raise Exception(z)
+34 +     b = 2
+35 +     raise Exception(z)
+36 | 
+37 | 
+38 | def foo3(x, y, z):
 
 RET506 [*] Unnecessary `else` after `raise` statement
   --> RET506.py:45:9
@@ -81,19 +75,17 @@ RET506 [*] Unnecessary `else` after `raise` statement
 47 |             raise Exception(x)
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-42 42 |         if y:  # [no-else-raise]
-43 43 |             b = 2
-44 44 |             raise Exception(y)
-45    |-        else:
-46    |-            c = 3
-47    |-            raise Exception(x)
-   45 |+        c = 3
-   46 |+        raise Exception(x)
-48 47 |     else:
-49 48 |         d = 4
-50 49 |         raise Exception(z)
+42 |         if y:  # [no-else-raise]
+43 |             b = 2
+44 |             raise Exception(y)
+   -         else:
+   -             c = 3
+   -             raise Exception(x)
+45 +         c = 3
+46 +         raise Exception(x)
+47 |     else:
+48 |         d = 4
+49 |         raise Exception(z)
 
 RET506 [*] Unnecessary `else` after `raise` statement
   --> RET506.py:60:5
@@ -106,17 +98,15 @@ RET506 [*] Unnecessary `else` after `raise` statement
 62 |     raise Exception(y)
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-57 57 |         else:
-58 58 |             b = 2
-59 59 |         raise Exception(x)
-60    |-    else:
-61    |-        c = 3
-   60 |+    c = 3
-62 61 |     raise Exception(y)
-63 62 | 
-64 63 | 
+57 |         else:
+58 |             b = 2
+59 |         raise Exception(x)
+   -     else:
+   -         c = 3
+60 +     c = 3
+61 |     raise Exception(y)
+62 | 
+63 | 
 
 RET506 [*] Unnecessary `else` after `raise` statement
   --> RET506.py:70:9
@@ -129,17 +119,15 @@ RET506 [*] Unnecessary `else` after `raise` statement
 72 |     else:
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-67 67 |         if y:  # [no-else-raise]
-68 68 |             a = 4
-69 69 |             raise Exception(x)
-70    |-        else:
-71    |-            b = 2
-   70 |+        b = 2
-72 71 |     else:
-73 72 |         c = 3
-74 73 |     raise Exception(y)
+67 |         if y:  # [no-else-raise]
+68 |             a = 4
+69 |             raise Exception(x)
+   -         else:
+   -             b = 2
+70 +         b = 2
+71 |     else:
+72 |         c = 3
+73 |     raise Exception(y)
 
 RET506 [*] Unnecessary `else` after `raise` statement
   --> RET506.py:80:5
@@ -152,20 +140,18 @@ RET506 [*] Unnecessary `else` after `raise` statement
 82 |             raise Exception(False)
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-77 77 | def bar4(x):
-78 78 |     if x:  # [no-else-raise]
-79 79 |         raise Exception(True)
-80    |-    else:
-81    |-        try:
-82    |-            raise Exception(False)
-83    |-        except ValueError:
-84    |-            raise Exception(None)
-   80 |+    try:
-   81 |+        raise Exception(False)
-   82 |+    except ValueError:
-   83 |+        raise Exception(None)
-85 84 | 
-86 85 | 
-87 86 | ###
+77 | def bar4(x):
+78 |     if x:  # [no-else-raise]
+79 |         raise Exception(True)
+   -     else:
+   -         try:
+   -             raise Exception(False)
+   -         except ValueError:
+   -             raise Exception(None)
+80 +     try:
+81 +         raise Exception(False)
+82 +     except ValueError:
+83 +         raise Exception(None)
+84 | 
+85 | 
+86 | ###
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap
index 0a2c279fb5..85dbb3204f 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap
@@ -12,16 +12,14 @@ RET507 [*] Unnecessary `elif` after `continue` statement
 10 |         else:
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-5 5 |     for i in x:
-6 6 |         if i < y:  # [no-else-continue]
-7 7 |             continue
-8   |-        elif i < w:
-  8 |+        if i < w:
-9 9 |             continue
-10 10 |         else:
-11 11 |             a = z
+5  |     for i in x:
+6  |         if i < y:  # [no-else-continue]
+7  |             continue
+   -         elif i < w:
+8  +         if i < w:
+9  |             continue
+10 |         else:
+11 |             a = z
 
 RET507 [*] Unnecessary `elif` after `continue` statement
   --> RET507.py:22:9
@@ -34,16 +32,14 @@ RET507 [*] Unnecessary `elif` after `continue` statement
 24 |         else:
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-19 19 |             else:
-20 20 |                 b = 2
-21 21 |             continue
-22    |-        elif z:
-   22 |+        if z:
-23 23 |             c = 2
-24 24 |         else:
-25 25 |             c = 3
+19 |             else:
+20 |                 b = 2
+21 |             continue
+   -         elif z:
+22 +         if z:
+23 |             c = 2
+24 |         else:
+25 |             c = 3
 
 RET507 [*] Unnecessary `else` after `continue` statement
   --> RET507.py:36:9
@@ -55,17 +51,15 @@ RET507 [*] Unnecessary `else` after `continue` statement
 37 |             a = z
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-33 33 |     for i in x:
-34 34 |         if i < y:  # [no-else-continue]
-35 35 |             continue
-36    |-        else:
-37    |-            a = z
-   36 |+        a = z
-38 37 | 
-39 38 | 
-40 39 | def foo3(x, y, z):
+33 |     for i in x:
+34 |         if i < y:  # [no-else-continue]
+35 |             continue
+   -         else:
+   -             a = z
+36 +         a = z
+37 | 
+38 | 
+39 | def foo3(x, y, z):
 
 RET507 [*] Unnecessary `else` after `continue` statement
   --> RET507.py:47:13
@@ -78,19 +72,17 @@ RET507 [*] Unnecessary `else` after `continue` statement
 49 |                 continue
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-44 44 |             if z:  # [no-else-continue]
-45 45 |                 b = 2
-46 46 |                 continue
-47    |-            else:
-48    |-                c = 3
-49    |-                continue
-   47 |+            c = 3
-   48 |+            continue
-50 49 |         else:
-51 50 |             d = 4
-52 51 |             continue
+44 |             if z:  # [no-else-continue]
+45 |                 b = 2
+46 |                 continue
+   -             else:
+   -                 c = 3
+   -                 continue
+47 +             c = 3
+48 +             continue
+49 |         else:
+50 |             d = 4
+51 |             continue
 
 RET507 [*] Unnecessary `else` after `continue` statement
   --> RET507.py:63:9
@@ -103,17 +95,15 @@ RET507 [*] Unnecessary `else` after `continue` statement
 65 |         continue
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-60 60 |             else:
-61 61 |                 b = 2
-62 62 |             continue
-63    |-        else:
-64    |-            c = 3
-   63 |+        c = 3
-65 64 |         continue
-66 65 | 
-67 66 | 
+60 |             else:
+61 |                 b = 2
+62 |             continue
+   -         else:
+   -             c = 3
+63 +         c = 3
+64 |         continue
+65 | 
+66 | 
 
 RET507 [*] Unnecessary `else` after `continue` statement
   --> RET507.py:74:13
@@ -126,17 +116,15 @@ RET507 [*] Unnecessary `else` after `continue` statement
 76 |         else:
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-71 71 |             if y:  # [no-else-continue]
-72 72 |                 a = 4
-73 73 |                 continue
-74    |-            else:
-75    |-                b = 2
-   74 |+            b = 2
-76 75 |         else:
-77 76 |             c = 3
-78 77 |         continue
+71 |             if y:  # [no-else-continue]
+72 |                 a = 4
+73 |                 continue
+   -             else:
+   -                 b = 2
+74 +             b = 2
+75 |         else:
+76 |             c = 3
+77 |         continue
 
 RET507 [*] Unnecessary `else` after `continue` statement
   --> RET507.py:85:9
@@ -149,20 +137,18 @@ RET507 [*] Unnecessary `else` after `continue` statement
 87 |                 return
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-82 82 |     for i in range(10):
-83 83 |         if x:  # [no-else-continue]
-84 84 |             continue
-85    |-        else:
-86    |-            try:
-87    |-                return
-88    |-            except ValueError:
-89    |-                continue
-   85 |+        try:
-   86 |+            return
-   87 |+        except ValueError:
-   88 |+            continue
-90 89 | 
-91 90 | 
-92 91 | def bar1(x, y, z):
+82 |     for i in range(10):
+83 |         if x:  # [no-else-continue]
+84 |             continue
+   -         else:
+   -             try:
+   -                 return
+   -             except ValueError:
+   -                 continue
+85 +         try:
+86 +             return
+87 +         except ValueError:
+88 +             continue
+89 | 
+90 | 
+91 | def bar1(x, y, z):
diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap
index 3b0edfbc06..6cee48b323 100644
--- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap
@@ -12,16 +12,14 @@ RET508 [*] Unnecessary `elif` after `break` statement
 10 |         else:
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-5 5 |     for i in x:
-6 6 |         if i > y:  # [no-else-break]
-7 7 |             break
-8   |-        elif i > w:
-  8 |+        if i > w:
-9 9 |             break
-10 10 |         else:
-11 11 |             a = z
+5  |     for i in x:
+6  |         if i > y:  # [no-else-break]
+7  |             break
+   -         elif i > w:
+8  +         if i > w:
+9  |             break
+10 |         else:
+11 |             a = z
 
 RET508 [*] Unnecessary `elif` after `break` statement
   --> RET508.py:22:9
@@ -34,16 +32,14 @@ RET508 [*] Unnecessary `elif` after `break` statement
 24 |         else:
    |
 help: Remove unnecessary `elif`
-
-ℹ Safe fix
-19 19 |             else:
-20 20 |                 b = 2
-21 21 |             break
-22    |-        elif z:
-   22 |+        if z:
-23 23 |             c = 2
-24 24 |         else:
-25 25 |             c = 3
+19 |             else:
+20 |                 b = 2
+21 |             break
+   -         elif z:
+22 +         if z:
+23 |             c = 2
+24 |         else:
+25 |             c = 3
 
 RET508 [*] Unnecessary `else` after `break` statement
   --> RET508.py:33:9
@@ -55,17 +51,15 @@ RET508 [*] Unnecessary `else` after `break` statement
 34 |             a = z
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-30 30 |     for i in x:
-31 31 |         if i > y:  # [no-else-break]
-32 32 |             break
-33    |-        else:
-34    |-            a = z
-   33 |+        a = z
-35 34 | 
-36 35 | 
-37 36 | def foo3(x, y, z):
+30 |     for i in x:
+31 |         if i > y:  # [no-else-break]
+32 |             break
+   -         else:
+   -             a = z
+33 +         a = z
+34 | 
+35 | 
+36 | def foo3(x, y, z):
 
 RET508 [*] Unnecessary `else` after `break` statement
   --> RET508.py:44:13
@@ -78,19 +72,17 @@ RET508 [*] Unnecessary `else` after `break` statement
 46 |                 break
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-41 41 |             if z:  # [no-else-break]
-42 42 |                 b = 2
-43 43 |                 break
-44    |-            else:
-45    |-                c = 3
-46    |-                break
-   44 |+            c = 3
-   45 |+            break
-47 46 |         else:
-48 47 |             d = 4
-49 48 |             break
+41 |             if z:  # [no-else-break]
+42 |                 b = 2
+43 |                 break
+   -             else:
+   -                 c = 3
+   -                 break
+44 +             c = 3
+45 +             break
+46 |         else:
+47 |             d = 4
+48 |             break
 
 RET508 [*] Unnecessary `else` after `break` statement
   --> RET508.py:60:9
@@ -103,17 +95,15 @@ RET508 [*] Unnecessary `else` after `break` statement
 62 |         break
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-57 57 |             else:
-58 58 |                 b = 2
-59 59 |             break
-60    |-        else:
-61    |-            c = 3
-   60 |+        c = 3
-62 61 |         break
-63 62 | 
-64 63 | 
+57 |             else:
+58 |                 b = 2
+59 |             break
+   -         else:
+   -             c = 3
+60 +         c = 3
+61 |         break
+62 | 
+63 | 
 
 RET508 [*] Unnecessary `else` after `break` statement
   --> RET508.py:71:13
@@ -126,17 +116,15 @@ RET508 [*] Unnecessary `else` after `break` statement
 73 |         else:
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-68 68 |             if y:  # [no-else-break]
-69 69 |                 a = 4
-70 70 |                 break
-71    |-            else:
-72    |-                b = 2
-   71 |+            b = 2
-73 72 |         else:
-74 73 |             c = 3
-75 74 |         break
+68 |             if y:  # [no-else-break]
+69 |                 a = 4
+70 |                 break
+   -             else:
+   -                 b = 2
+71 +             b = 2
+72 |         else:
+73 |             c = 3
+74 |         break
 
 RET508 [*] Unnecessary `else` after `break` statement
   --> RET508.py:82:9
@@ -149,23 +137,21 @@ RET508 [*] Unnecessary `else` after `break` statement
 84 |                 return
    |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-79 79 |     for i in range(10):
-80 80 |         if x:  # [no-else-break]
-81 81 |             break
-82    |-        else:
-83    |-            try:
-84    |-                return
-85    |-            except ValueError:
-86    |-                break
-   82 |+        try:
-   83 |+            return
-   84 |+        except ValueError:
-   85 |+            break
-87 86 | 
-88 87 | 
-89 88 | ###
+79 |     for i in range(10):
+80 |         if x:  # [no-else-break]
+81 |             break
+   -         else:
+   -             try:
+   -                 return
+   -             except ValueError:
+   -                 break
+82 +         try:
+83 +             return
+84 +         except ValueError:
+85 +             break
+86 | 
+87 | 
+88 | ###
 
 RET508 [*] Unnecessary `else` after `break` statement
    --> RET508.py:158:13
@@ -177,11 +163,9 @@ RET508 [*] Unnecessary `else` after `break` statement
 159 |                 a = z
     |
 help: Remove unnecessary `else`
-
-ℹ Safe fix
-155 155 |         else:
-156 156 |             if i > w:
-157 157 |                 break
-158     |-            else:
-159     |-                a = z
-    158 |+            a = z
+155 |         else:
+156 |             if i > w:
+157 |                 break
+    -             else:
+    -                 a = z
+158 +             a = z
diff --git a/crates/ruff_linter/src/rules/flake8_self/rules/private_member_access.rs b/crates/ruff_linter/src/rules/flake8_self/rules/private_member_access.rs
index 2326e24ea3..1b2db08b00 100644
--- a/crates/ruff_linter/src/rules/flake8_self/rules/private_member_access.rs
+++ b/crates/ruff_linter/src/rules/flake8_self/rules/private_member_access.rs
@@ -55,6 +55,7 @@ use crate::rules::pylint::helpers::is_dunder_operator_method;
 /// ## References
 /// - [_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)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.240")]
 pub(crate) struct PrivateMemberAccess {
     access: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/mod.rs b/crates/ruff_linter/src/rules/flake8_simplify/mod.rs
index d3ac85a8fb..45233277e5 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/mod.rs
@@ -59,8 +59,8 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::MultipleWithStatements, Path::new("SIM117.py"))]
     #[test_case(Rule::SplitStaticString, Path::new("SIM905.py"))]
+    #[test_case(Rule::DictGetWithNoneDefault, Path::new("SIM910.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "preview__{}_{}",
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs
index 7576c71fc1..0b53a271f4 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs
@@ -45,6 +45,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `isinstance`](https://docs.python.org/3/library/functions.html#isinstance)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.212")]
 pub(crate) struct DuplicateIsinstanceCall {
     name: Option<String>,
 }
@@ -93,6 +94,7 @@ impl Violation for DuplicateIsinstanceCall {
 /// ## References
 /// - [Python documentation: Membership test operations](https://docs.python.org/3/reference/expressions.html#membership-test-operations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct CompareWithTuple {
     replacement: String,
 }
@@ -126,6 +128,7 @@ impl AlwaysFixableViolation for CompareWithTuple {
 /// ## References
 /// - [Python documentation: Boolean operations](https://docs.python.org/3/reference/expressions.html#boolean-operations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct ExprAndNotExpr {
     name: String,
 }
@@ -158,6 +161,7 @@ impl AlwaysFixableViolation for ExprAndNotExpr {
 /// ## References
 /// - [Python documentation: Boolean operations](https://docs.python.org/3/reference/expressions.html#boolean-operations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct ExprOrNotExpr {
     name: String,
 }
@@ -210,6 +214,7 @@ pub(crate) enum ContentAround {
 /// a = x or [1]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct ExprOrTrue {
     expr: String,
     remove: ContentAround,
@@ -262,6 +267,7 @@ impl AlwaysFixableViolation for ExprOrTrue {
 /// a = x and []
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.208")]
 pub(crate) struct ExprAndFalse {
     expr: String,
     remove: ContentAround,
@@ -421,7 +427,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) {
                         .collect(),
                     ctx: ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     parenthesized: true,
                 };
                 let isinstance_call = ast::ExprCall {
@@ -430,7 +436,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) {
                             id: Name::new_static("isinstance"),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         }
                         .into(),
                     ),
@@ -438,10 +444,10 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) {
                         args: Box::from([target.clone(), tuple.into()]),
                         keywords: Box::from([]),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     },
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 }
                 .into();
 
@@ -458,7 +464,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) {
                         .chain(after)
                         .collect(),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 }
                 .into();
                 let fixed_source = checker.generator().expr(&bool_op);
@@ -552,21 +558,21 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) {
             elts: comparators.into_iter().cloned().collect(),
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             parenthesized: true,
         };
         let node1 = ast::ExprName {
             id: id.clone(),
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         };
         let node2 = ast::ExprCompare {
             left: Box::new(node1.into()),
             ops: Box::from([CmpOp::In]),
             comparators: Box::from([node.into()]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         };
         let in_expr = node2.into();
         let mut diagnostic = checker.report_diagnostic(
@@ -589,7 +595,7 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) {
                 op: BoolOp::Or,
                 values: iter::once(in_expr).chain(unmatched).collect(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             };
             node.into()
         };
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs
index afc2e88b04..58860dc56e 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs
@@ -41,6 +41,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `os.environ`](https://docs.python.org/3/library/os.html#os.environ)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.218")]
 pub(crate) struct UncapitalizedEnvironmentVariables {
     expected: SourceCodeSnippet,
     actual: SourceCodeSnippet,
@@ -91,6 +92,7 @@ impl Violation for UncapitalizedEnvironmentVariables {
 /// ## References
 /// - [Python documentation: `dict.get`](https://docs.python.org/3/library/stdtypes.html#dict.get)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.261")]
 pub(crate) struct DictGetWithNoneDefault {
     expected: SourceCodeSnippet,
     actual: SourceCodeSnippet,
@@ -232,7 +234,7 @@ fn check_os_environ_subscript(checker: &Checker, expr: &Expr) {
             }
         }),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let new_env_var = node.into();
     diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
@@ -264,8 +266,10 @@ pub(crate) fn dict_get_with_none_default(checker: &Checker, expr: &Expr) {
     let Some(key) = args.first() else {
         return;
     };
-    if !(key.is_literal_expr() || key.is_name_expr()) {
-        return;
+    if !crate::preview::is_sim910_expanded_key_support_enabled(checker.settings()) {
+        if !(key.is_literal_expr() || key.is_name_expr()) {
+            return;
+        }
     }
     let Some(default) = args.get(1) else {
         return;
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs
index 7ba5d6410a..15b2f54bf8 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs
@@ -37,6 +37,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Truth Value Testing](https://docs.python.org/3/library/stdtypes.html#truth-value-testing)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.214")]
 pub(crate) struct IfExprWithTrueFalse {
     is_compare: bool,
 }
@@ -85,6 +86,7 @@ impl Violation for IfExprWithTrueFalse {
 /// ## References
 /// - [Python documentation: Truth Value Testing](https://docs.python.org/3/library/stdtypes.html#truth-value-testing)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.214")]
 pub(crate) struct IfExprWithFalseTrue;
 
 impl AlwaysFixableViolation for IfExprWithFalseTrue {
@@ -118,6 +120,7 @@ impl AlwaysFixableViolation for IfExprWithFalseTrue {
 /// ## References
 /// - [Python documentation: Truth Value Testing](https://docs.python.org/3/library/stdtypes.html#truth-value-testing)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.214")]
 pub(crate) struct IfExprWithTwistedArms {
     expr_body: String,
     expr_else: String,
@@ -188,7 +191,7 @@ pub(crate) fn if_expr_with_true_false(
                             id: Name::new_static("bool"),
                             ctx: ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         }
                         .into(),
                     ),
@@ -196,10 +199,10 @@ pub(crate) fn if_expr_with_true_false(
                         args: Box::from([test.clone()]),
                         keywords: Box::from([]),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     },
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 }
                 .into(),
             ),
@@ -227,7 +230,7 @@ pub(crate) fn if_expr_with_false_true(
                 op: UnaryOp::Not,
                 operand: Box::new(test.clone()),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
         ),
@@ -282,7 +285,7 @@ pub(crate) fn twisted_arms_in_ifexpr(
         body: Box::new(node1),
         orelse: Box::new(node),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
         checker.generator().expr(&node3.into()),
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs
index 37f3c16a8e..f7977066cf 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs
@@ -33,6 +33,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct NegateEqualOp {
     left: String,
     right: String,
@@ -75,6 +76,7 @@ impl AlwaysFixableViolation for NegateEqualOp {
 /// ## References
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct NegateNotEqualOp {
     left: String,
     right: String,
@@ -112,6 +114,7 @@ impl AlwaysFixableViolation for NegateNotEqualOp {
 /// ## References
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct DoubleNegation {
     expr: String,
 }
@@ -186,7 +189,7 @@ pub(crate) fn negation_with_equal_op(checker: &Checker, expr: &Expr, op: UnaryOp
         ops: Box::from([CmpOp::NotEq]),
         comparators: comparators.clone(),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
         checker.generator().expr(&node.into()),
@@ -242,7 +245,7 @@ pub(crate) fn negation_with_not_equal_op(
         ops: Box::from([CmpOp::Eq]),
         comparators: comparators.clone(),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
         checker.generator().expr(&node.into()),
@@ -284,7 +287,7 @@ pub(crate) fn double_negation(checker: &Checker, expr: &Expr, op: UnaryOp, opera
             id: Name::new_static("bool"),
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         };
         let node1 = ast::ExprCall {
             func: Box::new(node.into()),
@@ -292,10 +295,10 @@ pub(crate) fn double_negation(checker: &Checker, expr: &Expr, op: UnaryOp, opera
                 args: Box::from([*operand.clone()]),
                 keywords: Box::from([]),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             },
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         };
         diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
             checker.generator().expr(&node1.into()),
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs
index 248a7250e7..c115122453 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs
@@ -10,7 +10,6 @@ use super::fix_with;
 use crate::Fix;
 use crate::checkers::ast::Checker;
 use crate::fix::edits::fits;
-use crate::preview::is_multiple_with_statements_fix_safe_enabled;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -45,16 +44,10 @@ use crate::{FixAvailability, Violation};
 ///     pass
 /// ```
 ///
-/// ## Fix safety
-///
-/// This fix is marked as always unsafe unless [preview] mode is enabled, in which case it is always
-/// marked as safe. Note that the fix is unavailable if it would remove comments (in either case).
-///
 /// ## References
 /// - [Python documentation: The `with` statement](https://docs.python.org/3/reference/compound_stmts.html#the-with-statement)
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct MultipleWithStatements;
 
 impl Violation for MultipleWithStatements {
@@ -195,11 +188,7 @@ pub(crate) fn multiple_with_statements(
                                 checker.settings().tab_size,
                             )
                         }) {
-                            if is_multiple_with_statements_fix_safe_enabled(checker.settings()) {
-                                Ok(Some(Fix::safe_edit(edit)))
-                            } else {
-                                Ok(Some(Fix::unsafe_edit(edit)))
-                            }
+                            Ok(Some(Fix::safe_edit(edit)))
                         } else {
                             Ok(None)
                         }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/collapsible_if.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/collapsible_if.rs
index 9131a0369c..f0d726cc52 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/collapsible_if.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/collapsible_if.rs
@@ -46,6 +46,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: The `if` statement](https://docs.python.org/3/reference/compound_stmts.html#the-if-statement)
 /// - [Python documentation: Boolean operations](https://docs.python.org/3/reference/expressions.html#boolean-operations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct CollapsibleIf;
 
 impl Violation for CollapsibleIf {
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/enumerate_for_loop.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/enumerate_for_loop.rs
index 4f4d0c3968..6739fa3868 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/enumerate_for_loop.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/enumerate_for_loop.rs
@@ -36,6 +36,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `enumerate`](https://docs.python.org/3/library/functions.html#enumerate)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct EnumerateForLoop {
     index: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs
index 505bfe58f7..91f837647f 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs
@@ -53,6 +53,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Mapping Types](https://docs.python.org/3/library/stdtypes.html#mapping-types-dict)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.219")]
 pub(crate) struct IfElseBlockInsteadOfDictGet {
     contents: String,
 }
@@ -190,7 +191,7 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast
         attr: Identifier::new("get".to_string(), TextRange::default()),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let node3 = ast::ExprCall {
         func: Box::new(node2.into()),
@@ -198,17 +199,17 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast
             args: Box::from([node1, node]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let node4 = expected_var.clone();
     let node5 = ast::StmtAssign {
         targets: vec![node4],
         value: Box::new(node3.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let contents = checker.generator().stmt(&node5.into());
 
@@ -299,7 +300,7 @@ pub(crate) fn if_exp_instead_of_dict_get(
         attr: Identifier::new("get".to_string(), TextRange::default()),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let fixed_node = ast::ExprCall {
         func: Box::new(dict_get_node.into()),
@@ -307,10 +308,10 @@ pub(crate) fn if_exp_instead_of_dict_get(
             args: Box::from([dict_key_node, default_value_node]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
 
     let contents = checker.generator().expr(&fixed_node.into());
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs
index e3e7a41b63..8b0454355b 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs
@@ -36,6 +36,7 @@ use crate::checkers::ast::Checker;
 ///     return phrases.get(x, "Goodnight")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.250")]
 pub(crate) struct IfElseBlockInsteadOfDictLookup;
 
 impl Violation for IfElseBlockInsteadOfDictLookup {
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs
index 97cbcb76ac..f69098f697 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs
@@ -61,6 +61,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// [code coverage]: https://github.com/nedbat/coveragepy/issues/509
 /// [pycodestyle.max-line-length]: https://docs.astral.sh/ruff/settings/#lint_pycodestyle_max-line-length
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.213")]
 pub(crate) struct IfElseBlockInsteadOfIfExp {
     /// The ternary or binary expression to replace the `if`-`else`-block.
     contents: String,
@@ -266,13 +267,13 @@ fn assignment_ternary(
         body: Box::new(body_value.clone()),
         orelse: Box::new(orelse_value.clone()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let node1 = ast::StmtAssign {
         targets: vec![target_var.clone()],
         value: Box::new(node.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     node1.into()
 }
@@ -282,13 +283,13 @@ fn assignment_binary_and(target_var: &Expr, left_value: &Expr, right_value: &Exp
         op: BoolOp::And,
         values: vec![left_value.clone(), right_value.clone()],
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let node1 = ast::StmtAssign {
         targets: vec![target_var.clone()],
         value: Box::new(node.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     node1.into()
 }
@@ -296,12 +297,12 @@ fn assignment_binary_and(target_var: &Expr, left_value: &Expr, right_value: &Exp
 fn assignment_binary_or(target_var: &Expr, left_value: &Expr, right_value: &Expr) -> Stmt {
     (ast::StmtAssign {
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         targets: vec![target_var.clone()],
         value: Box::new(
             (ast::ExprBoolOp {
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 op: BoolOp::Or,
                 values: vec![left_value.clone(), right_value.clone()],
             })
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_with_same_arms.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_with_same_arms.rs
index 404c78e260..92182b383a 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_with_same_arms.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_with_same_arms.rs
@@ -36,6 +36,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///     print("Hello")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.246")]
 pub(crate) struct IfWithSameArms;
 
 impl Violation for IfWithSameArms {
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/key_in_dict.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/key_in_dict.rs
index da647235e1..5ced08a673 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/key_in_dict.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/key_in_dict.rs
@@ -38,6 +38,7 @@ use crate::{Applicability, Edit};
 /// ## References
 /// - [Python documentation: Mapping Types](https://docs.python.org/3/library/stdtypes.html#mapping-types-dict)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.176")]
 pub(crate) struct InDictKeys {
     operator: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs
index 679797a258..4b2dbb7d9a 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs
@@ -56,6 +56,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Truth Value Testing](https://docs.python.org/3/library/stdtypes.html#truth-value-testing)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.214")]
 pub(crate) struct NeedlessBool {
     condition: Option<SourceCodeSnippet>,
     negate: bool,
@@ -256,7 +257,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) {
                         left: left.clone(),
                         comparators: Box::new([right.clone()]),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     }))
                 }
 
@@ -264,7 +265,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) {
                     op: ast::UnaryOp::Not,
                     operand: Box::new(if_test.clone()),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 })),
             }
         } else if if_test.is_compare_expr() {
@@ -277,7 +278,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) {
                 id: Name::new_static("bool"),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             };
             let call_node = ast::ExprCall {
                 func: Box::new(func_node.into()),
@@ -285,10 +286,10 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) {
                     args: Box::from([if_test.clone()]),
                     keywords: Box::from([]),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 },
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             };
             Some(Expr::Call(call_node))
         } else {
@@ -301,7 +302,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) {
         Stmt::Return(ast::StmtReturn {
             value: Some(Box::new(expr.clone())),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })
     });
 
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
index 33c789455f..a21af6475f 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `open`](https://docs.python.org/3/library/functions.html#open)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.219")]
 pub(crate) struct OpenFileWithContextHandler;
 
 impl Violation for OpenFileWithContextHandler {
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
index 88e1693d29..9c216311ed 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
@@ -44,6 +44,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `any`](https://docs.python.org/3/library/functions.html#any)
 /// - [Python documentation: `all`](https://docs.python.org/3/library/functions.html#all)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct ReimplementedBuiltin {
     replacement: String,
 }
@@ -165,7 +166,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) {
                             ops: Box::from([op]),
                             comparators: Box::from([comparator.clone()]),
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         };
                         node.into()
                     } else {
@@ -173,7 +174,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) {
                             op: UnaryOp::Not,
                             operand: Box::new(loop_.test.clone()),
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         };
                         node.into()
                     }
@@ -182,7 +183,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) {
                         op: UnaryOp::Not,
                         operand: Box::new(loop_.test.clone()),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     };
                     node.into()
                 }
@@ -406,17 +407,17 @@ fn return_stmt(id: Name, test: &Expr, target: &Expr, iter: &Expr, generator: Gen
             ifs: vec![],
             is_async: false,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         }],
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         parenthesized: false,
     };
     let node1 = ast::ExprName {
         id,
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let node2 = ast::ExprCall {
         func: Box::new(node1.into()),
@@ -424,15 +425,15 @@ fn return_stmt(id: Name, test: &Expr, target: &Expr, iter: &Expr, generator: Gen
             args: Box::from([node.into()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let node3 = ast::StmtReturn {
         value: Some(Box::new(node2.into())),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     generator.stmt(&node3.into())
 }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs
index 636b490673..e574f51adc 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: Defining Clean-up Actions](https://docs.python.org/3/tutorial/errors.html#defining-clean-up-actions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct ReturnInTryExceptFinally;
 
 impl Violation for ReturnInTryExceptFinally {
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs
index 367e5a7507..a38886772e 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs
@@ -1,11 +1,11 @@
-use std::cmp::Ordering;
-
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::{
     Expr, ExprCall, ExprContext, ExprList, ExprUnaryOp, StringFlags, StringLiteral,
     StringLiteralFlags, StringLiteralValue, UnaryOp,
 };
 use ruff_text_size::{Ranged, TextRange};
+use std::cmp::Ordering;
+use std::fmt::{Display, Formatter};
 
 use crate::checkers::ast::Checker;
 use crate::preview::is_maxsplit_without_separator_fix_enabled;
@@ -46,14 +46,41 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `str.split`](https://docs.python.org/3/library/stdtypes.html#str.split)
 #[derive(ViolationMetadata)]
-pub(crate) struct SplitStaticString;
+#[violation_metadata(stable_since = "0.10.0")]
+pub(crate) struct SplitStaticString {
+    method: Method,
+}
+
+#[derive(Copy, Clone, Debug)]
+enum Method {
+    Split,
+    RSplit,
+}
+
+impl Method {
+    fn is_rsplit(self) -> bool {
+        matches!(self, Method::RSplit)
+    }
+}
+
+impl Display for Method {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Method::Split => f.write_str("split"),
+            Method::RSplit => f.write_str("rsplit"),
+        }
+    }
+}
 
 impl Violation for SplitStaticString {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        "Consider using a list literal instead of `str.split`".to_string()
+        format!(
+            "Consider using a list literal instead of `str.{}`",
+            self.method
+        )
     }
 
     fn fix_title(&self) -> Option<String> {
@@ -76,26 +103,21 @@ pub(crate) fn split_static_string(
     };
 
     // `split` vs `rsplit`.
-    let direction = if attr == "split" {
-        Direction::Left
+    let method = if attr == "split" {
+        Method::Split
     } else {
-        Direction::Right
+        Method::RSplit
     };
 
     let sep_arg = arguments.find_argument_value("sep", 0);
     let split_replacement = if let Some(sep) = sep_arg {
         match sep {
             Expr::NoneLiteral(_) => {
-                split_default(str_value, maxsplit_value, direction, checker.settings())
+                split_default(str_value, maxsplit_value, method, checker.settings())
             }
             Expr::StringLiteral(sep_value) => {
                 let sep_value_str = sep_value.value.to_str();
-                Some(split_sep(
-                    str_value,
-                    sep_value_str,
-                    maxsplit_value,
-                    direction,
-                ))
+                Some(split_sep(str_value, sep_value_str, maxsplit_value, method))
             }
             // Ignore names until type inference is available.
             _ => {
@@ -103,10 +125,10 @@ pub(crate) fn split_static_string(
             }
         }
     } else {
-        split_default(str_value, maxsplit_value, direction, checker.settings())
+        split_default(str_value, maxsplit_value, method, checker.settings())
     };
 
-    let mut diagnostic = checker.report_diagnostic(SplitStaticString, call.range());
+    let mut diagnostic = checker.report_diagnostic(SplitStaticString { method }, call.range());
     if let Some(ref replacement_expr) = split_replacement {
         diagnostic.set_fix(Fix::applicable_edit(
             Edit::range_replacement(checker.generator().expr(replacement_expr), call.range()),
@@ -167,82 +189,36 @@ fn construct_replacement(elts: &[&str], flags: StringLiteralFlags) -> Expr {
                 Expr::from(StringLiteral {
                     value: Box::from(*elt),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     flags: element_flags,
                 })
             })
             .collect(),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     })
 }
 
 fn split_default(
     str_value: &StringLiteralValue,
     max_split: i32,
-    direction: Direction,
+    method: Method,
     settings: &LinterSettings,
 ) -> Option<Expr> {
-    // From the Python documentation:
-    // > If sep is not specified or is None, a different splitting algorithm is applied: runs of
-    // > consecutive whitespace are regarded as a single separator, and the result will contain
-    // > no empty strings at the start or end if the string has leading or trailing whitespace.
-    // > Consequently, splitting an empty string or a string consisting of just whitespace with
-    // > a None separator returns [].
-    // https://docs.python.org/3/library/stdtypes.html#str.split
     let string_val = str_value.to_str();
     match max_split.cmp(&0) {
-        Ordering::Greater => {
-            if !is_maxsplit_without_separator_fix_enabled(settings) {
-                return None;
-            }
+        Ordering::Greater if !is_maxsplit_without_separator_fix_enabled(settings) => None,
+        Ordering::Greater | Ordering::Equal => {
             let Ok(max_split) = usize::try_from(max_split) else {
                 return None;
             };
-            let list_items: Vec<&str> = if direction == Direction::Left {
-                string_val
-                    .trim_start_matches(py_unicode_is_whitespace)
-                    .splitn(max_split + 1, py_unicode_is_whitespace)
-                    .filter(|s| !s.is_empty())
-                    .collect()
-            } else {
-                let mut items: Vec<&str> = string_val
-                    .trim_end_matches(py_unicode_is_whitespace)
-                    .rsplitn(max_split + 1, py_unicode_is_whitespace)
-                    .filter(|s| !s.is_empty())
-                    .collect();
-                items.reverse();
-                items
-            };
+            let list_items = split_whitespace_with_maxsplit(string_val, max_split, method);
             Some(construct_replacement(
                 &list_items,
                 str_value.first_literal_flags(),
             ))
         }
-        Ordering::Equal => {
-            // Behavior for maxsplit = 0 when sep is None:
-            // - If the string is empty or all whitespace, result is [].
-            // - Otherwise:
-            //   - " x ".split(maxsplit=0)  -> ['x ']
-            //   - " x ".rsplit(maxsplit=0) -> [' x']
-            //   - "".split(maxsplit=0) -> []
-            //   - " ".split(maxsplit=0) -> []
-            let processed_str = if direction == Direction::Left {
-                string_val.trim_start_matches(py_unicode_is_whitespace)
-            } else {
-                string_val.trim_end_matches(py_unicode_is_whitespace)
-            };
-            let list_items: &[_] = if processed_str.is_empty() {
-                &[]
-            } else {
-                &[processed_str]
-            };
-            Some(construct_replacement(
-                list_items,
-                str_value.first_literal_flags(),
-            ))
-        }
         Ordering::Less => {
             let list_items: Vec<&str> = string_val
                 .split(py_unicode_is_whitespace)
@@ -260,22 +236,22 @@ fn split_sep(
     str_value: &StringLiteralValue,
     sep_value: &str,
     max_split: i32,
-    direction: Direction,
+    method: Method,
 ) -> Expr {
     let value = str_value.to_str();
     let list_items: Vec<&str> = if let Ok(split_n) = usize::try_from(max_split) {
-        match direction {
-            Direction::Left => value.splitn(split_n + 1, sep_value).collect(),
-            Direction::Right => {
+        match method {
+            Method::Split => value.splitn(split_n + 1, sep_value).collect(),
+            Method::RSplit => {
                 let mut items: Vec<&str> = value.rsplitn(split_n + 1, sep_value).collect();
                 items.reverse();
                 items
             }
         }
     } else {
-        match direction {
-            Direction::Left => value.split(sep_value).collect(),
-            Direction::Right => {
+        match method {
+            Method::Split => value.split(sep_value).collect(),
+            Method::RSplit => {
                 let mut items: Vec<&str> = value.rsplit(sep_value).collect();
                 items.reverse();
                 items
@@ -320,12 +296,6 @@ fn get_maxsplit_value(arg: Option<&Expr>) -> Option<i32> {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Direction {
-    Left,
-    Right,
-}
-
 /// Like [`char::is_whitespace`] but with Python's notion of whitespace.
 ///
 /// <https://github.com/astral-sh/ruff/issues/19845>
@@ -356,3 +326,107 @@ const fn py_unicode_is_whitespace(ch: char) -> bool {
         | '\u{3000}'
     )
 }
+
+struct WhitespaceMaxSplitIterator<'a> {
+    remaining: &'a str,
+    max_split: usize,
+    splits: usize,
+    method: Method,
+}
+
+impl<'a> WhitespaceMaxSplitIterator<'a> {
+    fn new(s: &'a str, max_split: usize, method: Method) -> Self {
+        let remaining = match method {
+            Method::Split => s.trim_start_matches(py_unicode_is_whitespace),
+            Method::RSplit => s.trim_end_matches(py_unicode_is_whitespace),
+        };
+
+        Self {
+            remaining,
+            max_split,
+            splits: 0,
+            method,
+        }
+    }
+}
+
+impl<'a> Iterator for WhitespaceMaxSplitIterator<'a> {
+    type Item = &'a str;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.remaining.is_empty() {
+            return None;
+        }
+
+        if self.splits >= self.max_split {
+            let result = self.remaining;
+            self.remaining = "";
+            return Some(result);
+        }
+
+        self.splits += 1;
+        match self.method {
+            Method::Split => match self.remaining.split_once(py_unicode_is_whitespace) {
+                Some((s, remaining)) => {
+                    self.remaining = remaining.trim_start_matches(py_unicode_is_whitespace);
+                    Some(s)
+                }
+                None => Some(std::mem::take(&mut self.remaining)),
+            },
+            Method::RSplit => match self.remaining.rsplit_once(py_unicode_is_whitespace) {
+                Some((remaining, s)) => {
+                    self.remaining = remaining.trim_end_matches(py_unicode_is_whitespace);
+                    Some(s)
+                }
+                None => Some(std::mem::take(&mut self.remaining)),
+            },
+        }
+    }
+}
+
+// From the Python documentation:
+// > If sep is not specified or is None, a different splitting algorithm is applied: runs of
+// > consecutive whitespace are regarded as a single separator, and the result will contain
+// > no empty strings at the start or end if the string has leading or trailing whitespace.
+// > Consequently, splitting an empty string or a string consisting of just whitespace with
+// > a None separator returns [].
+// https://docs.python.org/3/library/stdtypes.html#str.split
+fn split_whitespace_with_maxsplit(s: &str, max_split: usize, method: Method) -> Vec<&str> {
+    let mut result: Vec<_> = WhitespaceMaxSplitIterator::new(s, max_split, method).collect();
+    if method.is_rsplit() {
+        result.reverse();
+    }
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Method, split_whitespace_with_maxsplit};
+    use test_case::test_case;
+
+    #[test_case("  ", 1, &[])]
+    #[test_case("a  b", 1, &["a", "b"])]
+    #[test_case("a  b", 2, &["a", "b"])]
+    #[test_case(" a b c d ", 2, &["a", "b", "c d "])]
+    #[test_case("  a  b  c  ", 1, &["a", "b  c  "])]
+    #[test_case(" x ", 0, &["x "])]
+    #[test_case(" ", 0, &[])]
+    #[test_case("a\u{3000}b", 1, &["a", "b"])]
+    fn test_split_whitespace_with_maxsplit(s: &str, max_split: usize, expected: &[&str]) {
+        let parts = split_whitespace_with_maxsplit(s, max_split, Method::Split);
+        assert_eq!(parts, expected);
+    }
+
+    #[test_case("  ", 1, &[])]
+    #[test_case("a  b", 1, &["a", "b"])]
+    #[test_case("a  b", 2, &["a", "b"])]
+    #[test_case(" a b c d ", 2, &[" a b", "c", "d"])]
+    #[test_case("  a  b  c  ", 1, &["  a  b", "c"])]
+    #[test_case(" x ", 0, &[" x"])]
+    #[test_case(" ", 0, &[])]
+    #[test_case("a\u{3000}b", 1, &["a", "b"])]
+    fn test_rsplit_whitespace_with_maxsplit(s: &str, max_split: usize, expected: &[&str]) {
+        let parts = split_whitespace_with_maxsplit(s, max_split, Method::RSplit);
+        assert_eq!(parts, expected);
+    }
+}
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs
index 34c4915f3b..2dc4a778f4 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs
@@ -43,6 +43,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `try` statement](https://docs.python.org/3/reference/compound_stmts.html#the-try-statement)
 /// - [a simpler `try`/`except` (and why maybe shouldn't)](https://www.youtube.com/watch?v=MZAJ8qnC7mk)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct SuppressibleException {
     exception: String,
 }
@@ -58,7 +59,9 @@ impl Violation for SuppressibleException {
 
     fn fix_title(&self) -> Option<String> {
         let SuppressibleException { exception } = self;
-        Some(format!("Replace with `contextlib.suppress({exception})`"))
+        Some(format!(
+            "Replace `try`-`except`-`pass` with `with contextlib.suppress({exception}): ...`"
+        ))
     }
 }
 
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs
index a21b960af0..687729c20c 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs
@@ -48,6 +48,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 /// - [Python documentation: Assignment statements](https://docs.python.org/3/reference/simple_stmts.html#assignment-statements)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.207")]
 pub(crate) struct YodaConditions {
     suggestion: Option<SourceCodeSnippet>,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs
index 58f3a01a8a..19169b72c7 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs
+++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs
@@ -33,6 +33,7 @@ use crate::{checkers::ast::Checker, fix::snippet::SourceCodeSnippet};
 /// ## References
 /// - [Python documentation: `dict.items`](https://docs.python.org/3/library/stdtypes.html#dict.items)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct ZipDictKeysAndValues {
     expected: SourceCodeSnippet,
     actual: SourceCodeSnippet,
@@ -78,13 +79,18 @@ pub(crate) fn zip_dict_keys_and_values(checker: &Checker, expr: &ast::ExprCall)
     let [arg1, arg2] = &args[..] else {
         return;
     };
-    let Some((var1, attr1)) = get_var_attr(arg1) else {
+    let Some((var1, attr1, args1)) = get_var_attr_args(arg1) else {
         return;
     };
-    let Some((var2, attr2)) = get_var_attr(arg2) else {
+    let Some((var2, attr2, args2)) = get_var_attr_args(arg2) else {
         return;
     };
-    if var1.id != var2.id || attr1 != "keys" || attr2 != "values" {
+    if var1.id != var2.id
+        || attr1 != "keys"
+        || attr2 != "values"
+        || !args1.is_empty()
+        || !args2.is_empty()
+    {
         return;
     }
     if !checker.semantic().match_builtin_expr(func, "zip") {
@@ -122,8 +128,11 @@ pub(crate) fn zip_dict_keys_and_values(checker: &Checker, expr: &ast::ExprCall)
     )));
 }
 
-fn get_var_attr(expr: &Expr) -> Option<(&ExprName, &Identifier)> {
-    let Expr::Call(ast::ExprCall { func, .. }) = expr else {
+fn get_var_attr_args(expr: &Expr) -> Option<(&ExprName, &Identifier, &Arguments)> {
+    let Expr::Call(ast::ExprCall {
+        func, arguments, ..
+    }) = expr
+    else {
         return None;
     };
     let Expr::Attribute(ExprAttribute { value, attr, .. }) = func.as_ref() else {
@@ -132,5 +141,5 @@ fn get_var_attr(expr: &Expr) -> Option<(&ExprName, &Identifier)> {
     let Expr::Name(var_name) = value.as_ref() else {
         return None;
     };
-    Some((var_name, attr))
+    Some((var_name, attr, arguments))
 }
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap
index 660a531793..3a8f81c63e 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap
@@ -9,13 +9,12 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 2 |     pass
   |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-1   |-if isinstance(a, int) or isinstance(a, float):  # SIM101
-  1 |+if isinstance(a, (int, float)):  # SIM101
-2 2 |     pass
-3 3 | 
-4 4 | if isinstance(a, (int, float)) or isinstance(a, bool):  # SIM101
+  - if isinstance(a, int) or isinstance(a, float):  # SIM101
+1 + if isinstance(a, (int, float)):  # SIM101
+2 |     pass
+3 | 
+4 | if isinstance(a, (int, float)) or isinstance(a, bool):  # SIM101
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
  --> SIM101.py:4:4
@@ -27,16 +26,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 5 |     pass
   |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-1 1 | if isinstance(a, int) or isinstance(a, float):  # SIM101
-2 2 |     pass
-3 3 | 
-4   |-if isinstance(a, (int, float)) or isinstance(a, bool):  # SIM101
-  4 |+if isinstance(a, (int, float, bool)):  # SIM101
-5 5 |     pass
-6 6 | 
-7 7 | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool):  # SIM101
+1 | if isinstance(a, int) or isinstance(a, float):  # SIM101
+2 |     pass
+3 | 
+  - if isinstance(a, (int, float)) or isinstance(a, bool):  # SIM101
+4 + if isinstance(a, (int, float, bool)):  # SIM101
+5 |     pass
+6 | 
+7 | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool):  # SIM101
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
  --> SIM101.py:7:4
@@ -48,16 +46,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 8 |     pass
   |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-4 4 | if isinstance(a, (int, float)) or isinstance(a, bool):  # SIM101
-5 5 |     pass
-6 6 | 
-7   |-if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool):  # SIM101
-  7 |+if isinstance(a, (int, float)) or isinstance(b, bool):  # SIM101
-8 8 |     pass
-9 9 | 
-10 10 | if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float):  # SIM101
+4  | if isinstance(a, (int, float)) or isinstance(a, bool):  # SIM101
+5  |     pass
+6  | 
+   - if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool):  # SIM101
+7  + if isinstance(a, (int, float)) or isinstance(b, bool):  # SIM101
+8  |     pass
+9  | 
+10 | if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float):  # SIM101
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
   --> SIM101.py:10:4
@@ -69,16 +66,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 11 |     pass
    |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-7  7  | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool):  # SIM101
-8  8  |     pass
-9  9  | 
-10    |-if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float):  # SIM101
-   10 |+if isinstance(b, bool) or isinstance(a, (int, float)):  # SIM101
-11 11 |     pass
-12 12 | 
-13 13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float):  # SIM101
+7  | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool):  # SIM101
+8  |     pass
+9  | 
+   - if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float):  # SIM101
+10 + if isinstance(b, bool) or isinstance(a, (int, float)):  # SIM101
+11 |     pass
+12 | 
+13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float):  # SIM101
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
   --> SIM101.py:16:5
@@ -90,16 +86,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 17 |     pass
    |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-13 13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float):  # SIM101
-14 14 |     pass
-15 15 | 
-16    |-if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool):  # SIM101
-   16 |+if (isinstance(a, (int, float))) and isinstance(b, bool):  # SIM101
-17 17 |     pass
-18 18 | 
-19 19 | if isinstance(a.b, int) or isinstance(a.b, float):  # SIM101
+13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float):  # SIM101
+14 |     pass
+15 | 
+   - if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool):  # SIM101
+16 + if (isinstance(a, (int, float))) and isinstance(b, bool):  # SIM101
+17 |     pass
+18 | 
+19 | if isinstance(a.b, int) or isinstance(a.b, float):  # SIM101
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for expression, merge into a single call
   --> SIM101.py:19:4
@@ -111,16 +106,15 @@ SIM101 [*] Multiple `isinstance` calls for expression, merge into a single call
 20 |     pass
    |
 help: Merge `isinstance` calls
-
-ℹ Unsafe fix
-16 16 | if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool):  # SIM101
-17 17 |     pass
-18 18 | 
-19    |-if isinstance(a.b, int) or isinstance(a.b, float):  # SIM101
-   19 |+if isinstance(a.b, (int, float)):  # SIM101
-20 20 |     pass
-21 21 | 
-22 22 | if isinstance(a(), int) or isinstance(a(), float):  # SIM101
+16 | if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool):  # SIM101
+17 |     pass
+18 | 
+   - if isinstance(a.b, int) or isinstance(a.b, float):  # SIM101
+19 + if isinstance(a.b, (int, float)):  # SIM101
+20 |     pass
+21 | 
+22 | if isinstance(a(), int) or isinstance(a(), float):  # SIM101
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 Multiple `isinstance` calls for expression, merge into a single call
   --> SIM101.py:22:4
@@ -143,16 +137,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 39 |     pass
    |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-35 35 | if isinstance(a, int) or unrelated_condition or isinstance(a, float):
-36 36 |     pass
-37 37 | 
-38    |-if x or isinstance(a, int) or isinstance(a, float):
-   38 |+if x or isinstance(a, (int, float)):
-39 39 |     pass
-40 40 | 
-41 41 | if x or y or isinstance(a, int) or isinstance(a, float) or z:
+35 | if isinstance(a, int) or unrelated_condition or isinstance(a, float):
+36 |     pass
+37 | 
+   - if x or isinstance(a, int) or isinstance(a, float):
+38 + if x or isinstance(a, (int, float)):
+39 |     pass
+40 | 
+41 | if x or y or isinstance(a, int) or isinstance(a, float) or z:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
   --> SIM101.py:41:4
@@ -164,16 +157,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 42 |     pass
    |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-38 38 | if x or isinstance(a, int) or isinstance(a, float):
-39 39 |     pass
-40 40 | 
-41    |-if x or y or isinstance(a, int) or isinstance(a, float) or z:
-   41 |+if x or y or isinstance(a, (int, float)) or z:
-42 42 |     pass
-43 43 | 
-44 44 | def f():
+38 | if x or isinstance(a, int) or isinstance(a, float):
+39 |     pass
+40 | 
+   - if x or y or isinstance(a, int) or isinstance(a, float) or z:
+41 + if x or y or isinstance(a, (int, float)) or z:
+42 |     pass
+43 | 
+44 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
   --> SIM101.py:53:3
@@ -184,11 +176,10 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call
 54 |     pass
    |
 help: Merge `isinstance` calls for `a`
-
-ℹ Unsafe fix
-50 50 |         pass
-51 51 | 
-52 52 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722460483
-53    |-if(isinstance(a, int)) or (isinstance(a, float)):
-   53 |+if isinstance(a, (int, float)):
-54 54 |     pass
+50 |         pass
+51 | 
+52 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722460483
+   - if(isinstance(a, int)) or (isinstance(a, float)):
+53 + if isinstance(a, (int, float)):
+54 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap
index 94e6118857..5a31fa2684 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap
@@ -11,17 +11,16 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 4 |           c
   |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-1 1 | # SIM102
-2   |-if a:
-3   |-    if b:
-4   |-        c
-  2 |+if a and b:
-  3 |+    c
-5 4 | 
-6 5 | # SIM102
-7 6 | if a:
+1 | # SIM102
+  - if a:
+  -     if b:
+  -         c
+2 + if a and b:
+3 +     c
+4 | 
+5 | # SIM102
+6 | if a:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:7:1
@@ -34,21 +33,20 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 10 |               d
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-4  4  |         c
-5  5  | 
-6  6  | # SIM102
-7     |-if a:
-8     |-    if b:
-9     |-        if c:
-10    |-            d
-   7  |+if a and b:
-   8  |+    if c:
-   9  |+        d
-11 10 | 
-12 11 | # SIM102
-13 12 | if a:
+4  |         c
+5  | 
+6  | # SIM102
+   - if a:
+   -     if b:
+   -         if c:
+   -             d
+7  + if a and b:
+8  +     if c:
+9  +         d
+10 | 
+11 | # SIM102
+12 | if a:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:8:5
@@ -61,19 +59,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 10 |               d
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-5  5  | 
-6  6  | # SIM102
-7  7  | if a:
-8     |-    if b:
-9     |-        if c:
-10    |-            d
-   8  |+    if b and c:
-   9  |+        d
-11 10 | 
-12 11 | # SIM102
-13 12 | if a:
+5  | 
+6  | # SIM102
+7  | if a:
+   -     if b:
+   -         if c:
+   -             d
+8  +     if b and c:
+9  +         d
+10 | 
+11 | # SIM102
+12 | if a:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:15:1
@@ -86,19 +83,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 17 |           d
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-12 12 | # SIM102
-13 13 | if a:
-14 14 |     pass
-15    |-elif b:
-16    |-    if c:
-17    |-        d
-   15 |+elif b and c:
-   16 |+    d
-18 17 | 
-19 18 | # SIM102
-20 19 | if a:
+12 | # SIM102
+13 | if a:
+14 |     pass
+   - elif b:
+   -     if c:
+   -         d
+15 + elif b and c:
+16 +     d
+17 | 
+18 | # SIM102
+19 | if a:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:20:1
@@ -123,21 +119,20 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 29 |           c
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-23 23 |         c
-24 24 | 
-25 25 | # SIM102
-26    |-if a:
-27    |-    if b:
-28    |-        # Fixable due to placement of this comment.
-29    |-        c
-   26 |+if a and b:
-   27 |+    # Fixable due to placement of this comment.
-   28 |+    c
-30 29 | 
-31 30 | # OK
-32 31 | if a:
+23 |         c
+24 | 
+25 | # SIM102
+   - if a:
+   -     if b:
+   -         # Fixable due to placement of this comment.
+   -         c
+26 + if a and b:
+27 +     # Fixable due to placement of this comment.
+28 +     c
+29 | 
+30 | # OK
+31 | if a:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:51:5
@@ -151,31 +146,30 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 54 |   is valid"""
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-48 48 | 
-49 49 | while x > 0:
-50 50 |     # SIM102
-51    |-    if y > 0:
-52    |-        if z > 0:
-53    |-            """this
-   51 |+    if y > 0 and z > 0:
-   52 |+        """this
-54 53 | is valid"""
-55 54 | 
-56    |-            """the indentation on
-   55 |+        """the indentation on
-57 56 |             this line is significant"""
-58 57 | 
-59    |-            "this is" \
-   58 |+        "this is" \
-60 59 | "allowed too"
-61 60 | 
-62    |-            ("so is"
-   61 |+        ("so is"
-63 62 | "this for some reason")
-64 63 | 
-65 64 | 
+48 | 
+49 | while x > 0:
+50 |     # SIM102
+   -     if y > 0:
+   -         if z > 0:
+   -             """this
+51 +     if y > 0 and z > 0:
+52 +         """this
+53 | is valid"""
+54 | 
+   -             """the indentation on
+55 +         """the indentation on
+56 |             this line is significant"""
+57 | 
+   -             "this is" \
+58 +         "this is" \
+59 | "allowed too"
+60 | 
+   -             ("so is"
+61 +         ("so is"
+62 | "this for some reason")
+63 | 
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:67:1
@@ -188,31 +182,30 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 70 |   is valid"""
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-64 64 | 
-65 65 | 
-66 66 | # SIM102
-67    |-if x > 0:
-68    |-    if y > 0:
-69    |-        """this
-   67 |+if x > 0 and y > 0:
-   68 |+    """this
-70 69 | is valid"""
-71 70 | 
-72    |-        """the indentation on
-   71 |+    """the indentation on
-73 72 |         this line is significant"""
-74 73 | 
-75    |-        "this is" \
-   74 |+    "this is" \
-76 75 | "allowed too"
-77 76 | 
-78    |-        ("so is"
-   77 |+    ("so is"
-79 78 | "this for some reason")
-80 79 | 
-81 80 | while x > 0:
+64 | 
+65 | 
+66 | # SIM102
+   - if x > 0:
+   -     if y > 0:
+   -         """this
+67 + if x > 0 and y > 0:
+68 +     """this
+69 | is valid"""
+70 | 
+   -         """the indentation on
+71 +     """the indentation on
+72 |         this line is significant"""
+73 | 
+   -         "this is" \
+74 +     "this is" \
+75 | "allowed too"
+76 | 
+   -         ("so is"
+77 +     ("so is"
+78 | "this for some reason")
+79 | 
+80 | while x > 0:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:83:5
@@ -227,23 +220,22 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 87 |               print("Bad module!")
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | while x > 0:
-82 82 |     # SIM102
-83    |-    if node.module:
-84    |-        if node.module == "multiprocessing" or node.module.startswith(
-85    |-            "multiprocessing."
-86    |-        ):
-87    |-            print("Bad module!")
-   83 |+    if node.module and (node.module == "multiprocessing" or node.module.startswith(
-   84 |+        "multiprocessing."
-   85 |+    )):
-   86 |+        print("Bad module!")
-88 87 | 
-89 88 | # SIM102 (auto-fixable)
-90 89 | if node.module012345678:
+80 | 
+81 | while x > 0:
+82 |     # SIM102
+   -     if node.module:
+   -         if node.module == "multiprocessing" or node.module.startswith(
+   -             "multiprocessing."
+   -         ):
+   -             print("Bad module!")
+83 +     if node.module and (node.module == "multiprocessing" or node.module.startswith(
+84 +         "multiprocessing."
+85 +     )):
+86 +         print("Bad module!")
+87 | 
+88 | # SIM102 (auto-fixable)
+89 | if node.module012345678:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
   --> SIM102.py:90:1
@@ -257,23 +249,22 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 94 |           print("Bad module!")
    |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-87 87 |             print("Bad module!")
-88 88 | 
-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.module012345678 and (node.module == "multiprocß9💣2ℝ" or node.module.startswith(
-   91 |+    "multiprocessing."
-   92 |+)):
-   93 |+    print("Bad module!")
-95 94 | 
-96 95 | # SIM102 (not auto-fixable)
-97 96 | if node.module0123456789:
+87 |             print("Bad module!")
+88 | 
+89 | # SIM102 (auto-fixable)
+   - if node.module012345678:
+   -     if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
+   -         "multiprocessing."
+   -     ):
+   -         print("Bad module!")
+90 + if node.module012345678 and (node.module == "multiprocß9💣2ℝ" or node.module.startswith(
+91 +     "multiprocessing."
+92 + )):
+93 +     print("Bad module!")
+94 | 
+95 | # SIM102 (not auto-fixable)
+96 | if node.module0123456789:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 Use a single `if` statement instead of nested `if` statements
    --> SIM102.py:97:1
@@ -300,19 +291,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 109 |   elif d:
     |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-103 103 | # SIM102
-104 104 | # Regression test for https://github.com/apache/airflow/blob/145b16caaa43f0c42bffd97344df916c602cddde/airflow/configuration.py#L1161
-105 105 | if a:
-106     |-    if b:
-107     |-        if c:
-108     |-            print("if")
-    106 |+    if b and c:
-    107 |+        print("if")
-109 108 | elif d:
-110 109 |     print("elif")
-111 110 | 
+103 | # SIM102
+104 | # Regression test for https://github.com/apache/airflow/blob/145b16caaa43f0c42bffd97344df916c602cddde/airflow/configuration.py#L1161
+105 | if a:
+    -     if b:
+    -         if c:
+    -             print("if")
+106 +     if b and c:
+107 +         print("if")
+108 | elif d:
+109 |     print("elif")
+110 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
    --> SIM102.py:132:5
@@ -326,19 +316,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 135 |   else:
     |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-129 129 | # OK
-130 130 | if a:
-131 131 |     # SIM 102
-132     |-    if b:
-133     |-        if c:
-134     |-            print("foo")
-    132 |+    if b and c:
-    133 |+        print("foo")
-135 134 | else:
-136 135 |     print("bar")
-137 136 | 
+129 | # OK
+130 | if a:
+131 |     # SIM 102
+    -     if b:
+    -         if c:
+    -             print("foo")
+132 +     if b and c:
+133 +         print("foo")
+134 | else:
+135 |     print("bar")
+136 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM102 [*] Use a single `if` statement instead of nested `if` statements
    --> SIM102.py:165:5
@@ -351,13 +340,12 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements
 167 |               d
     |
 help: Combine `if` statements using `and`
-
-ℹ Unsafe fix
-162 162 | def f():
-163 163 |     if a:
-164 164 |         pass
-165     |-    elif b:
-166     |-        if c:
-167     |-            d
-    165 |+    elif b and c:
-    166 |+        d
+162 | def f():
+163 |     if a:
+164 |         pass
+    -     elif b:
+    -         if c:
+    -             d
+165 +     elif b and c:
+166 +         d
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap
index 4ae8c970c5..51cd372286 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap
@@ -13,18 +13,17 @@ SIM103 [*] Return the condition `bool(a)` directly
   | |____________________^
   |
 help: Replace with `return bool(a)`
-
-ℹ Unsafe fix
-1 1 | def f():
-2 2 |     # SIM103
-3   |-    if a:
-4   |-        return True
-5   |-    else:
-6   |-        return False
-  3 |+    return bool(a)
-7 4 | 
-8 5 | 
-9 6 | def f():
+1 | def f():
+2 |     # SIM103
+  -     if a:
+  -         return True
+  -     else:
+  -         return False
+3 +     return bool(a)
+4 | 
+5 | 
+6 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `a == b` directly
   --> SIM103.py:11:5
@@ -38,19 +37,18 @@ SIM103 [*] Return the condition `a == b` directly
    | |____________________^
    |
 help: Replace with `return a == b`
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | def f():
-10 10 |     # SIM103
-11    |-    if a == b:
-12    |-        return True
-13    |-    else:
-14    |-        return False
-   11 |+    return a == b
-15 12 | 
-16 13 | 
-17 14 | def f():
+8  | 
+9  | def f():
+10 |     # SIM103
+   -     if a == b:
+   -         return True
+   -     else:
+   -         return False
+11 +     return a == b
+12 | 
+13 | 
+14 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `bool(b)` directly
   --> SIM103.py:21:5
@@ -64,19 +62,18 @@ SIM103 [*] Return the condition `bool(b)` directly
    | |____________________^
    |
 help: Replace with `return bool(b)`
-
-ℹ Unsafe fix
-18 18 |     # SIM103
-19 19 |     if a:
-20 20 |         return 1
-21    |-    elif b:
-22    |-        return True
-23    |-    else:
-24    |-        return False
-   21 |+    return bool(b)
-25 22 | 
-26 23 | 
-27 24 | def f():
+18 |     # SIM103
+19 |     if a:
+20 |         return 1
+   -     elif b:
+   -         return True
+   -     else:
+   -         return False
+21 +     return bool(b)
+22 | 
+23 | 
+24 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `bool(b)` directly
   --> SIM103.py:32:9
@@ -90,19 +87,18 @@ SIM103 [*] Return the condition `bool(b)` directly
    | |________________________^
    |
 help: Replace with `return bool(b)`
-
-ℹ Unsafe fix
-29 29 |     if a:
-30 30 |         return 1
-31 31 |     else:
-32    |-        if b:
-33    |-            return True
-34    |-        else:
-35    |-            return False
-   32 |+        return bool(b)
-36 33 | 
-37 34 | 
-38 35 | def f():
+29 |     if a:
+30 |         return 1
+31 |     else:
+   -         if b:
+   -             return True
+   -         else:
+   -             return False
+32 +         return bool(b)
+33 | 
+34 | 
+35 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `not a` directly
   --> SIM103.py:57:5
@@ -116,19 +112,18 @@ SIM103 [*] Return the condition `not a` directly
    | |___________________^
    |
 help: Replace with `return not a`
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | def f():
-56 56 |     # SIM103
-57    |-    if a:
-58    |-        return False
-59    |-    else:
-60    |-        return True
-   57 |+    return not a
-61 58 | 
-62 59 | 
-63 60 | def f():
+54 | 
+55 | def f():
+56 |     # SIM103
+   -     if a:
+   -         return False
+   -     else:
+   -         return True
+57 +     return not a
+58 | 
+59 | 
+60 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 Return the condition directly
   --> SIM103.py:83:5
@@ -155,19 +150,18 @@ SIM103 [*] Return the condition `not (keys is not None and notice.key not in key
    | |___________________^
    |
 help: Replace with `return not (keys is not None and notice.key not in keys)`
-
-ℹ Unsafe fix
-88 88 | 
-89 89 | def f():
-90 90 |     # SIM103
-91    |-    if keys is not None and notice.key not in keys:
-92    |-        return False
-93    |-    else:
-94    |-        return True
-   91 |+    return not (keys is not None and notice.key not in keys)
-95 92 | 
-96 93 | 
-97 94 | ###
+88 | 
+89 | def f():
+90 |     # SIM103
+   -     if keys is not None and notice.key not in keys:
+   -         return False
+   -     else:
+   -         return True
+91 +     return not (keys is not None and notice.key not in keys)
+92 | 
+93 | 
+94 | ###
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `bool(a)` directly
    --> SIM103.py:104:5
@@ -180,18 +174,17 @@ SIM103 [*] Return the condition `bool(a)` directly
     | |________________^
     |
 help: Replace with `return bool(a)`
-
-ℹ Unsafe fix
-101 101 | 
-102 102 | def f():
-103 103 |     # SIM103
-104     |-    if a:
-105     |-        return True
-106     |-    return False
-    104 |+    return bool(a)
-107 105 | 
-108 106 | 
-109 107 | def f():
+101 | 
+102 | def f():
+103 |     # SIM103
+    -     if a:
+    -         return True
+    -     return False
+104 +     return bool(a)
+105 | 
+106 | 
+107 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `not a` directly
    --> SIM103.py:111:5
@@ -204,18 +197,17 @@ SIM103 [*] Return the condition `not a` directly
     | |_______________^
     |
 help: Replace with `return not a`
-
-ℹ Unsafe fix
-108 108 | 
-109 109 | def f():
-110 110 |     # SIM103
-111     |-    if a:
-112     |-        return False
-113     |-    return True
-    111 |+    return not a
-114 112 | 
-115 113 | 
-116 114 | def f():
+108 | 
+109 | def f():
+110 |     # SIM103
+    -     if a:
+    -         return False
+    -     return True
+111 +     return not a
+112 | 
+113 | 
+114 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `10 < a` directly
    --> SIM103.py:117:5
@@ -227,18 +219,17 @@ SIM103 [*] Return the condition `10 < a` directly
     | |_______________^
     |
 help: Replace with `return 10 < a`
-
-ℹ Unsafe fix
-114 114 | 
-115 115 | 
-116 116 | def f():
-117     |-    if not 10 < a:
-118     |-        return False
-119     |-    return True
-    117 |+    return 10 < a
-120 118 | 
-121 119 | 
-122 120 | def f():
+114 | 
+115 | 
+116 | def f():
+    -     if not 10 < a:
+    -         return False
+    -     return True
+117 +     return 10 < a
+118 | 
+119 | 
+120 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `not 10 < a` directly
    --> SIM103.py:123:5
@@ -250,18 +241,17 @@ SIM103 [*] Return the condition `not 10 < a` directly
     | |_______________^
     |
 help: Replace with `return not 10 < a`
-
-ℹ Unsafe fix
-120 120 | 
-121 121 | 
-122 122 | def f():
-123     |-    if 10 < a:
-124     |-        return False
-125     |-    return True
-    123 |+    return not 10 < a
-126 124 | 
-127 125 | 
-128 126 | def f():
+120 | 
+121 | 
+122 | def f():
+    -     if 10 < a:
+    -         return False
+    -     return True
+123 +     return not 10 < a
+124 | 
+125 | 
+126 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `10 not in a` directly
    --> SIM103.py:129:5
@@ -273,18 +263,17 @@ SIM103 [*] Return the condition `10 not in a` directly
     | |_______________^
     |
 help: Replace with `return 10 not in a`
-
-ℹ Unsafe fix
-126 126 | 
-127 127 | 
-128 128 | def f():
-129     |-    if 10 in a:
-130     |-        return False
-131     |-    return True
-    129 |+    return 10 not in a
-132 130 | 
-133 131 | 
-134 132 | def f():
+126 | 
+127 | 
+128 | def f():
+    -     if 10 in a:
+    -         return False
+    -     return True
+129 +     return 10 not in a
+130 | 
+131 | 
+132 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `10 in a` directly
    --> SIM103.py:135:5
@@ -296,18 +285,17 @@ SIM103 [*] Return the condition `10 in a` directly
     | |_______________^
     |
 help: Replace with `return 10 in a`
-
-ℹ Unsafe fix
-132 132 | 
-133 133 | 
-134 134 | def f():
-135     |-    if 10 not in a:
-136     |-        return False
-137     |-    return True
-    135 |+    return 10 in a
-138 136 | 
-139 137 | 
-140 138 | def f():
+132 | 
+133 | 
+134 | def f():
+    -     if 10 not in a:
+    -         return False
+    -     return True
+135 +     return 10 in a
+136 | 
+137 | 
+138 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `a is not 10` directly
    --> SIM103.py:141:5
@@ -319,18 +307,17 @@ SIM103 [*] Return the condition `a is not 10` directly
     | |_______________^
     |
 help: Replace with `return a is not 10`
-
-ℹ Unsafe fix
-138 138 | 
-139 139 | 
-140 140 | def f():
-141     |-    if a is 10:
-142     |-        return False
-143     |-    return True
-    141 |+    return a is not 10
-144 142 | 
-145 143 | 
-146 144 | def f():
+138 | 
+139 | 
+140 | def f():
+    -     if a is 10:
+    -         return False
+    -     return True
+141 +     return a is not 10
+142 | 
+143 | 
+144 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `a is 10` directly
    --> SIM103.py:147:5
@@ -342,18 +329,17 @@ SIM103 [*] Return the condition `a is 10` directly
     | |_______________^
     |
 help: Replace with `return a is 10`
-
-ℹ Unsafe fix
-144 144 | 
-145 145 | 
-146 146 | def f():
-147     |-    if a is not 10:
-148     |-        return False
-149     |-    return True
-    147 |+    return a is 10
-150 148 | 
-151 149 | 
-152 150 | def f():
+144 | 
+145 | 
+146 | def f():
+    -     if a is not 10:
+    -         return False
+    -     return True
+147 +     return a is 10
+148 | 
+149 | 
+150 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `a != 10` directly
    --> SIM103.py:153:5
@@ -365,18 +351,17 @@ SIM103 [*] Return the condition `a != 10` directly
     | |_______________^
     |
 help: Replace with `return a != 10`
-
-ℹ Unsafe fix
-150 150 | 
-151 151 | 
-152 152 | def f():
-153     |-    if a == 10:
-154     |-        return False
-155     |-    return True
-    153 |+    return a != 10
-156 154 | 
-157 155 | 
-158 156 | def f():
+150 | 
+151 | 
+152 | def f():
+    -     if a == 10:
+    -         return False
+    -     return True
+153 +     return a != 10
+154 | 
+155 | 
+156 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM103 [*] Return the condition `a == 10` directly
    --> SIM103.py:159:5
@@ -388,12 +373,11 @@ SIM103 [*] Return the condition `a == 10` directly
     | |_______________^
     |
 help: Replace with `return a == 10`
-
-ℹ Unsafe fix
-156 156 | 
-157 157 | 
-158 158 | def f():
-159     |-    if a != 10:
-160     |-        return False
-161     |-    return True
-    159 |+    return a == 10
+156 | 
+157 | 
+158 | def f():
+    -     if a != 10:
+    -         return False
+    -     return True
+159 +     return a == 10
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap
index 829eff5b88..26a37405fa 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap
@@ -11,23 +11,22 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass
 9 | |     pass
   | |________^
   |
-help: Replace with `contextlib.suppress(ValueError)`
-
-ℹ Unsafe 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  | 
-11 10 | 
-12 11 | # SIM105
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError): ...`
+1  + import contextlib
+2  | def foo():
+3  |     pass
+4  | 
+5  | 
+6  | # SIM105
+   - try:
+7  + with contextlib.suppress(ValueError):
+8  |     foo()
+   - except ValueError:
+   -     pass
+9  | 
+10 | 
+11 | # SIM105
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass`
   --> SIM105_0.py:13:1
@@ -41,25 +40,24 @@ SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`exce
 17 |
 18 |   # SIM105
    |
-help: Replace with `contextlib.suppress(ValueError, OSError)`
-
-ℹ Unsafe fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError, OSError): ...`
+1  + import contextlib
+2  | def foo():
+3  |     pass
+4  | 
 --------------------------------------------------------------------------------
-10 11 | 
-11 12 | 
-12 13 | # SIM105
-13    |-try:
-   14 |+with contextlib.suppress(ValueError, OSError):
-14 15 |     foo()
-15    |-except (ValueError, OSError):
-16    |-    pass
-17 16 | 
-18 17 | # SIM105
-19 18 | try:
+11 | 
+12 | 
+13 | # SIM105
+   - try:
+14 + with contextlib.suppress(ValueError, OSError):
+15 |     foo()
+   - except (ValueError, OSError):
+   -     pass
+16 | 
+17 | # SIM105
+18 | try:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass`
   --> SIM105_0.py:19:1
@@ -73,25 +71,24 @@ SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`exce
 23 |
 24 |   # SIM105
    |
-help: Replace with `contextlib.suppress(ValueError, OSError)`
-
-ℹ Unsafe fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError, OSError): ...`
+1  + import contextlib
+2  | def foo():
+3  |     pass
+4  | 
 --------------------------------------------------------------------------------
-16 17 |     pass
-17 18 | 
-18 19 | # SIM105
-19    |-try:
-   20 |+with contextlib.suppress(ValueError, OSError):
-20 21 |     foo()
-21    |-except (ValueError, OSError) as e:
-22    |-    pass
-23 22 | 
-24 23 | # SIM105
-25 24 | try:
+17 |     pass
+18 | 
+19 | # SIM105
+   - try:
+20 + with contextlib.suppress(ValueError, OSError):
+21 |     foo()
+   - except (ValueError, OSError) as e:
+   -     pass
+22 | 
+23 | # SIM105
+24 | try:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`pass`
   --> SIM105_0.py:25:1
@@ -105,26 +102,25 @@ SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`p
 29 |
 30 |   # SIM105
    |
-help: Replace with `contextlib.suppress(BaseException)`
-
-ℹ Unsafe fix
-   1  |+import contextlib
-   2  |+import builtins
-1  3  | def foo():
-2  4  |     pass
-3  5  | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(BaseException): ...`
+1  + import contextlib
+2  + import builtins
+3  | def foo():
+4  |     pass
+5  | 
 --------------------------------------------------------------------------------
-22 24 |     pass
-23 25 | 
-24 26 | # SIM105
-25    |-try:
-   27 |+with contextlib.suppress(builtins.BaseException):
-26 28 |     foo()
-27    |-except:
-28    |-    pass
-29 29 | 
-30 30 | # SIM105
-31 31 | try:
+24 |     pass
+25 | 
+26 | # SIM105
+   - try:
+27 + with contextlib.suppress(builtins.BaseException):
+28 |     foo()
+   - except:
+   -     pass
+29 | 
+30 | # SIM105
+31 | try:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(a.Error, b.Error)` instead of `try`-`except`-`pass`
   --> SIM105_0.py:31:1
@@ -138,25 +134,24 @@ SIM105 [*] Use `contextlib.suppress(a.Error, b.Error)` instead of `try`-`except`
 35 |
 36 |   # OK
    |
-help: Replace with `contextlib.suppress(a.Error, b.Error)`
-
-ℹ Unsafe fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(a.Error, b.Error): ...`
+1  + import contextlib
+2  | def foo():
+3  |     pass
+4  | 
 --------------------------------------------------------------------------------
-28 29 |     pass
-29 30 | 
-30 31 | # SIM105
-31    |-try:
-   32 |+with contextlib.suppress(a.Error, b.Error):
-32 33 |     foo()
-33    |-except (a.Error, b.Error):
-34    |-    pass
-35 34 | 
-36 35 | # OK
-37 36 | try:
+29 |     pass
+30 | 
+31 | # SIM105
+   - try:
+32 + with contextlib.suppress(a.Error, b.Error):
+33 |     foo()
+   - except (a.Error, b.Error):
+   -     pass
+34 | 
+35 | # OK
+36 | try:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
   --> SIM105_0.py:85:5
@@ -169,25 +164,24 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass
 88 | |         ...
    | |___________^
    |
-help: Replace with `contextlib.suppress(ValueError)`
-
-ℹ Unsafe fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError): ...`
+1  + import contextlib
+2  | def foo():
+3  |     pass
+4  | 
 --------------------------------------------------------------------------------
-82 83 | 
-83 84 | def with_ellipsis():
-84 85 |     # OK
-85    |-    try:
-   86 |+    with contextlib.suppress(ValueError):
-86 87 |         foo()
-87    |-    except ValueError:
-88    |-        ...
-89 88 | 
-90 89 | 
-91 90 | def with_ellipsis_and_return():
+83 | 
+84 | def with_ellipsis():
+85 |     # OK
+   -     try:
+86 +     with contextlib.suppress(ValueError):
+87 |         foo()
+   -     except ValueError:
+   -         ...
+88 | 
+89 | 
+90 | def with_ellipsis_and_return():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass`
    --> SIM105_0.py:100:5
@@ -201,7 +195,7 @@ SIM105 Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-
 104 |
 105 |   try:
     |
-help: Replace with `contextlib.suppress(ValueError, OSError)`
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError, OSError): ...`
 
 SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass`
    --> SIM105_0.py:117:5
@@ -216,25 +210,24 @@ SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass`
 121 |
 122 |       try: os.makedirs(model_dir);
     |
-help: Replace with `contextlib.suppress(OSError)`
-
-ℹ Unsafe fix
-    1   |+import contextlib
-1   2   | def foo():
-2   3   |     pass
-3   4   | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(OSError): ...`
+1   + import contextlib
+2   | def foo():
+3   |     pass
+4   | 
 --------------------------------------------------------------------------------
-114 115 | 
-115 116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7123
-116 117 | def write_models(directory, Models):
-117     |-    try:
-    118 |+    with contextlib.suppress(OSError):
-118 119 |         os.makedirs(model_dir);
-119     |-    except OSError:
-120     |-        pass;
-121 120 | 
-122 121 |     try: os.makedirs(model_dir);
-123 122 |     except OSError:
+115 | 
+116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7123
+117 | def write_models(directory, Models):
+    -     try:
+118 +     with contextlib.suppress(OSError):
+119 |         os.makedirs(model_dir);
+    -     except OSError:
+    -         pass;
+120 | 
+121 |     try: os.makedirs(model_dir);
+122 |     except OSError:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass`
    --> SIM105_0.py:122:5
@@ -248,24 +241,23 @@ SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass`
 125 |
 126 |       try: os.makedirs(model_dir);
     |
-help: Replace with `contextlib.suppress(OSError)`
-
-ℹ Unsafe fix
-    1   |+import contextlib
-1   2   | def foo():
-2   3   |     pass
-3   4   | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(OSError): ...`
+1   + import contextlib
+2   | def foo():
+3   |     pass
+4   | 
 --------------------------------------------------------------------------------
-119 120 |     except OSError:
-120 121 |         pass;
-121 122 | 
-122     |-    try: os.makedirs(model_dir);
-123     |-    except OSError:
-124     |-        pass;
-    123 |+    with contextlib.suppress(OSError): os.makedirs(model_dir);
-125 124 | 
-126 125 |     try: os.makedirs(model_dir);
-127 126 |     except OSError:
+120 |     except OSError:
+121 |         pass;
+122 | 
+    -     try: os.makedirs(model_dir);
+    -     except OSError:
+    -         pass;
+123 +     with contextlib.suppress(OSError): os.makedirs(model_dir);
+124 | 
+125 |     try: os.makedirs(model_dir);
+126 |     except OSError:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass`
    --> SIM105_0.py:126:5
@@ -279,24 +271,23 @@ SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass`
 129 |               \
 130 |               #
     |
-help: Replace with `contextlib.suppress(OSError)`
-
-ℹ Unsafe fix
-    1   |+import contextlib
-1   2   | def foo():
-2   3   |     pass
-3   4   | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(OSError): ...`
+1   + import contextlib
+2   | def foo():
+3   |     pass
+4   | 
 --------------------------------------------------------------------------------
-123 124 |     except OSError:
-124 125 |         pass;
-125 126 | 
-126     |-    try: os.makedirs(model_dir);
-127     |-    except OSError:
-128     |-        pass; \
-    127 |+    with contextlib.suppress(OSError): os.makedirs(model_dir);
-129 128 |             \
-130 129 |             #
-131 130 | 
+124 |     except OSError:
+125 |         pass;
+126 | 
+    -     try: os.makedirs(model_dir);
+    -     except OSError:
+    -         pass; \
+127 +     with contextlib.suppress(OSError): os.makedirs(model_dir);
+128 |             \
+129 |             #
+130 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress()` instead of `try`-`except`-`pass`
    --> SIM105_0.py:133:1
@@ -308,25 +299,24 @@ SIM105 [*] Use `contextlib.suppress()` instead of `try`-`except`-`pass`
 136 | |     pass
     | |________^
     |
-help: Replace with `contextlib.suppress()`
-
-ℹ Unsafe fix
-    1   |+import contextlib
-1   2   | def foo():
-2   3   |     pass
-3   4   | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(): ...`
+1   + import contextlib
+2   | def foo():
+3   |     pass
+4   | 
 --------------------------------------------------------------------------------
-130 131 |             #
-131 132 | 
-132 133 | # Regression tests for: https://github.com/astral-sh/ruff/issues/18209
-133     |-try:
-    134 |+with contextlib.suppress():
-134 135 |     1 / 0
-135     |-except ():
-136     |-    pass
-137 136 | 
-138 137 | 
-139 138 | BaseException = ValueError
+131 |             #
+132 | 
+133 | # Regression tests for: https://github.com/astral-sh/ruff/issues/18209
+    - try:
+134 + with contextlib.suppress():
+135 |     1 / 0
+    - except ():
+    -     pass
+136 | 
+137 | 
+138 | BaseException = ValueError
+note: This is an unsafe fix and may change runtime behavior
 
 SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`pass`
    --> SIM105_0.py:140:1
@@ -338,19 +328,18 @@ SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`p
 143 | |     pass
     | |________^
     |
-help: Replace with `contextlib.suppress(BaseException)`
-
-ℹ Unsafe fix
-    1   |+import contextlib
-1   2   | def foo():
-2   3   |     pass
-3   4   | 
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(BaseException): ...`
+1   + import contextlib
+2   | def foo():
+3   |     pass
+4   | 
 --------------------------------------------------------------------------------
-137 138 | 
-138 139 | 
-139 140 | BaseException = ValueError
-140     |-try:
-    141 |+with contextlib.suppress(BaseException):
-141 142 |     int("a")
-142     |-except BaseException:
-143     |-    pass
+138 | 
+139 | 
+140 | BaseException = ValueError
+    - try:
+141 + with contextlib.suppress(BaseException):
+142 |     int("a")
+    - except BaseException:
+    -     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap
index 8dc7d3ba61..9ad5a3c17e 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap
@@ -11,16 +11,15 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass
 8 | |     pass
   | |________^
   |
-help: Replace with `contextlib.suppress(ValueError)`
-
-ℹ Unsafe fix
-1 1 | """Case: There's a random import, so it should add `contextlib` after it."""
-2 2 | import math
-  3 |+import contextlib
-3 4 | 
-4 5 | # SIM105
-5   |-try:
-  6 |+with contextlib.suppress(ValueError):
-6 7 |     math.sqrt(-1)
-7   |-except ValueError:
-8   |-    pass
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError): ...`
+1 | """Case: There's a random import, so it should add `contextlib` after it."""
+2 | import math
+3 + import contextlib
+4 | 
+5 | # SIM105
+  - try:
+6 + with contextlib.suppress(ValueError):
+7 |     math.sqrt(-1)
+  - except ValueError:
+  -     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap
index 2373fbb0ee..2f73d90197 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap
@@ -11,14 +11,13 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass
 13 | |     pass
    | |________^
    |
-help: Replace with `contextlib.suppress(ValueError)`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | 
-9  9  | # SIM105
-10    |-try:
-   10 |+with contextlib.suppress(ValueError):
-11 11 |     foo()
-12    |-except ValueError:
-13    |-    pass
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError): ...`
+7  | 
+8  | 
+9  | # SIM105
+   - try:
+10 + with contextlib.suppress(ValueError):
+11 |     foo()
+   - except ValueError:
+   -     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap
index 385aabd5de..3f4f3a5e14 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap
@@ -12,4 +12,4 @@ SIM105 Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
 13 | |         pass
    | |____________^
    |
-help: Replace with `contextlib.suppress(ValueError)`
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ValueError): ...`
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap
index 86932241c7..da7e0842f7 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap
@@ -10,12 +10,11 @@ SIM105 [*] Use `contextlib.suppress(ImportError)` instead of `try`-`except`-`pas
 4 | | except ImportError:    pass
   | |___________________________^
   |
-help: Replace with `contextlib.suppress(ImportError)`
-
-ℹ Unsafe fix
-1 1 | #!/usr/bin/env python
-2   |-try:
-  2 |+import contextlib
-  3 |+with contextlib.suppress(ImportError):
-3 4 |    from __builtin__ import bytes, str, open, super, range, zip, round, int, pow, object, input
-4   |-except ImportError:    pass
+help: Replace `try`-`except`-`pass` with `with contextlib.suppress(ImportError): ...`
+1 | #!/usr/bin/env python
+  - try:
+2 + import contextlib
+3 + with contextlib.suppress(ImportError):
+4 |    from __builtin__ import bytes, str, open, super, range, zip, round, int, pow, object, input
+  - except ImportError:    pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap
index d9cf4f4c3c..1d00efe601 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap
@@ -14,17 +14,16 @@ SIM108 [*] Use ternary operator `b = c if a else d` instead of `if`-`else`-block
 7 |   # OK
   |
 help: Replace `if`-`else`-block with `b = c if a else d`
-
-ℹ Unsafe fix
-1 1 | # SIM108
-2   |-if a:
-3   |-    b = c
-4   |-else:
-5   |-    b = d
-  2 |+b = c if a else d
-6 3 | 
-7 4 | # OK
-8 5 | b = c if a else d
+1 | # SIM108
+  - if a:
+  -     b = c
+  - else:
+  -     b = d
+2 + b = c if a else d
+3 | 
+4 | # OK
+5 | b = c if a else d
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `b = 1 if a else 2` instead of `if`-`else`-block
   --> SIM108.py:30:5
@@ -38,19 +37,18 @@ SIM108 [*] Use ternary operator `b = 1 if a else 2` instead of `if`-`else`-block
    | |_____________^
    |
 help: Replace `if`-`else`-block with `b = 1 if a else 2`
-
-ℹ Unsafe fix
-27 27 | if True:
-28 28 |     pass
-29 29 | else:
-30    |-    if a:
-31    |-        b = 1
-32    |-    else:
-33    |-        b = 2
-   30 |+    b = 1 if a else 2
-34 31 | 
-35 32 | 
-36 33 | import sys
+27 | if True:
+28 |     pass
+29 | else:
+   -     if a:
+   -         b = 1
+   -     else:
+   -         b = 2
+30 +     b = 1 if a else 2
+31 | 
+32 | 
+33 | import sys
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 Use ternary operator `abc = x if x > 0 else -x` instead of `if`-`else`-block
   --> SIM108.py:58:1
@@ -77,19 +75,18 @@ SIM108 [*] Use ternary operator `b = "cccccccccccccccccccccccccccccccccß" if a
    | |_____________________________________________^
    |
 help: Replace `if`-`else`-block with `b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"`
-
-ℹ Unsafe fix
-79 79 | 
-80 80 | 
-81 81 | # SIM108
-82    |-if a:
-83    |-    b = "cccccccccccccccccccccccccccccccccß"
-84    |-else:
-85    |-    b = "ddddddddddddddddddddddddddddddddd💣"
-   82 |+b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"
-86 83 | 
-87 84 | 
-88 85 | # OK (too long)
+79 | 
+80 | 
+81 | # SIM108
+   - if a:
+   -     b = "cccccccccccccccccccccccccccccccccß"
+   - else:
+   -     b = "ddddddddddddddddddddddddddddddddd💣"
+82 + b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"
+83 | 
+84 | 
+85 | # OK (too long)
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 Use ternary operator `exitcode = 0 if True else 1` instead of `if`-`else`-block
    --> SIM108.py:105:1
@@ -139,19 +136,18 @@ SIM108 [*] Use binary operator `z = cond or other_cond` instead of `if`-`else`-b
 146 |   # SIM108 - should suggest
     |
 help: Replace `if`-`else`-block with `z = cond or other_cond`
-
-ℹ Unsafe fix
-138 138 | 
-139 139 | # SIM108 - should suggest
-140 140 | # z = cond or other_cond
-141     |-if cond:
-142     |-    z = cond 
-143     |-else:
-144     |-    z = other_cond
-    141 |+z = cond or other_cond
-145 142 | 
-146 143 | # SIM108 - should suggest
-147 144 | # z = cond and other_cond
+138 | 
+139 | # SIM108 - should suggest
+140 | # z = cond or other_cond
+    - if cond:
+    -     z = cond 
+    - else:
+    -     z = other_cond
+141 + z = cond or other_cond
+142 | 
+143 | # SIM108 - should suggest
+144 | # z = cond and other_cond
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use binary operator `z = cond and other_cond` instead of `if`-`else`-block
    --> SIM108.py:148:1
@@ -167,19 +163,18 @@ SIM108 [*] Use binary operator `z = cond and other_cond` instead of `if`-`else`-
 153 |   # SIM108 - should suggest
     |
 help: Replace `if`-`else`-block with `z = cond and other_cond`
-
-ℹ Unsafe fix
-145 145 | 
-146 146 | # SIM108 - should suggest
-147 147 | # z = cond and other_cond
-148     |-if not cond:
-149     |-    z = cond
-150     |-else:
-151     |-    z = other_cond
-    148 |+z = cond and other_cond
-152 149 | 
-153 150 | # SIM108 - should suggest
-154 151 | # z = not cond and other_cond
+145 | 
+146 | # SIM108 - should suggest
+147 | # z = cond and other_cond
+    - if not cond:
+    -     z = cond
+    - else:
+    -     z = other_cond
+148 + z = cond and other_cond
+149 | 
+150 | # SIM108 - should suggest
+151 | # z = not cond and other_cond
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use binary operator `z = not cond and other_cond` instead of `if`-`else`-block
    --> SIM108.py:155:1
@@ -195,19 +190,18 @@ SIM108 [*] Use binary operator `z = not cond and other_cond` instead of `if`-`el
 160 |   # SIM108 does not suggest
     |
 help: Replace `if`-`else`-block with `z = not cond and other_cond`
-
-ℹ Unsafe fix
-152 152 | 
-153 153 | # SIM108 - should suggest
-154 154 | # z = not cond and other_cond
-155     |-if cond:
-156     |-    z = not cond
-157     |-else:
-158     |-    z = other_cond
-    155 |+z = not cond and other_cond
-159 156 | 
-160 157 | # SIM108 does not suggest
-161 158 | # a binary option in these cases,
+152 | 
+153 | # SIM108 - should suggest
+154 | # z = not cond and other_cond
+    - if cond:
+    -     z = not cond
+    - else:
+    -     z = other_cond
+155 + z = not cond and other_cond
+156 | 
+157 | # SIM108 does not suggest
+158 | # a binary option in these cases,
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `z = 1 if True else other` instead of `if`-`else`-block
    --> SIM108.py:167:1
@@ -223,19 +217,18 @@ SIM108 [*] Use ternary operator `z = 1 if True else other` instead of `if`-`else
 172 |   if False:
     |
 help: Replace `if`-`else`-block with `z = 1 if True else other`
-
-ℹ Unsafe fix
-164 164 | # so, e.g. `True == 1`.
-165 165 | # (Of course, these specific expressions 
-166 166 | # should be simplified for other reasons...)
-167     |-if True:
-168     |-    z = 1
-169     |-else:
-170     |-    z = other
-    167 |+z = 1 if True else other
-171 168 | 
-172 169 | if False:
-173 170 |     z = 1
+164 | # so, e.g. `True == 1`.
+165 | # (Of course, these specific expressions 
+166 | # should be simplified for other reasons...)
+    - if True:
+    -     z = 1
+    - else:
+    -     z = other
+167 + z = 1 if True else other
+168 | 
+169 | if False:
+170 |     z = 1
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `z = 1 if False else other` instead of `if`-`else`-block
    --> SIM108.py:172:1
@@ -251,19 +244,18 @@ SIM108 [*] Use ternary operator `z = 1 if False else other` instead of `if`-`els
 177 |   if 1:
     |
 help: Replace `if`-`else`-block with `z = 1 if False else other`
-
-ℹ Unsafe fix
-169 169 | else:
-170 170 |     z = other
-171 171 | 
-172     |-if False:
-173     |-    z = 1
-174     |-else:
-175     |-    z = other
-    172 |+z = 1 if False else other
-176 173 | 
-177 174 | if 1:
-178 175 |     z = True
+169 | else:
+170 |     z = other
+171 | 
+    - if False:
+    -     z = 1
+    - else:
+    -     z = other
+172 + z = 1 if False else other
+173 | 
+174 | if 1:
+175 |     z = True
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `z = True if 1 else other` instead of `if`-`else`-block
    --> SIM108.py:177:1
@@ -279,19 +271,18 @@ SIM108 [*] Use ternary operator `z = True if 1 else other` instead of `if`-`else
 182 |   # SIM108 does not suggest a binary option in this
     |
 help: Replace `if`-`else`-block with `z = True if 1 else other`
-
-ℹ Unsafe fix
-174 174 | else:
-175 175 |     z = other
-176 176 | 
-177     |-if 1:
-178     |-    z = True
-179     |-else:
-180     |-    z = other
-    177 |+z = True if 1 else other
-181 178 | 
-182 179 | # SIM108 does not suggest a binary option in this
-183 180 | # case, since we'd be reducing the number of calls
+174 | else:
+175 |     z = other
+176 | 
+    - if 1:
+    -     z = True
+    - else:
+    -     z = other
+177 + z = True if 1 else other
+178 | 
+179 | # SIM108 does not suggest a binary option in this
+180 | # case, since we'd be reducing the number of calls
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `z = foo() if foo() else other` instead of `if`-`else`-block
    --> SIM108.py:185:1
@@ -307,19 +298,18 @@ SIM108 [*] Use ternary operator `z = foo() if foo() else other` instead of `if`-
 190 |   # SIM108 does not suggest a binary option in this
     |
 help: Replace `if`-`else`-block with `z = foo() if foo() else other`
-
-ℹ Unsafe fix
-182 182 | # SIM108 does not suggest a binary option in this
-183 183 | # case, since we'd be reducing the number of calls
-184 184 | # from Two to one.
-185     |-if foo():
-186     |-    z = foo()
-187     |-else:
-188     |-    z = other
-    185 |+z = foo() if foo() else other
-189 186 | 
-190 187 | # SIM108 does not suggest a binary option in this
-191 188 | # case, since we'd be reducing the number of calls
+182 | # SIM108 does not suggest a binary option in this
+183 | # case, since we'd be reducing the number of calls
+184 | # from Two to one.
+    - if foo():
+    -     z = foo()
+    - else:
+    -     z = other
+185 + z = foo() if foo() else other
+186 | 
+187 | # SIM108 does not suggest a binary option in this
+188 | # case, since we'd be reducing the number of calls
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `z = not foo() if foo() else other` instead of `if`-`else`-block
    --> SIM108.py:193:1
@@ -333,19 +323,18 @@ SIM108 [*] Use ternary operator `z = not foo() if foo() else other` instead of `
     | |_____________^
     |
 help: Replace `if`-`else`-block with `z = not foo() if foo() else other`
-
-ℹ Unsafe fix
-190 190 | # SIM108 does not suggest a binary option in this
-191 191 | # case, since we'd be reducing the number of calls
-192 192 | # from Two to one.
-193     |-if foo():
-194     |-    z = not foo()
-195     |-else:
-196     |-    z = other
-    193 |+z = not foo() if foo() else other
-197 194 | 
-198 195 | 
-199 196 | # These two cases double as tests for f-string quote preservation. The first
+190 | # SIM108 does not suggest a binary option in this
+191 | # case, since we'd be reducing the number of calls
+192 | # from Two to one.
+    - if foo():
+    -     z = not foo()
+    - else:
+    -     z = other
+193 + z = not foo() if foo() else other
+194 | 
+195 | 
+196 | # These two cases double as tests for f-string quote preservation. The first
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `var = "str" if cond else f"{first}-{second}"` instead of `if`-`else`-block
    --> SIM108.py:202:1
@@ -361,19 +350,18 @@ SIM108 [*] Use ternary operator `var = "str" if cond else f"{first}-{second}"` i
 207 |   if cond:
     |
 help: Replace `if`-`else`-block with `var = "str" if cond else f"{first}-{second}"`
-
-ℹ Unsafe fix
-199 199 | # These two cases double as tests for f-string quote preservation. The first
-200 200 | # f-string should preserve its double quotes, and the second should preserve
-201 201 | # single quotes
-202     |-if cond:
-203     |-    var = "str"
-204     |-else:
-205     |-    var = f"{first}-{second}"
-    202 |+var = "str" if cond else f"{first}-{second}"
-206 203 | 
-207 204 | if cond:
-208 205 |     var = "str"
+199 | # These two cases double as tests for f-string quote preservation. The first
+200 | # f-string should preserve its double quotes, and the second should preserve
+201 | # single quotes
+    - if cond:
+    -     var = "str"
+    - else:
+    -     var = f"{first}-{second}"
+202 + var = "str" if cond else f"{first}-{second}"
+203 | 
+204 | if cond:
+205 |     var = "str"
+note: This is an unsafe fix and may change runtime behavior
 
 SIM108 [*] Use ternary operator `var = "str" if cond else f'{first}-{second}'` instead of `if`-`else`-block
    --> SIM108.py:207:1
@@ -387,13 +375,12 @@ SIM108 [*] Use ternary operator `var = "str" if cond else f'{first}-{second}'` i
     | |_____________________________^
     |
 help: Replace `if`-`else`-block with `var = "str" if cond else f'{first}-{second}'`
-
-ℹ Unsafe fix
-204 204 | else:
-205 205 |     var = f"{first}-{second}"
-206 206 | 
-207     |-if cond:
-208     |-    var = "str"
-209     |-else:
-210     |-    var = f'{first}-{second}'
-    207 |+var = "str" if cond else f'{first}-{second}'
+204 | else:
+205 |     var = f"{first}-{second}"
+206 | 
+    - if cond:
+    -     var = "str"
+    - else:
+    -     var = f'{first}-{second}'
+207 + var = "str" if cond else f'{first}-{second}'
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap
index 84e84015c3..4ea4815d52 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap
@@ -10,14 +10,13 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
 3 |     d
   |
 help: Replace with `a in (b, c)`
-
-ℹ Unsafe fix
-1 1 | # SIM109
-2   |-if a == b or a == c:
-  2 |+if a in (b, c):
-3 3 |     d
-4 4 | 
-5 5 | # SIM109
+1 | # SIM109
+  - if a == b or a == c:
+2 + if a in (b, c):
+3 |     d
+4 | 
+5 | # SIM109
+note: This is an unsafe fix and may change runtime behavior
 
 SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
  --> SIM109.py:6:5
@@ -28,16 +27,15 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
 7 |     d
   |
 help: Replace with `a in (b, c)`
-
-ℹ Unsafe fix
-3 3 |     d
-4 4 | 
-5 5 | # SIM109
-6   |-if (a == b or a == c) and None:
-  6 |+if (a in (b, c)) and None:
-7 7 |     d
-8 8 | 
-9 9 | # SIM109
+3 |     d
+4 | 
+5 | # SIM109
+  - if (a == b or a == c) and None:
+6 + if (a in (b, c)) and None:
+7 |     d
+8 | 
+9 | # SIM109
+note: This is an unsafe fix and may change runtime behavior
 
 SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
   --> SIM109.py:10:4
@@ -48,16 +46,15 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
 11 |     d
    |
 help: Replace with `a in (b, c)`
-
-ℹ Unsafe fix
-7  7  |     d
-8  8  | 
-9  9  | # SIM109
-10    |-if a == b or a == c or None:
-   10 |+if a in (b, c) or None:
-11 11 |     d
-12 12 | 
-13 13 | # SIM109
+7  |     d
+8  | 
+9  | # SIM109
+   - if a == b or a == c or None:
+10 + if a in (b, c) or None:
+11 |     d
+12 | 
+13 | # SIM109
+note: This is an unsafe fix and may change runtime behavior
 
 SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
   --> SIM109.py:14:4
@@ -68,13 +65,12 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons
 15 |     d
    |
 help: Replace with `a in (b, c)`
-
-ℹ Unsafe fix
-11 11 |     d
-12 12 | 
-13 13 | # SIM109
-14    |-if a == b or None or a == c:
-   14 |+if a in (b, c) or None:
-15 15 |     d
-16 16 | 
-17 17 | # OK
+11 |     d
+12 | 
+13 | # SIM109
+   - if a == b or None or a == c:
+14 + if a in (b, c) or None:
+15 |     d
+16 | 
+17 | # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
index 742bd1fc86..7846bc35f2 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
@@ -13,18 +13,17 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
   | |________________^
   |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-1 1 | def f():
-2 2 |     # SIM110
-3   |-    for x in iterable:
-4   |-        if check(x):
-5   |-            return True
-6   |-    return False
-  3 |+    return any(check(x) for x in iterable)
-7 4 | 
-8 5 | 
-9 6 | def f():
+1 | def f():
+2 |     # SIM110
+  -     for x in iterable:
+  -         if check(x):
+  -             return True
+  -     return False
+3 +     return any(check(x) for x in iterable)
+4 | 
+5 | 
+6 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
   --> SIM110.py:25:5
@@ -38,19 +37,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
    | |_______________^
    |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | def f():
-24 24 |     # SIM111
-25    |-    for x in iterable:
-26    |-        if check(x):
-27    |-            return False
-28    |-    return True
-   25 |+    return all(not check(x) for x in iterable)
-29 26 | 
-30 27 | 
-31 28 | def f():
+22 | 
+23 | def f():
+24 |     # SIM111
+   -     for x in iterable:
+   -         if check(x):
+   -             return False
+   -     return True
+25 +     return all(not check(x) for x in iterable)
+26 | 
+27 | 
+28 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loop
   --> SIM110.py:33:5
@@ -64,19 +62,18 @@ SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loo
    | |_______________^
    |
 help: Replace with `return all(x.is_empty() for x in iterable)`
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | def f():
-32 32 |     # SIM111
-33    |-    for x in iterable:
-34    |-        if not x.is_empty():
-35    |-            return False
-36    |-    return True
-   33 |+    return all(x.is_empty() for x in iterable)
-37 34 | 
-38 35 | 
-39 36 | def f():
+30 | 
+31 | def f():
+32 |     # SIM111
+   -     for x in iterable:
+   -         if not x.is_empty():
+   -             return False
+   -     return True
+33 +     return all(x.is_empty() for x in iterable)
+34 | 
+35 | 
+36 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
   --> SIM110.py:55:5
@@ -91,20 +88,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
    | |____________________^
    |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-52 52 | 
-53 53 | def f():
-54 54 |     # SIM110
-55    |-    for x in iterable:
-56    |-        if check(x):
-57    |-            return True
-58    |-    else:
-59    |-        return False
-   55 |+    return any(check(x) for x in iterable)
-60 56 | 
-61 57 | 
-62 58 | def f():
+52 | 
+53 | def f():
+54 |     # SIM110
+   -     for x in iterable:
+   -         if check(x):
+   -             return True
+   -     else:
+   -         return False
+55 +     return any(check(x) for x in iterable)
+56 | 
+57 | 
+58 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
   --> SIM110.py:64:5
@@ -119,20 +115,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
    | |___________________^
    |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | def f():
-63 63 |     # SIM111
-64    |-    for x in iterable:
-65    |-        if check(x):
-66    |-            return False
-67    |-    else:
-68    |-        return True
-   64 |+    return all(not check(x) for x in iterable)
-69 65 | 
-70 66 | 
-71 67 | def f():
+61 | 
+62 | def f():
+63 |     # SIM111
+   -     for x in iterable:
+   -         if check(x):
+   -             return False
+   -     else:
+   -         return True
+64 +     return all(not check(x) for x in iterable)
+65 | 
+66 | 
+67 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
   --> SIM110.py:73:5
@@ -148,20 +143,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
 78 |       return True
    |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-70 70 | 
-71 71 | def f():
-72 72 |     # SIM110
-73    |-    for x in iterable:
-74    |-        if check(x):
-75    |-            return True
-76    |-    else:
-77    |-        return False
-   73 |+    return any(check(x) for x in iterable)
-78 74 |     return True
-79 75 | 
-80 76 | 
+70 | 
+71 | def f():
+72 |     # SIM110
+   -     for x in iterable:
+   -         if check(x):
+   -             return True
+   -     else:
+   -         return False
+73 +     return any(check(x) for x in iterable)
+74 |     return True
+75 | 
+76 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
   --> SIM110.py:83:5
@@ -177,20 +171,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
 88 |       return False
    |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | def f():
-82 82 |     # SIM111
-83    |-    for x in iterable:
-84    |-        if check(x):
-85    |-            return False
-86    |-    else:
-87    |-        return True
-   83 |+    return all(not check(x) for x in iterable)
-88 84 |     return False
-89 85 | 
-90 86 | 
+80 | 
+81 | def f():
+82 |     # SIM111
+   -     for x in iterable:
+   -         if check(x):
+   -             return False
+   -     else:
+   -         return True
+83 +     return all(not check(x) for x in iterable)
+84 |     return False
+85 | 
+86 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 Use `return any(check(x) for x in iterable)` instead of `for` loop
    --> SIM110.py:124:5
@@ -229,19 +222,18 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
     | |________________^
     |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-141 141 |     x = 1
-142 142 | 
-143 143 |     # SIM110
-144     |-    for x in iterable:
-145     |-        if check(x):
-146     |-            return True
-147     |-    return False
-    144 |+    return any(check(x) for x in iterable)
-148 145 | 
-149 146 | 
-150 147 | def f():
+141 |     x = 1
+142 | 
+143 |     # SIM110
+    -     for x in iterable:
+    -         if check(x):
+    -             return True
+    -     return False
+144 +     return any(check(x) for x in iterable)
+145 | 
+146 | 
+147 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
    --> SIM110.py:154:5
@@ -254,19 +246,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
     | |_______________^
     |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-151 151 |     x = 1
-152 152 | 
-153 153 |     # SIM111
-154     |-    for x in iterable:
-155     |-        if check(x):
-156     |-            return False
-157     |-    return True
-    154 |+    return all(not check(x) for x in iterable)
-158 155 | 
-159 156 | 
-160 157 | def f():
+151 |     x = 1
+152 | 
+153 |     # SIM111
+    -     for x in iterable:
+    -         if check(x):
+    -             return False
+    -     return True
+154 +     return all(not check(x) for x in iterable)
+155 | 
+156 | 
+157 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 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
    --> SIM110.py:162:5
@@ -280,19 +271,18 @@ SIM110 [*] Use `return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ90
     | |________________^
     |
 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ℝ")`
-
-ℹ Unsafe 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():
+159 | 
+160 | def f():
+161 |     # 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
+162 +     return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ")
+163 | 
+164 | 
+165 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
    --> SIM110.py:184:5
@@ -308,19 +298,18 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
 189 |   async def f():
     |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-181 181 | 
-182 182 | async def f():
-183 183 |     # SIM110
-184     |-    for x in iterable:
-185     |-        if check(x):
-186     |-            return True
-187     |-    return False
-    184 |+    return any(check(x) for x in iterable)
-188 185 | 
-189 186 | async def f():
-190 187 |     # SIM110
+181 | 
+182 | async def f():
+183 |     # SIM110
+    -     for x in iterable:
+    -         if check(x):
+    -             return True
+    -     return False
+184 +     return any(check(x) for x in iterable)
+185 | 
+186 | async def f():
+187 |     # SIM110
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return any(check(x) for x in await iterable)` instead of `for` loop
    --> SIM110.py:191:5
@@ -336,16 +325,15 @@ SIM110 [*] Use `return any(check(x) for x in await iterable)` instead of `for` l
 196 |   def f():
     |
 help: Replace with `return any(check(x) for x in await iterable)`
-
-ℹ Unsafe fix
-188 188 | 
-189 189 | async def f():
-190 190 |     # SIM110
-191     |-    for x in await iterable:
-192     |-        if check(x):
-193     |-            return True
-194     |-    return False
-    191 |+    return any(check(x) for x in await iterable)
-195 192 | 
-196 193 | def f():
-197 194 |     # OK (can't turn this into any() because the yield would end up inside a genexp)
+188 | 
+189 | async def f():
+190 |     # SIM110
+    -     for x in await iterable:
+    -         if check(x):
+    -             return True
+    -     return False
+191 +     return any(check(x) for x in await iterable)
+192 | 
+193 | def f():
+194 |     # OK (can't turn this into any() because the yield would end up inside a genexp)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
index a8c0b4d02c..8143e3cb2a 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
@@ -13,18 +13,17 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
   | |________________^
   |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-1 1 | def f():
-2 2 |     # SIM110
-3   |-    for x in iterable:
-4   |-        if check(x):
-5   |-            return True
-6   |-    return False
-  3 |+    return any(check(x) for x in iterable)
-7 4 | 
-8 5 | 
-9 6 | def f():
+1 | def f():
+2 |     # SIM110
+  -     for x in iterable:
+  -         if check(x):
+  -             return True
+  -     return False
+3 +     return any(check(x) for x in iterable)
+4 | 
+5 | 
+6 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
   --> SIM111.py:25:5
@@ -38,19 +37,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
    | |_______________^
    |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | def f():
-24 24 |     # SIM111
-25    |-    for x in iterable:
-26    |-        if check(x):
-27    |-            return False
-28    |-    return True
-   25 |+    return all(not check(x) for x in iterable)
-29 26 | 
-30 27 | 
-31 28 | def f():
+22 | 
+23 | def f():
+24 |     # SIM111
+   -     for x in iterable:
+   -         if check(x):
+   -             return False
+   -     return True
+25 +     return all(not check(x) for x in iterable)
+26 | 
+27 | 
+28 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loop
   --> SIM111.py:33:5
@@ -64,19 +62,18 @@ SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loo
    | |_______________^
    |
 help: Replace with `return all(x.is_empty() for x in iterable)`
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | def f():
-32 32 |     # SIM111
-33    |-    for x in iterable:
-34    |-        if not x.is_empty():
-35    |-            return False
-36    |-    return True
-   33 |+    return all(x.is_empty() for x in iterable)
-37 34 | 
-38 35 | 
-39 36 | def f():
+30 | 
+31 | def f():
+32 |     # SIM111
+   -     for x in iterable:
+   -         if not x.is_empty():
+   -             return False
+   -     return True
+33 +     return all(x.is_empty() for x in iterable)
+34 | 
+35 | 
+36 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
   --> SIM111.py:55:5
@@ -91,20 +88,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
    | |____________________^
    |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-52 52 | 
-53 53 | def f():
-54 54 |     # SIM110
-55    |-    for x in iterable:
-56    |-        if check(x):
-57    |-            return True
-58    |-    else:
-59    |-        return False
-   55 |+    return any(check(x) for x in iterable)
-60 56 | 
-61 57 | 
-62 58 | def f():
+52 | 
+53 | def f():
+54 |     # SIM110
+   -     for x in iterable:
+   -         if check(x):
+   -             return True
+   -     else:
+   -         return False
+55 +     return any(check(x) for x in iterable)
+56 | 
+57 | 
+58 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
   --> SIM111.py:64:5
@@ -119,20 +115,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
    | |___________________^
    |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | def f():
-63 63 |     # SIM111
-64    |-    for x in iterable:
-65    |-        if check(x):
-66    |-            return False
-67    |-    else:
-68    |-        return True
-   64 |+    return all(not check(x) for x in iterable)
-69 65 | 
-70 66 | 
-71 67 | def f():
+61 | 
+62 | def f():
+63 |     # SIM111
+   -     for x in iterable:
+   -         if check(x):
+   -             return False
+   -     else:
+   -         return True
+64 +     return all(not check(x) for x in iterable)
+65 | 
+66 | 
+67 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
   --> SIM111.py:73:5
@@ -148,20 +143,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
 78 |       return True
    |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-70 70 | 
-71 71 | def f():
-72 72 |     # SIM110
-73    |-    for x in iterable:
-74    |-        if check(x):
-75    |-            return True
-76    |-    else:
-77    |-        return False
-   73 |+    return any(check(x) for x in iterable)
-78 74 |     return True
-79 75 | 
-80 76 | 
+70 | 
+71 | def f():
+72 |     # SIM110
+   -     for x in iterable:
+   -         if check(x):
+   -             return True
+   -     else:
+   -         return False
+73 +     return any(check(x) for x in iterable)
+74 |     return True
+75 | 
+76 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
   --> SIM111.py:83:5
@@ -177,20 +171,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
 88 |       return False
    |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | def f():
-82 82 |     # SIM111
-83    |-    for x in iterable:
-84    |-        if check(x):
-85    |-            return False
-86    |-    else:
-87    |-        return True
-   83 |+    return all(not check(x) for x in iterable)
-88 84 |     return False
-89 85 | 
-90 86 | 
+80 | 
+81 | def f():
+82 |     # SIM111
+   -     for x in iterable:
+   -         if check(x):
+   -             return False
+   -     else:
+   -         return True
+83 +     return all(not check(x) for x in iterable)
+84 |     return False
+85 | 
+86 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 Use `return any(check(x) for x in iterable)` instead of `for` loop
    --> SIM111.py:124:5
@@ -229,19 +222,18 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
     | |________________^
     |
 help: Replace with `return any(check(x) for x in iterable)`
-
-ℹ Unsafe fix
-141 141 |     x = 1
-142 142 | 
-143 143 |     # SIM110
-144     |-    for x in iterable:
-145     |-        if check(x):
-146     |-            return True
-147     |-    return False
-    144 |+    return any(check(x) for x in iterable)
-148 145 | 
-149 146 | 
-150 147 | def f():
+141 |     x = 1
+142 | 
+143 |     # SIM110
+    -     for x in iterable:
+    -         if check(x):
+    -             return True
+    -     return False
+144 +     return any(check(x) for x in iterable)
+145 | 
+146 | 
+147 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
    --> SIM111.py:154:5
@@ -254,19 +246,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo
     | |_______________^
     |
 help: Replace with `return all(not check(x) for x in iterable)`
-
-ℹ Unsafe fix
-151 151 |     x = 1
-152 152 | 
-153 153 |     # SIM111
-154     |-    for x in iterable:
-155     |-        if check(x):
-156     |-            return False
-157     |-    return True
-    154 |+    return all(not check(x) for x in iterable)
-158 155 | 
-159 156 | 
-160 157 | def f():
+151 |     x = 1
+152 | 
+153 |     # SIM111
+    -     for x in iterable:
+    -         if check(x):
+    -             return False
+    -     return True
+154 +     return all(not check(x) for x in iterable)
+155 | 
+156 | 
+157 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(x in y for x in iterable)` instead of `for` loop
    --> SIM111.py:162:5
@@ -280,19 +271,18 @@ SIM110 [*] Use `return all(x in y for x in iterable)` instead of `for` loop
     | |_______________^
     |
 help: Replace with `return all(x in y for x in iterable)`
-
-ℹ Unsafe fix
-159 159 | 
-160 160 | def f():
-161 161 |     # SIM111
-162     |-    for x in iterable:
-163     |-        if x not in y:
-164     |-            return False
-165     |-    return True
-    162 |+    return all(x in y for x in iterable)
-166 163 | 
-167 164 | 
-168 165 | def f():
+159 | 
+160 | def f():
+161 |     # SIM111
+    -     for x in iterable:
+    -         if x not in y:
+    -             return False
+    -     return True
+162 +     return all(x in y for x in iterable)
+163 | 
+164 | 
+165 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM110 [*] Use `return all(x <= y for x in iterable)` instead of `for` loop
    --> SIM111.py:170:5
@@ -306,19 +296,18 @@ SIM110 [*] Use `return all(x <= y for x in iterable)` instead of `for` loop
     | |_______________^
     |
 help: Replace with `return all(x <= y for x in iterable)`
-
-ℹ Unsafe fix
-167 167 | 
-168 168 | def f():
-169 169 |     # SIM111
-170     |-    for x in iterable:
-171     |-        if x > y:
-172     |-            return False
-173     |-    return True
-    170 |+    return all(x <= y for x in iterable)
-174 171 | 
-175 172 | 
-176 173 | def f():
+167 | 
+168 | def f():
+169 |     # SIM111
+    -     for x in iterable:
+    -         if x > y:
+    -             return False
+    -     return True
+170 +     return all(x <= y for x in iterable)
+171 | 
+172 | 
+173 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 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
    --> SIM111.py:178:5
@@ -332,16 +321,15 @@ SIM110 [*] Use `return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2
     | |_______________^
     |
 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")`
-
-ℹ Unsafe 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():
+175 | 
+176 | def f():
+177 |     # 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
+178 +     return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9")
+179 | 
+180 | 
+181 | def f():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
index 2df4110d7c..aa748af00a 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
@@ -11,16 +11,15 @@ SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
 6 | os.environ.get('foo')
   |
 help: Replace `foo` with `FOO`
-
-ℹ Unsafe fix
-1 1 | import os
-2 2 | 
-3 3 | # Bad
-4   |-os.environ['foo']
-  4 |+os.environ['FOO']
-5 5 | 
-6 6 | os.environ.get('foo')
-7 7 | 
+1 | import os
+2 | 
+3 | # Bad
+  - os.environ['foo']
+4 + os.environ['FOO']
+5 | 
+6 | os.environ.get('foo')
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM112 Use capitalized environment variable `FOO` instead of `foo`
  --> SIM112.py:6:16
@@ -81,16 +80,15 @@ SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
 16 | if env := os.environ.get('foo'):
    |
 help: Replace `foo` with `FOO`
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | env = os.environ.get('foo')
-13 13 | 
-14    |-env = os.environ['foo']
-   14 |+env = os.environ['FOO']
-15 15 | 
-16 16 | if env := os.environ.get('foo'):
-17 17 |     pass
+11 | 
+12 | env = os.environ.get('foo')
+13 | 
+   - env = os.environ['foo']
+14 + env = os.environ['FOO']
+15 | 
+16 | if env := os.environ.get('foo'):
+17 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM112 Use capitalized environment variable `FOO` instead of `foo`
   --> SIM112.py:16:26
@@ -113,13 +111,12 @@ SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
 20 |     pass
    |
 help: Replace `foo` with `FOO`
-
-ℹ Unsafe fix
-16 16 | if env := os.environ.get('foo'):
-17 17 |     pass
-18 18 | 
-19    |-if env := os.environ['foo']:
-   19 |+if env := os.environ['FOO']:
-20 20 |     pass
-21 21 | 
-22 22 |
+16 | if env := os.environ.get('foo'):
+17 |     pass
+18 | 
+   - if env := os.environ['foo']:
+19 + if env := os.environ['FOO']:
+20 |     pass
+21 | 
+22 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap
index d5c11a5859..45d6aad6bf 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap
@@ -14,16 +14,14 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 7 |   if a:  # we preserve comments, too!
   |
 help: Combine `if` branches
-
-ℹ Safe fix
-1 1 | # Errors
-2   |-if a:
-3   |-    b
-4   |-elif c:
-  2 |+if a or c:
-5 3 |     b
-6 4 | 
-7 5 | if a:  # we preserve comments, too!
+1 | # Errors
+  - if a:
+  -     b
+  - elif c:
+2 + if a or c:
+3 |     b
+4 | 
+5 | if a:  # we preserve comments, too!
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:7:1
@@ -39,18 +37,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 12 |   if x == 1:
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-4  4  | elif c:
-5  5  |     b
-6  6  | 
-7     |-if a:  # we preserve comments, too!
-8     |-    b
-9     |-elif c:  # but not on the second branch
-   7  |+if a or c:  # we preserve comments, too!
-10 8  |     b
-11 9  | 
-12 10 | if x == 1:
+4  | elif c:
+5  |     b
+6  | 
+   - if a:  # we preserve comments, too!
+   -     b
+   - elif c:  # but not on the second branch
+7  + if a or c:  # we preserve comments, too!
+8  |     b
+9  | 
+10 | if x == 1:
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:12:1
@@ -68,19 +64,17 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 19 |   if x == 1:
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-9  9  | elif c:  # but not on the second branch
-10 10 |     b
-11 11 | 
-12    |-if x == 1:
-13    |-    for _ in range(20):
-14    |-        print("hello")
-15    |-elif x == 2:
-   12 |+if x == 1 or x == 2:
-16 13 |     for _ in range(20):
-17 14 |         print("hello")
-18 15 | 
+9  | elif c:  # but not on the second branch
+10 |     b
+11 | 
+   - if x == 1:
+   -     for _ in range(20):
+   -         print("hello")
+   - elif x == 2:
+12 + if x == 1 or x == 2:
+13 |     for _ in range(20):
+14 |         print("hello")
+15 | 
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:19:1
@@ -100,20 +94,18 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 28 |   if x == 1:
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-16 16 |     for _ in range(20):
-17 17 |         print("hello")
-18 18 | 
-19    |-if x == 1:
-20    |-    if True:
-21    |-        for _ in range(20):
-22    |-            print("hello")
-23    |-elif x == 2:
-   19 |+if x == 1 or x == 2:
-24 20 |     if True:
-25 21 |         for _ in range(20):
-26 22 |             print("hello")
+16 |     for _ in range(20):
+17 |         print("hello")
+18 | 
+   - if x == 1:
+   -     if True:
+   -         for _ in range(20):
+   -             print("hello")
+   - elif x == 2:
+19 + if x == 1 or x == 2:
+20 |     if True:
+21 |         for _ in range(20):
+22 |             print("hello")
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:28:1
@@ -139,23 +131,21 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 43 |   if (
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-25 25 |         for _ in range(20):
-26 26 |             print("hello")
-27 27 | 
-28    |-if x == 1:
-29    |-    if True:
-30    |-        for _ in range(20):
-31    |-            print("hello")
-32    |-    elif False:
-33    |-        for _ in range(20):
-34    |-            print("hello")
-35    |-elif x == 2:
-   28 |+if x == 1 or x == 2:
-36 29 |     if True:
-37 30 |         for _ in range(20):
-38 31 |             print("hello")
+25 |         for _ in range(20):
+26 |             print("hello")
+27 | 
+   - if x == 1:
+   -     if True:
+   -         for _ in range(20):
+   -             print("hello")
+   -     elif False:
+   -         for _ in range(20):
+   -             print("hello")
+   - elif x == 2:
+28 + if x == 1 or x == 2:
+29 |     if True:
+30 |         for _ in range(20):
+31 |             print("hello")
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:29:5
@@ -172,19 +162,17 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 36 |       if True:
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-26 26 |             print("hello")
-27 27 | 
-28 28 | if x == 1:
-29    |-    if True:
-30    |-        for _ in range(20):
-31    |-            print("hello")
-32    |-    elif False:
-   29 |+    if True or False:
-33 30 |         for _ in range(20):
-34 31 |             print("hello")
-35 32 | elif x == 2:
+26 |             print("hello")
+27 | 
+28 | if x == 1:
+   -     if True:
+   -         for _ in range(20):
+   -             print("hello")
+   -     elif False:
+29 +     if True or False:
+30 |         for _ in range(20):
+31 |             print("hello")
+32 | elif x == 2:
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:36:5
@@ -202,19 +190,17 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 43 |   if (
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-33 33 |         for _ in range(20):
-34 34 |             print("hello")
-35 35 | elif x == 2:
-36    |-    if True:
-37    |-        for _ in range(20):
-38    |-            print("hello")
-39    |-    elif False:
-   36 |+    if True or False:
-40 37 |         for _ in range(20):
-41 38 |             print("hello")
-42 39 | 
+33 |         for _ in range(20):
+34 |             print("hello")
+35 | elif x == 2:
+   -     if True:
+   -         for _ in range(20):
+   -             print("hello")
+   -     elif False:
+36 +     if True or False:
+37 |         for _ in range(20):
+38 |             print("hello")
+39 | 
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:43:1
@@ -245,18 +231,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 63 |   if result.eofs == "O":
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-55 55 |     and i == 12
-56 56 |     and j == 13
-57 57 |     and k == 14
-58    |-):
-59    |-    pass
-60    |-elif 1 == 2:
-   58 |+) or 1 == 2:
-61 59 |     pass
-62 60 | 
-63 61 | if result.eofs == "O":
+55 |     and i == 12
+56 |     and j == 13
+57 |     and k == 14
+   - ):
+   -     pass
+   - elif 1 == 2:
+58 + ) or 1 == 2:
+59 |     pass
+60 | 
+61 | if result.eofs == "O":
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:67:1
@@ -272,18 +256,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 72 |       errors = 1
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-64 64 |     pass
-65 65 | elif result.eofs == "S":
-66 66 |     skipped = 1
-67    |-elif result.eofs == "F":
-68    |-    errors = 1
-69    |-elif result.eofs == "E":
-   67 |+elif result.eofs == "F" or result.eofs == "E":
-70 68 |     errors = 1
-71 69 | elif result.eofs == "X":
-72 70 |     errors = 1
+64 |     pass
+65 | elif result.eofs == "S":
+66 |     skipped = 1
+   - elif result.eofs == "F":
+   -     errors = 1
+   - elif result.eofs == "E":
+67 + elif result.eofs == "F" or result.eofs == "E":
+68 |     errors = 1
+69 | elif result.eofs == "X":
+70 |     errors = 1
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:69:1
@@ -299,18 +281,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 74 |       errors = 1
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-66 66 |     skipped = 1
-67 67 | elif result.eofs == "F":
-68 68 |     errors = 1
-69    |-elif result.eofs == "E":
-70    |-    errors = 1
-71    |-elif result.eofs == "X":
-   69 |+elif result.eofs == "E" or result.eofs == "X":
-72 70 |     errors = 1
-73 71 | elif result.eofs == "C":
-74 72 |     errors = 1
+66 |     skipped = 1
+67 | elif result.eofs == "F":
+68 |     errors = 1
+   - elif result.eofs == "E":
+   -     errors = 1
+   - elif result.eofs == "X":
+69 + elif result.eofs == "E" or result.eofs == "X":
+70 |     errors = 1
+71 | elif result.eofs == "C":
+72 |     errors = 1
 
 SIM114 [*] Combine `if` branches using logical `or` operator
   --> SIM114.py:71:1
@@ -324,18 +304,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
    | |______________^
    |
 help: Combine `if` branches
-
-ℹ Safe fix
-68 68 |     errors = 1
-69 69 | elif result.eofs == "E":
-70 70 |     errors = 1
-71    |-elif result.eofs == "X":
-72    |-    errors = 1
-73    |-elif result.eofs == "C":
-   71 |+elif result.eofs == "X" or result.eofs == "C":
-74 72 |     errors = 1
-75 73 | 
-76 74 | 
+68 |     errors = 1
+69 | elif result.eofs == "E":
+70 |     errors = 1
+   - elif result.eofs == "X":
+   -     errors = 1
+   - elif result.eofs == "C":
+71 + elif result.eofs == "X" or result.eofs == "C":
+72 |     errors = 1
+73 | 
+74 | 
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:118:5
@@ -351,18 +329,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 123 |           return 4
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-115 115 | def func():
-116 116 |     a = True
-117 117 |     b = False
-118     |-    if a > b:  # end-of-line
-119     |-        return 3
-120     |-    elif a == b:
-    118 |+    if a > b or a == b:  # end-of-line
-121 119 |         return 3
-122 120 |     elif a < b:  # end-of-line
-123 121 |         return 4
+115 | def func():
+116 |     a = True
+117 |     b = False
+    -     if a > b:  # end-of-line
+    -         return 3
+    -     elif a == b:
+118 +     if a > b or a == b:  # end-of-line
+119 |         return 3
+120 |     elif a < b:  # end-of-line
+121 |         return 4
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:122:5
@@ -376,18 +352,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
     | |________________^
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-119 119 |         return 3
-120 120 |     elif a == b:
-121 121 |         return 3
-122     |-    elif a < b:  # end-of-line
-123     |-        return 4
-124     |-    elif b is None:
-    122 |+    elif a < b or b is None:  # end-of-line
-125 123 |         return 4
-126 124 | 
-127 125 | 
+119 |         return 3
+120 |     elif a == b:
+121 |         return 3
+    -     elif a < b:  # end-of-line
+    -         return 4
+    -     elif b is None:
+122 +     elif a < b or b is None:  # end-of-line
+123 |         return 4
+124 | 
+125 | 
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:132:5
@@ -401,18 +375,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
     | |________________^
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-129 129 |     """Ensure that the named expression is parenthesized when merged."""
-130 130 |     a = True
-131 131 |     b = False
-132     |-    if a > b:  # end-of-line
-133     |-        return 3
-134     |-    elif a := 1:
-    132 |+    if a > b or (a := 1):  # end-of-line
-135 133 |         return 3
-136 134 | 
-137 135 | 
+129 |     """Ensure that the named expression is parenthesized when merged."""
+130 |     a = True
+131 |     b = False
+    -     if a > b:  # end-of-line
+    -         return 3
+    -     elif a := 1:
+132 +     if a > b or (a := 1):  # end-of-line
+133 |         return 3
+134 | 
+135 | 
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:138:1
@@ -424,18 +396,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
     | |_____^
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-135 135 |         return 3
-136 136 | 
-137 137 | 
-138     |-if a:  # we preserve comments, too!
-139     |-    b
-140     |-elif c:  # but not on the second branch
-    138 |+if a or c:  # we preserve comments, too!
-141 139 |     b
-142 140 | 
-143 141 | 
+135 |         return 3
+136 | 
+137 | 
+    - if a:  # we preserve comments, too!
+    -     b
+    - elif c:  # but not on the second branch
+138 + if a or c:  # we preserve comments, too!
+139 |     b
+140 | 
+141 | 
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:144:1
@@ -445,17 +415,15 @@ SIM114 [*] Combine `if` branches using logical `or` operator
     | |_________^
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-141 141 |     b
-142 142 | 
-143 143 | 
-144     |-if a: b  # here's a comment
-145     |-elif c: b
-    144 |+if a or c: b  # here's a comment
-146 145 | 
-147 146 | 
-148 147 | if(x > 200): pass
+141 |     b
+142 | 
+143 | 
+    - if a: b  # here's a comment
+    - elif c: b
+144 + if a or c: b  # here's a comment
+145 | 
+146 | 
+147 | if(x > 200): pass
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:148:1
@@ -466,18 +434,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator
     | |________^
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-145 145 | elif c: b
-146 146 | 
-147 147 | 
-148     |-if(x > 200): pass
-149     |-elif(100 < x and x < 200 and 300 < y and y < 800):
-150     |-	pass
-    148 |+if(x > 200) or (100 < x and x < 200 and 300 < y and y < 800): pass
-151 149 | 
-152 150 | 
-153 151 | # See: https://github.com/astral-sh/ruff/issues/12732
+145 | elif c: b
+146 | 
+147 | 
+    - if(x > 200): pass
+    - elif(100 < x and x < 200 and 300 < y and y < 800):
+    - 	pass
+148 + if(x > 200) or (100 < x and x < 200 and 300 < y and y < 800): pass
+149 | 
+150 | 
+151 | # See: https://github.com/astral-sh/ruff/issues/12732
 
 SIM114 [*] Combine `if` branches using logical `or` operator
    --> SIM114.py:154:1
@@ -492,15 +458,13 @@ SIM114 [*] Combine `if` branches using logical `or` operator
 159 |       print(2)
     |
 help: Combine `if` branches
-
-ℹ Safe fix
-151 151 | 
-152 152 | 
-153 153 | # See: https://github.com/astral-sh/ruff/issues/12732
-154     |-if False if True else False:
-155     |-    print(1)
-156     |-elif True:
-    154 |+if (False if True else False) or True:
-157 155 |     print(1)
-158 156 | else:
-159 157 |     print(2)
+151 | 
+152 | 
+153 | # See: https://github.com/astral-sh/ruff/issues/12732
+    - if False if True else False:
+    -     print(1)
+    - elif True:
+154 + if (False if True else False) or True:
+155 |     print(1)
+156 | else:
+157 |     print(2)
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap
index 5669f91959..62d5972419 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap
@@ -11,17 +11,15 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 4 |           print("hello")
   |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-1 1 | # SIM117
-2   |-with A() as a:
-3   |-    with B() as b:
-4   |-        print("hello")
-  2 |+with A() as a, B() as b:
-  3 |+    print("hello")
-5 4 | 
-6 5 | # SIM117
-7 6 | with A():
+1 | # SIM117
+  - with A() as a:
+  -     with B() as b:
+  -         print("hello")
+2 + with A() as a, B() as b:
+3 +     print("hello")
+4 | 
+5 | # SIM117
+6 | with A():
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:7:1
@@ -34,21 +32,19 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 10 |               print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-4  4  |         print("hello")
-5  5  | 
-6  6  | # SIM117
-7     |-with A():
-8     |-    with B():
-9     |-        with C():
-10    |-            print("hello")
-   7  |+with A(), B():
-   8  |+    with C():
-   9  |+        print("hello")
-11 10 | 
-12 11 | # SIM117
-13 12 | with A() as a:
+4  |         print("hello")
+5  | 
+6  | # SIM117
+   - with A():
+   -     with B():
+   -         with C():
+   -             print("hello")
+7  + with A(), B():
+8  +     with C():
+9  +         print("hello")
+10 | 
+11 | # SIM117
+12 | with A() as a:
 
 SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:13:1
@@ -73,21 +69,19 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 22 |           print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-16 16 |         print("hello")
-17 17 | 
-18 18 | # SIM117
-19    |-with A() as a:
-20    |-    with B() as b:
-21    |-        # Fixable due to placement of this comment.
-22    |-        print("hello")
-   19 |+with A() as a, B() as b:
-   20 |+    # Fixable due to placement of this comment.
-   21 |+    print("hello")
-23 22 | 
-24 23 | # OK
-25 24 | with A() as a:
+16 |         print("hello")
+17 | 
+18 | # SIM117
+   - with A() as a:
+   -     with B() as b:
+   -         # Fixable due to placement of this comment.
+   -         print("hello")
+19 + with A() as a, B() as b:
+20 +     # Fixable due to placement of this comment.
+21 +     print("hello")
+22 | 
+23 | # OK
+24 | with A() as a:
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:47:1
@@ -99,19 +93,17 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 49 |           print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-44 44 |         print("hello")
-45 45 | 
-46 46 | # SIM117
-47    |-async with A() as a:
-48    |-    async with B() as b:
-49    |-        print("hello")
-   47 |+async with A() as a, B() as b:
-   48 |+    print("hello")
-50 49 | 
-51 50 | while True:
-52 51 |     # SIM117
+44 |         print("hello")
+45 | 
+46 | # SIM117
+   - async with A() as a:
+   -     async with B() as b:
+   -         print("hello")
+47 + async with A() as a, B() as b:
+48 +     print("hello")
+49 | 
+50 | while True:
+51 |     # SIM117
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:53:5
@@ -125,31 +117,29 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 56 |   is valid"""
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-50 50 | 
-51 51 | while True:
-52 52 |     # SIM117
-53    |-    with A() as a:
-54    |-        with B() as b:
-55    |-            """this
-   53 |+    with A() as a, B() as b:
-   54 |+        """this
-56 55 | is valid"""
-57 56 | 
-58    |-            """the indentation on
-   57 |+        """the indentation on
-59 58 |             this line is significant"""
-60 59 | 
-61    |-            "this is" \
-   60 |+        "this is" \
-62 61 | "allowed too"
-63 62 | 
-64    |-            ("so is"
-   63 |+        ("so is"
-65 64 | "this for some reason")
-66 65 | 
-67 66 | # SIM117
+50 | 
+51 | while True:
+52 |     # SIM117
+   -     with A() as a:
+   -         with B() as b:
+   -             """this
+53 +     with A() as a, B() as b:
+54 +         """this
+55 | is valid"""
+56 | 
+   -             """the indentation on
+57 +         """the indentation on
+58 |             this line is significant"""
+59 | 
+   -             "this is" \
+60 +         "this is" \
+61 | "allowed too"
+62 | 
+   -             ("so is"
+63 +         ("so is"
+64 | "this for some reason")
+65 | 
+66 | # SIM117
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:68:1
@@ -164,20 +154,18 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 73 |           print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-67 67 | # SIM117
-68 68 | with (
-69 69 |     A() as a,
-70    |-    B() as b,
-   70 |+    B() as b,C() as c
-71 71 | ):
-72    |-    with C() as c:
-73    |-        print("hello")
-   72 |+    print("hello")
-74 73 | 
-75 74 | # SIM117
-76 75 | with A() as a:
+67 | # SIM117
+68 | with (
+69 |     A() as a,
+   -     B() as b,
+70 +     B() as b,C() as c
+71 | ):
+   -     with C() as c:
+   -         print("hello")
+72 +     print("hello")
+73 | 
+74 | # SIM117
+75 | with A() as a:
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:76:1
@@ -192,25 +180,23 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 81 |           print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-73 73 |         print("hello")
-74 74 | 
-75 75 | # SIM117
-76    |-with A() as a:
-77    |-    with (
-78    |-        B() as b,
-79    |-        C() as c,
-80    |-    ):
-81    |-        print("hello")
-   76 |+with (
-   77 |+    A() as a, B() as b,
-   78 |+    C() as c,
-   79 |+):
-   80 |+    print("hello")
-82 81 | 
-83 82 | # SIM117
-84 83 | with (
+73 |         print("hello")
+74 | 
+75 | # SIM117
+   - with A() as a:
+   -     with (
+   -         B() as b,
+   -         C() as c,
+   -     ):
+   -         print("hello")
+76 + with (
+77 +     A() as a, B() as b,
+78 +     C() as c,
+79 + ):
+80 +     print("hello")
+81 | 
+82 | # SIM117
+83 | with (
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:84:1
@@ -228,24 +214,22 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 92 |           print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-83 83 | # SIM117
-84 84 | with (
-85 85 |     A() as a,
-86    |-    B() as b,
-   86 |+    B() as b,C() as c,
-   87 |+    D() as d,
-87 88 | ):
-88    |-    with (
-89    |-        C() as c,
-90    |-        D() as d,
-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:
+83 | # SIM117
+84 | with (
+85 |     A() as a,
+   -     B() as b,
+86 +     B() as b,C() as c,
+87 +     D() as d,
+88 | ):
+   -     with (
+   -         C() as c,
+   -         D() as d,
+   -     ):
+   -         print("hello")
+89 +     print("hello")
+90 | 
+91 | # SIM117 (auto-fixable)
+92 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a:
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
   --> SIM117.py:95:1
@@ -257,19 +241,17 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 97 |           print("hello")
    |
 help: Combine `with` statements
-
-ℹ Unsafe 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:
+92 |         print("hello")
+93 | 
+94 | # 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")
+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")
+97 | 
+98 | # SIM117 (not auto-fixable too long)
+99 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a:
 
 SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements
    --> SIM117.py:100:1
@@ -304,32 +286,30 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 128 |           type ListOrSet[T] = list[T] | set[T]
     |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-123 123 |             f(b2, c2, d2)
-124 124 | 
-125 125 | # SIM117
-126     |-with A() as a:
-127     |-    with B() as b:
-128     |-        type ListOrSet[T] = list[T] | set[T]
-    126 |+with A() as a, B() as b:
-    127 |+    type ListOrSet[T] = list[T] | set[T]
-129 128 | 
-130     |-        class ClassA[T: str]:
-131     |-            def method1(self) -> T:
-132     |-                ...
-    129 |+    class ClassA[T: str]:
-    130 |+        def method1(self) -> T:
-    131 |+            ...
-133 132 | 
-134     |-        f" something { my_dict["key"] } something else "
-    133 |+    f" something { my_dict["key"] } something else "
-135 134 | 
-136     |-        f"foo {f"bar {x}"} baz"
-    135 |+    f"foo {f"bar {x}"} baz"
-137 136 | 
-138 137 | # Allow cascading for some statements.
-139 138 | import anyio
+123 |             f(b2, c2, d2)
+124 | 
+125 | # SIM117
+    - with A() as a:
+    -     with B() as b:
+    -         type ListOrSet[T] = list[T] | set[T]
+126 + with A() as a, B() as b:
+127 +     type ListOrSet[T] = list[T] | set[T]
+128 | 
+    -         class ClassA[T: str]:
+    -             def method1(self) -> T:
+    -                 ...
+129 +     class ClassA[T: str]:
+130 +         def method1(self) -> T:
+131 +             ...
+132 | 
+    -         f" something { my_dict["key"] } something else "
+133 +     f" something { my_dict["key"] } something else "
+134 | 
+    -         f"foo {f"bar {x}"} baz"
+135 +     f"foo {f"bar {x}"} baz"
+136 | 
+137 | # Allow cascading for some statements.
+138 | import anyio
 
 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
    --> SIM117.py:163:1
@@ -341,13 +321,11 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste
 165 |           pass
     |
 help: Combine `with` statements
-
-ℹ Unsafe fix
-160 160 |                                     pass
-161 161 | 
-162 162 | # Do not suppress combination, if a context manager is already combined with another.
-163     |-async with asyncio.timeout(1), A():
-164     |-    async with B():
-165     |-        pass
-    163 |+async with asyncio.timeout(1), A(), B():
-    164 |+    pass
+160 |                                     pass
+161 | 
+162 | # Do not suppress combination, if a context manager is already combined with another.
+    - async with asyncio.timeout(1), A():
+    -     async with B():
+    -         pass
+163 + async with asyncio.timeout(1), A(), B():
+164 +     pass
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap
index 1400a9d93b..7dd62e1b1e 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap
@@ -12,15 +12,13 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 5 | key not in obj.keys()  # SIM118
   |
 help: Remove `.keys()`
-
-ℹ Safe fix
-1 1 | obj = {}
-2 2 | 
-3   |-key in obj.keys()  # SIM118
-  3 |+key in obj  # SIM118
-4 4 | 
-5 5 | key not in obj.keys()  # SIM118
-6 6 | 
+1 | obj = {}
+2 | 
+  - key in obj.keys()  # SIM118
+3 + key in obj  # SIM118
+4 | 
+5 | key not in obj.keys()  # SIM118
+6 | 
 
 SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
  --> SIM118.py:5:1
@@ -33,16 +31,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
 7 | foo["bar"] in obj.keys()  # SIM118
   |
 help: Remove `.keys()`
-
-ℹ Safe fix
-2 2 | 
-3 3 | key in obj.keys()  # SIM118
-4 4 | 
-5   |-key not in obj.keys()  # SIM118
-  5 |+key not in obj  # SIM118
-6 6 | 
-7 7 | foo["bar"] in obj.keys()  # SIM118
-8 8 | 
+2 | 
+3 | key in obj.keys()  # SIM118
+4 | 
+  - key not in obj.keys()  # SIM118
+5 + key not in obj  # SIM118
+6 | 
+7 | foo["bar"] in obj.keys()  # SIM118
+8 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
  --> SIM118.py:7:1
@@ -55,16 +51,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 9 | foo["bar"] not in obj.keys()  # SIM118
   |
 help: Remove `.keys()`
-
-ℹ Safe fix
-4 4 | 
-5 5 | key not in obj.keys()  # SIM118
-6 6 | 
-7   |-foo["bar"] in obj.keys()  # SIM118
-  7 |+foo["bar"] in obj  # SIM118
-8 8 | 
-9 9 | foo["bar"] not in obj.keys()  # SIM118
-10 10 | 
+4  | 
+5  | key not in obj.keys()  # SIM118
+6  | 
+   - foo["bar"] in obj.keys()  # SIM118
+7  + foo["bar"] in obj  # SIM118
+8  | 
+9  | foo["bar"] not in obj.keys()  # SIM118
+10 | 
 
 SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
   --> SIM118.py:9:1
@@ -77,16 +71,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
 11 | foo['bar'] in obj.keys()  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-6  6  | 
-7  7  | foo["bar"] in obj.keys()  # SIM118
-8  8  | 
-9     |-foo["bar"] not in obj.keys()  # SIM118
-   9  |+foo["bar"] not in obj  # SIM118
-10 10 | 
-11 11 | foo['bar'] in obj.keys()  # SIM118
-12 12 | 
+6  | 
+7  | foo["bar"] in obj.keys()  # SIM118
+8  | 
+   - foo["bar"] not in obj.keys()  # SIM118
+9  + foo["bar"] not in obj  # SIM118
+10 | 
+11 | foo['bar'] in obj.keys()  # SIM118
+12 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:11:1
@@ -99,16 +91,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 13 | foo['bar'] not in obj.keys()  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-8  8  | 
-9  9  | foo["bar"] not in obj.keys()  # SIM118
-10 10 | 
-11    |-foo['bar'] in obj.keys()  # SIM118
-   11 |+foo['bar'] in obj  # SIM118
-12 12 | 
-13 13 | foo['bar'] not in obj.keys()  # SIM118
-14 14 | 
+8  | 
+9  | foo["bar"] not in obj.keys()  # SIM118
+10 | 
+   - foo['bar'] in obj.keys()  # SIM118
+11 + foo['bar'] in obj  # SIM118
+12 | 
+13 | foo['bar'] not in obj.keys()  # SIM118
+14 | 
 
 SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
   --> SIM118.py:13:1
@@ -121,16 +111,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
 15 | foo() in obj.keys()  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-10 10 | 
-11 11 | foo['bar'] in obj.keys()  # SIM118
-12 12 | 
-13    |-foo['bar'] not in obj.keys()  # SIM118
-   13 |+foo['bar'] not in obj  # SIM118
-14 14 | 
-15 15 | foo() in obj.keys()  # SIM118
-16 16 | 
+10 | 
+11 | foo['bar'] in obj.keys()  # SIM118
+12 | 
+   - foo['bar'] not in obj.keys()  # SIM118
+13 + foo['bar'] not in obj  # SIM118
+14 | 
+15 | foo() in obj.keys()  # SIM118
+16 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:15:1
@@ -143,16 +131,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 17 | foo() not in obj.keys()  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-12 12 | 
-13 13 | foo['bar'] not in obj.keys()  # SIM118
-14 14 | 
-15    |-foo() in obj.keys()  # SIM118
-   15 |+foo() in obj  # SIM118
-16 16 | 
-17 17 | foo() not in obj.keys()  # SIM118
-18 18 | 
+12 | 
+13 | foo['bar'] not in obj.keys()  # SIM118
+14 | 
+   - foo() in obj.keys()  # SIM118
+15 + foo() in obj  # SIM118
+16 | 
+17 | foo() not in obj.keys()  # SIM118
+18 | 
 
 SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
   --> SIM118.py:17:1
@@ -165,16 +151,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()`
 19 | for key in obj.keys():  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-14 14 | 
-15 15 | foo() in obj.keys()  # SIM118
-16 16 | 
-17    |-foo() not in obj.keys()  # SIM118
-   17 |+foo() not in obj  # SIM118
-18 18 | 
-19 19 | for key in obj.keys():  # SIM118
-20 20 |     pass
+14 | 
+15 | foo() in obj.keys()  # SIM118
+16 | 
+   - foo() not in obj.keys()  # SIM118
+17 + foo() not in obj  # SIM118
+18 | 
+19 | for key in obj.keys():  # SIM118
+20 |     pass
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:19:5
@@ -186,16 +170,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 20 |     pass
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-16 16 | 
-17 17 | foo() not in obj.keys()  # SIM118
-18 18 | 
-19    |-for key in obj.keys():  # SIM118
-   19 |+for key in obj:  # SIM118
-20 20 |     pass
-21 21 | 
-22 22 | for key in list(obj.keys()):
+16 | 
+17 | foo() not in obj.keys()  # SIM118
+18 | 
+   - for key in obj.keys():  # SIM118
+19 + for key in obj:  # SIM118
+20 |     pass
+21 | 
+22 | for key in list(obj.keys()):
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:26:8
@@ -208,16 +190,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 28 | {k for k in obj.keys()}  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-23 23 |     if some_property(key):
-24 24 |         del obj[key]
-25 25 | 
-26    |-[k for k in obj.keys()]  # SIM118
-   26 |+[k for k in obj]  # SIM118
-27 27 | 
-28 28 | {k for k in obj.keys()}  # SIM118
-29 29 | 
+23 |     if some_property(key):
+24 |         del obj[key]
+25 | 
+   - [k for k in obj.keys()]  # SIM118
+26 + [k for k in obj]  # SIM118
+27 | 
+28 | {k for k in obj.keys()}  # SIM118
+29 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:28:8
@@ -230,16 +210,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 30 | {k: k for k in obj.keys()}  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-25 25 | 
-26 26 | [k for k in obj.keys()]  # SIM118
-27 27 | 
-28    |-{k for k in obj.keys()}  # SIM118
-   28 |+{k for k in obj}  # SIM118
-29 29 | 
-30 30 | {k: k for k in obj.keys()}  # SIM118
-31 31 | 
+25 | 
+26 | [k for k in obj.keys()]  # SIM118
+27 | 
+   - {k for k in obj.keys()}  # SIM118
+28 + {k for k in obj}  # SIM118
+29 | 
+30 | {k: k for k in obj.keys()}  # SIM118
+31 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:30:11
@@ -252,16 +230,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 32 | (k for k in obj.keys())  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-27 27 | 
-28 28 | {k for k in obj.keys()}  # SIM118
-29 29 | 
-30    |-{k: k for k in obj.keys()}  # SIM118
-   30 |+{k: k for k in obj}  # SIM118
-31 31 | 
-32 32 | (k for k in obj.keys())  # SIM118
-33 33 | 
+27 | 
+28 | {k for k in obj.keys()}  # SIM118
+29 | 
+   - {k: k for k in obj.keys()}  # SIM118
+30 + {k: k for k in obj}  # SIM118
+31 | 
+32 | (k for k in obj.keys())  # SIM118
+33 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:32:8
@@ -274,16 +250,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 34 | key in (obj or {}).keys()  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-29 29 | 
-30 30 | {k: k for k in obj.keys()}  # SIM118
-31 31 | 
-32    |-(k for k in obj.keys())  # SIM118
-   32 |+(k for k in obj)  # SIM118
-33 33 | 
-34 34 | key in (obj or {}).keys()  # SIM118
-35 35 | 
+29 | 
+30 | {k: k for k in obj.keys()}  # SIM118
+31 | 
+   - (k for k in obj.keys())  # SIM118
+32 + (k for k in obj)  # SIM118
+33 | 
+34 | key in (obj or {}).keys()  # SIM118
+35 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:34:1
@@ -296,16 +270,15 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 36 | (key) in (obj or {}).keys()  # SIM118
    |
 help: Remove `.keys()`
-
-ℹ Unsafe fix
-31 31 | 
-32 32 | (k for k in obj.keys())  # SIM118
-33 33 | 
-34    |-key in (obj or {}).keys()  # SIM118
-   34 |+key in (obj or {})  # SIM118
-35 35 | 
-36 36 | (key) in (obj or {}).keys()  # SIM118
-37 37 | 
+31 | 
+32 | (k for k in obj.keys())  # SIM118
+33 | 
+   - key in (obj or {}).keys()  # SIM118
+34 + key in (obj or {})  # SIM118
+35 | 
+36 | (key) in (obj or {}).keys()  # SIM118
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:36:1
@@ -318,16 +291,15 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 38 | from typing import KeysView
    |
 help: Remove `.keys()`
-
-ℹ Unsafe fix
-33 33 | 
-34 34 | key in (obj or {}).keys()  # SIM118
-35 35 | 
-36    |-(key) in (obj or {}).keys()  # SIM118
-   36 |+(key) in (obj or {})  # SIM118
-37 37 | 
-38 38 | from typing import KeysView
-39 39 | 
+33 | 
+34 | key in (obj or {}).keys()  # SIM118
+35 | 
+   - (key) in (obj or {}).keys()  # SIM118
+36 + (key) in (obj or {})  # SIM118
+37 | 
+38 | from typing import KeysView
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:50:1
@@ -339,16 +311,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 52 | key in (obj.keys())and foo
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-47 47 | 
-48 48 | 
-49 49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124
-50    |-key in obj.keys()and foo
-   50 |+key in obj and foo
-51 51 | (key in obj.keys())and foo
-52 52 | key in (obj.keys())and foo
-53 53 | 
+47 | 
+48 | 
+49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124
+   - key in obj.keys()and foo
+50 + key in obj and foo
+51 | (key in obj.keys())and foo
+52 | key in (obj.keys())and foo
+53 | 
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:51:2
@@ -360,16 +330,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 52 | key in (obj.keys())and foo
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-48 48 | 
-49 49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124
-50 50 | key in obj.keys()and foo
-51    |-(key in obj.keys())and foo
-   51 |+(key in obj)and foo
-52 52 | key in (obj.keys())and foo
-53 53 | 
-54 54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200
+48 | 
+49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124
+50 | key in obj.keys()and foo
+   - (key in obj.keys())and foo
+51 + (key in obj)and foo
+52 | key in (obj.keys())and foo
+53 | 
+54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:52:1
@@ -382,16 +350,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-49 49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124
-50 50 | key in obj.keys()and foo
-51 51 | (key in obj.keys())and foo
-52    |-key in (obj.keys())and foo
-   52 |+key in (obj)and foo
-53 53 | 
-54 54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200
-55 55 | for key in (
+49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124
+50 | key in obj.keys()and foo
+51 | (key in obj.keys())and foo
+   - key in (obj.keys())and foo
+52 + key in (obj)and foo
+53 | 
+54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200
+55 | for key in (
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:55:5
@@ -407,16 +373,15 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
 60 |       continue
    |
 help: Remove `.keys()`
-
-ℹ Unsafe fix
-55 55 | for key in (
-56 56 |     self.experiment.surveys[0]
-57 57 |         .stations[0]
-58    |-        .keys()
-   58 |+        
-59 59 | ):
-60 60 |     continue
-61 61 | 
+55 | for key in (
+56 |     self.experiment.surveys[0]
+57 |         .stations[0]
+   -         .keys()
+58 +         
+59 | ):
+60 |     continue
+61 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
   --> SIM118.py:65:1
@@ -426,10 +391,8 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()`
    | ^^^^^^^^^^^^^^^
    |
 help: Remove `.keys()`
-
-ℹ Safe fix
-62 62 | from builtins import dict as SneakyDict
-63 63 | 
-64 64 | d = SneakyDict()
-65    |-key in d.keys()  # SIM118
-   65 |+key in d  # SIM118
+62 | from builtins import dict as SneakyDict
+63 | 
+64 | d = SneakyDict()
+   - key in d.keys()  # SIM118
+65 + key in d  # SIM118
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap
index fcf5326220..5409fd61e0 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap
@@ -10,14 +10,13 @@ SIM201 [*] Use `a != b` instead of `not a == b`
 3 |     pass
   |
 help: Replace with `!=` operator
-
-ℹ Unsafe fix
-1 1 | # SIM201
-2   |-if not a == b:
-  2 |+if a != b:
-3 3 |     pass
-4 4 | 
-5 5 | # SIM201
+1 | # SIM201
+  - if not a == b:
+2 + if a != b:
+3 |     pass
+4 | 
+5 | # SIM201
+note: This is an unsafe fix and may change runtime behavior
 
 SIM201 [*] Use `a != b + c` instead of `not a == b + c`
  --> SIM201.py:6:4
@@ -28,16 +27,15 @@ SIM201 [*] Use `a != b + c` instead of `not a == b + c`
 7 |     pass
   |
 help: Replace with `!=` operator
-
-ℹ Unsafe fix
-3 3 |     pass
-4 4 | 
-5 5 | # SIM201
-6   |-if not a == (b + c):
-  6 |+if a != b + c:
-7 7 |     pass
-8 8 | 
-9 9 | # SIM201
+3 |     pass
+4 | 
+5 | # SIM201
+  - if not a == (b + c):
+6 + if a != b + c:
+7 |     pass
+8 | 
+9 | # SIM201
+note: This is an unsafe fix and may change runtime behavior
 
 SIM201 [*] Use `a + b != c` instead of `not a + b == c`
   --> SIM201.py:10:4
@@ -48,13 +46,12 @@ SIM201 [*] Use `a + b != c` instead of `not a + b == c`
 11 |     pass
    |
 help: Replace with `!=` operator
-
-ℹ Unsafe fix
-7  7  |     pass
-8  8  | 
-9  9  | # SIM201
-10    |-if not (a + b) == c:
-   10 |+if a + b != c:
-11 11 |     pass
-12 12 | 
-13 13 | # OK
+7  |     pass
+8  | 
+9  | # SIM201
+   - if not (a + b) == c:
+10 + if a + b != c:
+11 |     pass
+12 | 
+13 | # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap
index a843381049..431da3e6b3 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap
@@ -10,14 +10,13 @@ SIM202 [*] Use `a == b` instead of `not a != b`
 3 |     pass
   |
 help: Replace with `==` operator
-
-ℹ Unsafe fix
-1 1 | # SIM202
-2   |-if not a != b:
-  2 |+if a == b:
-3 3 |     pass
-4 4 | 
-5 5 | # SIM202
+1 | # SIM202
+  - if not a != b:
+2 + if a == b:
+3 |     pass
+4 | 
+5 | # SIM202
+note: This is an unsafe fix and may change runtime behavior
 
 SIM202 [*] Use `a == b + c` instead of `not a != b + c`
  --> SIM202.py:6:4
@@ -28,16 +27,15 @@ SIM202 [*] Use `a == b + c` instead of `not a != b + c`
 7 |     pass
   |
 help: Replace with `==` operator
-
-ℹ Unsafe fix
-3 3 |     pass
-4 4 | 
-5 5 | # SIM202
-6   |-if not a != (b + c):
-  6 |+if a == b + c:
-7 7 |     pass
-8 8 | 
-9 9 | # SIM202
+3 |     pass
+4 | 
+5 | # SIM202
+  - if not a != (b + c):
+6 + if a == b + c:
+7 |     pass
+8 | 
+9 | # SIM202
+note: This is an unsafe fix and may change runtime behavior
 
 SIM202 [*] Use `a + b == c` instead of `not a + b != c`
   --> SIM202.py:10:4
@@ -48,13 +46,12 @@ SIM202 [*] Use `a + b == c` instead of `not a + b != c`
 11 |     pass
    |
 help: Replace with `==` operator
-
-ℹ Unsafe fix
-7  7  |     pass
-8  8  | 
-9  9  | # SIM202
-10    |-if not (a + b) != c:
-   10 |+if a + b == c:
-11 11 |     pass
-12 12 | 
-13 13 | # OK
+7  |     pass
+8  | 
+9  | # SIM202
+   - if not (a + b) != c:
+10 + if a + b == c:
+11 |     pass
+12 | 
+13 | # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap
index ba0415f28b..b1d752c6ea 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap
@@ -9,13 +9,11 @@ SIM208 [*] Use `a` instead of `not (not a)`
 2 |     pass
   |
 help: Replace with `a`
-
-ℹ Safe fix
-1   |-if not (not a):  # SIM208
-  1 |+if a:  # SIM208
-2 2 |     pass
-3 3 | 
-4 4 | if not (not (a == b)):  # SIM208
+  - if not (not a):  # SIM208
+1 + if a:  # SIM208
+2 |     pass
+3 | 
+4 | if not (not (a == b)):  # SIM208
 
 SIM208 [*] Use `a == b` instead of `not (not a == b)`
  --> SIM208.py:4:4
@@ -27,16 +25,14 @@ SIM208 [*] Use `a == b` instead of `not (not a == b)`
 5 |     pass
   |
 help: Replace with `a == b`
-
-ℹ Safe fix
-1 1 | if not (not a):  # SIM208
-2 2 |     pass
-3 3 | 
-4   |-if not (not (a == b)):  # SIM208
-  4 |+if a == b:  # SIM208
-5 5 |     pass
-6 6 | 
-7 7 | if not a:  # OK
+1 | if not (not a):  # SIM208
+2 |     pass
+3 | 
+  - if not (not (a == b)):  # SIM208
+4 + if a == b:  # SIM208
+5 |     pass
+6 | 
+7 | if not a:  # OK
 
 SIM208 [*] Use `b` instead of `not (not b)`
   --> SIM208.py:16:5
@@ -49,16 +45,14 @@ SIM208 [*] Use `b` instead of `not (not b)`
 18 | f(not not a)  # SIM208
    |
 help: Replace with `b`
-
-ℹ Safe 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 | 
+13 | if not a != b:  # OK
+14 |     pass
+15 | 
+   - a = not not b  # SIM208
+16 + a = bool(b)  # SIM208
+17 | 
+18 | f(not not a)  # SIM208
+19 | 
 
 SIM208 [*] Use `a` instead of `not (not a)`
   --> SIM208.py:18:3
@@ -71,16 +65,14 @@ SIM208 [*] Use `a` instead of `not (not a)`
 20 | if 1 + (not (not a)):  # SIM208
    |
 help: Replace with `a`
-
-ℹ Safe 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
+15 | 
+16 | a = not not b  # SIM208
+17 | 
+   - f(not not a)  # SIM208
+18 + f(bool(a))  # SIM208
+19 | 
+20 | if 1 + (not (not a)):  # SIM208
+21 |     pass
 
 SIM208 [*] Use `a` instead of `not (not a)`
   --> SIM208.py:20:9
@@ -92,11 +84,9 @@ SIM208 [*] Use `a` instead of `not (not a)`
 21 |     pass
    |
 help: Replace with `a`
-
-ℹ Safe 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
+17 | 
+18 | f(not not a)  # SIM208
+19 | 
+   - if 1 + (not (not a)):  # SIM208
+20 + if 1 + (bool(a)):  # SIM208
+21 |     pass
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap
index f6246838c4..616fe26298 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap
@@ -10,13 +10,12 @@ SIM210 [*] Use `bool(...)` instead of `True if ... else False`
 3 | a = True if b != c else False  # SIM210
   |
 help: Replace with `bool(...)
-
-ℹ Unsafe fix
-1   |-a = True if b else False  # SIM210
-  1 |+a = bool(b)  # SIM210
-2 2 | 
-3 3 | a = True if b != c else False  # SIM210
-4 4 | 
+  - a = True if b else False  # SIM210
+1 + a = bool(b)  # SIM210
+2 | 
+3 | a = True if b != c else False  # SIM210
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM210 [*] Remove unnecessary `True if ... else False`
  --> SIM210.py:3:5
@@ -29,15 +28,14 @@ SIM210 [*] Remove unnecessary `True if ... else False`
 5 | a = True if b + c else False  # SIM210
   |
 help: Remove unnecessary `True if ... else False`
-
-ℹ Unsafe fix
-1 1 | a = True if b else False  # SIM210
-2 2 | 
-3   |-a = True if b != c else False  # SIM210
-  3 |+a = b != c  # SIM210
-4 4 | 
-5 5 | a = True if b + c else False  # SIM210
-6 6 | 
+1 | a = True if b else False  # SIM210
+2 | 
+  - a = True if b != c else False  # SIM210
+3 + a = b != c  # SIM210
+4 | 
+5 | a = True if b + c else False  # SIM210
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM210 [*] Use `bool(...)` instead of `True if ... else False`
  --> SIM210.py:5:5
@@ -50,16 +48,15 @@ SIM210 [*] Use `bool(...)` instead of `True if ... else False`
 7 | a = False if b else True  # OK
   |
 help: Replace with `bool(...)
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | a = True if b != c else False  # SIM210
-4 4 | 
-5   |-a = True if b + c else False  # SIM210
-  5 |+a = bool(b + c)  # SIM210
-6 6 | 
-7 7 | a = False if b else True  # OK
-8 8 | 
+2 | 
+3 | a = True if b != c else False  # SIM210
+4 | 
+  - a = True if b + c else False  # SIM210
+5 + a = bool(b + c)  # SIM210
+6 | 
+7 | a = False if b else True  # OK
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM210 Use `bool(...)` instead of `True if ... else False`
   --> SIM210.py:15:9
@@ -81,12 +78,11 @@ SIM210 [*] Remove unnecessary `True if ... else False`
    | |____________________________________________________________________________^
    |
 help: Remove unnecessary `True if ... else False`
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | 
-18 18 | # Regression test for: https://github.com/astral-sh/ruff/issues/7076
-19    |-samesld = True if (psl.privatesuffix(urlparse(response.url).netloc) ==
-20    |-                                   psl.privatesuffix(src.netloc)) else False
-   19 |+samesld = (psl.privatesuffix(urlparse(response.url).netloc) ==
-   20 |+                                   psl.privatesuffix(src.netloc))
+16 | 
+17 | 
+18 | # Regression test for: https://github.com/astral-sh/ruff/issues/7076
+   - samesld = True if (psl.privatesuffix(urlparse(response.url).netloc) ==
+   -                                    psl.privatesuffix(src.netloc)) else False
+19 + samesld = (psl.privatesuffix(urlparse(response.url).netloc) ==
+20 +                                    psl.privatesuffix(src.netloc))
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap
index 86e134ff58..9476d3e474 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap
@@ -10,13 +10,12 @@ SIM211 [*] Use `not ...` instead of `False if ... else True`
 3 | a = False if b != c else True  # SIM211
   |
 help: Replace with `not ...`
-
-ℹ Unsafe fix
-1   |-a = False if b else True  # SIM211
-  1 |+a = not b  # SIM211
-2 2 | 
-3 3 | a = False if b != c else True  # SIM211
-4 4 | 
+  - a = False if b else True  # SIM211
+1 + a = not b  # SIM211
+2 | 
+3 | a = False if b != c else True  # SIM211
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM211 [*] Use `not ...` instead of `False if ... else True`
  --> SIM211.py:3:5
@@ -29,15 +28,14 @@ SIM211 [*] Use `not ...` instead of `False if ... else True`
 5 | a = False if b + c else True  # SIM211
   |
 help: Replace with `not ...`
-
-ℹ Unsafe fix
-1 1 | a = False if b else True  # SIM211
-2 2 | 
-3   |-a = False if b != c else True  # SIM211
-  3 |+a = not b != c  # SIM211
-4 4 | 
-5 5 | a = False if b + c else True  # SIM211
-6 6 | 
+1 | a = False if b else True  # SIM211
+2 | 
+  - a = False if b != c else True  # SIM211
+3 + a = not b != c  # SIM211
+4 | 
+5 | a = False if b + c else True  # SIM211
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM211 [*] Use `not ...` instead of `False if ... else True`
  --> SIM211.py:5:5
@@ -50,12 +48,11 @@ SIM211 [*] Use `not ...` instead of `False if ... else True`
 7 | a = True if b else False  # OK
   |
 help: Replace with `not ...`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | a = False if b != c else True  # SIM211
-4 4 | 
-5   |-a = False if b + c else True  # SIM211
-  5 |+a = not b + c  # SIM211
-6 6 | 
-7 7 | a = True if b else False  # OK
+2 | 
+3 | a = False if b != c else True  # SIM211
+4 | 
+  - a = False if b + c else True  # SIM211
+5 + a = not b + c  # SIM211
+6 | 
+7 | a = True if b else False  # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap
index 7f8aefa640..3366311164 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap
@@ -10,13 +10,12 @@ SIM212 [*] Use `a if a else b` instead of `b if not a else a`
 3 | c = b + c if not a else a  # SIM212
   |
 help: Replace with `a if a else b`
-
-ℹ Unsafe fix
-1   |-c = b if not a else a  # SIM212
-  1 |+c = a if a else b  # SIM212
-2 2 | 
-3 3 | c = b + c if not a else a  # SIM212
-4 4 | 
+  - c = b if not a else a  # SIM212
+1 + c = a if a else b  # SIM212
+2 | 
+3 | c = b + c if not a else a  # SIM212
+4 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM212 [*] Use `a if a else b + c` instead of `b + c if not a else a`
  --> SIM212.py:3:5
@@ -29,12 +28,11 @@ SIM212 [*] Use `a if a else b + c` instead of `b + c if not a else a`
 5 | c = b if not x else a  # OK
   |
 help: Replace with `a if a else b + c`
-
-ℹ Unsafe fix
-1 1 | c = b if not a else a  # SIM212
-2 2 | 
-3   |-c = b + c if not a else a  # SIM212
-  3 |+c = a if a else b + c  # SIM212
-4 4 | 
-5 5 | c = b if not x else a  # OK
-6 6 |
+1 | c = b if not a else a  # SIM212
+2 | 
+  - c = b + c if not a else a  # SIM212
+3 + c = a if a else b + c  # SIM212
+4 | 
+5 | c = b if not x else a  # OK
+6 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap
index ab1d1e3165..65c5719d65 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap
@@ -9,13 +9,12 @@ SIM220 [*] Use `False` instead of `a and not a`
 2 |     pass
   |
 help: Replace with `False`
-
-ℹ Unsafe fix
-1   |-if a and not a:
-  1 |+if False:
-2 2 |     pass
-3 3 | 
-4 4 | if (a and not a) and b:
+  - if a and not a:
+1 + if False:
+2 |     pass
+3 | 
+4 | if (a and not a) and b:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM220 [*] Use `False` instead of `a and not a`
  --> SIM220.py:4:5
@@ -27,16 +26,15 @@ SIM220 [*] Use `False` instead of `a and not a`
 5 |     pass
   |
 help: Replace with `False`
-
-ℹ Unsafe fix
-1 1 | if a and not a:
-2 2 |     pass
-3 3 | 
-4   |-if (a and not a) and b:
-  4 |+if (False) and b:
-5 5 |     pass
-6 6 | 
-7 7 | if (a and not a) or b:
+1 | if a and not a:
+2 |     pass
+3 | 
+  - if (a and not a) and b:
+4 + if (False) and b:
+5 |     pass
+6 | 
+7 | if (a and not a) or b:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM220 [*] Use `False` instead of `a and not a`
  --> SIM220.py:7:5
@@ -48,13 +46,12 @@ SIM220 [*] Use `False` instead of `a and not a`
 8 |     pass
   |
 help: Replace with `False`
-
-ℹ Unsafe fix
-4 4 | if (a and not a) and b:
-5 5 |     pass
-6 6 | 
-7   |-if (a and not a) or b:
-  7 |+if (False) or b:
-8 8 |     pass
-9 9 | 
-10 10 | if a:
+4  | if (a and not a) and b:
+5  |     pass
+6  | 
+   - if (a and not a) or b:
+7  + if (False) or b:
+8  |     pass
+9  | 
+10 | if a:
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap
index d7c0ec8b26..9e1a6cf4a4 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap
@@ -9,13 +9,12 @@ SIM221 [*] Use `True` instead of `a or not a`
 2 |     pass
   |
 help: Replace with `True`
-
-ℹ Unsafe fix
-1   |-if a or not a:
-  1 |+if True:
-2 2 |     pass
-3 3 | 
-4 4 | if (a or not a) or b:
+  - if a or not a:
+1 + if True:
+2 |     pass
+3 | 
+4 | if (a or not a) or b:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM221 [*] Use `True` instead of `a or not a`
  --> SIM221.py:4:5
@@ -27,16 +26,15 @@ SIM221 [*] Use `True` instead of `a or not a`
 5 |     pass
   |
 help: Replace with `True`
-
-ℹ Unsafe fix
-1 1 | if a or not a:
-2 2 |     pass
-3 3 | 
-4   |-if (a or not a) or b:
-  4 |+if (True) or b:
-5 5 |     pass
-6 6 | 
-7 7 | if (a or not a) and b:
+1 | if a or not a:
+2 |     pass
+3 | 
+  - if (a or not a) or b:
+4 + if (True) or b:
+5 |     pass
+6 | 
+7 | if (a or not a) and b:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM221 [*] Use `True` instead of `a or not a`
  --> SIM221.py:7:5
@@ -48,13 +46,12 @@ SIM221 [*] Use `True` instead of `a or not a`
 8 |     pass
   |
 help: Replace with `True`
-
-ℹ Unsafe fix
-4 4 | if (a or not a) or b:
-5 5 |     pass
-6 6 | 
-7   |-if (a or not a) and b:
-  7 |+if (True) and b:
-8 8 |     pass
-9 9 | 
-10 10 | if a:
+4  | if (a or not a) or b:
+5  |     pass
+6  | 
+   - if (a or not a) and b:
+7  + if (True) and b:
+8  |     pass
+9  | 
+10 | if a:
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap
index 3c894ee321..f6c8bba110 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap
@@ -9,13 +9,12 @@ SIM222 [*] Use `True` instead of `... or True`
 2 |     pass
   |
 help: Replace with `True`
-
-ℹ Unsafe fix
-1   |-if a or True:  # SIM222
-  1 |+if True:  # SIM222
-2 2 |     pass
-3 3 | 
-4 4 | if (a or b) or True:  # SIM222
+  - if a or True:  # SIM222
+1 + if True:  # SIM222
+2 |     pass
+3 | 
+4 | if (a or b) or True:  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
  --> SIM222.py:4:4
@@ -27,16 +26,15 @@ SIM222 [*] Use `True` instead of `... or True`
 5 |     pass
   |
 help: Replace with `True`
-
-ℹ Unsafe fix
-1 1 | if a or True:  # SIM222
-2 2 |     pass
-3 3 | 
-4   |-if (a or b) or True:  # SIM222
-  4 |+if True:  # SIM222
-5 5 |     pass
-6 6 | 
-7 7 | if a or (b or True):  # SIM222
+1 | if a or True:  # SIM222
+2 |     pass
+3 | 
+  - if (a or b) or True:  # SIM222
+4 + if True:  # SIM222
+5 |     pass
+6 | 
+7 | if a or (b or True):  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
  --> SIM222.py:7:10
@@ -48,16 +46,15 @@ SIM222 [*] Use `True` instead of `... or True`
 8 |     pass
   |
 help: Replace with `True`
-
-ℹ Unsafe fix
-4 4 | if (a or b) or True:  # SIM222
-5 5 |     pass
-6 6 | 
-7   |-if a or (b or True):  # SIM222
-  7 |+if a or (True):  # SIM222
-8 8 |     pass
-9 9 | 
-10 10 | if a and True:  # OK
+4  | if (a or b) or True:  # SIM222
+5  |     pass
+6  | 
+   - if a or (b or True):  # SIM222
+7  + if a or (True):  # SIM222
+8  |     pass
+9  | 
+10 | if a and True:  # OK
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `True or ...`
   --> SIM222.py:24:16
@@ -69,16 +66,15 @@ SIM222 [*] Use `True` instead of `True or ...`
 25 |     pass
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-21 21 | if a or f() or b or g() or True:  # OK
-22 22 |     pass
-23 23 | 
-24    |-if a or f() or True or g() or b:  # SIM222
-   24 |+if a or f() or True:  # SIM222
-25 25 |     pass
-26 26 | 
-27 27 | if True or f() or a or g() or b:  # SIM222
+21 | if a or f() or b or g() or True:  # OK
+22 |     pass
+23 | 
+   - if a or f() or True or g() or b:  # SIM222
+24 + if a or f() or True:  # SIM222
+25 |     pass
+26 | 
+27 | if True or f() or a or g() or b:  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `True or ...`
   --> SIM222.py:27:4
@@ -90,16 +86,15 @@ SIM222 [*] Use `True` instead of `True or ...`
 28 |     pass
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-24 24 | if a or f() or True or g() or b:  # SIM222
-25 25 |     pass
-26 26 | 
-27    |-if True or f() or a or g() or b:  # SIM222
-   27 |+if True:  # SIM222
-28 28 |     pass
-29 29 | 
-30 30 | if a or True or f() or b or g():  # SIM222
+24 | if a or f() or True or g() or b:  # SIM222
+25 |     pass
+26 | 
+   - if True or f() or a or g() or b:  # SIM222
+27 + if True:  # SIM222
+28 |     pass
+29 | 
+30 | if a or True or f() or b or g():  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
   --> SIM222.py:30:4
@@ -111,16 +106,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 31 |     pass
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-27 27 | if True or f() or a or g() or b:  # SIM222
-28 28 |     pass
-29 29 | 
-30    |-if a or True or f() or b or g():  # SIM222
-   30 |+if True:  # SIM222
-31 31 |     pass
-32 32 | 
-33 33 | 
+27 | if True or f() or a or g() or b:  # SIM222
+28 |     pass
+29 | 
+   - if a or True or f() or b or g():  # SIM222
+30 + if True:  # SIM222
+31 |     pass
+32 | 
+33 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:47:6
@@ -131,16 +125,15 @@ SIM222 [*] Use `True` instead of `... or True`
 49 | a or "foo" or True or "bar"  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-44 44 |     pass
-45 45 | 
-46 46 | 
-47    |-a or "" or True  # SIM222
-   47 |+a or True  # SIM222
-48 48 | 
-49 49 | a or "foo" or True or "bar"  # SIM222
-50 50 | 
+44 |     pass
+45 | 
+46 | 
+   - a or "" or True  # SIM222
+47 + a or True  # SIM222
+48 | 
+49 | a or "foo" or True or "bar"  # SIM222
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `"foo"` instead of `"foo" or ...`
   --> SIM222.py:49:6
@@ -153,16 +146,15 @@ SIM222 [*] Use `"foo"` instead of `"foo" or ...`
 51 | a or 0 or True  # SIM222
    |
 help: Replace with `"foo"`
-
-ℹ Unsafe fix
-46 46 | 
-47 47 | a or "" or True  # SIM222
-48 48 | 
-49    |-a or "foo" or True or "bar"  # SIM222
-   49 |+a or "foo"  # SIM222
-50 50 | 
-51 51 | a or 0 or True  # SIM222
-52 52 | 
+46 | 
+47 | a or "" or True  # SIM222
+48 | 
+   - a or "foo" or True or "bar"  # SIM222
+49 + a or "foo"  # SIM222
+50 | 
+51 | a or 0 or True  # SIM222
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:51:6
@@ -175,16 +167,15 @@ SIM222 [*] Use `True` instead of `... or True`
 53 | a or 1 or True or 2  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-48 48 | 
-49 49 | a or "foo" or True or "bar"  # SIM222
-50 50 | 
-51    |-a or 0 or True  # SIM222
-   51 |+a or True  # SIM222
-52 52 | 
-53 53 | a or 1 or True or 2  # SIM222
-54 54 | 
+48 | 
+49 | a or "foo" or True or "bar"  # SIM222
+50 | 
+   - a or 0 or True  # SIM222
+51 + a or True  # SIM222
+52 | 
+53 | a or 1 or True or 2  # SIM222
+54 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `1` instead of `1 or ...`
   --> SIM222.py:53:6
@@ -197,16 +188,15 @@ SIM222 [*] Use `1` instead of `1 or ...`
 55 | a or 0.0 or True  # SIM222
    |
 help: Replace with `1`
-
-ℹ Unsafe fix
-50 50 | 
-51 51 | a or 0 or True  # SIM222
-52 52 | 
-53    |-a or 1 or True or 2  # SIM222
-   53 |+a or 1  # SIM222
-54 54 | 
-55 55 | a or 0.0 or True  # SIM222
-56 56 | 
+50 | 
+51 | a or 0 or True  # SIM222
+52 | 
+   - a or 1 or True or 2  # SIM222
+53 + a or 1  # SIM222
+54 | 
+55 | a or 0.0 or True  # SIM222
+56 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:55:6
@@ -219,16 +209,15 @@ SIM222 [*] Use `True` instead of `... or True`
 57 | a or 0.1 or True or 0.2  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-52 52 | 
-53 53 | a or 1 or True or 2  # SIM222
-54 54 | 
-55    |-a or 0.0 or True  # SIM222
-   55 |+a or True  # SIM222
-56 56 | 
-57 57 | a or 0.1 or True or 0.2  # SIM222
-58 58 | 
+52 | 
+53 | a or 1 or True or 2  # SIM222
+54 | 
+   - a or 0.0 or True  # SIM222
+55 + a or True  # SIM222
+56 | 
+57 | a or 0.1 or True or 0.2  # SIM222
+58 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `0.1` instead of `0.1 or ...`
   --> SIM222.py:57:6
@@ -241,16 +230,15 @@ SIM222 [*] Use `0.1` instead of `0.1 or ...`
 59 | a or [] or True  # SIM222
    |
 help: Replace with `0.1`
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | a or 0.0 or True  # SIM222
-56 56 | 
-57    |-a or 0.1 or True or 0.2  # SIM222
-   57 |+a or 0.1  # SIM222
-58 58 | 
-59 59 | a or [] or True  # SIM222
-60 60 | 
+54 | 
+55 | a or 0.0 or True  # SIM222
+56 | 
+   - a or 0.1 or True or 0.2  # SIM222
+57 + a or 0.1  # SIM222
+58 | 
+59 | a or [] or True  # SIM222
+60 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:59:6
@@ -263,16 +251,15 @@ SIM222 [*] Use `True` instead of `... or True`
 61 | a or list([]) or True  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-56 56 | 
-57 57 | a or 0.1 or True or 0.2  # SIM222
-58 58 | 
-59    |-a or [] or True  # SIM222
-   59 |+a or True  # SIM222
-60 60 | 
-61 61 | a or list([]) or True  # SIM222
-62 62 | 
+56 | 
+57 | a or 0.1 or True or 0.2  # SIM222
+58 | 
+   - a or [] or True  # SIM222
+59 + a or True  # SIM222
+60 | 
+61 | a or list([]) or True  # SIM222
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:61:6
@@ -285,16 +272,15 @@ SIM222 [*] Use `True` instead of `... or True`
 63 | a or [1] or True or [2]  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-58 58 | 
-59 59 | a or [] or True  # SIM222
-60 60 | 
-61    |-a or list([]) or True  # SIM222
-   61 |+a or True  # SIM222
-62 62 | 
-63 63 | a or [1] or True or [2]  # SIM222
-64 64 | 
+58 | 
+59 | a or [] or True  # SIM222
+60 | 
+   - a or list([]) or True  # SIM222
+61 + a or True  # SIM222
+62 | 
+63 | a or [1] or True or [2]  # SIM222
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `[1]` instead of `[1] or ...`
   --> SIM222.py:63:6
@@ -307,16 +293,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...`
 65 | a or list([1]) or True or list([2])  # SIM222
    |
 help: Replace with `[1]`
-
-ℹ Unsafe fix
-60 60 | 
-61 61 | a or list([]) or True  # SIM222
-62 62 | 
-63    |-a or [1] or True or [2]  # SIM222
-   63 |+a or [1]  # SIM222
-64 64 | 
-65 65 | a or list([1]) or True or list([2])  # SIM222
-66 66 | 
+60 | 
+61 | a or list([]) or True  # SIM222
+62 | 
+   - a or [1] or True or [2]  # SIM222
+63 + a or [1]  # SIM222
+64 | 
+65 | a or list([1]) or True or list([2])  # SIM222
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `list([1])` instead of `list([1]) or ...`
   --> SIM222.py:65:6
@@ -329,16 +314,15 @@ SIM222 [*] Use `list([1])` instead of `list([1]) or ...`
 67 | a or {} or True  # SIM222
    |
 help: Replace with `list([1])`
-
-ℹ Unsafe fix
-62 62 | 
-63 63 | a or [1] or True or [2]  # SIM222
-64 64 | 
-65    |-a or list([1]) or True or list([2])  # SIM222
-   65 |+a or list([1])  # SIM222
-66 66 | 
-67 67 | a or {} or True  # SIM222
-68 68 | 
+62 | 
+63 | a or [1] or True or [2]  # SIM222
+64 | 
+   - a or list([1]) or True or list([2])  # SIM222
+65 + a or list([1])  # SIM222
+66 | 
+67 | a or {} or True  # SIM222
+68 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:67:6
@@ -351,16 +335,15 @@ SIM222 [*] Use `True` instead of `... or True`
 69 | a or dict() or True  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-64 64 | 
-65 65 | a or list([1]) or True or list([2])  # SIM222
-66 66 | 
-67    |-a or {} or True  # SIM222
-   67 |+a or True  # SIM222
-68 68 | 
-69 69 | a or dict() or True  # SIM222
-70 70 | 
+64 | 
+65 | a or list([1]) or True or list([2])  # SIM222
+66 | 
+   - a or {} or True  # SIM222
+67 + a or True  # SIM222
+68 | 
+69 | a or dict() or True  # SIM222
+70 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:69:6
@@ -373,16 +356,15 @@ SIM222 [*] Use `True` instead of `... or True`
 71 | a or {1: 1} or True or {2: 2}  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | a or {} or True  # SIM222
-68 68 | 
-69    |-a or dict() or True  # SIM222
-   69 |+a or True  # SIM222
-70 70 | 
-71 71 | a or {1: 1} or True or {2: 2}  # SIM222
-72 72 | 
+66 | 
+67 | a or {} or True  # SIM222
+68 | 
+   - a or dict() or True  # SIM222
+69 + a or True  # SIM222
+70 | 
+71 | a or {1: 1} or True or {2: 2}  # SIM222
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `{1: 1}` instead of `{1: 1} or ...`
   --> SIM222.py:71:6
@@ -395,16 +377,15 @@ SIM222 [*] Use `{1: 1}` instead of `{1: 1} or ...`
 73 | a or dict({1: 1}) or True or dict({2: 2})  # SIM222
    |
 help: Replace with `{1: 1}`
-
-ℹ Unsafe fix
-68 68 | 
-69 69 | a or dict() or True  # SIM222
-70 70 | 
-71    |-a or {1: 1} or True or {2: 2}  # SIM222
-   71 |+a or {1: 1}  # SIM222
-72 72 | 
-73 73 | a or dict({1: 1}) or True or dict({2: 2})  # SIM222
-74 74 | 
+68 | 
+69 | a or dict() or True  # SIM222
+70 | 
+   - a or {1: 1} or True or {2: 2}  # SIM222
+71 + a or {1: 1}  # SIM222
+72 | 
+73 | a or dict({1: 1}) or True or dict({2: 2})  # SIM222
+74 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `dict({1: 1})` instead of `dict({1: 1}) or ...`
   --> SIM222.py:73:6
@@ -417,16 +398,15 @@ SIM222 [*] Use `dict({1: 1})` instead of `dict({1: 1}) or ...`
 75 | a or set() or True  # SIM222
    |
 help: Replace with `dict({1: 1})`
-
-ℹ Unsafe fix
-70 70 | 
-71 71 | a or {1: 1} or True or {2: 2}  # SIM222
-72 72 | 
-73    |-a or dict({1: 1}) or True or dict({2: 2})  # SIM222
-   73 |+a or dict({1: 1})  # SIM222
-74 74 | 
-75 75 | a or set() or True  # SIM222
-76 76 | 
+70 | 
+71 | a or {1: 1} or True or {2: 2}  # SIM222
+72 | 
+   - a or dict({1: 1}) or True or dict({2: 2})  # SIM222
+73 + a or dict({1: 1})  # SIM222
+74 | 
+75 | a or set() or True  # SIM222
+76 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:75:6
@@ -439,16 +419,15 @@ SIM222 [*] Use `True` instead of `... or True`
 77 | a or set(set()) or True  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-72 72 | 
-73 73 | a or dict({1: 1}) or True or dict({2: 2})  # SIM222
-74 74 | 
-75    |-a or set() or True  # SIM222
-   75 |+a or True  # SIM222
-76 76 | 
-77 77 | a or set(set()) or True  # SIM222
-78 78 | 
+72 | 
+73 | a or dict({1: 1}) or True or dict({2: 2})  # SIM222
+74 | 
+   - a or set() or True  # SIM222
+75 + a or True  # SIM222
+76 | 
+77 | a or set(set()) or True  # SIM222
+78 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:77:6
@@ -461,16 +440,15 @@ SIM222 [*] Use `True` instead of `... or True`
 79 | a or {1} or True or {2}  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-74 74 | 
-75 75 | a or set() or True  # SIM222
-76 76 | 
-77    |-a or set(set()) or True  # SIM222
-   77 |+a or True  # SIM222
-78 78 | 
-79 79 | a or {1} or True or {2}  # SIM222
-80 80 | 
+74 | 
+75 | a or set() or True  # SIM222
+76 | 
+   - a or set(set()) or True  # SIM222
+77 + a or True  # SIM222
+78 | 
+79 | a or {1} or True or {2}  # SIM222
+80 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `{1}` instead of `{1} or ...`
   --> SIM222.py:79:6
@@ -483,16 +461,15 @@ SIM222 [*] Use `{1}` instead of `{1} or ...`
 81 | a or set({1}) or True or set({2})  # SIM222
    |
 help: Replace with `{1}`
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | a or set(set()) or True  # SIM222
-78 78 | 
-79    |-a or {1} or True or {2}  # SIM222
-   79 |+a or {1}  # SIM222
-80 80 | 
-81 81 | a or set({1}) or True or set({2})  # SIM222
-82 82 | 
+76 | 
+77 | a or set(set()) or True  # SIM222
+78 | 
+   - a or {1} or True or {2}  # SIM222
+79 + a or {1}  # SIM222
+80 | 
+81 | a or set({1}) or True or set({2})  # SIM222
+82 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `set({1})` instead of `set({1}) or ...`
   --> SIM222.py:81:6
@@ -505,16 +482,15 @@ SIM222 [*] Use `set({1})` instead of `set({1}) or ...`
 83 | a or () or True  # SIM222
    |
 help: Replace with `set({1})`
-
-ℹ Unsafe fix
-78 78 | 
-79 79 | a or {1} or True or {2}  # SIM222
-80 80 | 
-81    |-a or set({1}) or True or set({2})  # SIM222
-   81 |+a or set({1})  # SIM222
-82 82 | 
-83 83 | a or () or True  # SIM222
-84 84 | 
+78 | 
+79 | a or {1} or True or {2}  # SIM222
+80 | 
+   - a or set({1}) or True or set({2})  # SIM222
+81 + a or set({1})  # SIM222
+82 | 
+83 | a or () or True  # SIM222
+84 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:83:6
@@ -527,16 +503,15 @@ SIM222 [*] Use `True` instead of `... or True`
 85 | a or tuple(()) or True  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | a or set({1}) or True or set({2})  # SIM222
-82 82 | 
-83    |-a or () or True  # SIM222
-   83 |+a or True  # SIM222
-84 84 | 
-85 85 | a or tuple(()) or True  # SIM222
-86 86 | 
+80 | 
+81 | a or set({1}) or True or set({2})  # SIM222
+82 | 
+   - a or () or True  # SIM222
+83 + a or True  # SIM222
+84 | 
+85 | a or tuple(()) or True  # SIM222
+86 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:85:6
@@ -549,16 +524,15 @@ SIM222 [*] Use `True` instead of `... or True`
 87 | a or (1,) or True or (2,)  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-82 82 | 
-83 83 | a or () or True  # SIM222
-84 84 | 
-85    |-a or tuple(()) or True  # SIM222
-   85 |+a or True  # SIM222
-86 86 | 
-87 87 | a or (1,) or True or (2,)  # SIM222
-88 88 | 
+82 | 
+83 | a or () or True  # SIM222
+84 | 
+   - a or tuple(()) or True  # SIM222
+85 + a or True  # SIM222
+86 | 
+87 | a or (1,) or True or (2,)  # SIM222
+88 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `(1,)` instead of `(1,) or ...`
   --> SIM222.py:87:6
@@ -571,16 +545,15 @@ SIM222 [*] Use `(1,)` instead of `(1,) or ...`
 89 | a or tuple((1,)) or True or tuple((2,))  # SIM222
    |
 help: Replace with `(1,)`
-
-ℹ Unsafe fix
-84 84 | 
-85 85 | a or tuple(()) or True  # SIM222
-86 86 | 
-87    |-a or (1,) or True or (2,)  # SIM222
-   87 |+a or (1,)  # SIM222
-88 88 | 
-89 89 | a or tuple((1,)) or True or tuple((2,))  # SIM222
-90 90 | 
+84 | 
+85 | a or tuple(()) or True  # SIM222
+86 | 
+   - a or (1,) or True or (2,)  # SIM222
+87 + a or (1,)  # SIM222
+88 | 
+89 | a or tuple((1,)) or True or tuple((2,))  # SIM222
+90 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `tuple((1,))` instead of `tuple((1,)) or ...`
   --> SIM222.py:89:6
@@ -593,16 +566,15 @@ SIM222 [*] Use `tuple((1,))` instead of `tuple((1,)) or ...`
 91 | a or frozenset() or True  # SIM222
    |
 help: Replace with `tuple((1,))`
-
-ℹ Unsafe fix
-86 86 | 
-87 87 | a or (1,) or True or (2,)  # SIM222
-88 88 | 
-89    |-a or tuple((1,)) or True or tuple((2,))  # SIM222
-   89 |+a or tuple((1,))  # SIM222
-90 90 | 
-91 91 | a or frozenset() or True  # SIM222
-92 92 | 
+86 | 
+87 | a or (1,) or True or (2,)  # SIM222
+88 | 
+   - a or tuple((1,)) or True or tuple((2,))  # SIM222
+89 + a or tuple((1,))  # SIM222
+90 | 
+91 | a or frozenset() or True  # SIM222
+92 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:91:6
@@ -615,16 +587,15 @@ SIM222 [*] Use `True` instead of `... or True`
 93 | a or frozenset(frozenset()) or True  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-88 88 | 
-89 89 | a or tuple((1,)) or True or tuple((2,))  # SIM222
-90 90 | 
-91    |-a or frozenset() or True  # SIM222
-   91 |+a or True  # SIM222
-92 92 | 
-93 93 | a or frozenset(frozenset()) or True  # SIM222
-94 94 | 
+88 | 
+89 | a or tuple((1,)) or True or tuple((2,))  # SIM222
+90 | 
+   - a or frozenset() or True  # SIM222
+91 + a or True  # SIM222
+92 | 
+93 | a or frozenset(frozenset()) or True  # SIM222
+94 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True`
   --> SIM222.py:93:6
@@ -637,16 +608,15 @@ SIM222 [*] Use `True` instead of `... or True`
 95 | a or frozenset({1}) or True or frozenset({2})  # SIM222
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-90 90 | 
-91 91 | a or frozenset() or True  # SIM222
-92 92 | 
-93    |-a or frozenset(frozenset()) or True  # SIM222
-   93 |+a or True  # SIM222
-94 94 | 
-95 95 | a or frozenset({1}) or True or frozenset({2})  # SIM222
-96 96 | 
+90 | 
+91 | a or frozenset() or True  # SIM222
+92 | 
+   - a or frozenset(frozenset()) or True  # SIM222
+93 + a or True  # SIM222
+94 | 
+95 | a or frozenset({1}) or True or frozenset({2})  # SIM222
+96 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `frozenset({1})` instead of `frozenset({1}) or ...`
   --> SIM222.py:95:6
@@ -659,16 +629,15 @@ SIM222 [*] Use `frozenset({1})` instead of `frozenset({1}) or ...`
 97 | a or frozenset(frozenset({1})) or True or frozenset(frozenset({2}))  # SIM222
    |
 help: Replace with `frozenset({1})`
-
-ℹ Unsafe fix
-92 92 | 
-93 93 | a or frozenset(frozenset()) or True  # SIM222
-94 94 | 
-95    |-a or frozenset({1}) or True or frozenset({2})  # SIM222
-   95 |+a or frozenset({1})  # SIM222
-96 96 | 
-97 97 | a or frozenset(frozenset({1})) or True or frozenset(frozenset({2}))  # SIM222
-98 98 | 
+92 | 
+93 | a or frozenset(frozenset()) or True  # SIM222
+94 | 
+   - a or frozenset({1}) or True or frozenset({2})  # SIM222
+95 + a or frozenset({1})  # SIM222
+96 | 
+97 | a or frozenset(frozenset({1})) or True or frozenset(frozenset({2}))  # SIM222
+98 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `frozenset(frozenset({1}))` instead of `frozenset(frozenset({1})) or ...`
   --> SIM222.py:97:6
@@ -679,16 +648,15 @@ SIM222 [*] Use `frozenset(frozenset({1}))` instead of `frozenset(frozenset({1}))
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `frozenset(frozenset({1}))`
-
-ℹ Unsafe fix
-94 94 | 
-95 95 | a or frozenset({1}) or True or frozenset({2})  # SIM222
-96 96 | 
-97    |-a or frozenset(frozenset({1})) or True or frozenset(frozenset({2}))  # SIM222
-   97 |+a or frozenset(frozenset({1}))  # SIM222
-98 98 | 
-99 99 | 
-100 100 | # Inside test `a` is simplified.
+94  | 
+95  | a or frozenset({1}) or True or frozenset({2})  # SIM222
+96  | 
+    - a or frozenset(frozenset({1})) or True or frozenset(frozenset({2}))  # SIM222
+97  + a or frozenset(frozenset({1}))  # SIM222
+98  | 
+99  | 
+100 | # Inside test `a` is simplified.
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:102:6
@@ -701,16 +669,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 104 | assert a or [1] or True or [2]  # SIM222
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-99  99  | 
-100 100 | # Inside test `a` is simplified.
-101 101 | 
-102     |-bool(a or [1] or True or [2])  # SIM222
-    102 |+bool(True)  # SIM222
-103 103 | 
-104 104 | assert a or [1] or True or [2]  # SIM222
-105 105 | 
+99  | 
+100 | # Inside test `a` is simplified.
+101 | 
+    - bool(a or [1] or True or [2])  # SIM222
+102 + bool(True)  # SIM222
+103 | 
+104 | assert a or [1] or True or [2]  # SIM222
+105 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:104:8
@@ -723,16 +690,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-101 101 | 
-102 102 | bool(a or [1] or True or [2])  # SIM222
-103 103 | 
-104     |-assert a or [1] or True or [2]  # SIM222
-    104 |+assert True  # SIM222
-105 105 | 
-106 106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
-107 107 |     pass
+101 | 
+102 | bool(a or [1] or True or [2])  # SIM222
+103 | 
+    - assert a or [1] or True or [2]  # SIM222
+104 + assert True  # SIM222
+105 | 
+106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
+107 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:106:5
@@ -744,16 +710,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 107 |     pass
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | assert a or [1] or True or [2]  # SIM222
-105 105 | 
-106     |-if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
-    106 |+if (True) and (a or [1] or True or [2]):  # SIM222
-107 107 |     pass
-108 108 | 
-109 109 | 0 if a or [1] or True or [2] else 1  # SIM222
+103 | 
+104 | assert a or [1] or True or [2]  # SIM222
+105 | 
+    - if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
+106 + if (True) and (a or [1] or True or [2]):  # SIM222
+107 |     pass
+108 | 
+109 | 0 if a or [1] or True or [2] else 1  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:106:35
@@ -765,16 +730,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 107 |     pass
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | assert a or [1] or True or [2]  # SIM222
-105 105 | 
-106     |-if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
-    106 |+if (a or [1] or True or [2]) and (True):  # SIM222
-107 107 |     pass
-108 108 | 
-109 109 | 0 if a or [1] or True or [2] else 1  # SIM222
+103 | 
+104 | assert a or [1] or True or [2]  # SIM222
+105 | 
+    - if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
+106 + if (a or [1] or True or [2]) and (True):  # SIM222
+107 |     pass
+108 | 
+109 | 0 if a or [1] or True or [2] else 1  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:109:6
@@ -787,16 +751,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 111 | while a or [1] or True or [2]:  # SIM222
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-106 106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
-107 107 |     pass
-108 108 | 
-109     |-0 if a or [1] or True or [2] else 1  # SIM222
-    109 |+0 if True else 1  # SIM222
-110 110 | 
-111 111 | while a or [1] or True or [2]:  # SIM222
-112 112 |     pass
+106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
+107 |     pass
+108 | 
+    - 0 if a or [1] or True or [2] else 1  # SIM222
+109 + 0 if True else 1  # SIM222
+110 | 
+111 | while a or [1] or True or [2]:  # SIM222
+112 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:111:7
@@ -808,16 +771,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 112 |     pass
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-108 108 | 
-109 109 | 0 if a or [1] or True or [2] else 1  # SIM222
-110 110 | 
-111     |-while a or [1] or True or [2]:  # SIM222
-    111 |+while True:  # SIM222
-112 112 |     pass
-113 113 | 
-114 114 | [
+108 | 
+109 | 0 if a or [1] or True or [2] else 1  # SIM222
+110 | 
+    - while a or [1] or True or [2]:  # SIM222
+111 + while True:  # SIM222
+112 |     pass
+113 | 
+114 | [
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:118:8
@@ -830,16 +792,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 120 | ]
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-115 115 |     0
-116 116 |     for a in range(10)
-117 117 |     for b in range(10)
-118     |-    if a or [1] or True or [2]  # SIM222
-    118 |+    if True  # SIM222
-119 119 |     if b or [1] or True or [2]  # SIM222
-120 120 | ]
-121 121 | 
+115 |     0
+116 |     for a in range(10)
+117 |     for b in range(10)
+    -     if a or [1] or True or [2]  # SIM222
+118 +     if True  # SIM222
+119 |     if b or [1] or True or [2]  # SIM222
+120 | ]
+121 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:119:8
@@ -851,16 +812,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 120 | ]
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-116 116 |     for a in range(10)
-117 117 |     for b in range(10)
-118 118 |     if a or [1] or True or [2]  # SIM222
-119     |-    if b or [1] or True or [2]  # SIM222
-    119 |+    if True  # SIM222
-120 120 | ]
-121 121 | 
-122 122 | {
+116 |     for a in range(10)
+117 |     for b in range(10)
+118 |     if a or [1] or True or [2]  # SIM222
+    -     if b or [1] or True or [2]  # SIM222
+119 +     if True  # SIM222
+120 | ]
+121 | 
+122 | {
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:126:8
@@ -873,16 +833,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 128 | }
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-123 123 |     0
-124 124 |     for a in range(10)
-125 125 |     for b in range(10)
-126     |-    if a or [1] or True or [2]  # SIM222
-    126 |+    if True  # SIM222
-127 127 |     if b or [1] or True or [2]  # SIM222
-128 128 | }
-129 129 | 
+123 |     0
+124 |     for a in range(10)
+125 |     for b in range(10)
+    -     if a or [1] or True or [2]  # SIM222
+126 +     if True  # SIM222
+127 |     if b or [1] or True or [2]  # SIM222
+128 | }
+129 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:127:8
@@ -894,16 +853,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 128 | }
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-124 124 |     for a in range(10)
-125 125 |     for b in range(10)
-126 126 |     if a or [1] or True or [2]  # SIM222
-127     |-    if b or [1] or True or [2]  # SIM222
-    127 |+    if True  # SIM222
-128 128 | }
-129 129 | 
-130 130 | {
+124 |     for a in range(10)
+125 |     for b in range(10)
+126 |     if a or [1] or True or [2]  # SIM222
+    -     if b or [1] or True or [2]  # SIM222
+127 +     if True  # SIM222
+128 | }
+129 | 
+130 | {
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:134:8
@@ -916,16 +874,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 136 | }
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-131 131 |     0: 0
-132 132 |     for a in range(10)
-133 133 |     for b in range(10)
-134     |-    if a or [1] or True or [2]  # SIM222
-    134 |+    if True  # SIM222
-135 135 |     if b or [1] or True or [2]  # SIM222
-136 136 | }
-137 137 | 
+131 |     0: 0
+132 |     for a in range(10)
+133 |     for b in range(10)
+    -     if a or [1] or True or [2]  # SIM222
+134 +     if True  # SIM222
+135 |     if b or [1] or True or [2]  # SIM222
+136 | }
+137 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:135:8
@@ -937,16 +894,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 136 | }
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-132 132 |     for a in range(10)
-133 133 |     for b in range(10)
-134 134 |     if a or [1] or True or [2]  # SIM222
-135     |-    if b or [1] or True or [2]  # SIM222
-    135 |+    if True  # SIM222
-136 136 | }
-137 137 | 
-138 138 | (
+132 |     for a in range(10)
+133 |     for b in range(10)
+134 |     if a or [1] or True or [2]  # SIM222
+    -     if b or [1] or True or [2]  # SIM222
+135 +     if True  # SIM222
+136 | }
+137 | 
+138 | (
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:142:8
@@ -959,16 +915,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 144 | )
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-139 139 |     0
-140 140 |     for a in range(10)
-141 141 |     for b in range(10)
-142     |-    if a or [1] or True or [2]  # SIM222
-    142 |+    if True  # SIM222
-143 143 |     if b or [1] or True or [2]  # SIM222
-144 144 | )
-145 145 | 
+139 |     0
+140 |     for a in range(10)
+141 |     for b in range(10)
+    -     if a or [1] or True or [2]  # SIM222
+142 +     if True  # SIM222
+143 |     if b or [1] or True or [2]  # SIM222
+144 | )
+145 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `True` instead of `... or True or ...`
    --> SIM222.py:143:8
@@ -980,16 +935,15 @@ SIM222 [*] Use `True` instead of `... or True or ...`
 144 | )
     |
 help: Replace with `True`
-
-ℹ Unsafe fix
-140 140 |     for a in range(10)
-141 141 |     for b in range(10)
-142 142 |     if a or [1] or True or [2]  # SIM222
-143     |-    if b or [1] or True or [2]  # SIM222
-    143 |+    if True  # SIM222
-144 144 | )
-145 145 | 
-146 146 | # Outside test `a` is not simplified.
+140 |     for a in range(10)
+141 |     for b in range(10)
+142 |     if a or [1] or True or [2]  # SIM222
+    -     if b or [1] or True or [2]  # SIM222
+143 +     if True  # SIM222
+144 | )
+145 | 
+146 | # Outside test `a` is not simplified.
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `[1]` instead of `[1] or ...`
    --> SIM222.py:148:6
@@ -1002,16 +956,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...`
 150 | if (a or [1] or True or [2]) == (a or [1]):  # SIM222
     |
 help: Replace with `[1]`
-
-ℹ Unsafe fix
-145 145 | 
-146 146 | # Outside test `a` is not simplified.
-147 147 | 
-148     |-a or [1] or True or [2]  # SIM222
-    148 |+a or [1]  # SIM222
-149 149 | 
-150 150 | if (a or [1] or True or [2]) == (a or [1]):  # SIM222
-151 151 |     pass
+145 | 
+146 | # Outside test `a` is not simplified.
+147 | 
+    - a or [1] or True or [2]  # SIM222
+148 + a or [1]  # SIM222
+149 | 
+150 | if (a or [1] or True or [2]) == (a or [1]):  # SIM222
+151 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `[1]` instead of `[1] or ...`
    --> SIM222.py:150:10
@@ -1023,16 +976,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...`
 151 |     pass
     |
 help: Replace with `[1]`
-
-ℹ Unsafe fix
-147 147 | 
-148 148 | a or [1] or True or [2]  # SIM222
-149 149 | 
-150     |-if (a or [1] or True or [2]) == (a or [1]):  # SIM222
-    150 |+if (a or [1]) == (a or [1]):  # SIM222
-151 151 |     pass
-152 152 | 
-153 153 | if f(a or [1] or True or [2]):  # SIM222
+147 | 
+148 | a or [1] or True or [2]  # SIM222
+149 | 
+    - if (a or [1] or True or [2]) == (a or [1]):  # SIM222
+150 + if (a or [1]) == (a or [1]):  # SIM222
+151 |     pass
+152 | 
+153 | if f(a or [1] or True or [2]):  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `[1]` instead of `[1] or ...`
    --> SIM222.py:153:11
@@ -1044,16 +996,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...`
 154 |     pass
     |
 help: Replace with `[1]`
-
-ℹ Unsafe fix
-150 150 | if (a or [1] or True or [2]) == (a or [1]):  # SIM222
-151 151 |     pass
-152 152 | 
-153     |-if f(a or [1] or True or [2]):  # SIM222
-    153 |+if f(a or [1]):  # SIM222
-154 154 |     pass
-155 155 | 
-156 156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099
+150 | if (a or [1] or True or [2]) == (a or [1]):  # SIM222
+151 |     pass
+152 | 
+    - if f(a or [1] or True or [2]):  # SIM222
+153 + if f(a or [1]):  # SIM222
+154 |     pass
+155 | 
+156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...`
    --> SIM222.py:157:30
@@ -1064,16 +1015,15 @@ SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...`
 158 |     m, s = divmod(s0, 60)
     |
 help: Replace with `(int, int, int)`
-
-ℹ Unsafe fix
-154 154 |     pass
-155 155 | 
-156 156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099
-157     |-def secondToTime(s0: int) -> (int, int, int) or str:
-    157 |+def secondToTime(s0: int) -> (int, int, int):
-158 158 |     m, s = divmod(s0, 60)
-159 159 | 
-160 160 | 
+154 |     pass
+155 | 
+156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099
+    - def secondToTime(s0: int) -> (int, int, int) or str:
+157 + def secondToTime(s0: int) -> (int, int, int):
+158 |     m, s = divmod(s0, 60)
+159 | 
+160 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...`
    --> SIM222.py:161:31
@@ -1083,16 +1033,15 @@ SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...`
 162 |     m, s = divmod(s0, 60)
     |
 help: Replace with `(int, int, int)`
-
-ℹ Unsafe fix
-158 158 |     m, s = divmod(s0, 60)
-159 159 | 
-160 160 | 
-161     |-def secondToTime(s0: int) -> ((int, int, int) or str):
-    161 |+def secondToTime(s0: int) -> ((int, int, int)):
-162 162 |     m, s = divmod(s0, 60)
-163 163 | 
-164 164 | 
+158 |     m, s = divmod(s0, 60)
+159 | 
+160 | 
+    - def secondToTime(s0: int) -> ((int, int, int) or str):
+161 + def secondToTime(s0: int) -> ((int, int, int)):
+162 |     m, s = divmod(s0, 60)
+163 | 
+164 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM222 [*] Use `"bar"` instead of `... or "bar"`
    --> SIM222.py:168:7
@@ -1104,13 +1053,86 @@ SIM222 [*] Use `"bar"` instead of `... or "bar"`
 169 | print(f"{1}{''}" or "bar")
     |
 help: Replace with `"bar"`
+165 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479
+166 | print(f"{a}{b}" or "bar")
+167 | print(f"{a}{''}" or "bar")
+    - print(f"{''}{''}" or "bar")
+168 + print("bar")
+169 | print(f"{1}{''}" or "bar")
+170 | 
+171 | 
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-165 165 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479
-166 166 | print(f"{a}{b}" or "bar")
-167 167 | print(f"{a}{''}" or "bar")
-168     |-print(f"{''}{''}" or "bar")
-    168 |+print("bar")
-169 169 | print(f"{1}{''}" or "bar")
-170 170 | 
-171 171 |
+SIM222 [*] Use `f"{b''}"` instead of `f"{b''}" or ...`
+   --> SIM222.py:202:7
+    |
+201 | # https://github.com/astral-sh/ruff/issues/20703
+202 | print(f"{b''}" or "bar")  # SIM222
+    |       ^^^^^^^^^^^^^^^^^
+203 | x = 1
+204 | print(f"{x=}" or "bar")  # SIM222
+    |
+help: Replace with `f"{b''}"`
+199 | def f(a: "'b' or 'c'"): ...
+200 | 
+201 | # https://github.com/astral-sh/ruff/issues/20703
+    - print(f"{b''}" or "bar")  # SIM222
+202 + print(f"{b''}")  # SIM222
+203 | x = 1
+204 | print(f"{x=}" or "bar")  # SIM222
+205 | (lambda: 1) or True  # SIM222
+note: This is an unsafe fix and may change runtime behavior
+
+SIM222 [*] Use `f"{x=}"` instead of `f"{x=}" or ...`
+   --> SIM222.py:204:7
+    |
+202 | print(f"{b''}" or "bar")  # SIM222
+203 | x = 1
+204 | print(f"{x=}" or "bar")  # SIM222
+    |       ^^^^^^^^^^^^^^^^
+205 | (lambda: 1) or True  # SIM222
+206 | (i for i in range(1)) or "bar"  # SIM222
+    |
+help: Replace with `f"{x=}"`
+201 | # https://github.com/astral-sh/ruff/issues/20703
+202 | print(f"{b''}" or "bar")  # SIM222
+203 | x = 1
+    - print(f"{x=}" or "bar")  # SIM222
+204 + print(f"{x=}")  # SIM222
+205 | (lambda: 1) or True  # SIM222
+206 | (i for i in range(1)) or "bar"  # SIM222
+note: This is an unsafe fix and may change runtime behavior
+
+SIM222 [*] Use `lambda: 1` instead of `lambda: 1 or ...`
+   --> SIM222.py:205:1
+    |
+203 | x = 1
+204 | print(f"{x=}" or "bar")  # SIM222
+205 | (lambda: 1) or True  # SIM222
+    | ^^^^^^^^^^^^^^^^^^^
+206 | (i for i in range(1)) or "bar"  # SIM222
+    |
+help: Replace with `lambda: 1`
+202 | print(f"{b''}" or "bar")  # SIM222
+203 | x = 1
+204 | print(f"{x=}" or "bar")  # SIM222
+    - (lambda: 1) or True  # SIM222
+205 + lambda: 1  # SIM222
+206 | (i for i in range(1)) or "bar"  # SIM222
+note: This is an unsafe fix and may change runtime behavior
+
+SIM222 [*] Use `(i for i in range(1))` instead of `(i for i in range(1)) or ...`
+   --> SIM222.py:206:1
+    |
+204 | print(f"{x=}" or "bar")  # SIM222
+205 | (lambda: 1) or True  # SIM222
+206 | (i for i in range(1)) or "bar"  # SIM222
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |
+help: Replace with `(i for i in range(1))`
+203 | x = 1
+204 | print(f"{x=}" or "bar")  # SIM222
+205 | (lambda: 1) or True  # SIM222
+    - (i for i in range(1)) or "bar"  # SIM222
+206 + (i for i in range(1))  # SIM222
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap
index c95fe3335a..4fe01c8146 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap
@@ -9,13 +9,12 @@ SIM223 [*] Use `False` instead of `... and False`
 2 |     pass
   |
 help: Replace with `False`
-
-ℹ Unsafe fix
-1   |-if a and False:  # SIM223
-  1 |+if False:  # SIM223
-2 2 |     pass
-3 3 | 
-4 4 | if (a or b) and False:  # SIM223
+  - if a and False:  # SIM223
+1 + if False:  # SIM223
+2 |     pass
+3 | 
+4 | if (a or b) and False:  # SIM223
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False`
  --> SIM223.py:4:4
@@ -27,16 +26,15 @@ SIM223 [*] Use `False` instead of `... and False`
 5 |     pass
   |
 help: Replace with `False`
-
-ℹ Unsafe fix
-1 1 | if a and False:  # SIM223
-2 2 |     pass
-3 3 | 
-4   |-if (a or b) and False:  # SIM223
-  4 |+if False:  # SIM223
-5 5 |     pass
-6 6 | 
-7 7 | if a or (b and False):  # SIM223
+1 | if a and False:  # SIM223
+2 |     pass
+3 | 
+  - if (a or b) and False:  # SIM223
+4 + if False:  # SIM223
+5 |     pass
+6 | 
+7 | if a or (b and False):  # SIM223
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False`
  --> SIM223.py:7:10
@@ -48,16 +46,15 @@ SIM223 [*] Use `False` instead of `... and False`
 8 |     pass
   |
 help: Replace with `False`
-
-ℹ Unsafe fix
-4 4 | if (a or b) and False:  # SIM223
-5 5 |     pass
-6 6 | 
-7   |-if a or (b and False):  # SIM223
-  7 |+if a or (False):  # SIM223
-8 8 |     pass
-9 9 | 
-10 10 | if a or False:
+4  | if (a or b) and False:  # SIM223
+5  |     pass
+6  | 
+   - if a or (b and False):  # SIM223
+7  + if a or (False):  # SIM223
+8  |     pass
+9  | 
+10 | if a or False:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `False and ...`
   --> SIM223.py:19:18
@@ -69,16 +66,15 @@ SIM223 [*] Use `False` instead of `False and ...`
 20 |     pass
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-16 16 | if a and f() and b and g() and False:  # OK
-17 17 |     pass
-18 18 | 
-19    |-if a and f() and False and g() and b:  # SIM223
-   19 |+if a and f() and False:  # SIM223
-20 20 |     pass
-21 21 | 
-22 22 | if False and f() and a and g() and b:  # SIM223
+16 | if a and f() and b and g() and False:  # OK
+17 |     pass
+18 | 
+   - if a and f() and False and g() and b:  # SIM223
+19 + if a and f() and False:  # SIM223
+20 |     pass
+21 | 
+22 | if False and f() and a and g() and b:  # SIM223
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `False and ...`
   --> SIM223.py:22:4
@@ -90,16 +86,15 @@ SIM223 [*] Use `False` instead of `False and ...`
 23 |     pass
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-19 19 | if a and f() and False and g() and b:  # SIM223
-20 20 |     pass
-21 21 | 
-22    |-if False and f() and a and g() and b:  # SIM223
-   22 |+if False:  # SIM223
-23 23 |     pass
-24 24 | 
-25 25 | if a and False and f() and b and g():  # SIM223
+19 | if a and f() and False and g() and b:  # SIM223
+20 |     pass
+21 | 
+   - if False and f() and a and g() and b:  # SIM223
+22 + if False:  # SIM223
+23 |     pass
+24 | 
+25 | if a and False and f() and b and g():  # SIM223
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:25:4
@@ -111,16 +106,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 26 |     pass
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-22 22 | if False and f() and a and g() and b:  # SIM223
-23 23 |     pass
-24 24 | 
-25    |-if a and False and f() and b and g():  # SIM223
-   25 |+if False:  # SIM223
-26 26 |     pass
-27 27 | 
-28 28 | 
+22 | if False and f() and a and g() and b:  # SIM223
+23 |     pass
+24 | 
+   - if a and False and f() and b and g():  # SIM223
+25 + if False:  # SIM223
+26 |     pass
+27 | 
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `""` instead of `"" and ...`
   --> SIM223.py:42:7
@@ -131,16 +125,15 @@ SIM223 [*] Use `""` instead of `"" and ...`
 44 | a and "foo" and False and "bar"  # SIM223
    |
 help: Replace with `""`
-
-ℹ Unsafe fix
-39 39 |     pass
-40 40 | 
-41 41 | 
-42    |-a and "" and False  # SIM223
-   42 |+a and ""  # SIM223
-43 43 | 
-44 44 | a and "foo" and False and "bar"  # SIM223
-45 45 | 
+39 |     pass
+40 | 
+41 | 
+   - a and "" and False  # SIM223
+42 + a and ""  # SIM223
+43 | 
+44 | a and "foo" and False and "bar"  # SIM223
+45 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:44:7
@@ -153,16 +146,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 46 | a and 0 and False  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | a and "" and False  # SIM223
-43 43 | 
-44    |-a and "foo" and False and "bar"  # SIM223
-   44 |+a and False  # SIM223
-45 45 | 
-46 46 | a and 0 and False  # SIM223
-47 47 | 
+41 | 
+42 | a and "" and False  # SIM223
+43 | 
+   - a and "foo" and False and "bar"  # SIM223
+44 + a and False  # SIM223
+45 | 
+46 | a and 0 and False  # SIM223
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `0` instead of `0 and ...`
   --> SIM223.py:46:7
@@ -175,16 +167,15 @@ SIM223 [*] Use `0` instead of `0 and ...`
 48 | a and 1 and False and 2  # SIM223
    |
 help: Replace with `0`
-
-ℹ Unsafe fix
-43 43 | 
-44 44 | a and "foo" and False and "bar"  # SIM223
-45 45 | 
-46    |-a and 0 and False  # SIM223
-   46 |+a and 0  # SIM223
-47 47 | 
-48 48 | a and 1 and False and 2  # SIM223
-49 49 | 
+43 | 
+44 | a and "foo" and False and "bar"  # SIM223
+45 | 
+   - a and 0 and False  # SIM223
+46 + a and 0  # SIM223
+47 | 
+48 | a and 1 and False and 2  # SIM223
+49 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:48:7
@@ -197,16 +188,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 50 | a and 0.0 and False  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-45 45 | 
-46 46 | a and 0 and False  # SIM223
-47 47 | 
-48    |-a and 1 and False and 2  # SIM223
-   48 |+a and False  # SIM223
-49 49 | 
-50 50 | a and 0.0 and False  # SIM223
-51 51 | 
+45 | 
+46 | a and 0 and False  # SIM223
+47 | 
+   - a and 1 and False and 2  # SIM223
+48 + a and False  # SIM223
+49 | 
+50 | a and 0.0 and False  # SIM223
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `0.0` instead of `0.0 and ...`
   --> SIM223.py:50:7
@@ -219,16 +209,15 @@ SIM223 [*] Use `0.0` instead of `0.0 and ...`
 52 | a and 0.1 and False and 0.2  # SIM223
    |
 help: Replace with `0.0`
-
-ℹ Unsafe fix
-47 47 | 
-48 48 | a and 1 and False and 2  # SIM223
-49 49 | 
-50    |-a and 0.0 and False  # SIM223
-   50 |+a and 0.0  # SIM223
-51 51 | 
-52 52 | a and 0.1 and False and 0.2  # SIM223
-53 53 | 
+47 | 
+48 | a and 1 and False and 2  # SIM223
+49 | 
+   - a and 0.0 and False  # SIM223
+50 + a and 0.0  # SIM223
+51 | 
+52 | a and 0.1 and False and 0.2  # SIM223
+53 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:52:7
@@ -241,16 +230,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 54 | a and [] and False  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | a and 0.0 and False  # SIM223
-51 51 | 
-52    |-a and 0.1 and False and 0.2  # SIM223
-   52 |+a and False  # SIM223
-53 53 | 
-54 54 | a and [] and False  # SIM223
-55 55 | 
+49 | 
+50 | a and 0.0 and False  # SIM223
+51 | 
+   - a and 0.1 and False and 0.2  # SIM223
+52 + a and False  # SIM223
+53 | 
+54 | a and [] and False  # SIM223
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `[]` instead of `[] and ...`
   --> SIM223.py:54:7
@@ -263,16 +251,15 @@ SIM223 [*] Use `[]` instead of `[] and ...`
 56 | a and list([]) and False  # SIM223
    |
 help: Replace with `[]`
-
-ℹ Unsafe fix
-51 51 | 
-52 52 | a and 0.1 and False and 0.2  # SIM223
-53 53 | 
-54    |-a and [] and False  # SIM223
-   54 |+a and []  # SIM223
-55 55 | 
-56 56 | a and list([]) and False  # SIM223
-57 57 | 
+51 | 
+52 | a and 0.1 and False and 0.2  # SIM223
+53 | 
+   - a and [] and False  # SIM223
+54 + a and []  # SIM223
+55 | 
+56 | a and list([]) and False  # SIM223
+57 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `list([])` instead of `list([]) and ...`
   --> SIM223.py:56:7
@@ -285,16 +272,15 @@ SIM223 [*] Use `list([])` instead of `list([]) and ...`
 58 | a and [1] and False and [2]  # SIM223
    |
 help: Replace with `list([])`
-
-ℹ Unsafe fix
-53 53 | 
-54 54 | a and [] and False  # SIM223
-55 55 | 
-56    |-a and list([]) and False  # SIM223
-   56 |+a and list([])  # SIM223
-57 57 | 
-58 58 | a and [1] and False and [2]  # SIM223
-59 59 | 
+53 | 
+54 | a and [] and False  # SIM223
+55 | 
+   - a and list([]) and False  # SIM223
+56 + a and list([])  # SIM223
+57 | 
+58 | a and [1] and False and [2]  # SIM223
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:58:7
@@ -307,16 +293,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 60 | a and list([1]) and False and list([2])  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-55 55 | 
-56 56 | a and list([]) and False  # SIM223
-57 57 | 
-58    |-a and [1] and False and [2]  # SIM223
-   58 |+a and False  # SIM223
-59 59 | 
-60 60 | a and list([1]) and False and list([2])  # SIM223
-61 61 | 
+55 | 
+56 | a and list([]) and False  # SIM223
+57 | 
+   - a and [1] and False and [2]  # SIM223
+58 + a and False  # SIM223
+59 | 
+60 | a and list([1]) and False and list([2])  # SIM223
+61 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:60:7
@@ -329,16 +314,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 62 | a and {} and False  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | a and [1] and False and [2]  # SIM223
-59 59 | 
-60    |-a and list([1]) and False and list([2])  # SIM223
-   60 |+a and False  # SIM223
-61 61 | 
-62 62 | a and {} and False  # SIM223
-63 63 | 
+57 | 
+58 | a and [1] and False and [2]  # SIM223
+59 | 
+   - a and list([1]) and False and list([2])  # SIM223
+60 + a and False  # SIM223
+61 | 
+62 | a and {} and False  # SIM223
+63 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `{}` instead of `{} and ...`
   --> SIM223.py:62:7
@@ -351,16 +335,15 @@ SIM223 [*] Use `{}` instead of `{} and ...`
 64 | a and dict() and False  # SIM223
    |
 help: Replace with `{}`
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | a and list([1]) and False and list([2])  # SIM223
-61 61 | 
-62    |-a and {} and False  # SIM223
-   62 |+a and {}  # SIM223
-63 63 | 
-64 64 | a and dict() and False  # SIM223
-65 65 | 
+59 | 
+60 | a and list([1]) and False and list([2])  # SIM223
+61 | 
+   - a and {} and False  # SIM223
+62 + a and {}  # SIM223
+63 | 
+64 | a and dict() and False  # SIM223
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `dict()` instead of `dict() and ...`
   --> SIM223.py:64:7
@@ -373,16 +356,15 @@ SIM223 [*] Use `dict()` instead of `dict() and ...`
 66 | a and {1: 1} and False and {2: 2}  # SIM223
    |
 help: Replace with `dict()`
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | a and {} and False  # SIM223
-63 63 | 
-64    |-a and dict() and False  # SIM223
-   64 |+a and dict()  # SIM223
-65 65 | 
-66 66 | a and {1: 1} and False and {2: 2}  # SIM223
-67 67 | 
+61 | 
+62 | a and {} and False  # SIM223
+63 | 
+   - a and dict() and False  # SIM223
+64 + a and dict()  # SIM223
+65 | 
+66 | a and {1: 1} and False and {2: 2}  # SIM223
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:66:7
@@ -395,16 +377,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 68 | a and dict({1: 1}) and False and dict({2: 2})  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-63 63 | 
-64 64 | a and dict() and False  # SIM223
-65 65 | 
-66    |-a and {1: 1} and False and {2: 2}  # SIM223
-   66 |+a and False  # SIM223
-67 67 | 
-68 68 | a and dict({1: 1}) and False and dict({2: 2})  # SIM223
-69 69 | 
+63 | 
+64 | a and dict() and False  # SIM223
+65 | 
+   - a and {1: 1} and False and {2: 2}  # SIM223
+66 + a and False  # SIM223
+67 | 
+68 | a and dict({1: 1}) and False and dict({2: 2})  # SIM223
+69 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:68:7
@@ -417,16 +398,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 70 | a and set() and False  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | a and {1: 1} and False and {2: 2}  # SIM223
-67 67 | 
-68    |-a and dict({1: 1}) and False and dict({2: 2})  # SIM223
-   68 |+a and False  # SIM223
-69 69 | 
-70 70 | a and set() and False  # SIM223
-71 71 | 
+65 | 
+66 | a and {1: 1} and False and {2: 2}  # SIM223
+67 | 
+   - a and dict({1: 1}) and False and dict({2: 2})  # SIM223
+68 + a and False  # SIM223
+69 | 
+70 | a and set() and False  # SIM223
+71 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `set()` instead of `set() and ...`
   --> SIM223.py:70:7
@@ -439,16 +419,15 @@ SIM223 [*] Use `set()` instead of `set() and ...`
 72 | a and set(set()) and False  # SIM223
    |
 help: Replace with `set()`
-
-ℹ Unsafe fix
-67 67 | 
-68 68 | a and dict({1: 1}) and False and dict({2: 2})  # SIM223
-69 69 | 
-70    |-a and set() and False  # SIM223
-   70 |+a and set()  # SIM223
-71 71 | 
-72 72 | a and set(set()) and False  # SIM223
-73 73 | 
+67 | 
+68 | a and dict({1: 1}) and False and dict({2: 2})  # SIM223
+69 | 
+   - a and set() and False  # SIM223
+70 + a and set()  # SIM223
+71 | 
+72 | a and set(set()) and False  # SIM223
+73 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `set(set())` instead of `set(set()) and ...`
   --> SIM223.py:72:7
@@ -461,16 +440,15 @@ SIM223 [*] Use `set(set())` instead of `set(set()) and ...`
 74 | a and {1} and False and {2}  # SIM223
    |
 help: Replace with `set(set())`
-
-ℹ Unsafe fix
-69 69 | 
-70 70 | a and set() and False  # SIM223
-71 71 | 
-72    |-a and set(set()) and False  # SIM223
-   72 |+a and set(set())  # SIM223
-73 73 | 
-74 74 | a and {1} and False and {2}  # SIM223
-75 75 | 
+69 | 
+70 | a and set() and False  # SIM223
+71 | 
+   - a and set(set()) and False  # SIM223
+72 + a and set(set())  # SIM223
+73 | 
+74 | a and {1} and False and {2}  # SIM223
+75 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:74:7
@@ -483,16 +461,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 76 | a and set({1}) and False and set({2})  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-71 71 | 
-72 72 | a and set(set()) and False  # SIM223
-73 73 | 
-74    |-a and {1} and False and {2}  # SIM223
-   74 |+a and False  # SIM223
-75 75 | 
-76 76 | a and set({1}) and False and set({2})  # SIM223
-77 77 | 
+71 | 
+72 | a and set(set()) and False  # SIM223
+73 | 
+   - a and {1} and False and {2}  # SIM223
+74 + a and False  # SIM223
+75 | 
+76 | a and set({1}) and False and set({2})  # SIM223
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:76:7
@@ -505,16 +482,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 78 | a and () and False  # SIM222
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-73 73 | 
-74 74 | a and {1} and False and {2}  # SIM223
-75 75 | 
-76    |-a and set({1}) and False and set({2})  # SIM223
-   76 |+a and False  # SIM223
-77 77 | 
-78 78 | a and () and False  # SIM222
-79 79 | 
+73 | 
+74 | a and {1} and False and {2}  # SIM223
+75 | 
+   - a and set({1}) and False and set({2})  # SIM223
+76 + a and False  # SIM223
+77 | 
+78 | a and () and False  # SIM222
+79 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `()` instead of `() and ...`
   --> SIM223.py:78:7
@@ -527,16 +503,15 @@ SIM223 [*] Use `()` instead of `() and ...`
 80 | a and tuple(()) and False  # SIM222
    |
 help: Replace with `()`
-
-ℹ Unsafe fix
-75 75 | 
-76 76 | a and set({1}) and False and set({2})  # SIM223
-77 77 | 
-78    |-a and () and False  # SIM222
-   78 |+a and ()  # SIM222
-79 79 | 
-80 80 | a and tuple(()) and False  # SIM222
-81 81 | 
+75 | 
+76 | a and set({1}) and False and set({2})  # SIM223
+77 | 
+   - a and () and False  # SIM222
+78 + a and ()  # SIM222
+79 | 
+80 | a and tuple(()) and False  # SIM222
+81 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `tuple(())` instead of `tuple(()) and ...`
   --> SIM223.py:80:7
@@ -549,16 +524,15 @@ SIM223 [*] Use `tuple(())` instead of `tuple(()) and ...`
 82 | a and (1,) and False and (2,)  # SIM222
    |
 help: Replace with `tuple(())`
-
-ℹ Unsafe fix
-77 77 | 
-78 78 | a and () and False  # SIM222
-79 79 | 
-80    |-a and tuple(()) and False  # SIM222
-   80 |+a and tuple(())  # SIM222
-81 81 | 
-82 82 | a and (1,) and False and (2,)  # SIM222
-83 83 | 
+77 | 
+78 | a and () and False  # SIM222
+79 | 
+   - a and tuple(()) and False  # SIM222
+80 + a and tuple(())  # SIM222
+81 | 
+82 | a and (1,) and False and (2,)  # SIM222
+83 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:82:7
@@ -571,16 +545,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 84 | a and tuple((1,)) and False and tuple((2,))  # SIM222
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-79 79 | 
-80 80 | a and tuple(()) and False  # SIM222
-81 81 | 
-82    |-a and (1,) and False and (2,)  # SIM222
-   82 |+a and False  # SIM222
-83 83 | 
-84 84 | a and tuple((1,)) and False and tuple((2,))  # SIM222
-85 85 | 
+79 | 
+80 | a and tuple(()) and False  # SIM222
+81 | 
+   - a and (1,) and False and (2,)  # SIM222
+82 + a and False  # SIM222
+83 | 
+84 | a and tuple((1,)) and False and tuple((2,))  # SIM222
+85 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:84:7
@@ -593,16 +566,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 86 | a and frozenset() and False  # SIM222
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-81 81 | 
-82 82 | a and (1,) and False and (2,)  # SIM222
-83 83 | 
-84    |-a and tuple((1,)) and False and tuple((2,))  # SIM222
-   84 |+a and False  # SIM222
-85 85 | 
-86 86 | a and frozenset() and False  # SIM222
-87 87 | 
+81 | 
+82 | a and (1,) and False and (2,)  # SIM222
+83 | 
+   - a and tuple((1,)) and False and tuple((2,))  # SIM222
+84 + a and False  # SIM222
+85 | 
+86 | a and frozenset() and False  # SIM222
+87 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `frozenset()` instead of `frozenset() and ...`
   --> SIM223.py:86:7
@@ -615,16 +587,15 @@ SIM223 [*] Use `frozenset()` instead of `frozenset() and ...`
 88 | a and frozenset(frozenset()) and False  # SIM222
    |
 help: Replace with `frozenset()`
-
-ℹ Unsafe fix
-83 83 | 
-84 84 | a and tuple((1,)) and False and tuple((2,))  # SIM222
-85 85 | 
-86    |-a and frozenset() and False  # SIM222
-   86 |+a and frozenset()  # SIM222
-87 87 | 
-88 88 | a and frozenset(frozenset()) and False  # SIM222
-89 89 | 
+83 | 
+84 | a and tuple((1,)) and False and tuple((2,))  # SIM222
+85 | 
+   - a and frozenset() and False  # SIM222
+86 + a and frozenset()  # SIM222
+87 | 
+88 | a and frozenset(frozenset()) and False  # SIM222
+89 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `frozenset(frozenset())` instead of `frozenset(frozenset()) and ...`
   --> SIM223.py:88:7
@@ -637,16 +608,15 @@ SIM223 [*] Use `frozenset(frozenset())` instead of `frozenset(frozenset()) and .
 90 | a and frozenset({1}) and False and frozenset({2})  # SIM222
    |
 help: Replace with `frozenset(frozenset())`
-
-ℹ Unsafe fix
-85 85 | 
-86 86 | a and frozenset() and False  # SIM222
-87 87 | 
-88    |-a and frozenset(frozenset()) and False  # SIM222
-   88 |+a and frozenset(frozenset())  # SIM222
-89 89 | 
-90 90 | a and frozenset({1}) and False and frozenset({2})  # SIM222
-91 91 | 
+85 | 
+86 | a and frozenset() and False  # SIM222
+87 | 
+   - a and frozenset(frozenset()) and False  # SIM222
+88 + a and frozenset(frozenset())  # SIM222
+89 | 
+90 | a and frozenset({1}) and False and frozenset({2})  # SIM222
+91 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:90:7
@@ -659,16 +629,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 92 | a and frozenset(frozenset({1})) and False and frozenset(frozenset({2}))  # SIM222
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-87 87 | 
-88 88 | a and frozenset(frozenset()) and False  # SIM222
-89 89 | 
-90    |-a and frozenset({1}) and False and frozenset({2})  # SIM222
-   90 |+a and False  # SIM222
-91 91 | 
-92 92 | a and frozenset(frozenset({1})) and False and frozenset(frozenset({2}))  # SIM222
-93 93 | 
+87 | 
+88 | a and frozenset(frozenset()) and False  # SIM222
+89 | 
+   - a and frozenset({1}) and False and frozenset({2})  # SIM222
+90 + a and False  # SIM222
+91 | 
+92 | a and frozenset(frozenset({1})) and False and frozenset(frozenset({2}))  # SIM222
+93 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:92:7
@@ -679,16 +648,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-89 89 | 
-90 90 | a and frozenset({1}) and False and frozenset({2})  # SIM222
-91 91 | 
-92    |-a and frozenset(frozenset({1})) and False and frozenset(frozenset({2}))  # SIM222
-   92 |+a and False  # SIM222
-93 93 | 
-94 94 | 
-95 95 | # Inside test `a` is simplified.
+89 | 
+90 | a and frozenset({1}) and False and frozenset({2})  # SIM222
+91 | 
+   - a and frozenset(frozenset({1})) and False and frozenset(frozenset({2}))  # SIM222
+92 + a and False  # SIM222
+93 | 
+94 | 
+95 | # Inside test `a` is simplified.
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
   --> SIM223.py:97:6
@@ -701,16 +669,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 99 | assert a and [] and False and []  # SIM223
    |
 help: Replace with `False`
-
-ℹ Unsafe fix
-94 94 | 
-95 95 | # Inside test `a` is simplified.
-96 96 | 
-97    |-bool(a and [] and False and [])  # SIM223
-   97 |+bool(False)  # SIM223
-98 98 | 
-99 99 | assert a and [] and False and []  # SIM223
-100 100 | 
+94  | 
+95  | # Inside test `a` is simplified.
+96  | 
+    - bool(a and [] and False and [])  # SIM223
+97  + bool(False)  # SIM223
+98  | 
+99  | assert a and [] and False and []  # SIM223
+100 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:99:8
@@ -723,16 +690,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 101 | if (a and [] and False and []) or (a and [] and False and []):  # SIM223
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-96  96  | 
-97  97  | bool(a and [] and False and [])  # SIM223
-98  98  | 
-99      |-assert a and [] and False and []  # SIM223
-    99  |+assert False  # SIM223
-100 100 | 
-101 101 | if (a and [] and False and []) or (a and [] and False and []):  # SIM223
-102 102 |     pass
+96  | 
+97  | bool(a and [] and False and [])  # SIM223
+98  | 
+    - assert a and [] and False and []  # SIM223
+99  + assert False  # SIM223
+100 | 
+101 | if (a and [] and False and []) or (a and [] and False and []):  # SIM223
+102 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:101:5
@@ -744,16 +710,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 102 |     pass
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-98  98  | 
-99  99  | assert a and [] and False and []  # SIM223
-100 100 | 
-101     |-if (a and [] and False and []) or (a and [] and False and []):  # SIM223
-    101 |+if (False) or (a and [] and False and []):  # SIM223
-102 102 |     pass
-103 103 | 
-104 104 | 0 if a and [] and False and [] else 1  # SIM222
+98  | 
+99  | assert a and [] and False and []  # SIM223
+100 | 
+    - if (a and [] and False and []) or (a and [] and False and []):  # SIM223
+101 + if (False) or (a and [] and False and []):  # SIM223
+102 |     pass
+103 | 
+104 | 0 if a and [] and False and [] else 1  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:101:36
@@ -765,16 +730,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 102 |     pass
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-98  98  | 
-99  99  | assert a and [] and False and []  # SIM223
-100 100 | 
-101     |-if (a and [] and False and []) or (a and [] and False and []):  # SIM223
-    101 |+if (a and [] and False and []) or (False):  # SIM223
-102 102 |     pass
-103 103 | 
-104 104 | 0 if a and [] and False and [] else 1  # SIM222
+98  | 
+99  | assert a and [] and False and []  # SIM223
+100 | 
+    - if (a and [] and False and []) or (a and [] and False and []):  # SIM223
+101 + if (a and [] and False and []) or (False):  # SIM223
+102 |     pass
+103 | 
+104 | 0 if a and [] and False and [] else 1  # SIM222
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:104:6
@@ -787,16 +751,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 106 | while a and [] and False and []:  # SIM223
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-101 101 | if (a and [] and False and []) or (a and [] and False and []):  # SIM223
-102 102 |     pass
-103 103 | 
-104     |-0 if a and [] and False and [] else 1  # SIM222
-    104 |+0 if False else 1  # SIM222
-105 105 | 
-106 106 | while a and [] and False and []:  # SIM223
-107 107 |     pass
+101 | if (a and [] and False and []) or (a and [] and False and []):  # SIM223
+102 |     pass
+103 | 
+    - 0 if a and [] and False and [] else 1  # SIM222
+104 + 0 if False else 1  # SIM222
+105 | 
+106 | while a and [] and False and []:  # SIM223
+107 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:106:7
@@ -808,16 +771,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 107 |     pass
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | 0 if a and [] and False and [] else 1  # SIM222
-105 105 | 
-106     |-while a and [] and False and []:  # SIM223
-    106 |+while False:  # SIM223
-107 107 |     pass
-108 108 | 
-109 109 | [
+103 | 
+104 | 0 if a and [] and False and [] else 1  # SIM222
+105 | 
+    - while a and [] and False and []:  # SIM223
+106 + while False:  # SIM223
+107 |     pass
+108 | 
+109 | [
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:113:8
@@ -830,16 +792,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 115 | ]
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-110 110 |     0
-111 111 |     for a in range(10)
-112 112 |     for b in range(10)
-113     |-    if a and [] and False and []  # SIM223
-    113 |+    if False  # SIM223
-114 114 |     if b and [] and False and []  # SIM223
-115 115 | ]
-116 116 | 
+110 |     0
+111 |     for a in range(10)
+112 |     for b in range(10)
+    -     if a and [] and False and []  # SIM223
+113 +     if False  # SIM223
+114 |     if b and [] and False and []  # SIM223
+115 | ]
+116 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:114:8
@@ -851,16 +812,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 115 | ]
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-111 111 |     for a in range(10)
-112 112 |     for b in range(10)
-113 113 |     if a and [] and False and []  # SIM223
-114     |-    if b and [] and False and []  # SIM223
-    114 |+    if False  # SIM223
-115 115 | ]
-116 116 | 
-117 117 | {
+111 |     for a in range(10)
+112 |     for b in range(10)
+113 |     if a and [] and False and []  # SIM223
+    -     if b and [] and False and []  # SIM223
+114 +     if False  # SIM223
+115 | ]
+116 | 
+117 | {
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:121:8
@@ -873,16 +833,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 123 | }
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-118 118 |     0
-119 119 |     for a in range(10)
-120 120 |     for b in range(10)
-121     |-    if a and [] and False and []  # SIM223
-    121 |+    if False  # SIM223
-122 122 |     if b and [] and False and []  # SIM223
-123 123 | }
-124 124 | 
+118 |     0
+119 |     for a in range(10)
+120 |     for b in range(10)
+    -     if a and [] and False and []  # SIM223
+121 +     if False  # SIM223
+122 |     if b and [] and False and []  # SIM223
+123 | }
+124 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:122:8
@@ -894,16 +853,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 123 | }
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-119 119 |     for a in range(10)
-120 120 |     for b in range(10)
-121 121 |     if a and [] and False and []  # SIM223
-122     |-    if b and [] and False and []  # SIM223
-    122 |+    if False  # SIM223
-123 123 | }
-124 124 | 
-125 125 | {
+119 |     for a in range(10)
+120 |     for b in range(10)
+121 |     if a and [] and False and []  # SIM223
+    -     if b and [] and False and []  # SIM223
+122 +     if False  # SIM223
+123 | }
+124 | 
+125 | {
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:129:8
@@ -916,16 +874,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 131 | }
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-126 126 |     0: 0
-127 127 |     for a in range(10)
-128 128 |     for b in range(10)
-129     |-    if a and [] and False and []  # SIM223
-    129 |+    if False  # SIM223
-130 130 |     if b and [] and False and []  # SIM223
-131 131 | }
-132 132 | 
+126 |     0: 0
+127 |     for a in range(10)
+128 |     for b in range(10)
+    -     if a and [] and False and []  # SIM223
+129 +     if False  # SIM223
+130 |     if b and [] and False and []  # SIM223
+131 | }
+132 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:130:8
@@ -937,16 +894,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 131 | }
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-127 127 |     for a in range(10)
-128 128 |     for b in range(10)
-129 129 |     if a and [] and False and []  # SIM223
-130     |-    if b and [] and False and []  # SIM223
-    130 |+    if False  # SIM223
-131 131 | }
-132 132 | 
-133 133 | (
+127 |     for a in range(10)
+128 |     for b in range(10)
+129 |     if a and [] and False and []  # SIM223
+    -     if b and [] and False and []  # SIM223
+130 +     if False  # SIM223
+131 | }
+132 | 
+133 | (
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:137:8
@@ -959,16 +915,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 139 | )
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-134 134 |     0
-135 135 |     for a in range(10)
-136 136 |     for b in range(10)
-137     |-    if a and [] and False and []  # SIM223
-    137 |+    if False  # SIM223
-138 138 |     if b and [] and False and []  # SIM223
-139 139 | )
-140 140 | 
+134 |     0
+135 |     for a in range(10)
+136 |     for b in range(10)
+    -     if a and [] and False and []  # SIM223
+137 +     if False  # SIM223
+138 |     if b and [] and False and []  # SIM223
+139 | )
+140 | 
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `False` instead of `... and False and ...`
    --> SIM223.py:138:8
@@ -980,16 +935,15 @@ SIM223 [*] Use `False` instead of `... and False and ...`
 139 | )
     |
 help: Replace with `False`
-
-ℹ Unsafe fix
-135 135 |     for a in range(10)
-136 136 |     for b in range(10)
-137 137 |     if a and [] and False and []  # SIM223
-138     |-    if b and [] and False and []  # SIM223
-    138 |+    if False  # SIM223
-139 139 | )
-140 140 | 
-141 141 | # Outside test `a` is not simplified.
+135 |     for a in range(10)
+136 |     for b in range(10)
+137 |     if a and [] and False and []  # SIM223
+    -     if b and [] and False and []  # SIM223
+138 +     if False  # SIM223
+139 | )
+140 | 
+141 | # Outside test `a` is not simplified.
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `[]` instead of `[] and ...`
    --> SIM223.py:143:7
@@ -1002,16 +956,15 @@ SIM223 [*] Use `[]` instead of `[] and ...`
 145 | if (a and [] and False and []) == (a and []):  # SIM223
     |
 help: Replace with `[]`
-
-ℹ Unsafe fix
-140 140 | 
-141 141 | # Outside test `a` is not simplified.
-142 142 | 
-143     |-a and [] and False and []  # SIM223
-    143 |+a and []  # SIM223
-144 144 | 
-145 145 | if (a and [] and False and []) == (a and []):  # SIM223
-146 146 |     pass
+140 | 
+141 | # Outside test `a` is not simplified.
+142 | 
+    - a and [] and False and []  # SIM223
+143 + a and []  # SIM223
+144 | 
+145 | if (a and [] and False and []) == (a and []):  # SIM223
+146 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `[]` instead of `[] and ...`
    --> SIM223.py:145:11
@@ -1023,16 +976,15 @@ SIM223 [*] Use `[]` instead of `[] and ...`
 146 |     pass
     |
 help: Replace with `[]`
-
-ℹ Unsafe fix
-142 142 | 
-143 143 | a and [] and False and []  # SIM223
-144 144 | 
-145     |-if (a and [] and False and []) == (a and []):  # SIM223
-    145 |+if (a and []) == (a and []):  # SIM223
-146 146 |     pass
-147 147 | 
-148 148 | if f(a and [] and False and []):  # SIM223
+142 | 
+143 | a and [] and False and []  # SIM223
+144 | 
+    - if (a and [] and False and []) == (a and []):  # SIM223
+145 + if (a and []) == (a and []):  # SIM223
+146 |     pass
+147 | 
+148 | if f(a and [] and False and []):  # SIM223
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `[]` instead of `[] and ...`
    --> SIM223.py:148:12
@@ -1044,16 +996,15 @@ SIM223 [*] Use `[]` instead of `[] and ...`
 149 |     pass
     |
 help: Replace with `[]`
-
-ℹ Unsafe fix
-145 145 | if (a and [] and False and []) == (a and []):  # SIM223
-146 146 |     pass
-147 147 | 
-148     |-if f(a and [] and False and []):  # SIM223
-    148 |+if f(a and []):  # SIM223
-149 149 |     pass
-150 150 | 
-151 151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479
+145 | if (a and [] and False and []) == (a and []):  # SIM223
+146 |     pass
+147 | 
+    - if f(a and [] and False and []):  # SIM223
+148 + if f(a and []):  # SIM223
+149 |     pass
+150 | 
+151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479
+note: This is an unsafe fix and may change runtime behavior
 
 SIM223 [*] Use `f"{''}{''}"` instead of `f"{''}{''}" and ...`
    --> SIM223.py:154:7
@@ -1065,13 +1016,12 @@ SIM223 [*] Use `f"{''}{''}"` instead of `f"{''}{''}" and ...`
 155 | print(f"{1}{''}" and "bar")
     |
 help: Replace with `f"{''}{''}"`
-
-ℹ Unsafe fix
-151 151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479
-152 152 | print(f"{a}{b}" and "bar")
-153 153 | print(f"{a}{''}" and "bar")
-154     |-print(f"{''}{''}" and "bar")
-    154 |+print(f"{''}{''}")
-155 155 | print(f"{1}{''}" and "bar")
-156 156 | 
-157 157 |
+151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479
+152 | print(f"{a}{b}" and "bar")
+153 | print(f"{a}{''}" and "bar")
+    - print(f"{''}{''}" and "bar")
+154 + print(f"{''}{''}")
+155 | print(f"{1}{''}" and "bar")
+156 | 
+157 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap
index 8dc1a167be..1c1dba4ce0 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap
@@ -11,14 +11,12 @@ SIM300 [*] Yoda condition detected
 4 | ("a", "b") == compare  # SIM300
   |
 help: Rewrite as `compare == "yoda"`
-
-ℹ Safe fix
-1 1 | # Errors
-2   |-"yoda" == compare  # SIM300
-  2 |+compare == "yoda"  # SIM300
-3 3 | 42 == age  # SIM300
-4 4 | ("a", "b") == compare  # SIM300
-5 5 | "yoda" <= compare  # SIM300
+1 | # Errors
+  - "yoda" == compare  # SIM300
+2 + compare == "yoda"  # SIM300
+3 | 42 == age  # SIM300
+4 | ("a", "b") == compare  # SIM300
+5 | "yoda" <= compare  # SIM300
 
 SIM300 [*] Yoda condition detected
  --> SIM300.py:3:1
@@ -31,15 +29,13 @@ SIM300 [*] Yoda condition detected
 5 | "yoda" <= compare  # SIM300
   |
 help: Rewrite as `age == 42`
-
-ℹ Safe fix
-1 1 | # Errors
-2 2 | "yoda" == compare  # SIM300
-3   |-42 == age  # SIM300
-  3 |+age == 42  # SIM300
-4 4 | ("a", "b") == compare  # SIM300
-5 5 | "yoda" <= compare  # SIM300
-6 6 | "yoda" < compare  # SIM300
+1 | # Errors
+2 | "yoda" == compare  # SIM300
+  - 42 == age  # SIM300
+3 + age == 42  # SIM300
+4 | ("a", "b") == compare  # SIM300
+5 | "yoda" <= compare  # SIM300
+6 | "yoda" < compare  # SIM300
 
 SIM300 [*] Yoda condition detected
  --> SIM300.py:4:1
@@ -52,16 +48,14 @@ SIM300 [*] Yoda condition detected
 6 | "yoda" < compare  # SIM300
   |
 help: Rewrite as `compare == ("a", "b")`
-
-ℹ Safe fix
-1 1 | # Errors
-2 2 | "yoda" == compare  # SIM300
-3 3 | 42 == age  # SIM300
-4   |-("a", "b") == compare  # SIM300
-  4 |+compare == ("a", "b")  # SIM300
-5 5 | "yoda" <= compare  # SIM300
-6 6 | "yoda" < compare  # SIM300
-7 7 | 42 > age  # SIM300
+1 | # Errors
+2 | "yoda" == compare  # SIM300
+3 | 42 == age  # SIM300
+  - ("a", "b") == compare  # SIM300
+4 + compare == ("a", "b")  # SIM300
+5 | "yoda" <= compare  # SIM300
+6 | "yoda" < compare  # SIM300
+7 | 42 > age  # SIM300
 
 SIM300 [*] Yoda condition detected
  --> SIM300.py:5:1
@@ -74,16 +68,14 @@ SIM300 [*] Yoda condition detected
 7 | 42 > age  # SIM300
   |
 help: Rewrite as `compare >= "yoda"`
-
-ℹ Safe fix
-2 2 | "yoda" == compare  # SIM300
-3 3 | 42 == age  # SIM300
-4 4 | ("a", "b") == compare  # SIM300
-5   |-"yoda" <= compare  # SIM300
-  5 |+compare >= "yoda"  # SIM300
-6 6 | "yoda" < compare  # SIM300
-7 7 | 42 > age  # SIM300
-8 8 | -42 > age  # SIM300
+2 | "yoda" == compare  # SIM300
+3 | 42 == age  # SIM300
+4 | ("a", "b") == compare  # SIM300
+  - "yoda" <= compare  # SIM300
+5 + compare >= "yoda"  # SIM300
+6 | "yoda" < compare  # SIM300
+7 | 42 > age  # SIM300
+8 | -42 > age  # SIM300
 
 SIM300 [*] Yoda condition detected
  --> SIM300.py:6:1
@@ -96,16 +88,14 @@ SIM300 [*] Yoda condition detected
 8 | -42 > age  # SIM300
   |
 help: Rewrite as `compare > "yoda"`
-
-ℹ Safe fix
-3 3 | 42 == age  # SIM300
-4 4 | ("a", "b") == compare  # SIM300
-5 5 | "yoda" <= compare  # SIM300
-6   |-"yoda" < compare  # SIM300
-  6 |+compare > "yoda"  # SIM300
-7 7 | 42 > age  # SIM300
-8 8 | -42 > age  # SIM300
-9 9 | +42 > age  # SIM300
+3 | 42 == age  # SIM300
+4 | ("a", "b") == compare  # SIM300
+5 | "yoda" <= compare  # SIM300
+  - "yoda" < compare  # SIM300
+6 + compare > "yoda"  # SIM300
+7 | 42 > age  # SIM300
+8 | -42 > age  # SIM300
+9 | +42 > age  # SIM300
 
 SIM300 [*] Yoda condition detected
  --> SIM300.py:7:1
@@ -118,16 +108,14 @@ SIM300 [*] Yoda condition detected
 9 | +42 > age  # SIM300
   |
 help: Rewrite as `age < 42`
-
-ℹ Safe fix
-4 4 | ("a", "b") == compare  # SIM300
-5 5 | "yoda" <= compare  # SIM300
-6 6 | "yoda" < compare  # SIM300
-7   |-42 > age  # SIM300
-  7 |+age < 42  # SIM300
-8 8 | -42 > age  # SIM300
-9 9 | +42 > age  # SIM300
-10 10 | YODA == age  # SIM300
+4  | ("a", "b") == compare  # SIM300
+5  | "yoda" <= compare  # SIM300
+6  | "yoda" < compare  # SIM300
+   - 42 > age  # SIM300
+7  + age < 42  # SIM300
+8  | -42 > age  # SIM300
+9  | +42 > age  # SIM300
+10 | YODA == age  # SIM300
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:8:1
@@ -140,16 +128,14 @@ SIM300 [*] Yoda condition detected
 10 | YODA == age  # SIM300
    |
 help: Rewrite as `age < -42`
-
-ℹ Safe fix
-5 5 | "yoda" <= compare  # SIM300
-6 6 | "yoda" < compare  # SIM300
-7 7 | 42 > age  # SIM300
-8   |--42 > age  # SIM300
-  8 |+age < -42  # SIM300
-9 9 | +42 > age  # SIM300
-10 10 | YODA == age  # SIM300
-11 11 | YODA > age  # SIM300
+5  | "yoda" <= compare  # SIM300
+6  | "yoda" < compare  # SIM300
+7  | 42 > age  # SIM300
+   - -42 > age  # SIM300
+8  + age < -42  # SIM300
+9  | +42 > age  # SIM300
+10 | YODA == age  # SIM300
+11 | YODA > age  # SIM300
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:9:1
@@ -162,16 +148,14 @@ SIM300 [*] Yoda condition detected
 11 | YODA > age  # SIM300
    |
 help: Rewrite as `age < +42`
-
-ℹ Safe fix
-6  6  | "yoda" < compare  # SIM300
-7  7  | 42 > age  # SIM300
-8  8  | -42 > age  # SIM300
-9     |-+42 > age  # SIM300
-   9  |+age < +42  # SIM300
-10 10 | YODA == age  # SIM300
-11 11 | YODA > age  # SIM300
-12 12 | YODA >= age  # SIM300
+6  | "yoda" < compare  # SIM300
+7  | 42 > age  # SIM300
+8  | -42 > age  # SIM300
+   - +42 > age  # SIM300
+9  + age < +42  # SIM300
+10 | YODA == age  # SIM300
+11 | YODA > age  # SIM300
+12 | YODA >= age  # SIM300
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:10:1
@@ -184,16 +168,14 @@ SIM300 [*] Yoda condition detected
 12 | YODA >= age  # SIM300
    |
 help: Rewrite as `age == YODA`
-
-ℹ Safe fix
-7  7  | 42 > age  # SIM300
-8  8  | -42 > age  # SIM300
-9  9  | +42 > age  # SIM300
-10    |-YODA == age  # SIM300
-   10 |+age == YODA  # SIM300
-11 11 | YODA > age  # SIM300
-12 12 | YODA >= age  # SIM300
-13 13 | JediOrder.YODA == age  # SIM300
+7  | 42 > age  # SIM300
+8  | -42 > age  # SIM300
+9  | +42 > age  # SIM300
+   - YODA == age  # SIM300
+10 + age == YODA  # SIM300
+11 | YODA > age  # SIM300
+12 | YODA >= age  # SIM300
+13 | JediOrder.YODA == age  # SIM300
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:11:1
@@ -206,16 +188,14 @@ SIM300 [*] Yoda condition detected
 13 | JediOrder.YODA == age  # SIM300
    |
 help: Rewrite as `age < YODA`
-
-ℹ Safe fix
-8  8  | -42 > age  # SIM300
-9  9  | +42 > age  # SIM300
-10 10 | YODA == age  # SIM300
-11    |-YODA > age  # SIM300
-   11 |+age < YODA  # SIM300
-12 12 | YODA >= age  # SIM300
-13 13 | JediOrder.YODA == age  # SIM300
-14 14 | 0 < (number - 100)  # SIM300
+8  | -42 > age  # SIM300
+9  | +42 > age  # SIM300
+10 | YODA == age  # SIM300
+   - YODA > age  # SIM300
+11 + age < YODA  # SIM300
+12 | YODA >= age  # SIM300
+13 | JediOrder.YODA == age  # SIM300
+14 | 0 < (number - 100)  # SIM300
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:12:1
@@ -228,16 +208,14 @@ SIM300 [*] Yoda condition detected
 14 | 0 < (number - 100)  # SIM300
    |
 help: Rewrite as `age <= YODA`
-
-ℹ Safe fix
-9  9  | +42 > age  # SIM300
-10 10 | YODA == age  # SIM300
-11 11 | YODA > age  # SIM300
-12    |-YODA >= age  # SIM300
-   12 |+age <= YODA  # SIM300
-13 13 | JediOrder.YODA == age  # SIM300
-14 14 | 0 < (number - 100)  # SIM300
-15 15 | B<A[0][0]or B
+9  | +42 > age  # SIM300
+10 | YODA == age  # SIM300
+11 | YODA > age  # SIM300
+   - YODA >= age  # SIM300
+12 + age <= YODA  # SIM300
+13 | JediOrder.YODA == age  # SIM300
+14 | 0 < (number - 100)  # SIM300
+15 | B<A[0][0]or B
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:13:1
@@ -250,16 +228,14 @@ SIM300 [*] Yoda condition detected
 15 | B<A[0][0]or B
    |
 help: Rewrite as `age == JediOrder.YODA`
-
-ℹ Safe fix
-10 10 | YODA == age  # SIM300
-11 11 | YODA > age  # SIM300
-12 12 | YODA >= age  # SIM300
-13    |-JediOrder.YODA == age  # SIM300
-   13 |+age == JediOrder.YODA  # SIM300
-14 14 | 0 < (number - 100)  # SIM300
-15 15 | B<A[0][0]or B
-16 16 | B or(B)<A[0][0]
+10 | YODA == age  # SIM300
+11 | YODA > age  # SIM300
+12 | YODA >= age  # SIM300
+   - JediOrder.YODA == age  # SIM300
+13 + age == JediOrder.YODA  # SIM300
+14 | 0 < (number - 100)  # SIM300
+15 | B<A[0][0]or B
+16 | B or(B)<A[0][0]
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:14:1
@@ -272,16 +248,14 @@ SIM300 [*] Yoda condition detected
 16 | B or(B)<A[0][0]
    |
 help: Rewrite as `(number - 100) > 0`
-
-ℹ Safe fix
-11 11 | YODA > age  # SIM300
-12 12 | YODA >= age  # SIM300
-13 13 | JediOrder.YODA == age  # SIM300
-14    |-0 < (number - 100)  # SIM300
-   14 |+(number - 100) > 0  # SIM300
-15 15 | B<A[0][0]or B
-16 16 | B or(B)<A[0][0]
-17 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
+11 | YODA > age  # SIM300
+12 | YODA >= age  # SIM300
+13 | JediOrder.YODA == age  # SIM300
+   - 0 < (number - 100)  # SIM300
+14 + (number - 100) > 0  # SIM300
+15 | B<A[0][0]or B
+16 | B or(B)<A[0][0]
+17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:15:1
@@ -294,16 +268,14 @@ SIM300 [*] Yoda condition detected
 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
    |
 help: Rewrite as `A[0][0] > B`
-
-ℹ Safe fix
-12 12 | YODA >= age  # SIM300
-13 13 | JediOrder.YODA == age  # SIM300
-14 14 | 0 < (number - 100)  # SIM300
-15    |-B<A[0][0]or B
-   15 |+A[0][0] > B or B
-16 16 | B or(B)<A[0][0]
-17 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
-18 18 | 
+12 | YODA >= age  # SIM300
+13 | JediOrder.YODA == age  # SIM300
+14 | 0 < (number - 100)  # SIM300
+   - B<A[0][0]or B
+15 + A[0][0] > B or B
+16 | B or(B)<A[0][0]
+17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
+18 | 
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:16:5
@@ -315,16 +287,14 @@ SIM300 [*] Yoda condition detected
 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
    |
 help: Rewrite as `A[0][0] > (B)`
-
-ℹ Safe fix
-13 13 | JediOrder.YODA == age  # SIM300
-14 14 | 0 < (number - 100)  # SIM300
-15 15 | B<A[0][0]or B
-16    |-B or(B)<A[0][0]
-   16 |+B or A[0][0] > (B)
-17 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
-18 18 | 
-19 19 | # Errors in preview
+13 | JediOrder.YODA == age  # SIM300
+14 | 0 < (number - 100)  # SIM300
+15 | B<A[0][0]or B
+   - B or(B)<A[0][0]
+16 + B or A[0][0] > (B)
+17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
+18 | 
+19 | # Errors in preview
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:17:1
@@ -337,16 +307,14 @@ SIM300 [*] Yoda condition detected
 19 | # Errors in preview
    |
 help: Rewrite as `DummyHandler.CONFIG == {"non-empty-dict": "is-ok"}`
-
-ℹ Safe fix
-14 14 | 0 < (number - 100)  # SIM300
-15 15 | B<A[0][0]or B
-16 16 | B or(B)<A[0][0]
-17    |-{"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
-   17 |+DummyHandler.CONFIG == {"non-empty-dict": "is-ok"}
-18 18 | 
-19 19 | # Errors in preview
-20 20 | ['upper'] == UPPER_LIST
+14 | 0 < (number - 100)  # SIM300
+15 | B<A[0][0]or B
+16 | B or(B)<A[0][0]
+   - {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
+17 + DummyHandler.CONFIG == {"non-empty-dict": "is-ok"}
+18 | 
+19 | # Errors in preview
+20 | ['upper'] == UPPER_LIST
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:20:1
@@ -357,16 +325,14 @@ SIM300 [*] Yoda condition detected
 21 | {} == DummyHandler.CONFIG
    |
 help: Rewrite as `UPPER_LIST == ['upper']`
-
-ℹ Safe fix
-17 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
-18 18 | 
-19 19 | # Errors in preview
-20    |-['upper'] == UPPER_LIST
-   20 |+UPPER_LIST == ['upper']
-21 21 | {} == DummyHandler.CONFIG
-22 22 | 
-23 23 | # Errors in stable
+17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG
+18 | 
+19 | # Errors in preview
+   - ['upper'] == UPPER_LIST
+20 + UPPER_LIST == ['upper']
+21 | {} == DummyHandler.CONFIG
+22 | 
+23 | # Errors in stable
 
 SIM300 [*] Yoda condition detected
   --> SIM300.py:21:1
@@ -379,13 +345,11 @@ SIM300 [*] Yoda condition detected
 23 | # Errors in stable
    |
 help: Rewrite as `DummyHandler.CONFIG == {}`
-
-ℹ Safe fix
-18 18 | 
-19 19 | # Errors in preview
-20 20 | ['upper'] == UPPER_LIST
-21    |-{} == DummyHandler.CONFIG
-   21 |+DummyHandler.CONFIG == {}
-22 22 | 
-23 23 | # Errors in stable
-24 24 | UPPER_LIST == ['upper']
+18 | 
+19 | # Errors in preview
+20 | ['upper'] == UPPER_LIST
+   - {} == DummyHandler.CONFIG
+21 + DummyHandler.CONFIG == {}
+22 | 
+23 | # Errors in stable
+24 | UPPER_LIST == ['upper']
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap
index 36573493b8..e395a29c7e 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap
@@ -14,19 +14,18 @@ SIM401 [*] Use `var = a_dict.get(key, "default1")` instead of an `if` block
 13 |   # SIM401 (pattern-2)
    |
 help: Replace with `var = a_dict.get(key, "default1")`
-
-ℹ Unsafe fix
-5  5  | a_dict = {}
-6  6  | 
-7  7  | # SIM401 (pattern-1)
-8     |-if key in a_dict:
-9     |-    var = a_dict[key]
-10    |-else:
-11    |-    var = "default1"
-   8  |+var = a_dict.get(key, "default1")
-12 9  | 
-13 10 | # SIM401 (pattern-2)
-14 11 | if key not in a_dict:
+5  | a_dict = {}
+6  | 
+7  | # SIM401 (pattern-1)
+   - if key in a_dict:
+   -     var = a_dict[key]
+   - else:
+   -     var = "default1"
+8  + var = a_dict.get(key, "default1")
+9  | 
+10 | # SIM401 (pattern-2)
+11 | if key not in a_dict:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM401 [*] Use `var = a_dict.get(key, "default2")` instead of an `if` block
   --> SIM401.py:14:1
@@ -41,19 +40,18 @@ SIM401 [*] Use `var = a_dict.get(key, "default2")` instead of an `if` block
 19 |   # OK (default contains effect)
    |
 help: Replace with `var = a_dict.get(key, "default2")`
-
-ℹ Unsafe fix
-11 11 |     var = "default1"
-12 12 | 
-13 13 | # SIM401 (pattern-2)
-14    |-if key not in a_dict:
-15    |-    var = "default2"
-16    |-else:
-17    |-    var = a_dict[key]
-   14 |+var = a_dict.get(key, "default2")
-18 15 | 
-19 16 | # OK (default contains effect)
-20 17 | if key in a_dict:
+11 |     var = "default1"
+12 | 
+13 | # SIM401 (pattern-2)
+   - if key not in a_dict:
+   -     var = "default2"
+   - else:
+   -     var = a_dict[key]
+14 + var = a_dict.get(key, "default2")
+15 | 
+16 | # OK (default contains effect)
+17 | if key in a_dict:
+note: This is an unsafe fix and may change runtime behavior
 
 SIM401 [*] Use `var = a_dict.get(keys[idx], "default")` instead of an `if` block
   --> SIM401.py:26:1
@@ -68,19 +66,18 @@ SIM401 [*] Use `var = a_dict.get(keys[idx], "default")` instead of an `if` block
 31 |   dicts = {"key": a_dict}
    |
 help: Replace with `var = a_dict.get(keys[idx], "default")`
-
-ℹ Unsafe fix
-23 23 |     var = val1 + val2
-24 24 | 
-25 25 | # SIM401 (complex expression in key)
-26    |-if keys[idx] in a_dict:
-27    |-    var = a_dict[keys[idx]]
-28    |-else:
-29    |-    var = "default"
-   26 |+var = a_dict.get(keys[idx], "default")
-30 27 | 
-31 28 | dicts = {"key": a_dict}
-32 29 | 
+23 |     var = val1 + val2
+24 | 
+25 | # SIM401 (complex expression in key)
+   - if keys[idx] in a_dict:
+   -     var = a_dict[keys[idx]]
+   - else:
+   -     var = "default"
+26 + var = a_dict.get(keys[idx], "default")
+27 | 
+28 | dicts = {"key": a_dict}
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 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
   --> SIM401.py:40:1
@@ -95,19 +92,18 @@ SIM401 [*] Use `vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ67
 45 |   # SIM401
    |
 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")`
-
-ℹ Unsafe fix
-37 37 |     var = "default"
-38 38 | 
-39 39 | # SIM401 (complex expression in var)
-40    |-if key in a_dict:
-41    |-    vars[idx] = a_dict[key]
-42    |-else:
-43    |-    vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789"
-   40 |+vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")
-44 41 | 
-45 42 | # SIM401
-46 43 | if foo():
+37 |     var = "default"
+38 | 
+39 | # SIM401 (complex expression in var)
+   - 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"
+40 + vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")
+41 | 
+42 | # SIM401
+43 | if foo():
+note: This is an unsafe fix and may change runtime behavior
 
 SIM401 [*] Use `vars[idx] = a_dict.get(key, "default")` instead of an `if` block
   --> SIM401.py:49:5
@@ -123,19 +119,18 @@ SIM401 [*] Use `vars[idx] = a_dict.get(key, "default")` instead of an `if` block
 54 |   ###
    |
 help: Replace with `vars[idx] = a_dict.get(key, "default")`
-
-ℹ Unsafe fix
-46 46 | if foo():
-47 47 |     pass
-48 48 | else:
-49    |-    if key in a_dict:
-50    |-        vars[idx] = a_dict[key]
-51    |-    else:
-52    |-        vars[idx] = "default"
-   49 |+    vars[idx] = a_dict.get(key, "default")
-53 50 | 
-54 51 | ###
-55 52 | # Negative cases
+46 | if foo():
+47 |     pass
+48 | else:
+   -     if key in a_dict:
+   -         vars[idx] = a_dict[key]
+   -     else:
+   -         vars[idx] = "default"
+49 +     vars[idx] = a_dict.get(key, "default")
+50 | 
+51 | ###
+52 | # Negative cases
+note: This is an unsafe fix and may change runtime behavior
 
 SIM401 [*] Use `a_dict.get(key, "default3")` instead of an `if` block
    --> SIM401.py:149:7
@@ -147,16 +142,15 @@ SIM401 [*] Use `a_dict.get(key, "default3")` instead of an `if` block
 151 | # SIM401
     |
 help: Replace with `a_dict.get(key, "default3")`
-
-ℹ Unsafe fix
-146 146 | ###
-147 147 | 
-148 148 | # SIM401
-149     |-var = a_dict[key] if key in a_dict else "default3"
-    149 |+var = a_dict.get(key, "default3")
-150 150 | 
-151 151 | # SIM401
-152 152 | var = "default-1" if key not in a_dict else a_dict[key]
+146 | ###
+147 | 
+148 | # SIM401
+    - var = a_dict[key] if key in a_dict else "default3"
+149 + var = a_dict.get(key, "default3")
+150 | 
+151 | # SIM401
+152 | var = "default-1" if key not in a_dict else a_dict[key]
+note: This is an unsafe fix and may change runtime behavior
 
 SIM401 [*] Use `a_dict.get(key, "default-1")` instead of an `if` block
    --> SIM401.py:152:7
@@ -168,13 +162,12 @@ SIM401 [*] Use `a_dict.get(key, "default-1")` instead of an `if` block
 154 | # OK (default contains effect)
     |
 help: Replace with `a_dict.get(key, "default-1")`
-
-ℹ Unsafe fix
-149 149 | var = a_dict[key] if key in a_dict else "default3"
-150 150 | 
-151 151 | # SIM401
-152     |-var = "default-1" if key not in a_dict else a_dict[key]
-    152 |+var = a_dict.get(key, "default-1")
-153 153 | 
-154 154 | # OK (default contains effect)
-155 155 | var = a_dict[key] if key in a_dict else val1 + val2
+149 | var = a_dict[key] if key in a_dict else "default3"
+150 | 
+151 | # SIM401
+    - var = "default-1" if key not in a_dict else a_dict[key]
+152 + var = a_dict.get(key, "default-1")
+153 | 
+154 | # OK (default contains effect)
+155 | var = a_dict[key] if key in a_dict else val1 + val2
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap
index ed52d17a68..2cadf0ceb9 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap
@@ -15,20 +15,18 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 12 |   "a,b,c,d".split(",")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-3  3  | no_sep = None
-4  4  | 
-5  5  | # positives
-6     |-"""
-7     |-	itemA
-8     |-	itemB
-9     |-	itemC
-10    |-""".split()
-   6  |+["itemA", "itemB", "itemC"]
-11 7  | 
-12 8  | "a,b,c,d".split(",")
-13 9  | "a,b,c,d".split(None)
+3 | no_sep = None
+4 | 
+5 | # positives
+  - """
+  - 	itemA
+  - 	itemB
+  - 	itemC
+  - """.split()
+6 + ["itemA", "itemB", "itemC"]
+7 | 
+8 | "a,b,c,d".split(",")
+9 | "a,b,c,d".split(None)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:12:1
@@ -41,16 +39,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 14 | "a,b,c,d".split(",", 1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-9  9  | 	itemC
-10 10 | """.split()
-11 11 | 
-12    |-"a,b,c,d".split(",")
-   12 |+["a", "b", "c", "d"]
-13 13 | "a,b,c,d".split(None)
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
+9  | 	itemC
+10 | """.split()
+11 | 
+   - "a,b,c,d".split(",")
+12 + ["a", "b", "c", "d"]
+13 | "a,b,c,d".split(None)
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:13:1
@@ -62,16 +58,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 15 | "a,b,c,d".split(None, 1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-10 10 | """.split()
-11 11 | 
-12 12 | "a,b,c,d".split(",")
-13    |-"a,b,c,d".split(None)
-   13 |+["a,b,c,d"]
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
+10 | """.split()
+11 | 
+12 | "a,b,c,d".split(",")
+   - "a,b,c,d".split(None)
+13 + ["a,b,c,d"]
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:14:1
@@ -84,16 +78,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 16 | "a,b,c,d".split(sep=",")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-11 11 | 
-12 12 | "a,b,c,d".split(",")
-13 13 | "a,b,c,d".split(None)
-14    |-"a,b,c,d".split(",", 1)
-   14 |+["a", "b,c,d"]
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
-17 17 | "a,b,c,d".split(sep=None)
+11 | 
+12 | "a,b,c,d".split(",")
+13 | "a,b,c,d".split(None)
+   - "a,b,c,d".split(",", 1)
+14 + ["a", "b,c,d"]
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
+17 | "a,b,c,d".split(sep=None)
 
 SIM905 Consider using a list literal instead of `str.split`
   --> SIM905.py:15:1
@@ -118,16 +110,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 18 | "a,b,c,d".split(sep=",", maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-13 13 | "a,b,c,d".split(None)
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
-16    |-"a,b,c,d".split(sep=",")
-   16 |+["a", "b", "c", "d"]
-17 17 | "a,b,c,d".split(sep=None)
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
+13 | "a,b,c,d".split(None)
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
+   - "a,b,c,d".split(sep=",")
+16 + ["a", "b", "c", "d"]
+17 | "a,b,c,d".split(sep=None)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:17:1
@@ -140,16 +130,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 19 | "a,b,c,d".split(sep=None, maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
-17    |-"a,b,c,d".split(sep=None)
-   17 |+["a,b,c,d"]
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
+   - "a,b,c,d".split(sep=None)
+17 + ["a,b,c,d"]
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:18:1
@@ -162,16 +150,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 20 | "a,b,c,d".split(maxsplit=1, sep=",")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
-17 17 | "a,b,c,d".split(sep=None)
-18    |-"a,b,c,d".split(sep=",", maxsplit=1)
-   18 |+["a", "b,c,d"]
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
+17 | "a,b,c,d".split(sep=None)
+   - "a,b,c,d".split(sep=",", maxsplit=1)
+18 + ["a", "b,c,d"]
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
 
 SIM905 Consider using a list literal instead of `str.split`
   --> SIM905.py:19:1
@@ -196,16 +182,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 22 | "a,b,c,d".split(",", maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-17 17 | "a,b,c,d".split(sep=None)
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20    |-"a,b,c,d".split(maxsplit=1, sep=",")
-   20 |+["a", "b,c,d"]
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22 22 | "a,b,c,d".split(",", maxsplit=1)
-23 23 | "a,b,c,d".split(None, maxsplit=1)
+17 | "a,b,c,d".split(sep=None)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+   - "a,b,c,d".split(maxsplit=1, sep=",")
+20 + ["a", "b,c,d"]
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+22 | "a,b,c,d".split(",", maxsplit=1)
+23 | "a,b,c,d".split(None, maxsplit=1)
 
 SIM905 Consider using a list literal instead of `str.split`
   --> SIM905.py:21:1
@@ -230,16 +214,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 24 | "a,b,c,d".split(maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22    |-"a,b,c,d".split(",", maxsplit=1)
-   22 |+["a", "b,c,d"]
-23 23 | "a,b,c,d".split(None, maxsplit=1)
-24 24 | "a,b,c,d".split(maxsplit=1)
-25 25 | "a,b,c,d".split(maxsplit=1.0)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+   - "a,b,c,d".split(",", maxsplit=1)
+22 + ["a", "b,c,d"]
+23 | "a,b,c,d".split(None, maxsplit=1)
+24 | "a,b,c,d".split(maxsplit=1)
+25 | "a,b,c,d".split(maxsplit=1.0)
 
 SIM905 Consider using a list literal instead of `str.split`
   --> SIM905.py:23:1
@@ -288,16 +270,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 29 | '   1   2   3   '.split()
    |
 help: Replace with list literal
-
-ℹ Safe fix
-24 24 | "a,b,c,d".split(maxsplit=1)
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26 26 | "a,b,c,d".split(maxsplit=1)
-27    |-"a,b,c,d".split(maxsplit=0)
-   27 |+["a,b,c,d"]
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29 29 | '   1   2   3   '.split()
-30 30 | '1<>2<>3<4'.split('<>')
+24 | "a,b,c,d".split(maxsplit=1)
+25 | "a,b,c,d".split(maxsplit=1.0)
+26 | "a,b,c,d".split(maxsplit=1)
+   - "a,b,c,d".split(maxsplit=0)
+27 + ["a,b,c,d"]
+28 | "VERB AUX PRON ADP DET".split(" ")
+29 | '   1   2   3   '.split()
+30 | '1<>2<>3<4'.split('<>')
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:28:1
@@ -310,16 +290,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 30 | '1<>2<>3<4'.split('<>')
    |
 help: Replace with list literal
-
-ℹ Safe fix
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26 26 | "a,b,c,d".split(maxsplit=1)
-27 27 | "a,b,c,d".split(maxsplit=0)
-28    |-"VERB AUX PRON ADP DET".split(" ")
-   28 |+["VERB", "AUX", "PRON", "ADP", "DET"]
-29 29 | '   1   2   3   '.split()
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
+25 | "a,b,c,d".split(maxsplit=1.0)
+26 | "a,b,c,d".split(maxsplit=1)
+27 | "a,b,c,d".split(maxsplit=0)
+   - "VERB AUX PRON ADP DET".split(" ")
+28 + ["VERB", "AUX", "PRON", "ADP", "DET"]
+29 | '   1   2   3   '.split()
+30 | '1<>2<>3<4'.split('<>')
+31 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:29:1
@@ -331,16 +309,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 30 | '1<>2<>3<4'.split('<>')
    |
 help: Replace with list literal
-
-ℹ Safe fix
-26 26 | "a,b,c,d".split(maxsplit=1)
-27 27 | "a,b,c,d".split(maxsplit=0)
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29    |-'   1   2   3   '.split()
-   29 |+['1', '2', '3']
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+26 | "a,b,c,d".split(maxsplit=1)
+27 | "a,b,c,d".split(maxsplit=0)
+28 | "VERB AUX PRON ADP DET".split(" ")
+   - '   1   2   3   '.split()
+29 + ['1', '2', '3']
+30 | '1<>2<>3<4'.split('<>')
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:30:1
@@ -353,16 +329,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-27 27 | "a,b,c,d".split(maxsplit=0)
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29 29 | '   1   2   3   '.split()
-30    |-'1<>2<>3<4'.split('<>')
-   30 |+['1', '2', '3<4']
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-33 33 | "".split()  # []
+27 | "a,b,c,d".split(maxsplit=0)
+28 | "VERB AUX PRON ADP DET".split(" ")
+29 | '   1   2   3   '.split()
+   - '1<>2<>3<4'.split('<>')
+30 + ['1', '2', '3<4']
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+33 | "".split()  # []
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:32:1
@@ -375,16 +349,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 34 | """
    |
 help: Replace with list literal
-
-ℹ Safe fix
-29 29 | '   1   2   3   '.split()
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
-32    |-" a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-   32 |+[" a", "a a", "a a "]  # [" a", "a a", "a a "]
-33 33 | "".split()  # []
-34 34 | """
-35 35 | """.split()  # []
+29 | '   1   2   3   '.split()
+30 | '1<>2<>3<4'.split('<>')
+31 | 
+   - " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+32 + [" a", "a a", "a a "]  # [" a", "a a", "a a "]
+33 | "".split()  # []
+34 | """
+35 | """.split()  # []
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:33:1
@@ -396,16 +368,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 35 | """.split()  # []
    |
 help: Replace with list literal
-
-ℹ Safe fix
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-33    |-"".split()  # []
-   33 |+[]  # []
-34 34 | """
-35 35 | """.split()  # []
-36 36 | "   	".split()  # []
+30 | '1<>2<>3<4'.split('<>')
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+   - "".split()  # []
+33 + []  # []
+34 | """
+35 | """.split()  # []
+36 | "   	".split()  # []
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:34:1
@@ -419,17 +389,15 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 37 |   "/abc/".split() # ["/abc/"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-33 33 | "".split()  # []
-34    |-"""
-35    |-""".split()  # []
-   34 |+[]  # []
-36 35 | "   	".split()  # []
-37 36 | "/abc/".split() # ["/abc/"]
-38 37 | ("a,b,c"
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+33 | "".split()  # []
+   - """
+   - """.split()  # []
+34 + []  # []
+35 | "   	".split()  # []
+36 | "/abc/".split() # ["/abc/"]
+37 | ("a,b,c"
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:36:1
@@ -442,16 +410,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 38 | ("a,b,c"
    |
 help: Replace with list literal
-
-ℹ Safe fix
-33 33 | "".split()  # []
-34 34 | """
-35 35 | """.split()  # []
-36    |-"   	".split()  # []
-   36 |+[]  # []
-37 37 | "/abc/".split() # ["/abc/"]
-38 38 | ("a,b,c"
-39 39 | # comment
+33 | "".split()  # []
+34 | """
+35 | """.split()  # []
+   - "   	".split()  # []
+36 + []  # []
+37 | "/abc/".split() # ["/abc/"]
+38 | ("a,b,c"
+39 | # comment
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:37:1
@@ -464,16 +430,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 39 | # comment
    |
 help: Replace with list literal
-
-ℹ Safe fix
-34 34 | """
-35 35 | """.split()  # []
-36 36 | "   	".split()  # []
-37    |-"/abc/".split() # ["/abc/"]
-   37 |+["/abc/"] # ["/abc/"]
-38 38 | ("a,b,c"
-39 39 | # comment
-40 40 | .split()
+34 | """
+35 | """.split()  # []
+36 | "   	".split()  # []
+   - "/abc/".split() # ["/abc/"]
+37 + ["/abc/"] # ["/abc/"]
+38 | ("a,b,c"
+39 | # comment
+40 | .split()
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:38:2
@@ -489,18 +453,17 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 42 |   ("a,b,c"
    |
 help: Replace with list literal
-
-ℹ Unsafe fix
-35 35 | """.split()  # []
-36 36 | "   	".split()  # []
-37 37 | "/abc/".split() # ["/abc/"]
-38    |-("a,b,c"
-39    |-# comment
-40    |-.split()
-   38 |+(["a,b,c"]
-41 39 | )  # ["a,b,c"]
-42 40 | ("a,b,c"
-43 41 | # comment1
+35 | """.split()  # []
+36 | "   	".split()  # []
+37 | "/abc/".split() # ["/abc/"]
+   - ("a,b,c"
+   - # comment
+   - .split()
+38 + (["a,b,c"]
+39 | )  # ["a,b,c"]
+40 | ("a,b,c"
+41 | # comment1
+note: This is an unsafe fix and may change runtime behavior
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:42:2
@@ -516,18 +479,17 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 46 |   ("a,"
    |
 help: Replace with list literal
-
-ℹ Unsafe fix
-39 39 | # comment
-40 40 | .split()
-41 41 | )  # ["a,b,c"]
-42    |-("a,b,c"
-43    |-# comment1
-44    |-.split(",")
-   42 |+(["a", "b", "c"]
-45 43 | ) # ["a", "b", "c"]
-46 44 | ("a,"
-47 45 | # comment
+39 | # comment
+40 | .split()
+41 | )  # ["a,b,c"]
+   - ("a,b,c"
+   - # comment1
+   - .split(",")
+42 + (["a", "b", "c"]
+43 | ) # ["a", "b", "c"]
+44 | ("a,"
+45 | # comment
+note: This is an unsafe fix and may change runtime behavior
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:46:2
@@ -544,20 +506,19 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 51 |   ) # ["a", "b", "c"]
    |
 help: Replace with list literal
-
-ℹ Unsafe fix
-43 43 | # comment1
-44 44 | .split(",")
-45 45 | ) # ["a", "b", "c"]
-46    |-("a,"
-47    |-# comment
-48    |-"b,"
-49    |-"c"
-50    |-.split(",")
-   46 |+(["a", "b", "c"]
-51 47 | ) # ["a", "b", "c"]
-52 48 | 
-53 49 | "hello "\
+43 | # comment1
+44 | .split(",")
+45 | ) # ["a", "b", "c"]
+   - ("a,"
+   - # comment
+   - "b,"
+   - "c"
+   - .split(",")
+46 + (["a", "b", "c"]
+47 | ) # ["a", "b", "c"]
+48 | 
+49 | "hello "\
+note: This is an unsafe fix and may change runtime behavior
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:53:1
@@ -570,17 +531,15 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 55 |   # ["hello", "world"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-50 50 | .split(",")
-51 51 | ) # ["a", "b", "c"]
-52 52 | 
-53    |-"hello "\
-54    |-	"world".split()
-   53 |+["hello", "world"]
-55 54 | # ["hello", "world"]
-56 55 | 
-57 56 | # prefixes and isc
+50 | .split(",")
+51 | ) # ["a", "b", "c"]
+52 | 
+   - "hello "\
+   - 	"world".split()
+53 + ["hello", "world"]
+54 | # ["hello", "world"]
+55 | 
+56 | # prefixes and isc
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:58:1
@@ -592,16 +551,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 60 | ("a " "b").split()  # ["a", "b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-55 55 | # ["hello", "world"]
-56 56 | 
-57 57 | # prefixes and isc
-58    |-u"a b".split()  # [u"a", u"b"]
-   58 |+[u"a", u"b"]  # [u"a", u"b"]
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
+55 | # ["hello", "world"]
+56 | 
+57 | # prefixes and isc
+   - u"a b".split()  # [u"a", u"b"]
+58 + [u"a", u"b"]  # [u"a", u"b"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:59:1
@@ -614,16 +571,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 61 | "a " "b".split()  # ["a", "b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-56 56 | 
-57 57 | # prefixes and isc
-58 58 | u"a b".split()  # [u"a", u"b"]
-59    |-r"a \n b".split()  # [r"a", r"\n", r"b"]
-   59 |+[r"a", r"\n", r"b"]  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
+56 | 
+57 | # prefixes and isc
+58 | u"a b".split()  # [u"a", u"b"]
+   - r"a \n b".split()  # [r"a", r"\n", r"b"]
+59 + [r"a", r"\n", r"b"]  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:60:1
@@ -636,16 +591,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 62 | u"a " "b".split()  # [u"a", u"b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-57 57 | # prefixes and isc
-58 58 | u"a b".split()  # [u"a", u"b"]
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60    |-("a " "b").split()  # ["a", "b"]
-   60 |+["a", "b"]  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
+57 | # prefixes and isc
+58 | u"a b".split()  # [u"a", u"b"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+   - ("a " "b").split()  # ["a", "b"]
+60 + ["a", "b"]  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:61:1
@@ -658,16 +611,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 63 | "a " u"b".split()  # ["a", "b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-58 58 | u"a b".split()  # [u"a", u"b"]
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61    |-"a " "b".split()  # ["a", "b"]
-   61 |+["a", "b"]  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+58 | u"a b".split()  # [u"a", u"b"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+   - "a " "b".split()  # ["a", "b"]
+61 + ["a", "b"]  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:62:1
@@ -680,16 +631,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62    |-u"a " "b".split()  # [u"a", u"b"]
-   62 |+[u"a", u"b"]  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+   - u"a " "b".split()  # [u"a", u"b"]
+62 + [u"a", u"b"]  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:63:1
@@ -702,16 +651,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 65 | r"\n " u"\n".split()  # [r"\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63    |-"a " u"b".split()  # ["a", "b"]
-   63 |+["a", "b"]  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+   - "a " u"b".split()  # ["a", "b"]
+63 + ["a", "b"]  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:64:1
@@ -724,16 +671,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 66 | r"\n " "\n".split()  # [r"\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64    |-u"a " r"\n".split()  # [u"a", u"\\n"]
-   64 |+[u"a", u"\\n"]  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+   - u"a " r"\n".split()  # [u"a", u"\\n"]
+64 + [u"a", u"\\n"]  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:65:1
@@ -746,16 +691,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 67 | "a " r"\n".split()  # ["a", "\\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65    |-r"\n " u"\n".split()  # [r"\n"]
-   65 |+[r"\n"]  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+   - r"\n " u"\n".split()  # [r"\n"]
+65 + [r"\n"]  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:66:1
@@ -767,16 +710,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 67 | "a " r"\n".split()  # ["a", "\\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66    |-r"\n " "\n".split()  # [r"\n"]
-   66 |+[r"\n"]  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+   - r"\n " "\n".split()  # [r"\n"]
+66 + [r"\n"]  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:67:1
@@ -789,16 +730,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67    |-"a " r"\n".split()  # ["a", "\\n"]
-   67 |+["a", "\\n"]  # ["a", "\\n"]
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
+   - "a " r"\n".split()  # ["a", "\\n"]
+67 + ["a", "\\n"]  # ["a", "\\n"]
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:69:1
@@ -811,16 +750,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
-69    |-"a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-   69 |+["a,b,c"] # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-71 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-72 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+66 | r"\n " "\n".split()  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
+   - "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+69 + ["a,b,c"] # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:70:1
@@ -832,16 +769,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70    |-"a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-   70 |+["a", "b", "c"]  # ["a", "b", "c"]
-71 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-72 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
-73 73 | 
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+   - "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+70 + ["a", "b", "c"]  # ["a", "b", "c"]
+71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+73 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:71:1
@@ -853,16 +788,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-71    |-"a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-   71 |+["a", "b", "c"]  # ["a", "b", "c"]
-72 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
-73 73 | 
-74 74 | # negatives
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+   - "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+71 + ["a", "b", "c"]  # ["a", "b", "c"]
+72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+73 | 
+74 | # negatives
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:72:1
@@ -875,16 +808,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 74 | # negatives
    |
 help: Replace with list literal
-
-ℹ Safe fix
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-71 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-72    |-"a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
-   72 |+["a,b,c"]  # ["a,b,c"]
-73 73 | 
-74 74 | # negatives
-75 75 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+   - "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+72 + ["a,b,c"]  # ["a,b,c"]
+73 | 
+74 | # negatives
+75 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:103:1
@@ -901,23 +832,21 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 110 |   # https://github.com/astral-sh/ruff/issues/18042
     |
 help: Replace with list literal
+100 | 
+101 | 
+102 | # another positive demonstrating quote preservation
+    - """
+    - "itemA"
+    - 'itemB'
+    - '''itemC'''
+    - "'itemD'"
+    - """.split()
+103 + ['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""]
+104 | 
+105 | # https://github.com/astral-sh/ruff/issues/18042
+106 | print("a,b".rsplit(","))
 
-ℹ Safe fix
-100 100 | 
-101 101 | 
-102 102 | # another positive demonstrating quote preservation
-103     |-"""
-104     |-"itemA"
-105     |-'itemB'
-106     |-'''itemC'''
-107     |-"'itemD'"
-108     |-""".split()
-    103 |+['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""]
-109 104 | 
-110 105 | # https://github.com/astral-sh/ruff/issues/18042
-111 106 | print("a,b".rsplit(","))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:111:7
     |
 110 | # https://github.com/astral-sh/ruff/issues/18042
@@ -926,18 +855,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 112 | print("a,b,c".rsplit(",", 1))
     |
 help: Replace with list literal
+108 | """.split()
+109 | 
+110 | # https://github.com/astral-sh/ruff/issues/18042
+    - print("a,b".rsplit(","))
+111 + print(["a", "b"])
+112 | print("a,b,c".rsplit(",", 1))
+113 | 
+114 | # https://github.com/astral-sh/ruff/issues/18069
 
-ℹ Safe fix
-108 108 | """.split()
-109 109 | 
-110 110 | # https://github.com/astral-sh/ruff/issues/18042
-111     |-print("a,b".rsplit(","))
-    111 |+print(["a", "b"])
-112 112 | print("a,b,c".rsplit(",", 1))
-113 113 | 
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:112:7
     |
 110 | # https://github.com/astral-sh/ruff/issues/18042
@@ -948,16 +875,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 114 | # https://github.com/astral-sh/ruff/issues/18069
     |
 help: Replace with list literal
-
-ℹ Safe fix
-109 109 | 
-110 110 | # https://github.com/astral-sh/ruff/issues/18042
-111 111 | print("a,b".rsplit(","))
-112     |-print("a,b,c".rsplit(",", 1))
-    112 |+print(["a,b", "c"])
-113 113 | 
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-115 115 | 
+109 | 
+110 | # https://github.com/astral-sh/ruff/issues/18042
+111 | print("a,b".rsplit(","))
+    - print("a,b,c".rsplit(",", 1))
+112 + print(["a,b", "c"])
+113 | 
+114 | # https://github.com/astral-sh/ruff/issues/18069
+115 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:116:7
@@ -970,16 +895,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 118 | print(" ".split(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-113 113 | 
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-115 115 | 
-116     |-print("".split(maxsplit=0))
-    116 |+print([])
-117 117 | print("".split(sep=None, maxsplit=0))
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
+113 | 
+114 | # https://github.com/astral-sh/ruff/issues/18069
+115 | 
+    - print("".split(maxsplit=0))
+116 + print([])
+117 | print("".split(sep=None, maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:117:7
@@ -991,16 +914,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 119 | print(" ".split(sep=None, maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-115 115 | 
-116 116 | print("".split(maxsplit=0))
-117     |-print("".split(sep=None, maxsplit=0))
-    117 |+print([])
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
+114 | # https://github.com/astral-sh/ruff/issues/18069
+115 | 
+116 | print("".split(maxsplit=0))
+    - print("".split(sep=None, maxsplit=0))
+117 + print([])
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:118:7
@@ -1013,16 +934,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 120 | print(" x ".split(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-115 115 | 
-116 116 | print("".split(maxsplit=0))
-117 117 | print("".split(sep=None, maxsplit=0))
-118     |-print(" ".split(maxsplit=0))
-    118 |+print([])
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
+115 | 
+116 | print("".split(maxsplit=0))
+117 | print("".split(sep=None, maxsplit=0))
+    - print(" ".split(maxsplit=0))
+118 + print([])
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:119:7
@@ -1035,16 +954,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 121 | print(" x ".split(sep=None, maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-116 116 | print("".split(maxsplit=0))
-117 117 | print("".split(sep=None, maxsplit=0))
-118 118 | print(" ".split(maxsplit=0))
-119     |-print(" ".split(sep=None, maxsplit=0))
-    119 |+print([])
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
+116 | print("".split(maxsplit=0))
+117 | print("".split(sep=None, maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+    - print(" ".split(sep=None, maxsplit=0))
+119 + print([])
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:120:7
@@ -1057,16 +974,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 122 | print("  x  ".split(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-117 117 | print("".split(sep=None, maxsplit=0))
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120     |-print(" x ".split(maxsplit=0))
-    120 |+print(["x "])
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
+117 | print("".split(sep=None, maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+    - print(" x ".split(maxsplit=0))
+120 + print(["x "])
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:121:7
@@ -1079,16 +994,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 123 | print("  x  ".split(sep=None, maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
-121     |-print(" x ".split(sep=None, maxsplit=0))
-    121 |+print(["x "])
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
+    - print(" x ".split(sep=None, maxsplit=0))
+121 + print(["x "])
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:122:7
@@ -1101,16 +1014,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 124 | print("".rsplit(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122     |-print("  x  ".split(maxsplit=0))
-    122 |+print(["x  "])
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
+    - print("  x  ".split(maxsplit=0))
+122 + print(["x  "])
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:123:7
@@ -1123,18 +1034,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 125 | print("".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
+    - print("  x  ".split(sep=None, maxsplit=0))
+123 + print(["x  "])
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
-123     |-print("  x  ".split(sep=None, maxsplit=0))
-    123 |+print(["x  "])
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:124:7
     |
 122 | print("  x  ".split(maxsplit=0))
@@ -1145,18 +1054,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 126 | print(" ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
+    - print("".rsplit(maxsplit=0))
+124 + print([])
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
 
-ℹ Safe fix
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124     |-print("".rsplit(maxsplit=0))
-    124 |+print([])
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:125:7
     |
 123 | print("  x  ".split(sep=None, maxsplit=0))
@@ -1167,18 +1074,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 127 | print(" ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
+    - print("".rsplit(sep=None, maxsplit=0))
+125 + print([])
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
-125     |-print("".rsplit(sep=None, maxsplit=0))
-    125 |+print([])
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:126:7
     |
 124 | print("".rsplit(maxsplit=0))
@@ -1189,18 +1094,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 128 | print(" x ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
+    - print(" ".rsplit(maxsplit=0))
+126 + print([])
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126     |-print(" ".rsplit(maxsplit=0))
-    126 |+print([])
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:127:7
     |
 125 | print("".rsplit(sep=None, maxsplit=0))
@@ -1211,18 +1114,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 129 | print(" x ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
+    - print(" ".rsplit(sep=None, maxsplit=0))
+127 + print([])
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
 
-ℹ Safe fix
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-127     |-print(" ".rsplit(sep=None, maxsplit=0))
-    127 |+print([])
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:128:7
     |
 126 | print(" ".rsplit(maxsplit=0))
@@ -1233,18 +1134,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 130 | print(" x ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+    - print(" x ".rsplit(maxsplit=0))
+128 + print([" x"])
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+131 | print("  x  ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128     |-print(" x ".rsplit(maxsplit=0))
-    128 |+print([" x"])
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131 131 | print("  x  ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:129:7
     |
 127 | print(" ".rsplit(sep=None, maxsplit=0))
@@ -1255,18 +1154,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 131 | print("  x  ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
+    - print(" x ".rsplit(maxsplit=0))
+129 + print([" x"])
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+131 | print("  x  ".rsplit(maxsplit=0))
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
 
-ℹ Safe fix
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-129     |-print(" x ".rsplit(maxsplit=0))
-    129 |+print([" x"])
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131 131 | print("  x  ".rsplit(maxsplit=0))
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:130:7
     |
 128 | print(" x ".rsplit(maxsplit=0))
@@ -1277,18 +1174,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
+    - print(" x ".rsplit(sep=None, maxsplit=0))
+130 + print([" x"])
+131 | print("  x  ".rsplit(maxsplit=0))
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
+133 | 
 
-ℹ Safe fix
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-130     |-print(" x ".rsplit(sep=None, maxsplit=0))
-    130 |+print([" x"])
-131 131 | print("  x  ".rsplit(maxsplit=0))
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-133 133 | 
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:131:7
     |
 129 | print(" x ".rsplit(maxsplit=0))
@@ -1298,18 +1193,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+    - print("  x  ".rsplit(maxsplit=0))
+131 + print(["  x"])
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
+133 | 
+134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
 
-ℹ Safe fix
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131     |-print("  x  ".rsplit(maxsplit=0))
-    131 |+print(["  x"])
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-133 133 | 
-134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:132:7
     |
 130 | print(" x ".rsplit(sep=None, maxsplit=0))
@@ -1320,16 +1213,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
     |
 help: Replace with list literal
-
-ℹ Safe fix
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131 131 | print("  x  ".rsplit(maxsplit=0))
-132     |-print("  x  ".rsplit(sep=None, maxsplit=0))
-    132 |+print(["  x"])
-133 133 | 
-134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-135 135 | r"""simple@example.com
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+131 | print("  x  ".rsplit(maxsplit=0))
+    - print("  x  ".rsplit(sep=None, maxsplit=0))
+132 + print(["  x"])
+133 | 
+134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
+135 | r"""simple@example.com
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:135:1
@@ -1361,38 +1252,36 @@ SIM905 [*] Consider using a list literal instead of `str.split`
     | |_______________________________________^
     |
 help: Replace with list literal
-
-ℹ Safe fix
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-133 133 | 
-134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-135     |-r"""simple@example.com
-136     |-very.common@example.com
-137     |-FirstName.LastName@EasierReading.org
-138     |-x@example.com
-139     |-long.email-address-with-hyphens@and.subdomains.example.com
-140     |-user.name+tag+sorting@example.com
-141     |-name/surname@example.com
-142     |-xample@s.example
-143     |-" "@example.org
-144     |-"john..doe"@example.org
-145     |-mailhost!username@example.org
-146     |-"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com
-147     |-user%example.com@example.org
-148     |-user-@example.org
-149     |-I❤️CHOCOLATE@example.com
-150     |-this\ still\"not\\allowed@example.com
-151     |-stellyamburrr985@example.com
-152     |-Abc.123@example.com
-153     |-user+mailbox/department=shipping@example.com
-154     |-!#$%&'*+-/=?^_`.{|}~@example.com
-155     |-"Abc@def"@example.com
-156     |-"Fred\ Bloggs"@example.com
-157     |-"Joe.\\Blow"@example.com""".split("\n")
-    135 |+[r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com']
-158 136 | 
-159 137 | 
-160 138 | r"""first
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
+133 | 
+134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
+    - r"""simple@example.com
+    - very.common@example.com
+    - FirstName.LastName@EasierReading.org
+    - x@example.com
+    - long.email-address-with-hyphens@and.subdomains.example.com
+    - user.name+tag+sorting@example.com
+    - name/surname@example.com
+    - xample@s.example
+    - " "@example.org
+    - "john..doe"@example.org
+    - mailhost!username@example.org
+    - "very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com
+    - user%example.com@example.org
+    - user-@example.org
+    - I❤️CHOCOLATE@example.com
+    - this\ still\"not\\allowed@example.com
+    - stellyamburrr985@example.com
+    - Abc.123@example.com
+    - user+mailbox/department=shipping@example.com
+    - !#$%&'*+-/=?^_`.{|}~@example.com
+    - "Abc@def"@example.com
+    - "Fred\ Bloggs"@example.com
+    - "Joe.\\Blow"@example.com""".split("\n")
+135 + [r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com']
+136 | 
+137 | 
+138 | r"""first
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:160:1
@@ -1406,19 +1295,17 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 165 |   # https://github.com/astral-sh/ruff/issues/19845
     |
 help: Replace with list literal
-
-ℹ Safe fix
-157 157 | "Joe.\\Blow"@example.com""".split("\n")
-158 158 | 
-159 159 | 
-160     |-r"""first
-161     |-'no need' to escape
-162     |-"swap" quote style
-163     |-"use' ugly triple quotes""".split("\n")
-    160 |+[r"first", r"'no need' to escape", r'"swap" quote style', '"use\' ugly triple quotes']
-164 161 | 
-165 162 | # https://github.com/astral-sh/ruff/issues/19845
-166 163 | print("S\x1cP\x1dL\x1eI\x1fT".split())
+157 | "Joe.\\Blow"@example.com""".split("\n")
+158 | 
+159 | 
+    - r"""first
+    - 'no need' to escape
+    - "swap" quote style
+    - "use' ugly triple quotes""".split("\n")
+160 + [r"first", r"'no need' to escape", r'"swap" quote style', r""""use' ugly triple quotes"""]
+161 | 
+162 | # https://github.com/astral-sh/ruff/issues/19845
+163 | print("S\x1cP\x1dL\x1eI\x1fT".split())
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:166:7
@@ -1430,16 +1317,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-163 163 | "use' ugly triple quotes""".split("\n")
-164 164 | 
-165 165 | # https://github.com/astral-sh/ruff/issues/19845
-166     |-print("S\x1cP\x1dL\x1eI\x1fT".split())
-    166 |+print(["S", "P", "L", "I", "T"])
-167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-169 169 | 
+163 | "use' ugly triple quotes""".split("\n")
+164 | 
+165 | # https://github.com/astral-sh/ruff/issues/19845
+    - print("S\x1cP\x1dL\x1eI\x1fT".split())
+166 + print(["S", "P", "L", "I", "T"])
+167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
+168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+169 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:167:7
@@ -1451,18 +1336,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+164 | 
+165 | # https://github.com/astral-sh/ruff/issues/19845
+166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
+    - print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
+167 + print([">"])
+168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+169 | 
+170 | # leading/trailing whitespace should not count towards maxsplit
 
-ℹ Safe fix
-164 164 | 
-165 165 | # https://github.com/astral-sh/ruff/issues/19845
-166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
-167     |-print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-    167 |+print([">"])
-168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-169 169 | 
-170 170 | # leading/trailing whitespace should not count towards maxsplit
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:168:7
     |
 166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
@@ -1473,16 +1356,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 170 | # leading/trailing whitespace should not count towards maxsplit
     |
 help: Replace with list literal
-
-ℹ Safe fix
-165 165 | # https://github.com/astral-sh/ruff/issues/19845
-166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
-167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-168     |-print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-    168 |+print(["<"])
-169 169 | 
-170 170 | # leading/trailing whitespace should not count towards maxsplit
-171 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+165 | # https://github.com/astral-sh/ruff/issues/19845
+166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
+167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
+    - print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+168 + print(["<"])
+169 | 
+170 | # leading/trailing whitespace should not count towards maxsplit
+171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
 
 SIM905 Consider using a list literal instead of `str.split`
    --> SIM905.py:171:1
@@ -1491,98 +1372,27 @@ SIM905 Consider using a list literal instead of `str.split`
 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
     |
 help: Replace with list literal
 
-SIM905 Consider using a list literal instead of `str.split`
+SIM905 Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:172:1
     |
 170 | # leading/trailing whitespace should not count towards maxsplit
 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-173 |
-174 | # https://github.com/astral-sh/ruff/issues/19610
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
     |
 help: Replace with list literal
 
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:175:1
+SIM905 Consider using a list literal instead of `str.split`
+   --> SIM905.py:173:1
     |
-174 | # https://github.com/astral-sh/ruff/issues/19610
-175 | r"1" "\n".split("1")  # [r"", "\n"]
-    | ^^^^^^^^^^^^^^^^^^^^
-176 | r"" "\"".split("1")  # ['"']
-177 | r"1" """
-    |
-help: Replace with list literal
-
-ℹ Safe fix
-172 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
-173 173 | 
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175     |-r"1" "\n".split("1")  # [r"", "\n"]
-    175 |+[r"", '\n']  # [r"", "\n"]
-176 176 | r"" "\"".split("1")  # ['"']
-177 177 | r"1" """
-178 178 | """.split("1")  # [r"", "\n"]
-
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:176:1
-    |
-174 | # https://github.com/astral-sh/ruff/issues/19610
-175 | r"1" "\n".split("1")  # [r"", "\n"]
-176 | r"" "\"".split("1")  # ['"']
-    | ^^^^^^^^^^^^^^^^^^^
-177 | r"1" """
-178 | """.split("1")  # [r"", "\n"]
-    |
-help: Replace with list literal
-
-ℹ Safe fix
-173 173 | 
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175 175 | r"1" "\n".split("1")  # [r"", "\n"]
-176     |-r"" "\"".split("1")  # ['"']
-    176 |+[r'"']  # ['"']
-177 177 | r"1" """
-178 178 | """.split("1")  # [r"", "\n"]
-179 179 | r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:177:1
-    |
-175 |   r"1" "\n".split("1")  # [r"", "\n"]
-176 |   r"" "\"".split("1")  # ['"']
-177 | / r"1" """
-178 | | """.split("1")  # [r"", "\n"]
-    | |______________^
-179 |   r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-    |
-help: Replace with list literal
-
-ℹ Safe fix
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175 175 | r"1" "\n".split("1")  # [r"", "\n"]
-176 176 | r"" "\"".split("1")  # ['"']
-177     |-r"1" """
-178     |-""".split("1")  # [r"", "\n"]
-    177 |+[r"", '\n']  # [r"", "\n"]
-179 178 | r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:179:1
-    |
-177 | r"1" """
-178 | """.split("1")  # [r"", "\n"]
-179 | r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
+171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
     | ^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace with list literal
-
-ℹ Safe fix
-176 176 | r"" "\"".split("1")  # ['"']
-177 177 | r"1" """
-178 178 | """.split("1")  # [r"", "\n"]
-179     |-r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-    179 |+['\\n\n\'"']  # ["\\n\n'\""]
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap
index 4840899e7c..49b1b6a953 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap
@@ -11,14 +11,12 @@ SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
 4 | # SIM910
   |
 help: Replace `{}.get(key, None)` with `{}.get(key)`
-
-ℹ Safe fix
-1 1 | # SIM910
-2   |-{}.get(key, None)
-  2 |+{}.get(key)
-3 3 | 
-4 4 | # SIM910
-5 5 | {}.get("key", None)
+1 | # SIM910
+  - {}.get(key, None)
+2 + {}.get(key)
+3 | 
+4 | # SIM910
+5 | {}.get("key", None)
 
 SIM910 [*] Use `{}.get("key")` instead of `{}.get("key", None)`
  --> SIM910.py:5:1
@@ -30,16 +28,14 @@ SIM910 [*] Use `{}.get("key")` instead of `{}.get("key", None)`
 7 | # OK
   |
 help: Replace `{}.get("key", None)` with `{}.get("key")`
-
-ℹ Safe fix
-2 2 | {}.get(key, None)
-3 3 | 
-4 4 | # SIM910
-5   |-{}.get("key", None)
-  5 |+{}.get("key")
-6 6 | 
-7 7 | # OK
-8 8 | {}.get(key)
+2 | {}.get(key, None)
+3 | 
+4 | # SIM910
+  - {}.get("key", None)
+5 + {}.get("key")
+6 | 
+7 | # OK
+8 | {}.get(key)
 
 SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
   --> SIM910.py:20:9
@@ -50,16 +46,14 @@ SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
 21 |     pass
    |
 help: Replace `{}.get(key, None)` with `{}.get(key)`
-
-ℹ Safe fix
-17 17 | {}.get("key", False)
-18 18 | 
-19 19 | # SIM910
-20    |-if a := {}.get(key, None):
-   20 |+if a := {}.get(key):
-21 21 |     pass
-22 22 | 
-23 23 | # SIM910
+17 | {}.get("key", False)
+18 | 
+19 | # SIM910
+   - if a := {}.get(key, None):
+20 + if a := {}.get(key):
+21 |     pass
+22 | 
+23 | # SIM910
 
 SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
   --> SIM910.py:24:5
@@ -71,16 +65,14 @@ SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
 26 | # SIM910
    |
 help: Replace `{}.get(key, None)` with `{}.get(key)`
-
-ℹ Safe fix
-21 21 |     pass
-22 22 | 
-23 23 | # SIM910
-24    |-a = {}.get(key, None)
-   24 |+a = {}.get(key)
-25 25 | 
-26 26 | # SIM910
-27 27 | ({}).get(key, None)
+21 |     pass
+22 | 
+23 | # SIM910
+   - a = {}.get(key, None)
+24 + a = {}.get(key)
+25 | 
+26 | # SIM910
+27 | ({}).get(key, None)
 
 SIM910 [*] Use `({}).get(key)` instead of `({}).get(key, None)`
   --> SIM910.py:27:1
@@ -92,16 +84,14 @@ SIM910 [*] Use `({}).get(key)` instead of `({}).get(key, None)`
 29 | # SIM910
    |
 help: Replace `({}).get(key, None)` with `({}).get(key)`
-
-ℹ Safe fix
-24 24 | a = {}.get(key, None)
-25 25 | 
-26 26 | # SIM910
-27    |-({}).get(key, None)
-   27 |+({}).get(key)
-28 28 | 
-29 29 | # SIM910
-30 30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+24 | a = {}.get(key, None)
+25 | 
+26 | # SIM910
+   - ({}).get(key, None)
+27 + ({}).get(key)
+28 | 
+29 | # SIM910
+30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
 
 SIM910 [*] Use `ages.get("Cat")` instead of `ages.get("Cat", None)`
   --> SIM910.py:31:7
@@ -114,16 +104,14 @@ SIM910 [*] Use `ages.get("Cat")` instead of `ages.get("Cat", None)`
 33 | # OK
    |
 help: Replace `ages.get("Cat", None)` with `ages.get("Cat")`
-
-ℹ Safe fix
-28 28 | 
-29 29 | # SIM910
-30 30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
-31    |-age = ages.get("Cat", None)
-   31 |+age = ages.get("Cat")
-32 32 | 
-33 33 | # OK
-34 34 | ages = ["Tom", "Maria", "Dog"]
+28 | 
+29 | # SIM910
+30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get("Cat", None)
+31 + age = ages.get("Cat")
+32 | 
+33 | # OK
+34 | ages = ["Tom", "Maria", "Dog"]
 
 SIM910 [*] Use `kwargs.get('a')` instead of `kwargs.get('a', None)`
   --> SIM910.py:39:9
@@ -136,16 +124,14 @@ SIM910 [*] Use `kwargs.get('a')` instead of `kwargs.get('a', None)`
 41 | # SIM910
    |
 help: Replace `kwargs.get('a', None)` with `kwargs.get('a')`
-
-ℹ Safe fix
-36 36 | 
-37 37 | # SIM910
-38 38 | def foo(**kwargs):
-39    |-    a = kwargs.get('a', None)
-   39 |+    a = kwargs.get('a')
-40 40 | 
-41 41 | # SIM910
-42 42 | def foo(some_dict: dict):
+36 | 
+37 | # SIM910
+38 | def foo(**kwargs):
+   -     a = kwargs.get('a', None)
+39 +     a = kwargs.get('a')
+40 | 
+41 | # SIM910
+42 | def foo(some_dict: dict):
 
 SIM910 [*] Use `some_dict.get('a')` instead of `some_dict.get('a', None)`
   --> SIM910.py:43:9
@@ -158,16 +144,14 @@ SIM910 [*] Use `some_dict.get('a')` instead of `some_dict.get('a', None)`
 45 | # OK
    |
 help: Replace `some_dict.get('a', None)` with `some_dict.get('a')`
-
-ℹ Safe fix
-40 40 | 
-41 41 | # SIM910
-42 42 | def foo(some_dict: dict):
-43    |-    a = some_dict.get('a', None)
-   43 |+    a = some_dict.get('a')
-44 44 | 
-45 45 | # OK
-46 46 | def foo(some_other: object):
+40 | 
+41 | # SIM910
+42 | def foo(some_dict: dict):
+   -     a = some_dict.get('a', None)
+43 +     a = some_dict.get('a')
+44 | 
+45 | # OK
+46 | def foo(some_other: object):
 
 SIM910 [*] Use `dict.get("Cat")` instead of `dict.get("Cat", None)`
   --> SIM910.py:57:11
@@ -178,10 +162,11 @@ SIM910 [*] Use `dict.get("Cat")` instead of `dict.get("Cat", None)`
    |           ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace `dict.get("Cat", None)` with `dict.get("Cat")`
-
-ℹ Safe fix
-54 54 | # https://github.com/astral-sh/ruff/issues/18777
-55 55 | def foo():
-56 56 |     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
-57    |-    age = dict.get("Cat", None)
-   57 |+    age = dict.get("Cat")
+54 | # https://github.com/astral-sh/ruff/issues/18777
+55 | def foo():
+56 |     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
+   -     age = dict.get("Cat", None)
+57 +     age = dict.get("Cat")
+58 | 
+59 | 
+60 | # https://github.com/astral-sh/ruff/issues/20341
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap
index 4996e8d7d0..3b2f5bdf35 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap
@@ -10,14 +10,12 @@ SIM911 [*] Use `d.items()` instead of `zip(d.keys(), d.values())`
 3 |         ...
   |
 help: Replace `zip(d.keys(), d.values())` with `d.items()`
-
-ℹ Safe fix
-1 1 | def foo(d: dict[str, str]) -> None:
-2   |-    for k, v in zip(d.keys(), d.values()):  # SIM911
-  2 |+    for k, v in d.items():  # SIM911
-3 3 |         ...
-4 4 | 
-5 5 |     for k, v in zip(d.keys(), d.values(), strict=True):  # SIM911
+1 | def foo(d: dict[str, str]) -> None:
+  -     for k, v in zip(d.keys(), d.values()):  # SIM911
+2 +     for k, v in d.items():  # SIM911
+3 |         ...
+4 | 
+5 |     for k, v in zip(d.keys(), d.values(), strict=True):  # SIM911
 
 SIM911 [*] Use `d.items()` instead of `zip(d.keys(), d.values(), strict=True)`
  --> SIM911.py:5:17
@@ -29,16 +27,14 @@ SIM911 [*] Use `d.items()` instead of `zip(d.keys(), d.values(), strict=True)`
 6 |         ...
   |
 help: Replace `zip(d.keys(), d.values(), strict=True)` with `d.items()`
-
-ℹ Safe fix
-2 2 |     for k, v in zip(d.keys(), d.values()):  # SIM911
-3 3 |         ...
-4 4 | 
-5   |-    for k, v in zip(d.keys(), d.values(), strict=True):  # SIM911
-  5 |+    for k, v in d.items():  # SIM911
-6 6 |         ...
-7 7 | 
-8 8 |     for k, v in zip(d.keys(), d.values(), struct=True):  # OK
+2 |     for k, v in zip(d.keys(), d.values()):  # SIM911
+3 |         ...
+4 | 
+  -     for k, v in zip(d.keys(), d.values(), strict=True):  # SIM911
+5 +     for k, v in d.items():  # SIM911
+6 |         ...
+7 | 
+8 |     for k, v in zip(d.keys(), d.values(), struct=True):  # OK
 
 SIM911 [*] Use `d2.items()` instead of `zip(d2.keys(), d2.values())`
   --> SIM911.py:20:13
@@ -50,16 +46,14 @@ SIM911 [*] Use `d2.items()` instead of `zip(d2.keys(), d2.values())`
 21 |     ...
    |
 help: Replace `zip(d2.keys(), d2.values())` with `d2.items()`
-
-ℹ Safe fix
-17 17 | for k, v in zip(d1.items(), d2.values()):  # OK
-18 18 |     ...
-19 19 | 
-20    |-for k, v in zip(d2.keys(), d2.values()):  # SIM911
-   20 |+for k, v in d2.items():  # SIM911
-21 21 |     ...
-22 22 | 
-23 23 | items = zip(x.keys(), x.values())  # OK
+17 | for k, v in zip(d1.items(), d2.values()):  # OK
+18 |     ...
+19 | 
+   - for k, v in zip(d2.keys(), d2.values()):  # SIM911
+20 + for k, v in d2.items():  # SIM911
+21 |     ...
+22 | 
+23 | items = zip(x.keys(), x.values())  # OK
 
 SIM911 [*] Use `dict.items()` instead of `zip(dict.keys(), dict.values())`
   --> SIM911.py:30:27
@@ -71,16 +65,14 @@ SIM911 [*] Use `dict.items()` instead of `zip(dict.keys(), dict.values())`
 31 |         ...
    |
 help: Replace `zip(dict.keys(), dict.values())` with `dict.items()`
-
-ℹ Safe fix
-27 27 | # https://github.com/astral-sh/ruff/issues/18777
-28 28 | def foo():
-29 29 |     dict = {}
-30    |-    for country, stars in zip(dict.keys(), dict.values()):
-   30 |+    for country, stars in dict.items():
-31 31 |         ...
-32 32 | 
-33 33 | 
+27 | # https://github.com/astral-sh/ruff/issues/18777
+28 | def foo():
+29 |     dict = {}
+   -     for country, stars in zip(dict.keys(), dict.values()):
+30 +     for country, stars in dict.items():
+31 |         ...
+32 | 
+33 | 
 
 SIM911 [*] Use ` flag_stars.items()` instead of `(zip)(flag_stars.keys(), flag_stars.values())`
   --> SIM911.py:36:22
@@ -89,12 +81,15 @@ SIM911 [*] Use ` flag_stars.items()` instead of `(zip)(flag_stars.keys(), flag_s
 35 | flag_stars = {}
 36 | for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+37 |
+38 | # Regression test for https://github.com/astral-sh/ruff/issues/18778
    |
 help: Replace `(zip)(flag_stars.keys(), flag_stars.values())` with ` flag_stars.items()`
-
-ℹ Safe fix
-33 33 | 
-34 34 | # https://github.com/astral-sh/ruff/issues/18776
-35 35 | flag_stars = {}
-36    |-for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
-   36 |+for country, stars in flag_stars.items():...
+33 | 
+34 | # https://github.com/astral-sh/ruff/issues/18776
+35 | flag_stars = {}
+   - for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
+36 + for country, stars in flag_stars.items():...
+37 | 
+38 | # Regression test for https://github.com/astral-sh/ruff/issues/18778
+39 | d = {}
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap
deleted file mode 100644
index db3862e18e..0000000000
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap
+++ /dev/null
@@ -1,353 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_simplify/mod.rs
----
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
- --> SIM117.py:2:1
-  |
-1 |   # SIM117
-2 | / with A() as a:
-3 | |     with B() as b:
-  | |__________________^
-4 |           print("hello")
-  |
-help: Combine `with` statements
-
-ℹ Safe fix
-1 1 | # SIM117
-2   |-with A() as a:
-3   |-    with B() as b:
-4   |-        print("hello")
-  2 |+with A() as a, B() as b:
-  3 |+    print("hello")
-5 4 | 
-6 5 | # SIM117
-7 6 | with A():
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:7:1
-   |
- 6 |   # SIM117
- 7 | / with A():
- 8 | |     with B():
-   | |_____________^
- 9 |           with C():
-10 |               print("hello")
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-4  4  |         print("hello")
-5  5  | 
-6  6  | # SIM117
-7     |-with A():
-8     |-    with B():
-9     |-        with C():
-10    |-            print("hello")
-   7  |+with A(), B():
-   8  |+    with C():
-   9  |+        print("hello")
-11 10 | 
-12 11 | # SIM117
-13 12 | with A() as a:
-
-SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:13:1
-   |
-12 |   # SIM117
-13 | / with A() as a:
-14 | |     # Unfixable due to placement of this comment.
-15 | |     with B() as b:
-   | |__________________^
-16 |           print("hello")
-   |
-help: Combine `with` statements
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:19:1
-   |
-18 |   # SIM117
-19 | / with A() as a:
-20 | |     with B() as b:
-   | |__________________^
-21 |           # Fixable due to placement of this comment.
-22 |           print("hello")
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-16 16 |         print("hello")
-17 17 | 
-18 18 | # SIM117
-19    |-with A() as a:
-20    |-    with B() as b:
-21    |-        # Fixable due to placement of this comment.
-22    |-        print("hello")
-   19 |+with A() as a, B() as b:
-   20 |+    # Fixable due to placement of this comment.
-   21 |+    print("hello")
-23 22 | 
-24 23 | # OK
-25 24 | with A() as a:
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:47:1
-   |
-46 |   # SIM117
-47 | / async with A() as a:
-48 | |     async with B() as b:
-   | |________________________^
-49 |           print("hello")
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-44 44 |         print("hello")
-45 45 | 
-46 46 | # SIM117
-47    |-async with A() as a:
-48    |-    async with B() as b:
-49    |-        print("hello")
-   47 |+async with A() as a, B() as b:
-   48 |+    print("hello")
-50 49 | 
-51 50 | while True:
-52 51 |     # SIM117
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:53:5
-   |
-51 |   while True:
-52 |       # SIM117
-53 | /     with A() as a:
-54 | |         with B() as b:
-   | |______________________^
-55 |               """this
-56 |   is valid"""
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-50 50 | 
-51 51 | while True:
-52 52 |     # SIM117
-53    |-    with A() as a:
-54    |-        with B() as b:
-55    |-            """this
-   53 |+    with A() as a, B() as b:
-   54 |+        """this
-56 55 | is valid"""
-57 56 | 
-58    |-            """the indentation on
-   57 |+        """the indentation on
-59 58 |             this line is significant"""
-60 59 | 
-61    |-            "this is" \
-   60 |+        "this is" \
-62 61 | "allowed too"
-63 62 | 
-64    |-            ("so is"
-   63 |+        ("so is"
-65 64 | "this for some reason")
-66 65 | 
-67 66 | # SIM117
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:68:1
-   |
-67 |   # SIM117
-68 | / with (
-69 | |     A() as a,
-70 | |     B() as b,
-71 | | ):
-72 | |     with C() as c:
-   | |__________________^
-73 |           print("hello")
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-67 67 | # SIM117
-68 68 | with (
-69 69 |     A() as a,
-70    |-    B() as b,
-   70 |+    B() as b,C() as c
-71 71 | ):
-72    |-    with C() as c:
-73    |-        print("hello")
-   72 |+    print("hello")
-74 73 | 
-75 74 | # SIM117
-76 75 | with A() as a:
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:76:1
-   |
-75 |   # SIM117
-76 | / with A() as a:
-77 | |     with (
-78 | |         B() as b,
-79 | |         C() as c,
-80 | |     ):
-   | |______^
-81 |           print("hello")
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-73 73 |         print("hello")
-74 74 | 
-75 75 | # SIM117
-76    |-with A() as a:
-77    |-    with (
-78    |-        B() as b,
-79    |-        C() as c,
-80    |-    ):
-81    |-        print("hello")
-   76 |+with (
-   77 |+    A() as a, B() as b,
-   78 |+    C() as c,
-   79 |+):
-   80 |+    print("hello")
-82 81 | 
-83 82 | # SIM117
-84 83 | with (
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:84:1
-   |
-83 |   # SIM117
-84 | / with (
-85 | |     A() as a,
-86 | |     B() as b,
-87 | | ):
-88 | |     with (
-89 | |         C() as c,
-90 | |         D() as d,
-91 | |     ):
-   | |______^
-92 |           print("hello")
-   |
-help: Combine `with` statements
-
-ℹ Safe fix
-83 83 | # SIM117
-84 84 | with (
-85 85 |     A() as a,
-86    |-    B() as b,
-   86 |+    B() as b,C() as c,
-   87 |+    D() as d,
-87 88 | ):
-88    |-    with (
-89    |-        C() as c,
-90    |-        D() as d,
-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 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-  --> SIM117.py:95:1
-   |
-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")
-   |
-help: Combine `with` statements
-
-ℹ Safe 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 Use a single `with` statement with multiple contexts instead of nested `with` statements
-   --> SIM117.py:100:1
-    |
- 99 |   # SIM117 (not auto-fixable too long)
-100 | / with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a:
-101 | |     with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
-    | |__________________________________________________^
-102 |           print("hello")
-    |
-help: Combine `with` statements
-
-SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements
-   --> SIM117.py:106:5
-    |
-104 |   # From issue #3025.
-105 |   async def main():
-106 | /     async with A() as a: # SIM117.
-107 | |         async with B() as b:
-    | |____________________________^
-108 |               print("async-inside!")
-    |
-help: Combine `with` statements
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-   --> SIM117.py:126:1
-    |
-125 |   # SIM117
-126 | / with A() as a:
-127 | |     with B() as b:
-    | |__________________^
-128 |           type ListOrSet[T] = list[T] | set[T]
-    |
-help: Combine `with` statements
-
-ℹ Safe fix
-123 123 |             f(b2, c2, d2)
-124 124 | 
-125 125 | # SIM117
-126     |-with A() as a:
-127     |-    with B() as b:
-128     |-        type ListOrSet[T] = list[T] | set[T]
-    126 |+with A() as a, B() as b:
-    127 |+    type ListOrSet[T] = list[T] | set[T]
-129 128 | 
-130     |-        class ClassA[T: str]:
-131     |-            def method1(self) -> T:
-132     |-                ...
-    129 |+    class ClassA[T: str]:
-    130 |+        def method1(self) -> T:
-    131 |+            ...
-133 132 | 
-134     |-        f" something { my_dict["key"] } something else "
-    133 |+    f" something { my_dict["key"] } something else "
-135 134 | 
-136     |-        f"foo {f"bar {x}"} baz"
-    135 |+    f"foo {f"bar {x}"} baz"
-137 136 | 
-138 137 | # Allow cascading for some statements.
-139 138 | import anyio
-
-SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
-   --> SIM117.py:163:1
-    |
-162 |   # Do not suppress combination, if a context manager is already combined with another.
-163 | / async with asyncio.timeout(1), A():
-164 | |     async with B():
-    | |___________________^
-165 |           pass
-    |
-help: Combine `with` statements
-
-ℹ Safe fix
-160 160 |                                     pass
-161 161 | 
-162 162 | # Do not suppress combination, if a context manager is already combined with another.
-163     |-async with asyncio.timeout(1), A():
-164     |-    async with B():
-165     |-        pass
-    163 |+async with asyncio.timeout(1), A(), B():
-    164 |+    pass
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap
index 809e400704..d477367205 100644
--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap
@@ -15,20 +15,18 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 12 |   "a,b,c,d".split(",")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-3  3  | no_sep = None
-4  4  | 
-5  5  | # positives
-6     |-"""
-7     |-	itemA
-8     |-	itemB
-9     |-	itemC
-10    |-""".split()
-   6  |+["itemA", "itemB", "itemC"]
-11 7  | 
-12 8  | "a,b,c,d".split(",")
-13 9  | "a,b,c,d".split(None)
+3 | no_sep = None
+4 | 
+5 | # positives
+  - """
+  - 	itemA
+  - 	itemB
+  - 	itemC
+  - """.split()
+6 + ["itemA", "itemB", "itemC"]
+7 | 
+8 | "a,b,c,d".split(",")
+9 | "a,b,c,d".split(None)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:12:1
@@ -41,16 +39,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 14 | "a,b,c,d".split(",", 1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-9  9  | 	itemC
-10 10 | """.split()
-11 11 | 
-12    |-"a,b,c,d".split(",")
-   12 |+["a", "b", "c", "d"]
-13 13 | "a,b,c,d".split(None)
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
+9  | 	itemC
+10 | """.split()
+11 | 
+   - "a,b,c,d".split(",")
+12 + ["a", "b", "c", "d"]
+13 | "a,b,c,d".split(None)
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:13:1
@@ -62,16 +58,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 15 | "a,b,c,d".split(None, 1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-10 10 | """.split()
-11 11 | 
-12 12 | "a,b,c,d".split(",")
-13    |-"a,b,c,d".split(None)
-   13 |+["a,b,c,d"]
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
+10 | """.split()
+11 | 
+12 | "a,b,c,d".split(",")
+   - "a,b,c,d".split(None)
+13 + ["a,b,c,d"]
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:14:1
@@ -84,16 +78,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 16 | "a,b,c,d".split(sep=",")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-11 11 | 
-12 12 | "a,b,c,d".split(",")
-13 13 | "a,b,c,d".split(None)
-14    |-"a,b,c,d".split(",", 1)
-   14 |+["a", "b,c,d"]
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
-17 17 | "a,b,c,d".split(sep=None)
+11 | 
+12 | "a,b,c,d".split(",")
+13 | "a,b,c,d".split(None)
+   - "a,b,c,d".split(",", 1)
+14 + ["a", "b,c,d"]
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
+17 | "a,b,c,d".split(sep=None)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:15:1
@@ -106,16 +98,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 17 | "a,b,c,d".split(sep=None)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-12 12 | "a,b,c,d".split(",")
-13 13 | "a,b,c,d".split(None)
-14 14 | "a,b,c,d".split(",", 1)
-15    |-"a,b,c,d".split(None, 1)
-   15 |+["a,b,c,d"]
-16 16 | "a,b,c,d".split(sep=",")
-17 17 | "a,b,c,d".split(sep=None)
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
+12 | "a,b,c,d".split(",")
+13 | "a,b,c,d".split(None)
+14 | "a,b,c,d".split(",", 1)
+   - "a,b,c,d".split(None, 1)
+15 + ["a,b,c,d"]
+16 | "a,b,c,d".split(sep=",")
+17 | "a,b,c,d".split(sep=None)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:16:1
@@ -128,16 +118,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 18 | "a,b,c,d".split(sep=",", maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-13 13 | "a,b,c,d".split(None)
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
-16    |-"a,b,c,d".split(sep=",")
-   16 |+["a", "b", "c", "d"]
-17 17 | "a,b,c,d".split(sep=None)
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
+13 | "a,b,c,d".split(None)
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
+   - "a,b,c,d".split(sep=",")
+16 + ["a", "b", "c", "d"]
+17 | "a,b,c,d".split(sep=None)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:17:1
@@ -150,16 +138,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 19 | "a,b,c,d".split(sep=None, maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-14 14 | "a,b,c,d".split(",", 1)
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
-17    |-"a,b,c,d".split(sep=None)
-   17 |+["a,b,c,d"]
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
+14 | "a,b,c,d".split(",", 1)
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
+   - "a,b,c,d".split(sep=None)
+17 + ["a,b,c,d"]
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:18:1
@@ -172,16 +158,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 20 | "a,b,c,d".split(maxsplit=1, sep=",")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-15 15 | "a,b,c,d".split(None, 1)
-16 16 | "a,b,c,d".split(sep=",")
-17 17 | "a,b,c,d".split(sep=None)
-18    |-"a,b,c,d".split(sep=",", maxsplit=1)
-   18 |+["a", "b,c,d"]
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
+15 | "a,b,c,d".split(None, 1)
+16 | "a,b,c,d".split(sep=",")
+17 | "a,b,c,d".split(sep=None)
+   - "a,b,c,d".split(sep=",", maxsplit=1)
+18 + ["a", "b,c,d"]
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:19:1
@@ -194,16 +178,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 21 | "a,b,c,d".split(maxsplit=1, sep=None)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-16 16 | "a,b,c,d".split(sep=",")
-17 17 | "a,b,c,d".split(sep=None)
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19    |-"a,b,c,d".split(sep=None, maxsplit=1)
-   19 |+["a,b,c,d"]
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22 22 | "a,b,c,d".split(",", maxsplit=1)
+16 | "a,b,c,d".split(sep=",")
+17 | "a,b,c,d".split(sep=None)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+   - "a,b,c,d".split(sep=None, maxsplit=1)
+19 + ["a,b,c,d"]
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+22 | "a,b,c,d".split(",", maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:20:1
@@ -216,16 +198,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 22 | "a,b,c,d".split(",", maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-17 17 | "a,b,c,d".split(sep=None)
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20    |-"a,b,c,d".split(maxsplit=1, sep=",")
-   20 |+["a", "b,c,d"]
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22 22 | "a,b,c,d".split(",", maxsplit=1)
-23 23 | "a,b,c,d".split(None, maxsplit=1)
+17 | "a,b,c,d".split(sep=None)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+   - "a,b,c,d".split(maxsplit=1, sep=",")
+20 + ["a", "b,c,d"]
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+22 | "a,b,c,d".split(",", maxsplit=1)
+23 | "a,b,c,d".split(None, maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:21:1
@@ -238,16 +218,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 23 | "a,b,c,d".split(None, maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-18 18 | "a,b,c,d".split(sep=",", maxsplit=1)
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21    |-"a,b,c,d".split(maxsplit=1, sep=None)
-   21 |+["a,b,c,d"]
-22 22 | "a,b,c,d".split(",", maxsplit=1)
-23 23 | "a,b,c,d".split(None, maxsplit=1)
-24 24 | "a,b,c,d".split(maxsplit=1)
+18 | "a,b,c,d".split(sep=",", maxsplit=1)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+   - "a,b,c,d".split(maxsplit=1, sep=None)
+21 + ["a,b,c,d"]
+22 | "a,b,c,d".split(",", maxsplit=1)
+23 | "a,b,c,d".split(None, maxsplit=1)
+24 | "a,b,c,d".split(maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:22:1
@@ -260,16 +238,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 24 | "a,b,c,d".split(maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-19 19 | "a,b,c,d".split(sep=None, maxsplit=1)
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22    |-"a,b,c,d".split(",", maxsplit=1)
-   22 |+["a", "b,c,d"]
-23 23 | "a,b,c,d".split(None, maxsplit=1)
-24 24 | "a,b,c,d".split(maxsplit=1)
-25 25 | "a,b,c,d".split(maxsplit=1.0)
+19 | "a,b,c,d".split(sep=None, maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+   - "a,b,c,d".split(",", maxsplit=1)
+22 + ["a", "b,c,d"]
+23 | "a,b,c,d".split(None, maxsplit=1)
+24 | "a,b,c,d".split(maxsplit=1)
+25 | "a,b,c,d".split(maxsplit=1.0)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:23:1
@@ -282,16 +258,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 25 | "a,b,c,d".split(maxsplit=1.0)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-20 20 | "a,b,c,d".split(maxsplit=1, sep=",")
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22 22 | "a,b,c,d".split(",", maxsplit=1)
-23    |-"a,b,c,d".split(None, maxsplit=1)
-   23 |+["a,b,c,d"]
-24 24 | "a,b,c,d".split(maxsplit=1)
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26 26 | "a,b,c,d".split(maxsplit=1)
+20 | "a,b,c,d".split(maxsplit=1, sep=",")
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+22 | "a,b,c,d".split(",", maxsplit=1)
+   - "a,b,c,d".split(None, maxsplit=1)
+23 + ["a,b,c,d"]
+24 | "a,b,c,d".split(maxsplit=1)
+25 | "a,b,c,d".split(maxsplit=1.0)
+26 | "a,b,c,d".split(maxsplit=1)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:24:1
@@ -304,16 +278,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 26 | "a,b,c,d".split(maxsplit=1)
    |
 help: Replace with list literal
-
-ℹ Safe fix
-21 21 | "a,b,c,d".split(maxsplit=1, sep=None)
-22 22 | "a,b,c,d".split(",", maxsplit=1)
-23 23 | "a,b,c,d".split(None, maxsplit=1)
-24    |-"a,b,c,d".split(maxsplit=1)
-   24 |+["a,b,c,d"]
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26 26 | "a,b,c,d".split(maxsplit=1)
-27 27 | "a,b,c,d".split(maxsplit=0)
+21 | "a,b,c,d".split(maxsplit=1, sep=None)
+22 | "a,b,c,d".split(",", maxsplit=1)
+23 | "a,b,c,d".split(None, maxsplit=1)
+   - "a,b,c,d".split(maxsplit=1)
+24 + ["a,b,c,d"]
+25 | "a,b,c,d".split(maxsplit=1.0)
+26 | "a,b,c,d".split(maxsplit=1)
+27 | "a,b,c,d".split(maxsplit=0)
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:26:1
@@ -326,16 +298,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 28 | "VERB AUX PRON ADP DET".split(" ")
    |
 help: Replace with list literal
-
-ℹ Safe fix
-23 23 | "a,b,c,d".split(None, maxsplit=1)
-24 24 | "a,b,c,d".split(maxsplit=1)
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26    |-"a,b,c,d".split(maxsplit=1)
-   26 |+["a,b,c,d"]
-27 27 | "a,b,c,d".split(maxsplit=0)
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29 29 | '   1   2   3   '.split()
+23 | "a,b,c,d".split(None, maxsplit=1)
+24 | "a,b,c,d".split(maxsplit=1)
+25 | "a,b,c,d".split(maxsplit=1.0)
+   - "a,b,c,d".split(maxsplit=1)
+26 + ["a,b,c,d"]
+27 | "a,b,c,d".split(maxsplit=0)
+28 | "VERB AUX PRON ADP DET".split(" ")
+29 | '   1   2   3   '.split()
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:27:1
@@ -348,16 +318,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 29 | '   1   2   3   '.split()
    |
 help: Replace with list literal
-
-ℹ Safe fix
-24 24 | "a,b,c,d".split(maxsplit=1)
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26 26 | "a,b,c,d".split(maxsplit=1)
-27    |-"a,b,c,d".split(maxsplit=0)
-   27 |+["a,b,c,d"]
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29 29 | '   1   2   3   '.split()
-30 30 | '1<>2<>3<4'.split('<>')
+24 | "a,b,c,d".split(maxsplit=1)
+25 | "a,b,c,d".split(maxsplit=1.0)
+26 | "a,b,c,d".split(maxsplit=1)
+   - "a,b,c,d".split(maxsplit=0)
+27 + ["a,b,c,d"]
+28 | "VERB AUX PRON ADP DET".split(" ")
+29 | '   1   2   3   '.split()
+30 | '1<>2<>3<4'.split('<>')
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:28:1
@@ -370,16 +338,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 30 | '1<>2<>3<4'.split('<>')
    |
 help: Replace with list literal
-
-ℹ Safe fix
-25 25 | "a,b,c,d".split(maxsplit=1.0)
-26 26 | "a,b,c,d".split(maxsplit=1)
-27 27 | "a,b,c,d".split(maxsplit=0)
-28    |-"VERB AUX PRON ADP DET".split(" ")
-   28 |+["VERB", "AUX", "PRON", "ADP", "DET"]
-29 29 | '   1   2   3   '.split()
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
+25 | "a,b,c,d".split(maxsplit=1.0)
+26 | "a,b,c,d".split(maxsplit=1)
+27 | "a,b,c,d".split(maxsplit=0)
+   - "VERB AUX PRON ADP DET".split(" ")
+28 + ["VERB", "AUX", "PRON", "ADP", "DET"]
+29 | '   1   2   3   '.split()
+30 | '1<>2<>3<4'.split('<>')
+31 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:29:1
@@ -391,16 +357,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 30 | '1<>2<>3<4'.split('<>')
    |
 help: Replace with list literal
-
-ℹ Safe fix
-26 26 | "a,b,c,d".split(maxsplit=1)
-27 27 | "a,b,c,d".split(maxsplit=0)
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29    |-'   1   2   3   '.split()
-   29 |+['1', '2', '3']
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+26 | "a,b,c,d".split(maxsplit=1)
+27 | "a,b,c,d".split(maxsplit=0)
+28 | "VERB AUX PRON ADP DET".split(" ")
+   - '   1   2   3   '.split()
+29 + ['1', '2', '3']
+30 | '1<>2<>3<4'.split('<>')
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:30:1
@@ -413,16 +377,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-27 27 | "a,b,c,d".split(maxsplit=0)
-28 28 | "VERB AUX PRON ADP DET".split(" ")
-29 29 | '   1   2   3   '.split()
-30    |-'1<>2<>3<4'.split('<>')
-   30 |+['1', '2', '3<4']
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-33 33 | "".split()  # []
+27 | "a,b,c,d".split(maxsplit=0)
+28 | "VERB AUX PRON ADP DET".split(" ")
+29 | '   1   2   3   '.split()
+   - '1<>2<>3<4'.split('<>')
+30 + ['1', '2', '3<4']
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+33 | "".split()  # []
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:32:1
@@ -435,16 +397,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 34 | """
    |
 help: Replace with list literal
-
-ℹ Safe fix
-29 29 | '   1   2   3   '.split()
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
-32    |-" a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-   32 |+[" a", "a a", "a a "]  # [" a", "a a", "a a "]
-33 33 | "".split()  # []
-34 34 | """
-35 35 | """.split()  # []
+29 | '   1   2   3   '.split()
+30 | '1<>2<>3<4'.split('<>')
+31 | 
+   - " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+32 + [" a", "a a", "a a "]  # [" a", "a a", "a a "]
+33 | "".split()  # []
+34 | """
+35 | """.split()  # []
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:33:1
@@ -456,16 +416,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 35 | """.split()  # []
    |
 help: Replace with list literal
-
-ℹ Safe fix
-30 30 | '1<>2<>3<4'.split('<>')
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-33    |-"".split()  # []
-   33 |+[]  # []
-34 34 | """
-35 35 | """.split()  # []
-36 36 | "   	".split()  # []
+30 | '1<>2<>3<4'.split('<>')
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+   - "".split()  # []
+33 + []  # []
+34 | """
+35 | """.split()  # []
+36 | "   	".split()  # []
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:34:1
@@ -479,17 +437,15 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 37 |   "/abc/".split() # ["/abc/"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-31 31 | 
-32 32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
-33 33 | "".split()  # []
-34    |-"""
-35    |-""".split()  # []
-   34 |+[]  # []
-36 35 | "   	".split()  # []
-37 36 | "/abc/".split() # ["/abc/"]
-38 37 | ("a,b,c"
+31 | 
+32 | " a*a a*a a ".split("*", -1)  # [" a", "a a", "a a "]
+33 | "".split()  # []
+   - """
+   - """.split()  # []
+34 + []  # []
+35 | "   	".split()  # []
+36 | "/abc/".split() # ["/abc/"]
+37 | ("a,b,c"
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:36:1
@@ -502,16 +458,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 38 | ("a,b,c"
    |
 help: Replace with list literal
-
-ℹ Safe fix
-33 33 | "".split()  # []
-34 34 | """
-35 35 | """.split()  # []
-36    |-"   	".split()  # []
-   36 |+[]  # []
-37 37 | "/abc/".split() # ["/abc/"]
-38 38 | ("a,b,c"
-39 39 | # comment
+33 | "".split()  # []
+34 | """
+35 | """.split()  # []
+   - "   	".split()  # []
+36 + []  # []
+37 | "/abc/".split() # ["/abc/"]
+38 | ("a,b,c"
+39 | # comment
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:37:1
@@ -524,16 +478,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 39 | # comment
    |
 help: Replace with list literal
-
-ℹ Safe fix
-34 34 | """
-35 35 | """.split()  # []
-36 36 | "   	".split()  # []
-37    |-"/abc/".split() # ["/abc/"]
-   37 |+["/abc/"] # ["/abc/"]
-38 38 | ("a,b,c"
-39 39 | # comment
-40 40 | .split()
+34 | """
+35 | """.split()  # []
+36 | "   	".split()  # []
+   - "/abc/".split() # ["/abc/"]
+37 + ["/abc/"] # ["/abc/"]
+38 | ("a,b,c"
+39 | # comment
+40 | .split()
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:38:2
@@ -549,18 +501,17 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 42 |   ("a,b,c"
    |
 help: Replace with list literal
-
-ℹ Unsafe fix
-35 35 | """.split()  # []
-36 36 | "   	".split()  # []
-37 37 | "/abc/".split() # ["/abc/"]
-38    |-("a,b,c"
-39    |-# comment
-40    |-.split()
-   38 |+(["a,b,c"]
-41 39 | )  # ["a,b,c"]
-42 40 | ("a,b,c"
-43 41 | # comment1
+35 | """.split()  # []
+36 | "   	".split()  # []
+37 | "/abc/".split() # ["/abc/"]
+   - ("a,b,c"
+   - # comment
+   - .split()
+38 + (["a,b,c"]
+39 | )  # ["a,b,c"]
+40 | ("a,b,c"
+41 | # comment1
+note: This is an unsafe fix and may change runtime behavior
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:42:2
@@ -576,18 +527,17 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 46 |   ("a,"
    |
 help: Replace with list literal
-
-ℹ Unsafe fix
-39 39 | # comment
-40 40 | .split()
-41 41 | )  # ["a,b,c"]
-42    |-("a,b,c"
-43    |-# comment1
-44    |-.split(",")
-   42 |+(["a", "b", "c"]
-45 43 | ) # ["a", "b", "c"]
-46 44 | ("a,"
-47 45 | # comment
+39 | # comment
+40 | .split()
+41 | )  # ["a,b,c"]
+   - ("a,b,c"
+   - # comment1
+   - .split(",")
+42 + (["a", "b", "c"]
+43 | ) # ["a", "b", "c"]
+44 | ("a,"
+45 | # comment
+note: This is an unsafe fix and may change runtime behavior
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:46:2
@@ -604,20 +554,19 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 51 |   ) # ["a", "b", "c"]
    |
 help: Replace with list literal
-
-ℹ Unsafe fix
-43 43 | # comment1
-44 44 | .split(",")
-45 45 | ) # ["a", "b", "c"]
-46    |-("a,"
-47    |-# comment
-48    |-"b,"
-49    |-"c"
-50    |-.split(",")
-   46 |+(["a", "b", "c"]
-51 47 | ) # ["a", "b", "c"]
-52 48 | 
-53 49 | "hello "\
+43 | # comment1
+44 | .split(",")
+45 | ) # ["a", "b", "c"]
+   - ("a,"
+   - # comment
+   - "b,"
+   - "c"
+   - .split(",")
+46 + (["a", "b", "c"]
+47 | ) # ["a", "b", "c"]
+48 | 
+49 | "hello "\
+note: This is an unsafe fix and may change runtime behavior
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:53:1
@@ -630,17 +579,15 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 55 |   # ["hello", "world"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-50 50 | .split(",")
-51 51 | ) # ["a", "b", "c"]
-52 52 | 
-53    |-"hello "\
-54    |-	"world".split()
-   53 |+["hello", "world"]
-55 54 | # ["hello", "world"]
-56 55 | 
-57 56 | # prefixes and isc
+50 | .split(",")
+51 | ) # ["a", "b", "c"]
+52 | 
+   - "hello "\
+   - 	"world".split()
+53 + ["hello", "world"]
+54 | # ["hello", "world"]
+55 | 
+56 | # prefixes and isc
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:58:1
@@ -652,16 +599,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 60 | ("a " "b").split()  # ["a", "b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-55 55 | # ["hello", "world"]
-56 56 | 
-57 57 | # prefixes and isc
-58    |-u"a b".split()  # [u"a", u"b"]
-   58 |+[u"a", u"b"]  # [u"a", u"b"]
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
+55 | # ["hello", "world"]
+56 | 
+57 | # prefixes and isc
+   - u"a b".split()  # [u"a", u"b"]
+58 + [u"a", u"b"]  # [u"a", u"b"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:59:1
@@ -674,16 +619,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 61 | "a " "b".split()  # ["a", "b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-56 56 | 
-57 57 | # prefixes and isc
-58 58 | u"a b".split()  # [u"a", u"b"]
-59    |-r"a \n b".split()  # [r"a", r"\n", r"b"]
-   59 |+[r"a", r"\n", r"b"]  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
+56 | 
+57 | # prefixes and isc
+58 | u"a b".split()  # [u"a", u"b"]
+   - r"a \n b".split()  # [r"a", r"\n", r"b"]
+59 + [r"a", r"\n", r"b"]  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:60:1
@@ -696,16 +639,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 62 | u"a " "b".split()  # [u"a", u"b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-57 57 | # prefixes and isc
-58 58 | u"a b".split()  # [u"a", u"b"]
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60    |-("a " "b").split()  # ["a", "b"]
-   60 |+["a", "b"]  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
+57 | # prefixes and isc
+58 | u"a b".split()  # [u"a", u"b"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+   - ("a " "b").split()  # ["a", "b"]
+60 + ["a", "b"]  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:61:1
@@ -718,16 +659,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 63 | "a " u"b".split()  # ["a", "b"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-58 58 | u"a b".split()  # [u"a", u"b"]
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61    |-"a " "b".split()  # ["a", "b"]
-   61 |+["a", "b"]  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+58 | u"a b".split()  # [u"a", u"b"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+   - "a " "b".split()  # ["a", "b"]
+61 + ["a", "b"]  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:62:1
@@ -740,16 +679,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-59 59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62    |-u"a " "b".split()  # [u"a", u"b"]
-   62 |+[u"a", u"b"]  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
+59 | r"a \n b".split()  # [r"a", r"\n", r"b"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+   - u"a " "b".split()  # [u"a", u"b"]
+62 + [u"a", u"b"]  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:63:1
@@ -762,16 +699,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 65 | r"\n " u"\n".split()  # [r"\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-60 60 | ("a " "b").split()  # ["a", "b"]
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63    |-"a " u"b".split()  # ["a", "b"]
-   63 |+["a", "b"]  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
+60 | ("a " "b").split()  # ["a", "b"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+   - "a " u"b".split()  # ["a", "b"]
+63 + ["a", "b"]  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:64:1
@@ -784,16 +719,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 66 | r"\n " "\n".split()  # [r"\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-61 61 | "a " "b".split()  # ["a", "b"]
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64    |-u"a " r"\n".split()  # [u"a", u"\\n"]
-   64 |+[u"a", u"\\n"]  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
+61 | "a " "b".split()  # ["a", "b"]
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+   - u"a " r"\n".split()  # [u"a", u"\\n"]
+64 + [u"a", u"\\n"]  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:65:1
@@ -806,16 +739,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 67 | "a " r"\n".split()  # ["a", "\\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-62 62 | u"a " "b".split()  # [u"a", u"b"]
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65    |-r"\n " u"\n".split()  # [r"\n"]
-   65 |+[r"\n"]  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
+62 | u"a " "b".split()  # [u"a", u"b"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+   - r"\n " u"\n".split()  # [r"\n"]
+65 + [r"\n"]  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:66:1
@@ -827,16 +758,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 67 | "a " r"\n".split()  # ["a", "\\n"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-63 63 | "a " u"b".split()  # ["a", "b"]
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66    |-r"\n " "\n".split()  # [r"\n"]
-   66 |+[r"\n"]  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+63 | "a " u"b".split()  # ["a", "b"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+   - r"\n " "\n".split()  # [r"\n"]
+66 + [r"\n"]  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:67:1
@@ -849,16 +778,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-64 64 | u"a " r"\n".split()  # [u"a", u"\\n"]
-65 65 | r"\n " u"\n".split()  # [r"\n"]
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67    |-"a " r"\n".split()  # ["a", "\\n"]
-   67 |+["a", "\\n"]  # ["a", "\\n"]
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+64 | u"a " r"\n".split()  # [u"a", u"\\n"]
+65 | r"\n " u"\n".split()  # [r"\n"]
+66 | r"\n " "\n".split()  # [r"\n"]
+   - "a " r"\n".split()  # ["a", "\\n"]
+67 + ["a", "\\n"]  # ["a", "\\n"]
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:69:1
@@ -871,16 +798,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-66 66 | r"\n " "\n".split()  # [r"\n"]
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
-69    |-"a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-   69 |+["a,b,c"] # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-71 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-72 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+66 | r"\n " "\n".split()  # [r"\n"]
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
+   - "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+69 + ["a,b,c"] # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:70:1
@@ -892,16 +817,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-67 67 | "a " r"\n".split()  # ["a", "\\n"]
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70    |-"a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-   70 |+["a", "b", "c"]  # ["a", "b", "c"]
-71 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-72 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
-73 73 | 
+67 | "a " r"\n".split()  # ["a", "\\n"]
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+   - "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+70 + ["a", "b", "c"]  # ["a", "b", "c"]
+71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+73 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:71:1
@@ -913,16 +836,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
    |
 help: Replace with list literal
-
-ℹ Safe fix
-68 68 | 
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-71    |-"a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-   71 |+["a", "b", "c"]  # ["a", "b", "c"]
-72 72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
-73 73 | 
-74 74 | # negatives
+68 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+   - "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+71 + ["a", "b", "c"]  # ["a", "b", "c"]
+72 | "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+73 | 
+74 | # negatives
 
 SIM905 [*] Consider using a list literal instead of `str.split`
   --> SIM905.py:72:1
@@ -935,16 +856,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 74 | # negatives
    |
 help: Replace with list literal
-
-ℹ Safe fix
-69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
-70 70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
-71 71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
-72    |-"a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
-   72 |+["a,b,c"]  # ["a,b,c"]
-73 73 | 
-74 74 | # negatives
-75 75 | 
+69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"]
+70 | "a,b,c".split(',', maxsplit=-1)  # ["a", "b", "c"]
+71 | "a,b,c".split(',', maxsplit=-2)  # ["a", "b", "c"]
+   - "a,b,c".split(',', maxsplit=-0)  # ["a,b,c"]
+72 + ["a,b,c"]  # ["a,b,c"]
+73 | 
+74 | # negatives
+75 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:103:1
@@ -961,23 +880,21 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 110 |   # https://github.com/astral-sh/ruff/issues/18042
     |
 help: Replace with list literal
+100 | 
+101 | 
+102 | # another positive demonstrating quote preservation
+    - """
+    - "itemA"
+    - 'itemB'
+    - '''itemC'''
+    - "'itemD'"
+    - """.split()
+103 + ['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""]
+104 | 
+105 | # https://github.com/astral-sh/ruff/issues/18042
+106 | print("a,b".rsplit(","))
 
-ℹ Safe fix
-100 100 | 
-101 101 | 
-102 102 | # another positive demonstrating quote preservation
-103     |-"""
-104     |-"itemA"
-105     |-'itemB'
-106     |-'''itemC'''
-107     |-"'itemD'"
-108     |-""".split()
-    103 |+['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""]
-109 104 | 
-110 105 | # https://github.com/astral-sh/ruff/issues/18042
-111 106 | print("a,b".rsplit(","))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:111:7
     |
 110 | # https://github.com/astral-sh/ruff/issues/18042
@@ -986,18 +903,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 112 | print("a,b,c".rsplit(",", 1))
     |
 help: Replace with list literal
+108 | """.split()
+109 | 
+110 | # https://github.com/astral-sh/ruff/issues/18042
+    - print("a,b".rsplit(","))
+111 + print(["a", "b"])
+112 | print("a,b,c".rsplit(",", 1))
+113 | 
+114 | # https://github.com/astral-sh/ruff/issues/18069
 
-ℹ Safe fix
-108 108 | """.split()
-109 109 | 
-110 110 | # https://github.com/astral-sh/ruff/issues/18042
-111     |-print("a,b".rsplit(","))
-    111 |+print(["a", "b"])
-112 112 | print("a,b,c".rsplit(",", 1))
-113 113 | 
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:112:7
     |
 110 | # https://github.com/astral-sh/ruff/issues/18042
@@ -1008,16 +923,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 114 | # https://github.com/astral-sh/ruff/issues/18069
     |
 help: Replace with list literal
-
-ℹ Safe fix
-109 109 | 
-110 110 | # https://github.com/astral-sh/ruff/issues/18042
-111 111 | print("a,b".rsplit(","))
-112     |-print("a,b,c".rsplit(",", 1))
-    112 |+print(["a,b", "c"])
-113 113 | 
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-115 115 | 
+109 | 
+110 | # https://github.com/astral-sh/ruff/issues/18042
+111 | print("a,b".rsplit(","))
+    - print("a,b,c".rsplit(",", 1))
+112 + print(["a,b", "c"])
+113 | 
+114 | # https://github.com/astral-sh/ruff/issues/18069
+115 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:116:7
@@ -1030,16 +943,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 118 | print(" ".split(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-113 113 | 
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-115 115 | 
-116     |-print("".split(maxsplit=0))
-    116 |+print([])
-117 117 | print("".split(sep=None, maxsplit=0))
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
+113 | 
+114 | # https://github.com/astral-sh/ruff/issues/18069
+115 | 
+    - print("".split(maxsplit=0))
+116 + print([])
+117 | print("".split(sep=None, maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:117:7
@@ -1051,16 +962,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 119 | print(" ".split(sep=None, maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-114 114 | # https://github.com/astral-sh/ruff/issues/18069
-115 115 | 
-116 116 | print("".split(maxsplit=0))
-117     |-print("".split(sep=None, maxsplit=0))
-    117 |+print([])
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
+114 | # https://github.com/astral-sh/ruff/issues/18069
+115 | 
+116 | print("".split(maxsplit=0))
+    - print("".split(sep=None, maxsplit=0))
+117 + print([])
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:118:7
@@ -1073,16 +982,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 120 | print(" x ".split(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-115 115 | 
-116 116 | print("".split(maxsplit=0))
-117 117 | print("".split(sep=None, maxsplit=0))
-118     |-print(" ".split(maxsplit=0))
-    118 |+print([])
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
+115 | 
+116 | print("".split(maxsplit=0))
+117 | print("".split(sep=None, maxsplit=0))
+    - print(" ".split(maxsplit=0))
+118 + print([])
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:119:7
@@ -1095,16 +1002,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 121 | print(" x ".split(sep=None, maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-116 116 | print("".split(maxsplit=0))
-117 117 | print("".split(sep=None, maxsplit=0))
-118 118 | print(" ".split(maxsplit=0))
-119     |-print(" ".split(sep=None, maxsplit=0))
-    119 |+print([])
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
+116 | print("".split(maxsplit=0))
+117 | print("".split(sep=None, maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+    - print(" ".split(sep=None, maxsplit=0))
+119 + print([])
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:120:7
@@ -1117,16 +1022,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 122 | print("  x  ".split(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-117 117 | print("".split(sep=None, maxsplit=0))
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120     |-print(" x ".split(maxsplit=0))
-    120 |+print(["x "])
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
+117 | print("".split(sep=None, maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+    - print(" x ".split(maxsplit=0))
+120 + print(["x "])
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:121:7
@@ -1139,16 +1042,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 123 | print("  x  ".split(sep=None, maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-118 118 | print(" ".split(maxsplit=0))
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
-121     |-print(" x ".split(sep=None, maxsplit=0))
-    121 |+print(["x "])
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
+118 | print(" ".split(maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
+    - print(" x ".split(sep=None, maxsplit=0))
+121 + print(["x "])
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:122:7
@@ -1161,16 +1062,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 124 | print("".rsplit(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-119 119 | print(" ".split(sep=None, maxsplit=0))
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122     |-print("  x  ".split(maxsplit=0))
-    122 |+print(["x  "])
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
+119 | print(" ".split(sep=None, maxsplit=0))
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
+    - print("  x  ".split(maxsplit=0))
+122 + print(["x  "])
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:123:7
@@ -1183,18 +1082,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 125 | print("".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+120 | print(" x ".split(maxsplit=0))
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
+    - print("  x  ".split(sep=None, maxsplit=0))
+123 + print(["x  "])
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-120 120 | print(" x ".split(maxsplit=0))
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
-123     |-print("  x  ".split(sep=None, maxsplit=0))
-    123 |+print(["x  "])
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:124:7
     |
 122 | print("  x  ".split(maxsplit=0))
@@ -1205,18 +1102,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 126 | print(" ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+121 | print(" x ".split(sep=None, maxsplit=0))
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
+    - print("".rsplit(maxsplit=0))
+124 + print([])
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
 
-ℹ Safe fix
-121 121 | print(" x ".split(sep=None, maxsplit=0))
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124     |-print("".rsplit(maxsplit=0))
-    124 |+print([])
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:125:7
     |
 123 | print("  x  ".split(sep=None, maxsplit=0))
@@ -1227,18 +1122,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 127 | print(" ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+122 | print("  x  ".split(maxsplit=0))
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
+    - print("".rsplit(sep=None, maxsplit=0))
+125 + print([])
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-122 122 | print("  x  ".split(maxsplit=0))
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
-125     |-print("".rsplit(sep=None, maxsplit=0))
-    125 |+print([])
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:126:7
     |
 124 | print("".rsplit(maxsplit=0))
@@ -1249,18 +1142,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 128 | print(" x ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+123 | print("  x  ".split(sep=None, maxsplit=0))
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
+    - print(" ".rsplit(maxsplit=0))
+126 + print([])
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-123 123 | print("  x  ".split(sep=None, maxsplit=0))
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126     |-print(" ".rsplit(maxsplit=0))
-    126 |+print([])
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:127:7
     |
 125 | print("".rsplit(sep=None, maxsplit=0))
@@ -1271,18 +1162,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 129 | print(" x ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+124 | print("".rsplit(maxsplit=0))
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
+    - print(" ".rsplit(sep=None, maxsplit=0))
+127 + print([])
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
 
-ℹ Safe fix
-124 124 | print("".rsplit(maxsplit=0))
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-127     |-print(" ".rsplit(sep=None, maxsplit=0))
-    127 |+print([])
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:128:7
     |
 126 | print(" ".rsplit(maxsplit=0))
@@ -1293,18 +1182,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 130 | print(" x ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+125 | print("".rsplit(sep=None, maxsplit=0))
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+    - print(" x ".rsplit(maxsplit=0))
+128 + print([" x"])
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+131 | print("  x  ".rsplit(maxsplit=0))
 
-ℹ Safe fix
-125 125 | print("".rsplit(sep=None, maxsplit=0))
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128     |-print(" x ".rsplit(maxsplit=0))
-    128 |+print([" x"])
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131 131 | print("  x  ".rsplit(maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:129:7
     |
 127 | print(" ".rsplit(sep=None, maxsplit=0))
@@ -1315,18 +1202,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 131 | print("  x  ".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+126 | print(" ".rsplit(maxsplit=0))
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
+    - print(" x ".rsplit(maxsplit=0))
+129 + print([" x"])
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+131 | print("  x  ".rsplit(maxsplit=0))
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
 
-ℹ Safe fix
-126 126 | print(" ".rsplit(maxsplit=0))
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-129     |-print(" x ".rsplit(maxsplit=0))
-    129 |+print([" x"])
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131 131 | print("  x  ".rsplit(maxsplit=0))
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:130:7
     |
 128 | print(" x ".rsplit(maxsplit=0))
@@ -1337,18 +1222,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+127 | print(" ".rsplit(sep=None, maxsplit=0))
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
+    - print(" x ".rsplit(sep=None, maxsplit=0))
+130 + print([" x"])
+131 | print("  x  ".rsplit(maxsplit=0))
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
+133 | 
 
-ℹ Safe fix
-127 127 | print(" ".rsplit(sep=None, maxsplit=0))
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-130     |-print(" x ".rsplit(sep=None, maxsplit=0))
-    130 |+print([" x"])
-131 131 | print("  x  ".rsplit(maxsplit=0))
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-133 133 | 
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:131:7
     |
 129 | print(" x ".rsplit(maxsplit=0))
@@ -1358,18 +1241,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
     |
 help: Replace with list literal
+128 | print(" x ".rsplit(maxsplit=0))
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+    - print("  x  ".rsplit(maxsplit=0))
+131 + print(["  x"])
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
+133 | 
+134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
 
-ℹ Safe fix
-128 128 | print(" x ".rsplit(maxsplit=0))
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131     |-print("  x  ".rsplit(maxsplit=0))
-    131 |+print(["  x"])
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-133 133 | 
-134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:132:7
     |
 130 | print(" x ".rsplit(sep=None, maxsplit=0))
@@ -1380,16 +1261,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
     |
 help: Replace with list literal
-
-ℹ Safe fix
-129 129 | print(" x ".rsplit(maxsplit=0))
-130 130 | print(" x ".rsplit(sep=None, maxsplit=0))
-131 131 | print("  x  ".rsplit(maxsplit=0))
-132     |-print("  x  ".rsplit(sep=None, maxsplit=0))
-    132 |+print(["  x"])
-133 133 | 
-134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-135 135 | r"""simple@example.com
+129 | print(" x ".rsplit(maxsplit=0))
+130 | print(" x ".rsplit(sep=None, maxsplit=0))
+131 | print("  x  ".rsplit(maxsplit=0))
+    - print("  x  ".rsplit(sep=None, maxsplit=0))
+132 + print(["  x"])
+133 | 
+134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
+135 | r"""simple@example.com
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:135:1
@@ -1421,38 +1300,36 @@ SIM905 [*] Consider using a list literal instead of `str.split`
     | |_______________________________________^
     |
 help: Replace with list literal
-
-ℹ Safe fix
-132 132 | print("  x  ".rsplit(sep=None, maxsplit=0))
-133 133 | 
-134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-135     |-r"""simple@example.com
-136     |-very.common@example.com
-137     |-FirstName.LastName@EasierReading.org
-138     |-x@example.com
-139     |-long.email-address-with-hyphens@and.subdomains.example.com
-140     |-user.name+tag+sorting@example.com
-141     |-name/surname@example.com
-142     |-xample@s.example
-143     |-" "@example.org
-144     |-"john..doe"@example.org
-145     |-mailhost!username@example.org
-146     |-"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com
-147     |-user%example.com@example.org
-148     |-user-@example.org
-149     |-I❤️CHOCOLATE@example.com
-150     |-this\ still\"not\\allowed@example.com
-151     |-stellyamburrr985@example.com
-152     |-Abc.123@example.com
-153     |-user+mailbox/department=shipping@example.com
-154     |-!#$%&'*+-/=?^_`.{|}~@example.com
-155     |-"Abc@def"@example.com
-156     |-"Fred\ Bloggs"@example.com
-157     |-"Joe.\\Blow"@example.com""".split("\n")
-    135 |+[r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com']
-158 136 | 
-159 137 | 
-160 138 | r"""first
+132 | print("  x  ".rsplit(sep=None, maxsplit=0))
+133 | 
+134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
+    - r"""simple@example.com
+    - very.common@example.com
+    - FirstName.LastName@EasierReading.org
+    - x@example.com
+    - long.email-address-with-hyphens@and.subdomains.example.com
+    - user.name+tag+sorting@example.com
+    - name/surname@example.com
+    - xample@s.example
+    - " "@example.org
+    - "john..doe"@example.org
+    - mailhost!username@example.org
+    - "very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com
+    - user%example.com@example.org
+    - user-@example.org
+    - I❤️CHOCOLATE@example.com
+    - this\ still\"not\\allowed@example.com
+    - stellyamburrr985@example.com
+    - Abc.123@example.com
+    - user+mailbox/department=shipping@example.com
+    - !#$%&'*+-/=?^_`.{|}~@example.com
+    - "Abc@def"@example.com
+    - "Fred\ Bloggs"@example.com
+    - "Joe.\\Blow"@example.com""".split("\n")
+135 + [r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com']
+136 | 
+137 | 
+138 | r"""first
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:160:1
@@ -1466,19 +1343,17 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 165 |   # https://github.com/astral-sh/ruff/issues/19845
     |
 help: Replace with list literal
-
-ℹ Safe fix
-157 157 | "Joe.\\Blow"@example.com""".split("\n")
-158 158 | 
-159 159 | 
-160     |-r"""first
-161     |-'no need' to escape
-162     |-"swap" quote style
-163     |-"use' ugly triple quotes""".split("\n")
-    160 |+[r"first", r"'no need' to escape", r'"swap" quote style', '"use\' ugly triple quotes']
-164 161 | 
-165 162 | # https://github.com/astral-sh/ruff/issues/19845
-166 163 | print("S\x1cP\x1dL\x1eI\x1fT".split())
+157 | "Joe.\\Blow"@example.com""".split("\n")
+158 | 
+159 | 
+    - r"""first
+    - 'no need' to escape
+    - "swap" quote style
+    - "use' ugly triple quotes""".split("\n")
+160 + [r"first", r"'no need' to escape", r'"swap" quote style', r""""use' ugly triple quotes"""]
+161 | 
+162 | # https://github.com/astral-sh/ruff/issues/19845
+163 | print("S\x1cP\x1dL\x1eI\x1fT".split())
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:166:7
@@ -1490,16 +1365,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
     |
 help: Replace with list literal
-
-ℹ Safe fix
-163 163 | "use' ugly triple quotes""".split("\n")
-164 164 | 
-165 165 | # https://github.com/astral-sh/ruff/issues/19845
-166     |-print("S\x1cP\x1dL\x1eI\x1fT".split())
-    166 |+print(["S", "P", "L", "I", "T"])
-167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-169 169 | 
+163 | "use' ugly triple quotes""".split("\n")
+164 | 
+165 | # https://github.com/astral-sh/ruff/issues/19845
+    - print("S\x1cP\x1dL\x1eI\x1fT".split())
+166 + print(["S", "P", "L", "I", "T"])
+167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
+168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+169 | 
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:167:7
@@ -1511,18 +1384,16 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
     |
 help: Replace with list literal
+164 | 
+165 | # https://github.com/astral-sh/ruff/issues/19845
+166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
+    - print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
+167 + print([">"])
+168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+169 | 
+170 | # leading/trailing whitespace should not count towards maxsplit
 
-ℹ Safe fix
-164 164 | 
-165 165 | # https://github.com/astral-sh/ruff/issues/19845
-166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
-167     |-print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-    167 |+print([">"])
-168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-169 169 | 
-170 170 | # leading/trailing whitespace should not count towards maxsplit
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:168:7
     |
 166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
@@ -1533,16 +1404,14 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 170 | # leading/trailing whitespace should not count towards maxsplit
     |
 help: Replace with list literal
-
-ℹ Safe fix
-165 165 | # https://github.com/astral-sh/ruff/issues/19845
-166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
-167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-168     |-print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-    168 |+print(["<"])
-169 169 | 
-170 170 | # leading/trailing whitespace should not count towards maxsplit
-171 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+165 | # https://github.com/astral-sh/ruff/issues/19845
+166 | print("S\x1cP\x1dL\x1eI\x1fT".split())
+167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
+    - print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+168 + print(["<"])
+169 | 
+170 | # leading/trailing whitespace should not count towards maxsplit
+171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
    --> SIM905.py:171:1
@@ -1551,118 +1420,45 @@ SIM905 [*] Consider using a list literal instead of `str.split`
 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
     |
 help: Replace with list literal
+168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+169 | 
+170 | # leading/trailing whitespace should not count towards maxsplit
+    - " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+171 + ["a", "b", "c d "]  # ["a", "b", "c d "]
+172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
 
-ℹ Safe fix
-168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-169 169 | 
-170 170 | # leading/trailing whitespace should not count towards maxsplit
-171     |-" a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
-    171 |+["a", "b", "c d "]  # ["a", "b", "c d "]
-172 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
-173 173 | 
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-
-SIM905 [*] Consider using a list literal instead of `str.split`
+SIM905 [*] Consider using a list literal instead of `str.rsplit`
    --> SIM905.py:172:1
     |
 170 | # leading/trailing whitespace should not count towards maxsplit
 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-173 |
-174 | # https://github.com/astral-sh/ruff/issues/19610
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
     |
 help: Replace with list literal
-
-ℹ Safe fix
-169 169 | 
-170 170 | # leading/trailing whitespace should not count towards maxsplit
-171 171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
-172     |-" a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
-    172 |+[" a b", "c", "d"]  # [" a b", "c", "d"]
-173 173 | 
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175 175 | r"1" "\n".split("1")  # [r"", "\n"]
+169 | 
+170 | # leading/trailing whitespace should not count towards maxsplit
+171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+    - " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+172 + [" a b", "c", "d"]  # [" a b", "c", "d"]
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
 
 SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:175:1
+   --> SIM905.py:173:1
     |
-174 | # https://github.com/astral-sh/ruff/issues/19610
-175 | r"1" "\n".split("1")  # [r"", "\n"]
-    | ^^^^^^^^^^^^^^^^^^^^
-176 | r"" "\"".split("1")  # ['"']
-177 | r"1" """
-    |
-help: Replace with list literal
-
-ℹ Safe fix
-172 172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
-173 173 | 
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175     |-r"1" "\n".split("1")  # [r"", "\n"]
-    175 |+[r"", '\n']  # [r"", "\n"]
-176 176 | r"" "\"".split("1")  # ['"']
-177 177 | r"1" """
-178 178 | """.split("1")  # [r"", "\n"]
-
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:176:1
-    |
-174 | # https://github.com/astral-sh/ruff/issues/19610
-175 | r"1" "\n".split("1")  # [r"", "\n"]
-176 | r"" "\"".split("1")  # ['"']
-    | ^^^^^^^^^^^^^^^^^^^
-177 | r"1" """
-178 | """.split("1")  # [r"", "\n"]
-    |
-help: Replace with list literal
-
-ℹ Safe fix
-173 173 | 
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175 175 | r"1" "\n".split("1")  # [r"", "\n"]
-176     |-r"" "\"".split("1")  # ['"']
-    176 |+[r'"']  # ['"']
-177 177 | r"1" """
-178 178 | """.split("1")  # [r"", "\n"]
-179 179 | r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:177:1
-    |
-175 |   r"1" "\n".split("1")  # [r"", "\n"]
-176 |   r"" "\"".split("1")  # ['"']
-177 | / r"1" """
-178 | | """.split("1")  # [r"", "\n"]
-    | |______________^
-179 |   r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-    |
-help: Replace with list literal
-
-ℹ Safe fix
-174 174 | # https://github.com/astral-sh/ruff/issues/19610
-175 175 | r"1" "\n".split("1")  # [r"", "\n"]
-176 176 | r"" "\"".split("1")  # ['"']
-177     |-r"1" """
-178     |-""".split("1")  # [r"", "\n"]
-    177 |+[r"", '\n']  # [r"", "\n"]
-179 178 | r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-
-SIM905 [*] Consider using a list literal instead of `str.split`
-   --> SIM905.py:179:1
-    |
-177 | r"1" """
-178 | """.split("1")  # [r"", "\n"]
-179 | r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
+171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+173 | "a  b".split(maxsplit=1)  # ["a", "b"]
     | ^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace with list literal
-
-ℹ Safe fix
-176 176 | r"" "\"".split("1")  # ['"']
-177 177 | r"1" """
-178 178 | """.split("1")  # [r"", "\n"]
-179     |-r"\n" "\n'\"".split("1")  # ["\\n\n'\""]
-    179 |+['\\n\n\'"']  # ["\\n\n'\""]
+170 | # leading/trailing whitespace should not count towards maxsplit
+171 | " a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
+172 | " a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
+    - "a  b".split(maxsplit=1)  # ["a", "b"]
+173 + ["a", "b"]  # ["a", "b"]
diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM910_SIM910.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM910_SIM910.py.snap
new file mode 100644
index 0000000000..79e12c5d8b
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM910_SIM910.py.snap
@@ -0,0 +1,246 @@
+---
+source: crates/ruff_linter/src/rules/flake8_simplify/mod.rs
+---
+SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
+ --> SIM910.py:2:1
+  |
+1 | # SIM910
+2 | {}.get(key, None)
+  | ^^^^^^^^^^^^^^^^^
+3 |
+4 | # SIM910
+  |
+help: Replace `{}.get(key, None)` with `{}.get(key)`
+1 | # SIM910
+  - {}.get(key, None)
+2 + {}.get(key)
+3 | 
+4 | # SIM910
+5 | {}.get("key", None)
+
+SIM910 [*] Use `{}.get("key")` instead of `{}.get("key", None)`
+ --> SIM910.py:5:1
+  |
+4 | # SIM910
+5 | {}.get("key", None)
+  | ^^^^^^^^^^^^^^^^^^^
+6 |
+7 | # OK
+  |
+help: Replace `{}.get("key", None)` with `{}.get("key")`
+2 | {}.get(key, None)
+3 | 
+4 | # SIM910
+  - {}.get("key", None)
+5 + {}.get("key")
+6 | 
+7 | # OK
+8 | {}.get(key)
+
+SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
+  --> SIM910.py:20:9
+   |
+19 | # SIM910
+20 | if a := {}.get(key, None):
+   |         ^^^^^^^^^^^^^^^^^
+21 |     pass
+   |
+help: Replace `{}.get(key, None)` with `{}.get(key)`
+17 | {}.get("key", False)
+18 | 
+19 | # SIM910
+   - if a := {}.get(key, None):
+20 + if a := {}.get(key):
+21 |     pass
+22 | 
+23 | # SIM910
+
+SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
+  --> SIM910.py:24:5
+   |
+23 | # SIM910
+24 | a = {}.get(key, None)
+   |     ^^^^^^^^^^^^^^^^^
+25 |
+26 | # SIM910
+   |
+help: Replace `{}.get(key, None)` with `{}.get(key)`
+21 |     pass
+22 | 
+23 | # SIM910
+   - a = {}.get(key, None)
+24 + a = {}.get(key)
+25 | 
+26 | # SIM910
+27 | ({}).get(key, None)
+
+SIM910 [*] Use `({}).get(key)` instead of `({}).get(key, None)`
+  --> SIM910.py:27:1
+   |
+26 | # SIM910
+27 | ({}).get(key, None)
+   | ^^^^^^^^^^^^^^^^^^^
+28 |
+29 | # SIM910
+   |
+help: Replace `({}).get(key, None)` with `({}).get(key)`
+24 | a = {}.get(key, None)
+25 | 
+26 | # SIM910
+   - ({}).get(key, None)
+27 + ({}).get(key)
+28 | 
+29 | # SIM910
+30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+
+SIM910 [*] Use `ages.get("Cat")` instead of `ages.get("Cat", None)`
+  --> SIM910.py:31:7
+   |
+29 | # SIM910
+30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+31 | age = ages.get("Cat", None)
+   |       ^^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | # OK
+   |
+help: Replace `ages.get("Cat", None)` with `ages.get("Cat")`
+28 | 
+29 | # SIM910
+30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get("Cat", None)
+31 + age = ages.get("Cat")
+32 | 
+33 | # OK
+34 | ages = ["Tom", "Maria", "Dog"]
+
+SIM910 [*] Use `kwargs.get('a')` instead of `kwargs.get('a', None)`
+  --> SIM910.py:39:9
+   |
+37 | # SIM910
+38 | def foo(**kwargs):
+39 |     a = kwargs.get('a', None)
+   |         ^^^^^^^^^^^^^^^^^^^^^
+40 |
+41 | # SIM910
+   |
+help: Replace `kwargs.get('a', None)` with `kwargs.get('a')`
+36 | 
+37 | # SIM910
+38 | def foo(**kwargs):
+   -     a = kwargs.get('a', None)
+39 +     a = kwargs.get('a')
+40 | 
+41 | # SIM910
+42 | def foo(some_dict: dict):
+
+SIM910 [*] Use `some_dict.get('a')` instead of `some_dict.get('a', None)`
+  --> SIM910.py:43:9
+   |
+41 | # SIM910
+42 | def foo(some_dict: dict):
+43 |     a = some_dict.get('a', None)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
+44 |
+45 | # OK
+   |
+help: Replace `some_dict.get('a', None)` with `some_dict.get('a')`
+40 | 
+41 | # SIM910
+42 | def foo(some_dict: dict):
+   -     a = some_dict.get('a', None)
+43 +     a = some_dict.get('a')
+44 | 
+45 | # OK
+46 | def foo(some_other: object):
+
+SIM910 [*] Use `dict.get("Cat")` instead of `dict.get("Cat", None)`
+  --> SIM910.py:57:11
+   |
+55 | def foo():
+56 |     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
+57 |     age = dict.get("Cat", None)
+   |           ^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Replace `dict.get("Cat", None)` with `dict.get("Cat")`
+54 | # https://github.com/astral-sh/ruff/issues/18777
+55 | def foo():
+56 |     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
+   -     age = dict.get("Cat", None)
+57 +     age = dict.get("Cat")
+58 | 
+59 | 
+60 | # https://github.com/astral-sh/ruff/issues/20341
+
+SIM910 [*] Use `ages.get(key_source.get("Thomas", "Tom"))` instead of `ages.get(key_source.get("Thomas", "Tom"), None)`
+  --> SIM910.py:64:7
+   |
+62 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+63 | key_source = {"Thomas": "Tom"}
+64 | age = ages.get(key_source.get("Thomas", "Tom"), None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+65 |
+66 | # Property access as key
+   |
+help: Replace `ages.get(key_source.get("Thomas", "Tom"), None)` with `ages.get(key_source.get("Thomas", "Tom"))`
+61 | # Method call as key
+62 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+63 | key_source = {"Thomas": "Tom"}
+   - age = ages.get(key_source.get("Thomas", "Tom"), None)
+64 + age = ages.get(key_source.get("Thomas", "Tom"))
+65 | 
+66 | # Property access as key
+67 | class Data:
+
+SIM910 [*] Use `ages.get(data.name)` instead of `ages.get(data.name, None)`
+  --> SIM910.py:73:7
+   |
+71 | data = Data()
+72 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+73 | age = ages.get(data.name, None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^
+74 |
+75 | # Complex expression as key
+   |
+help: Replace `ages.get(data.name, None)` with `ages.get(data.name)`
+70 | 
+71 | data = Data()
+72 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get(data.name, None)
+73 + age = ages.get(data.name)
+74 | 
+75 | # Complex expression as key
+76 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+
+SIM910 [*] Use `ages.get("Tom" if True else "Maria")` instead of `ages.get("Tom" if True else "Maria", None)`
+  --> SIM910.py:77:7
+   |
+75 | # Complex expression as key
+76 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+77 | age = ages.get("Tom" if True else "Maria", None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+78 |
+79 | # Function call as key
+   |
+help: Replace `ages.get("Tom" if True else "Maria", None)` with `ages.get("Tom" if True else "Maria")`
+74 | 
+75 | # Complex expression as key
+76 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get("Tom" if True else "Maria", None)
+77 + age = ages.get("Tom" if True else "Maria")
+78 | 
+79 | # Function call as key
+80 | def get_key():
+
+SIM910 [*] Use `ages.get(get_key())` instead of `ages.get(get_key(), None)`
+  --> SIM910.py:84:7
+   |
+83 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+84 | age = ages.get(get_key(), None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Replace `ages.get(get_key(), None)` with `ages.get(get_key())`
+81 |     return "Tom"
+82 | 
+83 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get(get_key(), None)
+84 + age = ages.get(get_key())
diff --git a/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_namedtuple_subclass.rs b/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_namedtuple_subclass.rs
index 37d2084c96..142233a4bf 100644
--- a/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_namedtuple_subclass.rs
+++ b/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_namedtuple_subclass.rs
@@ -47,6 +47,7 @@ use crate::rules::flake8_slots::helpers::has_slots;
 /// ## References
 /// - [Python documentation: `__slots__`](https://docs.python.org/3/reference/datamodel.html#slots)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct NoSlotsInNamedtupleSubclass(NamedTupleKind);
 
 impl Violation for NoSlotsInNamedtupleSubclass {
diff --git a/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_str_subclass.rs b/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_str_subclass.rs
index 198071aaa4..6ab13988e7 100644
--- a/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_str_subclass.rs
+++ b/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_str_subclass.rs
@@ -39,6 +39,7 @@ use crate::rules::flake8_slots::helpers::has_slots;
 /// ## References
 /// - [Python documentation: `__slots__`](https://docs.python.org/3/reference/datamodel.html#slots)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct NoSlotsInStrSubclass;
 
 impl Violation for NoSlotsInStrSubclass {
diff --git a/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_tuple_subclass.rs b/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_tuple_subclass.rs
index dd9cea0ad3..addc7bd421 100644
--- a/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_tuple_subclass.rs
+++ b/crates/ruff_linter/src/rules/flake8_slots/rules/no_slots_in_tuple_subclass.rs
@@ -40,6 +40,7 @@ use crate::rules::flake8_slots::helpers::has_slots;
 /// ## References
 /// - [Python documentation: `__slots__`](https://docs.python.org/3/reference/datamodel.html#slots)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct NoSlotsInTupleSubclass;
 
 impl Violation for NoSlotsInTupleSubclass {
diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_api.rs b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_api.rs
index dc352e3e4e..6ada015222 100644
--- a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_api.rs
+++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_api.rs
@@ -25,6 +25,7 @@ use crate::rules::flake8_tidy_imports::matchers::NameMatchPolicy;
 /// ## Options
 /// - `lint.flake8-tidy-imports.banned-api`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.201")]
 pub(crate) struct BannedApi {
     name: String,
     message: String,
diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_module_level_imports.rs b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_module_level_imports.rs
index 6527d8d522..23d250f7a9 100644
--- a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_module_level_imports.rs
+++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_module_level_imports.rs
@@ -43,6 +43,7 @@ use crate::rules::flake8_tidy_imports::matchers::{MatchName, MatchNameOrParent,
 /// ## Options
 /// - `lint.flake8-tidy-imports.banned-module-level-imports`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.285")]
 pub(crate) struct BannedModuleLevelImports {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs
index 1e6ac5e4ca..bc77a55716 100644
--- a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs
+++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs
@@ -46,6 +46,7 @@ use crate::rules::flake8_tidy_imports::settings::Strictness;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#imports
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.169")]
 pub(crate) struct RelativeImports {
     strictness: Strictness,
 }
@@ -101,7 +102,7 @@ fn fix_banned_relative_import(
         names: names.clone(),
         level: 0,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let content = generator.stmt(&node.into());
     Some(Fix::unsafe_edit(Edit::range_replacement(
diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap b/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap
index 0829419730..e02c73ccdb 100644
--- a/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap
+++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap
@@ -23,16 +23,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules
 8 | from .. import server
   |
 help: Replace relative imports from parent modules with absolute imports
-
-ℹ Unsafe fix
-3 3 | import attrs
-4 4 | 
-5 5 | from ....import unknown
-6   |-from ..protocol import commands, definitions, responses
-  6 |+from my_package.sublib.protocol import commands, definitions, responses
-7 7 | from ..server import example
-8 8 | from .. import server
-9 9 | from . import logger, models
+3 | import attrs
+4 | 
+5 | from ....import unknown
+  - from ..protocol import commands, definitions, responses
+6 + from my_package.sublib.protocol import commands, definitions, responses
+7 | from ..server import example
+8 | from .. import server
+9 | from . import logger, models
+note: This is an unsafe fix and may change runtime behavior
 
 TID252 [*] Prefer absolute imports over relative imports from parent modules
  --> application.py:6:1
@@ -44,16 +43,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules
 8 | from .. import server
   |
 help: Replace relative imports from parent modules with absolute imports
-
-ℹ Unsafe fix
-3 3 | import attrs
-4 4 | 
-5 5 | from ....import unknown
-6   |-from ..protocol import commands, definitions, responses
-  6 |+from my_package.sublib.protocol import commands, definitions, responses
-7 7 | from ..server import example
-8 8 | from .. import server
-9 9 | from . import logger, models
+3 | import attrs
+4 | 
+5 | from ....import unknown
+  - from ..protocol import commands, definitions, responses
+6 + from my_package.sublib.protocol import commands, definitions, responses
+7 | from ..server import example
+8 | from .. import server
+9 | from . import logger, models
+note: This is an unsafe fix and may change runtime behavior
 
 TID252 [*] Prefer absolute imports over relative imports from parent modules
  --> application.py:6:1
@@ -65,16 +63,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules
 8 | from .. import server
   |
 help: Replace relative imports from parent modules with absolute imports
-
-ℹ Unsafe fix
-3 3 | import attrs
-4 4 | 
-5 5 | from ....import unknown
-6   |-from ..protocol import commands, definitions, responses
-  6 |+from my_package.sublib.protocol import commands, definitions, responses
-7 7 | from ..server import example
-8 8 | from .. import server
-9 9 | from . import logger, models
+3 | import attrs
+4 | 
+5 | from ....import unknown
+  - from ..protocol import commands, definitions, responses
+6 + from my_package.sublib.protocol import commands, definitions, responses
+7 | from ..server import example
+8 | from .. import server
+9 | from . import logger, models
+note: This is an unsafe fix and may change runtime behavior
 
 TID252 [*] Prefer absolute imports over relative imports from parent modules
  --> application.py:7:1
@@ -87,16 +84,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules
 9 | from . import logger, models
   |
 help: Replace relative imports from parent modules with absolute imports
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | from ....import unknown
-6 6 | from ..protocol import commands, definitions, responses
-7   |-from ..server import example
-  7 |+from my_package.sublib.server import example
-8 8 | from .. import server
-9 9 | from . import logger, models
-10 10 | from ..protocol.UpperCaseModule import some_function
+4  | 
+5  | from ....import unknown
+6  | from ..protocol import commands, definitions, responses
+   - from ..server import example
+7  + from my_package.sublib.server import example
+8  | from .. import server
+9  | from . import logger, models
+10 | from ..protocol.UpperCaseModule import some_function
+note: This is an unsafe fix and may change runtime behavior
 
 TID252 [*] Prefer absolute imports over relative imports from parent modules
   --> application.py:8:1
@@ -109,15 +105,14 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules
 10 | from ..protocol.UpperCaseModule import some_function
    |
 help: Replace relative imports from parent modules with absolute imports
-
-ℹ Unsafe fix
-5 5 | from ....import unknown
-6 6 | from ..protocol import commands, definitions, responses
-7 7 | from ..server import example
-8   |-from .. import server
-  8 |+from my_package.sublib import server
-9 9 | from . import logger, models
-10 10 | from ..protocol.UpperCaseModule import some_function
+5  | from ....import unknown
+6  | from ..protocol import commands, definitions, responses
+7  | from ..server import example
+   - from .. import server
+8  + from my_package.sublib import server
+9  | from . import logger, models
+10 | from ..protocol.UpperCaseModule import some_function
+note: This is an unsafe fix and may change runtime behavior
 
 TID252 [*] Prefer absolute imports over relative imports from parent modules
   --> application.py:10:1
@@ -128,10 +123,9 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace relative imports from parent modules with absolute imports
-
-ℹ Unsafe fix
-7  7  | from ..server import example
-8  8  | from .. import server
-9  9  | from . import logger, models
-10    |-from ..protocol.UpperCaseModule import some_function
-   10 |+from my_package.sublib.protocol.UpperCaseModule import some_function
+7  | from ..server import example
+8  | from .. import server
+9  | from . import logger, models
+   - from ..protocol.UpperCaseModule import some_function
+10 + from my_package.sublib.protocol.UpperCaseModule import some_function
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_todos/rules/todos.rs b/crates/ruff_linter/src/rules/flake8_todos/rules/todos.rs
index 24125023a6..b46e4d44aa 100644
--- a/crates/ruff_linter/src/rules/flake8_todos/rules/todos.rs
+++ b/crates/ruff_linter/src/rules/flake8_todos/rules/todos.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix, Violation};
 /// # TODO(ruff): this is now fixed!
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct InvalidTodoTag {
     pub tag: String,
 }
@@ -61,6 +62,7 @@ impl Violation for InvalidTodoTag {
 /// # TODO(charlie): now an author is assigned
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct MissingTodoAuthor;
 
 impl Violation for MissingTodoAuthor {
@@ -102,6 +104,7 @@ impl Violation for MissingTodoAuthor {
 /// # SIXCHR-003
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct MissingTodoLink;
 
 impl Violation for MissingTodoLink {
@@ -131,6 +134,7 @@ impl Violation for MissingTodoLink {
 /// # TODO(charlie): colon fixed
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct MissingTodoColon;
 
 impl Violation for MissingTodoColon {
@@ -158,6 +162,7 @@ impl Violation for MissingTodoColon {
 /// # TODO(charlie): fix some issue
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct MissingTodoDescription;
 
 impl Violation for MissingTodoDescription {
@@ -185,6 +190,7 @@ impl Violation for MissingTodoDescription {
 /// # TODO(charlie): this is capitalized
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct InvalidTodoCapitalization {
     tag: String,
 }
@@ -222,6 +228,7 @@ impl AlwaysFixableViolation for InvalidTodoCapitalization {
 /// # TODO(charlie): fix this
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct MissingSpaceAfterTodoColon;
 
 impl Violation for MissingSpaceAfterTodoColon {
diff --git a/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap b/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap
index 3876b47eba..500a7c7140 100644
--- a/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap
@@ -12,15 +12,13 @@ TD006 [*] Invalid TODO capitalization: `ToDo` should be `TODO`
 7 | # foo # todo: invalid capitalization
   |
 help: Replace `ToDo` with `TODO`
-
-ℹ Safe fix
-2 2 | # TODO (evanrittenhouse): this is a valid TODO
-3 3 | # Todoism is a word which starts with todo, but is not a todo
-4 4 | # TDO006 - error
-5   |-# ToDo (evanrittenhouse): invalid capitalization
-  5 |+# TODO (evanrittenhouse): invalid capitalization
-6 6 | # todo (evanrittenhouse): another invalid capitalization
-7 7 | # foo # todo: invalid capitalization
+2 | # TODO (evanrittenhouse): this is a valid TODO
+3 | # Todoism is a word which starts with todo, but is not a todo
+4 | # TDO006 - error
+  - # ToDo (evanrittenhouse): invalid capitalization
+5 + # TODO (evanrittenhouse): invalid capitalization
+6 | # todo (evanrittenhouse): another invalid capitalization
+7 | # foo # todo: invalid capitalization
 
 TD006 [*] Invalid TODO capitalization: `todo` should be `TODO`
  --> TD006.py:6:3
@@ -32,14 +30,12 @@ TD006 [*] Invalid TODO capitalization: `todo` should be `TODO`
 7 | # foo # todo: invalid capitalization
   |
 help: Replace `todo` with `TODO`
-
-ℹ Safe fix
-3 3 | # Todoism is a word which starts with todo, but is not a todo
-4 4 | # TDO006 - error
-5 5 | # ToDo (evanrittenhouse): invalid capitalization
-6   |-# todo (evanrittenhouse): another invalid capitalization
-  6 |+# TODO (evanrittenhouse): another invalid capitalization
-7 7 | # foo # todo: invalid capitalization
+3 | # Todoism is a word which starts with todo, but is not a todo
+4 | # TDO006 - error
+5 | # ToDo (evanrittenhouse): invalid capitalization
+  - # todo (evanrittenhouse): another invalid capitalization
+6 + # TODO (evanrittenhouse): another invalid capitalization
+7 | # foo # todo: invalid capitalization
 
 TD006 [*] Invalid TODO capitalization: `todo` should be `TODO`
  --> TD006.py:7:9
@@ -50,10 +46,8 @@ TD006 [*] Invalid TODO capitalization: `todo` should be `TODO`
   |         ^^^^
   |
 help: Replace `todo` with `TODO`
-
-ℹ Safe fix
-4 4 | # TDO006 - error
-5 5 | # ToDo (evanrittenhouse): invalid capitalization
-6 6 | # todo (evanrittenhouse): another invalid capitalization
-7   |-# foo # todo: invalid capitalization
-  7 |+# foo # TODO: invalid capitalization
+4 | # TDO006 - error
+5 | # ToDo (evanrittenhouse): invalid capitalization
+6 | # todo (evanrittenhouse): another invalid capitalization
+  - # foo # todo: invalid capitalization
+7 + # foo # TODO: invalid capitalization
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs b/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs
index 6725e2f4b0..03368702d3 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs
@@ -66,7 +66,7 @@ impl TypingReference {
             }
 
             // prefer `from __future__ import annotations` to quoting
-            if settings.future_annotations()
+            if settings.future_annotations
                 && !reference.in_typing_only_annotation()
                 && reference.in_runtime_evaluated_annotation()
             {
@@ -436,7 +436,7 @@ impl<'a> QuoteAnnotator<'a> {
         let annotation = subgenerator.expr(&expr_without_forward_references);
         generator.expr(&Expr::from(ast::StringLiteral {
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             value: annotation.into_boxed_str(),
             flags: self.flags,
         }))
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/mod.rs b/crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
index 2b66b3a567..fd8f08626d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
@@ -14,7 +14,6 @@ mod tests {
     use test_case::test_case;
 
     use crate::registry::{Linter, Rule};
-    use crate::settings::types::PreviewMode;
     use crate::test::{test_path, test_snippet};
     use crate::{assert_diagnostics, settings};
 
@@ -86,7 +85,6 @@ mod tests {
             Path::new("flake8_type_checking").join(path).as_path(),
             &settings::LinterSettings {
                 future_annotations: true,
-                preview: PreviewMode::Enabled,
                 // also enable quoting annotations to check the interaction. the future import
                 // should take precedence.
                 flake8_type_checking: super::settings::Settings {
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs
index c6b935929d..4299a91804 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs
@@ -33,6 +33,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## References
 /// - [PEP 563: Runtime annotation resolution and `TYPE_CHECKING`](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct EmptyTypeCheckingBlock;
 
 impl AlwaysFixableViolation for EmptyTypeCheckingBlock {
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_cast_value.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_cast_value.rs
index 1db267f677..40c210dee1 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_cast_value.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_cast_value.rs
@@ -43,6 +43,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// This fix is safe as long as the type expression doesn't span multiple
 /// lines and includes comments on any of the lines apart from the last one.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct RuntimeCastValue;
 
 impl AlwaysFixableViolation for RuntimeCastValue {
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
index e3cbf17a02..e96b3b7bc6 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
@@ -54,6 +54,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// ## References
 /// - [PEP 563: Runtime annotation resolution and `TYPE_CHECKING`](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct RuntimeImportInTypeCheckingBlock {
     qualified_name: String,
     strategy: Strategy,
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_string_union.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_string_union.rs
index 1c103e0db8..40c6a066b6 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_string_union.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_string_union.rs
@@ -53,6 +53,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 604]: https://peps.python.org/pep-0604/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct RuntimeStringUnion;
 
 impl Violation for RuntimeStringUnion {
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/type_alias_quotes.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/type_alias_quotes.rs
index 53c1d004c3..776ce1486e 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/type_alias_quotes.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/type_alias_quotes.rs
@@ -49,6 +49,7 @@ use ruff_python_ast::parenthesize::parenthesized_range;
 ///
 /// [PEP 613]: https://peps.python.org/pep-0613/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct UnquotedTypeAlias;
 
 impl Violation for UnquotedTypeAlias {
@@ -133,6 +134,7 @@ impl Violation for UnquotedTypeAlias {
 /// [PYI020]: https://docs.astral.sh/ruff/rules/quoted-annotation-in-stub/
 /// [UP037]: https://docs.astral.sh/ruff/rules/quoted-annotation/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.8.1")]
 pub(crate) struct QuotedTypeAlias;
 
 impl AlwaysFixableViolation for QuotedTypeAlias {
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
index 9789ce417d..f1918596b1 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
@@ -11,12 +11,10 @@ use crate::checkers::ast::{Checker, DiagnosticGuard};
 use crate::codes::Rule;
 use crate::fix;
 use crate::importer::ImportedMembers;
-use crate::preview::is_full_path_match_source_strategy_enabled;
 use crate::rules::flake8_type_checking::helpers::{
     TypingReference, filter_contained, quote_annotation,
 };
 use crate::rules::flake8_type_checking::imports::ImportBinding;
-use crate::rules::isort::categorize::MatchSourceStrategy;
 use crate::rules::isort::{ImportSection, ImportType, categorize};
 use crate::{Fix, FixAvailability, Violation};
 
@@ -40,6 +38,13 @@ use crate::{Fix, FixAvailability, Violation};
 /// [`lint.flake8-type-checking.runtime-evaluated-decorators`] settings to mark them
 /// as such.
 ///
+/// If [`lint.future-annotations`] is set to `true`, `from __future__ import
+/// annotations` will be added if doing so would enable an import to be
+/// moved into an `if TYPE_CHECKING:` block. This takes precedence over the
+/// [`lint.flake8-type-checking.quote-annotations`] setting described above if
+/// both settings are enabled.
+///
+///
 /// ## Example
 /// ```python
 /// from __future__ import annotations
@@ -65,18 +70,6 @@ use crate::{Fix, FixAvailability, Violation};
 ///     return len(sized)
 /// ```
 ///
-///
-/// ## Preview
-/// When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
-/// the criterion for determining whether an import is first-party
-/// is stricter, which could affect whether this lint is triggered vs [`TC001`](https://docs.astral.sh/ruff/rules/typing-only-third-party-import/). See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.
-///
-/// If [`lint.future-annotations`] is set to `true`, `from __future__ import
-/// annotations` will be added if doing so would enable an import to be moved into an `if
-/// TYPE_CHECKING:` block. This takes precedence over the
-/// [`lint.flake8-type-checking.quote-annotations`] setting described above if both settings are
-/// enabled.
-///
 /// ## Options
 /// - `lint.flake8-type-checking.quote-annotations`
 /// - `lint.flake8-type-checking.runtime-evaluated-base-classes`
@@ -88,6 +81,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// ## References
 /// - [PEP 563: Runtime annotation resolution and `TYPE_CHECKING`](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct TypingOnlyFirstPartyImport {
     qualified_name: String,
 }
@@ -128,6 +122,12 @@ impl Violation for TypingOnlyFirstPartyImport {
 /// [`lint.flake8-type-checking.runtime-evaluated-decorators`] settings to mark them
 /// as such.
 ///
+/// If [`lint.future-annotations`] is set to `true`, `from __future__ import
+/// annotations` will be added if doing so would enable an import to be
+/// moved into an `if TYPE_CHECKING:` block. This takes precedence over the
+/// [`lint.flake8-type-checking.quote-annotations`] setting described above if
+/// both settings are enabled.
+///
 /// ## Example
 /// ```python
 /// from __future__ import annotations
@@ -153,17 +153,6 @@ impl Violation for TypingOnlyFirstPartyImport {
 ///     return len(df)
 /// ```
 ///
-/// ## Preview
-/// When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
-/// the criterion for determining whether an import is first-party
-/// is stricter, which could affect whether this lint is triggered vs [`TC001`](https://docs.astral.sh/ruff/rules/typing-only-first-party-import/). See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.
-///
-/// If [`lint.future-annotations`] is set to `true`, `from __future__ import
-/// annotations` will be added if doing so would enable an import to be moved into an `if
-/// TYPE_CHECKING:` block. This takes precedence over the
-/// [`lint.flake8-type-checking.quote-annotations`] setting described above if both settings are
-/// enabled.
-///
 /// ## Options
 /// - `lint.flake8-type-checking.quote-annotations`
 /// - `lint.flake8-type-checking.runtime-evaluated-base-classes`
@@ -175,6 +164,7 @@ impl Violation for TypingOnlyFirstPartyImport {
 /// ## References
 /// - [PEP 563: Runtime annotation resolution and `TYPE_CHECKING`](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct TypingOnlyThirdPartyImport {
     qualified_name: String,
 }
@@ -215,6 +205,12 @@ impl Violation for TypingOnlyThirdPartyImport {
 /// [`lint.flake8-type-checking.runtime-evaluated-decorators`] settings to mark them
 /// as such.
 ///
+/// If [`lint.future-annotations`] is set to `true`, `from __future__ import
+/// annotations` will be added if doing so would enable an import to be
+/// moved into an `if TYPE_CHECKING:` block. This takes precedence over the
+/// [`lint.flake8-type-checking.quote-annotations`] setting described above if
+/// both settings are enabled.
+///
 /// ## Example
 /// ```python
 /// from __future__ import annotations
@@ -240,15 +236,6 @@ impl Violation for TypingOnlyThirdPartyImport {
 ///     return str(path)
 /// ```
 ///
-/// ## Preview
-///
-/// When [preview](https://docs.astral.sh/ruff/preview/) is enabled, if
-/// [`lint.future-annotations`] is set to `true`, `from __future__ import
-/// annotations` will be added if doing so would enable an import to be moved into an `if
-/// TYPE_CHECKING:` block. This takes precedence over the
-/// [`lint.flake8-type-checking.quote-annotations`] setting described above if both settings are
-/// enabled.
-///
 /// ## Options
 /// - `lint.flake8-type-checking.quote-annotations`
 /// - `lint.flake8-type-checking.runtime-evaluated-base-classes`
@@ -260,6 +247,7 @@ impl Violation for TypingOnlyThirdPartyImport {
 /// ## References
 /// - [PEP 563: Runtime annotation resolution and `TYPE_CHECKING`](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct TypingOnlyStandardLibraryImport {
     qualified_name: String,
 }
@@ -297,7 +285,7 @@ pub(crate) fn typing_only_runtime_import(
 
         // If we can't add a `__future__` import and in un-strict mode, don't flag typing-only
         // imports that are implicitly loaded by way of a valid runtime import.
-        if !checker.settings().future_annotations()
+        if !checker.settings().future_annotations
             && !checker.settings().flake8_type_checking.strict
             && runtime_imports
                 .iter()
@@ -347,13 +335,6 @@ pub(crate) fn typing_only_runtime_import(
         let source_name = import.source_name().join(".");
 
         // Categorize the import, using coarse-grained categorization.
-        let match_source_strategy =
-            if is_full_path_match_source_strategy_enabled(checker.settings()) {
-                MatchSourceStrategy::FullPath
-            } else {
-                MatchSourceStrategy::Root
-            };
-
         let import_type = match categorize(
             &source_name,
             qualified_name.is_unresolved_import(),
@@ -365,7 +346,6 @@ pub(crate) fn typing_only_runtime_import(
             checker.settings().isort.no_sections,
             &checker.settings().isort.section_order,
             &checker.settings().isort.default_section,
-            match_source_strategy,
         ) {
             ImportSection::Known(ImportType::LocalFolder | ImportType::FirstParty) => {
                 ImportType::FirstParty
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap
index 4dbb82a063..2d3e377e1f 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap
@@ -10,21 +10,19 @@ TC003 [*] Move standard library import `collections.Counter` into a type-checkin
 3 | from elsewhere import third_party
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1     |-from collections import Counter
-   1  |+from __future__ import annotations
-2  2  | 
-3  3  | from elsewhere import third_party
-4  4  | 
-5  5  | from . import first_party
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from collections import Counter
-6  10 | 
-7  11 | 
-8  12 | def f(x: first_party.foo): ...
+   - from collections import Counter
+1  | 
+2  | from elsewhere import third_party
+3  | 
+4  | from . import first_party
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from collections import Counter
+9  | 
+10 | 
+11 | def f(x: first_party.foo): ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `elsewhere.third_party` into a type-checking block
  --> TC001-3_future.py:3:23
@@ -37,21 +35,19 @@ TC002 [*] Move third-party import `elsewhere.third_party` into a type-checking b
 5 | from . import first_party
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from collections import Counter
-2  3  | 
-3     |-from elsewhere import third_party
-4  4  | 
-5  5  | from . import first_party
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from elsewhere import third_party
-6  10 | 
-7  11 | 
-8  12 | def f(x: first_party.foo): ...
+1  | from collections import Counter
+2  | 
+   - from elsewhere import third_party
+3  | 
+4  | from . import first_party
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from elsewhere import third_party
+9  | 
+10 | 
+11 | def f(x: first_party.foo): ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC001 [*] Move application import `.first_party` into a type-checking block
  --> TC001-3_future.py:5:15
@@ -62,18 +58,15 @@ TC001 [*] Move application import `.first_party` into a type-checking block
   |               ^^^^^^^^^^^
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from collections import Counter
-2  3  | 
-3  4  | from elsewhere import third_party
-4  5  | 
-5     |-from . import first_party
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from . import first_party
-6  10 | 
-7  11 | 
-8  12 | def f(x: first_party.foo): ...
+2  | 
+3  | from elsewhere import third_party
+4  | 
+   - from . import first_party
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from . import first_party
+9  | 
+10 | 
+11 | def f(x: first_party.foo): ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap
index f9b554bbbc..bfe8aee71b 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap
@@ -11,23 +11,22 @@ TC001 [*] Move application import `.TYP001` into a type-checking block
 22 |     x: TYP001
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | For typing-only import detection tests, see `TC002.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():
+2  | 
+3  | For typing-only import detection tests, see `TC002.py`.
+4  | """
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from . import TYP001
+9  | 
+10 | 
+11 | def f():
 --------------------------------------------------------------------------------
-17 21 | 
-18 22 | 
-19 23 | def f():
-20    |-    from . import TYP001
-21 24 | 
-22 25 |     x: TYP001
-23 26 |
+21 | 
+22 | 
+23 | def f():
+   -     from . import TYP001
+24 | 
+25 |     x: TYP001
+26 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap
index b775c34e96..12b5aa40f2 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap
@@ -11,18 +11,16 @@ TC001 [*] Move application import `.first_party` into a type-checking block
 4 |     def f(x: first_party.foo): ...
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1   |-def f():
-  1 |+from __future__ import annotations
-  2 |+from typing import TYPE_CHECKING
-  3 |+
-  4 |+if TYPE_CHECKING:
-2 5 |     from . import first_party
-  6 |+def f():
-3 7 | 
-4 8 |     def f(x: first_party.foo): ...
-5 9 | 
+  - def f():
+1 + from typing import TYPE_CHECKING
+2 + 
+3 + if TYPE_CHECKING:
+4 |     from . import first_party
+5 + def f():
+6 | 
+7 |     def f(x: first_party.foo): ...
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC001 [*] Move application import `.foo` into a type-checking block
   --> TC001_future.py:57:19
@@ -34,25 +32,19 @@ TC001 [*] Move application import `.foo` into a type-checking block
 59 |     def f(x: Union[foo.Ty, int]): ...
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | def f():
-2  3  |     from . import first_party
-3  4  | 
---------------------------------------------------------------------------------
-50 51 | 
-51 52 | 
-52 53 | # unions
-53    |-from typing import Union
-   54 |+from typing import Union, TYPE_CHECKING
-54 55 | 
-   56 |+if TYPE_CHECKING:
-   57 |+    from . import foo
-   58 |+
-55 59 | 
-56 60 | def n():
-57    |-    from . import foo
-58 61 | 
-59 62 |     def f(x: Union[foo.Ty, int]): ...
-60 63 |     def g(x: foo.Ty | int): ...
+50 | 
+51 | 
+52 | # unions
+   - from typing import Union
+53 + from typing import Union, TYPE_CHECKING
+54 + 
+55 + if TYPE_CHECKING:
+56 +     from . import foo
+57 | 
+58 | 
+59 | def n():
+   -     from . import foo
+60 | 
+61 |     def f(x: Union[foo.Ty, int]): ...
+62 |     def g(x: foo.Ty | int): ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap
index b3105c9e1f..f9a8f3ab78 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap
@@ -10,15 +10,14 @@ TC001 [*] Move application import `.first_party` into a type-checking block
   |               ^^^^^^^^^^^
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from . import first_party
-  3 |+from typing import TYPE_CHECKING
-  4 |+
-  5 |+if TYPE_CHECKING:
-  6 |+    from . import first_party
-4 7 | 
-5 8 | 
-6 9 | def f(x: first_party.foo): ...
+1 | from __future__ import annotations
+2 | 
+  - from . import first_party
+3 + from typing import TYPE_CHECKING
+4 + 
+5 + if TYPE_CHECKING:
+6 +     from . import first_party
+7 | 
+8 | 
+9 | def f(x: first_party.foo): ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap
index f060bd6715..d84c1fff21 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap
@@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 7 |     x: pd.DataFrame
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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  # TC002
-6 9 | 
-7 10 |     x: pd.DataFrame
-8 11 | 
+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
+6  | 
+7  | 
+8  | def f():
+   -     import pandas as pd  # TC002
+9  | 
+10 |     x: pd.DataFrame
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:11:24
@@ -36,24 +35,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 13 |     x: DataFrame
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-8  12 | 
-9  13 | 
-10 14 | def f():
-11    |-    from pandas import DataFrame  # TC002
-12 15 | 
-13 16 |     x: DataFrame
-14 17 | 
+12 | 
+13 | 
+14 | def f():
+   -     from pandas import DataFrame  # TC002
+15 | 
+16 |     x: DataFrame
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:17:37
@@ -65,24 +63,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 19 |     x: df
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-14 18 | 
-15 19 | 
-16 20 | def f():
-17    |-    from pandas import DataFrame as df  # TC002
-18 21 | 
-19 22 |     x: df
-20 23 | 
+18 | 
+19 | 
+20 | def f():
+   -     from pandas import DataFrame as df  # TC002
+21 | 
+22 |     x: df
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> TC002.py:23:22
@@ -94,24 +91,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 25 |     x: pd.DataFrame = 1
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-20 24 | 
-21 25 | 
-22 26 | def f():
-23    |-    import pandas as pd  # TC002
-24 27 | 
-25 28 |     x: pd.DataFrame = 1
-26 29 | 
+24 | 
+25 | 
+26 | def f():
+   -     import pandas as pd  # TC002
+27 | 
+28 |     x: pd.DataFrame = 1
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:29:24
@@ -123,24 +119,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 31 |     x: DataFrame = 2
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-26 30 | 
-27 31 | 
-28 32 | def f():
-29    |-    from pandas import DataFrame  # TC002
-30 33 | 
-31 34 |     x: DataFrame = 2
-32 35 | 
+30 | 
+31 | 
+32 | def f():
+   -     from pandas import DataFrame  # TC002
+33 | 
+34 |     x: DataFrame = 2
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:35:37
@@ -152,24 +147,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 37 |     x: df = 3
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-32 36 | 
-33 37 | 
-34 38 | def f():
-35    |-    from pandas import DataFrame as df  # TC002
-36 39 | 
-37 40 |     x: df = 3
-38 41 | 
+36 | 
+37 | 
+38 | def f():
+   -     from pandas import DataFrame as df  # TC002
+39 | 
+40 |     x: df = 3
+41 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> TC002.py:41:22
@@ -181,24 +175,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 43 |     x: "pd.DataFrame" = 1
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-38 42 | 
-39 43 | 
-40 44 | def f():
-41    |-    import pandas as pd  # TC002
-42 45 | 
-43 46 |     x: "pd.DataFrame" = 1
-44 47 | 
+42 | 
+43 | 
+44 | def f():
+   -     import pandas as pd  # TC002
+45 | 
+46 |     x: "pd.DataFrame" = 1
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> TC002.py:47:22
@@ -210,51 +203,20 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 49 |     x = dict["pd.DataFrame", "pd.DataFrame"]
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-44 48 | 
-45 49 | 
-46 50 | def f():
-47    |-    import pandas as pd  # TC002
-48 51 | 
-49 52 |     x = dict["pd.DataFrame", "pd.DataFrame"]
-50 53 | 
-
-TC002 [*] Move third-party import `module.Member` into a type-checking block
-   --> TC002.py:172:24
-    |
-170 |     global Member
-171 |
-172 |     from module import Member
-    |                        ^^^^^^
-173 |
-174 |     x: Member = 1
-    |
-help: Move into type-checking block
-
-ℹ Unsafe 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 module import Member
-2   6   | 
-3   7   | 
-4   8   | def f():
---------------------------------------------------------------------------------
-169 173 | def f():
-170 174 |     global Member
-171 175 | 
-172     |-    from module import Member
-173 176 | 
-174 177 |     x: Member = 1
-175 178 |
+48 | 
+49 | 
+50 | def f():
+   -     import pandas as pd  # TC002
+51 | 
+52 |     x = dict["pd.DataFrame", "pd.DataFrame"]
+53 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap
index 90bd90e695..c2f1077e90 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap
@@ -11,19 +11,18 @@ TC003 [*] Move standard library import `os` into a type-checking block
 10 |     x: os
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | For typing-only import detection tests, see `TC002.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 |
+2  | 
+3  | For typing-only import detection tests, see `TC002.py`.
+4  | """
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     import os
+9  | 
+10 | 
+11 | def f():
+   -     import os
+12 | 
+13 |     x: os
+14 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap
index 169c38f1ad..687ede833c 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap
@@ -9,15 +9,13 @@ TC005 [*] Found empty type-checking block
   |     ^^^^
   |
 help: Delete empty type-checking block
-
-ℹ Safe fix
-1 1 | from typing import TYPE_CHECKING, List
-2 2 | 
-3   |-if TYPE_CHECKING:
-4   |-    pass  # TC005
-5 3 | 
-6 4 | 
-7 5 | def example():
+1 | from typing import TYPE_CHECKING, List
+2 | 
+  - if TYPE_CHECKING:
+  -     pass  # TC005
+3 | 
+4 | 
+5 | def example():
 
 TC005 [*] Found empty type-checking block
   --> TC005.py:9:9
@@ -29,16 +27,14 @@ TC005 [*] Found empty type-checking block
 10 |     return
    |
 help: Delete empty type-checking block
-
-ℹ Safe fix
-5  5  | 
-6  6  | 
-7  7  | def example():
-8     |-    if TYPE_CHECKING:
-9     |-        pass  # TC005
-10 8  |     return
-11 9  | 
-12 10 | 
+5  | 
+6  | 
+7  | def example():
+   -     if TYPE_CHECKING:
+   -         pass  # TC005
+8  |     return
+9  | 
+10 | 
 
 TC005 [*] Found empty type-checking block
   --> TC005.py:15:9
@@ -50,16 +46,14 @@ TC005 [*] Found empty type-checking block
 16 |     x = 2
    |
 help: Delete empty type-checking block
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 | class Test:
-14    |-    if TYPE_CHECKING:
-15    |-        pass  # TC005
-16 14 |     x = 2
-17 15 | 
-18 16 | 
+11 | 
+12 | 
+13 | class Test:
+   -     if TYPE_CHECKING:
+   -         pass  # TC005
+14 |     x = 2
+15 | 
+16 | 
 
 TC005 [*] Found empty type-checking block
   --> TC005.py:31:5
@@ -71,13 +65,11 @@ TC005 [*] Found empty type-checking block
 33 | # https://github.com/astral-sh/ruff/issues/11368
    |
 help: Delete empty type-checking block
-
-ℹ Safe fix
-27 27 | 
-28 28 | from typing_extensions import TYPE_CHECKING
-29 29 | 
-30    |-if TYPE_CHECKING:
-31    |-    pass  # TC005
-32 30 | 
-33 31 | # https://github.com/astral-sh/ruff/issues/11368
-34 32 | if TYPE_CHECKING:
+27 | 
+28 | from typing_extensions import TYPE_CHECKING
+29 | 
+   - if TYPE_CHECKING:
+   -     pass  # TC005
+30 | 
+31 | # https://github.com/astral-sh/ruff/issues/11368
+32 | if TYPE_CHECKING:
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap
index 013562d793..a9aba38fd7 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap
@@ -11,19 +11,18 @@ TC002 [*] Move third-party import `flask` into a type-checking block
 16 |     x: flask
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import flask
+5  | def f():
+6  |     import pandas as pd
+7  | 
 --------------------------------------------------------------------------------
-11 15 | 
-12 16 | 
-13 17 | def f():
-14    |-    import flask
-15 18 | 
-16 19 |     x: flask
+15 | 
+16 | 
+17 | def f():
+   -     import flask
+18 | 
+19 |     x: flask
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap
index bf88fa10a8..a19eef7095 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap
@@ -12,16 +12,15 @@ TC003 [*] Move standard library import `pathlib` into a type-checking block
 6 | TYPE_CHECKING = False
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1 1 | 
-2 2 | from __future__ import annotations
-3 3 | 
-4   |-import pathlib  # TC003
-5 4 | 
-6 5 | TYPE_CHECKING = False
-7 6 | if TYPE_CHECKING:
-  7 |+    import pathlib
-8 8 |     from types import TracebackType
-9 9 | 
-10 10 | def foo(tb: TracebackType) -> pathlib.Path: ...
+1  | 
+2  | from __future__ import annotations
+3  | 
+   - import pathlib  # TC003
+4  | 
+5  | TYPE_CHECKING = False
+6  | if TYPE_CHECKING:
+7  +     import pathlib
+8  |     from types import TracebackType
+9  | 
+10 | def foo(tb: TracebackType) -> pathlib.Path: ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap
index 38f00f2e07..1a71220df1 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap
@@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 7 | )
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+2  | from __future__ import annotations
+3  | 
+4  | from pandas import (
+   -     DataFrame,  # DataFrame
+5  |     Series,  # Series
+6  | )
+7  + from typing import TYPE_CHECKING
+8  + 
+9  + if TYPE_CHECKING:
+10 +     from pandas import (
+11 +         DataFrame,  # DataFrame
+12 +         )
+13 | 
+14 | def f(x: DataFrame):
+15 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap
index 57b5fc2893..5c98fbf524 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap
@@ -11,19 +11,18 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 9 | )
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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):
+4  | from typing import TYPE_CHECKING
+5  | 
+6  | from pandas import (
+   -     DataFrame,  # DataFrame
+7  |     Series,  # Series
+8  | )
+9  | 
+10 | if TYPE_CHECKING:
+11 +     from pandas import (
+12 +         DataFrame,  # DataFrame
+13 +         )
+14 |     import os
+15 | 
+16 | def f(x: DataFrame):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap
index 23b306e112..c3a7e639b1 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap
@@ -11,24 +11,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 9 | )
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - from pandas import (
+   -     DataFrame,  # DataFrame
+   -     Series,  # Series
+   - )
+6  | 
+7  + if TYPE_CHECKING:
+8  +     from pandas import (
+9  +         DataFrame,  # DataFrame
+10 +         Series,  # Series
+11 +     )
+12 + 
+13 | def f(x: DataFrame, y: Series):
+14 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.Series` into a type-checking block
  --> <filename>:8:5
@@ -40,21 +39,20 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block
 9 | )
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - from pandas import (
+   -     DataFrame,  # DataFrame
+   -     Series,  # Series
+   - )
+6  | 
+7  + if TYPE_CHECKING:
+8  +     from pandas import (
+9  +         DataFrame,  # DataFrame
+10 +         Series,  # Series
+11 +     )
+12 + 
+13 | def f(x: DataFrame, y: Series):
+14 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap
index b0fae941ba..17a481674e 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap
@@ -12,19 +12,18 @@ TC003 [*] Move standard library import `os` into a type-checking block
 8 | def f(x: os, y: pandas):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import os, pandas
+6  + import pandas
+7  + 
+8  + if TYPE_CHECKING:
+9  +     import os
+10 | 
+11 | def f(x: os, y: pandas):
+12 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
  --> <filename>:6:12
@@ -37,16 +36,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 8 | def f(x: os, y: pandas):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import os, pandas
+6  + import os
+7  + 
+8  + if TYPE_CHECKING:
+9  +     import pandas
+10 | 
+11 | def f(x: os, y: pandas):
+12 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap
index fe26ff1dcd..00d8e9adb4 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap
@@ -12,18 +12,17 @@ TC003 [*] Move standard library import `os` into a type-checking block
 8 | def f(x: os, y: sys):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import os, sys
+6  | 
+7  + if TYPE_CHECKING:
+8  +     import os, sys
+9  + 
+10 | def f(x: os, y: sys):
+11 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC003 [*] Move standard library import `sys` into a type-checking block
  --> <filename>:6:12
@@ -36,15 +35,14 @@ TC003 [*] Move standard library import `sys` into a type-checking block
 8 | def f(x: os, y: sys):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import os, sys
+6  | 
+7  + if TYPE_CHECKING:
+8  +     import os, sys
+9  + 
+10 | def f(x: os, y: sys):
+11 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap
index 6861baaee0..5c4b9abf1c 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap
@@ -12,16 +12,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 6 | def f(x: pd.DataFrame):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+1  | 
+2  | from __future__ import annotations
+3  | 
+   - import pandas as pd
+4  + from typing import TYPE_CHECKING
+5  + 
+6  + if TYPE_CHECKING:
+7  +     import pandas as pd
+8  | 
+9  | def f(x: pd.DataFrame):
+10 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap
index 7943a3d635..fc9bc371c3 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap
@@ -12,15 +12,13 @@ TC008 [*] Remove quotes from type alias
 12 |     f: TypeAlias = 'dict[str, int | None]'  # OK
    |
 help: Remove quotes
-
-ℹ Safe fix
-7  7  | 
-8  8  | if TYPE_CHECKING:
-9  9  |     c: TypeAlias = 'int | None'  # OK
-10    |-    d: TypeAlias = 'Annotated[int, 1 | 2]'  # TC008
-   10 |+    d: TypeAlias = Annotated[int, 1 | 2]  # TC008
-11 11 |     e: TypeAlias = 'Annotated[int, 1 + 2]'  # TC008
-12 12 |     f: TypeAlias = 'dict[str, int | None]'  # OK
+7  | 
+8  | if TYPE_CHECKING:
+9  |     c: TypeAlias = 'int | None'  # OK
+   -     d: TypeAlias = 'Annotated[int, 1 | 2]'  # TC008
+10 +     d: TypeAlias = Annotated[int, 1 | 2]  # TC008
+11 |     e: TypeAlias = 'Annotated[int, 1 + 2]'  # TC008
+12 |     f: TypeAlias = 'dict[str, int | None]'  # OK
 
 TC008 [*] Remove quotes from type alias
   --> TC008_union_syntax_pre_py310.py:11:20
@@ -32,11 +30,9 @@ TC008 [*] Remove quotes from type alias
 12 |     f: TypeAlias = 'dict[str, int | None]'  # OK
    |
 help: Remove quotes
-
-ℹ Safe fix
-8  8  | if TYPE_CHECKING:
-9  9  |     c: TypeAlias = 'int | None'  # OK
-10 10 |     d: TypeAlias = 'Annotated[int, 1 | 2]'  # TC008
-11    |-    e: TypeAlias = 'Annotated[int, 1 + 2]'  # TC008
-   11 |+    e: TypeAlias = Annotated[int, 1 + 2]  # TC008
-12 12 |     f: TypeAlias = 'dict[str, int | None]'  # OK
+8  | if TYPE_CHECKING:
+9  |     c: TypeAlias = 'int | None'  # OK
+10 |     d: TypeAlias = 'Annotated[int, 1 | 2]'  # TC008
+   -     e: TypeAlias = 'Annotated[int, 1 + 2]'  # TC008
+11 +     e: TypeAlias = Annotated[int, 1 + 2]  # TC008
+12 |     f: TypeAlias = 'dict[str, int | None]'  # OK
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap
index 24cd5aa546..22bae5d08e 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap
@@ -1,27 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
 ---
-TC004 [*] Quote references to `pandas.DataFrame`. Import is in a type-checking block.
-  --> quote.py:57:28
-   |
-56 |     if TYPE_CHECKING:
-57 |         from pandas import DataFrame
-   |                            ^^^^^^^^^
-58 |
-59 |     def func(value: DataFrame):
-   |
-help: Quote references
-
-ℹ Unsafe fix
-56 56 |     if TYPE_CHECKING:
-57 57 |         from pandas import DataFrame
-58 58 | 
-59    |-    def func(value: DataFrame):
-   59 |+    def func(value: "DataFrame"):
-60 60 |         ...
-61 61 | 
-62 62 | 
-
 TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is used for more than type hinting.
    --> quote.py:110:28
     |
@@ -32,17 +11,16 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u
 112 |     x: TypeAlias = DataFrame | None
     |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-    1   |+from pandas import DataFrame
-1   2   | def f():
-2   3   |     from pandas import DataFrame
-3   4   | 
+1   + from pandas import DataFrame
+2   | def f():
+3   |     from pandas import DataFrame
+4   | 
 --------------------------------------------------------------------------------
-107 108 |     from typing import TypeAlias, TYPE_CHECKING
-108 109 | 
-109 110 |     if TYPE_CHECKING:
-110     |-        from pandas import DataFrame
-    111 |+        pass
-111 112 | 
-112 113 |     x: TypeAlias = DataFrame | None
+108 |     from typing import TypeAlias, TYPE_CHECKING
+109 | 
+110 |     if TYPE_CHECKING:
+    -         from pandas import DataFrame
+111 +         pass
+112 | 
+113 |     x: TypeAlias = DataFrame | None
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap
index 452c839561..8efb644122 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap
@@ -11,20 +11,16 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 4 |     def baz() -> DataFrame:
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1   |-def f():
-  1 |+from typing import TYPE_CHECKING
-  2 |+
-  3 |+if TYPE_CHECKING:
-2 4 |     from pandas import DataFrame
-  5 |+def f():
-3 6 | 
-4   |-    def baz() -> DataFrame:
-  7 |+    def baz() -> "DataFrame":
-5 8 |         ...
-6 9 | 
-7 10 | 
+  - def f():
+1 + from typing import TYPE_CHECKING
+2 + 
+3 + if TYPE_CHECKING:
+4 |     from pandas import DataFrame
+5 + def f():
+6 | 
+7 |     def baz() -> DataFrame:
+8 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> quote.py:9:24
@@ -36,26 +32,22 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 11 |     def baz() -> DataFrame[int]:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-6  10 | 
-7  11 | 
-8  12 | def f():
-9     |-    from pandas import DataFrame
-10 13 | 
-11    |-    def baz() -> DataFrame[int]:
-   14 |+    def baz() -> "DataFrame[int]":
-12 15 |         ...
-13 16 | 
-14 17 | 
+10 | 
+11 | 
+12 | def f():
+   -     from pandas import DataFrame
+13 | 
+14 |     def baz() -> DataFrame[int]:
+15 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> quote.py:16:22
@@ -67,26 +59,22 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 18 |     def baz() -> pd.DataFrame:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    import pandas as pd
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import pandas as pd
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-13 17 | 
-14 18 | 
-15 19 | def f():
-16    |-    import pandas as pd
-17 20 | 
-18    |-    def baz() -> pd.DataFrame:
-   21 |+    def baz() -> "pd.DataFrame":
-19 22 |         ...
-20 23 | 
-21 24 | 
+17 | 
+18 | 
+19 | def f():
+   -     import pandas as pd
+20 | 
+21 |     def baz() -> pd.DataFrame:
+22 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> quote.py:23:22
@@ -98,26 +86,22 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 25 |     def baz() -> pd.DataFrame.Extra:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    import pandas as pd
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import pandas as pd
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-20 24 | 
-21 25 | 
-22 26 | def f():
-23    |-    import pandas as pd
-24 27 | 
-25    |-    def baz() -> pd.DataFrame.Extra:
-   28 |+    def baz() -> "pd.DataFrame.Extra":
-26 29 |         ...
-27 30 | 
-28 31 | 
+24 | 
+25 | 
+26 | def f():
+   -     import pandas as pd
+27 | 
+28 |     def baz() -> pd.DataFrame.Extra:
+29 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> quote.py:30:22
@@ -129,26 +113,22 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 32 |     def baz() -> pd.DataFrame | int:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    import pandas as pd
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import pandas as pd
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-27 31 | 
-28 32 | 
-29 33 | def f():
-30    |-    import pandas as pd
-31 34 | 
-32    |-    def baz() -> pd.DataFrame | int:
-   35 |+    def baz() -> "pd.DataFrame | int":
-33 36 |         ...
-34 37 | 
-35 38 | 
+31 | 
+32 | 
+33 | def f():
+   -     import pandas as pd
+34 | 
+35 |     def baz() -> pd.DataFrame | int:
+36 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> quote.py:38:24
@@ -160,26 +140,22 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 40 |     def baz() -> DataFrame():
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-35 39 | 
-36 40 | 
-37 41 | def f():
-38    |-    from pandas import DataFrame
-39 42 | 
-40    |-    def baz() -> DataFrame():
-   43 |+    def baz() -> "DataFrame()":
-41 44 |         ...
-42 45 | 
-43 46 | 
+39 | 
+40 | 
+41 | def f():
+   -     from pandas import DataFrame
+42 | 
+43 |     def baz() -> DataFrame():
+44 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> quote.py:47:24
@@ -192,26 +168,22 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 49 |     def baz() -> DataFrame[Literal["int"]]:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-44 48 | def f():
-45 49 |     from typing import Literal
-46 50 | 
-47    |-    from pandas import DataFrame
-48 51 | 
-49    |-    def baz() -> DataFrame[Literal["int"]]:
-   52 |+    def baz() -> "DataFrame[Literal['int']]":
-50 53 |         ...
-51 54 | 
-52 55 | 
+48 | def f():
+49 |     from typing import Literal
+50 | 
+   -     from pandas import DataFrame
+51 | 
+52 |     def baz() -> DataFrame[Literal["int"]]:
+53 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> quote.py:64:24
@@ -223,26 +195,22 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 66 |     def baz() -> DataFrame | Series:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame, Series
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-61 65 | 
-62 66 | 
-63 67 | def f():
-64    |-    from pandas import DataFrame, Series
-65 68 | 
-66    |-    def baz() -> DataFrame | Series:
-   69 |+    def baz() -> "DataFrame | Series":
-67 70 |         ...
-68 71 | 
-69 72 | 
+65 | 
+66 | 
+67 | def f():
+   -     from pandas import DataFrame, Series
+68 | 
+69 |     def baz() -> DataFrame | Series:
+70 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.Series` into a type-checking block
   --> quote.py:64:35
@@ -254,26 +222,22 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block
 66 |     def baz() -> DataFrame | Series:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame, Series
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-61 65 | 
-62 66 | 
-63 67 | def f():
-64    |-    from pandas import DataFrame, Series
-65 68 | 
-66    |-    def baz() -> DataFrame | Series:
-   69 |+    def baz() -> "DataFrame | Series":
-67 70 |         ...
-68 71 | 
-69 72 | 
+65 | 
+66 | 
+67 | def f():
+   -     from pandas import DataFrame, Series
+68 | 
+69 |     def baz() -> DataFrame | Series:
+70 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> quote.py:71:24
@@ -285,39 +249,22 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 73 |     def baz() -> (
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame, Series
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-68 72 | 
-69 73 | 
-70 74 | def f():
-71    |-    from pandas import DataFrame, Series
-72 75 | 
-73 76 |     def baz() -> (
-74    |-        DataFrame |
-75    |-        Series
-   77 |+        "DataFrame | Series"
-76 78 |     ):
-77 79 |         ...
-78 80 | 
-79 81 |     class C:
-80    |-        x: DataFrame[
-81    |-            int
-82    |-        ] = 1
-   82 |+        x: "DataFrame[int]" = 1
-83 83 | 
-84    |-    def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]:
-   84 |+    def func() -> "DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]":
-85 85 |         ...
-86 86 | 
-87 87 | 
+72 | 
+73 | 
+74 | def f():
+   -     from pandas import DataFrame, Series
+75 | 
+76 |     def baz() -> (
+77 |         DataFrame |
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.Series` into a type-checking block
   --> quote.py:71:35
@@ -329,39 +276,22 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block
 73 |     def baz() -> (
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame, Series
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-68 72 | 
-69 73 | 
-70 74 | def f():
-71    |-    from pandas import DataFrame, Series
-72 75 | 
-73 76 |     def baz() -> (
-74    |-        DataFrame |
-75    |-        Series
-   77 |+        "DataFrame | Series"
-76 78 |     ):
-77 79 |         ...
-78 80 | 
-79 81 |     class C:
-80    |-        x: DataFrame[
-81    |-            int
-82    |-        ] = 1
-   82 |+        x: "DataFrame[int]" = 1
-83 83 | 
-84    |-    def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]:
-   84 |+    def func() -> "DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]":
-85 85 |         ...
-86 86 | 
-87 87 | 
+72 | 
+73 | 
+74 | def f():
+   -     from pandas import DataFrame, Series
+75 | 
+76 |     def baz() -> (
+77 |         DataFrame |
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> quote.py:89:24
@@ -373,26 +303,22 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 91 |     def func(self) -> DataFrame | list[Series]:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame, Series
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-86 90 | 
-87 91 | 
-88 92 | def f():
-89    |-    from pandas import DataFrame, Series
-90 93 | 
-91    |-    def func(self) -> DataFrame | list[Series]:
-   94 |+    def func(self) -> "DataFrame | list[Series]":
-92 95 |         pass
-93 96 | 
-94 97 | 
+90 | 
+91 | 
+92 | def f():
+   -     from pandas import DataFrame, Series
+93 | 
+94 |     def func(self) -> DataFrame | list[Series]:
+95 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.Series` into a type-checking block
   --> quote.py:89:35
@@ -404,23 +330,19 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block
 91 |     def func(self) -> DataFrame | list[Series]:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame, Series
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
 --------------------------------------------------------------------------------
-86 90 | 
-87 91 | 
-88 92 | def f():
-89    |-    from pandas import DataFrame, Series
-90 93 | 
-91    |-    def func(self) -> DataFrame | list[Series]:
-   94 |+    def func(self) -> "DataFrame | list[Series]":
-92 95 |         pass
-93 96 | 
-94 97 |
+90 | 
+91 | 
+92 | def f():
+   -     from pandas import DataFrame, Series
+93 | 
+94 |     def func(self) -> DataFrame | list[Series]:
+95 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap
index 3cb135c374..5e0b5862ab 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap
@@ -11,20 +11,16 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 4 |     def test_remove_inner_quotes_double(self, user: AbstractBaseUser["int"]):
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1   |-def f():
-  1 |+from typing import TYPE_CHECKING
-  2 |+
-  3 |+if TYPE_CHECKING:
-2 4 |     from django.contrib.auth.models import AbstractBaseUser
-  5 |+def f():
-3 6 | 
-4   |-    def test_remove_inner_quotes_double(self, user: AbstractBaseUser["int"]):
-  7 |+    def test_remove_inner_quotes_double(self, user: "AbstractBaseUser[int]"):
-5 8 |         pass
-6 9 | 
-7 10 | 
+  - def f():
+1 + from typing import TYPE_CHECKING
+2 + 
+3 + if TYPE_CHECKING:
+4 |     from django.contrib.auth.models import AbstractBaseUser
+5 + def f():
+6 | 
+7 |     def test_remove_inner_quotes_double(self, user: AbstractBaseUser["int"]):
+8 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:9:44
@@ -36,26 +32,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 11 |     def test_remove_inner_quotes_single(self, user: AbstractBaseUser['int']):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-6  10 | 
-7  11 | 
-8  12 | def f():
-9     |-    from django.contrib.auth.models import AbstractBaseUser
-10 13 | 
-11    |-    def test_remove_inner_quotes_single(self, user: AbstractBaseUser['int']):
-   14 |+    def test_remove_inner_quotes_single(self, user: "AbstractBaseUser[int]"):
-12 15 |         pass
-13 16 | 
-14 17 | 
+10 | 
+11 | 
+12 | def f():
+   -     from django.contrib.auth.models import AbstractBaseUser
+13 | 
+14 |     def test_remove_inner_quotes_single(self, user: AbstractBaseUser['int']):
+15 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:16:44
@@ -67,26 +59,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 18 |     def test_remove_inner_quotes_mixed(self, user: AbstractBaseUser['int', "str"]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-13 17 | 
-14 18 | 
-15 19 | def f():
-16    |-    from django.contrib.auth.models import AbstractBaseUser
-17 20 | 
-18    |-    def test_remove_inner_quotes_mixed(self, user: AbstractBaseUser['int', "str"]):
-   21 |+    def test_remove_inner_quotes_mixed(self, user: "AbstractBaseUser[int, str]"):
-19 22 |         pass
-20 23 | 
-21 24 | 
+17 | 
+18 | 
+19 | def f():
+   -     from django.contrib.auth.models import AbstractBaseUser
+20 | 
+21 |     def test_remove_inner_quotes_mixed(self, user: AbstractBaseUser['int', "str"]):
+22 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:25:44
@@ -99,26 +87,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 27 |     def test_literal_annotation_args_contain_quotes(self, type1: AbstractBaseUser[Literal["user", "admin"], Annotated["int", "1", 2]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-22 26 | def f():
-23 27 |     from typing import Annotated, Literal
-24 28 | 
-25    |-    from django.contrib.auth.models import AbstractBaseUser
-26 29 | 
-27    |-    def test_literal_annotation_args_contain_quotes(self, type1: AbstractBaseUser[Literal["user", "admin"], Annotated["int", "1", 2]]):
-   30 |+    def test_literal_annotation_args_contain_quotes(self, type1: "AbstractBaseUser[Literal['user', 'admin'], Annotated[int, '1', 2]]"):
-28 31 |         pass
-29 32 | 
-30 33 | 
+26 | def f():
+27 |     from typing import Annotated, Literal
+28 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+29 | 
+30 |     def test_literal_annotation_args_contain_quotes(self, type1: AbstractBaseUser[Literal["user", "admin"], Annotated["int", "1", 2]]):
+31 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:34:44
@@ -131,26 +115,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 36 |     def test_union_contain_inner_quotes(self, type1: AbstractBaseUser["int" | Literal["int"]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-31 35 | def f():
-32 36 |     from typing import Literal
-33 37 | 
-34    |-    from django.contrib.auth.models import AbstractBaseUser
-35 38 | 
-36    |-    def test_union_contain_inner_quotes(self, type1: AbstractBaseUser["int" | Literal["int"]]):
-   39 |+    def test_union_contain_inner_quotes(self, type1: "AbstractBaseUser[int | Literal['int']]"):
-37 40 |         pass
-38 41 | 
-39 42 | 
+35 | def f():
+36 |     from typing import Literal
+37 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+38 | 
+39 |     def test_union_contain_inner_quotes(self, type1: AbstractBaseUser["int" | Literal["int"]]):
+40 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:43:44
@@ -163,26 +143,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 45 |     def test_inner_literal_mixed_quotes(user: AbstractBaseUser[Literal['user', "admin"]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-40 44 | def f():
-41 45 |     from typing import Literal
-42 46 | 
-43    |-    from django.contrib.auth.models import AbstractBaseUser
-44 47 | 
-45    |-    def test_inner_literal_mixed_quotes(user: AbstractBaseUser[Literal['user', "admin"]]):
-   48 |+    def test_inner_literal_mixed_quotes(user: "AbstractBaseUser[Literal['user', 'admin']]"):
-46 49 |         pass
-47 50 | 
-48 51 | 
+44 | def f():
+45 |     from typing import Literal
+46 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+47 | 
+48 |     def test_inner_literal_mixed_quotes(user: AbstractBaseUser[Literal['user', "admin"]]):
+49 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:52:44
@@ -195,26 +171,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 54 |     def test_inner_literal_single_quote(user: AbstractBaseUser[Literal['int'], str]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-49 53 | def f():
-50 54 |     from typing import Literal
-51 55 | 
-52    |-    from django.contrib.auth.models import AbstractBaseUser
-53 56 | 
-54    |-    def test_inner_literal_single_quote(user: AbstractBaseUser[Literal['int'], str]):
-   57 |+    def test_inner_literal_single_quote(user: "AbstractBaseUser[Literal['int'], str]"):
-55 58 |         pass
-56 59 | 
-57 60 | 
+53 | def f():
+54 |     from typing import Literal
+55 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+56 | 
+57 |     def test_inner_literal_single_quote(user: AbstractBaseUser[Literal['int'], str]):
+58 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:61:44
@@ -227,26 +199,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 63 |     def test_mixed_quotes_literal(user: AbstractBaseUser[Literal['user'], "int"]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-58 62 | def f():
-59 63 |     from typing import Literal
-60 64 | 
-61    |-    from django.contrib.auth.models import AbstractBaseUser
-62 65 | 
-63    |-    def test_mixed_quotes_literal(user: AbstractBaseUser[Literal['user'], "int"]):
-   66 |+    def test_mixed_quotes_literal(user: "AbstractBaseUser[Literal['user'], int]"):
-64 67 |         pass
-65 68 | 
-66 69 | 
+62 | def f():
+63 |     from typing import Literal
+64 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+65 | 
+66 |     def test_mixed_quotes_literal(user: AbstractBaseUser[Literal['user'], "int"]):
+67 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote2.py:70:44
@@ -259,23 +227,19 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 72 |     def test_annotated_literal_mixed_quotes(user: AbstractBaseUser[Annotated[str, "max_length=20", Literal['user', "admin"]]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from django.contrib.auth.models import AbstractBaseUser
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from django.contrib.auth.models import AbstractBaseUser
+7  | 
 --------------------------------------------------------------------------------
-67 71 | def f():
-68 72 |     from typing import Annotated, Literal
-69 73 | 
-70    |-    from django.contrib.auth.models import AbstractBaseUser
-71 74 | 
-72    |-    def test_annotated_literal_mixed_quotes(user: AbstractBaseUser[Annotated[str, "max_length=20", Literal['user', "admin"]]]):
-   75 |+    def test_annotated_literal_mixed_quotes(user: "AbstractBaseUser[Annotated[str, 'max_length=20', Literal['user', 'admin']]]"):
-73 76 |         pass
-74 77 | 
-75 78 |
+71 | def f():
+72 |     from typing import Annotated, Literal
+73 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+74 | 
+75 |     def test_annotated_literal_mixed_quotes(user: AbstractBaseUser[Annotated[str, "max_length=20", Literal['user', "admin"]]]):
+76 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap
index 61e7ae28ed..5877229b63 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap
@@ -12,22 +12,18 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 6 |     def test_union_literal_mixed_quotes(user: AbstractBaseUser[Union[Literal['active', "inactive"], str]]):
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
-4     |-    from django.contrib.auth.models import AbstractBaseUser
-5  8  | 
-6     |-    def test_union_literal_mixed_quotes(user: AbstractBaseUser[Union[Literal['active', "inactive"], str]]):
-   9  |+    def test_union_literal_mixed_quotes(user: 'AbstractBaseUser[Union[Literal["active", "inactive"], str]]'):
-7  10 |         pass
-8  11 | 
-9  12 | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+8  | 
+9  |     def test_union_literal_mixed_quotes(user: AbstractBaseUser[Union[Literal['active', "inactive"], str]]):
+10 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote3.py:13:44
@@ -40,26 +36,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 15 |     def test_callable_literal_mixed_quotes(callable_fn: AbstractBaseUser[Callable[["int", Literal['admin', "user"]], 'bool']]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
 --------------------------------------------------------------------------------
-10 14 | def f():
-11 15 |     from typing import Callable, Literal
-12 16 | 
-13    |-    from django.contrib.auth.models import AbstractBaseUser
-14 17 | 
-15    |-    def test_callable_literal_mixed_quotes(callable_fn: AbstractBaseUser[Callable[["int", Literal['admin', "user"]], 'bool']]):
-   18 |+    def test_callable_literal_mixed_quotes(callable_fn: 'AbstractBaseUser[Callable[[int, Literal["admin", "user"]], bool]]'):
-16 19 |         pass
-17 20 | 
-18 21 | 
+14 | def f():
+15 |     from typing import Callable, Literal
+16 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+17 | 
+18 |     def test_callable_literal_mixed_quotes(callable_fn: AbstractBaseUser[Callable[["int", Literal['admin', "user"]], 'bool']]):
+19 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block
   --> quote3.py:22:44
@@ -72,26 +64,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser`
 24 |     def test_callable_annotated_literal(callable_fn: AbstractBaseUser[Callable[[int, Annotated[str, Literal['active', "inactive"]]], b…
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth.models import AbstractBaseUser
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth.models import AbstractBaseUser
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
 --------------------------------------------------------------------------------
-19 23 | def f():
-20 24 |     from typing import Annotated, Callable, Literal
-21 25 | 
-22    |-    from django.contrib.auth.models import AbstractBaseUser
-23 26 | 
-24    |-    def test_callable_annotated_literal(callable_fn: AbstractBaseUser[Callable[[int, Annotated[str, Literal['active', "inactive"]]], bool]]):
-   27 |+    def test_callable_annotated_literal(callable_fn: 'AbstractBaseUser[Callable[[int, Annotated[str, Literal["active", "inactive"]]], bool]]'):
-25 28 |         pass
-26 29 | 
-27 30 | 
+23 | def f():
+24 |     from typing import Annotated, Callable, Literal
+25 | 
+   -     from django.contrib.auth.models import AbstractBaseUser
+26 | 
+27 |     def test_callable_annotated_literal(callable_fn: AbstractBaseUser[Callable[[int, Annotated[str, Literal['active', "inactive"]]], bool]]):
+28 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models` into a type-checking block
   --> quote3.py:31:37
@@ -104,26 +92,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models` into a type-check
 33 |     def test_attribute(arg: models.AbstractBaseUser["int"]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth import models
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth import models
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
 --------------------------------------------------------------------------------
-28 32 | def f():
-29 33 |     from typing import literal
-30 34 | 
-31    |-    from django.contrib.auth import models
-32 35 | 
-33    |-    def test_attribute(arg: models.AbstractBaseUser["int"]):
-   36 |+    def test_attribute(arg: 'models.AbstractBaseUser[int]'):
-34 37 |         pass
-35 38 | 
-36 39 | 
+32 | def f():
+33 |     from typing import literal
+34 | 
+   -     from django.contrib.auth import models
+35 | 
+36 |     def test_attribute(arg: models.AbstractBaseUser["int"]):
+37 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `django.contrib.auth.models` into a type-checking block
   --> quote3.py:40:37
@@ -136,26 +120,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models` into a type-check
 42 |     def test_attribute_typing_literal(arg: models.AbstractBaseUser[Literal["admin"]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from django.contrib.auth import models
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from django.contrib.auth import models
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
 --------------------------------------------------------------------------------
-37 41 | def f():
-38 42 |     from typing import Literal
-39 43 | 
-40    |-    from django.contrib.auth import models
-41 44 | 
-42    |-    def test_attribute_typing_literal(arg: models.AbstractBaseUser[Literal["admin"]]):
-   45 |+    def test_attribute_typing_literal(arg: 'models.AbstractBaseUser[Literal["admin"]]'):
-43 46 |         pass
-44 47 | 
-45 48 | 
+41 | def f():
+42 |     from typing import Literal
+43 | 
+   -     from django.contrib.auth import models
+44 | 
+45 |     def test_attribute_typing_literal(arg: models.AbstractBaseUser[Literal["admin"]]):
+46 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `third_party.Type` into a type-checking block
   --> quote3.py:59:29
@@ -168,26 +148,22 @@ TC002 [*] Move third-party import `third_party.Type` into a type-checking block
 61 |     def test_string_contains_opposite_quote(self, type1: Type[Literal["'"]], type2: Type[Literal["\'"]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from third_party import Type
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from third_party import Type
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
 --------------------------------------------------------------------------------
-56 60 | 
-57 61 | def f():
-58 62 |     from typing import Literal
-59    |-    from third_party import Type
-60 63 | 
-61    |-    def test_string_contains_opposite_quote(self, type1: Type[Literal["'"]], type2: Type[Literal["\'"]]):
-   64 |+    def test_string_contains_opposite_quote(self, type1: 'Type[Literal["\'"]]', type2: 'Type[Literal["\'"]]'):
-62 65 |         pass
-63 66 | 
-64 67 | 
+60 | 
+61 | def f():
+62 |     from typing import Literal
+   -     from third_party import Type
+63 | 
+64 |     def test_string_contains_opposite_quote(self, type1: Type[Literal["'"]], type2: Type[Literal["\'"]]):
+65 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `third_party.Type` into a type-checking block
   --> quote3.py:67:29
@@ -200,21 +176,19 @@ TC002 [*] Move third-party import `third_party.Type` into a type-checking block
 69 |     def test_quote_contains_backslash(self, type1: Type[Literal["\n"]], type2: Type[Literal["\""]]):
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from third_party import Type
-1  5  | def f():
-2  6  |     from typing import Literal, Union
-3  7  | 
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from third_party import Type
+5  | def f():
+6  |     from typing import Literal, Union
+7  | 
 --------------------------------------------------------------------------------
-64 68 | 
-65 69 | def f():
-66 70 |     from typing import Literal
-67    |-    from third_party import Type
-68 71 | 
-69    |-    def test_quote_contains_backslash(self, type1: Type[Literal["\n"]], type2: Type[Literal["\""]]):
-   72 |+    def test_quote_contains_backslash(self, type1: 'Type[Literal["\\n"]]', type2: 'Type[Literal[\'"\']]'):
-70 73 |         pass
+68 | 
+69 | def f():
+70 |     from typing import Literal
+   -     from third_party import Type
+71 | 
+72 |     def test_quote_contains_backslash(self, type1: Type[Literal["\n"]], type2: Type[Literal["\""]]):
+73 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap
index bc584f9775..53f8bb88a0 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap
@@ -12,16 +12,14 @@ TC008 [*] Remove quotes from type alias
 17 | c: TypeAlias = 'Foo'   # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-12 12 | else:
-13 13 |     Bar = Foo
-14 14 | 
-15    |-a: TypeAlias = 'int'  # TC008
-   15 |+a: TypeAlias = int  # TC008
-16 16 | b: TypeAlias = 'Dict'  # OK
-17 17 | c: TypeAlias = 'Foo'   # TC008
-18 18 | d: TypeAlias = 'Foo[str]'  # OK
+12 | else:
+13 |     Bar = Foo
+14 | 
+   - a: TypeAlias = 'int'  # TC008
+15 + a: TypeAlias = int  # TC008
+16 | b: TypeAlias = 'Dict'  # OK
+17 | c: TypeAlias = 'Foo'   # TC008
+18 | d: TypeAlias = 'Foo[str]'  # OK
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:17:16
@@ -34,16 +32,14 @@ TC008 [*] Remove quotes from type alias
 19 | e: TypeAlias = 'Foo.bar'  # OK
    |
 help: Remove quotes
-
-ℹ Safe fix
-14 14 | 
-15 15 | a: TypeAlias = 'int'  # TC008
-16 16 | b: TypeAlias = 'Dict'  # OK
-17    |-c: TypeAlias = 'Foo'   # TC008
-   17 |+c: TypeAlias = Foo   # TC008
-18 18 | d: TypeAlias = 'Foo[str]'  # OK
-19 19 | e: TypeAlias = 'Foo.bar'  # OK
-20 20 | f: TypeAlias = 'Foo | None'  # TC008
+14 | 
+15 | a: TypeAlias = 'int'  # TC008
+16 | b: TypeAlias = 'Dict'  # OK
+   - c: TypeAlias = 'Foo'   # TC008
+17 + c: TypeAlias = Foo   # TC008
+18 | d: TypeAlias = 'Foo[str]'  # OK
+19 | e: TypeAlias = 'Foo.bar'  # OK
+20 | f: TypeAlias = 'Foo | None'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:20:16
@@ -56,16 +52,14 @@ TC008 [*] Remove quotes from type alias
 22 | h: TypeAlias = 'Bar'   # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-17 17 | c: TypeAlias = 'Foo'   # TC008
-18 18 | d: TypeAlias = 'Foo[str]'  # OK
-19 19 | e: TypeAlias = 'Foo.bar'  # OK
-20    |-f: TypeAlias = 'Foo | None'  # TC008
-   20 |+f: TypeAlias = Foo | None  # TC008
-21 21 | g: TypeAlias = 'OptStr'   # OK
-22 22 | h: TypeAlias = 'Bar'   # TC008
-23 23 | i: TypeAlias = Foo['str']   # TC008
+17 | c: TypeAlias = 'Foo'   # TC008
+18 | d: TypeAlias = 'Foo[str]'  # OK
+19 | e: TypeAlias = 'Foo.bar'  # OK
+   - f: TypeAlias = 'Foo | None'  # TC008
+20 + f: TypeAlias = Foo | None  # TC008
+21 | g: TypeAlias = 'OptStr'   # OK
+22 | h: TypeAlias = 'Bar'   # TC008
+23 | i: TypeAlias = Foo['str']   # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:22:16
@@ -78,16 +72,14 @@ TC008 [*] Remove quotes from type alias
 24 | j: TypeAlias = 'Baz'   # OK
    |
 help: Remove quotes
-
-ℹ Safe fix
-19 19 | e: TypeAlias = 'Foo.bar'  # OK
-20 20 | f: TypeAlias = 'Foo | None'  # TC008
-21 21 | g: TypeAlias = 'OptStr'   # OK
-22    |-h: TypeAlias = 'Bar'   # TC008
-   22 |+h: TypeAlias = Bar   # TC008
-23 23 | i: TypeAlias = Foo['str']   # TC008
-24 24 | j: TypeAlias = 'Baz'   # OK
-25 25 | k: TypeAlias = 'k | None'  # OK
+19 | e: TypeAlias = 'Foo.bar'  # OK
+20 | f: TypeAlias = 'Foo | None'  # TC008
+21 | g: TypeAlias = 'OptStr'   # OK
+   - h: TypeAlias = 'Bar'   # TC008
+22 + h: TypeAlias = Bar   # TC008
+23 | i: TypeAlias = Foo['str']   # TC008
+24 | j: TypeAlias = 'Baz'   # OK
+25 | k: TypeAlias = 'k | None'  # OK
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:23:20
@@ -100,16 +92,14 @@ TC008 [*] Remove quotes from type alias
 25 | k: TypeAlias = 'k | None'  # OK
    |
 help: Remove quotes
-
-ℹ Safe fix
-20 20 | f: TypeAlias = 'Foo | None'  # TC008
-21 21 | g: TypeAlias = 'OptStr'   # OK
-22 22 | h: TypeAlias = 'Bar'   # TC008
-23    |-i: TypeAlias = Foo['str']   # TC008
-   23 |+i: TypeAlias = Foo[str]   # TC008
-24 24 | j: TypeAlias = 'Baz'   # OK
-25 25 | k: TypeAlias = 'k | None'  # OK
-26 26 | l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+20 | f: TypeAlias = 'Foo | None'  # TC008
+21 | g: TypeAlias = 'OptStr'   # OK
+22 | h: TypeAlias = 'Bar'   # TC008
+   - i: TypeAlias = Foo['str']   # TC008
+23 + i: TypeAlias = Foo[str]   # TC008
+24 | j: TypeAlias = 'Baz'   # OK
+25 | k: TypeAlias = 'k | None'  # OK
+26 | l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:26:16
@@ -122,16 +112,14 @@ TC008 [*] Remove quotes from type alias
 28 |     | None)
    |
 help: Remove quotes
-
-ℹ Safe fix
-23 23 | i: TypeAlias = Foo['str']   # TC008
-24 24 | j: TypeAlias = 'Baz'   # OK
-25 25 | k: TypeAlias = 'k | None'  # OK
-26    |-l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
-   26 |+l: TypeAlias = int | None  # TC008 (because TC010 is not enabled)
-27 27 | m: TypeAlias = ('int'  # TC008
-28 28 |     | None)
-29 29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+23 | i: TypeAlias = Foo['str']   # TC008
+24 | j: TypeAlias = 'Baz'   # OK
+25 | k: TypeAlias = 'k | None'  # OK
+   - l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+26 + l: TypeAlias = int | None  # TC008 (because TC010 is not enabled)
+27 | m: TypeAlias = ('int'  # TC008
+28 |     | None)
+29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:27:17
@@ -144,16 +132,14 @@ TC008 [*] Remove quotes from type alias
 29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
    |
 help: Remove quotes
-
-ℹ Safe fix
-24 24 | j: TypeAlias = 'Baz'   # OK
-25 25 | k: TypeAlias = 'k | None'  # OK
-26 26 | l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
-27    |-m: TypeAlias = ('int'  # TC008
-   27 |+m: TypeAlias = (int  # TC008
-28 28 |     | None)
-29 29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
-30 30 |     ' | None')
+24 | j: TypeAlias = 'Baz'   # OK
+25 | k: TypeAlias = 'k | None'  # OK
+26 | l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+   - m: TypeAlias = ('int'  # TC008
+27 + m: TypeAlias = (int  # TC008
+28 |     | None)
+29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+30 |     ' | None')
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:29:17
@@ -168,17 +154,16 @@ TC008 [*] Remove quotes from type alias
 32 |   type B = 'Dict'  # TC008
    |
 help: Remove quotes
-
-ℹ Unsafe fix
-26 26 | l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
-27 27 | m: TypeAlias = ('int'  # TC008
-28 28 |     | None)
-29    |-n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
-30    |-    ' | None')
-   29 |+n: TypeAlias = (int | None)
-31 30 | 
-32 31 | type B = 'Dict'  # TC008
-33 32 | type D = 'Foo[str]'  # TC008
+26 | l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+27 | m: TypeAlias = ('int'  # TC008
+28 |     | None)
+   - n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+   -     ' | None')
+29 + n: TypeAlias = (int | None)
+30 | 
+31 | type B = 'Dict'  # TC008
+32 | type D = 'Foo[str]'  # TC008
+note: This is an unsafe fix and may change runtime behavior
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:32:10
@@ -191,16 +176,14 @@ TC008 [*] Remove quotes from type alias
 34 | type E = 'Foo.bar'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-29 29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
-30 30 |     ' | None')
-31 31 | 
-32    |-type B = 'Dict'  # TC008
-   32 |+type B = Dict  # TC008
-33 33 | type D = 'Foo[str]'  # TC008
-34 34 | type E = 'Foo.bar'  # TC008
-35 35 | type G = 'OptStr'  # TC008
+29 | n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+30 |     ' | None')
+31 | 
+   - type B = 'Dict'  # TC008
+32 + type B = Dict  # TC008
+33 | type D = 'Foo[str]'  # TC008
+34 | type E = 'Foo.bar'  # TC008
+35 | type G = 'OptStr'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:33:10
@@ -212,16 +195,14 @@ TC008 [*] Remove quotes from type alias
 35 | type G = 'OptStr'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-30 30 |     ' | None')
-31 31 | 
-32 32 | type B = 'Dict'  # TC008
-33    |-type D = 'Foo[str]'  # TC008
-   33 |+type D = Foo[str]  # TC008
-34 34 | type E = 'Foo.bar'  # TC008
-35 35 | type G = 'OptStr'  # TC008
-36 36 | type I = Foo['str']  # TC008
+30 |     ' | None')
+31 | 
+32 | type B = 'Dict'  # TC008
+   - type D = 'Foo[str]'  # TC008
+33 + type D = Foo[str]  # TC008
+34 | type E = 'Foo.bar'  # TC008
+35 | type G = 'OptStr'  # TC008
+36 | type I = Foo['str']  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:34:10
@@ -234,16 +215,14 @@ TC008 [*] Remove quotes from type alias
 36 | type I = Foo['str']  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-31 31 | 
-32 32 | type B = 'Dict'  # TC008
-33 33 | type D = 'Foo[str]'  # TC008
-34    |-type E = 'Foo.bar'  # TC008
-   34 |+type E = Foo.bar  # TC008
-35 35 | type G = 'OptStr'  # TC008
-36 36 | type I = Foo['str']  # TC008
-37 37 | type J = 'Baz'  # TC008
+31 | 
+32 | type B = 'Dict'  # TC008
+33 | type D = 'Foo[str]'  # TC008
+   - type E = 'Foo.bar'  # TC008
+34 + type E = Foo.bar  # TC008
+35 | type G = 'OptStr'  # TC008
+36 | type I = Foo['str']  # TC008
+37 | type J = 'Baz'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:35:10
@@ -256,16 +235,14 @@ TC008 [*] Remove quotes from type alias
 37 | type J = 'Baz'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-32 32 | type B = 'Dict'  # TC008
-33 33 | type D = 'Foo[str]'  # TC008
-34 34 | type E = 'Foo.bar'  # TC008
-35    |-type G = 'OptStr'  # TC008
-   35 |+type G = OptStr  # TC008
-36 36 | type I = Foo['str']  # TC008
-37 37 | type J = 'Baz'  # TC008
-38 38 | type K = 'K | None'  # TC008
+32 | type B = 'Dict'  # TC008
+33 | type D = 'Foo[str]'  # TC008
+34 | type E = 'Foo.bar'  # TC008
+   - type G = 'OptStr'  # TC008
+35 + type G = OptStr  # TC008
+36 | type I = Foo['str']  # TC008
+37 | type J = 'Baz'  # TC008
+38 | type K = 'K | None'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:36:14
@@ -278,16 +255,14 @@ TC008 [*] Remove quotes from type alias
 38 | type K = 'K | None'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-33 33 | type D = 'Foo[str]'  # TC008
-34 34 | type E = 'Foo.bar'  # TC008
-35 35 | type G = 'OptStr'  # TC008
-36    |-type I = Foo['str']  # TC008
-   36 |+type I = Foo[str]  # TC008
-37 37 | type J = 'Baz'  # TC008
-38 38 | type K = 'K | None'  # TC008
-39 39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
+33 | type D = 'Foo[str]'  # TC008
+34 | type E = 'Foo.bar'  # TC008
+35 | type G = 'OptStr'  # TC008
+   - type I = Foo['str']  # TC008
+36 + type I = Foo[str]  # TC008
+37 | type J = 'Baz'  # TC008
+38 | type K = 'K | None'  # TC008
+39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:37:10
@@ -300,16 +275,14 @@ TC008 [*] Remove quotes from type alias
 39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
    |
 help: Remove quotes
-
-ℹ Safe fix
-34 34 | type E = 'Foo.bar'  # TC008
-35 35 | type G = 'OptStr'  # TC008
-36 36 | type I = Foo['str']  # TC008
-37    |-type J = 'Baz'  # TC008
-   37 |+type J = Baz  # TC008
-38 38 | type K = 'K | None'  # TC008
-39 39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
-40 40 | type M = ('int'  # TC008
+34 | type E = 'Foo.bar'  # TC008
+35 | type G = 'OptStr'  # TC008
+36 | type I = Foo['str']  # TC008
+   - type J = 'Baz'  # TC008
+37 + type J = Baz  # TC008
+38 | type K = 'K | None'  # TC008
+39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
+40 | type M = ('int'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:38:10
@@ -322,16 +295,14 @@ TC008 [*] Remove quotes from type alias
 40 | type M = ('int'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-35 35 | type G = 'OptStr'  # TC008
-36 36 | type I = Foo['str']  # TC008
-37 37 | type J = 'Baz'  # TC008
-38    |-type K = 'K | None'  # TC008
-   38 |+type K = K | None  # TC008
-39 39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
-40 40 | type M = ('int'  # TC008
-41 41 |     | None)
+35 | type G = 'OptStr'  # TC008
+36 | type I = Foo['str']  # TC008
+37 | type J = 'Baz'  # TC008
+   - type K = 'K | None'  # TC008
+38 + type K = K | None  # TC008
+39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
+40 | type M = ('int'  # TC008
+41 |     | None)
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:39:10
@@ -344,16 +315,14 @@ TC008 [*] Remove quotes from type alias
 41 |     | None)
    |
 help: Remove quotes
-
-ℹ Safe fix
-36 36 | type I = Foo['str']  # TC008
-37 37 | type J = 'Baz'  # TC008
-38 38 | type K = 'K | None'  # TC008
-39    |-type L = 'int' | None  # TC008 (because TC010 is not enabled)
-   39 |+type L = int | None  # TC008 (because TC010 is not enabled)
-40 40 | type M = ('int'  # TC008
-41 41 |     | None)
-42 42 | type N = ('int'  # TC008 (fix removes comment currently)
+36 | type I = Foo['str']  # TC008
+37 | type J = 'Baz'  # TC008
+38 | type K = 'K | None'  # TC008
+   - type L = 'int' | None  # TC008 (because TC010 is not enabled)
+39 + type L = int | None  # TC008 (because TC010 is not enabled)
+40 | type M = ('int'  # TC008
+41 |     | None)
+42 | type N = ('int'  # TC008 (fix removes comment currently)
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:40:11
@@ -366,16 +335,14 @@ TC008 [*] Remove quotes from type alias
 42 | type N = ('int'  # TC008 (fix removes comment currently)
    |
 help: Remove quotes
-
-ℹ Safe fix
-37 37 | type J = 'Baz'  # TC008
-38 38 | type K = 'K | None'  # TC008
-39 39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
-40    |-type M = ('int'  # TC008
-   40 |+type M = (int  # TC008
-41 41 |     | None)
-42 42 | type N = ('int'  # TC008 (fix removes comment currently)
-43 43 |     ' | None')
+37 | type J = 'Baz'  # TC008
+38 | type K = 'K | None'  # TC008
+39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
+   - type M = ('int'  # TC008
+40 + type M = (int  # TC008
+41 |     | None)
+42 | type N = ('int'  # TC008 (fix removes comment currently)
+43 |     ' | None')
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:42:11
@@ -388,17 +355,16 @@ TC008 [*] Remove quotes from type alias
    | |_____________^
    |
 help: Remove quotes
-
-ℹ Unsafe fix
-39 39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
-40 40 | type M = ('int'  # TC008
-41 41 |     | None)
-42    |-type N = ('int'  # TC008 (fix removes comment currently)
-43    |-    ' | None')
-   42 |+type N = (int | None)
-44 43 | 
-45 44 | 
-46 45 | class Baz:
+39 | type L = 'int' | None  # TC008 (because TC010 is not enabled)
+40 | type M = ('int'  # TC008
+41 |     | None)
+   - type N = ('int'  # TC008 (fix removes comment currently)
+   -     ' | None')
+42 + type N = (int | None)
+43 | 
+44 | 
+45 | class Baz:
+note: This is an unsafe fix and may change runtime behavior
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:48:14
@@ -411,16 +377,14 @@ TC008 [*] Remove quotes from type alias
 50 |     class Nested:
    |
 help: Remove quotes
-
-ℹ Safe fix
-45 45 | 
-46 46 | class Baz:
-47 47 |     a: TypeAlias = 'Baz'  # OK
-48    |-    type A = 'Baz'  # TC008
-   48 |+    type A = Baz  # TC008
-49 49 | 
-50 50 |     class Nested:
-51 51 |         a: TypeAlias = 'Baz'  # OK
+45 | 
+46 | class Baz:
+47 |     a: TypeAlias = 'Baz'  # OK
+   -     type A = 'Baz'  # TC008
+48 +     type A = Baz  # TC008
+49 | 
+50 |     class Nested:
+51 |         a: TypeAlias = 'Baz'  # OK
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:52:18
@@ -433,16 +397,14 @@ TC008 [*] Remove quotes from type alias
 54 | # O should have parenthesis added
    |
 help: Remove quotes
-
-ℹ Safe fix
-49 49 | 
-50 50 |     class Nested:
-51 51 |         a: TypeAlias = 'Baz'  # OK
-52    |-        type A = 'Baz'  # TC008
-   52 |+        type A = Baz  # TC008
-53 53 | 
-54 54 | # O should have parenthesis added
-55 55 | o: TypeAlias = """int
+49 | 
+50 |     class Nested:
+51 |         a: TypeAlias = 'Baz'  # OK
+   -         type A = 'Baz'  # TC008
+52 +         type A = Baz  # TC008
+53 | 
+54 | # O should have parenthesis added
+55 | o: TypeAlias = """int
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:55:16
@@ -456,18 +418,16 @@ TC008 [*] Remove quotes from type alias
 58 |   | None"""
    |
 help: Remove quotes
-
-ℹ Safe fix
-52 52 |         type A = 'Baz'  # TC008
-53 53 | 
-54 54 | # O should have parenthesis added
-55    |-o: TypeAlias = """int
-56    |-| None"""
-   55 |+o: TypeAlias = (int
-   56 |+| None)
-57 57 | type O = """int
-58 58 | | None"""
-59 59 | 
+52 |         type A = 'Baz'  # TC008
+53 | 
+54 | # O should have parenthesis added
+   - o: TypeAlias = """int
+   - | None"""
+55 + o: TypeAlias = (int
+56 + | None)
+57 | type O = """int
+58 | | None"""
+59 | 
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:57:10
@@ -482,18 +442,16 @@ TC008 [*] Remove quotes from type alias
 60 |   # P, Q, and R should not have parenthesis added
    |
 help: Remove quotes
-
-ℹ Safe fix
-54 54 | # O should have parenthesis added
-55 55 | o: TypeAlias = """int
-56 56 | | None"""
-57    |-type O = """int
-58    |-| None"""
-   57 |+type O = (int
-   58 |+| None)
-59 59 | 
-60 60 | # P, Q, and R should not have parenthesis added
-61 61 | p: TypeAlias = ("""int
+54 | # O should have parenthesis added
+55 | o: TypeAlias = """int
+56 | | None"""
+   - type O = """int
+   - | None"""
+57 + type O = (int
+58 + | None)
+59 | 
+60 | # P, Q, and R should not have parenthesis added
+61 | p: TypeAlias = ("""int
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:61:17
@@ -507,18 +465,16 @@ TC008 [*] Remove quotes from type alias
 64 |   | None""")
    |
 help: Remove quotes
-
-ℹ Safe fix
-58 58 | | None"""
-59 59 | 
-60 60 | # P, Q, and R should not have parenthesis added
-61    |-p: TypeAlias = ("""int
-62    |-| None""")
-   61 |+p: TypeAlias = (int
-   62 |+| None)
-63 63 | type P = ("""int
-64 64 | | None""")
-65 65 | 
+58 | | None"""
+59 | 
+60 | # P, Q, and R should not have parenthesis added
+   - p: TypeAlias = ("""int
+   - | None""")
+61 + p: TypeAlias = (int
+62 + | None)
+63 | type P = ("""int
+64 | | None""")
+65 | 
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:63:11
@@ -533,18 +489,16 @@ TC008 [*] Remove quotes from type alias
 66 |   q: TypeAlias = """(int
    |
 help: Remove quotes
-
-ℹ Safe fix
-60 60 | # P, Q, and R should not have parenthesis added
-61 61 | p: TypeAlias = ("""int
-62 62 | | None""")
-63    |-type P = ("""int
-64    |-| None""")
-   63 |+type P = (int
-   64 |+| None)
-65 65 | 
-66 66 | q: TypeAlias = """(int
-67 67 | | None)"""
+60 | # P, Q, and R should not have parenthesis added
+61 | p: TypeAlias = ("""int
+62 | | None""")
+   - type P = ("""int
+   - | None""")
+63 + type P = (int
+64 + | None)
+65 | 
+66 | q: TypeAlias = """(int
+67 | | None)"""
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:66:16
@@ -559,18 +513,16 @@ TC008 [*] Remove quotes from type alias
 69 |   | None)"""
    |
 help: Remove quotes
-
-ℹ Safe fix
-63 63 | type P = ("""int
-64 64 | | None""")
-65 65 | 
-66    |-q: TypeAlias = """(int
-67    |-| None)"""
-   66 |+q: TypeAlias = (int
-   67 |+| None)
-68 68 | type Q = """(int
-69 69 | | None)"""
-70 70 | 
+63 | type P = ("""int
+64 | | None""")
+65 | 
+   - q: TypeAlias = """(int
+   - | None)"""
+66 + q: TypeAlias = (int
+67 + | None)
+68 | type Q = """(int
+69 | | None)"""
+70 | 
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:68:10
@@ -585,18 +537,16 @@ TC008 [*] Remove quotes from type alias
 71 |   r: TypeAlias = """int | None"""
    |
 help: Remove quotes
-
-ℹ Safe fix
-65 65 | 
-66 66 | q: TypeAlias = """(int
-67 67 | | None)"""
-68    |-type Q = """(int
-69    |-| None)"""
-   68 |+type Q = (int
-   69 |+| None)
-70 70 | 
-71 71 | r: TypeAlias = """int | None"""
-72 72 | type R = """int | None"""
+65 | 
+66 | q: TypeAlias = """(int
+67 | | None)"""
+   - type Q = """(int
+   - | None)"""
+68 + type Q = (int
+69 + | None)
+70 | 
+71 | r: TypeAlias = """int | None"""
+72 | type R = """int | None"""
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:71:16
@@ -608,14 +558,12 @@ TC008 [*] Remove quotes from type alias
 72 | type R = """int | None"""
    |
 help: Remove quotes
-
-ℹ Safe fix
-68 68 | type Q = """(int
-69 69 | | None)"""
-70 70 | 
-71    |-r: TypeAlias = """int | None"""
-   71 |+r: TypeAlias = int | None
-72 72 | type R = """int | None"""
+68 | type Q = """(int
+69 | | None)"""
+70 | 
+   - r: TypeAlias = """int | None"""
+71 + r: TypeAlias = int | None
+72 | type R = """int | None"""
 
 TC008 [*] Remove quotes from type alias
   --> TC008.py:72:10
@@ -625,10 +573,8 @@ TC008 [*] Remove quotes from type alias
    |          ^^^^^^^^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-69 69 | | None)"""
-70 70 | 
-71 71 | r: TypeAlias = """int | None"""
-72    |-type R = """int | None"""
-   72 |+type R = int | None
+69 | | None)"""
+70 | 
+71 | r: TypeAlias = """int | None"""
+   - type R = """int | None"""
+72 + type R = int | None
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap
index 9d729f56b3..c305a21048 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap
@@ -12,16 +12,14 @@ TC008 [*] Remove quotes from type alias
 15 |     c: TypeAlias = 'Foo'   # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-10 10 |     OptStr: TypeAlias = str | None
-11 11 |     Bar: TypeAlias = Foo[int]
-12 12 | 
-13    |-    a: TypeAlias = 'int'  # TC008
-   13 |+    a: TypeAlias = int  # TC008
-14 14 |     b: TypeAlias = 'Dict'  # TC008
-15 15 |     c: TypeAlias = 'Foo'   # TC008
-16 16 |     d: TypeAlias = 'Foo[str]'  # TC008
+10 |     OptStr: TypeAlias = str | None
+11 |     Bar: TypeAlias = Foo[int]
+12 | 
+   -     a: TypeAlias = 'int'  # TC008
+13 +     a: TypeAlias = int  # TC008
+14 |     b: TypeAlias = 'Dict'  # TC008
+15 |     c: TypeAlias = 'Foo'   # TC008
+16 |     d: TypeAlias = 'Foo[str]'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:14:20
@@ -33,16 +31,14 @@ TC008 [*] Remove quotes from type alias
 16 |     d: TypeAlias = 'Foo[str]'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-11 11 |     Bar: TypeAlias = Foo[int]
-12 12 | 
-13 13 |     a: TypeAlias = 'int'  # TC008
-14    |-    b: TypeAlias = 'Dict'  # TC008
-   14 |+    b: TypeAlias = Dict  # TC008
-15 15 |     c: TypeAlias = 'Foo'   # TC008
-16 16 |     d: TypeAlias = 'Foo[str]'  # TC008
-17 17 |     e: TypeAlias = 'Foo.bar'  # TC008
+11 |     Bar: TypeAlias = Foo[int]
+12 | 
+13 |     a: TypeAlias = 'int'  # TC008
+   -     b: TypeAlias = 'Dict'  # TC008
+14 +     b: TypeAlias = Dict  # TC008
+15 |     c: TypeAlias = 'Foo'   # TC008
+16 |     d: TypeAlias = 'Foo[str]'  # TC008
+17 |     e: TypeAlias = 'Foo.bar'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:15:20
@@ -55,16 +51,14 @@ TC008 [*] Remove quotes from type alias
 17 |     e: TypeAlias = 'Foo.bar'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-12 12 | 
-13 13 |     a: TypeAlias = 'int'  # TC008
-14 14 |     b: TypeAlias = 'Dict'  # TC008
-15    |-    c: TypeAlias = 'Foo'   # TC008
-   15 |+    c: TypeAlias = Foo   # TC008
-16 16 |     d: TypeAlias = 'Foo[str]'  # TC008
-17 17 |     e: TypeAlias = 'Foo.bar'  # TC008
-18 18 |     f: TypeAlias = 'Foo | None'  # TC008
+12 | 
+13 |     a: TypeAlias = 'int'  # TC008
+14 |     b: TypeAlias = 'Dict'  # TC008
+   -     c: TypeAlias = 'Foo'   # TC008
+15 +     c: TypeAlias = Foo   # TC008
+16 |     d: TypeAlias = 'Foo[str]'  # TC008
+17 |     e: TypeAlias = 'Foo.bar'  # TC008
+18 |     f: TypeAlias = 'Foo | None'  # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:16:20
@@ -77,16 +71,14 @@ TC008 [*] Remove quotes from type alias
 18 |     f: TypeAlias = 'Foo | None'  # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-13 13 |     a: TypeAlias = 'int'  # TC008
-14 14 |     b: TypeAlias = 'Dict'  # TC008
-15 15 |     c: TypeAlias = 'Foo'   # TC008
-16    |-    d: TypeAlias = 'Foo[str]'  # TC008
-   16 |+    d: TypeAlias = Foo[str]  # TC008
-17 17 |     e: TypeAlias = 'Foo.bar'  # TC008
-18 18 |     f: TypeAlias = 'Foo | None'  # TC008
-19 19 |     g: TypeAlias = 'OptStr'   # TC008
+13 |     a: TypeAlias = 'int'  # TC008
+14 |     b: TypeAlias = 'Dict'  # TC008
+15 |     c: TypeAlias = 'Foo'   # TC008
+   -     d: TypeAlias = 'Foo[str]'  # TC008
+16 +     d: TypeAlias = Foo[str]  # TC008
+17 |     e: TypeAlias = 'Foo.bar'  # TC008
+18 |     f: TypeAlias = 'Foo | None'  # TC008
+19 |     g: TypeAlias = 'OptStr'   # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:17:20
@@ -99,16 +91,14 @@ TC008 [*] Remove quotes from type alias
 19 |     g: TypeAlias = 'OptStr'   # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-14 14 |     b: TypeAlias = 'Dict'  # TC008
-15 15 |     c: TypeAlias = 'Foo'   # TC008
-16 16 |     d: TypeAlias = 'Foo[str]'  # TC008
-17    |-    e: TypeAlias = 'Foo.bar'  # TC008
-   17 |+    e: TypeAlias = Foo.bar  # TC008
-18 18 |     f: TypeAlias = 'Foo | None'  # TC008
-19 19 |     g: TypeAlias = 'OptStr'   # TC008
-20 20 |     h: TypeAlias = 'Bar'   # TC008
+14 |     b: TypeAlias = 'Dict'  # TC008
+15 |     c: TypeAlias = 'Foo'   # TC008
+16 |     d: TypeAlias = 'Foo[str]'  # TC008
+   -     e: TypeAlias = 'Foo.bar'  # TC008
+17 +     e: TypeAlias = Foo.bar  # TC008
+18 |     f: TypeAlias = 'Foo | None'  # TC008
+19 |     g: TypeAlias = 'OptStr'   # TC008
+20 |     h: TypeAlias = 'Bar'   # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:18:20
@@ -121,16 +111,14 @@ TC008 [*] Remove quotes from type alias
 20 |     h: TypeAlias = 'Bar'   # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-15 15 |     c: TypeAlias = 'Foo'   # TC008
-16 16 |     d: TypeAlias = 'Foo[str]'  # TC008
-17 17 |     e: TypeAlias = 'Foo.bar'  # TC008
-18    |-    f: TypeAlias = 'Foo | None'  # TC008
-   18 |+    f: TypeAlias = Foo | None  # TC008
-19 19 |     g: TypeAlias = 'OptStr'   # TC008
-20 20 |     h: TypeAlias = 'Bar'   # TC008
-21 21 |     i: TypeAlias = Foo['str']   # TC008
+15 |     c: TypeAlias = 'Foo'   # TC008
+16 |     d: TypeAlias = 'Foo[str]'  # TC008
+17 |     e: TypeAlias = 'Foo.bar'  # TC008
+   -     f: TypeAlias = 'Foo | None'  # TC008
+18 +     f: TypeAlias = Foo | None  # TC008
+19 |     g: TypeAlias = 'OptStr'   # TC008
+20 |     h: TypeAlias = 'Bar'   # TC008
+21 |     i: TypeAlias = Foo['str']   # TC008
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:19:20
@@ -143,16 +131,14 @@ TC008 [*] Remove quotes from type alias
 21 |     i: TypeAlias = Foo['str']   # TC008
    |
 help: Remove quotes
-
-ℹ Safe fix
-16 16 |     d: TypeAlias = 'Foo[str]'  # TC008
-17 17 |     e: TypeAlias = 'Foo.bar'  # TC008
-18 18 |     f: TypeAlias = 'Foo | None'  # TC008
-19    |-    g: TypeAlias = 'OptStr'   # TC008
-   19 |+    g: TypeAlias = OptStr   # TC008
-20 20 |     h: TypeAlias = 'Bar'   # TC008
-21 21 |     i: TypeAlias = Foo['str']   # TC008
-22 22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
+16 |     d: TypeAlias = 'Foo[str]'  # TC008
+17 |     e: TypeAlias = 'Foo.bar'  # TC008
+18 |     f: TypeAlias = 'Foo | None'  # TC008
+   -     g: TypeAlias = 'OptStr'   # TC008
+19 +     g: TypeAlias = OptStr   # TC008
+20 |     h: TypeAlias = 'Bar'   # TC008
+21 |     i: TypeAlias = Foo['str']   # TC008
+22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:20:20
@@ -165,16 +151,14 @@ TC008 [*] Remove quotes from type alias
 22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
    |
 help: Remove quotes
-
-ℹ Safe fix
-17 17 |     e: TypeAlias = 'Foo.bar'  # TC008
-18 18 |     f: TypeAlias = 'Foo | None'  # TC008
-19 19 |     g: TypeAlias = 'OptStr'   # TC008
-20    |-    h: TypeAlias = 'Bar'   # TC008
-   20 |+    h: TypeAlias = Bar   # TC008
-21 21 |     i: TypeAlias = Foo['str']   # TC008
-22 22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
-23 23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
+17 |     e: TypeAlias = 'Foo.bar'  # TC008
+18 |     f: TypeAlias = 'Foo | None'  # TC008
+19 |     g: TypeAlias = 'OptStr'   # TC008
+   -     h: TypeAlias = 'Bar'   # TC008
+20 +     h: TypeAlias = Bar   # TC008
+21 |     i: TypeAlias = Foo['str']   # TC008
+22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
+23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:21:24
@@ -187,16 +171,14 @@ TC008 [*] Remove quotes from type alias
 23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
    |
 help: Remove quotes
-
-ℹ Safe fix
-18 18 |     f: TypeAlias = 'Foo | None'  # TC008
-19 19 |     g: TypeAlias = 'OptStr'   # TC008
-20 20 |     h: TypeAlias = 'Bar'   # TC008
-21    |-    i: TypeAlias = Foo['str']   # TC008
-   21 |+    i: TypeAlias = Foo[str]   # TC008
-22 22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
-23 23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
-24 24 |     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+18 |     f: TypeAlias = 'Foo | None'  # TC008
+19 |     g: TypeAlias = 'OptStr'   # TC008
+20 |     h: TypeAlias = 'Bar'   # TC008
+   -     i: TypeAlias = Foo['str']   # TC008
+21 +     i: TypeAlias = Foo[str]   # TC008
+22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
+23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
+24 |     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:24:20
@@ -209,16 +191,14 @@ TC008 [*] Remove quotes from type alias
 26 |         | None)
    |
 help: Remove quotes
-
-ℹ Safe fix
-21 21 |     i: TypeAlias = Foo['str']   # TC008
-22 22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
-23 23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
-24    |-    l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
-   24 |+    l: TypeAlias = int | None  # TC008 (because TC010 is not enabled)
-25 25 |     m: TypeAlias = ('int'  # TC008
-26 26 |         | None)
-27 27 |     n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+21 |     i: TypeAlias = Foo['str']   # TC008
+22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
+23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
+   -     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+24 +     l: TypeAlias = int | None  # TC008 (because TC010 is not enabled)
+25 |     m: TypeAlias = ('int'  # TC008
+26 |         | None)
+27 |     n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:25:21
@@ -231,16 +211,14 @@ TC008 [*] Remove quotes from type alias
 27 |     n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
    |
 help: Remove quotes
-
-ℹ Safe fix
-22 22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
-23 23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
-24 24 |     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
-25    |-    m: TypeAlias = ('int'  # TC008
-   25 |+    m: TypeAlias = (int  # TC008
-26 26 |         | None)
-27 27 |     n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
-28 28 |         ' | None')
+22 |     j: TypeAlias = 'Baz'   # OK (this would be treated as use before define)
+23 |     k: TypeAlias = 'k | None'  # False negative in type checking block
+24 |     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+   -     m: TypeAlias = ('int'  # TC008
+25 +     m: TypeAlias = (int  # TC008
+26 |         | None)
+27 |     n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+28 |         ' | None')
 
 TC008 [*] Remove quotes from type alias
   --> TC008_typing_execution_context.py:27:21
@@ -253,14 +231,13 @@ TC008 [*] Remove quotes from type alias
    | |_________________^
    |
 help: Remove quotes
-
-ℹ Unsafe fix
-24 24 |     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
-25 25 |     m: TypeAlias = ('int'  # TC008
-26 26 |         | None)
-27    |-    n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
-28    |-        ' | None')
-   27 |+    n: TypeAlias = (int | None)
-29 28 | 
-30 29 | 
-31 30 |     class Baz: ...
+24 |     l: TypeAlias = 'int' | None  # TC008 (because TC010 is not enabled)
+25 |     m: TypeAlias = ('int'  # TC008
+26 |         | None)
+   -     n: TypeAlias = ('int'  # TC008 (fix removes comment currently)
+   -         ' | None')
+27 +     n: TypeAlias = (int | None)
+28 | 
+29 | 
+30 |     class Baz: ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap
index cb009f96d5..cc7dcd3dc2 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap
@@ -10,16 +10,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
   |          ^^^
   |
 help: Add quotes
-
-ℹ Safe fix
-1 1 | def f():
-2 2 |     from typing import cast
-3 3 | 
-4   |-    cast(int, 3.0)  # TC006
-  4 |+    cast("int", 3.0)  # TC006
-5 5 | 
-6 6 | 
-7 7 | def f():
+1 | def f():
+2 |     from typing import cast
+3 | 
+  -     cast(int, 3.0)  # TC006
+4 +     cast("int", 3.0)  # TC006
+5 | 
+6 | 
+7 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:10:10
@@ -30,16 +28,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-7  7  | def f():
-8  8  |     from typing import cast
-9  9  | 
-10    |-    cast(list[tuple[bool | float | int | str]], 3.0)  # TC006
-   10 |+    cast("list[tuple[bool | float | int | str]]", 3.0)  # TC006
-11 11 | 
-12 12 | 
-13 13 | def f():
+7  | def f():
+8  |     from typing import cast
+9  | 
+   -     cast(list[tuple[bool | float | int | str]], 3.0)  # TC006
+10 +     cast("list[tuple[bool | float | int | str]]", 3.0)  # TC006
+11 | 
+12 | 
+13 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:16:10
@@ -50,16 +46,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-13 13 | def f():
-14 14 |     from typing import Union, cast
-15 15 | 
-16    |-    cast(list[tuple[Union[bool, float, int, str]]], 3.0)  # TC006
-   16 |+    cast("list[tuple[Union[bool, float, int, str]]]", 3.0)  # TC006
-17 17 | 
-18 18 | 
-19 19 | def f():
+13 | def f():
+14 |     from typing import Union, cast
+15 | 
+   -     cast(list[tuple[Union[bool, float, int, str]]], 3.0)  # TC006
+16 +     cast("list[tuple[Union[bool, float, int, str]]]", 3.0)  # TC006
+17 | 
+18 | 
+19 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:40:14
@@ -70,16 +64,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |              ^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-37 37 | def f():
-38 38 |     from typing import cast as typecast
-39 39 | 
-40    |-    typecast(int, 3.0)  # TC006
-   40 |+    typecast("int", 3.0)  # TC006
-41 41 | 
-42 42 | 
-43 43 | def f():
+37 | def f():
+38 |     from typing import cast as typecast
+39 | 
+   -     typecast(int, 3.0)  # TC006
+40 +     typecast("int", 3.0)  # TC006
+41 | 
+42 | 
+43 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:46:17
@@ -90,16 +82,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |                 ^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-43 43 | def f():
-44 44 |     import typing
-45 45 | 
-46    |-    typing.cast(int, 3.0)  # TC006
-   46 |+    typing.cast("int", 3.0)  # TC006
-47 47 | 
-48 48 | 
-49 49 | def f():
+43 | def f():
+44 |     import typing
+45 | 
+   -     typing.cast(int, 3.0)  # TC006
+46 +     typing.cast("int", 3.0)  # TC006
+47 | 
+48 | 
+49 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:52:12
@@ -110,16 +100,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |            ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-49 49 | def f():
-50 50 |     import typing as t
-51 51 | 
-52    |-    t.cast(t.Literal["3.0", '3'], 3.0)  # TC006
-   52 |+    t.cast("t.Literal['3.0', '3']", 3.0)  # TC006
-53 53 | 
-54 54 | 
-55 55 | def f():
+49 | def f():
+50 |     import typing as t
+51 | 
+   -     t.cast(t.Literal["3.0", '3'], 3.0)  # TC006
+52 +     t.cast("t.Literal['3.0', '3']", 3.0)  # TC006
+53 | 
+54 | 
+55 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:59:9
@@ -132,17 +120,16 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
 62 |       )
    |
 help: Add quotes
-
-ℹ Unsafe fix
-56 56 |     from typing import cast
-57 57 | 
-58 58 |     cast(
-59    |-        int  # TC006 (unsafe, because it will get rid of this comment)
-60    |-        | None,
-   59 |+        "int | None",
-61 60 |         3.0
-62 61 |     )
-63 62 | 
+56 |     from typing import cast
+57 | 
+58 |     cast(
+   -         int  # TC006 (unsafe, because it will get rid of this comment)
+   -         | None,
+59 +         "int | None",
+60 |         3.0
+61 |     )
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:68:17
@@ -153,16 +140,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |                 ^^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-65 65 | def f():
-66 66 |     # Regression test for #14554
-67 67 |     import typing
-68    |-    typing.cast(M-())
-   68 |+    typing.cast("M - ()")
-69 69 | 
-70 70 | 
-71 71 | def f():
+65 | def f():
+66 |     # Regression test for #14554
+67 |     import typing
+   -     typing.cast(M-())
+68 +     typing.cast("M - ()")
+69 | 
+70 | 
+71 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:75:10
@@ -173,16 +158,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |          ^^^^^^^^^^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-72 72 |     # Simple case with Literal that should lead to nested quotes
-73 73 |     from typing import cast, Literal
-74 74 | 
-75    |-    cast(Literal["A"], 'A')
-   75 |+    cast("Literal['A']", 'A')
-76 76 | 
-77 77 | 
-78 78 | def f():
+72 |     # Simple case with Literal that should lead to nested quotes
+73 |     from typing import cast, Literal
+74 | 
+   -     cast(Literal["A"], 'A')
+75 +     cast("Literal['A']", 'A')
+76 | 
+77 | 
+78 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:82:10
@@ -193,16 +176,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-79 79 |     # Really complex case with nested forward references
-80 80 |     from typing import cast, Annotated, Literal
-81 81 | 
-82    |-    cast(list[Annotated["list['Literal[\"A\"]']", "Foo"]], ['A'])
-   82 |+    cast("list[Annotated[list[Literal['A']], 'Foo']]", ['A'])
-83 83 | 
-84 84 | 
-85 85 | def f():
+79 |     # Really complex case with nested forward references
+80 |     from typing import cast, Annotated, Literal
+81 | 
+   -     cast(list[Annotated["list['Literal[\"A\"]']", "Foo"]], ['A'])
+82 +     cast("list[Annotated[list[Literal['A']], 'Foo']]", ['A'])
+83 | 
+84 | 
+85 | def f():
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:89:9
@@ -214,16 +195,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
 91 |     )
    |
 help: Add quotes
-
-ℹ Safe fix
-86 86 |     from typing import cast
-87 87 | 
-88 88 |     cast(
-89    |-        int  # TC006
-   89 |+        "int"  # TC006
-90 90 |         , 6.0
-91 91 |     )
-92 92 | 
+86 |     from typing import cast
+87 | 
+88 |     cast(
+   -         int  # TC006
+89 +         "int"  # TC006
+90 |         , 6.0
+91 |     )
+92 | 
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:98:14
@@ -235,14 +214,12 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
 99 |     cast(val=3.0, typ=int)  # TC006
    |
 help: Add quotes
-
-ℹ Safe fix
-95 95 |     # Keyword arguments
-96 96 |     from typing import cast
-97 97 | 
-98    |-    cast(typ=int, val=3.0)  # TC006
-   98 |+    cast(typ="int", val=3.0)  # TC006
-99 99 |     cast(val=3.0, typ=int)  # TC006
+95 |     # Keyword arguments
+96 |     from typing import cast
+97 | 
+   -     cast(typ=int, val=3.0)  # TC006
+98 +     cast(typ="int", val=3.0)  # TC006
+99 |     cast(val=3.0, typ=int)  # TC006
 
 TC006 [*] Add quotes to type expression in `typing.cast()`
   --> TC006.py:99:23
@@ -252,10 +229,8 @@ TC006 [*] Add quotes to type expression in `typing.cast()`
    |                       ^^^
    |
 help: Add quotes
-
-ℹ Safe fix
-96 96 |     from typing import cast
-97 97 | 
-98 98 |     cast(typ=int, val=3.0)  # TC006
-99    |-    cast(val=3.0, typ=int)  # TC006
-   99 |+    cast(val=3.0, typ="int")  # TC006
+96 |     from typing import cast
+97 | 
+98 |     cast(typ=int, val=3.0)  # TC006
+   -     cast(val=3.0, typ=int)  # TC006
+99 +     cast(val=3.0, typ="int")  # TC006
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap
index 4092c2bc4a..e22e3acae2 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap
@@ -10,12 +10,11 @@ TC004 [*] Move import `datetime.datetime` out of type-checking block. Import is
 5 | x = datetime
   |
 help: Move out of type-checking block
-
-ℹ Unsafe 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
+1 | from typing import TYPE_CHECKING
+2 + from datetime import datetime
+3 | 
+4 | if TYPE_CHECKING:
+  -     from datetime import datetime
+5 +     pass
+6 | x = datetime
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap
index 3d60b335c8..50595a325d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap
@@ -11,13 +11,12 @@ TC004 [*] Move import `typing.List` out of type-checking block. Import is used f
 6 | __all__ = ("List",)
   |
 help: Move out of type-checking block
-
-ℹ Unsafe 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",)
+1 | from typing import TYPE_CHECKING
+2 + from typing import List
+3 | 
+4 | if TYPE_CHECKING:
+  -     from typing import List
+5 +     pass
+6 | 
+7 | __all__ = ("List",)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap
index 8382e0a7a2..9847125b9d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap
@@ -11,15 +11,14 @@ TC004 [*] Move import `collections.abc.Callable` out of type-checking block. Imp
 8 | AnyCallable: TypeAlias = Callable[..., Any]
   |
 help: Move out of type-checking block
-
-ℹ Unsafe 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]
+1 | from __future__ import annotations
+2 | 
+3 | from typing import Any, TYPE_CHECKING, TypeAlias
+4 + from collections.abc import Callable
+5 | 
+6 | if TYPE_CHECKING:
+  -     from collections.abc import Callable
+7 +     pass
+8 | 
+9 | AnyCallable: TypeAlias = Callable[..., Any]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap
index 84b0738d53..15a9001324 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap
@@ -9,16 +9,15 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u
   |                        ^^^^^^^^^
   |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from typing_extensions import TYPE_CHECKING
-  4 |+from pandas import DataFrame
-4 5 | 
-5 6 | if TYPE_CHECKING:
-6   |-    from pandas import DataFrame
-  7 |+    pass
-7 8 | 
-8 9 | 
-9 10 | def example() -> DataFrame:
+1  | from __future__ import annotations
+2  | 
+3  | from typing_extensions import TYPE_CHECKING
+4  + from pandas import DataFrame
+5  | 
+6  | if TYPE_CHECKING:
+   -     from pandas import DataFrame
+7  +     pass
+8  | 
+9  | 
+10 | def example() -> DataFrame:
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap
index a7c102496f..4cf7269823 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap
@@ -9,14 +9,13 @@ TC004 [*] Move import `datetime.date` out of type-checking block. Import is used
   |                          ^^^^
   |
 help: Move out of type-checking block
-
-ℹ Unsafe 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():
+1 | from typing import TYPE_CHECKING
+2 + from datetime import date
+3 | 
+4 | if TYPE_CHECKING:
+  -     from datetime import date
+5 +     pass
+6 | 
+7 | 
+8 | def example():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap
index e5971221d0..6c5ead2742 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap
@@ -1,22 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
 ---
-TC004 [*] Move import `typing.Any` out of type-checking block. Import is used for more than type hinting.
- --> TC004_4.py:4:24
-  |
-3 | if TYPE_CHECKING:
-4 |     from typing import Any
-  |                        ^^^
-  |
-help: Move out of type-checking block
 
-ℹ Unsafe 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_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap
index a9dcddd513..6c5ead2742 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap
@@ -1,62 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
 ---
-TC004 [*] Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
- --> TC004_5.py:4:24
-  |
-3 | if TYPE_CHECKING:
-4 |     from typing import List, Sequence, Set
-  |                        ^^^^
-  |
-help: Move out of type-checking block
 
-ℹ Unsafe 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]):
-
-TC004 [*] Move import `typing.Sequence` out of type-checking block. Import is used for more than type hinting.
- --> TC004_5.py:4:30
-  |
-3 | if TYPE_CHECKING:
-4 |     from typing import List, Sequence, Set
-  |                              ^^^^^^^^
-  |
-help: Move out of type-checking block
-
-ℹ Unsafe 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]):
-
-TC004 [*] Move import `typing.Set` out of type-checking block. Import is used for more than type hinting.
- --> TC004_5.py:4:40
-  |
-3 | if TYPE_CHECKING:
-4 |     from typing import List, Sequence, Set
-  |                                        ^^^
-  |
-help: Move out of type-checking block
-
-ℹ Unsafe 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_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap
index 93d461cb89..6c5ead2742 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap
@@ -1,46 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
 ---
-TC004 [*] Move import `typing.Tuple` out of type-checking block. Import is used for more than type hinting.
- --> TC004_9.py:4:24
-  |
-3 | if TYPE_CHECKING:
-4 |     from typing import Tuple, List, Dict
-  |                        ^^^^^
-5 |
-6 | x: Tuple
-  |
-help: Move out of type-checking block
 
-ℹ Unsafe 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 | 
-
-TC004 [*] Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
- --> TC004_9.py:4:31
-  |
-3 | if TYPE_CHECKING:
-4 |     from typing import Tuple, List, Dict
-  |                               ^^^^
-5 |
-6 | x: Tuple
-  |
-help: Move out of type-checking block
-
-ℹ Unsafe 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_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap
index 0dbc9b654e..8fd4dd118e 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap
@@ -10,18 +10,17 @@ TC004 [*] Move import `datetime` out of type-checking block. Import is used for
 10 |     from array import array  # TC004
    |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-4  4  | 
-5  5  | import fastapi
-6  6  | from fastapi import FastAPI as Api
-   7  |+import datetime
-7  8  | 
-8  9  | if TYPE_CHECKING:
-9     |-    import datetime  # TC004
-10 10 |     from array import array  # TC004
-11 11 | 
-12 12 | app = fastapi.FastAPI("First application")
+4  | 
+5  | import fastapi
+6  | from fastapi import FastAPI as Api
+7  + import datetime
+8  | 
+9  | if TYPE_CHECKING:
+   -     import datetime  # TC004
+10 |     from array import array  # TC004
+11 | 
+12 | app = fastapi.FastAPI("First application")
+note: This is an unsafe fix and may change runtime behavior
 
 TC004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting.
   --> app.py:10:23
@@ -34,16 +33,15 @@ TC004 [*] Move import `array.array` out of type-checking block. Import is used f
 12 | app = fastapi.FastAPI("First application")
    |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-4  4  | 
-5  5  | import fastapi
-6  6  | from fastapi import FastAPI as Api
-   7  |+from array import array
-7  8  | 
-8  9  | if TYPE_CHECKING:
-9  10 |     import datetime  # TC004
-10    |-    from array import array  # TC004
-11 11 | 
-12 12 | app = fastapi.FastAPI("First application")
-13 13 |
+4  | 
+5  | import fastapi
+6  | from fastapi import FastAPI as Api
+7  + from array import array
+8  | 
+9  | if TYPE_CHECKING:
+10 |     import datetime  # TC004
+   -     from array import array  # TC004
+11 | 
+12 | app = fastapi.FastAPI("First application")
+13 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap
index 175d447961..22bae5d08e 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap
@@ -1,32 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
 ---
-TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is used for more than type hinting.
-  --> quote.py:57:28
-   |
-56 |     if TYPE_CHECKING:
-57 |         from pandas import DataFrame
-   |                            ^^^^^^^^^
-58 |
-59 |     def func(value: DataFrame):
-   |
-help: Move out of type-checking block
-
-ℹ Unsafe fix
-   1  |+from pandas import DataFrame
-1  2  | def f():
-2  3  |     from pandas import DataFrame
-3  4  | 
---------------------------------------------------------------------------------
-54 55 |     from typing import TYPE_CHECKING
-55 56 | 
-56 57 |     if TYPE_CHECKING:
-57    |-        from pandas import DataFrame
-   58 |+        pass
-58 59 | 
-59 60 |     def func(value: DataFrame):
-60 61 |         ...
-
 TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is used for more than type hinting.
    --> quote.py:110:28
     |
@@ -37,17 +11,16 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u
 112 |     x: TypeAlias = DataFrame | None
     |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-    1   |+from pandas import DataFrame
-1   2   | def f():
-2   3   |     from pandas import DataFrame
-3   4   | 
+1   + from pandas import DataFrame
+2   | def f():
+3   |     from pandas import DataFrame
+4   | 
 --------------------------------------------------------------------------------
-107 108 |     from typing import TypeAlias, TYPE_CHECKING
-108 109 | 
-109 110 |     if TYPE_CHECKING:
-110     |-        from pandas import DataFrame
-    111 |+        pass
-111 112 | 
-112 113 |     x: TypeAlias = DataFrame | None
+108 |     from typing import TypeAlias, TYPE_CHECKING
+109 | 
+110 |     if TYPE_CHECKING:
+    -         from pandas import DataFrame
+111 +         pass
+112 | 
+113 |     x: TypeAlias = DataFrame | None
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap
index 437547481b..0755f4fc48 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap
@@ -10,18 +10,17 @@ TC004 [*] Move import `datetime` out of type-checking block. Import is used for
 11 |     from array import array  # TC004
    |
 help: Move out of type-checking block
-
-ℹ Unsafe 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  # TC004
-11 11 |     from array import array  # TC004
-12 12 | 
-13 13 |     import pandas  # TC004
+5  | 
+6  | import pydantic
+7  | from pydantic import BaseModel
+8  + import datetime
+9  | 
+10 | if TYPE_CHECKING:
+   -     import datetime  # TC004
+11 |     from array import array  # TC004
+12 | 
+13 |     import pandas  # TC004
+note: This is an unsafe fix and may change runtime behavior
 
 TC004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting.
   --> runtime_evaluated_base_classes_1.py:11:23
@@ -34,19 +33,18 @@ TC004 [*] Move import `array.array` out of type-checking block. Import is used f
 13 |     import pandas  # TC004
    |
 help: Move out of type-checking block
-
-ℹ Unsafe 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  # TC004
-11    |-    from array import array  # TC004
-12 12 | 
-13 13 |     import pandas  # TC004
-14 14 |     import pyproj
+5  | 
+6  | import pydantic
+7  | from pydantic import BaseModel
+8  + from array import array
+9  | 
+10 | if TYPE_CHECKING:
+11 |     import datetime  # TC004
+   -     from array import array  # TC004
+12 | 
+13 |     import pandas  # TC004
+14 |     import pyproj
+note: This is an unsafe fix and may change runtime behavior
 
 TC004 [*] Move import `pandas` out of type-checking block. Import is used for more than type hinting.
   --> runtime_evaluated_base_classes_1.py:13:12
@@ -58,18 +56,17 @@ TC004 [*] Move import `pandas` out of type-checking block. Import is used for mo
 14 |     import pyproj
    |
 help: Move out of type-checking block
-
-ℹ Unsafe 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  # TC004
-11 12 |     from array import array  # TC004
-12 13 | 
-13    |-    import pandas  # TC004
-14 14 |     import pyproj
-15 15 | 
-16 16 |
+5  | 
+6  | import pydantic
+7  | from pydantic import BaseModel
+8  + import pandas
+9  | 
+10 | if TYPE_CHECKING:
+11 |     import datetime  # TC004
+12 |     from array import array  # TC004
+13 | 
+   -     import pandas  # TC004
+14 |     import pyproj
+15 | 
+16 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap
index c6d82c4794..8e3bf508ea 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap
@@ -10,18 +10,17 @@ TC004 [*] Move import `datetime` out of type-checking block. Import is used for
 13 |     from array import array  # TC004
    |
 help: Move out of type-checking block
-
-ℹ Unsafe 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  # TC004
-13 13 |     from array import array  # TC004
-14 14 | 
-15 15 |     import pandas  # TC004
+7  | from attrs import frozen
+8  | 
+9  | import numpy
+10 + import datetime
+11 | 
+12 | if TYPE_CHECKING:
+   -     import datetime  # TC004
+13 |     from array import array  # TC004
+14 | 
+15 |     import pandas  # TC004
+note: This is an unsafe fix and may change runtime behavior
 
 TC004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting.
   --> runtime_evaluated_decorators_1.py:13:23
@@ -34,19 +33,18 @@ TC004 [*] Move import `array.array` out of type-checking block. Import is used f
 15 |     import pandas  # TC004
    |
 help: Move out of type-checking block
-
-ℹ Unsafe 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  # TC004
-13    |-    from array import array  # TC004
-14 14 | 
-15 15 |     import pandas  # TC004
-16 16 |     import pyproj
+7  | from attrs import frozen
+8  | 
+9  | import numpy
+10 + from array import array
+11 | 
+12 | if TYPE_CHECKING:
+13 |     import datetime  # TC004
+   -     from array import array  # TC004
+14 | 
+15 |     import pandas  # TC004
+16 |     import pyproj
+note: This is an unsafe fix and may change runtime behavior
 
 TC004 [*] Move import `pandas` out of type-checking block. Import is used for more than type hinting.
   --> runtime_evaluated_decorators_1.py:15:12
@@ -58,18 +56,17 @@ TC004 [*] Move import `pandas` out of type-checking block. Import is used for mo
 16 |     import pyproj
    |
 help: Move out of type-checking block
-
-ℹ Unsafe 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  # TC004
-13 14 |     from array import array  # TC004
-14 15 | 
-15    |-    import pandas  # TC004
-16 16 |     import pyproj
-17 17 | 
-18 18 |
+7  | from attrs import frozen
+8  | 
+9  | import numpy
+10 + import pandas
+11 | 
+12 | if TYPE_CHECKING:
+13 |     import datetime  # TC004
+14 |     from array import array  # TC004
+15 | 
+   -     import pandas  # TC004
+16 |     import pyproj
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap
index 000858b290..d2d97031f8 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap
@@ -11,13 +11,12 @@ TC004 [*] Move import `builtins` out of type-checking block. Import is used for
 6 | builtins.print("!")
   |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-1 1 | # Regression test for: https://github.com/astral-sh/ruff/issues/19175
-2 2 | # there is a (potentially invisible) unicode formfeed character (000C) between `TYPE_CHECKING` and the backslash
-3   |-from typing import TYPE_CHECKING\
-  3 |+from typing import TYPE_CHECKING; import builtins\
-4 4 | 
-5   |-if TYPE_CHECKING: import builtins
-  5 |+if TYPE_CHECKING: pass
-6 6 | builtins.print("!")
+1 | # Regression test for: https://github.com/astral-sh/ruff/issues/19175
+2 | # there is a (potentially invisible) unicode formfeed character (000C) between `TYPE_CHECKING` and the backslash
+  - from typing import TYPE_CHECKING\
+3 + from typing import TYPE_CHECKING; import builtins\
+4 | 
+  - if TYPE_CHECKING: import builtins
+5 + if TYPE_CHECKING: pass
+6 | builtins.print("!")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-string-union_TC010_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-string-union_TC010_2.py.snap
index ab0b2a8952..3588e7b241 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-string-union_TC010_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-string-union_TC010_2.py.snap
@@ -1,39 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
 ---
-TC010 Invalid string member in `X | Y`-style union type
- --> TC010_2.py:4:4
-  |
-4 | x: "int" | str  # TC010
-  |    ^^^^^
-5 | x: ("int" | str) | "bool"  # TC010
-  |
-
-TC010 Invalid string member in `X | Y`-style union type
- --> TC010_2.py:5:5
-  |
-4 | x: "int" | str  # TC010
-5 | x: ("int" | str) | "bool"  # TC010
-  |     ^^^^^
-  |
-
-TC010 Invalid string member in `X | Y`-style union type
- --> TC010_2.py:5:20
-  |
-4 | x: "int" | str  # TC010
-5 | x: ("int" | str) | "bool"  # TC010
-  |                    ^^^^^^
-  |
-
-TC010 Invalid string member in `X | Y`-style union type
-  --> TC010_2.py:12:20
-   |
-12 | z: list[str, str | "int"] = []  # TC010
-   |                    ^^^^^
-13 |
-14 | type A = Value["int" | str]  # OK
-   |
-
 TC010 Invalid string member in `X | Y`-style union type
   --> TC010_2.py:16:30
    |
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap
index 326a0d894f..129c0f12b4 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap
@@ -11,21 +11,20 @@ TC003 [*] Move standard library import `dataclasses.FrozenInstanceError` into a
 6 | from pathlib import Path
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from __future__ import annotations
-4  4  | 
-5     |-from dataclasses import FrozenInstanceError, InitVar, dataclass
-   5  |+from dataclasses import InitVar, dataclass
-6  6  | from pathlib import Path
-   7  |+from typing import TYPE_CHECKING
-   8  |+
-   9  |+if TYPE_CHECKING:
-   10 |+    from dataclasses import FrozenInstanceError
-7  11 | 
-8  12 | 
-9  13 | @dataclass
+2  | 
+3  | from __future__ import annotations
+4  | 
+   - from dataclasses import FrozenInstanceError, InitVar, dataclass
+5  + from dataclasses import InitVar, dataclass
+6  | from pathlib import Path
+7  + from typing import TYPE_CHECKING
+8  + 
+9  + if TYPE_CHECKING:
+10 +     from dataclasses import FrozenInstanceError
+11 | 
+12 | 
+13 | @dataclass
+note: This is an unsafe fix and may change runtime behavior
 
 TC003 [*] Move standard library import `pathlib.Path` into a type-checking block
  --> init_var.py:6:21
@@ -35,16 +34,15 @@ TC003 [*] Move standard library import `pathlib.Path` into a type-checking block
   |                     ^^^^
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-3  3  | from __future__ import annotations
-4  4  | 
-5  5  | from dataclasses import FrozenInstanceError, InitVar, dataclass
-6     |-from pathlib import Path
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from pathlib import Path
-7  10 | 
-8  11 | 
-9  12 | @dataclass
+3  | from __future__ import annotations
+4  | 
+5  | from dataclasses import FrozenInstanceError, InitVar, dataclass
+   - from pathlib import Path
+6  + from typing import TYPE_CHECKING
+7  + 
+8  + if TYPE_CHECKING:
+9  +     from pathlib import Path
+10 | 
+11 | 
+12 | @dataclass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap
index 57c6a1adeb..04cafeba04 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap
@@ -10,17 +10,16 @@ TC003 [*] Move standard library import `dataclasses.Field` into a type-checking
   |                                             ^^^^^
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from __future__ import annotations
-4  4  | 
-5     |-from dataclasses import KW_ONLY, dataclass, Field
-   5  |+from dataclasses import KW_ONLY, dataclass
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from dataclasses import Field
-6  10 | 
-7  11 | 
-8  12 | @dataclass
+2  | 
+3  | from __future__ import annotations
+4  | 
+   - from dataclasses import KW_ONLY, dataclass, Field
+5  + from dataclasses import KW_ONLY, dataclass
+6  + from typing import TYPE_CHECKING
+7  + 
+8  + if TYPE_CHECKING:
+9  +     from dataclasses import Field
+10 | 
+11 | 
+12 | @dataclass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap
index fbbef0ec9d..f467cd7c04 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap
@@ -12,24 +12,23 @@ TC002 [*] Move third-party import `pkg.A` into a type-checking block
 29 |     def test(value: A):
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     from pkg import A
+6  | 
+7  | 
+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()
+28 | def f():
+29 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+30 |     import pkg
+   -     from pkg import A
+31 | 
+32 |     def test(value: A):
+33 |         return pkg.B()
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg.A` into a type-checking block
   --> strict.py:35:21
@@ -42,25 +41,24 @@ TC002 [*] Move third-party import `pkg.A` into a type-checking block
 37 |     def test(value: A):
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     from pkg import A
+6  | 
+7  | 
+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()
+36 | 
+37 | def f():
+38 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+   -     from pkg import A, B
+39 +     from pkg import B
+40 | 
+41 |     def test(value: A):
+42 |         return B()
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg.bar.A` into a type-checking block
   --> strict.py:54:25
@@ -73,24 +71,23 @@ TC002 [*] Move third-party import `pkg.bar.A` into a type-checking block
 56 |     def test(value: A):
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     from pkg.bar import A
+6  | 
+7  | 
+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()
+55 | def f():
+56 |     # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
+57 |     import pkg
+   -     from pkg.bar import A
+58 | 
+59 |     def test(value: A):
+60 |         return pkg.B()
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg` into a type-checking block
   --> strict.py:62:12
@@ -102,24 +99,23 @@ TC002 [*] Move third-party import `pkg` into a type-checking block
 63 |     import pkg.bar as B
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     import pkg
+6  | 
+7  | 
+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):
+63 | 
+64 | def f():
+65 |     # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime.
+   -     import pkg
+66 |     import pkg.bar as B
+67 | 
+68 |     def test(value: pkg.A):
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg.foo` into a type-checking block
   --> strict.py:71:23
@@ -131,24 +127,23 @@ TC002 [*] Move third-party import `pkg.foo` into a type-checking block
 72 |     import pkg.foo.bar as B
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     import pkg.foo as F
+6  | 
+7  | 
+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):
+72 | 
+73 | def f():
+74 |     # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+   -     import pkg.foo as F
+75 |     import pkg.foo.bar as B
+76 | 
+77 |     def test(value: F.Foo):
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg` into a type-checking block
   --> strict.py:80:12
@@ -160,24 +155,23 @@ TC002 [*] Move third-party import `pkg` into a type-checking block
 81 |     import pkg.foo.bar as B
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     import pkg
+6  | 
+7  | 
+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):
+81 | 
+82 | def f():
+83 |     # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+   -     import pkg
+84 |     import pkg.foo.bar as B
+85 | 
+86 |     def test(value: pkg.A):
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg` into a type-checking block
   --> strict.py:91:12
@@ -189,24 +183,23 @@ TC002 [*] Move third-party import `pkg` into a type-checking block
 92 |     import pkgfoo.bar as B
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     import pkg
+6  | 
+7  | 
+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):
+92 |     # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime.
+93 |     # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+94 |     # testing the implementation.
+   -     import pkg
+95 |     import pkgfoo.bar as B
+96 | 
+97 |     def test(value: pkg.A):
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg.foo` into a type-checking block
    --> strict.py:101:23
@@ -219,21 +212,20 @@ TC002 [*] Move third-party import `pkg.foo` into a type-checking block
 103 |     def test(value: F.Foo):
     |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1   | from __future__ import annotations
+2   + from typing import TYPE_CHECKING
+3   + 
+4   + if TYPE_CHECKING:
+5   +     import pkg.foo as F
+6   | 
+7   | 
+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()
+102 | def f():
+103 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+104 |     import pkg.bar as B
+    -     import pkg.foo as F
+105 | 
+106 |     def test(value: F.Foo):
+107 |         return B.Bar()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap
index 066155d1b9..1c862f6b5d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap
@@ -12,14 +12,13 @@ TC004 [*] Move import `foo.Foo` out of type-checking block. Import is used for m
 8 | a: TypeAlias = Foo | None  # OK
   |
 help: Move out of type-checking block
-
-ℹ Unsafe fix
-2 2 | from __future__ import annotations
-3 3 | 
-4 4 | from typing import TYPE_CHECKING, TypeAlias
-  5 |+from foo import Foo
-5 6 | if TYPE_CHECKING:
-6   |-    from foo import Foo  # TC004
-  7 |+    pass  # TC004
-7 8 | 
-8 9 | a: TypeAlias = Foo | None  # OK
+2 | from __future__ import annotations
+3 | 
+4 | from typing import TYPE_CHECKING, TypeAlias
+5 + from foo import Foo
+6 | if TYPE_CHECKING:
+  -     from foo import Foo  # TC004
+7 +     pass  # TC004
+8 | 
+9 | a: TypeAlias = Foo | None  # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap
index 7cba591164..3f6b1785b7 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap
@@ -11,14 +11,12 @@ TC008 [*] Remove quotes from type alias
 7 | b: TypeAlias = 'int' | None  # TC010
   |
 help: Remove quotes
-
-ℹ Safe fix
-3 3 | 
-4 4 | from typing import TypeAlias
-5 5 | 
-6   |-a: TypeAlias = 'int | None'  # TC008
-  6 |+a: TypeAlias = int | None  # TC008
-7 7 | b: TypeAlias = 'int' | None  # TC010
+3 | 
+4 | from typing import TypeAlias
+5 | 
+  - a: TypeAlias = 'int | None'  # TC008
+6 + a: TypeAlias = int | None  # TC008
+7 | b: TypeAlias = 'int' | None  # TC010
 
 TC010 Invalid string member in `X | Y`-style union type
  --> <filename>:7:16
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap
index d49fc5ac43..afcf894e1c 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap
@@ -12,16 +12,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 8 | def f(x: pd.DataFrame):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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 |
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import pandas as pd
+6  | 
+7  + if TYPE_CHECKING:
+8  +     import pandas as pd
+9  + 
+10 | def f(x: pd.DataFrame):
+11 |     pass
+12 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap
index 622926c8f9..dd29d90b22 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap
@@ -12,16 +12,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 8 | if TYPE_CHECKING:
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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):
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import pandas as pd
+6  | 
+7  | if TYPE_CHECKING:
+8  |     # This is a comment.
+9  +     import pandas as pd
+10 |     import os
+11 | 
+12 | def f(x: pd.DataFrame):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap
index 3154d35ecd..785f6e1ea8 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap
@@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 8 | if TYPE_CHECKING: import os
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import pandas as pd
+6  | 
+   - if TYPE_CHECKING: import os
+7  + if TYPE_CHECKING: import pandas as pd; import os
+8  | 
+9  | def f(x: pd.DataFrame):
+10 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap
index b2018bd971..9e8a9f7a0a 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap
@@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 8 | if TYPE_CHECKING:
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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):
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import pandas as pd
+6  | 
+7  | if TYPE_CHECKING:
+8  +     import pandas as pd
+9  |     import os
+10 | 
+11 | def f(x: pd.DataFrame):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap
index f9b554bbbc..bfe8aee71b 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap
@@ -11,23 +11,22 @@ TC001 [*] Move application import `.TYP001` into a type-checking block
 22 |     x: TYP001
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | For typing-only import detection tests, see `TC002.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():
+2  | 
+3  | For typing-only import detection tests, see `TC002.py`.
+4  | """
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from . import TYP001
+9  | 
+10 | 
+11 | def f():
 --------------------------------------------------------------------------------
-17 21 | 
-18 22 | 
-19 23 | def f():
-20    |-    from . import TYP001
-21 24 | 
-22 25 |     x: TYP001
-23 26 |
+21 | 
+22 | 
+23 | def f():
+   -     from . import TYP001
+24 | 
+25 |     x: TYP001
+26 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap
index 90bd90e695..c2f1077e90 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap
@@ -11,19 +11,18 @@ TC003 [*] Move standard library import `os` into a type-checking block
 10 |     x: os
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | For typing-only import detection tests, see `TC002.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 |
+2  | 
+3  | For typing-only import detection tests, see `TC002.py`.
+4  | """
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     import os
+9  | 
+10 | 
+11 | def f():
+   -     import os
+12 | 
+13 |     x: os
+14 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap
index 9d978decd1..cee4aeb09d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap
@@ -12,15 +12,14 @@ TC003 [*] Move standard library import `typing.Final` into a type-checking block
 7 | Const: Final[dict] = {}
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from __future__ import annotations
-4 4 | 
-5   |-from typing import Final
-  5 |+from typing import TYPE_CHECKING
-  6 |+
-  7 |+if TYPE_CHECKING:
-  8 |+    from typing import Final
-6 9 | 
-7 10 | Const: Final[dict] = {}
+2  | 
+3  | from __future__ import annotations
+4  | 
+   - from typing import Final
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from typing import Final
+9  | 
+10 | Const: Final[dict] = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap
index 1c40a7ad20..de632b8e7e 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap
@@ -12,15 +12,14 @@ TC003 [*] Move standard library import `typing.Final` into a type-checking block
 7 | Const: Final[dict] = {}
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | from __future__ import annotations
-4 4 | 
-5   |-from typing import Final, TYPE_CHECKING
-  5 |+from typing import TYPE_CHECKING
-  6 |+
-  7 |+if TYPE_CHECKING:
-  8 |+    from typing import Final
-6 9 | 
-7 10 | Const: Final[dict] = {}
+2  | 
+3  | from __future__ import annotations
+4  | 
+   - from typing import Final, TYPE_CHECKING
+5  + from typing import TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from typing import Final
+9  | 
+10 | Const: Final[dict] = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap
index 1e257387db..56506e24f4 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap
@@ -12,16 +12,15 @@ TC003 [*] Move standard library import `typing.Final` into a type-checking block
 7 | Const: Final[dict] = {}
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | from __future__ import annotations
-4  4  | 
-5     |-from typing import Final, Mapping
-   5  |+from typing import Mapping
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from typing import Final
-6  10 | 
-7  11 | Const: Final[dict] = {}
+2  | 
+3  | from __future__ import annotations
+4  | 
+   - from typing import Final, Mapping
+5  + from typing import Mapping
+6  + from typing import TYPE_CHECKING
+7  + 
+8  + if TYPE_CHECKING:
+9  +     from typing import Final
+10 | 
+11 | Const: Final[dict] = {}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap
index c7ca4bfe79..9d826051d9 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap
@@ -9,16 +9,15 @@ TC003 [*] Move standard library import `pathlib.Path` into a type-checking block
   |                     ^^^^
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-3  3  | from __future__ import annotations
-4  4  | 
-5  5  | from dataclasses import FrozenInstanceError, InitVar, dataclass
-6     |-from pathlib import Path
-   6  |+from typing import TYPE_CHECKING
-   7  |+
-   8  |+if TYPE_CHECKING:
-   9  |+    from pathlib import Path
-7  10 | 
-8  11 | 
-9  12 | @dataclass
+3  | from __future__ import annotations
+4  | 
+5  | from dataclasses import FrozenInstanceError, InitVar, dataclass
+   - from pathlib import Path
+6  + from typing import TYPE_CHECKING
+7  + 
+8  + if TYPE_CHECKING:
+9  +     from pathlib import Path
+10 | 
+11 | 
+12 | @dataclass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap
index 49c2af1dca..6db7c62e9d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap
@@ -10,15 +10,14 @@ TC003 [*] Move standard library import `collections.abc.Sequence` into a type-ch
   |                             ^^^^^^^^
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3   |-from collections.abc import Sequence
-  3 |+from typing import TYPE_CHECKING
-  4 |+
-  5 |+if TYPE_CHECKING:
-  6 |+    from collections.abc import Sequence
-4 7 | 
-5 8 | 
-6 9 | class Foo(MyBaseClass):
+1 | from __future__ import annotations
+2 | 
+  - from collections.abc import Sequence
+3 + from typing import TYPE_CHECKING
+4 + 
+5 + if TYPE_CHECKING:
+6 +     from collections.abc import Sequence
+7 | 
+8 | 
+9 | class Foo(MyBaseClass):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap
index afc6053cd8..6b9323ac78 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap
@@ -12,19 +12,18 @@ TC003 [*] Move standard library import `uuid.UUID` into a type-checking block
 7 | import pydantic
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | import datetime
-4  4  | import pathlib
-5     |-from uuid import UUID  # TC003
-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):
+2  | 
+3  | import datetime
+4  | import pathlib
+   - from uuid import UUID  # TC003
+5  | 
+6  | import pydantic
+7  | from pydantic import BaseModel
+8  + from typing import TYPE_CHECKING
+9  + 
+10 + if TYPE_CHECKING:
+11 +     from uuid import UUID
+12 | 
+13 | 
+14 | class A(pydantic.BaseModel):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap
index 35712dc794..7b7d2036c7 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap
@@ -12,21 +12,20 @@ TC003 [*] Move standard library import `uuid.UUID` into a type-checking block
 8 | from pydantic import validate_call
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-3  3  | import datetime
-4  4  | from array import array
-5  5  | from dataclasses import dataclass
-6     |-from uuid import UUID  # TC003
-7  6  | from collections.abc import Sequence
-8  7  | from pydantic import validate_call
-9  8  | 
-10 9  | import attrs
-11 10 | from attrs import frozen
-   11 |+from typing import TYPE_CHECKING
-   12 |+
-   13 |+if TYPE_CHECKING:
-   14 |+    from uuid import UUID
-12 15 | 
-13 16 | 
-14 17 | @attrs.define(auto_attribs=True)
+3  | import datetime
+4  | from array import array
+5  | from dataclasses import dataclass
+   - from uuid import UUID  # TC003
+6  | from collections.abc import Sequence
+7  | from pydantic import validate_call
+8  | 
+9  | import attrs
+10 | from attrs import frozen
+11 + from typing import TYPE_CHECKING
+12 + 
+13 + if TYPE_CHECKING:
+14 +     from uuid import UUID
+15 | 
+16 | 
+17 | @attrs.define(auto_attribs=True)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap
index 919be0bfcc..9a6552ac53 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap
@@ -11,18 +11,17 @@ TC003 [*] Move standard library import `pathlib.Path` into a type-checking block
 6 | from typing import Union
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1 1 | from __future__ import annotations
-2 2 | 
-3 3 | from collections.abc import MutableMapping, Mapping
-4   |-from pathlib import Path
-5 4 | from functools import singledispatchmethod
-6   |-from typing import Union
-  5 |+from typing import Union, TYPE_CHECKING
-  6 |+
-  7 |+if TYPE_CHECKING:
-  8 |+    from pathlib import Path
-7 9 | 
-8 10 | 
-9 11 | class Foo:
+1  | from __future__ import annotations
+2  | 
+3  | from collections.abc import MutableMapping, Mapping
+   - from pathlib import Path
+4  | from functools import singledispatchmethod
+   - from typing import Union
+5  + from typing import Union, TYPE_CHECKING
+6  + 
+7  + if TYPE_CHECKING:
+8  +     from pathlib import Path
+9  | 
+10 | 
+11 | class Foo:
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap
index f060bd6715..d84c1fff21 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap
@@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 7 |     x: pd.DataFrame
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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  # TC002
-6 9 | 
-7 10 |     x: pd.DataFrame
-8 11 | 
+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
+6  | 
+7  | 
+8  | def f():
+   -     import pandas as pd  # TC002
+9  | 
+10 |     x: pd.DataFrame
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:11:24
@@ -36,24 +35,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 13 |     x: DataFrame
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-8  12 | 
-9  13 | 
-10 14 | def f():
-11    |-    from pandas import DataFrame  # TC002
-12 15 | 
-13 16 |     x: DataFrame
-14 17 | 
+12 | 
+13 | 
+14 | def f():
+   -     from pandas import DataFrame  # TC002
+15 | 
+16 |     x: DataFrame
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:17:37
@@ -65,24 +63,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 19 |     x: df
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-14 18 | 
-15 19 | 
-16 20 | def f():
-17    |-    from pandas import DataFrame as df  # TC002
-18 21 | 
-19 22 |     x: df
-20 23 | 
+18 | 
+19 | 
+20 | def f():
+   -     from pandas import DataFrame as df  # TC002
+21 | 
+22 |     x: df
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> TC002.py:23:22
@@ -94,24 +91,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 25 |     x: pd.DataFrame = 1
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-20 24 | 
-21 25 | 
-22 26 | def f():
-23    |-    import pandas as pd  # TC002
-24 27 | 
-25 28 |     x: pd.DataFrame = 1
-26 29 | 
+24 | 
+25 | 
+26 | def f():
+   -     import pandas as pd  # TC002
+27 | 
+28 |     x: pd.DataFrame = 1
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:29:24
@@ -123,24 +119,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 31 |     x: DataFrame = 2
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-26 30 | 
-27 31 | 
-28 32 | def f():
-29    |-    from pandas import DataFrame  # TC002
-30 33 | 
-31 34 |     x: DataFrame = 2
-32 35 | 
+30 | 
+31 | 
+32 | def f():
+   -     from pandas import DataFrame  # TC002
+33 | 
+34 |     x: DataFrame = 2
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
   --> TC002.py:35:37
@@ -152,24 +147,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 37 |     x: df = 3
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-32 36 | 
-33 37 | 
-34 38 | def f():
-35    |-    from pandas import DataFrame as df  # TC002
-36 39 | 
-37 40 |     x: df = 3
-38 41 | 
+36 | 
+37 | 
+38 | def f():
+   -     from pandas import DataFrame as df  # TC002
+39 | 
+40 |     x: df = 3
+41 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> TC002.py:41:22
@@ -181,24 +175,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 43 |     x: "pd.DataFrame" = 1
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-38 42 | 
-39 43 | 
-40 44 | def f():
-41    |-    import pandas as pd  # TC002
-42 45 | 
-43 46 |     x: "pd.DataFrame" = 1
-44 47 | 
+42 | 
+43 | 
+44 | def f():
+   -     import pandas as pd  # TC002
+45 | 
+46 |     x: "pd.DataFrame" = 1
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pandas` into a type-checking block
   --> TC002.py:47:22
@@ -210,51 +203,20 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 49 |     x = dict["pd.DataFrame", "pd.DataFrame"]
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+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
+6  | 
+7  | 
+8  | def f():
 --------------------------------------------------------------------------------
-44 48 | 
-45 49 | 
-46 50 | def f():
-47    |-    import pandas as pd  # TC002
-48 51 | 
-49 52 |     x = dict["pd.DataFrame", "pd.DataFrame"]
-50 53 | 
-
-TC002 [*] Move third-party import `module.Member` into a type-checking block
-   --> TC002.py:172:24
-    |
-170 |     global Member
-171 |
-172 |     from module import Member
-    |                        ^^^^^^
-173 |
-174 |     x: Member = 1
-    |
-help: Move into type-checking block
-
-ℹ Unsafe 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 module import Member
-2   6   | 
-3   7   | 
-4   8   | def f():
---------------------------------------------------------------------------------
-169 173 | def f():
-170 174 |     global Member
-171 175 | 
-172     |-    from module import Member
-173 176 | 
-174 177 |     x: Member = 1
-175 178 |
+48 | 
+49 | 
+50 | def f():
+   -     import pandas as pd  # TC002
+51 | 
+52 |     x = dict["pd.DataFrame", "pd.DataFrame"]
+53 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_quote.py.snap
index 173cb5a2d6..8efb644122 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_quote.py.snap
@@ -1,5 +1,348 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
-snapshot_kind: text
 ---
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+ --> quote.py:2:24
+  |
+1 | def f():
+2 |     from pandas import DataFrame
+  |                        ^^^^^^^^^
+3 |
+4 |     def baz() -> DataFrame:
+  |
+help: Move into type-checking block
+  - def f():
+1 + from typing import TYPE_CHECKING
+2 + 
+3 + if TYPE_CHECKING:
+4 |     from pandas import DataFrame
+5 + def f():
+6 | 
+7 |     def baz() -> DataFrame:
+8 |         ...
+note: This is an unsafe fix and may change runtime behavior
 
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  --> quote.py:9:24
+   |
+ 8 | def f():
+ 9 |     from pandas import DataFrame
+   |                        ^^^^^^^^^
+10 |
+11 |     def baz() -> DataFrame[int]:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+10 | 
+11 | 
+12 | def f():
+   -     from pandas import DataFrame
+13 | 
+14 |     def baz() -> DataFrame[int]:
+15 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas` into a type-checking block
+  --> quote.py:16:22
+   |
+15 | def f():
+16 |     import pandas as pd
+   |                      ^^
+17 |
+18 |     def baz() -> pd.DataFrame:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import pandas as pd
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+17 | 
+18 | 
+19 | def f():
+   -     import pandas as pd
+20 | 
+21 |     def baz() -> pd.DataFrame:
+22 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas` into a type-checking block
+  --> quote.py:23:22
+   |
+22 | def f():
+23 |     import pandas as pd
+   |                      ^^
+24 |
+25 |     def baz() -> pd.DataFrame.Extra:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import pandas as pd
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+24 | 
+25 | 
+26 | def f():
+   -     import pandas as pd
+27 | 
+28 |     def baz() -> pd.DataFrame.Extra:
+29 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas` into a type-checking block
+  --> quote.py:30:22
+   |
+29 | def f():
+30 |     import pandas as pd
+   |                      ^^
+31 |
+32 |     def baz() -> pd.DataFrame | int:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     import pandas as pd
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+31 | 
+32 | 
+33 | def f():
+   -     import pandas as pd
+34 | 
+35 |     def baz() -> pd.DataFrame | int:
+36 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  --> quote.py:38:24
+   |
+37 | def f():
+38 |     from pandas import DataFrame
+   |                        ^^^^^^^^^
+39 |
+40 |     def baz() -> DataFrame():
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+39 | 
+40 | 
+41 | def f():
+   -     from pandas import DataFrame
+42 | 
+43 |     def baz() -> DataFrame():
+44 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  --> quote.py:47:24
+   |
+45 |     from typing import Literal
+46 |
+47 |     from pandas import DataFrame
+   |                        ^^^^^^^^^
+48 |
+49 |     def baz() -> DataFrame[Literal["int"]]:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+48 | def f():
+49 |     from typing import Literal
+50 | 
+   -     from pandas import DataFrame
+51 | 
+52 |     def baz() -> DataFrame[Literal["int"]]:
+53 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  --> quote.py:64:24
+   |
+63 | def f():
+64 |     from pandas import DataFrame, Series
+   |                        ^^^^^^^^^
+65 |
+66 |     def baz() -> DataFrame | Series:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+65 | 
+66 | 
+67 | def f():
+   -     from pandas import DataFrame, Series
+68 | 
+69 |     def baz() -> DataFrame | Series:
+70 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.Series` into a type-checking block
+  --> quote.py:64:35
+   |
+63 | def f():
+64 |     from pandas import DataFrame, Series
+   |                                   ^^^^^^
+65 |
+66 |     def baz() -> DataFrame | Series:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+65 | 
+66 | 
+67 | def f():
+   -     from pandas import DataFrame, Series
+68 | 
+69 |     def baz() -> DataFrame | Series:
+70 |         ...
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  --> quote.py:71:24
+   |
+70 | def f():
+71 |     from pandas import DataFrame, Series
+   |                        ^^^^^^^^^
+72 |
+73 |     def baz() -> (
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+72 | 
+73 | 
+74 | def f():
+   -     from pandas import DataFrame, Series
+75 | 
+76 |     def baz() -> (
+77 |         DataFrame |
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.Series` into a type-checking block
+  --> quote.py:71:35
+   |
+70 | def f():
+71 |     from pandas import DataFrame, Series
+   |                                   ^^^^^^
+72 |
+73 |     def baz() -> (
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+72 | 
+73 | 
+74 | def f():
+   -     from pandas import DataFrame, Series
+75 | 
+76 |     def baz() -> (
+77 |         DataFrame |
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  --> quote.py:89:24
+   |
+88 | def f():
+89 |     from pandas import DataFrame, Series
+   |                        ^^^^^^^^^
+90 |
+91 |     def func(self) -> DataFrame | list[Series]:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+90 | 
+91 | 
+92 | def f():
+   -     from pandas import DataFrame, Series
+93 | 
+94 |     def func(self) -> DataFrame | list[Series]:
+95 |         pass
+note: This is an unsafe fix and may change runtime behavior
+
+TC002 [*] Move third-party import `pandas.Series` into a type-checking block
+  --> quote.py:89:35
+   |
+88 | def f():
+89 |     from pandas import DataFrame, Series
+   |                                   ^^^^^^
+90 |
+91 |     def func(self) -> DataFrame | list[Series]:
+   |
+help: Move into type-checking block
+1  + from typing import TYPE_CHECKING
+2  + 
+3  + if TYPE_CHECKING:
+4  +     from pandas import DataFrame, Series
+5  | def f():
+6  |     from pandas import DataFrame
+7  | 
+--------------------------------------------------------------------------------
+90 | 
+91 | 
+92 | def f():
+   -     from pandas import DataFrame, Series
+93 | 
+94 |     def func(self) -> DataFrame | list[Series]:
+95 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap
index 77938f9a02..886a190214 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap
@@ -12,23 +12,22 @@ TC002 [*] Move third-party import `geopandas` into a type-checking block
 5 | import pyproj  # TC002
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3     |-import geopandas as gpd  # TC002
-4  3  | import pydantic
-5  4  | import pyproj  # TC002
-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):
+1  | from __future__ import annotations
+2  | 
+   - import geopandas as gpd  # TC002
+3  | import pydantic
+4  | import pyproj  # TC002
+5  | from pydantic import BaseModel
+6  | 
+7  | import numpy
+8  + from typing import TYPE_CHECKING
+9  + 
+10 + if TYPE_CHECKING:
+11 +     import geopandas as gpd
+12 | 
+13 | 
+14 | class A(BaseModel):
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pyproj` into a type-checking block
  --> runtime_evaluated_base_classes_2.py:5:8
@@ -40,19 +39,18 @@ TC002 [*] Move third-party import `pyproj` into a type-checking block
 6 | from pydantic import BaseModel
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | import geopandas as gpd  # TC002
-4  4  | import pydantic
-5     |-import pyproj  # TC002
-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):
+2  | 
+3  | import geopandas as gpd  # TC002
+4  | import pydantic
+   - import pyproj  # TC002
+5  | from pydantic import BaseModel
+6  | 
+7  | import numpy
+8  + from typing import TYPE_CHECKING
+9  + 
+10 + if TYPE_CHECKING:
+11 +     import pyproj
+12 | 
+13 | 
+14 | class A(BaseModel):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap
index e4245adea6..f8024fa370 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap
@@ -10,16 +10,15 @@ TC002 [*] Move third-party import `numpy` into a type-checking block
    |        ^^^^^
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-7  7  | import pyproj
-8  8  | from attrs import frozen
-9  9  | 
-10    |-import numpy  # TC002
-   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)
+7  | import pyproj
+8  | from attrs import frozen
+9  | 
+   - import numpy  # TC002
+10 + from typing import TYPE_CHECKING
+11 + 
+12 + if TYPE_CHECKING:
+13 +     import numpy
+14 | 
+15 | 
+16 | @attrs.define(auto_attribs=True)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap
index f6d4f2f11c..0609e15da2 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap
@@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 14 | if TYPE_CHECKING:
    |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-9  9  | from numpy import asarray
-10 10 | from numpy.typing import ArrayLike
-11 11 | from scipy.sparse import spmatrix
-12    |-from pandas import DataFrame
-13 12 | 
-14 13 | if TYPE_CHECKING:
-   14 |+    from pandas import DataFrame
-15 15 |     from numpy import ndarray
-16 16 | 
-17 17 |
+9  | from numpy import asarray
+10 | from numpy.typing import ArrayLike
+11 | from scipy.sparse import spmatrix
+   - from pandas import DataFrame
+12 | 
+13 | if TYPE_CHECKING:
+14 +     from pandas import DataFrame
+15 |     from numpy import ndarray
+16 | 
+17 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap
index fef1a107a0..1dae69a4a2 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap
@@ -12,24 +12,23 @@ TC002 [*] Move third-party import `pkg.bar.A` into a type-checking block
 56 |     def test(value: A):
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     from pkg.bar import A
+6  | 
+7  | 
+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()
+55 | def f():
+56 |     # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
+57 |     import pkg
+   -     from pkg.bar import A
+58 | 
+59 |     def test(value: A):
+60 |         return pkg.B()
+note: This is an unsafe fix and may change runtime behavior
 
 TC002 [*] Move third-party import `pkg` into a type-checking block
   --> strict.py:91:12
@@ -41,21 +40,20 @@ TC002 [*] Move third-party import `pkg` into a type-checking block
 92 |     import pkgfoo.bar as B
    |
 help: Move into type-checking block
-
-ℹ Unsafe 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():
+1  | from __future__ import annotations
+2  + from typing import TYPE_CHECKING
+3  + 
+4  + if TYPE_CHECKING:
+5  +     import pkg
+6  | 
+7  | 
+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):
+92 |     # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime.
+93 |     # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+94 |     # testing the implementation.
+   -     import pkg
+95 |     import pkgfoo.bar as B
+96 | 
+97 |     def test(value: pkg.A):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap
index 3e38e94b6d..5dca1ca18c 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap
@@ -11,18 +11,17 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 9 |     df: DataFrame
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3  3  | from typing_extensions import Self
-   4  |+from typing import TYPE_CHECKING
-   5  |+
-   6  |+if TYPE_CHECKING:
-   7  |+    from pandas import DataFrame
-4  8  | 
-5  9  | 
-6  10 | def func():
-7     |-    from pandas import DataFrame
-8  11 | 
-9  12 |     df: DataFrame
+1  | from __future__ import annotations
+2  | 
+3  | from typing_extensions import Self
+4  + from typing import TYPE_CHECKING
+5  + 
+6  + if TYPE_CHECKING:
+7  +     from pandas import DataFrame
+8  | 
+9  | 
+10 | def func():
+   -     from pandas import DataFrame
+11 | 
+12 |     df: DataFrame
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap
index d0f633a1f0..d58a404b0d 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap
@@ -11,16 +11,15 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
 9 |     df: DataFrame
   |
 help: Move into type-checking block
-
-ℹ Unsafe fix
-2  2  | 
-3  3  | import typing_extensions
-4  4  | 
-   5  |+if typing_extensions.TYPE_CHECKING:
-   6  |+    from pandas import DataFrame
-   7  |+
-5  8  | 
-6  9  | def func():
-7     |-    from pandas import DataFrame
-8  10 | 
-9  11 |     df: DataFrame
+2  | 
+3  | import typing_extensions
+4  | 
+5  + if typing_extensions.TYPE_CHECKING:
+6  +     from pandas import DataFrame
+7  + 
+8  | 
+9  | def func():
+   -     from pandas import DataFrame
+10 | 
+11 |     df: DataFrame
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap
index 36ac27e90e..5d66325269 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap
@@ -12,17 +12,16 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 6 | from typing import TYPE_CHECKING
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+1  | 
+2  | from __future__ import annotations
+3  | 
+   - import pandas as pd
+4  | 
+5  | from typing import TYPE_CHECKING
+6  | 
+7  + if TYPE_CHECKING:
+8  +     import pandas as pd
+9  + 
+10 | def f(x: pd.DataFrame):
+11 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap
index b06fe0450d..0c3209ab43 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap
@@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas` into a type-checking block
 8 | def f(x: pd.DataFrame):
   |
 help: Move into type-checking block
-
-ℹ Unsafe 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
+3  | 
+4  | from typing import TYPE_CHECKING
+5  | 
+   - import pandas as pd
+6  | 
+7  + if TYPE_CHECKING:
+8  +     import pandas as pd
+9  + 
+10 | def f(x: pd.DataFrame):
+11 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap
index b06e7c139c..549f8826a7 100644
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap
@@ -12,16 +12,15 @@ TC007 [*] Add quotes to type alias
 17 | e: TypeAlias = OptStr   # TC007
    |
 help: Add quotes
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | a: TypeAlias = int  # OK
-14 14 | b: TypeAlias = Dict  # OK
-15    |-c: TypeAlias = Foo   # TC007
-   15 |+c: TypeAlias = "Foo"   # TC007
-16 16 | d: TypeAlias = Foo | None  # TC007
-17 17 | e: TypeAlias = OptStr   # TC007
-18 18 | f: TypeAlias = Bar   # TC007
+12 | 
+13 | a: TypeAlias = int  # OK
+14 | b: TypeAlias = Dict  # OK
+   - c: TypeAlias = Foo   # TC007
+15 + c: TypeAlias = "Foo"   # TC007
+16 | d: TypeAlias = Foo | None  # TC007
+17 | e: TypeAlias = OptStr   # TC007
+18 | f: TypeAlias = Bar   # TC007
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:16:16
@@ -34,16 +33,15 @@ TC007 [*] Add quotes to type alias
 18 | f: TypeAlias = Bar   # TC007
    |
 help: Add quotes
-
-ℹ Unsafe fix
-13 13 | a: TypeAlias = int  # OK
-14 14 | b: TypeAlias = Dict  # OK
-15 15 | c: TypeAlias = Foo   # TC007
-16    |-d: TypeAlias = Foo | None  # TC007
-   16 |+d: TypeAlias = "Foo | None"  # TC007
-17 17 | e: TypeAlias = OptStr   # TC007
-18 18 | f: TypeAlias = Bar   # TC007
-19 19 | g: TypeAlias = Foo | Bar  # TC007 x2
+13 | a: TypeAlias = int  # OK
+14 | b: TypeAlias = Dict  # OK
+15 | c: TypeAlias = Foo   # TC007
+   - d: TypeAlias = Foo | None  # TC007
+16 + d: TypeAlias = "Foo | None"  # TC007
+17 | e: TypeAlias = OptStr   # TC007
+18 | f: TypeAlias = Bar   # TC007
+19 | g: TypeAlias = Foo | Bar  # TC007 x2
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:17:16
@@ -56,16 +54,15 @@ TC007 [*] Add quotes to type alias
 19 | g: TypeAlias = Foo | Bar  # TC007 x2
    |
 help: Add quotes
-
-ℹ Unsafe fix
-14 14 | b: TypeAlias = Dict  # OK
-15 15 | c: TypeAlias = Foo   # TC007
-16 16 | d: TypeAlias = Foo | None  # TC007
-17    |-e: TypeAlias = OptStr   # TC007
-   17 |+e: TypeAlias = "OptStr"   # TC007
-18 18 | f: TypeAlias = Bar   # TC007
-19 19 | g: TypeAlias = Foo | Bar  # TC007 x2
-20 20 | h: TypeAlias = Foo[str]  # TC007
+14 | b: TypeAlias = Dict  # OK
+15 | c: TypeAlias = Foo   # TC007
+16 | d: TypeAlias = Foo | None  # TC007
+   - e: TypeAlias = OptStr   # TC007
+17 + e: TypeAlias = "OptStr"   # TC007
+18 | f: TypeAlias = Bar   # TC007
+19 | g: TypeAlias = Foo | Bar  # TC007 x2
+20 | h: TypeAlias = Foo[str]  # TC007
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:18:16
@@ -78,16 +75,15 @@ TC007 [*] Add quotes to type alias
 20 | h: TypeAlias = Foo[str]  # TC007
    |
 help: Add quotes
-
-ℹ Unsafe fix
-15 15 | c: TypeAlias = Foo   # TC007
-16 16 | d: TypeAlias = Foo | None  # TC007
-17 17 | e: TypeAlias = OptStr   # TC007
-18    |-f: TypeAlias = Bar   # TC007
-   18 |+f: TypeAlias = "Bar"   # TC007
-19 19 | g: TypeAlias = Foo | Bar  # TC007 x2
-20 20 | h: TypeAlias = Foo[str]  # TC007
-21 21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+15 | c: TypeAlias = Foo   # TC007
+16 | d: TypeAlias = Foo | None  # TC007
+17 | e: TypeAlias = OptStr   # TC007
+   - f: TypeAlias = Bar   # TC007
+18 + f: TypeAlias = "Bar"   # TC007
+19 | g: TypeAlias = Foo | Bar  # TC007 x2
+20 | h: TypeAlias = Foo[str]  # TC007
+21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:19:16
@@ -100,16 +96,15 @@ TC007 [*] Add quotes to type alias
 21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
    |
 help: Add quotes
-
-ℹ Unsafe fix
-16 16 | d: TypeAlias = Foo | None  # TC007
-17 17 | e: TypeAlias = OptStr   # TC007
-18 18 | f: TypeAlias = Bar   # TC007
-19    |-g: TypeAlias = Foo | Bar  # TC007 x2
-   19 |+g: TypeAlias = "Foo | Bar"  # TC007 x2
-20 20 | h: TypeAlias = Foo[str]  # TC007
-21 21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
-22 22 |     Bar)
+16 | d: TypeAlias = Foo | None  # TC007
+17 | e: TypeAlias = OptStr   # TC007
+18 | f: TypeAlias = Bar   # TC007
+   - g: TypeAlias = Foo | Bar  # TC007 x2
+19 + g: TypeAlias = "Foo | Bar"  # TC007 x2
+20 | h: TypeAlias = Foo[str]  # TC007
+21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+22 |     Bar)
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:19:22
@@ -122,16 +117,15 @@ TC007 [*] Add quotes to type alias
 21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
    |
 help: Add quotes
-
-ℹ Unsafe fix
-16 16 | d: TypeAlias = Foo | None  # TC007
-17 17 | e: TypeAlias = OptStr   # TC007
-18 18 | f: TypeAlias = Bar   # TC007
-19    |-g: TypeAlias = Foo | Bar  # TC007 x2
-   19 |+g: TypeAlias = "Foo | Bar"  # TC007 x2
-20 20 | h: TypeAlias = Foo[str]  # TC007
-21 21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
-22 22 |     Bar)
+16 | d: TypeAlias = Foo | None  # TC007
+17 | e: TypeAlias = OptStr   # TC007
+18 | f: TypeAlias = Bar   # TC007
+   - g: TypeAlias = Foo | Bar  # TC007 x2
+19 + g: TypeAlias = "Foo | Bar"  # TC007 x2
+20 | h: TypeAlias = Foo[str]  # TC007
+21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+22 |     Bar)
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:20:16
@@ -144,16 +138,15 @@ TC007 [*] Add quotes to type alias
 22 |     Bar)
    |
 help: Add quotes
-
-ℹ Unsafe fix
-17 17 | e: TypeAlias = OptStr   # TC007
-18 18 | f: TypeAlias = Bar   # TC007
-19 19 | g: TypeAlias = Foo | Bar  # TC007 x2
-20    |-h: TypeAlias = Foo[str]  # TC007
-   20 |+h: TypeAlias = "Foo[str]"  # TC007
-21 21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
-22 22 |     Bar)
-23 23 | 
+17 | e: TypeAlias = OptStr   # TC007
+18 | f: TypeAlias = Bar   # TC007
+19 | g: TypeAlias = Foo | Bar  # TC007 x2
+   - h: TypeAlias = Foo[str]  # TC007
+20 + h: TypeAlias = "Foo[str]"  # TC007
+21 | i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+22 |     Bar)
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:21:17
@@ -165,17 +158,16 @@ TC007 [*] Add quotes to type alias
 22 |     Bar)
    |
 help: Add quotes
-
-ℹ Unsafe fix
-18 18 | f: TypeAlias = Bar   # TC007
-19 19 | g: TypeAlias = Foo | Bar  # TC007 x2
-20 20 | h: TypeAlias = Foo[str]  # TC007
-21    |-i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
-22    |-    Bar)
-   21 |+i: TypeAlias = ("Foo | Bar")
-23 22 | 
-24 23 | type C = Foo   # OK
-25 24 | type D = Foo | None  # OK
+18 | f: TypeAlias = Bar   # TC007
+19 | g: TypeAlias = Foo | Bar  # TC007 x2
+20 | h: TypeAlias = Foo[str]  # TC007
+   - i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+   -     Bar)
+21 + i: TypeAlias = ("Foo | Bar")
+22 | 
+23 | type C = Foo   # OK
+24 | type D = Foo | None  # OK
+note: This is an unsafe fix and may change runtime behavior
 
 TC007 [*] Add quotes to type alias
   --> TC007.py:22:5
@@ -188,14 +180,13 @@ TC007 [*] Add quotes to type alias
 24 | type C = Foo   # OK
    |
 help: Add quotes
-
-ℹ Unsafe fix
-18 18 | f: TypeAlias = Bar   # TC007
-19 19 | g: TypeAlias = Foo | Bar  # TC007 x2
-20 20 | h: TypeAlias = Foo[str]  # TC007
-21    |-i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
-22    |-    Bar)
-   21 |+i: TypeAlias = ("Foo | Bar")
-23 22 | 
-24 23 | type C = Foo   # OK
-25 24 | type D = Foo | None  # OK
+18 | f: TypeAlias = Bar   # TC007
+19 | g: TypeAlias = Foo | Bar  # TC007 x2
+20 | h: TypeAlias = Foo[str]  # TC007
+   - i: TypeAlias = (Foo |  # TC007 x2 (fix removes comment currently)
+   -     Bar)
+21 + i: TypeAlias = ("Foo | Bar")
+22 | 
+23 | type C = Foo   # OK
+24 | type D = Foo | None  # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_unused_arguments/rules/unused_arguments.rs b/crates/ruff_linter/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
index fb0ea5a004..18d0a96377 100644
--- a/crates/ruff_linter/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
+++ b/crates/ruff_linter/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
@@ -36,6 +36,7 @@ use crate::registry::Rule;
 /// ## Options
 /// - `lint.dummy-variable-rgx`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedFunctionArgument {
     name: String,
 }
@@ -76,6 +77,7 @@ impl Violation for UnusedFunctionArgument {
 /// ## Options
 /// - `lint.dummy-variable-rgx`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedMethodArgument {
     name: String,
 }
@@ -118,6 +120,7 @@ impl Violation for UnusedMethodArgument {
 /// ## Options
 /// - `lint.dummy-variable-rgx`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedClassMethodArgument {
     name: String,
 }
@@ -160,6 +163,7 @@ impl Violation for UnusedClassMethodArgument {
 /// ## Options
 /// - `lint.dummy-variable-rgx`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedStaticMethodArgument {
     name: String,
 }
@@ -199,6 +203,7 @@ impl Violation for UnusedStaticMethodArgument {
 /// ## Options
 /// - `lint.dummy-variable-rgx`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedLambdaArgument {
     name: String,
 }
@@ -223,7 +228,7 @@ enum Argumentable {
 
 impl Argumentable {
     fn check_for(self, checker: &Checker, name: String, range: TextRange) {
-        match self {
+        let mut diagnostic = match self {
             Self::Function => checker.report_diagnostic(UnusedFunctionArgument { name }, range),
             Self::Method => checker.report_diagnostic(UnusedMethodArgument { name }, range),
             Self::ClassMethod => {
@@ -234,6 +239,7 @@ impl Argumentable {
             }
             Self::Lambda => checker.report_diagnostic(UnusedLambdaArgument { name }, range),
         };
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
     }
 
     const fn rule_code(self) -> Rule {
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs
index 19a00b26b0..3ba017ecb7 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs
@@ -1,4 +1,4 @@
-use ruff_python_ast::{self as ast, Expr, ExprCall};
+use ruff_python_ast::{self as ast, Arguments, Expr, ExprCall};
 use ruff_python_semantic::{SemanticModel, analyze::typing};
 use ruff_text_size::Ranged;
 
@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::importer::ImportRequest;
 use crate::{Applicability, Edit, Fix, Violation};
 
-pub(crate) fn is_keyword_only_argument_non_default(arguments: &ast::Arguments, name: &str) -> bool {
+pub(crate) fn is_keyword_only_argument_non_default(arguments: &Arguments, name: &str) -> bool {
     arguments
         .find_keyword(name)
         .is_some_and(|keyword| !keyword.value.is_none_literal_expr())
@@ -24,10 +24,7 @@ pub(crate) fn is_pathlib_path_call(checker: &Checker, expr: &Expr) -> bool {
 /// Check if the given segments represent a pathlib Path subclass or `PackagePath` with preview mode support.
 /// In stable mode, only checks for `Path` and `PurePath`. In preview mode, also checks for
 /// `PosixPath`, `PurePosixPath`, `WindowsPath`, `PureWindowsPath`, and `PackagePath`.
-pub(crate) fn is_pure_path_subclass_with_preview(
-    checker: &crate::checkers::ast::Checker,
-    segments: &[&str],
-) -> bool {
+pub(crate) fn is_pure_path_subclass_with_preview(checker: &Checker, segments: &[&str]) -> bool {
     let is_core_pathlib = matches!(segments, ["pathlib", "Path" | "PurePath"]);
 
     if is_core_pathlib {
@@ -60,6 +57,7 @@ pub(crate) fn check_os_pathlib_single_arg_calls(
     fn_argument: &str,
     fix_enabled: bool,
     violation: impl Violation,
+    applicability: Option<Applicability>,
 ) {
     if call.arguments.len() != 1 {
         return;
@@ -74,33 +72,39 @@ pub(crate) fn check_os_pathlib_single_arg_calls(
 
     let mut diagnostic = checker.report_diagnostic(violation, call.func.range());
 
-    if fix_enabled {
-        diagnostic.try_set_fix(|| {
-            let (import_edit, binding) = checker.importer().get_or_import_symbol(
-                &ImportRequest::import("pathlib", "Path"),
-                call.start(),
-                checker.semantic(),
-            )?;
-
-            let applicability = if checker.comment_ranges().intersects(range) {
-                Applicability::Unsafe
-            } else {
-                Applicability::Safe
-            };
-
-            let replacement = if is_pathlib_path_call(checker, arg) {
-                format!("{arg_code}.{attr}")
-            } else {
-                format!("{binding}({arg_code}).{attr}")
-            };
-
-            Ok(Fix::applicable_edits(
-                Edit::range_replacement(replacement, range),
-                [import_edit],
-                applicability,
-            ))
-        });
+    if !fix_enabled {
+        return;
     }
+
+    diagnostic.try_set_fix(|| {
+        let (import_edit, binding) = checker.importer().get_or_import_symbol(
+            &ImportRequest::import("pathlib", "Path"),
+            call.start(),
+            checker.semantic(),
+        )?;
+
+        let replacement = if is_pathlib_path_call(checker, arg) {
+            format!("{arg_code}.{attr}")
+        } else {
+            format!("{binding}({arg_code}).{attr}")
+        };
+
+        let edit = Edit::range_replacement(replacement, range);
+
+        let fix = match applicability {
+            Some(Applicability::Unsafe) => Fix::unsafe_edits(edit, [import_edit]),
+            _ => {
+                let applicability = if checker.comment_ranges().intersects(range) {
+                    Applicability::Unsafe
+                } else {
+                    Applicability::Safe
+                };
+                Fix::applicable_edits(edit, [import_edit], applicability)
+            }
+        };
+
+        Ok(fix)
+    });
 }
 
 pub(crate) fn get_name_expr(expr: &Expr) -> Option<&ast::ExprName> {
@@ -186,7 +190,7 @@ pub(crate) fn check_os_pathlib_two_arg_calls(
 }
 
 pub(crate) fn has_unknown_keywords_or_starred_expr(
-    arguments: &ast::Arguments,
+    arguments: &Arguments,
     allowed: &[&str],
 ) -> bool {
     if arguments.args.iter().any(Expr::is_starred_expr) {
@@ -198,3 +202,10 @@ pub(crate) fn has_unknown_keywords_or_starred_expr(
         None => true,
     })
 }
+
+/// Returns `true` if argument `name` is set to a non-default `None` value.
+pub(crate) fn is_argument_non_default(arguments: &Arguments, name: &str, position: usize) -> bool {
+    arguments
+        .find_argument_value(name, position)
+        .is_some_and(|expr| !expr.is_none_literal_expr())
+}
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
index 6042c440e9..5d0938d5c6 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
@@ -11,11 +11,11 @@ mod tests {
     use ruff_python_ast::PythonVersion;
     use test_case::test_case;
 
-    use crate::assert_diagnostics;
     use crate::registry::Rule;
     use crate::settings;
     use crate::settings::types::PreviewMode;
     use crate::test::test_path;
+    use crate::{assert_diagnostics, assert_diagnostics_diff};
 
     #[test_case(Path::new("full_name.py"))]
     #[test_case(Path::new("import_as.py"))]
@@ -59,6 +59,7 @@ mod tests {
 
     #[test_case(Rule::PyPath, Path::new("py_path_1.py"))]
     #[test_case(Rule::PyPath, Path::new("py_path_2.py"))]
+    #[test_case(Rule::BuiltinOpen, Path::new("PTH123.py"))]
     #[test_case(Rule::PathConstructorCurrentDirectory, Path::new("PTH201.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202_2.py"))]
@@ -81,6 +82,29 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::InvalidPathlibWithSuffix, Path::new("PTH210.py"))]
+    #[test_case(Rule::InvalidPathlibWithSuffix, Path::new("PTH210_1.py"))]
+    fn deferred_annotations_diff(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "deferred_annotations_diff_{}_{}",
+            rule_code.name(),
+            path.to_string_lossy()
+        );
+        assert_diagnostics_diff!(
+            snapshot,
+            Path::new("flake8_use_pathlib").join(path).as_path(),
+            &settings::LinterSettings {
+                unresolved_target_version: PythonVersion::PY313.into(),
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+            &settings::LinterSettings {
+                unresolved_target_version: PythonVersion::PY314.into(),
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+        );
+        Ok(())
+    }
+
     #[test_case(Path::new("full_name.py"))]
     #[test_case(Path::new("import_as.py"))]
     #[test_case(Path::new("import_from_as.py"))]
@@ -123,6 +147,7 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::BuiltinOpen, Path::new("PTH123.py"))]
     #[test_case(Rule::PathConstructorCurrentDirectory, Path::new("PTH201.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202_2.py"))]
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/builtin_open.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/builtin_open.rs
new file mode 100644
index 0000000000..c88519c844
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/builtin_open.rs
@@ -0,0 +1,192 @@
+use ruff_diagnostics::{Applicability, Edit, Fix};
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{ArgOrKeyword, Expr, ExprBooleanLiteral, ExprCall};
+use ruff_text_size::Ranged;
+
+use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
+use crate::preview::is_fix_builtin_open_enabled;
+use crate::rules::flake8_use_pathlib::helpers::{
+    has_unknown_keywords_or_starred_expr, is_argument_non_default, is_file_descriptor,
+    is_pathlib_path_call,
+};
+use crate::{FixAvailability, Violation};
+
+/// ## What it does
+/// Checks for uses of the `open()` builtin.
+///
+/// ## Why is this bad?
+/// `pathlib` offers a high-level API for path manipulation. When possible,
+/// using `Path` object methods such as `Path.open()` can improve readability
+/// over the `open` builtin.
+///
+/// ## Examples
+/// ```python
+/// with open("f1.py", "wb") as fp:
+///     ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from pathlib import Path
+///
+/// with Path("f1.py").open("wb") as fp:
+///     ...
+/// ```
+///
+/// ## Known issues
+/// While using `pathlib` can improve the readability and type safety of your code,
+/// it can be less performant than working directly with strings,
+/// especially on older versions of Python.
+///
+/// ## Fix Safety
+/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+///
+/// ## References
+/// - [Python documentation: `Path.open`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.open)
+/// - [Python documentation: `open`](https://docs.python.org/3/library/functions.html#open)
+/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
+/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
+/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
+#[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
+pub(crate) struct BuiltinOpen;
+
+impl Violation for BuiltinOpen {
+    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        "`open()` should be replaced by `Path.open()`".to_string()
+    }
+
+    fn fix_title(&self) -> Option<String> {
+        Some("Replace with `Path.open()`".to_string())
+    }
+}
+
+// PTH123
+pub(crate) fn builtin_open(checker: &Checker, call: &ExprCall, segments: &[&str]) {
+    // `closefd` and `opener` are not supported by pathlib, so check if they
+    // are set to non-default values.
+    // https://github.com/astral-sh/ruff/issues/7620
+    // Signature as of Python 3.11 (https://docs.python.org/3/library/functions.html#open):
+    // ```text
+    // builtins.open(
+    //   file,          0
+    //   mode='r',      1
+    //   buffering=-1,  2
+    //   encoding=None, 3
+    //   errors=None,   4
+    //   newline=None,  5
+    //   closefd=True,  6 <= not supported
+    //   opener=None    7 <= not supported
+    // )
+    // ```
+    // For `pathlib` (https://docs.python.org/3/library/pathlib.html#pathlib.Path.open):
+    // ```text
+    // Path.open(mode='r', buffering=-1, encoding=None, errors=None, newline=None)
+    // ```
+    let file_arg = call.arguments.find_argument_value("file", 0);
+
+    if call
+        .arguments
+        .find_argument_value("closefd", 6)
+        .is_some_and(|expr| {
+            !matches!(
+                expr,
+                Expr::BooleanLiteral(ExprBooleanLiteral { value: true, .. })
+            )
+        })
+        || is_argument_non_default(&call.arguments, "opener", 7)
+        || file_arg.is_some_and(|expr| is_file_descriptor(expr, checker.semantic()))
+    {
+        return;
+    }
+
+    if !matches!(segments, ["" | "builtins", "open"]) {
+        return;
+    }
+
+    let mut diagnostic = checker.report_diagnostic(BuiltinOpen, call.func.range());
+
+    if !is_fix_builtin_open_enabled(checker.settings()) {
+        return;
+    }
+
+    let Some(file) = file_arg else {
+        return;
+    };
+
+    if has_unknown_keywords_or_starred_expr(
+        &call.arguments,
+        &[
+            "file",
+            "mode",
+            "buffering",
+            "encoding",
+            "errors",
+            "newline",
+            "closefd",
+            "opener",
+        ],
+    ) {
+        return;
+    }
+
+    diagnostic.try_set_fix(|| {
+        let (import_edit, binding) = checker.importer().get_or_import_symbol(
+            &ImportRequest::import("pathlib", "Path"),
+            call.start(),
+            checker.semantic(),
+        )?;
+
+        let locator = checker.locator();
+        let file_code = locator.slice(file.range());
+
+        let args = |i: usize, arg: ArgOrKeyword| match arg {
+            ArgOrKeyword::Arg(expr) => {
+                if expr.range() == file.range() || i == 6 || i == 7 {
+                    None
+                } else {
+                    Some(locator.slice(expr.range()))
+                }
+            }
+            ArgOrKeyword::Keyword(kw) => match kw.arg.as_deref() {
+                Some("mode" | "buffering" | "encoding" | "errors" | "newline") => {
+                    Some(locator.slice(kw))
+                }
+                _ => None,
+            },
+        };
+
+        let open_args = itertools::join(
+            call.arguments
+                .arguments_source_order()
+                .enumerate()
+                .filter_map(|(i, arg)| args(i, arg)),
+            ", ",
+        );
+
+        let replacement = if is_pathlib_path_call(checker, file) {
+            format!("{file_code}.open({open_args})")
+        } else {
+            format!("{binding}({file_code}).open({open_args})")
+        };
+
+        let range = call.range();
+
+        let applicability = if checker.comment_ranges().intersects(range) {
+            Applicability::Unsafe
+        } else {
+            Applicability::Safe
+        };
+
+        Ok(Fix::applicable_edits(
+            Edit::range_replacement(replacement, range),
+            [import_edit],
+            applicability,
+        ))
+    });
+}
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/glob_rule.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/glob_rule.rs
index 3c329bf20d..b131679ff4 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/glob_rule.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/glob_rule.rs
@@ -51,6 +51,7 @@ use crate::Violation;
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct Glob {
     pub function: String,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/invalid_pathlib_with_suffix.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/invalid_pathlib_with_suffix.rs
index 3bd4c5a091..fc66c33855 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/invalid_pathlib_with_suffix.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/invalid_pathlib_with_suffix.rs
@@ -57,6 +57,7 @@ use ruff_text_size::Ranged;
 ///
 /// No fix is offered if the suffix `"."` is given, since the intent is unclear.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct InvalidPathlibWithSuffix {
     single_dot: bool,
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/mod.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/mod.rs
index 7c9c180fb6..339d2c6a9e 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/mod.rs
@@ -1,3 +1,4 @@
+pub(crate) use builtin_open::*;
 pub(crate) use glob_rule::*;
 pub(crate) use invalid_pathlib_with_suffix::*;
 pub(crate) use os_chmod::*;
@@ -24,10 +25,12 @@ pub(crate) use os_rename::*;
 pub(crate) use os_replace::*;
 pub(crate) use os_rmdir::*;
 pub(crate) use os_sep_split::*;
+pub(crate) use os_symlink::*;
 pub(crate) use os_unlink::*;
 pub(crate) use path_constructor_current_directory::*;
 pub(crate) use replaceable_by_pathlib::*;
 
+mod builtin_open;
 mod glob_rule;
 mod invalid_pathlib_with_suffix;
 mod os_chmod;
@@ -54,6 +57,7 @@ mod os_rename;
 mod os_replace;
 mod os_rmdir;
 mod os_sep_split;
+mod os_symlink;
 mod os_unlink;
 mod path_constructor_current_directory;
 mod replaceable_by_pathlib;
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_chmod.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_chmod.rs
index cca89e7278..a6f851ca89 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_chmod.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_chmod.rs
@@ -1,11 +1,16 @@
+use ruff_diagnostics::{Applicability, Edit, Fix};
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{ArgOrKeyword, ExprCall};
+use ruff_text_size::Ranged;
+
 use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
 use crate::preview::is_fix_os_chmod_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
-    check_os_pathlib_two_arg_calls, is_file_descriptor, is_keyword_only_argument_non_default,
+    has_unknown_keywords_or_starred_expr, is_file_descriptor, is_keyword_only_argument_non_default,
+    is_pathlib_path_call,
 };
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.chmod`.
@@ -42,10 +47,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.chmod`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.chmod)
 /// - [Python documentation: `os.chmod`](https://docs.python.org/3/library/os.html#os.chmod)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsChmod;
 
 impl Violation for OsChmod {
@@ -73,22 +79,80 @@ pub(crate) fn os_chmod(checker: &Checker, call: &ExprCall, segments: &[&str]) {
     //           0     1          2               3
     // os.chmod(path, mode, *, dir_fd=None, follow_symlinks=True)
     // ```
-    if call
-        .arguments
-        .find_argument_value("path", 0)
-        .is_some_and(|expr| is_file_descriptor(expr, checker.semantic()))
+    let path_arg = call.arguments.find_argument_value("path", 0);
+
+    if path_arg.is_some_and(|expr| is_file_descriptor(expr, checker.semantic()))
         || is_keyword_only_argument_non_default(&call.arguments, "dir_fd")
     {
         return;
     }
 
-    check_os_pathlib_two_arg_calls(
-        checker,
-        call,
-        "chmod",
-        "path",
-        "mode",
-        is_fix_os_chmod_enabled(checker.settings()),
-        OsChmod,
-    );
+    let range = call.range();
+    let mut diagnostic = checker.report_diagnostic(OsChmod, call.func.range());
+
+    if !is_fix_os_chmod_enabled(checker.settings()) {
+        return;
+    }
+
+    if call.arguments.len() < 2 {
+        return;
+    }
+
+    if has_unknown_keywords_or_starred_expr(
+        &call.arguments,
+        &["path", "mode", "dir_fd", "follow_symlinks"],
+    ) {
+        return;
+    }
+
+    let (Some(path_arg), Some(_)) = (path_arg, call.arguments.find_argument_value("mode", 1))
+    else {
+        return;
+    };
+
+    diagnostic.try_set_fix(|| {
+        let (import_edit, binding) = checker.importer().get_or_import_symbol(
+            &ImportRequest::import("pathlib", "Path"),
+            call.start(),
+            checker.semantic(),
+        )?;
+
+        let locator = checker.locator();
+        let path_code = locator.slice(path_arg.range());
+
+        let args = |arg: ArgOrKeyword| match arg {
+            ArgOrKeyword::Arg(expr) if expr.range() != path_arg.range() => {
+                Some(locator.slice(expr.range()))
+            }
+            ArgOrKeyword::Keyword(kw)
+                if matches!(kw.arg.as_deref(), Some("mode" | "follow_symlinks")) =>
+            {
+                Some(locator.slice(kw.range()))
+            }
+            _ => None,
+        };
+
+        let chmod_args = itertools::join(
+            call.arguments.arguments_source_order().filter_map(args),
+            ", ",
+        );
+
+        let replacement = if is_pathlib_path_call(checker, path_arg) {
+            format!("{path_code}.chmod({chmod_args})")
+        } else {
+            format!("{binding}({path_code}).chmod({chmod_args})")
+        };
+
+        let applicability = if checker.comment_ranges().intersects(range) {
+            Applicability::Unsafe
+        } else {
+            Applicability::Safe
+        };
+
+        Ok(Fix::applicable_edits(
+            Edit::range_replacement(replacement, range),
+            [import_edit],
+            applicability,
+        ))
+    });
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_getcwd.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_getcwd.rs
index 8ce71b158d..7bb533246d 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_getcwd.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_getcwd.rs
@@ -43,10 +43,11 @@ use ruff_text_size::Ranged;
 /// - [Python documentation: `os.getcwd`](https://docs.python.org/3/library/os.html#os.getcwd)
 /// - [Python documentation: `os.getcwdb`](https://docs.python.org/3/library/os.html#os.getcwdb)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsGetcwd;
 
 impl Violation for OsGetcwd {
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_makedirs.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_makedirs.rs
index c280d3ef77..27aec3e66c 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_makedirs.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_makedirs.rs
@@ -46,10 +46,11 @@ use crate::{FixAvailability, Violation};
 /// - [Python documentation: `Path.mkdir`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.mkdir)
 /// - [Python documentation: `os.makedirs`](https://docs.python.org/3/library/os.html#os.makedirs)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsMakedirs;
 
 impl Violation for OsMakedirs {
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_mkdir.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_mkdir.rs
index 754191910e..86eec34df9 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_mkdir.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_mkdir.rs
@@ -47,10 +47,11 @@ use crate::{FixAvailability, Violation};
 /// - [Python documentation: `Path.mkdir`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.mkdir)
 /// - [Python documentation: `os.mkdir`](https://docs.python.org/3/library/os.html#os.mkdir)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsMkdir;
 
 impl Violation for OsMkdir {
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_abspath.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_abspath.rs
index a8961da959..9b58561e88 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_abspath.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_abspath.rs
@@ -1,10 +1,14 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_abspath_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
+use ruff_diagnostics::Applicability;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::ExprCall;
 
+use crate::checkers::ast::Checker;
+use crate::preview::is_fix_os_path_abspath_enabled;
+use crate::rules::flake8_use_pathlib::helpers::{
+    check_os_pathlib_single_arg_calls, has_unknown_keywords_or_starred_expr,
+};
+use crate::{FixAvailability, Violation};
+
 /// ## What it does
 /// Checks for uses of `os.path.abspath`.
 ///
@@ -34,16 +38,22 @@ use ruff_python_ast::ExprCall;
 /// especially on older versions of Python.
 ///
 /// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+/// This rule's fix is always marked as unsafe because `Path.resolve()` resolves symlinks, while
+/// `os.path.abspath()` does not. If resolving symlinks is important, you may need to use
+/// `Path.absolute()`. However, `Path.absolute()` also does not remove any `..` components in a
+/// path, unlike `os.path.abspath()` and `Path.resolve()`, so if that specific combination of
+/// behaviors is required, there's no existing `pathlib` alternative. See CPython issue
+/// [#69200](https://github.com/python/cpython/issues/69200).
 ///
 /// ## References
 /// - [Python documentation: `Path.resolve`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.resolve)
 /// - [Python documentation: `os.path.abspath`](https://docs.python.org/3/library/os.path.html#os.path.abspath)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathAbspath;
 
 impl Violation for OsPathAbspath {
@@ -63,6 +73,11 @@ pub(crate) fn os_path_abspath(checker: &Checker, call: &ExprCall, segments: &[&s
     if segments != ["os", "path", "abspath"] {
         return;
     }
+
+    if has_unknown_keywords_or_starred_expr(&call.arguments, &["path"]) {
+        return;
+    }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -70,5 +85,6 @@ pub(crate) fn os_path_abspath(checker: &Checker, call: &ExprCall, segments: &[&s
         "path",
         is_fix_os_path_abspath_enabled(checker.settings()),
         OsPathAbspath,
+        Some(Applicability::Unsafe),
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_basename.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_basename.rs
index f69526dd7a..ca69d07ce3 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_basename.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_basename.rs
@@ -1,9 +1,11 @@
+use ruff_diagnostics::Applicability;
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_basename_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.basename`.
@@ -34,16 +36,26 @@ use ruff_python_ast::ExprCall;
 /// especially on older versions of Python.
 ///
 /// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+/// This rule's fix is always marked as unsafe because the replacement is not always semantically
+/// equivalent to the original code. In particular, `pathlib` performs path normalization,
+/// which can alter the result compared to `os.path.basename`. For example, this normalization:
+///
+/// - Collapses consecutive slashes (e.g., `"a//b"` → `"a/b"`).
+/// - Removes trailing slashes (e.g., `"a/b/"` → `"a/b"`).
+/// - Eliminates `"."` (e.g., `"a/./b"` → `"a/b"`).
+///
+/// As a result, code relying on the exact string returned by `os.path.basename`
+/// may behave differently after the fix.
 ///
 /// ## References
 /// - [Python documentation: `PurePath.name`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.name)
 /// - [Python documentation: `os.path.basename`](https://docs.python.org/3/library/os.path.html#os.path.basename)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathBasename;
 
 impl Violation for OsPathBasename {
@@ -62,6 +74,7 @@ pub(crate) fn os_path_basename(checker: &Checker, call: &ExprCall, segments: &[&
     if segments != ["os", "path", "basename"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -69,5 +82,6 @@ pub(crate) fn os_path_basename(checker: &Checker, call: &ExprCall, segments: &[&
         "p",
         is_fix_os_path_basename_enabled(checker.settings()),
         OsPathBasename,
+        Some(Applicability::Unsafe),
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_dirname.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_dirname.rs
index a39ebc2814..d3175c2035 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_dirname.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_dirname.rs
@@ -1,9 +1,11 @@
+use ruff_diagnostics::Applicability;
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_dirname_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.dirname`.
@@ -29,7 +31,16 @@ use ruff_python_ast::ExprCall;
 /// ```
 ///
 /// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+/// This rule's fix is always marked as unsafe because the replacement is not always semantically
+/// equivalent to the original code. In particular, `pathlib` performs path normalization,
+/// which can alter the result compared to `os.path.dirname`. For example, this normalization:
+///
+/// - Collapses consecutive slashes (e.g., `"a//b"` → `"a/b"`).
+/// - Removes trailing slashes (e.g., `"a/b/"` → `"a/b"`).
+/// - Eliminates `"."` (e.g., `"a/./b"` → `"a/b"`).
+///
+/// As a result, code relying on the exact string returned by `os.path.dirname`
+/// may behave differently after the fix.
 ///
 /// ## Known issues
 /// While using `pathlib` can improve the readability and type safety of your code,
@@ -40,10 +51,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `PurePath.parent`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.parent)
 /// - [Python documentation: `os.path.dirname`](https://docs.python.org/3/library/os.path.html#os.path.dirname)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathDirname;
 
 impl Violation for OsPathDirname {
@@ -62,6 +74,7 @@ pub(crate) fn os_path_dirname(checker: &Checker, call: &ExprCall, segments: &[&s
     if segments != ["os", "path", "dirname"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -69,5 +82,6 @@ pub(crate) fn os_path_dirname(checker: &Checker, call: &ExprCall, segments: &[&s
         "p",
         is_fix_os_path_dirname_enabled(checker.settings()),
         OsPathDirname,
+        Some(Applicability::Unsafe),
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_exists.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_exists.rs
index d56697b7b1..f3fe32a641 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_exists.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_exists.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_exists_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.exists`.
@@ -40,10 +41,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.exists`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.exists)
 /// - [Python documentation: `os.path.exists`](https://docs.python.org/3/library/os.path.html#os.path.exists)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathExists;
 
 impl Violation for OsPathExists {
@@ -62,6 +64,7 @@ pub(crate) fn os_path_exists(checker: &Checker, call: &ExprCall, segments: &[&st
     if segments != ["os", "path", "exists"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -69,5 +72,6 @@ pub(crate) fn os_path_exists(checker: &Checker, call: &ExprCall, segments: &[&st
         "path",
         is_fix_os_path_exists_enabled(checker.settings()),
         OsPathExists,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_expanduser.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_expanduser.rs
index 6c25e30a5f..d544acde39 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_expanduser.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_expanduser.rs
@@ -1,9 +1,11 @@
+use ruff_diagnostics::Applicability;
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_expanduser_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.expanduser`.
@@ -34,16 +36,20 @@ use ruff_python_ast::ExprCall;
 /// especially on older versions of Python.
 ///
 /// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+/// This rule's fix is always marked as unsafe because the behaviors of
+/// `os.path.expanduser` and `Path.expanduser` differ when a user's home
+/// directory can't be resolved: `os.path.expanduser` returns the
+/// input unchanged, while `Path.expanduser` raises `RuntimeError`.
 ///
 /// ## References
 /// - [Python documentation: `Path.expanduser`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.expanduser)
 /// - [Python documentation: `os.path.expanduser`](https://docs.python.org/3/library/os.path.html#os.path.expanduser)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathExpanduser;
 
 impl Violation for OsPathExpanduser {
@@ -62,6 +68,7 @@ pub(crate) fn os_path_expanduser(checker: &Checker, call: &ExprCall, segments: &
     if segments != ["os", "path", "expanduser"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -69,5 +76,6 @@ pub(crate) fn os_path_expanduser(checker: &Checker, call: &ExprCall, segments: &
         "path",
         is_fix_os_path_expanduser_enabled(checker.settings()),
         OsPathExpanduser,
+        Some(Applicability::Unsafe),
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getatime.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getatime.rs
index 435ec1a939..0f148f4033 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getatime.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getatime.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_getatime_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.getatime`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getatime`](https://docs.python.org/3/library/os.path.html#os.path.getatime)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct OsPathGetatime;
 
 impl Violation for OsPathGetatime {
@@ -65,6 +67,7 @@ pub(crate) fn os_path_getatime(checker: &Checker, call: &ExprCall, segments: &[&
     if segments != ["os", "path", "getatime"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -72,5 +75,6 @@ pub(crate) fn os_path_getatime(checker: &Checker, call: &ExprCall, segments: &[&
         "filename",
         is_fix_os_path_getatime_enabled(checker.settings()),
         OsPathGetatime,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getctime.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getctime.rs
index 7b01da2234..86bce28aed 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getctime.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getctime.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_getctime_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.getctime`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getctime`](https://docs.python.org/3/library/os.path.html#os.path.getctime)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct OsPathGetctime;
 
 impl Violation for OsPathGetctime {
@@ -66,6 +68,7 @@ pub(crate) fn os_path_getctime(checker: &Checker, call: &ExprCall, segments: &[&
     if segments != ["os", "path", "getctime"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -73,5 +76,6 @@ pub(crate) fn os_path_getctime(checker: &Checker, call: &ExprCall, segments: &[&
         "filename",
         is_fix_os_path_getctime_enabled(checker.settings()),
         OsPathGetctime,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getmtime.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getmtime.rs
index dbcc1d44b9..42e77e3fe9 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getmtime.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getmtime.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_getmtime_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.getmtime`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getmtime`](https://docs.python.org/3/library/os.path.html#os.path.getmtime)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct OsPathGetmtime;
 
 impl Violation for OsPathGetmtime {
@@ -66,6 +68,7 @@ pub(crate) fn os_path_getmtime(checker: &Checker, call: &ExprCall, segments: &[&
     if segments != ["os", "path", "getmtime"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -73,5 +76,6 @@ pub(crate) fn os_path_getmtime(checker: &Checker, call: &ExprCall, segments: &[&
         "filename",
         is_fix_os_path_getmtime_enabled(checker.settings()),
         OsPathGetmtime,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getsize.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getsize.rs
index 9dc2606d7f..a945b2224c 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getsize.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getsize.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_getsize_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.getsize`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getsize`](https://docs.python.org/3/library/os.path.html#os.path.getsize)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct OsPathGetsize;
 
 impl Violation for OsPathGetsize {
@@ -66,6 +68,7 @@ pub(crate) fn os_path_getsize(checker: &Checker, call: &ExprCall, segments: &[&s
     if segments != ["os", "path", "getsize"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -73,5 +76,6 @@ pub(crate) fn os_path_getsize(checker: &Checker, call: &ExprCall, segments: &[&s
         "filename",
         is_fix_os_path_getsize_enabled(checker.settings()),
         OsPathGetsize,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isabs.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isabs.rs
index 482ec95f24..b1c8cb33c3 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isabs.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isabs.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_isabs_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.isabs`.
@@ -39,10 +40,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `PurePath.is_absolute`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.is_absolute)
 /// - [Python documentation: `os.path.isabs`](https://docs.python.org/3/library/os.path.html#os.path.isabs)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathIsabs;
 
 impl Violation for OsPathIsabs {
@@ -61,6 +63,7 @@ pub(crate) fn os_path_isabs(checker: &Checker, call: &ExprCall, segments: &[&str
     if segments != ["os", "path", "isabs"] {
         return;
     }
+
     check_os_pathlib_single_arg_calls(
         checker,
         call,
@@ -68,5 +71,6 @@ pub(crate) fn os_path_isabs(checker: &Checker, call: &ExprCall, segments: &[&str
         "s",
         is_fix_os_path_isabs_enabled(checker.settings()),
         OsPathIsabs,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isdir.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isdir.rs
index 4c33745e52..a2c1b8620f 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isdir.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isdir.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_isdir_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.isdir`.
@@ -40,10 +41,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.is_dir`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.is_dir)
 /// - [Python documentation: `os.path.isdir`](https://docs.python.org/3/library/os.path.html#os.path.isdir)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathIsdir;
 
 impl Violation for OsPathIsdir {
@@ -71,5 +73,6 @@ pub(crate) fn os_path_isdir(checker: &Checker, call: &ExprCall, segments: &[&str
         "s",
         is_fix_os_path_isdir_enabled(checker.settings()),
         OsPathIsdir,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isfile.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isfile.rs
index 0fa2bd4fd8..d31e39eef7 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isfile.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_isfile.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_isfile_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.isfile`.
@@ -40,10 +41,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.is_file`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.is_file)
 /// - [Python documentation: `os.path.isfile`](https://docs.python.org/3/library/os.path.html#os.path.isfile)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathIsfile;
 
 impl Violation for OsPathIsfile {
@@ -71,5 +73,6 @@ pub(crate) fn os_path_isfile(checker: &Checker, call: &ExprCall, segments: &[&st
         "path",
         is_fix_os_path_isfile_enabled(checker.settings()),
         OsPathIsfile,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_islink.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_islink.rs
index db9aa3d5e9..d958a2c19c 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_islink.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_islink.rs
@@ -1,9 +1,10 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_islink_enabled;
 use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.path.islink`.
@@ -40,10 +41,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.is_symlink`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.is_symlink)
 /// - [Python documentation: `os.path.islink`](https://docs.python.org/3/library/os.path.html#os.path.islink)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathIslink;
 
 impl Violation for OsPathIslink {
@@ -71,5 +73,6 @@ pub(crate) fn os_path_islink(checker: &Checker, call: &ExprCall, segments: &[&st
         "path",
         is_fix_os_path_islink_enabled(checker.settings()),
         OsPathIslink,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_samefile.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_samefile.rs
index f761de962c..cbf6d7a034 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_samefile.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_samefile.rs
@@ -1,6 +1,8 @@
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_path_samefile_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_two_arg_calls;
+use crate::rules::flake8_use_pathlib::helpers::{
+    check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
+};
 use crate::{FixAvailability, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::ExprCall;
@@ -40,10 +42,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.samefile`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.samefile)
 /// - [Python documentation: `os.path.samefile`](https://docs.python.org/3/library/os.path.html#os.path.samefile)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathSamefile;
 
 impl Violation for OsPathSamefile {
@@ -65,13 +68,16 @@ pub(crate) fn os_path_samefile(checker: &Checker, call: &ExprCall, segments: &[&
         return;
     }
 
+    let fix_enabled = is_fix_os_path_samefile_enabled(checker.settings())
+        && !has_unknown_keywords_or_starred_expr(&call.arguments, &["f1", "f2"]);
+
     check_os_pathlib_two_arg_calls(
         checker,
         call,
         "samefile",
         "f1",
         "f2",
-        is_fix_os_path_samefile_enabled(checker.settings()),
+        fix_enabled,
         OsPathSamefile,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_readlink.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_readlink.rs
index 62526f6666..d1df572ed5 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_readlink.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_readlink.rs
@@ -1,11 +1,12 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{ExprCall, PythonVersion};
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_readlink_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
 };
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{ExprCall, PythonVersion};
 
 /// ## What it does
 /// Checks for uses of `os.readlink`.
@@ -42,10 +43,11 @@ use ruff_python_ast::{ExprCall, PythonVersion};
 /// - [Python documentation: `Path.readlink`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.readline)
 /// - [Python documentation: `os.readlink`](https://docs.python.org/3/library/os.html#os.readlink)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsReadlink;
 
 impl Violation for OsReadlink {
@@ -87,5 +89,6 @@ pub(crate) fn os_readlink(checker: &Checker, call: &ExprCall, segments: &[&str])
         "path",
         is_fix_os_readlink_enabled(checker.settings()),
         OsReadlink,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_remove.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_remove.rs
index 3ec99469ea..43852e11e2 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_remove.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_remove.rs
@@ -1,11 +1,12 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_remove_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
 };
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.remove`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.unlink`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.unlink)
 /// - [Python documentation: `os.remove`](https://docs.python.org/3/library/os.html#os.remove)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsRemove;
 
 impl Violation for OsRemove {
@@ -82,5 +84,6 @@ pub(crate) fn os_remove(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         "path",
         is_fix_os_remove_enabled(checker.settings()),
         OsRemove,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rename.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rename.rs
index 63e9ac0d60..c5f2293ee9 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rename.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rename.rs
@@ -1,7 +1,8 @@
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_rename_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
-    check_os_pathlib_two_arg_calls, is_keyword_only_argument_non_default,
+    check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
+    is_keyword_only_argument_non_default,
 };
 use crate::{FixAvailability, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.rename`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.rename)
 /// - [Python documentation: `os.rename`](https://docs.python.org/3/library/os.html#os.rename)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsRename;
 
 impl Violation for OsRename {
@@ -79,13 +81,11 @@ pub(crate) fn os_rename(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         return;
     }
 
-    check_os_pathlib_two_arg_calls(
-        checker,
-        call,
-        "rename",
-        "src",
-        "dst",
-        is_fix_os_rename_enabled(checker.settings()),
-        OsRename,
-    );
+    let fix_enabled = is_fix_os_rename_enabled(checker.settings())
+        && !has_unknown_keywords_or_starred_expr(
+            &call.arguments,
+            &["src", "dst", "src_dir_fd", "dst_dir_fd"],
+        );
+
+    check_os_pathlib_two_arg_calls(checker, call, "rename", "src", "dst", fix_enabled, OsRename);
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_replace.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_replace.rs
index a63da9dc37..ef60099467 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_replace.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_replace.rs
@@ -1,7 +1,8 @@
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_replace_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
-    check_os_pathlib_two_arg_calls, is_keyword_only_argument_non_default,
+    check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
+    is_keyword_only_argument_non_default,
 };
 use crate::{FixAvailability, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
@@ -45,10 +46,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.replace`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.replace)
 /// - [Python documentation: `os.replace`](https://docs.python.org/3/library/os.html#os.replace)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsReplace;
 
 impl Violation for OsReplace {
@@ -82,13 +84,19 @@ pub(crate) fn os_replace(checker: &Checker, call: &ExprCall, segments: &[&str])
         return;
     }
 
+    let fix_enabled = is_fix_os_replace_enabled(checker.settings())
+        && !has_unknown_keywords_or_starred_expr(
+            &call.arguments,
+            &["src", "dst", "src_dir_fd", "dst_dir_fd"],
+        );
+
     check_os_pathlib_two_arg_calls(
         checker,
         call,
         "replace",
         "src",
         "dst",
-        is_fix_os_replace_enabled(checker.settings()),
+        fix_enabled,
         OsReplace,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rmdir.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rmdir.rs
index bb85284f4e..a044e541b9 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rmdir.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rmdir.rs
@@ -1,11 +1,12 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_rmdir_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
 };
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.rmdir`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.rmdir`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.rmdir)
 /// - [Python documentation: `os.rmdir`](https://docs.python.org/3/library/os.html#os.rmdir)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsRmdir;
 
 impl Violation for OsRmdir {
@@ -82,5 +84,6 @@ pub(crate) fn os_rmdir(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         "path",
         is_fix_os_rmdir_enabled(checker.settings()),
         OsRmdir,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_sep_split.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_sep_split.rs
index f6e01d037c..8a74dd1106 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_sep_split.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_sep_split.rs
@@ -53,6 +53,7 @@ use crate::checkers::ast::Checker;
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct OsSepSplit;
 
 impl Violation for OsSepSplit {
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_symlink.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_symlink.rs
new file mode 100644
index 0000000000..6e54acabb4
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_symlink.rs
@@ -0,0 +1,148 @@
+use ruff_diagnostics::{Applicability, Edit, Fix};
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+use ruff_text_size::Ranged;
+
+use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
+use crate::preview::is_fix_os_symlink_enabled;
+use crate::rules::flake8_use_pathlib::helpers::{
+    has_unknown_keywords_or_starred_expr, is_keyword_only_argument_non_default,
+    is_pathlib_path_call,
+};
+use crate::{FixAvailability, Violation};
+
+/// ## What it does
+/// Checks for uses of `os.symlink`.
+///
+/// ## Why is this bad?
+/// `pathlib` offers a high-level API for path manipulation, as compared to
+/// the lower-level API offered by `os.symlink`.
+///
+/// ## Example
+/// ```python
+/// import os
+///
+/// os.symlink("usr/bin/python", "tmp/python", target_is_directory=False)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from pathlib import Path
+///
+/// Path("tmp/python").symlink_to("usr/bin/python")
+/// ```
+///
+/// ## Known issues
+/// While using `pathlib` can improve the readability and type safety of your code,
+/// it can be less performant than the lower-level alternatives that work directly with strings,
+/// especially on older versions of Python.
+///
+/// ## Fix Safety
+/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+///
+/// ## References
+/// - [Python documentation: `Path.symlink_to`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.symlink_to)
+/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
+/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
+/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
+#[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
+pub(crate) struct OsSymlink;
+
+impl Violation for OsSymlink {
+    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        "`os.symlink` should be replaced by `Path.symlink_to`".to_string()
+    }
+
+    fn fix_title(&self) -> Option<String> {
+        Some("Replace with `Path(...).symlink_to(...)`".to_string())
+    }
+}
+
+/// PTH211
+pub(crate) fn os_symlink(checker: &Checker, call: &ExprCall, segments: &[&str]) {
+    if segments != ["os", "symlink"] {
+        return;
+    }
+
+    // `dir_fd` is not supported by pathlib, so check if there are non-default values.
+    // Signature as of Python 3.13 (https://docs.python.org/3/library/os.html#os.symlink)
+    // ```text
+    //            0    1    2                             3
+    // os.symlink(src, dst, target_is_directory=False, *, dir_fd=None)
+    // ```
+    if is_keyword_only_argument_non_default(&call.arguments, "dir_fd") {
+        return;
+    }
+
+    let range = call.range();
+    let mut diagnostic = checker.report_diagnostic(OsSymlink, call.func.range());
+
+    if !is_fix_os_symlink_enabled(checker.settings()) {
+        return;
+    }
+
+    if call.arguments.len() > 3 {
+        return;
+    }
+
+    if has_unknown_keywords_or_starred_expr(
+        &call.arguments,
+        &["src", "dst", "target_is_directory", "dir_fd"],
+    ) {
+        return;
+    }
+
+    let (Some(src), Some(dst)) = (
+        call.arguments.find_argument_value("src", 0),
+        call.arguments.find_argument_value("dst", 1),
+    ) else {
+        return;
+    };
+
+    diagnostic.try_set_fix(|| {
+        let (import_edit, binding) = checker.importer().get_or_import_symbol(
+            &ImportRequest::import("pathlib", "Path"),
+            call.start(),
+            checker.semantic(),
+        )?;
+
+        let applicability = if checker.comment_ranges().intersects(range) {
+            Applicability::Unsafe
+        } else {
+            Applicability::Safe
+        };
+
+        let locator = checker.locator();
+        let src_code = locator.slice(src.range());
+        let dst_code = locator.slice(dst.range());
+
+        let target_is_directory = call
+            .arguments
+            .find_argument_value("target_is_directory", 2)
+            .and_then(|expr| {
+                let code = locator.slice(expr.range());
+                expr.as_boolean_literal_expr()
+                    .is_none_or(|bl| bl.value)
+                    .then_some(format!(", target_is_directory={code}"))
+            })
+            .unwrap_or_default();
+
+        let replacement = if is_pathlib_path_call(checker, dst) {
+            format!("{dst_code}.symlink_to({src_code}{target_is_directory})")
+        } else {
+            format!("{binding}({dst_code}).symlink_to({src_code}{target_is_directory})")
+        };
+
+        Ok(Fix::applicable_edits(
+            Edit::range_replacement(replacement, range),
+            [import_edit],
+            applicability,
+        ))
+    });
+}
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_unlink.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_unlink.rs
index 5d97338e88..9f49025465 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_unlink.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_unlink.rs
@@ -1,11 +1,12 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::ExprCall;
+
 use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_unlink_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
 };
 use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
 
 /// ## What it does
 /// Checks for uses of `os.unlink`.
@@ -42,10 +43,11 @@ use ruff_python_ast::ExprCall;
 /// - [Python documentation: `Path.unlink`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.unlink)
 /// - [Python documentation: `os.unlink`](https://docs.python.org/3/library/os.html#os.unlink)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsUnlink;
 
 impl Violation for OsUnlink {
@@ -82,5 +84,6 @@ pub(crate) fn os_unlink(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         "path",
         is_fix_os_unlink_enabled(checker.settings()),
         OsUnlink,
+        None,
     );
 }
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/path_constructor_current_directory.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/path_constructor_current_directory.rs
index c909c312ac..bf5a4ed8b7 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/path_constructor_current_directory.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/path_constructor_current_directory.rs
@@ -41,6 +41,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// ## References
 /// - [Python documentation: `Path`](https://docs.python.org/3/library/pathlib.html#pathlib.Path)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct PathConstructorCurrentDirectory;
 
 impl AlwaysFixableViolation for PathConstructorCurrentDirectory {
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
index b35ecd77c1..5ecef9398c 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
@@ -1,4 +1,4 @@
-use ruff_python_ast::{self as ast, Expr, ExprBooleanLiteral, ExprCall};
+use ruff_python_ast::{Expr, ExprCall};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -7,9 +7,7 @@ use crate::rules::flake8_use_pathlib::helpers::{
 };
 use crate::rules::flake8_use_pathlib::{
     rules::Glob,
-    violations::{
-        BuiltinOpen, Joiner, OsListdir, OsPathJoin, OsPathSplitext, OsStat, OsSymlink, PyPath,
-    },
+    violations::{Joiner, OsListdir, OsPathJoin, OsPathSplitext, OsStat, PyPath},
 };
 
 pub(crate) fn replaceable_by_pathlib(checker: &Checker, call: &ExprCall) {
@@ -62,56 +60,6 @@ pub(crate) fn replaceable_by_pathlib(checker: &Checker, call: &ExprCall) {
         ),
         // PTH122
         ["os", "path", "splitext"] => checker.report_diagnostic_if_enabled(OsPathSplitext, range),
-        // PTH211
-        ["os", "symlink"] => {
-            // `dir_fd` is not supported by pathlib, so check if there are non-default values.
-            // Signature as of Python 3.13 (https://docs.python.org/3/library/os.html#os.symlink)
-            // ```text
-            //            0    1    2                             3
-            // os.symlink(src, dst, target_is_directory=False, *, dir_fd=None)
-            // ```
-            if is_keyword_only_argument_non_default(&call.arguments, "dir_fd") {
-                return;
-            }
-            checker.report_diagnostic_if_enabled(OsSymlink, range)
-        }
-
-        // PTH123
-        ["" | "builtins", "open"] => {
-            // `closefd` and `opener` are not supported by pathlib, so check if they
-            // are set to non-default values.
-            // https://github.com/astral-sh/ruff/issues/7620
-            // Signature as of Python 3.11 (https://docs.python.org/3/library/functions.html#open):
-            // ```text
-            //      0     1         2             3              4            5
-            // open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None,
-            //      6             7
-            //      closefd=True, opener=None)
-            //              ^^^^         ^^^^
-            // ```
-            // For `pathlib` (https://docs.python.org/3/library/pathlib.html#pathlib.Path.open):
-            // ```text
-            // Path.open(mode='r', buffering=-1, encoding=None, errors=None, newline=None)
-            // ```
-            if call
-                .arguments
-                .find_argument_value("closefd", 6)
-                .is_some_and(|expr| {
-                    !matches!(
-                        expr,
-                        Expr::BooleanLiteral(ExprBooleanLiteral { value: true, .. })
-                    )
-                })
-                || is_argument_non_default(&call.arguments, "opener", 7)
-                || call
-                    .arguments
-                    .find_argument_value("file", 0)
-                    .is_some_and(|expr| is_file_descriptor(expr, checker.semantic()))
-            {
-                return;
-            }
-            checker.report_diagnostic_if_enabled(BuiltinOpen, range)
-        }
         // PTH124
         ["py", "path", "local"] => checker.report_diagnostic_if_enabled(PyPath, range),
         // PTH207
@@ -167,10 +115,3 @@ pub(crate) fn replaceable_by_pathlib(checker: &Checker, call: &ExprCall) {
         _ => return,
     };
 }
-
-/// Returns `true` if argument `name` is set to a non-default `None` value.
-fn is_argument_non_default(arguments: &ast::Arguments, name: &str, position: usize) -> bool {
-    arguments
-        .find_argument_value(name, position)
-        .is_some_and(|expr| !expr.is_none_literal_expr())
-}
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH123_PTH123.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH123_PTH123.py.snap
new file mode 100644
index 0000000000..488f69210c
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH123_PTH123.py.snap
@@ -0,0 +1,143 @@
+---
+source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
+---
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:8:1
+   |
+ 6 | r_plus = "r+"
+ 7 |
+ 8 | builtins.open(file=_file)
+   | ^^^^^^^^^^^^^
+ 9 |
+10 | open(_file, "r+ ", -  1)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:10:1
+   |
+ 8 | builtins.open(file=_file)
+ 9 |
+10 | open(_file, "r+ ", -  1)
+   | ^^^^
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:11:1
+   |
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+   | ^^^^
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:12:1
+   |
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+   | ^^^^
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:13:1
+   |
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+   | ^^^^
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:14:1
+   |
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+   | ^^^^
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:15:1
+   |
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+   | ^^^^
+16 | open(_file, f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:16:1
+   |
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+   | ^^^^
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:17:1
+   |
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+   | ^^^^
+18 |
+19 | # Only diagnostic
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:20:1
+   |
+19 | # Only diagnostic
+20 | open()
+   | ^^^^
+21 | open(_file, *_x)
+22 | open(_file, "r+", unknown=True)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:21:1
+   |
+19 | # Only diagnostic
+20 | open()
+21 | open(_file, *_x)
+   | ^^^^
+22 | open(_file, "r+", unknown=True)
+23 | open(_file, "r+", closefd=False)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:22:1
+   |
+20 | open()
+21 | open(_file, *_x)
+22 | open(_file, "r+", unknown=True)
+   | ^^^^
+23 | open(_file, "r+", closefd=False)
+24 | open(_file, "r+", None, None, None, None, None, None, None)
+   |
+help: Replace with `Path.open()`
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap
index 8e5ee8eb59..976595eb45 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap
@@ -11,16 +11,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 8 | _ = PurePath(".")
   |
 help: Remove the current directory argument
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | # match
-6   |-_ = Path(".")
-  6 |+_ = Path()
-7 7 | _ = pth(".")
-8 8 | _ = PurePath(".")
-9 9 | _ = Path("")
+3 | 
+4 | 
+5 | # match
+  - _ = Path(".")
+6 + _ = Path()
+7 | _ = pth(".")
+8 | _ = PurePath(".")
+9 | _ = Path("")
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
  --> PTH201.py:7:9
@@ -33,16 +31,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 9 | _ = Path("")
   |
 help: Remove the current directory argument
-
-ℹ Safe fix
-4 4 | 
-5 5 | # match
-6 6 | _ = Path(".")
-7   |-_ = pth(".")
-  7 |+_ = pth()
-8 8 | _ = PurePath(".")
-9 9 | _ = Path("")
-10 10 | 
+4  | 
+5  | # match
+6  | _ = Path(".")
+   - _ = pth(".")
+7  + _ = pth()
+8  | _ = PurePath(".")
+9  | _ = Path("")
+10 | 
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
  --> PTH201.py:8:14
@@ -54,16 +50,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 9 | _ = Path("")
   |
 help: Remove the current directory argument
-
-ℹ Safe fix
-5 5 | # match
-6 6 | _ = Path(".")
-7 7 | _ = pth(".")
-8   |-_ = PurePath(".")
-  8 |+_ = PurePath()
-9 9 | _ = Path("")
-10 10 | 
-11 11 | Path('', )
+5  | # match
+6  | _ = Path(".")
+7  | _ = pth(".")
+   - _ = PurePath(".")
+8  + _ = PurePath()
+9  | _ = Path("")
+10 | 
+11 | Path('', )
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:9:10
@@ -76,16 +70,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 11 | Path('', )
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-6  6  | _ = Path(".")
-7  7  | _ = pth(".")
-8  8  | _ = PurePath(".")
-9     |-_ = Path("")
-   9  |+_ = Path()
-10 10 | 
-11 11 | Path('', )
-12 12 | 
+6  | _ = Path(".")
+7  | _ = pth(".")
+8  | _ = PurePath(".")
+   - _ = Path("")
+9  + _ = Path()
+10 | 
+11 | Path('', )
+12 | 
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:11:6
@@ -98,16 +90,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 13 | Path(
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-8  8  | _ = PurePath(".")
-9  9  | _ = Path("")
-10 10 | 
-11    |-Path('', )
-   11 |+Path()
-12 12 | 
-13 13 | Path(
-14 14 |     '',
+8  | _ = PurePath(".")
+9  | _ = Path("")
+10 | 
+   - Path('', )
+11 + Path()
+12 | 
+13 | Path(
+14 |     '',
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:14:5
@@ -118,18 +108,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 15 | )
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-10 10 | 
-11 11 | Path('', )
-12 12 | 
-13    |-Path(
-14    |-    '',
-15    |-)
-   13 |+Path()
-16 14 | 
-17 15 | Path(  # Comment before argument
-18 16 |     '',
+10 | 
+11 | Path('', )
+12 | 
+   - Path(
+   -     '',
+   - )
+13 + Path()
+14 | 
+15 | Path(  # Comment before argument
+16 |     '',
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:18:5
@@ -140,18 +128,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 19 | )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-14 14 |     '',
-15 15 | )
-16 16 | 
-17    |-Path(  # Comment before argument
-18    |-    '',
-19    |-)
-   17 |+Path()
-20 18 | 
-21 19 | Path(
-22 20 |     '',  # EOL comment
+14 |     '',
+15 | )
+16 | 
+   - Path(  # Comment before argument
+   -     '',
+   - )
+17 + Path()
+18 | 
+19 | Path(
+20 |     '',  # EOL comment
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:22:5
@@ -162,18 +149,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 23 | )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-18 18 |     '',
-19 19 | )
-20 20 | 
-21    |-Path(
-22    |-    '',  # EOL comment
-23    |-)
-   21 |+Path()
-24 22 | 
-25 23 | Path(
-26 24 |     ''  # Comment in the middle of implicitly concatenated string
+18 |     '',
+19 | )
+20 | 
+   - Path(
+   -     '',  # EOL comment
+   - )
+21 + Path()
+22 | 
+23 | Path(
+24 |     ''  # Comment in the middle of implicitly concatenated string
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:26:5
@@ -185,19 +171,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 28 |   )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-22 22 |     '',  # EOL comment
-23 23 | )
-24 24 | 
-25    |-Path(
-26    |-    ''  # Comment in the middle of implicitly concatenated string
-27    |-    ".",
-28    |-)
-   25 |+Path()
-29 26 | 
-30 27 | Path(
-31 28 |     ''  # Comment before comma
+22 |     '',  # EOL comment
+23 | )
+24 | 
+   - Path(
+   -     ''  # Comment in the middle of implicitly concatenated string
+   -     ".",
+   - )
+25 + Path()
+26 | 
+27 | Path(
+28 |     ''  # Comment before comma
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:31:5
@@ -209,19 +194,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 33 | )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-27 27 |     ".",
-28 28 | )
-29 29 | 
-30    |-Path(
-31    |-    ''  # Comment before comma
-32    |-    ,
-33    |-)
-   30 |+Path()
-34 31 | 
-35 32 | Path(
-36 33 |     '',
+27 |     ".",
+28 | )
+29 | 
+   - Path(
+   -     ''  # Comment before comma
+   -     ,
+   - )
+30 + Path()
+31 | 
+32 | Path(
+33 |     '',
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:36:5
@@ -232,18 +216,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 37 | ) / "bare"
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-33 33 | )
-34 34 | 
-35 35 | Path(
-36    |-    '',
-37    |-) / "bare"
-   36 |+    "bare",
-   37 |+)
-38 38 | 
-39 39 | Path(  # Comment before argument
-40 40 |     '',
+33 | )
+34 | 
+35 | Path(
+   -     '',
+   - ) / "bare"
+36 +     "bare",
+37 + )
+38 | 
+39 | Path(  # Comment before argument
+40 |     '',
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:40:5
@@ -254,18 +236,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 41 | ) / ("parenthesized")
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-37 37 | ) / "bare"
-38 38 | 
-39 39 | Path(  # Comment before argument
-40    |-    '',
-41    |-) / ("parenthesized")
-   40 |+    ("parenthesized"),
-   41 |+)
-42 42 | 
-43 43 | Path(
-44 44 |     '',  # EOL comment
+37 | ) / "bare"
+38 | 
+39 | Path(  # Comment before argument
+   -     '',
+   - ) / ("parenthesized")
+40 +     ("parenthesized"),
+41 + )
+42 | 
+43 | Path(
+44 |     '',  # EOL comment
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:44:5
@@ -276,18 +257,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 45 | ) / ( ("double parenthesized"  )   )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-41 41 | ) / ("parenthesized")
-42 42 | 
-43 43 | Path(
-44    |-    '',  # EOL comment
-45    |-) / ( ("double parenthesized"  )   )
-   44 |+    ( ("double parenthesized"  )   ),  # EOL comment
-   45 |+)
-46 46 | 
-47 47 | (  Path(
-48 48 |     ''  # Comment in the middle of implicitly concatenated string
+41 | ) / ("parenthesized")
+42 | 
+43 | Path(
+   -     '',  # EOL comment
+   - ) / ( ("double parenthesized"  )   )
+44 +     ( ("double parenthesized"  )   ),  # EOL comment
+45 + )
+46 | 
+47 | (  Path(
+48 |     ''  # Comment in the middle of implicitly concatenated string
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:48:5
@@ -300,22 +280,21 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 51 |         # Comment between closing parentheses
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-44 44 |     '',  # EOL comment
-45 45 | ) / ( ("double parenthesized"  )   )
-46 46 | 
-47    |-(  Path(
-48    |-    ''  # Comment in the middle of implicitly concatenated string
-49    |-    ".",
-50    |-) )/ (("parenthesized path call")
-   47 |+Path(
-   48 |+    (("parenthesized path call")
-51 49 |       # Comment between closing parentheses
-   50 |+),
-52 51 | )
-53 52 | 
-54 53 | Path(
+44 |     '',  # EOL comment
+45 | ) / ( ("double parenthesized"  )   )
+46 | 
+   - (  Path(
+   -     ''  # Comment in the middle of implicitly concatenated string
+   -     ".",
+   - ) )/ (("parenthesized path call")
+47 + Path(
+48 +     (("parenthesized path call")
+49 |       # Comment between closing parentheses
+50 + ),
+51 | )
+52 | 
+53 | Path(
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:55:5
@@ -327,16 +306,15 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 57 | ) / "multiple" / (
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-52 52 | )
-53 53 | 
-54 54 | Path(
-55    |-    ''  # Comment before comma
-   55 |+    "multiple"  # Comment before comma
-56 56 |     ,
-57    |-) / "multiple" / (
-   57 |+) / (
-58 58 |     "frag"  # Comment
-59 59 |     'ment'
-60 60 | )
+52 | )
+53 | 
+54 | Path(
+   -     ''  # Comment before comma
+55 +     "multiple"  # Comment before comma
+56 |     ,
+   - ) / "multiple" / (
+57 + ) / (
+58 |     "frag"  # Comment
+59 |     'ment'
+60 | )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap
index 512cbe18b3..9a057749d1 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap
@@ -1,17 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
 ---
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:21:1
-   |
-20 | ### Errors
-21 | path.with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^
-22 | path.with_suffix("py")
-23 | path.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
-
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:22:1
    |
@@ -23,16 +12,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 24 | path.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | ### Errors
-21 21 | path.with_suffix(".")
-22    |-path.with_suffix("py")
-   22 |+path.with_suffix(".py")
-23 23 | path.with_suffix(r"s")
-24 24 | path.with_suffix(u'' "json")
-25 25 | path.with_suffix(suffix="js")
+19 | 
+20 | ### Errors
+21 | path.with_suffix(".")
+   - path.with_suffix("py")
+22 + path.with_suffix(".py")
+23 | path.with_suffix(r"s")
+24 | path.with_suffix(u'' "json")
+25 | path.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:23:1
@@ -45,16 +33,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 25 | path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-20 20 | ### Errors
-21 21 | path.with_suffix(".")
-22 22 | path.with_suffix("py")
-23    |-path.with_suffix(r"s")
-   23 |+path.with_suffix(r".s")
-24 24 | path.with_suffix(u'' "json")
-25 25 | path.with_suffix(suffix="js")
-26 26 | 
+20 | ### Errors
+21 | path.with_suffix(".")
+22 | path.with_suffix("py")
+   - path.with_suffix(r"s")
+23 + path.with_suffix(r".s")
+24 | path.with_suffix(u'' "json")
+25 | path.with_suffix(suffix="js")
+26 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:24:1
@@ -66,16 +53,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 25 | path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-21 21 | path.with_suffix(".")
-22 22 | path.with_suffix("py")
-23 23 | path.with_suffix(r"s")
-24    |-path.with_suffix(u'' "json")
-   24 |+path.with_suffix(u'.' "json")
-25 25 | path.with_suffix(suffix="js")
-26 26 | 
-27 27 | posix_path.with_suffix(".")
+21 | path.with_suffix(".")
+22 | path.with_suffix("py")
+23 | path.with_suffix(r"s")
+   - path.with_suffix(u'' "json")
+24 + path.with_suffix(u'.' "json")
+25 | path.with_suffix(suffix="js")
+26 | 
+27 | posix_path.with_suffix(".")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:25:1
@@ -88,28 +74,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 27 | posix_path.with_suffix(".")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-22 22 | path.with_suffix("py")
-23 23 | path.with_suffix(r"s")
-24 24 | path.with_suffix(u'' "json")
-25    |-path.with_suffix(suffix="js")
-   25 |+path.with_suffix(suffix=".js")
-26 26 | 
-27 27 | posix_path.with_suffix(".")
-28 28 | posix_path.with_suffix("py")
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:27:1
-   |
-25 | path.with_suffix(suffix="js")
-26 |
+22 | path.with_suffix("py")
+23 | path.with_suffix(r"s")
+24 | path.with_suffix(u'' "json")
+   - path.with_suffix(suffix="js")
+25 + path.with_suffix(suffix=".js")
+26 | 
 27 | posix_path.with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 28 | posix_path.with_suffix("py")
-29 | posix_path.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:28:1
@@ -121,16 +94,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 30 | posix_path.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-25 25 | path.with_suffix(suffix="js")
-26 26 | 
-27 27 | posix_path.with_suffix(".")
-28    |-posix_path.with_suffix("py")
-   28 |+posix_path.with_suffix(".py")
-29 29 | posix_path.with_suffix(r"s")
-30 30 | posix_path.with_suffix(u'' "json")
-31 31 | posix_path.with_suffix(suffix="js")
+25 | path.with_suffix(suffix="js")
+26 | 
+27 | posix_path.with_suffix(".")
+   - posix_path.with_suffix("py")
+28 + posix_path.with_suffix(".py")
+29 | posix_path.with_suffix(r"s")
+30 | posix_path.with_suffix(u'' "json")
+31 | posix_path.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:29:1
@@ -143,16 +115,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 31 | posix_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-26 26 | 
-27 27 | posix_path.with_suffix(".")
-28 28 | posix_path.with_suffix("py")
-29    |-posix_path.with_suffix(r"s")
-   29 |+posix_path.with_suffix(r".s")
-30 30 | posix_path.with_suffix(u'' "json")
-31 31 | posix_path.with_suffix(suffix="js")
-32 32 | 
+26 | 
+27 | posix_path.with_suffix(".")
+28 | posix_path.with_suffix("py")
+   - posix_path.with_suffix(r"s")
+29 + posix_path.with_suffix(r".s")
+30 | posix_path.with_suffix(u'' "json")
+31 | posix_path.with_suffix(suffix="js")
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:30:1
@@ -164,16 +135,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 31 | posix_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-27 27 | posix_path.with_suffix(".")
-28 28 | posix_path.with_suffix("py")
-29 29 | posix_path.with_suffix(r"s")
-30    |-posix_path.with_suffix(u'' "json")
-   30 |+posix_path.with_suffix(u'.' "json")
-31 31 | posix_path.with_suffix(suffix="js")
-32 32 | 
-33 33 | pure_path.with_suffix(".")
+27 | posix_path.with_suffix(".")
+28 | posix_path.with_suffix("py")
+29 | posix_path.with_suffix(r"s")
+   - posix_path.with_suffix(u'' "json")
+30 + posix_path.with_suffix(u'.' "json")
+31 | posix_path.with_suffix(suffix="js")
+32 | 
+33 | pure_path.with_suffix(".")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:31:1
@@ -186,28 +156,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 33 | pure_path.with_suffix(".")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-28 28 | posix_path.with_suffix("py")
-29 29 | posix_path.with_suffix(r"s")
-30 30 | posix_path.with_suffix(u'' "json")
-31    |-posix_path.with_suffix(suffix="js")
-   31 |+posix_path.with_suffix(suffix=".js")
-32 32 | 
-33 33 | pure_path.with_suffix(".")
-34 34 | pure_path.with_suffix("py")
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:33:1
-   |
-31 | posix_path.with_suffix(suffix="js")
-32 |
+28 | posix_path.with_suffix("py")
+29 | posix_path.with_suffix(r"s")
+30 | posix_path.with_suffix(u'' "json")
+   - posix_path.with_suffix(suffix="js")
+31 + posix_path.with_suffix(suffix=".js")
+32 | 
 33 | pure_path.with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 34 | pure_path.with_suffix("py")
-35 | pure_path.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:34:1
@@ -219,16 +176,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 36 | pure_path.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-31 31 | posix_path.with_suffix(suffix="js")
-32 32 | 
-33 33 | pure_path.with_suffix(".")
-34    |-pure_path.with_suffix("py")
-   34 |+pure_path.with_suffix(".py")
-35 35 | pure_path.with_suffix(r"s")
-36 36 | pure_path.with_suffix(u'' "json")
-37 37 | pure_path.with_suffix(suffix="js")
+31 | posix_path.with_suffix(suffix="js")
+32 | 
+33 | pure_path.with_suffix(".")
+   - pure_path.with_suffix("py")
+34 + pure_path.with_suffix(".py")
+35 | pure_path.with_suffix(r"s")
+36 | pure_path.with_suffix(u'' "json")
+37 | pure_path.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:35:1
@@ -241,16 +197,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 37 | pure_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | pure_path.with_suffix(".")
-34 34 | pure_path.with_suffix("py")
-35    |-pure_path.with_suffix(r"s")
-   35 |+pure_path.with_suffix(r".s")
-36 36 | pure_path.with_suffix(u'' "json")
-37 37 | pure_path.with_suffix(suffix="js")
-38 38 | 
+32 | 
+33 | pure_path.with_suffix(".")
+34 | pure_path.with_suffix("py")
+   - pure_path.with_suffix(r"s")
+35 + pure_path.with_suffix(r".s")
+36 | pure_path.with_suffix(u'' "json")
+37 | pure_path.with_suffix(suffix="js")
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:36:1
@@ -262,16 +217,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 37 | pure_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-33 33 | pure_path.with_suffix(".")
-34 34 | pure_path.with_suffix("py")
-35 35 | pure_path.with_suffix(r"s")
-36    |-pure_path.with_suffix(u'' "json")
-   36 |+pure_path.with_suffix(u'.' "json")
-37 37 | pure_path.with_suffix(suffix="js")
-38 38 | 
-39 39 | pure_posix_path.with_suffix(".")
+33 | pure_path.with_suffix(".")
+34 | pure_path.with_suffix("py")
+35 | pure_path.with_suffix(r"s")
+   - pure_path.with_suffix(u'' "json")
+36 + pure_path.with_suffix(u'.' "json")
+37 | pure_path.with_suffix(suffix="js")
+38 | 
+39 | pure_posix_path.with_suffix(".")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:37:1
@@ -284,28 +238,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 39 | pure_posix_path.with_suffix(".")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-34 34 | pure_path.with_suffix("py")
-35 35 | pure_path.with_suffix(r"s")
-36 36 | pure_path.with_suffix(u'' "json")
-37    |-pure_path.with_suffix(suffix="js")
-   37 |+pure_path.with_suffix(suffix=".js")
-38 38 | 
-39 39 | pure_posix_path.with_suffix(".")
-40 40 | pure_posix_path.with_suffix("py")
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:39:1
-   |
-37 | pure_path.with_suffix(suffix="js")
-38 |
+34 | pure_path.with_suffix("py")
+35 | pure_path.with_suffix(r"s")
+36 | pure_path.with_suffix(u'' "json")
+   - pure_path.with_suffix(suffix="js")
+37 + pure_path.with_suffix(suffix=".js")
+38 | 
 39 | pure_posix_path.with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 40 | pure_posix_path.with_suffix("py")
-41 | pure_posix_path.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:40:1
@@ -317,16 +258,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 42 | pure_posix_path.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-37 37 | pure_path.with_suffix(suffix="js")
-38 38 | 
-39 39 | pure_posix_path.with_suffix(".")
-40    |-pure_posix_path.with_suffix("py")
-   40 |+pure_posix_path.with_suffix(".py")
-41 41 | pure_posix_path.with_suffix(r"s")
-42 42 | pure_posix_path.with_suffix(u'' "json")
-43 43 | pure_posix_path.with_suffix(suffix="js")
+37 | pure_path.with_suffix(suffix="js")
+38 | 
+39 | pure_posix_path.with_suffix(".")
+   - pure_posix_path.with_suffix("py")
+40 + pure_posix_path.with_suffix(".py")
+41 | pure_posix_path.with_suffix(r"s")
+42 | pure_posix_path.with_suffix(u'' "json")
+43 | pure_posix_path.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:41:1
@@ -339,16 +279,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 43 | pure_posix_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-38 38 | 
-39 39 | pure_posix_path.with_suffix(".")
-40 40 | pure_posix_path.with_suffix("py")
-41    |-pure_posix_path.with_suffix(r"s")
-   41 |+pure_posix_path.with_suffix(r".s")
-42 42 | pure_posix_path.with_suffix(u'' "json")
-43 43 | pure_posix_path.with_suffix(suffix="js")
-44 44 | 
+38 | 
+39 | pure_posix_path.with_suffix(".")
+40 | pure_posix_path.with_suffix("py")
+   - pure_posix_path.with_suffix(r"s")
+41 + pure_posix_path.with_suffix(r".s")
+42 | pure_posix_path.with_suffix(u'' "json")
+43 | pure_posix_path.with_suffix(suffix="js")
+44 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:42:1
@@ -360,16 +299,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 43 | pure_posix_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-39 39 | pure_posix_path.with_suffix(".")
-40 40 | pure_posix_path.with_suffix("py")
-41 41 | pure_posix_path.with_suffix(r"s")
-42    |-pure_posix_path.with_suffix(u'' "json")
-   42 |+pure_posix_path.with_suffix(u'.' "json")
-43 43 | pure_posix_path.with_suffix(suffix="js")
-44 44 | 
-45 45 | pure_windows_path.with_suffix(".")
+39 | pure_posix_path.with_suffix(".")
+40 | pure_posix_path.with_suffix("py")
+41 | pure_posix_path.with_suffix(r"s")
+   - pure_posix_path.with_suffix(u'' "json")
+42 + pure_posix_path.with_suffix(u'.' "json")
+43 | pure_posix_path.with_suffix(suffix="js")
+44 | 
+45 | pure_windows_path.with_suffix(".")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:43:1
@@ -382,28 +320,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 45 | pure_windows_path.with_suffix(".")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-40 40 | pure_posix_path.with_suffix("py")
-41 41 | pure_posix_path.with_suffix(r"s")
-42 42 | pure_posix_path.with_suffix(u'' "json")
-43    |-pure_posix_path.with_suffix(suffix="js")
-   43 |+pure_posix_path.with_suffix(suffix=".js")
-44 44 | 
-45 45 | pure_windows_path.with_suffix(".")
-46 46 | pure_windows_path.with_suffix("py")
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:45:1
-   |
-43 | pure_posix_path.with_suffix(suffix="js")
-44 |
+40 | pure_posix_path.with_suffix("py")
+41 | pure_posix_path.with_suffix(r"s")
+42 | pure_posix_path.with_suffix(u'' "json")
+   - pure_posix_path.with_suffix(suffix="js")
+43 + pure_posix_path.with_suffix(suffix=".js")
+44 | 
 45 | pure_windows_path.with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 46 | pure_windows_path.with_suffix("py")
-47 | pure_windows_path.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:46:1
@@ -415,16 +340,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 48 | pure_windows_path.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-43 43 | pure_posix_path.with_suffix(suffix="js")
-44 44 | 
-45 45 | pure_windows_path.with_suffix(".")
-46    |-pure_windows_path.with_suffix("py")
-   46 |+pure_windows_path.with_suffix(".py")
-47 47 | pure_windows_path.with_suffix(r"s")
-48 48 | pure_windows_path.with_suffix(u'' "json")
-49 49 | pure_windows_path.with_suffix(suffix="js")
+43 | pure_posix_path.with_suffix(suffix="js")
+44 | 
+45 | pure_windows_path.with_suffix(".")
+   - pure_windows_path.with_suffix("py")
+46 + pure_windows_path.with_suffix(".py")
+47 | pure_windows_path.with_suffix(r"s")
+48 | pure_windows_path.with_suffix(u'' "json")
+49 | pure_windows_path.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:47:1
@@ -437,16 +361,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 49 | pure_windows_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-44 44 | 
-45 45 | pure_windows_path.with_suffix(".")
-46 46 | pure_windows_path.with_suffix("py")
-47    |-pure_windows_path.with_suffix(r"s")
-   47 |+pure_windows_path.with_suffix(r".s")
-48 48 | pure_windows_path.with_suffix(u'' "json")
-49 49 | pure_windows_path.with_suffix(suffix="js")
-50 50 | 
+44 | 
+45 | pure_windows_path.with_suffix(".")
+46 | pure_windows_path.with_suffix("py")
+   - pure_windows_path.with_suffix(r"s")
+47 + pure_windows_path.with_suffix(r".s")
+48 | pure_windows_path.with_suffix(u'' "json")
+49 | pure_windows_path.with_suffix(suffix="js")
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:48:1
@@ -458,16 +381,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 49 | pure_windows_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-45 45 | pure_windows_path.with_suffix(".")
-46 46 | pure_windows_path.with_suffix("py")
-47 47 | pure_windows_path.with_suffix(r"s")
-48    |-pure_windows_path.with_suffix(u'' "json")
-   48 |+pure_windows_path.with_suffix(u'.' "json")
-49 49 | pure_windows_path.with_suffix(suffix="js")
-50 50 | 
-51 51 | windows_path.with_suffix(".")
+45 | pure_windows_path.with_suffix(".")
+46 | pure_windows_path.with_suffix("py")
+47 | pure_windows_path.with_suffix(r"s")
+   - pure_windows_path.with_suffix(u'' "json")
+48 + pure_windows_path.with_suffix(u'.' "json")
+49 | pure_windows_path.with_suffix(suffix="js")
+50 | 
+51 | windows_path.with_suffix(".")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:49:1
@@ -480,28 +402,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 51 | windows_path.with_suffix(".")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-46 46 | pure_windows_path.with_suffix("py")
-47 47 | pure_windows_path.with_suffix(r"s")
-48 48 | pure_windows_path.with_suffix(u'' "json")
-49    |-pure_windows_path.with_suffix(suffix="js")
-   49 |+pure_windows_path.with_suffix(suffix=".js")
-50 50 | 
-51 51 | windows_path.with_suffix(".")
-52 52 | windows_path.with_suffix("py")
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:51:1
-   |
-49 | pure_windows_path.with_suffix(suffix="js")
-50 |
+46 | pure_windows_path.with_suffix("py")
+47 | pure_windows_path.with_suffix(r"s")
+48 | pure_windows_path.with_suffix(u'' "json")
+   - pure_windows_path.with_suffix(suffix="js")
+49 + pure_windows_path.with_suffix(suffix=".js")
+50 | 
 51 | windows_path.with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 52 | windows_path.with_suffix("py")
-53 | windows_path.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:52:1
@@ -513,16 +422,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 54 | windows_path.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-49 49 | pure_windows_path.with_suffix(suffix="js")
-50 50 | 
-51 51 | windows_path.with_suffix(".")
-52    |-windows_path.with_suffix("py")
-   52 |+windows_path.with_suffix(".py")
-53 53 | windows_path.with_suffix(r"s")
-54 54 | windows_path.with_suffix(u'' "json")
-55 55 | windows_path.with_suffix(suffix="js")
+49 | pure_windows_path.with_suffix(suffix="js")
+50 | 
+51 | windows_path.with_suffix(".")
+   - windows_path.with_suffix("py")
+52 + windows_path.with_suffix(".py")
+53 | windows_path.with_suffix(r"s")
+54 | windows_path.with_suffix(u'' "json")
+55 | windows_path.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:53:1
@@ -535,16 +443,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 55 | windows_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-50 50 | 
-51 51 | windows_path.with_suffix(".")
-52 52 | windows_path.with_suffix("py")
-53    |-windows_path.with_suffix(r"s")
-   53 |+windows_path.with_suffix(r".s")
-54 54 | windows_path.with_suffix(u'' "json")
-55 55 | windows_path.with_suffix(suffix="js")
-56 56 | 
+50 | 
+51 | windows_path.with_suffix(".")
+52 | windows_path.with_suffix("py")
+   - windows_path.with_suffix(r"s")
+53 + windows_path.with_suffix(r".s")
+54 | windows_path.with_suffix(u'' "json")
+55 | windows_path.with_suffix(suffix="js")
+56 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:54:1
@@ -556,16 +463,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 55 | windows_path.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-51 51 | windows_path.with_suffix(".")
-52 52 | windows_path.with_suffix("py")
-53 53 | windows_path.with_suffix(r"s")
-54    |-windows_path.with_suffix(u'' "json")
-   54 |+windows_path.with_suffix(u'.' "json")
-55 55 | windows_path.with_suffix(suffix="js")
-56 56 | 
-57 57 | Path().with_suffix(".")
+51 | windows_path.with_suffix(".")
+52 | windows_path.with_suffix("py")
+53 | windows_path.with_suffix(r"s")
+   - windows_path.with_suffix(u'' "json")
+54 + windows_path.with_suffix(u'.' "json")
+55 | windows_path.with_suffix(suffix="js")
+56 | 
+57 | Path().with_suffix(".")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:55:1
@@ -578,28 +484,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 57 | Path().with_suffix(".")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-52 52 | windows_path.with_suffix("py")
-53 53 | windows_path.with_suffix(r"s")
-54 54 | windows_path.with_suffix(u'' "json")
-55    |-windows_path.with_suffix(suffix="js")
-   55 |+windows_path.with_suffix(suffix=".js")
-56 56 | 
-57 57 | Path().with_suffix(".")
-58 58 | Path().with_suffix("py")
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210.py:57:1
-   |
-55 | windows_path.with_suffix(suffix="js")
-56 |
+52 | windows_path.with_suffix("py")
+53 | windows_path.with_suffix(r"s")
+54 | windows_path.with_suffix(u'' "json")
+   - windows_path.with_suffix(suffix="js")
+55 + windows_path.with_suffix(suffix=".js")
+56 | 
 57 | Path().with_suffix(".")
-   | ^^^^^^^^^^^^^^^^^^^^^^^
 58 | Path().with_suffix("py")
-59 | PosixPath().with_suffix("py")
-   |
-help: Remove "." or extend to valid suffix
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:58:1
@@ -611,16 +504,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 60 | PurePath().with_suffix("py")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-55 55 | windows_path.with_suffix(suffix="js")
-56 56 | 
-57 57 | Path().with_suffix(".")
-58    |-Path().with_suffix("py")
-   58 |+Path().with_suffix(".py")
-59 59 | PosixPath().with_suffix("py")
-60 60 | PurePath().with_suffix("py")
-61 61 | PurePosixPath().with_suffix("py")
+55 | windows_path.with_suffix(suffix="js")
+56 | 
+57 | Path().with_suffix(".")
+   - Path().with_suffix("py")
+58 + Path().with_suffix(".py")
+59 | PosixPath().with_suffix("py")
+60 | PurePath().with_suffix("py")
+61 | PurePosixPath().with_suffix("py")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:59:1
@@ -633,16 +525,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 61 | PurePosixPath().with_suffix("py")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-56 56 | 
-57 57 | Path().with_suffix(".")
-58 58 | Path().with_suffix("py")
-59    |-PosixPath().with_suffix("py")
-   59 |+PosixPath().with_suffix(".py")
-60 60 | PurePath().with_suffix("py")
-61 61 | PurePosixPath().with_suffix("py")
-62 62 | PureWindowsPath().with_suffix("py")
+56 | 
+57 | Path().with_suffix(".")
+58 | Path().with_suffix("py")
+   - PosixPath().with_suffix("py")
+59 + PosixPath().with_suffix(".py")
+60 | PurePath().with_suffix("py")
+61 | PurePosixPath().with_suffix("py")
+62 | PureWindowsPath().with_suffix("py")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:60:1
@@ -655,16 +546,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 62 | PureWindowsPath().with_suffix("py")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-57 57 | Path().with_suffix(".")
-58 58 | Path().with_suffix("py")
-59 59 | PosixPath().with_suffix("py")
-60    |-PurePath().with_suffix("py")
-   60 |+PurePath().with_suffix(".py")
-61 61 | PurePosixPath().with_suffix("py")
-62 62 | PureWindowsPath().with_suffix("py")
-63 63 | WindowsPath().with_suffix("py")
+57 | Path().with_suffix(".")
+58 | Path().with_suffix("py")
+59 | PosixPath().with_suffix("py")
+   - PurePath().with_suffix("py")
+60 + PurePath().with_suffix(".py")
+61 | PurePosixPath().with_suffix("py")
+62 | PureWindowsPath().with_suffix("py")
+63 | WindowsPath().with_suffix("py")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:61:1
@@ -677,16 +567,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 63 | WindowsPath().with_suffix("py")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-58 58 | Path().with_suffix("py")
-59 59 | PosixPath().with_suffix("py")
-60 60 | PurePath().with_suffix("py")
-61    |-PurePosixPath().with_suffix("py")
-   61 |+PurePosixPath().with_suffix(".py")
-62 62 | PureWindowsPath().with_suffix("py")
-63 63 | WindowsPath().with_suffix("py")
-64 64 | 
+58 | Path().with_suffix("py")
+59 | PosixPath().with_suffix("py")
+60 | PurePath().with_suffix("py")
+   - PurePosixPath().with_suffix("py")
+61 + PurePosixPath().with_suffix(".py")
+62 | PureWindowsPath().with_suffix("py")
+63 | WindowsPath().with_suffix("py")
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:62:1
@@ -698,16 +587,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 63 | WindowsPath().with_suffix("py")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-59 59 | PosixPath().with_suffix("py")
-60 60 | PurePath().with_suffix("py")
-61 61 | PurePosixPath().with_suffix("py")
-62    |-PureWindowsPath().with_suffix("py")
-   62 |+PureWindowsPath().with_suffix(".py")
-63 63 | WindowsPath().with_suffix("py")
-64 64 | 
-65 65 | ### No errors
+59 | PosixPath().with_suffix("py")
+60 | PurePath().with_suffix("py")
+61 | PurePosixPath().with_suffix("py")
+   - PureWindowsPath().with_suffix("py")
+62 + PureWindowsPath().with_suffix(".py")
+63 | WindowsPath().with_suffix("py")
+64 | 
+65 | ### No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210.py:63:1
@@ -720,13 +608,12 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 65 | ### No errors
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-60 60 | PurePath().with_suffix("py")
-61 61 | PurePosixPath().with_suffix("py")
-62 62 | PureWindowsPath().with_suffix("py")
-63    |-WindowsPath().with_suffix("py")
-   63 |+WindowsPath().with_suffix(".py")
-64 64 | 
-65 65 | ### No errors
-66 66 | path.with_suffix()
+60 | PurePath().with_suffix("py")
+61 | PurePosixPath().with_suffix("py")
+62 | PureWindowsPath().with_suffix("py")
+   - WindowsPath().with_suffix("py")
+63 + WindowsPath().with_suffix(".py")
+64 | 
+65 | ### No errors
+66 | path.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap
index 04a5e8e740..1f523ea194 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap
@@ -1,18 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
 ---
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210_1.py:13:5
-   |
-11 | def test_path(p: Path) -> None:
-12 |     ## Errors
-13 |     p.with_suffix(".")
-   |     ^^^^^^^^^^^^^^^^^^
-14 |     p.with_suffix("py")
-15 |     p.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
-
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:14:5
    |
@@ -24,16 +12,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 16 |     p.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-11 11 | def test_path(p: Path) -> None:
-12 12 |     ## Errors
-13 13 |     p.with_suffix(".")
-14    |-    p.with_suffix("py")
-   14 |+    p.with_suffix(".py")
-15 15 |     p.with_suffix(r"s")
-16 16 |     p.with_suffix(u'' "json")
-17 17 |     p.with_suffix(suffix="js")
+11 | def test_path(p: Path) -> None:
+12 |     ## Errors
+13 |     p.with_suffix(".")
+   -     p.with_suffix("py")
+14 +     p.with_suffix(".py")
+15 |     p.with_suffix(r"s")
+16 |     p.with_suffix(u'' "json")
+17 |     p.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:15:5
@@ -46,16 +33,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 17 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-12 12 |     ## Errors
-13 13 |     p.with_suffix(".")
-14 14 |     p.with_suffix("py")
-15    |-    p.with_suffix(r"s")
-   15 |+    p.with_suffix(r".s")
-16 16 |     p.with_suffix(u'' "json")
-17 17 |     p.with_suffix(suffix="js")
-18 18 | 
+12 |     ## Errors
+13 |     p.with_suffix(".")
+14 |     p.with_suffix("py")
+   -     p.with_suffix(r"s")
+15 +     p.with_suffix(r".s")
+16 |     p.with_suffix(u'' "json")
+17 |     p.with_suffix(suffix="js")
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:16:5
@@ -67,16 +53,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 17 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-13 13 |     p.with_suffix(".")
-14 14 |     p.with_suffix("py")
-15 15 |     p.with_suffix(r"s")
-16    |-    p.with_suffix(u'' "json")
-   16 |+    p.with_suffix(u'.' "json")
-17 17 |     p.with_suffix(suffix="js")
-18 18 | 
-19 19 |     ## No errors
+13 |     p.with_suffix(".")
+14 |     p.with_suffix("py")
+15 |     p.with_suffix(r"s")
+   -     p.with_suffix(u'' "json")
+16 +     p.with_suffix(u'.' "json")
+17 |     p.with_suffix(suffix="js")
+18 | 
+19 |     ## No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:17:5
@@ -89,28 +74,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 19 |     ## No errors
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-14 14 |     p.with_suffix("py")
-15 15 |     p.with_suffix(r"s")
-16 16 |     p.with_suffix(u'' "json")
-17    |-    p.with_suffix(suffix="js")
-   17 |+    p.with_suffix(suffix=".js")
-18 18 | 
-19 19 |     ## No errors
-20 20 |     p.with_suffix()
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210_1.py:31:5
-   |
-29 | def test_posix_path(p: PosixPath) -> None:
-30 |     ## Errors
-31 |     p.with_suffix(".")
-   |     ^^^^^^^^^^^^^^^^^^
-32 |     p.with_suffix("py")
-33 |     p.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+14 |     p.with_suffix("py")
+15 |     p.with_suffix(r"s")
+16 |     p.with_suffix(u'' "json")
+   -     p.with_suffix(suffix="js")
+17 +     p.with_suffix(suffix=".js")
+18 | 
+19 |     ## No errors
+20 |     p.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:32:5
@@ -123,16 +95,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 34 |     p.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-29 29 | def test_posix_path(p: PosixPath) -> None:
-30 30 |     ## Errors
-31 31 |     p.with_suffix(".")
-32    |-    p.with_suffix("py")
-   32 |+    p.with_suffix(".py")
-33 33 |     p.with_suffix(r"s")
-34 34 |     p.with_suffix(u'' "json")
-35 35 |     p.with_suffix(suffix="js")
+29 | def test_posix_path(p: PosixPath) -> None:
+30 |     ## Errors
+31 |     p.with_suffix(".")
+   -     p.with_suffix("py")
+32 +     p.with_suffix(".py")
+33 |     p.with_suffix(r"s")
+34 |     p.with_suffix(u'' "json")
+35 |     p.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:33:5
@@ -145,16 +116,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 35 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-30 30 |     ## Errors
-31 31 |     p.with_suffix(".")
-32 32 |     p.with_suffix("py")
-33    |-    p.with_suffix(r"s")
-   33 |+    p.with_suffix(r".s")
-34 34 |     p.with_suffix(u'' "json")
-35 35 |     p.with_suffix(suffix="js")
-36 36 | 
+30 |     ## Errors
+31 |     p.with_suffix(".")
+32 |     p.with_suffix("py")
+   -     p.with_suffix(r"s")
+33 +     p.with_suffix(r".s")
+34 |     p.with_suffix(u'' "json")
+35 |     p.with_suffix(suffix="js")
+36 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:34:5
@@ -166,16 +136,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 35 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-31 31 |     p.with_suffix(".")
-32 32 |     p.with_suffix("py")
-33 33 |     p.with_suffix(r"s")
-34    |-    p.with_suffix(u'' "json")
-   34 |+    p.with_suffix(u'.' "json")
-35 35 |     p.with_suffix(suffix="js")
-36 36 | 
-37 37 |     ## No errors
+31 |     p.with_suffix(".")
+32 |     p.with_suffix("py")
+33 |     p.with_suffix(r"s")
+   -     p.with_suffix(u'' "json")
+34 +     p.with_suffix(u'.' "json")
+35 |     p.with_suffix(suffix="js")
+36 | 
+37 |     ## No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:35:5
@@ -188,28 +157,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 37 |     ## No errors
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-32 32 |     p.with_suffix("py")
-33 33 |     p.with_suffix(r"s")
-34 34 |     p.with_suffix(u'' "json")
-35    |-    p.with_suffix(suffix="js")
-   35 |+    p.with_suffix(suffix=".js")
-36 36 | 
-37 37 |     ## No errors
-38 38 |     p.with_suffix()
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210_1.py:49:5
-   |
-47 | def test_pure_path(p: PurePath) -> None:
-48 |     ## Errors
-49 |     p.with_suffix(".")
-   |     ^^^^^^^^^^^^^^^^^^
-50 |     p.with_suffix("py")
-51 |     p.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+32 |     p.with_suffix("py")
+33 |     p.with_suffix(r"s")
+34 |     p.with_suffix(u'' "json")
+   -     p.with_suffix(suffix="js")
+35 +     p.with_suffix(suffix=".js")
+36 | 
+37 |     ## No errors
+38 |     p.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:50:5
@@ -222,16 +178,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 52 |     p.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-47 47 | def test_pure_path(p: PurePath) -> None:
-48 48 |     ## Errors
-49 49 |     p.with_suffix(".")
-50    |-    p.with_suffix("py")
-   50 |+    p.with_suffix(".py")
-51 51 |     p.with_suffix(r"s")
-52 52 |     p.with_suffix(u'' "json")
-53 53 |     p.with_suffix(suffix="js")
+47 | def test_pure_path(p: PurePath) -> None:
+48 |     ## Errors
+49 |     p.with_suffix(".")
+   -     p.with_suffix("py")
+50 +     p.with_suffix(".py")
+51 |     p.with_suffix(r"s")
+52 |     p.with_suffix(u'' "json")
+53 |     p.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:51:5
@@ -244,16 +199,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 53 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-48 48 |     ## Errors
-49 49 |     p.with_suffix(".")
-50 50 |     p.with_suffix("py")
-51    |-    p.with_suffix(r"s")
-   51 |+    p.with_suffix(r".s")
-52 52 |     p.with_suffix(u'' "json")
-53 53 |     p.with_suffix(suffix="js")
-54 54 | 
+48 |     ## Errors
+49 |     p.with_suffix(".")
+50 |     p.with_suffix("py")
+   -     p.with_suffix(r"s")
+51 +     p.with_suffix(r".s")
+52 |     p.with_suffix(u'' "json")
+53 |     p.with_suffix(suffix="js")
+54 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:52:5
@@ -265,16 +219,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 53 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-49 49 |     p.with_suffix(".")
-50 50 |     p.with_suffix("py")
-51 51 |     p.with_suffix(r"s")
-52    |-    p.with_suffix(u'' "json")
-   52 |+    p.with_suffix(u'.' "json")
-53 53 |     p.with_suffix(suffix="js")
-54 54 | 
-55 55 |     ## No errors
+49 |     p.with_suffix(".")
+50 |     p.with_suffix("py")
+51 |     p.with_suffix(r"s")
+   -     p.with_suffix(u'' "json")
+52 +     p.with_suffix(u'.' "json")
+53 |     p.with_suffix(suffix="js")
+54 | 
+55 |     ## No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:53:5
@@ -287,28 +240,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 55 |     ## No errors
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-50 50 |     p.with_suffix("py")
-51 51 |     p.with_suffix(r"s")
-52 52 |     p.with_suffix(u'' "json")
-53    |-    p.with_suffix(suffix="js")
-   53 |+    p.with_suffix(suffix=".js")
-54 54 | 
-55 55 |     ## No errors
-56 56 |     p.with_suffix()
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210_1.py:67:5
-   |
-65 | def test_pure_posix_path(p: PurePosixPath) -> None:
-66 |     ## Errors
-67 |     p.with_suffix(".")
-   |     ^^^^^^^^^^^^^^^^^^
-68 |     p.with_suffix("py")
-69 |     p.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+50 |     p.with_suffix("py")
+51 |     p.with_suffix(r"s")
+52 |     p.with_suffix(u'' "json")
+   -     p.with_suffix(suffix="js")
+53 +     p.with_suffix(suffix=".js")
+54 | 
+55 |     ## No errors
+56 |     p.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:68:5
@@ -321,16 +261,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 70 |     p.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-65 65 | def test_pure_posix_path(p: PurePosixPath) -> None:
-66 66 |     ## Errors
-67 67 |     p.with_suffix(".")
-68    |-    p.with_suffix("py")
-   68 |+    p.with_suffix(".py")
-69 69 |     p.with_suffix(r"s")
-70 70 |     p.with_suffix(u'' "json")
-71 71 |     p.with_suffix(suffix="js")
+65 | def test_pure_posix_path(p: PurePosixPath) -> None:
+66 |     ## Errors
+67 |     p.with_suffix(".")
+   -     p.with_suffix("py")
+68 +     p.with_suffix(".py")
+69 |     p.with_suffix(r"s")
+70 |     p.with_suffix(u'' "json")
+71 |     p.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:69:5
@@ -343,16 +282,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 71 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-66 66 |     ## Errors
-67 67 |     p.with_suffix(".")
-68 68 |     p.with_suffix("py")
-69    |-    p.with_suffix(r"s")
-   69 |+    p.with_suffix(r".s")
-70 70 |     p.with_suffix(u'' "json")
-71 71 |     p.with_suffix(suffix="js")
-72 72 | 
+66 |     ## Errors
+67 |     p.with_suffix(".")
+68 |     p.with_suffix("py")
+   -     p.with_suffix(r"s")
+69 +     p.with_suffix(r".s")
+70 |     p.with_suffix(u'' "json")
+71 |     p.with_suffix(suffix="js")
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:70:5
@@ -364,16 +302,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 71 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-67 67 |     p.with_suffix(".")
-68 68 |     p.with_suffix("py")
-69 69 |     p.with_suffix(r"s")
-70    |-    p.with_suffix(u'' "json")
-   70 |+    p.with_suffix(u'.' "json")
-71 71 |     p.with_suffix(suffix="js")
-72 72 | 
-73 73 |     ## No errors
+67 |     p.with_suffix(".")
+68 |     p.with_suffix("py")
+69 |     p.with_suffix(r"s")
+   -     p.with_suffix(u'' "json")
+70 +     p.with_suffix(u'.' "json")
+71 |     p.with_suffix(suffix="js")
+72 | 
+73 |     ## No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:71:5
@@ -386,28 +323,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 73 |     ## No errors
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-68 68 |     p.with_suffix("py")
-69 69 |     p.with_suffix(r"s")
-70 70 |     p.with_suffix(u'' "json")
-71    |-    p.with_suffix(suffix="js")
-   71 |+    p.with_suffix(suffix=".js")
-72 72 | 
-73 73 |     ## No errors
-74 74 |     p.with_suffix()
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-  --> PTH210_1.py:85:5
-   |
-83 | def test_pure_windows_path(p: PureWindowsPath) -> None:
-84 |     ## Errors
-85 |     p.with_suffix(".")
-   |     ^^^^^^^^^^^^^^^^^^
-86 |     p.with_suffix("py")
-87 |     p.with_suffix(r"s")
-   |
-help: Remove "." or extend to valid suffix
+68 |     p.with_suffix("py")
+69 |     p.with_suffix(r"s")
+70 |     p.with_suffix(u'' "json")
+   -     p.with_suffix(suffix="js")
+71 +     p.with_suffix(suffix=".js")
+72 | 
+73 |     ## No errors
+74 |     p.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:86:5
@@ -420,16 +344,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 88 |     p.with_suffix(u'' "json")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-83 83 | def test_pure_windows_path(p: PureWindowsPath) -> None:
-84 84 |     ## Errors
-85 85 |     p.with_suffix(".")
-86    |-    p.with_suffix("py")
-   86 |+    p.with_suffix(".py")
-87 87 |     p.with_suffix(r"s")
-88 88 |     p.with_suffix(u'' "json")
-89 89 |     p.with_suffix(suffix="js")
+83 | def test_pure_windows_path(p: PureWindowsPath) -> None:
+84 |     ## Errors
+85 |     p.with_suffix(".")
+   -     p.with_suffix("py")
+86 +     p.with_suffix(".py")
+87 |     p.with_suffix(r"s")
+88 |     p.with_suffix(u'' "json")
+89 |     p.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:87:5
@@ -442,16 +365,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 89 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-84 84 |     ## Errors
-85 85 |     p.with_suffix(".")
-86 86 |     p.with_suffix("py")
-87    |-    p.with_suffix(r"s")
-   87 |+    p.with_suffix(r".s")
-88 88 |     p.with_suffix(u'' "json")
-89 89 |     p.with_suffix(suffix="js")
-90 90 | 
+84 |     ## Errors
+85 |     p.with_suffix(".")
+86 |     p.with_suffix("py")
+   -     p.with_suffix(r"s")
+87 +     p.with_suffix(r".s")
+88 |     p.with_suffix(u'' "json")
+89 |     p.with_suffix(suffix="js")
+90 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:88:5
@@ -463,16 +385,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 89 |     p.with_suffix(suffix="js")
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-85 85 |     p.with_suffix(".")
-86 86 |     p.with_suffix("py")
-87 87 |     p.with_suffix(r"s")
-88    |-    p.with_suffix(u'' "json")
-   88 |+    p.with_suffix(u'.' "json")
-89 89 |     p.with_suffix(suffix="js")
-90 90 | 
-91 91 |     ## No errors
+85 |     p.with_suffix(".")
+86 |     p.with_suffix("py")
+87 |     p.with_suffix(r"s")
+   -     p.with_suffix(u'' "json")
+88 +     p.with_suffix(u'.' "json")
+89 |     p.with_suffix(suffix="js")
+90 | 
+91 |     ## No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
   --> PTH210_1.py:89:5
@@ -485,28 +406,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 91 |     ## No errors
    |
 help: Add a leading dot
-
-ℹ Unsafe fix
-86 86 |     p.with_suffix("py")
-87 87 |     p.with_suffix(r"s")
-88 88 |     p.with_suffix(u'' "json")
-89    |-    p.with_suffix(suffix="js")
-   89 |+    p.with_suffix(suffix=".js")
-90 90 | 
-91 91 |     ## No errors
-92 92 |     p.with_suffix()
-
-PTH210 Invalid suffix passed to `.with_suffix()`
-   --> PTH210_1.py:103:5
-    |
-101 | def test_windows_path(p: WindowsPath) -> None:
-102 |     ## Errors
-103 |     p.with_suffix(".")
-    |     ^^^^^^^^^^^^^^^^^^
-104 |     p.with_suffix("py")
-105 |     p.with_suffix(r"s")
-    |
-help: Remove "." or extend to valid suffix
+86 |     p.with_suffix("py")
+87 |     p.with_suffix(r"s")
+88 |     p.with_suffix(u'' "json")
+   -     p.with_suffix(suffix="js")
+89 +     p.with_suffix(suffix=".js")
+90 | 
+91 |     ## No errors
+92 |     p.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
    --> PTH210_1.py:104:5
@@ -519,16 +427,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 106 |     p.with_suffix(u'' "json")
     |
 help: Add a leading dot
-
-ℹ Unsafe fix
-101 101 | def test_windows_path(p: WindowsPath) -> None:
-102 102 |     ## Errors
-103 103 |     p.with_suffix(".")
-104     |-    p.with_suffix("py")
-    104 |+    p.with_suffix(".py")
-105 105 |     p.with_suffix(r"s")
-106 106 |     p.with_suffix(u'' "json")
-107 107 |     p.with_suffix(suffix="js")
+101 | def test_windows_path(p: WindowsPath) -> None:
+102 |     ## Errors
+103 |     p.with_suffix(".")
+    -     p.with_suffix("py")
+104 +     p.with_suffix(".py")
+105 |     p.with_suffix(r"s")
+106 |     p.with_suffix(u'' "json")
+107 |     p.with_suffix(suffix="js")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
    --> PTH210_1.py:105:5
@@ -541,16 +448,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 107 |     p.with_suffix(suffix="js")
     |
 help: Add a leading dot
-
-ℹ Unsafe fix
-102 102 |     ## Errors
-103 103 |     p.with_suffix(".")
-104 104 |     p.with_suffix("py")
-105     |-    p.with_suffix(r"s")
-    105 |+    p.with_suffix(r".s")
-106 106 |     p.with_suffix(u'' "json")
-107 107 |     p.with_suffix(suffix="js")
-108 108 | 
+102 |     ## Errors
+103 |     p.with_suffix(".")
+104 |     p.with_suffix("py")
+    -     p.with_suffix(r"s")
+105 +     p.with_suffix(r".s")
+106 |     p.with_suffix(u'' "json")
+107 |     p.with_suffix(suffix="js")
+108 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
    --> PTH210_1.py:106:5
@@ -562,16 +468,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 107 |     p.with_suffix(suffix="js")
     |
 help: Add a leading dot
-
-ℹ Unsafe fix
-103 103 |     p.with_suffix(".")
-104 104 |     p.with_suffix("py")
-105 105 |     p.with_suffix(r"s")
-106     |-    p.with_suffix(u'' "json")
-    106 |+    p.with_suffix(u'.' "json")
-107 107 |     p.with_suffix(suffix="js")
-108 108 | 
-109 109 |     ## No errors
+103 |     p.with_suffix(".")
+104 |     p.with_suffix("py")
+105 |     p.with_suffix(r"s")
+    -     p.with_suffix(u'' "json")
+106 +     p.with_suffix(u'.' "json")
+107 |     p.with_suffix(suffix="js")
+108 | 
+109 |     ## No errors
+note: This is an unsafe fix and may change runtime behavior
 
 PTH210 [*] Dotless suffix passed to `.with_suffix()`
    --> PTH210_1.py:107:5
@@ -584,13 +489,12 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()`
 109 |     ## No errors
     |
 help: Add a leading dot
-
-ℹ Unsafe fix
-104 104 |     p.with_suffix("py")
-105 105 |     p.with_suffix(r"s")
-106 106 |     p.with_suffix(u'' "json")
-107     |-    p.with_suffix(suffix="js")
-    107 |+    p.with_suffix(suffix=".js")
-108 108 | 
-109 109 |     ## No errors
-110 110 |     p.with_suffix()
+104 |     p.with_suffix("py")
+105 |     p.with_suffix(r"s")
+106 |     p.with_suffix(u'' "json")
+    -     p.with_suffix(suffix="js")
+107 +     p.with_suffix(suffix=".js")
+108 | 
+109 |     ## No errors
+110 |     p.with_suffix()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH211_PTH211.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH211_PTH211.py.snap
index 69dffd9abb..cd46c1b704 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH211_PTH211.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH211_PTH211.py.snap
@@ -9,6 +9,7 @@ PTH211 `os.symlink` should be replaced by `Path.symlink_to`
 6 | os.symlink(b"usr/bin/python", b"tmp/python")
 7 | Path("tmp/python").symlink_to("usr/bin/python")  # Ok
   |
+help: Replace with `Path(...).symlink_to(...)`
 
 PTH211 `os.symlink` should be replaced by `Path.symlink_to`
  --> PTH211.py:6:1
@@ -18,6 +19,7 @@ PTH211 `os.symlink` should be replaced by `Path.symlink_to`
   | ^^^^^^^^^^
 7 | Path("tmp/python").symlink_to("usr/bin/python")  # Ok
   |
+help: Replace with `Path(...).symlink_to(...)`
 
 PTH211 `os.symlink` should be replaced by `Path.symlink_to`
   --> PTH211.py:9:1
@@ -29,6 +31,7 @@ PTH211 `os.symlink` should be replaced by `Path.symlink_to`
 10 | os.symlink(b"usr/bin/python", b"tmp/python", target_is_directory=True)
 11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True)  # Ok
    |
+help: Replace with `Path(...).symlink_to(...)`
 
 PTH211 `os.symlink` should be replaced by `Path.symlink_to`
   --> PTH211.py:10:1
@@ -38,3 +41,58 @@ PTH211 `os.symlink` should be replaced by `Path.symlink_to`
    | ^^^^^^^^^^
 11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True)  # Ok
    |
+help: Replace with `Path(...).symlink_to(...)`
+
+PTH211 `os.symlink` should be replaced by `Path.symlink_to`
+  --> PTH211.py:17:1
+   |
+15 | os.close(fd)
+16 |
+17 | os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True)
+   | ^^^^^^^^^^
+18 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=False)
+   |
+help: Replace with `Path(...).symlink_to(...)`
+
+PTH211 `os.symlink` should be replaced by `Path.symlink_to`
+  --> PTH211.py:18:1
+   |
+17 | os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True)
+18 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=False)
+   | ^^^^^^^^^^
+19 |
+20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None)
+   |
+help: Replace with `Path(...).symlink_to(...)`
+
+PTH211 `os.symlink` should be replaced by `Path.symlink_to`
+  --> PTH211.py:20:1
+   |
+18 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=False)
+19 |
+20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None)
+   | ^^^^^^^^^^
+21 |
+22 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=     True    )
+   |
+help: Replace with `Path(...).symlink_to(...)`
+
+PTH211 `os.symlink` should be replaced by `Path.symlink_to`
+  --> PTH211.py:22:1
+   |
+20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None)
+21 |
+22 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=     True    )
+   | ^^^^^^^^^^
+23 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory="nonboolean")
+   |
+help: Replace with `Path(...).symlink_to(...)`
+
+PTH211 `os.symlink` should be replaced by `Path.symlink_to`
+  --> PTH211.py:23:1
+   |
+22 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=     True    )
+23 | os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory="nonboolean")
+   | ^^^^^^^^^^
+   |
+help: Replace with `Path(...).symlink_to(...)`
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__deferred_annotations_diff_invalid-pathlib-with-suffix_PTH210.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__deferred_annotations_diff_invalid-pathlib-with-suffix_PTH210.py.snap
new file mode 100644
index 0000000000..3a9523b277
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__deferred_annotations_diff_invalid-pathlib-with-suffix_PTH210.py.snap
@@ -0,0 +1,100 @@
+---
+source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
+---
+--- Linter settings ---
+-linter.unresolved_target_version = 3.13
++linter.unresolved_target_version = 3.14
+
+--- Summary ---
+Removed: 7
+Added: 0
+
+--- Removed ---
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:21:1
+   |
+20 | ### Errors
+21 | path.with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^
+22 | path.with_suffix("py")
+23 | path.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:27:1
+   |
+25 | path.with_suffix(suffix="js")
+26 |
+27 | posix_path.with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+28 | posix_path.with_suffix("py")
+29 | posix_path.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:33:1
+   |
+31 | posix_path.with_suffix(suffix="js")
+32 |
+33 | pure_path.with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+34 | pure_path.with_suffix("py")
+35 | pure_path.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:39:1
+   |
+37 | pure_path.with_suffix(suffix="js")
+38 |
+39 | pure_posix_path.with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+40 | pure_posix_path.with_suffix("py")
+41 | pure_posix_path.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:45:1
+   |
+43 | pure_posix_path.with_suffix(suffix="js")
+44 |
+45 | pure_windows_path.with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+46 | pure_windows_path.with_suffix("py")
+47 | pure_windows_path.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:51:1
+   |
+49 | pure_windows_path.with_suffix(suffix="js")
+50 |
+51 | windows_path.with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+52 | windows_path.with_suffix("py")
+53 | windows_path.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210.py:57:1
+   |
+55 | windows_path.with_suffix(suffix="js")
+56 |
+57 | Path().with_suffix(".")
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+58 | Path().with_suffix("py")
+59 | PosixPath().with_suffix("py")
+   |
+help: Remove "." or extend to valid suffix
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__deferred_annotations_diff_invalid-pathlib-with-suffix_PTH210_1.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__deferred_annotations_diff_invalid-pathlib-with-suffix_PTH210_1.py.snap
new file mode 100644
index 0000000000..ee2bdd1988
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__deferred_annotations_diff_invalid-pathlib-with-suffix_PTH210_1.py.snap
@@ -0,0 +1,88 @@
+---
+source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
+---
+--- Linter settings ---
+-linter.unresolved_target_version = 3.13
++linter.unresolved_target_version = 3.14
+
+--- Summary ---
+Removed: 6
+Added: 0
+
+--- Removed ---
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210_1.py:13:5
+   |
+11 | def test_path(p: Path) -> None:
+12 |     ## Errors
+13 |     p.with_suffix(".")
+   |     ^^^^^^^^^^^^^^^^^^
+14 |     p.with_suffix("py")
+15 |     p.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210_1.py:31:5
+   |
+29 | def test_posix_path(p: PosixPath) -> None:
+30 |     ## Errors
+31 |     p.with_suffix(".")
+   |     ^^^^^^^^^^^^^^^^^^
+32 |     p.with_suffix("py")
+33 |     p.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210_1.py:49:5
+   |
+47 | def test_pure_path(p: PurePath) -> None:
+48 |     ## Errors
+49 |     p.with_suffix(".")
+   |     ^^^^^^^^^^^^^^^^^^
+50 |     p.with_suffix("py")
+51 |     p.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210_1.py:67:5
+   |
+65 | def test_pure_posix_path(p: PurePosixPath) -> None:
+66 |     ## Errors
+67 |     p.with_suffix(".")
+   |     ^^^^^^^^^^^^^^^^^^
+68 |     p.with_suffix("py")
+69 |     p.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+  --> PTH210_1.py:85:5
+   |
+83 | def test_pure_windows_path(p: PureWindowsPath) -> None:
+84 |     ## Errors
+85 |     p.with_suffix(".")
+   |     ^^^^^^^^^^^^^^^^^^
+86 |     p.with_suffix("py")
+87 |     p.with_suffix(r"s")
+   |
+help: Remove "." or extend to valid suffix
+
+
+PTH210 Invalid suffix passed to `.with_suffix()`
+   --> PTH210_1.py:103:5
+    |
+101 | def test_windows_path(p: WindowsPath) -> None:
+102 |     ## Errors
+103 |     p.with_suffix(".")
+    |     ^^^^^^^^^^^^^^^^^^
+104 |     p.with_suffix("py")
+105 |     p.with_suffix(r"s")
+    |
+help: Remove "." or extend to valid suffix
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__full_name.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__full_name.py.snap
index 84900549de..f8bdfa55ad 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__full_name.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__full_name.py.snap
@@ -305,6 +305,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 33 |     fp.read()
 34 | open(p).close()
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> full_name.py:34:1
@@ -316,6 +317,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 35 | os.getcwdb(p)
 36 | os.path.join(p, *q)
    |
+help: Replace with `Path.open()`
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
   --> full_name.py:35:1
@@ -360,6 +362,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 47 | open(p, 'r', - 1, None, None, None, True, None)
 48 | open(p, 'r', - 1, None, None, None, False, opener)
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> full_name.py:47:1
@@ -370,6 +373,7 @@ PTH123 `open()` should be replaced by `Path.open()`
    | ^^^^
 48 | open(p, 'r', - 1, None, None, None, False, opener)
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> full_name.py:65:1
@@ -381,6 +385,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 66 | byte_str = b"bar"
 67 | open(byte_str)
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> full_name.py:67:1
@@ -392,6 +397,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 68 |
 69 | def bytes_str_func() -> bytes:
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> full_name.py:71:1
@@ -403,6 +409,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 72 |
 73 | # https://github.com/astral-sh/ruff/issues/17693
    |
+help: Replace with `Path.open()`
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
    --> full_name.py:108:1
@@ -493,5 +500,72 @@ PTH103 `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 126 |
 127 | os.makedirs("name", unknown_kwarg=True)
     | ^^^^^^^^^^^
+128 |
+129 | # https://github.com/astral-sh/ruff/issues/20134
     |
 help: Replace with `Path(...).mkdir(parents=True)`
+
+PTH101 `os.chmod()` should be replaced by `Path.chmod()`
+   --> full_name.py:130:1
+    |
+129 | # https://github.com/astral-sh/ruff/issues/20134
+130 | os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+    | ^^^^^^^^
+131 | os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+    |
+help: Replace with `Path(...).chmod(...)`
+
+PTH101 `os.chmod()` should be replaced by `Path.chmod()`
+   --> full_name.py:131:1
+    |
+129 | # https://github.com/astral-sh/ruff/issues/20134
+130 | os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+131 | os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+    | ^^^^^^^^
+132 |
+133 | # Only diagnostic
+    |
+help: Replace with `Path(...).chmod(...)`
+
+PTH101 `os.chmod()` should be replaced by `Path.chmod()`
+   --> full_name.py:134:1
+    |
+133 | # Only diagnostic
+134 | os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^
+135 |
+136 | os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+    |
+help: Replace with `Path(...).chmod(...)`
+
+PTH104 `os.rename()` should be replaced by `Path.rename()`
+   --> full_name.py:136:1
+    |
+134 | os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
+135 |
+136 | os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^^
+137 | os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+    |
+help: Replace with `Path(...).rename(...)`
+
+PTH105 `os.replace()` should be replaced by `Path.replace()`
+   --> full_name.py:137:1
+    |
+136 | os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+137 | os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^^^
+138 |
+139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
+    |
+help: Replace with `Path(...).replace(...)`
+
+PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
+   --> full_name.py:139:1
+    |
+137 | os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+138 |
+139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^^^^^^^^^
+    |
+help: Replace with `Path(...).samefile()`
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__import_from.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__import_from.py.snap
index 010c779654..4e06614274 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__import_from.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__import_from.py.snap
@@ -305,6 +305,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 35 |     fp.read()
 36 | open(p).close()
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> import_from.py:36:1
@@ -314,6 +315,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 36 | open(p).close()
    | ^^^^
    |
+help: Replace with `Path.open()`
 
 PTH123 `open()` should be replaced by `Path.open()`
   --> import_from.py:43:10
@@ -323,6 +325,7 @@ PTH123 `open()` should be replaced by `Path.open()`
 43 |     with open(p) as _: ...  # Error
    |          ^^^^
    |
+help: Replace with `Path.open()`
 
 PTH104 `os.rename()` should be replaced by `Path.rename()`
   --> import_from.py:53:1
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH123_PTH123.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH123_PTH123.py.snap
new file mode 100644
index 0000000000..e6f769753e
--- /dev/null
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH123_PTH123.py.snap
@@ -0,0 +1,215 @@
+---
+source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
+---
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:8:1
+   |
+ 6 | r_plus = "r+"
+ 7 |
+ 8 | builtins.open(file=_file)
+   | ^^^^^^^^^^^^^
+ 9 |
+10 | open(_file, "r+ ", -  1)
+   |
+help: Replace with `Path.open()`
+5  | _x = ("r+", -1)
+6  | r_plus = "r+"
+7  | 
+   - builtins.open(file=_file)
+8  + Path(_file).open()
+9  | 
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:10:1
+   |
+ 8 | builtins.open(file=_file)
+ 9 |
+10 | open(_file, "r+ ", -  1)
+   | ^^^^
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+   |
+help: Replace with `Path.open()`
+7  | 
+8  | builtins.open(file=_file)
+9  | 
+   - open(_file, "r+ ", -  1)
+10 + Path(_file).open("r+ ", -  1)
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:11:1
+   |
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+   | ^^^^
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+   |
+help: Replace with `Path.open()`
+8  | builtins.open(file=_file)
+9  | 
+10 | open(_file, "r+ ", -  1)
+   - open(mode="wb", file=_file)
+11 + Path(_file).open(mode="wb")
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:12:1
+   |
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+   | ^^^^
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+   |
+help: Replace with `Path.open()`
+9  | 
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+   - open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+12 + Path(_file).open(mode="r+", buffering=-1, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:13:1
+   |
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+   | ^^^^
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+   |
+help: Replace with `Path.open()`
+10 | open(_file, "r+ ", -  1)
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+   - open(_file, "r+", - 1, None, None, None, True, None)
+13 + Path(_file).open("r+", - 1, None, None, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:14:1
+   |
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+   | ^^^^
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+   |
+help: Replace with `Path.open()`
+11 | open(mode="wb", file=_file)
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+   - open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+14 + Path(_file).open("r+", -1, None, None, None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:15:1
+   |
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+   | ^^^^
+16 | open(_file, f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+   |
+help: Replace with `Path.open()`
+12 | open(mode="r+", buffering=-1, file=_file, encoding="utf-8")
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+   - open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+15 + Path(_file).open(mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+18 | 
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:16:1
+   |
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+   | ^^^^
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+   |
+help: Replace with `Path.open()`
+13 | open(_file, "r+", - 1, None, None, None, True, None)
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+   - open(_file, f"  {r_plus}      ", -  1)
+16 + Path(_file).open(f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+18 | 
+19 | # Only diagnostic
+
+PTH123 [*] `open()` should be replaced by `Path.open()`
+  --> PTH123.py:17:1
+   |
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+17 | open(buffering=-      1, file=_file, encoding=         "utf-8")
+   | ^^^^
+18 |
+19 | # Only diagnostic
+   |
+help: Replace with `Path.open()`
+14 | open(_file, "r+", -1, None, None, None, closefd=True, opener=None)
+15 | open(_file, mode="r+", buffering=-1, encoding=None, errors=None, newline=None)
+16 | open(_file, f"  {r_plus}      ", -  1)
+   - open(buffering=-      1, file=_file, encoding=         "utf-8")
+17 + Path(_file).open(buffering=-      1, encoding=         "utf-8")
+18 | 
+19 | # Only diagnostic
+20 | open()
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:20:1
+   |
+19 | # Only diagnostic
+20 | open()
+   | ^^^^
+21 | open(_file, *_x)
+22 | open(_file, "r+", unknown=True)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:21:1
+   |
+19 | # Only diagnostic
+20 | open()
+21 | open(_file, *_x)
+   | ^^^^
+22 | open(_file, "r+", unknown=True)
+23 | open(_file, "r+", closefd=False)
+   |
+help: Replace with `Path.open()`
+
+PTH123 `open()` should be replaced by `Path.open()`
+  --> PTH123.py:22:1
+   |
+20 | open()
+21 | open(_file, *_x)
+22 | open(_file, "r+", unknown=True)
+   | ^^^^
+23 | open(_file, "r+", closefd=False)
+24 | open(_file, "r+", None, None, None, None, None, None, None)
+   |
+help: Replace with `Path.open()`
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap
index 7819dbb198..02d0039102 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap
@@ -11,16 +11,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 8 | _ = PurePath(".")
   |
 help: Remove the current directory argument
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | # match
-6   |-_ = Path(".")
-  6 |+_ = Path()
-7 7 | _ = pth(".")
-8 8 | _ = PurePath(".")
-9 9 | _ = Path("")
+3 | 
+4 | 
+5 | # match
+  - _ = Path(".")
+6 + _ = Path()
+7 | _ = pth(".")
+8 | _ = PurePath(".")
+9 | _ = Path("")
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
  --> PTH201.py:7:9
@@ -33,16 +31,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 9 | _ = Path("")
   |
 help: Remove the current directory argument
-
-ℹ Safe fix
-4 4 | 
-5 5 | # match
-6 6 | _ = Path(".")
-7   |-_ = pth(".")
-  7 |+_ = pth()
-8 8 | _ = PurePath(".")
-9 9 | _ = Path("")
-10 10 | 
+4  | 
+5  | # match
+6  | _ = Path(".")
+   - _ = pth(".")
+7  + _ = pth()
+8  | _ = PurePath(".")
+9  | _ = Path("")
+10 | 
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
  --> PTH201.py:8:14
@@ -54,16 +50,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 9 | _ = Path("")
   |
 help: Remove the current directory argument
-
-ℹ Safe fix
-5 5 | # match
-6 6 | _ = Path(".")
-7 7 | _ = pth(".")
-8   |-_ = PurePath(".")
-  8 |+_ = PurePath()
-9 9 | _ = Path("")
-10 10 | 
-11 11 | Path('', )
+5  | # match
+6  | _ = Path(".")
+7  | _ = pth(".")
+   - _ = PurePath(".")
+8  + _ = PurePath()
+9  | _ = Path("")
+10 | 
+11 | Path('', )
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:9:10
@@ -76,16 +70,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 11 | Path('', )
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-6  6  | _ = Path(".")
-7  7  | _ = pth(".")
-8  8  | _ = PurePath(".")
-9     |-_ = Path("")
-   9  |+_ = Path()
-10 10 | 
-11 11 | Path('', )
-12 12 | 
+6  | _ = Path(".")
+7  | _ = pth(".")
+8  | _ = PurePath(".")
+   - _ = Path("")
+9  + _ = Path()
+10 | 
+11 | Path('', )
+12 | 
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:11:6
@@ -98,16 +90,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 13 | Path(
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-8  8  | _ = PurePath(".")
-9  9  | _ = Path("")
-10 10 | 
-11    |-Path('', )
-   11 |+Path()
-12 12 | 
-13 13 | Path(
-14 14 |     '',
+8  | _ = PurePath(".")
+9  | _ = Path("")
+10 | 
+   - Path('', )
+11 + Path()
+12 | 
+13 | Path(
+14 |     '',
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:14:5
@@ -118,18 +108,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 15 | )
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-10 10 | 
-11 11 | Path('', )
-12 12 | 
-13    |-Path(
-14    |-    '',
-15    |-)
-   13 |+Path()
-16 14 | 
-17 15 | Path(  # Comment before argument
-18 16 |     '',
+10 | 
+11 | Path('', )
+12 | 
+   - Path(
+   -     '',
+   - )
+13 + Path()
+14 | 
+15 | Path(  # Comment before argument
+16 |     '',
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:18:5
@@ -140,18 +128,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 19 | )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-14 14 |     '',
-15 15 | )
-16 16 | 
-17    |-Path(  # Comment before argument
-18    |-    '',
-19    |-)
-   17 |+Path()
-20 18 | 
-21 19 | Path(
-22 20 |     '',  # EOL comment
+14 |     '',
+15 | )
+16 | 
+   - Path(  # Comment before argument
+   -     '',
+   - )
+17 + Path()
+18 | 
+19 | Path(
+20 |     '',  # EOL comment
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:22:5
@@ -162,18 +149,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 23 | )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-18 18 |     '',
-19 19 | )
-20 20 | 
-21    |-Path(
-22    |-    '',  # EOL comment
-23    |-)
-   21 |+Path()
-24 22 | 
-25 23 | Path(
-26 24 |     ''  # Comment in the middle of implicitly concatenated string
+18 |     '',
+19 | )
+20 | 
+   - Path(
+   -     '',  # EOL comment
+   - )
+21 + Path()
+22 | 
+23 | Path(
+24 |     ''  # Comment in the middle of implicitly concatenated string
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:26:5
@@ -185,19 +171,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 28 |   )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-22 22 |     '',  # EOL comment
-23 23 | )
-24 24 | 
-25    |-Path(
-26    |-    ''  # Comment in the middle of implicitly concatenated string
-27    |-    ".",
-28    |-)
-   25 |+Path()
-29 26 | 
-30 27 | Path(
-31 28 |     ''  # Comment before comma
+22 |     '',  # EOL comment
+23 | )
+24 | 
+   - Path(
+   -     ''  # Comment in the middle of implicitly concatenated string
+   -     ".",
+   - )
+25 + Path()
+26 | 
+27 | Path(
+28 |     ''  # Comment before comma
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:31:5
@@ -209,19 +194,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 33 | )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-27 27 |     ".",
-28 28 | )
-29 29 | 
-30    |-Path(
-31    |-    ''  # Comment before comma
-32    |-    ,
-33    |-)
-   30 |+Path()
-34 31 | 
-35 32 | Path(
-36 33 |     '',
+27 |     ".",
+28 | )
+29 | 
+   - Path(
+   -     ''  # Comment before comma
+   -     ,
+   - )
+30 + Path()
+31 | 
+32 | Path(
+33 |     '',
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:36:5
@@ -232,18 +216,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 37 | ) / "bare"
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-33 33 | )
-34 34 | 
-35 35 | Path(
-36    |-    '',
-37    |-) / "bare"
-   36 |+    "bare",
-   37 |+)
-38 38 | 
-39 39 | Path(  # Comment before argument
-40 40 |     '',
+33 | )
+34 | 
+35 | Path(
+   -     '',
+   - ) / "bare"
+36 +     "bare",
+37 + )
+38 | 
+39 | Path(  # Comment before argument
+40 |     '',
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:40:5
@@ -254,18 +236,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 41 | ) / ("parenthesized")
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-37 37 | ) / "bare"
-38 38 | 
-39 39 | Path(  # Comment before argument
-40    |-    '',
-41    |-) / ("parenthesized")
-   40 |+    ("parenthesized"),
-   41 |+)
-42 42 | 
-43 43 | Path(
-44 44 |     '',  # EOL comment
+37 | ) / "bare"
+38 | 
+39 | Path(  # Comment before argument
+   -     '',
+   - ) / ("parenthesized")
+40 +     ("parenthesized"),
+41 + )
+42 | 
+43 | Path(
+44 |     '',  # EOL comment
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:44:5
@@ -276,18 +257,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 45 | ) / ( ("double parenthesized"  )   )
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-41 41 | ) / ("parenthesized")
-42 42 | 
-43 43 | Path(
-44    |-    '',  # EOL comment
-45    |-) / ( ("double parenthesized"  )   )
-   44 |+    ( ("double parenthesized"  )   ),  # EOL comment
-   45 |+)
-46 46 | 
-47 47 | (  Path(
-48 48 |     ''  # Comment in the middle of implicitly concatenated string
+41 | ) / ("parenthesized")
+42 | 
+43 | Path(
+   -     '',  # EOL comment
+   - ) / ( ("double parenthesized"  )   )
+44 +     ( ("double parenthesized"  )   ),  # EOL comment
+45 + )
+46 | 
+47 | (  Path(
+48 |     ''  # Comment in the middle of implicitly concatenated string
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:48:5
@@ -300,22 +280,21 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 51 |         # Comment between closing parentheses
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-44 44 |     '',  # EOL comment
-45 45 | ) / ( ("double parenthesized"  )   )
-46 46 | 
-47    |-(  Path(
-48    |-    ''  # Comment in the middle of implicitly concatenated string
-49    |-    ".",
-50    |-) )/ (("parenthesized path call")
-   47 |+Path(
-   48 |+    (("parenthesized path call")
-51 49 |       # Comment between closing parentheses
-   50 |+),
-52 51 | )
-53 52 | 
-54 53 | Path(
+44 |     '',  # EOL comment
+45 | ) / ( ("double parenthesized"  )   )
+46 | 
+   - (  Path(
+   -     ''  # Comment in the middle of implicitly concatenated string
+   -     ".",
+   - ) )/ (("parenthesized path call")
+47 + Path(
+48 +     (("parenthesized path call")
+49 |       # Comment between closing parentheses
+50 + ),
+51 | )
+52 | 
+53 | Path(
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:55:5
@@ -327,19 +306,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 57 | ) / "multiple" / (
    |
 help: Remove the current directory argument
-
-ℹ Unsafe fix
-52 52 | )
-53 53 | 
-54 54 | Path(
-55    |-    ''  # Comment before comma
-   55 |+    "multiple"  # Comment before comma
-56 56 |     ,
-57    |-) / "multiple" / (
-   57 |+) / (
-58 58 |     "frag"  # Comment
-59 59 |     'ment'
-60 60 | )
+52 | )
+53 | 
+54 | Path(
+   -     ''  # Comment before comma
+55 +     "multiple"  # Comment before comma
+56 |     ,
+   - ) / "multiple" / (
+57 + ) / (
+58 |     "frag"  # Comment
+59 |     'ment'
+60 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:74:15
@@ -352,16 +330,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 76 | _ = WindowsPath(".")
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-71 71 | 
-72 72 | from importlib.metadata import PackagePath
-73 73 | 
-74    |-_ = PosixPath(".")
-   74 |+_ = PosixPath()
-75 75 | _ = PurePosixPath(".")
-76 76 | _ = WindowsPath(".")
-77 77 | _ = PureWindowsPath(".")
+71 | 
+72 | from importlib.metadata import PackagePath
+73 | 
+   - _ = PosixPath(".")
+74 + _ = PosixPath()
+75 | _ = PurePosixPath(".")
+76 | _ = WindowsPath(".")
+77 | _ = PureWindowsPath(".")
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:75:19
@@ -373,16 +349,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 77 | _ = PureWindowsPath(".")
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-72 72 | from importlib.metadata import PackagePath
-73 73 | 
-74 74 | _ = PosixPath(".")
-75    |-_ = PurePosixPath(".")
-   75 |+_ = PurePosixPath()
-76 76 | _ = WindowsPath(".")
-77 77 | _ = PureWindowsPath(".")
-78 78 | _ = PackagePath(".")
+72 | from importlib.metadata import PackagePath
+73 | 
+74 | _ = PosixPath(".")
+   - _ = PurePosixPath(".")
+75 + _ = PurePosixPath()
+76 | _ = WindowsPath(".")
+77 | _ = PureWindowsPath(".")
+78 | _ = PackagePath(".")
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:76:17
@@ -395,15 +369,13 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 78 | _ = PackagePath(".")
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-73 73 | 
-74 74 | _ = PosixPath(".")
-75 75 | _ = PurePosixPath(".")
-76    |-_ = WindowsPath(".")
-   76 |+_ = WindowsPath()
-77 77 | _ = PureWindowsPath(".")
-78 78 | _ = PackagePath(".")
+73 | 
+74 | _ = PosixPath(".")
+75 | _ = PurePosixPath(".")
+   - _ = WindowsPath(".")
+76 + _ = WindowsPath()
+77 | _ = PureWindowsPath(".")
+78 | _ = PackagePath(".")
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:77:21
@@ -415,14 +387,12 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
 78 | _ = PackagePath(".")
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-74 74 | _ = PosixPath(".")
-75 75 | _ = PurePosixPath(".")
-76 76 | _ = WindowsPath(".")
-77    |-_ = PureWindowsPath(".")
-   77 |+_ = PureWindowsPath()
-78 78 | _ = PackagePath(".")
+74 | _ = PosixPath(".")
+75 | _ = PurePosixPath(".")
+76 | _ = WindowsPath(".")
+   - _ = PureWindowsPath(".")
+77 + _ = PureWindowsPath()
+78 | _ = PackagePath(".")
 
 PTH201 [*] Do not pass the current directory explicitly to `Path`
   --> PTH201.py:78:17
@@ -433,10 +403,8 @@ PTH201 [*] Do not pass the current directory explicitly to `Path`
    |                 ^^^
    |
 help: Remove the current directory argument
-
-ℹ Safe fix
-75 75 | _ = PurePosixPath(".")
-76 76 | _ = WindowsPath(".")
-77 77 | _ = PureWindowsPath(".")
-78    |-_ = PackagePath(".")
-   78 |+_ = PackagePath()
+75 | _ = PurePosixPath(".")
+76 | _ = WindowsPath(".")
+77 | _ = PureWindowsPath(".")
+   - _ = PackagePath(".")
+78 + _ = PackagePath()
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap
index 107a4da2c0..3ba53629ec 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap
@@ -10,16 +10,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 12 | os.path.getsize(Path("filename"))
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-7  7  | filename2 = Path("filename")
-8  8  | 
-9  9  | 
-10    |-os.path.getsize("filename")
-   10 |+Path("filename").stat().st_size
-11 11 | os.path.getsize(b"filename")
-12 12 | os.path.getsize(Path("filename"))
-13 13 | os.path.getsize(__file__)
+7  | filename2 = Path("filename")
+8  | 
+9  | 
+   - os.path.getsize("filename")
+10 + Path("filename").stat().st_size
+11 | os.path.getsize(b"filename")
+12 | os.path.getsize(Path("filename"))
+13 | os.path.getsize(__file__)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:11:1
@@ -31,16 +29,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 13 | os.path.getsize(__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-8  8  | 
-9  9  | 
-10 10 | os.path.getsize("filename")
-11    |-os.path.getsize(b"filename")
-   11 |+Path(b"filename").stat().st_size
-12 12 | os.path.getsize(Path("filename"))
-13 13 | os.path.getsize(__file__)
-14 14 | 
+8  | 
+9  | 
+10 | os.path.getsize("filename")
+   - os.path.getsize(b"filename")
+11 + Path(b"filename").stat().st_size
+12 | os.path.getsize(Path("filename"))
+13 | os.path.getsize(__file__)
+14 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:12:1
@@ -52,16 +48,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 13 | os.path.getsize(__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-9  9  | 
-10 10 | os.path.getsize("filename")
-11 11 | os.path.getsize(b"filename")
-12    |-os.path.getsize(Path("filename"))
-   12 |+Path("filename").stat().st_size
-13 13 | os.path.getsize(__file__)
-14 14 | 
-15 15 | os.path.getsize(filename)
+9  | 
+10 | os.path.getsize("filename")
+11 | os.path.getsize(b"filename")
+   - os.path.getsize(Path("filename"))
+12 + Path("filename").stat().st_size
+13 | os.path.getsize(__file__)
+14 | 
+15 | os.path.getsize(filename)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:13:1
@@ -74,16 +68,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 15 | os.path.getsize(filename)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-10 10 | os.path.getsize("filename")
-11 11 | os.path.getsize(b"filename")
-12 12 | os.path.getsize(Path("filename"))
-13    |-os.path.getsize(__file__)
-   13 |+Path(__file__).stat().st_size
-14 14 | 
-15 15 | os.path.getsize(filename)
-16 16 | os.path.getsize(filename1)
+10 | os.path.getsize("filename")
+11 | os.path.getsize(b"filename")
+12 | os.path.getsize(Path("filename"))
+   - os.path.getsize(__file__)
+13 + Path(__file__).stat().st_size
+14 | 
+15 | os.path.getsize(filename)
+16 | os.path.getsize(filename1)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:15:1
@@ -96,16 +88,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 17 | os.path.getsize(filename2)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-12 12 | os.path.getsize(Path("filename"))
-13 13 | os.path.getsize(__file__)
-14 14 | 
-15    |-os.path.getsize(filename)
-   15 |+Path(filename).stat().st_size
-16 16 | os.path.getsize(filename1)
-17 17 | os.path.getsize(filename2)
-18 18 | 
+12 | os.path.getsize(Path("filename"))
+13 | os.path.getsize(__file__)
+14 | 
+   - os.path.getsize(filename)
+15 + Path(filename).stat().st_size
+16 | os.path.getsize(filename1)
+17 | os.path.getsize(filename2)
+18 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:16:1
@@ -116,16 +106,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 17 | os.path.getsize(filename2)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-13 13 | os.path.getsize(__file__)
-14 14 | 
-15 15 | os.path.getsize(filename)
-16    |-os.path.getsize(filename1)
-   16 |+Path(filename1).stat().st_size
-17 17 | os.path.getsize(filename2)
-18 18 | 
-19 19 | os.path.getsize(filename="filename")
+13 | os.path.getsize(__file__)
+14 | 
+15 | os.path.getsize(filename)
+   - os.path.getsize(filename1)
+16 + Path(filename1).stat().st_size
+17 | os.path.getsize(filename2)
+18 | 
+19 | os.path.getsize(filename="filename")
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:17:1
@@ -138,16 +126,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 19 | os.path.getsize(filename="filename")
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-14 14 | 
-15 15 | os.path.getsize(filename)
-16 16 | os.path.getsize(filename1)
-17    |-os.path.getsize(filename2)
-   17 |+Path(filename2).stat().st_size
-18 18 | 
-19 19 | os.path.getsize(filename="filename")
-20 20 | os.path.getsize(filename=b"filename")
+14 | 
+15 | os.path.getsize(filename)
+16 | os.path.getsize(filename1)
+   - os.path.getsize(filename2)
+17 + Path(filename2).stat().st_size
+18 | 
+19 | os.path.getsize(filename="filename")
+20 | os.path.getsize(filename=b"filename")
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:19:1
@@ -160,16 +146,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 21 | os.path.getsize(filename=Path("filename"))
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-16 16 | os.path.getsize(filename1)
-17 17 | os.path.getsize(filename2)
-18 18 | 
-19    |-os.path.getsize(filename="filename")
-   19 |+Path("filename").stat().st_size
-20 20 | os.path.getsize(filename=b"filename")
-21 21 | os.path.getsize(filename=Path("filename"))
-22 22 | os.path.getsize(filename=__file__)
+16 | os.path.getsize(filename1)
+17 | os.path.getsize(filename2)
+18 | 
+   - os.path.getsize(filename="filename")
+19 + Path("filename").stat().st_size
+20 | os.path.getsize(filename=b"filename")
+21 | os.path.getsize(filename=Path("filename"))
+22 | os.path.getsize(filename=__file__)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:20:1
@@ -181,16 +165,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 22 | os.path.getsize(filename=__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-17 17 | os.path.getsize(filename2)
-18 18 | 
-19 19 | os.path.getsize(filename="filename")
-20    |-os.path.getsize(filename=b"filename")
-   20 |+Path(b"filename").stat().st_size
-21 21 | os.path.getsize(filename=Path("filename"))
-22 22 | os.path.getsize(filename=__file__)
-23 23 | 
+17 | os.path.getsize(filename2)
+18 | 
+19 | os.path.getsize(filename="filename")
+   - os.path.getsize(filename=b"filename")
+20 + Path(b"filename").stat().st_size
+21 | os.path.getsize(filename=Path("filename"))
+22 | os.path.getsize(filename=__file__)
+23 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:21:1
@@ -202,16 +184,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 22 | os.path.getsize(filename=__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-18 18 | 
-19 19 | os.path.getsize(filename="filename")
-20 20 | os.path.getsize(filename=b"filename")
-21    |-os.path.getsize(filename=Path("filename"))
-   21 |+Path("filename").stat().st_size
-22 22 | os.path.getsize(filename=__file__)
-23 23 | 
-24 24 | getsize("filename")
+18 | 
+19 | os.path.getsize(filename="filename")
+20 | os.path.getsize(filename=b"filename")
+   - os.path.getsize(filename=Path("filename"))
+21 + Path("filename").stat().st_size
+22 | os.path.getsize(filename=__file__)
+23 | 
+24 | getsize("filename")
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:22:1
@@ -224,16 +204,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 24 | getsize("filename")
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-19 19 | os.path.getsize(filename="filename")
-20 20 | os.path.getsize(filename=b"filename")
-21 21 | os.path.getsize(filename=Path("filename"))
-22    |-os.path.getsize(filename=__file__)
-   22 |+Path(__file__).stat().st_size
-23 23 | 
-24 24 | getsize("filename")
-25 25 | getsize(b"filename")
+19 | os.path.getsize(filename="filename")
+20 | os.path.getsize(filename=b"filename")
+21 | os.path.getsize(filename=Path("filename"))
+   - os.path.getsize(filename=__file__)
+22 + Path(__file__).stat().st_size
+23 | 
+24 | getsize("filename")
+25 | getsize(b"filename")
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:24:1
@@ -246,16 +224,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 26 | getsize(Path("filename"))
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-21 21 | os.path.getsize(filename=Path("filename"))
-22 22 | os.path.getsize(filename=__file__)
-23 23 | 
-24    |-getsize("filename")
-   24 |+Path("filename").stat().st_size
-25 25 | getsize(b"filename")
-26 26 | getsize(Path("filename"))
-27 27 | getsize(__file__)
+21 | os.path.getsize(filename=Path("filename"))
+22 | os.path.getsize(filename=__file__)
+23 | 
+   - getsize("filename")
+24 + Path("filename").stat().st_size
+25 | getsize(b"filename")
+26 | getsize(Path("filename"))
+27 | getsize(__file__)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:25:1
@@ -267,16 +243,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 27 | getsize(__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-22 22 | os.path.getsize(filename=__file__)
-23 23 | 
-24 24 | getsize("filename")
-25    |-getsize(b"filename")
-   25 |+Path(b"filename").stat().st_size
-26 26 | getsize(Path("filename"))
-27 27 | getsize(__file__)
-28 28 | 
+22 | os.path.getsize(filename=__file__)
+23 | 
+24 | getsize("filename")
+   - getsize(b"filename")
+25 + Path(b"filename").stat().st_size
+26 | getsize(Path("filename"))
+27 | getsize(__file__)
+28 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:26:1
@@ -288,16 +262,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 27 | getsize(__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-23 23 | 
-24 24 | getsize("filename")
-25 25 | getsize(b"filename")
-26    |-getsize(Path("filename"))
-   26 |+Path("filename").stat().st_size
-27 27 | getsize(__file__)
-28 28 | 
-29 29 | getsize(filename="filename")
+23 | 
+24 | getsize("filename")
+25 | getsize(b"filename")
+   - getsize(Path("filename"))
+26 + Path("filename").stat().st_size
+27 | getsize(__file__)
+28 | 
+29 | getsize(filename="filename")
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:27:1
@@ -310,16 +282,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 29 | getsize(filename="filename")
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-24 24 | getsize("filename")
-25 25 | getsize(b"filename")
-26 26 | getsize(Path("filename"))
-27    |-getsize(__file__)
-   27 |+Path(__file__).stat().st_size
-28 28 | 
-29 29 | getsize(filename="filename")
-30 30 | getsize(filename=b"filename")
+24 | getsize("filename")
+25 | getsize(b"filename")
+26 | getsize(Path("filename"))
+   - getsize(__file__)
+27 + Path(__file__).stat().st_size
+28 | 
+29 | getsize(filename="filename")
+30 | getsize(filename=b"filename")
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:29:1
@@ -332,16 +302,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 31 | getsize(filename=Path("filename"))
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-26 26 | getsize(Path("filename"))
-27 27 | getsize(__file__)
-28 28 | 
-29    |-getsize(filename="filename")
-   29 |+Path("filename").stat().st_size
-30 30 | getsize(filename=b"filename")
-31 31 | getsize(filename=Path("filename"))
-32 32 | getsize(filename=__file__)
+26 | getsize(Path("filename"))
+27 | getsize(__file__)
+28 | 
+   - getsize(filename="filename")
+29 + Path("filename").stat().st_size
+30 | getsize(filename=b"filename")
+31 | getsize(filename=Path("filename"))
+32 | getsize(filename=__file__)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:30:1
@@ -353,16 +321,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 32 | getsize(filename=__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-27 27 | getsize(__file__)
-28 28 | 
-29 29 | getsize(filename="filename")
-30    |-getsize(filename=b"filename")
-   30 |+Path(b"filename").stat().st_size
-31 31 | getsize(filename=Path("filename"))
-32 32 | getsize(filename=__file__)
-33 33 | 
+27 | getsize(__file__)
+28 | 
+29 | getsize(filename="filename")
+   - getsize(filename=b"filename")
+30 + Path(b"filename").stat().st_size
+31 | getsize(filename=Path("filename"))
+32 | getsize(filename=__file__)
+33 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:31:1
@@ -374,16 +340,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 32 | getsize(filename=__file__)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-28 28 | 
-29 29 | getsize(filename="filename")
-30 30 | getsize(filename=b"filename")
-31    |-getsize(filename=Path("filename"))
-   31 |+Path("filename").stat().st_size
-32 32 | getsize(filename=__file__)
-33 33 | 
-34 34 | getsize(filename)
+28 | 
+29 | getsize(filename="filename")
+30 | getsize(filename=b"filename")
+   - getsize(filename=Path("filename"))
+31 + Path("filename").stat().st_size
+32 | getsize(filename=__file__)
+33 | 
+34 | getsize(filename)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:32:1
@@ -396,16 +360,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 34 | getsize(filename)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-29 29 | getsize(filename="filename")
-30 30 | getsize(filename=b"filename")
-31 31 | getsize(filename=Path("filename"))
-32    |-getsize(filename=__file__)
-   32 |+Path(__file__).stat().st_size
-33 33 | 
-34 34 | getsize(filename)
-35 35 | getsize(filename1)
+29 | getsize(filename="filename")
+30 | getsize(filename=b"filename")
+31 | getsize(filename=Path("filename"))
+   - getsize(filename=__file__)
+32 + Path(__file__).stat().st_size
+33 | 
+34 | getsize(filename)
+35 | getsize(filename1)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:34:1
@@ -418,16 +380,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 36 | getsize(filename2)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-31 31 | getsize(filename=Path("filename"))
-32 32 | getsize(filename=__file__)
-33 33 | 
-34    |-getsize(filename)
-   34 |+Path(filename).stat().st_size
-35 35 | getsize(filename1)
-36 36 | getsize(filename2)
-37 37 | 
+31 | getsize(filename=Path("filename"))
+32 | getsize(filename=__file__)
+33 | 
+   - getsize(filename)
+34 + Path(filename).stat().st_size
+35 | getsize(filename1)
+36 | getsize(filename2)
+37 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:35:1
@@ -438,16 +398,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 36 | getsize(filename2)
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-32 32 | getsize(filename=__file__)
-33 33 | 
-34 34 | getsize(filename)
-35    |-getsize(filename1)
-   35 |+Path(filename1).stat().st_size
-36 36 | getsize(filename2)
-37 37 | 
-38 38 | 
+32 | getsize(filename=__file__)
+33 | 
+34 | getsize(filename)
+   - getsize(filename1)
+35 + Path(filename1).stat().st_size
+36 | getsize(filename2)
+37 | 
+38 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:36:1
@@ -458,16 +416,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
    | ^^^^^^^
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-33 33 | 
-34 34 | getsize(filename)
-35 35 | getsize(filename1)
-36    |-getsize(filename2)
-   36 |+Path(filename2).stat().st_size
-37 37 | 
-38 38 | 
-39 39 | os.path.getsize(
+33 | 
+34 | getsize(filename)
+35 | getsize(filename1)
+   - getsize(filename2)
+36 + Path(filename2).stat().st_size
+37 | 
+38 | 
+39 | os.path.getsize(
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:39:1
@@ -478,18 +434,17 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 41 | )
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-36 36 | getsize(filename2)
-37 37 | 
-38 38 | 
-39    |-os.path.getsize(
-40    |-    "filename", # comment
-41    |-)
-   39 |+Path("filename").stat().st_size
-42 40 | 
-43 41 | os.path.getsize(
-44 42 |     # comment
+36 | getsize(filename2)
+37 | 
+38 | 
+   - os.path.getsize(
+   -     "filename", # comment
+   - )
+39 + Path("filename").stat().st_size
+40 | 
+41 | os.path.getsize(
+42 |     # comment
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:43:1
@@ -502,21 +457,20 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 45 |     "filename"
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-40 40 |     "filename", # comment
-41 41 | )
-42 42 | 
-43    |-os.path.getsize(
-44    |-    # comment
-45    |-    "filename"
-46    |-    ,
-47    |-    # comment
-48    |-)
-   43 |+Path("filename").stat().st_size
-49 44 | 
-50 45 | os.path.getsize(
-51 46 |     # comment
+40 |     "filename", # comment
+41 | )
+42 | 
+   - os.path.getsize(
+   -     # comment
+   -     "filename"
+   -     ,
+   -     # comment
+   - )
+43 + Path("filename").stat().st_size
+44 | 
+45 | os.path.getsize(
+46 |     # comment
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:50:1
@@ -529,20 +483,19 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 52 |     b"filename"
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-47 47 |     # comment
-48 48 | )
-49 49 | 
-50    |-os.path.getsize(
-51    |-    # comment
-52    |-    b"filename"
-53    |-    # comment
-54    |-)
-   50 |+Path(b"filename").stat().st_size
-55 51 | 
-56 52 | os.path.getsize( # comment
-57 53 |     Path(__file__)
+47 |     # comment
+48 | )
+49 | 
+   - os.path.getsize(
+   -     # comment
+   -     b"filename"
+   -     # comment
+   - )
+50 + Path(b"filename").stat().st_size
+51 | 
+52 | os.path.getsize( # comment
+53 |     Path(__file__)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:56:1
@@ -555,19 +508,18 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 58 |     # comment
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-53 53 |     # comment
-54 54 | )
-55 55 | 
-56    |-os.path.getsize( # comment
-57    |-    Path(__file__)
-58    |-    # comment
-59    |-) # comment
-   56 |+Path(__file__).stat().st_size # comment
-60 57 | 
-61 58 | getsize( # comment
-62 59 |     "filename")
+53 |     # comment
+54 | )
+55 | 
+   - os.path.getsize( # comment
+   -     Path(__file__)
+   -     # comment
+   - ) # comment
+56 + Path(__file__).stat().st_size # comment
+57 | 
+58 | getsize( # comment
+59 |     "filename")
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:61:1
@@ -579,17 +531,16 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 62 |     "filename")
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-58 58 |     # comment
-59 59 | ) # comment
-60 60 | 
-61    |-getsize( # comment
-62    |-    "filename")
-   61 |+Path("filename").stat().st_size
-63 62 | 
-64 63 | getsize( # comment
-65 64 |     b"filename",
+58 |     # comment
+59 | ) # comment
+60 | 
+   - getsize( # comment
+   -     "filename")
+61 + Path("filename").stat().st_size
+62 | 
+63 | getsize( # comment
+64 |     b"filename",
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:64:1
@@ -602,19 +553,18 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 66 |     #comment
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-61 61 | getsize( # comment
-62 62 |     "filename")
-63 63 | 
-64    |-getsize( # comment
-65    |-    b"filename",
-66    |-    #comment
-67    |-)
-   64 |+Path(b"filename").stat().st_size
-68 65 | 
-69 66 | os.path.getsize("file" + "name")
-70 67 | 
+61 | getsize( # comment
+62 |     "filename")
+63 | 
+   - getsize( # comment
+   -     b"filename",
+   -     #comment
+   - )
+64 + Path(b"filename").stat().st_size
+65 | 
+66 | os.path.getsize("file" + "name")
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:69:1
@@ -627,16 +577,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 71 | getsize \
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-66 66 |     #comment
-67 67 | )
-68 68 | 
-69    |-os.path.getsize("file" + "name")
-   69 |+Path("file" + "name").stat().st_size
-70 70 | 
-71 71 | getsize \
-72 72 | \
+66 |     #comment
+67 | )
+68 | 
+   - os.path.getsize("file" + "name")
+69 + Path("file" + "name").stat().st_size
+70 | 
+71 | getsize \
+72 | \
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:71:1
@@ -649,21 +597,20 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 73 | \
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Unsafe fix
-68 68 | 
-69 69 | os.path.getsize("file" + "name")
-70 70 | 
-71    |-getsize \
-72    |-\
-73    |-\
-74    |-        ( # comment
-75    |-    "filename",
-76    |-    )
-   71 |+Path("filename").stat().st_size
-77 72 | 
-78 73 | getsize(Path("filename").resolve())
-79 74 | 
+68 | 
+69 | os.path.getsize("file" + "name")
+70 | 
+   - getsize \
+   - \
+   - \
+   -         ( # comment
+   -     "filename",
+   -     )
+71 + Path("filename").stat().st_size
+72 | 
+73 | getsize(Path("filename").resolve())
+74 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:78:1
@@ -676,16 +623,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 80 | import pathlib
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-75 75 |     "filename",
-76 76 |     )
-77 77 | 
-78    |-getsize(Path("filename").resolve())
-   78 |+Path(Path("filename").resolve()).stat().st_size
-79 79 | 
-80 80 | import pathlib
-81 81 | 
+75 |     "filename",
+76 |     )
+77 | 
+   - getsize(Path("filename").resolve())
+78 + Path(Path("filename").resolve()).stat().st_size
+79 | 
+80 | import pathlib
+81 | 
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   --> PTH202.py:82:1
@@ -696,10 +641,8 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
    | ^^^^^^^^^^^^^^^
    |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-79 79 | 
-80 80 | import pathlib
-81 81 | 
-82    |-os.path.getsize(pathlib.Path("filename"))
-   82 |+pathlib.Path("filename").stat().st_size
+79 | 
+80 | import pathlib
+81 | 
+   - os.path.getsize(pathlib.Path("filename"))
+82 + pathlib.Path("filename").stat().st_size
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap
index 95dc695ee6..fbeba4eace 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap
@@ -12,15 +12,13 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 5 | os.path.getsize(filename=__file__)
   |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-1 1 | import os
-  2 |+import pathlib
-2 3 | 
-3   |-os.path.getsize(filename="filename")
-  4 |+pathlib.Path("filename").stat().st_size
-4 5 | os.path.getsize(filename=b"filename")
-5 6 | os.path.getsize(filename=__file__)
+1 | import os
+2 + import pathlib
+3 | 
+  - os.path.getsize(filename="filename")
+4 + pathlib.Path("filename").stat().st_size
+5 | os.path.getsize(filename=b"filename")
+6 | os.path.getsize(filename=__file__)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
  --> PTH202_2.py:4:1
@@ -31,15 +29,13 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
 5 | os.path.getsize(filename=__file__)
   |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-1 1 | import os
-  2 |+import pathlib
-2 3 | 
-3 4 | os.path.getsize(filename="filename")
-4   |-os.path.getsize(filename=b"filename")
-  5 |+pathlib.Path(b"filename").stat().st_size
-5 6 | os.path.getsize(filename=__file__)
+1 | import os
+2 + import pathlib
+3 | 
+4 | os.path.getsize(filename="filename")
+  - os.path.getsize(filename=b"filename")
+5 + pathlib.Path(b"filename").stat().st_size
+6 | os.path.getsize(filename=__file__)
 
 PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
  --> PTH202_2.py:5:1
@@ -50,12 +46,10 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size`
   | ^^^^^^^^^^^^^^^
   |
 help: Replace with `Path(...).stat().st_size`
-
-ℹ Safe fix
-1 1 | import os
-  2 |+import pathlib
-2 3 | 
-3 4 | os.path.getsize(filename="filename")
-4 5 | os.path.getsize(filename=b"filename")
-5   |-os.path.getsize(filename=__file__)
-  6 |+pathlib.Path(__file__).stat().st_size
+1 | import os
+2 + import pathlib
+3 | 
+4 | os.path.getsize(filename="filename")
+5 | os.path.getsize(filename=b"filename")
+  - os.path.getsize(filename=__file__)
+6 + pathlib.Path(__file__).stat().st_size
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap
index 81109e01bd..374d0094c6 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap
@@ -12,16 +12,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 7 | os.path.getatime(Path("filename"))
   |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-2 2 | from pathlib import Path
-3 3 | from os.path import getatime
-4 4 | 
-5   |-os.path.getatime("filename")
-  5 |+Path("filename").stat().st_atime
-6 6 | os.path.getatime(b"filename")
-7 7 | os.path.getatime(Path("filename"))
-8 8 | 
+2 | from pathlib import Path
+3 | from os.path import getatime
+4 | 
+  - os.path.getatime("filename")
+5 + Path("filename").stat().st_atime
+6 | os.path.getatime(b"filename")
+7 | os.path.getatime(Path("filename"))
+8 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
  --> PTH203.py:6:1
@@ -32,16 +30,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 7 | os.path.getatime(Path("filename"))
   |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-3 3 | from os.path import getatime
-4 4 | 
-5 5 | os.path.getatime("filename")
-6   |-os.path.getatime(b"filename")
-  6 |+Path(b"filename").stat().st_atime
-7 7 | os.path.getatime(Path("filename"))
-8 8 | 
-9 9 | 
+3 | from os.path import getatime
+4 | 
+5 | os.path.getatime("filename")
+  - os.path.getatime(b"filename")
+6 + Path(b"filename").stat().st_atime
+7 | os.path.getatime(Path("filename"))
+8 | 
+9 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
  --> PTH203.py:7:1
@@ -52,16 +48,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   | ^^^^^^^^^^^^^^^^
   |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-4 4 | 
-5 5 | os.path.getatime("filename")
-6 6 | os.path.getatime(b"filename")
-7   |-os.path.getatime(Path("filename"))
-  7 |+Path("filename").stat().st_atime
-8 8 | 
-9 9 | 
-10 10 | getatime("filename")
+4  | 
+5  | os.path.getatime("filename")
+6  | os.path.getatime(b"filename")
+   - os.path.getatime(Path("filename"))
+7  + Path("filename").stat().st_atime
+8  | 
+9  | 
+10 | getatime("filename")
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:10:1
@@ -72,16 +66,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 12 | getatime(Path("filename"))
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-7  7  | os.path.getatime(Path("filename"))
-8  8  | 
-9  9  | 
-10    |-getatime("filename")
-   10 |+Path("filename").stat().st_atime
-11 11 | getatime(b"filename")
-12 12 | getatime(Path("filename"))
-13 13 | 
+7  | os.path.getatime(Path("filename"))
+8  | 
+9  | 
+   - getatime("filename")
+10 + Path("filename").stat().st_atime
+11 | getatime(b"filename")
+12 | getatime(Path("filename"))
+13 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:11:1
@@ -92,16 +84,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 12 | getatime(Path("filename"))
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-8  8  | 
-9  9  | 
-10 10 | getatime("filename")
-11    |-getatime(b"filename")
-   11 |+Path(b"filename").stat().st_atime
-12 12 | getatime(Path("filename"))
-13 13 | 
-14 14 | 
+8  | 
+9  | 
+10 | getatime("filename")
+   - getatime(b"filename")
+11 + Path(b"filename").stat().st_atime
+12 | getatime(Path("filename"))
+13 | 
+14 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:12:1
@@ -112,16 +102,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
    | ^^^^^^^^
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-9  9  | 
-10 10 | getatime("filename")
-11 11 | getatime(b"filename")
-12    |-getatime(Path("filename"))
-   12 |+Path("filename").stat().st_atime
-13 13 | 
-14 14 | 
-15 15 | file = __file__
+9  | 
+10 | getatime("filename")
+11 | getatime(b"filename")
+   - getatime(Path("filename"))
+12 + Path("filename").stat().st_atime
+13 | 
+14 | 
+15 | file = __file__
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:17:1
@@ -134,16 +122,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 19 | os.path.getatime(filename=Path("filename"))
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-14 14 | 
-15 15 | file = __file__
-16 16 | 
-17    |-os.path.getatime(file)
-   17 |+Path(file).stat().st_atime
-18 18 | os.path.getatime(filename="filename")
-19 19 | os.path.getatime(filename=Path("filename"))
-20 20 | 
+14 | 
+15 | file = __file__
+16 | 
+   - os.path.getatime(file)
+17 + Path(file).stat().st_atime
+18 | os.path.getatime(filename="filename")
+19 | os.path.getatime(filename=Path("filename"))
+20 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:18:1
@@ -154,16 +140,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 19 | os.path.getatime(filename=Path("filename"))
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-15 15 | file = __file__
-16 16 | 
-17 17 | os.path.getatime(file)
-18    |-os.path.getatime(filename="filename")
-   18 |+Path("filename").stat().st_atime
-19 19 | os.path.getatime(filename=Path("filename"))
-20 20 | 
-21 21 | os.path.getatime(  # comment 1
+15 | file = __file__
+16 | 
+17 | os.path.getatime(file)
+   - os.path.getatime(filename="filename")
+18 + Path("filename").stat().st_atime
+19 | os.path.getatime(filename=Path("filename"))
+20 | 
+21 | os.path.getatime(  # comment 1
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:19:1
@@ -176,16 +160,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 21 | os.path.getatime(  # comment 1
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-16 16 | 
-17 17 | os.path.getatime(file)
-18 18 | os.path.getatime(filename="filename")
-19    |-os.path.getatime(filename=Path("filename"))
-   19 |+Path("filename").stat().st_atime
-20 20 | 
-21 21 | os.path.getatime(  # comment 1
-22 22 |     # comment 2
+16 | 
+17 | os.path.getatime(file)
+18 | os.path.getatime(filename="filename")
+   - os.path.getatime(filename=Path("filename"))
+19 + Path("filename").stat().st_atime
+20 | 
+21 | os.path.getatime(  # comment 1
+22 |     # comment 2
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:21:1
@@ -198,22 +180,21 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 23 |     "filename"  # comment 3
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Unsafe fix
-18 18 | os.path.getatime(filename="filename")
-19 19 | os.path.getatime(filename=Path("filename"))
-20 20 | 
-21    |-os.path.getatime(  # comment 1
-22    |-    # comment 2
-23    |-    "filename"  # comment 3
-24    |-    # comment 4
-25    |-    ,  # comment 5
-26    |-    # comment 6
-27    |-)  # comment 7
-   21 |+Path("filename").stat().st_atime  # comment 7
-28 22 | 
-29 23 | os.path.getatime("file" + "name")
-30 24 | 
+18 | os.path.getatime(filename="filename")
+19 | os.path.getatime(filename=Path("filename"))
+20 | 
+   - os.path.getatime(  # comment 1
+   -     # comment 2
+   -     "filename"  # comment 3
+   -     # comment 4
+   -     ,  # comment 5
+   -     # comment 6
+   - )  # comment 7
+21 + Path("filename").stat().st_atime  # comment 7
+22 | 
+23 | os.path.getatime("file" + "name")
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:29:1
@@ -226,16 +207,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 31 | getatime(Path("filename").resolve())
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-26 26 |     # comment 6
-27 27 | )  # comment 7
-28 28 | 
-29    |-os.path.getatime("file" + "name")
-   29 |+Path("file" + "name").stat().st_atime
-30 30 | 
-31 31 | getatime(Path("filename").resolve())
-32 32 | 
+26 |     # comment 6
+27 | )  # comment 7
+28 | 
+   - os.path.getatime("file" + "name")
+29 + Path("file" + "name").stat().st_atime
+30 | 
+31 | getatime(Path("filename").resolve())
+32 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:31:1
@@ -248,16 +227,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 33 | os.path.getatime(pathlib.Path("filename"))
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-28 28 | 
-29 29 | os.path.getatime("file" + "name")
-30 30 | 
-31    |-getatime(Path("filename").resolve())
-   31 |+Path(Path("filename").resolve()).stat().st_atime
-32 32 | 
-33 33 | os.path.getatime(pathlib.Path("filename"))
-34 34 | 
+28 | 
+29 | os.path.getatime("file" + "name")
+30 | 
+   - getatime(Path("filename").resolve())
+31 + Path(Path("filename").resolve()).stat().st_atime
+32 | 
+33 | os.path.getatime(pathlib.Path("filename"))
+34 | 
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:33:1
@@ -270,15 +247,13 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
 35 | getatime(Path("dir") / "file.txt")
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-30 30 | 
-31 31 | getatime(Path("filename").resolve())
-32 32 | 
-33    |-os.path.getatime(pathlib.Path("filename"))
-   33 |+pathlib.Path("filename").stat().st_atime
-34 34 | 
-35 35 | getatime(Path("dir") / "file.txt")
+30 | 
+31 | getatime(Path("filename").resolve())
+32 | 
+   - os.path.getatime(pathlib.Path("filename"))
+33 + pathlib.Path("filename").stat().st_atime
+34 | 
+35 | getatime(Path("dir") / "file.txt")
 
 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
   --> PTH203.py:35:1
@@ -289,10 +264,8 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime`
    | ^^^^^^^^
    |
 help: Replace with `Path.stat(...).st_atime`
-
-ℹ Safe fix
-32 32 | 
-33 33 | os.path.getatime(pathlib.Path("filename"))
-34 34 | 
-35    |-getatime(Path("dir") / "file.txt")
-   35 |+Path(Path("dir") / "file.txt").stat().st_atime
+32 | 
+33 | os.path.getatime(pathlib.Path("filename"))
+34 | 
+   - getatime(Path("dir") / "file.txt")
+35 + Path(Path("dir") / "file.txt").stat().st_atime
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap
index 023f059ab3..cb48936311 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap
@@ -10,16 +10,14 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
 8 | os.path.getmtime(Path("filename"))
   |
 help: Replace with `Path.stat(...).st_mtime`
-
-ℹ Safe fix
-3 3 | from os.path import getmtime
-4 4 | 
-5 5 | 
-6   |-os.path.getmtime("filename")
-  6 |+Path("filename").stat().st_mtime
-7 7 | os.path.getmtime(b"filename")
-8 8 | os.path.getmtime(Path("filename"))
-9 9 | 
+3 | from os.path import getmtime
+4 | 
+5 | 
+  - os.path.getmtime("filename")
+6 + Path("filename").stat().st_mtime
+7 | os.path.getmtime(b"filename")
+8 | os.path.getmtime(Path("filename"))
+9 | 
 
 PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
  --> PTH204.py:7:1
@@ -30,16 +28,14 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
 8 | os.path.getmtime(Path("filename"))
   |
 help: Replace with `Path.stat(...).st_mtime`
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | os.path.getmtime("filename")
-7   |-os.path.getmtime(b"filename")
-  7 |+Path(b"filename").stat().st_mtime
-8 8 | os.path.getmtime(Path("filename"))
-9 9 | 
-10 10 | 
+4  | 
+5  | 
+6  | os.path.getmtime("filename")
+   - os.path.getmtime(b"filename")
+7  + Path(b"filename").stat().st_mtime
+8  | os.path.getmtime(Path("filename"))
+9  | 
+10 | 
 
 PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
  --> PTH204.py:8:1
@@ -50,16 +46,14 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
   | ^^^^^^^^^^^^^^^^
   |
 help: Replace with `Path.stat(...).st_mtime`
-
-ℹ Safe fix
-5 5 | 
-6 6 | os.path.getmtime("filename")
-7 7 | os.path.getmtime(b"filename")
-8   |-os.path.getmtime(Path("filename"))
-  8 |+Path("filename").stat().st_mtime
-9 9 | 
-10 10 | 
-11 11 | getmtime("filename")
+5  | 
+6  | os.path.getmtime("filename")
+7  | os.path.getmtime(b"filename")
+   - os.path.getmtime(Path("filename"))
+8  + Path("filename").stat().st_mtime
+9  | 
+10 | 
+11 | getmtime("filename")
 
 PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
   --> PTH204.py:11:1
@@ -70,15 +64,13 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
 13 | getmtime(Path("filename"))
    |
 help: Replace with `Path.stat(...).st_mtime`
-
-ℹ Safe fix
-8  8  | os.path.getmtime(Path("filename"))
-9  9  | 
-10 10 | 
-11    |-getmtime("filename")
-   11 |+Path("filename").stat().st_mtime
-12 12 | getmtime(b"filename")
-13 13 | getmtime(Path("filename"))
+8  | os.path.getmtime(Path("filename"))
+9  | 
+10 | 
+   - getmtime("filename")
+11 + Path("filename").stat().st_mtime
+12 | getmtime(b"filename")
+13 | getmtime(Path("filename"))
 
 PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
   --> PTH204.py:12:1
@@ -89,14 +81,12 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
 13 | getmtime(Path("filename"))
    |
 help: Replace with `Path.stat(...).st_mtime`
-
-ℹ Safe fix
-9  9  | 
-10 10 | 
-11 11 | getmtime("filename")
-12    |-getmtime(b"filename")
-   12 |+Path(b"filename").stat().st_mtime
-13 13 | getmtime(Path("filename"))
+9  | 
+10 | 
+11 | getmtime("filename")
+   - getmtime(b"filename")
+12 + Path(b"filename").stat().st_mtime
+13 | getmtime(Path("filename"))
 
 PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
   --> PTH204.py:13:1
@@ -107,10 +97,8 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime`
    | ^^^^^^^^
    |
 help: Replace with `Path.stat(...).st_mtime`
-
-ℹ Safe fix
-10 10 | 
-11 11 | getmtime("filename")
-12 12 | getmtime(b"filename")
-13    |-getmtime(Path("filename"))
-   13 |+Path("filename").stat().st_mtime
+10 | 
+11 | getmtime("filename")
+12 | getmtime(b"filename")
+   - getmtime(Path("filename"))
+13 + Path("filename").stat().st_mtime
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap
index 858f75f1ed..c15f941c5e 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap
@@ -10,16 +10,14 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
 8 | os.path.getctime(Path("filename"))
   |
 help: Replace with `Path.stat(...).st_ctime`
-
-ℹ Safe fix
-3 3 | from os.path import getctime
-4 4 | 
-5 5 | 
-6   |-os.path.getctime("filename")
-  6 |+Path("filename").stat().st_ctime
-7 7 | os.path.getctime(b"filename")
-8 8 | os.path.getctime(Path("filename"))
-9 9 | 
+3 | from os.path import getctime
+4 | 
+5 | 
+  - os.path.getctime("filename")
+6 + Path("filename").stat().st_ctime
+7 | os.path.getctime(b"filename")
+8 | os.path.getctime(Path("filename"))
+9 | 
 
 PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
  --> PTH205.py:7:1
@@ -30,16 +28,14 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
 8 | os.path.getctime(Path("filename"))
   |
 help: Replace with `Path.stat(...).st_ctime`
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | os.path.getctime("filename")
-7   |-os.path.getctime(b"filename")
-  7 |+Path(b"filename").stat().st_ctime
-8 8 | os.path.getctime(Path("filename"))
-9 9 | 
-10 10 | getctime("filename")
+4  | 
+5  | 
+6  | os.path.getctime("filename")
+   - os.path.getctime(b"filename")
+7  + Path(b"filename").stat().st_ctime
+8  | os.path.getctime(Path("filename"))
+9  | 
+10 | getctime("filename")
 
 PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
   --> PTH205.py:8:1
@@ -52,16 +48,14 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
 10 | getctime("filename")
    |
 help: Replace with `Path.stat(...).st_ctime`
-
-ℹ Safe fix
-5 5 | 
-6 6 | os.path.getctime("filename")
-7 7 | os.path.getctime(b"filename")
-8   |-os.path.getctime(Path("filename"))
-  8 |+Path("filename").stat().st_ctime
-9 9 | 
-10 10 | getctime("filename")
-11 11 | getctime(b"filename")
+5  | 
+6  | os.path.getctime("filename")
+7  | os.path.getctime(b"filename")
+   - os.path.getctime(Path("filename"))
+8  + Path("filename").stat().st_ctime
+9  | 
+10 | getctime("filename")
+11 | getctime(b"filename")
 
 PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
   --> PTH205.py:10:1
@@ -74,15 +68,13 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
 12 | getctime(Path("filename"))
    |
 help: Replace with `Path.stat(...).st_ctime`
-
-ℹ Safe fix
-7  7  | os.path.getctime(b"filename")
-8  8  | os.path.getctime(Path("filename"))
-9  9  | 
-10    |-getctime("filename")
-   10 |+Path("filename").stat().st_ctime
-11 11 | getctime(b"filename")
-12 12 | getctime(Path("filename"))
+7  | os.path.getctime(b"filename")
+8  | os.path.getctime(Path("filename"))
+9  | 
+   - getctime("filename")
+10 + Path("filename").stat().st_ctime
+11 | getctime(b"filename")
+12 | getctime(Path("filename"))
 
 PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
   --> PTH205.py:11:1
@@ -93,14 +85,12 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
 12 | getctime(Path("filename"))
    |
 help: Replace with `Path.stat(...).st_ctime`
-
-ℹ Safe fix
-8  8  | os.path.getctime(Path("filename"))
-9  9  | 
-10 10 | getctime("filename")
-11    |-getctime(b"filename")
-   11 |+Path(b"filename").stat().st_ctime
-12 12 | getctime(Path("filename"))
+8  | os.path.getctime(Path("filename"))
+9  | 
+10 | getctime("filename")
+   - getctime(b"filename")
+11 + Path(b"filename").stat().st_ctime
+12 | getctime(Path("filename"))
 
 PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
   --> PTH205.py:12:1
@@ -111,10 +101,8 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime`
    | ^^^^^^^^
    |
 help: Replace with `Path.stat(...).st_ctime`
-
-ℹ Safe fix
-9  9  | 
-10 10 | getctime("filename")
-11 11 | getctime(b"filename")
-12    |-getctime(Path("filename"))
-   12 |+Path("filename").stat().st_ctime
+9  | 
+10 | getctime("filename")
+11 | getctime(b"filename")
+   - getctime(Path("filename"))
+12 + Path("filename").stat().st_ctime
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap
index 8ed5325600..7292a3b5d2 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap
@@ -12,20 +12,19 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()`
 9 | aaa = os.mkdir(p)
   |
 help: Replace with `Path(...).resolve()`
-
-ℹ Safe fix
-1 1 | import os
-2 2 | import os.path
-  3 |+import pathlib
-3 4 | 
-4 5 | p = "/foo"
-5 6 | q = "bar"
-6 7 | 
-7   |-a = os.path.abspath(p)
-  8 |+a = pathlib.Path(p).resolve()
-8 9 | aa = os.chmod(p)
-9 10 | aaa = os.mkdir(p)
-10 11 | os.makedirs(p)
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+7  | 
+   - a = os.path.abspath(p)
+8  + a = pathlib.Path(p).resolve()
+9  | aa = os.chmod(p)
+10 | aaa = os.mkdir(p)
+11 | os.makedirs(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH101 `os.chmod()` should be replaced by `Path.chmod()`
   --> full_name.py:8:6
@@ -49,22 +48,20 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
 11 | os.rename(p)
    |
 help: Replace with `Path(...).mkdir()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
-6  7  | 
-7  8  | a = os.path.abspath(p)
-8  9  | aa = os.chmod(p)
-9     |-aaa = os.mkdir(p)
-   10 |+aaa = pathlib.Path(p).mkdir()
-10 11 | os.makedirs(p)
-11 12 | os.rename(p)
-12 13 | os.replace(p)
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+7  | 
+8  | a = os.path.abspath(p)
+9  | aa = os.chmod(p)
+   - aaa = os.mkdir(p)
+10 + aaa = pathlib.Path(p).mkdir()
+11 | os.makedirs(p)
+12 | os.rename(p)
+13 | os.replace(p)
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
   --> full_name.py:10:1
@@ -77,23 +74,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 12 | os.replace(p)
    |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-7  8  | a = os.path.abspath(p)
-8  9  | aa = os.chmod(p)
-9  10 | aaa = os.mkdir(p)
-10    |-os.makedirs(p)
-   11 |+pathlib.Path(p).mkdir(parents=True)
-11 12 | os.rename(p)
-12 13 | os.replace(p)
-13 14 | os.rmdir(p)
+8  | a = os.path.abspath(p)
+9  | aa = os.chmod(p)
+10 | aaa = os.mkdir(p)
+   - os.makedirs(p)
+11 + pathlib.Path(p).mkdir(parents=True)
+12 | os.rename(p)
+13 | os.replace(p)
+14 | os.rmdir(p)
 
 PTH104 `os.rename()` should be replaced by `Path.rename()`
   --> full_name.py:11:1
@@ -130,23 +125,21 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()`
 15 | os.unlink(p)
    |
 help: Replace with `Path(...).rmdir()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-10 11 | os.makedirs(p)
-11 12 | os.rename(p)
-12 13 | os.replace(p)
-13    |-os.rmdir(p)
-   14 |+pathlib.Path(p).rmdir()
-14 15 | os.remove(p)
-15 16 | os.unlink(p)
-16 17 | os.getcwd(p)
+11 | os.makedirs(p)
+12 | os.rename(p)
+13 | os.replace(p)
+   - os.rmdir(p)
+14 + pathlib.Path(p).rmdir()
+15 | os.remove(p)
+16 | os.unlink(p)
+17 | os.getcwd(p)
 
 PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
   --> full_name.py:14:1
@@ -159,23 +152,21 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
 16 | os.getcwd(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-11 12 | os.rename(p)
-12 13 | os.replace(p)
-13 14 | os.rmdir(p)
-14    |-os.remove(p)
-   15 |+pathlib.Path(p).unlink()
-15 16 | os.unlink(p)
-16 17 | os.getcwd(p)
-17 18 | b = os.path.exists(p)
+12 | os.rename(p)
+13 | os.replace(p)
+14 | os.rmdir(p)
+   - os.remove(p)
+15 + pathlib.Path(p).unlink()
+16 | os.unlink(p)
+17 | os.getcwd(p)
+18 | b = os.path.exists(p)
 
 PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
   --> full_name.py:15:1
@@ -188,23 +179,21 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
 17 | b = os.path.exists(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-12 13 | os.replace(p)
-13 14 | os.rmdir(p)
-14 15 | os.remove(p)
-15    |-os.unlink(p)
-   16 |+pathlib.Path(p).unlink()
-16 17 | os.getcwd(p)
-17 18 | b = os.path.exists(p)
-18 19 | bb = os.path.expanduser(p)
+13 | os.replace(p)
+14 | os.rmdir(p)
+15 | os.remove(p)
+   - os.unlink(p)
+16 + pathlib.Path(p).unlink()
+17 | os.getcwd(p)
+18 | b = os.path.exists(p)
+19 | bb = os.path.expanduser(p)
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
   --> full_name.py:16:1
@@ -229,23 +218,21 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()`
 19 | bbb = os.path.isdir(p)
    |
 help: Replace with `Path(...).exists()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-14 15 | os.remove(p)
-15 16 | os.unlink(p)
-16 17 | os.getcwd(p)
-17    |-b = os.path.exists(p)
-   18 |+b = pathlib.Path(p).exists()
-18 19 | bb = os.path.expanduser(p)
-19 20 | bbb = os.path.isdir(p)
-20 21 | bbbb = os.path.isfile(p)
+15 | os.remove(p)
+16 | os.unlink(p)
+17 | os.getcwd(p)
+   - b = os.path.exists(p)
+18 + b = pathlib.Path(p).exists()
+19 | bb = os.path.expanduser(p)
+20 | bbb = os.path.isdir(p)
+21 | bbbb = os.path.isfile(p)
 
 PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
   --> full_name.py:18:6
@@ -258,23 +245,22 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
 20 | bbbb = os.path.isfile(p)
    |
 help: Replace with `Path(...).expanduser()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-15 16 | os.unlink(p)
-16 17 | os.getcwd(p)
-17 18 | b = os.path.exists(p)
-18    |-bb = os.path.expanduser(p)
-   19 |+bb = pathlib.Path(p).expanduser()
-19 20 | bbb = os.path.isdir(p)
-20 21 | bbbb = os.path.isfile(p)
-21 22 | bbbbb = os.path.islink(p)
+16 | os.unlink(p)
+17 | os.getcwd(p)
+18 | b = os.path.exists(p)
+   - bb = os.path.expanduser(p)
+19 + bb = pathlib.Path(p).expanduser()
+20 | bbb = os.path.isdir(p)
+21 | bbbb = os.path.isfile(p)
+22 | bbbbb = os.path.islink(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
   --> full_name.py:19:7
@@ -287,23 +273,21 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
 21 | bbbbb = os.path.islink(p)
    |
 help: Replace with `Path(...).is_dir()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-16 17 | os.getcwd(p)
-17 18 | b = os.path.exists(p)
-18 19 | bb = os.path.expanduser(p)
-19    |-bbb = os.path.isdir(p)
-   20 |+bbb = pathlib.Path(p).is_dir()
-20 21 | bbbb = os.path.isfile(p)
-21 22 | bbbbb = os.path.islink(p)
-22 23 | os.readlink(p)
+17 | os.getcwd(p)
+18 | b = os.path.exists(p)
+19 | bb = os.path.expanduser(p)
+   - bbb = os.path.isdir(p)
+20 + bbb = pathlib.Path(p).is_dir()
+21 | bbbb = os.path.isfile(p)
+22 | bbbbb = os.path.islink(p)
+23 | os.readlink(p)
 
 PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
   --> full_name.py:20:8
@@ -316,23 +300,21 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
 22 | os.readlink(p)
    |
 help: Replace with `Path(...).is_file()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-17 18 | b = os.path.exists(p)
-18 19 | bb = os.path.expanduser(p)
-19 20 | bbb = os.path.isdir(p)
-20    |-bbbb = os.path.isfile(p)
-   21 |+bbbb = pathlib.Path(p).is_file()
-21 22 | bbbbb = os.path.islink(p)
-22 23 | os.readlink(p)
-23 24 | os.stat(p)
+18 | b = os.path.exists(p)
+19 | bb = os.path.expanduser(p)
+20 | bbb = os.path.isdir(p)
+   - bbbb = os.path.isfile(p)
+21 + bbbb = pathlib.Path(p).is_file()
+22 | bbbbb = os.path.islink(p)
+23 | os.readlink(p)
+24 | os.stat(p)
 
 PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
   --> full_name.py:21:9
@@ -345,23 +327,21 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
 23 | os.stat(p)
    |
 help: Replace with `Path(...).is_symlink()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-18 19 | bb = os.path.expanduser(p)
-19 20 | bbb = os.path.isdir(p)
-20 21 | bbbb = os.path.isfile(p)
-21    |-bbbbb = os.path.islink(p)
-   22 |+bbbbb = pathlib.Path(p).is_symlink()
-22 23 | os.readlink(p)
-23 24 | os.stat(p)
-24 25 | os.path.isabs(p)
+19 | bb = os.path.expanduser(p)
+20 | bbb = os.path.isdir(p)
+21 | bbbb = os.path.isfile(p)
+   - bbbbb = os.path.islink(p)
+22 + bbbbb = pathlib.Path(p).is_symlink()
+23 | os.readlink(p)
+24 | os.stat(p)
+25 | os.path.isabs(p)
 
 PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
   --> full_name.py:22:1
@@ -374,23 +354,21 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
 24 | os.path.isabs(p)
    |
 help: Replace with `Path(...).readlink()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-19 20 | bbb = os.path.isdir(p)
-20 21 | bbbb = os.path.isfile(p)
-21 22 | bbbbb = os.path.islink(p)
-22    |-os.readlink(p)
-   23 |+pathlib.Path(p).readlink()
-23 24 | os.stat(p)
-24 25 | os.path.isabs(p)
-25 26 | os.path.join(p, q)
+20 | bbb = os.path.isdir(p)
+21 | bbbb = os.path.isfile(p)
+22 | bbbbb = os.path.islink(p)
+   - os.readlink(p)
+23 + pathlib.Path(p).readlink()
+24 | os.stat(p)
+25 | os.path.isabs(p)
+26 | os.path.join(p, q)
 
 PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()`
   --> full_name.py:23:1
@@ -414,23 +392,21 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()`
 26 | os.sep.join([p, q])
    |
 help: Replace with `Path(...).is_absolute()`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-21 22 | bbbbb = os.path.islink(p)
-22 23 | os.readlink(p)
-23 24 | os.stat(p)
-24    |-os.path.isabs(p)
-   25 |+pathlib.Path(p).is_absolute()
-25 26 | os.path.join(p, q)
-26 27 | os.sep.join([p, q])
-27 28 | os.sep.join((p, q))
+22 | bbbbb = os.path.islink(p)
+23 | os.readlink(p)
+24 | os.stat(p)
+   - os.path.isabs(p)
+25 + pathlib.Path(p).is_absolute()
+26 | os.path.join(p, q)
+27 | os.sep.join([p, q])
+28 | os.sep.join((p, q))
 
 PTH118 `os.path.join()` should be replaced by `Path` with `/` operator
   --> full_name.py:25:1
@@ -476,23 +452,22 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name`
 30 | os.path.samefile(p)
    |
 help: Replace with `Path(...).name`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-25 26 | os.path.join(p, q)
-26 27 | os.sep.join([p, q])
-27 28 | os.sep.join((p, q))
-28    |-os.path.basename(p)
-   29 |+pathlib.Path(p).name
-29 30 | os.path.dirname(p)
-30 31 | os.path.samefile(p)
-31 32 | os.path.splitext(p)
+26 | os.path.join(p, q)
+27 | os.sep.join([p, q])
+28 | os.sep.join((p, q))
+   - os.path.basename(p)
+29 + pathlib.Path(p).name
+30 | os.path.dirname(p)
+31 | os.path.samefile(p)
+32 | os.path.splitext(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
   --> full_name.py:29:1
@@ -505,23 +480,22 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
 31 | os.path.splitext(p)
    |
 help: Replace with `Path(...).parent`
-
-ℹ Safe fix
-1  1  | import os
-2  2  | import os.path
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-26 27 | os.sep.join([p, q])
-27 28 | os.sep.join((p, q))
-28 29 | os.path.basename(p)
-29    |-os.path.dirname(p)
-   30 |+pathlib.Path(p).parent
-30 31 | os.path.samefile(p)
-31 32 | os.path.splitext(p)
-32 33 | with open(p) as fp:
+27 | os.sep.join([p, q])
+28 | os.sep.join((p, q))
+29 | os.path.basename(p)
+   - os.path.dirname(p)
+30 + pathlib.Path(p).parent
+31 | os.path.samefile(p)
+32 | os.path.splitext(p)
+33 | with open(p) as fp:
+note: This is an unsafe fix and may change runtime behavior
 
 PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
   --> full_name.py:30:1
@@ -546,7 +520,7 @@ PTH122 `os.path.splitext()` should be replaced by `Path.suffix`, `Path.stem`, an
 33 |     fp.read()
    |
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:32:6
    |
 30 | os.path.samefile(p)
@@ -556,8 +530,24 @@ PTH123 `open()` should be replaced by `Path.open()`
 33 |     fp.read()
 34 | open(p).close()
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+30 | os.path.dirname(p)
+31 | os.path.samefile(p)
+32 | os.path.splitext(p)
+   - with open(p) as fp:
+33 + with pathlib.Path(p).open() as fp:
+34 |     fp.read()
+35 | open(p).close()
+36 | os.getcwdb(p)
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:34:1
    |
 32 | with open(p) as fp:
@@ -567,6 +557,22 @@ PTH123 `open()` should be replaced by `Path.open()`
 35 | os.getcwdb(p)
 36 | os.path.join(p, *q)
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+32 | os.path.splitext(p)
+33 | with open(p) as fp:
+34 |     fp.read()
+   - open(p).close()
+35 + pathlib.Path(p).open().close()
+36 | os.getcwdb(p)
+37 | os.path.join(p, *q)
+38 | os.sep.join(p, *q)
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
   --> full_name.py:35:1
@@ -601,7 +607,7 @@ PTH118 `os.sep.join()` should be replaced by `Path.joinpath()`
 39 | # https://github.com/astral-sh/ruff/issues/7620
    |
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:46:1
    |
 44 | open(p, closefd=False)
@@ -611,8 +617,24 @@ PTH123 `open()` should be replaced by `Path.open()`
 47 | open(p, 'r', - 1, None, None, None, True, None)
 48 | open(p, 'r', - 1, None, None, None, False, opener)
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+44 | 
+45 | open(p, closefd=False)
+46 | open(p, opener=opener)
+   - open(p, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+47 + pathlib.Path(p).open(mode='r', buffering=-1, encoding=None, errors=None, newline=None)
+48 | open(p, 'r', - 1, None, None, None, True, None)
+49 | open(p, 'r', - 1, None, None, None, False, opener)
+50 | 
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:47:1
    |
 45 | open(p, opener=opener)
@@ -621,8 +643,24 @@ PTH123 `open()` should be replaced by `Path.open()`
    | ^^^^
 48 | open(p, 'r', - 1, None, None, None, False, opener)
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+45 | open(p, closefd=False)
+46 | open(p, opener=opener)
+47 | open(p, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+   - open(p, 'r', - 1, None, None, None, True, None)
+48 + pathlib.Path(p).open('r', - 1, None, None, None)
+49 | open(p, 'r', - 1, None, None, None, False, opener)
+50 | 
+51 | # Cannot be upgraded `pathlib.Open` does not support fds
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:65:1
    |
 63 | open(f())
@@ -632,8 +670,24 @@ PTH123 `open()` should be replaced by `Path.open()`
 66 | byte_str = b"bar"
 67 | open(byte_str)
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+63 |     return 1
+64 | open(f())
+65 | 
+   - open(b"foo")
+66 + pathlib.Path(b"foo").open()
+67 | byte_str = b"bar"
+68 | open(byte_str)
+69 | 
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:67:1
    |
 65 | open(b"foo")
@@ -643,8 +697,24 @@ PTH123 `open()` should be replaced by `Path.open()`
 68 |
 69 | def bytes_str_func() -> bytes:
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+65 | 
+66 | open(b"foo")
+67 | byte_str = b"bar"
+   - open(byte_str)
+68 + pathlib.Path(byte_str).open()
+69 | 
+70 | def bytes_str_func() -> bytes:
+71 |     return b"foo"
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> full_name.py:71:1
    |
 69 | def bytes_str_func() -> bytes:
@@ -654,6 +724,22 @@ PTH123 `open()` should be replaced by `Path.open()`
 72 |
 73 | # https://github.com/astral-sh/ruff/issues/17693
    |
+help: Replace with `Path.open()`
+1  | import os
+2  | import os.path
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+--------------------------------------------------------------------------------
+69 | 
+70 | def bytes_str_func() -> bytes:
+71 |     return b"foo"
+   - open(bytes_str_func())
+72 + pathlib.Path(bytes_str_func()).open()
+73 | 
+74 | # https://github.com/astral-sh/ruff/issues/17693
+75 | os.stat(1)
 
 PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
    --> full_name.py:108:1
@@ -665,23 +751,21 @@ PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
 109 | os.getcwdb()
     |
 help: Replace with `Path.cwd()`
-
-ℹ Safe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-105 106 | os.replace("src", "dst", src_dir_fd=1)
-106 107 | os.replace("src", "dst", dst_dir_fd=2)
-107 108 | 
-108     |-os.getcwd()
-    109 |+pathlib.Path.cwd()
-109 110 | os.getcwdb()
-110 111 | 
-111 112 | os.mkdir(path="directory")
+106 | os.replace("src", "dst", src_dir_fd=1)
+107 | os.replace("src", "dst", dst_dir_fd=2)
+108 | 
+    - os.getcwd()
+109 + pathlib.Path.cwd()
+110 | os.getcwdb()
+111 | 
+112 | os.mkdir(path="directory")
 
 PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
    --> full_name.py:109:1
@@ -693,23 +777,21 @@ PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
 111 | os.mkdir(path="directory")
     |
 help: Replace with `Path.cwd()`
-
-ℹ Safe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-106 107 | os.replace("src", "dst", dst_dir_fd=2)
-107 108 | 
-108 109 | os.getcwd()
-109     |-os.getcwdb()
-    110 |+pathlib.Path.cwd()
-110 111 | 
-111 112 | os.mkdir(path="directory")
-112 113 | 
+107 | os.replace("src", "dst", dst_dir_fd=2)
+108 | 
+109 | os.getcwd()
+    - os.getcwdb()
+110 + pathlib.Path.cwd()
+111 | 
+112 | os.mkdir(path="directory")
+113 | 
 
 PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
    --> full_name.py:111:1
@@ -722,23 +804,21 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
 113 | os.mkdir(
     |
 help: Replace with `Path(...).mkdir()`
-
-ℹ Safe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-108 109 | os.getcwd()
-109 110 | os.getcwdb()
-110 111 | 
-111     |-os.mkdir(path="directory")
-    112 |+pathlib.Path("directory").mkdir()
-112 113 | 
-113 114 | os.mkdir(
-114 115 |     # comment 1
+109 | os.getcwd()
+110 | os.getcwdb()
+111 | 
+    - os.mkdir(path="directory")
+112 + pathlib.Path("directory").mkdir()
+113 | 
+114 | os.mkdir(
+115 |     # comment 1
 
 PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
    --> full_name.py:113:1
@@ -751,27 +831,26 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
 115 |     "directory",
     |
 help: Replace with `Path(...).mkdir()`
-
-ℹ Unsafe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-110 111 | 
-111 112 | os.mkdir(path="directory")
-112 113 | 
-113     |-os.mkdir(
-114     |-    # comment 1
-115     |-    "directory",
-116     |-    mode=0o777
-117     |-)
-    114 |+pathlib.Path("directory").mkdir(mode=0o777)
-118 115 | 
-119 116 | os.mkdir("directory", mode=0o777, dir_fd=1)
-120 117 | 
+111 | 
+112 | os.mkdir(path="directory")
+113 | 
+    - os.mkdir(
+    -     # comment 1
+    -     "directory",
+    -     mode=0o777
+    - )
+114 + pathlib.Path("directory").mkdir(mode=0o777)
+115 | 
+116 | os.mkdir("directory", mode=0o777, dir_fd=1)
+117 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
    --> full_name.py:121:1
@@ -784,23 +863,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 123 | os.makedirs("name", 0o777, False)
     |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-118 119 | 
-119 120 | os.mkdir("directory", mode=0o777, dir_fd=1)
-120 121 | 
-121     |-os.makedirs("name", 0o777, exist_ok=False)
-    122 |+pathlib.Path("name").mkdir(0o777, exist_ok=False, parents=True)
-122 123 | 
-123 124 | os.makedirs("name", 0o777, False)
-124 125 | 
+119 | 
+120 | os.mkdir("directory", mode=0o777, dir_fd=1)
+121 | 
+    - os.makedirs("name", 0o777, exist_ok=False)
+122 + pathlib.Path("name").mkdir(0o777, exist_ok=False, parents=True)
+123 | 
+124 | os.makedirs("name", 0o777, False)
+125 | 
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
    --> full_name.py:123:1
@@ -813,23 +890,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 125 | os.makedirs(name="name", mode=0o777, exist_ok=False)
     |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-120 121 | 
-121 122 | os.makedirs("name", 0o777, exist_ok=False)
-122 123 | 
-123     |-os.makedirs("name", 0o777, False)
-    124 |+pathlib.Path("name").mkdir(0o777, True, False)
-124 125 | 
-125 126 | os.makedirs(name="name", mode=0o777, exist_ok=False)
-126 127 | 
+121 | 
+122 | os.makedirs("name", 0o777, exist_ok=False)
+123 | 
+    - os.makedirs("name", 0o777, False)
+124 + pathlib.Path("name").mkdir(0o777, True, False)
+125 | 
+126 | os.makedirs(name="name", mode=0o777, exist_ok=False)
+127 | 
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
    --> full_name.py:125:1
@@ -842,22 +917,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 127 | os.makedirs("name", unknown_kwarg=True)
     |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-1   1   | import os
-2   2   | import os.path
-    3   |+import pathlib
-3   4   | 
-4   5   | p = "/foo"
-5   6   | q = "bar"
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
 --------------------------------------------------------------------------------
-122 123 | 
-123 124 | os.makedirs("name", 0o777, False)
-124 125 | 
-125     |-os.makedirs(name="name", mode=0o777, exist_ok=False)
-    126 |+pathlib.Path("name").mkdir(mode=0o777, exist_ok=False, parents=True)
-126 127 | 
-127 128 | os.makedirs("name", unknown_kwarg=True)
+123 | 
+124 | os.makedirs("name", 0o777, False)
+125 | 
+    - os.makedirs(name="name", mode=0o777, exist_ok=False)
+126 + pathlib.Path("name").mkdir(mode=0o777, exist_ok=False, parents=True)
+127 | 
+128 | os.makedirs("name", unknown_kwarg=True)
+129 | 
 
 PTH103 `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
    --> full_name.py:127:1
@@ -866,5 +940,102 @@ PTH103 `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 126 |
 127 | os.makedirs("name", unknown_kwarg=True)
     | ^^^^^^^^^^^
+128 |
+129 | # https://github.com/astral-sh/ruff/issues/20134
     |
 help: Replace with `Path(...).mkdir(parents=True)`
+
+PTH101 [*] `os.chmod()` should be replaced by `Path.chmod()`
+   --> full_name.py:130:1
+    |
+129 | # https://github.com/astral-sh/ruff/issues/20134
+130 | os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+    | ^^^^^^^^
+131 | os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+    |
+help: Replace with `Path(...).chmod(...)`
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
+--------------------------------------------------------------------------------
+128 | os.makedirs("name", unknown_kwarg=True)
+129 | 
+130 | # https://github.com/astral-sh/ruff/issues/20134
+    - os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+131 + pathlib.Path("pth1_link").chmod(mode=0o600, follow_symlinks=      False)
+132 | os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+133 | 
+134 | # Only diagnostic
+
+PTH101 [*] `os.chmod()` should be replaced by `Path.chmod()`
+   --> full_name.py:131:1
+    |
+129 | # https://github.com/astral-sh/ruff/issues/20134
+130 | os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+131 | os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+    | ^^^^^^^^
+132 |
+133 | # Only diagnostic
+    |
+help: Replace with `Path(...).chmod(...)`
+1   | import os
+2   | import os.path
+3   + import pathlib
+4   | 
+5   | p = "/foo"
+6   | q = "bar"
+--------------------------------------------------------------------------------
+129 | 
+130 | # https://github.com/astral-sh/ruff/issues/20134
+131 | os.chmod("pth1_link", mode=0o600, follow_symlinks=      False    )
+    - os.chmod("pth1_link", mode=0o600, follow_symlinks=True)
+132 + pathlib.Path("pth1_link").chmod(mode=0o600, follow_symlinks=True)
+133 | 
+134 | # Only diagnostic
+135 | os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
+
+PTH101 `os.chmod()` should be replaced by `Path.chmod()`
+   --> full_name.py:134:1
+    |
+133 | # Only diagnostic
+134 | os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^
+135 |
+136 | os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+    |
+help: Replace with `Path(...).chmod(...)`
+
+PTH104 `os.rename()` should be replaced by `Path.rename()`
+   --> full_name.py:136:1
+    |
+134 | os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
+135 |
+136 | os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^^
+137 | os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+    |
+help: Replace with `Path(...).rename(...)`
+
+PTH105 `os.replace()` should be replaced by `Path.replace()`
+   --> full_name.py:137:1
+    |
+136 | os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
+137 | os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^^^
+138 |
+139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
+    |
+help: Replace with `Path(...).replace(...)`
+
+PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
+   --> full_name.py:139:1
+    |
+137 | os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
+138 |
+139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
+    | ^^^^^^^^^^^^^^^^
+    |
+help: Replace with `Path(...).samefile()`
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap
index 167f4ecd2c..de63cbde9d 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap
@@ -12,20 +12,19 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()`
 9 | aaa = foo.mkdir(p)
   |
 help: Replace with `Path(...).resolve()`
-
-ℹ Safe fix
-1 1 | import os as foo
-2 2 | import os.path as foo_p
-  3 |+import pathlib
-3 4 | 
-4 5 | p = "/foo"
-5 6 | q = "bar"
-6 7 | 
-7   |-a = foo_p.abspath(p)
-  8 |+a = pathlib.Path(p).resolve()
-8 9 | aa = foo.chmod(p)
-9 10 | aaa = foo.mkdir(p)
-10 11 | foo.makedirs(p)
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+7  | 
+   - a = foo_p.abspath(p)
+8  + a = pathlib.Path(p).resolve()
+9  | aa = foo.chmod(p)
+10 | aaa = foo.mkdir(p)
+11 | foo.makedirs(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH101 `os.chmod()` should be replaced by `Path.chmod()`
   --> import_as.py:8:6
@@ -49,22 +48,20 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
 11 | foo.rename(p)
    |
 help: Replace with `Path(...).mkdir()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
-6  7  | 
-7  8  | a = foo_p.abspath(p)
-8  9  | aa = foo.chmod(p)
-9     |-aaa = foo.mkdir(p)
-   10 |+aaa = pathlib.Path(p).mkdir()
-10 11 | foo.makedirs(p)
-11 12 | foo.rename(p)
-12 13 | foo.replace(p)
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
+7  | 
+8  | a = foo_p.abspath(p)
+9  | aa = foo.chmod(p)
+   - aaa = foo.mkdir(p)
+10 + aaa = pathlib.Path(p).mkdir()
+11 | foo.makedirs(p)
+12 | foo.rename(p)
+13 | foo.replace(p)
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
   --> import_as.py:10:1
@@ -77,23 +74,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 12 | foo.replace(p)
    |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-7  8  | a = foo_p.abspath(p)
-8  9  | aa = foo.chmod(p)
-9  10 | aaa = foo.mkdir(p)
-10    |-foo.makedirs(p)
-   11 |+pathlib.Path(p).mkdir(parents=True)
-11 12 | foo.rename(p)
-12 13 | foo.replace(p)
-13 14 | foo.rmdir(p)
+8  | a = foo_p.abspath(p)
+9  | aa = foo.chmod(p)
+10 | aaa = foo.mkdir(p)
+   - foo.makedirs(p)
+11 + pathlib.Path(p).mkdir(parents=True)
+12 | foo.rename(p)
+13 | foo.replace(p)
+14 | foo.rmdir(p)
 
 PTH104 `os.rename()` should be replaced by `Path.rename()`
   --> import_as.py:11:1
@@ -130,23 +125,21 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()`
 15 | foo.unlink(p)
    |
 help: Replace with `Path(...).rmdir()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-10 11 | foo.makedirs(p)
-11 12 | foo.rename(p)
-12 13 | foo.replace(p)
-13    |-foo.rmdir(p)
-   14 |+pathlib.Path(p).rmdir()
-14 15 | foo.remove(p)
-15 16 | foo.unlink(p)
-16 17 | foo.getcwd(p)
+11 | foo.makedirs(p)
+12 | foo.rename(p)
+13 | foo.replace(p)
+   - foo.rmdir(p)
+14 + pathlib.Path(p).rmdir()
+15 | foo.remove(p)
+16 | foo.unlink(p)
+17 | foo.getcwd(p)
 
 PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
   --> import_as.py:14:1
@@ -159,23 +152,21 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
 16 | foo.getcwd(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-11 12 | foo.rename(p)
-12 13 | foo.replace(p)
-13 14 | foo.rmdir(p)
-14    |-foo.remove(p)
-   15 |+pathlib.Path(p).unlink()
-15 16 | foo.unlink(p)
-16 17 | foo.getcwd(p)
-17 18 | b = foo_p.exists(p)
+12 | foo.rename(p)
+13 | foo.replace(p)
+14 | foo.rmdir(p)
+   - foo.remove(p)
+15 + pathlib.Path(p).unlink()
+16 | foo.unlink(p)
+17 | foo.getcwd(p)
+18 | b = foo_p.exists(p)
 
 PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
   --> import_as.py:15:1
@@ -188,23 +179,21 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
 17 | b = foo_p.exists(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-12 13 | foo.replace(p)
-13 14 | foo.rmdir(p)
-14 15 | foo.remove(p)
-15    |-foo.unlink(p)
-   16 |+pathlib.Path(p).unlink()
-16 17 | foo.getcwd(p)
-17 18 | b = foo_p.exists(p)
-18 19 | bb = foo_p.expanduser(p)
+13 | foo.replace(p)
+14 | foo.rmdir(p)
+15 | foo.remove(p)
+   - foo.unlink(p)
+16 + pathlib.Path(p).unlink()
+17 | foo.getcwd(p)
+18 | b = foo_p.exists(p)
+19 | bb = foo_p.expanduser(p)
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
   --> import_as.py:16:1
@@ -229,23 +218,21 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()`
 19 | bbb = foo_p.isdir(p)
    |
 help: Replace with `Path(...).exists()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-14 15 | foo.remove(p)
-15 16 | foo.unlink(p)
-16 17 | foo.getcwd(p)
-17    |-b = foo_p.exists(p)
-   18 |+b = pathlib.Path(p).exists()
-18 19 | bb = foo_p.expanduser(p)
-19 20 | bbb = foo_p.isdir(p)
-20 21 | bbbb = foo_p.isfile(p)
+15 | foo.remove(p)
+16 | foo.unlink(p)
+17 | foo.getcwd(p)
+   - b = foo_p.exists(p)
+18 + b = pathlib.Path(p).exists()
+19 | bb = foo_p.expanduser(p)
+20 | bbb = foo_p.isdir(p)
+21 | bbbb = foo_p.isfile(p)
 
 PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
   --> import_as.py:18:6
@@ -258,23 +245,22 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
 20 | bbbb = foo_p.isfile(p)
    |
 help: Replace with `Path(...).expanduser()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-15 16 | foo.unlink(p)
-16 17 | foo.getcwd(p)
-17 18 | b = foo_p.exists(p)
-18    |-bb = foo_p.expanduser(p)
-   19 |+bb = pathlib.Path(p).expanduser()
-19 20 | bbb = foo_p.isdir(p)
-20 21 | bbbb = foo_p.isfile(p)
-21 22 | bbbbb = foo_p.islink(p)
+16 | foo.unlink(p)
+17 | foo.getcwd(p)
+18 | b = foo_p.exists(p)
+   - bb = foo_p.expanduser(p)
+19 + bb = pathlib.Path(p).expanduser()
+20 | bbb = foo_p.isdir(p)
+21 | bbbb = foo_p.isfile(p)
+22 | bbbbb = foo_p.islink(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
   --> import_as.py:19:7
@@ -287,23 +273,21 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
 21 | bbbbb = foo_p.islink(p)
    |
 help: Replace with `Path(...).is_dir()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-16 17 | foo.getcwd(p)
-17 18 | b = foo_p.exists(p)
-18 19 | bb = foo_p.expanduser(p)
-19    |-bbb = foo_p.isdir(p)
-   20 |+bbb = pathlib.Path(p).is_dir()
-20 21 | bbbb = foo_p.isfile(p)
-21 22 | bbbbb = foo_p.islink(p)
-22 23 | foo.readlink(p)
+17 | foo.getcwd(p)
+18 | b = foo_p.exists(p)
+19 | bb = foo_p.expanduser(p)
+   - bbb = foo_p.isdir(p)
+20 + bbb = pathlib.Path(p).is_dir()
+21 | bbbb = foo_p.isfile(p)
+22 | bbbbb = foo_p.islink(p)
+23 | foo.readlink(p)
 
 PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
   --> import_as.py:20:8
@@ -316,23 +300,21 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
 22 | foo.readlink(p)
    |
 help: Replace with `Path(...).is_file()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-17 18 | b = foo_p.exists(p)
-18 19 | bb = foo_p.expanduser(p)
-19 20 | bbb = foo_p.isdir(p)
-20    |-bbbb = foo_p.isfile(p)
-   21 |+bbbb = pathlib.Path(p).is_file()
-21 22 | bbbbb = foo_p.islink(p)
-22 23 | foo.readlink(p)
-23 24 | foo.stat(p)
+18 | b = foo_p.exists(p)
+19 | bb = foo_p.expanduser(p)
+20 | bbb = foo_p.isdir(p)
+   - bbbb = foo_p.isfile(p)
+21 + bbbb = pathlib.Path(p).is_file()
+22 | bbbbb = foo_p.islink(p)
+23 | foo.readlink(p)
+24 | foo.stat(p)
 
 PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
   --> import_as.py:21:9
@@ -345,23 +327,21 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
 23 | foo.stat(p)
    |
 help: Replace with `Path(...).is_symlink()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-18 19 | bb = foo_p.expanduser(p)
-19 20 | bbb = foo_p.isdir(p)
-20 21 | bbbb = foo_p.isfile(p)
-21    |-bbbbb = foo_p.islink(p)
-   22 |+bbbbb = pathlib.Path(p).is_symlink()
-22 23 | foo.readlink(p)
-23 24 | foo.stat(p)
-24 25 | foo_p.isabs(p)
+19 | bb = foo_p.expanduser(p)
+20 | bbb = foo_p.isdir(p)
+21 | bbbb = foo_p.isfile(p)
+   - bbbbb = foo_p.islink(p)
+22 + bbbbb = pathlib.Path(p).is_symlink()
+23 | foo.readlink(p)
+24 | foo.stat(p)
+25 | foo_p.isabs(p)
 
 PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
   --> import_as.py:22:1
@@ -374,23 +354,21 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
 24 | foo_p.isabs(p)
    |
 help: Replace with `Path(...).readlink()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-19 20 | bbb = foo_p.isdir(p)
-20 21 | bbbb = foo_p.isfile(p)
-21 22 | bbbbb = foo_p.islink(p)
-22    |-foo.readlink(p)
-   23 |+pathlib.Path(p).readlink()
-23 24 | foo.stat(p)
-24 25 | foo_p.isabs(p)
-25 26 | foo_p.join(p, q)
+20 | bbb = foo_p.isdir(p)
+21 | bbbb = foo_p.isfile(p)
+22 | bbbbb = foo_p.islink(p)
+   - foo.readlink(p)
+23 + pathlib.Path(p).readlink()
+24 | foo.stat(p)
+25 | foo_p.isabs(p)
+26 | foo_p.join(p, q)
 
 PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()`
   --> import_as.py:23:1
@@ -414,23 +392,21 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()`
 26 | foo.sep.join([p, q])
    |
 help: Replace with `Path(...).is_absolute()`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-21 22 | bbbbb = foo_p.islink(p)
-22 23 | foo.readlink(p)
-23 24 | foo.stat(p)
-24    |-foo_p.isabs(p)
-   25 |+pathlib.Path(p).is_absolute()
-25 26 | foo_p.join(p, q)
-26 27 | foo.sep.join([p, q])
-27 28 | foo.sep.join((p, q))
+22 | bbbbb = foo_p.islink(p)
+23 | foo.readlink(p)
+24 | foo.stat(p)
+   - foo_p.isabs(p)
+25 + pathlib.Path(p).is_absolute()
+26 | foo_p.join(p, q)
+27 | foo.sep.join([p, q])
+28 | foo.sep.join((p, q))
 
 PTH118 `os.path.join()` should be replaced by `Path` with `/` operator
   --> import_as.py:25:1
@@ -476,23 +452,22 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name`
 30 | foo_p.samefile(p)
    |
 help: Replace with `Path(...).name`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-25 26 | foo_p.join(p, q)
-26 27 | foo.sep.join([p, q])
-27 28 | foo.sep.join((p, q))
-28    |-foo_p.basename(p)
-   29 |+pathlib.Path(p).name
-29 30 | foo_p.dirname(p)
-30 31 | foo_p.samefile(p)
-31 32 | foo_p.splitext(p)
+26 | foo_p.join(p, q)
+27 | foo.sep.join([p, q])
+28 | foo.sep.join((p, q))
+   - foo_p.basename(p)
+29 + pathlib.Path(p).name
+30 | foo_p.dirname(p)
+31 | foo_p.samefile(p)
+32 | foo_p.splitext(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
   --> import_as.py:29:1
@@ -505,22 +480,21 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
 31 | foo_p.splitext(p)
    |
 help: Replace with `Path(...).parent`
-
-ℹ Safe fix
-1  1  | import os as foo
-2  2  | import os.path as foo_p
-   3  |+import pathlib
-3  4  | 
-4  5  | p = "/foo"
-5  6  | q = "bar"
+1  | import os as foo
+2  | import os.path as foo_p
+3  + import pathlib
+4  | 
+5  | p = "/foo"
+6  | q = "bar"
 --------------------------------------------------------------------------------
-26 27 | foo.sep.join([p, q])
-27 28 | foo.sep.join((p, q))
-28 29 | foo_p.basename(p)
-29    |-foo_p.dirname(p)
-   30 |+pathlib.Path(p).parent
-30 31 | foo_p.samefile(p)
-31 32 | foo_p.splitext(p)
+27 | foo.sep.join([p, q])
+28 | foo.sep.join((p, q))
+29 | foo_p.basename(p)
+   - foo_p.dirname(p)
+30 + pathlib.Path(p).parent
+31 | foo_p.samefile(p)
+32 | foo_p.splitext(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
   --> import_as.py:30:1
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap
index 9b1262c76c..236b00ff4c 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap
@@ -12,21 +12,20 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()`
 11 | aaa = mkdir(p)
    |
 help: Replace with `Path(...).resolve()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
-8  9  | 
-9     |-a = abspath(p)
-   10 |+a = pathlib.Path(p).resolve()
-10 11 | aa = chmod(p)
-11 12 | aaa = mkdir(p)
-12 13 | makedirs(p)
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
+9  | 
+   - a = abspath(p)
+10 + a = pathlib.Path(p).resolve()
+11 | aa = chmod(p)
+12 | aaa = mkdir(p)
+13 | makedirs(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH101 `os.chmod()` should be replaced by `Path.chmod()`
   --> import_from.py:10:6
@@ -50,23 +49,21 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
 13 | rename(p)
    |
 help: Replace with `Path(...).mkdir()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
-8  9  | 
-9  10 | a = abspath(p)
-10 11 | aa = chmod(p)
-11    |-aaa = mkdir(p)
-   12 |+aaa = pathlib.Path(p).mkdir()
-12 13 | makedirs(p)
-13 14 | rename(p)
-14 15 | replace(p)
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
+9  | 
+10 | a = abspath(p)
+11 | aa = chmod(p)
+   - aaa = mkdir(p)
+12 + aaa = pathlib.Path(p).mkdir()
+13 | makedirs(p)
+14 | rename(p)
+15 | replace(p)
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
   --> import_from.py:12:1
@@ -79,24 +76,22 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 14 | replace(p)
    |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-9  10 | a = abspath(p)
-10 11 | aa = chmod(p)
-11 12 | aaa = mkdir(p)
-12    |-makedirs(p)
-   13 |+pathlib.Path(p).mkdir(parents=True)
-13 14 | rename(p)
-14 15 | replace(p)
-15 16 | rmdir(p)
+10 | a = abspath(p)
+11 | aa = chmod(p)
+12 | aaa = mkdir(p)
+   - makedirs(p)
+13 + pathlib.Path(p).mkdir(parents=True)
+14 | rename(p)
+15 | replace(p)
+16 | rmdir(p)
 
 PTH104 `os.rename()` should be replaced by `Path.rename()`
   --> import_from.py:13:1
@@ -133,24 +128,22 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()`
 17 | unlink(p)
    |
 help: Replace with `Path(...).rmdir()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-12 13 | makedirs(p)
-13 14 | rename(p)
-14 15 | replace(p)
-15    |-rmdir(p)
-   16 |+pathlib.Path(p).rmdir()
-16 17 | remove(p)
-17 18 | unlink(p)
-18 19 | getcwd(p)
+13 | makedirs(p)
+14 | rename(p)
+15 | replace(p)
+   - rmdir(p)
+16 + pathlib.Path(p).rmdir()
+17 | remove(p)
+18 | unlink(p)
+19 | getcwd(p)
 
 PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
   --> import_from.py:16:1
@@ -163,24 +156,22 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
 18 | getcwd(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-13 14 | rename(p)
-14 15 | replace(p)
-15 16 | rmdir(p)
-16    |-remove(p)
-   17 |+pathlib.Path(p).unlink()
-17 18 | unlink(p)
-18 19 | getcwd(p)
-19 20 | b = exists(p)
+14 | rename(p)
+15 | replace(p)
+16 | rmdir(p)
+   - remove(p)
+17 + pathlib.Path(p).unlink()
+18 | unlink(p)
+19 | getcwd(p)
+20 | b = exists(p)
 
 PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
   --> import_from.py:17:1
@@ -193,24 +184,22 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
 19 | b = exists(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-14 15 | replace(p)
-15 16 | rmdir(p)
-16 17 | remove(p)
-17    |-unlink(p)
-   18 |+pathlib.Path(p).unlink()
-18 19 | getcwd(p)
-19 20 | b = exists(p)
-20 21 | bb = expanduser(p)
+15 | replace(p)
+16 | rmdir(p)
+17 | remove(p)
+   - unlink(p)
+18 + pathlib.Path(p).unlink()
+19 | getcwd(p)
+20 | b = exists(p)
+21 | bb = expanduser(p)
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
   --> import_from.py:18:1
@@ -235,24 +224,22 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()`
 21 | bbb = isdir(p)
    |
 help: Replace with `Path(...).exists()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-16 17 | remove(p)
-17 18 | unlink(p)
-18 19 | getcwd(p)
-19    |-b = exists(p)
-   20 |+b = pathlib.Path(p).exists()
-20 21 | bb = expanduser(p)
-21 22 | bbb = isdir(p)
-22 23 | bbbb = isfile(p)
+17 | remove(p)
+18 | unlink(p)
+19 | getcwd(p)
+   - b = exists(p)
+20 + b = pathlib.Path(p).exists()
+21 | bb = expanduser(p)
+22 | bbb = isdir(p)
+23 | bbbb = isfile(p)
 
 PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
   --> import_from.py:20:6
@@ -265,24 +252,23 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
 22 | bbbb = isfile(p)
    |
 help: Replace with `Path(...).expanduser()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-17 18 | unlink(p)
-18 19 | getcwd(p)
-19 20 | b = exists(p)
-20    |-bb = expanduser(p)
-   21 |+bb = pathlib.Path(p).expanduser()
-21 22 | bbb = isdir(p)
-22 23 | bbbb = isfile(p)
-23 24 | bbbbb = islink(p)
+18 | unlink(p)
+19 | getcwd(p)
+20 | b = exists(p)
+   - bb = expanduser(p)
+21 + bb = pathlib.Path(p).expanduser()
+22 | bbb = isdir(p)
+23 | bbbb = isfile(p)
+24 | bbbbb = islink(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
   --> import_from.py:21:7
@@ -295,24 +281,22 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
 23 | bbbbb = islink(p)
    |
 help: Replace with `Path(...).is_dir()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-18 19 | getcwd(p)
-19 20 | b = exists(p)
-20 21 | bb = expanduser(p)
-21    |-bbb = isdir(p)
-   22 |+bbb = pathlib.Path(p).is_dir()
-22 23 | bbbb = isfile(p)
-23 24 | bbbbb = islink(p)
-24 25 | readlink(p)
+19 | getcwd(p)
+20 | b = exists(p)
+21 | bb = expanduser(p)
+   - bbb = isdir(p)
+22 + bbb = pathlib.Path(p).is_dir()
+23 | bbbb = isfile(p)
+24 | bbbbb = islink(p)
+25 | readlink(p)
 
 PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
   --> import_from.py:22:8
@@ -325,24 +309,22 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
 24 | readlink(p)
    |
 help: Replace with `Path(...).is_file()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-19 20 | b = exists(p)
-20 21 | bb = expanduser(p)
-21 22 | bbb = isdir(p)
-22    |-bbbb = isfile(p)
-   23 |+bbbb = pathlib.Path(p).is_file()
-23 24 | bbbbb = islink(p)
-24 25 | readlink(p)
-25 26 | stat(p)
+20 | b = exists(p)
+21 | bb = expanduser(p)
+22 | bbb = isdir(p)
+   - bbbb = isfile(p)
+23 + bbbb = pathlib.Path(p).is_file()
+24 | bbbbb = islink(p)
+25 | readlink(p)
+26 | stat(p)
 
 PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
   --> import_from.py:23:9
@@ -355,24 +337,22 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
 25 | stat(p)
    |
 help: Replace with `Path(...).is_symlink()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-20 21 | bb = expanduser(p)
-21 22 | bbb = isdir(p)
-22 23 | bbbb = isfile(p)
-23    |-bbbbb = islink(p)
-   24 |+bbbbb = pathlib.Path(p).is_symlink()
-24 25 | readlink(p)
-25 26 | stat(p)
-26 27 | isabs(p)
+21 | bb = expanduser(p)
+22 | bbb = isdir(p)
+23 | bbbb = isfile(p)
+   - bbbbb = islink(p)
+24 + bbbbb = pathlib.Path(p).is_symlink()
+25 | readlink(p)
+26 | stat(p)
+27 | isabs(p)
 
 PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
   --> import_from.py:24:1
@@ -385,24 +365,22 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
 26 | isabs(p)
    |
 help: Replace with `Path(...).readlink()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-21 22 | bbb = isdir(p)
-22 23 | bbbb = isfile(p)
-23 24 | bbbbb = islink(p)
-24    |-readlink(p)
-   25 |+pathlib.Path(p).readlink()
-25 26 | stat(p)
-26 27 | isabs(p)
-27 28 | join(p, q)
+22 | bbb = isdir(p)
+23 | bbbb = isfile(p)
+24 | bbbbb = islink(p)
+   - readlink(p)
+25 + pathlib.Path(p).readlink()
+26 | stat(p)
+27 | isabs(p)
+28 | join(p, q)
 
 PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()`
   --> import_from.py:25:1
@@ -426,24 +404,22 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()`
 28 | sep.join((p, q))
    |
 help: Replace with `Path(...).is_absolute()`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-23 24 | bbbbb = islink(p)
-24 25 | readlink(p)
-25 26 | stat(p)
-26    |-isabs(p)
-   27 |+pathlib.Path(p).is_absolute()
-27 28 | join(p, q)
-28 29 | sep.join((p, q))
-29 30 | sep.join([p, q])
+24 | bbbbb = islink(p)
+25 | readlink(p)
+26 | stat(p)
+   - isabs(p)
+27 + pathlib.Path(p).is_absolute()
+28 | join(p, q)
+29 | sep.join((p, q))
+30 | sep.join([p, q])
 
 PTH118 `os.path.join()` should be replaced by `Path` with `/` operator
   --> import_from.py:27:1
@@ -489,24 +465,23 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name`
 32 | samefile(p)
    |
 help: Replace with `Path(...).name`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-27 28 | join(p, q)
-28 29 | sep.join((p, q))
-29 30 | sep.join([p, q])
-30    |-basename(p)
-   31 |+pathlib.Path(p).name
-31 32 | dirname(p)
-32 33 | samefile(p)
-33 34 | splitext(p)
+28 | join(p, q)
+29 | sep.join((p, q))
+30 | sep.join([p, q])
+   - basename(p)
+31 + pathlib.Path(p).name
+32 | dirname(p)
+33 | samefile(p)
+34 | splitext(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
   --> import_from.py:31:1
@@ -519,24 +494,23 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
 33 | splitext(p)
    |
 help: Replace with `Path(...).parent`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-28 29 | sep.join((p, q))
-29 30 | sep.join([p, q])
-30 31 | basename(p)
-31    |-dirname(p)
-   32 |+pathlib.Path(p).parent
-32 33 | samefile(p)
-33 34 | splitext(p)
-34 35 | with open(p) as fp:
+29 | sep.join((p, q))
+30 | sep.join([p, q])
+31 | basename(p)
+   - dirname(p)
+32 + pathlib.Path(p).parent
+33 | samefile(p)
+34 | splitext(p)
+35 | with open(p) as fp:
+note: This is an unsafe fix and may change runtime behavior
 
 PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
   --> import_from.py:32:1
@@ -561,7 +535,7 @@ PTH122 `os.path.splitext()` should be replaced by `Path.suffix`, `Path.stem`, an
 35 |     fp.read()
    |
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> import_from.py:34:6
    |
 32 | samefile(p)
@@ -571,8 +545,25 @@ PTH123 `open()` should be replaced by `Path.open()`
 35 |     fp.read()
 36 | open(p).close()
    |
+help: Replace with `Path.open()`
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
+--------------------------------------------------------------------------------
+32 | dirname(p)
+33 | samefile(p)
+34 | splitext(p)
+   - with open(p) as fp:
+35 + with pathlib.Path(p).open() as fp:
+36 |     fp.read()
+37 | open(p).close()
+38 | 
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> import_from.py:36:1
    |
 34 | with open(p) as fp:
@@ -580,8 +571,25 @@ PTH123 `open()` should be replaced by `Path.open()`
 36 | open(p).close()
    | ^^^^
    |
+help: Replace with `Path.open()`
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
+--------------------------------------------------------------------------------
+34 | splitext(p)
+35 | with open(p) as fp:
+36 |     fp.read()
+   - open(p).close()
+37 + pathlib.Path(p).open().close()
+38 | 
+39 | 
+40 | # https://github.com/astral-sh/ruff/issues/15442
 
-PTH123 `open()` should be replaced by `Path.open()`
+PTH123 [*] `open()` should be replaced by `Path.open()`
   --> import_from.py:43:10
    |
 41 |     from builtins import open
@@ -589,6 +597,23 @@ PTH123 `open()` should be replaced by `Path.open()`
 43 |     with open(p) as _: ...  # Error
    |          ^^^^
    |
+help: Replace with `Path.open()`
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
+--------------------------------------------------------------------------------
+41 | def _():
+42 |     from builtins import open
+43 | 
+   -     with open(p) as _: ...  # Error
+44 +     with pathlib.Path(p).open() as _: ...  # Error
+45 | 
+46 | 
+47 | def _():
 
 PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
   --> import_from.py:53:1
@@ -601,24 +626,22 @@ PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
 55 | rename(
    |
 help: Replace with `Path(...).rename(...)`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-50 51 | 
-51 52 | file = "file_1.py"
-52 53 | 
-53    |-rename(file, "file_2.py")
-   54 |+pathlib.Path(file).rename("file_2.py")
-54 55 | 
-55 56 | rename(
-56 57 |     # commment 1
+51 | 
+52 | file = "file_1.py"
+53 | 
+   - rename(file, "file_2.py")
+54 + pathlib.Path(file).rename("file_2.py")
+55 | 
+56 | rename(
+57 |     # commment 1
 
 PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
   --> import_from.py:55:1
@@ -631,30 +654,29 @@ PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
 57 |     file, # comment 2
    |
 help: Replace with `Path(...).rename(...)`
-
-ℹ Unsafe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-52 53 | 
-53 54 | rename(file, "file_2.py")
-54 55 | 
-55    |-rename(
-56    |-    # commment 1
-57    |-    file, # comment 2
-58    |-    "file_2.py"
-59    |-    ,
-60    |-    # comment 3
-61    |-)
-   56 |+pathlib.Path(file).rename("file_2.py")
-62 57 | 
-63 58 | rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None)
-64 59 | 
+53 | 
+54 | rename(file, "file_2.py")
+55 | 
+   - rename(
+   -     # commment 1
+   -     file, # comment 2
+   -     "file_2.py"
+   -     ,
+   -     # comment 3
+   - )
+56 + pathlib.Path(file).rename("file_2.py")
+57 | 
+58 | rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None)
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
   --> import_from.py:63:1
@@ -667,20 +689,18 @@ PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
 65 | rename(file, "file_2.py", src_dir_fd=1)
    |
 help: Replace with `Path(...).rename(...)`
-
-ℹ Safe fix
-2  2  | from os import remove, unlink, getcwd, readlink, stat
-3  3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
-4  4  | from os.path import isabs, join, basename, dirname, samefile, splitext
-   5  |+import pathlib
-5  6  | 
-6  7  | p = "/foo"
-7  8  | q = "bar"
+2  | from os import remove, unlink, getcwd, readlink, stat
+3  | from os.path import abspath, exists, expanduser, isdir, isfile, islink
+4  | from os.path import isabs, join, basename, dirname, samefile, splitext
+5  + import pathlib
+6  | 
+7  | p = "/foo"
+8  | q = "bar"
 --------------------------------------------------------------------------------
-60 61 |     # comment 3
-61 62 | )
-62 63 | 
-63    |-rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None)
-   64 |+pathlib.Path(file).rename("file_2.py")
-64 65 | 
-65 66 | rename(file, "file_2.py", src_dir_fd=1)
+61 |     # comment 3
+62 | )
+63 | 
+   - rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None)
+64 + pathlib.Path(file).rename("file_2.py")
+65 | 
+66 | rename(file, "file_2.py", src_dir_fd=1)
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap
index c964f4b123..e037400a27 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap
@@ -12,21 +12,20 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()`
 16 | aaa = xmkdir(p)
    |
 help: Replace with `Path(...).resolve()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
-13 14 | 
-14    |-a = xabspath(p)
-   15 |+a = pathlib.Path(p).resolve()
-15 16 | aa = xchmod(p)
-16 17 | aaa = xmkdir(p)
-17 18 | xmakedirs(p)
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
+14 | 
+   - a = xabspath(p)
+15 + a = pathlib.Path(p).resolve()
+16 | aa = xchmod(p)
+17 | aaa = xmkdir(p)
+18 | xmakedirs(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH101 `os.chmod()` should be replaced by `Path.chmod()`
   --> import_from_as.py:15:6
@@ -50,23 +49,21 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()`
 18 | xrename(p)
    |
 help: Replace with `Path(...).mkdir()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
-13 14 | 
-14 15 | a = xabspath(p)
-15 16 | aa = xchmod(p)
-16    |-aaa = xmkdir(p)
-   17 |+aaa = pathlib.Path(p).mkdir()
-17 18 | xmakedirs(p)
-18 19 | xrename(p)
-19 20 | xreplace(p)
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
+14 | 
+15 | a = xabspath(p)
+16 | aa = xchmod(p)
+   - aaa = xmkdir(p)
+17 + aaa = pathlib.Path(p).mkdir()
+18 | xmakedirs(p)
+19 | xrename(p)
+20 | xreplace(p)
 
 PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
   --> import_from_as.py:17:1
@@ -79,24 +76,22 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)`
 19 | xreplace(p)
    |
 help: Replace with `Path(...).mkdir(parents=True)`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-14 15 | a = xabspath(p)
-15 16 | aa = xchmod(p)
-16 17 | aaa = xmkdir(p)
-17    |-xmakedirs(p)
-   18 |+pathlib.Path(p).mkdir(parents=True)
-18 19 | xrename(p)
-19 20 | xreplace(p)
-20 21 | xrmdir(p)
+15 | a = xabspath(p)
+16 | aa = xchmod(p)
+17 | aaa = xmkdir(p)
+   - xmakedirs(p)
+18 + pathlib.Path(p).mkdir(parents=True)
+19 | xrename(p)
+20 | xreplace(p)
+21 | xrmdir(p)
 
 PTH104 `os.rename()` should be replaced by `Path.rename()`
   --> import_from_as.py:18:1
@@ -133,24 +128,22 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()`
 22 | xunlink(p)
    |
 help: Replace with `Path(...).rmdir()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-17 18 | xmakedirs(p)
-18 19 | xrename(p)
-19 20 | xreplace(p)
-20    |-xrmdir(p)
-   21 |+pathlib.Path(p).rmdir()
-21 22 | xremove(p)
-22 23 | xunlink(p)
-23 24 | xgetcwd(p)
+18 | xmakedirs(p)
+19 | xrename(p)
+20 | xreplace(p)
+   - xrmdir(p)
+21 + pathlib.Path(p).rmdir()
+22 | xremove(p)
+23 | xunlink(p)
+24 | xgetcwd(p)
 
 PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
   --> import_from_as.py:21:1
@@ -163,24 +156,22 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()`
 23 | xgetcwd(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-18 19 | xrename(p)
-19 20 | xreplace(p)
-20 21 | xrmdir(p)
-21    |-xremove(p)
-   22 |+pathlib.Path(p).unlink()
-22 23 | xunlink(p)
-23 24 | xgetcwd(p)
-24 25 | b = xexists(p)
+19 | xrename(p)
+20 | xreplace(p)
+21 | xrmdir(p)
+   - xremove(p)
+22 + pathlib.Path(p).unlink()
+23 | xunlink(p)
+24 | xgetcwd(p)
+25 | b = xexists(p)
 
 PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
   --> import_from_as.py:22:1
@@ -193,24 +184,22 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()`
 24 | b = xexists(p)
    |
 help: Replace with `Path(...).unlink()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-19 20 | xreplace(p)
-20 21 | xrmdir(p)
-21 22 | xremove(p)
-22    |-xunlink(p)
-   23 |+pathlib.Path(p).unlink()
-23 24 | xgetcwd(p)
-24 25 | b = xexists(p)
-25 26 | bb = xexpanduser(p)
+20 | xreplace(p)
+21 | xrmdir(p)
+22 | xremove(p)
+   - xunlink(p)
+23 + pathlib.Path(p).unlink()
+24 | xgetcwd(p)
+25 | b = xexists(p)
+26 | bb = xexpanduser(p)
 
 PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
   --> import_from_as.py:23:1
@@ -235,24 +224,22 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()`
 26 | bbb = xisdir(p)
    |
 help: Replace with `Path(...).exists()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-21 22 | xremove(p)
-22 23 | xunlink(p)
-23 24 | xgetcwd(p)
-24    |-b = xexists(p)
-   25 |+b = pathlib.Path(p).exists()
-25 26 | bb = xexpanduser(p)
-26 27 | bbb = xisdir(p)
-27 28 | bbbb = xisfile(p)
+22 | xremove(p)
+23 | xunlink(p)
+24 | xgetcwd(p)
+   - b = xexists(p)
+25 + b = pathlib.Path(p).exists()
+26 | bb = xexpanduser(p)
+27 | bbb = xisdir(p)
+28 | bbbb = xisfile(p)
 
 PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
   --> import_from_as.py:25:6
@@ -265,24 +252,23 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()`
 27 | bbbb = xisfile(p)
    |
 help: Replace with `Path(...).expanduser()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-22 23 | xunlink(p)
-23 24 | xgetcwd(p)
-24 25 | b = xexists(p)
-25    |-bb = xexpanduser(p)
-   26 |+bb = pathlib.Path(p).expanduser()
-26 27 | bbb = xisdir(p)
-27 28 | bbbb = xisfile(p)
-28 29 | bbbbb = xislink(p)
+23 | xunlink(p)
+24 | xgetcwd(p)
+25 | b = xexists(p)
+   - bb = xexpanduser(p)
+26 + bb = pathlib.Path(p).expanduser()
+27 | bbb = xisdir(p)
+28 | bbbb = xisfile(p)
+29 | bbbbb = xislink(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
   --> import_from_as.py:26:7
@@ -295,24 +281,22 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()`
 28 | bbbbb = xislink(p)
    |
 help: Replace with `Path(...).is_dir()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-23 24 | xgetcwd(p)
-24 25 | b = xexists(p)
-25 26 | bb = xexpanduser(p)
-26    |-bbb = xisdir(p)
-   27 |+bbb = pathlib.Path(p).is_dir()
-27 28 | bbbb = xisfile(p)
-28 29 | bbbbb = xislink(p)
-29 30 | xreadlink(p)
+24 | xgetcwd(p)
+25 | b = xexists(p)
+26 | bb = xexpanduser(p)
+   - bbb = xisdir(p)
+27 + bbb = pathlib.Path(p).is_dir()
+28 | bbbb = xisfile(p)
+29 | bbbbb = xislink(p)
+30 | xreadlink(p)
 
 PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
   --> import_from_as.py:27:8
@@ -325,24 +309,22 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()`
 29 | xreadlink(p)
    |
 help: Replace with `Path(...).is_file()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-24 25 | b = xexists(p)
-25 26 | bb = xexpanduser(p)
-26 27 | bbb = xisdir(p)
-27    |-bbbb = xisfile(p)
-   28 |+bbbb = pathlib.Path(p).is_file()
-28 29 | bbbbb = xislink(p)
-29 30 | xreadlink(p)
-30 31 | xstat(p)
+25 | b = xexists(p)
+26 | bb = xexpanduser(p)
+27 | bbb = xisdir(p)
+   - bbbb = xisfile(p)
+28 + bbbb = pathlib.Path(p).is_file()
+29 | bbbbb = xislink(p)
+30 | xreadlink(p)
+31 | xstat(p)
 
 PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
   --> import_from_as.py:28:9
@@ -355,24 +337,22 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()`
 30 | xstat(p)
    |
 help: Replace with `Path(...).is_symlink()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-25 26 | bb = xexpanduser(p)
-26 27 | bbb = xisdir(p)
-27 28 | bbbb = xisfile(p)
-28    |-bbbbb = xislink(p)
-   29 |+bbbbb = pathlib.Path(p).is_symlink()
-29 30 | xreadlink(p)
-30 31 | xstat(p)
-31 32 | xisabs(p)
+26 | bb = xexpanduser(p)
+27 | bbb = xisdir(p)
+28 | bbbb = xisfile(p)
+   - bbbbb = xislink(p)
+29 + bbbbb = pathlib.Path(p).is_symlink()
+30 | xreadlink(p)
+31 | xstat(p)
+32 | xisabs(p)
 
 PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
   --> import_from_as.py:29:1
@@ -385,24 +365,22 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
 31 | xisabs(p)
    |
 help: Replace with `Path(...).readlink()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-26 27 | bbb = xisdir(p)
-27 28 | bbbb = xisfile(p)
-28 29 | bbbbb = xislink(p)
-29    |-xreadlink(p)
-   30 |+pathlib.Path(p).readlink()
-30 31 | xstat(p)
-31 32 | xisabs(p)
-32 33 | xjoin(p, q)
+27 | bbb = xisdir(p)
+28 | bbbb = xisfile(p)
+29 | bbbbb = xislink(p)
+   - xreadlink(p)
+30 + pathlib.Path(p).readlink()
+31 | xstat(p)
+32 | xisabs(p)
+33 | xjoin(p, q)
 
 PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()`
   --> import_from_as.py:30:1
@@ -426,24 +404,22 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()`
 33 | s.join((p, q))
    |
 help: Replace with `Path(...).is_absolute()`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-28 29 | bbbbb = xislink(p)
-29 30 | xreadlink(p)
-30 31 | xstat(p)
-31    |-xisabs(p)
-   32 |+pathlib.Path(p).is_absolute()
-32 33 | xjoin(p, q)
-33 34 | s.join((p, q))
-34 35 | s.join([p, q])
+29 | bbbbb = xislink(p)
+30 | xreadlink(p)
+31 | xstat(p)
+   - xisabs(p)
+32 + pathlib.Path(p).is_absolute()
+33 | xjoin(p, q)
+34 | s.join((p, q))
+35 | s.join([p, q])
 
 PTH118 `os.path.join()` should be replaced by `Path` with `/` operator
   --> import_from_as.py:32:1
@@ -489,24 +465,23 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name`
 37 | xsamefile(p)
    |
 help: Replace with `Path(...).name`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-32 33 | xjoin(p, q)
-33 34 | s.join((p, q))
-34 35 | s.join([p, q])
-35    |-xbasename(p)
-   36 |+pathlib.Path(p).name
-36 37 | xdirname(p)
-37 38 | xsamefile(p)
-38 39 | xsplitext(p)
+33 | xjoin(p, q)
+34 | s.join((p, q))
+35 | s.join([p, q])
+   - xbasename(p)
+36 + pathlib.Path(p).name
+37 | xdirname(p)
+38 | xsamefile(p)
+39 | xsplitext(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
   --> import_from_as.py:36:1
@@ -519,23 +494,22 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent`
 38 | xsplitext(p)
    |
 help: Replace with `Path(...).parent`
-
-ℹ Safe fix
-7  7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-8  8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-9  9  | from os.path import samefile as xsamefile, splitext as xsplitext
-   10 |+import pathlib
-10 11 | 
-11 12 | p = "/foo"
-12 13 | q = "bar"
+7  | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+8  | from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+9  | from os.path import samefile as xsamefile, splitext as xsplitext
+10 + import pathlib
+11 | 
+12 | p = "/foo"
+13 | q = "bar"
 --------------------------------------------------------------------------------
-33 34 | s.join((p, q))
-34 35 | s.join([p, q])
-35 36 | xbasename(p)
-36    |-xdirname(p)
-   37 |+pathlib.Path(p).parent
-37 38 | xsamefile(p)
-38 39 | xsplitext(p)
+34 | s.join((p, q))
+35 | s.join([p, q])
+36 | xbasename(p)
+   - xdirname(p)
+37 + pathlib.Path(p).parent
+38 | xsamefile(p)
+39 | xsplitext(p)
+note: This is an unsafe fix and may change runtime behavior
 
 PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
   --> import_from_as.py:37:1
diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/violations.rs b/crates/ruff_linter/src/rules/flake8_use_pathlib/violations.rs
index 7a5661aae2..b5bcfdb1e3 100644
--- a/crates/ruff_linter/src/rules/flake8_use_pathlib/violations.rs
+++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/violations.rs
@@ -43,10 +43,11 @@ use crate::Violation;
 /// - [Python documentation: `Path.owner`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.owner)
 /// - [Python documentation: `os.stat`](https://docs.python.org/3/library/os.html#os.stat)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsStat;
 
 impl Violation for OsStat {
@@ -89,10 +90,11 @@ impl Violation for OsStat {
 /// - [Python documentation: `PurePath.joinpath`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.joinpath)
 /// - [Python documentation: `os.path.join`](https://docs.python.org/3/library/os.path.html#os.path.join)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathJoin {
     pub(crate) module: String,
     pub(crate) joiner: Joiner,
@@ -160,10 +162,11 @@ pub(crate) enum Joiner {
 /// - [Python documentation: `Path.suffixes`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.suffixes)
 /// - [Python documentation: `os.path.splitext`](https://docs.python.org/3/library/os.path.html#os.path.splitext)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct OsPathSplitext;
 
 impl Violation for OsPathSplitext {
@@ -174,50 +177,6 @@ impl Violation for OsPathSplitext {
     }
 }
 
-/// ## What it does
-/// Checks for uses of the `open()` builtin.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation. When possible,
-/// using `Path` object methods such as `Path.open()` can improve readability
-/// over the `open` builtin.
-///
-/// ## Examples
-/// ```python
-/// with open("f1.py", "wb") as fp:
-///     ...
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// with Path("f1.py").open("wb") as fp:
-///     ...
-/// ```
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than working directly with strings,
-/// especially on older versions of Python.
-///
-/// ## References
-/// - [Python documentation: `Path.open`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.open)
-/// - [Python documentation: `open`](https://docs.python.org/3/library/functions.html#open)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct BuiltinOpen;
-
-impl Violation for BuiltinOpen {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`open()` should be replaced by `Path.open()`".to_string()
-    }
-}
-
 /// ## What it does
 /// Checks for uses of the `py.path` library.
 ///
@@ -244,6 +203,7 @@ impl Violation for BuiltinOpen {
 /// - [Python documentation: `Pathlib`](https://docs.python.org/3/library/pathlib.html)
 /// - [Path repository](https://github.com/jaraco/path)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct PyPath;
 
 impl Violation for PyPath {
@@ -298,10 +258,11 @@ impl Violation for PyPath {
 /// - [Python documentation: `Path.iterdir`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.iterdir)
 /// - [Python documentation: `os.listdir`](https://docs.python.org/3/library/os.html#os.listdir)
 /// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
+/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#corresponding-tools)
 /// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
 /// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct OsListdir;
 
 impl Violation for OsListdir {
@@ -310,45 +271,3 @@ impl Violation for OsListdir {
         "Use `pathlib.Path.iterdir()` instead.".to_string()
     }
 }
-
-/// ## What it does
-/// Checks for uses of `os.symlink`.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation, as compared to
-/// the lower-level API offered by `os.symlink`.
-///
-/// ## Example
-/// ```python
-/// import os
-///
-/// os.symlink("usr/bin/python", "tmp/python", target_is_directory=False)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// Path("tmp/python").symlink_to("usr/bin/python")
-/// ```
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than the lower-level alternatives that work directly with strings,
-/// especially on older versions of Python.
-///
-/// ## References
-/// - [Python documentation: `Path.symlink_to`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.symlink_to)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct OsSymlink;
-
-impl Violation for OsSymlink {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`os.symlink` should be replaced by `Path.symlink_to`".to_string()
-    }
-}
diff --git a/crates/ruff_linter/src/rules/flynt/helpers.rs b/crates/ruff_linter/src/rules/flynt/helpers.rs
index 58137a3816..96852d8961 100644
--- a/crates/ruff_linter/src/rules/flynt/helpers.rs
+++ b/crates/ruff_linter/src/rules/flynt/helpers.rs
@@ -9,7 +9,7 @@ fn to_interpolated_string_interpolation_element(inner: &Expr) -> ast::Interpolat
         conversion: ConversionFlag::None,
         format_spec: None,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     })
 }
 
@@ -18,7 +18,7 @@ pub(super) fn to_interpolated_string_literal_element(s: &str) -> ast::Interpolat
     ast::InterpolatedStringElement::Literal(ast::InterpolatedStringLiteralElement {
         value: Box::from(s),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     })
 }
 
diff --git a/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs b/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs
index 6ac651fb66..bdc7340974 100644
--- a/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs
+++ b/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs
@@ -2,7 +2,7 @@ use ast::FStringFlags;
 use itertools::Itertools;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast, Arguments, Expr};
+use ruff_python_ast::{self as ast, Arguments, Expr, StringFlags, str::Quote};
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
@@ -39,6 +39,7 @@ use crate::rules::flynt::helpers;
 /// ## References
 /// - [Python documentation: f-strings](https://docs.python.org/3/reference/lexical_analysis.html#f-strings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.266")]
 pub(crate) struct StaticJoinToFString {
     expression: SourceCodeSnippet,
 }
@@ -72,31 +73,51 @@ fn is_static_length(elts: &[Expr]) -> bool {
 fn build_fstring(joiner: &str, joinees: &[Expr], flags: FStringFlags) -> Option<Expr> {
     // If all elements are string constants, join them into a single string.
     if joinees.iter().all(Expr::is_string_literal_expr) {
-        let mut flags = None;
-        let node = ast::StringLiteral {
-            value: joinees
-                .iter()
-                .filter_map(|expr| {
-                    if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = expr {
-                        if flags.is_none() {
-                            // take the flags from the first Expr
-                            flags = Some(value.first_literal_flags());
-                        }
-                        Some(value.to_str())
-                    } else {
-                        None
+        let mut flags: Option<ast::StringLiteralFlags> = None;
+        let content = joinees
+            .iter()
+            .filter_map(|expr| {
+                if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = expr {
+                    if flags.is_none() {
+                        // Take the flags from the first Expr
+                        flags = Some(value.first_literal_flags());
                     }
-                })
-                .join(joiner)
-                .into_boxed_str(),
-            flags: flags?,
+                    Some(value.to_str())
+                } else {
+                    None
+                }
+            })
+            .join(joiner);
+
+        let mut flags = flags?;
+
+        // If the result is a raw string and contains a newline, use triple quotes.
+        if flags.prefix().is_raw() && content.contains(['\n', '\r']) {
+            flags = flags.with_triple_quotes(ruff_python_ast::str::TripleQuotes::Yes);
+
+            // Prefer a delimiter that doesn't occur in the content; if both occur, bail.
+            if content.contains(flags.quote_str()) {
+                flags = flags.with_quote_style(flags.quote_style().opposite());
+                if content.contains(flags.quote_str()) {
+                    // Both "'''" and "\"\"\"" are present in content; avoid emitting
+                    // an invalid raw triple-quoted literal (or escaping). Bail on the fix.
+                    return None;
+                }
+            }
+        }
+
+        let node = ast::StringLiteral {
+            value: content.into_boxed_str(),
+            flags,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         };
         return Some(node.into());
     }
 
     let mut f_string_elements = Vec::with_capacity(joinees.len() * 2);
+    let mut has_single_quote = joiner.contains('\'');
+    let mut has_double_quote = joiner.contains('"');
     let mut first = true;
 
     for expr in joinees {
@@ -108,14 +129,31 @@ fn build_fstring(joiner: &str, joinees: &[Expr], flags: FStringFlags) -> Option<
         if !std::mem::take(&mut first) {
             f_string_elements.push(helpers::to_interpolated_string_literal_element(joiner));
         }
-        f_string_elements.push(helpers::to_interpolated_string_element(expr)?);
+        let element = helpers::to_interpolated_string_element(expr)?;
+        if let ast::InterpolatedStringElement::Literal(ast::InterpolatedStringLiteralElement {
+            value,
+            ..
+        }) = &element
+        {
+            has_single_quote |= value.contains('\'');
+            has_double_quote |= value.contains('"');
+        }
+        f_string_elements.push(element);
     }
 
+    let quote = flags.quote_style();
+    let adjusted_quote = match quote {
+        Quote::Single if has_single_quote && !has_double_quote => quote.opposite(),
+        Quote::Double if has_double_quote && !has_single_quote => quote.opposite(),
+        _ if has_double_quote && has_single_quote => return None,
+        _ => quote,
+    };
+
     let node = ast::FString {
         elements: f_string_elements.into(),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
-        flags,
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        flags: flags.with_quote_style(adjusted_quote),
     };
     Some(node.into())
 }
diff --git a/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap b/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap
index a05344de64..81a410947c 100644
--- a/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap
+++ b/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap
@@ -11,16 +11,15 @@ FLY002 [*] Consider `f"{a}  World"` instead of string join
 7 | ok3 = "x".join(("1", "2", "3"))  # OK
   |
 help: Replace with `f"{a}  World"`
-
-ℹ Unsafe 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
+2 | from random import random, choice
+3 | 
+4 | a = "Hello"
+  - ok1 = " ".join([a, " World"])  # OK
+5 + ok1 = f"{a}  World"  # OK
+6 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7 | ok3 = "x".join(("1", "2", "3"))  # OK
+8 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+note: This is an unsafe fix and may change runtime behavior
 
 FLY002 [*] Consider `f"Finally, {a} World"` instead of string join
  --> FLY002.py:6:7
@@ -33,16 +32,15 @@ FLY002 [*] Consider `f"Finally, {a} World"` instead of string join
 8 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
   |
 help: Replace with `f"Finally, {a} World"`
-
-ℹ Unsafe 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)
+3 | 
+4 | a = "Hello"
+5 | ok1 = " ".join([a, " World"])  # OK
+  - ok2 = "".join(["Finally, ", a, " World"])  # OK
+6 + ok2 = f"Finally, {a} World"  # OK
+7 | ok3 = "x".join(("1", "2", "3"))  # OK
+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)
+note: This is an unsafe fix and may change runtime behavior
 
 FLY002 [*] Consider `"1x2x3"` instead of string join
  --> FLY002.py:7:7
@@ -55,16 +53,15 @@ FLY002 [*] Consider `"1x2x3"` instead of string join
 9 | ok5 = "a".join([random(), random()])  # OK (simple calls)
   |
 help: Replace with `"1x2x3"`
-
-ℹ Unsafe 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)
+4  | a = "Hello"
+5  | ok1 = " ".join([a, " World"])  # OK
+6  | ok2 = "".join(["Finally, ", a, " World"])  # OK
+   - ok3 = "x".join(("1", "2", "3"))  # OK
+7  + ok3 = "1x2x3"  # OK
+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)
+10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+note: This is an unsafe fix and may change runtime behavior
 
 FLY002 [*] Consider `f"{1}y{2}y{3}"` instead of string join
   --> FLY002.py:8:7
@@ -77,16 +74,15 @@ FLY002 [*] Consider `f"{1}y{2}y{3}"` instead of string join
 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
    |
 help: Replace with `f"{1}y{2}y{3}"`
-
-ℹ Unsafe 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 | 
+5  | ok1 = " ".join([a, " World"])  # OK
+6  | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7  | ok3 = "x".join(("1", "2", "3"))  # OK
+   - 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  | ok5 = "a".join([random(), random()])  # OK (simple calls)
+10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FLY002 [*] Consider `f"{random()}a{random()}"` instead of string join
   --> FLY002.py:9:7
@@ -98,16 +94,15 @@ FLY002 [*] Consider `f"{random()}a{random()}"` instead of string join
 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
    |
 help: Replace with `f"{random()}a{random()}"`
-
-ℹ Unsafe 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)
+6  | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7  | ok3 = "x".join(("1", "2", "3"))  # OK
+8  | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+   - ok5 = "a".join([random(), random()])  # OK (simple calls)
+9  + ok5 = f"{random()}a{random()}"  # OK (simple calls)
+10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+11 | 
+12 | nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
+note: This is an unsafe fix and may change runtime behavior
 
 FLY002 [*] Consider `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"` instead of string join
   --> FLY002.py:10:7
@@ -120,30 +115,94 @@ FLY002 [*] Consider `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"` instead
 12 | nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
    |
 help: Replace with `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"`
+7  | ok3 = "x".join(("1", "2", "3"))  # OK
+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)
+   - 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 | 
+12 | nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
+13 | nok2 = a.join(["1", "2", "3"])  # Not OK (not a static joiner)
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe 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)
+FLY002 [*] Consider f-string instead of string join
+  --> FLY002.py:20:8
+   |
+18 | nok7 = "a".join([f"foo{8}", "bar"])  # Not OK (contains an f-string)
+19 | # https://github.com/astral-sh/ruff/issues/19887
+20 | nok8 = '\n'.join([r'line1','line2'])
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21 | nok9 = '\n'.join([r"raw string", '<""">', "<'''>"])  # Not OK (both triple-quote delimiters appear; should bail)
+   |
+help: Replace with f-string
+17 | nok6 = "a".join(x for x in "feefoofum")  # Not OK (generator)
+18 | nok7 = "a".join([f"foo{8}", "bar"])  # Not OK (contains an f-string)
+19 | # https://github.com/astral-sh/ruff/issues/19887
+   - nok8 = '\n'.join([r'line1','line2'])
+20 + nok8 = r'''line1
+21 + line2'''
+22 | nok9 = '\n'.join([r"raw string", '<""">', "<'''>"])  # Not OK (both triple-quote delimiters appear; should bail)
+23 | 
+24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197
+note: This is an unsafe fix and may change runtime behavior
 
 FLY002 [*] Consider `f"{url}{filename}"` instead of string join
-  --> FLY002.py:23:11
+  --> FLY002.py:25:11
    |
-21 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197
-22 | def create_file_public_url(url, filename):
-23 |     return''.join([url, filename])
+23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197
+24 | def create_file_public_url(url, filename):
+25 |     return''.join([url, filename])
    |           ^^^^^^^^^^^^^^^^^^^^^^^^
+26 |
+27 | # Regression test for: https://github.com/astral-sh/ruff/issues/19837
    |
 help: Replace with `f"{url}{filename}"`
+22 | 
+23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197
+24 | def create_file_public_url(url, filename):
+   -     return''.join([url, filename])
+25 +     return f"{url}{filename}"
+26 | 
+27 | # Regression test for: https://github.com/astral-sh/ruff/issues/19837
+28 | nok10 = "".join((foo, '"'))
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-20 20 | 
-21 21 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197
-22 22 | def create_file_public_url(url, filename):
-23    |-    return''.join([url, filename])
-   23 |+    return f"{url}{filename}"
+FLY002 [*] Consider `f'{foo}"'` instead of string join
+  --> FLY002.py:28:9
+   |
+27 | # Regression test for: https://github.com/astral-sh/ruff/issues/19837
+28 | nok10 = "".join((foo, '"'))
+   |         ^^^^^^^^^^^^^^^^^^^
+29 | nok11 = ''.join((foo, "'"))
+30 | nok12 = ''.join([foo, "'", '"'])
+   |
+help: Replace with `f'{foo}"'`
+25 |     return''.join([url, filename])
+26 | 
+27 | # Regression test for: https://github.com/astral-sh/ruff/issues/19837
+   - nok10 = "".join((foo, '"'))
+28 + nok10 = f'{foo}"'
+29 | nok11 = ''.join((foo, "'"))
+30 | nok12 = ''.join([foo, "'", '"'])
+31 | nok13 = "".join([foo, "'", '"'])
+note: This is an unsafe fix and may change runtime behavior
+
+FLY002 [*] Consider `f"{foo}'"` instead of string join
+  --> FLY002.py:29:9
+   |
+27 | # Regression test for: https://github.com/astral-sh/ruff/issues/19837
+28 | nok10 = "".join((foo, '"'))
+29 | nok11 = ''.join((foo, "'"))
+   |         ^^^^^^^^^^^^^^^^^^^
+30 | nok12 = ''.join([foo, "'", '"'])
+31 | nok13 = "".join([foo, "'", '"'])
+   |
+help: Replace with `f"{foo}'"`
+26 | 
+27 | # Regression test for: https://github.com/astral-sh/ruff/issues/19837
+28 | nok10 = "".join((foo, '"'))
+   - nok11 = ''.join((foo, "'"))
+29 + nok11 = f"{foo}'"
+30 | nok12 = ''.join([foo, "'", '"'])
+31 | nok13 = "".join([foo, "'", '"'])
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/isort/categorize.rs b/crates/ruff_linter/src/rules/isort/categorize.rs
index 7486cdbb0d..a6af5b4ca2 100644
--- a/crates/ruff_linter/src/rules/isort/categorize.rs
+++ b/crates/ruff_linter/src/rules/isort/categorize.rs
@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 use std::fmt;
-use std::fs;
 use std::iter;
 use std::path::{Path, PathBuf};
 
@@ -101,7 +100,6 @@ pub(crate) fn categorize<'a>(
     no_sections: bool,
     section_order: &'a [ImportSection],
     default_section: &'a ImportSection,
-    match_source_strategy: MatchSourceStrategy,
 ) -> &'a ImportSection {
     let module_base = module_name.split('.').next().unwrap();
     let (mut import_type, mut reason) = {
@@ -129,7 +127,7 @@ pub(crate) fn categorize<'a>(
                 &ImportSection::Known(ImportType::FirstParty),
                 Reason::SamePackage,
             )
-        } else if let Some(src) = match_sources(src, module_name, match_source_strategy) {
+        } else if let Some(src) = match_sources(src, module_name) {
             (
                 &ImportSection::Known(ImportType::FirstParty),
                 Reason::SourceMatch(src),
@@ -161,61 +159,29 @@ fn same_package(package: Option<PackageRoot<'_>>, module_base: &str) -> bool {
 /// Returns the source path with respect to which the module `name`
 /// should be considered first party, or `None` if no path is found.
 ///
-/// The [`MatchSourceStrategy`] is the criterion used to decide whether
-/// the module path matches a given source directory.
-///
 /// # Examples
 ///
-/// - The module named `foo` will match `[SRC]` if `[SRC]/foo` is a directory,
-///   no matter the strategy.
+/// - The module named `foo` will match `[SRC]` if `[SRC]/foo` is a directory
 ///
-/// - With `match_source_strategy == MatchSourceStrategy::Root`, the module
-///   named `foo.baz` will match `[SRC]` if `[SRC]/foo` is a
-///   directory or `[SRC]/foo.py` exists.
-///
-/// - With `match_source_stratgy == MatchSourceStrategy::FullPath`, the module
-///   named `foo.baz` will match `[SRC]` only if `[SRC]/foo/baz` is a directory,
-///   or `[SRC]/foo/baz.py` exists or `[SRC]/foo/baz.pyi` exists.
-fn match_sources<'a>(
-    paths: &'a [PathBuf],
-    name: &str,
-    match_source_strategy: MatchSourceStrategy,
-) -> Option<&'a Path> {
-    match match_source_strategy {
-        MatchSourceStrategy::Root => {
-            let base = name.split('.').next()?;
-            for path in paths {
-                if let Ok(metadata) = fs::metadata(path.join(base)) {
-                    if metadata.is_dir() {
-                        return Some(path);
-                    }
-                }
-                if let Ok(metadata) = fs::metadata(path.join(format!("{base}.py"))) {
-                    if metadata.is_file() {
-                        return Some(path);
-                    }
-                }
-            }
-            None
+/// - The module named `foo.baz` will match `[SRC]` only if `[SRC]/foo/baz`
+///   is a directory, or `[SRC]/foo/baz.py` exists,
+///   or `[SRC]/foo/baz.pyi` exists.
+fn match_sources<'a>(paths: &'a [PathBuf], name: &str) -> Option<&'a Path> {
+    let relative_path: PathBuf = name.split('.').collect();
+    relative_path.components().next()?;
+    for root in paths {
+        let candidate = root.join(&relative_path);
+        if candidate.is_dir() {
+            return Some(root);
         }
-        MatchSourceStrategy::FullPath => {
-            let relative_path: PathBuf = name.split('.').collect();
-            relative_path.components().next()?;
-            for root in paths {
-                let candidate = root.join(&relative_path);
-                if candidate.is_dir() {
-                    return Some(root);
-                }
-                if ["py", "pyi"]
-                    .into_iter()
-                    .any(|extension| candidate.with_extension(extension).is_file())
-                {
-                    return Some(root);
-                }
-            }
-            None
+        if ["py", "pyi"]
+            .into_iter()
+            .any(|extension| candidate.with_extension(extension).is_file())
+        {
+            return Some(root);
         }
     }
+    None
 }
 
 #[expect(clippy::too_many_arguments)]
@@ -229,7 +195,6 @@ pub(crate) fn categorize_imports<'a>(
     no_sections: bool,
     section_order: &'a [ImportSection],
     default_section: &'a ImportSection,
-    match_source_strategy: MatchSourceStrategy,
 ) -> BTreeMap<&'a ImportSection, ImportBlock<'a>> {
     let mut block_by_type: BTreeMap<&ImportSection, ImportBlock> = BTreeMap::default();
     // Categorize `Stmt::Import`.
@@ -245,7 +210,6 @@ pub(crate) fn categorize_imports<'a>(
             no_sections,
             section_order,
             default_section,
-            match_source_strategy,
         );
         block_by_type
             .entry(import_type)
@@ -266,7 +230,6 @@ pub(crate) fn categorize_imports<'a>(
             no_sections,
             section_order,
             default_section,
-            match_source_strategy,
         );
         block_by_type
             .entry(classification)
@@ -287,7 +250,6 @@ pub(crate) fn categorize_imports<'a>(
             no_sections,
             section_order,
             default_section,
-            match_source_strategy,
         );
         block_by_type
             .entry(classification)
@@ -308,7 +270,6 @@ pub(crate) fn categorize_imports<'a>(
             no_sections,
             section_order,
             default_section,
-            match_source_strategy,
         );
         block_by_type
             .entry(classification)
@@ -463,25 +424,9 @@ impl fmt::Display for KnownModules {
     }
 }
 
-/// Rule to determine whether a module path matches
-/// a relative path from a source directory.
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum MatchSourceStrategy {
-    /// Matches if first term in module path is found in file system
-    ///
-    /// # Example
-    /// Module is `foo.bar.baz` and `[SRC]/foo` exists
-    Root,
-    /// Matches only if full module path is reflected in file system
-    ///
-    /// # Example
-    /// Module is `foo.bar.baz` and `[SRC]/foo/bar/baz` exists
-    FullPath,
-}
-
 #[cfg(test)]
 mod tests {
-    use crate::rules::isort::categorize::{MatchSourceStrategy, match_sources};
+    use crate::rules::isort::categorize::match_sources;
 
     use std::fs;
     use std::path::{Path, PathBuf};
@@ -522,49 +467,17 @@ mod tests {
 
         let paths = vec![project_dir.clone()];
 
-        // Test with Root strategy
-
         assert_eq!(
-            match_sources(&paths, "mypackage", MatchSourceStrategy::Root),
+            match_sources(&paths, "mypackage"),
             Some(project_dir.as_path())
         );
 
         assert_eq!(
-            match_sources(&paths, "mypackage.module1", MatchSourceStrategy::Root),
+            match_sources(&paths, "mypackage.module1"),
             Some(project_dir.as_path())
         );
 
-        assert_eq!(
-            match_sources(&paths, "mypackage.nonexistent", MatchSourceStrategy::Root),
-            Some(project_dir.as_path())
-        );
-
-        assert_eq!(
-            match_sources(&paths, "nonexistent", MatchSourceStrategy::Root),
-            None
-        );
-
-        // Test with FullPath strategy
-
-        assert_eq!(
-            match_sources(&paths, "mypackage", MatchSourceStrategy::FullPath),
-            Some(project_dir.as_path())
-        );
-
-        assert_eq!(
-            match_sources(&paths, "mypackage.module1", MatchSourceStrategy::FullPath),
-            Some(project_dir.as_path())
-        );
-
-        // Differs in behavior from [`MatchSourceStrategy::Root`]
-        assert_eq!(
-            match_sources(
-                &paths,
-                "mypackage.nonexistent",
-                MatchSourceStrategy::FullPath
-            ),
-            None
-        );
+        assert_eq!(match_sources(&paths, "mypackage.nonexistent",), None);
     }
 
     /// Tests a src-based Python package layout:
@@ -588,39 +501,12 @@ mod tests {
 
         let paths = vec![src_dir.clone()];
 
-        // Test with Root strategy
-
         assert_eq!(
-            match_sources(&paths, "mypackage", MatchSourceStrategy::Root),
+            match_sources(&paths, "mypackage.module1"),
             Some(src_dir.as_path())
         );
 
-        assert_eq!(
-            match_sources(&paths, "mypackage.module1", MatchSourceStrategy::Root),
-            Some(src_dir.as_path())
-        );
-
-        assert_eq!(
-            match_sources(&paths, "mypackage.nonexistent", MatchSourceStrategy::Root),
-            Some(src_dir.as_path())
-        );
-
-        // Test with FullPath strategy
-
-        assert_eq!(
-            match_sources(&paths, "mypackage.module1", MatchSourceStrategy::FullPath),
-            Some(src_dir.as_path())
-        );
-
-        // Differs in behavior from [`MatchSourceStrategy::Root`]
-        assert_eq!(
-            match_sources(
-                &paths,
-                "mypackage.nonexistent",
-                MatchSourceStrategy::FullPath
-            ),
-            None
-        );
+        assert_eq!(match_sources(&paths, "mypackage.nonexistent"), None);
     }
 
     /// Tests a nested package layout:
@@ -647,35 +533,13 @@ mod tests {
 
         let paths = vec![project_dir.clone()];
 
-        // Test with Root strategy
         assert_eq!(
-            match_sources(&paths, "mypackage", MatchSourceStrategy::Root),
+            match_sources(&paths, "mypackage.subpackage.module2"),
             Some(project_dir.as_path())
         );
 
         assert_eq!(
-            match_sources(&paths, "mypackage.subpackage", MatchSourceStrategy::Root),
-            Some(project_dir.as_path())
-        );
-
-        // Test with FullPath strategy
-
-        assert_eq!(
-            match_sources(
-                &paths,
-                "mypackage.subpackage.module2",
-                MatchSourceStrategy::FullPath
-            ),
-            Some(project_dir.as_path())
-        );
-
-        // Differs in behavior from [`MatchSourceStrategy::Root`]
-        assert_eq!(
-            match_sources(
-                &paths,
-                "mypackage.subpackage.nonexistent",
-                MatchSourceStrategy::FullPath
-            ),
+            match_sources(&paths, "mypackage.subpackage.nonexistent"),
             None
         );
     }
@@ -699,52 +563,17 @@ mod tests {
         create_file(project_dir.join("namespace/package1/module1.py"));
 
         let paths = vec![project_dir.clone()];
-        // Test with Root strategy
-
         assert_eq!(
-            match_sources(&paths, "namespace", MatchSourceStrategy::Root),
+            match_sources(&paths, "namespace.package1"),
             Some(project_dir.as_path())
         );
 
         assert_eq!(
-            match_sources(&paths, "namespace.package1", MatchSourceStrategy::Root),
+            match_sources(&paths, "namespace.package1.module1"),
             Some(project_dir.as_path())
         );
 
-        assert_eq!(
-            match_sources(
-                &paths,
-                "namespace.package2.module1",
-                MatchSourceStrategy::Root
-            ),
-            Some(project_dir.as_path())
-        );
-
-        // Test with FullPath strategy
-
-        assert_eq!(
-            match_sources(&paths, "namespace.package1", MatchSourceStrategy::FullPath),
-            Some(project_dir.as_path())
-        );
-
-        assert_eq!(
-            match_sources(
-                &paths,
-                "namespace.package1.module1",
-                MatchSourceStrategy::FullPath
-            ),
-            Some(project_dir.as_path())
-        );
-
-        // Differs in behavior from [`MatchSourceStrategy::Root`]
-        assert_eq!(
-            match_sources(
-                &paths,
-                "namespace.package2.module1",
-                MatchSourceStrategy::FullPath
-            ),
-            None
-        );
+        assert_eq!(match_sources(&paths, "namespace.package2.module1"), None);
     }
 
     /// Tests a package with type stubs (.pyi files):
@@ -764,12 +593,11 @@ mod tests {
         create_file(project_dir.join("mypackage/__init__.py"));
         create_file(project_dir.join("mypackage/module1.pyi")); // Only create .pyi file, not .py
 
-        // Test with FullPath strategy
         let paths = vec![project_dir.clone()];
 
         // Module "mypackage.module1" should match project_dir using .pyi file
         assert_eq!(
-            match_sources(&paths, "mypackage.module1", MatchSourceStrategy::FullPath),
+            match_sources(&paths, "mypackage.module1"),
             Some(project_dir.as_path())
         );
     }
@@ -796,30 +624,17 @@ mod tests {
         create_file(project_dir.join("mypackage/feature/__init__.py"));
         create_file(project_dir.join("mypackage/feature/submodule.py"));
 
-        // Test with Root strategy
         let paths = vec![project_dir.clone()];
 
-        // Module "mypackage.feature" should match project_dir (matches the file first)
-        assert_eq!(
-            match_sources(&paths, "mypackage.feature", MatchSourceStrategy::Root),
-            Some(project_dir.as_path())
-        );
-
-        // Test with FullPath strategy
-
         // Module "mypackage.feature" should match project_dir
         assert_eq!(
-            match_sources(&paths, "mypackage.feature", MatchSourceStrategy::FullPath),
+            match_sources(&paths, "mypackage.feature"),
             Some(project_dir.as_path())
         );
 
         // Module "mypackage.feature.submodule" should match project_dir
         assert_eq!(
-            match_sources(
-                &paths,
-                "mypackage.feature.submodule",
-                MatchSourceStrategy::FullPath
-            ),
+            match_sources(&paths, "mypackage.feature.submodule"),
             Some(project_dir.as_path())
         );
     }
@@ -857,13 +672,13 @@ mod tests {
 
         // Module "package1" should match project1_dir
         assert_eq!(
-            match_sources(&paths, "package1", MatchSourceStrategy::Root),
+            match_sources(&paths, "package1"),
             Some(project1_dir.as_path())
         );
 
         // Module "package2" should match project2_dir
         assert_eq!(
-            match_sources(&paths, "package2", MatchSourceStrategy::Root),
+            match_sources(&paths, "package2"),
             Some(project2_dir.as_path())
         );
 
@@ -872,7 +687,7 @@ mod tests {
 
         // Module "package1" should still match project1_dir
         assert_eq!(
-            match_sources(&paths_reversed, "package1", MatchSourceStrategy::Root),
+            match_sources(&paths_reversed, "package1"),
             Some(project1_dir.as_path())
         );
     }
@@ -885,8 +700,7 @@ mod tests {
     ///
     /// In theory this should never happen since we expect
     /// module names to have been normalized by the time we
-    /// call `match_sources`. But it is worth noting that the
-    /// behavior is different depending on the [`MatchSourceStrategy`]
+    /// call `match_sources`.
     #[test]
     fn test_empty_module_name() {
         let temp_dir = tempdir().unwrap();
@@ -894,16 +708,9 @@ mod tests {
 
         create_dir(project_dir.join("mypackage"));
 
-        let paths = vec![project_dir.clone()];
+        let paths = vec![project_dir];
 
-        assert_eq!(
-            match_sources(&paths, "", MatchSourceStrategy::Root),
-            Some(project_dir.as_path())
-        );
-        assert_eq!(
-            match_sources(&paths, "", MatchSourceStrategy::FullPath),
-            None
-        );
+        assert_eq!(match_sources(&paths, ""), None);
     }
 
     /// Tests behavior with an empty list of source paths
@@ -911,14 +718,6 @@ mod tests {
     fn test_empty_paths() {
         let paths: Vec<PathBuf> = vec![];
 
-        // Empty paths should return None
-        assert_eq!(
-            match_sources(&paths, "mypackage", MatchSourceStrategy::Root),
-            None
-        );
-        assert_eq!(
-            match_sources(&paths, "mypackage", MatchSourceStrategy::FullPath),
-            None
-        );
+        assert_eq!(match_sources(&paths, "mypackage"), None);
     }
 }
diff --git a/crates/ruff_linter/src/rules/isort/mod.rs b/crates/ruff_linter/src/rules/isort/mod.rs
index 6f18ce05b8..28c3c69650 100644
--- a/crates/ruff_linter/src/rules/isort/mod.rs
+++ b/crates/ruff_linter/src/rules/isort/mod.rs
@@ -5,8 +5,8 @@ use std::path::PathBuf;
 use annotate::annotate_imports;
 use block::{Block, Trailer};
 pub(crate) use categorize::categorize;
+use categorize::categorize_imports;
 pub use categorize::{ImportSection, ImportType};
-use categorize::{MatchSourceStrategy, categorize_imports};
 use comments::Comment;
 use normalize::normalize_imports;
 use order::order_imports;
@@ -76,7 +76,6 @@ pub(crate) fn format_imports(
     source_type: PySourceType,
     target_version: PythonVersion,
     settings: &Settings,
-    match_source_strategy: MatchSourceStrategy,
     tokens: &Tokens,
 ) -> String {
     let trailer = &block.trailer;
@@ -104,7 +103,6 @@ pub(crate) fn format_imports(
             package,
             target_version,
             settings,
-            match_source_strategy,
         );
 
         if !block_output.is_empty() && !output.is_empty() {
@@ -161,7 +159,6 @@ fn format_import_block(
     package: Option<PackageRoot<'_>>,
     target_version: PythonVersion,
     settings: &Settings,
-    match_source_strategy: MatchSourceStrategy,
 ) -> String {
     #[derive(Debug, Copy, Clone, PartialEq, Eq)]
     enum LineInsertion {
@@ -182,7 +179,6 @@ fn format_import_block(
         settings.no_sections,
         &settings.section_order,
         &settings.default_section,
-        match_source_strategy,
     );
 
     let mut output = String::new();
@@ -646,7 +642,7 @@ mod tests {
     #[test_case(Path::new("order_by_type.py"))]
     fn order_by_type(path: &Path) -> Result<()> {
         let snapshot = format!("order_by_type_false_{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -657,7 +653,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -668,7 +663,7 @@ mod tests {
             "order_by_type_with_custom_classes_{}",
             path.to_string_lossy()
         );
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -685,7 +680,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -696,7 +690,7 @@ mod tests {
             "order_by_type_with_custom_constants_{}",
             path.to_string_lossy()
         );
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -715,7 +709,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -726,7 +719,7 @@ mod tests {
             "order_by_type_with_custom_variables_{}",
             path.to_string_lossy()
         );
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -743,7 +736,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -753,7 +745,7 @@ mod tests {
     #[test_case(Path::new("force_sort_within_sections_future.py"))]
     fn force_sort_within_sections(path: &Path) -> Result<()> {
         let snapshot = format!("force_sort_within_sections_{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -765,7 +757,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -773,7 +764,7 @@ mod tests {
     #[test_case(Path::new("force_sort_within_sections_lines_between.py"))]
     fn force_sort_within_sections_lines_between(path: &Path) -> Result<()> {
         let snapshot = format!("force_sort_within_sections_{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -785,7 +776,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -1001,6 +991,53 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Path::new("plr0402_skip.py"))]
+    fn plr0402_skips_required_imports(path: &Path) -> Result<()> {
+        let snapshot = format!("plr0402_skips_required_imports_{}", path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("isort/required_imports").join(path).as_path(),
+            &LinterSettings {
+                src: vec![test_resource_path("fixtures/isort")],
+                isort: super::settings::Settings {
+                    required_imports: BTreeSet::from_iter([NameImport::Import(
+                        ModuleNameImport::alias(
+                            "concurrent.futures".to_string(),
+                            "futures".to_string(),
+                        ),
+                    )]),
+                    ..super::settings::Settings::default()
+                },
+                ..LinterSettings::for_rules([Rule::MissingRequiredImport, Rule::ManualFromImport])
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
+
+    #[test_case(Path::new("future_import.py"))]
+    #[test_case(Path::new("docstring_future_import.py"))]
+    fn required_import_with_future_import(path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "required_import_with_future_import_{}",
+            path.to_string_lossy()
+        );
+        let diagnostics = test_path(
+            Path::new("isort/required_imports").join(path).as_path(),
+            &LinterSettings {
+                src: vec![test_resource_path("fixtures/isort")],
+                isort: super::settings::Settings {
+                    required_imports: BTreeSet::from_iter([NameImport::Import(
+                        ModuleNameImport::module("this".to_string()),
+                    )]),
+                    ..super::settings::Settings::default()
+                },
+                ..LinterSettings::for_rule(Rule::MissingRequiredImport)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
+
     #[test_case(Path::new("from_first.py"))]
     fn from_first(path: &Path) -> Result<()> {
         let snapshot = format!("from_first_{}", path.to_string_lossy());
@@ -1118,7 +1155,7 @@ mod tests {
     #[test_case(Path::new("no_lines_before.py"))]
     fn no_lines_before(path: &Path) -> Result<()> {
         let snapshot = format!("no_lines_before.py_{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -1135,7 +1172,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -1146,7 +1182,7 @@ mod tests {
             "no_lines_before_with_empty_sections.py_{}",
             path.to_string_lossy()
         );
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -1160,7 +1196,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -1171,7 +1206,7 @@ mod tests {
     #[test_case(Path::new("lines_after_imports_class_after.py"))]
     fn lines_after_imports(path: &Path) -> Result<()> {
         let snapshot = format!("lines_after_imports_{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -1182,7 +1217,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
@@ -1192,7 +1226,7 @@ mod tests {
     #[test_case(Path::new("lines_after_imports_class_after.py"))]
     fn lines_after_imports_default_settings(path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy();
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 src: vec![test_resource_path("fixtures/isort")],
@@ -1203,7 +1237,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(&*snapshot, diagnostics);
         Ok(())
     }
@@ -1211,7 +1244,7 @@ mod tests {
     #[test_case(Path::new("lines_between_types.py"))]
     fn lines_between_types(path: &Path) -> Result<()> {
         let snapshot = format!("lines_between_types{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
+        let diagnostics = test_path(
             Path::new("isort").join(path).as_path(),
             &LinterSettings {
                 isort: super::settings::Settings {
@@ -1222,7 +1255,6 @@ mod tests {
                 ..LinterSettings::for_rule(Rule::UnsortedImports)
             },
         )?;
-        diagnostics.sort_by_key(|diagnostic| diagnostic.expect_range().start());
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
diff --git a/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs b/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs
index bff7e42137..b887e1c2a0 100644
--- a/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs
+++ b/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs
@@ -39,6 +39,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## Options
 /// - `lint.isort.required-imports`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.218")]
 pub(crate) struct MissingRequiredImport(pub String);
 
 impl AlwaysFixableViolation for MissingRequiredImport {
@@ -125,7 +126,8 @@ fn add_required_import(
         TextRange::default(),
     );
     diagnostic.set_fix(Fix::safe_edit(
-        Importer::new(parsed, locator, stylist).add_import(required_import, TextSize::default()),
+        Importer::new(parsed, locator.contents(), stylist)
+            .add_import(required_import, TextSize::default()),
     ));
 }
 
diff --git a/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs b/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs
index 4f379b503a..febe9fc425 100644
--- a/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs
+++ b/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs
@@ -14,9 +14,7 @@ use crate::Locator;
 use crate::checkers::ast::LintContext;
 use crate::line_width::LineWidthBuilder;
 use crate::package::PackageRoot;
-use crate::preview::is_full_path_match_source_strategy_enabled;
 use crate::rules::isort::block::Block;
-use crate::rules::isort::categorize::MatchSourceStrategy;
 use crate::rules::isort::{comments, format_imports};
 use crate::settings::LinterSettings;
 use crate::{Edit, Fix, FixAvailability, Violation};
@@ -40,13 +38,8 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// import pandas
 /// ```
 ///
-/// ## Preview
-/// When [`preview`](https://docs.astral.sh/ruff/preview/) mode is enabled, Ruff applies a stricter criterion
-/// for determining whether an import should be classified as first-party.
-/// Specifically, for an import of the form `import foo.bar.baz`, Ruff will
-/// check that `foo/bar`, relative to a [user-specified `src`](https://docs.astral.sh/ruff/settings/#src) directory, contains either
-/// the directory `baz` or else a file with the name `baz.py` or `baz.pyi`.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.110")]
 pub(crate) struct UnsortedImports;
 
 impl Violation for UnsortedImports {
@@ -129,12 +122,6 @@ pub(crate) fn organize_imports(
         trailing_lines_end(block.imports.last().unwrap(), locator.contents())
     };
 
-    let match_source_strategy = if is_full_path_match_source_strategy_enabled(settings) {
-        MatchSourceStrategy::FullPath
-    } else {
-        MatchSourceStrategy::Root
-    };
-
     // Generate the sorted import block.
     let expected = format_imports(
         block,
@@ -148,7 +135,6 @@ pub(crate) fn organize_imports(
         source_type,
         target_version,
         &settings.isort,
-        match_source_strategy,
         tokens,
     );
 
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap
index 640f8ef45f..f5b9d42767 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap
@@ -15,19 +15,17 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | import sys
-   2  |+
-   3  |+import foo
-   4  |+from foo import bar, baz
-   5  |+
-2  6  | import baz
-3     |-from foo import bar, baz
-   7  |+import foo.bar
-   8  |+import foo.bar.baz
-4  9  | from foo.bar import blah, blub
-5  10 | from foo.bar.baz import something
-6     |-import foo
-7     |-import foo.bar
-8     |-import foo.bar.baz
+1  | import sys
+2  + 
+3  + import foo
+4  + from foo import bar, baz
+5  + 
+6  | import baz
+   - from foo import bar, baz
+7  + import foo.bar
+8  + import foo.bar.baz
+9  | from foo.bar import blah, blub
+10 | from foo.bar.baz import something
+   - import foo
+   - import foo.bar
+   - import foo.bar.baz
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap
index a112861682..917e7c390f 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap
@@ -15,18 +15,16 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | import sys
-   2  |+
-2  3  | import baz
-3     |-from foo import bar, baz
-   4  |+import foo.bar
-   5  |+import foo.bar.baz
-4  6  | from foo.bar import blah, blub
-5  7  | from foo.bar.baz import something
-   8  |+
-6  9  | import foo
-7     |-import foo.bar
-8     |-import foo.bar.baz
-   10 |+from foo import bar, baz
+1  | import sys
+2  + 
+3  | import baz
+   - from foo import bar, baz
+4  + import foo.bar
+5  + import foo.bar.baz
+6  | from foo.bar import blah, blub
+7  | from foo.bar.baz import something
+8  + 
+9  | import foo
+   - import foo.bar
+   - import foo.bar.baz
+10 + from foo import bar, baz
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap
index 7764f55c0c..19a1d5264c 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap
@@ -14,15 +14,13 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import os
-  2 |+
-2 3 | # This is a comment in the same section, so we need to add one newline.
-3 4 | import sys
-  5 |+
-4 6 | import numpy as np
-  7 |+
-5 8 | # This is a comment, but it starts a new section, so we don't need to add a newline
-6 9 | # before it.
-7 10 | import leading_prefix
+1  | import os
+2  + 
+3  | # This is a comment in the same section, so we need to add one newline.
+4  | import sys
+5  + 
+6  | import numpy as np
+7  + 
+8  | # This is a comment, but it starts a new section, so we don't need to add a newline
+9  | # before it.
+10 | import leading_prefix
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap
index f99d6dc880..897fef0831 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap
@@ -22,24 +22,22 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-from foo import (  # Comment on `foo`
-2     |-    Member as Alias,  # Comment on `Alias`
-3     |-)
-4     |-
-5  1  | from bar import (  # Comment on `bar`
-6  2  |     Member,  # Comment on `Member`
-7     |-)
-8     |-
-9     |-from baz import (  # Comment on `baz`
-10    |-    Member as Alias  # Comment on `Alias`
-11 3  | )
-12    |-
-13    |-from bop import (  # Comment on `bop`
-14    |-    Member  # Comment on `Member`
-   4  |+from baz import Member as Alias  # Comment on `baz`  # Comment on `Alias`
-   5  |+from bop import Member  # Comment on `bop`  # Comment on `Member`
-   6  |+from foo import (  # Comment on `foo`
-   7  |+    Member as Alias,  # Comment on `Alias`
-15 8  | )
+  - from foo import (  # Comment on `foo`
+  -     Member as Alias,  # Comment on `Alias`
+  - )
+  - 
+1 | from bar import (  # Comment on `bar`
+2 |     Member,  # Comment on `Member`
+  - )
+  - 
+  - from baz import (  # Comment on `baz`
+  -     Member as Alias  # Comment on `Alias`
+3 | )
+  - 
+  - from bop import (  # Comment on `bop`
+  -     Member  # Comment on `Member`
+4 + from baz import Member as Alias  # Comment on `baz`  # Comment on `Alias`
+5 + from bop import Member  # Comment on `bop`  # Comment on `Member`
+6 + from foo import (  # Comment on `foo`
+7 +     Member as Alias,  # Comment on `Alias`
+8 | )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap
index 94f4c90cd0..bf99dd51dc 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap
@@ -9,9 +9,7 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-import foo
-2   |-import bar
-  1 |+import bar
-  2 |+import foo
+  - import foo
+  - import bar
+1 + import bar
+2 + import foo
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap
index dbdb4cef00..5d92111627 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap
@@ -16,18 +16,16 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import A
-2 2 | import B
-  3 |+import C
-  4 |+import E
-3 5 | import b
-4   |-import C
-5 6 | import d
-6   |-import E
-7 7 | import f
-8   |-from g import a, B, c
-9   |-from h import A, b, C
-  8 |+from g import B, a, c
-  9 |+from h import A, C, b
+1 | import A
+2 | import B
+3 + import C
+4 + import E
+5 | import b
+  - import C
+6 | import d
+  - import E
+7 | import f
+  - from g import a, B, c
+  - from h import A, b, C
+8 + from g import B, a, c
+9 + from h import A, C, b
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap
index 282f28db82..86e459fb79 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap
@@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+from . import c
-  2 |+from .. import b
-1 3 | from ... import a
-2   |-from .. import b
-3   |-from . import c
+1 + from . import c
+2 + from .. import b
+3 | from ... import a
+  - from .. import b
+  - from . import c
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap
index c9a668a8cf..a02afabc6e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap
@@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+from module import CONSTANT, function
-1 2 | from module import Class as C
-2   |-from module import CONSTANT
-3   |-from module import function
-4 3 | from module import function as f
+1 + from module import CONSTANT, function
+2 | from module import Class as C
+  - from module import CONSTANT
+  - from module import function
+3 | from module import function as f
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap
index 1bfabef370..af1b0e074c 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap
@@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from module import Class as C
-2   |-from module import CONSTANT
-3   |-from module import function
-4   |-from module import function as f
-  1 |+from module import CONSTANT, Class as C, function, function as f
+  - from module import Class as C
+  - from module import CONSTANT
+  - from module import function
+  - from module import function as f
+1 + from module import CONSTANT, Class as C, function, function as f
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap
index 3277e96b8b..e718f48194 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap
@@ -12,18 +12,16 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from collections import Awaitable
-2   |-from collections import AsyncIterable
-3   |-from collections import Collection
-4   |-from collections import ChainMap
-5   |-from collections import MutableSequence, MutableMapping
-  1 |+from collections import (
-  2 |+    AsyncIterable,
-  3 |+    Awaitable,
-  4 |+    ChainMap,
-  5 |+    Collection,
-  6 |+    MutableMapping,
-  7 |+    MutableSequence,
-  8 |+)
+  - from collections import Awaitable
+  - from collections import AsyncIterable
+  - from collections import Collection
+  - from collections import ChainMap
+  - from collections import MutableSequence, MutableMapping
+1 + from collections import (
+2 +     AsyncIterable,
+3 +     Awaitable,
+4 +     ChainMap,
+5 +     Collection,
+6 +     MutableMapping,
+7 +     MutableSequence,
+8 + )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap
index a05d2accfa..9bc54c7de5 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap
@@ -40,50 +40,48 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_______________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | # Comment 1
-2  2  | # Comment 2
-3     |-import D
-   3  |+import B  # Comment 4
-4  4  | 
-5  5  | # Comment 3a
-6     |-import C
-7     |-
-8  6  | # Comment 3b
-9  7  | import C
-10    |-
-11    |-import B  # Comment 4
-   8  |+import D
-12 9  | 
-13 10 | # Comment 5
-14    |-
-15 11 | # Comment 6
-16 12 | from A import (
-17    |-    a,  # Comment 7
-18    |-    b,
-19    |-    c,  # Comment 8
-   13 |+    a,  # Comment 7  # Comment 9
-   14 |+    b,  # Comment 10
-   15 |+    c,  # Comment 8  # Comment 11
-20 16 | )
-21    |-from A import (
-22    |-    a,  # Comment 9
-23    |-    b,  # Comment 10
-24    |-    c,  # Comment 11
-   17 |+from D import (
-   18 |+    a_long_name_to_force_multiple_lines,  # Comment 12
-   19 |+    another_long_name_to_force_multiple_lines,  # Comment 13
-25 20 | )
-26    |-
-27    |-from D import a_long_name_to_force_multiple_lines # Comment 12
-28    |-from D import another_long_name_to_force_multiple_lines # Comment 13
-29    |-
-30 21 | from E import a  # Comment 1
-31    |-
-32    |-from F import a  # Comment 1
-33    |-from F import b
-   22 |+from F import (
-   23 |+    a,  # Comment 1
-   24 |+    b,
-   25 |+)
+1  | # Comment 1
+2  | # Comment 2
+   - import D
+3  + import B  # Comment 4
+4  | 
+5  | # Comment 3a
+   - import C
+   - 
+6  | # Comment 3b
+7  | import C
+   - 
+   - import B  # Comment 4
+8  + import D
+9  | 
+10 | # Comment 5
+   - 
+11 | # Comment 6
+12 | from A import (
+   -     a,  # Comment 7
+   -     b,
+   -     c,  # Comment 8
+13 +     a,  # Comment 7  # Comment 9
+14 +     b,  # Comment 10
+15 +     c,  # Comment 8  # Comment 11
+16 | )
+   - from A import (
+   -     a,  # Comment 9
+   -     b,  # Comment 10
+   -     c,  # Comment 11
+17 + from D import (
+18 +     a_long_name_to_force_multiple_lines,  # Comment 12
+19 +     another_long_name_to_force_multiple_lines,  # Comment 13
+20 | )
+   - 
+   - from D import a_long_name_to_force_multiple_lines # Comment 12
+   - from D import another_long_name_to_force_multiple_lines # Comment 13
+   - 
+21 | from E import a  # Comment 1
+   - 
+   - from F import a  # Comment 1
+   - from F import b
+22 + from F import (
+23 +     a,  # Comment 1
+24 +     b,
+25 + )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap
index 802f717317..8bd0e08fec 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap
@@ -11,9 +11,7 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import os
-2   |-import os
-3 2 | import os as os1
-4 3 | import os as os2
+1 | import os
+  - import os
+2 | import os as os1
+3 | import os as os2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap
index ea45f03a17..df981a6f5e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap
@@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import os
-  2 |+
-2 3 | import pandas
-  4 |+
-3 5 | import foo.baz
+1 | import os
+2 + 
+3 | import pandas
+4 + 
+5 | import foo.baz
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap
index 71e291594f..574d30e45a 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap
@@ -16,27 +16,25 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_____^
    |
 help: Organize imports
-
-ℹ Safe fix
-5  5  | 
-6  6  | if indented:
-7  7  |     from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-8     |-    from line_with_89 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-9     |-    from line_with_90 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10    |-    from line_with_91 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11    |-    from line_with_92 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-   8  |+    from line_with_89 import (
-   9  |+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-   10 |+    )
-   11 |+    from line_with_90 import (
-   12 |+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-   13 |+    )
-   14 |+    from line_with_91 import (
-   15 |+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-   16 |+    )
-   17 |+    from line_with_92 import (
-   18 |+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-   19 |+    )
-12 20 |     from line_with_93 import (
-13 21 |         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-14 22 |     )
+5  | 
+6  | if indented:
+7  |     from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+   -     from line_with_89 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+   -     from line_with_90 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+   -     from line_with_91 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+   -     from line_with_92 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+8  +     from line_with_89 import (
+9  +         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+10 +     )
+11 +     from line_with_90 import (
+12 +         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+13 +     )
+14 +     from line_with_91 import (
+15 +         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+16 +     )
+17 +     from line_with_92 import (
+18 +         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+19 +     )
+20 |     from line_with_93 import (
+21 |         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+22 |     )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap
index 1e9aa5cab2..8ae9842a78 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap
@@ -15,22 +15,20 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________^
   |
 help: Organize imports
-
-ℹ Safe 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 |+)
+1  | import a
+2  + 
+3  | # Don't take this comment into account when determining whether the next import can fit on one line.
+4  | 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.
+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  + 
+9  | # The next import fits on one line.
+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 + 
+12 | # 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
+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_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap
index 0e39739f5d..99e9f896a4 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap
@@ -34,52 +34,50 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-import sys, math
-2     |-from os import path, uname
-   1  |+import math
-   2  |+import sys
-3  3  | from json import detect_encoding
-4  4  | from json import dump
-5  5  | from json import dumps as json_dumps
-6  6  | from json import load
-7  7  | from json import loads as json_loads
-8     |-from logging.handlers import StreamHandler, FileHandler
-   8  |+from logging.handlers import FileHandler, StreamHandler
-   9  |+from os import path, uname
-9  10 | 
-10    |-# comment 1
-11    |-from third_party import lib1, lib2, \
-12    |-     lib3, lib7, lib5, lib6
-13    |-# comment 2
-14    |-from third_party import lib4
-   11 |+# comment 6
-   12 |+from bar import a  # comment 7
-   13 |+from bar import b  # comment 8
-15 14 | 
-   15 |+# comment 9
-   16 |+from baz import *  # comment 10
-16 17 | from foo import bar  # comment 3
-17 18 | from foo2 import bar2  # comment 4
-18    |-from foo3 import bar3, baz3  # comment 5
-   19 |+from foo3 import bar3  # comment 5
-   20 |+from foo3 import baz3  # comment 5
-19 21 | 
-20    |-# comment 6
-21    |-from bar import (
-22    |-     a, # comment 7
-23    |-     b, # comment 8
-24    |-)
-   22 |+# comment 1
-   23 |+from third_party import lib1
-   24 |+from third_party import lib2
-   25 |+from third_party import lib3
-25 26 | 
-26    |-# comment 9
-27    |-from baz import *  # comment 10
-   27 |+# comment 2
-   28 |+from third_party import lib4
-   29 |+from third_party import lib5
-   30 |+from third_party import lib6
-   31 |+from third_party import lib7
+   - import sys, math
+   - from os import path, uname
+1  + import math
+2  + import sys
+3  | from json import detect_encoding
+4  | from json import dump
+5  | from json import dumps as json_dumps
+6  | from json import load
+7  | from json import loads as json_loads
+   - from logging.handlers import StreamHandler, FileHandler
+8  + from logging.handlers import FileHandler, StreamHandler
+9  + from os import path, uname
+10 | 
+   - # comment 1
+   - from third_party import lib1, lib2, \
+   -      lib3, lib7, lib5, lib6
+   - # comment 2
+   - from third_party import lib4
+11 + # comment 6
+12 + from bar import a  # comment 7
+13 + from bar import b  # comment 8
+14 | 
+15 + # comment 9
+16 + from baz import *  # comment 10
+17 | from foo import bar  # comment 3
+18 | from foo2 import bar2  # comment 4
+   - from foo3 import bar3, baz3  # comment 5
+19 + from foo3 import bar3  # comment 5
+20 + from foo3 import baz3  # comment 5
+21 | 
+   - # comment 6
+   - from bar import (
+   -      a, # comment 7
+   -      b, # comment 8
+   - )
+22 + # comment 1
+23 + from third_party import lib1
+24 + from third_party import lib2
+25 + from third_party import lib3
+26 | 
+   - # comment 9
+   - from baz import *  # comment 10
+27 + # comment 2
+28 + from third_party import lib4
+29 + from third_party import lib5
+30 + from third_party import lib6
+31 + from third_party import lib7
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap
index c691b2aefe..439b590204 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap
@@ -20,24 +20,22 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-from a import a1  # import_from
-2     |-from c import * # import_from_star
-3  1  | import a  # import
-   2  |+import b as b1  # import_as
-4  3  | import c.d
-   4  |+import z
-   5  |+from a import a1  # import_from
-   6  |+from c import *  # import_from_star
-5  7  | from z import z1
-6     |-import b as b1  # import_as
-7     |-import z
-8  8  | 
-   9  |+from ...grandparent import fn3
-9  10 | from ..parent import *
-   11 |+from . import my
-10 12 | from .my import fn
-11    |-from . import my
-12 13 | from .my.nested import fn2
-13    |-from ...grandparent import fn3
+   - from a import a1  # import_from
+   - from c import * # import_from_star
+1  | import a  # import
+2  + import b as b1  # import_as
+3  | import c.d
+4  + import z
+5  + from a import a1  # import_from
+6  + from c import *  # import_from_star
+7  | from z import z1
+   - import b as b1  # import_as
+   - import z
+8  | 
+9  + from ...grandparent import fn3
+10 | from ..parent import *
+11 + from . import my
+12 | from .my import fn
+   - from . import my
+13 | from .my.nested import fn2
+   - from ...grandparent import fn3
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap
index 62d7a8d8ef..117531db2d 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap
@@ -20,25 +20,23 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-from a import a1  # import_from
-2     |-from c import * # import_from_star
-   1  |+import z
-   2  |+from z import z1
-3  3  | import a  # import
-   4  |+from a import a1  # import_from
-   5  |+import b as b1  # import_as
-   6  |+from c import *  # import_from_star
-4  7  | import c.d
-5     |-from z import z1
-6     |-import b as b1  # import_as
-7     |-import z
-8  8  | 
-   9  |+from ...grandparent import fn3
-9  10 | from ..parent import *
-   11 |+from . import my
-10 12 | from .my import fn
-11    |-from . import my
-12 13 | from .my.nested import fn2
-13    |-from ...grandparent import fn3
+   - from a import a1  # import_from
+   - from c import * # import_from_star
+1  + import z
+2  + from z import z1
+3  | import a  # import
+4  + from a import a1  # import_from
+5  + import b as b1  # import_as
+6  + from c import *  # import_from_star
+7  | import c.d
+   - from z import z1
+   - import b as b1  # import_as
+   - import z
+8  | 
+9  + from ...grandparent import fn3
+10 | from ..parent import *
+11 + from . import my
+12 | from .my import fn
+   - from . import my
+13 | from .my.nested import fn2
+   - from ...grandparent import fn3
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap
index 94212f25e5..632a0c606a 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap
@@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+from __future__ import annotations
-1 2 | import __future__
-2   |-from __future__ import annotations
+1 + from __future__ import annotations
+2 | import __future__
+  - from __future__ import annotations
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap
index 86c1f33ecd..b7be5859b6 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap
@@ -12,14 +12,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import datetime
-  2 |+import datetime as dt
-  3 |+from datetime import timedelta
-  4 |+from datetime import timezone as tz
-1 5 | import encodings
-2   |-from datetime import timezone as tz
-3   |-from datetime import timedelta
-4   |-import datetime as dt
-5   |-import datetime
+1 + import datetime
+2 + import datetime as dt
+3 + from datetime import timedelta
+4 + from datetime import timezone as tz
+5 | import encodings
+  - from datetime import timezone as tz
+  - from datetime import timedelta
+  - import datetime as dt
+  - import datetime
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap
index d13a77760b..98e508937e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap
@@ -30,38 +30,36 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-import lib6
-   1  |+import foo
-   2  |+import lib1
-2  3  | import lib2
-3     |-import lib5
-4     |-import lib1
-5  4  | import lib3
-   5  |+import lib3.lib4
-   6  |+import lib3.lib4.lib5
-6  7  | import lib4
-7     |-
-8     |-import foo
-   8  |+import lib5
-   9  |+import lib6
-9  10 | import z
-10 11 | from foo import bar
-   12 |+from foo.lib1.bar import baz
-11 13 | from lib1 import foo
-12    |-from lib2 import foo
-13 14 | from lib1.lib2 import foo
-14    |-from foo.lib1.bar import baz
-15    |-from lib4 import lib1
-16    |-from lib5 import lib2
-17    |-from lib4 import lib2
-18    |-from lib5 import lib1
-19    |-
-20    |-import lib3.lib4
-21    |-import lib3.lib4.lib5
-   15 |+from lib2 import foo
-22 16 | from lib3.lib4 import foo
-23 17 | from lib3.lib4.lib5 import foo
-   18 |+from lib4 import lib1, lib2
-   19 |+from lib5 import lib1, lib2
+   - import lib6
+1  + import foo
+2  + import lib1
+3  | import lib2
+   - import lib5
+   - import lib1
+4  | import lib3
+5  + import lib3.lib4
+6  + import lib3.lib4.lib5
+7  | import lib4
+   - 
+   - import foo
+8  + import lib5
+9  + import lib6
+10 | import z
+11 | from foo import bar
+12 + from foo.lib1.bar import baz
+13 | from lib1 import foo
+   - from lib2 import foo
+14 | from lib1.lib2 import foo
+   - from foo.lib1.bar import baz
+   - from lib4 import lib1
+   - from lib5 import lib2
+   - from lib4 import lib2
+   - from lib5 import lib1
+   - 
+   - import lib3.lib4
+   - import lib3.lib4.lib5
+15 + from lib2 import foo
+16 | from lib3.lib4 import foo
+17 | from lib3.lib4.lib5 import foo
+18 + from lib4 import lib1, lib2
+19 + from lib5 import lib1, lib2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap
index e3b5a2578a..2f36ba2660 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap
@@ -30,41 +30,39 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-import lib6
-2     |-import lib2
-3     |-import lib5
-4  1  | import lib1
-5  2  | import lib3
-6     |-import lib4
-7     |-
-   3  |+import lib3.lib4
-   4  |+import lib5
-   5  |+import z
-8  6  | import foo
-9     |-import z
-   7  |+import lib2
-   8  |+import lib3.lib4.lib5
-   9  |+import lib4
-   10 |+import lib6
-   11 |+from lib1 import foo
-   12 |+from lib3.lib4 import foo
-   13 |+from lib5 import lib1, lib2
-10 14 | from foo import bar
-11    |-from lib1 import foo
-12    |-from lib2 import foo
-13    |-from lib1.lib2 import foo
-14 15 | from foo.lib1.bar import baz
-15    |-from lib4 import lib1
-16    |-from lib5 import lib2
-17    |-from lib4 import lib2
-18    |-from lib5 import lib1
-19    |-
-20    |-import lib3.lib4
-21    |-import lib3.lib4.lib5
-22    |-from lib3.lib4 import foo
-   16 |+from lib1.lib2 import foo
-   17 |+from lib2 import foo
-23 18 | from lib3.lib4.lib5 import foo
-   19 |+from lib4 import lib1, lib2
+   - import lib6
+   - import lib2
+   - import lib5
+1  | import lib1
+2  | import lib3
+   - import lib4
+   - 
+3  + import lib3.lib4
+4  + import lib5
+5  + import z
+6  | import foo
+   - import z
+7  + import lib2
+8  + import lib3.lib4.lib5
+9  + import lib4
+10 + import lib6
+11 + from lib1 import foo
+12 + from lib3.lib4 import foo
+13 + from lib5 import lib1, lib2
+14 | from foo import bar
+   - from lib1 import foo
+   - from lib2 import foo
+   - from lib1.lib2 import foo
+15 | from foo.lib1.bar import baz
+   - from lib4 import lib1
+   - from lib5 import lib2
+   - from lib4 import lib2
+   - from lib5 import lib1
+   - 
+   - import lib3.lib4
+   - import lib3.lib4.lib5
+   - from lib3.lib4 import foo
+16 + from lib1.lib2 import foo
+17 + from lib2 import foo
+18 | from lib3.lib4.lib5 import foo
+19 + from lib4 import lib1, lib2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap
index e53adb4091..e42a678791 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap
@@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-2 3 | from .b import b1 as b1
-3 4 | from .c import c1
+  - from .a import a1 as a1, a2 as a2
+1 + from .a import a1 as a1
+2 + from .a import a2 as a2
+3 | from .b import b1 as b1
+4 | from .c import c1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap
index 25a4bc4b1c..206ea89c8b 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap
@@ -10,12 +10,10 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from .a import a1 as a1, a2 as a2
-  1 |+from .a import (
-  2 |+    a1 as a1,
-  3 |+    a2 as a2,
-  4 |+)
-2 5 | from .b import b1 as b1
-3 6 | from .c import c1
+  - from .a import a1 as a1, a2 as a2
+1 + from .a import (
+2 +     a1 as a1,
+3 +     a2 as a2,
+4 + )
+5 | from .b import b1 as b1
+6 | from .c import c1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap
index b1c25d4506..09821ee3a1 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap
@@ -15,16 +15,14 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-3  4  | from office_helper.core import CoreState
-   5  |+
-4  6  | import tests.common.foo as tcf
-5  7  | from tests.common import async_mock_service
-   8  |+
-6  9  | from experiments.starry import *
-7  10 | from experiments.weird import varieties
-8     |-from office_helper.assistants import entity_registry as er
+1  | # office_helper and tests are both first-party,
+2  | # but we want tests and experiments to be separated, in that order
+3  + from office_helper.assistants import entity_registry as er
+4  | from office_helper.core import CoreState
+5  + 
+6  | import tests.common.foo as tcf
+7  | from tests.common import async_mock_service
+8  + 
+9  | from experiments.starry import *
+10 | from experiments.weird import varieties
+   - from office_helper.assistants import entity_registry as er
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap
index 136faa2daf..718a705e2a 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap
@@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+from __future__ import annotations
-1 2 | import __future__
-2   |-from __future__ import annotations
+1 + from __future__ import annotations
+2 | import __future__
+  - from __future__ import annotations
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap
index 640f8ef45f..f5b9d42767 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap
@@ -15,19 +15,17 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | import sys
-   2  |+
-   3  |+import foo
-   4  |+from foo import bar, baz
-   5  |+
-2  6  | import baz
-3     |-from foo import bar, baz
-   7  |+import foo.bar
-   8  |+import foo.bar.baz
-4  9  | from foo.bar import blah, blub
-5  10 | from foo.bar.baz import something
-6     |-import foo
-7     |-import foo.bar
-8     |-import foo.bar.baz
+1  | import sys
+2  + 
+3  + import foo
+4  + from foo import bar, baz
+5  + 
+6  | import baz
+   - from foo import bar, baz
+7  + import foo.bar
+8  + import foo.bar.baz
+9  | from foo.bar import blah, blub
+10 | from foo.bar.baz import something
+   - import foo
+   - import foo.bar
+   - import foo.bar.baz
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap
index a68ca1b639..fc12431cad 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap
@@ -11,11 +11,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-3 3 | elif "setuptools" in sys.modules:
-4 4 |     from setuptools.command.sdist import sdist as _sdist
-5 5 | else:
-  6 |+    from distutils.command.sdist import sdist as _sdist
-6 7 |     from setuptools.command.sdist import sdist as _sdist
-7   |-    from distutils.command.sdist import sdist as _sdist
+3 | elif "setuptools" in sys.modules:
+4 |     from setuptools.command.sdist import sdist as _sdist
+5 | else:
+6 +     from distutils.command.sdist import sdist as _sdist
+7 |     from setuptools.command.sdist import sdist as _sdist
+  -     from distutils.command.sdist import sdist as _sdist
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap
index 549e10842a..aa37e927ca 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap
@@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import os
-1 2 | from collections import Collection
-2   |-import os
+1 + import os
+2 | from collections import Collection
+  - import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap
index 86ef5295bd..302280ade9 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap
@@ -18,23 +18,21 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________________________________________________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | from a.prometheus.metrics import (  # type:ignore[attr-defined]
-2 2 |     TERMINAL_CURRENTLY_RUNNING_TOTAL,
-3 3 | )
-4   |-
-5 4 | from b.prometheus.metrics import (
-6 5 |     TERMINAL_CURRENTLY_RUNNING_TOTAL,  # type:ignore[attr-defined]
-7 6 | )
-8   |-
-9   |-from c.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL  # type:ignore[attr-defined]
-10   |-
-11   |-from d.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL, OTHER_RUNNING_TOTAL  # type:ignore[attr-defined]
-  7 |+from c.prometheus.metrics import (
-  8 |+    TERMINAL_CURRENTLY_RUNNING_TOTAL,  # type:ignore[attr-defined]
-  9 |+)
-  10 |+from d.prometheus.metrics import (  # type:ignore[attr-defined]
-  11 |+    OTHER_RUNNING_TOTAL,
-  12 |+    TERMINAL_CURRENTLY_RUNNING_TOTAL,
-  13 |+)
+1  | from a.prometheus.metrics import (  # type:ignore[attr-defined]
+2  |     TERMINAL_CURRENTLY_RUNNING_TOTAL,
+3  | )
+   - 
+4  | from b.prometheus.metrics import (
+5  |     TERMINAL_CURRENTLY_RUNNING_TOTAL,  # type:ignore[attr-defined]
+6  | )
+   - 
+   - from c.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL  # type:ignore[attr-defined]
+   - 
+   - from d.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL, OTHER_RUNNING_TOTAL  # type:ignore[attr-defined]
+7  + from c.prometheus.metrics import (
+8  +     TERMINAL_CURRENTLY_RUNNING_TOTAL,  # type:ignore[attr-defined]
+9  + )
+10 + from d.prometheus.metrics import (  # type:ignore[attr-defined]
+11 +     OTHER_RUNNING_TOTAL,
+12 +     TERMINAL_CURRENTLY_RUNNING_TOTAL,
+13 + )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap
index 76f24a7a8b..df1b21ec93 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap
@@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted
 4 |   import os
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import a
-2 2 | import b
-  3 |+
-3 4 | x = 1
-4 5 | import os
-5 6 | import sys
+1 | import a
+2 | import b
+3 + 
+4 | x = 1
+5 | import os
+6 | import sys
 
 I001 [*] Import block is un-sorted or un-formatted
  --> insert_empty_lines.py:4:1
@@ -32,16 +30,14 @@ I001 [*] Import block is un-sorted or un-formatted
 7 |       pass
   |
 help: Organize imports
-
-ℹ Safe fix
-3 3 | x = 1
-4 4 | import os
-5 5 | import sys
-  6 |+
-  7 |+
-6 8 | def f():
-7 9 |     pass
-8 10 | if True:
+3  | x = 1
+4  | import os
+5  | import sys
+6  + 
+7  + 
+8  | def f():
+9  |     pass
+10 | if True:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> insert_empty_lines.py:14:1
@@ -54,15 +50,13 @@ I001 [*] Import block is un-sorted or un-formatted
 16 |   """Docstring"""
    |
 help: Organize imports
-
-ℹ Safe fix
-13 13 | y = 1
-14 14 | import os
-15 15 | import sys
-   16 |+
-16 17 | """Docstring"""
-17 18 | 
-18 19 | if True:
+13 | y = 1
+14 | import os
+15 | import sys
+16 + 
+17 | """Docstring"""
+18 | 
+19 | if True:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> insert_empty_lines.py:52:1
@@ -73,12 +67,10 @@ I001 [*] Import block is un-sorted or un-formatted
 54 | # Comment goes here.
    |
 help: Organize imports
-
-ℹ Safe fix
-51 51 | 
-52 52 | import os
-53 53 | 
-   54 |+
-54 55 | # Comment goes here.
-55 56 | def f():
-56 57 |     pass
+51 | 
+52 | import os
+53 | 
+54 + 
+55 | # Comment goes here.
+56 | def f():
+57 |     pass
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap
index edb2bd3578..c16c7d3602 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap
@@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted
 4 |   import os
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import a
-2 2 | import b
-  3 |+
-3 4 | x = 1
-4 5 | import os
-5 6 | import sys
+1 | import a
+2 | import b
+3 + 
+4 | x = 1
+5 | import os
+6 | import sys
 
 I001 [*] Import block is un-sorted or un-formatted
  --> insert_empty_lines.pyi:4:1
@@ -32,15 +30,13 @@ I001 [*] Import block is un-sorted or un-formatted
 7 |       pass
   |
 help: Organize imports
-
-ℹ Safe fix
-3 3 | x = 1
-4 4 | import os
-5 5 | import sys
-  6 |+
-6 7 | def f():
-7 8 |     pass
-8 9 | if True:
+3 | x = 1
+4 | import os
+5 | import sys
+6 + 
+7 | def f():
+8 |     pass
+9 | if True:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> insert_empty_lines.pyi:14:1
@@ -53,12 +49,10 @@ I001 [*] Import block is un-sorted or un-formatted
 16 |   """Docstring"""
    |
 help: Organize imports
-
-ℹ Safe fix
-13 13 | y = 1
-14 14 | import os
-15 15 | import sys
-   16 |+
-16 17 | """Docstring"""
-17 18 | 
-18 19 | if True:
+13 | y = 1
+14 | import os
+15 | import sys
+16 + 
+17 | """Docstring"""
+18 | 
+19 | if True:
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap
index a0303f1be5..0dc3139078 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap
@@ -14,16 +14,14 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import os
-1 2 | import sys
-  3 |+
-  4 |+import leading_prefix
-  5 |+
-2 6 | import ruff
-3   |-import leading_prefix
-4   |-import os
-5 7 | from . import leading_prefix
-6 8 | from .. import trailing_prefix
-7 9 | from ruff import check
+1 + import os
+2 | import sys
+3 + 
+4 + import leading_prefix
+5 + 
+6 | import ruff
+  - import leading_prefix
+  - import os
+7 | from . import leading_prefix
+8 | from .. import trailing_prefix
+9 | from ruff import check
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap
index 4ca17dda52..6a9d9ab9e3 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap
@@ -14,17 +14,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import os
-1 2 | import sys
-  3 |+
-  4 |+import leading_prefix
-  5 |+
-2 6 | import ruff
-3   |-import leading_prefix
-4   |-import os
-  7 |+from .. import trailing_prefix
-5 8 | from . import leading_prefix
-6   |-from .. import trailing_prefix
-7 9 | from ruff import check
+1 + import os
+2 | import sys
+3 + 
+4 + import leading_prefix
+5 + 
+6 | import ruff
+  - import leading_prefix
+  - import os
+7 + from .. import trailing_prefix
+8 | from . import leading_prefix
+  - from .. import trailing_prefix
+9 | from ruff import check
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap
index 0b48d95f99..cb9163b858 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap
@@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+from short import b
-1 2 | from mediuuuuuuuuuuum import a
-2   |-from short import b
-3 3 | from loooooooooooooooooooooog import c
+1 + from short import b
+2 | from mediuuuuuuuuuuum import a
+  - from short import b
+3 | from loooooooooooooooooooooog import c
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap
index 94f47e0f40..e3b19c01a4 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap
@@ -18,20 +18,18 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_^
    |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | from module1 import (
-2     |-    loooooooooooooong,
-   2  |+    short,
-3  3  |     σηορτ,
-   4  |+    shoort,
-4  5  |     mediuuuuum,
-5     |-    shoort,
-6     |-    looooooooooooooong,
-7  6  |     μεδιυυυυυμ,
-8     |-    short,
-9  7  |     mediuuuuuum,
-   8  |+    loooooooooooooong,
-10 9  |     λοοοοοοοοοοοοοονγ,
-   10 |+    looooooooooooooong,
-11 11 | )
+1  | from module1 import (
+   -     loooooooooooooong,
+2  +     short,
+3  |     σηορτ,
+4  +     shoort,
+5  |     mediuuuuum,
+   -     shoort,
+   -     looooooooooooooong,
+6  |     μεδιυυυυυμ,
+   -     short,
+7  |     mediuuuuuum,
+8  +     loooooooooooooong,
+9  |     λοοοοοοοοοοοοοονγ,
+10 +     looooooooooooooong,
+11 | )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap
index 2ec6069c64..7c70f9719c 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap
@@ -16,17 +16,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-import loooooooooooooong
-2   |-import mediuuuuuum
-3 1 | import short
-4 2 | import σηορτ
-5 3 | import shoort
-6 4 | import mediuuuuum
-  5 |+import μεδιυυυυυμ
-  6 |+import mediuuuuuum
-  7 |+import loooooooooooooong
-7 8 | import λοοοοοοοοοοοοοονγ
-8   |-import μεδιυυυυυμ
-9 9 | import looooooooooooooong
+  - import loooooooooooooong
+  - import mediuuuuuum
+1 | import short
+2 | import σηορτ
+3 | import shoort
+4 | import mediuuuuum
+5 + import μεδιυυυυυμ
+6 + import mediuuuuuum
+7 + import loooooooooooooong
+8 | import λοοοοοοοοοοοοοονγ
+  - import μεδιυυυυυμ
+9 | import looooooooooooooong
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap
index f6bd011af9..d096cf65a0 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap
@@ -13,14 +13,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import short
-1 2 | import mediuuuuuum
-2   |-import short
-3 3 | import looooooooooooooooong
-4   |-from looooooooooooooong import a
-  4 |+from short import b
-5 5 | from mediuuuum import c
-6   |-from short import b
-  6 |+from looooooooooooooong import a
+1 + import short
+2 | import mediuuuuuum
+  - import short
+3 | import looooooooooooooooong
+  - from looooooooooooooong import a
+4 + from short import b
+5 | from mediuuuum import c
+  - from short import b
+6 + from looooooooooooooong import a
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap
index a17b260c40..34291d8f81 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap
@@ -11,11 +11,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import short
-  2 |+import mediuuuuuuma
-1 3 | import mediuuuuuumb
-2   |-import short
-3 4 | import looooooooooooooooong
-4   |-import mediuuuuuuma
+1 + import short
+2 + import mediuuuuuuma
+3 | import mediuuuuuumb
+  - import short
+4 | import looooooooooooooooong
+  - import mediuuuuuuma
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap
index 10f86beef6..25679e4a7e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap
@@ -14,15 +14,13 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from ..looooooooooooooong import a
-2   |-from ...mediuuuum import b
-  1 |+from . import d
-3 2 | from .short import c
-4 3 | from ....short import c
-5   |-from . import d
-6 4 | from .mediuuuum import a
-7 5 | from ......short import b
-  6 |+from ...mediuuuum import b
-  7 |+from ..looooooooooooooong import a
+  - from ..looooooooooooooong import a
+  - from ...mediuuuum import b
+1 + from . import d
+2 | from .short import c
+3 | from ....short import c
+  - from . import d
+4 | from .mediuuuum import a
+5 | from ......short import b
+6 + from ...mediuuuum import b
+7 + from ..looooooooooooooong import a
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap
index 96a389074a..ed428cbcea 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap
@@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+from loooooooooooooooooooooog import c
-1 2 | from mediuuuuuuuuuuum import a
-2 3 | from short import b
-3   |-from loooooooooooooooooooooog import c
+1 + from loooooooooooooooooooooog import c
+2 | from mediuuuuuuuuuuum import a
+3 | from short import b
+  - from loooooooooooooooooooooog import c
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap
index eede9709bd..9ba474fbc2 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap
@@ -13,11 +13,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import short
-1 2 | import mediuuuuuum
-2   |-import short
-3 3 | import looooooooooooooooong
-4 4 | from looooooooooooooong import a
-5 5 | from mediuuuum import c
+1 + import short
+2 | import mediuuuuuum
+  - import short
+3 | import looooooooooooooooong
+4 | from looooooooooooooong import a
+5 | from mediuuuum import c
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap
index a17b260c40..34291d8f81 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap
@@ -11,11 +11,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import short
-  2 |+import mediuuuuuuma
-1 3 | import mediuuuuuumb
-2   |-import short
-3 4 | import looooooooooooooooong
-4   |-import mediuuuuuuma
+1 + import short
+2 + import mediuuuuuuma
+3 | import mediuuuuuumb
+  - import short
+4 | import looooooooooooooooong
+  - import mediuuuuuuma
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap
index 9822ae9a5a..1e3f63bcfc 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap
@@ -8,14 +8,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from long_module_name import member_one, member_two, member_three, member_four, member_five
-  1 |+from long_module_name import (
-  2 |+    member_five,
-  3 |+    member_four,
-  4 |+    member_one,
-  5 |+    member_three,
-  6 |+    member_two,
-  7 |+)
-2 8 |
+  - from long_module_name import member_one, member_two, member_three, member_four, member_five
+1 + from long_module_name import (
+2 +     member_five,
+3 +     member_four,
+4 +     member_one,
+5 +     member_three,
+6 +     member_two,
+7 + )
+8 |
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap
index ff6cdea1d7..023304caef 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap
@@ -8,14 +8,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from long_module_name import member_one, member_two, member_three, member_four, member_five
-  1 |+from long_module_name import (
-  2 |+    member_five,
-  3 |+    member_four,
-  4 |+    member_one,
-  5 |+    member_three,
-  6 |+    member_two,
-  7 |+)
-2 8 |
+  - from long_module_name import member_one, member_two, member_three, member_four, member_five
+1 + from long_module_name import (
+2 +     member_five,
+3 +     member_four,
+4 +     member_one,
+5 +     member_three,
+6 +     member_two,
+7 + )
+8 |
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap
index a4c209169f..1c228b764f 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap
@@ -16,19 +16,17 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | from typing import Any
-4  4  | 
-5     |-from requests import Session
-6     |-
-7  5  | from my_first_party import my_first_party_object
-   6  |+from requests import Session
-8  7  | 
-9  8  | from . import my_local_folder_object
-10    |-
-11    |-
-12 9  | 
-13 10 | class Thing(object):
-14 11 |   name: str
+2  | 
+3  | from typing import Any
+4  | 
+   - from requests import Session
+   - 
+5  | from my_first_party import my_first_party_object
+6  + from requests import Session
+7  | 
+8  | from . import my_local_folder_object
+   - 
+   - 
+9  | 
+10 | class Thing(object):
+11 |   name: str
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap
index c270af683c..cca116a4f7 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap
@@ -18,19 +18,17 @@ I001 [*] Import block is un-sorted or un-formatted
 11 |     name: str
    |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | from typing import Any
-4  4  | 
-5     |-from requests import Session
-6     |-
-7  5  | from my_first_party import my_first_party_object
-   6  |+from requests import Session
-8  7  | 
-9  8  | from . import my_local_folder_object
-   9  |+
-   10 |+
-10 11 | class Thing(object):
-11 12 |   name: str
-12 13 |   def __init__(self, name: str):
+2  | 
+3  | from typing import Any
+4  | 
+   - from requests import Session
+   - 
+5  | from my_first_party import my_first_party_object
+6  + from requests import Session
+7  | 
+8  | from . import my_local_folder_object
+9  + 
+10 + 
+11 | class Thing(object):
+12 |   name: str
+13 |   def __init__(self, name: str):
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap
index e35b6f26bb..58e7705715 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap
@@ -16,26 +16,24 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | from typing import Any
-4  4  | 
-5     |-from requests import Session
-6     |-
-7  5  | from my_first_party import my_first_party_object
-   6  |+from requests import Session
-8  7  | 
-9  8  | from . import my_local_folder_object
-10    |-
-11    |-
-12    |-
-13    |-
-14    |-
-15    |-
-16    |-
-17    |-
-18    |-
-19 9  | 
-20 10 | 
-21 11 | def main():
+2  | 
+3  | from typing import Any
+4  | 
+   - from requests import Session
+   - 
+5  | from my_first_party import my_first_party_object
+6  + from requests import Session
+7  | 
+8  | from . import my_local_folder_object
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+9  | 
+10 | 
+11 | def main():
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap
index a4c209169f..1c228b764f 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap
@@ -16,19 +16,17 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | from typing import Any
-4  4  | 
-5     |-from requests import Session
-6     |-
-7  5  | from my_first_party import my_first_party_object
-   6  |+from requests import Session
-8  7  | 
-9  8  | from . import my_local_folder_object
-10    |-
-11    |-
-12 9  | 
-13 10 | class Thing(object):
-14 11 |   name: str
+2  | 
+3  | from typing import Any
+4  | 
+   - from requests import Session
+   - 
+5  | from my_first_party import my_first_party_object
+6  + from requests import Session
+7  | 
+8  | from . import my_local_folder_object
+   - 
+   - 
+9  | 
+10 | class Thing(object):
+11 |   name: str
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap
index e6081ac492..1c21d083b5 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap
@@ -18,20 +18,18 @@ I001 [*] Import block is un-sorted or un-formatted
 11 |     name: str
    |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | from typing import Any
-4  4  | 
-   5  |+from my_first_party import my_first_party_object
-5  6  | from requests import Session
-6  7  | 
-7     |-from my_first_party import my_first_party_object
-   8  |+from . import my_local_folder_object
-   9  |+
-   10 |+
-8  11 | 
-9     |-from . import my_local_folder_object
-10 12 | class Thing(object):
-11 13 |   name: str
-12 14 |   def __init__(self, name: str):
+2  | 
+3  | from typing import Any
+4  | 
+5  + from my_first_party import my_first_party_object
+6  | from requests import Session
+7  | 
+   - from my_first_party import my_first_party_object
+8  + from . import my_local_folder_object
+9  + 
+10 + 
+11 | 
+   - from . import my_local_folder_object
+12 | class Thing(object):
+13 |   name: str
+14 |   def __init__(self, name: str):
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap
index 448c2eb7ee..c9b2306130 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap
@@ -16,25 +16,23 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | from typing import Any
-4  4  | 
-5     |-from requests import Session
-6     |-
-7  5  | from my_first_party import my_first_party_object
-   6  |+from requests import Session
-8  7  | 
-9  8  | from . import my_local_folder_object
-10    |-
-11    |-
-12    |-
-13    |-
-14    |-
-15    |-
-16    |-
-17    |-
-18 9  | 
-19 10 | 
-20 11 |
+2  | 
+3  | from typing import Any
+4  | 
+   - from requests import Session
+   - 
+5  | from my_first_party import my_first_party_object
+6  + from requests import Session
+7  | 
+8  | from . import my_local_folder_object
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+   - 
+9  | 
+10 | 
+11 |
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap
index ff9a5bfc0a..e0cc211bc4 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap
@@ -16,14 +16,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2 2 | 
-3 3 | from typing import Any
-4 4 | 
-5   |-from requests import Session
-6   |-
-7 5 | from my_first_party import my_first_party_object
-  6 |+from requests import Session
-8 7 | 
-9 8 | from . import my_local_folder_object
+2 | 
+3 | from typing import Any
+4 | 
+  - from requests import Session
+  - 
+5 | from my_first_party import my_first_party_object
+6 + from requests import Session
+7 | 
+8 | from . import my_local_folder_object
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap
index 0cdda30e86..7c7836dd37 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap
@@ -23,14 +23,12 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-9  9  | import requests
-10 10 | 
-11 11 | 
-   12 |+from loguru import Logger
-12 13 | from sanic import Sanic
-13    |-from loguru import Logger
-14 14 | 
-15 15 | from . import config
-16 16 | from .data import Data
+9  | import requests
+10 | 
+11 | 
+12 + from loguru import Logger
+13 | from sanic import Sanic
+   - from loguru import Logger
+14 | 
+15 | from . import config
+16 | from .data import Data
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap
index 1351db55e3..dea383689c 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap
@@ -45,57 +45,55 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_^
    |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | # This has a magic trailing comma, will be sorted, but not rolled into one line
-2     |-from sys import (
-3     |-    stderr,
-4     |-    argv,
-5     |-    stdout,
-6     |-    exit,
-   2  |+from glob import (
-   3  |+    escape,  # Ends with a comment, should still treat as magic trailing comma.
-   4  |+    glob,
-   5  |+    iglob,
-7  6  | )
-8  7  | 
-9  8  | # No magic comma, this will be rolled into one line.
-10    |-from os import (
-11    |-    path,
-12    |-    environ,
-13    |-    execl,
-14    |-    execv
-15    |-)
-16    |-
-17    |-from glob import (
-18    |-    glob,
-19    |-    iglob,
-20    |-    escape,  # Ends with a comment, should still treat as magic trailing comma.
-   9  |+from os import environ, execl, execv, path
-   10 |+from sys import (
-   11 |+    argv,
-   12 |+    exit,
-   13 |+    stderr,
-   14 |+    stdout,
-21 15 | )
-22 16 | 
-23 17 | # These will be combined, but without a trailing comma.
-24    |-from foo import bar
-25    |-from foo import baz
-   18 |+from foo import bar, baz
-26 19 | 
-27 20 | # These will be combined, _with_ a trailing comma.
-28    |-from module1 import member1
-29 21 | from module1 import (
-   22 |+    member1,
-30 23 |     member2,
-31 24 |     member3,
-32 25 | )
-33 26 | 
-34 27 | # These will be combined, _with_ a trailing comma.
-35    |-from module2 import member1, member2
-36 28 | from module2 import (
-   29 |+    member1,
-   30 |+    member2,
-37 31 |     member3,
-38 32 | )
+1  | # This has a magic trailing comma, will be sorted, but not rolled into one line
+   - from sys import (
+   -     stderr,
+   -     argv,
+   -     stdout,
+   -     exit,
+2  + from glob import (
+3  +     escape,  # Ends with a comment, should still treat as magic trailing comma.
+4  +     glob,
+5  +     iglob,
+6  | )
+7  | 
+8  | # No magic comma, this will be rolled into one line.
+   - from os import (
+   -     path,
+   -     environ,
+   -     execl,
+   -     execv
+   - )
+   - 
+   - from glob import (
+   -     glob,
+   -     iglob,
+   -     escape,  # Ends with a comment, should still treat as magic trailing comma.
+9  + from os import environ, execl, execv, path
+10 + from sys import (
+11 +     argv,
+12 +     exit,
+13 +     stderr,
+14 +     stdout,
+15 | )
+16 | 
+17 | # These will be combined, but without a trailing comma.
+   - from foo import bar
+   - from foo import baz
+18 + from foo import bar, baz
+19 | 
+20 | # These will be combined, _with_ a trailing comma.
+   - from module1 import member1
+21 | from module1 import (
+22 +     member1,
+23 |     member2,
+24 |     member3,
+25 | )
+26 | 
+27 | # These will be combined, _with_ a trailing comma.
+   - from module2 import member1, member2
+28 | from module2 import (
+29 +     member1,
+30 +     member2,
+31 |     member3,
+32 | )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap
index f8c50324e8..a3bf6f296b 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap
@@ -13,16 +13,14 @@ I001 [*] Import block is un-sorted or un-formatted
 6 |           import collections
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | match 1:
-2 2 |     case 1:
-  3 |+        import os
-3 4 |         import sys
-4   |-        import os
-5 5 |     case 2:
-6 6 |         import collections
-7 7 |         import abc
+1 | match 1:
+2 |     case 1:
+3 +         import os
+4 |         import sys
+  -         import os
+5 |     case 2:
+6 |         import collections
+7 |         import abc
 
 I001 [*] Import block is un-sorted or un-formatted
  --> match_case.py:6:9
@@ -34,11 +32,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-3 3 |         import sys
-4 4 |         import os
-5 5 |     case 2:
-  6 |+        import abc
-6 7 |         import collections
-7   |-        import abc
+3 |         import sys
+4 |         import os
+5 |     case 2:
+6 +         import abc
+7 |         import collections
+  -         import abc
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap
index 3179e36560..f9934c7442 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap
@@ -23,24 +23,22 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_^
    |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | import numpy1
-   2  |+import numpy2
-2  3  | import numpy10
-3     |-import numpy2
-4  4  | from numpy import (
-5  5  |     cos,
-6  6  |     int8,
-7     |-    sin,
-   7  |+    int16,
-8  8  |     int32,
-9  9  |     int64,
-   10 |+    sin,
-10 11 |     tan,
-11 12 |     uint8,
-12 13 |     uint16,
-13    |-    int16,
-14 14 |     uint32,
-15 15 |     uint64,
-16 16 | )
+1  | import numpy1
+2  + import numpy2
+3  | import numpy10
+   - import numpy2
+4  | from numpy import (
+5  |     cos,
+6  |     int8,
+   -     sin,
+7  +     int16,
+8  |     int32,
+9  |     int64,
+10 +     sin,
+11 |     tan,
+12 |     uint8,
+13 |     uint16,
+   -     int16,
+14 |     uint32,
+15 |     uint64,
+16 | )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap
index d23761ecb0..28955f76f3 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap
@@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import os
-2   |-import pandas
-  2 |+
-3 3 | import foo.baz
-  4 |+import pandas
+1 | import os
+  - import pandas
+2 + 
+3 | import foo.baz
+4 + import pandas
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap
index 49a20edc69..b19933fbe4 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap
@@ -16,14 +16,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2 2 | 
-3 3 | from typing import Any
-4 4 | 
-5   |-from requests import Session
-6   |-
-7 5 | from my_first_party import my_first_party_object
-  6 |+from requests import Session
-8 7 | 
-9 8 | from . import my_local_folder_object
+2 | 
+3 | from typing import Any
+4 | 
+  - from requests import Session
+  - 
+5 | from my_first_party import my_first_party_object
+6 + from requests import Session
+7 | 
+8 | from . import my_local_folder_object
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap
index 6edb96de08..aa2e6aa9a5 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap
@@ -16,15 +16,13 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | from __future__ import annotations
-2   |-
-3 2 | from typing import Any
-4   |-
-  3 |+from my_first_party import my_first_party_object
-5 4 | from requests import Session
-6   |-
-7   |-from my_first_party import my_first_party_object
-8   |-
-9 5 | from . import my_local_folder_object
+1 | from __future__ import annotations
+  - 
+2 | from typing import Any
+  - 
+3 + from my_first_party import my_first_party_object
+4 | from requests import Session
+  - 
+  - from my_first_party import my_first_party_object
+  - 
+5 | from . import my_local_folder_object
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap
index ccd137ad41..03c88d8522 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap
@@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted
   | |____________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | from __future__ import annotations
-2 2 | from typing import Any
-  3 |+
-3 4 | from . import my_local_folder_object
+1 | from __future__ import annotations
+2 | from typing import Any
+3 + 
+4 | from . import my_local_folder_object
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap
index 2a6ae0bc0e..9cf50cb706 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap
@@ -16,16 +16,14 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | from __future__ import annotations
-2  2  | 
-3     |-import os
-4  3  | import django.settings
-5  4  | from library import foo
-   5  |+import os
-6  6  | import pytz
-   7  |+import sys
-7  8  | 
-8  9  | from . import local
-9     |-import sys
+1 | from __future__ import annotations
+2 | 
+  - import os
+3 | import django.settings
+4 | from library import foo
+5 + import os
+6 | import pytz
+7 + import sys
+8 | 
+9 | from . import local
+  - import sys
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap
index 2a77df40fd..10553e7371 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap
@@ -8,7 +8,5 @@ I001 [*] Import block is un-sorted or un-formatted
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Organize imports
-
-ℹ Safe 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
+  - 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_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap
index 5d90b0269b..689773fc03 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap
@@ -19,23 +19,21 @@ I001 [*] Import block is un-sorted or un-formatted
    | |__________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-import StringIO
-2  1  | import glob
-3  2  | import os
-4  3  | import shutil
-5  4  | import tempfile
-6  5  | import time
-7     |-from subprocess import PIPE, Popen, STDOUT
-8     |-from module import Class, CONSTANT, function, BASIC, Apple
-9     |-import foo
-10    |-import FOO
-   6  |+from subprocess import PIPE, STDOUT, Popen
-   7  |+
-11 8  | import BAR
-12 9  | import bar
-   10 |+import FOO
-   11 |+import foo
-   12 |+import StringIO
-   13 |+from module import BASIC, CONSTANT, Apple, Class, function
+   - import StringIO
+1  | import glob
+2  | import os
+3  | import shutil
+4  | import tempfile
+5  | import time
+   - from subprocess import PIPE, Popen, STDOUT
+   - from module import Class, CONSTANT, function, BASIC, Apple
+   - import foo
+   - import FOO
+6  + from subprocess import PIPE, STDOUT, Popen
+7  + 
+8  | import BAR
+9  | import bar
+10 + import FOO
+11 + import foo
+12 + import StringIO
+13 + from module import BASIC, CONSTANT, Apple, Class, function
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap
index c31710b90d..4277709111 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap
@@ -19,22 +19,20 @@ I001 [*] Import block is un-sorted or un-formatted
    | |__________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-import StringIO
-2  1  | import glob
-3  2  | import os
-4  3  | import shutil
-5  4  | import tempfile
-6  5  | import time
-7  6  | from subprocess import PIPE, Popen, STDOUT
-8     |-from module import Class, CONSTANT, function, BASIC, Apple
-9     |-import foo
-10    |-import FOO
-   7  |+
-11 8  | import BAR
-12 9  | import bar
-   10 |+import FOO
-   11 |+import foo
-   12 |+import StringIO
-   13 |+from module import Apple, BASIC, Class, CONSTANT, function
+   - import StringIO
+1  | import glob
+2  | import os
+3  | import shutil
+4  | import tempfile
+5  | import time
+6  | from subprocess import PIPE, Popen, STDOUT
+   - from module import Class, CONSTANT, function, BASIC, Apple
+   - import foo
+   - import FOO
+7  + 
+8  | import BAR
+9  | import bar
+10 + import FOO
+11 + import foo
+12 + import StringIO
+13 + from module import Apple, BASIC, Class, CONSTANT, function
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap
index 829c83cdd5..b4cc49d62d 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap
@@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-4   |-from torch.nn import SELU, AClass, A_CONSTANT
-  1 |+from subprocess import N_CLASS, PIPE, STDOUT, Popen
-  2 |+
-  3 |+from module import BASIC, CLASS, CONSTANT, Apple, Class, function
-  4 |+from sklearn.svm import CONST, SVC, Klass, func
-  5 |+from torch.nn import A_CONSTANT, SELU, AClass
+  - from sklearn.svm import func, SVC, CONST, Klass
+  - from subprocess import N_CLASS, PIPE, Popen, STDOUT
+  - from module import CLASS, Class, CONSTANT, function, BASIC, Apple
+  - from torch.nn import SELU, AClass, A_CONSTANT
+1 + from subprocess import N_CLASS, PIPE, STDOUT, Popen
+2 + 
+3 + from module import BASIC, CLASS, CONSTANT, Apple, Class, function
+4 + from sklearn.svm import CONST, SVC, Klass, func
+5 + from torch.nn import A_CONSTANT, SELU, AClass
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap
index 9c80994321..0aad0400d5 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap
@@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-4   |-from torch.nn import SELU, AClass, A_CONSTANT
-  1 |+from subprocess import PIPE, STDOUT, N_CLASS, Popen
-  2 |+
-  3 |+from module import BASIC, CONSTANT, Apple, CLASS, Class, function
-  4 |+from sklearn.svm import CONST, Klass, SVC, func
-  5 |+from torch.nn import A_CONSTANT, AClass, SELU
+  - from sklearn.svm import func, SVC, CONST, Klass
+  - from subprocess import N_CLASS, PIPE, Popen, STDOUT
+  - from module import CLASS, Class, CONSTANT, function, BASIC, Apple
+  - from torch.nn import SELU, AClass, A_CONSTANT
+1 + from subprocess import PIPE, STDOUT, N_CLASS, Popen
+2 + 
+3 + from module import BASIC, CONSTANT, Apple, CLASS, Class, function
+4 + from sklearn.svm import CONST, Klass, SVC, func
+5 + from torch.nn import A_CONSTANT, AClass, SELU
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap
index 4af13473df..12070dd546 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap
@@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________________________________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-  2 |+
-  3 |+from sklearn.svm import XYZ, Const, Klass, constant, func, variable
+  - from sklearn.svm import XYZ, func, variable, Const, Klass, constant
+  - 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
+2 + 
+3 + from sklearn.svm import XYZ, Const, Klass, constant, func, variable
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap
index 12652cfccf..8a4faaa00f 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap
@@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________________________________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-  2 |+
-  3 |+from sklearn.svm import Const, constant, XYZ, Klass, func, variable
+  - from sklearn.svm import XYZ, func, variable, Const, Klass, constant
+  - 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
+2 + 
+3 + from sklearn.svm import Const, constant, XYZ, Klass, func, variable
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap
index 9c479a19f4..97f2340ad4 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap
@@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________________________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-  2 |+
-  3 |+from sklearn.svm import CONST, VAR, Class, MyVar, abc
+  - from sklearn.svm import VAR, Class, MyVar, CONST, abc
+  - from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe
+1 + from subprocess import CONSTANT, Klass, Variable, exe, utils, var_ABC
+2 + 
+3 + from sklearn.svm import CONST, VAR, Class, MyVar, abc
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap
index 5ba8a2a85d..9bed5e346a 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap
@@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________________________________________________________________^
   |
 help: Organize imports
-
-ℹ Safe 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
-  2 |+
-  3 |+from sklearn.svm import CONST, Class, abc, MyVar, VAR
+  - from sklearn.svm import VAR, Class, MyVar, CONST, abc
+  - from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe
+1 + from subprocess import CONSTANT, Klass, exe, utils, var_ABC, Variable
+2 + 
+3 + from sklearn.svm import CONST, Class, abc, MyVar, VAR
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap
index 81306b136c..a7721979d3 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap
@@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from .a import a
-2 1 | from ..a import a
-3 2 | from ..b import a
-  3 |+from .a import a
-4 4 | from .b import a
+  - from .a import a
+1 | from ..a import a
+2 | from ..b import a
+3 + from .a import a
+4 | from .b import a
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__plr0402_skips_required_imports_plr0402_skip.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__plr0402_skips_required_imports_plr0402_skip.py.snap
new file mode 100644
index 0000000000..ed369f0fd6
--- /dev/null
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__plr0402_skips_required_imports_plr0402_skip.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap
index 0e7e1444ff..947ae20af8 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap
@@ -18,16 +18,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |__________^
    |
 help: Organize imports
-
-ℹ Safe fix
-   1  |+import abc
-1  2  | import io
-   3  |+
-2  4  | # Old MacDonald had a farm,
-3  5  | # EIEIO
-4  6  | # And on his farm he had a cow,
+1  + import abc
+2  | import io
+3  + 
+4  | # Old MacDonald had a farm,
+5  | # EIEIO
+6  | # And on his farm he had a cow,
 --------------------------------------------------------------------------------
-8  10 | # Old MacDonald had a farm,
-9  11 | # EIEIO
-10 12 | from errno import EIO
-11    |-import abc
+10 | # Old MacDonald had a farm,
+11 | # EIEIO
+12 | from errno import EIO
+   - import abc
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap
index bed68a5be3..81bfbf8ac2 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap
@@ -13,16 +13,14 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-from some_other_module import some_class
-2   |-from some_other_module import *
-3 1 | # Above
-4   |-from some_module import some_class  # Aside
-5   |-# Above
-6 2 | from some_module import *  # Aside
-  3 |+
-  4 |+# Above
-  5 |+from some_module import some_class  # Aside
-  6 |+from some_other_module import *
-  7 |+from some_other_module import some_class
+  - from some_other_module import some_class
+  - from some_other_module import *
+1 | # Above
+  - from some_module import some_class  # Aside
+  - # Above
+2 | from some_module import *  # Aside
+3 + 
+4 + # Above
+5 + from some_module import some_class  # Aside
+6 + from some_other_module import *
+7 + from some_other_module import some_class
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap
index cf9fa130e1..6c0579a1be 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap
@@ -12,15 +12,13 @@ I001 [*] Import block is un-sorted or un-formatted
 5 |       import sys
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | if True:
-  2 |+    import os
-2 3 |     import sys
-3   |-    import os
-4 4 | else:
-5 5 |     import sys
-6 6 |     import os
+1 | if True:
+2 +     import os
+3 |     import sys
+  -     import os
+4 | else:
+5 |     import sys
+6 |     import os
 
 I001 [*] Import block is un-sorted or un-formatted
  --> preserve_indentation.py:5:5
@@ -32,11 +30,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_____________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2 2 |     import sys
-3 3 |     import os
-4 4 | else:
-  5 |+    import os
-5 6 |     import sys
-6   |-    import os
+2 |     import sys
+3 |     import os
+4 | else:
+5 +     import os
+6 |     import sys
+  -     import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap
index 66ad3162d5..b1874b9482 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap
@@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_^
   |
 help: Organize imports
-
-ℹ Safe 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,
-4 3 | )
-  4 |+from mypackage.subpackage import items  # long comment that seems to be a problem
+1 | from mypackage.subpackage import (  # long comment that seems to be a problem
+2 |     a_long_variable_name_that_causes_problems,
+  -     items,
+3 | )
+4 + from mypackage.subpackage import items  # long comment that seems to be a problem
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap
index a9b7d1db9d..a95f61cadb 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap
@@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import os
-1 2 | import sys
-2   |-import os
+1 + import os
+2 | import sys
+  - import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap
index dd3573040b..9a2d25a230 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> comment.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | #!/usr/bin/env python3
-  2 |+from __future__ import annotations
-2 3 | 
-3 4 | x = 1
+1 | #!/usr/bin/env python3
+2 + from __future__ import annotations
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap
index b458a05db3..d1911923c2 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap
@@ -4,11 +4,9 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> comments_and_newlines.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-2 2 | # A copyright notice could go here
-3 3 | 
-4 4 | # A linter directive could go here
-  5 |+from __future__ import annotations
-5 6 | 
-6 7 | x = 1
+2 | # A copyright notice could go here
+3 | 
+4 | # A linter directive could go here
+5 + from __future__ import annotations
+6 | 
+7 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap
index 5f66b71778..1b3b41d7ee 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> docstring.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""
-  2 |+from __future__ import annotations
-2 3 | 
-3 4 | x = 1
+1 | """Hello, world!"""
+2 + from __future__ import annotations
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap
index 69109cf945..129377aa61 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> docstring_followed_by_continuation.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""\
-2 2 | 
-  3 |+from __future__ import annotations
-3 4 | x = 1; y = 2
+1 | """Hello, world!"""\
+2 | 
+3 + from __future__ import annotations
+4 | x = 1; y = 2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap
index 52a950f66e..e64702b5c3 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap
@@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> docstring_with_continuation.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1   |-"""Hello, world!"""; x = \
-  1 |+"""Hello, world!"""; from __future__ import annotations; x = \
-2 2 |     1; y = 2
+  - """Hello, world!"""; x = \
+1 + """Hello, world!"""; from __future__ import annotations; x = \
+2 |     1; y = 2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap
index 3c438a2ed8..7607b810c4 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap
@@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> docstring_with_multiple_continuations.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""\
-2 2 | \
-3 3 | 
-  4 |+from __future__ import annotations
-4 5 | x = 1; y = 2
+1 | """Hello, world!"""\
+2 | \
+3 | 
+4 + from __future__ import annotations
+5 | x = 1; y = 2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap
index d9c7308b79..b4953166a9 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap
@@ -4,7 +4,5 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> docstring_with_semicolon.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1   |-"""Hello, world!"""; x = 1
-  1 |+"""Hello, world!"""; from __future__ import annotations; x = 1
+  - """Hello, world!"""; x = 1
+1 + """Hello, world!"""; from __future__ import annotations; x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap
index 1a5c82902f..e4a5e566ff 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap
@@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> existing_import.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-  1 |+from __future__ import annotations
-1 2 | from __future__ import generator_stop
-2 3 | import os
+1 | from __future__ import generator_stop
+2 + from __future__ import annotations
+3 | import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap
index 49f487f419..27528e2e3e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap
@@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> multiline_docstring.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | """a
-2 2 | b"""
-3 3 | # b
-  4 |+from __future__ import annotations
-4 5 | import os
+1 | """a
+2 | b"""
+3 | # b
+4 + from __future__ import annotations
+5 | import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap
index ca65feda4d..ea3ab8c897 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap
@@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> off.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | # isort: off
-  2 |+from __future__ import annotations
-2 3 | 
-3 4 | x = 1
-4 5 | # isort: on
+1 | # isort: off
+2 + from __future__ import annotations
+3 | 
+4 | x = 1
+5 | # isort: on
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap
index e99460f814..4296853943 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap
@@ -11,15 +11,13 @@ F401 [*] `sys` imported but unused
 7 | # Unused, _not_ marked as required (due to the alias).
   |
 help: Remove unused import: `sys`
-
-ℹ Safe fix
-2 2 | import os
-3 3 | 
-4 4 | # Unused, _not_ marked as required.
-5   |-import sys
-6 5 | 
-7 6 | # Unused, _not_ marked as required (due to the alias).
-8 7 | import pathlib as non_alias
+2 | import os
+3 | 
+4 | # Unused, _not_ marked as required.
+  - import sys
+5 | 
+6 | # Unused, _not_ marked as required (due to the alias).
+7 | import pathlib as non_alias
 
 F401 [*] `pathlib` imported but unused
   --> unused.py:8:19
@@ -31,12 +29,10 @@ F401 [*] `pathlib` imported but unused
 10 | # Unused, marked as required.
    |
 help: Remove unused import: `pathlib`
-
-ℹ Safe fix
-5 5 | import sys
-6 6 | 
-7 7 | # Unused, _not_ marked as required (due to the alias).
-8   |-import pathlib as non_alias
-9 8 | 
-10 9 | # Unused, marked as required.
-11 10 | import shelve as alias
+5  | import sys
+6  | 
+7  | # Unused, _not_ marked as required (due to the alias).
+   - import pathlib as non_alias
+8  | 
+9  | # Unused, marked as required.
+10 | import shelve as alias
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap
index 08b3cfc7ba..087919fdc8 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap
@@ -4,11 +4,9 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> whitespace.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | # This is a regression test for https://github.com/astral-sh/ruff/issues/19310
-2 2 | # there is a (potentially invisible) unicode formfeed character (000C) between "docstring" and the semicolon
-3   |-"docstring"; print(
-  3 |+"docstring"; from __future__ import annotations; print(
-4 4 |     f"{__doc__=}",
-5 5 | )
+1 | # This is a regression test for https://github.com/astral-sh/ruff/issues/19310
+2 | # there is a (potentially invisible) unicode formfeed character (000C) between "docstring" and the semicolon
+  - "docstring"; print(
+3 + "docstring"; from __future__ import annotations; print(
+4 |     f"{__doc__=}",
+5 | )
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap
index ae06367b92..dcfb94ea27 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> comment.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1 1 | #!/usr/bin/env python3
-  2 |+from __future__ import annotations as _annotations
-2 3 | 
-3 4 | x = 1
+1 | #!/usr/bin/env python3
+2 + from __future__ import annotations as _annotations
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap
index c85b5c507c..0253eee38e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap
@@ -4,11 +4,9 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> comments_and_newlines.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-2 2 | # A copyright notice could go here
-3 3 | 
-4 4 | # A linter directive could go here
-  5 |+from __future__ import annotations as _annotations
-5 6 | 
-6 7 | x = 1
+2 | # A copyright notice could go here
+3 | 
+4 | # A linter directive could go here
+5 + from __future__ import annotations as _annotations
+6 | 
+7 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap
index e91df9de92..5fa25396c3 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> docstring.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""
-  2 |+from __future__ import annotations as _annotations
-2 3 | 
-3 4 | x = 1
+1 | """Hello, world!"""
+2 + from __future__ import annotations as _annotations
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap
index 711989cbfe..3041bb362f 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> docstring_followed_by_continuation.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""\
-2 2 | 
-  3 |+from __future__ import annotations as _annotations
-3 4 | x = 1; y = 2
+1 | """Hello, world!"""\
+2 | 
+3 + from __future__ import annotations as _annotations
+4 | x = 1; y = 2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap
index b8a3e7f2cb..d32da5dfb5 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap
@@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> docstring_with_continuation.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1   |-"""Hello, world!"""; x = \
-  1 |+"""Hello, world!"""; from __future__ import annotations as _annotations; x = \
-2 2 |     1; y = 2
+  - """Hello, world!"""; x = \
+1 + """Hello, world!"""; from __future__ import annotations as _annotations; x = \
+2 |     1; y = 2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap
index ce1f0d64ba..3e017dc1ad 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap
@@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> docstring_with_multiple_continuations.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""\
-2 2 | \
-3 3 | 
-  4 |+from __future__ import annotations as _annotations
-4 5 | x = 1; y = 2
+1 | """Hello, world!"""\
+2 | \
+3 | 
+4 + from __future__ import annotations as _annotations
+5 | x = 1; y = 2
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap
index d1cc50e2a8..12058500f5 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap
@@ -4,7 +4,5 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> docstring_with_semicolon.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1   |-"""Hello, world!"""; x = 1
-  1 |+"""Hello, world!"""; from __future__ import annotations as _annotations; x = 1
+  - """Hello, world!"""; x = 1
+1 + """Hello, world!"""; from __future__ import annotations as _annotations; x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap
index 95493b80a2..6eb136fab0 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap
@@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> existing_import.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-  1 |+from __future__ import annotations as _annotations
-1 2 | from __future__ import generator_stop
-2 3 | import os
+1 | from __future__ import generator_stop
+2 + from __future__ import annotations as _annotations
+3 | import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap
index fca4d8f8eb..4a5260cca7 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap
@@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> multiline_docstring.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1 1 | """a
-2 2 | b"""
-3 3 | # b
-  4 |+from __future__ import annotations as _annotations
-4 5 | import os
+1 | """a
+2 | b"""
+3 | # b
+4 + from __future__ import annotations as _annotations
+5 | import os
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap
index 60be80529b..886d740520 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap
@@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations as _annotations`
 --> off.py:1:1
 help: Insert required import: `from __future__ import annotations as _annotations`
-
-ℹ Safe fix
-1 1 | # isort: off
-  2 |+from __future__ import annotations as _annotations
-2 3 | 
-3 4 | x = 1
-4 5 | # isort: on
+1 | # isort: off
+2 + from __future__ import annotations as _annotations
+3 | 
+4 | x = 1
+5 | # isort: on
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_future_import_docstring_future_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_future_import_docstring_future_import.py.snap
new file mode 100644
index 0000000000..c78a254664
--- /dev/null
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_future_import_docstring_future_import.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+I002 [*] Missing required import: `import this`
+--> docstring_future_import.py:1:1
+help: Insert required import: `import this`
+1 | "a docstring"
+2 | from __future__ import annotations
+3 + import this
+4 | # EOF
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_future_import_future_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_future_import_future_import.py.snap
new file mode 100644
index 0000000000..af219a1219
--- /dev/null
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_future_import_future_import.py.snap
@@ -0,0 +1,9 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+I002 [*] Missing required import: `import this`
+--> future_import.py:1:1
+help: Insert required import: `import this`
+1 | from __future__ import annotations
+2 + import this
+3 | # EOF
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap
index 8bf448df89..dc042745fa 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap
@@ -4,19 +4,15 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> docstring.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""
-  2 |+from __future__ import annotations
-2 3 | 
-3 4 | x = 1
+1 | """Hello, world!"""
+2 + from __future__ import annotations
+3 | 
+4 | x = 1
 
 I002 [*] Missing required import: `from __future__ import generator_stop`
 --> docstring.py:1:1
 help: Insert required import: `from __future__ import generator_stop`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""
-  2 |+from __future__ import generator_stop
-2 3 | 
-3 4 | x = 1
+1 | """Hello, world!"""
+2 + from __future__ import generator_stop
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap
index 4300626f5d..f3bad09c67 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap
@@ -4,21 +4,17 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `from __future__ import annotations`
 --> multiple_strings.py:1:1
 help: Insert required import: `from __future__ import annotations`
-
-ℹ Safe fix
-1 1 | """This is a docstring."""
-  2 |+from __future__ import annotations
-2 3 | "This is not a docstring."
-3 4 | "This is also not a docstring."
-4 5 | 
+1 | """This is a docstring."""
+2 + from __future__ import annotations
+3 | "This is not a docstring."
+4 | "This is also not a docstring."
+5 | 
 
 I002 [*] Missing required import: `from __future__ import generator_stop`
 --> multiple_strings.py:1:1
 help: Insert required import: `from __future__ import generator_stop`
-
-ℹ Safe fix
-1 1 | """This is a docstring."""
-  2 |+from __future__ import generator_stop
-2 3 | "This is not a docstring."
-3 4 | "This is also not a docstring."
-4 5 |
+1 | """This is a docstring."""
+2 + from __future__ import generator_stop
+3 | "This is not a docstring."
+4 | "This is also not a docstring."
+5 |
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap
index 5066d975ed..522dbc5a73 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap
@@ -14,17 +14,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | from __future__ import annotations
-   2  |+
-2  3  | import os
-3  4  | import sys
-   5  |+
-4  6  | import pytz
-   7  |+
-5  8  | import django.settings
-   9  |+
-6  10 | from library import foo
-   11 |+
-7  12 | from . import local
+1  | from __future__ import annotations
+2  + 
+3  | import os
+4  | import sys
+5  + 
+6  | import pytz
+7  + 
+8  | import django.settings
+9  + 
+10 | from library import foo
+11 + 
+12 | from . import local
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap
index 608a27d50f..5189470128 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap
@@ -15,14 +15,12 @@ I001 [*] Import block is un-sorted or un-formatted
 8 |   os.a
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import os
-2 2 | 
-3   |-import __main__
-4 3 | import third_party
-5 4 | 
-  5 |+import __main__
-6 6 | import first_party
-7 7 | 
-8 8 | os.a
+1 | import os
+2 | 
+  - import __main__
+3 | import third_party
+4 | 
+5 + import __main__
+6 | import first_party
+7 | 
+8 | os.a
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap
index 09893b2c97..a80b9a5426 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap
@@ -14,17 +14,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | from __future__ import annotations
-   2  |+
-2  3  | import os
-3  4  | import sys
-   5  |+
-4  6  | import pytz
-5     |-import django.settings
-6  7  | from library import foo
-   8  |+
-7  9  | from . import local
-   10 |+
-   11 |+import django.settings
+1  | from __future__ import annotations
+2  + 
+3  | import os
+4  | import sys
+5  + 
+6  | import pytz
+   - import django.settings
+7  | from library import foo
+8  + 
+9  | from . import local
+10 + 
+11 + import django.settings
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap
index 66636e6f78..774d16ac36 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap
@@ -12,14 +12,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import os
-1 2 | import sys
-  3 |+
-  4 |+import numpy as np
-  5 |+
-2 6 | import leading_prefix
-3   |-import numpy as np
-4   |-import os
-5 7 | from leading_prefix import Class
+1 + import os
+2 | import sys
+3 + 
+4 + import numpy as np
+5 + 
+6 | import leading_prefix
+  - import numpy as np
+  - import os
+7 | from leading_prefix import Class
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap
index 3d3dc12260..230f91e4b6 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap
@@ -10,11 +10,9 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-import sys
-2   |-import os
-3 1 | from __future__ import annotations
-  2 |+
-  3 |+import os
-  4 |+import sys
+  - import sys
+  - import os
+1 | from __future__ import annotations
+2 + 
+3 + import os
+4 + import sys
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap
index 553ad555bb..f419664b61 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap
@@ -14,18 +14,16 @@ I001 [*] Import block is un-sorted or un-formatted
   | |______________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-   1  |+import os
-1  2  | import sys
-   3  |+
-2  4  | import ruff
-   5  |+from ruff import check
-   6  |+
-3  7  | import leading_prefix
-4     |-import os
-   8  |+
-   9  |+from .. import trailing_prefix
-5  10 | from . import leading_prefix
-6     |-from .. import trailing_prefix
-7     |-from ruff import check
+1  + import os
+2  | import sys
+3  + 
+4  | import ruff
+5  + from ruff import check
+6  + 
+7  | import leading_prefix
+   - import os
+8  + 
+9  + from .. import trailing_prefix
+10 | from . import leading_prefix
+   - from .. import trailing_prefix
+   - from ruff import check
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap
index 16428a3868..000ee1c61b 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap
@@ -11,12 +11,10 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1   |-import pandas as pd
-  1 |+import os
-2 2 | import sys
-  3 |+
-3 4 | import numpy as np
-4   |-import os
-  5 |+import pandas as pd
+  - import pandas as pd
+1 + import os
+2 | import sys
+3 + 
+4 | import numpy as np
+  - import os
+5 + import pandas as pd
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap
index 6bf22e519b..64993cd84f 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap
@@ -11,17 +11,15 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________^
    |
 help: Organize imports
-
-ℹ Safe fix
-17 17 | def f():
-18 18 |     import sys
-19 19 |     import os  # isort: skip
-   20 |+    import abc
-20 21 |     import collections
-21    |-    import abc
-22 22 | 
-23 23 | 
-24 24 | def f():
+17 | def f():
+18 |     import sys
+19 |     import os  # isort: skip
+20 +     import abc
+21 |     import collections
+   -     import abc
+22 | 
+23 | 
+24 | def f():
 
 I001 [*] Import block is un-sorted or un-formatted
   --> skip.py:27:5
@@ -33,17 +31,15 @@ I001 [*] Import block is un-sorted or un-formatted
    | |______________^
    |
 help: Organize imports
-
-ℹ Safe fix
-24 24 | def f():
-25 25 |     import sys
-26 26 |     import os  # isort:skip
-   27 |+    import abc
-27 28 |     import collections
-28    |-    import abc
-29 29 | 
-30 30 | 
-31 31 | def f():
+24 | def f():
+25 |     import sys
+26 |     import os  # isort:skip
+27 +     import abc
+28 |     import collections
+   -     import abc
+29 | 
+30 | 
+31 | def f():
 
 I001 [*] Import block is un-sorted or un-formatted
   --> skip.py:34:5
@@ -54,11 +50,9 @@ I001 [*] Import block is un-sorted or un-formatted
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Organize imports
-
-ℹ Safe fix
-31 31 | def f():
-32 32 |     import sys; import os  # isort:skip
-33 33 |     import sys; import os  # isort:skip  # isort:skip
-34    |-    import sys; import os
-   34 |+    import os
-   35 |+    import sys
+31 | def f():
+32 |     import sys; import os  # isort:skip
+33 |     import sys; import os  # isort:skip  # isort:skip
+   -     import sys; import os
+34 +     import os
+35 +     import sys
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap
index 28ac2cbf46..b6c8b985aa 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap
@@ -33,45 +33,43 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_____________^
    |
 help: Organize imports
-
-ℹ Safe fix
-1     |-from a import b
-   1  |+import A
-   2  |+import a
-   3  |+import B
-   4  |+import b
-   5  |+import x
-   6  |+import x as A
-   7  |+import x as Y
-   8  |+import x as a
-   9  |+import x as y
-2  10 | from a import BAD as DEF
-3     |-from a import B
-4     |-from a import Boo as DEF
-   11 |+from a import B, b
-   12 |+from a import B as A
-5  13 | from a import B as Abc
-6     |-from a import B as A
-7  14 | from a import B as DEF
-   15 |+from a import Boo as DEF
-8  16 | from a import b as a
-9     |-from a import b as x
-10 17 | from a import b as c
-11    |-from b import c
-12 18 | from a import b as d
-   19 |+from a import b as x
-13 20 | from a import b as y
-14    |-from b import C
-   21 |+from b import C, c
-15 22 | from b import c as d
-16    |-
-17    |-import A
-18    |-import a
-19    |-import b
-20    |-import B
-21    |-
-22    |-import x as y
-23    |-import x as A
-24    |-import x as Y
-25    |-import x
-26    |-import x as a
+   - from a import b
+1  + import A
+2  + import a
+3  + import B
+4  + import b
+5  + import x
+6  + import x as A
+7  + import x as Y
+8  + import x as a
+9  + import x as y
+10 | from a import BAD as DEF
+   - from a import B
+   - from a import Boo as DEF
+11 + from a import B, b
+12 + from a import B as A
+13 | from a import B as Abc
+   - from a import B as A
+14 | from a import B as DEF
+15 + from a import Boo as DEF
+16 | from a import b as a
+   - from a import b as x
+17 | from a import b as c
+   - from b import c
+18 | from a import b as d
+19 + from a import b as x
+20 | from a import b as y
+   - from b import C
+21 + from b import C, c
+22 | from b import c as d
+   - 
+   - import A
+   - import a
+   - import b
+   - import B
+   - 
+   - import x as y
+   - import x as A
+   - import x as Y
+   - import x
+   - import x as a
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap
index ba458c1fea..1296aaaf93 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap
@@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted
 18 |       # isort: split
    |
 help: Organize imports
-
-ℹ Safe 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 | 
+12 | import b
+13 | 
+14 | if True:
+15 +     import A
+16 |     import C
+   -     import A
+17 | 
+18 |     # isort: split
+19 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> split.py:20:5
@@ -34,17 +32,15 @@ I001 [*] Import block is un-sorted or un-formatted
    | |____________^
    |
 help: Organize imports
-
-ℹ Safe fix
-17 17 | 
-18 18 |     # isort: split
-19 19 | 
-   20 |+    import B
-20 21 |     import D
-21    |-    import B
-22 22 | 
-23 23 | 
-24 24 | import e
+17 | 
+18 |     # isort: split
+19 | 
+20 +     import B
+21 |     import D
+   -     import B
+22 | 
+23 | 
+24 | import e
 
 I001 [*] Import block is un-sorted or un-formatted
   --> split.py:30:1
@@ -56,11 +52,9 @@ I001 [*] Import block is un-sorted or un-formatted
    | |________^
    |
 help: Organize imports
-
-ℹ Safe fix
-27 27 | # isort: split
-28 28 | # isort: split
-29 29 | 
-   30 |+import c
-30 31 | import d
-31    |-import c
+27 | # isort: split
+28 | # isort: split
+29 | 
+30 + import c
+31 | import d
+   - import c
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap
index e8504643c3..14574d6605 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap
@@ -45,51 +45,49 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_^
    |
 help: Organize imports
-
-ℹ Safe fix
-1  1  | # This has a magic trailing comma, will be sorted, but not rolled into one line
-2     |-from sys import (
-3     |-    stderr,
-4     |-    argv,
-5     |-    stdout,
-6     |-    exit,
-7     |-)
-8     |-
-9     |-# No magic comma, this will be rolled into one line.
-10    |-from os import (
-11    |-    path,
-12    |-    environ,
-13    |-    execl,
-14    |-    execv
-15    |-)
-16    |-
-17 2  | from glob import (
-   3  |+    escape,  # Ends with a comment, should still treat as magic trailing comma.
-18 4  |     glob,
-19 5  |     iglob,
-20    |-    escape,  # Ends with a comment, should still treat as magic trailing comma.
-21 6  | )
-22 7  | 
-   8  |+# No magic comma, this will be rolled into one line.
-   9  |+from os import environ, execl, execv, path
-   10 |+from sys import argv, exit, stderr, stdout
-   11 |+
-23 12 | # These will be combined, but without a trailing comma.
-24    |-from foo import bar
-25    |-from foo import baz
-   13 |+from foo import bar, baz
-26 14 | 
-27 15 | # These will be combined, _with_ a trailing comma.
-28    |-from module1 import member1
-29    |-from module1 import (
-30    |-    member2,
-31    |-    member3,
-32    |-)
-   16 |+from module1 import member1, member2, member3
-33 17 | 
-34 18 | # These will be combined, _with_ a trailing comma.
-35    |-from module2 import member1, member2
-36    |-from module2 import (
-37    |-    member3,
-38    |-)
-   19 |+from module2 import member1, member2, member3
+1  | # This has a magic trailing comma, will be sorted, but not rolled into one line
+   - from sys import (
+   -     stderr,
+   -     argv,
+   -     stdout,
+   -     exit,
+   - )
+   - 
+   - # No magic comma, this will be rolled into one line.
+   - from os import (
+   -     path,
+   -     environ,
+   -     execl,
+   -     execv
+   - )
+   - 
+2  | from glob import (
+3  +     escape,  # Ends with a comment, should still treat as magic trailing comma.
+4  |     glob,
+5  |     iglob,
+   -     escape,  # Ends with a comment, should still treat as magic trailing comma.
+6  | )
+7  | 
+8  + # No magic comma, this will be rolled into one line.
+9  + from os import environ, execl, execv, path
+10 + from sys import argv, exit, stderr, stdout
+11 + 
+12 | # These will be combined, but without a trailing comma.
+   - from foo import bar
+   - from foo import baz
+13 + from foo import bar, baz
+14 | 
+15 | # These will be combined, _with_ a trailing comma.
+   - from module1 import member1
+   - from module1 import (
+   -     member2,
+   -     member3,
+   - )
+16 + from module1 import member1, member2, member3
+17 | 
+18 | # These will be combined, _with_ a trailing comma.
+   - from module2 import member1, member2
+   - from module2 import (
+   -     member3,
+   - )
+19 + from module2 import member1, member2, member3
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap
index 0b3da48c00..a19c0e909a 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap
@@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted
   | |_______________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | from .logging import config_logging
-  2 |+from .settings import *
-2 3 | from .settings import ENV
-3   |-from .settings import *
+1 | from .logging import config_logging
+2 + from .settings import *
+3 | from .settings import ENV
+  - from .settings import *
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap
index 3aa72a1317..9195b747fa 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `import os`
 --> docstring.py:1:1
 help: Insert required import: `import os`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""
-  2 |+import os
-2 3 | 
-3 4 | x = 1
+1 | """Hello, world!"""
+2 + import os
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap
index 90186c1c46..03fe838a2a 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap
@@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs
 I002 [*] Missing required import: `import os`
 --> docstring.pyi:1:1
 help: Insert required import: `import os`
-
-ℹ Safe fix
-1 1 | """Hello, world!"""
-  2 |+import os
-2 3 | 
-3 4 | x = 1
+1 | """Hello, world!"""
+2 + import os
+3 | 
+4 | x = 1
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap
index 95ca30c37b..2038d98586 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap
@@ -17,22 +17,20 @@ I001 [*] Import block is un-sorted or un-formatted
 15 |   pass
    |
 help: Organize imports
-
-ℹ Safe fix
-5  5  | 
-6  6  | pass
-7  7  | 
-   8  |+from foo import bar  # some comment
-8  9  | from mylib import (
-9  10 |     MyClient,
-10 11 |     MyMgmtClient,
-11    |-); from foo import (
-12    |-    bar
-13    |-)# some comment
-   12 |+)
-14 13 | 
-15 14 | pass
-16 15 | 
+5  | 
+6  | pass
+7  | 
+8  + from foo import bar  # some comment
+9  | from mylib import (
+10 |     MyClient,
+11 |     MyMgmtClient,
+   - ); from foo import (
+   -     bar
+   - )# some comment
+12 + )
+13 | 
+14 | pass
+15 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> trailing_comment.py:17:1
@@ -52,18 +50,16 @@ I001 [*] Import block is un-sorted or un-formatted
 26 |   pass
    |
 help: Organize imports
-
-ℹ Safe fix
-14 14 | 
-15 15 | pass
-16 16 | 
-17    |-from foo import (
-18    |-    bar
-19    |-)
-   17 |+from foo import bar
-20 18 | from mylib import (
-21 19 |     MyClient,
-22 20 |     MyMgmtClient,
+14 | 
+15 | pass
+16 | 
+   - from foo import (
+   -     bar
+   - )
+17 + from foo import bar
+18 | from mylib import (
+19 |     MyClient,
+20 |     MyMgmtClient,
 
 I001 [*] Import block is un-sorted or un-formatted
   --> trailing_comment.py:35:1
@@ -79,19 +75,17 @@ I001 [*] Import block is un-sorted or un-formatted
 40 |   pass
    |
 help: Organize imports
-
-ℹ Safe fix
-32 32 | 
-33 33 | pass
-34 34 | 
-35    |-from mylib import (
-36    |-    MyClient
-37    |-    # some comment
-38    |-)
-   35 |+from mylib import MyClient  # some comment
-39 36 | 
-40 37 | pass
-41 38 | 
+32 | 
+33 | pass
+34 | 
+   - from mylib import (
+   -     MyClient
+   -     # some comment
+   - )
+35 + from mylib import MyClient  # some comment
+36 | 
+37 | pass
+38 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> trailing_comment.py:42:1
@@ -107,19 +101,17 @@ I001 [*] Import block is un-sorted or un-formatted
 47 |   pass
    |
 help: Organize imports
-
-ℹ Safe fix
-39 39 | 
-40 40 | pass
-41 41 | 
-42    |-from mylib import (
-43    |-    # some comment
-44    |-    MyClient
-45    |-)
-   42 |+from mylib import MyClient  # some comment
-46 43 | 
-47 44 | pass
-48 45 | 
+39 | 
+40 | pass
+41 | 
+   - from mylib import (
+   -     # some comment
+   -     MyClient
+   - )
+42 + from mylib import MyClient  # some comment
+43 | 
+44 | pass
+45 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> trailing_comment.py:50:1
@@ -133,14 +125,12 @@ I001 [*] Import block is un-sorted or un-formatted
    | |_^
    |
 help: Organize imports
-
-ℹ Safe fix
-47 47 | pass
-48 48 | 
-49 49 | # a
-50    |-from mylib import ( # b
-51    |-    # c
-52    |-    MyClient # d
-53    |-    # e
-54    |-) # f
-   50 |+from mylib import MyClient  # b  # c  # d  # e  # f
+47 | pass
+48 | 
+49 | # a
+   - from mylib import ( # b
+   -     # c
+   -     MyClient # d
+   -     # e
+   - ) # f
+50 + from mylib import MyClient  # b  # c  # d  # e  # f
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap
index 65d75ac606..48aeeee11e 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap
@@ -17,17 +17,15 @@ I001 [*] Import block is un-sorted or un-formatted
 10 |   del sin, cos, tan, pi, nan
    |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | # If the file doesn't contain a logical indent token, we should still detect two-space indentation on imports.
-2 2 | from math import (
-3   |-  sin,
-4   |-  tan,
-5 3 |   cos,
-6 4 |   nan,
-7 5 |   pi,
-  6 |+  sin,
-  7 |+  tan,
-8 8 | )
-9 9 | 
-10 10 | del sin, cos, tan, pi, nan
+1  | # If the file doesn't contain a logical indent token, we should still detect two-space indentation on imports.
+2  | from math import (
+   -   sin,
+   -   tan,
+3  |   cos,
+4  |   nan,
+5  |   pi,
+6  +   sin,
+7  +   tan,
+8  | )
+9  | 
+10 | del sin, cos, tan, pi, nan
diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap
index 1b90e6af08..7dae7e26dc 100644
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap
@@ -13,13 +13,11 @@ I001 [*] Import block is un-sorted or un-formatted
 6 |   h = 2 * π * ℏ
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio
-  2 |+import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ
-1 3 | from astropy.constants import hbar as ℏ
-2 4 | from numpy import pi as π
-3   |-import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ
-4   |-import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio
-5 5 | 
-6 6 | h = 2 * π * ℏ
+1 + import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio
+2 + import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ
+3 | from astropy.constants import hbar as ℏ
+4 | from numpy import pi as π
+  - import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ
+  - import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio
+5 | 
+6 | h = 2 * π * ℏ
diff --git a/crates/ruff_linter/src/rules/mccabe/rules/function_is_too_complex.rs b/crates/ruff_linter/src/rules/mccabe/rules/function_is_too_complex.rs
index 3648c48239..bc1ca1e278 100644
--- a/crates/ruff_linter/src/rules/mccabe/rules/function_is_too_complex.rs
+++ b/crates/ruff_linter/src/rules/mccabe/rules/function_is_too_complex.rs
@@ -48,6 +48,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.mccabe.max-complexity`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct ComplexStructure {
     name: String,
     complexity: usize,
diff --git a/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs b/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs
index b34f4b917d..b945ba8df0 100644
--- a/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs
+++ b/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs
@@ -31,6 +31,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// np.all([True, False])
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct NumpyDeprecatedFunction {
     existing: String,
     replacement: String,
@@ -80,6 +81,7 @@ pub(crate) fn deprecated_function(checker: &Checker, expr: &Expr) {
             },
             expr.range(),
         );
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         diagnostic.try_set_fix(|| {
             let (import_edit, binding) = checker.importer().get_or_import_symbol(
                 &ImportRequest::import_from("numpy", replacement),
diff --git a/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs b/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs
index daa445642a..c2744dfbe1 100644
--- a/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs
+++ b/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs
@@ -31,6 +31,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// int
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.247")]
 pub(crate) struct NumpyDeprecatedTypeAlias {
     type_name: String,
 }
@@ -80,6 +81,7 @@ pub(crate) fn deprecated_type_alias(checker: &Checker, expr: &Expr) {
             },
             expr.range(),
         );
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         let type_name = match type_name {
             "unicode" => "str",
             _ => type_name,
diff --git a/crates/ruff_linter/src/rules/numpy/rules/legacy_random.rs b/crates/ruff_linter/src/rules/numpy/rules/legacy_random.rs
index cbe58e2122..625a29829f 100644
--- a/crates/ruff_linter/src/rules/numpy/rules/legacy_random.rs
+++ b/crates/ruff_linter/src/rules/numpy/rules/legacy_random.rs
@@ -46,6 +46,7 @@ use crate::checkers::ast::Checker;
 /// [Random Sampling]: https://numpy.org/doc/stable/reference/random/index.html#random-quick-start
 /// [NEP 19]: https://numpy.org/neps/nep-0019-rng-policy.html
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.248")]
 pub(crate) struct NumpyLegacyRandom {
     method_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/numpy/rules/numpy_2_0_deprecation.rs b/crates/ruff_linter/src/rules/numpy/rules/numpy_2_0_deprecation.rs
index bcc712b18d..313e0cc9a8 100644
--- a/crates/ruff_linter/src/rules/numpy/rules/numpy_2_0_deprecation.rs
+++ b/crates/ruff_linter/src/rules/numpy/rules/numpy_2_0_deprecation.rs
@@ -50,6 +50,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// np.round(arr2)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct Numpy2Deprecation {
     existing: String,
     migration_guide: Option<String>,
diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap
index 63f0ce2588..331cee389d 100644
--- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap
+++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap
@@ -12,16 +12,14 @@ NPY003 [*] `np.round_` is deprecated; use `np.round` instead
 6 |     np.cumproduct(np.random.rand(5, 5))
   |
 help: Replace with `np.round`
-
-ℹ Safe fix
-1 1 | def func():
-2 2 |     import numpy as np
-3 3 | 
-4   |-    np.round_(np.random.rand(5, 5), 2)
-  4 |+    np.round(np.random.rand(5, 5), 2)
-5 5 |     np.product(np.random.rand(5, 5))
-6 6 |     np.cumproduct(np.random.rand(5, 5))
-7 7 |     np.sometrue(np.random.rand(5, 5))
+1 | def func():
+2 |     import numpy as np
+3 | 
+  -     np.round_(np.random.rand(5, 5), 2)
+4 +     np.round(np.random.rand(5, 5), 2)
+5 |     np.product(np.random.rand(5, 5))
+6 |     np.cumproduct(np.random.rand(5, 5))
+7 |     np.sometrue(np.random.rand(5, 5))
 
 NPY003 [*] `np.product` is deprecated; use `np.prod` instead
  --> NPY003.py:5:5
@@ -33,16 +31,14 @@ NPY003 [*] `np.product` is deprecated; use `np.prod` instead
 7 |     np.sometrue(np.random.rand(5, 5))
   |
 help: Replace with `np.prod`
-
-ℹ Safe fix
-2 2 |     import numpy as np
-3 3 | 
-4 4 |     np.round_(np.random.rand(5, 5), 2)
-5   |-    np.product(np.random.rand(5, 5))
-  5 |+    np.prod(np.random.rand(5, 5))
-6 6 |     np.cumproduct(np.random.rand(5, 5))
-7 7 |     np.sometrue(np.random.rand(5, 5))
-8 8 |     np.alltrue(np.random.rand(5, 5))
+2 |     import numpy as np
+3 | 
+4 |     np.round_(np.random.rand(5, 5), 2)
+  -     np.product(np.random.rand(5, 5))
+5 +     np.prod(np.random.rand(5, 5))
+6 |     np.cumproduct(np.random.rand(5, 5))
+7 |     np.sometrue(np.random.rand(5, 5))
+8 |     np.alltrue(np.random.rand(5, 5))
 
 NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead
  --> NPY003.py:6:5
@@ -55,16 +51,14 @@ NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead
 8 |     np.alltrue(np.random.rand(5, 5))
   |
 help: Replace with `np.cumprod`
-
-ℹ Safe fix
-3 3 | 
-4 4 |     np.round_(np.random.rand(5, 5), 2)
-5 5 |     np.product(np.random.rand(5, 5))
-6   |-    np.cumproduct(np.random.rand(5, 5))
-  6 |+    np.cumprod(np.random.rand(5, 5))
-7 7 |     np.sometrue(np.random.rand(5, 5))
-8 8 |     np.alltrue(np.random.rand(5, 5))
-9 9 | 
+3 | 
+4 |     np.round_(np.random.rand(5, 5), 2)
+5 |     np.product(np.random.rand(5, 5))
+  -     np.cumproduct(np.random.rand(5, 5))
+6 +     np.cumprod(np.random.rand(5, 5))
+7 |     np.sometrue(np.random.rand(5, 5))
+8 |     np.alltrue(np.random.rand(5, 5))
+9 | 
 
 NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead
  --> NPY003.py:7:5
@@ -76,16 +70,14 @@ NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead
 8 |     np.alltrue(np.random.rand(5, 5))
   |
 help: Replace with `np.any`
-
-ℹ Safe fix
-4 4 |     np.round_(np.random.rand(5, 5), 2)
-5 5 |     np.product(np.random.rand(5, 5))
-6 6 |     np.cumproduct(np.random.rand(5, 5))
-7   |-    np.sometrue(np.random.rand(5, 5))
-  7 |+    np.any(np.random.rand(5, 5))
-8 8 |     np.alltrue(np.random.rand(5, 5))
-9 9 | 
-10 10 | 
+4  |     np.round_(np.random.rand(5, 5), 2)
+5  |     np.product(np.random.rand(5, 5))
+6  |     np.cumproduct(np.random.rand(5, 5))
+   -     np.sometrue(np.random.rand(5, 5))
+7  +     np.any(np.random.rand(5, 5))
+8  |     np.alltrue(np.random.rand(5, 5))
+9  | 
+10 | 
 
 NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead
  --> NPY003.py:8:5
@@ -96,16 +88,14 @@ NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead
   |     ^^^^^^^^^^
   |
 help: Replace with `np.all`
-
-ℹ Safe fix
-5 5 |     np.product(np.random.rand(5, 5))
-6 6 |     np.cumproduct(np.random.rand(5, 5))
-7 7 |     np.sometrue(np.random.rand(5, 5))
-8   |-    np.alltrue(np.random.rand(5, 5))
-  8 |+    np.all(np.random.rand(5, 5))
-9 9 | 
-10 10 | 
-11 11 | def func():
+5  |     np.product(np.random.rand(5, 5))
+6  |     np.cumproduct(np.random.rand(5, 5))
+7  |     np.sometrue(np.random.rand(5, 5))
+   -     np.alltrue(np.random.rand(5, 5))
+8  +     np.all(np.random.rand(5, 5))
+9  | 
+10 | 
+11 | def func():
 
 NPY003 [*] `np.round_` is deprecated; use `np.round` instead
   --> NPY003.py:14:5
@@ -118,21 +108,19 @@ NPY003 [*] `np.round_` is deprecated; use `np.round` instead
 16 |     cumproduct(np.random.rand(5, 5))
    |
 help: Replace with `np.round`
-
-ℹ Safe fix
-   1  |+from numpy import round
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy import round
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-11 12 | def func():
-12 13 |     from numpy import round_, product, cumproduct, sometrue, alltrue
-13 14 | 
-14    |-    round_(np.random.rand(5, 5), 2)
-   15 |+    round(np.random.rand(5, 5), 2)
-15 16 |     product(np.random.rand(5, 5))
-16 17 |     cumproduct(np.random.rand(5, 5))
-17 18 |     sometrue(np.random.rand(5, 5))
+12 | def func():
+13 |     from numpy import round_, product, cumproduct, sometrue, alltrue
+14 | 
+   -     round_(np.random.rand(5, 5), 2)
+15 +     round(np.random.rand(5, 5), 2)
+16 |     product(np.random.rand(5, 5))
+17 |     cumproduct(np.random.rand(5, 5))
+18 |     sometrue(np.random.rand(5, 5))
 
 NPY003 [*] `np.product` is deprecated; use `np.prod` instead
   --> NPY003.py:15:5
@@ -144,21 +132,19 @@ NPY003 [*] `np.product` is deprecated; use `np.prod` instead
 17 |     sometrue(np.random.rand(5, 5))
    |
 help: Replace with `np.prod`
-
-ℹ Safe fix
-   1  |+from numpy import prod
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy import prod
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-12 13 |     from numpy import round_, product, cumproduct, sometrue, alltrue
-13 14 | 
-14 15 |     round_(np.random.rand(5, 5), 2)
-15    |-    product(np.random.rand(5, 5))
-   16 |+    prod(np.random.rand(5, 5))
-16 17 |     cumproduct(np.random.rand(5, 5))
-17 18 |     sometrue(np.random.rand(5, 5))
-18 19 |     alltrue(np.random.rand(5, 5))
+13 |     from numpy import round_, product, cumproduct, sometrue, alltrue
+14 | 
+15 |     round_(np.random.rand(5, 5), 2)
+   -     product(np.random.rand(5, 5))
+16 +     prod(np.random.rand(5, 5))
+17 |     cumproduct(np.random.rand(5, 5))
+18 |     sometrue(np.random.rand(5, 5))
+19 |     alltrue(np.random.rand(5, 5))
 
 NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead
   --> NPY003.py:16:5
@@ -171,20 +157,18 @@ NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead
 18 |     alltrue(np.random.rand(5, 5))
    |
 help: Replace with `np.cumprod`
-
-ℹ Safe fix
-   1  |+from numpy import cumprod
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy import cumprod
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-13 14 | 
-14 15 |     round_(np.random.rand(5, 5), 2)
-15 16 |     product(np.random.rand(5, 5))
-16    |-    cumproduct(np.random.rand(5, 5))
-   17 |+    cumprod(np.random.rand(5, 5))
-17 18 |     sometrue(np.random.rand(5, 5))
-18 19 |     alltrue(np.random.rand(5, 5))
+14 | 
+15 |     round_(np.random.rand(5, 5), 2)
+16 |     product(np.random.rand(5, 5))
+   -     cumproduct(np.random.rand(5, 5))
+17 +     cumprod(np.random.rand(5, 5))
+18 |     sometrue(np.random.rand(5, 5))
+19 |     alltrue(np.random.rand(5, 5))
 
 NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead
   --> NPY003.py:17:5
@@ -196,19 +180,17 @@ NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead
 18 |     alltrue(np.random.rand(5, 5))
    |
 help: Replace with `np.any`
-
-ℹ Safe fix
-   1  |+from numpy import any
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy import any
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-14 15 |     round_(np.random.rand(5, 5), 2)
-15 16 |     product(np.random.rand(5, 5))
-16 17 |     cumproduct(np.random.rand(5, 5))
-17    |-    sometrue(np.random.rand(5, 5))
-   18 |+    any(np.random.rand(5, 5))
-18 19 |     alltrue(np.random.rand(5, 5))
+15 |     round_(np.random.rand(5, 5), 2)
+16 |     product(np.random.rand(5, 5))
+17 |     cumproduct(np.random.rand(5, 5))
+   -     sometrue(np.random.rand(5, 5))
+18 +     any(np.random.rand(5, 5))
+19 |     alltrue(np.random.rand(5, 5))
 
 NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead
   --> NPY003.py:18:5
@@ -219,15 +201,13 @@ NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead
    |     ^^^^^^^
    |
 help: Replace with `np.all`
-
-ℹ Safe fix
-   1  |+from numpy import all
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy import all
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-15 16 |     product(np.random.rand(5, 5))
-16 17 |     cumproduct(np.random.rand(5, 5))
-17 18 |     sometrue(np.random.rand(5, 5))
-18    |-    alltrue(np.random.rand(5, 5))
-   19 |+    all(np.random.rand(5, 5))
+16 |     product(np.random.rand(5, 5))
+17 |     cumproduct(np.random.rand(5, 5))
+18 |     sometrue(np.random.rand(5, 5))
+   -     alltrue(np.random.rand(5, 5))
+19 +     all(np.random.rand(5, 5))
diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap
index 55f95252ae..26aaed26cb 100644
--- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap
+++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap
@@ -10,16 +10,14 @@ NPY001 [*] Type alias `np.float` is deprecated, replace with builtin type
 7 | npy.int
   |
 help: Replace `np.float` with builtin type
-
-ℹ Safe fix
-3 3 | import numpy
-4 4 | 
-5 5 | # Error
-6   |-npy.float
-  6 |+float
-7 7 | npy.int
-8 8 | 
-9 9 | if dtype == np.object:
+3 | import numpy
+4 | 
+5 | # Error
+  - npy.float
+6 + float
+7 | npy.int
+8 | 
+9 | if dtype == np.object:
 
 NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type
  --> NPY001.py:7:1
@@ -32,16 +30,14 @@ NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type
 9 | if dtype == np.object:
   |
 help: Replace `np.int` with builtin type
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Error
-6 6 | npy.float
-7   |-npy.int
-  7 |+int
-8 8 | 
-9 9 | if dtype == np.object:
-10 10 |     ...
+4  | 
+5  | # Error
+6  | npy.float
+   - npy.int
+7  + int
+8  | 
+9  | if dtype == np.object:
+10 |     ...
 
 NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type
   --> NPY001.py:9:13
@@ -53,16 +49,14 @@ NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type
 10 |     ...
    |
 help: Replace `np.object` with builtin type
-
-ℹ Safe fix
-6  6  | npy.float
-7  7  | npy.int
-8  8  | 
-9     |-if dtype == np.object:
-   9  |+if dtype == object:
-10 10 |     ...
-11 11 | 
-12 12 | result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex])
+6  | npy.float
+7  | npy.int
+8  | 
+   - if dtype == np.object:
+9  + if dtype == object:
+10 |     ...
+11 | 
+12 | result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex])
 
 NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type
   --> NPY001.py:12:72
@@ -75,16 +69,14 @@ NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type
 14 | pdf = pd.DataFrame(
    |
 help: Replace `np.int` with builtin type
-
-ℹ Safe fix
-9  9  | if dtype == np.object:
-10 10 |     ...
-11 11 | 
-12    |-result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex])
-   12 |+result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, int, np.complex])
-13 13 | 
-14 14 | pdf = pd.DataFrame(
-15 15 |     data=[[1, 2, 3]],
+9  | if dtype == np.object:
+10 |     ...
+11 | 
+   - result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex])
+12 + result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, int, np.complex])
+13 | 
+14 | pdf = pd.DataFrame(
+15 |     data=[[1, 2, 3]],
 
 NPY001 [*] Type alias `np.complex` is deprecated, replace with builtin type
   --> NPY001.py:12:80
@@ -97,16 +89,14 @@ NPY001 [*] Type alias `np.complex` is deprecated, replace with builtin type
 14 | pdf = pd.DataFrame(
    |
 help: Replace `np.complex` with builtin type
-
-ℹ Safe fix
-9  9  | if dtype == np.object:
-10 10 |     ...
-11 11 | 
-12    |-result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex])
-   12 |+result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, complex])
-13 13 | 
-14 14 | pdf = pd.DataFrame(
-15 15 |     data=[[1, 2, 3]],
+9  | if dtype == np.object:
+10 |     ...
+11 | 
+   - result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex])
+12 + result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, complex])
+13 | 
+14 | pdf = pd.DataFrame(
+15 |     data=[[1, 2, 3]],
 
 NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type
   --> NPY001.py:17:11
@@ -118,16 +108,14 @@ NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type
 18 | )
    |
 help: Replace `np.object` with builtin type
-
-ℹ Safe fix
-14 14 | pdf = pd.DataFrame(
-15 15 |     data=[[1, 2, 3]],
-16 16 |     columns=["a", "b", "c"],
-17    |-    dtype=numpy.object,
-   17 |+    dtype=object,
-18 18 | )
-19 19 | 
-20 20 | _ = arr.astype(np.int)
+14 | pdf = pd.DataFrame(
+15 |     data=[[1, 2, 3]],
+16 |     columns=["a", "b", "c"],
+   -     dtype=numpy.object,
+17 +     dtype=object,
+18 | )
+19 | 
+20 | _ = arr.astype(np.int)
 
 NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type
   --> NPY001.py:20:16
@@ -140,16 +128,14 @@ NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type
 22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952
    |
 help: Replace `np.int` with builtin type
-
-ℹ Safe fix
-17 17 |     dtype=numpy.object,
-18 18 | )
-19 19 | 
-20    |-_ = arr.astype(np.int)
-   20 |+_ = arr.astype(int)
-21 21 | 
-22 22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952
-23 23 | from numpy import float
+17 |     dtype=numpy.object,
+18 | )
+19 | 
+   - _ = arr.astype(np.int)
+20 + _ = arr.astype(int)
+21 | 
+22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952
+23 | from numpy import float
 
 NPY001 [*] Type alias `np.float` is deprecated, replace with builtin type
   --> NPY001.py:25:1
@@ -160,12 +146,10 @@ NPY001 [*] Type alias `np.float` is deprecated, replace with builtin type
    | ^^^^^
    |
 help: Replace `np.float` with builtin type
-
-ℹ Safe fix
-21 21 | 
-22 22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952
-23 23 | from numpy import float
-   24 |+import builtins
-24 25 | 
-25    |-float(1)
-   26 |+builtins.float(1)
+21 | 
+22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952
+23 | from numpy import float
+24 + import builtins
+25 | 
+   - float(1)
+26 + builtins.float(1)
diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap
index 966168f605..a63fd3be90 100644
--- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap
+++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap
@@ -12,17 +12,15 @@ NPY201 [*] `np.add_docstring` will be removed in NumPy 2.0. Use `numpy.lib.add_d
 6 |     np.add_newdoc
   |
 help: Replace with `numpy.lib.add_docstring`
-
-ℹ Safe fix
-  1 |+from numpy.lib import add_docstring
-1 2 | def func():
-2 3 |     import numpy as np
-3 4 | 
-4   |-    np.add_docstring
-  5 |+    add_docstring
-5 6 | 
-6 7 |     np.add_newdoc
-7 8 | 
+1 + from numpy.lib import add_docstring
+2 | def func():
+3 |     import numpy as np
+4 | 
+  -     np.add_docstring
+5 +     add_docstring
+6 | 
+7 |     np.add_newdoc
+8 | 
 
 NPY201 [*] `np.add_newdoc` will be removed in NumPy 2.0. Use `numpy.lib.add_newdoc` instead.
  --> NPY201.py:6:5
@@ -35,19 +33,17 @@ NPY201 [*] `np.add_newdoc` will be removed in NumPy 2.0. Use `numpy.lib.add_newd
 8 |     np.add_newdoc_ufunc
   |
 help: Replace with `numpy.lib.add_newdoc`
-
-ℹ Safe fix
-  1 |+from numpy.lib import add_newdoc
-1 2 | def func():
-2 3 |     import numpy as np
-3 4 | 
-4 5 |     np.add_docstring
-5 6 | 
-6   |-    np.add_newdoc
-  7 |+    add_newdoc
-7 8 | 
-8 9 |     np.add_newdoc_ufunc
-9 10 | 
+1  + from numpy.lib import add_newdoc
+2  | def func():
+3  |     import numpy as np
+4  | 
+5  |     np.add_docstring
+6  | 
+   -     np.add_newdoc
+7  +     add_newdoc
+8  | 
+9  |     np.add_newdoc_ufunc
+10 | 
 
 NPY201 `np.add_newdoc_ufunc` will be removed in NumPy 2.0. `add_newdoc_ufunc` is an internal function.
   --> NPY201.py:8:5
@@ -82,21 +78,20 @@ NPY201 [*] `np.byte_bounds` will be removed in NumPy 2.0. Use `numpy.lib.array_u
 14 |     np.cast
    |
 help: Replace with `numpy.lib.array_utils.byte_bounds` (requires NumPy 2.0 or greater)
-
-ℹ Unsafe fix
-   1  |+from numpy.lib.array_utils import byte_bounds
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.lib.array_utils import byte_bounds
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-9  10 | 
-10 11 |     np.asfarray([1,2,3])
-11 12 | 
-12    |-    np.byte_bounds(np.array([1,2,3]))
-   13 |+    byte_bounds(np.array([1,2,3]))
-13 14 | 
-14 15 |     np.cast
-15 16 | 
+10 | 
+11 |     np.asfarray([1,2,3])
+12 | 
+   -     np.byte_bounds(np.array([1,2,3]))
+13 +     byte_bounds(np.array([1,2,3]))
+14 | 
+15 |     np.cast
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 NPY201 `np.cast` will be removed in NumPy 2.0. Use `np.asarray(arr, dtype=dtype)` instead.
   --> NPY201.py:14:5
@@ -120,16 +115,14 @@ NPY201 [*] `np.cfloat` will be removed in NumPy 2.0. Use `numpy.complex128` inst
 18 |     np.clongfloat(12+34j)
    |
 help: Replace with `numpy.complex128`
-
-ℹ Safe fix
-13 13 | 
-14 14 |     np.cast
-15 15 | 
-16    |-    np.cfloat(12+34j)
-   16 |+    np.complex128(12+34j)
-17 17 | 
-18 18 |     np.clongfloat(12+34j)
-19 19 | 
+13 | 
+14 |     np.cast
+15 | 
+   -     np.cfloat(12+34j)
+16 +     np.complex128(12+34j)
+17 | 
+18 |     np.clongfloat(12+34j)
+19 | 
 
 NPY201 [*] `np.clongfloat` will be removed in NumPy 2.0. Use `numpy.clongdouble` instead.
   --> NPY201.py:18:5
@@ -142,16 +135,14 @@ NPY201 [*] `np.clongfloat` will be removed in NumPy 2.0. Use `numpy.clongdouble`
 20 |     np.compat
    |
 help: Replace with `numpy.clongdouble`
-
-ℹ Safe fix
-15 15 | 
-16 16 |     np.cfloat(12+34j)
-17 17 | 
-18    |-    np.clongfloat(12+34j)
-   18 |+    np.clongdouble(12+34j)
-19 19 | 
-20 20 |     np.compat
-21 21 | 
+15 | 
+16 |     np.cfloat(12+34j)
+17 | 
+   -     np.clongfloat(12+34j)
+18 +     np.clongdouble(12+34j)
+19 | 
+20 |     np.compat
+21 | 
 
 NPY201 `np.compat` will be removed in NumPy 2.0. Python 2 is no longer supported.
   --> NPY201.py:20:5
@@ -175,16 +166,14 @@ NPY201 [*] `np.complex_` will be removed in NumPy 2.0. Use `numpy.complex128` in
 24 |     np.DataSource
    |
 help: Replace with `numpy.complex128`
-
-ℹ Safe fix
-19 19 | 
-20 20 |     np.compat
-21 21 | 
-22    |-    np.complex_(12+34j)
-   22 |+    np.complex128(12+34j)
-23 23 | 
-24 24 |     np.DataSource
-25 25 | 
+19 | 
+20 |     np.compat
+21 | 
+   -     np.complex_(12+34j)
+22 +     np.complex128(12+34j)
+23 | 
+24 |     np.DataSource
+25 | 
 
 NPY201 [*] `np.DataSource` will be removed in NumPy 2.0. Use `numpy.lib.npyio.DataSource` instead.
   --> NPY201.py:24:5
@@ -197,21 +186,19 @@ NPY201 [*] `np.DataSource` will be removed in NumPy 2.0. Use `numpy.lib.npyio.Da
 26 |     np.deprecate
    |
 help: Replace with `numpy.lib.npyio.DataSource`
-
-ℹ Safe fix
-   1  |+from numpy.lib.npyio import DataSource
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.lib.npyio import DataSource
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-21 22 | 
-22 23 |     np.complex_(12+34j)
-23 24 | 
-24    |-    np.DataSource
-   25 |+    DataSource
-25 26 | 
-26 27 |     np.deprecate
-27 28 | 
+22 | 
+23 |     np.complex_(12+34j)
+24 | 
+   -     np.DataSource
+25 +     DataSource
+26 | 
+27 |     np.deprecate
+28 | 
 
 NPY201 `np.deprecate` will be removed in NumPy 2.0. Emit `DeprecationWarning` with `warnings.warn` directly, or use `typing.deprecated`.
   --> NPY201.py:26:5
@@ -290,16 +277,14 @@ NPY201 [*] `np.float_` will be removed in NumPy 2.0. Use `numpy.float64` instead
 40 |     np.geterrobj
    |
 help: Replace with `numpy.float64`
-
-ℹ Safe fix
-35 35 | 
-36 36 |     np.get_array_wrap
-37 37 | 
-38    |-    np.float_
-   38 |+    np.float64
-39 39 | 
-40 40 |     np.geterrobj
-41 41 | 
+35 | 
+36 |     np.get_array_wrap
+37 | 
+   -     np.float_
+38 +     np.float64
+39 | 
+40 |     np.geterrobj
+41 | 
 
 NPY201 `np.geterrobj` will be removed in NumPy 2.0. Use the `np.errstate` context manager instead.
   --> NPY201.py:40:5
@@ -323,16 +308,14 @@ NPY201 [*] `np.Inf` will be removed in NumPy 2.0. Use `numpy.inf` instead.
 44 |     np.Infinity
    |
 help: Replace with `numpy.inf`
-
-ℹ Safe fix
-39 39 | 
-40 40 |     np.geterrobj
-41 41 | 
-42    |-    np.Inf
-   42 |+    np.inf
-43 43 | 
-44 44 |     np.Infinity
-45 45 | 
+39 | 
+40 |     np.geterrobj
+41 | 
+   -     np.Inf
+42 +     np.inf
+43 | 
+44 |     np.Infinity
+45 | 
 
 NPY201 [*] `np.Infinity` will be removed in NumPy 2.0. Use `numpy.inf` instead.
   --> NPY201.py:44:5
@@ -345,16 +328,14 @@ NPY201 [*] `np.Infinity` will be removed in NumPy 2.0. Use `numpy.inf` instead.
 46 |     np.infty
    |
 help: Replace with `numpy.inf`
-
-ℹ Safe fix
-41 41 | 
-42 42 |     np.Inf
-43 43 | 
-44    |-    np.Infinity
-   44 |+    np.inf
-45 45 | 
-46 46 |     np.infty
-47 47 | 
+41 | 
+42 |     np.Inf
+43 | 
+   -     np.Infinity
+44 +     np.inf
+45 | 
+46 |     np.infty
+47 | 
 
 NPY201 [*] `np.infty` will be removed in NumPy 2.0. Use `numpy.inf` instead.
   --> NPY201.py:46:5
@@ -367,16 +348,14 @@ NPY201 [*] `np.infty` will be removed in NumPy 2.0. Use `numpy.inf` instead.
 48 |     np.issctype
    |
 help: Replace with `numpy.inf`
-
-ℹ Safe fix
-43 43 | 
-44 44 |     np.Infinity
-45 45 | 
-46    |-    np.infty
-   46 |+    np.inf
-47 47 | 
-48 48 |     np.issctype
-49 49 | 
+43 | 
+44 |     np.Infinity
+45 | 
+   -     np.infty
+46 +     np.inf
+47 | 
+48 |     np.issctype
+49 | 
 
 NPY201 `np.issctype` will be removed without replacement in NumPy 2.0
   --> NPY201.py:48:5
@@ -400,16 +379,14 @@ NPY201 [*] `np.issubclass_` will be removed in NumPy 2.0. Use `issubclass` inste
 52 |     np.issubsctype
    |
 help: Replace with `issubclass`
-
-ℹ Safe fix
-47 47 | 
-48 48 |     np.issctype
-49 49 | 
-50    |-    np.issubclass_(np.int32, np.integer)
-   50 |+    issubclass(np.int32, np.integer)
-51 51 | 
-52 52 |     np.issubsctype
-53 53 | 
+47 | 
+48 |     np.issctype
+49 | 
+   -     np.issubclass_(np.int32, np.integer)
+50 +     issubclass(np.int32, np.integer)
+51 | 
+52 |     np.issubsctype
+53 | 
 
 NPY201 [*] `np.issubsctype` will be removed in NumPy 2.0. Use `numpy.issubdtype` instead.
   --> NPY201.py:52:5
@@ -422,16 +399,14 @@ NPY201 [*] `np.issubsctype` will be removed in NumPy 2.0. Use `numpy.issubdtype`
 54 |     np.mat
    |
 help: Replace with `numpy.issubdtype`
-
-ℹ Safe fix
-49 49 | 
-50 50 |     np.issubclass_(np.int32, np.integer)
-51 51 | 
-52    |-    np.issubsctype
-   52 |+    np.issubdtype
-53 53 | 
-54 54 |     np.mat
-55 55 | 
+49 | 
+50 |     np.issubclass_(np.int32, np.integer)
+51 | 
+   -     np.issubsctype
+52 +     np.issubdtype
+53 | 
+54 |     np.mat
+55 | 
 
 NPY201 [*] `np.mat` will be removed in NumPy 2.0. Use `numpy.asmatrix` instead.
   --> NPY201.py:54:5
@@ -444,16 +419,14 @@ NPY201 [*] `np.mat` will be removed in NumPy 2.0. Use `numpy.asmatrix` instead.
 56 |     np.maximum_sctype
    |
 help: Replace with `numpy.asmatrix`
-
-ℹ Safe fix
-51 51 | 
-52 52 |     np.issubsctype
-53 53 | 
-54    |-    np.mat
-   54 |+    np.asmatrix
-55 55 | 
-56 56 |     np.maximum_sctype
-57 57 | 
+51 | 
+52 |     np.issubsctype
+53 | 
+   -     np.mat
+54 +     np.asmatrix
+55 | 
+56 |     np.maximum_sctype
+57 | 
 
 NPY201 `np.maximum_sctype` will be removed without replacement in NumPy 2.0
   --> NPY201.py:56:5
@@ -477,16 +450,14 @@ NPY201 [*] `np.NaN` will be removed in NumPy 2.0. Use `numpy.nan` instead.
 60 |     np.nbytes[np.int64]
    |
 help: Replace with `numpy.nan`
-
-ℹ Safe fix
-55 55 | 
-56 56 |     np.maximum_sctype
-57 57 | 
-58    |-    np.NaN
-   58 |+    np.nan
-59 59 | 
-60 60 |     np.nbytes[np.int64]
-61 61 | 
+55 | 
+56 |     np.maximum_sctype
+57 | 
+   -     np.NaN
+58 +     np.nan
+59 | 
+60 |     np.nbytes[np.int64]
+61 | 
 
 NPY201 `np.nbytes` will be removed in NumPy 2.0. Use `np.dtype(<dtype>).itemsize` instead.
   --> NPY201.py:60:5
@@ -510,16 +481,14 @@ NPY201 [*] `np.NINF` will be removed in NumPy 2.0. Use `-np.inf` instead.
 64 |     np.NZERO
    |
 help: Replace with `-np.inf`
-
-ℹ Safe fix
-59 59 | 
-60 60 |     np.nbytes[np.int64]
-61 61 | 
-62    |-    np.NINF
-   62 |+    -np.inf
-63 63 | 
-64 64 |     np.NZERO
-65 65 | 
+59 | 
+60 |     np.nbytes[np.int64]
+61 | 
+   -     np.NINF
+62 +     -np.inf
+63 | 
+64 |     np.NZERO
+65 | 
 
 NPY201 [*] `np.NZERO` will be removed in NumPy 2.0. Use `-0.0` instead.
   --> NPY201.py:64:5
@@ -532,16 +501,14 @@ NPY201 [*] `np.NZERO` will be removed in NumPy 2.0. Use `-0.0` instead.
 66 |     np.longcomplex(12+34j)
    |
 help: Replace with `-0.0`
-
-ℹ Safe fix
-61 61 | 
-62 62 |     np.NINF
-63 63 | 
-64    |-    np.NZERO
-   64 |+    -0.0
-65 65 | 
-66 66 |     np.longcomplex(12+34j)
-67 67 | 
+61 | 
+62 |     np.NINF
+63 | 
+   -     np.NZERO
+64 +     -0.0
+65 | 
+66 |     np.longcomplex(12+34j)
+67 | 
 
 NPY201 [*] `np.longcomplex` will be removed in NumPy 2.0. Use `numpy.clongdouble` instead.
   --> NPY201.py:66:5
@@ -554,16 +521,14 @@ NPY201 [*] `np.longcomplex` will be removed in NumPy 2.0. Use `numpy.clongdouble
 68 |     np.longfloat(12+34j)
    |
 help: Replace with `numpy.clongdouble`
-
-ℹ Safe fix
-63 63 | 
-64 64 |     np.NZERO
-65 65 | 
-66    |-    np.longcomplex(12+34j)
-   66 |+    np.clongdouble(12+34j)
-67 67 | 
-68 68 |     np.longfloat(12+34j)
-69 69 | 
+63 | 
+64 |     np.NZERO
+65 | 
+   -     np.longcomplex(12+34j)
+66 +     np.clongdouble(12+34j)
+67 | 
+68 |     np.longfloat(12+34j)
+69 | 
 
 NPY201 [*] `np.longfloat` will be removed in NumPy 2.0. Use `numpy.longdouble` instead.
   --> NPY201.py:68:5
@@ -576,16 +541,14 @@ NPY201 [*] `np.longfloat` will be removed in NumPy 2.0. Use `numpy.longdouble` i
 70 |     np.lookfor
    |
 help: Replace with `numpy.longdouble`
-
-ℹ Safe fix
-65 65 | 
-66 66 |     np.longcomplex(12+34j)
-67 67 | 
-68    |-    np.longfloat(12+34j)
-   68 |+    np.longdouble(12+34j)
-69 69 | 
-70 70 |     np.lookfor
-71 71 | 
+65 | 
+66 |     np.longcomplex(12+34j)
+67 | 
+   -     np.longfloat(12+34j)
+68 +     np.longdouble(12+34j)
+69 | 
+70 |     np.lookfor
+71 | 
 
 NPY201 `np.lookfor` will be removed in NumPy 2.0. Search NumPy’s documentation directly.
   --> NPY201.py:70:5
@@ -609,13 +572,11 @@ NPY201 [*] `np.NAN` will be removed in NumPy 2.0. Use `numpy.nan` instead.
 74 |     try:
    |
 help: Replace with `numpy.nan`
-
-ℹ Safe fix
-69 69 | 
-70 70 |     np.lookfor
-71 71 | 
-72    |-    np.NAN
-   72 |+    np.nan
-73 73 | 
-74 74 |     try:
-75 75 |         from numpy.lib.npyio import DataSource
+69 | 
+70 |     np.lookfor
+71 | 
+   -     np.NAN
+72 +     np.nan
+73 | 
+74 |     try:
+75 |         from numpy.lib.npyio import DataSource
diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap
index cc084a2158..0fc00891d2 100644
--- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap
+++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap
@@ -23,16 +23,14 @@ NPY201 [*] `np.PINF` will be removed in NumPy 2.0. Use `numpy.inf` instead.
 8 |     np.PZERO
   |
 help: Replace with `numpy.inf`
-
-ℹ Safe fix
-3 3 | 
-4 4 |     np.obj2sctype(int)
-5 5 | 
-6   |-    np.PINF
-  6 |+    np.inf
-7 7 | 
-8 8 |     np.PZERO
-9 9 | 
+3 | 
+4 |     np.obj2sctype(int)
+5 | 
+  -     np.PINF
+6 +     np.inf
+7 | 
+8 |     np.PZERO
+9 | 
 
 NPY201 [*] `np.PZERO` will be removed in NumPy 2.0. Use `0.0` instead.
   --> NPY201_2.py:8:5
@@ -45,16 +43,14 @@ NPY201 [*] `np.PZERO` will be removed in NumPy 2.0. Use `0.0` instead.
 10 |     np.recfromcsv
    |
 help: Replace with `0.0`
-
-ℹ Safe fix
-5 5 | 
-6 6 |     np.PINF
-7 7 | 
-8   |-    np.PZERO
-  8 |+    0.0
-9 9 | 
-10 10 |     np.recfromcsv
-11 11 | 
+5  | 
+6  |     np.PINF
+7  | 
+   -     np.PZERO
+8  +     0.0
+9  | 
+10 |     np.recfromcsv
+11 | 
 
 NPY201 `np.recfromcsv` will be removed in NumPy 2.0. Use `np.genfromtxt` with comma delimiter instead.
   --> NPY201_2.py:10:5
@@ -89,16 +85,14 @@ NPY201 [*] `np.round_` will be removed in NumPy 2.0. Use `numpy.round` instead.
 16 |     np.safe_eval
    |
 help: Replace with `numpy.round`
-
-ℹ Safe fix
-11 11 | 
-12 12 |     np.recfromtxt
-13 13 | 
-14    |-    np.round_(12.34)
-   14 |+    np.round(12.34)
-15 15 | 
-16 16 |     np.safe_eval
-17 17 | 
+11 | 
+12 |     np.recfromtxt
+13 | 
+   -     np.round_(12.34)
+14 +     np.round(12.34)
+15 | 
+16 |     np.safe_eval
+17 | 
 
 NPY201 [*] `np.safe_eval` will be removed in NumPy 2.0. Use `ast.literal_eval` instead.
   --> NPY201_2.py:16:5
@@ -111,21 +105,19 @@ NPY201 [*] `np.safe_eval` will be removed in NumPy 2.0. Use `ast.literal_eval` i
 18 |     np.sctype2char
    |
 help: Replace with `ast.literal_eval`
-
-ℹ Safe fix
-   1  |+from ast import literal_eval
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from ast import literal_eval
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-13 14 | 
-14 15 |     np.round_(12.34)
-15 16 | 
-16    |-    np.safe_eval
-   17 |+    literal_eval
-17 18 | 
-18 19 |     np.sctype2char
-19 20 | 
+14 | 
+15 |     np.round_(12.34)
+16 | 
+   -     np.safe_eval
+17 +     literal_eval
+18 | 
+19 |     np.sctype2char
+20 | 
 
 NPY201 `np.sctype2char` will be removed without replacement in NumPy 2.0
   --> NPY201_2.py:18:5
@@ -182,16 +174,14 @@ NPY201 [*] `np.singlecomplex` will be removed in NumPy 2.0. Use `numpy.complex64
 30 |     np.string_("asdf")
    |
 help: Replace with `numpy.complex64`
-
-ℹ Safe fix
-25 25 | 
-26 26 |     np.set_string_function
-27 27 | 
-28    |-    np.singlecomplex(12+1j)
-   28 |+    np.complex64(12+1j)
-29 29 | 
-30 30 |     np.string_("asdf")
-31 31 | 
+25 | 
+26 |     np.set_string_function
+27 | 
+   -     np.singlecomplex(12+1j)
+28 +     np.complex64(12+1j)
+29 | 
+30 |     np.string_("asdf")
+31 | 
 
 NPY201 [*] `np.string_` will be removed in NumPy 2.0. Use `numpy.bytes_` instead.
   --> NPY201_2.py:30:5
@@ -204,16 +194,14 @@ NPY201 [*] `np.string_` will be removed in NumPy 2.0. Use `numpy.bytes_` instead
 32 |     np.source
    |
 help: Replace with `numpy.bytes_`
-
-ℹ Safe fix
-27 27 | 
-28 28 |     np.singlecomplex(12+1j)
-29 29 | 
-30    |-    np.string_("asdf")
-   30 |+    np.bytes_("asdf")
-31 31 | 
-32 32 |     np.source
-33 33 | 
+27 | 
+28 |     np.singlecomplex(12+1j)
+29 | 
+   -     np.string_("asdf")
+30 +     np.bytes_("asdf")
+31 | 
+32 |     np.source
+33 | 
 
 NPY201 [*] `np.source` will be removed in NumPy 2.0. Use `inspect.getsource` instead.
   --> NPY201_2.py:32:5
@@ -226,21 +214,19 @@ NPY201 [*] `np.source` will be removed in NumPy 2.0. Use `inspect.getsource` ins
 34 |     np.tracemalloc_domain
    |
 help: Replace with `inspect.getsource`
-
-ℹ Safe fix
-   1  |+from inspect import getsource
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from inspect import getsource
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-29 30 | 
-30 31 |     np.string_("asdf")
-31 32 | 
-32    |-    np.source
-   33 |+    getsource
-33 34 | 
-34 35 |     np.tracemalloc_domain
-35 36 | 
+30 | 
+31 |     np.string_("asdf")
+32 | 
+   -     np.source
+33 +     getsource
+34 | 
+35 |     np.tracemalloc_domain
+36 | 
 
 NPY201 [*] `np.tracemalloc_domain` will be removed in NumPy 2.0. Use `numpy.lib.tracemalloc_domain` instead.
   --> NPY201_2.py:34:5
@@ -253,21 +239,19 @@ NPY201 [*] `np.tracemalloc_domain` will be removed in NumPy 2.0. Use `numpy.lib.
 36 |     np.unicode_("asf")
    |
 help: Replace with `numpy.lib.tracemalloc_domain`
-
-ℹ Safe fix
-   1  |+from numpy.lib import tracemalloc_domain
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.lib import tracemalloc_domain
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-31 32 | 
-32 33 |     np.source
-33 34 | 
-34    |-    np.tracemalloc_domain
-   35 |+    tracemalloc_domain
-35 36 | 
-36 37 |     np.unicode_("asf")
-37 38 | 
+32 | 
+33 |     np.source
+34 | 
+   -     np.tracemalloc_domain
+35 +     tracemalloc_domain
+36 | 
+37 |     np.unicode_("asf")
+38 | 
 
 NPY201 [*] `np.unicode_` will be removed in NumPy 2.0. Use `numpy.str_` instead.
   --> NPY201_2.py:36:5
@@ -280,16 +264,14 @@ NPY201 [*] `np.unicode_` will be removed in NumPy 2.0. Use `numpy.str_` instead.
 38 |     np.who()
    |
 help: Replace with `numpy.str_`
-
-ℹ Safe fix
-33 33 | 
-34 34 |     np.tracemalloc_domain
-35 35 | 
-36    |-    np.unicode_("asf")
-   36 |+    np.str_("asf")
-37 37 | 
-38 38 |     np.who()
-39 39 | 
+33 | 
+34 |     np.tracemalloc_domain
+35 | 
+   -     np.unicode_("asf")
+36 +     np.str_("asf")
+37 | 
+38 |     np.who()
+39 | 
 
 NPY201 `np.who` will be removed in NumPy 2.0. Use an IDE variable explorer or `locals()` instead.
   --> NPY201_2.py:38:5
@@ -313,16 +295,14 @@ NPY201 [*] `np.row_stack` will be removed in NumPy 2.0. Use `numpy.vstack` inste
 42 |     np.alltrue([True, True])
    |
 help: Replace with `numpy.vstack`
-
-ℹ Safe fix
-37 37 | 
-38 38 |     np.who()
-39 39 | 
-40    |-    np.row_stack(([1,2], [3,4]))
-   40 |+    np.vstack(([1,2], [3,4]))
-41 41 | 
-42 42 |     np.alltrue([True, True])
-43 43 | 
+37 | 
+38 |     np.who()
+39 | 
+   -     np.row_stack(([1,2], [3,4]))
+40 +     np.vstack(([1,2], [3,4]))
+41 | 
+42 |     np.alltrue([True, True])
+43 | 
 
 NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead.
   --> NPY201_2.py:42:5
@@ -335,16 +315,14 @@ NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead.
 44 |     np.sometrue([True, False])
    |
 help: Replace with `numpy.all`
-
-ℹ Safe fix
-39 39 | 
-40 40 |     np.row_stack(([1,2], [3,4]))
-41 41 | 
-42    |-    np.alltrue([True, True])
-   42 |+    np.all([True, True])
-43 43 | 
-44 44 |     np.sometrue([True, False])
-45 45 | 
+39 | 
+40 |     np.row_stack(([1,2], [3,4]))
+41 | 
+   -     np.alltrue([True, True])
+42 +     np.all([True, True])
+43 | 
+44 |     np.sometrue([True, False])
+45 | 
 
 NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead.
   --> NPY201_2.py:44:5
@@ -357,16 +335,14 @@ NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead.
 46 |     np.cumproduct([1, 2, 3])
    |
 help: Replace with `numpy.any`
-
-ℹ Safe fix
-41 41 | 
-42 42 |     np.alltrue([True, True])
-43 43 | 
-44    |-    np.sometrue([True, False])
-   44 |+    np.any([True, False])
-45 45 | 
-46 46 |     np.cumproduct([1, 2, 3])
-47 47 | 
+41 | 
+42 |     np.alltrue([True, True])
+43 | 
+   -     np.sometrue([True, False])
+44 +     np.any([True, False])
+45 | 
+46 |     np.cumproduct([1, 2, 3])
+47 | 
 
 NPY201 [*] `np.cumproduct` will be removed in NumPy 2.0. Use `numpy.cumprod` instead.
   --> NPY201_2.py:46:5
@@ -379,16 +355,14 @@ NPY201 [*] `np.cumproduct` will be removed in NumPy 2.0. Use `numpy.cumprod` ins
 48 |     np.product([1, 2, 3])
    |
 help: Replace with `numpy.cumprod`
-
-ℹ Safe fix
-43 43 | 
-44 44 |     np.sometrue([True, False])
-45 45 | 
-46    |-    np.cumproduct([1, 2, 3])
-   46 |+    np.cumprod([1, 2, 3])
-47 47 | 
-48 48 |     np.product([1, 2, 3])
-49 49 | 
+43 | 
+44 |     np.sometrue([True, False])
+45 | 
+   -     np.cumproduct([1, 2, 3])
+46 +     np.cumprod([1, 2, 3])
+47 | 
+48 |     np.product([1, 2, 3])
+49 | 
 
 NPY201 [*] `np.product` will be removed in NumPy 2.0. Use `numpy.prod` instead.
   --> NPY201_2.py:48:5
@@ -401,16 +375,14 @@ NPY201 [*] `np.product` will be removed in NumPy 2.0. Use `numpy.prod` instead.
 50 |     np.trapz([1, 2, 3])
    |
 help: Replace with `numpy.prod`
-
-ℹ Safe fix
-45 45 | 
-46 46 |     np.cumproduct([1, 2, 3])
-47 47 | 
-48    |-    np.product([1, 2, 3])
-   48 |+    np.prod([1, 2, 3])
-49 49 | 
-50 50 |     np.trapz([1, 2, 3])
-51 51 | 
+45 | 
+46 |     np.cumproduct([1, 2, 3])
+47 | 
+   -     np.product([1, 2, 3])
+48 +     np.prod([1, 2, 3])
+49 | 
+50 |     np.trapz([1, 2, 3])
+51 | 
 
 NPY201 [*] `np.trapz` will be removed in NumPy 2.0. Use `numpy.trapezoid` on NumPy 2.0, or ignore this warning on earlier versions.
   --> NPY201_2.py:50:5
@@ -423,16 +395,15 @@ NPY201 [*] `np.trapz` will be removed in NumPy 2.0. Use `numpy.trapezoid` on Num
 52 |     np.in1d([1, 2], [1, 3, 5])
    |
 help: Replace with `numpy.trapezoid` (requires NumPy 2.0 or greater)
-
-ℹ Unsafe fix
-47 47 | 
-48 48 |     np.product([1, 2, 3])
-49 49 | 
-50    |-    np.trapz([1, 2, 3])
-   50 |+    np.trapezoid([1, 2, 3])
-51 51 | 
-52 52 |     np.in1d([1, 2], [1, 3, 5])
-53 53 | 
+47 | 
+48 |     np.product([1, 2, 3])
+49 | 
+   -     np.trapz([1, 2, 3])
+50 +     np.trapezoid([1, 2, 3])
+51 | 
+52 |     np.in1d([1, 2], [1, 3, 5])
+53 | 
+note: This is an unsafe fix and may change runtime behavior
 
 NPY201 [*] `np.in1d` will be removed in NumPy 2.0. Use `numpy.isin` instead.
   --> NPY201_2.py:52:5
@@ -445,16 +416,14 @@ NPY201 [*] `np.in1d` will be removed in NumPy 2.0. Use `numpy.isin` instead.
 54 |     np.AxisError
    |
 help: Replace with `numpy.isin`
-
-ℹ Safe fix
-49 49 | 
-50 50 |     np.trapz([1, 2, 3])
-51 51 | 
-52    |-    np.in1d([1, 2], [1, 3, 5])
-   52 |+    np.isin([1, 2], [1, 3, 5])
-53 53 | 
-54 54 |     np.AxisError
-55 55 | 
+49 | 
+50 |     np.trapz([1, 2, 3])
+51 | 
+   -     np.in1d([1, 2], [1, 3, 5])
+52 +     np.isin([1, 2], [1, 3, 5])
+53 | 
+54 |     np.AxisError
+55 | 
 
 NPY201 [*] `np.AxisError` will be removed in NumPy 2.0. Use `numpy.exceptions.AxisError` instead.
   --> NPY201_2.py:54:5
@@ -467,21 +436,19 @@ NPY201 [*] `np.AxisError` will be removed in NumPy 2.0. Use `numpy.exceptions.Ax
 56 |     np.ComplexWarning
    |
 help: Replace with `numpy.exceptions.AxisError`
-
-ℹ Safe fix
-   1  |+from numpy.exceptions import AxisError
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.exceptions import AxisError
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-51 52 | 
-52 53 |     np.in1d([1, 2], [1, 3, 5])
-53 54 | 
-54    |-    np.AxisError
-   55 |+    AxisError
-55 56 | 
-56 57 |     np.ComplexWarning
-57 58 | 
+52 | 
+53 |     np.in1d([1, 2], [1, 3, 5])
+54 | 
+   -     np.AxisError
+55 +     AxisError
+56 | 
+57 |     np.ComplexWarning
+58 | 
 
 NPY201 [*] `np.ComplexWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.ComplexWarning` instead.
   --> NPY201_2.py:56:5
@@ -494,21 +461,19 @@ NPY201 [*] `np.ComplexWarning` will be removed in NumPy 2.0. Use `numpy.exceptio
 58 |     np.compare_chararrays
    |
 help: Replace with `numpy.exceptions.ComplexWarning`
-
-ℹ Safe fix
-   1  |+from numpy.exceptions import ComplexWarning
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.exceptions import ComplexWarning
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-53 54 | 
-54 55 |     np.AxisError
-55 56 | 
-56    |-    np.ComplexWarning
-   57 |+    ComplexWarning
-57 58 | 
-58 59 |     np.compare_chararrays
-59 60 | 
+54 | 
+55 |     np.AxisError
+56 | 
+   -     np.ComplexWarning
+57 +     ComplexWarning
+58 | 
+59 |     np.compare_chararrays
+60 | 
 
 NPY201 [*] `np.compare_chararrays` will be removed in NumPy 2.0. Use `numpy.char.compare_chararrays` instead.
   --> NPY201_2.py:58:5
@@ -521,21 +486,19 @@ NPY201 [*] `np.compare_chararrays` will be removed in NumPy 2.0. Use `numpy.char
 60 |     try:
    |
 help: Replace with `numpy.char.compare_chararrays`
-
-ℹ Safe fix
-   1  |+from numpy.char import compare_chararrays
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.char import compare_chararrays
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-55 56 | 
-56 57 |     np.ComplexWarning
-57 58 | 
-58    |-    np.compare_chararrays
-   59 |+    compare_chararrays
-59 60 | 
-60 61 |     try:
-61 62 |         np.all([True, True])
+56 | 
+57 |     np.ComplexWarning
+58 | 
+   -     np.compare_chararrays
+59 +     compare_chararrays
+60 | 
+61 |     try:
+62 |         np.all([True, True])
 
 NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead.
   --> NPY201_2.py:63:9
@@ -548,16 +511,14 @@ NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead.
 65 |     try:
    |
 help: Replace with `numpy.all`
-
-ℹ Safe fix
-60 60 |     try:
-61 61 |         np.all([True, True])
-62 62 |     except TypeError:
-63    |-        np.alltrue([True, True])  # Should emit a warning here (`except TypeError`, not `except AttributeError`)
-   63 |+        np.all([True, True])  # Should emit a warning here (`except TypeError`, not `except AttributeError`)
-64 64 | 
-65 65 |     try:
-66 66 |         np.anyyyy([True, True])
+60 |     try:
+61 |         np.all([True, True])
+62 |     except TypeError:
+   -         np.alltrue([True, True])  # Should emit a warning here (`except TypeError`, not `except AttributeError`)
+63 +         np.all([True, True])  # Should emit a warning here (`except TypeError`, not `except AttributeError`)
+64 | 
+65 |     try:
+66 |         np.anyyyy([True, True])
 
 NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead.
   --> NPY201_2.py:68:9
@@ -569,13 +530,11 @@ NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead.
 69 |                                    # (must have an attribute access of the undeprecated name in the `try` body for it to be ignored)
    |
 help: Replace with `numpy.any`
-
-ℹ Safe fix
-65 65 |     try:
-66 66 |         np.anyyyy([True, True])
-67 67 |     except AttributeError:
-68    |-        np.sometrue([True, True])  # Should emit a warning here
-   68 |+        np.any([True, True])  # Should emit a warning here
-69 69 |                                    # (must have an attribute access of the undeprecated name in the `try` body for it to be ignored)
-70 70 | 
-71 71 |     try:
+65 |     try:
+66 |         np.anyyyy([True, True])
+67 |     except AttributeError:
+   -         np.sometrue([True, True])  # Should emit a warning here
+68 +         np.any([True, True])  # Should emit a warning here
+69 |                                    # (must have an attribute access of the undeprecated name in the `try` body for it to be ignored)
+70 | 
+71 |     try:
diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap
index 8b9bb6bee7..873f15d871 100644
--- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap
+++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap
@@ -12,17 +12,15 @@ NPY201 [*] `np.DTypePromotionError` will be removed in NumPy 2.0. Use `numpy.exc
 6 |     np.ModuleDeprecationWarning
   |
 help: Replace with `numpy.exceptions.DTypePromotionError`
-
-ℹ Safe fix
-  1 |+from numpy.exceptions import DTypePromotionError
-1 2 | def func():
-2 3 |     import numpy as np
-3 4 | 
-4   |-    np.DTypePromotionError
-  5 |+    DTypePromotionError
-5 6 | 
-6 7 |     np.ModuleDeprecationWarning
-7 8 | 
+1 + from numpy.exceptions import DTypePromotionError
+2 | def func():
+3 |     import numpy as np
+4 | 
+  -     np.DTypePromotionError
+5 +     DTypePromotionError
+6 | 
+7 |     np.ModuleDeprecationWarning
+8 | 
 
 NPY201 [*] `np.ModuleDeprecationWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.ModuleDeprecationWarning` instead.
  --> NPY201_3.py:6:5
@@ -35,19 +33,17 @@ NPY201 [*] `np.ModuleDeprecationWarning` will be removed in NumPy 2.0. Use `nump
 8 |     np.RankWarning
   |
 help: Replace with `numpy.exceptions.ModuleDeprecationWarning`
-
-ℹ Safe fix
-  1 |+from numpy.exceptions import ModuleDeprecationWarning
-1 2 | def func():
-2 3 |     import numpy as np
-3 4 | 
-4 5 |     np.DTypePromotionError
-5 6 | 
-6   |-    np.ModuleDeprecationWarning
-  7 |+    ModuleDeprecationWarning
-7 8 | 
-8 9 |     np.RankWarning
-9 10 | 
+1  + from numpy.exceptions import ModuleDeprecationWarning
+2  | def func():
+3  |     import numpy as np
+4  | 
+5  |     np.DTypePromotionError
+6  | 
+   -     np.ModuleDeprecationWarning
+7  +     ModuleDeprecationWarning
+8  | 
+9  |     np.RankWarning
+10 | 
 
 NPY201 [*] `np.RankWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.RankWarning` on NumPy 2.0, or ignore this warning on earlier versions.
   --> NPY201_3.py:8:5
@@ -60,21 +56,20 @@ NPY201 [*] `np.RankWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.
 10 |     np.TooHardError
    |
 help: Replace with `numpy.exceptions.RankWarning` (requires NumPy 2.0 or greater)
-
-ℹ Unsafe fix
-   1  |+from numpy.exceptions import RankWarning
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.exceptions import RankWarning
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-5  6  | 
-6  7  |     np.ModuleDeprecationWarning
-7  8  | 
-8     |-    np.RankWarning
-   9  |+    RankWarning
-9  10 | 
-10 11 |     np.TooHardError
-11 12 | 
+6  | 
+7  |     np.ModuleDeprecationWarning
+8  | 
+   -     np.RankWarning
+9  +     RankWarning
+10 | 
+11 |     np.TooHardError
+12 | 
+note: This is an unsafe fix and may change runtime behavior
 
 NPY201 [*] `np.TooHardError` will be removed in NumPy 2.0. Use `numpy.exceptions.TooHardError` instead.
   --> NPY201_3.py:10:5
@@ -87,21 +82,19 @@ NPY201 [*] `np.TooHardError` will be removed in NumPy 2.0. Use `numpy.exceptions
 12 |     np.VisibleDeprecationWarning
    |
 help: Replace with `numpy.exceptions.TooHardError`
-
-ℹ Safe fix
-   1  |+from numpy.exceptions import TooHardError
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.exceptions import TooHardError
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-7  8  | 
-8  9  |     np.RankWarning
-9  10 | 
-10    |-    np.TooHardError
-   11 |+    TooHardError
-11 12 | 
-12 13 |     np.VisibleDeprecationWarning
-13 14 | 
+8  | 
+9  |     np.RankWarning
+10 | 
+   -     np.TooHardError
+11 +     TooHardError
+12 | 
+13 |     np.VisibleDeprecationWarning
+14 | 
 
 NPY201 [*] `np.VisibleDeprecationWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.VisibleDeprecationWarning` instead.
   --> NPY201_3.py:12:5
@@ -114,21 +107,19 @@ NPY201 [*] `np.VisibleDeprecationWarning` will be removed in NumPy 2.0. Use `num
 14 |     np.chararray
    |
 help: Replace with `numpy.exceptions.VisibleDeprecationWarning`
-
-ℹ Safe fix
-   1  |+from numpy.exceptions import VisibleDeprecationWarning
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.exceptions import VisibleDeprecationWarning
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-9  10 | 
-10 11 |     np.TooHardError
-11 12 | 
-12    |-    np.VisibleDeprecationWarning
-   13 |+    VisibleDeprecationWarning
-13 14 | 
-14 15 |     np.chararray
-15 16 | 
+10 | 
+11 |     np.TooHardError
+12 | 
+   -     np.VisibleDeprecationWarning
+13 +     VisibleDeprecationWarning
+14 | 
+15 |     np.chararray
+16 | 
 
 NPY201 [*] `np.chararray` will be removed in NumPy 2.0. Use `numpy.char.chararray` instead.
   --> NPY201_3.py:14:5
@@ -141,20 +132,18 @@ NPY201 [*] `np.chararray` will be removed in NumPy 2.0. Use `numpy.char.chararra
 16 |     np.format_parser
    |
 help: Replace with `numpy.char.chararray`
-
-ℹ Safe fix
-   1  |+from numpy.char import chararray
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.char import chararray
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-11 12 | 
-12 13 |     np.VisibleDeprecationWarning
-13 14 | 
-14    |-    np.chararray
-   15 |+    chararray
-15 16 | 
-16 17 |     np.format_parser
+12 | 
+13 |     np.VisibleDeprecationWarning
+14 | 
+   -     np.chararray
+15 +     chararray
+16 | 
+17 |     np.format_parser
 
 NPY201 [*] `np.format_parser` will be removed in NumPy 2.0. Use `numpy.rec.format_parser` instead.
   --> NPY201_3.py:16:5
@@ -165,15 +154,13 @@ NPY201 [*] `np.format_parser` will be removed in NumPy 2.0. Use `numpy.rec.forma
    |     ^^^^^^^^^^^^^^^^
    |
 help: Replace with `numpy.rec.format_parser`
-
-ℹ Safe fix
-   1  |+from numpy.rec import format_parser
-1  2  | def func():
-2  3  |     import numpy as np
-3  4  | 
+1  + from numpy.rec import format_parser
+2  | def func():
+3  |     import numpy as np
+4  | 
 --------------------------------------------------------------------------------
-13 14 | 
-14 15 |     np.chararray
-15 16 | 
-16    |-    np.format_parser
-   17 |+    format_parser
+14 | 
+15 |     np.chararray
+16 | 
+   -     np.format_parser
+17 +     format_parser
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/assignment_to_df.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/assignment_to_df.rs
index 3c0617b708..fb7ae9713b 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/assignment_to_df.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/assignment_to_df.rs
@@ -4,9 +4,9 @@ use ruff_text_size::Ranged;
 
 use crate::{Violation, checkers::ast::Checker};
 
-/// ## Deprecated
+/// ## Removed
 ///
-/// This rule has been deprecated as it's highly opinionated and overly strict in most cases.
+/// This rule has been removed as it's highly opinionated and overly strict in most cases.
 ///
 /// ## What it does
 /// Checks for assignments to the variable `df`.
@@ -32,6 +32,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// animals = pd.read_csv("animals.csv")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.13.0")]
 pub(crate) struct PandasDfVariableName;
 
 impl Violation for PandasDfVariableName {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/attr.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/attr.rs
index ab6b55104b..e867edc5c0 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/attr.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/attr.rs
@@ -34,6 +34,7 @@ use crate::rules::pandas_vet::helpers::{Resolution, test_expression};
 /// ## References
 /// - [Pandas documentation: Accessing the values in a Series or Index](https://pandas.pydata.org/pandas-docs/stable/whatsnew/v0.24.0.html#accessing-the-values-in-a-series-or-index)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotValues;
 
 impl Violation for PandasUseOfDotValues {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/call.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/call.rs
index 8b7619cf3e..407f689b69 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/call.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/call.rs
@@ -40,6 +40,7 @@ use crate::rules::pandas_vet::helpers::{Resolution, test_expression};
 /// - [Pandas documentation: `isnull`](https://pandas.pydata.org/docs/reference/api/pandas.isnull.html#pandas.isnull)
 /// - [Pandas documentation: `isna`](https://pandas.pydata.org/docs/reference/api/pandas.isna.html#pandas.isna)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotIsNull;
 
 impl Violation for PandasUseOfDotIsNull {
@@ -80,6 +81,7 @@ impl Violation for PandasUseOfDotIsNull {
 /// - [Pandas documentation: `notnull`](https://pandas.pydata.org/docs/reference/api/pandas.notnull.html#pandas.notnull)
 /// - [Pandas documentation: `notna`](https://pandas.pydata.org/docs/reference/api/pandas.notna.html#pandas.notna)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotNotNull;
 
 impl Violation for PandasUseOfDotNotNull {
@@ -116,6 +118,7 @@ impl Violation for PandasUseOfDotNotNull {
 /// - [Pandas documentation: Reshaping and pivot tables](https://pandas.pydata.org/docs/user_guide/reshaping.html)
 /// - [Pandas documentation: `pivot_table`](https://pandas.pydata.org/docs/reference/api/pandas.pivot_table.html#pandas.pivot_table)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotPivotOrUnstack;
 
 impl Violation for PandasUseOfDotPivotOrUnstack {
@@ -153,6 +156,7 @@ impl Violation for PandasUseOfDotPivotOrUnstack {
 /// - [Pandas documentation: `melt`](https://pandas.pydata.org/docs/reference/api/pandas.melt.html)
 /// - [Pandas documentation: `stack`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.stack.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotStack;
 
 impl Violation for PandasUseOfDotStack {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs
index 100a688b79..0fa448f7c5 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs
@@ -36,6 +36,7 @@ use ruff_python_semantic::Modules;
 /// ## References
 /// - [_Why You Should Probably Never Use pandas `inplace=True`_](https://towardsdatascience.com/why-you-should-probably-never-use-pandas-inplace-true-9f9f211849e4)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfInplaceArgument;
 
 impl Violation for PandasUseOfInplaceArgument {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/nunique_constant_series_check.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/nunique_constant_series_check.rs
index 2d7ceba14b..279e0a9d69 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/nunique_constant_series_check.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/nunique_constant_series_check.rs
@@ -51,6 +51,7 @@ use crate::rules::pandas_vet::helpers::{Resolution, test_expression};
 /// - [Pandas Cookbook: "Constant Series"](https://pandas.pydata.org/docs/user_guide/cookbook.html#constant-series)
 /// - [Pandas documentation: `nunique`](https://pandas.pydata.org/docs/reference/api/pandas.Series.nunique.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct PandasNuniqueConstantSeriesCheck;
 
 impl Violation for PandasNuniqueConstantSeriesCheck {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/pd_merge.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/pd_merge.rs
index d8c90b74ac..34ca700a13 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/pd_merge.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/pd_merge.rs
@@ -44,6 +44,7 @@ use crate::checkers::ast::Checker;
 /// - [Pandas documentation: `merge`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.merge.html#pandas.DataFrame.merge)
 /// - [Pandas documentation: `pd.merge`](https://pandas.pydata.org/docs/reference/api/pandas.merge.html#pandas.merge)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfPdMerge;
 
 impl Violation for PandasUseOfPdMerge {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/read_table.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/read_table.rs
index 776e738bbb..79025d2b8b 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/read_table.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/read_table.rs
@@ -36,6 +36,7 @@ use crate::checkers::ast::Checker;
 /// - [Pandas documentation: `read_csv`](https://pandas.pydata.org/docs/reference/api/pandas.read_csv.html#pandas.read_csv)
 /// - [Pandas documentation: `read_table`](https://pandas.pydata.org/docs/reference/api/pandas.read_table.html#pandas.read_table)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotReadTable;
 
 impl Violation for PandasUseOfDotReadTable {
diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/subscript.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/subscript.rs
index 30fc920952..7ebb5ba0d0 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/rules/subscript.rs
+++ b/crates/ruff_linter/src/rules/pandas_vet/rules/subscript.rs
@@ -40,6 +40,7 @@ use crate::rules::pandas_vet::helpers::{Resolution, test_expression};
 /// - [Pandas documentation: `loc`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.loc.html)
 /// - [Pandas documentation: `iloc`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.iloc.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotIx;
 
 impl Violation for PandasUseOfDotIx {
@@ -82,6 +83,7 @@ impl Violation for PandasUseOfDotIx {
 /// - [Pandas documentation: `loc`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.loc.html)
 /// - [Pandas documentation: `at`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.at.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotAt;
 
 impl Violation for PandasUseOfDotAt {
@@ -133,6 +135,7 @@ impl Violation for PandasUseOfDotAt {
 /// - [Pandas documentation: `iloc`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.iloc.html)
 /// - [Pandas documentation: `iat`](https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.iat.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.188")]
 pub(crate) struct PandasUseOfDotIat;
 
 impl Violation for PandasUseOfDotIat {
@@ -165,16 +168,17 @@ pub(crate) fn subscript(checker: &Checker, value: &Expr, expr: &Expr) {
     match attr.as_str() {
         // PD007
         "ix" if checker.is_rule_enabled(Rule::PandasUseOfDotIx) => {
-            checker.report_diagnostic(PandasUseOfDotIx, range)
+            let mut diagnostic = checker.report_diagnostic(PandasUseOfDotIx, range);
+            diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         }
         // PD008
         "at" if checker.is_rule_enabled(Rule::PandasUseOfDotAt) => {
-            checker.report_diagnostic(PandasUseOfDotAt, range)
+            checker.report_diagnostic(PandasUseOfDotAt, range);
         }
         // PD009
         "iat" if checker.is_rule_enabled(Rule::PandasUseOfDotIat) => {
-            checker.report_diagnostic(PandasUseOfDotIat, range)
+            checker.report_diagnostic(PandasUseOfDotIat, range);
         }
-        _ => return,
-    };
+        _ => (),
+    }
 }
diff --git a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap
index 6fd2c7666c..206dd11ff3 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap
+++ b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap
@@ -12,16 +12,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 7 | x.y.drop(["a"], axis=1, inplace=True)
   |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | x = pd.DataFrame()
-4 4 | 
-5   |-x.drop(["a"], axis=1, inplace=True)
-  5 |+x = x.drop(["a"], axis=1)
-6 6 | 
-7 7 | x.y.drop(["a"], axis=1, inplace=True)
-8 8 | 
+2 | 
+3 | x = pd.DataFrame()
+4 | 
+  - x.drop(["a"], axis=1, inplace=True)
+5 + x = x.drop(["a"], axis=1)
+6 | 
+7 | x.y.drop(["a"], axis=1, inplace=True)
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
  --> PD002.py:7:25
@@ -34,16 +33,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 9 | x["y"].drop(["a"], axis=1, inplace=True)
   |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | x.drop(["a"], axis=1, inplace=True)
-6 6 | 
-7   |-x.y.drop(["a"], axis=1, inplace=True)
-  7 |+x.y = x.y.drop(["a"], axis=1)
-8 8 | 
-9 9 | x["y"].drop(["a"], axis=1, inplace=True)
-10 10 | 
+4  | 
+5  | x.drop(["a"], axis=1, inplace=True)
+6  | 
+   - x.y.drop(["a"], axis=1, inplace=True)
+7  + x.y = x.y.drop(["a"], axis=1)
+8  | 
+9  | x["y"].drop(["a"], axis=1, inplace=True)
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
   --> PD002.py:9:28
@@ -56,16 +54,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 11 | x.drop(
    |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | x.y.drop(["a"], axis=1, inplace=True)
-8  8  | 
-9     |-x["y"].drop(["a"], axis=1, inplace=True)
-   9  |+x["y"] = x["y"].drop(["a"], axis=1)
-10 10 | 
-11 11 | x.drop(
-12 12 |     inplace=True,
+6  | 
+7  | x.y.drop(["a"], axis=1, inplace=True)
+8  | 
+   - x["y"].drop(["a"], axis=1, inplace=True)
+9  + x["y"] = x["y"].drop(["a"], axis=1)
+10 | 
+11 | x.drop(
+12 |     inplace=True,
+note: This is an unsafe fix and may change runtime behavior
 
 PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
   --> PD002.py:12:5
@@ -77,17 +74,16 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 14 |     axis=1,
    |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | x["y"].drop(["a"], axis=1, inplace=True)
-10 10 | 
-11    |-x.drop(
-12    |-    inplace=True,
-   11 |+x = x.drop(
-13 12 |     columns=["a"],
-14 13 |     axis=1,
-15 14 | )
+8  | 
+9  | x["y"].drop(["a"], axis=1, inplace=True)
+10 | 
+   - x.drop(
+   -     inplace=True,
+11 + x = x.drop(
+12 |     columns=["a"],
+13 |     axis=1,
+14 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
   --> PD002.py:19:9
@@ -100,17 +96,16 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 21 |         axis=1,
    |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-15 15 | )
-16 16 | 
-17 17 | if True:
-18    |-    x.drop(
-19    |-        inplace=True,
-   18 |+    x = x.drop(
-20 19 |         columns=["a"],
-21 20 |         axis=1,
-22 21 |     )
+15 | )
+16 | 
+17 | if True:
+   -     x.drop(
+   -         inplace=True,
+18 +     x = x.drop(
+19 |         columns=["a"],
+20 |         axis=1,
+21 |     )
+note: This is an unsafe fix and may change runtime behavior
 
 PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
   --> PD002.py:24:33
@@ -123,16 +118,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 26 | f(x.drop(["a"], axis=1, inplace=True))
    |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-21 21 |         axis=1,
-22 22 |     )
-23 23 | 
-24    |-x.drop(["a"], axis=1, **kwargs, inplace=True)
-   24 |+x = x.drop(["a"], axis=1, **kwargs)
-25 25 | x.drop(["a"], axis=1, inplace=True, **kwargs)
-26 26 | f(x.drop(["a"], axis=1, inplace=True))
-27 27 | 
+21 |         axis=1,
+22 |     )
+23 | 
+   - x.drop(["a"], axis=1, **kwargs, inplace=True)
+24 + x = x.drop(["a"], axis=1, **kwargs)
+25 | x.drop(["a"], axis=1, inplace=True, **kwargs)
+26 | f(x.drop(["a"], axis=1, inplace=True))
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PD002 `inplace=True` should be avoided; it has inconsistent behavior
   --> PD002.py:25:23
@@ -178,13 +172,12 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
 35 | # This method doesn't take exist in Pandas, so ignore it.
    |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | torch.m.ReLU(inplace=True)  # safe because this isn't a pandas call
-32 32 | 
-33    |-(x.drop(["a"], axis=1, inplace=True))
-   33 |+x = (x.drop(["a"], axis=1))
-34 34 | 
-35 35 | # This method doesn't take exist in Pandas, so ignore it.
-36 36 | x.rotate_z(45, inplace=True)
+30 | 
+31 | torch.m.ReLU(inplace=True)  # safe because this isn't a pandas call
+32 | 
+   - (x.drop(["a"], axis=1, inplace=True))
+33 + x = (x.drop(["a"], axis=1))
+34 | 
+35 | # This method doesn't take exist in Pandas, so ignore it.
+36 | x.rotate_z(45, inplace=True)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap
index 38ae790070..5816d50691 100644
--- a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap
+++ b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap
@@ -10,10 +10,9 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
   |                       ^^^^^^^^^^^^
   |
 help: Assign to variable; remove `inplace` arg
-
-ℹ Unsafe 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)
+1 | 
+2 | import pandas as pd
+3 | x = pd.DataFrame()
+  - x.drop(["a"], axis=1, inplace=True)
+4 + x = x.drop(["a"], axis=1)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs
index 6c547ff5c8..6e5c75886a 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs
@@ -42,6 +42,7 @@ use crate::rules::pep8_naming::helpers;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.82")]
 pub(crate) struct CamelcaseImportedAsAcronym {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs
index 609cd61fc0..09f5f2deb0 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs
@@ -51,6 +51,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.82")]
 pub(crate) struct CamelcaseImportedAsConstant {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs
index c81884c045..eb3cf80bdf 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs
@@ -36,6 +36,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.82")]
 pub(crate) struct CamelcaseImportedAsLowercase {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs
index 26e72de928..f88853faab 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs
@@ -49,6 +49,7 @@ use crate::rules::pep8_naming::{helpers, settings::IgnoreNames};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.82")]
 pub(crate) struct ConstantImportedAsNonConstant {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/dunder_function_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/dunder_function_name.rs
index c4b8f86299..84ec885347 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/dunder_function_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/dunder_function_name.rs
@@ -38,6 +38,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.82")]
 pub(crate) struct DunderFunctionName;
 
 impl Violation for DunderFunctionName {
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
index ecaa71ee20..bb990df5ce 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
@@ -35,6 +35,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#exception-names
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.89")]
 pub(crate) struct ErrorSuffixOnExceptionName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs
index 5bab2edfc7..a490f34702 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs
@@ -44,6 +44,7 @@ use crate::checkers::ast::Checker;
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidArgumentName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_class_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_class_name.rs
index c220d4d41a..cf996876c8 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_class_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_class_name.rs
@@ -41,6 +41,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#class-names
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidClassName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_first_argument_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_first_argument_name.rs
index 790f1a8b40..b174329467 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_first_argument_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_first_argument_name.rs
@@ -59,6 +59,7 @@ use crate::{Fix, Violation};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidFirstArgumentNameForMethod {
     argument_name: String,
 }
@@ -129,6 +130,7 @@ impl Violation for InvalidFirstArgumentNameForMethod {
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 /// [PLW0211]: https://docs.astral.sh/ruff/rules/bad-staticmethod-argument/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidFirstArgumentNameForClassMethod {
     argument_name: String,
     // Whether the method is `__new__`
@@ -141,7 +143,6 @@ impl Violation for InvalidFirstArgumentNameForClassMethod {
     #[derive_message_formats]
     // The first string below is what shows up in the documentation
     // in the rule table, and it is the more common case.
-    #[expect(clippy::if_not_else)]
     fn message(&self) -> String {
         if !self.is_new {
             "First argument of a class method should be named `cls`".to_string()
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs
index 5deb83247e..546b41c014 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs
@@ -42,6 +42,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-variable-names
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidFunctionName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_module_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_module_name.rs
index 6e7e699282..cbc9b54ae2 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_module_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_module_name.rs
@@ -38,6 +38,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#package-and-module-names
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.248")]
 pub(crate) struct InvalidModuleName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs
index 6d2df2e8f1..ae246a1f5b 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs
@@ -35,6 +35,7 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.82")]
 pub(crate) struct LowercaseImportedAsNonLowercase {
     name: String,
     asname: String,
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs
index 1ad5f88381..8e3842a0ef 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs
@@ -41,6 +41,7 @@ use crate::rules::pep8_naming::helpers;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.89")]
 pub(crate) struct MixedCaseVariableInClassScope {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs
index 84e955033e..ae4b159bf2 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs
@@ -18,8 +18,8 @@ use crate::rules::pep8_naming::helpers;
 /// > (Let’s hope that these variables are meant for use inside one module
 /// > only.) The conventions are about the same as those for functions.
 /// >
-/// > Modules that are designed for use via from M import * should use the
-/// > __all__ mechanism to prevent exporting globals, or use the older
+/// > Modules that are designed for use via `from M import *` should use the
+/// > `__all__` mechanism to prevent exporting globals, or use the older
 /// > convention of prefixing such globals with an underscore (which you might
 /// > want to do to indicate these globals are “module non-public”).
 /// >
@@ -52,6 +52,7 @@ use crate::rules::pep8_naming::helpers;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#global-variable-names
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.89")]
 pub(crate) struct MixedCaseVariableInGlobalScope {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs
index d066363122..afcf42309a 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs
@@ -39,6 +39,7 @@ use crate::rules::pep8_naming::helpers;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-variable-names
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.89")]
 pub(crate) struct NonLowercaseVariableInFunction {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap
index 2e7927936b..baf13d4f03 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap
@@ -11,16 +11,15 @@ N804 [*] First argument of a class method should be named `cls`
 31 |         ...
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-27 27 |     def __new__(cls, *args, **kwargs):
-28 28 |         ...
-29 29 | 
-30    |-    def __init_subclass__(self, default_name, **kwargs):
-   30 |+    def __init_subclass__(cls, default_name, **kwargs):
-31 31 |         ...
-32 32 | 
-33 33 |     @classmethod
+27 |     def __new__(cls, *args, **kwargs):
+28 |         ...
+29 | 
+   -     def __init_subclass__(self, default_name, **kwargs):
+30 +     def __init_subclass__(cls, default_name, **kwargs):
+31 |         ...
+32 | 
+33 |     @classmethod
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:38:56
@@ -31,16 +30,15 @@ N804 [*] First argument of a class method should be named `cls`
 39 |         ...
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-35 35 |         ...
-36 36 | 
-37 37 |     @classmethod
-38    |-    def bad_class_method_with_positional_only_argument(self, x, /, other):
-   38 |+    def bad_class_method_with_positional_only_argument(cls, x, /, other):
-39 39 |         ...
-40 40 | 
-41 41 | 
+35 |         ...
+36 | 
+37 |     @classmethod
+   -     def bad_class_method_with_positional_only_argument(self, x, /, other):
+38 +     def bad_class_method_with_positional_only_argument(cls, x, /, other):
+39 |         ...
+40 | 
+41 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:43:20
@@ -51,16 +49,15 @@ N804 [*] First argument of a class method should be named `cls`
 44 |         pass
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-40 40 | 
-41 41 | 
-42 42 | class MetaClass(ABCMeta):
-43    |-    def bad_method(self):
-   43 |+    def bad_method(cls):
-44 44 |         pass
-45 45 | 
-46 46 |     def good_method(cls):
+40 | 
+41 | 
+42 | class MetaClass(ABCMeta):
+   -     def bad_method(self):
+43 +     def bad_method(cls):
+44 |         pass
+45 | 
+46 |     def good_method(cls):
+note: This is an unsafe fix and may change runtime behavior
 
 N804 First argument of a class method should be named `cls`
   --> N804.py:54:25
@@ -126,20 +123,19 @@ N804 [*] First argument of a class method should be named `cls`
 72 |         this
    |
 help: Rename `this` to `cls`
-
-ℹ Unsafe fix
-67 67 |         pass
-68 68 | 
-69 69 | class RenamingInMethodBodyClass(ABCMeta):
-70    |-    def bad_method(this):
-71    |-        this = this
-72    |-        this
-   70 |+    def bad_method(cls):
-   71 |+        cls = cls
-   72 |+        cls
-73 73 | 
-74 74 |     def bad_method(this):
-75 75 |         self = this
+67 |         pass
+68 | 
+69 | class RenamingInMethodBodyClass(ABCMeta):
+   -     def bad_method(this):
+   -         this = this
+   -         this
+70 +     def bad_method(cls):
+71 +         cls = cls
+72 +         cls
+73 | 
+74 |     def bad_method(this):
+75 |         self = this
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:74:20
@@ -151,18 +147,17 @@ N804 [*] First argument of a class method should be named `cls`
 75 |         self = this
    |
 help: Rename `this` to `cls`
-
-ℹ Unsafe fix
-71 71 |         this = this
-72 72 |         this
-73 73 | 
-74    |-    def bad_method(this):
-75    |-        self = this
-   74 |+    def bad_method(cls):
-   75 |+        self = cls
-76 76 | 
-77 77 | def func(x):
-78 78 |     return x
+71 |         this = this
+72 |         this
+73 | 
+   -     def bad_method(this):
+   -         self = this
+74 +     def bad_method(cls):
+75 +         self = cls
+76 | 
+77 | def func(x):
+78 |     return x
+note: This is an unsafe fix and may change runtime behavior
 
 N804 First argument of a class method should be named `cls`
   --> N804.py:88:18
diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap
index 67d2b6cb40..3c48758e14 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap
@@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self`
 8 |         pass
   |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | class Class:
-7   |-    def bad_method(this):
-  7 |+    def bad_method(self):
-8 8 |         pass
-9 9 | 
-10 10 |     if False:
+4  | 
+5  | 
+6  | class Class:
+   -     def bad_method(this):
+7  +     def bad_method(self):
+8  |         pass
+9  | 
+10 |     if False:
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:11:30
@@ -30,16 +29,15 @@ N805 [*] First argument of a method should be named `self`
 12 |             pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-8  8  |         pass
-9  9  | 
-10 10 |     if False:
-11    |-        def extra_bad_method(this):
-   11 |+        def extra_bad_method(self):
-12 12 |             pass
-13 13 | 
-14 14 |     def good_method(self):
+8  |         pass
+9  | 
+10 |     if False:
+   -         def extra_bad_method(this):
+11 +         def extra_bad_method(self):
+12 |             pass
+13 | 
+14 |     def good_method(self):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:30:15
@@ -50,16 +48,15 @@ N805 [*] First argument of a method should be named `self`
 31 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-27 27 |         return x
-28 28 | 
-29 29 |     @pydantic.validator
-30    |-    def lower(cls, my_field: str) -> str:
-   30 |+    def lower(self, my_field: str) -> str:
-31 31 |         pass
-32 32 | 
-33 33 |     @pydantic.validator("my_field")
+27 |         return x
+28 | 
+29 |     @pydantic.validator
+   -     def lower(cls, my_field: str) -> str:
+30 +     def lower(self, my_field: str) -> str:
+31 |         pass
+32 | 
+33 |     @pydantic.validator("my_field")
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:34:15
@@ -70,16 +67,15 @@ N805 [*] First argument of a method should be named `self`
 35 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-31 31 |         pass
-32 32 | 
-33 33 |     @pydantic.validator("my_field")
-34    |-    def lower(cls, my_field: str) -> str:
-   34 |+    def lower(self, my_field: str) -> str:
-35 35 |         pass
-36 36 | 
-37 37 |     def __init__(self):
+31 |         pass
+32 | 
+33 |     @pydantic.validator("my_field")
+   -     def lower(cls, my_field: str) -> str:
+34 +     def lower(self, my_field: str) -> str:
+35 |         pass
+36 | 
+37 |     def __init__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:63:29
@@ -91,16 +87,15 @@ N805 [*] First argument of a method should be named `self`
 64 |         pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-60 60 |     def good_method_pos_only(self, blah, /, something: str):
-61 61 |         pass
-62 62 | 
-63    |-    def bad_method_pos_only(this, blah, /, something: str):
-   63 |+    def bad_method_pos_only(self, blah, /, something: str):
-64 64 |         pass
-65 65 | 
-66 66 | 
+60 |     def good_method_pos_only(self, blah, /, something: str):
+61 |         pass
+62 | 
+   -     def bad_method_pos_only(this, blah, /, something: str):
+63 +     def bad_method_pos_only(self, blah, /, something: str):
+64 |         pass
+65 | 
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:69:13
@@ -112,16 +107,15 @@ N805 [*] First argument of a method should be named `self`
 70 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | class ModelClass:
-68 68 |     @hybrid_property
-69    |-    def bad(cls):
-   69 |+    def bad(self):
-70 70 |         pass
-71 71 | 
-72 72 |     @bad.expression
+66 | 
+67 | class ModelClass:
+68 |     @hybrid_property
+   -     def bad(cls):
+69 +     def bad(self):
+70 |         pass
+71 | 
+72 |     @bad.expression
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:77:13
@@ -132,16 +126,15 @@ N805 [*] First argument of a method should be named `self`
 78 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-74 74 |         pass
-75 75 | 
-76 76 |     @bad.wtf
-77    |-    def bad(cls):
-   77 |+    def bad(self):
-78 78 |         pass
-79 79 | 
-80 80 |     @hybrid_property
+74 |         pass
+75 | 
+76 |     @bad.wtf
+   -     def bad(cls):
+77 +     def bad(self):
+78 |         pass
+79 | 
+80 |     @hybrid_property
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:85:14
@@ -152,16 +145,15 @@ N805 [*] First argument of a method should be named `self`
 86 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-82 82 |         pass
-83 83 | 
-84 84 |     @good.expression
-85    |-    def good(cls):
-   85 |+    def good(self):
-86 86 |         pass
-87 87 | 
-88 88 |     @good.wtf
+82 |         pass
+83 | 
+84 |     @good.expression
+   -     def good(cls):
+85 +     def good(self):
+86 |         pass
+87 | 
+88 |     @good.wtf
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:93:19
@@ -172,16 +164,15 @@ N805 [*] First argument of a method should be named `self`
 94 |         pass
    |
 help: Rename `foo` to `self`
-
-ℹ Unsafe fix
-90 90 |         pass
-91 91 | 
-92 92 |     @foobar.thisisstatic
-93    |-    def badstatic(foo):
-   93 |+    def badstatic(self):
-94 94 |         pass
-95 95 | 
-96 96 | 
+90 |         pass
+91 | 
+92 |     @foobar.thisisstatic
+   -     def badstatic(foo):
+93 +     def badstatic(self):
+94 |         pass
+95 | 
+96 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
   --> N805.py:98:26
@@ -247,20 +238,19 @@ N805 [*] First argument of a method should be named `self`
 117 |         this
     |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-112 112 | 
-113 113 | 
-114 114 | class RenamingInMethodBodyClass:
-115     |-    def bad_method(this):
-116     |-        this = this
-117     |-        this
-    115 |+    def bad_method(self):
-    116 |+        self = self
-    117 |+        self
-118 118 | 
-119 119 |     def bad_method(this):
-120 120 |         self = this
+112 | 
+113 | 
+114 | class RenamingInMethodBodyClass:
+    -     def bad_method(this):
+    -         this = this
+    -         this
+115 +     def bad_method(self):
+116 +         self = self
+117 +         self
+118 | 
+119 |     def bad_method(this):
+120 |         self = this
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
    --> N805.py:119:20
@@ -282,18 +272,17 @@ N805 [*] First argument of a method should be named `self`
 125 |         hºusehold(1)
     |
 help: Rename `household` to `self`
-
-ℹ Unsafe fix
-121 121 | 
-122 122 | 
-123 123 | class RenamingWithNFKC:
-124     |-    def formula(household):
-125     |-        hºusehold(1)
-    124 |+    def formula(self):
-    125 |+        self(1)
-126 126 | 
-127 127 | 
-128 128 | from typing import Protocol
+121 | 
+122 | 
+123 | class RenamingWithNFKC:
+    -     def formula(household):
+    -         hºusehold(1)
+124 +     def formula(self):
+125 +         self(1)
+126 | 
+127 | 
+128 | from typing import Protocol
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
    --> N805.py:141:11
diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap
index ade14cb4e6..9b1800ce93 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap
@@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self`
 8 |         pass
   |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | class Class:
-7   |-    def bad_method(this):
-  7 |+    def bad_method(self):
-8 8 |         pass
-9 9 | 
-10 10 |     if False:
+4  | 
+5  | 
+6  | class Class:
+   -     def bad_method(this):
+7  +     def bad_method(self):
+8  |         pass
+9  | 
+10 |     if False:
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:11:30
@@ -30,16 +29,15 @@ N805 [*] First argument of a method should be named `self`
 12 |             pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-8  8  |         pass
-9  9  | 
-10 10 |     if False:
-11    |-        def extra_bad_method(this):
-   11 |+        def extra_bad_method(self):
-12 12 |             pass
-13 13 | 
-14 14 |     def good_method(self):
+8  |         pass
+9  | 
+10 |     if False:
+   -         def extra_bad_method(this):
+11 +         def extra_bad_method(self):
+12 |             pass
+13 | 
+14 |     def good_method(self):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:63:29
@@ -51,16 +49,15 @@ N805 [*] First argument of a method should be named `self`
 64 |         pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-60 60 |     def good_method_pos_only(self, blah, /, something: str):
-61 61 |         pass
-62 62 | 
-63    |-    def bad_method_pos_only(this, blah, /, something: str):
-   63 |+    def bad_method_pos_only(self, blah, /, something: str):
-64 64 |         pass
-65 65 | 
-66 66 | 
+60 |     def good_method_pos_only(self, blah, /, something: str):
+61 |         pass
+62 | 
+   -     def bad_method_pos_only(this, blah, /, something: str):
+63 +     def bad_method_pos_only(self, blah, /, something: str):
+64 |         pass
+65 | 
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:69:13
@@ -72,16 +69,15 @@ N805 [*] First argument of a method should be named `self`
 70 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | class ModelClass:
-68 68 |     @hybrid_property
-69    |-    def bad(cls):
-   69 |+    def bad(self):
-70 70 |         pass
-71 71 | 
-72 72 |     @bad.expression
+66 | 
+67 | class ModelClass:
+68 |     @hybrid_property
+   -     def bad(cls):
+69 +     def bad(self):
+70 |         pass
+71 | 
+72 |     @bad.expression
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:77:13
@@ -92,16 +88,15 @@ N805 [*] First argument of a method should be named `self`
 78 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-74 74 |         pass
-75 75 | 
-76 76 |     @bad.wtf
-77    |-    def bad(cls):
-   77 |+    def bad(self):
-78 78 |         pass
-79 79 | 
-80 80 |     @hybrid_property
+74 |         pass
+75 | 
+76 |     @bad.wtf
+   -     def bad(cls):
+77 +     def bad(self):
+78 |         pass
+79 | 
+80 |     @hybrid_property
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:93:19
@@ -112,16 +107,15 @@ N805 [*] First argument of a method should be named `self`
 94 |         pass
    |
 help: Rename `foo` to `self`
-
-ℹ Unsafe fix
-90 90 |         pass
-91 91 | 
-92 92 |     @foobar.thisisstatic
-93    |-    def badstatic(foo):
-   93 |+    def badstatic(self):
-94 94 |         pass
-95 95 | 
-96 96 | 
+90 |         pass
+91 | 
+92 |     @foobar.thisisstatic
+   -     def badstatic(foo):
+93 +     def badstatic(self):
+94 |         pass
+95 | 
+96 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
   --> N805.py:98:26
@@ -187,20 +181,19 @@ N805 [*] First argument of a method should be named `self`
 117 |         this
     |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-112 112 | 
-113 113 | 
-114 114 | class RenamingInMethodBodyClass:
-115     |-    def bad_method(this):
-116     |-        this = this
-117     |-        this
-    115 |+    def bad_method(self):
-    116 |+        self = self
-    117 |+        self
-118 118 | 
-119 119 |     def bad_method(this):
-120 120 |         self = this
+112 | 
+113 | 
+114 | class RenamingInMethodBodyClass:
+    -     def bad_method(this):
+    -         this = this
+    -         this
+115 +     def bad_method(self):
+116 +         self = self
+117 +         self
+118 | 
+119 |     def bad_method(this):
+120 |         self = this
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
    --> N805.py:119:20
@@ -222,18 +215,17 @@ N805 [*] First argument of a method should be named `self`
 125 |         hºusehold(1)
     |
 help: Rename `household` to `self`
-
-ℹ Unsafe fix
-121 121 | 
-122 122 | 
-123 123 | class RenamingWithNFKC:
-124     |-    def formula(household):
-125     |-        hºusehold(1)
-    124 |+    def formula(self):
-    125 |+        self(1)
-126 126 | 
-127 127 | 
-128 128 | from typing import Protocol
+121 | 
+122 | 
+123 | class RenamingWithNFKC:
+    -     def formula(household):
+    -         hºusehold(1)
+124 +     def formula(self):
+125 +         self(1)
+126 | 
+127 | 
+128 | from typing import Protocol
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
    --> N805.py:141:11
diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap
index 4f123be2e7..0039192b4b 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap
@@ -10,16 +10,15 @@ N804 [*] First argument of a class method should be named `cls`
 6 |         ...
   |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | 
-4 4 | class Class:
-5   |-    def __init_subclass__(self, default_name, **kwargs):
-  5 |+    def __init_subclass__(cls, default_name, **kwargs):
-6 6 |         ...
-7 7 | 
-8 8 |     @classmethod
+2 | 
+3 | 
+4 | class Class:
+  -     def __init_subclass__(self, default_name, **kwargs):
+5 +     def __init_subclass__(cls, default_name, **kwargs):
+6 |         ...
+7 | 
+8 |     @classmethod
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:9:20
@@ -30,16 +29,15 @@ N804 [*] First argument of a class method should be named `cls`
 10 |         ...
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-6  6  |         ...
-7  7  | 
-8  8  |     @classmethod
-9     |-    def badAllowed(self, x, /, other):
-   9  |+    def badAllowed(cls, x, /, other):
-10 10 |         ...
-11 11 | 
-12 12 |     @classmethod
+6  |         ...
+7  | 
+8  |     @classmethod
+   -     def badAllowed(self, x, /, other):
+9  +     def badAllowed(cls, x, /, other):
+10 |         ...
+11 | 
+12 |     @classmethod
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:13:18
@@ -50,16 +48,15 @@ N804 [*] First argument of a class method should be named `cls`
 14 |         ...
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-10 10 |         ...
-11 11 | 
-12 12 |     @classmethod
-13    |-    def stillBad(self, x, /, other):
-   13 |+    def stillBad(cls, x, /, other):
-14 14 |         ...
-15 15 | 
-16 16 | 
+10 |         ...
+11 | 
+12 |     @classmethod
+   -     def stillBad(self, x, /, other):
+13 +     def stillBad(cls, x, /, other):
+14 |         ...
+15 | 
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:18:20
@@ -70,16 +67,15 @@ N804 [*] First argument of a class method should be named `cls`
 19 |         pass
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | 
-17 17 | class MetaClass(ABCMeta):
-18    |-    def badAllowed(self):
-   18 |+    def badAllowed(cls):
-19 19 |         pass
-20 20 | 
-21 21 |     def stillBad(self):
+15 | 
+16 | 
+17 | class MetaClass(ABCMeta):
+   -     def badAllowed(self):
+18 +     def badAllowed(cls):
+19 |         pass
+20 | 
+21 |     def stillBad(self):
+note: This is an unsafe fix and may change runtime behavior
 
 N804 [*] First argument of a class method should be named `cls`
   --> N804.py:21:18
@@ -91,11 +87,10 @@ N804 [*] First argument of a class method should be named `cls`
 22 |         pass
    |
 help: Rename `self` to `cls`
-
-ℹ Unsafe fix
-18 18 |     def badAllowed(self):
-19 19 |         pass
-20 20 | 
-21    |-    def stillBad(self):
-   21 |+    def stillBad(cls):
-22 22 |         pass
+18 |     def badAllowed(self):
+19 |         pass
+20 | 
+   -     def stillBad(self):
+21 +     def stillBad(cls):
+22 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap
index 94c5871ea8..f4f8f4e261 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap
@@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self`
 8 |         pass
   |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | class Class:
-7   |-    def badAllowed(this):
-  7 |+    def badAllowed(self):
-8 8 |         pass
-9 9 | 
-10 10 |     def stillBad(this):
+4  | 
+5  | 
+6  | class Class:
+   -     def badAllowed(this):
+7  +     def badAllowed(self):
+8  |         pass
+9  | 
+10 |     def stillBad(this):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:10:18
@@ -31,16 +30,15 @@ N805 [*] First argument of a method should be named `self`
 11 |         pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-7  7  |     def badAllowed(this):
-8  8  |         pass
-9  9  | 
-10    |-    def stillBad(this):
-   10 |+    def stillBad(self):
-11 11 |         pass
-12 12 | 
-13 13 |     if False:
+7  |     def badAllowed(this):
+8  |         pass
+9  | 
+   -     def stillBad(this):
+10 +     def stillBad(self):
+11 |         pass
+12 | 
+13 |     if False:
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:15:24
@@ -52,16 +50,15 @@ N805 [*] First argument of a method should be named `self`
 16 |             pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-12 12 | 
-13 13 |     if False:
-14 14 | 
-15    |-        def badAllowed(this):
-   15 |+        def badAllowed(self):
-16 16 |             pass
-17 17 | 
-18 18 |         def stillBad(this):
+12 | 
+13 |     if False:
+14 | 
+   -         def badAllowed(this):
+15 +         def badAllowed(self):
+16 |             pass
+17 | 
+18 |         def stillBad(this):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:18:22
@@ -73,16 +70,15 @@ N805 [*] First argument of a method should be named `self`
 19 |             pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-15 15 |         def badAllowed(this):
-16 16 |             pass
-17 17 | 
-18    |-        def stillBad(this):
-   18 |+        def stillBad(self):
-19 19 |             pass
-20 20 | 
-21 21 |     @pydantic.validator
+15 |         def badAllowed(this):
+16 |             pass
+17 | 
+   -         def stillBad(this):
+18 +         def stillBad(self):
+19 |             pass
+20 | 
+21 |     @pydantic.validator
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:22:20
@@ -93,16 +89,15 @@ N805 [*] First argument of a method should be named `self`
 23 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-19 19 |             pass
-20 20 | 
-21 21 |     @pydantic.validator
-22    |-    def badAllowed(cls, my_field: str) -> str:
-   22 |+    def badAllowed(self, my_field: str) -> str:
-23 23 |         pass
-24 24 | 
-25 25 |     @pydantic.validator
+19 |             pass
+20 | 
+21 |     @pydantic.validator
+   -     def badAllowed(cls, my_field: str) -> str:
+22 +     def badAllowed(self, my_field: str) -> str:
+23 |         pass
+24 | 
+25 |     @pydantic.validator
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:26:18
@@ -113,16 +108,15 @@ N805 [*] First argument of a method should be named `self`
 27 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-23 23 |         pass
-24 24 | 
-25 25 |     @pydantic.validator
-26    |-    def stillBad(cls, my_field: str) -> str:
-   26 |+    def stillBad(self, my_field: str) -> str:
-27 27 |         pass
-28 28 | 
-29 29 |     @pydantic.validator("my_field")
+23 |         pass
+24 | 
+25 |     @pydantic.validator
+   -     def stillBad(cls, my_field: str) -> str:
+26 +     def stillBad(self, my_field: str) -> str:
+27 |         pass
+28 | 
+29 |     @pydantic.validator("my_field")
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:30:20
@@ -133,16 +127,15 @@ N805 [*] First argument of a method should be named `self`
 31 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-27 27 |         pass
-28 28 | 
-29 29 |     @pydantic.validator("my_field")
-30    |-    def badAllowed(cls, my_field: str) -> str:
-   30 |+    def badAllowed(self, my_field: str) -> str:
-31 31 |         pass
-32 32 | 
-33 33 |     @pydantic.validator("my_field")
+27 |         pass
+28 | 
+29 |     @pydantic.validator("my_field")
+   -     def badAllowed(cls, my_field: str) -> str:
+30 +     def badAllowed(self, my_field: str) -> str:
+31 |         pass
+32 | 
+33 |     @pydantic.validator("my_field")
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:34:18
@@ -153,16 +146,15 @@ N805 [*] First argument of a method should be named `self`
 35 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-31 31 |         pass
-32 32 | 
-33 33 |     @pydantic.validator("my_field")
-34    |-    def stillBad(cls, my_field: str) -> str:
-   34 |+    def stillBad(self, my_field: str) -> str:
-35 35 |         pass
-36 36 | 
-37 37 |     @classmethod
+31 |         pass
+32 | 
+33 |     @pydantic.validator("my_field")
+   -     def stillBad(cls, my_field: str) -> str:
+34 +     def stillBad(self, my_field: str) -> str:
+35 |         pass
+36 | 
+37 |     @classmethod
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
   --> N805.py:55:20
diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap
index d7d332471d..b1ff6bb824 100644
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap
@@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self`
 8 |         pass
   |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | class Class:
-7   |-    def bad_method(this):
-  7 |+    def bad_method(self):
-8 8 |         pass
-9 9 | 
-10 10 |     if False:
+4  | 
+5  | 
+6  | class Class:
+   -     def bad_method(this):
+7  +     def bad_method(self):
+8  |         pass
+9  | 
+10 |     if False:
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:11:30
@@ -30,16 +29,15 @@ N805 [*] First argument of a method should be named `self`
 12 |             pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-8  8  |         pass
-9  9  | 
-10 10 |     if False:
-11    |-        def extra_bad_method(this):
-   11 |+        def extra_bad_method(self):
-12 12 |             pass
-13 13 | 
-14 14 |     def good_method(self):
+8  |         pass
+9  | 
+10 |     if False:
+   -         def extra_bad_method(this):
+11 +         def extra_bad_method(self):
+12 |             pass
+13 | 
+14 |     def good_method(self):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:30:15
@@ -50,16 +48,15 @@ N805 [*] First argument of a method should be named `self`
 31 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-27 27 |         return x
-28 28 | 
-29 29 |     @pydantic.validator
-30    |-    def lower(cls, my_field: str) -> str:
-   30 |+    def lower(self, my_field: str) -> str:
-31 31 |         pass
-32 32 | 
-33 33 |     @pydantic.validator("my_field")
+27 |         return x
+28 | 
+29 |     @pydantic.validator
+   -     def lower(cls, my_field: str) -> str:
+30 +     def lower(self, my_field: str) -> str:
+31 |         pass
+32 | 
+33 |     @pydantic.validator("my_field")
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:34:15
@@ -70,16 +67,15 @@ N805 [*] First argument of a method should be named `self`
 35 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-31 31 |         pass
-32 32 | 
-33 33 |     @pydantic.validator("my_field")
-34    |-    def lower(cls, my_field: str) -> str:
-   34 |+    def lower(self, my_field: str) -> str:
-35 35 |         pass
-36 36 | 
-37 37 |     def __init__(self):
+31 |         pass
+32 | 
+33 |     @pydantic.validator("my_field")
+   -     def lower(cls, my_field: str) -> str:
+34 +     def lower(self, my_field: str) -> str:
+35 |         pass
+36 | 
+37 |     def __init__(self):
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:63:29
@@ -91,16 +87,15 @@ N805 [*] First argument of a method should be named `self`
 64 |         pass
    |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-60 60 |     def good_method_pos_only(self, blah, /, something: str):
-61 61 |         pass
-62 62 | 
-63    |-    def bad_method_pos_only(this, blah, /, something: str):
-   63 |+    def bad_method_pos_only(self, blah, /, something: str):
-64 64 |         pass
-65 65 | 
-66 66 | 
+60 |     def good_method_pos_only(self, blah, /, something: str):
+61 |         pass
+62 | 
+   -     def bad_method_pos_only(this, blah, /, something: str):
+63 +     def bad_method_pos_only(self, blah, /, something: str):
+64 |         pass
+65 | 
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:69:13
@@ -112,16 +107,15 @@ N805 [*] First argument of a method should be named `self`
 70 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | class ModelClass:
-68 68 |     @hybrid_property
-69    |-    def bad(cls):
-   69 |+    def bad(self):
-70 70 |         pass
-71 71 | 
-72 72 |     @bad.expression
+66 | 
+67 | class ModelClass:
+68 |     @hybrid_property
+   -     def bad(cls):
+69 +     def bad(self):
+70 |         pass
+71 | 
+72 |     @bad.expression
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:77:13
@@ -132,16 +126,15 @@ N805 [*] First argument of a method should be named `self`
 78 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-74 74 |         pass
-75 75 | 
-76 76 |     @bad.wtf
-77    |-    def bad(cls):
-   77 |+    def bad(self):
-78 78 |         pass
-79 79 | 
-80 80 |     @hybrid_property
+74 |         pass
+75 | 
+76 |     @bad.wtf
+   -     def bad(cls):
+77 +     def bad(self):
+78 |         pass
+79 | 
+80 |     @hybrid_property
+note: This is an unsafe fix and may change runtime behavior
 
 N805 [*] First argument of a method should be named `self`
   --> N805.py:85:14
@@ -152,16 +145,15 @@ N805 [*] First argument of a method should be named `self`
 86 |         pass
    |
 help: Rename `cls` to `self`
-
-ℹ Unsafe fix
-82 82 |         pass
-83 83 | 
-84 84 |     @good.expression
-85    |-    def good(cls):
-   85 |+    def good(self):
-86 86 |         pass
-87 87 | 
-88 88 |     @good.wtf
+82 |         pass
+83 | 
+84 |     @good.expression
+   -     def good(cls):
+85 +     def good(self):
+86 |         pass
+87 | 
+88 |     @good.wtf
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
   --> N805.py:98:26
@@ -227,20 +219,19 @@ N805 [*] First argument of a method should be named `self`
 117 |         this
     |
 help: Rename `this` to `self`
-
-ℹ Unsafe fix
-112 112 | 
-113 113 | 
-114 114 | class RenamingInMethodBodyClass:
-115     |-    def bad_method(this):
-116     |-        this = this
-117     |-        this
-    115 |+    def bad_method(self):
-    116 |+        self = self
-    117 |+        self
-118 118 | 
-119 119 |     def bad_method(this):
-120 120 |         self = this
+112 | 
+113 | 
+114 | class RenamingInMethodBodyClass:
+    -     def bad_method(this):
+    -         this = this
+    -         this
+115 +     def bad_method(self):
+116 +         self = self
+117 +         self
+118 | 
+119 |     def bad_method(this):
+120 |         self = this
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
    --> N805.py:119:20
@@ -262,18 +253,17 @@ N805 [*] First argument of a method should be named `self`
 125 |         hºusehold(1)
     |
 help: Rename `household` to `self`
-
-ℹ Unsafe fix
-121 121 | 
-122 122 | 
-123 123 | class RenamingWithNFKC:
-124     |-    def formula(household):
-125     |-        hºusehold(1)
-    124 |+    def formula(self):
-    125 |+        self(1)
-126 126 | 
-127 127 | 
-128 128 | from typing import Protocol
+121 | 
+122 | 
+123 | class RenamingWithNFKC:
+    -     def formula(household):
+    -         hºusehold(1)
+124 +     def formula(self):
+125 +         self(1)
+126 | 
+127 | 
+128 | from typing import Protocol
+note: This is an unsafe fix and may change runtime behavior
 
 N805 First argument of a method should be named `self`
    --> N805.py:141:11
diff --git a/crates/ruff_linter/src/rules/perflint/rules/incorrect_dict_iterator.rs b/crates/ruff_linter/src/rules/perflint/rules/incorrect_dict_iterator.rs
index b26e7b309b..b24e8fa793 100644
--- a/crates/ruff_linter/src/rules/perflint/rules/incorrect_dict_iterator.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/incorrect_dict_iterator.rs
@@ -44,6 +44,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// (e.g., if it is missing a `.keys()` or `.values()` method, or if those
 /// methods behave differently than they do on standard mapping types).
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct IncorrectDictIterator {
     subset: DictSubset,
 }
diff --git a/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs b/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs
index d67b3803d8..560aac29a8 100644
--- a/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs
@@ -46,6 +46,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// result.update({x: y for x, y in pairs if y % 2})
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct ManualDictComprehension {
     fix_type: DictComprehensionType,
     is_async: bool,
@@ -354,21 +355,37 @@ fn convert_to_dict_comprehension(
         "for"
     };
     // Handles the case where `key` has a trailing comma, e.g, `dict[x,] = y`
-    let key_range = if let Expr::Tuple(ast::ExprTuple { elts, .. }) = key {
-        let [expr] = elts.as_slice() else {
+    let key_str = if let Expr::Tuple(ast::ExprTuple {
+        elts,
+        parenthesized,
+        ..
+    }) = key
+    {
+        if elts.len() != 1 {
             return None;
-        };
-        expr.range()
+        }
+        if *parenthesized {
+            locator.slice(key).to_string()
+        } else {
+            format!("({})", locator.slice(key))
+        }
     } else {
-        key.range()
+        locator.slice(key).to_string()
     };
-    let elt_str = format!(
-        "{}: {}",
-        locator.slice(key_range),
-        locator.slice(value.range())
-    );
 
-    let comprehension_str = format!("{{{elt_str} {for_type} {target_str} in {iter_str}{if_str}}}");
+    // If the value is a tuple without parentheses, add them
+    let value_str = if let Expr::Tuple(ast::ExprTuple {
+        parenthesized: false,
+        ..
+    }) = value
+    {
+        format!("({})", locator.slice(value))
+    } else {
+        locator.slice(value).to_string()
+    };
+
+    let comprehension_str =
+        format!("{{{key_str}: {value_str} {for_type} {target_str} in {iter_str}{if_str}}}");
 
     let for_loop_inline_comments = comment_strings_in_range(
         checker,
diff --git a/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs b/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs
index d09e42db8d..84b7290e51 100644
--- a/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs
@@ -49,6 +49,7 @@ use ruff_text_size::{Ranged, TextRange};
 /// filtered.extend(x for x in original if x % 2)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct ManualListComprehension {
     is_async: bool,
     comprehension_type: Option<ComprehensionType>,
diff --git a/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs b/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs
index 3322830aca..44122f25b3 100644
--- a/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// filtered = list(original)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct ManualListCopy;
 
 impl Violation for ManualListCopy {
diff --git a/crates/ruff_linter/src/rules/perflint/rules/try_except_in_loop.rs b/crates/ruff_linter/src/rules/perflint/rules/try_except_in_loop.rs
index 87f89bf18e..9fdcc29446 100644
--- a/crates/ruff_linter/src/rules/perflint/rules/try_except_in_loop.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/try_except_in_loop.rs
@@ -77,6 +77,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `target-version`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct TryExceptInLoop;
 
 impl Violation for TryExceptInLoop {
diff --git a/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs b/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs
index 8949c0997d..f616e0f541 100644
--- a/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs
@@ -51,6 +51,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     print(i)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct UnnecessaryListCast;
 
 impl AlwaysFixableViolation for UnnecessaryListCast {
diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap
index 60a71ae175..d37d637bbc 100644
--- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap
+++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap
@@ -11,16 +11,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 8 |     pass
   |
 help: Remove `list()` cast
-
-ℹ Safe fix
-4 4 | foo_dict = {1: 2, 3: 4}
-5 5 | foo_int = 123
-6 6 | 
-7   |-for i in list(foo_tuple):  # PERF101
-  7 |+for i in foo_tuple:  # PERF101
-8 8 |     pass
-9 9 | 
-10 10 | for i in list(foo_list):  # PERF101
+4  | foo_dict = {1: 2, 3: 4}
+5  | foo_int = 123
+6  | 
+   - for i in list(foo_tuple):  # PERF101
+7  + for i in foo_tuple:  # PERF101
+8  |     pass
+9  | 
+10 | for i in list(foo_list):  # PERF101
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:10:10
@@ -32,16 +30,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 11 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-7  7  | for i in list(foo_tuple):  # PERF101
-8  8  |     pass
-9  9  | 
-10    |-for i in list(foo_list):  # PERF101
-   10 |+for i in foo_list:  # PERF101
-11 11 |     pass
-12 12 | 
-13 13 | for i in list(foo_set):  # PERF101
+7  | for i in list(foo_tuple):  # PERF101
+8  |     pass
+9  | 
+   - for i in list(foo_list):  # PERF101
+10 + for i in foo_list:  # PERF101
+11 |     pass
+12 | 
+13 | for i in list(foo_set):  # PERF101
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:13:10
@@ -53,16 +49,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 14 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-10 10 | for i in list(foo_list):  # PERF101
-11 11 |     pass
-12 12 | 
-13    |-for i in list(foo_set):  # PERF101
-   13 |+for i in foo_set:  # PERF101
-14 14 |     pass
-15 15 | 
-16 16 | for i in list((1, 2, 3)):  # PERF101
+10 | for i in list(foo_list):  # PERF101
+11 |     pass
+12 | 
+   - for i in list(foo_set):  # PERF101
+13 + for i in foo_set:  # PERF101
+14 |     pass
+15 | 
+16 | for i in list((1, 2, 3)):  # PERF101
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:16:10
@@ -74,16 +68,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 17 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-13 13 | for i in list(foo_set):  # PERF101
-14 14 |     pass
-15 15 | 
-16    |-for i in list((1, 2, 3)):  # PERF101
-   16 |+for i in (1, 2, 3):  # PERF101
-17 17 |     pass
-18 18 | 
-19 19 | for i in list([1, 2, 3]):  # PERF101
+13 | for i in list(foo_set):  # PERF101
+14 |     pass
+15 | 
+   - for i in list((1, 2, 3)):  # PERF101
+16 + for i in (1, 2, 3):  # PERF101
+17 |     pass
+18 | 
+19 | for i in list([1, 2, 3]):  # PERF101
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:19:10
@@ -95,16 +87,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 20 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-16 16 | for i in list((1, 2, 3)):  # PERF101
-17 17 |     pass
-18 18 | 
-19    |-for i in list([1, 2, 3]):  # PERF101
-   19 |+for i in [1, 2, 3]:  # PERF101
-20 20 |     pass
-21 21 | 
-22 22 | for i in list({1, 2, 3}):  # PERF101
+16 | for i in list((1, 2, 3)):  # PERF101
+17 |     pass
+18 | 
+   - for i in list([1, 2, 3]):  # PERF101
+19 + for i in [1, 2, 3]:  # PERF101
+20 |     pass
+21 | 
+22 | for i in list({1, 2, 3}):  # PERF101
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:22:10
@@ -116,16 +106,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 23 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-19 19 | for i in list([1, 2, 3]):  # PERF101
-20 20 |     pass
-21 21 | 
-22    |-for i in list({1, 2, 3}):  # PERF101
-   22 |+for i in {1, 2, 3}:  # PERF101
-23 23 |     pass
-24 24 | 
-25 25 | for i in list(
+19 | for i in list([1, 2, 3]):  # PERF101
+20 |     pass
+21 | 
+   - for i in list({1, 2, 3}):  # PERF101
+22 + for i in {1, 2, 3}:  # PERF101
+23 |     pass
+24 | 
+25 | for i in list(
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:25:10
@@ -144,23 +132,21 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 32 |       pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-22 22 | for i in list({1, 2, 3}):  # PERF101
-23 23 |     pass
-24 24 | 
-25    |-for i in list(
-26    |-    {
-   25 |+for i in {
-27 26 |     1,
-28 27 |     2,
-29 28 |     3,
-30    |-    }
-31    |-):
-   29 |+    }:
-32 30 |     pass
-33 31 | 
-34 32 | for i in list( # Comment
+22 | for i in list({1, 2, 3}):  # PERF101
+23 |     pass
+24 | 
+   - for i in list(
+   -     {
+25 + for i in {
+26 |     1,
+27 |     2,
+28 |     3,
+   -     }
+   - ):
+29 +     }:
+30 |     pass
+31 | 
+32 | for i in list( # Comment
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:34:10
@@ -175,18 +161,17 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 37 |       pass
    |
 help: Remove `list()` cast
-
-ℹ Unsafe fix
-31 31 | ):
-32 32 |     pass
-33 33 | 
-34    |-for i in list( # Comment
-35    |-    {1, 2, 3}
-36    |-):  # PERF101
-   34 |+for i in {1, 2, 3}:  # PERF101
-37 35 |     pass
-38 36 | 
-39 37 | for i in list(foo_dict):  # OK
+31 | ):
+32 |     pass
+33 | 
+   - for i in list( # Comment
+   -     {1, 2, 3}
+   - ):  # PERF101
+34 + for i in {1, 2, 3}:  # PERF101
+35 |     pass
+36 | 
+37 | for i in list(foo_dict):  # OK
+note: This is an unsafe fix and may change runtime behavior
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:57:10
@@ -199,16 +184,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 59 |     other_list.append(i + 1)
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-54 54 | for i in list(foo_list):  # OK
-55 55 |     foo_list.append(i + 1)
-56 56 | 
-57    |-for i in list(foo_list):  # PERF101
-   57 |+for i in foo_list:  # PERF101
-58 58 |     # Make sure we match the correct list
-59 59 |     other_list.append(i + 1)
-60 60 | 
+54 | for i in list(foo_list):  # OK
+55 |     foo_list.append(i + 1)
+56 | 
+   - for i in list(foo_list):  # PERF101
+57 + for i in foo_list:  # PERF101
+58 |     # Make sure we match the correct list
+59 |     other_list.append(i + 1)
+60 | 
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:69:10
@@ -220,16 +203,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 70 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-66 66 | 
-67 67 | x, y, nested_tuple = (1, 2, (3, 4, 5))
-68 68 | 
-69    |-for i in list(nested_tuple):  # PERF101
-   69 |+for i in nested_tuple:  # PERF101
-70 70 |     pass
-71 71 | 
-72 72 | for i in list(foo_list):  # OK
+66 | 
+67 | x, y, nested_tuple = (1, 2, (3, 4, 5))
+68 | 
+   - for i in list(nested_tuple):  # PERF101
+69 + for i in nested_tuple:  # PERF101
+70 |     pass
+71 | 
+72 | for i in list(foo_list):  # OK
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:86:10
@@ -241,16 +222,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 87 |     pass
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-83 83 | 
-84 84 | import builtins
-85 85 | 
-86    |-for i in builtins.list(nested_tuple):  # PERF101
-   86 |+for i in nested_tuple:  # PERF101
-87 87 |     pass
-88 88 | 
-89 89 | # https://github.com/astral-sh/ruff/issues/18783
+83 | 
+84 | import builtins
+85 | 
+   - for i in builtins.list(nested_tuple):  # PERF101
+86 + for i in nested_tuple:  # PERF101
+87 |     pass
+88 | 
+89 | # https://github.com/astral-sh/ruff/issues/18783
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
   --> PERF101.py:91:9
@@ -262,16 +241,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 92 |     print(i)
    |
 help: Remove `list()` cast
-
-ℹ Safe fix
-88 88 | 
-89 89 | # https://github.com/astral-sh/ruff/issues/18783
-90 90 | items = (1, 2, 3)
-91    |-for i in(list)(items):
-   91 |+for i in items:
-92 92 |     print(i)
-93 93 | 
-94 94 | # https://github.com/astral-sh/ruff/issues/18784
+88 | 
+89 | # https://github.com/astral-sh/ruff/issues/18783
+90 | items = (1, 2, 3)
+   - for i in(list)(items):
+91 + for i in items:
+92 |     print(i)
+93 | 
+94 | # https://github.com/astral-sh/ruff/issues/18784
 
 PERF101 [*] Do not cast an iterable to `list` before iterating over it
    --> PERF101.py:96:10
@@ -290,17 +267,16 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it
 103 |       print(i)
     |
 help: Remove `list()` cast
-
-ℹ Unsafe fix
-93  93  | 
-94  94  | # https://github.com/astral-sh/ruff/issues/18784
-95  95  | items = (1, 2, 3)
-96      |-for i in (  # 1
-97      |-    list  # 2
-98      |-    # 3
-99      |-)(  # 4
-100     |-    items  # 5
-101     |-    # 6
-102     |-):
-    96  |+for i in items:
-103 97  |     print(i)
+93 | 
+94 | # https://github.com/astral-sh/ruff/issues/18784
+95 | items = (1, 2, 3)
+   - for i in (  # 1
+   -     list  # 2
+   -     # 3
+   - )(  # 4
+   -     items  # 5
+   -     # 6
+   - ):
+96 + for i in items:
+97 |     print(i)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap
index e7b8eb93f3..587b67ccd0 100644
--- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap
+++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap
@@ -10,16 +10,15 @@ PERF102 [*] When using only the values of a dict use the `values()` method
 6 |         print(value)
   |
 help: Replace `.items()` with `.values()`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | 
-4 4 | def f():
-5   |-    for _, value in some_dict.items():  # PERF102
-  5 |+    for value in some_dict.values():  # PERF102
-6 6 |         print(value)
-7 7 | 
-8 8 | 
+2 | 
+3 | 
+4 | def f():
+  -     for _, value in some_dict.items():  # PERF102
+5 +     for value in some_dict.values():  # PERF102
+6 |         print(value)
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:10:19
@@ -30,16 +29,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 11 |         print(key)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | 
-9  9  | def f():
-10    |-    for key, _ in some_dict.items():  # PERF102
-   10 |+    for key in some_dict.keys():  # PERF102
-11 11 |         print(key)
-12 12 | 
-13 13 | 
+7  | 
+8  | 
+9  | def f():
+   -     for key, _ in some_dict.items():  # PERF102
+10 +     for key in some_dict.keys():  # PERF102
+11 |         print(key)
+12 | 
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:15:30
@@ -50,16 +48,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 16 |         print(weird_arg_name)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | 
-14 14 | def f():
-15    |-    for weird_arg_name, _ in some_dict.items():  # PERF102
-   15 |+    for weird_arg_name in some_dict.keys():  # PERF102
-16 16 |         print(weird_arg_name)
-17 17 | 
-18 18 | 
+12 | 
+13 | 
+14 | def f():
+   -     for weird_arg_name, _ in some_dict.items():  # PERF102
+15 +     for weird_arg_name in some_dict.keys():  # PERF102
+16 |         print(weird_arg_name)
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:20:25
@@ -70,16 +67,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 21 |         print(name)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    for name, (_, _) in some_dict.items():  # PERF102
-   20 |+    for name in some_dict.keys():  # PERF102
-21 21 |         print(name)
-22 22 | 
-23 23 | 
+17 | 
+18 | 
+19 | def f():
+   -     for name, (_, _) in some_dict.items():  # PERF102
+20 +     for name in some_dict.keys():  # PERF102
+21 |         print(name)
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:30:30
@@ -90,16 +86,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 31 |         print(key1)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-27 27 | 
-28 28 | 
-29 29 | def f():
-30    |-    for (key1, _), (_, _) in some_dict.items():  # PERF102
-   30 |+    for (key1, _) in some_dict.keys():  # PERF102
-31 31 |         print(key1)
-32 32 | 
-33 33 | 
+27 | 
+28 | 
+29 | def f():
+   -     for (key1, _), (_, _) in some_dict.items():  # PERF102
+30 +     for (key1, _) in some_dict.keys():  # PERF102
+31 |         print(key1)
+32 | 
+33 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the values of a dict use the `values()` method
   --> PERF102.py:35:36
@@ -110,16 +105,15 @@ PERF102 [*] When using only the values of a dict use the `values()` method
 36 |         print(value)
    |
 help: Replace `.items()` with `.values()`
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | 
-34 34 | def f():
-35    |-    for (_, (_, _)), (value, _) in some_dict.items():  # PERF102
-   35 |+    for (value, _) in some_dict.values():  # PERF102
-36 36 |         print(value)
-37 37 | 
-38 38 | 
+32 | 
+33 | 
+34 | def f():
+   -     for (_, (_, _)), (value, _) in some_dict.items():  # PERF102
+35 +     for (value, _) in some_dict.values():  # PERF102
+36 |         print(value)
+37 | 
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:50:32
@@ -130,16 +124,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 51 |         print(key2)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-47 47 | 
-48 48 | 
-49 49 | def f():
-50    |-    for ((_, key2), (_, _)) in some_dict.items():  # PERF102
-   50 |+    for (_, key2) in some_dict.keys():  # PERF102
-51 51 |         print(key2)
-52 52 | 
-53 53 | 
+47 | 
+48 | 
+49 | def f():
+   -     for ((_, key2), (_, _)) in some_dict.items():  # PERF102
+50 +     for (_, key2) in some_dict.keys():  # PERF102
+51 |         print(key2)
+52 | 
+53 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:85:25
@@ -150,16 +143,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 86 |         print(name)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-82 82 | 
-83 83 | 
-84 84 | def f():
-85    |-    for name, (_, _) in (some_function()).items():  # PERF102
-   85 |+    for name in (some_function()).keys():  # PERF102
-86 86 |         print(name)
-87 87 | 
-88 88 | 
+82 | 
+83 | 
+84 | def f():
+   -     for name, (_, _) in (some_function()).items():  # PERF102
+85 +     for name in (some_function()).keys():  # PERF102
+86 |         print(name)
+87 | 
+88 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:90:25
@@ -170,16 +162,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 91 |         print(name)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-87 87 | 
-88 88 | 
-89 89 | def f():
-90    |-    for name, (_, _) in (some_function().some_attribute).items():  # PERF102
-   90 |+    for name in (some_function().some_attribute).keys():  # PERF102
-91 91 |         print(name)
-92 92 | 
-93 93 | 
+87 | 
+88 | 
+89 | def f():
+   -     for name, (_, _) in (some_function().some_attribute).items():  # PERF102
+90 +     for name in (some_function().some_attribute).keys():  # PERF102
+91 |         print(name)
+92 | 
+93 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
   --> PERF102.py:95:31
@@ -190,16 +181,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 96 |         print(name)
    |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-92 92 | 
-93 93 | 
-94 94 | def f():
-95    |-    for name, unused_value in some_dict.items():  # PERF102
-   95 |+    for name in some_dict.keys():  # PERF102
-96 96 |         print(name)
-97 97 | 
-98 98 | 
+92 | 
+93 | 
+94 | def f():
+   -     for name, unused_value in some_dict.items():  # PERF102
+95 +     for name in some_dict.keys():  # PERF102
+96 |         print(name)
+97 | 
+98 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the values of a dict use the `values()` method
    --> PERF102.py:100:31
@@ -210,16 +200,15 @@ PERF102 [*] When using only the values of a dict use the `values()` method
 101 |         print(value)
     |
 help: Replace `.items()` with `.values()`
-
-ℹ Unsafe fix
-97  97  | 
-98  98  | 
-99  99  | def f():
-100     |-    for unused_name, value in some_dict.items():  # PERF102
-    100 |+    for value in some_dict.values():  # PERF102
-101 101 |         print(value)
-102 102 | 
-103 103 | 
+97  | 
+98  | 
+99  | def f():
+    -     for unused_name, value in some_dict.items():  # PERF102
+100 +     for value in some_dict.values():  # PERF102
+101 |         print(value)
+102 | 
+103 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF102 [*] When using only the keys of a dict use the `keys()` method
    --> PERF102.py:106:16
@@ -231,11 +220,10 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method
 107 |         if(C:=name_to_value.get(B.name)):A.run(B.set,C)
     |
 help: Replace `.items()` with `.keys()`
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | # Regression test for: https://github.com/astral-sh/ruff/issues/7097
-105 105 | def _create_context(name_to_value):
-106     |-    for(B,D)in A.items():
-    106 |+    for B in A.keys():
-107 107 |         if(C:=name_to_value.get(B.name)):A.run(B.set,C)
+103 | 
+104 | # Regression test for: https://github.com/astral-sh/ruff/issues/7097
+105 | def _create_context(name_to_value):
+    -     for(B,D)in A.items():
+106 +     for B in A.keys():
+107 |         if(C:=name_to_value.get(B.name)):A.run(B.set,C)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF403_PERF403.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF403_PERF403.py.snap
index 30a30469eb..fa06705416 100644
--- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF403_PERF403.py.snap
+++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF403_PERF403.py.snap
@@ -176,3 +176,36 @@ PERF403 Use a dictionary comprehension instead of a for-loop
     |         ^^^^^^^
     |
 help: Replace for loop with dict comprehension
+
+PERF403 Use a dictionary comprehension instead of a for-loop
+   --> PERF403.py:200:9
+    |
+198 |     v = {}
+199 |     for o, (x,) in ["ox"]:
+200 |         v[x,] = o
+    |         ^^^^^^^^^
+201 |     return v
+    |
+help: Replace for loop with dict comprehension
+
+PERF403 Use a dictionary comprehension instead of a for-loop
+   --> PERF403.py:207:9
+    |
+205 |     v = {}
+206 |     for (o, p), x in [("op", "x")]:
+207 |         v[x] = o, p
+    |         ^^^^^^^^^^^
+208 |     return v
+    |
+help: Replace for loop with dict comprehension
+
+PERF403 Use a dictionary comprehension instead of a for-loop
+   --> PERF403.py:214:9
+    |
+212 |     v = {}
+213 |     for o, (x,) in ["ox"]: 
+214 |         v[(x,)] = o 
+    |         ^^^^^^^^^^^
+215 |     return v
+    |
+help: Replace for loop with dict comprehension
diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap
index c625975738..3d114bcd3a 100644
--- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap
+++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap
@@ -10,18 +10,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
   |             ^^^^^^^^^^^^^^^^
   |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-1 1 | def f():
-2 2 |     items = [1, 2, 3, 4]
-3   |-    result = []
-4   |-    for i in items:
-5   |-        if i % 2:
-6   |-            result.append(i)  # PERF401
-  3 |+    result = [i for i in items if i % 2]  # PERF401
-7 4 | 
-8 5 | 
-9 6 | def f():
+1 | def f():
+2 |     items = [1, 2, 3, 4]
+  -     result = []
+  -     for i in items:
+  -         if i % 2:
+  -             result.append(i)  # PERF401
+3 +     result = [i for i in items if i % 2]  # PERF401
+4 | 
+5 | 
+6 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
   --> PERF401.py:13:9
@@ -32,18 +31,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
    |         ^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | def f():
-10 10 |     items = [1, 2, 3, 4]
-11    |-    result = []
-12    |-    for i in items:
-13    |-        result.append(i * i)  # PERF401
-   11 |+    result = [i * i for i in items]  # PERF401
-14 12 | 
-15 13 | 
-16 14 | def f():
+8  | 
+9  | def f():
+10 |     items = [1, 2, 3, 4]
+   -     result = []
+   -     for i in items:
+   -         result.append(i * i)  # PERF401
+11 +     result = [i * i for i in items]  # PERF401
+12 | 
+13 | 
+14 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use an async list comprehension to create a transformed list
   --> PERF401.py:82:13
@@ -54,19 +52,18 @@ PERF401 [*] Use an async list comprehension to create a transformed list
    |             ^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | async def f():
-78 78 |     items = [1, 2, 3, 4]
-79    |-    result = []
-80    |-    async for i in items:
-81    |-        if i % 2:
-82    |-            result.append(i)  # PERF401
-   79 |+    result = [i async for i in items if i % 2]  # PERF401
-83 80 | 
-84 81 | 
-85 82 | async def f():
+76 | 
+77 | async def f():
+78 |     items = [1, 2, 3, 4]
+   -     result = []
+   -     async for i in items:
+   -         if i % 2:
+   -             result.append(i)  # PERF401
+79 +     result = [i async for i in items if i % 2]  # PERF401
+80 | 
+81 | 
+82 | async def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use an async list comprehension to create a transformed list
   --> PERF401.py:89:9
@@ -77,18 +74,17 @@ PERF401 [*] Use an async list comprehension to create a transformed list
    |         ^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-84 84 | 
-85 85 | async def f():
-86 86 |     items = [1, 2, 3, 4]
-87    |-    result = []
-88    |-    async for i in items:
-89    |-        result.append(i)  # PERF401
-   87 |+    result = [i async for i in items]  # PERF401
-90 88 | 
-91 89 | 
-92 90 | async def f():
+84 | 
+85 | async def f():
+86 |     items = [1, 2, 3, 4]
+   -     result = []
+   -     async for i in items:
+   -         result.append(i)  # PERF401
+87 +     result = [i async for i in items]  # PERF401
+88 | 
+89 | 
+90 | async def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use `list.extend` with an async comprehension to create a transformed list
   --> PERF401.py:96:9
@@ -99,17 +95,16 @@ PERF401 [*] Use `list.extend` with an async comprehension to create a transforme
    |         ^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with list.extend
-
-ℹ Unsafe fix
-92 92 | async def f():
-93 93 |     items = [1, 2, 3, 4]
-94 94 |     result = [1, 2]
-95    |-    async for i in items:
-96    |-        result.append(i)  # PERF401
-   95 |+    result.extend([i async for i in items])  # PERF401
-97 96 | 
-98 97 | 
-99 98 | def f():
+92 | async def f():
+93 |     items = [1, 2, 3, 4]
+94 |     result = [1, 2]
+   -     async for i in items:
+   -         result.append(i)  # PERF401
+95 +     result.extend([i async for i in items])  # PERF401
+96 | 
+97 | 
+98 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use `list.extend` to create a transformed list
    --> PERF401.py:102:9
@@ -120,17 +115,16 @@ PERF401 [*] Use `list.extend` to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list.extend
-
-ℹ Unsafe fix
-98  98  | 
-99  99  | def f():
-100 100 |     result, _ = [1, 2, 3, 4], ...
-101     |-    for i in range(10):
-102     |-        result.append(i * 2)  # PERF401
-    101 |+    result.extend(i * 2 for i in range(10))  # PERF401
-103 102 | 
-104 103 | 
-105 104 | def f():
+98  | 
+99  | def f():
+100 |     result, _ = [1, 2, 3, 4], ...
+    -     for i in range(10):
+    -         result.append(i * 2)  # PERF401
+101 +     result.extend(i * 2 for i in range(10))  # PERF401
+102 | 
+103 | 
+104 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use `list.extend` to create a transformed list
    --> PERF401.py:111:17
@@ -141,22 +135,21 @@ PERF401 [*] Use `list.extend` to create a transformed list
     |                 ^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list.extend
-
-ℹ Unsafe fix
-105 105 | def f():
-106 106 |     result = []
-107 107 |     if True:
-108     |-        for i in range(10):  # single-line comment 1 should be protected
-109     |-            # single-line comment 2 should be protected
-110     |-            if i % 2:  # single-line comment 3 should be protected
-111     |-                result.append(i)  # PERF401
-    108 |+        # single-line comment 1 should be protected
-    109 |+        # single-line comment 2 should be protected
-    110 |+        # single-line comment 3 should be protected
-    111 |+        result.extend(i for i in range(10) if i % 2)  # PERF401
-112 112 | 
-113 113 | 
-114 114 | def f():
+105 | def f():
+106 |     result = []
+107 |     if True:
+    -         for i in range(10):  # single-line comment 1 should be protected
+    -             # single-line comment 2 should be protected
+    -             if i % 2:  # single-line comment 3 should be protected
+    -                 result.append(i)  # PERF401
+108 +         # single-line comment 1 should be protected
+109 +         # single-line comment 2 should be protected
+110 +         # single-line comment 3 should be protected
+111 +         result.extend(i for i in range(10) if i % 2)  # PERF401
+112 | 
+113 | 
+114 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:119:13
@@ -167,24 +160,23 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |             ^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-112 112 | 
-113 113 | 
-114 114 | def f():
-115     |-    result = []  # comment after assignment should be protected
-116     |-    for i in range(10):  # single-line comment 1 should be protected
-117     |-        # single-line comment 2 should be protected
-118     |-        if i % 2:  # single-line comment 3 should be protected
-119     |-            result.append(i)  # PERF401
-    115 |+    # comment after assignment should be protected
-    116 |+    # single-line comment 1 should be protected
-    117 |+    # single-line comment 2 should be protected
-    118 |+    # single-line comment 3 should be protected
-    119 |+    result = [i for i in range(10) if i % 2]  # PERF401
-120 120 | 
-121 121 | 
-122 122 | def f():
+112 | 
+113 | 
+114 | def f():
+    -     result = []  # comment after assignment should be protected
+    -     for i in range(10):  # single-line comment 1 should be protected
+    -         # single-line comment 2 should be protected
+    -         if i % 2:  # single-line comment 3 should be protected
+    -             result.append(i)  # PERF401
+115 +     # comment after assignment should be protected
+116 +     # single-line comment 1 should be protected
+117 +     # single-line comment 2 should be protected
+118 +     # single-line comment 3 should be protected
+119 +     result = [i for i in range(10) if i % 2]  # PERF401
+120 | 
+121 | 
+122 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:135:13
@@ -195,18 +187,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-130 130 |     # PERF401
-131 131 |     # make sure the fix does not panic if there is no comments
-132 132 |     if param:
-133     |-        new_layers = []
-134     |-        for value in param:
-135     |-            new_layers.append(value * 3)
-    133 |+        new_layers = [value * 3 for value in param]
-136 134 | 
-137 135 | 
-138 136 | def f():
+130 |     # PERF401
+131 |     # make sure the fix does not panic if there is no comments
+132 |     if param:
+    -         new_layers = []
+    -         for value in param:
+    -             new_layers.append(value * 3)
+133 +         new_layers = [value * 3 for value in param]
+134 | 
+135 | 
+136 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:142:9
@@ -217,19 +208,18 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-136 136 | 
-137 137 | 
-138 138 | def f():
-139     |-    result = []
-140 139 |     var = 1
-141     |-    for _ in range(10):
-142     |-        result.append(var + 1)  # PERF401
-    140 |+    result = [var + 1 for _ in range(10)]  # PERF401
-143 141 | 
-144 142 | 
-145 143 | def f():
+136 | 
+137 | 
+138 | def f():
+    -     result = []
+139 |     var = 1
+    -     for _ in range(10):
+    -         result.append(var + 1)  # PERF401
+140 +     result = [var + 1 for _ in range(10)]  # PERF401
+141 | 
+142 | 
+143 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:149:9
@@ -240,19 +230,18 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-144 144 | 
-145 145 | def f():
-146 146 |     # make sure that `tmp` is not deleted
-147     |-    tmp = 1; result = []  # comment should be protected
-148     |-    for i in range(10):
-149     |-        result.append(i + 1)  # PERF401
-    147 |+    tmp = 1  # comment should be protected
-    148 |+    result = [i + 1 for i in range(10)]  # PERF401
-150 149 | 
-151 150 | 
-152 151 | def f():
+144 | 
+145 | def f():
+146 |     # make sure that `tmp` is not deleted
+    -     tmp = 1; result = []  # comment should be protected
+    -     for i in range(10):
+    -         result.append(i + 1)  # PERF401
+147 +     tmp = 1  # comment should be protected
+148 +     result = [i + 1 for i in range(10)]  # PERF401
+149 | 
+150 | 
+151 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:156:9
@@ -263,19 +252,18 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | def f():
-153 153 |     # make sure that `tmp` is not deleted
-154     |-    result = []; tmp = 1  # comment should be protected
-155     |-    for i in range(10):
-156     |-        result.append(i + 1)  # PERF401
-    154 |+    tmp = 1  # comment should be protected
-    155 |+    result = [i + 1 for i in range(10)]  # PERF401
-157 156 | 
-158 157 | 
-159 158 | def f():
+151 | 
+152 | def f():
+153 |     # make sure that `tmp` is not deleted
+    -     result = []; tmp = 1  # comment should be protected
+    -     for i in range(10):
+    -         result.append(i + 1)  # PERF401
+154 +     tmp = 1  # comment should be protected
+155 +     result = [i + 1 for i in range(10)]  # PERF401
+156 | 
+157 | 
+158 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:162:9
@@ -286,19 +274,18 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-157 157 | 
-158 158 | 
-159 159 | def f():
-160     |-    result = []  # comment should be protected
-161     |-    for i in range(10):
-162     |-        result.append(i * 2)  # PERF401
-    160 |+    # comment should be protected
-    161 |+    result = [i * 2 for i in range(10)]  # PERF401
-163 162 | 
-164 163 | 
-165 164 | def f():
+157 | 
+158 | 
+159 | def f():
+    -     result = []  # comment should be protected
+    -     for i in range(10):
+    -         result.append(i * 2)  # PERF401
+160 +     # comment should be protected
+161 +     result = [i * 2 for i in range(10)]  # PERF401
+162 | 
+163 | 
+164 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use `list.extend` to create a transformed list
    --> PERF401.py:169:9
@@ -309,17 +296,16 @@ PERF401 [*] Use `list.extend` to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list.extend
-
-ℹ Unsafe fix
-165 165 | def f():
-166 166 |     result = []
-167 167 |     result.append(1)
-168     |-    for i in range(10):
-169     |-        result.append(i * 2)  # PERF401
-    168 |+    result.extend(i * 2 for i in range(10))  # PERF401
-170 169 | 
-171 170 | 
-172 171 | def f():
+165 | def f():
+166 |     result = []
+167 |     result.append(1)
+    -     for i in range(10):
+    -         result.append(i * 2)  # PERF401
+168 +     result.extend(i * 2 for i in range(10))  # PERF401
+169 | 
+170 | 
+171 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:189:9
@@ -332,18 +318,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
 191 |     print(val)
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-184 184 | 
-185 185 | 
-186 186 | def f():
-187     |-    result = []
-188     |-    for val in range(5):
-189     |-        result.append(val * 2)  # PERF401
-    187 |+    result = [val * 2 for val in range(5)]  # PERF401
-190 188 |     val = 1
-191 189 |     print(val)
-192 190 | 
+184 | 
+185 | 
+186 | def f():
+    -     result = []
+    -     for val in range(5):
+    -         result.append(val * 2)  # PERF401
+187 +     result = [val * 2 for val in range(5)]  # PERF401
+188 |     val = 1
+189 |     print(val)
+190 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:198:9
@@ -354,18 +339,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-193 193 | 
-194 194 | def f():
-195 195 |     i = [1, 2, 3]
-196     |-    result = []
-197     |-    for i in i:
-198     |-        result.append(i + 1)  # PERF401
-    196 |+    result = [i + 1 for i in i]  # PERF401
-199 197 | 
-200 198 | 
-201 199 | def f():
+193 | 
+194 | def f():
+195 |     i = [1, 2, 3]
+    -     result = []
+    -     for i in i:
+    -         result.append(i + 1)  # PERF401
+196 +     result = [i + 1 for i in i]  # PERF401
+197 | 
+198 | 
+199 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:210:13
@@ -382,37 +366,36 @@ PERF401 [*] Use a list comprehension to create a transformed list
     | |_____________^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-199 199 | 
-200 200 | 
-201 201 | def f():
-202     |-    result = []
-203     |-    for i in range(  # Comment 1 should not be duplicated
-    202 |+    # Comment 3
-    203 |+    # Comment 4
-    204 |+    result = [(
-    205 |+                    i + 1,
-    206 |+                    # Comment 5
-    207 |+                    2,
-    208 |+                ) for i in range(  # Comment 1 should not be duplicated
-204 209 |         (
-205 210 |             2  # Comment 2
-206 211 |             + 1
-207 212 |         )
-208     |-    ):  # Comment 3
-209     |-        if i % 2:  # Comment 4
-210     |-            result.append(
-211     |-                (
-212     |-                    i + 1,
-213     |-                    # Comment 5
-214     |-                    2,
-215     |-                )
-216     |-            )  # PERF401
-    213 |+    ) if i % 2]  # PERF401
-217 214 | 
-218 215 | 
-219 216 | def f():
+199 | 
+200 | 
+201 | def f():
+    -     result = []
+    -     for i in range(  # Comment 1 should not be duplicated
+202 +     # Comment 3
+203 +     # Comment 4
+204 +     result = [(
+205 +                     i + 1,
+206 +                     # Comment 5
+207 +                     2,
+208 +                 ) for i in range(  # Comment 1 should not be duplicated
+209 |         (
+210 |             2  # Comment 2
+211 |             + 1
+212 |         )
+    -     ):  # Comment 3
+    -         if i % 2:  # Comment 4
+    -             result.append(
+    -                 (
+    -                     i + 1,
+    -                     # Comment 5
+    -                     2,
+    -                 )
+    -             )  # PERF401
+213 +     ) if i % 2]  # PERF401
+214 | 
+215 | 
+216 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:222:9
@@ -423,18 +406,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
     |         ^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-217 217 | 
-218 218 | 
-219 219 | def f():
-220     |-    result: list[int] = []
-221     |-    for i in range(10):
-222     |-        result.append(i * 2)  # PERF401
-    220 |+    result: list[int] = [i * 2 for i in range(10)]  # PERF401
-223 221 | 
-224 222 | 
-225 223 | def f():
+217 | 
+218 | 
+219 | def f():
+    -     result: list[int] = []
+    -     for i in range(10):
+    -         result.append(i * 2)  # PERF401
+220 +     result: list[int] = [i * 2 for i in range(10)]  # PERF401
+221 | 
+222 | 
+223 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:229:9
@@ -446,18 +428,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
 230 |     return result
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-224 224 | 
-225 225 | def f():
-226 226 |     a, b = [1, 2, 3], [4, 5, 6]
-227     |-    result = []
-228     |-    for i in a, b:
-229     |-        result.append(i[0] + i[1])  # PERF401
-    227 |+    result = [i[0] + i[1] for i in (a, b)]  # PERF401
-230 228 |     return result
-231 229 | 
-232 230 | 
+224 | 
+225 | def f():
+226 |     a, b = [1, 2, 3], [4, 5, 6]
+    -     result = []
+    -     for i in a, b:
+    -         result.append(i[0] + i[1])  # PERF401
+227 +     result = [i[0] + i[1] for i in (a, b)]  # PERF401
+228 |     return result
+229 | 
+230 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:239:9
@@ -470,20 +451,19 @@ PERF401 [*] Use a list comprehension to create a transformed list
 241 | def f():
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-232 232 | 
-233 233 | def f():
-234 234 |     values = [1, 2, 3]
-235     |-    result = []
-236 235 |     for a in values:
-237 236 |         print(a)
-238     |-    for a in values:
-239     |-        result.append(a + 1)  # PERF401
-    237 |+    result = [a + 1 for a in values]  # PERF401
-240 238 | 
-241 239 | def f():
-242 240 |     values = [1, 2, 3]
+232 | 
+233 | def f():
+234 |     values = [1, 2, 3]
+    -     result = []
+235 |     for a in values:
+236 |         print(a)
+    -     for a in values:
+    -         result.append(a + 1)  # PERF401
+237 +     result = [a + 1 for a in values]  # PERF401
+238 | 
+239 | def f():
+240 |     values = [1, 2, 3]
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use `list.extend` to create a transformed list
    --> PERF401.py:245:13
@@ -495,17 +475,16 @@ PERF401 [*] Use `list.extend` to create a transformed list
 246 |     result = []
     |
 help: Replace for loop with list.extend
-
-ℹ Unsafe fix
-241 241 | def f():
-242 242 |     values = [1, 2, 3]
-243 243 |     def g():
-244     |-        for a in values:
-245     |-            result.append(a + 1)  # PERF401
-    244 |+        result.extend(a + 1 for a in values)  # PERF401
-246 245 |     result = []
-247 246 | 
-248 247 | def f():
+241 | def f():
+242 |     values = [1, 2, 3]
+243 |     def g():
+    -         for a in values:
+    -             result.append(a + 1)  # PERF401
+244 +         result.extend(a + 1 for a in values)  # PERF401
+245 |     result = []
+246 | 
+247 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:262:13
@@ -518,20 +497,19 @@ PERF401 [*] Use a list comprehension to create a transformed list
 264 | def f():
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-255 255 | # The fix here must parenthesize the walrus operator
-256 256 | # https://github.com/astral-sh/ruff/issues/15047
-257 257 | def f():
-258     |-    items = []
-259 258 | 
-260     |-    for i in range(5):
-261     |-        if j := i:
-262     |-            items.append(j)
-    259 |+    items = [j for i in range(5) if (j := i)]
-263 260 | 
-264 261 | def f():
-265 262 |     values = [1, 2, 3]
+255 | # The fix here must parenthesize the walrus operator
+256 | # https://github.com/astral-sh/ruff/issues/15047
+257 | def f():
+    -     items = []
+258 | 
+    -     for i in range(5):
+    -         if j := i:
+    -             items.append(j)
+259 +     items = [j for i in range(5) if (j := i)]
+260 | 
+261 | def f():
+262 |     values = [1, 2, 3]
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:268:9
@@ -544,19 +522,18 @@ PERF401 [*] Use a list comprehension to create a transformed list
 270 | def f():
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-263 263 | 
-264 264 | def f():
-265 265 |     values = [1, 2, 3]
-266     |-    result = list()  # this should be replaced with a comprehension
-267     |-    for i in values:
-268     |-        result.append(i + 1)  # PERF401
-    266 |+    # this should be replaced with a comprehension
-    267 |+    result = [i + 1 for i in values]  # PERF401
-269 268 | 
-270 269 | def f():
-271 270 |     src = [1]
+263 | 
+264 | def f():
+265 |     values = [1, 2, 3]
+    -     result = list()  # this should be replaced with a comprehension
+    -     for i in values:
+    -         result.append(i + 1)  # PERF401
+266 +     # this should be replaced with a comprehension
+267 +     result = [i + 1 for i in values]  # PERF401
+268 | 
+269 | def f():
+270 |     src = [1]
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:276:13
@@ -569,20 +546,19 @@ PERF401 [*] Use a list comprehension to create a transformed list
 278 |     for i in src:
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-269 269 | 
-270 270 | def f():
-271 271 |     src = [1]
-272     |-    dst = []
-273 272 | 
-274     |-    for i in src:
-275     |-        if True if True else False:
-276     |-            dst.append(i)
-    273 |+    dst = [i for i in src if (True if True else False)]
-277 274 | 
-278 275 |     for i in src:
-279 276 |         if lambda: 0:
+269 | 
+270 | def f():
+271 |     src = [1]
+    -     dst = []
+272 | 
+    -     for i in src:
+    -         if True if True else False:
+    -             dst.append(i)
+273 +     dst = [i for i in src if (True if True else False)]
+274 | 
+275 |     for i in src:
+276 |         if lambda: 0:
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use `list.extend` to create a transformed list
    --> PERF401.py:280:13
@@ -595,18 +571,17 @@ PERF401 [*] Use `list.extend` to create a transformed list
 282 | def f():
     |
 help: Replace for loop with list.extend
-
-ℹ Unsafe fix
-275 275 |         if True if True else False:
-276 276 |             dst.append(i)
-277 277 | 
-278     |-    for i in src:
-279     |-        if lambda: 0:
-280     |-            dst.append(i)
-    278 |+    dst.extend(i for i in src if (lambda: 0))
-281 279 | 
-282 280 | def f():
-283 281 |     i = "xyz"
+275 |         if True if True else False:
+276 |             dst.append(i)
+277 | 
+    -     for i in src:
+    -         if lambda: 0:
+    -             dst.append(i)
+278 +     dst.extend(i for i in src if (lambda: 0))
+279 | 
+280 | def f():
+281 |     i = "xyz"
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:286:9
@@ -619,18 +594,17 @@ PERF401 [*] Use a list comprehension to create a transformed list
 288 | def f():
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-281 281 | 
-282 282 | def f():
-283 283 |     i = "xyz"
-284     |-    result = []
-285     |-    for i in range(3):
-286     |-        result.append(x for x in [i])
-    284 |+    result = [(x for x in [i]) for i in range(3)]
-287 285 | 
-288 286 | def f():
-289 287 |     i = "xyz"
+281 | 
+282 | def f():
+283 |     i = "xyz"
+    -     result = []
+    -     for i in range(3):
+    -         result.append(x for x in [i])
+284 +     result = [(x for x in [i]) for i in range(3)]
+285 | 
+286 | def f():
+287 |     i = "xyz"
+note: This is an unsafe fix and may change runtime behavior
 
 PERF401 [*] Use a list comprehension to create a transformed list
    --> PERF401.py:292:9
@@ -643,15 +617,14 @@ PERF401 [*] Use a list comprehension to create a transformed list
 294 | G_INDEX = None
     |
 help: Replace for loop with list comprehension
-
-ℹ Unsafe fix
-287 287 | 
-288 288 | def f():
-289 289 |     i = "xyz"
-290     |-    result = []
-291     |-    for i in range(3):
-292     |-        result.append((x for x in [i]))
-    290 |+    result = [(x for x in [i]) for i in range(3)]
-293 291 | 
-294 292 | G_INDEX = None
-295 293 | def f():
+287 | 
+288 | def f():
+289 |     i = "xyz"
+    -     result = []
+    -     for i in range(3):
+    -         result.append((x for x in [i]))
+290 +     result = [(x for x in [i]) for i in range(3)]
+291 | 
+292 | G_INDEX = None
+293 | def f():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap
index c4e3cf3033..810e014b2e 100644
--- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap
+++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap
@@ -10,17 +10,16 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
   |         ^^^^^^^^^^^^^^^^^^
   |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-1 1 | def foo():
-2 2 |     fruit = ["apple", "pear", "orange"]
-3   |-    result = {}
-4   |-    for idx, name in enumerate(fruit):
-5   |-        result[idx] = name  # PERF403
-  3 |+    result = {idx: name for idx, name in enumerate(fruit)}  # PERF403
-6 4 | 
-7 5 | 
-8 6 | def foo():
+1 | def foo():
+2 |     fruit = ["apple", "pear", "orange"]
+  -     result = {}
+  -     for idx, name in enumerate(fruit):
+  -         result[idx] = name  # PERF403
+3 +     result = {idx: name for idx, name in enumerate(fruit)}  # PERF403
+4 | 
+5 | 
+6 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
   --> PERF403.py:13:13
@@ -31,19 +30,18 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
    |             ^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | def foo():
-9  9  |     fruit = ["apple", "pear", "orange"]
-10    |-    result = {}
-11    |-    for idx, name in enumerate(fruit):
-12    |-        if idx % 2:
-13    |-            result[idx] = name  # PERF403
-   10 |+    result = {idx: name for idx, name in enumerate(fruit) if idx % 2}  # PERF403
-14 11 | 
-15 12 | 
-16 13 | def foo():
+7  | 
+8  | def foo():
+9  |     fruit = ["apple", "pear", "orange"]
+   -     result = {}
+   -     for idx, name in enumerate(fruit):
+   -         if idx % 2:
+   -             result[idx] = name  # PERF403
+10 +     result = {idx: name for idx, name in enumerate(fruit) if idx % 2}  # PERF403
+11 | 
+12 | 
+13 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
   --> PERF403.py:33:13
@@ -54,20 +52,19 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
    |             ^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-26 26 | 
-27 27 | 
-28 28 | def foo():
-29    |-    result = {}
-30 29 |     fruit = ["apple", "pear", "orange"]
-31    |-    for idx, name in enumerate(fruit):
-32    |-        if idx % 2:
-33    |-            result[idx] = name  # PERF403
-   30 |+    result = {idx: name for idx, name in enumerate(fruit) if idx % 2}  # PERF403
-34 31 | 
-35 32 | 
-36 33 | def foo():
+26 | 
+27 | 
+28 | def foo():
+   -     result = {}
+29 |     fruit = ["apple", "pear", "orange"]
+   -     for idx, name in enumerate(fruit):
+   -         if idx % 2:
+   -             result[idx] = name  # PERF403
+30 +     result = {idx: name for idx, name in enumerate(fruit) if idx % 2}  # PERF403
+31 | 
+32 | 
+33 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use `dict.update` instead of a for-loop
   --> PERF403.py:63:13
@@ -78,18 +75,17 @@ PERF403 [*] Use `dict.update` instead of a for-loop
    |             ^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with `dict.update`
-
-ℹ Unsafe fix
-58 58 | def foo():
-59 59 |     result = {1: "banana"}
-60 60 |     fruit = ["apple", "pear", "orange"]
-61    |-    for idx, name in enumerate(fruit):
-62    |-        if idx % 2:
-63    |-            result[idx] = name  # PERF403
-   61 |+    result.update({idx: name for idx, name in enumerate(fruit) if idx % 2})  # PERF403
-64 62 | 
-65 63 | 
-66 64 | def foo():
+58 | def foo():
+59 |     result = {1: "banana"}
+60 |     fruit = ["apple", "pear", "orange"]
+   -     for idx, name in enumerate(fruit):
+   -         if idx % 2:
+   -             result[idx] = name  # PERF403
+61 +     result.update({idx: name for idx, name in enumerate(fruit) if idx % 2})  # PERF403
+62 | 
+63 | 
+64 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
   --> PERF403.py:78:9
@@ -100,18 +96,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
    |         ^^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-73 73 | 
-74 74 | def foo():
-75 75 |     fruit = ["apple", "pear", "orange"]
-76    |-    result = {}
-77    |-    for name in fruit:
-78    |-        result[name] = name  # PERF403
-   76 |+    result = {name: name for name in fruit}  # PERF403
-79 77 | 
-80 78 | 
-81 79 | def foo():
+73 | 
+74 | def foo():
+75 |     fruit = ["apple", "pear", "orange"]
+   -     result = {}
+   -     for name in fruit:
+   -         result[name] = name  # PERF403
+76 +     result = {name: name for name in fruit}  # PERF403
+77 | 
+78 | 
+79 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
   --> PERF403.py:85:9
@@ -122,18 +117,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
    |         ^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-80 80 | 
-81 81 | def foo():
-82 82 |     fruit = ["apple", "pear", "orange"]
-83    |-    result = {}
-84    |-    for idx, name in enumerate(fruit):
-85    |-        result[name] = idx  # PERF403
-   83 |+    result = {name: idx for idx, name in enumerate(fruit)}  # PERF403
-86 84 | 
-87 85 | 
-88 86 | def foo():
+80 | 
+81 | def foo():
+82 |     fruit = ["apple", "pear", "orange"]
+   -     result = {}
+   -     for idx, name in enumerate(fruit):
+   -         result[name] = idx  # PERF403
+83 +     result = {name: idx for idx, name in enumerate(fruit)}  # PERF403
+84 | 
+85 | 
+86 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
   --> PERF403.py:94:9
@@ -144,18 +138,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
    |         ^^^^^^^^^^^^^^^^^^
    |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-89 89 |     from builtins import dict as SneakyDict
-90 90 | 
-91 91 |     fruit = ["apple", "pear", "orange"]
-92    |-    result = SneakyDict()
-93    |-    for idx, name in enumerate(fruit):
-94    |-        result[name] = idx  # PERF403
-   92 |+    result = {name: idx for idx, name in enumerate(fruit)}  # PERF403
-95 93 | 
-96 94 | 
-97 95 | def foo():
+89 |     from builtins import dict as SneakyDict
+90 | 
+91 |     fruit = ["apple", "pear", "orange"]
+   -     result = SneakyDict()
+   -     for idx, name in enumerate(fruit):
+   -         result[name] = idx  # PERF403
+92 +     result = {name: idx for idx, name in enumerate(fruit)}  # PERF403
+93 | 
+94 | 
+95 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
    --> PERF403.py:106:9
@@ -168,29 +161,28 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
     | |_______________^
     |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-96  96  | 
-97  97  | def foo():
-98  98  |     fruit = ["apple", "pear", "orange"]
-99      |-    result: dict[str, int] = {
-100     |-        # comment 1
-101     |-    }
-102     |-    for idx, name in enumerate(
-    99  |+    # comment 1
-    100 |+    # comment 3
-    101 |+    # comment 4
-    102 |+    result: dict[str, int] = {name: idx for idx, name in enumerate(
-103 103 |         fruit  # comment 2
-104     |-    ):
-105     |-        # comment 3
-106     |-        result[
-107     |-            name  # comment 4
-108     |-        ] = idx  # PERF403
-    104 |+    )}  # PERF403
-109 105 | 
-110 106 | 
-111 107 | def foo():
+96  | 
+97  | def foo():
+98  |     fruit = ["apple", "pear", "orange"]
+    -     result: dict[str, int] = {
+    -         # comment 1
+    -     }
+    -     for idx, name in enumerate(
+99  +     # comment 1
+100 +     # comment 3
+101 +     # comment 4
+102 +     result: dict[str, int] = {name: idx for idx, name in enumerate(
+103 |         fruit  # comment 2
+    -     ):
+    -         # comment 3
+    -         result[
+    -             name  # comment 4
+    -         ] = idx  # PERF403
+104 +     )}  # PERF403
+105 | 
+106 | 
+107 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
    --> PERF403.py:115:9
@@ -201,19 +193,18 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
     |         ^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-110 110 | 
-111 111 | def foo():
-112 112 |     fruit = ["apple", "pear", "orange"]
-113     |-    a = 1; result = {}; b = 2
-114     |-    for idx, name in enumerate(fruit):
-115     |-        result[name] = idx  # PERF403
-    113 |+    a = 1; b = 2
-    114 |+    result = {name: idx for idx, name in enumerate(fruit)}  # PERF403
-116 115 | 
-117 116 | 
-118 117 | def foo():
+110 | 
+111 | def foo():
+112 |     fruit = ["apple", "pear", "orange"]
+    -     a = 1; result = {}; b = 2
+    -     for idx, name in enumerate(fruit):
+    -         result[name] = idx  # PERF403
+113 +     a = 1; b = 2
+114 +     result = {name: idx for idx, name in enumerate(fruit)}  # PERF403
+115 | 
+116 | 
+117 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use `dict.update` instead of a for-loop
    --> PERF403.py:122:9
@@ -224,17 +215,16 @@ PERF403 [*] Use `dict.update` instead of a for-loop
     |         ^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with `dict.update`
-
-ℹ Unsafe fix
-118 118 | def foo():
-119 119 |     fruit = ["apple", "pear", "orange"]
-120 120 |     result = {"kiwi": 3}
-121     |-    for idx, name in enumerate(fruit):
-122     |-        result[name] = idx  # PERF403
-    121 |+    result.update({name: idx for idx, name in enumerate(fruit)})  # PERF403
-123 122 | 
-124 123 | 
-125 124 | def foo():
+118 | def foo():
+119 |     fruit = ["apple", "pear", "orange"]
+120 |     result = {"kiwi": 3}
+    -     for idx, name in enumerate(fruit):
+    -         result[name] = idx  # PERF403
+121 +     result.update({name: idx for idx, name in enumerate(fruit)})  # PERF403
+122 | 
+123 | 
+124 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use `dict.update` instead of a for-loop
    --> PERF403.py:129:9
@@ -245,17 +235,16 @@ PERF403 [*] Use `dict.update` instead of a for-loop
     |         ^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with `dict.update`
-
-ℹ Unsafe fix
-125 125 | def foo():
-126 126 |     fruit = ["apple", "pear", "orange"]
-127 127 |     (_, result) = (None, {"kiwi": 3})
-128     |-    for idx, name in enumerate(fruit):
-129     |-        result[name] = idx  # PERF403
-    128 |+    result.update({name: idx for idx, name in enumerate(fruit)})  # PERF403
-130 129 | 
-131 130 | 
-132 131 | def foo():
+125 | def foo():
+126 |     fruit = ["apple", "pear", "orange"]
+127 |     (_, result) = (None, {"kiwi": 3})
+    -     for idx, name in enumerate(fruit):
+    -         result[name] = idx  # PERF403
+128 +     result.update({name: idx for idx, name in enumerate(fruit)})  # PERF403
+129 | 
+130 | 
+131 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use `dict.update` instead of a for-loop
    --> PERF403.py:137:9
@@ -266,17 +255,16 @@ PERF403 [*] Use `dict.update` instead of a for-loop
     |         ^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with `dict.update`
-
-ℹ Unsafe fix
-133 133 |     fruit = ["apple", "pear", "orange"]
-134 134 |     result = {}
-135 135 |     print(len(result))
-136     |-    for idx, name in enumerate(fruit):
-137     |-        result[name] = idx  # PERF403
-    136 |+    result.update({name: idx for idx, name in enumerate(fruit)})  # PERF403
-138 137 | 
-139 138 | 
-140 139 | def foo():
+133 |     fruit = ["apple", "pear", "orange"]
+134 |     result = {}
+135 |     print(len(result))
+    -     for idx, name in enumerate(fruit):
+    -         result[name] = idx  # PERF403
+136 +     result.update({name: idx for idx, name in enumerate(fruit)})  # PERF403
+137 | 
+138 | 
+139 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
    --> PERF403.py:145:13
@@ -287,19 +275,18 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
     |             ^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-139 139 | 
-140 140 | def foo():
-141 141 |     fruit = ["apple", "pear", "orange"]
-142     |-    result = {}
-143     |-    for idx, name in enumerate(fruit):
-144     |-        if last_idx := idx % 3:
-145     |-            result[name] = idx  # PERF403
-    142 |+    result = {name: idx for idx, name in enumerate(fruit) if (last_idx := idx % 3)}  # PERF403
-146 143 | 
-147 144 | 
-148 145 | def foo():
+139 | 
+140 | def foo():
+141 |     fruit = ["apple", "pear", "orange"]
+    -     result = {}
+    -     for idx, name in enumerate(fruit):
+    -         if last_idx := idx % 3:
+    -             result[name] = idx  # PERF403
+142 +     result = {name: idx for idx, name in enumerate(fruit) if (last_idx := idx % 3)}  # PERF403
+143 | 
+144 | 
+145 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
    --> PERF403.py:153:9
@@ -310,18 +297,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
     |         ^^^^^^^^^^^^^^^^^^
     |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-148 148 | def foo():
-149 149 |     fruit = ["apple", "pear", "orange"]
-150 150 |     indices = [0, 1, 2]
-151     |-    result = {}
-152     |-    for idx, name in indices, fruit:
-153     |-        result[name] = idx  # PERF403
-    151 |+    result = {name: idx for idx, name in (indices, fruit)}  # PERF403
-154 152 | 
-155 153 | 
-156 154 | def foo():
+148 | def foo():
+149 |     fruit = ["apple", "pear", "orange"]
+150 |     indices = [0, 1, 2]
+    -     result = {}
+    -     for idx, name in indices, fruit:
+    -         result[name] = idx  # PERF403
+151 +     result = {name: idx for idx, name in (indices, fruit)}  # PERF403
+152 | 
+153 | 
+154 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
    --> PERF403.py:162:13
@@ -334,20 +320,19 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
 164 |     for k, v in src:
     |
 help: Replace for loop with dict comprehension
-
-ℹ Unsafe fix
-155 155 | 
-156 156 | def foo():
-157 157 |     src = (("x", 1),)
-158     |-    dst = {}
-159 158 | 
-160     |-    for k, v in src:
-161     |-        if True if True else False:
-162     |-            dst[k] = v
-    159 |+    dst = {k: v for k, v in src if (True if True else False)}
-163 160 | 
-164 161 |     for k, v in src:
-165 162 |         if lambda: 0:
+155 | 
+156 | def foo():
+157 |     src = (("x", 1),)
+    -     dst = {}
+158 | 
+    -     for k, v in src:
+    -         if True if True else False:
+    -             dst[k] = v
+159 +     dst = {k: v for k, v in src if (True if True else False)}
+160 | 
+161 |     for k, v in src:
+162 |         if lambda: 0:
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use `dict.update` instead of a for-loop
    --> PERF403.py:166:13
@@ -360,18 +345,17 @@ PERF403 [*] Use `dict.update` instead of a for-loop
 168 | # https://github.com/astral-sh/ruff/issues/18859
     |
 help: Replace for loop with `dict.update`
-
-ℹ Unsafe fix
-161 161 |         if True if True else False:
-162 162 |             dst[k] = v
-163 163 | 
-164     |-    for k, v in src:
-165     |-        if lambda: 0:
-166     |-            dst[k] = v
-    164 |+    dst.update({k: v for k, v in src if (lambda: 0)})
-167 165 | 
-168 166 | # https://github.com/astral-sh/ruff/issues/18859
-169 167 | def foo():
+161 |         if True if True else False:
+162 |             dst[k] = v
+163 | 
+    -     for k, v in src:
+    -         if lambda: 0:
+    -             dst[k] = v
+164 +     dst.update({k: v for k, v in src if (lambda: 0)})
+165 | 
+166 | # https://github.com/astral-sh/ruff/issues/18859
+167 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 PERF403 [*] Use a dictionary comprehension instead of a for-loop
    --> PERF403.py:172:9
@@ -382,15 +366,78 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop
     |         ^^^^^^^
     |
 help: Replace for loop with dict comprehension
+167 | 
+168 | # https://github.com/astral-sh/ruff/issues/18859
+169 | def foo():
+    -     v = {}
+    -     for o,(x,)in():
+    -         v[x,]=o
+170 +     v = {(x,): o for o,(x,) in ()}
+171 | 
+172 | 
+173 | # https://github.com/astral-sh/ruff/issues/19005
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-167 167 | 
-168 168 | # https://github.com/astral-sh/ruff/issues/18859
-169 169 | def foo():
-170     |-    v = {}
-171     |-    for o,(x,)in():
-172     |-        v[x,]=o
-    170 |+    v = {x: o for o,(x,) in ()}
-173 171 | 
-174 172 | 
-175 173 | # https://github.com/astral-sh/ruff/issues/19005
+PERF403 [*] Use a dictionary comprehension instead of a for-loop
+   --> PERF403.py:200:9
+    |
+198 |     v = {}
+199 |     for o, (x,) in ["ox"]:
+200 |         v[x,] = o
+    |         ^^^^^^^^^
+201 |     return v
+    |
+help: Replace for loop with dict comprehension
+195 | 
+196 | 
+197 | def issue_19153_1():
+    -     v = {}
+    -     for o, (x,) in ["ox"]:
+    -         v[x,] = o
+198 +     v = {(x,): o for o, (x,) in ["ox"]}
+199 |     return v
+200 | 
+201 | 
+note: This is an unsafe fix and may change runtime behavior
+
+PERF403 [*] Use a dictionary comprehension instead of a for-loop
+   --> PERF403.py:207:9
+    |
+205 |     v = {}
+206 |     for (o, p), x in [("op", "x")]:
+207 |         v[x] = o, p
+    |         ^^^^^^^^^^^
+208 |     return v
+    |
+help: Replace for loop with dict comprehension
+202 | 
+203 | 
+204 | def issue_19153_2():
+    -     v = {}
+    -     for (o, p), x in [("op", "x")]:
+    -         v[x] = o, p
+205 +     v = {x: (o, p) for (o, p), x in [("op", "x")]}
+206 |     return v
+207 | 
+208 | 
+note: This is an unsafe fix and may change runtime behavior
+
+PERF403 [*] Use a dictionary comprehension instead of a for-loop
+   --> PERF403.py:214:9
+    |
+212 |     v = {}
+213 |     for o, (x,) in ["ox"]: 
+214 |         v[(x,)] = o 
+    |         ^^^^^^^^^^^
+215 |     return v
+    |
+help: Replace for loop with dict comprehension
+209 | 
+210 | 
+211 | def issue_19153_3():
+    -     v = {}
+    -     for o, (x,) in ["ox"]: 
+    -         v[(x,)] = o 
+212 +     v = {(x,): o for o, (x,) in ["ox"]} 
+213 |     return v
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_class_name.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_class_name.rs
index 6bf061ede5..eb2bb786ba 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_class_name.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_class_name.rs
@@ -26,6 +26,7 @@ use crate::rules::pycodestyle::helpers::is_ambiguous_name;
 /// class Integer(object): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.35")]
 pub(crate) struct AmbiguousClassName(pub String);
 
 impl Violation for AmbiguousClassName {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_function_name.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_function_name.rs
index 1cd8770c86..f9d53f25b8 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_function_name.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_function_name.rs
@@ -26,6 +26,7 @@ use crate::rules::pycodestyle::helpers::is_ambiguous_name;
 /// def long_name(x): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.35")]
 pub(crate) struct AmbiguousFunctionName(pub String);
 
 impl Violation for AmbiguousFunctionName {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_variable_name.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_variable_name.rs
index 156b336a47..d618e3d116 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_variable_name.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/ambiguous_variable_name.rs
@@ -33,6 +33,7 @@ use crate::rules::pycodestyle::helpers::is_ambiguous_name;
 /// i = 42
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.34")]
 pub(crate) struct AmbiguousVariableName(pub String);
 
 impl Violation for AmbiguousVariableName {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/bare_except.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/bare_except.rs
index 3040240166..82bbea5beb 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/bare_except.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/bare_except.rs
@@ -45,6 +45,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: Exception hierarchy](https://docs.python.org/3/library/exceptions.html#exception-hierarchy)
 /// - [Google Python Style Guide: "Exceptions"](https://google.github.io/styleguide/pyguide.html#24-exceptions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.36")]
 pub(crate) struct BareExcept;
 
 impl Violation for BareExcept {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/blank_lines.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/blank_lines.rs
index 07f5627f36..978806ee95 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/blank_lines.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/blank_lines.rs
@@ -62,6 +62,7 @@ const BLANK_LINES_NESTED_LEVEL: u32 = 1;
 /// - [Flake 8 rule](https://www.flake8rules.com/rules/E301.html)
 /// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.2")]
 pub(crate) struct BlankLineBetweenMethods;
 
 impl AlwaysFixableViolation for BlankLineBetweenMethods {
@@ -115,6 +116,7 @@ impl AlwaysFixableViolation for BlankLineBetweenMethods {
 /// - [Flake 8 rule](https://www.flake8rules.com/rules/E302.html)
 /// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.2")]
 pub(crate) struct BlankLinesTopLevel {
     actual_blank_lines: u32,
     expected_blank_lines: u32,
@@ -182,6 +184,7 @@ impl AlwaysFixableViolation for BlankLinesTopLevel {
 /// - [Flake 8 rule](https://www.flake8rules.com/rules/E303.html)
 /// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.2")]
 pub(crate) struct TooManyBlankLines {
     actual_blank_lines: u32,
 }
@@ -228,6 +231,7 @@ impl AlwaysFixableViolation for TooManyBlankLines {
 /// - [PEP 8: Blank Lines](https://peps.python.org/pep-0008/#blank-lines)
 /// - [Flake 8 rule](https://www.flake8rules.com/rules/E304.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.2")]
 pub(crate) struct BlankLineAfterDecorator {
     actual_blank_lines: u32,
 }
@@ -279,6 +283,7 @@ impl AlwaysFixableViolation for BlankLineAfterDecorator {
 /// - [Flake 8 rule](https://www.flake8rules.com/rules/E305.html)
 /// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.2")]
 pub(crate) struct BlankLinesAfterFunctionOrClass {
     actual_blank_lines: u32,
 }
@@ -333,6 +338,7 @@ impl AlwaysFixableViolation for BlankLinesAfterFunctionOrClass {
 /// - [Flake 8 rule](https://www.flake8rules.com/rules/E306.html)
 /// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.2")]
 pub(crate) struct BlankLinesBeforeNestedDefinition;
 
 impl AlwaysFixableViolation for BlankLinesBeforeNestedDefinition {
@@ -836,7 +842,10 @@ impl<'a, 'b> BlankLinesChecker<'a, 'b> {
             // Allow groups of one-liners.
             && !(state.follows.is_any_def() && line.last_token != TokenKind::Colon)
             && !state.follows.follows_def_with_dummy_body()
+            // Only for class scope: we must be inside a class block
             && matches!(state.class_status, Status::Inside(_))
+            // But NOT inside a function body; nested defs inside methods are handled by E306
+            && matches!(state.fn_status, Status::Outside | Status::CommentAfter(_))
             // The class/parent method's docstring can directly precede the def.
             // Allow following a decorator (if there is an error it will be triggered on the first decorator).
             && !matches!(state.follows, Follows::Docstring | Follows::Decorator)
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/compound_statements.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/compound_statements.rs
index 49a2fb1db5..8fd4889f3b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/compound_statements.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/compound_statements.rs
@@ -29,6 +29,7 @@ use crate::{Edit, Fix};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct MultipleStatementsOnOneLineColon;
 
 impl Violation for MultipleStatementsOnOneLineColon {
@@ -59,6 +60,7 @@ impl Violation for MultipleStatementsOnOneLineColon {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct MultipleStatementsOnOneLineSemicolon;
 
 impl Violation for MultipleStatementsOnOneLineSemicolon {
@@ -84,6 +86,7 @@ impl Violation for MultipleStatementsOnOneLineSemicolon {
 /// do_four()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct UselessSemicolon;
 
 impl AlwaysFixableViolation for UselessSemicolon {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/doc_line_too_long.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/doc_line_too_long.rs
index c9f0ae0753..9e59ce5a79 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/doc_line_too_long.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/doc_line_too_long.rs
@@ -72,6 +72,7 @@ use crate::settings::LinterSettings;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#maximum-line-length
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.219")]
 pub(crate) struct DocLineTooLong(usize, usize);
 
 impl Violation for DocLineTooLong {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/errors.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/errors.rs
index 58baf660bc..ad74b42169 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/errors.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/errors.rs
@@ -25,6 +25,7 @@ use crate::Violation;
 /// - [UNIX Permissions introduction](https://mason.gmu.edu/~montecin/UNIXpermiss.htm)
 /// - [Command Line Basics: Symbolic Links](https://www.digitalocean.com/community/tutorials/workflow-symbolic-links)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub struct IOError {
     pub message: String,
 }
@@ -65,6 +66,7 @@ impl Violation for IOError {
 /// - [Python documentation: Syntax Errors](https://docs.python.org/3/tutorial/errors.html#syntax-errors)
 #[derive(ViolationMetadata)]
 #[deprecated(note = "E999 has been removed")]
+#[violation_metadata(removed_since = "0.8.0")]
 pub(crate) struct SyntaxError;
 
 #[expect(deprecated)]
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/invalid_escape_sequence.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
index 1e0fe8507a..0d6ea9c1a6 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
@@ -41,6 +41,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: String and Bytes literals](https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.85")]
 pub(crate) struct InvalidEscapeSequence {
     ch: char,
     fix_title: FixTitle,
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs
index 24c47e1c7c..a42473386b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs
@@ -36,6 +36,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#programming-recommendations
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct LambdaAssignment {
     name: String,
 }
@@ -154,11 +155,16 @@ fn extract_types(annotation: &Expr, semantic: &SemanticModel) -> Option<(Vec<Exp
     }
 
     // The first argument to `Callable` must be a list of types, parameter
-    // specification, or ellipsis.
+    // specification (e.g., a `ParamSpec`), or ellipsis.
+    // For parameter specifications, we cannot assign per-parameter annotations,
+    // but we can still preserve the return type annotation.
     let params = match param_types {
         Expr::List(ast::ExprList { elts, .. }) => elts.clone(),
         Expr::EllipsisLiteral(_) => vec![],
-        _ => return None,
+        // Treat any other form (e.g., `ParamSpec`, `Concatenate`, etc.) as a
+        // parameter specification: do not annotate individual parameters, but
+        // keep the return type.
+        _ => vec![],
     };
 
     // The second argument to `Callable` must be a type.
@@ -182,7 +188,7 @@ fn function(
             ExprEllipsisLiteral::default(),
         ))),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     });
     let parameters = lambda.parameters.as_deref().cloned().unwrap_or_default();
     if let Some(annotation) = annotation {
@@ -230,7 +236,7 @@ fn function(
                 returns: Some(Box::new(return_type)),
                 type_params: None,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let generated = checker.generator().stmt(&func);
 
@@ -246,7 +252,7 @@ fn function(
         returns: None,
         type_params: None,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     });
     let generated = checker.generator().stmt(&function);
 
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/line_too_long.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/line_too_long.rs
index 9a03e0f98a..b81cbdf7b1 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/line_too_long.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/line_too_long.rs
@@ -70,6 +70,7 @@ use crate::settings::LinterSettings;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#maximum-line-length
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct LineTooLong(usize, usize);
 
 impl Violation for LineTooLong {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs
index baf229ada8..6ae6cea817 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs
@@ -58,6 +58,7 @@ impl EqCmpOp {
 /// [PEP 8]: https://peps.python.org/pep-0008/#programming-recommendations
 /// [this issue]: https://github.com/astral-sh/ruff/issues/4560
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct NoneComparison(EqCmpOp);
 
 impl AlwaysFixableViolation for NoneComparison {
@@ -120,6 +121,7 @@ impl AlwaysFixableViolation for NoneComparison {
 /// [PEP 8]: https://peps.python.org/pep-0008/#programming-recommendations
 /// [this issue]: https://github.com/astral-sh/ruff/issues/4560
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct TrueFalseComparison {
     value: bool,
     op: EqCmpOp,
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs
index 1419525033..ff57fca1fe 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs
@@ -31,6 +31,7 @@ use super::{LogicalLine, Whitespace};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#pet-peeves
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct WhitespaceAfterOpenBracket {
     symbol: char,
 }
@@ -70,6 +71,7 @@ impl AlwaysFixableViolation for WhitespaceAfterOpenBracket {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#pet-peeves
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct WhitespaceBeforeCloseBracket {
     symbol: char,
 }
@@ -107,6 +109,7 @@ impl AlwaysFixableViolation for WhitespaceBeforeCloseBracket {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#pet-peeves
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct WhitespaceBeforePunctuation {
     symbol: char,
 }
@@ -168,11 +171,11 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                 {
                     let (trailing, trailing_len) = line.trailing_whitespace(token);
                     if !matches!(trailing, Whitespace::None) {
+                        let range = TextRange::at(token.end(), trailing_len);
                         if let Some(mut diagnostic) = context.report_diagnostic_if_enabled(
                             WhitespaceAfterOpenBracket { symbol },
-                            TextRange::at(token.end(), trailing_len),
+                            range,
                         ) {
-                            let range = diagnostic.expect_range();
                             diagnostic.set_fix(Fix::safe_edit(Edit::range_deletion(range)));
                         }
                     }
@@ -184,11 +187,11 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                         if let (Whitespace::Single | Whitespace::Many | Whitespace::Tab, offset) =
                             line.leading_whitespace(token)
                         {
+                            let range = TextRange::at(token.start() - offset, offset);
                             if let Some(mut diagnostic) = context.report_diagnostic_if_enabled(
                                 WhitespaceBeforeCloseBracket { symbol },
-                                TextRange::at(token.start() - offset, offset),
+                                range,
                             ) {
-                                let range = diagnostic.expect_range();
                                 diagnostic.set_fix(Fix::safe_edit(Edit::range_deletion(range)));
                             }
                         }
@@ -210,13 +213,13 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                                 // If we're in the second half of a double colon, disallow
                                 // any whitespace (e.g., `foo[1: :2]` or `foo[1 : : 2]`).
                                 if matches!(prev_token, Some(TokenKind::Colon)) {
+                                    let range = TextRange::at(token.start() - offset, offset);
                                     if let Some(mut diagnostic) = context
                                         .report_diagnostic_if_enabled(
                                             WhitespaceBeforePunctuation { symbol },
-                                            TextRange::at(token.start() - offset, offset),
+                                            range,
                                         )
                                     {
-                                        let range = diagnostic.expect_range();
                                         diagnostic
                                             .set_fix(Fix::safe_edit(Edit::range_deletion(range)));
                                     }
@@ -227,13 +230,13 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                                     // Or `foo[index :, 2]`, but not `foo[index  :, 2]`.
                                     if let (Whitespace::Many | Whitespace::Tab, offset) = whitespace
                                     {
+                                        let range = TextRange::at(token.start() - offset, offset);
                                         if let Some(mut diagnostic) = context
                                             .report_diagnostic_if_enabled(
                                                 WhitespaceBeforePunctuation { symbol },
-                                                TextRange::at(token.start() - offset, offset),
+                                                range,
                                             )
                                         {
-                                            let range = diagnostic.expect_range();
                                             diagnostic.set_fix(Fix::safe_edit(
                                                 Edit::range_deletion(range),
                                             ));
@@ -255,13 +258,13 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                                     // whitespace before the colon and so should the fix
                                     if let (Whitespace::Many | Whitespace::Tab, offset) = whitespace
                                     {
+                                        let range = TextRange::at(token.start() - offset, offset);
                                         if let Some(mut diagnostic) = context
                                             .report_diagnostic_if_enabled(
                                                 WhitespaceBeforePunctuation { symbol },
-                                                TextRange::at(token.start() - offset, offset),
+                                                range,
                                             )
                                         {
-                                            let range = diagnostic.expect_range();
                                             diagnostic.set_fix(Fix::safe_edits(
                                                 Edit::range_deletion(range),
                                                 [Edit::insertion(
@@ -278,13 +281,13 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                                         .filter(|next| matches!(next.kind(), TokenKind::Colon))
                                         .unwrap_or(&token);
                                     if line.trailing_whitespace(token) != whitespace {
+                                        let range = TextRange::at(token.start() - offset, offset);
                                         if let Some(mut diagnostic) = context
                                             .report_diagnostic_if_enabled(
                                                 WhitespaceBeforePunctuation { symbol },
-                                                TextRange::at(token.start() - offset, offset),
+                                                range,
                                             )
                                         {
-                                            let range = diagnostic.expect_range();
                                             diagnostic.set_fix(Fix::safe_edit(
                                                 Edit::range_deletion(range),
                                             ));
@@ -299,11 +302,11 @@ pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &LintContext) {
                                     // Avoid removing any whitespace for f-string debug expressions.
                                     continue;
                                 }
+                                let range = TextRange::at(token.start() - offset, offset);
                                 if let Some(mut diagnostic) = context.report_diagnostic_if_enabled(
                                     WhitespaceBeforePunctuation { symbol },
-                                    TextRange::at(token.start() - offset, offset),
+                                    range,
                                 ) {
-                                    let range = diagnostic.expect_range();
                                     diagnostic.set_fix(Fix::safe_edit(Edit::range_deletion(range)));
                                 }
                             }
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/indentation.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/indentation.rs
index b6a6bbe434..5c351f695f 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/indentation.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/indentation.rs
@@ -38,6 +38,7 @@ use super::LogicalLine;
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct IndentationWithInvalidMultiple {
     indent_width: usize,
 }
@@ -83,6 +84,7 @@ impl Violation for IndentationWithInvalidMultiple {
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct IndentationWithInvalidMultipleComment {
     indent_width: usize,
 }
@@ -116,6 +118,7 @@ impl Violation for IndentationWithInvalidMultipleComment {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct NoIndentedBlock;
 
 impl Violation for NoIndentedBlock {
@@ -148,6 +151,7 @@ impl Violation for NoIndentedBlock {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct NoIndentedBlockComment;
 
 impl Violation for NoIndentedBlockComment {
@@ -177,6 +181,7 @@ impl Violation for NoIndentedBlockComment {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct UnexpectedIndentation;
 
 impl Violation for UnexpectedIndentation {
@@ -206,6 +211,7 @@ impl Violation for UnexpectedIndentation {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct UnexpectedIndentationComment;
 
 impl Violation for UnexpectedIndentationComment {
@@ -242,6 +248,7 @@ impl Violation for UnexpectedIndentationComment {
 /// [PEP 8]: https://peps.python.org/pep-0008/#indentation
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct OverIndented {
     is_comment: bool,
 }
@@ -269,7 +276,7 @@ pub(crate) fn indentation(
     range: TextRange,
     context: &LintContext,
 ) {
-    if indent_level % indent_size != 0 {
+    if !indent_level.is_multiple_of(indent_size) {
         if logical_line.is_comment_only() {
             context.report_diagnostic_if_enabled(
                 IndentationWithInvalidMultipleComment {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs
index 7b9e82c4f7..759bbb29d6 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs
@@ -24,6 +24,7 @@ use super::{DefinitionState, LogicalLine};
 /// a = (1, 2)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespace {
     token: TokenKind,
 }
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs
index f0d4600038..c767be0dc8 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs
@@ -27,6 +27,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: Keywords](https://docs.python.org/3/reference/lexical_analysis.html#keywords)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespaceAfterKeyword;
 
 impl AlwaysFixableViolation for MissingWhitespaceAfterKeyword {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs
index 2b7fdadb10..408575fa23 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs
@@ -30,6 +30,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// [PEP 8]: https://peps.python.org/pep-0008/#pet-peeves
 // E225
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespaceAroundOperator;
 
 impl AlwaysFixableViolation for MissingWhitespaceAroundOperator {
@@ -69,6 +70,7 @@ impl AlwaysFixableViolation for MissingWhitespaceAroundOperator {
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 // E226
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespaceAroundArithmeticOperator;
 
 impl AlwaysFixableViolation for MissingWhitespaceAroundArithmeticOperator {
@@ -108,6 +110,7 @@ impl AlwaysFixableViolation for MissingWhitespaceAroundArithmeticOperator {
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 // E227
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespaceAroundBitwiseOrShiftOperator;
 
 impl AlwaysFixableViolation for MissingWhitespaceAroundBitwiseOrShiftOperator {
@@ -147,6 +150,7 @@ impl AlwaysFixableViolation for MissingWhitespaceAroundBitwiseOrShiftOperator {
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 // E228
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespaceAroundModuloOperator;
 
 impl AlwaysFixableViolation for MissingWhitespaceAroundModuloOperator {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/redundant_backslash.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/redundant_backslash.rs
index b8f8439bec..2092b63716 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/redundant_backslash.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/redundant_backslash.rs
@@ -30,6 +30,7 @@ use super::LogicalLine;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#maximum-line-length
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.3")]
 pub(crate) struct RedundantBackslash;
 
 impl AlwaysFixableViolation for RedundantBackslash {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs
index 7a73fc7795..c806ba46f4 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs
@@ -26,6 +26,7 @@ use super::{LogicalLine, Whitespace};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#whitespace-in-expressions-and-statements
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct TabBeforeOperator;
 
 impl AlwaysFixableViolation for TabBeforeOperator {
@@ -58,6 +59,7 @@ impl AlwaysFixableViolation for TabBeforeOperator {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#whitespace-in-expressions-and-statements
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MultipleSpacesBeforeOperator;
 
 impl AlwaysFixableViolation for MultipleSpacesBeforeOperator {
@@ -90,6 +92,7 @@ impl AlwaysFixableViolation for MultipleSpacesBeforeOperator {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#whitespace-in-expressions-and-statements
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct TabAfterOperator;
 
 impl AlwaysFixableViolation for TabAfterOperator {
@@ -122,6 +125,7 @@ impl AlwaysFixableViolation for TabAfterOperator {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#whitespace-in-expressions-and-statements
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MultipleSpacesAfterOperator;
 
 impl AlwaysFixableViolation for MultipleSpacesAfterOperator {
@@ -152,6 +156,7 @@ impl AlwaysFixableViolation for MultipleSpacesAfterOperator {
 /// ```
 ///
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.281")]
 pub(crate) struct TabAfterComma;
 
 impl AlwaysFixableViolation for TabAfterComma {
@@ -182,6 +187,7 @@ impl AlwaysFixableViolation for TabAfterComma {
 /// a = 4, 5
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.281")]
 pub(crate) struct MultipleSpacesAfterComma;
 
 impl AlwaysFixableViolation for MultipleSpacesAfterComma {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs
index af7a415275..69ef1174d4 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs
@@ -22,6 +22,7 @@ use super::{LogicalLine, Whitespace};
 /// True and False
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MultipleSpacesAfterKeyword;
 
 impl AlwaysFixableViolation for MultipleSpacesAfterKeyword {
@@ -51,6 +52,7 @@ impl AlwaysFixableViolation for MultipleSpacesAfterKeyword {
 /// x and y
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MultipleSpacesBeforeKeyword;
 
 impl AlwaysFixableViolation for MultipleSpacesBeforeKeyword {
@@ -80,6 +82,7 @@ impl AlwaysFixableViolation for MultipleSpacesBeforeKeyword {
 /// True and False
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct TabAfterKeyword;
 
 impl AlwaysFixableViolation for TabAfterKeyword {
@@ -109,6 +112,7 @@ impl AlwaysFixableViolation for TabAfterKeyword {
 /// True and False
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct TabBeforeKeyword;
 
 impl AlwaysFixableViolation for TabBeforeKeyword {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
index 3e11ca5a8c..bed7da83e1 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#whitespace-in-expressions-and-statements
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct UnexpectedSpacesAroundKeywordParameterEquals;
 
 impl AlwaysFixableViolation for UnexpectedSpacesAroundKeywordParameterEquals {
@@ -71,6 +72,7 @@ impl AlwaysFixableViolation for UnexpectedSpacesAroundKeywordParameterEquals {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#whitespace-in-expressions-and-statements
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MissingWhitespaceAroundParameterEquals;
 
 impl AlwaysFixableViolation for MissingWhitespaceAroundParameterEquals {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
index 49f85613b2..dc9e91dac2 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#comments
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct TooFewSpacesBeforeInlineComment;
 
 impl AlwaysFixableViolation for TooFewSpacesBeforeInlineComment {
@@ -67,6 +68,7 @@ impl AlwaysFixableViolation for TooFewSpacesBeforeInlineComment {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#comments
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct NoSpaceAfterInlineComment;
 
 impl AlwaysFixableViolation for NoSpaceAfterInlineComment {
@@ -104,6 +106,7 @@ impl AlwaysFixableViolation for NoSpaceAfterInlineComment {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#comments
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct NoSpaceAfterBlockComment;
 
 impl AlwaysFixableViolation for NoSpaceAfterBlockComment {
@@ -150,6 +153,7 @@ impl AlwaysFixableViolation for NoSpaceAfterBlockComment {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#comments
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct MultipleLeadingHashesForBlockComment;
 
 impl AlwaysFixableViolation for MultipleLeadingHashesForBlockComment {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs
index 4f180f2632..e176455718 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs
@@ -26,6 +26,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#pet-peeves
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.269")]
 pub(crate) struct WhitespaceBeforeParameters {
     bracket: TokenKind,
 }
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs
index f8301cbc94..de7fbd042d 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs
@@ -24,6 +24,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// spam(1)\n
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.61")]
 pub(crate) struct MissingNewlineAtEndOfFile;
 
 impl AlwaysFixableViolation for MissingNewlineAtEndOfFile {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs
index 649fc972fc..b62d4e008b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs
@@ -27,6 +27,7 @@ use crate::{Violation, checkers::ast::LintContext};
 /// if a == 0:\n    a = 1\n    b = 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.229")]
 pub(crate) struct MixedSpacesAndTabs;
 
 impl Violation for MixedSpacesAndTabs {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/module_import_not_at_top_of_file.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/module_import_not_at_top_of_file.rs
index 066de7316f..3da13717a3 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/module_import_not_at_top_of_file.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/module_import_not_at_top_of_file.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#imports
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct ModuleImportNotAtTopOfFile {
     source_type: PySourceType,
 }
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/multiple_imports_on_one_line.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/multiple_imports_on_one_line.rs
index dd7dc69b5b..aa5301fb49 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/multiple_imports_on_one_line.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/multiple_imports_on_one_line.rs
@@ -31,6 +31,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#imports
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.191")]
 pub(crate) struct MultipleImportsOnOneLine;
 
 impl Violation for MultipleImportsOnOneLine {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs
index a431cb0368..a4234093bc 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs
@@ -28,6 +28,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct NotInTest;
 
 impl AlwaysFixableViolation for NotInTest {
@@ -64,6 +65,7 @@ impl AlwaysFixableViolation for NotInTest {
 ///
 /// [PEP8]: https://peps.python.org/pep-0008/#programming-recommendations
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct NotIsTest;
 
 impl AlwaysFixableViolation for NotIsTest {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/tab_indentation.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/tab_indentation.rs
index 40d272336d..581f2a1eaa 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/tab_indentation.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/tab_indentation.rs
@@ -24,6 +24,7 @@ use crate::checkers::ast::LintContext;
 /// [PEP 8]: https://peps.python.org/pep-0008/#tabs-or-spaces
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.254")]
 pub(crate) struct TabIndentation;
 
 impl Violation for TabIndentation {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/too_many_newlines_at_end_of_file.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/too_many_newlines_at_end_of_file.rs
index 79ccdc6978..3a84aad979 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/too_many_newlines_at_end_of_file.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/too_many_newlines_at_end_of_file.rs
@@ -29,6 +29,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix, checkers::ast::LintContext};
 /// spam(1)\n
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.3")]
 pub(crate) struct TooManyNewlinesAtEndOfFile {
     num_trailing_newlines: u32,
     in_notebook: bool,
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/trailing_whitespace.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/trailing_whitespace.rs
index 78dabff4df..c72825da72 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/trailing_whitespace.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/trailing_whitespace.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct TrailingWhitespace;
 
 impl AlwaysFixableViolation for TrailingWhitespace {
@@ -69,6 +70,7 @@ impl AlwaysFixableViolation for TrailingWhitespace {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#other-recommendations
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct BlankLineWithWhitespace;
 
 impl AlwaysFixableViolation for BlankLineWithWhitespace {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/type_comparison.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/type_comparison.rs
index b7a0c0ca86..152e5e808e 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/type_comparison.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/type_comparison.rs
@@ -49,6 +49,7 @@ use crate::checkers::ast::Checker;
 ///     pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.39")]
 pub(crate) struct TypeComparison;
 
 impl Violation for TypeComparison {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/whitespace_after_decorator.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/whitespace_after_decorator.rs
index 63517ae803..1ce7f2c0a8 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/whitespace_after_decorator.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/whitespace_after_decorator.rs
@@ -30,6 +30,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#maximum-line-length
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.1")]
 pub(crate) struct WhitespaceAfterDecorator;
 
 impl AlwaysFixableViolation for WhitespaceAfterDecorator {
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap
index c85c3b4a81..7f3b7fa1c9 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap
@@ -11,14 +11,12 @@ E201 [*] Whitespace after '('
 4 | spam(ham[ 1], {eggs: 2})
   |
 help: Remove whitespace before '('
-
-ℹ Safe 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
+1 | #: E201:1:6
+  - spam( ham[1], {eggs: 2})
+2 + spam(ham[1], {eggs: 2})
+3 | #: E201:1:10
+4 | spam(ham[ 1], {eggs: 2})
+5 | #: E201:1:15
 
 E201 [*] Whitespace after '['
  --> E20.py:4:10
@@ -31,16 +29,14 @@ E201 [*] Whitespace after '['
 6 | spam(ham[1], { eggs: 2})
   |
 help: Remove whitespace before '['
-
-ℹ Safe 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
+1 | #: E201:1:6
+2 | spam( ham[1], {eggs: 2})
+3 | #: E201:1:10
+  - spam(ham[ 1], {eggs: 2})
+4 + spam(ham[1], {eggs: 2})
+5 | #: E201:1:15
+6 | spam(ham[1], { eggs: 2})
+7 | #: E201:1:6
 
 E201 [*] Whitespace after '{'
  --> E20.py:6:15
@@ -53,16 +49,14 @@ E201 [*] Whitespace after '{'
 8 | spam(    ham[1], {eggs: 2})
   |
 help: Remove whitespace before '{'
-
-ℹ Safe 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
+3 | #: E201:1:10
+4 | spam(ham[ 1], {eggs: 2})
+5 | #: E201:1:15
+  - spam(ham[1], { eggs: 2})
+6 + spam(ham[1], {eggs: 2})
+7 | #: E201:1:6
+8 | spam(	ham[1], {eggs: 2})
+9 | #: E201:1:10
 
 E201 [*] Whitespace after '('
   --> E20.py:8:6
@@ -75,16 +69,14 @@ E201 [*] Whitespace after '('
 10 | spam(ham[    1], {eggs: 2})
    |
 help: Remove whitespace before '('
-
-ℹ Safe 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
+5  | #: E201:1:15
+6  | spam(ham[1], { eggs: 2})
+7  | #: E201:1:6
+   - spam(	ham[1], {eggs: 2})
+8  + spam(ham[1], {eggs: 2})
+9  | #: E201:1:10
+10 | spam(ham[	1], {eggs: 2})
+11 | #: E201:1:15
 
 E201 [*] Whitespace after '['
   --> E20.py:10:10
@@ -97,16 +89,14 @@ E201 [*] Whitespace after '['
 12 | spam(ham[1], {    eggs: 2})
    |
 help: Remove whitespace before '['
-
-ℹ Safe 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
+7  | #: E201:1:6
+8  | spam(	ham[1], {eggs: 2})
+9  | #: E201:1:10
+   - spam(ham[	1], {eggs: 2})
+10 + spam(ham[1], {eggs: 2})
+11 | #: E201:1:15
+12 | spam(ham[1], {	eggs: 2})
+13 | #: Okay
 
 E201 [*] Whitespace after '{'
   --> E20.py:12:15
@@ -119,16 +109,14 @@ E201 [*] Whitespace after '{'
 14 | spam(ham[1], {eggs: 2})
    |
 help: Remove whitespace before '{'
-
-ℹ Safe 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 | #:
+9  | #: E201:1:10
+10 | spam(ham[	1], {eggs: 2})
+11 | #: E201:1:15
+   - spam(ham[1], {	eggs: 2})
+12 + spam(ham[1], {eggs: 2})
+13 | #: Okay
+14 | spam(ham[1], {eggs: 2})
+15 | #:
 
 E201 [*] Whitespace after '['
    --> E20.py:107:6
@@ -140,16 +128,14 @@ E201 [*] Whitespace after '['
 109 | #: Okay
     |
 help: Remove whitespace before '['
-
-ℹ Safe fix
-104 104 | #:
-105 105 | 
-106 106 | #: E201:1:6
-107     |-spam[ ~ham]
-    107 |+spam[~ham]
-108 108 | 
-109 109 | #: Okay
-110 110 | x = [  #
+104 | #:
+105 | 
+106 | #: E201:1:6
+    - spam[ ~ham]
+107 + spam[~ham]
+108 | 
+109 | #: Okay
+110 | x = [  #
 
 E201 [*] Whitespace after '['
    --> E20.py:116:5
@@ -161,16 +147,14 @@ E201 [*] Whitespace after '['
 117 | f"normal { {f"{ { [1, 2] } }" } } normal"
     |
 help: Remove whitespace before '['
-
-ℹ Safe fix
-113 113 | 
-114 114 | # F-strings
-115 115 | f"{ {'a': 1} }"
-116     |-f"{[ { {'a': 1} } ]}"
-    116 |+f"{[{ {'a': 1} } ]}"
-117 117 | f"normal { {f"{ { [1, 2] } }" } } normal"
-118 118 | 
-119 119 | #: Okay
+113 | 
+114 | # F-strings
+115 | f"{ {'a': 1} }"
+    - f"{[ { {'a': 1} } ]}"
+116 + f"{[{ {'a': 1} } ]}"
+117 | f"normal { {f"{ { [1, 2] } }" } } normal"
+118 | 
+119 | #: Okay
 
 E201 [*] Whitespace after '['
    --> E20.py:145:5
@@ -182,16 +166,14 @@ E201 [*] Whitespace after '['
 147 | #: Okay
     |
 help: Remove whitespace before '['
-
-ℹ Safe fix
-142 142 | ham[lower + offset : upper + offset]
-143 143 | 
-144 144 | #: E201:1:5
-145     |-ham[ : upper]
-    145 |+ham[: upper]
-146 146 | 
-147 147 | #: Okay
-148 148 | ham[lower + offset :: upper + offset]
+142 | ham[lower + offset : upper + offset]
+143 | 
+144 | #: E201:1:5
+    - ham[ : upper]
+145 + ham[: upper]
+146 | 
+147 | #: Okay
+148 | ham[lower + offset :: upper + offset]
 
 E201 [*] Whitespace after '['
    --> E20.py:195:5
@@ -203,13 +185,11 @@ E201 [*] Whitespace after '['
 196 | t"normal { {t"{ { [1, 2] } }" } } normal"
     |
 help: Remove whitespace before '['
-
-ℹ Safe fix
-192 192 | 
-193 193 | # t-strings
-194 194 | t"{ {'a': 1} }"
-195     |-t"{[ { {'a': 1} } ]}"
-    195 |+t"{[{ {'a': 1} } ]}"
-196 196 | t"normal { {t"{ { [1, 2] } }" } } normal"
-197 197 | 
-198 198 | t"{x = :.2f}"
+192 | 
+193 | # t-strings
+194 | t"{ {'a': 1} }"
+    - t"{[ { {'a': 1} } ]}"
+195 + t"{[{ {'a': 1} } ]}"
+196 | t"normal { {t"{ { [1, 2] } }" } } normal"
+197 | 
+198 | t"{x = :.2f}"
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap
index 839db34d56..66d9bede1f 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap
@@ -11,16 +11,14 @@ E202 [*] Whitespace before ')'
 21 | spam(ham[1], {eggs: 2 })
    |
 help: Remove whitespace before ')'
-
-ℹ Safe 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
+16 | 
+17 | 
+18 | #: E202:1:23
+   - spam(ham[1], {eggs: 2} )
+19 + spam(ham[1], {eggs: 2})
+20 | #: E202:1:22
+21 | spam(ham[1], {eggs: 2 })
+22 | #: E202:1:11
 
 E202 [*] Whitespace before '}'
   --> E20.py:21:22
@@ -33,16 +31,14 @@ E202 [*] Whitespace before '}'
 23 | spam(ham[1 ], {eggs: 2})
    |
 help: Remove whitespace before '}'
-
-ℹ Safe 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
+18 | #: E202:1:23
+19 | spam(ham[1], {eggs: 2} )
+20 | #: E202:1:22
+   - spam(ham[1], {eggs: 2 })
+21 + spam(ham[1], {eggs: 2})
+22 | #: E202:1:11
+23 | spam(ham[1 ], {eggs: 2})
+24 | #: E202:1:23
 
 E202 [*] Whitespace before ']'
   --> E20.py:23:11
@@ -55,16 +51,14 @@ E202 [*] Whitespace before ']'
 25 | spam(ham[1], {eggs: 2}    )
    |
 help: Remove whitespace before ']'
-
-ℹ Safe 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
+20 | #: E202:1:22
+21 | spam(ham[1], {eggs: 2 })
+22 | #: E202:1:11
+   - spam(ham[1 ], {eggs: 2})
+23 + spam(ham[1], {eggs: 2})
+24 | #: E202:1:23
+25 | spam(ham[1], {eggs: 2}	)
+26 | #: E202:1:22
 
 E202 [*] Whitespace before ')'
   --> E20.py:25:23
@@ -77,16 +71,14 @@ E202 [*] Whitespace before ')'
 27 | spam(ham[1], {eggs: 2    })
    |
 help: Remove whitespace before ')'
-
-ℹ Safe 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
+22 | #: E202:1:11
+23 | spam(ham[1 ], {eggs: 2})
+24 | #: E202:1:23
+   - spam(ham[1], {eggs: 2}	)
+25 + spam(ham[1], {eggs: 2})
+26 | #: E202:1:22
+27 | spam(ham[1], {eggs: 2	})
+28 | #: E202:1:11
 
 E202 [*] Whitespace before '}'
   --> E20.py:27:22
@@ -99,16 +91,14 @@ E202 [*] Whitespace before '}'
 29 | spam(ham[1    ], {eggs: 2})
    |
 help: Remove whitespace before '}'
-
-ℹ Safe 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
+24 | #: E202:1:23
+25 | spam(ham[1], {eggs: 2}	)
+26 | #: E202:1:22
+   - spam(ham[1], {eggs: 2	})
+27 + spam(ham[1], {eggs: 2})
+28 | #: E202:1:11
+29 | spam(ham[1	], {eggs: 2})
+30 | #: Okay
 
 E202 [*] Whitespace before ']'
   --> E20.py:29:11
@@ -121,16 +111,14 @@ E202 [*] Whitespace before ']'
 31 | spam(ham[1], {eggs: 2})
    |
 help: Remove whitespace before ']'
-
-ℹ Safe 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 | 
+26 | #: E202:1:22
+27 | spam(ham[1], {eggs: 2	})
+28 | #: E202:1:11
+   - spam(ham[1	], {eggs: 2})
+29 + spam(ham[1], {eggs: 2})
+30 | #: Okay
+31 | spam(ham[1], {eggs: 2})
+32 | 
 
 E202 [*] Whitespace before ']'
    --> E20.py:116:18
@@ -142,16 +130,14 @@ E202 [*] Whitespace before ']'
 117 | f"normal { {f"{ { [1, 2] } }" } } normal"
     |
 help: Remove whitespace before ']'
-
-ℹ Safe fix
-113 113 | 
-114 114 | # F-strings
-115 115 | f"{ {'a': 1} }"
-116     |-f"{[ { {'a': 1} } ]}"
-    116 |+f"{[ { {'a': 1} }]}"
-117 117 | f"normal { {f"{ { [1, 2] } }" } } normal"
-118 118 | 
-119 119 | #: Okay
+113 | 
+114 | # F-strings
+115 | f"{ {'a': 1} }"
+    - f"{[ { {'a': 1} } ]}"
+116 + f"{[ { {'a': 1} }]}"
+117 | f"normal { {f"{ { [1, 2] } }" } } normal"
+118 | 
+119 | #: Okay
 
 E202 [*] Whitespace before ']'
    --> E20.py:172:12
@@ -163,16 +149,14 @@ E202 [*] Whitespace before ']'
 174 | #: E203:1:10
     |
 help: Remove whitespace before ']'
-
-ℹ Safe fix
-169 169 | ham[upper :]
-170 170 | 
-171 171 | #: E202:1:12
-172     |-ham[upper : ]
-    172 |+ham[upper :]
-173 173 | 
-174 174 | #: E203:1:10
-175 175 | ham[upper  :]
+169 | ham[upper :]
+170 | 
+171 | #: E202:1:12
+    - ham[upper : ]
+172 + ham[upper :]
+173 | 
+174 | #: E203:1:10
+175 | ham[upper  :]
 
 E202 [*] Whitespace before ']'
    --> E20.py:195:18
@@ -184,13 +168,11 @@ E202 [*] Whitespace before ']'
 196 | t"normal { {t"{ { [1, 2] } }" } } normal"
     |
 help: Remove whitespace before ']'
-
-ℹ Safe fix
-192 192 | 
-193 193 | # t-strings
-194 194 | t"{ {'a': 1} }"
-195     |-t"{[ { {'a': 1} } ]}"
-    195 |+t"{[ { {'a': 1} }]}"
-196 196 | t"normal { {t"{ { [1, 2] } }" } } normal"
-197 197 | 
-198 198 | t"{x = :.2f}"
+192 | 
+193 | # t-strings
+194 | t"{ {'a': 1} }"
+    - t"{[ { {'a': 1} } ]}"
+195 + t"{[ { {'a': 1} }]}"
+196 | t"normal { {t"{ { [1, 2] } }" } } normal"
+197 | 
+198 | t"{x = :.2f}"
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap
index f8cd84d5de..48b597a3e2 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap
@@ -11,16 +11,14 @@ E203 [*] Whitespace before ':'
 53 |     x, y = y, x
    |
 help: Remove whitespace before ':'
-
-ℹ Safe 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
+48 | 
+49 | 
+50 | #: E203:1:10
+   - if x == 4 :
+51 + if x == 4:
+52 |     print(x, y)
+53 |     x, y = y, x
+54 | #: E203:1:10
 
 E203 [*] Whitespace before ':'
   --> E20.py:55:10
@@ -33,16 +31,14 @@ E203 [*] Whitespace before ':'
 57 |     x, y = y, x
    |
 help: Remove whitespace before ':'
-
-ℹ Safe 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
+52 |     print(x, y)
+53 |     x, y = y, x
+54 | #: E203:1:10
+   - if x == 4	:
+55 + if x == 4:
+56 |     print(x, y)
+57 |     x, y = y, x
+58 | #: E203:2:15 E702:2:16
 
 E203 [*] Whitespace before ';'
   --> E20.py:60:16
@@ -55,16 +51,14 @@ E203 [*] Whitespace before ';'
 62 | if x == 4:
    |
 help: Remove whitespace before ';'
-
-ℹ Safe 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
+57 |     x, y = y, x
+58 | #: E203:2:15 E702:2:16
+59 | if x == 4:
+   -     print(x, y) ; x, y = y, x
+60 +     print(x, y); x, y = y, x
+61 | #: E203:2:15 E702:2:16
+62 | if x == 4:
+63 |     print(x, y)	; x, y = y, x
 
 E203 [*] Whitespace before ';'
   --> E20.py:63:16
@@ -77,16 +71,14 @@ E203 [*] Whitespace before ';'
 65 | if x == 4:
    |
 help: Remove whitespace before ';'
-
-ℹ Safe 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)
+60 |     print(x, y) ; x, y = y, x
+61 | #: E203:2:15 E702:2:16
+62 | if x == 4:
+   -     print(x, y)	; x, y = y, x
+63 +     print(x, y); x, y = y, x
+64 | #: E203:3:13
+65 | if x == 4:
+66 |     print(x, y)
 
 E203 [*] Whitespace before ','
   --> E20.py:67:13
@@ -99,16 +91,14 @@ E203 [*] Whitespace before ','
 69 | if x == 4:
    |
 help: Remove whitespace before ','
-
-ℹ Safe 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)
+64 | #: E203:3:13
+65 | if x == 4:
+66 |     print(x, y)
+   -     x, y = y , x
+67 +     x, y = y, x
+68 | #: E203:3:13
+69 | if x == 4:
+70 |     print(x, y)
 
 E203 [*] Whitespace before ','
   --> E20.py:71:13
@@ -121,16 +111,14 @@ E203 [*] Whitespace before ','
 73 | if x == 4:
    |
 help: Remove whitespace before ','
-
-ℹ Safe 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)
+68 | #: E203:3:13
+69 | if x == 4:
+70 |     print(x, y)
+   -     x, y = y	, x
+71 +     x, y = y, x
+72 | #: Okay
+73 | if x == 4:
+74 |     print(x, y)
 
 E203 [*] Whitespace before ':'
   --> E20.py:86:61
@@ -142,16 +130,14 @@ E203 [*] Whitespace before ':'
 87 | ]
    |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-83 83 | 
-84 84 | #: E203 multi whitespace before :
-85 85 | predictions = predictions[
-86    |-    len(past_covariates) // datamodule.hparams["downsample"]  :
-   86 |+    len(past_covariates) // datamodule.hparams["downsample"] :
-87 87 | ]
-88 88 | 
-89 89 | #: E203 tab before :
+83 | 
+84 | #: E203 multi whitespace before :
+85 | predictions = predictions[
+   -     len(past_covariates) // datamodule.hparams["downsample"]  :
+86 +     len(past_covariates) // datamodule.hparams["downsample"] :
+87 | ]
+88 | 
+89 | #: E203 tab before :
 
 E203 [*] Whitespace before ':'
   --> E20.py:91:61
@@ -163,16 +149,14 @@ E203 [*] Whitespace before ':'
 92 | ]
    |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-88 88 | 
-89 89 | #: E203 tab before :
-90 90 | predictions = predictions[
-91    |-    len(past_covariates) // datamodule.hparams["downsample"]	:
-   91 |+    len(past_covariates) // datamodule.hparams["downsample"] :
-92 92 | ]
-93 93 | 
-94 94 | #: E203 single whitespace before : with line a comment
+88 | 
+89 | #: E203 tab before :
+90 | predictions = predictions[
+   -     len(past_covariates) // datamodule.hparams["downsample"]	:
+91 +     len(past_covariates) // datamodule.hparams["downsample"] :
+92 | ]
+93 | 
+94 | #: E203 single whitespace before : with line a comment
 
 E203 [*] Whitespace before ':'
    --> E20.py:101:61
@@ -184,16 +168,14 @@ E203 [*] Whitespace before ':'
 102 | ]
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-98  98  | 
-99  99  | #: E203 multi whitespace before : with line a comment
-100 100 | predictions = predictions[
-101     |-    len(past_covariates) // datamodule.hparams["downsample"]  :  # Just some comment
-    101 |+    len(past_covariates) // datamodule.hparams["downsample"] :  # Just some comment
-102 102 | ]
-103 103 | 
-104 104 | #:
+98  | 
+99  | #: E203 multi whitespace before : with line a comment
+100 | predictions = predictions[
+    -     len(past_covariates) // datamodule.hparams["downsample"]  :  # Just some comment
+101 +     len(past_covariates) // datamodule.hparams["downsample"] :  # Just some comment
+102 | ]
+103 | 
+104 | #:
 
 E203 [*] Whitespace before ':'
    --> E20.py:126:16
@@ -205,16 +187,14 @@ E203 [*] Whitespace before ':'
 128 | #: E203:1:19
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-123 123 | ham[(lower + offset) : upper + offset]
-124 124 | 
-125 125 | #: E203:1:19
-126     |-{lower + offset : upper + offset}
-    126 |+{lower + offset: upper + offset}
-127 127 | 
-128 128 | #: E203:1:19
-129 129 | ham[lower + offset  : upper + offset]
+123 | ham[(lower + offset) : upper + offset]
+124 | 
+125 | #: E203:1:19
+    - {lower + offset : upper + offset}
+126 + {lower + offset: upper + offset}
+127 | 
+128 | #: E203:1:19
+129 | ham[lower + offset  : upper + offset]
 
 E203 [*] Whitespace before ':'
    --> E20.py:129:19
@@ -226,16 +206,14 @@ E203 [*] Whitespace before ':'
 131 | #: Okay
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-126 126 | {lower + offset : upper + offset}
-127 127 | 
-128 128 | #: E203:1:19
-129     |-ham[lower + offset  : upper + offset]
-    129 |+ham[lower + offset: upper + offset]
-130 130 | 
-131 131 | #: Okay
-132 132 | release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1: -1]
+126 | {lower + offset : upper + offset}
+127 | 
+128 | #: E203:1:19
+    - ham[lower + offset  : upper + offset]
+129 + ham[lower + offset: upper + offset]
+130 | 
+131 | #: Okay
+132 | release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1: -1]
 
 E203 [*] Whitespace before ':'
    --> E20.py:157:21
@@ -247,16 +225,14 @@ E203 [*] Whitespace before ':'
 159 | #: E203:1:20
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-154 154 | ham[lower + offset::upper + offset]
-155 155 | 
-156 156 | #: E203:1:21
-157     |-ham[lower + offset : : upper + offset]
-    157 |+ham[lower + offset :: upper + offset]
-158 158 | 
-159 159 | #: E203:1:20
-160 160 | ham[lower + offset: :upper + offset]
+154 | ham[lower + offset::upper + offset]
+155 | 
+156 | #: E203:1:21
+    - ham[lower + offset : : upper + offset]
+157 + ham[lower + offset :: upper + offset]
+158 | 
+159 | #: E203:1:20
+160 | ham[lower + offset: :upper + offset]
 
 E203 [*] Whitespace before ':'
    --> E20.py:160:20
@@ -268,16 +244,14 @@ E203 [*] Whitespace before ':'
 162 | #: E203:1:20
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-157 157 | ham[lower + offset : : upper + offset]
-158 158 | 
-159 159 | #: E203:1:20
-160     |-ham[lower + offset: :upper + offset]
-    160 |+ham[lower + offset::upper + offset]
-161 161 | 
-162 162 | #: E203:1:20
-163 163 | ham[{lower + offset : upper + offset} : upper + offset]
+157 | ham[lower + offset : : upper + offset]
+158 | 
+159 | #: E203:1:20
+    - ham[lower + offset: :upper + offset]
+160 + ham[lower + offset::upper + offset]
+161 | 
+162 | #: E203:1:20
+163 | ham[{lower + offset : upper + offset} : upper + offset]
 
 E203 [*] Whitespace before ':'
    --> E20.py:163:20
@@ -289,16 +263,14 @@ E203 [*] Whitespace before ':'
 165 | #: Okay
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-160 160 | ham[lower + offset: :upper + offset]
-161 161 | 
-162 162 | #: E203:1:20
-163     |-ham[{lower + offset : upper + offset} : upper + offset]
-    163 |+ham[{lower + offset: upper + offset} : upper + offset]
-164 164 | 
-165 165 | #: Okay
-166 166 | ham[upper:]
+160 | ham[lower + offset: :upper + offset]
+161 | 
+162 | #: E203:1:20
+    - ham[{lower + offset : upper + offset} : upper + offset]
+163 + ham[{lower + offset: upper + offset} : upper + offset]
+164 | 
+165 | #: Okay
+166 | ham[upper:]
 
 E203 [*] Whitespace before ':'
    --> E20.py:175:10
@@ -310,16 +282,14 @@ E203 [*] Whitespace before ':'
 177 | #: Okay
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-172 172 | ham[upper : ]
-173 173 | 
-174 174 | #: E203:1:10
-175     |-ham[upper  :]
-    175 |+ham[upper:]
-176 176 | 
-177 177 | #: Okay
-178 178 | ham[lower +1 :, "columnname"]
+172 | ham[upper : ]
+173 | 
+174 | #: E203:1:10
+    - ham[upper  :]
+175 + ham[upper:]
+176 | 
+177 | #: Okay
+178 | ham[lower +1 :, "columnname"]
 
 E203 [*] Whitespace before ':'
    --> E20.py:181:14
@@ -331,16 +301,14 @@ E203 [*] Whitespace before ':'
 183 | #: Okay
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-178 178 | ham[lower +1 :, "columnname"]
-179 179 | 
-180 180 | #: E203:1:13
-181     |-ham[lower + 1  :, "columnname"]
-    181 |+ham[lower + 1:, "columnname"]
-182 182 | 
-183 183 | #: Okay
-184 184 | f"{ham[lower +1 :, "columnname"]}"
+178 | ham[lower +1 :, "columnname"]
+179 | 
+180 | #: E203:1:13
+    - ham[lower + 1  :, "columnname"]
+181 + ham[lower + 1:, "columnname"]
+182 | 
+183 | #: Okay
+184 | f"{ham[lower +1 :, "columnname"]}"
 
 E203 [*] Whitespace before ':'
    --> E20.py:187:17
@@ -352,16 +320,14 @@ E203 [*] Whitespace before ':'
 189 | #: Okay: https://github.com/astral-sh/ruff/issues/12023
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-184 184 | f"{ham[lower +1 :, "columnname"]}"
-185 185 | 
-186 186 | #: E203:1:13
-187     |-f"{ham[lower + 1  :, "columnname"]}"
-    187 |+f"{ham[lower + 1:, "columnname"]}"
-188 188 | 
-189 189 | #: Okay: https://github.com/astral-sh/ruff/issues/12023
-190 190 | f"{x = :.2f}"
+184 | f"{ham[lower +1 :, "columnname"]}"
+185 | 
+186 | #: E203:1:13
+    - f"{ham[lower + 1  :, "columnname"]}"
+187 + f"{ham[lower + 1:, "columnname"]}"
+188 | 
+189 | #: Okay: https://github.com/astral-sh/ruff/issues/12023
+190 | f"{x = :.2f}"
 
 E203 [*] Whitespace before ':'
    --> E20.py:205:17
@@ -371,11 +337,9 @@ E203 [*] Whitespace before ':'
     |                 ^^
     |
 help: Remove whitespace before ':'
-
-ℹ Safe fix
-202 202 | t"{ham[lower +1 :, "columnname"]}"
-203 203 | 
-204 204 | #: E203:1:13
-205     |-t"{ham[lower + 1  :, "columnname"]}"
-    205 |+t"{ham[lower + 1:, "columnname"]}"
-206 206 |
+202 | t"{ham[lower +1 :, "columnname"]}"
+203 | 
+204 | #: E203:1:13
+    - t"{ham[lower + 1  :, "columnname"]}"
+205 + t"{ham[lower + 1:, "columnname"]}"
+206 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap
index 47b03f8b73..244df047fa 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap
@@ -11,16 +11,14 @@ E204 [*] Whitespace after decorator
 16 |     print('baz')
    |
 help: Remove whitespace
-
-ℹ Safe fix
-11 11 |     print('bar')
-12 12 | 
-13 13 | # E204
-14    |-@ foo
-   14 |+@foo
-15 15 | def baz():
-16 16 |     print('baz')
-17 17 | 
+11 |     print('bar')
+12 | 
+13 | # E204
+   - @ foo
+14 + @foo
+15 | def baz():
+16 |     print('baz')
+17 | 
 
 E204 [*] Whitespace after decorator
   --> E204.py:25:6
@@ -32,16 +30,14 @@ E204 [*] Whitespace after decorator
 27 |         print('baz')
    |
 help: Remove whitespace
-
-ℹ Safe fix
-22 22 |         print('bar')
-23 23 | 
-24 24 |     # E204
-25    |-    @ foo
-   25 |+    @foo
-26 26 |     def baz(self):
-27 27 |         print('baz')
-28 28 | 
+22 |         print('bar')
+23 | 
+24 |     # E204
+   -     @ foo
+25 +     @foo
+26 |     def baz(self):
+27 |         print('baz')
+28 | 
 
 E204 [*] Whitespace after decorator
   --> E204.py:31:2
@@ -53,13 +49,11 @@ E204 [*] Whitespace after decorator
 33 | def baz():
    |
 help: Remove whitespace
-
-ℹ Safe fix
-28 28 | 
-29 29 | 
-30 30 | # E204
-31    |-@ \
-32    |-foo
-   31 |+@foo
-33 32 | def baz():
-34 33 |     print('baz')
+28 | 
+29 | 
+30 | # E204
+   - @ \
+   - foo
+31 + @foo
+32 | def baz():
+33 |     print('baz')
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap
index c9307277cb..ca3b6c94c2 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap
@@ -11,14 +11,12 @@ E211 [*] Whitespace before '('
 4 | dict ['key'] = list [index]
   |
 help: Removed whitespace before '('
-
-ℹ Safe fix
-1 1 | #: E211
-2   |-spam (1)
-  2 |+spam(1)
-3 3 | #: E211 E211
-4 4 | dict ['key'] = list [index]
-5 5 | #: E211
+1 | #: E211
+  - spam (1)
+2 + spam(1)
+3 | #: E211 E211
+4 | dict ['key'] = list [index]
+5 | #: E211
 
 E211 [*] Whitespace before '['
  --> E21.py:4:5
@@ -31,16 +29,14 @@ E211 [*] Whitespace before '['
 6 | dict['key'] ['subkey'] = list[index]
   |
 help: Removed whitespace before '['
-
-ℹ Safe fix
-1 1 | #: E211
-2 2 | spam (1)
-3 3 | #: E211 E211
-4   |-dict ['key'] = list [index]
-  4 |+dict['key'] = list [index]
-5 5 | #: E211
-6 6 | dict['key'] ['subkey'] = list[index]
-7 7 | #: Okay
+1 | #: E211
+2 | spam (1)
+3 | #: E211 E211
+  - dict ['key'] = list [index]
+4 + dict['key'] = list [index]
+5 | #: E211
+6 | dict['key'] ['subkey'] = list[index]
+7 | #: Okay
 
 E211 [*] Whitespace before '['
  --> E21.py:4:20
@@ -53,16 +49,14 @@ E211 [*] Whitespace before '['
 6 | dict['key'] ['subkey'] = list[index]
   |
 help: Removed whitespace before '['
-
-ℹ Safe fix
-1 1 | #: E211
-2 2 | spam (1)
-3 3 | #: E211 E211
-4   |-dict ['key'] = list [index]
-  4 |+dict ['key'] = list[index]
-5 5 | #: E211
-6 6 | dict['key'] ['subkey'] = list[index]
-7 7 | #: Okay
+1 | #: E211
+2 | spam (1)
+3 | #: E211 E211
+  - dict ['key'] = list [index]
+4 + dict ['key'] = list[index]
+5 | #: E211
+6 | dict['key'] ['subkey'] = list[index]
+7 | #: Okay
 
 E211 [*] Whitespace before '['
  --> E21.py:6:12
@@ -75,16 +69,14 @@ E211 [*] Whitespace before '['
 8 | spam(1)
   |
 help: Removed whitespace before '['
-
-ℹ Safe fix
-3 3 | #: E211 E211
-4 4 | dict ['key'] = list [index]
-5 5 | #: E211
-6   |-dict['key'] ['subkey'] = list[index]
-  6 |+dict['key']['subkey'] = list[index]
-7 7 | #: Okay
-8 8 | spam(1)
-9 9 | dict['key'] = list[index]
+3 | #: E211 E211
+4 | dict ['key'] = list [index]
+5 | #: E211
+  - dict['key'] ['subkey'] = list[index]
+6 + dict['key']['subkey'] = list[index]
+7 | #: Okay
+8 | spam(1)
+9 | dict['key'] = list[index]
 
 E211 [*] Whitespace before '('
   --> E21.py:17:15
@@ -94,16 +86,14 @@ E211 [*] Whitespace before '('
 18 |     """Fetch name from --person-name in sys.argv.
    |
 help: Removed whitespace before '('
-
-ℹ Safe fix
-14 14 |     pass
-15 15 | 
-16 16 | 
-17    |-def fetch_name () -> Union[str, None]:
-   17 |+def fetch_name() -> Union[str, None]:
-18 18 |     """Fetch name from --person-name in sys.argv.
-19 19 | 
-20 20 |    Returns:
+14 |     pass
+15 | 
+16 | 
+   - def fetch_name () -> Union[str, None]:
+17 + def fetch_name() -> Union[str, None]:
+18 |     """Fetch name from --person-name in sys.argv.
+19 | 
+20 |    Returns:
 
 E211 [*] Whitespace before '('
   --> E21.py:27:19
@@ -116,16 +106,14 @@ E211 [*] Whitespace before '('
 29 |             return sys.argv[i + 1]
    |
 help: Removed whitespace before '('
-
-ℹ Safe fix
-24 24 |     Logger.info(test)
-25 25 |     # test commented code
-26 26 |     # Logger.info("test code")
-27    |-    for i in range (0, len (sys.argv)) :
-   27 |+    for i in range(0, len (sys.argv)) :
-28 28 |         if sys.argv[i] == "--name" :
-29 29 |             return sys.argv[i + 1]
-30 30 |     return None
+24 |     Logger.info(test)
+25 |     # test commented code
+26 |     # Logger.info("test code")
+   -     for i in range (0, len (sys.argv)) :
+27 +     for i in range(0, len (sys.argv)) :
+28 |         if sys.argv[i] == "--name" :
+29 |             return sys.argv[i + 1]
+30 |     return None
 
 E211 [*] Whitespace before '('
   --> E21.py:27:27
@@ -138,13 +126,11 @@ E211 [*] Whitespace before '('
 29 |             return sys.argv[i + 1]
    |
 help: Removed whitespace before '('
-
-ℹ Safe fix
-24 24 |     Logger.info(test)
-25 25 |     # test commented code
-26 26 |     # Logger.info("test code")
-27    |-    for i in range (0, len (sys.argv)) :
-   27 |+    for i in range (0, len(sys.argv)) :
-28 28 |         if sys.argv[i] == "--name" :
-29 29 |             return sys.argv[i + 1]
-30 30 |     return None
+24 |     Logger.info(test)
+25 |     # test commented code
+26 |     # Logger.info("test code")
+   -     for i in range (0, len (sys.argv)) :
+27 +     for i in range (0, len(sys.argv)) :
+28 |         if sys.argv[i] == "--name" :
+29 |             return sys.argv[i + 1]
+30 |     return None
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap
index b8afef65c3..8dbc7c2b9a 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap
@@ -12,15 +12,13 @@ E221 [*] Multiple spaces before operator
 5 | x             = 1
   |
 help: Replace with single space
-
-ℹ Safe fix
-1 1 | #: E221
-2 2 | a = 12 + 3
-3   |-b = 4  + 5
-  3 |+b = 4 + 5
-4 4 | #: E221 E221
-5 5 | x             = 1
-6 6 | y             = 2
+1 | #: E221
+2 | a = 12 + 3
+  - b = 4  + 5
+3 + b = 4 + 5
+4 | #: E221 E221
+5 | x             = 1
+6 | y             = 2
 
 E221 [*] Multiple spaces before operator
  --> E22.py:5:2
@@ -33,16 +31,14 @@ E221 [*] Multiple spaces before operator
 7 | long_variable = 3
   |
 help: Replace with single space
-
-ℹ Safe fix
-2 2 | a = 12 + 3
-3 3 | b = 4  + 5
-4 4 | #: E221 E221
-5   |-x             = 1
-  5 |+x = 1
-6 6 | y             = 2
-7 7 | long_variable = 3
-8 8 | #: E221 E221
+2 | a = 12 + 3
+3 | b = 4  + 5
+4 | #: E221 E221
+  - x             = 1
+5 + x = 1
+6 | y             = 2
+7 | long_variable = 3
+8 | #: E221 E221
 
 E221 [*] Multiple spaces before operator
  --> E22.py:6:2
@@ -55,16 +51,14 @@ E221 [*] Multiple spaces before operator
 8 | #: E221 E221
   |
 help: Replace with single space
-
-ℹ Safe fix
-3 3 | b = 4  + 5
-4 4 | #: E221 E221
-5 5 | x             = 1
-6   |-y             = 2
-  6 |+y = 2
-7 7 | long_variable = 3
-8 8 | #: E221 E221
-9 9 | x[0]          = 1
+3 | b = 4  + 5
+4 | #: E221 E221
+5 | x             = 1
+  - y             = 2
+6 + y = 2
+7 | long_variable = 3
+8 | #: E221 E221
+9 | x[0]          = 1
 
 E221 [*] Multiple spaces before operator
   --> E22.py:9:5
@@ -77,16 +71,14 @@ E221 [*] Multiple spaces before operator
 11 | long_variable = 3
    |
 help: Replace with single space
-
-ℹ Safe fix
-6  6  | y             = 2
-7  7  | long_variable = 3
-8  8  | #: E221 E221
-9     |-x[0]          = 1
-   9  |+x[0] = 1
-10 10 | x[1]          = 2
-11 11 | long_variable = 3
-12 12 | #: E221 E221
+6  | y             = 2
+7  | long_variable = 3
+8  | #: E221 E221
+   - x[0]          = 1
+9  + x[0] = 1
+10 | x[1]          = 2
+11 | long_variable = 3
+12 | #: E221 E221
 
 E221 [*] Multiple spaces before operator
   --> E22.py:10:5
@@ -99,16 +91,14 @@ E221 [*] Multiple spaces before operator
 12 | #: E221 E221
    |
 help: Replace with single space
-
-ℹ Safe fix
-7  7  | long_variable = 3
-8  8  | #: E221 E221
-9  9  | x[0]          = 1
-10    |-x[1]          = 2
-   10 |+x[1] = 2
-11 11 | long_variable = 3
-12 12 | #: E221 E221
-13 13 | x = f(x)          + 1
+7  | long_variable = 3
+8  | #: E221 E221
+9  | x[0]          = 1
+   - x[1]          = 2
+10 + x[1] = 2
+11 | long_variable = 3
+12 | #: E221 E221
+13 | x = f(x)          + 1
 
 E221 [*] Multiple spaces before operator
   --> E22.py:13:9
@@ -121,16 +111,14 @@ E221 [*] Multiple spaces before operator
 15 | z = x[0]          + 3
    |
 help: Replace with single space
-
-ℹ Safe fix
-10 10 | x[1]          = 2
-11 11 | long_variable = 3
-12 12 | #: E221 E221
-13    |-x = f(x)          + 1
-   13 |+x = f(x) + 1
-14 14 | y = long_variable + 2
-15 15 | z = x[0]          + 3
-16 16 | #: E221:3:14
+10 | x[1]          = 2
+11 | long_variable = 3
+12 | #: E221 E221
+   - x = f(x)          + 1
+13 + x = f(x) + 1
+14 | y = long_variable + 2
+15 | z = x[0]          + 3
+16 | #: E221:3:14
 
 E221 [*] Multiple spaces before operator
   --> E22.py:15:9
@@ -143,16 +131,14 @@ E221 [*] Multiple spaces before operator
 17 | text = """
    |
 help: Replace with single space
-
-ℹ Safe fix
-12 12 | #: E221 E221
-13 13 | x = f(x)          + 1
-14 14 | y = long_variable + 2
-15    |-z = x[0]          + 3
-   15 |+z = x[0] + 3
-16 16 | #: E221:3:14
-17 17 | text = """
-18 18 |     bar
+12 | #: E221 E221
+13 | x = f(x)          + 1
+14 | y = long_variable + 2
+   - z = x[0]          + 3
+15 + z = x[0] + 3
+16 | #: E221:3:14
+17 | text = """
+18 |     bar
 
 E221 [*] Multiple spaces before operator
   --> E22.py:19:14
@@ -165,16 +151,14 @@ E221 [*] Multiple spaces before operator
 21 | x = 1
    |
 help: Replace with single space
-
-ℹ Safe fix
-16 16 | #: E221:3:14
-17 17 | text = """
-18 18 |     bar
-19    |-    foo %s"""  % rofl
-   19 |+    foo %s""" % rofl
-20 20 | #: Okay
-21 21 | x = 1
-22 22 | y = 2
+16 | #: E221:3:14
+17 | text = """
+18 |     bar
+   -     foo %s"""  % rofl
+19 +     foo %s""" % rofl
+20 | #: Okay
+21 | x = 1
+22 | y = 2
 
 E221 [*] Multiple spaces before operator
    --> E22.py:184:5
@@ -186,13 +170,11 @@ E221 [*] Multiple spaces before operator
 185 |     print(a)
     |
 help: Replace with single space
-
-ℹ Safe fix
-181 181 |     pass
-182 182 | #:
-183 183 | 
-184     |-if a  ==  1:
-    184 |+if a ==  1:
-185 185 |     print(a)
-186 186 | 
-187 187 |
+181 |     pass
+182 | #:
+183 | 
+    - if a  ==  1:
+184 + if a ==  1:
+185 |     print(a)
+186 | 
+187 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap
index c3fa3fd64c..199fa5eb51 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap
@@ -11,16 +11,14 @@ E222 [*] Multiple spaces after operator
 30 | #: E222 E222
    |
 help: Replace with single space
-
-ℹ Safe fix
-25 25 | 
-26 26 | 
-27 27 | #: E222
-28    |-a = a +  1
-   28 |+a = a + 1
-29 29 | b = b + 10
-30 30 | #: E222 E222
-31 31 | x =            -1
+25 | 
+26 | 
+27 | #: E222
+   - a = a +  1
+28 + a = a + 1
+29 | b = b + 10
+30 | #: E222 E222
+31 | x =            -1
 
 E222 [*] Multiple spaces after operator
   --> E22.py:31:4
@@ -33,16 +31,14 @@ E222 [*] Multiple spaces after operator
 33 | long_variable = 3
    |
 help: Replace with single space
-
-ℹ Safe fix
-28 28 | a = a +  1
-29 29 | b = b + 10
-30 30 | #: E222 E222
-31    |-x =            -1
-   31 |+x = -1
-32 32 | y =            -2
-33 33 | long_variable = 3
-34 34 | #: E222 E222
+28 | a = a +  1
+29 | b = b + 10
+30 | #: E222 E222
+   - x =            -1
+31 + x = -1
+32 | y =            -2
+33 | long_variable = 3
+34 | #: E222 E222
 
 E222 [*] Multiple spaces after operator
   --> E22.py:32:4
@@ -55,16 +51,14 @@ E222 [*] Multiple spaces after operator
 34 | #: E222 E222
    |
 help: Replace with single space
-
-ℹ Safe fix
-29 29 | b = b + 10
-30 30 | #: E222 E222
-31 31 | x =            -1
-32    |-y =            -2
-   32 |+y = -2
-33 33 | long_variable = 3
-34 34 | #: E222 E222
-35 35 | x[0] =          1
+29 | b = b + 10
+30 | #: E222 E222
+31 | x =            -1
+   - y =            -2
+32 + y = -2
+33 | long_variable = 3
+34 | #: E222 E222
+35 | x[0] =          1
 
 E222 [*] Multiple spaces after operator
   --> E22.py:35:7
@@ -77,16 +71,14 @@ E222 [*] Multiple spaces after operator
 37 | long_variable = 3
    |
 help: Replace with single space
-
-ℹ Safe fix
-32 32 | y =            -2
-33 33 | long_variable = 3
-34 34 | #: E222 E222
-35    |-x[0] =          1
-   35 |+x[0] = 1
-36 36 | x[1] =          2
-37 37 | long_variable = 3
-38 38 | #:
+32 | y =            -2
+33 | long_variable = 3
+34 | #: E222 E222
+   - x[0] =          1
+35 + x[0] = 1
+36 | x[1] =          2
+37 | long_variable = 3
+38 | #:
 
 E222 [*] Multiple spaces after operator
   --> E22.py:36:7
@@ -99,16 +91,14 @@ E222 [*] Multiple spaces after operator
 38 | #:
    |
 help: Replace with single space
-
-ℹ Safe fix
-33 33 | long_variable = 3
-34 34 | #: E222 E222
-35 35 | x[0] =          1
-36    |-x[1] =          2
-   36 |+x[1] = 2
-37 37 | long_variable = 3
-38 38 | #:
-39 39 | 
+33 | long_variable = 3
+34 | #: E222 E222
+35 | x[0] =          1
+   - x[1] =          2
+36 + x[1] = 2
+37 | long_variable = 3
+38 | #:
+39 | 
 
 E222 [*] Multiple spaces after operator
    --> E22.py:184:9
@@ -120,13 +110,11 @@ E222 [*] Multiple spaces after operator
 185 |     print(a)
     |
 help: Replace with single space
-
-ℹ Safe fix
-181 181 |     pass
-182 182 | #:
-183 183 | 
-184     |-if a  ==  1:
-    184 |+if a  == 1:
-185 185 |     print(a)
-186 186 | 
-187 187 |
+181 |     pass
+182 | #:
+183 | 
+    - if a  ==  1:
+184 + if a  == 1:
+185 |     print(a)
+186 | 
+187 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap
index b8b17d0a49..7fc6679f49 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap
@@ -11,13 +11,11 @@ E223 [*] Tab before operator
 44 | #:
    |
 help: Replace with single space
-
-ℹ Safe fix
-40 40 | 
-41 41 | #: E223
-42 42 | foobart = 4
-43    |-a	= 3  # aligned with tab
-   43 |+a = 3  # aligned with tab
-44 44 | #:
-45 45 | 
-46 46 |
+40 | 
+41 | #: E223
+42 | foobart = 4
+   - a	= 3  # aligned with tab
+43 + a = 3  # aligned with tab
+44 | #:
+45 | 
+46 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap
index d5af8158a4..73cadde88f 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap
@@ -11,13 +11,11 @@ E224 [*] Tab after operator
 50 | #:
    |
 help: Replace with single space
-
-ℹ Safe fix
-45 45 | 
-46 46 | 
-47 47 | #: E224
-48    |-a +=	1
-   48 |+a += 1
-49 49 | b += 1000
-50 50 | #:
-51 51 |
+45 | 
+46 | 
+47 | #: E224
+   - a +=	1
+48 + a += 1
+49 | b += 1000
+50 | #:
+51 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap
index 5c9f55037a..990faba8fc 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap
@@ -11,16 +11,14 @@ E225 [*] Missing whitespace around operator
 56 | submitted+= 1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-51 51 | 
-52 52 | 
-53 53 | #: E225
-54    |-submitted +=1
-   54 |+submitted += 1
-55 55 | #: E225
-56 56 | submitted+= 1
-57 57 | #: E225
+51 | 
+52 | 
+53 | #: E225
+   - submitted +=1
+54 + submitted += 1
+55 | #: E225
+56 | submitted+= 1
+57 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:56:10
@@ -33,16 +31,14 @@ E225 [*] Missing whitespace around operator
 58 | c =-1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-53 53 | #: E225
-54 54 | submitted +=1
-55 55 | #: E225
-56    |-submitted+= 1
-   56 |+submitted += 1
-57 57 | #: E225
-58 58 | c =-1
-59 59 | #: E225
+53 | #: E225
+54 | submitted +=1
+55 | #: E225
+   - submitted+= 1
+56 + submitted += 1
+57 | #: E225
+58 | c =-1
+59 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:58:3
@@ -55,16 +51,14 @@ E225 [*] Missing whitespace around operator
 60 | x = x /2 - 1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-55 55 | #: E225
-56 56 | submitted+= 1
-57 57 | #: E225
-58    |-c =-1
-   58 |+c = -1
-59 59 | #: E225
-60 60 | x = x /2 - 1
-61 61 | #: E225
+55 | #: E225
+56 | submitted+= 1
+57 | #: E225
+   - c =-1
+58 + c = -1
+59 | #: E225
+60 | x = x /2 - 1
+61 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:76:2
@@ -77,16 +71,14 @@ E225 [*] Missing whitespace around operator
 78 | i=i +1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-73 73 | #: E225
-74 74 | _1kB = _1MB>> 10
-75 75 | #: E225 E225
-76    |-i=i+ 1
-   76 |+i = i+ 1
-77 77 | #: E225 E225
-78 78 | i=i +1
-79 79 | #: E225
+73 | #: E225
+74 | _1kB = _1MB>> 10
+75 | #: E225 E225
+   - i=i+ 1
+76 + i = i+ 1
+77 | #: E225 E225
+78 | i=i +1
+79 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:78:2
@@ -99,16 +91,14 @@ E225 [*] Missing whitespace around operator
 80 | i = 1and 1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-75 75 | #: E225 E225
-76 76 | i=i+ 1
-77 77 | #: E225 E225
-78    |-i=i +1
-   78 |+i = i +1
-79 79 | #: E225
-80 80 | i = 1and 1
-81 81 | #: E225
+75 | #: E225 E225
+76 | i=i+ 1
+77 | #: E225 E225
+   - i=i +1
+78 + i = i +1
+79 | #: E225
+80 | i = 1and 1
+81 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:80:6
@@ -121,16 +111,14 @@ E225 [*] Missing whitespace around operator
 82 | i = 1or 0
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-77 77 | #: E225 E225
-78 78 | i=i +1
-79 79 | #: E225
-80    |-i = 1and 1
-   80 |+i = 1 and 1
-81 81 | #: E225
-82 82 | i = 1or 0
-83 83 | #: E225
+77 | #: E225 E225
+78 | i=i +1
+79 | #: E225
+   - i = 1and 1
+80 + i = 1 and 1
+81 | #: E225
+82 | i = 1or 0
+83 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:82:6
@@ -143,16 +131,14 @@ E225 [*] Missing whitespace around operator
 84 | 1is 1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-79 79 | #: E225
-80 80 | i = 1and 1
-81 81 | #: E225
-82    |-i = 1or 0
-   82 |+i = 1 or 0
-83 83 | #: E225
-84 84 | 1is 1
-85 85 | #: E225
+79 | #: E225
+80 | i = 1and 1
+81 | #: E225
+   - i = 1or 0
+82 + i = 1 or 0
+83 | #: E225
+84 | 1is 1
+85 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:84:2
@@ -165,16 +151,14 @@ E225 [*] Missing whitespace around operator
 86 | 1in []
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-81 81 | #: E225
-82 82 | i = 1or 0
-83 83 | #: E225
-84    |-1is 1
-   84 |+1 is 1
-85 85 | #: E225
-86 86 | 1in []
-87 87 | #: E225
+81 | #: E225
+82 | i = 1or 0
+83 | #: E225
+   - 1is 1
+84 + 1 is 1
+85 | #: E225
+86 | 1in []
+87 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:86:2
@@ -187,16 +171,14 @@ E225 [*] Missing whitespace around operator
 88 | i = 1 @2
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-83 83 | #: E225
-84 84 | 1is 1
-85 85 | #: E225
-86    |-1in []
-   86 |+1 in []
-87 87 | #: E225
-88 88 | i = 1 @2
-89 89 | #: E225
+83 | #: E225
+84 | 1is 1
+85 | #: E225
+   - 1in []
+86 + 1 in []
+87 | #: E225
+88 | i = 1 @2
+89 | #: E225
 
 E225 [*] Missing whitespace around operator
   --> E22.py:92:2
@@ -209,16 +191,14 @@ E225 [*] Missing whitespace around operator
 94 | i =i+1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-89 89 | #: E225
-90 90 | i = 1@ 2
-91 91 | #: E225 E226
-92    |-i=i+1
-   92 |+i = i+1
-93 93 | #: E225 E226
-94 94 | i =i+1
-95 95 | #: E225 E226
+89 | #: E225
+90 | i = 1@ 2
+91 | #: E225 E226
+   - i=i+1
+92 + i = i+1
+93 | #: E225 E226
+94 | i =i+1
+95 | #: E225 E226
 
 E225 [*] Missing whitespace around operator
   --> E22.py:94:3
@@ -231,16 +211,14 @@ E225 [*] Missing whitespace around operator
 96 | i= i+1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-91 91 | #: E225 E226
-92 92 | i=i+1
-93 93 | #: E225 E226
-94    |-i =i+1
-   94 |+i = i+1
-95 95 | #: E225 E226
-96 96 | i= i+1
-97 97 | #: E225 E226
+91 | #: E225 E226
+92 | i=i+1
+93 | #: E225 E226
+   - i =i+1
+94 + i = i+1
+95 | #: E225 E226
+96 | i= i+1
+97 | #: E225 E226
 
 E225 [*] Missing whitespace around operator
   --> E22.py:96:2
@@ -253,13 +231,11 @@ E225 [*] Missing whitespace around operator
 98 | c = (a +b)*(a - b)
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-93 93 | #: E225 E226
-94 94 | i =i+1
-95 95 | #: E225 E226
-96    |-i= i+1
-   96 |+i = i+1
-97 97 | #: E225 E226
-98 98 | c = (a +b)*(a - b)
-99 99 | #: E225 E226
+93 | #: E225 E226
+94 | i =i+1
+95 | #: E225 E226
+   - i= i+1
+96 + i = i+1
+97 | #: E225 E226
+98 | c = (a +b)*(a - b)
+99 | #: E225 E226
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap
index 3545f910f4..40f64a0f0c 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap
@@ -12,16 +12,14 @@ E226 [*] Missing whitespace around arithmetic operator
 62 | c = alpha -4
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-57 57 | #: E225
-58 58 | c =-1
-59 59 | #: E225
-60    |-x = x /2 - 1
-   60 |+x = x / 2 - 1
-61 61 | #: E225
-62 62 | c = alpha -4
-63 63 | #: E225
+57 | #: E225
+58 | c =-1
+59 | #: E225
+   - x = x /2 - 1
+60 + x = x / 2 - 1
+61 | #: E225
+62 | c = alpha -4
+63 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:62:11
@@ -34,16 +32,14 @@ E226 [*] Missing whitespace around arithmetic operator
 64 | c = alpha- 4
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-59 59 | #: E225
-60 60 | x = x /2 - 1
-61 61 | #: E225
-62    |-c = alpha -4
-   62 |+c = alpha - 4
-63 63 | #: E225
-64 64 | c = alpha- 4
-65 65 | #: E225
+59 | #: E225
+60 | x = x /2 - 1
+61 | #: E225
+   - c = alpha -4
+62 + c = alpha - 4
+63 | #: E225
+64 | c = alpha- 4
+65 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:64:10
@@ -56,16 +52,14 @@ E226 [*] Missing whitespace around arithmetic operator
 66 | z = x **y
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | #: E225
-62 62 | c = alpha -4
-63 63 | #: E225
-64    |-c = alpha- 4
-   64 |+c = alpha - 4
-65 65 | #: E225
-66 66 | z = x **y
-67 67 | #: E225
+61 | #: E225
+62 | c = alpha -4
+63 | #: E225
+   - c = alpha- 4
+64 + c = alpha - 4
+65 | #: E225
+66 | z = x **y
+67 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:66:7
@@ -78,16 +72,14 @@ E226 [*] Missing whitespace around arithmetic operator
 68 | z = (x + 1) **y
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-63 63 | #: E225
-64 64 | c = alpha- 4
-65 65 | #: E225
-66    |-z = x **y
-   66 |+z = x ** y
-67 67 | #: E225
-68 68 | z = (x + 1) **y
-69 69 | #: E225
+63 | #: E225
+64 | c = alpha- 4
+65 | #: E225
+   - z = x **y
+66 + z = x ** y
+67 | #: E225
+68 | z = (x + 1) **y
+69 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:68:13
@@ -100,16 +92,14 @@ E226 [*] Missing whitespace around arithmetic operator
 70 | z = (x + 1)** y
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-65 65 | #: E225
-66 66 | z = x **y
-67 67 | #: E225
-68    |-z = (x + 1) **y
-   68 |+z = (x + 1) ** y
-69 69 | #: E225
-70 70 | z = (x + 1)** y
-71 71 | #: E225
+65 | #: E225
+66 | z = x **y
+67 | #: E225
+   - z = (x + 1) **y
+68 + z = (x + 1) ** y
+69 | #: E225
+70 | z = (x + 1)** y
+71 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:70:12
@@ -122,16 +112,14 @@ E226 [*] Missing whitespace around arithmetic operator
 72 | _1kB = _1MB >>10
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-67 67 | #: E225
-68 68 | z = (x + 1) **y
-69 69 | #: E225
-70    |-z = (x + 1)** y
-   70 |+z = (x + 1) ** y
-71 71 | #: E225
-72 72 | _1kB = _1MB >>10
-73 73 | #: E225
+67 | #: E225
+68 | z = (x + 1) **y
+69 | #: E225
+   - z = (x + 1)** y
+70 + z = (x + 1) ** y
+71 | #: E225
+72 | _1kB = _1MB >>10
+73 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:76:4
@@ -144,16 +132,14 @@ E226 [*] Missing whitespace around arithmetic operator
 78 | i=i +1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-73 73 | #: E225
-74 74 | _1kB = _1MB>> 10
-75 75 | #: E225 E225
-76    |-i=i+ 1
-   76 |+i=i + 1
-77 77 | #: E225 E225
-78 78 | i=i +1
-79 79 | #: E225
+73 | #: E225
+74 | _1kB = _1MB>> 10
+75 | #: E225 E225
+   - i=i+ 1
+76 + i=i + 1
+77 | #: E225 E225
+78 | i=i +1
+79 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:78:5
@@ -166,16 +152,14 @@ E226 [*] Missing whitespace around arithmetic operator
 80 | i = 1and 1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-75 75 | #: E225 E225
-76 76 | i=i+ 1
-77 77 | #: E225 E225
-78    |-i=i +1
-   78 |+i=i + 1
-79 79 | #: E225
-80 80 | i = 1and 1
-81 81 | #: E225
+75 | #: E225 E225
+76 | i=i+ 1
+77 | #: E225 E225
+   - i=i +1
+78 + i=i + 1
+79 | #: E225
+80 | i = 1and 1
+81 | #: E225
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:88:7
@@ -188,16 +172,14 @@ E226 [*] Missing whitespace around arithmetic operator
 90 | i = 1@ 2
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-85 85 | #: E225
-86 86 | 1in []
-87 87 | #: E225
-88    |-i = 1 @2
-   88 |+i = 1 @ 2
-89 89 | #: E225
-90 90 | i = 1@ 2
-91 91 | #: E225 E226
+85 | #: E225
+86 | 1in []
+87 | #: E225
+   - i = 1 @2
+88 + i = 1 @ 2
+89 | #: E225
+90 | i = 1@ 2
+91 | #: E225 E226
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:90:6
@@ -210,16 +192,14 @@ E226 [*] Missing whitespace around arithmetic operator
 92 | i=i+1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-87 87 | #: E225
-88 88 | i = 1 @2
-89 89 | #: E225
-90    |-i = 1@ 2
-   90 |+i = 1 @ 2
-91 91 | #: E225 E226
-92 92 | i=i+1
-93 93 | #: E225 E226
+87 | #: E225
+88 | i = 1 @2
+89 | #: E225
+   - i = 1@ 2
+90 + i = 1 @ 2
+91 | #: E225 E226
+92 | i=i+1
+93 | #: E225 E226
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:92:4
@@ -232,16 +212,14 @@ E226 [*] Missing whitespace around arithmetic operator
 94 | i =i+1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-89 89 | #: E225
-90 90 | i = 1@ 2
-91 91 | #: E225 E226
-92    |-i=i+1
-   92 |+i=i + 1
-93 93 | #: E225 E226
-94 94 | i =i+1
-95 95 | #: E225 E226
+89 | #: E225
+90 | i = 1@ 2
+91 | #: E225 E226
+   - i=i+1
+92 + i=i + 1
+93 | #: E225 E226
+94 | i =i+1
+95 | #: E225 E226
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:94:5
@@ -254,16 +232,14 @@ E226 [*] Missing whitespace around arithmetic operator
 96 | i= i+1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-91 91 | #: E225 E226
-92 92 | i=i+1
-93 93 | #: E225 E226
-94    |-i =i+1
-   94 |+i =i + 1
-95 95 | #: E225 E226
-96 96 | i= i+1
-97 97 | #: E225 E226
+91 | #: E225 E226
+92 | i=i+1
+93 | #: E225 E226
+   - i =i+1
+94 + i =i + 1
+95 | #: E225 E226
+96 | i= i+1
+97 | #: E225 E226
 
 E226 [*] Missing whitespace around arithmetic operator
   --> E22.py:96:5
@@ -276,16 +252,14 @@ E226 [*] Missing whitespace around arithmetic operator
 98 | c = (a +b)*(a - b)
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-93 93 | #: E225 E226
-94 94 | i =i+1
-95 95 | #: E225 E226
-96    |-i= i+1
-   96 |+i= i + 1
-97 97 | #: E225 E226
-98 98 | c = (a +b)*(a - b)
-99 99 | #: E225 E226
+93 | #: E225 E226
+94 | i =i+1
+95 | #: E225 E226
+   - i= i+1
+96 + i= i + 1
+97 | #: E225 E226
+98 | c = (a +b)*(a - b)
+99 | #: E225 E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:98:8
@@ -298,16 +272,14 @@ E226 [*] Missing whitespace around arithmetic operator
 100 | c = (a+ b)*(a - b)
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-95 95 | #: E225 E226
-96 96 | i= i+1
-97 97 | #: E225 E226
-98    |-c = (a +b)*(a - b)
-   98 |+c = (a + b)*(a - b)
-99 99 | #: E225 E226
-100 100 | c = (a+ b)*(a - b)
-101 101 | #:
+95  | #: E225 E226
+96  | i= i+1
+97  | #: E225 E226
+    - c = (a +b)*(a - b)
+98  + c = (a + b)*(a - b)
+99  | #: E225 E226
+100 | c = (a+ b)*(a - b)
+101 | #:
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:98:11
@@ -320,16 +292,14 @@ E226 [*] Missing whitespace around arithmetic operator
 100 | c = (a+ b)*(a - b)
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-95 95 | #: E225 E226
-96 96 | i= i+1
-97 97 | #: E225 E226
-98    |-c = (a +b)*(a - b)
-   98 |+c = (a +b) * (a - b)
-99 99 | #: E225 E226
-100 100 | c = (a+ b)*(a - b)
-101 101 | #:
+95  | #: E225 E226
+96  | i= i+1
+97  | #: E225 E226
+    - c = (a +b)*(a - b)
+98  + c = (a +b) * (a - b)
+99  | #: E225 E226
+100 | c = (a+ b)*(a - b)
+101 | #:
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:100:7
@@ -341,16 +311,14 @@ E226 [*] Missing whitespace around arithmetic operator
 101 | #:
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-97  97  | #: E225 E226
-98  98  | c = (a +b)*(a - b)
-99  99  | #: E225 E226
-100     |-c = (a+ b)*(a - b)
-    100 |+c = (a + b)*(a - b)
-101 101 | #:
-102 102 | 
-103 103 | #: E226
+97  | #: E225 E226
+98  | c = (a +b)*(a - b)
+99  | #: E225 E226
+    - c = (a+ b)*(a - b)
+100 + c = (a + b)*(a - b)
+101 | #:
+102 | 
+103 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:100:11
@@ -362,16 +330,14 @@ E226 [*] Missing whitespace around arithmetic operator
 101 | #:
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-97  97  | #: E225 E226
-98  98  | c = (a +b)*(a - b)
-99  99  | #: E225 E226
-100     |-c = (a+ b)*(a - b)
-    100 |+c = (a+ b) * (a - b)
-101 101 | #:
-102 102 | 
-103 103 | #: E226
+97  | #: E225 E226
+98  | c = (a +b)*(a - b)
+99  | #: E225 E226
+    - c = (a+ b)*(a - b)
+100 + c = (a+ b) * (a - b)
+101 | #:
+102 | 
+103 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:104:6
@@ -383,16 +349,14 @@ E226 [*] Missing whitespace around arithmetic operator
 106 | c = (a+b) * (a-b)
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-101 101 | #:
-102 102 | 
-103 103 | #: E226
-104     |-z = 2//30
-    104 |+z = 2 // 30
-105 105 | #: E226 E226
-106 106 | c = (a+b) * (a-b)
-107 107 | #: E226
+101 | #:
+102 | 
+103 | #: E226
+    - z = 2//30
+104 + z = 2 // 30
+105 | #: E226 E226
+106 | c = (a+b) * (a-b)
+107 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:106:7
@@ -405,16 +369,14 @@ E226 [*] Missing whitespace around arithmetic operator
 108 | norman = True+False
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-103 103 | #: E226
-104 104 | z = 2//30
-105 105 | #: E226 E226
-106     |-c = (a+b) * (a-b)
-    106 |+c = (a + b) * (a-b)
-107 107 | #: E226
-108 108 | norman = True+False
-109 109 | #: E226
+103 | #: E226
+104 | z = 2//30
+105 | #: E226 E226
+    - c = (a+b) * (a-b)
+106 + c = (a + b) * (a-b)
+107 | #: E226
+108 | norman = True+False
+109 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:106:15
@@ -427,16 +389,14 @@ E226 [*] Missing whitespace around arithmetic operator
 108 | norman = True+False
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-103 103 | #: E226
-104 104 | z = 2//30
-105 105 | #: E226 E226
-106     |-c = (a+b) * (a-b)
-    106 |+c = (a+b) * (a - b)
-107 107 | #: E226
-108 108 | norman = True+False
-109 109 | #: E226
+103 | #: E226
+104 | z = 2//30
+105 | #: E226 E226
+    - c = (a+b) * (a-b)
+106 + c = (a+b) * (a - b)
+107 | #: E226
+108 | norman = True+False
+109 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:110:6
@@ -449,16 +409,14 @@ E226 [*] Missing whitespace around arithmetic operator
 112 | x = x/2 - 1
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-107 107 | #: E226
-108 108 | norman = True+False
-109 109 | #: E226
-110     |-x = x*2 - 1
-    110 |+x = x * 2 - 1
-111 111 | #: E226
-112 112 | x = x/2 - 1
-113 113 | #: E226 E226
+107 | #: E226
+108 | norman = True+False
+109 | #: E226
+    - x = x*2 - 1
+110 + x = x * 2 - 1
+111 | #: E226
+112 | x = x/2 - 1
+113 | #: E226 E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:112:6
@@ -471,16 +429,14 @@ E226 [*] Missing whitespace around arithmetic operator
 114 | hypot2 = x*x + y*y
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-109 109 | #: E226
-110 110 | x = x*2 - 1
-111 111 | #: E226
-112     |-x = x/2 - 1
-    112 |+x = x / 2 - 1
-113 113 | #: E226 E226
-114 114 | hypot2 = x*x + y*y
-115 115 | #: E226
+109 | #: E226
+110 | x = x*2 - 1
+111 | #: E226
+    - x = x/2 - 1
+112 + x = x / 2 - 1
+113 | #: E226 E226
+114 | hypot2 = x*x + y*y
+115 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:114:11
@@ -493,16 +449,14 @@ E226 [*] Missing whitespace around arithmetic operator
 116 | c = (a + b)*(a - b)
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-111 111 | #: E226
-112 112 | x = x/2 - 1
-113 113 | #: E226 E226
-114     |-hypot2 = x*x + y*y
-    114 |+hypot2 = x * x + y*y
-115 115 | #: E226
-116 116 | c = (a + b)*(a - b)
-117 117 | #: E226
+111 | #: E226
+112 | x = x/2 - 1
+113 | #: E226 E226
+    - hypot2 = x*x + y*y
+114 + hypot2 = x * x + y*y
+115 | #: E226
+116 | c = (a + b)*(a - b)
+117 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:114:17
@@ -515,16 +469,14 @@ E226 [*] Missing whitespace around arithmetic operator
 116 | c = (a + b)*(a - b)
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-111 111 | #: E226
-112 112 | x = x/2 - 1
-113 113 | #: E226 E226
-114     |-hypot2 = x*x + y*y
-    114 |+hypot2 = x*x + y * y
-115 115 | #: E226
-116 116 | c = (a + b)*(a - b)
-117 117 | #: E226
+111 | #: E226
+112 | x = x/2 - 1
+113 | #: E226 E226
+    - hypot2 = x*x + y*y
+114 + hypot2 = x*x + y * y
+115 | #: E226
+116 | c = (a + b)*(a - b)
+117 | #: E226
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:116:12
@@ -537,16 +489,14 @@ E226 [*] Missing whitespace around arithmetic operator
 118 | def halves(n):
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-113 113 | #: E226 E226
-114 114 | hypot2 = x*x + y*y
-115 115 | #: E226
-116     |-c = (a + b)*(a - b)
-    116 |+c = (a + b) * (a - b)
-117 117 | #: E226
-118 118 | def halves(n):
-119 119 |     return (i//2 for i in range(n))
+113 | #: E226 E226
+114 | hypot2 = x*x + y*y
+115 | #: E226
+    - c = (a + b)*(a - b)
+116 + c = (a + b) * (a - b)
+117 | #: E226
+118 | def halves(n):
+119 |     return (i//2 for i in range(n))
 
 E226 [*] Missing whitespace around arithmetic operator
    --> E22.py:119:14
@@ -559,13 +509,11 @@ E226 [*] Missing whitespace around arithmetic operator
 121 | _1kB = _1MB>>10
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-116 116 | c = (a + b)*(a - b)
-117 117 | #: E226
-118 118 | def halves(n):
-119     |-    return (i//2 for i in range(n))
-    119 |+    return (i // 2 for i in range(n))
-120 120 | #: E227
-121 121 | _1kB = _1MB>>10
-122 122 | #: E227
+116 | c = (a + b)*(a - b)
+117 | #: E226
+118 | def halves(n):
+    -     return (i//2 for i in range(n))
+119 +     return (i // 2 for i in range(n))
+120 | #: E227
+121 | _1kB = _1MB>>10
+122 | #: E227
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap
index da81b27486..46be0b7b6f 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap
@@ -12,16 +12,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 74 | _1kB = _1MB>> 10
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-69 69 | #: E225
-70 70 | z = (x + 1)** y
-71 71 | #: E225
-72    |-_1kB = _1MB >>10
-   72 |+_1kB = _1MB >> 10
-73 73 | #: E225
-74 74 | _1kB = _1MB>> 10
-75 75 | #: E225 E225
+69 | #: E225
+70 | z = (x + 1)** y
+71 | #: E225
+   - _1kB = _1MB >>10
+72 + _1kB = _1MB >> 10
+73 | #: E225
+74 | _1kB = _1MB>> 10
+75 | #: E225 E225
 
 E227 [*] Missing whitespace around bitwise or shift operator
   --> E22.py:74:12
@@ -34,16 +32,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 76 | i=i+ 1
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-71 71 | #: E225
-72 72 | _1kB = _1MB >>10
-73 73 | #: E225
-74    |-_1kB = _1MB>> 10
-   74 |+_1kB = _1MB >> 10
-75 75 | #: E225 E225
-76 76 | i=i+ 1
-77 77 | #: E225 E225
+71 | #: E225
+72 | _1kB = _1MB >>10
+73 | #: E225
+   - _1kB = _1MB>> 10
+74 + _1kB = _1MB >> 10
+75 | #: E225 E225
+76 | i=i+ 1
+77 | #: E225 E225
 
 E227 [*] Missing whitespace around bitwise or shift operator
    --> E22.py:121:12
@@ -56,16 +52,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 123 | _1MB = _1kB<<10
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-118 118 | def halves(n):
-119 119 |     return (i//2 for i in range(n))
-120 120 | #: E227
-121     |-_1kB = _1MB>>10
-    121 |+_1kB = _1MB >> 10
-122 122 | #: E227
-123 123 | _1MB = _1kB<<10
-124 124 | #: E227
+118 | def halves(n):
+119 |     return (i//2 for i in range(n))
+120 | #: E227
+    - _1kB = _1MB>>10
+121 + _1kB = _1MB >> 10
+122 | #: E227
+123 | _1MB = _1kB<<10
+124 | #: E227
 
 E227 [*] Missing whitespace around bitwise or shift operator
    --> E22.py:123:12
@@ -78,16 +72,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 125 | a = b|c
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-120 120 | #: E227
-121 121 | _1kB = _1MB>>10
-122 122 | #: E227
-123     |-_1MB = _1kB<<10
-    123 |+_1MB = _1kB << 10
-124 124 | #: E227
-125 125 | a = b|c
-126 126 | #: E227
+120 | #: E227
+121 | _1kB = _1MB>>10
+122 | #: E227
+    - _1MB = _1kB<<10
+123 + _1MB = _1kB << 10
+124 | #: E227
+125 | a = b|c
+126 | #: E227
 
 E227 [*] Missing whitespace around bitwise or shift operator
    --> E22.py:125:6
@@ -100,16 +92,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 127 | b = c&a
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-122 122 | #: E227
-123 123 | _1MB = _1kB<<10
-124 124 | #: E227
-125     |-a = b|c
-    125 |+a = b | c
-126 126 | #: E227
-127 127 | b = c&a
-128 128 | #: E227
+122 | #: E227
+123 | _1MB = _1kB<<10
+124 | #: E227
+    - a = b|c
+125 + a = b | c
+126 | #: E227
+127 | b = c&a
+128 | #: E227
 
 E227 [*] Missing whitespace around bitwise or shift operator
    --> E22.py:127:6
@@ -122,16 +112,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 129 | c = b^a
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-124 124 | #: E227
-125 125 | a = b|c
-126 126 | #: E227
-127     |-b = c&a
-    127 |+b = c & a
-128 128 | #: E227
-129 129 | c = b^a
-130 130 | #: E228
+124 | #: E227
+125 | a = b|c
+126 | #: E227
+    - b = c&a
+127 + b = c & a
+128 | #: E227
+129 | c = b^a
+130 | #: E228
 
 E227 [*] Missing whitespace around bitwise or shift operator
    --> E22.py:129:6
@@ -144,16 +132,14 @@ E227 [*] Missing whitespace around bitwise or shift operator
 131 | a = b%c
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-126 126 | #: E227
-127 127 | b = c&a
-128 128 | #: E227
-129     |-c = b^a
-    129 |+c = b ^ a
-130 130 | #: E228
-131 131 | a = b%c
-132 132 | #: E228
+126 | #: E227
+127 | b = c&a
+128 | #: E227
+    - c = b^a
+129 + c = b ^ a
+130 | #: E228
+131 | a = b%c
+132 | #: E228
 
 E227 [*] Missing whitespace around bitwise or shift operator
    --> E22.py:154:11
@@ -166,13 +152,11 @@ E227 [*] Missing whitespace around bitwise or shift operator
 156 | x = x / 2 - 1
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-151 151 | func1(lambda *args, **kw: (args, kw))
-152 152 | func2(lambda a, b=h[:], c=0: (a, b, c))
-153 153 | if not -5 < x < +5:
-154     |-    print >>sys.stderr, "x is out of range."
-    154 |+    print >> sys.stderr, "x is out of range."
-155 155 | print >> sys.stdout, "x is an integer."
-156 156 | x = x / 2 - 1
-157 157 | x = 1 @ 2
+151 | func1(lambda *args, **kw: (args, kw))
+152 | func2(lambda a, b=h[:], c=0: (a, b, c))
+153 | if not -5 < x < +5:
+    -     print >>sys.stderr, "x is out of range."
+154 +     print >> sys.stderr, "x is out of range."
+155 | print >> sys.stdout, "x is an integer."
+156 | x = x / 2 - 1
+157 | x = 1 @ 2
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap
index c6ee2bea2c..7361b9d036 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap
@@ -12,16 +12,14 @@ E228 [*] Missing whitespace around modulo operator
 133 | msg = fmt%(errno, errmsg)
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-128 128 | #: E227
-129 129 | c = b^a
-130 130 | #: E228
-131     |-a = b%c
-    131 |+a = b % c
-132 132 | #: E228
-133 133 | msg = fmt%(errno, errmsg)
-134 134 | #: E228
+128 | #: E227
+129 | c = b^a
+130 | #: E228
+    - a = b%c
+131 + a = b % c
+132 | #: E228
+133 | msg = fmt%(errno, errmsg)
+134 | #: E228
 
 E228 [*] Missing whitespace around modulo operator
    --> E22.py:133:10
@@ -34,16 +32,14 @@ E228 [*] Missing whitespace around modulo operator
 135 | msg = "Error %d occurred"%errno
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-130 130 | #: E228
-131 131 | a = b%c
-132 132 | #: E228
-133     |-msg = fmt%(errno, errmsg)
-    133 |+msg = fmt % (errno, errmsg)
-134 134 | #: E228
-135 135 | msg = "Error %d occurred"%errno
-136 136 | #:
+130 | #: E228
+131 | a = b%c
+132 | #: E228
+    - msg = fmt%(errno, errmsg)
+133 + msg = fmt % (errno, errmsg)
+134 | #: E228
+135 | msg = "Error %d occurred"%errno
+136 | #:
 
 E228 [*] Missing whitespace around modulo operator
    --> E22.py:135:26
@@ -55,13 +51,11 @@ E228 [*] Missing whitespace around modulo operator
 136 | #:
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-132 132 | #: E228
-133 133 | msg = fmt%(errno, errmsg)
-134 134 | #: E228
-135     |-msg = "Error %d occurred"%errno
-    135 |+msg = "Error %d occurred" % errno
-136 136 | #:
-137 137 | 
-138 138 | #: Okay
+132 | #: E228
+133 | msg = fmt%(errno, errmsg)
+134 | #: E228
+    - msg = "Error %d occurred"%errno
+135 + msg = "Error %d occurred" % errno
+136 | #:
+137 | 
+138 | #: Okay
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap
index df5b5a5502..c210a6768b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap
@@ -11,14 +11,12 @@ E231 [*] Missing whitespace after ','
 4 | a[b1,:]
   |
 help: Add missing whitespace
-
-ℹ Safe fix
-1 1 | #: E231
-2   |-a = (1,2)
-  2 |+a = (1, 2)
-3 3 | #: E231
-4 4 | a[b1,:]
-5 5 | #: E231
+1 | #: E231
+  - a = (1,2)
+2 + a = (1, 2)
+3 | #: E231
+4 | a[b1,:]
+5 | #: E231
 
 E231 [*] Missing whitespace after ','
  --> E23.py:4:5
@@ -31,16 +29,14 @@ E231 [*] Missing whitespace after ','
 6 | a = [{'a':''}]
   |
 help: Add missing whitespace
-
-ℹ Safe fix
-1 1 | #: E231
-2 2 | a = (1,2)
-3 3 | #: E231
-4   |-a[b1,:]
-  4 |+a[b1, :]
-5 5 | #: E231
-6 6 | a = [{'a':''}]
-7 7 | #: Okay
+1 | #: E231
+2 | a = (1,2)
+3 | #: E231
+  - a[b1,:]
+4 + a[b1, :]
+5 | #: E231
+6 | a = [{'a':''}]
+7 | #: Okay
 
 E231 [*] Missing whitespace after ':'
  --> E23.py:6:10
@@ -53,16 +49,14 @@ E231 [*] Missing whitespace after ':'
 8 | a = (4,)
   |
 help: Add missing whitespace
-
-ℹ Safe fix
-3 3 | #: E231
-4 4 | a[b1,:]
-5 5 | #: E231
-6   |-a = [{'a':''}]
-  6 |+a = [{'a': ''}]
-7 7 | #: Okay
-8 8 | a = (4,)
-9 9 | b = (5, )
+3 | #: E231
+4 | a[b1,:]
+5 | #: E231
+  - a = [{'a':''}]
+6 + a = [{'a': ''}]
+7 | #: Okay
+8 | a = (4,)
+9 | b = (5, )
 
 E231 [*] Missing whitespace after ','
   --> E23.py:19:10
@@ -74,16 +68,14 @@ E231 [*] Missing whitespace after ','
 20 |         pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-16 16 | 
-17 17 | def foo() -> None:
-18 18 |     #: E231
-19    |-    if (1,2):
-   19 |+    if (1, 2):
-20 20 |         pass
-21 21 | 
-22 22 | #: Okay
+16 | 
+17 | def foo() -> None:
+18 |     #: E231
+   -     if (1,2):
+19 +     if (1, 2):
+20 |         pass
+21 | 
+22 | #: Okay
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:29:20
@@ -95,16 +87,14 @@ E231 [*] Missing whitespace after ':'
 30 | }
    |
 help: Add missing whitespace
-
-ℹ Safe 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 | }
-31 31 | 
-32 32 | # E231
+26 | #: E231:2:20
+27 | mdtypes_template = {
+28 |     'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')],
+   -     'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')],
+29 +     'tag_smalldata': [('byte_count_mdtype', 'u4'), ('data', 'S4')],
+30 | }
+31 | 
+32 | # E231
 
 E231 [*] Missing whitespace after ','
   --> E23.py:33:6
@@ -116,16 +106,14 @@ E231 [*] Missing whitespace after ','
 35 | # Okay because it's hard to differentiate between the usages of a colon in a f-string
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-30 30 | }
-31 31 | 
-32 32 | # E231
-33    |-f"{(a,b)}"
-   33 |+f"{(a, b)}"
-34 34 | 
-35 35 | # Okay because it's hard to differentiate between the usages of a colon in a f-string
-36 36 | f"{a:=1}"
+30 | }
+31 | 
+32 | # E231
+   - f"{(a,b)}"
+33 + f"{(a, b)}"
+34 | 
+35 | # Okay because it's hard to differentiate between the usages of a colon in a f-string
+36 | f"{a:=1}"
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:47:37
@@ -137,16 +125,14 @@ E231 [*] Missing whitespace after ':'
 49 | #: Okay
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-44 44 | snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):]
-45 45 | 
-46 46 | #: E231
-47    |-{len(f's3://{self.s3_bucket_name}/'):1}
-   47 |+{len(f's3://{self.s3_bucket_name}/'): 1}
-48 48 | 
-49 49 | #: Okay
-50 50 | a = (1,)
+44 | snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):]
+45 | 
+46 | #: E231
+   - {len(f's3://{self.s3_bucket_name}/'):1}
+47 + {len(f's3://{self.s3_bucket_name}/'): 1}
+48 | 
+49 | #: Okay
+50 | a = (1,)
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:60:13
@@ -159,16 +145,14 @@ E231 [*] Missing whitespace after ':'
 62 |     results_in_tuple = (
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-57 57 |     """Primary function."""
-58 58 |     results = {
-59 59 |         "k1": [1],
-60    |-        "k2":[2],
-   60 |+        "k2": [2],
-61 61 |     }
-62 62 |     results_in_tuple = (
-63 63 |         {
+57 |     """Primary function."""
+58 |     results = {
+59 |         "k1": [1],
+   -         "k2":[2],
+60 +         "k2": [2],
+61 |     }
+62 |     results_in_tuple = (
+63 |         {
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:65:17
@@ -181,16 +165,14 @@ E231 [*] Missing whitespace after ':'
 67 |     )
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-62 62 |     results_in_tuple = (
-63 63 |         {
-64 64 |             "k1": [1],
-65    |-            "k2":[2],
-   65 |+            "k2": [2],
-66 66 |         },
-67 67 |     )
-68 68 |     results_in_list = [
+62 |     results_in_tuple = (
+63 |         {
+64 |             "k1": [1],
+   -             "k2":[2],
+65 +             "k2": [2],
+66 |         },
+67 |     )
+68 |     results_in_list = [
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:71:17
@@ -203,16 +185,14 @@ E231 [*] Missing whitespace after ':'
 73 |     ]
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-68 68 |     results_in_list = [
-69 69 |         {
-70 70 |             "k1": [1],
-71    |-            "k2":[2],
-   71 |+            "k2": [2],
-72 72 |         }
-73 73 |     ]
-74 74 |     results_in_list_first = [
+68 |     results_in_list = [
+69 |         {
+70 |             "k1": [1],
+   -             "k2":[2],
+71 +             "k2": [2],
+72 |         }
+73 |     ]
+74 |     results_in_list_first = [
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:76:17
@@ -225,16 +205,14 @@ E231 [*] Missing whitespace after ':'
 78 |     ]
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-73 73 |     ]
-74 74 |     results_in_list_first = [
-75 75 |         {
-76    |-            "k2":[2],
-   76 |+            "k2": [2],
-77 77 |         }
-78 78 |     ]
-79 79 | 
+73 |     ]
+74 |     results_in_list_first = [
+75 |         {
+   -             "k2":[2],
+76 +             "k2": [2],
+77 |         }
+78 |     ]
+79 | 
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:82:13
@@ -247,16 +225,14 @@ E231 [*] Missing whitespace after ':'
 84 |         "k3":[2],  # E231
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-79 79 | 
-80 80 | x = [
-81 81 |     {
-82    |-        "k1":[2], # E231
-   82 |+        "k1": [2], # E231
-83 83 |         "k2": x[2:4],
-84 84 |         "k3":[2],  # E231
-85 85 |         "k4": [2],
+79 | 
+80 | x = [
+81 |     {
+   -         "k1":[2], # E231
+82 +         "k1": [2], # E231
+83 |         "k2": x[2:4],
+84 |         "k3":[2],  # E231
+85 |         "k4": [2],
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:84:13
@@ -269,16 +245,14 @@ E231 [*] Missing whitespace after ':'
 86 |         "k5": [2],
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-81 81 |     {
-82 82 |         "k1":[2], # E231
-83 83 |         "k2": x[2:4],
-84    |-        "k3":[2],  # E231
-   84 |+        "k3": [2],  # E231
-85 85 |         "k4": [2],
-86 86 |         "k5": [2],
-87 87 |         "k6": [1, 2, 3, 4,5,6,7]  # E231
+81 |     {
+82 |         "k1":[2], # E231
+83 |         "k2": x[2:4],
+   -         "k3":[2],  # E231
+84 +         "k3": [2],  # E231
+85 |         "k4": [2],
+86 |         "k5": [2],
+87 |         "k6": [1, 2, 3, 4,5,6,7]  # E231
 
 E231 [*] Missing whitespace after ','
   --> E23.py:87:26
@@ -291,16 +265,14 @@ E231 [*] Missing whitespace after ','
 89 |     {
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-84 84 |         "k3":[2],  # E231
-85 85 |         "k4": [2],
-86 86 |         "k5": [2],
-87    |-        "k6": [1, 2, 3, 4,5,6,7]  # E231
-   87 |+        "k6": [1, 2, 3, 4, 5,6,7]  # E231
-88 88 |     },
-89 89 |     {
-90 90 |         "k1": [
+84 |         "k3":[2],  # E231
+85 |         "k4": [2],
+86 |         "k5": [2],
+   -         "k6": [1, 2, 3, 4,5,6,7]  # E231
+87 +         "k6": [1, 2, 3, 4, 5,6,7]  # E231
+88 |     },
+89 |     {
+90 |         "k1": [
 
 E231 [*] Missing whitespace after ','
   --> E23.py:87:28
@@ -313,16 +285,14 @@ E231 [*] Missing whitespace after ','
 89 |     {
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-84 84 |         "k3":[2],  # E231
-85 85 |         "k4": [2],
-86 86 |         "k5": [2],
-87    |-        "k6": [1, 2, 3, 4,5,6,7]  # E231
-   87 |+        "k6": [1, 2, 3, 4,5, 6,7]  # E231
-88 88 |     },
-89 89 |     {
-90 90 |         "k1": [
+84 |         "k3":[2],  # E231
+85 |         "k4": [2],
+86 |         "k5": [2],
+   -         "k6": [1, 2, 3, 4,5,6,7]  # E231
+87 +         "k6": [1, 2, 3, 4,5, 6,7]  # E231
+88 |     },
+89 |     {
+90 |         "k1": [
 
 E231 [*] Missing whitespace after ','
   --> E23.py:87:30
@@ -335,16 +305,14 @@ E231 [*] Missing whitespace after ','
 89 |     {
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-84 84 |         "k3":[2],  # E231
-85 85 |         "k4": [2],
-86 86 |         "k5": [2],
-87    |-        "k6": [1, 2, 3, 4,5,6,7]  # E231
-   87 |+        "k6": [1, 2, 3, 4,5,6, 7]  # E231
-88 88 |     },
-89 89 |     {
-90 90 |         "k1": [
+84 |         "k3":[2],  # E231
+85 |         "k4": [2],
+86 |         "k5": [2],
+   -         "k6": [1, 2, 3, 4,5,6,7]  # E231
+87 +         "k6": [1, 2, 3, 4,5,6, 7]  # E231
+88 |     },
+89 |     {
+90 |         "k1": [
 
 E231 [*] Missing whitespace after ':'
   --> E23.py:92:21
@@ -357,16 +325,14 @@ E231 [*] Missing whitespace after ':'
 94 |             {
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-89 89 |     {
-90 90 |         "k1": [
-91 91 |             {
-92    |-                "ka":[2,3],  # E231
-   92 |+                "ka": [2,3],  # E231
-93 93 |             },
-94 94 |             {
-95 95 |                 "kb": [2,3],  # E231
+89 |     {
+90 |         "k1": [
+91 |             {
+   -                 "ka":[2,3],  # E231
+92 +                 "ka": [2,3],  # E231
+93 |             },
+94 |             {
+95 |                 "kb": [2,3],  # E231
 
 E231 [*] Missing whitespace after ','
   --> E23.py:92:24
@@ -379,16 +345,14 @@ E231 [*] Missing whitespace after ','
 94 |             {
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-89 89 |     {
-90 90 |         "k1": [
-91 91 |             {
-92    |-                "ka":[2,3],  # E231
-   92 |+                "ka":[2, 3],  # E231
-93 93 |             },
-94 94 |             {
-95 95 |                 "kb": [2,3],  # E231
+89 |     {
+90 |         "k1": [
+91 |             {
+   -                 "ka":[2,3],  # E231
+92 +                 "ka":[2, 3],  # E231
+93 |             },
+94 |             {
+95 |                 "kb": [2,3],  # E231
 
 E231 [*] Missing whitespace after ','
   --> E23.py:95:25
@@ -401,16 +365,14 @@ E231 [*] Missing whitespace after ','
 97 |             {
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-92 92 |                 "ka":[2,3],  # E231
-93 93 |             },
-94 94 |             {
-95    |-                "kb": [2,3],  # E231
-   95 |+                "kb": [2, 3],  # E231
-96 96 |             },
-97 97 |             {
-98 98 |                 "ka":[2, 3],  # E231
+92 |                 "ka":[2,3],  # E231
+93 |             },
+94 |             {
+   -                 "kb": [2,3],  # E231
+95 +                 "kb": [2, 3],  # E231
+96 |             },
+97 |             {
+98 |                 "ka":[2, 3],  # E231
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:98:21
@@ -423,16 +385,14 @@ E231 [*] Missing whitespace after ':'
 100 |                 "kc": [2, 3],  # Ok
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-95 95 |                 "kb": [2,3],  # E231
-96 96 |             },
-97 97 |             {
-98    |-                "ka":[2, 3],  # E231
-   98 |+                "ka": [2, 3],  # E231
-99 99 |                 "kb": [2, 3],  # Ok
-100 100 |                 "kc": [2, 3],  # Ok
-101 101 |                 "kd": [2,3],  # E231
+95  |                 "kb": [2,3],  # E231
+96  |             },
+97  |             {
+    -                 "ka":[2, 3],  # E231
+98  +                 "ka": [2, 3],  # E231
+99  |                 "kb": [2, 3],  # Ok
+100 |                 "kc": [2, 3],  # Ok
+101 |                 "kd": [2,3],  # E231
 
 E231 [*] Missing whitespace after ','
    --> E23.py:101:25
@@ -445,16 +405,14 @@ E231 [*] Missing whitespace after ','
 103 |             },
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-98  98  |                 "ka":[2, 3],  # E231
-99  99  |                 "kb": [2, 3],  # Ok
-100 100 |                 "kc": [2, 3],  # Ok
-101     |-                "kd": [2,3],  # E231
-    101 |+                "kd": [2, 3],  # E231
-102 102 |                 "ke":[2,3],  # E231
-103 103 |             },
-104 104 |         ]
+98  |                 "ka":[2, 3],  # E231
+99  |                 "kb": [2, 3],  # Ok
+100 |                 "kc": [2, 3],  # Ok
+    -                 "kd": [2,3],  # E231
+101 +                 "kd": [2, 3],  # E231
+102 |                 "ke":[2,3],  # E231
+103 |             },
+104 |         ]
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:102:21
@@ -467,16 +425,14 @@ E231 [*] Missing whitespace after ':'
 104 |         ]
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-99  99  |                 "kb": [2, 3],  # Ok
-100 100 |                 "kc": [2, 3],  # Ok
-101 101 |                 "kd": [2,3],  # E231
-102     |-                "ke":[2,3],  # E231
-    102 |+                "ke": [2,3],  # E231
-103 103 |             },
-104 104 |         ]
-105 105 |     }
+99  |                 "kb": [2, 3],  # Ok
+100 |                 "kc": [2, 3],  # Ok
+101 |                 "kd": [2,3],  # E231
+    -                 "ke":[2,3],  # E231
+102 +                 "ke": [2,3],  # E231
+103 |             },
+104 |         ]
+105 |     }
 
 E231 [*] Missing whitespace after ','
    --> E23.py:102:24
@@ -489,16 +445,14 @@ E231 [*] Missing whitespace after ','
 104 |         ]
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-99  99  |                 "kb": [2, 3],  # Ok
-100 100 |                 "kc": [2, 3],  # Ok
-101 101 |                 "kd": [2,3],  # E231
-102     |-                "ke":[2,3],  # E231
-    102 |+                "ke":[2, 3],  # E231
-103 103 |             },
-104 104 |         ]
-105 105 |     }
+99  |                 "kb": [2, 3],  # Ok
+100 |                 "kc": [2, 3],  # Ok
+101 |                 "kd": [2,3],  # E231
+    -                 "ke":[2,3],  # E231
+102 +                 "ke":[2, 3],  # E231
+103 |             },
+104 |         ]
+105 |     }
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:109:18
@@ -510,16 +464,14 @@ E231 [*] Missing whitespace after ':'
 111 |     y:B = [[["foo", "bar"]]],
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-106 106 | ]
-107 107 | 
-108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
-109     |-def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-    109 |+def pep_696_bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-110 110 |     x:A = "foo"[::-1],
-111 111 |     y:B = [[["foo", "bar"]]],
-112 112 |     z:object = "fooo",
+106 | ]
+107 | 
+108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
+    - def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+109 + def pep_696_bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+110 |     x:A = "foo"[::-1],
+111 |     y:B = [[["foo", "bar"]]],
+112 |     z:object = "fooo",
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:109:40
@@ -531,16 +483,14 @@ E231 [*] Missing whitespace after ':'
 111 |     y:B = [[["foo", "bar"]]],
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-106 106 | ]
-107 107 | 
-108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
-109     |-def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-    109 |+def pep_696_bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](
-110 110 |     x:A = "foo"[::-1],
-111 111 |     y:B = [[["foo", "bar"]]],
-112 112 |     z:object = "fooo",
+106 | ]
+107 | 
+108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
+    - def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+109 + def pep_696_bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](
+110 |     x:A = "foo"[::-1],
+111 |     y:B = [[["foo", "bar"]]],
+112 |     z:object = "fooo",
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:109:70
@@ -552,16 +502,14 @@ E231 [*] Missing whitespace after ':'
 111 |     y:B = [[["foo", "bar"]]],
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-106 106 | ]
-107 107 | 
-108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
-109     |-def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-    109 |+def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](
-110 110 |     x:A = "foo"[::-1],
-111 111 |     y:B = [[["foo", "bar"]]],
-112 112 |     z:object = "fooo",
+106 | ]
+107 | 
+108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
+    - def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+109 + def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](
+110 |     x:A = "foo"[::-1],
+111 |     y:B = [[["foo", "bar"]]],
+112 |     z:object = "fooo",
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:110:6
@@ -574,16 +522,14 @@ E231 [*] Missing whitespace after ':'
 112 |     z:object = "fooo",
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-107 107 | 
-108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
-109 109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-110     |-    x:A = "foo"[::-1],
-    110 |+    x: A = "foo"[::-1],
-111 111 |     y:B = [[["foo", "bar"]]],
-112 112 |     z:object = "fooo",
-113 113 | ):
+107 | 
+108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
+109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+    -     x:A = "foo"[::-1],
+110 +     x: A = "foo"[::-1],
+111 |     y:B = [[["foo", "bar"]]],
+112 |     z:object = "fooo",
+113 | ):
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:111:6
@@ -596,16 +542,14 @@ E231 [*] Missing whitespace after ':'
 113 | ):
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
-109 109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-110 110 |     x:A = "foo"[::-1],
-111     |-    y:B = [[["foo", "bar"]]],
-    111 |+    y: B = [[["foo", "bar"]]],
-112 112 |     z:object = "fooo",
-113 113 | ):
-114 114 |     pass
+108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults
+109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+110 |     x:A = "foo"[::-1],
+    -     y:B = [[["foo", "bar"]]],
+111 +     y: B = [[["foo", "bar"]]],
+112 |     z:object = "fooo",
+113 | ):
+114 |     pass
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:112:6
@@ -618,16 +562,14 @@ E231 [*] Missing whitespace after ':'
 114 |     pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-109 109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-110 110 |     x:A = "foo"[::-1],
-111 111 |     y:B = [[["foo", "bar"]]],
-112     |-    z:object = "fooo",
-    112 |+    z: object = "fooo",
-113 113 | ):
-114 114 |     pass
-115 115 | 
+109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+110 |     x:A = "foo"[::-1],
+111 |     y:B = [[["foo", "bar"]]],
+    -     z:object = "fooo",
+112 +     z: object = "fooo",
+113 | ):
+114 |     pass
+115 | 
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:116:18
@@ -640,16 +582,14 @@ E231 [*] Missing whitespace after ':'
 118 |         self,
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-113 113 | ):
-114 114 |     pass
-115 115 | 
-116     |-class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-    116 |+class PEP696Bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-117 117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
+113 | ):
+114 |     pass
+115 | 
+    - class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+116 + class PEP696Bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:116:40
@@ -662,16 +602,14 @@ E231 [*] Missing whitespace after ':'
 118 |         self,
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-113 113 | ):
-114 114 |     pass
-115 115 | 
-116     |-class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-    116 |+class PEP696Bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]:
-117 117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
+113 | ):
+114 |     pass
+115 | 
+    - class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+116 + class PEP696Bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]:
+117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:116:70
@@ -684,16 +622,14 @@ E231 [*] Missing whitespace after ':'
 118 |         self,
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-113 113 | ):
-114 114 |     pass
-115 115 | 
-116     |-class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-    116 |+class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]:
-117 117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
+113 | ):
+114 |     pass
+115 | 
+    - class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+116 + class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]:
+117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:117:29
@@ -705,16 +641,14 @@ E231 [*] Missing whitespace after ':'
 119 |         x:A = "foo"[::-1],
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-114 114 |     pass
-115 115 | 
-116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-117     |-    def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-    117 |+    def pep_696_bad_method[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
-120 120 |         y:B = [[["foo", "bar"]]],
+114 |     pass
+115 | 
+116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+    -     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+117 +     def pep_696_bad_method[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
+120 |         y:B = [[["foo", "bar"]]],
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:117:51
@@ -726,16 +660,14 @@ E231 [*] Missing whitespace after ':'
 119 |         x:A = "foo"[::-1],
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-114 114 |     pass
-115 115 | 
-116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-117     |-    def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-    117 |+    def pep_696_bad_method[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
-120 120 |         y:B = [[["foo", "bar"]]],
+114 |     pass
+115 | 
+116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+    -     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+117 +     def pep_696_bad_method[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
+120 |         y:B = [[["foo", "bar"]]],
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:117:81
@@ -747,16 +679,14 @@ E231 [*] Missing whitespace after ':'
 119 |         x:A = "foo"[::-1],
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-114 114 |     pass
-115 115 | 
-116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-117     |-    def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-    117 |+    def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
-120 120 |         y:B = [[["foo", "bar"]]],
+114 |     pass
+115 | 
+116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+    -     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+117 +     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
+120 |         y:B = [[["foo", "bar"]]],
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:119:10
@@ -769,16 +699,14 @@ E231 [*] Missing whitespace after ':'
 121 |         z:object = "fooo",
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
-117 117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119     |-        x:A = "foo"[::-1],
-    119 |+        x: A = "foo"[::-1],
-120 120 |         y:B = [[["foo", "bar"]]],
-121 121 |         z:object = "fooo",
-122 122 |     ):
+116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]:
+117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+    -         x:A = "foo"[::-1],
+119 +         x: A = "foo"[::-1],
+120 |         y:B = [[["foo", "bar"]]],
+121 |         z:object = "fooo",
+122 |     ):
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:120:10
@@ -791,16 +719,14 @@ E231 [*] Missing whitespace after ':'
 122 |     ):
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-117 117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
-120     |-        y:B = [[["foo", "bar"]]],
-    120 |+        y: B = [[["foo", "bar"]]],
-121 121 |         z:object = "fooo",
-122 122 |     ):
-123 123 |         pass
+117 |     def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](
+118 |         self,
+119 |         x:A = "foo"[::-1],
+    -         y:B = [[["foo", "bar"]]],
+120 +         y: B = [[["foo", "bar"]]],
+121 |         z:object = "fooo",
+122 |     ):
+123 |         pass
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:121:10
@@ -813,16 +739,14 @@ E231 [*] Missing whitespace after ':'
 123 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-118 118 |         self,
-119 119 |         x:A = "foo"[::-1],
-120 120 |         y:B = [[["foo", "bar"]]],
-121     |-        z:object = "fooo",
-    121 |+        z: object = "fooo",
-122 122 |     ):
-123 123 |         pass
-124 124 | 
+118 |         self,
+119 |         x:A = "foo"[::-1],
+120 |         y:B = [[["foo", "bar"]]],
+    -         z:object = "fooo",
+121 +         z: object = "fooo",
+122 |     ):
+123 |         pass
+124 | 
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:125:32
@@ -835,16 +759,14 @@ E231 [*] Missing whitespace after ':'
 127 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-122 122 |     ):
-123 123 |         pass
-124 124 | 
-125     |-class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-    125 |+class PEP696BadWithEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-126 126 |     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-127 127 |         pass
-128 128 | 
+122 |     ):
+123 |         pass
+124 | 
+    - class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+125 + class PEP696BadWithEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+126 |     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+127 |         pass
+128 | 
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:125:54
@@ -857,16 +779,14 @@ E231 [*] Missing whitespace after ':'
 127 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-122 122 |     ):
-123 123 |         pass
-124 124 | 
-125     |-class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-    125 |+class PEP696BadWithEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]():
-126 126 |     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-127 127 |         pass
-128 128 | 
+122 |     ):
+123 |         pass
+124 | 
+    - class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+125 + class PEP696BadWithEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]():
+126 |     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+127 |         pass
+128 | 
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:125:84
@@ -879,16 +799,14 @@ E231 [*] Missing whitespace after ':'
 127 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-122 122 |     ):
-123 123 |         pass
-124 124 | 
-125     |-class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-    125 |+class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]():
-126 126 |     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-127 127 |         pass
-128 128 | 
+122 |     ):
+123 |         pass
+124 | 
+    - class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+125 + class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]():
+126 |     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+127 |         pass
+128 | 
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:126:47
@@ -899,16 +817,14 @@ E231 [*] Missing whitespace after ':'
 127 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-123 123 |         pass
-124 124 | 
-125 125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-126     |-    class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-    126 |+    class IndentedPEP696BadWithNonEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-127 127 |         pass
-128 128 | 
-129 129 | # Should be no E231 errors on any of these:
+123 |         pass
+124 | 
+125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+    -     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+126 +     class IndentedPEP696BadWithNonEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+127 |         pass
+128 | 
+129 | # Should be no E231 errors on any of these:
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:126:69
@@ -919,16 +835,14 @@ E231 [*] Missing whitespace after ':'
 127 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-123 123 |         pass
-124 124 | 
-125 125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-126     |-    class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-    126 |+    class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-127 127 |         pass
-128 128 | 
-129 129 | # Should be no E231 errors on any of these:
+123 |         pass
+124 | 
+125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+    -     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+126 +     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+127 |         pass
+128 | 
+129 | # Should be no E231 errors on any of these:
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:126:99
@@ -939,16 +853,14 @@ E231 [*] Missing whitespace after ':'
 127 |         pass
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-123 123 |         pass
-124 124 | 
-125 125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
-126     |-    class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
-    126 |+    class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](object, something_dynamic[x::-1]):
-127 127 |         pass
-128 128 | 
-129 129 | # Should be no E231 errors on any of these:
+123 |         pass
+124 | 
+125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]():
+    -     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]):
+126 +     class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](object, something_dynamic[x::-1]):
+127 |         pass
+128 | 
+129 | # Should be no E231 errors on any of these:
 
 E231 [*] Missing whitespace after ','
    --> E23.py:147:6
@@ -960,16 +872,14 @@ E231 [*] Missing whitespace after ','
 149 | # Okay because it's hard to differentiate between the usages of a colon in a t-string
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-144 144 |     pass
-145 145 | 
-146 146 | # E231
-147     |-t"{(a,b)}"
-    147 |+t"{(a, b)}"
-148 148 | 
-149 149 | # Okay because it's hard to differentiate between the usages of a colon in a t-string
-150 150 | t"{a:=1}"
+144 |     pass
+145 | 
+146 | # E231
+    - t"{(a,b)}"
+147 + t"{(a, b)}"
+148 | 
+149 | # Okay because it's hard to differentiate between the usages of a colon in a t-string
+150 | t"{a:=1}"
 
 E231 [*] Missing whitespace after ':'
    --> E23.py:161:37
@@ -979,10 +889,8 @@ E231 [*] Missing whitespace after ':'
     |                                     ^
     |
 help: Add missing whitespace
-
-ℹ Safe fix
-158 158 | snapshot.file_uri[len(t's3://{self.s3_bucket_name}/'):]
-159 159 | 
-160 160 | #: E231
-161     |-{len(t's3://{self.s3_bucket_name}/'):1}
-    161 |+{len(t's3://{self.s3_bucket_name}/'): 1}
+158 | snapshot.file_uri[len(t's3://{self.s3_bucket_name}/'):]
+159 | 
+160 | #: E231
+    - {len(t's3://{self.s3_bucket_name}/'):1}
+161 + {len(t's3://{self.s3_bucket_name}/'): 1}
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap
index 15b4ba7da7..a1f5d6a4b0 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap
@@ -11,14 +11,12 @@ E241 [*] Multiple spaces after comma
 4 | b = (1, 20)
   |
 help: Replace with single space
-
-ℹ Safe fix
-1 1 | #: E241
-2   |-a = (1,  2)
-  2 |+a = (1, 2)
-3 3 | #: Okay
-4 4 | b = (1, 20)
-5 5 | #: E242
+1 | #: E241
+  - a = (1,  2)
+2 + a = (1, 2)
+3 | #: Okay
+4 | b = (1, 20)
+5 | #: E242
 
 E241 [*] Multiple spaces after comma
   --> E24.py:11:18
@@ -31,15 +29,13 @@ E241 [*] Multiple spaces after comma
 13 |                c,   -d]
    |
 help: Replace with single space
-
-ℹ Safe fix
-8  8  | b = (1, 20)  # space before 20
-9  9  | #: E241 E241 E241
-10 10 | # issue 135
-11    |-more_spaces = [a,    b,
-   11 |+more_spaces = [a, b,
-12 12 |                ef,  +h,
-13 13 |                c,   -d]
+8  | b = (1, 20)  # space before 20
+9  | #: E241 E241 E241
+10 | # issue 135
+   - more_spaces = [a,    b,
+11 + more_spaces = [a, b,
+12 |                ef,  +h,
+13 |                c,   -d]
 
 E241 [*] Multiple spaces after comma
   --> E24.py:12:19
@@ -51,14 +47,12 @@ E241 [*] Multiple spaces after comma
 13 |                c,   -d]
    |
 help: Replace with single space
-
-ℹ Safe fix
-9  9  | #: E241 E241 E241
-10 10 | # issue 135
-11 11 | more_spaces = [a,    b,
-12    |-               ef,  +h,
-   12 |+               ef, +h,
-13 13 |                c,   -d]
+9  | #: E241 E241 E241
+10 | # issue 135
+11 | more_spaces = [a,    b,
+   -                ef,  +h,
+12 +                ef, +h,
+13 |                c,   -d]
 
 E241 [*] Multiple spaces after comma
   --> E24.py:13:18
@@ -69,10 +63,8 @@ E241 [*] Multiple spaces after comma
    |                  ^^^
    |
 help: Replace with single space
-
-ℹ Safe fix
-10 10 | # issue 135
-11 11 | more_spaces = [a,    b,
-12 12 |                ef,  +h,
-13    |-               c,   -d]
-   13 |+               c, -d]
+10 | # issue 135
+11 | more_spaces = [a,    b,
+12 |                ef,  +h,
+   -                c,   -d]
+13 +                c, -d]
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap
index a77f70cb0b..af927a5d3d 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap
@@ -12,13 +12,11 @@ E242 [*] Tab after comma
 8 | b = (1, 20)  # space before 20
   |
 help: Replace with single space
-
-ℹ Safe fix
-3 3 | #: Okay
-4 4 | b = (1, 20)
-5 5 | #: E242
-6   |-a = (1,	2)  # tab before 2
-  6 |+a = (1, 2)  # tab before 2
-7 7 | #: Okay
-8 8 | b = (1, 20)  # space before 20
-9 9 | #: E241 E241 E241
+3 | #: Okay
+4 | b = (1, 20)
+5 | #: E242
+  - a = (1,	2)  # tab before 2
+6 + a = (1, 2)  # tab before 2
+7 | #: Okay
+8 | b = (1, 20)  # space before 20
+9 | #: E241 E241 E241
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap
index 542413bf0a..ea63ba312b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap
@@ -11,14 +11,12 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 4 |     pass
   |
 help: Remove whitespace
-
-ℹ Safe fix
-1 1 | #: E251 E251
-2   |-def foo(bar = False):
-  2 |+def foo(bar= False):
-3 3 |     '''Test function with an error in declaration'''
-4 4 |     pass
-5 5 | #: E251
+1 | #: E251 E251
+  - def foo(bar = False):
+2 + def foo(bar= False):
+3 |     '''Test function with an error in declaration'''
+4 |     pass
+5 | #: E251
 
 E251 [*] Unexpected spaces around keyword / parameter equals
  --> E25.py:2:14
@@ -30,14 +28,12 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 4 |     pass
   |
 help: Remove whitespace
-
-ℹ Safe fix
-1 1 | #: E251 E251
-2   |-def foo(bar = False):
-  2 |+def foo(bar =False):
-3 3 |     '''Test function with an error in declaration'''
-4 4 |     pass
-5 5 | #: E251
+1 | #: E251 E251
+  - def foo(bar = False):
+2 + def foo(bar =False):
+3 |     '''Test function with an error in declaration'''
+4 |     pass
+5 | #: E251
 
 E251 [*] Unexpected spaces around keyword / parameter equals
  --> E25.py:6:9
@@ -50,16 +46,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 8 | foo(bar =True)
   |
 help: Remove whitespace
-
-ℹ Safe fix
-3 3 |     '''Test function with an error in declaration'''
-4 4 |     pass
-5 5 | #: E251
-6   |-foo(bar= True)
-  6 |+foo(bar=True)
-7 7 | #: E251
-8 8 | foo(bar =True)
-9 9 | #: E251 E251
+3 |     '''Test function with an error in declaration'''
+4 |     pass
+5 | #: E251
+  - foo(bar= True)
+6 + foo(bar=True)
+7 | #: E251
+8 | foo(bar =True)
+9 | #: E251 E251
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:8:8
@@ -72,16 +66,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 10 | foo(bar = True)
    |
 help: Remove whitespace
-
-ℹ Safe fix
-5 5 | #: E251
-6 6 | foo(bar= True)
-7 7 | #: E251
-8   |-foo(bar =True)
-  8 |+foo(bar=True)
-9 9 | #: E251 E251
-10 10 | foo(bar = True)
-11 11 | #: E251
+5  | #: E251
+6  | foo(bar= True)
+7  | #: E251
+   - foo(bar =True)
+8  + foo(bar=True)
+9  | #: E251 E251
+10 | foo(bar = True)
+11 | #: E251
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:10:8
@@ -94,16 +86,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 12 | y = bar(root= "sdasd")
    |
 help: Remove whitespace
-
-ℹ Safe fix
-7  7  | #: E251
-8  8  | foo(bar =True)
-9  9  | #: E251 E251
-10    |-foo(bar = True)
-   10 |+foo(bar= True)
-11 11 | #: E251
-12 12 | y = bar(root= "sdasd")
-13 13 | #: E251:2:29
+7  | #: E251
+8  | foo(bar =True)
+9  | #: E251 E251
+   - foo(bar = True)
+10 + foo(bar= True)
+11 | #: E251
+12 | y = bar(root= "sdasd")
+13 | #: E251:2:29
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:10:10
@@ -116,16 +106,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 12 | y = bar(root= "sdasd")
    |
 help: Remove whitespace
-
-ℹ Safe fix
-7  7  | #: E251
-8  8  | foo(bar =True)
-9  9  | #: E251 E251
-10    |-foo(bar = True)
-   10 |+foo(bar =True)
-11 11 | #: E251
-12 12 | y = bar(root= "sdasd")
-13 13 | #: E251:2:29
+7  | #: E251
+8  | foo(bar =True)
+9  | #: E251 E251
+   - foo(bar = True)
+10 + foo(bar =True)
+11 | #: E251
+12 | y = bar(root= "sdasd")
+13 | #: E251:2:29
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:12:14
@@ -138,16 +126,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 14 | parser.add_argument('--long-option',
    |
 help: Remove whitespace
-
-ℹ Safe fix
-9  9  | #: E251 E251
-10 10 | foo(bar = True)
-11 11 | #: E251
-12    |-y = bar(root= "sdasd")
-   12 |+y = bar(root="sdasd")
-13 13 | #: E251:2:29
-14 14 | parser.add_argument('--long-option',
-15 15 |                     default=
+9  | #: E251 E251
+10 | foo(bar = True)
+11 | #: E251
+   - y = bar(root= "sdasd")
+12 + y = bar(root="sdasd")
+13 | #: E251:2:29
+14 | parser.add_argument('--long-option',
+15 |                     default=
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:15:29
@@ -162,17 +148,15 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 18 |   parser.add_argument('--long-option', default
    |
 help: Remove whitespace
-
-ℹ Safe fix
-12 12 | y = bar(root= "sdasd")
-13 13 | #: E251:2:29
-14 14 | parser.add_argument('--long-option',
-15    |-                    default=
-16    |-                    "/rather/long/filesystem/path/here/blah/blah/blah")
-   15 |+                    default="/rather/long/filesystem/path/here/blah/blah/blah")
-17 16 | #: E251:1:45
-18 17 | parser.add_argument('--long-option', default
-19 18 |                     ="/rather/long/filesystem/path/here/blah/blah/blah")
+12 | y = bar(root= "sdasd")
+13 | #: E251:2:29
+14 | parser.add_argument('--long-option',
+   -                     default=
+   -                     "/rather/long/filesystem/path/here/blah/blah/blah")
+15 +                     default="/rather/long/filesystem/path/here/blah/blah/blah")
+16 | #: E251:1:45
+17 | parser.add_argument('--long-option', default
+18 |                     ="/rather/long/filesystem/path/here/blah/blah/blah")
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:18:45
@@ -187,17 +171,15 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 21 |   foo(True,
    |
 help: Remove whitespace
-
-ℹ Safe fix
-15 15 |                     default=
-16 16 |                     "/rather/long/filesystem/path/here/blah/blah/blah")
-17 17 | #: E251:1:45
-18    |-parser.add_argument('--long-option', default
-19    |-                    ="/rather/long/filesystem/path/here/blah/blah/blah")
-   18 |+parser.add_argument('--long-option', default="/rather/long/filesystem/path/here/blah/blah/blah")
-20 19 | #: E251:3:8 E251:3:10
-21 20 | foo(True,
-22 21 |     baz=(1, 2),
+15 |                     default=
+16 |                     "/rather/long/filesystem/path/here/blah/blah/blah")
+17 | #: E251:1:45
+   - parser.add_argument('--long-option', default
+   -                     ="/rather/long/filesystem/path/here/blah/blah/blah")
+18 + parser.add_argument('--long-option', default="/rather/long/filesystem/path/here/blah/blah/blah")
+19 | #: E251:3:8 E251:3:10
+20 | foo(True,
+21 |     baz=(1, 2),
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:23:8
@@ -210,16 +192,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 25 | #: Okay
    |
 help: Remove whitespace
-
-ℹ Safe fix
-20 20 | #: E251:3:8 E251:3:10
-21 21 | foo(True,
-22 22 |     baz=(1, 2),
-23    |-    biz = 'foo'
-   23 |+    biz= 'foo'
-24 24 |     )
-25 25 | #: Okay
-26 26 | foo(bar=(1 == 1))
+20 | #: E251:3:8 E251:3:10
+21 | foo(True,
+22 |     baz=(1, 2),
+   -     biz = 'foo'
+23 +     biz= 'foo'
+24 |     )
+25 | #: Okay
+26 | foo(bar=(1 == 1))
 
 E251 [*] Unexpected spaces around keyword / parameter equals
   --> E25.py:23:10
@@ -232,13 +212,11 @@ E251 [*] Unexpected spaces around keyword / parameter equals
 25 | #: Okay
    |
 help: Remove whitespace
-
-ℹ Safe fix
-20 20 | #: E251:3:8 E251:3:10
-21 21 | foo(True,
-22 22 |     baz=(1, 2),
-23    |-    biz = 'foo'
-   23 |+    biz ='foo'
-24 24 |     )
-25 25 | #: Okay
-26 26 | foo(bar=(1 == 1))
+20 | #: E251:3:8 E251:3:10
+21 | foo(True,
+22 |     baz=(1, 2),
+   -     biz = 'foo'
+23 +     biz ='foo'
+24 |     )
+25 | #: Okay
+26 | foo(bar=(1 == 1))
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap
index ced0599eb2..ccdff8a151 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap
@@ -12,16 +12,14 @@ E252 [*] Missing whitespace around parameter equals
 48 | #: Okay
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-43 43 | async  def add(a: int = 0, b: int = 0) -> int:
-44 44 |     return a + b
-45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
-46    |-def add(a: int=0, b: int =0, c: int= 0) -> int:
-   46 |+def add(a: int =0, b: int =0, c: int= 0) -> int:
-47 47 |     return a + b + c
-48 48 | #: Okay
-49 49 | def add(a: int = _default(name='f')):
+43 | async  def add(a: int = 0, b: int = 0) -> int:
+44 |     return a + b
+45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
+   - def add(a: int=0, b: int =0, c: int= 0) -> int:
+46 + def add(a: int =0, b: int =0, c: int= 0) -> int:
+47 |     return a + b + c
+48 | #: Okay
+49 | def add(a: int = _default(name='f')):
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:46:15
@@ -34,16 +32,14 @@ E252 [*] Missing whitespace around parameter equals
 48 | #: Okay
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-43 43 | async  def add(a: int = 0, b: int = 0) -> int:
-44 44 |     return a + b
-45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
-46    |-def add(a: int=0, b: int =0, c: int= 0) -> int:
-   46 |+def add(a: int= 0, b: int =0, c: int= 0) -> int:
-47 47 |     return a + b + c
-48 48 | #: Okay
-49 49 | def add(a: int = _default(name='f')):
+43 | async  def add(a: int = 0, b: int = 0) -> int:
+44 |     return a + b
+45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
+   - def add(a: int=0, b: int =0, c: int= 0) -> int:
+46 + def add(a: int= 0, b: int =0, c: int= 0) -> int:
+47 |     return a + b + c
+48 | #: Okay
+49 | def add(a: int = _default(name='f')):
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:46:26
@@ -56,16 +52,14 @@ E252 [*] Missing whitespace around parameter equals
 48 | #: Okay
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-43 43 | async  def add(a: int = 0, b: int = 0) -> int:
-44 44 |     return a + b
-45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
-46    |-def add(a: int=0, b: int =0, c: int= 0) -> int:
-   46 |+def add(a: int=0, b: int = 0, c: int= 0) -> int:
-47 47 |     return a + b + c
-48 48 | #: Okay
-49 49 | def add(a: int = _default(name='f')):
+43 | async  def add(a: int = 0, b: int = 0) -> int:
+44 |     return a + b
+45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
+   - def add(a: int=0, b: int =0, c: int= 0) -> int:
+46 + def add(a: int=0, b: int = 0, c: int= 0) -> int:
+47 |     return a + b + c
+48 | #: Okay
+49 | def add(a: int = _default(name='f')):
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:46:36
@@ -78,16 +72,14 @@ E252 [*] Missing whitespace around parameter equals
 48 | #: Okay
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-43 43 | async  def add(a: int = 0, b: int = 0) -> int:
-44 44 |     return a + b
-45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
-46    |-def add(a: int=0, b: int =0, c: int= 0) -> int:
-   46 |+def add(a: int=0, b: int =0, c: int = 0) -> int:
-47 47 |     return a + b + c
-48 48 | #: Okay
-49 49 | def add(a: int = _default(name='f')):
+43 | async  def add(a: int = 0, b: int = 0) -> int:
+44 |     return a + b
+45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
+   - def add(a: int=0, b: int =0, c: int= 0) -> int:
+46 + def add(a: int=0, b: int =0, c: int = 0) -> int:
+47 |     return a + b + c
+48 | #: Okay
+49 | def add(a: int = _default(name='f')):
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:18
@@ -98,16 +90,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:18
@@ -118,16 +108,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:26
@@ -138,16 +126,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:33
@@ -158,16 +144,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:49
@@ -178,16 +162,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:49
@@ -198,16 +180,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:64
@@ -218,16 +198,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:64
@@ -238,16 +216,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:80
@@ -258,16 +234,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:64:96
@@ -278,16 +252,14 @@ E252 [*] Missing whitespace around parameter equals
 65 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-61 61 | print(f"{foo(a = 1)}")
-62 62 | 
-63 63 | # There should be at least one E251 diagnostic for each type parameter here:
-64    |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-   64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes]():
-65 65 |     pass
-66 66 | 
-67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+61 | print(f"{foo(a = 1)}")
+62 | 
+63 | # There should be at least one E251 diagnostic for each type parameter here:
+   - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes]():
+65 |     pass
+66 | 
+67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:18
@@ -299,16 +271,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:18
@@ -320,16 +290,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:26
@@ -341,16 +309,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:33
@@ -362,16 +328,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:49
@@ -383,16 +347,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:49
@@ -404,16 +366,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:64
@@ -425,16 +385,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:64
@@ -446,16 +404,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:80
@@ -467,16 +423,14 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
 
 E252 [*] Missing whitespace around parameter equals
   --> E25.py:67:96
@@ -488,13 +442,11 @@ E252 [*] Missing whitespace around parameter equals
 68 |     pass
    |
 help: Add missing whitespace
-
-ℹ Safe fix
-64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
-65 65 |     pass
-66 66 | 
-67    |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
-   67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes]:
-68 68 |     pass
-69 69 | 
-70 70 | # The last of these should cause us to emit E231,
+64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]():
+65 |     pass
+66 | 
+   - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]:
+67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes]:
+68 |     pass
+69 | 
+70 | # The last of these should cause us to emit E231,
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap
index 2970034f65..04502d5950 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap
@@ -11,11 +11,9 @@ E261 [*] Insert at least two spaces before an inline comment
 4 | x = x + 1  #Increment x
   |
 help: Insert spaces
-
-ℹ Safe fix
-1 1 | #: E261:1:5
-2   |-pass # an inline comment
-  2 |+pass  # an inline comment
-3 3 | #: E262:1:12
-4 4 | x = x + 1  #Increment x
-5 5 | #: E262:1:12
+1 | #: E261:1:5
+  - pass # an inline comment
+2 + pass  # an inline comment
+3 | #: E262:1:12
+4 | x = x + 1  #Increment x
+5 | #: E262:1:12
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap
index b3a33831ca..d570c51213 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap
@@ -12,16 +12,14 @@ E262 [*] Inline comment should start with `# `
 6 | x = x + 1  #  Increment x
   |
 help: Format space
-
-ℹ Safe fix
-1 1 | #: E261:1:5
-2 2 | pass # an inline comment
-3 3 | #: E262:1:12
-4   |-x = x + 1  #Increment x
-  4 |+x = x + 1  # Increment x
-5 5 | #: E262:1:12
-6 6 | x = x + 1  #  Increment x
-7 7 | #: E262:1:12
+1 | #: E261:1:5
+2 | pass # an inline comment
+3 | #: E262:1:12
+  - x = x + 1  #Increment x
+4 + x = x + 1  # Increment x
+5 | #: E262:1:12
+6 | x = x + 1  #  Increment x
+7 | #: E262:1:12
 
 E262 [*] Inline comment should start with `# `
  --> E26.py:6:12
@@ -34,16 +32,14 @@ E262 [*] Inline comment should start with `# `
 8 | x = y + 1  #:  Increment x
   |
 help: Format space
-
-ℹ Safe fix
-3 3 | #: E262:1:12
-4 4 | x = x + 1  #Increment x
-5 5 | #: E262:1:12
-6   |-x = x + 1  #  Increment x
-  6 |+x = x + 1  # Increment x
-7 7 | #: E262:1:12
-8 8 | x = y + 1  #:  Increment x
-9 9 | #: E265:1:1
+3 | #: E262:1:12
+4 | x = x + 1  #Increment x
+5 | #: E262:1:12
+  - x = x + 1  #  Increment x
+6 + x = x + 1  # Increment x
+7 | #: E262:1:12
+8 | x = y + 1  #:  Increment x
+9 | #: E265:1:1
 
 E262 [*] Inline comment should start with `# `
   --> E26.py:8:12
@@ -56,16 +52,14 @@ E262 [*] Inline comment should start with `# `
 10 | #Block comment
    |
 help: Format space
-
-ℹ Safe fix
-5 5 | #: E262:1:12
-6 6 | x = x + 1  #  Increment x
-7 7 | #: E262:1:12
-8   |-x = y + 1  #:  Increment x
-  8 |+x = y + 1  #: Increment x
-9 9 | #: E265:1:1
-10 10 | #Block comment
-11 11 | a = 1
+5  | #: E262:1:12
+6  | x = x + 1  #  Increment x
+7  | #: E262:1:12
+   - x = y + 1  #:  Increment x
+8  + x = y + 1  #: Increment x
+9  | #: E265:1:1
+10 | #Block comment
+11 | a = 1
 
 E262 [*] Inline comment should start with `# `
   --> E26.py:63:9
@@ -78,16 +72,14 @@ E262 [*] Inline comment should start with `# `
 65 | #  (Two spaces) Ok for block comment
    |
 help: Format space
-
-ℹ Safe fix
-60 60 | #: E262:3:9
-61 61 | # -*- coding: utf8 -*-
-62 62 | #  (One space one NBSP) Ok for block comment
-63    |-a = 42  #  (One space one NBSP)
-   63 |+a = 42  # (One space one NBSP)
-64 64 | #: E262:2:9
-65 65 | #  (Two spaces) Ok for block comment
-66 66 | a = 42  #  (Two spaces)
+60 | #: E262:3:9
+61 | # -*- coding: utf8 -*-
+62 | #  (One space one NBSP) Ok for block comment
+   - a = 42  #  (One space one NBSP)
+63 + a = 42  # (One space one NBSP)
+64 | #: E262:2:9
+65 | #  (Two spaces) Ok for block comment
+66 | a = 42  #  (Two spaces)
 
 E262 [*] Inline comment should start with `# `
   --> E26.py:66:9
@@ -100,16 +92,14 @@ E262 [*] Inline comment should start with `# `
 68 | #: E265:5:1
    |
 help: Format space
-
-ℹ Safe fix
-63 63 | a = 42  #  (One space one NBSP)
-64 64 | #: E262:2:9
-65 65 | #  (Two spaces) Ok for block comment
-66    |-a = 42  #  (Two spaces)
-   66 |+a = 42  # (Two spaces)
-67 67 | 
-68 68 | #: E265:5:1
-69 69 | ### Means test is not done yet
+63 | a = 42  #  (One space one NBSP)
+64 | #: E262:2:9
+65 | #  (Two spaces) Ok for block comment
+   - a = 42  #  (Two spaces)
+66 + a = 42  # (Two spaces)
+67 | 
+68 | #: E265:5:1
+69 | ### Means test is not done yet
 
 E262 [*] Inline comment should start with `# `
   --> E26.py:84:8
@@ -122,15 +112,13 @@ E262 [*] Inline comment should start with `# `
 86 | a = 1  #:Foo
    |
 help: Format space
-
-ℹ Safe fix
-81 81 | #: E266:1:3
-82 82 | ##  Foo
-83 83 | 
-84    |-a = 1  ## Foo
-   84 |+a = 1  # Foo
-85 85 | 
-86 86 | a = 1  #:Foo
+81 | #: E266:1:3
+82 | ##  Foo
+83 | 
+   - a = 1  ## Foo
+84 + a = 1  # Foo
+85 | 
+86 | a = 1  #:Foo
 
 E262 [*] Inline comment should start with `# `
   --> E26.py:86:8
@@ -141,10 +129,8 @@ E262 [*] Inline comment should start with `# `
    |        ^^^^^
    |
 help: Format space
-
-ℹ Safe fix
-83 83 | 
-84 84 | a = 1  ## Foo
-85 85 | 
-86    |-a = 1  #:Foo
-   86 |+a = 1  #: Foo
+83 | 
+84 | a = 1  ## Foo
+85 | 
+   - a = 1  #:Foo
+86 + a = 1  #: Foo
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap
index f2af89f9d4..5dac94331c 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap
@@ -12,16 +12,14 @@ E265 [*] Block comment should start with `# `
 12 | #: E265:2:1
    |
 help: Format space
-
-ℹ Safe fix
-7  7  | #: E262:1:12
-8  8  | x = y + 1  #:  Increment x
-9  9  | #: E265:1:1
-10    |-#Block comment
-   10 |+# Block comment
-11 11 | a = 1
-12 12 | #: E265:2:1
-13 13 | m = 42
+7  | #: E262:1:12
+8  | x = y + 1  #:  Increment x
+9  | #: E265:1:1
+   - #Block comment
+10 + # Block comment
+11 | a = 1
+12 | #: E265:2:1
+13 | m = 42
 
 E265 [*] Block comment should start with `# `
   --> E26.py:14:1
@@ -34,16 +32,14 @@ E265 [*] Block comment should start with `# `
 16 | #: E266:3:5 E266:6:5
    |
 help: Format space
-
-ℹ Safe fix
-11 11 | a = 1
-12 12 | #: E265:2:1
-13 13 | m = 42
-14    |-#! This is important
-   14 |+# ! This is important
-15 15 | mx = 42 - 42
-16 16 | #: E266:3:5 E266:6:5
-17 17 | def how_it_feel(r):
+11 | a = 1
+12 | #: E265:2:1
+13 | m = 42
+   - #! This is important
+14 + # ! This is important
+15 | mx = 42 - 42
+16 | #: E266:3:5 E266:6:5
+17 | def how_it_feel(r):
 
 E265 [*] Block comment should start with `# `
   --> E26.py:25:1
@@ -56,16 +52,14 @@ E265 [*] Block comment should start with `# `
 27 | #: W291:1:42
    |
 help: Format space
-
-ℹ Safe fix
-22 22 |     ### Of course it is unused
-23 23 |     return
-24 24 | #: E265:1:1 E266:2:1
-25    |-##if DEBUG:
-   25 |+# if DEBUG:
-26 26 | ##    logging.error()
-27 27 | #: W291:1:42
-28 28 | #########################################
+22 |     ### Of course it is unused
+23 |     return
+24 | #: E265:1:1 E266:2:1
+   - ##if DEBUG:
+25 + # if DEBUG:
+26 | ##    logging.error()
+27 | #: W291:1:42
+28 | #########################################
 
 E265 [*] Block comment should start with `# `
   --> E26.py:32:1
@@ -77,16 +71,14 @@ E265 [*] Block comment should start with `# `
 34 | pass  # an inline comment
    |
 help: Format space
-
-ℹ Safe fix
-29 29 | #:
-30 30 | 
-31 31 | #: Okay
-32    |-#!/usr/bin/env python
-   32 |+# !/usr/bin/env python
-33 33 | 
-34 34 | pass  # an inline comment
-35 35 | x = x + 1   # Increment x
+29 | #:
+30 | 
+31 | #: Okay
+   - #!/usr/bin/env python
+32 + # !/usr/bin/env python
+33 | 
+34 | pass  # an inline comment
+35 | x = x + 1   # Increment x
 
 E265 [*] Block comment should start with `# `
   --> E26.py:73:1
@@ -98,16 +90,14 @@ E265 [*] Block comment should start with `# `
 74 | # 8   Means test runs forever
    |
 help: Format space
-
-ℹ Safe fix
-70 70 | # E   Means test is giving error (E)
-71 71 | # F   Means test is failing (F)
-72 72 | # EF  Means test is giving error and Failing
-73    |-#!   Means test is segfaulting
-   73 |+# !   Means test is segfaulting
-74 74 | # 8   Means test runs forever
-75 75 | 
-76 76 | #: Colon prefix is okay
+70 | # E   Means test is giving error (E)
+71 | # F   Means test is failing (F)
+72 | # EF  Means test is giving error and Failing
+   - #!   Means test is segfaulting
+73 + # !   Means test is segfaulting
+74 | # 8   Means test runs forever
+75 | 
+76 | #: Colon prefix is okay
 
 E265 [*] Block comment should start with `# `
   --> E26.py:78:1
@@ -120,13 +110,11 @@ E265 [*] Block comment should start with `# `
 80 | # We should strip the space, but preserve the hashes.
    |
 help: Format space
-
-ℹ Safe fix
-75 75 | 
-76 76 | #: Colon prefix is okay
-77 77 | 
-78    |-###This is a variable ###
-   78 |+# This is a variable ###
-79 79 | 
-80 80 | # We should strip the space, but preserve the hashes.
-81 81 | #: E266:1:3
+75 | 
+76 | #: Colon prefix is okay
+77 | 
+   - ###This is a variable ###
+78 + # This is a variable ###
+79 | 
+80 | # We should strip the space, but preserve the hashes.
+81 | #: E266:1:3
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap
index e1d348254b..ec06e548d8 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap
@@ -11,16 +11,14 @@ E266 [*] Too many leading `#` before block comment
 20 |     a = 42
    |
 help: Remove leading `#`
-
-ℹ Safe fix
-16 16 | #: E266:3:5 E266:6:5
-17 17 | def how_it_feel(r):
-18 18 | 
-19    |-    ### This is a variable ###
-   19 |+    # This is a variable ###
-20 20 |     a = 42
-21 21 | 
-22 22 |     ### Of course it is unused
+16 | #: E266:3:5 E266:6:5
+17 | def how_it_feel(r):
+18 | 
+   -     ### This is a variable ###
+19 +     # This is a variable ###
+20 |     a = 42
+21 | 
+22 |     ### Of course it is unused
 
 E266 [*] Too many leading `#` before block comment
   --> E26.py:22:5
@@ -33,16 +31,14 @@ E266 [*] Too many leading `#` before block comment
 24 | #: E265:1:1 E266:2:1
    |
 help: Remove leading `#`
-
-ℹ Safe fix
-19 19 |     ### This is a variable ###
-20 20 |     a = 42
-21 21 | 
-22    |-    ### Of course it is unused
-   22 |+    # Of course it is unused
-23 23 |     return
-24 24 | #: E265:1:1 E266:2:1
-25 25 | ##if DEBUG:
+19 |     ### This is a variable ###
+20 |     a = 42
+21 | 
+   -     ### Of course it is unused
+22 +     # Of course it is unused
+23 |     return
+24 | #: E265:1:1 E266:2:1
+25 | ##if DEBUG:
 
 E266 [*] Too many leading `#` before block comment
   --> E26.py:26:1
@@ -55,16 +51,14 @@ E266 [*] Too many leading `#` before block comment
 28 | #########################################
    |
 help: Remove leading `#`
-
-ℹ Safe fix
-23 23 |     return
-24 24 | #: E265:1:1 E266:2:1
-25 25 | ##if DEBUG:
-26    |-##    logging.error()
-   26 |+# logging.error()
-27 27 | #: W291:1:42
-28 28 | #########################################
-29 29 | #:
+23 |     return
+24 | #: E265:1:1 E266:2:1
+25 | ##if DEBUG:
+   - ##    logging.error()
+26 + # logging.error()
+27 | #: W291:1:42
+28 | #########################################
+29 | #:
 
 E266 [*] Too many leading `#` before block comment
   --> E26.py:69:1
@@ -76,16 +70,14 @@ E266 [*] Too many leading `#` before block comment
 71 | # F   Means test is failing (F)
    |
 help: Remove leading `#`
-
-ℹ Safe fix
-66 66 | a = 42  #  (Two spaces)
-67 67 | 
-68 68 | #: E265:5:1
-69    |-### Means test is not done yet
-   69 |+# Means test is not done yet
-70 70 | # E   Means test is giving error (E)
-71 71 | # F   Means test is failing (F)
-72 72 | # EF  Means test is giving error and Failing
+66 | a = 42  #  (Two spaces)
+67 | 
+68 | #: E265:5:1
+   - ### Means test is not done yet
+69 + # Means test is not done yet
+70 | # E   Means test is giving error (E)
+71 | # F   Means test is failing (F)
+72 | # EF  Means test is giving error and Failing
 
 E266 [*] Too many leading `#` before block comment
   --> E26.py:82:1
@@ -98,13 +90,11 @@ E266 [*] Too many leading `#` before block comment
 84 | a = 1  ## Foo
    |
 help: Remove leading `#`
-
-ℹ Safe fix
-79 79 | 
-80 80 | # We should strip the space, but preserve the hashes.
-81 81 | #: E266:1:3
-82    |-##  Foo
-   82 |+# Foo
-83 83 | 
-84 84 | a = 1  ## Foo
-85 85 |
+79 | 
+80 | # We should strip the space, but preserve the hashes.
+81 | #: E266:1:3
+   - ##  Foo
+82 + # Foo
+83 | 
+84 | a = 1  ## Foo
+85 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap
index 55cdd05b70..0c8168f818 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap
@@ -12,16 +12,14 @@ E271 [*] Multiple spaces after keyword
 6 | True  and False
   |
 help: Replace with single space
-
-ℹ Safe fix
-1 1 | #: Okay
-2 2 | True and False
-3 3 | #: E271
-4   |-True and  False
-  4 |+True and False
-5 5 | #: E272
-6 6 | True  and False
-7 7 | #: E271
+1 | #: Okay
+2 | True and False
+3 | #: E271
+  - True and  False
+4 + True and False
+5 | #: E272
+6 | True  and False
+7 | #: E271
 
 E271 [*] Multiple spaces after keyword
  --> E27.py:6:5
@@ -34,16 +32,14 @@ E271 [*] Multiple spaces after keyword
 8 | if   1:
   |
 help: Replace with single space
-
-ℹ Safe fix
-3 3 | #: E271
-4 4 | True and  False
-5 5 | #: E272
-6   |-True  and False
-  6 |+True and False
-7 7 | #: E271
-8 8 | if   1:
-9 9 |     pass
+3 | #: E271
+4 | True and  False
+5 | #: E272
+  - True  and False
+6 + True and False
+7 | #: E271
+8 | if   1:
+9 |     pass
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:8:3
@@ -56,16 +52,14 @@ E271 [*] Multiple spaces after keyword
 10 | #: E273
    |
 help: Replace with single space
-
-ℹ Safe fix
-5 5 | #: E272
-6 6 | True  and False
-7 7 | #: E271
-8   |-if   1:
-  8 |+if 1:
-9 9 |     pass
-10 10 | #: E273
-11 11 | True and		False
+5  | #: E272
+6  | True  and False
+7  | #: E271
+   - if   1:
+8  + if 1:
+9  |     pass
+10 | #: E273
+11 | True and		False
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:15:6
@@ -78,16 +72,14 @@ E271 [*] Multiple spaces after keyword
 17 | 1 and  b
    |
 help: Replace with single space
-
-ℹ Safe fix
-12 12 | #: E273 E274
-13 13 | True		and	False
-14 14 | #: E271
-15    |-a and  b
-   15 |+a and b
-16 16 | #: E271
-17 17 | 1 and  b
-18 18 | #: E271
+12 | #: E273 E274
+13 | True		and	False
+14 | #: E271
+   - a and  b
+15 + a and b
+16 | #: E271
+17 | 1 and  b
+18 | #: E271
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:17:6
@@ -100,16 +92,14 @@ E271 [*] Multiple spaces after keyword
 19 | a and  2
    |
 help: Replace with single space
-
-ℹ Safe fix
-14 14 | #: E271
-15 15 | a and  b
-16 16 | #: E271
-17    |-1 and  b
-   17 |+1 and b
-18 18 | #: E271
-19 19 | a and  2
-20 20 | #: E271 E272
+14 | #: E271
+15 | a and  b
+16 | #: E271
+   - 1 and  b
+17 + 1 and b
+18 | #: E271
+19 | a and  2
+20 | #: E271 E272
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:19:6
@@ -122,16 +112,14 @@ E271 [*] Multiple spaces after keyword
 21 | 1  and  b
    |
 help: Replace with single space
-
-ℹ Safe fix
-16 16 | #: E271
-17 17 | 1 and  b
-18 18 | #: E271
-19    |-a and  2
-   19 |+a and 2
-20 20 | #: E271 E272
-21 21 | 1  and  b
-22 22 | #: E271 E272
+16 | #: E271
+17 | 1 and  b
+18 | #: E271
+   - a and  2
+19 + a and 2
+20 | #: E271 E272
+21 | 1  and  b
+22 | #: E271 E272
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:21:7
@@ -144,16 +132,14 @@ E271 [*] Multiple spaces after keyword
 23 | a  and  2
    |
 help: Replace with single space
-
-ℹ Safe fix
-18 18 | #: E271
-19 19 | a and  2
-20 20 | #: E271 E272
-21    |-1  and  b
-   21 |+1  and b
-22 22 | #: E271 E272
-23 23 | a  and  2
-24 24 | #: E272
+18 | #: E271
+19 | a and  2
+20 | #: E271 E272
+   - 1  and  b
+21 + 1  and b
+22 | #: E271 E272
+23 | a  and  2
+24 | #: E272
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:23:7
@@ -166,16 +152,14 @@ E271 [*] Multiple spaces after keyword
 25 | this  and False
    |
 help: Replace with single space
-
-ℹ Safe fix
-20 20 | #: E271 E272
-21 21 | 1  and  b
-22 22 | #: E271 E272
-23    |-a  and  2
-   23 |+a  and 2
-24 24 | #: E272
-25 25 | this  and False
-26 26 | #: E273
+20 | #: E271 E272
+21 | 1  and  b
+22 | #: E271 E272
+   - a  and  2
+23 + a  and 2
+24 | #: E272
+25 | this  and False
+26 | #: E273
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:36:14
@@ -188,16 +172,14 @@ E271 [*] Multiple spaces after keyword
 38 | from w import(e, f)
    |
 help: Replace with single space
-
-ℹ Safe fix
-33 33 | from u import (a, b)
-34 34 | from v import c, d
-35 35 | #: E271
-36    |-from w import  (e, f)
-   36 |+from w import (e, f)
-37 37 | #: E275
-38 38 | from w import(e, f)
-39 39 | #: E275
+33 | from u import (a, b)
+34 | from v import c, d
+35 | #: E271
+   - from w import  (e, f)
+36 + from w import (e, f)
+37 | #: E275
+38 | from w import(e, f)
+39 | #: E275
 
 E271 [*] Multiple spaces after keyword
   --> E27.py:71:5
@@ -209,13 +191,11 @@ E271 [*] Multiple spaces after keyword
 73 | #: E273
    |
 help: Replace with single space
-
-ℹ Safe fix
-68 68 | # Soft keywords
-69 69 | 
-70 70 | #: E271
-71    |-type  Number = int
-   71 |+type Number = int
-72 72 | 
-73 73 | #: E273
-74 74 | type	Number = int
+68 | # Soft keywords
+69 | 
+70 | #: E271
+   - type  Number = int
+71 + type Number = int
+72 | 
+73 | #: E273
+74 | type	Number = int
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap
index f01d5aa72f..4b8185fe87 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap
@@ -12,16 +12,14 @@ E272 [*] Multiple spaces before keyword
 23 | a  and  2
    |
 help: Replace with single space
-
-ℹ Safe fix
-18 18 | #: E271
-19 19 | a and  2
-20 20 | #: E271 E272
-21    |-1  and  b
-   21 |+1 and  b
-22 22 | #: E271 E272
-23 23 | a  and  2
-24 24 | #: E272
+18 | #: E271
+19 | a and  2
+20 | #: E271 E272
+   - 1  and  b
+21 + 1 and  b
+22 | #: E271 E272
+23 | a  and  2
+24 | #: E272
 
 E272 [*] Multiple spaces before keyword
   --> E27.py:23:2
@@ -34,16 +32,14 @@ E272 [*] Multiple spaces before keyword
 25 | this  and False
    |
 help: Replace with single space
-
-ℹ Safe fix
-20 20 | #: E271 E272
-21 21 | 1  and  b
-22 22 | #: E271 E272
-23    |-a  and  2
-   23 |+a and  2
-24 24 | #: E272
-25 25 | this  and False
-26 26 | #: E273
+20 | #: E271 E272
+21 | 1  and  b
+22 | #: E271 E272
+   - a  and  2
+23 + a and  2
+24 | #: E272
+25 | this  and False
+26 | #: E273
 
 E272 [*] Multiple spaces before keyword
   --> E27.py:25:5
@@ -56,13 +52,11 @@ E272 [*] Multiple spaces before keyword
 27 | a and    b
    |
 help: Replace with single space
-
-ℹ Safe fix
-22 22 | #: E271 E272
-23 23 | a  and  2
-24 24 | #: E272
-25    |-this  and False
-   25 |+this and False
-26 26 | #: E273
-27 27 | a and	b
-28 28 | #: E274
+22 | #: E271 E272
+23 | a  and  2
+24 | #: E272
+   - this  and False
+25 + this and False
+26 | #: E273
+27 | a and	b
+28 | #: E274
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap
index f48e5fa931..90bc4a0143 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap
@@ -12,16 +12,14 @@ E273 [*] Tab after keyword
 13 | True        and    False
    |
 help: Replace with single space
-
-ℹ Safe fix
-8  8  | if   1:
-9  9  |     pass
-10 10 | #: E273
-11    |-True and		False
-   11 |+True and False
-12 12 | #: E273 E274
-13 13 | True		and	False
-14 14 | #: E271
+8  | if   1:
+9  |     pass
+10 | #: E273
+   - True and		False
+11 + True and False
+12 | #: E273 E274
+13 | True		and	False
+14 | #: E271
 
 E273 [*] Tab after keyword
   --> E27.py:13:5
@@ -34,16 +32,14 @@ E273 [*] Tab after keyword
 15 | a and  b
    |
 help: Replace with single space
-
-ℹ Safe fix
-10 10 | #: E273
-11 11 | True and		False
-12 12 | #: E273 E274
-13    |-True		and	False
-   13 |+True and	False
-14 14 | #: E271
-15 15 | a and  b
-16 16 | #: E271
+10 | #: E273
+11 | True and		False
+12 | #: E273 E274
+   - True		and	False
+13 + True and	False
+14 | #: E271
+15 | a and  b
+16 | #: E271
 
 E273 [*] Tab after keyword
   --> E27.py:13:10
@@ -56,16 +52,14 @@ E273 [*] Tab after keyword
 15 | a and  b
    |
 help: Replace with single space
-
-ℹ Safe fix
-10 10 | #: E273
-11 11 | True and		False
-12 12 | #: E273 E274
-13    |-True		and	False
-   13 |+True		and False
-14 14 | #: E271
-15 15 | a and  b
-16 16 | #: E271
+10 | #: E273
+11 | True and		False
+12 | #: E273 E274
+   - True		and	False
+13 + True		and False
+14 | #: E271
+15 | a and  b
+16 | #: E271
 
 E273 [*] Tab after keyword
   --> E27.py:27:6
@@ -78,16 +72,14 @@ E273 [*] Tab after keyword
 29 | a        and b
    |
 help: Replace with single space
-
-ℹ Safe fix
-24 24 | #: E272
-25 25 | this  and False
-26 26 | #: E273
-27    |-a and	b
-   27 |+a and b
-28 28 | #: E274
-29 29 | a		and b
-30 30 | #: E273 E274
+24 | #: E272
+25 | this  and False
+26 | #: E273
+   - a and	b
+27 + a and b
+28 | #: E274
+29 | a		and b
+30 | #: E273 E274
 
 E273 [*] Tab after keyword
   --> E27.py:31:10
@@ -100,16 +92,14 @@ E273 [*] Tab after keyword
 33 | from u import (a, b)
    |
 help: Replace with single space
-
-ℹ Safe fix
-28 28 | #: E274
-29 29 | a		and b
-30 30 | #: E273 E274
-31    |-this		and	False
-   31 |+this		and False
-32 32 | #: Okay
-33 33 | from u import (a, b)
-34 34 | from v import c, d
+28 | #: E274
+29 | a		and b
+30 | #: E273 E274
+   - this		and	False
+31 + this		and False
+32 | #: Okay
+33 | from u import (a, b)
+34 | from v import c, d
 
 E273 [*] Tab after keyword
   --> E27.py:74:5
@@ -121,13 +111,11 @@ E273 [*] Tab after keyword
 76 | #: E275
    |
 help: Replace with single space
-
-ℹ Safe fix
-71 71 | type  Number = int
-72 72 | 
-73 73 | #: E273
-74    |-type	Number = int
-   74 |+type Number = int
-75 75 | 
-76 76 | #: E275
-77 77 | match(foo):
+71 | type  Number = int
+72 | 
+73 | #: E273
+   - type	Number = int
+74 + type Number = int
+75 | 
+76 | #: E275
+77 | match(foo):
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap
index b77370136a..e4540d9f30 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap
@@ -12,16 +12,14 @@ E274 [*] Tab before keyword
 31 | this        and    False
    |
 help: Replace with single space
-
-ℹ Safe fix
-26 26 | #: E273
-27 27 | a and	b
-28 28 | #: E274
-29    |-a		and b
-   29 |+a and b
-30 30 | #: E273 E274
-31 31 | this		and	False
-32 32 | #: Okay
+26 | #: E273
+27 | a and	b
+28 | #: E274
+   - a		and b
+29 + a and b
+30 | #: E273 E274
+31 | this		and	False
+32 | #: Okay
 
 E274 [*] Tab before keyword
   --> E27.py:31:5
@@ -34,13 +32,11 @@ E274 [*] Tab before keyword
 33 | from u import (a, b)
    |
 help: Replace with single space
-
-ℹ Safe fix
-28 28 | #: E274
-29 29 | a		and b
-30 30 | #: E273 E274
-31    |-this		and	False
-   31 |+this and	False
-32 32 | #: Okay
-33 33 | from u import (a, b)
-34 34 | from v import c, d
+28 | #: E274
+29 | a		and b
+30 | #: E273 E274
+   - this		and	False
+31 + this and	False
+32 | #: Okay
+33 | from u import (a, b)
+34 | from v import c, d
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap
index ce4802d928..83ce6619a4 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap
@@ -12,16 +12,14 @@ E275 [*] Missing whitespace after keyword
 40 | from importable.module import(e, f)
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-35 35 | #: E271
-36 36 | from w import  (e, f)
-37 37 | #: E275
-38    |-from w import(e, f)
-   38 |+from w import (e, f)
-39 39 | #: E275
-40 40 | from importable.module import(e, f)
-41 41 | #: E275
+35 | #: E271
+36 | from w import  (e, f)
+37 | #: E275
+   - from w import(e, f)
+38 + from w import (e, f)
+39 | #: E275
+40 | from importable.module import(e, f)
+41 | #: E275
 
 E275 [*] Missing whitespace after keyword
   --> E27.py:40:24
@@ -34,16 +32,14 @@ E275 [*] Missing whitespace after keyword
 42 | try:
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-37 37 | #: E275
-38 38 | from w import(e, f)
-39 39 | #: E275
-40    |-from importable.module import(e, f)
-   40 |+from importable.module import (e, f)
-41 41 | #: E275
-42 42 | try:
-43 43 |     from importable.module import(e, f)
+37 | #: E275
+38 | from w import(e, f)
+39 | #: E275
+   - from importable.module import(e, f)
+40 + from importable.module import (e, f)
+41 | #: E275
+42 | try:
+43 |     from importable.module import(e, f)
 
 E275 [*] Missing whitespace after keyword
   --> E27.py:43:28
@@ -56,16 +52,14 @@ E275 [*] Missing whitespace after keyword
 45 |     pass
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-40 40 | from importable.module import(e, f)
-41 41 | #: E275
-42 42 | try:
-43    |-    from importable.module import(e, f)
-   43 |+    from importable.module import (e, f)
-44 44 | except ImportError:
-45 45 |     pass
-46 46 | #: E275
+40 | from importable.module import(e, f)
+41 | #: E275
+42 | try:
+   -     from importable.module import(e, f)
+43 +     from importable.module import (e, f)
+44 | except ImportError:
+45 |     pass
+46 | #: E275
 
 E275 [*] Missing whitespace after keyword
   --> E27.py:47:1
@@ -78,16 +72,14 @@ E275 [*] Missing whitespace after keyword
 49 | else:
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-44 44 | except ImportError:
-45 45 |     pass
-46 46 | #: E275
-47    |-if(foo):
-   47 |+if (foo):
-48 48 |     pass
-49 49 | else:
-50 50 |     pass
+44 | except ImportError:
+45 |     pass
+46 | #: E275
+   - if(foo):
+47 + if (foo):
+48 |     pass
+49 | else:
+50 |     pass
 
 E275 [*] Missing whitespace after keyword
   --> E27.py:55:5
@@ -100,16 +92,14 @@ E275 [*] Missing whitespace after keyword
 57 | def f():
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-52 52 | matched = {"true": True, "false": False}
-53 53 | #: E275:2:11
-54 54 | if True:
-55    |-    assert(1)
-   55 |+    assert (1)
-56 56 | #: Okay
-57 57 | def f():
-58 58 |     print((yield))
+52 | matched = {"true": True, "false": False}
+53 | #: E275:2:11
+54 | if True:
+   -     assert(1)
+55 +     assert (1)
+56 | #: Okay
+57 | def f():
+58 |     print((yield))
 
 E275 [*] Missing whitespace after keyword
   --> E27.py:77:1
@@ -121,16 +111,14 @@ E275 [*] Missing whitespace after keyword
 79 |         pass
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-74 74 | type	Number = int
-75 75 | 
-76 76 | #: E275
-77    |-match(foo):
-   77 |+match (foo):
-78 78 |     case(1):
-79 79 |         pass
-80 80 | 
+74 | type	Number = int
+75 | 
+76 | #: E275
+   - match(foo):
+77 + match (foo):
+78 |     case(1):
+79 |         pass
+80 | 
 
 E275 [*] Missing whitespace after keyword
   --> E27.py:78:5
@@ -142,13 +130,11 @@ E275 [*] Missing whitespace after keyword
 79 |         pass
    |
 help: Added missing whitespace after keyword
-
-ℹ Safe fix
-75 75 | 
-76 76 | #: E275
-77 77 | match(foo):
-78    |-    case(1):
-   78 |+    case (1):
-79 79 |         pass
-80 80 | 
-81 81 | # https://github.com/astral-sh/ruff/issues/12094
+75 | 
+76 | #: E275
+77 | match(foo):
+   -     case(1):
+78 +     case (1):
+79 |         pass
+80 | 
+81 | # https://github.com/astral-sh/ruff/issues/12094
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap
index f72f81c611..13360489e4 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap
@@ -12,15 +12,13 @@ E301 [*] Expected 1 blank line, found 0
 480 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-475 475 | 
-476 476 |     def func1():
-477 477 |         pass
-    478 |+
-478 479 |     def func2():
-479 480 |         pass
-480 481 | # end
+475 | 
+476 |     def func1():
+477 |         pass
+478 + 
+479 |     def func2():
+480 |         pass
+481 | # end
 
 E301 [*] Expected 1 blank line, found 0
    --> E30.py:489:5
@@ -33,15 +31,13 @@ E301 [*] Expected 1 blank line, found 0
 491 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-485 485 | 
-486 486 |     def fn1():
-487 487 |         pass
-    488 |+
-488 489 |     # comment
-489 490 |     def fn2():
-490 491 |         pass
+485 | 
+486 |     def fn1():
+487 |         pass
+488 + 
+489 |     # comment
+490 |     def fn2():
+491 |         pass
 
 E301 [*] Expected 1 blank line, found 0
    --> E30.py:499:5
@@ -53,15 +49,13 @@ E301 [*] Expected 1 blank line, found 0
 501 |         pass
     |
 help: Add missing blank line
-
-ℹ Safe fix
-496 496 |     """Class for minimal repo."""
-497 497 | 
-498 498 |     columns = []
-    499 |+
-499 500 |     @classmethod
-500 501 |     def cls_method(cls) -> None:
-501 502 |         pass
+496 |     """Class for minimal repo."""
+497 | 
+498 |     columns = []
+499 + 
+500 |     @classmethod
+501 |     def cls_method(cls) -> None:
+502 |         pass
 
 E301 [*] Expected 1 blank line, found 0
    --> E30.py:511:5
@@ -74,15 +68,13 @@ E301 [*] Expected 1 blank line, found 0
 513 |         pass
     |
 help: Add missing blank line
-
-ℹ Safe fix
-508 508 | 
-509 509 |     def method(cls) -> None:
-510 510 |         pass
-    511 |+
-511 512 |     @classmethod
-512 513 |     def cls_method(cls) -> None:
-513 514 |         pass
+508 | 
+509 |     def method(cls) -> None:
+510 |         pass
+511 + 
+512 |     @classmethod
+513 |     def cls_method(cls) -> None:
+514 |         pass
 
 E301 [*] Expected 1 blank line, found 0
    --> E30.py:526:5
@@ -95,12 +87,29 @@ E301 [*] Expected 1 blank line, found 0
 528 | # end
     |
 help: Add missing blank line
+523 |     @overload
+524 |     def bar(self, x: str) -> str:
+525 |         ...
+526 + 
+527 |     def bar(self, x: int | str) -> int | str:
+528 |         return x
+529 | # end
 
-ℹ Safe fix
-523 523 |     @overload
-524 524 |     def bar(self, x: str) -> str:
-525 525 |         ...
-    526 |+
-526 527 |     def bar(self, x: int | str) -> int | str:
-527 528 |         return x
-528 529 | # end
+E301 [*] Expected 1 blank line, found 0
+   --> E30.py:993:9
+    |
+991 |     if True:
+992 |         print("conditional")
+993 |         def test():
+    |         ^^^
+994 |             pass
+995 | # end
+    |
+help: Add missing blank line
+990 | class Foo:
+991 |     if True:
+992 |         print("conditional")
+993 + 
+994 |         def test():
+995 |             pass
+996 | # end
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap
index 83da023604..f598258bc3 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap
@@ -12,16 +12,14 @@ E302 [*] Expected 2 blank lines, found 0
 535 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-530 530 | 
-531 531 | # E302
-532 532 | """Main module."""
-    533 |+
-    534 |+
-533 535 | def fn():
-534 536 |     pass
-535 537 | # end
+530 | 
+531 | # E302
+532 | """Main module."""
+533 + 
+534 + 
+535 | def fn():
+536 |     pass
+537 | # end
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:540:1
@@ -34,16 +32,14 @@ E302 [*] Expected 2 blank lines, found 0
 542 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-537 537 | 
-538 538 | # E302
-539 539 | import sys
-    540 |+
-    541 |+
-540 542 | def get_sys_path():
-541 543 |     return sys.path
-542 544 | # end
+537 | 
+538 | # E302
+539 | import sys
+540 + 
+541 + 
+542 | def get_sys_path():
+543 |     return sys.path
+544 | # end
 
 E302 [*] Expected 2 blank lines, found 1
    --> E30.py:549:1
@@ -56,15 +52,13 @@ E302 [*] Expected 2 blank lines, found 1
 551 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-546 546 | def a():
-547 547 |     pass
-548 548 | 
-    549 |+
-549 550 | def b():
-550 551 |     pass
-551 552 | # end
+546 | def a():
+547 |     pass
+548 | 
+549 + 
+550 | def b():
+551 |     pass
+552 | # end
 
 E302 [*] Expected 2 blank lines, found 1
    --> E30.py:560:1
@@ -77,15 +71,13 @@ E302 [*] Expected 2 blank lines, found 1
 562 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-557 557 | 
-558 558 | # comment
-559 559 | 
-    560 |+
-560 561 | def b():
-561 562 |     pass
-562 563 | # end
+557 | 
+558 | # comment
+559 | 
+560 + 
+561 | def b():
+562 |     pass
+563 | # end
 
 E302 [*] Expected 2 blank lines, found 1
    --> E30.py:569:1
@@ -98,15 +90,13 @@ E302 [*] Expected 2 blank lines, found 1
 571 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-566 566 | def a():
-567 567 |     pass
-568 568 | 
-    569 |+
-569 570 | async def b():
-570 571 |     pass
-571 572 | # end
+566 | def a():
+567 |     pass
+568 | 
+569 + 
+570 | async def b():
+571 |     pass
+572 | # end
 
 E302 [*] Expected 2 blank lines, found 1
    --> E30.py:578:1
@@ -119,15 +109,13 @@ E302 [*] Expected 2 blank lines, found 1
 580 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-575 575 | async  def x():
-576 576 |     pass
-577 577 | 
-    578 |+
-578 579 | async  def x(y: int = 1):
-579 580 |     pass
-580 581 | # end
+575 | async  def x():
+576 |     pass
+577 | 
+578 + 
+579 | async  def x(y: int = 1):
+580 |     pass
+581 | # end
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:586:1
@@ -139,16 +127,14 @@ E302 [*] Expected 2 blank lines, found 0
 587 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-583 583 | # E302
-584 584 | def bar():
-585 585 |     pass
-    586 |+
-    587 |+
-586 588 | def baz(): pass
-587 589 | # end
-588 590 | 
+583 | # E302
+584 | def bar():
+585 |     pass
+586 + 
+587 + 
+588 | def baz(): pass
+589 | # end
+590 | 
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:592:1
@@ -161,16 +147,14 @@ E302 [*] Expected 2 blank lines, found 0
 594 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-589 589 | 
-590 590 | # E302
-591 591 | def bar(): pass
-    592 |+
-    593 |+
-592 594 | def baz():
-593 595 |     pass
-594 596 | # end
+589 | 
+590 | # E302
+591 | def bar(): pass
+592 + 
+593 + 
+594 | def baz():
+595 |     pass
+596 | # end
 
 E302 [*] Expected 2 blank lines, found 1
    --> E30.py:602:1
@@ -182,15 +166,13 @@ E302 [*] Expected 2 blank lines, found 1
 604 |     pass
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-598 598 | def f():
-599 599 |     pass
-600 600 | 
-    601 |+
-601 602 | # comment
-602 603 | @decorator
-603 604 | def g():
+598 | def f():
+599 |     pass
+600 | 
+601 + 
+602 | # comment
+603 | @decorator
+604 | def g():
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:624:1
@@ -202,16 +184,14 @@ E302 [*] Expected 2 blank lines, found 0
 625 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-621 621 | 
-622 622 | # E302
-623 623 | class A:...
-    624 |+
-    625 |+
-624 626 | class B: ...
-625 627 | # end
-626 628 | 
+621 | 
+622 | # E302
+623 | class A:...
+624 + 
+625 + 
+626 | class B: ...
+627 | # end
+628 | 
 
 E302 [*] Expected 2 blank lines, found 1
    --> E30.py:634:1
@@ -224,15 +204,13 @@ E302 [*] Expected 2 blank lines, found 1
 636 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-631 631 | @overload
-632 632 | def fn(a: str) -> str: ...
-633 633 | 
-    634 |+
-634 635 | def fn(a: int | str) -> int | str:
-635 636 |     ...
-636 637 | # end
+631 | @overload
+632 | def fn(a: str) -> str: ...
+633 | 
+634 + 
+635 | def fn(a: int | str) -> int | str:
+636 |     ...
+637 | # end
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:944:1
@@ -245,16 +223,14 @@ E302 [*] Expected 2 blank lines, found 0
 946 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-941 941 | def test_update():
-942 942 |     pass
-943 943 |     # comment
-    944 |+
-    945 |+
-944 946 | def test_clientmodel():
-945 947 |     pass
-946 948 | # end
+941 | def test_update():
+942 |     pass
+943 |     # comment
+944 + 
+945 + 
+946 | def test_clientmodel():
+947 |     pass
+948 | # end
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:953:1
@@ -267,16 +243,14 @@ E302 [*] Expected 2 blank lines, found 0
 955 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-950 950 | def test_update():
-951 951 |     pass
-952 952 |         # comment
-    953 |+
-    954 |+
-953 955 | def test_clientmodel():
-954 956 |     pass
-955 957 | # end
+950 | def test_update():
+951 |     pass
+952 |         # comment
+953 + 
+954 + 
+955 | def test_clientmodel():
+956 |     pass
+957 | # end
 
 E302 [*] Expected 2 blank lines, found 0
    --> E30.py:962:1
@@ -289,13 +263,11 @@ E302 [*] Expected 2 blank lines, found 0
 964 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-958 958 | # E302
-959 959 | def test_update():
-960 960 |     pass
-    961 |+
-    962 |+
-961 963 | # comment
-962 964 | def test_clientmodel():
-963 965 |     pass
+958 | # E302
+959 | def test_update():
+960 |     pass
+961 + 
+962 + 
+963 | # comment
+964 | def test_clientmodel():
+965 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap
index 236d2a724f..e021a4a224 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap
@@ -11,10 +11,8 @@ E302 [*] Expected 2 blank lines, found 1
 4 |     pass
   |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-1 1 | """Test where the error is after the module's docstring."""
-2 2 | 
-  3 |+
-3 4 | def fn():
-4 5 |     pass
+1 | """Test where the error is after the module's docstring."""
+2 | 
+3 + 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap
index 9bce5adbdc..0aa7b284cf 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap
@@ -11,10 +11,8 @@ E302 [*] Expected 2 blank lines, found 1
 4 |     pass
   |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-1 1 | "Test where the first line is a comment, " + "and the rule violation follows it."
-2 2 | 
-  3 |+
-3 4 | def fn():
-4 5 |     pass
+1 | "Test where the first line is a comment, " + "and the rule violation follows it."
+2 | 
+3 + 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap
index dae5f7c98a..33d80a82aa 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap
@@ -11,11 +11,9 @@ E302 [*] Expected 2 blank lines, found 1
 5 |     pass
   |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-1 1 | def fn1():
-2 2 |     pass
-3 3 | 
-  4 |+
-4 5 | def fn2():
-5 6 |     pass
+1 | def fn1():
+2 |     pass
+3 | 
+4 + 
+5 | def fn2():
+6 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap
index 3951c67b86..ffa7bac2f9 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap
@@ -11,10 +11,8 @@ E302 [*] Expected 2 blank lines, found 1
 4 |     pass
   |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-1 1 | print("Test where the first line is a statement, and the rule violation follows it.")
-2 2 | 
-  3 |+
-3 4 | def fn():
-4 5 |     pass
+1 | print("Test where the first line is a statement, and the rule violation follows it.")
+2 | 
+3 + 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap
index 1551b0be0d..a793f49d25 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap
@@ -10,15 +10,13 @@ E303 [*] Too many blank lines (2)
 619 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-613 613 | 	def method1():
-614 614 | 		return 1
-615 615 | 
-616     |-
-617 616 | 	def method2():
-618 617 | 		return 22
-619 618 | # end
+613 | 	def method1():
+614 | 		return 1
+615 | 
+    - 
+616 | 	def method2():
+617 | 		return 22
+618 | # end
 
 E303 [*] Too many blank lines (2)
    --> E30.py:644:5
@@ -29,15 +27,13 @@ E303 [*] Too many blank lines (2)
 646 |     def inner():  # E306 not expected (pycodestyle detects E306)
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-640 640 | def fn():
-641 641 |     _ = None
-642 642 | 
-643     |-
-644 643 |     # arbitrary comment
-645 644 | 
-646 645 |     def inner():  # E306 not expected (pycodestyle detects E306)
+640 | def fn():
+641 |     _ = None
+642 | 
+    - 
+643 |     # arbitrary comment
+644 | 
+645 |     def inner():  # E306 not expected (pycodestyle detects E306)
 
 E303 [*] Too many blank lines (2)
    --> E30.py:656:5
@@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2)
 658 |         pass
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-652 652 | def fn():
-653 653 |     _ = None
-654 654 | 
-655     |-
-656 655 |     # arbitrary comment
-657 656 |     def inner():  # E306 not expected (pycodestyle detects E306)
-658 657 |         pass
+652 | def fn():
+653 |     _ = None
+654 | 
+    - 
+655 |     # arbitrary comment
+656 |     def inner():  # E306 not expected (pycodestyle detects E306)
+657 |         pass
 
 E303 [*] Too many blank lines (3)
    --> E30.py:667:1
@@ -66,15 +60,13 @@ E303 [*] Too many blank lines (3)
 668 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-663 663 | print()
-664 664 | 
-665 665 | 
-666     |-
-667 666 | print()
-668 667 | # end
-669 668 | 
+663 | print()
+664 | 
+665 | 
+    - 
+666 | print()
+667 | # end
+668 | 
 
 E303 [*] Too many blank lines (3)
    --> E30.py:676:1
@@ -85,15 +77,13 @@ E303 [*] Too many blank lines (3)
 678 | print()
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-672 672 | print()
-673 673 | 
-674 674 | 
-675     |-
-676 675 | # comment
-677 676 | 
-678 677 | print()
+672 | print()
+673 | 
+674 | 
+    - 
+675 | # comment
+676 | 
+677 | print()
 
 E303 [*] Too many blank lines (2)
    --> E30.py:687:5
@@ -102,15 +92,13 @@ E303 [*] Too many blank lines (2)
     |     ^^^^^^^^^
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-683 683 | def a():
-684 684 |     print()
-685 685 | 
-686     |-
-687 686 |     # comment
-688 687 | 
-689 688 | 
+683 | def a():
+684 |     print()
+685 | 
+    - 
+686 |     # comment
+687 | 
+688 | 
 
 E303 [*] Too many blank lines (2)
    --> E30.py:690:5
@@ -121,15 +109,13 @@ E303 [*] Too many blank lines (2)
 692 |     print()
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-686 686 | 
-687 687 |     # comment
-688 688 | 
-689     |-
-690 689 |     # another comment
-691 690 | 
-692 691 |     print()
+686 | 
+687 |     # comment
+688 | 
+    - 
+689 |     # another comment
+690 | 
+691 |     print()
 
 E303 [*] Too many blank lines (3)
    --> E30.py:701:1
@@ -141,15 +127,13 @@ E303 [*] Too many blank lines (3)
 704 |   # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-697 697 | #!python
-698 698 | 
-699 699 | 
-700     |-
-701 700 | """This class docstring comes on line 5.
-702 701 | It gives error E303: too many blank lines (3)
-703 702 | """
+697 | #!python
+698 | 
+699 | 
+    - 
+700 | """This class docstring comes on line 5.
+701 | It gives error E303: too many blank lines (3)
+702 | """
 
 E303 [*] Too many blank lines (2)
    --> E30.py:713:5
@@ -160,15 +144,13 @@ E303 [*] Too many blank lines (2)
 715 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-709 709 |     def a(self):
-710 710 |         pass
-711 711 | 
-712     |-
-713 712 |     def b(self):
-714 713 |         pass
-715 714 | # end
+709 |     def a(self):
+710 |         pass
+711 | 
+    - 
+712 |     def b(self):
+713 |         pass
+714 | # end
 
 E303 [*] Too many blank lines (2)
    --> E30.py:723:5
@@ -178,15 +160,13 @@ E303 [*] Too many blank lines (2)
 724 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-719 719 | if True:
-720 720 |     a = 1
-721 721 | 
-722     |-
-723 722 |     a = 2
-724 723 | # end
-725 724 | 
+719 | if True:
+720 |     a = 1
+721 | 
+    - 
+722 |     a = 2
+723 | # end
+724 | 
 
 E303 [*] Too many blank lines (2)
    --> E30.py:731:5
@@ -195,15 +175,13 @@ E303 [*] Too many blank lines (2)
     |     ^^^^^^^^^
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-727 727 | # E303
-728 728 | class Test:
-729 729 | 
-730     |-
-731 730 |     # comment
-732 731 | 
-733 732 | 
+727 | # E303
+728 | class Test:
+729 | 
+    - 
+730 |     # comment
+731 | 
+732 | 
 
 E303 [*] Too many blank lines (2)
    --> E30.py:734:5
@@ -214,15 +192,13 @@ E303 [*] Too many blank lines (2)
 736 |     def test(self): pass
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-730 730 | 
-731 731 |     # comment
-732 732 | 
-733     |-
-734 733 |     # another comment
-735 734 | 
-736 735 |     def test(self): pass
+730 | 
+731 |     # comment
+732 | 
+    - 
+733 |     # another comment
+734 | 
+735 |     def test(self): pass
 
 E303 [*] Too many blank lines (2)
    --> E30.py:748:5
@@ -233,15 +209,13 @@ E303 [*] Too many blank lines (2)
 750 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-744 744 | 
-745 745 | # wrongly indented comment
-746 746 | 
-747     |-
-748 747 |     def b(self):
-749 748 |         pass
-750 749 | # end
+744 | 
+745 | # wrongly indented comment
+746 | 
+    - 
+747 |     def b(self):
+748 |         pass
+749 | # end
 
 E303 [*] Too many blank lines (2)
    --> E30.py:758:5
@@ -251,12 +225,10 @@ E303 [*] Too many blank lines (2)
 759 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-754 754 | def fn():
-755 755 |     pass
-756 756 | 
-757     |-
-758 757 |     pass
-759 758 | # end
-760 759 |
+754 | def fn():
+755 |     pass
+756 | 
+    - 
+757 |     pass
+758 | # end
+759 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap
index 69abdc2255..26a455e445 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap
@@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3)
 6 |     pass
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | # Test where the first line is a comment, and the rule violation follows it.
-2 2 | 
-3 3 | 
-4   |-
-5 4 | def fn():
-6 5 |     pass
+1 | # Test where the first line is a comment, and the rule violation follows it.
+2 | 
+3 | 
+  - 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap
index a17b0e2583..fadad42fa6 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap
@@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3)
 6 |     pass
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | """Test where the error is after the module's docstring."""
-2 2 | 
-3 3 | 
-4   |-
-5 4 | def fn():
-6 5 |     pass
+1 | """Test where the error is after the module's docstring."""
+2 | 
+3 | 
+  - 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap
index 5b5949a0ad..c7b102856d 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap
@@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3)
 6 |     pass
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | "Test where the first line is a comment, " + "and the rule violation follows it."
-2 2 | 
-3 3 | 
-4   |-
-5 4 | def fn():
-6 5 |     pass
+1 | "Test where the first line is a comment, " + "and the rule violation follows it."
+2 | 
+3 | 
+  - 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap
index 76cd66baf6..5cfbafff8a 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap
@@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3)
 6 |     pass
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | print("Test where the first line is a statement, and the rule violation follows it.")
-2 2 | 
-3 3 | 
-4   |-
-5 4 | def fn():
-6 5 |     pass
+1 | print("Test where the first line is a statement, and the rule violation follows it.")
+2 | 
+3 | 
+  - 
+4 | def fn():
+5 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap
index 8600852a29..383dee6b36 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap
@@ -12,15 +12,13 @@ E304 [*] Blank lines found after function decorator (1)
 767 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-761 761 | 
-762 762 | # E304
-763 763 | @decorator
-764     |-
-765 764 | def function():
-766 765 |     pass
-767 766 | # end
+761 | 
+762 | # E304
+763 | @decorator
+    - 
+764 | def function():
+765 |     pass
+766 | # end
 
 E304 [*] Blank lines found after function decorator (1)
    --> E30.py:774:1
@@ -32,15 +30,13 @@ E304 [*] Blank lines found after function decorator (1)
 776 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-769 769 | 
-770 770 | # E304
-771 771 | @decorator
-772     |-
-773 772 | # comment    E304 not expected
-774 773 | def function():
-775 774 |     pass
+769 | 
+770 | # E304
+771 | @decorator
+    - 
+772 | # comment    E304 not expected
+773 | def function():
+774 |     pass
 
 E304 [*] Blank lines found after function decorator (2)
    --> E30.py:786:1
@@ -52,15 +48,13 @@ E304 [*] Blank lines found after function decorator (2)
 788 | # end
     |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-778 778 | 
-779 779 | # E304
-780 780 | @decorator
-781     |-
-782 781 | # comment  E304 not expected
-783     |-
-784     |-
-785 782 | # second comment  E304 not expected
-786 783 | def function():
-787 784 |     pass
+778 | 
+779 | # E304
+780 | @decorator
+    - 
+781 | # comment  E304 not expected
+    - 
+    - 
+782 | # second comment  E304 not expected
+783 | def function():
+784 |     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap
index 4991548cac..b57173b4a5 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap
@@ -10,15 +10,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 799 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-795 795 |     # comment
-796 796 | 
-797 797 |     # another comment
-    798 |+
-798 799 | fn()
-799 800 | # end
-800 801 | 
+795 |     # comment
+796 | 
+797 |     # another comment
+798 + 
+799 | fn()
+800 | # end
+801 | 
 
 E305 [*] Expected 2 blank lines after class or function definition, found (1)
    --> E30.py:809:1
@@ -29,15 +27,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 810 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-806 806 |     # comment
-807 807 | 
-808 808 |     # another comment
-    809 |+
-809 810 | a = 1
-810 811 | # end
-811 812 | 
+806 |     # comment
+807 | 
+808 |     # another comment
+809 + 
+810 | a = 1
+811 | # end
+812 | 
 
 E305 [*] Expected 2 blank lines after class or function definition, found (1)
    --> E30.py:821:1
@@ -50,15 +46,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 823 | except Exception:
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-818 818 | 
-819 819 |     # another comment
-820 820 | 
-    821 |+
-821 822 | try:
-822 823 |     fn()
-823 824 | except Exception:
+818 | 
+819 |     # another comment
+820 | 
+821 + 
+822 | try:
+823 |     fn()
+824 | except Exception:
 
 E305 [*] Expected 2 blank lines after class or function definition, found (1)
    --> E30.py:833:1
@@ -70,15 +64,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 835 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-829 829 | def a():
-830 830 |     print()
-831 831 | 
-    832 |+
-832 833 | # Two spaces before comments, too.
-833 834 | if a():
-834 835 |     a()
+829 | def a():
+830 |     print()
+831 | 
+832 + 
+833 | # Two spaces before comments, too.
+834 | if a():
+835 |     a()
 
 E305 [*] Expected 2 blank lines after class or function definition, found (1)
    --> E30.py:846:1
@@ -91,15 +83,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 848 | # end
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-843 843 | def main():
-844 844 |     blah, blah
-845 845 | 
-    846 |+
-846 847 | if __name__ == '__main__':
-847 848 |     main()
-848 849 | # end
+843 | def main():
+844 |     blah, blah
+845 | 
+846 + 
+847 | if __name__ == '__main__':
+848 |     main()
+849 | # end
 
 E305 [*] Expected 2 blank lines after class or function definition, found (1)
    --> E30.py:973:1
@@ -110,12 +100,10 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 974 | APPLE = 200
     |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-969 969 | class A:
-970 970 |     pass
-971 971 | 
-    972 |+
-972 973 | # ====== Cool constants ========
-973 974 | BANANA = 100
-974 975 | APPLE = 200
+969 | class A:
+970 |     pass
+971 | 
+972 + 
+973 | # ====== Cool constants ========
+974 | BANANA = 100
+975 | APPLE = 200
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap
index b322886e7d..b3cba08a97 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap
@@ -12,15 +12,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 856 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-851 851 | # E306:3:5
-852 852 | def a():
-853 853 |     x = 1
-    854 |+
-854 855 |     def b():
-855 856 |         pass
-856 857 | # end
+851 | # E306:3:5
+852 | def a():
+853 |     x = 1
+854 + 
+855 |     def b():
+856 |         pass
+857 | # end
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:862:5
@@ -33,15 +31,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 864 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-859 859 | #: E306:3:5
-860 860 | async def a():
-861 861 |     x = 1
-    862 |+
-862 863 |     def b():
-863 864 |         pass
-864 865 | # end
+859 | #: E306:3:5
+860 | async def a():
+861 |     x = 1
+862 + 
+863 |     def b():
+864 |         pass
+865 | # end
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:870:5
@@ -54,15 +50,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 872 |         def c():
     |
 help: Add missing blank line
-
-ℹ Safe fix
-867 867 | #: E306:3:5 E306:5:9
-868 868 | def a():
-869 869 |     x = 2
-    870 |+
-870 871 |     def b():
-871 872 |         x = 1
-872 873 |         def c():
+867 | #: E306:3:5 E306:5:9
+868 | def a():
+869 |     x = 2
+870 + 
+871 |     def b():
+872 |         x = 1
+873 |         def c():
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:872:9
@@ -75,15 +69,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 874 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-869 869 |     x = 2
-870 870 |     def b():
-871 871 |         x = 1
-    872 |+
-872 873 |         def c():
-873 874 |             pass
-874 875 | # end
+869 |     x = 2
+870 |     def b():
+871 |         x = 1
+872 + 
+873 |         def c():
+874 |             pass
+875 | # end
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:880:5
@@ -96,15 +88,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 882 |     x = 2
     |
 help: Add missing blank line
-
-ℹ Safe fix
-877 877 | # E306:3:5 E306:6:5
-878 878 | def a():
-879 879 |     x = 1
-    880 |+
-880 881 |     class C:
-881 882 |         pass
-882 883 |     x = 2
+877 | # E306:3:5 E306:6:5
+878 | def a():
+879 |     x = 1
+880 + 
+881 |     class C:
+882 |         pass
+883 |     x = 2
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:883:5
@@ -117,15 +107,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 885 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-880 880 |     class C:
-881 881 |         pass
-882 882 |     x = 2
-    883 |+
-883 884 |     def b():
-884 885 |         pass
-885 886 | # end
+880 |     class C:
+881 |         pass
+882 |     x = 2
+883 + 
+884 |     def b():
+885 |         pass
+886 | # end
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:892:5
@@ -137,15 +125,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 893 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-889 889 | def foo():
-890 890 |     def bar():
-891 891 |         pass
-    892 |+
-892 893 |     def baz(): pass
-893 894 | # end
-894 895 | 
+889 | def foo():
+890 |     def bar():
+891 |         pass
+892 + 
+893 |     def baz(): pass
+894 | # end
+895 | 
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:899:5
@@ -158,15 +144,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 901 | # end
     |
 help: Add missing blank line
-
-ℹ Safe fix
-896 896 | # E306:3:5
-897 897 | def foo():
-898 898 |     def bar(): pass
-    899 |+
-899 900 |     def baz():
-900 901 |         pass
-901 902 | # end
+896 | # E306:3:5
+897 | def foo():
+898 |     def bar(): pass
+899 + 
+900 |     def baz():
+901 |         pass
+902 | # end
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:907:5
@@ -179,15 +163,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 909 |         pass
     |
 help: Add missing blank line
-
-ℹ Safe fix
-904 904 | # E306
-905 905 | def a():
-906 906 |     x = 2
-    907 |+
-907 908 |     @decorator
-908 909 |     def b():
-909 910 |         pass
+904 | # E306
+905 | def a():
+906 |     x = 2
+907 + 
+908 |     @decorator
+909 |     def b():
+910 |         pass
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:916:5
@@ -200,15 +182,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 918 |         pass
     |
 help: Add missing blank line
-
-ℹ Safe fix
-913 913 | # E306
-914 914 | def a():
-915 915 |     x = 2
-    916 |+
-916 917 |     @decorator
-917 918 |     async def b():
-918 919 |         pass
+913 | # E306
+914 | def a():
+915 |     x = 2
+916 + 
+917 |     @decorator
+918 |     async def b():
+919 |         pass
 
 E306 [*] Expected 1 blank line before a nested definition, found 0
    --> E30.py:925:5
@@ -221,12 +201,67 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 927 | # end
     |
 help: Add missing blank line
+922 | # E306
+923 | def a():
+924 |     x = 2
+925 + 
+926 |     async def b():
+927 |         pass
+928 | # end
 
-ℹ Safe fix
-922 922 | # E306
-923 923 | def a():
-924 924 |     x = 2
-    925 |+
-925 926 |     async def b():
-926 927 |         pass
-927 928 | # end
+E306 [*] Expected 1 blank line before a nested definition, found 0
+   --> E30.py:983:9
+    |
+981 |     async def recv(self, *, length=65536):
+982 |         loop = asyncio.get_event_loop()
+983 |         def callback():
+    |         ^^^
+984 |             loop.remove_reader(self._fd)
+985 |         loop.add_reader(self._fd, callback)
+    |
+help: Add missing blank line
+980 | class foo:
+981 |     async def recv(self, *, length=65536):
+982 |         loop = asyncio.get_event_loop()
+983 + 
+984 |         def callback():
+985 |             loop.remove_reader(self._fd)
+986 |         loop.add_reader(self._fd, callback)
+
+E306 [*] Expected 1 blank line before a nested definition, found 0
+    --> E30.py:1002:9
+     |
+1000 |     def f():
+1001 |         x = 1
+1002 |         def g():
+     |         ^^^
+1003 |             return 1
+1004 |         return 2
+     |
+help: Add missing blank line
+999  | class Bar:
+1000 |     def f():
+1001 |         x = 1
+1002 + 
+1003 |         def g():
+1004 |             return 1
+1005 |         return 2
+
+E306 [*] Expected 1 blank line before a nested definition, found 0
+    --> E30.py:1009:13
+     |
+1007 |         class Baz:
+1008 |             x = 1
+1009 |             def g():
+     |             ^^^
+1010 |                 return 1
+1011 |             return 2
+     |
+help: Add missing blank line
+1006 |     def f():
+1007 |         class Baz:
+1008 |             x = 1
+1009 + 
+1010 |             def g():
+1011 |                 return 1
+1012 |             return 2
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap
index d9b8910ed4..c5c2ac2f41 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap
@@ -11,15 +11,13 @@ E401 [*] Multiple imports on one line
 4 | #: Okay
   |
 help: Split imports
-
-ℹ Safe fix
-1 1 | #: E401
-2   |-import os, sys
-  2 |+import os
-  3 |+import sys
-3 4 | 
-4 5 | #: Okay
-5 6 | import os
+1 | #: E401
+  - import os, sys
+2 + import os
+3 + import sys
+4 | 
+5 | #: Okay
+6 | import os
 
 E401 [*] Multiple imports on one line
   --> E40.py:65:1
@@ -30,17 +28,15 @@ E401 [*] Multiple imports on one line
 66 | import re as regex, string; x = 1
    |
 help: Split imports
-
-ℹ Safe fix
-62 62 | import bar
-63 63 | 
-64 64 | #: E401
-65    |-import re as regex, string  # also with a comment!
-   65 |+import re as regex
-   66 |+import string  # also with a comment!
-66 67 | import re as regex, string; x = 1
-67 68 | 
-68 69 | x = 1; import re as regex, string
+62 | import bar
+63 | 
+64 | #: E401
+   - import re as regex, string  # also with a comment!
+65 + import re as regex
+66 + import string  # also with a comment!
+67 | import re as regex, string; x = 1
+68 | 
+69 | x = 1; import re as regex, string
 
 E401 [*] Multiple imports on one line
   --> E40.py:66:1
@@ -53,16 +49,14 @@ E401 [*] Multiple imports on one line
 68 | x = 1; import re as regex, string
    |
 help: Split imports
-
-ℹ Safe fix
-63 63 | 
-64 64 | #: E401
-65 65 | import re as regex, string  # also with a comment!
-66    |-import re as regex, string; x = 1
-   66 |+import re as regex; import string; x = 1
-67 67 | 
-68 68 | x = 1; import re as regex, string
-69 69 | 
+63 | 
+64 | #: E401
+65 | import re as regex, string  # also with a comment!
+   - import re as regex, string; x = 1
+66 + import re as regex; import string; x = 1
+67 | 
+68 | x = 1; import re as regex, string
+69 | 
 
 E401 [*] Multiple imports on one line
   --> E40.py:68:8
@@ -73,16 +67,14 @@ E401 [*] Multiple imports on one line
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Split imports
-
-ℹ Safe fix
-65 65 | import re as regex, string  # also with a comment!
-66 66 | import re as regex, string; x = 1
-67 67 | 
-68    |-x = 1; import re as regex, string
-   68 |+x = 1; import re as regex; import string
-69 69 | 
-70 70 | 
-71 71 | def blah():
+65 | import re as regex, string  # also with a comment!
+66 | import re as regex, string; x = 1
+67 | 
+   - x = 1; import re as regex, string
+68 + x = 1; import re as regex; import string
+69 | 
+70 | 
+71 | def blah():
 
 E401 [*] Multiple imports on one line
   --> E40.py:72:5
@@ -94,17 +86,15 @@ E401 [*] Multiple imports on one line
 74 |     def nested_and_tested():
    |
 help: Split imports
-
-ℹ Safe fix
-69 69 | 
-70 70 | 
-71 71 | def blah():
-72    |-    import datetime as dt, copy
-   72 |+    import datetime as dt
-   73 |+    import copy
-73 74 | 
-74 75 |     def nested_and_tested():
-75 76 |         import builtins, textwrap as tw
+69 | 
+70 | 
+71 | def blah():
+   -     import datetime as dt, copy
+72 +     import datetime as dt
+73 +     import copy
+74 | 
+75 |     def nested_and_tested():
+76 |         import builtins, textwrap as tw
 
 E401 [*] Multiple imports on one line
   --> E40.py:75:9
@@ -116,17 +106,15 @@ E401 [*] Multiple imports on one line
 77 |         x = 1; import re as regex, string
    |
 help: Split imports
-
-ℹ Safe fix
-72 72 |     import datetime as dt, copy
-73 73 | 
-74 74 |     def nested_and_tested():
-75    |-        import builtins, textwrap as tw
-   75 |+        import builtins
-   76 |+        import textwrap as tw
-76 77 | 
-77 78 |         x = 1; import re as regex, string
-78 79 |         import re as regex, string; x = 1
+72 |     import datetime as dt, copy
+73 | 
+74 |     def nested_and_tested():
+   -         import builtins, textwrap as tw
+75 +         import builtins
+76 +         import textwrap as tw
+77 | 
+78 |         x = 1; import re as regex, string
+79 |         import re as regex, string; x = 1
 
 E401 [*] Multiple imports on one line
   --> E40.py:77:16
@@ -138,16 +126,14 @@ E401 [*] Multiple imports on one line
 78 |         import re as regex, string; x = 1
    |
 help: Split imports
-
-ℹ Safe fix
-74 74 |     def nested_and_tested():
-75 75 |         import builtins, textwrap as tw
-76 76 | 
-77    |-        x = 1; import re as regex, string
-   77 |+        x = 1; import re as regex; import string
-78 78 |         import re as regex, string; x = 1
-79 79 | 
-80 80 |     if True: import re as regex, string
+74 |     def nested_and_tested():
+75 |         import builtins, textwrap as tw
+76 | 
+   -         x = 1; import re as regex, string
+77 +         x = 1; import re as regex; import string
+78 |         import re as regex, string; x = 1
+79 | 
+80 |     if True: import re as regex, string
 
 E401 [*] Multiple imports on one line
   --> E40.py:78:9
@@ -159,15 +145,13 @@ E401 [*] Multiple imports on one line
 80 |     if True: import re as regex, string
    |
 help: Split imports
-
-ℹ Safe fix
-75 75 |         import builtins, textwrap as tw
-76 76 | 
-77 77 |         x = 1; import re as regex, string
-78    |-        import re as regex, string; x = 1
-   78 |+        import re as regex; import string; x = 1
-79 79 | 
-80 80 |     if True: import re as regex, string
+75 |         import builtins, textwrap as tw
+76 | 
+77 |         x = 1; import re as regex, string
+   -         import re as regex, string; x = 1
+78 +         import re as regex; import string; x = 1
+79 | 
+80 |     if True: import re as regex, string
 
 E401 [*] Multiple imports on one line
   --> E40.py:80:14
@@ -178,10 +162,8 @@ E401 [*] Multiple imports on one line
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Split imports
-
-ℹ Safe fix
-77 77 |         x = 1; import re as regex, string
-78 78 |         import re as regex, string; x = 1
-79 79 | 
-80    |-    if True: import re as regex, string
-   80 |+    if True: import re as regex; import string
+77 |         x = 1; import re as regex, string
+78 |         import re as regex, string; x = 1
+79 | 
+   -     if True: import re as regex, string
+80 +     if True: import re as regex; import string
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap
index 9b62eb2ee9..a4e605d2cb 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap
@@ -12,16 +12,14 @@ E703 [*] Statement ends with an unnecessary semicolon
 12 | del a[:]; a.append(42);
    |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-7  7  | #: E702:1:17
-8  8  | import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe)
-9  9  | #: E703:1:13
-10    |-import shlex;
-   10 |+import shlex
-11 11 | #: E702:1:9 E703:1:23
-12 12 | del a[:]; a.append(42);
-13 13 | #: E704:1:1
+7  | #: E702:1:17
+8  | import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe)
+9  | #: E703:1:13
+   - import shlex;
+10 + import shlex
+11 | #: E702:1:9 E703:1:23
+12 | del a[:]; a.append(42);
+13 | #: E704:1:1
 
 E703 [*] Statement ends with an unnecessary semicolon
   --> E70.py:12:23
@@ -34,16 +32,14 @@ E703 [*] Statement ends with an unnecessary semicolon
 14 | def f(x): return 2
    |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-9  9  | #: E703:1:13
-10 10 | import shlex;
-11 11 | #: E702:1:9 E703:1:23
-12    |-del a[:]; a.append(42);
-   12 |+del a[:]; a.append(42)
-13 13 | #: E704:1:1
-14 14 | def f(x): return 2
-15 15 | #: E704:1:1
+9  | #: E703:1:13
+10 | import shlex;
+11 | #: E702:1:9 E703:1:23
+   - del a[:]; a.append(42);
+12 + del a[:]; a.append(42)
+13 | #: E704:1:1
+14 | def f(x): return 2
+15 | #: E704:1:1
 
 E703 [*] Statement ends with an unnecessary semicolon
   --> E70.py:25:14
@@ -56,16 +52,14 @@ E703 [*] Statement ends with an unnecessary semicolon
 27 | if True: lambda a: b
    |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-22 22 | while all is round:
-23 23 |     def f(x): return 2*x
-24 24 | #: E704:1:8 E702:1:11 E703:1:14
-25    |-if True: x; y;
-   25 |+if True: x; y
-26 26 | #: E701:1:8
-27 27 | if True: lambda a: b
-28 28 | #: E701:1:10
+22 | while all is round:
+23 |     def f(x): return 2*x
+24 | #: E704:1:8 E702:1:11 E703:1:14
+   - if True: x; y;
+25 + if True: x; y
+26 | #: E701:1:8
+27 | if True: lambda a: b
+28 | #: E701:1:10
 
 E703 [*] Statement ends with an unnecessary semicolon
   --> E70.py:68:1
@@ -78,17 +72,15 @@ E703 [*] Statement ends with an unnecessary semicolon
 70 | a = \
    |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-64 64 | while 1:
-65 65 |   1;...
-66 66 | #: E703:2:1
-67    |-0\
-68    |-;
-   67 |+0
-69 68 | #: E701:2:3
-70 69 | a = \
-71 70 |   5;
+64 | while 1:
+65 |   1;...
+66 | #: E703:2:1
+   - 0\
+   - ;
+67 + 0
+68 | #: E701:2:3
+69 | a = \
+70 |   5;
 
 E703 [*] Statement ends with an unnecessary semicolon
   --> E70.py:71:4
@@ -101,12 +93,10 @@ E703 [*] Statement ends with an unnecessary semicolon
 73 | with x(y) as z: ...
    |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-68 68 | ;
-69 69 | #: E701:2:3
-70 70 | a = \
-71    |-  5;
-   71 |+  5
-72 72 | #:
-73 73 | with x(y) as z: ...
+68 | ;
+69 | #: E701:2:3
+70 | a = \
+   -   5;
+71 +   5
+72 | #:
+73 | with x(y) as z: ...
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap
index 03e8193c87..b0b21c9051 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap
@@ -12,16 +12,14 @@ E703 [*] Statement ends with an unnecessary semicolon
 7 | # Nested expressions isn't relevant
   |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-2 2 | # Simple case
-3 3 | x;
-4 4 | # Only skip the last expression
-5   |-x;  # E703
-  5 |+x  # E703
-6 6 | x;
-7 7 | # Nested expressions isn't relevant
-8 8 | if True:
+2 | # Simple case
+3 | x;
+4 | # Only skip the last expression
+  - x;  # E703
+5 + x  # E703
+6 | x;
+7 | # Nested expressions isn't relevant
+8 | if True:
 
 E703 [*] Statement ends with an unnecessary semicolon
   --> E703.ipynb:9:6
@@ -34,13 +32,11 @@ E703 [*] Statement ends with an unnecessary semicolon
 11 | x; x;
    |
 help: Remove unnecessary semicolon
-
-ℹ Safe fix
-6  6  | x;
-7  7  | # Nested expressions isn't relevant
-8  8  | if True:
-9     |-    x;
-   9  |+    x
-10 10 | # Semicolons with multiple expressions
-11 11 | x; x;
-12 12 | # Comments, newlines and whitespace
+6  | x;
+7  | # Nested expressions isn't relevant
+8  | if True:
+   -     x;
+9  +     x
+10 | # Semicolons with multiple expressions
+11 | x; x;
+12 | # Comments, newlines and whitespace
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap
index ea67cff398..c8614bf34a 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap
@@ -11,14 +11,13 @@ E711 [*] Comparison to `None` should be `cond is None`
 4 | #: E711
   |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-1 1 | #: E711
-2   |-if res == None:
-  2 |+if res is None:
-3 3 |     pass
-4 4 | #: E711
-5 5 | if res != None:
+1 | #: E711
+  - if res == None:
+2 + if res is None:
+3 |     pass
+4 | #: E711
+5 | if res != None:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is not None`
  --> E711.py:5:11
@@ -31,16 +30,15 @@ E711 [*] Comparison to `None` should be `cond is not None`
 7 | #: E711
   |
 help: Replace with `cond is not None`
-
-ℹ Unsafe fix
-2 2 | if res == None:
-3 3 |     pass
-4 4 | #: E711
-5   |-if res != None:
-  5 |+if res is not None:
-6 6 |     pass
-7 7 | #: E711
-8 8 | if None == res:
+2 | if res == None:
+3 |     pass
+4 | #: E711
+  - if res != None:
+5 + if res is not None:
+6 |     pass
+7 | #: E711
+8 | if None == res:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is None`
   --> E711.py:8:4
@@ -53,16 +51,15 @@ E711 [*] Comparison to `None` should be `cond is None`
 10 | #: E711
    |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-5 5 | if res != None:
-6 6 |     pass
-7 7 | #: E711
-8   |-if None == res:
-  8 |+if None is res:
-9 9 |     pass
-10 10 | #: E711
-11 11 | if None != res:
+5  | if res != None:
+6  |     pass
+7  | #: E711
+   - if None == res:
+8  + if None is res:
+9  |     pass
+10 | #: E711
+11 | if None != res:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is not None`
   --> E711.py:11:4
@@ -75,16 +72,15 @@ E711 [*] Comparison to `None` should be `cond is not None`
 13 | #: E711
    |
 help: Replace with `cond is not None`
-
-ℹ Unsafe fix
-8  8  | if None == res:
-9  9  |     pass
-10 10 | #: E711
-11    |-if None != res:
-   11 |+if None is not res:
-12 12 |     pass
-13 13 | #: E711
-14 14 | if res[1] == None:
+8  | if None == res:
+9  |     pass
+10 | #: E711
+   - if None != res:
+11 + if None is not res:
+12 |     pass
+13 | #: E711
+14 | if res[1] == None:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is None`
   --> E711.py:14:14
@@ -97,16 +93,15 @@ E711 [*] Comparison to `None` should be `cond is None`
 16 | #: E711
    |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-11 11 | if None != res:
-12 12 |     pass
-13 13 | #: E711
-14    |-if res[1] == None:
-   14 |+if res[1] is None:
-15 15 |     pass
-16 16 | #: E711
-17 17 | if res[1] != None:
+11 | if None != res:
+12 |     pass
+13 | #: E711
+   - if res[1] == None:
+14 + if res[1] is None:
+15 |     pass
+16 | #: E711
+17 | if res[1] != None:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is not None`
   --> E711.py:17:14
@@ -119,16 +114,15 @@ E711 [*] Comparison to `None` should be `cond is not None`
 19 | #: E711
    |
 help: Replace with `cond is not None`
-
-ℹ Unsafe fix
-14 14 | if res[1] == None:
-15 15 |     pass
-16 16 | #: E711
-17    |-if res[1] != None:
-   17 |+if res[1] is not None:
-18 18 |     pass
-19 19 | #: E711
-20 20 | if None != res[1]:
+14 | if res[1] == None:
+15 |     pass
+16 | #: E711
+   - if res[1] != None:
+17 + if res[1] is not None:
+18 |     pass
+19 | #: E711
+20 | if None != res[1]:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is not None`
   --> E711.py:20:4
@@ -141,16 +135,15 @@ E711 [*] Comparison to `None` should be `cond is not None`
 22 | #: E711
    |
 help: Replace with `cond is not None`
-
-ℹ Unsafe fix
-17 17 | if res[1] != None:
-18 18 |     pass
-19 19 | #: E711
-20    |-if None != res[1]:
-   20 |+if None is not res[1]:
-21 21 |     pass
-22 22 | #: E711
-23 23 | if None == res[1]:
+17 | if res[1] != None:
+18 |     pass
+19 | #: E711
+   - if None != res[1]:
+20 + if None is not res[1]:
+21 |     pass
+22 | #: E711
+23 | if None == res[1]:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is None`
   --> E711.py:23:4
@@ -162,16 +155,15 @@ E711 [*] Comparison to `None` should be `cond is None`
 24 |     pass
    |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-20 20 | if None != res[1]:
-21 21 |     pass
-22 22 | #: E711
-23    |-if None == res[1]:
-   23 |+if None is res[1]:
-24 24 |     pass
-25 25 | 
-26 26 | if x == None != None:
+20 | if None != res[1]:
+21 |     pass
+22 | #: E711
+   - if None == res[1]:
+23 + if None is res[1]:
+24 |     pass
+25 | 
+26 | if x == None != None:
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is None`
   --> E711.py:26:9
@@ -183,16 +175,15 @@ E711 [*] Comparison to `None` should be `cond is None`
 27 |     pass
    |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-23 23 | if None == res[1]:
-24 24 |     pass
-25 25 | 
-26    |-if x == None != None:
-   26 |+if x is None is not None:
-27 27 |     pass
-28 28 | 
-29 29 | #: Okay
+23 | if None == res[1]:
+24 |     pass
+25 | 
+   - if x == None != None:
+26 + if x is None is not None:
+27 |     pass
+28 | 
+29 | #: Okay
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is not None`
   --> E711.py:26:17
@@ -204,13 +195,12 @@ E711 [*] Comparison to `None` should be `cond is not None`
 27 |     pass
    |
 help: Replace with `cond is not None`
-
-ℹ Unsafe fix
-23 23 | if None == res[1]:
-24 24 |     pass
-25 25 | 
-26    |-if x == None != None:
-   26 |+if x is None is not None:
-27 27 |     pass
-28 28 | 
-29 29 | #: Okay
+23 | if None == res[1]:
+24 |     pass
+25 | 
+   - if x == None != None:
+26 + if x is None is not None:
+27 |     pass
+28 | 
+29 | #: Okay
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap
index 502c3b1e2c..7155cd3ac5 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap
@@ -11,14 +11,13 @@ E712 [*] Avoid equality comparisons to `True`; use `res:` for truth checks
 4 | #: E712
   |
 help: Replace with `res`
-
-ℹ Unsafe fix
-1 1 | #: E712
-2   |-if res == True:
-  2 |+if res:
-3 3 |     pass
-4 4 | #: E712
-5 5 | if res != False:
+1 | #: E712
+  - if res == True:
+2 + if res:
+3 |     pass
+4 | #: E712
+5 | if res != False:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid inequality comparisons to `False`; use `res:` for truth checks
  --> E712.py:5:4
@@ -31,16 +30,15 @@ E712 [*] Avoid inequality comparisons to `False`; use `res:` for truth checks
 7 | #: E712
   |
 help: Replace with `res`
-
-ℹ Unsafe fix
-2 2 | if res == True:
-3 3 |     pass
-4 4 | #: E712
-5   |-if res != False:
-  5 |+if res:
-6 6 |     pass
-7 7 | #: E712
-8 8 | if True != res:
+2 | if res == True:
+3 |     pass
+4 | #: E712
+  - if res != False:
+5 + if res:
+6 |     pass
+7 | #: E712
+8 | if True != res:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid inequality comparisons to `True`; use `not res:` for false checks
   --> E712.py:8:4
@@ -53,16 +51,15 @@ E712 [*] Avoid inequality comparisons to `True`; use `not res:` for false checks
 10 | #: E712
    |
 help: Replace with `not res`
-
-ℹ Unsafe fix
-5 5 | if res != False:
-6 6 |     pass
-7 7 | #: E712
-8   |-if True != res:
-  8 |+if not res:
-9 9 |     pass
-10 10 | #: E712
-11 11 | if False == res:
+5  | if res != False:
+6  |     pass
+7  | #: E712
+   - if True != res:
+8  + if not res:
+9  |     pass
+10 | #: E712
+11 | if False == res:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `False`; use `not res:` for false checks
   --> E712.py:11:4
@@ -75,16 +72,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not res:` for false checks
 13 | #: E712
    |
 help: Replace with `not res`
-
-ℹ Unsafe fix
-8  8  | if True != res:
-9  9  |     pass
-10 10 | #: E712
-11    |-if False == res:
-   11 |+if not res:
-12 12 |     pass
-13 13 | #: E712
-14 14 | if res[1] == True:
+8  | if True != res:
+9  |     pass
+10 | #: E712
+   - if False == res:
+11 + if not res:
+12 |     pass
+13 | #: E712
+14 | if res[1] == True:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True`; use `res[1]:` for truth checks
   --> E712.py:14:4
@@ -97,16 +93,15 @@ E712 [*] Avoid equality comparisons to `True`; use `res[1]:` for truth checks
 16 | #: E712
    |
 help: Replace with `res[1]`
-
-ℹ Unsafe fix
-11 11 | if False == res:
-12 12 |     pass
-13 13 | #: E712
-14    |-if res[1] == True:
-   14 |+if res[1]:
-15 15 |     pass
-16 16 | #: E712
-17 17 | if res[1] != False:
+11 | if False == res:
+12 |     pass
+13 | #: E712
+   - if res[1] == True:
+14 + if res[1]:
+15 |     pass
+16 | #: E712
+17 | if res[1] != False:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid inequality comparisons to `False`; use `res[1]:` for truth checks
   --> E712.py:17:4
@@ -119,16 +114,15 @@ E712 [*] Avoid inequality comparisons to `False`; use `res[1]:` for truth checks
 19 | #: E712
    |
 help: Replace with `res[1]`
-
-ℹ Unsafe fix
-14 14 | if res[1] == True:
-15 15 |     pass
-16 16 | #: E712
-17    |-if res[1] != False:
-   17 |+if res[1]:
-18 18 |     pass
-19 19 | #: E712
-20 20 | var = 1 if cond == True else -1 if cond == False else cond
+14 | if res[1] == True:
+15 |     pass
+16 | #: E712
+   - if res[1] != False:
+17 + if res[1]:
+18 |     pass
+19 | #: E712
+20 | var = 1 if cond == True else -1 if cond == False else cond
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True`; use `cond:` for truth checks
   --> E712.py:20:12
@@ -141,16 +135,15 @@ E712 [*] Avoid equality comparisons to `True`; use `cond:` for truth checks
 22 | if (True) == TrueElement or x == TrueElement:
    |
 help: Replace with `cond`
-
-ℹ Unsafe fix
-17 17 | if res[1] != False:
-18 18 |     pass
-19 19 | #: E712
-20    |-var = 1 if cond == True else -1 if cond == False else cond
-   20 |+var = 1 if cond else -1 if cond == False else cond
-21 21 | #: E712
-22 22 | if (True) == TrueElement or x == TrueElement:
-23 23 |     pass
+17 | if res[1] != False:
+18 |     pass
+19 | #: E712
+   - var = 1 if cond == True else -1 if cond == False else cond
+20 + var = 1 if cond else -1 if cond == False else cond
+21 | #: E712
+22 | if (True) == TrueElement or x == TrueElement:
+23 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `False`; use `not cond:` for false checks
   --> E712.py:20:36
@@ -163,16 +156,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not cond:` for false checks
 22 | if (True) == TrueElement or x == TrueElement:
    |
 help: Replace with `not cond`
-
-ℹ Unsafe fix
-17 17 | if res[1] != False:
-18 18 |     pass
-19 19 | #: E712
-20    |-var = 1 if cond == True else -1 if cond == False else cond
-   20 |+var = 1 if cond == True else -1 if not cond else cond
-21 21 | #: E712
-22 22 | if (True) == TrueElement or x == TrueElement:
-23 23 |     pass
+17 | if res[1] != False:
+18 |     pass
+19 | #: E712
+   - var = 1 if cond == True else -1 if cond == False else cond
+20 + var = 1 if cond == True else -1 if not cond else cond
+21 | #: E712
+22 | if (True) == TrueElement or x == TrueElement:
+23 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth checks
   --> E712.py:22:4
@@ -184,16 +176,15 @@ E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth chec
 23 |     pass
    |
 help: Replace with `TrueElement`
-
-ℹ Unsafe fix
-19 19 | #: E712
-20 20 | var = 1 if cond == True else -1 if cond == False else cond
-21 21 | #: E712
-22    |-if (True) == TrueElement or x == TrueElement:
-   22 |+if (TrueElement) or x == TrueElement:
-23 23 |     pass
-24 24 | 
-25 25 | if res == True != False:
+19 | #: E712
+20 | var = 1 if cond == True else -1 if cond == False else cond
+21 | #: E712
+   - if (True) == TrueElement or x == TrueElement:
+22 + if (TrueElement) or x == TrueElement:
+23 |     pass
+24 | 
+25 | if res == True != False:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True` or `False`
   --> E712.py:25:4
@@ -205,16 +196,15 @@ E712 [*] Avoid equality comparisons to `True` or `False`
 26 |     pass
    |
 help: Replace comparison
-
-ℹ Unsafe fix
-22 22 | if (True) == TrueElement or x == TrueElement:
-23 23 |     pass
-24 24 | 
-25    |-if res == True != False:
-   25 |+if res is True is not False:
-26 26 |     pass
-27 27 | 
-28 28 | if(True) == TrueElement or x == TrueElement:
+22 | if (True) == TrueElement or x == TrueElement:
+23 |     pass
+24 | 
+   - if res == True != False:
+25 + if res is True is not False:
+26 |     pass
+27 | 
+28 | if(True) == TrueElement or x == TrueElement:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True` or `False`
   --> E712.py:25:4
@@ -226,16 +216,15 @@ E712 [*] Avoid equality comparisons to `True` or `False`
 26 |     pass
    |
 help: Replace comparison
-
-ℹ Unsafe fix
-22 22 | if (True) == TrueElement or x == TrueElement:
-23 23 |     pass
-24 24 | 
-25    |-if res == True != False:
-   25 |+if res is True is not False:
-26 26 |     pass
-27 27 | 
-28 28 | if(True) == TrueElement or x == TrueElement:
+22 | if (True) == TrueElement or x == TrueElement:
+23 |     pass
+24 | 
+   - if res == True != False:
+25 + if res is True is not False:
+26 |     pass
+27 | 
+28 | if(True) == TrueElement or x == TrueElement:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth checks
   --> E712.py:28:3
@@ -247,16 +236,15 @@ E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth chec
 29 |     pass
    |
 help: Replace with `TrueElement`
-
-ℹ Unsafe fix
-25 25 | if res == True != False:
-26 26 |     pass
-27 27 | 
-28    |-if(True) == TrueElement or x == TrueElement:
-   28 |+if(TrueElement) or x == TrueElement:
-29 29 |     pass
-30 30 | 
-31 31 | if (yield i) == True:
+25 | if res == True != False:
+26 |     pass
+27 | 
+   - if(True) == TrueElement or x == TrueElement:
+28 + if(TrueElement) or x == TrueElement:
+29 |     pass
+30 | 
+31 | if (yield i) == True:
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True`; use `yield i:` for truth checks
   --> E712.py:31:4
@@ -268,16 +256,15 @@ E712 [*] Avoid equality comparisons to `True`; use `yield i:` for truth checks
 32 |       print("even")
    |
 help: Replace with `yield i`
-
-ℹ Unsafe fix
-28 28 | if(True) == TrueElement or x == TrueElement:
-29 29 |     pass
-30 30 | 
-31    |-if (yield i) == True:
-   31 |+if (yield i):
-32 32 |       print("even")
-33 33 | 
-34 34 | #: Okay
+28 | if(True) == TrueElement or x == TrueElement:
+29 |     pass
+30 | 
+   - if (yield i) == True:
+31 + if (yield i):
+32 |       print("even")
+33 | 
+34 | #: Okay
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `True`; use `True:` for truth checks
   --> E712.py:58:4
@@ -288,11 +275,10 @@ E712 [*] Avoid equality comparisons to `True`; use `True:` for truth checks
 59 |     pass
    |
 help: Replace with `True`
-
-ℹ Unsafe fix
-55 55 | assert [42, not foo] in bar
-56 56 | 
-57 57 | # https://github.com/astral-sh/ruff/issues/17582
-58    |-if True == True: # No duplicated diagnostic
-   58 |+if True: # No duplicated diagnostic
-59 59 |     pass
+55 | assert [42, not foo] in bar
+56 | 
+57 | # https://github.com/astral-sh/ruff/issues/17582
+   - if True == True: # No duplicated diagnostic
+58 + if True: # No duplicated diagnostic
+59 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap
index a41a7572d6..ad29800e0b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap
@@ -11,14 +11,12 @@ E713 [*] Test for membership should be `not in`
 4 | #: E713
   |
 help: Convert to `not in`
-
-ℹ Safe fix
-1 1 | #: E713
-2   |-if not X in Y:
-  2 |+if X not in Y:
-3 3 |     pass
-4 4 | #: E713
-5 5 | if not X.B in Y:
+1 | #: E713
+  - if not X in Y:
+2 + if X not in Y:
+3 |     pass
+4 | #: E713
+5 | if not X.B in Y:
 
 E713 [*] Test for membership should be `not in`
  --> E713.py:5:8
@@ -31,16 +29,14 @@ E713 [*] Test for membership should be `not in`
 7 | #: E713
   |
 help: Convert to `not in`
-
-ℹ Safe fix
-2 2 | if not X in Y:
-3 3 |     pass
-4 4 | #: E713
-5   |-if not X.B in Y:
-  5 |+if X.B not in Y:
-6 6 |     pass
-7 7 | #: E713
-8 8 | if not X in Y and Z == "zero":
+2 | if not X in Y:
+3 |     pass
+4 | #: E713
+  - if not X.B in Y:
+5 + if X.B not in Y:
+6 |     pass
+7 | #: E713
+8 | if not X in Y and Z == "zero":
 
 E713 [*] Test for membership should be `not in`
   --> E713.py:8:8
@@ -53,16 +49,14 @@ E713 [*] Test for membership should be `not in`
 10 | #: E713
    |
 help: Convert to `not in`
-
-ℹ Safe fix
-5 5 | if not X.B in Y:
-6 6 |     pass
-7 7 | #: E713
-8   |-if not X in Y and Z == "zero":
-  8 |+if X not in Y and Z == "zero":
-9 9 |     pass
-10 10 | #: E713
-11 11 | if X == "zero" or not Y in Z:
+5  | if not X.B in Y:
+6  |     pass
+7  | #: E713
+   - if not X in Y and Z == "zero":
+8  + if X not in Y and Z == "zero":
+9  |     pass
+10 | #: E713
+11 | if X == "zero" or not Y in Z:
 
 E713 [*] Test for membership should be `not in`
   --> E713.py:11:23
@@ -75,16 +69,14 @@ E713 [*] Test for membership should be `not in`
 13 | #: E713
    |
 help: Convert to `not in`
-
-ℹ Safe fix
-8  8  | if not X in Y and Z == "zero":
-9  9  |     pass
-10 10 | #: E713
-11    |-if X == "zero" or not Y in Z:
-   11 |+if X == "zero" or Y not in Z:
-12 12 |     pass
-13 13 | #: E713
-14 14 | if not (X in Y):
+8  | if not X in Y and Z == "zero":
+9  |     pass
+10 | #: E713
+   - if X == "zero" or not Y in Z:
+11 + if X == "zero" or Y not in Z:
+12 |     pass
+13 | #: E713
+14 | if not (X in Y):
 
 E713 [*] Test for membership should be `not in`
   --> E713.py:14:9
@@ -96,16 +88,14 @@ E713 [*] Test for membership should be `not in`
 15 |     pass
    |
 help: Convert to `not in`
-
-ℹ Safe fix
-11 11 | if X == "zero" or not Y in Z:
-12 12 |     pass
-13 13 | #: E713
-14    |-if not (X in Y):
-   14 |+if X not in Y:
-15 15 |     pass
-16 16 | 
-17 17 | #: Okay
+11 | if X == "zero" or not Y in Z:
+12 |     pass
+13 | #: E713
+   - if not (X in Y):
+14 + if X not in Y:
+15 |     pass
+16 | 
+17 | #: Okay
 
 E713 [*] Test for membership should be `not in`
   --> E713.py:40:12
@@ -116,10 +106,8 @@ E713 [*] Test for membership should be `not in`
    |            ^^^^^^^^^^^^^^^^^
    |
 help: Convert to `not in`
-
-ℹ Safe fix
-37 37 | assert {"x": not foo} in bar
-38 38 | assert [42, not foo] in bar
-39 39 | assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None)
-40    |-assert not('name' in request)or not request['name']
-   40 |+assert 'name' not in request or not request['name']
+37 | assert {"x": not foo} in bar
+38 | assert [42, not foo] in bar
+39 | assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None)
+   - assert not('name' in request)or not request['name']
+40 + assert 'name' not in request or not request['name']
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap
index 3b9bfc27f3..7050ec8911 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap
@@ -11,14 +11,12 @@ E714 [*] Test for object identity should be `is not`
 4 | #: E714
   |
 help: Convert to `is not`
-
-ℹ Safe fix
-1 1 | #: E714
-2   |-if not X is Y:
-  2 |+if X is not Y:
-3 3 |     pass
-4 4 | #: E714
-5 5 | if not X.B is Y:
+1 | #: E714
+  - if not X is Y:
+2 + if X is not Y:
+3 |     pass
+4 | #: E714
+5 | if not X.B is Y:
 
 E714 [*] Test for object identity should be `is not`
  --> E714.py:5:8
@@ -30,16 +28,14 @@ E714 [*] Test for object identity should be `is not`
 6 |     pass
   |
 help: Convert to `is not`
-
-ℹ Safe fix
-2 2 | if not X is Y:
-3 3 |     pass
-4 4 | #: E714
-5   |-if not X.B is Y:
-  5 |+if X.B is not Y:
-6 6 |     pass
-7 7 | 
-8 8 | #: Okay
+2 | if not X is Y:
+3 |     pass
+4 | #: E714
+  - if not X.B is Y:
+5 + if X.B is not Y:
+6 |     pass
+7 | 
+8 | #: Okay
 
 E714 [*] Test for object identity should be `is not`
   --> E714.py:39:13
@@ -50,10 +46,8 @@ E714 [*] Test for object identity should be `is not`
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Convert to `is not`
-
-ℹ Safe fix
-36 36 | assert (not foo) in bar
-37 37 | assert {"x": not foo} in bar
-38 38 | assert [42, not foo] in bar
-39    |-assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None)
-   39 |+assert re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is not None
+36 | assert (not foo) in bar
+37 | assert {"x": not foo} in bar
+38 | assert [42, not foo] in bar
+   - assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None)
+39 + assert re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is not None
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap
index f3054605a4..ef823404b3 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap
@@ -10,16 +10,15 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
   |     ^^^^^^^^^^^^^^^^^^^
   |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-1 1 | def scope():
-2 2 |     # E731
-3   |-    f = lambda x: 2 * x
-  3 |+    def f(x):
-  4 |+        return 2 * x
-4 5 | 
-5 6 | 
-6 7 | def scope():
+1 | def scope():
+2 |     # E731
+  -     f = lambda x: 2 * x
+3 +     def f(x):
+4 +         return 2 * x
+5 | 
+6 | 
+7 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
  --> E731.py:8:5
@@ -30,17 +29,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
   |     ^^^^^^^^^^^^^^^^^^^
   |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-5  5  | 
-6  6  | def scope():
-7  7  |     # E731
-8     |-    f = lambda x: 2 * x
-   8  |+    def f(x):
-   9  |+        return 2 * x
-9  10 | 
-10 11 | 
-11 12 | def scope():
+5  | 
+6  | def scope():
+7  |     # E731
+   -     f = lambda x: 2 * x
+8  +     def f(x):
+9  +         return 2 * x
+10 | 
+11 | 
+12 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:14:9
@@ -51,17 +49,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite `this` as a `def`
-
-ℹ Unsafe fix
-11 11 | def scope():
-12 12 |     # E731
-13 13 |     while False:
-14    |-        this = lambda y, z: 2 * x
-   14 |+        def this(y, z):
-   15 |+            return 2 * x
-15 16 | 
-16 17 | 
-17 18 | def scope():
+11 | def scope():
+12 |     # E731
+13 |     while False:
+   -         this = lambda y, z: 2 * x
+14 +         def this(y, z):
+15 +             return 2 * x
+16 | 
+17 | 
+18 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:19:5
@@ -72,17 +69,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | def scope():
-18 18 |     # E731
-19    |-    f = lambda: (yield 1)
-   19 |+    def f():
-   20 |+        return (yield 1)
-20 21 | 
-21 22 | 
-22 23 | def scope():
+16 | 
+17 | def scope():
+18 |     # E731
+   -     f = lambda: (yield 1)
+19 +     def f():
+20 +         return (yield 1)
+21 | 
+22 | 
+23 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:24:5
@@ -93,17 +89,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | def scope():
-23 23 |     # E731
-24    |-    f = lambda: (yield from g())
-   24 |+    def f():
-   25 |+        return (yield from g())
-25 26 | 
-26 27 | 
-27 28 | def scope():
+21 | 
+22 | def scope():
+23 |     # E731
+   -     f = lambda: (yield from g())
+24 +     def f():
+25 +         return (yield from g())
+26 | 
+27 | 
+28 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:57:5
@@ -114,19 +109,18 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
    |     ^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite `f` as a `def`
+54 | 
+55 | class Scope:
+56 |     # E731
+   -     f = lambda x: 2 * x
+57 +     def f(x):
+58 +         return 2 * x
+59 | 
+60 | 
+61 | class Scope:
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-54 54 | 
-55 55 | class Scope:
-56 56 |     # E731
-57    |-    f = lambda x: 2 * x
-   57 |+    def f(x):
-   58 |+        return 2 * x
-58 59 | 
-59 60 | 
-60 61 | class Scope:
-
-E731 Do not assign a `lambda` expression, use a `def`
+E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:73:9
    |
 71 |     x: Callable[[int], int]
@@ -137,19 +131,18 @@ E731 Do not assign a `lambda` expression, use a `def`
 75 |         x = lambda: 2
    |
 help: Rewrite `x` as a `def`
+70 | 
+71 |     x: Callable[[int], int]
+72 |     if True:
+   -         x = lambda: 1
+73 +         def x():
+74 +             return 1
+75 |     else:
+76 |         x = lambda: 2
+77 |     return x
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-70 70 | 
-71 71 |     x: Callable[[int], int]
-72 72 |     if True:
-73    |-        x = lambda: 1
-   73 |+        def x():
-   74 |+            return 1
-74 75 |     else:
-75 76 |         x = lambda: 2
-76 77 |     return x
-
-E731 Do not assign a `lambda` expression, use a `def`
+E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:75:9
    |
 73 |         x = lambda: 1
@@ -159,17 +152,16 @@ E731 Do not assign a `lambda` expression, use a `def`
 76 |     return x
    |
 help: Rewrite `x` as a `def`
-
-ℹ Display-only fix
-72 72 |     if True:
-73 73 |         x = lambda: 1
-74 74 |     else:
-75    |-        x = lambda: 2
-   75 |+        def x():
-   76 |+            return 2
-76 77 |     return x
-77 78 | 
-78 79 | 
+72 |     if True:
+73 |         x = lambda: 1
+74 |     else:
+   -         x = lambda: 2
+75 +         def x():
+76 +             return 2
+77 |     return x
+78 | 
+79 | 
+note: This is a display-only fix and is likely to be incorrect
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:86:5
@@ -180,17 +172,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-83 83 | 
-84 84 |     # ParamSpec cannot be used in this context, so do not preserve the annotation.
-85 85 |     P = ParamSpec("P")
-86    |-    f: Callable[P, int] = lambda *args: len(args)
-   86 |+    def f(*args):
-   87 |+        return len(args)
-87 88 | 
-88 89 | 
-89 90 | def scope():
+83 | 
+84 |     # ParamSpec cannot be used in this context, so do not preserve the annotation.
+85 |     P = ParamSpec("P")
+   -     f: Callable[P, int] = lambda *args: len(args)
+86 +     def f(*args) -> int:
+87 +         return len(args)
+88 | 
+89 | 
+90 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
   --> E731.py:94:5
@@ -201,17 +192,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-91 91 | 
-92 92 |     from typing import Callable
-93 93 | 
-94    |-    f: Callable[[], None] = lambda: None
-   94 |+    def f() -> None:
-   95 |+        return None
-95 96 | 
-96 97 | 
-97 98 | def scope():
+91 | 
+92 |     from typing import Callable
+93 | 
+   -     f: Callable[[], None] = lambda: None
+94 +     def f() -> None:
+95 +         return None
+96 | 
+97 | 
+98 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:102:5
@@ -222,17 +212,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-99  99  | 
-100 100 |     from typing import Callable
-101 101 | 
-102     |-    f: Callable[..., None] = lambda a, b: None
-    102 |+    def f(a, b) -> None:
-    103 |+        return None
-103 104 | 
-104 105 | 
-105 106 | def scope():
+99  | 
+100 |     from typing import Callable
+101 | 
+    -     f: Callable[..., None] = lambda a, b: None
+102 +     def f(a, b) -> None:
+103 +         return None
+104 | 
+105 | 
+106 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:110:5
@@ -243,17 +232,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-107 107 | 
-108 108 |     from typing import Callable
-109 109 | 
-110     |-    f: Callable[[int], int] = lambda x: 2 * x
-    110 |+    def f(x: int) -> int:
-    111 |+        return 2 * x
-111 112 | 
-112 113 | 
-113 114 | # Let's use the `Callable` type from `collections.abc` instead.
+107 | 
+108 |     from typing import Callable
+109 | 
+    -     f: Callable[[int], int] = lambda x: 2 * x
+110 +     def f(x: int) -> int:
+111 +         return 2 * x
+112 | 
+113 | 
+114 | # Let's use the `Callable` type from `collections.abc` instead.
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:119:5
@@ -264,17 +252,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-116 116 | 
-117 117 |     from collections.abc import Callable
-118 118 | 
-119     |-    f: Callable[[str, int], str] = lambda a, b: a * b
-    119 |+    def f(a: str, b: int) -> str:
-    120 |+        return a * b
-120 121 | 
-121 122 | 
-122 123 | def scope():
+116 | 
+117 |     from collections.abc import Callable
+118 | 
+    -     f: Callable[[str, int], str] = lambda a, b: a * b
+119 +     def f(a: str, b: int) -> str:
+120 +         return a * b
+121 | 
+122 | 
+123 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:127:5
@@ -285,17 +272,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-124 124 | 
-125 125 |     from collections.abc import Callable
-126 126 | 
-127     |-    f: Callable[[str, int], tuple[str, int]] = lambda a, b: (a, b)
-    127 |+    def f(a: str, b: int) -> tuple[str, int]:
-    128 |+        return (a, b)
-128 129 | 
-129 130 | 
-130 131 | def scope():
+124 | 
+125 |     from collections.abc import Callable
+126 | 
+    -     f: Callable[[str, int], tuple[str, int]] = lambda a, b: (a, b)
+127 +     def f(a: str, b: int) -> tuple[str, int]:
+128 +         return (a, b)
+129 | 
+130 | 
+131 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:135:5
@@ -306,17 +292,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-132 132 | 
-133 133 |     from collections.abc import Callable
-134 134 | 
-135     |-    f: Callable[[str, int, list[str]], list[str]] = lambda a, b, /, c: [*c, a * b]
-    135 |+    def f(a: str, b: int, /, c: list[str]) -> list[str]:
-    136 |+        return [*c, a * b]
-136 137 | 
-137 138 | 
-138 139 | class TemperatureScales(Enum):
+132 | 
+133 |     from collections.abc import Callable
+134 | 
+    -     f: Callable[[str, int, list[str]], list[str]] = lambda a, b, /, c: [*c, a * b]
+135 +     def f(a: str, b: int, /, c: list[str]) -> list[str]:
+136 +         return [*c, a * b]
+137 | 
+138 | 
+139 | class TemperatureScales(Enum):
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:139:5
@@ -327,17 +312,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 140 |     FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
     |
 help: Rewrite `CELSIUS` as a `def`
-
-ℹ Unsafe fix
-136 136 | 
-137 137 | 
-138 138 | class TemperatureScales(Enum):
-139     |-    CELSIUS = (lambda deg_c: deg_c)
-    139 |+    def CELSIUS(deg_c):
-    140 |+        return (deg_c)
-140 141 |     FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
-141 142 | 
-142 143 | 
+136 | 
+137 | 
+138 | class TemperatureScales(Enum):
+    -     CELSIUS = (lambda deg_c: deg_c)
+139 +     def CELSIUS(deg_c):
+140 +         return (deg_c)
+141 |     FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
+142 | 
+143 | 
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:140:5
@@ -348,17 +332,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Rewrite `FAHRENHEIT` as a `def`
-
-ℹ Unsafe fix
-137 137 | 
-138 138 | class TemperatureScales(Enum):
-139 139 |     CELSIUS = (lambda deg_c: deg_c)
-140     |-    FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
-    140 |+    def FAHRENHEIT(deg_c):
-    141 |+        return (deg_c * 9 / 5 + 32)
-141 142 | 
-142 143 | 
-143 144 | # Regression test for: https://github.com/astral-sh/ruff/issues/7141
+137 | 
+138 | class TemperatureScales(Enum):
+139 |     CELSIUS = (lambda deg_c: deg_c)
+    -     FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
+140 +     def FAHRENHEIT(deg_c):
+141 +         return (deg_c * 9 / 5 + 32)
+142 | 
+143 | 
+144 | # Regression test for: https://github.com/astral-sh/ruff/issues/7141
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:147:5
@@ -371,21 +354,20 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
     | |_____^
     |
 help: Rewrite `f` as a `def`
-
-ℹ Unsafe fix
-144 144 | def scope():
-145 145 |     # E731
-146 146 | 
-147     |-    f = lambda: (
-148     |-        i := 1,
-149     |-    )
-    147 |+    def f():
-    148 |+        return (
-    149 |+            i := 1,
-    150 |+        )
-150 151 | 
-151 152 | 
-152 153 | from dataclasses import dataclass
+144 | def scope():
+145 |     # E731
+146 | 
+    -     f = lambda: (
+    -         i := 1,
+    -     )
+147 +     def f():
+148 +         return (
+149 +             i := 1,
+150 +         )
+151 | 
+152 | 
+153 | from dataclasses import dataclass
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:163:1
@@ -401,17 +383,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 168 |   # * https://github.com/astral-sh/ruff/issues/10277
     |
 help: Rewrite `x` as a `def`
-
-ℹ Unsafe fix
-160 160 | 
-161 161 | # Regression tests for:
-162 162 | # * https://github.com/astral-sh/ruff/issues/7720
-163     |-x = lambda: """
-    163 |+def x():
-    164 |+    return """
-164 165 |         a
-165 166 |     b
-166 167 | """
+160 | 
+161 | # Regression tests for:
+162 | # * https://github.com/astral-sh/ruff/issues/7720
+    - x = lambda: """
+163 + def x():
+164 +     return """
+165 |         a
+166 |     b
+167 | """
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:169:1
@@ -423,17 +404,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 171 | x = lambda: (
     |
 help: Rewrite `at_least_one_million` as a `def`
-
-ℹ Unsafe fix
-166 166 | """
-167 167 | 
-168 168 | # * https://github.com/astral-sh/ruff/issues/10277
-169     |-at_least_one_million = lambda _: _ >= 1_000_000
-    169 |+def at_least_one_million(_):
-    170 |+    return _ >= 1_000_000
-170 171 | 
-171 172 | x = lambda: (
-172 173 |     # comment
+166 | """
+167 | 
+168 | # * https://github.com/astral-sh/ruff/issues/10277
+    - at_least_one_million = lambda _: _ >= 1_000_000
+169 + def at_least_one_million(_):
+170 +     return _ >= 1_000_000
+171 | 
+172 | x = lambda: (
+173 |     # comment
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:171:1
@@ -449,17 +429,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 176 |   x = lambda: (
     |
 help: Rewrite `x` as a `def`
-
-ℹ Unsafe fix
-168 168 | # * https://github.com/astral-sh/ruff/issues/10277
-169 169 | at_least_one_million = lambda _: _ >= 1_000_000
-170 170 | 
-171     |-x = lambda: (
-    171 |+def x():
-    172 |+    return (
-172 173 |     # comment
-173 174 |     5 + 10
-174 175 | )
+168 | # * https://github.com/astral-sh/ruff/issues/10277
+169 | at_least_one_million = lambda _: _ >= 1_000_000
+170 | 
+    - x = lambda: (
+171 + def x():
+172 +     return (
+173 |     # comment
+174 |     5 + 10
+175 | )
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:176:1
@@ -475,17 +454,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 181 |   # https://github.com/astral-sh/ruff/issues/18475
     |
 help: Rewrite `x` as a `def`
-
-ℹ Unsafe fix
-173 173 |     5 + 10
-174 174 | )
-175 175 | 
-176     |-x = lambda: (
-    176 |+def x():
-    177 |+    return (
-177 178 |     # comment
-178 179 |     y := 10
-179 180 | )
+173 |     5 + 10
+174 | )
+175 | 
+    - x = lambda: (
+176 + def x():
+177 +     return (
+178 |     # comment
+179 |     y := 10
+180 | )
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:182:1
@@ -501,22 +479,21 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 188 |   foo_tooltip = (
     |
 help: Rewrite `foo_tooltip` as a `def`
-
-ℹ Unsafe fix
-179 179 | )
-180 180 | 
-181 181 | # https://github.com/astral-sh/ruff/issues/18475
-182     |-foo_tooltip = (
-183     |-    lambda x, data: f"\nfoo: {data['foo'][int(x)]}"
-    182 |+def foo_tooltip(x, data):
-    183 |+    return (f"\nfoo: {data['foo'][int(x)]}"
-184 184 |     if data["foo"] is not None
-185     |-    else ""
-186     |-)
-    185 |+    else "")
-187 186 | 
-188 187 | foo_tooltip = (
-189 188 |     lambda x, data: f"\nfoo: {data['foo'][int(x)]}" +
+179 | )
+180 | 
+181 | # https://github.com/astral-sh/ruff/issues/18475
+    - foo_tooltip = (
+    -     lambda x, data: f"\nfoo: {data['foo'][int(x)]}"
+182 + def foo_tooltip(x, data):
+183 +     return (f"\nfoo: {data['foo'][int(x)]}"
+184 |     if data["foo"] is not None
+    -     else ""
+    - )
+185 +     else "")
+186 | 
+187 | foo_tooltip = (
+188 |     lambda x, data: f"\nfoo: {data['foo'][int(x)]}" +
+note: This is an unsafe fix and may change runtime behavior
 
 E731 [*] Do not assign a `lambda` expression, use a `def`
    --> E731.py:188:1
@@ -529,18 +506,57 @@ E731 [*] Do not assign a `lambda` expression, use a `def`
 191 | |
 192 | | )
     | |_^
+193 |
+194 |   # https://github.com/astral-sh/ruff/issues/20097
     |
 help: Rewrite `foo_tooltip` as a `def`
+185 |     else ""
+186 | )
+187 | 
+    - foo_tooltip = (
+    -     lambda x, data: f"\nfoo: {data['foo'][int(x)]}" +
+    -     more
+    - 
+    - )
+188 + def foo_tooltip(x, data):
+189 +     return (f"\nfoo: {data['foo'][int(x)]}" +
+190 +     more)
+191 | 
+192 | # https://github.com/astral-sh/ruff/issues/20097
+193 | def scope():
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-185 185 |     else ""
-186 186 | )
-187 187 | 
-188     |-foo_tooltip = (
-189     |-    lambda x, data: f"\nfoo: {data['foo'][int(x)]}" +
-190     |-    more
-191     |-
-192     |-)
-    188 |+def foo_tooltip(x, data):
-    189 |+    return (f"\nfoo: {data['foo'][int(x)]}" +
-    190 |+    more)
+E731 [*] Do not assign a `lambda` expression, use a `def`
+   --> E731.py:200:5
+    |
+199 |     P = ParamSpec("P")
+200 |     f1: Callable[P, str] = lambda x: str(x)
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+201 |     f2: Callable[..., str] = lambda x: str(x)
+    |
+help: Rewrite `f1` as a `def`
+197 |     from typing import ParamSpec
+198 | 
+199 |     P = ParamSpec("P")
+    -     f1: Callable[P, str] = lambda x: str(x)
+200 +     def f1(x) -> str:
+201 +         return str(x)
+202 |     f2: Callable[..., str] = lambda x: str(x)
+note: This is an unsafe fix and may change runtime behavior
+
+E731 [*] Do not assign a `lambda` expression, use a `def`
+   --> E731.py:201:5
+    |
+199 |     P = ParamSpec("P")
+200 |     f1: Callable[P, str] = lambda x: str(x)
+201 |     f2: Callable[..., str] = lambda x: str(x)
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |
+help: Rewrite `f2` as a `def`
+198 | 
+199 |     P = ParamSpec("P")
+200 |     f1: Callable[P, str] = lambda x: str(x)
+    -     f2: Callable[..., str] = lambda x: str(x)
+201 +     def f2(x) -> str:
+202 +         return str(x)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap
index 837470c93c..74f2e3b2d3 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap
@@ -12,16 +12,14 @@ W291 [*] Trailing whitespace
 6 | class Foo(object):
   |
 help: Remove trailing whitespace
-
-ℹ Safe fix
-1 1 | #: Okay
-2 2 | # 情
-3 3 | #: W291:1:6
-4   |-print 
-  4 |+print
-5 5 | #: W293:2:1
-6 6 | class Foo(object):
-7 7 |     
+1 | #: Okay
+2 | # 情
+3 | #: W291:1:6
+  - print 
+4 + print
+5 | #: W293:2:1
+6 | class Foo(object):
+7 |     
 
 W291 [*] Trailing whitespace
   --> W29.py:11:35
@@ -34,16 +32,14 @@ W291 [*] Trailing whitespace
 13 | x = 1   
    |
 help: Remove trailing whitespace
-
-ℹ Safe fix
-8  8  |     bang = 12
-9  9  | #: W291:2:35
-10 10 | '''multiline
-11    |-string with trailing whitespace'''   
-   11 |+string with trailing whitespace'''
-12 12 | #: W291 W292 noeol
-13 13 | x = 1   
-14 14 | #: W191 W292 noeol
+8  |     bang = 12
+9  | #: W291:2:35
+10 | '''multiline
+   - string with trailing whitespace'''   
+11 + string with trailing whitespace'''
+12 | #: W291 W292 noeol
+13 | x = 1   
+14 | #: W191 W292 noeol
 
 W291 [*] Trailing whitespace
   --> W29.py:13:6
@@ -56,13 +52,11 @@ W291 [*] Trailing whitespace
 15 | if False:
    |
 help: Remove trailing whitespace
-
-ℹ Safe fix
-10 10 | '''multiline
-11 11 | string with trailing whitespace'''   
-12 12 | #: W291 W292 noeol
-13    |-x = 1   
-   13 |+x = 1
-14 14 | #: W191 W292 noeol
-15 15 | if False:
-16 16 | 	pass  # indented with tabs
+10 | '''multiline
+11 | string with trailing whitespace'''   
+12 | #: W291 W292 noeol
+   - x = 1   
+13 + x = 1
+14 | #: W191 W292 noeol
+15 | if False:
+16 | 	pass  # indented with tabs
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap
index a349223f9c..130cc97f3b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap
@@ -9,13 +9,12 @@ W291 [*] Trailing whitespace
 2 | inside a multiline string'''
   |
 help: Remove trailing whitespace
-
-ℹ Unsafe fix
-1   |-'''trailing whitespace 
-  1 |+'''trailing whitespace
-2 2 | inside a multiline string'''
-3 3 | 
-4 4 | f'''trailing whitespace 
+  - '''trailing whitespace 
+1 + '''trailing whitespace
+2 | inside a multiline string'''
+3 | 
+4 | f'''trailing whitespace 
+note: This is an unsafe fix and may change runtime behavior
 
 W291 [*] Trailing whitespace
  --> W291.py:4:24
@@ -27,16 +26,15 @@ W291 [*] Trailing whitespace
 5 | inside a multiline f-string'''
   |
 help: Remove trailing whitespace
-
-ℹ Unsafe fix
-1 1 | '''trailing whitespace 
-2 2 | inside a multiline string'''
-3 3 | 
-4   |-f'''trailing whitespace 
-  4 |+f'''trailing whitespace
-5 5 | inside a multiline f-string'''
-6 6 | 
-7 7 | # Trailing whitespace after `{`
+1 | '''trailing whitespace 
+2 | inside a multiline string'''
+3 | 
+  - f'''trailing whitespace 
+4 + f'''trailing whitespace
+5 | inside a multiline f-string'''
+6 | 
+7 | # Trailing whitespace after `{`
+note: This is an unsafe fix and may change runtime behavior
 
 W291 [*] Trailing whitespace
   --> W291.py:8:8
@@ -48,16 +46,14 @@ W291 [*] Trailing whitespace
 10 | }'
    |
 help: Remove trailing whitespace
-
-ℹ Safe fix
-5 5 | inside a multiline f-string'''
-6 6 | 
-7 7 | # Trailing whitespace after `{`
-8   |-f'abc { 
-  8 |+f'abc {
-9 9 |     1 + 2
-10 10 | }'
-11 11 | 
+5  | inside a multiline f-string'''
+6  | 
+7  | # Trailing whitespace after `{`
+   - f'abc { 
+8  + f'abc {
+9  |     1 + 2
+10 | }'
+11 | 
 
 W291 [*] Trailing whitespace
   --> W291.py:14:10
@@ -69,11 +65,9 @@ W291 [*] Trailing whitespace
 15 | }'
    |
 help: Remove trailing whitespace
-
-ℹ Safe fix
-11 11 | 
-12 12 | # Trailing whitespace after `2`
-13 13 | f'abc {
-14    |-    1 + 2 
-   14 |+    1 + 2
-15 15 | }'
+11 | 
+12 | # Trailing whitespace after `2`
+13 | f'abc {
+   -     1 + 2 
+14 +     1 + 2
+15 | }'
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap
index 404fb9c25e..7863cb988c 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap
@@ -9,8 +9,6 @@ W292 [*] No newline at end of file
   |         ^
   |
 help: Add trailing newline
-
-ℹ Safe fix
-1 1 | def fn() -> None:
-2   |-    pass
-  2 |+    pass
+1 | def fn() -> None:
+  -     pass
+2 +     pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap
index 03b3a090bc..b93378d6b4 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap
@@ -12,13 +12,11 @@ W293 [*] Blank line contains whitespace
 9 | #: W291:2:35
   |
 help: Remove whitespace from blank line
-
-ℹ Safe fix
-4 4 | print 
-5 5 | #: W293:2:1
-6 6 | class Foo(object):
-7   |-    
-  7 |+
-8 8 |     bang = 12
-9 9 | #: W291:2:35
-10 10 | '''multiline
+4  | print 
+5  | #: W293:2:1
+6  | class Foo(object):
+   -     
+7  + 
+8  |     bang = 12
+9  | #: W291:2:35
+10 | '''multiline
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap
index 7fc13aa2f1..78db67be97 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap
@@ -11,16 +11,15 @@ W293 [*] Blank line contains whitespace
 5 |     """\
   |
 help: Remove whitespace from blank line
-
-ℹ Unsafe fix
-1 1 | # See: https://github.com/astral-sh/ruff/issues/9323
-2 2 | class Chassis(RobotModuleTemplate):
-3 3 |     """底盘信息推送控制
-4   |-    
-  4 |+
-5 5 |     """\
-6 6 | 
-7 7 | 
+1 | # See: https://github.com/astral-sh/ruff/issues/9323
+2 | class Chassis(RobotModuleTemplate):
+3 |     """底盘信息推送控制
+  -     
+4 + 
+5 |     """\
+6 | 
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 W293 [*] Blank line contains whitespace
   --> W293.py:10:1
@@ -31,18 +30,16 @@ W293 [*] Blank line contains whitespace
    | ^^^^
    |
 help: Remove whitespace from blank line
-
-ℹ Safe fix
-5  5  |     """\
-6  6  | 
-7  7  | 
-8     |-"""""" \
-9     |-    \
-10    |-    
-   8  |+"""""" 
-11 9  | 
-12 10 | 
-13 11 | "abc\
+5  |     """\
+6  | 
+7  | 
+   - """""" \
+   -     \
+   -     
+8  + """""" 
+9  | 
+10 | 
+11 | "abc\
 
 W293 [*] Blank line contains whitespace
   --> W293.py:16:1
@@ -54,18 +51,16 @@ W293 [*] Blank line contains whitespace
 17 | '''blank line with whitespace
    |
 help: Remove whitespace from blank line
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 | "abc\
-14    |- " \
-15    |-    \
-16    |-    
-   14 |+ " 
-17 15 | '''blank line with whitespace
-18 16 |  
-19 17 | inside a multiline string'''
+11 | 
+12 | 
+13 | "abc\
+   -  " \
+   -     \
+   -     
+14 +  " 
+15 | '''blank line with whitespace
+16 |  
+17 | inside a multiline string'''
 
 W293 [*] Blank line contains whitespace
   --> W293.py:18:1
@@ -76,11 +71,10 @@ W293 [*] Blank line contains whitespace
 19 | inside a multiline string'''
    |
 help: Remove whitespace from blank line
-
-ℹ Unsafe fix
-15 15 |     \
-16 16 |     
-17 17 | '''blank line with whitespace
-18    |- 
-   18 |+
-19 19 | inside a multiline string'''
+15 |     \
+16 |     
+17 | '''blank line with whitespace
+   -  
+18 + 
+19 | inside a multiline string'''
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap
index 6b64fdb629..107afa57bb 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap
@@ -11,14 +11,12 @@ W605 [*] Invalid escape sequence: `\.`
 4 | #: W605:2:1
   |
 help: Use a raw string literal
-
-ℹ Safe fix
-1 1 | #: W605:1:10
-2   |-regex = '\.png$'
-  2 |+regex = r'\.png$'
-3 3 | 
-4 4 | #: W605:2:1
-5 5 | regex = '''
+1 | #: W605:1:10
+  - regex = '\.png$'
+2 + regex = r'\.png$'
+3 | 
+4 | #: W605:2:1
+5 | regex = '''
 
 W605 [*] Invalid escape sequence: `\.`
  --> W605_0.py:6:1
@@ -30,16 +28,14 @@ W605 [*] Invalid escape sequence: `\.`
 7 | '''
   |
 help: Use a raw string literal
-
-ℹ Safe fix
-2 2 | regex = '\.png$'
-3 3 | 
-4 4 | #: W605:2:1
-5   |-regex = '''
-  5 |+regex = r'''
-6 6 | \.png$
-7 7 | '''
-8 8 | 
+2 | regex = '\.png$'
+3 | 
+4 | #: W605:2:1
+  - regex = '''
+5 + regex = r'''
+6 | \.png$
+7 | '''
+8 | 
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_0.py:11:6
@@ -51,16 +47,14 @@ W605 [*] Invalid escape sequence: `\_`
 12 | )
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-8  8  | 
-9  9  | #: W605:2:6
-10 10 | f(
-11    |-    '\_'
-   11 |+    r'\_'
-12 12 | )
-13 13 | 
-14 14 | #: W605:4:6
+8  | 
+9  | #: W605:2:6
+10 | f(
+   -     '\_'
+11 +     r'\_'
+12 | )
+13 | 
+14 | #: W605:4:6
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_0.py:18:6
@@ -73,16 +67,14 @@ W605 [*] Invalid escape sequence: `\_`
 20 | """
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-12 12 | )
-13 13 | 
-14 14 | #: W605:4:6
-15    |-"""
-   15 |+r"""
-16 16 | multi-line
-17 17 | literal
-18 18 | with \_ somewhere
+12 | )
+13 | 
+14 | #: W605:4:6
+   - """
+15 + r"""
+16 | multi-line
+17 | literal
+18 | with \_ somewhere
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_0.py:23:39
@@ -92,16 +84,14 @@ W605 [*] Invalid escape sequence: `\_`
    |                                       ^^
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-20 20 | """
-21 21 | 
-22 22 | #: W605:1:38
-23    |-value = 'new line\nand invalid escape \_ here'
-   23 |+value = 'new line\nand invalid escape \\_ here'
-24 24 | 
-25 25 | 
-26 26 | def f():
+20 | """
+21 | 
+22 | #: W605:1:38
+   - value = 'new line\nand invalid escape \_ here'
+23 + value = 'new line\nand invalid escape \\_ here'
+24 | 
+25 | 
+26 | def f():
 
 W605 [*] Invalid escape sequence: `\.`
   --> W605_0.py:28:12
@@ -114,16 +104,14 @@ W605 [*] Invalid escape sequence: `\.`
 30 | #: Okay
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-25 25 | 
-26 26 | def f():
-27 27 |     #: W605:1:11
-28    |-    return'\.png$'
-   28 |+    return r'\.png$'
-29 29 | 
-30 30 | #: Okay
-31 31 | regex = r'\.png$'
+25 | 
+26 | def f():
+27 |     #: W605:1:11
+   -     return'\.png$'
+28 +     return r'\.png$'
+29 | 
+30 | #: Okay
+31 | regex = r'\.png$'
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_0.py:45:12
@@ -136,16 +124,14 @@ W605 [*] Invalid escape sequence: `\_`
 47 | #: W605:1:7
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-42 42 | \w
-43 43 | '''  # noqa
-44 44 | 
-45    |-regex = '\\\_'
-   45 |+regex = '\\\\_'
-46 46 | 
-47 47 | #: W605:1:7
-48 48 | u'foo\ bar'
+42 | \w
+43 | '''  # noqa
+44 | 
+   - regex = '\\\_'
+45 + regex = '\\\\_'
+46 | 
+47 | #: W605:1:7
+48 | u'foo\ bar'
 
 W605 [*] Invalid escape sequence: `\ `
   --> W605_0.py:48:6
@@ -157,16 +143,14 @@ W605 [*] Invalid escape sequence: `\ `
 50 | #: W605:1:13
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-45 45 | regex = '\\\_'
-46 46 | 
-47 47 | #: W605:1:7
-48    |-u'foo\ bar'
-   48 |+r'foo\ bar'
-49 49 | 
-50 50 | #: W605:1:13
-51 51 | (
+45 | regex = '\\\_'
+46 | 
+47 | #: W605:1:7
+   - u'foo\ bar'
+48 + r'foo\ bar'
+49 | 
+50 | #: W605:1:13
+51 | (
 
 W605 [*] Invalid escape sequence: `\.`
   --> W605_0.py:53:9
@@ -178,16 +162,14 @@ W605 [*] Invalid escape sequence: `\.`
 54 | )
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-50 50 | #: W605:1:13
-51 51 | (
-52 52 |     "foo \
-53    |-    bar \. baz"
-   53 |+    bar \\. baz"
-54 54 | )
-55 55 | 
-56 56 | #: W605:1:6
+50 | #: W605:1:13
+51 | (
+52 |     "foo \
+   -     bar \. baz"
+53 +     bar \\. baz"
+54 | )
+55 | 
+56 | #: W605:1:6
 
 W605 [*] Invalid escape sequence: `\.`
   --> W605_0.py:57:6
@@ -199,16 +181,14 @@ W605 [*] Invalid escape sequence: `\.`
 59 | #: W605:1:13
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-54 54 | )
-55 55 | 
-56 56 | #: W605:1:6
-57    |-"foo \. bar \t"
-   57 |+"foo \\. bar \t"
-58 58 | 
-59 59 | #: W605:1:13
-60 60 | "foo \t bar \."
+54 | )
+55 | 
+56 | #: W605:1:6
+   - "foo \. bar \t"
+57 + "foo \\. bar \t"
+58 | 
+59 | #: W605:1:13
+60 | "foo \t bar \."
 
 W605 [*] Invalid escape sequence: `\.`
   --> W605_0.py:60:13
@@ -218,10 +198,8 @@ W605 [*] Invalid escape sequence: `\.`
    |             ^^
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-57 57 | "foo \. bar \t"
-58 58 | 
-59 59 | #: W605:1:13
-60    |-"foo \t bar \."
-   60 |+"foo \t bar \\."
+57 | "foo \. bar \t"
+58 | 
+59 | #: W605:1:13
+   - "foo \t bar \."
+60 + "foo \t bar \\."
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap
index efee7333ef..4efee366a1 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap
@@ -11,16 +11,14 @@ W605 [*] Invalid escape sequence: `\.`
 6 | #: W605:2:1
   |
 help: Use a raw string literal
-
-ℹ Safe fix
-1 1 | # Same as `W605_0.py` but using f-strings and t-strings instead.
-2 2 | 
-3 3 | #: W605:1:10
-4   |-regex = f'\.png$'
-  4 |+regex = rf'\.png$'
-5 5 | 
-6 6 | #: W605:2:1
-7 7 | regex = f'''
+1 | # Same as `W605_0.py` but using f-strings and t-strings instead.
+2 | 
+3 | #: W605:1:10
+  - regex = f'\.png$'
+4 + regex = rf'\.png$'
+5 | 
+6 | #: W605:2:1
+7 | regex = f'''
 
 W605 [*] Invalid escape sequence: `\.`
  --> W605_1.py:8:1
@@ -32,16 +30,14 @@ W605 [*] Invalid escape sequence: `\.`
 9 | '''
   |
 help: Use a raw string literal
-
-ℹ Safe fix
-4 4 | regex = f'\.png$'
-5 5 | 
-6 6 | #: W605:2:1
-7   |-regex = f'''
-  7 |+regex = rf'''
-8 8 | \.png$
-9 9 | '''
-10 10 | 
+4  | regex = f'\.png$'
+5  | 
+6  | #: W605:2:1
+   - regex = f'''
+7  + regex = rf'''
+8  | \.png$
+9  | '''
+10 | 
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:13:7
@@ -53,16 +49,14 @@ W605 [*] Invalid escape sequence: `\_`
 14 | )
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-10 10 | 
-11 11 | #: W605:2:6
-12 12 | f(
-13    |-    f'\_'
-   13 |+    rf'\_'
-14 14 | )
-15 15 | 
-16 16 | #: W605:4:6
+10 | 
+11 | #: W605:2:6
+12 | f(
+   -     f'\_'
+13 +     rf'\_'
+14 | )
+15 | 
+16 | #: W605:4:6
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:20:6
@@ -75,16 +69,14 @@ W605 [*] Invalid escape sequence: `\_`
 22 | """
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-14 14 | )
-15 15 | 
-16 16 | #: W605:4:6
-17    |-f"""
-   17 |+rf"""
-18 18 | multi-line
-19 19 | literal
-20 20 | with \_ somewhere
+14 | )
+15 | 
+16 | #: W605:4:6
+   - f"""
+17 + rf"""
+18 | multi-line
+19 | literal
+20 | with \_ somewhere
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:25:40
@@ -94,16 +86,14 @@ W605 [*] Invalid escape sequence: `\_`
    |                                        ^^
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-22 22 | """
-23 23 | 
-24 24 | #: W605:1:38
-25    |-value = f'new line\nand invalid escape \_ here'
-   25 |+value = f'new line\nand invalid escape \\_ here'
-26 26 | 
-27 27 | 
-28 28 | #: Okay
+22 | """
+23 | 
+24 | #: W605:1:38
+   - value = f'new line\nand invalid escape \_ here'
+25 + value = f'new line\nand invalid escape \\_ here'
+26 | 
+27 | 
+28 | #: Okay
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:43:13
@@ -116,16 +106,14 @@ W605 [*] Invalid escape sequence: `\_`
 45 | value = f'\{1}'
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-40 40 | \w
-41 41 | '''  # noqa
-42 42 | 
-43    |-regex = f'\\\_'
-   43 |+regex = f'\\\\_'
-44 44 | value = f'\{{1}}'
-45 45 | value = f'\{1}'
-46 46 | value = f'{1:\}'
+40 | \w
+41 | '''  # noqa
+42 | 
+   - regex = f'\\\_'
+43 + regex = f'\\\\_'
+44 | value = f'\{{1}}'
+45 | value = f'\{1}'
+46 | value = f'{1:\}'
 
 W605 [*] Invalid escape sequence: `\{`
   --> W605_1.py:44:11
@@ -137,16 +125,14 @@ W605 [*] Invalid escape sequence: `\{`
 46 | value = f'{1:\}'
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-41 41 | '''  # noqa
-42 42 | 
-43 43 | regex = f'\\\_'
-44    |-value = f'\{{1}}'
-   44 |+value = rf'\{{1}}'
-45 45 | value = f'\{1}'
-46 46 | value = f'{1:\}'
-47 47 | value = f"{f"\{1}"}"
+41 | '''  # noqa
+42 | 
+43 | regex = f'\\\_'
+   - value = f'\{{1}}'
+44 + value = rf'\{{1}}'
+45 | value = f'\{1}'
+46 | value = f'{1:\}'
+47 | value = f"{f"\{1}"}"
 
 W605 [*] Invalid escape sequence: `\{`
   --> W605_1.py:45:11
@@ -159,16 +145,14 @@ W605 [*] Invalid escape sequence: `\{`
 47 | value = f"{f"\{1}"}"
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-42 42 | 
-43 43 | regex = f'\\\_'
-44 44 | value = f'\{{1}}'
-45    |-value = f'\{1}'
-   45 |+value = rf'\{1}'
-46 46 | value = f'{1:\}'
-47 47 | value = f"{f"\{1}"}"
-48 48 | value = rf"{f"\{1}"}"
+42 | 
+43 | regex = f'\\\_'
+44 | value = f'\{{1}}'
+   - value = f'\{1}'
+45 + value = rf'\{1}'
+46 | value = f'{1:\}'
+47 | value = f"{f"\{1}"}"
+48 | value = rf"{f"\{1}"}"
 
 W605 [*] Invalid escape sequence: `\}`
   --> W605_1.py:46:14
@@ -181,16 +165,14 @@ W605 [*] Invalid escape sequence: `\}`
 48 | value = rf"{f"\{1}"}"
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-43 43 | regex = f'\\\_'
-44 44 | value = f'\{{1}}'
-45 45 | value = f'\{1}'
-46    |-value = f'{1:\}'
-   46 |+value = rf'{1:\}'
-47 47 | value = f"{f"\{1}"}"
-48 48 | value = rf"{f"\{1}"}"
-49 49 | 
+43 | regex = f'\\\_'
+44 | value = f'\{{1}}'
+45 | value = f'\{1}'
+   - value = f'{1:\}'
+46 + value = rf'{1:\}'
+47 | value = f"{f"\{1}"}"
+48 | value = rf"{f"\{1}"}"
+49 | 
 
 W605 [*] Invalid escape sequence: `\{`
   --> W605_1.py:47:14
@@ -202,16 +184,14 @@ W605 [*] Invalid escape sequence: `\{`
 48 | value = rf"{f"\{1}"}"
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-44 44 | value = f'\{{1}}'
-45 45 | value = f'\{1}'
-46 46 | value = f'{1:\}'
-47    |-value = f"{f"\{1}"}"
-   47 |+value = f"{rf"\{1}"}"
-48 48 | value = rf"{f"\{1}"}"
-49 49 | 
-50 50 | # Okay
+44 | value = f'\{{1}}'
+45 | value = f'\{1}'
+46 | value = f'{1:\}'
+   - value = f"{f"\{1}"}"
+47 + value = f"{rf"\{1}"}"
+48 | value = rf"{f"\{1}"}"
+49 | 
+50 | # Okay
 
 W605 [*] Invalid escape sequence: `\{`
   --> W605_1.py:48:15
@@ -224,16 +204,14 @@ W605 [*] Invalid escape sequence: `\{`
 50 | # Okay
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-45 45 | value = f'\{1}'
-46 46 | value = f'{1:\}'
-47 47 | value = f"{f"\{1}"}"
-48    |-value = rf"{f"\{1}"}"
-   48 |+value = rf"{rf"\{1}"}"
-49 49 | 
-50 50 | # Okay
-51 51 | value = rf'\{{1}}'
+45 | value = f'\{1}'
+46 | value = f'{1:\}'
+47 | value = f"{f"\{1}"}"
+   - value = rf"{f"\{1}"}"
+48 + value = rf"{rf"\{1}"}"
+49 | 
+50 | # Okay
+51 | value = rf'\{{1}}'
 
 W605 [*] Invalid escape sequence: `\d`
   --> W605_1.py:57:9
@@ -245,16 +223,14 @@ W605 [*] Invalid escape sequence: `\d`
 59 | f"\n{{}}�+-\d+"
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-54 54 | value = f"{rf"\{1}"}"
-55 55 | 
-56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
-57    |-f"{{}}+-\d"
-   57 |+rf"{{}}+-\d"
-58 58 | f"\n{{}}+-\d+"
-59 59 | f"\n{{}}�+-\d+"
-60 60 | 
+54 | value = f"{rf"\{1}"}"
+55 | 
+56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
+   - f"{{}}+-\d"
+57 + rf"{{}}+-\d"
+58 | f"\n{{}}+-\d+"
+59 | f"\n{{}}�+-\d+"
+60 | 
 
 W605 [*] Invalid escape sequence: `\d`
   --> W605_1.py:58:11
@@ -266,16 +242,14 @@ W605 [*] Invalid escape sequence: `\d`
 59 | f"\n{{}}�+-\d+"
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-55 55 | 
-56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
-57 57 | f"{{}}+-\d"
-58    |-f"\n{{}}+-\d+"
-   58 |+f"\n{{}}+-\\d+"
-59 59 | f"\n{{}}�+-\d+"
-60 60 | 
-61 61 | # See https://github.com/astral-sh/ruff/issues/11491
+55 | 
+56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
+57 | f"{{}}+-\d"
+   - f"\n{{}}+-\d+"
+58 + f"\n{{}}+-\\d+"
+59 | f"\n{{}}�+-\d+"
+60 | 
+61 | # See https://github.com/astral-sh/ruff/issues/11491
 
 W605 [*] Invalid escape sequence: `\d`
   --> W605_1.py:59:12
@@ -288,16 +262,14 @@ W605 [*] Invalid escape sequence: `\d`
 61 | # See https://github.com/astral-sh/ruff/issues/11491
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
-57 57 | f"{{}}+-\d"
-58 58 | f"\n{{}}+-\d+"
-59    |-f"\n{{}}�+-\d+"
-   59 |+f"\n{{}}�+-\\d+"
-60 60 | 
-61 61 | # See https://github.com/astral-sh/ruff/issues/11491
-62 62 | total = 10
+56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
+57 | f"{{}}+-\d"
+58 | f"\n{{}}+-\d+"
+   - f"\n{{}}�+-\d+"
+59 + f"\n{{}}�+-\\d+"
+60 | 
+61 | # See https://github.com/astral-sh/ruff/issues/11491
+62 | total = 10
 
 W605 [*] Invalid escape sequence: `\I`
   --> W605_1.py:65:31
@@ -310,16 +282,14 @@ W605 [*] Invalid escape sequence: `\I`
 67 | # Debug text (should trigger)
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-62 62 | total = 10
-63 63 | ok = 7
-64 64 | incomplete = 3
-65    |-s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
-   65 |+s = f"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n"
-66 66 | 
-67 67 | # Debug text (should trigger)
-68 68 | t = f"{'\InHere'=}"
+62 | total = 10
+63 | ok = 7
+64 | incomplete = 3
+   - s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
+65 + s = f"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n"
+66 | 
+67 | # Debug text (should trigger)
+68 | t = f"{'\InHere'=}"
 
 W605 [*] Invalid escape sequence: `\I`
   --> W605_1.py:68:9
@@ -329,16 +299,14 @@ W605 [*] Invalid escape sequence: `\I`
    |         ^^
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-65 65 | s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
-66 66 | 
-67 67 | # Debug text (should trigger)
-68    |-t = f"{'\InHere'=}"
-   68 |+t = f"{r'\InHere'=}"
-69 69 | 
-70 70 | 
-71 71 | 
+65 | s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
+66 | 
+67 | # Debug text (should trigger)
+   - t = f"{'\InHere'=}"
+68 + t = f"{r'\InHere'=}"
+69 | 
+70 | 
+71 | 
 
 W605 [*] Invalid escape sequence: `\.`
   --> W605_1.py:73:11
@@ -350,16 +318,14 @@ W605 [*] Invalid escape sequence: `\.`
 75 | #: W605:2:1
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-70 70 | 
-71 71 | 
-72 72 | #: W605:1:10
-73    |-regex = t'\.png$'
-   73 |+regex = rt'\.png$'
-74 74 | 
-75 75 | #: W605:2:1
-76 76 | regex = t'''
+70 | 
+71 | 
+72 | #: W605:1:10
+   - regex = t'\.png$'
+73 + regex = rt'\.png$'
+74 | 
+75 | #: W605:2:1
+76 | regex = t'''
 
 W605 [*] Invalid escape sequence: `\.`
   --> W605_1.py:77:1
@@ -371,16 +337,14 @@ W605 [*] Invalid escape sequence: `\.`
 78 | '''
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-73 73 | regex = t'\.png$'
-74 74 | 
-75 75 | #: W605:2:1
-76    |-regex = t'''
-   76 |+regex = rt'''
-77 77 | \.png$
-78 78 | '''
-79 79 | 
+73 | regex = t'\.png$'
+74 | 
+75 | #: W605:2:1
+   - regex = t'''
+76 + regex = rt'''
+77 | \.png$
+78 | '''
+79 | 
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:82:7
@@ -392,16 +356,14 @@ W605 [*] Invalid escape sequence: `\_`
 83 | )
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-79 79 | 
-80 80 | #: W605:2:6
-81 81 | f(
-82    |-    t'\_'
-   82 |+    rt'\_'
-83 83 | )
-84 84 | 
-85 85 | #: W605:4:6
+79 | 
+80 | #: W605:2:6
+81 | f(
+   -     t'\_'
+82 +     rt'\_'
+83 | )
+84 | 
+85 | #: W605:4:6
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:89:6
@@ -414,16 +376,14 @@ W605 [*] Invalid escape sequence: `\_`
 91 | """
    |
 help: Use a raw string literal
-
-ℹ Safe fix
-83 83 | )
-84 84 | 
-85 85 | #: W605:4:6
-86    |-t"""
-   86 |+rt"""
-87 87 | multi-line
-88 88 | literal
-89 89 | with \_ somewhere
+83 | )
+84 | 
+85 | #: W605:4:6
+   - t"""
+86 + rt"""
+87 | multi-line
+88 | literal
+89 | with \_ somewhere
 
 W605 [*] Invalid escape sequence: `\_`
   --> W605_1.py:94:40
@@ -433,37 +393,14 @@ W605 [*] Invalid escape sequence: `\_`
    |                                        ^^
    |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-91 91 | """
-92 92 | 
-93 93 | #: W605:1:38
-94    |-value = t'new line\nand invalid escape \_ here'
-   94 |+value = t'new line\nand invalid escape \\_ here'
-95 95 | 
-96 96 | 
-97 97 | #: Okay
-
-W605 [*] Invalid escape sequence: `\w`
-   --> W605_1.py:109:1
-    |
-107 | regex = t'\w'  # noqa
-108 | regex = t'''
-109 | \w
-    | ^^
-110 | '''  # noqa
-    |
-help: Use a raw string literal
-
-ℹ Safe fix
-105 105 | '''
-106 106 | s = t'\\'
-107 107 | regex = t'\w'  # noqa
-108     |-regex = t'''
-    108 |+regex = rt'''
-109 109 | \w
-110 110 | '''  # noqa
-111 111 | 
+91 | """
+92 | 
+93 | #: W605:1:38
+   - value = t'new line\nand invalid escape \_ here'
+94 + value = t'new line\nand invalid escape \\_ here'
+95 | 
+96 | 
+97 | #: Okay
 
 W605 [*] Invalid escape sequence: `\_`
    --> W605_1.py:112:13
@@ -476,16 +413,14 @@ W605 [*] Invalid escape sequence: `\_`
 114 | value = t'\{1}'
     |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-109 109 | \w
-110 110 | '''  # noqa
-111 111 | 
-112     |-regex = t'\\\_'
-    112 |+regex = t'\\\\_'
-113 113 | value = t'\{{1}}'
-114 114 | value = t'\{1}'
-115 115 | value = t'{1:\}'
+109 | \w
+110 | '''  # noqa
+111 | 
+    - regex = t'\\\_'
+112 + regex = t'\\\\_'
+113 | value = t'\{{1}}'
+114 | value = t'\{1}'
+115 | value = t'{1:\}'
 
 W605 [*] Invalid escape sequence: `\{`
    --> W605_1.py:113:11
@@ -497,16 +432,14 @@ W605 [*] Invalid escape sequence: `\{`
 115 | value = t'{1:\}'
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-110 110 | '''  # noqa
-111 111 | 
-112 112 | regex = t'\\\_'
-113     |-value = t'\{{1}}'
-    113 |+value = rt'\{{1}}'
-114 114 | value = t'\{1}'
-115 115 | value = t'{1:\}'
-116 116 | value = t"{t"\{1}"}"
+110 | '''  # noqa
+111 | 
+112 | regex = t'\\\_'
+    - value = t'\{{1}}'
+113 + value = rt'\{{1}}'
+114 | value = t'\{1}'
+115 | value = t'{1:\}'
+116 | value = t"{t"\{1}"}"
 
 W605 [*] Invalid escape sequence: `\{`
    --> W605_1.py:114:11
@@ -519,16 +452,14 @@ W605 [*] Invalid escape sequence: `\{`
 116 | value = t"{t"\{1}"}"
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-111 111 | 
-112 112 | regex = t'\\\_'
-113 113 | value = t'\{{1}}'
-114     |-value = t'\{1}'
-    114 |+value = rt'\{1}'
-115 115 | value = t'{1:\}'
-116 116 | value = t"{t"\{1}"}"
-117 117 | value = rt"{t"\{1}"}"
+111 | 
+112 | regex = t'\\\_'
+113 | value = t'\{{1}}'
+    - value = t'\{1}'
+114 + value = rt'\{1}'
+115 | value = t'{1:\}'
+116 | value = t"{t"\{1}"}"
+117 | value = rt"{t"\{1}"}"
 
 W605 [*] Invalid escape sequence: `\}`
    --> W605_1.py:115:14
@@ -541,16 +472,14 @@ W605 [*] Invalid escape sequence: `\}`
 117 | value = rt"{t"\{1}"}"
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-112 112 | regex = t'\\\_'
-113 113 | value = t'\{{1}}'
-114 114 | value = t'\{1}'
-115     |-value = t'{1:\}'
-    115 |+value = rt'{1:\}'
-116 116 | value = t"{t"\{1}"}"
-117 117 | value = rt"{t"\{1}"}"
-118 118 | 
+112 | regex = t'\\\_'
+113 | value = t'\{{1}}'
+114 | value = t'\{1}'
+    - value = t'{1:\}'
+115 + value = rt'{1:\}'
+116 | value = t"{t"\{1}"}"
+117 | value = rt"{t"\{1}"}"
+118 | 
 
 W605 [*] Invalid escape sequence: `\{`
    --> W605_1.py:116:14
@@ -562,16 +491,14 @@ W605 [*] Invalid escape sequence: `\{`
 117 | value = rt"{t"\{1}"}"
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-113 113 | value = t'\{{1}}'
-114 114 | value = t'\{1}'
-115 115 | value = t'{1:\}'
-116     |-value = t"{t"\{1}"}"
-    116 |+value = t"{rt"\{1}"}"
-117 117 | value = rt"{t"\{1}"}"
-118 118 | 
-119 119 | # Okay
+113 | value = t'\{{1}}'
+114 | value = t'\{1}'
+115 | value = t'{1:\}'
+    - value = t"{t"\{1}"}"
+116 + value = t"{rt"\{1}"}"
+117 | value = rt"{t"\{1}"}"
+118 | 
+119 | # Okay
 
 W605 [*] Invalid escape sequence: `\{`
    --> W605_1.py:117:15
@@ -584,16 +511,14 @@ W605 [*] Invalid escape sequence: `\{`
 119 | # Okay
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-114 114 | value = t'\{1}'
-115 115 | value = t'{1:\}'
-116 116 | value = t"{t"\{1}"}"
-117     |-value = rt"{t"\{1}"}"
-    117 |+value = rt"{rt"\{1}"}"
-118 118 | 
-119 119 | # Okay
-120 120 | value = rt'\{{1}}'
+114 | value = t'\{1}'
+115 | value = t'{1:\}'
+116 | value = t"{t"\{1}"}"
+    - value = rt"{t"\{1}"}"
+117 + value = rt"{rt"\{1}"}"
+118 | 
+119 | # Okay
+120 | value = rt'\{{1}}'
 
 W605 [*] Invalid escape sequence: `\d`
    --> W605_1.py:126:9
@@ -605,16 +530,14 @@ W605 [*] Invalid escape sequence: `\d`
 128 | t"\n{{}}�+-\d+"
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-123 123 | value = t"{rt"\{1}"}"
-124 124 | 
-125 125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
-126     |-t"{{}}+-\d"
-    126 |+rt"{{}}+-\d"
-127 127 | t"\n{{}}+-\d+"
-128 128 | t"\n{{}}�+-\d+"
-129 129 | 
+123 | value = t"{rt"\{1}"}"
+124 | 
+125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
+    - t"{{}}+-\d"
+126 + rt"{{}}+-\d"
+127 | t"\n{{}}+-\d+"
+128 | t"\n{{}}�+-\d+"
+129 | 
 
 W605 [*] Invalid escape sequence: `\d`
    --> W605_1.py:127:11
@@ -626,16 +549,14 @@ W605 [*] Invalid escape sequence: `\d`
 128 | t"\n{{}}�+-\d+"
     |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-124 124 | 
-125 125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
-126 126 | t"{{}}+-\d"
-127     |-t"\n{{}}+-\d+"
-    127 |+t"\n{{}}+-\\d+"
-128 128 | t"\n{{}}�+-\d+"
-129 129 | 
-130 130 | # See https://github.com/astral-sh/ruff/issues/11491
+124 | 
+125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
+126 | t"{{}}+-\d"
+    - t"\n{{}}+-\d+"
+127 + t"\n{{}}+-\\d+"
+128 | t"\n{{}}�+-\d+"
+129 | 
+130 | # See https://github.com/astral-sh/ruff/issues/11491
 
 W605 [*] Invalid escape sequence: `\d`
    --> W605_1.py:128:12
@@ -648,16 +569,14 @@ W605 [*] Invalid escape sequence: `\d`
 130 | # See https://github.com/astral-sh/ruff/issues/11491
     |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-125 125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
-126 126 | t"{{}}+-\d"
-127 127 | t"\n{{}}+-\d+"
-128     |-t"\n{{}}�+-\d+"
-    128 |+t"\n{{}}�+-\\d+"
-129 129 | 
-130 130 | # See https://github.com/astral-sh/ruff/issues/11491
-131 131 | total = 10
+125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434
+126 | t"{{}}+-\d"
+127 | t"\n{{}}+-\d+"
+    - t"\n{{}}�+-\d+"
+128 + t"\n{{}}�+-\\d+"
+129 | 
+130 | # See https://github.com/astral-sh/ruff/issues/11491
+131 | total = 10
 
 W605 [*] Invalid escape sequence: `\I`
    --> W605_1.py:134:31
@@ -670,16 +589,14 @@ W605 [*] Invalid escape sequence: `\I`
 136 | # Debug text (should trigger)
     |
 help: Add backslash to escape sequence
-
-ℹ Safe fix
-131 131 | total = 10
-132 132 | ok = 7
-133 133 | incomplete = 3
-134     |-s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
-    134 |+s = t"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n"
-135 135 | 
-136 136 | # Debug text (should trigger)
-137 137 | t = t"{'\InHere'=}"
+131 | total = 10
+132 | ok = 7
+133 | incomplete = 3
+    - s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
+134 + s = t"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n"
+135 | 
+136 | # Debug text (should trigger)
+137 | t = t"{'\InHere'=}"
 
 W605 [*] Invalid escape sequence: `\I`
    --> W605_1.py:137:9
@@ -689,10 +606,8 @@ W605 [*] Invalid escape sequence: `\I`
     |         ^^
     |
 help: Use a raw string literal
-
-ℹ Safe fix
-134 134 | s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
-135 135 | 
-136 136 | # Debug text (should trigger)
-137     |-t = t"{'\InHere'=}"
-    137 |+t = t"{r'\InHere'=}"
+134 | s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
+135 | 
+136 | # Debug text (should trigger)
+    - t = t"{'\InHere'=}"
+137 + t = t"{r'\InHere'=}"
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap
index e7db6cbc5d..3bd1c13bce 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap
@@ -12,12 +12,10 @@ E301 [*] Expected 1 blank line, found 0
 15 |         pass
    |
 help: Add missing blank line
-
-ℹ Safe fix
-10 10 | 
-11 11 |     def method(cls) -> None:
-12 12 |         pass
-   13 |+
-13 14 |     @classmethod
-14 15 |     def cls_method(cls) -> None:
-15 16 |         pass
+10 | 
+11 |     def method(cls) -> None:
+12 |         pass
+13 + 
+14 |     @classmethod
+15 |     def cls_method(cls) -> None:
+16 |         pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap
index 8a5cfb44fb..ae745b3cde 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap
@@ -12,12 +12,10 @@ E302 [*] Expected 2 blank lines, found 1
 23 | # end
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-18 18 | def a():
-19 19 |     pass
-20 20 | 
-   21 |+
-21 22 | def b():
-22 23 |     pass
-23 24 | # end
+18 | def a():
+19 |     pass
+20 | 
+21 + 
+22 | def b():
+23 |     pass
+24 | # end
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap
index 977af3e324..f41c631c18 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap
@@ -10,15 +10,13 @@ E303 [*] Too many blank lines (2)
 31 |     def inner():  # E306 not expected (pycodestyle detects E306)
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-25 25 | def fn():
-26 26 |     _ = None
-27 27 | 
-28    |-
-29 28 |     # arbitrary comment
-30 29 | 
-31 30 |     def inner():  # E306 not expected (pycodestyle detects E306)
+25 | def fn():
+26 |     _ = None
+27 | 
+   - 
+28 |     # arbitrary comment
+29 | 
+30 |     def inner():  # E306 not expected (pycodestyle detects E306)
 
 E303 [*] Too many blank lines (4)
   --> E30.ipynb:39:1
@@ -29,13 +27,11 @@ E303 [*] Too many blank lines (4)
 41 | # end
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-34 34 | # E303
-35 35 | 
-36 36 | 
-37    |-
-38    |-
-39 37 | def fn():
-40 38 | 	pass
-41 39 | # end
+34 | # E303
+35 | 
+36 | 
+   - 
+   - 
+37 | def fn():
+38 | 	pass
+39 | # end
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap
index c8f3e76104..1e06e30216 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap
@@ -10,15 +10,13 @@ E303 [*] Too many blank lines (2)
 19 | def grouped3( ): ...
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-13 13 | @overload
-14 14 | def a(arg: int, name: str): ...
-15 15 | 
-16    |-
-17 16 | def grouped1(): ...
-18 17 | def grouped2(): ...
-19 18 | def grouped3( ): ...
+13 | @overload
+14 | def a(arg: int, name: str): ...
+15 | 
+   - 
+16 | def grouped1(): ...
+17 | def grouped2(): ...
+18 | def grouped3( ): ...
 
 E303 [*] Too many blank lines (2)
   --> E30.pyi:22:1
@@ -29,15 +27,13 @@ E303 [*] Too many blank lines (2)
 24 |     backend_object: str | None
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-18 18 | def grouped2(): ...
-19 19 | def grouped3( ): ...
-20 20 | 
-21    |-
-22 21 | class BackendProxy:
-23 22 |     backend_module: str
-24 23 |     backend_object: str | None
+18 | def grouped2(): ...
+19 | def grouped3( ): ...
+20 | 
+   - 
+21 | class BackendProxy:
+22 |     backend_module: str
+23 |     backend_object: str | None
 
 E303 [*] Too many blank lines (2)
   --> E30.pyi:35:5
@@ -47,15 +43,13 @@ E303 [*] Too many blank lines (2)
 36 | a = "test"
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-31 31 |     
-32 32 |     def with_blank_line(): ...
-33 33 |     
-34    |-    
-35 34 |     def ungrouped(): ...
-36 35 | a = "test"
-37 36 | 
+31 |     
+32 |     def with_blank_line(): ...
+33 |     
+   -     
+34 |     def ungrouped(): ...
+35 | a = "test"
+36 | 
 
 E303 [*] Too many blank lines (2)
   --> E30.pyi:43:1
@@ -66,12 +60,10 @@ E303 [*] Too many blank lines (2)
 45 |          pass
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-39 39 |     pass
-40 40 | b = "test"
-41 41 | 
-42    |-
-43 42 | def outer():
-44 43 |      def inner():
-45 44 |          pass
+39 |     pass
+40 | b = "test"
+41 | 
+   - 
+42 | def outer():
+43 |      def inner():
+44 |          pass
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap
index 3d9f4f8434..a6746e265f 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap
@@ -12,12 +12,10 @@ E304 [*] Blank lines found after function decorator (1)
 47 | # end
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-41 41 | # end
-42 42 | # E304
-43 43 | @decorator
-44    |-
-45 44 | def function():
-46 45 |     pass
-47 46 | # end
+41 | # end
+42 | # E304
+43 | @decorator
+   - 
+44 | def function():
+45 |     pass
+46 | # end
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap
index 5b83ab47b2..d7d2bf4263 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap
@@ -10,12 +10,10 @@ E304 [*] Blank lines found after function decorator (1)
    |     ^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-28 28 |     def grouped2(): ...
-29 29 |     def grouped3( ): ...
-30 30 |     @decorated
-31    |-    
-32 31 |     def with_blank_line(): ...
-33 32 |     
-34 33 |
+28 |     def grouped2(): ...
+29 |     def grouped3( ): ...
+30 |     @decorated
+   -     
+31 |     def with_blank_line(): ...
+32 |     
+33 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap
index 250640539c..68f4da8c09 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap
@@ -11,12 +11,10 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1)
 57 | # E306:3:5
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-52 52 |     # comment
-53 53 | 
-54 54 |     # another comment
-   55 |+
-55 56 | fn()
-56 57 | # end
-57 58 | # E306:3:5
+52 |     # comment
+53 | 
+54 |     # another comment
+55 + 
+56 | fn()
+57 | # end
+58 | # E306:3:5
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap
index 342b178c56..cc8b45b445 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap
@@ -12,12 +12,10 @@ E306 [*] Expected 1 blank line before a nested definition, found 0
 62 | # end
    |
 help: Add missing blank line
-
-ℹ Safe fix
-57 57 | # E306:3:5
-58 58 | def a():
-59 59 |     x = 1
-   60 |+
-60 61 |     def b():
-61 62 |         pass
-62 63 | # end
+57 | # E306:3:5
+58 | def a():
+59 |     x = 1
+60 + 
+61 |     def b():
+62 |         pass
+63 | # end
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap
index 8a04a07b58..eac3013414 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap
@@ -12,15 +12,13 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2   |-
-3   |-
-4   |-
-5 2 | from typing import Any, Sequence
-6 3 | 
-7 4 | 
+1 | import json
+  - 
+  - 
+  - 
+2 | from typing import Any, Sequence
+3 | 
+4 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:23:1
@@ -33,15 +31,13 @@ E302 [*] Expected 2 blank lines, found 1
 25 | if TYPE_CHECKING:
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-20 20 | 
-21 21 |     abcd.foo()
-22 22 | 
-   23 |+
-23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
-24 25 | 
-25 26 | if TYPE_CHECKING:
+20 | 
+21 |     abcd.foo()
+22 | 
+23 + 
+24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+25 | 
+26 | if TYPE_CHECKING:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -55,16 +51,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:35:1
@@ -76,15 +70,13 @@ E302 [*] Expected 2 blank lines, found 1
 36 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-32 32 | 
-33 33 |     abcd.foo()
-34 34 | 
-   35 |+
-35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
-36 37 |     ...
-37 38 | 
+32 | 
+33 |     abcd.foo()
+34 | 
+35 + 
+36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+37 |     ...
+38 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:41:1
@@ -96,15 +88,13 @@ E302 [*] Expected 2 blank lines, found 1
 42 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-38 38 | if TYPE_CHECKING:
-39 39 |     from typing_extensions import TypeAlias
-40 40 | 
-   41 |+
-41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-42 43 |     ...
-43 44 | 
+38 | if TYPE_CHECKING:
+39 |     from typing_extensions import TypeAlias
+40 | 
+41 + 
+42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
+43 |     ...
+44 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:60:1
@@ -115,13 +105,11 @@ I001 [*] Import block is un-sorted or un-formatted
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Organize imports
-
-ℹ Safe fix
-59 59 | 
-60 60 | from typing import Any, Sequence
-61 61 | 
-   62 |+
-62 63 | class MissingCommand(TypeError): ...  # noqa: N818
+59 | 
+60 | from typing import Any, Sequence
+61 | 
+62 + 
+63 | class MissingCommand(TypeError): ...  # noqa: N818
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:62:1
@@ -132,10 +120,8 @@ E302 [*] Expected 2 blank lines, found 1
    | ^^^^^
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-59 59 | 
-60 60 | from typing import Any, Sequence
-61 61 | 
-   62 |+
-62 63 | class MissingCommand(TypeError): ...  # noqa: N818
+59 | 
+60 | from typing import Any, Sequence
+61 | 
+62 + 
+63 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap
index 9c480c19a2..0fc8cc5855 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap
@@ -12,18 +12,16 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2   |-
-3   |-
-4   |-
-5 2 | from typing import Any, Sequence
-6   |-
-7   |-
-8 3 | class MissingCommand(TypeError): ...  # noqa: N818
-9 4 | 
-10 5 | 
+1 | import json
+  - 
+  - 
+  - 
+2 | from typing import Any, Sequence
+  - 
+  - 
+3 | class MissingCommand(TypeError): ...  # noqa: N818
+4 | 
+5 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:23:1
@@ -36,15 +34,13 @@ E302 [*] Expected 2 blank lines, found 1
 25 | if TYPE_CHECKING:
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-20 20 | 
-21 21 |     abcd.foo()
-22 22 | 
-   23 |+
-23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
-24 25 | 
-25 26 | if TYPE_CHECKING:
+20 | 
+21 |     abcd.foo()
+22 | 
+23 + 
+24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+25 | 
+26 | if TYPE_CHECKING:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -58,16 +54,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:35:1
@@ -79,15 +73,13 @@ E302 [*] Expected 2 blank lines, found 1
 36 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-32 32 | 
-33 33 |     abcd.foo()
-34 34 | 
-   35 |+
-35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
-36 37 |     ...
-37 38 | 
+32 | 
+33 |     abcd.foo()
+34 | 
+35 + 
+36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+37 |     ...
+38 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:41:1
@@ -99,15 +91,13 @@ E302 [*] Expected 2 blank lines, found 1
 42 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-38 38 | if TYPE_CHECKING:
-39 39 |     from typing_extensions import TypeAlias
-40 40 | 
-   41 |+
-41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-42 43 |     ...
-43 44 | 
+38 | if TYPE_CHECKING:
+39 |     from typing_extensions import TypeAlias
+40 | 
+41 + 
+42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
+43 |     ...
+44 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:60:1
@@ -118,10 +108,8 @@ I001 [*] Import block is un-sorted or un-formatted
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Organize imports
-
-ℹ Safe fix
-58 58 | 
-59 59 | 
-60 60 | from typing import Any, Sequence
-61    |-
-62 61 | class MissingCommand(TypeError): ...  # noqa: N818
+58 | 
+59 | 
+60 | from typing import Any, Sequence
+   - 
+61 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap
index 5c84b8e63e..84e7144bae 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap
@@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2 2 | 
-3   |-
-4   |-
-5 3 | from typing import Any, Sequence
-6   |-
-7 4 | 
-8 5 | class MissingCommand(TypeError): ...  # noqa: N818
-9 6 | 
+1 | import json
+2 | 
+  - 
+  - 
+3 | from typing import Any, Sequence
+  - 
+4 | 
+5 | class MissingCommand(TypeError): ...  # noqa: N818
+6 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:23:1
@@ -35,15 +33,13 @@ E302 [*] Expected 2 blank lines, found 1
 25 | if TYPE_CHECKING:
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-20 20 | 
-21 21 |     abcd.foo()
-22 22 | 
-   23 |+
-23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
-24 25 | 
-25 26 | if TYPE_CHECKING:
+20 | 
+21 |     abcd.foo()
+22 | 
+23 + 
+24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+25 | 
+26 | if TYPE_CHECKING:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -57,16 +53,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:35:1
@@ -78,15 +72,13 @@ E302 [*] Expected 2 blank lines, found 1
 36 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-32 32 | 
-33 33 |     abcd.foo()
-34 34 | 
-   35 |+
-35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
-36 37 |     ...
-37 38 | 
+32 | 
+33 |     abcd.foo()
+34 | 
+35 + 
+36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+37 |     ...
+38 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:41:1
@@ -98,12 +90,10 @@ E302 [*] Expected 2 blank lines, found 1
 42 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-38 38 | if TYPE_CHECKING:
-39 39 |     from typing_extensions import TypeAlias
-40 40 | 
-   41 |+
-41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-42 43 |     ...
-43 44 |
+38 | if TYPE_CHECKING:
+39 |     from typing_extensions import TypeAlias
+40 | 
+41 + 
+42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
+43 |     ...
+44 |
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap
index b3900e15ed..ee1ddb0fea 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap
@@ -12,20 +12,18 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | 
-4  4  | 
-   5  |+
-5  6  | from typing import Any, Sequence
-6  7  | 
-7  8  | 
-   9  |+
-   10 |+
-8  11 | class MissingCommand(TypeError): ...  # noqa: N818
-9  12 | 
-10 13 | 
+2  | 
+3  | 
+4  | 
+5  + 
+6  | from typing import Any, Sequence
+7  | 
+8  | 
+9  + 
+10 + 
+11 | class MissingCommand(TypeError): ...  # noqa: N818
+12 | 
+13 | 
 
 E302 [*] Expected 4 blank lines, found 2
  --> E30_isort.py:8:1
@@ -34,16 +32,14 @@ E302 [*] Expected 4 blank lines, found 2
   | ^^^^^
   |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-5  5  | from typing import Any, Sequence
-6  6  | 
-7  7  | 
-   8  |+
-   9  |+
-8  10 | class MissingCommand(TypeError): ...  # noqa: N818
-9  11 | 
-10 12 | 
+5  | from typing import Any, Sequence
+6  | 
+7  | 
+8  + 
+9  + 
+10 | class MissingCommand(TypeError): ...  # noqa: N818
+11 | 
+12 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:23:1
@@ -56,15 +52,13 @@ E302 [*] Expected 2 blank lines, found 1
 25 | if TYPE_CHECKING:
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-20 20 | 
-21 21 |     abcd.foo()
-22 22 | 
-   23 |+
-23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
-24 25 | 
-25 26 | if TYPE_CHECKING:
+20 | 
+21 |     abcd.foo()
+22 | 
+23 + 
+24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+25 | 
+26 | if TYPE_CHECKING:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -78,16 +72,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:35:1
@@ -99,15 +91,13 @@ E302 [*] Expected 2 blank lines, found 1
 36 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-32 32 | 
-33 33 |     abcd.foo()
-34 34 | 
-   35 |+
-35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
-36 37 |     ...
-37 38 | 
+32 | 
+33 |     abcd.foo()
+34 | 
+35 + 
+36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+37 |     ...
+38 | 
 
 E302 [*] Expected 2 blank lines, found 1
   --> E30_isort.py:41:1
@@ -119,15 +109,13 @@ E302 [*] Expected 2 blank lines, found 1
 42 |     ...
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-38 38 | if TYPE_CHECKING:
-39 39 |     from typing_extensions import TypeAlias
-40 40 | 
-   41 |+
-41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-42 43 |     ...
-43 44 | 
+38 | if TYPE_CHECKING:
+39 |     from typing_extensions import TypeAlias
+40 | 
+41 + 
+42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
+43 |     ...
+44 | 
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:60:1
@@ -138,15 +126,13 @@ I001 [*] Import block is un-sorted or un-formatted
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Organize imports
-
-ℹ Safe fix
-59 59 | 
-60 60 | from typing import Any, Sequence
-61 61 | 
-   62 |+
-   63 |+
-   64 |+
-62 65 | class MissingCommand(TypeError): ...  # noqa: N818
+59 | 
+60 | from typing import Any, Sequence
+61 | 
+62 + 
+63 + 
+64 + 
+65 | class MissingCommand(TypeError): ...  # noqa: N818
 
 E302 [*] Expected 4 blank lines, found 1
   --> E30_isort.py:62:1
@@ -157,12 +143,10 @@ E302 [*] Expected 4 blank lines, found 1
    | ^^^^^
    |
 help: Add missing blank line(s)
-
-ℹ Safe fix
-59 59 | 
-60 60 | from typing import Any, Sequence
-61 61 | 
-   62 |+
-   63 |+
-   64 |+
-62 65 | class MissingCommand(TypeError): ...  # noqa: N818
+59 | 
+60 | from typing import Any, Sequence
+61 | 
+62 + 
+63 + 
+64 + 
+65 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap
index 941e55ca08..1d509703d2 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap
@@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2   |-
-3   |-
-4   |-
-5 2 | from typing import Any, Sequence
-6   |-
-7 3 | 
-8 4 | class MissingCommand(TypeError): ...  # noqa: N818
-9 5 | 
+1 | import json
+  - 
+  - 
+  - 
+2 | from typing import Any, Sequence
+  - 
+3 | 
+4 | class MissingCommand(TypeError): ...  # noqa: N818
+5 | 
 
 E303 [*] Too many blank lines (3)
  --> E30_isort.pyi:5:1
@@ -31,15 +29,13 @@ E303 [*] Too many blank lines (3)
   | ^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | import json
-2 2 | 
-3   |-
-4   |-
-5 3 | from typing import Any, Sequence
-6 4 | 
-7 5 | 
+1 | import json
+2 | 
+  - 
+  - 
+3 | from typing import Any, Sequence
+4 | 
+5 | 
 
 E303 [*] Too many blank lines (2)
  --> E30_isort.pyi:8:1
@@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2)
   | ^^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-4 4 | 
-5 5 | from typing import Any, Sequence
-6 6 | 
-7   |-
-8 7 | class MissingCommand(TypeError): ...  # noqa: N818
-9 8 | 
-10 9 | 
+4 | 
+5 | from typing import Any, Sequence
+6 | 
+  - 
+7 | class MissingCommand(TypeError): ...  # noqa: N818
+8 | 
+9 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:11:1
@@ -67,15 +61,13 @@ E303 [*] Too many blank lines (2)
 13 |     backend_object: str | None
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-7  7  | 
-8  8  | class MissingCommand(TypeError): ...  # noqa: N818
-9  9  | 
-10    |-
-11 10 | class BackendProxy:
-12 11 |     backend_module: str
-13 12 |     backend_object: str | None
+7  | 
+8  | class MissingCommand(TypeError): ...  # noqa: N818
+9  | 
+   - 
+10 | class BackendProxy:
+11 |     backend_module: str
+12 |     backend_object: str | None
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:17:1
@@ -85,15 +77,13 @@ E303 [*] Too many blank lines (2)
 18 |     import abcd
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-13 13 |     backend_object: str | None
-14 14 |     backend: Any
-15 15 | 
-16    |-
-17 16 | if __name__ == "__main__":
-18 17 |     import abcd
-19 18 | 
+13 |     backend_object: str | None
+14 |     backend: Any
+15 | 
+   - 
+16 | if __name__ == "__main__":
+17 |     import abcd
+18 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:21:5
@@ -104,15 +94,13 @@ E303 [*] Too many blank lines (2)
 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-17 17 | if __name__ == "__main__":
-18 18 |     import abcd
-19 19 | 
-20    |-
-21 20 |     abcd.foo()
-22 21 | 
-23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+17 | if __name__ == "__main__":
+18 |     import abcd
+19 | 
+   - 
+20 |     abcd.foo()
+21 | 
+22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.pyi:26:5
@@ -126,16 +114,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (3)
   --> E30_isort.pyi:30:5
@@ -144,16 +130,14 @@ E303 [*] Too many blank lines (3)
    |     ^^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:33:5
@@ -164,15 +148,13 @@ E303 [*] Too many blank lines (2)
 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-29 29 | 
-30 30 |     from typing_extensions import TypeAlias
-31 31 | 
-32    |-
-33 32 |     abcd.foo()
-34 33 | 
-35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+29 | 
+30 |     from typing_extensions import TypeAlias
+31 | 
+   - 
+32 |     abcd.foo()
+33 | 
+34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:45:1
@@ -181,15 +163,13 @@ E303 [*] Too many blank lines (2)
    | ^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-41 41 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-42 42 |     ...
-43 43 | 
-44    |-
-45 44 | def _exit(self) -> None: ...
-46 45 | 
-47 46 | 
+41 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
+42 |     ...
+43 | 
+   - 
+44 | def _exit(self) -> None: ...
+45 | 
+46 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:48:1
@@ -198,15 +178,13 @@ E303 [*] Too many blank lines (2)
    | ^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-44 44 | 
-45 45 | def _exit(self) -> None: ...
-46 46 | 
-47    |-
-48 47 | def _optional_commands(self) -> dict[str, bool]: ...
-49 48 | 
-50 49 | 
+44 | 
+45 | def _exit(self) -> None: ...
+46 | 
+   - 
+47 | def _optional_commands(self) -> dict[str, bool]: ...
+48 | 
+49 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:51:1
@@ -215,15 +193,13 @@ E303 [*] Too many blank lines (2)
    | ^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-47 47 | 
-48 48 | def _optional_commands(self) -> dict[str, bool]: ...
-49 49 | 
-50    |-
-51 50 | def run(argv: Sequence[str]) -> int: ...
-52 51 | 
-53 52 | 
+47 | 
+48 | def _optional_commands(self) -> dict[str, bool]: ...
+49 | 
+   - 
+50 | def run(argv: Sequence[str]) -> int: ...
+51 | 
+52 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:54:1
@@ -232,15 +208,13 @@ E303 [*] Too many blank lines (2)
    | ^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-50 50 | 
-51 51 | def run(argv: Sequence[str]) -> int: ...
-52 52 | 
-53    |-
-54 53 | def read_line(fd: int = 0) -> bytearray: ...
-55 54 | 
-56 55 | 
+50 | 
+51 | def run(argv: Sequence[str]) -> int: ...
+52 | 
+   - 
+53 | def read_line(fd: int = 0) -> bytearray: ...
+54 | 
+55 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:57:1
@@ -249,15 +223,13 @@ E303 [*] Too many blank lines (2)
    | ^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-53 53 | 
-54 54 | def read_line(fd: int = 0) -> bytearray: ...
-55 55 | 
-56    |-
-57 56 | def flush() -> None: ...
-58 57 | 
-59 58 | 
+53 | 
+54 | def read_line(fd: int = 0) -> bytearray: ...
+55 | 
+   - 
+56 | def flush() -> None: ...
+57 | 
+58 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.pyi:60:1
@@ -268,12 +240,10 @@ E303 [*] Too many blank lines (2)
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-56 56 | 
-57 57 | def flush() -> None: ...
-58 58 | 
-59    |-
-60 59 | from typing import Any, Sequence
-61 60 | 
-62 61 | class MissingCommand(TypeError): ...  # noqa: N818
+56 | 
+57 | def flush() -> None: ...
+58 | 
+   - 
+59 | from typing import Any, Sequence
+60 | 
+61 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap
index cbd129d821..9d883aa7b3 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap
@@ -12,16 +12,14 @@ F632 [*] Use `==` to compare constant literals
 6 | if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
   |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-1 1 | ###
-2 2 | # Errors
-3 3 | ###
-4   |-if "abc" is "def":  # F632 (fix)
-  4 |+if "abc" == "def":  # F632 (fix)
-5 5 |     pass
-6 6 | if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
-7 7 |     pass
+1 | ###
+2 | # Errors
+3 | ###
+  - if "abc" is "def":  # F632 (fix)
+4 + if "abc" == "def":  # F632 (fix)
+5 |     pass
+6 | if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
+7 |     pass
 
 F632 [*] Use `==` to compare constant literals
  --> constant_literals.py:6:4
@@ -34,16 +32,14 @@ F632 [*] Use `==` to compare constant literals
 8 | if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
   |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-3 3 | ###
-4 4 | if "abc" is "def":  # F632 (fix)
-5 5 |     pass
-6   |-if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
-  6 |+if "abc" == None:  # F632 (fix, but leaves behind unfixable E711)
-7 7 |     pass
-8 8 | if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
-9 9 |     pass
+3 | ###
+4 | if "abc" is "def":  # F632 (fix)
+5 |     pass
+  - if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
+6 + if "abc" == None:  # F632 (fix, but leaves behind unfixable E711)
+7 |     pass
+8 | if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
+9 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:8:4
@@ -56,16 +52,14 @@ F632 [*] Use `==` to compare constant literals
 10 | if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-5 5 |     pass
-6 6 | if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
-7 7 |     pass
-8   |-if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
-  8 |+if None == "abc":  # F632 (fix, but leaves behind unfixable E711)
-9 9 |     pass
-10 10 | if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
-11 11 |     pass
+5  |     pass
+6  | if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
+7  |     pass
+   - if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
+8  + if None == "abc":  # F632 (fix, but leaves behind unfixable E711)
+9  |     pass
+10 | if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
+11 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:10:4
@@ -78,16 +72,14 @@ F632 [*] Use `==` to compare constant literals
 12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-7  7  |     pass
-8  8  | if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
-9  9  |     pass
-10    |-if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
-   10 |+if "abc" == False:  # F632 (fix, but leaves behind unfixable E712)
-11 11 |     pass
-12 12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
-13 13 |     pass
+7  |     pass
+8  | if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
+9  |     pass
+   - if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
+10 + if "abc" == False:  # F632 (fix, but leaves behind unfixable E712)
+11 |     pass
+12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
+13 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:12:4
@@ -100,16 +92,14 @@ F632 [*] Use `==` to compare constant literals
 14 | if False == None:  # E711, E712 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-9  9  |     pass
-10 10 | if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
-11 11 |     pass
-12    |-if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
-   12 |+if False == "abc":  # F632 (fix, but leaves behind unfixable E712)
-13 13 |     pass
-14 14 | if False == None:  # E711, E712 (fix)
-15 15 |     pass
+9  |     pass
+10 | if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
+11 |     pass
+   - if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
+12 + if False == "abc":  # F632 (fix, but leaves behind unfixable E712)
+13 |     pass
+14 | if False == None:  # E711, E712 (fix)
+15 |     pass
 
 E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks
   --> constant_literals.py:14:4
@@ -122,16 +112,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks
 16 | if None == False:  # E711, E712 (fix)
    |
 help: Replace with `not None`
-
-ℹ Unsafe fix
-11 11 |     pass
-12 12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
-13 13 |     pass
-14    |-if False == None:  # E711, E712 (fix)
-   14 |+if not None:  # E711, E712 (fix)
-15 15 |     pass
-16 16 | if None == False:  # E711, E712 (fix)
-17 17 |     pass
+11 |     pass
+12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
+13 |     pass
+   - if False == None:  # E711, E712 (fix)
+14 + if not None:  # E711, E712 (fix)
+15 |     pass
+16 | if None == False:  # E711, E712 (fix)
+17 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is None`
   --> constant_literals.py:14:13
@@ -144,16 +133,15 @@ E711 [*] Comparison to `None` should be `cond is None`
 16 | if None == False:  # E711, E712 (fix)
    |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-11 11 |     pass
-12 12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
-13 13 |     pass
-14    |-if False == None:  # E711, E712 (fix)
-   14 |+if not None:  # E711, E712 (fix)
-15 15 |     pass
-16 16 | if None == False:  # E711, E712 (fix)
-17 17 |     pass
+11 |     pass
+12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
+13 |     pass
+   - if False == None:  # E711, E712 (fix)
+14 + if not None:  # E711, E712 (fix)
+15 |     pass
+16 | if None == False:  # E711, E712 (fix)
+17 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 E711 [*] Comparison to `None` should be `cond is None`
   --> constant_literals.py:16:4
@@ -165,16 +153,15 @@ E711 [*] Comparison to `None` should be `cond is None`
 17 |     pass
    |
 help: Replace with `cond is None`
-
-ℹ Unsafe fix
-13 13 |     pass
-14 14 | if False == None:  # E711, E712 (fix)
-15 15 |     pass
-16    |-if None == False:  # E711, E712 (fix)
-   16 |+if not None:  # E711, E712 (fix)
-17 17 |     pass
-18 18 | 
-19 19 | named_var = []
+13 |     pass
+14 | if False == None:  # E711, E712 (fix)
+15 |     pass
+   - if None == False:  # E711, E712 (fix)
+16 + if not None:  # E711, E712 (fix)
+17 |     pass
+18 | 
+19 | named_var = []
+note: This is an unsafe fix and may change runtime behavior
 
 E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks
   --> constant_literals.py:16:4
@@ -186,16 +173,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks
 17 |     pass
    |
 help: Replace with `not None`
-
-ℹ Unsafe fix
-13 13 |     pass
-14 14 | if False == None:  # E711, E712 (fix)
-15 15 |     pass
-16    |-if None == False:  # E711, E712 (fix)
-   16 |+if not None:  # E711, E712 (fix)
-17 17 |     pass
-18 18 | 
-19 19 | named_var = []
+13 |     pass
+14 | if False == None:  # E711, E712 (fix)
+15 |     pass
+   - if None == False:  # E711, E712 (fix)
+16 + if not None:  # E711, E712 (fix)
+17 |     pass
+18 | 
+19 | named_var = []
+note: This is an unsafe fix and may change runtime behavior
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:20:4
@@ -207,16 +193,14 @@ F632 [*] Use `==` to compare constant literals
 22 | if named_var is []:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-17 17 |     pass
-18 18 | 
-19 19 | named_var = []
-20    |-if [] is []:  # F632 (fix)
-   20 |+if [] == []:  # F632 (fix)
-21 21 |     pass
-22 22 | if named_var is []:  # F632 (fix)
-23 23 |     pass
+17 |     pass
+18 | 
+19 | named_var = []
+   - if [] is []:  # F632 (fix)
+20 + if [] == []:  # F632 (fix)
+21 |     pass
+22 | if named_var is []:  # F632 (fix)
+23 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:22:4
@@ -229,16 +213,14 @@ F632 [*] Use `==` to compare constant literals
 24 | if [] is named_var:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-19 19 | named_var = []
-20 20 | if [] is []:  # F632 (fix)
-21 21 |     pass
-22    |-if named_var is []:  # F632 (fix)
-   22 |+if named_var == []:  # F632 (fix)
-23 23 |     pass
-24 24 | if [] is named_var:  # F632 (fix)
-25 25 |     pass
+19 | named_var = []
+20 | if [] is []:  # F632 (fix)
+21 |     pass
+   - if named_var is []:  # F632 (fix)
+22 + if named_var == []:  # F632 (fix)
+23 |     pass
+24 | if [] is named_var:  # F632 (fix)
+25 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:24:4
@@ -251,16 +233,14 @@ F632 [*] Use `==` to compare constant literals
 26 | if named_var is [1]:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-21 21 |     pass
-22 22 | if named_var is []:  # F632 (fix)
-23 23 |     pass
-24    |-if [] is named_var:  # F632 (fix)
-   24 |+if [] == named_var:  # F632 (fix)
-25 25 |     pass
-26 26 | if named_var is [1]:  # F632 (fix)
-27 27 |     pass
+21 |     pass
+22 | if named_var is []:  # F632 (fix)
+23 |     pass
+   - if [] is named_var:  # F632 (fix)
+24 + if [] == named_var:  # F632 (fix)
+25 |     pass
+26 | if named_var is [1]:  # F632 (fix)
+27 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:26:4
@@ -273,16 +253,14 @@ F632 [*] Use `==` to compare constant literals
 28 | if [1] is named_var:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-23 23 |     pass
-24 24 | if [] is named_var:  # F632 (fix)
-25 25 |     pass
-26    |-if named_var is [1]:  # F632 (fix)
-   26 |+if named_var == [1]:  # F632 (fix)
-27 27 |     pass
-28 28 | if [1] is named_var:  # F632 (fix)
-29 29 |     pass
+23 |     pass
+24 | if [] is named_var:  # F632 (fix)
+25 |     pass
+   - if named_var is [1]:  # F632 (fix)
+26 + if named_var == [1]:  # F632 (fix)
+27 |     pass
+28 | if [1] is named_var:  # F632 (fix)
+29 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:28:4
@@ -295,16 +273,14 @@ F632 [*] Use `==` to compare constant literals
 30 | if named_var is [i for i in [1]]:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-25 25 |     pass
-26 26 | if named_var is [1]:  # F632 (fix)
-27 27 |     pass
-28    |-if [1] is named_var:  # F632 (fix)
-   28 |+if [1] == named_var:  # F632 (fix)
-29 29 |     pass
-30 30 | if named_var is [i for i in [1]]:  # F632 (fix)
-31 31 |     pass
+25 |     pass
+26 | if named_var is [1]:  # F632 (fix)
+27 |     pass
+   - if [1] is named_var:  # F632 (fix)
+28 + if [1] == named_var:  # F632 (fix)
+29 |     pass
+30 | if named_var is [i for i in [1]]:  # F632 (fix)
+31 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:30:4
@@ -316,16 +292,14 @@ F632 [*] Use `==` to compare constant literals
 31 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-27 27 |     pass
-28 28 | if [1] is named_var:  # F632 (fix)
-29 29 |     pass
-30    |-if named_var is [i for i in [1]]:  # F632 (fix)
-   30 |+if named_var == [i for i in [1]]:  # F632 (fix)
-31 31 |     pass
-32 32 | 
-33 33 | named_var = {}
+27 |     pass
+28 | if [1] is named_var:  # F632 (fix)
+29 |     pass
+   - if named_var is [i for i in [1]]:  # F632 (fix)
+30 + if named_var == [i for i in [1]]:  # F632 (fix)
+31 |     pass
+32 | 
+33 | named_var = {}
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:34:4
@@ -337,16 +311,14 @@ F632 [*] Use `==` to compare constant literals
 36 | if named_var is {}:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-31 31 |     pass
-32 32 | 
-33 33 | named_var = {}
-34    |-if {} is {}:  # F632 (fix)
-   34 |+if {} == {}:  # F632 (fix)
-35 35 |     pass
-36 36 | if named_var is {}:  # F632 (fix)
-37 37 |     pass
+31 |     pass
+32 | 
+33 | named_var = {}
+   - if {} is {}:  # F632 (fix)
+34 + if {} == {}:  # F632 (fix)
+35 |     pass
+36 | if named_var is {}:  # F632 (fix)
+37 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:36:4
@@ -359,16 +331,14 @@ F632 [*] Use `==` to compare constant literals
 38 | if {} is named_var:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-33 33 | named_var = {}
-34 34 | if {} is {}:  # F632 (fix)
-35 35 |     pass
-36    |-if named_var is {}:  # F632 (fix)
-   36 |+if named_var == {}:  # F632 (fix)
-37 37 |     pass
-38 38 | if {} is named_var:  # F632 (fix)
-39 39 |     pass
+33 | named_var = {}
+34 | if {} is {}:  # F632 (fix)
+35 |     pass
+   - if named_var is {}:  # F632 (fix)
+36 + if named_var == {}:  # F632 (fix)
+37 |     pass
+38 | if {} is named_var:  # F632 (fix)
+39 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:38:4
@@ -381,16 +351,14 @@ F632 [*] Use `==` to compare constant literals
 40 | if named_var is {1}:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-35 35 |     pass
-36 36 | if named_var is {}:  # F632 (fix)
-37 37 |     pass
-38    |-if {} is named_var:  # F632 (fix)
-   38 |+if {} == named_var:  # F632 (fix)
-39 39 |     pass
-40 40 | if named_var is {1}:  # F632 (fix)
-41 41 |     pass
+35 |     pass
+36 | if named_var is {}:  # F632 (fix)
+37 |     pass
+   - if {} is named_var:  # F632 (fix)
+38 + if {} == named_var:  # F632 (fix)
+39 |     pass
+40 | if named_var is {1}:  # F632 (fix)
+41 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:40:4
@@ -403,16 +371,14 @@ F632 [*] Use `==` to compare constant literals
 42 | if {1} is named_var:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-37 37 |     pass
-38 38 | if {} is named_var:  # F632 (fix)
-39 39 |     pass
-40    |-if named_var is {1}:  # F632 (fix)
-   40 |+if named_var == {1}:  # F632 (fix)
-41 41 |     pass
-42 42 | if {1} is named_var:  # F632 (fix)
-43 43 |     pass
+37 |     pass
+38 | if {} is named_var:  # F632 (fix)
+39 |     pass
+   - if named_var is {1}:  # F632 (fix)
+40 + if named_var == {1}:  # F632 (fix)
+41 |     pass
+42 | if {1} is named_var:  # F632 (fix)
+43 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:42:4
@@ -425,16 +391,14 @@ F632 [*] Use `==` to compare constant literals
 44 | if named_var is {i for i in [1]}:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-39 39 |     pass
-40 40 | if named_var is {1}:  # F632 (fix)
-41 41 |     pass
-42    |-if {1} is named_var:  # F632 (fix)
-   42 |+if {1} == named_var:  # F632 (fix)
-43 43 |     pass
-44 44 | if named_var is {i for i in [1]}:  # F632 (fix)
-45 45 |     pass
+39 |     pass
+40 | if named_var is {1}:  # F632 (fix)
+41 |     pass
+   - if {1} is named_var:  # F632 (fix)
+42 + if {1} == named_var:  # F632 (fix)
+43 |     pass
+44 | if named_var is {i for i in [1]}:  # F632 (fix)
+45 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:44:4
@@ -446,16 +410,14 @@ F632 [*] Use `==` to compare constant literals
 45 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-41 41 |     pass
-42 42 | if {1} is named_var:  # F632 (fix)
-43 43 |     pass
-44    |-if named_var is {i for i in [1]}:  # F632 (fix)
-   44 |+if named_var == {i for i in [1]}:  # F632 (fix)
-45 45 |     pass
-46 46 | 
-47 47 | named_var = {1: 1}
+41 |     pass
+42 | if {1} is named_var:  # F632 (fix)
+43 |     pass
+   - if named_var is {i for i in [1]}:  # F632 (fix)
+44 + if named_var == {i for i in [1]}:  # F632 (fix)
+45 |     pass
+46 | 
+47 | named_var = {1: 1}
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:48:4
@@ -467,16 +429,14 @@ F632 [*] Use `==` to compare constant literals
 50 | if named_var is {1: 1}:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-45 45 |     pass
-46 46 | 
-47 47 | named_var = {1: 1}
-48    |-if {1: 1} is {1: 1}:  # F632 (fix)
-   48 |+if {1: 1} == {1: 1}:  # F632 (fix)
-49 49 |     pass
-50 50 | if named_var is {1: 1}:  # F632 (fix)
-51 51 |     pass
+45 |     pass
+46 | 
+47 | named_var = {1: 1}
+   - if {1: 1} is {1: 1}:  # F632 (fix)
+48 + if {1: 1} == {1: 1}:  # F632 (fix)
+49 |     pass
+50 | if named_var is {1: 1}:  # F632 (fix)
+51 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:50:4
@@ -489,16 +449,14 @@ F632 [*] Use `==` to compare constant literals
 52 | if {1: 1} is named_var:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-47 47 | named_var = {1: 1}
-48 48 | if {1: 1} is {1: 1}:  # F632 (fix)
-49 49 |     pass
-50    |-if named_var is {1: 1}:  # F632 (fix)
-   50 |+if named_var == {1: 1}:  # F632 (fix)
-51 51 |     pass
-52 52 | if {1: 1} is named_var:  # F632 (fix)
-53 53 |     pass
+47 | named_var = {1: 1}
+48 | if {1: 1} is {1: 1}:  # F632 (fix)
+49 |     pass
+   - if named_var is {1: 1}:  # F632 (fix)
+50 + if named_var == {1: 1}:  # F632 (fix)
+51 |     pass
+52 | if {1: 1} is named_var:  # F632 (fix)
+53 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:52:4
@@ -511,16 +469,14 @@ F632 [*] Use `==` to compare constant literals
 54 | if named_var is {1: 1}:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-49 49 |     pass
-50 50 | if named_var is {1: 1}:  # F632 (fix)
-51 51 |     pass
-52    |-if {1: 1} is named_var:  # F632 (fix)
-   52 |+if {1: 1} == named_var:  # F632 (fix)
-53 53 |     pass
-54 54 | if named_var is {1: 1}:  # F632 (fix)
-55 55 |     pass
+49 |     pass
+50 | if named_var is {1: 1}:  # F632 (fix)
+51 |     pass
+   - if {1: 1} is named_var:  # F632 (fix)
+52 + if {1: 1} == named_var:  # F632 (fix)
+53 |     pass
+54 | if named_var is {1: 1}:  # F632 (fix)
+55 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:54:4
@@ -533,16 +489,14 @@ F632 [*] Use `==` to compare constant literals
 56 | if {1: 1} is named_var:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-51 51 |     pass
-52 52 | if {1: 1} is named_var:  # F632 (fix)
-53 53 |     pass
-54    |-if named_var is {1: 1}:  # F632 (fix)
-   54 |+if named_var == {1: 1}:  # F632 (fix)
-55 55 |     pass
-56 56 | if {1: 1} is named_var:  # F632 (fix)
-57 57 |     pass
+51 |     pass
+52 | if {1: 1} is named_var:  # F632 (fix)
+53 |     pass
+   - if named_var is {1: 1}:  # F632 (fix)
+54 + if named_var == {1: 1}:  # F632 (fix)
+55 |     pass
+56 | if {1: 1} is named_var:  # F632 (fix)
+57 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:56:4
@@ -555,16 +509,14 @@ F632 [*] Use `==` to compare constant literals
 58 | if named_var is {i: 1 for i in [1]}:  # F632 (fix)
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-53 53 |     pass
-54 54 | if named_var is {1: 1}:  # F632 (fix)
-55 55 |     pass
-56    |-if {1: 1} is named_var:  # F632 (fix)
-   56 |+if {1: 1} == named_var:  # F632 (fix)
-57 57 |     pass
-58 58 | if named_var is {i: 1 for i in [1]}:  # F632 (fix)
-59 59 |     pass
+53 |     pass
+54 | if named_var is {1: 1}:  # F632 (fix)
+55 |     pass
+   - if {1: 1} is named_var:  # F632 (fix)
+56 + if {1: 1} == named_var:  # F632 (fix)
+57 |     pass
+58 | if named_var is {i: 1 for i in [1]}:  # F632 (fix)
+59 |     pass
 
 F632 [*] Use `==` to compare constant literals
   --> constant_literals.py:58:4
@@ -576,13 +528,11 @@ F632 [*] Use `==` to compare constant literals
 59 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-55 55 |     pass
-56 56 | if {1: 1} is named_var:  # F632 (fix)
-57 57 |     pass
-58    |-if named_var is {i: 1 for i in [1]}:  # F632 (fix)
-   58 |+if named_var == {i: 1 for i in [1]}:  # F632 (fix)
-59 59 |     pass
-60 60 | 
-61 61 | ###
+55 |     pass
+56 | if {1: 1} is named_var:  # F632 (fix)
+57 |     pass
+   - if named_var is {i: 1 for i in [1]}:  # F632 (fix)
+58 + if named_var == {i: 1 for i in [1]}:  # F632 (fix)
+59 |     pass
+60 | 
+61 | ###
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap
index 851d6ec397..f2a87ff747 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap
@@ -12,16 +12,14 @@ E502 [*] Redundant backslash
 11 |     7)
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-6  6  |     3 \
-7  7  |     + 4
-8  8  | 
-9     |-a = (3 -\
-   9  |+a = (3 -
-10 10 |     2 +   \
-11 11 |     7)
-12 12 | 
+6  |     3 \
+7  |     + 4
+8  | 
+   - a = (3 -\
+9  + a = (3 -
+10 |     2 +   \
+11 |     7)
+12 | 
 
 E502 [*] Redundant backslash
   --> E502.py:10:11
@@ -32,16 +30,14 @@ E502 [*] Redundant backslash
 11 |     7)
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-7  7  |     + 4
-8  8  | 
-9  9  | a = (3 -\
-10    |-    2 +   \
-   10 |+    2 +   
-11 11 |     7)
-12 12 | 
-13 13 | z = 5 + \
+7  |     + 4
+8  | 
+9  | a = (3 -\
+   -     2 +   \
+10 +     2 +   
+11 |     7)
+12 | 
+13 | z = 5 + \
 
 E502 [*] Redundant backslash
   --> E502.py:14:9
@@ -53,16 +49,14 @@ E502 [*] Redundant backslash
 16 |     7) + \
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-11 11 |     7)
-12 12 | 
-13 13 | z = 5 + \
-14    |-    (3 -\
-   14 |+    (3 -
-15 15 |     2 +   \
-16 16 |     7) + \
-17 17 |     4
+11 |     7)
+12 | 
+13 | z = 5 + \
+   -     (3 -\
+14 +     (3 -
+15 |     2 +   \
+16 |     7) + \
+17 |     4
 
 E502 [*] Redundant backslash
   --> E502.py:15:11
@@ -75,16 +69,14 @@ E502 [*] Redundant backslash
 17 |     4
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-12 12 | 
-13 13 | z = 5 + \
-14 14 |     (3 -\
-15    |-    2 +   \
-   15 |+    2 +   
-16 16 |     7) + \
-17 17 |     4
-18 18 | 
+12 | 
+13 | z = 5 + \
+14 |     (3 -\
+   -     2 +   \
+15 +     2 +   
+16 |     7) + \
+17 |     4
+18 | 
 
 E502 [*] Redundant backslash
   --> E502.py:23:17
@@ -96,16 +88,14 @@ E502 [*] Redundant backslash
 25 |     - 5
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-20 20 |     2]
-21 21 | 
-22 22 | b = [
-23    |-    2 + 4 + 5 + \
-   23 |+    2 + 4 + 5 + 
-24 24 |     44 \
-25 25 |     - 5
-26 26 | ]
+20 |     2]
+21 | 
+22 | b = [
+   -     2 + 4 + 5 + \
+23 +     2 + 4 + 5 + 
+24 |     44 \
+25 |     - 5
+26 | ]
 
 E502 [*] Redundant backslash
   --> E502.py:24:8
@@ -118,16 +108,14 @@ E502 [*] Redundant backslash
 26 | ]
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-21 21 | 
-22 22 | b = [
-23 23 |     2 + 4 + 5 + \
-24    |-    44 \
-   24 |+    44 
-25 25 |     - 5
-26 26 | ]
-27 27 | 
+21 | 
+22 | b = [
+23 |     2 + 4 + 5 + \
+   -     44 \
+24 +     44 
+25 |     - 5
+26 | ]
+27 | 
 
 E502 [*] Redundant backslash
   --> E502.py:29:11
@@ -139,16 +127,14 @@ E502 [*] Redundant backslash
 31 |     and True \
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-26 26 | ]
-27 27 | 
-28 28 | c = (True and
-29    |-    False \
-   29 |+    False 
-30 30 |     or False \
-31 31 |     and True \
-32 32 | )
+26 | ]
+27 | 
+28 | c = (True and
+   -     False \
+29 +     False 
+30 |     or False \
+31 |     and True \
+32 | )
 
 E502 [*] Redundant backslash
   --> E502.py:30:14
@@ -161,16 +147,14 @@ E502 [*] Redundant backslash
 32 | )
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-27 27 | 
-28 28 | c = (True and
-29 29 |     False \
-30    |-    or False \
-   30 |+    or False 
-31 31 |     and True \
-32 32 | )
-33 33 | 
+27 | 
+28 | c = (True and
+29 |     False \
+   -     or False \
+30 +     or False 
+31 |     and True \
+32 | )
+33 | 
 
 E502 [*] Redundant backslash
   --> E502.py:31:14
@@ -182,16 +166,14 @@ E502 [*] Redundant backslash
 32 | )
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-28 28 | c = (True and
-29 29 |     False \
-30 30 |     or False \
-31    |-    and True \
-   31 |+    and True 
-32 32 | )
-33 33 | 
-34 34 | c = (True and
+28 | c = (True and
+29 |     False \
+30 |     or False \
+   -     and True \
+31 +     and True 
+32 | )
+33 | 
+34 | c = (True and
 
 E502 [*] Redundant backslash
   --> E502.py:44:14
@@ -203,16 +185,14 @@ E502 [*] Redundant backslash
 46 | }
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-41 41 | 
-42 42 | 
-43 43 | s = {
-44    |-    'x': 2 + \
-   44 |+    'x': 2 + 
-45 45 |     2
-46 46 | }
-47 47 | 
+41 | 
+42 | 
+43 | s = {
+   -     'x': 2 + \
+44 +     'x': 2 + 
+45 |     2
+46 | }
+47 | 
 
 E502 [*] Redundant backslash
   --> E502.py:55:12
@@ -222,16 +202,14 @@ E502 [*] Redundant backslash
 56 |   + 3}
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-52 52 | }
-53 53 | 
-54 54 | 
-55    |-x = {2 + 4 \
-   55 |+x = {2 + 4 
-56 56 |   + 3}
-57 57 | 
-58 58 | y = (
+52 | }
+53 | 
+54 | 
+   - x = {2 + 4 \
+55 + x = {2 + 4 
+56 |   + 3}
+57 | 
+58 | y = (
 
 E502 [*] Redundant backslash
   --> E502.py:61:9
@@ -244,16 +222,14 @@ E502 [*] Redundant backslash
 63 | )
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-58 58 | y = (
-59 59 |     2 + 2  # \
-60 60 |     + 3  # \
-61    |-    + 4 \
-   61 |+    + 4 
-62 62 |     + 3
-63 63 | )
-64 64 | 
+58 | y = (
+59 |     2 + 2  # \
+60 |     + 3  # \
+   -     + 4 \
+61 +     + 4 
+62 |     + 3
+63 | )
+64 | 
 
 E502 [*] Redundant backslash
   --> E502.py:82:12
@@ -265,16 +241,14 @@ E502 [*] Redundant backslash
 83 |     "xyz")
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-79 79 | x = "abc" \
-80 80 |     "xyz"
-81 81 | 
-82    |-x = ("abc" \
-   82 |+x = ("abc" 
-83 83 |     "xyz")
-84 84 | 
-85 85 | 
+79 | x = "abc" \
+80 |     "xyz"
+81 | 
+   - x = ("abc" \
+82 + x = ("abc" 
+83 |     "xyz")
+84 | 
+85 | 
 
 E502 [*] Redundant backslash
   --> E502.py:87:14
@@ -285,11 +259,9 @@ E502 [*] Redundant backslash
 88 |         2)
    |
 help: Remove redundant backslash
-
-ℹ Safe fix
-84 84 | 
-85 85 | 
-86 86 | def foo():
-87    |-    x = (a + \
-   87 |+    x = (a + 
-88 88 |         2)
+84 | 
+85 | 
+86 | def foo():
+   -     x = (a + \
+87 +     x = (a + 
+88 |         2)
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap
index 5f15f1f97c..b13fb973a2 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap
@@ -14,17 +14,15 @@ W391 [*] Too many newlines at end of cell
 9 |   1 + 1
   |
 help: Remove trailing newlines
-
-ℹ Safe fix
-3 3 | # just a comment in this cell
-4 4 | # a comment and some newlines
-5 5 | 
-6   |-
-7   |-
-8   |-
-9 6 | 1 + 1
-10 7 | # a comment
-11 8 | 
+3 | # just a comment in this cell
+4 | # a comment and some newlines
+5 | 
+  - 
+  - 
+  - 
+6 | 1 + 1
+7 | # a comment
+8 | 
 
 W391 [*] Too many newlines at end of cell
   --> W391.ipynb:11:1
@@ -40,18 +38,16 @@ W391 [*] Too many newlines at end of cell
 16 |   1+1
    |
 help: Remove trailing newlines
-
-ℹ Safe fix
-9  9  | 1 + 1
-10 10 | # a comment
-11 11 | 
-12    |-
-13    |-
-14    |-
-15    |-
-16 12 | 1+1
-17 13 | 
-18 14 | 
+9  | 1 + 1
+10 | # a comment
+11 | 
+   - 
+   - 
+   - 
+   - 
+12 | 1+1
+13 | 
+14 | 
 
 W391 [*] Too many newlines at end of cell
   --> W391.ipynb:17:1
@@ -64,12 +60,10 @@ W391 [*] Too many newlines at end of cell
    | |__^
    |
 help: Remove trailing newlines
-
-ℹ Safe fix
-15 15 | 
-16 16 | 1+1
-17 17 | 
-18    |-
-19    |-
-20    |-
-21    |-
+15 | 
+16 | 1+1
+17 | 
+   - 
+   - 
+   - 
+   -
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap
index 770754ec50..4a41503307 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap
@@ -10,9 +10,7 @@ W391 [*] Extra newline at end of file
    | ^
    |
 help: Remove trailing newline
-
-ℹ Safe fix
-11 11 | if __name__ == '__main__':
-12 12 |     foo()
-13 13 |     bar()
-14    |-
+11 | if __name__ == '__main__':
+12 |     foo()
+13 |     bar()
+   -
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap
index 4fee49f2de..9ea457b532 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap
@@ -13,12 +13,10 @@ W391 [*] Too many newlines at end of file
    | |__^
    |
 help: Remove trailing newlines
-
-ℹ Safe fix
-11 11 | if __name__ == '__main__':
-12 12 |     foo()
-13 13 |     bar()
-14    |-
-15    |-
-16    |-
-17    |-
+11 | if __name__ == '__main__':
+12 |     foo()
+13 |     bar()
+   - 
+   - 
+   - 
+   -
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap
index fd26c27315..e1442beb98 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap
@@ -11,10 +11,8 @@ E265 [*] Block comment should start with `# `
 4 | #:
   |
 help: Format space
-
-ℹ Safe fix
-1 1 | #!/usr/bin/python
-2 2 | #
-3   |-#!
-  3 |+# !
-4 4 | #:
+1 | #!/usr/bin/python
+2 | #
+  - #!
+3 + # !
+4 | #:
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap
index 1e0642addf..da17003370 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap
@@ -12,15 +12,13 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2   |-
-3   |-
-4   |-
-5 2 | from typing import Any, Sequence
-6 3 | 
-7 4 | 
+1 | import json
+  - 
+  - 
+  - 
+2 | from typing import Any, Sequence
+3 | 
+4 | 
 
 E303 [*] Too many blank lines (3)
  --> E30_isort.py:5:1
@@ -29,15 +27,13 @@ E303 [*] Too many blank lines (3)
   | ^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | import json
-2 2 | 
-3 3 | 
-4   |-
-5 4 | from typing import Any, Sequence
-6 5 | 
-7 6 | 
+1 | import json
+2 | 
+3 | 
+  - 
+4 | from typing import Any, Sequence
+5 | 
+6 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:21:5
@@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2)
 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-17 17 | if __name__ == "__main__":
-18 18 |     import abcd
-19 19 | 
-20    |-
-21 20 |     abcd.foo()
-22 21 | 
-23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+17 | if __name__ == "__main__":
+18 |     import abcd
+19 | 
+   - 
+20 |     abcd.foo()
+21 | 
+22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -70,16 +64,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (3)
   --> E30_isort.py:30:5
@@ -88,16 +80,14 @@ E303 [*] Too many blank lines (3)
    |     ^^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:33:5
@@ -108,15 +98,13 @@ E303 [*] Too many blank lines (2)
 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-29 29 | 
-30 30 |     from typing_extensions import TypeAlias
-31 31 | 
-32    |-
-33 32 |     abcd.foo()
-34 33 | 
-35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+29 | 
+30 |     from typing_extensions import TypeAlias
+31 | 
+   - 
+32 |     abcd.foo()
+33 | 
+34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:60:1
@@ -127,10 +115,8 @@ I001 [*] Import block is un-sorted or un-formatted
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Organize imports
-
-ℹ Safe fix
-59 59 | 
-60 60 | from typing import Any, Sequence
-61 61 | 
-   62 |+
-62 63 | class MissingCommand(TypeError): ...  # noqa: N818
+59 | 
+60 | from typing import Any, Sequence
+61 | 
+62 + 
+63 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap
index 395cce3697..69b9af9459 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap
@@ -12,18 +12,16 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2   |-
-3   |-
-4   |-
-5 2 | from typing import Any, Sequence
-6   |-
-7   |-
-8 3 | class MissingCommand(TypeError): ...  # noqa: N818
-9 4 | 
-10 5 | 
+1 | import json
+  - 
+  - 
+  - 
+2 | from typing import Any, Sequence
+  - 
+  - 
+3 | class MissingCommand(TypeError): ...  # noqa: N818
+4 | 
+5 | 
 
 E303 [*] Too many blank lines (3)
  --> E30_isort.py:5:1
@@ -32,15 +30,13 @@ E303 [*] Too many blank lines (3)
   | ^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | import json
-2 2 | 
-3 3 | 
-4   |-
-5 4 | from typing import Any, Sequence
-6 5 | 
-7 6 | 
+1 | import json
+2 | 
+3 | 
+  - 
+4 | from typing import Any, Sequence
+5 | 
+6 | 
 
 E303 [*] Too many blank lines (2)
  --> E30_isort.py:8:1
@@ -49,16 +45,14 @@ E303 [*] Too many blank lines (2)
   | ^^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | from typing import Any, Sequence
-6   |-
-7   |-
-8 6 | class MissingCommand(TypeError): ...  # noqa: N818
-9 7 | 
-10 8 | 
+3 | 
+4 | 
+5 | from typing import Any, Sequence
+  - 
+  - 
+6 | class MissingCommand(TypeError): ...  # noqa: N818
+7 | 
+8 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:21:5
@@ -69,15 +63,13 @@ E303 [*] Too many blank lines (2)
 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-17 17 | if __name__ == "__main__":
-18 18 |     import abcd
-19 19 | 
-20    |-
-21 20 |     abcd.foo()
-22 21 | 
-23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+17 | if __name__ == "__main__":
+18 |     import abcd
+19 | 
+   - 
+20 |     abcd.foo()
+21 | 
+22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -91,16 +83,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (3)
   --> E30_isort.py:30:5
@@ -109,16 +99,14 @@ E303 [*] Too many blank lines (3)
    |     ^^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:33:5
@@ -129,15 +117,13 @@ E303 [*] Too many blank lines (2)
 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-29 29 | 
-30 30 |     from typing_extensions import TypeAlias
-31 31 | 
-32    |-
-33 32 |     abcd.foo()
-34 33 | 
-35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+29 | 
+30 |     from typing_extensions import TypeAlias
+31 | 
+   - 
+32 |     abcd.foo()
+33 | 
+34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:60:1
@@ -148,13 +134,11 @@ I001 [*] Import block is un-sorted or un-formatted
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Organize imports
-
-ℹ Safe fix
-58 58 | 
-59 59 | 
-60 60 | from typing import Any, Sequence
-61    |-
-62 61 | class MissingCommand(TypeError): ...  # noqa: N818
+58 | 
+59 | 
+60 | from typing import Any, Sequence
+   - 
+61 | class MissingCommand(TypeError): ...  # noqa: N818
 
 E303 [*] Too many blank lines (1)
   --> E30_isort.py:62:1
@@ -165,10 +149,8 @@ E303 [*] Too many blank lines (1)
    | ^^^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-58 58 | 
-59 59 | 
-60 60 | from typing import Any, Sequence
-61    |-
-62 61 | class MissingCommand(TypeError): ...  # noqa: N818
+58 | 
+59 | 
+60 | from typing import Any, Sequence
+   - 
+61 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap
index 7e3f1d9486..53ef02507b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap
@@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | import json
-2 2 | 
-3   |-
-4   |-
-5 3 | from typing import Any, Sequence
-6   |-
-7 4 | 
-8 5 | class MissingCommand(TypeError): ...  # noqa: N818
-9 6 | 
+1 | import json
+2 | 
+  - 
+  - 
+3 | from typing import Any, Sequence
+  - 
+4 | 
+5 | class MissingCommand(TypeError): ...  # noqa: N818
+6 | 
 
 E303 [*] Too many blank lines (3)
  --> E30_isort.py:5:1
@@ -31,15 +29,13 @@ E303 [*] Too many blank lines (3)
   | ^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-1 1 | import json
-2 2 | 
-3 3 | 
-4   |-
-5 4 | from typing import Any, Sequence
-6 5 | 
-7 6 | 
+1 | import json
+2 | 
+3 | 
+  - 
+4 | from typing import Any, Sequence
+5 | 
+6 | 
 
 E303 [*] Too many blank lines (2)
  --> E30_isort.py:8:1
@@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2)
   | ^^^^^
   |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-4 4 | 
-5 5 | from typing import Any, Sequence
-6 6 | 
-7   |-
-8 7 | class MissingCommand(TypeError): ...  # noqa: N818
-9 8 | 
-10 9 | 
+4 | 
+5 | from typing import Any, Sequence
+6 | 
+  - 
+7 | class MissingCommand(TypeError): ...  # noqa: N818
+8 | 
+9 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:21:5
@@ -67,15 +61,13 @@ E303 [*] Too many blank lines (2)
 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-17 17 | if __name__ == "__main__":
-18 18 |     import abcd
-19 19 | 
-20    |-
-21 20 |     abcd.foo()
-22 21 | 
-23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+17 | if __name__ == "__main__":
+18 |     import abcd
+19 | 
+   - 
+20 |     abcd.foo()
+21 | 
+22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -89,16 +81,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (3)
   --> E30_isort.py:30:5
@@ -107,16 +97,14 @@ E303 [*] Too many blank lines (3)
    |     ^^^^
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:33:5
@@ -127,12 +115,10 @@ E303 [*] Too many blank lines (2)
 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-29 29 | 
-30 30 |     from typing_extensions import TypeAlias
-31 31 | 
-32    |-
-33 32 |     abcd.foo()
-34 33 | 
-35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+29 | 
+30 |     from typing_extensions import TypeAlias
+31 | 
+   - 
+32 |     abcd.foo()
+33 | 
+34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap
index 78d8e3cc24..a754ff752f 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap
@@ -12,20 +12,18 @@ I001 [*] Import block is un-sorted or un-formatted
   | |________________________________^
   |
 help: Organize imports
-
-ℹ Safe fix
-2  2  | 
-3  3  | 
-4  4  | 
-   5  |+
-5  6  | from typing import Any, Sequence
-6  7  | 
-7  8  | 
-   9  |+
-   10 |+
-8  11 | class MissingCommand(TypeError): ...  # noqa: N818
-9  12 | 
-10 13 | 
+2  | 
+3  | 
+4  | 
+5  + 
+6  | from typing import Any, Sequence
+7  | 
+8  | 
+9  + 
+10 + 
+11 | class MissingCommand(TypeError): ...  # noqa: N818
+12 | 
+13 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:21:5
@@ -36,15 +34,13 @@ E303 [*] Too many blank lines (2)
 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-17 17 | if __name__ == "__main__":
-18 18 |     import abcd
-19 19 | 
-20    |-
-21 20 |     abcd.foo()
-22 21 | 
-23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
+17 | if __name__ == "__main__":
+18 |     import abcd
+19 | 
+   - 
+20 |     abcd.foo()
+21 | 
+22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:26:5
@@ -58,16 +54,14 @@ I001 [*] Import block is un-sorted or un-formatted
    | |___________________________________________^
    |
 help: Organize imports
-
-ℹ Safe fix
-25 25 | if TYPE_CHECKING:
-26 26 |     import os
-27 27 | 
-28    |-
-29    |-
-30 28 |     from typing_extensions import TypeAlias
-31 29 | 
-32 30 | 
+25 | if TYPE_CHECKING:
+26 |     import os
+27 | 
+   - 
+   - 
+28 |     from typing_extensions import TypeAlias
+29 | 
+30 | 
 
 E303 [*] Too many blank lines (2)
   --> E30_isort.py:33:5
@@ -78,15 +72,13 @@ E303 [*] Too many blank lines (2)
 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
    |
 help: Remove extraneous blank line(s)
-
-ℹ Safe fix
-29 29 | 
-30 30 |     from typing_extensions import TypeAlias
-31 31 | 
-32    |-
-33 32 |     abcd.foo()
-34 33 | 
-35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
+29 | 
+30 |     from typing_extensions import TypeAlias
+31 | 
+   - 
+32 |     abcd.foo()
+33 | 
+34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
 
 I001 [*] Import block is un-sorted or un-formatted
   --> E30_isort.py:60:1
@@ -97,12 +89,10 @@ I001 [*] Import block is un-sorted or un-formatted
 62 | class MissingCommand(TypeError): ...  # noqa: N818
    |
 help: Organize imports
-
-ℹ Safe fix
-59 59 | 
-60 60 | from typing import Any, Sequence
-61 61 | 
-   62 |+
-   63 |+
-   64 |+
-62 65 | class MissingCommand(TypeError): ...  # noqa: N818
+59 | 
+60 | from typing import Any, Sequence
+61 | 
+62 + 
+63 + 
+64 + 
+65 | class MissingCommand(TypeError): ...  # noqa: N818
diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap
index 807eabd09c..40ece69f5b 100644
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap
@@ -8,7 +8,5 @@ W292 [*] No newline at end of file
   |  ^
   |
 help: Add trailing newline
-
-ℹ Safe fix
-1   |- 
-  1 |+
+  -  
+1 +
diff --git a/crates/ruff_linter/src/rules/pydoclint/mod.rs b/crates/ruff_linter/src/rules/pydoclint/mod.rs
index 9fae2230a6..69326b0c51 100644
--- a/crates/ruff_linter/src/rules/pydoclint/mod.rs
+++ b/crates/ruff_linter/src/rules/pydoclint/mod.rs
@@ -28,6 +28,7 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::DocstringExtraneousParameter, Path::new("DOC102_google.py"))]
     #[test_case(Rule::DocstringMissingReturns, Path::new("DOC201_google.py"))]
     #[test_case(Rule::DocstringExtraneousReturns, Path::new("DOC202_google.py"))]
     #[test_case(Rule::DocstringMissingYields, Path::new("DOC402_google.py"))]
@@ -50,6 +51,7 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::DocstringExtraneousParameter, Path::new("DOC102_numpy.py"))]
     #[test_case(Rule::DocstringMissingReturns, Path::new("DOC201_numpy.py"))]
     #[test_case(Rule::DocstringExtraneousReturns, Path::new("DOC202_numpy.py"))]
     #[test_case(Rule::DocstringMissingYields, Path::new("DOC402_numpy.py"))]
diff --git a/crates/ruff_linter/src/rules/pydoclint/rules/check_docstring.rs b/crates/ruff_linter/src/rules/pydoclint/rules/check_docstring.rs
index 8db3c53808..adcdcc5dec 100644
--- a/crates/ruff_linter/src/rules/pydoclint/rules/check_docstring.rs
+++ b/crates/ruff_linter/src/rules/pydoclint/rules/check_docstring.rs
@@ -1,14 +1,14 @@
 use itertools::Itertools;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::helpers::map_callable;
-use ruff_python_ast::helpers::map_subscript;
+use ruff_python_ast::helpers::{map_callable, map_subscript};
 use ruff_python_ast::name::QualifiedName;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{self as ast, Expr, Stmt, visitor};
 use ruff_python_semantic::analyze::{function_type, visibility};
 use ruff_python_semantic::{Definition, SemanticModel};
-use ruff_source_file::NewlineWithTrailingNewline;
-use ruff_text_size::{Ranged, TextRange};
+use ruff_python_stdlib::identifiers::is_identifier;
+use ruff_source_file::{LineRanges, NewlineWithTrailingNewline};
+use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use crate::Violation;
 use crate::checkers::ast::Checker;
@@ -18,6 +18,63 @@ use crate::docstrings::styles::SectionStyle;
 use crate::registry::Rule;
 use crate::rules::pydocstyle::settings::Convention;
 
+/// ## What it does
+/// Checks for function docstrings that include parameters which are not
+/// in the function signature.
+///
+/// ## Why is this bad?
+/// If a docstring documents a parameter which is not in the function signature,
+/// it can be misleading to users and/or a sign of incomplete documentation or
+/// refactors.
+///
+/// ## Example
+/// ```python
+/// def calculate_speed(distance: float, time: float) -> float:
+///     """Calculate speed as distance divided by time.
+///
+///     Args:
+///         distance: Distance traveled.
+///         time: Time spent traveling.
+///         acceleration: Rate of change of speed.
+///
+///     Returns:
+///         Speed as distance divided by time.
+///     """
+///     return distance / time
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def calculate_speed(distance: float, time: float) -> float:
+///     """Calculate speed as distance divided by time.
+///
+///     Args:
+///         distance: Distance traveled.
+///         time: Time spent traveling.
+///
+///     Returns:
+///         Speed as distance divided by time.
+///     """
+///     return distance / time
+/// ```
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.14.1")]
+pub(crate) struct DocstringExtraneousParameter {
+    id: String,
+}
+
+impl Violation for DocstringExtraneousParameter {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let DocstringExtraneousParameter { id } = self;
+        format!("Documented parameter `{id}` is not in the function's signature")
+    }
+
+    fn fix_title(&self) -> Option<String> {
+        Some("Remove the extraneous parameter from the docstring".to_string())
+    }
+}
+
 /// ## What it does
 /// Checks for functions with `return` statements that do not have "Returns"
 /// sections in their docstrings.
@@ -56,6 +113,7 @@ use crate::rules::pydocstyle::settings::Convention;
 ///     return distance / time
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.6")]
 pub(crate) struct DocstringMissingReturns;
 
 impl Violation for DocstringMissingReturns {
@@ -107,6 +165,7 @@ impl Violation for DocstringMissingReturns {
 ///         print("Hello!")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.6")]
 pub(crate) struct DocstringExtraneousReturns;
 
 impl Violation for DocstringExtraneousReturns {
@@ -159,6 +218,7 @@ impl Violation for DocstringExtraneousReturns {
 ///         yield i
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.7")]
 pub(crate) struct DocstringMissingYields;
 
 impl Violation for DocstringMissingYields {
@@ -210,6 +270,7 @@ impl Violation for DocstringMissingYields {
 ///         print("Hello!")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.7")]
 pub(crate) struct DocstringExtraneousYields;
 
 impl Violation for DocstringExtraneousYields {
@@ -281,6 +342,7 @@ impl Violation for DocstringExtraneousYields {
 ///         raise FasterThanLightError from exc
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.5")]
 pub(crate) struct DocstringMissingException {
     id: String,
 }
@@ -348,6 +410,7 @@ impl Violation for DocstringMissingException {
 /// could possibly raise, even those which are not explicitly raised using
 /// `raise` statements in the function body.
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.5")]
 pub(crate) struct DocstringExtraneousException {
     ids: Vec<String>,
 }
@@ -396,6 +459,19 @@ impl GenericSection {
     }
 }
 
+/// A parameter in a docstring with its text range.
+#[derive(Debug, Clone)]
+struct ParameterEntry<'a> {
+    name: &'a str,
+    range: TextRange,
+}
+
+impl Ranged for ParameterEntry<'_> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+
 /// A "Raises" section in a docstring.
 #[derive(Debug)]
 struct RaisesSection<'a> {
@@ -414,17 +490,46 @@ impl<'a> RaisesSection<'a> {
     /// a "Raises" section.
     fn from_section(section: &SectionContext<'a>, style: Option<SectionStyle>) -> Self {
         Self {
-            raised_exceptions: parse_entries(section.following_lines_str(), style),
+            raised_exceptions: parse_raises(section.following_lines_str(), style),
             range: section.range(),
         }
     }
 }
 
+/// An "Args" or "Parameters" section in a docstring.
+#[derive(Debug)]
+struct ParametersSection<'a> {
+    parameters: Vec<ParameterEntry<'a>>,
+    range: TextRange,
+}
+
+impl Ranged for ParametersSection<'_> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+
+impl<'a> ParametersSection<'a> {
+    /// Return the parameters for the docstring, or `None` if the docstring does not contain
+    /// an "Args" or "Parameters" section.
+    fn from_section(section: &SectionContext<'a>, style: Option<SectionStyle>) -> Self {
+        Self {
+            parameters: parse_parameters(
+                section.following_lines_str(),
+                section.following_range().start(),
+                style,
+            ),
+            range: section.section_name_range(),
+        }
+    }
+}
+
 #[derive(Debug, Default)]
 struct DocstringSections<'a> {
     returns: Option<GenericSection>,
     yields: Option<GenericSection>,
     raises: Option<RaisesSection<'a>>,
+    parameters: Option<ParametersSection<'a>>,
 }
 
 impl<'a> DocstringSections<'a> {
@@ -432,6 +537,10 @@ impl<'a> DocstringSections<'a> {
         let mut docstring_sections = Self::default();
         for section in sections {
             match section.kind() {
+                SectionKind::Args | SectionKind::Arguments | SectionKind::Parameters => {
+                    docstring_sections.parameters =
+                        Some(ParametersSection::from_section(&section, style));
+                }
                 SectionKind::Raises => {
                     docstring_sections.raises = Some(RaisesSection::from_section(&section, style));
                 }
@@ -448,18 +557,22 @@ impl<'a> DocstringSections<'a> {
     }
 }
 
-/// Parse the entries in a "Raises" section of a docstring.
+/// Parse the entries in a "Parameters" section of a docstring.
 ///
 /// Attempts to parse using the specified [`SectionStyle`], falling back to the other style if no
 /// entries are found.
-fn parse_entries(content: &str, style: Option<SectionStyle>) -> Vec<QualifiedName<'_>> {
+fn parse_parameters(
+    content: &str,
+    content_start: TextSize,
+    style: Option<SectionStyle>,
+) -> Vec<ParameterEntry<'_>> {
     match style {
-        Some(SectionStyle::Google) => parse_entries_google(content),
-        Some(SectionStyle::Numpy) => parse_entries_numpy(content),
+        Some(SectionStyle::Google) => parse_parameters_google(content, content_start),
+        Some(SectionStyle::Numpy) => parse_parameters_numpy(content, content_start),
         None => {
-            let entries = parse_entries_google(content);
+            let entries = parse_parameters_google(content, content_start);
             if entries.is_empty() {
-                parse_entries_numpy(content)
+                parse_parameters_numpy(content, content_start)
             } else {
                 entries
             }
@@ -467,14 +580,134 @@ fn parse_entries(content: &str, style: Option<SectionStyle>) -> Vec<QualifiedNam
     }
 }
 
-/// Parses Google-style docstring sections of the form:
+/// Parses Google-style "Args" sections of the form:
+///
+/// ```python
+/// Args:
+///     a (int): The first number to add.
+///     b (int): The second number to add.
+/// ```
+fn parse_parameters_google(content: &str, content_start: TextSize) -> Vec<ParameterEntry<'_>> {
+    let mut entries: Vec<ParameterEntry> = Vec::new();
+    // Find first entry to determine indentation
+    let Some(first_arg) = content.lines().next() else {
+        return entries;
+    };
+    let indentation = &first_arg[..first_arg.len() - first_arg.trim_start().len()];
+
+    let mut current_pos = TextSize::ZERO;
+    for line in content.lines() {
+        let line_start = current_pos;
+        current_pos = content.full_line_end(line_start);
+
+        if let Some(entry) = line.strip_prefix(indentation) {
+            if entry
+                .chars()
+                .next()
+                .is_some_and(|first_char| !first_char.is_whitespace())
+            {
+                let Some((before_colon, _)) = entry.split_once(':') else {
+                    continue;
+                };
+                if let Some(param) = before_colon.split_whitespace().next() {
+                    let param_name = param.trim_start_matches('*');
+                    if is_identifier(param_name) {
+                        let param_start = line_start + indentation.text_len();
+                        let param_end = param_start + param.text_len();
+
+                        entries.push(ParameterEntry {
+                            name: param_name,
+                            range: TextRange::new(
+                                content_start + param_start,
+                                content_start + param_end,
+                            ),
+                        });
+                    }
+                }
+            }
+        }
+    }
+    entries
+}
+
+/// Parses NumPy-style "Parameters" sections of the form:
+///
+/// ```python
+/// Parameters
+/// ----------
+/// a : int
+///     The first number to add.
+/// b : int
+///     The second number to add.
+/// ```
+fn parse_parameters_numpy(content: &str, content_start: TextSize) -> Vec<ParameterEntry<'_>> {
+    let mut entries: Vec<ParameterEntry> = Vec::new();
+    let mut lines = content.lines();
+    let Some(dashes) = lines.next() else {
+        return entries;
+    };
+    let indentation = &dashes[..dashes.len() - dashes.trim_start().len()];
+
+    let mut current_pos = content.full_line_end(dashes.text_len());
+    for potential in lines {
+        let line_start = current_pos;
+        current_pos = content.full_line_end(line_start);
+
+        if let Some(entry) = potential.strip_prefix(indentation) {
+            if entry
+                .chars()
+                .next()
+                .is_some_and(|first_char| !first_char.is_whitespace())
+            {
+                if let Some(before_colon) = entry.split(':').next() {
+                    let param = before_colon.trim_end();
+                    let param_name = param.trim_start_matches('*');
+                    if is_identifier(param_name) {
+                        let param_start = line_start + indentation.text_len();
+                        let param_end = param_start + param.text_len();
+
+                        entries.push(ParameterEntry {
+                            name: param_name,
+                            range: TextRange::new(
+                                content_start + param_start,
+                                content_start + param_end,
+                            ),
+                        });
+                    }
+                }
+            }
+        }
+    }
+    entries
+}
+
+/// Parse the entries in a "Raises" section of a docstring.
+///
+/// Attempts to parse using the specified [`SectionStyle`], falling back to the other style if no
+/// entries are found.
+fn parse_raises(content: &str, style: Option<SectionStyle>) -> Vec<QualifiedName<'_>> {
+    match style {
+        Some(SectionStyle::Google) => parse_raises_google(content),
+        Some(SectionStyle::Numpy) => parse_raises_numpy(content),
+        None => {
+            let entries = parse_raises_google(content);
+            if entries.is_empty() {
+                parse_raises_numpy(content)
+            } else {
+                entries
+            }
+        }
+    }
+}
+
+/// Parses Google-style "Raises" section of the form:
 ///
 /// ```python
 /// Raises:
 ///     FasterThanLightError: If speed is greater than the speed of light.
 ///     DivisionByZero: If attempting to divide by zero.
 /// ```
-fn parse_entries_google(content: &str) -> Vec<QualifiedName<'_>> {
+fn parse_raises_google(content: &str) -> Vec<QualifiedName<'_>> {
     let mut entries: Vec<QualifiedName> = Vec::new();
     for potential in content.lines() {
         let Some(colon_idx) = potential.find(':') else {
@@ -486,7 +719,7 @@ fn parse_entries_google(content: &str) -> Vec<QualifiedName<'_>> {
     entries
 }
 
-/// Parses NumPy-style docstring sections of the form:
+/// Parses NumPy-style "Raises" section of the form:
 ///
 /// ```python
 /// Raises
@@ -496,7 +729,7 @@ fn parse_entries_google(content: &str) -> Vec<QualifiedName<'_>> {
 /// DivisionByZero
 ///     If attempting to divide by zero.
 /// ```
-fn parse_entries_numpy(content: &str) -> Vec<QualifiedName<'_>> {
+fn parse_raises_numpy(content: &str) -> Vec<QualifiedName<'_>> {
     let mut entries: Vec<QualifiedName> = Vec::new();
     let mut lines = content.lines();
     let Some(dashes) = lines.next() else {
@@ -867,6 +1100,17 @@ fn is_generator_function_annotated_as_returning_none(
         .is_some_and(GeneratorOrIteratorArguments::indicates_none_returned)
 }
 
+fn parameters_from_signature<'a>(docstring: &'a Docstring) -> Vec<&'a str> {
+    let mut parameters = Vec::new();
+    let Some(function) = docstring.definition.as_function_def() else {
+        return parameters;
+    };
+    for param in &function.parameters {
+        parameters.push(param.name());
+    }
+    parameters
+}
+
 fn is_one_line(docstring: &Docstring) -> bool {
     let mut non_empty_line_count = 0;
     for line in NewlineWithTrailingNewline::from(docstring.body().as_str()) {
@@ -880,7 +1124,7 @@ fn is_one_line(docstring: &Docstring) -> bool {
     true
 }
 
-/// DOC201, DOC202, DOC402, DOC403, DOC501, DOC502
+/// DOC102, DOC201, DOC202, DOC402, DOC403, DOC501, DOC502
 pub(crate) fn check_docstring(
     checker: &Checker,
     definition: &Definition,
@@ -920,6 +1164,8 @@ pub(crate) fn check_docstring(
         visitor.finish()
     };
 
+    let signature_parameters = parameters_from_signature(docstring);
+
     // DOC201
     if checker.is_rule_enabled(Rule::DocstringMissingReturns) {
         if should_document_returns(function_def)
@@ -1008,6 +1254,25 @@ pub(crate) fn check_docstring(
         }
     }
 
+    // DOC102
+    if checker.is_rule_enabled(Rule::DocstringExtraneousParameter) {
+        // Don't report extraneous parameters if the signature defines *args or **kwargs
+        if function_def.parameters.vararg.is_none() && function_def.parameters.kwarg.is_none() {
+            if let Some(docstring_params) = docstring_sections.parameters {
+                for docstring_param in &docstring_params.parameters {
+                    if !signature_parameters.contains(&docstring_param.name) {
+                        checker.report_diagnostic(
+                            DocstringExtraneousParameter {
+                                id: docstring_param.name.to_string(),
+                            },
+                            docstring_param.range(),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
     // Avoid applying "extraneous" rules to abstract methods. An abstract method's docstring _could_
     // document that it raises an exception without including the exception in the implementation.
     if !visibility::is_abstract(&function_def.decorator_list, semantic) {
diff --git a/crates/ruff_linter/src/rules/pydoclint/snapshots/ruff_linter__rules__pydoclint__tests__docstring-extraneous-parameter_DOC102_google.py.snap b/crates/ruff_linter/src/rules/pydoclint/snapshots/ruff_linter__rules__pydoclint__tests__docstring-extraneous-parameter_DOC102_google.py.snap
new file mode 100644
index 0000000000..1a0dd86341
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pydoclint/snapshots/ruff_linter__rules__pydoclint__tests__docstring-extraneous-parameter_DOC102_google.py.snap
@@ -0,0 +1,180 @@
+---
+source: crates/ruff_linter/src/rules/pydoclint/mod.rs
+---
+DOC102 Documented parameter `a` is not in the function's signature
+ --> DOC102_google.py:7:9
+  |
+6 |     Args:
+7 |         a (int): The first number to add.
+  |         ^
+8 |         b (int): The second number to add.
+  |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `multiplier` is not in the function's signature
+  --> DOC102_google.py:23:9
+   |
+21 |     Args:
+22 |         lst (list of int): A list of integers.
+23 |         multiplier (int): The multiplier for each element in the list.
+   |         ^^^^^^^^^^
+24 |
+25 |     Returns:
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `numbers` is not in the function's signature
+  --> DOC102_google.py:37:9
+   |
+36 |     Args:
+37 |         numbers (list of int): A list of integers to search through.
+   |         ^^^^^^^
+38 |
+39 |     Returns:
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `name` is not in the function's signature
+  --> DOC102_google.py:51:9
+   |
+50 |     Args:
+51 |         name (str): The name of the user.
+   |         ^^^^
+52 |         age (int): The age of the user.
+53 |         email (str): The user's email address.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `age` is not in the function's signature
+  --> DOC102_google.py:52:9
+   |
+50 |     Args:
+51 |         name (str): The name of the user.
+52 |         age (int): The age of the user.
+   |         ^^^
+53 |         email (str): The user's email address.
+54 |         location (str): The location of the user.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `email` is not in the function's signature
+  --> DOC102_google.py:53:9
+   |
+51 |         name (str): The name of the user.
+52 |         age (int): The age of the user.
+53 |         email (str): The user's email address.
+   |         ^^^^^
+54 |         location (str): The location of the user.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `tax_rate` is not in the function's signature
+  --> DOC102_google.py:74:9
+   |
+72 |     Args:
+73 |         item_prices (list of float): A list of prices for each item.
+74 |         tax_rate (float): The tax rate to apply.
+   |         ^^^^^^^^
+75 |         discount (float): The discount to subtract from the total.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `to_address` is not in the function's signature
+  --> DOC102_google.py:94:9
+   |
+92 |         subject (str): The subject of the email.
+93 |         body (str): The content of the email.
+94 |         to_address (str): The recipient's email address.
+   |         ^^^^^^^^^^
+95 |         cc_address (str, optional): The email address for CC. Defaults to None.
+96 |         bcc_address (str, optional): The email address for BCC. Defaults to None.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `cc_address` is not in the function's signature
+  --> DOC102_google.py:95:9
+   |
+93 |         body (str): The content of the email.
+94 |         to_address (str): The recipient's email address.
+95 |         cc_address (str, optional): The email address for CC. Defaults to None.
+   |         ^^^^^^^^^^
+96 |         bcc_address (str, optional): The email address for BCC. Defaults to None.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `items` is not in the function's signature
+   --> DOC102_google.py:126:9
+    |
+124 |     Args:
+125 |         order_id (int): The unique identifier for the order.
+126 |         *items (str): Variable length argument list of items in the order.
+    |         ^^^^^^
+127 |         **details (dict): Additional details such as shipping method and address.
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `details` is not in the function's signature
+   --> DOC102_google.py:127:9
+    |
+125 |         order_id (int): The unique identifier for the order.
+126 |         *items (str): Variable length argument list of items in the order.
+127 |         **details (dict): Additional details such as shipping method and address.
+    |         ^^^^^^^^^
+128 |
+129 |     Returns:
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `value` is not in the function's signature
+   --> DOC102_google.py:150:13
+    |
+149 |         Args:
+150 |             value (int, optional): The initial value of the calculator. Defaults to 0.
+    |             ^^^^^
+151 |         """
+152 |         self.value = value
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `number` is not in the function's signature
+   --> DOC102_google.py:160:13
+    |
+159 |         Args:
+160 |             number (int or float): The number to add to the current value.
+    |             ^^^^^^
+161 |
+162 |         Returns:
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `value_str` is not in the function's signature
+   --> DOC102_google.py:175:13
+    |
+174 |         Args:
+175 |             value_str (str): The string representing the initial value.
+    |             ^^^^^^^^^
+176 |
+177 |         Returns:
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `number` is not in the function's signature
+   --> DOC102_google.py:190:13
+    |
+189 |         Args:
+190 |             number (any): The value to check.
+    |             ^^^^^^
+191 |
+192 |         Returns:
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `a` is not in the function's signature
+   --> DOC102_google.py:258:9
+    |
+257 |     Args:
+258 |         a: The first number to add.
+    |         ^
+259 |         b: The second number to add.
+    |
+help: Remove the extraneous parameter from the docstring
diff --git a/crates/ruff_linter/src/rules/pydoclint/snapshots/ruff_linter__rules__pydoclint__tests__docstring-extraneous-parameter_DOC102_numpy.py.snap b/crates/ruff_linter/src/rules/pydoclint/snapshots/ruff_linter__rules__pydoclint__tests__docstring-extraneous-parameter_DOC102_numpy.py.snap
new file mode 100644
index 0000000000..c4566953d0
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pydoclint/snapshots/ruff_linter__rules__pydoclint__tests__docstring-extraneous-parameter_DOC102_numpy.py.snap
@@ -0,0 +1,189 @@
+---
+source: crates/ruff_linter/src/rules/pydoclint/mod.rs
+---
+DOC102 Documented parameter `a` is not in the function's signature
+  --> DOC102_numpy.py:8:5
+   |
+ 6 |     Parameters
+ 7 |     ----------
+ 8 |     a : int
+   |     ^
+ 9 |         The first number to add.
+10 |     b : int
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `multiplier` is not in the function's signature
+  --> DOC102_numpy.py:30:5
+   |
+28 |     lst : list of int
+29 |         A list of integers.
+30 |     multiplier : int
+   |     ^^^^^^^^^^
+31 |         The multiplier for each element in the list.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `numbers` is not in the function's signature
+  --> DOC102_numpy.py:48:5
+   |
+46 |     Parameters
+47 |     ----------
+48 |     numbers : list of int
+   |     ^^^^^^^
+49 |         A list of integers to search through.
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `name` is not in the function's signature
+  --> DOC102_numpy.py:66:5
+   |
+64 |     Parameters
+65 |     ----------
+66 |     name : str
+   |     ^^^^
+67 |         The name of the user.
+68 |     age : int
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `age` is not in the function's signature
+  --> DOC102_numpy.py:68:5
+   |
+66 |     name : str
+67 |         The name of the user.
+68 |     age : int
+   |     ^^^
+69 |         The age of the user.
+70 |     email : str
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `email` is not in the function's signature
+  --> DOC102_numpy.py:70:5
+   |
+68 |     age : int
+69 |         The age of the user.
+70 |     email : str
+   |     ^^^^^
+71 |         The user's email address.
+72 |     location : str, optional
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `tax_rate` is not in the function's signature
+  --> DOC102_numpy.py:97:5
+   |
+95 |     item_prices : list of float
+96 |         A list of prices for each item.
+97 |     tax_rate : float
+   |     ^^^^^^^^
+98 |         The tax rate to apply.
+99 |     discount : float
+   |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `to_address` is not in the function's signature
+   --> DOC102_numpy.py:124:5
+    |
+122 |     body : str
+123 |         The content of the email.
+124 |     to_address : str
+    |     ^^^^^^^^^^
+125 |         The recipient's email address.
+126 |     cc_address : str, optional
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `cc_address` is not in the function's signature
+   --> DOC102_numpy.py:126:5
+    |
+124 |     to_address : str
+125 |         The recipient's email address.
+126 |     cc_address : str, optional
+    |     ^^^^^^^^^^
+127 |         The email address for CC, by default None.
+128 |     bcc_address : str, optional
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `items` is not in the function's signature
+   --> DOC102_numpy.py:168:5
+    |
+166 |     order_id : int
+167 |         The unique identifier for the order.
+168 |     *items : str
+    |     ^^^^^^
+169 |         Variable length argument list of items in the order.
+170 |     **details : dict
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `details` is not in the function's signature
+   --> DOC102_numpy.py:170:5
+    |
+168 |     *items : str
+169 |         Variable length argument list of items in the order.
+170 |     **details : dict
+    |     ^^^^^^^^^
+171 |         Additional details such as shipping method and address.
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `value` is not in the function's signature
+   --> DOC102_numpy.py:197:9
+    |
+195 |         Parameters
+196 |         ----------
+197 |         value : int, optional
+    |         ^^^^^
+198 |             The initial value of the calculator, by default 0.
+199 |         """
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `number` is not in the function's signature
+   --> DOC102_numpy.py:209:9
+    |
+207 |         Parameters
+208 |         ----------
+209 |         number : int or float
+    |         ^^^^^^
+210 |             The first number to add.
+211 |         number2 : int or float
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `value_str` is not in the function's signature
+   --> DOC102_numpy.py:230:9
+    |
+228 |         Parameters
+229 |         ----------
+230 |         value_str : str
+    |         ^^^^^^^^^
+231 |             The string representing the initial value.
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `number` is not in the function's signature
+   --> DOC102_numpy.py:249:9
+    |
+247 |         Parameters
+248 |         ----------
+249 |         number : any
+    |         ^^^^^^
+250 |             The value to check.
+    |
+help: Remove the extraneous parameter from the docstring
+
+DOC102 Documented parameter `a` is not in the function's signature
+   --> DOC102_numpy.py:300:5
+    |
+298 |     Parameters
+299 |     ----------
+300 |     a
+    |     ^
+301 |         The first number to add.
+302 |     b
+    |
+help: Remove the extraneous parameter from the docstring
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/backslashes.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/backslashes.rs
index a062d173bd..e7fdf4f37b 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/backslashes.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/backslashes.rs
@@ -42,6 +42,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [PEP 257 – Docstring Conventions](https://peps.python.org/pep-0257/)
 /// - [Python documentation: String and Bytes literals](https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.172")]
 pub(crate) struct EscapeSequenceInDocstring;
 
 impl Violation for EscapeSequenceInDocstring {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs
index 50e6a75d3d..52e0282b6e 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs
@@ -41,6 +41,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.68")]
 pub(crate) struct MissingBlankLineAfterSummary {
     num_lines: usize,
 }
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_class.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_class.rs
index 1196a42a75..16cdb26a13 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_class.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_class.rs
@@ -43,6 +43,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [D211]: https://docs.astral.sh/ruff/rules/blank-line-before-class
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct IncorrectBlankLineBeforeClass;
 
 impl AlwaysFixableViolation for IncorrectBlankLineBeforeClass {
@@ -95,6 +96,7 @@ impl AlwaysFixableViolation for IncorrectBlankLineBeforeClass {
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct IncorrectBlankLineAfterClass;
 
 impl AlwaysFixableViolation for IncorrectBlankLineAfterClass {
@@ -142,6 +144,7 @@ impl AlwaysFixableViolation for IncorrectBlankLineAfterClass {
 ///
 /// [D203]: https://docs.astral.sh/ruff/rules/incorrect-blank-line-before-class
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct BlankLineBeforeClass;
 
 impl AlwaysFixableViolation for BlankLineBeforeClass {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_function.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_function.rs
index bf124a12d1..83efa3adc6 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_function.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_before_after_function.rs
@@ -38,6 +38,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct BlankLineBeforeFunction {
     num_lines: usize,
 }
@@ -84,6 +85,7 @@ impl Violation for BlankLineBeforeFunction {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct BlankLineAfterFunction {
     num_lines: usize,
 }
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/capitalized.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/capitalized.rs
index ccc082ba38..32cfa89406 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/capitalized.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/capitalized.rs
@@ -30,6 +30,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.69")]
 pub(crate) struct FirstWordUncapitalized {
     first_word: String,
     capitalized_word: String,
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_period.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_period.rs
index 11f7915c33..6b1c7f4cf1 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_period.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_period.rs
@@ -45,6 +45,7 @@ use crate::rules::pydocstyle::helpers::logical_line;
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.68")]
 pub(crate) struct MissingTrailingPeriod;
 
 impl Violation for MissingTrailingPeriod {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_punctuation.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_punctuation.rs
index 6b4d25fa56..2e1174a72e 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_punctuation.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/ends_with_punctuation.rs
@@ -44,6 +44,7 @@ use crate::rules::pydocstyle::helpers::logical_line;
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.69")]
 pub(crate) struct MissingTerminalPunctuation;
 
 impl Violation for MissingTerminalPunctuation {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/if_needed.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/if_needed.rs
index 0ad276b816..7fb88ffc34 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/if_needed.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/if_needed.rs
@@ -67,6 +67,7 @@ use crate::docstrings::Docstring;
 /// - [PEP 257 – Docstring Conventions](https://peps.python.org/pep-0257/)
 /// - [Python documentation: `typing.overload`](https://docs.python.org/3/library/typing.html#typing.overload)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct OverloadWithDocstring;
 
 impl Violation for OverloadWithDocstring {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/indent.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/indent.rs
index 2a8f9b721f..ebb1c72cc9 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/indent.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/indent.rs
@@ -52,6 +52,7 @@ use crate::{Edit, Fix};
 /// [PEP 8]: https://peps.python.org/pep-0008/#tabs-or-spaces
 /// [formatter]: https://docs.astral.sh/ruff/formatter
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.75")]
 pub(crate) struct DocstringTabIndentation;
 
 impl Violation for DocstringTabIndentation {
@@ -100,6 +101,7 @@ impl Violation for DocstringTabIndentation {
 /// [PEP 257]: https://peps.python.org/pep-0257/
 /// [formatter]: https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.75")]
 pub(crate) struct UnderIndentation;
 
 impl AlwaysFixableViolation for UnderIndentation {
@@ -152,6 +154,7 @@ impl AlwaysFixableViolation for UnderIndentation {
 /// [PEP 257]: https://peps.python.org/pep-0257/
 /// [formatter]:https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.75")]
 pub(crate) struct OverIndentation;
 
 impl AlwaysFixableViolation for OverIndentation {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/multi_line_summary_start.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/multi_line_summary_start.rs
index 4d2e6e596f..b02c06af01 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/multi_line_summary_start.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/multi_line_summary_start.rs
@@ -61,6 +61,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// [D213]: https://docs.astral.sh/ruff/rules/multi-line-summary-second-line
 /// [PEP 257]: https://peps.python.org/pep-0257
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.69")]
 pub(crate) struct MultiLineSummaryFirstLine;
 
 impl AlwaysFixableViolation for MultiLineSummaryFirstLine {
@@ -124,6 +125,7 @@ impl AlwaysFixableViolation for MultiLineSummaryFirstLine {
 /// [D212]: https://docs.astral.sh/ruff/rules/multi-line-summary-first-line
 /// [PEP 257]: https://peps.python.org/pep-0257
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.69")]
 pub(crate) struct MultiLineSummarySecondLine;
 
 impl AlwaysFixableViolation for MultiLineSummarySecondLine {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs
index afdaf68348..43c32de6c1 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs
@@ -44,6 +44,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.68")]
 pub(crate) struct NewLineAfterLastParagraph;
 
 impl AlwaysFixableViolation for NewLineAfterLastParagraph {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/no_signature.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/no_signature.rs
index 5a06ae6022..4ffc8be1dd 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/no_signature.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/no_signature.rs
@@ -41,6 +41,7 @@ use crate::docstrings::Docstring;
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct SignatureInDocstring;
 
 impl Violation for SignatureInDocstring {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs
index fd9ee2798e..4233f596ed 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs
@@ -32,6 +32,7 @@ use crate::rules::pydocstyle::helpers::ends_with_backslash;
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.68")]
 pub(crate) struct SurroundingWhitespace;
 
 impl Violation for SurroundingWhitespace {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/non_imperative_mood.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/non_imperative_mood.rs
index 6369e355de..9597b17b92 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/non_imperative_mood.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/non_imperative_mood.rs
@@ -51,6 +51,7 @@ static MOOD: LazyLock<Mood> = LazyLock::new(Mood::new);
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.228")]
 pub(crate) struct NonImperativeMood {
     first_line: String,
 }
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/not_empty.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/not_empty.rs
index 4c69d9bd4f..a16e0a191d 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/not_empty.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/not_empty.rs
@@ -29,6 +29,7 @@ use crate::docstrings::Docstring;
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.68")]
 pub(crate) struct EmptyDocstring;
 
 impl Violation for EmptyDocstring {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/not_missing.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/not_missing.rs
index 87d4f876aa..b82098169f 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/not_missing.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/not_missing.rs
@@ -61,6 +61,7 @@ use crate::checkers::ast::Checker;
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicModule;
 
 impl Violation for UndocumentedPublicModule {
@@ -144,6 +145,7 @@ impl Violation for UndocumentedPublicModule {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicClass;
 
 impl Violation for UndocumentedPublicClass {
@@ -226,6 +228,7 @@ impl Violation for UndocumentedPublicClass {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicMethod;
 
 impl Violation for UndocumentedPublicMethod {
@@ -316,6 +319,7 @@ impl Violation for UndocumentedPublicMethod {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Python Docstrings](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicFunction;
 
 impl Violation for UndocumentedPublicFunction {
@@ -359,6 +363,7 @@ impl Violation for UndocumentedPublicFunction {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Python Docstrings](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicPackage;
 
 impl Violation for UndocumentedPublicPackage {
@@ -416,6 +421,7 @@ impl Violation for UndocumentedPublicPackage {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Python Docstrings](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedMagicMethod;
 
 impl Violation for UndocumentedMagicMethod {
@@ -471,6 +477,7 @@ impl Violation for UndocumentedMagicMethod {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Python Docstrings](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicNestedClass;
 
 impl Violation for UndocumentedPublicNestedClass {
@@ -519,6 +526,7 @@ impl Violation for UndocumentedPublicNestedClass {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Python Docstrings](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicInit;
 
 impl Violation for UndocumentedPublicInit {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs
index 158092f110..3fe7e92bae 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs
@@ -37,6 +37,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.68")]
 pub(crate) struct UnnecessaryMultilineDocstring;
 
 impl Violation for UnnecessaryMultilineDocstring {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/sections.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/sections.rs
index 0f4e51717a..7b9fc80ba8 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/sections.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/sections.rs
@@ -89,6 +89,7 @@ use crate::{Edit, Fix};
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.73")]
 pub(crate) struct OverindentedSection {
     name: String,
 }
@@ -192,6 +193,7 @@ impl AlwaysFixableViolation for OverindentedSection {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.73")]
 pub(crate) struct OverindentedSectionUnderline {
     name: String,
 }
@@ -275,6 +277,7 @@ impl AlwaysFixableViolation for OverindentedSectionUnderline {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct NonCapitalizedSectionName {
     name: String,
 }
@@ -373,6 +376,7 @@ impl AlwaysFixableViolation for NonCapitalizedSectionName {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct MissingNewLineAfterSectionName {
     name: String,
 }
@@ -476,6 +480,7 @@ impl AlwaysFixableViolation for MissingNewLineAfterSectionName {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct MissingDashedUnderlineAfterSection {
     name: String,
 }
@@ -582,6 +587,7 @@ impl AlwaysFixableViolation for MissingDashedUnderlineAfterSection {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct MissingSectionUnderlineAfterName {
     name: String,
 }
@@ -686,6 +692,7 @@ impl AlwaysFixableViolation for MissingSectionUnderlineAfterName {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct MismatchedSectionUnderlineLength {
     name: String,
 }
@@ -783,6 +790,7 @@ impl AlwaysFixableViolation for MismatchedSectionUnderlineLength {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Guide](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct NoBlankLineAfterSection {
     name: String,
 }
@@ -876,6 +884,7 @@ impl AlwaysFixableViolation for NoBlankLineAfterSection {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct NoBlankLineBeforeSection {
     name: String,
 }
@@ -971,6 +980,7 @@ impl AlwaysFixableViolation for NoBlankLineBeforeSection {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct MissingBlankLineAfterLastSection {
     name: String,
 }
@@ -1060,6 +1070,7 @@ impl AlwaysFixableViolation for MissingBlankLineAfterLastSection {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Style Guide](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct EmptyDocstringSection {
     name: String,
 }
@@ -1137,6 +1148,7 @@ impl Violation for EmptyDocstringSection {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [Google Style Guide](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.74")]
 pub(crate) struct MissingSectionNameColon {
     name: String,
 }
@@ -1222,6 +1234,7 @@ impl AlwaysFixableViolation for MissingSectionNameColon {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.73")]
 pub(crate) struct UndocumentedParam {
     /// The name of the function being documented.
     definition: String,
@@ -1304,6 +1317,7 @@ impl Violation for UndocumentedParam {
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct BlankLinesBetweenHeaderAndContent {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/starts_with_this.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/starts_with_this.rs
index 1bbcc9ab4c..d3e9465918 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/starts_with_this.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/starts_with_this.rs
@@ -40,6 +40,7 @@ use crate::rules::pydocstyle::helpers::normalize_word;
 ///
 /// [PEP 257]: https://peps.python.org/pep-0257/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.71")]
 pub(crate) struct DocstringStartsWithThis;
 
 impl Violation for DocstringStartsWithThis {
diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/triple_quotes.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/triple_quotes.rs
index 374ac69369..17dc5eac92 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/rules/triple_quotes.rs
+++ b/crates/ruff_linter/src/rules/pydocstyle/rules/triple_quotes.rs
@@ -38,6 +38,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [formatter]: https://docs.astral.sh/ruff/formatter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.69")]
 pub(crate) struct TripleSingleQuotes {
     expected_quote: Quote,
 }
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap
index 89eb2e2bb2..513311b656 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap
@@ -12,18 +12,17 @@ D200 [*] One-line docstring should fit on one line
     | |_______^
     |
 help: Reformat to one line
-
-ℹ Unsafe fix
-126 126 |         '(found 3)')
-127 127 | @expect('D212: Multi-line docstring summary should start at the first line')
-128 128 | def asdlkfasd():
-129     |-    """
-130     |-    Wrong.
-131     |-    """
-    129 |+    """Wrong."""
-132 130 | 
-133 131 | 
-134 132 | @expect('D201: No blank lines allowed before function docstring (found 1)')
+126 |         '(found 3)')
+127 | @expect('D212: Multi-line docstring summary should start at the first line')
+128 | def asdlkfasd():
+    -     """
+    -     Wrong.
+    -     """
+129 +     """Wrong."""
+130 | 
+131 | 
+132 | @expect('D201: No blank lines allowed before function docstring (found 1)')
+note: This is an unsafe fix and may change runtime behavior
 
 D200 [*] One-line docstring should fit on one line
    --> D.py:597:5
@@ -36,18 +35,17 @@ D200 [*] One-line docstring should fit on one line
     | |_____________^
     |
 help: Reformat to one line
-
-ℹ Unsafe fix
-594 594 |         '(found 3)')
-595 595 | @expect('D212: Multi-line docstring summary should start at the first line')
-596 596 | def one_liner():
-597     |-    """
-598     |-
-599     |-    Wrong."""
-    597 |+    """Wrong."""
-600 598 | 
-601 599 | 
-602 600 | @expect('D200: One-line docstring should fit on one line with quotes '
+594 |         '(found 3)')
+595 | @expect('D212: Multi-line docstring summary should start at the first line')
+596 | def one_liner():
+    -     """
+    - 
+    -     Wrong."""
+597 +     """Wrong."""
+598 | 
+599 | 
+600 | @expect('D200: One-line docstring should fit on one line with quotes '
+note: This is an unsafe fix and may change runtime behavior
 
 D200 [*] One-line docstring should fit on one line
    --> D.py:606:5
@@ -60,18 +58,17 @@ D200 [*] One-line docstring should fit on one line
     | |_______^
     |
 help: Reformat to one line
-
-ℹ Unsafe fix
-603 603 |         '(found 3)')
-604 604 | @expect('D212: Multi-line docstring summary should start at the first line')
-605 605 | def one_liner():
-606     |-    r"""Wrong.
-607     |-
-608     |-    """
-    606 |+    r"""Wrong."""
-609 607 | 
-610 608 | 
-611 609 | @expect('D200: One-line docstring should fit on one line with quotes '
+603 |         '(found 3)')
+604 | @expect('D212: Multi-line docstring summary should start at the first line')
+605 | def one_liner():
+    -     r"""Wrong.
+    - 
+    -     """
+606 +     r"""Wrong."""
+607 | 
+608 | 
+609 | @expect('D200: One-line docstring should fit on one line with quotes '
+note: This is an unsafe fix and may change runtime behavior
 
 D200 One-line docstring should fit on one line
    --> D.py:615:5
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap
index 0ab129407c..958ce017b1 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap
@@ -20,17 +20,16 @@ D200 [*] One-line docstring should fit on one line
   | |_______^
   |
 help: Reformat to one line
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | def func():
-7   |-    """\\
-8   |-    """
-  7 |+    """\\"""
-9 8 | 
-10 9 | 
-11 10 | def func():
+4  | 
+5  | 
+6  | def func():
+   -     """\\
+   -     """
+7  +     """\\"""
+8  | 
+9  | 
+10 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 D200 One-line docstring should fit on one line
   --> D200.py:12:5
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap
index 552f29e140..ed526eeae3 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap
@@ -10,15 +10,13 @@ D201 [*] No blank lines allowed before function docstring (found 1)
     |     ^^^^^^^^^^^^^^^^^^^^
     |
 help: Remove blank line(s) before function docstring
-
-ℹ Safe fix
-133 133 | 
-134 134 | @expect('D201: No blank lines allowed before function docstring (found 1)')
-135 135 | def leading_space():
-136     |-
-137 136 |     """Leading space."""
-138 137 | 
-139 138 | 
+133 | 
+134 | @expect('D201: No blank lines allowed before function docstring (found 1)')
+135 | def leading_space():
+    - 
+136 |     """Leading space."""
+137 | 
+138 | 
 
 D201 [*] No blank lines allowed before function docstring (found 1)
    --> D.py:151:5
@@ -31,15 +29,13 @@ D201 [*] No blank lines allowed before function docstring (found 1)
 153 |     pass
     |
 help: Remove blank line(s) before function docstring
-
-ℹ Safe fix
-147 147 | @expect('D201: No blank lines allowed before function docstring (found 1)')
-148 148 | @expect('D202: No blank lines allowed after function docstring (found 1)')
-149 149 | def trailing_and_leading_space():
-150     |-
-151 150 |     """Trailing and leading space."""
-152 151 | 
-153 152 |     pass
+147 | @expect('D201: No blank lines allowed before function docstring (found 1)')
+148 | @expect('D202: No blank lines allowed after function docstring (found 1)')
+149 | def trailing_and_leading_space():
+    - 
+150 |     """Trailing and leading space."""
+151 | 
+152 |     pass
 
 D201 [*] No blank lines allowed before function docstring (found 1)
    --> D.py:546:5
@@ -53,15 +49,13 @@ D201 [*] No blank lines allowed before function docstring (found 1)
     | |_______^
     |
 help: Remove blank line(s) before function docstring
-
-ℹ Safe fix
-542 542 | @expect('D201: No blank lines allowed before function docstring (found 1)')
-543 543 | @expect('D213: Multi-line docstring summary should start at the second line')
-544 544 | def multiline_leading_space():
-545     |-
-546 545 |     """Leading space.
-547 546 | 
-548 547 |     More content.
+542 | @expect('D201: No blank lines allowed before function docstring (found 1)')
+543 | @expect('D213: Multi-line docstring summary should start at the second line')
+544 | def multiline_leading_space():
+    - 
+545 |     """Leading space.
+546 | 
+547 |     More content.
 
 D201 [*] No blank lines allowed before function docstring (found 1)
    --> D.py:568:5
@@ -77,15 +71,13 @@ D201 [*] No blank lines allowed before function docstring (found 1)
 573 |       pass
     |
 help: Remove blank line(s) before function docstring
-
-ℹ Safe fix
-564 564 | @expect('D202: No blank lines allowed after function docstring (found 1)')
-565 565 | @expect('D213: Multi-line docstring summary should start at the second line')
-566 566 | def multiline_trailing_and_leading_space():
-567     |-
-568 567 |     """Trailing and leading space.
-569 568 | 
-570 569 |     More content.
+564 | @expect('D202: No blank lines allowed after function docstring (found 1)')
+565 | @expect('D213: Multi-line docstring summary should start at the second line')
+566 | def multiline_trailing_and_leading_space():
+    - 
+567 |     """Trailing and leading space.
+568 | 
+569 |     More content.
 
 D201 No blank lines allowed before function docstring (found 1)
    --> D.py:729:5
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap
index c41685f416..2618e6444c 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap
@@ -12,15 +12,13 @@ D202 [*] No blank lines allowed after function docstring (found 1)
 144 |     pass
     |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-140 140 | @expect('D202: No blank lines allowed after function docstring (found 1)')
-141 141 | def trailing_space():
-142 142 |     """Leading space."""
-143     |-
-144 143 |     pass
-145 144 | 
-146 145 | 
+140 | @expect('D202: No blank lines allowed after function docstring (found 1)')
+141 | def trailing_space():
+142 |     """Leading space."""
+    - 
+143 |     pass
+144 | 
+145 | 
 
 D202 [*] No blank lines allowed after function docstring (found 1)
    --> D.py:151:5
@@ -33,15 +31,13 @@ D202 [*] No blank lines allowed after function docstring (found 1)
 153 |     pass
     |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-149 149 | def trailing_and_leading_space():
-150 150 | 
-151 151 |     """Trailing and leading space."""
-152     |-
-153 152 |     pass
-154 153 | 
-155 154 | 
+149 | def trailing_and_leading_space():
+150 | 
+151 |     """Trailing and leading space."""
+    - 
+152 |     pass
+153 | 
+154 | 
 
 D202 [*] No blank lines allowed after function docstring (found 1)
    --> D.py:555:5
@@ -57,15 +53,13 @@ D202 [*] No blank lines allowed after function docstring (found 1)
 560 |       pass
     |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-556 556 | 
-557 557 |     More content.
-558 558 |     """
-559     |-
-560 559 |     pass
-561 560 | 
-562 561 | 
+556 | 
+557 |     More content.
+558 |     """
+    - 
+559 |     pass
+560 | 
+561 | 
 
 D202 [*] No blank lines allowed after function docstring (found 1)
    --> D.py:568:5
@@ -81,15 +75,13 @@ D202 [*] No blank lines allowed after function docstring (found 1)
 573 |       pass
     |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-569 569 | 
-570 570 |     More content.
-571 571 |     """
-572     |-
-573 572 |     pass
-574 573 | 
-575 574 | 
+569 | 
+570 |     More content.
+571 |     """
+    - 
+572 |     pass
+573 | 
+574 | 
 
 D202 No blank lines allowed after function docstring (found 1)
    --> D.py:729:5
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap
index 2212f54da7..b9c607d3b7 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap
@@ -10,16 +10,14 @@ D202 [*] No blank lines allowed after function docstring (found 2)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-55 55 | # D202
-56 56 | def outer():
-57 57 |     """This is a docstring."""
-58    |-
-59    |-
-60 58 |     def inner():
-61 59 |         return
-62 60 | 
+55 | # D202
+56 | def outer():
+57 |     """This is a docstring."""
+   - 
+   - 
+58 |     def inner():
+59 |         return
+60 | 
 
 D202 [*] No blank lines allowed after function docstring (found 2)
   --> D202.py:68:5
@@ -30,16 +28,14 @@ D202 [*] No blank lines allowed after function docstring (found 2)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-66 66 | # D202
-67 67 | def outer():
-68 68 |     """This is a docstring."""
-69    |-
-70    |-
-71 69 |     # This is a comment.
-72 70 |     def inner():
-73 71 |         return
+66 | # D202
+67 | def outer():
+68 |     """This is a docstring."""
+   - 
+   - 
+69 |     # This is a comment.
+70 |     def inner():
+71 |         return
 
 D202 [*] No blank lines allowed after function docstring (found 1)
   --> D202.py:80:5
@@ -52,12 +48,10 @@ D202 [*] No blank lines allowed after function docstring (found 1)
 82 |     # This is a comment.
    |
 help: Remove blank line(s) after function docstring
-
-ℹ Safe fix
-78 78 | # D202
-79 79 | def outer():
-80 80 |     """This is a docstring."""
-81    |-
-82 81 |     # This is a comment.
-83 82 | 
-84 83 |     def inner():
+78 | # D202
+79 | def outer():
+80 |     """This is a docstring."""
+   - 
+81 |     # This is a comment.
+82 | 
+83 |     def inner():
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap
index d8aaf746a0..44d0eb9886 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap
@@ -9,15 +9,13 @@ D203 [*] 1 blank line required before class docstring
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Insert 1 blank line before class docstring
-
-ℹ Safe fix
-158 158 | 
-159 159 | 
-160 160 | class LeadingSpaceMissing:
-    161 |+
-161 162 |     """Leading space missing."""
-162 163 | 
-163 164 | 
+158 | 
+159 | 
+160 | class LeadingSpaceMissing:
+161 + 
+162 |     """Leading space missing."""
+163 | 
+164 | 
 
 D203 [*] 1 blank line required before class docstring
    --> D.py:192:5
@@ -28,15 +26,13 @@ D203 [*] 1 blank line required before class docstring
 193 |     pass
     |
 help: Insert 1 blank line before class docstring
-
-ℹ Safe fix
-189 189 | 
-190 190 | 
-191 191 | class LeadingAndTrailingSpaceMissing:
-    192 |+
-192 193 |     """Leading and trailing space missing."""
-193 194 |     pass
-194 195 | 
+189 | 
+190 | 
+191 | class LeadingAndTrailingSpaceMissing:
+192 + 
+193 |     """Leading and trailing space missing."""
+194 |     pass
+195 | 
 
 D203 [*] 1 blank line required before class docstring
    --> D.py:526:5
@@ -55,15 +51,13 @@ D203 [*] 1 blank line required before class docstring
 534 |       def __init__(self, x):
     |
 help: Insert 1 blank line before class docstring
-
-ℹ Safe fix
-523 523 | # This is reproducing a bug where AttributeError is raised when parsing class
-524 524 | # parameters as functions for Google / Numpy conventions.
-525 525 | class Blah:  # noqa: D203,D213
-    526 |+
-526 527 |     """A Blah.
-527 528 | 
-528 529 |     Parameters
+523 | # This is reproducing a bug where AttributeError is raised when parsing class
+524 | # parameters as functions for Google / Numpy conventions.
+525 | class Blah:  # noqa: D203,D213
+526 + 
+527 |     """A Blah.
+528 | 
+529 |     Parameters
 
 D203 [*] 1 blank line required before class docstring
    --> D.py:649:5
@@ -75,15 +69,13 @@ D203 [*] 1 blank line required before class docstring
 651 |         pass
     |
 help: Insert 1 blank line before class docstring
-
-ℹ Safe fix
-646 646 |     "
-647 647 | 
-648 648 | class StatementOnSameLineAsDocstring:
-    649 |+
-649 650 |     "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
-650 651 |     def sort_services(self):
-651 652 |         pass
+646 |     "
+647 | 
+648 | class StatementOnSameLineAsDocstring:
+649 + 
+650 |     "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
+651 |     def sort_services(self):
+652 |         pass
 
 D203 [*] 1 blank line required before class docstring
    --> D.py:654:5
@@ -93,15 +85,13 @@ D203 [*] 1 blank line required before class docstring
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Insert 1 blank line before class docstring
-
-ℹ Safe fix
-651 651 |         pass
-652 652 | 
-653 653 | class StatementOnSameLineAsDocstring:
-    654 |+
-654 655 |     "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
-655 656 | 
-656 657 | 
+651 |         pass
+652 | 
+653 | class StatementOnSameLineAsDocstring:
+654 + 
+655 |     "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
+656 | 
+657 | 
 
 D203 [*] 1 blank line required before class docstring
    --> D.py:658:5
@@ -113,12 +103,10 @@ D203 [*] 1 blank line required before class docstring
 660 |         pass
     |
 help: Insert 1 blank line before class docstring
-
-ℹ Safe fix
-655 655 | 
-656 656 | 
-657 657 | class CommentAfterDocstring:
-    658 |+
-658 659 |     "After this docstring there's a comment."  # priorities=1
-659 660 |     def sort_services(self):
-660 661 |         pass
+655 | 
+656 | 
+657 | class CommentAfterDocstring:
+658 + 
+659 |     "After this docstring there's a comment."  # priorities=1
+660 |     def sort_services(self):
+661 |         pass
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap
index 5bdd5f22e7..b5e456a022 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap
@@ -11,15 +11,13 @@ D204 [*] 1 blank line required after class docstring
 182 |     pass
     |
 help: Insert 1 blank line after class docstring
-
-ℹ Safe fix
-179 179 | class TrailingSpace:
-180 180 | 
-181 181 |     """TrailingSpace."""
-    182 |+
-182 183 |     pass
-183 184 | 
-184 185 | 
+179 | class TrailingSpace:
+180 | 
+181 |     """TrailingSpace."""
+182 + 
+183 |     pass
+184 | 
+185 | 
 
 D204 [*] 1 blank line required after class docstring
    --> D.py:192:5
@@ -30,15 +28,13 @@ D204 [*] 1 blank line required after class docstring
 193 |     pass
     |
 help: Insert 1 blank line after class docstring
-
-ℹ Safe fix
-190 190 | 
-191 191 | class LeadingAndTrailingSpaceMissing:
-192 192 |     """Leading and trailing space missing."""
-    193 |+
-193 194 |     pass
-194 195 | 
-195 196 | 
+190 | 
+191 | class LeadingAndTrailingSpaceMissing:
+192 |     """Leading and trailing space missing."""
+193 + 
+194 |     pass
+195 | 
+196 | 
 
 D204 [*] 1 blank line required after class docstring
    --> D.py:649:5
@@ -50,18 +46,16 @@ D204 [*] 1 blank line required after class docstring
 651 |         pass
     |
 help: Insert 1 blank line after class docstring
-
-ℹ Safe fix
-646 646 |     "
-647 647 | 
-648 648 | class StatementOnSameLineAsDocstring:
-649     |-    "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
-    649 |+    "After this docstring there's another statement on the same line separated by a semicolon."
-    650 |+
-    651 |+    priorities=1
-650 652 |     def sort_services(self):
-651 653 |         pass
-652 654 | 
+646 |     "
+647 | 
+648 | class StatementOnSameLineAsDocstring:
+    -     "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
+649 +     "After this docstring there's another statement on the same line separated by a semicolon."
+650 + 
+651 +     priorities=1
+652 |     def sort_services(self):
+653 |         pass
+654 | 
 
 D204 [*] 1 blank line required after class docstring
    --> D.py:654:5
@@ -71,18 +65,16 @@ D204 [*] 1 blank line required after class docstring
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Insert 1 blank line after class docstring
-
-ℹ Safe fix
-651 651 |         pass
-652 652 | 
-653 653 | class StatementOnSameLineAsDocstring:
-654     |-    "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
-    654 |+    "After this docstring there's another statement on the same line separated by a semicolon."
-    655 |+
-    656 |+    priorities=1
-655 657 | 
-656 658 | 
-657 659 | class CommentAfterDocstring:
+651 |         pass
+652 | 
+653 | class StatementOnSameLineAsDocstring:
+    -     "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
+654 +     "After this docstring there's another statement on the same line separated by a semicolon."
+655 + 
+656 +     priorities=1
+657 | 
+658 | 
+659 | class CommentAfterDocstring:
 
 D204 [*] 1 blank line required after class docstring
    --> D.py:658:5
@@ -94,12 +86,10 @@ D204 [*] 1 blank line required after class docstring
 660 |         pass
     |
 help: Insert 1 blank line after class docstring
-
-ℹ Safe fix
-656 656 | 
-657 657 | class CommentAfterDocstring:
-658 658 |     "After this docstring there's a comment."  # priorities=1
-    659 |+
-659 660 |     def sort_services(self):
-660 661 |         pass
-661 662 |
+656 | 
+657 | class CommentAfterDocstring:
+658 |     "After this docstring there's a comment."  # priorities=1
+659 + 
+660 |     def sort_services(self):
+661 |         pass
+662 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap
index 417c81ed81..671f1a821c 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap
@@ -28,12 +28,10 @@ D205 [*] 1 blank line required between summary line and description (found 2)
     | |_______^
     |
 help: Insert single blank line
-
-ℹ Safe fix
-209 209 | def multi_line_two_separating_blanks():
-210 210 |     """Summary.
-211 211 | 
-212     |-
-213 212 |     Description.
-214 213 | 
-215 214 |     """
+209 | def multi_line_two_separating_blanks():
+210 |     """Summary.
+211 | 
+    - 
+212 |     Description.
+213 | 
+214 |     """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap
index 0865368e89..9ec1166ab6 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap
@@ -12,16 +12,14 @@ D207 [*] Docstring is under-indented
 234 |     """
     |
 help: Increase indentation
-
-ℹ Safe fix
-229 229 | def asdfsdf():
-230 230 |     """Summary.
-231 231 | 
-232     |-Description.
-    232 |+    Description.
-233 233 | 
-234 234 |     """
-235 235 | 
+229 | def asdfsdf():
+230 |     """Summary.
+231 | 
+    - Description.
+232 +     Description.
+233 | 
+234 |     """
+235 | 
 
 D207 [*] Docstring is under-indented
    --> D.py:244:1
@@ -32,16 +30,14 @@ D207 [*] Docstring is under-indented
     | ^
     |
 help: Increase indentation
-
-ℹ Safe fix
-241 241 | 
-242 242 |     Description.
-243 243 | 
-244     |-"""
-    244 |+    """
-245 245 | 
-246 246 | 
-247 247 | @expect('D208: Docstring is over-indented')
+241 | 
+242 |     Description.
+243 | 
+    - """
+244 +     """
+245 | 
+246 | 
+247 | @expect('D208: Docstring is over-indented')
 
 D207 [*] Docstring is under-indented
    --> D.py:440:1
@@ -53,16 +49,14 @@ D207 [*] Docstring is under-indented
 441 |     """
     |
 help: Increase indentation
-
-ℹ Safe fix
-437 437 | @expect('D213: Multi-line docstring summary should start at the second line')
-438 438 | def docstring_start_in_same_line(): """First Line.
-439 439 | 
-440     |-    Second Line
-    440 |+                                    Second Line
-441 441 |     """
-442 442 | 
-443 443 | 
+437 | @expect('D213: Multi-line docstring summary should start at the second line')
+438 | def docstring_start_in_same_line(): """First Line.
+439 | 
+    -     Second Line
+440 +                                     Second Line
+441 |     """
+442 | 
+443 | 
 
 D207 [*] Docstring is under-indented
    --> D.py:441:1
@@ -72,13 +66,11 @@ D207 [*] Docstring is under-indented
     | ^
     |
 help: Increase indentation
-
-ℹ Safe fix
-438 438 | def docstring_start_in_same_line(): """First Line.
-439 439 | 
-440 440 |     Second Line
-441     |-    """
-    441 |+                                    """
-442 442 | 
-443 443 | 
-444 444 | def function_with_lambda_arg(x=lambda y: y):
+438 | def docstring_start_in_same_line(): """First Line.
+439 | 
+440 |     Second Line
+    -     """
+441 +                                     """
+442 | 
+443 | 
+444 | def function_with_lambda_arg(x=lambda y: y):
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap
index c54989a221..32ec2acd7e 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap
@@ -12,16 +12,14 @@ D208 [*] Docstring is over-indented
 254 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-249 249 | def asdfsdsdf24():
-250 250 |     """Summary.
-251 251 | 
-252     |-       Description.
-    252 |+    Description.
-253 253 | 
-254 254 |     """
-255 255 | 
+249 | def asdfsdsdf24():
+250 |     """Summary.
+251 | 
+    -        Description.
+252 +     Description.
+253 | 
+254 |     """
+255 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:264:1
@@ -32,16 +30,14 @@ D208 [*] Docstring is over-indented
     | ^
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-261 261 | 
-262 262 |     Description.
-263 263 | 
-264     |-        """
-    264 |+    """
-265 265 | 
-266 266 | 
-267 267 | @expect('D208: Docstring is over-indented')
+261 | 
+262 |     Description.
+263 | 
+    -         """
+264 +     """
+265 | 
+266 | 
+267 | @expect('D208: Docstring is over-indented')
 
 D208 [*] Docstring is over-indented
    --> D.py:272:1
@@ -54,16 +50,14 @@ D208 [*] Docstring is over-indented
 274 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-269 269 | def asdfsdfsdsdsdfsdf24():
-270 270 |     """Summary.
-271 271 | 
-272     |-        Description.
-    272 |+    Description.
-273 273 | 
-274 274 |     """
-275 275 | 
+269 | def asdfsdfsdsdsdfsdf24():
+270 |     """Summary.
+271 | 
+    -         Description.
+272 +     Description.
+273 | 
+274 |     """
+275 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:673:1
@@ -76,16 +70,14 @@ D208 [*] Docstring is over-indented
 675 |             to the one before
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-670 670 | def retain_extra_whitespace():
-671 671 |     """Summary.
-672 672 | 
-673     |-        This is overindented
-    673 |+    This is overindented
-674 674 |             And so is this, but it we should preserve the extra space on this line relative
-675 675 |             to the one before
-676 676 |     """
+670 | def retain_extra_whitespace():
+671 |     """Summary.
+672 | 
+    -         This is overindented
+673 +     This is overindented
+674 |             And so is this, but it we should preserve the extra space on this line relative
+675 |             to the one before
+676 |     """
 
 D208 [*] Docstring is over-indented
    --> D.py:674:1
@@ -97,16 +89,14 @@ D208 [*] Docstring is over-indented
 676 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-671 671 |     """Summary.
-672 672 | 
-673 673 |         This is overindented
-674     |-            And so is this, but it we should preserve the extra space on this line relative
-    674 |+        And so is this, but it we should preserve the extra space on this line relative
-675 675 |             to the one before
-676 676 |     """
-677 677 | 
+671 |     """Summary.
+672 | 
+673 |         This is overindented
+    -             And so is this, but it we should preserve the extra space on this line relative
+674 +         And so is this, but it we should preserve the extra space on this line relative
+675 |             to the one before
+676 |     """
+677 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:675:1
@@ -118,16 +108,14 @@ D208 [*] Docstring is over-indented
 676 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-672 672 | 
-673 673 |         This is overindented
-674 674 |             And so is this, but it we should preserve the extra space on this line relative
-675     |-            to the one before
-    675 |+        to the one before
-676 676 |     """
-677 677 | 
-678 678 | 
+672 | 
+673 |         This is overindented
+674 |             And so is this, but it we should preserve the extra space on this line relative
+    -             to the one before
+675 +         to the one before
+676 |     """
+677 | 
+678 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:682:1
@@ -140,16 +128,14 @@ D208 [*] Docstring is over-indented
 684 |             to the one before
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-679 679 | def retain_extra_whitespace_multiple():
-680 680 |     """Summary.
-681 681 | 
-682     |-        This is overindented
-    682 |+    This is overindented
-683 683 |             And so is this, but it we should preserve the extra space on this line relative
-684 684 |             to the one before
-685 685 |         This is also overindented
+679 | def retain_extra_whitespace_multiple():
+680 |     """Summary.
+681 | 
+    -         This is overindented
+682 +     This is overindented
+683 |             And so is this, but it we should preserve the extra space on this line relative
+684 |             to the one before
+685 |         This is also overindented
 
 D208 [*] Docstring is over-indented
    --> D.py:683:1
@@ -161,16 +147,14 @@ D208 [*] Docstring is over-indented
 685 |         This is also overindented
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-680 680 |     """Summary.
-681 681 | 
-682 682 |         This is overindented
-683     |-            And so is this, but it we should preserve the extra space on this line relative
-    683 |+        And so is this, but it we should preserve the extra space on this line relative
-684 684 |             to the one before
-685 685 |         This is also overindented
-686 686 |             And so is this, but it we should preserve the extra space on this line relative
+680 |     """Summary.
+681 | 
+682 |         This is overindented
+    -             And so is this, but it we should preserve the extra space on this line relative
+683 +         And so is this, but it we should preserve the extra space on this line relative
+684 |             to the one before
+685 |         This is also overindented
+686 |             And so is this, but it we should preserve the extra space on this line relative
 
 D208 [*] Docstring is over-indented
    --> D.py:684:1
@@ -183,16 +167,14 @@ D208 [*] Docstring is over-indented
 686 |             And so is this, but it we should preserve the extra space on this line relative
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-681 681 | 
-682 682 |         This is overindented
-683 683 |             And so is this, but it we should preserve the extra space on this line relative
-684     |-            to the one before
-    684 |+        to the one before
-685 685 |         This is also overindented
-686 686 |             And so is this, but it we should preserve the extra space on this line relative
-687 687 |             to the one before
+681 | 
+682 |         This is overindented
+683 |             And so is this, but it we should preserve the extra space on this line relative
+    -             to the one before
+684 +         to the one before
+685 |         This is also overindented
+686 |             And so is this, but it we should preserve the extra space on this line relative
+687 |             to the one before
 
 D208 [*] Docstring is over-indented
    --> D.py:685:1
@@ -205,16 +187,14 @@ D208 [*] Docstring is over-indented
 687 |             to the one before
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-682 682 |         This is overindented
-683 683 |             And so is this, but it we should preserve the extra space on this line relative
-684 684 |             to the one before
-685     |-        This is also overindented
-    685 |+    This is also overindented
-686 686 |             And so is this, but it we should preserve the extra space on this line relative
-687 687 |             to the one before
-688 688 |     """
+682 |         This is overindented
+683 |             And so is this, but it we should preserve the extra space on this line relative
+684 |             to the one before
+    -         This is also overindented
+685 +     This is also overindented
+686 |             And so is this, but it we should preserve the extra space on this line relative
+687 |             to the one before
+688 |     """
 
 D208 [*] Docstring is over-indented
    --> D.py:686:1
@@ -227,16 +207,14 @@ D208 [*] Docstring is over-indented
 688 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-683 683 |             And so is this, but it we should preserve the extra space on this line relative
-684 684 |             to the one before
-685 685 |         This is also overindented
-686     |-            And so is this, but it we should preserve the extra space on this line relative
-    686 |+        And so is this, but it we should preserve the extra space on this line relative
-687 687 |             to the one before
-688 688 |     """
-689 689 | 
+683 |             And so is this, but it we should preserve the extra space on this line relative
+684 |             to the one before
+685 |         This is also overindented
+    -             And so is this, but it we should preserve the extra space on this line relative
+686 +         And so is this, but it we should preserve the extra space on this line relative
+687 |             to the one before
+688 |     """
+689 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:687:1
@@ -248,16 +226,14 @@ D208 [*] Docstring is over-indented
 688 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-684 684 |             to the one before
-685 685 |         This is also overindented
-686 686 |             And so is this, but it we should preserve the extra space on this line relative
-687     |-            to the one before
-    687 |+        to the one before
-688 688 |     """
-689 689 | 
-690 690 | 
+684 |             to the one before
+685 |         This is also overindented
+686 |             And so is this, but it we should preserve the extra space on this line relative
+    -             to the one before
+687 +         to the one before
+688 |     """
+689 | 
+690 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:695:1
@@ -270,16 +246,14 @@ D208 [*] Docstring is over-indented
 697 |             to the one before
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-692 692 | def retain_extra_whitespace_deeper():
-693 693 |     """Summary.
-694 694 | 
-695     |-        This is overindented
-    695 |+    This is overindented
-696 696 |             And so is this, but it we should preserve the extra space on this line relative
-697 697 |             to the one before
-698 698 |                 And the relative indent here should be preserved too
+692 | def retain_extra_whitespace_deeper():
+693 |     """Summary.
+694 | 
+    -         This is overindented
+695 +     This is overindented
+696 |             And so is this, but it we should preserve the extra space on this line relative
+697 |             to the one before
+698 |                 And the relative indent here should be preserved too
 
 D208 [*] Docstring is over-indented
    --> D.py:696:1
@@ -291,16 +265,14 @@ D208 [*] Docstring is over-indented
 698 |                 And the relative indent here should be preserved too
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-693 693 |     """Summary.
-694 694 | 
-695 695 |         This is overindented
-696     |-            And so is this, but it we should preserve the extra space on this line relative
-    696 |+        And so is this, but it we should preserve the extra space on this line relative
-697 697 |             to the one before
-698 698 |                 And the relative indent here should be preserved too
-699 699 |     """
+693 |     """Summary.
+694 | 
+695 |         This is overindented
+    -             And so is this, but it we should preserve the extra space on this line relative
+696 +         And so is this, but it we should preserve the extra space on this line relative
+697 |             to the one before
+698 |                 And the relative indent here should be preserved too
+699 |     """
 
 D208 [*] Docstring is over-indented
    --> D.py:697:1
@@ -313,16 +285,14 @@ D208 [*] Docstring is over-indented
 699 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-694 694 | 
-695 695 |         This is overindented
-696 696 |             And so is this, but it we should preserve the extra space on this line relative
-697     |-            to the one before
-    697 |+        to the one before
-698 698 |                 And the relative indent here should be preserved too
-699 699 |     """
-700 700 | 
+694 | 
+695 |         This is overindented
+696 |             And so is this, but it we should preserve the extra space on this line relative
+    -             to the one before
+697 +         to the one before
+698 |                 And the relative indent here should be preserved too
+699 |     """
+700 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:698:1
@@ -334,16 +304,14 @@ D208 [*] Docstring is over-indented
 699 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-695 695 |         This is overindented
-696 696 |             And so is this, but it we should preserve the extra space on this line relative
-697 697 |             to the one before
-698     |-                And the relative indent here should be preserved too
-    698 |+            And the relative indent here should be preserved too
-699 699 |     """
-700 700 | 
-701 701 | def retain_extra_whitespace_followed_by_same_offset():
+695 |         This is overindented
+696 |             And so is this, but it we should preserve the extra space on this line relative
+697 |             to the one before
+    -                 And the relative indent here should be preserved too
+698 +             And the relative indent here should be preserved too
+699 |     """
+700 | 
+701 | def retain_extra_whitespace_followed_by_same_offset():
 
 D208 [*] Docstring is over-indented
    --> D.py:704:1
@@ -356,16 +324,14 @@ D208 [*] Docstring is over-indented
 706 |         This is overindented
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-701 701 | def retain_extra_whitespace_followed_by_same_offset():
-702 702 |     """Summary.
-703 703 | 
-704     |-        This is overindented
-    704 |+    This is overindented
-705 705 |             And so is this, but it we should preserve the extra space on this line relative
-706 706 |         This is overindented
-707 707 |         This is overindented
+701 | def retain_extra_whitespace_followed_by_same_offset():
+702 |     """Summary.
+703 | 
+    -         This is overindented
+704 +     This is overindented
+705 |             And so is this, but it we should preserve the extra space on this line relative
+706 |         This is overindented
+707 |         This is overindented
 
 D208 [*] Docstring is over-indented
    --> D.py:705:1
@@ -377,16 +343,14 @@ D208 [*] Docstring is over-indented
 707 |         This is overindented
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-702 702 |     """Summary.
-703 703 | 
-704 704 |         This is overindented
-705     |-            And so is this, but it we should preserve the extra space on this line relative
-    705 |+        And so is this, but it we should preserve the extra space on this line relative
-706 706 |         This is overindented
-707 707 |         This is overindented
-708 708 |     """
+702 |     """Summary.
+703 | 
+704 |         This is overindented
+    -             And so is this, but it we should preserve the extra space on this line relative
+705 +         And so is this, but it we should preserve the extra space on this line relative
+706 |         This is overindented
+707 |         This is overindented
+708 |     """
 
 D208 [*] Docstring is over-indented
    --> D.py:706:1
@@ -399,16 +363,14 @@ D208 [*] Docstring is over-indented
 708 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-703 703 | 
-704 704 |         This is overindented
-705 705 |             And so is this, but it we should preserve the extra space on this line relative
-706     |-        This is overindented
-    706 |+    This is overindented
-707 707 |         This is overindented
-708 708 |     """
-709 709 | 
+703 | 
+704 |         This is overindented
+705 |             And so is this, but it we should preserve the extra space on this line relative
+    -         This is overindented
+706 +     This is overindented
+707 |         This is overindented
+708 |     """
+709 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:707:1
@@ -420,16 +382,14 @@ D208 [*] Docstring is over-indented
 708 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-704 704 |         This is overindented
-705 705 |             And so is this, but it we should preserve the extra space on this line relative
-706 706 |         This is overindented
-707     |-        This is overindented
-    707 |+    This is overindented
-708 708 |     """
-709 709 | 
-710 710 | 
+704 |         This is overindented
+705 |             And so is this, but it we should preserve the extra space on this line relative
+706 |         This is overindented
+    -         This is overindented
+707 +     This is overindented
+708 |     """
+709 | 
+710 | 
 
 D208 [*] Docstring is over-indented
    --> D.py:723:1
@@ -441,13 +401,11 @@ D208 [*] Docstring is over-indented
 724 |     """
     |
 help: Remove over-indentation
-
-ℹ Safe fix
-720 720 | def inconsistent_indent_byte_size():
-721 721 |     """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
-722 722 | 
-723     |-       Returns:
-    723 |+    Returns:
-724 724 |     """
-725 725 | 
-726 726 |
+720 | def inconsistent_indent_byte_size():
+721 |     """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
+722 | 
+    -        Returns:
+723 +     Returns:
+724 |     """
+725 | 
+726 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap
index e6a1707a5b..663c3a0b47 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap
@@ -10,14 +10,12 @@ D208 [*] Docstring is over-indented
 3 | """
   |
 help: Remove over-indentation
-
-ℹ Safe fix
-1 1 | """
-2   |-   Author
-  2 |+Author
-3 3 | """
-4 4 | 
-5 5 | 
+1 | """
+  -    Author
+2 + Author
+3 | """
+4 | 
+5 | 
 
 D208 [*] Docstring is over-indented
   --> D208.py:8:1
@@ -30,16 +28,14 @@ D208 [*] Docstring is over-indented
 10 |             """
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-5 5 | 
-6 6 | class Platform:
-7 7 |     """ Remove sampler
-8   |-            Args:
-  8 |+    Args:
-9 9 |             Returns:
-10 10 |             """
-11 11 | 
+5  | 
+6  | class Platform:
+7  |     """ Remove sampler
+   -             Args:
+8  +     Args:
+9  |             Returns:
+10 |             """
+11 | 
 
 D208 [*] Docstring is over-indented
   --> D208.py:9:1
@@ -51,16 +47,14 @@ D208 [*] Docstring is over-indented
 10 |             """
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-6  6  | class Platform:
-7  7  |     """ Remove sampler
-8  8  |             Args:
-9     |-            Returns:
-   9  |+    Returns:
-10 10 |             """
-11 11 | 
-12 12 | 
+6  | class Platform:
+7  |     """ Remove sampler
+8  |             Args:
+   -             Returns:
+9  +     Returns:
+10 |             """
+11 | 
+12 | 
 
 D208 [*] Docstring is over-indented
   --> D208.py:10:1
@@ -71,16 +65,14 @@ D208 [*] Docstring is over-indented
    | ^
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-7  7  |     """ Remove sampler
-8  8  |             Args:
-9  9  |             Returns:
-10    |-            """
-   10 |+    """
-11 11 | 
-12 12 | 
-13 13 | def memory_test():
+7  |     """ Remove sampler
+8  |             Args:
+9  |             Returns:
+   -             """
+10 +     """
+11 | 
+12 | 
+13 | def memory_test():
 
 D208 [*] Docstring is over-indented
   --> D208.py:24:1
@@ -91,16 +83,14 @@ D208 [*] Docstring is over-indented
    | ^
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-21 21 |     """Over indented last line
-22 22 |     Args:
-23 23 |     Returns:
-24    |-                """
-   24 |+    """
-25 25 | 
-26 26 | 
-27 27 | class Platform:
+21 |     """Over indented last line
+22 |     Args:
+23 |     Returns:
+   -                 """
+24 +     """
+25 | 
+26 | 
+27 | class Platform:
 
 D208 [*] Docstring is over-indented
   --> D208.py:29:1
@@ -113,16 +103,14 @@ D208 [*] Docstring is over-indented
 31 |         """
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-26 26 | 
-27 27 | class Platform:
-28 28 |     """All lines are over indented including the last containing the closing quotes
-29    |-        Args:
-   29 |+    Args:
-30 30 |         Returns:
-31 31 |         """
-32 32 | 
+26 | 
+27 | class Platform:
+28 |     """All lines are over indented including the last containing the closing quotes
+   -         Args:
+29 +     Args:
+30 |         Returns:
+31 |         """
+32 | 
 
 D208 [*] Docstring is over-indented
   --> D208.py:30:1
@@ -134,16 +122,14 @@ D208 [*] Docstring is over-indented
 31 |         """
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-27 27 | class Platform:
-28 28 |     """All lines are over indented including the last containing the closing quotes
-29 29 |         Args:
-30    |-        Returns:
-   30 |+    Returns:
-31 31 |         """
-32 32 | 
-33 33 | class Platform:
+27 | class Platform:
+28 |     """All lines are over indented including the last containing the closing quotes
+29 |         Args:
+   -         Returns:
+30 +     Returns:
+31 |         """
+32 | 
+33 | class Platform:
 
 D208 [*] Docstring is over-indented
   --> D208.py:31:1
@@ -156,16 +142,14 @@ D208 [*] Docstring is over-indented
 33 | class Platform:
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-28 28 |     """All lines are over indented including the last containing the closing quotes
-29 29 |         Args:
-30 30 |         Returns:
-31    |-        """
-   31 |+    """
-32 32 | 
-33 33 | class Platform:
-34 34 |     """All lines are over indented including the last
+28 |     """All lines are over indented including the last containing the closing quotes
+29 |         Args:
+30 |         Returns:
+   -         """
+31 +     """
+32 | 
+33 | class Platform:
+34 |     """All lines are over indented including the last
 
 D208 [*] Docstring is over-indented
   --> D208.py:35:1
@@ -177,16 +161,14 @@ D208 [*] Docstring is over-indented
 36 |         Returns"""
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-32 32 | 
-33 33 | class Platform:
-34 34 |     """All lines are over indented including the last
-35    |-        Args:
-   35 |+    Args:
-36 36 |         Returns"""
-37 37 | 
-38 38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line  (see next test). Raises D209
+32 | 
+33 | class Platform:
+34 |     """All lines are over indented including the last
+   -         Args:
+35 +     Args:
+36 |         Returns"""
+37 | 
+38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line  (see next test). Raises D209
 
 D208 [*] Docstring is over-indented
   --> D208.py:36:1
@@ -199,13 +181,11 @@ D208 [*] Docstring is over-indented
 38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line  (see next test). Raises D209
    |
 help: Remove over-indentation
-
-ℹ Safe fix
-33 33 | class Platform:
-34 34 |     """All lines are over indented including the last
-35 35 |         Args:
-36    |-        Returns"""
-   36 |+    Returns"""
-37 37 | 
-38 38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line  (see next test). Raises D209
-39 39 | class Platform:
+33 | class Platform:
+34 |     """All lines are over indented including the last
+35 |         Args:
+   -         Returns"""
+36 +     Returns"""
+37 | 
+38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line  (see next test). Raises D209
+39 | class Platform:
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap
index fcfd42cb1a..a8616e4c2a 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap
@@ -12,17 +12,15 @@ D209 [*] Multi-line docstring closing quotes should be on a separate line
     | |___________________^
     |
 help: Move closing quotes to new line
-
-ℹ Safe fix
-280 280 | def asdfljdf24():
-281 281 |     """Summary.
-282 282 | 
-283     |-    Description."""
-    283 |+    Description.
-    284 |+    """
-284 285 | 
-285 286 | 
-286 287 | @expect('D210: No whitespaces allowed surrounding docstring text')
+280 | def asdfljdf24():
+281 |     """Summary.
+282 | 
+    -     Description."""
+283 +     Description.
+284 +     """
+285 | 
+286 | 
+287 | @expect('D210: No whitespaces allowed surrounding docstring text')
 
 D209 [*] Multi-line docstring closing quotes should be on a separate line
    --> D.py:588:5
@@ -35,14 +33,12 @@ D209 [*] Multi-line docstring closing quotes should be on a separate line
     | |_____________________^
     |
 help: Move closing quotes to new line
-
-ℹ Safe fix
-587 587 | def asdfljdjgf24():
-588 588 |     """Summary.
-589 589 | 
-590     |-    Description.  """
-    590 |+    Description.
-    591 |+    """
-591 592 | 
-592 593 | 
-593 594 | @expect('D200: One-line docstring should fit on one line with quotes '
+587 | def asdfljdjgf24():
+588 |     """Summary.
+589 | 
+    -     Description.  """
+590 +     Description.
+591 +     """
+592 | 
+593 | 
+594 | @expect('D200: One-line docstring should fit on one line with quotes '
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap
index 4a65482cfe..2121af479b 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap
@@ -10,16 +10,14 @@ D210 [*] No whitespaces allowed surrounding docstring text
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Trim surrounding whitespace
-
-ℹ Safe fix
-285 285 | 
-286 286 | @expect('D210: No whitespaces allowed surrounding docstring text')
-287 287 | def endswith():
-288     |-    """Whitespace at the end. """
-    288 |+    """Whitespace at the end."""
-289 289 | 
-290 290 | 
-291 291 | @expect('D210: No whitespaces allowed surrounding docstring text')
+285 | 
+286 | @expect('D210: No whitespaces allowed surrounding docstring text')
+287 | def endswith():
+    -     """Whitespace at the end. """
+288 +     """Whitespace at the end."""
+289 | 
+290 | 
+291 | @expect('D210: No whitespaces allowed surrounding docstring text')
 
 D210 [*] No whitespaces allowed surrounding docstring text
    --> D.py:293:5
@@ -30,16 +28,14 @@ D210 [*] No whitespaces allowed surrounding docstring text
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Trim surrounding whitespace
-
-ℹ Safe fix
-290 290 | 
-291 291 | @expect('D210: No whitespaces allowed surrounding docstring text')
-292 292 | def around():
-293     |-    """ Whitespace at everywhere. """
-    293 |+    """Whitespace at everywhere."""
-294 294 | 
-295 295 | 
-296 296 | @expect('D210: No whitespaces allowed surrounding docstring text')
+290 | 
+291 | @expect('D210: No whitespaces allowed surrounding docstring text')
+292 | def around():
+    -     """ Whitespace at everywhere. """
+293 +     """Whitespace at everywhere."""
+294 | 
+295 | 
+296 | @expect('D210: No whitespaces allowed surrounding docstring text')
 
 D210 [*] No whitespaces allowed surrounding docstring text
    --> D.py:299:5
@@ -53,16 +49,14 @@ D210 [*] No whitespaces allowed surrounding docstring text
     | |_______^
     |
 help: Trim surrounding whitespace
-
-ℹ Safe fix
-296 296 | @expect('D210: No whitespaces allowed surrounding docstring text')
-297 297 | @expect('D213: Multi-line docstring summary should start at the second line')
-298 298 | def multiline():
-299     |-    """ Whitespace at the beginning.
-    299 |+    """Whitespace at the beginning.
-300 300 | 
-301 301 |     This is the end.
-302 302 |     """
+296 | @expect('D210: No whitespaces allowed surrounding docstring text')
+297 | @expect('D213: Multi-line docstring summary should start at the second line')
+298 | def multiline():
+    -     """ Whitespace at the beginning.
+299 +     """Whitespace at the beginning.
+300 | 
+301 |     This is the end.
+302 |     """
 
 D210 No whitespaces allowed surrounding docstring text
    --> D.py:581:5
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap
index 7826cc5fb1..627337f71c 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap
@@ -10,15 +10,13 @@ D211 [*] No blank lines allowed before class docstring
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Remove blank line(s) before class docstring
-
-ℹ Safe fix
-166 166 | 
-167 167 | 
-168 168 | class WithLeadingSpace:
-169     |-
-170 169 |     """With leading space."""
-171 170 | 
-172 171 | 
+166 | 
+167 | 
+168 | class WithLeadingSpace:
+    - 
+169 |     """With leading space."""
+170 | 
+171 | 
 
 D211 [*] No blank lines allowed before class docstring
    --> D.py:181:5
@@ -30,12 +28,10 @@ D211 [*] No blank lines allowed before class docstring
 182 |     pass
     |
 help: Remove blank line(s) before class docstring
-
-ℹ Safe fix
-177 177 | 
-178 178 | 
-179 179 | class TrailingSpace:
-180     |-
-181 180 |     """TrailingSpace."""
-182 181 |     pass
-183 182 |
+177 | 
+178 | 
+179 | class TrailingSpace:
+    - 
+180 |     """TrailingSpace."""
+181 |     pass
+182 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap
index b934ae897e..2b17765409 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap
@@ -12,17 +12,15 @@ D212 [*] Multi-line docstring summary should start at the first line
     | |_______^
     |
 help: Remove whitespace after opening quotes
-
-ℹ Safe fix
-126 126 |         '(found 3)')
-127 127 | @expect('D212: Multi-line docstring summary should start at the first line')
-128 128 | def asdlkfasd():
-129     |-    """
-130     |-    Wrong.
-    129 |+    """Wrong.
-131 130 |     """
-132 131 | 
-133 132 | 
+126 |         '(found 3)')
+127 | @expect('D212: Multi-line docstring summary should start at the first line')
+128 | def asdlkfasd():
+    -     """
+    -     Wrong.
+129 +     """Wrong.
+130 |     """
+131 | 
+132 | 
 
 D212 [*] Multi-line docstring summary should start at the first line
    --> D.py:597:5
@@ -35,18 +33,16 @@ D212 [*] Multi-line docstring summary should start at the first line
     | |_____________^
     |
 help: Remove whitespace after opening quotes
-
-ℹ Safe fix
-594 594 |         '(found 3)')
-595 595 | @expect('D212: Multi-line docstring summary should start at the first line')
-596 596 | def one_liner():
-597     |-    """
-598     |-
-599     |-    Wrong."""
-    597 |+    """Wrong."""
-600 598 | 
-601 599 | 
-602 600 | @expect('D200: One-line docstring should fit on one line with quotes '
+594 |         '(found 3)')
+595 | @expect('D212: Multi-line docstring summary should start at the first line')
+596 | def one_liner():
+    -     """
+    - 
+    -     Wrong."""
+597 +     """Wrong."""
+598 | 
+599 | 
+600 | @expect('D200: One-line docstring should fit on one line with quotes '
 
 D212 [*] Multi-line docstring summary should start at the first line
    --> D.py:624:5
@@ -59,15 +55,13 @@ D212 [*] Multi-line docstring summary should start at the first line
     | |______________^
     |
 help: Remove whitespace after opening quotes
-
-ℹ Safe fix
-621 621 |         '(found 3)')
-622 622 | @expect('D212: Multi-line docstring summary should start at the first line')
-623 623 | def one_liner():
-624     |-    """
-625     |-
-626     |-    "Wrong."""
-    624 |+    """"Wrong."""
-627 625 | 
-628 626 | 
-629 627 | @expect('D404: First word of the docstring should not be "This"')
+621 |         '(found 3)')
+622 | @expect('D212: Multi-line docstring summary should start at the first line')
+623 | def one_liner():
+    -     """
+    - 
+    -     "Wrong."""
+624 +     """"Wrong."""
+625 | 
+626 | 
+627 | @expect('D404: First word of the docstring should not be "This"')
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap
index 7b1de443da..8b3f443400 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap
@@ -13,17 +13,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-197 197 |         '(found 0)')
-198 198 | @expect('D213: Multi-line docstring summary should start at the second line')
-199 199 | def multi_line_zero_separating_blanks():
-200     |-    """Summary.
-    200 |+    """
-    201 |+    Summary.
-201 202 |     Description.
-202 203 | 
-203 204 |     """
+197 |         '(found 0)')
+198 | @expect('D213: Multi-line docstring summary should start at the second line')
+199 | def multi_line_zero_separating_blanks():
+    -     """Summary.
+200 +     """
+201 +     Summary.
+202 |     Description.
+203 | 
+204 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:210:5
@@ -39,17 +37,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-207 207 |         '(found 2)')
-208 208 | @expect('D213: Multi-line docstring summary should start at the second line')
-209 209 | def multi_line_two_separating_blanks():
-210     |-    """Summary.
-    210 |+    """
-    211 |+    Summary.
-211 212 | 
-212 213 | 
-213 214 |     Description.
+207 |         '(found 2)')
+208 | @expect('D213: Multi-line docstring summary should start at the second line')
+209 | def multi_line_two_separating_blanks():
+    -     """Summary.
+210 +     """
+211 +     Summary.
+212 | 
+213 | 
+214 |     Description.
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:220:5
@@ -64,17 +60,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-217 217 | 
-218 218 | @expect('D213: Multi-line docstring summary should start at the second line')
-219 219 | def multi_line_one_separating_blanks():
-220     |-    """Summary.
-    220 |+    """
-    221 |+    Summary.
-221 222 | 
-222 223 |     Description.
-223 224 | 
+217 | 
+218 | @expect('D213: Multi-line docstring summary should start at the second line')
+219 | def multi_line_one_separating_blanks():
+    -     """Summary.
+220 +     """
+221 +     Summary.
+222 | 
+223 |     Description.
+224 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:230:5
@@ -89,17 +83,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-227 227 | @expect('D207: Docstring is under-indented')
-228 228 | @expect('D213: Multi-line docstring summary should start at the second line')
-229 229 | def asdfsdf():
-230     |-    """Summary.
-    230 |+    """
-    231 |+    Summary.
-231 232 | 
-232 233 | Description.
-233 234 | 
+227 | @expect('D207: Docstring is under-indented')
+228 | @expect('D213: Multi-line docstring summary should start at the second line')
+229 | def asdfsdf():
+    -     """Summary.
+230 +     """
+231 +     Summary.
+232 | 
+233 | Description.
+234 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:240:5
@@ -114,17 +106,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |___^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-237 237 | @expect('D207: Docstring is under-indented')
-238 238 | @expect('D213: Multi-line docstring summary should start at the second line')
-239 239 | def asdsdfsdffsdf():
-240     |-    """Summary.
-    240 |+    """
-    241 |+    Summary.
-241 242 | 
-242 243 |     Description.
-243 244 | 
+237 | @expect('D207: Docstring is under-indented')
+238 | @expect('D213: Multi-line docstring summary should start at the second line')
+239 | def asdsdfsdffsdf():
+    -     """Summary.
+240 +     """
+241 +     Summary.
+242 | 
+243 |     Description.
+244 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:250:5
@@ -139,17 +129,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-247 247 | @expect('D208: Docstring is over-indented')
-248 248 | @expect('D213: Multi-line docstring summary should start at the second line')
-249 249 | def asdfsdsdf24():
-250     |-    """Summary.
-    250 |+    """
-    251 |+    Summary.
-251 252 | 
-252 253 |        Description.
-253 254 | 
+247 | @expect('D208: Docstring is over-indented')
+248 | @expect('D213: Multi-line docstring summary should start at the second line')
+249 | def asdfsdsdf24():
+    -     """Summary.
+250 +     """
+251 +     Summary.
+252 | 
+253 |        Description.
+254 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:260:5
@@ -164,17 +152,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |___________^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-257 257 | @expect('D208: Docstring is over-indented')
-258 258 | @expect('D213: Multi-line docstring summary should start at the second line')
-259 259 | def asdfsdsdfsdf24():
-260     |-    """Summary.
-    260 |+    """
-    261 |+    Summary.
-261 262 | 
-262 263 |     Description.
-263 264 | 
+257 | @expect('D208: Docstring is over-indented')
+258 | @expect('D213: Multi-line docstring summary should start at the second line')
+259 | def asdfsdsdfsdf24():
+    -     """Summary.
+260 +     """
+261 +     Summary.
+262 | 
+263 |     Description.
+264 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:270:5
@@ -189,17 +175,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-267 267 | @expect('D208: Docstring is over-indented')
-268 268 | @expect('D213: Multi-line docstring summary should start at the second line')
-269 269 | def asdfsdfsdsdsdfsdf24():
-270     |-    """Summary.
-    270 |+    """
-    271 |+    Summary.
-271 272 | 
-272 273 |         Description.
-273 274 | 
+267 | @expect('D208: Docstring is over-indented')
+268 | @expect('D213: Multi-line docstring summary should start at the second line')
+269 | def asdfsdfsdsdsdfsdf24():
+    -     """Summary.
+270 +     """
+271 +     Summary.
+272 | 
+273 |         Description.
+274 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:281:5
@@ -212,17 +196,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |___________________^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-278 278 |         'line')
-279 279 | @expect('D213: Multi-line docstring summary should start at the second line')
-280 280 | def asdfljdf24():
-281     |-    """Summary.
-    281 |+    """
-    282 |+    Summary.
-282 283 | 
-283 284 |     Description."""
-284 285 | 
+278 |         'line')
+279 | @expect('D213: Multi-line docstring summary should start at the second line')
+280 | def asdfljdf24():
+    -     """Summary.
+281 +     """
+282 +     Summary.
+283 | 
+284 |     Description."""
+285 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:299:5
@@ -236,17 +218,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-296 296 | @expect('D210: No whitespaces allowed surrounding docstring text')
-297 297 | @expect('D213: Multi-line docstring summary should start at the second line')
-298 298 | def multiline():
-299     |-    """ Whitespace at the beginning.
-    299 |+    """
-    300 |+    Whitespace at the beginning.
-300 301 | 
-301 302 |     This is the end.
-302 303 |     """
+296 | @expect('D210: No whitespaces allowed surrounding docstring text')
+297 | @expect('D213: Multi-line docstring summary should start at the second line')
+298 | def multiline():
+    -     """ Whitespace at the beginning.
+299 +     """
+300 +     Whitespace at the beginning.
+301 | 
+302 |     This is the end.
+303 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:343:5
@@ -262,17 +242,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-340 340 | 
-341 341 | @expect('D213: Multi-line docstring summary should start at the second line')
-342 342 | def exceptions_of_D301():
-343     |-    """Exclude some backslashes from D301.
-    343 |+    """
-    344 |+    Exclude some backslashes from D301.
-344 345 | 
-345 346 |     In particular, line continuations \
-346 347 |     and unicode literals \u0394 and \N{GREEK CAPITAL LETTER DELTA}.
+340 | 
+341 | @expect('D213: Multi-line docstring summary should start at the second line')
+342 | def exceptions_of_D301():
+    -     """Exclude some backslashes from D301.
+343 +     """
+344 +     Exclude some backslashes from D301.
+345 | 
+346 |     In particular, line continuations \
+347 |     and unicode literals \u0394 and \N{GREEK CAPITAL LETTER DELTA}.
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:383:5
@@ -287,17 +265,15 @@ D213 [*] Multi-line docstring summary should start at the second line
 387 |       pass
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-380 380 | 
-381 381 | @expect('D213: Multi-line docstring summary should start at the second line')
-382 382 | def new_209():
-383     |-    """First line.
-    383 |+    """
-    384 |+    First line.
-384 385 | 
-385 386 |     More lines.
-386 387 |     """
+380 | 
+381 | @expect('D213: Multi-line docstring summary should start at the second line')
+382 | def new_209():
+    -     """First line.
+383 +     """
+384 +     First line.
+385 | 
+386 |     More lines.
+387 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:392:5
@@ -312,17 +288,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-389 389 | 
-390 390 | @expect('D213: Multi-line docstring summary should start at the second line')
-391 391 | def old_209():
-392     |-    """One liner.
-    392 |+    """
-    393 |+    One liner.
-393 394 | 
-394 395 |     Multi-line comments. OK to have extra blank line
-395 396 | 
+389 | 
+390 | @expect('D213: Multi-line docstring summary should start at the second line')
+391 | def old_209():
+    -     """One liner.
+392 +     """
+393 +     One liner.
+394 | 
+395 |     Multi-line comments. OK to have extra blank line
+396 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:438:37
@@ -337,17 +311,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-435 435 | 
-436 436 | @expect("D207: Docstring is under-indented")
-437 437 | @expect('D213: Multi-line docstring summary should start at the second line')
-438     |-def docstring_start_in_same_line(): """First Line.
-    438 |+def docstring_start_in_same_line(): """
-    439 |+    First Line.
-439 440 | 
-440 441 |     Second Line
-441 442 |     """
+435 | 
+436 | @expect("D207: Docstring is under-indented")
+437 | @expect('D213: Multi-line docstring summary should start at the second line')
+    - def docstring_start_in_same_line(): """First Line.
+438 + def docstring_start_in_same_line(): """
+439 +     First Line.
+440 | 
+441 |     Second Line
+442 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:450:5
@@ -362,17 +334,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-447 447 | 
-448 448 | @expect('D213: Multi-line docstring summary should start at the second line')
-449 449 | def a_following_valid_function(x=None):
-450     |-    """Check for a bug where the previous function caused an assertion.
-    450 |+    """
-    451 |+    Check for a bug where the previous function caused an assertion.
-451 452 | 
-452 453 |     The assertion was caused in the next function, so this one is necessary.
-453 454 | 
+447 | 
+448 | @expect('D213: Multi-line docstring summary should start at the second line')
+449 | def a_following_valid_function(x=None):
+    -     """Check for a bug where the previous function caused an assertion.
+450 +     """
+451 +     Check for a bug where the previous function caused an assertion.
+452 | 
+453 |     The assertion was caused in the next function, so this one is necessary.
+454 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:526:5
@@ -391,17 +361,15 @@ D213 [*] Multi-line docstring summary should start at the second line
 534 |       def __init__(self, x):
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-523 523 | # This is reproducing a bug where AttributeError is raised when parsing class
-524 524 | # parameters as functions for Google / Numpy conventions.
-525 525 | class Blah:  # noqa: D203,D213
-526     |-    """A Blah.
-    526 |+    """
-    527 |+    A Blah.
-527 528 | 
-528 529 |     Parameters
-529 530 |     ----------
+523 | # This is reproducing a bug where AttributeError is raised when parsing class
+524 | # parameters as functions for Google / Numpy conventions.
+525 | class Blah:  # noqa: D203,D213
+    -     """A Blah.
+526 +     """
+527 +     A Blah.
+528 | 
+529 |     Parameters
+530 |     ----------
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:546:5
@@ -415,17 +383,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-543 543 | @expect('D213: Multi-line docstring summary should start at the second line')
-544 544 | def multiline_leading_space():
-545 545 | 
-546     |-    """Leading space.
-    546 |+    """
-    547 |+    Leading space.
-547 548 | 
-548 549 |     More content.
-549 550 |     """
+543 | @expect('D213: Multi-line docstring summary should start at the second line')
+544 | def multiline_leading_space():
+545 | 
+    -     """Leading space.
+546 +     """
+547 +     Leading space.
+548 | 
+549 |     More content.
+550 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:555:5
@@ -441,17 +407,15 @@ D213 [*] Multi-line docstring summary should start at the second line
 560 |       pass
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-552 552 | @expect('D202: No blank lines allowed after function docstring (found 1)')
-553 553 | @expect('D213: Multi-line docstring summary should start at the second line')
-554 554 | def multiline_trailing_space():
-555     |-    """Leading space.
-    555 |+    """
-    556 |+    Leading space.
-556 557 | 
-557 558 |     More content.
-558 559 |     """
+552 | @expect('D202: No blank lines allowed after function docstring (found 1)')
+553 | @expect('D213: Multi-line docstring summary should start at the second line')
+554 | def multiline_trailing_space():
+    -     """Leading space.
+555 +     """
+556 +     Leading space.
+557 | 
+558 |     More content.
+559 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:568:5
@@ -467,17 +431,15 @@ D213 [*] Multi-line docstring summary should start at the second line
 573 |       pass
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-565 565 | @expect('D213: Multi-line docstring summary should start at the second line')
-566 566 | def multiline_trailing_and_leading_space():
-567 567 | 
-568     |-    """Trailing and leading space.
-    568 |+    """
-    569 |+    Trailing and leading space.
-569 570 | 
-570 571 |     More content.
-571 572 |     """
+565 | @expect('D213: Multi-line docstring summary should start at the second line')
+566 | def multiline_trailing_and_leading_space():
+567 | 
+    -     """Trailing and leading space.
+568 +     """
+569 +     Trailing and leading space.
+570 | 
+571 |     More content.
+572 |     """
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:588:5
@@ -490,17 +452,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_____________________^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-585 585 |         'line')
-586 586 | @expect('D213: Multi-line docstring summary should start at the second line')
-587 587 | def asdfljdjgf24():
-588     |-    """Summary.
-    588 |+    """
-    589 |+    Summary.
-589 590 | 
-590 591 |     Description.  """
-591 592 | 
+585 |         'line')
+586 | @expect('D213: Multi-line docstring summary should start at the second line')
+587 | def asdfljdjgf24():
+    -     """Summary.
+588 +     """
+589 +     Summary.
+590 | 
+591 |     Description.  """
+592 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:606:5
@@ -513,17 +473,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-603 603 |         '(found 3)')
-604 604 | @expect('D212: Multi-line docstring summary should start at the first line')
-605 605 | def one_liner():
-606     |-    r"""Wrong.
-    606 |+    r"""
-    607 |+    Wrong.
-607 608 | 
-608 609 |     """
-609 610 | 
+603 |         '(found 3)')
+604 | @expect('D212: Multi-line docstring summary should start at the first line')
+605 | def one_liner():
+    -     r"""Wrong.
+606 +     r"""
+607 +     Wrong.
+608 | 
+609 |     """
+610 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:615:5
@@ -536,17 +494,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-612 612 |         '(found 3)')
-613 613 | @expect('D212: Multi-line docstring summary should start at the first line')
-614 614 | def one_liner():
-615     |-    """Wrong."
-    615 |+    """
-    616 |+    Wrong."
-616 617 | 
-617 618 |     """
-618 619 | 
+612 |         '(found 3)')
+613 | @expect('D212: Multi-line docstring summary should start at the first line')
+614 | def one_liner():
+    -     """Wrong."
+615 +     """
+616 +     Wrong."
+617 | 
+618 |     """
+619 | 
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:671:5
@@ -561,17 +517,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-668 668 | 
-669 669 | 
-670 670 | def retain_extra_whitespace():
-671     |-    """Summary.
-    671 |+    """
-    672 |+    Summary.
-672 673 | 
-673 674 |         This is overindented
-674 675 |             And so is this, but it we should preserve the extra space on this line relative
+668 | 
+669 | 
+670 | def retain_extra_whitespace():
+    -     """Summary.
+671 +     """
+672 +     Summary.
+673 | 
+674 |         This is overindented
+675 |             And so is this, but it we should preserve the extra space on this line relative
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:680:5
@@ -589,17 +543,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-677 677 | 
-678 678 | 
-679 679 | def retain_extra_whitespace_multiple():
-680     |-    """Summary.
-    680 |+    """
-    681 |+    Summary.
-681 682 | 
-682 683 |         This is overindented
-683 684 |             And so is this, but it we should preserve the extra space on this line relative
+677 | 
+678 | 
+679 | def retain_extra_whitespace_multiple():
+    -     """Summary.
+680 +     """
+681 +     Summary.
+682 | 
+683 |         This is overindented
+684 |             And so is this, but it we should preserve the extra space on this line relative
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:693:5
@@ -617,17 +569,15 @@ D213 [*] Multi-line docstring summary should start at the second line
 701 |   def retain_extra_whitespace_followed_by_same_offset():
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-690 690 | 
-691 691 | 
-692 692 | def retain_extra_whitespace_deeper():
-693     |-    """Summary.
-    693 |+    """
-    694 |+    Summary.
-694 695 | 
-695 696 |         This is overindented
-696 697 |             And so is this, but it we should preserve the extra space on this line relative
+690 | 
+691 | 
+692 | def retain_extra_whitespace_deeper():
+    -     """Summary.
+693 +     """
+694 +     Summary.
+695 | 
+696 |         This is overindented
+697 |             And so is this, but it we should preserve the extra space on this line relative
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:702:5
@@ -643,17 +593,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-699 699 |     """
-700 700 | 
-701 701 | def retain_extra_whitespace_followed_by_same_offset():
-702     |-    """Summary.
-    702 |+    """
-    703 |+    Summary.
-703 704 | 
-704 705 |         This is overindented
-705 706 |             And so is this, but it we should preserve the extra space on this line relative
+699 |     """
+700 | 
+701 | def retain_extra_whitespace_followed_by_same_offset():
+    -     """Summary.
+702 +     """
+703 +     Summary.
+704 | 
+705 |         This is overindented
+706 |             And so is this, but it we should preserve the extra space on this line relative
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:712:5
@@ -668,17 +616,15 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-709 709 | 
-710 710 | 
-711 711 | def retain_extra_whitespace_not_overindented():
-712     |-    """Summary.
-    712 |+    """
-    713 |+    Summary.
-713 714 | 
-714 715 |     This is not overindented
-715 716 |         This is overindented, but since one line is not overindented this should not raise
+709 | 
+710 | 
+711 | def retain_extra_whitespace_not_overindented():
+    -     """Summary.
+712 +     """
+713 +     Summary.
+714 | 
+715 |     This is not overindented
+716 |         This is overindented, but since one line is not overindented this should not raise
 
 D213 [*] Multi-line docstring summary should start at the second line
    --> D.py:721:5
@@ -691,14 +637,12 @@ D213 [*] Multi-line docstring summary should start at the second line
     | |_______^
     |
 help: Insert line break and indentation after opening quotes
-
-ℹ Safe fix
-718 718 | 
-719 719 | 
-720 720 | def inconsistent_indent_byte_size():
-721     |-    """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
-    721 |+    """
-    722 |+    There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
-722 723 | 
-723 724 |        Returns:
-724 725 |     """
+718 | 
+719 | 
+720 | def inconsistent_indent_byte_size():
+    -     """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
+721 +     """
+722 +     There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
+723 | 
+724 |        Returns:
+725 |     """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap
index 19876f408e..76a70d0927 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap
@@ -12,15 +12,13 @@ D214 [*] Section is over-indented ("Returns")
 5 |     valid returns
   |
 help: Remove over-indentation from "Returns"
-
-ℹ Safe fix
-1 1 | """A module docstring with D214 violations
-2 2 | 
-3   |-    Returns
-  3 |+Returns
-4 4 | -----
-5 5 |     valid returns
-6 6 | 
+1 | """A module docstring with D214 violations
+2 | 
+  -     Returns
+3 + Returns
+4 | -----
+5 |     valid returns
+6 | 
 
 D214 [*] Section is over-indented ("Args")
  --> D214_module.py:7:5
@@ -33,13 +31,11 @@ D214 [*] Section is over-indented ("Args")
 9 |     valid args
   |
 help: Remove over-indentation from "Args"
-
-ℹ Safe fix
-4 4 | -----
-5 5 |     valid returns
-6 6 | 
-7   |-    Args
-  7 |+Args
-8 8 | -----
-9 9 |     valid args
-10 10 | """
+4  | -----
+5  |     valid returns
+6  | 
+   -     Args
+7  + Args
+8  | -----
+9  |     valid args
+10 | """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap
index d84cea76af..8853029784 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap
@@ -12,16 +12,14 @@ D214 [*] Section is over-indented ("Returns")
 148 |     A value of some sort.
     |
 help: Remove over-indentation from "Returns"
-
-ℹ Safe fix
-143 143 | def section_overindented():  # noqa: D416
-144 144 |     """Toggle the gizmo.
-145 145 | 
-146     |-        Returns
-    146 |+    Returns
-147 147 |     -------
-148 148 |     A value of some sort.
-149 149 | 
+143 | def section_overindented():  # noqa: D416
+144 |     """Toggle the gizmo.
+145 | 
+    -         Returns
+146 +     Returns
+147 |     -------
+148 |     A value of some sort.
+149 | 
 
 D214 [*] Section is over-indented ("Returns")
    --> sections.py:563:9
@@ -33,13 +31,11 @@ D214 [*] Section is over-indented ("Returns")
 564 |     """
     |
 help: Remove over-indentation from "Returns"
-
-ℹ Safe fix
-560 560 |     Args:
-561 561 |         Here's a note.
-562 562 | 
-563     |-        Returns:
-    563 |+    Returns:
-564 564 |     """
-565 565 | 
-566 566 |
+560 |     Args:
+561 |         Here's a note.
+562 | 
+    -         Returns:
+563 +     Returns:
+564 |     """
+565 | 
+566 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap
index b3d204755b..2d9cb0a76c 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap
@@ -11,10 +11,8 @@ D215 [*] Section underline is over-indented ("TODO")
 4 | """
   |
 help: Remove over-indentation from "TODO" underline
-
-ℹ Safe fix
-1 1 | """
-2 2 | TODO:
-3   |-    -
-  3 |+
-4 4 | """
+1 | """
+2 | TODO:
+  -     -
+3 + 
+4 | """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap
index 6039da3d4a..5b3e878dd6 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap
@@ -10,16 +10,14 @@ D215 [*] Section underline is over-indented ("Returns")
 160 |     A value of some sort.
     |
 help: Remove over-indentation from "Returns" underline
-
-ℹ Safe fix
-156 156 |     """Toggle the gizmo.
-157 157 | 
-158 158 |     Returns
-159     |-        -------
-    159 |+    ------
-160 160 |     A value of some sort.
-161 161 | 
-162 162 |     """
+156 |     """Toggle the gizmo.
+157 | 
+158 |     Returns
+    -         -------
+159 +     ------
+160 |     A value of some sort.
+161 | 
+162 |     """
 
 D215 [*] Section underline is over-indented ("Returns")
    --> sections.py:173:9
@@ -30,13 +28,11 @@ D215 [*] Section underline is over-indented ("Returns")
 174 |     """
     |
 help: Remove over-indentation from "Returns" underline
-
-ℹ Safe fix
-170 170 |     """Toggle the gizmo.
-171 171 | 
-172 172 |     Returns
-173     |-        -------
-    173 |+    ------
-174 174 |     """
-175 175 | 
-176 176 |
+170 |     """Toggle the gizmo.
+171 | 
+172 |     Returns
+    -         -------
+173 +     ------
+174 |     """
+175 | 
+176 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap
index f2ecfcbc5e..5d32d79d4d 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap
@@ -10,16 +10,14 @@ D300 [*] Use triple double quotes `"""`
     |     ^^^^^^^^^^^^^^^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-304 304 | 
-305 305 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)')
-306 306 | def triple_single_quotes_raw():
-307     |-    r'''Summary.'''
-    307 |+    r"""Summary."""
-308 308 | 
-309 309 | 
-310 310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)')
+304 | 
+305 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)')
+306 | def triple_single_quotes_raw():
+    -     r'''Summary.'''
+307 +     r"""Summary."""
+308 | 
+309 | 
+310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)')
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:312:5
@@ -30,16 +28,14 @@ D300 [*] Use triple double quotes `"""`
     |     ^^^^^^^^^^^^^^^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-309 309 | 
-310 310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)')
-311 311 | def triple_single_quotes_raw_uppercase():
-312     |-    R'''Summary.'''
-    312 |+    R"""Summary."""
-313 313 | 
-314 314 | 
-315 315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
+309 | 
+310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)')
+311 | def triple_single_quotes_raw_uppercase():
+    -     R'''Summary.'''
+312 +     R"""Summary."""
+313 | 
+314 | 
+315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:317:5
@@ -50,16 +46,14 @@ D300 [*] Use triple double quotes `"""`
     |     ^^^^^^^^^^^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-314 314 | 
-315 315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
-316 316 | def single_quotes_raw():
-317     |-    r'Summary.'
-    317 |+    r"""Summary."""
-318 318 | 
-319 319 | 
-320 320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
+314 | 
+315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
+316 | def single_quotes_raw():
+    -     r'Summary.'
+317 +     r"""Summary."""
+318 | 
+319 | 
+320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:322:5
@@ -70,16 +64,14 @@ D300 [*] Use triple double quotes `"""`
     |     ^^^^^^^^^^^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-319 319 | 
-320 320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
-321 321 | def single_quotes_raw_uppercase():
-322     |-    R'Summary.'
-    322 |+    R"""Summary."""
-323 323 | 
-324 324 | 
-325 325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
+319 | 
+320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
+321 | def single_quotes_raw_uppercase():
+    -     R'Summary.'
+322 +     R"""Summary."""
+323 | 
+324 | 
+325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:328:5
@@ -90,16 +82,14 @@ D300 [*] Use triple double quotes `"""`
     |     ^^^^^^^^^^^^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-325 325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
-326 326 | @expect('D301: Use r""" if any backslashes in a docstring')
-327 327 | def single_quotes_raw_uppercase_backslash():
-328     |-    R'Sum\mary.'
-    328 |+    R"""Sum\mary."""
-329 329 | 
-330 330 | 
-331 331 | @expect('D301: Use r""" if any backslashes in a docstring')
+325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)')
+326 | @expect('D301: Use r""" if any backslashes in a docstring')
+327 | def single_quotes_raw_uppercase_backslash():
+    -     R'Sum\mary.'
+328 +     R"""Sum\mary."""
+329 | 
+330 | 
+331 | @expect('D301: Use r""" if any backslashes in a docstring')
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:645:5
@@ -112,18 +102,16 @@ D300 [*] Use triple double quotes `"""`
 648 |   class StatementOnSameLineAsDocstring:
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-642 642 | 
-643 643 | 
-644 644 | def single_line_docstring_with_an_escaped_backslash():
-645     |-    "\
-646     |-    "
-    645 |+    """\
-    646 |+    """
-647 647 | 
-648 648 | class StatementOnSameLineAsDocstring:
-649 649 |     "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
+642 | 
+643 | 
+644 | def single_line_docstring_with_an_escaped_backslash():
+    -     "\
+    -     "
+645 +     """\
+646 +     """
+647 | 
+648 | class StatementOnSameLineAsDocstring:
+649 |     "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:649:5
@@ -135,16 +123,14 @@ D300 [*] Use triple double quotes `"""`
 651 |         pass
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-646 646 |     "
-647 647 | 
-648 648 | class StatementOnSameLineAsDocstring:
-649     |-    "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
-    649 |+    """After this docstring there's another statement on the same line separated by a semicolon.""" ; priorities=1
-650 650 |     def sort_services(self):
-651 651 |         pass
-652 652 | 
+646 |     "
+647 | 
+648 | class StatementOnSameLineAsDocstring:
+    -     "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
+649 +     """After this docstring there's another statement on the same line separated by a semicolon.""" ; priorities=1
+650 |     def sort_services(self):
+651 |         pass
+652 | 
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:654:5
@@ -154,16 +140,14 @@ D300 [*] Use triple double quotes `"""`
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-651 651 |         pass
-652 652 | 
-653 653 | class StatementOnSameLineAsDocstring:
-654     |-    "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
-    654 |+    """After this docstring there's another statement on the same line separated by a semicolon."""; priorities=1
-655 655 | 
-656 656 | 
-657 657 | class CommentAfterDocstring:
+651 |         pass
+652 | 
+653 | class StatementOnSameLineAsDocstring:
+    -     "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
+654 +     """After this docstring there's another statement on the same line separated by a semicolon."""; priorities=1
+655 | 
+656 | 
+657 | class CommentAfterDocstring:
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:658:5
@@ -175,16 +159,14 @@ D300 [*] Use triple double quotes `"""`
 660 |         pass
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-655 655 | 
-656 656 | 
-657 657 | class CommentAfterDocstring:
-658     |-    "After this docstring there's a comment."  # priorities=1
-    658 |+    """After this docstring there's a comment."""  # priorities=1
-659 659 |     def sort_services(self):
-660 660 |         pass
-661 661 | 
+655 | 
+656 | 
+657 | class CommentAfterDocstring:
+    -     "After this docstring there's a comment."  # priorities=1
+658 +     """After this docstring there's a comment."""  # priorities=1
+659 |     def sort_services(self):
+660 |         pass
+661 | 
 
 D300 [*] Use triple double quotes `"""`
    --> D.py:664:5
@@ -195,15 +177,13 @@ D300 [*] Use triple double quotes `"""`
     | |_________________________________________________________^
     |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-661 661 | 
-662 662 | 
-663 663 | def newline_after_closing_quote(self):
-664     |-    "We enforce a newline after the closing quote for a multi-line docstring \
-665     |-    but continuations shouldn't be considered multi-line"
-    664 |+    """We enforce a newline after the closing quote for a multi-line docstring \
-    665 |+    but continuations shouldn't be considered multi-line"""
-666 666 | 
-667 667 | 
-668 668 |
+661 | 
+662 | 
+663 | def newline_after_closing_quote(self):
+    -     "We enforce a newline after the closing quote for a multi-line docstring \
+    -     but continuations shouldn't be considered multi-line"
+664 +     """We enforce a newline after the closing quote for a multi-line docstring \
+665 +     but continuations shouldn't be considered multi-line"""
+666 | 
+667 | 
+668 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap
index 8aa4ccb908..69baa65bee 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap
@@ -18,13 +18,11 @@ D300 [*] Use triple double quotes `"""`
    |     ^^^^^^^^^^^^^
    |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-7  7  | 
-8  8  | 
-9  9  | def contains_quote():
-10    |-    'Sum"\\mary.'
-   10 |+    """Sum"\\mary."""
-11 11 | 
-12 12 | 
-13 13 | # OK
+7  | 
+8  | 
+9  | def contains_quote():
+   -     'Sum"\\mary.'
+10 +     """Sum"\\mary."""
+11 | 
+12 | 
+13 | # OK
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap
index 72289dc8b2..8fed86924c 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap
@@ -10,13 +10,12 @@ D301 [*] Use `r"""` if any backslashes in a docstring
     |     ^^^^^^^^^^^^^^^^
     |
 help: Add `r` prefix
-
-ℹ Unsafe fix
-330 330 | 
-331 331 | @expect('D301: Use r""" if any backslashes in a docstring')
-332 332 | def double_quotes_backslash():
-333     |-    """Sum\\mary."""
-    333 |+    r"""Sum\\mary."""
-334 334 | 
-335 335 | 
-336 336 | @expect('D301: Use r""" if any backslashes in a docstring')
+330 | 
+331 | @expect('D301: Use r""" if any backslashes in a docstring')
+332 | def double_quotes_backslash():
+    -     """Sum\\mary."""
+333 +     r"""Sum\\mary."""
+334 | 
+335 | 
+336 | @expect('D301: Use r""" if any backslashes in a docstring')
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap
index 984047111e..1d87a1179a 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap
@@ -9,14 +9,13 @@ D301 [*] Use `r"""` if any backslashes in a docstring
   |     ^^^^^^^^^^^^^^^^
   |
 help: Add `r` prefix
-
-ℹ Unsafe fix
-1 1 | def double_quotes_backslash():
-2   |-    """Sum\\mary."""
-  2 |+    r"""Sum\\mary."""
-3 3 | 
-4 4 | 
-5 5 | def double_quotes_backslash_raw():
+1 | def double_quotes_backslash():
+  -     """Sum\\mary."""
+2 +     r"""Sum\\mary."""
+3 | 
+4 | 
+5 | def double_quotes_backslash_raw():
+note: This is an unsafe fix and may change runtime behavior
 
 D301 Use `r"""` if any backslashes in a docstring
   --> D301.py:37:5
@@ -37,16 +36,15 @@ D301 [*] Use `r"""` if any backslashes in a docstring
    | |_______^
    |
 help: Add `r` prefix
-
-ℹ Unsafe fix
-90 90 | 
-91 91 | 
-92 92 | def should_add_raw_for_single_double_quote_escape():
-93    |-    """
-   93 |+    r"""
-94 94 |     This is single quote escape \".
-95 95 |     """
-96 96 | 
+90 | 
+91 | 
+92 | def should_add_raw_for_single_double_quote_escape():
+   -     """
+93 +     r"""
+94 |     This is single quote escape \".
+95 |     """
+96 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D301 [*] Use `r"""` if any backslashes in a docstring
    --> D301.py:99:5
@@ -58,12 +56,11 @@ D301 [*] Use `r"""` if any backslashes in a docstring
     | |_______^
     |
 help: Add `r` prefix
-
-ℹ Unsafe fix
-96  96  | 
-97  97  | 
-98  98  | def should_add_raw_for_single_single_quote_escape():
-99      |-    '''
-    99  |+    r'''
-100 100 |     This is single quote escape \'.
-101 101 |     '''
+96  | 
+97  | 
+98  | def should_add_raw_for_single_single_quote_escape():
+    -     '''
+99  +     r'''
+100 |     This is single quote escape \'.
+101 |     '''
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap
index 4c97147f52..f3ce740ea0 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap
@@ -10,16 +10,15 @@ D400 [*] First line should end with a period
     |     ^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-352 352 | @expect("D415: First line should end with a period, question mark, "
-353 353 |         "or exclamation point (not 'y')")
-354 354 | def lwnlkjl():
-355     |-    """Summary"""
-    355 |+    """Summary."""
-356 356 | 
-357 357 | 
-358 358 | @expect("D401: First line should be in imperative mood "
+352 | @expect("D415: First line should end with a period, question mark, "
+353 |         "or exclamation point (not 'y')")
+354 | def lwnlkjl():
+    -     """Summary"""
+355 +     """Summary."""
+356 | 
+357 | 
+358 | @expect("D401: First line should be in imperative mood "
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:406:25
@@ -30,16 +29,15 @@ D400 [*] First line should end with a period
     |                         ^^^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-403 403 | @expect("D400: First line should end with a period (not 'r')")
-404 404 | @expect("D415: First line should end with a period, question mark,"
-405 405 |         " or exclamation point (not 'r')")
-406     |-def oneliner_withdoc(): """One liner"""
-    406 |+def oneliner_withdoc(): """One liner."""
-407 407 | 
-408 408 | 
-409 409 | def ignored_decorator(func):   # noqa: D400,D401,D415
+403 | @expect("D400: First line should end with a period (not 'r')")
+404 | @expect("D415: First line should end with a period, question mark,"
+405 |         " or exclamation point (not 'r')")
+    - def oneliner_withdoc(): """One liner"""
+406 + def oneliner_withdoc(): """One liner."""
+407 | 
+408 | 
+409 | def ignored_decorator(func):   # noqa: D400,D401,D415
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:410:5
@@ -51,16 +49,15 @@ D400 [*] First line should end with a period
 412 |     pass
     |
 help: Add period
-
-ℹ Unsafe fix
-407 407 | 
-408 408 | 
-409 409 | def ignored_decorator(func):   # noqa: D400,D401,D415
-410     |-    """Runs something"""
-    410 |+    """Runs something."""
-411 411 |     func()
-412 412 |     pass
-413 413 | 
+407 | 
+408 | 
+409 | def ignored_decorator(func):   # noqa: D400,D401,D415
+    -     """Runs something"""
+410 +     """Runs something."""
+411 |     func()
+412 |     pass
+413 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:416:5
@@ -72,16 +69,15 @@ D400 [*] First line should end with a period
 418 |     pass
     |
 help: Add period
-
-ℹ Unsafe fix
-413 413 | 
-414 414 | 
-415 415 | def decorator_for_test(func):   # noqa: D400,D401,D415
-416     |-    """Runs something"""
-    416 |+    """Runs something."""
-417 417 |     func()
-418 418 |     pass
-419 419 | 
+413 | 
+414 | 
+415 | def decorator_for_test(func):   # noqa: D400,D401,D415
+    -     """Runs something"""
+416 +     """Runs something."""
+417 |     func()
+418 |     pass
+419 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:422:35
@@ -91,16 +87,15 @@ D400 [*] First line should end with a period
     |                                   ^^^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-419 419 | 
-420 420 | 
-421 421 | @ignored_decorator
-422     |-def oneliner_ignored_decorator(): """One liner"""
-    422 |+def oneliner_ignored_decorator(): """One liner."""
-423 423 | 
-424 424 | 
-425 425 | @decorator_for_test
+419 | 
+420 | 
+421 | @ignored_decorator
+    - def oneliner_ignored_decorator(): """One liner"""
+422 + def oneliner_ignored_decorator(): """One liner."""
+423 | 
+424 | 
+425 | @decorator_for_test
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:429:49
@@ -111,16 +106,15 @@ D400 [*] First line should end with a period
     |                                                 ^^^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-426 426 | @expect("D400: First line should end with a period (not 'r')")
-427 427 | @expect("D415: First line should end with a period, question mark,"
-428 428 |         " or exclamation point (not 'r')")
-429     |-def oneliner_with_decorator_expecting_errors(): """One liner"""
-    429 |+def oneliner_with_decorator_expecting_errors(): """One liner."""
-430 430 | 
-431 431 | 
-432 432 | @decorator_for_test
+426 | @expect("D400: First line should end with a period (not 'r')")
+427 | @expect("D415: First line should end with a period, question mark,"
+428 |         " or exclamation point (not 'r')")
+    - def oneliner_with_decorator_expecting_errors(): """One liner"""
+429 + def oneliner_with_decorator_expecting_errors(): """One liner."""
+430 | 
+431 | 
+432 | @decorator_for_test
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:470:5
@@ -132,16 +126,15 @@ D400 [*] First line should end with a period
 471 |     pass
     |
 help: Add period
-
-ℹ Unsafe fix
-467 467 | @expect("D415: First line should end with a period, question mark, "
-468 468 |         "or exclamation point (not 'g')")
-469 469 | def docstring_bad():
-470     |-    """Runs something"""
-    470 |+    """Runs something."""
-471 471 |     pass
-472 472 | 
-473 473 | 
+467 | @expect("D415: First line should end with a period, question mark, "
+468 |         "or exclamation point (not 'g')")
+469 | def docstring_bad():
+    -     """Runs something"""
+470 +     """Runs something."""
+471 |     pass
+472 | 
+473 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:475:5
@@ -152,16 +145,15 @@ D400 [*] First line should end with a period
 476 |     pass
     |
 help: Add period
-
-ℹ Unsafe fix
-472 472 | 
-473 473 | 
-474 474 | def docstring_bad_ignore_all():  # noqa
-475     |-    """Runs something"""
-    475 |+    """Runs something."""
-476 476 |     pass
-477 477 | 
-478 478 | 
+472 | 
+473 | 
+474 | def docstring_bad_ignore_all():  # noqa
+    -     """Runs something"""
+475 +     """Runs something."""
+476 |     pass
+477 | 
+478 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:480:5
@@ -172,16 +164,15 @@ D400 [*] First line should end with a period
 481 |     pass
     |
 help: Add period
-
-ℹ Unsafe fix
-477 477 | 
-478 478 | 
-479 479 | def docstring_bad_ignore_one():  # noqa: D400,D401,D415
-480     |-    """Runs something"""
-    480 |+    """Runs something."""
-481 481 |     pass
-482 482 | 
-483 483 | 
+477 | 
+478 | 
+479 | def docstring_bad_ignore_one():  # noqa: D400,D401,D415
+    -     """Runs something"""
+480 +     """Runs something."""
+481 |     pass
+482 | 
+483 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:487:5
@@ -193,16 +184,15 @@ D400 [*] First line should end with a period
 488 |     pass
     |
 help: Add period
-
-ℹ Unsafe fix
-484 484 | @expect("D401: First line should be in imperative mood "
-485 485 |         "(perhaps 'Run', not 'Runs')")
-486 486 | def docstring_ignore_some_violations_but_catch_D401():  # noqa: E501,D400,D415
-487     |-    """Runs something"""
-    487 |+    """Runs something."""
-488 488 |     pass
-489 489 | 
-490 490 | 
+484 | @expect("D401: First line should be in imperative mood "
+485 |         "(perhaps 'Run', not 'Runs')")
+486 | def docstring_ignore_some_violations_but_catch_D401():  # noqa: E501,D400,D415
+    -     """Runs something"""
+487 +     """Runs something."""
+488 |     pass
+489 | 
+490 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 First line should end with a period
    --> D.py:514:5
@@ -222,16 +212,15 @@ D400 [*] First line should end with a period
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-517 517 | @expect("D415: First line should end with a period, question mark, "
-518 518 |         "or exclamation point (not 'g')")
-519 519 | def bad_google_string():  # noqa: D400
-520     |-    """Test a valid something"""
-    520 |+    """Test a valid something."""
-521 521 | 
-522 522 | 
-523 523 | # This is reproducing a bug where AttributeError is raised when parsing class
+517 | @expect("D415: First line should end with a period, question mark, "
+518 |         "or exclamation point (not 'g')")
+519 | def bad_google_string():  # noqa: D400
+    -     """Test a valid something"""
+520 +     """Test a valid something."""
+521 | 
+522 | 
+523 | # This is reproducing a bug where AttributeError is raised when parsing class
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:581:5
@@ -242,16 +231,15 @@ D400 [*] First line should end with a period
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-578 578 | @expect("D415: First line should end with a period, question mark, "
-579 579 |         "or exclamation point (not '\"')")
-580 580 | def endswith_quote():
-581     |-    """Whitespace at the end, but also a quote" """
-    581 |+    """Whitespace at the end, but also a quote". """
-582 582 | 
-583 583 | 
-584 584 | @expect('D209: Multi-line docstring closing quotes should be on a separate '
+578 | @expect("D415: First line should end with a period, question mark, "
+579 |         "or exclamation point (not '\"')")
+580 | def endswith_quote():
+    -     """Whitespace at the end, but also a quote" """
+581 +     """Whitespace at the end, but also a quote". """
+582 | 
+583 | 
+584 | @expect('D209: Multi-line docstring closing quotes should be on a separate '
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:615:5
@@ -264,16 +252,15 @@ D400 [*] First line should end with a period
     | |_______^
     |
 help: Add period
-
-ℹ Unsafe fix
-612 612 |         '(found 3)')
-613 613 | @expect('D212: Multi-line docstring summary should start at the first line')
-614 614 | def one_liner():
-615     |-    """Wrong."
-    615 |+    """Wrong.".
-616 616 | 
-617 617 |     """
-618 618 | 
+612 |         '(found 3)')
+613 | @expect('D212: Multi-line docstring summary should start at the first line')
+614 | def one_liner():
+    -     """Wrong."
+615 +     """Wrong.".
+616 | 
+617 |     """
+618 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:639:17
@@ -284,16 +271,15 @@ D400 [*] First line should end with a period
 641 | def same_line(): """This is a docstring on the same line"""
     |
 help: Add period
-
-ℹ Unsafe fix
-636 636 |     """ This is a docstring that starts with a space."""  # noqa: D210
-637 637 | 
-638 638 | 
-639     |-class SameLine: """This is a docstring on the same line"""
-    639 |+class SameLine: """This is a docstring on the same line."""
-640 640 | 
-641 641 | def same_line(): """This is a docstring on the same line"""
-642 642 | 
+636 |     """ This is a docstring that starts with a space."""  # noqa: D210
+637 | 
+638 | 
+    - class SameLine: """This is a docstring on the same line"""
+639 + class SameLine: """This is a docstring on the same line."""
+640 | 
+641 | def same_line(): """This is a docstring on the same line"""
+642 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:641:18
@@ -304,16 +290,15 @@ D400 [*] First line should end with a period
     |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add period
-
-ℹ Unsafe fix
-638 638 | 
-639 639 | class SameLine: """This is a docstring on the same line"""
-640 640 | 
-641     |-def same_line(): """This is a docstring on the same line"""
-    641 |+def same_line(): """This is a docstring on the same line."""
-642 642 | 
-643 643 | 
-644 644 | def single_line_docstring_with_an_escaped_backslash():
+638 | 
+639 | class SameLine: """This is a docstring on the same line"""
+640 | 
+    - def same_line(): """This is a docstring on the same line"""
+641 + def same_line(): """This is a docstring on the same line."""
+642 | 
+643 | 
+644 | def single_line_docstring_with_an_escaped_backslash():
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D.py:664:5
@@ -324,13 +309,12 @@ D400 [*] First line should end with a period
     | |_________________________________________________________^
     |
 help: Add period
-
-ℹ Unsafe fix
-662 662 | 
-663 663 | def newline_after_closing_quote(self):
-664 664 |     "We enforce a newline after the closing quote for a multi-line docstring \
-665     |-    but continuations shouldn't be considered multi-line"
-    665 |+    but continuations shouldn't be considered multi-line."
-666 666 | 
-667 667 | 
-668 668 |
+662 | 
+663 | def newline_after_closing_quote(self):
+664 |     "We enforce a newline after the closing quote for a multi-line docstring \
+    -     but continuations shouldn't be considered multi-line"
+665 +     but continuations shouldn't be considered multi-line."
+666 | 
+667 | 
+668 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap
index 096ffb22e5..a3db38099d 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap
@@ -10,14 +10,13 @@ D400 [*] First line should end with a period
 3 |     ...
   |
 help: Add period
-
-ℹ Unsafe fix
-1 1 | def f():
-2   |-    "Here's a line without a period"
-  2 |+    "Here's a line without a period."
-3 3 |     ...
-4 4 | 
-5 5 | 
+1 | def f():
+  -     "Here's a line without a period"
+2 +     "Here's a line without a period."
+3 |     ...
+4 | 
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
  --> D400.py:7:5
@@ -28,16 +27,15 @@ D400 [*] First line should end with a period
 8 |     ...
   |
 help: Add period
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | def f():
-7   |-    """Here's a line without a period"""
-  7 |+    """Here's a line without a period."""
-8 8 |     ...
-9 9 | 
-10 10 | 
+4  | 
+5  | 
+6  | def f():
+   -     """Here's a line without a period"""
+7  +     """Here's a line without a period."""
+8  |     ...
+9  | 
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:12:5
@@ -51,16 +49,15 @@ D400 [*] First line should end with a period
 16 |       ...
    |
 help: Add period
-
-ℹ Unsafe fix
-11 11 | def f():
-12 12 |     """
-13 13 |     Here's a line without a period,
-14    |-    but here's the next line
-   14 |+    but here's the next line.
-15 15 |     """
-16 16 |     ...
-17 17 | 
+11 | def f():
+12 |     """
+13 |     Here's a line without a period,
+   -     but here's the next line
+14 +     but here's the next line.
+15 |     """
+16 |     ...
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:20:5
@@ -71,16 +68,15 @@ D400 [*] First line should end with a period
 21 |     ...
    |
 help: Add period
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    """Here's a line without a period"""
-   20 |+    """Here's a line without a period."""
-21 21 |     ...
-22 22 | 
-23 23 | 
+17 | 
+18 | 
+19 | def f():
+   -     """Here's a line without a period"""
+20 +     """Here's a line without a period."""
+21 |     ...
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:25:5
@@ -93,16 +89,15 @@ D400 [*] First line should end with a period
 28 |       ...
    |
 help: Add period
-
-ℹ Unsafe fix
-24 24 | def f():
-25 25 |     """
-26 26 |     Here's a line without a period,
-27    |-    but here's the next line"""
-   27 |+    but here's the next line."""
-28 28 |     ...
-29 29 | 
-30 30 | 
+24 | def f():
+25 |     """
+26 |     Here's a line without a period,
+   -     but here's the next line"""
+27 +     but here's the next line."""
+28 |     ...
+29 | 
+30 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:32:5
@@ -115,16 +110,15 @@ D400 [*] First line should end with a period
 35 |       ...
    |
 help: Add period
-
-ℹ Unsafe fix
-31 31 | def f():
-32 32 |     """
-33 33 |     Here's a line without a period,
-34    |-    but here's the next line with trailing space """
-   34 |+    but here's the next line with trailing space. """
-35 35 |     ...
-36 36 | 
-37 37 | 
+31 | def f():
+32 |     """
+33 |     Here's a line without a period,
+   -     but here's the next line with trailing space """
+34 +     but here's the next line with trailing space. """
+35 |     ...
+36 | 
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:39:5
@@ -135,16 +129,15 @@ D400 [*] First line should end with a period
 40 |     ...
    |
 help: Add period
-
-ℹ Unsafe fix
-36 36 | 
-37 37 | 
-38 38 | def f():
-39    |-    r"Here's a line without a period"
-   39 |+    r"Here's a line without a period."
-40 40 |     ...
-41 41 | 
-42 42 | 
+36 | 
+37 | 
+38 | def f():
+   -     r"Here's a line without a period"
+39 +     r"Here's a line without a period."
+40 |     ...
+41 | 
+42 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:44:5
@@ -155,16 +148,15 @@ D400 [*] First line should end with a period
 45 |     ...
    |
 help: Add period
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | 
-43 43 | def f():
-44    |-    r"""Here's a line without a period"""
-   44 |+    r"""Here's a line without a period."""
-45 45 |     ...
-46 46 | 
-47 47 | 
+41 | 
+42 | 
+43 | def f():
+   -     r"""Here's a line without a period"""
+44 +     r"""Here's a line without a period."""
+45 |     ...
+46 | 
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:49:5
@@ -178,16 +170,15 @@ D400 [*] First line should end with a period
 53 |       ...
    |
 help: Add period
-
-ℹ Unsafe fix
-48 48 | def f():
-49 49 |     r"""
-50 50 |     Here's a line without a period,
-51    |-    but here's the next line
-   51 |+    but here's the next line.
-52 52 |     """
-53 53 |     ...
-54 54 | 
+48 | def f():
+49 |     r"""
+50 |     Here's a line without a period,
+   -     but here's the next line
+51 +     but here's the next line.
+52 |     """
+53 |     ...
+54 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:57:5
@@ -198,16 +189,15 @@ D400 [*] First line should end with a period
 58 |     ...
    |
 help: Add period
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | 
-56 56 | def f():
-57    |-    r"""Here's a line without a period"""
-   57 |+    r"""Here's a line without a period."""
-58 58 |     ...
-59 59 | 
-60 60 | 
+54 | 
+55 | 
+56 | def f():
+   -     r"""Here's a line without a period"""
+57 +     r"""Here's a line without a period."""
+58 |     ...
+59 | 
+60 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:62:5
@@ -220,16 +210,15 @@ D400 [*] First line should end with a period
 65 |       ...
    |
 help: Add period
-
-ℹ Unsafe fix
-61 61 | def f():
-62 62 |     r"""
-63 63 |     Here's a line without a period,
-64    |-    but here's the next line"""
-   64 |+    but here's the next line."""
-65 65 |     ...
-66 66 | 
-67 67 | 
+61 | def f():
+62 |     r"""
+63 |     Here's a line without a period,
+   -     but here's the next line"""
+64 +     but here's the next line."""
+65 |     ...
+66 | 
+67 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
   --> D400.py:69:5
@@ -242,16 +231,15 @@ D400 [*] First line should end with a period
 72 |       ...
    |
 help: Add period
-
-ℹ Unsafe fix
-68 68 | def f():
-69 69 |     r"""
-70 70 |     Here's a line without a period,
-71    |-    but here's the next line with trailing space """
-   71 |+    but here's the next line with trailing space. """
-72 72 |     ...
-73 73 | 
-74 74 | 
+68 | def f():
+69 |     r"""
+70 |     Here's a line without a period,
+   -     but here's the next line with trailing space """
+71 +     but here's the next line with trailing space. """
+72 |     ...
+73 | 
+74 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D400 [*] First line should end with a period
    --> D400.py:97:5
@@ -266,13 +254,12 @@ D400 [*] First line should end with a period
     | |_______^
     |
 help: Add period
-
-ℹ Unsafe fix
-95 95 | 
-96 96 | def f():
-97 97 |     """
-98    |-    My example
-   98 |+    My example.
-99 99 |     ==========
-100 100 | 
-101 101 |     My example explanation
+95  | 
+96  | def f():
+97  |     """
+    -     My example
+98  +     My example.
+99  |     ==========
+100 | 
+101 |     My example explanation
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap
index 5f64adf444..9945f1290d 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap
@@ -50,11 +50,10 @@ D400 [*] First line should end with a period
 20 |     ...
    |
 help: Add period
-
-ℹ Unsafe fix
-16 16 |     ...
-17 17 | 
-18 18 | def f():
-19    |-    """Here's a line ending with a whitespace  """
-   19 |+    """Here's a line ending with a whitespace.  """
-20 20 |     ...
+16 |     ...
+17 | 
+18 | def f():
+   -     """Here's a line ending with a whitespace  """
+19 +     """Here's a line ending with a whitespace.  """
+20 |     ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap
index a2f48de1d4..7459658816 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap
@@ -11,14 +11,12 @@ D403 [*] First word of the docstring should be capitalized: `this` -> `This`
 4 | def good_function():
   |
 help: Capitalize `this` to `This`
-
-ℹ Safe fix
-1 1 | def bad_function():
-2   |-    """this docstring is not capitalized"""
-  2 |+    """This docstring is not capitalized"""
-3 3 | 
-4 4 | def good_function():
-5 5 |     """This docstring is capitalized."""
+1 | def bad_function():
+  -     """this docstring is not capitalized"""
+2 +     """This docstring is not capitalized"""
+3 | 
+4 | def good_function():
+5 |     """This docstring is capitalized."""
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:30:5
@@ -30,16 +28,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 32 | def single_word_no_dot():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-27 27 |     """th•s is not capitalized."""
-28 28 | 
-29 29 | def single_word():
-30    |-    """singleword."""
-   30 |+    """Singleword."""
-31 31 | 
-32 32 | def single_word_no_dot():
-33 33 |     """singleword"""
+27 |     """th•s is not capitalized."""
+28 | 
+29 | def single_word():
+   -     """singleword."""
+30 +     """Singleword."""
+31 | 
+32 | def single_word_no_dot():
+33 |     """singleword"""
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:33:5
@@ -51,16 +47,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 35 | def first_word_lots_of_whitespace():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-30 30 |     """singleword."""
-31 31 | 
-32 32 | def single_word_no_dot():
-33    |-    """singleword"""
-   33 |+    """Singleword"""
-34 34 | 
-35 35 | def first_word_lots_of_whitespace():
-36 36 |     """
+30 |     """singleword."""
+31 | 
+32 | def single_word_no_dot():
+   -     """singleword"""
+33 +     """Singleword"""
+34 | 
+35 | def first_word_lots_of_whitespace():
+36 |     """
 
 D403 [*] First word of the docstring should be capitalized: `here` -> `Here`
   --> D403.py:36:5
@@ -79,16 +73,14 @@ D403 [*] First word of the docstring should be capitalized: `here` -> `Here`
 45 |   def single_word_newline():
    |
 help: Capitalize `here` to `Here`
-
-ℹ Safe fix
-37 37 | 
-38 38 | 
-39 39 | 
-40    |-    here is the start of my docstring!
-   40 |+    Here is the start of my docstring!
-41 41 | 
-42 42 |     What do you think?    
-43 43 |     """
+37 | 
+38 | 
+39 | 
+   -     here is the start of my docstring!
+40 +     Here is the start of my docstring!
+41 | 
+42 |     What do you think?    
+43 |     """
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:46:5
@@ -102,16 +94,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 50 |   def single_word_dot_newline():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-43 43 |     """
-44 44 | 
-45 45 | def single_word_newline():
-46    |-    """singleword
-   46 |+    """Singleword
-47 47 | 
-48 48 |     """
-49 49 | 
+43 |     """
+44 | 
+45 | def single_word_newline():
+   -     """singleword
+46 +     """Singleword
+47 | 
+48 |     """
+49 | 
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:51:5
@@ -125,16 +115,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 55 |   def single_word_second_line():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-48 48 |     """
-49 49 | 
-50 50 | def single_word_dot_newline():
-51    |-    """singleword.
-   51 |+    """Singleword.
-52 52 | 
-53 53 |     """
-54 54 | 
+48 |     """
+49 | 
+50 | def single_word_dot_newline():
+   -     """singleword.
+51 +     """Singleword.
+52 | 
+53 |     """
+54 | 
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:56:5
@@ -148,16 +136,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 60 |   def single_word_dot_second_line():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-54 54 | 
-55 55 | def single_word_second_line():
-56 56 |     """
-57    |-    singleword
-   57 |+    Singleword
-58 58 |     """
-59 59 | 
-60 60 | def single_word_dot_second_line():
+54 | 
+55 | def single_word_second_line():
+56 |     """
+   -     singleword
+57 +     Singleword
+58 |     """
+59 | 
+60 | def single_word_dot_second_line():
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:61:5
@@ -171,16 +157,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 65 |   def single_word_then_more_text():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-59 59 | 
-60 60 | def single_word_dot_second_line():
-61 61 |     """
-62    |-    singleword.
-   62 |+    Singleword.
-63 63 |     """
-64 64 | 
-65 65 | def single_word_then_more_text():
+59 | 
+60 | def single_word_dot_second_line():
+61 |     """
+   -     singleword.
+62 +     Singleword.
+63 |     """
+64 | 
+65 | def single_word_then_more_text():
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:66:5
@@ -195,16 +179,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 71 |   def single_word_dot_then_more_text():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-63 63 |     """
-64 64 | 
-65 65 | def single_word_then_more_text():
-66    |-    """singleword
-   66 |+    """Singleword
-67 67 | 
-68 68 |     This is more text.
-69 69 |     """
+63 |     """
+64 | 
+65 | def single_word_then_more_text():
+   -     """singleword
+66 +     """Singleword
+67 | 
+68 |     This is more text.
+69 |     """
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:72:5
@@ -219,16 +201,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 77 |   def single_word_second_line_then_more_text():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-69 69 |     """
-70 70 | 
-71 71 | def single_word_dot_then_more_text():
-72    |-    """singleword.
-   72 |+    """Singleword.
-73 73 | 
-74 74 |     This is more text.
-75 75 |     """
+69 |     """
+70 | 
+71 | def single_word_dot_then_more_text():
+   -     """singleword.
+72 +     """Singleword.
+73 | 
+74 |     This is more text.
+75 |     """
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:78:5
@@ -244,16 +224,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
 84 |   def single_word_dot_second_line_then_more_text():
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-76 76 | 
-77 77 | def single_word_second_line_then_more_text():
-78 78 |     """
-79    |-    singleword
-   79 |+    Singleword
-80 80 | 
-81 81 |     This is more text.
-82 82 |     """
+76 | 
+77 | def single_word_second_line_then_more_text():
+78 |     """
+   -     singleword
+79 +     Singleword
+80 | 
+81 |     This is more text.
+82 |     """
 
 D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword`
   --> D403.py:85:5
@@ -267,13 +245,11 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin
    | |_______^
    |
 help: Capitalize `singleword` to `Singleword`
-
-ℹ Safe fix
-83 83 | 
-84 84 | def single_word_dot_second_line_then_more_text():
-85 85 |     """
-86    |-    singleword.
-   86 |+    Singleword.
-87 87 | 
-88 88 |     This is more text.
-89 89 |     """
+83 | 
+84 | def single_word_dot_second_line_then_more_text():
+85 |     """
+   -     singleword.
+86 +     Singleword.
+87 | 
+88 |     This is more text.
+89 |     """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap
index 7a3cecaa19..12b39f0b6e 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap
@@ -12,16 +12,14 @@ D405 [*] Section name should be properly capitalized ("returns")
 21 |     A value of some sort.
    |
 help: Capitalize "returns"
-
-ℹ Safe fix
-16 16 | def not_capitalized():  # noqa: D416
-17 17 |     """Toggle the gizmo.
-18 18 | 
-19    |-    returns
-   19 |+    Returns
-20 20 |     -------
-21 21 |     A value of some sort.
-22 22 | 
+16 | def not_capitalized():  # noqa: D416
+17 |     """Toggle the gizmo.
+18 | 
+   -     returns
+19 +     Returns
+20 |     -------
+21 |     A value of some sort.
+22 | 
 
 D405 [*] Section name should be properly capitalized ("Short summary")
    --> sections.py:218:5
@@ -33,16 +31,14 @@ D405 [*] Section name should be properly capitalized ("Short summary")
 219 |     -------------
     |
 help: Capitalize "Short summary"
-
-ℹ Safe fix
-215 215 | def multiple_sections():  # noqa: D416
-216 216 |     """Toggle the gizmo.
-217 217 | 
-218     |-    Short summary
-    218 |+    Short Summary
-219 219 |     -------------
-220 220 | 
-221 221 |     This is the function's description, which will also specify what it
+215 | def multiple_sections():  # noqa: D416
+216 |     """Toggle the gizmo.
+217 | 
+    -     Short summary
+218 +     Short Summary
+219 |     -------------
+220 | 
+221 |     This is the function's description, which will also specify what it
 
 D405 [*] Section name should be properly capitalized ("returns")
    --> sections.py:573:5
@@ -55,13 +51,11 @@ D405 [*] Section name should be properly capitalized ("returns")
 575 |     """
     |
 help: Capitalize "returns"
-
-ℹ Safe fix
-570 570 |     Args:
-571 571 |         arg: Here's a note.
-572 572 | 
-573     |-    returns:
-    573 |+    Returns:
-574 574 |         Here's another note.
-575 575 |     """
-576 576 |
+570 |     Args:
+571 |         arg: Here's a note.
+572 | 
+    -     returns:
+573 +     Returns:
+574 |         Here's another note.
+575 |     """
+576 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap
index d2f758e3a5..cb5e3a4582 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap
@@ -12,16 +12,14 @@ D406 [*] Section name should end with a newline ("Returns")
 34 |     A value of some sort.
    |
 help: Add newline after "Returns"
-
-ℹ Safe fix
-29 29 | def superfluous_suffix():  # noqa: D416
-30 30 |     """Toggle the gizmo.
-31 31 | 
-32    |-    Returns:
-   32 |+    Returns
-33 33 |     -------
-34 34 |     A value of some sort.
-35 35 | 
+29 | def superfluous_suffix():  # noqa: D416
+30 |     """Toggle the gizmo.
+31 | 
+   -     Returns:
+32 +     Returns
+33 |     -------
+34 |     A value of some sort.
+35 | 
 
 D406 [*] Section name should end with a newline ("Raises")
    --> sections.py:227:5
@@ -33,16 +31,14 @@ D406 [*] Section name should end with a newline ("Raises")
 228 |     My attention.
     |
 help: Add newline after "Raises"
-
-ℹ Safe fix
-224 224 |     Returns
-225 225 |     ------
-226 226 |     Many many wonderful things.
-227     |-    Raises:
-    227 |+    Raises
-228 228 |     My attention.
-229 229 | 
-230 230 |     """
+224 |     Returns
+225 |     ------
+226 |     Many many wonderful things.
+    -     Raises:
+227 +     Raises
+228 |     My attention.
+229 | 
+230 |     """
 
 D406 [*] Section name should end with a newline ("Parameters")
    --> sections.py:601:5
@@ -55,13 +51,11 @@ D406 [*] Section name should end with a newline ("Parameters")
 603 |     parameters:
     |
 help: Add newline after "Parameters"
-
-ℹ Safe fix
-598 598 | def test_lowercase_sub_section_header_should_be_valid(parameters: list[str], value: int):  # noqa: D213
-599 599 |     """Test that lower case subsection header is valid even if it has the same name as section kind.
-600 600 | 
-601     |-    Parameters:
-    601 |+    Parameters
-602 602 |     ----------
-603 603 |     parameters:
-604 604 |         A list of string parameters
+598 | def test_lowercase_sub_section_header_should_be_valid(parameters: list[str], value: int):  # noqa: D213
+599 |     """Test that lower case subsection header is valid even if it has the same name as section kind.
+600 | 
+    -     Parameters:
+601 +     Parameters
+602 |     ----------
+603 |     parameters:
+604 |         A list of string parameters
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap
index 6a46781233..66af4769f3 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap
@@ -11,15 +11,13 @@ D407 [*] Missing dashed underline after section ("Returns")
 45 |     A value of some sort.
    |
 help: Add dashed line under "Returns"
-
-ℹ Safe fix
-42 42 |     """Toggle the gizmo.
-43 43 | 
-44 44 |     Returns
-   45 |+    -------
-45 46 |     A value of some sort.
-46 47 | 
-47 48 |     """
+42 |     """Toggle the gizmo.
+43 | 
+44 |     Returns
+45 +     -------
+46 |     A value of some sort.
+47 | 
+48 |     """
 
 D407 [*] Missing dashed underline after section ("Returns")
   --> sections.py:56:5
@@ -32,15 +30,13 @@ D407 [*] Missing dashed underline after section ("Returns")
 58 |     """
    |
 help: Add dashed line under "Returns"
-
-ℹ Safe fix
-54 54 |     """Toggle the gizmo.
-55 55 | 
-56 56 |     Returns
-   57 |+    -------
-57 58 | 
-58 59 |     """
-59 60 | 
+54 |     """Toggle the gizmo.
+55 | 
+56 |     Returns
+57 +     -------
+58 | 
+59 |     """
+60 | 
 
 D407 [*] Missing dashed underline after section ("Returns")
   --> sections.py:67:5
@@ -51,17 +47,15 @@ D407 [*] Missing dashed underline after section ("Returns")
    |     ^^^^^^^
    |
 help: Add dashed line under "Returns"
-
-ℹ Safe fix
-64 64 | def no_underline_and_no_newline():  # noqa: D416
-65 65 |     """Toggle the gizmo.
-66 66 | 
-67    |-    Returns"""
-   67 |+    Returns
-   68 |+    -------"""
-68 69 | 
-69 70 | 
-70 71 | @expect(_D213)
+64 | def no_underline_and_no_newline():  # noqa: D416
+65 |     """Toggle the gizmo.
+66 | 
+   -     Returns"""
+67 +     Returns
+68 +     -------"""
+69 | 
+70 | 
+71 | @expect(_D213)
 
 D407 [*] Missing dashed underline after section ("Raises")
    --> sections.py:227:5
@@ -73,15 +67,13 @@ D407 [*] Missing dashed underline after section ("Raises")
 228 |     My attention.
     |
 help: Add dashed line under "Raises"
-
-ℹ Safe fix
-225 225 |     ------
-226 226 |     Many many wonderful things.
-227 227 |     Raises:
-    228 |+    ------
-228 229 |     My attention.
-229 230 | 
-230 231 |     """
+225 |     ------
+226 |     Many many wonderful things.
+227 |     Raises:
+228 +     ------
+229 |     My attention.
+230 | 
+231 |     """
 
 D407 [*] Missing dashed underline after section ("Parameters")
    --> sections.py:522:5
@@ -92,16 +84,14 @@ D407 [*] Missing dashed underline after section ("Parameters")
 523 |     """
     |
 help: Add dashed line under "Parameters"
-
-ℹ Safe fix
-519 519 |     """Equal length equals should be replaced with dashes.
-520 520 | 
-521 521 |     Parameters
-522     |-    ==========
-    522 |+    ----------
-523 523 |     """
-524 524 | 
-525 525 | 
+519 |     """Equal length equals should be replaced with dashes.
+520 | 
+521 |     Parameters
+    -     ==========
+522 +     ----------
+523 |     """
+524 | 
+525 | 
 
 D407 [*] Missing dashed underline after section ("Parameters")
    --> sections.py:530:5
@@ -112,16 +102,14 @@ D407 [*] Missing dashed underline after section ("Parameters")
 531 |     """
     |
 help: Add dashed line under "Parameters"
-
-ℹ Safe fix
-527 527 |     """Here, the length of equals is not the same.
-528 528 | 
-529 529 |     Parameters
-530     |-    ===========
-    530 |+    ----------
-531 531 |     """
-532 532 | 
-533 533 | 
+527 |     """Here, the length of equals is not the same.
+528 | 
+529 |     Parameters
+    -     ===========
+530 +     ----------
+531 |     """
+532 | 
+533 | 
 
 D407 [*] Missing dashed underline after section ("Parameters")
    --> sections.py:613:4
@@ -134,12 +122,10 @@ D407 [*] Missing dashed underline after section ("Parameters")
 615 |    returns:
     |
 help: Add dashed line under "Parameters"
-
-ℹ Safe fix
-611 611 |    """Test that lower case subsection header is valid even if it is of a different kind.
-612 612 | 
-613 613 |    Parameters
-    614 |+   ----------
-614 615 |    -‐-----------------
-615 616 |    returns:
-616 617 |        some value
+611 |    """Test that lower case subsection header is valid even if it is of a different kind.
+612 | 
+613 |    Parameters
+614 +    ----------
+615 |    -‐-----------------
+616 |    returns:
+617 |        some value
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap
index 4ebd79bda4..3a668bc5ae 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap
@@ -11,12 +11,10 @@ D408 [*] Section underline should be in the line following the section's name ("
 99 |     A value of some sort.
    |
 help: Add underline to "Returns"
-
-ℹ Safe fix
-94 94 |     """Toggle the gizmo.
-95 95 | 
-96 96 |     Returns
-97    |-
-98 97 |     -------
-99 98 |     A value of some sort.
-100 99 |
+94 |     """Toggle the gizmo.
+95 | 
+96 |     Returns
+   - 
+97 |     -------
+98 |     A value of some sort.
+99 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap
index a87eb5ac32..cdb27b3d52 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap
@@ -10,16 +10,14 @@ D409 [*] Section underline should match the length of its name ("Returns")
 112 |     A value of some sort.
     |
 help: Adjust underline length to match "Returns"
-
-ℹ Safe fix
-108 108 |     """Toggle the gizmo.
-109 109 | 
-110 110 |     Returns
-111     |-    --
-    111 |+    -------
-112 112 |     A value of some sort.
-113 113 | 
-114 114 |     """
+108 |     """Toggle the gizmo.
+109 | 
+110 |     Returns
+    -     --
+111 +     -------
+112 |     A value of some sort.
+113 | 
+114 |     """
 
 D409 [*] Section underline should match the length of its name ("Returns")
    --> sections.py:225:5
@@ -31,16 +29,14 @@ D409 [*] Section underline should match the length of its name ("Returns")
 227 |     Raises:
     |
 help: Adjust underline length to match "Returns"
-
-ℹ Safe fix
-222 222 |     returns.
-223 223 | 
-224 224 |     Returns
-225     |-    ------
-    225 |+    -------
-226 226 |     Many many wonderful things.
-227 227 |     Raises:
-228 228 |     My attention.
+222 |     returns.
+223 | 
+224 |     Returns
+    -     ------
+225 +     -------
+226 |     Many many wonderful things.
+227 |     Raises:
+228 |     My attention.
 
 D409 [*] Section underline should match the length of its name ("Other Parameters")
    --> sections.py:589:5
@@ -52,13 +48,11 @@ D409 [*] Section underline should match the length of its name ("Other Parameter
 591 |         A dictionary of string attributes
     |
 help: Adjust underline length to match "Other Parameters"
-
-ℹ Safe fix
-586 586 |         A dictionary of string attributes
-587 587 | 
-588 588 |     Other Parameters
-589     |-    ----------
-    589 |+    ----------------
-590 590 |     other_parameters:
-591 591 |         A dictionary of string attributes
-592 592 |     parameters:
+586 |         A dictionary of string attributes
+587 | 
+588 |     Other Parameters
+    -     ----------
+589 +     ----------------
+590 |     other_parameters:
+591 |         A dictionary of string attributes
+592 |     parameters:
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap
index d4cba2ca9f..5b6c02d505 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap
@@ -12,15 +12,13 @@ D410 [*] Missing blank line after section ("Parameters")
 6 |     a : int
   |
 help: Add blank line after "Parameters"
-
-ℹ Safe fix
-7  7  |         _description_
-8  8  |     b : int
-9  9  |         _description_
-   10 |+
-10 11 |     Returns
-11 12 |     -------
-12 13 |     int
+7  |         _description_
+8  |     b : int
+9  |         _description_
+10 + 
+11 |     Returns
+12 |     -------
+13 |     int
 
 D410 [*] Missing blank line after section ("Parameters")
   --> D410.py:21:5
@@ -33,12 +31,10 @@ D410 [*] Missing blank line after section ("Parameters")
 23 |     Returns
    |
 help: Add blank line after "Parameters"
-
-ℹ Safe fix
-20 20 | 
-21 21 |     Parameters
-22 22 |     ----------
-   23 |+
-23 24 |     Returns
-24 25 |     -------
-25 26 |     """
+20 | 
+21 |     Parameters
+22 |     ----------
+23 + 
+24 |     Returns
+25 |     -------
+26 |     """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap
index efd8950322..ac9a6968a8 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap
@@ -12,15 +12,13 @@ D410 [*] Missing blank line after section ("Returns")
 80 |     Yields
    |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-77 77 | 
-78 78 |     Returns
-79 79 |     -------
-   80 |+
-80 81 |     Yields
-81 82 |     ------
-82 83 | 
+77 | 
+78 |     Returns
+79 |     -------
+80 + 
+81 |     Yields
+82 |     ------
+83 | 
 
 D410 [*] Missing blank line after section ("Returns")
    --> sections.py:224:5
@@ -33,12 +31,10 @@ D410 [*] Missing blank line after section ("Returns")
 226 |     Many many wonderful things.
     |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-224 224 |     Returns
-225 225 |     ------
-226 226 |     Many many wonderful things.
-    227 |+
-227 228 |     Raises:
-228 229 |     My attention.
-229 230 |
+224 |     Returns
+225 |     ------
+226 |     Many many wonderful things.
+227 + 
+228 |     Raises:
+229 |     My attention.
+230 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap
index f4b40fa690..4a12abe6e5 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap
@@ -11,15 +11,13 @@ D411 [*] Missing blank line before section ("Yields")
 81 |     ------
    |
 help: Add blank line before "Yields"
-
-ℹ Safe fix
-77 77 | 
-78 78 |     Returns
-79 79 |     -------
-   80 |+
-80 81 |     Yields
-81 82 |     ------
-82 83 | 
+77 | 
+78 |     Returns
+79 |     -------
+80 + 
+81 |     Yields
+82 |     ------
+83 | 
 
 D411 [*] Missing blank line before section ("Returns")
    --> sections.py:134:5
@@ -31,15 +29,13 @@ D411 [*] Missing blank line before section ("Returns")
 136 |     A value of some sort.
     |
 help: Add blank line before "Returns"
-
-ℹ Safe fix
-131 131 |     """Toggle the gizmo.
-132 132 | 
-133 133 |     The function's description.
-    134 |+
-134 135 |     Returns
-135 136 |     -------
-136 137 |     A value of some sort.
+131 |     """Toggle the gizmo.
+132 | 
+133 |     The function's description.
+134 + 
+135 |     Returns
+136 |     -------
+137 |     A value of some sort.
 
 D411 [*] Missing blank line before section ("Raises")
    --> sections.py:227:5
@@ -51,12 +47,10 @@ D411 [*] Missing blank line before section ("Raises")
 228 |     My attention.
     |
 help: Add blank line before "Raises"
-
-ℹ Safe fix
-224 224 |     Returns
-225 225 |     ------
-226 226 |     Many many wonderful things.
-    227 |+
-227 228 |     Raises:
-228 229 |     My attention.
-229 230 |
+224 |     Returns
+225 |     ------
+226 |     Many many wonderful things.
+227 + 
+228 |     Raises:
+229 |     My attention.
+230 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap
index 715e1abb87..40bad80d92 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap
@@ -11,12 +11,10 @@ D412 [*] No blank lines allowed between a section header and its content ("Short
 219 |     -------------
     |
 help: Remove blank line(s)
-
-ℹ Safe fix
-217 217 | 
-218 218 |     Short summary
-219 219 |     -------------
-220     |-
-221 220 |     This is the function's description, which will also specify what it
-222 221 |     returns.
-223 222 |
+217 | 
+218 |     Short summary
+219 |     -------------
+    - 
+220 |     This is the function's description, which will also specify what it
+221 |     returns.
+222 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap
index 98b536302c..67cc310129 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap
@@ -10,15 +10,13 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp
    |     ^^^^^^^
    |
 help: Remove blank line(s)
-
-ℹ Safe fix
-12 12 |     """
-13 13 |     Example:
-14 14 | 
-15    |-
-16 15 |     .. code-block:: python
-17 16 | 
-18 17 |         import foo
+12 |     """
+13 |     Example:
+14 | 
+   - 
+15 |     .. code-block:: python
+16 | 
+17 |         import foo
 
 D412 [*] No blank lines allowed between a section header and its content ("Example")
   --> sphinx.py:24:5
@@ -29,16 +27,14 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp
    |     ^^^^^^^
    |
 help: Remove blank line(s)
-
-ℹ Safe fix
-23 23 |     """
-24 24 |     Example:
-25 25 | 
-26    |-
-27    |-
-28 26 |     .. code-block:: python
-29 27 | 
-30 28 |         import foo
+23 |     """
+24 |     Example:
+25 | 
+   - 
+   - 
+26 |     .. code-block:: python
+27 | 
+28 |         import foo
 
 D412 [*] No blank lines allowed between a section header and its content ("Example")
   --> sphinx.py:47:5
@@ -50,15 +46,13 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp
 48 |     -------
    |
 help: Remove blank line(s)
-
-ℹ Safe fix
-47 47 |     Example
-48 48 |     -------
-49 49 | 
-50    |-
-51 50 |     .. code-block:: python
-52 51 | 
-53 52 |         import foo
+47 |     Example
+48 |     -------
+49 | 
+   - 
+50 |     .. code-block:: python
+51 | 
+52 |         import foo
 
 D412 [*] No blank lines allowed between a section header and its content ("Example")
   --> sphinx.py:59:5
@@ -70,13 +64,11 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp
 60 |     -------
    |
 help: Remove blank line(s)
-
-ℹ Safe fix
-59 59 |     Example
-60 60 |     -------
-61 61 | 
-62    |-
-63    |-
-64 62 |     .. code-block:: python
-65 63 | 
-66 64 |         import foo
+59 |     Example
+60 |     -------
+61 | 
+   - 
+   - 
+62 |     .. code-block:: python
+63 | 
+64 |         import foo
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap
index 0830634d78..d0f44e907a 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap
@@ -12,15 +12,13 @@ D413 [*] Missing blank line after last section ("Returns")
 9 | """
   |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-6  6  | 
-7  7  | Returns:
-8  8  |     the value
-   9  |+
-9  10 | """
-10 11 | 
-11 12 | 
+6  | 
+7  | Returns:
+8  |     the value
+9  + 
+10 | """
+11 | 
+12 | 
 
 D413 [*] Missing blank line after last section ("Returns")
   --> D413.py:19:5
@@ -33,15 +31,13 @@ D413 [*] Missing blank line after last section ("Returns")
 21 |     """
    |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-18 18 | 
-19 19 |     Returns:
-20 20 |         the value
-   21 |+
-21 22 |     """
-22 23 | 
-23 24 | 
+18 | 
+19 |     Returns:
+20 |         the value
+21 + 
+22 |     """
+23 | 
+24 | 
 
 D413 [*] Missing blank line after last section ("Returns")
   --> D413.py:58:5
@@ -53,18 +49,16 @@ D413 [*] Missing blank line after last section ("Returns")
 59 |         the value"""
    |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-56 56 |             with a hanging indent
-57 57 | 
-58 58 |     Returns:
-59    |-        the value"""
-   59 |+        the value
-   60 |+
-   61 |+    """
-60 62 | 
-61 63 | 
-62 64 | def func():
+56 |             with a hanging indent
+57 | 
+58 |     Returns:
+   -         the value"""
+59 +         the value
+60 + 
+61 +     """
+62 | 
+63 | 
+64 | def func():
 
 D413 [*] Missing blank line after last section ("Returns")
   --> D413.py:69:5
@@ -77,18 +71,16 @@ D413 [*] Missing blank line after last section ("Returns")
 71 |         """
    |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-68 68 | 
-69 69 |     Returns:
-70 70 |         the value
-71    |-        """
-72 71 | 
-   72 |+    """
-   73 |+
-73 74 | 
-74 75 | def func():
-75 76 |     ("""Docstring.
+68 | 
+69 |     Returns:
+70 |         the value
+   -         """
+71 | 
+72 +     """
+73 + 
+74 | 
+75 | def func():
+76 |     ("""Docstring.
 
 D413 [*] Missing blank line after last section ("Raises")
   --> D413.py:77:5
@@ -101,10 +93,8 @@ D413 [*] Missing blank line after last section ("Raises")
 79 |     """)
    |
 help: Add blank line after "Raises"
-
-ℹ Safe fix
-76 76 | 
-77 77 |     Raises:
-78 78 |         ValueError: An error.
-   79 |+
-79 80 |     """)
+76 | 
+77 |     Raises:
+78 |         ValueError: An error.
+79 + 
+80 |     """)
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap
index ac2dba9162..0bad62bf08 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap
@@ -10,18 +10,16 @@ D413 [*] Missing blank line after last section ("Returns")
    |     ^^^^^^^
    |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-64 64 | def no_underline_and_no_newline():  # noqa: D416
-65 65 |     """Toggle the gizmo.
-66 66 | 
-67    |-    Returns"""
-   67 |+    Returns
-   68 |+
-   69 |+    """
-68 70 | 
-69 71 | 
-70 72 | @expect(_D213)
+64 | def no_underline_and_no_newline():  # noqa: D416
+65 |     """Toggle the gizmo.
+66 | 
+   -     Returns"""
+67 +     Returns
+68 + 
+69 +     """
+70 | 
+71 | 
+72 | @expect(_D213)
 
 D413 [*] Missing blank line after last section ("Returns")
    --> sections.py:122:5
@@ -34,15 +32,13 @@ D413 [*] Missing blank line after last section ("Returns")
 124 |     A value of some sort.
     |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-122 122 |     Returns
-123 123 |     -------
-124 124 |     A value of some sort.
-    125 |+
-125 126 |     """
-126 127 | 
-127 128 | 
+122 |     Returns
+123 |     -------
+124 |     A value of some sort.
+125 + 
+126 |     """
+127 | 
+128 | 
 
 D413 [*] Missing blank line after last section ("Returns")
    --> sections.py:172:5
@@ -55,15 +51,13 @@ D413 [*] Missing blank line after last section ("Returns")
 174 |     """
     |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-171 171 | 
-172 172 |     Returns
-173 173 |         -------
-    174 |+
-174 175 |     """
-175 176 | 
-176 177 | 
+171 | 
+172 |     Returns
+173 |         -------
+174 + 
+175 |     """
+176 | 
+177 | 
 
 D413 [*] Missing blank line after last section ("Parameters")
    --> sections.py:521:5
@@ -76,15 +70,13 @@ D413 [*] Missing blank line after last section ("Parameters")
 523 |     """
     |
 help: Add blank line after "Parameters"
-
-ℹ Safe fix
-520 520 | 
-521 521 |     Parameters
-522 522 |     ==========
-    523 |+
-523 524 |     """
-524 525 | 
-525 526 | 
+520 | 
+521 |     Parameters
+522 |     ==========
+523 + 
+524 |     """
+525 | 
+526 | 
 
 D413 [*] Missing blank line after last section ("Parameters")
    --> sections.py:529:5
@@ -97,15 +89,13 @@ D413 [*] Missing blank line after last section ("Parameters")
 531 |     """
     |
 help: Add blank line after "Parameters"
-
-ℹ Safe fix
-528 528 | 
-529 529 |     Parameters
-530 530 |     ===========
-    531 |+
-531 532 |     """
-532 533 | 
-533 534 | 
+528 | 
+529 |     Parameters
+530 |     ===========
+531 + 
+532 |     """
+533 | 
+534 | 
 
 D413 [*] Missing blank line after last section ("Args")
    --> sections.py:550:5
@@ -117,15 +107,13 @@ D413 [*] Missing blank line after last section ("Args")
 551 |         Here's a note.
     |
 help: Add blank line after "Args"
-
-ℹ Safe fix
-551 551 |         Here's a note.
-552 552 | 
-553 553 |         returns:
-    554 |+
-554 555 |     """
-555 556 | 
-556 557 | 
+551 |         Here's a note.
+552 | 
+553 |         returns:
+554 + 
+555 |     """
+556 | 
+557 | 
 
 D413 [*] Missing blank line after last section ("Returns")
    --> sections.py:563:9
@@ -137,15 +125,13 @@ D413 [*] Missing blank line after last section ("Returns")
 564 |     """
     |
 help: Add blank line after "Returns"
-
-ℹ Safe fix
-561 561 |         Here's a note.
-562 562 | 
-563 563 |         Returns:
-    564 |+
-564 565 |     """
-565 566 | 
-566 567 | 
+561 |         Here's a note.
+562 | 
+563 |         Returns:
+564 + 
+565 |     """
+566 | 
+567 | 
 
 D413 [*] Missing blank line after last section ("returns")
    --> sections.py:573:5
@@ -158,15 +144,13 @@ D413 [*] Missing blank line after last section ("returns")
 575 |     """
     |
 help: Add blank line after "returns"
-
-ℹ Safe fix
-572 572 | 
-573 573 |     returns:
-574 574 |         Here's another note.
-    575 |+
-575 576 |     """
-576 577 | 
-577 578 | 
+572 | 
+573 |     returns:
+574 |         Here's another note.
+575 + 
+576 |     """
+577 | 
+578 | 
 
 D413 [*] Missing blank line after last section ("Parameters")
    --> sections.py:601:5
@@ -179,12 +163,10 @@ D413 [*] Missing blank line after last section ("Parameters")
 603 |     parameters:
     |
 help: Add blank line after "Parameters"
-
-ℹ Safe fix
-604 604 |         A list of string parameters
-605 605 |     value:
-606 606 |         Some value
-    607 |+
-607 608 |     """
-608 609 | 
-609 610 |
+604 |         A list of string parameters
+605 |     value:
+606 |         Some value
+607 + 
+608 |     """
+609 | 
+610 |
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap
index f342894e32..119389116a 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap
@@ -10,16 +10,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |     ^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-352 352 | @expect("D415: First line should end with a period, question mark, "
-353 353 |         "or exclamation point (not 'y')")
-354 354 | def lwnlkjl():
-355     |-    """Summary"""
-    355 |+    """Summary."""
-356 356 | 
-357 357 | 
-358 358 | @expect("D401: First line should be in imperative mood "
+352 | @expect("D415: First line should end with a period, question mark, "
+353 |         "or exclamation point (not 'y')")
+354 | def lwnlkjl():
+    -     """Summary"""
+355 +     """Summary."""
+356 | 
+357 | 
+358 | @expect("D401: First line should be in imperative mood "
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:406:25
@@ -30,16 +29,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |                         ^^^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-403 403 | @expect("D400: First line should end with a period (not 'r')")
-404 404 | @expect("D415: First line should end with a period, question mark,"
-405 405 |         " or exclamation point (not 'r')")
-406     |-def oneliner_withdoc(): """One liner"""
-    406 |+def oneliner_withdoc(): """One liner."""
-407 407 | 
-408 408 | 
-409 409 | def ignored_decorator(func):   # noqa: D400,D401,D415
+403 | @expect("D400: First line should end with a period (not 'r')")
+404 | @expect("D415: First line should end with a period, question mark,"
+405 |         " or exclamation point (not 'r')")
+    - def oneliner_withdoc(): """One liner"""
+406 + def oneliner_withdoc(): """One liner."""
+407 | 
+408 | 
+409 | def ignored_decorator(func):   # noqa: D400,D401,D415
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:410:5
@@ -51,16 +49,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 412 |     pass
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-407 407 | 
-408 408 | 
-409 409 | def ignored_decorator(func):   # noqa: D400,D401,D415
-410     |-    """Runs something"""
-    410 |+    """Runs something."""
-411 411 |     func()
-412 412 |     pass
-413 413 | 
+407 | 
+408 | 
+409 | def ignored_decorator(func):   # noqa: D400,D401,D415
+    -     """Runs something"""
+410 +     """Runs something."""
+411 |     func()
+412 |     pass
+413 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:416:5
@@ -72,16 +69,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 418 |     pass
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-413 413 | 
-414 414 | 
-415 415 | def decorator_for_test(func):   # noqa: D400,D401,D415
-416     |-    """Runs something"""
-    416 |+    """Runs something."""
-417 417 |     func()
-418 418 |     pass
-419 419 | 
+413 | 
+414 | 
+415 | def decorator_for_test(func):   # noqa: D400,D401,D415
+    -     """Runs something"""
+416 +     """Runs something."""
+417 |     func()
+418 |     pass
+419 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:422:35
@@ -91,16 +87,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |                                   ^^^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-419 419 | 
-420 420 | 
-421 421 | @ignored_decorator
-422     |-def oneliner_ignored_decorator(): """One liner"""
-    422 |+def oneliner_ignored_decorator(): """One liner."""
-423 423 | 
-424 424 | 
-425 425 | @decorator_for_test
+419 | 
+420 | 
+421 | @ignored_decorator
+    - def oneliner_ignored_decorator(): """One liner"""
+422 + def oneliner_ignored_decorator(): """One liner."""
+423 | 
+424 | 
+425 | @decorator_for_test
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:429:49
@@ -111,16 +106,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |                                                 ^^^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-426 426 | @expect("D400: First line should end with a period (not 'r')")
-427 427 | @expect("D415: First line should end with a period, question mark,"
-428 428 |         " or exclamation point (not 'r')")
-429     |-def oneliner_with_decorator_expecting_errors(): """One liner"""
-    429 |+def oneliner_with_decorator_expecting_errors(): """One liner."""
-430 430 | 
-431 431 | 
-432 432 | @decorator_for_test
+426 | @expect("D400: First line should end with a period (not 'r')")
+427 | @expect("D415: First line should end with a period, question mark,"
+428 |         " or exclamation point (not 'r')")
+    - def oneliner_with_decorator_expecting_errors(): """One liner"""
+429 + def oneliner_with_decorator_expecting_errors(): """One liner."""
+430 | 
+431 | 
+432 | @decorator_for_test
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:470:5
@@ -132,16 +126,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 471 |     pass
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-467 467 | @expect("D415: First line should end with a period, question mark, "
-468 468 |         "or exclamation point (not 'g')")
-469 469 | def docstring_bad():
-470     |-    """Runs something"""
-    470 |+    """Runs something."""
-471 471 |     pass
-472 472 | 
-473 473 | 
+467 | @expect("D415: First line should end with a period, question mark, "
+468 |         "or exclamation point (not 'g')")
+469 | def docstring_bad():
+    -     """Runs something"""
+470 +     """Runs something."""
+471 |     pass
+472 | 
+473 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:475:5
@@ -152,16 +145,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 476 |     pass
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-472 472 | 
-473 473 | 
-474 474 | def docstring_bad_ignore_all():  # noqa
-475     |-    """Runs something"""
-    475 |+    """Runs something."""
-476 476 |     pass
-477 477 | 
-478 478 | 
+472 | 
+473 | 
+474 | def docstring_bad_ignore_all():  # noqa
+    -     """Runs something"""
+475 +     """Runs something."""
+476 |     pass
+477 | 
+478 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:480:5
@@ -172,16 +164,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 481 |     pass
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-477 477 | 
-478 478 | 
-479 479 | def docstring_bad_ignore_one():  # noqa: D400,D401,D415
-480     |-    """Runs something"""
-    480 |+    """Runs something."""
-481 481 |     pass
-482 482 | 
-483 483 | 
+477 | 
+478 | 
+479 | def docstring_bad_ignore_one():  # noqa: D400,D401,D415
+    -     """Runs something"""
+480 +     """Runs something."""
+481 |     pass
+482 | 
+483 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:487:5
@@ -193,16 +184,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 488 |     pass
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-484 484 | @expect("D401: First line should be in imperative mood "
-485 485 |         "(perhaps 'Run', not 'Runs')")
-486 486 | def docstring_ignore_some_violations_but_catch_D401():  # noqa: E501,D400,D415
-487     |-    """Runs something"""
-    487 |+    """Runs something."""
-488 488 |     pass
-489 489 | 
-490 490 | 
+484 | @expect("D401: First line should be in imperative mood "
+485 |         "(perhaps 'Run', not 'Runs')")
+486 | def docstring_ignore_some_violations_but_catch_D401():  # noqa: E501,D400,D415
+    -     """Runs something"""
+487 +     """Runs something."""
+488 |     pass
+489 | 
+490 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:520:5
@@ -213,16 +203,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-517 517 | @expect("D415: First line should end with a period, question mark, "
-518 518 |         "or exclamation point (not 'g')")
-519 519 | def bad_google_string():  # noqa: D400
-520     |-    """Test a valid something"""
-    520 |+    """Test a valid something."""
-521 521 | 
-522 522 | 
-523 523 | # This is reproducing a bug where AttributeError is raised when parsing class
+517 | @expect("D415: First line should end with a period, question mark, "
+518 |         "or exclamation point (not 'g')")
+519 | def bad_google_string():  # noqa: D400
+    -     """Test a valid something"""
+520 +     """Test a valid something."""
+521 | 
+522 | 
+523 | # This is reproducing a bug where AttributeError is raised when parsing class
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:581:5
@@ -233,16 +222,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-578 578 | @expect("D415: First line should end with a period, question mark, "
-579 579 |         "or exclamation point (not '\"')")
-580 580 | def endswith_quote():
-581     |-    """Whitespace at the end, but also a quote" """
-    581 |+    """Whitespace at the end, but also a quote". """
-582 582 | 
-583 583 | 
-584 584 | @expect('D209: Multi-line docstring closing quotes should be on a separate '
+578 | @expect("D415: First line should end with a period, question mark, "
+579 |         "or exclamation point (not '\"')")
+580 | def endswith_quote():
+    -     """Whitespace at the end, but also a quote" """
+581 +     """Whitespace at the end, but also a quote". """
+582 | 
+583 | 
+584 | @expect('D209: Multi-line docstring closing quotes should be on a separate '
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:615:5
@@ -255,16 +243,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     | |_______^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-612 612 |         '(found 3)')
-613 613 | @expect('D212: Multi-line docstring summary should start at the first line')
-614 614 | def one_liner():
-615     |-    """Wrong."
-    615 |+    """Wrong.".
-616 616 | 
-617 617 |     """
-618 618 | 
+612 |         '(found 3)')
+613 | @expect('D212: Multi-line docstring summary should start at the first line')
+614 | def one_liner():
+    -     """Wrong."
+615 +     """Wrong.".
+616 | 
+617 |     """
+618 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:639:17
@@ -275,16 +262,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 641 | def same_line(): """This is a docstring on the same line"""
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-636 636 |     """ This is a docstring that starts with a space."""  # noqa: D210
-637 637 | 
-638 638 | 
-639     |-class SameLine: """This is a docstring on the same line"""
-    639 |+class SameLine: """This is a docstring on the same line."""
-640 640 | 
-641 641 | def same_line(): """This is a docstring on the same line"""
-642 642 | 
+636 |     """ This is a docstring that starts with a space."""  # noqa: D210
+637 | 
+638 | 
+    - class SameLine: """This is a docstring on the same line"""
+639 + class SameLine: """This is a docstring on the same line."""
+640 | 
+641 | def same_line(): """This is a docstring on the same line"""
+642 | 
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:641:18
@@ -295,16 +281,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-638 638 | 
-639 639 | class SameLine: """This is a docstring on the same line"""
-640 640 | 
-641     |-def same_line(): """This is a docstring on the same line"""
-    641 |+def same_line(): """This is a docstring on the same line."""
-642 642 | 
-643 643 | 
-644 644 | def single_line_docstring_with_an_escaped_backslash():
+638 | 
+639 | class SameLine: """This is a docstring on the same line"""
+640 | 
+    - def same_line(): """This is a docstring on the same line"""
+641 + def same_line(): """This is a docstring on the same line."""
+642 | 
+643 | 
+644 | def single_line_docstring_with_an_escaped_backslash():
+note: This is an unsafe fix and may change runtime behavior
 
 D415 [*] First line should end with a period, question mark, or exclamation point
    --> D.py:664:5
@@ -315,13 +300,12 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
     | |_________________________________________________________^
     |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-662 662 | 
-663 663 | def newline_after_closing_quote(self):
-664 664 |     "We enforce a newline after the closing quote for a multi-line docstring \
-665     |-    but continuations shouldn't be considered multi-line"
-    665 |+    but continuations shouldn't be considered multi-line."
-666 666 | 
-667 667 | 
-668 668 |
+662 | 
+663 | def newline_after_closing_quote(self):
+664 |     "We enforce a newline after the closing quote for a multi-line docstring \
+    -     but continuations shouldn't be considered multi-line"
+665 +     but continuations shouldn't be considered multi-line."
+666 | 
+667 | 
+668 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap
index eba6769802..cdaf36bc26 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap
@@ -30,11 +30,10 @@ D415 [*] First line should end with a period, question mark, or exclamation poin
 20 |     ...
    |
 help: Add closing punctuation
-
-ℹ Unsafe fix
-16 16 |     ...
-17 17 | 
-18 18 | def f():
-19    |-    """Here's a line ending with a whitespace  """
-   19 |+    """Here's a line ending with a whitespace.  """
-20 20 |     ...
+16 |     ...
+17 | 
+18 | def f():
+   -     """Here's a line ending with a whitespace  """
+19 +     """Here's a line ending with a whitespace.  """
+20 |     ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap
index 5c3bf3e0bd..134327fe30 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap
@@ -8,7 +8,5 @@ D300 [*] Use triple double quotes `"""`
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Convert to triple double quotes
-
-ℹ Safe fix
-1   |-''' SAM macro definitions '''
-  1 |+""" SAM macro definitions """
+  - ''' SAM macro definitions '''
+1 + """ SAM macro definitions """
diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap
index 262bc67768..cd1e64586a 100644
--- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap
+++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap
@@ -10,13 +10,11 @@ D209 [*] Multi-line docstring closing quotes should be on a separate line
   | |________________________________________________________________________^
   |
 help: Move closing quotes to new line
-
-ℹ Safe fix
-1 1 | def lorem():
-2 2 |     """lorem ipsum dolor sit amet consectetur adipiscing elit
-3   |-    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"""
-  3 |+    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua
-  4 |+    """
+1 | def lorem():
+2 |     """lorem ipsum dolor sit amet consectetur adipiscing elit
+  -     sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"""
+3 +     sed do eiusmod tempor incididunt ut labore et dolore magna aliqua
+4 +     """
 
 D400 [*] First line should end with a period
  --> D209_D400.py:2:5
@@ -27,9 +25,8 @@ D400 [*] First line should end with a period
   | |________________________________________________________________________^
   |
 help: Add period
-
-ℹ Unsafe fix
-1 1 | def lorem():
-2 2 |     """lorem ipsum dolor sit amet consectetur adipiscing elit
-3   |-    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"""
-  3 |+    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."""
+1 | def lorem():
+2 |     """lorem ipsum dolor sit amet consectetur adipiscing elit
+  -     sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"""
+3 +     sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."""
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/mod.rs b/crates/ruff_linter/src/rules/pyflakes/mod.rs
index 2aa8104d6b..3dd7edde65 100644
--- a/crates/ruff_linter/src/rules/pyflakes/mod.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/mod.rs
@@ -29,7 +29,7 @@ mod tests {
     use crate::settings::{LinterSettings, flags};
     use crate::source_kind::SourceKind;
     use crate::test::{test_contents, test_path, test_snippet};
-    use crate::{Locator, assert_diagnostics, directives};
+    use crate::{Locator, assert_diagnostics, assert_diagnostics_diff, directives};
 
     #[test_case(Rule::UnusedImport, Path::new("F401_0.py"))]
     #[test_case(Rule::UnusedImport, Path::new("F401_1.py"))]
@@ -376,6 +376,170 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::UnusedImport, Path::new("F401_35.py"))]
+    fn f401_allowed_unused_imports_top_level_module(rule_code: Rule, path: &Path) -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("pyflakes").join(path).as_path(),
+            &LinterSettings {
+                pyflakes: pyflakes::settings::Settings {
+                    allowed_unused_imports: vec!["hvplot".to_string()],
+                    ..pyflakes::settings::Settings::default()
+                },
+                ..LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(diagnostics);
+        Ok(())
+    }
+
+    #[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::UnusedImport, Path::new("F401_18.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_19.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_20.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_21.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_22.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_23.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_32.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_34.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_35.py"))]
+    fn f401_preview_refined_submodule_handling_diffs(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("preview_diff__{}", path.to_string_lossy());
+        assert_diagnostics_diff!(
+            snapshot,
+            Path::new("pyflakes").join(path).as_path(),
+            &LinterSettings::for_rule(rule_code),
+            &LinterSettings {
+                preview: PreviewMode::Enabled,
+                ..LinterSettings::for_rule(rule_code)
+            }
+        );
+        Ok(())
+    }
+
+    #[test_case(
+        r"
+        import a
+        import a.b
+        import a.c",
+        "f401_multiple_unused_submodules"
+    )]
+    #[test_case(
+        r"
+        import a
+        import a.b
+        a.foo()",
+        "f401_use_top_member"
+    )]
+    #[test_case(
+        r"
+        import a
+        import a.b
+        a.foo()
+        a.bar()",
+        "f401_use_top_member_twice"
+    )]
+    #[test_case(
+        r"
+        # reverts to stable behavior - used between imports
+        import a
+        a.foo()
+        import a.b",
+        "f401_use_top_member_before_second_import"
+    )]
+    #[test_case(
+        r"
+        # reverts to stable behavior - used between imports
+        import a
+        a.foo()
+        a = 1
+        import a.b",
+        "f401_use_top_member_and_redefine_before_second_import"
+    )]
+    #[test_case(
+        r"
+        # reverts to stable behavior - used between imports
+        import a
+        a.foo()
+        import a.b
+        a = 1",
+        "f401_use_top_member_then_import_then_redefine"
+    )]
+    #[test_case(
+        r#"
+        import a
+        import a.b
+        __all__ = ["a"]"#,
+        "f401_use_in_dunder_all"
+    )]
+    #[test_case(
+        r"
+        import a.c
+        import a.b
+        a.foo()",
+        "f401_import_submodules_but_use_top_level"
+    )]
+    #[test_case(
+        r"
+        import a.c
+        import a.b.d
+        a.foo()",
+        "f401_import_submodules_different_lengths_but_use_top_level"
+    )]
+    #[test_case(
+        r"
+        # refined logic only applied _within_ scope
+        import a
+        def foo():
+            import a.b
+            a.foo()",
+        "f401_import_submodules_in_function_scope"
+    )]
+    #[test_case(
+        r"
+        # reverts to stable behavior - used between bindings
+        import a
+        a.b
+        import a.b",
+        "f401_use_in_between_imports"
+    )]
+    #[test_case(
+        r"
+        # reverts to stable behavior - used between bindings
+        import a.b
+        a
+        import a",
+        "f401_use_in_between_imports"
+    )]
+    fn f401_preview_refined_submodule_handling(contents: &str, snapshot: &str) {
+        let diagnostics = test_contents(
+            &SourceKind::Python(dedent(contents).to_string()),
+            Path::new("f401_preview_submodule.py"),
+            &LinterSettings {
+                preview: PreviewMode::Enabled,
+                ..LinterSettings::for_rule(Rule::UnusedImport)
+            },
+        )
+        .0;
+        assert_diagnostics!(snapshot, diagnostics);
+    }
+
     #[test]
     fn f841_dummy_variable_rgx() -> Result<()> {
         let diagnostics = test_path(
@@ -737,6 +901,7 @@ mod tests {
 
     /// A re-implementation of the Pyflakes test runner.
     /// Note that all tests marked with `#[ignore]` should be considered TODOs.
+    #[track_caller]
     fn flakes(contents: &str, expected: &[Rule]) {
         let contents = dedent(contents);
         let source_type = PySourceType::default();
@@ -771,7 +936,7 @@ mod tests {
             &parsed,
             target_version,
         );
-        messages.sort_by_key(|diagnostic| diagnostic.expect_range().start());
+        messages.sort_by(Diagnostic::ruff_start_ordering);
         let actual = messages
             .iter()
             .filter(|msg| !msg.is_invalid_syntax())
@@ -903,6 +1068,42 @@ mod tests {
         flakes("__annotations__", &[]);
     }
 
+    #[test]
+    fn module_warningregistry() {
+        // Using __warningregistry__ should not be considered undefined.
+        flakes("__warningregistry__", &[]);
+    }
+
+    #[test]
+    fn module_annotate_py314_available() {
+        // __annotate__ is available starting in Python 3.14.
+        let diagnostics = crate::test::test_snippet(
+            "__annotate__",
+            &crate::settings::LinterSettings {
+                unresolved_target_version: ruff_python_ast::PythonVersion::PY314.into(),
+                ..crate::settings::LinterSettings::for_rules(vec![
+                    crate::codes::Rule::UndefinedName,
+                ])
+            },
+        );
+        assert!(diagnostics.is_empty());
+    }
+
+    #[test]
+    fn module_annotate_pre_py314_undefined() {
+        // __annotate__ is not available before Python 3.14.
+        let diagnostics = crate::test::test_snippet(
+            "__annotate__",
+            &crate::settings::LinterSettings {
+                unresolved_target_version: ruff_python_ast::PythonVersion::PY313.into(),
+                ..crate::settings::LinterSettings::for_rules(vec![
+                    crate::codes::Rule::UndefinedName,
+                ])
+            },
+        );
+        assert_eq!(diagnostics.len(), 1);
+    }
+
     #[test]
     fn magic_globals_file() {
         // Use of the C{__file__} magic global should not emit an undefined name
@@ -3568,7 +3769,7 @@ lambda: fu
         def f(a: A) -> A: pass
         class A: pass
         ",
-            &[Rule::UndefinedName, Rule::UndefinedName],
+            &[],
         );
         flakes(
             r"
@@ -3582,7 +3783,7 @@ lambda: fu
         a: A
         class A: pass
         ",
-            &[Rule::UndefinedName],
+            &[],
         );
         flakes(
             r"
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/assert_tuple.rs b/crates/ruff_linter/src/rules/pyflakes/rules/assert_tuple.rs
index 798f9bb990..1884a2e6cf 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/assert_tuple.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/assert_tuple.rs
@@ -28,6 +28,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `assert` statement](https://docs.python.org/3/reference/simple_stmts.html#the-assert-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct AssertTuple;
 
 impl Violation for AssertTuple {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/break_outside_loop.rs b/crates/ruff_linter/src/rules/pyflakes/rules/break_outside_loop.rs
index 88b77c2cb4..834d63f730 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/break_outside_loop.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/break_outside_loop.rs
@@ -1,9 +1,6 @@
-use ruff_python_ast::{self as ast, Stmt};
-
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_text_size::Ranged;
 
-use crate::{Violation, checkers::ast::Checker};
+use crate::Violation;
 
 /// ## What it does
 /// Checks for `break` statements outside of loops.
@@ -21,6 +18,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## References
 /// - [Python documentation: `break`](https://docs.python.org/3/reference/simple_stmts.html#the-break-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.36")]
 pub(crate) struct BreakOutsideLoop;
 
 impl Violation for BreakOutsideLoop {
@@ -29,28 +27,3 @@ impl Violation for BreakOutsideLoop {
         "`break` outside loop".to_string()
     }
 }
-
-/// F701
-pub(crate) fn break_outside_loop<'a>(
-    checker: &Checker,
-    stmt: &'a Stmt,
-    parents: &mut impl Iterator<Item = &'a Stmt>,
-) {
-    let mut child = stmt;
-    for parent in parents {
-        match parent {
-            Stmt::For(ast::StmtFor { orelse, .. }) | Stmt::While(ast::StmtWhile { orelse, .. }) => {
-                if !orelse.contains(child) {
-                    return;
-                }
-            }
-            Stmt::FunctionDef(_) | Stmt::ClassDef(_) => {
-                break;
-            }
-            _ => {}
-        }
-        child = parent;
-    }
-
-    checker.report_diagnostic(BreakOutsideLoop, stmt.range());
-}
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/continue_outside_loop.rs b/crates/ruff_linter/src/rules/pyflakes/rules/continue_outside_loop.rs
index a6e426b9d5..4e775f3ccd 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/continue_outside_loop.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/continue_outside_loop.rs
@@ -1,9 +1,6 @@
-use ruff_python_ast::{self as ast, Stmt};
-
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_text_size::Ranged;
 
-use crate::{Violation, checkers::ast::Checker};
+use crate::Violation;
 
 /// ## What it does
 /// Checks for `continue` statements outside of loops.
@@ -21,6 +18,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## References
 /// - [Python documentation: `continue`](https://docs.python.org/3/reference/simple_stmts.html#the-continue-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.36")]
 pub(crate) struct ContinueOutsideLoop;
 
 impl Violation for ContinueOutsideLoop {
@@ -29,28 +27,3 @@ impl Violation for ContinueOutsideLoop {
         "`continue` not properly in loop".to_string()
     }
 }
-
-/// F702
-pub(crate) fn continue_outside_loop<'a>(
-    checker: &Checker,
-    stmt: &'a Stmt,
-    parents: &mut impl Iterator<Item = &'a Stmt>,
-) {
-    let mut child = stmt;
-    for parent in parents {
-        match parent {
-            Stmt::For(ast::StmtFor { orelse, .. }) | Stmt::While(ast::StmtWhile { orelse, .. }) => {
-                if !orelse.contains(child) {
-                    return;
-                }
-            }
-            Stmt::FunctionDef(_) | Stmt::ClassDef(_) => {
-                break;
-            }
-            _ => {}
-        }
-        child = parent;
-    }
-
-    checker.report_diagnostic(ContinueOutsideLoop, stmt.range());
-}
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/default_except_not_last.rs b/crates/ruff_linter/src/rules/pyflakes/rules/default_except_not_last.rs
index 42a45f3bf4..0cfa0a1950 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/default_except_not_last.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/default_except_not_last.rs
@@ -45,6 +45,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `except` clause](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.28")]
 pub(crate) struct DefaultExceptNotLast;
 
 impl Violation for DefaultExceptNotLast {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/f_string_missing_placeholders.rs b/crates/ruff_linter/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
index 3e15f4cfe3..3538e596e1 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
@@ -54,6 +54,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [PEP 498 – Literal String Interpolation](https://peps.python.org/pep-0498/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct FStringMissingPlaceholders;
 
 impl AlwaysFixableViolation for FStringMissingPlaceholders {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs b/crates/ruff_linter/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs
index 41c3796563..d552c3f3d9 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs
@@ -24,6 +24,7 @@ use crate::Violation;
 /// ## References
 /// - [PEP 563 – Postponed Evaluation of Annotations](https://peps.python.org/pep-0563/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.39")]
 pub(crate) struct ForwardAnnotationSyntaxError {
     pub parse_error: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/future_feature_not_defined.rs b/crates/ruff_linter/src/rules/pyflakes/rules/future_feature_not_defined.rs
index f30347c0d6..59e2bf79a1 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/future_feature_not_defined.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/future_feature_not_defined.rs
@@ -1,11 +1,6 @@
-use ruff_python_ast::Alias;
-
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_stdlib::future::is_feature_name;
-use ruff_text_size::Ranged;
 
 use crate::Violation;
-use crate::checkers::ast::Checker;
 
 /// ## What it does
 /// Checks for `__future__` imports that are not defined in the current Python
@@ -18,8 +13,9 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `__future__`](https://docs.python.org/3/library/__future__.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.34")]
 pub(crate) struct FutureFeatureNotDefined {
-    name: String,
+    pub name: String,
 }
 
 impl Violation for FutureFeatureNotDefined {
@@ -29,17 +25,3 @@ impl Violation for FutureFeatureNotDefined {
         format!("Future feature `{name}` is not defined")
     }
 }
-
-/// F407
-pub(crate) fn future_feature_not_defined(checker: &Checker, alias: &Alias) {
-    if is_feature_name(&alias.name) {
-        return;
-    }
-
-    checker.report_diagnostic(
-        FutureFeatureNotDefined {
-            name: alias.name.to_string(),
-        },
-        alias.range(),
-    );
-}
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/if_tuple.rs b/crates/ruff_linter/src/rules/pyflakes/rules/if_tuple.rs
index 75fb7ce65a..47f6ea9fd7 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/if_tuple.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/if_tuple.rs
@@ -29,6 +29,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `if` statement](https://docs.python.org/3/reference/compound_stmts.html#the-if-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct IfTuple;
 
 impl Violation for IfTuple {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/imports.rs b/crates/ruff_linter/src/rules/pyflakes/rules/imports.rs
index 3b3c33d0fe..7a97aa09ab 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/imports.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/imports.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 ///     print(filename)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.44")]
 pub(crate) struct ImportShadowedByLoopVar {
     pub(crate) name: String,
     pub(crate) row: SourceRow,
@@ -117,6 +118,7 @@ pub(crate) fn import_shadowed_by_loop_var(checker: &Checker, scope_id: ScopeId,
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#imports
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct UndefinedLocalWithImportStar {
     pub(crate) name: String,
 }
@@ -155,6 +157,7 @@ impl Violation for UndefinedLocalWithImportStar {
 /// ## References
 /// - [Python documentation: Future statements](https://docs.python.org/3/reference/simple_stmts.html#future)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.34")]
 pub(crate) struct LateFutureImport;
 
 impl Violation for LateFutureImport {
@@ -199,6 +202,7 @@ impl Violation for LateFutureImport {
 ///     return pi * radius**2
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.44")]
 pub(crate) struct UndefinedLocalWithImportStarUsage {
     pub(crate) name: String,
 }
@@ -240,6 +244,7 @@ impl Violation for UndefinedLocalWithImportStarUsage {
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#imports
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.37")]
 pub(crate) struct UndefinedLocalWithNestedImportStarUsage {
     pub(crate) name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/invalid_literal_comparisons.rs b/crates/ruff_linter/src/rules/pyflakes/rules/invalid_literal_comparisons.rs
index 6a6fa72517..d09d6cd006 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/invalid_literal_comparisons.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/invalid_literal_comparisons.rs
@@ -51,6 +51,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python documentation: Value comparisons](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/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.39")]
 pub(crate) struct IsLiteral {
     cmp_op: IsCmpOp,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/invalid_print_syntax.rs b/crates/ruff_linter/src/rules/pyflakes/rules/invalid_print_syntax.rs
index 146917dd45..72ccffb266 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/invalid_print_syntax.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/invalid_print_syntax.rs
@@ -47,6 +47,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `print`](https://docs.python.org/3/library/functions.html#print)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.39")]
 pub(crate) struct InvalidPrintSyntax;
 
 impl Violation for InvalidPrintSyntax {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs b/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs
index e19fd97b5d..0bfd4f9933 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs
@@ -35,6 +35,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `NotImplemented`](https://docs.python.org/3/library/constants.html#NotImplemented)
 /// - [Python documentation: `NotImplementedError`](https://docs.python.org/3/library/exceptions.html#NotImplementedError)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct RaiseNotImplemented;
 
 impl Violation for RaiseNotImplemented {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/redefined_while_unused.rs b/crates/ruff_linter/src/rules/pyflakes/rules/redefined_while_unused.rs
index 65019a997b..01439bc764 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/redefined_while_unused.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/redefined_while_unused.rs
@@ -31,6 +31,7 @@ use rustc_hash::FxHashMap;
 /// import bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.171")]
 pub(crate) struct RedefinedWhileUnused {
     pub name: String,
     pub row: SourceRow,
@@ -191,15 +192,14 @@ pub(crate) fn redefined_while_unused(checker: &Checker, scope_id: ScopeId, scope
                 },
                 binding.range(),
             );
+            diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
 
             diagnostic.secondary_annotation(
                 format_args!("previous definition of `{name}` here"),
                 shadowed,
             );
 
-            if let Some(ann) = diagnostic.primary_annotation_mut() {
-                ann.set_message(format_args!("`{name}` redefined here"));
-            }
+            diagnostic.set_primary_message(format_args!("`{name}` redefined here"));
 
             if let Some(range) = binding.parent_range(checker.semantic()) {
                 diagnostic.set_parent(range.start());
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs b/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs
index 0771b2ec72..1acdc90138 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs
@@ -49,6 +49,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Dictionaries](https://docs.python.org/3/tutorial/datastructures.html#dictionaries)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.30")]
 pub(crate) struct MultiValueRepeatedKeyLiteral {
     name: SourceCodeSnippet,
     existing: SourceCodeSnippet,
@@ -121,6 +122,7 @@ impl Violation for MultiValueRepeatedKeyLiteral {
 /// ## References
 /// - [Python documentation: Dictionaries](https://docs.python.org/3/tutorial/datastructures.html#dictionaries)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.30")]
 pub(crate) struct MultiValueRepeatedKeyVariable {
     name: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/return_outside_function.rs b/crates/ruff_linter/src/rules/pyflakes/rules/return_outside_function.rs
index bd004db454..dc67da1e58 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/return_outside_function.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/return_outside_function.rs
@@ -18,6 +18,7 @@ use crate::Violation;
 /// ## References
 /// - [Python documentation: `return`](https://docs.python.org/3/reference/simple_stmts.html#the-return-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct ReturnOutsideFunction;
 
 impl Violation for ReturnOutsideFunction {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/starred_expressions.rs b/crates/ruff_linter/src/rules/pyflakes/rules/starred_expressions.rs
index b7566b7311..70f25fb689 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/starred_expressions.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/starred_expressions.rs
@@ -18,6 +18,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## References
 /// - [PEP 3132 – Extended Iterable Unpacking](https://peps.python.org/pep-3132/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.32")]
 pub(crate) struct ExpressionsInStarAssignment;
 
 impl Violation for ExpressionsInStarAssignment {
@@ -44,6 +45,7 @@ impl Violation for ExpressionsInStarAssignment {
 /// ## References
 /// - [PEP 3132 – Extended Iterable Unpacking](https://peps.python.org/pep-3132/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.32")]
 pub(crate) struct MultipleStarredExpressions;
 
 impl Violation for MultipleStarredExpressions {
@@ -53,27 +55,14 @@ impl Violation for MultipleStarredExpressions {
     }
 }
 
-/// F621, F622
+/// F621
 pub(crate) fn starred_expressions(
     checker: &Checker,
     elts: &[Expr],
     check_too_many_expressions: bool,
-    check_two_starred_expressions: bool,
     location: TextRange,
 ) {
-    let mut has_starred: bool = false;
-    let mut starred_index: Option<usize> = None;
-    for (index, elt) in elts.iter().enumerate() {
-        if elt.is_starred_expr() {
-            if has_starred && check_two_starred_expressions {
-                checker.report_diagnostic(MultipleStarredExpressions, location);
-                return;
-            }
-            has_starred = true;
-            starred_index = Some(index);
-        }
-    }
-
+    let starred_index: Option<usize> = None;
     if check_too_many_expressions {
         if let Some(starred_index) = starred_index {
             if starred_index >= 1 << 8 || elts.len() - starred_index > 1 << 24 {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs b/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs
index 785e7266b3..9df61638c4 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs
@@ -39,6 +39,7 @@ use crate::rules::pyflakes::format::FormatSummary;
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatInvalidFormat {
     pub(crate) message: String,
 }
@@ -78,6 +79,7 @@ impl Violation for PercentFormatInvalidFormat {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatExpectedMapping;
 
 impl Violation for PercentFormatExpectedMapping {
@@ -114,6 +116,7 @@ impl Violation for PercentFormatExpectedMapping {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatExpectedSequence;
 
 impl Violation for PercentFormatExpectedSequence {
@@ -153,6 +156,7 @@ impl Violation for PercentFormatExpectedSequence {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatExtraNamedArguments {
     missing: Vec<String>,
 }
@@ -193,6 +197,7 @@ impl AlwaysFixableViolation for PercentFormatExtraNamedArguments {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatMissingArgument {
     missing: Vec<String>,
 }
@@ -233,6 +238,7 @@ impl Violation for PercentFormatMissingArgument {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatMixedPositionalAndNamed;
 
 impl Violation for PercentFormatMixedPositionalAndNamed {
@@ -263,6 +269,7 @@ impl Violation for PercentFormatMixedPositionalAndNamed {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatPositionalCountMismatch {
     wanted: usize,
     got: usize,
@@ -301,6 +308,7 @@ impl Violation for PercentFormatPositionalCountMismatch {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatStarRequiresSequence;
 
 impl Violation for PercentFormatStarRequiresSequence {
@@ -331,6 +339,7 @@ impl Violation for PercentFormatStarRequiresSequence {
 /// ## References
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.142")]
 pub(crate) struct PercentFormatUnsupportedFormatCharacter {
     pub(crate) char: char,
 }
@@ -362,6 +371,7 @@ impl Violation for PercentFormatUnsupportedFormatCharacter {
 /// ## References
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.138")]
 pub(crate) struct StringDotFormatInvalidFormat {
     pub(crate) message: String,
 }
@@ -404,6 +414,7 @@ impl Violation for StringDotFormatInvalidFormat {
 /// ## References
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.139")]
 pub(crate) struct StringDotFormatExtraNamedArguments {
     missing: Vec<Name>,
 }
@@ -455,6 +466,7 @@ impl Violation for StringDotFormatExtraNamedArguments {
 /// ## References
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.139")]
 pub(crate) struct StringDotFormatExtraPositionalArguments {
     missing: Vec<String>,
 }
@@ -498,6 +510,7 @@ impl Violation for StringDotFormatExtraPositionalArguments {
 /// ## References
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.139")]
 pub(crate) struct StringDotFormatMissingArguments {
     missing: Vec<String>,
 }
@@ -536,6 +549,7 @@ impl Violation for StringDotFormatMissingArguments {
 /// ## References
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.139")]
 pub(crate) struct StringDotFormatMixingAutomatic;
 
 impl Violation for StringDotFormatMixingAutomatic {
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/undefined_export.rs b/crates/ruff_linter/src/rules/pyflakes/rules/undefined_export.rs
index 18c9ddc1d8..1a1648f92c 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/undefined_export.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/undefined_export.rs
@@ -40,6 +40,7 @@ use crate::Violation;
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.25")]
 pub(crate) struct UndefinedExport {
     pub name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/undefined_local.rs b/crates/ruff_linter/src/rules/pyflakes/rules/undefined_local.rs
index 0af1d5f4fb..a46205a72a 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/undefined_local.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/undefined_local.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 ///     x += 1
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.24")]
 pub(crate) struct UndefinedLocal {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/undefined_name.rs b/crates/ruff_linter/src/rules/pyflakes/rules/undefined_name.rs
index f1666bf9b3..314488cb21 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/undefined_name.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/undefined_name.rs
@@ -27,6 +27,7 @@ use crate::Violation;
 /// ## References
 /// - [Python documentation: Naming and binding](https://docs.python.org/3/reference/executionmodel.html#naming-and-binding)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.20")]
 pub(crate) struct UndefinedName {
     pub(crate) name: String,
     pub(crate) minor_version_builtin_added: Option<u8>,
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/unused_annotation.rs b/crates/ruff_linter/src/rules/pyflakes/rules/unused_annotation.rs
index 041a5a0211..98692373bf 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/unused_annotation.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/unused_annotation.rs
@@ -21,6 +21,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [PEP 484 – Type Hints](https://peps.python.org/pep-0484/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.172")]
 pub(crate) struct UnusedAnnotation {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs b/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs
index 5af5312af5..37530f1a60 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs
@@ -5,22 +5,22 @@ use anyhow::{Result, anyhow, bail};
 use std::collections::BTreeMap;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::name::QualifiedName;
+use ruff_python_ast::name::{QualifiedName, QualifiedNameBuilder};
 use ruff_python_ast::{self as ast, Stmt};
 use ruff_python_semantic::{
-    AnyImport, BindingKind, Exceptions, Imported, NodeId, Scope, ScopeId, SemanticModel,
-    SubmoduleImport,
+    AnyImport, Binding, BindingFlags, BindingId, BindingKind, Exceptions, Imported, NodeId, Scope,
+    ScopeId, SemanticModel, SubmoduleImport,
 };
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
 use crate::fix;
 use crate::preview::{
-    is_dunder_init_fix_unused_import_enabled, is_full_path_match_source_strategy_enabled,
+    is_dunder_init_fix_unused_import_enabled, is_refined_submodule_import_match_enabled,
 };
 use crate::registry::Rule;
-use crate::rules::isort::categorize::MatchSourceStrategy;
 use crate::rules::{isort, isort::ImportSection, isort::ImportType};
+use crate::settings::LinterSettings;
 use crate::{Applicability, Fix, FixAvailability, Violation};
 
 /// ## What it does
@@ -52,6 +52,43 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 /// __all__ = ["some_module"]
 /// ```
 ///
+/// ## Preview
+/// When [preview] is enabled (and certain simplifying assumptions
+/// are met), we analyze all import statements for a given module
+/// when determining whether an import is used, rather than simply
+/// the last of these statements. This can result in both different and
+/// more import statements being marked as unused.
+///
+/// For example, if a module consists of
+///
+/// ```python
+/// import a
+/// import a.b
+/// ```
+///
+/// then both statements are marked as unused under [preview], whereas
+/// only the second is marked as unused under stable behavior.
+///
+/// As another example, if a module consists of
+///
+/// ```python
+/// import a.b
+/// import a
+///
+/// a.b.foo()
+/// ```
+///
+/// then a diagnostic will only be emitted for the first line under [preview],
+/// whereas a diagnostic would only be emitted for the second line under
+/// stable behavior.
+///
+/// Note that this behavior is somewhat subjective and is designed
+/// to conform to the developer's intuition rather than Python's actual
+/// execution. To wit, the statement `import a.b` automatically executes
+/// `import a`, so in some sense `import a` is _always_ redundant
+/// in the presence of `import a.b`.
+///
+///
 /// ## Fix safety
 ///
 /// Fixes to remove unused imports are safe, except in `__init__.py` files.
@@ -63,6 +100,10 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 /// to remove third-party and standard library imports -- the fix is unsafe because the module's
 /// interface changes.
 ///
+/// See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)
+/// for more details on how Ruff
+/// determines whether an import is first or third-party.
+///
 /// ## Example
 ///
 /// ```python
@@ -91,11 +132,6 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 ///     print("numpy is not installed")
 /// ```
 ///
-/// ## Preview
-/// When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
-/// the criterion for determining whether an import is first-party
-/// is stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.
-///
 /// ## Options
 /// - `lint.ignore-init-module-imports`
 /// - `lint.pyflakes.allowed-unused-imports`
@@ -104,7 +140,10 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 /// - [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)
 /// - [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
+///
+/// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.18")]
 pub(crate) struct UnusedImport {
     /// Qualified name of the import
     name: String,
@@ -231,11 +270,6 @@ enum UnusedImportContext {
 
 fn is_first_party(import: &AnyImport, checker: &Checker) -> bool {
     let source_name = import.source_name().join(".");
-    let match_source_strategy = if is_full_path_match_source_strategy_enabled(checker.settings()) {
-        MatchSourceStrategy::FullPath
-    } else {
-        MatchSourceStrategy::Root
-    };
     let category = isort::categorize(
         &source_name,
         import.qualified_name().is_unresolved_import(),
@@ -247,7 +281,6 @@ fn is_first_party(import: &AnyImport, checker: &Checker) -> bool {
         checker.settings().isort.no_sections,
         &checker.settings().isort.section_order,
         &checker.settings().isort.default_section,
-        match_source_strategy,
     );
     matches! {
         category,
@@ -294,17 +327,7 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope) {
     let mut unused: BTreeMap<(NodeId, Exceptions), Vec<ImportBinding>> = BTreeMap::default();
     let mut ignored: BTreeMap<(NodeId, Exceptions), Vec<ImportBinding>> = BTreeMap::default();
 
-    for binding_id in scope.binding_ids() {
-        let binding = checker.semantic().binding(binding_id);
-
-        if binding.is_used()
-            || binding.is_explicit_export()
-            || binding.is_nonlocal()
-            || binding.is_global()
-        {
-            continue;
-        }
-
+    for binding in unused_imports_in_scope(checker.semantic(), scope, checker.settings()) {
         let Some(import) = binding.as_any_import() else {
             continue;
         };
@@ -334,7 +357,7 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope) {
             .allowed_unused_imports
             .iter()
             .any(|allowed_unused_import| {
-                let allowed_unused_import = QualifiedName::from_dotted_name(allowed_unused_import);
+                let allowed_unused_import = QualifiedName::user_defined(allowed_unused_import);
                 import.qualified_name().starts_with(&allowed_unused_import)
             })
         {
@@ -445,6 +468,8 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope) {
                     diagnostic.set_fix(fix.clone());
                 }
             }
+
+            diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
         }
     }
 
@@ -465,6 +490,8 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope) {
         if let Some(range) = binding.parent_range {
             diagnostic.set_parent(range.start());
         }
+
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
     }
 }
 
@@ -592,3 +619,302 @@ fn fix_by_reexporting<'a>(
     let isolation = Checker::isolation(checker.semantic().parent_statement_id(node_id));
     Ok(Fix::safe_edits(head, tail).isolate(isolation))
 }
+
+/// Returns an iterator over bindings to import statements that appear unused.
+///
+/// The stable behavior is to return those bindings to imports
+/// satisfying the following properties:
+///
+/// - they are not shadowed
+/// - they are not `global`, not `nonlocal`, and not explicit exports (i.e. `import foo as foo`)
+/// - they have no references, according to the semantic model
+///
+/// Under preview, there is a more refined analysis performed
+/// in the case where all bindings shadowed by a given import
+/// binding (including the binding itself) are of a simple form:
+/// they are required to be un-aliased imports or submodule imports.
+///
+/// This alternative analysis is described in the documentation for
+/// [`unused_imports_from_binding`].
+fn unused_imports_in_scope<'a, 'b>(
+    semantic: &'a SemanticModel<'b>,
+    scope: &'a Scope,
+    settings: &'a LinterSettings,
+) -> impl Iterator<Item = &'a Binding<'b>> {
+    scope
+        .binding_ids()
+        .map(|id| (id, semantic.binding(id)))
+        .filter(|(_, bdg)| {
+            matches!(
+                bdg.kind,
+                BindingKind::Import(_)
+                    | BindingKind::FromImport(_)
+                    | BindingKind::SubmoduleImport(_)
+            )
+        })
+        .filter(|(_, bdg)| !bdg.is_global() && !bdg.is_nonlocal() && !bdg.is_explicit_export())
+        .flat_map(|(id, bdg)| {
+            if is_refined_submodule_import_match_enabled(settings)
+                // No need to apply refined logic if there is only a single binding
+                && scope.shadowed_bindings(id).nth(1).is_some()
+                // Only apply the new logic in certain situations to avoid
+                // complexity, false positives, and intersection with
+                // `redefined-while-unused` (`F811`).
+                && has_simple_shadowed_bindings(scope, id, semantic)
+            {
+                unused_imports_from_binding(semantic, id, scope)
+            } else if bdg.is_used() {
+                vec![]
+            } else {
+                vec![bdg]
+            }
+        })
+}
+
+/// Returns a `Vec` of bindings to unused import statements that
+/// are shadowed by a given binding.
+///
+/// This is best explained by example. So suppose we have:
+///
+/// ```python
+/// import a
+/// import a.b
+/// import a.b.c
+///
+/// __all__ = ["a"]
+///
+/// a.b.foo()
+/// ```
+///
+/// As of 2025-09-25, Ruff's semantic model, upon visiting
+/// the whole module, will have a single live binding for
+/// the symbol `a` that points to the line `import a.b.c`,
+/// and the remaining two import bindings are considered shadowed
+/// by the last.
+///
+/// This function expects to receive the `id`
+/// for the live binding and will begin by collecting
+/// all bindings shadowed by the given one - i.e. all
+/// the different import statements binding the symbol `a`.
+/// We iterate over references to this
+/// module and decide (somewhat subjectively) which
+/// import statement the user "intends" to reference. To that end,
+/// to each reference we attempt to build a [`QualifiedName`]
+/// corresponding to an iterated attribute access (e.g. `a.b.foo`).
+/// We then determine the closest matching import statement to that
+/// qualified name, and mark it as used.
+///
+/// In the present example, the qualified name associated to the
+/// reference from the dunder all export is `"a"` and the qualified
+/// name associated to the reference in the last line is `"a.b.foo"`.
+/// The closest matches are `import a` and `import a.b`, respectively,
+/// leaving `import a.b.c` unused.
+///
+/// For a precise definition of "closest match" see [`best_match`]
+/// and [`rank_matches`].
+///
+/// Note: if any reference comes from something other than
+/// a `Name` or a dunder all expression, then we return just
+/// the original binding, thus reverting the stable behavior.
+fn unused_imports_from_binding<'a, 'b>(
+    semantic: &'a SemanticModel<'b>,
+    id: BindingId,
+    scope: &'a Scope,
+) -> Vec<&'a Binding<'b>> {
+    let mut marked = MarkedBindings::from_binding_id(semantic, id, scope);
+
+    let binding = semantic.binding(id);
+
+    // ensure we only do this once
+    let mut marked_dunder_all = false;
+
+    for ref_id in binding.references() {
+        let resolved_reference = semantic.reference(ref_id);
+        if !marked_dunder_all && resolved_reference.in_dunder_all_definition() {
+            let first = *binding
+                                .as_any_import()
+                                .expect("binding to be import binding since current function called after restricting to these in `unused_imports_in_scope`")
+                                .qualified_name()
+                                .segments().first().expect("import binding to have nonempty qualified name");
+            mark_uses_of_qualified_name(&mut marked, &QualifiedName::user_defined(first));
+            marked_dunder_all = true;
+            continue;
+        }
+        let Some(expr_id) = resolved_reference.expression_id() else {
+            // If there is some other kind of reference, abandon
+            // the refined approach for the usual one
+            return vec![binding];
+        };
+        let Some(prototype) = expand_to_qualified_name_attribute(semantic, expr_id) else {
+            return vec![binding];
+        };
+
+        mark_uses_of_qualified_name(&mut marked, &prototype);
+    }
+
+    marked.into_unused()
+}
+
+#[derive(Debug)]
+struct MarkedBindings<'a, 'b> {
+    bindings: Vec<&'a Binding<'b>>,
+    used: Vec<bool>,
+}
+
+impl<'a, 'b> MarkedBindings<'a, 'b> {
+    fn from_binding_id(semantic: &'a SemanticModel<'b>, id: BindingId, scope: &'a Scope) -> Self {
+        let bindings: Vec<_> = scope
+            .shadowed_bindings(id)
+            .map(|id| semantic.binding(id))
+            .collect();
+
+        Self {
+            used: vec![false; bindings.len()],
+            bindings,
+        }
+    }
+
+    fn into_unused(self) -> Vec<&'a Binding<'b>> {
+        self.bindings
+            .into_iter()
+            .zip(self.used)
+            .filter_map(|(bdg, is_used)| (!is_used).then_some(bdg))
+            .collect()
+    }
+
+    fn iter_mut(&mut self) -> impl Iterator<Item = (&'a Binding<'b>, &mut bool)> {
+        self.bindings.iter().copied().zip(self.used.iter_mut())
+    }
+}
+
+/// Returns `Some` [`QualifiedName`] delineating the path for the
+/// maximal [`ExprName`] or [`ExprAttribute`] containing the expression
+/// associated to the given [`NodeId`], or `None` otherwise.
+///
+/// For example, if the `expr_id` points to `a` in `a.b.c.foo()`
+/// then the qualified name would have segments [`a`, `b`, `c`, `foo`].
+fn expand_to_qualified_name_attribute<'b>(
+    semantic: &SemanticModel<'b>,
+    expr_id: NodeId,
+) -> Option<QualifiedName<'b>> {
+    let mut builder = QualifiedNameBuilder::with_capacity(16);
+
+    let mut expr_id = expr_id;
+
+    let expr = semantic.expression(expr_id)?;
+
+    let name = expr.as_name_expr()?;
+
+    builder.push(&name.id);
+
+    while let Some(node_id) = semantic.parent_expression_id(expr_id) {
+        let Some(expr) = semantic.expression(node_id) else {
+            break;
+        };
+        let Some(expr_attr) = expr.as_attribute_expr() else {
+            break;
+        };
+        builder.push(expr_attr.attr.as_str());
+        expr_id = node_id;
+    }
+    Some(builder.build())
+}
+
+fn mark_uses_of_qualified_name(marked: &mut MarkedBindings, prototype: &QualifiedName) {
+    let Some(best) = best_match(&marked.bindings, prototype) else {
+        return;
+    };
+
+    let Some(best_import) = best.as_any_import() else {
+        return;
+    };
+
+    let best_name = best_import.qualified_name();
+
+    // We loop through all bindings in case there are repeated instances
+    // of the `best_name`. For example, if we have
+    //
+    // ```python
+    // import a
+    // import a
+    //
+    // a.foo()
+    // ```
+    //
+    // then we want to mark both import statements as used. It
+    // is the job of `redefined-while-unused` (`F811`) to catch
+    // the repeated binding in this case.
+    for (binding, is_used) in marked.iter_mut() {
+        if *is_used {
+            continue;
+        }
+
+        if binding
+            .as_any_import()
+            .is_some_and(|imp| imp.qualified_name() == best_name)
+        {
+            *is_used = true;
+        }
+    }
+}
+
+/// Returns a pair with first component the length of the largest
+/// shared prefix between the qualified name of the import binding
+/// and the `prototype` and second component the length of the
+/// qualified name of the import binding (i.e. the number of path
+/// segments). Moreover, we regard the second component as ordered
+/// in reverse.
+///
+/// For example, if the binding corresponds to `import a.b.c`
+/// and the prototype to `a.b.foo()`, then the function returns
+/// `(2,std::cmp::Reverse(3))`.
+fn rank_matches(binding: &Binding, prototype: &QualifiedName) -> (usize, std::cmp::Reverse<usize>) {
+    let Some(import) = binding.as_any_import() else {
+        unreachable!()
+    };
+    let qname = import.qualified_name();
+    let left = qname
+        .segments()
+        .iter()
+        .zip(prototype.segments())
+        .take_while(|(x, y)| x == y)
+        .count();
+    (left, std::cmp::Reverse(qname.segments().len()))
+}
+
+/// Returns the import binding that shares the longest prefix
+/// with the `prototype` and is of minimal length amongst these.
+///
+/// See also [`rank_matches`].
+fn best_match<'a, 'b>(
+    bindings: &Vec<&'a Binding<'b>>,
+    prototype: &QualifiedName,
+) -> Option<&'a Binding<'b>> {
+    bindings
+        .iter()
+        .copied()
+        .max_by_key(|binding| rank_matches(binding, prototype))
+}
+
+#[inline]
+fn has_simple_shadowed_bindings(scope: &Scope, id: BindingId, semantic: &SemanticModel) -> bool {
+    scope.shadowed_bindings(id).enumerate().all(|(i, shadow)| {
+        let shadowed_binding = semantic.binding(shadow);
+        // Bail if one of the shadowed bindings is
+        // used before the last live binding. This is
+        // to avoid situations like this:
+        //
+        // ```
+        // import a
+        // a.b
+        // import a.b
+        // ```
+        if i > 0 && shadowed_binding.is_used() {
+            return false;
+        }
+        matches!(
+            shadowed_binding.kind,
+            BindingKind::Import(_) | BindingKind::SubmoduleImport(_)
+        ) && !shadowed_binding.flags.contains(BindingFlags::ALIAS)
+    })
+}
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs b/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs
index 7dde1bd468..aa5610620e 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs
@@ -43,9 +43,17 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// This rule's fix is marked as unsafe because removing an unused variable assignment may
 /// delete comments that are attached to the assignment.
 ///
+/// ## See also
+///
+/// This rule does not apply to bindings in unpacked assignments (e.g. `x, y = 1, 2`). See
+/// [`unused-unpacked-variable`][RUF059] for this case.
+///
 /// ## Options
 /// - `lint.dummy-variable-rgx`
+///
+/// [RUF059]: https://docs.astral.sh/ruff/rules/unused-unpacked-variable/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.22")]
 pub(crate) struct UnusedVariable {
     pub name: String,
 }
@@ -265,4 +273,6 @@ pub(crate) fn unused_variable(checker: &Checker, name: &str, binding: &Binding)
     if let Some(fix) = remove_unused_variable(binding, checker) {
         diagnostic.set_fix(fix);
     }
+    // Add Unnecessary tag for unused variables
+    diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/yield_outside_function.rs b/crates/ruff_linter/src/rules/pyflakes/rules/yield_outside_function.rs
index 7838c267db..38be7d1167 100644
--- a/crates/ruff_linter/src/rules/pyflakes/rules/yield_outside_function.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/yield_outside_function.rs
@@ -54,6 +54,7 @@ impl From<YieldOutsideFunctionKind> for DeferralKeyword {
 ///
 /// [autoawait]: https://ipython.readthedocs.io/en/stable/interactive/autoawait.html
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.22")]
 pub(crate) struct YieldOutsideFunction {
     keyword: DeferralKeyword,
 }
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap
index 68c8fc9e8a..6f4ab6f43d 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap
@@ -11,14 +11,12 @@ F401 [*] `functools` imported but unused
 4 | from collections import (
   |
 help: Remove unused import: `functools`
-
-ℹ Safe fix
-1 1 | from __future__ import all_feature_names
-2   |-import functools, os
-  2 |+import os
-3 3 | from datetime import datetime
-4 4 | from collections import (
-5 5 |     Counter,
+1 | from __future__ import all_feature_names
+  - import functools, os
+2 + import os
+3 | from datetime import datetime
+4 | from collections import (
+5 |     Counter,
 
 F401 [*] `collections.OrderedDict` imported but unused
  --> F401_0.py:6:5
@@ -31,15 +29,13 @@ F401 [*] `collections.OrderedDict` imported but unused
 8 | )
   |
 help: Remove unused import: `collections.OrderedDict`
-
-ℹ Safe fix
-3 3 | from datetime import datetime
-4 4 | from collections import (
-5 5 |     Counter,
-6   |-    OrderedDict,
-7 6 |     namedtuple,
-8 7 | )
-9 8 | import multiprocessing.pool
+3 | from datetime import datetime
+4 | from collections import (
+5 |     Counter,
+  -     OrderedDict,
+6 |     namedtuple,
+7 | )
+8 | import multiprocessing.pool
 
 F401 [*] `logging.handlers` imported but unused
   --> F401_0.py:12:8
@@ -52,15 +48,13 @@ F401 [*] `logging.handlers` imported but unused
 14 |     TYPE_CHECKING,
    |
 help: Remove unused import: `logging.handlers`
-
-ℹ Safe fix
-9  9  | import multiprocessing.pool
-10 10 | import multiprocessing.process
-11 11 | import logging.config
-12    |-import logging.handlers
-13 12 | from typing import (
-14 13 |     TYPE_CHECKING,
-15 14 |     NamedTuple,
+9  | import multiprocessing.pool
+10 | import multiprocessing.process
+11 | import logging.config
+   - import logging.handlers
+12 | from typing import (
+13 |     TYPE_CHECKING,
+14 |     NamedTuple,
 
 F401 [*] `shelve` imported but unused
   --> F401_0.py:32:12
@@ -71,15 +65,13 @@ F401 [*] `shelve` imported but unused
 33 |     import importlib
    |
 help: Remove unused import: `shelve`
-
-ℹ Safe fix
-29 29 |     from models import Fruit, Nut, Vegetable
-30 30 | 
-31 31 | if TYPE_CHECKING:
-32    |-    import shelve
-33 32 |     import importlib
-34 33 | 
-35 34 | if TYPE_CHECKING:
+29 |     from models import Fruit, Nut, Vegetable
+30 | 
+31 | if TYPE_CHECKING:
+   -     import shelve
+32 |     import importlib
+33 | 
+34 | if TYPE_CHECKING:
 
 F401 [*] `importlib` imported but unused
   --> F401_0.py:33:12
@@ -92,15 +84,13 @@ F401 [*] `importlib` imported but unused
 35 | if TYPE_CHECKING:
    |
 help: Remove unused import: `importlib`
-
-ℹ Safe fix
-30 30 | 
-31 31 | if TYPE_CHECKING:
-32 32 |     import shelve
-33    |-    import importlib
-34 33 | 
-35 34 | if TYPE_CHECKING:
-36 35 |     """Hello, world!"""
+30 | 
+31 | if TYPE_CHECKING:
+32 |     import shelve
+   -     import importlib
+33 | 
+34 | if TYPE_CHECKING:
+35 |     """Hello, world!"""
 
 F401 [*] `pathlib` imported but unused
   --> F401_0.py:37:12
@@ -113,15 +103,13 @@ F401 [*] `pathlib` imported but unused
 39 |     z = 1
    |
 help: Remove unused import: `pathlib`
-
-ℹ Safe fix
-34 34 | 
-35 35 | if TYPE_CHECKING:
-36 36 |     """Hello, world!"""
-37    |-    import pathlib
-38 37 | 
-39 38 |     z = 1
-40 39 | 
+34 | 
+35 | if TYPE_CHECKING:
+36 |     """Hello, world!"""
+   -     import pathlib
+37 | 
+38 |     z = 1
+39 | 
 
 F401 [*] `pickle` imported but unused
   --> F401_0.py:52:16
@@ -131,16 +119,14 @@ F401 [*] `pickle` imported but unused
    |                ^^^^^^
    |
 help: Remove unused import: `pickle`
-
-ℹ Safe fix
-49 49 |         z = multiprocessing.pool.ThreadPool()
-50 50 | 
-51 51 |     def b(self) -> None:
-52    |-        import pickle
-   52 |+        pass
-53 53 | 
-54 54 | 
-55 55 | __all__ = ["ClassA"] + ["ClassB"]
+49 |         z = multiprocessing.pool.ThreadPool()
+50 | 
+51 |     def b(self) -> None:
+   -         import pickle
+52 +         pass
+53 | 
+54 | 
+55 | __all__ = ["ClassA"] + ["ClassB"]
 
 F401 [*] `x` imported but unused
   --> F401_0.py:93:16
@@ -152,15 +138,13 @@ F401 [*] `x` imported but unused
 94 |         import y
    |
 help: Remove unused import: `x`
-
-ℹ Safe fix
-90 90 | # Test: match statements.
-91 91 | match *0, 1, *2:
-92 92 |     case 0,:
-93    |-        import x
-94 93 |         import y
-95 94 | 
-96 95 | 
+90 | # Test: match statements.
+91 | match *0, 1, *2:
+92 |     case 0,:
+   -         import x
+93 |         import y
+94 | 
+95 | 
 
 F401 [*] `y` imported but unused
   --> F401_0.py:94:16
@@ -171,15 +155,13 @@ F401 [*] `y` imported but unused
    |                ^
    |
 help: Remove unused import: `y`
-
-ℹ Safe fix
-91 91 | match *0, 1, *2:
-92 92 |     case 0,:
-93 93 |         import x
-94    |-        import y
-95 94 | 
-96 95 | 
-97 96 | # Test: access a sub-importation via an alias.
+91 | match *0, 1, *2:
+92 |     case 0,:
+93 |         import x
+   -         import y
+94 | 
+95 | 
+96 | # Test: access a sub-importation via an alias.
 
 F401 [*] `foo.bar.baz` imported but unused
    --> F401_0.py:99:8
@@ -192,15 +174,13 @@ F401 [*] `foo.bar.baz` imported but unused
 101 | print(bop.baz.read_csv("test.csv"))
     |
 help: Remove unused import: `foo.bar.baz`
-
-ℹ Safe fix
-96  96  | 
-97  97  | # Test: access a sub-importation via an alias.
-98  98  | import foo.bar as bop
-99      |-import foo.bar.baz
-100 99  | 
-101 100 | print(bop.baz.read_csv("test.csv"))
-102 101 | 
+96  | 
+97  | # Test: access a sub-importation via an alias.
+98  | import foo.bar as bop
+    - import foo.bar.baz
+99  | 
+100 | print(bop.baz.read_csv("test.csv"))
+101 | 
 
 F401 [*] `a1` imported but unused
    --> F401_0.py:105:12
@@ -213,15 +193,13 @@ F401 [*] `a1` imported but unused
 107 |     import a2
     |
 help: Remove unused import: `a1`
-
-ℹ Safe fix
-102 102 | 
-103 103 | # Test: isolated deletions.
-104 104 | if TYPE_CHECKING:
-105     |-    import a1
-106 105 | 
-107 106 |     import a2
-108 107 | 
+102 | 
+103 | # Test: isolated deletions.
+104 | if TYPE_CHECKING:
+    -     import a1
+105 | 
+106 |     import a2
+107 | 
 
 F401 [*] `a2` imported but unused
    --> F401_0.py:107:12
@@ -232,15 +210,13 @@ F401 [*] `a2` imported but unused
     |            ^^
     |
 help: Remove unused import: `a2`
-
-ℹ Safe fix
-104 104 | if TYPE_CHECKING:
-105 105 |     import a1
-106 106 | 
-107     |-    import a2
-108 107 | 
-109 108 | 
-110 109 | match *0, 1, *2:
+104 | if TYPE_CHECKING:
+105 |     import a1
+106 | 
+    -     import a2
+107 | 
+108 | 
+109 | match *0, 1, *2:
 
 F401 [*] `b1` imported but unused
    --> F401_0.py:112:16
@@ -253,15 +229,13 @@ F401 [*] `b1` imported but unused
 114 |         import b2
     |
 help: Remove unused import: `b1`
-
-ℹ Safe fix
-109 109 | 
-110 110 | match *0, 1, *2:
-111 111 |     case 0,:
-112     |-        import b1
-113 112 | 
-114 113 |         import b2
-115 114 | 
+109 | 
+110 | match *0, 1, *2:
+111 |     case 0,:
+    -         import b1
+112 | 
+113 |         import b2
+114 | 
 
 F401 [*] `b2` imported but unused
    --> F401_0.py:114:16
@@ -272,15 +246,13 @@ F401 [*] `b2` imported but unused
     |                ^^
     |
 help: Remove unused import: `b2`
-
-ℹ Safe fix
-111 111 |     case 0,:
-112 112 |         import b1
-113 113 | 
-114     |-        import b2
-115 114 | 
-116 115 | 
-117 116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7244
+111 |     case 0,:
+112 |         import b1
+113 | 
+    -         import b2
+114 | 
+115 | 
+116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7244
 
 F401 [*] `datameta_client_lib.model_helpers.noqa` imported but unused
    --> F401_0.py:122:1
@@ -290,10 +262,8 @@ F401 [*] `datameta_client_lib.model_helpers.noqa` imported but unused
     | ^^^^
     |
 help: Remove unused import: `datameta_client_lib.model_helpers.noqa`
-
-ℹ Safe fix
-118 118 | from datameta_client_lib.model_utils import (  # noqa: F401
-119 119 | noqa )
-120 120 | 
-121     |-from datameta_client_lib.model_helpers import (
-122     |-noqa )
+118 | from datameta_client_lib.model_utils import (  # noqa: F401
+119 | noqa )
+120 | 
+    - from datameta_client_lib.model_helpers import (
+    - noqa )
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap
index 365fd6bce5..6c24a43245 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap
@@ -9,13 +9,11 @@ F401 [*] `pathlib.PurePath` imported but unused
   |                           ^^^^^^^^
   |
 help: Remove unused import: `pathlib.PurePath`
-
-ℹ Safe fix
-1 1 | """Test: parsing of nested string annotations."""
-2 2 | 
-3 3 | from typing import List
-4   |-from pathlib import Path, PurePath
-  4 |+from pathlib import Path
-5 5 | 
-6 6 | 
-7 7 | x: """List['Path']""" = []
+1 | """Test: parsing of nested string annotations."""
+2 | 
+3 | from typing import List
+  - from pathlib import Path, PurePath
+4 + from pathlib import Path
+5 | 
+6 | 
+7 | x: """List['Path']""" = []
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap
index f1a83cee3e..dbcc908056 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap
@@ -9,13 +9,11 @@ F401 [*] `pathlib.Path` imported but unused
   |                         ^^^^
   |
 help: Remove unused import: `pathlib.Path`
-
-ℹ Safe 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:
+2 | from django.db.models import ForeignKey
+3 | 
+4 | if TYPE_CHECKING:
+  -     from pathlib import Path
+5 +     pass
+6 | 
+7 | 
+8 | class Foo:
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap
index a3d870b502..462baf7cb5 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap
@@ -11,15 +11,13 @@ F401 [*] `threading.Thread` imported but unused
 14 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
    |
 help: Remove unused import: `threading.Thread`
-
-ℹ Safe 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.
+9  | 
+10 | 
+11 | def fn(thread: Thread):
+   -     from threading import Thread
+12 | 
+13 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+14 |     # top level.
 
 F401 [*] `threading.Thread` imported but unused
   --> F401_17.py:20:27
@@ -31,12 +29,10 @@ F401 [*] `threading.Thread` imported but unused
 22 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
    |
 help: Remove unused import: `threading.Thread`
-
-ℹ Safe 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.
+17 | 
+18 | 
+19 | def fn(thread: Thread):
+   -     from threading import Thread
+20 | 
+21 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+22 |     # top level.
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap
index 3bef4fd0f4..9f8421c760 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap
@@ -9,13 +9,11 @@ F401 [*] `__future__` imported but unused
   |            ^^^^^^^^^^
   |
 help: Remove unused import: `__future__`
-
-ℹ Safe fix
-2 2 | 
-3 3 | 
-4 4 | def f():
-5   |-    import __future__
-  5 |+    pass
-6 6 | 
-7 7 | 
-8 8 | def f():
+2 | 
+3 | 
+4 | def f():
+  -     import __future__
+5 +     pass
+6 | 
+7 | 
+8 | def f():
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap
index 13551928bf..eef29707e5 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap
@@ -10,12 +10,10 @@ F401 [*] `re.RegexFlag` imported but unused
 5 | from typing import Annotated
   |
 help: Remove unused import: `re.RegexFlag`
-
-ℹ Safe fix
-1 1 | """Test: ensure that we treat strings in `typing.Annotation` as type definitions."""
-2 2 | 
-3 3 | from pathlib import Path
-4   |-from re import RegexFlag
-5 4 | from typing import Annotated
-6 5 | 
-7 6 | p: Annotated["Path", int] = 1
+1 | """Test: ensure that we treat strings in `typing.Annotation` as type definitions."""
+2 | 
+3 | from pathlib import Path
+  - from re import RegexFlag
+4 | from typing import Annotated
+5 | 
+6 | p: Annotated["Path", int] = 1
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap
index dbbc13c516..25bbc847af 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap
@@ -12,15 +12,13 @@ F401 [*] `typing.Union` imported but unused
 47 |     from typing_extensions import TypeAliasType
    |
 help: Remove unused import: `typing.Union`
-
-ℹ Safe fix
-42 42 | # expressions (and type checkers probably wouldn't understand them as type
-43 43 | # expressions either!)
-44 44 | def f():
-45    |-    from typing import Union
-46 45 | 
-47 46 |     from typing_extensions import TypeAliasType
-48 47 | 
+42 | # expressions (and type checkers probably wouldn't understand them as type
+43 | # expressions either!)
+44 | def f():
+   -     from typing import Union
+45 | 
+46 |     from typing_extensions import TypeAliasType
+47 | 
 
 F401 [*] `typing.Union` imported but unused
   --> F401_34.py:58:24
@@ -32,12 +30,10 @@ F401 [*] `typing.Union` imported but unused
 60 |     from typing_extensions import TypeAliasType
    |
 help: Remove unused import: `typing.Union`
-
-ℹ Safe fix
-55 55 | 
-56 56 | 
-57 57 | def f():
-58    |-    from typing import Union
-59 58 | 
-60 59 |     from typing_extensions import TypeAliasType
-61 60 |
+55 | 
+56 | 
+57 | def f():
+   -     from typing import Union
+58 | 
+59 |     from typing_extensions import TypeAliasType
+60 |
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap
index c1e8f17a83..f420d16ed1 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap
@@ -11,13 +11,11 @@ F401 [*] `a.b.c` imported but unused
 4 | import h.i
   |
 help: Remove unused import: `a.b.c`
-
-ℹ Safe 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
-4 3 | import h.i
-5 4 | import j.k as l
+1 | """Test: removal of multi-segment and aliases imports."""
+  - from a.b import c
+2 | from d.e import f as g
+3 | import h.i
+4 | import j.k as l
 
 F401 [*] `d.e.f` imported but unused
  --> F401_5.py:3:22
@@ -30,13 +28,11 @@ F401 [*] `d.e.f` imported but unused
 5 | import j.k as l
   |
 help: Remove unused import: `d.e.f`
-
-ℹ Safe 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
-4 3 | import h.i
-5 4 | import j.k as l
+1 | """Test: removal of multi-segment and aliases imports."""
+2 | from a.b import c
+  - from d.e import f as g
+3 | import h.i
+4 | import j.k as l
 
 F401 [*] `h.i` imported but unused
  --> F401_5.py:4:8
@@ -48,13 +44,11 @@ F401 [*] `h.i` imported but unused
 5 | import j.k as l
   |
 help: Remove unused import: `h.i`
-
-ℹ Safe 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
-4   |-import h.i
-5 4 | import j.k as l
+1 | """Test: removal of multi-segment and aliases imports."""
+2 | from a.b import c
+3 | from d.e import f as g
+  - import h.i
+4 | import j.k as l
 
 F401 [*] `j.k` imported but unused
  --> F401_5.py:5:15
@@ -65,9 +59,7 @@ F401 [*] `j.k` imported but unused
   |               ^
   |
 help: Remove unused import: `j.k`
-
-ℹ Safe fix
-2 2 | from a.b import c
-3 3 | from d.e import f as g
-4 4 | import h.i
-5   |-import j.k as l
+2 | from a.b import c
+3 | from d.e import f as g
+4 | import h.i
+  - import j.k as l
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap
index 97f478faa2..6a19f97f2d 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap
@@ -11,15 +11,13 @@ F401 [*] `.background.BackgroundTasks` imported but unused
 9 | # F401 `datastructures.UploadFile` imported but unused
   |
 help: Remove unused import: `.background.BackgroundTasks`
-
-ℹ Safe fix
-4 4 | from .applications import FastAPI as FastAPI
-5 5 | 
-6 6 | # F401 `background.BackgroundTasks` imported but unused
-7   |-from .background import BackgroundTasks
-8 7 | 
-9 8 | # F401 `datastructures.UploadFile` imported but unused
-10 9 | from .datastructures import UploadFile as FileUpload
+4 | from .applications import FastAPI as FastAPI
+5 | 
+6 | # F401 `background.BackgroundTasks` imported but unused
+  - from .background import BackgroundTasks
+7 | 
+8 | # F401 `datastructures.UploadFile` imported but unused
+9 | from .datastructures import UploadFile as FileUpload
 
 F401 [*] `.datastructures.UploadFile` imported but unused
   --> F401_6.py:10:43
@@ -31,15 +29,13 @@ F401 [*] `.datastructures.UploadFile` imported but unused
 12 | # OK
    |
 help: Remove unused import: `.datastructures.UploadFile`
-
-ℹ Safe fix
-7  7  | from .background import BackgroundTasks
-8  8  | 
-9  9  | # F401 `datastructures.UploadFile` imported but unused
-10    |-from .datastructures import UploadFile as FileUpload
-11 10 | 
-12 11 | # OK
-13 12 | import applications as applications
+7  | from .background import BackgroundTasks
+8  | 
+9  | # F401 `datastructures.UploadFile` imported but unused
+   - from .datastructures import UploadFile as FileUpload
+10 | 
+11 | # OK
+12 | import applications as applications
 
 F401 [*] `background` imported but unused
   --> F401_6.py:16:8
@@ -51,15 +47,13 @@ F401 [*] `background` imported but unused
 18 | # F401 `datastructures` imported but unused
    |
 help: Remove unused import: `background`
-
-ℹ Safe fix
-13 13 | import applications as applications
-14 14 | 
-15 15 | # F401 `background` imported but unused
-16    |-import background
-17 16 | 
-18 17 | # F401 `datastructures` imported but unused
-19 18 | import datastructures as structures
+13 | import applications as applications
+14 | 
+15 | # F401 `background` imported but unused
+   - import background
+16 | 
+17 | # F401 `datastructures` imported but unused
+18 | import datastructures as structures
 
 F401 [*] `datastructures` imported but unused
   --> F401_6.py:19:26
@@ -69,9 +63,7 @@ F401 [*] `datastructures` imported but unused
    |                          ^^^^^^^^^^
    |
 help: Remove unused import: `datastructures`
-
-ℹ Safe fix
-16 16 | import background
-17 17 | 
-18 18 | # F401 `datastructures` imported but unused
-19    |-import datastructures as structures
+16 | import background
+17 | 
+18 | # F401 `datastructures` imported but unused
+   - import datastructures as structures
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap
index f269ad8657..283e6c1fbc 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap
@@ -11,17 +11,15 @@ F401 [*] `typing.Union` imported but unused
 31 | )
    |
 help: Remove unused import: `typing.Union`
-
-ℹ Safe fix
-27 27 | # This should ignore the first error.
-28 28 | from typing import (
-29 29 |     Mapping,  # noqa: F401
-30    |-    Union,
-31    |-)
-   30 |+    )
-32 31 | 
-33 32 | # This should ignore both errors.
-34 33 | from typing import (  # noqa
+27 | # This should ignore the first error.
+28 | from typing import (
+29 |     Mapping,  # noqa: F401
+   -     Union,
+   - )
+30 +     )
+31 | 
+32 | # This should ignore both errors.
+33 | from typing import (  # noqa
 
 F401 [*] `typing.Awaitable` imported but unused
   --> F401_7.py:66:20
@@ -31,12 +29,10 @@ F401 [*] `typing.Awaitable` imported but unused
    |                    ^^^^^^^^^
    |
 help: Remove unused import
-
-ℹ Safe fix
-63 63 | from typing import AsyncIterable, AsyncGenerator  # noqa
-64 64 | 
-65 65 | # This should mark F501 as unused.
-66    |-from typing import Awaitable, AwaitableGenerator  # noqa: F501
+63 | from typing import AsyncIterable, AsyncGenerator  # noqa
+64 | 
+65 | # This should mark F501 as unused.
+   - from typing import Awaitable, AwaitableGenerator  # noqa: F501
 
 F401 [*] `typing.AwaitableGenerator` imported but unused
   --> F401_7.py:66:31
@@ -46,9 +42,7 @@ F401 [*] `typing.AwaitableGenerator` imported but unused
    |                               ^^^^^^^^^^^^^^^^^^
    |
 help: Remove unused import
-
-ℹ Safe fix
-63 63 | from typing import AsyncIterable, AsyncGenerator  # noqa
-64 64 | 
-65 65 | # This should mark F501 as unused.
-66    |-from typing import Awaitable, AwaitableGenerator  # noqa: F501
+63 | from typing import AsyncIterable, AsyncGenerator  # noqa
+64 | 
+65 | # This should mark F501 as unused.
+   - from typing import Awaitable, AwaitableGenerator  # noqa: F501
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap
index 85c2ef1cc8..b5f8f7063e 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap
@@ -9,10 +9,8 @@ F401 [*] `foo.baz` imported but unused
   |                      ^^^
   |
 help: Remove unused import: `foo.baz`
-
-ℹ Safe fix
-1 1 | """Test: late-binding of `__all__`."""
-2 2 | 
-3 3 | __all__ = ("bar",)
-4   |-from foo import bar, baz
-  4 |+from foo import bar
+1 | """Test: late-binding of `__all__`."""
+2 | 
+3 | __all__ = ("bar",)
+  - from foo import bar, baz
+4 + from foo import bar
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap
index 62d0728c6f..575370185e 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused
    |        ^^^
    |
 help: Remove unused import: `sys`
-
-ℹ Unsafe fix
-16 16 | import argparse as argparse  # Ok: is redundant alias
-17 17 | 
-18 18 | 
-19    |-import sys  # F401: remove unused
-20 19 | 
-21 20 | 
-22 21 | # first-party
+16 | import argparse as argparse  # Ok: is redundant alias
+17 | 
+18 | 
+   - import sys  # F401: remove unused
+19 | 
+20 | 
+21 | # first-party
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:33:15
@@ -25,15 +24,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
    |               ^^^^^^
    |
 help: Remove unused import: `.unused`
-
-ℹ Unsafe fix
-30 30 | from . import aliased as aliased  # Ok: is redundant alias
-31 31 | 
-32 32 | 
-33    |-from . import unused  # F401: change to redundant alias
-34 33 | 
-35 34 | 
-36 35 | from . import renamed as bees  # F401: no fix
+30 | from . import aliased as aliased  # Ok: is redundant alias
+31 | 
+32 | 
+   - from . import unused  # F401: change to redundant alias
+33 | 
+34 | 
+35 | from . import renamed as bees  # F401: no fix
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:36:26
@@ -42,9 +40,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
    |                          ^^^^
    |
 help: Remove unused import: `.renamed`
-
-ℹ Unsafe fix
-33 33 | from . import unused  # F401: change to redundant alias
-34 34 | 
-35 35 | 
-36    |-from . import renamed as bees  # F401: no fix
+33 | from . import unused  # F401: change to redundant alias
+34 | 
+35 | 
+   - from . import renamed as bees  # F401: no fix
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap
index 3be84f3e29..7e16f3ec9c 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused
    |        ^^^
    |
 help: Remove unused import: `sys`
-
-ℹ Unsafe fix
-16 16 | import argparse  # Ok: is exported in __all__
-17 17 | 
-18 18 | 
-19    |-import sys  # F401: remove unused
-20 19 | 
-21 20 | 
-22 21 | # first-party
+16 | import argparse  # Ok: is exported in __all__
+17 | 
+18 | 
+   - import sys  # F401: remove unused
+19 | 
+20 | 
+21 | # first-party
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:36:15
@@ -25,15 +24,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
    |               ^^^^^^
    |
 help: Remove unused import: `.unused`
-
-ℹ Unsafe fix
-33 33 | from . import exported  # Ok: is exported in __all__
-34 34 | 
-35 35 | 
-36    |-from . import unused  # F401: add to __all__
-37 36 | 
-38 37 | 
-39 38 | from . import renamed as bees  # F401: add to __all__
+33 | from . import exported  # Ok: is exported in __all__
+34 | 
+35 | 
+   - from . import unused  # F401: add to __all__
+36 | 
+37 | 
+38 | from . import renamed as bees  # F401: add to __all__
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:39:26
@@ -42,12 +40,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
    |                          ^^^^
    |
 help: Remove unused import: `.renamed`
-
-ℹ Unsafe fix
-36 36 | from . import unused  # F401: add to __all__
-37 37 | 
-38 38 | 
-39    |-from . import renamed as bees  # F401: add to __all__
-40 39 | 
-41 40 | 
-42 41 | __all__ = ["argparse", "exported"]
+36 | from . import unused  # F401: add to __all__
+37 | 
+38 | 
+   - from . import renamed as bees  # F401: add to __all__
+39 | 
+40 | 
+41 | __all__ = ["argparse", "exported"]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap
index 52b04aa829..577fcb0a21 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
   |               ^^^^^^
   |
 help: Remove unused import: `.unused`
-
-ℹ Unsafe fix
-2 2 | """
-3 3 | 
-4 4 | 
-5   |-from . import unused  # F401: add to __all__
-6 5 | 
-7 6 | 
-8 7 | from . import renamed as bees  # F401: add to __all__
+2 | """
+3 | 
+4 | 
+  - from . import unused  # F401: add to __all__
+5 | 
+6 | 
+7 | from . import renamed as bees  # F401: add to __all__
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
  --> __init__.py:8:26
@@ -25,12 +24,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
   |                          ^^^^
   |
 help: Remove unused import: `.renamed`
-
-ℹ Unsafe fix
-5 5 | from . import unused  # F401: add to __all__
-6 6 | 
-7 7 | 
-8   |-from . import renamed as bees  # F401: add to __all__
-9 8 | 
-10 9 | 
-11 10 | __all__ = []
+5  | from . import unused  # F401: add to __all__
+6  | 
+7  | 
+   - from . import renamed as bees  # F401: add to __all__
+8  | 
+9  | 
+10 | __all__ = []
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap
index 5308d3121e..61891af74d 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
   |               ^^^^^^
   |
 help: Remove unused import: `.unused`
-
-ℹ Unsafe fix
-2 2 | """
-3 3 | 
-4 4 | 
-5   |-from . import unused  # F401: recommend add to all w/o fix
-6 5 | 
-7 6 | 
-8 7 | from . import renamed as bees  # F401: recommend add to all w/o fix
+2 | """
+3 | 
+4 | 
+  - from . import unused  # F401: recommend add to all w/o fix
+5 | 
+6 | 
+7 | from . import renamed as bees  # F401: recommend add to all w/o fix
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
  --> __init__.py:8:26
@@ -25,12 +24,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
   |                          ^^^^
   |
 help: Remove unused import: `.renamed`
-
-ℹ Unsafe fix
-5 5 | from . import unused  # F401: recommend add to all w/o fix
-6 6 | 
-7 7 | 
-8   |-from . import renamed as bees  # F401: recommend add to all w/o fix
-9 8 | 
-10 9 | 
-11 10 | __all__ = None
+5  | from . import unused  # F401: recommend add to all w/o fix
+6  | 
+7  | 
+   - from . import renamed as bees  # F401: recommend add to all w/o fix
+8  | 
+9  | 
+10 | __all__ = None
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap
index 6f5291bb12..6b471beba3 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
   |               ^^^^^^
   |
 help: Remove unused import
-
-ℹ Unsafe fix
-2 2 | """
-3 3 | 
-4 4 | 
-5   |-from . import unused, renamed as bees  # F401: add to __all__
-6 5 | 
-7 6 | 
-8 7 | __all__ = [];
+2 | """
+3 | 
+4 | 
+  - from . import unused, renamed as bees  # F401: add to __all__
+5 | 
+6 | 
+7 | __all__ = [];
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
  --> __init__.py:5:34
@@ -25,12 +24,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
   |                                  ^^^^
   |
 help: Remove unused import
-
-ℹ Unsafe fix
-2 2 | """
-3 3 | 
-4 4 | 
-5   |-from . import unused, renamed as bees  # F401: add to __all__
-6 5 | 
-7 6 | 
-8 7 | __all__ = [];
+2 | """
+3 | 
+4 | 
+  - from . import unused, renamed as bees  # F401: add to __all__
+5 | 
+6 | 
+7 | __all__ = [];
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap
index 8483e6b58f..5e21848e88 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap
@@ -12,16 +12,15 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
 10 | if sys.version_info > (3, 9):
    |
 help: Remove unused import
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | import sys
-7 7 | 
-8   |-from . import unused, exported, renamed as bees
-  8 |+from . import exported
-9 9 | 
-10 10 | if sys.version_info > (3, 9):
-11 11 |     from . import also_exported
+5  | 
+6  | import sys
+7  | 
+   - from . import unused, exported, renamed as bees
+8  + from . import exported
+9  | 
+10 | if sys.version_info > (3, 9):
+11 |     from . import also_exported
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:8:44
@@ -34,13 +33,12 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
 10 | if sys.version_info > (3, 9):
    |
 help: Remove unused import
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | import sys
-7 7 | 
-8   |-from . import unused, exported, renamed as bees
-  8 |+from . import exported
-9 9 | 
-10 10 | if sys.version_info > (3, 9):
-11 11 |     from . import also_exported
+5  | 
+6  | import sys
+7  | 
+   - from . import unused, exported, renamed as bees
+8  + from . import exported
+9  | 
+10 | if sys.version_info > (3, 9):
+11 |     from . import also_exported
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap
index 09741b40a6..ab41348146 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap
@@ -10,9 +10,7 @@ F401 [*] `.main.MaμToMan` imported but unused
   |                   ^^^^^^^^
   |
 help: Remove unused import: `.main.MaμToMan`
-
-ℹ Safe fix
-3 3 | even if they have characters in them that undergo NFKC normalization
-4 4 | """
-5 5 | 
-6   |-from .main import MaµToMan
+3 | even if they have characters in them that undergo NFKC normalization
+4 | """
+5 | 
+  - from .main import MaµToMan
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap
index e12ae328c0..27314e15d6 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap
@@ -12,15 +12,13 @@ F504 [*] `%`-format string has unused named argument(s): b
 5 | hidden = {"a": "!"}
   |
 help: Remove extra named arguments: b
-
-ℹ Safe 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)
-  3 |+"%(a)s %(c)s" % {a: "?", }  # F504 ("b" not used)
-4 4 | 
-5 5 | hidden = {"a": "!"}
-6 6 | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
+1 | # Ruff has no way of knowing if the following are F505s
+2 | a = "wrong"
+  - "%(a)s %(c)s" % {a: "?", "b": "!"}  # F504 ("b" not used)
+3 + "%(a)s %(c)s" % {a: "?", }  # F504 ("b" not used)
+4 | 
+5 | hidden = {"a": "!"}
+6 | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
 
 F504 [*] `%`-format string has unused named argument(s): b
  --> F504.py:8:1
@@ -32,16 +30,14 @@ F504 [*] `%`-format string has unused named argument(s): b
 9 | "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
   |
 help: Remove extra named arguments: b
-
-ℹ Safe fix
-5 5 | hidden = {"a": "!"}
-6 6 | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
-7 7 | 
-8   |-"%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
-  8 |+"%(a)s" % {"a": 1, }  # F504 ("b" not used)
-9 9 | "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
-10 10 | 
-11 11 | '' % {'a''b' : ''}  # F504 ("ab" not used)
+5  | hidden = {"a": "!"}
+6  | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
+7  | 
+   - "%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
+8  + "%(a)s" % {"a": 1, }  # F504 ("b" not used)
+9  | "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
+10 | 
+11 | '' % {'a''b' : ''}  # F504 ("ab" not used)
 
 F504 [*] `%`-format string has unused named argument(s): b
   --> F504.py:9:1
@@ -53,16 +49,14 @@ F504 [*] `%`-format string has unused named argument(s): b
 11 | '' % {'a''b' : ''}  # F504 ("ab" not used)
    |
 help: Remove extra named arguments: b
-
-ℹ Safe 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)
-9     |-"%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
-   9  |+"%(a)s" % {'a': 1, }  # F504 ("b" not used)
-10 10 | 
-11 11 | '' % {'a''b' : ''}  # F504 ("ab" not used)
-12 12 | 
+6  | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
+7  | 
+8  | "%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
+   - "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
+9  + "%(a)s" % {'a': 1, }  # F504 ("b" not used)
+10 | 
+11 | '' % {'a''b' : ''}  # F504 ("ab" not used)
+12 | 
 
 F504 [*] `%`-format string has unused named argument(s): ab
   --> F504.py:11:1
@@ -75,16 +69,14 @@ F504 [*] `%`-format string has unused named argument(s): ab
 13 | # https://github.com/astral-sh/ruff/issues/4899
    |
 help: Remove extra named arguments: ab
-
-ℹ Safe fix
-8  8  | "%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
-9  9  | "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
-10 10 | 
-11    |-'' % {'a''b' : ''}  # F504 ("ab" not used)
-   11 |+'' % {}  # F504 ("ab" not used)
-12 12 | 
-13 13 | # https://github.com/astral-sh/ruff/issues/4899
-14 14 | "" % {
+8  | "%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
+9  | "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
+10 | 
+   - '' % {'a''b' : ''}  # F504 ("ab" not used)
+11 + '' % {}  # F504 ("ab" not used)
+12 | 
+13 | # https://github.com/astral-sh/ruff/issues/4899
+14 | "" % {
 
 F504 [*] `%`-format string has unused named argument(s): test1, test2
   --> F504.py:14:1
@@ -99,16 +91,14 @@ F504 [*] `%`-format string has unused named argument(s): test1, test2
 19 |   # https://github.com/astral-sh/ruff/issues/18806
    |
 help: Remove extra named arguments: test1, test2
-
-ℹ Safe fix
-12 12 | 
-13 13 | # https://github.com/astral-sh/ruff/issues/4899
-14 14 | "" % {
-15    |-  'test1': '',
16    |-  'test2': '',
-   15 |+  
-17 16 | }
-18 17 | 
-19 18 | # https://github.com/astral-sh/ruff/issues/18806
+12 | 
+13 | # https://github.com/astral-sh/ruff/issues/4899
+14 | "" % {
+   -   'test1': '',
   -   'test2': '',
+15 +   
+16 | }
+17 | 
+18 | # https://github.com/astral-sh/ruff/issues/18806
 
 F504 [*] `%`-format string has unused named argument(s): greeting
   --> F504.py:20:1
@@ -118,10 +108,9 @@ F504 [*] `%`-format string has unused named argument(s): greeting
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove extra named arguments: greeting
-
-ℹ Unsafe fix
-17 17 | }
-18 18 | 
-19 19 | # https://github.com/astral-sh/ruff/issues/18806
-20    |-"Hello, %(name)s" % {"greeting": print(1), "name": "World"}
-   20 |+"Hello, %(name)s" % {"name": "World"}
+17 | }
+18 | 
+19 | # https://github.com/astral-sh/ruff/issues/18806
+   - "Hello, %(name)s" % {"greeting": print(1), "name": "World"}
+20 + "Hello, %(name)s" % {"name": "World"}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap
index a20aace19c..1bbf39535f 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap
@@ -12,13 +12,11 @@ F504 [*] `%`-format string has unused named argument(s): baz
 10 | '%s %s' % {'k': 'v'}  # F503
    |
 help: Remove extra named arguments: baz
-
-ℹ Safe fix
-5 5 | '%s %s' % (1,)  # F507
-6 6 | '%s %s' % (1, 2, 3)  # F507
-7 7 | '%(bar)s' % {}  # F505
-8   |-'%(bar)s' % {'bar': 1, 'baz': 2}  # F504
-  8 |+'%(bar)s' % {'bar': 1, }  # F504
-9 9 | '%(bar)s' % (1, 2, 3)  # F502
-10 10 | '%s %s' % {'k': 'v'}  # F503
-11 11 | '%(bar)*s' % {'bar': 'baz'}  # F506, F508
+5  | '%s %s' % (1,)  # F507
+6  | '%s %s' % (1, 2, 3)  # F507
+7  | '%(bar)s' % {}  # F505
+   - '%(bar)s' % {'bar': 1, 'baz': 2}  # F504
+8  + '%(bar)s' % {'bar': 1, }  # F504
+9  | '%(bar)s' % (1, 2, 3)  # F502
+10 | '%s %s' % {'k': 'v'}  # F503
+11 | '%(bar)*s' % {'bar': 'baz'}  # F506, F508
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap
index e3cd10e673..fd45602cee 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap
@@ -10,13 +10,11 @@ F522 [*] `.format` call has unused named argument(s): bar
 3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
   |
 help: Remove extra named arguments: bar
-
-ℹ Safe fix
-1   |-"{}".format(1, bar=2)  # F522
-  1 |+"{}".format(1, )  # F522
-2 2 | "{bar}{}".format(1, bar=2, spam=3)  # 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
+  - "{}".format(1, bar=2)  # F522
+1 + "{}".format(1, )  # F522
+2 | "{bar}{}".format(1, bar=2, spam=3)  # F522
+3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
+4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
 
 F522 [*] `.format` call has unused named argument(s): spam
  --> F522.py:2:1
@@ -28,14 +26,12 @@ F522 [*] `.format` call has unused named argument(s): spam
 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
   |
 help: Remove extra named arguments: spam
-
-ℹ Safe 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 | (''
+1 | "{}".format(1, bar=2)  # F522
+  - "{bar}{}".format(1, bar=2, spam=3)  # F522
+2 + "{bar}{}".format(1, bar=2, )  # F522
+3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
+4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+5 | (''
 
 F522 [*] `.format` call has unused named argument(s): eggs, ham
  --> F522.py:4:1
@@ -48,16 +44,14 @@ F522 [*] `.format` call has unused named argument(s): eggs, ham
 6 |  .format(x=2))  # F522
   |
 help: Remove extra named arguments: eggs, ham
-
-ℹ Safe 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 | (''
-6 6 |  .format(x=2))  # F522
-7 7 | 
+1 | "{}".format(1, bar=2)  # F522
+2 | "{bar}{}".format(1, bar=2, spam=3)  # F522
+3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
+  - "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+4 + "{bar:{spam}}".format(bar=2, spam=3, )  # F522
+5 | (''
+6 |  .format(x=2))  # F522
+7 | 
 
 F522 [*] `.format` call has unused named argument(s): x
  --> F522.py:5:2
@@ -72,16 +66,14 @@ F522 [*] `.format` call has unused named argument(s): x
 8 |   # https://github.com/astral-sh/ruff/issues/18806
   |
 help: Remove extra named arguments: x
-
-ℹ Safe fix
-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 | (''
-6   |- .format(x=2))  # F522
-  6 |+ .format())  # F522
-7 7 | 
-8 8 | # https://github.com/astral-sh/ruff/issues/18806
-9 9 | # The fix here is unsafe because the unused argument has side effect
+3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
+4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+5 | (''
+  -  .format(x=2))  # F522
+6 +  .format())  # F522
+7 | 
+8 | # https://github.com/astral-sh/ruff/issues/18806
+9 | # The fix here is unsafe because the unused argument has side effect
 
 F522 [*] `.format` call has unused named argument(s): greeting
   --> F522.py:10:1
@@ -94,16 +86,15 @@ F522 [*] `.format` call has unused named argument(s): greeting
 12 | # The fix here is safe because the unused argument has no side effect,
    |
 help: Remove extra named arguments: greeting
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | # https://github.com/astral-sh/ruff/issues/18806
-9  9  | # The fix here is unsafe because the unused argument has side effect
-10    |-"Hello, {name}".format(greeting=print(1), name="World")
-   10 |+"Hello, {name}".format(name="World")
-11 11 | 
-12 12 | # The fix here is safe because the unused argument has no side effect,
-13 13 | # even though the used argument has a side effect
+7  | 
+8  | # https://github.com/astral-sh/ruff/issues/18806
+9  | # The fix here is unsafe because the unused argument has side effect
+   - "Hello, {name}".format(greeting=print(1), name="World")
+10 + "Hello, {name}".format(name="World")
+11 | 
+12 | # The fix here is safe because the unused argument has no side effect,
+13 | # even though the used argument has a side effect
+note: This is an unsafe fix and may change runtime behavior
 
 F522 [*] `.format` call has unused named argument(s): greeting
   --> F522.py:14:1
@@ -114,10 +105,8 @@ F522 [*] `.format` call has unused named argument(s): greeting
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove extra named arguments: greeting
-
-ℹ Safe fix
-11 11 | 
-12 12 | # The fix here is safe because the unused argument has no side effect,
-13 13 | # even though the used argument has a side effect
-14    |-"Hello, {name}".format(greeting="Pikachu", name=print(1))
-   14 |+"Hello, {name}".format(name=print(1))
+11 | 
+12 | # The fix here is safe because the unused argument has no side effect,
+13 | # even though the used argument has a side effect
+   - "Hello, {name}".format(greeting="Pikachu", name=print(1))
+14 + "Hello, {name}".format(name=print(1))
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap
index 73bff9f750..3ac5ff22bb 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap
@@ -11,14 +11,12 @@ F523 [*] `.format` call has unused arguments at position(s): 1
 4 | "{1:{0}}".format(1, 2)  # No issues
   |
 help: Remove extra positional arguments at position(s): 1
-
-ℹ Safe fix
-1 1 | # With indexes
-2   |-"{0}".format(1, 2)  # F523
-  2 |+"{0}".format(1, )  # F523
-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
+1 | # With indexes
+  - "{0}".format(1, 2)  # F523
+2 + "{0}".format(1, )  # F523
+3 | "{1}".format(1, 2, 3)  # F523
+4 | "{1:{0}}".format(1, 2)  # No issues
+5 | "{1:{0}}".format(1, 2, 3)  # F523
 
 F523 `.format` call has unused arguments at position(s): 0, 2
  --> F523.py:3:1
@@ -43,16 +41,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2
 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
   |
 help: Remove extra positional arguments at position(s): 2
-
-ℹ Safe 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
-5   |-"{1:{0}}".format(1, 2, 3)  # F523
-  5 |+"{1:{0}}".format(1, 2, )  # F523
-6 6 | "{0}{2}".format(1, 2)  # F523, # F524
-7 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
-8 8 | 
+2 | "{0}".format(1, 2)  # F523
+3 | "{1}".format(1, 2, 3)  # F523
+4 | "{1:{0}}".format(1, 2)  # No issues
+  - "{1:{0}}".format(1, 2, 3)  # F523
+5 + "{1:{0}}".format(1, 2, )  # F523
+6 | "{0}{2}".format(1, 2)  # F523, # F524
+7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
+8 | 
 
 F523 [*] `.format` call has unused arguments at position(s): 1
  --> F523.py:6:1
@@ -64,16 +60,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1
 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
   |
 help: Remove extra positional arguments at position(s): 1
-
-ℹ Safe 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
-6   |-"{0}{2}".format(1, 2)  # F523, # F524
-  6 |+"{0}{2}".format(1, )  # F523, # F524
-7 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
-8 8 | 
-9 9 | # With no indexes
+3 | "{1}".format(1, 2, 3)  # F523
+4 | "{1:{0}}".format(1, 2)  # No issues
+5 | "{1:{0}}".format(1, 2, 3)  # F523
+  - "{0}{2}".format(1, 2)  # F523, # F524
+6 + "{0}{2}".format(1, )  # F523, # F524
+7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
+8 | 
+9 | # With no indexes
 
 F523 `.format` call has unused arguments at position(s): 0, 3
  --> F523.py:7:1
@@ -97,16 +91,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1
 12 | "{:{}}".format(1, 2)  # No issues
    |
 help: Remove extra positional arguments at position(s): 1
-
-ℹ Safe fix
-7  7  | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
-8  8  | 
-9  9  | # With no indexes
-10    |-"{}".format(1, 2)  # F523
-   10 |+"{}".format(1, )  # F523
-11 11 | "{}".format(1, 2, 3)  # F523
-12 12 | "{:{}}".format(1, 2)  # No issues
-13 13 | "{:{}}".format(1, 2, 3)  # F523
+7  | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
+8  | 
+9  | # With no indexes
+   - "{}".format(1, 2)  # F523
+10 + "{}".format(1, )  # F523
+11 | "{}".format(1, 2, 3)  # F523
+12 | "{:{}}".format(1, 2)  # No issues
+13 | "{:{}}".format(1, 2, 3)  # F523
 
 F523 [*] `.format` call has unused arguments at position(s): 1, 2
   --> F523.py:11:1
@@ -119,16 +111,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1, 2
 13 | "{:{}}".format(1, 2, 3)  # F523
    |
 help: Remove extra positional arguments at position(s): 1, 2
-
-ℹ Safe fix
-8  8  | 
-9  9  | # With no indexes
-10 10 | "{}".format(1, 2)  # F523
-11    |-"{}".format(1, 2, 3)  # F523
-   11 |+"{}".format(1, )  # F523
-12 12 | "{:{}}".format(1, 2)  # No issues
-13 13 | "{:{}}".format(1, 2, 3)  # F523
-14 14 | 
+8  | 
+9  | # With no indexes
+10 | "{}".format(1, 2)  # F523
+   - "{}".format(1, 2, 3)  # F523
+11 + "{}".format(1, )  # F523
+12 | "{:{}}".format(1, 2)  # No issues
+13 | "{:{}}".format(1, 2, 3)  # F523
+14 | 
 
 F523 [*] `.format` call has unused arguments at position(s): 2
   --> F523.py:13:1
@@ -141,16 +131,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2
 15 | # With *args
    |
 help: Remove extra positional arguments at position(s): 2
-
-ℹ Safe fix
-10 10 | "{}".format(1, 2)  # F523
-11 11 | "{}".format(1, 2, 3)  # F523
-12 12 | "{:{}}".format(1, 2)  # No issues
-13    |-"{:{}}".format(1, 2, 3)  # F523
-   13 |+"{:{}}".format(1, 2, )  # F523
-14 14 | 
-15 15 | # With *args
-16 16 | "{0}{1}".format(*args)  # No issues
+10 | "{}".format(1, 2)  # F523
+11 | "{}".format(1, 2, 3)  # F523
+12 | "{:{}}".format(1, 2)  # No issues
+   - "{:{}}".format(1, 2, 3)  # F523
+13 + "{:{}}".format(1, 2, )  # F523
+14 | 
+15 | # With *args
+16 | "{0}{1}".format(*args)  # No issues
 
 F523 `.format` call has unused arguments at position(s): 2
   --> F523.py:19:1
@@ -174,16 +162,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1, 2
 24 | '""{1}{0}'.format(1, 2, 3)  # F523
    |
 help: Remove extra positional arguments at position(s): 1, 2
-
-ℹ Safe 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 | 
+19 | "{0}{1}".format(1, 2, 3, *args)  # F523
+20 | 
+21 | # With nested quotes
+   - "''1{0}".format(1, 2, 3)  # F523
+22 + "''1{0}".format(1, )  # F523
+23 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+24 | '""{1}{0}'.format(1, 2, 3)  # F523
+25 | 
 
 F523 [*] `.format` call has unused arguments at position(s): 2
   --> F523.py:23:1
@@ -195,16 +181,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2
 24 | '""{1}{0}'.format(1, 2, 3)  # F523
    |
 help: Remove extra positional arguments at position(s): 2
-
-ℹ Safe 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
+20 | 
+21 | # With nested quotes
+22 | "''1{0}".format(1, 2, 3)  # F523
+   - "\"\"{1}{0}".format(1, 2, 3)  # F523
+23 + "\"\"{1}{0}".format(1, 2, )  # F523
+24 | '""{1}{0}'.format(1, 2, 3)  # F523
+25 | 
+26 | # With modified indexes
 
 F523 [*] `.format` call has unused arguments at position(s): 2
   --> F523.py:24:1
@@ -217,16 +201,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2
 26 | # With modified indexes
    |
 help: Remove extra positional arguments at position(s): 2
-
-ℹ Safe 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
+21 | # With nested quotes
+22 | "''1{0}".format(1, 2, 3)  # F523
+23 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+   - '""{1}{0}'.format(1, 2, 3)  # F523
+24 + '""{1}{0}'.format(1, 2, )  # F523
+25 | 
+26 | # With modified indexes
+27 | "{1}{2}".format(1, 2, 3)  # F523, # F524
 
 F523 `.format` call has unused arguments at position(s): 0
   --> F523.py:27:1
@@ -274,17 +256,15 @@ F523 [*] `.format` call has unused arguments at position(s): 0
 35 |   # Removing the final argument.
    |
 help: Remove extra positional arguments at position(s): 0
-
-ℹ Safe fix
-29 29 | "{1} {8}".format(0, 1)  # F523, # F524
-30 30 | 
-31 31 | # Multiline
-32    |-(''
-33    |-.format(2))
-   32 |+('')
-34 33 | 
-35 34 | # Removing the final argument.
-36 35 | "Hello".format("world")
+29 | "{1} {8}".format(0, 1)  # F523, # F524
+30 | 
+31 | # Multiline
+   - (''
+   - .format(2))
+32 + ('')
+33 | 
+34 | # Removing the final argument.
+35 | "Hello".format("world")
 
 F523 [*] `.format` call has unused arguments at position(s): 0
   --> F523.py:36:1
@@ -295,16 +275,14 @@ F523 [*] `.format` call has unused arguments at position(s): 0
 37 | "Hello".format("world", key="value")
    |
 help: Remove extra positional arguments at position(s): 0
-
-ℹ Safe fix
-33 33 | .format(2))
-34 34 | 
-35 35 | # Removing the final argument.
-36    |-"Hello".format("world")
-   36 |+"Hello"
-37 37 | "Hello".format("world", key="value")
-38 38 | 
-39 39 | # https://github.com/astral-sh/ruff/issues/18806
+33 | .format(2))
+34 | 
+35 | # Removing the final argument.
+   - "Hello".format("world")
+36 + "Hello"
+37 | "Hello".format("world", key="value")
+38 | 
+39 | # https://github.com/astral-sh/ruff/issues/18806
 
 F523 [*] `.format` call has unused arguments at position(s): 0
   --> F523.py:37:1
@@ -317,16 +295,14 @@ F523 [*] `.format` call has unused arguments at position(s): 0
 39 | # https://github.com/astral-sh/ruff/issues/18806
    |
 help: Remove extra positional arguments at position(s): 0
-
-ℹ Safe fix
-34 34 | 
-35 35 | # Removing the final argument.
-36 36 | "Hello".format("world")
-37    |-"Hello".format("world", key="value")
-   37 |+"Hello".format(key="value")
-38 38 | 
-39 39 | # https://github.com/astral-sh/ruff/issues/18806
-40 40 | # The fix here is unsafe because the unused argument has side effect
+34 | 
+35 | # Removing the final argument.
+36 | "Hello".format("world")
+   - "Hello".format("world", key="value")
+37 + "Hello".format(key="value")
+38 | 
+39 | # https://github.com/astral-sh/ruff/issues/18806
+40 | # The fix here is unsafe because the unused argument has side effect
 
 F523 [*] `.format` call has unused arguments at position(s): 1
   --> F523.py:41:1
@@ -339,16 +315,15 @@ F523 [*] `.format` call has unused arguments at position(s): 1
 43 | # The fix here is safe because the unused argument has no side effect,
    |
 help: Remove extra positional arguments at position(s): 1
-
-ℹ Unsafe fix
-38 38 | 
-39 39 | # https://github.com/astral-sh/ruff/issues/18806
-40 40 | # The fix here is unsafe because the unused argument has side effect
-41    |-"Hello, {0}".format("world", print(1))
-   41 |+"Hello, {0}".format("world", )
-42 42 | 
-43 43 | # The fix here is safe because the unused argument has no side effect,
-44 44 | # even though the used argument has a side effect
+38 | 
+39 | # https://github.com/astral-sh/ruff/issues/18806
+40 | # The fix here is unsafe because the unused argument has side effect
+   - "Hello, {0}".format("world", print(1))
+41 + "Hello, {0}".format("world", )
+42 | 
+43 | # The fix here is safe because the unused argument has no side effect,
+44 | # even though the used argument has a side effect
+note: This is an unsafe fix and may change runtime behavior
 
 F523 [*] `.format` call has unused arguments at position(s): 1
   --> F523.py:45:1
@@ -359,10 +334,8 @@ F523 [*] `.format` call has unused arguments at position(s): 1
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove extra positional arguments at position(s): 1
-
-ℹ Safe fix
-42 42 | 
-43 43 | # The fix here is safe because the unused argument has no side effect,
-44 44 | # even though the used argument has a side effect
-45    |-"Hello, {0}".format(print(1), "Pikachu")
-   45 |+"Hello, {0}".format(print(1), )
+42 | 
+43 | # The fix here is safe because the unused argument has no side effect,
+44 | # even though the used argument has a side effect
+   - "Hello, {0}".format(print(1), "Pikachu")
+45 + "Hello, {0}".format(print(1), )
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap
index a479bd02cb..c4e9cb08c8 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap
@@ -11,16 +11,14 @@ F541 [*] f-string without any placeholders
 8 | e = (
   |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-3 3 | b = f"ghi{'jkl'}"
-4 4 | 
-5 5 | # Errors
-6   |-c = f"def"
-  6 |+c = "def"
-7 7 | d = f"def" + "ghi"
-8 8 | e = (
-9 9 |     f"def" +
+3 | b = f"ghi{'jkl'}"
+4 | 
+5 | # Errors
+  - c = f"def"
+6 + c = "def"
+7 | d = f"def" + "ghi"
+8 | e = (
+9 |     f"def" +
 
 F541 [*] f-string without any placeholders
  --> F541.py:7:5
@@ -33,16 +31,14 @@ F541 [*] f-string without any placeholders
 9 |     f"def" +
   |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Errors
-6 6 | c = f"def"
-7   |-d = f"def" + "ghi"
-  7 |+d = "def" + "ghi"
-8 8 | e = (
-9 9 |     f"def" +
-10 10 |     "ghi"
+4  | 
+5  | # Errors
+6  | c = f"def"
+   - d = f"def" + "ghi"
+7  + d = "def" + "ghi"
+8  | e = (
+9  |     f"def" +
+10 |     "ghi"
 
 F541 [*] f-string without any placeholders
   --> F541.py:9:5
@@ -55,16 +51,14 @@ F541 [*] f-string without any placeholders
 11 | )
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-6  6  | c = f"def"
-7  7  | d = f"def" + "ghi"
-8  8  | e = (
-9     |-    f"def" +
-   9  |+    "def" +
-10 10 |     "ghi"
-11 11 | )
-12 12 | f = (
+6  | c = f"def"
+7  | d = f"def" + "ghi"
+8  | e = (
+   -     f"def" +
+9  +     "def" +
+10 |     "ghi"
+11 | )
+12 | f = (
 
 F541 [*] f-string without any placeholders
   --> F541.py:13:5
@@ -77,16 +71,14 @@ F541 [*] f-string without any placeholders
 15 |     "c"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-10 10 |     "ghi"
-11 11 | )
-12 12 | f = (
-13    |-    f"a"
-   13 |+    "a"
-14 14 |     F"b"
-15 15 |     "c"
-16 16 |     rf"d"
+10 |     "ghi"
+11 | )
+12 | f = (
+   -     f"a"
+13 +     "a"
+14 |     F"b"
+15 |     "c"
+16 |     rf"d"
 
 F541 [*] f-string without any placeholders
   --> F541.py:14:5
@@ -99,16 +91,14 @@ F541 [*] f-string without any placeholders
 16 |     rf"d"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-11 11 | )
-12 12 | f = (
-13 13 |     f"a"
-14    |-    F"b"
-   14 |+    "b"
-15 15 |     "c"
-16 16 |     rf"d"
-17 17 |     fr"e"
+11 | )
+12 | f = (
+13 |     f"a"
+   -     F"b"
+14 +     "b"
+15 |     "c"
+16 |     rf"d"
+17 |     fr"e"
 
 F541 [*] f-string without any placeholders
   --> F541.py:16:5
@@ -121,16 +111,14 @@ F541 [*] f-string without any placeholders
 18 | )
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-13 13 |     f"a"
-14 14 |     F"b"
-15 15 |     "c"
-16    |-    rf"d"
-   16 |+    r"d"
-17 17 |     fr"e"
-18 18 | )
-19 19 | g = f""
+13 |     f"a"
+14 |     F"b"
+15 |     "c"
+   -     rf"d"
+16 +     r"d"
+17 |     fr"e"
+18 | )
+19 | g = f""
 
 F541 [*] f-string without any placeholders
   --> F541.py:17:5
@@ -143,16 +131,14 @@ F541 [*] f-string without any placeholders
 19 | g = f""
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-14 14 |     F"b"
-15 15 |     "c"
-16 16 |     rf"d"
-17    |-    fr"e"
-   17 |+    r"e"
-18 18 | )
-19 19 | g = f""
-20 20 | 
+14 |     F"b"
+15 |     "c"
+16 |     rf"d"
+   -     fr"e"
+17 +     r"e"
+18 | )
+19 | g = f""
+20 | 
 
 F541 [*] f-string without any placeholders
   --> F541.py:19:5
@@ -165,16 +151,14 @@ F541 [*] f-string without any placeholders
 21 | # OK
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-16 16 |     rf"d"
-17 17 |     fr"e"
-18 18 | )
-19    |-g = f""
-   19 |+g = ""
-20 20 | 
-21 21 | # OK
-22 22 | g = f"ghi{123:{45}}"
+16 |     rf"d"
+17 |     fr"e"
+18 | )
+   - g = f""
+19 + g = ""
+20 | 
+21 | # OK
+22 | g = f"ghi{123:{45}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:25:13
@@ -186,16 +170,14 @@ F541 [*] f-string without any placeholders
 27 | v = 23.234234
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-22 22 | g = f"ghi{123:{45}}"
-23 23 | 
-24 24 | # Error
-25    |-h = "x" "y" f"z"
-   25 |+h = "x" "y" "z"
-26 26 | 
-27 27 | v = 23.234234
-28 28 | 
+22 | g = f"ghi{123:{45}}"
+23 | 
+24 | # Error
+   - h = "x" "y" f"z"
+25 + h = "x" "y" "z"
+26 | 
+27 | v = 23.234234
+28 | 
 
 F541 [*] f-string without any placeholders
   --> F541.py:34:7
@@ -207,16 +189,14 @@ F541 [*] f-string without any placeholders
 36 | f"{{test}}"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-31 31 | f"{f'{v:0.2f}'}"
-32 32 | 
-33 33 | # Errors
-34    |-f"{v:{f'0.2f'}}"
-   34 |+f"{v:{'0.2f'}}"
-35 35 | f"{f''}"
-36 36 | f"{{test}}"
-37 37 | f'{{ 40 }}'
+31 | f"{f'{v:0.2f}'}"
+32 | 
+33 | # Errors
+   - f"{v:{f'0.2f'}}"
+34 + f"{v:{'0.2f'}}"
+35 | f"{f''}"
+36 | f"{{test}}"
+37 | f'{{ 40 }}'
 
 F541 [*] f-string without any placeholders
   --> F541.py:35:4
@@ -229,16 +209,14 @@ F541 [*] f-string without any placeholders
 37 | f'{{ 40 }}'
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-32 32 | 
-33 33 | # Errors
-34 34 | f"{v:{f'0.2f'}}"
-35    |-f"{f''}"
-   35 |+f"{''}"
-36 36 | f"{{test}}"
-37 37 | f'{{ 40 }}'
-38 38 | f"{{a {{x}}"
+32 | 
+33 | # Errors
+34 | f"{v:{f'0.2f'}}"
+   - f"{f''}"
+35 + f"{''}"
+36 | f"{{test}}"
+37 | f'{{ 40 }}'
+38 | f"{{a {{x}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:36:1
@@ -251,16 +229,14 @@ F541 [*] f-string without any placeholders
 38 | f"{{a {{x}}"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-33 33 | # Errors
-34 34 | f"{v:{f'0.2f'}}"
-35 35 | f"{f''}"
-36    |-f"{{test}}"
-   36 |+"{test}"
-37 37 | f'{{ 40 }}'
-38 38 | f"{{a {{x}}"
-39 39 | f"{{{{x}}}}"
+33 | # Errors
+34 | f"{v:{f'0.2f'}}"
+35 | f"{f''}"
+   - f"{{test}}"
+36 + "{test}"
+37 | f'{{ 40 }}'
+38 | f"{{a {{x}}"
+39 | f"{{{{x}}}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:37:1
@@ -273,16 +249,14 @@ F541 [*] f-string without any placeholders
 39 | f"{{{{x}}}}"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-34 34 | f"{v:{f'0.2f'}}"
-35 35 | f"{f''}"
-36 36 | f"{{test}}"
-37    |-f'{{ 40 }}'
-   37 |+'{ 40 }'
-38 38 | f"{{a {{x}}"
-39 39 | f"{{{{x}}}}"
-40 40 | ""f""
+34 | f"{v:{f'0.2f'}}"
+35 | f"{f''}"
+36 | f"{{test}}"
+   - f'{{ 40 }}'
+37 + '{ 40 }'
+38 | f"{{a {{x}}"
+39 | f"{{{{x}}}}"
+40 | ""f""
 
 F541 [*] f-string without any placeholders
   --> F541.py:38:1
@@ -295,16 +269,14 @@ F541 [*] f-string without any placeholders
 40 | ""f""
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-35 35 | f"{f''}"
-36 36 | f"{{test}}"
-37 37 | f'{{ 40 }}'
-38    |-f"{{a {{x}}"
-   38 |+"{a {x}"
-39 39 | f"{{{{x}}}}"
-40 40 | ""f""
-41 41 | ''f""
+35 | f"{f''}"
+36 | f"{{test}}"
+37 | f'{{ 40 }}'
+   - f"{{a {{x}}"
+38 + "{a {x}"
+39 | f"{{{{x}}}}"
+40 | ""f""
+41 | ''f""
 
 F541 [*] f-string without any placeholders
   --> F541.py:39:1
@@ -317,16 +289,14 @@ F541 [*] f-string without any placeholders
 41 | ''f""
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-36 36 | f"{{test}}"
-37 37 | f'{{ 40 }}'
-38 38 | f"{{a {{x}}"
-39    |-f"{{{{x}}}}"
-   39 |+"{{x}}"
-40 40 | ""f""
-41 41 | ''f""
-42 42 | (""f""r"")
+36 | f"{{test}}"
+37 | f'{{ 40 }}'
+38 | f"{{a {{x}}"
+   - f"{{{{x}}}}"
+39 + "{{x}}"
+40 | ""f""
+41 | ''f""
+42 | (""f""r"")
 
 F541 [*] f-string without any placeholders
   --> F541.py:40:3
@@ -339,16 +309,14 @@ F541 [*] f-string without any placeholders
 42 | (""f""r"")
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-37 37 | f'{{ 40 }}'
-38 38 | f"{{a {{x}}"
-39 39 | f"{{{{x}}}}"
-40    |-""f""
-   40 |+"" ""
-41 41 | ''f""
-42 42 | (""f""r"")
-43 43 | f"{v:{f"0.2f"}}"
+37 | f'{{ 40 }}'
+38 | f"{{a {{x}}"
+39 | f"{{{{x}}}}"
+   - ""f""
+40 + "" ""
+41 | ''f""
+42 | (""f""r"")
+43 | f"{v:{f"0.2f"}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:41:3
@@ -361,16 +329,14 @@ F541 [*] f-string without any placeholders
 43 | f"{v:{f"0.2f"}}"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-38 38 | f"{{a {{x}}"
-39 39 | f"{{{{x}}}}"
-40 40 | ""f""
-41    |-''f""
-   41 |+''""
-42 42 | (""f""r"")
-43 43 | f"{v:{f"0.2f"}}"
-44 44 | f"\{{x}}"
+38 | f"{{a {{x}}"
+39 | f"{{{{x}}}}"
+40 | ""f""
+   - ''f""
+41 + ''""
+42 | (""f""r"")
+43 | f"{v:{f"0.2f"}}"
+44 | f"\{{x}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:42:4
@@ -383,15 +349,13 @@ F541 [*] f-string without any placeholders
 44 | f"\{{x}}"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-39 39 | f"{{{{x}}}}"
-40 40 | ""f""
-41 41 | ''f""
-42    |-(""f""r"")
-   42 |+("" ""r"")
-43 43 | f"{v:{f"0.2f"}}"
-44 44 | f"\{{x}}"
+39 | f"{{{{x}}}}"
+40 | ""f""
+41 | ''f""
+   - (""f""r"")
+42 + ("" ""r"")
+43 | f"{v:{f"0.2f"}}"
+44 | f"\{{x}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:43:7
@@ -403,14 +367,12 @@ F541 [*] f-string without any placeholders
 44 | f"\{{x}}"
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-40 40 | ""f""
-41 41 | ''f""
-42 42 | (""f""r"")
-43    |-f"{v:{f"0.2f"}}"
-   43 |+f"{v:{"0.2f"}}"
-44 44 | f"\{{x}}"
+40 | ""f""
+41 | ''f""
+42 | (""f""r"")
+   - f"{v:{f"0.2f"}}"
+43 + f"{v:{"0.2f"}}"
+44 | f"\{{x}}"
 
 F541 [*] f-string without any placeholders
   --> F541.py:44:1
@@ -421,10 +383,8 @@ F541 [*] f-string without any placeholders
    | ^^^^^^^^^
    |
 help: Remove extraneous `f` prefix
-
-ℹ Safe fix
-41 41 | ''f""
-42 42 | (""f""r"")
-43 43 | f"{v:{f"0.2f"}}"
-44    |-f"\{{x}}"
-   44 |+"\{x}"
+41 | ''f""
+42 | (""f""r"")
+43 | f"{v:{f"0.2f"}}"
+   - f"\{{x}}"
+44 + "\{x}"
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap
index adf7c6cfb2..3f893c9f48 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap
@@ -94,15 +94,14 @@ F601 [*] Dictionary key literal `"a"` repeated
 19 | }
    |
 help: Remove repeated key literal `"a"`
-
-ℹ Unsafe fix
-15 15 |     "a": 1,
-16 16 |     "a": 2,
-17 17 |     "a": 3,
-18    |-    "a": 3,
-19 18 | }
-20 19 | 
-21 20 | x = {
+15 |     "a": 1,
+16 |     "a": 2,
+17 |     "a": 3,
+   -     "a": 3,
+18 | }
+19 | 
+20 | x = {
+note: This is an unsafe fix and may change runtime behavior
 
 F601 Dictionary key literal `"a"` repeated
   --> F601.py:23:5
@@ -139,15 +138,14 @@ F601 [*] Dictionary key literal `"a"` repeated
 27 | }
    |
 help: Remove repeated key literal `"a"`
-
-ℹ Unsafe fix
-22 22 |     "a": 1,
-23 23 |     "a": 2,
-24 24 |     "a": 3,
-25    |-    "a": 3,
-26 25 |     "a": 4,
-27 26 | }
-28 27 | 
+22 |     "a": 1,
+23 |     "a": 2,
+24 |     "a": 3,
+   -     "a": 3,
+25 |     "a": 4,
+26 | }
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F601 Dictionary key literal `"a"` repeated
   --> F601.py:26:5
@@ -171,15 +169,14 @@ F601 [*] Dictionary key literal `"a"` repeated
 33 |     "a": 3,
    |
 help: Remove repeated key literal `"a"`
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | x = {
-30 30 |     "a": 1,
-31    |-    "a": 1,
-32 31 |     "a": 2,
-33 32 |     "a": 3,
-34 33 |     "a": 4,
+28 | 
+29 | x = {
+30 |     "a": 1,
+   -     "a": 1,
+31 |     "a": 2,
+32 |     "a": 3,
+33 |     "a": 4,
+note: This is an unsafe fix and may change runtime behavior
 
 F601 Dictionary key literal `"a"` repeated
   --> F601.py:32:5
@@ -251,15 +248,14 @@ F601 [*] Dictionary key literal `"a"` repeated
 47 | }
    |
 help: Remove repeated key literal `"a"`
-
-ℹ Unsafe fix
-42 42 |     a: 2,
-43 43 |     "a": 3,
-44 44 |     a: 3,
-45    |-    "a": 3,
-46 45 |     a: 4,
-47 46 | }
-48 47 | 
+42 |     a: 2,
+43 |     "a": 3,
+44 |     a: 3,
+   -     "a": 3,
+45 |     a: 4,
+46 | }
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F601 [*] Dictionary key literal `"a"` repeated
   --> F601.py:49:14
@@ -271,16 +267,15 @@ F601 [*] Dictionary key literal `"a"` repeated
 50 | x = {"a": 1, "b": 2, "a": 1}
    |
 help: Remove repeated key literal `"a"`
-
-ℹ Unsafe fix
-46 46 |     a: 4,
-47 47 | }
-48 48 | 
-49    |-x = {"a": 1, "a": 1}
-   49 |+x = {"a": 1}
-50 50 | x = {"a": 1, "b": 2, "a": 1}
-51 51 | 
-52 52 | x = {
+46 |     a: 4,
+47 | }
+48 | 
+   - x = {"a": 1, "a": 1}
+49 + x = {"a": 1}
+50 | x = {"a": 1, "b": 2, "a": 1}
+51 | 
+52 | x = {
+note: This is an unsafe fix and may change runtime behavior
 
 F601 [*] Dictionary key literal `"a"` repeated
   --> F601.py:50:22
@@ -292,16 +287,15 @@ F601 [*] Dictionary key literal `"a"` repeated
 52 | x = {
    |
 help: Remove repeated key literal `"a"`
-
-ℹ Unsafe fix
-47 47 | }
-48 48 | 
-49 49 | x = {"a": 1, "a": 1}
-50    |-x = {"a": 1, "b": 2, "a": 1}
-   50 |+x = {"a": 1, "b": 2}
-51 51 | 
-52 52 | x = {
-53 53 |     ('a', 'b'): 'asdf',
+47 | }
+48 | 
+49 | x = {"a": 1, "a": 1}
+   - x = {"a": 1, "b": 2, "a": 1}
+50 + x = {"a": 1, "b": 2}
+51 | 
+52 | x = {
+53 |     ('a', 'b'): 'asdf',
+note: This is an unsafe fix and may change runtime behavior
 
 F601 Dictionary key literal `('a', 'b')` repeated
   --> F601.py:54:5
@@ -324,16 +318,15 @@ F601 [*] Dictionary key literal `"x"` repeated
 60 | t={"x":("test123"), "x":"test123"}
    |
 help: Remove repeated key literal `"x"`
-
-ℹ Unsafe fix
-55 55 | }
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897
-58    |-t={"x":"test123", "x":("test123")}
-   58 |+t={"x":"test123"}
-59 59 | 
-60 60 | t={"x":("test123"), "x":"test123"}
-61 61 | 
+55 | }
+56 | 
+57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897
+   - t={"x":"test123", "x":("test123")}
+58 + t={"x":"test123"}
+59 | 
+60 | t={"x":("test123"), "x":"test123"}
+61 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F601 [*] Dictionary key literal `"x"` repeated
   --> F601.py:60:21
@@ -346,16 +339,15 @@ F601 [*] Dictionary key literal `"x"` repeated
 62 | # Regression test for: https://github.com/astral-sh/ruff/issues/12772
    |
 help: Remove repeated key literal `"x"`
-
-ℹ Unsafe fix
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897
-58 58 | t={"x":"test123", "x":("test123")}
-59 59 | 
-60    |-t={"x":("test123"), "x":"test123"}
-   60 |+t={"x":("test123")}
-61 61 | 
-62 62 | # Regression test for: https://github.com/astral-sh/ruff/issues/12772
-63 63 | x = {
+57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897
+58 | t={"x":"test123", "x":("test123")}
+59 | 
+   - t={"x":("test123"), "x":"test123"}
+60 + t={"x":("test123")}
+61 | 
+62 | # Regression test for: https://github.com/astral-sh/ruff/issues/12772
+63 | x = {
+note: This is an unsafe fix and may change runtime behavior
 
 F601 Dictionary key literal `1` repeated
   --> F601.py:65:5
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap
index f49f8ea2ec..fef3946669 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap
@@ -47,15 +47,14 @@ F602 [*] Dictionary key `a` repeated
 14 | }
    |
 help: Remove repeated key `a`
-
-ℹ Unsafe fix
-10 10 |     a: 1,
-11 11 |     a: 2,
-12 12 |     a: 3,
-13    |-    a: 3,
-14 13 | }
-15 14 | 
-16 15 | x = {
+10 |     a: 1,
+11 |     a: 2,
+12 |     a: 3,
+   -     a: 3,
+13 | }
+14 | 
+15 | x = {
+note: This is an unsafe fix and may change runtime behavior
 
 F602 Dictionary key `a` repeated
   --> F602.py:18:5
@@ -92,15 +91,14 @@ F602 [*] Dictionary key `a` repeated
 22 | }
    |
 help: Remove repeated key `a`
-
-ℹ Unsafe fix
-17 17 |     a: 1,
-18 18 |     a: 2,
-19 19 |     a: 3,
-20    |-    a: 3,
-21 20 |     a: 4,
-22 21 | }
-23 22 | 
+17 |     a: 1,
+18 |     a: 2,
+19 |     a: 3,
+   -     a: 3,
+20 |     a: 4,
+21 | }
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F602 Dictionary key `a` repeated
   --> F602.py:21:5
@@ -124,15 +122,14 @@ F602 [*] Dictionary key `a` repeated
 28 |     a: 3,
    |
 help: Remove repeated key `a`
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | x = {
-25 25 |     a: 1,
-26    |-    a: 1,
-27 26 |     a: 2,
-28 27 |     a: 3,
-29 28 |     a: 4,
+23 | 
+24 | x = {
+25 |     a: 1,
+   -     a: 1,
+26 |     a: 2,
+27 |     a: 3,
+28 |     a: 4,
+note: This is an unsafe fix and may change runtime behavior
 
 F602 Dictionary key `a` repeated
   --> F602.py:27:5
@@ -180,15 +177,14 @@ F602 [*] Dictionary key `a` repeated
 37 |     a: 2,
    |
 help: Remove repeated key `a`
-
-ℹ Unsafe fix
-32 32 | x = {
-33 33 |     a: 1,
-34 34 |     "a": 1,
-35    |-    a: 1,
-36 35 |     "a": 2,
-37 36 |     a: 2,
-38 37 |     "a": 3,
+32 | x = {
+33 |     a: 1,
+34 |     "a": 1,
+   -     a: 1,
+35 |     "a": 2,
+36 |     a: 2,
+37 |     "a": 3,
+note: This is an unsafe fix and may change runtime behavior
 
 F602 Dictionary key `a` repeated
   --> F602.py:37:5
@@ -235,14 +231,13 @@ F602 [*] Dictionary key `a` repeated
 45 | x = {a: 1, b: 2, a: 1}
    |
 help: Remove repeated key `a`
-
-ℹ Unsafe fix
-41 41 |     a: 4,
-42 42 | }
-43 43 | 
-44    |-x = {a: 1, a: 1}
-   44 |+x = {a: 1}
-45 45 | x = {a: 1, b: 2, a: 1}
+41 |     a: 4,
+42 | }
+43 | 
+   - x = {a: 1, a: 1}
+44 + x = {a: 1}
+45 | x = {a: 1, b: 2, a: 1}
+note: This is an unsafe fix and may change runtime behavior
 
 F602 [*] Dictionary key `a` repeated
   --> F602.py:45:18
@@ -252,10 +247,9 @@ F602 [*] Dictionary key `a` repeated
    |                  ^
    |
 help: Remove repeated key `a`
-
-ℹ Unsafe fix
-42 42 | }
-43 43 | 
-44 44 | x = {a: 1, a: 1}
-45    |-x = {a: 1, b: 2, a: 1}
-   45 |+x = {a: 1, b: 2}
+42 | }
+43 | 
+44 | x = {a: 1, a: 1}
+   - x = {a: 1, b: 2, a: 1}
+45 + x = {a: 1, b: 2}
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap
index a0fc045e36..a45eb31267 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap
@@ -9,13 +9,11 @@ F632 [*] Use `==` to compare constant literals
 2 |     pass
   |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-1   |-if x is "abc":
-  1 |+if x == "abc":
-2 2 |     pass
-3 3 | 
-4 4 | if 123 is not y:
+  - if x is "abc":
+1 + if x == "abc":
+2 |     pass
+3 | 
+4 | if 123 is not y:
 
 F632 [*] Use `!=` to compare constant literals
  --> F632.py:4:4
@@ -27,16 +25,14 @@ F632 [*] Use `!=` to compare constant literals
 5 |     pass
   |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-1 1 | if x is "abc":
-2 2 |     pass
-3 3 | 
-4   |-if 123 is not y:
-  4 |+if 123 != y:
-5 5 |     pass
-6 6 | 
-7 7 | if 123 is \
+1 | if x is "abc":
+2 |     pass
+3 | 
+  - if 123 is not y:
+4 + if 123 != y:
+5 |     pass
+6 | 
+7 | if 123 is \
 
 F632 [*] Use `!=` to compare constant literals
  --> F632.py:7:4
@@ -50,17 +46,15 @@ F632 [*] Use `!=` to compare constant literals
 9 |       pass
   |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-4 4 | if 123 is not y:
-5 5 |     pass
-6 6 | 
-7   |-if 123 is \
-8   |-        not y:
-  7 |+if 123 != y:
-9 8 |     pass
-10 9 | 
-11 10 | if "123" is x < 3:
+4  | if 123 is not y:
+5  |     pass
+6  | 
+   - if 123 is \
+   -         not y:
+7  + if 123 != y:
+8  |     pass
+9  | 
+10 | if "123" is x < 3:
 
 F632 [*] Use `==` to compare constant literals
   --> F632.py:11:4
@@ -72,16 +66,14 @@ F632 [*] Use `==` to compare constant literals
 12 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-8  8  |         not y:
-9  9  |     pass
-10 10 | 
-11    |-if "123" is x < 3:
-   11 |+if "123" == x < 3:
-12 12 |     pass
-13 13 | 
-14 14 | if "123" != x is 3:
+8  |         not y:
+9  |     pass
+10 | 
+   - if "123" is x < 3:
+11 + if "123" == x < 3:
+12 |     pass
+13 | 
+14 | if "123" != x is 3:
 
 F632 [*] Use `==` to compare constant literals
   --> F632.py:14:4
@@ -93,16 +85,14 @@ F632 [*] Use `==` to compare constant literals
 15 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-11 11 | if "123" is x < 3:
-12 12 |     pass
-13 13 | 
-14    |-if "123" != x is 3:
-   14 |+if "123" != x == 3:
-15 15 |     pass
-16 16 | 
-17 17 | if ("123" != x) is 3:
+11 | if "123" is x < 3:
+12 |     pass
+13 | 
+   - if "123" != x is 3:
+14 + if "123" != x == 3:
+15 |     pass
+16 | 
+17 | if ("123" != x) is 3:
 
 F632 [*] Use `==` to compare constant literals
   --> F632.py:17:4
@@ -114,16 +104,14 @@ F632 [*] Use `==` to compare constant literals
 18 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-14 14 | if "123" != x is 3:
-15 15 |     pass
-16 16 | 
-17    |-if ("123" != x) is 3:
-   17 |+if ("123" != x) == 3:
-18 18 |     pass
-19 19 | 
-20 20 | if "123" != (x is 3):
+14 | if "123" != x is 3:
+15 |     pass
+16 | 
+   - if ("123" != x) is 3:
+17 + if ("123" != x) == 3:
+18 |     pass
+19 | 
+20 | if "123" != (x is 3):
 
 F632 [*] Use `==` to compare constant literals
   --> F632.py:20:14
@@ -135,16 +123,14 @@ F632 [*] Use `==` to compare constant literals
 21 |     pass
    |
 help: Replace `is` with `==`
-
-ℹ Safe fix
-17 17 | if ("123" != x) is 3:
-18 18 |     pass
-19 19 | 
-20    |-if "123" != (x is 3):
-   20 |+if "123" != (x == 3):
-21 21 |     pass
-22 22 | 
-23 23 | {2 is
+17 | if ("123" != x) is 3:
+18 |     pass
+19 | 
+   - if "123" != (x is 3):
+20 + if "123" != (x == 3):
+21 |     pass
+22 | 
+23 | {2 is
 
 F632 [*] Use `!=` to compare constant literals
   --> F632.py:23:2
@@ -159,17 +145,15 @@ F632 [*] Use `!=` to compare constant literals
 26 |   {2 is
    |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-20 20 | if "123" != (x is 3):
-21 21 |     pass
-22 22 | 
-23    |-{2 is
-24    |-not ''}
-   23 |+{2 != ''}
-25 24 | 
-26 25 | {2 is
-27 26 |  not ''}
+20 | if "123" != (x is 3):
+21 |     pass
+22 | 
+   - {2 is
+   - not ''}
+23 + {2 != ''}
+24 | 
+25 | {2 is
+26 |  not ''}
 
 F632 [*] Use `!=` to compare constant literals
   --> F632.py:26:2
@@ -184,17 +168,15 @@ F632 [*] Use `!=` to compare constant literals
 29 |   # Regression test for
    |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-23 23 | {2 is
-24 24 | not ''}
-25 25 | 
-26    |-{2 is
-27    |- not ''}
-   26 |+{2 != ''}
-28 27 | 
-29 28 | # Regression test for
-30 29 | if values[1is not None ] is not '-':
+23 | {2 is
+24 | not ''}
+25 | 
+   - {2 is
+   -  not ''}
+26 + {2 != ''}
+27 | 
+28 | # Regression test for
+29 | if values[1is not None ] is not '-':
 
 F632 [*] Use `!=` to compare constant literals
   --> F632.py:30:4
@@ -205,16 +187,14 @@ F632 [*] Use `!=` to compare constant literals
 31 |     pass
    |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-27 27 |  not ''}
-28 28 | 
-29 29 | # Regression test for
-30    |-if values[1is not None ] is not '-':
-   30 |+if values[1is not None ] != '-':
-31 31 |     pass
-32 32 | 
-33 33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736
+27 |  not ''}
+28 | 
+29 | # Regression test for
+   - if values[1is not None ] is not '-':
+30 + if values[1is not None ] != '-':
+31 |     pass
+32 | 
+33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736
 
 F632 [*] Use `!=` to compare constant literals
   --> F632.py:30:11
@@ -225,16 +205,14 @@ F632 [*] Use `!=` to compare constant literals
 31 |     pass
    |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-27 27 |  not ''}
-28 28 | 
-29 29 | # Regression test for
-30    |-if values[1is not None ] is not '-':
-   30 |+if values[1!= None ] is not '-':
-31 31 |     pass
-32 32 | 
-33 33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736
+27 |  not ''}
+28 | 
+29 | # Regression test for
+   - if values[1is not None ] is not '-':
+30 + if values[1!= None ] is not '-':
+31 |     pass
+32 | 
+33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736
 
 F632 [*] Use `!=` to compare constant literals
   --> F632.py:34:12
@@ -244,10 +222,8 @@ F632 [*] Use `!=` to compare constant literals
    |            ^^^^^^^^^^^^
    |
 help: Replace `is not` with `!=`
-
-ℹ Safe fix
-31 31 |     pass
-32 32 | 
-33 33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736
-34    |-variable: "123 is not y"
-   34 |+variable: "123 != y"
+31 |     pass
+32 | 
+33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736
+   - variable: "123 is not y"
+34 + variable: "123 != y"
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap
index 70cee8d8c0..4e2418dd03 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap
@@ -17,15 +17,13 @@ F811 [*] Redefinition of unused `fu` from line 2
   |        -- previous definition of `fu` here
   |
 help: Remove definition: `fu`
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | def bar():
-6   |-    import fu
-7 6 | 
-8 7 |     def baz():
-9 8 |         def fu():
+3 | 
+4 | 
+5 | def bar():
+  -     import fu
+6 | 
+7 |     def baz():
+8 |         def fu():
 
 F811 Redefinition of unused `fu` from line 6
   --> F811_17.py:6:12
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap
index 196596c3ce..2da69cf461 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap
@@ -19,15 +19,13 @@ F811 [*] Redefinition of unused `Sequence` from line 26
 27 | )
    |
 help: Remove definition: `Sequence`
-
-ℹ Safe fix
-27 27 | )
-28 28 | 
-29 29 | # This should ignore the first error.
-30    |-from typing import (
-31    |-    List,  # noqa: F811
-32    |-    Sequence,
-33    |-)
-34 30 | 
-35 31 | # This should ignore both errors.
-36 32 | from typing import (  # noqa
+27 | )
+28 | 
+29 | # This should ignore the first error.
+   - from typing import (
+   -     List,  # noqa: F811
+   -     Sequence,
+   - )
+30 | 
+31 | # This should ignore both errors.
+32 | from typing import (  # noqa
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap
index c6a3a8d8fb..13e51004a0 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap
@@ -12,12 +12,10 @@ F811 [*] Redefinition of unused `List` from line 4
 6 | )
   |
 help: Remove definition: `List`
-
-ℹ Safe fix
-2 2 | 
-3 3 | from typing import (
-4 4 |     List,
-5   |-    List,
-6 5 | )
-7 6 | 
-8 7 |
+2 | 
+3 | from typing import (
+4 |     List,
+  -     List,
+5 | )
+6 | 
+7 |
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap
index cd6894d8c0..ab553d62fc 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap
@@ -13,10 +13,8 @@ F811 [*] Redefinition of unused `os` from line 5
 7 | os.path
   |
 help: Remove definition: `os`
-
-ℹ Safe fix
-3 3 | i = 2
-4 4 | if i == 1:
-5 5 |     import os
-6   |-    import os
-7 6 | os.path
+3 | i = 2
+4 | if i == 1:
+5 |     import os
+  -     import os
+6 | os.path
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap
index e198880e37..356a2d20b6 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap
@@ -13,12 +13,10 @@ F811 [*] Redefinition of unused `os` from line 4
 7 |     pass
   |
 help: Remove definition: `os`
-
-ℹ Safe fix
-2 2 | 
-3 3 | try:
-4 4 |     import os
-5   |-    import os
-6 5 | except:
-7 6 |     pass
-8 7 | os.path
+2 | 
+3 | try:
+4 |     import os
+  -     import os
+5 | except:
+6 |     pass
+7 | os.path
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_18.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_18.py.snap
index a487e4ddb8..95d305eb2b 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_18.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_18.py.snap
@@ -1,5 +1,11 @@
 ---
 source: crates/ruff_linter/src/rules/pyflakes/mod.rs
-snapshot_kind: text
 ---
-
+F821 Undefined name `y`
+  --> F821_18.py:19:7
+   |
+17 | # This is no longer allowed on Python 3.14+
+18 | x: (y := 1)
+19 | print(y)
+   |       ^
+   |
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_2.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_2.py.snap
index 89dd2df81f..d0b409f39e 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_2.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_2.py.snap
@@ -1,12 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/pyflakes/mod.rs
 ---
-F821 Undefined name `Model`
- --> F821_2.py:5:13
-  |
-4 | # F821 Undefined name `Model`
-5 | x: Literal["Model"]
-  |             ^^^^^
-6 |
-7 | from typing_extensions import Literal
-  |
+
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_26.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_26.py.snap
index 9bb838ffff..121eb3edd0 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_26.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_26.py.snap
@@ -21,48 +21,6 @@ F821 Undefined name `C`
 12 | CStr2: TypeAlias = Union["C", str]  # always okay
    |
 
-F821 Undefined name `C`
-  --> F821_26.py:16:12
-   |
-14 | # References to a class from inside the class:
-15 | class C:
-16 |     other: C = ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-   |            ^
-17 |     other2: "C" = ...  # always okay
-18 |     def from_str(self, s: str) -> C: ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-   |
-
-F821 Undefined name `C`
-  --> F821_26.py:18:35
-   |
-16 |     other: C = ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-17 |     other2: "C" = ...  # always okay
-18 |     def from_str(self, s: str) -> C: ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-   |                                   ^
-19 |     def from_str2(self, s: str) -> "C": ...  # always okay
-   |
-
-F821 Undefined name `B`
-  --> F821_26.py:23:10
-   |
-21 | # Circular references:
-22 | class A:
-23 |     foo: B  # valid in a `.pyi` stub file, not in a `.py` runtime file
-   |          ^
-24 |     foo2: "B"  # always okay
-25 |     bar: dict[str, B]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-   |
-
-F821 Undefined name `B`
-  --> F821_26.py:25:20
-   |
-23 |     foo: B  # valid in a `.pyi` stub file, not in a `.py` runtime file
-24 |     foo2: "B"  # always okay
-25 |     bar: dict[str, B]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-   |                    ^
-26 |     bar2: dict[str, "A"]  # always okay
-   |
-
 F821 Undefined name `Tree`
   --> F821_26.py:33:17
    |
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap
index 2361f61f36..78d16bb9be 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap
@@ -11,15 +11,13 @@ F841 [*] Local variable `e` is assigned to but never used
 4 |     pass
   |
 help: Remove assignment to unused variable `e`
-
-ℹ Safe fix
-1 1 | try:
-2 2 |     1 / 0
-3   |-except ValueError as e:
-  3 |+except ValueError:
-4 4 |     pass
-5 5 | 
-6 6 | 
+1 | try:
+2 |     1 / 0
+  - except ValueError as e:
+3 + except ValueError:
+4 |     pass
+5 | 
+6 | 
 
 F841 [*] Local variable `z` is assigned to but never used
   --> F841_0.py:16:5
@@ -30,16 +28,15 @@ F841 [*] Local variable `z` is assigned to but never used
    |     ^
    |
 help: Remove assignment to unused variable `z`
-
-ℹ Unsafe fix
-13 13 | def f():
-14 14 |     x = 1
-15 15 |     y = 2
-16    |-    z = x + y
-   16 |+    x + y
-17 17 | 
-18 18 | 
-19 19 | def f():
+13 | def f():
+14 |     x = 1
+15 |     y = 2
+   -     z = x + y
+16 +     x + y
+17 | 
+18 | 
+19 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `foo` is assigned to but never used
   --> F841_0.py:20:5
@@ -50,15 +47,14 @@ F841 [*] Local variable `foo` is assigned to but never used
 21 |     (a, b) = (1, 2)
    |
 help: Remove assignment to unused variable `foo`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    foo = (1, 2)
-21 20 |     (a, b) = (1, 2)
-22 21 | 
-23 22 |     bar = (1, 2)
+17 | 
+18 | 
+19 | def f():
+   -     foo = (1, 2)
+20 |     (a, b) = (1, 2)
+21 | 
+22 |     bar = (1, 2)
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `a` is assigned to but never used
   --> F841_0.py:21:6
@@ -71,16 +67,15 @@ F841 [*] Local variable `a` is assigned to but never used
 23 |     bar = (1, 2)
    |
 help: Remove assignment to unused variable `a`
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | def f():
-20 20 |     foo = (1, 2)
-21    |-    (a, b) = (1, 2)
-   21 |+    (_a, b) = (1, 2)
-22 22 | 
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
+18 | 
+19 | def f():
+20 |     foo = (1, 2)
+   -     (a, b) = (1, 2)
+21 +     (_a, b) = (1, 2)
+22 | 
+23 |     bar = (1, 2)
+24 |     (c, d) = bar
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `b` is assigned to but never used
   --> F841_0.py:21:9
@@ -93,16 +88,15 @@ F841 [*] Local variable `b` is assigned to but never used
 23 |     bar = (1, 2)
    |
 help: Remove assignment to unused variable `b`
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | def f():
-20 20 |     foo = (1, 2)
-21    |-    (a, b) = (1, 2)
-   21 |+    (a, _b) = (1, 2)
-22 22 | 
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
+18 | 
+19 | def f():
+20 |     foo = (1, 2)
+   -     (a, b) = (1, 2)
+21 +     (a, _b) = (1, 2)
+22 | 
+23 |     bar = (1, 2)
+24 |     (c, d) = bar
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `baz` is assigned to but never used
   --> F841_0.py:26:14
@@ -113,16 +107,15 @@ F841 [*] Local variable `baz` is assigned to but never used
    |              ^^^
    |
 help: Remove assignment to unused variable `baz`
-
-ℹ Unsafe fix
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
-25 25 | 
-26    |-    (x, y) = baz = bar
-   26 |+    (x, y) = bar
-27 27 | 
-28 28 | 
-29 29 | def f():
+23 |     bar = (1, 2)
+24 |     (c, d) = bar
+25 | 
+   -     (x, y) = baz = bar
+26 +     (x, y) = bar
+27 | 
+28 | 
+29 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `b` is assigned to but never used
   --> F841_0.py:51:9
@@ -135,16 +128,15 @@ F841 [*] Local variable `b` is assigned to but never used
 53 |     def d():
    |
 help: Remove assignment to unused variable `b`
-
-ℹ Unsafe fix
-48 48 | 
-49 49 |     def c():
-50 50 |         # F841
-51    |-        b = 1
-   51 |+        pass
-52 52 | 
-53 53 |     def d():
-54 54 |         nonlocal b
+48 | 
+49 |     def c():
+50 |         # F841
+   -         b = 1
+51 +         pass
+52 | 
+53 |     def d():
+54 |         nonlocal b
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `my_file` is assigned to but never used
   --> F841_0.py:79:26
@@ -155,16 +147,15 @@ F841 [*] Local variable `my_file` is assigned to but never used
 80 |         print("hello")
    |
 help: Remove assignment to unused variable `my_file`
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | 
-78 78 | def f():
-79    |-    with open("file") as my_file, open("") as ((this, that)):
-   79 |+    with open("file"), open("") as ((this, that)):
-80 80 |         print("hello")
-81 81 | 
-82 82 | 
+76 | 
+77 | 
+78 | def f():
+   -     with open("file") as my_file, open("") as ((this, that)):
+79 +     with open("file"), open("") as ((this, that)):
+80 |         print("hello")
+81 | 
+82 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `my_file` is assigned to but never used
   --> F841_0.py:85:25
@@ -177,16 +168,15 @@ F841 [*] Local variable `my_file` is assigned to but never used
 87 |     ):
    |
 help: Remove assignment to unused variable `my_file`
-
-ℹ Unsafe fix
-82 82 | 
-83 83 | def f():
-84 84 |     with (
-85    |-        open("file") as my_file,
-   85 |+        open("file"),
-86 86 |         open("") as ((this, that)),
-87 87 |     ):
-88 88 |         print("hello")
+82 | 
+83 | def f():
+84 |     with (
+   -         open("file") as my_file,
+85 +         open("file"),
+86 |         open("") as ((this, that)),
+87 |     ):
+88 |         print("hello")
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `msg3` is assigned to but never used
    --> F841_0.py:102:5
@@ -199,15 +189,14 @@ F841 [*] Local variable `msg3` is assigned to but never used
 104 |         case 1:
     |
 help: Remove assignment to unused variable `msg3`
-
-ℹ Unsafe fix
-99  99  | def f(x: int):
-100 100 |     msg1 = "Hello, world!"
-101 101 |     msg2 = "Hello, world!"
-102     |-    msg3 = "Hello, world!"
-103 102 |     match x:
-104 103 |         case 1:
-105 104 |             print(msg1)
+99  | def f(x: int):
+100 |     msg1 = "Hello, world!"
+101 |     msg2 = "Hello, world!"
+    -     msg3 = "Hello, world!"
+102 |     match x:
+103 |         case 1:
+104 |             print(msg1)
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `Baz` is assigned to but never used
    --> F841_0.py:115:5
@@ -220,16 +209,15 @@ F841 [*] Local variable `Baz` is assigned to but never used
 117 |     match x:
     |
 help: Remove assignment to unused variable `Baz`
-
-ℹ Unsafe fix
-112 112 | 
-113 113 |     Foo = enum.Enum("Foo", "A B")
-114 114 |     Bar = enum.Enum("Bar", "A B")
-115     |-    Baz = enum.Enum("Baz", "A B")
-    115 |+    enum.Enum("Baz", "A B")
-116 116 | 
-117 117 |     match x:
-118 118 |         case (Foo.A):
+112 | 
+113 |     Foo = enum.Enum("Foo", "A B")
+114 |     Bar = enum.Enum("Bar", "A B")
+    -     Baz = enum.Enum("Baz", "A B")
+115 +     enum.Enum("Baz", "A B")
+116 | 
+117 |     match x:
+118 |         case (Foo.A):
+note: This is an unsafe fix and may change runtime behavior
 
 F841 Local variable `y` is assigned to but never used
    --> F841_0.py:122:14
@@ -251,3 +239,60 @@ F841 Local variable `value` is assigned to but never used
 128 |         print(key)
     |
 help: Remove assignment to unused variable `value`
+
+F841 [*] Local variable `__class__` is assigned to but never used
+   --> F841_0.py:168:9
+    |
+166 | class A:
+167 |     def set_class(self, cls):
+168 |         __class__ = cls  # F841
+    |         ^^^^^^^^^
+    |
+help: Remove assignment to unused variable `__class__`
+165 | # variables that don't refer to the special `__class__` cell.
+166 | class A:
+167 |     def set_class(self, cls):
+    -         __class__ = cls  # F841
+168 +         pass  # F841
+169 | 
+170 | 
+171 | class A:
+note: This is an unsafe fix and may change runtime behavior
+
+F841 [*] Local variable `__class__` is assigned to but never used
+   --> F841_0.py:174:13
+    |
+172 |     class B:
+173 |         def set_class(self, cls):
+174 |             __class__ = cls  # F841
+    |             ^^^^^^^^^
+    |
+help: Remove assignment to unused variable `__class__`
+171 | class A:
+172 |     class B:
+173 |         def set_class(self, cls):
+    -             __class__ = cls  # F841
+174 +             pass  # F841
+175 | 
+176 | 
+177 | class A:
+note: This is an unsafe fix and may change runtime behavior
+
+F841 [*] Local variable `__class__` is assigned to but never used
+   --> F841_0.py:182:17
+    |
+180 |             print(__class__)
+181 |             def set_class(self, cls):
+182 |                 __class__ = cls  # F841
+    |                 ^^^^^^^^^
+    |
+help: Remove assignment to unused variable `__class__`
+179 |         class B:
+180 |             print(__class__)
+181 |             def set_class(self, cls):
+    -                 __class__ = cls  # F841
+182 +                 pass  # F841
+183 | 
+184 | 
+185 | # OK, the `__class__` cell is nonlocal and declared as such.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap
index f1b8ea02c3..68bcb7655d 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap
@@ -9,16 +9,15 @@ F841 [*] Local variable `x` is assigned to but never used
   |     ^
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | 
-5 5 | def f():
-6   |-    x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-  6 |+    _x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-7 7 | 
-8 8 | 
-9 9 | def f():
+3 | 
+4 | 
+5 | def f():
+  -     x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
+6 +     _x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
+7 | 
+8 | 
+9 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
  --> F841_1.py:6:8
@@ -28,16 +27,15 @@ F841 [*] Local variable `y` is assigned to but never used
   |        ^
   |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | 
-5 5 | def f():
-6   |-    x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-  6 |+    x, _y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-7 7 | 
-8 8 | 
-9 9 | def f():
+3 | 
+4 | 
+5 | def f():
+  -     x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
+6 +     x, _y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
+7 | 
+8 | 
+9 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `coords` is assigned to but never used
   --> F841_1.py:16:14
@@ -47,16 +45,15 @@ F841 [*] Local variable `coords` is assigned to but never used
    |              ^^^^^^
    |
 help: Remove assignment to unused variable `coords`
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | def f():
-16    |-    (x, y) = coords = 1, 2
-   16 |+    (x, y) = 1, 2
-17 17 | 
-18 18 | 
-19 19 | def f():
+13 | 
+14 | 
+15 | def f():
+   -     (x, y) = coords = 1, 2
+16 +     (x, y) = 1, 2
+17 | 
+18 | 
+19 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `coords` is assigned to but never used
   --> F841_1.py:20:5
@@ -66,16 +63,15 @@ F841 [*] Local variable `coords` is assigned to but never used
    |     ^^^^^^
    |
 help: Remove assignment to unused variable `coords`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    coords = (x, y) = 1, 2
-   20 |+    (x, y) = 1, 2
-21 21 | 
-22 22 | 
-23 23 | def f():
+17 | 
+18 | 
+19 | def f():
+   -     coords = (x, y) = 1, 2
+20 +     (x, y) = 1, 2
+21 | 
+22 | 
+23 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `a` is assigned to but never used
   --> F841_1.py:24:6
@@ -85,13 +81,12 @@ F841 [*] Local variable `a` is assigned to but never used
    |      ^
    |
 help: Remove assignment to unused variable `a`
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (_a, b) = (x, y) = 1, 2  # this triggers F841 on everything
+21 | 
+22 | 
+23 | def f():
+   -     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
+24 +     (_a, b) = (x, y) = 1, 2  # this triggers F841 on everything
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `b` is assigned to but never used
   --> F841_1.py:24:9
@@ -101,13 +96,12 @@ F841 [*] Local variable `b` is assigned to but never used
    |         ^
    |
 help: Remove assignment to unused variable `b`
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (a, _b) = (x, y) = 1, 2  # this triggers F841 on everything
+21 | 
+22 | 
+23 | def f():
+   -     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
+24 +     (a, _b) = (x, y) = 1, 2  # this triggers F841 on everything
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x` is assigned to but never used
   --> F841_1.py:24:15
@@ -117,13 +111,12 @@ F841 [*] Local variable `x` is assigned to but never used
    |               ^
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (a, b) = (_x, y) = 1, 2  # this triggers F841 on everything
+21 | 
+22 | 
+23 | def f():
+   -     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
+24 +     (a, b) = (_x, y) = 1, 2  # this triggers F841 on everything
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
   --> F841_1.py:24:18
@@ -133,10 +126,9 @@ F841 [*] Local variable `y` is assigned to but never used
    |                  ^
    |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (a, b) = (x, _y) = 1, 2  # this triggers F841 on everything
+21 | 
+22 | 
+23 | def f():
+   -     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
+24 +     (a, b) = (x, _y) = 1, 2  # this triggers F841 on everything
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap
index 9ddc03a282..0eb98d599e 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap
@@ -10,15 +10,14 @@ F841 [*] Local variable `x` is assigned to but never used
 6 |     y = 2
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | 
-4 4 | def f():
-5   |-    x = 1
-6 5 |     y = 2
-7 6 | 
-8 7 |     z = 3
+2 | 
+3 | 
+4 | def f():
+  -     x = 1
+5 |     y = 2
+6 | 
+7 |     z = 3
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
  --> F841_3.py:6:5
@@ -31,15 +30,14 @@ F841 [*] Local variable `y` is assigned to but never used
 8 |     z = 3
   |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | def f():
-5 5 |     x = 1
-6   |-    y = 2
-7 6 | 
-8 7 |     z = 3
-9 8 |     print(z)
+3 | 
+4 | def f():
+5 |     x = 1
+  -     y = 2
+6 | 
+7 |     z = 3
+8 |     print(z)
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x` is assigned to but never used
   --> F841_3.py:13:5
@@ -50,15 +48,14 @@ F841 [*] Local variable `x` is assigned to but never used
 14 |     y: int = 2
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-10 10 | 
-11 11 | 
-12 12 | def f():
-13    |-    x: int = 1
-14 13 |     y: int = 2
-15 14 | 
-16 15 |     z: int = 3
+10 | 
+11 | 
+12 | def f():
+   -     x: int = 1
+13 |     y: int = 2
+14 | 
+15 |     z: int = 3
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
   --> F841_3.py:14:5
@@ -71,15 +68,14 @@ F841 [*] Local variable `y` is assigned to but never used
 16 |     z: int = 3
    |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | def f():
-13 13 |     x: int = 1
-14    |-    y: int = 2
-15 14 | 
-16 15 |     z: int = 3
-17 16 |     print(z)
+11 | 
+12 | def f():
+13 |     x: int = 1
+   -     y: int = 2
+14 | 
+15 |     z: int = 3
+16 |     print(z)
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x1` is assigned to but never used
   --> F841_3.py:21:19
@@ -90,16 +86,15 @@ F841 [*] Local variable `x1` is assigned to but never used
 22 |         pass
    |
 help: Remove assignment to unused variable `x1`
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | 
-20 20 | def f():
-21    |-    with foo() as x1:
-   21 |+    with foo():
-22 22 |         pass
-23 23 | 
-24 24 |     with foo() as (x2, y2):
+18 | 
+19 | 
+20 | def f():
+   -     with foo() as x1:
+21 +     with foo():
+22 |         pass
+23 | 
+24 |     with foo() as (x2, y2):
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x3` is assigned to but never used
   --> F841_3.py:27:20
@@ -111,16 +106,15 @@ F841 [*] Local variable `x3` is assigned to but never used
 28 |         pass
    |
 help: Remove assignment to unused variable `x3`
-
-ℹ Unsafe fix
-24 24 |     with foo() as (x2, y2):
-25 25 |         pass
-26 26 | 
-27    |-    with (foo() as x3, foo() as y3, foo() as z3):
-   27 |+    with (foo(), foo() as y3, foo() as z3):
-28 28 |         pass
-29 29 | 
-30 30 | 
+24 |     with foo() as (x2, y2):
+25 |         pass
+26 | 
+   -     with (foo() as x3, foo() as y3, foo() as z3):
+27 +     with (foo(), foo() as y3, foo() as z3):
+28 |         pass
+29 | 
+30 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y3` is assigned to but never used
   --> F841_3.py:27:33
@@ -132,16 +126,15 @@ F841 [*] Local variable `y3` is assigned to but never used
 28 |         pass
    |
 help: Remove assignment to unused variable `y3`
-
-ℹ Unsafe fix
-24 24 |     with foo() as (x2, y2):
-25 25 |         pass
-26 26 | 
-27    |-    with (foo() as x3, foo() as y3, foo() as z3):
-   27 |+    with (foo() as x3, foo(), foo() as z3):
-28 28 |         pass
-29 29 | 
-30 30 | 
+24 |     with foo() as (x2, y2):
+25 |         pass
+26 | 
+   -     with (foo() as x3, foo() as y3, foo() as z3):
+27 +     with (foo() as x3, foo(), foo() as z3):
+28 |         pass
+29 | 
+30 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `z3` is assigned to but never used
   --> F841_3.py:27:46
@@ -153,16 +146,15 @@ F841 [*] Local variable `z3` is assigned to but never used
 28 |         pass
    |
 help: Remove assignment to unused variable `z3`
-
-ℹ Unsafe fix
-24 24 |     with foo() as (x2, y2):
-25 25 |         pass
-26 26 | 
-27    |-    with (foo() as x3, foo() as y3, foo() as z3):
-   27 |+    with (foo() as x3, foo() as y3, foo()):
-28 28 |         pass
-29 29 | 
-30 30 | 
+24 |     with foo() as (x2, y2):
+25 |         pass
+26 | 
+   -     with (foo() as x3, foo() as y3, foo() as z3):
+27 +     with (foo() as x3, foo() as y3, foo()):
+28 |         pass
+29 | 
+30 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x1` is assigned to but never used
   --> F841_3.py:32:6
@@ -174,16 +166,15 @@ F841 [*] Local variable `x1` is assigned to but never used
 34 |     coords3 = (x3, y3) = (1, 2)
    |
 help: Remove assignment to unused variable `x1`
-
-ℹ Unsafe fix
-29 29 | 
-30 30 | 
-31 31 | def f():
-32    |-    (x1, y1) = (1, 2)
-   32 |+    (_x1, y1) = (1, 2)
-33 33 |     (x2, y2) = coords2 = (1, 2)
-34 34 |     coords3 = (x3, y3) = (1, 2)
-35 35 | 
+29 | 
+30 | 
+31 | def f():
+   -     (x1, y1) = (1, 2)
+32 +     (_x1, y1) = (1, 2)
+33 |     (x2, y2) = coords2 = (1, 2)
+34 |     coords3 = (x3, y3) = (1, 2)
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y1` is assigned to but never used
   --> F841_3.py:32:10
@@ -195,16 +186,15 @@ F841 [*] Local variable `y1` is assigned to but never used
 34 |     coords3 = (x3, y3) = (1, 2)
    |
 help: Remove assignment to unused variable `y1`
-
-ℹ Unsafe fix
-29 29 | 
-30 30 | 
-31 31 | def f():
-32    |-    (x1, y1) = (1, 2)
-   32 |+    (x1, _y1) = (1, 2)
-33 33 |     (x2, y2) = coords2 = (1, 2)
-34 34 |     coords3 = (x3, y3) = (1, 2)
-35 35 | 
+29 | 
+30 | 
+31 | def f():
+   -     (x1, y1) = (1, 2)
+32 +     (x1, _y1) = (1, 2)
+33 |     (x2, y2) = coords2 = (1, 2)
+34 |     coords3 = (x3, y3) = (1, 2)
+35 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `coords2` is assigned to but never used
   --> F841_3.py:33:16
@@ -216,16 +206,15 @@ F841 [*] Local variable `coords2` is assigned to but never used
 34 |     coords3 = (x3, y3) = (1, 2)
    |
 help: Remove assignment to unused variable `coords2`
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | def f():
-32 32 |     (x1, y1) = (1, 2)
-33    |-    (x2, y2) = coords2 = (1, 2)
-   33 |+    (x2, y2) = (1, 2)
-34 34 |     coords3 = (x3, y3) = (1, 2)
-35 35 | 
-36 36 | 
+30 | 
+31 | def f():
+32 |     (x1, y1) = (1, 2)
+   -     (x2, y2) = coords2 = (1, 2)
+33 +     (x2, y2) = (1, 2)
+34 |     coords3 = (x3, y3) = (1, 2)
+35 | 
+36 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `coords3` is assigned to but never used
   --> F841_3.py:34:5
@@ -236,16 +225,15 @@ F841 [*] Local variable `coords3` is assigned to but never used
    |     ^^^^^^^
    |
 help: Remove assignment to unused variable `coords3`
-
-ℹ Unsafe fix
-31 31 | def f():
-32 32 |     (x1, y1) = (1, 2)
-33 33 |     (x2, y2) = coords2 = (1, 2)
-34    |-    coords3 = (x3, y3) = (1, 2)
-   34 |+    (x3, y3) = (1, 2)
-35 35 | 
-36 36 | 
-37 37 | def f():
+31 | def f():
+32 |     (x1, y1) = (1, 2)
+33 |     (x2, y2) = coords2 = (1, 2)
+   -     coords3 = (x3, y3) = (1, 2)
+34 +     (x3, y3) = (1, 2)
+35 | 
+36 | 
+37 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x1` is assigned to but never used
   --> F841_3.py:40:26
@@ -257,16 +245,14 @@ F841 [*] Local variable `x1` is assigned to but never used
 41 |         pass
    |
 help: Remove assignment to unused variable `x1`
-
-ℹ Safe fix
-37 37 | def f():
-38 38 |     try:
-39 39 |         1 / 0
-40    |-    except ValueError as x1:
-   40 |+    except ValueError:
-41 41 |         pass
-42 42 | 
-43 43 |     try:
+37 | def f():
+38 |     try:
+39 |         1 / 0
+   -     except ValueError as x1:
+40 +     except ValueError:
+41 |         pass
+42 | 
+43 |     try:
 
 F841 [*] Local variable `x2` is assigned to but never used
   --> F841_3.py:45:47
@@ -278,16 +264,14 @@ F841 [*] Local variable `x2` is assigned to but never used
 46 |         pass
    |
 help: Remove assignment to unused variable `x2`
-
-ℹ Safe fix
-42 42 | 
-43 43 |     try:
-44 44 |         1 / 0
-45    |-    except (ValueError, ZeroDivisionError) as x2:
-   45 |+    except (ValueError, ZeroDivisionError):
-46 46 |         pass
-47 47 | 
-48 48 | 
+42 | 
+43 |     try:
+44 |         1 / 0
+   -     except (ValueError, ZeroDivisionError) as x2:
+45 +     except (ValueError, ZeroDivisionError):
+46 |         pass
+47 | 
+48 | 
 
 F841 [*] Local variable `x` is assigned to but never used
   --> F841_3.py:50:5
@@ -299,16 +283,15 @@ F841 [*] Local variable `x` is assigned to but never used
 52 |         if a is not None
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-47 47 | 
-48 48 | 
-49 49 | def f(a, b):
-50    |-    x = (
-   50 |+    (
-51 51 |         a()
-52 52 |         if a is not None
-53 53 |         else b
+47 | 
+48 | 
+49 | def f(a, b):
+   -     x = (
+50 +     (
+51 |         a()
+52 |         if a is not None
+53 |         else b
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
   --> F841_3.py:56:5
@@ -320,17 +303,16 @@ F841 [*] Local variable `y` is assigned to but never used
 57 |         a() if a is not None else b
    |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-53 53 |         else b
-54 54 |     )
-55 55 | 
-56    |-    y = \
-57    |-        a() if a is not None else b
-   56 |+    a() if a is not None else b
-58 57 | 
-59 58 | 
-60 59 | def f(a, b):
+53 |         else b
+54 |     )
+55 | 
+   -     y = \
+   -         a() if a is not None else b
+56 +     a() if a is not None else b
+57 | 
+58 | 
+59 | def f(a, b):
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x` is assigned to but never used
   --> F841_3.py:61:5
@@ -342,19 +324,18 @@ F841 [*] Local variable `x` is assigned to but never used
 63 |         if a is not None
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-58 58 | 
-59 59 | 
-60 60 | def f(a, b):
-61    |-    x = (
-62    |-        a
-63    |-        if a is not None
-64    |-        else b
-65    |-    )
-66 61 | 
-67 62 |     y = \
-68 63 |         a if a is not None else b
+58 | 
+59 | 
+60 | def f(a, b):
+   -     x = (
+   -         a
+   -         if a is not None
+   -         else b
+   -     )
+61 | 
+62 |     y = \
+63 |         a if a is not None else b
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
   --> F841_3.py:67:5
@@ -366,16 +347,15 @@ F841 [*] Local variable `y` is assigned to but never used
 68 |         a if a is not None else b
    |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-64 64 |         else b
-65 65 |     )
-66 66 | 
-67    |-    y = \
-68    |-        a if a is not None else b
-69 67 | 
-70 68 | 
-71 69 | def f():
+64 |         else b
+65 |     )
+66 | 
+   -     y = \
+   -         a if a is not None else b
+67 | 
+68 | 
+69 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `cm` is assigned to but never used
   --> F841_3.py:72:24
@@ -386,16 +366,15 @@ F841 [*] Local variable `cm` is assigned to but never used
 73 |         pass
    |
 help: Remove assignment to unused variable `cm`
-
-ℹ Unsafe fix
-69 69 | 
-70 70 | 
-71 71 | def f():
-72    |-    with Nested(m) as (cm):
-   72 |+    with Nested(m):
-73 73 |         pass
-74 74 | 
-75 75 | 
+69 | 
+70 | 
+71 | def f():
+   -     with Nested(m) as (cm):
+72 +     with Nested(m):
+73 |         pass
+74 | 
+75 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `cm` is assigned to but never used
   --> F841_3.py:77:25
@@ -406,16 +385,15 @@ F841 [*] Local variable `cm` is assigned to but never used
 78 |         pass
    |
 help: Remove assignment to unused variable `cm`
-
-ℹ Unsafe fix
-74 74 | 
-75 75 | 
-76 76 | def f():
-77    |-    with (Nested(m) as (cm),):
-   77 |+    with (Nested(m),):
-78 78 |         pass
-79 79 | 
-80 80 | 
+74 | 
+75 | 
+76 | def f():
+   -     with (Nested(m) as (cm),):
+77 +     with (Nested(m),):
+78 |         pass
+79 | 
+80 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `cm` is assigned to but never used
   --> F841_3.py:87:26
@@ -426,16 +404,15 @@ F841 [*] Local variable `cm` is assigned to but never used
 88 |         pass
    |
 help: Remove assignment to unused variable `cm`
-
-ℹ Unsafe fix
-84 84 | 
-85 85 | 
-86 86 | def f():
-87    |-    with (Nested(m)) as (cm):
-   87 |+    with (Nested(m)):
-88 88 |         pass
-89 89 | 
-90 90 | 
+84 | 
+85 | 
+86 | def f():
+   -     with (Nested(m)) as (cm):
+87 +     with (Nested(m)):
+88 |         pass
+89 | 
+90 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `toplevel` is assigned to but never used
   --> F841_3.py:92:5
@@ -447,16 +424,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used
 94 |         break
    |
 help: Remove assignment to unused variable `toplevel`
-
-ℹ Unsafe fix
-89 89 | 
-90 90 | 
-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 | 
+89 | 
+90 | 
+91 | def f():
+   -     toplevel = tt = lexer.get_token()
+92 +     tt = lexer.get_token()
+93 |     if not tt:
+94 |         break
+95 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `toplevel` is assigned to but never used
   --> F841_3.py:98:5
@@ -466,16 +442,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used
    |     ^^^^^^^^
    |
 help: Remove assignment to unused variable `toplevel`
-
-ℹ Unsafe fix
-95 95 | 
-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():
+95  | 
+96  | 
+97  | def f():
+    -     toplevel = tt = lexer.get_token()
+98  +     tt = lexer.get_token()
+99  | 
+100 | 
+101 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `tt` is assigned to but never used
   --> F841_3.py:98:16
@@ -485,16 +460,15 @@ F841 [*] Local variable `tt` is assigned to but never used
    |                ^^
    |
 help: Remove assignment to unused variable `tt`
-
-ℹ Unsafe fix
-95 95 | 
-96 96 | 
-97 97 | def f():
-98    |-    toplevel = tt = lexer.get_token()
-   98 |+    toplevel = lexer.get_token()
-99 99 | 
-100 100 | 
-101 101 | def f():
+95  | 
+96  | 
+97  | def f():
+    -     toplevel = tt = lexer.get_token()
+98  +     toplevel = lexer.get_token()
+99  | 
+100 | 
+101 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `toplevel` is assigned to but never used
    --> F841_3.py:102:5
@@ -504,16 +478,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used
     |     ^^^^^^^^
     |
 help: Remove assignment to unused variable `toplevel`
-
-ℹ Unsafe fix
-99  99  | 
-100 100 | 
-101 101 | def f():
-102     |-    toplevel = (a, b) = lexer.get_token()
-    102 |+    (a, b) = lexer.get_token()
-103 103 | 
-104 104 | 
-105 105 | def f():
+99  | 
+100 | 
+101 | def f():
+    -     toplevel = (a, b) = lexer.get_token()
+102 +     (a, b) = lexer.get_token()
+103 | 
+104 | 
+105 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `toplevel` is assigned to but never used
    --> F841_3.py:106:14
@@ -523,16 +496,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used
     |              ^^^^^^^^
     |
 help: Remove assignment to unused variable `toplevel`
-
-ℹ Unsafe fix
-103 103 | 
-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():
+103 | 
+104 | 
+105 | def f():
+    -     (a, b) = toplevel = lexer.get_token()
+106 +     (a, b) = lexer.get_token()
+107 | 
+108 | 
+109 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `toplevel` is assigned to but never used
    --> F841_3.py:110:5
@@ -542,16 +514,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used
     |     ^^^^^^^^
     |
 help: Remove assignment to unused variable `toplevel`
-
-ℹ Unsafe fix
-107 107 | 
-108 108 | 
-109 109 | def f():
-110     |-    toplevel = tt = 1
-    110 |+    tt = 1
-111 111 | 
-112 112 | 
-113 113 | def f(provided: int) -> int:
+107 | 
+108 | 
+109 | def f():
+    -     toplevel = tt = 1
+110 +     tt = 1
+111 | 
+112 | 
+113 | def f(provided: int) -> int:
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `tt` is assigned to but never used
    --> F841_3.py:110:16
@@ -561,16 +532,15 @@ F841 [*] Local variable `tt` is assigned to but never used
     |                ^^
     |
 help: Remove assignment to unused variable `tt`
-
-ℹ Unsafe fix
-107 107 | 
-108 108 | 
-109 109 | def f():
-110     |-    toplevel = tt = 1
-    110 |+    toplevel = 1
-111 111 | 
-112 112 | 
-113 113 | def f(provided: int) -> int:
+107 | 
+108 | 
+109 | def f():
+    -     toplevel = tt = 1
+110 +     toplevel = 1
+111 | 
+112 | 
+113 | def f(provided: int) -> int:
+note: This is an unsafe fix and may change runtime behavior
 
 F841 Local variable `x` is assigned to but never used
    --> F841_3.py:115:19
@@ -648,16 +618,14 @@ F841 [*] Local variable `e` is assigned to but never used
 156 |         print("oh no!")
     |
 help: Remove assignment to unused variable `e`
-
-ℹ Safe fix
-152 152 | def f() -> None:
-153 153 |     try:
-154 154 |         print("hello")
-155     |-    except A as e :
-    155 |+    except A:
-156 156 |         print("oh no!")
-157 157 | 
-158 158 | 
+152 | def f() -> None:
+153 |     try:
+154 |         print("hello")
+    -     except A as e :
+155 +     except A:
+156 |         print("oh no!")
+157 | 
+158 | 
 
 F841 [*] Local variable `x` is assigned to but never used
    --> F841_3.py:160:5
@@ -668,15 +636,14 @@ F841 [*] Local variable `x` is assigned to but never used
 161 |     y = 2
     |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-157 157 | 
-158 158 | 
-159 159 | def f():
-160     |-    x = 1
-161 160 |     y = 2
-162 161 | 
-163 162 | 
+157 | 
+158 | 
+159 | def f():
+    -     x = 1
+160 |     y = 2
+161 | 
+162 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
    --> F841_3.py:161:5
@@ -687,15 +654,14 @@ F841 [*] Local variable `y` is assigned to but never used
     |     ^
     |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-158 158 | 
-159 159 | def f():
-160 160 |     x = 1
-161     |-    y = 2
-162 161 | 
-163 162 | 
-164 163 | def f():
+158 | 
+159 | def f():
+160 |     x = 1
+    -     y = 2
+161 | 
+162 | 
+163 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x` is assigned to but never used
    --> F841_3.py:165:5
@@ -707,15 +673,14 @@ F841 [*] Local variable `x` is assigned to but never used
 167 |     y = 2
     |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-162 162 | 
-163 163 | 
-164 164 | def f():
-165     |-    x = 1
-166 165 | 
-167 166 |     y = 2
-168 167 | 
+162 | 
+163 | 
+164 | def f():
+    -     x = 1
+165 | 
+166 |     y = 2
+167 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `y` is assigned to but never used
    --> F841_3.py:167:5
@@ -726,15 +691,14 @@ F841 [*] Local variable `y` is assigned to but never used
     |     ^
     |
 help: Remove assignment to unused variable `y`
-
-ℹ Unsafe fix
-164 164 | def f():
-165 165 |     x = 1
-166 166 | 
-167     |-    y = 2
-168 167 | 
-169 168 | 
-170 169 | def f():
+164 | def f():
+165 |     x = 1
+166 | 
+    -     y = 2
+167 | 
+168 | 
+169 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `x` is assigned to but never used
    --> F841_3.py:173:6
@@ -745,10 +709,9 @@ F841 [*] Local variable `x` is assigned to but never used
     |      ^
     |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-170 170 | def f():
-171 171 |     (x) = foo()
-172 172 |     ((x)) = foo()
-173     |-    (x) = (y.z) = foo()
-    173 |+    (y.z) = foo()
+170 | def f():
+171 |     (x) = foo()
+172 |     ((x)) = foo()
+    -     (x) = (y.z) = foo()
+173 +     (y.z) = foo()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap
index 689aab5390..67450b5d4e 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap
@@ -9,14 +9,12 @@ F901 [*] `raise NotImplemented` should be `raise NotImplementedError`
   |           ^^^^^^^^^^^^^^
   |
 help: Use `raise NotImplementedError`
-
-ℹ Safe fix
-1 1 | def f() -> None:
-2   |-    raise NotImplemented()
-  2 |+    raise NotImplementedError()
-3 3 | 
-4 4 | 
-5 5 | def g() -> None:
+1 | def f() -> None:
+  -     raise NotImplemented()
+2 +     raise NotImplementedError()
+3 | 
+4 | 
+5 | def g() -> None:
 
 F901 [*] `raise NotImplemented` should be `raise NotImplementedError`
  --> F901.py:6:11
@@ -26,16 +24,14 @@ F901 [*] `raise NotImplemented` should be `raise NotImplementedError`
   |           ^^^^^^^^^^^^^^
   |
 help: Use `raise NotImplementedError`
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | def g() -> None:
-6   |-    raise NotImplemented
-  6 |+    raise NotImplementedError
-7 7 | 
-8 8 | 
-9 9 | def h() -> None:
+3 | 
+4 | 
+5 | def g() -> None:
+  -     raise NotImplemented
+6 +     raise NotImplementedError
+7 | 
+8 | 
+9 | def h() -> None:
 
 F901 [*] `raise NotImplemented` should be `raise NotImplementedError`
   --> F901.py:11:11
@@ -46,15 +42,13 @@ F901 [*] `raise NotImplemented` should be `raise NotImplementedError`
    |           ^^^^^^^^^^^^^^
    |
 help: Use `raise NotImplementedError`
-
-ℹ Safe fix
-   1  |+import builtins
-1  2  | def f() -> None:
-2  3  |     raise NotImplemented()
-3  4  | 
+1  + import builtins
+2  | def f() -> None:
+3  |     raise NotImplemented()
+4  | 
 --------------------------------------------------------------------------------
-8  9  | 
-9  10 | def h() -> None:
-10 11 |     NotImplementedError = "foo"
-11    |-    raise NotImplemented
-   12 |+    raise builtins.NotImplementedError
+9  | 
+10 | def h() -> None:
+11 |     NotImplementedError = "foo"
+   -     raise NotImplemented
+12 +     raise builtins.NotImplementedError
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap
index 772f183bbe..a226d1836b 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap
@@ -11,13 +11,11 @@ F401 [*] `os` imported but unused
 7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
   |
 help: Remove unused import: `os`
-
-ℹ Safe 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.)
+2 | import os
+3 | 
+4 | def f():
+  -     import os
+5 +     pass
+6 | 
+7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
+8 | # import. (This is a false negative, but is consistent with Pyflakes.)
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap
index e8abef0b53..5cf22905e2 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap
@@ -10,13 +10,11 @@ F401 [*] `os` imported but unused
 4 | def f():
   |
 help: Remove unused import: `os`
-
-ℹ Safe fix
-1 1 | 
-2   |-import os
-3 2 | 
-4 3 | def f():
-5 4 |     import os
+1 | 
+  - import os
+2 | 
+3 | def f():
+4 |     import os
 
 F811 [*] Redefinition of unused `os` from line 2
  --> <filename>:2:8
@@ -31,12 +29,10 @@ F811 [*] Redefinition of unused `os` from line 2
 7 |     # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
   |
 help: Remove definition: `os`
-
-ℹ Safe fix
-2 2 | import os
-3 3 | 
-4 4 | def f():
-5   |-    import os
-6 5 | 
-7 6 |     # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
-8 7 |     # import.
+2 | import os
+3 | 
+4 | def f():
+  -     import os
+5 | 
+6 |     # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
+7 |     # import.
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap
index 02e03119dc..02764438de 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap
@@ -10,13 +10,11 @@ F401 [*] `os` imported but unused
 4 | def f():
   |
 help: Remove unused import: `os`
-
-ℹ Safe fix
-1 1 | 
-2   |-import os
-3 2 | 
-4 3 | def f():
-5 4 |     os = 1
+1 | 
+  - import os
+2 | 
+3 | def f():
+4 |     os = 1
 
 F811 Redefinition of unused `os` from line 2
  --> <filename>:2:8
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap
index 41041f5262..c8d4b0c292 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap
@@ -13,12 +13,10 @@ F811 [*] Redefinition of unused `os` from line 3
 6 |     # Despite this `del`, `import os` should still be flagged as shadowing an unused
   |
 help: Remove definition: `os`
-
-ℹ Safe fix
-1 1 | 
-2 2 | def f():
-3 3 |     import os
-4   |-    import os
-5 4 | 
-6 5 |     # Despite this `del`, `import os` should still be flagged as shadowing an unused
-7 6 |     # import.
+1 | 
+2 | def f():
+3 |     import os
+  -     import os
+4 | 
+5 |     # Despite this `del`, `import os` should still be flagged as shadowing an unused
+6 |     # import.
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap
index 8a0e8d0ebb..347e1d44e0 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap
@@ -9,9 +9,7 @@ F401 [*] `hvplot.pandas_alias.scatter_matrix` imported but unused
    |                                 ^^^^^^^^^^^^^^
    |
 help: Remove unused import: `hvplot.pandas_alias.scatter_matrix`
-
-ℹ Safe fix
-9  9  | from hvplot.pandas.plots import scatter_matrix
-10 10 | 
-11 11 | # Errors
-12    |-from hvplot.pandas_alias import scatter_matrix
+9  | from hvplot.pandas.plots import scatter_matrix
+10 | 
+11 | # Errors
+   - from hvplot.pandas_alias import scatter_matrix
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_top_level_module.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_top_level_module.snap
new file mode 100644
index 0000000000..d0b409f39e
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_top_level_module.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_but_use_top_level.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_but_use_top_level.snap
new file mode 100644
index 0000000000..c4ad92dca6
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_but_use_top_level.snap
@@ -0,0 +1,16 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a.b` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | import a.c
+3 | import a.b
+  |        ^^^
+4 | a.foo()
+  |
+help: Remove unused import: `a.b`
+1 | 
+2 | import a.c
+  - import a.b
+3 | a.foo()
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_different_lengths_but_use_top_level.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_different_lengths_but_use_top_level.snap
new file mode 100644
index 0000000000..12df1553b8
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_different_lengths_but_use_top_level.snap
@@ -0,0 +1,16 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a.b.d` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | import a.c
+3 | import a.b.d
+  |        ^^^^^
+4 | a.foo()
+  |
+help: Remove unused import: `a.b.d`
+1 | 
+2 | import a.c
+  - import a.b.d
+3 | a.foo()
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_in_function_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_in_function_scope.snap
new file mode 100644
index 0000000000..f99502873a
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_import_submodules_in_function_scope.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | # refined logic only applied _within_ scope
+3 | import a
+  |        ^
+4 | def foo():
+5 |     import a.b
+  |
+help: Remove unused import: `a`
+1 | 
+2 | # refined logic only applied _within_ scope
+  - import a
+3 | def foo():
+4 |     import a.b
+5 |     a.foo()
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_multiple_unused_submodules.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_multiple_unused_submodules.snap
new file mode 100644
index 0000000000..4eed530d8f
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_multiple_unused_submodules.snap
@@ -0,0 +1,44 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a` imported but unused
+ --> f401_preview_submodule.py:2:8
+  |
+2 | import a
+  |        ^
+3 | import a.b
+4 | import a.c
+  |
+help: Remove unused import: `a`
+1 | 
+  - import a
+2 | import a.b
+3 | import a.c
+
+F401 [*] `a.b` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | import a
+3 | import a.b
+  |        ^^^
+4 | import a.c
+  |
+help: Remove unused import: `a.b`
+1 | 
+2 | import a
+  - import a.b
+3 | import a.c
+
+F401 [*] `a.c` imported but unused
+ --> f401_preview_submodule.py:4:8
+  |
+2 | import a
+3 | import a.b
+4 | import a.c
+  |        ^^^
+  |
+help: Remove unused import: `a.c`
+1 | 
+2 | import a
+3 | import a.b
+  - import a.c
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap
index a51f6d418d..80e75e2376 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap
@@ -10,10 +10,8 @@ F401 [*] `submodule.a` imported but unused; consider removing, adding to `__all_
 4 | FOO = 42
   |
 help: Add `submodule` to __all__
-
-ℹ Safe fix
-1 1 | 
-2 2 | import submodule.a
-3   |-__all__ = ['FOO']
-  3 |+__all__ = ['FOO', 'submodule']
-4 4 | FOO = 42
+1 | 
+2 | import submodule.a
+  - __all__ = ['FOO']
+3 + __all__ = ['FOO', 'submodule']
+4 | FOO = 42
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_in_between_imports.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_in_between_imports.snap
new file mode 100644
index 0000000000..d0b409f39e
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_in_between_imports.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_in_dunder_all.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_in_dunder_all.snap
new file mode 100644
index 0000000000..58ec910de0
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_in_dunder_all.snap
@@ -0,0 +1,16 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a.b` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | import a
+3 | import a.b
+  |        ^^^
+4 | __all__ = ["a"]
+  |
+help: Remove unused import: `a.b`
+1 | 
+2 | import a
+  - import a.b
+3 | __all__ = ["a"]
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member.snap
new file mode 100644
index 0000000000..de8d07c090
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member.snap
@@ -0,0 +1,16 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a.b` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | import a
+3 | import a.b
+  |        ^^^
+4 | a.foo()
+  |
+help: Remove unused import: `a.b`
+1 | 
+2 | import a
+  - import a.b
+3 | a.foo()
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_and_redefine_before_second_import.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_and_redefine_before_second_import.snap
new file mode 100644
index 0000000000..d0b409f39e
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_and_redefine_before_second_import.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_before_second_import.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_before_second_import.snap
new file mode 100644
index 0000000000..d0b409f39e
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_before_second_import.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_then_import_then_redefine.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_then_import_then_redefine.snap
new file mode 100644
index 0000000000..d0b409f39e
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_then_import_then_redefine.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_twice.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_twice.snap
new file mode 100644
index 0000000000..a46036a45f
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_use_top_member_twice.snap
@@ -0,0 +1,18 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+F401 [*] `a.b` imported but unused
+ --> f401_preview_submodule.py:3:8
+  |
+2 | import a
+3 | import a.b
+  |        ^^^
+4 | a.foo()
+5 | a.bar()
+  |
+help: Remove unused import: `a.b`
+1 | 
+2 | import a
+  - import a.b
+3 | a.foo()
+4 | a.bar()
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap
index 747f7ba421..8cde364bb1 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap
@@ -11,15 +11,13 @@ F841 [*] Local variable `e` is assigned to but never used
 4 |     pass
   |
 help: Remove assignment to unused variable `e`
-
-ℹ Safe fix
-1 1 | try:
-2 2 |     1 / 0
-3   |-except ValueError as e:
-  3 |+except ValueError:
-4 4 |     pass
-5 5 | 
-6 6 | 
+1 | try:
+2 |     1 / 0
+  - except ValueError as e:
+3 + except ValueError:
+4 |     pass
+5 | 
+6 | 
 
 F841 [*] Local variable `foo` is assigned to but never used
   --> F841_0.py:20:5
@@ -30,15 +28,14 @@ F841 [*] Local variable `foo` is assigned to but never used
 21 |     (a, b) = (1, 2)
    |
 help: Remove assignment to unused variable `foo`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    foo = (1, 2)
-21 20 |     (a, b) = (1, 2)
-22 21 | 
-23 22 |     bar = (1, 2)
+17 | 
+18 | 
+19 | def f():
+   -     foo = (1, 2)
+20 |     (a, b) = (1, 2)
+21 | 
+22 |     bar = (1, 2)
+note: This is an unsafe fix and may change runtime behavior
 
 F841 Local variable `a` is assigned to but never used
   --> F841_0.py:21:6
@@ -73,16 +70,15 @@ F841 [*] Local variable `baz` is assigned to but never used
    |              ^^^
    |
 help: Remove assignment to unused variable `baz`
-
-ℹ Unsafe fix
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
-25 25 | 
-26    |-    (x, y) = baz = bar
-   26 |+    (x, y) = bar
-27 27 | 
-28 28 | 
-29 29 | def f():
+23 |     bar = (1, 2)
+24 |     (c, d) = bar
+25 | 
+   -     (x, y) = baz = bar
+26 +     (x, y) = bar
+27 | 
+28 | 
+29 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `_` is assigned to but never used
   --> F841_0.py:35:5
@@ -94,15 +90,14 @@ F841 [*] Local variable `_` is assigned to but never used
 37 |     _discarded = 1
    |
 help: Remove assignment to unused variable `_`
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | 
-34 34 | def f():
-35    |-    _ = 1
-36 35 |     __ = 1
-37 36 |     _discarded = 1
-38 37 | 
+32 | 
+33 | 
+34 | def f():
+   -     _ = 1
+35 |     __ = 1
+36 |     _discarded = 1
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `__` is assigned to but never used
   --> F841_0.py:36:5
@@ -114,15 +109,14 @@ F841 [*] Local variable `__` is assigned to but never used
 37 |     _discarded = 1
    |
 help: Remove assignment to unused variable `__`
-
-ℹ Unsafe fix
-33 33 | 
-34 34 | def f():
-35 35 |     _ = 1
-36    |-    __ = 1
-37 36 |     _discarded = 1
-38 37 | 
-39 38 | 
+33 | 
+34 | def f():
+35 |     _ = 1
+   -     __ = 1
+36 |     _discarded = 1
+37 | 
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `_discarded` is assigned to but never used
   --> F841_0.py:37:5
@@ -133,15 +127,14 @@ F841 [*] Local variable `_discarded` is assigned to but never used
    |     ^^^^^^^^^^
    |
 help: Remove assignment to unused variable `_discarded`
-
-ℹ Unsafe fix
-34 34 | def f():
-35 35 |     _ = 1
-36 36 |     __ = 1
-37    |-    _discarded = 1
-38 37 | 
-39 38 | 
-40 39 | a = 1
+34 | def f():
+35 |     _ = 1
+36 |     __ = 1
+   -     _discarded = 1
+37 | 
+38 | 
+39 | a = 1
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `b` is assigned to but never used
   --> F841_0.py:51:9
@@ -154,16 +147,15 @@ F841 [*] Local variable `b` is assigned to but never used
 53 |     def d():
    |
 help: Remove assignment to unused variable `b`
-
-ℹ Unsafe fix
-48 48 | 
-49 49 |     def c():
-50 50 |         # F841
-51    |-        b = 1
-   51 |+        pass
-52 52 | 
-53 53 |     def d():
-54 54 |         nonlocal b
+48 | 
+49 |     def c():
+50 |         # F841
+   -         b = 1
+51 +         pass
+52 | 
+53 |     def d():
+54 |         nonlocal b
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `my_file` is assigned to but never used
   --> F841_0.py:79:26
@@ -174,16 +166,15 @@ F841 [*] Local variable `my_file` is assigned to but never used
 80 |         print("hello")
    |
 help: Remove assignment to unused variable `my_file`
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | 
-78 78 | def f():
-79    |-    with open("file") as my_file, open("") as ((this, that)):
-   79 |+    with open("file"), open("") as ((this, that)):
-80 80 |         print("hello")
-81 81 | 
-82 82 | 
+76 | 
+77 | 
+78 | def f():
+   -     with open("file") as my_file, open("") as ((this, that)):
+79 +     with open("file"), open("") as ((this, that)):
+80 |         print("hello")
+81 | 
+82 | 
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `my_file` is assigned to but never used
   --> F841_0.py:85:25
@@ -196,16 +187,15 @@ F841 [*] Local variable `my_file` is assigned to but never used
 87 |     ):
    |
 help: Remove assignment to unused variable `my_file`
-
-ℹ Unsafe fix
-82 82 | 
-83 83 | def f():
-84 84 |     with (
-85    |-        open("file") as my_file,
-   85 |+        open("file"),
-86 86 |         open("") as ((this, that)),
-87 87 |     ):
-88 88 |         print("hello")
+82 | 
+83 | def f():
+84 |     with (
+   -         open("file") as my_file,
+85 +         open("file"),
+86 |         open("") as ((this, that)),
+87 |     ):
+88 |         print("hello")
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `msg3` is assigned to but never used
    --> F841_0.py:102:5
@@ -218,15 +208,14 @@ F841 [*] Local variable `msg3` is assigned to but never used
 104 |         case 1:
     |
 help: Remove assignment to unused variable `msg3`
-
-ℹ Unsafe fix
-99  99  | def f(x: int):
-100 100 |     msg1 = "Hello, world!"
-101 101 |     msg2 = "Hello, world!"
-102     |-    msg3 = "Hello, world!"
-103 102 |     match x:
-104 103 |         case 1:
-105 104 |             print(msg1)
+99  | def f(x: int):
+100 |     msg1 = "Hello, world!"
+101 |     msg2 = "Hello, world!"
+    -     msg3 = "Hello, world!"
+102 |     match x:
+103 |         case 1:
+104 |             print(msg1)
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `Baz` is assigned to but never used
    --> F841_0.py:115:5
@@ -239,16 +228,15 @@ F841 [*] Local variable `Baz` is assigned to but never used
 117 |     match x:
     |
 help: Remove assignment to unused variable `Baz`
-
-ℹ Unsafe fix
-112 112 | 
-113 113 |     Foo = enum.Enum("Foo", "A B")
-114 114 |     Bar = enum.Enum("Bar", "A B")
-115     |-    Baz = enum.Enum("Baz", "A B")
-    115 |+    enum.Enum("Baz", "A B")
-116 116 | 
-117 117 |     match x:
-118 118 |         case (Foo.A):
+112 | 
+113 |     Foo = enum.Enum("Foo", "A B")
+114 |     Bar = enum.Enum("Bar", "A B")
+    -     Baz = enum.Enum("Baz", "A B")
+115 +     enum.Enum("Baz", "A B")
+116 | 
+117 |     match x:
+118 |         case (Foo.A):
+note: This is an unsafe fix and may change runtime behavior
 
 F841 Local variable `y` is assigned to but never used
    --> F841_0.py:122:14
@@ -281,11 +269,68 @@ F841 [*] Local variable `_` is assigned to but never used
 153 |         pass
     |
 help: Remove assignment to unused variable `_`
+149 | def f():
+150 |     try:
+151 |         pass
+    -     except Exception as _:
+152 +     except Exception:
+153 |         pass
+154 | 
+155 | 
 
-ℹ Safe fix
-149 149 | def f():
-150 150 |     try:
-151 151 |         pass
-152     |-    except Exception as _:
-    152 |+    except Exception:
-153 153 |         pass
+F841 [*] Local variable `__class__` is assigned to but never used
+   --> F841_0.py:168:9
+    |
+166 | class A:
+167 |     def set_class(self, cls):
+168 |         __class__ = cls  # F841
+    |         ^^^^^^^^^
+    |
+help: Remove assignment to unused variable `__class__`
+165 | # variables that don't refer to the special `__class__` cell.
+166 | class A:
+167 |     def set_class(self, cls):
+    -         __class__ = cls  # F841
+168 +         pass  # F841
+169 | 
+170 | 
+171 | class A:
+note: This is an unsafe fix and may change runtime behavior
+
+F841 [*] Local variable `__class__` is assigned to but never used
+   --> F841_0.py:174:13
+    |
+172 |     class B:
+173 |         def set_class(self, cls):
+174 |             __class__ = cls  # F841
+    |             ^^^^^^^^^
+    |
+help: Remove assignment to unused variable `__class__`
+171 | class A:
+172 |     class B:
+173 |         def set_class(self, cls):
+    -             __class__ = cls  # F841
+174 +             pass  # F841
+175 | 
+176 | 
+177 | class A:
+note: This is an unsafe fix and may change runtime behavior
+
+F841 [*] Local variable `__class__` is assigned to but never used
+   --> F841_0.py:182:17
+    |
+180 |             print(__class__)
+181 |             def set_class(self, cls):
+182 |                 __class__ = cls  # F841
+    |                 ^^^^^^^^^
+    |
+help: Remove assignment to unused variable `__class__`
+179 |         class B:
+180 |             print(__class__)
+181 |             def set_class(self, cls):
+    -                 __class__ = cls  # F841
+182 +                 pass  # F841
+183 | 
+184 | 
+185 | # OK, the `__class__` cell is nonlocal and declared as such.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap
index 82363cecfc..bdb210f50f 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap
@@ -11,15 +11,13 @@ F401 [*] `models.Nut` imported but unused
 9 | )
   |
 help: Remove unused import: `models.Nut`
-
-ℹ Safe fix
-5 5 | 
-6 6 | from models import (
-7 7 |     Fruit,
-8   |-    Nut,
-9 8 | )
-10 9 | 
-11 10 | 
+5  | 
+6  | from models import (
+7  |     Fruit,
+   -     Nut,
+8  | )
+9  | 
+10 | 
 
 F821 Undefined name `Bar`
   --> future_annotations.py:26:19
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap
index 2972d12298..45632ee2d5 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap
@@ -11,16 +11,14 @@ F841 [*] Local variable `x` is assigned to but never used
 8 |         pass
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-4 4 | def f():
-5 5 |     try:
-6 6 |         pass
-7   |-    except ValueError as x:
-  7 |+    except ValueError:
-8 8 |         pass
-9 9 | 
-10 10 |     try:
+4  | def f():
+5  |     try:
+6  |         pass
+   -     except ValueError as x:
+7  +     except ValueError:
+8  |         pass
+9  | 
+10 |     try:
 
 F841 [*] Local variable `x` is assigned to but never used
   --> <filename>:12:26
@@ -32,13 +30,11 @@ F841 [*] Local variable `x` is assigned to but never used
 13 |         pass
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-9  9  | 
-10 10 |     try:
-11 11 |         pass
-12    |-    except ValueError as x:
-   12 |+    except ValueError:
-13 13 |         pass
-14 14 | 
-15 15 |     # This should resolve to the `x` in `x = 1`.
+9  | 
+10 |     try:
+11 |         pass
+   -     except ValueError as x:
+12 +     except ValueError:
+13 |         pass
+14 | 
+15 |     # This should resolve to the `x` in `x = 1`.
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap
index 377df1d4a9..8dc6cc0bde 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap
@@ -11,16 +11,14 @@ F841 [*] Local variable `x` is assigned to but never used
 9 |             pass
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-5 5 |     def f():
-6 6 |         try:
-7 7 |             pass
-8   |-        except ValueError as x:
-  8 |+        except ValueError:
-9 9 |             pass
-10 10 | 
-11 11 |         # This should raise an F821 error, rather than resolving to the
+5  |     def f():
+6  |         try:
+7  |             pass
+   -         except ValueError as x:
+8  +         except ValueError:
+9  |             pass
+10 | 
+11 |         # This should raise an F821 error, rather than resolving to the
 
 F821 Undefined name `x`
   --> <filename>:13:15
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap
index fc2a79d306..18c8a200f8 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap
@@ -11,13 +11,11 @@ F841 [*] Local variable `x` is assigned to but never used
 8 |         pass
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-4 4 | def f():
-5 5 |     try:
-6 6 |         pass
-7   |-    except ValueError as x:
-  7 |+    except ValueError:
-8 8 |         pass
-9 9 | 
-10 10 |     # This should resolve to the `x` in `x = 1`.
+4  | def f():
+5  |     try:
+6  |         pass
+   -     except ValueError as x:
+7  +     except ValueError:
+8  |         pass
+9  | 
+10 |     # This should resolve to the `x` in `x = 1`.
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap
index ab3f650e89..a6922aa855 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap
@@ -11,16 +11,14 @@ F841 [*] Local variable `x` is assigned to but never used
 8 |         pass
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-4 4 | def f():
-5 5 |     try:
-6 6 |         pass
-7   |-    except ValueError as x:
-  7 |+    except ValueError:
-8 8 |         pass
-9 9 | 
-10 10 |     def g():
+4  | def f():
+5  |     try:
+6  |         pass
+   -     except ValueError as x:
+7  +     except ValueError:
+8  |         pass
+9  | 
+10 |     def g():
 
 F841 [*] Local variable `x` is assigned to but never used
   --> <filename>:13:30
@@ -32,13 +30,11 @@ F841 [*] Local variable `x` is assigned to but never used
 14 |             pass
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-10 10 |     def g():
-11 11 |         try:
-12 12 |             pass
-13    |-        except ValueError as x:
-   13 |+        except ValueError:
-14 14 |             pass
-15 15 | 
-16 16 |         # This should resolve to the `x` in `x = 1`.
+10 |     def g():
+11 |         try:
+12 |             pass
+   -         except ValueError as x:
+13 +         except ValueError:
+14 |             pass
+15 | 
+16 |         # This should resolve to the `x` in `x = 1`.
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap
index a19d8ab553..7a1f5580a6 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap
@@ -10,14 +10,12 @@ F401 [*] `foo1` imported but unused
 3 |     import foo2;     x = 1
   |
 help: Remove unused import: `foo1`
-
-ℹ Safe fix
-1 1 | if True:
-2   |-    import foo1; x = 1
-  2 |+    x = 1
-3 3 |     import foo2;     x = 1
-4 4 | 
-5 5 | if True:
+1 | if True:
+  -     import foo1; x = 1
+2 +     x = 1
+3 |     import foo2;     x = 1
+4 | 
+5 | if True:
 
 F401 [*] `foo2` imported but unused
  --> multi_statement_lines.py:3:12
@@ -30,15 +28,13 @@ F401 [*] `foo2` imported but unused
 5 | if True:
   |
 help: Remove unused import: `foo2`
-
-ℹ Safe fix
-1 1 | if True:
-2 2 |     import foo1; x = 1
-3   |-    import foo2;     x = 1
-  3 |+    x = 1
-4 4 | 
-5 5 | if True:
-6 6 |     import foo3; \
+1 | if True:
+2 |     import foo1; x = 1
+  -     import foo2;     x = 1
+3 +     x = 1
+4 | 
+5 | if True:
+6 |     import foo3; \
 
 F401 [*] `foo3` imported but unused
  --> multi_statement_lines.py:6:12
@@ -49,17 +45,15 @@ F401 [*] `foo3` imported but unused
 7 | x = 1
   |
 help: Remove unused import: `foo3`
-
-ℹ Safe fix
-3 3 |     import foo2;     x = 1
-4 4 | 
-5 5 | if True:
-6   |-    import foo3; \
-7   |-x = 1
-  6 |+    x = 1
-8 7 | 
-9 8 | if True:
-10 9 |     import foo4 \
+3 |     import foo2;     x = 1
+4 | 
+5 | if True:
+  -     import foo3; \
+  - x = 1
+6 +     x = 1
+7 | 
+8 | if True:
+9 |     import foo4 \
 
 F401 [*] `foo4` imported but unused
   --> multi_statement_lines.py:10:12
@@ -70,17 +64,15 @@ F401 [*] `foo4` imported but unused
 11 |         ; x = 1
    |
 help: Remove unused import: `foo4`
-
-ℹ Safe fix
-7  7  | x = 1
-8  8  | 
-9  9  | if True:
-10    |-    import foo4 \
-11    |-        ; x = 1
-   10 |+    x = 1
-12 11 | 
-13 12 | if True:
-14 13 |     x = 1; import foo5
+7  | x = 1
+8  | 
+9  | if True:
+   -     import foo4 \
+   -         ; x = 1
+10 +     x = 1
+11 | 
+12 | if True:
+13 |     x = 1; import foo5
 
 F401 [*] `foo5` imported but unused
   --> multi_statement_lines.py:14:19
@@ -90,16 +82,14 @@ F401 [*] `foo5` imported but unused
    |                   ^^^^
    |
 help: Remove unused import: `foo5`
-
-ℹ Safe fix
-11 11 |         ; x = 1
-12 12 | 
-13 13 | if True:
-14    |-    x = 1; import foo5
-   14 |+    x = 1; 
-15 15 | 
-16 16 | 
-17 17 | if True:
+11 |         ; x = 1
+12 | 
+13 | if True:
+   -     x = 1; import foo5
+14 +     x = 1; 
+15 | 
+16 | 
+17 | if True:
 
 F401 [*] `foo6` imported but unused
   --> multi_statement_lines.py:19:17
@@ -112,17 +102,15 @@ F401 [*] `foo6` imported but unused
 21 | if True:
    |
 help: Remove unused import: `foo6`
-
-ℹ Safe fix
-15 15 | 
-16 16 | 
-17 17 | if True:
-18    |-    x = 1; \
-19    |-         import foo6
-   18 |+    x = 1; 
-20 19 | 
-21 20 | if True:
-22 21 |     x = 1 \
+15 | 
+16 | 
+17 | if True:
+   -     x = 1; \
+   -          import foo6
+18 +     x = 1; 
+19 | 
+20 | if True:
+21 |     x = 1 \
 
 F401 [*] `foo7` imported but unused
   --> multi_statement_lines.py:23:18
@@ -135,16 +123,14 @@ F401 [*] `foo7` imported but unused
 25 | if True:
    |
 help: Remove unused import: `foo7`
-
-ℹ Safe fix
-20 20 | 
-21 21 | if True:
-22 22 |     x = 1 \
-23    |-        ; import foo7
-   23 |+        ; 
-24 24 | 
-25 25 | if True:
-26 26 |     x = 1; import foo8; x = 1
+20 | 
+21 | if True:
+22 |     x = 1 \
+   -         ; import foo7
+23 +         ; 
+24 | 
+25 | if True:
+26 |     x = 1; import foo8; x = 1
 
 F401 [*] `foo8` imported but unused
   --> multi_statement_lines.py:26:19
@@ -155,16 +141,14 @@ F401 [*] `foo8` imported but unused
 27 |     x = 1;     import foo9;     x = 1
    |
 help: Remove unused import: `foo8`
-
-ℹ Safe fix
-23 23 |         ; import foo7
-24 24 | 
-25 25 | if True:
-26    |-    x = 1; import foo8; x = 1
-   26 |+    x = 1; x = 1
-27 27 |     x = 1;     import foo9;     x = 1
-28 28 | 
-29 29 | if True:
+23 |         ; import foo7
+24 | 
+25 | if True:
+   -     x = 1; import foo8; x = 1
+26 +     x = 1; x = 1
+27 |     x = 1;     import foo9;     x = 1
+28 | 
+29 | if True:
 
 F401 [*] `foo9` imported but unused
   --> multi_statement_lines.py:27:23
@@ -177,16 +161,14 @@ F401 [*] `foo9` imported but unused
 29 | if True:
    |
 help: Remove unused import: `foo9`
-
-ℹ Safe fix
-24 24 | 
-25 25 | if True:
-26 26 |     x = 1; import foo8; x = 1
-27    |-    x = 1;     import foo9;     x = 1
-   27 |+    x = 1;     x = 1
-28 28 | 
-29 29 | if True:
-30 30 |     x = 1; \
+24 | 
+25 | if True:
+26 |     x = 1; import foo8; x = 1
+   -     x = 1;     import foo9;     x = 1
+27 +     x = 1;     x = 1
+28 | 
+29 | if True:
+30 |     x = 1; \
 
 F401 [*] `foo10` imported but unused
   --> multi_statement_lines.py:31:16
@@ -198,17 +180,15 @@ F401 [*] `foo10` imported but unused
 32 |     x = 1
    |
 help: Remove unused import: `foo10`
-
-ℹ Safe fix
-28 28 | 
-29 29 | if True:
-30 30 |     x = 1; \
-31    |-        import foo10; \
-32    |-    x = 1
-   31 |+        x = 1
-33 32 | 
-34 33 | if True:
-35 34 |     x = 1 \
+28 | 
+29 | if True:
+30 |     x = 1; \
+   -         import foo10; \
+   -     x = 1
+31 +         x = 1
+32 | 
+33 | if True:
+34 |     x = 1 \
 
 F401 [*] `foo11` imported but unused
   --> multi_statement_lines.py:36:17
@@ -220,15 +200,13 @@ F401 [*] `foo11` imported but unused
 37 |         ;x = 1
    |
 help: Remove unused import: `foo11`
-
-ℹ Safe fix
-33 33 | 
-34 34 | if True:
-35 35 |     x = 1 \
-36    |-        ;import foo11 \
-37 36 |         ;x = 1
-38 37 | 
-39 38 | if True:
+33 | 
+34 | if True:
+35 |     x = 1 \
+   -         ;import foo11 \
+36 |         ;x = 1
+37 | 
+38 | if True:
 
 F401 [*] `foo12` imported but unused
   --> multi_statement_lines.py:42:16
@@ -241,18 +219,16 @@ F401 [*] `foo12` imported but unused
 44 | if True:
    |
 help: Remove unused import: `foo12`
-
-ℹ Safe fix
-37 37 |         ;x = 1
-38 38 | 
-39 39 | if True:
-40    |-    x = 1; \
-41    |-        \
-42    |-        import foo12
-   40 |+    x = 1; 
-43 41 | 
-44 42 | if True:
-45 43 |     x = 1; \
+37 |         ;x = 1
+38 | 
+39 | if True:
+   -     x = 1; \
+   -         \
+   -         import foo12
+40 +     x = 1; 
+41 | 
+42 | if True:
+43 |     x = 1; \
 
 F401 [*] `foo13` imported but unused
   --> multi_statement_lines.py:47:12
@@ -263,18 +239,16 @@ F401 [*] `foo13` imported but unused
    |            ^^^^^
    |
 help: Remove unused import: `foo13`
-
-ℹ Safe fix
-42 42 |         import foo12
-43 43 | 
-44 44 | if True:
-45    |-    x = 1; \
-46    |-\
-47    |-    import foo13
-   45 |+    x = 1; 
-48 46 | 
-49 47 | 
-50 48 | if True:
+42 |         import foo12
+43 | 
+44 | if True:
+   -     x = 1; \
+   - \
+   -     import foo13
+45 +     x = 1; 
+46 | 
+47 | 
+48 | if True:
 
 F401 [*] `foo14` imported but unused
   --> multi_statement_lines.py:53:12
@@ -287,15 +261,13 @@ F401 [*] `foo14` imported but unused
 55 | # Continuation, but not as the last content in the file.
    |
 help: Remove unused import: `foo14`
-
-ℹ Safe fix
-50 50 | if True:
-51 51 |     x = 1; \
-52 52 |     #    \
-53    |-    import foo14
-54 53 | 
-55 54 | # Continuation, but not as the last content in the file.
-56 55 | x = 1; \
+50 | if True:
+51 |     x = 1; \
+52 |     #    \
+   -     import foo14
+53 | 
+54 | # Continuation, but not as the last content in the file.
+55 | x = 1; \
 
 F401 [*] `foo15` imported but unused
   --> multi_statement_lines.py:57:8
@@ -308,17 +280,15 @@ F401 [*] `foo15` imported but unused
 59 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
    |
 help: Remove unused import: `foo15`
-
-ℹ Safe fix
-53 53 |     import foo14
-54 54 | 
-55 55 | # Continuation, but not as the last content in the file.
-56    |-x = 1; \
-57    |-import foo15
-   56 |+x = 1; 
-58 57 | 
-59 58 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
-60 59 | # error.)
+53 |     import foo14
+54 | 
+55 | # Continuation, but not as the last content in the file.
+   - x = 1; \
+   - import foo15
+56 + x = 1; 
+57 | 
+58 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
+59 | # error.)
 
 F401 [*] `foo16` imported but unused
   --> multi_statement_lines.py:62:8
@@ -329,11 +299,9 @@ F401 [*] `foo16` imported but unused
    |        ^^^^^
    |
 help: Remove unused import: `foo16`
-
-ℹ Safe fix
-58 58 | 
-59 59 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
-60 60 | # error.)
-61    |-x = 1; \
-62    |-import foo16
-   61 |+x = 1;
+58 | 
+59 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
+60 | # error.)
+   - x = 1; \
+   - import foo16
+61 + x = 1;
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap
index dc63a9b851..7a52a39e9b 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused
    |        ^^^
    |
 help: Remove unused import: `sys`
-
-ℹ Unsafe fix
-16 16 | import argparse as argparse  # Ok: is redundant alias
-17 17 | 
-18 18 | 
-19    |-import sys  # F401: remove unused
-20 19 | 
-21 20 | 
-22 21 | # first-party
+16 | import argparse as argparse  # Ok: is redundant alias
+17 | 
+18 | 
+   - import sys  # F401: remove unused
+19 | 
+20 | 
+21 | # first-party
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:33:15
@@ -25,16 +24,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
    |               ^^^^^^
    |
 help: Use an explicit re-export: `unused as unused`
-
-ℹ Safe fix
-30 30 | from . import aliased as aliased  # Ok: is redundant alias
-31 31 | 
-32 32 | 
-33    |-from . import unused  # F401: change to redundant alias
-   33 |+from . import unused as unused  # F401: change to redundant alias
-34 34 | 
-35 35 | 
-36 36 | from . import renamed as bees  # F401: no fix
+30 | from . import aliased as aliased  # Ok: is redundant alias
+31 | 
+32 | 
+   - from . import unused  # F401: change to redundant alias
+33 + from . import unused as unused  # F401: change to redundant alias
+34 | 
+35 | 
+36 | from . import renamed as bees  # F401: no fix
 
 F401 `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:36:26
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap
index ca0228f64f..2327fc9b6d 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap
@@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused
    |        ^^^
    |
 help: Remove unused import: `sys`
-
-ℹ Unsafe fix
-16 16 | import argparse  # Ok: is exported in __all__
-17 17 | 
-18 18 | 
-19    |-import sys  # F401: remove unused
-20 19 | 
-21 20 | 
-22 21 | # first-party
+16 | import argparse  # Ok: is exported in __all__
+17 | 
+18 | 
+   - import sys  # F401: remove unused
+19 | 
+20 | 
+21 | # first-party
+note: This is an unsafe fix and may change runtime behavior
 
 F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:36:15
@@ -25,13 +24,11 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
    |               ^^^^^^
    |
 help: Add unused import `unused` to __all__
-
-ℹ Safe fix
-39 39 | from . import renamed as bees  # F401: add to __all__
-40 40 | 
-41 41 | 
-42    |-__all__ = ["argparse", "exported"]
-   42 |+__all__ = ["argparse", "exported", "unused"]
+39 | from . import renamed as bees  # F401: add to __all__
+40 | 
+41 | 
+   - __all__ = ["argparse", "exported"]
+42 + __all__ = ["argparse", "exported", "unused"]
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
   --> __init__.py:39:26
@@ -40,10 +37,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
    |                          ^^^^
    |
 help: Add unused import `bees` to __all__
-
-ℹ Safe fix
-39 39 | from . import renamed as bees  # F401: add to __all__
-40 40 | 
-41 41 | 
-42    |-__all__ = ["argparse", "exported"]
-   42 |+__all__ = ["argparse", "exported", "bees"]
+39 | from . import renamed as bees  # F401: add to __all__
+40 | 
+41 | 
+   - __all__ = ["argparse", "exported"]
+42 + __all__ = ["argparse", "exported", "bees"]
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap
index 9cdd127afb..683f767628 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap
@@ -8,13 +8,11 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
   |               ^^^^^^
   |
 help: Add unused import `unused` to __all__
-
-ℹ Safe fix
-8  8  | from . import renamed as bees  # F401: add to __all__
-9  9  | 
-10 10 | 
-11    |-__all__ = []
-   11 |+__all__ = ["unused"]
+8  | from . import renamed as bees  # F401: add to __all__
+9  | 
+10 | 
+   - __all__ = []
+11 + __all__ = ["unused"]
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
  --> __init__.py:8:26
@@ -23,10 +21,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
   |                          ^^^^
   |
 help: Add unused import `bees` to __all__
-
-ℹ Safe fix
-8  8  | from . import renamed as bees  # F401: add to __all__
-9  9  | 
-10 10 | 
-11    |-__all__ = []
-   11 |+__all__ = ["bees"]
+8  | from . import renamed as bees  # F401: add to __all__
+9  | 
+10 | 
+   - __all__ = []
+11 + __all__ = ["bees"]
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap
index b85570c0c7..91db5a2dfc 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap
@@ -8,13 +8,11 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`,
   |               ^^^^^^
   |
 help: Add unused import `unused` to __all__
-
-ℹ Safe fix
-5 5 | from . import unused, renamed as bees  # F401: add to __all__
-6 6 | 
-7 7 | 
-8   |-__all__ = [];
-  8 |+__all__ = ["bees", "unused"];
+5 | from . import unused, renamed as bees  # F401: add to __all__
+6 | 
+7 | 
+  - __all__ = [];
+8 + __all__ = ["bees", "unused"];
 
 F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias
  --> __init__.py:5:34
@@ -23,10 +21,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`,
   |                                  ^^^^
   |
 help: Add unused import `bees` to __all__
-
-ℹ Safe fix
-5 5 | from . import unused, renamed as bees  # F401: add to __all__
-6 6 | 
-7 7 | 
-8   |-__all__ = [];
-  8 |+__all__ = ["bees", "unused"];
+5 | from . import unused, renamed as bees  # F401: add to __all__
+6 | 
+7 | 
+  - __all__ = [];
+8 + __all__ = ["bees", "unused"];
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap
index 1f40e7cb69..582259435a 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap
@@ -10,10 +10,9 @@ F401 [*] `F401_33.other.Ham` imported but unused
   |                                   ^^^
   |
 help: Remove unused import: `F401_33.other.Ham`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | class Spam:
-7 7 |     def __init__(self) -> None:
-8   |-        from F401_33.other import Ham
-  8 |+        pass
+5 | 
+6 | class Spam:
+7 |     def __init__(self) -> None:
+  -         from F401_33.other import Ham
+8 +         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap
index 89b804e26f..f7e0d2ce60 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap
@@ -10,9 +10,8 @@ F401 [*] `os` imported but unused
 3 | print(__path__)
   |
 help: Remove unused import: `os`
-
-ℹ Unsafe fix
-1   |-import os
-2 1 | 
-3 2 | print(__path__)
-4 3 |
+  - import os
+1 | 
+2 | print(__path__)
+3 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_0.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_0.py.snap
new file mode 100644
index 0000000000..64cb811dd4
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_0.py.snap
@@ -0,0 +1,50 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 2
+
+--- Added ---
+F401 [*] `multiprocessing.process` imported but unused
+  --> F401_0.py:10:8
+   |
+ 8 | )
+ 9 | import multiprocessing.pool
+10 | import multiprocessing.process
+   |        ^^^^^^^^^^^^^^^^^^^^^^^
+11 | import logging.config
+12 | import logging.handlers
+   |
+help: Remove unused import: `multiprocessing.process`
+7  |     namedtuple,
+8  | )
+9  | import multiprocessing.pool
+   - import multiprocessing.process
+10 | import logging.config
+11 | import logging.handlers
+12 | from typing import (
+
+
+F401 [*] `logging.config` imported but unused
+  --> F401_0.py:11:8
+   |
+ 9 | import multiprocessing.pool
+10 | import multiprocessing.process
+11 | import logging.config
+   |        ^^^^^^^^^^^^^^
+12 | import logging.handlers
+13 | from typing import (
+   |
+help: Remove unused import: `logging.config`
+8  | )
+9  | import multiprocessing.pool
+10 | import multiprocessing.process
+   - import logging.config
+11 | import logging.handlers
+12 | from typing import (
+13 |     TYPE_CHECKING,
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_1.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_1.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_1.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_10.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_10.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_10.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_11.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_11.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_11.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_12.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_12.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_12.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_13.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_13.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_13.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_14.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_14.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_14.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_15.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_15.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_15.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_16.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_16.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_16.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_17.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_17.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_17.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_18.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_18.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_18.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_19.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_19.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_19.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_2.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_2.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_2.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_20.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_20.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_20.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_21.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_21.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_21.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_22.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_22.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_22.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_23.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_23.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_23.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_3.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_3.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_3.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_32.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_32.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_32.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_34.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_34.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_34.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_35.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_35.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_35.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_4.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_4.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_4.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_5.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_5.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_5.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_6.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_6.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_6.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_7.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_7.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_7.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_8.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_8.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_8.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_9.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_9.py.snap
new file mode 100644
index 0000000000..4da451424d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview_diff__F401_9.py.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyflakes/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap
index 30100ddb2d..0b79f06eb5 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap
@@ -12,16 +12,14 @@ F841 [*] Local variable `x` is assigned to but never used
 9 |     except ImportError as x:
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-4 4 | 
-5 5 |     try:
-6 6 |         1 / 0
-7   |-    except ValueError as x:
-  7 |+    except ValueError:
-8 8 |         pass
-9 9 |     except ImportError as x:
-10 10 |         pass
+4  | 
+5  |     try:
+6  |         1 / 0
+   -     except ValueError as x:
+7  +     except ValueError:
+8  |         pass
+9  |     except ImportError as x:
+10 |         pass
 
 F841 [*] Local variable `x` is assigned to but never used
   --> <filename>:9:27
@@ -33,13 +31,11 @@ F841 [*] Local variable `x` is assigned to but never used
 10 |         pass
    |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-6  6  |         1 / 0
-7  7  |     except ValueError as x:
-8  8  |         pass
-9     |-    except ImportError as x:
-   9  |+    except ImportError:
-10 10 |         pass
-11 11 | 
-12 12 |     # No error here, though it should arguably be an F821 error. `x` will
+6  |         1 / 0
+7  |     except ValueError as x:
+8  |         pass
+   -     except ImportError as x:
+9  +     except ImportError:
+10 |         pass
+11 | 
+12 |     # No error here, though it should arguably be an F821 error. `x` will
diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap
index 2c495fdf7d..c885642cf7 100644
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap
@@ -11,13 +11,11 @@ F841 [*] Local variable `x` is assigned to but never used
 8 |         pass
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Safe fix
-4 4 | 
-5 5 |     try:
-6 6 |         1 / 0
-7   |-    except Exception as x:
-  7 |+    except Exception:
-8 8 |         pass
-9 9 | 
-10 10 |     # No error here, though it should arguably be an F821 error. `x` will
+4  | 
+5  |     try:
+6  |         1 / 0
+   -     except Exception as x:
+7  +     except Exception:
+8  |         pass
+9  | 
+10 |     # No error here, though it should arguably be an F821 error. `x` will
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/mod.rs b/crates/ruff_linter/src/rules/pygrep_hooks/mod.rs
index 1117bb516a..525a3ff0be 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/mod.rs
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/mod.rs
@@ -10,7 +10,6 @@ mod tests {
 
     use crate::registry::Rule;
 
-    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
@@ -30,22 +29,4 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
-
-    #[test_case(Rule::InvalidMockAccess, Path::new("PGH005_0.py"))]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("pygrep_hooks").join(path).as_path(),
-            &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_diagnostics!(snapshot, diagnostics);
-        Ok(())
-    }
 }
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_noqa.rs b/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_noqa.rs
index e60fd42072..1c5bdf4339 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_noqa.rs
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_noqa.rs
@@ -39,6 +39,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Ruff documentation](https://docs.astral.sh/ruff/configuration/#error-suppression)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.200")]
 pub(crate) struct BlanketNOQA {
     missing_colon: bool,
     file_exemption: bool,
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs b/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs
index efd12c7b3b..1386ca0f61 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs
@@ -42,6 +42,7 @@ use crate::checkers::ast::LintContext;
 /// enable_error_code = ["ignore-without-code"]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.187")]
 pub(crate) struct BlanketTypeIgnore;
 
 impl Violation for BlanketTypeIgnore {
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs b/crates/ruff_linter/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs
index 648702121c..87319784a8 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs
@@ -34,6 +34,7 @@ use crate::{FixAvailability, Violation};
 ///
 /// [G010]: https://docs.astral.sh/ruff/rules/logging-warn/
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "v0.2.0")]
 pub(crate) struct DeprecatedLogWarn;
 
 /// PGH002
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/rules/invalid_mock_access.rs b/crates/ruff_linter/src/rules/pygrep_hooks/rules/invalid_mock_access.rs
index 9ff519116d..afcc230966 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/rules/invalid_mock_access.rs
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/rules/invalid_mock_access.rs
@@ -5,7 +5,6 @@ use ruff_text_size::Ranged;
 
 use crate::Violation;
 use crate::checkers::ast::Checker;
-use crate::preview::is_invalid_async_mock_access_check_enabled;
 
 #[derive(Debug, PartialEq, Eq)]
 enum Reason {
@@ -34,6 +33,7 @@ enum Reason {
 /// my_mock.assert_called()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.266")]
 pub(crate) struct InvalidMockAccess {
     reason: Reason,
 }
@@ -62,18 +62,16 @@ pub(crate) fn uncalled_mock_method(checker: &Checker, expr: &Expr) {
                 | "assert_has_calls"
                 | "assert_not_called"
         );
-        let is_uncalled_async_mock_method =
-            is_invalid_async_mock_access_check_enabled(checker.settings())
-                && matches!(
-                    attr.as_str(),
-                    "assert_awaited"
-                        | "assert_awaited_once"
-                        | "assert_awaited_with"
-                        | "assert_awaited_once_with"
-                        | "assert_any_await"
-                        | "assert_has_awaits"
-                        | "assert_not_awaited"
-                );
+        let is_uncalled_async_mock_method = matches!(
+            attr.as_str(),
+            "assert_awaited"
+                | "assert_awaited_once"
+                | "assert_awaited_with"
+                | "assert_awaited_once_with"
+                | "assert_any_await"
+                | "assert_has_awaits"
+                | "assert_not_awaited"
+        );
         if is_uncalled_mock_method || is_uncalled_async_mock_method {
             checker.report_diagnostic(
                 InvalidMockAccess {
@@ -104,18 +102,16 @@ pub(crate) fn non_existent_mock_method(checker: &Checker, test: &Expr) {
             | "has_calls"
             | "not_called"
     );
-    let is_missing_async_mock_method =
-        is_invalid_async_mock_access_check_enabled(checker.settings())
-            && matches!(
-                attr.as_str(),
-                "awaited"
-                    | "awaited_once"
-                    | "awaited_with"
-                    | "awaited_once_with"
-                    | "any_await"
-                    | "has_awaits"
-                    | "not_awaited"
-            );
+    let is_missing_async_mock_method = matches!(
+        attr.as_str(),
+        "awaited"
+            | "awaited_once"
+            | "awaited_with"
+            | "awaited_once_with"
+            | "any_await"
+            | "has_awaits"
+            | "not_awaited"
+    );
     if is_missing_mock_method || is_missing_async_mock_method {
         checker.report_diagnostic(
             InvalidMockAccess {
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/rules/no_eval.rs b/crates/ruff_linter/src/rules/pygrep_hooks/rules/no_eval.rs
index 8615e4ae51..1818aaf79a 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/rules/no_eval.rs
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/rules/no_eval.rs
@@ -31,6 +31,7 @@ use crate::Violation;
 ///
 /// [S307]: https://docs.astral.sh/ruff/rules/suspicious-eval-usage/
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "v0.2.0")]
 pub(crate) struct Eval;
 
 /// PGH001
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap
index 86fd2f43f6..11914bed8c 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap
@@ -42,16 +42,15 @@ PGH004 [*] Use a colon when specifying `noqa` rule codes
 20 | # PGH004
    |
 help: Add missing colon
-
-ℹ Unsafe fix
-15 15 | x = 2  # noqa:X100
-16 16 | 
-17 17 | # PGH004
-18    |-x = 2  # noqa X100
-   18 |+x = 2  # noqa: X100
-19 19 | 
-20 20 | # PGH004
-21 21 | x = 2  # noqa X100, X200
+15 | x = 2  # noqa:X100
+16 | 
+17 | # PGH004
+   - x = 2  # noqa X100
+18 + x = 2  # noqa: X100
+19 | 
+20 | # PGH004
+21 | x = 2  # noqa X100, X200
+note: This is an unsafe fix and may change runtime behavior
 
 PGH004 [*] Use a colon when specifying `noqa` rule codes
   --> PGH004_0.py:21:8
@@ -63,13 +62,12 @@ PGH004 [*] Use a colon when specifying `noqa` rule codes
 23 | # PGH004
    |
 help: Add missing colon
-
-ℹ Unsafe fix
-18 18 | x = 2  # noqa X100
-19 19 | 
-20 20 | # PGH004
-21    |-x = 2  # noqa X100, X200
-   21 |+x = 2  # noqa: X100, X200
-22 22 | 
-23 23 | # PGH004
-24 24 | x = 2  # noqa : X300
+18 | x = 2  # noqa X100
+19 | 
+20 | # PGH004
+   - x = 2  # noqa X100, X200
+21 + x = 2  # noqa: X100, X200
+22 | 
+23 | # PGH004
+24 | x = 2  # noqa : X300
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap
index 651f26d344..664573f70b 100644
--- a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap
+++ b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap
@@ -98,3 +98,112 @@ PGH005 Mock method should be called: `assert_called_once_with`
 13 |
 14 | # OK
    |
+
+PGH005 Non-existent mock method: `not_awaited`
+  --> PGH005_0.py:26:8
+   |
+24 | # =================
+25 | # Errors
+26 | assert my_mock.not_awaited()
+   |        ^^^^^^^^^^^^^^^^^^^^^
+27 | assert my_mock.awaited_once_with()
+28 | assert my_mock.not_awaited
+   |
+
+PGH005 Non-existent mock method: `awaited_once_with`
+  --> PGH005_0.py:27:8
+   |
+25 | # Errors
+26 | assert my_mock.not_awaited()
+27 | assert my_mock.awaited_once_with()
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+28 | assert my_mock.not_awaited
+29 | assert my_mock.awaited_once_with
+   |
+
+PGH005 Non-existent mock method: `not_awaited`
+  --> PGH005_0.py:28:8
+   |
+26 | assert my_mock.not_awaited()
+27 | assert my_mock.awaited_once_with()
+28 | assert my_mock.not_awaited
+   |        ^^^^^^^^^^^^^^^^^^^
+29 | assert my_mock.awaited_once_with
+30 | my_mock.assert_not_awaited
+   |
+
+PGH005 Non-existent mock method: `awaited_once_with`
+  --> PGH005_0.py:29:8
+   |
+27 | assert my_mock.awaited_once_with()
+28 | assert my_mock.not_awaited
+29 | assert my_mock.awaited_once_with
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^
+30 | my_mock.assert_not_awaited
+31 | my_mock.assert_awaited
+   |
+
+PGH005 Mock method should be called: `assert_not_awaited`
+  --> PGH005_0.py:30:1
+   |
+28 | assert my_mock.not_awaited
+29 | assert my_mock.awaited_once_with
+30 | my_mock.assert_not_awaited
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+31 | my_mock.assert_awaited
+32 | my_mock.assert_awaited_once_with
+   |
+
+PGH005 Mock method should be called: `assert_awaited`
+  --> PGH005_0.py:31:1
+   |
+29 | assert my_mock.awaited_once_with
+30 | my_mock.assert_not_awaited
+31 | my_mock.assert_awaited
+   | ^^^^^^^^^^^^^^^^^^^^^^
+32 | my_mock.assert_awaited_once_with
+33 | my_mock.assert_awaited_once_with
+   |
+
+PGH005 Mock method should be called: `assert_awaited_once_with`
+  --> PGH005_0.py:32:1
+   |
+30 | my_mock.assert_not_awaited
+31 | my_mock.assert_awaited
+32 | my_mock.assert_awaited_once_with
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+33 | my_mock.assert_awaited_once_with
+34 | MyMock.assert_awaited_once_with
+   |
+
+PGH005 Mock method should be called: `assert_awaited_once_with`
+  --> PGH005_0.py:33:1
+   |
+31 | my_mock.assert_awaited
+32 | my_mock.assert_awaited_once_with
+33 | my_mock.assert_awaited_once_with
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+34 | MyMock.assert_awaited_once_with
+35 | assert my_mock.awaited
+   |
+
+PGH005 Mock method should be called: `assert_awaited_once_with`
+  --> PGH005_0.py:34:1
+   |
+32 | my_mock.assert_awaited_once_with
+33 | my_mock.assert_awaited_once_with
+34 | MyMock.assert_awaited_once_with
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+35 | assert my_mock.awaited
+   |
+
+PGH005 Non-existent mock method: `awaited`
+  --> PGH005_0.py:35:8
+   |
+33 | my_mock.assert_awaited_once_with
+34 | MyMock.assert_awaited_once_with
+35 | assert my_mock.awaited
+   |        ^^^^^^^^^^^^^^^
+36 |
+37 | # OK
+   |
diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__preview__PGH005_PGH005_0.py.snap b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__preview__PGH005_PGH005_0.py.snap
deleted file mode 100644
index 664573f70b..0000000000
--- a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__preview__PGH005_PGH005_0.py.snap
+++ /dev/null
@@ -1,209 +0,0 @@
----
-source: crates/ruff_linter/src/rules/pygrep_hooks/mod.rs
----
-PGH005 Non-existent mock method: `not_called`
- --> PGH005_0.py:4:8
-  |
-2 | # ============
-3 | # Errors
-4 | assert my_mock.not_called()
-  |        ^^^^^^^^^^^^^^^^^^^^
-5 | assert my_mock.called_once_with()
-6 | assert my_mock.not_called
-  |
-
-PGH005 Non-existent mock method: `called_once_with`
- --> PGH005_0.py:5:8
-  |
-3 | # Errors
-4 | assert my_mock.not_called()
-5 | assert my_mock.called_once_with()
-  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 | assert my_mock.not_called
-7 | assert my_mock.called_once_with
-  |
-
-PGH005 Non-existent mock method: `not_called`
- --> PGH005_0.py:6:8
-  |
-4 | assert my_mock.not_called()
-5 | assert my_mock.called_once_with()
-6 | assert my_mock.not_called
-  |        ^^^^^^^^^^^^^^^^^^
-7 | assert my_mock.called_once_with
-8 | my_mock.assert_not_called
-  |
-
-PGH005 Non-existent mock method: `called_once_with`
- --> PGH005_0.py:7:8
-  |
-5 | assert my_mock.called_once_with()
-6 | assert my_mock.not_called
-7 | assert my_mock.called_once_with
-  |        ^^^^^^^^^^^^^^^^^^^^^^^^
-8 | my_mock.assert_not_called
-9 | my_mock.assert_called
-  |
-
-PGH005 Mock method should be called: `assert_not_called`
-  --> PGH005_0.py:8:1
-   |
- 6 | assert my_mock.not_called
- 7 | assert my_mock.called_once_with
- 8 | my_mock.assert_not_called
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
- 9 | my_mock.assert_called
-10 | my_mock.assert_called_once_with
-   |
-
-PGH005 Mock method should be called: `assert_called`
-  --> PGH005_0.py:9:1
-   |
- 7 | assert my_mock.called_once_with
- 8 | my_mock.assert_not_called
- 9 | my_mock.assert_called
-   | ^^^^^^^^^^^^^^^^^^^^^
-10 | my_mock.assert_called_once_with
-11 | my_mock.assert_called_once_with
-   |
-
-PGH005 Mock method should be called: `assert_called_once_with`
-  --> PGH005_0.py:10:1
-   |
- 8 | my_mock.assert_not_called
- 9 | my_mock.assert_called
-10 | my_mock.assert_called_once_with
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11 | my_mock.assert_called_once_with
-12 | MyMock.assert_called_once_with
-   |
-
-PGH005 Mock method should be called: `assert_called_once_with`
-  --> PGH005_0.py:11:1
-   |
- 9 | my_mock.assert_called
-10 | my_mock.assert_called_once_with
-11 | my_mock.assert_called_once_with
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12 | MyMock.assert_called_once_with
-   |
-
-PGH005 Mock method should be called: `assert_called_once_with`
-  --> PGH005_0.py:12:1
-   |
-10 | my_mock.assert_called_once_with
-11 | my_mock.assert_called_once_with
-12 | MyMock.assert_called_once_with
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13 |
-14 | # OK
-   |
-
-PGH005 Non-existent mock method: `not_awaited`
-  --> PGH005_0.py:26:8
-   |
-24 | # =================
-25 | # Errors
-26 | assert my_mock.not_awaited()
-   |        ^^^^^^^^^^^^^^^^^^^^^
-27 | assert my_mock.awaited_once_with()
-28 | assert my_mock.not_awaited
-   |
-
-PGH005 Non-existent mock method: `awaited_once_with`
-  --> PGH005_0.py:27:8
-   |
-25 | # Errors
-26 | assert my_mock.not_awaited()
-27 | assert my_mock.awaited_once_with()
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-28 | assert my_mock.not_awaited
-29 | assert my_mock.awaited_once_with
-   |
-
-PGH005 Non-existent mock method: `not_awaited`
-  --> PGH005_0.py:28:8
-   |
-26 | assert my_mock.not_awaited()
-27 | assert my_mock.awaited_once_with()
-28 | assert my_mock.not_awaited
-   |        ^^^^^^^^^^^^^^^^^^^
-29 | assert my_mock.awaited_once_with
-30 | my_mock.assert_not_awaited
-   |
-
-PGH005 Non-existent mock method: `awaited_once_with`
-  --> PGH005_0.py:29:8
-   |
-27 | assert my_mock.awaited_once_with()
-28 | assert my_mock.not_awaited
-29 | assert my_mock.awaited_once_with
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^
-30 | my_mock.assert_not_awaited
-31 | my_mock.assert_awaited
-   |
-
-PGH005 Mock method should be called: `assert_not_awaited`
-  --> PGH005_0.py:30:1
-   |
-28 | assert my_mock.not_awaited
-29 | assert my_mock.awaited_once_with
-30 | my_mock.assert_not_awaited
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-31 | my_mock.assert_awaited
-32 | my_mock.assert_awaited_once_with
-   |
-
-PGH005 Mock method should be called: `assert_awaited`
-  --> PGH005_0.py:31:1
-   |
-29 | assert my_mock.awaited_once_with
-30 | my_mock.assert_not_awaited
-31 | my_mock.assert_awaited
-   | ^^^^^^^^^^^^^^^^^^^^^^
-32 | my_mock.assert_awaited_once_with
-33 | my_mock.assert_awaited_once_with
-   |
-
-PGH005 Mock method should be called: `assert_awaited_once_with`
-  --> PGH005_0.py:32:1
-   |
-30 | my_mock.assert_not_awaited
-31 | my_mock.assert_awaited
-32 | my_mock.assert_awaited_once_with
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-33 | my_mock.assert_awaited_once_with
-34 | MyMock.assert_awaited_once_with
-   |
-
-PGH005 Mock method should be called: `assert_awaited_once_with`
-  --> PGH005_0.py:33:1
-   |
-31 | my_mock.assert_awaited
-32 | my_mock.assert_awaited_once_with
-33 | my_mock.assert_awaited_once_with
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-34 | MyMock.assert_awaited_once_with
-35 | assert my_mock.awaited
-   |
-
-PGH005 Mock method should be called: `assert_awaited_once_with`
-  --> PGH005_0.py:34:1
-   |
-32 | my_mock.assert_awaited_once_with
-33 | my_mock.assert_awaited_once_with
-34 | MyMock.assert_awaited_once_with
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-35 | assert my_mock.awaited
-   |
-
-PGH005 Non-existent mock method: `awaited`
-  --> PGH005_0.py:35:8
-   |
-33 | my_mock.assert_awaited_once_with
-34 | MyMock.assert_awaited_once_with
-35 | assert my_mock.awaited
-   |        ^^^^^^^^^^^^^^^
-36 |
-37 | # OK
-   |
diff --git a/crates/ruff_linter/src/rules/pylint/mod.rs b/crates/ruff_linter/src/rules/pylint/mod.rs
index 101c92a16b..a0ab9a908e 100644
--- a/crates/ruff_linter/src/rules/pylint/mod.rs
+++ b/crates/ruff_linter/src/rules/pylint/mod.rs
@@ -52,6 +52,7 @@ mod tests {
     #[test_case(Rule::ManualFromImport, Path::new("import_aliasing.py"))]
     #[test_case(Rule::IfStmtMinMax, Path::new("if_stmt_min_max.py"))]
     #[test_case(Rule::SingleStringSlots, Path::new("single_string_slots.py"))]
+    #[test_case(Rule::StopIterationReturn, Path::new("stop_iteration_return.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"))]
@@ -420,19 +421,6 @@ mod tests {
         Ok(())
     }
 
-    #[test]
-    fn preview_useless_import_alias() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("pylint/import_aliasing_2/__init__.py"),
-            &LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..LinterSettings::for_rule(Rule::UselessImportAlias)
-            },
-        )?;
-        assert_diagnostics!(diagnostics);
-        Ok(())
-    }
-
     #[test]
     fn import_outside_top_level_with_banned() -> Result<()> {
         let diagnostics = test_path(
diff --git a/crates/ruff_linter/src/rules/pylint/rules/and_or_ternary.rs b/crates/ruff_linter/src/rules/pylint/rules/and_or_ternary.rs
index bc8bed77c7..e93e3a1c34 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/and_or_ternary.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/and_or_ternary.rs
@@ -29,6 +29,7 @@ use crate::Violation;
 /// maximum = x if x >= y else y
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "v0.2.0")]
 pub(crate) struct AndOrTernary;
 
 /// PLR1706
diff --git a/crates/ruff_linter/src/rules/pylint/rules/assert_on_string_literal.rs b/crates/ruff_linter/src/rules/pylint/rules/assert_on_string_literal.rs
index 64db3f1e40..60dbad3e8c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/assert_on_string_literal.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/assert_on_string_literal.rs
@@ -26,6 +26,7 @@ enum Kind {
 /// assert "always true"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct AssertOnStringLiteral {
     kind: Kind,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/await_outside_async.rs b/crates/ruff_linter/src/rules/pylint/rules/await_outside_async.rs
index e41275a1ca..78ad99fd07 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/await_outside_async.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/await_outside_async.rs
@@ -36,6 +36,7 @@ use crate::Violation;
 ///
 /// [autoawait]: https://ipython.readthedocs.io/en/stable/interactive/autoawait.html
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.150")]
 pub(crate) struct AwaitOutsideAsync;
 
 impl Violation for AwaitOutsideAsync {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_dunder_method_name.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_dunder_method_name.rs
index b4ee0a4332..200ec4dbe2 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bad_dunder_method_name.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bad_dunder_method_name.rs
@@ -43,6 +43,7 @@ use crate::rules::pylint::helpers::is_known_dunder_method;
 /// ## Options
 /// - `lint.pylint.allow-dunder-method-names`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.285")]
 pub(crate) struct BadDunderMethodName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_open_mode.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_open_mode.rs
index b89cbf1425..c949b7baef 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bad_open_mode.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bad_open_mode.rs
@@ -37,6 +37,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `open`](https://docs.python.org/3/library/functions.html#open)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct BadOpenMode {
     mode: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_staticmethod_argument.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_staticmethod_argument.rs
index 4108cd8c74..bc488411fd 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bad_staticmethod_argument.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bad_staticmethod_argument.rs
@@ -37,6 +37,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct BadStaticmethodArgument {
     argument_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_str_strip_call.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_str_strip_call.rs
index b251bab323..41620db47b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bad_str_strip_call.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bad_str_strip_call.rs
@@ -48,6 +48,7 @@ use ruff_python_ast::PythonVersion;
 /// ## References
 /// - [Python documentation: `str.strip`](https://docs.python.org/3/library/stdtypes.html?highlight=strip#str.strip)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.242")]
 pub(crate) struct BadStrStripCall {
     strip: StripKind,
     removal: Option<RemovalKind>,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_character.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_character.rs
index a94e8290e9..28a24babde 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_character.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_character.rs
@@ -27,6 +27,7 @@ use crate::checkers::ast::Checker;
 /// print("{:z}".format("1"))
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.283")]
 pub(crate) struct BadStringFormatCharacter {
     format_char: char,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs
index a747b9b12a..3822b76b7a 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs
@@ -28,6 +28,7 @@ use crate::checkers::ast::Checker;
 /// print("%d" % 1)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct BadStringFormatType;
 
 impl Violation for BadStringFormatType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/bidirectional_unicode.rs b/crates/ruff_linter/src/rules/pylint/rules/bidirectional_unicode.rs
index fce3e6b36d..3e6f2eff6f 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/bidirectional_unicode.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/bidirectional_unicode.rs
@@ -3,7 +3,7 @@ use ruff_source_file::Line;
 
 use crate::{Violation, checkers::ast::LintContext};
 
-const BIDI_UNICODE: [char; 10] = [
+const BIDI_UNICODE: [char; 11] = [
     '\u{202A}', //{LEFT-TO-RIGHT EMBEDDING}
     '\u{202B}', //{RIGHT-TO-LEFT EMBEDDING}
     '\u{202C}', //{POP DIRECTIONAL FORMATTING}
@@ -17,6 +17,7 @@ const BIDI_UNICODE: [char; 10] = [
     // https://peps.python.org/pep-0672/
     // so the list above might not be complete
     '\u{200F}', //{RIGHT-TO-LEFT MARK}
+    '\u{061C}', //{ARABIC LETTER MARK}
                 // We don't use
                 //   "\u200E" # \n{LEFT-TO-RIGHT MARK}
                 // as this is the default for latin files and can't be used
@@ -49,6 +50,7 @@ const BIDI_UNICODE: [char; 10] = [
 /// ## References
 /// - [PEP 672: Bidirectional Marks, Embeddings, Overrides and Isolates](https://peps.python.org/pep-0672/#bidirectional-marks-embeddings-overrides-and-isolates)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.244")]
 pub(crate) struct BidirectionalUnicode;
 
 impl Violation for BidirectionalUnicode {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/binary_op_exception.rs b/crates/ruff_linter/src/rules/pylint/rules/binary_op_exception.rs
index eefae02792..533d44cc5a 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/binary_op_exception.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/binary_op_exception.rs
@@ -47,6 +47,7 @@ impl From<&ast::BoolOp> for BoolOp {
 ///     pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.258")]
 pub(crate) struct BinaryOpException {
     op: BoolOp,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/boolean_chained_comparison.rs b/crates/ruff_linter/src/rules/pylint/rules/boolean_chained_comparison.rs
index 1795e7ed57..27d6d49ad5 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/boolean_chained_comparison.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/boolean_chained_comparison.rs
@@ -35,6 +35,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct BooleanChainedComparison;
 
 impl AlwaysFixableViolation for BooleanChainedComparison {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/collapsible_else_if.rs b/crates/ruff_linter/src/rules/pylint/rules/collapsible_else_if.rs
index 72b15426a7..1e68c246fb 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/collapsible_else_if.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/collapsible_else_if.rs
@@ -46,6 +46,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `if` Statements](https://docs.python.org/3/tutorial/controlflow.html#if-statements)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct CollapsibleElseIf;
 
 impl Violation for CollapsibleElseIf {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/compare_to_empty_string.rs b/crates/ruff_linter/src/rules/pylint/rules/compare_to_empty_string.rs
index 94217d05ce..421dcac4be 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/compare_to_empty_string.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/compare_to_empty_string.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [#4282]: https://github.com/astral-sh/ruff/issues/4282
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.255")]
 pub(crate) struct CompareToEmptyString {
     existing: String,
     replacement: String,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/comparison_of_constant.rs b/crates/ruff_linter/src/rules/pylint/rules/comparison_of_constant.rs
index 8eab156203..57abf6f9e3 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/comparison_of_constant.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/comparison_of_constant.rs
@@ -28,6 +28,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.221")]
 pub(crate) struct ComparisonOfConstant {
     left_constant: String,
     op: CmpOp,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/comparison_with_itself.rs b/crates/ruff_linter/src/rules/pylint/rules/comparison_with_itself.rs
index 60697e17cd..9c38b10839 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/comparison_with_itself.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/comparison_with_itself.rs
@@ -31,6 +31,7 @@ use crate::fix::snippet::SourceCodeSnippet;
 /// ## References
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct ComparisonWithItself {
     actual: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/continue_in_finally.rs b/crates/ruff_linter/src/rules/pylint/rules/continue_in_finally.rs
index a89baf379e..476dae54ed 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/continue_in_finally.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/continue_in_finally.rs
@@ -37,6 +37,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `target-version`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct ContinueInFinally;
 
 impl Violation for ContinueInFinally {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/dict_index_missing_items.rs b/crates/ruff_linter/src/rules/pylint/rules/dict_index_missing_items.rs
index c30ac6883e..a7f718c1b9 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/dict_index_missing_items.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/dict_index_missing_items.rs
@@ -46,6 +46,7 @@ use crate::checkers::ast::Checker;
 ///     print(f"{instrument}: {section}")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct DictIndexMissingItems;
 
 impl Violation for DictIndexMissingItems {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/dict_iter_missing_items.rs b/crates/ruff_linter/src/rules/pylint/rules/dict_iter_missing_items.rs
index 60c7b91d04..e973f1ce9c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/dict_iter_missing_items.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/dict_iter_missing_items.rs
@@ -51,6 +51,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## Fix safety
 /// Due to the known problem with tuple keys, this fix is unsafe.
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.0")]
 pub(crate) struct DictIterMissingItems;
 
 impl AlwaysFixableViolation for DictIterMissingItems {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/duplicate_bases.rs b/crates/ruff_linter/src/rules/pylint/rules/duplicate_bases.rs
index e4a5192df2..2724d9a5e0 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/duplicate_bases.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/duplicate_bases.rs
@@ -55,6 +55,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Class definitions](https://docs.python.org/3/reference/compound_stmts.html#class-definitions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.269")]
 pub(crate) struct DuplicateBases {
     base: String,
     class: String,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/empty_comment.rs b/crates/ruff_linter/src/rules/pylint/rules/empty_comment.rs
index fb67f85505..004d50e5f4 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/empty_comment.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/empty_comment.rs
@@ -30,6 +30,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Pylint documentation](https://pylint.pycqa.org/en/latest/user_guide/messages/refactor/empty-comment.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct EmptyComment;
 
 impl Violation for EmptyComment {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/eq_without_hash.rs b/crates/ruff_linter/src/rules/pylint/rules/eq_without_hash.rs
index 69401e854d..4c63c8b2a3 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/eq_without_hash.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/eq_without_hash.rs
@@ -64,6 +64,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `object.__hash__`](https://docs.python.org/3/reference/datamodel.html#object.__hash__)
 /// - [Python glossary: hashable](https://docs.python.org/3/glossary.html#term-hashable)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct EqWithoutHash;
 
 impl Violation for EqWithoutHash {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/global_at_module_level.rs b/crates/ruff_linter/src/rules/pylint/rules/global_at_module_level.rs
index c92593740f..681bdc5a21 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/global_at_module_level.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/global_at_module_level.rs
@@ -15,6 +15,7 @@ use crate::checkers::ast::Checker;
 /// At the module level, all names are global by default, so the `global`
 /// keyword is redundant.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct GlobalAtModuleLevel;
 
 impl Violation for GlobalAtModuleLevel {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/global_statement.rs b/crates/ruff_linter/src/rules/pylint/rules/global_statement.rs
index dfa63cd427..345357ecdd 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/global_statement.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/global_statement.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// print(var)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.253")]
 pub(crate) struct GlobalStatement {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/global_variable_not_assigned.rs b/crates/ruff_linter/src/rules/pylint/rules/global_variable_not_assigned.rs
index a5421541f3..26c6312e96 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/global_variable_not_assigned.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/global_variable_not_assigned.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `global` statement](https://docs.python.org/3/reference/simple_stmts.html#the-global-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.174")]
 pub(crate) struct GlobalVariableNotAssigned {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs b/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs
index 4fc2bf484e..247f1495df 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs
@@ -46,6 +46,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `max`](https://docs.python.org/3/library/functions.html#max)
 /// - [Python documentation: `min`](https://docs.python.org/3/library/functions.html#min)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct IfStmtMinMax {
     min_max: MinMax,
     replacement: SourceCodeSnippet,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/import_outside_top_level.rs b/crates/ruff_linter/src/rules/pylint/rules/import_outside_top_level.rs
index 57b7fd2b27..d2a953c816 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/import_outside_top_level.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/import_outside_top_level.rs
@@ -53,6 +53,7 @@ use crate::{
 /// [TID253]: https://docs.astral.sh/ruff/rules/banned-module-level-imports/
 /// [PEP 8]: https://peps.python.org/pep-0008/#imports
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct ImportOutsideTopLevel;
 
 impl Violation for ImportOutsideTopLevel {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/import_private_name.rs b/crates/ruff_linter/src/rules/pylint/rules/import_private_name.rs
index dab7b51793..e60ad913fc 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/import_private_name.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/import_private_name.rs
@@ -50,6 +50,7 @@ use crate::package::PackageRoot;
 /// [PEP 8]: https://peps.python.org/pep-0008/
 /// [PEP 420]: https://peps.python.org/pep-0420/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.14")]
 pub(crate) struct ImportPrivateName {
     name: String,
     module: Option<String>,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/import_self.rs b/crates/ruff_linter/src/rules/pylint/rules/import_self.rs
index 03ba035f3e..d755117246 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/import_self.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/import_self.rs
@@ -23,6 +23,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// def foo(): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.265")]
 pub(crate) struct ImportSelf {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_all_format.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_all_format.rs
index e338280462..cd0cf491eb 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_all_format.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_all_format.rs
@@ -27,6 +27,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## References
 /// - [Python documentation: The `import` statement](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.237")]
 pub(crate) struct InvalidAllFormat;
 
 impl Violation for InvalidAllFormat {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_all_object.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_all_object.rs
index 99d83fe98b..047d652f80 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_all_object.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_all_object.rs
@@ -27,6 +27,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## References
 /// - [Python documentation: The `import` statement](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.237")]
 pub(crate) struct InvalidAllObject;
 
 impl Violation for InvalidAllObject {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_bool_return.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_bool_return.rs
index cb099e399a..ab7970ddce 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_bool_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_bool_return.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `__bool__` method](https://docs.python.org/3/reference/datamodel.html#object.__bool__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.3")]
 pub(crate) struct InvalidBoolReturnType;
 
 impl Violation for InvalidBoolReturnType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_bytes_return.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_bytes_return.rs
index 9b5004e6bb..ca2126ef2a 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_bytes_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_bytes_return.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `__bytes__` method](https://docs.python.org/3/reference/datamodel.html#object.__bytes__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct InvalidBytesReturnType;
 
 impl Violation for InvalidBytesReturnType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs
index 37d899b653..2d84a1b9da 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 /// int(os.getenv("FOO", "1"))
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.255")]
 pub(crate) struct InvalidEnvvarDefault;
 
 impl Violation for InvalidEnvvarDefault {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_value.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_value.rs
index 9a986e41d7..3733211a38 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_value.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_value.rs
@@ -30,6 +30,7 @@ use crate::checkers::ast::Checker;
 /// os.getenv("1")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.255")]
 pub(crate) struct InvalidEnvvarValue;
 
 impl Violation for InvalidEnvvarValue {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_hash_return.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_hash_return.rs
index a1ecd71cf1..4ed2f1a470 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_hash_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_hash_return.rs
@@ -39,6 +39,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `__hash__` method](https://docs.python.org/3/reference/datamodel.html#object.__hash__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct InvalidHashReturnType;
 
 impl Violation for InvalidHashReturnType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_index_return.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_index_return.rs
index dca29deb76..c863e1011d 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_index_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_index_return.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `__index__` method](https://docs.python.org/3/reference/datamodel.html#object.__index__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct InvalidIndexReturnType;
 
 impl Violation for InvalidIndexReturnType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_length_return.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_length_return.rs
index 4e155a4aab..cf659ffa2b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_length_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_length_return.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `__len__` method](https://docs.python.org/3/reference/datamodel.html#object.__len__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct InvalidLengthReturnType;
 
 impl Violation for InvalidLengthReturnType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_str_return.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_str_return.rs
index 2484b2f74f..ecc67de402 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_str_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_str_return.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: The `__str__` method](https://docs.python.org/3/reference/datamodel.html#object.__str__)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct InvalidStrReturnType;
 
 impl Violation for InvalidStrReturnType {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_string_characters.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_string_characters.rs
index 6b621fe0cd..05688f67c7 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_string_characters.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_string_characters.rs
@@ -26,6 +26,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// x = "\b"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct InvalidCharacterBackspace;
 
 impl Violation for InvalidCharacterBackspace {
@@ -61,6 +62,7 @@ impl Violation for InvalidCharacterBackspace {
 /// x = "\x1a"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct InvalidCharacterSub;
 
 impl Violation for InvalidCharacterSub {
@@ -96,6 +98,7 @@ impl Violation for InvalidCharacterSub {
 /// x = "\x1b"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct InvalidCharacterEsc;
 
 impl Violation for InvalidCharacterEsc {
@@ -131,6 +134,7 @@ impl Violation for InvalidCharacterEsc {
 /// x = "\0"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct InvalidCharacterNul;
 
 impl Violation for InvalidCharacterNul {
@@ -165,6 +169,7 @@ impl Violation for InvalidCharacterNul {
 /// x = "Dear Sir\u200b/\u200bMadam"  # zero width space
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct InvalidCharacterZeroWidthSpace;
 
 impl Violation for InvalidCharacterZeroWidthSpace {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/iteration_over_set.rs b/crates/ruff_linter/src/rules/pylint/rules/iteration_over_set.rs
index 92d18485ae..0e99fc0f7c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/iteration_over_set.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/iteration_over_set.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `set`](https://docs.python.org/3/library/stdtypes.html#set)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct IterationOverSet;
 
 impl AlwaysFixableViolation for IterationOverSet {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/len_test.rs b/crates/ruff_linter/src/rules/pylint/rules/len_test.rs
index 1a664eadda..e64bcd12e5 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/len_test.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/len_test.rs
@@ -59,6 +59,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// [PEP 8: Programming Recommendations](https://peps.python.org/pep-0008/#programming-recommendations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct LenTest {
     expression: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/literal_membership.rs b/crates/ruff_linter/src/rules/pylint/rules/literal_membership.rs
index 2130cd29cf..b11870aa63 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/literal_membership.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/literal_membership.rs
@@ -25,13 +25,16 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// ## Fix safety
 /// This rule's fix is marked as unsafe, as the use of a `set` literal will
-/// error at runtime if the sequence contains unhashable elements (like lists
-/// or dictionaries). While Ruff will attempt to infer the hashability of the
-/// elements, it may not always be able to do so.
+/// error at runtime if either the element being tested for membership (the
+/// left-hand side) or any element of the sequence (the right-hand side)
+/// is unhashable (like lists or dictionaries). While Ruff will attempt to
+/// infer the hashability of both sides and skip the fix when it can determine
+/// that either side is unhashable, it may not always be able to do so.
 ///
 /// ## References
 /// - [What’s New In Python 3.2](https://docs.python.org/3/whatsnew/3.2.html#optimizations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.1")]
 pub(crate) struct LiteralMembership;
 
 impl AlwaysFixableViolation for LiteralMembership {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/load_before_global_declaration.rs b/crates/ruff_linter/src/rules/pylint/rules/load_before_global_declaration.rs
index 5d93d51e50..575239ec12 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/load_before_global_declaration.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/load_before_global_declaration.rs
@@ -37,6 +37,7 @@ use crate::Violation;
 /// ## References
 /// - [Python documentation: The `global` statement](https://docs.python.org/3/reference/simple_stmts.html#the-global-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.174")]
 pub(crate) struct LoadBeforeGlobalDeclaration {
     pub(crate) name: String,
     pub(crate) row: SourceRow,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/logging.rs b/crates/ruff_linter/src/rules/pylint/rules/logging.rs
index d8a13cfdf3..b126b85f77 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/logging.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/logging.rs
@@ -37,6 +37,7 @@ use crate::rules::pyflakes::cformat::CFormatSummary;
 ///     raise
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.252")]
 pub(crate) struct LoggingTooFewArgs;
 
 impl Violation for LoggingTooFewArgs {
@@ -74,6 +75,7 @@ impl Violation for LoggingTooFewArgs {
 ///     raise
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.252")]
 pub(crate) struct LoggingTooManyArgs;
 
 impl Violation for LoggingTooManyArgs {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/magic_value_comparison.rs b/crates/ruff_linter/src/rules/pylint/rules/magic_value_comparison.rs
index a469e7b40c..c3d6c2fe5e 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/magic_value_comparison.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/magic_value_comparison.rs
@@ -46,6 +46,7 @@ use crate::rules::pylint::settings::ConstantType;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#constants
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.221")]
 pub(crate) struct MagicValueComparison {
     value: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs
index 5f5cc9ccc9..c0aab3657b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs
@@ -4,6 +4,7 @@ use ruff_text_size::{Ranged, TextRange};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 
 use crate::checkers::ast::Checker;
+use crate::rules::pyupgrade::rules::is_import_required_by_isort;
 use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
@@ -26,6 +27,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Submodules](https://docs.python.org/3/reference/import.html#submodules)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct ManualFromImport {
     module: String,
     name: String,
@@ -58,6 +60,15 @@ pub(crate) fn manual_from_import(checker: &Checker, stmt: &Stmt, alias: &Alias,
         return;
     }
 
+    // Skip if this import is required by isort to prevent infinite loops with I002
+    if is_import_required_by_isort(
+        &checker.settings().isort.required_imports,
+        stmt.into(),
+        alias,
+    ) {
+        return;
+    }
+
     let mut diagnostic = checker.report_diagnostic(
         ManualFromImport {
             module: module.to_string(),
@@ -72,11 +83,11 @@ pub(crate) fn manual_from_import(checker: &Checker, stmt: &Stmt, alias: &Alias,
                 name: asname.clone(),
                 asname: None,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }],
             level: 0,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         };
         diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
             checker.generator().stmt(&node.into()),
diff --git a/crates/ruff_linter/src/rules/pylint/rules/misplaced_bare_raise.rs b/crates/ruff_linter/src/rules/pylint/rules/misplaced_bare_raise.rs
index 3856d2e649..98777b218c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/misplaced_bare_raise.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/misplaced_bare_raise.rs
@@ -41,6 +41,7 @@ use crate::rules::pylint::helpers::in_dunder_method;
 ///         raise ValueError("`obj` cannot be `None`")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct MisplacedBareRaise;
 
 impl Violation for MisplacedBareRaise {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/missing_maxsplit_arg.rs b/crates/ruff_linter/src/rules/pylint/rules/missing_maxsplit_arg.rs
index e047e9b019..7843f8f925 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/missing_maxsplit_arg.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/missing_maxsplit_arg.rs
@@ -41,6 +41,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// This rule's fix is marked as unsafe for `split()`/`rsplit()` calls that contain `*args` or `**kwargs` arguments, as
 /// adding a `maxsplit` argument to such a call may lead to duplicated arguments.
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.11.12")]
 pub(crate) struct MissingMaxsplitArg {
     actual_split_type: String,
     suggested_split_type: String,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/mod.rs b/crates/ruff_linter/src/rules/pylint/rules/mod.rs
index 891691f21b..2853bb84c9 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/mod.rs
@@ -75,6 +75,7 @@ pub(crate) use shallow_copy_environ::*;
 pub(crate) use single_string_slots::*;
 pub(crate) use singledispatch_method::*;
 pub(crate) use singledispatchmethod_function::*;
+pub(crate) use stop_iteration_return::*;
 pub(crate) use subprocess_popen_preexec_fn::*;
 pub(crate) use subprocess_run_without_check::*;
 pub(crate) use super_without_brackets::*;
@@ -185,6 +186,7 @@ mod shallow_copy_environ;
 mod single_string_slots;
 mod singledispatch_method;
 mod singledispatchmethod_function;
+mod stop_iteration_return;
 mod subprocess_popen_preexec_fn;
 mod subprocess_run_without_check;
 mod super_without_brackets;
diff --git a/crates/ruff_linter/src/rules/pylint/rules/modified_iterating_set.rs b/crates/ruff_linter/src/rules/pylint/rules/modified_iterating_set.rs
index 6d99e42069..b01ad881d8 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/modified_iterating_set.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/modified_iterating_set.rs
@@ -46,6 +46,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `set`](https://docs.python.org/3/library/stdtypes.html#set)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.5")]
 pub(crate) struct ModifiedIteratingSet {
     name: Name,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/named_expr_without_context.rs b/crates/ruff_linter/src/rules/pylint/rules/named_expr_without_context.rs
index 5b306bd547..3e45e26a49 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/named_expr_without_context.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/named_expr_without_context.rs
@@ -25,6 +25,7 @@ use crate::checkers::ast::Checker;
 /// a = 42
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.270")]
 pub(crate) struct NamedExprWithoutContext;
 
 impl Violation for NamedExprWithoutContext {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/nan_comparison.rs b/crates/ruff_linter/src/rules/pylint/rules/nan_comparison.rs
index 3ff711e0fd..d387f65c06 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/nan_comparison.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/nan_comparison.rs
@@ -33,6 +33,7 @@ use crate::linter::float::as_nan_float_string_literal;
 ///     pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct NanComparison {
     nan: Nan,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs
index b9be519243..34322705ee 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs
@@ -75,6 +75,7 @@ pub(crate) enum MinMax {
 /// - [Python documentation: `min`](https://docs.python.org/3/library/functions.html#min)
 /// - [Python documentation: `max`](https://docs.python.org/3/library/functions.html#max)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.266")]
 pub(crate) struct NestedMinMax {
     func: MinMax,
 }
@@ -147,7 +148,7 @@ fn collect_nested_args(min_max: MinMax, args: &[Expr], semantic: &SemanticModel)
                                 value: Box::new(arg.clone()),
                                 ctx: ast::ExprContext::Load,
                                 range: TextRange::default(),
-                                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             });
                             new_args.push(new_arg);
                             continue;
@@ -204,10 +205,10 @@ pub(crate) fn nested_min_max(
                 args: collect_nested_args(min_max, args, checker.semantic()).into_boxed_slice(),
                 keywords: Box::from(keywords),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             },
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         });
         diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
             checker.generator().expr(&flattened_expr),
diff --git a/crates/ruff_linter/src/rules/pylint/rules/no_method_decorator.rs b/crates/ruff_linter/src/rules/pylint/rules/no_method_decorator.rs
index 99016e24c2..334cd47bc8 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/no_method_decorator.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/no_method_decorator.rs
@@ -33,6 +33,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     def bar(cls): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.7")]
 pub(crate) struct NoClassmethodDecorator;
 
 impl AlwaysFixableViolation for NoClassmethodDecorator {
@@ -69,6 +70,7 @@ impl AlwaysFixableViolation for NoClassmethodDecorator {
 ///     def bar(arg1, arg2): ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.7")]
 pub(crate) struct NoStaticmethodDecorator;
 
 impl AlwaysFixableViolation for NoStaticmethodDecorator {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/no_self_use.rs b/crates/ruff_linter/src/rules/pylint/rules/no_self_use.rs
index c46a268005..fd6e24528c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/no_self_use.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/no_self_use.rs
@@ -39,6 +39,7 @@ use crate::rules::flake8_unused_arguments::rules::is_not_implemented_stub_with_v
 ///         print("Greetings friend!")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.286")]
 pub(crate) struct NoSelfUse {
     method_name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/non_ascii_module_import.rs b/crates/ruff_linter/src/rules/pylint/rules/non_ascii_module_import.rs
index 75046c8ffe..be493bb7de 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/non_ascii_module_import.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/non_ascii_module_import.rs
@@ -30,6 +30,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 672]: https://peps.python.org/pep-0672/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct NonAsciiImportName {
     name: String,
     kind: Kind,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/non_ascii_name.rs b/crates/ruff_linter/src/rules/pylint/rules/non_ascii_name.rs
index 2458f418a4..9be3a4e377 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/non_ascii_name.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/non_ascii_name.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 672]: https://peps.python.org/pep-0672/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct NonAsciiName {
     name: String,
     kind: Kind,
@@ -73,7 +74,8 @@ pub(crate) fn non_ascii_name(checker: &Checker, binding: &Binding) {
         | BindingKind::SubmoduleImport(_)
         | BindingKind::Deletion
         | BindingKind::ConditionalDeletion(_)
-        | BindingKind::UnboundException(_) => {
+        | BindingKind::UnboundException(_)
+        | BindingKind::DunderClassCell => {
             return;
         }
     };
diff --git a/crates/ruff_linter/src/rules/pylint/rules/non_augmented_assignment.rs b/crates/ruff_linter/src/rules/pylint/rules/non_augmented_assignment.rs
index 1562783af2..7423c2dc76 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/non_augmented_assignment.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/non_augmented_assignment.rs
@@ -69,6 +69,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// assert (foo, bar) == ([1, 2], [1, 2])
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.7")]
 pub(crate) struct NonAugmentedAssignment {
     operator: AugmentedOperator,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/non_slot_assignment.rs b/crates/ruff_linter/src/rules/pylint/rules/non_slot_assignment.rs
index 3c331c47ad..42964f1efa 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/non_slot_assignment.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/non_slot_assignment.rs
@@ -47,6 +47,7 @@ use crate::checkers::ast::Checker;
 ///         pass
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.1.15")]
 pub(crate) struct NonSlotAssignment {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/nonlocal_and_global.rs b/crates/ruff_linter/src/rules/pylint/rules/nonlocal_and_global.rs
index bb8b10a2ea..fd8d54441a 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/nonlocal_and_global.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/nonlocal_and_global.rs
@@ -41,6 +41,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: The `global` statement](https://docs.python.org/3/reference/simple_stmts.html#the-global-statement)
 /// - [Python documentation: The `nonlocal` statement](https://docs.python.org/3/reference/simple_stmts.html#nonlocal)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct NonlocalAndGlobal {
     pub(crate) name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/nonlocal_without_binding.rs b/crates/ruff_linter/src/rules/pylint/rules/nonlocal_without_binding.rs
index ff2bd1a2ab..90f5e0dde5 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/nonlocal_without_binding.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/nonlocal_without_binding.rs
@@ -34,6 +34,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: The `nonlocal` statement](https://docs.python.org/3/reference/simple_stmts.html#nonlocal)
 /// - [PEP 3104 – Access to Names in Outer Scopes](https://peps.python.org/pep-3104/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.174")]
 pub(crate) struct NonlocalWithoutBinding {
     pub(crate) name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/potential_index_error.rs b/crates/ruff_linter/src/rules/pylint/rules/potential_index_error.rs
index 4a3f29e090..2a67e6a83b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/potential_index_error.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/potential_index_error.rs
@@ -19,6 +19,7 @@ use crate::checkers::ast::Checker;
 /// print([0, 1, 2][3])
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct PotentialIndexError;
 
 impl Violation for PotentialIndexError {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/property_with_parameters.rs b/crates/ruff_linter/src/rules/pylint/rules/property_with_parameters.rs
index a0c2c9db75..9c77508943 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/property_with_parameters.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/property_with_parameters.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `property`](https://docs.python.org/3/library/functions.html#property)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.153")]
 pub(crate) struct PropertyWithParameters;
 
 impl Violation for PropertyWithParameters {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/redeclared_assigned_name.rs b/crates/ruff_linter/src/rules/pylint/rules/redeclared_assigned_name.rs
index b85a58b1da..aeac5463d3 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/redeclared_assigned_name.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/redeclared_assigned_name.rs
@@ -28,6 +28,7 @@ use crate::checkers::ast::Checker;
 /// print(a)  # 3
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct RedeclaredAssignedName {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/redefined_argument_from_local.rs b/crates/ruff_linter/src/rules/pylint/rules/redefined_argument_from_local.rs
index 856447d810..67799df816 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/redefined_argument_from_local.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/redefined_argument_from_local.rs
@@ -33,6 +33,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Pylint documentation](https://pylint.readthedocs.io/en/latest/user_guide/messages/refactor/redefined-argument-from-local.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct RedefinedArgumentFromLocal {
     pub(crate) name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs b/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs
index bbdf17e8e7..3abd675316 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs
@@ -49,6 +49,7 @@ use crate::checkers::ast::Checker;
 ///     print(f.readline())  # prints a line from path2
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.252")]
 pub(crate) struct RedefinedLoopName {
     name: String,
     outer_kind: OuterBindingKind,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/redefined_slots_in_subclass.rs b/crates/ruff_linter/src/rules/pylint/rules/redefined_slots_in_subclass.rs
index 43b4b5eaa3..21ccdc83da 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/redefined_slots_in_subclass.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/redefined_slots_in_subclass.rs
@@ -38,6 +38,7 @@ use crate::checkers::ast::Checker;
 ///     __slots__ = "d"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.3")]
 pub(crate) struct RedefinedSlotsInSubclass {
     base: String,
     slot_name: String,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs b/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs
index 4ac8f3f79f..441ea068c6 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs
@@ -53,6 +53,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python documentation: Membership test operations](https://docs.python.org/3/reference/expressions.html#membership-test-operations)
 /// - [Python documentation: `set`](https://docs.python.org/3/library/stdtypes.html#set)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.279")]
 pub(crate) struct RepeatedEqualityComparison {
     expression: SourceCodeSnippet,
     all_hashable: bool,
@@ -170,13 +171,13 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp
                 Expr::Set(ast::ExprSet {
                     elts: comparators.iter().copied().cloned().collect(),
                     range: TextRange::default(),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             } else {
                 Expr::Tuple(ast::ExprTuple {
                     elts: comparators.iter().copied().cloned().collect(),
                     range: TextRange::default(),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                     ctx: ExprContext::Load,
                     parenthesized: true,
                 })
@@ -194,12 +195,12 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp
                             },
                             comparators: Box::from([comparator]),
                             range: bool_op.range(),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         })))
                         .chain(after)
                         .collect(),
                     range: bool_op.range(),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })),
                 bool_op.range(),
             )));
diff --git a/crates/ruff_linter/src/rules/pylint/rules/repeated_isinstance_calls.rs b/crates/ruff_linter/src/rules/pylint/rules/repeated_isinstance_calls.rs
index 9c71a32469..093c3fa8d3 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/repeated_isinstance_calls.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/repeated_isinstance_calls.rs
@@ -49,6 +49,7 @@ use crate::fix::snippet::SourceCodeSnippet;
 ///
 /// [SIM101]: https://docs.astral.sh/ruff/rules/duplicate-isinstance-call/
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.5.0")]
 pub(crate) struct RepeatedIsinstanceCalls {
     expression: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/repeated_keyword_argument.rs b/crates/ruff_linter/src/rules/pylint/rules/repeated_keyword_argument.rs
index b2033a5e8f..ab2db3f95d 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/repeated_keyword_argument.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/repeated_keyword_argument.rs
@@ -23,6 +23,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: Argument](https://docs.python.org/3/glossary.html#term-argument)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct RepeatedKeywordArgument {
     duplicate_keyword: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/return_in_init.rs b/crates/ruff_linter/src/rules/pylint/rules/return_in_init.rs
index a80913635c..b27ee93b59 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/return_in_init.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/return_in_init.rs
@@ -35,6 +35,7 @@ use crate::rules::pylint::helpers::in_dunder_method;
 /// ## References
 /// - [CodeQL: `py-explicit-return-in-init`](https://codeql.github.com/codeql-query-help/python/py-explicit-return-in-init/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.248")]
 pub(crate) struct ReturnInInit;
 
 impl Violation for ReturnInInit {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/self_assigning_variable.rs b/crates/ruff_linter/src/rules/pylint/rules/self_assigning_variable.rs
index 2d9d194c6e..4c10078f8a 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/self_assigning_variable.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/self_assigning_variable.rs
@@ -24,6 +24,7 @@ use crate::checkers::ast::Checker;
 /// country = "Poland"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct SelfAssigningVariable {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/self_or_cls_assignment.rs b/crates/ruff_linter/src/rules/pylint/rules/self_or_cls_assignment.rs
index d6611acd21..e5c90407e1 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/self_or_cls_assignment.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/self_or_cls_assignment.rs
@@ -46,6 +46,7 @@ use crate::checkers::ast::Checker;
 ///         return supercls
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct SelfOrClsAssignment {
     method_type: MethodType,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/shallow_copy_environ.rs b/crates/ruff_linter/src/rules/pylint/rules/shallow_copy_environ.rs
index 2cfe984f86..94846decb2 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/shallow_copy_environ.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/shallow_copy_environ.rs
@@ -43,6 +43,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [BPO 15373]: https://bugs.python.org/issue15373
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct ShallowCopyEnviron;
 
 impl AlwaysFixableViolation for ShallowCopyEnviron {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/single_string_slots.rs b/crates/ruff_linter/src/rules/pylint/rules/single_string_slots.rs
index 3cf41a00db..0c6f94a483 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/single_string_slots.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/single_string_slots.rs
@@ -48,6 +48,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `__slots__`](https://docs.python.org/3/reference/datamodel.html#slots)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.276")]
 pub(crate) struct SingleStringSlots;
 
 impl Violation for SingleStringSlots {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/singledispatch_method.rs b/crates/ruff_linter/src/rules/pylint/rules/singledispatch_method.rs
index 91d280fb73..9096a22dc8 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/singledispatch_method.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/singledispatch_method.rs
@@ -43,6 +43,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// This rule's fix is marked as unsafe, as migrating from `@singledispatch` to
 /// `@singledispatchmethod` may change the behavior of the code.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct SingledispatchMethod;
 
 impl Violation for SingledispatchMethod {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/singledispatchmethod_function.rs b/crates/ruff_linter/src/rules/pylint/rules/singledispatchmethod_function.rs
index eb2e82c258..e658b19a0d 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/singledispatchmethod_function.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/singledispatchmethod_function.rs
@@ -41,6 +41,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// This rule's fix is marked as unsafe, as migrating from `@singledispatchmethod` to
 /// `@singledispatch` may change the behavior of the code.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct SingledispatchmethodFunction;
 
 impl Violation for SingledispatchmethodFunction {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/stop_iteration_return.rs b/crates/ruff_linter/src/rules/pylint/rules/stop_iteration_return.rs
new file mode 100644
index 0000000000..2abc339592
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pylint/rules/stop_iteration_return.rs
@@ -0,0 +1,114 @@
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast as ast;
+use ruff_python_ast::visitor::{Visitor, walk_expr, walk_stmt};
+use ruff_text_size::Ranged;
+
+use crate::Violation;
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for explicit `raise StopIteration` in generator functions.
+///
+/// ## Why is this bad?
+/// Raising `StopIteration` in a generator function causes a `RuntimeError`
+/// when the generator is iterated over.
+///
+/// Instead of `raise StopIteration`, use `return` in generator functions.
+///
+/// ## Example
+/// ```python
+/// def my_generator():
+///     yield 1
+///     yield 2
+///     raise StopIteration  # This causes RuntimeError at runtime
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def my_generator():
+///     yield 1
+///     yield 2
+///     return  # Use return instead
+/// ```
+///
+/// ## References
+/// - [PEP 479](https://peps.python.org/pep-0479/)
+/// - [Python documentation](https://docs.python.org/3/library/exceptions.html#StopIteration)
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.14.3")]
+pub(crate) struct StopIterationReturn;
+
+impl Violation for StopIterationReturn {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        "Explicit `raise StopIteration` in generator".to_string()
+    }
+
+    fn fix_title(&self) -> Option<String> {
+        Some("Use `return` instead".to_string())
+    }
+}
+
+/// PLR1708
+pub(crate) fn stop_iteration_return(checker: &Checker, raise_stmt: &ast::StmtRaise) {
+    // Fast-path: only continue if this is `raise StopIteration` (with or without args)
+    let Some(exc) = &raise_stmt.exc else {
+        return;
+    };
+
+    let is_stop_iteration = match exc.as_ref() {
+        ast::Expr::Call(ast::ExprCall { func, .. }) => {
+            checker.semantic().match_builtin_expr(func, "StopIteration")
+        }
+        expr => checker.semantic().match_builtin_expr(expr, "StopIteration"),
+    };
+
+    if !is_stop_iteration {
+        return;
+    }
+
+    // Now check the (more expensive) generator context
+    if !in_generator_context(checker) {
+        return;
+    }
+
+    checker.report_diagnostic(StopIterationReturn, raise_stmt.range());
+}
+
+/// Returns true if we're inside a function that contains any `yield`/`yield from`.
+fn in_generator_context(checker: &Checker) -> bool {
+    for scope in checker.semantic().current_scopes() {
+        if let ruff_python_semantic::ScopeKind::Function(function_def) = scope.kind {
+            if contains_yield_statement(&function_def.body) {
+                return true;
+            }
+        }
+    }
+    false
+}
+
+/// Check if a statement list contains any yield statements
+fn contains_yield_statement(body: &[ast::Stmt]) -> bool {
+    struct YieldFinder {
+        found: bool,
+    }
+
+    impl Visitor<'_> for YieldFinder {
+        fn visit_expr(&mut self, expr: &ast::Expr) {
+            if matches!(expr, ast::Expr::Yield(_) | ast::Expr::YieldFrom(_)) {
+                self.found = true;
+            } else {
+                walk_expr(self, expr);
+            }
+        }
+    }
+
+    let mut finder = YieldFinder { found: false };
+    for stmt in body {
+        walk_stmt(&mut finder, stmt);
+        if finder.found {
+            return true;
+        }
+    }
+    false
+}
diff --git a/crates/ruff_linter/src/rules/pylint/rules/subprocess_popen_preexec_fn.rs b/crates/ruff_linter/src/rules/pylint/rules/subprocess_popen_preexec_fn.rs
index b07d0bef0d..b27f592506 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/subprocess_popen_preexec_fn.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/subprocess_popen_preexec_fn.rs
@@ -40,6 +40,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [targeted for deprecation]: https://github.com/python/cpython/issues/82616
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.281")]
 pub(crate) struct SubprocessPopenPreexecFn;
 
 impl Violation for SubprocessPopenPreexecFn {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs b/crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs
index 9d4848ff67..0ed569eef8 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs
@@ -46,6 +46,7 @@ use crate::{AlwaysFixableViolation, Applicability, Fix};
 /// ## References
 /// - [Python documentation: `subprocess.run`](https://docs.python.org/3/library/subprocess.html#subprocess.run)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.285")]
 pub(crate) struct SubprocessRunWithoutCheck;
 
 impl AlwaysFixableViolation for SubprocessRunWithoutCheck {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/super_without_brackets.rs b/crates/ruff_linter/src/rules/pylint/rules/super_without_brackets.rs
index 510fc836c5..5791ee77ff 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/super_without_brackets.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/super_without_brackets.rs
@@ -47,6 +47,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///         return f"{original_speak} But as a dog, it barks!"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct SuperWithoutBrackets;
 
 impl AlwaysFixableViolation for SuperWithoutBrackets {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs b/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs
index c0a1a0445a..1fb4bd4792 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs
@@ -50,6 +50,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Constants added by the `site` module](https://docs.python.org/3/library/constants.html#constants-added-by-the-site-module)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.156")]
 pub(crate) struct SysExitAlias {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_arguments.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_arguments.rs
index 7fb946ea83..9242ad8342 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_arguments.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_arguments.rs
@@ -44,6 +44,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-args`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.238")]
 pub(crate) struct TooManyArguments {
     c_args: usize,
     max_args: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_boolean_expressions.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_boolean_expressions.rs
index 76bf947411..61f0dfa442 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_boolean_expressions.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_boolean_expressions.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-bool-expr`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.1")]
 pub(crate) struct TooManyBooleanExpressions {
     expressions: usize,
     max_expressions: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_branches.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_branches.rs
index d5c82b95eb..fd9d90cd38 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_branches.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_branches.rs
@@ -145,6 +145,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-branches`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.242")]
 pub(crate) struct TooManyBranches {
     branches: usize,
     max_branches: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_locals.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_locals.rs
index 56ac5cf986..0914278ae9 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_locals.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_locals.rs
@@ -20,6 +20,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-locals`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.9")]
 pub(crate) struct TooManyLocals {
     current_amount: usize,
     max_amount: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_nested_blocks.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_nested_blocks.rs
index 0e4ee0dea3..b07828832d 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_nested_blocks.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_nested_blocks.rs
@@ -19,6 +19,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-nested-blocks`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.15")]
 pub(crate) struct TooManyNestedBlocks {
     nested_blocks: usize,
     max_nested_blocks: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_positional_arguments.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_positional_arguments.rs
index 2e0e02908c..f9f979658c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_positional_arguments.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_positional_arguments.rs
@@ -42,6 +42,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-positional-args`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.7")]
 pub(crate) struct TooManyPositionalArguments {
     c_pos: usize,
     max_pos: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_public_methods.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_public_methods.rs
index 53decdc547..bc1802926b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_public_methods.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_public_methods.rs
@@ -83,6 +83,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-public-methods`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.290")]
 pub(crate) struct TooManyPublicMethods {
     methods: usize,
     max_methods: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_return_statements.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_return_statements.rs
index f4fb169653..f414f6931b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_return_statements.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_return_statements.rs
@@ -52,6 +52,7 @@ use crate::{Violation, checkers::ast::Checker};
 /// ## Options
 /// - `lint.pylint.max-returns`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.242")]
 pub(crate) struct TooManyReturnStatements {
     returns: usize,
     max_returns: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/too_many_statements.rs b/crates/ruff_linter/src/rules/pylint/rules/too_many_statements.rs
index 7033a71d83..7be3f6ac0c 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/too_many_statements.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/too_many_statements.rs
@@ -48,6 +48,7 @@ use crate::checkers::ast::Checker;
 /// ## Options
 /// - `lint.pylint.max-statements`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.240")]
 pub(crate) struct TooManyStatements {
     statements: usize,
     max_statements: usize,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/type_bivariance.rs b/crates/ruff_linter/src/rules/pylint/rules/type_bivariance.rs
index b4cd0a11f4..05e109907b 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/type_bivariance.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/type_bivariance.rs
@@ -54,6 +54,7 @@ use crate::rules::pylint::helpers::type_param_name;
 /// - [PEP 483 – The Theory of Type Hints: Covariance and Contravariance](https://peps.python.org/pep-0483/#covariance-and-contravariance)
 /// - [PEP 484 – Type Hints: Covariance and contravariance](https://peps.python.org/pep-0484/#covariance-and-contravariance)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.278")]
 pub(crate) struct TypeBivariance {
     kind: VarKind,
     param_name: Option<String>,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/type_name_incorrect_variance.rs b/crates/ruff_linter/src/rules/pylint/rules/type_name_incorrect_variance.rs
index f73b12fdad..4d1591abaa 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/type_name_incorrect_variance.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/type_name_incorrect_variance.rs
@@ -43,6 +43,7 @@ use crate::rules::pylint::helpers::type_param_name;
 ///
 /// [PEP 484]: https://peps.python.org/pep-0484/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.278")]
 pub(crate) struct TypeNameIncorrectVariance {
     kind: VarKind,
     param_name: String,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/type_param_name_mismatch.rs b/crates/ruff_linter/src/rules/pylint/rules/type_param_name_mismatch.rs
index 2d1b33bd89..1a936c95d1 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/type_param_name_mismatch.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/type_param_name_mismatch.rs
@@ -39,6 +39,7 @@ use crate::rules::pylint::helpers::type_param_name;
 ///
 /// [PEP 484]:https://peps.python.org/pep-0484/#generics
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.277")]
 pub(crate) struct TypeParamNameMismatch {
     kind: VarKind,
     var_name: String,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unexpected_special_method_signature.rs b/crates/ruff_linter/src/rules/pylint/rules/unexpected_special_method_signature.rs
index b6bc8c255c..ea6ddb31c4 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unexpected_special_method_signature.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unexpected_special_method_signature.rs
@@ -110,6 +110,7 @@ impl ExpectedParams {
 /// ## References
 /// - [Python documentation: Data model](https://docs.python.org/3/reference/datamodel.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.263")]
 pub(crate) struct UnexpectedSpecialMethodSignature {
     method_name: String,
     expected_params: ExpectedParams,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dict_index_lookup.rs b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dict_index_lookup.rs
index 9e1be524b2..f108291958 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dict_index_lookup.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dict_index_lookup.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     print(fruit_count)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct UnnecessaryDictIndexLookup;
 
 impl AlwaysFixableViolation for UnnecessaryDictIndexLookup {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs
index 17d0ab7663..dd40fa11c5 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: Lambdas](https://docs.python.org/3/reference/expressions.html#lambda)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.153")]
 pub(crate) struct UnnecessaryDirectLambdaCall;
 
 impl Violation for UnnecessaryDirectLambdaCall {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dunder_call.rs b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dunder_call.rs
index 62f69fad7b..f47c6d4e22 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dunder_call.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_dunder_call.rs
@@ -64,6 +64,7 @@ use ruff_python_ast::PythonVersion;
 ///     return x > 2
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.12")]
 pub(crate) struct UnnecessaryDunderCall {
     method: String,
     replacement: Option<String>,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_lambda.rs b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_lambda.rs
index 783063ccda..2d4fae9dc4 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_lambda.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_lambda.rs
@@ -44,6 +44,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// name, as in: `foo(x=1, y=2)`. Since `func` does not define the arguments
 /// `x` and `y`, unlike the lambda, the call would raise a `TypeError`.
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.2")]
 pub(crate) struct UnnecessaryLambda;
 
 impl Violation for UnnecessaryLambda {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_list_index_lookup.rs b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_list_index_lookup.rs
index 991d25bac6..49481b1634 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unnecessary_list_index_lookup.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unnecessary_list_index_lookup.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     print(letter)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct UnnecessaryListIndexLookup;
 
 impl AlwaysFixableViolation for UnnecessaryListIndexLookup {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unreachable.rs b/crates/ruff_linter/src/rules/pylint/rules/unreachable.rs
index b590573b4c..efd0a0db3a 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unreachable.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unreachable.rs
@@ -30,6 +30,7 @@ use crate::checkers::ast::Checker;
 ///     return "reachable"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.0.0")]
 pub(crate) struct UnreachableCode {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs b/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs
index e6d9e43cc0..7d9cd12506 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs
@@ -55,6 +55,7 @@ use crate::{AlwaysFixableViolation, Fix};
 ///
 /// [PEP 597]: https://peps.python.org/pep-0597/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.1")]
 pub(crate) struct UnspecifiedEncoding {
     function_name: String,
     mode: ModeArgument,
@@ -188,7 +189,7 @@ fn generate_keyword_fix(checker: &Checker, call: &ast::ExprCall) -> Fix {
                 value: Box::from("utf-8"),
                 flags: checker.default_string_flags(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }))
         ),
         &call.arguments,
diff --git a/crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs b/crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs
index 5dc74c156a..e1a1a20505 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs
@@ -47,6 +47,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `break` and `continue` Statements, and `else` Clauses on Loops](https://docs.python.org/3/tutorial/controlflow.html#break-and-continue-statements-and-else-clauses-on-loops)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.156")]
 pub(crate) struct UselessElseOnLoop;
 
 impl Violation for UselessElseOnLoop {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/useless_exception_statement.rs b/crates/ruff_linter/src/rules/pylint/rules/useless_exception_statement.rs
index 4d7be33a71..4608297683 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/useless_exception_statement.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/useless_exception_statement.rs
@@ -34,6 +34,7 @@ use ruff_python_ast::PythonVersion;
 /// This rule's fix is marked as unsafe, as converting a useless exception
 /// statement to a `raise` statement will change the program's behavior.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct UselessExceptionStatement;
 
 impl Violation for UselessExceptionStatement {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/useless_import_alias.rs b/crates/ruff_linter/src/rules/pylint/rules/useless_import_alias.rs
index bc9101b646..63f53fe8fb 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/useless_import_alias.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/useless_import_alias.rs
@@ -4,13 +4,11 @@ use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
-use crate::preview::is_ignore_init_files_in_useless_alias_enabled;
 use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
 /// Checks for import aliases that do not rename the original package.
-///
-/// In [preview] this rule does not apply in `__init__.py` files.
+/// This rule does not apply in `__init__.py` files.
 ///
 /// ## Why is this bad?
 /// The import alias is redundant and should be removed to avoid confusion.
@@ -35,9 +33,8 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ```python
 /// import numpy
 /// ```
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.156")]
 pub(crate) struct UselessImportAlias {
     required_import_conflict: bool,
 }
@@ -47,7 +44,6 @@ impl Violation for UselessImportAlias {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        #[expect(clippy::if_not_else)]
         if !self.required_import_conflict {
             "Import alias does not rename original package".to_string()
         } else {
@@ -74,9 +70,7 @@ pub(crate) fn useless_import_alias(checker: &Checker, alias: &Alias) {
     }
 
     // A re-export in __init__.py is probably intentional.
-    if checker.path().ends_with("__init__.py")
-        && is_ignore_init_files_in_useless_alias_enabled(checker.settings())
-    {
+    if checker.path().ends_with("__init__.py") {
         return;
     }
 
diff --git a/crates/ruff_linter/src/rules/pylint/rules/useless_return.rs b/crates/ruff_linter/src/rules/pylint/rules/useless_return.rs
index c33acea2d4..003b32a0e7 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/useless_return.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/useless_return.rs
@@ -29,6 +29,7 @@ use crate::{AlwaysFixableViolation, Fix};
 ///     print(5)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct UselessReturn;
 
 impl AlwaysFixableViolation for UselessReturn {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/useless_with_lock.rs b/crates/ruff_linter/src/rules/pylint/rules/useless_with_lock.rs
index 77931841f0..a45f02cb13 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/useless_with_lock.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/useless_with_lock.rs
@@ -48,6 +48,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `Lock Objects`](https://docs.python.org/3/library/threading.html#lock-objects)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct UselessWithLock;
 
 impl Violation for UselessWithLock {
diff --git a/crates/ruff_linter/src/rules/pylint/rules/yield_from_in_async_function.rs b/crates/ruff_linter/src/rules/pylint/rules/yield_from_in_async_function.rs
index 60fc10bc52..246870d5c0 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/yield_from_in_async_function.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/yield_from_in_async_function.rs
@@ -1,10 +1,6 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast};
-use ruff_python_semantic::ScopeKind;
-use ruff_text_size::Ranged;
 
 use crate::Violation;
-use crate::checkers::ast::Checker;
 
 /// ## What it does
 /// Checks for uses of `yield from` in async functions.
@@ -28,6 +24,7 @@ use crate::checkers::ast::Checker;
 ///         yield number
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct YieldFromInAsyncFunction;
 
 impl Violation for YieldFromInAsyncFunction {
@@ -36,13 +33,3 @@ impl Violation for YieldFromInAsyncFunction {
         "`yield from` statement in async function; use `async for` instead".to_string()
     }
 }
-
-/// PLE1700
-pub(crate) fn yield_from_in_async_function(checker: &Checker, expr: &ast::ExprYieldFrom) {
-    if matches!(
-        checker.semantic().current_scope().kind,
-        ScopeKind::Function(ast::StmtFunctionDef { is_async: true, .. })
-    ) {
-        checker.report_diagnostic(YieldFromInAsyncFunction, expr.range());
-    }
-}
diff --git a/crates/ruff_linter/src/rules/pylint/rules/yield_in_init.rs b/crates/ruff_linter/src/rules/pylint/rules/yield_in_init.rs
index 67236eed6b..622129ef58 100644
--- a/crates/ruff_linter/src/rules/pylint/rules/yield_in_init.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/yield_in_init.rs
@@ -29,6 +29,7 @@ use crate::rules::pylint::helpers::in_dunder_method;
 /// ## References
 /// - [CodeQL: `py-init-method-is-generator`](https://codeql.github.com/codeql-query-help/python/py-init-method-is-generator/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.245")]
 pub(crate) struct YieldInInit;
 
 impl Violation for YieldInInit {
diff --git a/crates/ruff_linter/src/rules/pylint/settings.rs b/crates/ruff_linter/src/rules/pylint/settings.rs
index 383f5136c8..c3abc7e83a 100644
--- a/crates/ruff_linter/src/rules/pylint/settings.rs
+++ b/crates/ruff_linter/src/rules/pylint/settings.rs
@@ -96,7 +96,8 @@ impl fmt::Display for Settings {
                 self.max_branches,
                 self.max_statements,
                 self.max_public_methods,
-                self.max_locals
+                self.max_locals,
+                self.max_nested_blocks
             ]
         }
         Ok(())
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap
index 9e974b0905..7b5f384b49 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap
@@ -12,16 +12,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-11 11 | 
-12 12 | # Errors
-13 13 | ## Test split called directly on string literal
-14    |-"1,2,3".split(",")[0]  # [missing-maxsplit-arg]
-   14 |+"1,2,3".split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-15 15 | "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
-16 16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
-17 17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
+11 | 
+12 | # Errors
+13 | ## Test split called directly on string literal
+   - "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
+14 + "1,2,3".split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+15 | "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
+16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
+17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:15:1
@@ -34,16 +32,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-12 12 | # Errors
-13 13 | ## Test split called directly on string literal
-14 14 | "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
-15    |-"1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
-   15 |+"1,2,3".rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-16 16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
-17 17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
-18 18 | 
+12 | # Errors
+13 | ## Test split called directly on string literal
+14 | "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
+   - "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
+15 + "1,2,3".rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
+17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
+18 | 
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:16:1
@@ -55,16 +51,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-13 13 | ## Test split called directly on string literal
-14 14 | "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
-15 15 | "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
-16    |-"1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
-   16 |+"1,2,3".split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-17 17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
-18 18 | 
-19 19 | ## Test split called on string variable
+13 | ## Test split called directly on string literal
+14 | "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
+15 | "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
+   - "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
+16 + "1,2,3".split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
+18 | 
+19 | ## Test split called on string variable
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:17:1
@@ -77,16 +71,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 19 | ## Test split called on string variable
    |
 help: Pass `maxsplit=1` into `str.rsplit()`
-
-ℹ Safe fix
-14 14 | "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
-15 15 | "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
-16 16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
-17    |-"1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
-   17 |+"1,2,3".rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-18 18 | 
-19 19 | ## Test split called on string variable
-20 20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
+14 | "1,2,3".split(",")[0]  # [missing-maxsplit-arg]
+15 | "1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
+16 | "1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
+   - "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
+17 + "1,2,3".rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+18 | 
+19 | ## Test split called on string variable
+20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:20:1
@@ -98,16 +90,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-17 17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
-18 18 | 
-19 19 | ## Test split called on string variable
-20    |-SEQ.split(",")[0]  # [missing-maxsplit-arg]
-   20 |+SEQ.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-21 21 | SEQ.split(",")[-1]  # [missing-maxsplit-arg]
-22 22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
-23 23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
+17 | "1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
+18 | 
+19 | ## Test split called on string variable
+   - SEQ.split(",")[0]  # [missing-maxsplit-arg]
+20 + SEQ.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+21 | SEQ.split(",")[-1]  # [missing-maxsplit-arg]
+22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
+23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:21:1
@@ -120,16 +110,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-18 18 | 
-19 19 | ## Test split called on string variable
-20 20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
-21    |-SEQ.split(",")[-1]  # [missing-maxsplit-arg]
-   21 |+SEQ.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-22 22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
-23 23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
-24 24 | 
+18 | 
+19 | ## Test split called on string variable
+20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
+   - SEQ.split(",")[-1]  # [missing-maxsplit-arg]
+21 + SEQ.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
+23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
+24 | 
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:22:1
@@ -141,16 +129,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-19 19 | ## Test split called on string variable
-20 20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
-21 21 | SEQ.split(",")[-1]  # [missing-maxsplit-arg]
-22    |-SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
-   22 |+SEQ.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-23 23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
-24 24 | 
-25 25 | ## Test split called on class attribute
+19 | ## Test split called on string variable
+20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
+21 | SEQ.split(",")[-1]  # [missing-maxsplit-arg]
+   - SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
+22 + SEQ.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
+24 | 
+25 | ## Test split called on class attribute
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:23:1
@@ -163,16 +149,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 25 | ## Test split called on class attribute
    |
 help: Pass `maxsplit=1` into `str.rsplit()`
-
-ℹ Safe fix
-20 20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
-21 21 | SEQ.split(",")[-1]  # [missing-maxsplit-arg]
-22 22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
-23    |-SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
-   23 |+SEQ.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-24 24 | 
-25 25 | ## Test split called on class attribute
-26 26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
+20 | SEQ.split(",")[0]  # [missing-maxsplit-arg]
+21 | SEQ.split(",")[-1]  # [missing-maxsplit-arg]
+22 | SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
+   - SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
+23 + SEQ.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+24 | 
+25 | ## Test split called on class attribute
+26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:26:1
@@ -184,16 +168,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-23 23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
-24 24 | 
-25 25 | ## Test split called on class attribute
-26    |-Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
-   26 |+Foo.class_str.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-27 27 | Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
-28 28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
-29 29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
+23 | SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
+24 | 
+25 | ## Test split called on class attribute
+   - Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
+26 + Foo.class_str.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+27 | Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
+28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
+29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:27:1
@@ -206,16 +188,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-24 24 | 
-25 25 | ## Test split called on class attribute
-26 26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
-27    |-Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
-   27 |+Foo.class_str.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-28 28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
-29 29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
-30 30 | 
+24 | 
+25 | ## Test split called on class attribute
+26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
+   - Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
+27 + Foo.class_str.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
+29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
+30 | 
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:28:1
@@ -227,16 +207,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-25 25 | ## Test split called on class attribute
-26 26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
-27 27 | Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
-28    |-Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
-   28 |+Foo.class_str.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-29 29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
-30 30 | 
-31 31 | ## Test split called on sliced string
+25 | ## Test split called on class attribute
+26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
+27 | Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
+   - Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
+28 + Foo.class_str.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
+30 | 
+31 | ## Test split called on sliced string
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:29:1
@@ -249,16 +227,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 31 | ## Test split called on sliced string
    |
 help: Pass `maxsplit=1` into `str.rsplit()`
-
-ℹ Safe fix
-26 26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
-27 27 | Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
-28 28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
-29    |-Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
-   29 |+Foo.class_str.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-30 30 | 
-31 31 | ## Test split called on sliced string
-32 32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
+26 | Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
+27 | Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
+28 | Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
+   - Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
+29 + Foo.class_str.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+30 | 
+31 | ## Test split called on sliced string
+32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:32:1
@@ -270,16 +246,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-29 29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
-30 30 | 
-31 31 | ## Test split called on sliced string
-32    |-"1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
-   32 |+"1,2,3"[::-1].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-33 33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
-34 34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-35 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+29 | Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
+30 | 
+31 | ## Test split called on sliced string
+   - "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
+32 + "1,2,3"[::-1].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
+34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
+35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:33:1
@@ -292,16 +266,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-30 30 | 
-31 31 | ## Test split called on sliced string
-32 32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
-33    |-"1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
-   33 |+"1,2,3"[::-1][::-1].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-34 34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-35 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-36 36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
+30 | 
+31 | ## Test split called on sliced string
+32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
+   - "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
+33 + "1,2,3"[::-1][::-1].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
+35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:34:1
@@ -314,16 +286,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-31 31 | ## Test split called on sliced string
-32 32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
-33 33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
-34    |-SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-   34 |+SEQ[:3].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-35 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-36 36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
-37 37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
+31 | ## Test split called on sliced string
+32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
+33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
+   - SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
+34 + SEQ[:3].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
+37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:35:1
@@ -336,16 +306,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-32 32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
-33 33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
-34 34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-35    |-Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-   35 |+Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-36 36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
-37 37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
-38 38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
+32 | "1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
+33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
+34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
+   - Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+35 + Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
+37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
+38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:36:1
@@ -358,16 +326,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-33 33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
-34 34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-35 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-36    |-"1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
-   36 |+"1,2,3"[::-1].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-37 37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
-38 38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
-39 39 | 
+33 | "1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
+34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
+35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+   - "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
+36 + "1,2,3"[::-1].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
+38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
+39 | 
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:37:1
@@ -379,16 +345,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-34 34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-35 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-36 36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
-37    |-SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
-   37 |+SEQ[:3].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-38 38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
-39 39 | 
-40 40 | ## Test sep given as named argument
+34 | SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
+35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
+   - SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
+37 + SEQ[:3].split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
+39 | 
+40 | ## Test sep given as named argument
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:38:1
@@ -401,16 +365,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 40 | ## Test sep given as named argument
    |
 help: Pass `maxsplit=1` into `str.rsplit()`
-
-ℹ Safe fix
-35 35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-36 36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
-37 37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
-38    |-Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
-   38 |+Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-39 39 | 
-40 40 | ## Test sep given as named argument
-41 41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
+35 | Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
+36 | "1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
+37 | SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
+   - Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
+38 + Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+39 | 
+40 | ## Test sep given as named argument
+41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:41:1
@@ -422,16 +384,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-38 38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
-39 39 | 
-40 40 | ## Test sep given as named argument
-41    |-"1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
-   41 |+"1,2,3".split(maxsplit=1, sep=",")[0]  # [missing-maxsplit-arg]
-42 42 | "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
-43 43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
-44 44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
+38 | Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
+39 | 
+40 | ## Test sep given as named argument
+   - "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
+41 + "1,2,3".split(maxsplit=1, sep=",")[0]  # [missing-maxsplit-arg]
+42 | "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
+43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
+44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:42:1
@@ -444,16 +404,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-39 39 | 
-40 40 | ## Test sep given as named argument
-41 41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
-42    |-"1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
-   42 |+"1,2,3".rsplit(maxsplit=1, sep=",")[-1]  # [missing-maxsplit-arg]
-43 43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
-44 44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
-45 45 | 
+39 | 
+40 | ## Test sep given as named argument
+41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
+   - "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
+42 + "1,2,3".rsplit(maxsplit=1, sep=",")[-1]  # [missing-maxsplit-arg]
+43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
+44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
+45 | 
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:43:1
@@ -465,16 +423,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-40 40 | ## Test sep given as named argument
-41 41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
-42 42 | "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
-43    |-"1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
-   43 |+"1,2,3".split(maxsplit=1, sep=",")[0]  # [missing-maxsplit-arg]
-44 44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
-45 45 | 
-46 46 | ## Special cases
+40 | ## Test sep given as named argument
+41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
+42 | "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
+   - "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
+43 + "1,2,3".split(maxsplit=1, sep=",")[0]  # [missing-maxsplit-arg]
+44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
+45 | 
+46 | ## Special cases
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:44:1
@@ -487,16 +443,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 46 | ## Special cases
    |
 help: Pass `maxsplit=1` into `str.rsplit()`
-
-ℹ Safe fix
-41 41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
-42 42 | "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
-43 43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
-44    |-"1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
-   44 |+"1,2,3".rsplit(maxsplit=1, sep=",")[-1]  # [missing-maxsplit-arg]
-45 45 | 
-46 46 | ## Special cases
-47 47 | "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
+41 | "1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
+42 | "1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
+43 | "1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
+   - "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
+44 + "1,2,3".rsplit(maxsplit=1, sep=",")[-1]  # [missing-maxsplit-arg]
+45 | 
+46 | ## Special cases
+47 | "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:47:1
@@ -508,16 +462,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-44 44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
-45 45 | 
-46 46 | ## Special cases
-47    |-"1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
-   47 |+"1,2,3".split("\n", maxsplit=1)[0]  # [missing-maxsplit-arg]
-48 48 | "1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
-49 49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
-50 50 | 
+44 | "1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
+45 | 
+46 | ## Special cases
+   - "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
+47 + "1,2,3".split("\n", maxsplit=1)[0]  # [missing-maxsplit-arg]
+48 | "1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
+49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
+50 | 
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:48:1
@@ -529,16 +481,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-45 45 | 
-46 46 | ## Special cases
-47 47 | "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
-48    |-"1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
-   48 |+"1,2,3".rsplit("split", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-49 49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
-50 50 | 
-51 51 | ## Test class attribute named split
+45 | 
+46 | ## Special cases
+47 | "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
+   - "1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
+48 + "1,2,3".rsplit("split", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
+50 | 
+51 | ## Test class attribute named split
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:49:1
@@ -551,16 +501,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 51 | ## Test class attribute named split
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-46 46 | ## Special cases
-47 47 | "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
-48 48 | "1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
-49    |-"1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
-   49 |+"1,2,3".split("rsplit", maxsplit=1)[0]  # [missing-maxsplit-arg]
-50 50 | 
-51 51 | ## Test class attribute named split
-52 52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
+46 | ## Special cases
+47 | "1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
+48 | "1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
+   - "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
+49 + "1,2,3".split("rsplit", maxsplit=1)[0]  # [missing-maxsplit-arg]
+50 | 
+51 | ## Test class attribute named split
+52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:52:1
@@ -572,16 +520,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Safe fix
-49 49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
-50 50 | 
-51 51 | ## Test class attribute named split
-52    |-Bar.split.split(",")[0]  # [missing-maxsplit-arg]
-   52 |+Bar.split.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-53 53 | Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
-54 54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
-55 55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
+49 | "1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
+50 | 
+51 | ## Test class attribute named split
+   - Bar.split.split(",")[0]  # [missing-maxsplit-arg]
+52 + Bar.split.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+53 | Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
+54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
+55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:53:1
@@ -594,16 +540,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.rsplit()` and pass `maxsplit=1`
-
-ℹ Safe fix
-50 50 | 
-51 51 | ## Test class attribute named split
-52 52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
-53    |-Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
-   53 |+Bar.split.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-54 54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
-55 55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
-56 56 | 
+50 | 
+51 | ## Test class attribute named split
+52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
+   - Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
+53 + Bar.split.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
+55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
+56 | 
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:54:1
@@ -615,16 +559,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
    |
 help: Use `str.split()` and pass `maxsplit=1`
-
-ℹ Safe fix
-51 51 | ## Test class attribute named split
-52 52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
-53 53 | Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
-54    |-Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
-   54 |+Bar.split.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
-55 55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
-56 56 | 
-57 57 | ## Test unpacked dict literal kwargs 
+51 | ## Test class attribute named split
+52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
+53 | Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
+   - Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
+54 + Bar.split.split(",", maxsplit=1)[0]  # [missing-maxsplit-arg]
+55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
+56 | 
+57 | ## Test unpacked dict literal kwargs 
 
 PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:55:1
@@ -637,16 +579,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`.
 57 | ## Test unpacked dict literal kwargs 
    |
 help: Pass `maxsplit=1` into `str.rsplit()`
-
-ℹ Safe fix
-52 52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
-53 53 | Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
-54 54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
-55    |-Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
-   55 |+Bar.split.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
-56 56 | 
-57 57 | ## Test unpacked dict literal kwargs 
-58 58 | "1,2,3".split(**{"sep": ","})[0]  # [missing-maxsplit-arg]
+52 | Bar.split.split(",")[0]  # [missing-maxsplit-arg]
+53 | Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
+54 | Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
+   - Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
+55 + Bar.split.rsplit(",", maxsplit=1)[-1]  # [missing-maxsplit-arg]
+56 | 
+57 | ## Test unpacked dict literal kwargs 
+58 | "1,2,3".split(**{"sep": ","})[0]  # [missing-maxsplit-arg]
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
   --> missing_maxsplit_arg.py:58:1
@@ -656,16 +596,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Unsafe fix
-55 55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
-56 56 | 
-57 57 | ## Test unpacked dict literal kwargs 
-58    |-"1,2,3".split(**{"sep": ","})[0]  # [missing-maxsplit-arg]
-   58 |+"1,2,3".split(maxsplit=1, **{"sep": ","})[0]  # [missing-maxsplit-arg]
-59 59 | 
-60 60 | 
-61 61 | # OK
+55 | Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
+56 | 
+57 | ## Test unpacked dict literal kwargs 
+   - "1,2,3".split(**{"sep": ","})[0]  # [missing-maxsplit-arg]
+58 + "1,2,3".split(maxsplit=1, **{"sep": ","})[0]  # [missing-maxsplit-arg]
+59 | 
+60 | 
+61 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
    --> missing_maxsplit_arg.py:179:1
@@ -678,16 +617,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 181 | kwargs_with_maxsplit = {"maxsplit": 1}
     |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Unsafe fix
-176 176 | ## TODO: These require the ability to resolve a dict variable name to a value
-177 177 | # Errors
-178 178 | kwargs_without_maxsplit = {"seq": ","}
-179     |-"1,2,3".split(**kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
-    179 |+"1,2,3".split(maxsplit=1, **kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
-180 180 | # OK
-181 181 | kwargs_with_maxsplit = {"maxsplit": 1}
-182 182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
+176 | ## TODO: These require the ability to resolve a dict variable name to a value
+177 | # Errors
+178 | kwargs_without_maxsplit = {"seq": ","}
+    - "1,2,3".split(**kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
+179 + "1,2,3".split(maxsplit=1, **kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
+180 | # OK
+181 | kwargs_with_maxsplit = {"maxsplit": 1}
+182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
    --> missing_maxsplit_arg.py:182:1
@@ -700,16 +638,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 184 | "1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive
     |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Unsafe fix
-179 179 | "1,2,3".split(**kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
-180 180 | # OK
-181 181 | kwargs_with_maxsplit = {"maxsplit": 1}
-182     |-"1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
-    182 |+"1,2,3".split(",", maxsplit=1, **kwargs_with_maxsplit)[0]  # TODO: false positive
-183 183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1}
-184 184 | "1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive
-185 185 | 
+179 | "1,2,3".split(**kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
+180 | # OK
+181 | kwargs_with_maxsplit = {"maxsplit": 1}
+    - "1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
+182 + "1,2,3".split(",", maxsplit=1, **kwargs_with_maxsplit)[0]  # TODO: false positive
+183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1}
+184 | "1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive
+185 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
    --> missing_maxsplit_arg.py:184:1
@@ -720,16 +657,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Unsafe fix
-181 181 | kwargs_with_maxsplit = {"maxsplit": 1}
-182 182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
-183 183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1}
-184     |-"1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive
-    184 |+"1,2,3".split(maxsplit=1, **kwargs_with_maxsplit)[0]  # TODO: false positive
-185 185 | 
-186 186 | 
-187 187 | ## Test unpacked list literal args (starred expressions)
+181 | kwargs_with_maxsplit = {"maxsplit": 1}
+182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
+183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1}
+    - "1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive
+184 + "1,2,3".split(maxsplit=1, **kwargs_with_maxsplit)[0]  # TODO: false positive
+185 | 
+186 | 
+187 | ## Test unpacked list literal args (starred expressions)
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
    --> missing_maxsplit_arg.py:189:1
@@ -742,16 +678,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
 191 | ## Test unpacked list variable args
     |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Unsafe fix
-186 186 | 
-187 187 | ## Test unpacked list literal args (starred expressions)
-188 188 | # Errors
-189     |-"1,2,3".split(",", *[-1])[0]
-    189 |+"1,2,3".split(",", *[-1], maxsplit=1)[0]
-190 190 | 
-191 191 | ## Test unpacked list variable args
-192 192 | # Errors
+186 | 
+187 | ## Test unpacked list literal args (starred expressions)
+188 | # Errors
+    - "1,2,3".split(",", *[-1])[0]
+189 + "1,2,3".split(",", *[-1], maxsplit=1)[0]
+190 | 
+191 | ## Test unpacked list variable args
+192 | # Errors
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0207 [*] Replace with `split(..., maxsplit=1)`.
    --> missing_maxsplit_arg.py:194:1
@@ -762,10 +697,9 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`.
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Pass `maxsplit=1` into `str.split()`
-
-ℹ Unsafe fix
-191 191 | ## Test unpacked list variable args
-192 192 | # Errors
-193 193 | args_list = [-1]
-194     |-"1,2,3".split(",", *args_list)[0]
-    194 |+"1,2,3".split(",", *args_list, maxsplit=1)[0]
+191 | ## Test unpacked list variable args
+192 | # Errors
+193 | args_list = [-1]
+    - "1,2,3".split(",", *args_list)[0]
+194 + "1,2,3".split(",", *args_list, maxsplit=1)[0]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap
index a8aa72f1c5..1c1ae92df6 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap
@@ -11,15 +11,13 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 4 |     print(f"I can count to {item}!")
   |
 help: Convert to `tuple`
-
-ℹ Safe fix
-1 1 | # Errors
-2 2 | 
-3   |-for item in {1}:
-  3 |+for item in (1,):
-4 4 |     print(f"I can count to {item}!")
-5 5 | 
-6 6 | for item in {"apples", "lemons", "water"}:  # flags in-line set literals
+1 | # Errors
+2 | 
+  - for item in {1}:
+3 + for item in (1,):
+4 |     print(f"I can count to {item}!")
+5 | 
+6 | for item in {"apples", "lemons", "water"}:  # flags in-line set literals
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
  --> iteration_over_set.py:6:13
@@ -31,16 +29,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 7 |     print(f"I like {item}.")
   |
 help: Convert to `tuple`
-
-ℹ Safe fix
-3 3 | for item in {1}:
-4 4 |     print(f"I can count to {item}!")
-5 5 | 
-6   |-for item in {"apples", "lemons", "water"}:  # flags in-line set literals
-  6 |+for item in ("apples", "lemons", "water"):  # flags in-line set literals
-7 7 |     print(f"I like {item}.")
-8 8 | 
-9 9 | for item in {1,}:
+3 | for item in {1}:
+4 |     print(f"I can count to {item}!")
+5 | 
+  - for item in {"apples", "lemons", "water"}:  # flags in-line set literals
+6 + for item in ("apples", "lemons", "water"):  # flags in-line set literals
+7 |     print(f"I like {item}.")
+8 | 
+9 | for item in {1,}:
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
   --> iteration_over_set.py:9:13
@@ -52,16 +48,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 10 |     print(f"I can count to {item}!")
    |
 help: Convert to `tuple`
-
-ℹ Safe fix
-6  6  | for item in {"apples", "lemons", "water"}:  # flags in-line set literals
-7  7  |     print(f"I like {item}.")
-8  8  | 
-9     |-for item in {1,}:
-   9  |+for item in (1,):
-10 10 |     print(f"I can count to {item}!")
-11 11 | 
-12 12 | for item in {
+6  | for item in {"apples", "lemons", "water"}:  # flags in-line set literals
+7  |     print(f"I like {item}.")
+8  | 
+   - for item in {1,}:
+9  + for item in (1,):
+10 |     print(f"I can count to {item}!")
+11 | 
+12 | for item in {
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
   --> iteration_over_set.py:12:13
@@ -76,19 +70,17 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 15 |       print(f"I like {item}.")
    |
 help: Convert to `tuple`
-
-ℹ Safe fix
-9  9  | for item in {1,}:
-10 10 |     print(f"I can count to {item}!")
-11 11 | 
-12    |-for item in {
-   12 |+for item in (
-13 13 |     "apples", "lemons", "water"
-14    |-}:  # flags in-line set literals
-   14 |+):  # flags in-line set literals
-15 15 |     print(f"I like {item}.")
-16 16 | 
-17 17 | numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+9  | for item in {1,}:
+10 |     print(f"I can count to {item}!")
+11 | 
+   - for item in {
+12 + for item in (
+13 |     "apples", "lemons", "water"
+   - }:  # flags in-line set literals
+14 + ):  # flags in-line set literals
+15 |     print(f"I like {item}.")
+16 | 
+17 | numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
   --> iteration_over_set.py:17:28
@@ -101,16 +93,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 19 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
    |
 help: Convert to `tuple`
-
-ℹ Safe fix
-14 14 | }:  # flags in-line set literals
-15 15 |     print(f"I like {item}.")
-16 16 | 
-17    |-numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
-   17 |+numbers_list = [i for i in (1, 2, 3)]  # flags sets in list comprehensions
-18 18 | 
-19 19 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
-20 20 | 
+14 | }:  # flags in-line set literals
+15 |     print(f"I like {item}.")
+16 | 
+   - numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+17 + numbers_list = [i for i in (1, 2, 3)]  # flags sets in list comprehensions
+18 | 
+19 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+20 | 
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
   --> iteration_over_set.py:19:27
@@ -123,16 +113,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 21 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
    |
 help: Convert to `tuple`
-
-ℹ Safe fix
-16 16 | 
-17 17 | numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
-18 18 | 
-19    |-numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
-   19 |+numbers_set = {i for i in (1, 2, 3)}  # flags sets in set comprehensions
-20 20 | 
-21 21 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
-22 22 | 
+16 | 
+17 | numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+18 | 
+   - numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+19 + numbers_set = {i for i in (1, 2, 3)}  # flags sets in set comprehensions
+20 | 
+21 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+22 | 
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
   --> iteration_over_set.py:21:36
@@ -145,16 +133,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 23 | numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
    |
 help: Convert to `tuple`
-
-ℹ Safe fix
-18 18 | 
-19 19 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
-20 20 | 
-21    |-numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
-   21 |+numbers_dict = {str(i): i for i in (1, 2, 3)}  # flags sets in dict comprehensions
-22 22 | 
-23 23 | numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
-24 24 | 
+18 | 
+19 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+20 | 
+   - numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+21 + numbers_dict = {str(i): i for i in (1, 2, 3)}  # flags sets in dict comprehensions
+22 | 
+23 | numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
+24 | 
 
 PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
   --> iteration_over_set.py:23:27
@@ -167,13 +153,11 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values
 25 | # Non-errors
    |
 help: Convert to `tuple`
-
-ℹ Safe fix
-20 20 | 
-21 21 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
-22 22 | 
-23    |-numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
-   23 |+numbers_gen = (i for i in (1, 2, 3))  # flags sets in generator expressions
-24 24 | 
-25 25 | # Non-errors
-26 26 |
+20 | 
+21 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+22 | 
+   - numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
+23 + numbers_gen = (i for i in (1, 2, 3))  # flags sets in generator expressions
+24 | 
+25 | # Non-errors
+26 |
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap
index df64c6bbfb..a191218fab 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap
@@ -12,16 +12,15 @@ PLC0414 [*] Import alias does not rename original package
 8 | from collections import OrderedDict as o_dict
   |
 help: Remove import alias
-
-ℹ Unsafe fix
-3 3 | # 1. useless-import-alias
-4 4 | # 2. consider-using-from-import
-5 5 | 
-6   |-import collections as collections  # [useless-import-alias]
-  6 |+import collections  # [useless-import-alias]
-7 7 | from collections import OrderedDict as OrderedDict  # [useless-import-alias]
-8 8 | from collections import OrderedDict as o_dict
-9 9 | import os.path as path  # [consider-using-from-import]
+3 | # 1. useless-import-alias
+4 | # 2. consider-using-from-import
+5 | 
+  - import collections as collections  # [useless-import-alias]
+6 + import collections  # [useless-import-alias]
+7 | from collections import OrderedDict as OrderedDict  # [useless-import-alias]
+8 | from collections import OrderedDict as o_dict
+9 | import os.path as path  # [consider-using-from-import]
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
  --> import_aliasing.py:7:25
@@ -33,16 +32,15 @@ PLC0414 [*] Import alias does not rename original package
 9 | import os.path as path  # [consider-using-from-import]
   |
 help: Remove import alias
-
-ℹ Unsafe fix
-4 4 | # 2. consider-using-from-import
-5 5 | 
-6 6 | import collections as collections  # [useless-import-alias]
-7   |-from collections import OrderedDict as OrderedDict  # [useless-import-alias]
-  7 |+from collections import OrderedDict  # [useless-import-alias]
-8 8 | from collections import OrderedDict as o_dict
-9 9 | import os.path as path  # [consider-using-from-import]
-10 10 | import os.path as p
+4  | # 2. consider-using-from-import
+5  | 
+6  | import collections as collections  # [useless-import-alias]
+   - from collections import OrderedDict as OrderedDict  # [useless-import-alias]
+7  + from collections import OrderedDict  # [useless-import-alias]
+8  | from collections import OrderedDict as o_dict
+9  | import os.path as path  # [consider-using-from-import]
+10 | import os.path as p
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
   --> import_aliasing.py:16:15
@@ -55,16 +53,15 @@ PLC0414 [*] Import alias does not rename original package
 18 | from . import bar
    |
 help: Remove import alias
-
-ℹ Unsafe fix
-13 13 | import os
-14 14 | import os as OS
-15 15 | from sys import version
-16    |-from . import bar as bar  # [useless-import-alias]
-   16 |+from . import bar  # [useless-import-alias]
-17 17 | from . import bar as Bar
-18 18 | from . import bar
-19 19 | from ..foo import bar as bar  # [useless-import-alias]
+13 | import os
+14 | import os as OS
+15 | from sys import version
+   - from . import bar as bar  # [useless-import-alias]
+16 + from . import bar  # [useless-import-alias]
+17 | from . import bar as Bar
+18 | from . import bar
+19 | from ..foo import bar as bar  # [useless-import-alias]
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
   --> import_aliasing.py:19:19
@@ -77,16 +74,15 @@ PLC0414 [*] Import alias does not rename original package
 21 | from ..foo.bar import foobar as anotherfoobar
    |
 help: Remove import alias
-
-ℹ Unsafe fix
-16 16 | from . import bar as bar  # [useless-import-alias]
-17 17 | from . import bar as Bar
-18 18 | from . import bar
-19    |-from ..foo import bar as bar  # [useless-import-alias]
-   19 |+from ..foo import bar  # [useless-import-alias]
-20 20 | from ..foo.bar import foobar as foobar  # [useless-import-alias]
-21 21 | from ..foo.bar import foobar as anotherfoobar
-22 22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
+16 | from . import bar as bar  # [useless-import-alias]
+17 | from . import bar as Bar
+18 | from . import bar
+   - from ..foo import bar as bar  # [useless-import-alias]
+19 + from ..foo import bar  # [useless-import-alias]
+20 | from ..foo.bar import foobar as foobar  # [useless-import-alias]
+21 | from ..foo.bar import foobar as anotherfoobar
+22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
   --> import_aliasing.py:20:23
@@ -99,16 +95,15 @@ PLC0414 [*] Import alias does not rename original package
 22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
    |
 help: Remove import alias
-
-ℹ Unsafe fix
-17 17 | from . import bar as Bar
-18 18 | from . import bar
-19 19 | from ..foo import bar as bar  # [useless-import-alias]
-20    |-from ..foo.bar import foobar as foobar  # [useless-import-alias]
-   20 |+from ..foo.bar import foobar  # [useless-import-alias]
-21 21 | from ..foo.bar import foobar as anotherfoobar
-22 22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
-23 23 | from . import foo as bar, foo2 as foo2  # [useless-import-alias]
+17 | from . import bar as Bar
+18 | from . import bar
+19 | from ..foo import bar as bar  # [useless-import-alias]
+   - from ..foo.bar import foobar as foobar  # [useless-import-alias]
+20 + from ..foo.bar import foobar  # [useless-import-alias]
+21 | from ..foo.bar import foobar as anotherfoobar
+22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
+23 | from . import foo as bar, foo2 as foo2  # [useless-import-alias]
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
   --> import_aliasing.py:22:15
@@ -121,16 +116,15 @@ PLC0414 [*] Import alias does not rename original package
 24 | from . import foo as bar, foo2 as bar2
    |
 help: Remove import alias
-
-ℹ Unsafe fix
-19 19 | from ..foo import bar as bar  # [useless-import-alias]
-20 20 | from ..foo.bar import foobar as foobar  # [useless-import-alias]
-21 21 | from ..foo.bar import foobar as anotherfoobar
-22    |-from . import foo as foo, foo2 as bar2  # [useless-import-alias]
-   22 |+from . import foo, foo2 as bar2  # [useless-import-alias]
-23 23 | from . import foo as bar, foo2 as foo2  # [useless-import-alias]
-24 24 | from . import foo as bar, foo2 as bar2
-25 25 | from foo.bar import foobar as foobar  # [useless-import-alias]
+19 | from ..foo import bar as bar  # [useless-import-alias]
+20 | from ..foo.bar import foobar as foobar  # [useless-import-alias]
+21 | from ..foo.bar import foobar as anotherfoobar
+   - from . import foo as foo, foo2 as bar2  # [useless-import-alias]
+22 + from . import foo, foo2 as bar2  # [useless-import-alias]
+23 | from . import foo as bar, foo2 as foo2  # [useless-import-alias]
+24 | from . import foo as bar, foo2 as bar2
+25 | from foo.bar import foobar as foobar  # [useless-import-alias]
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
   --> import_aliasing.py:23:27
@@ -143,16 +137,15 @@ PLC0414 [*] Import alias does not rename original package
 25 | from foo.bar import foobar as foobar  # [useless-import-alias]
    |
 help: Remove import alias
-
-ℹ Unsafe fix
-20 20 | from ..foo.bar import foobar as foobar  # [useless-import-alias]
-21 21 | from ..foo.bar import foobar as anotherfoobar
-22 22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
-23    |-from . import foo as bar, foo2 as foo2  # [useless-import-alias]
-   23 |+from . import foo as bar, foo2  # [useless-import-alias]
-24 24 | from . import foo as bar, foo2 as bar2
-25 25 | from foo.bar import foobar as foobar  # [useless-import-alias]
-26 26 | from foo.bar import foobar as foo
+20 | from ..foo.bar import foobar as foobar  # [useless-import-alias]
+21 | from ..foo.bar import foobar as anotherfoobar
+22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
+   - from . import foo as bar, foo2 as foo2  # [useless-import-alias]
+23 + from . import foo as bar, foo2  # [useless-import-alias]
+24 | from . import foo as bar, foo2 as bar2
+25 | from foo.bar import foobar as foobar  # [useless-import-alias]
+26 | from foo.bar import foobar as foo
+note: This is an unsafe fix and may change runtime behavior
 
 PLC0414 [*] Import alias does not rename original package
   --> import_aliasing.py:25:21
@@ -165,13 +158,12 @@ PLC0414 [*] Import alias does not rename original package
 27 | from .foo.bar import f as foobar
    |
 help: Remove import alias
-
-ℹ Unsafe fix
-22 22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
-23 23 | from . import foo as bar, foo2 as foo2  # [useless-import-alias]
-24 24 | from . import foo as bar, foo2 as bar2
-25    |-from foo.bar import foobar as foobar  # [useless-import-alias]
-   25 |+from foo.bar import foobar  # [useless-import-alias]
-26 26 | from foo.bar import foobar as foo
-27 27 | from .foo.bar import f as foobar
-28 28 | from ............a import b  # [relative-beyond-top-level]
+22 | from . import foo as foo, foo2 as bar2  # [useless-import-alias]
+23 | from . import foo as bar, foo2 as foo2  # [useless-import-alias]
+24 | from . import foo as bar, foo2 as bar2
+   - from foo.bar import foobar as foobar  # [useless-import-alias]
+25 + from foo.bar import foobar  # [useless-import-alias]
+26 | from foo.bar import foobar as foo
+27 | from .foo.bar import f as foobar
+28 | from ............a import b  # [relative-beyond-top-level]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap
index 5ab1f223aa..6c123427ab 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap
@@ -1,19 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/pylint/mod.rs
 ---
-PLC0414 [*] Import alias does not rename original package
- --> __init__.py:1:8
-  |
-1 | import collections as collections
-  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 | from collections import OrderedDict as OrderedDict
-3 | from . import foo as foo
-  |
-help: Remove import alias
 
-ℹ Unsafe fix
-1   |-import collections as collections
-  1 |+import collections
-2 2 | from collections import OrderedDict as OrderedDict
-3 3 | from . import foo as foo
-4 4 | from .foo import bar as bar
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap
index ad3929bb35..9605e4c62a 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap
@@ -9,13 +9,11 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 2 |     pass
   |
 help: Remove `len`
-
-ℹ Safe fix
-1   |-if len('TEST'):  # [PLC1802]
-  1 |+if 'TEST':  # [PLC1802]
-2 2 |     pass
-3 3 | 
-4 4 | if not len('TEST'):  # [PLC1802]
+  - if len('TEST'):  # [PLC1802]
+1 + if 'TEST':  # [PLC1802]
+2 |     pass
+3 | 
+4 | if not len('TEST'):  # [PLC1802]
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
  --> len_as_condition.py:4:8
@@ -27,16 +25,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 5 |     pass
   |
 help: Remove `len`
-
-ℹ Safe fix
-1 1 | if len('TEST'):  # [PLC1802]
-2 2 |     pass
-3 3 | 
-4   |-if not len('TEST'):  # [PLC1802]
-  4 |+if not 'TEST':  # [PLC1802]
-5 5 |     pass
-6 6 | 
-7 7 | z = []
+1 | if len('TEST'):  # [PLC1802]
+2 |     pass
+3 | 
+  - if not len('TEST'):  # [PLC1802]
+4 + if not 'TEST':  # [PLC1802]
+5 |     pass
+6 | 
+7 | z = []
 
 PLC1802 [*] `len(['T', 'E', 'S', 'T'])` used as condition without comparison
  --> len_as_condition.py:8:10
@@ -47,16 +43,14 @@ PLC1802 [*] `len(['T', 'E', 'S', 'T'])` used as condition without comparison
 9 |     pass
   |
 help: Remove `len`
-
-ℹ Safe fix
-5 5 |     pass
-6 6 | 
-7 7 | z = []
-8   |-if z and len(['T', 'E', 'S', 'T']):  # [PLC1802]
-  8 |+if z and ['T', 'E', 'S', 'T']:  # [PLC1802]
-9 9 |     pass
-10 10 | 
-11 11 | if True or len('TEST'):  # [PLC1802]
+5  |     pass
+6  | 
+7  | z = []
+   - if z and len(['T', 'E', 'S', 'T']):  # [PLC1802]
+8  + if z and ['T', 'E', 'S', 'T']:  # [PLC1802]
+9  |     pass
+10 | 
+11 | if True or len('TEST'):  # [PLC1802]
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:11:12
@@ -68,16 +62,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 12 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-8  8  | if z and len(['T', 'E', 'S', 'T']):  # [PLC1802]
-9  9  |     pass
-10 10 | 
-11    |-if True or len('TEST'):  # [PLC1802]
-   11 |+if True or 'TEST':  # [PLC1802]
-12 12 |     pass
-13 13 | 
-14 14 | if len('TEST') == 0:  # Should be fine
+8  | if z and len(['T', 'E', 'S', 'T']):  # [PLC1802]
+9  |     pass
+10 | 
+   - if True or len('TEST'):  # [PLC1802]
+11 + if True or 'TEST':  # [PLC1802]
+12 |     pass
+13 | 
+14 | if len('TEST') == 0:  # Should be fine
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:53:6
@@ -89,16 +81,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 54 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-50 50 | 
-51 51 | if z:
-52 52 |     pass
-53    |-elif len('TEST'):  # [PLC1802]
-   53 |+elif 'TEST':  # [PLC1802]
-54 54 |     pass
-55 55 | 
-56 56 | if z:
+50 | 
+51 | if z:
+52 |     pass
+   - elif len('TEST'):  # [PLC1802]
+53 + elif 'TEST':  # [PLC1802]
+54 |     pass
+55 | 
+56 | if z:
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:58:10
@@ -110,16 +100,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 59 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-55 55 | 
-56 56 | if z:
-57 57 |     pass
-58    |-elif not len('TEST'):  # [PLC1802]
-   58 |+elif not 'TEST':  # [PLC1802]
-59 59 |     pass
-60 60 | 
-61 61 | while len('TEST'):  # [PLC1802]
+55 | 
+56 | if z:
+57 |     pass
+   - elif not len('TEST'):  # [PLC1802]
+58 + elif not 'TEST':  # [PLC1802]
+59 |     pass
+60 | 
+61 | while len('TEST'):  # [PLC1802]
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:61:7
@@ -131,16 +119,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 62 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-58 58 | elif not len('TEST'):  # [PLC1802]
-59 59 |     pass
-60 60 | 
-61    |-while len('TEST'):  # [PLC1802]
-   61 |+while 'TEST':  # [PLC1802]
-62 62 |     pass
-63 63 | 
-64 64 | while not len('TEST'):  # [PLC1802]
+58 | elif not len('TEST'):  # [PLC1802]
+59 |     pass
+60 | 
+   - while len('TEST'):  # [PLC1802]
+61 + while 'TEST':  # [PLC1802]
+62 |     pass
+63 | 
+64 | while not len('TEST'):  # [PLC1802]
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:64:11
@@ -152,16 +138,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 65 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-61 61 | while len('TEST'):  # [PLC1802]
-62 62 |     pass
-63 63 | 
-64    |-while not len('TEST'):  # [PLC1802]
-   64 |+while not 'TEST':  # [PLC1802]
-65 65 |     pass
-66 66 | 
-67 67 | while z and len('TEST'):  # [PLC1802]
+61 | while len('TEST'):  # [PLC1802]
+62 |     pass
+63 | 
+   - while not len('TEST'):  # [PLC1802]
+64 + while not 'TEST':  # [PLC1802]
+65 |     pass
+66 | 
+67 | while z and len('TEST'):  # [PLC1802]
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:67:13
@@ -173,16 +157,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 68 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-64 64 | while not len('TEST'):  # [PLC1802]
-65 65 |     pass
-66 66 | 
-67    |-while z and len('TEST'):  # [PLC1802]
-   67 |+while z and 'TEST':  # [PLC1802]
-68 68 |     pass
-69 69 | 
-70 70 | while not len('TEST') and z:  # [PLC1802]
+64 | while not len('TEST'):  # [PLC1802]
+65 |     pass
+66 | 
+   - while z and len('TEST'):  # [PLC1802]
+67 + while z and 'TEST':  # [PLC1802]
+68 |     pass
+69 | 
+70 | while not len('TEST') and z:  # [PLC1802]
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
   --> len_as_condition.py:70:11
@@ -194,16 +176,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 71 |     pass
    |
 help: Remove `len`
-
-ℹ Safe fix
-67 67 | while z and len('TEST'):  # [PLC1802]
-68 68 |     pass
-69 69 | 
-70    |-while not len('TEST') and z:  # [PLC1802]
-   70 |+while not 'TEST' and z:  # [PLC1802]
-71 71 |     pass
-72 72 | 
-73 73 | assert len('TEST') > 0  # Should be fine
+67 | while z and len('TEST'):  # [PLC1802]
+68 |     pass
+69 | 
+   - while not len('TEST') and z:  # [PLC1802]
+70 + while not 'TEST' and z:  # [PLC1802]
+71 |     pass
+72 | 
+73 | assert len('TEST') > 0  # Should be fine
 
 PLC1802 [*] `len(args)` used as condition without comparison
   --> len_as_condition.py:93:12
@@ -215,16 +195,14 @@ PLC1802 [*] `len(args)` used as condition without comparison
 95 | def github_issue_1331_v3(*args):
    |
 help: Remove `len`
-
-ℹ Safe fix
-90 90 |     assert False, len(args)  # Should be fine
-91 91 | 
-92 92 | def github_issue_1331_v2(*args):
-93    |-    assert len(args), args  # [PLC1802]
-   93 |+    assert args, args  # [PLC1802]
-94 94 | 
-95 95 | def github_issue_1331_v3(*args):
-96 96 |     assert len(args) or z, args  # [PLC1802]
+90 |     assert False, len(args)  # Should be fine
+91 | 
+92 | def github_issue_1331_v2(*args):
+   -     assert len(args), args  # [PLC1802]
+93 +     assert args, args  # [PLC1802]
+94 | 
+95 | def github_issue_1331_v3(*args):
+96 |     assert len(args) or z, args  # [PLC1802]
 
 PLC1802 [*] `len(args)` used as condition without comparison
   --> len_as_condition.py:96:12
@@ -236,16 +214,14 @@ PLC1802 [*] `len(args)` used as condition without comparison
 98 | def github_issue_1331_v4(*args):
    |
 help: Remove `len`
-
-ℹ Safe fix
-93 93 |     assert len(args), args  # [PLC1802]
-94 94 | 
-95 95 | def github_issue_1331_v3(*args):
-96    |-    assert len(args) or z, args  # [PLC1802]
-   96 |+    assert args or z, args  # [PLC1802]
-97 97 | 
-98 98 | def github_issue_1331_v4(*args):
-99 99 |     assert z and len(args), args  # [PLC1802]
+93 |     assert len(args), args  # [PLC1802]
+94 | 
+95 | def github_issue_1331_v3(*args):
+   -     assert len(args) or z, args  # [PLC1802]
+96 +     assert args or z, args  # [PLC1802]
+97 | 
+98 | def github_issue_1331_v4(*args):
+99 |     assert z and len(args), args  # [PLC1802]
 
 PLC1802 [*] `len(args)` used as condition without comparison
    --> len_as_condition.py:99:18
@@ -257,16 +233,14 @@ PLC1802 [*] `len(args)` used as condition without comparison
 101 | def github_issue_1331_v5(**args):
     |
 help: Remove `len`
-
-ℹ Safe fix
-96  96  |     assert len(args) or z, args  # [PLC1802]
-97  97  | 
-98  98  | def github_issue_1331_v4(*args):
-99      |-    assert z and len(args), args  # [PLC1802]
-    99  |+    assert z and args, args  # [PLC1802]
-100 100 | 
-101 101 | def github_issue_1331_v5(**args):
-102 102 |     assert z and len(args), args  # [PLC1802]
+96  |     assert len(args) or z, args  # [PLC1802]
+97  | 
+98  | def github_issue_1331_v4(*args):
+    -     assert z and len(args), args  # [PLC1802]
+99  +     assert z and args, args  # [PLC1802]
+100 | 
+101 | def github_issue_1331_v5(**args):
+102 |     assert z and len(args), args  # [PLC1802]
 
 PLC1802 [*] `len(args)` used as condition without comparison
    --> len_as_condition.py:102:18
@@ -278,16 +252,14 @@ PLC1802 [*] `len(args)` used as condition without comparison
 104 | b = bool(len(z)) # [PLC1802]
     |
 help: Remove `len`
-
-ℹ Safe fix
-99  99  |     assert z and len(args), args  # [PLC1802]
-100 100 | 
-101 101 | def github_issue_1331_v5(**args):
-102     |-    assert z and len(args), args  # [PLC1802]
-    102 |+    assert z and args, args  # [PLC1802]
-103 103 | 
-104 104 | b = bool(len(z)) # [PLC1802]
-105 105 | c = bool(len('TEST') or 42) # [PLC1802]
+99  |     assert z and len(args), args  # [PLC1802]
+100 | 
+101 | def github_issue_1331_v5(**args):
+    -     assert z and len(args), args  # [PLC1802]
+102 +     assert z and args, args  # [PLC1802]
+103 | 
+104 | b = bool(len(z)) # [PLC1802]
+105 | c = bool(len('TEST') or 42) # [PLC1802]
 
 PLC1802 [*] `len(z)` used as condition without comparison
    --> len_as_condition.py:104:10
@@ -299,16 +271,14 @@ PLC1802 [*] `len(z)` used as condition without comparison
 105 | c = bool(len('TEST') or 42) # [PLC1802]
     |
 help: Remove `len`
-
-ℹ Safe fix
-101 101 | def github_issue_1331_v5(**args):
-102 102 |     assert z and len(args), args  # [PLC1802]
-103 103 | 
-104     |-b = bool(len(z)) # [PLC1802]
-    104 |+b = bool(z) # [PLC1802]
-105 105 | c = bool(len('TEST') or 42) # [PLC1802]
-106 106 | 
-107 107 | def github_issue_1879():
+101 | def github_issue_1331_v5(**args):
+102 |     assert z and len(args), args  # [PLC1802]
+103 | 
+    - b = bool(len(z)) # [PLC1802]
+104 + b = bool(z) # [PLC1802]
+105 | c = bool(len('TEST') or 42) # [PLC1802]
+106 | 
+107 | def github_issue_1879():
 
 PLC1802 [*] `len('TEST')` used as condition without comparison
    --> len_as_condition.py:105:10
@@ -320,16 +290,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison
 107 | def github_issue_1879():
     |
 help: Remove `len`
-
-ℹ Safe fix
-102 102 |     assert z and len(args), args  # [PLC1802]
-103 103 | 
-104 104 | b = bool(len(z)) # [PLC1802]
-105     |-c = bool(len('TEST') or 42) # [PLC1802]
-    105 |+c = bool('TEST' or 42) # [PLC1802]
-106 106 | 
-107 107 | def github_issue_1879():
-108 108 | 
+102 |     assert z and len(args), args  # [PLC1802]
+103 | 
+104 | b = bool(len(z)) # [PLC1802]
+    - c = bool(len('TEST') or 42) # [PLC1802]
+105 + c = bool('TEST' or 42) # [PLC1802]
+106 | 
+107 | def github_issue_1879():
+108 | 
 
 PLC1802 [*] `len(range(0))` used as condition without comparison
    --> len_as_condition.py:126:12
@@ -342,16 +310,14 @@ PLC1802 [*] `len(range(0))` used as condition without comparison
 128 |     # assert len(u + 1 for u in []) generator has no len
     |
 help: Remove `len`
-
-ℹ Safe fix
-123 123 |     assert len(ChildClassWithBool())
-124 124 |     assert len(ClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
-125 125 |     assert len(ChildClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
-126     |-    assert len(range(0))  # [PLC1802]
-    126 |+    assert range(0)  # [PLC1802]
-127 127 |     assert len([t + 1 for t in []])  # [PLC1802]
-128 128 |     # assert len(u + 1 for u in []) generator has no len
-129 129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
+123 |     assert len(ChildClassWithBool())
+124 |     assert len(ClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
+125 |     assert len(ChildClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
+    -     assert len(range(0))  # [PLC1802]
+126 +     assert range(0)  # [PLC1802]
+127 |     assert len([t + 1 for t in []])  # [PLC1802]
+128 |     # assert len(u + 1 for u in []) generator has no len
+129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
 
 PLC1802 [*] `len([t + 1 for t in []])` used as condition without comparison
    --> len_as_condition.py:127:12
@@ -364,16 +330,14 @@ PLC1802 [*] `len([t + 1 for t in []])` used as condition without comparison
 129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
     |
 help: Remove `len`
-
-ℹ Safe fix
-124 124 |     assert len(ClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
-125 125 |     assert len(ChildClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
-126 126 |     assert len(range(0))  # [PLC1802]
-127     |-    assert len([t + 1 for t in []])  # [PLC1802]
-    127 |+    assert [t + 1 for t in []]  # [PLC1802]
-128 128 |     # assert len(u + 1 for u in []) generator has no len
-129 129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
-130 130 |     assert len(set((w + 1) for w in set()))  # [PLC1802]
+124 |     assert len(ClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
+125 |     assert len(ChildClassWithoutBool())  # unintuitive?, in pylint: [PLC1802]
+126 |     assert len(range(0))  # [PLC1802]
+    -     assert len([t + 1 for t in []])  # [PLC1802]
+127 +     assert [t + 1 for t in []]  # [PLC1802]
+128 |     # assert len(u + 1 for u in []) generator has no len
+129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
+130 |     assert len(set((w + 1) for w in set()))  # [PLC1802]
 
 PLC1802 [*] `len({"1":(v + 1) for v in {}})` used as condition without comparison
    --> len_as_condition.py:129:12
@@ -385,16 +349,14 @@ PLC1802 [*] `len({"1":(v + 1) for v in {}})` used as condition without compariso
 130 |     assert len(set((w + 1) for w in set()))  # [PLC1802]
     |
 help: Remove `len`
-
-ℹ Safe fix
-126 126 |     assert len(range(0))  # [PLC1802]
-127 127 |     assert len([t + 1 for t in []])  # [PLC1802]
-128 128 |     # assert len(u + 1 for u in []) generator has no len
-129     |-    assert len({"1":(v + 1) for v in {}})  # [PLC1802]
-    129 |+    assert {"1":(v + 1) for v in {}}  # [PLC1802]
-130 130 |     assert len(set((w + 1) for w in set()))  # [PLC1802]
-131 131 | 
-132 132 | 
+126 |     assert len(range(0))  # [PLC1802]
+127 |     assert len([t + 1 for t in []])  # [PLC1802]
+128 |     # assert len(u + 1 for u in []) generator has no len
+    -     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
+129 +     assert {"1":(v + 1) for v in {}}  # [PLC1802]
+130 |     assert len(set((w + 1) for w in set()))  # [PLC1802]
+131 | 
+132 | 
 
 PLC1802 [*] `len(set((w + 1) for w in set()))` used as condition without comparison
    --> len_as_condition.py:130:12
@@ -405,16 +367,14 @@ PLC1802 [*] `len(set((w + 1) for w in set()))` used as condition without compari
     |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Remove `len`
-
-ℹ Safe fix
-127 127 |     assert len([t + 1 for t in []])  # [PLC1802]
-128 128 |     # assert len(u + 1 for u in []) generator has no len
-129 129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
-130     |-    assert len(set((w + 1) for w in set()))  # [PLC1802]
-    130 |+    assert set((w + 1) for w in set())  # [PLC1802]
-131 131 | 
-132 132 | 
-133 133 |     import numpy
+127 |     assert len([t + 1 for t in []])  # [PLC1802]
+128 |     # assert len(u + 1 for u in []) generator has no len
+129 |     assert len({"1":(v + 1) for v in {}})  # [PLC1802]
+    -     assert len(set((w + 1) for w in set()))  # [PLC1802]
+130 +     assert set((w + 1) for w in set())  # [PLC1802]
+131 | 
+132 | 
+133 |     import numpy
 
 PLC1802 [*] `len(x)` used as condition without comparison
    --> len_as_condition.py:193:8
@@ -426,16 +386,14 @@ PLC1802 [*] `len(x)` used as condition without comparison
 194 |         print(x)
     |
 help: Remove `len`
-
-ℹ Safe fix
-190 190 |     x = [1,2,3]
-191 191 |     if cond:
-192 192 |         x = [4,5,6]
-193     |-    if len(x): # this should be addressed
-    193 |+    if x: # this should be addressed
-194 194 |         print(x)
-195 195 | 
-196 196 | def g(cond:bool):
+190 |     x = [1,2,3]
+191 |     if cond:
+192 |         x = [4,5,6]
+    -     if len(x): # this should be addressed
+193 +     if x: # this should be addressed
+194 |         print(x)
+195 | 
+196 | def g(cond:bool):
 
 PLC1802 [*] `len(x)` used as condition without comparison
    --> len_as_condition.py:200:8
@@ -448,16 +406,14 @@ PLC1802 [*] `len(x)` used as condition without comparison
 202 |     del x
     |
 help: Remove `len`
-
-ℹ Safe fix
-197 197 |     x = [1,2,3]
-198 198 |     if cond:
-199 199 |         x = [4,5,6]
-200     |-    if len(x): # this should be addressed
-    200 |+    if x: # this should be addressed
-201 201 |         print(x)
-202 202 |     del x
-203 203 | 
+197 |     x = [1,2,3]
+198 |     if cond:
+199 |         x = [4,5,6]
+    -     if len(x): # this should be addressed
+200 +     if x: # this should be addressed
+201 |         print(x)
+202 |     del x
+203 | 
 
 PLC1802 [*] `len(x)` used as condition without comparison
    --> len_as_condition.py:214:8
@@ -469,16 +425,14 @@ PLC1802 [*] `len(x)` used as condition without comparison
 215 |         print(x)
     |
 help: Remove `len`
-
-ℹ Safe fix
-211 211 |     x = [1,2,3]
-212 212 |     def inner(x:int):
-213 213 |         return x+1
-214     |-    if len(x): # [PLC1802]
-    214 |+    if x: # [PLC1802]
-215 215 |         print(x)
-216 216 | 
-217 217 | def redefined():
+211 |     x = [1,2,3]
+212 |     def inner(x:int):
+213 |         return x+1
+    -     if len(x): # [PLC1802]
+214 +     if x: # [PLC1802]
+215 |         print(x)
+216 | 
+217 | def redefined():
 
 PLC1802 [*] `len(x)` used as condition without comparison
    --> len_as_condition.py:220:8
@@ -490,16 +444,14 @@ PLC1802 [*] `len(x)` used as condition without comparison
 221 |         print(x)
     |
 help: Remove `len`
-
-ℹ Safe fix
-217 217 | def redefined():
-218 218 |     x = 123
-219 219 |     x = [1, 2, 3]
-220     |-    if len(x): # this should be addressed
-    220 |+    if x: # this should be addressed
-221 221 |         print(x)
-222 222 | 
-223 223 | global_seq = [1, 2, 3]
+217 | def redefined():
+218 |     x = 123
+219 |     x = [1, 2, 3]
+    -     if len(x): # this should be addressed
+220 +     if x: # this should be addressed
+221 |         print(x)
+222 | 
+223 | global_seq = [1, 2, 3]
 
 PLC1802 [*] `len(x)` used as condition without comparison
    --> len_as_condition.py:233:8
@@ -511,16 +463,14 @@ PLC1802 [*] `len(x)` used as condition without comparison
 234 |         print(x)
     |
 help: Remove `len`
-
-ℹ Safe fix
-230 230 | def j():
-231 231 |     if False:
-232 232 |         x = [1, 2, 3]
-233     |-    if len(x): # [PLC1802] should be fine
-    233 |+    if x: # [PLC1802] should be fine
-234 234 |         print(x)
-235 235 | 
-236 236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690
+230 | def j():
+231 |     if False:
+232 |         x = [1, 2, 3]
+    -     if len(x): # [PLC1802] should be fine
+233 +     if x: # [PLC1802] should be fine
+234 |         print(x)
+235 | 
+236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690
 
 PLC1802 [*] `len(ascii(1))` used as condition without comparison
    --> len_as_condition.py:237:6
@@ -531,16 +481,14 @@ PLC1802 [*] `len(ascii(1))` used as condition without comparison
 238 | bool(len(sorted("")))
     |
 help: Remove `len`
-
-ℹ Safe fix
-234 234 |         print(x)
-235 235 | 
-236 236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690
-237     |-bool(len(ascii(1)))
-    237 |+bool(ascii(1))
-238 238 | bool(len(sorted("")))
-239 239 | 
-240 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
+234 |         print(x)
+235 | 
+236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690
+    - bool(len(ascii(1)))
+237 + bool(ascii(1))
+238 | bool(len(sorted("")))
+239 | 
+240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
 
 PLC1802 [*] `len(sorted(""))` used as condition without comparison
    --> len_as_condition.py:238:6
@@ -553,16 +501,14 @@ PLC1802 [*] `len(sorted(""))` used as condition without comparison
 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
     |
 help: Remove `len`
-
-ℹ Safe fix
-235 235 | 
-236 236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690
-237 237 | bool(len(ascii(1)))
-238     |-bool(len(sorted("")))
-    238 |+bool(sorted(""))
-239 239 | 
-240 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
-241 241 | fruits = []
+235 | 
+236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690
+237 | bool(len(ascii(1)))
+    - bool(len(sorted("")))
+238 + bool(sorted(""))
+239 | 
+240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
+241 | fruits = []
 
 PLC1802 [*] `len(fruits)` used as condition without comparison
    --> len_as_condition.py:242:3
@@ -574,16 +520,14 @@ PLC1802 [*] `len(fruits)` used as condition without comparison
 243 |     ...
     |
 help: Remove `len`
-
-ℹ Safe fix
-239 239 | 
-240 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
-241 241 | fruits = []
-242     |-if(len)(fruits):
-    242 |+if fruits:
-243 243 |     ...
-244 244 | 
-245 245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812
+239 | 
+240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811
+241 | fruits = []
+    - if(len)(fruits):
+242 + if fruits:
+243 |     ...
+244 | 
+245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812
 
 PLC1802 [*] `len(fruits)` used as condition without comparison
    --> len_as_condition.py:247:4
@@ -598,13 +542,12 @@ PLC1802 [*] `len(fruits)` used as condition without comparison
 250 |       ...
     |
 help: Remove `len`
-
-ℹ Unsafe fix
-244 244 | 
-245 245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812
-246 246 | fruits = []
-247     |-if len(
-248     |-    fruits  # comment
-249     |-):
-    247 |+if fruits:
-250 248 |     ...
+244 | 
+245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812
+246 | fruits = []
+    - if len(
+    -     fruits  # comment
+    - ):
+247 + if fruits:
+248 |     ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap
index d91c5b99fc..154bbc9fc2 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap
@@ -11,16 +11,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 6 | print((3.0).__mul__(4.0))  # PLC2801
   |
 help: Use `+` operator
-
-ℹ Unsafe fix
-1 1 | from typing import Any
-2 2 | 
-3 3 | a = 2
-4   |-print((3.0).__add__(4.0))  # PLC2801
-  4 |+print(3.0 + 4.0)  # PLC2801
-5 5 | print((3.0).__sub__(4.0))  # PLC2801
-6 6 | print((3.0).__mul__(4.0))  # PLC2801
-7 7 | print((3.0).__truediv__(4.0))  # PLC2801
+1 | from typing import Any
+2 | 
+3 | a = 2
+  - print((3.0).__add__(4.0))  # PLC2801
+4 + print(3.0 + 4.0)  # PLC2801
+5 | print((3.0).__sub__(4.0))  # PLC2801
+6 | print((3.0).__mul__(4.0))  # PLC2801
+7 | print((3.0).__truediv__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
  --> unnecessary_dunder_call.py:5:7
@@ -33,16 +32,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 7 | print((3.0).__truediv__(4.0))  # PLC2801
   |
 help: Use `-` operator
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | a = 2
-4 4 | print((3.0).__add__(4.0))  # PLC2801
-5   |-print((3.0).__sub__(4.0))  # PLC2801
-  5 |+print(3.0 - 4.0)  # PLC2801
-6 6 | print((3.0).__mul__(4.0))  # PLC2801
-7 7 | print((3.0).__truediv__(4.0))  # PLC2801
-8 8 | print((3.0).__floordiv__(4.0))  # PLC2801
+2 | 
+3 | a = 2
+4 | print((3.0).__add__(4.0))  # PLC2801
+  - print((3.0).__sub__(4.0))  # PLC2801
+5 + print(3.0 - 4.0)  # PLC2801
+6 | print((3.0).__mul__(4.0))  # PLC2801
+7 | print((3.0).__truediv__(4.0))  # PLC2801
+8 | print((3.0).__floordiv__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__mul__`. Use `*` operator.
  --> unnecessary_dunder_call.py:6:7
@@ -55,16 +53,15 @@ PLC2801 [*] Unnecessary dunder call to `__mul__`. Use `*` operator.
 8 | print((3.0).__floordiv__(4.0))  # PLC2801
   |
 help: Use `*` operator
-
-ℹ Unsafe fix
-3 3 | a = 2
-4 4 | print((3.0).__add__(4.0))  # PLC2801
-5 5 | print((3.0).__sub__(4.0))  # PLC2801
-6   |-print((3.0).__mul__(4.0))  # PLC2801
-  6 |+print(3.0 * 4.0)  # PLC2801
-7 7 | print((3.0).__truediv__(4.0))  # PLC2801
-8 8 | print((3.0).__floordiv__(4.0))  # PLC2801
-9 9 | print((3.0).__mod__(4.0))  # PLC2801
+3 | a = 2
+4 | print((3.0).__add__(4.0))  # PLC2801
+5 | print((3.0).__sub__(4.0))  # PLC2801
+  - print((3.0).__mul__(4.0))  # PLC2801
+6 + print(3.0 * 4.0)  # PLC2801
+7 | print((3.0).__truediv__(4.0))  # PLC2801
+8 | print((3.0).__floordiv__(4.0))  # PLC2801
+9 | print((3.0).__mod__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__truediv__`. Use `/` operator.
  --> unnecessary_dunder_call.py:7:7
@@ -77,16 +74,15 @@ PLC2801 [*] Unnecessary dunder call to `__truediv__`. Use `/` operator.
 9 | print((3.0).__mod__(4.0))  # PLC2801
   |
 help: Use `/` operator
-
-ℹ Unsafe fix
-4 4 | print((3.0).__add__(4.0))  # PLC2801
-5 5 | print((3.0).__sub__(4.0))  # PLC2801
-6 6 | print((3.0).__mul__(4.0))  # PLC2801
-7   |-print((3.0).__truediv__(4.0))  # PLC2801
-  7 |+print(3.0 / 4.0)  # PLC2801
-8 8 | print((3.0).__floordiv__(4.0))  # PLC2801
-9 9 | print((3.0).__mod__(4.0))  # PLC2801
-10 10 | print((3.0).__eq__(4.0))  # PLC2801
+4  | print((3.0).__add__(4.0))  # PLC2801
+5  | print((3.0).__sub__(4.0))  # PLC2801
+6  | print((3.0).__mul__(4.0))  # PLC2801
+   - print((3.0).__truediv__(4.0))  # PLC2801
+7  + print(3.0 / 4.0)  # PLC2801
+8  | print((3.0).__floordiv__(4.0))  # PLC2801
+9  | print((3.0).__mod__(4.0))  # PLC2801
+10 | print((3.0).__eq__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__floordiv__`. Use `//` operator.
   --> unnecessary_dunder_call.py:8:7
@@ -99,16 +95,15 @@ PLC2801 [*] Unnecessary dunder call to `__floordiv__`. Use `//` operator.
 10 | print((3.0).__eq__(4.0))  # PLC2801
    |
 help: Use `//` operator
-
-ℹ Unsafe fix
-5 5 | print((3.0).__sub__(4.0))  # PLC2801
-6 6 | print((3.0).__mul__(4.0))  # PLC2801
-7 7 | print((3.0).__truediv__(4.0))  # PLC2801
-8   |-print((3.0).__floordiv__(4.0))  # PLC2801
-  8 |+print(3.0 // 4.0)  # PLC2801
-9 9 | print((3.0).__mod__(4.0))  # PLC2801
-10 10 | print((3.0).__eq__(4.0))  # PLC2801
-11 11 | print((3.0).__ne__(4.0))  # PLC2801
+5  | print((3.0).__sub__(4.0))  # PLC2801
+6  | print((3.0).__mul__(4.0))  # PLC2801
+7  | print((3.0).__truediv__(4.0))  # PLC2801
+   - print((3.0).__floordiv__(4.0))  # PLC2801
+8  + print(3.0 // 4.0)  # PLC2801
+9  | print((3.0).__mod__(4.0))  # PLC2801
+10 | print((3.0).__eq__(4.0))  # PLC2801
+11 | print((3.0).__ne__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__mod__`. Use `%` operator.
   --> unnecessary_dunder_call.py:9:7
@@ -121,16 +116,15 @@ PLC2801 [*] Unnecessary dunder call to `__mod__`. Use `%` operator.
 11 | print((3.0).__ne__(4.0))  # PLC2801
    |
 help: Use `%` operator
-
-ℹ Unsafe fix
-6  6  | print((3.0).__mul__(4.0))  # PLC2801
-7  7  | print((3.0).__truediv__(4.0))  # PLC2801
-8  8  | print((3.0).__floordiv__(4.0))  # PLC2801
-9     |-print((3.0).__mod__(4.0))  # PLC2801
-   9  |+print(3.0 % 4.0)  # PLC2801
-10 10 | print((3.0).__eq__(4.0))  # PLC2801
-11 11 | print((3.0).__ne__(4.0))  # PLC2801
-12 12 | print((3.0).__lt__(4.0))  # PLC2801
+6  | print((3.0).__mul__(4.0))  # PLC2801
+7  | print((3.0).__truediv__(4.0))  # PLC2801
+8  | print((3.0).__floordiv__(4.0))  # PLC2801
+   - print((3.0).__mod__(4.0))  # PLC2801
+9  + print(3.0 % 4.0)  # PLC2801
+10 | print((3.0).__eq__(4.0))  # PLC2801
+11 | print((3.0).__ne__(4.0))  # PLC2801
+12 | print((3.0).__lt__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__eq__`. Use `==` operator.
   --> unnecessary_dunder_call.py:10:7
@@ -143,16 +137,15 @@ PLC2801 [*] Unnecessary dunder call to `__eq__`. Use `==` operator.
 12 | print((3.0).__lt__(4.0))  # PLC2801
    |
 help: Use `==` operator
-
-ℹ Unsafe fix
-7  7  | print((3.0).__truediv__(4.0))  # PLC2801
-8  8  | print((3.0).__floordiv__(4.0))  # PLC2801
-9  9  | print((3.0).__mod__(4.0))  # PLC2801
-10    |-print((3.0).__eq__(4.0))  # PLC2801
-   10 |+print(3.0 == 4.0)  # PLC2801
-11 11 | print((3.0).__ne__(4.0))  # PLC2801
-12 12 | print((3.0).__lt__(4.0))  # PLC2801
-13 13 | print((3.0).__le__(4.0))  # PLC2801
+7  | print((3.0).__truediv__(4.0))  # PLC2801
+8  | print((3.0).__floordiv__(4.0))  # PLC2801
+9  | print((3.0).__mod__(4.0))  # PLC2801
+   - print((3.0).__eq__(4.0))  # PLC2801
+10 + print(3.0 == 4.0)  # PLC2801
+11 | print((3.0).__ne__(4.0))  # PLC2801
+12 | print((3.0).__lt__(4.0))  # PLC2801
+13 | print((3.0).__le__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__ne__`. Use `!=` operator.
   --> unnecessary_dunder_call.py:11:7
@@ -165,16 +158,15 @@ PLC2801 [*] Unnecessary dunder call to `__ne__`. Use `!=` operator.
 13 | print((3.0).__le__(4.0))  # PLC2801
    |
 help: Use `!=` operator
-
-ℹ Unsafe fix
-8  8  | print((3.0).__floordiv__(4.0))  # PLC2801
-9  9  | print((3.0).__mod__(4.0))  # PLC2801
-10 10 | print((3.0).__eq__(4.0))  # PLC2801
-11    |-print((3.0).__ne__(4.0))  # PLC2801
-   11 |+print(3.0 != 4.0)  # PLC2801
-12 12 | print((3.0).__lt__(4.0))  # PLC2801
-13 13 | print((3.0).__le__(4.0))  # PLC2801
-14 14 | print((3.0).__gt__(4.0))  # PLC2801
+8  | print((3.0).__floordiv__(4.0))  # PLC2801
+9  | print((3.0).__mod__(4.0))  # PLC2801
+10 | print((3.0).__eq__(4.0))  # PLC2801
+   - print((3.0).__ne__(4.0))  # PLC2801
+11 + print(3.0 != 4.0)  # PLC2801
+12 | print((3.0).__lt__(4.0))  # PLC2801
+13 | print((3.0).__le__(4.0))  # PLC2801
+14 | print((3.0).__gt__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__lt__`. Use `<` operator.
   --> unnecessary_dunder_call.py:12:7
@@ -187,16 +179,15 @@ PLC2801 [*] Unnecessary dunder call to `__lt__`. Use `<` operator.
 14 | print((3.0).__gt__(4.0))  # PLC2801
    |
 help: Use `<` operator
-
-ℹ Unsafe fix
-9  9  | print((3.0).__mod__(4.0))  # PLC2801
-10 10 | print((3.0).__eq__(4.0))  # PLC2801
-11 11 | print((3.0).__ne__(4.0))  # PLC2801
-12    |-print((3.0).__lt__(4.0))  # PLC2801
-   12 |+print(3.0 < 4.0)  # PLC2801
-13 13 | print((3.0).__le__(4.0))  # PLC2801
-14 14 | print((3.0).__gt__(4.0))  # PLC2801
-15 15 | print((3.0).__ge__(4.0))  # PLC2801
+9  | print((3.0).__mod__(4.0))  # PLC2801
+10 | print((3.0).__eq__(4.0))  # PLC2801
+11 | print((3.0).__ne__(4.0))  # PLC2801
+   - print((3.0).__lt__(4.0))  # PLC2801
+12 + print(3.0 < 4.0)  # PLC2801
+13 | print((3.0).__le__(4.0))  # PLC2801
+14 | print((3.0).__gt__(4.0))  # PLC2801
+15 | print((3.0).__ge__(4.0))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__le__`. Use `<=` operator.
   --> unnecessary_dunder_call.py:13:7
@@ -209,16 +200,15 @@ PLC2801 [*] Unnecessary dunder call to `__le__`. Use `<=` operator.
 15 | print((3.0).__ge__(4.0))  # PLC2801
    |
 help: Use `<=` operator
-
-ℹ Unsafe fix
-10 10 | print((3.0).__eq__(4.0))  # PLC2801
-11 11 | print((3.0).__ne__(4.0))  # PLC2801
-12 12 | print((3.0).__lt__(4.0))  # PLC2801
-13    |-print((3.0).__le__(4.0))  # PLC2801
-   13 |+print(3.0 <= 4.0)  # PLC2801
-14 14 | print((3.0).__gt__(4.0))  # PLC2801
-15 15 | print((3.0).__ge__(4.0))  # PLC2801
-16 16 | print((3.0).__str__())  # PLC2801
+10 | print((3.0).__eq__(4.0))  # PLC2801
+11 | print((3.0).__ne__(4.0))  # PLC2801
+12 | print((3.0).__lt__(4.0))  # PLC2801
+   - print((3.0).__le__(4.0))  # PLC2801
+13 + print(3.0 <= 4.0)  # PLC2801
+14 | print((3.0).__gt__(4.0))  # PLC2801
+15 | print((3.0).__ge__(4.0))  # PLC2801
+16 | print((3.0).__str__())  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__gt__`. Use `>` operator.
   --> unnecessary_dunder_call.py:14:7
@@ -231,16 +221,15 @@ PLC2801 [*] Unnecessary dunder call to `__gt__`. Use `>` operator.
 16 | print((3.0).__str__())  # PLC2801
    |
 help: Use `>` operator
-
-ℹ Unsafe fix
-11 11 | print((3.0).__ne__(4.0))  # PLC2801
-12 12 | print((3.0).__lt__(4.0))  # PLC2801
-13 13 | print((3.0).__le__(4.0))  # PLC2801
-14    |-print((3.0).__gt__(4.0))  # PLC2801
-   14 |+print(3.0 > 4.0)  # PLC2801
-15 15 | print((3.0).__ge__(4.0))  # PLC2801
-16 16 | print((3.0).__str__())  # PLC2801
-17 17 | print((3.0).__repr__())  # PLC2801
+11 | print((3.0).__ne__(4.0))  # PLC2801
+12 | print((3.0).__lt__(4.0))  # PLC2801
+13 | print((3.0).__le__(4.0))  # PLC2801
+   - print((3.0).__gt__(4.0))  # PLC2801
+14 + print(3.0 > 4.0)  # PLC2801
+15 | print((3.0).__ge__(4.0))  # PLC2801
+16 | print((3.0).__str__())  # PLC2801
+17 | print((3.0).__repr__())  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__ge__`. Use `>=` operator.
   --> unnecessary_dunder_call.py:15:7
@@ -253,16 +242,15 @@ PLC2801 [*] Unnecessary dunder call to `__ge__`. Use `>=` operator.
 17 | print((3.0).__repr__())  # PLC2801
    |
 help: Use `>=` operator
-
-ℹ Unsafe fix
-12 12 | print((3.0).__lt__(4.0))  # PLC2801
-13 13 | print((3.0).__le__(4.0))  # PLC2801
-14 14 | print((3.0).__gt__(4.0))  # PLC2801
-15    |-print((3.0).__ge__(4.0))  # PLC2801
-   15 |+print(3.0 >= 4.0)  # PLC2801
-16 16 | print((3.0).__str__())  # PLC2801
-17 17 | print((3.0).__repr__())  # PLC2801
-18 18 | print([1, 2, 3].__len__())  # PLC2801
+12 | print((3.0).__lt__(4.0))  # PLC2801
+13 | print((3.0).__le__(4.0))  # PLC2801
+14 | print((3.0).__gt__(4.0))  # PLC2801
+   - print((3.0).__ge__(4.0))  # PLC2801
+15 + print(3.0 >= 4.0)  # PLC2801
+16 | print((3.0).__str__())  # PLC2801
+17 | print((3.0).__repr__())  # PLC2801
+18 | print([1, 2, 3].__len__())  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin.
   --> unnecessary_dunder_call.py:16:7
@@ -275,16 +263,15 @@ PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin.
 18 | print([1, 2, 3].__len__())  # PLC2801
    |
 help: Use `str()` builtin
-
-ℹ Unsafe fix
-13 13 | print((3.0).__le__(4.0))  # PLC2801
-14 14 | print((3.0).__gt__(4.0))  # PLC2801
-15 15 | print((3.0).__ge__(4.0))  # PLC2801
-16    |-print((3.0).__str__())  # PLC2801
-   16 |+print(str(3.0))  # PLC2801
-17 17 | print((3.0).__repr__())  # PLC2801
-18 18 | print([1, 2, 3].__len__())  # PLC2801
-19 19 | print((1).__neg__())  # PLC2801
+13 | print((3.0).__le__(4.0))  # PLC2801
+14 | print((3.0).__gt__(4.0))  # PLC2801
+15 | print((3.0).__ge__(4.0))  # PLC2801
+   - print((3.0).__str__())  # PLC2801
+16 + print(str(3.0))  # PLC2801
+17 | print((3.0).__repr__())  # PLC2801
+18 | print([1, 2, 3].__len__())  # PLC2801
+19 | print((1).__neg__())  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__repr__`. Use `repr()` builtin.
   --> unnecessary_dunder_call.py:17:7
@@ -297,16 +284,15 @@ PLC2801 [*] Unnecessary dunder call to `__repr__`. Use `repr()` builtin.
 19 | print((1).__neg__())  # PLC2801
    |
 help: Use `repr()` builtin
-
-ℹ Unsafe fix
-14 14 | print((3.0).__gt__(4.0))  # PLC2801
-15 15 | print((3.0).__ge__(4.0))  # PLC2801
-16 16 | print((3.0).__str__())  # PLC2801
-17    |-print((3.0).__repr__())  # PLC2801
-   17 |+print(repr(3.0))  # PLC2801
-18 18 | print([1, 2, 3].__len__())  # PLC2801
-19 19 | print((1).__neg__())  # PLC2801
-20 20 | print(-a.__sub__(1))  # PLC2801
+14 | print((3.0).__gt__(4.0))  # PLC2801
+15 | print((3.0).__ge__(4.0))  # PLC2801
+16 | print((3.0).__str__())  # PLC2801
+   - print((3.0).__repr__())  # PLC2801
+17 + print(repr(3.0))  # PLC2801
+18 | print([1, 2, 3].__len__())  # PLC2801
+19 | print((1).__neg__())  # PLC2801
+20 | print(-a.__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__len__`. Use `len()` builtin.
   --> unnecessary_dunder_call.py:18:7
@@ -319,16 +305,15 @@ PLC2801 [*] Unnecessary dunder call to `__len__`. Use `len()` builtin.
 20 | print(-a.__sub__(1))  # PLC2801
    |
 help: Use `len()` builtin
-
-ℹ Unsafe fix
-15 15 | print((3.0).__ge__(4.0))  # PLC2801
-16 16 | print((3.0).__str__())  # PLC2801
-17 17 | print((3.0).__repr__())  # PLC2801
-18    |-print([1, 2, 3].__len__())  # PLC2801
-   18 |+print(len([1, 2, 3]))  # PLC2801
-19 19 | print((1).__neg__())  # PLC2801
-20 20 | print(-a.__sub__(1))  # PLC2801
-21 21 | print(-(a).__sub__(1))  # PLC2801
+15 | print((3.0).__ge__(4.0))  # PLC2801
+16 | print((3.0).__str__())  # PLC2801
+17 | print((3.0).__repr__())  # PLC2801
+   - print([1, 2, 3].__len__())  # PLC2801
+18 + print(len([1, 2, 3]))  # PLC2801
+19 | print((1).__neg__())  # PLC2801
+20 | print(-a.__sub__(1))  # PLC2801
+21 | print(-(a).__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 Unnecessary dunder call to `__neg__`. Multiply by -1 instead.
   --> unnecessary_dunder_call.py:19:7
@@ -353,16 +338,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 22 | print(-(-a.__sub__(1)))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-17 17 | print((3.0).__repr__())  # PLC2801
-18 18 | print([1, 2, 3].__len__())  # PLC2801
-19 19 | print((1).__neg__())  # PLC2801
-20    |-print(-a.__sub__(1))  # PLC2801
-   20 |+print(-(a - 1))  # PLC2801
-21 21 | print(-(a).__sub__(1))  # PLC2801
-22 22 | print(-(-a.__sub__(1)))  # PLC2801
-23 23 | print((5 - a).__sub__(1))  # PLC2801
+17 | print((3.0).__repr__())  # PLC2801
+18 | print([1, 2, 3].__len__())  # PLC2801
+19 | print((1).__neg__())  # PLC2801
+   - print(-a.__sub__(1))  # PLC2801
+20 + print(-(a - 1))  # PLC2801
+21 | print(-(a).__sub__(1))  # PLC2801
+22 | print(-(-a.__sub__(1)))  # PLC2801
+23 | print((5 - a).__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:21:8
@@ -375,16 +359,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 23 | print((5 - a).__sub__(1))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-18 18 | print([1, 2, 3].__len__())  # PLC2801
-19 19 | print((1).__neg__())  # PLC2801
-20 20 | print(-a.__sub__(1))  # PLC2801
-21    |-print(-(a).__sub__(1))  # PLC2801
-   21 |+print(-(a - 1))  # PLC2801
-22 22 | print(-(-a.__sub__(1)))  # PLC2801
-23 23 | print((5 - a).__sub__(1))  # PLC2801
-24 24 | print(-(5 - a).__sub__(1))  # PLC2801
+18 | print([1, 2, 3].__len__())  # PLC2801
+19 | print((1).__neg__())  # PLC2801
+20 | print(-a.__sub__(1))  # PLC2801
+   - print(-(a).__sub__(1))  # PLC2801
+21 + print(-(a - 1))  # PLC2801
+22 | print(-(-a.__sub__(1)))  # PLC2801
+23 | print((5 - a).__sub__(1))  # PLC2801
+24 | print(-(5 - a).__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:22:10
@@ -397,16 +380,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 24 | print(-(5 - a).__sub__(1))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-19 19 | print((1).__neg__())  # PLC2801
-20 20 | print(-a.__sub__(1))  # PLC2801
-21 21 | print(-(a).__sub__(1))  # PLC2801
-22    |-print(-(-a.__sub__(1)))  # PLC2801
-   22 |+print(-(-(a - 1)))  # PLC2801
-23 23 | print((5 - a).__sub__(1))  # PLC2801
-24 24 | print(-(5 - a).__sub__(1))  # PLC2801
-25 25 | print(-(-5 - a).__sub__(1))  # PLC2801
+19 | print((1).__neg__())  # PLC2801
+20 | print(-a.__sub__(1))  # PLC2801
+21 | print(-(a).__sub__(1))  # PLC2801
+   - print(-(-a.__sub__(1)))  # PLC2801
+22 + print(-(-(a - 1)))  # PLC2801
+23 | print((5 - a).__sub__(1))  # PLC2801
+24 | print(-(5 - a).__sub__(1))  # PLC2801
+25 | print(-(-5 - a).__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:23:7
@@ -419,16 +401,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 25 | print(-(-5 - a).__sub__(1))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-20 20 | print(-a.__sub__(1))  # PLC2801
-21 21 | print(-(a).__sub__(1))  # PLC2801
-22 22 | print(-(-a.__sub__(1)))  # PLC2801
-23    |-print((5 - a).__sub__(1))  # PLC2801
-   23 |+print(5 - a - 1)  # PLC2801
-24 24 | print(-(5 - a).__sub__(1))  # PLC2801
-25 25 | print(-(-5 - a).__sub__(1))  # PLC2801
-26 26 | print(+-+-+-a.__sub__(1))  # PLC2801
+20 | print(-a.__sub__(1))  # PLC2801
+21 | print(-(a).__sub__(1))  # PLC2801
+22 | print(-(-a.__sub__(1)))  # PLC2801
+   - print((5 - a).__sub__(1))  # PLC2801
+23 + print(5 - a - 1)  # PLC2801
+24 | print(-(5 - a).__sub__(1))  # PLC2801
+25 | print(-(-5 - a).__sub__(1))  # PLC2801
+26 | print(+-+-+-a.__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:24:8
@@ -441,16 +422,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 26 | print(+-+-+-a.__sub__(1))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-21 21 | print(-(a).__sub__(1))  # PLC2801
-22 22 | print(-(-a.__sub__(1)))  # PLC2801
-23 23 | print((5 - a).__sub__(1))  # PLC2801
-24    |-print(-(5 - a).__sub__(1))  # PLC2801
-   24 |+print(-(5 - a - 1))  # PLC2801
-25 25 | print(-(-5 - a).__sub__(1))  # PLC2801
-26 26 | print(+-+-+-a.__sub__(1))  # PLC2801
-27 27 | print(a.__rsub__(2 - 1))  # PLC2801
+21 | print(-(a).__sub__(1))  # PLC2801
+22 | print(-(-a.__sub__(1)))  # PLC2801
+23 | print((5 - a).__sub__(1))  # PLC2801
+   - print(-(5 - a).__sub__(1))  # PLC2801
+24 + print(-(5 - a - 1))  # PLC2801
+25 | print(-(-5 - a).__sub__(1))  # PLC2801
+26 | print(+-+-+-a.__sub__(1))  # PLC2801
+27 | print(a.__rsub__(2 - 1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:25:8
@@ -463,16 +443,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 27 | print(a.__rsub__(2 - 1))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-22 22 | print(-(-a.__sub__(1)))  # PLC2801
-23 23 | print((5 - a).__sub__(1))  # PLC2801
-24 24 | print(-(5 - a).__sub__(1))  # PLC2801
-25    |-print(-(-5 - a).__sub__(1))  # PLC2801
-   25 |+print(-(-5 - a - 1))  # PLC2801
-26 26 | print(+-+-+-a.__sub__(1))  # PLC2801
-27 27 | print(a.__rsub__(2 - 1))  # PLC2801
-28 28 | print(a.__sub__(((((1))))))  # PLC2801
+22 | print(-(-a.__sub__(1)))  # PLC2801
+23 | print((5 - a).__sub__(1))  # PLC2801
+24 | print(-(5 - a).__sub__(1))  # PLC2801
+   - print(-(-5 - a).__sub__(1))  # PLC2801
+25 + print(-(-5 - a - 1))  # PLC2801
+26 | print(+-+-+-a.__sub__(1))  # PLC2801
+27 | print(a.__rsub__(2 - 1))  # PLC2801
+28 | print(a.__sub__(((((1))))))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:26:13
@@ -485,16 +464,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 28 | print(a.__sub__(((((1))))))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-23 23 | print((5 - a).__sub__(1))  # PLC2801
-24 24 | print(-(5 - a).__sub__(1))  # PLC2801
-25 25 | print(-(-5 - a).__sub__(1))  # PLC2801
-26    |-print(+-+-+-a.__sub__(1))  # PLC2801
-   26 |+print(+-+-+-(a - 1))  # PLC2801
-27 27 | print(a.__rsub__(2 - 1))  # PLC2801
-28 28 | print(a.__sub__(((((1))))))  # PLC2801
-29 29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
+23 | print((5 - a).__sub__(1))  # PLC2801
+24 | print(-(5 - a).__sub__(1))  # PLC2801
+25 | print(-(-5 - a).__sub__(1))  # PLC2801
+   - print(+-+-+-a.__sub__(1))  # PLC2801
+26 + print(+-+-+-(a - 1))  # PLC2801
+27 | print(a.__rsub__(2 - 1))  # PLC2801
+28 | print(a.__sub__(((((1))))))  # PLC2801
+29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:27:7
@@ -507,16 +485,15 @@ PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator.
 29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-24 24 | print(-(5 - a).__sub__(1))  # PLC2801
-25 25 | print(-(-5 - a).__sub__(1))  # PLC2801
-26 26 | print(+-+-+-a.__sub__(1))  # PLC2801
-27    |-print(a.__rsub__(2 - 1))  # PLC2801
-   27 |+print((2 - 1) - a)  # PLC2801
-28 28 | print(a.__sub__(((((1))))))  # PLC2801
-29 29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
-30 30 | print(a.__sub__(
+24 | print(-(5 - a).__sub__(1))  # PLC2801
+25 | print(-(-5 - a).__sub__(1))  # PLC2801
+26 | print(+-+-+-a.__sub__(1))  # PLC2801
+   - print(a.__rsub__(2 - 1))  # PLC2801
+27 + print((2 - 1) - a)  # PLC2801
+28 | print(a.__sub__(((((1))))))  # PLC2801
+29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
+30 | print(a.__sub__(
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:28:7
@@ -529,16 +506,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 30 | print(a.__sub__(
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-25 25 | print(-(-5 - a).__sub__(1))  # PLC2801
-26 26 | print(+-+-+-a.__sub__(1))  # PLC2801
-27 27 | print(a.__rsub__(2 - 1))  # PLC2801
-28    |-print(a.__sub__(((((1))))))  # PLC2801
-   28 |+print(a - 1)  # PLC2801
-29 29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
-30 30 | print(a.__sub__(
-31 31 |     3
+25 | print(-(-5 - a).__sub__(1))  # PLC2801
+26 | print(+-+-+-a.__sub__(1))  # PLC2801
+27 | print(a.__rsub__(2 - 1))  # PLC2801
+   - print(a.__sub__(((((1))))))  # PLC2801
+28 + print(a - 1)  # PLC2801
+29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
+30 | print(a.__sub__(
+31 |     3
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:29:7
@@ -551,16 +527,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 31 |     3
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-26 26 | print(+-+-+-a.__sub__(1))  # PLC2801
-27 27 | print(a.__rsub__(2 - 1))  # PLC2801
-28 28 | print(a.__sub__(((((1))))))  # PLC2801
-29    |-print(a.__sub__(((((2 - 1))))))  # PLC2801
-   29 |+print(a - (2 - 1))  # PLC2801
-30 30 | print(a.__sub__(
-31 31 |     3
-32 32 |     +
+26 | print(+-+-+-a.__sub__(1))  # PLC2801
+27 | print(a.__rsub__(2 - 1))  # PLC2801
+28 | print(a.__sub__(((((1))))))  # PLC2801
+   - print(a.__sub__(((((2 - 1))))))  # PLC2801
+29 + print(a - (2 - 1))  # PLC2801
+30 | print(a.__sub__(
+31 |     3
+32 |     +
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:30:7
@@ -578,21 +553,20 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 36 |       3
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-27 27 | print(a.__rsub__(2 - 1))  # PLC2801
-28 28 | print(a.__sub__(((((1))))))  # PLC2801
-29 29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
-30    |-print(a.__sub__(
-31    |-    3
-   30 |+print(a - (3
-32 31 |     +
-33    |-    4
-34    |-))
-   32 |+    4))
-35 33 | print(a.__rsub__(
-36 34 |     3
-37 35 |     +
+27 | print(a.__rsub__(2 - 1))  # PLC2801
+28 | print(a.__sub__(((((1))))))  # PLC2801
+29 | print(a.__sub__(((((2 - 1))))))  # PLC2801
+   - print(a.__sub__(
+   -     3
+30 + print(a - (3
+31 |     +
+   -     4
+   - ))
+32 +     4))
+33 | print(a.__rsub__(
+34 |     3
+35 |     +
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:35:7
@@ -610,21 +584,20 @@ PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator.
 41 |   x = 2 * a.__add__(3)  # PLC2801
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-32 32 |     +
-33 33 |     4
-34 34 | ))
-35    |-print(a.__rsub__(
-36    |-    3
-   35 |+print((3
-37 36 |     +
-38    |-    4
-39    |-))
-   37 |+    4) - a)
-40 38 | print(2 * a.__add__(3))  # PLC2801
-41 39 | x = 2 * a.__add__(3)  # PLC2801
-42 40 | x = 2 * -a.__add__(3)  # PLC2801
+32 |     +
+33 |     4
+34 | ))
+   - print(a.__rsub__(
+   -     3
+35 + print((3
+36 |     +
+   -     4
+   - ))
+37 +     4) - a)
+38 | print(2 * a.__add__(3))  # PLC2801
+39 | x = 2 * a.__add__(3)  # PLC2801
+40 | x = 2 * -a.__add__(3)  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:40:11
@@ -637,16 +610,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 42 | x = 2 * -a.__add__(3)  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-37 37 |     +
-38 38 |     4
-39 39 | ))
-40    |-print(2 * a.__add__(3))  # PLC2801
-   40 |+print(2 * (a + 3))  # PLC2801
-41 41 | x = 2 * a.__add__(3)  # PLC2801
-42 42 | x = 2 * -a.__add__(3)  # PLC2801
-43 43 | x = a.__add__(3)  # PLC2801
+37 |     +
+38 |     4
+39 | ))
+   - print(2 * a.__add__(3))  # PLC2801
+40 + print(2 * (a + 3))  # PLC2801
+41 | x = 2 * a.__add__(3)  # PLC2801
+42 | x = 2 * -a.__add__(3)  # PLC2801
+43 | x = a.__add__(3)  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:41:9
@@ -659,16 +631,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 43 | x = a.__add__(3)  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-38 38 |     4
-39 39 | ))
-40 40 | print(2 * a.__add__(3))  # PLC2801
-41    |-x = 2 * a.__add__(3)  # PLC2801
-   41 |+x = 2 * (a + 3)  # PLC2801
-42 42 | x = 2 * -a.__add__(3)  # PLC2801
-43 43 | x = a.__add__(3)  # PLC2801
-44 44 | x = -a.__add__(3)  # PLC2801
+38 |     4
+39 | ))
+40 | print(2 * a.__add__(3))  # PLC2801
+   - x = 2 * a.__add__(3)  # PLC2801
+41 + x = 2 * (a + 3)  # PLC2801
+42 | x = 2 * -a.__add__(3)  # PLC2801
+43 | x = a.__add__(3)  # PLC2801
+44 | x = -a.__add__(3)  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:42:10
@@ -681,16 +652,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 44 | x = -a.__add__(3)  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-39 39 | ))
-40 40 | print(2 * a.__add__(3))  # PLC2801
-41 41 | x = 2 * a.__add__(3)  # PLC2801
-42    |-x = 2 * -a.__add__(3)  # PLC2801
-   42 |+x = 2 * -(a + 3)  # PLC2801
-43 43 | x = a.__add__(3)  # PLC2801
-44 44 | x = -a.__add__(3)  # PLC2801
-45 45 | x = (-a).__add__(3)  # PLC2801
+39 | ))
+40 | print(2 * a.__add__(3))  # PLC2801
+41 | x = 2 * a.__add__(3)  # PLC2801
+   - x = 2 * -a.__add__(3)  # PLC2801
+42 + x = 2 * -(a + 3)  # PLC2801
+43 | x = a.__add__(3)  # PLC2801
+44 | x = -a.__add__(3)  # PLC2801
+45 | x = (-a).__add__(3)  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:43:5
@@ -703,16 +673,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 45 | x = (-a).__add__(3)  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-40 40 | print(2 * a.__add__(3))  # PLC2801
-41 41 | x = 2 * a.__add__(3)  # PLC2801
-42 42 | x = 2 * -a.__add__(3)  # PLC2801
-43    |-x = a.__add__(3)  # PLC2801
-   43 |+x = a + 3  # PLC2801
-44 44 | x = -a.__add__(3)  # PLC2801
-45 45 | x = (-a).__add__(3)  # PLC2801
-46 46 | x = -(-a).__add__(3)  # PLC2801
+40 | print(2 * a.__add__(3))  # PLC2801
+41 | x = 2 * a.__add__(3)  # PLC2801
+42 | x = 2 * -a.__add__(3)  # PLC2801
+   - x = a.__add__(3)  # PLC2801
+43 + x = a + 3  # PLC2801
+44 | x = -a.__add__(3)  # PLC2801
+45 | x = (-a).__add__(3)  # PLC2801
+46 | x = -(-a).__add__(3)  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:44:6
@@ -725,16 +694,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 46 | x = -(-a).__add__(3)  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-41 41 | x = 2 * a.__add__(3)  # PLC2801
-42 42 | x = 2 * -a.__add__(3)  # PLC2801
-43 43 | x = a.__add__(3)  # PLC2801
-44    |-x = -a.__add__(3)  # PLC2801
-   44 |+x = -(a + 3)  # PLC2801
-45 45 | x = (-a).__add__(3)  # PLC2801
-46 46 | x = -(-a).__add__(3)  # PLC2801
-47 47 | 
+41 | x = 2 * a.__add__(3)  # PLC2801
+42 | x = 2 * -a.__add__(3)  # PLC2801
+43 | x = a.__add__(3)  # PLC2801
+   - x = -a.__add__(3)  # PLC2801
+44 + x = -(a + 3)  # PLC2801
+45 | x = (-a).__add__(3)  # PLC2801
+46 | x = -(-a).__add__(3)  # PLC2801
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:45:5
@@ -746,16 +714,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 46 | x = -(-a).__add__(3)  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-42 42 | x = 2 * -a.__add__(3)  # PLC2801
-43 43 | x = a.__add__(3)  # PLC2801
-44 44 | x = -a.__add__(3)  # PLC2801
-45    |-x = (-a).__add__(3)  # PLC2801
-   45 |+x = -a + 3  # PLC2801
-46 46 | x = -(-a).__add__(3)  # PLC2801
-47 47 | 
-48 48 | # Calls
+42 | x = 2 * -a.__add__(3)  # PLC2801
+43 | x = a.__add__(3)  # PLC2801
+44 | x = -a.__add__(3)  # PLC2801
+   - x = (-a).__add__(3)  # PLC2801
+45 + x = -a + 3  # PLC2801
+46 | x = -(-a).__add__(3)  # PLC2801
+47 | 
+48 | # Calls
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:46:6
@@ -768,16 +735,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 48 | # Calls
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-43 43 | x = a.__add__(3)  # PLC2801
-44 44 | x = -a.__add__(3)  # PLC2801
-45 45 | x = (-a).__add__(3)  # PLC2801
-46    |-x = -(-a).__add__(3)  # PLC2801
-   46 |+x = -(-a + 3)  # PLC2801
-47 47 | 
-48 48 | # Calls
-49 49 | print(a.__call__())  # PLC2801 (no fix, intentional)
+43 | x = a.__add__(3)  # PLC2801
+44 | x = -a.__add__(3)  # PLC2801
+45 | x = (-a).__add__(3)  # PLC2801
+   - x = -(-a).__add__(3)  # PLC2801
+46 + x = -(-a + 3)  # PLC2801
+47 | 
+48 | # Calls
+49 | print(a.__call__())  # PLC2801 (no fix, intentional)
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 Unnecessary dunder call to `__call__`
   --> unnecessary_dunder_call.py:49:7
@@ -797,16 +763,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
    | ^^^^^^^^^^^^^^
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-60 60 |         return self.v
-61 61 | 
-62 62 | foo = Foo(1)
-63    |-foo.__add__(2).get_v()  # PLC2801
-   63 |+(foo + 2).get_v()  # PLC2801
-64 64 | 
-65 65 | 
-66 66 | # Lambda expressions
+60 |         return self.v
+61 | 
+62 | foo = Foo(1)
+   - foo.__add__(2).get_v()  # PLC2801
+63 + (foo + 2).get_v()  # PLC2801
+64 | 
+65 | 
+66 | # Lambda expressions
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:67:16
@@ -818,16 +783,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 69 | # If expressions
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-64 64 | 
-65 65 | 
-66 66 | # Lambda expressions
-67    |-blah = lambda: a.__add__(1)  # PLC2801
-   67 |+blah = lambda: a + 1  # PLC2801
-68 68 | 
-69 69 | # If expressions
-70 70 | print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
+64 | 
+65 | 
+66 | # Lambda expressions
+   - blah = lambda: a.__add__(1)  # PLC2801
+67 + blah = lambda: a + 1  # PLC2801
+68 | 
+69 | # If expressions
+70 | print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:70:7
@@ -839,16 +803,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 72 | # Dict/Set/List/Tuple
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-67 67 | blah = lambda: a.__add__(1)  # PLC2801
-68 68 | 
-69 69 | # If expressions
-70    |-print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
-   70 |+print(a + 1 if a > 0 else a.__sub__(1))  # PLC2801
-71 71 | 
-72 72 | # Dict/Set/List/Tuple
-73 73 | print({"a": a.__add__(1)})  # PLC2801
+67 | blah = lambda: a.__add__(1)  # PLC2801
+68 | 
+69 | # If expressions
+   - print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
+70 + print(a + 1 if a > 0 else a.__sub__(1))  # PLC2801
+71 | 
+72 | # Dict/Set/List/Tuple
+73 | print({"a": a.__add__(1)})  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
   --> unnecessary_dunder_call.py:70:34
@@ -860,16 +823,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 72 | # Dict/Set/List/Tuple
    |
 help: Use `-` operator
-
-ℹ Unsafe fix
-67 67 | blah = lambda: a.__add__(1)  # PLC2801
-68 68 | 
-69 69 | # If expressions
-70    |-print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
-   70 |+print(a.__add__(1) if a > 0 else a - 1)  # PLC2801
-71 71 | 
-72 72 | # Dict/Set/List/Tuple
-73 73 | print({"a": a.__add__(1)})  # PLC2801
+67 | blah = lambda: a.__add__(1)  # PLC2801
+68 | 
+69 | # If expressions
+   - print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
+70 + print(a.__add__(1) if a > 0 else a - 1)  # PLC2801
+71 | 
+72 | # Dict/Set/List/Tuple
+73 | print({"a": a.__add__(1)})  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:73:13
@@ -881,16 +843,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 75 | print([a.__add__(1)])  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-70 70 | print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
-71 71 | 
-72 72 | # Dict/Set/List/Tuple
-73    |-print({"a": a.__add__(1)})  # PLC2801
-   73 |+print({"a": (a + 1)})  # PLC2801
-74 74 | print({a.__add__(1)})  # PLC2801
-75 75 | print([a.__add__(1)])  # PLC2801
-76 76 | print((a.__add__(1),))  # PLC2801
+70 | print(a.__add__(1) if a > 0 else a.__sub__(1))  # PLC2801
+71 | 
+72 | # Dict/Set/List/Tuple
+   - print({"a": a.__add__(1)})  # PLC2801
+73 + print({"a": (a + 1)})  # PLC2801
+74 | print({a.__add__(1)})  # PLC2801
+75 | print([a.__add__(1)])  # PLC2801
+76 | print((a.__add__(1),))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:74:8
@@ -903,16 +864,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 76 | print((a.__add__(1),))  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-71 71 | 
-72 72 | # Dict/Set/List/Tuple
-73 73 | print({"a": a.__add__(1)})  # PLC2801
-74    |-print({a.__add__(1)})  # PLC2801
-   74 |+print({(a + 1)})  # PLC2801
-75 75 | print([a.__add__(1)])  # PLC2801
-76 76 | print((a.__add__(1),))  # PLC2801
-77 77 | 
+71 | 
+72 | # Dict/Set/List/Tuple
+73 | print({"a": a.__add__(1)})  # PLC2801
+   - print({a.__add__(1)})  # PLC2801
+74 + print({(a + 1)})  # PLC2801
+75 | print([a.__add__(1)])  # PLC2801
+76 | print((a.__add__(1),))  # PLC2801
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:75:8
@@ -924,16 +884,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 76 | print((a.__add__(1),))  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-72 72 | # Dict/Set/List/Tuple
-73 73 | print({"a": a.__add__(1)})  # PLC2801
-74 74 | print({a.__add__(1)})  # PLC2801
-75    |-print([a.__add__(1)])  # PLC2801
-   75 |+print([(a + 1)])  # PLC2801
-76 76 | print((a.__add__(1),))  # PLC2801
-77 77 | 
-78 78 | # Comprehension variants
+72 | # Dict/Set/List/Tuple
+73 | print({"a": a.__add__(1)})  # PLC2801
+74 | print({a.__add__(1)})  # PLC2801
+   - print([a.__add__(1)])  # PLC2801
+75 + print([(a + 1)])  # PLC2801
+76 | print((a.__add__(1),))  # PLC2801
+77 | 
+78 | # Comprehension variants
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:76:8
@@ -946,16 +905,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 78 | # Comprehension variants
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-73 73 | print({"a": a.__add__(1)})  # PLC2801
-74 74 | print({a.__add__(1)})  # PLC2801
-75 75 | print([a.__add__(1)])  # PLC2801
-76    |-print((a.__add__(1),))  # PLC2801
-   76 |+print(((a + 1),))  # PLC2801
-77 77 | 
-78 78 | # Comprehension variants
-79 79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
+73 | print({"a": a.__add__(1)})  # PLC2801
+74 | print({a.__add__(1)})  # PLC2801
+75 | print([a.__add__(1)])  # PLC2801
+   - print((a.__add__(1),))  # PLC2801
+76 + print(((a + 1),))  # PLC2801
+77 | 
+78 | # Comprehension variants
+79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:79:11
@@ -967,16 +925,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 81 | print([i.__add__(1) for i in range(5)])  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-76 76 | print((a.__add__(1),))  # PLC2801
-77 77 | 
-78 78 | # Comprehension variants
-79    |-print({i: i.__add__(1) for i in range(5)})  # PLC2801
-   79 |+print({i: (i + 1) for i in range(5)})  # PLC2801
-80 80 | print({i.__add__(1) for i in range(5)})  # PLC2801
-81 81 | print([i.__add__(1) for i in range(5)])  # PLC2801
-82 82 | print((i.__add__(1) for i in range(5)))  # PLC2801
+76 | print((a.__add__(1),))  # PLC2801
+77 | 
+78 | # Comprehension variants
+   - print({i: i.__add__(1) for i in range(5)})  # PLC2801
+79 + print({i: (i + 1) for i in range(5)})  # PLC2801
+80 | print({i.__add__(1) for i in range(5)})  # PLC2801
+81 | print([i.__add__(1) for i in range(5)])  # PLC2801
+82 | print((i.__add__(1) for i in range(5)))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:80:8
@@ -989,16 +946,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 82 | print((i.__add__(1) for i in range(5)))  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-77 77 | 
-78 78 | # Comprehension variants
-79 79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
-80    |-print({i.__add__(1) for i in range(5)})  # PLC2801
-   80 |+print({(i + 1) for i in range(5)})  # PLC2801
-81 81 | print([i.__add__(1) for i in range(5)])  # PLC2801
-82 82 | print((i.__add__(1) for i in range(5)))  # PLC2801
-83 83 | 
+77 | 
+78 | # Comprehension variants
+79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
+   - print({i.__add__(1) for i in range(5)})  # PLC2801
+80 + print({(i + 1) for i in range(5)})  # PLC2801
+81 | print([i.__add__(1) for i in range(5)])  # PLC2801
+82 | print((i.__add__(1) for i in range(5)))  # PLC2801
+83 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:81:8
@@ -1010,16 +966,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 82 | print((i.__add__(1) for i in range(5)))  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-78 78 | # Comprehension variants
-79 79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
-80 80 | print({i.__add__(1) for i in range(5)})  # PLC2801
-81    |-print([i.__add__(1) for i in range(5)])  # PLC2801
-   81 |+print([(i + 1) for i in range(5)])  # PLC2801
-82 82 | print((i.__add__(1) for i in range(5)))  # PLC2801
-83 83 | 
-84 84 | # Generators
+78 | # Comprehension variants
+79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
+80 | print({i.__add__(1) for i in range(5)})  # PLC2801
+   - print([i.__add__(1) for i in range(5)])  # PLC2801
+81 + print([(i + 1) for i in range(5)])  # PLC2801
+82 | print((i.__add__(1) for i in range(5)))  # PLC2801
+83 | 
+84 | # Generators
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:82:8
@@ -1032,16 +987,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 84 | # Generators
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-79 79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
-80 80 | print({i.__add__(1) for i in range(5)})  # PLC2801
-81 81 | print([i.__add__(1) for i in range(5)])  # PLC2801
-82    |-print((i.__add__(1) for i in range(5)))  # PLC2801
-   82 |+print(((i + 1) for i in range(5)))  # PLC2801
-83 83 | 
-84 84 | # Generators
-85 85 | gen = (i.__add__(1) for i in range(5))  # PLC2801
+79 | print({i: i.__add__(1) for i in range(5)})  # PLC2801
+80 | print({i.__add__(1) for i in range(5)})  # PLC2801
+81 | print([i.__add__(1) for i in range(5)])  # PLC2801
+   - print((i.__add__(1) for i in range(5)))  # PLC2801
+82 + print(((i + 1) for i in range(5)))  # PLC2801
+83 | 
+84 | # Generators
+85 | gen = (i.__add__(1) for i in range(5))  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:85:8
@@ -1052,16 +1006,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 86 | print(next(gen))
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-82 82 | print((i.__add__(1) for i in range(5)))  # PLC2801
-83 83 | 
-84 84 | # Generators
-85    |-gen = (i.__add__(1) for i in range(5))  # PLC2801
-   85 |+gen = ((i + 1) for i in range(5))  # PLC2801
-86 86 | print(next(gen))
-87 87 | 
-88 88 | # Subscripts
+82 | print((i.__add__(1) for i in range(5)))  # PLC2801
+83 | 
+84 | # Generators
+   - gen = (i.__add__(1) for i in range(5))  # PLC2801
+85 + gen = ((i + 1) for i in range(5))  # PLC2801
+86 | print(next(gen))
+87 | 
+88 | # Subscripts
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:89:13
@@ -1073,16 +1026,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 91 | print("x".__add__("y")[0])  # PLC2801
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-86 86 | print(next(gen))
-87 87 | 
-88 88 | # Subscripts
-89    |-print({"a": a.__add__(1)}["a"])  # PLC2801
-   89 |+print({"a": (a + 1)}["a"])  # PLC2801
-90 90 | # https://github.com/astral-sh/ruff/issues/15745
-91 91 | print("x".__add__("y")[0])  # PLC2801
-92 92 | 
+86 | print(next(gen))
+87 | 
+88 | # Subscripts
+   - print({"a": a.__add__(1)}["a"])  # PLC2801
+89 + print({"a": (a + 1)}["a"])  # PLC2801
+90 | # https://github.com/astral-sh/ruff/issues/15745
+91 | print("x".__add__("y")[0])  # PLC2801
+92 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:91:7
@@ -1095,16 +1047,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 93 | # Starred
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-88 88 | # Subscripts
-89 89 | print({"a": a.__add__(1)}["a"])  # PLC2801
-90 90 | # https://github.com/astral-sh/ruff/issues/15745
-91    |-print("x".__add__("y")[0])  # PLC2801
-   91 |+print(("x" + "y")[0])  # PLC2801
-92 92 | 
-93 93 | # Starred
-94 94 | print(*[a.__add__(1)])  # PLC2801
+88 | # Subscripts
+89 | print({"a": a.__add__(1)}["a"])  # PLC2801
+90 | # https://github.com/astral-sh/ruff/issues/15745
+   - print("x".__add__("y")[0])  # PLC2801
+91 + print(("x" + "y")[0])  # PLC2801
+92 | 
+93 | # Starred
+94 | print(*[a.__add__(1)])  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
   --> unnecessary_dunder_call.py:94:9
@@ -1116,16 +1067,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 96 | list1 = [1, 2, 3]
    |
 help: Use `+` operator
-
-ℹ Unsafe fix
-91 91 | print("x".__add__("y")[0])  # PLC2801
-92 92 | 
-93 93 | # Starred
-94    |-print(*[a.__add__(1)])  # PLC2801
-   94 |+print(*[(a + 1)])  # PLC2801
-95 95 | 
-96 96 | list1 = [1, 2, 3]
-97 97 | list2 = [4, 5, 6]
+91 | print("x".__add__("y")[0])  # PLC2801
+92 | 
+93 | # Starred
+   - print(*[a.__add__(1)])  # PLC2801
+94 + print(*[(a + 1)])  # PLC2801
+95 | 
+96 | list1 = [1, 2, 3]
+97 | list2 = [4, 5, 6]
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
    --> unnecessary_dunder_call.py:98:9
@@ -1138,16 +1088,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 100 | # Slices
     |
 help: Use `+` operator
-
-ℹ Unsafe fix
-95 95 | 
-96 96 | list1 = [1, 2, 3]
-97 97 | list2 = [4, 5, 6]
-98    |-print([*list1.__add__(list2)])  # PLC2801
-   98 |+print([*list1 + list2])  # PLC2801
-99 99 | 
-100 100 | # Slices
-101 101 | print([a.__add__(1), a.__sub__(1)][0:1])  # PLC2801
+95  | 
+96  | list1 = [1, 2, 3]
+97  | list2 = [4, 5, 6]
+    - print([*list1.__add__(list2)])  # PLC2801
+98  + print([*list1 + list2])  # PLC2801
+99  | 
+100 | # Slices
+101 | print([a.__add__(1), a.__sub__(1)][0:1])  # PLC2801
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
    --> unnecessary_dunder_call.py:101:8
@@ -1159,16 +1108,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 103 | # Attribute access
     |
 help: Use `+` operator
-
-ℹ Unsafe fix
-98  98  | print([*list1.__add__(list2)])  # PLC2801
-99  99  | 
-100 100 | # Slices
-101     |-print([a.__add__(1), a.__sub__(1)][0:1])  # PLC2801
-    101 |+print([(a + 1), a.__sub__(1)][0:1])  # PLC2801
-102 102 | 
-103 103 | # Attribute access
-104 104 | # https://github.com/astral-sh/ruff/issues/15745
+98  | print([*list1.__add__(list2)])  # PLC2801
+99  | 
+100 | # Slices
+    - print([a.__add__(1), a.__sub__(1)][0:1])  # PLC2801
+101 + print([(a + 1), a.__sub__(1)][0:1])  # PLC2801
+102 | 
+103 | # Attribute access
+104 | # https://github.com/astral-sh/ruff/issues/15745
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
    --> unnecessary_dunder_call.py:101:22
@@ -1180,16 +1128,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator.
 103 | # Attribute access
     |
 help: Use `-` operator
-
-ℹ Unsafe fix
-98  98  | print([*list1.__add__(list2)])  # PLC2801
-99  99  | 
-100 100 | # Slices
-101     |-print([a.__add__(1), a.__sub__(1)][0:1])  # PLC2801
-    101 |+print([a.__add__(1), (a - 1)][0:1])  # PLC2801
-102 102 | 
-103 103 | # Attribute access
-104 104 | # https://github.com/astral-sh/ruff/issues/15745
+98  | print([*list1.__add__(list2)])  # PLC2801
+99  | 
+100 | # Slices
+    - print([a.__add__(1), a.__sub__(1)][0:1])  # PLC2801
+101 + print([a.__add__(1), (a - 1)][0:1])  # PLC2801
+102 | 
+103 | # Attribute access
+104 | # https://github.com/astral-sh/ruff/issues/15745
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
    --> unnecessary_dunder_call.py:105:7
@@ -1202,16 +1149,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator.
 107 | class Thing:
     |
 help: Use `+` operator
-
-ℹ Unsafe fix
-102 102 | 
-103 103 | # Attribute access
-104 104 | # https://github.com/astral-sh/ruff/issues/15745
-105     |-print(1j.__add__(1.0).real) # PLC2801
-    105 |+print((1j + 1.0).real) # PLC2801
-106 106 | 
-107 107 | class Thing:
-108 108 |     def __init__(self, stuff: Any) -> None:
+102 | 
+103 | # Attribute access
+104 | # https://github.com/astral-sh/ruff/issues/15745
+    - print(1j.__add__(1.0).real) # PLC2801
+105 + print((1j + 1.0).real) # PLC2801
+106 | 
+107 | class Thing:
+108 |     def __init__(self, stuff: Any) -> None:
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 Unnecessary dunder call to `__getattribute__`. Access attribute directly or use getattr built-in function.
    --> unnecessary_dunder_call.py:116:16
@@ -1235,16 +1181,15 @@ PLC2801 [*] Unnecessary dunder call to `__contains__`. Use `in` operator.
 130 | # https://github.com/astral-sh/ruff/issues/14597
     |
 help: Use `in` operator
-
-ℹ Unsafe fix
-125 125 | 
-126 126 | blah = dict[{"a": 1}.__delitem__("a")]  # OK
-127 127 | 
-128     |-"abc".__contains__("a")
-    128 |+"a" in "abc"
-129 129 | 
-130 130 | # https://github.com/astral-sh/ruff/issues/14597
-131 131 | assert "abc".__str__() == "abc"
+125 | 
+126 | blah = dict[{"a": 1}.__delitem__("a")]  # OK
+127 | 
+    - "abc".__contains__("a")
+128 + "a" in "abc"
+129 | 
+130 | # https://github.com/astral-sh/ruff/issues/14597
+131 | assert "abc".__str__() == "abc"
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin.
    --> unnecessary_dunder_call.py:131:8
@@ -1256,16 +1201,15 @@ PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin.
 133 | # https://github.com/astral-sh/ruff/issues/18813
     |
 help: Use `str()` builtin
-
-ℹ Unsafe fix
-128 128 | "abc".__contains__("a")
-129 129 | 
-130 130 | # https://github.com/astral-sh/ruff/issues/14597
-131     |-assert "abc".__str__() == "abc"
-    131 |+assert str("abc") == "abc"
-132 132 | 
-133 133 | # https://github.com/astral-sh/ruff/issues/18813
-134 134 | three = 1 if 1 else(3.0).__str__()
+128 | "abc".__contains__("a")
+129 | 
+130 | # https://github.com/astral-sh/ruff/issues/14597
+    - assert "abc".__str__() == "abc"
+131 + assert str("abc") == "abc"
+132 | 
+133 | # https://github.com/astral-sh/ruff/issues/18813
+134 | three = 1 if 1 else(3.0).__str__()
+note: This is an unsafe fix and may change runtime behavior
 
 PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin.
    --> unnecessary_dunder_call.py:134:20
@@ -1275,10 +1219,9 @@ PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin.
     |                    ^^^^^^^^^^^^^^^
     |
 help: Use `str()` builtin
-
-ℹ Unsafe fix
-131 131 | assert "abc".__str__() == "abc"
-132 132 | 
-133 133 | # https://github.com/astral-sh/ruff/issues/18813
-134     |-three = 1 if 1 else(3.0).__str__()
-    134 |+three = 1 if 1 else str(3.0)
+131 | assert "abc".__str__() == "abc"
+132 | 
+133 | # https://github.com/astral-sh/ruff/issues/18813
+    - three = 1 if 1 else(3.0).__str__()
+134 + three = 1 if 1 else str(3.0)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap
index 5961b78d8e..c130605693 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap
@@ -10,16 +10,14 @@ PLE0241 [*] Duplicate base `A` for class `F1`
 14 |     ...
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-10 10 | 
-11 11 | 
-12 12 | # Duplicate base class is last.
-13    |-class F1(A, A):
-   13 |+class F1(A):
-14 14 |     ...
-15 15 | 
-16 16 | 
+10 | 
+11 | 
+12 | # Duplicate base class is last.
+   - class F1(A, A):
+13 + class F1(A):
+14 |     ...
+15 | 
+16 | 
 
 PLE0241 [*] Duplicate base `A` for class `F2`
   --> duplicate_bases.py:17:13
@@ -29,16 +27,14 @@ PLE0241 [*] Duplicate base `A` for class `F2`
 18 |     ...
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-14 14 |     ...
-15 15 | 
-16 16 | 
-17    |-class F2(A, A,):
-   17 |+class F2(A,):
-18 18 |     ...
-19 19 | 
-20 20 | 
+14 |     ...
+15 | 
+16 | 
+   - class F2(A, A,):
+17 + class F2(A,):
+18 |     ...
+19 | 
+20 | 
 
 PLE0241 [*] Duplicate base `A` for class `F3`
   --> duplicate_bases.py:23:5
@@ -51,15 +47,13 @@ PLE0241 [*] Duplicate base `A` for class `F3`
 25 |     ...
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | class F3(
-22    |-    A,
-23 22 |     A
-24 23 | ):
-25 24 |     ...
+19 | 
+20 | 
+21 | class F3(
+   -     A,
+22 |     A
+23 | ):
+24 |     ...
 
 PLE0241 [*] Duplicate base `A` for class `F4`
   --> duplicate_bases.py:30:5
@@ -72,15 +66,13 @@ PLE0241 [*] Duplicate base `A` for class `F4`
 32 |     ...
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-27 27 | 
-28 28 | class F4(
-29 29 |     A,
-30    |-    A,
-31 30 | ):
-32 31 |     ...
-33 32 | 
+27 | 
+28 | class F4(
+29 |     A,
+   -     A,
+30 | ):
+31 |     ...
+32 | 
 
 PLE0241 [*] Duplicate base `A` for class `G1`
   --> duplicate_bases.py:36:13
@@ -91,16 +83,14 @@ PLE0241 [*] Duplicate base `A` for class `G1`
 37 |     ...
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-33 33 | 
-34 34 | 
-35 35 | # Duplicate base class is not last.
-36    |-class G1(A, A, B):
-   36 |+class G1(A, B):
-37 37 |     ...
-38 38 | 
-39 39 | 
+33 | 
+34 | 
+35 | # Duplicate base class is not last.
+   - class G1(A, A, B):
+36 + class G1(A, B):
+37 |     ...
+38 | 
+39 | 
 
 PLE0241 [*] Duplicate base `A` for class `G2`
   --> duplicate_bases.py:40:13
@@ -110,16 +100,14 @@ PLE0241 [*] Duplicate base `A` for class `G2`
 41 |     ...
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-37 37 |     ...
-38 38 | 
-39 39 | 
-40    |-class G2(A, A, B,):
-   40 |+class G2(A, B,):
-41 41 |     ...
-42 42 | 
-43 43 | 
+37 |     ...
+38 | 
+39 | 
+   - class G2(A, A, B,):
+40 + class G2(A, B,):
+41 |     ...
+42 | 
+43 | 
 
 PLE0241 [*] Duplicate base `A` for class `G3`
   --> duplicate_bases.py:46:5
@@ -132,15 +120,13 @@ PLE0241 [*] Duplicate base `A` for class `G3`
 48 | ):
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-43 43 | 
-44 44 | class G3(
-45 45 |     A,
-46    |-    A,
-47 46 |     B
-48 47 | ):
-49 48 |     ...
+43 | 
+44 | class G3(
+45 |     A,
+   -     A,
+46 |     B
+47 | ):
+48 |     ...
 
 PLE0241 [*] Duplicate base `A` for class `G4`
   --> duplicate_bases.py:54:5
@@ -153,15 +139,13 @@ PLE0241 [*] Duplicate base `A` for class `G4`
 56 | ):
    |
 help: Remove duplicate base
-
-ℹ Safe fix
-51 51 | 
-52 52 | class G4(
-53 53 |     A,
-54    |-    A,
-55 54 |     B,
-56 55 | ):
-57 56 |     ...
+51 | 
+52 | class G4(
+53 |     A,
+   -     A,
+54 |     B,
+55 | ):
+56 |     ...
 
 PLE0241 [*] Duplicate base `Foo` for class `Bar`
   --> duplicate_bases.py:76:5
@@ -174,13 +158,12 @@ PLE0241 [*] Duplicate base `Foo` for class `Bar`
 78 |     pass
    |
 help: Remove duplicate base
-
-ℹ Unsafe fix
-72 72 |     ...
-73 73 | 
-74 74 | # https://github.com/astral-sh/ruff/issues/18814
-75    |-class Bar(Foo,  # 1
-76    |-    Foo  # 2
-   75 |+class Bar(Foo  # 2
-77 76 | ):
-78 77 |     pass
+72 |     ...
+73 | 
+74 | # https://github.com/astral-sh/ruff/issues/18814
+   - class Bar(Foo,  # 1
+   -     Foo  # 2
+75 + class Bar(Foo  # 2
+76 | ):
+77 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap
index e50e12a1fa..eb244c5aae 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap
@@ -10,16 +10,15 @@ PLE1141 [*] Unpacking a dictionary in iteration without calling `.items()`
 14 |     pass
    |
 help: Add a call to `.items()`
-
-ℹ Unsafe fix
-10 10 | s2 = {1, 2, 3}
-11 11 | 
-12 12 | # Errors
-13    |-for k, v in d:
-   13 |+for k, v in d.items():
-14 14 |     pass
-15 15 | 
-16 16 | for k, v in d_tuple_incorrect_tuple:
+10 | s2 = {1, 2, 3}
+11 | 
+12 | # Errors
+   - for k, v in d:
+13 + for k, v in d.items():
+14 |     pass
+15 | 
+16 | for k, v in d_tuple_incorrect_tuple:
+note: This is an unsafe fix and may change runtime behavior
 
 PLE1141 [*] Unpacking a dictionary in iteration without calling `.items()`
   --> dict_iter_missing_items.py:16:13
@@ -31,13 +30,12 @@ PLE1141 [*] Unpacking a dictionary in iteration without calling `.items()`
 17 |     pass
    |
 help: Add a call to `.items()`
-
-ℹ Unsafe fix
-13 13 | for k, v in d:
-14 14 |     pass
-15 15 | 
-16    |-for k, v in d_tuple_incorrect_tuple:
-   16 |+for k, v in d_tuple_incorrect_tuple.items():
-17 17 |     pass
-18 18 | 
-19 19 |
+13 | for k, v in d:
+14 |     pass
+15 | 
+   - for k, v in d_tuple_incorrect_tuple:
+16 + for k, v in d_tuple_incorrect_tuple.items():
+17 |     pass
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap
index 3b95a4d1db..5a21e4714f 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap
@@ -11,16 +11,15 @@ PLE1519 [*] `@singledispatch` decorator should not be used on methods
 12 |     def convert_position(cls, position):
    |
 help: Replace with `@singledispatchmethod`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | 
-9  9  | class Board:
-10    |-    @singledispatch  # [singledispatch-method]
-   10 |+    @singledispatchmethod  # [singledispatch-method]
-11 11 |     @classmethod
-12 12 |     def convert_position(cls, position):
-13 13 |         pass
+7  | 
+8  | 
+9  | class Board:
+   -     @singledispatch  # [singledispatch-method]
+10 +     @singledispatchmethod  # [singledispatch-method]
+11 |     @classmethod
+12 |     def convert_position(cls, position):
+13 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 PLE1519 [*] `@singledispatch` decorator should not be used on methods
   --> singledispatch_method.py:15:5
@@ -33,16 +32,15 @@ PLE1519 [*] `@singledispatch` decorator should not be used on methods
 17 |         pass
    |
 help: Replace with `@singledispatchmethod`
-
-ℹ Unsafe fix
-12 12 |     def convert_position(cls, position):
-13 13 |         pass
-14 14 | 
-15    |-    @singledispatch  # [singledispatch-method]
-   15 |+    @singledispatchmethod  # [singledispatch-method]
-16 16 |     def move(self, position):
-17 17 |         pass
-18 18 | 
+12 |     def convert_position(cls, position):
+13 |         pass
+14 | 
+   -     @singledispatch  # [singledispatch-method]
+15 +     @singledispatchmethod  # [singledispatch-method]
+16 |     def move(self, position):
+17 |         pass
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLE1519 [*] `@singledispatch` decorator should not be used on methods
   --> singledispatch_method.py:23:5
@@ -55,13 +53,12 @@ PLE1519 [*] `@singledispatch` decorator should not be used on methods
 25 |     def do(position):
    |
 help: Replace with `@singledispatchmethod`
-
-ℹ Unsafe fix
-20 20 |     def place(self, position):
-21 21 |         pass
-22 22 | 
-23    |-    @singledispatch  # [singledispatch-method]
-   23 |+    @singledispatchmethod  # [singledispatch-method]
-24 24 |     @staticmethod
-25 25 |     def do(position):
-26 26 |         pass
+20 |     def place(self, position):
+21 |         pass
+22 | 
+   -     @singledispatch  # [singledispatch-method]
+23 +     @singledispatchmethod  # [singledispatch-method]
+24 |     @staticmethod
+25 |     def do(position):
+26 |         pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap
index 07d807862a..cc3aae795f 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap
@@ -10,14 +10,13 @@ PLE1520 [*] `@singledispatchmethod` decorator should not be used on non-method f
 6 |     pass
   |
 help: Replace with `@singledispatch`
-
-ℹ Unsafe fix
-1   |-from functools import singledispatchmethod
-  1 |+from functools import singledispatchmethod, singledispatch
-2 2 | 
-3 3 | 
-4   |-@singledispatchmethod  # [singledispatchmethod-function]
-  4 |+@singledispatch  # [singledispatchmethod-function]
-5 5 | def convert_position(position):
-6 6 |     pass
-7 7 |
+  - from functools import singledispatchmethod
+1 + from functools import singledispatchmethod, singledispatch
+2 | 
+3 | 
+  - @singledispatchmethod  # [singledispatchmethod-function]
+4 + @singledispatch  # [singledispatchmethod-function]
+5 | def convert_position(position):
+6 |     pass
+7 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2502_bidirectional_unicode.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2502_bidirectional_unicode.py.snap
index 18356831d7..4a1555ebe8 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2502_bidirectional_unicode.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2502_bidirectional_unicode.py.snap
@@ -22,21 +22,31 @@ PLE2502 Contains control characters that can permit obfuscated code
   |
 
 PLE2502 Contains control characters that can permit obfuscated code
- --> bidirectional_unicode.py:8:1
-  |
-7 | # E2502
-8 | if access_level != "none":  # Check if admin ' and access_level != 'user
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 |     print("You are an admin.")
-  |
+  --> bidirectional_unicode.py:8:1
+   |
+ 7 | # E2502
+ 8 | another = "x؜" * 50  #    "؜x" is assigned
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 9 |
+10 | # E2502
+   |
 
 PLE2502 Contains control characters that can permit obfuscated code
-  --> bidirectional_unicode.py:14:1
+  --> bidirectional_unicode.py:11:1
    |
-12 | # E2502
-13 | def subtract_funds(account: str, amount: int):
-14 |     """Subtract funds from bank account then """
+10 | # E2502
+11 | if access_level != "none":  # Check if admin ' and access_level != 'user
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12 |     print("You are an admin.")
+   |
+
+PLE2502 Contains control characters that can permit obfuscated code
+  --> bidirectional_unicode.py:17:1
+   |
+15 | # E2502
+16 | def subtract_funds(account: str, amount: int):
+17 |     """Subtract funds from bank account then """
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15 |     return
-16 |     bank[account] -= amount
+18 |     return
+19 |     bank[account] -= amount
    |
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters.py.snap
index f2bd3e976d..ec84ce6886 100644
Binary files a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters.py.snap and b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters.py.snap differ
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters_syntax_error.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters_syntax_error.py.snap
index 10839c42b0..4ae66b4a4a 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters_syntax_error.py.snap
@@ -23,16 +23,17 @@ invalid-syntax: missing closing quote in string literal
 9 | # Unterminated f-string
   |
 
-invalid-syntax: Expected a statement
- --> invalid_characters_syntax_error.py:7:7
+PLE2510 Invalid unescaped character backspace, use "\b" instead
+ --> invalid_characters_syntax_error.py:7:6
   |
 5 | b = '␈'
 6 | # Unterminated string
 7 | b = '␈
-  |       ^
+  |      ^
 8 | b = '␈'
 9 | # Unterminated f-string
   |
+help: Replace with escape sequence
 
 PLE2510 Invalid unescaped character backspace, use "\b" instead
   --> invalid_characters_syntax_error.py:8:6
@@ -46,6 +47,18 @@ PLE2510 Invalid unescaped character backspace, use "\b" instead
    |
 help: Replace with escape sequence
 
+PLE2510 Invalid unescaped character backspace, use "\b" instead
+  --> invalid_characters_syntax_error.py:10:7
+   |
+ 8 | b = '␈'
+ 9 | # Unterminated f-string
+10 | b = f'␈
+   |       ^
+11 | b = f'␈'
+12 | # Implicitly concatenated
+   |
+help: Replace with escape sequence
+
 invalid-syntax: f-string: unterminated string
   --> invalid_characters_syntax_error.py:10:7
    |
@@ -109,11 +122,12 @@ invalid-syntax: missing closing quote in string literal
    |              ^^
    |
 
-invalid-syntax: Expected a statement
-  --> invalid_characters_syntax_error.py:13:16
+PLE2510 Invalid unescaped character backspace, use "\b" instead
+  --> invalid_characters_syntax_error.py:13:15
    |
 11 | b = f'␈'
 12 | # Implicitly concatenated
 13 | b = '␈' f'␈' '␈
-   |                ^
+   |               ^
    |
+help: Replace with escape sequence
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2512_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2512_invalid_characters.py.snap
index 2d36515f6e..7fdeac05ab 100644
Binary files a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2512_invalid_characters.py.snap and b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2512_invalid_characters.py.snap differ
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2513_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2513_invalid_characters.py.snap
index b29aada7e1..a04dfd8296 100644
Binary files a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2513_invalid_characters.py.snap and b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2513_invalid_characters.py.snap differ
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2514_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2514_invalid_characters.py.snap
index 84e551149a..bb9e09f4e6 100644
Binary files a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2514_invalid_characters.py.snap and b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2514_invalid_characters.py.snap differ
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2515_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2515_invalid_characters.py.snap
index ab4bd9aaac..735cbf023b 100644
Binary files a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2515_invalid_characters.py.snap and b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2515_invalid_characters.py.snap differ
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE4703_modified_iterating_set.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE4703_modified_iterating_set.py.snap
index e89f5d5583..823b90aaea 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE4703_modified_iterating_set.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE4703_modified_iterating_set.py.snap
@@ -12,16 +12,15 @@ PLE4703 [*] Iterated set `nums` is modified within the `for` loop
 7 |   animals = {"dog", "cat", "cow"}
   |
 help: Iterate over a copy of `nums`
-
-ℹ Unsafe fix
-1 1 | # Errors
-2 2 | 
-3 3 | nums = {1, 2, 3}
-4   |-for num in nums:
-  4 |+for num in nums.copy():
-5 5 |     nums.add(num + 1)
-6 6 | 
-7 7 | animals = {"dog", "cat", "cow"}
+1 | # Errors
+2 | 
+3 | nums = {1, 2, 3}
+  - for num in nums:
+4 + for num in nums.copy():
+5 |     nums.add(num + 1)
+6 | 
+7 | animals = {"dog", "cat", "cow"}
+note: This is an unsafe fix and may change runtime behavior
 
 PLE4703 [*] Iterated set `animals` is modified within the `for` loop
   --> modified_iterating_set.py:8:1
@@ -34,16 +33,15 @@ PLE4703 [*] Iterated set `animals` is modified within the `for` loop
 11 |   fruits = {"apple", "orange", "grape"}
    |
 help: Iterate over a copy of `animals`
-
-ℹ Unsafe fix
-5 5 |     nums.add(num + 1)
-6 6 | 
-7 7 | animals = {"dog", "cat", "cow"}
-8   |-for animal in animals:
-  8 |+for animal in animals.copy():
-9 9 |     animals.pop("cow")
-10 10 | 
-11 11 | fruits = {"apple", "orange", "grape"}
+5  |     nums.add(num + 1)
+6  | 
+7  | animals = {"dog", "cat", "cow"}
+   - for animal in animals:
+8  + for animal in animals.copy():
+9  |     animals.pop("cow")
+10 | 
+11 | fruits = {"apple", "orange", "grape"}
+note: This is an unsafe fix and may change runtime behavior
 
 PLE4703 [*] Iterated set `fruits` is modified within the `for` loop
   --> modified_iterating_set.py:12:1
@@ -56,16 +54,15 @@ PLE4703 [*] Iterated set `fruits` is modified within the `for` loop
 15 |   planets = {"mercury", "venus", "earth"}
    |
 help: Iterate over a copy of `fruits`
-
-ℹ Unsafe fix
-9  9  |     animals.pop("cow")
-10 10 | 
-11 11 | fruits = {"apple", "orange", "grape"}
-12    |-for fruit in fruits:
-   12 |+for fruit in fruits.copy():
-13 13 |     fruits.clear()
-14 14 | 
-15 15 | planets = {"mercury", "venus", "earth"}
+9  |     animals.pop("cow")
+10 | 
+11 | fruits = {"apple", "orange", "grape"}
+   - for fruit in fruits:
+12 + for fruit in fruits.copy():
+13 |     fruits.clear()
+14 | 
+15 | planets = {"mercury", "venus", "earth"}
+note: This is an unsafe fix and may change runtime behavior
 
 PLE4703 [*] Iterated set `planets` is modified within the `for` loop
   --> modified_iterating_set.py:16:1
@@ -78,16 +75,15 @@ PLE4703 [*] Iterated set `planets` is modified within the `for` loop
 19 |   colors = {"red", "green", "blue"}
    |
 help: Iterate over a copy of `planets`
-
-ℹ Unsafe fix
-13 13 |     fruits.clear()
-14 14 | 
-15 15 | planets = {"mercury", "venus", "earth"}
-16    |-for planet in planets:
-   16 |+for planet in planets.copy():
-17 17 |     planets.discard("mercury")
-18 18 | 
-19 19 | colors = {"red", "green", "blue"}
+13 |     fruits.clear()
+14 | 
+15 | planets = {"mercury", "venus", "earth"}
+   - for planet in planets:
+16 + for planet in planets.copy():
+17 |     planets.discard("mercury")
+18 | 
+19 | colors = {"red", "green", "blue"}
+note: This is an unsafe fix and may change runtime behavior
 
 PLE4703 [*] Iterated set `colors` is modified within the `for` loop
   --> modified_iterating_set.py:20:1
@@ -100,16 +96,15 @@ PLE4703 [*] Iterated set `colors` is modified within the `for` loop
 23 |   odds = {1, 3, 5}
    |
 help: Iterate over a copy of `colors`
-
-ℹ Unsafe fix
-17 17 |     planets.discard("mercury")
-18 18 | 
-19 19 | colors = {"red", "green", "blue"}
-20    |-for color in colors:
-   20 |+for color in colors.copy():
-21 21 |     colors.remove("red")
-22 22 | 
-23 23 | odds = {1, 3, 5}
+17 |     planets.discard("mercury")
+18 | 
+19 | colors = {"red", "green", "blue"}
+   - for color in colors:
+20 + for color in colors.copy():
+21 |     colors.remove("red")
+22 | 
+23 | odds = {1, 3, 5}
+note: This is an unsafe fix and may change runtime behavior
 
 PLE4703 [*] Iterated set `odds` is modified within the `for` loop
   --> modified_iterating_set.py:24:1
@@ -123,13 +118,12 @@ PLE4703 [*] Iterated set `odds` is modified within the `for` loop
 28 |   # OK
    |
 help: Iterate over a copy of `odds`
-
-ℹ Unsafe fix
-21 21 |     colors.remove("red")
-22 22 | 
-23 23 | odds = {1, 3, 5}
-24    |-for num in odds:
-   24 |+for num in odds.copy():
-25 25 |     if num > 1:
-26 26 |         odds.add(num + 1)
-27 27 |
+21 |     colors.remove("red")
+22 | 
+23 | odds = {1, 3, 5}
+   - for num in odds:
+24 + for num in odds.copy():
+25 |     if num > 1:
+26 |         odds.add(num + 1)
+27 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap
index 785b6a2f91..cc429e4c9e 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap
@@ -12,20 +12,18 @@ PLR0202 [*] Class method defined without decorator
 11 |         cls.COLORS = args
    |
 help: Add @classmethod decorator
-
-ℹ Safe fix
-6  6  |     def __init__(self, color):
-7  7  |         self.color = color
-8  8  | 
-   9  |+    @classmethod
-9  10 |     def pick_colors(cls, *args):  # [no-classmethod-decorator]
-10 11 |         """classmethod to pick fruit colors"""
-11 12 |         cls.COLORS = args
-12 13 | 
-13    |-    pick_colors = classmethod(pick_colors)
-14 14 | 
-15 15 |     def pick_one_color():  # [no-staticmethod-decorator]
-16 16 |         """staticmethod to pick one fruit color"""
+6  |     def __init__(self, color):
+7  |         self.color = color
+8  | 
+9  +     @classmethod
+10 |     def pick_colors(cls, *args):  # [no-classmethod-decorator]
+11 |         """classmethod to pick fruit colors"""
+12 |         cls.COLORS = args
+13 | 
+   -     pick_colors = classmethod(pick_colors)
+14 | 
+15 |     def pick_one_color():  # [no-staticmethod-decorator]
+16 |         """staticmethod to pick one fruit color"""
 
 PLR0202 [*] Class method defined without decorator
   --> no_method_decorator.py:22:5
@@ -36,17 +34,15 @@ PLR0202 [*] Class method defined without decorator
 23 |         pass
    |
 help: Add @classmethod decorator
-
-ℹ Safe fix
-19 19 |     pick_one_color = staticmethod(pick_one_color)
-20 20 | 
-21 21 | class Class:
-   22 |+    @classmethod
-22 23 |     def class_method(cls):
-23 24 |         pass
-24 25 | 
-25    |-    class_method = classmethod(class_method);another_statement
-   26 |+    another_statement
-26 27 | 
-27 28 |     def static_method():
-28 29 |         pass
+19 |     pick_one_color = staticmethod(pick_one_color)
+20 | 
+21 | class Class:
+22 +     @classmethod
+23 |     def class_method(cls):
+24 |         pass
+25 | 
+   -     class_method = classmethod(class_method);another_statement
+26 +     another_statement
+27 | 
+28 |     def static_method():
+29 |         pass
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap
index 7634dbb586..513e451d32 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap
@@ -12,20 +12,18 @@ PLR0203 [*] Static method defined without decorator
 17 |         return choice(Fruit.COLORS)
    |
 help: Add @staticmethod decorator
-
-ℹ Safe fix
-12 12 | 
-13 13 |     pick_colors = classmethod(pick_colors)
-14 14 | 
-   15 |+    @staticmethod
-15 16 |     def pick_one_color():  # [no-staticmethod-decorator]
-16 17 |         """staticmethod to pick one fruit color"""
-17 18 |         return choice(Fruit.COLORS)
-18 19 | 
-19    |-    pick_one_color = staticmethod(pick_one_color)
-20 20 | 
-21 21 | class Class:
-22 22 |     def class_method(cls):
+12 | 
+13 |     pick_colors = classmethod(pick_colors)
+14 | 
+15 +     @staticmethod
+16 |     def pick_one_color():  # [no-staticmethod-decorator]
+17 |         """staticmethod to pick one fruit color"""
+18 |         return choice(Fruit.COLORS)
+19 | 
+   -     pick_one_color = staticmethod(pick_one_color)
+20 | 
+21 | class Class:
+22 |     def class_method(cls):
 
 PLR0203 [*] Static method defined without decorator
   --> no_method_decorator.py:27:5
@@ -37,14 +35,12 @@ PLR0203 [*] Static method defined without decorator
 28 |         pass
    |
 help: Add @staticmethod decorator
-
-ℹ Safe fix
-24 24 | 
-25 25 |     class_method = classmethod(class_method);another_statement
-26 26 | 
-   27 |+    @staticmethod
-27 28 |     def static_method():
-28 29 |         pass
-29 30 | 
-30    |-    static_method = staticmethod(static_method);
-   31 |+
+24 | 
+25 |     class_method = classmethod(class_method);another_statement
+26 | 
+27 +     @staticmethod
+28 |     def static_method():
+29 |         pass
+30 | 
+   -     static_method = staticmethod(static_method);
+31 +
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap
index d204598a9d..0359c54f4d 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap
@@ -12,16 +12,14 @@ PLR0402 [*] Use `from os import path` in lieu of alias
 11 | import foo.bar.foobar as foobar  # [consider-using-from-import]
    |
 help: Replace with `from os import path`
-
-ℹ Safe fix
-6  6  | import collections as collections  # [useless-import-alias]
-7  7  | from collections import OrderedDict as OrderedDict  # [useless-import-alias]
-8  8  | from collections import OrderedDict as o_dict
-9     |-import os.path as path  # [consider-using-from-import]
-   9  |+from os import path  # [consider-using-from-import]
-10 10 | import os.path as p
-11 11 | import foo.bar.foobar as foobar  # [consider-using-from-import]
-12 12 | import foo.bar.foobar as foobar, sys  # [consider-using-from-import]
+6  | import collections as collections  # [useless-import-alias]
+7  | from collections import OrderedDict as OrderedDict  # [useless-import-alias]
+8  | from collections import OrderedDict as o_dict
+   - import os.path as path  # [consider-using-from-import]
+9  + from os import path  # [consider-using-from-import]
+10 | import os.path as p
+11 | import foo.bar.foobar as foobar  # [consider-using-from-import]
+12 | import foo.bar.foobar as foobar, sys  # [consider-using-from-import]
 
 PLR0402 [*] Use `from foo.bar import foobar` in lieu of alias
   --> import_aliasing.py:11:8
@@ -34,16 +32,14 @@ PLR0402 [*] Use `from foo.bar import foobar` in lieu of alias
 13 | import os
    |
 help: Replace with `from foo.bar import foobar`
-
-ℹ Safe fix
-8  8  | from collections import OrderedDict as o_dict
-9  9  | import os.path as path  # [consider-using-from-import]
-10 10 | import os.path as p
-11    |-import foo.bar.foobar as foobar  # [consider-using-from-import]
-   11 |+from foo.bar import foobar  # [consider-using-from-import]
-12 12 | import foo.bar.foobar as foobar, sys  # [consider-using-from-import]
-13 13 | import os
-14 14 | import os as OS
+8  | from collections import OrderedDict as o_dict
+9  | import os.path as path  # [consider-using-from-import]
+10 | import os.path as p
+   - import foo.bar.foobar as foobar  # [consider-using-from-import]
+11 + from foo.bar import foobar  # [consider-using-from-import]
+12 | import foo.bar.foobar as foobar, sys  # [consider-using-from-import]
+13 | import os
+14 | import os as OS
 
 PLR0402 Use `from foo.bar import foobar` in lieu of alias
   --> import_aliasing.py:12:8
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1708_stop_iteration_return.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1708_stop_iteration_return.py.snap
new file mode 100644
index 0000000000..5773ff81ea
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1708_stop_iteration_return.py.snap
@@ -0,0 +1,109 @@
+---
+source: crates/ruff_linter/src/rules/pylint/mod.rs
+---
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:38:5
+   |
+36 |     yield 1
+37 |     yield 2
+38 |     raise StopIteration  # Should trigger
+   |     ^^^^^^^^^^^^^^^^^^^
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:44:5
+   |
+42 |     yield 1
+43 |     yield 2
+44 |     raise StopIteration("finished")  # Should trigger
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:50:5
+   |
+48 |     yield 1
+49 |     yield 2
+50 |     raise StopIteration(1 + 2)  # Should trigger
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:56:5
+   |
+54 |     yield 1
+55 |     yield 2
+56 |     raise StopIteration("async")  # Should trigger
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:62:9
+   |
+60 |     def inner_gen():
+61 |         yield 1
+62 |         raise StopIteration("inner")  # Should trigger
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+63 |
+64 |     yield from inner_gen()
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:71:13
+   |
+69 |         def generator_method(self):
+70 |             yield 1
+71 |             raise StopIteration("method")  # Should trigger
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+72 |
+73 |     return MyClass
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:81:9
+   |
+79 |         yield 1
+80 |         yield 2
+81 |         raise StopIteration("complex")  # Should trigger
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+82 |     except ValueError:
+83 |         yield 3
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:91:9
+   |
+89 |     yield 1
+90 |     if condition:
+91 |         raise StopIteration("conditional")  # Should trigger
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+92 |     yield 2
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+  --> stop_iteration_return.py:98:5
+   |
+96 | def generator_with_bare_stop_iteration():
+97 |     yield 1
+98 |     raise StopIteration  # Should trigger (no arguments)
+   |     ^^^^^^^^^^^^^^^^^^^
+   |
+help: Use `return` instead
+
+PLR1708 Explicit `raise StopIteration` in generator
+   --> stop_iteration_return.py:105:13
+    |
+103 |         yield i
+104 |         if i == 3:
+105 |             raise StopIteration("loop")  # Should trigger
+    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |
+help: Use `return` instead
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap
index f43de224b9..adc2d40651 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap
@@ -10,15 +10,13 @@ PLR1711 [*] Useless `return` statement at end of function
   |     ^^^^^^^^^^^
   |
 help: Remove useless `return` statement
-
-ℹ Safe fix
-3 3 | 
-4 4 | def print_python_version():
-5 5 |     print(sys.version)
-6   |-    return None  # [useless-return]
-7 6 | 
-8 7 | 
-9 8 | def print_python_version():
+3 | 
+4 | def print_python_version():
+5 |     print(sys.version)
+  -     return None  # [useless-return]
+6 | 
+7 | 
+8 | def print_python_version():
 
 PLR1711 [*] Useless `return` statement at end of function
   --> useless_return.py:11:5
@@ -29,15 +27,13 @@ PLR1711 [*] Useless `return` statement at end of function
    |     ^^^^^^^^^^^
    |
 help: Remove useless `return` statement
-
-ℹ Safe fix
-8  8  | 
-9  9  | def print_python_version():
-10 10 |     print(sys.version)
-11    |-    return None  # [useless-return]
-12 11 | 
-13 12 | 
-14 13 | def print_python_version():
+8  | 
+9  | def print_python_version():
+10 |     print(sys.version)
+   -     return None  # [useless-return]
+11 | 
+12 | 
+13 | def print_python_version():
 
 PLR1711 [*] Useless `return` statement at end of function
   --> useless_return.py:16:5
@@ -48,15 +44,13 @@ PLR1711 [*] Useless `return` statement at end of function
    |     ^^^^^^^^^^^
    |
 help: Remove useless `return` statement
-
-ℹ Safe fix
-13 13 | 
-14 14 | def print_python_version():
-15 15 |     print(sys.version)
-16    |-    return None  # [useless-return]
-17 16 | 
-18 17 | 
-19 18 | class SomeClass:
+13 | 
+14 | def print_python_version():
+15 |     print(sys.version)
+   -     return None  # [useless-return]
+16 | 
+17 | 
+18 | class SomeClass:
 
 PLR1711 [*] Useless `return` statement at end of function
   --> useless_return.py:22:9
@@ -67,15 +61,13 @@ PLR1711 [*] Useless `return` statement at end of function
    |         ^^^^^^^^^^^
    |
 help: Remove useless `return` statement
-
-ℹ Safe fix
-19 19 | class SomeClass:
-20 20 |     def print_python_version(self):
-21 21 |         print(sys.version)
-22    |-        return None  # [useless-return]
-23 22 | 
-24 23 | 
-25 24 | def print_python_version():
+19 | class SomeClass:
+20 |     def print_python_version(self):
+21 |         print(sys.version)
+   -         return None  # [useless-return]
+22 | 
+23 | 
+24 | def print_python_version():
 
 PLR1711 [*] Useless `return` statement at end of function
   --> useless_return.py:50:5
@@ -86,15 +78,13 @@ PLR1711 [*] Useless `return` statement at end of function
    |     ^^^^^^^^^^^
    |
 help: Remove useless `return` statement
-
-ℹ Safe fix
-47 47 | def print_python_version():
-48 48 |     """This function returns None."""
-49 49 |     print(sys.version)
-50    |-    return None  # [useless-return]
-51 50 | 
-52 51 | 
-53 52 | class BaseCache:
+47 | def print_python_version():
+48 |     """This function returns None."""
+49 |     print(sys.version)
+   -     return None  # [useless-return]
+50 | 
+51 | 
+52 | class BaseCache:
 
 PLR1711 [*] Useless `return` statement at end of function
   --> useless_return.py:60:9
@@ -105,9 +95,7 @@ PLR1711 [*] Useless `return` statement at end of function
    |         ^^^^^^^^^^^
    |
 help: Remove useless `return` statement
-
-ℹ Safe fix
-57 57 | 
-58 58 |     def get(self, key: str) -> None:
-59 59 |         print(f"{key} not found")
-60    |-        return None
+57 | 
+58 |     def get(self, key: str) -> None:
+59 |         print(f"{key} not found")
+   -         return None
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap
index 725efe59ed..59b3f5b3ea 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap
@@ -11,14 +11,13 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`.
 4 | foo != "a" and foo != "b"
   |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-1 1 | # Errors.
-2   |-foo == "a" or foo == "b"
-  2 |+foo in {"a", "b"}
-3 3 | 
-4 4 | foo != "a" and foo != "b"
-5 5 | 
+1 | # Errors.
+  - foo == "a" or foo == "b"
+2 + foo in {"a", "b"}
+3 | 
+4 | foo != "a" and foo != "b"
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b"}`.
  --> repeated_equality_comparison.py:4:1
@@ -31,16 +30,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b"}`.
 6 | foo == "a" or foo == "b" or foo == "c"
   |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-1 1 | # Errors.
-2 2 | foo == "a" or foo == "b"
-3 3 | 
-4   |-foo != "a" and foo != "b"
-  4 |+foo not in {"a", "b"}
-5 5 | 
-6 6 | foo == "a" or foo == "b" or foo == "c"
-7 7 | 
+1 | # Errors.
+2 | foo == "a" or foo == "b"
+3 | 
+  - foo != "a" and foo != "b"
+4 + foo not in {"a", "b"}
+5 | 
+6 | foo == "a" or foo == "b" or foo == "c"
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
  --> repeated_equality_comparison.py:6:1
@@ -53,16 +51,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
 8 | foo != "a" and foo != "b" and foo != "c"
   |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | foo != "a" and foo != "b"
-5 5 | 
-6   |-foo == "a" or foo == "b" or foo == "c"
-  6 |+foo in {"a", "b", "c"}
-7 7 | 
-8 8 | foo != "a" and foo != "b" and foo != "c"
-9 9 | 
+3 | 
+4 | foo != "a" and foo != "b"
+5 | 
+  - foo == "a" or foo == "b" or foo == "c"
+6 + foo in {"a", "b", "c"}
+7 | 
+8 | foo != "a" and foo != "b" and foo != "c"
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`.
   --> repeated_equality_comparison.py:8:1
@@ -75,16 +72,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`.
 10 | foo == a or foo == "b" or foo == 3  # Mixed types.
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | foo == "a" or foo == "b" or foo == "c"
-7 7 | 
-8   |-foo != "a" and foo != "b" and foo != "c"
-  8 |+foo not in {"a", "b", "c"}
-9 9 | 
-10 10 | foo == a or foo == "b" or foo == 3  # Mixed types.
-11 11 | 
+5  | 
+6  | foo == "a" or foo == "b" or foo == "c"
+7  | 
+   - foo != "a" and foo != "b" and foo != "c"
+8  + foo not in {"a", "b", "c"}
+9  | 
+10 | foo == a or foo == "b" or foo == 3  # Mixed types.
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in (a, "b", 3)`. Use a `set` if the elements are hashable.
   --> repeated_equality_comparison.py:10:1
@@ -97,16 +93,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in (a, "b", 3)`. Use a `
 12 | "a" == foo or "b" == foo or "c" == foo
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | foo != "a" and foo != "b" and foo != "c"
-9  9  | 
-10    |-foo == a or foo == "b" or foo == 3  # Mixed types.
-   10 |+foo in (a, "b", 3)  # Mixed types.
-11 11 | 
-12 12 | "a" == foo or "b" == foo or "c" == foo
-13 13 | 
+7  | 
+8  | foo != "a" and foo != "b" and foo != "c"
+9  | 
+   - foo == a or foo == "b" or foo == 3  # Mixed types.
+10 + foo in (a, "b", 3)  # Mixed types.
+11 | 
+12 | "a" == foo or "b" == foo or "c" == foo
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
   --> repeated_equality_comparison.py:12:1
@@ -119,16 +114,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
 14 | "a" != foo and "b" != foo and "c" != foo
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | foo == a or foo == "b" or foo == 3  # Mixed types.
-11 11 | 
-12    |-"a" == foo or "b" == foo or "c" == foo
-   12 |+foo in {"a", "b", "c"}
-13 13 | 
-14 14 | "a" != foo and "b" != foo and "c" != foo
-15 15 | 
+9  | 
+10 | foo == a or foo == "b" or foo == 3  # Mixed types.
+11 | 
+   - "a" == foo or "b" == foo or "c" == foo
+12 + foo in {"a", "b", "c"}
+13 | 
+14 | "a" != foo and "b" != foo and "c" != foo
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`.
   --> repeated_equality_comparison.py:14:1
@@ -141,16 +135,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`.
 16 | "a" == foo or foo == "b" or "c" == foo
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | "a" == foo or "b" == foo or "c" == foo
-13 13 | 
-14    |-"a" != foo and "b" != foo and "c" != foo
-   14 |+foo not in {"a", "b", "c"}
-15 15 | 
-16 16 | "a" == foo or foo == "b" or "c" == foo
-17 17 | 
+11 | 
+12 | "a" == foo or "b" == foo or "c" == foo
+13 | 
+   - "a" != foo and "b" != foo and "c" != foo
+14 + foo not in {"a", "b", "c"}
+15 | 
+16 | "a" == foo or foo == "b" or "c" == foo
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
   --> repeated_equality_comparison.py:16:1
@@ -163,16 +156,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
 18 | foo == bar or baz == foo or qux == foo
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | "a" != foo and "b" != foo and "c" != foo
-15 15 | 
-16    |-"a" == foo or foo == "b" or "c" == foo
-   16 |+foo in {"a", "b", "c"}
-17 17 | 
-18 18 | foo == bar or baz == foo or qux == foo
-19 19 | 
+13 | 
+14 | "a" != foo and "b" != foo and "c" != foo
+15 | 
+   - "a" == foo or foo == "b" or "c" == foo
+16 + foo in {"a", "b", "c"}
+17 | 
+18 | foo == bar or baz == foo or qux == foo
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in (bar, baz, qux)`. Use a `set` if the elements are hashable.
   --> repeated_equality_comparison.py:18:1
@@ -185,16 +177,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in (bar, baz, qux)`. Use
 20 | foo == "a" or "b" == foo or foo == "c"
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | "a" == foo or foo == "b" or "c" == foo
-17 17 | 
-18    |-foo == bar or baz == foo or qux == foo
-   18 |+foo in (bar, baz, qux)
-19 19 | 
-20 20 | foo == "a" or "b" == foo or foo == "c"
-21 21 | 
+15 | 
+16 | "a" == foo or foo == "b" or "c" == foo
+17 | 
+   - foo == bar or baz == foo or qux == foo
+18 + foo in (bar, baz, qux)
+19 | 
+20 | foo == "a" or "b" == foo or foo == "c"
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
   --> repeated_equality_comparison.py:20:1
@@ -207,16 +198,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`.
 22 | foo != "a" and "b" != foo and foo != "c"
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | foo == bar or baz == foo or qux == foo
-19 19 | 
-20    |-foo == "a" or "b" == foo or foo == "c"
-   20 |+foo in {"a", "b", "c"}
-21 21 | 
-22 22 | foo != "a" and "b" != foo and foo != "c"
-23 23 | 
+17 | 
+18 | foo == bar or baz == foo or qux == foo
+19 | 
+   - foo == "a" or "b" == foo or foo == "c"
+20 + foo in {"a", "b", "c"}
+21 | 
+22 | foo != "a" and "b" != foo and foo != "c"
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`.
   --> repeated_equality_comparison.py:22:1
@@ -229,16 +219,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`.
 24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | foo == "a" or "b" == foo or foo == "c"
-21 21 | 
-22    |-foo != "a" and "b" != foo and foo != "c"
-   22 |+foo not in {"a", "b", "c"}
-23 23 | 
-24 24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
-25 25 | 
+19 | 
+20 | foo == "a" or "b" == foo or foo == "c"
+21 | 
+   - foo != "a" and "b" != foo and foo != "c"
+22 + foo not in {"a", "b", "c"}
+23 | 
+24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`.
   --> repeated_equality_comparison.py:24:1
@@ -251,16 +240,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`.
 26 | foo.bar == "a" or foo.bar == "b"  # Attributes.
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | foo != "a" and "b" != foo and foo != "c"
-23 23 | 
-24    |-foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
-   24 |+foo in {"a", "b"} or "c" == bar or "d" == bar  # Multiple targets
-25 25 | 
-26 26 | foo.bar == "a" or foo.bar == "b"  # Attributes.
-27 27 | 
+21 | 
+22 | foo != "a" and "b" != foo and foo != "c"
+23 | 
+   - foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
+24 + foo in {"a", "b"} or "c" == bar or "d" == bar  # Multiple targets
+25 | 
+26 | foo.bar == "a" or foo.bar == "b"  # Attributes.
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`.
   --> repeated_equality_comparison.py:24:1
@@ -273,16 +261,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`.
 26 | foo.bar == "a" or foo.bar == "b"  # Attributes.
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | foo != "a" and "b" != foo and foo != "c"
-23 23 | 
-24    |-foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
-   24 |+foo == "a" or foo == "b" or bar in {"c", "d"}  # Multiple targets
-25 25 | 
-26 26 | foo.bar == "a" or foo.bar == "b"  # Attributes.
-27 27 | 
+21 | 
+22 | foo != "a" and "b" != foo and foo != "c"
+23 | 
+   - foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
+24 + foo == "a" or foo == "b" or bar in {"c", "d"}  # Multiple targets
+25 | 
+26 | foo.bar == "a" or foo.bar == "b"  # Attributes.
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo.bar in {"a", "b"}`.
   --> repeated_equality_comparison.py:26:1
@@ -295,16 +282,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo.bar in {"a", "b"}`.
 28 | # OK
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
-25 25 | 
-26    |-foo.bar == "a" or foo.bar == "b"  # Attributes.
-   26 |+foo.bar in {"a", "b"}  # Attributes.
-27 27 | 
-28 28 | # OK
-29 29 | foo == "a" and foo == "b" and foo == "c"  # `and` mixed with `==`.
+23 | 
+24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
+25 | 
+   - foo.bar == "a" or foo.bar == "b"  # Attributes.
+26 + foo.bar in {"a", "b"}  # Attributes.
+27 | 
+28 | # OK
+29 | foo == "a" and foo == "b" and foo == "c"  # `and` mixed with `==`.
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`.
   --> repeated_equality_comparison.py:61:16
@@ -317,16 +303,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`.
 63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-58 58 | 
-59 59 | foo == "a" or "c" == bar or foo == "b" or "d" == bar  # Multiple targets
-60 60 | 
-61    |-foo == "a" or ("c" == bar or "d" == bar) or foo == "b"  # Multiple targets
-   61 |+foo == "a" or (bar in {"c", "d"}) or foo == "b"  # Multiple targets
-62 62 | 
-63 63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
-64 64 | 
+58 | 
+59 | foo == "a" or "c" == bar or foo == "b" or "d" == bar  # Multiple targets
+60 | 
+   - foo == "a" or ("c" == bar or "d" == bar) or foo == "b"  # Multiple targets
+61 + foo == "a" or (bar in {"c", "d"}) or foo == "b"  # Multiple targets
+62 | 
+63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`.
   --> repeated_equality_comparison.py:63:1
@@ -339,16 +324,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`.
 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-60 60 | 
-61 61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b"  # Multiple targets
-62 62 | 
-63    |-foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
-   63 |+foo in {"a", "b"} or "c" != bar and "d" != bar  # Multiple targets
-64 64 | 
-65 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
-66 66 | 
+60 | 
+61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b"  # Multiple targets
+62 | 
+   - foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
+63 + foo in {"a", "b"} or "c" != bar and "d" != bar  # Multiple targets
+64 | 
+65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`.
   --> repeated_equality_comparison.py:63:29
@@ -361,16 +345,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`.
 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-60 60 | 
-61 61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b"  # Multiple targets
-62 62 | 
-63    |-foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
-   63 |+foo == "a" or foo == "b" or bar not in {"c", "d"}  # Multiple targets
-64 64 | 
-65 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
-66 66 | 
+60 | 
+61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b"  # Multiple targets
+62 | 
+   - foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
+63 + foo == "a" or foo == "b" or bar not in {"c", "d"}  # Multiple targets
+64 | 
+65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`.
   --> repeated_equality_comparison.py:65:16
@@ -383,16 +366,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`.
 67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar  # Multiple targets
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-62 62 | 
-63 63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
-64 64 | 
-65    |-foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
-   65 |+foo == "a" or (bar not in {"c", "d"}) or foo == "b"  # Multiple targets
-66 66 | 
-67 67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar  # Multiple targets
-68 68 | 
+62 | 
+63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar  # Multiple targets
+64 | 
+   - foo == "a" or ("c" != bar and "d" != bar) or foo == "b"  # Multiple targets
+65 + foo == "a" or (bar not in {"c", "d"}) or foo == "b"  # Multiple targets
+66 | 
+67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar  # Multiple targets
+68 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {1, True}`.
   --> repeated_equality_comparison.py:69:1
@@ -405,16 +387,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {1, True}`.
 71 | foo == 1 or foo == 1.0 # Different types, same hashed value
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar  # Multiple targets
-68 68 | 
-69    |-foo == 1 or foo == True # Different types, same hashed value
-   69 |+foo in {1, True} # Different types, same hashed value
-70 70 | 
-71 71 | foo == 1 or foo == 1.0 # Different types, same hashed value
-72 72 | 
+66 | 
+67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar  # Multiple targets
+68 | 
+   - foo == 1 or foo == True # Different types, same hashed value
+69 + foo in {1, True} # Different types, same hashed value
+70 | 
+71 | foo == 1 or foo == 1.0 # Different types, same hashed value
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {1, 1.0}`.
   --> repeated_equality_comparison.py:71:1
@@ -427,16 +408,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {1, 1.0}`.
 73 | foo == False or foo == 0 # Different types, same hashed value
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-68 68 | 
-69 69 | foo == 1 or foo == True # Different types, same hashed value
-70 70 | 
-71    |-foo == 1 or foo == 1.0 # Different types, same hashed value
-   71 |+foo in {1, 1.0} # Different types, same hashed value
-72 72 | 
-73 73 | foo == False or foo == 0 # Different types, same hashed value
-74 74 | 
+68 | 
+69 | foo == 1 or foo == True # Different types, same hashed value
+70 | 
+   - foo == 1 or foo == 1.0 # Different types, same hashed value
+71 + foo in {1, 1.0} # Different types, same hashed value
+72 | 
+73 | foo == False or foo == 0 # Different types, same hashed value
+74 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {False, 0}`.
   --> repeated_equality_comparison.py:73:1
@@ -449,15 +429,14 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {False, 0}`.
 75 | foo == 0.0 or foo == 0j # Different types, same hashed value
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-70 70 | 
-71 71 | foo == 1 or foo == 1.0 # Different types, same hashed value
-72 72 | 
-73    |-foo == False or foo == 0 # Different types, same hashed value
-   73 |+foo in {False, 0} # Different types, same hashed value
-74 74 | 
-75 75 | foo == 0.0 or foo == 0j # Different types, same hashed value
+70 | 
+71 | foo == 1 or foo == 1.0 # Different types, same hashed value
+72 | 
+   - foo == False or foo == 0 # Different types, same hashed value
+73 + foo in {False, 0} # Different types, same hashed value
+74 | 
+75 | foo == 0.0 or foo == 0j # Different types, same hashed value
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1714 [*] Consider merging multiple comparisons: `foo in {0.0, 0j}`.
   --> repeated_equality_comparison.py:75:1
@@ -468,10 +447,9 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {0.0, 0j}`.
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Merge multiple comparisons
-
-ℹ Unsafe fix
-72 72 | 
-73 73 | foo == False or foo == 0 # Different types, same hashed value
-74 74 | 
-75    |-foo == 0.0 or foo == 0j # Different types, same hashed value
-   75 |+foo in {0.0, 0j} # Different types, same hashed value
+72 | 
+73 | foo == False or foo == 0 # Different types, same hashed value
+74 | 
+   - foo == 0.0 or foo == 0j # Different types, same hashed value
+75 + foo in {0.0, 0j} # Different types, same hashed value
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap
index faf07307cc..857e364771 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap
@@ -11,16 +11,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 9 |     pass
   |
 help: Use a single compare expression
-
-ℹ Safe fix
-5 5 | a = int(input())
-6 6 | b = int(input())
-7 7 | c = int(input())
-8   |-if a < b and b < c:  # [boolean-chained-comparison]
-  8 |+if a < b < c:  # [boolean-chained-comparison]
-9 9 |     pass
-10 10 | 
-11 11 | a = int(input())
+5  | a = int(input())
+6  | b = int(input())
+7  | c = int(input())
+   - if a < b and b < c:  # [boolean-chained-comparison]
+8  + if a < b < c:  # [boolean-chained-comparison]
+9  |     pass
+10 | 
+11 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:14:4
@@ -32,16 +30,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 15 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-11 11 | a = int(input())
-12 12 | b = int(input())
-13 13 | c = int(input())
-14    |-if a < b and b <= c:  # [boolean-chained-comparison]
-   14 |+if a < b <= c:  # [boolean-chained-comparison]
-15 15 |     pass
-16 16 | 
-17 17 | a = int(input())
+11 | a = int(input())
+12 | b = int(input())
+13 | c = int(input())
+   - if a < b and b <= c:  # [boolean-chained-comparison]
+14 + if a < b <= c:  # [boolean-chained-comparison]
+15 |     pass
+16 | 
+17 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:20:4
@@ -53,16 +49,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 21 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-17 17 | a = int(input())
-18 18 | b = int(input())
-19 19 | c = int(input())
-20    |-if a <= b and b < c:  # [boolean-chained-comparison]
-   20 |+if a <= b < c:  # [boolean-chained-comparison]
-21 21 |     pass
-22 22 | 
-23 23 | a = int(input())
+17 | a = int(input())
+18 | b = int(input())
+19 | c = int(input())
+   - if a <= b and b < c:  # [boolean-chained-comparison]
+20 + if a <= b < c:  # [boolean-chained-comparison]
+21 |     pass
+22 | 
+23 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:26:4
@@ -74,16 +68,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 27 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-23 23 | a = int(input())
-24 24 | b = int(input())
-25 25 | c = int(input())
-26    |-if a <= b and b <= c:  # [boolean-chained-comparison]
-   26 |+if a <= b <= c:  # [boolean-chained-comparison]
-27 27 |     pass
-28 28 | 
-29 29 | # ---------------------
+23 | a = int(input())
+24 | b = int(input())
+25 | c = int(input())
+   - if a <= b and b <= c:  # [boolean-chained-comparison]
+26 + if a <= b <= c:  # [boolean-chained-comparison]
+27 |     pass
+28 | 
+29 | # ---------------------
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:36:4
@@ -95,16 +87,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 37 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-33 33 | a = int(input())
-34 34 | b = int(input())
-35 35 | c = int(input())
-36    |-if a > b and b > c:  # [boolean-chained-comparison]
-   36 |+if a > b > c:  # [boolean-chained-comparison]
-37 37 |     pass
-38 38 | 
-39 39 | a = int(input())
+33 | a = int(input())
+34 | b = int(input())
+35 | c = int(input())
+   - if a > b and b > c:  # [boolean-chained-comparison]
+36 + if a > b > c:  # [boolean-chained-comparison]
+37 |     pass
+38 | 
+39 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:42:4
@@ -116,16 +106,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 43 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-39 39 | a = int(input())
-40 40 | b = int(input())
-41 41 | c = int(input())
-42    |-if a >= b and b > c:  # [boolean-chained-comparison]
-   42 |+if a >= b > c:  # [boolean-chained-comparison]
-43 43 |     pass
-44 44 | 
-45 45 | a = int(input())
+39 | a = int(input())
+40 | b = int(input())
+41 | c = int(input())
+   - if a >= b and b > c:  # [boolean-chained-comparison]
+42 + if a >= b > c:  # [boolean-chained-comparison]
+43 |     pass
+44 | 
+45 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:48:4
@@ -137,16 +125,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 49 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-45 45 | a = int(input())
-46 46 | b = int(input())
-47 47 | c = int(input())
-48    |-if a > b and b >= c:  # [boolean-chained-comparison]
-   48 |+if a > b >= c:  # [boolean-chained-comparison]
-49 49 |     pass
-50 50 | 
-51 51 | a = int(input())
+45 | a = int(input())
+46 | b = int(input())
+47 | c = int(input())
+   - if a > b and b >= c:  # [boolean-chained-comparison]
+48 + if a > b >= c:  # [boolean-chained-comparison]
+49 |     pass
+50 | 
+51 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:54:4
@@ -158,16 +144,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 55 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-51 51 | a = int(input())
-52 52 | b = int(input())
-53 53 | c = int(input())
-54    |-if a >= b and b >= c:  # [boolean-chained-comparison]
-   54 |+if a >= b >= c:  # [boolean-chained-comparison]
-55 55 |     pass
-56 56 | 
-57 57 | # -----------------------
+51 | a = int(input())
+52 | b = int(input())
+53 | c = int(input())
+   - if a >= b and b >= c:  # [boolean-chained-comparison]
+54 + if a >= b >= c:  # [boolean-chained-comparison]
+55 |     pass
+56 | 
+57 | # -----------------------
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:65:4
@@ -179,16 +163,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 66 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-62 62 | b = int(input())
-63 63 | c = int(input())
-64 64 | d = int(input())
-65    |-if a < b and b < c and c < d:  # [boolean-chained-comparison]
-   65 |+if a < b < c and c < d:  # [boolean-chained-comparison]
-66 66 |     pass
-67 67 | 
-68 68 | a = int(input())
+62 | b = int(input())
+63 | c = int(input())
+64 | d = int(input())
+   - if a < b and b < c and c < d:  # [boolean-chained-comparison]
+65 + if a < b < c and c < d:  # [boolean-chained-comparison]
+66 |     pass
+67 | 
+68 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:65:14
@@ -200,16 +182,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 66 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-62 62 | b = int(input())
-63 63 | c = int(input())
-64 64 | d = int(input())
-65    |-if a < b and b < c and c < d:  # [boolean-chained-comparison]
-   65 |+if a < b and b < c < d:  # [boolean-chained-comparison]
-66 66 |     pass
-67 67 | 
-68 68 | a = int(input())
+62 | b = int(input())
+63 | c = int(input())
+64 | d = int(input())
+   - if a < b and b < c and c < d:  # [boolean-chained-comparison]
+65 + if a < b and b < c < d:  # [boolean-chained-comparison]
+66 |     pass
+67 | 
+68 | a = int(input())
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:73:4
@@ -221,16 +201,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 74 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-70 70 | c = int(input())
-71 71 | d = int(input())
-72 72 | e = int(input())
-73    |-if a < b and b < c and c < d and d < e:  # [boolean-chained-comparison]
-   73 |+if a < b < c and c < d and d < e:  # [boolean-chained-comparison]
-74 74 |     pass
-75 75 | 
-76 76 | # ------------
+70 | c = int(input())
+71 | d = int(input())
+72 | e = int(input())
+   - if a < b and b < c and c < d and d < e:  # [boolean-chained-comparison]
+73 + if a < b < c and c < d and d < e:  # [boolean-chained-comparison]
+74 |     pass
+75 | 
+76 | # ------------
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:73:14
@@ -242,16 +220,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 74 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-70 70 | c = int(input())
-71 71 | d = int(input())
-72 72 | e = int(input())
-73    |-if a < b and b < c and c < d and d < e:  # [boolean-chained-comparison]
-   73 |+if a < b and b < c < d and d < e:  # [boolean-chained-comparison]
-74 74 |     pass
-75 75 | 
-76 76 | # ------------
+70 | c = int(input())
+71 | d = int(input())
+72 | e = int(input())
+   - if a < b and b < c and c < d and d < e:  # [boolean-chained-comparison]
+73 + if a < b and b < c < d and d < e:  # [boolean-chained-comparison]
+74 |     pass
+75 | 
+76 | # ------------
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
   --> boolean_chained_comparison.py:73:24
@@ -263,16 +239,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 74 |     pass
    |
 help: Use a single compare expression
-
-ℹ Safe fix
-70 70 | c = int(input())
-71 71 | d = int(input())
-72 72 | e = int(input())
-73    |-if a < b and b < c and c < d and d < e:  # [boolean-chained-comparison]
-   73 |+if a < b and b < c and c < d < e:  # [boolean-chained-comparison]
-74 74 |     pass
-75 75 | 
-76 76 | # ------------
+70 | c = int(input())
+71 | d = int(input())
+72 | e = int(input())
+   - if a < b and b < c and c < d and d < e:  # [boolean-chained-comparison]
+73 + if a < b and b < c and c < d < e:  # [boolean-chained-comparison]
+74 |     pass
+75 | 
+76 | # ------------
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:123:2
@@ -284,16 +258,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 125 | ((a < b) and b < c)
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-120 120 |     pass
-121 121 | 
-122 122 | # fixes will balance parentheses
-123     |-(a < b) and b < c
-    123 |+(a < b < c)
-124 124 | a < b and (b < c)
-125 125 | ((a < b) and b < c)
-126 126 | (a < b) and (b < c)
+120 |     pass
+121 | 
+122 | # fixes will balance parentheses
+    - (a < b) and b < c
+123 + (a < b < c)
+124 | a < b and (b < c)
+125 | ((a < b) and b < c)
+126 | (a < b) and (b < c)
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:124:1
@@ -306,16 +278,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 126 | (a < b) and (b < c)
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-121 121 | 
-122 122 | # fixes will balance parentheses
-123 123 | (a < b) and b < c
-124     |-a < b and (b < c)
-    124 |+(a < b < c)
-125 125 | ((a < b) and b < c)
-126 126 | (a < b) and (b < c)
-127 127 | (((a < b))) and (b < c)
+121 | 
+122 | # fixes will balance parentheses
+123 | (a < b) and b < c
+    - a < b and (b < c)
+124 + (a < b < c)
+125 | ((a < b) and b < c)
+126 | (a < b) and (b < c)
+127 | (((a < b))) and (b < c)
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:125:3
@@ -328,16 +298,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 127 | (((a < b))) and (b < c)
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-122 122 | # fixes will balance parentheses
-123 123 | (a < b) and b < c
-124 124 | a < b and (b < c)
-125     |-((a < b) and b < c)
-    125 |+((a < b < c))
-126 126 | (a < b) and (b < c)
-127 127 | (((a < b))) and (b < c)
-128 128 | 
+122 | # fixes will balance parentheses
+123 | (a < b) and b < c
+124 | a < b and (b < c)
+    - ((a < b) and b < c)
+125 + ((a < b < c))
+126 | (a < b) and (b < c)
+127 | (((a < b))) and (b < c)
+128 | 
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:126:2
@@ -349,16 +317,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 127 | (((a < b))) and (b < c)
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-123 123 | (a < b) and b < c
-124 124 | a < b and (b < c)
-125 125 | ((a < b) and b < c)
-126     |-(a < b) and (b < c)
-    126 |+(a < b < c)
-127 127 | (((a < b))) and (b < c)
-128 128 | 
-129 129 | (a<b) and b<c and ((c<d))
+123 | (a < b) and b < c
+124 | a < b and (b < c)
+125 | ((a < b) and b < c)
+    - (a < b) and (b < c)
+126 + (a < b < c)
+127 | (((a < b))) and (b < c)
+128 | 
+129 | (a<b) and b<c and ((c<d))
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:127:4
@@ -371,16 +337,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 129 | (a<b) and b<c and ((c<d))
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-124 124 | a < b and (b < c)
-125 125 | ((a < b) and b < c)
-126 126 | (a < b) and (b < c)
-127     |-(((a < b))) and (b < c)
-    127 |+(((a < b < c)))
-128 128 | 
-129 129 | (a<b) and b<c and ((c<d))
-130 130 | 
+124 | a < b and (b < c)
+125 | ((a < b) and b < c)
+126 | (a < b) and (b < c)
+    - (((a < b))) and (b < c)
+127 + (((a < b < c)))
+128 | 
+129 | (a<b) and b<c and ((c<d))
+130 | 
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:129:2
@@ -393,16 +357,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 131 | # should error and fix
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-126 126 | (a < b) and (b < c)
-127 127 | (((a < b))) and (b < c)
-128 128 | 
-129     |-(a<b) and b<c and ((c<d))
-    129 |+(a<b<c) and ((c<d))
-130 130 | 
-131 131 | # should error and fix
-132 132 | a<b<c and c<d
+126 | (a < b) and (b < c)
+127 | (((a < b))) and (b < c)
+128 | 
+    - (a<b) and b<c and ((c<d))
+129 + (a<b<c) and ((c<d))
+130 | 
+131 | # should error and fix
+132 | a<b<c and c<d
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:129:11
@@ -415,16 +377,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 131 | # should error and fix
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-126 126 | (a < b) and (b < c)
-127 127 | (((a < b))) and (b < c)
-128 128 | 
-129     |-(a<b) and b<c and ((c<d))
-    129 |+(a<b) and ((b<c<d))
-130 130 | 
-131 131 | # should error and fix
-132 132 | a<b<c and c<d
+126 | (a < b) and (b < c)
+127 | (((a < b))) and (b < c)
+128 | 
+    - (a<b) and b<c and ((c<d))
+129 + (a<b) and ((b<c<d))
+130 | 
+131 | # should error and fix
+132 | a<b<c and c<d
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:132:1
@@ -436,16 +396,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 134 | # more involved examples (all should error and fix)
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-129 129 | (a<b) and b<c and ((c<d))
-130 130 | 
-131 131 | # should error and fix
-132     |-a<b<c and c<d
-    132 |+a<b<c<d
-133 133 | 
-134 134 | # more involved examples (all should error and fix)
-135 135 | a < ( # sneaky comment
+129 | (a<b) and b<c and ((c<d))
+130 | 
+131 | # should error and fix
+    - a<b<c and c<d
+132 + a<b<c<d
+133 | 
+134 | # more involved examples (all should error and fix)
+135 | a < ( # sneaky comment
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:135:1
@@ -460,16 +418,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 140 |   (
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-135 135 | a < ( # sneaky comment
-136 136 | 	b
-137 137 |   # more comments 
-138     |-) and b < c
-    138 |+) < c
-139 139 | 
-140 140 | (
-141 141 |     a
+135 | a < ( # sneaky comment
+136 | 	b
+137 |   # more comments 
+    - ) and b < c
+138 + ) < c
+139 | 
+140 | (
+141 |     a
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:141:5
@@ -484,21 +440,19 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
 146 |   )
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-138 138 | ) and b < c
-139 139 | 
-140 140 | (
-141     |-    a
-    141 |+    ((a
-142 142 |     <b
-143 143 |     # hmmm...
-144     |-    <c
-145     |-    and ((c<d))
-    144 |+    <c<d))
-146 145 | )
-147 146 | 
-148 147 | a < (b) and (((b)) < c)
+138 | ) and b < c
+139 | 
+140 | (
+    -     a
+141 +     ((a
+142 |     <b
+143 |     # hmmm...
+    -     <c
+    -     and ((c<d))
+144 +     <c<d))
+145 | )
+146 | 
+147 | a < (b) and (((b)) < c)
 
 PLR1716 [*] Contains chained boolean comparison that can be simplified
    --> boolean_chained_comparison.py:148:1
@@ -509,10 +463,8 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified
     | ^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Use a single compare expression
-
-ℹ Safe fix
-145 145 |     and ((c<d))
-146 146 | )
-147 147 | 
-148     |-a < (b) and (((b)) < c)
-    148 |+(a < (b) < c)
+145 |     and ((c<d))
+146 | )
+147 | 
+    - a < (b) and (((b)) < c)
+148 + (a < (b) < c)
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_0.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_0.py.snap
index 9751e96519..cb5c9719df 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_0.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_0.py.snap
@@ -9,14 +9,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 2 | quit(0)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1   |-exit(0)
-  1 |+import sys
-  2 |+sys.exit(0)
-2 3 | quit(0)
-3 4 | 
-4 5 | 
+  - exit(0)
+1 + import sys
+2 + sys.exit(0)
+3 | quit(0)
+4 | 
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_0.py:2:1
@@ -26,15 +25,14 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | exit(0)
-2   |-quit(0)
-  3 |+sys.exit(0)
-3 4 | 
-4 5 | 
-5 6 | def main():
+1 + import sys
+2 | exit(0)
+  - quit(0)
+3 + sys.exit(0)
+4 | 
+5 | 
+6 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `exit`
  --> sys_exit_alias_0.py:6:5
@@ -45,17 +43,16 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 7 |     quit(2)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | exit(0)
-2 3 | quit(0)
-3 4 | 
-4 5 | 
-5 6 | def main():
-6   |-    exit(2)
-  7 |+    sys.exit(2)
-7 8 |     quit(2)
+1 + import sys
+2 | exit(0)
+3 | quit(0)
+4 | 
+5 | 
+6 | def main():
+  -     exit(2)
+7 +     sys.exit(2)
+8 |     quit(2)
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_0.py:7:5
@@ -66,14 +63,13 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   |     ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | exit(0)
-2 3 | quit(0)
-3 4 | 
-4 5 | 
-5 6 | def main():
-6 7 |     exit(2)
-7   |-    quit(2)
-  8 |+    sys.exit(2)
+1 + import sys
+2 | exit(0)
+3 | quit(0)
+4 | 
+5 | 
+6 | def main():
+7 |     exit(2)
+  -     quit(2)
+8 +     sys.exit(2)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap
index fe9dbde798..2a7b32f974 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap
@@ -11,15 +11,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 4 | quit(0)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | 
-3   |-exit(0)
-  3 |+sys.exit(0)
-4 4 | quit(0)
-5 5 | 
-6 6 | 
+1 | import sys
+2 | 
+  - exit(0)
+3 + sys.exit(0)
+4 | quit(0)
+5 | 
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_1.py:4:1
@@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | 
-3 3 | exit(0)
-4   |-quit(0)
-  4 |+sys.exit(0)
-5 5 | 
-6 6 | 
-7 7 | def main():
+1 | import sys
+2 | 
+3 | exit(0)
+  - quit(0)
+4 + sys.exit(0)
+5 | 
+6 | 
+7 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `exit`
  --> sys_exit_alias_1.py:8:5
@@ -49,16 +47,15 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 9 |     quit(1)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | 
-7 7 | def main():
-8   |-    exit(1)
-  8 |+    sys.exit(1)
-9 9 |     quit(1)
-10 10 | 
-11 11 | 
+5  | 
+6  | 
+7  | def main():
+   -     exit(1)
+8  +     sys.exit(1)
+9  |     quit(1)
+10 | 
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_1.py:9:5
@@ -69,16 +66,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   |     ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | def main():
-8  8  |     exit(1)
-9     |-    quit(1)
-   9  |+    sys.exit(1)
-10 10 | 
-11 11 | 
-12 12 | def main():
+6  | 
+7  | def main():
+8  |     exit(1)
+   -     quit(1)
+9  +     sys.exit(1)
+10 | 
+11 | 
+12 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 Use `sys.exit()` instead of `exit`
   --> sys_exit_alias_1.py:15:5
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap
index 815d6fcb23..a12c33d7a4 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap
@@ -10,10 +10,9 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   | ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | from sys import *
-  2 |+import sys
-2 3 | 
-3   |-exit(0)
-  4 |+sys.exit(0)
+1 | from sys import *
+2 + import sys
+3 | 
+  - exit(0)
+4 + sys.exit(0)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap
index 3e0a0aa135..95e178f98d 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap
@@ -10,10 +10,9 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   | ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1   |-import os \
-  1 |+import os; import sys \
-2 2 | 
-3   |-exit(0)
-  3 |+sys.exit(0)
+  - import os \
+1 + import os; import sys \
+2 | 
+  - exit(0)
+3 + sys.exit(0)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap
index f5ac04576c..1ee6c1e7b3 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap
@@ -8,9 +8,8 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   | ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1   |-exit(code=2)
-  1 |+import sys
-  2 |+sys.exit(2)
-2 3 |
+  - exit(code=2)
+1 + import sys
+2 + sys.exit(2)
+3 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap
index dc80fda262..7bb497e475 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap
@@ -10,13 +10,12 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   | ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | success = True
-2 3 | if success:
-3 4 |     code = 0
-4 5 | else:
-5 6 |     code = 1
-6   |-exit(code)
-  7 |+sys.exit(code)
+1 + import sys
+2 | success = True
+3 | if success:
+4 |     code = 0
+5 | else:
+6 |     code = 1
+  - exit(code)
+7 + sys.exit(code)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap
index c6ba6451e5..d3b14405ea 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap
@@ -12,16 +12,15 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 5 |     )  # 3
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | def test_case_1():
-2 3 |     # comments preserved with a positional argument
-3   |-    exit(  # comment
-  4 |+    sys.exit(  # comment
-4 5 |         1,  # 2
-5 6 |     )  # 3
-6 7 | 
+1 + import sys
+2 | def test_case_1():
+3 |     # comments preserved with a positional argument
+  -     exit(  # comment
+4 +     sys.exit(  # comment
+5 |         1,  # 2
+6 |     )  # 3
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `exit`
   --> sys_exit_alias_16.py:10:5
@@ -34,23 +33,22 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 12 |     )  # 3
    |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-   1  |+import sys
-1  2  | def test_case_1():
-2  3  |     # comments preserved with a positional argument
-3  4  |     exit(  # comment
+1  + import sys
+2  | def test_case_1():
+3  |     # comments preserved with a positional argument
+4  |     exit(  # comment
 --------------------------------------------------------------------------------
-7  8  | 
-8  9  | def test_case_2():
-9  10 |     # comments preserved with a single keyword argument
-10    |-    exit(  # comment
-11    |-        code=1,  # 2
-   11 |+    sys.exit(  # comment
-   12 |+        1,  # 2
-12 13 |     )  # 3
-13 14 | 
-14 15 | 
+8  | 
+9  | def test_case_2():
+10 |     # comments preserved with a single keyword argument
+   -     exit(  # comment
+   -         code=1,  # 2
+11 +     sys.exit(  # comment
+12 +         1,  # 2
+13 |     )  # 3
+14 | 
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 Use `sys.exit()` instead of `exit`
   --> sys_exit_alias_16.py:17:5
@@ -71,15 +69,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
    |     ^^^^
    |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-   1  |+import sys
-1  2  | def test_case_1():
-2  3  |     # comments preserved with a positional argument
-3  4  |     exit(  # comment
+1  + import sys
+2  | def test_case_1():
+3  |     # comments preserved with a positional argument
+4  |     exit(  # comment
 --------------------------------------------------------------------------------
-20 21 | def test_case_4():
-21 22 |     # this should now be fixable
-22 23 |     codes = [1]
-23    |-    exit(*codes)
-   24 |+    sys.exit(*codes)
+21 | def test_case_4():
+22 |     # this should now be fixable
+23 |     codes = [1]
+   -     exit(*codes)
+24 +     sys.exit(*codes)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap
index 642d47a335..0ba847b6e1 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap
@@ -11,15 +11,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 4 | quit(0)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | import sys as sys2
-2 2 | 
-3   |-exit(0)
-  3 |+sys2.exit(0)
-4 4 | quit(0)
-5 5 | 
-6 6 | 
+1 | import sys as sys2
+2 | 
+  - exit(0)
+3 + sys2.exit(0)
+4 | quit(0)
+5 | 
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_2.py:4:1
@@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | import sys as sys2
-2 2 | 
-3 3 | exit(0)
-4   |-quit(0)
-  4 |+sys2.exit(0)
-5 5 | 
-6 6 | 
-7 7 | def main():
+1 | import sys as sys2
+2 | 
+3 | exit(0)
+  - quit(0)
+4 + sys2.exit(0)
+5 | 
+6 | 
+7 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `exit`
  --> sys_exit_alias_2.py:8:5
@@ -49,14 +47,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 9 |     quit(1)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | 
-7 7 | def main():
-8   |-    exit(1)
-  8 |+    sys2.exit(1)
-9 9 |     quit(1)
+5 | 
+6 | 
+7 | def main():
+  -     exit(1)
+8 +     sys2.exit(1)
+9 |     quit(1)
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_2.py:9:5
@@ -67,10 +64,9 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   |     ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-6 6 | 
-7 7 | def main():
-8 8 |     exit(1)
-9   |-    quit(1)
-  9 |+    sys2.exit(1)
+6 | 
+7 | def main():
+8 |     exit(1)
+  -     quit(1)
+9 +     sys2.exit(1)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap
index c3e57c562a..47737c2cfa 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap
@@ -9,16 +9,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | from sys import exit
-2 2 | 
-3 3 | exit(0)
-4   |-quit(0)
-  4 |+exit(0)
-5 5 | 
-6 6 | 
-7 7 | def main():
+1 | from sys import exit
+2 | 
+3 | exit(0)
+  - quit(0)
+4 + exit(0)
+5 | 
+6 | 
+7 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_3.py:9:5
@@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   |     ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | def main():
-8  8  |     exit(1)
-9     |-    quit(1)
-   9  |+    exit(1)
-10 10 | 
-11 11 | 
-12 12 | def main():
+6  | 
+7  | def main():
+8  |     exit(1)
+   -     quit(1)
+9  +     exit(1)
+10 | 
+11 | 
+12 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 Use `sys.exit()` instead of `quit`
   --> sys_exit_alias_3.py:16:5
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap
index a488ad084d..f5fecf8781 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap
@@ -11,15 +11,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 4 | quit(0)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | from sys import exit as exit2
-2 2 | 
-3   |-exit(0)
-  3 |+exit2(0)
-4 4 | quit(0)
-5 5 | 
-6 6 | 
+1 | from sys import exit as exit2
+2 | 
+  - exit(0)
+3 + exit2(0)
+4 | quit(0)
+5 | 
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_4.py:4:1
@@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | from sys import exit as exit2
-2 2 | 
-3 3 | exit(0)
-4   |-quit(0)
-  4 |+exit2(0)
-5 5 | 
-6 6 | 
-7 7 | def main():
+1 | from sys import exit as exit2
+2 | 
+3 | exit(0)
+  - quit(0)
+4 + exit2(0)
+5 | 
+6 | 
+7 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `exit`
  --> sys_exit_alias_4.py:8:5
@@ -49,14 +47,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 9 |     quit(1)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | 
-7 7 | def main():
-8   |-    exit(1)
-  8 |+    exit2(1)
-9 9 |     quit(1)
+5 | 
+6 | 
+7 | def main():
+  -     exit(1)
+8 +     exit2(1)
+9 |     quit(1)
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_4.py:9:5
@@ -67,10 +64,9 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   |     ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-6 6 | 
-7 7 | def main():
-8 8 |     exit(1)
-9   |-    quit(1)
-  9 |+    exit2(1)
+6 | 
+7 | def main():
+8 |     exit(1)
+  -     quit(1)
+9 +     exit2(1)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap
index e1ba1969a6..a05a708419 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap
@@ -11,16 +11,15 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 4 | quit(0)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | from sys import *
-  2 |+import sys
-2 3 | 
-3   |-exit(0)
-  4 |+sys.exit(0)
-4 5 | quit(0)
-5 6 | 
-6 7 | 
+1 | from sys import *
+2 + import sys
+3 | 
+  - exit(0)
+4 + sys.exit(0)
+5 | quit(0)
+6 | 
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_5.py:4:1
@@ -30,17 +29,16 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-1 1 | from sys import *
-  2 |+import sys
-2 3 | 
-3 4 | exit(0)
-4   |-quit(0)
-  5 |+sys.exit(0)
-5 6 | 
-6 7 | 
-7 8 | def main():
+1 | from sys import *
+2 + import sys
+3 | 
+4 | exit(0)
+  - quit(0)
+5 + sys.exit(0)
+6 | 
+7 | 
+8 | def main():
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `exit`
  --> sys_exit_alias_5.py:8:5
@@ -51,19 +49,18 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 9 |     quit(1)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1  1  | from sys import *
-   2  |+import sys
-2  3  | 
-3  4  | exit(0)
-4  5  | quit(0)
-5  6  | 
-6  7  | 
-7  8  | def main():
-8     |-    exit(1)
-   9  |+    sys.exit(1)
-9  10 |     quit(1)
+1  | from sys import *
+2  + import sys
+3  | 
+4  | exit(0)
+5  | quit(0)
+6  | 
+7  | 
+8  | def main():
+   -     exit(1)
+9  +     sys.exit(1)
+10 |     quit(1)
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_5.py:9:5
@@ -74,16 +71,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   |     ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-1  1  | from sys import *
-   2  |+import sys
-2  3  | 
-3  4  | exit(0)
-4  5  | quit(0)
+1  | from sys import *
+2  + import sys
+3  | 
+4  | exit(0)
+5  | quit(0)
 --------------------------------------------------------------------------------
-6  7  | 
-7  8  | def main():
-8  9  |     exit(1)
-9     |-    quit(1)
-   10 |+    sys.exit(1)
+7  | 
+8  | def main():
+9  |     exit(1)
+   -     quit(1)
+10 +     sys.exit(1)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap
index 50fccc0bb8..816f3a77d4 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap
@@ -9,14 +9,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
 2 | quit(0)
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1   |-exit(0)
-  1 |+import sys
-  2 |+sys.exit(0)
-2 3 | quit(0)
-3 4 | 
-4 5 | 
+  - exit(0)
+1 + import sys
+2 + sys.exit(0)
+3 | quit(0)
+4 | 
+5 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1722 [*] Use `sys.exit()` instead of `quit`
  --> sys_exit_alias_6.py:2:1
@@ -26,12 +25,11 @@ PLR1722 [*] Use `sys.exit()` instead of `quit`
   | ^^^^
   |
 help: Replace `quit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | exit(0)
-2   |-quit(0)
-  3 |+sys.exit(0)
-3 4 | 
-4 5 | 
-5 6 | def exit(e):
+1 + import sys
+2 | exit(0)
+  - quit(0)
+3 + sys.exit(0)
+4 | 
+5 | 
+6 | def exit(e):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap
index 43c99f3f74..eb4d08baae 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap
@@ -9,12 +9,11 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   |     ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-  1 |+import sys
-1 2 | def main():
-2   |-    exit(0)
-  3 |+    sys.exit(0)
-3 4 | 
-4 5 | 
-5 6 | import functools
+1 + import sys
+2 | def main():
+  -     exit(0)
+3 +     sys.exit(0)
+4 | 
+5 | 
+6 | import functools
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap
index 2008a11682..f8b9fead38 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap
@@ -9,10 +9,9 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   |     ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe fix
-1   |-from sys import argv
-  1 |+from sys import argv, exit
-2 2 | 
-3 3 | 
-4 4 | def main():
+  - from sys import argv
+1 + from sys import argv, exit
+2 | 
+3 | 
+4 | def main():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap
index 667a82f2f6..bbcca9a69f 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap
@@ -9,12 +9,11 @@ PLR1722 [*] Use `sys.exit()` instead of `exit`
   |     ^^^^
   |
 help: Replace `exit` with `sys.exit()`
-
-ℹ Unsafe 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
+1 + import sys
+2 | def main():
+  -     exit(0)
+3 +     sys.exit(0)
+4 | 
+5 | 
+6 | from sys import argv
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap
index 6b97573e49..28b3d9acdc 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap
@@ -12,17 +12,15 @@ PLR1730 [*] Replace `if` statement with `a = min(b, a)`
 24 |   # case 2: a = max(b, a)
    |
 help: Replace with `a = min(b, a)`
-
-ℹ Safe fix
-18 18 | a, b = [], []
-19 19 | 
-20 20 | # case 1: a = min(b, a)
-21    |-if a >= b:
-22    |-    a = b
-   21 |+a = min(b, a)
-23 22 | 
-24 23 | # case 2: a = max(b, a)
-25 24 | if a <= b:
+18 | a, b = [], []
+19 | 
+20 | # case 1: a = min(b, a)
+   - if a >= b:
+   -     a = b
+21 + a = min(b, a)
+22 | 
+23 | # case 2: a = max(b, a)
+24 | if a <= b:
 
 PLR1730 [*] Replace `if` statement with `a = max(b, a)`
   --> if_stmt_min_max.py:25:1
@@ -35,17 +33,15 @@ PLR1730 [*] Replace `if` statement with `a = max(b, a)`
 28 |   # case 3: b = min(a, b)
    |
 help: Replace with `a = max(b, a)`
-
-ℹ Safe fix
-22 22 |     a = b
-23 23 | 
-24 24 | # case 2: a = max(b, a)
-25    |-if a <= b:
-26    |-    a = b
-   25 |+a = max(b, a)
-27 26 | 
-28 27 | # case 3: b = min(a, b)
-29 28 | if a <= b:
+22 |     a = b
+23 | 
+24 | # case 2: a = max(b, a)
+   - if a <= b:
+   -     a = b
+25 + a = max(b, a)
+26 | 
+27 | # case 3: b = min(a, b)
+28 | if a <= b:
 
 PLR1730 [*] Replace `if` statement with `b = min(a, b)`
   --> if_stmt_min_max.py:29:1
@@ -58,17 +54,15 @@ PLR1730 [*] Replace `if` statement with `b = min(a, b)`
 32 |   # case 4: b = max(a, b)
    |
 help: Replace with `b = min(a, b)`
-
-ℹ Safe fix
-26 26 |     a = b
-27 27 | 
-28 28 | # case 3: b = min(a, b)
-29    |-if a <= b:
-30    |-    b = a
-   29 |+b = min(a, b)
-31 30 | 
-32 31 | # case 4: b = max(a, b)
-33 32 | if a >= b:
+26 |     a = b
+27 | 
+28 | # case 3: b = min(a, b)
+   - if a <= b:
+   -     b = a
+29 + b = min(a, b)
+30 | 
+31 | # case 4: b = max(a, b)
+32 | if a >= b:
 
 PLR1730 [*] Replace `if` statement with `b = max(a, b)`
   --> if_stmt_min_max.py:33:1
@@ -81,17 +75,15 @@ PLR1730 [*] Replace `if` statement with `b = max(a, b)`
 36 |   # case 5: a = min(a, b)
    |
 help: Replace with `b = max(a, b)`
-
-ℹ Safe fix
-30 30 |     b = a
-31 31 | 
-32 32 | # case 4: b = max(a, b)
-33    |-if a >= b:
-34    |-    b = a
-   33 |+b = max(a, b)
-35 34 | 
-36 35 | # case 5: a = min(a, b)
-37 36 | if a > b:
+30 |     b = a
+31 | 
+32 | # case 4: b = max(a, b)
+   - if a >= b:
+   -     b = a
+33 + b = max(a, b)
+34 | 
+35 | # case 5: a = min(a, b)
+36 | if a > b:
 
 PLR1730 [*] Replace `if` statement with `a = min(a, b)`
   --> if_stmt_min_max.py:37:1
@@ -104,17 +96,15 @@ PLR1730 [*] Replace `if` statement with `a = min(a, b)`
 40 |   # case 6: a = max(a, b)
    |
 help: Replace with `a = min(a, b)`
-
-ℹ Safe fix
-34 34 |     b = a
-35 35 | 
-36 36 | # case 5: a = min(a, b)
-37    |-if a > b:
-38    |-    a = b
-   37 |+a = min(a, b)
-39 38 | 
-40 39 | # case 6: a = max(a, b)
-41 40 | if a < b:
+34 |     b = a
+35 | 
+36 | # case 5: a = min(a, b)
+   - if a > b:
+   -     a = b
+37 + a = min(a, b)
+38 | 
+39 | # case 6: a = max(a, b)
+40 | if a < b:
 
 PLR1730 [*] Replace `if` statement with `a = max(a, b)`
   --> if_stmt_min_max.py:41:1
@@ -127,17 +117,15 @@ PLR1730 [*] Replace `if` statement with `a = max(a, b)`
 44 |   # case 7: b = min(b, a)
    |
 help: Replace with `a = max(a, b)`
-
-ℹ Safe fix
-38 38 |     a = b
-39 39 | 
-40 40 | # case 6: a = max(a, b)
-41    |-if a < b:
-42    |-    a = b
-   41 |+a = max(a, b)
-43 42 | 
-44 43 | # case 7: b = min(b, a)
-45 44 | if a < b:
+38 |     a = b
+39 | 
+40 | # case 6: a = max(a, b)
+   - if a < b:
+   -     a = b
+41 + a = max(a, b)
+42 | 
+43 | # case 7: b = min(b, a)
+44 | if a < b:
 
 PLR1730 [*] Replace `if` statement with `b = min(b, a)`
   --> if_stmt_min_max.py:45:1
@@ -150,17 +138,15 @@ PLR1730 [*] Replace `if` statement with `b = min(b, a)`
 48 |   # case 8: b = max(b, a)
    |
 help: Replace with `b = min(b, a)`
-
-ℹ Safe fix
-42 42 |     a = b
-43 43 | 
-44 44 | # case 7: b = min(b, a)
-45    |-if a < b:
-46    |-    b = a
-   45 |+b = min(b, a)
-47 46 | 
-48 47 | # case 8: b = max(b, a)
-49 48 | if a > b:
+42 |     a = b
+43 | 
+44 | # case 7: b = min(b, a)
+   - if a < b:
+   -     b = a
+45 + b = min(b, a)
+46 | 
+47 | # case 8: b = max(b, a)
+48 | if a > b:
 
 PLR1730 [*] Replace `if` statement with `b = max(b, a)`
   --> if_stmt_min_max.py:49:1
@@ -171,17 +157,15 @@ PLR1730 [*] Replace `if` statement with `b = max(b, a)`
    | |_________^
    |
 help: Replace with `b = max(b, a)`
-
-ℹ Safe fix
-46 46 |     b = a
-47 47 | 
-48 48 | # case 8: b = max(b, a)
-49    |-if a > b:
-50    |-    b = a
-   49 |+b = max(b, a)
-51 50 | 
-52 51 | 
-53 52 | # test cases with assigned variables and primitives
+46 |     b = a
+47 | 
+48 | # case 8: b = max(b, a)
+   - if a > b:
+   -     b = a
+49 + b = max(b, a)
+50 | 
+51 | 
+52 | # test cases with assigned variables and primitives
 
 PLR1730 [*] Replace `if` statement with `value = max(value, 10)`
   --> if_stmt_min_max.py:59:1
@@ -194,17 +178,15 @@ PLR1730 [*] Replace `if` statement with `value = max(value, 10)`
 62 |   # base case 2: value = max(10, value)
    |
 help: Replace with `value = max(value, 10)`
-
-ℹ Safe fix
-56 56 | value3 = 3
-57 57 | 
-58 58 | # base case 6: value = max(value, 10)
-59    |-if value < 10:
-60    |-    value = 10
-   59 |+value = max(value, 10)
-61 60 | 
-62 61 | # base case 2: value = max(10, value)
-63 62 | if value <= 10:
+56 | value3 = 3
+57 | 
+58 | # base case 6: value = max(value, 10)
+   - if value < 10:
+   -     value = 10
+59 + value = max(value, 10)
+60 | 
+61 | # base case 2: value = max(10, value)
+62 | if value <= 10:
 
 PLR1730 [*] Replace `if` statement with `value = max(10, value)`
   --> if_stmt_min_max.py:63:1
@@ -217,17 +199,15 @@ PLR1730 [*] Replace `if` statement with `value = max(10, value)`
 66 |   # base case 6: value = max(value, value2)
    |
 help: Replace with `value = max(10, value)`
-
-ℹ Safe fix
-60 60 |     value = 10
-61 61 | 
-62 62 | # base case 2: value = max(10, value)
-63    |-if value <= 10:
-64    |-    value = 10
-   63 |+value = max(10, value)
-65 64 | 
-66 65 | # base case 6: value = max(value, value2)
-67 66 | if value < value2:
+60 |     value = 10
+61 | 
+62 | # base case 2: value = max(10, value)
+   - if value <= 10:
+   -     value = 10
+63 + value = max(10, value)
+64 | 
+65 | # base case 6: value = max(value, value2)
+66 | if value < value2:
 
 PLR1730 [*] Replace `if` statement with `value = max(value, value2)`
   --> if_stmt_min_max.py:67:1
@@ -240,17 +220,15 @@ PLR1730 [*] Replace `if` statement with `value = max(value, value2)`
 70 |   # base case 5: value = min(value, 10)
    |
 help: Replace with `value = max(value, value2)`
-
-ℹ Safe fix
-64 64 |     value = 10
-65 65 | 
-66 66 | # base case 6: value = max(value, value2)
-67    |-if value < value2:
-68    |-    value = value2
-   67 |+value = max(value, value2)
-69 68 | 
-70 69 | # base case 5: value = min(value, 10)
-71 70 | if value > 10:
+64 |     value = 10
+65 | 
+66 | # base case 6: value = max(value, value2)
+   - if value < value2:
+   -     value = value2
+67 + value = max(value, value2)
+68 | 
+69 | # base case 5: value = min(value, 10)
+70 | if value > 10:
 
 PLR1730 [*] Replace `if` statement with `value = min(value, 10)`
   --> if_stmt_min_max.py:71:1
@@ -263,17 +241,15 @@ PLR1730 [*] Replace `if` statement with `value = min(value, 10)`
 74 |   # base case 1: value = min(10, value)
    |
 help: Replace with `value = min(value, 10)`
-
-ℹ Safe fix
-68 68 |     value = value2
-69 69 | 
-70 70 | # base case 5: value = min(value, 10)
-71    |-if value > 10:
-72    |-    value = 10
-   71 |+value = min(value, 10)
-73 72 | 
-74 73 | # base case 1: value = min(10, value)
-75 74 | if value >= 10:
+68 |     value = value2
+69 | 
+70 | # base case 5: value = min(value, 10)
+   - if value > 10:
+   -     value = 10
+71 + value = min(value, 10)
+72 | 
+73 | # base case 1: value = min(10, value)
+74 | if value >= 10:
 
 PLR1730 [*] Replace `if` statement with `value = min(10, value)`
   --> if_stmt_min_max.py:75:1
@@ -286,17 +262,15 @@ PLR1730 [*] Replace `if` statement with `value = min(10, value)`
 78 |   # base case 5: value = min(value, value2)
    |
 help: Replace with `value = min(10, value)`
-
-ℹ Safe fix
-72 72 |     value = 10
-73 73 | 
-74 74 | # base case 1: value = min(10, value)
-75    |-if value >= 10:
-76    |-    value = 10
-   75 |+value = min(10, value)
-77 76 | 
-78 77 | # base case 5: value = min(value, value2)
-79 78 | if value > value2:
+72 |     value = 10
+73 | 
+74 | # base case 1: value = min(10, value)
+   - if value >= 10:
+   -     value = 10
+75 + value = min(10, value)
+76 | 
+77 | # base case 5: value = min(value, value2)
+78 | if value > value2:
 
 PLR1730 [*] Replace `if` statement with `value = min(value, value2)`
   --> if_stmt_min_max.py:79:1
@@ -307,17 +281,15 @@ PLR1730 [*] Replace `if` statement with `value = min(value, value2)`
    | |__________________^
    |
 help: Replace with `value = min(value, value2)`
-
-ℹ Safe fix
-76 76 |     value = 10
-77 77 | 
-78 78 | # base case 5: value = min(value, value2)
-79    |-if value > value2:
-80    |-    value = value2
-   79 |+value = min(value, value2)
-81 80 | 
-82 81 | 
-83 82 | # cases with calls
+76 |     value = 10
+77 | 
+78 | # base case 5: value = min(value, value2)
+   - if value > value2:
+   -     value = value2
+79 + value = min(value, value2)
+80 | 
+81 | 
+82 | # cases with calls
 
 PLR1730 [*] Replace `if` statement with `A1.value = max(A1.value, 10)`
   --> if_stmt_min_max.py:92:1
@@ -329,17 +301,15 @@ PLR1730 [*] Replace `if` statement with `A1.value = max(A1.value, 10)`
 95 |   if A1.value > 10:
    |
 help: Replace with `A1.value = max(A1.value, 10)`
-
-ℹ Safe fix
-89 89 | A1 = A()
-90 90 | 
-91 91 | 
-92    |-if A1.value < 10:
-93    |-    A1.value = 10
-   92 |+A1.value = max(A1.value, 10)
-94 93 | 
-95 94 | if A1.value > 10:
-96 95 |     A1.value = 10
+89 | A1 = A()
+90 | 
+91 | 
+   - if A1.value < 10:
+   -     A1.value = 10
+92 + A1.value = max(A1.value, 10)
+93 | 
+94 | if A1.value > 10:
+95 |     A1.value = 10
 
 PLR1730 [*] Replace `if` statement with `A1.value = min(A1.value, 10)`
   --> if_stmt_min_max.py:95:1
@@ -351,17 +321,15 @@ PLR1730 [*] Replace `if` statement with `A1.value = min(A1.value, 10)`
    | |_________________^
    |
 help: Replace with `A1.value = min(A1.value, 10)`
-
-ℹ Safe fix
-92 92 | if A1.value < 10:
-93 93 |     A1.value = 10
-94 94 | 
-95    |-if A1.value > 10:
-96    |-    A1.value = 10
-   95 |+A1.value = min(A1.value, 10)
-97 96 | 
-98 97 | 
-99 98 | class AA:
+92 | if A1.value < 10:
+93 |     A1.value = 10
+94 | 
+   - if A1.value > 10:
+   -     A1.value = 10
+95 + A1.value = min(A1.value, 10)
+96 | 
+97 | 
+98 | class AA:
 
 PLR1730 [*] Replace `if` statement with `A2 = max(A2, A1)`
    --> if_stmt_min_max.py:119:1
@@ -375,17 +343,16 @@ PLR1730 [*] Replace `if` statement with `A2 = max(A2, A1)`
 122 |   if A2 <= A1:  # [max-instead-of-if]
     |
 help: Replace with `A2 = max(A2, A1)`
-
-ℹ Unsafe fix
-116 116 | A1 = AA(0)
-117 117 | A2 = AA(3)
-118 118 | 
-119     |-if A2 < A1:  # [max-instead-of-if]
-120     |-    A2 = A1
-    119 |+A2 = max(A2, A1)
-121 120 | 
-122 121 | if A2 <= A1:  # [max-instead-of-if]
-123 122 |     A2 = A1
+116 | A1 = AA(0)
+117 | A2 = AA(3)
+118 | 
+    - if A2 < A1:  # [max-instead-of-if]
+    -     A2 = A1
+119 + A2 = max(A2, A1)
+120 | 
+121 | if A2 <= A1:  # [max-instead-of-if]
+122 |     A2 = A1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1730 [*] Replace `if` statement with `A2 = max(A1, A2)`
    --> if_stmt_min_max.py:122:1
@@ -399,17 +366,16 @@ PLR1730 [*] Replace `if` statement with `A2 = max(A1, A2)`
 125 |   if A2 > A1:  # [min-instead-of-if]
     |
 help: Replace with `A2 = max(A1, A2)`
-
-ℹ Unsafe fix
-119 119 | if A2 < A1:  # [max-instead-of-if]
-120 120 |     A2 = A1
-121 121 | 
-122     |-if A2 <= A1:  # [max-instead-of-if]
-123     |-    A2 = A1
-    122 |+A2 = max(A1, A2)
-124 123 | 
-125 124 | if A2 > A1:  # [min-instead-of-if]
-126 125 |     A2 = A1
+119 | if A2 < A1:  # [max-instead-of-if]
+120 |     A2 = A1
+121 | 
+    - if A2 <= A1:  # [max-instead-of-if]
+    -     A2 = A1
+122 + A2 = max(A1, A2)
+123 | 
+124 | if A2 > A1:  # [min-instead-of-if]
+125 |     A2 = A1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1730 [*] Replace `if` statement with `A2 = min(A2, A1)`
    --> if_stmt_min_max.py:125:1
@@ -423,17 +389,16 @@ PLR1730 [*] Replace `if` statement with `A2 = min(A2, A1)`
 128 |   if A2 >= A1:  # [min-instead-of-if]
     |
 help: Replace with `A2 = min(A2, A1)`
-
-ℹ Unsafe fix
-122 122 | if A2 <= A1:  # [max-instead-of-if]
-123 123 |     A2 = A1
-124 124 | 
-125     |-if A2 > A1:  # [min-instead-of-if]
-126     |-    A2 = A1
-    125 |+A2 = min(A2, A1)
-127 126 | 
-128 127 | if A2 >= A1:  # [min-instead-of-if]
-129 128 |     A2 = A1
+122 | if A2 <= A1:  # [max-instead-of-if]
+123 |     A2 = A1
+124 | 
+    - if A2 > A1:  # [min-instead-of-if]
+    -     A2 = A1
+125 + A2 = min(A2, A1)
+126 | 
+127 | if A2 >= A1:  # [min-instead-of-if]
+128 |     A2 = A1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1730 [*] Replace `if` statement with `A2 = min(A1, A2)`
    --> if_stmt_min_max.py:128:1
@@ -447,17 +412,16 @@ PLR1730 [*] Replace `if` statement with `A2 = min(A1, A2)`
 131 |   # Negative
     |
 help: Replace with `A2 = min(A1, A2)`
-
-ℹ Unsafe fix
-125 125 | if A2 > A1:  # [min-instead-of-if]
-126 126 |     A2 = A1
-127 127 | 
-128     |-if A2 >= A1:  # [min-instead-of-if]
-129     |-    A2 = A1
-    128 |+A2 = min(A1, A2)
-130 129 | 
-131 130 | # Negative
-132 131 | if value < 10:
+125 | if A2 > A1:  # [min-instead-of-if]
+126 |     A2 = A1
+127 | 
+    - if A2 >= A1:  # [min-instead-of-if]
+    -     A2 = A1
+128 + A2 = min(A1, A2)
+129 | 
+130 | # Negative
+131 | if value < 10:
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1730 [*] Replace `if` statement with `min` call
    --> if_stmt_min_max.py:191:1
@@ -473,21 +437,19 @@ PLR1730 [*] Replace `if` statement with `min` call
 197 |   class Foo:
     |
 help: Replace with `min` call
-
-ℹ Safe fix
-188 188 |     value = 2
-189 189 | 
-190 190 | # Parenthesized expressions
-191     |-if value.attr > 3:
-192     |-    (
-    191 |+(
-193 192 |         value.
-194 193 |         attr
-195     |-    ) = 3
-    194 |+    ) = min(value.attr, 3)
-196 195 | 
-197 196 | class Foo:
-198 197 |     _min = 0
+188 |     value = 2
+189 | 
+190 | # Parenthesized expressions
+    - if value.attr > 3:
+    -     (
+191 + (
+192 |         value.
+193 |         attr
+    -     ) = 3
+194 +     ) = min(value.attr, 3)
+195 | 
+196 | class Foo:
+197 |     _min = 0
 
 PLR1730 [*] Replace `if` statement with `self._min = min(self._min, value)`
    --> if_stmt_min_max.py:202:9
@@ -500,17 +462,15 @@ PLR1730 [*] Replace `if` statement with `self._min = min(self._min, value)`
 205 |               self._max = value
     |
 help: Replace with `self._min = min(self._min, value)`
-
-ℹ Safe fix
-199 199 |     _max = 0
-200 200 | 
-201 201 |     def foo(self, value) -> None:
-202     |-        if value < self._min:
-203     |-            self._min = value
-    202 |+        self._min = min(self._min, value)
-204 203 |         if value > self._max:
-205 204 |             self._max = value
-206 205 | 
+199 |     _max = 0
+200 | 
+201 |     def foo(self, value) -> None:
+    -         if value < self._min:
+    -             self._min = value
+202 +         self._min = min(self._min, value)
+203 |         if value > self._max:
+204 |             self._max = value
+205 | 
 
 PLR1730 [*] Replace `if` statement with `self._max = max(self._max, value)`
    --> if_stmt_min_max.py:204:9
@@ -524,17 +484,15 @@ PLR1730 [*] Replace `if` statement with `self._max = max(self._max, value)`
 207 |           if self._min < value:
     |
 help: Replace with `self._max = max(self._max, value)`
-
-ℹ Safe fix
-201 201 |     def foo(self, value) -> None:
-202 202 |         if value < self._min:
-203 203 |             self._min = value
-204     |-        if value > self._max:
-205     |-            self._max = value
-    204 |+        self._max = max(self._max, value)
-206 205 | 
-207 206 |         if self._min < value:
-208 207 |             self._min = value
+201 |     def foo(self, value) -> None:
+202 |         if value < self._min:
+203 |             self._min = value
+    -         if value > self._max:
+    -             self._max = value
+204 +         self._max = max(self._max, value)
+205 | 
+206 |         if self._min < value:
+207 |             self._min = value
 
 PLR1730 [*] Replace `if` statement with `self._min = max(self._min, value)`
    --> if_stmt_min_max.py:207:9
@@ -548,17 +506,15 @@ PLR1730 [*] Replace `if` statement with `self._min = max(self._min, value)`
 210 |               self._max = value
     |
 help: Replace with `self._min = max(self._min, value)`
-
-ℹ Safe fix
-204 204 |         if value > self._max:
-205 205 |             self._max = value
-206 206 | 
-207     |-        if self._min < value:
-208     |-            self._min = value
-    207 |+        self._min = max(self._min, value)
-209 208 |         if self._max > value:
-210 209 |             self._max = value
-211 210 | 
+204 |         if value > self._max:
+205 |             self._max = value
+206 | 
+    -         if self._min < value:
+    -             self._min = value
+207 +         self._min = max(self._min, value)
+208 |         if self._max > value:
+209 |             self._max = value
+210 | 
 
 PLR1730 [*] Replace `if` statement with `self._max = min(self._max, value)`
    --> if_stmt_min_max.py:209:9
@@ -572,17 +528,15 @@ PLR1730 [*] Replace `if` statement with `self._max = min(self._max, value)`
 212 |           if value <= self._min:
     |
 help: Replace with `self._max = min(self._max, value)`
-
-ℹ Safe fix
-206 206 | 
-207 207 |         if self._min < value:
-208 208 |             self._min = value
-209     |-        if self._max > value:
-210     |-            self._max = value
-    209 |+        self._max = min(self._max, value)
-211 210 | 
-212 211 |         if value <= self._min:
-213 212 |             self._min = value
+206 | 
+207 |         if self._min < value:
+208 |             self._min = value
+    -         if self._max > value:
+    -             self._max = value
+209 +         self._max = min(self._max, value)
+210 | 
+211 |         if value <= self._min:
+212 |             self._min = value
 
 PLR1730 [*] Replace `if` statement with `self._min = min(value, self._min)`
    --> if_stmt_min_max.py:212:9
@@ -596,17 +550,15 @@ PLR1730 [*] Replace `if` statement with `self._min = min(value, self._min)`
 215 |               self._max = value
     |
 help: Replace with `self._min = min(value, self._min)`
-
-ℹ Safe fix
-209 209 |         if self._max > value:
-210 210 |             self._max = value
-211 211 | 
-212     |-        if value <= self._min:
-213     |-            self._min = value
-    212 |+        self._min = min(value, self._min)
-214 213 |         if value >= self._max:
-215 214 |             self._max = value
-216 215 | 
+209 |         if self._max > value:
+210 |             self._max = value
+211 | 
+    -         if value <= self._min:
+    -             self._min = value
+212 +         self._min = min(value, self._min)
+213 |         if value >= self._max:
+214 |             self._max = value
+215 | 
 
 PLR1730 [*] Replace `if` statement with `self._max = max(value, self._max)`
    --> if_stmt_min_max.py:214:9
@@ -620,17 +572,15 @@ PLR1730 [*] Replace `if` statement with `self._max = max(value, self._max)`
 217 |           if self._min <= value:
     |
 help: Replace with `self._max = max(value, self._max)`
-
-ℹ Safe fix
-211 211 | 
-212 212 |         if value <= self._min:
-213 213 |             self._min = value
-214     |-        if value >= self._max:
-215     |-            self._max = value
-    214 |+        self._max = max(value, self._max)
-216 215 | 
-217 216 |         if self._min <= value:
-218 217 |             self._min = value
+211 | 
+212 |         if value <= self._min:
+213 |             self._min = value
+    -         if value >= self._max:
+    -             self._max = value
+214 +         self._max = max(value, self._max)
+215 | 
+216 |         if self._min <= value:
+217 |             self._min = value
 
 PLR1730 [*] Replace `if` statement with `self._min = max(value, self._min)`
    --> if_stmt_min_max.py:217:9
@@ -644,17 +594,15 @@ PLR1730 [*] Replace `if` statement with `self._min = max(value, self._min)`
 220 |               self._max = value
     |
 help: Replace with `self._min = max(value, self._min)`
-
-ℹ Safe fix
-214 214 |         if value >= self._max:
-215 215 |             self._max = value
-216 216 | 
-217     |-        if self._min <= value:
-218     |-            self._min = value
-    217 |+        self._min = max(value, self._min)
-219 218 |         if self._max >= value:
-220 219 |             self._max = value
-221 220 | 
+214 |         if value >= self._max:
+215 |             self._max = value
+216 | 
+    -         if self._min <= value:
+    -             self._min = value
+217 +         self._min = max(value, self._min)
+218 |         if self._max >= value:
+219 |             self._max = value
+220 | 
 
 PLR1730 [*] Replace `if` statement with `self._max = min(value, self._max)`
    --> if_stmt_min_max.py:219:9
@@ -666,17 +614,15 @@ PLR1730 [*] Replace `if` statement with `self._max = min(value, self._max)`
     | |_____________________________^
     |
 help: Replace with `self._max = min(value, self._max)`
-
-ℹ Safe fix
-216 216 | 
-217 217 |         if self._min <= value:
-218 218 |             self._min = value
-219     |-        if self._max >= value:
-220     |-            self._max = value
-    219 |+        self._max = min(value, self._max)
-221 220 | 
-222 221 | 
-223 222 | counter = {"a": 0, "b": 0}
+216 | 
+217 |         if self._min <= value:
+218 |             self._min = value
+    -         if self._max >= value:
+    -             self._max = value
+219 +         self._max = min(value, self._max)
+220 | 
+221 | 
+222 | counter = {"a": 0, "b": 0}
 
 PLR1730 [*] Replace `if` statement with `counter["a"] = max(counter["b"], counter["a"])`
    --> if_stmt_min_max.py:226:1
@@ -689,17 +635,15 @@ PLR1730 [*] Replace `if` statement with `counter["a"] = max(counter["b"], counte
 229 |   # case 3: counter["b"] = min(counter["a"], counter["b"])
     |
 help: Replace with `counter["a"] = max(counter["b"], counter["a"])`
-
-ℹ Safe fix
-223 223 | counter = {"a": 0, "b": 0}
-224 224 | 
-225 225 | # base case 2: counter["a"] = max(counter["b"], counter["a"])
-226     |-if counter["a"] <= counter["b"]:
-227     |-    counter["a"] = counter["b"]
-    226 |+counter["a"] = max(counter["b"], counter["a"])
-228 227 | 
-229 228 | # case 3: counter["b"] = min(counter["a"], counter["b"])
-230 229 | if counter["a"] <= counter["b"]:
+223 | counter = {"a": 0, "b": 0}
+224 | 
+225 | # base case 2: counter["a"] = max(counter["b"], counter["a"])
+    - if counter["a"] <= counter["b"]:
+    -     counter["a"] = counter["b"]
+226 + counter["a"] = max(counter["b"], counter["a"])
+227 | 
+228 | # case 3: counter["b"] = min(counter["a"], counter["b"])
+229 | if counter["a"] <= counter["b"]:
 
 PLR1730 [*] Replace `if` statement with `counter["b"] = min(counter["a"], counter["b"])`
    --> if_stmt_min_max.py:230:1
@@ -712,17 +656,15 @@ PLR1730 [*] Replace `if` statement with `counter["b"] = min(counter["a"], counte
 233 |   # case 5: counter["a"] = min(counter["a"], counter["b"])
     |
 help: Replace with `counter["b"] = min(counter["a"], counter["b"])`
-
-ℹ Safe fix
-227 227 |     counter["a"] = counter["b"]
-228 228 | 
-229 229 | # case 3: counter["b"] = min(counter["a"], counter["b"])
-230     |-if counter["a"] <= counter["b"]:
-231     |-    counter["b"] = counter["a"]
-    230 |+counter["b"] = min(counter["a"], counter["b"])
-232 231 | 
-233 232 | # case 5: counter["a"] = min(counter["a"], counter["b"])
-234 233 | if counter["a"] > counter["b"]:
+227 |     counter["a"] = counter["b"]
+228 | 
+229 | # case 3: counter["b"] = min(counter["a"], counter["b"])
+    - if counter["a"] <= counter["b"]:
+    -     counter["b"] = counter["a"]
+230 + counter["b"] = min(counter["a"], counter["b"])
+231 | 
+232 | # case 5: counter["a"] = min(counter["a"], counter["b"])
+233 | if counter["a"] > counter["b"]:
 
 PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counter["a"])`
    --> if_stmt_min_max.py:234:1
@@ -735,17 +677,15 @@ PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counte
 237 |   # case 8: counter["a"] = max(counter["b"], counter["a"])
     |
 help: Replace with `counter["b"] = max(counter["b"], counter["a"])`
-
-ℹ Safe fix
-231 231 |     counter["b"] = counter["a"]
-232 232 | 
-233 233 | # case 5: counter["a"] = min(counter["a"], counter["b"])
-234     |-if counter["a"] > counter["b"]:
-235     |-    counter["b"] = counter["a"]
-    234 |+counter["b"] = max(counter["b"], counter["a"])
-236 235 | 
-237 236 | # case 8: counter["a"] = max(counter["b"], counter["a"])
-238 237 | if counter["a"] > counter["b"]:
+231 |     counter["b"] = counter["a"]
+232 | 
+233 | # case 5: counter["a"] = min(counter["a"], counter["b"])
+    - if counter["a"] > counter["b"]:
+    -     counter["b"] = counter["a"]
+234 + counter["b"] = max(counter["b"], counter["a"])
+235 | 
+236 | # case 8: counter["a"] = max(counter["b"], counter["a"])
+237 | if counter["a"] > counter["b"]:
 
 PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counter["a"])`
    --> if_stmt_min_max.py:238:1
@@ -758,17 +698,15 @@ PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counte
 241 |   # https://github.com/astral-sh/ruff/issues/17311
     |
 help: Replace with `counter["b"] = max(counter["b"], counter["a"])`
-
-ℹ Safe fix
-235 235 |     counter["b"] = counter["a"]
-236 236 | 
-237 237 | # case 8: counter["a"] = max(counter["b"], counter["a"])
-238     |-if counter["a"] > counter["b"]:
-239     |-    counter["b"] = counter["a"]
-    238 |+counter["b"] = max(counter["b"], counter["a"])
-240 239 | 
-241 240 | # https://github.com/astral-sh/ruff/issues/17311
-242 241 | 
+235 |     counter["b"] = counter["a"]
+236 | 
+237 | # case 8: counter["a"] = max(counter["b"], counter["a"])
+    - if counter["a"] > counter["b"]:
+    -     counter["b"] = counter["a"]
+238 + counter["b"] = max(counter["b"], counter["a"])
+239 | 
+240 | # https://github.com/astral-sh/ruff/issues/17311
+241 | 
 
 PLR1730 [*] Replace `if` statement with `a = min(b, a)`
    --> if_stmt_min_max.py:245:1
@@ -783,18 +721,17 @@ PLR1730 [*] Replace `if` statement with `a = min(b, a)`
 249 |   # fix marked safe as preserve comments
     |
 help: Replace with `a = min(b, a)`
-
-ℹ Unsafe fix
-242 242 | 
-243 243 | # fix marked unsafe as delete comments
-244 244 | a, b = [], []
-245     |-if a >= b:
-246     |-    # very important comment
-247     |-    a = b
-    245 |+a = min(b, a)
-248 246 | 
-249 247 | # fix marked safe as preserve comments
-250 248 | if a >= b:
+242 | 
+243 | # fix marked unsafe as delete comments
+244 | a, b = [], []
+    - if a >= b:
+    -     # very important comment
+    -     a = b
+245 + a = min(b, a)
+246 | 
+247 | # fix marked safe as preserve comments
+248 | if a >= b:
+note: This is an unsafe fix and may change runtime behavior
 
 PLR1730 [*] Replace `if` statement with `a = min(b, a)`
    --> if_stmt_min_max.py:250:1
@@ -805,11 +742,9 @@ PLR1730 [*] Replace `if` statement with `a = min(b, a)`
     | |_________^
     |
 help: Replace with `a = min(b, a)`
-
-ℹ Safe fix
-247 247 |     a = b
-248 248 | 
-249 249 | # fix marked safe as preserve comments
-250     |-if a >= b:
-251     |-    a = b  # very important comment
-    250 |+a = min(b, a)  # very important comment
+247 |     a = b
+248 | 
+249 | # fix marked safe as preserve comments
+    - if a >= b:
+    -     a = b  # very important comment
+250 + a = min(b, a)  # very important comment
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap
index 8445685d8b..4709d8b257 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap
@@ -11,16 +11,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 6 |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
   |
 help: Use existing variable
-
-ℹ Safe fix
-1 1 | FRUITS = {"apple": 1, "orange": 10, "berry": 22}
-2 2 | 
-3 3 | def fix_these():
-4   |-    [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
-  4 |+    [fruit_count for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
-5 5 |     {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-6 6 |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-7 7 | 
+1 | FRUITS = {"apple": 1, "orange": 10, "berry": 22}
+2 | 
+3 | def fix_these():
+  -     [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
+4 +     [fruit_count for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
+5 |     {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+6 |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+7 | 
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
  --> unnecessary_dict_index_lookup.py:5:6
@@ -32,16 +30,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 6 |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
   |
 help: Use existing variable
-
-ℹ Safe fix
-2 2 | 
-3 3 | def fix_these():
-4 4 |     [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
-5   |-    {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-  5 |+    {fruit_count for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-6 6 |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-7 7 | 
-8 8 |     for fruit_name, fruit_count in FRUITS.items():
+2 | 
+3 | def fix_these():
+4 |     [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
+  -     {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+5 +     {fruit_count for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+6 |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+7 | 
+8 |     for fruit_name, fruit_count in FRUITS.items():
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
  --> unnecessary_dict_index_lookup.py:6:18
@@ -54,16 +50,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 8 |     for fruit_name, fruit_count in FRUITS.items():
   |
 help: Use existing variable
-
-ℹ Safe fix
-3 3 | def fix_these():
-4 4 |     [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
-5 5 |     {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-6   |-    {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-  6 |+    {fruit_name: fruit_count for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-7 7 | 
-8 8 |     for fruit_name, fruit_count in FRUITS.items():
-9 9 |         print(FRUITS[fruit_name])  # PLR1733
+3 | def fix_these():
+4 |     [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()]  # PLR1733
+5 |     {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+  -     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+6 +     {fruit_name: fruit_count for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+7 | 
+8 |     for fruit_name, fruit_count in FRUITS.items():
+9 |         print(FRUITS[fruit_name])  # PLR1733
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
   --> unnecessary_dict_index_lookup.py:9:15
@@ -75,16 +69,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 11 |         assert FRUITS[fruit_name] == "pear"  # PLR1733
    |
 help: Use existing variable
-
-ℹ Safe fix
-6  6  |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
-7  7  | 
-8  8  |     for fruit_name, fruit_count in FRUITS.items():
-9     |-        print(FRUITS[fruit_name])  # PLR1733
-   9  |+        print(fruit_count)  # PLR1733
-10 10 |         blah = FRUITS[fruit_name]  # PLR1733
-11 11 |         assert FRUITS[fruit_name] == "pear"  # PLR1733
-12 12 | 
+6  |     {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()}  # PLR1733
+7  | 
+8  |     for fruit_name, fruit_count in FRUITS.items():
+   -         print(FRUITS[fruit_name])  # PLR1733
+9  +         print(fruit_count)  # PLR1733
+10 |         blah = FRUITS[fruit_name]  # PLR1733
+11 |         assert FRUITS[fruit_name] == "pear"  # PLR1733
+12 | 
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
   --> unnecessary_dict_index_lookup.py:10:16
@@ -96,16 +88,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 11 |         assert FRUITS[fruit_name] == "pear"  # PLR1733
    |
 help: Use existing variable
-
-ℹ Safe fix
-7  7  | 
-8  8  |     for fruit_name, fruit_count in FRUITS.items():
-9  9  |         print(FRUITS[fruit_name])  # PLR1733
-10    |-        blah = FRUITS[fruit_name]  # PLR1733
-   10 |+        blah = fruit_count  # PLR1733
-11 11 |         assert FRUITS[fruit_name] == "pear"  # PLR1733
-12 12 | 
-13 13 | 
+7  | 
+8  |     for fruit_name, fruit_count in FRUITS.items():
+9  |         print(FRUITS[fruit_name])  # PLR1733
+   -         blah = FRUITS[fruit_name]  # PLR1733
+10 +         blah = fruit_count  # PLR1733
+11 |         assert FRUITS[fruit_name] == "pear"  # PLR1733
+12 | 
+13 | 
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
   --> unnecessary_dict_index_lookup.py:11:16
@@ -116,16 +106,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
    |                ^^^^^^^^^^^^^^^^^^
    |
 help: Use existing variable
-
-ℹ Safe fix
-8  8  |     for fruit_name, fruit_count in FRUITS.items():
-9  9  |         print(FRUITS[fruit_name])  # PLR1733
-10 10 |         blah = FRUITS[fruit_name]  # PLR1733
-11    |-        assert FRUITS[fruit_name] == "pear"  # PLR1733
-   11 |+        assert fruit_count == "pear"  # PLR1733
-12 12 | 
-13 13 | 
-14 14 | def dont_fix_these():
+8  |     for fruit_name, fruit_count in FRUITS.items():
+9  |         print(FRUITS[fruit_name])  # PLR1733
+10 |         blah = FRUITS[fruit_name]  # PLR1733
+   -         assert FRUITS[fruit_name] == "pear"  # PLR1733
+11 +         assert fruit_count == "pear"  # PLR1733
+12 | 
+13 | 
+14 | def dont_fix_these():
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
   --> unnecessary_dict_index_lookup.py:50:51
@@ -138,16 +126,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 52 |             mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))]  # PLR1733
    |
 help: Use existing variable
-
-ℹ Safe fix
-47 47 |         mapped_label = client_label_map(label)
-48 48 |         if mapped_label in mapped_arrays:
-49 49 |             for i in range(len(array)):
-50    |-                mapped_arrays[mapped_label][i] += value_arrays[label][i]  # PLR1733
-   50 |+                mapped_arrays[mapped_label][i] += array[i]  # PLR1733
-51 51 |         else:
-52 52 |             mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))]  # PLR1733
-53 53 |     return mapped_arrays
+47 |         mapped_label = client_label_map(label)
+48 |         if mapped_label in mapped_arrays:
+49 |             for i in range(len(array)):
+   -                 mapped_arrays[mapped_label][i] += value_arrays[label][i]  # PLR1733
+50 +                 mapped_arrays[mapped_label][i] += array[i]  # PLR1733
+51 |         else:
+52 |             mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))]  # PLR1733
+53 |     return mapped_arrays
 
 PLR1733 [*] Unnecessary lookup of dictionary value by key
   --> unnecessary_dict_index_lookup.py:52:44
@@ -159,11 +145,9 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key
 53 |     return mapped_arrays
    |
 help: Use existing variable
-
-ℹ Safe fix
-49 49 |             for i in range(len(array)):
-50 50 |                 mapped_arrays[mapped_label][i] += value_arrays[label][i]  # PLR1733
-51 51 |         else:
-52    |-            mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))]  # PLR1733
-   52 |+            mapped_arrays[mapped_label] = [array[i] for i in range(len(array))]  # PLR1733
-53 53 |     return mapped_arrays
+49 |             for i in range(len(array)):
+50 |                 mapped_arrays[mapped_label][i] += value_arrays[label][i]  # PLR1733
+51 |         else:
+   -             mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))]  # PLR1733
+52 +             mapped_arrays[mapped_label] = [array[i] for i in range(len(array))]  # PLR1733
+53 |     return mapped_arrays
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap
index 037f20311c..6154cbf825 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap
@@ -11,16 +11,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 9 |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
   |
 help: Use the loop variable directly
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | def fix_these():
-7   |-    [letters[index] for index, letter in enumerate(letters)]  # PLR1736
-  7 |+    [letter for index, letter in enumerate(letters)]  # PLR1736
-8 8 |     {letters[index] for index, letter in enumerate(letters)}  # PLR1736
-9 9 |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
-10 10 | 
+4  | 
+5  | 
+6  | def fix_these():
+   -     [letters[index] for index, letter in enumerate(letters)]  # PLR1736
+7  +     [letter for index, letter in enumerate(letters)]  # PLR1736
+8  |     {letters[index] for index, letter in enumerate(letters)}  # PLR1736
+9  |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
+10 | 
 
 PLR1736 [*] List index lookup in `enumerate()` loop
  --> unnecessary_list_index_lookup.py:8:6
@@ -32,16 +30,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 9 |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
   |
 help: Use the loop variable directly
-
-ℹ Safe fix
-5 5 | 
-6 6 | def fix_these():
-7 7 |     [letters[index] for index, letter in enumerate(letters)]  # PLR1736
-8   |-    {letters[index] for index, letter in enumerate(letters)}  # PLR1736
-  8 |+    {letter for index, letter in enumerate(letters)}  # PLR1736
-9 9 |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
-10 10 | 
-11 11 |     for index, letter in enumerate(letters):
+5  | 
+6  | def fix_these():
+7  |     [letters[index] for index, letter in enumerate(letters)]  # PLR1736
+   -     {letters[index] for index, letter in enumerate(letters)}  # PLR1736
+8  +     {letter for index, letter in enumerate(letters)}  # PLR1736
+9  |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
+10 | 
+11 |     for index, letter in enumerate(letters):
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:9:14
@@ -54,16 +50,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 11 |     for index, letter in enumerate(letters):
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-6  6  | def fix_these():
-7  7  |     [letters[index] for index, letter in enumerate(letters)]  # PLR1736
-8  8  |     {letters[index] for index, letter in enumerate(letters)}  # PLR1736
-9     |-    {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
-   9  |+    {letter: letter for index, letter in enumerate(letters)}  # PLR1736
-10 10 | 
-11 11 |     for index, letter in enumerate(letters):
-12 12 |         print(letters[index])  # PLR1736
+6  | def fix_these():
+7  |     [letters[index] for index, letter in enumerate(letters)]  # PLR1736
+8  |     {letters[index] for index, letter in enumerate(letters)}  # PLR1736
+   -     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
+9  +     {letter: letter for index, letter in enumerate(letters)}  # PLR1736
+10 | 
+11 |     for index, letter in enumerate(letters):
+12 |         print(letters[index])  # PLR1736
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:12:15
@@ -75,16 +69,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 14 |         assert letters[index]  == "d"  # PLR1736
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-9  9  |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
-10 10 | 
-11 11 |     for index, letter in enumerate(letters):
-12    |-        print(letters[index])  # PLR1736
-   12 |+        print(letter)  # PLR1736
-13 13 |         blah = letters[index]  # PLR1736
-14 14 |         assert letters[index]  == "d"  # PLR1736
-15 15 | 
+9  |     {letter: letters[index] for index, letter in enumerate(letters)}  # PLR1736
+10 | 
+11 |     for index, letter in enumerate(letters):
+   -         print(letters[index])  # PLR1736
+12 +         print(letter)  # PLR1736
+13 |         blah = letters[index]  # PLR1736
+14 |         assert letters[index]  == "d"  # PLR1736
+15 | 
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:13:16
@@ -96,16 +88,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 14 |         assert letters[index]  == "d"  # PLR1736
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-10 10 | 
-11 11 |     for index, letter in enumerate(letters):
-12 12 |         print(letters[index])  # PLR1736
-13    |-        blah = letters[index]  # PLR1736
-   13 |+        blah = letter  # PLR1736
-14 14 |         assert letters[index]  == "d"  # PLR1736
-15 15 | 
-16 16 |     for index, letter in builtins.enumerate(letters):
+10 | 
+11 |     for index, letter in enumerate(letters):
+12 |         print(letters[index])  # PLR1736
+   -         blah = letters[index]  # PLR1736
+13 +         blah = letter  # PLR1736
+14 |         assert letters[index]  == "d"  # PLR1736
+15 | 
+16 |     for index, letter in builtins.enumerate(letters):
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:14:16
@@ -118,16 +108,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 16 |     for index, letter in builtins.enumerate(letters):
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-11 11 |     for index, letter in enumerate(letters):
-12 12 |         print(letters[index])  # PLR1736
-13 13 |         blah = letters[index]  # PLR1736
-14    |-        assert letters[index]  == "d"  # PLR1736
-   14 |+        assert letter  == "d"  # PLR1736
-15 15 | 
-16 16 |     for index, letter in builtins.enumerate(letters):
-17 17 |         print(letters[index])  # PLR1736
+11 |     for index, letter in enumerate(letters):
+12 |         print(letters[index])  # PLR1736
+13 |         blah = letters[index]  # PLR1736
+   -         assert letters[index]  == "d"  # PLR1736
+14 +         assert letter  == "d"  # PLR1736
+15 | 
+16 |     for index, letter in builtins.enumerate(letters):
+17 |         print(letters[index])  # PLR1736
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:17:15
@@ -139,16 +127,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 19 |         assert letters[index]  == "d"  # PLR1736
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-14 14 |         assert letters[index]  == "d"  # PLR1736
-15 15 | 
-16 16 |     for index, letter in builtins.enumerate(letters):
-17    |-        print(letters[index])  # PLR1736
-   17 |+        print(letter)  # PLR1736
-18 18 |         blah = letters[index]  # PLR1736
-19 19 |         assert letters[index]  == "d"  # PLR1736
-20 20 | 
+14 |         assert letters[index]  == "d"  # PLR1736
+15 | 
+16 |     for index, letter in builtins.enumerate(letters):
+   -         print(letters[index])  # PLR1736
+17 +         print(letter)  # PLR1736
+18 |         blah = letters[index]  # PLR1736
+19 |         assert letters[index]  == "d"  # PLR1736
+20 | 
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:18:16
@@ -160,16 +146,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 19 |         assert letters[index]  == "d"  # PLR1736
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-15 15 | 
-16 16 |     for index, letter in builtins.enumerate(letters):
-17 17 |         print(letters[index])  # PLR1736
-18    |-        blah = letters[index]  # PLR1736
-   18 |+        blah = letter  # PLR1736
-19 19 |         assert letters[index]  == "d"  # PLR1736
-20 20 | 
-21 21 | 
+15 | 
+16 |     for index, letter in builtins.enumerate(letters):
+17 |         print(letters[index])  # PLR1736
+   -         blah = letters[index]  # PLR1736
+18 +         blah = letter  # PLR1736
+19 |         assert letters[index]  == "d"  # PLR1736
+20 | 
+21 | 
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:19:16
@@ -180,16 +164,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
    |                ^^^^^^^^^^^^^^
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-16 16 |     for index, letter in builtins.enumerate(letters):
-17 17 |         print(letters[index])  # PLR1736
-18 18 |         blah = letters[index]  # PLR1736
-19    |-        assert letters[index]  == "d"  # PLR1736
-   19 |+        assert letter  == "d"  # PLR1736
-20 20 | 
-21 21 | 
-22 22 | def dont_fix_these():
+16 |     for index, letter in builtins.enumerate(letters):
+17 |         print(letters[index])  # PLR1736
+18 |         blah = letters[index]  # PLR1736
+   -         assert letters[index]  == "d"  # PLR1736
+19 +         assert letter  == "d"  # PLR1736
+20 | 
+21 | 
+22 | def dont_fix_these():
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:74:15
@@ -202,16 +184,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
 76 |     # PLR1736
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-71 71 | 
-72 72 |     # PLR1736
-73 73 |     for index, list_item in enumerate(some_list, start=0):
-74    |-        print(some_list[index])
-   74 |+        print(list_item)
-75 75 | 
-76 76 |     # PLR1736
-77 77 |     for index, list_item in enumerate(some_list):
+71 | 
+72 |     # PLR1736
+73 |     for index, list_item in enumerate(some_list, start=0):
+   -         print(some_list[index])
+74 +         print(list_item)
+75 | 
+76 |     # PLR1736
+77 |     for index, list_item in enumerate(some_list):
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:78:15
@@ -222,16 +202,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop
    |               ^^^^^^^^^^^^^^^^
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-75 75 | 
-76 76 |     # PLR1736
-77 77 |     for index, list_item in enumerate(some_list):
-78    |-        print(some_list[index])
-   78 |+        print(list_item)
-79 79 | 
-80 80 | 
-81 81 | def nested_index_lookup():
+75 | 
+76 |     # PLR1736
+77 |     for index, list_item in enumerate(some_list):
+   -         print(some_list[index])
+78 +         print(list_item)
+79 | 
+80 | 
+81 | def nested_index_lookup():
 
 PLR1736 [*] List index lookup in `enumerate()` loop
   --> unnecessary_list_index_lookup.py:85:18
@@ -242,10 +220,8 @@ PLR1736 [*] List index lookup in `enumerate()` loop
    |                  ^^^^^^^^^^^^^^^^^^^
    |
 help: Use the loop variable directly
-
-ℹ Safe fix
-82 82 |     data = {"a": 1, "b": 2}
-83 83 |     column_names = ["a", "b"]
-84 84 |     for index, column_name in enumerate(column_names):
-85    |-        _ = data[column_names[index]]  # PLR1736
-   85 |+        _ = data[column_name]  # PLR1736
+82 |     data = {"a": 1, "b": 2}
+83 |     column_names = ["a", "b"]
+84 |     for index, column_name in enumerate(column_names):
+   -         _ = data[column_names[index]]  # PLR1736
+85 +         _ = data[column_name]  # PLR1736
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap
index 34f07f7c76..625c658359 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap
@@ -12,14 +12,12 @@ PLR2044 [*] Line with empty comment
 5 |         #
   |
 help: Delete the empty comment
-
-ℹ Safe fix
-1 1 | # this line has a non-empty comment and is OK
-2 2 |     # this line is also OK, but the three following lines are not
-3   |-#
-4 3 |     #
-5 4 |         #
-6 5 | 
+1 | # this line has a non-empty comment and is OK
+2 |     # this line is also OK, but the three following lines are not
+  - #
+3 |     #
+4 |         #
+5 | 
 
 PLR2044 [*] Line with empty comment
  --> empty_comment.py:4:5
@@ -31,15 +29,13 @@ PLR2044 [*] Line with empty comment
 5 |         #
   |
 help: Delete the empty comment
-
-ℹ Safe fix
-1 1 | # this line has a non-empty comment and is OK
-2 2 |     # this line is also OK, but the three following lines are not
-3 3 | #
-4   |-    #
-5 4 |         #
-6 5 | 
-7 6 | # this non-empty comment has trailing whitespace and is OK
+1 | # this line has a non-empty comment and is OK
+2 |     # this line is also OK, but the three following lines are not
+3 | #
+  -     #
+4 |         #
+5 | 
+6 | # this non-empty comment has trailing whitespace and is OK
 
 PLR2044 [*] Line with empty comment
  --> empty_comment.py:5:9
@@ -52,15 +48,13 @@ PLR2044 [*] Line with empty comment
 7 | # this non-empty comment has trailing whitespace and is OK
   |
 help: Delete the empty comment
-
-ℹ Safe fix
-2 2 |     # this line is also OK, but the three following lines are not
-3 3 | #
-4 4 |     #
-5   |-        #
-6 5 | 
-7 6 | # this non-empty comment has trailing whitespace and is OK
-8 7 | 
+2 |     # this line is also OK, but the three following lines are not
+3 | #
+4 |     #
+  -         #
+5 | 
+6 | # this non-empty comment has trailing whitespace and is OK
+7 | 
 
 PLR2044 [*] Line with empty comment
   --> empty_comment.py:18:11
@@ -70,16 +64,14 @@ PLR2044 [*] Line with empty comment
    |           ^
    |
 help: Delete the empty comment
-
-ℹ Safe fix
-15 15 | 
-16 16 | 
-17 17 | def foo():  # this comment is OK, the one below is not
-18    |-    pass  #
-   18 |+    pass
-19 19 | 
-20 20 | 
-21 21 | # the lines below have no comments and are OK
+15 | 
+16 | 
+17 | def foo():  # this comment is OK, the one below is not
+   -     pass  #
+18 +     pass
+19 | 
+20 | 
+21 | # the lines below have no comments and are OK
 
 PLR2044 [*] Line with empty comment
   --> empty_comment.py:44:1
@@ -91,15 +83,13 @@ PLR2044 [*] Line with empty comment
 45 | #
    |
 help: Delete the empty comment
-
-ℹ Safe fix
-42 42 | # These should be removed, despite being an empty "block comment".
-43 43 | 
-44 44 | #
-45    |-#
-46 45 | 
-47 46 | # These should also be removed.
-48 47 | 
+42 | # These should be removed, despite being an empty "block comment".
+43 | 
+44 | #
+   - #
+45 | 
+46 | # These should also be removed.
+47 | 
 
 PLR2044 [*] Line with empty comment
   --> empty_comment.py:45:1
@@ -111,15 +101,13 @@ PLR2044 [*] Line with empty comment
 47 | # These should also be removed.
    |
 help: Delete the empty comment
-
-ℹ Safe fix
-42 42 | # These should be removed, despite being an empty "block comment".
-43 43 | 
-44 44 | #
-45    |-#
-46 45 | 
-47 46 | # These should also be removed.
-48 47 | 
+42 | # These should be removed, despite being an empty "block comment".
+43 | 
+44 | #
+   - #
+45 | 
+46 | # These should also be removed.
+47 | 
 
 PLR2044 [*] Line with empty comment
   --> empty_comment.py:58:2
@@ -129,10 +117,8 @@ PLR2044 [*] Line with empty comment
    |  ^
    |
 help: Delete the empty comment
-
-ℹ Safe fix
-55 55 | # This should be removed.
-56 56 | 
-57 57 | α = 1
-58    |-α#
-   58 |+α
+55 | # This should be removed.
+56 | 
+57 | α = 1
+   - α#
+58 + α
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap
index bd171d35a0..0be542bd04 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap
@@ -10,12 +10,10 @@ PLR2044 [*] Line with empty comment
 3 | #
   |
 help: Delete the empty comment
-
-ℹ Safe fix
-1   |-#
-2 1 | x = 0 \
-3 2 | #
-4 3 | +1
+  - #
+1 | x = 0 \
+2 | #
+3 | +1
 
 PLR2044 [*] Line with empty comment
  --> empty_comment_line_continuation.py:3:1
@@ -28,11 +26,9 @@ PLR2044 [*] Line with empty comment
 5 | print(x)
   |
 help: Delete the empty comment
-
-ℹ Safe fix
-1 1 | #
-2 2 | x = 0 \
-3   |-#
-  3 |+
-4 4 | +1
-5 5 | print(x)
+1 | #
+2 | x = 0 \
+  - #
+3 + 
+4 | +1
+5 | print(x)
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap
index e85ad02790..b22d71e821 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap
@@ -12,19 +12,17 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 39 |               pass
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-34 34 | def not_ok0():
-35 35 |     if 1:
-36 36 |         pass
-37    |-    else:
-38    |-        if 2:
-39    |-            pass
-   37 |+    elif 2:
-   38 |+        pass
-40 39 | 
-41 40 | 
-42 41 | def not_ok1():
+34 | def not_ok0():
+35 |     if 1:
+36 |         pass
+   -     else:
+   -         if 2:
+   -             pass
+37 +     elif 2:
+38 +         pass
+39 | 
+40 | 
+41 | def not_ok1():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
   --> collapsible_else_if.py:45:5
@@ -38,22 +36,20 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 48 |           else:
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-42 42 | def not_ok1():
-43 43 |     if 1:
-44 44 |         pass
-   45 |+    elif 2:
-   46 |+        pass
-45 47 |     else:
-46    |-        if 2:
-47    |-            pass
-48    |-        else:
-49    |-            pass
-   48 |+        pass
-50 49 | 
-51 50 | 
-52 51 | def not_ok1_with_comments():
+42 | def not_ok1():
+43 |     if 1:
+44 |         pass
+45 +     elif 2:
+46 +         pass
+47 |     else:
+   -         if 2:
+   -             pass
+   -         else:
+   -             pass
+48 +         pass
+49 | 
+50 | 
+51 | def not_ok1_with_comments():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
   --> collapsible_else_if.py:55:5
@@ -68,24 +64,22 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 59 |           else:
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-52 52 | def not_ok1_with_comments():
-53 53 |     if 1:
-54 54 |         pass
-   55 |+    # inner comment
-   56 |+    elif 2:
-   57 |+        pass
-55 58 |     else:
-56    |-        # inner comment
-57    |-        if 2:
-58    |-            pass
-59    |-        else:
-60    |-            pass  # final pass comment
-   59 |+        pass  # final pass comment
-61 60 | 
-62 61 | 
-63 62 | # Regression test for https://github.com/apache/airflow/blob/f1e1cdcc3b2826e68ba133f350300b5065bbca33/airflow/models/dag.py#L1737
+52 | def not_ok1_with_comments():
+53 |     if 1:
+54 |         pass
+55 +     # inner comment
+56 +     elif 2:
+57 +         pass
+58 |     else:
+   -         # inner comment
+   -         if 2:
+   -             pass
+   -         else:
+   -             pass  # final pass comment
+59 +         pass  # final pass comment
+60 | 
+61 | 
+62 | # Regression test for https://github.com/apache/airflow/blob/f1e1cdcc3b2826e68ba133f350300b5065bbca33/airflow/models/dag.py#L1737
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
   --> collapsible_else_if.py:69:5
@@ -99,22 +93,20 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 72 |           else:
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-66 66 |         print(1)
-67 67 |     elif True:
-68 68 |         print(2)
-   69 |+    elif True:
-   70 |+        print(3)
-69 71 |     else:
-70    |-        if True:
-71    |-            print(3)
-72    |-        else:
-73    |-            print(4)
-   72 |+        print(4)
-74 73 | 
-75 74 | 
-76 75 | def not_ok3():
+66 |         print(1)
+67 |     elif True:
+68 |         print(2)
+69 +     elif True:
+70 +         print(3)
+71 |     else:
+   -         if True:
+   -             print(3)
+   -         else:
+   -             print(4)
+72 +         print(4)
+73 | 
+74 | 
+75 | def not_ok3():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
   --> collapsible_else_if.py:79:5
@@ -127,19 +119,17 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 81 |           else: pass
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-76 76 | def not_ok3():
-77 77 |     if 1:
-78 78 |         pass
-79    |-    else:
-80    |-        if 2: pass
-81    |-        else: pass
-   79 |+    elif 2: pass
-   80 |+    else: pass
-82 81 | 
-83 82 | 
-84 83 | def not_ok4():
+76 | def not_ok3():
+77 |     if 1:
+78 |         pass
+   -     else:
+   -         if 2: pass
+   -         else: pass
+79 +     elif 2: pass
+80 +     else: pass
+81 | 
+82 | 
+83 | def not_ok4():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
   --> collapsible_else_if.py:87:5
@@ -153,20 +143,18 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 90 |               pass
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-84 84 | def not_ok4():
-85 85 |     if 1:
-86 86 |         pass
-   87 |+    elif 2: pass
-87 88 |     else:
-88    |-        if 2: pass
-89    |-        else:
-90    |-            pass
-   89 |+        pass
-91 90 | 
-92 91 | 
-93 92 | def not_ok5():
+84 | def not_ok4():
+85 |     if 1:
+86 |         pass
+87 +     elif 2: pass
+88 |     else:
+   -         if 2: pass
+   -         else:
+   -             pass
+89 +         pass
+90 | 
+91 | 
+92 | def not_ok5():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
   --> collapsible_else_if.py:96:5
@@ -180,21 +168,19 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 99 |           else: pass
    |
 help: Convert to `elif`
-
-ℹ Safe fix
-93  93  | def not_ok5():
-94  94  |     if 1:
-95  95  |         pass
-96      |-    else:
-97      |-        if 2:
-98      |-            pass
-99      |-        else: pass
-    96  |+    elif 2:
-    97  |+        pass
-    98  |+    else: pass
-100 99  | 
-101 100 | 
-102 101 | def not_ok1_with_multiline_comments():
+93  | def not_ok5():
+94  |     if 1:
+95  |         pass
+    -     else:
+    -         if 2:
+    -             pass
+    -         else: pass
+96  +     elif 2:
+97  +         pass
+98  +     else: pass
+99  | 
+100 | 
+101 | def not_ok1_with_multiline_comments():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
    --> collapsible_else_if.py:105:5
@@ -210,26 +196,24 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 110 |           else:
     |
 help: Convert to `elif`
-
-ℹ Safe fix
-102 102 | def not_ok1_with_multiline_comments():
-103 103 |     if 1:
-104 104 |         pass
-    105 |+    # inner comment which happens
-    106 |+    # to be longer than one line
-    107 |+    elif 2:
-    108 |+        pass
-105 109 |     else:
-106     |-        # inner comment which happens
-107     |-        # to be longer than one line
-108     |-        if 2:
-109     |-            pass
-110     |-        else:
-111     |-            pass  # final pass comment
-    110 |+        pass  # final pass comment
-112 111 | 
-113 112 | 
-114 113 | def not_ok1_with_deep_indented_comments():
+102 | def not_ok1_with_multiline_comments():
+103 |     if 1:
+104 |         pass
+105 +     # inner comment which happens
+106 +     # to be longer than one line
+107 +     elif 2:
+108 +         pass
+109 |     else:
+    -         # inner comment which happens
+    -         # to be longer than one line
+    -         if 2:
+    -             pass
+    -         else:
+    -             pass  # final pass comment
+110 +         pass  # final pass comment
+111 | 
+112 | 
+113 | def not_ok1_with_deep_indented_comments():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
    --> collapsible_else_if.py:117:5
@@ -244,24 +228,22 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 121 |           else:
     |
 help: Convert to `elif`
-
-ℹ Safe fix
-114 114 | def not_ok1_with_deep_indented_comments():
-115 115 |     if 1:
-116 116 |         pass
-    117 |+    # inner comment which happens to be overly indented
-    118 |+    elif 2:
-    119 |+        pass
-117 120 |     else:
-118     |-            # inner comment which happens to be overly indented
-119     |-        if 2:
-120     |-            pass
-121     |-        else:
-122     |-            pass  # final pass comment
-    121 |+        pass  # final pass comment
-123 122 | 
-124 123 | 
-125 124 | def not_ok1_with_shallow_indented_comments():
+114 | def not_ok1_with_deep_indented_comments():
+115 |     if 1:
+116 |         pass
+117 +     # inner comment which happens to be overly indented
+118 +     elif 2:
+119 +         pass
+120 |     else:
+    -             # inner comment which happens to be overly indented
+    -         if 2:
+    -             pass
+    -         else:
+    -             pass  # final pass comment
+121 +         pass  # final pass comment
+122 | 
+123 | 
+124 | def not_ok1_with_shallow_indented_comments():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
    --> collapsible_else_if.py:128:5
@@ -276,24 +258,22 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 132 |           else:
     |
 help: Convert to `elif`
-
-ℹ Safe fix
-125 125 | def not_ok1_with_shallow_indented_comments():
-126 126 |     if 1:
-127 127 |         pass
-128     |-    else:
-129 128 |     # inner comment which happens to be under indented
-130     |-        if 2:
-131     |-            pass
-132     |-        else:
-133     |-            pass  # final pass comment
-    129 |+    elif 2:
-    130 |+        pass
-    131 |+    else:
-    132 |+        pass  # final pass comment
-134 133 | 
-135 134 | 
-136 135 | def not_ok1_with_mixed_indented_comments():
+125 | def not_ok1_with_shallow_indented_comments():
+126 |     if 1:
+127 |         pass
+    -     else:
+128 |     # inner comment which happens to be under indented
+    -         if 2:
+    -             pass
+    -         else:
+    -             pass  # final pass comment
+129 +     elif 2:
+130 +         pass
+131 +     else:
+132 +         pass  # final pass comment
+133 | 
+134 | 
+135 | def not_ok1_with_mixed_indented_comments():
 
 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
    --> collapsible_else_if.py:139:5
@@ -310,22 +290,20 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation
 145 |           else:
     |
 help: Convert to `elif`
-
-ℹ Safe fix
-136 136 | def not_ok1_with_mixed_indented_comments():
-137 137 |     if 1:
-138 138 |         pass
-    139 |+        # inner comment which has mixed
-    140 |+    # indentation levels
-    141 |+            # which is pretty weird
-    142 |+    elif 2:
-    143 |+        pass
-139 144 |     else:
-140     |-            # inner comment which has mixed
-141     |-        # indentation levels
-142     |-                # which is pretty weird
-143     |-        if 2:
-144     |-            pass
-145     |-        else:
-146     |-            pass  # final pass comment
-    145 |+        pass  # final pass comment
+136 | def not_ok1_with_mixed_indented_comments():
+137 |     if 1:
+138 |         pass
+139 +         # inner comment which has mixed
+140 +     # indentation levels
+141 +             # which is pretty weird
+142 +     elif 2:
+143 +         pass
+144 |     else:
+    -             # inner comment which has mixed
+    -         # indentation levels
+    -                 # which is pretty weird
+    -         if 2:
+    -             pass
+    -         else:
+    -             pass  # final pass comment
+145 +         pass  # final pass comment
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap
index c8f98fb600..c31d2b5662 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap
@@ -12,16 +12,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 18 | a_list = a_list + ["to concat"]
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-13 13 | some_set = {"elem"}
-14 14 | mat1, mat2 = None, None
-15 15 | 
-16    |-some_string = some_string + "a very long end of string"
-   16 |+some_string += "a very long end of string"
-17 17 | index = index - 1
-18 18 | a_list = a_list + ["to concat"]
-19 19 | some_set = some_set | {"to concat"}
+13 | some_set = {"elem"}
+14 | mat1, mat2 = None, None
+15 | 
+   - some_string = some_string + "a very long end of string"
+16 + some_string += "a very long end of string"
+17 | index = index - 1
+18 | a_list = a_list + ["to concat"]
+19 | some_set = some_set | {"to concat"}
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `-=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:17:1
@@ -33,16 +32,15 @@ PLR6104 [*] Use `-=` to perform an augmented assignment directly
 19 | some_set = some_set | {"to concat"}
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-14 14 | mat1, mat2 = None, None
-15 15 | 
-16 16 | some_string = some_string + "a very long end of string"
-17    |-index = index - 1
-   17 |+index -= 1
-18 18 | a_list = a_list + ["to concat"]
-19 19 | some_set = some_set | {"to concat"}
-20 20 | to_multiply = to_multiply * 5
+14 | mat1, mat2 = None, None
+15 | 
+16 | some_string = some_string + "a very long end of string"
+   - index = index - 1
+17 + index -= 1
+18 | a_list = a_list + ["to concat"]
+19 | some_set = some_set | {"to concat"}
+20 | to_multiply = to_multiply * 5
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:18:1
@@ -55,16 +53,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 20 | to_multiply = to_multiply * 5
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | some_string = some_string + "a very long end of string"
-17 17 | index = index - 1
-18    |-a_list = a_list + ["to concat"]
-   18 |+a_list += ["to concat"]
-19 19 | some_set = some_set | {"to concat"}
-20 20 | to_multiply = to_multiply * 5
-21 21 | to_multiply = 5 * to_multiply
+15 | 
+16 | some_string = some_string + "a very long end of string"
+17 | index = index - 1
+   - a_list = a_list + ["to concat"]
+18 + a_list += ["to concat"]
+19 | some_set = some_set | {"to concat"}
+20 | to_multiply = to_multiply * 5
+21 | to_multiply = 5 * to_multiply
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `|=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:19:1
@@ -77,16 +74,15 @@ PLR6104 [*] Use `|=` to perform an augmented assignment directly
 21 | to_multiply = 5 * to_multiply
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-16 16 | some_string = some_string + "a very long end of string"
-17 17 | index = index - 1
-18 18 | a_list = a_list + ["to concat"]
-19    |-some_set = some_set | {"to concat"}
-   19 |+some_set |= {"to concat"}
-20 20 | to_multiply = to_multiply * 5
-21 21 | to_multiply = 5 * to_multiply
-22 22 | to_multiply = to_multiply * to_multiply
+16 | some_string = some_string + "a very long end of string"
+17 | index = index - 1
+18 | a_list = a_list + ["to concat"]
+   - some_set = some_set | {"to concat"}
+19 + some_set |= {"to concat"}
+20 | to_multiply = to_multiply * 5
+21 | to_multiply = 5 * to_multiply
+22 | to_multiply = to_multiply * to_multiply
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:20:1
@@ -99,16 +95,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 22 | to_multiply = to_multiply * to_multiply
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-17 17 | index = index - 1
-18 18 | a_list = a_list + ["to concat"]
-19 19 | some_set = some_set | {"to concat"}
-20    |-to_multiply = to_multiply * 5
-   20 |+to_multiply *= 5
-21 21 | to_multiply = 5 * to_multiply
-22 22 | to_multiply = to_multiply * to_multiply
-23 23 | to_divide = to_divide / 5
+17 | index = index - 1
+18 | a_list = a_list + ["to concat"]
+19 | some_set = some_set | {"to concat"}
+   - to_multiply = to_multiply * 5
+20 + to_multiply *= 5
+21 | to_multiply = 5 * to_multiply
+22 | to_multiply = to_multiply * to_multiply
+23 | to_divide = to_divide / 5
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:21:1
@@ -121,16 +116,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 23 | to_divide = to_divide / 5
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-18 18 | a_list = a_list + ["to concat"]
-19 19 | some_set = some_set | {"to concat"}
-20 20 | to_multiply = to_multiply * 5
-21    |-to_multiply = 5 * to_multiply
-   21 |+to_multiply *= 5
-22 22 | to_multiply = to_multiply * to_multiply
-23 23 | to_divide = to_divide / 5
-24 24 | to_divide = to_divide // 5
+18 | a_list = a_list + ["to concat"]
+19 | some_set = some_set | {"to concat"}
+20 | to_multiply = to_multiply * 5
+   - to_multiply = 5 * to_multiply
+21 + to_multiply *= 5
+22 | to_multiply = to_multiply * to_multiply
+23 | to_divide = to_divide / 5
+24 | to_divide = to_divide // 5
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:22:1
@@ -143,16 +137,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 24 | to_divide = to_divide // 5
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-19 19 | some_set = some_set | {"to concat"}
-20 20 | to_multiply = to_multiply * 5
-21 21 | to_multiply = 5 * to_multiply
-22    |-to_multiply = to_multiply * to_multiply
-   22 |+to_multiply *= to_multiply
-23 23 | to_divide = to_divide / 5
-24 24 | to_divide = to_divide // 5
-25 25 | to_cube = to_cube**3
+19 | some_set = some_set | {"to concat"}
+20 | to_multiply = to_multiply * 5
+21 | to_multiply = 5 * to_multiply
+   - to_multiply = to_multiply * to_multiply
+22 + to_multiply *= to_multiply
+23 | to_divide = to_divide / 5
+24 | to_divide = to_divide // 5
+25 | to_cube = to_cube**3
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `/=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:23:1
@@ -165,16 +158,15 @@ PLR6104 [*] Use `/=` to perform an augmented assignment directly
 25 | to_cube = to_cube**3
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-20 20 | to_multiply = to_multiply * 5
-21 21 | to_multiply = 5 * to_multiply
-22 22 | to_multiply = to_multiply * to_multiply
-23    |-to_divide = to_divide / 5
-   23 |+to_divide /= 5
-24 24 | to_divide = to_divide // 5
-25 25 | to_cube = to_cube**3
-26 26 | to_cube = 3**to_cube
+20 | to_multiply = to_multiply * 5
+21 | to_multiply = 5 * to_multiply
+22 | to_multiply = to_multiply * to_multiply
+   - to_divide = to_divide / 5
+23 + to_divide /= 5
+24 | to_divide = to_divide // 5
+25 | to_cube = to_cube**3
+26 | to_cube = 3**to_cube
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `//=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:24:1
@@ -187,16 +179,15 @@ PLR6104 [*] Use `//=` to perform an augmented assignment directly
 26 | to_cube = 3**to_cube
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-21 21 | to_multiply = 5 * to_multiply
-22 22 | to_multiply = to_multiply * to_multiply
-23 23 | to_divide = to_divide / 5
-24    |-to_divide = to_divide // 5
-   24 |+to_divide //= 5
-25 25 | to_cube = to_cube**3
-26 26 | to_cube = 3**to_cube
-27 27 | to_cube = to_cube**to_cube
+21 | to_multiply = 5 * to_multiply
+22 | to_multiply = to_multiply * to_multiply
+23 | to_divide = to_divide / 5
+   - to_divide = to_divide // 5
+24 + to_divide //= 5
+25 | to_cube = to_cube**3
+26 | to_cube = 3**to_cube
+27 | to_cube = to_cube**to_cube
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `**=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:25:1
@@ -209,16 +200,15 @@ PLR6104 [*] Use `**=` to perform an augmented assignment directly
 27 | to_cube = to_cube**to_cube
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-22 22 | to_multiply = to_multiply * to_multiply
-23 23 | to_divide = to_divide / 5
-24 24 | to_divide = to_divide // 5
-25    |-to_cube = to_cube**3
-   25 |+to_cube **= 3
-26 26 | to_cube = 3**to_cube
-27 27 | to_cube = to_cube**to_cube
-28 28 | timeDiffSeconds = timeDiffSeconds % 60
+22 | to_multiply = to_multiply * to_multiply
+23 | to_divide = to_divide / 5
+24 | to_divide = to_divide // 5
+   - to_cube = to_cube**3
+25 + to_cube **= 3
+26 | to_cube = 3**to_cube
+27 | to_cube = to_cube**to_cube
+28 | timeDiffSeconds = timeDiffSeconds % 60
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `**=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:27:1
@@ -231,16 +221,15 @@ PLR6104 [*] Use `**=` to perform an augmented assignment directly
 29 | flags = flags & 0x1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-24 24 | to_divide = to_divide // 5
-25 25 | to_cube = to_cube**3
-26 26 | to_cube = 3**to_cube
-27    |-to_cube = to_cube**to_cube
-   27 |+to_cube **= to_cube
-28 28 | timeDiffSeconds = timeDiffSeconds % 60
-29 29 | flags = flags & 0x1
-30 30 | flags = flags | 0x1
+24 | to_divide = to_divide // 5
+25 | to_cube = to_cube**3
+26 | to_cube = 3**to_cube
+   - to_cube = to_cube**to_cube
+27 + to_cube **= to_cube
+28 | timeDiffSeconds = timeDiffSeconds % 60
+29 | flags = flags & 0x1
+30 | flags = flags | 0x1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `%=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:28:1
@@ -253,16 +242,15 @@ PLR6104 [*] Use `%=` to perform an augmented assignment directly
 30 | flags = flags | 0x1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-25 25 | to_cube = to_cube**3
-26 26 | to_cube = 3**to_cube
-27 27 | to_cube = to_cube**to_cube
-28    |-timeDiffSeconds = timeDiffSeconds % 60
-   28 |+timeDiffSeconds %= 60
-29 29 | flags = flags & 0x1
-30 30 | flags = flags | 0x1
-31 31 | flags = flags ^ 0x1
+25 | to_cube = to_cube**3
+26 | to_cube = 3**to_cube
+27 | to_cube = to_cube**to_cube
+   - timeDiffSeconds = timeDiffSeconds % 60
+28 + timeDiffSeconds %= 60
+29 | flags = flags & 0x1
+30 | flags = flags | 0x1
+31 | flags = flags ^ 0x1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `&=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:29:1
@@ -275,16 +263,15 @@ PLR6104 [*] Use `&=` to perform an augmented assignment directly
 31 | flags = flags ^ 0x1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-26 26 | to_cube = 3**to_cube
-27 27 | to_cube = to_cube**to_cube
-28 28 | timeDiffSeconds = timeDiffSeconds % 60
-29    |-flags = flags & 0x1
-   29 |+flags &= 0x1
-30 30 | flags = flags | 0x1
-31 31 | flags = flags ^ 0x1
-32 32 | flags = flags << 1
+26 | to_cube = 3**to_cube
+27 | to_cube = to_cube**to_cube
+28 | timeDiffSeconds = timeDiffSeconds % 60
+   - flags = flags & 0x1
+29 + flags &= 0x1
+30 | flags = flags | 0x1
+31 | flags = flags ^ 0x1
+32 | flags = flags << 1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `|=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:30:1
@@ -297,16 +284,15 @@ PLR6104 [*] Use `|=` to perform an augmented assignment directly
 32 | flags = flags << 1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-27 27 | to_cube = to_cube**to_cube
-28 28 | timeDiffSeconds = timeDiffSeconds % 60
-29 29 | flags = flags & 0x1
-30    |-flags = flags | 0x1
-   30 |+flags |= 0x1
-31 31 | flags = flags ^ 0x1
-32 32 | flags = flags << 1
-33 33 | flags = flags >> 1
+27 | to_cube = to_cube**to_cube
+28 | timeDiffSeconds = timeDiffSeconds % 60
+29 | flags = flags & 0x1
+   - flags = flags | 0x1
+30 + flags |= 0x1
+31 | flags = flags ^ 0x1
+32 | flags = flags << 1
+33 | flags = flags >> 1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `^=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:31:1
@@ -319,16 +305,15 @@ PLR6104 [*] Use `^=` to perform an augmented assignment directly
 33 | flags = flags >> 1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-28 28 | timeDiffSeconds = timeDiffSeconds % 60
-29 29 | flags = flags & 0x1
-30 30 | flags = flags | 0x1
-31    |-flags = flags ^ 0x1
-   31 |+flags ^= 0x1
-32 32 | flags = flags << 1
-33 33 | flags = flags >> 1
-34 34 | mat1 = mat1 @ mat2
+28 | timeDiffSeconds = timeDiffSeconds % 60
+29 | flags = flags & 0x1
+30 | flags = flags | 0x1
+   - flags = flags ^ 0x1
+31 + flags ^= 0x1
+32 | flags = flags << 1
+33 | flags = flags >> 1
+34 | mat1 = mat1 @ mat2
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `<<=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:32:1
@@ -341,16 +326,15 @@ PLR6104 [*] Use `<<=` to perform an augmented assignment directly
 34 | mat1 = mat1 @ mat2
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-29 29 | flags = flags & 0x1
-30 30 | flags = flags | 0x1
-31 31 | flags = flags ^ 0x1
-32    |-flags = flags << 1
-   32 |+flags <<= 1
-33 33 | flags = flags >> 1
-34 34 | mat1 = mat1 @ mat2
-35 35 | a_list[1] = a_list[1] + 1
+29 | flags = flags & 0x1
+30 | flags = flags | 0x1
+31 | flags = flags ^ 0x1
+   - flags = flags << 1
+32 + flags <<= 1
+33 | flags = flags >> 1
+34 | mat1 = mat1 @ mat2
+35 | a_list[1] = a_list[1] + 1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `>>=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:33:1
@@ -363,16 +347,15 @@ PLR6104 [*] Use `>>=` to perform an augmented assignment directly
 35 | a_list[1] = a_list[1] + 1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-30 30 | flags = flags | 0x1
-31 31 | flags = flags ^ 0x1
-32 32 | flags = flags << 1
-33    |-flags = flags >> 1
-   33 |+flags >>= 1
-34 34 | mat1 = mat1 @ mat2
-35 35 | a_list[1] = a_list[1] + 1
-36 36 | 
+30 | flags = flags | 0x1
+31 | flags = flags ^ 0x1
+32 | flags = flags << 1
+   - flags = flags >> 1
+33 + flags >>= 1
+34 | mat1 = mat1 @ mat2
+35 | a_list[1] = a_list[1] + 1
+36 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `@=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:34:1
@@ -384,16 +367,15 @@ PLR6104 [*] Use `@=` to perform an augmented assignment directly
 35 | a_list[1] = a_list[1] + 1
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-31 31 | flags = flags ^ 0x1
-32 32 | flags = flags << 1
-33 33 | flags = flags >> 1
-34    |-mat1 = mat1 @ mat2
-   34 |+mat1 @= mat2
-35 35 | a_list[1] = a_list[1] + 1
-36 36 | 
-37 37 | a_list[0:2] = a_list[0:2] * 3
+31 | flags = flags ^ 0x1
+32 | flags = flags << 1
+33 | flags = flags >> 1
+   - mat1 = mat1 @ mat2
+34 + mat1 @= mat2
+35 | a_list[1] = a_list[1] + 1
+36 | 
+37 | a_list[0:2] = a_list[0:2] * 3
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:35:1
@@ -406,16 +388,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 37 | a_list[0:2] = a_list[0:2] * 3
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-32 32 | flags = flags << 1
-33 33 | flags = flags >> 1
-34 34 | mat1 = mat1 @ mat2
-35    |-a_list[1] = a_list[1] + 1
-   35 |+a_list[1] += 1
-36 36 | 
-37 37 | a_list[0:2] = a_list[0:2] * 3
-38 38 | a_list[:2] = a_list[:2] * 3
+32 | flags = flags << 1
+33 | flags = flags >> 1
+34 | mat1 = mat1 @ mat2
+   - a_list[1] = a_list[1] + 1
+35 + a_list[1] += 1
+36 | 
+37 | a_list[0:2] = a_list[0:2] * 3
+38 | a_list[:2] = a_list[:2] * 3
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:37:1
@@ -428,16 +409,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 39 | a_list[1:] = a_list[1:] * 3
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-34 34 | mat1 = mat1 @ mat2
-35 35 | a_list[1] = a_list[1] + 1
-36 36 | 
-37    |-a_list[0:2] = a_list[0:2] * 3
-   37 |+a_list[0:2] *= 3
-38 38 | a_list[:2] = a_list[:2] * 3
-39 39 | a_list[1:] = a_list[1:] * 3
-40 40 | a_list[:] = a_list[:] * 3
+34 | mat1 = mat1 @ mat2
+35 | a_list[1] = a_list[1] + 1
+36 | 
+   - a_list[0:2] = a_list[0:2] * 3
+37 + a_list[0:2] *= 3
+38 | a_list[:2] = a_list[:2] * 3
+39 | a_list[1:] = a_list[1:] * 3
+40 | a_list[:] = a_list[:] * 3
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:38:1
@@ -449,16 +429,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 40 | a_list[:] = a_list[:] * 3
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-35 35 | a_list[1] = a_list[1] + 1
-36 36 | 
-37 37 | a_list[0:2] = a_list[0:2] * 3
-38    |-a_list[:2] = a_list[:2] * 3
-   38 |+a_list[:2] *= 3
-39 39 | a_list[1:] = a_list[1:] * 3
-40 40 | a_list[:] = a_list[:] * 3
-41 41 | 
+35 | a_list[1] = a_list[1] + 1
+36 | 
+37 | a_list[0:2] = a_list[0:2] * 3
+   - a_list[:2] = a_list[:2] * 3
+38 + a_list[:2] *= 3
+39 | a_list[1:] = a_list[1:] * 3
+40 | a_list[:] = a_list[:] * 3
+41 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:39:1
@@ -470,16 +449,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 40 | a_list[:] = a_list[:] * 3
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-36 36 | 
-37 37 | a_list[0:2] = a_list[0:2] * 3
-38 38 | a_list[:2] = a_list[:2] * 3
-39    |-a_list[1:] = a_list[1:] * 3
-   39 |+a_list[1:] *= 3
-40 40 | a_list[:] = a_list[:] * 3
-41 41 | 
-42 42 | index = index * (index + 10)
+36 | 
+37 | a_list[0:2] = a_list[0:2] * 3
+38 | a_list[:2] = a_list[:2] * 3
+   - a_list[1:] = a_list[1:] * 3
+39 + a_list[1:] *= 3
+40 | a_list[:] = a_list[:] * 3
+41 | 
+42 | index = index * (index + 10)
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:40:1
@@ -492,16 +470,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
 42 | index = index * (index + 10)
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-37 37 | a_list[0:2] = a_list[0:2] * 3
-38 38 | a_list[:2] = a_list[:2] * 3
-39 39 | a_list[1:] = a_list[1:] * 3
-40    |-a_list[:] = a_list[:] * 3
-   40 |+a_list[:] *= 3
-41 41 | 
-42 42 | index = index * (index + 10)
-43 43 | 
+37 | a_list[0:2] = a_list[0:2] * 3
+38 | a_list[:2] = a_list[:2] * 3
+39 | a_list[1:] = a_list[1:] * 3
+   - a_list[:] = a_list[:] * 3
+40 + a_list[:] *= 3
+41 | 
+42 | index = index * (index + 10)
+43 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `*=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:42:1
@@ -512,16 +489,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-39 39 | a_list[1:] = a_list[1:] * 3
-40 40 | a_list[:] = a_list[:] * 3
-41 41 | 
-42    |-index = index * (index + 10)
-   42 |+index *= (index + 10)
-43 43 | 
-44 44 | 
-45 45 | class T:
+39 | a_list[1:] = a_list[1:] * 3
+40 | a_list[:] = a_list[:] * 3
+41 | 
+   - index = index * (index + 10)
+42 + index *= (index + 10)
+43 | 
+44 | 
+45 | class T:
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:47:9
@@ -532,16 +508,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
    |         ^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-44 44 | 
-45 45 | class T:
-46 46 |     def t(self):
-47    |-        self.a = self.a + 1
-   47 |+        self.a += 1
-48 48 | 
-49 49 | 
-50 50 | obj = T()
+44 | 
+45 | class T:
+46 |     def t(self):
+   -         self.a = self.a + 1
+47 +         self.a += 1
+48 | 
+49 | 
+50 | obj = T()
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:51:1
@@ -551,16 +526,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
    | ^^^^^^^^^^^^^^^^^
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-48 48 | 
-49 49 | 
-50 50 | obj = T()
-51    |-obj.a = obj.a + 1
-   51 |+obj.a += 1
-52 52 | 
-53 53 | 
-54 54 | a = a+-1
+48 | 
+49 | 
+50 | obj = T()
+   - obj.a = obj.a + 1
+51 + obj.a += 1
+52 | 
+53 | 
+54 | a = a+-1
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:54:1
@@ -571,16 +545,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-51 51 | obj.a = obj.a + 1
-52 52 | 
-53 53 | 
-54    |-a = a+-1
-   54 |+a += -1
-55 55 | 
-56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672
-57 57 | test = 0x5
+51 | obj.a = obj.a + 1
+52 | 
+53 | 
+   - a = a+-1
+54 + a += -1
+55 | 
+56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672
+57 | test = 0x5
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:58:1
@@ -593,16 +566,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 60 | test2 = b""
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-55 55 | 
-56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672
-57 57 | test = 0x5
-58    |-test = test + 0xBA
-   58 |+test += 0xBA
-59 59 | 
-60 60 | test2 = b""
-61 61 | test2 = test2 + b"\000"
+55 | 
+56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672
+57 | test = 0x5
+   - test = test + 0xBA
+58 + test += 0xBA
+59 | 
+60 | test2 = b""
+61 | test2 = test2 + b"\000"
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:61:1
@@ -614,16 +586,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 63 | test3 = ""
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-58 58 | test = test + 0xBA
-59 59 | 
-60 60 | test2 = b""
-61    |-test2 = test2 + b"\000"
-   61 |+test2 += b"\000"
-62 62 | 
-63 63 | test3 = ""
-64 64 | test3 = test3 + (   a := R""
+58 | test = test + 0xBA
+59 | 
+60 | test2 = b""
+   - test2 = test2 + b"\000"
+61 + test2 += b"\000"
+62 | 
+63 | test3 = ""
+64 | test3 = test3 + (   a := R""
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:64:1
@@ -636,16 +607,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 67 |   test4 = []
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-61 61 | test2 = test2 + b"\000"
-62 62 | 
-63 63 | test3 = ""
-64    |-test3 = test3 + (   a := R""
-   64 |+test3 += (   a := R""
-65 65 |                          f"oo"   )
-66 66 | 
-67 67 | test4 = []
+61 | test2 = test2 + b"\000"
+62 | 
+63 | test3 = ""
+   - test3 = test3 + (   a := R""
+64 + test3 += (   a := R""
+65 |                          f"oo"   )
+66 | 
+67 | test4 = []
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:68:1
@@ -660,16 +630,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 73 |   test5 = test5 + (
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-65 65 |                          f"oo"   )
-66 66 | 
-67 67 | test4 = []
-68    |-test4 = test4 + ( e
-   68 |+test4 += ( e
-69 69 |                   for e in
-70 70 |                   range(10)
-71 71 |                   )
+65 |                          f"oo"   )
+66 | 
+67 | test4 = []
+   - test4 = test4 + ( e
+68 + test4 += ( e
+69 |                   for e in
+70 |                   range(10)
+71 |                   )
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:73:1
@@ -686,16 +655,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 79 |   test6 = test6 + \
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-70 70 |                   range(10)
-71 71 |                   )
-72 72 | 
-73    |-test5 = test5 + (
-   73 |+test5 += (
-74 74 |     4
-75 75 |     *
-76 76 |     10
+70 |                   range(10)
+71 |                   )
+72 | 
+   - test5 = test5 + (
+73 + test5 += (
+74 |     4
+75 |     *
+76 |     10
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:79:1
@@ -713,17 +681,16 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 86 |   test7 = \
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-76 76 |     10
-77 77 | )
-78 78 | 
-79    |-test6 = test6 + \
-80    |-        (
-   79 |+test6 += (
-81 80 |             4
-82 81 |             *
-83 82 |             10
+76 |     10
+77 | )
+78 | 
+   - test6 = test6 + \
+   -         (
+79 + test6 += (
+80 |             4
+81 |             *
+82 |             10
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:86:1
@@ -738,18 +705,17 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
 90 |   test8 = \
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-83 83 |             10
-84 84 |         )
-85 85 | 
-86    |-test7 = \
-87    |-        100 \
-88    |-    + test7
-   86 |+test7 += 100
-89 87 | 
-90 88 | test8 = \
-91 89 |     886 \
+83 |             10
+84 |         )
+85 | 
+   - test7 = \
+   -         100 \
+   -     + test7
+86 + test7 += 100
+87 | 
+88 | test8 = \
+89 |     886 \
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6104 [*] Use `+=` to perform an augmented assignment directly
   --> non_augmented_assignment.py:90:1
@@ -764,17 +730,16 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly
    | |_________^
    |
 help: Replace with augmented assignment
-
-ℹ Unsafe fix
-87 87 |         100 \
-88 88 |     + test7
-89 89 | 
-90    |-test8 = \
-91    |-    886 \
-92    |-    + \
-93    |- \
-94    |-    test8
-   90 |+test8 += 886
-95 91 | 
-96 92 | 
-97 93 | # OK
+87 |         100 \
+88 |     + test7
+89 | 
+   - test8 = \
+   -     886 \
+   -     + \
+   -  \
+   -     test8
+90 + test8 += 886
+91 | 
+92 | 
+93 | # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap
index caf82f42de..256db784d9 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap
@@ -11,14 +11,13 @@ PLR6201 [*] Use a set literal when testing for membership
 4 | 1 in (
   |
 help: Convert to `set`
-
-ℹ Unsafe fix
-1 1 | # Errors
-2   |-1 in [1, 2, 3]
-  2 |+1 in {1, 2, 3}
-3 3 | 1 in (1, 2, 3)
-4 4 | 1 in (
-5 5 |     1, 2, 3
+1 | # Errors
+  - 1 in [1, 2, 3]
+2 + 1 in {1, 2, 3}
+3 | 1 in (1, 2, 3)
+4 | 1 in (
+5 |     1, 2, 3
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6201 [*] Use a set literal when testing for membership
  --> literal_membership.py:3:6
@@ -31,15 +30,14 @@ PLR6201 [*] Use a set literal when testing for membership
 5 |     1, 2, 3
   |
 help: Convert to `set`
-
-ℹ Unsafe fix
-1 1 | # Errors
-2 2 | 1 in [1, 2, 3]
-3   |-1 in (1, 2, 3)
-  3 |+1 in {1, 2, 3}
-4 4 | 1 in (
-5 5 |     1, 2, 3
-6 6 | )
+1 | # Errors
+2 | 1 in [1, 2, 3]
+  - 1 in (1, 2, 3)
+3 + 1 in {1, 2, 3}
+4 | 1 in (
+5 |     1, 2, 3
+6 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6201 [*] Use a set literal when testing for membership
  --> literal_membership.py:4:6
@@ -55,19 +53,18 @@ PLR6201 [*] Use a set literal when testing for membership
 8 |   "cherry" in fruits
   |
 help: Convert to `set`
-
-ℹ Unsafe fix
-1 1 | # Errors
-2 2 | 1 in [1, 2, 3]
-3 3 | 1 in (1, 2, 3)
-4   |-1 in (
-  4 |+1 in {
-5 5 |     1, 2, 3
-6   |-)
-  6 |+}
-7 7 | fruits = ["cherry", "grapes"]
-8 8 | "cherry" in fruits
-9 9 | _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")}
+1 | # Errors
+2 | 1 in [1, 2, 3]
+3 | 1 in (1, 2, 3)
+  - 1 in (
+4 + 1 in {
+5 |     1, 2, 3
+  - )
+6 + }
+7 | fruits = ["cherry", "grapes"]
+8 | "cherry" in fruits
+9 | _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")}
+note: This is an unsafe fix and may change runtime behavior
 
 PLR6201 [*] Use a set literal when testing for membership
   --> literal_membership.py:9:70
@@ -80,13 +77,12 @@ PLR6201 [*] Use a set literal when testing for membership
 11 | # OK
    |
 help: Convert to `set`
-
-ℹ Unsafe fix
-6  6  | )
-7  7  | fruits = ["cherry", "grapes"]
-8  8  | "cherry" in fruits
-9     |-_ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")}
-   9  |+_ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in {"a", "b"}}
-10 10 | 
-11 11 | # OK
-12 12 | fruits in [[1, 2, 3], [4, 5, 6]]
+6  | )
+7  | fruits = ["cherry", "grapes"]
+8  | "cherry" in fruits
+   - _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")}
+9  + _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in {"a", "b"}}
+10 | 
+11 | # OK
+12 | fruits in [[1, 2, 3], [4, 5, 6]]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap
index 5d267e44ef..37415d51a2 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap
@@ -9,13 +9,12 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
   |
 help: Inline function call
-
-ℹ Unsafe fix
-1   |-_ = lambda: print()  # [unnecessary-lambda]
-  1 |+_ = print  # [unnecessary-lambda]
-2 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
-3 3 | 
-4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
+  - _ = lambda: print()  # [unnecessary-lambda]
+1 + _ = print  # [unnecessary-lambda]
+2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
+3 | 
+4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
  --> unnecessary_lambda.py:2:5
@@ -27,14 +26,13 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
   |
 help: Inline function call
-
-ℹ Unsafe fix
-1 1 | _ = lambda: print()  # [unnecessary-lambda]
-2   |-_ = lambda x, y: min(x, y) # [unnecessary-lambda]
-  2 |+_ = min # [unnecessary-lambda]
-3 3 | 
-4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
-5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
+1 | _ = lambda: print()  # [unnecessary-lambda]
+  - _ = lambda x, y: min(x, y) # [unnecessary-lambda]
+2 + _ = min # [unnecessary-lambda]
+3 | 
+4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
+5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
  --> unnecessary_lambda.py:4:5
@@ -47,16 +45,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
   |
 help: Inline function call
-
-ℹ Unsafe fix
-1 1 | _ = lambda: print()  # [unnecessary-lambda]
-2 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
-3 3 | 
-4   |-_ = lambda *args: f(*args) # [unnecessary-lambda]
-  4 |+_ = f # [unnecessary-lambda]
-5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
-6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
-7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+1 | _ = lambda: print()  # [unnecessary-lambda]
+2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
+3 | 
+  - _ = lambda *args: f(*args) # [unnecessary-lambda]
+4 + _ = f # [unnecessary-lambda]
+5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
+6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
+7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
  --> unnecessary_lambda.py:5:5
@@ -68,16 +65,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
   |
 help: Inline function call
-
-ℹ Unsafe fix
-2 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
-3 3 | 
-4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
-5   |-_ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
-  5 |+_ = f # [unnecessary-lambda]
-6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
-7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
-8 8 | 
+2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda]
+3 | 
+4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
+  - _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
+5 + _ = f # [unnecessary-lambda]
+6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
+7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
  --> unnecessary_lambda.py:6:5
@@ -89,16 +85,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
   |
 help: Inline function call
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
-5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
-6   |-_ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
-  6 |+_ = f # [unnecessary-lambda]
-7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
-8 8 | 
-9 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
+3 | 
+4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
+5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
+  - _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
+6 + _ = f # [unnecessary-lambda]
+7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+8 | 
+9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
  --> unnecessary_lambda.py:7:5
@@ -111,16 +106,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
   |
 help: Inline function call
-
-ℹ Unsafe fix
-4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda]
-5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
-6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
-7   |-_ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
-  7 |+_ = f # [unnecessary-lambda]
-8 8 | 
-9 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
-10 10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
+4  | _ = lambda *args: f(*args) # [unnecessary-lambda]
+5  | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
+6  | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
+   - _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+7  + _ = f # [unnecessary-lambda]
+8  | 
+9  | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
+10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
   --> unnecessary_lambda.py:9:5
@@ -132,16 +126,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
    |
 help: Inline function call
-
-ℹ Unsafe fix
-6  6  | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
-7  7  | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
-8  8  | 
-9     |-_ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
-   9  |+_ = f(lambda x: x) # [unnecessary-lambda]
-10 10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
-11 11 | 
-12 12 | # default value in lambda parameters
+6  | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
+7  | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+8  | 
+   - _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
+9  + _ = f(lambda x: x) # [unnecessary-lambda]
+10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
+11 | 
+12 | # default value in lambda parameters
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
   --> unnecessary_lambda.py:10:5
@@ -153,16 +146,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 12 | # default value in lambda parameters
    |
 help: Inline function call
-
-ℹ Unsafe fix
-7  7  | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
-8  8  | 
-9  9  | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
-10    |-_ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
-   10 |+_ = f(lambda x, y: x + y) # [unnecessary-lambda]
-11 11 | 
-12 12 | # default value in lambda parameters
-13 13 | _ = lambda x=42: print(x)
+7  | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
+8  | 
+9  | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
+   - _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
+10 + _ = f(lambda x, y: x + y) # [unnecessary-lambda]
+11 | 
+12 | # default value in lambda parameters
+13 | _ = lambda x=42: print(x)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
   --> unnecessary_lambda.py:62:5
@@ -173,14 +165,13 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function
 63 | _ = lambda x: ((x := 1) and str)(x)
    |
 help: Inline function call
-
-ℹ Unsafe fix
-59 59 | _ = lambda *args: f(*args, y=x)
-60 60 | 
-61 61 | # https://github.com/astral-sh/ruff/issues/18675
-62    |-_ = lambda x: (string := str)(x)
-   62 |+_ = (string := str)
-63 63 | _ = lambda x: ((x := 1) and str)(x)
+59 | _ = lambda *args: f(*args, y=x)
+60 | 
+61 | # https://github.com/astral-sh/ruff/issues/18675
+   - _ = lambda x: (string := str)(x)
+62 + _ = (string := str)
+63 | _ = lambda x: ((x := 1) and str)(x)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0108 Lambda may be unnecessary; consider inlining inner function
   --> unnecessary_lambda.py:63:5
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap
index 39be92ea3a..911e26a8dd 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap
@@ -12,17 +12,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 11 |     return None
    |
 help: Remove `else`
-
-ℹ Safe fix
-6  6  |     for i in range(10):
-7  7  |         if i % 2:
-8  8  |             return i
-9     |-    else:  # [useless-else-on-loop]
-10    |-        print("math is broken")
-   9  |+    print("math is broken")
-11 10 |     return None
-12 11 | 
-13 12 | 
+6  |     for i in range(10):
+7  |         if i % 2:
+8  |             return i
+   -     else:  # [useless-else-on-loop]
+   -         print("math is broken")
+9  +     print("math is broken")
+10 |     return None
+11 | 
+12 | 
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
   --> useless_else_on_loop.py:18:5
@@ -35,17 +33,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 20 |     return None
    |
 help: Remove `else`
-
-ℹ Safe fix
-15 15 |     """else + return is not acceptable."""
-16 16 |     while True:
-17 17 |         return 1
-18    |-    else:  # [useless-else-on-loop]
-19    |-        print("math is broken")
-   18 |+    print("math is broken")
-20 19 |     return None
-21 20 | 
-22 21 | 
+15 |     """else + return is not acceptable."""
+16 |     while True:
+17 |         return 1
+   -     else:  # [useless-else-on-loop]
+   -         print("math is broken")
+18 +     print("math is broken")
+19 |     return None
+20 | 
+21 | 
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
   --> useless_else_on_loop.py:30:1
@@ -57,17 +53,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 31 |     print("or else!")
    |
 help: Remove `else`
-
-ℹ Safe fix
-27 27 |         for _ in range(10):
-28 28 |             break
-29 29 | 
-30    |-else:  # [useless-else-on-loop]
-31    |-    print("or else!")
-   30 |+print("or else!")
-32 31 | 
-33 32 | 
-34 33 | while True:
+27 |         for _ in range(10):
+28 |             break
+29 | 
+   - else:  # [useless-else-on-loop]
+   -     print("or else!")
+30 + print("or else!")
+31 | 
+32 | 
+33 | while True:
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
   --> useless_else_on_loop.py:37:1
@@ -79,17 +73,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 38 |     print("or else!")
    |
 help: Remove `else`
-
-ℹ Safe fix
-34 34 | while True:
-35 35 |     while False:
-36 36 |         break
-37    |-else:  # [useless-else-on-loop]
-38    |-    print("or else!")
-   37 |+print("or else!")
-39 38 | 
-40 39 | for j in range(10):
-41 40 |     pass
+34 | while True:
+35 |     while False:
+36 |         break
+   - else:  # [useless-else-on-loop]
+   -     print("or else!")
+37 + print("or else!")
+38 | 
+39 | for j in range(10):
+40 |     pass
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
   --> useless_else_on_loop.py:42:1
@@ -102,21 +94,19 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 44 |     for j in range(10):
    |
 help: Remove `else`
-
-ℹ Safe fix
-39 39 | 
-40 40 | for j in range(10):
-41 41 |     pass
-42    |-else:  # [useless-else-on-loop]
-43    |-    print("fat chance")
-44    |-    for j in range(10):
-45    |-        break
-   42 |+print("fat chance")
-   43 |+for j in range(10):
-   44 |+    break
-46 45 | 
-47 46 | 
-48 47 | def test_return_for2():
+39 | 
+40 | for j in range(10):
+41 |     pass
+   - else:  # [useless-else-on-loop]
+   -     print("fat chance")
+   -     for j in range(10):
+   -         break
+42 + print("fat chance")
+43 + for j in range(10):
+44 +     break
+45 | 
+46 | 
+47 | def test_return_for2():
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
   --> useless_else_on_loop.py:88:5
@@ -129,17 +119,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 90 |     return False
    |
 help: Remove `else`
-
-ℹ Safe fix
-85 85 |                     break
-86 86 |             else:
-87 87 |                 print("all right")
-88    |-    else:  # [useless-else-on-loop]
-89    |-        return True
-   88 |+    return True
-90 89 |     return False
-91 90 | 
-92 91 | 
+85 |                     break
+86 |             else:
+87 |                 print("all right")
+   -     else:  # [useless-else-on-loop]
+   -         return True
+88 +     return True
+89 |     return False
+90 | 
+91 | 
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
    --> useless_else_on_loop.py:98:9
@@ -152,19 +140,17 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 100 |                 break
     |
 help: Remove `else`
-
-ℹ Safe fix
-95  95  |     for _ in range(10):
-96  96  |         for _ in range(3):
-97  97  |             pass
-98      |-        else:
-99      |-            if 1 < 2:  # pylint: disable=comparison-of-constants
-100     |-                break
-    98  |+        if 1 < 2:  # pylint: disable=comparison-of-constants
-    99  |+            break
-101 100 |     else:
-102 101 |         return True
-103 102 |     return False
+95  |     for _ in range(10):
+96  |         for _ in range(3):
+97  |             pass
+    -         else:
+    -             if 1 < 2:  # pylint: disable=comparison-of-constants
+    -                 break
+98  +         if 1 < 2:  # pylint: disable=comparison-of-constants
+99  +             break
+100 |     else:
+101 |         return True
+102 |     return False
 
 PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents
    --> useless_else_on_loop.py:144:5
@@ -177,17 +163,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else`
 146 |         print("fat chance")
     |
 help: Remove `else`
-
-ℹ Safe fix
-141 141 |     """Retain the comment within the `else` block"""
-142 142 |     for j in range(10):
-143 143 |         pass
-144     |-    else:
-145     |-        # [useless-else-on-loop]
-146     |-        print("fat chance")
-147     |-        for j in range(10):
-148     |-            break
-    144 |+    # [useless-else-on-loop]
-    145 |+    print("fat chance")
-    146 |+    for j in range(10):
-    147 |+        break
+141 |     """Retain the comment within the `else` block"""
+142 |     for j in range(10):
+143 |         pass
+    -     else:
+    -         # [useless-else-on-loop]
+    -         print("fat chance")
+    -         for j in range(10):
+    -             break
+144 +     # [useless-else-on-loop]
+145 +     print("fat chance")
+146 +     for j in range(10):
+147 +         break
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap
index 3bb64a4e40..6199c06156 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap
@@ -10,16 +10,15 @@ PLW0133 [*] Missing `raise` statement on exception
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | # Test case 1: Useless exception statement
-6 6 | def func():
-7   |-    AssertionError("This is an assertion error")  # PLW0133
-  7 |+    raise AssertionError("This is an assertion error")  # PLW0133
-8 8 | 
-9 9 | 
-10 10 | # Test case 2: Useless exception statement in try-except block
+4  | 
+5  | # Test case 1: Useless exception statement
+6  | def func():
+   -     AssertionError("This is an assertion error")  # PLW0133
+7  +     raise AssertionError("This is an assertion error")  # PLW0133
+8  | 
+9  | 
+10 | # Test case 2: Useless exception statement in try-except block
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:13:9
@@ -32,16 +31,15 @@ PLW0133 [*] Missing `raise` statement on exception
 15 |         pass
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-10 10 | # Test case 2: Useless exception statement in try-except block
-11 11 | def func():
-12 12 |     try:
-13    |-        Exception("This is an exception")  # PLW0133
-   13 |+        raise Exception("This is an exception")  # PLW0133
-14 14 |     except Exception as err:
-15 15 |         pass
-16 16 | 
+10 | # Test case 2: Useless exception statement in try-except block
+11 | def func():
+12 |     try:
+   -         Exception("This is an exception")  # PLW0133
+13 +         raise Exception("This is an exception")  # PLW0133
+14 |     except Exception as err:
+15 |         pass
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:21:9
@@ -52,16 +50,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-18 18 | # Test case 3: Useless exception statement in if statement
-19 19 | def func():
-20 20 |     if True:
-21    |-        RuntimeError("This is an exception")  # PLW0133
-   21 |+        raise RuntimeError("This is an exception")  # PLW0133
-22 22 | 
-23 23 | 
-24 24 | # Test case 4: Useless exception statement in class
+18 | # Test case 3: Useless exception statement in if statement
+19 | def func():
+20 |     if True:
+   -         RuntimeError("This is an exception")  # PLW0133
+21 +         raise RuntimeError("This is an exception")  # PLW0133
+22 | 
+23 | 
+24 | # Test case 4: Useless exception statement in class
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:28:13
@@ -72,16 +69,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-25 25 | def func():
-26 26 |     class Class:
-27 27 |         def __init__(self):
-28    |-            TypeError("This is an exception")  # PLW0133
-   28 |+            raise TypeError("This is an exception")  # PLW0133
-29 29 | 
-30 30 | 
-31 31 | # Test case 5: Useless exception statement in function
+25 | def func():
+26 |     class Class:
+27 |         def __init__(self):
+   -             TypeError("This is an exception")  # PLW0133
+28 +             raise TypeError("This is an exception")  # PLW0133
+29 | 
+30 | 
+31 | # Test case 5: Useless exception statement in function
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:34:9
@@ -94,16 +90,15 @@ PLW0133 [*] Missing `raise` statement on exception
 36 |     inner()
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-31 31 | # Test case 5: Useless exception statement in function
-32 32 | def func():
-33 33 |     def inner():
-34    |-        IndexError("This is an exception")  # PLW0133
-   34 |+        raise IndexError("This is an exception")  # PLW0133
-35 35 | 
-36 36 |     inner()
-37 37 | 
+31 | # Test case 5: Useless exception statement in function
+32 | def func():
+33 |     def inner():
+   -         IndexError("This is an exception")  # PLW0133
+34 +         raise IndexError("This is an exception")  # PLW0133
+35 | 
+36 |     inner()
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:42:9
@@ -114,16 +109,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-39 39 | # Test case 6: Useless exception statement in while loop
-40 40 | def func():
-41 41 |     while True:
-42    |-        KeyError("This is an exception")  # PLW0133
-   42 |+        raise KeyError("This is an exception")  # PLW0133
-43 43 | 
-44 44 | 
-45 45 | # Test case 7: Useless exception statement in abstract class
+39 | # Test case 6: Useless exception statement in while loop
+40 | def func():
+41 |     while True:
+   -         KeyError("This is an exception")  # PLW0133
+42 +         raise KeyError("This is an exception")  # PLW0133
+43 | 
+44 | 
+45 | # Test case 7: Useless exception statement in abstract class
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:50:13
@@ -134,16 +128,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-47 47 |     class Class(ABC):
-48 48 |         @abstractmethod
-49 49 |         def method(self):
-50    |-            NotImplementedError("This is an exception")  # PLW0133
-   50 |+            raise NotImplementedError("This is an exception")  # PLW0133
-51 51 | 
-52 52 | 
-53 53 | # Test case 8: Useless exception statement inside context manager
+47 |     class Class(ABC):
+48 |         @abstractmethod
+49 |         def method(self):
+   -             NotImplementedError("This is an exception")  # PLW0133
+50 +             raise NotImplementedError("This is an exception")  # PLW0133
+51 | 
+52 | 
+53 | # Test case 8: Useless exception statement inside context manager
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:56:9
@@ -154,16 +147,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-53 53 | # Test case 8: Useless exception statement inside context manager
-54 54 | def func():
-55 55 |     with suppress(AttributeError):
-56    |-        AttributeError("This is an exception")  # PLW0133
-   56 |+        raise AttributeError("This is an exception")  # PLW0133
-57 57 | 
-58 58 | 
-59 59 | # Test case 9: Useless exception statement in parentheses
+53 | # Test case 8: Useless exception statement inside context manager
+54 | def func():
+55 |     with suppress(AttributeError):
+   -         AttributeError("This is an exception")  # PLW0133
+56 +         raise AttributeError("This is an exception")  # PLW0133
+57 | 
+58 | 
+59 | # Test case 9: Useless exception statement in parentheses
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:61:5
@@ -174,16 +166,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-58 58 | 
-59 59 | # Test case 9: Useless exception statement in parentheses
-60 60 | def func():
-61    |-    (RuntimeError("This is an exception"))  # PLW0133
-   61 |+    raise (RuntimeError("This is an exception"))  # PLW0133
-62 62 | 
-63 63 | 
-64 64 | # Test case 10: Useless exception statement in continuation
+58 | 
+59 | # Test case 9: Useless exception statement in parentheses
+60 | def func():
+   -     (RuntimeError("This is an exception"))  # PLW0133
+61 +     raise (RuntimeError("This is an exception"))  # PLW0133
+62 | 
+63 | 
+64 | # Test case 10: Useless exception statement in continuation
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:66:12
@@ -194,16 +185,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-63 63 | 
-64 64 | # Test case 10: Useless exception statement in continuation
-65 65 | def func():
-66    |-    x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-   66 |+    x = 1; raise (RuntimeError("This is an exception")); y = 2  # PLW0133
-67 67 | 
-68 68 | 
-69 69 | # Test case 11: Useless warning statement
+63 | 
+64 | # Test case 10: Useless exception statement in continuation
+65 | def func():
+   -     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
+66 +     x = 1; raise (RuntimeError("This is an exception")); y = 2  # PLW0133
+67 | 
+68 | 
+69 | # Test case 11: Useless warning statement
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
   --> useless_exception_statement.py:71:5
@@ -214,16 +204,15 @@ PLW0133 [*] Missing `raise` statement on exception
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-68 68 | 
-69 69 | # Test case 11: Useless warning statement
-70 70 | def func():
-71    |-    UserWarning("This is an assertion error")  # PLW0133
-   71 |+    raise UserWarning("This is an assertion error")  # PLW0133
-72 72 | 
-73 73 | 
-74 74 | # Non-violation test cases: PLW0133
+68 | 
+69 | # Test case 11: Useless warning statement
+70 | def func():
+   -     UserWarning("This is an assertion error")  # PLW0133
+71 +     raise UserWarning("This is an assertion error")  # PLW0133
+72 | 
+73 | 
+74 | # Non-violation test cases: PLW0133
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
    --> useless_exception_statement.py:126:1
@@ -236,15 +225,14 @@ PLW0133 [*] Missing `raise` statement on exception
 128 | PythonFinalizationError("Added in Python 3.13")
     |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-123 123 | 
-124 124 | import builtins
-125 125 | 
-126     |-builtins.TypeError("still an exception even though it's an Attribute")
-    126 |+raise builtins.TypeError("still an exception even though it's an Attribute")
-127 127 | 
-128 128 | PythonFinalizationError("Added in Python 3.13")
+123 | 
+124 | import builtins
+125 | 
+    - builtins.TypeError("still an exception even though it's an Attribute")
+126 + raise builtins.TypeError("still an exception even though it's an Attribute")
+127 | 
+128 | PythonFinalizationError("Added in Python 3.13")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
    --> useless_exception_statement.py:128:1
@@ -255,10 +243,9 @@ PLW0133 [*] Missing `raise` statement on exception
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Add `raise` keyword
-
-ℹ Unsafe fix
-125 125 | 
-126 126 | builtins.TypeError("still an exception even though it's an Attribute")
-127 127 | 
-128     |-PythonFinalizationError("Added in Python 3.13")
-    128 |+raise PythonFinalizationError("Added in Python 3.13")
+125 | 
+126 | builtins.TypeError("still an exception even though it's an Attribute")
+127 | 
+    - PythonFinalizationError("Added in Python 3.13")
+128 + raise PythonFinalizationError("Added in Python 3.13")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap
index f940cf92ca..1645100047 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap
@@ -11,13 +11,11 @@ PLW0245 [*] `super` call is missing parentheses
 11 |         return f"{original_speak} But as a dog, it barks!"
    |
 help: Add parentheses to `super` call
-
-ℹ Safe fix
-7  7  | class BadDog(Animal):
-8  8  |     @staticmethod
-9  9  |     def speak():
-10    |-        original_speak = super.speak()  # PLW0245
-   10 |+        original_speak = super().speak()  # PLW0245
-11 11 |         return f"{original_speak} But as a dog, it barks!"
-12 12 | 
-13 13 |
+7  | class BadDog(Animal):
+8  |     @staticmethod
+9  |     def speak():
+   -         original_speak = super.speak()  # PLW0245
+10 +         original_speak = super().speak()  # PLW0245
+11 |         return f"{original_speak} But as a dog, it barks!"
+12 | 
+13 |
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap
index 02b7108617..5ece209fcc 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap
@@ -10,16 +10,15 @@ PLW1507 [*] Shallow copy of `os.environ` via `copy.copy(os.environ)`
   |              ^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `os.environ.copy()`
-
-ℹ Unsafe fix
-1 1 | import copy
-2 2 | import os
-3 3 | 
-4   |-copied_env = copy.copy(os.environ)  # [shallow-copy-environ]
-  4 |+copied_env = os.environ.copy()  # [shallow-copy-environ]
-5 5 | 
-6 6 | 
-7 7 | # Test case where the proposed fix is wrong, i.e., unsafe fix
+1 | import copy
+2 | import os
+3 | 
+  - copied_env = copy.copy(os.environ)  # [shallow-copy-environ]
+4 + copied_env = os.environ.copy()  # [shallow-copy-environ]
+5 | 
+6 | 
+7 | # Test case where the proposed fix is wrong, i.e., unsafe fix
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1507 [*] Shallow copy of `os.environ` via `copy.copy(os.environ)`
   --> shallow_copy_environ.py:11:7
@@ -30,11 +29,10 @@ PLW1507 [*] Shallow copy of `os.environ` via `copy.copy(os.environ)`
 12 | os.environ["X"] = "1"
    |
 help: Replace with `os.environ.copy()`
-
-ℹ Unsafe fix
-8  8  | # Ref: https://github.com/astral-sh/ruff/issues/16274#event-16423475135
-9  9  | 
-10 10 | os.environ["X"] = "0"
-11    |-env = copy.copy(os.environ)
-   11 |+env = os.environ.copy()
-12 12 | os.environ["X"] = "1"
+8  | # Ref: https://github.com/astral-sh/ruff/issues/16274#event-16423475135
+9  | 
+10 | os.environ["X"] = "0"
+   - env = copy.copy(os.environ)
+11 + env = os.environ.copy()
+12 | os.environ["X"] = "1"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap
index 4d980923ac..360048b2d6 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap
@@ -11,16 +11,14 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument
 6 | subprocess.run(
   |
 help: Add explicit `check=False`
-
-ℹ Safe fix
-1 1 | import subprocess
-2 2 | 
-3 3 | # Errors.
-4   |-subprocess.run("ls")
-  4 |+subprocess.run("ls", check=False)
-5 5 | subprocess.run("ls", shell=True)
-6 6 | subprocess.run(
-7 7 |     ["ls"],
+1 | import subprocess
+2 | 
+3 | # Errors.
+  - subprocess.run("ls")
+4 + subprocess.run("ls", check=False)
+5 | subprocess.run("ls", shell=True)
+6 | subprocess.run(
+7 |     ["ls"],
 
 PLW1510 [*] `subprocess.run` without explicit `check` argument
  --> subprocess_run_without_check.py:5:1
@@ -33,16 +31,14 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument
 7 |     ["ls"],
   |
 help: Add explicit `check=False`
-
-ℹ Safe fix
-2 2 | 
-3 3 | # Errors.
-4 4 | subprocess.run("ls")
-5   |-subprocess.run("ls", shell=True)
-  5 |+subprocess.run("ls", check=False, shell=True)
-6 6 | subprocess.run(
-7 7 |     ["ls"],
-8 8 |     shell=False,
+2 | 
+3 | # Errors.
+4 | subprocess.run("ls")
+  - subprocess.run("ls", shell=True)
+5 + subprocess.run("ls", check=False, shell=True)
+6 | subprocess.run(
+7 |     ["ls"],
+8 |     shell=False,
 
 PLW1510 [*] `subprocess.run` without explicit `check` argument
  --> subprocess_run_without_check.py:6:1
@@ -55,16 +51,14 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument
 8 |     shell=False,
   |
 help: Add explicit `check=False`
-
-ℹ Safe fix
-5 5 | subprocess.run("ls", shell=True)
-6 6 | subprocess.run(
-7 7 |     ["ls"],
-8   |-    shell=False,
-  8 |+    check=False, shell=False,
-9 9 | )
-10 10 | subprocess.run(["ls"], **kwargs)
-11 11 | 
+5  | subprocess.run("ls", shell=True)
+6  | subprocess.run(
+7  |     ["ls"],
+   -     shell=False,
+8  +     check=False, shell=False,
+9  | )
+10 | subprocess.run(["ls"], **kwargs)
+11 | 
 
 PLW1510 [*] `subprocess.run` without explicit `check` argument
   --> subprocess_run_without_check.py:10:1
@@ -77,13 +71,12 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument
 12 | # Non-errors.
    |
 help: Add explicit `check=False`
-
-ℹ Unsafe fix
-7  7  |     ["ls"],
-8  8  |     shell=False,
-9  9  | )
-10    |-subprocess.run(["ls"], **kwargs)
-   10 |+subprocess.run(["ls"], check=False, **kwargs)
-11 11 | 
-12 12 | # Non-errors.
-13 13 | subprocess.run("ls", check=True)
+7  |     ["ls"],
+8  |     shell=False,
+9  | )
+   - subprocess.run(["ls"], **kwargs)
+10 + subprocess.run(["ls"], check=False, **kwargs)
+11 | 
+12 | # Non-errors.
+13 | subprocess.run("ls", check=True)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap
index d8fd1c6d90..0223a6777e 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap
@@ -11,16 +11,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-5 5 | import codecs
-6 6 | 
-7 7 | # Errors.
-8   |-open("test.txt")
-  8 |+open("test.txt", encoding="utf-8")
-9 9 | io.TextIOWrapper(io.FileIO("test.txt"))
-10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-11 11 | tempfile.NamedTemporaryFile("w")
+5  | import codecs
+6  | 
+7  | # Errors.
+   - open("test.txt")
+8  + open("test.txt", encoding="utf-8")
+9  | io.TextIOWrapper(io.FileIO("test.txt"))
+10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
+11 | tempfile.NamedTemporaryFile("w")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument
   --> unspecified_encoding.py:9:1
@@ -33,16 +32,15 @@ PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument
 11 | tempfile.NamedTemporaryFile("w")
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-6  6  | 
-7  7  | # Errors.
-8  8  | open("test.txt")
-9     |-io.TextIOWrapper(io.FileIO("test.txt"))
-   9  |+io.TextIOWrapper(io.FileIO("test.txt"), encoding="utf-8")
-10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-11 11 | tempfile.NamedTemporaryFile("w")
-12 12 | tempfile.TemporaryFile("w")
+6  | 
+7  | # Errors.
+8  | open("test.txt")
+   - io.TextIOWrapper(io.FileIO("test.txt"))
+9  + io.TextIOWrapper(io.FileIO("test.txt"), encoding="utf-8")
+10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
+11 | tempfile.NamedTemporaryFile("w")
+12 | tempfile.TemporaryFile("w")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument
   --> unspecified_encoding.py:10:1
@@ -55,16 +53,15 @@ PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument
 12 | tempfile.TemporaryFile("w")
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-7  7  | # Errors.
-8  8  | open("test.txt")
-9  9  | io.TextIOWrapper(io.FileIO("test.txt"))
-10    |-hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-   10 |+hugo.TextIOWrapper(hugo.FileIO("test.txt"), encoding="utf-8")
-11 11 | tempfile.NamedTemporaryFile("w")
-12 12 | tempfile.TemporaryFile("w")
-13 13 | codecs.open("test.txt")
+7  | # Errors.
+8  | open("test.txt")
+9  | io.TextIOWrapper(io.FileIO("test.txt"))
+   - hugo.TextIOWrapper(hugo.FileIO("test.txt"))
+10 + hugo.TextIOWrapper(hugo.FileIO("test.txt"), encoding="utf-8")
+11 | tempfile.NamedTemporaryFile("w")
+12 | tempfile.TemporaryFile("w")
+13 | codecs.open("test.txt")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `tempfile.NamedTemporaryFile` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:11:1
@@ -77,16 +74,15 @@ PLW1514 [*] `tempfile.NamedTemporaryFile` in text mode without explicit `encodin
 13 | codecs.open("test.txt")
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-8  8  | open("test.txt")
-9  9  | io.TextIOWrapper(io.FileIO("test.txt"))
-10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-11    |-tempfile.NamedTemporaryFile("w")
-   11 |+tempfile.NamedTemporaryFile("w", encoding="utf-8")
-12 12 | tempfile.TemporaryFile("w")
-13 13 | codecs.open("test.txt")
-14 14 | tempfile.SpooledTemporaryFile(0, "w")
+8  | open("test.txt")
+9  | io.TextIOWrapper(io.FileIO("test.txt"))
+10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
+   - tempfile.NamedTemporaryFile("w")
+11 + tempfile.NamedTemporaryFile("w", encoding="utf-8")
+12 | tempfile.TemporaryFile("w")
+13 | codecs.open("test.txt")
+14 | tempfile.SpooledTemporaryFile(0, "w")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `tempfile.TemporaryFile` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:12:1
@@ -99,16 +95,15 @@ PLW1514 [*] `tempfile.TemporaryFile` in text mode without explicit `encoding` ar
 14 | tempfile.SpooledTemporaryFile(0, "w")
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-9  9  | io.TextIOWrapper(io.FileIO("test.txt"))
-10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-11 11 | tempfile.NamedTemporaryFile("w")
-12    |-tempfile.TemporaryFile("w")
-   12 |+tempfile.TemporaryFile("w", encoding="utf-8")
-13 13 | codecs.open("test.txt")
-14 14 | tempfile.SpooledTemporaryFile(0, "w")
-15 15 | 
+9  | io.TextIOWrapper(io.FileIO("test.txt"))
+10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
+11 | tempfile.NamedTemporaryFile("w")
+   - tempfile.TemporaryFile("w")
+12 + tempfile.TemporaryFile("w", encoding="utf-8")
+13 | codecs.open("test.txt")
+14 | tempfile.SpooledTemporaryFile(0, "w")
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `codecs.open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:13:1
@@ -120,16 +115,15 @@ PLW1514 [*] `codecs.open` in text mode without explicit `encoding` argument
 14 | tempfile.SpooledTemporaryFile(0, "w")
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-11 11 | tempfile.NamedTemporaryFile("w")
-12 12 | tempfile.TemporaryFile("w")
-13    |-codecs.open("test.txt")
-   13 |+codecs.open("test.txt", encoding="utf-8")
-14 14 | tempfile.SpooledTemporaryFile(0, "w")
-15 15 | 
-16 16 | # Non-errors.
+10 | hugo.TextIOWrapper(hugo.FileIO("test.txt"))
+11 | tempfile.NamedTemporaryFile("w")
+12 | tempfile.TemporaryFile("w")
+   - codecs.open("test.txt")
+13 + codecs.open("test.txt", encoding="utf-8")
+14 | tempfile.SpooledTemporaryFile(0, "w")
+15 | 
+16 | # Non-errors.
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `tempfile.SpooledTemporaryFile` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:14:1
@@ -142,16 +136,15 @@ PLW1514 [*] `tempfile.SpooledTemporaryFile` in text mode without explicit `encod
 16 | # Non-errors.
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-11 11 | tempfile.NamedTemporaryFile("w")
-12 12 | tempfile.TemporaryFile("w")
-13 13 | codecs.open("test.txt")
-14    |-tempfile.SpooledTemporaryFile(0, "w")
-   14 |+tempfile.SpooledTemporaryFile(0, "w", encoding="utf-8")
-15 15 | 
-16 16 | # Non-errors.
-17 17 | open("test.txt", encoding="utf-8")
+11 | tempfile.NamedTemporaryFile("w")
+12 | tempfile.TemporaryFile("w")
+13 | codecs.open("test.txt")
+   - tempfile.SpooledTemporaryFile(0, "w")
+14 + tempfile.SpooledTemporaryFile(0, "w", encoding="utf-8")
+15 | 
+16 | # Non-errors.
+17 | open("test.txt", encoding="utf-8")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:46:1
@@ -164,16 +157,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 48 | open(
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-43 43 | tempfile.SpooledTemporaryFile(0, "wb")
-44 44 | tempfile.SpooledTemporaryFile(0, )
-45 45 | 
-46    |-open("test.txt",)
-   46 |+open("test.txt", encoding="utf-8",)
-47 47 | open()
-48 48 | open(
-49 49 |     "test.txt",  # comment
+43 | tempfile.SpooledTemporaryFile(0, "wb")
+44 | tempfile.SpooledTemporaryFile(0, )
+45 | 
+   - open("test.txt",)
+46 + open("test.txt", encoding="utf-8",)
+47 | open()
+48 | open(
+49 |     "test.txt",  # comment
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:47:1
@@ -185,16 +177,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 49 |     "test.txt",  # comment
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-44 44 | tempfile.SpooledTemporaryFile(0, )
-45 45 | 
-46 46 | open("test.txt",)
-47    |-open()
-   47 |+open(encoding="utf-8")
-48 48 | open(
-49 49 |     "test.txt",  # comment
-50 50 | )
+44 | tempfile.SpooledTemporaryFile(0, )
+45 | 
+46 | open("test.txt",)
+   - open()
+47 + open(encoding="utf-8")
+48 | open(
+49 |     "test.txt",  # comment
+50 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:48:1
@@ -207,16 +198,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 50 | )
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-46 46 | open("test.txt",)
-47 47 | open()
-48 48 | open(
-49    |-    "test.txt",  # comment
-   49 |+    "test.txt", encoding="utf-8",  # comment
-50 50 | )
-51 51 | open(
-52 52 |     "test.txt",
+46 | open("test.txt",)
+47 | open()
+48 | open(
+   -     "test.txt",  # comment
+49 +     "test.txt", encoding="utf-8",  # comment
+50 | )
+51 | open(
+52 |     "test.txt",
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:51:1
@@ -229,16 +219,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 53 |     # comment
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-49 49 |     "test.txt",  # comment
-50 50 | )
-51 51 | open(
-52    |-    "test.txt",
-   52 |+    "test.txt", encoding="utf-8",
-53 53 |     # comment
-54 54 | )
-55 55 | open(("test.txt"),)
+49 |     "test.txt",  # comment
+50 | )
+51 | open(
+   -     "test.txt",
+52 +     "test.txt", encoding="utf-8",
+53 |     # comment
+54 | )
+55 | open(("test.txt"),)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:55:1
@@ -251,16 +240,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 57 |     ("test.txt"),  # comment
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-52 52 |     "test.txt",
-53 53 |     # comment
-54 54 | )
-55    |-open(("test.txt"),)
-   55 |+open(("test.txt"), encoding="utf-8",)
-56 56 | open(
-57 57 |     ("test.txt"),  # comment
-58 58 | )
+52 |     "test.txt",
+53 |     # comment
+54 | )
+   - open(("test.txt"),)
+55 + open(("test.txt"), encoding="utf-8",)
+56 | open(
+57 |     ("test.txt"),  # comment
+58 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:56:1
@@ -273,16 +261,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 58 | )
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-54 54 | )
-55 55 | open(("test.txt"),)
-56 56 | open(
-57    |-    ("test.txt"),  # comment
-   57 |+    ("test.txt"), encoding="utf-8",  # comment
-58 58 | )
-59 59 | open(
-60 60 |     ("test.txt"),
+54 | )
+55 | open(("test.txt"),)
+56 | open(
+   -     ("test.txt"),  # comment
+57 +     ("test.txt"), encoding="utf-8",  # comment
+58 | )
+59 | open(
+60 |     ("test.txt"),
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:59:1
@@ -295,16 +282,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 61 |     # comment
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-57 57 |     ("test.txt"),  # comment
-58 58 | )
-59 59 | open(
-60    |-    ("test.txt"),
-   60 |+    ("test.txt"), encoding="utf-8",
-61 61 |     # comment
-62 62 | )
-63 63 | 
+57 |     ("test.txt"),  # comment
+58 | )
+59 | open(
+   -     ("test.txt"),
+60 +     ("test.txt"), encoding="utf-8",
+61 |     # comment
+62 | )
+63 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:64:1
@@ -317,16 +303,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 66 |     (("test.txt")),  # comment
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-61 61 |     # comment
-62 62 | )
-63 63 | 
-64    |-open((("test.txt")),)
-   64 |+open((("test.txt")), encoding="utf-8",)
-65 65 | open(
-66 66 |     (("test.txt")),  # comment
-67 67 | )
+61 |     # comment
+62 | )
+63 | 
+   - open((("test.txt")),)
+64 + open((("test.txt")), encoding="utf-8",)
+65 | open(
+66 |     (("test.txt")),  # comment
+67 | )
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:65:1
@@ -338,16 +323,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 67 | )
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-63 63 | 
-64 64 | open((("test.txt")),)
-65 65 | open(
-66    |-    (("test.txt")),  # comment
-   66 |+    (("test.txt")), encoding="utf-8",  # comment
-67 67 | )
-68 68 | open(
-69 69 |     (("test.txt")),
+63 | 
+64 | open((("test.txt")),)
+65 | open(
+   -     (("test.txt")),  # comment
+66 +     (("test.txt")), encoding="utf-8",  # comment
+67 | )
+68 | open(
+69 |     (("test.txt")),
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:68:1
@@ -360,16 +344,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument
 70 |     # comment
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-66 66 |     (("test.txt")),  # comment
-67 67 | )
-68 68 | open(
-69    |-    (("test.txt")),
-   69 |+    (("test.txt")), encoding="utf-8",
-70 70 |     # comment
-71 71 | )
-72 72 | 
+66 |     (("test.txt")),  # comment
+67 | )
+68 | open(
+   -     (("test.txt")),
+69 +     (("test.txt")), encoding="utf-8",
+70 |     # comment
+71 | )
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:77:1
@@ -381,16 +364,15 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar
 79 | text = Path("foo.txt").read_text()
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-74 74 | from pathlib import Path
-75 75 | 
-76 76 | # Errors.
-77    |-Path("foo.txt").open()
-   77 |+Path("foo.txt").open(encoding="utf-8")
-78 78 | Path("foo.txt").open("w")
-79 79 | text = Path("foo.txt").read_text()
-80 80 | Path("foo.txt").write_text(text)
+74 | from pathlib import Path
+75 | 
+76 | # Errors.
+   - Path("foo.txt").open()
+77 + Path("foo.txt").open(encoding="utf-8")
+78 | Path("foo.txt").open("w")
+79 | text = Path("foo.txt").read_text()
+80 | Path("foo.txt").write_text(text)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:78:1
@@ -403,16 +385,15 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar
 80 | Path("foo.txt").write_text(text)
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-75 75 | 
-76 76 | # Errors.
-77 77 | Path("foo.txt").open()
-78    |-Path("foo.txt").open("w")
-   78 |+Path("foo.txt").open("w", encoding="utf-8")
-79 79 | text = Path("foo.txt").read_text()
-80 80 | Path("foo.txt").write_text(text)
-81 81 | 
+75 | 
+76 | # Errors.
+77 | Path("foo.txt").open()
+   - Path("foo.txt").open("w")
+78 + Path("foo.txt").open("w", encoding="utf-8")
+79 | text = Path("foo.txt").read_text()
+80 | Path("foo.txt").write_text(text)
+81 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `pathlib.Path(...).read_text` without explicit `encoding` argument
   --> unspecified_encoding.py:79:8
@@ -424,16 +405,15 @@ PLW1514 [*] `pathlib.Path(...).read_text` without explicit `encoding` argument
 80 | Path("foo.txt").write_text(text)
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-76 76 | # Errors.
-77 77 | Path("foo.txt").open()
-78 78 | Path("foo.txt").open("w")
-79    |-text = Path("foo.txt").read_text()
-   79 |+text = Path("foo.txt").read_text(encoding="utf-8")
-80 80 | Path("foo.txt").write_text(text)
-81 81 | 
-82 82 | # Non-errors.
+76 | # Errors.
+77 | Path("foo.txt").open()
+78 | Path("foo.txt").open("w")
+   - text = Path("foo.txt").read_text()
+79 + text = Path("foo.txt").read_text(encoding="utf-8")
+80 | Path("foo.txt").write_text(text)
+81 | 
+82 | # Non-errors.
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `pathlib.Path(...).write_text` without explicit `encoding` argument
   --> unspecified_encoding.py:80:1
@@ -446,16 +426,15 @@ PLW1514 [*] `pathlib.Path(...).write_text` without explicit `encoding` argument
 82 | # Non-errors.
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-77 77 | Path("foo.txt").open()
-78 78 | Path("foo.txt").open("w")
-79 79 | text = Path("foo.txt").read_text()
-80    |-Path("foo.txt").write_text(text)
-   80 |+Path("foo.txt").write_text(text, encoding="utf-8")
-81 81 | 
-82 82 | # Non-errors.
-83 83 | Path("foo.txt").open(encoding="utf-8")
+77 | Path("foo.txt").open()
+78 | Path("foo.txt").open("w")
+79 | text = Path("foo.txt").read_text()
+   - Path("foo.txt").write_text(text)
+80 + Path("foo.txt").write_text(text, encoding="utf-8")
+81 | 
+82 | # Non-errors.
+83 | Path("foo.txt").open(encoding="utf-8")
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument
   --> unspecified_encoding.py:96:1
@@ -468,16 +447,15 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar
 98 | # https://github.com/astral-sh/ruff/issues/18107
    |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-93 93 | 
-94 94 | # https://github.com/astral-sh/ruff/issues/19294
-95 95 | x = Path("foo.txt")
-96    |-x.open()
-   96 |+x.open(encoding="utf-8")
-97 97 | 
-98 98 | # https://github.com/astral-sh/ruff/issues/18107
-99 99 | codecs.open("plw1514.py", "r", "utf-8").close() # this is fine
+93 | 
+94 | # https://github.com/astral-sh/ruff/issues/19294
+95 | x = Path("foo.txt")
+   - x.open()
+96 + x.open(encoding="utf-8")
+97 | 
+98 | # https://github.com/astral-sh/ruff/issues/18107
+99 | codecs.open("plw1514.py", "r", "utf-8").close() # this is fine
+note: This is an unsafe fix and may change runtime behavior
 
 PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument
    --> unspecified_encoding.py:105:10
@@ -488,11 +466,10 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar
 106 |         contents = f.read()
     |
 help: Add explicit `encoding` argument
-
-ℹ Unsafe fix
-102 102 | from pathlib import Path
-103 103 | 
-104 104 | def format_file(file: Path):
-105     |-    with file.open() as f:
-    105 |+    with file.open(encoding="utf-8") as f:
-106 106 |         contents = f.read()
+102 | from pathlib import Path
+103 | 
+104 | def format_file(file: Path):
+    -     with file.open() as f:
+105 +     with file.open(encoding="utf-8") as f:
+106 |         contents = f.read()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap
index 9c0c63af9d..0106c57cd1 100644
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap
@@ -11,14 +11,13 @@ PLW3301 [*] Nested `min` calls can be flattened
 4 | min(1, foo("a", "b"), min(3, 4))
   |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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))
+1 | min(1, 2, 3)
+  - min(1, min(2, 3))
+2 + min(1, 2, 3)
+3 | min(1, min(2, min(3, 4)))
+4 | min(1, foo("a", "b"), min(3, 4))
+5 | min(1, max(2, 3))
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
  --> nested_min_max.py:3:1
@@ -31,15 +30,14 @@ PLW3301 [*] Nested `min` calls can be flattened
 5 | min(1, max(2, 3))
   |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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)
+1 | min(1, 2, 3)
+2 | min(1, min(2, 3))
+  - min(1, min(2, min(3, 4)))
+3 + min(1, 2, 3, 4)
+4 | min(1, foo("a", "b"), min(3, 4))
+5 | min(1, max(2, 3))
+6 | max(1, 2, 3)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
  --> nested_min_max.py:3:8
@@ -52,15 +50,14 @@ PLW3301 [*] Nested `min` calls can be flattened
 5 | min(1, max(2, 3))
   |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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)
+1 | min(1, 2, 3)
+2 | min(1, min(2, 3))
+  - min(1, min(2, min(3, 4)))
+3 + min(1, min(2, 3, 4))
+4 | min(1, foo("a", "b"), min(3, 4))
+5 | min(1, max(2, 3))
+6 | max(1, 2, 3)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
  --> nested_min_max.py:4:1
@@ -73,16 +70,15 @@ PLW3301 [*] Nested `min` calls can be flattened
 6 | max(1, 2, 3)
   |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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))
+1 | min(1, 2, 3)
+2 | min(1, min(2, 3))
+3 | min(1, min(2, min(3, 4)))
+  - min(1, foo("a", "b"), min(3, 4))
+4 + min(1, foo("a", "b"), 3, 4)
+5 | min(1, max(2, 3))
+6 | max(1, 2, 3)
+7 | max(1, max(2, 3))
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
  --> nested_min_max.py:7:1
@@ -95,16 +91,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 9 | max(1, foo("a", "b"), max(3, 4))
   |
 help: Flatten nested `max` calls
-
-ℹ Unsafe 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 | 
+4  | min(1, foo("a", "b"), min(3, 4))
+5  | min(1, max(2, 3))
+6  | max(1, 2, 3)
+   - max(1, max(2, 3))
+7  + max(1, 2, 3)
+8  | max(1, max(2, max(3, 4)))
+9  | max(1, foo("a", "b"), max(3, 4))
+10 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
  --> nested_min_max.py:8:1
@@ -116,16 +111,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 9 | max(1, foo("a", "b"), max(3, 4))
   |
 help: Flatten nested `max` calls
-
-ℹ Unsafe 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.
+5  | min(1, max(2, 3))
+6  | max(1, 2, 3)
+7  | max(1, max(2, 3))
+   - max(1, max(2, max(3, 4)))
+8  + max(1, 2, 3, 4)
+9  | max(1, foo("a", "b"), max(3, 4))
+10 | 
+11 | # These should not trigger; we do not flag cases with keyword args.
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
  --> nested_min_max.py:8:8
@@ -137,16 +131,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 9 | max(1, foo("a", "b"), max(3, 4))
   |
 help: Flatten nested `max` calls
-
-ℹ Unsafe 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.
+5  | min(1, max(2, 3))
+6  | max(1, 2, 3)
+7  | max(1, max(2, 3))
+   - max(1, max(2, max(3, 4)))
+8  + max(1, max(2, 3, 4))
+9  | max(1, foo("a", "b"), max(3, 4))
+10 | 
+11 | # These should not trigger; we do not flag cases with keyword args.
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
   --> nested_min_max.py:9:1
@@ -159,16 +152,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 11 | # These should not trigger; we do not flag cases with keyword args.
    |
 help: Flatten nested `max` calls
-
-ℹ Unsafe 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)
+6  | max(1, 2, 3)
+7  | max(1, max(2, 3))
+8  | max(1, max(2, max(3, 4)))
+   - max(1, foo("a", "b"), max(3, 4))
+9  + max(1, foo("a", "b"), 3, 4)
+10 | 
+11 | # These should not trigger; we do not flag cases with keyword args.
+12 | min(1, min(2, 3), key=test)
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
   --> nested_min_max.py:15:1
@@ -181,16 +173,15 @@ PLW3301 [*] Nested `min` calls can be flattened
 17 | # The fix is already unsafe, so deleting comments is okay.
    |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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 | # The fix is already unsafe, so deleting comments is okay.
-18 18 | min(
+12 | min(1, min(2, 3), key=test)
+13 | min(1, min(2, 3, key=test))
+14 | # This will still trigger, to merge the calls without keyword args.
+   - min(1, min(2, 3, key=test), min(4, 5))
+15 + min(1, min(2, 3, key=test), 4, 5)
+16 | 
+17 | # The fix is already unsafe, so deleting comments is okay.
+18 | min(
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
   --> nested_min_max.py:18:1
@@ -205,19 +196,18 @@ PLW3301 [*] Nested `min` calls can be flattened
 23 |   # Handle iterable expressions.
    |
 help: Flatten nested `min` calls
-
-ℹ Unsafe fix
-15 15 | min(1, min(2, 3, key=test), min(4, 5))
-16 16 | 
-17 17 | # The fix is already unsafe, so deleting comments is okay.
-18    |-min(
-19    |-    1,  # This is a comment.
-20    |-    min(2, 3),
-21    |-)
-   18 |+min(1, 2, 3)
-22 19 | 
-23 20 | # Handle iterable expressions.
-24 21 | min(1, min(a))
+15 | min(1, min(2, 3, key=test), min(4, 5))
+16 | 
+17 | # The fix is already unsafe, so deleting comments is okay.
+   - min(
+   -     1,  # This is a comment.
+   -     min(2, 3),
+   - )
+18 + min(1, 2, 3)
+19 | 
+20 | # Handle iterable expressions.
+21 | min(1, min(a))
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
   --> nested_min_max.py:24:1
@@ -229,16 +219,15 @@ PLW3301 [*] Nested `min` calls can be flattened
 26 | max(1, max(a))
    |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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)))
+21 | )
+22 | 
+23 | # Handle iterable expressions.
+   - min(1, min(a))
+24 + min(1, *a)
+25 | min(1, min(i for i in range(10)))
+26 | max(1, max(a))
+27 | max(1, max(i for i in range(10)))
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
   --> nested_min_max.py:25:1
@@ -251,16 +240,15 @@ PLW3301 [*] Nested `min` calls can be flattened
 27 | max(1, max(i for i in range(10)))
    |
 help: Flatten nested `min` calls
-
-ℹ Unsafe 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 | 
+22 | 
+23 | # Handle iterable expressions.
+24 | min(1, min(a))
+   - min(1, min(i for i in range(10)))
+25 + min(1, *(i for i in range(10)))
+26 | max(1, max(a))
+27 | max(1, max(i for i in range(10)))
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
   --> nested_min_max.py:26:1
@@ -272,16 +260,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 27 | max(1, max(i for i in range(10)))
    |
 help: Flatten nested `max` calls
-
-ℹ Unsafe 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 = [
+23 | # Handle iterable expressions.
+24 | min(1, min(a))
+25 | min(1, min(i for i in range(10)))
+   - max(1, max(a))
+26 + max(1, *a)
+27 | max(1, max(i for i in range(10)))
+28 | 
+29 | tuples_list = [
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
   --> nested_min_max.py:27:1
@@ -294,16 +281,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 29 | tuples_list = [
    |
 help: Flatten nested `max` calls
-
-ℹ Unsafe 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),
+24 | min(1, min(a))
+25 | min(1, min(i for i in range(10)))
+26 | max(1, max(a))
+   - max(1, max(i for i in range(10)))
+27 + max(1, *(i for i in range(10)))
+28 | 
+29 | tuples_list = [
+30 |     (1, 2),
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
   --> nested_min_max.py:41:1
@@ -315,16 +301,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 43 | import builtins
    |
 help: Flatten nested `max` calls
-
-ℹ Unsafe fix
-38 38 | max(max(tuples_list))
-39 39 | 
-40 40 | # Starred argument should be copied as it is.
-41    |-max(1, max(*a))
-   41 |+max(1, *a)
-42 42 | 
-43 43 | import builtins
-44 44 | builtins.min(1, min(2, 3))
+38 | max(max(tuples_list))
+39 | 
+40 | # Starred argument should be copied as it is.
+   - max(1, max(*a))
+41 + max(1, *a)
+42 | 
+43 | import builtins
+44 | builtins.min(1, min(2, 3))
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `min` calls can be flattened
   --> nested_min_max.py:44:1
@@ -334,16 +319,15 @@ PLW3301 [*] Nested `min` calls can be flattened
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Flatten nested `min` calls
-
-ℹ Unsafe fix
-41 41 | max(1, max(*a))
-42 42 | 
-43 43 | import builtins
-44    |-builtins.min(1, min(2, 3))
-   44 |+builtins.min(1, 2, 3)
-45 45 | 
-46 46 | 
-47 47 | # PLW3301
+41 | max(1, max(*a))
+42 | 
+43 | import builtins
+   - builtins.min(1, min(2, 3))
+44 + builtins.min(1, 2, 3)
+45 | 
+46 | 
+47 | # PLW3301
+note: This is an unsafe fix and may change runtime behavior
 
 PLW3301 [*] Nested `max` calls can be flattened
   --> nested_min_max.py:48:16
@@ -359,16 +343,15 @@ PLW3301 [*] Nested `max` calls can be flattened
 53 |   # OK
    |
 help: Flatten nested `max` calls
-
-ℹ Unsafe fix
-45 45 | 
-46 46 | 
-47 47 | # PLW3301
-48    |-max_word_len = max(
-49    |-    max(len(word) for word in "blah blah blah".split(" ")),
-50    |-    len("Done!"),
-51    |-)
-   48 |+max_word_len = max(*(len(word) for word in "blah blah blah".split(" ")), len("Done!"))
-52 49 | 
-53 50 | # OK
-54 51 | max_word_len = max(
+45 | 
+46 | 
+47 | # PLW3301
+   - max_word_len = max(
+   -     max(len(word) for word in "blah blah blah".split(" ")),
+   -     len("Done!"),
+   - )
+48 + max_word_len = max(*(len(word) for word in "blah blah blah".split(" ")), len("Done!"))
+49 | 
+50 | # OK
+51 | max_word_len = max(
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview_useless_import_alias.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview_useless_import_alias.snap
deleted file mode 100644
index 6c123427ab..0000000000
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview_useless_import_alias.snap
+++ /dev/null
@@ -1,4 +0,0 @@
----
-source: crates/ruff_linter/src/rules/pylint/mod.rs
----
-
diff --git a/crates/ruff_linter/src/rules/pyupgrade/mod.rs b/crates/ruff_linter/src/rules/pyupgrade/mod.rs
index 763e9f34b7..044c90b3a2 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/mod.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/mod.rs
@@ -19,7 +19,7 @@ mod tests {
     use crate::rules::{isort, pyupgrade};
     use crate::settings::types::PreviewMode;
     use crate::test::{test_path, test_snippet};
-    use crate::{assert_diagnostics, settings};
+    use crate::{assert_diagnostics, assert_diagnostics_diff, settings};
 
     #[test_case(Rule::ConvertNamedTupleFunctionalToClass, Path::new("UP014.py"))]
     #[test_case(Rule::ConvertTypedDictFunctionalToClass, Path::new("UP013.py"))]
@@ -97,7 +97,7 @@ mod tests {
     )]
     #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_many_empty_lines.py"))]
     #[test_case(Rule::UnicodeKindPrefix, Path::new("UP025.py"))]
-    #[test_case(Rule::UnnecessaryBuiltinImport, Path::new("UP029.py"))]
+    #[test_case(Rule::UnnecessaryBuiltinImport, Path::new("UP029_0.py"))]
     #[test_case(Rule::UnnecessaryClassParentheses, Path::new("UP039.py"))]
     #[test_case(Rule::UnnecessaryDefaultTypeArgs, Path::new("UP043.py"))]
     #[test_case(Rule::UnnecessaryEncodeUTF8, Path::new("UP012.py"))]
@@ -126,6 +126,7 @@ mod tests {
     }
 
     #[test_case(Rule::SuperCallWithParameters, Path::new("UP008.py"))]
+    #[test_case(Rule::TypingTextStrAlias, Path::new("UP019.py"))]
     fn rules_preview(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}__preview", path.to_string_lossy());
         let diagnostics = test_path(
@@ -139,6 +140,28 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::NonPEP695TypeAlias, Path::new("UP040.py"))]
+    #[test_case(Rule::NonPEP695TypeAlias, Path::new("UP040.pyi"))]
+    #[test_case(Rule::NonPEP695GenericClass, Path::new("UP046_0.py"))]
+    #[test_case(Rule::NonPEP695GenericClass, Path::new("UP046_1.py"))]
+    #[test_case(Rule::NonPEP695GenericFunction, Path::new("UP047.py"))]
+    fn type_var_default_preview(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("{}__preview_diff", path.to_string_lossy());
+        assert_diagnostics_diff!(
+            snapshot,
+            Path::new("pyupgrade").join(path).as_path(),
+            &settings::LinterSettings {
+                preview: PreviewMode::Disabled,
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+            &settings::LinterSettings {
+                preview: PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+        );
+        Ok(())
+    }
+
     #[test_case(Rule::QuotedAnnotation, Path::new("UP037_0.py"))]
     #[test_case(Rule::QuotedAnnotation, Path::new("UP037_1.py"))]
     #[test_case(Rule::QuotedAnnotation, Path::new("UP037_2.pyi"))]
@@ -147,7 +170,6 @@ mod tests {
         let diagnostics = test_path(
             Path::new("pyupgrade").join(path).as_path(),
             &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
                 future_annotations: true,
                 ..settings::LinterSettings::for_rule(rule_code)
             },
@@ -340,27 +362,62 @@ mod tests {
           | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
           |
         help: Import from `shlex`
-
-        ℹ Safe fix
-        1   |-from pipes import quote, Template
-          1 |+from pipes import Template
-          2 |+from shlex import quote
+          - from pipes import quote, Template
+        1 + from pipes import Template
+        2 + from shlex import quote
 
         I002 [*] Missing required import: `from __future__ import generator_stop`
         --> <filename>:1:1
         help: Insert required import: `from __future__ import generator_stop`
-
-        ℹ Safe fix
-          1 |+from __future__ import generator_stop
-        1 2 | from pipes import quote, Template
+        1 + from __future__ import generator_stop
+        2 | from pipes import quote, Template
 
         I002 [*] Missing required import: `from collections import Sequence`
         --> <filename>:1:1
         help: Insert required import: `from collections import Sequence`
-
-        ℹ Safe fix
-          1 |+from collections import Sequence
-        1 2 | from pipes import quote, Template
+        1 + from collections import Sequence
+        2 | from pipes import quote, Template
         ");
     }
+
+    #[test_case(Path::new("UP029_1.py"))]
+    fn i002_up029_conflict(path: &Path) -> Result<()> {
+        let snapshot = format!("{}_skip_required_imports", path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("pyupgrade").join(path).as_path(),
+            &settings::LinterSettings {
+                isort: isort::settings::Settings {
+                    required_imports: BTreeSet::from_iter([
+                        // https://github.com/astral-sh/ruff/issues/20601
+                        NameImport::ImportFrom(MemberNameImport::member(
+                            "builtins".to_string(),
+                            "str".to_string(),
+                        )),
+                    ]),
+                    ..Default::default()
+                },
+                ..settings::LinterSettings::for_rules([
+                    Rule::MissingRequiredImport,
+                    Rule::UnnecessaryBuiltinImport,
+                ])
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
+
+    #[test]
+    fn unnecessary_default_type_args_stubs_py312_preview() -> Result<()> {
+        let snapshot = format!("{}__preview", "UP043.pyi");
+        let diagnostics = test_path(
+            Path::new("pyupgrade/UP043.pyi"),
+            &settings::LinterSettings {
+                preview: PreviewMode::Enabled,
+                unresolved_target_version: PythonVersion::PY312.into(),
+                ..settings::LinterSettings::for_rule(Rule::UnnecessaryDefaultTypeArgs)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs
index 92f163a575..46004e4024 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs
@@ -50,6 +50,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `typing.NamedTuple`](https://docs.python.org/3/library/typing.html#typing.NamedTuple)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct ConvertNamedTupleFunctionalToClass {
     name: String,
 }
@@ -87,7 +88,7 @@ pub(crate) fn convert_named_tuple_functional_to_class(
         // Ex) `NamedTuple("MyType")`
         ([_typename], []) => vec![Stmt::Pass(ast::StmtPass {
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })],
         // Ex) `NamedTuple("MyType", [("a", int), ("b", str)])`
         ([_typename, fields], []) => {
@@ -165,7 +166,7 @@ fn create_field_assignment_stmt(field: Name, annotation: &Expr) -> Stmt {
                 id: field,
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
         ),
@@ -173,7 +174,7 @@ fn create_field_assignment_stmt(field: Name, annotation: &Expr) -> Stmt {
         value: None,
         simple: true,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     }
     .into()
 }
@@ -184,7 +185,7 @@ fn create_fields_from_fields_arg(fields: &Expr) -> Option<Vec<Stmt>> {
     if fields.is_empty() {
         let node = Stmt::Pass(ast::StmtPass {
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         });
         Some(vec![node])
     } else {
@@ -236,13 +237,13 @@ fn create_class_def_stmt(typename: &str, body: Vec<Stmt>, base_class: &Expr) ->
             args: Box::from([base_class.clone()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })),
         body,
         type_params: None,
         decorator_list: vec![],
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     }
     .into()
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
index 97f1619078..af99187e6d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
@@ -61,6 +61,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// [Python keywords]: https://docs.python.org/3/reference/lexical_analysis.html#keywords
 /// [Dunder names]: https://docs.python.org/3/reference/lexical_analysis.html#reserved-classes-of-identifiers
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct ConvertTypedDictFunctionalToClass {
     name: String,
 }
@@ -150,7 +151,7 @@ fn create_field_assignment_stmt(field: &str, annotation: &Expr) -> Stmt {
                 id: field.into(),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
         ),
@@ -158,7 +159,7 @@ fn create_field_assignment_stmt(field: &str, annotation: &Expr) -> Stmt {
         value: None,
         simple: true,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     }
     .into()
 }
@@ -179,13 +180,13 @@ fn create_class_def_stmt(
                 None => Box::from([]),
             },
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })),
         body,
         type_params: None,
         decorator_list: vec![],
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     }
     .into()
 }
@@ -194,7 +195,7 @@ fn fields_from_dict_literal(items: &[ast::DictItem]) -> Option<Vec<Stmt>> {
     if items.is_empty() {
         let node = Stmt::Pass(ast::StmtPass {
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         });
         Some(vec![node])
     } else {
@@ -228,7 +229,7 @@ fn fields_from_dict_call(func: &Expr, keywords: &[Keyword]) -> Option<Vec<Stmt>>
     if keywords.is_empty() {
         let node = Stmt::Pass(ast::StmtPass {
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         });
         Some(vec![node])
     } else {
@@ -241,7 +242,7 @@ fn fields_from_keywords(keywords: &[Keyword]) -> Option<Vec<Stmt>> {
     if keywords.is_empty() {
         let node = Stmt::Pass(ast::StmtPass {
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         });
         return Some(vec![node]);
     }
@@ -282,7 +283,7 @@ fn match_fields_and_total(arguments: &Arguments) -> Option<(Vec<Stmt>, Option<&K
         ([_typename], []) => {
             let node = Stmt::Pass(ast::StmtPass {
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             Some((vec![node], None))
         }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs
index b67f312699..c37281831f 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs
@@ -34,6 +34,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `datetime.UTC`](https://docs.python.org/3/library/datetime.html#datetime.UTC)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.192")]
 pub(crate) struct DatetimeTimezoneUTC;
 
 impl Violation for DatetimeTimezoneUTC {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
index 03dfec9322..1ce34e2f15 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
@@ -25,6 +25,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `xml.etree.ElementTree`](https://docs.python.org/3/library/xml.etree.elementtree.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.199")]
 pub(crate) struct DeprecatedCElementTree;
 
 impl AlwaysFixableViolation for DeprecatedCElementTree {
@@ -43,6 +44,7 @@ where
     T: Ranged,
 {
     let mut diagnostic = checker.report_diagnostic(DeprecatedCElementTree, node.range());
+    diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
     let contents = checker.locator().slice(node);
     diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
         contents.replacen("cElementTree", "ElementTree", 1),
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs
index c3428ef945..9b15ac0b5b 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs
@@ -64,6 +64,7 @@ enum Deprecation {
 /// from collections.abc import Sequence
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.239")]
 pub(crate) struct DeprecatedImport {
     deprecation: Deprecation,
 }
@@ -755,6 +756,7 @@ pub(crate) fn deprecated_import(checker: &Checker, import_from_stmt: &StmtImport
             },
             import_from_stmt.range(),
         );
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         if let Some(content) = fix {
             diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
                 content,
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_mock_import.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_mock_import.rs
index 0ef84304fc..5c13bbd07f 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_mock_import.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_mock_import.rs
@@ -17,6 +17,7 @@ use crate::Locator;
 use crate::checkers::ast::Checker;
 use crate::cst::matchers::{match_import, match_import_from, match_statement};
 use crate::fix::codemods::CodegenStylist;
+use crate::rules::pyupgrade::rules::is_import_required_by_isort;
 use crate::{AlwaysFixableViolation, Edit, Fix};
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
@@ -48,6 +49,7 @@ pub(crate) enum MockReference {
 /// - [Python documentation: `unittest.mock`](https://docs.python.org/3/library/unittest.mock.html)
 /// - [PyPI: `mock`](https://pypi.org/project/mock/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.206")]
 pub(crate) struct DeprecatedMockImport {
     reference_type: MockReference,
 }
@@ -264,6 +266,7 @@ pub(crate) fn deprecated_mock_attribute(checker: &Checker, attribute: &ast::Expr
             },
             attribute.value.range(),
         );
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
             "mock".to_string(),
             attribute.value.range(),
@@ -299,13 +302,20 @@ pub(crate) fn deprecated_mock_import(checker: &Checker, stmt: &Stmt) {
 
                 // Add a `Diagnostic` for each `mock` import.
                 for name in names {
-                    if &name.name == "mock" || &name.name == "mock.mock" {
+                    if (&name.name == "mock" || &name.name == "mock.mock")
+                        && !is_import_required_by_isort(
+                            &checker.settings().isort.required_imports,
+                            stmt.into(),
+                            name,
+                        )
+                    {
                         let mut diagnostic = checker.report_diagnostic(
                             DeprecatedMockImport {
                                 reference_type: MockReference::Import,
                             },
                             name.range(),
                         );
+                        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
                         if let Some(content) = content.as_ref() {
                             diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
                                 content.clone(),
@@ -319,6 +329,7 @@ pub(crate) fn deprecated_mock_import(checker: &Checker, stmt: &Stmt) {
         Stmt::ImportFrom(ast::StmtImportFrom {
             module: Some(module),
             level,
+            names,
             ..
         }) => {
             if *level > 0 {
@@ -326,12 +337,24 @@ pub(crate) fn deprecated_mock_import(checker: &Checker, stmt: &Stmt) {
             }
 
             if module == "mock" {
+                if names.iter().any(|alias| {
+                    alias.name.as_str() == "mock"
+                        && is_import_required_by_isort(
+                            &checker.settings().isort.required_imports,
+                            stmt.into(),
+                            alias,
+                        )
+                }) {
+                    return;
+                }
+
                 let mut diagnostic = checker.report_diagnostic(
                     DeprecatedMockImport {
                         reference_type: MockReference::Import,
                     },
                     stmt.range(),
                 );
+                diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
                 if let Some(indent) = indentation(checker.source(), stmt) {
                     diagnostic.try_set_fix(|| {
                         format_import_from(stmt, indent, checker.locator(), checker.stylist())
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
index 519f8d9d39..5804d543d4 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
@@ -39,6 +39,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python 3.11 documentation: Deprecated aliases](https://docs.python.org/3.11/library/unittest.html#deprecated-aliases)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct DeprecatedUnittestAlias {
     alias: String,
     target: String,
@@ -98,6 +99,7 @@ pub(crate) fn deprecated_unittest_alias(checker: &Checker, expr: &Expr) {
         },
         expr.range(),
     );
+    diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
     diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
         format!("self.{target}"),
         expr.range(),
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/extraneous_parentheses.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/extraneous_parentheses.rs
index c6ba676d82..9fe0324c1c 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/extraneous_parentheses.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/extraneous_parentheses.rs
@@ -25,6 +25,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// print("Hello, world")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.228")]
 pub(crate) struct ExtraneousParentheses;
 
 impl AlwaysFixableViolation for ExtraneousParentheses {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs
index f34751ce93..b889c66d8c 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs
@@ -6,7 +6,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::any_over_expr;
 use ruff_python_ast::str::{leading_quote, trailing_quote};
-use ruff_python_ast::{self as ast, Expr, Keyword};
+use ruff_python_ast::{self as ast, Expr, Keyword, StringFlags};
 use ruff_python_literal::format::{
     FieldName, FieldNamePart, FieldType, FormatPart, FormatString, FromTemplate,
 };
@@ -40,6 +40,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: f-strings](https://docs.python.org/3/reference/lexical_analysis.html#f-strings)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.224")]
 pub(crate) struct FString;
 
 impl Violation for FString {
@@ -145,7 +146,6 @@ fn parenthesize(expr: &Expr, text: &str, context: FormatContext) -> bool {
             Expr::BinOp(_)
             | Expr::UnaryOp(_)
             | Expr::BoolOp(_)
-            | Expr::Named(_)
             | Expr::Compare(_)
             | Expr::If(_)
             | Expr::Lambda(_)
@@ -161,12 +161,17 @@ fn parenthesize(expr: &Expr, text: &str, context: FormatContext) -> bool {
                 value: ast::Number::Int(..),
                 ..
             }),
-        ) => text.chars().all(|c| c.is_ascii_digit()),
+        ) => text
+            .chars()
+            // Ignore digit separators so decimal literals like `1_2` still count as pure digits.
+            .filter(|c| *c != '_')
+            .all(|c| c.is_ascii_digit()),
         // E.g., `{x, y}` should be parenthesized in `f"{(x, y)}"`.
         (
             _,
             Expr::Generator(_)
             | Expr::Dict(_)
+            | Expr::Named(_)
             | Expr::Set(_)
             | Expr::SetComp(_)
             | Expr::DictComp(_),
@@ -430,7 +435,7 @@ pub(crate) fn f_strings(checker: &Checker, call: &ast::ExprCall, summary: &Forma
                 // dot is the start of an attribute access.
                 break token.start();
             }
-            TokenKind::String => {
+            TokenKind::String if !token.unwrap_string_flags().is_unclosed() => {
                 match FStringConversion::try_convert(token.range(), &mut summary, checker.locator())
                 {
                     // If the format string contains side effects that would need to be repeated,
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs
index 5e738c013e..c60a9efa14 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs
@@ -47,6 +47,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax)
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.218")]
 pub(crate) struct FormatLiterals;
 
 impl Violation for FormatLiterals {
@@ -164,7 +165,7 @@ fn remove_specifiers<'a>(value: &mut Expression<'a>, arena: &'a typed_arena::Are
                         stack.push(&mut string.left);
                         stack.push(&mut string.right);
                     }
-                    libcst_native::String::Formatted(_) => {}
+                    libcst_native::String::Formatted(_) | libcst_native::String::Templated(_) => {}
                 }
             }
         }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs
index 9b1fd26801..1d66e806db 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs
@@ -41,6 +41,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `@functools.cache`](https://docs.python.org/3/library/functools.html#functools.cache)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.225")]
 pub(crate) struct LRUCacheWithMaxsizeNone;
 
 impl AlwaysFixableViolation for LRUCacheWithMaxsizeNone {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs
index 8941677219..27aaa84e31 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs
@@ -39,6 +39,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python documentation: `@functools.lru_cache`](https://docs.python.org/3/library/functools.html#functools.lru_cache)
 /// - [Let lru_cache be used as a decorator with no arguments](https://github.com/python/cpython/issues/80953)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct LRUCacheWithoutParameters;
 
 impl AlwaysFixableViolation for LRUCacheWithoutParameters {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs
index 4b2bbb1068..c1b6d0d540 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs
@@ -39,27 +39,27 @@ impl LiteralType {
             LiteralType::Str => ast::StringLiteral {
                 value: Box::default(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 flags: checker.default_string_flags(),
             }
             .into(),
             LiteralType::Bytes => ast::BytesLiteral {
                 value: Box::default(),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 flags: checker.default_bytes_flags(),
             }
             .into(),
             LiteralType::Int => ast::ExprNumberLiteral {
                 value: ast::Number::Int(Int::from(0u8)),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
             LiteralType::Float => ast::ExprNumberLiteral {
                 value: ast::Number::Float(0.0),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
             LiteralType::Bool => ast::ExprBooleanLiteral::default().into(),
@@ -128,6 +128,7 @@ impl fmt::Display for LiteralType {
 /// - [Python documentation: `float`](https://docs.python.org/3/library/functions.html#float)
 /// - [Python documentation: `bool`](https://docs.python.org/3/library/functions.html#bool)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.193")]
 pub(crate) struct NativeLiterals {
     literal_type: LiteralType,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/non_pep646_unpack.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/non_pep646_unpack.rs
index 79ab523ad3..36487d7926 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/non_pep646_unpack.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/non_pep646_unpack.rs
@@ -36,6 +36,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 646]: https://peps.python.org/pep-0646/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct NonPEP646Unpack;
 
 impl Violation for NonPEP646Unpack {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs
index 4d74273a28..563658fa66 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs
@@ -30,6 +30,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `io.open`](https://docs.python.org/3/library/io.html#io.open)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.196")]
 pub(crate) struct OpenAlias;
 
 impl Violation for OpenAlias {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs
index c08a49462f..a4486b93c2 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs
@@ -35,6 +35,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `OSError`](https://docs.python.org/3/library/exceptions.html#OSError)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.206")]
 pub(crate) struct OSErrorAlias {
     name: Option<String>,
 }
@@ -116,7 +117,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr]
                 id: Name::new_static("OSError"),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             };
             remaining.insert(0, node.into());
         }
@@ -128,7 +129,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr]
                 elts: remaining,
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 parenthesized: true,
             };
             format!("({})", checker.generator().expr(&node.into()))
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs
index 52e4cd9771..dfa945fab1 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs
@@ -52,6 +52,7 @@ use ruff_python_semantic::SemanticModel;
 /// ## References
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.240")]
 pub(crate) struct OutdatedVersionBlock {
     reason: Reason,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs
index e364056de3..c633c5b4ee 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs
@@ -14,13 +14,14 @@ use ruff_python_ast::{
 use ruff_python_semantic::SemanticModel;
 use ruff_text_size::{Ranged, TextRange};
 
+use crate::checkers::ast::Checker;
+use crate::preview::is_type_var_default_enabled;
+
 pub(crate) use non_pep695_generic_class::*;
 pub(crate) use non_pep695_generic_function::*;
 pub(crate) use non_pep695_type_alias::*;
 pub(crate) use private_type_parameter::*;
 
-use crate::checkers::ast::Checker;
-
 mod non_pep695_generic_class;
 mod non_pep695_generic_function;
 mod non_pep695_type_alias;
@@ -122,6 +123,10 @@ impl Display for DisplayTypeVar<'_> {
                 }
             }
         }
+        if let Some(default) = self.type_var.default {
+            f.write_str(" = ")?;
+            f.write_str(&self.source[default.range()])?;
+        }
 
         Ok(())
     }
@@ -133,66 +138,63 @@ impl<'a> From<&'a TypeVar<'a>> for TypeParam {
             name,
             restriction,
             kind,
-            default: _, // TODO(brent) see below
+            default,
         }: &'a TypeVar<'a>,
     ) -> Self {
+        let default = default.map(|expr| Box::new(expr.clone()));
         match kind {
-            TypeParamKind::TypeVar => {
-                TypeParam::TypeVar(TypeParamTypeVar {
-                    range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
-                    name: Identifier::new(*name, TextRange::default()),
-                    bound: match restriction {
-                        Some(TypeVarRestriction::Bound(bound)) => Some(Box::new((*bound).clone())),
-                        Some(TypeVarRestriction::Constraint(constraints)) => {
-                            Some(Box::new(Expr::Tuple(ast::ExprTuple {
-                                range: TextRange::default(),
-                                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
-                                elts: constraints.iter().map(|expr| (*expr).clone()).collect(),
-                                ctx: ast::ExprContext::Load,
-                                parenthesized: true,
-                            })))
-                        }
-                        Some(TypeVarRestriction::AnyStr) => {
-                            Some(Box::new(Expr::Tuple(ast::ExprTuple {
-                                range: TextRange::default(),
-                                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
-                                elts: vec![
-                                    Expr::Name(ExprName {
-                                        range: TextRange::default(),
-                                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
-                                        id: Name::from("str"),
-                                        ctx: ast::ExprContext::Load,
-                                    }),
-                                    Expr::Name(ExprName {
-                                        range: TextRange::default(),
-                                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
-                                        id: Name::from("bytes"),
-                                        ctx: ast::ExprContext::Load,
-                                    }),
-                                ],
-                                ctx: ast::ExprContext::Load,
-                                parenthesized: true,
-                            })))
-                        }
-                        None => None,
-                    },
-                    // We don't handle defaults here yet. Should perhaps be a different rule since
-                    // defaults are only valid in 3.13+.
-                    default: None,
-                })
-            }
+            TypeParamKind::TypeVar => TypeParam::TypeVar(TypeParamTypeVar {
+                range: TextRange::default(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                name: Identifier::new(*name, TextRange::default()),
+                bound: match restriction {
+                    Some(TypeVarRestriction::Bound(bound)) => Some(Box::new((*bound).clone())),
+                    Some(TypeVarRestriction::Constraint(constraints)) => {
+                        Some(Box::new(Expr::Tuple(ast::ExprTuple {
+                            range: TextRange::default(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                            elts: constraints.iter().map(|expr| (*expr).clone()).collect(),
+                            ctx: ast::ExprContext::Load,
+                            parenthesized: true,
+                        })))
+                    }
+                    Some(TypeVarRestriction::AnyStr) => {
+                        Some(Box::new(Expr::Tuple(ast::ExprTuple {
+                            range: TextRange::default(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                            elts: vec![
+                                Expr::Name(ExprName {
+                                    range: TextRange::default(),
+                                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                                    id: Name::from("str"),
+                                    ctx: ast::ExprContext::Load,
+                                }),
+                                Expr::Name(ExprName {
+                                    range: TextRange::default(),
+                                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                                    id: Name::from("bytes"),
+                                    ctx: ast::ExprContext::Load,
+                                }),
+                            ],
+                            ctx: ast::ExprContext::Load,
+                            parenthesized: true,
+                        })))
+                    }
+                    None => None,
+                },
+                default,
+            }),
             TypeParamKind::TypeVarTuple => TypeParam::TypeVarTuple(TypeParamTypeVarTuple {
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 name: Identifier::new(*name, TextRange::default()),
-                default: None,
+                default,
             }),
             TypeParamKind::ParamSpec => TypeParam::ParamSpec(TypeParamParamSpec {
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 name: Identifier::new(*name, TextRange::default()),
-                default: None,
+                default,
             }),
         }
     }
@@ -318,8 +320,8 @@ pub(crate) fn expr_name_to_type_var<'a>(
                 .first()
                 .is_some_and(Expr::is_string_literal_expr)
             {
-                // TODO(brent) `default` was added in PEP 696 and Python 3.13 but can't be used in
-                // generic type parameters before that
+                // `default` was added in PEP 696 and Python 3.13. We now support converting
+                // TypeVars with defaults to PEP 695 type parameters.
                 //
                 // ```python
                 // T = TypeVar("T", default=Any, bound=str)
@@ -367,21 +369,22 @@ fn in_nested_context(checker: &Checker) -> bool {
 }
 
 /// Deduplicate `vars`, returning `None` if `vars` is empty or any duplicates are found.
-fn check_type_vars(vars: Vec<TypeVar<'_>>) -> Option<Vec<TypeVar<'_>>> {
+/// Also returns `None` if any `TypeVar` has a default value and preview mode is not enabled.
+fn check_type_vars<'a>(vars: Vec<TypeVar<'a>>, checker: &Checker) -> Option<Vec<TypeVar<'a>>> {
     if vars.is_empty() {
         return None;
     }
 
+    // If any type variables have defaults and preview mode is not enabled, skip the rule
+    if vars.iter().any(|tv| tv.default.is_some())
+        && !is_type_var_default_enabled(checker.settings())
+    {
+        return None;
+    }
+
     // If any type variables were not unique, just bail out here. this is a runtime error and we
-    // can't predict what the user wanted. also bail out if any Python 3.13+ default values are
-    // found on the type parameters
-    (vars
-        .iter()
-        .unique_by(|tvar| tvar.name)
-        .filter(|tvar| tvar.default.is_none())
-        .count()
-        == vars.len())
-    .then_some(vars)
+    // can't predict what the user wanted.
+    (vars.iter().unique_by(|tvar| tvar.name).count() == vars.len()).then_some(vars)
 }
 
 /// Search `class_bases` for a `typing.Generic` base class. Returns the `Generic` expression (if
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs
index 00e76a5360..b0d273b7c4 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs
@@ -86,6 +86,7 @@ use super::{
 /// [UP049]: https://docs.astral.sh/ruff/rules/private-type-parameter/
 /// [fail]: https://github.com/python/mypy/issues/18507
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct NonPEP695GenericClass {
     name: String,
 }
@@ -186,7 +187,7 @@ pub(crate) fn non_pep695_generic_class(checker: &Checker, class_def: &StmtClassD
     //
     // just because we can't confirm that `SomethingElse` is a `TypeVar`
     if !visitor.any_skipped {
-        let Some(type_vars) = check_type_vars(visitor.vars) else {
+        let Some(type_vars) = check_type_vars(visitor.vars, checker) else {
             diagnostic.defuse();
             return;
         };
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_function.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_function.rs
index 645fbcad61..e59b3905ce 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_function.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_function.rs
@@ -78,6 +78,7 @@ use super::{DisplayTypeVars, TypeVarReferenceVisitor, check_type_vars, in_nested
 /// [UP049]: https://docs.astral.sh/ruff/rules/private-type-parameter/
 /// [fail]: https://github.com/python/mypy/issues/18507
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct NonPEP695GenericFunction {
     name: String,
 }
@@ -154,7 +155,7 @@ pub(crate) fn non_pep695_generic_function(checker: &Checker, function_def: &Stmt
         }
     }
 
-    let Some(type_vars) = check_type_vars(type_vars) else {
+    let Some(type_vars) = check_type_vars(type_vars, checker) else {
         return;
     };
 
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs
index e14c5c8632..43e3ec8536 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs
@@ -8,6 +8,7 @@ use ruff_python_ast::{Expr, ExprCall, ExprName, Keyword, StmtAnnAssign, StmtAssi
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
+use crate::preview::is_type_var_default_enabled;
 use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 use ruff_python_ast::PythonVersion;
 
@@ -83,6 +84,7 @@ use super::{
 /// [UP047]: https://docs.astral.sh/ruff/rules/non-pep695-generic-function/
 /// [UP049]: https://docs.astral.sh/ruff/rules/private-type-parameter/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.283")]
 pub(crate) struct NonPEP695TypeAlias {
     name: String,
     type_alias_kind: TypeAliasKind,
@@ -232,8 +234,10 @@ pub(crate) fn non_pep695_type_alias(checker: &Checker, stmt: &StmtAnnAssign) {
         .unique_by(|tvar| tvar.name)
         .collect::<Vec<_>>();
 
-    // TODO(brent) handle `default` arg for Python 3.13+
-    if vars.iter().any(|tv| tv.default.is_some()) {
+    // Skip if any TypeVar has defaults and preview mode is not enabled
+    if vars.iter().any(|tv| tv.default.is_some())
+        && !is_type_var_default_enabled(checker.settings())
+    {
         return;
     }
 
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/private_type_parameter.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/private_type_parameter.rs
index d581cc64dc..c5a20c83dc 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/private_type_parameter.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/private_type_parameter.rs
@@ -66,6 +66,7 @@ use crate::{
 /// [UP046]: https://docs.astral.sh/ruff/rules/non-pep695-generic-class
 /// [PYI018]: https://docs.astral.sh/ruff/rules/unused-private-type-var
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct PrivateTypeParameter {
     kind: ParamKind,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs
index 1faffd5a71..d6de04d355 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs
@@ -75,6 +75,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `printf`-style String Formatting](https://docs.python.org/3/library/stdtypes.html#old-string-formatting)
 /// - [Python documentation: `str.format`](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.229")]
 pub(crate) struct PrintfStringFormatting;
 
 impl Violation for PrintfStringFormatting {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/quoted_annotation.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/quoted_annotation.rs
index 834616edaa..25a85e0a18 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/quoted_annotation.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/quoted_annotation.rs
@@ -87,6 +87,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// [TC008]: https://docs.astral.sh/ruff/rules/quoted-type-alias/
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.242")]
 pub(crate) struct QuotedAnnotation;
 
 impl AlwaysFixableViolation for QuotedAnnotation {
@@ -102,7 +103,7 @@ impl AlwaysFixableViolation for QuotedAnnotation {
 
 /// UP037
 pub(crate) fn quoted_annotation(checker: &Checker, annotation: &str, range: TextRange) {
-    let add_future_import = checker.settings().future_annotations()
+    let add_future_import = checker.settings().future_annotations
         && checker.semantic().in_runtime_evaluated_annotation();
 
     if !(checker.semantic().in_typing_only_annotation() || add_future_import) {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/redundant_open_modes.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/redundant_open_modes.rs
index 13deff4941..cf87abc039 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/redundant_open_modes.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/redundant_open_modes.rs
@@ -30,6 +30,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `open`](https://docs.python.org/3/library/functions.html#open)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct RedundantOpenModes {
     replacement: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs
index 17de6c99fa..7c5dd2f027 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs
@@ -44,6 +44,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python 3.7 release notes](https://docs.python.org/3/whatsnew/3.7.html#subprocess)
 /// - [Python documentation: `subprocess.run`](https://docs.python.org/3/library/subprocess.html#subprocess.run)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.199")]
 pub(crate) struct ReplaceStdoutStderr;
 
 impl Violation for ReplaceStdoutStderr {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_str_enum.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_str_enum.rs
index 7bdcdad798..1adab1d52d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_str_enum.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_str_enum.rs
@@ -77,6 +77,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [breaking change]: https://blog.pecar.me/python-enum
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.6")]
 pub(crate) struct ReplaceStrEnum {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_universal_newlines.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_universal_newlines.rs
index c9a2a8b530..97000fa75f 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_universal_newlines.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_universal_newlines.rs
@@ -35,6 +35,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python 3.7 release notes](https://docs.python.org/3/whatsnew/3.7.html#subprocess)
 /// - [Python documentation: `subprocess.run`](https://docs.python.org/3/library/subprocess.html#subprocess.run)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.196")]
 pub(crate) struct ReplaceUniversalNewlines;
 
 impl AlwaysFixableViolation for ReplaceUniversalNewlines {
@@ -68,6 +69,7 @@ pub(crate) fn replace_universal_newlines(checker: &Checker, call: &ast::ExprCall
         };
 
         let mut diagnostic = checker.report_diagnostic(ReplaceUniversalNewlines, arg.range());
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
 
         if call.arguments.find_keyword("text").is_some() {
             diagnostic.try_set_fix(|| {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/super_call_with_parameters.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/super_call_with_parameters.rs
index ddb5ee034e..cc7cbef8e0 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/super_call_with_parameters.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/super_call_with_parameters.rs
@@ -1,6 +1,8 @@
 use ruff_diagnostics::Applicability;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::visitor::{Visitor, walk_expr, walk_stmt};
 use ruff_python_ast::{self as ast, Expr, Stmt};
+use ruff_python_semantic::SemanticModel;
 use ruff_text_size::{Ranged, TextSize};
 
 use crate::checkers::ast::Checker;
@@ -55,6 +57,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `super`](https://docs.python.org/3/library/functions.html#super)
 /// - [super/MRO, Python's most misunderstood feature.](https://www.youtube.com/watch?v=X1PQ7zzltz4)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct SuperCallWithParameters;
 
 impl Violation for SuperCallWithParameters {
@@ -94,14 +97,22 @@ pub(crate) fn super_call_with_parameters(checker: &Checker, call: &ast::ExprCall
     };
 
     // Find the enclosing function definition (if any).
-    let Some(Stmt::FunctionDef(ast::StmtFunctionDef {
-        parameters: parent_parameters,
-        ..
-    })) = parents.find(|stmt| stmt.is_function_def_stmt())
+    let Some(
+        func_stmt @ Stmt::FunctionDef(ast::StmtFunctionDef {
+            parameters: parent_parameters,
+            ..
+        }),
+    ) = parents.find(|stmt| stmt.is_function_def_stmt())
     else {
         return;
     };
 
+    if is_builtins_super(checker.semantic(), call)
+        && !has_local_dunder_class_var_ref(checker.semantic(), func_stmt)
+    {
+        return;
+    }
+
     // Extract the name of the first argument to the enclosing function.
     let Some(parent_arg) = parent_parameters.args.first() else {
         return;
@@ -129,7 +140,11 @@ pub(crate) fn super_call_with_parameters(checker: &Checker, call: &ast::ExprCall
         return;
     };
 
-    if !((first_arg_id == "__class__" || first_arg_id == parent_name.as_str())
+    // The `super(__class__, self)` and `super(ParentClass, self)` patterns are redundant in Python 3
+    // when the first argument refers to the implicit `__class__` cell or to the enclosing class.
+    // Avoid triggering if a local variable shadows either name.
+    if !(((first_arg_id == "__class__") || (first_arg_id == parent_name.as_str()))
+        && !checker.semantic().current_scope().has(first_arg_id)
         && second_arg_id == parent_arg.name().as_str())
     {
         return;
@@ -193,3 +208,67 @@ pub(crate) fn super_call_with_parameters(checker: &Checker, call: &ast::ExprCall
 fn is_super_call_with_arguments(call: &ast::ExprCall, checker: &Checker) -> bool {
     checker.semantic().match_builtin_expr(&call.func, "super") && !call.arguments.is_empty()
 }
+
+/// Returns `true` if the function contains load references to `__class__` or `super` without
+/// local binding.
+///
+/// This indicates that the function relies on the implicit `__class__` cell variable created by
+/// Python when `super()` is called without arguments, making it unsafe to remove `super()` parameters.
+fn has_local_dunder_class_var_ref(semantic: &SemanticModel, func_stmt: &Stmt) -> bool {
+    if semantic.current_scope().has("__class__") {
+        return false;
+    }
+
+    let mut finder = ClassCellReferenceFinder::new();
+    finder.visit_stmt(func_stmt);
+
+    finder.found()
+}
+
+/// Returns `true` if the call is to the built-in `builtins.super` function.
+fn is_builtins_super(semantic: &SemanticModel, call: &ast::ExprCall) -> bool {
+    semantic
+        .resolve_qualified_name(&call.func)
+        .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["builtins", "super"]))
+}
+
+/// A [`Visitor`] that searches for implicit reference to `__class__` cell,
+/// excluding nested class definitions.
+#[derive(Debug)]
+struct ClassCellReferenceFinder {
+    has_class_cell: bool,
+}
+
+impl ClassCellReferenceFinder {
+    pub(crate) fn new() -> Self {
+        ClassCellReferenceFinder {
+            has_class_cell: false,
+        }
+    }
+    pub(crate) fn found(&self) -> bool {
+        self.has_class_cell
+    }
+}
+
+impl<'a> Visitor<'a> for ClassCellReferenceFinder {
+    fn visit_stmt(&mut self, stmt: &'a Stmt) {
+        match stmt {
+            Stmt::ClassDef(_) => {}
+            _ => {
+                if !self.has_class_cell {
+                    walk_stmt(self, stmt);
+                }
+            }
+        }
+    }
+
+    fn visit_expr(&mut self, expr: &'a Expr) {
+        if expr.as_name_expr().is_some_and(|name| {
+            matches!(name.id.as_str(), "super" | "__class__") && name.ctx.is_load()
+        }) {
+            self.has_class_cell = true;
+            return;
+        }
+        walk_expr(self, expr);
+    }
+}
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs
index c5c2e609b6..85ca344d9d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs
@@ -40,6 +40,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `TimeoutError`](https://docs.python.org/3/library/exceptions.html#TimeoutError)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct TimeoutErrorAlias {
     name: Option<String>,
 }
@@ -130,7 +131,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr]
                 id: Name::new_static("TimeoutError"),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             };
             remaining.insert(0, node.into());
         }
@@ -142,7 +143,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr]
                 elts: remaining,
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 parenthesized: true,
             };
             format!("({})", checker.generator().expr(&node.into()))
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs
index 251cd37dbc..08acc9850d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs
@@ -30,6 +30,7 @@ use crate::rules::pyupgrade::types::Primitive;
 /// - [Python documentation: `type()`](https://docs.python.org/3/library/functions.html#type)
 /// - [Python documentation: Built-in types](https://docs.python.org/3/library/stdtypes.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct TypeOfPrimitive {
     primitive: Primitive,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs
index 9e8adda647..4e69c888b6 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs
@@ -1,15 +1,19 @@
 use ruff_python_ast::Expr;
+use std::fmt::{Display, Formatter};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_semantic::Modules;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
+use crate::preview::is_typing_extensions_str_alias_enabled;
 use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
 /// Checks for uses of `typing.Text`.
 ///
+/// In preview mode, also checks for `typing_extensions.Text`.
+///
 /// ## Why is this bad?
 /// `typing.Text` is an alias for `str`, and only exists for Python 2
 /// compatibility. As of Python 3.11, `typing.Text` is deprecated. Use `str`
@@ -30,14 +34,17 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `typing.Text`](https://docs.python.org/3/library/typing.html#typing.Text)
 #[derive(ViolationMetadata)]
-pub(crate) struct TypingTextStrAlias;
+#[violation_metadata(stable_since = "v0.0.195")]
+pub(crate) struct TypingTextStrAlias {
+    module: TypingModule,
+}
 
 impl Violation for TypingTextStrAlias {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        "`typing.Text` is deprecated, use `str`".to_string()
+        format!("`{}.Text` is deprecated, use `str`", self.module)
     }
 
     fn fix_title(&self) -> Option<String> {
@@ -47,16 +54,27 @@ impl Violation for TypingTextStrAlias {
 
 /// UP019
 pub(crate) fn typing_text_str_alias(checker: &Checker, expr: &Expr) {
-    if !checker.semantic().seen_module(Modules::TYPING) {
+    if !checker
+        .semantic()
+        .seen_module(Modules::TYPING | Modules::TYPING_EXTENSIONS)
+    {
         return;
     }
 
-    if checker
-        .semantic()
-        .resolve_qualified_name(expr)
-        .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["typing", "Text"]))
-    {
-        let mut diagnostic = checker.report_diagnostic(TypingTextStrAlias, expr.range());
+    if let Some(qualified_name) = checker.semantic().resolve_qualified_name(expr) {
+        let segments = qualified_name.segments();
+        let module = match segments {
+            ["typing", "Text"] => TypingModule::Typing,
+            ["typing_extensions", "Text"]
+                if is_typing_extensions_str_alias_enabled(checker.settings()) =>
+            {
+                TypingModule::TypingExtensions
+            }
+            _ => return,
+        };
+
+        let mut diagnostic = checker.report_diagnostic(TypingTextStrAlias { module }, expr.range());
+        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
         diagnostic.try_set_fix(|| {
             let (import_edit, binding) = checker.importer().get_or_import_builtin_symbol(
                 "str",
@@ -70,3 +88,18 @@ pub(crate) fn typing_text_str_alias(checker: &Checker, expr: &Expr) {
         });
     }
 }
+
+#[derive(Copy, Clone, Debug)]
+enum TypingModule {
+    Typing,
+    TypingExtensions,
+}
+
+impl Display for TypingModule {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TypingModule::Typing => f.write_str("typing"),
+            TypingModule::TypingExtensions => f.write_str("typing_extensions"),
+        }
+    }
+}
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unicode_kind_prefix.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
index 7d62237e1f..8e162fea30 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
@@ -25,6 +25,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: Unicode HOWTO](https://docs.python.org/3/howto/unicode.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.201")]
 pub(crate) struct UnicodeKindPrefix;
 
 impl AlwaysFixableViolation for UnicodeKindPrefix {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs
index bef5438882..41e73a3096 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs
@@ -6,6 +6,7 @@ use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::fix;
+use crate::rules::pyupgrade::rules::is_import_required_by_isort;
 use crate::{AlwaysFixableViolation, Fix};
 
 /// ## What it does
@@ -27,9 +28,25 @@ use crate::{AlwaysFixableViolation, Fix};
 /// str(1)
 /// ```
 ///
+/// ## Fix safety
+/// This fix is marked as unsafe because removing the import
+/// may change program behavior. For example, in the following
+/// situation:
+///
+/// ```python
+/// def str(x):
+///     return x
+///
+///
+/// from builtins import str
+///
+/// str(1)  # `"1"` with the import, `1` without
+/// ```
+///
 /// ## References
 /// - [Python documentation: The Python Standard Library](https://docs.python.org/3/library/index.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.211")]
 pub(crate) struct UnnecessaryBuiltinImport {
     pub names: Vec<String>,
 }
@@ -70,6 +87,13 @@ pub(crate) fn unnecessary_builtin_import(
     // Identify unaliased, builtin imports.
     let unused_imports: Vec<&Alias> = names
         .iter()
+        .filter(|alias| {
+            !is_import_required_by_isort(
+                &checker.settings().isort.required_imports,
+                stmt.into(),
+                alias,
+            )
+        })
         .filter(|alias| alias.asname.is_none())
         .filter(|alias| {
             matches!(
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_class_parentheses.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_class_parentheses.rs
index 10649d493e..d2459b8411 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_class_parentheses.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_class_parentheses.rs
@@ -25,6 +25,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct UnnecessaryClassParentheses;
 
 impl AlwaysFixableViolation for UnnecessaryClassParentheses {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs
index e9d7b90777..e2e8f10f60 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [PEP 3120]: https://peps.python.org/pep-3120/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct UTF8EncodingDeclaration;
 
 impl AlwaysFixableViolation for UTF8EncodingDeclaration {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs
index ed1cba9f53..c61cee5cb8 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs
@@ -8,6 +8,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// ## What it does
 /// Checks for unnecessary default type arguments for `Generator` and
 /// `AsyncGenerator` on Python 3.13+.
+/// In [preview], this rule will also apply to stub files.
 ///
 /// ## Why is this bad?
 /// Python 3.13 introduced the ability for type parameters to specify default
@@ -59,7 +60,10 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// - [Annotating generators and coroutines](https://docs.python.org/3/library/typing.html#annotating-generators-and-coroutines)
 /// - [Python documentation: `typing.Generator`](https://docs.python.org/3/library/typing.html#typing.Generator)
 /// - [Python documentation: `typing.AsyncGenerator`](https://docs.python.org/3/library/typing.html#typing.AsyncGenerator)
+///
+/// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct UnnecessaryDefaultTypeArgs;
 
 impl AlwaysFixableViolation for UnnecessaryDefaultTypeArgs {
@@ -127,13 +131,13 @@ pub(crate) fn unnecessary_default_type_args(checker: &Checker, expr: &Expr) {
                             elts: valid_elts,
                             ctx: ast::ExprContext::Load,
                             range: TextRange::default(),
-                            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                             parenthesized: true,
                         })
                     }),
                     ctx: ast::ExprContext::Load,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 })),
             expr.range(),
         ),
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs
index 7eea6a4613..12ca46ed4b 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs
@@ -30,6 +30,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `str.encode`](https://docs.python.org/3/library/stdtypes.html#str.encode)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct UnnecessaryEncodeUTF8 {
     reason: Reason,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs
index 51b8167172..8b5bd03bef 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs
@@ -4,6 +4,7 @@ use itertools::{Itertools, chain};
 use ruff_python_semantic::NodeId;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::name::{QualifiedName, QualifiedNameBuilder};
 use ruff_python_ast::{self as ast, Alias, Stmt, StmtRef};
 use ruff_python_semantic::{NameImport, Scope};
 use ruff_text_size::Ranged;
@@ -43,6 +44,7 @@ use crate::{AlwaysFixableViolation, Applicability, Fix};
 /// ## References
 /// - [Python documentation: `__future__` — Future statement definitions](https://docs.python.org/3/library/__future__.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct UnnecessaryFutureImport {
     pub names: Vec<String>,
 }
@@ -95,20 +97,35 @@ pub(crate) fn is_import_required_by_isort(
     stmt: StmtRef,
     alias: &Alias,
 ) -> bool {
-    let segments: &[&str] = match stmt {
+    match stmt {
         StmtRef::ImportFrom(ast::StmtImportFrom {
             module: Some(module),
             ..
-        }) => &[module.as_str(), alias.name.as_str()],
-        StmtRef::ImportFrom(ast::StmtImportFrom { module: None, .. }) | StmtRef::Import(_) => {
-            &[alias.name.as_str()]
-        }
-        _ => return false,
-    };
+        }) => {
+            let mut builder = QualifiedNameBuilder::with_capacity(module.split('.').count() + 1);
+            builder.extend(module.split('.'));
+            builder.push(alias.name.as_str());
+            let qualified = builder.build();
 
-    required_imports
-        .iter()
-        .any(|required_import| required_import.qualified_name().segments() == segments)
+            required_imports
+                .iter()
+                .any(|required_import| required_import.qualified_name() == qualified)
+        }
+        StmtRef::ImportFrom(ast::StmtImportFrom { module: None, .. })
+        | StmtRef::Import(ast::StmtImport { .. }) => {
+            let name = alias.name.as_str();
+            let qualified = if name.contains('.') {
+                QualifiedName::from_dotted_name(name)
+            } else {
+                QualifiedName::user_defined(name)
+            };
+
+            required_imports
+                .iter()
+                .any(|required_import| required_import.qualified_name() == qualified)
+        }
+        _ => false,
+    }
 }
 
 /// UP010
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs
index 1958a23120..7cb86fe030 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs
@@ -28,6 +28,7 @@ use crate::Violation;
 /// - [Python documentation: Generator expressions](https://docs.python.org/3/reference/expressions.html#generator-expressions)
 /// - [Python documentation: List comprehensions](https://docs.python.org/3/tutorial/datastructures.html#list-comprehensions)
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.8.0")]
 pub(crate) struct UnpackedListComprehension;
 
 impl Violation for UnpackedListComprehension {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs
index 044c21f258..420768f1ed 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs
@@ -55,6 +55,7 @@ use ruff_python_ast::PythonVersion;
 ///
 /// [PEP 585]: https://peps.python.org/pep-0585/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct NonPEP585Annotation {
     from: String,
     to: String,
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs
index 784bc5c65e..aabbb65d15 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs
@@ -54,6 +54,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 604]: https://peps.python.org/pep-0604/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct NonPEP604AnnotationUnion;
 
 impl Violation for NonPEP604AnnotationUnion {
@@ -110,6 +111,7 @@ impl Violation for NonPEP604AnnotationUnion {
 ///
 /// [PEP 604]: https://peps.python.org/pep-0604/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct NonPEP604AnnotationOptional;
 
 impl Violation for NonPEP604AnnotationOptional {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_isinstance.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_isinstance.rs
index 2e0f08638b..df8c492c96 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_isinstance.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_isinstance.rs
@@ -33,8 +33,8 @@ impl CallKind {
     }
 }
 
-/// ## Deprecation
-/// This rule was deprecated as using [PEP 604] syntax in `isinstance` and `issubclass` calls
+/// ## Removed
+/// This rule was removed as using [PEP 604] syntax in `isinstance` and `issubclass` calls
 /// isn't recommended practice, and it incorrectly suggests that other typing syntaxes like [PEP 695]
 /// would be supported by `isinstance` and `issubclass`. Using the [PEP 604] syntax
 /// is also slightly slower.
@@ -72,6 +72,7 @@ impl CallKind {
 /// [PEP 604]: https://peps.python.org/pep-0604/
 /// [PEP 695]: https://peps.python.org/pep-0695/
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.13.0")]
 pub(crate) struct NonPEP604Isinstance {
     kind: CallKind,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_class_metaclass_type.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_class_metaclass_type.rs
index 09e993b2fb..75bbe20eca 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_class_metaclass_type.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_class_metaclass_type.rs
@@ -29,6 +29,7 @@ use ruff_text_size::Ranged;
 /// ## References
 /// - [PEP 3115 – Metaclasses in Python 3000](https://peps.python.org/pep-3115/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct UselessClassMetaclassType {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_metaclass_type.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_metaclass_type.rs
index b221b2e7cd..2d2d7ac868 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_metaclass_type.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_metaclass_type.rs
@@ -29,6 +29,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## References
 /// - [PEP 3115 – Metaclasses in Python 3000](https://peps.python.org/pep-3115/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct UselessMetaclassType;
 
 impl AlwaysFixableViolation for UselessMetaclassType {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_object_inheritance.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_object_inheritance.rs
index cb1fe0152e..4a5789c78f 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_object_inheritance.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_object_inheritance.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Fix};
 /// ## References
 /// - [PEP 3115 – Metaclasses in Python 3000](https://peps.python.org/pep-3115/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct UselessObjectInheritance {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs
index 8fa6118e4c..7fec2b7d79 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs
@@ -51,6 +51,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: The `yield` statement](https://docs.python.org/3/reference/simple_stmts.html#the-yield-statement)
 /// - [PEP 380 – Syntax for Delegating to a Subgenerator](https://peps.python.org/pep-0380/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.210")]
 pub(crate) struct YieldInForLoop;
 
 impl Violation for YieldInForLoop {
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap
index 7f1c7a75a1..d986bbe165 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap
@@ -9,14 +9,12 @@ UP001 [*] `__metaclass__ = type` is implied
   |     ^^^^^^^^^^^^^^^^^^^^
   |
 help: Remove `__metaclass__ = type`
-
-ℹ Safe fix
-1 1 | class A:
-2   |-    __metaclass__ = type
-  2 |+    pass
-3 3 | 
-4 4 | 
-5 5 | class B:
+1 | class A:
+  -     __metaclass__ = type
+2 +     pass
+3 | 
+4 | 
+5 | class B:
 
 UP001 [*] `__metaclass__ = type` is implied
  --> UP001.py:6:5
@@ -28,12 +26,10 @@ UP001 [*] `__metaclass__ = type` is implied
 8 |     def __init__(self) -> None:
   |
 help: Remove `__metaclass__ = type`
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | class B:
-6   |-    __metaclass__ = type
-7 6 | 
-8 7 |     def __init__(self) -> None:
-9 8 |         pass
+3 | 
+4 | 
+5 | class B:
+  -     __metaclass__ = type
+6 | 
+7 |     def __init__(self) -> None:
+8 |         pass
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap
index 08d84dd2bb..44ca5f32bc 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap
@@ -10,13 +10,11 @@ UP003 [*] Use `str` instead of `type(...)`
 3 | type(0)
   |
 help: Replace `type(...)` with `str`
-
-ℹ Safe fix
-1   |-type("")
-  1 |+str
-2 2 | type(b"")
-3 3 | type(0)
-4 4 | type(0.0)
+  - type("")
+1 + str
+2 | type(b"")
+3 | type(0)
+4 | type(0.0)
 
 UP003 [*] Use `bytes` instead of `type(...)`
  --> UP003.py:2:1
@@ -28,14 +26,12 @@ UP003 [*] Use `bytes` instead of `type(...)`
 4 | type(0.0)
   |
 help: Replace `type(...)` with `bytes`
-
-ℹ Safe fix
-1 1 | type("")
-2   |-type(b"")
-  2 |+bytes
-3 3 | type(0)
-4 4 | type(0.0)
-5 5 | type(0j)
+1 | type("")
+  - type(b"")
+2 + bytes
+3 | type(0)
+4 | type(0.0)
+5 | type(0j)
 
 UP003 [*] Use `int` instead of `type(...)`
  --> UP003.py:3:1
@@ -48,15 +44,13 @@ UP003 [*] Use `int` instead of `type(...)`
 5 | type(0j)
   |
 help: Replace `type(...)` with `int`
-
-ℹ Safe fix
-1 1 | type("")
-2 2 | type(b"")
-3   |-type(0)
-  3 |+int
-4 4 | type(0.0)
-5 5 | type(0j)
-6 6 | 
+1 | type("")
+2 | type(b"")
+  - type(0)
+3 + int
+4 | type(0.0)
+5 | type(0j)
+6 | 
 
 UP003 [*] Use `float` instead of `type(...)`
  --> UP003.py:4:1
@@ -68,16 +62,14 @@ UP003 [*] Use `float` instead of `type(...)`
 5 | type(0j)
   |
 help: Replace `type(...)` with `float`
-
-ℹ Safe fix
-1 1 | type("")
-2 2 | type(b"")
-3 3 | type(0)
-4   |-type(0.0)
-  4 |+float
-5 5 | type(0j)
-6 6 | 
-7 7 | # OK
+1 | type("")
+2 | type(b"")
+3 | type(0)
+  - type(0.0)
+4 + float
+5 | type(0j)
+6 | 
+7 | # OK
 
 UP003 [*] Use `complex` instead of `type(...)`
  --> UP003.py:5:1
@@ -90,16 +82,14 @@ UP003 [*] Use `complex` instead of `type(...)`
 7 | # OK
   |
 help: Replace `type(...)` with `complex`
-
-ℹ Safe fix
-2 2 | type(b"")
-3 3 | type(0)
-4 4 | type(0.0)
-5   |-type(0j)
-  5 |+complex
-6 6 | 
-7 7 | # OK
-8 8 | type(arg)(" ")
+2 | type(b"")
+3 | type(0)
+4 | type(0.0)
+  - type(0j)
+5 + complex
+6 | 
+7 | # OK
+8 | type(arg)(" ")
 
 UP003 [*] Use `str` instead of `type(...)`
   --> UP003.py:14:29
@@ -109,10 +99,8 @@ UP003 [*] Use `str` instead of `type(...)`
    |                             ^^^^^^^^
    |
 help: Replace `type(...)` with `str`
-
-ℹ Safe fix
-11 11 | y = x.dtype.type(0.0)
-12 12 | 
-13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459841
-14    |-assert isinstance(fullname, type("")is not True)
-   14 |+assert isinstance(fullname, str is not True)
+11 | y = x.dtype.type(0.0)
+12 | 
+13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459841
+   - assert isinstance(fullname, type("")is not True)
+14 + assert isinstance(fullname, str is not True)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap
index 06bc6b37d4..51d694ac7d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap
@@ -9,16 +9,14 @@ UP004 [*] Class `A` inherits from `object`
 6 |     ...
   |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-2 2 |     ...
-3 3 | 
-4 4 | 
-5   |-class A(object):
-  5 |+class A:
-6 6 |     ...
-7 7 | 
-8 8 | 
+2 |     ...
+3 | 
+4 | 
+  - class A(object):
+5 + class A:
+6 |     ...
+7 | 
+8 | 
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:10:5
@@ -30,18 +28,16 @@ UP004 [*] Class `A` inherits from `object`
 12 |     ...
    |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-class A(
-10    |-    object,
-11    |-):
-   9  |+class A:
-12 10 |     ...
-13 11 | 
-14 12 | 
+6  |     ...
+7  | 
+8  | 
+   - class A(
+   -     object,
+   - ):
+9  + class A:
+10 |     ...
+11 | 
+12 | 
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:16:5
@@ -53,19 +49,18 @@ UP004 [*] Class `A` inherits from `object`
 18 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-12 12 |     ...
-13 13 | 
-14 14 | 
-15    |-class A(
-16    |-    object,
-17    |-    #
-18    |-):
-   15 |+class A:
-19 16 |     ...
-20 17 | 
-21 18 | 
+12 |     ...
+13 | 
+14 | 
+   - class A(
+   -     object,
+   -     #
+   - ):
+15 + class A:
+16 |     ...
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:24:5
@@ -78,19 +73,18 @@ UP004 [*] Class `A` inherits from `object`
 26 |     ...
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-19 19 |     ...
-20 20 | 
-21 21 | 
-22    |-class A(
-23    |-    #
-24    |-    object,
-25    |-):
-   22 |+class A:
-26 23 |     ...
-27 24 | 
-28 25 | 
+19 |     ...
+20 | 
+21 | 
+   - class A(
+   -     #
+   -     object,
+   - ):
+22 + class A:
+23 |     ...
+24 | 
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:31:5
@@ -103,19 +97,18 @@ UP004 [*] Class `A` inherits from `object`
 33 |     ...
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-class A(
-30    |-    #
-31    |-    object
-32    |-):
-   29 |+class A:
-33 30 |     ...
-34 31 | 
-35 32 | 
+26 |     ...
+27 | 
+28 | 
+   - class A(
+   -     #
+   -     object
+   - ):
+29 + class A:
+30 |     ...
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:37:5
@@ -127,19 +120,18 @@ UP004 [*] Class `A` inherits from `object`
 39 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-33 33 |     ...
-34 34 | 
-35 35 | 
-36    |-class A(
-37    |-    object
-38    |-    #
-39    |-):
-   36 |+class A:
-40 37 |     ...
-41 38 | 
-42 39 | 
+33 |     ...
+34 | 
+35 | 
+   - class A(
+   -     object
+   -     #
+   - ):
+36 + class A:
+37 |     ...
+38 | 
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:45:5
@@ -152,20 +144,19 @@ UP004 [*] Class `A` inherits from `object`
 47 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-40 40 |     ...
-41 41 | 
-42 42 | 
-43    |-class A(
-44    |-    #
-45    |-    object,
-46    |-    #
-47    |-):
-   43 |+class A:
-48 44 |     ...
-49 45 | 
-50 46 | 
+40 |     ...
+41 | 
+42 | 
+   - class A(
+   -     #
+   -     object,
+   -     #
+   - ):
+43 + class A:
+44 |     ...
+45 | 
+46 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:53:5
@@ -178,20 +169,19 @@ UP004 [*] Class `A` inherits from `object`
 55 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-48 48 |     ...
-49 49 | 
-50 50 | 
-51    |-class A(
-52    |-    #
-53    |-    object,
-54    |-    #
-55    |-):
-   51 |+class A:
-56 52 |     ...
-57 53 | 
-58 54 | 
+48 |     ...
+49 | 
+50 | 
+   - class A(
+   -     #
+   -     object,
+   -     #
+   - ):
+51 + class A:
+52 |     ...
+53 | 
+54 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:61:5
@@ -204,20 +194,19 @@ UP004 [*] Class `A` inherits from `object`
 63 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-56 56 |     ...
-57 57 | 
-58 58 | 
-59    |-class A(
-60    |-    #
-61    |-    object
-62    |-    #
-63    |-):
-   59 |+class A:
-64 60 |     ...
-65 61 | 
-66 62 | 
+56 |     ...
+57 | 
+58 | 
+   - class A(
+   -     #
+   -     object
+   -     #
+   - ):
+59 + class A:
+60 |     ...
+61 | 
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
   --> UP004.py:69:5
@@ -230,20 +219,19 @@ UP004 [*] Class `A` inherits from `object`
 71 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-64 64 |     ...
-65 65 | 
-66 66 | 
-67    |-class A(
-68    |-    #
-69    |-    object
-70    |-    #
-71    |-):
-   67 |+class A:
-72 68 |     ...
-73 69 | 
-74 70 | 
+64 |     ...
+65 | 
+66 | 
+   - class A(
+   -     #
+   -     object
+   -     #
+   - ):
+67 + class A:
+68 |     ...
+69 | 
+70 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `B` inherits from `object`
   --> UP004.py:75:12
@@ -253,16 +241,14 @@ UP004 [*] Class `B` inherits from `object`
 76 |     ...
    |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-72 72 |     ...
-73 73 | 
-74 74 | 
-75    |-class B(A, object):
-   75 |+class B(A):
-76 76 |     ...
-77 77 | 
-78 78 | 
+72 |     ...
+73 | 
+74 | 
+   - class B(A, object):
+75 + class B(A):
+76 |     ...
+77 | 
+78 | 
 
 UP004 [*] Class `B` inherits from `object`
   --> UP004.py:79:9
@@ -272,16 +258,14 @@ UP004 [*] Class `B` inherits from `object`
 80 |     ...
    |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-76 76 |     ...
-77 77 | 
-78 78 | 
-79    |-class B(object, A):
-   79 |+class B(A):
-80 80 |     ...
-81 81 | 
-82 82 | 
+76 |     ...
+77 | 
+78 | 
+   - class B(object, A):
+79 + class B(A):
+80 |     ...
+81 | 
+82 | 
 
 UP004 [*] Class `B` inherits from `object`
   --> UP004.py:84:5
@@ -293,15 +277,13 @@ UP004 [*] Class `B` inherits from `object`
 86 | ):
    |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-81 81 | 
-82 82 | 
-83 83 | class B(
-84    |-    object,
-85 84 |     A,
-86 85 | ):
-87 86 |     ...
+81 | 
+82 | 
+83 | class B(
+   -     object,
+84 |     A,
+85 | ):
+86 |     ...
 
 UP004 [*] Class `B` inherits from `object`
   --> UP004.py:92:5
@@ -314,15 +296,13 @@ UP004 [*] Class `B` inherits from `object`
 94 |     ...
    |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-89 89 | 
-90 90 | class B(
-91 91 |     A,
-92    |-    object,
-93 92 | ):
-94 93 |     ...
-95 94 | 
+89 | 
+90 | class B(
+91 |     A,
+   -     object,
+92 | ):
+93 |     ...
+94 | 
 
 UP004 [*] Class `B` inherits from `object`
    --> UP004.py:98:5
@@ -334,15 +314,14 @@ UP004 [*] Class `B` inherits from `object`
 100 |     A,
     |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-95 95 | 
-96 96 | 
-97 97 | class B(
-98    |-    object,
-99 98 |     # Comment on A.
-100 99 |     A,
-101 100 | ):
+95  | 
+96  | 
+97  | class B(
+    -     object,
+98  |     # Comment on A.
+99  |     A,
+100 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `B` inherits from `object`
    --> UP004.py:108:5
@@ -355,15 +334,13 @@ UP004 [*] Class `B` inherits from `object`
 110 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-105 105 | class B(
-106 106 |     # Comment on A.
-107 107 |     A,
-108     |-    object,
-109 108 | ):
-110 109 |     ...
-111 110 | 
+105 | class B(
+106 |     # Comment on A.
+107 |     A,
+    -     object,
+108 | ):
+109 |     ...
+110 | 
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:119:5
@@ -375,18 +352,16 @@ UP004 [*] Class `A` inherits from `object`
 121 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-115 115 |         ...
-116 116 | 
-117 117 | 
-118     |-class A(
-119     |-    object,
-120     |-):
-    118 |+class A:
-121 119 |     ...
-122 120 | 
-123 121 | 
+115 |         ...
+116 | 
+117 | 
+    - class A(
+    -     object,
+    - ):
+118 + class A:
+119 |     ...
+120 | 
+121 | 
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:125:5
@@ -398,18 +373,17 @@ UP004 [*] Class `A` inherits from `object`
 127 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-121 121 |     ...
-122 122 | 
-123 123 | 
-124     |-class A(
-125     |-    object,  # )
-126     |-):
-    124 |+class A:
-127 125 |     ...
-128 126 | 
-129 127 | 
+121 |     ...
+122 | 
+123 | 
+    - class A(
+    -     object,  # )
+    - ):
+124 + class A:
+125 |     ...
+126 | 
+127 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:131:5
@@ -421,19 +395,18 @@ UP004 [*] Class `A` inherits from `object`
 133 | ):
     |
 help: Remove `object` inheritance
-
-ℹ Unsafe fix
-127 127 |     ...
-128 128 | 
-129 129 | 
-130     |-class A(
-131     |-    object  # )
-132     |-    ,
-133     |-):
-    130 |+class A:
-134 131 |     ...
-135 132 | 
-136 133 | 
+127 |     ...
+128 | 
+129 | 
+    - class A(
+    -     object  # )
+    -     ,
+    - ):
+130 + class A:
+131 |     ...
+132 | 
+133 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:137:9
@@ -443,16 +416,14 @@ UP004 [*] Class `A` inherits from `object`
 138 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-134 134 |     ...
-135 135 | 
-136 136 | 
-137     |-class A(object, object):
-    137 |+class A(object):
-138 138 |     ...
-139 139 | 
-140 140 | 
+134 |     ...
+135 | 
+136 | 
+    - class A(object, object):
+137 + class A(object):
+138 |     ...
+139 | 
+140 | 
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:137:17
@@ -462,16 +433,14 @@ UP004 [*] Class `A` inherits from `object`
 138 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-134 134 |     ...
-135 135 | 
-136 136 | 
-137     |-class A(object, object):
-    137 |+class A(object):
-138 138 |     ...
-139 139 | 
-140 140 | 
+134 |     ...
+135 | 
+136 | 
+    - class A(object, object):
+137 + class A(object):
+138 |     ...
+139 | 
+140 | 
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:142:9
@@ -482,16 +451,14 @@ UP004 [*] Class `A` inherits from `object`
 143 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-139 139 | 
-140 140 | 
-141 141 | @decorator()
-142     |-class A(object):
-    142 |+class A:
-143 143 |     ...
-144 144 | 
-145 145 | @decorator()  # class A(object):
+139 | 
+140 | 
+141 | @decorator()
+    - class A(object):
+142 + class A:
+143 |     ...
+144 | 
+145 | @decorator()  # class A(object):
 
 UP004 [*] Class `A` inherits from `object`
    --> UP004.py:146:9
@@ -502,16 +469,14 @@ UP004 [*] Class `A` inherits from `object`
 147 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-143 143 |     ...
-144 144 | 
-145 145 | @decorator()  # class A(object):
-146     |-class A(object):
-    146 |+class A:
-147 147 |     ...
-148 148 | 
-149 149 | 
+143 |     ...
+144 | 
+145 | @decorator()  # class A(object):
+    - class A(object):
+146 + class A:
+147 |     ...
+148 | 
+149 | 
 
 UP004 [*] Class `Unusual` inherits from `object`
    --> UP004.py:159:15
@@ -523,11 +488,9 @@ UP004 [*] Class `Unusual` inherits from `object`
 160 |     ...
     |
 help: Remove `object` inheritance
-
-ℹ Safe fix
-156 156 | 
-157 157 | import builtins
-158 158 | 
-159     |-class Unusual(builtins.object):
-    159 |+class Unusual:
-160 160 |     ...
+156 | 
+157 | import builtins
+158 | 
+    - class Unusual(builtins.object):
+159 + class Unusual:
+160 |     ...
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap
index 062d02bd62..299cdb2e84 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap
@@ -12,16 +12,14 @@ UP005 [*] `assertEquals` is deprecated, use `assertEqual`
 8 |         self.assertEqual(3, 4)
   |
 help: Replace `assertEqual` with `assertEquals`
-
-ℹ Safe fix
-3 3 | 
-4 4 | class Suite(unittest.TestCase):
-5 5 |     def test(self) -> None:
-6   |-        self.assertEquals (1, 2)
-  6 |+        self.assertEqual (1, 2)
-7 7 |         self.assertEquals(1, 2)
-8 8 |         self.assertEqual(3, 4)
-9 9 |         self.failUnlessAlmostEqual(1, 1.1)
+3 | 
+4 | class Suite(unittest.TestCase):
+5 |     def test(self) -> None:
+  -         self.assertEquals (1, 2)
+6 +         self.assertEqual (1, 2)
+7 |         self.assertEquals(1, 2)
+8 |         self.assertEqual(3, 4)
+9 |         self.failUnlessAlmostEqual(1, 1.1)
 
 UP005 [*] `assertEquals` is deprecated, use `assertEqual`
  --> UP005.py:7:9
@@ -34,16 +32,14 @@ UP005 [*] `assertEquals` is deprecated, use `assertEqual`
 9 |         self.failUnlessAlmostEqual(1, 1.1)
   |
 help: Replace `assertEqual` with `assertEquals`
-
-ℹ Safe fix
-4 4 | class Suite(unittest.TestCase):
-5 5 |     def test(self) -> None:
-6 6 |         self.assertEquals (1, 2)
-7   |-        self.assertEquals(1, 2)
-  7 |+        self.assertEqual(1, 2)
-8 8 |         self.assertEqual(3, 4)
-9 9 |         self.failUnlessAlmostEqual(1, 1.1)
-10 10 |         self.assertNotRegexpMatches("a", "b")
+4  | class Suite(unittest.TestCase):
+5  |     def test(self) -> None:
+6  |         self.assertEquals (1, 2)
+   -         self.assertEquals(1, 2)
+7  +         self.assertEqual(1, 2)
+8  |         self.assertEqual(3, 4)
+9  |         self.failUnlessAlmostEqual(1, 1.1)
+10 |         self.assertNotRegexpMatches("a", "b")
 
 UP005 [*] `failUnlessAlmostEqual` is deprecated, use `assertAlmostEqual`
   --> UP005.py:9:9
@@ -55,14 +51,12 @@ UP005 [*] `failUnlessAlmostEqual` is deprecated, use `assertAlmostEqual`
 10 |         self.assertNotRegexpMatches("a", "b")
    |
 help: Replace `assertAlmostEqual` with `failUnlessAlmostEqual`
-
-ℹ Safe fix
-6  6  |         self.assertEquals (1, 2)
-7  7  |         self.assertEquals(1, 2)
-8  8  |         self.assertEqual(3, 4)
-9     |-        self.failUnlessAlmostEqual(1, 1.1)
-   9  |+        self.assertAlmostEqual(1, 1.1)
-10 10 |         self.assertNotRegexpMatches("a", "b")
+6  |         self.assertEquals (1, 2)
+7  |         self.assertEquals(1, 2)
+8  |         self.assertEqual(3, 4)
+   -         self.failUnlessAlmostEqual(1, 1.1)
+9  +         self.assertAlmostEqual(1, 1.1)
+10 |         self.assertNotRegexpMatches("a", "b")
 
 UP005 [*] `assertNotRegexpMatches` is deprecated, use `assertNotRegex`
   --> UP005.py:10:9
@@ -73,10 +67,8 @@ UP005 [*] `assertNotRegexpMatches` is deprecated, use `assertNotRegex`
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace `assertNotRegex` with `assertNotRegexpMatches`
-
-ℹ Safe fix
-7  7  |         self.assertEquals(1, 2)
-8  8  |         self.assertEqual(3, 4)
-9  9  |         self.failUnlessAlmostEqual(1, 1.1)
-10    |-        self.assertNotRegexpMatches("a", "b")
-   10 |+        self.assertNotRegex("a", "b")
+7  |         self.assertEquals(1, 2)
+8  |         self.assertEqual(3, 4)
+9  |         self.failUnlessAlmostEqual(1, 1.1)
+   -         self.assertNotRegexpMatches("a", "b")
+10 +         self.assertNotRegex("a", "b")
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap
index c5370c7563..afe4a58b6e 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap
@@ -9,16 +9,14 @@ UP006 [*] Use `list` instead of `typing.List` for type annotation
 5 |     ...
   |
 help: Replace with `list`
-
-ℹ Safe fix
-1 1 | import typing
-2 2 | 
-3 3 | 
-4   |-def f(x: typing.List[str]) -> None:
-  4 |+def f(x: list[str]) -> None:
-5 5 |     ...
-6 6 | 
-7 7 | 
+1 | import typing
+2 | 
+3 | 
+  - def f(x: typing.List[str]) -> None:
+4 + def f(x: list[str]) -> None:
+5 |     ...
+6 | 
+7 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:11:10
@@ -28,16 +26,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 12 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-8  8  | from typing import List
-9  9  | 
-10 10 | 
-11    |-def f(x: List[str]) -> None:
-   11 |+def f(x: list[str]) -> None:
-12 12 |     ...
-13 13 | 
-14 14 | 
+8  | from typing import List
+9  | 
+10 | 
+   - def f(x: List[str]) -> None:
+11 + def f(x: list[str]) -> None:
+12 |     ...
+13 | 
+14 | 
 
 UP006 [*] Use `list` instead of `t.List` for type annotation
   --> UP006_0.py:18:10
@@ -47,16 +43,14 @@ UP006 [*] Use `list` instead of `t.List` for type annotation
 19 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-15 15 | import typing as t
-16 16 | 
-17 17 | 
-18    |-def f(x: t.List[str]) -> None:
-   18 |+def f(x: list[str]) -> None:
-19 19 |     ...
-20 20 | 
-21 21 | 
+15 | import typing as t
+16 | 
+17 | 
+   - def f(x: t.List[str]) -> None:
+18 + def f(x: list[str]) -> None:
+19 |     ...
+20 | 
+21 | 
 
 UP006 [*] Use `list` instead of `IList` for type annotation
   --> UP006_0.py:25:10
@@ -66,16 +60,14 @@ UP006 [*] Use `list` instead of `IList` for type annotation
 26 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-22 22 | from typing import List as IList
-23 23 | 
-24 24 | 
-25    |-def f(x: IList[str]) -> None:
-   25 |+def f(x: list[str]) -> None:
-26 26 |     ...
-27 27 | 
-28 28 | 
+22 | from typing import List as IList
+23 | 
+24 | 
+   - def f(x: IList[str]) -> None:
+25 + def f(x: list[str]) -> None:
+26 |     ...
+27 | 
+28 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:29:11
@@ -85,16 +77,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 30 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-def f(x: "List[str]") -> None:
-   29 |+def f(x: "list[str]") -> None:
-30 30 |     ...
-31 31 | 
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - def f(x: "List[str]") -> None:
+29 + def f(x: "list[str]") -> None:
+30 |     ...
+31 | 
+32 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:33:12
@@ -104,16 +94,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 34 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-30 30 |     ...
-31 31 | 
-32 32 | 
-33    |-def f(x: r"List[str]") -> None:
-   33 |+def f(x: r"list[str]") -> None:
-34 34 |     ...
-35 35 | 
-36 36 | 
+30 |     ...
+31 | 
+32 | 
+   - def f(x: r"List[str]") -> None:
+33 + def f(x: r"list[str]") -> None:
+34 |     ...
+35 | 
+36 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:37:11
@@ -123,16 +111,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 38 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-34 34 |     ...
-35 35 | 
-36 36 | 
-37    |-def f(x: "List[str]") -> None:
-   37 |+def f(x: "list[str]") -> None:
-38 38 |     ...
-39 39 | 
-40 40 | 
+34 |     ...
+35 | 
+36 | 
+   - def f(x: "List[str]") -> None:
+37 + def f(x: "list[str]") -> None:
+38 |     ...
+39 | 
+40 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:41:13
@@ -142,16 +128,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 42 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-38 38 |     ...
-39 39 | 
-40 40 | 
-41    |-def f(x: """List[str]""") -> None:
-   41 |+def f(x: """list[str]""") -> None:
-42 42 |     ...
-43 43 | 
-44 44 | 
+38 |     ...
+39 | 
+40 | 
+   - def f(x: """List[str]""") -> None:
+41 + def f(x: """list[str]""") -> None:
+42 |     ...
+43 | 
+44 | 
 
 UP006 Use `list` instead of `List` for type annotation
   --> UP006_0.py:45:10
@@ -170,16 +154,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 50 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-46 46 |     ...
-47 47 | 
-48 48 | 
-49    |-def f(x: "List['List[str]']") -> None:
-   49 |+def f(x: "list['List[str]']") -> None:
-50 50 |     ...
-51 51 | 
-52 52 | 
+46 |     ...
+47 | 
+48 | 
+   - def f(x: "List['List[str]']") -> None:
+49 + def f(x: "list['List[str]']") -> None:
+50 |     ...
+51 | 
+52 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:49:17
@@ -189,16 +171,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 50 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-46 46 |     ...
-47 47 | 
-48 48 | 
-49    |-def f(x: "List['List[str]']") -> None:
-   49 |+def f(x: "List['list[str]']") -> None:
-50 50 |     ...
-51 51 | 
-52 52 | 
+46 |     ...
+47 | 
+48 | 
+   - def f(x: "List['List[str]']") -> None:
+49 + def f(x: "List['list[str]']") -> None:
+50 |     ...
+51 | 
+52 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> UP006_0.py:53:11
@@ -208,16 +188,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 54 |     ...
    |
 help: Replace with `list`
-
-ℹ Safe fix
-50 50 |     ...
-51 51 | 
-52 52 | 
-53    |-def f(x: "List['Li' 'st[str]']") -> None:
-   53 |+def f(x: "list['Li' 'st[str]']") -> None:
-54 54 |     ...
-55 55 | 
-56 56 | 
+50 |     ...
+51 | 
+52 | 
+   - def f(x: "List['Li' 'st[str]']") -> None:
+53 + def f(x: "list['Li' 'st[str]']") -> None:
+54 |     ...
+55 | 
+56 | 
 
 UP006 Use `list` instead of `List` for type annotation
   --> UP006_0.py:53:16
@@ -254,24 +232,22 @@ UP006 [*] Use `collections.deque` instead of `typing.Deque` for type annotation
 62 |     ...
    |
 help: Replace with `collections.deque`
-
-ℹ Safe 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:
+20 | 
+21 | 
+22 | from typing import List as IList
+23 + from collections import deque
+24 | 
+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 | 
+59 |     ...
+60 | 
+61 | 
+   - def f(x: typing.Deque[str]) -> None:
+62 + def f(x: deque[str]) -> None:
+63 |     ...
+64 | 
+65 | 
 
 UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
   --> UP006_0.py:65:10
@@ -281,19 +257,17 @@ UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type
 66 |     ...
    |
 help: Replace with `collections.defaultdict`
-
-ℹ Safe 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:
+20 | 
+21 | 
+22 | from typing import List as IList
+23 + from collections import defaultdict
+24 | 
+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 |     ...
+63 |     ...
+64 | 
+65 | 
+   - def f(x: typing.DefaultDict[str, str]) -> None:
+66 + def f(x: defaultdict[str, str]) -> None:
+67 |     ...
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap
index 680fe6a594..4381ef616a 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap
@@ -9,11 +9,9 @@ UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type
 10 |     ...
    |
 help: Replace with `collections.defaultdict`
-
-ℹ Safe 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 |     ...
+6  |     from collections import defaultdict
+7  | 
+8  | 
+   - def f(x: typing.DefaultDict[str, str]) -> None:
+9  + def f(x: defaultdict[str, str]) -> None:
+10 |     ...
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_2.py.snap
index e03ab73fc8..272d7d64e7 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_2.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_2.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
 ---
-UP006 Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
+UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
  --> UP006_2.py:7:10
   |
 7 | def f(x: typing.DefaultDict[str, str]) -> None:
@@ -9,3 +9,9 @@ UP006 Use `collections.defaultdict` instead of `typing.DefaultDict` for type ann
 8 |     ...
   |
 help: Replace with `collections.defaultdict`
+4 |     from collections import defaultdict
+5 | 
+6 | 
+  - def f(x: typing.DefaultDict[str, str]) -> None:
+7 + def f(x: defaultdict[str, str]) -> None:
+8 |     ...
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap
index 956d599409..c9034d7ee6 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap
@@ -9,11 +9,9 @@ UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type
 8 |     ...
   |
 help: Replace with `collections.defaultdict`
-
-ℹ Safe 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 |     ...
+4 |     from collections import defaultdict
+5 | 
+6 | 
+  - def f(x: "typing.DefaultDict[str, str]") -> None:
+7 + def f(x: "defaultdict[str, str]") -> None:
+8 |     ...
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap
index 8d7774bbe1..d2ce0fd604 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap
@@ -9,16 +9,14 @@ UP007 [*] Use `X | Y` for type annotations
 6 |     ...
   |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-2 2 | from typing import Union
-3 3 | 
-4 4 | 
-5   |-def f(x: Union[str, int, Union[float, bytes]]) -> None:
-  5 |+def f(x: str | int | Union[float, bytes]) -> None:
-6 6 |     ...
-7 7 | 
-8 8 | 
+2 | from typing import Union
+3 | 
+4 | 
+  - def f(x: Union[str, int, Union[float, bytes]]) -> None:
+5 + def f(x: str | int | Union[float, bytes]) -> None:
+6 |     ...
+7 | 
+8 | 
 
 UP007 [*] Use `X | Y` for type annotations
  --> UP007.py:5:26
@@ -28,16 +26,14 @@ UP007 [*] Use `X | Y` for type annotations
 6 |     ...
   |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-2 2 | from typing import Union
-3 3 | 
-4 4 | 
-5   |-def f(x: Union[str, int, Union[float, bytes]]) -> None:
-  5 |+def f(x: Union[str, int, float | bytes]) -> None:
-6 6 |     ...
-7 7 | 
-8 8 | 
+2 | from typing import Union
+3 | 
+4 | 
+  - def f(x: Union[str, int, Union[float, bytes]]) -> None:
+5 + def f(x: Union[str, int, float | bytes]) -> None:
+6 |     ...
+7 | 
+8 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:9:10
@@ -47,16 +43,14 @@ UP007 [*] Use `X | Y` for type annotations
 10 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-def f(x: typing.Union[str, int]) -> None:
-   9  |+def f(x: str | int) -> None:
-10 10 |     ...
-11 11 | 
-12 12 | 
+6  |     ...
+7  | 
+8  | 
+   - def f(x: typing.Union[str, int]) -> None:
+9  + def f(x: str | int) -> None:
+10 |     ...
+11 | 
+12 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:13:10
@@ -66,16 +60,14 @@ UP007 [*] Use `X | Y` for type annotations
 14 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-10 10 |     ...
-11 11 | 
-12 12 | 
-13    |-def f(x: typing.Union[(str, int)]) -> None:
-   13 |+def f(x: str | int) -> None:
-14 14 |     ...
-15 15 | 
-16 16 | 
+10 |     ...
+11 | 
+12 | 
+   - def f(x: typing.Union[(str, int)]) -> None:
+13 + def f(x: str | int) -> None:
+14 |     ...
+15 | 
+16 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:17:10
@@ -85,16 +77,14 @@ UP007 [*] Use `X | Y` for type annotations
 18 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-14 14 |     ...
-15 15 | 
-16 16 | 
-17    |-def f(x: typing.Union[(str, int), float]) -> None:
-   17 |+def f(x: str | int | float) -> None:
-18 18 |     ...
-19 19 | 
-20 20 | 
+14 |     ...
+15 | 
+16 | 
+   - def f(x: typing.Union[(str, int), float]) -> None:
+17 + def f(x: str | int | float) -> None:
+18 |     ...
+19 | 
+20 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:21:10
@@ -104,16 +94,14 @@ UP007 [*] Use `X | Y` for type annotations
 22 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-18 18 |     ...
-19 19 | 
-20 20 | 
-21    |-def f(x: typing.Union[(int,)]) -> None:
-   21 |+def f(x: int) -> None:
-22 22 |     ...
-23 23 | 
-24 24 | 
+18 |     ...
+19 | 
+20 | 
+   - def f(x: typing.Union[(int,)]) -> None:
+21 + def f(x: int) -> None:
+22 |     ...
+23 | 
+24 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:25:10
@@ -123,16 +111,14 @@ UP007 [*] Use `X | Y` for type annotations
 26 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-22 22 |     ...
-23 23 | 
-24 24 | 
-25    |-def f(x: typing.Union[()]) -> None:
-   25 |+def f(x: ()) -> None:
-26 26 |     ...
-27 27 | 
-28 28 | 
+22 |     ...
+23 | 
+24 | 
+   - def f(x: typing.Union[()]) -> None:
+25 + def f(x: ()) -> None:
+26 |     ...
+27 | 
+28 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:29:11
@@ -142,16 +128,14 @@ UP007 [*] Use `X | Y` for type annotations
 30 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-def f(x: "Union[str, int, Union[float, bytes]]") -> None:
-   29 |+def f(x: "str | int | Union[float, bytes]") -> None:
-30 30 |     ...
-31 31 | 
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - def f(x: "Union[str, int, Union[float, bytes]]") -> None:
+29 + def f(x: "str | int | Union[float, bytes]") -> None:
+30 |     ...
+31 | 
+32 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:29:27
@@ -161,16 +145,14 @@ UP007 [*] Use `X | Y` for type annotations
 30 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-def f(x: "Union[str, int, Union[float, bytes]]") -> None:
-   29 |+def f(x: "Union[str, int, float | bytes]") -> None:
-30 30 |     ...
-31 31 | 
-32 32 | 
+26 |     ...
+27 | 
+28 | 
+   - def f(x: "Union[str, int, Union[float, bytes]]") -> None:
+29 + def f(x: "Union[str, int, float | bytes]") -> None:
+30 |     ...
+31 | 
+32 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:33:11
@@ -180,16 +162,48 @@ UP007 [*] Use `X | Y` for type annotations
 34 |     ...
    |
 help: Convert to `X | Y`
+30 |     ...
+31 | 
+32 | 
+   - def f(x: "typing.Union[str, int]") -> None:
+33 + def f(x: "str | int") -> None:
+34 |     ...
+35 | 
+36 | 
 
-ℹ Safe fix
-30 30 |     ...
-31 31 | 
-32 32 | 
-33    |-def f(x: "typing.Union[str, int]") -> None:
-   33 |+def f(x: "str | int") -> None:
-34 34 |     ...
-35 35 | 
-36 36 | 
+UP007 [*] Use `X | Y` for type annotations
+  --> UP007.py:37:10
+   |
+37 | def f(x: Union["str", int]) -> None:
+   |          ^^^^^^^^^^^^^^^^^
+38 |     ...
+   |
+help: Convert to `X | Y`
+34 |     ...
+35 | 
+36 | 
+   - def f(x: Union["str", int]) -> None:
+37 + def f(x: "str" | int) -> None:
+38 |     ...
+39 | 
+40 | 
+
+UP007 [*] Use `X | Y` for type annotations
+  --> UP007.py:41:10
+   |
+41 | def f(x: Union[("str", "int"), float]) -> None:
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+42 |     ...
+   |
+help: Convert to `X | Y`
+38 |     ...
+39 | 
+40 | 
+   - def f(x: Union[("str", "int"), float]) -> None:
+41 + def f(x: "str" | "int" | float) -> None:
+42 |     ...
+43 | 
+44 | 
 
 UP007 Use `X | Y` for type annotations
   --> UP007.py:46:9
@@ -212,16 +226,14 @@ UP007 [*] Use `X | Y` for type annotations
 49 |     x: Union["str", "int"]
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-45 45 | def f() -> None:
-46 46 |     x = Union[str, int]
-47 47 |     x = Union["str", "int"]
-48    |-    x: Union[str, int]
-   48 |+    x: str | int
-49 49 |     x: Union["str", "int"]
-50 50 | 
-51 51 | 
+45 | def f() -> None:
+46 |     x = Union[str, int]
+47 |     x = Union["str", "int"]
+   -     x: Union[str, int]
+48 +     x: str | int
+49 |     x: Union["str", "int"]
+50 | 
+51 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:49:8
@@ -232,16 +244,14 @@ UP007 [*] Use `X | Y` for type annotations
    |        ^^^^^^^^^^^^^^^^^^^
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-46 46 |     x = Union[str, int]
-47 47 |     x = Union["str", "int"]
-48 48 |     x: Union[str, int]
-49    |-    x: Union["str", "int"]
-   49 |+    x: "str" | "int"
-50 50 | 
-51 51 | 
-52 52 | def f(x: Union[int : float]) -> None:
+46 |     x = Union[str, int]
+47 |     x = Union["str", "int"]
+48 |     x: Union[str, int]
+   -     x: Union["str", "int"]
+49 +     x: "str" | "int"
+50 | 
+51 | 
+52 | def f(x: Union[int : float]) -> None:
 
 UP007 Use `X | Y` for type annotations
   --> UP007.py:52:10
@@ -306,16 +316,14 @@ UP007 [*] Use `X | Y` for type annotations
 84 |     ...
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-80 80 | 
-81 81 | 
-82 82 | # Regression test for: https://github.com/astral-sh/ruff/issues/8609
-83    |-def f(x: Union[int, str, bytes]) -> None:
-   83 |+def f(x: int | str | bytes) -> None:
-84 84 |     ...
-85 85 | 
-86 86 | 
+80 | 
+81 | 
+82 | # Regression test for: https://github.com/astral-sh/ruff/issues/8609
+   - def f(x: Union[int, str, bytes]) -> None:
+83 + def f(x: int | str | bytes) -> None:
+84 |     ...
+85 | 
+86 | 
 
 UP007 [*] Use `X | Y` for type annotations
   --> UP007.py:91:26
@@ -327,13 +335,11 @@ UP007 [*] Use `X | Y` for type annotations
 92 |     print(param)
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-88 88 | class AClass:
-89 89 |     ...
-90 90 | 
-91    |-def myfunc(param: "tuple[Union[int, 'AClass', None], str]"):
-   91 |+def myfunc(param: "tuple[int | 'AClass' | None, str]"):
-92 92 |     print(param)
-93 93 | 
-94 94 |
+88 | class AClass:
+89 |     ...
+90 | 
+   - def myfunc(param: "tuple[Union[int, 'AClass', None], str]"):
+91 + def myfunc(param: "tuple[int | 'AClass' | None, str]"):
+92 |     print(param)
+93 | 
+94 |
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap
index b0d8a7da1c..2248bd5db3 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap
@@ -11,16 +11,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 19 |         super(
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-14 14 |         Parent.super(1, 2)  # ok
-15 15 | 
-16 16 |     def wrong(self):
-17    |-        parent = super(Child, self)  # wrong
-   17 |+        parent = super()  # wrong
-18 18 |         super(Child, self).method  # wrong
-19 19 |         super(
-20 20 |             Child,
+14 |         Parent.super(1, 2)  # ok
+15 | 
+16 |     def wrong(self):
+   -         parent = super(Child, self)  # wrong
+17 +         parent = super()  # wrong
+18 |         super(Child, self).method  # wrong
+19 |         super(
+20 |             Child,
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:18:14
@@ -33,16 +32,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 20 |             Child,
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-15 15 | 
-16 16 |     def wrong(self):
-17 17 |         parent = super(Child, self)  # wrong
-18    |-        super(Child, self).method  # wrong
-   18 |+        super().method  # wrong
-19 19 |         super(
-20 20 |             Child,
-21 21 |             self,
+15 | 
+16 |     def wrong(self):
+17 |         parent = super(Child, self)  # wrong
+   -         super(Child, self).method  # wrong
+18 +         super().method  # wrong
+19 |         super(
+20 |             Child,
+21 |             self,
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:19:14
@@ -57,19 +55,18 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
    | |_________^
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-16 16 |     def wrong(self):
-17 17 |         parent = super(Child, self)  # wrong
-18 18 |         super(Child, self).method  # wrong
-19    |-        super(
-20    |-            Child,
-21    |-            self,
-22    |-        ).method()  # wrong
-   19 |+        super().method()  # wrong
-23 20 | 
-24 21 | 
-25 22 | class BaseClass:
+16 |     def wrong(self):
+17 |         parent = super(Child, self)  # wrong
+18 |         super(Child, self).method  # wrong
+   -         super(
+   -             Child,
+   -             self,
+   -         ).method()  # wrong
+19 +         super().method()  # wrong
+20 | 
+21 | 
+22 | class BaseClass:
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:36:14
@@ -81,16 +78,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 37 |         super().f()
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-33 33 | 
-34 34 | class MyClass(BaseClass):
-35 35 |     def normal(self):
-36    |-        super(MyClass, self).f()  # can use super()
-   36 |+        super().f()  # can use super()
-37 37 |         super().f()
-38 38 | 
-39 39 |     def different_argument(self, other):
+33 | 
+34 | class MyClass(BaseClass):
+35 |     def normal(self):
+   -         super(MyClass, self).f()  # can use super()
+36 +         super().f()  # can use super()
+37 |         super().f()
+38 | 
+39 |     def different_argument(self, other):
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:50:18
@@ -101,16 +97,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 51 |             super().f()
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-47 47 |             super(MyClass, self).f()  # CANNOT use super()
-48 48 | 
-49 49 |         def inner_argument(self):
-50    |-            super(MyClass, self).f()  # can use super()
-   50 |+            super().f()  # can use super()
-51 51 |             super().f()
-52 52 | 
-53 53 |         outer_argument()
+47 |             super(MyClass, self).f()  # CANNOT use super()
+48 | 
+49 |         def inner_argument(self):
+   -             super(MyClass, self).f()  # can use super()
+50 +             super().f()  # can use super()
+51 |             super().f()
+52 | 
+53 |         outer_argument()
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:74:14
@@ -122,16 +117,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 75 |         super().f()  # OK
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-71 71 | @dataclass
-72 72 | class DataClass:
-73 73 |     def normal(self):
-74    |-        super(DataClass, self).f()  # Error
-   74 |+        super().f()  # Error
-75 75 |         super().f()  # OK
-76 76 | 
-77 77 | 
+71 | @dataclass
+72 | class DataClass:
+73 |     def normal(self):
+   -         super(DataClass, self).f()  # Error
+74 +         super().f()  # Error
+75 |         super().f()  # OK
+76 | 
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:92:14
@@ -142,36 +136,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
    |              ^^^^^^^^^^^^^^^^^
    |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-89 89 | 
-90 90 | class B(A):
-91 91 |     def bar(self):
-92    |-        super(__class__, self).foo()
-   92 |+        super().foo()
-93 93 | 
-94 94 | 
-95 95 | # see: https://github.com/astral-sh/ruff/issues/18684
-
-UP008 [*] Use `super()` instead of `super(__class__, self)`
-   --> UP008.py:107:23
-    |
-105 | class C:
-106 |     def f(self):
-107 |         builtins.super(C, self)
-    |                       ^^^^^^^^^
-    |
-help: Remove `super()` parameters
-
-ℹ Unsafe fix
-104 104 | 
-105 105 | class C:
-106 106 |     def f(self):
-107     |-        builtins.super(C, self)
-    107 |+        builtins.super()
-108 108 | 
-109 109 | 
-110 110 | # see: https://github.com/astral-sh/ruff/issues/18533
+89 | 
+90 | class B(A):
+91 |     def bar(self):
+   -         super(__class__, self).foo()
+92 +         super().foo()
+93 | 
+94 | 
+95 | # see: https://github.com/astral-sh/ruff/issues/18684
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
    --> UP008.py:113:14
@@ -189,20 +162,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 119 |               ClassForCommentEnthusiasts,
     |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-110 110 | # see: https://github.com/astral-sh/ruff/issues/18533
-111 111 | class ClassForCommentEnthusiasts(BaseClass):
-112 112 |     def with_comments(self):
-113     |-        super(
-114     |-            # super helpful comment
-115     |-            ClassForCommentEnthusiasts,
-116     |-            self
-117     |-        ).f()
-    113 |+        super().f()
-118 114 |         super(
-119 115 |             ClassForCommentEnthusiasts,
-120 116 |             # even more helpful comment
+110 | # see: https://github.com/astral-sh/ruff/issues/18533
+111 | class ClassForCommentEnthusiasts(BaseClass):
+112 |     def with_comments(self):
+    -         super(
+    -             # super helpful comment
+    -             ClassForCommentEnthusiasts,
+    -             self
+    -         ).f()
+113 +         super().f()
+114 |         super(
+115 |             ClassForCommentEnthusiasts,
+116 |             # even more helpful comment
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
    --> UP008.py:118:14
@@ -220,20 +192,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 124 |               ClassForCommentEnthusiasts,
     |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-115 115 |             ClassForCommentEnthusiasts,
-116 116 |             self
-117 117 |         ).f()
-118     |-        super(
-119     |-            ClassForCommentEnthusiasts,
-120     |-            # even more helpful comment
-121     |-            self
-122     |-        ).f()
-    118 |+        super().f()
-123 119 |         super(
-124 120 |             ClassForCommentEnthusiasts,
-125 121 |             self
+115 |             ClassForCommentEnthusiasts,
+116 |             self
+117 |         ).f()
+    -         super(
+    -             ClassForCommentEnthusiasts,
+    -             # even more helpful comment
+    -             self
+    -         ).f()
+118 +         super().f()
+119 |         super(
+120 |             ClassForCommentEnthusiasts,
+121 |             self
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
    --> UP008.py:123:14
@@ -249,20 +220,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
     | |_________^
     |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-120 120 |             # even more helpful comment
-121 121 |             self
-122 122 |         ).f()
-123     |-        super(
-124     |-            ClassForCommentEnthusiasts,
-125     |-            self
-126     |-            # also a comment
-127     |-        ).f()
-    123 |+        super().f()
-128 124 | 
-129 125 | 
-130 126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed
+120 |             # even more helpful comment
+121 |             self
+122 |         ).f()
+    -         super(
+    -             ClassForCommentEnthusiasts,
+    -             self
+    -             # also a comment
+    -         ).f()
+123 +         super().f()
+124 | 
+125 | 
+126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 Use `super()` instead of `super(__class__, self)`
    --> UP008.py:133:21
@@ -305,12 +275,222 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 142 |     def method3(self):
 143 |         super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+144 |
+145 | # See: https://github.com/astral-sh/ruff/issues/19357
     |
 help: Remove `super()` parameters
+140 |         super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method()  # Should emit diagnostic but NOT be fixed
+141 |     
+142 |     def method3(self):
+    -         super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
+143 +         super().some_method()  # Should be fixed - no keywords
+144 | 
+145 | # See: https://github.com/astral-sh/ruff/issues/19357
+146 | # Must be detected
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-140 140 |         super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method()  # Should emit diagnostic but NOT be fixed
-141 141 |     
-142 142 |     def method3(self):
-143     |-        super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
-    143 |+        super().some_method()  # Should be fixed - no keywords
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:154:23
+    |
+152 |     def f(self):
+153 |         if False: __class__ # Python injects __class__ into scope
+154 |         builtins.super(ChildD1, self).f()
+    |                       ^^^^^^^^^^^^^^^
+155 |
+156 | class ChildD2(ParentD):
+    |
+help: Remove `super()` parameters
+151 | class ChildD1(ParentD):
+152 |     def f(self):
+153 |         if False: __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD1, self).f()
+154 +         builtins.super().f()
+155 | 
+156 | class ChildD2(ParentD):
+157 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:159:23
+    |
+157 |     def f(self):
+158 |         if False: super # Python injects __class__ into scope
+159 |         builtins.super(ChildD2, self).f()
+    |                       ^^^^^^^^^^^^^^^
+160 |
+161 | class ChildD3(ParentD):
+    |
+help: Remove `super()` parameters
+156 | class ChildD2(ParentD):
+157 |     def f(self):
+158 |         if False: super # Python injects __class__ into scope
+    -         builtins.super(ChildD2, self).f()
+159 +         builtins.super().f()
+160 | 
+161 | class ChildD3(ParentD):
+162 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:163:23
+    |
+161 | class ChildD3(ParentD):
+162 |     def f(self):
+163 |         builtins.super(ChildD3, self).f()
+    |                       ^^^^^^^^^^^^^^^
+164 |         super # Python injects __class__ into scope
+    |
+help: Remove `super()` parameters
+160 | 
+161 | class ChildD3(ParentD):
+162 |     def f(self):
+    -         builtins.super(ChildD3, self).f()
+163 +         builtins.super().f()
+164 |         super # Python injects __class__ into scope
+165 | 
+166 | import builtins as builtins_alias
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:169:29
+    |
+167 | class ChildD4(ParentD):
+168 |     def f(self):
+169 |         builtins_alias.super(ChildD4, self).f()
+    |                             ^^^^^^^^^^^^^^^
+170 |         super # Python injects __class__ into scope
+    |
+help: Remove `super()` parameters
+166 | import builtins as builtins_alias
+167 | class ChildD4(ParentD):
+168 |     def f(self):
+    -         builtins_alias.super(ChildD4, self).f()
+169 +         builtins_alias.super().f()
+170 |         super # Python injects __class__ into scope
+171 | 
+172 | class ChildD5(ParentD):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:176:23
+    |
+174 |         super = 1
+175 |         super # Python injects __class__ into scope
+176 |         builtins.super(ChildD5, self).f()
+    |                       ^^^^^^^^^^^^^^^
+177 |
+178 | class ChildD6(ParentD):
+    |
+help: Remove `super()` parameters
+173 |     def f(self):
+174 |         super = 1
+175 |         super # Python injects __class__ into scope
+    -         builtins.super(ChildD5, self).f()
+176 +         builtins.super().f()
+177 | 
+178 | class ChildD6(ParentD):
+179 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:182:23
+    |
+180 |         super: "Any"
+181 |         __class__ # Python injects __class__ into scope
+182 |         builtins.super(ChildD6, self).f()
+    |                       ^^^^^^^^^^^^^^^
+183 |
+184 | class ChildD7(ParentD):
+    |
+help: Remove `super()` parameters
+179 |     def f(self):
+180 |         super: "Any"
+181 |         __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD6, self).f()
+182 +         builtins.super().f()
+183 | 
+184 | class ChildD7(ParentD):
+185 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:188:23
+    |
+186 |         def x():
+187 |             __class__ # Python injects __class__ into scope
+188 |         builtins.super(ChildD7, self).f()
+    |                       ^^^^^^^^^^^^^^^
+189 |
+190 | class ChildD8(ParentD):
+    |
+help: Remove `super()` parameters
+185 |     def f(self):
+186 |         def x():
+187 |             __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD7, self).f()
+188 +         builtins.super().f()
+189 | 
+190 | class ChildD8(ParentD):
+191 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:195:23
+    |
+193 |             super = 1
+194 |         super # Python injects __class__ into scope
+195 |         builtins.super(ChildD8, self).f()
+    |                       ^^^^^^^^^^^^^^^
+196 |
+197 | class ChildD9(ParentD):
+    |
+help: Remove `super()` parameters
+192 |         def x():
+193 |             super = 1
+194 |         super # Python injects __class__ into scope
+    -         builtins.super(ChildD8, self).f()
+195 +         builtins.super().f()
+196 | 
+197 | class ChildD9(ParentD):
+198 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:202:23
+    |
+200 |             __class__ = 1
+201 |         __class__ # Python injects __class__ into scope
+202 |         builtins.super(ChildD9, self).f()
+    |                       ^^^^^^^^^^^^^^^
+203 |
+204 | class ChildD10(ParentD):
+    |
+help: Remove `super()` parameters
+199 |         def x():
+200 |             __class__ = 1
+201 |         __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD9, self).f()
+202 +         builtins.super().f()
+203 | 
+204 | class ChildD10(ParentD):
+205 |     def f(self):
+note: This is an unsafe fix and may change runtime behavior
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:209:23
+    |
+207 |             __class__ = 1
+208 |         super # Python injects __class__ into scope
+209 |         builtins.super(ChildD10, self).f()
+    |                       ^^^^^^^^^^^^^^^^
+    |
+help: Remove `super()` parameters
+206 |         def x():
+207 |             __class__ = 1
+208 |         super # Python injects __class__ into scope
+    -         builtins.super(ChildD10, self).f()
+209 +         builtins.super().f()
+210 | 
+211 | 
+212 | # Must be ignored
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap
index ab4386423d..8e0ef1f754 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap
@@ -11,16 +11,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 19 |         super(
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-14 14 |         Parent.super(1, 2)  # ok
-15 15 | 
-16 16 |     def wrong(self):
-17    |-        parent = super(Child, self)  # wrong
-   17 |+        parent = super()  # wrong
-18 18 |         super(Child, self).method  # wrong
-19 19 |         super(
-20 20 |             Child,
+14 |         Parent.super(1, 2)  # ok
+15 | 
+16 |     def wrong(self):
+   -         parent = super(Child, self)  # wrong
+17 +         parent = super()  # wrong
+18 |         super(Child, self).method  # wrong
+19 |         super(
+20 |             Child,
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:18:14
@@ -33,16 +31,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 20 |             Child,
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-15 15 | 
-16 16 |     def wrong(self):
-17 17 |         parent = super(Child, self)  # wrong
-18    |-        super(Child, self).method  # wrong
-   18 |+        super().method  # wrong
-19 19 |         super(
-20 20 |             Child,
-21 21 |             self,
+15 | 
+16 |     def wrong(self):
+17 |         parent = super(Child, self)  # wrong
+   -         super(Child, self).method  # wrong
+18 +         super().method  # wrong
+19 |         super(
+20 |             Child,
+21 |             self,
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:19:14
@@ -57,19 +53,17 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
    | |_________^
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-16 16 |     def wrong(self):
-17 17 |         parent = super(Child, self)  # wrong
-18 18 |         super(Child, self).method  # wrong
-19    |-        super(
-20    |-            Child,
-21    |-            self,
-22    |-        ).method()  # wrong
-   19 |+        super().method()  # wrong
-23 20 | 
-24 21 | 
-25 22 | class BaseClass:
+16 |     def wrong(self):
+17 |         parent = super(Child, self)  # wrong
+18 |         super(Child, self).method  # wrong
+   -         super(
+   -             Child,
+   -             self,
+   -         ).method()  # wrong
+19 +         super().method()  # wrong
+20 | 
+21 | 
+22 | class BaseClass:
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:36:14
@@ -81,16 +75,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 37 |         super().f()
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-33 33 | 
-34 34 | class MyClass(BaseClass):
-35 35 |     def normal(self):
-36    |-        super(MyClass, self).f()  # can use super()
-   36 |+        super().f()  # can use super()
-37 37 |         super().f()
-38 38 | 
-39 39 |     def different_argument(self, other):
+33 | 
+34 | class MyClass(BaseClass):
+35 |     def normal(self):
+   -         super(MyClass, self).f()  # can use super()
+36 +         super().f()  # can use super()
+37 |         super().f()
+38 | 
+39 |     def different_argument(self, other):
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:50:18
@@ -101,16 +93,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 51 |             super().f()
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-47 47 |             super(MyClass, self).f()  # CANNOT use super()
-48 48 | 
-49 49 |         def inner_argument(self):
-50    |-            super(MyClass, self).f()  # can use super()
-   50 |+            super().f()  # can use super()
-51 51 |             super().f()
-52 52 | 
-53 53 |         outer_argument()
+47 |             super(MyClass, self).f()  # CANNOT use super()
+48 | 
+49 |         def inner_argument(self):
+   -             super(MyClass, self).f()  # can use super()
+50 +             super().f()  # can use super()
+51 |             super().f()
+52 | 
+53 |         outer_argument()
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:74:14
@@ -122,16 +112,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 75 |         super().f()  # OK
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-71 71 | @dataclass
-72 72 | class DataClass:
-73 73 |     def normal(self):
-74    |-        super(DataClass, self).f()  # Error
-   74 |+        super().f()  # Error
-75 75 |         super().f()  # OK
-76 76 | 
-77 77 | 
+71 | @dataclass
+72 | class DataClass:
+73 |     def normal(self):
+   -         super(DataClass, self).f()  # Error
+74 +         super().f()  # Error
+75 |         super().f()  # OK
+76 | 
+77 | 
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
   --> UP008.py:92:14
@@ -142,36 +130,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
    |              ^^^^^^^^^^^^^^^^^
    |
 help: Remove `super()` parameters
-
-ℹ Safe fix
-89 89 | 
-90 90 | class B(A):
-91 91 |     def bar(self):
-92    |-        super(__class__, self).foo()
-   92 |+        super().foo()
-93 93 | 
-94 94 | 
-95 95 | # see: https://github.com/astral-sh/ruff/issues/18684
-
-UP008 [*] Use `super()` instead of `super(__class__, self)`
-   --> UP008.py:107:23
-    |
-105 | class C:
-106 |     def f(self):
-107 |         builtins.super(C, self)
-    |                       ^^^^^^^^^
-    |
-help: Remove `super()` parameters
-
-ℹ Safe fix
-104 104 | 
-105 105 | class C:
-106 106 |     def f(self):
-107     |-        builtins.super(C, self)
-    107 |+        builtins.super()
-108 108 | 
-109 109 | 
-110 110 | # see: https://github.com/astral-sh/ruff/issues/18533
+89 | 
+90 | class B(A):
+91 |     def bar(self):
+   -         super(__class__, self).foo()
+92 +         super().foo()
+93 | 
+94 | 
+95 | # see: https://github.com/astral-sh/ruff/issues/18684
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
    --> UP008.py:113:14
@@ -189,20 +155,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 119 |               ClassForCommentEnthusiasts,
     |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-110 110 | # see: https://github.com/astral-sh/ruff/issues/18533
-111 111 | class ClassForCommentEnthusiasts(BaseClass):
-112 112 |     def with_comments(self):
-113     |-        super(
-114     |-            # super helpful comment
-115     |-            ClassForCommentEnthusiasts,
-116     |-            self
-117     |-        ).f()
-    113 |+        super().f()
-118 114 |         super(
-119 115 |             ClassForCommentEnthusiasts,
-120 116 |             # even more helpful comment
+110 | # see: https://github.com/astral-sh/ruff/issues/18533
+111 | class ClassForCommentEnthusiasts(BaseClass):
+112 |     def with_comments(self):
+    -         super(
+    -             # super helpful comment
+    -             ClassForCommentEnthusiasts,
+    -             self
+    -         ).f()
+113 +         super().f()
+114 |         super(
+115 |             ClassForCommentEnthusiasts,
+116 |             # even more helpful comment
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
    --> UP008.py:118:14
@@ -220,20 +185,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 124 |               ClassForCommentEnthusiasts,
     |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-115 115 |             ClassForCommentEnthusiasts,
-116 116 |             self
-117 117 |         ).f()
-118     |-        super(
-119     |-            ClassForCommentEnthusiasts,
-120     |-            # even more helpful comment
-121     |-            self
-122     |-        ).f()
-    118 |+        super().f()
-123 119 |         super(
-124 120 |             ClassForCommentEnthusiasts,
-125 121 |             self
+115 |             ClassForCommentEnthusiasts,
+116 |             self
+117 |         ).f()
+    -         super(
+    -             ClassForCommentEnthusiasts,
+    -             # even more helpful comment
+    -             self
+    -         ).f()
+118 +         super().f()
+119 |         super(
+120 |             ClassForCommentEnthusiasts,
+121 |             self
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 [*] Use `super()` instead of `super(__class__, self)`
    --> UP008.py:123:14
@@ -249,20 +213,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
     | |_________^
     |
 help: Remove `super()` parameters
-
-ℹ Unsafe fix
-120 120 |             # even more helpful comment
-121 121 |             self
-122 122 |         ).f()
-123     |-        super(
-124     |-            ClassForCommentEnthusiasts,
-125     |-            self
-126     |-            # also a comment
-127     |-        ).f()
-    123 |+        super().f()
-128 124 | 
-129 125 | 
-130 126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed
+120 |             # even more helpful comment
+121 |             self
+122 |         ).f()
+    -         super(
+    -             ClassForCommentEnthusiasts,
+    -             self
+    -             # also a comment
+    -         ).f()
+123 +         super().f()
+124 | 
+125 | 
+126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed
+note: This is an unsafe fix and may change runtime behavior
 
 UP008 Use `super()` instead of `super(__class__, self)`
    --> UP008.py:133:21
@@ -305,12 +268,211 @@ UP008 [*] Use `super()` instead of `super(__class__, self)`
 142 |     def method3(self):
 143 |         super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+144 |
+145 | # See: https://github.com/astral-sh/ruff/issues/19357
     |
 help: Remove `super()` parameters
+140 |         super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method()  # Should emit diagnostic but NOT be fixed
+141 |     
+142 |     def method3(self):
+    -         super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
+143 +         super().some_method()  # Should be fixed - no keywords
+144 | 
+145 | # See: https://github.com/astral-sh/ruff/issues/19357
+146 | # Must be detected
 
-ℹ Safe fix
-140 140 |         super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method()  # Should emit diagnostic but NOT be fixed
-141 141 |     
-142 142 |     def method3(self):
-143     |-        super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
-    143 |+        super().some_method()  # Should be fixed - no keywords
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:154:23
+    |
+152 |     def f(self):
+153 |         if False: __class__ # Python injects __class__ into scope
+154 |         builtins.super(ChildD1, self).f()
+    |                       ^^^^^^^^^^^^^^^
+155 |
+156 | class ChildD2(ParentD):
+    |
+help: Remove `super()` parameters
+151 | class ChildD1(ParentD):
+152 |     def f(self):
+153 |         if False: __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD1, self).f()
+154 +         builtins.super().f()
+155 | 
+156 | class ChildD2(ParentD):
+157 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:159:23
+    |
+157 |     def f(self):
+158 |         if False: super # Python injects __class__ into scope
+159 |         builtins.super(ChildD2, self).f()
+    |                       ^^^^^^^^^^^^^^^
+160 |
+161 | class ChildD3(ParentD):
+    |
+help: Remove `super()` parameters
+156 | class ChildD2(ParentD):
+157 |     def f(self):
+158 |         if False: super # Python injects __class__ into scope
+    -         builtins.super(ChildD2, self).f()
+159 +         builtins.super().f()
+160 | 
+161 | class ChildD3(ParentD):
+162 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:163:23
+    |
+161 | class ChildD3(ParentD):
+162 |     def f(self):
+163 |         builtins.super(ChildD3, self).f()
+    |                       ^^^^^^^^^^^^^^^
+164 |         super # Python injects __class__ into scope
+    |
+help: Remove `super()` parameters
+160 | 
+161 | class ChildD3(ParentD):
+162 |     def f(self):
+    -         builtins.super(ChildD3, self).f()
+163 +         builtins.super().f()
+164 |         super # Python injects __class__ into scope
+165 | 
+166 | import builtins as builtins_alias
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:169:29
+    |
+167 | class ChildD4(ParentD):
+168 |     def f(self):
+169 |         builtins_alias.super(ChildD4, self).f()
+    |                             ^^^^^^^^^^^^^^^
+170 |         super # Python injects __class__ into scope
+    |
+help: Remove `super()` parameters
+166 | import builtins as builtins_alias
+167 | class ChildD4(ParentD):
+168 |     def f(self):
+    -         builtins_alias.super(ChildD4, self).f()
+169 +         builtins_alias.super().f()
+170 |         super # Python injects __class__ into scope
+171 | 
+172 | class ChildD5(ParentD):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:176:23
+    |
+174 |         super = 1
+175 |         super # Python injects __class__ into scope
+176 |         builtins.super(ChildD5, self).f()
+    |                       ^^^^^^^^^^^^^^^
+177 |
+178 | class ChildD6(ParentD):
+    |
+help: Remove `super()` parameters
+173 |     def f(self):
+174 |         super = 1
+175 |         super # Python injects __class__ into scope
+    -         builtins.super(ChildD5, self).f()
+176 +         builtins.super().f()
+177 | 
+178 | class ChildD6(ParentD):
+179 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:182:23
+    |
+180 |         super: "Any"
+181 |         __class__ # Python injects __class__ into scope
+182 |         builtins.super(ChildD6, self).f()
+    |                       ^^^^^^^^^^^^^^^
+183 |
+184 | class ChildD7(ParentD):
+    |
+help: Remove `super()` parameters
+179 |     def f(self):
+180 |         super: "Any"
+181 |         __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD6, self).f()
+182 +         builtins.super().f()
+183 | 
+184 | class ChildD7(ParentD):
+185 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:188:23
+    |
+186 |         def x():
+187 |             __class__ # Python injects __class__ into scope
+188 |         builtins.super(ChildD7, self).f()
+    |                       ^^^^^^^^^^^^^^^
+189 |
+190 | class ChildD8(ParentD):
+    |
+help: Remove `super()` parameters
+185 |     def f(self):
+186 |         def x():
+187 |             __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD7, self).f()
+188 +         builtins.super().f()
+189 | 
+190 | class ChildD8(ParentD):
+191 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:195:23
+    |
+193 |             super = 1
+194 |         super # Python injects __class__ into scope
+195 |         builtins.super(ChildD8, self).f()
+    |                       ^^^^^^^^^^^^^^^
+196 |
+197 | class ChildD9(ParentD):
+    |
+help: Remove `super()` parameters
+192 |         def x():
+193 |             super = 1
+194 |         super # Python injects __class__ into scope
+    -         builtins.super(ChildD8, self).f()
+195 +         builtins.super().f()
+196 | 
+197 | class ChildD9(ParentD):
+198 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:202:23
+    |
+200 |             __class__ = 1
+201 |         __class__ # Python injects __class__ into scope
+202 |         builtins.super(ChildD9, self).f()
+    |                       ^^^^^^^^^^^^^^^
+203 |
+204 | class ChildD10(ParentD):
+    |
+help: Remove `super()` parameters
+199 |         def x():
+200 |             __class__ = 1
+201 |         __class__ # Python injects __class__ into scope
+    -         builtins.super(ChildD9, self).f()
+202 +         builtins.super().f()
+203 | 
+204 | class ChildD10(ParentD):
+205 |     def f(self):
+
+UP008 [*] Use `super()` instead of `super(__class__, self)`
+   --> UP008.py:209:23
+    |
+207 |             __class__ = 1
+208 |         super # Python injects __class__ into scope
+209 |         builtins.super(ChildD10, self).f()
+    |                       ^^^^^^^^^^^^^^^^
+    |
+help: Remove `super()` parameters
+206 |         def x():
+207 |             __class__ = 1
+208 |         super # Python injects __class__ into scope
+    -         builtins.super(ChildD10, self).f()
+209 +         builtins.super().f()
+210 | 
+211 | 
+212 | # Must be ignored
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap
index d13be47734..67b831c505 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap
@@ -10,8 +10,6 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 3 | print("Hello world")
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1   |-# coding=utf8
-2 1 | 
-3 2 | print("Hello world")
+  - # coding=utf8
+1 | 
+2 | print("Hello world")
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap
index 518d66064e..e9fecded89 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap
@@ -11,9 +11,7 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 4 | print('Hello world')
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1 1 | #!/usr/bin/python
-2   |-# -*- coding: utf-8 -*-
-3 2 | 
-4 3 | print('Hello world')
+1 | #!/usr/bin/python
+  - # -*- coding: utf-8 -*-
+2 | 
+3 | print('Hello world')
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap
index 51aa5c1f21..e96f9db7fd 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap
@@ -9,9 +9,7 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 2 | print("Hello world")
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1   |- # coding=utf8
-2 1 | print("Hello world")
-3 2 | 
-4 3 | """
+  -  # coding=utf8
+1 | print("Hello world")
+2 | 
+3 | """
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap
index 172cef836e..b9f0146c9e 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap
@@ -9,9 +9,7 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 2 | print("Hello world")
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1   |-	# coding=utf8
-2 1 | print("Hello world")
-3 2 | 
-4 3 | """
+  - 	# coding=utf8
+1 | print("Hello world")
+2 | 
+3 | """
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap
index 62c3c09c76..69ad15e018 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap
@@ -10,8 +10,6 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 3 | # -*- coding: ascii -*-
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1   |-# -*- coding: utf8 -*-
-2 1 | print("the following is not a coding comment")
-3 2 | # -*- coding: ascii -*-
+  - # -*- coding: utf8 -*-
+1 | print("the following is not a coding comment")
+2 | # -*- coding: ascii -*-
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap
index cdf3e2b5b1..1345d78543 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap
@@ -9,7 +9,5 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 2 | # -*- coding: utf-8 -*-
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1 1 | # -*- coding: utf-8 -*-
-2   |-# -*- coding: utf-8 -*-
+1 | # -*- coding: utf-8 -*-
+  - # -*- coding: utf-8 -*-
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap
index 6cefa818a7..bd91f21128 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap
@@ -10,8 +10,6 @@ UP009 [*] UTF-8 encoding declaration is unnecessary
 3 | # -*- coding: ascii -*-
   |
 help: Remove unnecessary coding comment
-
-ℹ Safe fix
-1 1 | # -*- coding: utf-8 -*-
-2   |-# -*- coding: utf-8 -*-
-3 2 | # -*- coding: ascii -*-
+1 | # -*- coding: utf-8 -*-
+  - # -*- coding: utf-8 -*-
+2 | # -*- coding: ascii -*-
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap
index dc038f9c44..f173eda454 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap
@@ -10,12 +10,10 @@ UP010 [*] Unnecessary `__future__` imports `generators`, `nested_scopes` for tar
 3 | from __future__ import absolute_import, division
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1   |-from __future__ import nested_scopes, generators
-2 1 | from __future__ import with_statement, unicode_literals
-3 2 | from __future__ import absolute_import, division
-4 3 | from __future__ import generator_stop
+  - from __future__ import nested_scopes, generators
+1 | from __future__ import with_statement, unicode_literals
+2 | from __future__ import absolute_import, division
+3 | from __future__ import generator_stop
 
 UP010 [*] Unnecessary `__future__` imports `unicode_literals`, `with_statement` for target Python version
  --> UP010_0.py:2:1
@@ -27,13 +25,11 @@ UP010 [*] Unnecessary `__future__` imports `unicode_literals`, `with_statement`
 4 | from __future__ import generator_stop
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1 1 | from __future__ import nested_scopes, generators
-2   |-from __future__ import with_statement, unicode_literals
-3 2 | from __future__ import absolute_import, division
-4 3 | from __future__ import generator_stop
-5 4 | from __future__ import print_function, generator_stop
+1 | from __future__ import nested_scopes, generators
+  - from __future__ import with_statement, unicode_literals
+2 | from __future__ import absolute_import, division
+3 | from __future__ import generator_stop
+4 | from __future__ import print_function, generator_stop
 
 UP010 [*] Unnecessary `__future__` imports `absolute_import`, `division` for target Python version
  --> UP010_0.py:3:1
@@ -46,14 +42,12 @@ UP010 [*] Unnecessary `__future__` imports `absolute_import`, `division` for tar
 5 | from __future__ import print_function, generator_stop
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1 1 | from __future__ import nested_scopes, generators
-2 2 | from __future__ import with_statement, unicode_literals
-3   |-from __future__ import absolute_import, division
-4 3 | from __future__ import generator_stop
-5 4 | from __future__ import print_function, generator_stop
-6 5 | from __future__ import invalid_module, generators
+1 | from __future__ import nested_scopes, generators
+2 | from __future__ import with_statement, unicode_literals
+  - from __future__ import absolute_import, division
+3 | from __future__ import generator_stop
+4 | from __future__ import print_function, generator_stop
+5 | from __future__ import invalid_module, generators
 
 UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version
  --> UP010_0.py:4:1
@@ -66,15 +60,13 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver
 6 | from __future__ import invalid_module, generators
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1 1 | from __future__ import nested_scopes, generators
-2 2 | from __future__ import with_statement, unicode_literals
-3 3 | from __future__ import absolute_import, division
-4   |-from __future__ import generator_stop
-5 4 | from __future__ import print_function, generator_stop
-6 5 | from __future__ import invalid_module, generators
-7 6 | 
+1 | from __future__ import nested_scopes, generators
+2 | from __future__ import with_statement, unicode_literals
+3 | from __future__ import absolute_import, division
+  - from __future__ import generator_stop
+4 | from __future__ import print_function, generator_stop
+5 | from __future__ import invalid_module, generators
+6 | 
 
 UP010 [*] Unnecessary `__future__` imports `generator_stop`, `print_function` for target Python version
  --> UP010_0.py:5:1
@@ -86,15 +78,13 @@ UP010 [*] Unnecessary `__future__` imports `generator_stop`, `print_function` fo
 6 | from __future__ import invalid_module, generators
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-2 2 | from __future__ import with_statement, unicode_literals
-3 3 | from __future__ import absolute_import, division
-4 4 | from __future__ import generator_stop
-5   |-from __future__ import print_function, generator_stop
-6 5 | from __future__ import invalid_module, generators
-7 6 | 
-8 7 | if True:
+2 | from __future__ import with_statement, unicode_literals
+3 | from __future__ import absolute_import, division
+4 | from __future__ import generator_stop
+  - from __future__ import print_function, generator_stop
+5 | from __future__ import invalid_module, generators
+6 | 
+7 | if True:
 
 UP010 [*] Unnecessary `__future__` import `generators` for target Python version
  --> UP010_0.py:6:1
@@ -107,16 +97,14 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version
 8 | if True:
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-3 3 | from __future__ import absolute_import, division
-4 4 | from __future__ import generator_stop
-5 5 | from __future__ import print_function, generator_stop
-6   |-from __future__ import invalid_module, generators
-  6 |+from __future__ import invalid_module
-7 7 | 
-8 8 | if True:
-9 9 |     from __future__ import generator_stop
+3 | from __future__ import absolute_import, division
+4 | from __future__ import generator_stop
+5 | from __future__ import print_function, generator_stop
+  - from __future__ import invalid_module, generators
+6 + from __future__ import invalid_module
+7 | 
+8 | if True:
+9 |     from __future__ import generator_stop
 
 UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version
   --> UP010_0.py:9:5
@@ -127,15 +115,13 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver
 10 |     from __future__ import generators
    |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-6  6  | from __future__ import invalid_module, generators
-7  7  | 
-8  8  | if True:
-9     |-    from __future__ import generator_stop
-10 9  |     from __future__ import generators
-11 10 | 
-12 11 | if True:
+6  | from __future__ import invalid_module, generators
+7  | 
+8  | if True:
+   -     from __future__ import generator_stop
+9  |     from __future__ import generators
+10 | 
+11 | if True:
 
 UP010 [*] Unnecessary `__future__` import `generators` for target Python version
   --> UP010_0.py:10:5
@@ -148,15 +134,13 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version
 12 | if True:
    |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-7  7  | 
-8  8  | if True:
-9  9  |     from __future__ import generator_stop
-10    |-    from __future__ import generators
-11 10 | 
-12 11 | if True:
-13 12 |     from __future__ import generator_stop
+7  | 
+8  | if True:
+9  |     from __future__ import generator_stop
+   -     from __future__ import generators
+10 | 
+11 | if True:
+12 |     from __future__ import generator_stop
 
 UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version
   --> UP010_0.py:13:5
@@ -168,14 +152,12 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver
 15 |     from __future__ import generators  # comment
    |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-10 10 |     from __future__ import generators
-11 11 | 
-12 12 | if True:
-13    |-    from __future__ import generator_stop
-14 13 |     from __future__ import invalid_module, generators
-15 14 |     from __future__ import generators  # comment
+10 |     from __future__ import generators
+11 | 
+12 | if True:
+   -     from __future__ import generator_stop
+13 |     from __future__ import invalid_module, generators
+14 |     from __future__ import generators  # comment
 
 UP010 [*] Unnecessary `__future__` import `generators` for target Python version
   --> UP010_0.py:14:5
@@ -187,14 +169,12 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version
 15 |     from __future__ import generators  # comment
    |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-11 11 | 
-12 12 | if True:
-13 13 |     from __future__ import generator_stop
-14    |-    from __future__ import invalid_module, generators
-   14 |+    from __future__ import invalid_module
-15 15 |     from __future__ import generators  # comment
+11 | 
+12 | if True:
+13 |     from __future__ import generator_stop
+   -     from __future__ import invalid_module, generators
+14 +     from __future__ import invalid_module
+15 |     from __future__ import generators  # comment
 
 UP010 [*] Unnecessary `__future__` import `generators` for target Python version
   --> UP010_0.py:15:5
@@ -205,9 +185,8 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove unnecessary `__future__` import
-
-ℹ Unsafe fix
-12 12 | if True:
-13 13 |     from __future__ import generator_stop
-14 14 |     from __future__ import invalid_module, generators
-15    |-    from __future__ import generators  # comment
+12 | if True:
+13 |     from __future__ import generator_stop
+14 |     from __future__ import invalid_module, generators
+   -     from __future__ import generators  # comment
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap
index be0f0ce24d..9e032d2de9 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap
@@ -9,12 +9,10 @@ UP010 [*] Unnecessary `__future__` imports `generators`, `nested_scopes` for tar
 2 | from __future__ import with_statement, unicode_literals
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1   |-from __future__ import nested_scopes, generators
-2 1 | from __future__ import with_statement, unicode_literals
-3 2 | 
-4 3 | from __future__ import absolute_import, division
+  - from __future__ import nested_scopes, generators
+1 | from __future__ import with_statement, unicode_literals
+2 | 
+3 | from __future__ import absolute_import, division
 
 UP010 [*] Unnecessary `__future__` import `unicode_literals` for target Python version
  --> UP010_1.py:2:1
@@ -26,14 +24,12 @@ UP010 [*] Unnecessary `__future__` import `unicode_literals` for target Python v
 4 | from __future__ import absolute_import, division
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1 1 | from __future__ import nested_scopes, generators
-2   |-from __future__ import with_statement, unicode_literals
-  2 |+from __future__ import with_statement
-3 3 | 
-4 4 | from __future__ import absolute_import, division
-5 5 | from __future__ import generator_stop
+1 | from __future__ import nested_scopes, generators
+  - from __future__ import with_statement, unicode_literals
+2 + from __future__ import with_statement
+3 | 
+4 | from __future__ import absolute_import, division
+5 | from __future__ import generator_stop
 
 UP010 [*] Unnecessary `__future__` import `absolute_import` for target Python version
  --> UP010_1.py:4:1
@@ -46,16 +42,14 @@ UP010 [*] Unnecessary `__future__` import `absolute_import` for target Python ve
 6 | from __future__ import print_function, nested_scopes, generator_stop
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-1 1 | from __future__ import nested_scopes, generators
-2 2 | from __future__ import with_statement, unicode_literals
-3 3 | 
-4   |-from __future__ import absolute_import, division
-  4 |+from __future__ import division
-5 5 | from __future__ import generator_stop
-6 6 | from __future__ import print_function, nested_scopes, generator_stop
-7 7 | 
+1 | from __future__ import nested_scopes, generators
+2 | from __future__ import with_statement, unicode_literals
+3 | 
+  - from __future__ import absolute_import, division
+4 + from __future__ import division
+5 | from __future__ import generator_stop
+6 | from __future__ import print_function, nested_scopes, generator_stop
+7 | 
 
 UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version
  --> UP010_1.py:5:1
@@ -66,15 +60,13 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver
 6 | from __future__ import print_function, nested_scopes, generator_stop
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-2 2 | from __future__ import with_statement, unicode_literals
-3 3 | 
-4 4 | from __future__ import absolute_import, division
-5   |-from __future__ import generator_stop
-6 5 | from __future__ import print_function, nested_scopes, generator_stop
-7 6 | 
-8 7 | print(with_statement)
+2 | from __future__ import with_statement, unicode_literals
+3 | 
+4 | from __future__ import absolute_import, division
+  - from __future__ import generator_stop
+5 | from __future__ import print_function, nested_scopes, generator_stop
+6 | 
+7 | print(with_statement)
 
 UP010 [*] Unnecessary `__future__` import `nested_scopes` for target Python version
  --> UP010_1.py:6:1
@@ -87,13 +79,11 @@ UP010 [*] Unnecessary `__future__` import `nested_scopes` for target Python vers
 8 | print(with_statement)
   |
 help: Remove unnecessary `__future__` import
-
-ℹ Safe fix
-3 3 | 
-4 4 | from __future__ import absolute_import, division
-5 5 | from __future__ import generator_stop
-6   |-from __future__ import print_function, nested_scopes, generator_stop
-  6 |+from __future__ import print_function, generator_stop
-7 7 | 
-8 8 | print(with_statement)
-9 9 | generators = 1
+3 | 
+4 | from __future__ import absolute_import, division
+5 | from __future__ import generator_stop
+  - from __future__ import print_function, nested_scopes, generator_stop
+6 + from __future__ import print_function, generator_stop
+7 | 
+8 | print(with_statement)
+9 | generators = 1
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap
index fe85949af8..54294a3686 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap
@@ -10,16 +10,14 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache`
 7 |     pass
   |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-2 2 | from functools import lru_cache
-3 3 | 
-4 4 | 
-5   |-@functools.lru_cache()
-  5 |+@functools.lru_cache
-6 6 | def fixme():
-7 7 |     pass
-8 8 | 
+2 | from functools import lru_cache
+3 | 
+4 | 
+  - @functools.lru_cache()
+5 + @functools.lru_cache
+6 | def fixme():
+7 |     pass
+8 | 
 
 UP011 [*] Unnecessary parentheses to `functools.lru_cache`
   --> UP011.py:10:11
@@ -30,16 +28,14 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache`
 12 |     pass
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-7  7  |     pass
-8  8  | 
-9  9  | 
-10    |-@lru_cache()
-   10 |+@lru_cache
-11 11 | def fixme():
-12 12 |     pass
-13 13 | 
+7  |     pass
+8  | 
+9  | 
+   - @lru_cache()
+10 + @lru_cache
+11 | def fixme():
+12 |     pass
+13 | 
 
 UP011 [*] Unnecessary parentheses to `functools.lru_cache`
   --> UP011.py:16:21
@@ -51,16 +47,14 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache`
 18 |     pass
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-13 13 | 
-14 14 | 
-15 15 | @other_decorator
-16    |-@functools.lru_cache()
-   16 |+@functools.lru_cache
-17 17 | def fixme():
-18 18 |     pass
-19 19 | 
+13 | 
+14 | 
+15 | @other_decorator
+   - @functools.lru_cache()
+16 + @functools.lru_cache
+17 | def fixme():
+18 |     pass
+19 | 
 
 UP011 [*] Unnecessary parentheses to `functools.lru_cache`
   --> UP011.py:21:21
@@ -71,13 +65,11 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache`
 23 | def fixme():
    |
 help: Remove unnecessary parentheses
-
-ℹ Safe fix
-18 18 |     pass
-19 19 | 
-20 20 | 
-21    |-@functools.lru_cache()
-   21 |+@functools.lru_cache
-22 22 | @other_decorator
-23 23 | def fixme():
-24 24 |     pass
+18 |     pass
+19 | 
+20 | 
+   - @functools.lru_cache()
+21 + @functools.lru_cache
+22 | @other_decorator
+23 | def fixme():
+24 |     pass
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap
index cc02002e15..4bafedb9d1 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap
@@ -11,14 +11,12 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 4 | "foo".encode()  # b"foo"
   |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-1 1 | # ASCII literals should be replaced by a bytes literal
-2   |-"foo".encode("utf-8")  # b"foo"
-  2 |+b"foo"  # b"foo"
-3 3 | "foo".encode("u8")  # b"foo"
-4 4 | "foo".encode()  # b"foo"
-5 5 | "foo".encode("UTF8")  # b"foo"
+1 | # ASCII literals should be replaced by a bytes literal
+  - "foo".encode("utf-8")  # b"foo"
+2 + b"foo"  # b"foo"
+3 | "foo".encode("u8")  # b"foo"
+4 | "foo".encode()  # b"foo"
+5 | "foo".encode("UTF8")  # b"foo"
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
  --> UP012.py:3:1
@@ -31,15 +29,13 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 5 | "foo".encode("UTF8")  # b"foo"
   |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-1 1 | # ASCII literals should be replaced by a bytes literal
-2 2 | "foo".encode("utf-8")  # b"foo"
-3   |-"foo".encode("u8")  # b"foo"
-  3 |+b"foo"  # b"foo"
-4 4 | "foo".encode()  # b"foo"
-5 5 | "foo".encode("UTF8")  # b"foo"
-6 6 | U"foo".encode("utf-8")  # b"foo"
+1 | # ASCII literals should be replaced by a bytes literal
+2 | "foo".encode("utf-8")  # b"foo"
+  - "foo".encode("u8")  # b"foo"
+3 + b"foo"  # b"foo"
+4 | "foo".encode()  # b"foo"
+5 | "foo".encode("UTF8")  # b"foo"
+6 | U"foo".encode("utf-8")  # b"foo"
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
  --> UP012.py:4:1
@@ -52,16 +48,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 6 | U"foo".encode("utf-8")  # b"foo"
   |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-1 1 | # ASCII literals should be replaced by a bytes literal
-2 2 | "foo".encode("utf-8")  # b"foo"
-3 3 | "foo".encode("u8")  # b"foo"
-4   |-"foo".encode()  # b"foo"
-  4 |+b"foo"  # b"foo"
-5 5 | "foo".encode("UTF8")  # b"foo"
-6 6 | U"foo".encode("utf-8")  # b"foo"
-7 7 | "foo".encode(encoding="utf-8")  # b"foo"
+1 | # ASCII literals should be replaced by a bytes literal
+2 | "foo".encode("utf-8")  # b"foo"
+3 | "foo".encode("u8")  # b"foo"
+  - "foo".encode()  # b"foo"
+4 + b"foo"  # b"foo"
+5 | "foo".encode("UTF8")  # b"foo"
+6 | U"foo".encode("utf-8")  # b"foo"
+7 | "foo".encode(encoding="utf-8")  # b"foo"
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
  --> UP012.py:5:1
@@ -74,16 +68,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 7 | "foo".encode(encoding="utf-8")  # b"foo"
   |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-2 2 | "foo".encode("utf-8")  # b"foo"
-3 3 | "foo".encode("u8")  # b"foo"
-4 4 | "foo".encode()  # b"foo"
-5   |-"foo".encode("UTF8")  # b"foo"
-  5 |+b"foo"  # b"foo"
-6 6 | U"foo".encode("utf-8")  # b"foo"
-7 7 | "foo".encode(encoding="utf-8")  # b"foo"
-8 8 | """
+2 | "foo".encode("utf-8")  # b"foo"
+3 | "foo".encode("u8")  # b"foo"
+4 | "foo".encode()  # b"foo"
+  - "foo".encode("UTF8")  # b"foo"
+5 + b"foo"  # b"foo"
+6 | U"foo".encode("utf-8")  # b"foo"
+7 | "foo".encode(encoding="utf-8")  # b"foo"
+8 | """
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
  --> UP012.py:6:1
@@ -96,16 +88,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 8 | """
   |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-3 3 | "foo".encode("u8")  # b"foo"
-4 4 | "foo".encode()  # b"foo"
-5 5 | "foo".encode("UTF8")  # b"foo"
-6   |-U"foo".encode("utf-8")  # b"foo"
-  6 |+b"foo"  # b"foo"
-7 7 | "foo".encode(encoding="utf-8")  # b"foo"
-8 8 | """
-9 9 | Lorem
+3 | "foo".encode("u8")  # b"foo"
+4 | "foo".encode()  # b"foo"
+5 | "foo".encode("UTF8")  # b"foo"
+  - U"foo".encode("utf-8")  # b"foo"
+6 + b"foo"  # b"foo"
+7 | "foo".encode(encoding="utf-8")  # b"foo"
+8 | """
+9 | Lorem
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
  --> UP012.py:7:1
@@ -118,16 +108,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 9 | Lorem
   |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-4 4 | "foo".encode()  # b"foo"
-5 5 | "foo".encode("UTF8")  # b"foo"
-6 6 | U"foo".encode("utf-8")  # b"foo"
-7   |-"foo".encode(encoding="utf-8")  # b"foo"
-  7 |+b"foo"  # b"foo"
-8 8 | """
-9 9 | Lorem
-10 10 | 
+4  | "foo".encode()  # b"foo"
+5  | "foo".encode("UTF8")  # b"foo"
+6  | U"foo".encode("utf-8")  # b"foo"
+   - "foo".encode(encoding="utf-8")  # b"foo"
+7  + b"foo"  # b"foo"
+8  | """
+9  | Lorem
+10 | 
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:8:1
@@ -146,23 +134,21 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 16 |       "Lorem "
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-5  5  | "foo".encode("UTF8")  # b"foo"
-6  6  | U"foo".encode("utf-8")  # b"foo"
-7  7  | "foo".encode(encoding="utf-8")  # b"foo"
-8     |-"""
-   8  |+b"""
-9  9  | Lorem
-10 10 | 
-11 11 | Ipsum
-12    |-""".encode(
-13    |-    "utf-8"
-14    |-)
-   12 |+"""
-15 13 | (
-16 14 |     "Lorem "
-17 15 |     "Ipsum".encode()
+5  | "foo".encode("UTF8")  # b"foo"
+6  | U"foo".encode("utf-8")  # b"foo"
+7  | "foo".encode(encoding="utf-8")  # b"foo"
+   - """
+8  + b"""
+9  | Lorem
+10 | 
+11 | Ipsum
+   - """.encode(
+   -     "utf-8"
+   - )
+12 + """
+13 | (
+14 |     "Lorem "
+15 |     "Ipsum".encode()
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:16:5
@@ -176,18 +162,16 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 19 |   (
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-13 13 |     "utf-8"
-14 14 | )
-15 15 | (
-16    |-    "Lorem "
-17    |-    "Ipsum".encode()
-   16 |+    b"Lorem "
-   17 |+    b"Ipsum"
-18 18 | )
-19 19 | (
-20 20 |     "Lorem "  # Comment
+13 |     "utf-8"
+14 | )
+15 | (
+   -     "Lorem "
+   -     "Ipsum".encode()
+16 +     b"Lorem "
+17 +     b"Ipsum"
+18 | )
+19 | (
+20 |     "Lorem "  # Comment
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:20:5
@@ -201,18 +185,16 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 23 |   (
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-17 17 |     "Ipsum".encode()
-18 18 | )
-19 19 | (
-20    |-    "Lorem "  # Comment
-21    |-    "Ipsum".encode()  # Comment
-   20 |+    b"Lorem "  # Comment
-   21 |+    b"Ipsum"  # Comment
-22 22 | )
-23 23 | (
-24 24 |     "Lorem " "Ipsum".encode()
+17 |     "Ipsum".encode()
+18 | )
+19 | (
+   -     "Lorem "  # Comment
+   -     "Ipsum".encode()  # Comment
+20 +     b"Lorem "  # Comment
+21 +     b"Ipsum"  # Comment
+22 | )
+23 | (
+24 |     "Lorem " "Ipsum".encode()
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:24:5
@@ -224,16 +206,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 25 | )
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-21 21 |     "Ipsum".encode()  # Comment
-22 22 | )
-23 23 | (
-24    |-    "Lorem " "Ipsum".encode()
-   24 |+    b"Lorem " b"Ipsum"
-25 25 | )
-26 26 | 
-27 27 | # `encode` on variables should not be processed.
+21 |     "Ipsum".encode()  # Comment
+22 | )
+23 | (
+   -     "Lorem " "Ipsum".encode()
+24 +     b"Lorem " b"Ipsum"
+25 | )
+26 | 
+27 | # `encode` on variables should not be processed.
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:32:1
@@ -245,16 +225,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 34 | "foo".encode(encoding)
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-29 29 | string.encode("utf-8")
-30 30 | 
-31 31 | bar = "bar"
-32    |-f"foo{bar}".encode("utf-8")
-   32 |+f"foo{bar}".encode()
-33 33 | encoding = "latin"
-34 34 | "foo".encode(encoding)
-35 35 | f"foo{bar}".encode(encoding)
+29 | string.encode("utf-8")
+30 | 
+31 | bar = "bar"
+   - f"foo{bar}".encode("utf-8")
+32 + f"foo{bar}".encode()
+33 | encoding = "latin"
+34 | "foo".encode(encoding)
+35 | f"foo{bar}".encode(encoding)
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:36:1
@@ -269,18 +247,16 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 40 |   # `encode` with custom args and kwargs should not be processed.
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-33 33 | encoding = "latin"
-34 34 | "foo".encode(encoding)
-35 35 | f"foo{bar}".encode(encoding)
-36    |-f"{a=} {b=}".encode(
-37    |-    "utf-8",
-38    |-)
-   36 |+f"{a=} {b=}".encode()
-39 37 | 
-40 38 | # `encode` with custom args and kwargs should not be processed.
-41 39 | "foo".encode("utf-8", errors="replace")
+33 | encoding = "latin"
+34 | "foo".encode(encoding)
+35 | f"foo{bar}".encode(encoding)
+   - f"{a=} {b=}".encode(
+   -     "utf-8",
+   - )
+36 + f"{a=} {b=}".encode()
+37 | 
+38 | # `encode` with custom args and kwargs should not be processed.
+39 | "foo".encode("utf-8", errors="replace")
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:53:1
@@ -292,16 +268,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-50 50 | "unicode text©".encode(encoding="utf-8", errors="replace")
-51 51 | 
-52 52 | # Unicode literals should only be stripped of default encoding.
-53    |-"unicode text©".encode("utf-8")  # "unicode text©".encode()
-   53 |+"unicode text©".encode()  # "unicode text©".encode()
-54 54 | "unicode text©".encode()
-55 55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
-56 56 | 
+50 | "unicode text©".encode(encoding="utf-8", errors="replace")
+51 | 
+52 | # Unicode literals should only be stripped of default encoding.
+   - "unicode text©".encode("utf-8")  # "unicode text©".encode()
+53 + "unicode text©".encode()  # "unicode text©".encode()
+54 | "unicode text©".encode()
+55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
+56 | 
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:55:1
@@ -314,16 +288,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 57 | r"foo\o".encode("utf-8")  # br"foo\o"
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-52 52 | # Unicode literals should only be stripped of default encoding.
-53 53 | "unicode text©".encode("utf-8")  # "unicode text©".encode()
-54 54 | "unicode text©".encode()
-55    |-"unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
-   55 |+"unicode text©".encode()  # "unicode text©".encode()
-56 56 | 
-57 57 | r"foo\o".encode("utf-8")  # br"foo\o"
-58 58 | u"foo".encode("utf-8")  # b"foo"
+52 | # Unicode literals should only be stripped of default encoding.
+53 | "unicode text©".encode("utf-8")  # "unicode text©".encode()
+54 | "unicode text©".encode()
+   - "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
+55 + "unicode text©".encode()  # "unicode text©".encode()
+56 | 
+57 | r"foo\o".encode("utf-8")  # br"foo\o"
+58 | u"foo".encode("utf-8")  # b"foo"
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:57:1
@@ -336,16 +308,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 59 | R"foo\o".encode("utf-8")  # br"foo\o"
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-54 54 | "unicode text©".encode()
-55 55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
-56 56 | 
-57    |-r"foo\o".encode("utf-8")  # br"foo\o"
-   57 |+br"foo\o"  # br"foo\o"
-58 58 | u"foo".encode("utf-8")  # b"foo"
-59 59 | R"foo\o".encode("utf-8")  # br"foo\o"
-60 60 | U"foo".encode("utf-8")  # b"foo"
+54 | "unicode text©".encode()
+55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
+56 | 
+   - r"foo\o".encode("utf-8")  # br"foo\o"
+57 + br"foo\o"  # br"foo\o"
+58 | u"foo".encode("utf-8")  # b"foo"
+59 | R"foo\o".encode("utf-8")  # br"foo\o"
+60 | U"foo".encode("utf-8")  # b"foo"
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:58:1
@@ -357,16 +327,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 60 | U"foo".encode("utf-8")  # b"foo"
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-55 55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
-56 56 | 
-57 57 | r"foo\o".encode("utf-8")  # br"foo\o"
-58    |-u"foo".encode("utf-8")  # b"foo"
-   58 |+b"foo"  # b"foo"
-59 59 | R"foo\o".encode("utf-8")  # br"foo\o"
-60 60 | U"foo".encode("utf-8")  # b"foo"
-61 61 | print("foo".encode())  # print(b"foo")
+55 | "unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
+56 | 
+57 | r"foo\o".encode("utf-8")  # br"foo\o"
+   - u"foo".encode("utf-8")  # b"foo"
+58 + b"foo"  # b"foo"
+59 | R"foo\o".encode("utf-8")  # br"foo\o"
+60 | U"foo".encode("utf-8")  # b"foo"
+61 | print("foo".encode())  # print(b"foo")
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:59:1
@@ -379,16 +347,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 61 | print("foo".encode())  # print(b"foo")
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-56 56 | 
-57 57 | r"foo\o".encode("utf-8")  # br"foo\o"
-58 58 | u"foo".encode("utf-8")  # b"foo"
-59    |-R"foo\o".encode("utf-8")  # br"foo\o"
-   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 | 
+56 | 
+57 | r"foo\o".encode("utf-8")  # br"foo\o"
+58 | u"foo".encode("utf-8")  # b"foo"
+   - R"foo\o".encode("utf-8")  # br"foo\o"
+59 + bR"foo\o"  # br"foo\o"
+60 | U"foo".encode("utf-8")  # b"foo"
+61 | print("foo".encode())  # print(b"foo")
+62 | 
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:60:1
@@ -400,16 +366,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 61 | print("foo".encode())  # print(b"foo")
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-57 57 | r"foo\o".encode("utf-8")  # br"foo\o"
-58 58 | u"foo".encode("utf-8")  # b"foo"
-59 59 | R"foo\o".encode("utf-8")  # br"foo\o"
-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.
+57 | r"foo\o".encode("utf-8")  # br"foo\o"
+58 | u"foo".encode("utf-8")  # b"foo"
+59 | R"foo\o".encode("utf-8")  # br"foo\o"
+   - U"foo".encode("utf-8")  # b"foo"
+60 + b"foo"  # b"foo"
+61 | print("foo".encode())  # print(b"foo")
+62 | 
+63 | # `encode` on parenthesized strings.
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:61:7
@@ -422,16 +386,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 63 | # `encode` on parenthesized strings.
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-58 58 | u"foo".encode("utf-8")  # b"foo"
-59 59 | R"foo\o".encode("utf-8")  # br"foo\o"
-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 | (
+58 | u"foo".encode("utf-8")  # b"foo"
+59 | R"foo\o".encode("utf-8")  # br"foo\o"
+60 | U"foo".encode("utf-8")  # b"foo"
+   - print("foo".encode())  # print(b"foo")
+61 + print(b"foo")  # print(b"foo")
+62 | 
+63 | # `encode` on parenthesized strings.
+64 | (
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:64:1
@@ -446,20 +408,18 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 69 |   ((
    |
 help: Rewrite as bytes literal
-
-ℹ Safe 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"
+62 | 
+63 | # `encode` on parenthesized strings.
+64 | (
+   -     "abc"
+   -     "def"
+   - ).encode()
+65 +     b"abc"
+66 +     b"def"
+67 + )
+68 | 
+69 | ((
+70 |     "abc"
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:69:1
@@ -475,20 +435,18 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 74 |   (f"foo{bar}").encode("utf-8")
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-67 67 | ).encode()
-68 68 | 
-69 69 | ((
-70    |-    "abc"
-71    |-    "def"
-72    |-)).encode()
-   70 |+    b"abc"
-   71 |+    b"def"
-   72 |+))
-73 73 | 
-74 74 | (f"foo{bar}").encode("utf-8")
-75 75 | (f"foo{bar}").encode(encoding="utf-8")
+67 | ).encode()
+68 | 
+69 | ((
+   -     "abc"
+   -     "def"
+   - )).encode()
+70 +     b"abc"
+71 +     b"def"
+72 + ))
+73 | 
+74 | (f"foo{bar}").encode("utf-8")
+75 | (f"foo{bar}").encode(encoding="utf-8")
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:74:1
@@ -501,16 +459,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 76 | ("unicode text©").encode("utf-8")
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-71 71 |     "def"
-72 72 | )).encode()
-73 73 | 
-74    |-(f"foo{bar}").encode("utf-8")
-   74 |+(f"foo{bar}").encode()
-75 75 | (f"foo{bar}").encode(encoding="utf-8")
-76 76 | ("unicode text©").encode("utf-8")
-77 77 | ("unicode text©").encode(encoding="utf-8")
+71 |     "def"
+72 | )).encode()
+73 | 
+   - (f"foo{bar}").encode("utf-8")
+74 + (f"foo{bar}").encode()
+75 | (f"foo{bar}").encode(encoding="utf-8")
+76 | ("unicode text©").encode("utf-8")
+77 | ("unicode text©").encode(encoding="utf-8")
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:75:1
@@ -522,16 +478,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 77 | ("unicode text©").encode(encoding="utf-8")
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-72 72 | )).encode()
-73 73 | 
-74 74 | (f"foo{bar}").encode("utf-8")
-75    |-(f"foo{bar}").encode(encoding="utf-8")
-   75 |+(f"foo{bar}").encode()
-76 76 | ("unicode text©").encode("utf-8")
-77 77 | ("unicode text©").encode(encoding="utf-8")
-78 78 | 
+72 | )).encode()
+73 | 
+74 | (f"foo{bar}").encode("utf-8")
+   - (f"foo{bar}").encode(encoding="utf-8")
+75 + (f"foo{bar}").encode()
+76 | ("unicode text©").encode("utf-8")
+77 | ("unicode text©").encode(encoding="utf-8")
+78 | 
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:76:1
@@ -543,16 +497,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
 77 | ("unicode text©").encode(encoding="utf-8")
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-73 73 | 
-74 74 | (f"foo{bar}").encode("utf-8")
-75 75 | (f"foo{bar}").encode(encoding="utf-8")
-76    |-("unicode text©").encode("utf-8")
-   76 |+("unicode text©").encode()
-77 77 | ("unicode text©").encode(encoding="utf-8")
-78 78 | 
-79 79 | 
+73 | 
+74 | (f"foo{bar}").encode("utf-8")
+75 | (f"foo{bar}").encode(encoding="utf-8")
+   - ("unicode text©").encode("utf-8")
+76 + ("unicode text©").encode()
+77 | ("unicode text©").encode(encoding="utf-8")
+78 | 
+79 | 
 
 UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
   --> UP012.py:77:1
@@ -563,16 +515,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode`
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove unnecessary `encoding` argument
-
-ℹ Safe fix
-74 74 | (f"foo{bar}").encode("utf-8")
-75 75 | (f"foo{bar}").encode(encoding="utf-8")
-76 76 | ("unicode text©").encode("utf-8")
-77    |-("unicode text©").encode(encoding="utf-8")
-   77 |+("unicode text©").encode()
-78 78 | 
-79 79 | 
-80 80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882
+74 | (f"foo{bar}").encode("utf-8")
+75 | (f"foo{bar}").encode(encoding="utf-8")
+76 | ("unicode text©").encode("utf-8")
+   - ("unicode text©").encode(encoding="utf-8")
+77 + ("unicode text©").encode()
+78 | 
+79 | 
+80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:82:17
@@ -585,16 +535,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 84 | # Not a valid type annotation but this test shouldn't result in a panic.
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-79 79 | 
-80 80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882
-81 81 | def _match_ignore(line):
-82    |-	input=stdin and'\n'.encode()or None
-   82 |+	input=stdin and b'\n' or None
-83 83 | 
-84 84 | # Not a valid type annotation but this test shouldn't result in a panic.
-85 85 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+79 | 
+80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882
+81 | def _match_ignore(line):
+   - 	input=stdin and'\n'.encode()or None
+82 + 	input=stdin and b'\n' or None
+83 | 
+84 | # Not a valid type annotation but this test shouldn't result in a panic.
+85 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 
 UP012 [*] Unnecessary call to `encode` as UTF-8
   --> UP012.py:86:5
@@ -607,13 +555,11 @@ UP012 [*] Unnecessary call to `encode` as UTF-8
 88 | # AttributeError for t-strings so skip lint
    |
 help: Rewrite as bytes literal
-
-ℹ Safe fix
-83 83 | 
-84 84 | # Not a valid type annotation but this test shouldn't result in a panic.
-85 85 | # Refer: https://github.com/astral-sh/ruff/issues/11736
-86    |-x: '"foo".encode("utf-8")'
-   86 |+x: 'b"foo"'
-87 87 | 
-88 88 | # AttributeError for t-strings so skip lint
-89 89 | (t"foo{bar}").encode("utf-8")
+83 | 
+84 | # Not a valid type annotation but this test shouldn't result in a panic.
+85 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+   - x: '"foo".encode("utf-8")'
+86 + x: 'b"foo"'
+87 | 
+88 | # AttributeError for t-strings so skip lint
+89 | (t"foo{bar}").encode("utf-8")
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap
index ec78ba6e59..4ec45d3515 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap
@@ -11,18 +11,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 7 | # dict call
   |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-2 2 | import typing
-3 3 | 
-4 4 | # dict literal
-5   |-MyType = TypedDict("MyType", {"a": int, "b": str})
-  5 |+class MyType(TypedDict):
-  6 |+    a: int
-  7 |+    b: str
-6 8 | 
-7 9 | # dict call
-8 10 | MyType = TypedDict("MyType", dict(a=int, b=str))
+2  | import typing
+3  | 
+4  | # dict literal
+   - MyType = TypedDict("MyType", {"a": int, "b": str})
+5  + class MyType(TypedDict):
+6  +     a: int
+7  +     b: str
+8  | 
+9  | # dict call
+10 | MyType = TypedDict("MyType", dict(a=int, b=str))
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:8:1
@@ -34,18 +32,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 10 | # kwargs
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-5  5  | MyType = TypedDict("MyType", {"a": int, "b": str})
-6  6  | 
-7  7  | # dict call
-8     |-MyType = TypedDict("MyType", dict(a=int, b=str))
-   8  |+class MyType(TypedDict):
-   9  |+    a: int
-   10 |+    b: str
-9  11 | 
-10 12 | # kwargs
-11 13 | MyType = TypedDict("MyType", a=int, b=str)
+5  | MyType = TypedDict("MyType", {"a": int, "b": str})
+6  | 
+7  | # dict call
+   - MyType = TypedDict("MyType", dict(a=int, b=str))
+8  + class MyType(TypedDict):
+9  +     a: int
+10 +     b: str
+11 | 
+12 | # kwargs
+13 | MyType = TypedDict("MyType", a=int, b=str)
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:11:1
@@ -57,18 +53,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 13 | # Empty TypedDict
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-8  8  | MyType = TypedDict("MyType", dict(a=int, b=str))
-9  9  | 
-10 10 | # kwargs
-11    |-MyType = TypedDict("MyType", a=int, b=str)
-   11 |+class MyType(TypedDict):
-   12 |+    a: int
-   13 |+    b: str
-12 14 | 
-13 15 | # Empty TypedDict
-14 16 | MyType = TypedDict("MyType")
+8  | MyType = TypedDict("MyType", dict(a=int, b=str))
+9  | 
+10 | # kwargs
+   - MyType = TypedDict("MyType", a=int, b=str)
+11 + class MyType(TypedDict):
+12 +     a: int
+13 +     b: str
+14 | 
+15 | # Empty TypedDict
+16 | MyType = TypedDict("MyType")
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:14:1
@@ -80,17 +74,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 16 | # Literal values
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-11 11 | MyType = TypedDict("MyType", a=int, b=str)
-12 12 | 
-13 13 | # Empty TypedDict
-14    |-MyType = TypedDict("MyType")
-   14 |+class MyType(TypedDict):
-   15 |+    pass
-15 16 | 
-16 17 | # Literal values
-17 18 | MyType = TypedDict("MyType", {"a": "hello"})
+11 | MyType = TypedDict("MyType", a=int, b=str)
+12 | 
+13 | # Empty TypedDict
+   - MyType = TypedDict("MyType")
+14 + class MyType(TypedDict):
+15 +     pass
+16 | 
+17 | # Literal values
+18 | MyType = TypedDict("MyType", {"a": "hello"})
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:17:1
@@ -101,17 +93,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 18 | MyType = TypedDict("MyType", a="hello")
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-14 14 | MyType = TypedDict("MyType")
-15 15 | 
-16 16 | # Literal values
-17    |-MyType = TypedDict("MyType", {"a": "hello"})
-   17 |+class MyType(TypedDict):
-   18 |+    a: "hello"
-18 19 | MyType = TypedDict("MyType", a="hello")
-19 20 | 
-20 21 | # NotRequired
+14 | MyType = TypedDict("MyType")
+15 | 
+16 | # Literal values
+   - MyType = TypedDict("MyType", {"a": "hello"})
+17 + class MyType(TypedDict):
+18 +     a: "hello"
+19 | MyType = TypedDict("MyType", a="hello")
+20 | 
+21 | # NotRequired
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:18:1
@@ -124,17 +114,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 20 | # NotRequired
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-15 15 | 
-16 16 | # Literal values
-17 17 | MyType = TypedDict("MyType", {"a": "hello"})
-18    |-MyType = TypedDict("MyType", a="hello")
-   18 |+class MyType(TypedDict):
-   19 |+    a: "hello"
-19 20 | 
-20 21 | # NotRequired
-21 22 | MyType = TypedDict("MyType", {"a": NotRequired[dict]})
+15 | 
+16 | # Literal values
+17 | MyType = TypedDict("MyType", {"a": "hello"})
+   - MyType = TypedDict("MyType", a="hello")
+18 + class MyType(TypedDict):
+19 +     a: "hello"
+20 | 
+21 | # NotRequired
+22 | MyType = TypedDict("MyType", {"a": NotRequired[dict]})
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:21:1
@@ -146,17 +134,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 23 | # total
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-18 18 | MyType = TypedDict("MyType", a="hello")
-19 19 | 
-20 20 | # NotRequired
-21    |-MyType = TypedDict("MyType", {"a": NotRequired[dict]})
-   21 |+class MyType(TypedDict):
-   22 |+    a: NotRequired[dict]
-22 23 | 
-23 24 | # total
-24 25 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False)
+18 | MyType = TypedDict("MyType", a="hello")
+19 | 
+20 | # NotRequired
+   - MyType = TypedDict("MyType", {"a": NotRequired[dict]})
+21 + class MyType(TypedDict):
+22 +     a: NotRequired[dict]
+23 | 
+24 | # total
+25 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False)
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:24:1
@@ -168,18 +154,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 26 | # using Literal type
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-21 21 | MyType = TypedDict("MyType", {"a": NotRequired[dict]})
-22 22 | 
-23 23 | # total
-24    |-MyType = TypedDict("MyType", {"x": int, "y": int}, total=False)
-   24 |+class MyType(TypedDict, total=False):
-   25 |+    x: int
-   26 |+    y: int
-25 27 | 
-26 28 | # using Literal type
-27 29 | MyType = TypedDict("MyType", {"key": Literal["value"]})
+21 | MyType = TypedDict("MyType", {"a": NotRequired[dict]})
+22 | 
+23 | # total
+   - MyType = TypedDict("MyType", {"x": int, "y": int}, total=False)
+24 + class MyType(TypedDict, total=False):
+25 +     x: int
+26 +     y: int
+27 | 
+28 | # using Literal type
+29 | MyType = TypedDict("MyType", {"key": Literal["value"]})
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:27:1
@@ -191,17 +175,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 29 | # using namespace TypedDict
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-24 24 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False)
-25 25 | 
-26 26 | # using Literal type
-27    |-MyType = TypedDict("MyType", {"key": Literal["value"]})
-   27 |+class MyType(TypedDict):
-   28 |+    key: Literal["value"]
-28 29 | 
-29 30 | # using namespace TypedDict
-30 31 | MyType = typing.TypedDict("MyType", {"key": int})
+24 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False)
+25 | 
+26 | # using Literal type
+   - MyType = TypedDict("MyType", {"key": Literal["value"]})
+27 + class MyType(TypedDict):
+28 +     key: Literal["value"]
+29 | 
+30 | # using namespace TypedDict
+31 | MyType = typing.TypedDict("MyType", {"key": int})
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:30:1
@@ -213,17 +195,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 32 | # invalid identifiers (OK)
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-27 27 | MyType = TypedDict("MyType", {"key": Literal["value"]})
-28 28 | 
-29 29 | # using namespace TypedDict
-30    |-MyType = typing.TypedDict("MyType", {"key": int})
-   30 |+class MyType(typing.TypedDict):
-   31 |+    key: int
-31 32 | 
-32 33 | # invalid identifiers (OK)
-33 34 | MyType = TypedDict("MyType", {"in": int, "x-y": int})
+27 | MyType = TypedDict("MyType", {"key": Literal["value"]})
+28 | 
+29 | # using namespace TypedDict
+   - MyType = typing.TypedDict("MyType", {"key": int})
+30 + class MyType(typing.TypedDict):
+31 +     key: int
+32 | 
+33 | # invalid identifiers (OK)
+34 | MyType = TypedDict("MyType", {"in": int, "x-y": int})
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:40:1
@@ -235,17 +215,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 42 | # Empty dict call
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-37 37 | MyType = TypedDict("MyType", {"a": int, "b": str, **c})
-38 38 | 
-39 39 | # Empty dict literal
-40    |-MyType = TypedDict("MyType", {})
-   40 |+class MyType(TypedDict):
-   41 |+    pass
-41 42 | 
-42 43 | # Empty dict call
-43 44 | MyType = TypedDict("MyType", dict())
+37 | MyType = TypedDict("MyType", {"a": int, "b": str, **c})
+38 | 
+39 | # Empty dict literal
+   - MyType = TypedDict("MyType", {})
+40 + class MyType(TypedDict):
+41 +     pass
+42 | 
+43 | # Empty dict call
+44 | MyType = TypedDict("MyType", dict())
 
 UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
   --> UP013.py:43:1
@@ -257,17 +235,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax
 45 | # Unsafe fix if comments are present
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-40 40 | MyType = TypedDict("MyType", {})
-41 41 | 
-42 42 | # Empty dict call
-43    |-MyType = TypedDict("MyType", dict())
-   43 |+class MyType(TypedDict):
-   44 |+    pass
-44 45 | 
-45 46 | # Unsafe fix if comments are present
-46 47 | X = TypedDict("X", {
+40 | MyType = TypedDict("MyType", {})
+41 | 
+42 | # Empty dict call
+   - MyType = TypedDict("MyType", dict())
+43 + class MyType(TypedDict):
+44 +     pass
+45 | 
+46 | # Unsafe fix if comments are present
+47 | X = TypedDict("X", {
 
 UP013 [*] Convert `X` from `TypedDict` functional to class syntax
   --> UP013.py:46:1
@@ -281,16 +257,15 @@ UP013 [*] Convert `X` from `TypedDict` functional to class syntax
 50 |   # Private names should not be reported (OK)
    |
 help: Convert `X` to class syntax
-
-ℹ Unsafe fix
-43 43 | MyType = TypedDict("MyType", dict())
-44 44 | 
-45 45 | # Unsafe fix if comments are present
-46    |-X = TypedDict("X", {
-47    |-    "some_config": int,  # important
-48    |-})
-   46 |+class X(TypedDict):
-   47 |+    some_config: int
-49 48 | 
-50 49 | # Private names should not be reported (OK)
-51 50 | WithPrivate = TypedDict("WithPrivate", {"__x": int})
+43 | MyType = TypedDict("MyType", dict())
+44 | 
+45 | # Unsafe fix if comments are present
+   - X = TypedDict("X", {
+   -     "some_config": int,  # important
+   - })
+46 + class X(TypedDict):
+47 +     some_config: int
+48 | 
+49 | # Private names should not be reported (OK)
+50 | WithPrivate = TypedDict("WithPrivate", {"__x": int})
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap
index f55d203b2f..17450e8fb5 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap
@@ -11,18 +11,16 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
 7 | # with namespace
   |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-2 2 | import typing
-3 3 | 
-4 4 | # with complex annotations
-5   |-MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])])
-  5 |+class MyType(NamedTuple):
-  6 |+    a: int
-  7 |+    b: tuple[str, ...]
-6 8 | 
-7 9 | # with namespace
-8 10 | MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)])
+2  | import typing
+3  | 
+4  | # with complex annotations
+   - MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])])
+5  + class MyType(NamedTuple):
+6  +     a: int
+7  +     b: tuple[str, ...]
+8  | 
+9  | # with namespace
+10 | MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)])
 
 UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
   --> UP014.py:8:1
@@ -34,18 +32,16 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
 10 | # invalid identifiers (OK)
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-5  5  | MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])])
-6  6  | 
-7  7  | # with namespace
-8     |-MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)])
-   8  |+class MyType(typing.NamedTuple):
-   9  |+    a: int
-   10 |+    b: str
-9  11 | 
-10 12 | # invalid identifiers (OK)
-11 13 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])])
+5  | MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])])
+6  | 
+7  | # with namespace
+   - MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)])
+8  + class MyType(typing.NamedTuple):
+9  +     a: int
+10 +     b: str
+11 | 
+12 | # invalid identifiers (OK)
+13 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])])
 
 UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
   --> UP014.py:14:1
@@ -57,17 +53,15 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
 16 | # empty fields
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-11 11 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])])
-12 12 | 
-13 13 | # no fields
-14    |-MyType = typing.NamedTuple("MyType")
-   14 |+class MyType(typing.NamedTuple):
-   15 |+    pass
-15 16 | 
-16 17 | # empty fields
-17 18 | MyType = typing.NamedTuple("MyType", [])
+11 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])])
+12 | 
+13 | # no fields
+   - MyType = typing.NamedTuple("MyType")
+14 + class MyType(typing.NamedTuple):
+15 +     pass
+16 | 
+17 | # empty fields
+18 | MyType = typing.NamedTuple("MyType", [])
 
 UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
   --> UP014.py:17:1
@@ -79,17 +73,15 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
 19 | # keywords
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-14 14 | MyType = typing.NamedTuple("MyType")
-15 15 | 
-16 16 | # empty fields
-17    |-MyType = typing.NamedTuple("MyType", [])
-   17 |+class MyType(typing.NamedTuple):
-   18 |+    pass
-18 19 | 
-19 20 | # keywords
-20 21 | MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...])
+14 | MyType = typing.NamedTuple("MyType")
+15 | 
+16 | # empty fields
+   - MyType = typing.NamedTuple("MyType", [])
+17 + class MyType(typing.NamedTuple):
+18 +     pass
+19 | 
+20 | # keywords
+21 | MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...])
 
 UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
   --> UP014.py:20:1
@@ -101,18 +93,16 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax
 22 | # unfixable
    |
 help: Convert `MyType` to class syntax
-
-ℹ Safe fix
-17 17 | MyType = typing.NamedTuple("MyType", [])
-18 18 | 
-19 19 | # keywords
-20    |-MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...])
-   20 |+class MyType(typing.NamedTuple):
-   21 |+    a: int
-   22 |+    b: tuple[str, ...]
-21 23 | 
-22 24 | # unfixable
-23 25 | MyType = typing.NamedTuple("MyType", [("a", int)], [("b", str)])
+17 | MyType = typing.NamedTuple("MyType", [])
+18 | 
+19 | # keywords
+   - MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...])
+20 + class MyType(typing.NamedTuple):
+21 +     a: int
+22 +     b: tuple[str, ...]
+23 | 
+24 | # unfixable
+25 | MyType = typing.NamedTuple("MyType", [("a", int)], [("b", str)])
 
 UP014 [*] Convert `X` from `NamedTuple` functional to class syntax
   --> UP014.py:36:1
@@ -124,14 +114,13 @@ UP014 [*] Convert `X` from `NamedTuple` functional to class syntax
    | |__^
    |
 help: Convert `X` to class syntax
-
-ℹ Unsafe fix
-33 33 | )
-34 34 | 
-35 35 | # Unsafe fix if comments are present
-36    |-X = NamedTuple("X", [
-37    |-    ("some_config", int),  # important
-38    |-])
-   36 |+class X(NamedTuple):
-   37 |+    some_config: int
-39 38 |
+33 | )
+34 | 
+35 | # Unsafe fix if comments are present
+   - X = NamedTuple("X", [
+   -     ("some_config", int),  # important
+   - ])
+36 + class X(NamedTuple):
+37 +     some_config: int
+38 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap
index 022846fbca..3776b03cde 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap
@@ -10,13 +10,11 @@ UP015 [*] Unnecessary mode argument
 3 | open("foo", "Ub")
   |
 help: Remove mode argument
-
-ℹ Safe fix
-1   |-open("foo", "U")
-  1 |+open("foo")
-2 2 | open("foo", "Ur")
-3 3 | open("foo", "Ub")
-4 4 | open("foo", "rUb")
+  - open("foo", "U")
+1 + open("foo")
+2 | open("foo", "Ur")
+3 | open("foo", "Ub")
+4 | open("foo", "rUb")
 
 UP015 [*] Unnecessary mode argument
  --> UP015.py:2:13
@@ -28,14 +26,12 @@ UP015 [*] Unnecessary mode argument
 4 | open("foo", "rUb")
   |
 help: Remove mode argument
-
-ℹ Safe fix
-1 1 | open("foo", "U")
-2   |-open("foo", "Ur")
-  2 |+open("foo")
-3 3 | open("foo", "Ub")
-4 4 | open("foo", "rUb")
-5 5 | open("foo", "r")
+1 | open("foo", "U")
+  - open("foo", "Ur")
+2 + open("foo")
+3 | open("foo", "Ub")
+4 | open("foo", "rUb")
+5 | open("foo", "r")
 
 UP015 [*] Unnecessary modes, use `rb`
  --> UP015.py:3:13
@@ -48,15 +44,13 @@ UP015 [*] Unnecessary modes, use `rb`
 5 | open("foo", "r")
   |
 help: Replace with `rb`
-
-ℹ Safe fix
-1 1 | open("foo", "U")
-2 2 | open("foo", "Ur")
-3   |-open("foo", "Ub")
-  3 |+open("foo", "rb")
-4 4 | open("foo", "rUb")
-5 5 | open("foo", "r")
-6 6 | open("foo", "rt")
+1 | open("foo", "U")
+2 | open("foo", "Ur")
+  - open("foo", "Ub")
+3 + open("foo", "rb")
+4 | open("foo", "rUb")
+5 | open("foo", "r")
+6 | open("foo", "rt")
 
 UP015 [*] Unnecessary modes, use `rb`
  --> UP015.py:4:13
@@ -69,16 +63,14 @@ UP015 [*] Unnecessary modes, use `rb`
 6 | open("foo", "rt")
   |
 help: Replace with `rb`
-
-ℹ Safe fix
-1 1 | open("foo", "U")
-2 2 | open("foo", "Ur")
-3 3 | open("foo", "Ub")
-4   |-open("foo", "rUb")
-  4 |+open("foo", "rb")
-5 5 | open("foo", "r")
-6 6 | open("foo", "rt")
-7 7 | open("f", "r", encoding="UTF-8")
+1 | open("foo", "U")
+2 | open("foo", "Ur")
+3 | open("foo", "Ub")
+  - open("foo", "rUb")
+4 + open("foo", "rb")
+5 | open("foo", "r")
+6 | open("foo", "rt")
+7 | open("f", "r", encoding="UTF-8")
 
 UP015 [*] Unnecessary mode argument
  --> UP015.py:5:13
@@ -91,16 +83,14 @@ UP015 [*] Unnecessary mode argument
 7 | open("f", "r", encoding="UTF-8")
   |
 help: Remove mode argument
-
-ℹ Safe fix
-2 2 | open("foo", "Ur")
-3 3 | open("foo", "Ub")
-4 4 | open("foo", "rUb")
-5   |-open("foo", "r")
-  5 |+open("foo")
-6 6 | open("foo", "rt")
-7 7 | open("f", "r", encoding="UTF-8")
-8 8 | open("f", "wt")
+2 | open("foo", "Ur")
+3 | open("foo", "Ub")
+4 | open("foo", "rUb")
+  - open("foo", "r")
+5 + open("foo")
+6 | open("foo", "rt")
+7 | open("f", "r", encoding="UTF-8")
+8 | open("f", "wt")
 
 UP015 [*] Unnecessary mode argument
  --> UP015.py:6:13
@@ -113,16 +103,14 @@ UP015 [*] Unnecessary mode argument
 8 | open("f", "wt")
   |
 help: Remove mode argument
-
-ℹ Safe fix
-3 3 | open("foo", "Ub")
-4 4 | open("foo", "rUb")
-5 5 | open("foo", "r")
-6   |-open("foo", "rt")
-  6 |+open("foo")
-7 7 | open("f", "r", encoding="UTF-8")
-8 8 | open("f", "wt")
-9 9 | open("f", "tw")
+3 | open("foo", "Ub")
+4 | open("foo", "rUb")
+5 | open("foo", "r")
+  - open("foo", "rt")
+6 + open("foo")
+7 | open("f", "r", encoding="UTF-8")
+8 | open("f", "wt")
+9 | open("f", "tw")
 
 UP015 [*] Unnecessary mode argument
  --> UP015.py:7:11
@@ -135,16 +123,14 @@ UP015 [*] Unnecessary mode argument
 9 | open("f", "tw")
   |
 help: Remove mode argument
-
-ℹ Safe fix
-4 4 | open("foo", "rUb")
-5 5 | open("foo", "r")
-6 6 | open("foo", "rt")
-7   |-open("f", "r", encoding="UTF-8")
-  7 |+open("f", encoding="UTF-8")
-8 8 | open("f", "wt")
-9 9 | open("f", "tw")
-10 10 | 
+4  | open("foo", "rUb")
+5  | open("foo", "r")
+6  | open("foo", "rt")
+   - open("f", "r", encoding="UTF-8")
+7  + open("f", encoding="UTF-8")
+8  | open("f", "wt")
+9  | open("f", "tw")
+10 | 
 
 UP015 [*] Unnecessary modes, use `w`
  --> UP015.py:8:11
@@ -156,16 +142,14 @@ UP015 [*] Unnecessary modes, use `w`
 9 | open("f", "tw")
   |
 help: Replace with `w`
-
-ℹ Safe fix
-5 5 | open("foo", "r")
-6 6 | open("foo", "rt")
-7 7 | open("f", "r", encoding="UTF-8")
-8   |-open("f", "wt")
-  8 |+open("f", "w")
-9 9 | open("f", "tw")
-10 10 | 
-11 11 | with open("foo", "U") as f:
+5  | open("foo", "r")
+6  | open("foo", "rt")
+7  | open("f", "r", encoding="UTF-8")
+   - open("f", "wt")
+8  + open("f", "w")
+9  | open("f", "tw")
+10 | 
+11 | with open("foo", "U") as f:
 
 UP015 [*] Unnecessary modes, use `w`
   --> UP015.py:9:11
@@ -178,16 +162,14 @@ UP015 [*] Unnecessary modes, use `w`
 11 | with open("foo", "U") as f:
    |
 help: Replace with `w`
-
-ℹ Safe fix
-6  6  | open("foo", "rt")
-7  7  | open("f", "r", encoding="UTF-8")
-8  8  | open("f", "wt")
-9     |-open("f", "tw")
-   9  |+open("f", "w")
-10 10 | 
-11 11 | with open("foo", "U") as f:
-12 12 |     pass
+6  | open("foo", "rt")
+7  | open("f", "r", encoding="UTF-8")
+8  | open("f", "wt")
+   - open("f", "tw")
+9  + open("f", "w")
+10 | 
+11 | with open("foo", "U") as f:
+12 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:11:18
@@ -200,16 +182,14 @@ UP015 [*] Unnecessary mode argument
 13 | with open("foo", "Ur") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-8  8  | open("f", "wt")
-9  9  | open("f", "tw")
-10 10 | 
-11    |-with open("foo", "U") as f:
-   11 |+with open("foo") as f:
-12 12 |     pass
-13 13 | with open("foo", "Ur") as f:
-14 14 |     pass
+8  | open("f", "wt")
+9  | open("f", "tw")
+10 | 
+   - with open("foo", "U") as f:
+11 + with open("foo") as f:
+12 |     pass
+13 | with open("foo", "Ur") as f:
+14 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:13:18
@@ -222,16 +202,14 @@ UP015 [*] Unnecessary mode argument
 15 | with open("foo", "Ub") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-10 10 | 
-11 11 | with open("foo", "U") as f:
-12 12 |     pass
-13    |-with open("foo", "Ur") as f:
-   13 |+with open("foo") as f:
-14 14 |     pass
-15 15 | with open("foo", "Ub") as f:
-16 16 |     pass
+10 | 
+11 | with open("foo", "U") as f:
+12 |     pass
+   - with open("foo", "Ur") as f:
+13 + with open("foo") as f:
+14 |     pass
+15 | with open("foo", "Ub") as f:
+16 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:15:18
@@ -244,16 +222,14 @@ UP015 [*] Unnecessary modes, use `rb`
 17 | with open("foo", "rUb") as f:
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-12 12 |     pass
-13 13 | with open("foo", "Ur") as f:
-14 14 |     pass
-15    |-with open("foo", "Ub") as f:
-   15 |+with open("foo", "rb") as f:
-16 16 |     pass
-17 17 | with open("foo", "rUb") as f:
-18 18 |     pass
+12 |     pass
+13 | with open("foo", "Ur") as f:
+14 |     pass
+   - with open("foo", "Ub") as f:
+15 + with open("foo", "rb") as f:
+16 |     pass
+17 | with open("foo", "rUb") as f:
+18 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:17:18
@@ -266,16 +242,14 @@ UP015 [*] Unnecessary modes, use `rb`
 19 | with open("foo", "r") as f:
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-14 14 |     pass
-15 15 | with open("foo", "Ub") as f:
-16 16 |     pass
-17    |-with open("foo", "rUb") as f:
-   17 |+with open("foo", "rb") as f:
-18 18 |     pass
-19 19 | with open("foo", "r") as f:
-20 20 |     pass
+14 |     pass
+15 | with open("foo", "Ub") as f:
+16 |     pass
+   - with open("foo", "rUb") as f:
+17 + with open("foo", "rb") as f:
+18 |     pass
+19 | with open("foo", "r") as f:
+20 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:19:18
@@ -288,16 +262,14 @@ UP015 [*] Unnecessary mode argument
 21 | with open("foo", "rt") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-16 16 |     pass
-17 17 | with open("foo", "rUb") as f:
-18 18 |     pass
-19    |-with open("foo", "r") as f:
-   19 |+with open("foo") as f:
-20 20 |     pass
-21 21 | with open("foo", "rt") as f:
-22 22 |     pass
+16 |     pass
+17 | with open("foo", "rUb") as f:
+18 |     pass
+   - with open("foo", "r") as f:
+19 + with open("foo") as f:
+20 |     pass
+21 | with open("foo", "rt") as f:
+22 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:21:18
@@ -310,16 +282,14 @@ UP015 [*] Unnecessary mode argument
 23 | with open("foo", "r", encoding="UTF-8") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-18 18 |     pass
-19 19 | with open("foo", "r") as f:
-20 20 |     pass
-21    |-with open("foo", "rt") as f:
-   21 |+with open("foo") as f:
-22 22 |     pass
-23 23 | with open("foo", "r", encoding="UTF-8") as f:
-24 24 |     pass
+18 |     pass
+19 | with open("foo", "r") as f:
+20 |     pass
+   - with open("foo", "rt") as f:
+21 + with open("foo") as f:
+22 |     pass
+23 | with open("foo", "r", encoding="UTF-8") as f:
+24 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:23:18
@@ -332,16 +302,14 @@ UP015 [*] Unnecessary mode argument
 25 | with open("foo", "wt") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-20 20 |     pass
-21 21 | with open("foo", "rt") as f:
-22 22 |     pass
-23    |-with open("foo", "r", encoding="UTF-8") as f:
-   23 |+with open("foo", encoding="UTF-8") as f:
-24 24 |     pass
-25 25 | with open("foo", "wt") as f:
-26 26 |     pass
+20 |     pass
+21 | with open("foo", "rt") as f:
+22 |     pass
+   - with open("foo", "r", encoding="UTF-8") as f:
+23 + with open("foo", encoding="UTF-8") as f:
+24 |     pass
+25 | with open("foo", "wt") as f:
+26 |     pass
 
 UP015 [*] Unnecessary modes, use `w`
   --> UP015.py:25:18
@@ -353,16 +321,14 @@ UP015 [*] Unnecessary modes, use `w`
 26 |     pass
    |
 help: Replace with `w`
-
-ℹ Safe fix
-22 22 |     pass
-23 23 | with open("foo", "r", encoding="UTF-8") as f:
-24 24 |     pass
-25    |-with open("foo", "wt") as f:
-   25 |+with open("foo", "w") as f:
-26 26 |     pass
-27 27 | 
-28 28 | open(f("a", "b", "c"), "U")
+22 |     pass
+23 | with open("foo", "r", encoding="UTF-8") as f:
+24 |     pass
+   - with open("foo", "wt") as f:
+25 + with open("foo", "w") as f:
+26 |     pass
+27 | 
+28 | open(f("a", "b", "c"), "U")
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:28:24
@@ -374,16 +340,14 @@ UP015 [*] Unnecessary mode argument
 29 | open(f("a", "b", "c"), "Ub")
    |
 help: Remove mode argument
-
-ℹ Safe fix
-25 25 | with open("foo", "wt") as f:
-26 26 |     pass
-27 27 | 
-28    |-open(f("a", "b", "c"), "U")
-   28 |+open(f("a", "b", "c"))
-29 29 | open(f("a", "b", "c"), "Ub")
-30 30 | 
-31 31 | with open(f("a", "b", "c"), "U") as f:
+25 | with open("foo", "wt") as f:
+26 |     pass
+27 | 
+   - open(f("a", "b", "c"), "U")
+28 + open(f("a", "b", "c"))
+29 | open(f("a", "b", "c"), "Ub")
+30 | 
+31 | with open(f("a", "b", "c"), "U") as f:
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:29:24
@@ -395,16 +359,14 @@ UP015 [*] Unnecessary modes, use `rb`
 31 | with open(f("a", "b", "c"), "U") as f:
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-26 26 |     pass
-27 27 | 
-28 28 | open(f("a", "b", "c"), "U")
-29    |-open(f("a", "b", "c"), "Ub")
-   29 |+open(f("a", "b", "c"), "rb")
-30 30 | 
-31 31 | with open(f("a", "b", "c"), "U") as f:
-32 32 |     pass
+26 |     pass
+27 | 
+28 | open(f("a", "b", "c"), "U")
+   - open(f("a", "b", "c"), "Ub")
+29 + open(f("a", "b", "c"), "rb")
+30 | 
+31 | with open(f("a", "b", "c"), "U") as f:
+32 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:31:29
@@ -417,16 +379,14 @@ UP015 [*] Unnecessary mode argument
 33 | with open(f("a", "b", "c"), "Ub") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-28 28 | open(f("a", "b", "c"), "U")
-29 29 | open(f("a", "b", "c"), "Ub")
-30 30 | 
-31    |-with open(f("a", "b", "c"), "U") as f:
-   31 |+with open(f("a", "b", "c")) as f:
-32 32 |     pass
-33 33 | with open(f("a", "b", "c"), "Ub") as f:
-34 34 |     pass
+28 | open(f("a", "b", "c"), "U")
+29 | open(f("a", "b", "c"), "Ub")
+30 | 
+   - with open(f("a", "b", "c"), "U") as f:
+31 + with open(f("a", "b", "c")) as f:
+32 |     pass
+33 | with open(f("a", "b", "c"), "Ub") as f:
+34 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:33:29
@@ -438,16 +398,14 @@ UP015 [*] Unnecessary modes, use `rb`
 34 |     pass
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-30 30 | 
-31 31 | with open(f("a", "b", "c"), "U") as f:
-32 32 |     pass
-33    |-with open(f("a", "b", "c"), "Ub") as f:
-   33 |+with open(f("a", "b", "c"), "rb") as f:
-34 34 |     pass
-35 35 | 
-36 36 | with open("foo", "U") as fa, open("bar", "U") as fb:
+30 | 
+31 | with open(f("a", "b", "c"), "U") as f:
+32 |     pass
+   - with open(f("a", "b", "c"), "Ub") as f:
+33 + with open(f("a", "b", "c"), "rb") as f:
+34 |     pass
+35 | 
+36 | with open("foo", "U") as fa, open("bar", "U") as fb:
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:36:18
@@ -460,16 +418,14 @@ UP015 [*] Unnecessary mode argument
 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-33 33 | with open(f("a", "b", "c"), "Ub") as f:
-34 34 |     pass
-35 35 | 
-36    |-with open("foo", "U") as fa, open("bar", "U") as fb:
-   36 |+with open("foo") as fa, open("bar", "U") as fb:
-37 37 |     pass
-38 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
-39 39 |     pass
+33 | with open(f("a", "b", "c"), "Ub") as f:
+34 |     pass
+35 | 
+   - with open("foo", "U") as fa, open("bar", "U") as fb:
+36 + with open("foo") as fa, open("bar", "U") as fb:
+37 |     pass
+38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
+39 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:36:42
@@ -482,16 +438,14 @@ UP015 [*] Unnecessary mode argument
 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-33 33 | with open(f("a", "b", "c"), "Ub") as f:
-34 34 |     pass
-35 35 | 
-36    |-with open("foo", "U") as fa, open("bar", "U") as fb:
-   36 |+with open("foo", "U") as fa, open("bar") as fb:
-37 37 |     pass
-38 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
-39 39 |     pass
+33 | with open(f("a", "b", "c"), "Ub") as f:
+34 |     pass
+35 | 
+   - with open("foo", "U") as fa, open("bar", "U") as fb:
+36 + with open("foo", "U") as fa, open("bar") as fb:
+37 |     pass
+38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
+39 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:38:18
@@ -503,16 +457,14 @@ UP015 [*] Unnecessary modes, use `rb`
 39 |     pass
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-35 35 | 
-36 36 | with open("foo", "U") as fa, open("bar", "U") as fb:
-37 37 |     pass
-38    |-with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
-   38 |+with open("foo", "rb") as fa, open("bar", "Ub") as fb:
-39 39 |     pass
-40 40 | 
-41 41 | open("foo", mode="U")
+35 | 
+36 | with open("foo", "U") as fa, open("bar", "U") as fb:
+37 |     pass
+   - with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
+38 + with open("foo", "rb") as fa, open("bar", "Ub") as fb:
+39 |     pass
+40 | 
+41 | open("foo", mode="U")
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:38:43
@@ -524,16 +476,14 @@ UP015 [*] Unnecessary modes, use `rb`
 39 |     pass
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-35 35 | 
-36 36 | with open("foo", "U") as fa, open("bar", "U") as fb:
-37 37 |     pass
-38    |-with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
-   38 |+with open("foo", "Ub") as fa, open("bar", "rb") as fb:
-39 39 |     pass
-40 40 | 
-41 41 | open("foo", mode="U")
+35 | 
+36 | with open("foo", "U") as fa, open("bar", "U") as fb:
+37 |     pass
+   - with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
+38 + with open("foo", "Ub") as fa, open("bar", "rb") as fb:
+39 |     pass
+40 | 
+41 | open("foo", mode="U")
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:41:18
@@ -546,16 +496,14 @@ UP015 [*] Unnecessary mode argument
 43 | open(mode="U", name="foo")
    |
 help: Remove mode argument
-
-ℹ Safe fix
-38 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
-39 39 |     pass
-40 40 | 
-41    |-open("foo", mode="U")
-   41 |+open("foo")
-42 42 | open(name="foo", mode="U")
-43 43 | open(mode="U", name="foo")
-44 44 | 
+38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
+39 |     pass
+40 | 
+   - open("foo", mode="U")
+41 + open("foo")
+42 | open(name="foo", mode="U")
+43 | open(mode="U", name="foo")
+44 | 
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:42:23
@@ -566,16 +514,14 @@ UP015 [*] Unnecessary mode argument
 43 | open(mode="U", name="foo")
    |
 help: Remove mode argument
-
-ℹ Safe fix
-39 39 |     pass
-40 40 | 
-41 41 | open("foo", mode="U")
-42    |-open(name="foo", mode="U")
-   42 |+open(name="foo")
-43 43 | open(mode="U", name="foo")
-44 44 | 
-45 45 | with open("foo", mode="U") as f:
+39 |     pass
+40 | 
+41 | open("foo", mode="U")
+   - open(name="foo", mode="U")
+42 + open(name="foo")
+43 | open(mode="U", name="foo")
+44 | 
+45 | with open("foo", mode="U") as f:
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:43:11
@@ -588,16 +534,14 @@ UP015 [*] Unnecessary mode argument
 45 | with open("foo", mode="U") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-40 40 | 
-41 41 | open("foo", mode="U")
-42 42 | open(name="foo", mode="U")
-43    |-open(mode="U", name="foo")
-   43 |+open(name="foo")
-44 44 | 
-45 45 | with open("foo", mode="U") as f:
-46 46 |     pass
+40 | 
+41 | open("foo", mode="U")
+42 | open(name="foo", mode="U")
+   - open(mode="U", name="foo")
+43 + open(name="foo")
+44 | 
+45 | with open("foo", mode="U") as f:
+46 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:45:23
@@ -610,16 +554,14 @@ UP015 [*] Unnecessary mode argument
 47 | with open(name="foo", mode="U") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-42 42 | open(name="foo", mode="U")
-43 43 | open(mode="U", name="foo")
-44 44 | 
-45    |-with open("foo", mode="U") as f:
-   45 |+with open("foo") as f:
-46 46 |     pass
-47 47 | with open(name="foo", mode="U") as f:
-48 48 |     pass
+42 | open(name="foo", mode="U")
+43 | open(mode="U", name="foo")
+44 | 
+   - with open("foo", mode="U") as f:
+45 + with open("foo") as f:
+46 |     pass
+47 | with open(name="foo", mode="U") as f:
+48 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:47:28
@@ -632,16 +574,14 @@ UP015 [*] Unnecessary mode argument
 49 | with open(mode="U", name="foo") as f:
    |
 help: Remove mode argument
-
-ℹ Safe fix
-44 44 | 
-45 45 | with open("foo", mode="U") as f:
-46 46 |     pass
-47    |-with open(name="foo", mode="U") as f:
-   47 |+with open(name="foo") as f:
-48 48 |     pass
-49 49 | with open(mode="U", name="foo") as f:
-50 50 |     pass
+44 | 
+45 | with open("foo", mode="U") as f:
+46 |     pass
+   - with open(name="foo", mode="U") as f:
+47 + with open(name="foo") as f:
+48 |     pass
+49 | with open(mode="U", name="foo") as f:
+50 |     pass
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:49:16
@@ -653,16 +593,14 @@ UP015 [*] Unnecessary mode argument
 50 |     pass
    |
 help: Remove mode argument
-
-ℹ Safe fix
-46 46 |     pass
-47 47 | with open(name="foo", mode="U") as f:
-48 48 |     pass
-49    |-with open(mode="U", name="foo") as f:
-   49 |+with open(name="foo") as f:
-50 50 |     pass
-51 51 | 
-52 52 | open("foo", mode="Ub")
+46 |     pass
+47 | with open(name="foo", mode="U") as f:
+48 |     pass
+   - with open(mode="U", name="foo") as f:
+49 + with open(name="foo") as f:
+50 |     pass
+51 | 
+52 | open("foo", mode="Ub")
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:52:18
@@ -675,16 +613,14 @@ UP015 [*] Unnecessary modes, use `rb`
 54 | open(mode="Ub", name="foo")
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-49 49 | with open(mode="U", name="foo") as f:
-50 50 |     pass
-51 51 | 
-52    |-open("foo", mode="Ub")
-   52 |+open("foo", mode="rb")
-53 53 | open(name="foo", mode="Ub")
-54 54 | open(mode="Ub", name="foo")
-55 55 | 
+49 | with open(mode="U", name="foo") as f:
+50 |     pass
+51 | 
+   - open("foo", mode="Ub")
+52 + open("foo", mode="rb")
+53 | open(name="foo", mode="Ub")
+54 | open(mode="Ub", name="foo")
+55 | 
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:53:23
@@ -695,16 +631,14 @@ UP015 [*] Unnecessary modes, use `rb`
 54 | open(mode="Ub", name="foo")
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-50 50 |     pass
-51 51 | 
-52 52 | open("foo", mode="Ub")
-53    |-open(name="foo", mode="Ub")
-   53 |+open(name="foo", mode="rb")
-54 54 | open(mode="Ub", name="foo")
-55 55 | 
-56 56 | with open("foo", mode="Ub") as f:
+50 |     pass
+51 | 
+52 | open("foo", mode="Ub")
+   - open(name="foo", mode="Ub")
+53 + open(name="foo", mode="rb")
+54 | open(mode="Ub", name="foo")
+55 | 
+56 | with open("foo", mode="Ub") as f:
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:54:11
@@ -717,16 +651,14 @@ UP015 [*] Unnecessary modes, use `rb`
 56 | with open("foo", mode="Ub") as f:
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-51 51 | 
-52 52 | open("foo", mode="Ub")
-53 53 | open(name="foo", mode="Ub")
-54    |-open(mode="Ub", name="foo")
-   54 |+open(mode="rb", name="foo")
-55 55 | 
-56 56 | with open("foo", mode="Ub") as f:
-57 57 |     pass
+51 | 
+52 | open("foo", mode="Ub")
+53 | open(name="foo", mode="Ub")
+   - open(mode="Ub", name="foo")
+54 + open(mode="rb", name="foo")
+55 | 
+56 | with open("foo", mode="Ub") as f:
+57 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:56:23
@@ -739,16 +671,14 @@ UP015 [*] Unnecessary modes, use `rb`
 58 | with open(name="foo", mode="Ub") as f:
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-53 53 | open(name="foo", mode="Ub")
-54 54 | open(mode="Ub", name="foo")
-55 55 | 
-56    |-with open("foo", mode="Ub") as f:
-   56 |+with open("foo", mode="rb") as f:
-57 57 |     pass
-58 58 | with open(name="foo", mode="Ub") as f:
-59 59 |     pass
+53 | open(name="foo", mode="Ub")
+54 | open(mode="Ub", name="foo")
+55 | 
+   - with open("foo", mode="Ub") as f:
+56 + with open("foo", mode="rb") as f:
+57 |     pass
+58 | with open(name="foo", mode="Ub") as f:
+59 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:58:28
@@ -761,16 +691,14 @@ UP015 [*] Unnecessary modes, use `rb`
 60 | with open(mode="Ub", name="foo") as f:
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-55 55 | 
-56 56 | with open("foo", mode="Ub") as f:
-57 57 |     pass
-58    |-with open(name="foo", mode="Ub") as f:
-   58 |+with open(name="foo", mode="rb") as f:
-59 59 |     pass
-60 60 | with open(mode="Ub", name="foo") as f:
-61 61 |     pass
+55 | 
+56 | with open("foo", mode="Ub") as f:
+57 |     pass
+   - with open(name="foo", mode="Ub") as f:
+58 + with open(name="foo", mode="rb") as f:
+59 |     pass
+60 | with open(mode="Ub", name="foo") as f:
+61 |     pass
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:60:16
@@ -782,16 +710,14 @@ UP015 [*] Unnecessary modes, use `rb`
 61 |     pass
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-57 57 |     pass
-58 58 | with open(name="foo", mode="Ub") as f:
-59 59 |     pass
-60    |-with open(mode="Ub", name="foo") as f:
-   60 |+with open(mode="rb", name="foo") as f:
-61 61 |     pass
-62 62 | 
-63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+57 |     pass
+58 | with open(name="foo", mode="Ub") as f:
+59 |     pass
+   - with open(mode="Ub", name="foo") as f:
+60 + with open(mode="rb", name="foo") as f:
+61 |     pass
+62 | 
+63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:63:23
@@ -804,16 +730,14 @@ UP015 [*] Unnecessary mode argument
 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
    |
 help: Remove mode argument
-
-ℹ Safe fix
-60 60 | with open(mode="Ub", name="foo") as f:
-61 61 |     pass
-62 62 | 
-63    |-open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-   63 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-64 64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
-65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
-66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+60 | with open(mode="Ub", name="foo") as f:
+61 |     pass
+62 | 
+   - open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+63 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
+65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
+66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:64:106
@@ -825,16 +749,14 @@ UP015 [*] Unnecessary mode argument
 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
    |
 help: Remove mode argument
-
-ℹ Safe fix
-61 61 |     pass
-62 62 | 
-63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-64    |-open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
-   64 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
-66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-67 67 | 
+61 |     pass
+62 | 
+63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+   - open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
+64 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
+66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+67 | 
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:65:65
@@ -846,16 +768,14 @@ UP015 [*] Unnecessary mode argument
 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
    |
 help: Remove mode argument
-
-ℹ Safe fix
-62 62 | 
-63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-64 64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
-65    |-open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
-   65 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-67 67 | 
-68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+62 | 
+63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
+   - open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
+65 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+67 | 
+68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:66:11
@@ -868,16 +788,14 @@ UP015 [*] Unnecessary mode argument
 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
    |
 help: Remove mode argument
-
-ℹ Safe fix
-63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-64 64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
-65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
-66    |-open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-   66 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-67 67 | 
-68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
+63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
+65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
+   - open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+66 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+67 | 
+68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:68:23
@@ -890,16 +808,14 @@ UP015 [*] Unnecessary modes, use `rb`
 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
-66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-67 67 | 
-68    |-open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-   68 |+open(file="foo", mode="rb", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
-70 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
-71 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
+66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+67 | 
+   - open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+68 + open(file="foo", mode="rb", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
+70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
+71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:69:106
@@ -911,16 +827,14 @@ UP015 [*] Unnecessary modes, use `rb`
 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-67 67 | 
-68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-69    |-open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
-   69 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode="rb")
-70 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
-71 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-72 72 | 
+66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+67 | 
+68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+   - open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
+69 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode="rb")
+70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
+71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+72 | 
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:70:65
@@ -932,16 +846,14 @@ UP015 [*] Unnecessary modes, use `rb`
 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-67 67 | 
-68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
-70    |-open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
-   70 |+open(file="foo", buffering=-1, encoding=None, errors=None, mode="rb", newline=None, closefd=True, opener=None)
-71 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-72 72 | 
-73 73 | import aiofiles
+67 | 
+68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
+   - open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
+70 + open(file="foo", buffering=-1, encoding=None, errors=None, mode="rb", newline=None, closefd=True, opener=None)
+71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+72 | 
+73 | import aiofiles
 
 UP015 [*] Unnecessary modes, use `rb`
   --> UP015.py:71:11
@@ -954,16 +866,14 @@ UP015 [*] Unnecessary modes, use `rb`
 73 | import aiofiles
    |
 help: Replace with `rb`
-
-ℹ Safe fix
-68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
-70 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
-71    |-open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-   71 |+open(mode="rb", file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-72 72 | 
-73 73 | import aiofiles
-74 74 | 
+68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
+70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
+   - open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+71 + open(mode="rb", file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
+72 | 
+73 | import aiofiles
+74 | 
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:75:22
@@ -976,16 +886,14 @@ UP015 [*] Unnecessary mode argument
 77 | aiofiles.open("foo", mode="r")
    |
 help: Remove mode argument
-
-ℹ Safe fix
-72 72 | 
-73 73 | import aiofiles
-74 74 | 
-75    |-aiofiles.open("foo", "U")
-   75 |+aiofiles.open("foo")
-76 76 | aiofiles.open("foo", "r")
-77 77 | aiofiles.open("foo", mode="r")
-78 78 | 
+72 | 
+73 | import aiofiles
+74 | 
+   - aiofiles.open("foo", "U")
+75 + aiofiles.open("foo")
+76 | aiofiles.open("foo", "r")
+77 | aiofiles.open("foo", mode="r")
+78 | 
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:76:22
@@ -996,16 +904,14 @@ UP015 [*] Unnecessary mode argument
 77 | aiofiles.open("foo", mode="r")
    |
 help: Remove mode argument
-
-ℹ Safe fix
-73 73 | import aiofiles
-74 74 | 
-75 75 | aiofiles.open("foo", "U")
-76    |-aiofiles.open("foo", "r")
-   76 |+aiofiles.open("foo")
-77 77 | aiofiles.open("foo", mode="r")
-78 78 | 
-79 79 | open("foo", "r+")
+73 | import aiofiles
+74 | 
+75 | aiofiles.open("foo", "U")
+   - aiofiles.open("foo", "r")
+76 + aiofiles.open("foo")
+77 | aiofiles.open("foo", mode="r")
+78 | 
+79 | open("foo", "r+")
 
 UP015 [*] Unnecessary mode argument
   --> UP015.py:77:27
@@ -1018,13 +924,11 @@ UP015 [*] Unnecessary mode argument
 79 | open("foo", "r+")
    |
 help: Remove mode argument
-
-ℹ Safe fix
-74 74 | 
-75 75 | aiofiles.open("foo", "U")
-76 76 | aiofiles.open("foo", "r")
-77    |-aiofiles.open("foo", mode="r")
-   77 |+aiofiles.open("foo")
-78 78 | 
-79 79 | open("foo", "r+")
-80 80 | open("foo", "rb")
+74 | 
+75 | aiofiles.open("foo", "U")
+76 | aiofiles.open("foo", "r")
+   - aiofiles.open("foo", mode="r")
+77 + aiofiles.open("foo")
+78 | 
+79 | open("foo", "r+")
+80 | open("foo", "rb")
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap
index 27b02bad15..df526db240 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap
@@ -10,10 +10,8 @@ UP015 [*] Unnecessary mode argument
   |                 ^^^
   |
 help: Remove mode argument
-
-ℹ Safe fix
-1 1 | # Not a valid type annotation but this test shouldn't result in a panic.
-2 2 | # Refer: https://github.com/astral-sh/ruff/issues/11736
-3   |-x: 'open("foo", "r")'
-  3 |+x: 'open("foo")'
-4 4 |
+1 | # Not a valid type annotation but this test shouldn't result in a panic.
+2 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+  - x: 'open("foo", "r")'
+3 + x: 'open("foo")'
+4 |
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap
index e30ca3fdbf..05c508ea6f 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap
@@ -11,16 +11,14 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal)
 39 | str("""
    |
 help: Replace with string literal
-
-ℹ Safe fix
-34 34 | int().denominator
-35 35 | 
-36 36 | # These become literals
-37    |-str()
-   37 |+""
-38 38 | str("foo")
-39 39 | str("""
-40 40 | foo""")
+34 | int().denominator
+35 | 
+36 | # These become literals
+   - str()
+37 + ""
+38 | str("foo")
+39 | str("""
+40 | foo""")
 
 UP018 [*] Unnecessary `str` call (rewrite as a literal)
   --> UP018.py:38:1
@@ -33,16 +31,14 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal)
 40 | foo""")
    |
 help: Replace with string literal
-
-ℹ Safe fix
-35 35 | 
-36 36 | # These become literals
-37 37 | str()
-38    |-str("foo")
-   38 |+"foo"
-39 39 | str("""
-40 40 | foo""")
-41 41 | bytes()
+35 | 
+36 | # These become literals
+37 | str()
+   - str("foo")
+38 + "foo"
+39 | str("""
+40 | foo""")
+41 | bytes()
 
 UP018 [*] Unnecessary `str` call (rewrite as a literal)
   --> UP018.py:39:1
@@ -56,18 +52,16 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal)
 42 |   bytes(b"foo")
    |
 help: Replace with string literal
-
-ℹ Safe fix
-36 36 | # These become literals
-37 37 | str()
-38 38 | str("foo")
-39    |-str("""
-40    |-foo""")
-   39 |+"""
-   40 |+foo"""
-41 41 | bytes()
-42 42 | bytes(b"foo")
-43 43 | bytes(b"""
+36 | # These become literals
+37 | str()
+38 | str("foo")
+   - str("""
+   - foo""")
+39 + """
+40 + foo"""
+41 | bytes()
+42 | bytes(b"foo")
+43 | bytes(b"""
 
 UP018 [*] Unnecessary `bytes` call (rewrite as a literal)
   --> UP018.py:41:1
@@ -80,16 +74,14 @@ UP018 [*] Unnecessary `bytes` call (rewrite as a literal)
 43 | bytes(b"""
    |
 help: Replace with bytes literal
-
-ℹ Safe fix
-38 38 | str("foo")
-39 39 | str("""
-40 40 | foo""")
-41    |-bytes()
-   41 |+b""
-42 42 | bytes(b"foo")
-43 43 | bytes(b"""
-44 44 | foo""")
+38 | str("foo")
+39 | str("""
+40 | foo""")
+   - bytes()
+41 + b""
+42 | bytes(b"foo")
+43 | bytes(b"""
+44 | foo""")
 
 UP018 [*] Unnecessary `bytes` call (rewrite as a literal)
   --> UP018.py:42:1
@@ -102,16 +94,14 @@ UP018 [*] Unnecessary `bytes` call (rewrite as a literal)
 44 | foo""")
    |
 help: Replace with bytes literal
-
-ℹ Safe fix
-39 39 | str("""
-40 40 | foo""")
-41 41 | bytes()
-42    |-bytes(b"foo")
-   42 |+b"foo"
-43 43 | bytes(b"""
-44 44 | foo""")
-45 45 | f"{str()}"
+39 | str("""
+40 | foo""")
+41 | bytes()
+   - bytes(b"foo")
+42 + b"foo"
+43 | bytes(b"""
+44 | foo""")
+45 | f"{str()}"
 
 UP018 [*] Unnecessary `bytes` call (rewrite as a literal)
   --> UP018.py:43:1
@@ -125,18 +115,16 @@ UP018 [*] Unnecessary `bytes` call (rewrite as a literal)
 46 |   int()
    |
 help: Replace with bytes literal
-
-ℹ Safe fix
-40 40 | foo""")
-41 41 | bytes()
-42 42 | bytes(b"foo")
-43    |-bytes(b"""
-44    |-foo""")
-   43 |+b"""
-   44 |+foo"""
-45 45 | f"{str()}"
-46 46 | int()
-47 47 | int(1)
+40 | foo""")
+41 | bytes()
+42 | bytes(b"foo")
+   - bytes(b"""
+   - foo""")
+43 + b"""
+44 + foo"""
+45 | f"{str()}"
+46 | int()
+47 | int(1)
 
 UP018 [*] Unnecessary `str` call (rewrite as a literal)
   --> UP018.py:45:4
@@ -149,16 +137,14 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal)
 47 | int(1)
    |
 help: Replace with string literal
-
-ℹ Safe fix
-42 42 | bytes(b"foo")
-43 43 | bytes(b"""
-44 44 | foo""")
-45    |-f"{str()}"
-   45 |+f"{''}"
-46 46 | int()
-47 47 | int(1)
-48 48 | float()
+42 | bytes(b"foo")
+43 | bytes(b"""
+44 | foo""")
+   - f"{str()}"
+45 + f"{''}"
+46 | int()
+47 | int(1)
+48 | float()
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:46:1
@@ -171,16 +157,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 48 | float()
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-43 43 | bytes(b"""
-44 44 | foo""")
-45 45 | f"{str()}"
-46    |-int()
-   46 |+0
-47 47 | int(1)
-48 48 | float()
-49 49 | float(1.0)
+43 | bytes(b"""
+44 | foo""")
+45 | f"{str()}"
+   - int()
+46 + 0
+47 | int(1)
+48 | float()
+49 | float(1.0)
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:47:1
@@ -193,16 +177,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 49 | float(1.0)
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-44 44 | foo""")
-45 45 | f"{str()}"
-46 46 | int()
-47    |-int(1)
-   47 |+1
-48 48 | float()
-49 49 | float(1.0)
-50 50 | bool()
+44 | foo""")
+45 | f"{str()}"
+46 | int()
+   - int(1)
+47 + 1
+48 | float()
+49 | float(1.0)
+50 | bool()
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:48:1
@@ -215,16 +197,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
 50 | bool()
    |
 help: Replace with float literal
-
-ℹ Safe fix
-45 45 | f"{str()}"
-46 46 | int()
-47 47 | int(1)
-48    |-float()
-   48 |+0.0
-49 49 | float(1.0)
-50 50 | bool()
-51 51 | bool(True)
+45 | f"{str()}"
+46 | int()
+47 | int(1)
+   - float()
+48 + 0.0
+49 | float(1.0)
+50 | bool()
+51 | bool(True)
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:49:1
@@ -237,16 +217,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
 51 | bool(True)
    |
 help: Replace with float literal
-
-ℹ Safe fix
-46 46 | int()
-47 47 | int(1)
-48 48 | float()
-49    |-float(1.0)
-   49 |+1.0
-50 50 | bool()
-51 51 | bool(True)
-52 52 | bool(False)
+46 | int()
+47 | int(1)
+48 | float()
+   - float(1.0)
+49 + 1.0
+50 | bool()
+51 | bool(True)
+52 | bool(False)
 
 UP018 [*] Unnecessary `bool` call (rewrite as a literal)
   --> UP018.py:50:1
@@ -259,16 +237,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal)
 52 | bool(False)
    |
 help: Replace with boolean literal
-
-ℹ Safe fix
-47 47 | int(1)
-48 48 | float()
-49 49 | float(1.0)
-50    |-bool()
-   50 |+False
-51 51 | bool(True)
-52 52 | bool(False)
-53 53 | 
+47 | int(1)
+48 | float()
+49 | float(1.0)
+   - bool()
+50 + False
+51 | bool(True)
+52 | bool(False)
+53 | 
 
 UP018 [*] Unnecessary `bool` call (rewrite as a literal)
   --> UP018.py:51:1
@@ -280,16 +256,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal)
 52 | bool(False)
    |
 help: Replace with boolean literal
-
-ℹ Safe fix
-48 48 | float()
-49 49 | float(1.0)
-50 50 | bool()
-51    |-bool(True)
-   51 |+True
-52 52 | bool(False)
-53 53 | 
-54 54 | # These become a literal but retain parentheses
+48 | float()
+49 | float(1.0)
+50 | bool()
+   - bool(True)
+51 + True
+52 | bool(False)
+53 | 
+54 | # These become a literal but retain parentheses
 
 UP018 [*] Unnecessary `bool` call (rewrite as a literal)
   --> UP018.py:52:1
@@ -302,16 +276,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal)
 54 | # These become a literal but retain parentheses
    |
 help: Replace with boolean literal
-
-ℹ Safe fix
-49 49 | float(1.0)
-50 50 | bool()
-51 51 | bool(True)
-52    |-bool(False)
-   52 |+False
-53 53 | 
-54 54 | # These become a literal but retain parentheses
-55 55 | int(1).denominator
+49 | float(1.0)
+50 | bool()
+51 | bool(True)
+   - bool(False)
+52 + False
+53 | 
+54 | # These become a literal but retain parentheses
+55 | int(1).denominator
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:55:1
@@ -323,16 +295,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 57 | # These too are literals in spirit
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-52 52 | bool(False)
-53 53 | 
-54 54 | # These become a literal but retain parentheses
-55    |-int(1).denominator
-   55 |+(1).denominator
-56 56 | 
-57 57 | # These too are literals in spirit
-58 58 | int(+1)
+52 | bool(False)
+53 | 
+54 | # These become a literal but retain parentheses
+   - int(1).denominator
+55 + (1).denominator
+56 | 
+57 | # These too are literals in spirit
+58 | int(+1)
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:58:1
@@ -344,16 +314,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 60 | float(+1.0)
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-55 55 | int(1).denominator
-56 56 | 
-57 57 | # These too are literals in spirit
-58    |-int(+1)
-   58 |++1
-59 59 | int(-1)
-60 60 | float(+1.0)
-61 61 | float(-1.0)
+55 | int(1).denominator
+56 | 
+57 | # These too are literals in spirit
+   - int(+1)
+58 + +1
+59 | int(-1)
+60 | float(+1.0)
+61 | float(-1.0)
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:59:1
@@ -366,16 +334,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 61 | float(-1.0)
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-56 56 | 
-57 57 | # These too are literals in spirit
-58 58 | int(+1)
-59    |-int(-1)
-   59 |+-1
-60 60 | float(+1.0)
-61 61 | float(-1.0)
-62 62 | 
+56 | 
+57 | # These too are literals in spirit
+58 | int(+1)
+   - int(-1)
+59 + -1
+60 | float(+1.0)
+61 | float(-1.0)
+62 | 
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:60:1
@@ -387,16 +353,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
 61 | float(-1.0)
    |
 help: Replace with float literal
-
-ℹ Safe fix
-57 57 | # These too are literals in spirit
-58 58 | int(+1)
-59 59 | int(-1)
-60    |-float(+1.0)
-   60 |++1.0
-61 61 | float(-1.0)
-62 62 | 
-63 63 | 
+57 | # These too are literals in spirit
+58 | int(+1)
+59 | int(-1)
+   - float(+1.0)
+60 + +1.0
+61 | float(-1.0)
+62 | 
+63 | 
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:61:1
@@ -407,16 +371,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
    | ^^^^^^^^^^^
    |
 help: Replace with float literal
-
-ℹ Safe fix
-58 58 | int(+1)
-59 59 | int(-1)
-60 60 | float(+1.0)
-61    |-float(-1.0)
-   61 |+-1.0
-62 62 | 
-63 63 | 
-64 64 | # https://github.com/astral-sh/ruff/issues/15859
+58 | int(+1)
+59 | int(-1)
+60 | float(+1.0)
+   - float(-1.0)
+61 + -1.0
+62 | 
+63 | 
+64 | # https://github.com/astral-sh/ruff/issues/15859
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:65:1
@@ -427,16 +389,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 66 | 2 ** int(-1)                 # 2 ** -1
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-62 62 | 
-63 63 | 
-64 64 | # https://github.com/astral-sh/ruff/issues/15859
-65    |-int(-1) ** 0                 # (-1) ** 0
-   65 |+(-1) ** 0                 # (-1) ** 0
-66 66 | 2 ** int(-1)                 # 2 ** -1
-67 67 | 
-68 68 | int(-1)[0]                   # (-1)[0]
+62 | 
+63 | 
+64 | # https://github.com/astral-sh/ruff/issues/15859
+   - int(-1) ** 0                 # (-1) ** 0
+65 + (-1) ** 0                 # (-1) ** 0
+66 | 2 ** int(-1)                 # 2 ** -1
+67 | 
+68 | int(-1)[0]                   # (-1)[0]
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:66:6
@@ -449,16 +409,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 68 | int(-1)[0]                   # (-1)[0]
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-63 63 | 
-64 64 | # https://github.com/astral-sh/ruff/issues/15859
-65 65 | int(-1) ** 0                 # (-1) ** 0
-66    |-2 ** int(-1)                 # 2 ** -1
-   66 |+2 ** (-1)                 # 2 ** -1
-67 67 | 
-68 68 | int(-1)[0]                   # (-1)[0]
-69 69 | 2[int(-1)]                   # 2[-1]
+63 | 
+64 | # https://github.com/astral-sh/ruff/issues/15859
+65 | int(-1) ** 0                 # (-1) ** 0
+   - 2 ** int(-1)                 # 2 ** -1
+66 + 2 ** (-1)                 # 2 ** -1
+67 | 
+68 | int(-1)[0]                   # (-1)[0]
+69 | 2[int(-1)]                   # 2[-1]
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:68:1
@@ -470,16 +428,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 69 | 2[int(-1)]                   # 2[-1]
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-65 65 | int(-1) ** 0                 # (-1) ** 0
-66 66 | 2 ** int(-1)                 # 2 ** -1
-67 67 | 
-68    |-int(-1)[0]                   # (-1)[0]
-   68 |+(-1)[0]                   # (-1)[0]
-69 69 | 2[int(-1)]                   # 2[-1]
-70 70 | 
-71 71 | int(-1)(0)                   # (-1)(0)
+65 | int(-1) ** 0                 # (-1) ** 0
+66 | 2 ** int(-1)                 # 2 ** -1
+67 | 
+   - int(-1)[0]                   # (-1)[0]
+68 + (-1)[0]                   # (-1)[0]
+69 | 2[int(-1)]                   # 2[-1]
+70 | 
+71 | int(-1)(0)                   # (-1)(0)
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:69:3
@@ -491,16 +447,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 71 | int(-1)(0)                   # (-1)(0)
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-66 66 | 2 ** int(-1)                 # 2 ** -1
-67 67 | 
-68 68 | int(-1)[0]                   # (-1)[0]
-69    |-2[int(-1)]                   # 2[-1]
-   69 |+2[(-1)]                   # 2[-1]
-70 70 | 
-71 71 | int(-1)(0)                   # (-1)(0)
-72 72 | 2(int(-1))                   # 2(-1)
+66 | 2 ** int(-1)                 # 2 ** -1
+67 | 
+68 | int(-1)[0]                   # (-1)[0]
+   - 2[int(-1)]                   # 2[-1]
+69 + 2[(-1)]                   # 2[-1]
+70 | 
+71 | int(-1)(0)                   # (-1)(0)
+72 | 2(int(-1))                   # 2(-1)
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:71:1
@@ -512,16 +466,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 72 | 2(int(-1))                   # 2(-1)
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-68 68 | int(-1)[0]                   # (-1)[0]
-69 69 | 2[int(-1)]                   # 2[-1]
-70 70 | 
-71    |-int(-1)(0)                   # (-1)(0)
-   71 |+(-1)(0)                   # (-1)(0)
-72 72 | 2(int(-1))                   # 2(-1)
-73 73 | 
-74 74 | float(-1.0).foo              # (-1.0).foo
+68 | int(-1)[0]                   # (-1)[0]
+69 | 2[int(-1)]                   # 2[-1]
+70 | 
+   - int(-1)(0)                   # (-1)(0)
+71 + (-1)(0)                   # (-1)(0)
+72 | 2(int(-1))                   # 2(-1)
+73 | 
+74 | float(-1.0).foo              # (-1.0).foo
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:72:3
@@ -533,16 +485,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 74 | float(-1.0).foo              # (-1.0).foo
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-69 69 | 2[int(-1)]                   # 2[-1]
-70 70 | 
-71 71 | int(-1)(0)                   # (-1)(0)
-72    |-2(int(-1))                   # 2(-1)
-   72 |+2((-1))                   # 2(-1)
-73 73 | 
-74 74 | float(-1.0).foo              # (-1.0).foo
-75 75 | 
+69 | 2[int(-1)]                   # 2[-1]
+70 | 
+71 | int(-1)(0)                   # (-1)(0)
+   - 2(int(-1))                   # 2(-1)
+72 + 2((-1))                   # 2(-1)
+73 | 
+74 | float(-1.0).foo              # (-1.0).foo
+75 | 
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:74:1
@@ -555,16 +505,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
 76 | await int(-1)                # await (-1)
    |
 help: Replace with float literal
-
-ℹ Safe fix
-71 71 | int(-1)(0)                   # (-1)(0)
-72 72 | 2(int(-1))                   # 2(-1)
-73 73 | 
-74    |-float(-1.0).foo              # (-1.0).foo
-   74 |+(-1.0).foo              # (-1.0).foo
-75 75 | 
-76 76 | await int(-1)                # await (-1)
-77 77 | 
+71 | int(-1)(0)                   # (-1)(0)
+72 | 2(int(-1))                   # 2(-1)
+73 | 
+   - float(-1.0).foo              # (-1.0).foo
+74 + (-1.0).foo              # (-1.0).foo
+75 | 
+76 | await int(-1)                # await (-1)
+77 | 
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:76:7
@@ -575,16 +523,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
    |       ^^^^^^^
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-73 73 | 
-74 74 | float(-1.0).foo              # (-1.0).foo
-75 75 | 
-76    |-await int(-1)                # await (-1)
-   76 |+await (-1)                # await (-1)
-77 77 | 
-78 78 | 
-79 79 | int(+1) ** 0
+73 | 
+74 | float(-1.0).foo              # (-1.0).foo
+75 | 
+   - await int(-1)                # await (-1)
+76 + await (-1)                # await (-1)
+77 | 
+78 | 
+79 | int(+1) ** 0
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:79:1
@@ -594,16 +540,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 80 | float(+1.0)()
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-76 76 | await int(-1)                # await (-1)
-77 77 | 
-78 78 | 
-79    |-int(+1) ** 0
-   79 |+(+1) ** 0
-80 80 | float(+1.0)()
-81 81 | 
-82 82 | 
+76 | await int(-1)                # await (-1)
+77 | 
+78 | 
+   - int(+1) ** 0
+79 + (+1) ** 0
+80 | float(+1.0)()
+81 | 
+82 | 
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:80:1
@@ -613,16 +557,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
    | ^^^^^^^^^^^
    |
 help: Replace with float literal
-
-ℹ Safe fix
-77 77 | 
-78 78 | 
-79 79 | int(+1) ** 0
-80    |-float(+1.0)()
-   80 |+(+1.0)()
-81 81 | 
-82 82 | 
-83 83 | str(
+77 | 
+78 | 
+79 | int(+1) ** 0
+   - float(+1.0)()
+80 + (+1.0)()
+81 | 
+82 | 
+83 | str(
 
 UP018 [*] Unnecessary `str` call (rewrite as a literal)
   --> UP018.py:83:1
@@ -636,20 +578,19 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal)
 88 |   # https://github.com/astral-sh/ruff/issues/17606
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-80 80 | float(+1.0)()
-81 81 | 
-82 82 | 
-83    |-str(
-84    |-    '''Lorem
-85    |-    ipsum'''  # Comment
-86    |-).foo
-   83 |+'''Lorem
-   84 |+    ipsum'''.foo
-87 85 | 
-88 86 | # https://github.com/astral-sh/ruff/issues/17606
-89 87 | bool(True)and None
+80 | float(+1.0)()
+81 | 
+82 | 
+   - str(
+   -     '''Lorem
+   -     ipsum'''  # Comment
+   - ).foo
+83 + '''Lorem
+84 +     ipsum'''.foo
+85 | 
+86 | # https://github.com/astral-sh/ruff/issues/17606
+87 | bool(True)and None
+note: This is an unsafe fix and may change runtime behavior
 
 UP018 [*] Unnecessary `bool` call (rewrite as a literal)
   --> UP018.py:89:1
@@ -661,16 +602,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal)
 91 | float(1.)and None
    |
 help: Replace with boolean literal
-
-ℹ Safe fix
-86 86 | ).foo
-87 87 | 
-88 88 | # https://github.com/astral-sh/ruff/issues/17606
-89    |-bool(True)and None
-   89 |+True and None
-90 90 | int(1)and None
-91 91 | float(1.)and None
-92 92 | bool(True)and()
+86 | ).foo
+87 | 
+88 | # https://github.com/astral-sh/ruff/issues/17606
+   - bool(True)and None
+89 + True and None
+90 | int(1)and None
+91 | float(1.)and None
+92 | bool(True)and()
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
   --> UP018.py:90:1
@@ -683,16 +622,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 92 | bool(True)and()
    |
 help: Replace with integer literal
-
-ℹ Safe fix
-87 87 | 
-88 88 | # https://github.com/astral-sh/ruff/issues/17606
-89 89 | bool(True)and None
-90    |-int(1)and None
-   90 |+1 and None
-91 91 | float(1.)and None
-92 92 | bool(True)and()
-93 93 | 
+87 | 
+88 | # https://github.com/astral-sh/ruff/issues/17606
+89 | bool(True)and None
+   - int(1)and None
+90 + 1 and None
+91 | float(1.)and None
+92 | bool(True)and()
+93 | 
 
 UP018 [*] Unnecessary `float` call (rewrite as a literal)
   --> UP018.py:91:1
@@ -704,16 +641,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal)
 92 | bool(True)and()
    |
 help: Replace with float literal
-
-ℹ Safe fix
-88 88 | # https://github.com/astral-sh/ruff/issues/17606
-89 89 | bool(True)and None
-90 90 | int(1)and None
-91    |-float(1.)and None
-   91 |+1. and None
-92 92 | bool(True)and()
-93 93 | 
-94 94 | 
+88 | # https://github.com/astral-sh/ruff/issues/17606
+89 | bool(True)and None
+90 | int(1)and None
+   - float(1.)and None
+91 + 1. and None
+92 | bool(True)and()
+93 | 
+94 | 
 
 UP018 [*] Unnecessary `bool` call (rewrite as a literal)
   --> UP018.py:92:1
@@ -724,13 +659,11 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal)
    | ^^^^^^^^^^
    |
 help: Replace with boolean literal
-
-ℹ Safe fix
-89 89 | bool(True)and None
-90 90 | int(1)and None
-91 91 | float(1.)and None
-92    |-bool(True)and()
-   92 |+True and()
-93 93 | 
-94 94 | 
-95 95 | # t-strings are not native literals
+89 | bool(True)and None
+90 | int(1)and None
+91 | float(1.)and None
+   - bool(True)and()
+92 + True and()
+93 | 
+94 | 
+95 | # t-strings are not native literals
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap
index b5e11a0c87..6ac6e53b92 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap
@@ -12,9 +12,7 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 5 |       1)
   |
 help: Replace with integer literal
-
-ℹ Safe fix
-1 1 | # Keep parenthesis around preserved CR
2   |-int(-
  2 |+(-
3 3 |     1)
4 4 | int(+
5 5 |     1)
+1 | # Keep parenthesis around preserved CR
  - int(-
2 + (-
3 |     1)
4 | int(+
5 |     1)
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
  --> UP018_CR.py:4:1
@@ -26,6 +24,4 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
   | |______^
   |
 help: Replace with integer literal
-
-ℹ Safe fix
-1 1 | # Keep parenthesis around preserved CR
2 2 | int(-
3 3 |     1)
4   |-int(+
  4 |+(+
5 5 |     1)
+1 | # Keep parenthesis around preserved CR
2 | int(-
3 |     1)
  - int(+
4 + (+
5 |     1)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap
index 243b5efaa7..2a6bd9c894 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap
@@ -13,15 +13,13 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
 6 |   int(+
   |
 help: Replace with integer literal
-
-ℹ Safe fix
-1 1 | # Keep parentheses around preserved \n 
-2 2 | 
-3   |-int(-
-  3 |+(-
-4 4 |     1)
-5 5 | 
-6 6 | int(+
+1 | # Keep parentheses around preserved \n 
+2 | 
+  - int(-
+3 + (-
+4 |     1)
+5 | 
+6 | int(+
 
 UP018 [*] Unnecessary `int` call (rewrite as a literal)
  --> UP018_LF.py:6:1
@@ -33,11 +31,9 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal)
   | |______^
   |
 help: Replace with integer literal
-
-ℹ Safe fix
-3 3 | int(-
-4 4 |     1)
-5 5 | 
-6   |-int(+
-  6 |+(+
-7 7 |     1)
+3 | int(-
+4 |     1)
+5 | 
+  - int(+
+6 + (+
+7 |     1)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap
index 39152672a8..279648f87a 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap
@@ -9,16 +9,14 @@ UP019 [*] `typing.Text` is deprecated, use `str`
 8 |     print(word)
   |
 help: Replace with `str`
-
-ℹ Safe fix
-4 4 | from typing import Text as Goodbye
-5 5 | 
-6 6 | 
-7   |-def print_word(word: Text) -> None:
-  7 |+def print_word(word: str) -> None:
-8 8 |     print(word)
-9 9 | 
-10 10 | 
+4  | from typing import Text as Goodbye
+5  | 
+6  | 
+   - def print_word(word: Text) -> None:
+7  + def print_word(word: str) -> None:
+8  |     print(word)
+9  | 
+10 | 
 
 UP019 [*] `typing.Text` is deprecated, use `str`
   --> UP019.py:11:29
@@ -28,16 +26,14 @@ UP019 [*] `typing.Text` is deprecated, use `str`
 12 |     print(word)
    |
 help: Replace with `str`
-
-ℹ Safe fix
-8  8  |     print(word)
-9  9  | 
-10 10 | 
-11    |-def print_second_word(word: typing.Text) -> None:
-   11 |+def print_second_word(word: str) -> None:
-12 12 |     print(word)
-13 13 | 
-14 14 | 
+8  |     print(word)
+9  | 
+10 | 
+   - def print_second_word(word: typing.Text) -> None:
+11 + def print_second_word(word: str) -> None:
+12 |     print(word)
+13 | 
+14 | 
 
 UP019 [*] `typing.Text` is deprecated, use `str`
   --> UP019.py:15:28
@@ -47,16 +43,14 @@ UP019 [*] `typing.Text` is deprecated, use `str`
 16 |     print(word)
    |
 help: Replace with `str`
-
-ℹ Safe fix
-12 12 |     print(word)
-13 13 | 
-14 14 | 
-15    |-def print_third_word(word: Hello.Text) -> None:
-   15 |+def print_third_word(word: str) -> None:
-16 16 |     print(word)
-17 17 | 
-18 18 | 
+12 |     print(word)
+13 | 
+14 | 
+   - def print_third_word(word: Hello.Text) -> None:
+15 + def print_third_word(word: str) -> None:
+16 |     print(word)
+17 | 
+18 | 
 
 UP019 [*] `typing.Text` is deprecated, use `str`
   --> UP019.py:19:29
@@ -66,11 +60,11 @@ UP019 [*] `typing.Text` is deprecated, use `str`
 20 |     print(word)
    |
 help: Replace with `str`
-
-ℹ Safe fix
-16 16 |     print(word)
-17 17 | 
-18 18 | 
-19    |-def print_fourth_word(word: Goodbye) -> None:
-   19 |+def print_fourth_word(word: str) -> None:
-20 20 |     print(word)
+16 |     print(word)
+17 | 
+18 | 
+   - def print_fourth_word(word: Goodbye) -> None:
+19 + def print_fourth_word(word: str) -> None:
+20 |     print(word)
+21 |     
+22 |
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py__preview.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py__preview.snap
new file mode 100644
index 0000000000..89b257ccc2
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py__preview.snap
@@ -0,0 +1,119 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+UP019 [*] `typing.Text` is deprecated, use `str`
+ --> UP019.py:7:22
+  |
+7 | def print_word(word: Text) -> None:
+  |                      ^^^^
+8 |     print(word)
+  |
+help: Replace with `str`
+4  | from typing import Text as Goodbye
+5  | 
+6  | 
+   - def print_word(word: Text) -> None:
+7  + def print_word(word: str) -> None:
+8  |     print(word)
+9  | 
+10 | 
+
+UP019 [*] `typing.Text` is deprecated, use `str`
+  --> UP019.py:11:29
+   |
+11 | def print_second_word(word: typing.Text) -> None:
+   |                             ^^^^^^^^^^^
+12 |     print(word)
+   |
+help: Replace with `str`
+8  |     print(word)
+9  | 
+10 | 
+   - def print_second_word(word: typing.Text) -> None:
+11 + def print_second_word(word: str) -> None:
+12 |     print(word)
+13 | 
+14 | 
+
+UP019 [*] `typing.Text` is deprecated, use `str`
+  --> UP019.py:15:28
+   |
+15 | def print_third_word(word: Hello.Text) -> None:
+   |                            ^^^^^^^^^^
+16 |     print(word)
+   |
+help: Replace with `str`
+12 |     print(word)
+13 | 
+14 | 
+   - def print_third_word(word: Hello.Text) -> None:
+15 + def print_third_word(word: str) -> None:
+16 |     print(word)
+17 | 
+18 | 
+
+UP019 [*] `typing.Text` is deprecated, use `str`
+  --> UP019.py:19:29
+   |
+19 | def print_fourth_word(word: Goodbye) -> None:
+   |                             ^^^^^^^
+20 |     print(word)
+   |
+help: Replace with `str`
+16 |     print(word)
+17 | 
+18 | 
+   - def print_fourth_word(word: Goodbye) -> None:
+19 + def print_fourth_word(word: str) -> None:
+20 |     print(word)
+21 |     
+22 | 
+
+UP019 [*] `typing_extensions.Text` is deprecated, use `str`
+  --> UP019.py:28:28
+   |
+28 | def print_fifth_word(word: typing_extensions.Text) -> None:
+   |                            ^^^^^^^^^^^^^^^^^^^^^^
+29 |     print(word)
+   |
+help: Replace with `str`
+25 | from typing_extensions import Text as TextAlias
+26 | 
+27 | 
+   - def print_fifth_word(word: typing_extensions.Text) -> None:
+28 + def print_fifth_word(word: str) -> None:
+29 |     print(word)
+30 | 
+31 | 
+
+UP019 [*] `typing_extensions.Text` is deprecated, use `str`
+  --> UP019.py:32:28
+   |
+32 | def print_sixth_word(word: TypingExt.Text) -> None:
+   |                            ^^^^^^^^^^^^^^
+33 |     print(word)
+   |
+help: Replace with `str`
+29 |     print(word)
+30 | 
+31 | 
+   - def print_sixth_word(word: TypingExt.Text) -> None:
+32 + def print_sixth_word(word: str) -> None:
+33 |     print(word)
+34 | 
+35 | 
+
+UP019 [*] `typing_extensions.Text` is deprecated, use `str`
+  --> UP019.py:36:30
+   |
+36 | def print_seventh_word(word: TextAlias) -> None:
+   |                              ^^^^^^^^^
+37 |     print(word)
+   |
+help: Replace with `str`
+33 |     print(word)
+34 | 
+35 | 
+   - def print_seventh_word(word: TextAlias) -> None:
+36 + def print_seventh_word(word: str) -> None:
+37 |     print(word)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap
index 6fe9612829..0d816f52ac 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap
@@ -11,15 +11,13 @@ UP020 [*] Use builtin `open`
 4 |     print(f.read())
   |
 help: Replace with builtin `open`
-
-ℹ Safe fix
-1 1 | import io
-2 2 | 
-3   |-with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f:
-  3 |+with open("f.txt", mode="r", buffering=-1, **kwargs) as f:
-4 4 |     print(f.read())
-5 5 | 
-6 6 | from io import open
+1 | import io
+2 | 
+  - with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f:
+3 + with open("f.txt", mode="r", buffering=-1, **kwargs) as f:
+4 |     print(f.read())
+5 | 
+6 | from io import open
 
 UP020 [*] Use builtin `open`
  --> UP020.py:8:6
@@ -31,13 +29,11 @@ UP020 [*] Use builtin `open`
 9 |     print(f.read())
   |
 help: Replace with builtin `open`
-
-ℹ Safe fix
-4  4  |     print(f.read())
-5  5  | 
-6  6  | from io import open
-   7  |+import builtins
-7  8  | 
-8     |-with open("f.txt") as f:
-   9  |+with builtins.open("f.txt") as f:
-9  10 |     print(f.read())
+4  |     print(f.read())
+5  | 
+6  | from io import open
+7  + import builtins
+8  | 
+   - with open("f.txt") as f:
+9  + with builtins.open("f.txt") as f:
+10 |     print(f.read())
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap
index 967b409372..bc5091ab9c 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap
@@ -11,16 +11,14 @@ UP021 [*] `universal_newlines` is deprecated, use `text`
 7 | run(["foo"], universal_newlines=True, check=False)
   |
 help: Replace with `text` keyword argument
-
-ℹ Safe fix
-2 2 | from subprocess import run
-3 3 | 
-4 4 | # Errors
-5   |-subprocess.run(["foo"], universal_newlines=True, check=True)
-  5 |+subprocess.run(["foo"], text=True, check=True)
-6 6 | subprocess.run(["foo"], universal_newlines=True, text=True)
-7 7 | run(["foo"], universal_newlines=True, check=False)
-8 8 | 
+2 | from subprocess import run
+3 | 
+4 | # Errors
+  - subprocess.run(["foo"], universal_newlines=True, check=True)
+5 + subprocess.run(["foo"], text=True, check=True)
+6 | subprocess.run(["foo"], universal_newlines=True, text=True)
+7 | run(["foo"], universal_newlines=True, check=False)
+8 | 
 
 UP021 [*] `universal_newlines` is deprecated, use `text`
  --> UP021.py:6:25
@@ -32,16 +30,14 @@ UP021 [*] `universal_newlines` is deprecated, use `text`
 7 | run(["foo"], universal_newlines=True, check=False)
   |
 help: Replace with `text` keyword argument
-
-ℹ Safe fix
-3 3 | 
-4 4 | # Errors
-5 5 | subprocess.run(["foo"], universal_newlines=True, check=True)
-6   |-subprocess.run(["foo"], universal_newlines=True, text=True)
-  6 |+subprocess.run(["foo"], text=True)
-7 7 | run(["foo"], universal_newlines=True, check=False)
-8 8 | 
-9 9 | # OK
+3 | 
+4 | # Errors
+5 | subprocess.run(["foo"], universal_newlines=True, check=True)
+  - subprocess.run(["foo"], universal_newlines=True, text=True)
+6 + subprocess.run(["foo"], text=True)
+7 | run(["foo"], universal_newlines=True, check=False)
+8 | 
+9 | # OK
 
 UP021 [*] `universal_newlines` is deprecated, use `text`
  --> UP021.py:7:14
@@ -54,13 +50,11 @@ UP021 [*] `universal_newlines` is deprecated, use `text`
 9 | # OK
   |
 help: Replace with `text` keyword argument
-
-ℹ Safe fix
-4 4 | # Errors
-5 5 | subprocess.run(["foo"], universal_newlines=True, check=True)
-6 6 | subprocess.run(["foo"], universal_newlines=True, text=True)
-7   |-run(["foo"], universal_newlines=True, check=False)
-  7 |+run(["foo"], text=True, check=False)
-8 8 | 
-9 9 | # OK
-10 10 | subprocess.run(["foo"], check=True)
+4  | # Errors
+5  | subprocess.run(["foo"], universal_newlines=True, check=True)
+6  | subprocess.run(["foo"], universal_newlines=True, text=True)
+   - run(["foo"], universal_newlines=True, check=False)
+7  + run(["foo"], text=True, check=False)
+8  | 
+9  | # OK
+10 | subprocess.run(["foo"], check=True)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap
index 79582dbaee..60b3a958af 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap
@@ -12,16 +12,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-1 1 | from subprocess import run
-2 2 | import subprocess
-3 3 | 
-4   |-output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  4 |+output = run(["foo"], capture_output=True)
-5 5 | 
-6 6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-7 7 | 
+1 | from subprocess import run
+2 | import subprocess
+3 | 
+  - output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+4 + output = run(["foo"], capture_output=True)
+5 | 
+6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
  --> UP022.py:6:10
@@ -34,16 +33,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
   |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-5 5 | 
-6   |-output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  6 |+output = subprocess.run(["foo"], capture_output=True)
-7 7 | 
-8 8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
-9 9 | 
+3 | 
+4 | output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+5 | 
+  - output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+6 + output = subprocess.run(["foo"], capture_output=True)
+7 | 
+8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
   --> UP022.py:8:10
@@ -56,16 +54,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 10 | output = subprocess.run(
    |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-7 7 | 
-8   |-output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
-  8 |+output = subprocess.run(capture_output=True, args=["foo"])
-9 9 | 
-10 10 | output = subprocess.run(
-11 11 |     ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE
+5  | 
+6  | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+7  | 
+   - output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
+8  + output = subprocess.run(capture_output=True, args=["foo"])
+9  | 
+10 | output = subprocess.run(
+11 |     ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
   --> UP022.py:10:10
@@ -81,16 +78,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 14 |   output = subprocess.run(
    |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-8  8  | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
-9  9  | 
-10 10 | output = subprocess.run(
-11    |-    ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE
-   11 |+    ["foo"], capture_output=True, check=True
-12 12 | )
-13 13 | 
-14 14 | output = subprocess.run(
+8  | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
+9  | 
+10 | output = subprocess.run(
+   -     ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE
+11 +     ["foo"], capture_output=True, check=True
+12 | )
+13 | 
+14 | output = subprocess.run(
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
   --> UP022.py:14:10
@@ -106,16 +102,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 18 |   output = subprocess.run(
    |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-12 12 | )
-13 13 | 
-14 14 | output = subprocess.run(
-15    |-    ["foo"], stderr=subprocess.PIPE, check=True, stdout=subprocess.PIPE
-   15 |+    ["foo"], capture_output=True, check=True
-16 16 | )
-17 17 | 
-18 18 | output = subprocess.run(
+12 | )
+13 | 
+14 | output = subprocess.run(
+   -     ["foo"], stderr=subprocess.PIPE, check=True, stdout=subprocess.PIPE
+15 +     ["foo"], capture_output=True, check=True
+16 | )
+17 | 
+18 | output = subprocess.run(
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
   --> UP022.py:18:10
@@ -137,18 +132,17 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 28 |   if output:
    |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | output = subprocess.run(
-19 19 |     ["foo"],
-20    |-    stdout=subprocess.PIPE,
-   20 |+    capture_output=True,
-21 21 |     check=True,
-22    |-    stderr=subprocess.PIPE,
-23 22 |     text=True,
-24 23 |     encoding="utf-8",
-25 24 |     close_fds=True,
+17 | 
+18 | output = subprocess.run(
+19 |     ["foo"],
+   -     stdout=subprocess.PIPE,
+20 +     capture_output=True,
+21 |     check=True,
+   -     stderr=subprocess.PIPE,
+22 |     text=True,
+23 |     encoding="utf-8",
+24 |     close_fds=True,
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
   --> UP022.py:29:14
@@ -168,18 +162,17 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
 38 |   output = subprocess.run(
    |
 help: Replace with `capture_output` keyword argument
-
-ℹ Unsafe fix
-28 28 | if output:
-29 29 |     output = subprocess.run(
-30 30 |         ["foo"],
-31    |-        stdout=subprocess.PIPE,
-   31 |+        capture_output=True,
-32 32 |         check=True,
-33    |-        stderr=subprocess.PIPE,
-34 33 |         text=True,
-35 34 |         encoding="utf-8",
-36 35 |     )
+28 | if output:
+29 |     output = subprocess.run(
+30 |         ["foo"],
+   -         stdout=subprocess.PIPE,
+31 +         capture_output=True,
+32 |         check=True,
+   -         stderr=subprocess.PIPE,
+33 |         text=True,
+34 |         encoding="utf-8",
+35 |     )
+note: This is an unsafe fix and may change runtime behavior
 
 UP022 Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
   --> UP022.py:38:10
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap
index 5052273855..9ab8fd6492 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap
@@ -10,14 +10,12 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 3 | import xml.etree.cElementTree as ET
   |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-1 1 | # These two imports have something after cElementTree, so they should be fixed.
-2   |-from xml.etree.cElementTree import XML, Element, SubElement
-  2 |+from xml.etree.ElementTree import XML, Element, SubElement
-3 3 | import xml.etree.cElementTree as ET
-4 4 | 
-5 5 | # Weird spacing should not cause issues.
+1 | # These two imports have something after cElementTree, so they should be fixed.
+  - from xml.etree.cElementTree import XML, Element, SubElement
+2 + from xml.etree.ElementTree import XML, Element, SubElement
+3 | import xml.etree.cElementTree as ET
+4 | 
+5 | # Weird spacing should not cause issues.
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
  --> UP023.py:3:8
@@ -30,15 +28,13 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 5 | # Weird spacing should not cause issues.
   |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-1 1 | # These two imports have something after cElementTree, so they should be fixed.
-2 2 | from xml.etree.cElementTree import XML, Element, SubElement
-3   |-import xml.etree.cElementTree as ET
-  3 |+import xml.etree.ElementTree as ET
-4 4 | 
-5 5 | # Weird spacing should not cause issues.
-6 6 | from   xml.etree.cElementTree    import  XML
+1 | # These two imports have something after cElementTree, so they should be fixed.
+2 | from xml.etree.cElementTree import XML, Element, SubElement
+  - import xml.etree.cElementTree as ET
+3 + import xml.etree.ElementTree as ET
+4 | 
+5 | # Weird spacing should not cause issues.
+6 | from   xml.etree.cElementTree    import  XML
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
  --> UP023.py:6:1
@@ -49,16 +45,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 7 | import    xml.etree.cElementTree       as      ET
   |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-3 3 | import xml.etree.cElementTree as ET
-4 4 | 
-5 5 | # Weird spacing should not cause issues.
-6   |-from   xml.etree.cElementTree    import  XML
-  6 |+from   xml.etree.ElementTree    import  XML
-7 7 | import    xml.etree.cElementTree       as      ET
-8 8 | 
-9 9 | # Multi line imports should also work fine.
+3 | import xml.etree.cElementTree as ET
+4 | 
+5 | # Weird spacing should not cause issues.
+  - from   xml.etree.cElementTree    import  XML
+6 + from   xml.etree.ElementTree    import  XML
+7 | import    xml.etree.cElementTree       as      ET
+8 | 
+9 | # Multi line imports should also work fine.
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
  --> UP023.py:7:11
@@ -71,16 +65,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 9 | # Multi line imports should also work fine.
   |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Weird spacing should not cause issues.
-6 6 | from   xml.etree.cElementTree    import  XML
-7   |-import    xml.etree.cElementTree       as      ET
-  7 |+import    xml.etree.ElementTree       as      ET
-8 8 | 
-9 9 | # Multi line imports should also work fine.
-10 10 | from xml.etree.cElementTree import (
+4  | 
+5  | # Weird spacing should not cause issues.
+6  | from   xml.etree.cElementTree    import  XML
+   - import    xml.etree.cElementTree       as      ET
+7  + import    xml.etree.ElementTree       as      ET
+8  | 
+9  | # Multi line imports should also work fine.
+10 | from xml.etree.cElementTree import (
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
   --> UP023.py:10:1
@@ -96,16 +88,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 16 |       import xml.etree.cElementTree as ET
    |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-7  7  | import    xml.etree.cElementTree       as      ET
-8  8  | 
-9  9  | # Multi line imports should also work fine.
-10    |-from xml.etree.cElementTree import (
-   10 |+from xml.etree.ElementTree import (
-11 11 |     XML,
-12 12 |     Element,
-13 13 |     SubElement,
+7  | import    xml.etree.cElementTree       as      ET
+8  | 
+9  | # Multi line imports should also work fine.
+   - from xml.etree.cElementTree import (
+10 + from xml.etree.ElementTree import (
+11 |     XML,
+12 |     Element,
+13 |     SubElement,
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
   --> UP023.py:16:12
@@ -117,16 +107,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 17 |     from xml.etree import cElementTree as CET
    |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-13 13 |     SubElement,
-14 14 | )
-15 15 | if True:
-16    |-    import xml.etree.cElementTree as ET
-   16 |+    import xml.etree.ElementTree as ET
-17 17 |     from xml.etree import cElementTree as CET
-18 18 | 
-19 19 | from xml.etree import cElementTree as ET
+13 |     SubElement,
+14 | )
+15 | if True:
+   -     import xml.etree.cElementTree as ET
+16 +     import xml.etree.ElementTree as ET
+17 |     from xml.etree import cElementTree as CET
+18 | 
+19 | from xml.etree import cElementTree as ET
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
   --> UP023.py:17:27
@@ -139,16 +127,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 19 | from xml.etree import cElementTree as ET
    |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-14 14 | )
-15 15 | if True:
-16 16 |     import xml.etree.cElementTree as ET
-17    |-    from xml.etree import cElementTree as CET
-   17 |+    from xml.etree import ElementTree as CET
-18 18 | 
-19 19 | from xml.etree import cElementTree as ET
-20 20 | 
+14 | )
+15 | if True:
+16 |     import xml.etree.cElementTree as ET
+   -     from xml.etree import cElementTree as CET
+17 +     from xml.etree import ElementTree as CET
+18 | 
+19 | from xml.etree import cElementTree as ET
+20 | 
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
   --> UP023.py:19:23
@@ -161,16 +147,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 21 | import contextlib, xml.etree.cElementTree as ET
    |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-16 16 |     import xml.etree.cElementTree as ET
-17 17 |     from xml.etree import cElementTree as CET
-18 18 | 
-19    |-from xml.etree import cElementTree as ET
-   19 |+from xml.etree import ElementTree as ET
-20 20 | 
-21 21 | import contextlib, xml.etree.cElementTree as ET
-22 22 | 
+16 |     import xml.etree.cElementTree as ET
+17 |     from xml.etree import cElementTree as CET
+18 | 
+   - from xml.etree import cElementTree as ET
+19 + from xml.etree import ElementTree as ET
+20 | 
+21 | import contextlib, xml.etree.cElementTree as ET
+22 | 
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
   --> UP023.py:21:20
@@ -183,16 +167,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 23 | # This should fix the second, but not the first invocation.
    |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-18 18 | 
-19 19 | from xml.etree import cElementTree as ET
-20 20 | 
-21    |-import contextlib, xml.etree.cElementTree as ET
-   21 |+import contextlib, xml.etree.ElementTree as ET
-22 22 | 
-23 23 | # This should fix the second, but not the first invocation.
-24 24 | import xml.etree.cElementTree, xml.etree.cElementTree as ET
+18 | 
+19 | from xml.etree import cElementTree as ET
+20 | 
+   - import contextlib, xml.etree.cElementTree as ET
+21 + import contextlib, xml.etree.ElementTree as ET
+22 | 
+23 | # This should fix the second, but not the first invocation.
+24 | import xml.etree.cElementTree, xml.etree.cElementTree as ET
 
 UP023 [*] `cElementTree` is deprecated, use `ElementTree`
   --> UP023.py:24:32
@@ -204,13 +186,11 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree`
 26 | # The below items should NOT be changed.
    |
 help: Replace with `ElementTree`
-
-ℹ Safe fix
-21 21 | import contextlib, xml.etree.cElementTree as ET
-22 22 | 
-23 23 | # This should fix the second, but not the first invocation.
-24    |-import xml.etree.cElementTree, xml.etree.cElementTree as ET
-   24 |+import xml.etree.cElementTree, xml.etree.ElementTree as ET
-25 25 | 
-26 26 | # The below items should NOT be changed.
-27 27 | import xml.etree.cElementTree
+21 | import contextlib, xml.etree.cElementTree as ET
+22 | 
+23 | # This should fix the second, but not the first invocation.
+   - import xml.etree.cElementTree, xml.etree.cElementTree as ET
+24 + import xml.etree.cElementTree, xml.etree.ElementTree as ET
+25 | 
+26 | # The below items should NOT be changed.
+27 | import xml.etree.cElementTree
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap
index 552413b64e..e9b6bab722 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap
@@ -11,16 +11,14 @@ UP024 [*] Replace aliased errors with `OSError`
 7 |     pass
   |
 help: Replace `EnvironmentError` with builtin `OSError`
-
-ℹ Safe fix
-3 3 | # These should be fixed
-4 4 | try:
-5 5 |     pass
-6   |-except EnvironmentError:
-  6 |+except OSError:
-7 7 |     pass
-8 8 | 
-9 9 | try:
+3 | # These should be fixed
+4 | try:
+5 |     pass
+  - except EnvironmentError:
+6 + except OSError:
+7 |     pass
+8 | 
+9 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:11:8
@@ -32,16 +30,14 @@ UP024 [*] Replace aliased errors with `OSError`
 12 |     pass
    |
 help: Replace `IOError` with builtin `OSError`
-
-ℹ Safe fix
-8  8  | 
-9  9  | try:
-10 10 |     pass
-11    |-except IOError:
-   11 |+except OSError:
-12 12 |     pass
-13 13 | 
-14 14 | try:
+8  | 
+9  | try:
+10 |     pass
+   - except IOError:
+11 + except OSError:
+12 |     pass
+13 | 
+14 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:16:8
@@ -53,16 +49,14 @@ UP024 [*] Replace aliased errors with `OSError`
 17 |     pass
    |
 help: Replace `WindowsError` with builtin `OSError`
-
-ℹ Safe fix
-13 13 | 
-14 14 | try:
-15 15 |     pass
-16    |-except WindowsError:
-   16 |+except OSError:
-17 17 |     pass
-18 18 | 
-19 19 | try:
+13 | 
+14 | try:
+15 |     pass
+   - except WindowsError:
+16 + except OSError:
+17 |     pass
+18 | 
+19 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:21:8
@@ -74,16 +68,14 @@ UP024 [*] Replace aliased errors with `OSError`
 22 |     pass
    |
 help: Replace `mmap.error` with builtin `OSError`
-
-ℹ Safe fix
-18 18 | 
-19 19 | try:
-20 20 |     pass
-21    |-except mmap.error:
-   21 |+except OSError:
-22 22 |     pass
-23 23 | 
-24 24 | try:
+18 | 
+19 | try:
+20 |     pass
+   - except mmap.error:
+21 + except OSError:
+22 |     pass
+23 | 
+24 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:26:8
@@ -95,16 +87,14 @@ UP024 [*] Replace aliased errors with `OSError`
 27 |     pass
    |
 help: Replace `select.error` with builtin `OSError`
-
-ℹ Safe fix
-23 23 | 
-24 24 | try:
-25 25 |     pass
-26    |-except select.error:
-   26 |+except OSError:
-27 27 |     pass
-28 28 | 
-29 29 | try:
+23 | 
+24 | try:
+25 |     pass
+   - except select.error:
+26 + except OSError:
+27 |     pass
+28 | 
+29 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:31:8
@@ -116,16 +106,14 @@ UP024 [*] Replace aliased errors with `OSError`
 32 |     pass
    |
 help: Replace `socket.error` with builtin `OSError`
-
-ℹ Safe fix
-28 28 | 
-29 29 | try:
-30 30 |     pass
-31    |-except socket.error:
-   31 |+except OSError:
-32 32 |     pass
-33 33 | 
-34 34 | try:
+28 | 
+29 | try:
+30 |     pass
+   - except socket.error:
+31 + except OSError:
+32 |     pass
+33 | 
+34 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:36:8
@@ -137,16 +125,14 @@ UP024 [*] Replace aliased errors with `OSError`
 37 |     pass
    |
 help: Replace `error` with builtin `OSError`
-
-ℹ Safe fix
-33 33 | 
-34 34 | try:
-35 35 |     pass
-36    |-except error:
-   36 |+except OSError:
-37 37 |     pass
-38 38 | 
-39 39 | # Should NOT be in parentheses when replaced
+33 | 
+34 | try:
+35 |     pass
+   - except error:
+36 + except OSError:
+37 |     pass
+38 | 
+39 | # Should NOT be in parentheses when replaced
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:43:8
@@ -159,16 +145,14 @@ UP024 [*] Replace aliased errors with `OSError`
 45 | try:
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-40 40 | 
-41 41 | try:
-42 42 |     pass
-43    |-except (IOError,):
-   43 |+except OSError:
-44 44 |     pass
-45 45 | try:
-46 46 |     pass
+40 | 
+41 | try:
+42 |     pass
+   - except (IOError,):
+43 + except OSError:
+44 |     pass
+45 | try:
+46 |     pass
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:47:8
@@ -181,16 +165,14 @@ UP024 [*] Replace aliased errors with `OSError`
 49 | try:
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-44 44 |     pass
-45 45 | try:
-46 46 |     pass
-47    |-except (mmap.error,):
-   47 |+except OSError:
-48 48 |     pass
-49 49 | try:
-50 50 |     pass
+44 |     pass
+45 | try:
+46 |     pass
+   - except (mmap.error,):
+47 + except OSError:
+48 |     pass
+49 | try:
+50 |     pass
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:51:8
@@ -202,16 +184,14 @@ UP024 [*] Replace aliased errors with `OSError`
 52 |     pass
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-48 48 |     pass
-49 49 | try:
-50 50 |     pass
-51    |-except (EnvironmentError, IOError, OSError, select.error):
-   51 |+except OSError:
-52 52 |     pass
-53 53 | 
-54 54 | # Should be kept in parentheses (because multiple)
+48 |     pass
+49 | try:
+50 |     pass
+   - except (EnvironmentError, IOError, OSError, select.error):
+51 + except OSError:
+52 |     pass
+53 | 
+54 | # Should be kept in parentheses (because multiple)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:58:8
@@ -223,16 +203,14 @@ UP024 [*] Replace aliased errors with `OSError`
 59 |     pass
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-55 55 | 
-56 56 | try:
-57 57 |     pass
-58    |-except (IOError, KeyError, OSError):
-   58 |+except (KeyError, OSError):
-59 59 |     pass
-60 60 | 
-61 61 | # First should change, second should not
+55 | 
+56 | try:
+57 |     pass
+   - except (IOError, KeyError, OSError):
+58 + except (KeyError, OSError):
+59 |     pass
+60 | 
+61 | # First should change, second should not
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:65:8
@@ -245,16 +223,14 @@ UP024 [*] Replace aliased errors with `OSError`
 67 | # These should not change
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-62 62 | from .mmap import error
-63 63 | try:
-64 64 |     pass
-65    |-except (IOError, error):
-   65 |+except (OSError, error):
-66 66 |     pass
-67 67 | # These should not change
-68 68 | 
+62 | from .mmap import error
+63 | try:
+64 |     pass
+   - except (IOError, error):
+65 + except (OSError, error):
+66 |     pass
+67 | # These should not change
+68 | 
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_0.py:87:8
@@ -266,16 +242,14 @@ UP024 [*] Replace aliased errors with `OSError`
 88 |     pass
    |
 help: Replace `mmap.error` with builtin `OSError`
-
-ℹ Safe fix
-84 84 |     pass
-85 85 | try:
-86 86 |     pass
-87    |-except (mmap).error:
-   87 |+except OSError:
-88 88 |     pass
-89 89 | 
-90 90 | try:
+84 |     pass
+85 | try:
+86 |     pass
+   - except (mmap).error:
+87 + except OSError:
+88 |     pass
+89 | 
+90 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
    --> UP024_0.py:105:11
@@ -287,16 +261,14 @@ UP024 [*] Replace aliased errors with `OSError`
 106 |         msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex)
     |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-102 102 | def get_owner_id_from_mac_address():
-103 103 |     try:
-104 104 |         mac_address = get_primary_mac_address()
-105     |-    except(IOError, OSError) as ex:
-    105 |+    except OSError as ex:
-106 106 |         msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex)
-107 107 | 
-108 108 | 
+102 | def get_owner_id_from_mac_address():
+103 |     try:
+104 |         mac_address = get_primary_mac_address()
+    -     except(IOError, OSError) as ex:
+105 +     except OSError as ex:
+106 |         msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex)
+107 | 
+108 | 
 
 UP024 [*] Replace aliased errors with `OSError`
    --> UP024_0.py:114:8
@@ -308,11 +280,9 @@ UP024 [*] Replace aliased errors with `OSError`
 115 |     pass
     |
 help: Replace `os.error` with builtin `OSError`
-
-ℹ Safe fix
-111 111 | 
-112 112 | try:
-113 113 |     pass
-114     |-except os.error:
-    114 |+except OSError:
-115 115 |     pass
+111 | 
+112 | try:
+113 |     pass
+    - except os.error:
+114 + except OSError:
+115 |     pass
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap
index 0f79af245f..3315a98eef 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap
@@ -12,16 +12,14 @@ UP024 [*] Replace aliased errors with `OSError`
 7 | except (OSError, socket.error, KeyError):
   |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-2 2 | 
-3 3 | try:
-4 4 |     pass
-5   |-except (OSError, mmap.error, IOError):
-  5 |+except OSError:
-6 6 |     pass
-7 7 | except (OSError, socket.error, KeyError):
-8 8 |     pass
+2 | 
+3 | try:
+4 |     pass
+  - except (OSError, mmap.error, IOError):
+5 + except OSError:
+6 |     pass
+7 | except (OSError, socket.error, KeyError):
+8 |     pass
 
 UP024 [*] Replace aliased errors with `OSError`
  --> UP024_1.py:7:8
@@ -33,16 +31,14 @@ UP024 [*] Replace aliased errors with `OSError`
 8 |     pass
   |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-4 4 |     pass
-5 5 | except (OSError, mmap.error, IOError):
-6 6 |     pass
-7   |-except (OSError, socket.error, KeyError):
-  7 |+except (OSError, KeyError):
-8 8 |     pass
-9 9 | 
-10 10 | try:
+4  |     pass
+5  | except (OSError, mmap.error, IOError):
+6  |     pass
+   - except (OSError, socket.error, KeyError):
+7  + except (OSError, KeyError):
+8  |     pass
+9  | 
+10 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_1.py:12:8
@@ -59,15 +55,13 @@ UP024 [*] Replace aliased errors with `OSError`
 17 |       pass
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-9  9  | 
-10 10 | try:
-11 11 |     pass
-12    |-except (
-13    |-    OSError,
-14    |-    select.error,
-15    |-    IOError,
-16    |-):
-   12 |+except OSError:
-17 13 |     pass
+9  | 
+10 | try:
+11 |     pass
+   - except (
+   -     OSError,
+   -     select.error,
+   -     IOError,
+   - ):
+12 + except OSError:
+13 |     pass
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap
index 6f60ec07fd..9c899f5fb3 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap
@@ -12,16 +12,14 @@ UP024 [*] Replace aliased errors with `OSError`
 12 | raise select.error
    |
 help: Replace `socket.error` with builtin `OSError`
-
-ℹ Safe fix
-7  7  | 
-8  8  | # Testing the modules
-9  9  | import socket, mmap, select, resource
-10    |-raise socket.error
-   10 |+raise OSError
-11 11 | raise mmap.error
-12 12 | raise select.error
-13 13 | raise resource.error
+7  | 
+8  | # Testing the modules
+9  | import socket, mmap, select, resource
+   - raise socket.error
+10 + raise OSError
+11 | raise mmap.error
+12 | raise select.error
+13 | raise resource.error
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:11:7
@@ -34,16 +32,14 @@ UP024 [*] Replace aliased errors with `OSError`
 13 | raise resource.error
    |
 help: Replace `mmap.error` with builtin `OSError`
-
-ℹ Safe fix
-8  8  | # Testing the modules
-9  9  | import socket, mmap, select, resource
-10 10 | raise socket.error
-11    |-raise mmap.error
-   11 |+raise OSError
-12 12 | raise select.error
-13 13 | raise resource.error
-14 14 | 
+8  | # Testing the modules
+9  | import socket, mmap, select, resource
+10 | raise socket.error
+   - raise mmap.error
+11 + raise OSError
+12 | raise select.error
+13 | raise resource.error
+14 | 
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:12:7
@@ -55,16 +51,14 @@ UP024 [*] Replace aliased errors with `OSError`
 13 | raise resource.error
    |
 help: Replace `select.error` with builtin `OSError`
-
-ℹ Safe fix
-9  9  | import socket, mmap, select, resource
-10 10 | raise socket.error
-11 11 | raise mmap.error
-12    |-raise select.error
-   12 |+raise OSError
-13 13 | raise resource.error
-14 14 | 
-15 15 | raise socket.error()
+9  | import socket, mmap, select, resource
+10 | raise socket.error
+11 | raise mmap.error
+   - raise select.error
+12 + raise OSError
+13 | raise resource.error
+14 | 
+15 | raise socket.error()
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:13:7
@@ -77,16 +71,14 @@ UP024 [*] Replace aliased errors with `OSError`
 15 | raise socket.error()
    |
 help: Replace `resource.error` with builtin `OSError`
-
-ℹ Safe fix
-10 10 | raise socket.error
-11 11 | raise mmap.error
-12 12 | raise select.error
-13    |-raise resource.error
-   13 |+raise OSError
-14 14 | 
-15 15 | raise socket.error()
-16 16 | raise mmap.error(1)
+10 | raise socket.error
+11 | raise mmap.error
+12 | raise select.error
+   - raise resource.error
+13 + raise OSError
+14 | 
+15 | raise socket.error()
+16 | raise mmap.error(1)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:15:7
@@ -99,16 +91,14 @@ UP024 [*] Replace aliased errors with `OSError`
 17 | raise select.error(1, 2)
    |
 help: Replace `socket.error` with builtin `OSError`
-
-ℹ Safe fix
-12 12 | raise select.error
-13 13 | raise resource.error
-14 14 | 
-15    |-raise socket.error()
-   15 |+raise OSError()
-16 16 | raise mmap.error(1)
-17 17 | raise select.error(1, 2)
-18 18 | raise resource.error(1, "strerror", "filename")
+12 | raise select.error
+13 | raise resource.error
+14 | 
+   - raise socket.error()
+15 + raise OSError()
+16 | raise mmap.error(1)
+17 | raise select.error(1, 2)
+18 | raise resource.error(1, "strerror", "filename")
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:16:7
@@ -120,16 +110,14 @@ UP024 [*] Replace aliased errors with `OSError`
 18 | raise resource.error(1, "strerror", "filename")
    |
 help: Replace `mmap.error` with builtin `OSError`
-
-ℹ Safe fix
-13 13 | raise resource.error
-14 14 | 
-15 15 | raise socket.error()
-16    |-raise mmap.error(1)
-   16 |+raise OSError(1)
-17 17 | raise select.error(1, 2)
-18 18 | raise resource.error(1, "strerror", "filename")
-19 19 | 
+13 | raise resource.error
+14 | 
+15 | raise socket.error()
+   - raise mmap.error(1)
+16 + raise OSError(1)
+17 | raise select.error(1, 2)
+18 | raise resource.error(1, "strerror", "filename")
+19 | 
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:17:7
@@ -141,16 +129,14 @@ UP024 [*] Replace aliased errors with `OSError`
 18 | raise resource.error(1, "strerror", "filename")
    |
 help: Replace `select.error` with builtin `OSError`
-
-ℹ Safe fix
-14 14 | 
-15 15 | raise socket.error()
-16 16 | raise mmap.error(1)
-17    |-raise select.error(1, 2)
-   17 |+raise OSError(1, 2)
-18 18 | raise resource.error(1, "strerror", "filename")
-19 19 | 
-20 20 | raise socket.error(
+14 | 
+15 | raise socket.error()
+16 | raise mmap.error(1)
+   - raise select.error(1, 2)
+17 + raise OSError(1, 2)
+18 | raise resource.error(1, "strerror", "filename")
+19 | 
+20 | raise socket.error(
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:18:7
@@ -163,16 +149,14 @@ UP024 [*] Replace aliased errors with `OSError`
 20 | raise socket.error(
    |
 help: Replace `resource.error` with builtin `OSError`
-
-ℹ Safe fix
-15 15 | raise socket.error()
-16 16 | raise mmap.error(1)
-17 17 | raise select.error(1, 2)
-18    |-raise resource.error(1, "strerror", "filename")
-   18 |+raise OSError(1, "strerror", "filename")
-19 19 | 
-20 20 | raise socket.error(
-21 21 |     1,
+15 | raise socket.error()
+16 | raise mmap.error(1)
+17 | raise select.error(1, 2)
+   - raise resource.error(1, "strerror", "filename")
+18 + raise OSError(1, "strerror", "filename")
+19 | 
+20 | raise socket.error(
+21 |     1,
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:20:7
@@ -185,16 +169,14 @@ UP024 [*] Replace aliased errors with `OSError`
 22 |     2,
    |
 help: Replace `socket.error` with builtin `OSError`
-
-ℹ Safe fix
-17 17 | raise select.error(1, 2)
-18 18 | raise resource.error(1, "strerror", "filename")
-19 19 | 
-20    |-raise socket.error(
-   20 |+raise OSError(
-21 21 |     1,
-22 22 |     2,
-23 23 |     3,
+17 | raise select.error(1, 2)
+18 | raise resource.error(1, "strerror", "filename")
+19 | 
+   - raise socket.error(
+20 + raise OSError(
+21 |     1,
+22 |     2,
+23 |     3,
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:27:7
@@ -206,16 +188,14 @@ UP024 [*] Replace aliased errors with `OSError`
 29 | from socket import error
    |
 help: Replace `error` with builtin `OSError`
-
-ℹ Safe fix
-24 24 | )
-25 25 | 
-26 26 | from mmap import error
-27    |-raise error
-   27 |+raise OSError
-28 28 | 
-29 29 | from socket import error
-30 30 | raise error(1)
+24 | )
+25 | 
+26 | from mmap import error
+   - raise error
+27 + raise OSError
+28 | 
+29 | from socket import error
+30 | raise error(1)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:30:7
@@ -227,16 +207,14 @@ UP024 [*] Replace aliased errors with `OSError`
 32 | from select import error
    |
 help: Replace `error` with builtin `OSError`
-
-ℹ Safe fix
-27 27 | raise error
-28 28 | 
-29 29 | from socket import error
-30    |-raise error(1)
-   30 |+raise OSError(1)
-31 31 | 
-32 32 | from select import error
-33 33 | raise error(1, 2)
+27 | raise error
+28 | 
+29 | from socket import error
+   - raise error(1)
+30 + raise OSError(1)
+31 | 
+32 | from select import error
+33 | raise error(1, 2)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:33:7
@@ -248,16 +226,14 @@ UP024 [*] Replace aliased errors with `OSError`
 35 | from resource import error
    |
 help: Replace `error` with builtin `OSError`
-
-ℹ Safe fix
-30 30 | raise error(1)
-31 31 | 
-32 32 | from select import error
-33    |-raise error(1, 2)
-   33 |+raise OSError(1, 2)
-34 34 | 
-35 35 | from resource import error
-36 36 | raise error(1, "strerror", "filename")
+30 | raise error(1)
+31 | 
+32 | from select import error
+   - raise error(1, 2)
+33 + raise OSError(1, 2)
+34 | 
+35 | from resource import error
+36 | raise error(1, "strerror", "filename")
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:36:7
@@ -269,16 +245,14 @@ UP024 [*] Replace aliased errors with `OSError`
 38 | # Testing the names
    |
 help: Replace `error` with builtin `OSError`
-
-ℹ Safe fix
-33 33 | raise error(1, 2)
-34 34 | 
-35 35 | from resource import error
-36    |-raise error(1, "strerror", "filename")
-   36 |+raise OSError(1, "strerror", "filename")
-37 37 | 
-38 38 | # Testing the names
-39 39 | raise EnvironmentError
+33 | raise error(1, 2)
+34 | 
+35 | from resource import error
+   - raise error(1, "strerror", "filename")
+36 + raise OSError(1, "strerror", "filename")
+37 | 
+38 | # Testing the names
+39 | raise EnvironmentError
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:39:7
@@ -290,16 +264,14 @@ UP024 [*] Replace aliased errors with `OSError`
 41 | raise WindowsError
    |
 help: Replace `EnvironmentError` with builtin `OSError`
-
-ℹ Safe fix
-36 36 | raise error(1, "strerror", "filename")
-37 37 | 
-38 38 | # Testing the names
-39    |-raise EnvironmentError
-   39 |+raise OSError
-40 40 | raise IOError
-41 41 | raise WindowsError
-42 42 | 
+36 | raise error(1, "strerror", "filename")
+37 | 
+38 | # Testing the names
+   - raise EnvironmentError
+39 + raise OSError
+40 | raise IOError
+41 | raise WindowsError
+42 | 
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:40:7
@@ -311,16 +283,14 @@ UP024 [*] Replace aliased errors with `OSError`
 41 | raise WindowsError
    |
 help: Replace `IOError` with builtin `OSError`
-
-ℹ Safe fix
-37 37 | 
-38 38 | # Testing the names
-39 39 | raise EnvironmentError
-40    |-raise IOError
-   40 |+raise OSError
-41 41 | raise WindowsError
-42 42 | 
-43 43 | raise EnvironmentError()
+37 | 
+38 | # Testing the names
+39 | raise EnvironmentError
+   - raise IOError
+40 + raise OSError
+41 | raise WindowsError
+42 | 
+43 | raise EnvironmentError()
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:41:7
@@ -333,16 +303,14 @@ UP024 [*] Replace aliased errors with `OSError`
 43 | raise EnvironmentError()
    |
 help: Replace `WindowsError` with builtin `OSError`
-
-ℹ Safe fix
-38 38 | # Testing the names
-39 39 | raise EnvironmentError
-40 40 | raise IOError
-41    |-raise WindowsError
-   41 |+raise OSError
-42 42 | 
-43 43 | raise EnvironmentError()
-44 44 | raise IOError(1)
+38 | # Testing the names
+39 | raise EnvironmentError
+40 | raise IOError
+   - raise WindowsError
+41 + raise OSError
+42 | 
+43 | raise EnvironmentError()
+44 | raise IOError(1)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:43:7
@@ -355,16 +323,14 @@ UP024 [*] Replace aliased errors with `OSError`
 45 | raise WindowsError(1, 2)
    |
 help: Replace `EnvironmentError` with builtin `OSError`
-
-ℹ Safe fix
-40 40 | raise IOError
-41 41 | raise WindowsError
-42 42 | 
-43    |-raise EnvironmentError()
-   43 |+raise OSError()
-44 44 | raise IOError(1)
-45 45 | raise WindowsError(1, 2)
-46 46 | 
+40 | raise IOError
+41 | raise WindowsError
+42 | 
+   - raise EnvironmentError()
+43 + raise OSError()
+44 | raise IOError(1)
+45 | raise WindowsError(1, 2)
+46 | 
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:44:7
@@ -375,16 +341,14 @@ UP024 [*] Replace aliased errors with `OSError`
 45 | raise WindowsError(1, 2)
    |
 help: Replace `IOError` with builtin `OSError`
-
-ℹ Safe fix
-41 41 | raise WindowsError
-42 42 | 
-43 43 | raise EnvironmentError()
-44    |-raise IOError(1)
-   44 |+raise OSError(1)
-45 45 | raise WindowsError(1, 2)
-46 46 | 
-47 47 | raise EnvironmentError(
+41 | raise WindowsError
+42 | 
+43 | raise EnvironmentError()
+   - raise IOError(1)
+44 + raise OSError(1)
+45 | raise WindowsError(1, 2)
+46 | 
+47 | raise EnvironmentError(
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:45:7
@@ -397,16 +361,14 @@ UP024 [*] Replace aliased errors with `OSError`
 47 | raise EnvironmentError(
    |
 help: Replace `WindowsError` with builtin `OSError`
-
-ℹ Safe fix
-42 42 | 
-43 43 | raise EnvironmentError()
-44 44 | raise IOError(1)
-45    |-raise WindowsError(1, 2)
-   45 |+raise OSError(1, 2)
-46 46 | 
-47 47 | raise EnvironmentError(
-48 48 |     1,
+42 | 
+43 | raise EnvironmentError()
+44 | raise IOError(1)
+   - raise WindowsError(1, 2)
+45 + raise OSError(1, 2)
+46 | 
+47 | raise EnvironmentError(
+48 |     1,
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:47:7
@@ -419,16 +381,14 @@ UP024 [*] Replace aliased errors with `OSError`
 49 |     2,
    |
 help: Replace `EnvironmentError` with builtin `OSError`
-
-ℹ Safe fix
-44 44 | raise IOError(1)
-45 45 | raise WindowsError(1, 2)
-46 46 | 
-47    |-raise EnvironmentError(
-   47 |+raise OSError(
-48 48 |     1,
-49 49 |     2,
-50 50 |     3,
+44 | raise IOError(1)
+45 | raise WindowsError(1, 2)
+46 | 
+   - raise EnvironmentError(
+47 + raise OSError(
+48 |     1,
+49 |     2,
+50 |     3,
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:53:7
@@ -441,15 +401,13 @@ UP024 [*] Replace aliased errors with `OSError`
 55 | raise IOError(1, 2)
    |
 help: Replace `WindowsError` with builtin `OSError`
-
-ℹ Safe fix
-50 50 |     3,
-51 51 | )
-52 52 | 
-53    |-raise WindowsError
-   53 |+raise OSError
-54 54 | raise EnvironmentError(1)
-55 55 | raise IOError(1, 2)
+50 |     3,
+51 | )
+52 | 
+   - raise WindowsError
+53 + raise OSError
+54 | raise EnvironmentError(1)
+55 | raise IOError(1, 2)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:54:7
@@ -460,14 +418,12 @@ UP024 [*] Replace aliased errors with `OSError`
 55 | raise IOError(1, 2)
    |
 help: Replace `EnvironmentError` with builtin `OSError`
-
-ℹ Safe fix
-51 51 | )
-52 52 | 
-53 53 | raise WindowsError
-54    |-raise EnvironmentError(1)
-   54 |+raise OSError(1)
-55 55 | raise IOError(1, 2)
+51 | )
+52 | 
+53 | raise WindowsError
+   - raise EnvironmentError(1)
+54 + raise OSError(1)
+55 | raise IOError(1, 2)
 
 UP024 [*] Replace aliased errors with `OSError`
   --> UP024_2.py:55:7
@@ -478,10 +434,8 @@ UP024 [*] Replace aliased errors with `OSError`
    |       ^^^^^^^
    |
 help: Replace `IOError` with builtin `OSError`
-
-ℹ Safe fix
-52 52 | 
-53 53 | raise WindowsError
-54 54 | raise EnvironmentError(1)
-55    |-raise IOError(1, 2)
-   55 |+raise OSError(1, 2)
+52 | 
+53 | raise WindowsError
+54 | raise EnvironmentError(1)
+   - raise IOError(1, 2)
+55 + raise OSError(1, 2)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap
index 010982c8f1..997357adab 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap
@@ -11,11 +11,9 @@ UP024 [*] Replace aliased errors with `OSError`
 10 |     return HttpResponseServerError("cache: cannot connect to broker.")
    |
 help: Replace with builtin `OSError`
-
-ℹ Safe fix
-6  6  |     conn = Connection(settings.CELERY_BROKER_URL)
-7  7  |     conn.ensure_connection(max_retries=2)
-8  8  |     conn._close()
-9     |-except (socket.error, exceptions.OperationalError):
-   9  |+except (OSError, exceptions.OperationalError):
-10 10 |     return HttpResponseServerError("cache: cannot connect to broker.")
+6  |     conn = Connection(settings.CELERY_BROKER_URL)
+7  |     conn.ensure_connection(max_retries=2)
+8  |     conn._close()
+   - except (socket.error, exceptions.OperationalError):
+9  + except (OSError, exceptions.OperationalError):
+10 |     return HttpResponseServerError("cache: cannot connect to broker.")
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap
index 5fc2ff59e5..529aea1b2a 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap
@@ -10,13 +10,11 @@ UP025 [*] Remove unicode literals from strings
 3 | x = u"Hello"  # UP025
   |
 help: Remove unicode prefix
-
-ℹ Safe fix
-1   |-u"Hello"
-  1 |+"Hello"
-2 2 | 
-3 3 | x = u"Hello"  # UP025
-4 4 | 
+  - u"Hello"
+1 + "Hello"
+2 | 
+3 | x = u"Hello"  # UP025
+4 | 
 
 UP025 [*] Remove unicode literals from strings
  --> UP025.py:3:5
@@ -29,15 +27,13 @@ UP025 [*] Remove unicode literals from strings
 5 | u'world'  # UP025
   |
 help: Remove unicode prefix
-
-ℹ Safe fix
-1 1 | u"Hello"
-2 2 | 
-3   |-x = u"Hello"  # UP025
-  3 |+x = "Hello"  # UP025
-4 4 | 
-5 5 | u'world'  # UP025
-6 6 | 
+1 | u"Hello"
+2 | 
+  - x = u"Hello"  # UP025
+3 + x = "Hello"  # UP025
+4 | 
+5 | u'world'  # UP025
+6 | 
 
 UP025 [*] Remove unicode literals from strings
  --> UP025.py:5:1
@@ -50,16 +46,14 @@ UP025 [*] Remove unicode literals from strings
 7 | print(u"Hello")  # UP025
   |
 help: Remove unicode prefix
-
-ℹ Safe fix
-2 2 | 
-3 3 | x = u"Hello"  # UP025
-4 4 | 
-5   |-u'world'  # UP025
-  5 |+'world'  # UP025
-6 6 | 
-7 7 | print(u"Hello")  # UP025
-8 8 | 
+2 | 
+3 | x = u"Hello"  # UP025
+4 | 
+  - u'world'  # UP025
+5 + 'world'  # UP025
+6 | 
+7 | print(u"Hello")  # UP025
+8 | 
 
 UP025 [*] Remove unicode literals from strings
  --> UP025.py:7:7
@@ -72,16 +66,14 @@ UP025 [*] Remove unicode literals from strings
 9 | print(u'world')  # UP025
   |
 help: Remove unicode prefix
-
-ℹ Safe fix
-4 4 | 
-5 5 | u'world'  # UP025
-6 6 | 
-7   |-print(u"Hello")  # UP025
-  7 |+print("Hello")  # UP025
-8 8 | 
-9 9 | print(u'world')  # UP025
-10 10 | 
+4  | 
+5  | u'world'  # UP025
+6  | 
+   - print(u"Hello")  # UP025
+7  + print("Hello")  # UP025
+8  | 
+9  | print(u'world')  # UP025
+10 | 
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:9:7
@@ -94,16 +86,14 @@ UP025 [*] Remove unicode literals from strings
 11 | import foo
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-6  6  | 
-7  7  | print(u"Hello")  # UP025
-8  8  | 
-9     |-print(u'world')  # UP025
-   9  |+print('world')  # UP025
-10 10 | 
-11 11 | import foo
-12 12 | 
+6  | 
+7  | print(u"Hello")  # UP025
+8  | 
+   - print(u'world')  # UP025
+9  + print('world')  # UP025
+10 | 
+11 | import foo
+12 | 
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:13:5
@@ -116,16 +106,14 @@ UP025 [*] Remove unicode literals from strings
 15 | # Retain quotes when fixing.
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-10 10 | 
-11 11 | import foo
-12 12 | 
-13    |-foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
-   13 |+foo("Hello", U"world", a=u"Hello", b=u"world")  # UP025
-14 14 | 
-15 15 | # Retain quotes when fixing.
-16 16 | x = u'hello'  # UP025
+10 | 
+11 | import foo
+12 | 
+   - foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
+13 + foo("Hello", U"world", a=u"Hello", b=u"world")  # UP025
+14 | 
+15 | # Retain quotes when fixing.
+16 | x = u'hello'  # UP025
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:13:15
@@ -138,16 +126,14 @@ UP025 [*] Remove unicode literals from strings
 15 | # Retain quotes when fixing.
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-10 10 | 
-11 11 | import foo
-12 12 | 
-13    |-foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
-   13 |+foo(u"Hello", "world", a=u"Hello", b=u"world")  # UP025
-14 14 | 
-15 15 | # Retain quotes when fixing.
-16 16 | x = u'hello'  # UP025
+10 | 
+11 | import foo
+12 | 
+   - foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
+13 + foo(u"Hello", "world", a=u"Hello", b=u"world")  # UP025
+14 | 
+15 | # Retain quotes when fixing.
+16 | x = u'hello'  # UP025
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:13:27
@@ -160,16 +146,14 @@ UP025 [*] Remove unicode literals from strings
 15 | # Retain quotes when fixing.
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-10 10 | 
-11 11 | import foo
-12 12 | 
-13    |-foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
-   13 |+foo(u"Hello", U"world", a="Hello", b=u"world")  # UP025
-14 14 | 
-15 15 | # Retain quotes when fixing.
-16 16 | x = u'hello'  # UP025
+10 | 
+11 | import foo
+12 | 
+   - foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
+13 + foo(u"Hello", U"world", a="Hello", b=u"world")  # UP025
+14 | 
+15 | # Retain quotes when fixing.
+16 | x = u'hello'  # UP025
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:13:39
@@ -182,16 +166,14 @@ UP025 [*] Remove unicode literals from strings
 15 | # Retain quotes when fixing.
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-10 10 | 
-11 11 | import foo
-12 12 | 
-13    |-foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
-   13 |+foo(u"Hello", U"world", a=u"Hello", b="world")  # UP025
-14 14 | 
-15 15 | # Retain quotes when fixing.
-16 16 | x = u'hello'  # UP025
+10 | 
+11 | import foo
+12 | 
+   - foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
+13 + foo(u"Hello", U"world", a=u"Hello", b="world")  # UP025
+14 | 
+15 | # Retain quotes when fixing.
+16 | x = u'hello'  # UP025
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:16:5
@@ -203,16 +185,14 @@ UP025 [*] Remove unicode literals from strings
 18 | x = u'''hello'''  # UP025
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-13 13 | foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
-14 14 | 
-15 15 | # Retain quotes when fixing.
-16    |-x = u'hello'  # UP025
-   16 |+x = 'hello'  # UP025
-17 17 | x = u"""hello"""  # UP025
-18 18 | x = u'''hello'''  # UP025
-19 19 | x = u'Hello "World"'  # UP025
+13 | foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
+14 | 
+15 | # Retain quotes when fixing.
+   - x = u'hello'  # UP025
+16 + x = 'hello'  # UP025
+17 | x = u"""hello"""  # UP025
+18 | x = u'''hello'''  # UP025
+19 | x = u'Hello "World"'  # UP025
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:17:5
@@ -225,16 +205,14 @@ UP025 [*] Remove unicode literals from strings
 19 | x = u'Hello "World"'  # UP025
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-14 14 | 
-15 15 | # Retain quotes when fixing.
-16 16 | x = u'hello'  # UP025
-17    |-x = u"""hello"""  # UP025
-   17 |+x = """hello"""  # UP025
-18 18 | x = u'''hello'''  # UP025
-19 19 | x = u'Hello "World"'  # UP025
-20 20 | 
+14 | 
+15 | # Retain quotes when fixing.
+16 | x = u'hello'  # UP025
+   - x = u"""hello"""  # UP025
+17 + x = """hello"""  # UP025
+18 | x = u'''hello'''  # UP025
+19 | x = u'Hello "World"'  # UP025
+20 | 
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:18:5
@@ -246,16 +224,14 @@ UP025 [*] Remove unicode literals from strings
 19 | x = u'Hello "World"'  # UP025
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-15 15 | # Retain quotes when fixing.
-16 16 | x = u'hello'  # UP025
-17 17 | x = u"""hello"""  # UP025
-18    |-x = u'''hello'''  # UP025
-   18 |+x = '''hello'''  # UP025
-19 19 | x = u'Hello "World"'  # UP025
-20 20 | 
-21 21 | u = "Hello"  # OK
+15 | # Retain quotes when fixing.
+16 | x = u'hello'  # UP025
+17 | x = u"""hello"""  # UP025
+   - x = u'''hello'''  # UP025
+18 + x = '''hello'''  # UP025
+19 | x = u'Hello "World"'  # UP025
+20 | 
+21 | u = "Hello"  # OK
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:19:5
@@ -268,16 +244,14 @@ UP025 [*] Remove unicode literals from strings
 21 | u = "Hello"  # OK
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-16 16 | x = u'hello'  # UP025
-17 17 | x = u"""hello"""  # UP025
-18 18 | x = u'''hello'''  # UP025
-19    |-x = u'Hello "World"'  # UP025
-   19 |+x = 'Hello "World"'  # UP025
-20 20 | 
-21 21 | u = "Hello"  # OK
-22 22 | u = u  # OK
+16 | x = u'hello'  # UP025
+17 | x = u"""hello"""  # UP025
+18 | x = u'''hello'''  # UP025
+   - x = u'Hello "World"'  # UP025
+19 + x = 'Hello "World"'  # UP025
+20 | 
+21 | u = "Hello"  # OK
+22 | u = u  # OK
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:27:7
@@ -289,16 +263,14 @@ UP025 [*] Remove unicode literals from strings
 28 | f"foo" u"bar"  # OK
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-24 24 | def hello():
-25 25 |     return"Hello"  # OK
-26 26 | 
-27    |-f"foo"u"bar"  # OK
-   27 |+f"foo" "bar"  # OK
-28 28 | f"foo" u"bar"  # OK
-29 29 | 
-30 30 | # https://github.com/astral-sh/ruff/issues/18895
+24 | def hello():
+25 |     return"Hello"  # OK
+26 | 
+   - f"foo"u"bar"  # OK
+27 + f"foo" "bar"  # OK
+28 | f"foo" u"bar"  # OK
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/18895
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:28:8
@@ -310,16 +282,14 @@ UP025 [*] Remove unicode literals from strings
 30 | # https://github.com/astral-sh/ruff/issues/18895
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-25 25 |     return"Hello"  # OK
-26 26 | 
-27 27 | f"foo"u"bar"  # OK
-28    |-f"foo" u"bar"  # OK
-   28 |+f"foo" "bar"  # OK
-29 29 | 
-30 30 | # https://github.com/astral-sh/ruff/issues/18895
-31 31 | ""u""
+25 |     return"Hello"  # OK
+26 | 
+27 | f"foo"u"bar"  # OK
+   - f"foo" u"bar"  # OK
+28 + f"foo" "bar"  # OK
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/18895
+31 | ""u""
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:31:3
@@ -331,16 +301,14 @@ UP025 [*] Remove unicode literals from strings
 33 | """"""""""""""""""""u"hi"
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-28 28 | f"foo" u"bar"  # OK
-29 29 | 
-30 30 | # https://github.com/astral-sh/ruff/issues/18895
-31    |-""u""
-   31 |+"" ""
-32 32 | ""u"hi"
-33 33 | """"""""""""""""""""u"hi"
-34 34 | ""U"helloooo"
+28 | f"foo" u"bar"  # OK
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/18895
+   - ""u""
+31 + "" ""
+32 | ""u"hi"
+33 | """"""""""""""""""""u"hi"
+34 | ""U"helloooo"
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:32:3
@@ -353,15 +321,13 @@ UP025 [*] Remove unicode literals from strings
 34 | ""U"helloooo"
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-29 29 | 
-30 30 | # https://github.com/astral-sh/ruff/issues/18895
-31 31 | ""u""
-32    |-""u"hi"
-   32 |+"" "hi"
-33 33 | """"""""""""""""""""u"hi"
-34 34 | ""U"helloooo"
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/18895
+31 | ""u""
+   - ""u"hi"
+32 + "" "hi"
+33 | """"""""""""""""""""u"hi"
+34 | ""U"helloooo"
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:33:21
@@ -373,14 +339,12 @@ UP025 [*] Remove unicode literals from strings
 34 | ""U"helloooo"
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-30 30 | # https://github.com/astral-sh/ruff/issues/18895
-31 31 | ""u""
-32 32 | ""u"hi"
-33    |-""""""""""""""""""""u"hi"
-   33 |+"""""""""""""""""""" "hi"
-34 34 | ""U"helloooo"
+30 | # https://github.com/astral-sh/ruff/issues/18895
+31 | ""u""
+32 | ""u"hi"
+   - """"""""""""""""""""u"hi"
+33 + """""""""""""""""""" "hi"
+34 | ""U"helloooo"
 
 UP025 [*] Remove unicode literals from strings
   --> UP025.py:34:3
@@ -391,10 +355,8 @@ UP025 [*] Remove unicode literals from strings
    |   ^^^^^^^^^^^
    |
 help: Remove unicode prefix
-
-ℹ Safe fix
-31 31 | ""u""
-32 32 | ""u"hi"
-33 33 | """"""""""""""""""""u"hi"
-34    |-""U"helloooo"
-   34 |+"" "helloooo"
+31 | ""u""
+32 | ""u"hi"
+33 | """"""""""""""""""""u"hi"
+   - ""U"helloooo"
+34 + "" "helloooo"
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap
index 33ff29dad7..b78d9cd51d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap
@@ -12,15 +12,13 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 5 | # Error (`from unittest import mock`)
   |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-1 1 | # Error (`from unittest import mock`)
-2 2 | if True:
-3   |-    import mock
-  3 |+    from unittest import mock
-4 4 | 
-5 5 | # Error (`from unittest import mock`)
-6 6 | if True:
+1 | # Error (`from unittest import mock`)
+2 | if True:
+  -     import mock
+3 +     from unittest import mock
+4 | 
+5 | # Error (`from unittest import mock`)
+6 | if True:
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
  --> UP026.py:7:12
@@ -33,17 +31,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 9 | # Error (`from unittest.mock import *`)
   |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Error (`from unittest import mock`)
-6 6 | if True:
-7   |-    import mock, sys
-  7 |+    import sys
-  8 |+    from unittest import mock
-8 9 | 
-9 10 | # Error (`from unittest.mock import *`)
-10 11 | if True:
+4  | 
+5  | # Error (`from unittest import mock`)
+6  | if True:
+   -     import mock, sys
+7  +     import sys
+8  +     from unittest import mock
+9  | 
+10 | # Error (`from unittest.mock import *`)
+11 | if True:
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:11:5
@@ -56,16 +52,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 13 | # Error (`from unittest import mock`)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-8  8  | 
-9  9  | # Error (`from unittest.mock import *`)
-10 10 | if True:
-11    |-    from mock import *
-   11 |+    from unittest.mock import *
-12 12 | 
-13 13 | # Error (`from unittest import mock`)
-14 14 | import mock.mock
+8  | 
+9  | # Error (`from unittest.mock import *`)
+10 | if True:
+   -     from mock import *
+11 +     from unittest.mock import *
+12 | 
+13 | # Error (`from unittest import mock`)
+14 | import mock.mock
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:14:8
@@ -77,16 +71,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 16 | # Error (`from unittest import mock`)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-11 11 |     from mock import *
-12 12 | 
-13 13 | # Error (`from unittest import mock`)
-14    |-import mock.mock
-   14 |+from unittest import mock
-15 15 | 
-16 16 | # Error (`from unittest import mock`)
-17 17 | import contextlib, mock, sys
+11 |     from mock import *
+12 | 
+13 | # Error (`from unittest import mock`)
+   - import mock.mock
+14 + from unittest import mock
+15 | 
+16 | # Error (`from unittest import mock`)
+17 | import contextlib, mock, sys
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:17:20
@@ -98,17 +90,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 19 | # Error (`from unittest import mock`)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-14 14 | import mock.mock
-15 15 | 
-16 16 | # Error (`from unittest import mock`)
-17    |-import contextlib, mock, sys
-   17 |+import contextlib, sys
-   18 |+from unittest import mock
-18 19 | 
-19 20 | # Error (`from unittest import mock`)
-20 21 | import mock, sys
+14 | import mock.mock
+15 | 
+16 | # Error (`from unittest import mock`)
+   - import contextlib, mock, sys
+17 + import contextlib, sys
+18 + from unittest import mock
+19 | 
+20 | # Error (`from unittest import mock`)
+21 | import mock, sys
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:20:8
@@ -119,17 +109,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 21 | x = "This code should be preserved one line below the mock"
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-17 17 | import contextlib, mock, sys
-18 18 | 
-19 19 | # Error (`from unittest import mock`)
-20    |-import mock, sys
-   20 |+import sys
-   21 |+from unittest import mock
-21 22 | x = "This code should be preserved one line below the mock"
-22 23 | 
-23 24 | # Error (`from unittest import mock`)
+17 | import contextlib, mock, sys
+18 | 
+19 | # Error (`from unittest import mock`)
+   - import mock, sys
+20 + import sys
+21 + from unittest import mock
+22 | x = "This code should be preserved one line below the mock"
+23 | 
+24 | # Error (`from unittest import mock`)
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:24:1
@@ -141,16 +129,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 26 | # Error (keep trailing comma)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-21 21 | x = "This code should be preserved one line below the mock"
-22 22 | 
-23 23 | # Error (`from unittest import mock`)
-24    |-from mock import mock
-   24 |+from unittest import mock
-25 25 | 
-26 26 | # Error (keep trailing comma)
-27 27 | from mock import (
+21 | x = "This code should be preserved one line below the mock"
+22 | 
+23 | # Error (`from unittest import mock`)
+   - from mock import mock
+24 + from unittest import mock
+25 | 
+26 | # Error (keep trailing comma)
+27 | from mock import (
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:27:1
@@ -167,22 +153,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 34 |       a,
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-24 24 | from mock import mock
-25 25 | 
-26 26 | # Error (keep trailing comma)
-27    |-from mock import (
-28    |-    mock,
-   27 |+from unittest.mock import (
-29 28 |     a,
-30 29 |     b,
-31 30 |     c,
-32 31 | )
-   32 |+from unittest import mock
-33 33 | from mock import (
-34 34 |     a,
-35 35 |     b,
+24 | from mock import mock
+25 | 
+26 | # Error (keep trailing comma)
+   - from mock import (
+   -     mock,
+27 + from unittest.mock import (
+28 |     a,
+29 |     b,
+30 |     c,
+31 | )
+32 + from unittest import mock
+33 | from mock import (
+34 |     a,
+35 |     b,
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:33:1
@@ -200,22 +184,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 40 |   # Error (avoid trailing comma)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-30 30 |     b,
-31 31 |     c,
-32 32 | )
-33    |-from mock import (
-   33 |+from unittest.mock import (
-34 34 |     a,
-35 35 |     b,
-36 36 |     c,
-37    |-    mock,
-38 37 | )
-   38 |+from unittest import mock
-39 39 | 
-40 40 | # Error (avoid trailing comma)
-41 41 | from mock import (
+30 |     b,
+31 |     c,
+32 | )
+   - from mock import (
+33 + from unittest.mock import (
+34 |     a,
+35 |     b,
+36 |     c,
+   -     mock,
+37 | )
+38 + from unittest import mock
+39 | 
+40 | # Error (avoid trailing comma)
+41 | from mock import (
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:41:1
@@ -232,22 +214,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 48 |       a,
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-38 38 | )
-39 39 | 
-40 40 | # Error (avoid trailing comma)
-41    |-from mock import (
-42    |-    mock,
-   41 |+from unittest.mock import (
-43 42 |     a,
-44 43 |     b,
-45 44 |     c
-46 45 | )
-   46 |+from unittest import mock
-47 47 | from mock import (
-48 48 |     a,
-49 49 |     b,
+38 | )
+39 | 
+40 | # Error (avoid trailing comma)
+   - from mock import (
+   -     mock,
+41 + from unittest.mock import (
+42 |     a,
+43 |     b,
+44 |     c
+45 | )
+46 + from unittest import mock
+47 | from mock import (
+48 |     a,
+49 |     b,
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:47:1
@@ -265,23 +245,21 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 54 |   from mock import a, b, c, mock
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-44 44 |     b,
-45 45 |     c
-46 46 | )
-47    |-from mock import (
-   47 |+from unittest.mock import (
-48 48 |     a,
-49 49 |     b,
-50    |-    c,
-51    |-    mock
-   50 |+    c
-52 51 | )
-   52 |+from unittest import mock
-53 53 | from mock import mock, a, b, c
-54 54 | from mock import a, b, c, mock
-55 55 | 
+44 |     b,
+45 |     c
+46 | )
+   - from mock import (
+47 + from unittest.mock import (
+48 |     a,
+49 |     b,
+   -     c,
+   -     mock
+50 +     c
+51 | )
+52 + from unittest import mock
+53 | from mock import mock, a, b, c
+54 | from mock import a, b, c, mock
+55 | 
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:53:1
@@ -293,17 +271,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 54 | from mock import a, b, c, mock
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-50 50 |     c,
-51 51 |     mock
-52 52 | )
-53    |-from mock import mock, a, b, c
-   53 |+from unittest.mock import a, b, c
-   54 |+from unittest import mock
-54 55 | from mock import a, b, c, mock
-55 56 | 
-56 57 | if True:
+50 |     c,
+51 |     mock
+52 | )
+   - from mock import mock, a, b, c
+53 + from unittest.mock import a, b, c
+54 + from unittest import mock
+55 | from mock import a, b, c, mock
+56 | 
+57 | if True:
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:54:1
@@ -316,17 +292,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 56 | if True:
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-51 51 |     mock
-52 52 | )
-53 53 | from mock import mock, a, b, c
-54    |-from mock import a, b, c, mock
-   54 |+from unittest.mock import a, b, c
-   55 |+from unittest import mock
-55 56 | 
-56 57 | if True:
-57 58 |     if False:
+51 |     mock
+52 | )
+53 | from mock import mock, a, b, c
+   - from mock import a, b, c, mock
+54 + from unittest.mock import a, b, c
+55 + from unittest import mock
+56 | 
+57 | if True:
+58 |     if False:
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:58:9
@@ -344,22 +318,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 65 |   # OK
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-55 55 | 
-56 56 | if True:
-57 57 |     if False:
-58    |-        from mock import (
-59    |-            mock,
-   58 |+        from unittest.mock import (
-60 59 |             a,
-61 60 |             b,
-62 61 |             c
-63 62 |         )
-   63 |+        from unittest import mock
-64 64 | 
-65 65 | # OK
-66 66 | import os, io
+55 | 
+56 | if True:
+57 |     if False:
+   -         from mock import (
+   -             mock,
+58 +         from unittest.mock import (
+59 |             a,
+60 |             b,
+61 |             c
+62 |         )
+63 +         from unittest import mock
+64 | 
+65 | # OK
+66 | import os, io
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:69:8
@@ -371,17 +343,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 71 | # Error (`from unittest import mock as foo`)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-66 66 | import os, io
-67 67 | 
-68 68 | # Error (`from unittest import mock`)
-69    |-import mock, mock
-   69 |+from unittest import mock
-   70 |+from unittest import mock
-70 71 | 
-71 72 | # Error (`from unittest import mock as foo`)
-72 73 | import mock as foo
+66 | import os, io
+67 | 
+68 | # Error (`from unittest import mock`)
+   - import mock, mock
+69 + from unittest import mock
+70 + from unittest import mock
+71 | 
+72 | # Error (`from unittest import mock as foo`)
+73 | import mock as foo
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:69:14
@@ -393,17 +363,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 71 | # Error (`from unittest import mock as foo`)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-66 66 | import os, io
-67 67 | 
-68 68 | # Error (`from unittest import mock`)
-69    |-import mock, mock
-   69 |+from unittest import mock
-   70 |+from unittest import mock
-70 71 | 
-71 72 | # Error (`from unittest import mock as foo`)
-72 73 | import mock as foo
+66 | import os, io
+67 | 
+68 | # Error (`from unittest import mock`)
+   - import mock, mock
+69 + from unittest import mock
+70 + from unittest import mock
+71 | 
+72 | # Error (`from unittest import mock as foo`)
+73 | import mock as foo
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:72:8
@@ -415,16 +383,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 74 | # Error (`from unittest import mock as foo`)
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-69 69 | import mock, mock
-70 70 | 
-71 71 | # Error (`from unittest import mock as foo`)
-72    |-import mock as foo
-   72 |+from unittest import mock as foo
-73 73 | 
-74 74 | # Error (`from unittest import mock as foo`)
-75 75 | from mock import mock as foo
+69 | import mock, mock
+70 | 
+71 | # Error (`from unittest import mock as foo`)
+   - import mock as foo
+72 + from unittest import mock as foo
+73 | 
+74 | # Error (`from unittest import mock as foo`)
+75 | from mock import mock as foo
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:75:1
@@ -436,16 +402,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 77 | if True:
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-72 72 | import mock as foo
-73 73 | 
-74 74 | # Error (`from unittest import mock as foo`)
-75    |-from mock import mock as foo
-   75 |+from unittest import mock as foo
-76 76 | 
-77 77 | if True:
-78 78 |     # This should yield multiple, aliased imports.
+72 | import mock as foo
+73 | 
+74 | # Error (`from unittest import mock as foo`)
+   - from mock import mock as foo
+75 + from unittest import mock as foo
+76 | 
+77 | if True:
+78 |     # This should yield multiple, aliased imports.
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:79:12
@@ -458,18 +422,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 81 |     # This should yield multiple, aliased imports, and preserve `os`.
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-76 76 | 
-77 77 | if True:
-78 78 |     # This should yield multiple, aliased imports.
-79    |-    import mock as foo, mock as bar, mock
-   79 |+    from unittest import mock as foo
-   80 |+    from unittest import mock as bar
-   81 |+    from unittest import mock
-80 82 | 
-81 83 |     # This should yield multiple, aliased imports, and preserve `os`.
-82 84 |     import mock as foo, mock as bar, mock, os
+76 | 
+77 | if True:
+78 |     # This should yield multiple, aliased imports.
+   -     import mock as foo, mock as bar, mock
+79 +     from unittest import mock as foo
+80 +     from unittest import mock as bar
+81 +     from unittest import mock
+82 | 
+83 |     # This should yield multiple, aliased imports, and preserve `os`.
+84 |     import mock as foo, mock as bar, mock, os
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:79:25
@@ -482,18 +444,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 81 |     # This should yield multiple, aliased imports, and preserve `os`.
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-76 76 | 
-77 77 | if True:
-78 78 |     # This should yield multiple, aliased imports.
-79    |-    import mock as foo, mock as bar, mock
-   79 |+    from unittest import mock as foo
-   80 |+    from unittest import mock as bar
-   81 |+    from unittest import mock
-80 82 | 
-81 83 |     # This should yield multiple, aliased imports, and preserve `os`.
-82 84 |     import mock as foo, mock as bar, mock, os
+76 | 
+77 | if True:
+78 |     # This should yield multiple, aliased imports.
+   -     import mock as foo, mock as bar, mock
+79 +     from unittest import mock as foo
+80 +     from unittest import mock as bar
+81 +     from unittest import mock
+82 | 
+83 |     # This should yield multiple, aliased imports, and preserve `os`.
+84 |     import mock as foo, mock as bar, mock, os
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:79:38
@@ -506,18 +466,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 81 |     # This should yield multiple, aliased imports, and preserve `os`.
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-76 76 | 
-77 77 | if True:
-78 78 |     # This should yield multiple, aliased imports.
-79    |-    import mock as foo, mock as bar, mock
-   79 |+    from unittest import mock as foo
-   80 |+    from unittest import mock as bar
-   81 |+    from unittest import mock
-80 82 | 
-81 83 |     # This should yield multiple, aliased imports, and preserve `os`.
-82 84 |     import mock as foo, mock as bar, mock, os
+76 | 
+77 | if True:
+78 |     # This should yield multiple, aliased imports.
+   -     import mock as foo, mock as bar, mock
+79 +     from unittest import mock as foo
+80 +     from unittest import mock as bar
+81 +     from unittest import mock
+82 | 
+83 |     # This should yield multiple, aliased imports, and preserve `os`.
+84 |     import mock as foo, mock as bar, mock, os
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:82:12
@@ -529,19 +487,17 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 84 | if True:
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-79 79 |     import mock as foo, mock as bar, mock
-80 80 | 
-81 81 |     # This should yield multiple, aliased imports, and preserve `os`.
-82    |-    import mock as foo, mock as bar, mock, os
-   82 |+    import os
-   83 |+    from unittest import mock as foo
-   84 |+    from unittest import mock as bar
-   85 |+    from unittest import mock
-83 86 | 
-84 87 | if True:
-85 88 |     # This should yield multiple, aliased imports.
+79 |     import mock as foo, mock as bar, mock
+80 | 
+81 |     # This should yield multiple, aliased imports, and preserve `os`.
+   -     import mock as foo, mock as bar, mock, os
+82 +     import os
+83 +     from unittest import mock as foo
+84 +     from unittest import mock as bar
+85 +     from unittest import mock
+86 | 
+87 | if True:
+88 |     # This should yield multiple, aliased imports.
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:82:25
@@ -553,19 +509,17 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 84 | if True:
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-79 79 |     import mock as foo, mock as bar, mock
-80 80 | 
-81 81 |     # This should yield multiple, aliased imports, and preserve `os`.
-82    |-    import mock as foo, mock as bar, mock, os
-   82 |+    import os
-   83 |+    from unittest import mock as foo
-   84 |+    from unittest import mock as bar
-   85 |+    from unittest import mock
-83 86 | 
-84 87 | if True:
-85 88 |     # This should yield multiple, aliased imports.
+79 |     import mock as foo, mock as bar, mock
+80 | 
+81 |     # This should yield multiple, aliased imports, and preserve `os`.
+   -     import mock as foo, mock as bar, mock, os
+82 +     import os
+83 +     from unittest import mock as foo
+84 +     from unittest import mock as bar
+85 +     from unittest import mock
+86 | 
+87 | if True:
+88 |     # This should yield multiple, aliased imports.
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:82:38
@@ -577,19 +531,17 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
 84 | if True:
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-79 79 |     import mock as foo, mock as bar, mock
-80 80 | 
-81 81 |     # This should yield multiple, aliased imports, and preserve `os`.
-82    |-    import mock as foo, mock as bar, mock, os
-   82 |+    import os
-   83 |+    from unittest import mock as foo
-   84 |+    from unittest import mock as bar
-   85 |+    from unittest import mock
-83 86 | 
-84 87 | if True:
-85 88 |     # This should yield multiple, aliased imports.
+79 |     import mock as foo, mock as bar, mock
+80 | 
+81 |     # This should yield multiple, aliased imports, and preserve `os`.
+   -     import mock as foo, mock as bar, mock, os
+82 +     import os
+83 +     from unittest import mock as foo
+84 +     from unittest import mock as bar
+85 +     from unittest import mock
+86 | 
+87 | if True:
+88 |     # This should yield multiple, aliased imports.
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:86:5
@@ -600,18 +552,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Import from `unittest.mock` instead
-
-ℹ Safe fix
-83 83 | 
-84 84 | if True:
-85 85 |     # This should yield multiple, aliased imports.
-86    |-    from mock import mock as foo, mock as bar, mock
-   86 |+    from unittest import mock as foo
-   87 |+    from unittest import mock as bar
-   88 |+    from unittest import mock
-87 89 | 
-88 90 | 
-89 91 | # OK.
+83 | 
+84 | if True:
+85 |     # This should yield multiple, aliased imports.
+   -     from mock import mock as foo, mock as bar, mock
+86 +     from unittest import mock as foo
+87 +     from unittest import mock as bar
+88 +     from unittest import mock
+89 | 
+90 | 
+91 | # OK.
 
 UP026 [*] `mock` is deprecated, use `unittest.mock`
   --> UP026.py:93:5
@@ -621,10 +571,8 @@ UP026 [*] `mock` is deprecated, use `unittest.mock`
    |     ^^^^^^^^^
    |
 help: Replace `mock.mock` with `mock`
-
-ℹ Safe fix
-90 90 | x = mock.Mock()
-91 91 | 
-92 92 | # Error (`mock.Mock()`).
-93    |-x = mock.mock.Mock()
-   93 |+x = mock.Mock()
+90 | x = mock.Mock()
+91 | 
+92 | # Error (`mock.Mock()`).
+   - x = mock.mock.Mock()
+93 + x = mock.Mock()
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap
index 9ff4a063a7..23621bf5a9 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap
@@ -10,15 +10,14 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
   | |_______________^
   |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-1 1 | def f():
-2   |-    for x in y:
-3   |-        yield x
-  2 |+    yield from y
-4 3 | 
-5 4 | 
-6 5 | def g():
+1 | def f():
+  -     for x in y:
+  -         yield x
+2 +     yield from y
+3 | 
+4 | 
+5 | def g():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
  --> UP028_0.py:7:5
@@ -29,17 +28,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
   | |____________________^
   |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | 
-6 6 | def g():
-7   |-    for x, y in z:
-8   |-        yield (x, y)
-  7 |+    yield from z
-9 8 | 
-10 9 | 
-11 10 | def h():
+4  | 
+5  | 
+6  | def g():
+   -     for x, y in z:
+   -         yield (x, y)
+7  +     yield from z
+8  | 
+9  | 
+10 | def h():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:12:5
@@ -50,17 +48,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |_______________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | 
-11 11 | def h():
-12    |-    for x in [1, 2, 3]:
-13    |-        yield x
-   12 |+    yield from [1, 2, 3]
-14 13 | 
-15 14 | 
-16 15 | def i():
+9  | 
+10 | 
+11 | def h():
+   -     for x in [1, 2, 3]:
+   -         yield x
+12 +     yield from [1, 2, 3]
+13 | 
+14 | 
+15 | def i():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:17:5
@@ -71,17 +68,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |_______________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | 
-16 16 | def i():
-17    |-    for x in {x for x in y}:
-18    |-        yield x
-   17 |+    yield from {x for x in y}
-19 18 | 
-20 19 | 
-21 20 | def j():
+14 | 
+15 | 
+16 | def i():
+   -     for x in {x for x in y}:
+   -         yield x
+17 +     yield from {x for x in y}
+18 | 
+19 | 
+20 | def j():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:22:5
@@ -92,17 +88,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |_______________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | 
-21 21 | def j():
-22    |-    for x in (1, 2, 3):
-23    |-        yield x
-   22 |+    yield from (1, 2, 3)
-24 23 | 
-25 24 | 
-26 25 | def k():
+19 | 
+20 | 
+21 | def j():
+   -     for x in (1, 2, 3):
+   -         yield x
+22 +     yield from (1, 2, 3)
+23 | 
+24 | 
+25 | def k():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:27:5
@@ -113,17 +108,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |__________________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | 
-26 26 | def k():
-27    |-    for x, y in {3: "x", 6: "y"}:
-28    |-        yield x, y
-   27 |+    yield from {3: "x", 6: "y"}
-29 28 | 
-30 29 | 
-31 30 | def f():  # Comment one\n'
+24 | 
+25 | 
+26 | def k():
+   -     for x, y in {3: "x", 6: "y"}:
+   -         yield x, y
+27 +     yield from {3: "x", 6: "y"}
+28 | 
+29 | 
+30 | def f():  # Comment one\n'
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:33:5
@@ -141,23 +135,22 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 40 |           # Comment ten',
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | def f():  # Comment one\n'
-32 32 |     # Comment two\n'
-33    |-    for x, y in {  # Comment three\n'
-   33 |+    yield from {  # Comment three\n'
-34 34 |         3: "x",  # Comment four\n'
-35 35 |         # Comment five\n'
-36 36 |         6: "y",  # Comment six\n'
-37    |-    }:  # Comment seven\n'
-38    |-        # Comment eight\n'
-39    |-        yield x, y  # Comment nine\n'
-   37 |+    }  # Comment nine\n'
-40 38 |         # Comment ten',
-41 39 | 
-42 40 | 
+30 | 
+31 | def f():  # Comment one\n'
+32 |     # Comment two\n'
+   -     for x, y in {  # Comment three\n'
+33 +     yield from {  # Comment three\n'
+34 |         3: "x",  # Comment four\n'
+35 |         # Comment five\n'
+36 |         6: "y",  # Comment six\n'
+   -     }:  # Comment seven\n'
+   -         # Comment eight\n'
+   -         yield x, y  # Comment nine\n'
+37 +     }  # Comment nine\n'
+38 |         # Comment ten',
+39 | 
+40 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:44:5
@@ -168,17 +161,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |__________________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | 
-43 43 | def f():
-44    |-    for x, y in [{3: (3, [44, "long ss"]), 6: "y"}]:
-45    |-        yield x, y
-   44 |+    yield from [{3: (3, [44, "long ss"]), 6: "y"}]
-46 45 | 
-47 46 | 
-48 47 | def f():
+41 | 
+42 | 
+43 | def f():
+   -     for x, y in [{3: (3, [44, "long ss"]), 6: "y"}]:
+   -         yield x, y
+44 +     yield from [{3: (3, [44, "long ss"]), 6: "y"}]
+45 | 
+46 | 
+47 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:49:5
@@ -191,17 +183,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 52 |   def f():
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-46 46 | 
-47 47 | 
-48 48 | def f():
-49    |-    for x, y in z():
-50    |-        yield x, y
-   49 |+    yield from z()
-51 50 | 
-52 51 | def f():
-53 52 |     def func():
+46 | 
+47 | 
+48 | def f():
+   -     for x, y in z():
+   -         yield x, y
+49 +     yield from z()
+50 | 
+51 | def f():
+52 |     def func():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:55:9
@@ -216,18 +207,17 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 59 |   # Comment\n'
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-52 52 | def f():
-53 53 |     def func():
-54 54 |         # This comment is preserved\n'
-55    |-        for x, y in z():  # Comment one\n'
-56    |-            # Comment two\n'
-57    |-            yield x, y  # Comment three\n'
-   55 |+        yield from z()  # Comment three\n'
-58 56 |             # Comment four\n'
-59 57 | # Comment\n'
-60 58 | def g():
+52 | def f():
+53 |     def func():
+54 |         # This comment is preserved\n'
+   -         for x, y in z():  # Comment one\n'
+   -             # Comment two\n'
+   -             yield x, y  # Comment three\n'
+55 +         yield from z()  # Comment three\n'
+56 |             # Comment four\n'
+57 | # Comment\n'
+58 | def g():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:67:5
@@ -239,17 +229,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |_______________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-64 64 | def f():
-65 65 |     for x in y:
-66 66 |         yield x
-67    |-    for z in x:
-68    |-        yield z
-   67 |+    yield from x
-69 68 | 
-70 69 | 
-71 70 | def f():
+64 | def f():
+65 |     for x in y:
+66 |         yield x
+   -     for z in x:
+   -         yield z
+67 +     yield from x
+68 | 
+69 | 
+70 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:72:5
@@ -261,17 +250,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 74 |       x = 1
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-69 69 | 
-70 70 | 
-71 71 | def f():
-72    |-    for x, y in z():
-73    |-        yield x, y
-   72 |+    yield from z()
-74 73 |     x = 1
-75 74 | 
-76 75 | 
+69 | 
+70 | 
+71 | def f():
+   -     for x, y in z():
+   -         yield x, y
+72 +     yield from z()
+73 |     x = 1
+74 | 
+75 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
   --> UP028_0.py:79:5
@@ -286,21 +274,20 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
    | |_______________^
    |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | # Regression test for: https://github.com/astral-sh/ruff/issues/7103
-78 78 | def _serve_method(fn):
-79    |-    for h in (
-   79 |+    yield from (
-80 80 |         TaggedText.from_file(args.input)
-81 81 |             .markup(highlight=args.region)
-82    |-    ):
-83    |-        yield h
-   82 |+    )
-84 83 | 
-85 84 | 
-86 85 | # UP028: The later loop variable is not a reference to the earlier loop variable
+76 | 
+77 | # Regression test for: https://github.com/astral-sh/ruff/issues/7103
+78 | def _serve_method(fn):
+   -     for h in (
+79 +     yield from (
+80 |         TaggedText.from_file(args.input)
+81 |             .markup(highlight=args.region)
+   -     ):
+   -         yield h
+82 +     )
+83 | 
+84 | 
+85 | # UP028: The later loop variable is not a reference to the earlier loop variable
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
    --> UP028_0.py:97:5
@@ -314,17 +301,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 100 |       try:
     |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-94 94 | 
-95 95 | # UP028: The exception binding is not a reference to the loop variable
-96 96 | def f():
-97    |-    for x in (1, 2, 3):
-98    |-        yield x
-   97 |+    yield from (1, 2, 3)
-99 98 |     # Shadowing with an `except`
-100 99 |     try:
-101 100 |         pass
+94  | 
+95  | # UP028: The exception binding is not a reference to the loop variable
+96  | def f():
+    -     for x in (1, 2, 3):
+    -         yield x
+97  +     yield from (1, 2, 3)
+98  |     # Shadowing with an `except`
+99  |     try:
+100 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
    --> UP028_0.py:108:5
@@ -338,17 +324,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 111 |       with contextlib.nullcontext() as x:
     |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-105 105 | 
-106 106 | # UP028: The context binding is not a reference to the loop variable
-107 107 | def f():
-108     |-    for x in (1, 2, 3):
-109     |-        yield x
-    108 |+    yield from (1, 2, 3)
-110 109 |     # Shadowing with `with`
-111 110 |     with contextlib.nullcontext() as x:
-112 111 |         pass
+105 | 
+106 | # UP028: The context binding is not a reference to the loop variable
+107 | def f():
+    -     for x in (1, 2, 3):
+    -         yield x
+108 +     yield from (1, 2, 3)
+109 |     # Shadowing with `with`
+110 |     with contextlib.nullcontext() as x:
+111 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
    --> UP028_0.py:118:5
@@ -362,17 +347,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 121 |       x: int
     |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-115 115 | 
-116 116 | # UP028: The type annotation binding is not a reference to the loop variable
-117 117 | def f():
-118     |-    for x in (1, 2, 3):
-119     |-        yield x
-    118 |+    yield from (1, 2, 3)
-120 119 |     # Shadowing with a type annotation
-121 120 |     x: int
-122 121 | 
+115 | 
+116 | # UP028: The type annotation binding is not a reference to the loop variable
+117 | def f():
+    -     for x in (1, 2, 3):
+    -         yield x
+118 +     yield from (1, 2, 3)
+119 |     # Shadowing with a type annotation
+120 |     x: int
+121 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
    --> UP028_0.py:134:5
@@ -386,17 +370,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
 137 |       try:
     |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-131 131 | 
-132 132 | # UP028: The exception bindings are not a reference to the loop variable
-133 133 | def f():
-134     |-    for x in (1, 2, 3):
-135     |-        yield x
-    134 |+    yield from (1, 2, 3)
-136 135 |     # Shadowing with multiple `except` blocks
-137 136 |     try:
-138 137 |         pass
+131 | 
+132 | # UP028: The exception bindings are not a reference to the loop variable
+133 | def f():
+    -     for x in (1, 2, 3):
+    -         yield x
+134 +     yield from (1, 2, 3)
+135 |     # Shadowing with multiple `except` blocks
+136 |     try:
+137 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 [*] Replace `yield` over `for` loop with `yield from`
    --> UP028_0.py:170:5
@@ -408,17 +391,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from`
     | |_______________^
     |
 help: Replace with `yield from`
-
-ℹ Unsafe fix
-167 167 | 
-168 168 | # https://github.com/astral-sh/ruff/issues/15540
-169 169 | def f():
-170     |-    for a in 1,:
-171     |-        yield a
-    170 |+    yield from (1,)
-172 171 | 
-173 172 | 
-174 173 | SOME_GLOBAL = None
+167 | 
+168 | # https://github.com/astral-sh/ruff/issues/15540
+169 | def f():
+    -     for a in 1,:
+    -         yield a
+170 +     yield from (1,)
+171 | 
+172 | 
+173 | SOME_GLOBAL = None
+note: This is an unsafe fix and may change runtime behavior
 
 UP028 Replace `yield` over `for` loop with `yield from`
    --> UP028_0.py:179:5
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029_0.py.snap
similarity index 50%
rename from crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap
rename to crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029_0.py.snap
index 09c5ad548c..841fbed2f6 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029_0.py.snap
@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
 ---
 UP029 [*] Unnecessary builtin import: `*`
- --> UP029.py:1:1
+ --> UP029_0.py:1:1
   |
 1 | from builtins import *
   | ^^^^^^^^^^^^^^^^^^^^^^
@@ -10,15 +10,14 @@ UP029 [*] Unnecessary builtin import: `*`
 3 | from builtins import str as _str
   |
 help: Remove unnecessary builtin import
-
-ℹ Unsafe fix
-1   |-from builtins import *
-2 1 | from builtins import ascii, bytes, compile
-3 2 | from builtins import str as _str
-4 3 | from six.moves import filter, zip, zip_longest
+  - from builtins import *
+1 | from builtins import ascii, bytes, compile
+2 | from builtins import str as _str
+3 | from six.moves import filter, zip, zip_longest
+note: This is an unsafe fix and may change runtime behavior
 
 UP029 [*] Unnecessary builtin imports: `ascii`, `bytes`
- --> UP029.py:2:1
+ --> UP029_0.py:2:1
   |
 1 | from builtins import *
 2 | from builtins import ascii, bytes, compile
@@ -27,17 +26,16 @@ UP029 [*] Unnecessary builtin imports: `ascii`, `bytes`
 4 | from six.moves import filter, zip, zip_longest
   |
 help: Remove unnecessary builtin import
-
-ℹ Unsafe fix
-1 1 | from builtins import *
-2   |-from builtins import ascii, bytes, compile
-  2 |+from builtins import compile
-3 3 | from builtins import str as _str
-4 4 | from six.moves import filter, zip, zip_longest
-5 5 | from io import open
+1 | from builtins import *
+  - from builtins import ascii, bytes, compile
+2 + from builtins import compile
+3 | from builtins import str as _str
+4 | from six.moves import filter, zip, zip_longest
+5 | from io import open
+note: This is an unsafe fix and may change runtime behavior
 
 UP029 [*] Unnecessary builtin imports: `filter`, `zip`
- --> UP029.py:4:1
+ --> UP029_0.py:4:1
   |
 2 | from builtins import ascii, bytes, compile
 3 | from builtins import str as _str
@@ -47,19 +45,18 @@ UP029 [*] Unnecessary builtin imports: `filter`, `zip`
 6 | import io
   |
 help: Remove unnecessary builtin import
-
-ℹ Unsafe fix
-1 1 | from builtins import *
-2 2 | from builtins import ascii, bytes, compile
-3 3 | from builtins import str as _str
-4   |-from six.moves import filter, zip, zip_longest
-  4 |+from six.moves import zip_longest
-5 5 | from io import open
-6 6 | import io
-7 7 | import six
+1 | from builtins import *
+2 | from builtins import ascii, bytes, compile
+3 | from builtins import str as _str
+  - from six.moves import filter, zip, zip_longest
+4 + from six.moves import zip_longest
+5 | from io import open
+6 | import io
+7 | import six
+note: This is an unsafe fix and may change runtime behavior
 
 UP029 [*] Unnecessary builtin import: `open`
- --> UP029.py:5:1
+ --> UP029_0.py:5:1
   |
 3 | from builtins import str as _str
 4 | from six.moves import filter, zip, zip_longest
@@ -69,12 +66,11 @@ UP029 [*] Unnecessary builtin import: `open`
 7 | import six
   |
 help: Remove unnecessary builtin import
-
-ℹ Unsafe fix
-2 2 | from builtins import ascii, bytes, compile
-3 3 | from builtins import str as _str
-4 4 | from six.moves import filter, zip, zip_longest
-5   |-from io import open
-6 5 | import io
-7 6 | import six
-8 7 | import six.moves
+2 | from builtins import ascii, bytes, compile
+3 | from builtins import str as _str
+4 | from six.moves import filter, zip, zip_longest
+  - from io import open
+5 | import io
+6 | import six
+7 | import six.moves
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029_1.py_skip_required_imports.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029_1.py_skip_required_imports.snap
new file mode 100644
index 0000000000..9b5a2b1f24
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029_1.py_skip_required_imports.snap
@@ -0,0 +1,13 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+UP029 [*] Unnecessary builtin import: `int`
+ --> UP029_1.py:1:1
+  |
+1 | from builtins import str, int
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+help: Remove unnecessary builtin import
+  - from builtins import str, int
+1 + from builtins import str
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap
index f24c483f25..101fb07ce7 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap
@@ -12,15 +12,14 @@ UP030 [*] Use implicit references for positional format fields
 5 | "a {3} complicated {1} string with {0} {2}".format(
   |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-1 1 | # Invalid calls; errors expected.
-2 2 | 
-3   |-"{0}" "{1}" "{2}".format(1, 2, 3)
-  3 |+"{}" "{}" "{}".format(1, 2, 3)
-4 4 | 
-5 5 | "a {3} complicated {1} string with {0} {2}".format(
-6 6 |     "first", "second", "third", "fourth"
+1 | # Invalid calls; errors expected.
+2 | 
+  - "{0}" "{1}" "{2}".format(1, 2, 3)
+3 + "{}" "{}" "{}".format(1, 2, 3)
+4 | 
+5 | "a {3} complicated {1} string with {0} {2}".format(
+6 |     "first", "second", "third", "fourth"
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
  --> UP030_0.py:5:1
@@ -35,18 +34,17 @@ UP030 [*] Use implicit references for positional format fields
 9 |   '{0}'.format(1)
   |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | "{0}" "{1}" "{2}".format(1, 2, 3)
-4 4 | 
-5   |-"a {3} complicated {1} string with {0} {2}".format(
-6   |-    "first", "second", "third", "fourth"
-  5 |+"a {} complicated {} string with {} {}".format(
-  6 |+    "fourth", "second", "first", "third"
-7 7 | )
-8 8 | 
-9 9 | '{0}'.format(1)
+2 | 
+3 | "{0}" "{1}" "{2}".format(1, 2, 3)
+4 | 
+  - "a {3} complicated {1} string with {0} {2}".format(
+  -     "first", "second", "third", "fourth"
+5 + "a {} complicated {} string with {} {}".format(
+6 +     "fourth", "second", "first", "third"
+7 | )
+8 | 
+9 | '{0}'.format(1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:9:1
@@ -59,16 +57,15 @@ UP030 [*] Use implicit references for positional format fields
 11 | '{0:x}'.format(30)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-6  6  |     "first", "second", "third", "fourth"
-7  7  | )
-8  8  | 
-9     |-'{0}'.format(1)
-   9  |+'{}'.format(1)
-10 10 | 
-11 11 | '{0:x}'.format(30)
-12 12 | 
+6  |     "first", "second", "third", "fourth"
+7  | )
+8  | 
+   - '{0}'.format(1)
+9  + '{}'.format(1)
+10 | 
+11 | '{0:x}'.format(30)
+12 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:11:1
@@ -81,16 +78,15 @@ UP030 [*] Use implicit references for positional format fields
 13 | x = '{0}'.format(1)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | '{0}'.format(1)
-10 10 | 
-11    |-'{0:x}'.format(30)
-   11 |+'{:x}'.format(30)
-12 12 | 
-13 13 | x = '{0}'.format(1)
-14 14 | 
+8  | 
+9  | '{0}'.format(1)
+10 | 
+   - '{0:x}'.format(30)
+11 + '{:x}'.format(30)
+12 | 
+13 | x = '{0}'.format(1)
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:13:5
@@ -103,16 +99,15 @@ UP030 [*] Use implicit references for positional format fields
 15 | '''{0}\n{1}\n'''.format(1, 2)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-10 10 | 
-11 11 | '{0:x}'.format(30)
-12 12 | 
-13    |-x = '{0}'.format(1)
-   13 |+x = '{}'.format(1)
-14 14 | 
-15 15 | '''{0}\n{1}\n'''.format(1, 2)
-16 16 | 
+10 | 
+11 | '{0:x}'.format(30)
+12 | 
+   - x = '{0}'.format(1)
+13 + x = '{}'.format(1)
+14 | 
+15 | '''{0}\n{1}\n'''.format(1, 2)
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:15:1
@@ -125,16 +120,15 @@ UP030 [*] Use implicit references for positional format fields
 17 | x = "foo {0}" \
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | x = '{0}'.format(1)
-14 14 | 
-15    |-'''{0}\n{1}\n'''.format(1, 2)
-   15 |+'''{}\n{}\n'''.format(1, 2)
-16 16 | 
-17 17 | x = "foo {0}" \
-18 18 |     "bar {1}".format(1, 2)
+12 | 
+13 | x = '{0}'.format(1)
+14 | 
+   - '''{0}\n{1}\n'''.format(1, 2)
+15 + '''{}\n{}\n'''.format(1, 2)
+16 | 
+17 | x = "foo {0}" \
+18 |     "bar {1}".format(1, 2)
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:17:5
@@ -149,18 +143,17 @@ UP030 [*] Use implicit references for positional format fields
 20 |   ("{0}").format(1)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | '''{0}\n{1}\n'''.format(1, 2)
-16 16 | 
-17    |-x = "foo {0}" \
-18    |-    "bar {1}".format(1, 2)
-   17 |+x = "foo {}" \
-   18 |+    "bar {}".format(1, 2)
-19 19 | 
-20 20 | ("{0}").format(1)
-21 21 | 
+14 | 
+15 | '''{0}\n{1}\n'''.format(1, 2)
+16 | 
+   - x = "foo {0}" \
+   -     "bar {1}".format(1, 2)
+17 + x = "foo {}" \
+18 +     "bar {}".format(1, 2)
+19 | 
+20 | ("{0}").format(1)
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:20:1
@@ -173,16 +166,15 @@ UP030 [*] Use implicit references for positional format fields
 22 | "\N{snowman} {0}".format(1)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-17 17 | x = "foo {0}" \
-18 18 |     "bar {1}".format(1, 2)
-19 19 | 
-20    |-("{0}").format(1)
-   20 |+("{}").format(1)
-21 21 | 
-22 22 | "\N{snowman} {0}".format(1)
-23 23 | 
+17 | x = "foo {0}" \
+18 |     "bar {1}".format(1, 2)
+19 | 
+   - ("{0}").format(1)
+20 + ("{}").format(1)
+21 | 
+22 | "\N{snowman} {0}".format(1)
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:22:1
@@ -195,16 +187,15 @@ UP030 [*] Use implicit references for positional format fields
 24 | print(
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | ("{0}").format(1)
-21 21 | 
-22    |-"\N{snowman} {0}".format(1)
-   22 |+"\N{snowman} {}".format(1)
-23 23 | 
-24 24 | print(
-25 25 |     'foo{0}'
+19 | 
+20 | ("{0}").format(1)
+21 | 
+   - "\N{snowman} {0}".format(1)
+22 + "\N{snowman} {}".format(1)
+23 | 
+24 | print(
+25 |     'foo{0}'
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:25:5
@@ -216,18 +207,17 @@ UP030 [*] Use implicit references for positional format fields
 27 |   )
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-22 22 | "\N{snowman} {0}".format(1)
-23 23 | 
-24 24 | print(
-25    |-    'foo{0}'
-26    |-    'bar{1}'.format(1, 2)
-   25 |+    'foo{}'
-   26 |+    'bar{}'.format(1, 2)
-27 27 | )
-28 28 | 
-29 29 | print(
+22 | "\N{snowman} {0}".format(1)
+23 | 
+24 | print(
+   -     'foo{0}'
+   -     'bar{1}'.format(1, 2)
+25 +     'foo{}'
+26 +     'bar{}'.format(1, 2)
+27 | )
+28 | 
+29 | print(
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:30:5
@@ -239,18 +229,17 @@ UP030 [*] Use implicit references for positional format fields
 32 |   )
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-27 27 | )
-28 28 | 
-29 29 | print(
-30    |-    'foo{0}'  # ohai\n"
-31    |-    'bar{1}'.format(1, 2)
-   30 |+    'foo{}'  # ohai\n"
-   31 |+    'bar{}'.format(1, 2)
-32 32 | )
-33 33 | 
-34 34 | '{' '0}'.format(1)
+27 | )
+28 | 
+29 | print(
+   -     'foo{0}'  # ohai\n"
+   -     'bar{1}'.format(1, 2)
+30 +     'foo{}'  # ohai\n"
+31 +     'bar{}'.format(1, 2)
+32 | )
+33 | 
+34 | '{' '0}'.format(1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 Use implicit references for positional format fields
   --> UP030_0.py:34:1
@@ -275,16 +264,15 @@ UP030 [*] Use implicit references for positional format fields
 41 | "{0}".format(**kwargs)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-36 36 | args = list(range(10))
-37 37 | kwargs = {x: x for x in range(10)}
-38 38 | 
-39    |-"{0}".format(*args)
-   39 |+"{}".format(*args)
-40 40 | 
-41 41 | "{0}".format(**kwargs)
-42 42 | 
+36 | args = list(range(10))
+37 | kwargs = {x: x for x in range(10)}
+38 | 
+   - "{0}".format(*args)
+39 + "{}".format(*args)
+40 | 
+41 | "{0}".format(**kwargs)
+42 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:41:1
@@ -297,16 +285,15 @@ UP030 [*] Use implicit references for positional format fields
 43 | "{0}_{1}".format(*args)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-38 38 | 
-39 39 | "{0}".format(*args)
-40 40 | 
-41    |-"{0}".format(**kwargs)
-   41 |+"{}".format(**kwargs)
-42 42 | 
-43 43 | "{0}_{1}".format(*args)
-44 44 | 
+38 | 
+39 | "{0}".format(*args)
+40 | 
+   - "{0}".format(**kwargs)
+41 + "{}".format(**kwargs)
+42 | 
+43 | "{0}_{1}".format(*args)
+44 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:43:1
@@ -319,16 +306,15 @@ UP030 [*] Use implicit references for positional format fields
 45 | "{0}_{1}".format(1, *args)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-40 40 | 
-41 41 | "{0}".format(**kwargs)
-42 42 | 
-43    |-"{0}_{1}".format(*args)
-   43 |+"{}_{}".format(*args)
-44 44 | 
-45 45 | "{0}_{1}".format(1, *args)
-46 46 | 
+40 | 
+41 | "{0}".format(**kwargs)
+42 | 
+   - "{0}_{1}".format(*args)
+43 + "{}_{}".format(*args)
+44 | 
+45 | "{0}_{1}".format(1, *args)
+46 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:45:1
@@ -341,16 +327,15 @@ UP030 [*] Use implicit references for positional format fields
 47 | "{0}_{1}".format(1, 2, *args)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | "{0}_{1}".format(*args)
-44 44 | 
-45    |-"{0}_{1}".format(1, *args)
-   45 |+"{}_{}".format(1, *args)
-46 46 | 
-47 47 | "{0}_{1}".format(1, 2, *args)
-48 48 | 
+42 | 
+43 | "{0}_{1}".format(*args)
+44 | 
+   - "{0}_{1}".format(1, *args)
+45 + "{}_{}".format(1, *args)
+46 | 
+47 | "{0}_{1}".format(1, 2, *args)
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:47:1
@@ -363,16 +348,15 @@ UP030 [*] Use implicit references for positional format fields
 49 | "{0}_{1}".format(*args, 1, 2)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-44 44 | 
-45 45 | "{0}_{1}".format(1, *args)
-46 46 | 
-47    |-"{0}_{1}".format(1, 2, *args)
-   47 |+"{}_{}".format(1, 2, *args)
-48 48 | 
-49 49 | "{0}_{1}".format(*args, 1, 2)
-50 50 | 
+44 | 
+45 | "{0}_{1}".format(1, *args)
+46 | 
+   - "{0}_{1}".format(1, 2, *args)
+47 + "{}_{}".format(1, 2, *args)
+48 | 
+49 | "{0}_{1}".format(*args, 1, 2)
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:49:1
@@ -385,16 +369,15 @@ UP030 [*] Use implicit references for positional format fields
 51 | "{0}_{1}_{2}".format(1, **kwargs)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-46 46 | 
-47 47 | "{0}_{1}".format(1, 2, *args)
-48 48 | 
-49    |-"{0}_{1}".format(*args, 1, 2)
-   49 |+"{}_{}".format(*args, 1, 2)
-50 50 | 
-51 51 | "{0}_{1}_{2}".format(1, **kwargs)
-52 52 | 
+46 | 
+47 | "{0}_{1}".format(1, 2, *args)
+48 | 
+   - "{0}_{1}".format(*args, 1, 2)
+49 + "{}_{}".format(*args, 1, 2)
+50 | 
+51 | "{0}_{1}_{2}".format(1, **kwargs)
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:51:1
@@ -407,16 +390,15 @@ UP030 [*] Use implicit references for positional format fields
 53 | "{0}_{1}_{2}".format(1, 2, **kwargs)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-48 48 | 
-49 49 | "{0}_{1}".format(*args, 1, 2)
-50 50 | 
-51    |-"{0}_{1}_{2}".format(1, **kwargs)
-   51 |+"{}_{}_{}".format(1, **kwargs)
-52 52 | 
-53 53 | "{0}_{1}_{2}".format(1, 2, **kwargs)
-54 54 | 
+48 | 
+49 | "{0}_{1}".format(*args, 1, 2)
+50 | 
+   - "{0}_{1}_{2}".format(1, **kwargs)
+51 + "{}_{}_{}".format(1, **kwargs)
+52 | 
+53 | "{0}_{1}_{2}".format(1, 2, **kwargs)
+54 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:53:1
@@ -429,16 +411,15 @@ UP030 [*] Use implicit references for positional format fields
 55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-50 50 | 
-51 51 | "{0}_{1}_{2}".format(1, **kwargs)
-52 52 | 
-53    |-"{0}_{1}_{2}".format(1, 2, **kwargs)
-   53 |+"{}_{}_{}".format(1, 2, **kwargs)
-54 54 | 
-55 55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs)
-56 56 | 
+50 | 
+51 | "{0}_{1}_{2}".format(1, **kwargs)
+52 | 
+   - "{0}_{1}_{2}".format(1, 2, **kwargs)
+53 + "{}_{}_{}".format(1, 2, **kwargs)
+54 | 
+55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs)
+56 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:55:1
@@ -451,16 +432,15 @@ UP030 [*] Use implicit references for positional format fields
 57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-52 52 | 
-53 53 | "{0}_{1}_{2}".format(1, 2, **kwargs)
-54 54 | 
-55    |-"{0}_{1}_{2}".format(1, 2, 3, **kwargs)
-   55 |+"{}_{}_{}".format(1, 2, 3, **kwargs)
-56 56 | 
-57 57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
-58 58 | 
+52 | 
+53 | "{0}_{1}_{2}".format(1, 2, **kwargs)
+54 | 
+   - "{0}_{1}_{2}".format(1, 2, 3, **kwargs)
+55 + "{}_{}_{}".format(1, 2, 3, **kwargs)
+56 | 
+57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
+58 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:57:1
@@ -473,16 +453,15 @@ UP030 [*] Use implicit references for positional format fields
 59 | "{1}_{0}".format(1, 2, *args)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs)
-56 56 | 
-57    |-"{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
-   57 |+"{}_{}_{}".format(1, 2, 3, *args, **kwargs)
-58 58 | 
-59 59 | "{1}_{0}".format(1, 2, *args)
-60 60 | 
+54 | 
+55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs)
+56 | 
+   - "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
+57 + "{}_{}_{}".format(1, 2, 3, *args, **kwargs)
+58 | 
+59 | "{1}_{0}".format(1, 2, *args)
+60 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:59:1
@@ -495,16 +474,15 @@ UP030 [*] Use implicit references for positional format fields
 61 | "{1}_{0}".format(1, 2)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-56 56 | 
-57 57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
-58 58 | 
-59    |-"{1}_{0}".format(1, 2, *args)
-   59 |+"{}_{}".format(2, 1, )
-60 60 | 
-61 61 | "{1}_{0}".format(1, 2)
-62 62 | 
+56 | 
+57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
+58 | 
+   - "{1}_{0}".format(1, 2, *args)
+59 + "{}_{}".format(2, 1, )
+60 | 
+61 | "{1}_{0}".format(1, 2)
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:61:1
@@ -517,16 +495,15 @@ UP030 [*] Use implicit references for positional format fields
 63 | r"\d{{1,2}} {0}".format(42)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-58 58 | 
-59 59 | "{1}_{0}".format(1, 2, *args)
-60 60 | 
-61    |-"{1}_{0}".format(1, 2)
-   61 |+"{}_{}".format(2, 1)
-62 62 | 
-63 63 | r"\d{{1,2}} {0}".format(42)
-64 64 | 
+58 | 
+59 | "{1}_{0}".format(1, 2, *args)
+60 | 
+   - "{1}_{0}".format(1, 2)
+61 + "{}_{}".format(2, 1)
+62 | 
+63 | r"\d{{1,2}} {0}".format(42)
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:63:1
@@ -539,15 +516,14 @@ UP030 [*] Use implicit references for positional format fields
 65 | "{{{0}}}".format(123)
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-60 60 | 
-61 61 | "{1}_{0}".format(1, 2)
-62 62 | 
-63    |-r"\d{{1,2}} {0}".format(42)
-   63 |+r"\d{{1,2}} {}".format(42)
-64 64 | 
-65 65 | "{{{0}}}".format(123)
+60 | 
+61 | "{1}_{0}".format(1, 2)
+62 | 
+   - r"\d{{1,2}} {0}".format(42)
+63 + r"\d{{1,2}} {}".format(42)
+64 | 
+65 | "{{{0}}}".format(123)
+note: This is an unsafe fix and may change runtime behavior
 
 UP030 [*] Use implicit references for positional format fields
   --> UP030_0.py:65:1
@@ -558,10 +534,9 @@ UP030 [*] Use implicit references for positional format fields
    | ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove explicit positional indices
-
-ℹ Unsafe fix
-62 62 | 
-63 63 | r"\d{{1,2}} {0}".format(42)
-64 64 | 
-65    |-"{{{0}}}".format(123)
-   65 |+"{{{}}}".format(123)
+62 | 
+63 | r"\d{{1,2}} {0}".format(42)
+64 | 
+   - "{{{0}}}".format(123)
+65 + "{{{}}}".format(123)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap
index f298074e37..4dc65c4808 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap
@@ -11,16 +11,15 @@ UP031 [*] Use format specifiers instead of percent format
 6 | print('%s%s' % (a, b))
   |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-1 1 | a, b, x, y = 1, 2, 3, 4
-2 2 | 
-3 3 | # UP031
-4   |-print('%s %s' % (a, b))
-  4 |+print('{} {}'.format(a, b))
-5 5 | 
-6 6 | print('%s%s' % (a, b))
-7 7 | 
+1 | a, b, x, y = 1, 2, 3, 4
+2 | 
+3 | # UP031
+  - print('%s %s' % (a, b))
+4 + print('{} {}'.format(a, b))
+5 | 
+6 | print('%s%s' % (a, b))
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
  --> UP031_0.py:6:7
@@ -33,16 +32,15 @@ UP031 [*] Use format specifiers instead of percent format
 8 | print("trivial" % ())
   |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-3 3 | # UP031
-4 4 | print('%s %s' % (a, b))
-5 5 | 
-6   |-print('%s%s' % (a, b))
-  6 |+print('{}{}'.format(a, b))
-7 7 | 
-8 8 | print("trivial" % ())
-9 9 | 
+3 | # UP031
+4 | print('%s %s' % (a, b))
+5 | 
+  - print('%s%s' % (a, b))
+6 + print('{}{}'.format(a, b))
+7 | 
+8 | print("trivial" % ())
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:8:7
@@ -55,16 +53,15 @@ UP031 [*] Use format specifiers instead of percent format
 10 | print("%s" % ("simple",))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | print('%s%s' % (a, b))
-7 7 | 
-8   |-print("trivial" % ())
-  8 |+print("trivial".format())
-9 9 | 
-10 10 | print("%s" % ("simple",))
-11 11 | 
+5  | 
+6  | print('%s%s' % (a, b))
+7  | 
+   - print("trivial" % ())
+8  + print("trivial".format())
+9  | 
+10 | print("%s" % ("simple",))
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:10:7
@@ -77,16 +74,15 @@ UP031 [*] Use format specifiers instead of percent format
 12 | print("%s" % ("%s" % ("nested",),))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | print("trivial" % ())
-9  9  | 
-10    |-print("%s" % ("simple",))
-   10 |+print("{}".format("simple"))
-11 11 | 
-12 12 | print("%s" % ("%s" % ("nested",),))
-13 13 | 
+7  | 
+8  | print("trivial" % ())
+9  | 
+   - print("%s" % ("simple",))
+10 + print("{}".format("simple"))
+11 | 
+12 | print("%s" % ("%s" % ("nested",),))
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:12:7
@@ -99,16 +95,15 @@ UP031 [*] Use format specifiers instead of percent format
 14 | print("%s%% percent" % (15,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | print("%s" % ("simple",))
-11 11 | 
-12    |-print("%s" % ("%s" % ("nested",),))
-   12 |+print("{}".format("%s" % ("nested",)))
-13 13 | 
-14 14 | print("%s%% percent" % (15,))
-15 15 | 
+9  | 
+10 | print("%s" % ("simple",))
+11 | 
+   - print("%s" % ("%s" % ("nested",),))
+12 + print("{}".format("%s" % ("nested",)))
+13 | 
+14 | print("%s%% percent" % (15,))
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:12:15
@@ -121,16 +116,15 @@ UP031 [*] Use format specifiers instead of percent format
 14 | print("%s%% percent" % (15,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | print("%s" % ("simple",))
-11 11 | 
-12    |-print("%s" % ("%s" % ("nested",),))
-   12 |+print("%s" % ("{}".format("nested"),))
-13 13 | 
-14 14 | print("%s%% percent" % (15,))
-15 15 | 
+9  | 
+10 | print("%s" % ("simple",))
+11 | 
+   - print("%s" % ("%s" % ("nested",),))
+12 + print("%s" % ("{}".format("nested"),))
+13 | 
+14 | print("%s%% percent" % (15,))
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:14:7
@@ -143,16 +137,15 @@ UP031 [*] Use format specifiers instead of percent format
 16 | print("%f" % (15,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | print("%s" % ("%s" % ("nested",),))
-13 13 | 
-14    |-print("%s%% percent" % (15,))
-   14 |+print("{}% percent".format(15))
-15 15 | 
-16 16 | print("%f" % (15,))
-17 17 | 
+11 | 
+12 | print("%s" % ("%s" % ("nested",),))
+13 | 
+   - print("%s%% percent" % (15,))
+14 + print("{}% percent".format(15))
+15 | 
+16 | print("%f" % (15,))
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:16:7
@@ -165,16 +158,15 @@ UP031 [*] Use format specifiers instead of percent format
 18 | print("%.f" % (15,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | print("%s%% percent" % (15,))
-15 15 | 
-16    |-print("%f" % (15,))
-   16 |+print("{:f}".format(15))
-17 17 | 
-18 18 | print("%.f" % (15,))
-19 19 | 
+13 | 
+14 | print("%s%% percent" % (15,))
+15 | 
+   - print("%f" % (15,))
+16 + print("{:f}".format(15))
+17 | 
+18 | print("%.f" % (15,))
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:18:7
@@ -187,16 +179,15 @@ UP031 [*] Use format specifiers instead of percent format
 20 | print("%.3f" % (15,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | print("%f" % (15,))
-17 17 | 
-18    |-print("%.f" % (15,))
-   18 |+print("{:.0f}".format(15))
-19 19 | 
-20 20 | print("%.3f" % (15,))
-21 21 | 
+15 | 
+16 | print("%f" % (15,))
+17 | 
+   - print("%.f" % (15,))
+18 + print("{:.0f}".format(15))
+19 | 
+20 | print("%.3f" % (15,))
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:20:7
@@ -209,16 +200,15 @@ UP031 [*] Use format specifiers instead of percent format
 22 | print("%3f" % (15,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | print("%.f" % (15,))
-19 19 | 
-20    |-print("%.3f" % (15,))
-   20 |+print("{:.3f}".format(15))
-21 21 | 
-22 22 | print("%3f" % (15,))
-23 23 | 
+17 | 
+18 | print("%.f" % (15,))
+19 | 
+   - print("%.3f" % (15,))
+20 + print("{:.3f}".format(15))
+21 | 
+22 | print("%3f" % (15,))
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:22:7
@@ -231,16 +221,15 @@ UP031 [*] Use format specifiers instead of percent format
 24 | print("%-5f" % (5,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | print("%.3f" % (15,))
-21 21 | 
-22    |-print("%3f" % (15,))
-   22 |+print("{:3f}".format(15))
-23 23 | 
-24 24 | print("%-5f" % (5,))
-25 25 | 
+19 | 
+20 | print("%.3f" % (15,))
+21 | 
+   - print("%3f" % (15,))
+22 + print("{:3f}".format(15))
+23 | 
+24 | print("%-5f" % (5,))
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:24:7
@@ -253,16 +242,15 @@ UP031 [*] Use format specifiers instead of percent format
 26 | print("%9f" % (5,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | print("%3f" % (15,))
-23 23 | 
-24    |-print("%-5f" % (5,))
-   24 |+print("{:<5f}".format(5))
-25 25 | 
-26 26 | print("%9f" % (5,))
-27 27 | 
+21 | 
+22 | print("%3f" % (15,))
+23 | 
+   - print("%-5f" % (5,))
+24 + print("{:<5f}".format(5))
+25 | 
+26 | print("%9f" % (5,))
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:26:7
@@ -275,16 +263,15 @@ UP031 [*] Use format specifiers instead of percent format
 28 | print("%#o" % (123,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | print("%-5f" % (5,))
-25 25 | 
-26    |-print("%9f" % (5,))
-   26 |+print("{:9f}".format(5))
-27 27 | 
-28 28 | print("%#o" % (123,))
-29 29 | 
+23 | 
+24 | print("%-5f" % (5,))
+25 | 
+   - print("%9f" % (5,))
+26 + print("{:9f}".format(5))
+27 | 
+28 | print("%#o" % (123,))
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:28:7
@@ -297,16 +284,15 @@ UP031 [*] Use format specifiers instead of percent format
 30 | print("brace {} %s" % (1,))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-25 25 | 
-26 26 | print("%9f" % (5,))
-27 27 | 
-28    |-print("%#o" % (123,))
-   28 |+print("{:#o}".format(123))
-29 29 | 
-30 30 | print("brace {} %s" % (1,))
-31 31 | 
+25 | 
+26 | print("%9f" % (5,))
+27 | 
+   - print("%#o" % (123,))
+28 + print("{:#o}".format(123))
+29 | 
+30 | print("brace {} %s" % (1,))
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:30:7
@@ -319,16 +305,15 @@ UP031 [*] Use format specifiers instead of percent format
 32 | print((
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-27 27 | 
-28 28 | print("%#o" % (123,))
-29 29 | 
-30    |-print("brace {} %s" % (1,))
-   30 |+print("brace {{}} {}".format(1))
-31 31 | 
-32 32 | print((
-33 33 |     "foo %s "
+27 | 
+28 | print("%#o" % (123,))
+29 | 
+   - print("brace {} %s" % (1,))
+30 + print("brace {{}} {}".format(1))
+31 | 
+32 | print((
+33 |     "foo %s "
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:33:5
@@ -340,18 +325,17 @@ UP031 [*] Use format specifiers instead of percent format
 35 |   ))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-30 30 | print("brace {} %s" % (1,))
-31 31 | 
-32 32 | print((
-33    |-    "foo %s "
-34    |-    "bar %s" % (x, y)
-   33 |+    "foo {} "
-   34 |+    "bar {}".format(x, y)
-35 35 | ))
-36 36 | 
-37 37 | print(
+30 | print("brace {} %s" % (1,))
+31 | 
+32 | print((
+   -     "foo %s "
+   -     "bar %s" % (x, y)
+33 +     "foo {} "
+34 +     "bar {}".format(x, y)
+35 | ))
+36 | 
+37 | print(
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:38:3
@@ -364,16 +348,15 @@ UP031 [*] Use format specifiers instead of percent format
 41 |   )
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-35 35 | ))
-36 36 | 
-37 37 | print(
-38    |-  "%s" % (
-   38 |+  "{}".format(
-39 39 |     "trailing comma",
-40 40 |         )
-41 41 | )
+35 | ))
+36 | 
+37 | print(
+   -   "%s" % (
+38 +   "{}".format(
+39 |     "trailing comma",
+40 |         )
+41 | )
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:43:7
@@ -386,16 +369,15 @@ UP031 [*] Use format specifiers instead of percent format
 45 | print("%(k)s" % {"k": "v"})
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-40 40 |         )
-41 41 | )
-42 42 | 
-43    |-print("foo %s " % (x,))
-   43 |+print("foo {} ".format(x))
-44 44 | 
-45 45 | print("%(k)s" % {"k": "v"})
-46 46 | 
+40 |         )
+41 | )
+42 | 
+   - print("foo %s " % (x,))
+43 + print("foo {} ".format(x))
+44 | 
+45 | print("%(k)s" % {"k": "v"})
+46 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:45:7
@@ -408,16 +390,15 @@ UP031 [*] Use format specifiers instead of percent format
 47 | print("%(k)s" % {
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | print("foo %s " % (x,))
-44 44 | 
-45    |-print("%(k)s" % {"k": "v"})
-   45 |+print("{k}".format(k="v"))
-46 46 | 
-47 47 | print("%(k)s" % {
-48 48 |     "k": "v",
+42 | 
+43 | print("foo %s " % (x,))
+44 | 
+   - print("%(k)s" % {"k": "v"})
+45 + print("{k}".format(k="v"))
+46 | 
+47 | print("%(k)s" % {
+48 |     "k": "v",
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:47:7
@@ -434,22 +415,21 @@ UP031 [*] Use format specifiers instead of percent format
 52 |   print("%(to_list)s" % {"to_list": []})
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-44 44 | 
-45 45 | print("%(k)s" % {"k": "v"})
-46 46 | 
-47    |-print("%(k)s" % {
-48    |-    "k": "v",
-49    |-    "i": "j"
-50    |-})
-   47 |+print("{k}".format(
-   48 |+    k="v",
-   49 |+    i="j",
-   50 |+))
-51 51 | 
-52 52 | print("%(to_list)s" % {"to_list": []})
-53 53 | 
+44 | 
+45 | print("%(k)s" % {"k": "v"})
+46 | 
+   - print("%(k)s" % {
+   -     "k": "v",
+   -     "i": "j"
+   - })
+47 + print("{k}".format(
+48 +     k="v",
+49 +     i="j",
+50 + ))
+51 | 
+52 | print("%(to_list)s" % {"to_list": []})
+53 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:52:7
@@ -462,16 +442,15 @@ UP031 [*] Use format specifiers instead of percent format
 54 | print("%(k)s" % {"k": "v", "i": 1, "j": []})
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-49 49 |     "i": "j"
-50 50 | })
-51 51 | 
-52    |-print("%(to_list)s" % {"to_list": []})
-   52 |+print("{to_list}".format(to_list=[]))
-53 53 | 
-54 54 | print("%(k)s" % {"k": "v", "i": 1, "j": []})
-55 55 | 
+49 |     "i": "j"
+50 | })
+51 | 
+   - print("%(to_list)s" % {"to_list": []})
+52 + print("{to_list}".format(to_list=[]))
+53 | 
+54 | print("%(k)s" % {"k": "v", "i": 1, "j": []})
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:54:7
@@ -484,16 +463,15 @@ UP031 [*] Use format specifiers instead of percent format
 56 | print("%(ab)s" % {"a" "b": 1})
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-51 51 | 
-52 52 | print("%(to_list)s" % {"to_list": []})
-53 53 | 
-54    |-print("%(k)s" % {"k": "v", "i": 1, "j": []})
-   54 |+print("{k}".format(k="v", i=1, j=[]))
-55 55 | 
-56 56 | print("%(ab)s" % {"a" "b": 1})
-57 57 | 
+51 | 
+52 | print("%(to_list)s" % {"to_list": []})
+53 | 
+   - print("%(k)s" % {"k": "v", "i": 1, "j": []})
+54 + print("{k}".format(k="v", i=1, j=[]))
+55 | 
+56 | print("%(ab)s" % {"a" "b": 1})
+57 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:56:7
@@ -506,16 +484,15 @@ UP031 [*] Use format specifiers instead of percent format
 58 | print("%(a)s" % {"a"  :  1})
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-53 53 | 
-54 54 | print("%(k)s" % {"k": "v", "i": 1, "j": []})
-55 55 | 
-56    |-print("%(ab)s" % {"a" "b": 1})
-   56 |+print("{ab}".format(ab=1))
-57 57 | 
-58 58 | print("%(a)s" % {"a"  :  1})
-59 59 | 
+53 | 
+54 | print("%(k)s" % {"k": "v", "i": 1, "j": []})
+55 | 
+   - print("%(ab)s" % {"a" "b": 1})
+56 + print("{ab}".format(ab=1))
+57 | 
+58 | print("%(a)s" % {"a"  :  1})
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:58:7
@@ -526,16 +503,15 @@ UP031 [*] Use format specifiers instead of percent format
    |       ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-55 55 | 
-56 56 | print("%(ab)s" % {"a" "b": 1})
-57 57 | 
-58    |-print("%(a)s" % {"a"  :  1})
-   58 |+print("{a}".format(a=1))
-59 59 | 
-60 60 | 
-61 61 | print(
+55 | 
+56 | print("%(ab)s" % {"a" "b": 1})
+57 | 
+   - print("%(a)s" % {"a"  :  1})
+58 + print("{a}".format(a=1))
+59 | 
+60 | 
+61 | print(
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:62:5
@@ -547,18 +523,17 @@ UP031 [*] Use format specifiers instead of percent format
 64 |   )
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | 
-61 61 | print(
-62    |-    "foo %(foo)s "
-63    |-    "bar %(bar)s" % {"foo": x, "bar": y}
-   62 |+    "foo {foo} "
-   63 |+    "bar {bar}".format(foo=x, bar=y)
-64 64 | )
-65 65 | 
-66 66 | bar = {"bar": y}
+59 | 
+60 | 
+61 | print(
+   -     "foo %(foo)s "
+   -     "bar %(bar)s" % {"foo": x, "bar": y}
+62 +     "foo {foo} "
+63 +     "bar {bar}".format(foo=x, bar=y)
+64 | )
+65 | 
+66 | bar = {"bar": y}
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:68:5
@@ -571,18 +546,17 @@ UP031 [*] Use format specifiers instead of percent format
 70 |   )
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-65 65 | 
-66 66 | bar = {"bar": y}
-67 67 | print(
-68    |-    "foo %(foo)s "
-69    |-    "bar %(bar)s" % {"foo": x, **bar}
-   68 |+    "foo {foo} "
-   69 |+    "bar {bar}".format(foo=x, **bar)
-70 70 | )
-71 71 | 
-72 72 | print("%s \N{snowman}" % (a,))
+65 | 
+66 | bar = {"bar": y}
+67 | print(
+   -     "foo %(foo)s "
+   -     "bar %(bar)s" % {"foo": x, **bar}
+68 +     "foo {foo} "
+69 +     "bar {bar}".format(foo=x, **bar)
+70 | )
+71 | 
+72 | print("%s \N{snowman}" % (a,))
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:72:7
@@ -595,16 +569,15 @@ UP031 [*] Use format specifiers instead of percent format
 74 | print("%(foo)s \N{snowman}" % {"foo": 1})
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-69 69 |     "bar %(bar)s" % {"foo": x, **bar}
-70 70 | )
-71 71 | 
-72    |-print("%s \N{snowman}" % (a,))
-   72 |+print("{} \N{snowman}".format(a))
-73 73 | 
-74 74 | print("%(foo)s \N{snowman}" % {"foo": 1})
-75 75 | 
+69 |     "bar %(bar)s" % {"foo": x, **bar}
+70 | )
+71 | 
+   - print("%s \N{snowman}" % (a,))
+72 + print("{} \N{snowman}".format(a))
+73 | 
+74 | print("%(foo)s \N{snowman}" % {"foo": 1})
+75 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:74:7
@@ -617,16 +590,15 @@ UP031 [*] Use format specifiers instead of percent format
 76 | print(("foo %s " "bar %s") % (x, y))
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-71 71 | 
-72 72 | print("%s \N{snowman}" % (a,))
-73 73 | 
-74    |-print("%(foo)s \N{snowman}" % {"foo": 1})
-   74 |+print("{foo} \N{snowman}".format(foo=1))
-75 75 | 
-76 76 | print(("foo %s " "bar %s") % (x, y))
-77 77 | 
+71 | 
+72 | print("%s \N{snowman}" % (a,))
+73 | 
+   - print("%(foo)s \N{snowman}" % {"foo": 1})
+74 + print("{foo} \N{snowman}".format(foo=1))
+75 | 
+76 | print(("foo %s " "bar %s") % (x, y))
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:76:7
@@ -639,16 +611,15 @@ UP031 [*] Use format specifiers instead of percent format
 78 | # Single-value expressions
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-73 73 | 
-74 74 | print("%(foo)s \N{snowman}" % {"foo": 1})
-75 75 | 
-76    |-print(("foo %s " "bar %s") % (x, y))
-   76 |+print(("foo {} " "bar {}").format(x, y))
-77 77 | 
-78 78 | # Single-value expressions
-79 79 | print('Hello %s' % "World")
+73 | 
+74 | print("%(foo)s \N{snowman}" % {"foo": 1})
+75 | 
+   - print(("foo %s " "bar %s") % (x, y))
+76 + print(("foo {} " "bar {}").format(x, y))
+77 | 
+78 | # Single-value expressions
+79 | print('Hello %s' % "World")
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:79:7
@@ -660,16 +631,15 @@ UP031 [*] Use format specifiers instead of percent format
 81 | print('Hello %s (%s)' % bar)
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-76 76 | print(("foo %s " "bar %s") % (x, y))
-77 77 | 
-78 78 | # Single-value expressions
-79    |-print('Hello %s' % "World")
-   79 |+print('Hello {}'.format("World"))
-80 80 | print('Hello %s' % f"World")
-81 81 | print('Hello %s (%s)' % bar)
-82 82 | print('Hello %s (%s)' % bar.baz)
+76 | print(("foo %s " "bar %s") % (x, y))
+77 | 
+78 | # Single-value expressions
+   - print('Hello %s' % "World")
+79 + print('Hello {}'.format("World"))
+80 | print('Hello %s' % f"World")
+81 | print('Hello %s (%s)' % bar)
+82 | print('Hello %s (%s)' % bar.baz)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:80:7
@@ -682,16 +652,15 @@ UP031 [*] Use format specifiers instead of percent format
 82 | print('Hello %s (%s)' % bar.baz)
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-77 77 | 
-78 78 | # Single-value expressions
-79 79 | print('Hello %s' % "World")
-80    |-print('Hello %s' % f"World")
-   80 |+print('Hello {}'.format(f"World"))
-81 81 | print('Hello %s (%s)' % bar)
-82 82 | print('Hello %s (%s)' % bar.baz)
-83 83 | print('Hello %s (%s)' % bar['bop'])
+77 | 
+78 | # Single-value expressions
+79 | print('Hello %s' % "World")
+   - print('Hello %s' % f"World")
+80 + print('Hello {}'.format(f"World"))
+81 | print('Hello %s (%s)' % bar)
+82 | print('Hello %s (%s)' % bar.baz)
+83 | print('Hello %s (%s)' % bar['bop'])
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:81:7
@@ -704,16 +673,15 @@ UP031 [*] Use format specifiers instead of percent format
 83 | print('Hello %s (%s)' % bar['bop'])
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-78 78 | # Single-value expressions
-79 79 | print('Hello %s' % "World")
-80 80 | print('Hello %s' % f"World")
-81    |-print('Hello %s (%s)' % bar)
-   81 |+print('Hello {} ({})'.format(*bar))
-82 82 | print('Hello %s (%s)' % bar.baz)
-83 83 | print('Hello %s (%s)' % bar['bop'])
-84 84 | print('Hello %(arg)s' % bar)
+78 | # Single-value expressions
+79 | print('Hello %s' % "World")
+80 | print('Hello %s' % f"World")
+   - print('Hello %s (%s)' % bar)
+81 + print('Hello {} ({})'.format(*bar))
+82 | print('Hello %s (%s)' % bar.baz)
+83 | print('Hello %s (%s)' % bar['bop'])
+84 | print('Hello %(arg)s' % bar)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:82:7
@@ -726,16 +694,15 @@ UP031 [*] Use format specifiers instead of percent format
 84 | print('Hello %(arg)s' % bar)
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-79 79 | print('Hello %s' % "World")
-80 80 | print('Hello %s' % f"World")
-81 81 | print('Hello %s (%s)' % bar)
-82    |-print('Hello %s (%s)' % bar.baz)
-   82 |+print('Hello {} ({})'.format(*bar.baz))
-83 83 | print('Hello %s (%s)' % bar['bop'])
-84 84 | print('Hello %(arg)s' % bar)
-85 85 | print('Hello %(arg)s' % bar.baz)
+79 | print('Hello %s' % "World")
+80 | print('Hello %s' % f"World")
+81 | print('Hello %s (%s)' % bar)
+   - print('Hello %s (%s)' % bar.baz)
+82 + print('Hello {} ({})'.format(*bar.baz))
+83 | print('Hello %s (%s)' % bar['bop'])
+84 | print('Hello %(arg)s' % bar)
+85 | print('Hello %(arg)s' % bar.baz)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:83:7
@@ -748,16 +715,15 @@ UP031 [*] Use format specifiers instead of percent format
 85 | print('Hello %(arg)s' % bar.baz)
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-80 80 | print('Hello %s' % f"World")
-81 81 | print('Hello %s (%s)' % bar)
-82 82 | print('Hello %s (%s)' % bar.baz)
-83    |-print('Hello %s (%s)' % bar['bop'])
-   83 |+print('Hello {} ({})'.format(*bar['bop']))
-84 84 | print('Hello %(arg)s' % bar)
-85 85 | print('Hello %(arg)s' % bar.baz)
-86 86 | print('Hello %(arg)s' % bar['bop'])
+80 | print('Hello %s' % f"World")
+81 | print('Hello %s (%s)' % bar)
+82 | print('Hello %s (%s)' % bar.baz)
+   - print('Hello %s (%s)' % bar['bop'])
+83 + print('Hello {} ({})'.format(*bar['bop']))
+84 | print('Hello %(arg)s' % bar)
+85 | print('Hello %(arg)s' % bar.baz)
+86 | print('Hello %(arg)s' % bar['bop'])
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:84:7
@@ -770,16 +736,15 @@ UP031 [*] Use format specifiers instead of percent format
 86 | print('Hello %(arg)s' % bar['bop'])
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-81 81 | print('Hello %s (%s)' % bar)
-82 82 | print('Hello %s (%s)' % bar.baz)
-83 83 | print('Hello %s (%s)' % bar['bop'])
-84    |-print('Hello %(arg)s' % bar)
-   84 |+print('Hello {arg}'.format(**bar))
-85 85 | print('Hello %(arg)s' % bar.baz)
-86 86 | print('Hello %(arg)s' % bar['bop'])
-87 87 | 
+81 | print('Hello %s (%s)' % bar)
+82 | print('Hello %s (%s)' % bar.baz)
+83 | print('Hello %s (%s)' % bar['bop'])
+   - print('Hello %(arg)s' % bar)
+84 + print('Hello {arg}'.format(**bar))
+85 | print('Hello %(arg)s' % bar.baz)
+86 | print('Hello %(arg)s' % bar['bop'])
+87 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:85:7
@@ -791,16 +756,15 @@ UP031 [*] Use format specifiers instead of percent format
 86 | print('Hello %(arg)s' % bar['bop'])
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-82 82 | print('Hello %s (%s)' % bar.baz)
-83 83 | print('Hello %s (%s)' % bar['bop'])
-84 84 | print('Hello %(arg)s' % bar)
-85    |-print('Hello %(arg)s' % bar.baz)
-   85 |+print('Hello {arg}'.format(**bar.baz))
-86 86 | print('Hello %(arg)s' % bar['bop'])
-87 87 | 
-88 88 | # Hanging modulos
+82 | print('Hello %s (%s)' % bar.baz)
+83 | print('Hello %s (%s)' % bar['bop'])
+84 | print('Hello %(arg)s' % bar)
+   - print('Hello %(arg)s' % bar.baz)
+85 + print('Hello {arg}'.format(**bar.baz))
+86 | print('Hello %(arg)s' % bar['bop'])
+87 | 
+88 | # Hanging modulos
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:86:7
@@ -813,16 +777,15 @@ UP031 [*] Use format specifiers instead of percent format
 88 | # Hanging modulos
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-83 83 | print('Hello %s (%s)' % bar['bop'])
-84 84 | print('Hello %(arg)s' % bar)
-85 85 | print('Hello %(arg)s' % bar.baz)
-86    |-print('Hello %(arg)s' % bar['bop'])
-   86 |+print('Hello {arg}'.format(**bar['bop']))
-87 87 | 
-88 88 | # Hanging modulos
-89 89 | (
+83 | print('Hello %s (%s)' % bar['bop'])
+84 | print('Hello %(arg)s' % bar)
+85 | print('Hello %(arg)s' % bar.baz)
+   - print('Hello %(arg)s' % bar['bop'])
+86 + print('Hello {arg}'.format(**bar['bop']))
+87 | 
+88 | # Hanging modulos
+89 | (
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:89:1
@@ -837,20 +800,19 @@ UP031 [*] Use format specifiers instead of percent format
 94 |   (
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-87 87 | 
-88 88 | # Hanging modulos
-89 89 | (
-90    |-    "foo %s "
-91    |-    "bar %s"
-92    |-) % (x, y)
-   90 |+    "foo {} "
-   91 |+    "bar {}"
-   92 |+).format(x, y)
-93 93 | 
-94 94 | (
-95 95 |     "foo %(foo)s "
+87 | 
+88 | # Hanging modulos
+89 | (
+   -     "foo %s "
+   -     "bar %s"
+   - ) % (x, y)
+90 +     "foo {} "
+91 +     "bar {}"
+92 + ).format(x, y)
+93 | 
+94 | (
+95 |     "foo %(foo)s "
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
   --> UP031_0.py:94:1
@@ -866,20 +828,19 @@ UP031 [*] Use format specifiers instead of percent format
 99 |   (
    |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-92 92 | ) % (x, y)
-93 93 | 
-94 94 | (
-95    |-    "foo %(foo)s "
-96    |-    "bar %(bar)s"
-97    |-) % {"foo": x, "bar": y}
-   95 |+    "foo {foo} "
-   96 |+    "bar {bar}"
-   97 |+).format(foo=x, bar=y)
-98 98 | 
-99 99 | (
-100 100 |     """foo %s"""
+92  | ) % (x, y)
+93  | 
+94  | (
+    -     "foo %(foo)s "
+    -     "bar %(bar)s"
+    - ) % {"foo": x, "bar": y}
+95  +     "foo {foo} "
+96  +     "bar {bar}"
+97  + ).format(foo=x, bar=y)
+98  | 
+99  | (
+100 |     """foo %s"""
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:100:5
@@ -891,17 +852,16 @@ UP031 [*] Use format specifiers instead of percent format
 102 |   )
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-97  97  | ) % {"foo": x, "bar": y}
-98  98  | 
-99  99  | (
-100     |-    """foo %s"""
-101     |-    % (x,)
-    100 |+    """foo {}""".format(x)
-102 101 | )
-103 102 | 
-104 103 | (
+97  | ) % {"foo": x, "bar": y}
+98  | 
+99  | (
+    -     """foo %s"""
+    -     % (x,)
+100 +     """foo {}""".format(x)
+101 | )
+102 | 
+103 | (
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:105:5
@@ -915,19 +875,18 @@ UP031 [*] Use format specifiers instead of percent format
 109 |   )
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | (
-105 105 |     """
-106     |-    foo %s
-107     |-    """
-108     |-    % (x,)
-    106 |+    foo {}
-    107 |+    """.format(x)
-109 108 | )
-110 109 | 
-111 110 | "%s" % (
+103 | 
+104 | (
+105 |     """
+    -     foo %s
+    -     """
+    -     % (x,)
+106 +     foo {}
+107 +     """.format(x)
+108 | )
+109 | 
+110 | "%s" % (
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:111:1
@@ -940,16 +899,15 @@ UP031 [*] Use format specifiers instead of percent format
     | |_^
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-108 108 |     % (x,)
-109 109 | )
-110 110 | 
-111     |-"%s" % (
-    111 |+"{}".format(
-112 112 |     x,  # comment
-113 113 | )
-114 114 | 
+108 |     % (x,)
+109 | )
+110 | 
+    - "%s" % (
+111 + "{}".format(
+112 |     x,  # comment
+113 | )
+114 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:116:8
@@ -965,16 +923,15 @@ UP031 [*] Use format specifiers instead of percent format
 122 |   # UP031 (no longer false negatives; now offer potentially unsafe fixes)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-113 113 | )
-114 114 | 
-115 115 | 
-116     |-path = "%s-%s-%s.pem" % (
-    116 |+path = "{}-{}-{}.pem".format(
-117 117 |     safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename
-118 118 |     cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date
-119 119 |     hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix
+113 | )
+114 | 
+115 | 
+    - path = "%s-%s-%s.pem" % (
+116 + path = "{}-{}-{}.pem".format(
+117 |     safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename
+118 |     cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date
+119 |     hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:123:1
@@ -986,16 +943,15 @@ UP031 [*] Use format specifiers instead of percent format
 125 | 'Hello %s' % bar.baz
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-120 120 | )
-121 121 | 
-122 122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes)
-123     |-'Hello %s' % bar
-    123 |+'Hello {}'.format(bar)
-124 124 | 
-125 125 | 'Hello %s' % bar.baz
-126 126 | 
+120 | )
+121 | 
+122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes)
+    - 'Hello %s' % bar
+123 + 'Hello {}'.format(bar)
+124 | 
+125 | 'Hello %s' % bar.baz
+126 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:125:1
@@ -1008,16 +964,15 @@ UP031 [*] Use format specifiers instead of percent format
 127 | 'Hello %s' % bar['bop']
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-122 122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes)
-123 123 | 'Hello %s' % bar
-124 124 | 
-125     |-'Hello %s' % bar.baz
-    125 |+'Hello {}'.format(bar.baz)
-126 126 | 
-127 127 | 'Hello %s' % bar['bop']
-128 128 | 
+122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes)
+123 | 'Hello %s' % bar
+124 | 
+    - 'Hello %s' % bar.baz
+125 + 'Hello {}'.format(bar.baz)
+126 | 
+127 | 'Hello %s' % bar['bop']
+128 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:127:1
@@ -1030,16 +985,15 @@ UP031 [*] Use format specifiers instead of percent format
 129 | # Not a valid type annotation but this test shouldn't result in a panic.
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-124 124 | 
-125 125 | 'Hello %s' % bar.baz
-126 126 | 
-127     |-'Hello %s' % bar['bop']
-    127 |+'Hello {}'.format(bar['bop'])
-128 128 | 
-129 129 | # Not a valid type annotation but this test shouldn't result in a panic.
-130 130 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+124 | 
+125 | 'Hello %s' % bar.baz
+126 | 
+    - 'Hello %s' % bar['bop']
+127 + 'Hello {}'.format(bar['bop'])
+128 | 
+129 | # Not a valid type annotation but this test shouldn't result in a panic.
+130 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:131:5
@@ -1052,16 +1006,15 @@ UP031 [*] Use format specifiers instead of percent format
 133 | # See: https://github.com/astral-sh/ruff/issues/12421
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-128 128 | 
-129 129 | # Not a valid type annotation but this test shouldn't result in a panic.
-130 130 | # Refer: https://github.com/astral-sh/ruff/issues/11736
-131     |-x: "'%s + %s' % (1, 2)"
-    131 |+x: "'{} + {}'.format(1, 2)"
-132 132 | 
-133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
-134 134 | print("%.2X" % 1)
+128 | 
+129 | # Not a valid type annotation but this test shouldn't result in a panic.
+130 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+    - x: "'%s + %s' % (1, 2)"
+131 + x: "'{} + {}'.format(1, 2)"
+132 | 
+133 | # See: https://github.com/astral-sh/ruff/issues/12421
+134 | print("%.2X" % 1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:134:7
@@ -1073,16 +1026,15 @@ UP031 [*] Use format specifiers instead of percent format
 136 | print("%02X" % 1)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-131 131 | x: "'%s + %s' % (1, 2)"
-132 132 | 
-133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
-134     |-print("%.2X" % 1)
-    134 |+print("{:02X}".format(1))
-135 135 | print("%.02X" % 1)
-136 136 | print("%02X" % 1)
-137 137 | print("%.00002X" % 1)
+131 | x: "'%s + %s' % (1, 2)"
+132 | 
+133 | # See: https://github.com/astral-sh/ruff/issues/12421
+    - print("%.2X" % 1)
+134 + print("{:02X}".format(1))
+135 | print("%.02X" % 1)
+136 | print("%02X" % 1)
+137 | print("%.00002X" % 1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:135:7
@@ -1095,16 +1047,15 @@ UP031 [*] Use format specifiers instead of percent format
 137 | print("%.00002X" % 1)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-132 132 | 
-133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
-134 134 | print("%.2X" % 1)
-135     |-print("%.02X" % 1)
-    135 |+print("{:02X}".format(1))
-136 136 | print("%02X" % 1)
-137 137 | print("%.00002X" % 1)
-138 138 | print("%.20X" % 1)
+132 | 
+133 | # See: https://github.com/astral-sh/ruff/issues/12421
+134 | print("%.2X" % 1)
+    - print("%.02X" % 1)
+135 + print("{:02X}".format(1))
+136 | print("%02X" % 1)
+137 | print("%.00002X" % 1)
+138 | print("%.20X" % 1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:136:7
@@ -1117,16 +1068,15 @@ UP031 [*] Use format specifiers instead of percent format
 138 | print("%.20X" % 1)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
-134 134 | print("%.2X" % 1)
-135 135 | print("%.02X" % 1)
-136     |-print("%02X" % 1)
-    136 |+print("{:02X}".format(1))
-137 137 | print("%.00002X" % 1)
-138 138 | print("%.20X" % 1)
-139 139 | 
+133 | # See: https://github.com/astral-sh/ruff/issues/12421
+134 | print("%.2X" % 1)
+135 | print("%.02X" % 1)
+    - print("%02X" % 1)
+136 + print("{:02X}".format(1))
+137 | print("%.00002X" % 1)
+138 | print("%.20X" % 1)
+139 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:137:7
@@ -1138,16 +1088,15 @@ UP031 [*] Use format specifiers instead of percent format
 138 | print("%.20X" % 1)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-134 134 | print("%.2X" % 1)
-135 135 | print("%.02X" % 1)
-136 136 | print("%02X" % 1)
-137     |-print("%.00002X" % 1)
-    137 |+print("{:02X}".format(1))
-138 138 | print("%.20X" % 1)
-139 139 | 
-140 140 | print("%2X" % 1)
+134 | print("%.2X" % 1)
+135 | print("%.02X" % 1)
+136 | print("%02X" % 1)
+    - print("%.00002X" % 1)
+137 + print("{:02X}".format(1))
+138 | print("%.20X" % 1)
+139 | 
+140 | print("%2X" % 1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:138:7
@@ -1160,16 +1109,15 @@ UP031 [*] Use format specifiers instead of percent format
 140 | print("%2X" % 1)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-135 135 | print("%.02X" % 1)
-136 136 | print("%02X" % 1)
-137 137 | print("%.00002X" % 1)
-138     |-print("%.20X" % 1)
-    138 |+print("{:020X}".format(1))
-139 139 | 
-140 140 | print("%2X" % 1)
-141 141 | print("%02X" % 1)
+135 | print("%.02X" % 1)
+136 | print("%02X" % 1)
+137 | print("%.00002X" % 1)
+    - print("%.20X" % 1)
+138 + print("{:020X}".format(1))
+139 | 
+140 | print("%2X" % 1)
+141 | print("%02X" % 1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:140:7
@@ -1181,16 +1129,15 @@ UP031 [*] Use format specifiers instead of percent format
 141 | print("%02X" % 1)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-137 137 | print("%.00002X" % 1)
-138 138 | print("%.20X" % 1)
-139 139 | 
-140     |-print("%2X" % 1)
-    140 |+print("{:2X}".format(1))
-141 141 | print("%02X" % 1)
-142 142 | 
-143 143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax)
+137 | print("%.00002X" % 1)
+138 | print("%.20X" % 1)
+139 | 
+    - print("%2X" % 1)
+140 + print("{:2X}".format(1))
+141 | print("%02X" % 1)
+142 | 
+143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax)
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 [*] Use format specifiers instead of percent format
    --> UP031_0.py:141:7
@@ -1202,16 +1149,15 @@ UP031 [*] Use format specifiers instead of percent format
 143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax)
     |
 help: Replace with format specifiers
-
-ℹ Unsafe fix
-138 138 | print("%.20X" % 1)
-139 139 | 
-140 140 | print("%2X" % 1)
-141     |-print("%02X" % 1)
-    141 |+print("{:02X}".format(1))
-142 142 | 
-143 143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax)
-144 144 | 
+138 | print("%.20X" % 1)
+139 | 
+140 | print("%2X" % 1)
+    - print("%02X" % 1)
+141 + print("{:02X}".format(1))
+142 | 
+143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax)
+144 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP031 Use format specifiers instead of percent format
    --> UP031_0.py:145:1
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap
index 19c78a643d..2ecb24ea07 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap
@@ -12,16 +12,14 @@ UP032 [*] Use f-string instead of `format` call
 7 | "{1} {0}".format(a, b)
   |
 help: Convert to f-string
-
-ℹ Safe fix
-2 2 | # Errors
-3 3 | ###
-4 4 | 
-5   |-"{} {}".format(a, b)
-  5 |+f"{a} {b}"
-6 6 | 
-7 7 | "{1} {0}".format(a, b)
-8 8 | 
+2 | # Errors
+3 | ###
+4 | 
+  - "{} {}".format(a, b)
+5 + f"{a} {b}"
+6 | 
+7 | "{1} {0}".format(a, b)
+8 | 
 
 UP032 [*] Use f-string instead of `format` call
  --> UP032_0.py:7:1
@@ -34,16 +32,14 @@ UP032 [*] Use f-string instead of `format` call
 9 | "{0} {1} {0}".format(a, b)
   |
 help: Convert to f-string
-
-ℹ Safe fix
-4 4 | 
-5 5 | "{} {}".format(a, b)
-6 6 | 
-7   |-"{1} {0}".format(a, b)
-  7 |+f"{b} {a}"
-8 8 | 
-9 9 | "{0} {1} {0}".format(a, b)
-10 10 | 
+4  | 
+5  | "{} {}".format(a, b)
+6  | 
+   - "{1} {0}".format(a, b)
+7  + f"{b} {a}"
+8  | 
+9  | "{0} {1} {0}".format(a, b)
+10 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:9:1
@@ -56,16 +52,14 @@ UP032 [*] Use f-string instead of `format` call
 11 | "{x.y}".format(x=z)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-6  6  | 
-7  7  | "{1} {0}".format(a, b)
-8  8  | 
-9     |-"{0} {1} {0}".format(a, b)
-   9  |+f"{a} {b} {a}"
-10 10 | 
-11 11 | "{x.y}".format(x=z)
-12 12 | 
+6  | 
+7  | "{1} {0}".format(a, b)
+8  | 
+   - "{0} {1} {0}".format(a, b)
+9  + f"{a} {b} {a}"
+10 | 
+11 | "{x.y}".format(x=z)
+12 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:11:1
@@ -78,16 +72,14 @@ UP032 [*] Use f-string instead of `format` call
 13 | "{x} {y} {x}".format(x=a, y=b)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-8  8  | 
-9  9  | "{0} {1} {0}".format(a, b)
-10 10 | 
-11    |-"{x.y}".format(x=z)
-   11 |+f"{z.y}"
-12 12 | 
-13 13 | "{x} {y} {x}".format(x=a, y=b)
-14 14 | 
+8  | 
+9  | "{0} {1} {0}".format(a, b)
+10 | 
+   - "{x.y}".format(x=z)
+11 + f"{z.y}"
+12 | 
+13 | "{x} {y} {x}".format(x=a, y=b)
+14 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:13:1
@@ -100,16 +92,14 @@ UP032 [*] Use f-string instead of `format` call
 15 | "{.x} {.y}".format(a, b)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-10 10 | 
-11 11 | "{x.y}".format(x=z)
-12 12 | 
-13    |-"{x} {y} {x}".format(x=a, y=b)
-   13 |+f"{a} {b} {a}"
-14 14 | 
-15 15 | "{.x} {.y}".format(a, b)
-16 16 | 
+10 | 
+11 | "{x.y}".format(x=z)
+12 | 
+   - "{x} {y} {x}".format(x=a, y=b)
+13 + f"{a} {b} {a}"
+14 | 
+15 | "{.x} {.y}".format(a, b)
+16 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:15:1
@@ -122,16 +112,14 @@ UP032 [*] Use f-string instead of `format` call
 17 | "{} {}".format(a.b, c.d)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-12 12 | 
-13 13 | "{x} {y} {x}".format(x=a, y=b)
-14 14 | 
-15    |-"{.x} {.y}".format(a, b)
-   15 |+f"{a.x} {b.y}"
-16 16 | 
-17 17 | "{} {}".format(a.b, c.d)
-18 18 | 
+12 | 
+13 | "{x} {y} {x}".format(x=a, y=b)
+14 | 
+   - "{.x} {.y}".format(a, b)
+15 + f"{a.x} {b.y}"
+16 | 
+17 | "{} {}".format(a.b, c.d)
+18 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:17:1
@@ -144,16 +132,14 @@ UP032 [*] Use f-string instead of `format` call
 19 | "{}".format(a())
    |
 help: Convert to f-string
-
-ℹ Safe fix
-14 14 | 
-15 15 | "{.x} {.y}".format(a, b)
-16 16 | 
-17    |-"{} {}".format(a.b, c.d)
-   17 |+f"{a.b} {c.d}"
-18 18 | 
-19 19 | "{}".format(a())
-20 20 | 
+14 | 
+15 | "{.x} {.y}".format(a, b)
+16 | 
+   - "{} {}".format(a.b, c.d)
+17 + f"{a.b} {c.d}"
+18 | 
+19 | "{}".format(a())
+20 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:19:1
@@ -166,16 +152,14 @@ UP032 [*] Use f-string instead of `format` call
 21 | "{}".format(a.b())
    |
 help: Convert to f-string
-
-ℹ Safe fix
-16 16 | 
-17 17 | "{} {}".format(a.b, c.d)
-18 18 | 
-19    |-"{}".format(a())
-   19 |+f"{a()}"
-20 20 | 
-21 21 | "{}".format(a.b())
-22 22 | 
+16 | 
+17 | "{} {}".format(a.b, c.d)
+18 | 
+   - "{}".format(a())
+19 + f"{a()}"
+20 | 
+21 | "{}".format(a.b())
+22 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:21:1
@@ -188,16 +172,14 @@ UP032 [*] Use f-string instead of `format` call
 23 | "{}".format(a.b().c())
    |
 help: Convert to f-string
-
-ℹ Safe fix
-18 18 | 
-19 19 | "{}".format(a())
-20 20 | 
-21    |-"{}".format(a.b())
-   21 |+f"{a.b()}"
-22 22 | 
-23 23 | "{}".format(a.b().c())
-24 24 | 
+18 | 
+19 | "{}".format(a())
+20 | 
+   - "{}".format(a.b())
+21 + f"{a.b()}"
+22 | 
+23 | "{}".format(a.b().c())
+24 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:23:1
@@ -210,16 +192,14 @@ UP032 [*] Use f-string instead of `format` call
 25 | "hello {}!".format(name)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-20 20 | 
-21 21 | "{}".format(a.b())
-22 22 | 
-23    |-"{}".format(a.b().c())
-   23 |+f"{a.b().c()}"
-24 24 | 
-25 25 | "hello {}!".format(name)
-26 26 | 
+20 | 
+21 | "{}".format(a.b())
+22 | 
+   - "{}".format(a.b().c())
+23 + f"{a.b().c()}"
+24 | 
+25 | "hello {}!".format(name)
+26 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:25:1
@@ -232,16 +212,14 @@ UP032 [*] Use f-string instead of `format` call
 27 | "{}{b}{}".format(a, c, b=b)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-22 22 | 
-23 23 | "{}".format(a.b().c())
-24 24 | 
-25    |-"hello {}!".format(name)
-   25 |+f"hello {name}!"
-26 26 | 
-27 27 | "{}{b}{}".format(a, c, b=b)
-28 28 | 
+22 | 
+23 | "{}".format(a.b().c())
+24 | 
+   - "hello {}!".format(name)
+25 + f"hello {name}!"
+26 | 
+27 | "{}{b}{}".format(a, c, b=b)
+28 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:27:1
@@ -254,16 +232,14 @@ UP032 [*] Use f-string instead of `format` call
 29 | "{}".format(0x0)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-24 24 | 
-25 25 | "hello {}!".format(name)
-26 26 | 
-27    |-"{}{b}{}".format(a, c, b=b)
-   27 |+f"{a}{b}{c}"
-28 28 | 
-29 29 | "{}".format(0x0)
-30 30 | 
+24 | 
+25 | "hello {}!".format(name)
+26 | 
+   - "{}{b}{}".format(a, c, b=b)
+27 + f"{a}{b}{c}"
+28 | 
+29 | "{}".format(0x0)
+30 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:29:1
@@ -276,16 +252,14 @@ UP032 [*] Use f-string instead of `format` call
 31 | "{} {}".format(a, b)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-26 26 | 
-27 27 | "{}{b}{}".format(a, c, b=b)
-28 28 | 
-29    |-"{}".format(0x0)
-   29 |+f"{0x0}"
-30 30 | 
-31 31 | "{} {}".format(a, b)
-32 32 | 
+26 | 
+27 | "{}{b}{}".format(a, c, b=b)
+28 | 
+   - "{}".format(0x0)
+29 + f"{0x0}"
+30 | 
+31 | "{} {}".format(a, b)
+32 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:31:1
@@ -298,16 +272,14 @@ UP032 [*] Use f-string instead of `format` call
 33 | """{} {}""".format(a, b)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-28 28 | 
-29 29 | "{}".format(0x0)
-30 30 | 
-31    |-"{} {}".format(a, b)
-   31 |+f"{a} {b}"
-32 32 | 
-33 33 | """{} {}""".format(a, b)
-34 34 | 
+28 | 
+29 | "{}".format(0x0)
+30 | 
+   - "{} {}".format(a, b)
+31 + f"{a} {b}"
+32 | 
+33 | """{} {}""".format(a, b)
+34 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:33:1
@@ -320,16 +292,14 @@ UP032 [*] Use f-string instead of `format` call
 35 | "foo{}".format(1)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-30 30 | 
-31 31 | "{} {}".format(a, b)
-32 32 | 
-33    |-"""{} {}""".format(a, b)
-   33 |+f"""{a} {b}"""
-34 34 | 
-35 35 | "foo{}".format(1)
-36 36 | 
+30 | 
+31 | "{} {}".format(a, b)
+32 | 
+   - """{} {}""".format(a, b)
+33 + f"""{a} {b}"""
+34 | 
+35 | "foo{}".format(1)
+36 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:35:1
@@ -342,16 +312,14 @@ UP032 [*] Use f-string instead of `format` call
 37 | r"foo{}".format(1)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-32 32 | 
-33 33 | """{} {}""".format(a, b)
-34 34 | 
-35    |-"foo{}".format(1)
-   35 |+f"foo{1}"
-36 36 | 
-37 37 | r"foo{}".format(1)
-38 38 | 
+32 | 
+33 | """{} {}""".format(a, b)
+34 | 
+   - "foo{}".format(1)
+35 + f"foo{1}"
+36 | 
+37 | r"foo{}".format(1)
+38 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:37:1
@@ -364,16 +332,14 @@ UP032 [*] Use f-string instead of `format` call
 39 | x = "{a}".format(a=1)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-34 34 | 
-35 35 | "foo{}".format(1)
-36 36 | 
-37    |-r"foo{}".format(1)
-   37 |+rf"foo{1}"
-38 38 | 
-39 39 | x = "{a}".format(a=1)
-40 40 | 
+34 | 
+35 | "foo{}".format(1)
+36 | 
+   - r"foo{}".format(1)
+37 + rf"foo{1}"
+38 | 
+39 | x = "{a}".format(a=1)
+40 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:39:5
@@ -386,16 +352,14 @@ UP032 [*] Use f-string instead of `format` call
 41 | print("foo {} ".format(x))
    |
 help: Convert to f-string
-
-ℹ Safe fix
-36 36 | 
-37 37 | r"foo{}".format(1)
-38 38 | 
-39    |-x = "{a}".format(a=1)
-   39 |+x = f"{1}"
-40 40 | 
-41 41 | print("foo {} ".format(x))
-42 42 | 
+36 | 
+37 | r"foo{}".format(1)
+38 | 
+   - x = "{a}".format(a=1)
+39 + x = f"{1}"
+40 | 
+41 | print("foo {} ".format(x))
+42 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:41:7
@@ -408,16 +372,14 @@ UP032 [*] Use f-string instead of `format` call
 43 | "{a[b]}".format(a=a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-38 38 | 
-39 39 | x = "{a}".format(a=1)
-40 40 | 
-41    |-print("foo {} ".format(x))
-   41 |+print(f"foo {x} ")
-42 42 | 
-43 43 | "{a[b]}".format(a=a)
-44 44 | 
+38 | 
+39 | x = "{a}".format(a=1)
+40 | 
+   - print("foo {} ".format(x))
+41 + print(f"foo {x} ")
+42 | 
+43 | "{a[b]}".format(a=a)
+44 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:43:1
@@ -430,16 +392,14 @@ UP032 [*] Use f-string instead of `format` call
 45 | "{a.a[b]}".format(a=a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-40 40 | 
-41 41 | print("foo {} ".format(x))
-42 42 | 
-43    |-"{a[b]}".format(a=a)
-   43 |+f"{a['b']}"
-44 44 | 
-45 45 | "{a.a[b]}".format(a=a)
-46 46 | 
+40 | 
+41 | print("foo {} ".format(x))
+42 | 
+   - "{a[b]}".format(a=a)
+43 + f"{a['b']}"
+44 | 
+45 | "{a.a[b]}".format(a=a)
+46 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:45:1
@@ -452,16 +412,14 @@ UP032 [*] Use f-string instead of `format` call
 47 | "{}{{}}{}".format(escaped, y)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-42 42 | 
-43 43 | "{a[b]}".format(a=a)
-44 44 | 
-45    |-"{a.a[b]}".format(a=a)
-   45 |+f"{a.a['b']}"
-46 46 | 
-47 47 | "{}{{}}{}".format(escaped, y)
-48 48 | 
+42 | 
+43 | "{a[b]}".format(a=a)
+44 | 
+   - "{a.a[b]}".format(a=a)
+45 + f"{a.a['b']}"
+46 | 
+47 | "{}{{}}{}".format(escaped, y)
+48 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:47:1
@@ -474,16 +432,14 @@ UP032 [*] Use f-string instead of `format` call
 49 | "{}".format(a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-44 44 | 
-45 45 | "{a.a[b]}".format(a=a)
-46 46 | 
-47    |-"{}{{}}{}".format(escaped, y)
-   47 |+f"{escaped}{{}}{y}"
-48 48 | 
-49 49 | "{}".format(a)
-50 50 | 
+44 | 
+45 | "{a.a[b]}".format(a=a)
+46 | 
+   - "{}{{}}{}".format(escaped, y)
+47 + f"{escaped}{{}}{y}"
+48 | 
+49 | "{}".format(a)
+50 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:49:1
@@ -496,16 +452,14 @@ UP032 [*] Use f-string instead of `format` call
 51 | '({}={{0!e}})'.format(a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-46 46 | 
-47 47 | "{}{{}}{}".format(escaped, y)
-48 48 | 
-49    |-"{}".format(a)
-   49 |+f"{a}"
-50 50 | 
-51 51 | '({}={{0!e}})'.format(a)
-52 52 | 
+46 | 
+47 | "{}{{}}{}".format(escaped, y)
+48 | 
+   - "{}".format(a)
+49 + f"{a}"
+50 | 
+51 | '({}={{0!e}})'.format(a)
+52 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:51:1
@@ -518,16 +472,14 @@ UP032 [*] Use f-string instead of `format` call
 53 | "{[b]}".format(a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-48 48 | 
-49 49 | "{}".format(a)
-50 50 | 
-51    |-'({}={{0!e}})'.format(a)
-   51 |+f'({a}={{0!e}})'
-52 52 | 
-53 53 | "{[b]}".format(a)
-54 54 | 
+48 | 
+49 | "{}".format(a)
+50 | 
+   - '({}={{0!e}})'.format(a)
+51 + f'({a}={{0!e}})'
+52 | 
+53 | "{[b]}".format(a)
+54 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:53:1
@@ -540,16 +492,14 @@ UP032 [*] Use f-string instead of `format` call
 55 | '{[b]}'.format(a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-50 50 | 
-51 51 | '({}={{0!e}})'.format(a)
-52 52 | 
-53    |-"{[b]}".format(a)
-   53 |+f"{a['b']}"
-54 54 | 
-55 55 | '{[b]}'.format(a)
-56 56 | 
+50 | 
+51 | '({}={{0!e}})'.format(a)
+52 | 
+   - "{[b]}".format(a)
+53 + f"{a['b']}"
+54 | 
+55 | '{[b]}'.format(a)
+56 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:55:1
@@ -562,16 +512,14 @@ UP032 [*] Use f-string instead of `format` call
 57 | """{[b]}""".format(a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-52 52 | 
-53 53 | "{[b]}".format(a)
-54 54 | 
-55    |-'{[b]}'.format(a)
-   55 |+f'{a["b"]}'
-56 56 | 
-57 57 | """{[b]}""".format(a)
-58 58 | 
+52 | 
+53 | "{[b]}".format(a)
+54 | 
+   - '{[b]}'.format(a)
+55 + f'{a["b"]}'
+56 | 
+57 | """{[b]}""".format(a)
+58 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:57:1
@@ -584,16 +532,14 @@ UP032 [*] Use f-string instead of `format` call
 59 | '''{[b]}'''.format(a)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-54 54 | 
-55 55 | '{[b]}'.format(a)
-56 56 | 
-57    |-"""{[b]}""".format(a)
-   57 |+f"""{a["b"]}"""
-58 58 | 
-59 59 | '''{[b]}'''.format(a)
-60 60 | 
+54 | 
+55 | '{[b]}'.format(a)
+56 | 
+   - """{[b]}""".format(a)
+57 + f"""{a["b"]}"""
+58 | 
+59 | '''{[b]}'''.format(a)
+60 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:59:1
@@ -606,16 +552,14 @@ UP032 [*] Use f-string instead of `format` call
 61 | "{}".format(
    |
 help: Convert to f-string
-
-ℹ Safe fix
-56 56 | 
-57 57 | """{[b]}""".format(a)
-58 58 | 
-59    |-'''{[b]}'''.format(a)
-   59 |+f'''{a["b"]}'''
-60 60 | 
-61 61 | "{}".format(
-62 62 |     1
+56 | 
+57 | """{[b]}""".format(a)
+58 | 
+   - '''{[b]}'''.format(a)
+59 + f'''{a["b"]}'''
+60 | 
+61 | "{}".format(
+62 |     1
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:61:1
@@ -630,18 +574,16 @@ UP032 [*] Use f-string instead of `format` call
 65 |   "123456789 {}".format(
    |
 help: Convert to f-string
-
-ℹ Safe fix
-58 58 | 
-59 59 | '''{[b]}'''.format(a)
-60 60 | 
-61    |-"{}".format(
-62    |-    1
-63    |-)
-   61 |+f"{1}"
-64 62 | 
-65 63 | "123456789 {}".format(
-66 64 |     1111111111111111111111111111111111111111111111111111111111111111111111111,
+58 | 
+59 | '''{[b]}'''.format(a)
+60 | 
+   - "{}".format(
+   -     1
+   - )
+61 + f"{1}"
+62 | 
+63 | "123456789 {}".format(
+64 |     1111111111111111111111111111111111111111111111111111111111111111111111111,
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:65:1
@@ -656,18 +598,16 @@ UP032 [*] Use f-string instead of `format` call
 69 |   """
    |
 help: Convert to f-string
-
-ℹ Safe fix
-62 62 |     1
-63 63 | )
-64 64 | 
-65    |-"123456789 {}".format(
-66    |-    1111111111111111111111111111111111111111111111111111111111111111111111111,
-67    |-)
-   65 |+f"123456789 {1111111111111111111111111111111111111111111111111111111111111111111111111}"
-68 66 | 
-69 67 | """
-70 68 | {}
+62 |     1
+63 | )
+64 | 
+   - "123456789 {}".format(
+   -     1111111111111111111111111111111111111111111111111111111111111111111111111,
+   - )
+65 + f"123456789 {1111111111111111111111111111111111111111111111111111111111111111111111111}"
+66 | 
+67 | """
+68 | {}
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:69:1
@@ -682,19 +622,17 @@ UP032 [*] Use f-string instead of `format` call
 73 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """
    |
 help: Convert to f-string
-
-ℹ Safe fix
-66 66 |     1111111111111111111111111111111111111111111111111111111111111111111111111,
-67 67 | )
-68 68 | 
-   69 |+f"""
-   70 |+{1}
-69 71 | """
-70    |-{}
-71    |-""".format(1)
-72 72 | 
-73 73 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """
-74 74 | {}
+66 |     1111111111111111111111111111111111111111111111111111111111111111111111111,
+67 | )
+68 | 
+69 + f"""
+70 + {1}
+71 | """
+   - {}
+   - """.format(1)
+72 | 
+73 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """
+74 | {}
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:73:85
@@ -712,22 +650,20 @@ UP032 [*] Use f-string instead of `format` call
 79 |   "{a}" "{b}".format(a=1, b=1)
    |
 help: Convert to f-string
-
-ℹ Safe fix
-70 70 | {}
-71 71 | """.format(1)
-72 72 | 
-73    |-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """
-74    |-{}
-75    |-""".format(
-76    |-    111111
-77    |-)
-   73 |+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""
-   74 |+{111111}
-   75 |+"""
-78 76 | 
-79 77 | "{a}" "{b}".format(a=1, b=1)
-80 78 | 
+70 | {}
+71 | """.format(1)
+72 | 
+   - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """
+   - {}
+   - """.format(
+   -     111111
+   - )
+73 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""
+74 + {111111}
+75 + """
+76 | 
+77 | "{a}" "{b}".format(a=1, b=1)
+78 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:79:1
@@ -740,16 +676,14 @@ UP032 [*] Use f-string instead of `format` call
 81 | (
    |
 help: Convert to f-string
-
-ℹ Safe fix
-76 76 |     111111
-77 77 | )
-78 78 | 
-79    |-"{a}" "{b}".format(a=1, b=1)
-   79 |+f"{1}" f"{1}"
-80 80 | 
-81 81 | (
-82 82 |     "{a}"
+76 |     111111
+77 | )
+78 | 
+   - "{a}" "{b}".format(a=1, b=1)
+79 + f"{1}" f"{1}"
+80 | 
+81 | (
+82 |     "{a}"
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:81:1
@@ -765,20 +699,18 @@ UP032 [*] Use f-string instead of `format` call
 86 |   (
    |
 help: Convert to f-string
-
-ℹ Safe fix
-79 79 | "{a}" "{b}".format(a=1, b=1)
-80 80 | 
-81 81 | (
-82    |-    "{a}"
-83    |-    "{b}"
-84    |-).format(a=1, b=1)
-   82 |+    f"{1}"
-   83 |+    f"{1}"
-   84 |+)
-85 85 | 
-86 86 | (
-87 87 |     "{a}"
+79 | "{a}" "{b}".format(a=1, b=1)
+80 | 
+81 | (
+   -     "{a}"
+   -     "{b}"
+   - ).format(a=1, b=1)
+82 +     f"{1}"
+83 +     f"{1}"
+84 + )
+85 | 
+86 | (
+87 |     "{a}"
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_0.py:86:1
@@ -796,22 +728,20 @@ UP032 [*] Use f-string instead of `format` call
 93 |   (
    |
 help: Convert to f-string
-
-ℹ Safe fix
-84 84 | ).format(a=1, b=1)
-85 85 | 
-86 86 | (
-87    |-    "{a}"
-88    |-    ""
-89    |-    "{b}"
-90    |-    ""
-91    |-).format(a=1, b=1)
-   87 |+    f"{1}"
-   88 |+    f"{1}"
-   89 |+)
-92 90 | 
-93 91 | (
-94 92 |     (
+84 | ).format(a=1, b=1)
+85 | 
+86 | (
+   -     "{a}"
+   -     ""
+   -     "{b}"
+   -     ""
+   - ).format(a=1, b=1)
+87 +     f"{1}"
+88 +     f"{1}"
+89 + )
+90 | 
+91 | (
+92 |     (
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:94:5
@@ -829,23 +759,21 @@ UP032 [*] Use f-string instead of `format` call
 102 |   )
     |
 help: Convert to f-string
-
-ℹ Safe fix
-93  93  | (
-94  94  |     (
-95  95  |         # comment
-96      |-        "{a}"
-    96  |+        f"{1}"
-97  97  |         # comment
-98      |-        "{b}"
-    98  |+        f"{1}"
-99  99  |     )
-100 100 |     # comment
-101     |-    .format(a=1, b=1)
-    101 |+    
-102 102 | )
-103 103 | 
-104 104 | (
+93  | (
+94  |     (
+95  |         # comment
+    -         "{a}"
+96  +         f"{1}"
+97  |         # comment
+    -         "{b}"
+98  +         f"{1}"
+99  |     )
+100 |     # comment
+    -     .format(a=1, b=1)
+101 +     
+102 | )
+103 | 
+104 | (
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:104:1
@@ -859,19 +787,17 @@ UP032 [*] Use f-string instead of `format` call
     | |_____________^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-102 102 | )
-103 103 | 
-104 104 | (
-105     |-    "{a}"
-    105 |+    f"{1}"
-106 106 |     "b"
-107     |-).format(a=1)
-    107 |+)
-108 108 | 
-109 109 | 
-110 110 | def d(osname, version, release):
+102 | )
+103 | 
+104 | (
+    -     "{a}"
+105 +     f"{1}"
+106 |     "b"
+    - ).format(a=1)
+107 + )
+108 | 
+109 | 
+110 | def d(osname, version, release):
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:111:11
@@ -881,16 +807,14 @@ UP032 [*] Use f-string instead of `format` call
     |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-108 108 | 
-109 109 | 
-110 110 | def d(osname, version, release):
-111     |-    return"{}-{}.{}".format(osname, version, release)
-    111 |+    return f"{osname}-{version}.{release}"
-112 112 | 
-113 113 | 
-114 114 | def e():
+108 | 
+109 | 
+110 | def d(osname, version, release):
+    -     return"{}-{}.{}".format(osname, version, release)
+111 +     return f"{osname}-{version}.{release}"
+112 | 
+113 | 
+114 | def e():
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:115:10
@@ -900,16 +824,14 @@ UP032 [*] Use f-string instead of `format` call
     |          ^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-112 112 | 
-113 113 | 
-114 114 | def e():
-115     |-    yield"{}".format(1)
-    115 |+    yield f"{1}"
-116 116 | 
-117 117 | 
-118 118 | assert"{}".format(1)
+112 | 
+113 | 
+114 | def e():
+    -     yield"{}".format(1)
+115 +     yield f"{1}"
+116 | 
+117 | 
+118 | assert"{}".format(1)
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:118:7
@@ -918,16 +840,14 @@ UP032 [*] Use f-string instead of `format` call
     |       ^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-115 115 |     yield"{}".format(1)
-116 116 | 
-117 117 | 
-118     |-assert"{}".format(1)
-    118 |+assert f"{1}"
-119 119 | 
-120 120 | 
-121 121 | async def c():
+115 |     yield"{}".format(1)
+116 | 
+117 | 
+    - assert"{}".format(1)
+118 + assert f"{1}"
+119 | 
+120 | 
+121 | async def c():
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:122:12
@@ -937,16 +857,14 @@ UP032 [*] Use f-string instead of `format` call
     |            ^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-119 119 | 
-120 120 | 
-121 121 | async def c():
-122     |-    return "{}".format(await 3)
-    122 |+    return f"{await 3}"
-123 123 | 
-124 124 | 
-125 125 | async def c():
+119 | 
+120 | 
+121 | async def c():
+    -     return "{}".format(await 3)
+122 +     return f"{await 3}"
+123 | 
+124 | 
+125 | async def c():
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:126:12
@@ -956,16 +874,14 @@ UP032 [*] Use f-string instead of `format` call
     |            ^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-123 123 | 
-124 124 | 
-125 125 | async def c():
-126     |-    return "{}".format(1 + await 3)
-    126 |+    return f"{1 + await 3}"
-127 127 | 
-128 128 | 
-129 129 | "{}".format(1 * 2)
+123 | 
+124 | 
+125 | async def c():
+    -     return "{}".format(1 + await 3)
+126 +     return f"{1 + await 3}"
+127 | 
+128 | 
+129 | "{}".format(1 * 2)
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:129:1
@@ -976,16 +892,14 @@ UP032 [*] Use f-string instead of `format` call
 131 | ###
     |
 help: Convert to f-string
-
-ℹ Safe fix
-126 126 |     return "{}".format(1 + await 3)
-127 127 | 
-128 128 | 
-129     |-"{}".format(1 * 2)
-    129 |+f"{1 * 2}"
-130 130 | 
-131 131 | ###
-132 132 | # Non-errors
+126 |     return "{}".format(1 + await 3)
+127 | 
+128 | 
+    - "{}".format(1 * 2)
+129 + f"{1 * 2}"
+130 | 
+131 | ###
+132 | # Non-errors
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:160:1
@@ -1000,18 +914,16 @@ UP032 [*] Use f-string instead of `format` call
 164 |   """
     |
 help: Convert to f-string
-
-ℹ Safe fix
-157 157 | 
-158 158 | r'"\N{snowman} {}".format(a)'
-159 159 | 
-160     |-"123456789 {}".format(
-161     |-    11111111111111111111111111111111111111111111111111111111111111111111111111,
-162     |-)
-    160 |+f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}"
-163 161 | 
-164 162 | """
-165 163 | {}
+157 | 
+158 | r'"\N{snowman} {}".format(a)'
+159 | 
+    - "123456789 {}".format(
+    -     11111111111111111111111111111111111111111111111111111111111111111111111111,
+    - )
+160 + f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}"
+161 | 
+162 | """
+163 | {}
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:164:1
@@ -1032,27 +944,25 @@ UP032 [*] Use f-string instead of `format` call
 174 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     |
 help: Convert to f-string
-
-ℹ Safe fix
-161 161 |     11111111111111111111111111111111111111111111111111111111111111111111111111,
-162 162 | )
-163 163 | 
-    164 |+f"""
-    165 |+{1}
-    166 |+{2}
-    167 |+{111111111111111111111111111111111111111111111111111111111111111111111111111111111111111}
-164 168 | """
-165     |-{}
-166     |-{}
-167     |-{}
-168     |-""".format(
-169     |-1,
-170     |-2,
-171     |-111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
-172     |-)
-173 169 | 
-174 170 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
-175 171 | """.format(
+161 |     11111111111111111111111111111111111111111111111111111111111111111111111111,
+162 | )
+163 | 
+164 + f"""
+165 + {1}
+166 + {2}
+167 + {111111111111111111111111111111111111111111111111111111111111111111111111111111111111111}
+168 | """
+    - {}
+    - {}
+    - {}
+    - """.format(
+    - 1,
+    - 2,
+    - 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+    - )
+169 | 
+170 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+171 | """.format(
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:174:84
@@ -1069,20 +979,18 @@ UP032 [*] Use f-string instead of `format` call
 179 |   "{}".format(
     |
 help: Convert to f-string
-
-ℹ Safe fix
-171 171 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
-172 172 | )
-173 173 | 
-174     |-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
-175     |-""".format(
-176     |-    111111
-177     |-)
-    174 |+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111}
-    175 |+"""
-178 176 | 
-179 177 | "{}".format(
-180 178 |     [
+171 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+172 | )
+173 | 
+    - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+    - """.format(
+    -     111111
+    - )
+174 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111}
+175 + """
+176 | 
+177 | "{}".format(
+178 |     [
 
 UP032 Use f-string instead of `format` call
    --> UP032_0.py:202:1
@@ -1107,16 +1015,14 @@ UP032 [*] Use f-string instead of `format` call
 211 | # When fixing, trim the trailing empty string.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-206 206 | 
-207 207 | # The fixed string will exceed the line length, but it's still smaller than the
-208 208 | # existing line length, so it's fine.
-209     |-"<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-    209 |+f"<Customer: {self.internal_ids}, {self.external_ids}, {self.properties}, {self.tags}, {self.others}>"
-210 210 | 
-211 211 | # When fixing, trim the trailing empty string.
-212 212 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+206 | 
+207 | # The fixed string will exceed the line length, but it's still smaller than the
+208 | # existing line length, so it's fine.
+    - "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
+209 + f"<Customer: {self.internal_ids}, {self.external_ids}, {self.properties}, {self.tags}, {self.others}>"
+210 | 
+211 | # When fixing, trim the trailing empty string.
+212 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:212:18
@@ -1130,17 +1036,15 @@ UP032 [*] Use f-string instead of `format` call
 215 |   # When fixing, trim the trailing empty string.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-209 209 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-210 210 | 
-211 211 | # When fixing, trim the trailing empty string.
-212     |-raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-213     |-                 "".format(new_dict, d))
-    212 |+raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}")
-214 213 | 
-215 214 | # When fixing, trim the trailing empty string.
-216 215 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+209 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
+210 | 
+211 | # When fixing, trim the trailing empty string.
+    - raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+    -                  "".format(new_dict, d))
+212 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}")
+213 | 
+214 | # When fixing, trim the trailing empty string.
+215 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:216:18
@@ -1154,18 +1058,16 @@ UP032 [*] Use f-string instead of `format` call
 219 |   raise ValueError(
     |
 help: Convert to f-string
-
-ℹ Safe fix
-213 213 |                  "".format(new_dict, d))
-214 214 | 
-215 215 | # When fixing, trim the trailing empty string.
-216     |-raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-217     |-                 .format(new_dict, d))
-    216 |+raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-    217 |+                 )
-218 218 | 
-219 219 | raise ValueError(
-220 220 |     "Conflicting configuration dicts: {!r} {!r}"
+213 |                  "".format(new_dict, d))
+214 | 
+215 | # When fixing, trim the trailing empty string.
+    - raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+    -                  .format(new_dict, d))
+216 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+217 +                  )
+218 | 
+219 | raise ValueError(
+220 |     "Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:220:5
@@ -1177,17 +1079,15 @@ UP032 [*] Use f-string instead of `format` call
 222 |   )
     |
 help: Convert to f-string
-
-ℹ Safe fix
-217 217 |                  .format(new_dict, d))
-218 218 | 
-219 219 | raise ValueError(
-220     |-    "Conflicting configuration dicts: {!r} {!r}"
-221     |-    "".format(new_dict, d)
-    220 |+    f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-222 221 | )
-223 222 | 
-224 223 | raise ValueError(
+217 |                  .format(new_dict, d))
+218 | 
+219 | raise ValueError(
+    -     "Conflicting configuration dicts: {!r} {!r}"
+    -     "".format(new_dict, d)
+220 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+221 | )
+222 | 
+223 | raise ValueError(
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:225:5
@@ -1200,17 +1100,15 @@ UP032 [*] Use f-string instead of `format` call
 228 |   )
     |
 help: Convert to f-string
-
-ℹ Safe fix
-222 222 | )
-223 223 | 
-224 224 | raise ValueError(
-225     |-    "Conflicting configuration dicts: {!r} {!r}"
-226     |-    "".format(new_dict, d)
-    225 |+    f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-227 226 | 
-228 227 | )
-229 228 | 
+222 | )
+223 | 
+224 | raise ValueError(
+    -     "Conflicting configuration dicts: {!r} {!r}"
+    -     "".format(new_dict, d)
+225 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+226 | 
+227 | )
+228 | 
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:231:1
@@ -1225,19 +1123,17 @@ UP032 [*] Use f-string instead of `format` call
 236 |   ("{}" "{{}}").format(a)
     |
 help: Convert to f-string
-
-ℹ Safe fix
-229 229 | 
-230 230 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
-231 231 | (
-    232 |+    f"{a}"
-232 233 |     "{}"
-233     |-    "{{}}"
-234     |-).format(a)
-    234 |+)
-235 235 | 
-236 236 | ("{}" "{{}}").format(a)
-237 237 | 
+229 | 
+230 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
+231 | (
+232 +     f"{a}"
+233 |     "{}"
+    -     "{{}}"
+    - ).format(a)
+234 + )
+235 | 
+236 | ("{}" "{{}}").format(a)
+237 | 
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:236:1
@@ -1248,16 +1144,14 @@ UP032 [*] Use f-string instead of `format` call
     | ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-
-ℹ Safe fix
-233 233 |     "{{}}"
-234 234 | ).format(a)
-235 235 | 
-236     |-("{}" "{{}}").format(a)
-    236 |+(f"{a}" "{}")
-237 237 | 
-238 238 | 
-239 239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+233 |     "{{}}"
+234 | ).format(a)
+235 | 
+    - ("{}" "{{}}").format(a)
+236 + (f"{a}" "{}")
+237 | 
+238 | 
+239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:240:1
@@ -1272,20 +1166,18 @@ UP032 [*] Use f-string instead of `format` call
 245 |   ("{}" "{{{}}}").format(a, b)
     |
 help: Convert to f-string
-
-ℹ Safe fix
-238 238 | 
-239 239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
-240 240 | (
-241     |-    "{}"
-242     |-    "{{{}}}"
-243     |-).format(a, b)
-    241 |+    f"{a}"
-    242 |+    f"{{{b}}}"
-    243 |+)
-244 244 | 
-245 245 | ("{}" "{{{}}}").format(a, b)
-246 246 | 
+238 | 
+239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+240 | (
+    -     "{}"
+    -     "{{{}}}"
+    - ).format(a, b)
+241 +     f"{a}"
+242 +     f"{{{b}}}"
+243 + )
+244 | 
+245 | ("{}" "{{{}}}").format(a, b)
+246 | 
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:245:1
@@ -1298,16 +1190,14 @@ UP032 [*] Use f-string instead of `format` call
 247 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-242 242 |     "{{{}}}"
-243 243 | ).format(a, b)
-244 244 | 
-245     |-("{}" "{{{}}}").format(a, b)
-    245 |+(f"{a}" f"{{{b}}}")
-246 246 | 
-247 247 | # The dictionary should be parenthesized.
-248 248 | "{}".format({0: 1}[0])
+242 |     "{{{}}}"
+243 | ).format(a, b)
+244 | 
+    - ("{}" "{{{}}}").format(a, b)
+245 + (f"{a}" f"{{{b}}}")
+246 | 
+247 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:248:1
@@ -1319,16 +1209,14 @@ UP032 [*] Use f-string instead of `format` call
 250 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-245 245 | ("{}" "{{{}}}").format(a, b)
-246 246 | 
-247 247 | # The dictionary should be parenthesized.
-248     |-"{}".format({0: 1}[0])
-    248 |+f"{({0: 1}[0])}"
-249 249 | 
-250 250 | # The dictionary should be parenthesized.
-251 251 | "{}".format({0: 1}.bar)
+245 | ("{}" "{{{}}}").format(a, b)
+246 | 
+247 | # The dictionary should be parenthesized.
+    - "{}".format({0: 1}[0])
+248 + f"{({0: 1}[0])}"
+249 | 
+250 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:251:1
@@ -1340,16 +1228,14 @@ UP032 [*] Use f-string instead of `format` call
 253 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-248 248 | "{}".format({0: 1}[0])
-249 249 | 
-250 250 | # The dictionary should be parenthesized.
-251     |-"{}".format({0: 1}.bar)
-    251 |+f"{({0: 1}.bar)}"
-252 252 | 
-253 253 | # The dictionary should be parenthesized.
-254 254 | "{}".format({0: 1}())
+248 | "{}".format({0: 1}[0])
+249 | 
+250 | # The dictionary should be parenthesized.
+    - "{}".format({0: 1}.bar)
+251 + f"{({0: 1}.bar)}"
+252 | 
+253 | # The dictionary should be parenthesized.
+254 | "{}".format({0: 1}())
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:254:1
@@ -1361,16 +1247,14 @@ UP032 [*] Use f-string instead of `format` call
 256 | # The string shouldn't be converted, since it would require repeating the function call.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-251 251 | "{}".format({0: 1}.bar)
-252 252 | 
-253 253 | # The dictionary should be parenthesized.
-254     |-"{}".format({0: 1}())
-    254 |+f"{({0: 1}())}"
-255 255 | 
-256 256 | # The string shouldn't be converted, since it would require repeating the function call.
-257 257 | "{x} {x}".format(x=foo())
+251 | "{}".format({0: 1}.bar)
+252 | 
+253 | # The dictionary should be parenthesized.
+    - "{}".format({0: 1}())
+254 + f"{({0: 1}())}"
+255 | 
+256 | # The string shouldn't be converted, since it would require repeating the function call.
+257 | "{x} {x}".format(x=foo())
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:261:1
@@ -1382,16 +1266,14 @@ UP032 [*] Use f-string instead of `format` call
 263 | # The call should be removed, but the string itself should remain.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-258 258 | "{0} {0}".format(foo())
-259 259 | 
-260 260 | # The string _should_ be converted, since the function call is repeated in the arguments.
-261     |-"{0} {1}".format(foo(), foo())
-    261 |+f"{foo()} {foo()}"
-262 262 | 
-263 263 | # The call should be removed, but the string itself should remain.
-264 264 | ''.format(self.project)
+258 | "{0} {0}".format(foo())
+259 | 
+260 | # The string _should_ be converted, since the function call is repeated in the arguments.
+    - "{0} {1}".format(foo(), foo())
+261 + f"{foo()} {foo()}"
+262 | 
+263 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:264:1
@@ -1403,16 +1285,14 @@ UP032 [*] Use f-string instead of `format` call
 266 | # The call should be removed, but the string itself should remain.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-261 261 | "{0} {1}".format(foo(), foo())
-262 262 | 
-263 263 | # The call should be removed, but the string itself should remain.
-264     |-''.format(self.project)
-    264 |+''
-265 265 | 
-266 266 | # The call should be removed, but the string itself should remain.
-267 267 | "".format(self.project)
+261 | "{0} {1}".format(foo(), foo())
+262 | 
+263 | # The call should be removed, but the string itself should remain.
+    - ''.format(self.project)
+264 + ''
+265 | 
+266 | # The call should be removed, but the string itself should remain.
+267 | "".format(self.project)
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:267:1
@@ -1424,16 +1304,14 @@ UP032 [*] Use f-string instead of `format` call
 269 | # Not a valid type annotation but this test shouldn't result in a panic.
     |
 help: Convert to f-string
-
-ℹ Safe fix
-264 264 | ''.format(self.project)
-265 265 | 
-266 266 | # The call should be removed, but the string itself should remain.
-267     |-"".format(self.project)
-    267 |+""
-268 268 | 
-269 269 | # Not a valid type annotation but this test shouldn't result in a panic.
-270 270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+264 | ''.format(self.project)
+265 | 
+266 | # The call should be removed, but the string itself should remain.
+    - "".format(self.project)
+267 + ""
+268 | 
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 
 UP032 [*] Use f-string instead of `format` call
    --> UP032_0.py:271:5
@@ -1442,12 +1320,32 @@ UP032 [*] Use f-string instead of `format` call
 270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 271 | x: "'{} + {}'.format(x, y)"
     |     ^^^^^^^^^^^^^^^^^^^^^^
+272 |
+273 | # Regression https://github.com/astral-sh/ruff/issues/21000
     |
 help: Convert to f-string
+268 | 
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+    - x: "'{} + {}'.format(x, y)"
+271 + x: "f'{x} + {y}'"
+272 | 
+273 | # Regression https://github.com/astral-sh/ruff/issues/21000
+274 | # Fix should parenthesize walrus
 
-ℹ Safe fix
-268 268 | 
-269 269 | # Not a valid type annotation but this test shouldn't result in a panic.
-270 270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
-271     |-x: "'{} + {}'.format(x, y)"
-    271 |+x: "f'{x} + {y}'"
+UP032 [*] Use f-string instead of `format` call
+   --> UP032_0.py:277:14
+    |
+275 | if __name__ == "__main__":
+276 |     number = 0
+277 |     string = "{}".format(number := number + 1)
+    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+278 |     print(string)
+    |
+help: Convert to f-string
+274 | # Fix should parenthesize walrus
+275 | if __name__ == "__main__":
+276 |     number = 0
+    -     string = "{}".format(number := number + 1)
+277 +     string = f"{(number := number + 1)}"
+278 |     print(string)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap
index 705d8d2492..20370bdb62 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap
@@ -8,7 +8,5 @@ UP032 [*] Use f-string instead of `format` call
   | ^^^^^^^^^^^^^^^^^^^^
   |
 help: Convert to f-string
-
-ℹ Safe 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.
+  - "{} {}".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_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap
index b104d2bb3f..835b1ea651 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap
@@ -11,14 +11,12 @@ UP032 [*] Use f-string instead of `format` call
 4 | "{a.real}".format(a=1)
   |
 help: Convert to f-string
-
-ℹ Safe 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 | 
+1 | # Errors
+  - "{.real}".format(1)
+2 + f"{(1).real}"
+3 | "{0.real}".format(1)
+4 | "{a.real}".format(a=1)
+5 | 
 
 UP032 [*] Use f-string instead of `format` call
  --> UP032_2.py:3:1
@@ -30,15 +28,13 @@ UP032 [*] Use f-string instead of `format` call
 4 | "{a.real}".format(a=1)
   |
 help: Convert to f-string
-
-ℹ Safe 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)
+1 | # Errors
+2 | "{.real}".format(1)
+  - "{0.real}".format(1)
+3 + f"{(1).real}"
+4 | "{a.real}".format(a=1)
+5 | 
+6 | "{.real}".format(1.0)
 
 UP032 [*] Use f-string instead of `format` call
  --> UP032_2.py:4:1
@@ -51,16 +47,14 @@ UP032 [*] Use f-string instead of `format` call
 6 | "{.real}".format(1.0)
   |
 help: Convert to f-string
-
-ℹ Safe 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)
+1 | # Errors
+2 | "{.real}".format(1)
+3 | "{0.real}".format(1)
+  - "{a.real}".format(a=1)
+4 + f"{(1).real}"
+5 | 
+6 | "{.real}".format(1.0)
+7 | "{0.real}".format(1.0)
 
 UP032 [*] Use f-string instead of `format` call
  --> UP032_2.py:6:1
@@ -73,16 +67,14 @@ UP032 [*] Use f-string instead of `format` call
 8 | "{a.real}".format(a=1.0)
   |
 help: Convert to f-string
-
-ℹ Safe 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 | 
+3 | "{0.real}".format(1)
+4 | "{a.real}".format(a=1)
+5 | 
+  - "{.real}".format(1.0)
+6 + f"{1.0.real}"
+7 | "{0.real}".format(1.0)
+8 | "{a.real}".format(a=1.0)
+9 | 
 
 UP032 [*] Use f-string instead of `format` call
  --> UP032_2.py:7:1
@@ -93,16 +85,14 @@ UP032 [*] Use f-string instead of `format` call
 8 | "{a.real}".format(a=1.0)
   |
 help: Convert to f-string
-
-ℹ Safe 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)
+4  | "{a.real}".format(a=1)
+5  | 
+6  | "{.real}".format(1.0)
+   - "{0.real}".format(1.0)
+7  + f"{1.0.real}"
+8  | "{a.real}".format(a=1.0)
+9  | 
+10 | "{.real}".format(1j)
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:8:1
@@ -115,16 +105,14 @@ UP032 [*] Use f-string instead of `format` call
 10 | "{.real}".format(1j)
    |
 help: Convert to f-string
-
-ℹ Safe 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)
+5  | 
+6  | "{.real}".format(1.0)
+7  | "{0.real}".format(1.0)
+   - "{a.real}".format(a=1.0)
+8  + f"{1.0.real}"
+9  | 
+10 | "{.real}".format(1j)
+11 | "{0.real}".format(1j)
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:10:1
@@ -137,16 +125,14 @@ UP032 [*] Use f-string instead of `format` call
 12 | "{a.real}".format(a=1j)
    |
 help: Convert to f-string
-
-ℹ Safe 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 | 
+7  | "{0.real}".format(1.0)
+8  | "{a.real}".format(a=1.0)
+9  | 
+   - "{.real}".format(1j)
+10 + f"{1j.real}"
+11 | "{0.real}".format(1j)
+12 | "{a.real}".format(a=1j)
+13 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:11:1
@@ -157,16 +143,14 @@ UP032 [*] Use f-string instead of `format` call
 12 | "{a.real}".format(a=1j)
    |
 help: Convert to f-string
-
-ℹ Safe 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)
+8  | "{a.real}".format(a=1.0)
+9  | 
+10 | "{.real}".format(1j)
+   - "{0.real}".format(1j)
+11 + f"{1j.real}"
+12 | "{a.real}".format(a=1j)
+13 | 
+14 | "{.real}".format(0b01)
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:12:1
@@ -179,16 +163,14 @@ UP032 [*] Use f-string instead of `format` call
 14 | "{.real}".format(0b01)
    |
 help: Convert to f-string
-
-ℹ Safe 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)
+9  | 
+10 | "{.real}".format(1j)
+11 | "{0.real}".format(1j)
+   - "{a.real}".format(a=1j)
+12 + f"{1j.real}"
+13 | 
+14 | "{.real}".format(0b01)
+15 | "{0.real}".format(0b01)
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:14:1
@@ -201,16 +183,14 @@ UP032 [*] Use f-string instead of `format` call
 16 | "{a.real}".format(a=0b01)
    |
 help: Convert to f-string
-
-ℹ Safe 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 | 
+11 | "{0.real}".format(1j)
+12 | "{a.real}".format(a=1j)
+13 | 
+   - "{.real}".format(0b01)
+14 + f"{0b01.real}"
+15 | "{0.real}".format(0b01)
+16 | "{a.real}".format(a=0b01)
+17 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:15:1
@@ -221,16 +201,14 @@ UP032 [*] Use f-string instead of `format` call
 16 | "{a.real}".format(a=0b01)
    |
 help: Convert to f-string
-
-ℹ Safe 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)
+12 | "{a.real}".format(a=1j)
+13 | 
+14 | "{.real}".format(0b01)
+   - "{0.real}".format(0b01)
+15 + f"{0b01.real}"
+16 | "{a.real}".format(a=0b01)
+17 | 
+18 | "{}".format(1 + 2)
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:16:1
@@ -243,16 +221,14 @@ UP032 [*] Use f-string instead of `format` call
 18 | "{}".format(1 + 2)
    |
 help: Convert to f-string
-
-ℹ Safe 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])
+13 | 
+14 | "{.real}".format(0b01)
+15 | "{0.real}".format(0b01)
+   - "{a.real}".format(a=0b01)
+16 + f"{0b01.real}"
+17 | 
+18 | "{}".format(1 + 2)
+19 | "{}".format([1, 2])
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:18:1
@@ -265,16 +241,14 @@ UP032 [*] Use f-string instead of `format` call
 20 | "{}".format({1, 2})
    |
 help: Convert to f-string
-
-ℹ Safe 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})
+15 | "{0.real}".format(0b01)
+16 | "{a.real}".format(a=0b01)
+17 | 
+   - "{}".format(1 + 2)
+18 + f"{1 + 2}"
+19 | "{}".format([1, 2])
+20 | "{}".format({1, 2})
+21 | "{}".format({1: 2, 3: 4})
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:19:1
@@ -286,16 +260,14 @@ UP032 [*] Use f-string instead of `format` call
 21 | "{}".format({1: 2, 3: 4})
    |
 help: Convert to f-string
-
-ℹ Safe 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)))
+16 | "{a.real}".format(a=0b01)
+17 | 
+18 | "{}".format(1 + 2)
+   - "{}".format([1, 2])
+19 + f"{[1, 2]}"
+20 | "{}".format({1, 2})
+21 | "{}".format({1: 2, 3: 4})
+22 | "{}".format((i for i in range(2)))
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:20:1
@@ -308,16 +280,14 @@ UP032 [*] Use f-string instead of `format` call
 22 | "{}".format((i for i in range(2)))
    |
 help: Convert to f-string
-
-ℹ Safe 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 | 
+17 | 
+18 | "{}".format(1 + 2)
+19 | "{}".format([1, 2])
+   - "{}".format({1, 2})
+20 + f"{({1, 2})}"
+21 | "{}".format({1: 2, 3: 4})
+22 | "{}".format((i for i in range(2)))
+23 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:21:1
@@ -329,16 +299,14 @@ UP032 [*] Use f-string instead of `format` call
 22 | "{}".format((i for i in range(2)))
    |
 help: Convert to f-string
-
-ℹ Safe 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)
+18 | "{}".format(1 + 2)
+19 | "{}".format([1, 2])
+20 | "{}".format({1, 2})
+   - "{}".format({1: 2, 3: 4})
+21 + f"{({1: 2, 3: 4})}"
+22 | "{}".format((i for i in range(2)))
+23 | 
+24 | "{.real}".format(1 + 2)
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:22:1
@@ -351,16 +319,14 @@ UP032 [*] Use f-string instead of `format` call
 24 | "{.real}".format(1 + 2)
    |
 help: Convert to f-string
-
-ℹ Safe 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])
+19 | "{}".format([1, 2])
+20 | "{}".format({1, 2})
+21 | "{}".format({1: 2, 3: 4})
+   - "{}".format((i for i in range(2)))
+22 + f"{(i for i in range(2))}"
+23 | 
+24 | "{.real}".format(1 + 2)
+25 | "{.real}".format([1, 2])
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:24:1
@@ -373,16 +339,14 @@ UP032 [*] Use f-string instead of `format` call
 26 | "{.real}".format({1, 2})
    |
 help: Convert to f-string
-
-ℹ Safe 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})
+21 | "{}".format({1: 2, 3: 4})
+22 | "{}".format((i for i in range(2)))
+23 | 
+   - "{.real}".format(1 + 2)
+24 + f"{(1 + 2).real}"
+25 | "{.real}".format([1, 2])
+26 | "{.real}".format({1, 2})
+27 | "{.real}".format({1: 2, 3: 4})
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:25:1
@@ -394,16 +358,14 @@ UP032 [*] Use f-string instead of `format` call
 27 | "{.real}".format({1: 2, 3: 4})
    |
 help: Convert to f-string
-
-ℹ Safe 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)))
+22 | "{}".format((i for i in range(2)))
+23 | 
+24 | "{.real}".format(1 + 2)
+   - "{.real}".format([1, 2])
+25 + f"{[1, 2].real}"
+26 | "{.real}".format({1, 2})
+27 | "{.real}".format({1: 2, 3: 4})
+28 | "{}".format((i for i in range(2)))
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:26:1
@@ -416,15 +378,14 @@ UP032 [*] Use f-string instead of `format` call
 28 | "{}".format((i for i in range(2)))
    |
 help: Convert to f-string
-
-ℹ Safe 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)))
+23 | 
+24 | "{.real}".format(1 + 2)
+25 | "{.real}".format([1, 2])
+   - "{.real}".format({1, 2})
+26 + f"{({1, 2}).real}"
+27 | "{.real}".format({1: 2, 3: 4})
+28 | "{}".format((i for i in range(2)))
+29 | 
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:27:1
@@ -436,14 +397,14 @@ UP032 [*] Use f-string instead of `format` call
 28 | "{}".format((i for i in range(2)))
    |
 help: Convert to f-string
-
-ℹ Safe 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)))
+24 | "{.real}".format(1 + 2)
+25 | "{.real}".format([1, 2])
+26 | "{.real}".format({1, 2})
+   - "{.real}".format({1: 2, 3: 4})
+27 + f"{({1: 2, 3: 4}).real}"
+28 | "{}".format((i for i in range(2)))
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/21017
 
 UP032 [*] Use f-string instead of `format` call
   --> UP032_2.py:28:1
@@ -452,12 +413,65 @@ UP032 [*] Use f-string instead of `format` call
 27 | "{.real}".format({1: 2, 3: 4})
 28 | "{}".format((i for i in range(2)))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+29 |
+30 | # https://github.com/astral-sh/ruff/issues/21017
    |
 help: Convert to f-string
+25 | "{.real}".format([1, 2])
+26 | "{.real}".format({1, 2})
+27 | "{.real}".format({1: 2, 3: 4})
+   - "{}".format((i for i in range(2)))
+28 + f"{(i for i in range(2))}"
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/21017
+31 | "{.real}".format(1_2)
 
-ℹ Safe 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))}"
+UP032 [*] Use f-string instead of `format` call
+  --> UP032_2.py:31:1
+   |
+30 | # https://github.com/astral-sh/ruff/issues/21017
+31 | "{.real}".format(1_2)
+   | ^^^^^^^^^^^^^^^^^^^^^
+32 | "{0.real}".format(1_2)
+33 | "{a.real}".format(a=1_2)
+   |
+help: Convert to f-string
+28 | "{}".format((i for i in range(2)))
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/21017
+   - "{.real}".format(1_2)
+31 + f"{(1_2).real}"
+32 | "{0.real}".format(1_2)
+33 | "{a.real}".format(a=1_2)
+
+UP032 [*] Use f-string instead of `format` call
+  --> UP032_2.py:32:1
+   |
+30 | # https://github.com/astral-sh/ruff/issues/21017
+31 | "{.real}".format(1_2)
+32 | "{0.real}".format(1_2)
+   | ^^^^^^^^^^^^^^^^^^^^^^
+33 | "{a.real}".format(a=1_2)
+   |
+help: Convert to f-string
+29 | 
+30 | # https://github.com/astral-sh/ruff/issues/21017
+31 | "{.real}".format(1_2)
+   - "{0.real}".format(1_2)
+32 + f"{(1_2).real}"
+33 | "{a.real}".format(a=1_2)
+
+UP032 [*] Use f-string instead of `format` call
+  --> UP032_2.py:33:1
+   |
+31 | "{.real}".format(1_2)
+32 | "{0.real}".format(1_2)
+33 | "{a.real}".format(a=1_2)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Convert to f-string
+30 | # https://github.com/astral-sh/ruff/issues/21017
+31 | "{.real}".format(1_2)
+32 | "{0.real}".format(1_2)
+   - "{a.real}".format(a=1_2)
+33 + f"{(1_2).real}"
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap
index 360f79668a..ea4fbd79e2 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap
@@ -10,16 +10,14 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
 6 |     pass
   |
 help: Rewrite with `@functools.cache
-
-ℹ Safe fix
-1 1 | import functools
-2 2 | 
-3 3 | 
-4   |-@functools.lru_cache(maxsize=None)
-  4 |+@functools.cache
-5 5 | def fixme():
-6 6 |     pass
-7 7 | 
+1 | import functools
+2 | 
+3 | 
+  - @functools.lru_cache(maxsize=None)
+4 + @functools.cache
+5 | def fixme():
+6 |     pass
+7 | 
 
 UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
   --> UP033_0.py:10:21
@@ -31,16 +29,14 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
 12 |     pass
    |
 help: Rewrite with `@functools.cache
-
-ℹ Safe fix
-7  7  | 
-8  8  | 
-9  9  | @other_decorator
-10    |-@functools.lru_cache(maxsize=None)
-   10 |+@functools.cache
-11 11 | def fixme():
-12 12 |     pass
-13 13 | 
+7  | 
+8  | 
+9  | @other_decorator
+   - @functools.lru_cache(maxsize=None)
+10 + @functools.cache
+11 | def fixme():
+12 |     pass
+13 | 
 
 UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
   --> UP033_0.py:15:21
@@ -51,13 +47,11 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
 17 | def fixme():
    |
 help: Rewrite with `@functools.cache
-
-ℹ Safe fix
-12 12 |     pass
-13 13 | 
-14 14 | 
-15    |-@functools.lru_cache(maxsize=None)
-   15 |+@functools.cache
-16 16 | @other_decorator
-17 17 | def fixme():
-18 18 |     pass
+12 |     pass
+13 | 
+14 | 
+   - @functools.lru_cache(maxsize=None)
+15 + @functools.cache
+16 | @other_decorator
+17 | def fixme():
+18 |     pass
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap
index cb370b0f83..8bc7dc837b 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap
@@ -10,17 +10,15 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
 6 |     pass
   |
 help: Rewrite with `@functools.cache
-
-ℹ Safe fix
-1   |-from functools import lru_cache
-  1 |+from functools import lru_cache, cache
-2 2 | 
-3 3 | 
-4   |-@lru_cache(maxsize=None)
-  4 |+@cache
-5 5 | def fixme():
-6 6 |     pass
-7 7 | 
+  - from functools import lru_cache
+1 + from functools import lru_cache, cache
+2 | 
+3 | 
+  - @lru_cache(maxsize=None)
+4 + @cache
+5 | def fixme():
+6 |     pass
+7 | 
 
 UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
   --> UP033_1.py:10:11
@@ -32,22 +30,20 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
 12 |     pass
    |
 help: Rewrite with `@functools.cache
-
-ℹ Safe fix
-1     |-from functools import lru_cache
-   1  |+from functools import lru_cache, cache
-2  2  | 
-3  3  | 
-4  4  | @lru_cache(maxsize=None)
+   - from functools import lru_cache
+1  + from functools import lru_cache, cache
+2  | 
+3  | 
+4  | @lru_cache(maxsize=None)
 --------------------------------------------------------------------------------
-7  7  | 
-8  8  | 
-9  9  | @other_decorator
-10    |-@lru_cache(maxsize=None)
-   10 |+@cache
-11 11 | def fixme():
-12 12 |     pass
-13 13 | 
+7  | 
+8  | 
+9  | @other_decorator
+   - @lru_cache(maxsize=None)
+10 + @cache
+11 | def fixme():
+12 |     pass
+13 | 
 
 UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
   --> UP033_1.py:15:11
@@ -58,19 +54,17 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)`
 17 | def fixme():
    |
 help: Rewrite with `@functools.cache
-
-ℹ Safe fix
-1     |-from functools import lru_cache
-   1  |+from functools import lru_cache, cache
-2  2  | 
-3  3  | 
-4  4  | @lru_cache(maxsize=None)
+   - from functools import lru_cache
+1  + from functools import lru_cache, cache
+2  | 
+3  | 
+4  | @lru_cache(maxsize=None)
 --------------------------------------------------------------------------------
-12 12 |     pass
-13 13 | 
-14 14 | 
-15    |-@lru_cache(maxsize=None)
-   15 |+@cache
-16 16 | @other_decorator
-17 17 | def fixme():
-18 18 |     pass
+12 |     pass
+13 | 
+14 | 
+   - @lru_cache(maxsize=None)
+15 + @cache
+16 | @other_decorator
+17 | def fixme():
+18 |     pass
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap
index 99c070b031..0bbe51fad7 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap
@@ -11,14 +11,12 @@ UP034 [*] Avoid extraneous parentheses
 4 | # UP034
   |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-1 1 | # UP034
-2   |-print(("foo"))
-  2 |+print("foo")
-3 3 | 
-4 4 | # UP034
-5 5 | print(("hell((goodybe))o"))
+1 | # UP034
+  - print(("foo"))
+2 + print("foo")
+3 | 
+4 | # UP034
+5 | print(("hell((goodybe))o"))
 
 UP034 [*] Avoid extraneous parentheses
  --> UP034.py:5:7
@@ -30,16 +28,14 @@ UP034 [*] Avoid extraneous parentheses
 7 | # UP034
   |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-2 2 | print(("foo"))
-3 3 | 
-4 4 | # UP034
-5   |-print(("hell((goodybe))o"))
-  5 |+print("hell((goodybe))o")
-6 6 | 
-7 7 | # UP034
-8 8 | print((("foo")))
+2 | print(("foo"))
+3 | 
+4 | # UP034
+  - print(("hell((goodybe))o"))
+5 + print("hell((goodybe))o")
+6 | 
+7 | # UP034
+8 | print((("foo")))
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:8:7
@@ -51,16 +47,14 @@ UP034 [*] Avoid extraneous parentheses
 10 | # UP034
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-5 5 | print(("hell((goodybe))o"))
-6 6 | 
-7 7 | # UP034
-8   |-print((("foo")))
-  8 |+print(("foo"))
-9 9 | 
-10 10 | # UP034
-11 11 | print((((1))))
+5  | print(("hell((goodybe))o"))
+6  | 
+7  | # UP034
+   - print((("foo")))
+8  + print(("foo"))
+9  | 
+10 | # UP034
+11 | print((((1))))
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:11:7
@@ -72,16 +66,14 @@ UP034 [*] Avoid extraneous parentheses
 13 | # UP034
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-8  8  | print((("foo")))
-9  9  | 
-10 10 | # UP034
-11    |-print((((1))))
-   11 |+print(((1)))
-12 12 | 
-13 13 | # UP034
-14 14 | print(("foo{}".format(1)))
+8  | print((("foo")))
+9  | 
+10 | # UP034
+   - print((((1))))
+11 + print(((1)))
+12 | 
+13 | # UP034
+14 | print(("foo{}".format(1)))
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:14:7
@@ -93,16 +85,14 @@ UP034 [*] Avoid extraneous parentheses
 16 | # UP034
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-11 11 | print((((1))))
-12 12 | 
-13 13 | # UP034
-14    |-print(("foo{}".format(1)))
-   14 |+print("foo{}".format(1))
-15 15 | 
-16 16 | # UP034
-17 17 | print(
+11 | print((((1))))
+12 | 
+13 | # UP034
+   - print(("foo{}".format(1)))
+14 + print("foo{}".format(1))
+15 | 
+16 | # UP034
+17 | print(
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:18:5
@@ -114,16 +104,14 @@ UP034 [*] Avoid extraneous parentheses
 19 | )
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-15 15 | 
-16 16 | # UP034
-17 17 | print(
-18    |-    ("foo{}".format(1))
-   18 |+    "foo{}".format(1)
-19 19 | )
-20 20 | 
-21 21 | # UP034
+15 | 
+16 | # UP034
+17 | print(
+   -     ("foo{}".format(1))
+18 +     "foo{}".format(1)
+19 | )
+20 | 
+21 | # UP034
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:23:5
@@ -137,19 +125,17 @@ UP034 [*] Avoid extraneous parentheses
 26 |   )
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-20 20 | 
-21 21 | # UP034
-22 22 | print(
-23    |-    (
-   23 |+    
-24 24 |         "foo"
-25    |-    )
-   25 |+    
-26 26 | )
-27 27 | 
-28 28 | # UP034
+20 | 
+21 | # UP034
+22 | print(
+   -     (
+23 +     
+24 |         "foo"
+   -     )
+25 +     
+26 | )
+27 | 
+28 | # UP034
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:30:13
@@ -162,16 +148,14 @@ UP034 [*] Avoid extraneous parentheses
 32 | # UP034
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-27 27 | 
-28 28 | # UP034
-29 29 | def f():
-30    |-    x = int(((yield 1)))
-   30 |+    x = int((yield 1))
-31 31 | 
-32 32 | # UP034
-33 33 | if True:
+27 | 
+28 | # UP034
+29 | def f():
+   -     x = int(((yield 1)))
+30 +     x = int((yield 1))
+31 | 
+32 | # UP034
+33 | if True:
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:35:9
@@ -183,16 +167,14 @@ UP034 [*] Avoid extraneous parentheses
 36 |     )
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-32 32 | # UP034
-33 33 | if True:
-34 34 |     print(
-35    |-        ("foo{}".format(1))
-   35 |+        "foo{}".format(1)
-36 36 |     )
-37 37 | 
-38 38 | # UP034
+32 | # UP034
+33 | if True:
+34 |     print(
+   -         ("foo{}".format(1))
+35 +         "foo{}".format(1)
+36 |     )
+37 | 
+38 | # UP034
 
 UP034 [*] Avoid extraneous parentheses
   --> UP034.py:39:7
@@ -204,13 +186,11 @@ UP034 [*] Avoid extraneous parentheses
 41 | # OK
    |
 help: Remove extraneous parentheses
-
-ℹ Safe fix
-36 36 |     )
-37 37 | 
-38 38 | # UP034
-39    |-print((x for x in range(3)))
-   39 |+print(x for x in range(3))
-40 40 | 
-41 41 | # OK
-42 42 | print("foo")
+36 |     )
+37 | 
+38 | # UP034
+   - print((x for x in range(3)))
+39 + print(x for x in range(3))
+40 | 
+41 | # OK
+42 | print("foo")
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap
index 8b0669e054..ac901b5d66 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap
@@ -11,14 +11,12 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 4 | from collections import Mapping as MAP
   |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-1 1 | # UP035
-2   |-from collections import Mapping
-  2 |+from collections.abc import Mapping
-3 3 | 
-4 4 | from collections import Mapping as MAP
-5 5 | 
+1 | # UP035
+  - from collections import Mapping
+2 + from collections.abc import Mapping
+3 | 
+4 | from collections import Mapping as MAP
+5 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
  --> UP035.py:4:1
@@ -31,16 +29,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 6 | from collections import Mapping, Sequence
   |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-1 1 | # UP035
-2 2 | from collections import Mapping
-3 3 | 
-4   |-from collections import Mapping as MAP
-  4 |+from collections.abc import Mapping as MAP
-5 5 | 
-6 6 | from collections import Mapping, Sequence
-7 7 | 
+1 | # UP035
+2 | from collections import Mapping
+3 | 
+  - from collections import Mapping as MAP
+4 + from collections.abc import Mapping as MAP
+5 | 
+6 | from collections import Mapping, Sequence
+7 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence`
  --> UP035.py:6:1
@@ -53,16 +49,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence`
 8 | from collections import Counter, Mapping
   |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-3 3 | 
-4 4 | from collections import Mapping as MAP
-5 5 | 
-6   |-from collections import Mapping, Sequence
-  6 |+from collections.abc import Mapping, Sequence
-7 7 | 
-8 8 | from collections import Counter, Mapping
-9 9 | 
+3 | 
+4 | from collections import Mapping as MAP
+5 | 
+  - from collections import Mapping, Sequence
+6 + from collections.abc import Mapping, Sequence
+7 | 
+8 | from collections import Counter, Mapping
+9 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:8:1
@@ -75,17 +69,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 10 | from collections import (Counter, Mapping)
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-5  5  | 
-6  6  | from collections import Mapping, Sequence
-7  7  | 
-8     |-from collections import Counter, Mapping
-   8  |+from collections import Counter
-   9  |+from collections.abc import Mapping
-9  10 | 
-10 11 | from collections import (Counter, Mapping)
-11 12 | 
+5  | 
+6  | from collections import Mapping, Sequence
+7  | 
+   - from collections import Counter, Mapping
+8  + from collections import Counter
+9  + from collections.abc import Mapping
+10 | 
+11 | from collections import (Counter, Mapping)
+12 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:10:1
@@ -98,17 +90,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 12 | from collections import (Counter,
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-7  7  | 
-8  8  | from collections import Counter, Mapping
-9  9  | 
-10    |-from collections import (Counter, Mapping)
-   10 |+from collections import (Counter)
-   11 |+from collections.abc import Mapping
-11 12 | 
-12 13 | from collections import (Counter,
-13 14 |                          Mapping)
+7  | 
+8  | from collections import Counter, Mapping
+9  | 
+   - from collections import (Counter, Mapping)
+10 + from collections import (Counter)
+11 + from collections.abc import Mapping
+12 | 
+13 | from collections import (Counter,
+14 |                          Mapping)
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:12:1
@@ -122,18 +112,16 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 15 |   from collections import Counter, \
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-9  9  | 
-10 10 | from collections import (Counter, Mapping)
-11 11 | 
-12    |-from collections import (Counter,
-13    |-                         Mapping)
-   12 |+from collections import (Counter)
-   13 |+from collections.abc import Mapping
-14 14 | 
-15 15 | from collections import Counter, \
-16 16 |                          Mapping
+9  | 
+10 | from collections import (Counter, Mapping)
+11 | 
+   - from collections import (Counter,
+   -                          Mapping)
+12 + from collections import (Counter)
+13 + from collections.abc import Mapping
+14 | 
+15 | from collections import Counter, \
+16 |                          Mapping
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:15:1
@@ -147,18 +135,16 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 18 |   from collections import Counter, Mapping, Sequence
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-12 12 | from collections import (Counter,
-13 13 |                          Mapping)
-14 14 | 
-15    |-from collections import Counter, \
-16    |-                         Mapping
-   15 |+from collections import Counter
-   16 |+from collections.abc import Mapping
-17 17 | 
-18 18 | from collections import Counter, Mapping, Sequence
-19 19 | 
+12 | from collections import (Counter,
+13 |                          Mapping)
+14 | 
+   - from collections import Counter, \
+   -                          Mapping
+15 + from collections import Counter
+16 + from collections.abc import Mapping
+17 | 
+18 | from collections import Counter, Mapping, Sequence
+19 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence`
   --> UP035.py:18:1
@@ -171,17 +157,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence`
 20 | from collections import Mapping as mapping, Counter
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-15 15 | from collections import Counter, \
-16 16 |                          Mapping
-17 17 | 
-18    |-from collections import Counter, Mapping, Sequence
-   18 |+from collections import Counter
-   19 |+from collections.abc import Mapping, Sequence
-19 20 | 
-20 21 | from collections import Mapping as mapping, Counter
-21 22 | 
+15 | from collections import Counter, \
+16 |                          Mapping
+17 | 
+   - from collections import Counter, Mapping, Sequence
+18 + from collections import Counter
+19 + from collections.abc import Mapping, Sequence
+20 | 
+21 | from collections import Mapping as mapping, Counter
+22 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:20:1
@@ -194,17 +178,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 22 | if True:
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-17 17 | 
-18 18 | from collections import Counter, Mapping, Sequence
-19 19 | 
-20    |-from collections import Mapping as mapping, Counter
-   20 |+from collections import Counter
-   21 |+from collections.abc import Mapping as mapping
-21 22 | 
-22 23 | if True:
-23 24 |     from collections import Mapping, Counter
+17 | 
+18 | from collections import Counter, Mapping, Sequence
+19 | 
+   - from collections import Mapping as mapping, Counter
+20 + from collections import Counter
+21 + from collections.abc import Mapping as mapping
+22 | 
+23 | if True:
+24 |     from collections import Mapping, Counter
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:23:5
@@ -216,17 +198,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 25 | if True:
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-20 20 | from collections import Mapping as mapping, Counter
-21 21 | 
-22 22 | if True:
-23    |-    from collections import Mapping, Counter
-   23 |+    from collections import Counter
-   24 |+    from collections.abc import Mapping
-24 25 | 
-25 26 | if True:
-26 27 |     if True:
+20 | from collections import Mapping as mapping, Counter
+21 | 
+22 | if True:
+   -     from collections import Mapping, Counter
+23 +     from collections import Counter
+24 +     from collections.abc import Mapping
+25 | 
+26 | if True:
+27 |     if True:
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:28:5
@@ -239,17 +219,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 30 | if True: from collections import Mapping
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-25 25 | if True:
-26 26 |     if True:
-27 27 |         pass
-28    |-    from collections import Mapping, Counter
-   28 |+    from collections import Counter
-   29 |+    from collections.abc import Mapping
-29 30 | 
-30 31 | if True: from collections import Mapping
-31 32 | 
+25 | if True:
+26 |     if True:
+27 |         pass
+   -     from collections import Mapping, Counter
+28 +     from collections import Counter
+29 +     from collections.abc import Mapping
+30 | 
+31 | if True: from collections import Mapping
+32 | 
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:30:10
@@ -262,16 +240,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 32 | import os
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-27 27 |         pass
-28 28 |     from collections import Mapping, Counter
-29 29 | 
-30    |-if True: from collections import Mapping
-   30 |+if True: from collections.abc import Mapping
-31 31 | 
-32 32 | import os
-33 33 | from collections import Counter, Mapping
+27 |         pass
+28 |     from collections import Mapping, Counter
+29 | 
+   - if True: from collections import Mapping
+30 + if True: from collections.abc import Mapping
+31 | 
+32 | import os
+33 | from collections import Counter, Mapping
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:33:1
@@ -282,17 +258,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 34 | import sys
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-30 30 | if True: from collections import Mapping
-31 31 | 
-32 32 | import os
-33    |-from collections import Counter, Mapping
-   33 |+from collections import Counter
-   34 |+from collections.abc import Mapping
-34 35 | import sys
-35 36 | 
-36 37 | if True:
+30 | if True: from collections import Mapping
+31 | 
+32 | import os
+   - from collections import Counter, Mapping
+33 + from collections import Counter
+34 + from collections.abc import Mapping
+35 | import sys
+36 | 
+37 | if True:
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`, `Callable`
   --> UP035.py:37:5
@@ -309,20 +283,18 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`, `Callable`
 44 |   from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-35 35 | 
-36 36 | if True:
-37 37 |     from collections import (
-38    |-        Mapping,
-39    |-        Callable,
-40 38 |         Bad,
-41 39 |         Good,
-42 40 |     )
-   41 |+    from collections.abc import Mapping, Callable
-43 42 | 
-44 43 | from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
-45 44 | 
+35 | 
+36 | if True:
+37 |     from collections import (
+   -         Mapping,
+   -         Callable,
+38 |         Bad,
+39 |         Good,
+40 |     )
+41 +     from collections.abc import Mapping, Callable
+42 | 
+43 | from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
+44 | 
 
 UP035 [*] Import from `collections.abc` instead: `Callable`
   --> UP035.py:44:1
@@ -335,17 +307,15 @@ UP035 [*] Import from `collections.abc` instead: `Callable`
 46 | if True: from collections import (
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-41 41 |         Good,
-42 42 |     )
-43 43 | 
-44    |-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
-   44 |+from typing import Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
-   45 |+from collections.abc import Callable
-45 46 | 
-46 47 | if True: from collections import (
-47 48 |     Mapping, Counter)
+41 |         Good,
+42 |     )
+43 | 
+   - from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
+44 + from typing import Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
+45 + from collections.abc import Callable
+46 | 
+47 | if True: from collections import (
+48 |     Mapping, Counter)
 
 UP035 [*] Import from `collections` instead: `OrderedDict`
   --> UP035.py:44:1
@@ -358,17 +328,15 @@ UP035 [*] Import from `collections` instead: `OrderedDict`
 46 | if True: from collections import (
    |
 help: Import from `collections`
-
-ℹ Safe fix
-41 41 |         Good,
-42 42 |     )
-43 43 | 
-44    |-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
-   44 |+from typing import Callable, Match, Pattern, List, AbstractSet, ContextManager
-   45 |+from collections import OrderedDict
-45 46 | 
-46 47 | if True: from collections import (
-47 48 |     Mapping, Counter)
+41 |         Good,
+42 |     )
+43 | 
+   - from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
+44 + from typing import Callable, Match, Pattern, List, AbstractSet, ContextManager
+45 + from collections import OrderedDict
+46 | 
+47 | if True: from collections import (
+48 |     Mapping, Counter)
 
 UP035 [*] Import from `re` instead: `Match`, `Pattern`
   --> UP035.py:44:1
@@ -381,17 +349,15 @@ UP035 [*] Import from `re` instead: `Match`, `Pattern`
 46 | if True: from collections import (
    |
 help: Import from `re`
-
-ℹ Safe fix
-41 41 |         Good,
-42 42 |     )
-43 43 | 
-44    |-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
-   44 |+from typing import Callable, List, OrderedDict, AbstractSet, ContextManager
-   45 |+from re import Match, Pattern
-45 46 | 
-46 47 | if True: from collections import (
-47 48 |     Mapping, Counter)
+41 |         Good,
+42 |     )
+43 | 
+   - from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
+44 + from typing import Callable, List, OrderedDict, AbstractSet, ContextManager
+45 + from re import Match, Pattern
+46 | 
+47 | if True: from collections import (
+48 |     Mapping, Counter)
 
 UP035 `typing.List` is deprecated, use `list` instead
   --> UP035.py:44:1
@@ -461,16 +427,14 @@ UP035 [*] Import from `collections` instead: `OrderedDict`
 53 | from typing import Callable
    |
 help: Import from `collections`
-
-ℹ Safe fix
-48 48 | 
-49 49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035)
-50 50 | from typing import ContextManager
-51    |-from typing import OrderedDict
-   51 |+from collections import OrderedDict
-52 52 | from typing_extensions import OrderedDict
-53 53 | from typing import Callable
-54 54 | from typing import ByteString
+48 | 
+49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035)
+50 | from typing import ContextManager
+   - from typing import OrderedDict
+51 + from collections import OrderedDict
+52 | from typing_extensions import OrderedDict
+53 | from typing import Callable
+54 | from typing import ByteString
 
 UP035 [*] Import from `typing` instead: `OrderedDict`
   --> UP035.py:52:1
@@ -483,16 +447,14 @@ UP035 [*] Import from `typing` instead: `OrderedDict`
 54 | from typing import ByteString
    |
 help: Import from `typing`
-
-ℹ Safe fix
-49 49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035)
-50 50 | from typing import ContextManager
-51 51 | from typing import OrderedDict
-52    |-from typing_extensions import OrderedDict
-   52 |+from typing import OrderedDict
-53 53 | from typing import Callable
-54 54 | from typing import ByteString
-55 55 | from typing import Container
+49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035)
+50 | from typing import ContextManager
+51 | from typing import OrderedDict
+   - from typing_extensions import OrderedDict
+52 + from typing import OrderedDict
+53 | from typing import Callable
+54 | from typing import ByteString
+55 | from typing import Container
 
 UP035 [*] Import from `collections.abc` instead: `Callable`
   --> UP035.py:53:1
@@ -505,16 +467,14 @@ UP035 [*] Import from `collections.abc` instead: `Callable`
 55 | from typing import Container
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-50 50 | from typing import ContextManager
-51 51 | from typing import OrderedDict
-52 52 | from typing_extensions import OrderedDict
-53    |-from typing import Callable
-   53 |+from collections.abc import Callable
-54 54 | from typing import ByteString
-55 55 | from typing import Container
-56 56 | from typing import Hashable
+50 | from typing import ContextManager
+51 | from typing import OrderedDict
+52 | from typing_extensions import OrderedDict
+   - from typing import Callable
+53 + from collections.abc import Callable
+54 | from typing import ByteString
+55 | from typing import Container
+56 | from typing import Hashable
 
 UP035 [*] Import from `collections.abc` instead: `ByteString`
   --> UP035.py:54:1
@@ -527,16 +487,14 @@ UP035 [*] Import from `collections.abc` instead: `ByteString`
 56 | from typing import Hashable
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-51 51 | from typing import OrderedDict
-52 52 | from typing_extensions import OrderedDict
-53 53 | from typing import Callable
-54    |-from typing import ByteString
-   54 |+from collections.abc import ByteString
-55 55 | from typing import Container
-56 56 | from typing import Hashable
-57 57 | from typing import ItemsView
+51 | from typing import OrderedDict
+52 | from typing_extensions import OrderedDict
+53 | from typing import Callable
+   - from typing import ByteString
+54 + from collections.abc import ByteString
+55 | from typing import Container
+56 | from typing import Hashable
+57 | from typing import ItemsView
 
 UP035 [*] Import from `collections.abc` instead: `Container`
   --> UP035.py:55:1
@@ -549,16 +507,14 @@ UP035 [*] Import from `collections.abc` instead: `Container`
 57 | from typing import ItemsView
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-52 52 | from typing_extensions import OrderedDict
-53 53 | from typing import Callable
-54 54 | from typing import ByteString
-55    |-from typing import Container
-   55 |+from collections.abc import Container
-56 56 | from typing import Hashable
-57 57 | from typing import ItemsView
-58 58 | from typing import Iterable
+52 | from typing_extensions import OrderedDict
+53 | from typing import Callable
+54 | from typing import ByteString
+   - from typing import Container
+55 + from collections.abc import Container
+56 | from typing import Hashable
+57 | from typing import ItemsView
+58 | from typing import Iterable
 
 UP035 [*] Import from `collections.abc` instead: `Hashable`
   --> UP035.py:56:1
@@ -571,16 +527,14 @@ UP035 [*] Import from `collections.abc` instead: `Hashable`
 58 | from typing import Iterable
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-53 53 | from typing import Callable
-54 54 | from typing import ByteString
-55 55 | from typing import Container
-56    |-from typing import Hashable
-   56 |+from collections.abc import Hashable
-57 57 | from typing import ItemsView
-58 58 | from typing import Iterable
-59 59 | from typing import Iterator
+53 | from typing import Callable
+54 | from typing import ByteString
+55 | from typing import Container
+   - from typing import Hashable
+56 + from collections.abc import Hashable
+57 | from typing import ItemsView
+58 | from typing import Iterable
+59 | from typing import Iterator
 
 UP035 [*] Import from `collections.abc` instead: `ItemsView`
   --> UP035.py:57:1
@@ -593,16 +547,14 @@ UP035 [*] Import from `collections.abc` instead: `ItemsView`
 59 | from typing import Iterator
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-54 54 | from typing import ByteString
-55 55 | from typing import Container
-56 56 | from typing import Hashable
-57    |-from typing import ItemsView
-   57 |+from collections.abc import ItemsView
-58 58 | from typing import Iterable
-59 59 | from typing import Iterator
-60 60 | from typing import KeysView
+54 | from typing import ByteString
+55 | from typing import Container
+56 | from typing import Hashable
+   - from typing import ItemsView
+57 + from collections.abc import ItemsView
+58 | from typing import Iterable
+59 | from typing import Iterator
+60 | from typing import KeysView
 
 UP035 [*] Import from `collections.abc` instead: `Iterable`
   --> UP035.py:58:1
@@ -615,16 +567,14 @@ UP035 [*] Import from `collections.abc` instead: `Iterable`
 60 | from typing import KeysView
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-55 55 | from typing import Container
-56 56 | from typing import Hashable
-57 57 | from typing import ItemsView
-58    |-from typing import Iterable
-   58 |+from collections.abc import Iterable
-59 59 | from typing import Iterator
-60 60 | from typing import KeysView
-61 61 | from typing import Mapping
+55 | from typing import Container
+56 | from typing import Hashable
+57 | from typing import ItemsView
+   - from typing import Iterable
+58 + from collections.abc import Iterable
+59 | from typing import Iterator
+60 | from typing import KeysView
+61 | from typing import Mapping
 
 UP035 [*] Import from `collections.abc` instead: `Iterator`
   --> UP035.py:59:1
@@ -637,16 +587,14 @@ UP035 [*] Import from `collections.abc` instead: `Iterator`
 61 | from typing import Mapping
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-56 56 | from typing import Hashable
-57 57 | from typing import ItemsView
-58 58 | from typing import Iterable
-59    |-from typing import Iterator
-   59 |+from collections.abc import Iterator
-60 60 | from typing import KeysView
-61 61 | from typing import Mapping
-62 62 | from typing import MappingView
+56 | from typing import Hashable
+57 | from typing import ItemsView
+58 | from typing import Iterable
+   - from typing import Iterator
+59 + from collections.abc import Iterator
+60 | from typing import KeysView
+61 | from typing import Mapping
+62 | from typing import MappingView
 
 UP035 [*] Import from `collections.abc` instead: `KeysView`
   --> UP035.py:60:1
@@ -659,16 +607,14 @@ UP035 [*] Import from `collections.abc` instead: `KeysView`
 62 | from typing import MappingView
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-57 57 | from typing import ItemsView
-58 58 | from typing import Iterable
-59 59 | from typing import Iterator
-60    |-from typing import KeysView
-   60 |+from collections.abc import KeysView
-61 61 | from typing import Mapping
-62 62 | from typing import MappingView
-63 63 | from typing import MutableMapping
+57 | from typing import ItemsView
+58 | from typing import Iterable
+59 | from typing import Iterator
+   - from typing import KeysView
+60 + from collections.abc import KeysView
+61 | from typing import Mapping
+62 | from typing import MappingView
+63 | from typing import MutableMapping
 
 UP035 [*] Import from `collections.abc` instead: `Mapping`
   --> UP035.py:61:1
@@ -681,16 +627,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`
 63 | from typing import MutableMapping
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-58 58 | from typing import Iterable
-59 59 | from typing import Iterator
-60 60 | from typing import KeysView
-61    |-from typing import Mapping
-   61 |+from collections.abc import Mapping
-62 62 | from typing import MappingView
-63 63 | from typing import MutableMapping
-64 64 | from typing import MutableSequence
+58 | from typing import Iterable
+59 | from typing import Iterator
+60 | from typing import KeysView
+   - from typing import Mapping
+61 + from collections.abc import Mapping
+62 | from typing import MappingView
+63 | from typing import MutableMapping
+64 | from typing import MutableSequence
 
 UP035 [*] Import from `collections.abc` instead: `MappingView`
   --> UP035.py:62:1
@@ -703,16 +647,14 @@ UP035 [*] Import from `collections.abc` instead: `MappingView`
 64 | from typing import MutableSequence
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-59 59 | from typing import Iterator
-60 60 | from typing import KeysView
-61 61 | from typing import Mapping
-62    |-from typing import MappingView
-   62 |+from collections.abc import MappingView
-63 63 | from typing import MutableMapping
-64 64 | from typing import MutableSequence
-65 65 | from typing import MutableSet
+59 | from typing import Iterator
+60 | from typing import KeysView
+61 | from typing import Mapping
+   - from typing import MappingView
+62 + from collections.abc import MappingView
+63 | from typing import MutableMapping
+64 | from typing import MutableSequence
+65 | from typing import MutableSet
 
 UP035 [*] Import from `collections.abc` instead: `MutableMapping`
   --> UP035.py:63:1
@@ -725,16 +667,14 @@ UP035 [*] Import from `collections.abc` instead: `MutableMapping`
 65 | from typing import MutableSet
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-60 60 | from typing import KeysView
-61 61 | from typing import Mapping
-62 62 | from typing import MappingView
-63    |-from typing import MutableMapping
-   63 |+from collections.abc import MutableMapping
-64 64 | from typing import MutableSequence
-65 65 | from typing import MutableSet
-66 66 | from typing import Sequence
+60 | from typing import KeysView
+61 | from typing import Mapping
+62 | from typing import MappingView
+   - from typing import MutableMapping
+63 + from collections.abc import MutableMapping
+64 | from typing import MutableSequence
+65 | from typing import MutableSet
+66 | from typing import Sequence
 
 UP035 [*] Import from `collections.abc` instead: `MutableSequence`
   --> UP035.py:64:1
@@ -747,16 +687,14 @@ UP035 [*] Import from `collections.abc` instead: `MutableSequence`
 66 | from typing import Sequence
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-61 61 | from typing import Mapping
-62 62 | from typing import MappingView
-63 63 | from typing import MutableMapping
-64    |-from typing import MutableSequence
-   64 |+from collections.abc import MutableSequence
-65 65 | from typing import MutableSet
-66 66 | from typing import Sequence
-67 67 | from typing import Sized
+61 | from typing import Mapping
+62 | from typing import MappingView
+63 | from typing import MutableMapping
+   - from typing import MutableSequence
+64 + from collections.abc import MutableSequence
+65 | from typing import MutableSet
+66 | from typing import Sequence
+67 | from typing import Sized
 
 UP035 [*] Import from `collections.abc` instead: `MutableSet`
   --> UP035.py:65:1
@@ -769,16 +707,14 @@ UP035 [*] Import from `collections.abc` instead: `MutableSet`
 67 | from typing import Sized
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-62 62 | from typing import MappingView
-63 63 | from typing import MutableMapping
-64 64 | from typing import MutableSequence
-65    |-from typing import MutableSet
-   65 |+from collections.abc import MutableSet
-66 66 | from typing import Sequence
-67 67 | from typing import Sized
-68 68 | from typing import ValuesView
+62 | from typing import MappingView
+63 | from typing import MutableMapping
+64 | from typing import MutableSequence
+   - from typing import MutableSet
+65 + from collections.abc import MutableSet
+66 | from typing import Sequence
+67 | from typing import Sized
+68 | from typing import ValuesView
 
 UP035 [*] Import from `collections.abc` instead: `Sequence`
   --> UP035.py:66:1
@@ -791,16 +727,14 @@ UP035 [*] Import from `collections.abc` instead: `Sequence`
 68 | from typing import ValuesView
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-63 63 | from typing import MutableMapping
-64 64 | from typing import MutableSequence
-65 65 | from typing import MutableSet
-66    |-from typing import Sequence
-   66 |+from collections.abc import Sequence
-67 67 | from typing import Sized
-68 68 | from typing import ValuesView
-69 69 | from typing import Awaitable
+63 | from typing import MutableMapping
+64 | from typing import MutableSequence
+65 | from typing import MutableSet
+   - from typing import Sequence
+66 + from collections.abc import Sequence
+67 | from typing import Sized
+68 | from typing import ValuesView
+69 | from typing import Awaitable
 
 UP035 [*] Import from `collections.abc` instead: `Sized`
   --> UP035.py:67:1
@@ -813,16 +747,14 @@ UP035 [*] Import from `collections.abc` instead: `Sized`
 69 | from typing import Awaitable
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-64 64 | from typing import MutableSequence
-65 65 | from typing import MutableSet
-66 66 | from typing import Sequence
-67    |-from typing import Sized
-   67 |+from collections.abc import Sized
-68 68 | from typing import ValuesView
-69 69 | from typing import Awaitable
-70 70 | from typing import AsyncIterator
+64 | from typing import MutableSequence
+65 | from typing import MutableSet
+66 | from typing import Sequence
+   - from typing import Sized
+67 + from collections.abc import Sized
+68 | from typing import ValuesView
+69 | from typing import Awaitable
+70 | from typing import AsyncIterator
 
 UP035 [*] Import from `collections.abc` instead: `ValuesView`
   --> UP035.py:68:1
@@ -835,16 +767,14 @@ UP035 [*] Import from `collections.abc` instead: `ValuesView`
 70 | from typing import AsyncIterator
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-65 65 | from typing import MutableSet
-66 66 | from typing import Sequence
-67 67 | from typing import Sized
-68    |-from typing import ValuesView
-   68 |+from collections.abc import ValuesView
-69 69 | from typing import Awaitable
-70 70 | from typing import AsyncIterator
-71 71 | from typing import AsyncIterable
+65 | from typing import MutableSet
+66 | from typing import Sequence
+67 | from typing import Sized
+   - from typing import ValuesView
+68 + from collections.abc import ValuesView
+69 | from typing import Awaitable
+70 | from typing import AsyncIterator
+71 | from typing import AsyncIterable
 
 UP035 [*] Import from `collections.abc` instead: `Awaitable`
   --> UP035.py:69:1
@@ -857,16 +787,14 @@ UP035 [*] Import from `collections.abc` instead: `Awaitable`
 71 | from typing import AsyncIterable
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-66 66 | from typing import Sequence
-67 67 | from typing import Sized
-68 68 | from typing import ValuesView
-69    |-from typing import Awaitable
-   69 |+from collections.abc import Awaitable
-70 70 | from typing import AsyncIterator
-71 71 | from typing import AsyncIterable
-72 72 | from typing import Coroutine
+66 | from typing import Sequence
+67 | from typing import Sized
+68 | from typing import ValuesView
+   - from typing import Awaitable
+69 + from collections.abc import Awaitable
+70 | from typing import AsyncIterator
+71 | from typing import AsyncIterable
+72 | from typing import Coroutine
 
 UP035 [*] Import from `collections.abc` instead: `AsyncIterator`
   --> UP035.py:70:1
@@ -879,16 +807,14 @@ UP035 [*] Import from `collections.abc` instead: `AsyncIterator`
 72 | from typing import Coroutine
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-67 67 | from typing import Sized
-68 68 | from typing import ValuesView
-69 69 | from typing import Awaitable
-70    |-from typing import AsyncIterator
-   70 |+from collections.abc import AsyncIterator
-71 71 | from typing import AsyncIterable
-72 72 | from typing import Coroutine
-73 73 | from typing import Collection
+67 | from typing import Sized
+68 | from typing import ValuesView
+69 | from typing import Awaitable
+   - from typing import AsyncIterator
+70 + from collections.abc import AsyncIterator
+71 | from typing import AsyncIterable
+72 | from typing import Coroutine
+73 | from typing import Collection
 
 UP035 [*] Import from `collections.abc` instead: `AsyncIterable`
   --> UP035.py:71:1
@@ -901,16 +827,14 @@ UP035 [*] Import from `collections.abc` instead: `AsyncIterable`
 73 | from typing import Collection
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-68 68 | from typing import ValuesView
-69 69 | from typing import Awaitable
-70 70 | from typing import AsyncIterator
-71    |-from typing import AsyncIterable
-   71 |+from collections.abc import AsyncIterable
-72 72 | from typing import Coroutine
-73 73 | from typing import Collection
-74 74 | from typing import AsyncGenerator
+68 | from typing import ValuesView
+69 | from typing import Awaitable
+70 | from typing import AsyncIterator
+   - from typing import AsyncIterable
+71 + from collections.abc import AsyncIterable
+72 | from typing import Coroutine
+73 | from typing import Collection
+74 | from typing import AsyncGenerator
 
 UP035 [*] Import from `collections.abc` instead: `Coroutine`
   --> UP035.py:72:1
@@ -923,16 +847,14 @@ UP035 [*] Import from `collections.abc` instead: `Coroutine`
 74 | from typing import AsyncGenerator
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-69 69 | from typing import Awaitable
-70 70 | from typing import AsyncIterator
-71 71 | from typing import AsyncIterable
-72    |-from typing import Coroutine
-   72 |+from collections.abc import Coroutine
-73 73 | from typing import Collection
-74 74 | from typing import AsyncGenerator
-75 75 | from typing import Reversible
+69 | from typing import Awaitable
+70 | from typing import AsyncIterator
+71 | from typing import AsyncIterable
+   - from typing import Coroutine
+72 + from collections.abc import Coroutine
+73 | from typing import Collection
+74 | from typing import AsyncGenerator
+75 | from typing import Reversible
 
 UP035 [*] Import from `collections.abc` instead: `Collection`
   --> UP035.py:73:1
@@ -945,16 +867,14 @@ UP035 [*] Import from `collections.abc` instead: `Collection`
 75 | from typing import Reversible
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-70 70 | from typing import AsyncIterator
-71 71 | from typing import AsyncIterable
-72 72 | from typing import Coroutine
-73    |-from typing import Collection
-   73 |+from collections.abc import Collection
-74 74 | from typing import AsyncGenerator
-75 75 | from typing import Reversible
-76 76 | from typing import Generator
+70 | from typing import AsyncIterator
+71 | from typing import AsyncIterable
+72 | from typing import Coroutine
+   - from typing import Collection
+73 + from collections.abc import Collection
+74 | from typing import AsyncGenerator
+75 | from typing import Reversible
+76 | from typing import Generator
 
 UP035 [*] Import from `collections.abc` instead: `AsyncGenerator`
   --> UP035.py:74:1
@@ -967,16 +887,14 @@ UP035 [*] Import from `collections.abc` instead: `AsyncGenerator`
 76 | from typing import Generator
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-71 71 | from typing import AsyncIterable
-72 72 | from typing import Coroutine
-73 73 | from typing import Collection
-74    |-from typing import AsyncGenerator
-   74 |+from collections.abc import AsyncGenerator
-75 75 | from typing import Reversible
-76 76 | from typing import Generator
-77 77 | from typing import Callable
+71 | from typing import AsyncIterable
+72 | from typing import Coroutine
+73 | from typing import Collection
+   - from typing import AsyncGenerator
+74 + from collections.abc import AsyncGenerator
+75 | from typing import Reversible
+76 | from typing import Generator
+77 | from typing import Callable
 
 UP035 [*] Import from `collections.abc` instead: `Reversible`
   --> UP035.py:75:1
@@ -989,16 +907,14 @@ UP035 [*] Import from `collections.abc` instead: `Reversible`
 77 | from typing import Callable
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-72 72 | from typing import Coroutine
-73 73 | from typing import Collection
-74 74 | from typing import AsyncGenerator
-75    |-from typing import Reversible
-   75 |+from collections.abc import Reversible
-76 76 | from typing import Generator
-77 77 | from typing import Callable
-78 78 | from typing import cast
+72 | from typing import Coroutine
+73 | from typing import Collection
+74 | from typing import AsyncGenerator
+   - from typing import Reversible
+75 + from collections.abc import Reversible
+76 | from typing import Generator
+77 | from typing import Callable
+78 | from typing import cast
 
 UP035 [*] Import from `collections.abc` instead: `Generator`
   --> UP035.py:76:1
@@ -1011,16 +927,14 @@ UP035 [*] Import from `collections.abc` instead: `Generator`
 78 | from typing import cast
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-73 73 | from typing import Collection
-74 74 | from typing import AsyncGenerator
-75 75 | from typing import Reversible
-76    |-from typing import Generator
-   76 |+from collections.abc import Generator
-77 77 | from typing import Callable
-78 78 | from typing import cast
-79 79 | 
+73 | from typing import Collection
+74 | from typing import AsyncGenerator
+75 | from typing import Reversible
+   - from typing import Generator
+76 + from collections.abc import Generator
+77 | from typing import Callable
+78 | from typing import cast
+79 | 
 
 UP035 [*] Import from `collections.abc` instead: `Callable`
   --> UP035.py:77:1
@@ -1032,16 +946,14 @@ UP035 [*] Import from `collections.abc` instead: `Callable`
 78 | from typing import cast
    |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-74 74 | from typing import AsyncGenerator
-75 75 | from typing import Reversible
-76 76 | from typing import Generator
-77    |-from typing import Callable
-   77 |+from collections.abc import Callable
-78 78 | from typing import cast
-79 79 | 
-80 80 | # OK
+74 | from typing import AsyncGenerator
+75 | from typing import Reversible
+76 | from typing import Generator
+   - from typing import Callable
+77 + from collections.abc import Callable
+78 | from typing import cast
+79 | 
+80 | # OK
 
 UP035 [*] Import from `typing` instead: `SupportsIndex`
   --> UP035.py:84:1
@@ -1053,16 +965,14 @@ UP035 [*] Import from `typing` instead: `SupportsIndex`
 86 | # UP035 on py312+ only
    |
 help: Import from `typing`
-
-ℹ Safe fix
-81 81 | from a import b
-82 82 | 
-83 83 | # UP035 on py312+ only
-84    |-from typing_extensions import SupportsIndex
-   84 |+from typing import SupportsIndex
-85 85 | 
-86 86 | # UP035 on py312+ only
-87 87 | from typing_extensions import NamedTuple
+81 | from a import b
+82 | 
+83 | # UP035 on py312+ only
+   - from typing_extensions import SupportsIndex
+84 + from typing import SupportsIndex
+85 | 
+86 | # UP035 on py312+ only
+87 | from typing_extensions import NamedTuple
 
 UP035 [*] Import from `typing` instead: `NamedTuple`
   --> UP035.py:87:1
@@ -1074,16 +984,14 @@ UP035 [*] Import from `typing` instead: `NamedTuple`
 89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12).
    |
 help: Import from `typing`
-
-ℹ Safe fix
-84 84 | from typing_extensions import SupportsIndex
-85 85 | 
-86 86 | # UP035 on py312+ only
-87    |-from typing_extensions import NamedTuple
-   87 |+from typing import NamedTuple
-88 88 | 
-89 89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12).
-90 90 | from typing_extensions import dataclass_transform
+84 | from typing_extensions import SupportsIndex
+85 | 
+86 | # UP035 on py312+ only
+   - from typing_extensions import NamedTuple
+87 + from typing import NamedTuple
+88 | 
+89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12).
+90 | from typing_extensions import dataclass_transform
 
 UP035 [*] Import from `typing` instead: `dataclass_transform`
   --> UP035.py:90:1
@@ -1095,16 +1003,14 @@ UP035 [*] Import from `typing` instead: `dataclass_transform`
 92 | # UP035
    |
 help: Import from `typing`
-
-ℹ Safe fix
-87 87 | from typing_extensions import NamedTuple
-88 88 | 
-89 89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12).
-90    |-from typing_extensions import dataclass_transform
-   90 |+from typing import dataclass_transform
-91 91 | 
-92 92 | # UP035
-93 93 | from backports.strenum import StrEnum
+87 | from typing_extensions import NamedTuple
+88 | 
+89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12).
+   - from typing_extensions import dataclass_transform
+90 + from typing import dataclass_transform
+91 | 
+92 | # UP035
+93 | from backports.strenum import StrEnum
 
 UP035 [*] Import from `enum` instead: `StrEnum`
   --> UP035.py:93:1
@@ -1116,16 +1022,14 @@ UP035 [*] Import from `enum` instead: `StrEnum`
 95 | # UP035
    |
 help: Import from `enum`
-
-ℹ Safe fix
-90 90 | from typing_extensions import dataclass_transform
-91 91 | 
-92 92 | # UP035
-93    |-from backports.strenum import StrEnum
-   93 |+from enum import StrEnum
-94 94 | 
-95 95 | # UP035
-96 96 | from typing_extensions import override
+90 | from typing_extensions import dataclass_transform
+91 | 
+92 | # UP035
+   - from backports.strenum import StrEnum
+93 + from enum import StrEnum
+94 | 
+95 | # UP035
+96 | from typing_extensions import override
 
 UP035 [*] Import from `typing` instead: `override`
   --> UP035.py:96:1
@@ -1137,16 +1041,14 @@ UP035 [*] Import from `typing` instead: `override`
 98 | # UP035
    |
 help: Import from `typing`
-
-ℹ Safe fix
-93 93 | from backports.strenum import StrEnum
-94 94 | 
-95 95 | # UP035
-96    |-from typing_extensions import override
-   96 |+from typing import override
-97 97 | 
-98 98 | # UP035
-99 99 | from typing_extensions import Buffer
+93 | from backports.strenum import StrEnum
+94 | 
+95 | # UP035
+   - from typing_extensions import override
+96 + from typing import override
+97 | 
+98 | # UP035
+99 | from typing_extensions import Buffer
 
 UP035 [*] Import from `collections.abc` instead: `Buffer`
    --> UP035.py:99:1
@@ -1158,16 +1060,14 @@ UP035 [*] Import from `collections.abc` instead: `Buffer`
 101 | # UP035
     |
 help: Import from `collections.abc`
-
-ℹ Safe fix
-96  96  | from typing_extensions import override
-97  97  | 
-98  98  | # UP035
-99      |-from typing_extensions import Buffer
-    99  |+from collections.abc import Buffer
-100 100 | 
-101 101 | # UP035
-102 102 | from typing_extensions import get_original_bases
+96  | from typing_extensions import override
+97  | 
+98  | # UP035
+    - from typing_extensions import Buffer
+99  + from collections.abc import Buffer
+100 | 
+101 | # UP035
+102 | from typing_extensions import get_original_bases
 
 UP035 [*] Import from `types` instead: `get_original_bases`
    --> UP035.py:102:1
@@ -1179,16 +1079,14 @@ UP035 [*] Import from `types` instead: `get_original_bases`
 104 | # UP035 on py313+ only
     |
 help: Import from `types`
-
-ℹ Safe fix
-99  99  | from typing_extensions import Buffer
-100 100 | 
-101 101 | # UP035
-102     |-from typing_extensions import get_original_bases
-    102 |+from types import get_original_bases
-103 103 | 
-104 104 | # UP035 on py313+ only
-105 105 | from typing_extensions import TypeVar
+99  | from typing_extensions import Buffer
+100 | 
+101 | # UP035
+    - from typing_extensions import get_original_bases
+102 + from types import get_original_bases
+103 | 
+104 | # UP035 on py313+ only
+105 | from typing_extensions import TypeVar
 
 UP035 [*] Import from `typing` instead: `TypeVar`
    --> UP035.py:105:1
@@ -1200,16 +1098,14 @@ UP035 [*] Import from `typing` instead: `TypeVar`
 107 | # UP035 on py313+ only
     |
 help: Import from `typing`
-
-ℹ Safe fix
-102 102 | from typing_extensions import get_original_bases
-103 103 | 
-104 104 | # UP035 on py313+ only
-105     |-from typing_extensions import TypeVar
-    105 |+from typing import TypeVar
-106 106 | 
-107 107 | # UP035 on py313+ only
-108 108 | from typing_extensions import CapsuleType
+102 | from typing_extensions import get_original_bases
+103 | 
+104 | # UP035 on py313+ only
+    - from typing_extensions import TypeVar
+105 + from typing import TypeVar
+106 | 
+107 | # UP035 on py313+ only
+108 | from typing_extensions import CapsuleType
 
 UP035 [*] Import from `types` instead: `CapsuleType`
    --> UP035.py:108:1
@@ -1221,16 +1117,14 @@ UP035 [*] Import from `types` instead: `CapsuleType`
 110 | # UP035 on py313+ only
     |
 help: Import from `types`
-
-ℹ Safe fix
-105 105 | from typing_extensions import TypeVar
-106 106 | 
-107 107 | # UP035 on py313+ only
-108     |-from typing_extensions import CapsuleType
-    108 |+from types import CapsuleType
-109 109 | 
-110 110 | # UP035 on py313+ only
-111 111 | from typing_extensions import deprecated
+105 | from typing_extensions import TypeVar
+106 | 
+107 | # UP035 on py313+ only
+    - from typing_extensions import CapsuleType
+108 + from types import CapsuleType
+109 | 
+110 | # UP035 on py313+ only
+111 | from typing_extensions import deprecated
 
 UP035 [*] Import from `warnings` instead: `deprecated`
    --> UP035.py:111:1
@@ -1242,16 +1136,14 @@ UP035 [*] Import from `warnings` instead: `deprecated`
 113 | # UP035 on py313+ only
     |
 help: Import from `warnings`
-
-ℹ Safe fix
-108 108 | from typing_extensions import CapsuleType
-109 109 | 
-110 110 | # UP035 on py313+ only
-111     |-from typing_extensions import deprecated
-    111 |+from warnings import deprecated
-112 112 | 
-113 113 | # UP035 on py313+ only
-114 114 | from typing_extensions import get_type_hints
+108 | from typing_extensions import CapsuleType
+109 | 
+110 | # UP035 on py313+ only
+    - from typing_extensions import deprecated
+111 + from warnings import deprecated
+112 | 
+113 | # UP035 on py313+ only
+114 | from typing_extensions import get_type_hints
 
 UP035 [*] Import from `typing` instead: `get_type_hints`
    --> UP035.py:114:1
@@ -1263,13 +1155,11 @@ UP035 [*] Import from `typing` instead: `get_type_hints`
 116 | # https://github.com/astral-sh/ruff/issues/15780
     |
 help: Import from `typing`
-
-ℹ Safe fix
-111 111 | from typing_extensions import deprecated
-112 112 | 
-113 113 | # UP035 on py313+ only
-114     |-from typing_extensions import get_type_hints
-    114 |+from typing import get_type_hints
-115 115 | 
-116 116 | # https://github.com/astral-sh/ruff/issues/15780
-117 117 | from typing_extensions import is_typeddict
+111 | from typing_extensions import deprecated
+112 | 
+113 | # UP035 on py313+ only
+    - from typing_extensions import get_type_hints
+114 + from typing import get_type_hints
+115 | 
+116 | # https://github.com/astral-sh/ruff/issues/15780
+117 | from typing_extensions import is_typeddict
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap
index b3df965476..a198337648 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap
@@ -12,18 +12,17 @@ UP036 [*] Version block is outdated for minimum Python version
 5 | else:
   |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | 
-3   |-if sys.version_info < (3,0):
-4   |-    print("py2")
-5   |-else:
-6   |-    print("py3")
-  3 |+print("py3")
-7 4 | 
-8 5 | if sys.version_info < (3,0):
-9 6 |     if True:
+1 | import sys
+2 | 
+  - if sys.version_info < (3,0):
+  -     print("py2")
+  - else:
+  -     print("py3")
+3 + print("py3")
+4 | 
+5 | if sys.version_info < (3,0):
+6 |     if True:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:8:4
@@ -36,22 +35,21 @@ UP036 [*] Version block is outdated for minimum Python version
 10 |         print("py2!")
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-5  5  | else:
-6  6  |     print("py3")
-7  7  | 
-8     |-if sys.version_info < (3,0):
-9     |-    if True:
-10    |-        print("py2!")
-11    |-    else:
-12    |-        print("???")
-13    |-else:
-14    |-    print("py3")
-   8  |+print("py3")
-15 9  | 
-16 10 | if sys.version_info < (3,0): print("PY2!")
-17 11 | else: print("PY3!")
+5  | else:
+6  |     print("py3")
+7  | 
+   - if sys.version_info < (3,0):
+   -     if True:
+   -         print("py2!")
+   -     else:
+   -         print("???")
+   - else:
+   -     print("py3")
+8  + print("py3")
+9  | 
+10 | if sys.version_info < (3,0): print("PY2!")
+11 | else: print("PY3!")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:16:4
@@ -63,17 +61,16 @@ UP036 [*] Version block is outdated for minimum Python version
 17 | else: print("PY3!")
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-13 13 | else:
-14 14 |     print("py3")
-15 15 | 
-16    |-if sys.version_info < (3,0): print("PY2!")
-17    |-else: print("PY3!")
-   16 |+print("PY3!")
-18 17 | 
-19 18 | if True:
-20 19 |     if sys.version_info < (3,0):
+13 | else:
+14 |     print("py3")
+15 | 
+   - if sys.version_info < (3,0): print("PY2!")
+   - else: print("PY3!")
+16 + print("PY3!")
+17 | 
+18 | if True:
+19 |     if sys.version_info < (3,0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:20:8
@@ -85,19 +82,18 @@ UP036 [*] Version block is outdated for minimum Python version
 22 |     else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-17 17 | else: print("PY3!")
-18 18 | 
-19 19 | if True:
-20    |-    if sys.version_info < (3,0):
-21    |-        print("PY2")
-22    |-    else:
-23    |-        print("PY3")
-   20 |+    print("PY3")
-24 21 | 
-25 22 | if sys.version_info < (3,0): print(1 if True else 3)
-26 23 | else:
+17 | else: print("PY3!")
+18 | 
+19 | if True:
+   -     if sys.version_info < (3,0):
+   -         print("PY2")
+   -     else:
+   -         print("PY3")
+20 +     print("PY3")
+21 | 
+22 | if sys.version_info < (3,0): print(1 if True else 3)
+23 | else:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:25:4
@@ -110,18 +106,17 @@ UP036 [*] Version block is outdated for minimum Python version
 27 |     print("py3")
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-22 22 |     else:
-23 23 |         print("PY3")
-24 24 | 
-25    |-if sys.version_info < (3,0): print(1 if True else 3)
-26    |-else:
-27    |-    print("py3")
-   25 |+print("py3")
-28 26 | 
-29 27 | if sys.version_info < (3,0):
-30 28 |     def f():
+22 |     else:
+23 |         print("PY3")
+24 | 
+   - if sys.version_info < (3,0): print(1 if True else 3)
+   - else:
+   -     print("py3")
+25 + print("py3")
+26 | 
+27 | if sys.version_info < (3,0):
+28 |     def f():
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:29:4
@@ -134,24 +129,23 @@ UP036 [*] Version block is outdated for minimum Python version
 31 |         print("py2")
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-26 26 | else:
-27 27 |     print("py3")
-28 28 | 
-29    |-if sys.version_info < (3,0):
-30    |-    def f():
-31    |-        print("py2")
-32    |-else:
-33    |-    def f():
-34    |-        print("py3")
-35    |-        print("This the next")
-   29 |+def f():
-   30 |+    print("py3")
-   31 |+    print("This the next")
-36 32 | 
-37 33 | if sys.version_info > (3,0):
-38 34 |     print("py3")
+26 | else:
+27 |     print("py3")
+28 | 
+   - if sys.version_info < (3,0):
+   -     def f():
+   -         print("py2")
+   - else:
+   -     def f():
+   -         print("py3")
+   -         print("This the next")
+29 + def f():
+30 +     print("py3")
+31 +     print("This the next")
+32 | 
+33 | if sys.version_info > (3,0):
+34 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:37:4
@@ -164,19 +158,18 @@ UP036 [*] Version block is outdated for minimum Python version
 39 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-34 34 |         print("py3")
-35 35 |         print("This the next")
-36 36 | 
-37    |-if sys.version_info > (3,0):
-38    |-    print("py3")
-39    |-else:
-40    |-    print("py2")
-   37 |+print("py3")
-41 38 | 
-42 39 | 
-43 40 | x = 1
+34 |         print("py3")
+35 |         print("This the next")
+36 | 
+   - if sys.version_info > (3,0):
+   -     print("py3")
+   - else:
+   -     print("py2")
+37 + print("py3")
+38 | 
+39 | 
+40 | x = 1
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:45:4
@@ -189,19 +182,18 @@ UP036 [*] Version block is outdated for minimum Python version
 47 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | x = 1
-44 44 | 
-45    |-if sys.version_info > (3,0):
-46    |-    print("py3")
-47    |-else:
-48    |-    print("py2")
-   45 |+print("py3")
-49 46 |     # ohai
-50 47 | 
-51 48 | x = 1
+42 | 
+43 | x = 1
+44 | 
+   - if sys.version_info > (3,0):
+   -     print("py3")
+   - else:
+   -     print("py2")
+45 + print("py3")
+46 |     # ohai
+47 | 
+48 | x = 1
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:53:4
@@ -213,17 +205,16 @@ UP036 [*] Version block is outdated for minimum Python version
 54 | else: print("py2")
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-50 50 | 
-51 51 | x = 1
-52 52 | 
-53    |-if sys.version_info > (3,0): print("py3")
-54    |-else: print("py2")
-   53 |+print("py3")
-55 54 | 
-56 55 | if sys.version_info > (3,):
-57 56 |     print("py3")
+50 | 
+51 | x = 1
+52 | 
+   - if sys.version_info > (3,0): print("py3")
+   - else: print("py2")
+53 + print("py3")
+54 | 
+55 | if sys.version_info > (3,):
+56 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:56:4
@@ -236,19 +227,18 @@ UP036 [*] Version block is outdated for minimum Python version
 58 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-53 53 | if sys.version_info > (3,0): print("py3")
-54 54 | else: print("py2")
-55 55 | 
-56    |-if sys.version_info > (3,):
-57    |-    print("py3")
-58    |-else:
-59    |-    print("py2")
-   56 |+print("py3")
-60 57 | 
-61 58 | if True:
-62 59 |     if sys.version_info > (3,):
+53 | if sys.version_info > (3,0): print("py3")
+54 | else: print("py2")
+55 | 
+   - if sys.version_info > (3,):
+   -     print("py3")
+   - else:
+   -     print("py2")
+56 + print("py3")
+57 | 
+58 | if True:
+59 |     if sys.version_info > (3,):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:62:8
@@ -260,19 +250,18 @@ UP036 [*] Version block is outdated for minimum Python version
 64 |     else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-59 59 |     print("py2")
-60 60 | 
-61 61 | if True:
-62    |-    if sys.version_info > (3,):
-63    |-        print("py3")
-64    |-    else:
-65    |-        print("py2")
-   62 |+    print("py3")
-66 63 | 
-67 64 | if sys.version_info < (3,):
-68 65 |     print("py2")
+59 |     print("py2")
+60 | 
+61 | if True:
+   -     if sys.version_info > (3,):
+   -         print("py3")
+   -     else:
+   -         print("py2")
+62 +     print("py3")
+63 | 
+64 | if sys.version_info < (3,):
+65 |     print("py2")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:67:4
@@ -285,19 +274,18 @@ UP036 [*] Version block is outdated for minimum Python version
 69 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-64 64 |     else:
-65 65 |         print("py2")
-66 66 | 
-67    |-if sys.version_info < (3,):
-68    |-    print("py2")
-69    |-else:
-70    |-    print("py3")
-   67 |+print("py3")
-71 68 | 
-72 69 | def f():
-73 70 |     if sys.version_info < (3,0):
+64 |     else:
+65 |         print("py2")
+66 | 
+   - if sys.version_info < (3,):
+   -     print("py2")
+   - else:
+   -     print("py3")
+67 + print("py3")
+68 | 
+69 | def f():
+70 |     if sys.version_info < (3,0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:73:8
@@ -309,22 +297,21 @@ UP036 [*] Version block is outdated for minimum Python version
 75 |             yield
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-70 70 |     print("py3")
-71 71 | 
-72 72 | def f():
-73    |-    if sys.version_info < (3,0):
-74    |-        try:
-75    |-            yield
-76    |-        finally:
-77    |-            pass
-78    |-    else:
-79    |-        yield
-   73 |+    yield
-80 74 | 
-81 75 | 
-82 76 | class C:
+70 |     print("py3")
+71 | 
+72 | def f():
+   -     if sys.version_info < (3,0):
+   -         try:
+   -             yield
+   -         finally:
+   -             pass
+   -     else:
+   -         yield
+73 +     yield
+74 | 
+75 | 
+76 | class C:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:86:8
@@ -337,22 +324,21 @@ UP036 [*] Version block is outdated for minimum Python version
 88 |             pass
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-83 83 |     def g():
-84 84 |         pass
-85 85 | 
-86    |-    if sys.version_info < (3,0):
-87    |-        def f(py2):
-88    |-            pass
-89    |-    else:
-90    |-        def f(py3):
-91    |-            pass
-   86 |+    def f(py3):
-   87 |+        pass
-92 88 | 
-93 89 |     def h():
-94 90 |         pass
+83 |     def g():
+84 |         pass
+85 | 
+   -     if sys.version_info < (3,0):
+   -         def f(py2):
+   -             pass
+   -     else:
+   -         def f(py3):
+   -             pass
+86 +     def f(py3):
+87 +         pass
+88 | 
+89 |     def h():
+90 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_0.py:97:8
@@ -364,19 +350,18 @@ UP036 [*] Version block is outdated for minimum Python version
 99 |     else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-94  94  |         pass
-95  95  | 
-96  96  | if True:
-97      |-    if sys.version_info < (3,0):
-98      |-        2
-99      |-    else:
-100     |-        3
-    97  |+    3
-101 98  | 
-102 99  |     # comment
-103 100 | 
+94  |         pass
+95  | 
+96  | if True:
+    -     if sys.version_info < (3,0):
+    -         2
+    -     else:
+    -         3
+97  +     3
+98  | 
+99  |     # comment
+100 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:104:4
@@ -389,28 +374,27 @@ UP036 [*] Version block is outdated for minimum Python version
 106 |         print("py2")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-101 101 | 
-102 102 |     # comment
-103 103 | 
-104     |-if sys.version_info < (3,0):
-105     |-    def f():
-106     |-        print("py2")
-107     |-    def g():
-108     |-        print("py2")
-109     |-else:
-110     |-    def f():
-111     |-        print("py3")
-112     |-    def g():
-113     |-        print("py3")
-    104 |+def f():
-    105 |+    print("py3")
-    106 |+def g():
-    107 |+    print("py3")
-114 108 | 
-115 109 | if True:
-116 110 |     if sys.version_info > (3,):
+101 | 
+102 |     # comment
+103 | 
+    - if sys.version_info < (3,0):
+    -     def f():
+    -         print("py2")
+    -     def g():
+    -         print("py2")
+    - else:
+    -     def f():
+    -         print("py3")
+    -     def g():
+    -         print("py3")
+104 + def f():
+105 +     print("py3")
+106 + def g():
+107 +     print("py3")
+108 | 
+109 | if True:
+110 |     if sys.version_info > (3,):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:116:8
@@ -422,17 +406,16 @@ UP036 [*] Version block is outdated for minimum Python version
 118 |     # comment
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-113 113 |         print("py3")
-114 114 | 
-115 115 | if True:
-116     |-    if sys.version_info > (3,):
-117     |-        print(3)
-    116 |+    print(3)
-118 117 |     # comment
-119 118 |     print(2+3)
-120 119 | 
+113 |         print("py3")
+114 | 
+115 | if True:
+    -     if sys.version_info > (3,):
+    -         print(3)
+116 +     print(3)
+117 |     # comment
+118 |     print(2+3)
+119 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:122:8
@@ -444,16 +427,15 @@ UP036 [*] Version block is outdated for minimum Python version
 124 | if True:
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-119 119 |     print(2+3)
-120 120 | 
-121 121 | if True:
-122     |-    if sys.version_info > (3,): print(3)
-    122 |+    print(3)
-123 123 | 
-124 124 | if True:
-125 125 |     if sys.version_info > (3,):
+119 |     print(2+3)
+120 | 
+121 | if True:
+    -     if sys.version_info > (3,): print(3)
+122 +     print(3)
+123 | 
+124 | if True:
+125 |     if sys.version_info > (3,):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:125:8
@@ -464,17 +446,16 @@ UP036 [*] Version block is outdated for minimum Python version
 126 |         print(3)
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-122 122 |     if sys.version_info > (3,): print(3)
-123 123 | 
-124 124 | if True:
-125     |-    if sys.version_info > (3,):
-126     |-        print(3)
-    125 |+    print(3)
-127 126 | 
-128 127 | 
-129 128 | if True:
+122 |     if sys.version_info > (3,): print(3)
+123 | 
+124 | if True:
+    -     if sys.version_info > (3,):
+    -         print(3)
+125 +     print(3)
+126 | 
+127 | 
+128 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:130:8
@@ -486,24 +467,23 @@ UP036 [*] Version block is outdated for minimum Python version
 132 |     else:
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-127 127 | 
-128 128 | 
-129 129 | if True:
-130     |-    if sys.version_info <= (3, 0):
-131     |-        expected_error = []
-132     |-    else:
-133     |-        expected_error = [
-    130 |+    expected_error = [
-134 131 | "<stdin>:1:5: Generator expression must be parenthesized",
-135 132 | "max(1 for i in range(10), key=lambda x: x+1)",
-136 133 | "    ^",
-137     |-        ]
-    134 |+    ]
-138 135 | 
-139 136 | 
-140 137 | if sys.version_info <= (3, 0):
+127 | 
+128 | 
+129 | if True:
+    -     if sys.version_info <= (3, 0):
+    -         expected_error = []
+    -     else:
+    -         expected_error = [
+130 +     expected_error = [
+131 | "<stdin>:1:5: Generator expression must be parenthesized",
+132 | "max(1 for i in range(10), key=lambda x: x+1)",
+133 | "    ^",
+    -         ]
+134 +     ]
+135 | 
+136 | 
+137 | if sys.version_info <= (3, 0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:140:4
@@ -514,24 +494,23 @@ UP036 [*] Version block is outdated for minimum Python version
 142 | else:
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-137 137 |         ]
-138 138 | 
-139 139 | 
-140     |-if sys.version_info <= (3, 0):
-141     |-    expected_error = []
-142     |-else:
-143     |-    expected_error = [
-    140 |+expected_error = [
-144 141 | "<stdin>:1:5: Generator expression must be parenthesized",
-145 142 | "max(1 for i in range(10), key=lambda x: x+1)",
-146 143 | "    ^",
-147     |-    ]
-    144 |+]
-148 145 | 
-149 146 | 
-150 147 | if sys.version_info > (3,0):
+137 |         ]
+138 | 
+139 | 
+    - if sys.version_info <= (3, 0):
+    -     expected_error = []
+    - else:
+    -     expected_error = [
+140 + expected_error = [
+141 | "<stdin>:1:5: Generator expression must be parenthesized",
+142 | "max(1 for i in range(10), key=lambda x: x+1)",
+143 | "    ^",
+    -     ]
+144 + ]
+145 | 
+146 | 
+147 | if sys.version_info > (3,0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:150:4
@@ -542,31 +521,30 @@ UP036 [*] Version block is outdated for minimum Python version
 152 | is valid"""
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-147 147 |     ]
-148 148 | 
-149 149 | 
-150     |-if sys.version_info > (3,0):
-151     |-    """this
-    150 |+"""this
-152 151 | is valid"""
-153 152 | 
-154     |-    """the indentation on
-    153 |+"""the indentation on
-155 154 |     this line is significant"""
-156 155 | 
-157     |-    "this is" \
-    156 |+"this is" \
-158 157 |     "allowed too"
-159 158 | 
-160     |-    ("so is"
-161     |-     "this for some reason")
-    159 |+("so is"
-    160 |+ "this for some reason")
-162 161 | 
-163 162 | if sys.version_info > (3, 0): expected_error = \
-164 163 |     []
+147 |     ]
+148 | 
+149 | 
+    - if sys.version_info > (3,0):
+    -     """this
+150 + """this
+151 | is valid"""
+152 | 
+    -     """the indentation on
+153 + """the indentation on
+154 |     this line is significant"""
+155 | 
+    -     "this is" \
+156 + "this is" \
+157 |     "allowed too"
+158 | 
+    -     ("so is"
+    -      "this for some reason")
+159 + ("so is"
+160 +  "this for some reason")
+161 | 
+162 | if sys.version_info > (3, 0): expected_error = \
+163 |     []
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:163:4
@@ -578,16 +556,15 @@ UP036 [*] Version block is outdated for minimum Python version
 164 |     []
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-160 160 |     ("so is"
-161 161 |      "this for some reason")
-162 162 | 
-163     |-if sys.version_info > (3, 0): expected_error = \
-    163 |+expected_error = \
-164 164 |     []
-165 165 | 
-166 166 | if sys.version_info > (3, 0): expected_error = []
+160 |     ("so is"
+161 |      "this for some reason")
+162 | 
+    - if sys.version_info > (3, 0): expected_error = \
+163 + expected_error = \
+164 |     []
+165 | 
+166 | if sys.version_info > (3, 0): expected_error = []
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:166:4
@@ -600,16 +577,15 @@ UP036 [*] Version block is outdated for minimum Python version
 168 | if sys.version_info > (3, 0): \
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-163 163 | if sys.version_info > (3, 0): expected_error = \
-164 164 |     []
-165 165 | 
-166     |-if sys.version_info > (3, 0): expected_error = []
-    166 |+expected_error = []
-167 167 | 
-168 168 | if sys.version_info > (3, 0): \
-169 169 |     expected_error = []
+163 | if sys.version_info > (3, 0): expected_error = \
+164 |     []
+165 | 
+    - if sys.version_info > (3, 0): expected_error = []
+166 + expected_error = []
+167 | 
+168 | if sys.version_info > (3, 0): \
+169 |     expected_error = []
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:168:4
@@ -621,17 +597,16 @@ UP036 [*] Version block is outdated for minimum Python version
 169 |     expected_error = []
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-165 165 | 
-166 166 | if sys.version_info > (3, 0): expected_error = []
-167 167 | 
-168     |-if sys.version_info > (3, 0): \
-169     |-    expected_error = []
-    168 |+expected_error = []
-170 169 | 
-171 170 | if True:
-172 171 |     if sys.version_info > (3, 0): expected_error = \
+165 | 
+166 | if sys.version_info > (3, 0): expected_error = []
+167 | 
+    - if sys.version_info > (3, 0): \
+    -     expected_error = []
+168 + expected_error = []
+169 | 
+170 | if True:
+171 |     if sys.version_info > (3, 0): expected_error = \
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:172:8
@@ -642,16 +617,15 @@ UP036 [*] Version block is outdated for minimum Python version
 173 |     []
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-169 169 |     expected_error = []
-170 170 | 
-171 171 | if True:
-172     |-    if sys.version_info > (3, 0): expected_error = \
-    172 |+    expected_error = \
-173 173 |     []
-174 174 | 
-175 175 | if True:
+169 |     expected_error = []
+170 | 
+171 | if True:
+    -     if sys.version_info > (3, 0): expected_error = \
+172 +     expected_error = \
+173 |     []
+174 | 
+175 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:176:8
@@ -663,16 +637,15 @@ UP036 [*] Version block is outdated for minimum Python version
 178 | if True:
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-173 173 |     []
-174 174 | 
-175 175 | if True:
-176     |-    if sys.version_info > (3, 0): expected_error = []
-    176 |+    expected_error = []
-177 177 | 
-178 178 | if True:
-179 179 |     if sys.version_info > (3, 0): \
+173 |     []
+174 | 
+175 | if True:
+    -     if sys.version_info > (3, 0): expected_error = []
+176 +     expected_error = []
+177 | 
+178 | if True:
+179 |     if sys.version_info > (3, 0): \
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:179:8
@@ -683,15 +656,14 @@ UP036 [*] Version block is outdated for minimum Python version
 180 |     expected_error = []
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-176 176 |     if sys.version_info > (3, 0): expected_error = []
-177 177 | 
-178 178 | if True:
-179     |-    if sys.version_info > (3, 0): \
-180 179 |     expected_error = []
-181 180 | 
-182 181 | if sys.version_info < (3,13):
+176 |     if sys.version_info > (3, 0): expected_error = []
+177 | 
+178 | if True:
+    -     if sys.version_info > (3, 0): \
+179 |     expected_error = []
+180 | 
+181 | if sys.version_info < (3,13):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:182:4
@@ -703,16 +675,55 @@ UP036 [*] Version block is outdated for minimum Python version
 183 |     print("py3")
     |
 help: Remove outdated version block
+179 |     if sys.version_info > (3, 0): \
+180 |     expected_error = []
+181 | 
+    - if sys.version_info < (3,13):
+    -     print("py3")
+182 | 
+183 | if sys.version_info <= (3,13):
+184 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-179 179 |     if sys.version_info > (3, 0): \
-180 180 |     expected_error = []
-181 181 | 
-182     |-if sys.version_info < (3,13):
-183     |-    print("py3")
-184 182 | 
-185 183 | if sys.version_info <= (3,13):
-186 184 |     print("py3")
+UP036 [*] Version block is outdated for minimum Python version
+   --> UP036_0.py:185:4
+    |
+183 |     print("py3")
+184 |
+185 | if sys.version_info <= (3,13):
+    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^
+186 |     print("py3")
+    |
+help: Remove outdated version block
+182 | if sys.version_info < (3,13):
+183 |     print("py3")
+184 | 
+    - if sys.version_info <= (3,13):
+    -     print("py3")
+185 | 
+186 | if sys.version_info <= (3,13):
+187 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
+
+UP036 [*] Version block is outdated for minimum Python version
+   --> UP036_0.py:188:4
+    |
+186 |     print("py3")
+187 |
+188 | if sys.version_info <= (3,13):
+    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^
+189 |     print("py3")
+    |
+help: Remove outdated version block
+185 | if sys.version_info <= (3,13):
+186 |     print("py3")
+187 | 
+    - if sys.version_info <= (3,13):
+    -     print("py3")
+188 | 
+189 | if sys.version_info == 10000000:
+190 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 Version specifier is invalid
    --> UP036_0.py:191:24
@@ -744,6 +755,27 @@ UP036 Version specifier is invalid
 198 |     print("py3")
     |
 
+UP036 [*] Version block is outdated for minimum Python version
+   --> UP036_0.py:200:4
+    |
+198 |     print("py3")
+199 |
+200 | if sys.version_info > (3,13):
+    |    ^^^^^^^^^^^^^^^^^^^^^^^^^
+201 |     print("py3")
+    |
+help: Remove outdated version block
+197 | if sys.version_info <= (3,10000000):
+198 |     print("py3")
+199 | 
+    - if sys.version_info > (3,13):
+    -     print("py3")
+200 + print("py3")
+201 | 
+202 | if sys.version_info >= (3,13):
+203 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
+
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:203:4
     |
@@ -754,17 +786,16 @@ UP036 [*] Version block is outdated for minimum Python version
 204 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-200 200 | if sys.version_info > (3,13):
-201 201 |     print("py3")
-202 202 | 
-203     |-if sys.version_info >= (3,13):
-204     |-    print("py3")
-    203 |+print("py3")
-205 204 | 
-206 205 | # Slices on `sys.version_info` should be treated equivalently.
-207 206 | if sys.version_info[:2] >= (3,0):
+200 | if sys.version_info > (3,13):
+201 |     print("py3")
+202 | 
+    - if sys.version_info >= (3,13):
+    -     print("py3")
+203 + print("py3")
+204 | 
+205 | # Slices on `sys.version_info` should be treated equivalently.
+206 | if sys.version_info[:2] >= (3,0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:207:4
@@ -775,17 +806,16 @@ UP036 [*] Version block is outdated for minimum Python version
 208 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-204 204 |     print("py3")
-205 205 | 
-206 206 | # Slices on `sys.version_info` should be treated equivalently.
-207     |-if sys.version_info[:2] >= (3,0):
-208     |-    print("py3")
-    207 |+print("py3")
-209 208 | 
-210 209 | if sys.version_info[:3] >= (3,0):
-211 210 |     print("py3")
+204 |     print("py3")
+205 | 
+206 | # Slices on `sys.version_info` should be treated equivalently.
+    - if sys.version_info[:2] >= (3,0):
+    -     print("py3")
+207 + print("py3")
+208 | 
+209 | if sys.version_info[:3] >= (3,0):
+210 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:210:4
@@ -797,17 +827,16 @@ UP036 [*] Version block is outdated for minimum Python version
 211 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-207 207 | if sys.version_info[:2] >= (3,0):
-208 208 |     print("py3")
-209 209 | 
-210     |-if sys.version_info[:3] >= (3,0):
-211     |-    print("py3")
-    210 |+print("py3")
-212 211 | 
-213 212 | if sys.version_info[:2] > (3,14):
-214 213 |     print("py3")
+207 | if sys.version_info[:2] >= (3,0):
+208 |     print("py3")
+209 | 
+    - if sys.version_info[:3] >= (3,0):
+    -     print("py3")
+210 + print("py3")
+211 | 
+212 | if sys.version_info[:2] > (3,14):
+213 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:219:4
@@ -820,25 +849,24 @@ UP036 [*] Version block is outdated for minimum Python version
 221 |     allowed too"
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-216 216 | if sys.version_info[:3] > (3,14):
-217 217 |     print("py3")
-218 218 | 
-219     |-if sys.version_info > (3,0):
-220     |-    f"this is\
-    219 |+f"this is\
-221 220 |     allowed too"
-222 221 | 
-223     |-    f"""the indentation on
-    222 |+f"""the indentation on
-224 223 |     this line is significant"""
-225 224 | 
-226     |-    "this is\
-    225 |+"this is\
-227 226 |     allowed too"
-228 227 | 
-229 228 | if sys.version_info[0] == 3:
+216 | if sys.version_info[:3] > (3,14):
+217 |     print("py3")
+218 | 
+    - if sys.version_info > (3,0):
+    -     f"this is\
+219 + f"this is\
+220 |     allowed too"
+221 | 
+    -     f"""the indentation on
+222 + f"""the indentation on
+223 |     this line is significant"""
+224 | 
+    -     "this is\
+225 + "this is\
+226 |     allowed too"
+227 | 
+228 | if sys.version_info[0] == 3:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:229:4
@@ -850,17 +878,16 @@ UP036 [*] Version block is outdated for minimum Python version
 230 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-226 226 |     "this is\
-227 227 |     allowed too"
-228 228 | 
-229     |-if sys.version_info[0] == 3:
-230     |-    print("py3")
-    229 |+print("py3")
-231 230 | 
-232 231 | if sys.version_info[0] <= 3:
-233 232 |     print("py3")
+226 |     "this is\
+227 |     allowed too"
+228 | 
+    - if sys.version_info[0] == 3:
+    -     print("py3")
+229 + print("py3")
+230 | 
+231 | if sys.version_info[0] <= 3:
+232 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:232:4
@@ -872,17 +899,16 @@ UP036 [*] Version block is outdated for minimum Python version
 233 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-229 229 | if sys.version_info[0] == 3:
-230 230 |     print("py3")
-231 231 | 
-232     |-if sys.version_info[0] <= 3:
-233     |-    print("py3")
-    232 |+print("py3")
-234 233 | 
-235 234 | if sys.version_info[0] < 3:
-236 235 |     print("py3")
+229 | if sys.version_info[0] == 3:
+230 |     print("py3")
+231 | 
+    - if sys.version_info[0] <= 3:
+    -     print("py3")
+232 + print("py3")
+233 | 
+234 | if sys.version_info[0] < 3:
+235 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:235:4
@@ -894,16 +920,15 @@ UP036 [*] Version block is outdated for minimum Python version
 236 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-232 232 | if sys.version_info[0] <= 3:
-233 233 |     print("py3")
-234 234 | 
-235     |-if sys.version_info[0] < 3:
-236     |-    print("py3")
-237 235 | 
-238 236 | if sys.version_info[0] >= 3:
-239 237 |     print("py3")
+232 | if sys.version_info[0] <= 3:
+233 |     print("py3")
+234 | 
+    - if sys.version_info[0] < 3:
+    -     print("py3")
+235 | 
+236 | if sys.version_info[0] >= 3:
+237 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:238:4
@@ -915,17 +940,16 @@ UP036 [*] Version block is outdated for minimum Python version
 239 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-235 235 | if sys.version_info[0] < 3:
-236 236 |     print("py3")
-237 237 | 
-238     |-if sys.version_info[0] >= 3:
-239     |-    print("py3")
-    238 |+print("py3")
-240 239 | 
-241 240 | if sys.version_info[0] > 3:
-242 241 |     print("py3")
+235 | if sys.version_info[0] < 3:
+236 |     print("py3")
+237 | 
+    - if sys.version_info[0] >= 3:
+    -     print("py3")
+238 + print("py3")
+239 | 
+240 | if sys.version_info[0] > 3:
+241 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:241:4
@@ -937,16 +961,15 @@ UP036 [*] Version block is outdated for minimum Python version
 242 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-238 238 | if sys.version_info[0] >= 3:
-239 239 |     print("py3")
-240 240 | 
-241     |-if sys.version_info[0] > 3:
-242     |-    print("py3")
-243 241 | 
-244 242 | if sys.version_info[0] == 2:
-245 243 |     print("py3")
+238 | if sys.version_info[0] >= 3:
+239 |     print("py3")
+240 | 
+    - if sys.version_info[0] > 3:
+    -     print("py3")
+241 | 
+242 | if sys.version_info[0] == 2:
+243 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:244:4
@@ -958,16 +981,15 @@ UP036 [*] Version block is outdated for minimum Python version
 245 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-241 241 | if sys.version_info[0] > 3:
-242 242 |     print("py3")
-243 243 | 
-244     |-if sys.version_info[0] == 2:
-245     |-    print("py3")
-246 244 | 
-247 245 | if sys.version_info[0] <= 2:
-248 246 |     print("py3")
+241 | if sys.version_info[0] > 3:
+242 |     print("py3")
+243 | 
+    - if sys.version_info[0] == 2:
+    -     print("py3")
+244 | 
+245 | if sys.version_info[0] <= 2:
+246 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:247:4
@@ -979,16 +1001,15 @@ UP036 [*] Version block is outdated for minimum Python version
 248 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-244 244 | if sys.version_info[0] == 2:
-245 245 |     print("py3")
-246 246 | 
-247     |-if sys.version_info[0] <= 2:
-248     |-    print("py3")
-249 247 | 
-250 248 | if sys.version_info[0] < 2:
-251 249 |     print("py3")
+244 | if sys.version_info[0] == 2:
+245 |     print("py3")
+246 | 
+    - if sys.version_info[0] <= 2:
+    -     print("py3")
+247 | 
+248 | if sys.version_info[0] < 2:
+249 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:250:4
@@ -1000,16 +1021,15 @@ UP036 [*] Version block is outdated for minimum Python version
 251 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-247 247 | if sys.version_info[0] <= 2:
-248 248 |     print("py3")
-249 249 | 
-250     |-if sys.version_info[0] < 2:
-251     |-    print("py3")
-252 250 | 
-253 251 | if sys.version_info[0] >= 2:
-254 252 |     print("py3")
+247 | if sys.version_info[0] <= 2:
+248 |     print("py3")
+249 | 
+    - if sys.version_info[0] < 2:
+    -     print("py3")
+250 | 
+251 | if sys.version_info[0] >= 2:
+252 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:253:4
@@ -1021,17 +1041,16 @@ UP036 [*] Version block is outdated for minimum Python version
 254 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-250 250 | if sys.version_info[0] < 2:
-251 251 |     print("py3")
-252 252 | 
-253     |-if sys.version_info[0] >= 2:
-254     |-    print("py3")
-    253 |+print("py3")
-255 254 | 
-256 255 | if sys.version_info[0] > 2:
-257 256 |     print("py3")
+250 | if sys.version_info[0] < 2:
+251 |     print("py3")
+252 | 
+    - if sys.version_info[0] >= 2:
+    -     print("py3")
+253 + print("py3")
+254 | 
+255 | if sys.version_info[0] > 2:
+256 |     print("py3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
    --> UP036_0.py:256:4
@@ -1043,11 +1062,10 @@ UP036 [*] Version block is outdated for minimum Python version
 257 |     print("py3")
     |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-253 253 | if sys.version_info[0] >= 2:
-254 254 |     print("py3")
-255 255 | 
-256     |-if sys.version_info[0] > 2:
-257     |-    print("py3")
-    256 |+print("py3")
+253 | if sys.version_info[0] >= 2:
+254 |     print("py3")
+255 | 
+    - if sys.version_info[0] > 2:
+    -     print("py3")
+256 + print("py3")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap
index 312669b328..0290d392fc 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap
@@ -12,18 +12,17 @@ UP036 [*] Version block is outdated for minimum Python version
 5 | else:
   |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | 
-3   |-if sys.version_info == 2:
-4   |-    2
-5   |-else:
-6   |-    3
-  3 |+3
-7 4 | 
-8 5 | if sys.version_info < (3,):
-9 6 |     2
+1 | import sys
+2 | 
+  - if sys.version_info == 2:
+  -     2
+  - else:
+  -     3
+3 + 3
+4 | 
+5 | if sys.version_info < (3,):
+6 |     2
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:8:4
@@ -36,19 +35,18 @@ UP036 [*] Version block is outdated for minimum Python version
 10 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-5  5  | else:
-6  6  |     3
-7  7  | 
-8     |-if sys.version_info < (3,):
-9     |-    2
-10    |-else:
-11    |-    3
-   8  |+3
-12 9  | 
-13 10 | if sys.version_info < (3,0):
-14 11 |     2
+5  | else:
+6  |     3
+7  | 
+   - if sys.version_info < (3,):
+   -     2
+   - else:
+   -     3
+8  + 3
+9  | 
+10 | if sys.version_info < (3,0):
+11 |     2
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:13:4
@@ -61,19 +59,18 @@ UP036 [*] Version block is outdated for minimum Python version
 15 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-10 10 | else:
-11 11 |     3
-12 12 | 
-13    |-if sys.version_info < (3,0):
-14    |-    2
-15    |-else:
-16    |-    3
-   13 |+3
-17 14 | 
-18 15 | if sys.version_info == 3:
-19 16 |     3
+10 | else:
+11 |     3
+12 | 
+   - if sys.version_info < (3,0):
+   -     2
+   - else:
+   -     3
+13 + 3
+14 | 
+15 | if sys.version_info == 3:
+16 |     3
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:18:4
@@ -86,19 +83,18 @@ UP036 [*] Version block is outdated for minimum Python version
 20 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-15 15 | else:
-16 16 |     3
-17 17 | 
-18    |-if sys.version_info == 3:
-19    |-    3
-20    |-else:
-21    |-    2
-   18 |+3
-22 19 | 
-23 20 | if sys.version_info > (3,):
-24 21 |     3
+15 | else:
+16 |     3
+17 | 
+   - if sys.version_info == 3:
+   -     3
+   - else:
+   -     2
+18 + 3
+19 | 
+20 | if sys.version_info > (3,):
+21 |     3
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:23:4
@@ -111,19 +107,18 @@ UP036 [*] Version block is outdated for minimum Python version
 25 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-20 20 | else:
-21 21 |     2
-22 22 | 
-23    |-if sys.version_info > (3,):
-24    |-    3
-25    |-else:
-26    |-    2
-   23 |+3
-27 24 | 
-28 25 | if sys.version_info >= (3,):
-29 26 |     3
+20 | else:
+21 |     2
+22 | 
+   - if sys.version_info > (3,):
+   -     3
+   - else:
+   -     2
+23 + 3
+24 | 
+25 | if sys.version_info >= (3,):
+26 |     3
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:28:4
@@ -136,19 +131,18 @@ UP036 [*] Version block is outdated for minimum Python version
 30 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-25 25 | else:
-26 26 |     2
-27 27 | 
-28    |-if sys.version_info >= (3,):
-29    |-    3
-30    |-else:
-31    |-    2
-   28 |+3
-32 29 | 
-33 30 | from sys import version_info
-34 31 | 
+25 | else:
+26 |     2
+27 | 
+   - if sys.version_info >= (3,):
+   -     3
+   - else:
+   -     2
+28 + 3
+29 | 
+30 | from sys import version_info
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:35:4
@@ -161,19 +155,18 @@ UP036 [*] Version block is outdated for minimum Python version
 37 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | from sys import version_info
-34 34 | 
-35    |-if version_info > (3,):
-36    |-    3
-37    |-else:
-38    |-    2
-   35 |+3
-39 36 | 
-40 37 | if True:
-41 38 |     print(1)
+32 | 
+33 | from sys import version_info
+34 | 
+   - if version_info > (3,):
+   -     3
+   - else:
+   -     2
+35 + 3
+36 | 
+37 | if True:
+38 |     print(1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:42:6
@@ -186,16 +179,15 @@ UP036 [*] Version block is outdated for minimum Python version
 44 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-39 39 | 
-40 40 | if True:
-41 41 |     print(1)
-42    |-elif sys.version_info < (3,0):
-43    |-    print(2)
-44 42 | else:
-45 43 |     print(3)
-46 44 | 
+39 | 
+40 | if True:
+41 |     print(1)
+   - elif sys.version_info < (3,0):
+   -     print(2)
+42 | else:
+43 |     print(3)
+44 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:49:6
@@ -208,19 +200,18 @@ UP036 [*] Version block is outdated for minimum Python version
 51 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-46 46 | 
-47 47 | if True:
-48 48 |     print(1)
-49    |-elif sys.version_info > (3,):
-   49 |+else:
-50 50 |     print(3)
-51    |-else:
-52    |-    print(2)
-53 51 | 
-54 52 | if True:
-55 53 |     print(1)
+46 | 
+47 | if True:
+48 |     print(1)
+   - elif sys.version_info > (3,):
+49 + else:
+50 |     print(3)
+   - else:
+   -     print(2)
+51 | 
+52 | if True:
+53 |     print(1)
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:56:6
@@ -232,16 +223,15 @@ UP036 [*] Version block is outdated for minimum Python version
 57 |     print(3)
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-53 53 | 
-54 54 | if True:
-55 55 |     print(1)
-56    |-elif sys.version_info > (3,):
-   56 |+else:
-57 57 |     print(3)
-58 58 | 
-59 59 | def f():
+53 | 
+54 | if True:
+55 |     print(1)
+   - elif sys.version_info > (3,):
+56 + else:
+57 |     print(3)
+58 | 
+59 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:62:10
@@ -253,16 +243,15 @@ UP036 [*] Version block is outdated for minimum Python version
 63 |         print(3)
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-59 59 | def f():
-60 60 |     if True:
-61 61 |         print(1)
-62    |-    elif sys.version_info > (3,):
-   62 |+    else:
-63 63 |         print(3)
-64 64 | 
-65 65 | if True:
+59 | def f():
+60 |     if True:
+61 |         print(1)
+   -     elif sys.version_info > (3,):
+62 +     else:
+63 |         print(3)
+64 | 
+65 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:67:6
@@ -275,16 +264,15 @@ UP036 [*] Version block is outdated for minimum Python version
 69 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-64 64 | 
-65 65 | if True:
-66 66 |     print(1)
-67    |-elif sys.version_info < (3,0):
-68    |-    print(2)
-69 67 | else:
-70 68 |     print(3)
-71 69 | 
+64 | 
+65 | if True:
+66 |     print(1)
+   - elif sys.version_info < (3,0):
+   -     print(2)
+67 | else:
+68 |     print(3)
+69 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_1.py:75:10
@@ -296,11 +284,10 @@ UP036 [*] Version block is outdated for minimum Python version
 76 |         print(3)
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-72 72 | def f():
-73 73 |     if True:
-74 74 |         print(1)
-75    |-    elif sys.version_info > (3,):
-   75 |+    else:
-76 76 |         print(3)
+72 | def f():
+73 |     if True:
+74 |         print(1)
+   -     elif sys.version_info > (3,):
+75 +     else:
+76 |         print(3)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap
index 32373c23a6..5b22b6e77b 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap
@@ -12,19 +12,18 @@ UP036 [*] Version block is outdated for minimum Python version
 6 | else:
   |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | from sys import version_info
-3 3 | 
-4   |-if sys.version_info > (3, 5):
-5   |-    3+6
-6   |-else:
-7   |-    3-5
-  4 |+3+6
-8 5 | 
-9 6 | if version_info > (3, 5):
-10 7 |     3+6
+1 | import sys
+2 | from sys import version_info
+3 | 
+  - if sys.version_info > (3, 5):
+  -     3+6
+  - else:
+  -     3-5
+4 + 3+6
+5 | 
+6 | if version_info > (3, 5):
+7 |     3+6
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:9:4
@@ -37,19 +36,18 @@ UP036 [*] Version block is outdated for minimum Python version
 11 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-6  6  | else:
-7  7  |     3-5
-8  8  | 
-9     |-if version_info > (3, 5):
-10    |-    3+6
-11    |-else:
-12    |-    3-5
-   9  |+3+6
-13 10 | 
-14 11 | if sys.version_info >= (3,6):
-15 12 |     3+6
+6  | else:
+7  |     3-5
+8  | 
+   - if version_info > (3, 5):
+   -     3+6
+   - else:
+   -     3-5
+9  + 3+6
+10 | 
+11 | if sys.version_info >= (3,6):
+12 |     3+6
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:14:4
@@ -62,19 +60,18 @@ UP036 [*] Version block is outdated for minimum Python version
 16 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-11 11 | else:
-12 12 |     3-5
-13 13 | 
-14    |-if sys.version_info >= (3,6):
-15    |-    3+6
-16    |-else:
-17    |-    3-5
-   14 |+3+6
-18 15 | 
-19 16 | if version_info >= (3,6):
-20 17 |     3+6
+11 | else:
+12 |     3-5
+13 | 
+   - if sys.version_info >= (3,6):
+   -     3+6
+   - else:
+   -     3-5
+14 + 3+6
+15 | 
+16 | if version_info >= (3,6):
+17 |     3+6
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:19:4
@@ -87,19 +84,18 @@ UP036 [*] Version block is outdated for minimum Python version
 21 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-16 16 | else:
-17 17 |     3-5
-18 18 | 
-19    |-if version_info >= (3,6):
-20    |-    3+6
-21    |-else:
-22    |-    3-5
-   19 |+3+6
-23 20 | 
-24 21 | if sys.version_info < (3,6):
-25 22 |     3-5
+16 | else:
+17 |     3-5
+18 | 
+   - if version_info >= (3,6):
+   -     3+6
+   - else:
+   -     3-5
+19 + 3+6
+20 | 
+21 | if sys.version_info < (3,6):
+22 |     3-5
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:24:4
@@ -112,19 +108,18 @@ UP036 [*] Version block is outdated for minimum Python version
 26 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-21 21 | else:
-22 22 |     3-5
-23 23 | 
-24    |-if sys.version_info < (3,6):
-25    |-    3-5
-26    |-else:
-27    |-    3+6
-   24 |+3+6
-28 25 | 
-29 26 | if sys.version_info <= (3,5):
-30 27 |     3-5
+21 | else:
+22 |     3-5
+23 | 
+   - if sys.version_info < (3,6):
+   -     3-5
+   - else:
+   -     3+6
+24 + 3+6
+25 | 
+26 | if sys.version_info <= (3,5):
+27 |     3-5
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:29:4
@@ -137,19 +132,18 @@ UP036 [*] Version block is outdated for minimum Python version
 31 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-26 26 | else:
-27 27 |     3+6
-28 28 | 
-29    |-if sys.version_info <= (3,5):
-30    |-    3-5
-31    |-else:
-32    |-    3+6
-   29 |+3+6
-33 30 | 
-34 31 | if sys.version_info <= (3, 5):
-35 32 |     3-5
+26 | else:
+27 |     3+6
+28 | 
+   - if sys.version_info <= (3,5):
+   -     3-5
+   - else:
+   -     3+6
+29 + 3+6
+30 | 
+31 | if sys.version_info <= (3, 5):
+32 |     3-5
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:34:4
@@ -162,19 +156,18 @@ UP036 [*] Version block is outdated for minimum Python version
 36 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-31 31 | else:
-32 32 |     3+6
-33 33 | 
-34    |-if sys.version_info <= (3, 5):
-35    |-    3-5
-36    |-else:
-37    |-    3+6
-   34 |+3+6
-38 35 | 
-39 36 | if sys.version_info >= (3, 5):
-40 37 |     pass
+31 | else:
+32 |     3+6
+33 | 
+   - if sys.version_info <= (3, 5):
+   -     3-5
+   - else:
+   -     3+6
+34 + 3+6
+35 | 
+36 | if sys.version_info >= (3, 5):
+37 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:39:4
@@ -186,17 +179,16 @@ UP036 [*] Version block is outdated for minimum Python version
 40 |     pass
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-36 36 | else:
-37 37 |     3+6
-38 38 | 
-39    |-if sys.version_info >= (3, 5):
-40    |-    pass
-   39 |+pass
-41 40 | 
-42 41 | if sys.version_info < (3,0):
-43 42 |     pass
+36 | else:
+37 |     3+6
+38 | 
+   - if sys.version_info >= (3, 5):
+   -     pass
+39 + pass
+40 | 
+41 | if sys.version_info < (3,0):
+42 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:42:4
@@ -208,16 +200,15 @@ UP036 [*] Version block is outdated for minimum Python version
 43 |     pass
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-39 39 | if sys.version_info >= (3, 5):
-40 40 |     pass
-41 41 | 
-42    |-if sys.version_info < (3,0):
-43    |-    pass
-44 42 | 
-45 43 | if True:
-46 44 |     if sys.version_info < (3,0):
+39 | if sys.version_info >= (3, 5):
+40 |     pass
+41 | 
+   - if sys.version_info < (3,0):
+   -     pass
+42 | 
+43 | if True:
+44 |     if sys.version_info < (3,0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:46:8
@@ -228,17 +219,16 @@ UP036 [*] Version block is outdated for minimum Python version
 47 |         pass
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-43 43 |     pass
-44 44 | 
-45 45 | if True:
-46    |-    if sys.version_info < (3,0):
-47    |-        pass
-   46 |+    pass
-48 47 | 
-49 48 | if sys.version_info < (3,0):
-50 49 |     pass
+43 |     pass
+44 | 
+45 | if True:
+   -     if sys.version_info < (3,0):
+   -         pass
+46 +     pass
+47 | 
+48 | if sys.version_info < (3,0):
+49 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:49:4
@@ -251,18 +241,17 @@ UP036 [*] Version block is outdated for minimum Python version
 51 | elif False:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-46 46 |     if sys.version_info < (3,0):
-47 47 |         pass
-48 48 | 
-49    |-if sys.version_info < (3,0):
-50    |-    pass
-51    |-elif False:
-   49 |+if False:
-52 50 |     pass
-53 51 | 
-54 52 | if sys.version_info > (3,):
+46 |     if sys.version_info < (3,0):
+47 |         pass
+48 | 
+   - if sys.version_info < (3,0):
+   -     pass
+   - elif False:
+49 + if False:
+50 |     pass
+51 | 
+52 | if sys.version_info > (3,):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_2.py:54:4
@@ -275,16 +264,15 @@ UP036 [*] Version block is outdated for minimum Python version
 56 | elif False:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-51 51 | elif False:
-52 52 |     pass
-53 53 | 
-54    |-if sys.version_info > (3,):
-55    |-    pass
-56    |-elif False:
-57    |-    pass
-   54 |+pass
-58 55 | 
-59 56 | if sys.version_info[0] > "2":
-60 57 |     3
+51 | elif False:
+52 |     pass
+53 | 
+   - if sys.version_info > (3,):
+   -     pass
+   - elif False:
+   -     pass
+54 + pass
+55 | 
+56 | if sys.version_info[0] > "2":
+57 |     3
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap
index 82ac0fd9ce..300b9e32b9 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap
@@ -12,24 +12,23 @@ UP036 [*] Version block is outdated for minimum Python version
 5 |     for item in range(10):
   |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-1  1  | import sys
-2  2  | 
-3     |-if            sys.version_info < (3,0):
-4     |-    print("py2")
-5     |-    for item in range(10):
-6     |-        print(f"PY2-{item}")
-7     |-else                                :
-8     |-    print("py3")
-9     |-    for item in range(10):
-10    |-        print(f"PY3-{item}")
-   3  |+print("py3")
-   4  |+for item in range(10):
-   5  |+    print(f"PY3-{item}")
-11 6  | 
-12 7  | if False:
-13 8  |     if            sys.version_info < (3,0):
+1 | import sys
+2 | 
+  - if            sys.version_info < (3,0):
+  -     print("py2")
+  -     for item in range(10):
+  -         print(f"PY2-{item}")
+  - else                                :
+  -     print("py3")
+  -     for item in range(10):
+  -         print(f"PY3-{item}")
+3 + print("py3")
+4 + for item in range(10):
+5 +     print(f"PY3-{item}")
+6 | 
+7 | if False:
+8 |     if            sys.version_info < (3,0):
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_3.py:13:19
@@ -41,25 +40,24 @@ UP036 [*] Version block is outdated for minimum Python version
 15 |         for item in range(10):
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-10 10 |         print(f"PY3-{item}")
-11 11 | 
-12 12 | if False:
-13    |-    if            sys.version_info < (3,0):
-14    |-        print("py2")
-15    |-        for item in range(10):
-16    |-            print(f"PY2-{item}")
-17    |-    else                                :
-18    |-        print("py3")
-19    |-        for item in range(10):
-20    |-            print(f"PY3-{item}")
-   13 |+    print("py3")
-   14 |+    for item in range(10):
-   15 |+        print(f"PY3-{item}")
-21 16 | 
-22 17 | 
-23 18 | if            sys.version_info < (3,0): print("PY2!")
+10 |         print(f"PY3-{item}")
+11 | 
+12 | if False:
+   -     if            sys.version_info < (3,0):
+   -         print("py2")
+   -         for item in range(10):
+   -             print(f"PY2-{item}")
+   -     else                                :
+   -         print("py3")
+   -         for item in range(10):
+   -             print(f"PY3-{item}")
+13 +     print("py3")
+14 +     for item in range(10):
+15 +         print(f"PY3-{item}")
+16 | 
+17 | 
+18 | if            sys.version_info < (3,0): print("PY2!")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_3.py:23:15
@@ -69,11 +67,10 @@ UP036 [*] Version block is outdated for minimum Python version
 24 | else                               : print("PY3!")
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-20 20 |             print(f"PY3-{item}")
-21 21 | 
-22 22 | 
-23    |-if            sys.version_info < (3,0): print("PY2!")
-24    |-else                               : print("PY3!")
-   23 |+print("PY3!")
+20 |             print(f"PY3-{item}")
+21 | 
+22 | 
+   - if            sys.version_info < (3,0): print("PY2!")
+   - else                               : print("PY3!")
+23 + print("PY3!")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap
index 37041671bc..d6ca76d218 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap
@@ -10,17 +10,16 @@ UP036 [*] Version block is outdated for minimum Python version
 5 |         cmd = [sys.executable, "-m", "test.regrtest"]
   |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-1 1 | import sys
-2 2 | 
-3 3 | if True:
-4   |-    if sys.version_info < (3, 3):
-5   |-        cmd = [sys.executable, "-m", "test.regrtest"]
-  4 |+    pass
-6 5 | 
-7 6 | 
-8 7 | if True:
+1 | import sys
+2 | 
+3 | if True:
+  -     if sys.version_info < (3, 3):
+  -         cmd = [sys.executable, "-m", "test.regrtest"]
+4 +     pass
+5 | 
+6 | 
+7 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:11:10
@@ -32,17 +31,16 @@ UP036 [*] Version block is outdated for minimum Python version
 12 |         cmd = [sys.executable, "-m", "test.regrtest"]
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-8  8  | if True:
-9  9  |     if foo:
-10 10 |         print()
-11    |-    elif sys.version_info < (3, 3):
-12    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-   11 |+    
-13 12 | 
-14 13 | if True:
-15 14 |     if foo:
+8  | if True:
+9  |     if foo:
+10 |         print()
+   -     elif sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+11 +     
+12 | 
+13 | if True:
+14 |     if foo:
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:17:10
@@ -55,16 +53,15 @@ UP036 [*] Version block is outdated for minimum Python version
 19 |     elif foo:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-14 14 | if True:
-15 15 |     if foo:
-16 16 |         print()
-17    |-    elif sys.version_info < (3, 3):
-18    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-19 17 |     elif foo:
-20 18 |         cmd = [sys.executable, "-m", "test", "-j0"]
-21 19 | 
+14 | if True:
+15 |     if foo:
+16 |         print()
+   -     elif sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+17 |     elif foo:
+18 |         cmd = [sys.executable, "-m", "test", "-j0"]
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:24:10
@@ -76,17 +73,16 @@ UP036 [*] Version block is outdated for minimum Python version
 25 |         cmd = [sys.executable, "-m", "test.regrtest"]
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-21 21 | 
-22 22 |     if foo:
-23 23 |         print()
-24    |-    elif sys.version_info < (3, 3):
-25    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-   24 |+    
-26 25 | 
-27 26 |     if sys.version_info < (3, 3):
-28 27 |         cmd = [sys.executable, "-m", "test.regrtest"]
+21 | 
+22 |     if foo:
+23 |         print()
+   -     elif sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+24 +     
+25 | 
+26 |     if sys.version_info < (3, 3):
+27 |         cmd = [sys.executable, "-m", "test.regrtest"]
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:27:8
@@ -98,16 +94,15 @@ UP036 [*] Version block is outdated for minimum Python version
 28 |         cmd = [sys.executable, "-m", "test.regrtest"]
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-24 24 |     elif sys.version_info < (3, 3):
-25 25 |         cmd = [sys.executable, "-m", "test.regrtest"]
-26 26 | 
-27    |-    if sys.version_info < (3, 3):
-28    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-29 27 | 
-30 28 |     if foo:
-31 29 |         print()
+24 |     elif sys.version_info < (3, 3):
+25 |         cmd = [sys.executable, "-m", "test.regrtest"]
+26 | 
+   -     if sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+27 | 
+28 |     if foo:
+29 |         print()
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:32:10
@@ -120,16 +115,15 @@ UP036 [*] Version block is outdated for minimum Python version
 34 |     else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-29 29 | 
-30 30 |     if foo:
-31 31 |         print()
-32    |-    elif sys.version_info < (3, 3):
-33    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-34 32 |     else:
-35 33 |         cmd = [sys.executable, "-m", "test", "-j0"]
-36 34 | 
+29 | 
+30 |     if foo:
+31 |         print()
+   -     elif sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+32 |     else:
+33 |         cmd = [sys.executable, "-m", "test", "-j0"]
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:37:8
@@ -142,19 +136,18 @@ UP036 [*] Version block is outdated for minimum Python version
 39 |     else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-34 34 |     else:
-35 35 |         cmd = [sys.executable, "-m", "test", "-j0"]
-36 36 | 
-37    |-    if sys.version_info < (3, 3):
-38    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-39    |-    else:
-40    |-        cmd = [sys.executable, "-m", "test", "-j0"]
-   37 |+    cmd = [sys.executable, "-m", "test", "-j0"]
-41 38 | 
-42 39 |     if sys.version_info < (3, 3):
-43 40 |         cmd = [sys.executable, "-m", "test.regrtest"]
+34 |     else:
+35 |         cmd = [sys.executable, "-m", "test", "-j0"]
+36 | 
+   -     if sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+   -     else:
+   -         cmd = [sys.executable, "-m", "test", "-j0"]
+37 +     cmd = [sys.executable, "-m", "test", "-j0"]
+38 | 
+39 |     if sys.version_info < (3, 3):
+40 |         cmd = [sys.executable, "-m", "test.regrtest"]
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_4.py:42:8
@@ -167,13 +160,12 @@ UP036 [*] Version block is outdated for minimum Python version
 44 |     elif foo:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-39 39 |     else:
-40 40 |         cmd = [sys.executable, "-m", "test", "-j0"]
-41 41 | 
-42    |-    if sys.version_info < (3, 3):
-43    |-        cmd = [sys.executable, "-m", "test.regrtest"]
-44    |-    elif foo:
-   42 |+    if foo:
-45 43 |         cmd = [sys.executable, "-m", "test", "-j0"]
+39 |     else:
+40 |         cmd = [sys.executable, "-m", "test", "-j0"]
+41 | 
+   -     if sys.version_info < (3, 3):
+   -         cmd = [sys.executable, "-m", "test.regrtest"]
+   -     elif foo:
+42 +     if foo:
+43 |         cmd = [sys.executable, "-m", "test", "-j0"]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap
index 5e9addf542..98e269b932 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap
@@ -12,25 +12,24 @@ UP036 [*] Version block is outdated for minimum Python version
 5 |     def a():
   |
 help: Remove outdated version block
-
-ℹ Unsafe 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
+1 | import sys
+2 | 
+  - if sys.version_info < (3, 8):
+  - 
+  -     def a():
+  -         if b:
+  -             print(1)
+  -         elif c:
+  -             print(2)
+  -         return None
+  - 
+  - else:
+  -     pass
+3 + pass
+4 | 
+5 | 
+6 | import sys
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:18:4
@@ -42,35 +41,34 @@ UP036 [*] Version block is outdated for minimum Python version
 19 |     pass
    |
 help: Remove outdated version block
-
-ℹ Unsafe 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
-31 26 | 
-32 27 | 
-33 28 | # https://github.com/astral-sh/ruff/issues/16082
+15 | 
+16 | import sys
+17 | 
+   - if sys.version_info < (3, 8):
+   -     pass
+   - 
+   - else:
+   - 
+   -     def a():
+   -         if b:
+   -             print(1)
+   -         elif c:
+   -             print(2)
+   -         else:
+   -             print(3)
+   -         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
+26 | 
+27 | 
+28 | # https://github.com/astral-sh/ruff/issues/16082
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:36:4
@@ -81,16 +79,15 @@ UP036 [*] Version block is outdated for minimum Python version
 37 |     print()
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-33 33 | # https://github.com/astral-sh/ruff/issues/16082
-34 34 | 
-35 35 | ## Errors
-36    |-if sys.version_info < (3, 12, 0):
-37    |-    print()
-38 36 | 
-39 37 | if sys.version_info <= (3, 12, 0):
-40 38 |     print()
+33 | # https://github.com/astral-sh/ruff/issues/16082
+34 | 
+35 | ## Errors
+   - if sys.version_info < (3, 12, 0):
+   -     print()
+36 | 
+37 | if sys.version_info <= (3, 12, 0):
+38 |     print()
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:39:4
@@ -102,16 +99,15 @@ UP036 [*] Version block is outdated for minimum Python version
 40 |     print()
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-36 36 | if sys.version_info < (3, 12, 0):
-37 37 |     print()
-38 38 | 
-39    |-if sys.version_info <= (3, 12, 0):
-40    |-    print()
-41 39 | 
-42 40 | if sys.version_info < (3, 12, 11):
-43 41 |     print()
+36 | if sys.version_info < (3, 12, 0):
+37 |     print()
+38 | 
+   - if sys.version_info <= (3, 12, 0):
+   -     print()
+39 | 
+40 | if sys.version_info < (3, 12, 11):
+41 |     print()
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:42:4
@@ -123,16 +119,15 @@ UP036 [*] Version block is outdated for minimum Python version
 43 |     print()
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-39 39 | if sys.version_info <= (3, 12, 0):
-40 40 |     print()
-41 41 | 
-42    |-if sys.version_info < (3, 12, 11):
-43    |-    print()
-44 42 | 
-45 43 | if sys.version_info < (3, 13, 0):
-46 44 |     print()
+39 | if sys.version_info <= (3, 12, 0):
+40 |     print()
+41 | 
+   - if sys.version_info < (3, 12, 11):
+   -     print()
+42 | 
+43 | if sys.version_info < (3, 13, 0):
+44 |     print()
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:45:4
@@ -144,16 +139,15 @@ UP036 [*] Version block is outdated for minimum Python version
 46 |     print()
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-42 42 | if sys.version_info < (3, 12, 11):
-43 43 |     print()
-44 44 | 
-45    |-if sys.version_info < (3, 13, 0):
-46    |-    print()
-47 45 | 
-48 46 | if sys.version_info <= (3, 13, 100000):
-49 47 |     print()
+42 | if sys.version_info < (3, 12, 11):
+43 |     print()
+44 | 
+   - if sys.version_info < (3, 13, 0):
+   -     print()
+45 | 
+46 | if sys.version_info <= (3, 13, 100000):
+47 |     print()
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 Version specifier is invalid
   --> UP036_5.py:48:24
@@ -165,6 +159,66 @@ UP036 Version specifier is invalid
 49 |     print()
    |
 
+UP036 [*] Version block is outdated for minimum Python version
+  --> UP036_5.py:60:4
+   |
+58 |     print()
+59 |
+60 | if sys.version_info <= (3, 13, 0):
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+61 |     print()
+   |
+help: Remove outdated version block
+57 | if sys.version_info <= (3, 13, 'final'):
+58 |     print()
+59 | 
+   - if sys.version_info <= (3, 13, 0):
+   -     print()
+60 | 
+61 | if sys.version_info < (3, 13, 37):
+62 |     print()
+note: This is an unsafe fix and may change runtime behavior
+
+UP036 [*] Version block is outdated for minimum Python version
+  --> UP036_5.py:63:4
+   |
+61 |     print()
+62 |
+63 | if sys.version_info < (3, 13, 37):
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+64 |     print()
+   |
+help: Remove outdated version block
+60 | if sys.version_info <= (3, 13, 0):
+61 |     print()
+62 | 
+   - if sys.version_info < (3, 13, 37):
+   -     print()
+63 | 
+64 | if sys.version_info <= (3, 13, 37):
+65 |     print()
+note: This is an unsafe fix and may change runtime behavior
+
+UP036 [*] Version block is outdated for minimum Python version
+  --> UP036_5.py:66:4
+   |
+64 |     print()
+65 |
+66 | if sys.version_info <= (3, 13, 37):
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+67 |     print()
+   |
+help: Remove outdated version block
+63 | if sys.version_info < (3, 13, 37):
+64 |     print()
+65 | 
+   - if sys.version_info <= (3, 13, 37):
+   -     print()
+66 | 
+67 | if sys.version_info <= (3, 14, 0):
+68 |     print()
+note: This is an unsafe fix and may change runtime behavior
+
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:77:4
    |
@@ -176,19 +230,18 @@ UP036 [*] Version block is outdated for minimum Python version
 79 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-74 74 | 
-75 75 | # https://github.com/astral-sh/ruff/issues/18165
-76 76 | 
-77    |-if sys.version_info.major >= 3:
-78    |-    print("3")
-79    |-else:
-80    |-    print("2")
-   77 |+print("3")
-81 78 | 
-82 79 | if sys.version_info.major > 3:
-83 80 |     print("3")
+74 | 
+75 | # https://github.com/astral-sh/ruff/issues/18165
+76 | 
+   - if sys.version_info.major >= 3:
+   -     print("3")
+   - else:
+   -     print("2")
+77 + print("3")
+78 | 
+79 | if sys.version_info.major > 3:
+80 |     print("3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:82:4
@@ -201,19 +254,18 @@ UP036 [*] Version block is outdated for minimum Python version
 84 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-79 79 | else:
-80 80 |     print("2")
-81 81 | 
-82    |-if sys.version_info.major > 3:
-83    |-    print("3")
-84    |-else:
-85    |-    print("2")
-   82 |+print("2")
-86 83 | 
-87 84 | if sys.version_info.major <= 3:
-88 85 |     print("3")
+79 | else:
+80 |     print("2")
+81 | 
+   - if sys.version_info.major > 3:
+   -     print("3")
+   - else:
+   -     print("2")
+82 + print("2")
+83 | 
+84 | if sys.version_info.major <= 3:
+85 |     print("3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:87:4
@@ -226,19 +278,18 @@ UP036 [*] Version block is outdated for minimum Python version
 89 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-84 84 | else:
-85 85 |     print("2")
-86 86 | 
-87    |-if sys.version_info.major <= 3:
-88    |-    print("3")
-89    |-else:
-90    |-    print("2")
-   87 |+print("3")
-91 88 | 
-92 89 | if sys.version_info.major < 3:
-93 90 |     print("3")
+84 | else:
+85 |     print("2")
+86 | 
+   - if sys.version_info.major <= 3:
+   -     print("3")
+   - else:
+   -     print("2")
+87 + print("3")
+88 | 
+89 | if sys.version_info.major < 3:
+90 |     print("3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:92:4
@@ -251,19 +302,18 @@ UP036 [*] Version block is outdated for minimum Python version
 94 | else:
    |
 help: Remove outdated version block
-
-ℹ Unsafe fix
-89 89 | else:
-90 90 |     print("2")
-91 91 | 
-92    |-if sys.version_info.major < 3:
-93    |-    print("3")
-94    |-else:
-95    |-    print("2")
-   92 |+print("2")
-96 93 | 
-97 94 | if sys.version_info.major == 3:
-98 95 |     print("3")
+89 | else:
+90 |     print("2")
+91 | 
+   - if sys.version_info.major < 3:
+   -     print("3")
+   - else:
+   -     print("2")
+92 + print("2")
+93 | 
+94 | if sys.version_info.major == 3:
+95 |     print("3")
+note: This is an unsafe fix and may change runtime behavior
 
 UP036 [*] Version block is outdated for minimum Python version
   --> UP036_5.py:97:4
@@ -276,16 +326,39 @@ UP036 [*] Version block is outdated for minimum Python version
 99 | else:
    |
 help: Remove outdated version block
+94  | else:
+95  |     print("2")
+96  | 
+    - if sys.version_info.major == 3:
+    -     print("3")
+    - else:
+    -     print("2")
+97  + print("3")
+98  | 
+99  | # Semantically incorrect, skip fixing
+100 | 
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-94  94  | else:
-95  95  |     print("2")
-96  96  | 
-97      |-if sys.version_info.major == 3:
-98      |-    print("3")
-99      |-else:
-100     |-    print("2")
-    97  |+print("3")
-101 98  | 
-102 99  | # Semantically incorrect, skip fixing
-103 100 |
+UP036 [*] Version block is outdated for minimum Python version
+   --> UP036_5.py:109:4
+    |
+107 |     print(2)
+108 |
+109 | if sys.version_info.major > (3, 13):
+    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+110 |     print(3)
+111 | else:
+    |
+help: Remove outdated version block
+106 | else:
+107 |     print(2)
+108 | 
+    - if sys.version_info.major > (3, 13):
+    -     print(3)
+    - else:
+    -     print(2)
+109 + print(3)
+110 | 
+111 | if sys.version_info.major[:2] > (3, 13):
+112 |     print(3)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap
index 2c67e9da5a..3040870f87 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap
@@ -9,16 +9,14 @@ UP037 [*] Remove quotes from type annotation
 19 |     x: "MyClass"
    |
 help: Remove quotes
-
-ℹ Safe fix
-15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
-16 16 | 
-17 17 | 
-18    |-def foo(var: "MyClass") -> "MyClass":
-   18 |+def foo(var: MyClass) -> "MyClass":
-19 19 |     x: "MyClass"
-20 20 | 
-21 21 | 
+15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
+16 | 
+17 | 
+   - def foo(var: "MyClass") -> "MyClass":
+18 + def foo(var: MyClass) -> "MyClass":
+19 |     x: "MyClass"
+20 | 
+21 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:18:28
@@ -28,16 +26,14 @@ UP037 [*] Remove quotes from type annotation
 19 |     x: "MyClass"
    |
 help: Remove quotes
-
-ℹ Safe fix
-15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
-16 16 | 
-17 17 | 
-18    |-def foo(var: "MyClass") -> "MyClass":
-   18 |+def foo(var: "MyClass") -> MyClass:
-19 19 |     x: "MyClass"
-20 20 | 
-21 21 | 
+15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
+16 | 
+17 | 
+   - def foo(var: "MyClass") -> "MyClass":
+18 + def foo(var: "MyClass") -> MyClass:
+19 |     x: "MyClass"
+20 | 
+21 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:19:8
@@ -47,16 +43,14 @@ UP037 [*] Remove quotes from type annotation
    |        ^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-16 16 | 
-17 17 | 
-18 18 | def foo(var: "MyClass") -> "MyClass":
-19    |-    x: "MyClass"
-   19 |+    x: MyClass
-20 20 | 
-21 21 | 
-22 22 | def foo(*, inplace: "bool"):
+16 | 
+17 | 
+18 | def foo(var: "MyClass") -> "MyClass":
+   -     x: "MyClass"
+19 +     x: MyClass
+20 | 
+21 | 
+22 | def foo(*, inplace: "bool"):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:22:21
@@ -66,16 +60,14 @@ UP037 [*] Remove quotes from type annotation
 23 |     pass
    |
 help: Remove quotes
-
-ℹ Safe fix
-19 19 |     x: "MyClass"
-20 20 | 
-21 21 | 
-22    |-def foo(*, inplace: "bool"):
-   22 |+def foo(*, inplace: bool):
-23 23 |     pass
-24 24 | 
-25 25 | 
+19 |     x: "MyClass"
+20 | 
+21 | 
+   - def foo(*, inplace: "bool"):
+22 + def foo(*, inplace: bool):
+23 |     pass
+24 | 
+25 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:26:16
@@ -85,16 +77,14 @@ UP037 [*] Remove quotes from type annotation
 27 |     pass
    |
 help: Remove quotes
-
-ℹ Safe fix
-23 23 |     pass
-24 24 | 
-25 25 | 
-26    |-def foo(*args: "str", **kwargs: "int"):
-   26 |+def foo(*args: str, **kwargs: "int"):
-27 27 |     pass
-28 28 | 
-29 29 | 
+23 |     pass
+24 | 
+25 | 
+   - def foo(*args: "str", **kwargs: "int"):
+26 + def foo(*args: str, **kwargs: "int"):
+27 |     pass
+28 | 
+29 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:26:33
@@ -104,16 +94,14 @@ UP037 [*] Remove quotes from type annotation
 27 |     pass
    |
 help: Remove quotes
-
-ℹ Safe fix
-23 23 |     pass
-24 24 | 
-25 25 | 
-26    |-def foo(*args: "str", **kwargs: "int"):
-   26 |+def foo(*args: "str", **kwargs: int):
-27 27 |     pass
-28 28 | 
-29 29 | 
+23 |     pass
+24 | 
+25 | 
+   - def foo(*args: "str", **kwargs: "int"):
+26 + def foo(*args: "str", **kwargs: int):
+27 |     pass
+28 | 
+29 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:30:10
@@ -124,16 +112,14 @@ UP037 [*] Remove quotes from type annotation
 32 | x: Callable[["MyClass"], None]
    |
 help: Remove quotes
-
-ℹ Safe fix
-27 27 |     pass
-28 28 | 
-29 29 | 
-30    |-x: Tuple["MyClass"]
-   30 |+x: Tuple[MyClass]
-31 31 | 
-32 32 | x: Callable[["MyClass"], None]
-33 33 | 
+27 |     pass
+28 | 
+29 | 
+   - x: Tuple["MyClass"]
+30 + x: Tuple[MyClass]
+31 | 
+32 | x: Callable[["MyClass"], None]
+33 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:32:14
@@ -144,16 +130,14 @@ UP037 [*] Remove quotes from type annotation
    |              ^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-29 29 | 
-30 30 | x: Tuple["MyClass"]
-31 31 | 
-32    |-x: Callable[["MyClass"], None]
-   32 |+x: Callable[[MyClass], None]
-33 33 | 
-34 34 | 
-35 35 | class Foo(NamedTuple):
+29 | 
+30 | x: Tuple["MyClass"]
+31 | 
+   - x: Callable[["MyClass"], None]
+32 + x: Callable[[MyClass], None]
+33 | 
+34 | 
+35 | class Foo(NamedTuple):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:36:8
@@ -163,16 +147,14 @@ UP037 [*] Remove quotes from type annotation
    |        ^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-33 33 | 
-34 34 | 
-35 35 | class Foo(NamedTuple):
-36    |-    x: "MyClass"
-   36 |+    x: MyClass
-37 37 | 
-38 38 | 
-39 39 | class D(TypedDict):
+33 | 
+34 | 
+35 | class Foo(NamedTuple):
+   -     x: "MyClass"
+36 +     x: MyClass
+37 | 
+38 | 
+39 | class D(TypedDict):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:40:27
@@ -182,16 +164,14 @@ UP037 [*] Remove quotes from type annotation
    |                           ^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-37 37 | 
-38 38 | 
-39 39 | class D(TypedDict):
-40    |-    E: TypedDict("E", foo="int", total=False)
-   40 |+    E: TypedDict("E", foo=int, total=False)
-41 41 | 
-42 42 | 
-43 43 | class D(TypedDict):
+37 | 
+38 | 
+39 | class D(TypedDict):
+   -     E: TypedDict("E", foo="int", total=False)
+40 +     E: TypedDict("E", foo=int, total=False)
+41 | 
+42 | 
+43 | class D(TypedDict):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:44:31
@@ -201,16 +181,14 @@ UP037 [*] Remove quotes from type annotation
    |                               ^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-41 41 | 
-42 42 | 
-43 43 | class D(TypedDict):
-44    |-    E: TypedDict("E", {"foo": "int"})
-   44 |+    E: TypedDict("E", {"foo": int})
-45 45 | 
-46 46 | 
-47 47 | x: Annotated["str", "metadata"]
+41 | 
+42 | 
+43 | class D(TypedDict):
+   -     E: TypedDict("E", {"foo": "int"})
+44 +     E: TypedDict("E", {"foo": int})
+45 | 
+46 | 
+47 | x: Annotated["str", "metadata"]
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:47:14
@@ -221,16 +199,14 @@ UP037 [*] Remove quotes from type annotation
 49 | x: Arg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-44 44 |     E: TypedDict("E", {"foo": "int"})
-45 45 | 
-46 46 | 
-47    |-x: Annotated["str", "metadata"]
-   47 |+x: Annotated[str, "metadata"]
-48 48 | 
-49 49 | x: Arg("str", "name")
-50 50 | 
+44 |     E: TypedDict("E", {"foo": "int"})
+45 | 
+46 | 
+   - x: Annotated["str", "metadata"]
+47 + x: Annotated[str, "metadata"]
+48 | 
+49 | x: Arg("str", "name")
+50 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:49:8
@@ -243,16 +219,14 @@ UP037 [*] Remove quotes from type annotation
 51 | x: DefaultArg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-46 46 | 
-47 47 | x: Annotated["str", "metadata"]
-48 48 | 
-49    |-x: Arg("str", "name")
-   49 |+x: Arg(str, "name")
-50 50 | 
-51 51 | x: DefaultArg("str", "name")
-52 52 | 
+46 | 
+47 | x: Annotated["str", "metadata"]
+48 | 
+   - x: Arg("str", "name")
+49 + x: Arg(str, "name")
+50 | 
+51 | x: DefaultArg("str", "name")
+52 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:51:15
@@ -265,16 +239,14 @@ UP037 [*] Remove quotes from type annotation
 53 | x: NamedArg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-48 48 | 
-49 49 | x: Arg("str", "name")
-50 50 | 
-51    |-x: DefaultArg("str", "name")
-   51 |+x: DefaultArg(str, "name")
-52 52 | 
-53 53 | x: NamedArg("str", "name")
-54 54 | 
+48 | 
+49 | x: Arg("str", "name")
+50 | 
+   - x: DefaultArg("str", "name")
+51 + x: DefaultArg(str, "name")
+52 | 
+53 | x: NamedArg("str", "name")
+54 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:53:13
@@ -287,16 +259,14 @@ UP037 [*] Remove quotes from type annotation
 55 | x: DefaultNamedArg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-50 50 | 
-51 51 | x: DefaultArg("str", "name")
-52 52 | 
-53    |-x: NamedArg("str", "name")
-   53 |+x: NamedArg(str, "name")
-54 54 | 
-55 55 | x: DefaultNamedArg("str", "name")
-56 56 | 
+50 | 
+51 | x: DefaultArg("str", "name")
+52 | 
+   - x: NamedArg("str", "name")
+53 + x: NamedArg(str, "name")
+54 | 
+55 | x: DefaultNamedArg("str", "name")
+56 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:55:20
@@ -309,16 +279,14 @@ UP037 [*] Remove quotes from type annotation
 57 | x: DefaultNamedArg("str", name="name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-52 52 | 
-53 53 | x: NamedArg("str", "name")
-54 54 | 
-55    |-x: DefaultNamedArg("str", "name")
-   55 |+x: DefaultNamedArg(str, "name")
-56 56 | 
-57 57 | x: DefaultNamedArg("str", name="name")
-58 58 | 
+52 | 
+53 | x: NamedArg("str", "name")
+54 | 
+   - x: DefaultNamedArg("str", "name")
+55 + x: DefaultNamedArg(str, "name")
+56 | 
+57 | x: DefaultNamedArg("str", name="name")
+58 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:57:20
@@ -331,16 +299,14 @@ UP037 [*] Remove quotes from type annotation
 59 | x: VarArg("str")
    |
 help: Remove quotes
-
-ℹ Safe fix
-54 54 | 
-55 55 | x: DefaultNamedArg("str", "name")
-56 56 | 
-57    |-x: DefaultNamedArg("str", name="name")
-   57 |+x: DefaultNamedArg(str, name="name")
-58 58 | 
-59 59 | x: VarArg("str")
-60 60 | 
+54 | 
+55 | x: DefaultNamedArg("str", "name")
+56 | 
+   - x: DefaultNamedArg("str", name="name")
+57 + x: DefaultNamedArg(str, name="name")
+58 | 
+59 | x: VarArg("str")
+60 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:59:11
@@ -353,16 +319,14 @@ UP037 [*] Remove quotes from type annotation
 61 | x: List[List[List["MyClass"]]]
    |
 help: Remove quotes
-
-ℹ Safe fix
-56 56 | 
-57 57 | x: DefaultNamedArg("str", name="name")
-58 58 | 
-59    |-x: VarArg("str")
-   59 |+x: VarArg(str)
-60 60 | 
-61 61 | x: List[List[List["MyClass"]]]
-62 62 | 
+56 | 
+57 | x: DefaultNamedArg("str", name="name")
+58 | 
+   - x: VarArg("str")
+59 + x: VarArg(str)
+60 | 
+61 | x: List[List[List["MyClass"]]]
+62 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:61:19
@@ -375,16 +339,14 @@ UP037 [*] Remove quotes from type annotation
 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-58 58 | 
-59 59 | x: VarArg("str")
-60 60 | 
-61    |-x: List[List[List["MyClass"]]]
-   61 |+x: List[List[List[MyClass]]]
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
+58 | 
+59 | x: VarArg("str")
+60 | 
+   - x: List[List[List["MyClass"]]]
+61 + x: List[List[List[MyClass]]]
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:63:29
@@ -397,16 +359,14 @@ UP037 [*] Remove quotes from type annotation
 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-60 60 | 
-61 61 | x: List[List[List["MyClass"]]]
-62 62 | 
-63    |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-   63 |+x: NamedTuple("X", [("foo", int), ("bar", "str")])
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
+60 | 
+61 | x: List[List[List["MyClass"]]]
+62 | 
+   - x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+63 + x: NamedTuple("X", [("foo", int), ("bar", "str")])
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:63:45
@@ -419,16 +379,14 @@ UP037 [*] Remove quotes from type annotation
 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-60 60 | 
-61 61 | x: List[List[List["MyClass"]]]
-62 62 | 
-63    |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-   63 |+x: NamedTuple("X", [("foo", "int"), ("bar", str)])
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
+60 | 
+61 | x: List[List[List["MyClass"]]]
+62 | 
+   - x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+63 + x: NamedTuple("X", [("foo", "int"), ("bar", str)])
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:29
@@ -441,16 +399,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:36
@@ -463,16 +419,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[("foo", int), ("bar", "str")])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[("foo", int), ("bar", "str")])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:45
@@ -485,16 +439,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:52
@@ -507,16 +459,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:67:24
@@ -529,16 +479,14 @@ UP037 [*] Remove quotes from type annotation
 69 | X: MyCallable("X")
    |
 help: Remove quotes
-
-ℹ Safe fix
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
-67    |-x: NamedTuple(typename="X", fields=[("foo", "int")])
-   67 |+x: NamedTuple(typename=X, fields=[("foo", "int")])
-68 68 | 
-69 69 | X: MyCallable("X")
-70 70 | 
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
+   - x: NamedTuple(typename="X", fields=[("foo", "int")])
+67 + x: NamedTuple(typename=X, fields=[("foo", "int")])
+68 | 
+69 | X: MyCallable("X")
+70 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:67:38
@@ -551,16 +499,14 @@ UP037 [*] Remove quotes from type annotation
 69 | X: MyCallable("X")
    |
 help: Remove quotes
-
-ℹ Safe fix
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
-67    |-x: NamedTuple(typename="X", fields=[("foo", "int")])
-   67 |+x: NamedTuple(typename="X", fields=[(foo, "int")])
-68 68 | 
-69 69 | X: MyCallable("X")
-70 70 | 
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
+   - x: NamedTuple(typename="X", fields=[("foo", "int")])
+67 + x: NamedTuple(typename="X", fields=[(foo, "int")])
+68 | 
+69 | X: MyCallable("X")
+70 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:67:45
@@ -573,16 +519,14 @@ UP037 [*] Remove quotes from type annotation
 69 | X: MyCallable("X")
    |
 help: Remove quotes
-
-ℹ Safe fix
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
-67    |-x: NamedTuple(typename="X", fields=[("foo", "int")])
-   67 |+x: NamedTuple(typename="X", fields=[("foo", int)])
-68 68 | 
-69 69 | X: MyCallable("X")
-70 70 | 
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
+   - x: NamedTuple(typename="X", fields=[("foo", "int")])
+67 + x: NamedTuple(typename="X", fields=[("foo", int)])
+68 | 
+69 | X: MyCallable("X")
+70 | 
 
 UP037 [*] Remove quotes from type annotation
    --> UP037_0.py:112:12
@@ -594,17 +538,15 @@ UP037 [*] Remove quotes from type annotation
 113 |     return 0
     |
 help: Remove quotes
-
-ℹ Safe fix
-109 109 | 
-110 110 | # Handle end of line comment in string annotation
-111 111 | # See https://github.com/astral-sh/ruff/issues/15816
-112     |-def f() -> "Literal[0]#":
-    112 |+def f() -> (Literal[0]#
-    113 |+):
-113 114 |     return 0
-114 115 | 
-115 116 | def g(x: "Literal['abc']#") -> None:
+109 | 
+110 | # Handle end of line comment in string annotation
+111 | # See https://github.com/astral-sh/ruff/issues/15816
+    - def f() -> "Literal[0]#":
+112 + def f() -> (Literal[0]#
+113 + ):
+114 |     return 0
+115 | 
+116 | def g(x: "Literal['abc']#") -> None:
 
 UP037 [*] Remove quotes from type annotation
    --> UP037_0.py:115:10
@@ -616,17 +558,15 @@ UP037 [*] Remove quotes from type annotation
 116 |     return
     |
 help: Remove quotes
-
-ℹ Safe fix
-112 112 | def f() -> "Literal[0]#":
-113 113 |     return 0
-114 114 | 
-115     |-def g(x: "Literal['abc']#") -> None:
-    115 |+def g(x: (Literal['abc']#
-    116 |+)) -> None:
-116 117 |     return
-117 118 | 
-118 119 | def f() -> """Literal[0]
+112 | def f() -> "Literal[0]#":
+113 |     return 0
+114 | 
+    - def g(x: "Literal['abc']#") -> None:
+115 + def g(x: (Literal['abc']#
+116 + )) -> None:
+117 |     return
+118 | 
+119 | def f() -> """Literal[0]
 
 UP037 [*] Remove quotes from type annotation
    --> UP037_0.py:118:12
@@ -642,15 +582,13 @@ UP037 [*] Remove quotes from type annotation
 122 |       return 0
     |
 help: Remove quotes
-
-ℹ Safe fix
-115 115 | def g(x: "Literal['abc']#") -> None:
-116 116 |     return
-117 117 | 
-118     |-def f() -> """Literal[0]
-    118 |+def f() -> (Literal[0]
-119 119 |     #
-120 120 |     
-121     |-    """:
-    121 |+    ):
-122 122 |     return 0
+115 | def g(x: "Literal['abc']#") -> None:
+116 |     return
+117 | 
+    - def f() -> """Literal[0]
+118 + def f() -> (Literal[0]
+119 |     #
+120 |     
+    -     """:
+121 +     ):
+122 |     return 0
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap
index ce3ac81a13..04fbed2e63 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap
@@ -11,13 +11,25 @@ UP037 [*] Remove quotes from type annotation
 10 |     print(x)
    |
 help: Remove quotes
+6  | 
+7  | def foo():
+8  |     # UP037
+   -     x: "Tuple[int, int]" = (0, 0)
+9  +     x: Tuple[int, int] = (0, 0)
+10 |     print(x)
+11 | 
+12 | 
 
-ℹ Safe fix
-6  6  | 
-7  7  | def foo():
-8  8  |     # UP037
-9     |-    x: "Tuple[int, int]" = (0, 0)
-   9  |+    x: Tuple[int, int] = (0, 0)
-10 10 |     print(x)
-11 11 | 
-12 12 |
+UP037 [*] Remove quotes from type annotation
+  --> UP037_1.py:14:4
+   |
+13 | # OK
+14 | X: "Tuple[int, int]" = (0, 0)
+   |    ^^^^^^^^^^^^^^^^^
+   |
+help: Remove quotes
+11 | 
+12 | 
+13 | # OK
+   - X: "Tuple[int, int]" = (0, 0)
+14 + X: Tuple[int, int] = (0, 0)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap
index e10f3761d3..93fe2fa475 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap
@@ -10,16 +10,14 @@ UP037 [*] Remove quotes from type annotation
   |              ^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Remove quotes
-
-ℹ Safe fix
-1 1 | # https://github.com/astral-sh/ruff/issues/7102
-2 2 | 
-3   |-def f(a: Foo['SingleLine  # Comment']): ...
-  3 |+def f(a: Foo[(SingleLine  # Comment
-  4 |+)]): ...
-4 5 | 
-5 6 | 
-6 7 | def f(a: Foo['''Bar[
+1 | # https://github.com/astral-sh/ruff/issues/7102
+2 | 
+  - def f(a: Foo['SingleLine  # Comment']): ...
+3 + def f(a: Foo[(SingleLine  # Comment
+4 + )]): ...
+5 | 
+6 | 
+7 | def f(a: Foo['''Bar[
 
 UP037 [*] Remove quotes from type annotation
  --> UP037_2.pyi:6:14
@@ -31,19 +29,17 @@ UP037 [*] Remove quotes from type annotation
   | |____________^
   |
 help: Remove quotes
-
-ℹ Safe fix
-3 3 | def f(a: Foo['SingleLine  # Comment']): ...
-4 4 | 
-5 5 | 
-6   |-def f(a: Foo['''Bar[
-  6 |+def f(a: Foo[Bar[
-7 7 |     Multi |
-8   |-    Line]''']): ...
-  8 |+    Line]]): ...
-9 9 | 
-10 10 | 
-11 11 | def f(a: Foo['''Bar[
+3  | def f(a: Foo['SingleLine  # Comment']): ...
+4  | 
+5  | 
+   - def f(a: Foo['''Bar[
+6  + def f(a: Foo[Bar[
+7  |     Multi |
+   -     Line]''']): ...
+8  +     Line]]): ...
+9  | 
+10 | 
+11 | def f(a: Foo['''Bar[
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:11:14
@@ -56,20 +52,18 @@ UP037 [*] Remove quotes from type annotation
    | |____^
    |
 help: Remove quotes
-
-ℹ Safe fix
-8  8  |     Line]''']): ...
-9  9  | 
-10 10 | 
-11    |-def f(a: Foo['''Bar[
-   11 |+def f(a: Foo[Bar[
-12 12 |     Multi |
-13 13 |     Line  # Comment
-14    |-]''']): ...
-   14 |+]]): ...
-15 15 | 
-16 16 | 
-17 17 | def f(a: Foo['''Bar[
+8  |     Line]''']): ...
+9  | 
+10 | 
+   - def f(a: Foo['''Bar[
+11 + def f(a: Foo[Bar[
+12 |     Multi |
+13 |     Line  # Comment
+   - ]''']): ...
+14 + ]]): ...
+15 | 
+16 | 
+17 | def f(a: Foo['''Bar[
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:17:14
@@ -81,20 +75,18 @@ UP037 [*] Remove quotes from type annotation
    | |_______________________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-14 14 | ]''']): ...
-15 15 | 
-16 16 | 
-17    |-def f(a: Foo['''Bar[
-   17 |+def f(a: Foo[(Bar[
-18 18 |     Multi |
-19    |-    Line]  # Comment''']): ...
-   19 |+    Line]  # Comment
-   20 |+)]): ...
-20 21 | 
-21 22 | 
-22 23 | def f(a: Foo['''
+14 | ]''']): ...
+15 | 
+16 | 
+   - def f(a: Foo['''Bar[
+17 + def f(a: Foo[(Bar[
+18 |     Multi |
+   -     Line]  # Comment''']): ...
+19 +     Line]  # Comment
+20 + )]): ...
+21 | 
+22 | 
+23 | def f(a: Foo['''
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:22:14
@@ -107,21 +99,19 @@ UP037 [*] Remove quotes from type annotation
    | |_______________________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-19 19 |     Line]  # Comment''']): ...
-20 20 | 
-21 21 | 
-22    |-def f(a: Foo['''
-   22 |+def f(a: Foo[(
-23 23 | Bar[
-24 24 |     Multi |
-25    |-    Line]  # Comment''']): ...
-   25 |+    Line]  # Comment
-   26 |+)]): ...
-26 27 | 
-27 28 | 
-28 29 | def f(a: '''list[int]
+19 |     Line]  # Comment''']): ...
+20 | 
+21 | 
+   - def f(a: Foo['''
+22 + def f(a: Foo[(
+23 | Bar[
+24 |     Multi |
+   -     Line]  # Comment''']): ...
+25 +     Line]  # Comment
+26 + )]): ...
+27 | 
+28 | 
+29 | def f(a: '''list[int]
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:28:10
@@ -132,18 +122,16 @@ UP037 [*] Remove quotes from type annotation
    | |_______^
    |
 help: Remove quotes
-
-ℹ Safe fix
-25 25 |     Line]  # Comment''']): ...
-26 26 | 
-27 27 | 
-28    |-def f(a: '''list[int]
-29    |-	''' = []): ...
-   28 |+def f(a: list[int]
-   29 |+	 = []): ...
-30 30 | 
-31 31 | 
-32 32 | a: '''\\
+25 |     Line]  # Comment''']): ...
+26 | 
+27 | 
+   - def f(a: '''list[int]
+   - 	''' = []): ...
+28 + def f(a: list[int]
+29 + 	 = []): ...
+30 | 
+31 | 
+32 | a: '''\\
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:32:4
@@ -154,18 +142,16 @@ UP037 [*] Remove quotes from type annotation
    | |____________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-29 29 | 	''' = []): ...
-30 30 | 
-31 31 | 
-32    |-a: '''\\
-33    |-list[int]''' = [42]
-   32 |+a: (\
-   33 |+list[int]) = [42]
-34 34 | 
-35 35 | 
-36 36 | def f(a: '''
+29 | 	''' = []): ...
+30 | 
+31 | 
+   - a: '''\\
+   - list[int]''' = [42]
+32 + a: (\
+33 + list[int]) = [42]
+34 | 
+35 | 
+36 | def f(a: '''
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:36:10
@@ -177,19 +163,17 @@ UP037 [*] Remove quotes from type annotation
    | |_______^
    |
 help: Remove quotes
-
-ℹ Safe fix
-33 33 | list[int]''' = [42]
-34 34 | 
-35 35 | 
-36    |-def f(a: '''
-   36 |+def f(a: 
-37 37 | 	list[int]
-38    |-	''' = []): ...
-   38 |+	 = []): ...
-39 39 | 
-40 40 | 
-41 41 | def f(a: Foo['''
+33 | list[int]''' = [42]
+34 | 
+35 | 
+   - def f(a: '''
+36 + def f(a: 
+37 | 	list[int]
+   - 	''' = []): ...
+38 + 	 = []): ...
+39 | 
+40 | 
+41 | def f(a: Foo['''
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:41:14
@@ -204,23 +188,21 @@ UP037 [*] Remove quotes from type annotation
    | |___________________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-38 38 | 	''' = []): ...
-39 39 | 
-40 40 | 
-41    |-def f(a: Foo['''
-   41 |+def f(a: Foo[(
-42 42 |     Bar
-43 43 |     [
-44 44 |     Multi |
-45 45 |     Line
-46    |-    ]  # Comment''']): ...
-   46 |+    ]  # Comment
-   47 |+)]): ...
-47 48 | 
-48 49 | 
-49 50 | a: '''list
+38 | 	''' = []): ...
+39 | 
+40 | 
+   - def f(a: Foo['''
+41 + def f(a: Foo[(
+42 |     Bar
+43 |     [
+44 |     Multi |
+45 |     Line
+   -     ]  # Comment''']): ...
+46 +     ]  # Comment
+47 + )]): ...
+48 | 
+49 | 
+50 | a: '''list
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:49:4
@@ -231,12 +213,10 @@ UP037 [*] Remove quotes from type annotation
    | |________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-46 46 |     ]  # Comment''']): ...
-47 47 | 
-48 48 | 
-49    |-a: '''list
-50    |-[int]''' = [42]
-   49 |+a: (list
-   50 |+[int]) = [42]
+46 |     ]  # Comment''']): ...
+47 | 
+48 | 
+   - a: '''list
+   - [int]''' = [42]
+49 + a: (list
+50 + [int]) = [42]
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap
index 35ad47f599..68fe020bdc 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap
@@ -9,13 +9,12 @@ UP038 [*] Use `X | Y` in `isinstance` call instead of `(X, Y)`
 2 | issubclass("yes", (int, float, str))  # UP038
   |
 help: Convert to `X | Y`
-
-ℹ Unsafe fix
-1   |-isinstance(1, (int, float))  # UP038
-  1 |+isinstance(1, int | float)  # UP038
-2 2 | issubclass("yes", (int, float, str))  # UP038
-3 3 | 
-4 4 | isinstance(1, int)  # OK
+  - isinstance(1, (int, float))  # UP038
+1 + isinstance(1, int | float)  # UP038
+2 | issubclass("yes", (int, float, str))  # UP038
+3 | 
+4 | isinstance(1, int)  # OK
+note: This is an unsafe fix and may change runtime behavior
 
 UP038 [*] Use `X | Y` in `issubclass` call instead of `(X, Y)`
  --> UP038.py:2:1
@@ -27,11 +26,10 @@ UP038 [*] Use `X | Y` in `issubclass` call instead of `(X, Y)`
 4 | isinstance(1, int)  # OK
   |
 help: Convert to `X | Y`
-
-ℹ Unsafe fix
-1 1 | isinstance(1, (int, float))  # UP038
-2   |-issubclass("yes", (int, float, str))  # UP038
-  2 |+issubclass("yes", int | float | str)  # UP038
-3 3 | 
-4 4 | isinstance(1, int)  # OK
-5 5 | issubclass("yes", int)  # OK
+1 | isinstance(1, (int, float))  # UP038
+  - issubclass("yes", (int, float, str))  # UP038
+2 + issubclass("yes", int | float | str)  # UP038
+3 | 
+4 | isinstance(1, int)  # OK
+5 | issubclass("yes", int)  # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap
index 0d83d4c92b..8af4ba1348 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap
@@ -10,14 +10,12 @@ UP039 [*] Unnecessary parentheses after class definition
 3 |     pass
   |
 help: Remove parentheses
-
-ℹ Safe fix
-1 1 | # Errors
-2   |-class A():
-  2 |+class A:
-3 3 |     pass
-4 4 | 
-5 5 | 
+1 | # Errors
+  - class A():
+2 + class A:
+3 |     pass
+4 | 
+5 | 
 
 UP039 [*] Unnecessary parentheses after class definition
  --> UP039.py:6:8
@@ -28,16 +26,14 @@ UP039 [*] Unnecessary parentheses after class definition
 8 |     pass
   |
 help: Remove parentheses
-
-ℹ Safe fix
-3 3 |     pass
-4 4 | 
-5 5 | 
-6   |-class A() \
-  6 |+class A \
-7 7 |     :
-8 8 |     pass
-9 9 | 
+3 |     pass
+4 | 
+5 | 
+  - class A() \
+6 + class A \
+7 |     :
+8 |     pass
+9 | 
 
 UP039 [*] Unnecessary parentheses after class definition
   --> UP039.py:12:9
@@ -48,16 +44,14 @@ UP039 [*] Unnecessary parentheses after class definition
 13 |     pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-9  9  | 
-10 10 | 
-11 11 | class A \
-12    |-        ():
-   12 |+        :
-13 13 |     pass
-14 14 | 
-15 15 | 
+9  | 
+10 | 
+11 | class A \
+   -         ():
+12 +         :
+13 |     pass
+14 | 
+15 | 
 
 UP039 [*] Unnecessary parentheses after class definition
   --> UP039.py:17:8
@@ -68,16 +62,14 @@ UP039 [*] Unnecessary parentheses after class definition
 18 |     pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-14 14 | 
-15 15 | 
-16 16 | @decorator()
-17    |-class A():
-   17 |+class A:
-18 18 |     pass
-19 19 | 
-20 20 | @decorator
+14 | 
+15 | 
+16 | @decorator()
+   - class A():
+17 + class A:
+18 |     pass
+19 | 
+20 | @decorator
 
 UP039 [*] Unnecessary parentheses after class definition
   --> UP039.py:21:8
@@ -88,13 +80,11 @@ UP039 [*] Unnecessary parentheses after class definition
 22 |     pass
    |
 help: Remove parentheses
-
-ℹ Safe fix
-18 18 |     pass
-19 19 | 
-20 20 | @decorator
-21    |-class A():
-   21 |+class A:
-22 22 |     pass
-23 23 | 
-24 24 | # OK
+18 |     pass
+19 | 
+20 | @decorator
+   - class A():
+21 + class A:
+22 |     pass
+23 | 
+24 | # OK
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap
index 55601e0651..ac492e70d3 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap
@@ -10,16 +10,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 6 | x: TypeAlias = int
   |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-2 2 | from typing import Any, TypeAlias
-3 3 | 
-4 4 | # UP040
-5   |-x: typing.TypeAlias = int
-  5 |+type x = int
-6 6 | x: TypeAlias = int
-7 7 | 
-8 8 | # UP040 simple generic
+2 | from typing import Any, TypeAlias
+3 | 
+4 | # UP040
+  - x: typing.TypeAlias = int
+5 + type x = int
+6 | x: TypeAlias = int
+7 | 
+8 | # UP040 simple generic
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
  --> UP040.py:6:1
@@ -32,16 +31,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 8 | # UP040 simple generic
   |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | # UP040
-5 5 | x: typing.TypeAlias = int
-6   |-x: TypeAlias = int
-  6 |+type x = int
-7 7 | 
-8 8 | # UP040 simple generic
-9 9 | T = typing.TypeVar["T"]
+3 | 
+4 | # UP040
+5 | x: typing.TypeAlias = int
+  - x: TypeAlias = int
+6 + type x = int
+7 | 
+8 | # UP040 simple generic
+9 | T = typing.TypeVar["T"]
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:10:1
@@ -54,16 +52,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 12 | # UP040 call style generic
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | # UP040 simple generic
-9  9  | T = typing.TypeVar["T"]
-10    |-x: typing.TypeAlias = list[T]
-   10 |+type x[T] = list[T]
-11 11 | 
-12 12 | # UP040 call style generic
-13 13 | T = typing.TypeVar("T")
+7  | 
+8  | # UP040 simple generic
+9  | T = typing.TypeVar["T"]
+   - x: typing.TypeAlias = list[T]
+10 + type x[T] = list[T]
+11 | 
+12 | # UP040 call style generic
+13 | T = typing.TypeVar("T")
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:14:1
@@ -76,16 +73,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 16 | # UP040 bounded generic
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-11 11 | 
-12 12 | # UP040 call style generic
-13 13 | T = typing.TypeVar("T")
-14    |-x: typing.TypeAlias = list[T]
-   14 |+type x[T] = list[T]
-15 15 | 
-16 16 | # UP040 bounded generic
-17 17 | T = typing.TypeVar("T", bound=int)
+11 | 
+12 | # UP040 call style generic
+13 | T = typing.TypeVar("T")
+   - x: typing.TypeAlias = list[T]
+14 + type x[T] = list[T]
+15 | 
+16 | # UP040 bounded generic
+17 | T = typing.TypeVar("T", bound=int)
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:18:1
@@ -98,16 +94,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 20 | # UP040 constrained generic
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | # UP040 bounded generic
-17 17 | T = typing.TypeVar("T", bound=int)
-18    |-x: typing.TypeAlias = list[T]
-   18 |+type x[T: int] = list[T]
-19 19 | 
-20 20 | # UP040 constrained generic
-21 21 | T = typing.TypeVar("T", int, str)
+15 | 
+16 | # UP040 bounded generic
+17 | T = typing.TypeVar("T", bound=int)
+   - x: typing.TypeAlias = list[T]
+18 + type x[T: int] = list[T]
+19 | 
+20 | # UP040 constrained generic
+21 | T = typing.TypeVar("T", int, str)
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:22:1
@@ -120,16 +115,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 24 | # UP040 contravariant generic
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | # UP040 constrained generic
-21 21 | T = typing.TypeVar("T", int, str)
-22    |-x: typing.TypeAlias = list[T]
-   22 |+type x[T: (int, str)] = list[T]
-23 23 | 
-24 24 | # UP040 contravariant generic
-25 25 | T = typing.TypeVar("T", contravariant=True)
+19 | 
+20 | # UP040 constrained generic
+21 | T = typing.TypeVar("T", int, str)
+   - x: typing.TypeAlias = list[T]
+22 + type x[T: (int, str)] = list[T]
+23 | 
+24 | # UP040 contravariant generic
+25 | T = typing.TypeVar("T", contravariant=True)
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:26:1
@@ -142,16 +136,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 28 | # UP040 covariant generic
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-23 23 | 
-24 24 | # UP040 contravariant generic
-25 25 | T = typing.TypeVar("T", contravariant=True)
-26    |-x: typing.TypeAlias = list[T]
-   26 |+type x[T] = list[T]
-27 27 | 
-28 28 | # UP040 covariant generic
-29 29 | T = typing.TypeVar("T", covariant=True)
+23 | 
+24 | # UP040 contravariant generic
+25 | T = typing.TypeVar("T", contravariant=True)
+   - x: typing.TypeAlias = list[T]
+26 + type x[T] = list[T]
+27 | 
+28 | # UP040 covariant generic
+29 | T = typing.TypeVar("T", covariant=True)
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:30:1
@@ -164,16 +157,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 32 | # UP040 in class scope
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-27 27 | 
-28 28 | # UP040 covariant generic
-29 29 | T = typing.TypeVar("T", covariant=True)
-30    |-x: typing.TypeAlias = list[T]
-   30 |+type x[T] = list[T]
-31 31 | 
-32 32 | # UP040 in class scope
-33 33 | T = typing.TypeVar["T"]
+27 | 
+28 | # UP040 covariant generic
+29 | T = typing.TypeVar("T", covariant=True)
+   - x: typing.TypeAlias = list[T]
+30 + type x[T] = list[T]
+31 | 
+32 | # UP040 in class scope
+33 | T = typing.TypeVar["T"]
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:36:5
@@ -186,16 +178,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 38 |     # reference to class variable
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-33 33 | T = typing.TypeVar["T"]
-34 34 | class Foo:
-35 35 |     # reference to global variable
-36    |-    x: typing.TypeAlias = list[T]
-   36 |+    type x[T] = list[T]
-37 37 | 
-38 38 |     # reference to class variable
-39 39 |     TCLS = typing.TypeVar["TCLS"]
+33 | T = typing.TypeVar["T"]
+34 | class Foo:
+35 |     # reference to global variable
+   -     x: typing.TypeAlias = list[T]
+36 +     type x[T] = list[T]
+37 | 
+38 |     # reference to class variable
+39 |     TCLS = typing.TypeVar["TCLS"]
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `y` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:40:5
@@ -208,16 +199,15 @@ UP040 [*] Type alias `y` uses `TypeAlias` annotation instead of the `type` keywo
 42 | # UP040 won't add generics in fix
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-37 37 | 
-38 38 |     # reference to class variable
-39 39 |     TCLS = typing.TypeVar["TCLS"]
-40    |-    y: typing.TypeAlias = list[TCLS]
-   40 |+    type y[TCLS] = list[TCLS]
-41 41 | 
-42 42 | # UP040 won't add generics in fix
-43 43 | T = typing.TypeVar(*args)
+37 | 
+38 |     # reference to class variable
+39 |     TCLS = typing.TypeVar["TCLS"]
+   -     y: typing.TypeAlias = list[TCLS]
+40 +     type y[TCLS] = list[TCLS]
+41 | 
+42 | # UP040 won't add generics in fix
+43 | T = typing.TypeVar(*args)
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:44:1
@@ -227,19 +217,18 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 44 | x: typing.TypeAlias = list[T]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 45 |
-46 | # `default` should be skipped for now, added in Python 3.13
+46 | # `default` was added in Python 3.13
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | # UP040 won't add generics in fix
-43 43 | T = typing.TypeVar(*args)
-44    |-x: typing.TypeAlias = list[T]
-   44 |+type x = list[T]
-45 45 | 
-46 46 | # `default` should be skipped for now, added in Python 3.13
-47 47 | T = typing.TypeVar("T", default=Any)
+41 | 
+42 | # UP040 won't add generics in fix
+43 | T = typing.TypeVar(*args)
+   - x: typing.TypeAlias = list[T]
+44 + type x = list[T]
+45 | 
+46 | # `default` was added in Python 3.13
+47 | T = typing.TypeVar("T", default=Any)
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `Decorator` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.py:57:1
@@ -250,16 +239,15 @@ UP040 [*] Type alias `Decorator` uses `TypeAlias` annotation instead of the `typ
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-54 54 | # Ensure that "T" appears only once  in the type parameters for the modernized
-55 55 | # type alias.
-56 56 | T = typing.TypeVar["T"]
-57    |-Decorator: TypeAlias = typing.Callable[[T], T]
-   57 |+type Decorator[T] = typing.Callable[[T], T]
-58 58 | 
-59 59 | 
-60 60 | from typing import TypeVar, Annotated, TypeAliasType
+54 | # Ensure that "T" appears only once  in the type parameters for the modernized
+55 | # type alias.
+56 | T = typing.TypeVar["T"]
+   - Decorator: TypeAlias = typing.Callable[[T], T]
+57 + type Decorator[T] = typing.Callable[[T], T]
+58 | 
+59 | 
+60 | from typing import TypeVar, Annotated, TypeAliasType
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword
   --> UP040.py:67:1
@@ -274,18 +262,16 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t
 71 |   # Bound
    |
 help: Use the `type` keyword
-
-ℹ Safe fix
-64 64 | 
-65 65 | # https://github.com/astral-sh/ruff/issues/11422
-66 66 | T = TypeVar("T")
-67    |-PositiveList = TypeAliasType(
-68    |-    "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
-69    |-)
-   67 |+type PositiveList[T] = list[Annotated[T, Gt(0)]]
-70 68 | 
-71 69 | # Bound
-72 70 | T = TypeVar("T", bound=SupportGt)
+64 | 
+65 | # https://github.com/astral-sh/ruff/issues/11422
+66 | T = TypeVar("T")
+   - PositiveList = TypeAliasType(
+   -     "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
+   - )
+67 + type PositiveList[T] = list[Annotated[T, Gt(0)]]
+68 | 
+69 | # Bound
+70 | T = TypeVar("T", bound=SupportGt)
 
 UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword
   --> UP040.py:73:1
@@ -300,18 +286,16 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t
 77 |   # Multiple bounds
    |
 help: Use the `type` keyword
-
-ℹ Safe fix
-70 70 | 
-71 71 | # Bound
-72 72 | T = TypeVar("T", bound=SupportGt)
-73    |-PositiveList = TypeAliasType(
-74    |-    "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
-75    |-)
-   73 |+type PositiveList[T: SupportGt] = list[Annotated[T, Gt(0)]]
-76 74 | 
-77 75 | # Multiple bounds
-78 76 | T1 = TypeVar("T1", bound=SupportGt)
+70 | 
+71 | # Bound
+72 | T = TypeVar("T", bound=SupportGt)
+   - PositiveList = TypeAliasType(
+   -     "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
+   - )
+73 + type PositiveList[T: SupportGt] = list[Annotated[T, Gt(0)]]
+74 | 
+75 | # Multiple bounds
+76 | T1 = TypeVar("T1", bound=SupportGt)
 
 UP040 [*] Type alias `Tuple3` uses `TypeAliasType` assignment instead of the `type` keyword
   --> UP040.py:81:1
@@ -324,16 +308,14 @@ UP040 [*] Type alias `Tuple3` uses `TypeAliasType` assignment instead of the `ty
 83 | # No type_params
    |
 help: Use the `type` keyword
-
-ℹ Safe fix
-78 78 | T1 = TypeVar("T1", bound=SupportGt)
-79 79 | T2 = TypeVar("T2")
-80 80 | T3 = TypeVar("T3")
-81    |-Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3))
-   81 |+type Tuple3[T1: SupportGt, T2, T3] = tuple[T1, T2, T3]
-82 82 | 
-83 83 | # No type_params
-84 84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
+78 | T1 = TypeVar("T1", bound=SupportGt)
+79 | T2 = TypeVar("T2")
+80 | T3 = TypeVar("T3")
+   - Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3))
+81 + type Tuple3[T1: SupportGt, T2, T3] = tuple[T1, T2, T3]
+82 | 
+83 | # No type_params
+84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
 
 UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of the `type` keyword
   --> UP040.py:84:1
@@ -344,16 +326,14 @@ UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of th
 85 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=())
    |
 help: Use the `type` keyword
-
-ℹ Safe fix
-81 81 | Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3))
-82 82 | 
-83 83 | # No type_params
-84    |-PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
-   84 |+type PositiveInt = Annotated[int, Gt(0)]
-85 85 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=())
-86 86 | 
-87 87 | # OK: Other name
+81 | Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3))
+82 | 
+83 | # No type_params
+   - PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
+84 + type PositiveInt = Annotated[int, Gt(0)]
+85 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=())
+86 | 
+87 | # OK: Other name
 
 UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of the `type` keyword
   --> UP040.py:85:1
@@ -366,16 +346,34 @@ UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of th
 87 | # OK: Other name
    |
 help: Use the `type` keyword
+82 | 
+83 | # No type_params
+84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
+   - PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=())
+85 + type PositiveInt = Annotated[int, Gt(0)]
+86 | 
+87 | # OK: Other name
+88 | T = TypeVar("T", bound=SupportGt)
 
-ℹ Safe fix
-82 82 | 
-83 83 | # No type_params
-84 84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
-85    |-PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=())
-   85 |+type PositiveInt = Annotated[int, Gt(0)]
-86 86 | 
-87 87 | # OK: Other name
-88 88 | T = TypeVar("T", bound=SupportGt)
+UP040 [*] Type alias `AnyList` uses `TypeAliasType` assignment instead of the `type` keyword
+  --> UP040.py:95:1
+   |
+93 | # `default` was added in Python 3.13
+94 | T = typing.TypeVar("T", default=Any)
+95 | AnyList = TypeAliasType("AnyList", list[T], type_params=(T,))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+96 |
+97 | # unsafe fix if comments within the fix
+   |
+help: Use the `type` keyword
+92 | 
+93 | # `default` was added in Python 3.13
+94 | T = typing.TypeVar("T", default=Any)
+   - AnyList = TypeAliasType("AnyList", list[T], type_params=(T,))
+95 + type AnyList[T = Any] = list[T]
+96 | 
+97 | # unsafe fix if comments within the fix
+98 | T = TypeVar("T")
 
 UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword
    --> UP040.py:99:1
@@ -390,18 +388,17 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t
 103 |   T = TypeVar("T")
     |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-96  96  | 
-97  97  | # unsafe fix if comments within the fix
-98  98  | T = TypeVar("T")
-99      |-PositiveList = TypeAliasType(  # eaten comment
-100     |-    "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
-101     |-)
-    99  |+type PositiveList[T] = list[Annotated[T, Gt(0)]]
-102 100 | 
-103 101 | T = TypeVar("T")
-104 102 | PositiveList = TypeAliasType(
+96  | 
+97  | # unsafe fix if comments within the fix
+98  | T = TypeVar("T")
+    - PositiveList = TypeAliasType(  # eaten comment
+    -     "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
+    - )
+99  + type PositiveList[T] = list[Annotated[T, Gt(0)]]
+100 | 
+101 | T = TypeVar("T")
+102 | PositiveList = TypeAliasType(
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword
    --> UP040.py:104:1
@@ -413,18 +410,16 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t
     | |_^
     |
 help: Use the `type` keyword
-
-ℹ Safe fix
-101 101 | )
-102 102 | 
-103 103 | T = TypeVar("T")
-104     |-PositiveList = TypeAliasType(
-105     |-    "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
-106     |-) # this comment should be okay
-    104 |+type PositiveList[T] = list[Annotated[T, Gt(0)]] # this comment should be okay
-107 105 | 
-108 106 | 
-109 107 | # this comment will actually be preserved because it's inside the "value" part
+101 | )
+102 | 
+103 | T = TypeVar("T")
+    - PositiveList = TypeAliasType(
+    -     "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,)
+    - ) # this comment should be okay
+104 + type PositiveList[T] = list[Annotated[T, Gt(0)]] # this comment should be okay
+105 | 
+106 | 
+107 | # this comment will actually be preserved because it's inside the "value" part
 
 UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword
    --> UP040.py:111:1
@@ -441,21 +436,19 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t
 117 |   T: TypeAlias = (
     |
 help: Use the `type` keyword
-
-ℹ Safe fix
-108 108 | 
-109 109 | # this comment will actually be preserved because it's inside the "value" part
-110 110 | T = TypeVar("T")
-111     |-PositiveList = TypeAliasType(
-112     |-    "PositiveList", list[
-    111 |+type PositiveList[T] = list[
-113 112 |         Annotated[T, Gt(0)],  # preserved comment
-114     |-    ], type_params=(T,)
-115     |-)
-    113 |+    ]
-116 114 | 
-117 115 | T: TypeAlias = (
-118 116 |     int
+108 | 
+109 | # this comment will actually be preserved because it's inside the "value" part
+110 | T = TypeVar("T")
+    - PositiveList = TypeAliasType(
+    -     "PositiveList", list[
+111 + type PositiveList[T] = list[
+112 |         Annotated[T, Gt(0)],  # preserved comment
+    -     ], type_params=(T,)
+    - )
+113 +     ]
+114 | 
+115 | T: TypeAlias = (
+116 |     int
 
 UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keyword
    --> UP040.py:117:1
@@ -471,16 +464,15 @@ UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keywo
 122 |   T: TypeAlias = ( # comment0
     |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-114 114 |     ], type_params=(T,)
-115 115 | )
-116 116 | 
-117     |-T: TypeAlias = (
-    117 |+type T = (
-118 118 |     int
-119 119 |     | str
-120 120 | )
+114 |     ], type_params=(T,)
+115 | )
+116 | 
+    - T: TypeAlias = (
+117 + type T = (
+118 |     int
+119 |     | str
+120 | )
+note: This is an unsafe fix and may change runtime behavior
 
 UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keyword
    --> UP040.py:122:1
@@ -497,15 +489,16 @@ UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keywo
 129 | |     # comment7
 130 | | ) # comment8
     | |_^
+131 |
+132 |   # Test case for TypeVar with default - should be converted when preview mode is enabled
     |
 help: Use the `type` keyword
-
-ℹ Unsafe fix
-119 119 |     | str
-120 120 | )
-121 121 | 
-122     |-T: TypeAlias = ( # comment0
-    122 |+type T = ( # comment0
-123 123 |     # comment1
-124 124 |     int  # comment2
-125 125 |     # comment3
+119 |     | str
+120 | )
+121 | 
+    - T: TypeAlias = ( # comment0
+122 + type T = ( # comment0
+123 |     # comment1
+124 |     int  # comment2
+125 |     # comment3
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py__preview_diff.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py__preview_diff.snap
new file mode 100644
index 0000000000..475e758873
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py__preview_diff.snap
@@ -0,0 +1,49 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 2
+
+--- Added ---
+UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
+  --> UP040.py:48:1
+   |
+46 | # `default` was added in Python 3.13
+47 | T = typing.TypeVar("T", default=Any)
+48 | x: typing.TypeAlias = list[T]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+49 |
+50 | # OK
+   |
+help: Use the `type` keyword
+45 | 
+46 | # `default` was added in Python 3.13
+47 | T = typing.TypeVar("T", default=Any)
+   - x: typing.TypeAlias = list[T]
+48 + type x[T = Any] = list[T]
+49 | 
+50 | # OK
+51 | x: TypeAlias
+note: This is an unsafe fix and may change runtime behavior
+
+
+UP040 [*] Type alias `DefaultList` uses `TypeAlias` annotation instead of the `type` keyword
+   --> UP040.py:134:1
+    |
+132 | # Test case for TypeVar with default - should be converted when preview mode is enabled
+133 | T_default = TypeVar("T_default", default=int)
+134 | DefaultList: TypeAlias = list[T_default]
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |
+help: Use the `type` keyword
+131 | 
+132 | # Test case for TypeVar with default - should be converted when preview mode is enabled
+133 | T_default = TypeVar("T_default", default=int)
+    - DefaultList: TypeAlias = list[T_default]
+134 + type DefaultList[T_default = int] = list[T_default]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap
index 0ee653e917..472905e606 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap
@@ -11,16 +11,14 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 7 | x: TypeAlias = int
   |
 help: Use the `type` keyword
-
-ℹ Safe fix
-3 3 | 
-4 4 | # UP040
-5 5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change
-6   |-x: typing.TypeAlias = int
-  6 |+type x = int
-7 7 | x: TypeAlias = int
-8 8 | 
-9 9 | 
+3 | 
+4 | # UP040
+5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change
+  - x: typing.TypeAlias = int
+6 + type x = int
+7 | x: TypeAlias = int
+8 | 
+9 | 
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
  --> UP040.pyi:7:1
@@ -31,16 +29,14 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
   | ^^^^^^^^^^^^^^^^^^
   |
 help: Use the `type` keyword
-
-ℹ Safe fix
-4 4 | # UP040
-5 5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change
-6 6 | x: typing.TypeAlias = int
-7   |-x: TypeAlias = int
-  7 |+type x = int
-8 8 | 
-9 9 | 
-10 10 | # comments in the value are preserved
+4  | # UP040
+5  | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change
+6  | x: typing.TypeAlias = int
+   - x: TypeAlias = int
+7  + type x = int
+8  | 
+9  | 
+10 | # comments in the value are preserved
 
 UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.pyi:11:1
@@ -55,16 +51,14 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo
 16 |   T: TypeAlias = ( # comment0
    |
 help: Use the `type` keyword
-
-ℹ Safe fix
-8  8  | 
-9  9  | 
-10 10 | # comments in the value are preserved
-11    |-x: TypeAlias = tuple[
-   11 |+type x = tuple[
-12 12 |     int,  # preserved
-13 13 |     float,
-14 14 | ]
+8  | 
+9  | 
+10 | # comments in the value are preserved
+   - x: TypeAlias = tuple[
+11 + type x = tuple[
+12 |     int,  # preserved
+13 |     float,
+14 | ]
 
 UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keyword
   --> UP040.pyi:16:1
@@ -83,13 +77,11 @@ UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keywo
    | |_^
    |
 help: Use the `type` keyword
-
-ℹ Safe fix
-13 13 |     float,
-14 14 | ]
-15 15 | 
-16    |-T: TypeAlias = ( # comment0
-   16 |+type T = ( # comment0
-17 17 |     # comment1
-18 18 |     int  # comment2
-19 19 |     # comment3
+13 |     float,
+14 | ]
+15 | 
+   - T: TypeAlias = ( # comment0
+16 + type T = ( # comment0
+17 |     # comment1
+18 |     int  # comment2
+19 |     # comment3
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi__preview_diff.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi__preview_diff.snap
new file mode 100644
index 0000000000..7e33841de0
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi__preview_diff.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap
index a2bbdb30d4..b737ce4b6d 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap
@@ -11,16 +11,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 6 |     pass
   |
 help: Replace `asyncio.TimeoutError` with builtin `TimeoutError`
-
-ℹ Safe fix
-2 2 | # These should be fixed
-3 3 | try:
-4 4 |     pass
-5   |-except asyncio.TimeoutError:
-  5 |+except TimeoutError:
-6 6 |     pass
-7 7 | 
-8 8 | try:
+2 | # These should be fixed
+3 | try:
+4 |     pass
+  - except asyncio.TimeoutError:
+5 + except TimeoutError:
+6 |     pass
+7 | 
+8 | try:
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:10:8
@@ -32,16 +30,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 11 |     pass
    |
 help: Replace `socket.timeout` with builtin `TimeoutError`
-
-ℹ Safe fix
-7  7  | 
-8  8  | try:
-9  9  |     pass
-10    |-except socket.timeout:
-   10 |+except TimeoutError:
-11 11 |     pass
-12 12 | 
-13 13 | # Should NOT be in parentheses when replaced
+7  | 
+8  | try:
+9  |     pass
+   - except socket.timeout:
+10 + except TimeoutError:
+11 |     pass
+12 | 
+13 | # Should NOT be in parentheses when replaced
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:17:8
@@ -53,16 +49,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 18 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-14 14 | 
-15 15 | try:
-16 16 |     pass
-17    |-except (asyncio.TimeoutError,):
-   17 |+except TimeoutError:
-18 18 |     pass
-19 19 | 
-20 20 | try:
+14 | 
+15 | try:
+16 |     pass
+   - except (asyncio.TimeoutError,):
+17 + except TimeoutError:
+18 |     pass
+19 | 
+20 | try:
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:22:8
@@ -74,16 +68,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 23 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-19 19 | 
-20 20 | try:
-21 21 |     pass
-22    |-except (socket.timeout,):
-   22 |+except TimeoutError:
-23 23 |     pass
-24 24 | 
-25 25 | try:
+19 | 
+20 | try:
+21 |     pass
+   - except (socket.timeout,):
+22 + except TimeoutError:
+23 |     pass
+24 | 
+25 | try:
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:27:8
@@ -95,16 +87,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 28 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-24 24 | 
-25 25 | try:
-26 26 |     pass
-27    |-except (asyncio.TimeoutError, socket.timeout,):
-   27 |+except TimeoutError:
-28 28 |     pass
-29 29 | 
-30 30 | # Should be kept in parentheses (because multiple)
+24 | 
+25 | try:
+26 |     pass
+   - except (asyncio.TimeoutError, socket.timeout,):
+27 + except TimeoutError:
+28 |     pass
+29 | 
+30 | # Should be kept in parentheses (because multiple)
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:34:8
@@ -116,16 +106,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 35 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-31 31 | 
-32 32 | try:
-33 33 |     pass
-34    |-except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError):
-   34 |+except (KeyError, TimeoutError):
-35 35 |     pass
-36 36 | 
-37 37 | # First should change, second should not
+31 | 
+32 | try:
+33 |     pass
+   - except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError):
+34 + except (KeyError, TimeoutError):
+35 |     pass
+36 | 
+37 | # First should change, second should not
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:42:8
@@ -137,13 +125,11 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 43 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-39 39 | from .mmap import error
-40 40 | try:
-41 41 |     pass
-42    |-except (asyncio.TimeoutError, error):
-   42 |+except (TimeoutError, error):
-43 43 |     pass
-44 44 | 
-45 45 | # These should not change
+39 | from .mmap import error
+40 | try:
+41 |     pass
+   - except (asyncio.TimeoutError, error):
+42 + except (TimeoutError, error):
+43 |     pass
+44 | 
+45 | # These should not change
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap
index 60d8df42da..92a17dcfd5 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap
@@ -8,17 +8,16 @@ UP042 [*] Class A inherits from both `str` and `enum.Enum`
   |       ^
   |
 help: Inherit from `enum.StrEnum`
-
-ℹ Unsafe fix
-1   |-from enum import Enum
-  1 |+from enum import Enum, StrEnum
-2 2 | 
-3 3 | 
-4   |-class A(str, Enum): ...
-  4 |+class A(StrEnum): ...
-5 5 | 
-6 6 | 
-7 7 | class B(Enum, str): ...
+  - from enum import Enum
+1 + from enum import Enum, StrEnum
+2 | 
+3 | 
+  - class A(str, Enum): ...
+4 + class A(StrEnum): ...
+5 | 
+6 | 
+7 | class B(Enum, str): ...
+note: This is an unsafe fix and may change runtime behavior
 
 UP042 [*] Class B inherits from both `str` and `enum.Enum`
  --> UP042.py:7:7
@@ -27,20 +26,19 @@ UP042 [*] Class B inherits from both `str` and `enum.Enum`
   |       ^
   |
 help: Inherit from `enum.StrEnum`
-
-ℹ Unsafe fix
-1   |-from enum import Enum
-  1 |+from enum import Enum, StrEnum
-2 2 | 
-3 3 | 
-4 4 | class A(str, Enum): ...
-5 5 | 
-6 6 | 
-7   |-class B(Enum, str): ...
-  7 |+class B(StrEnum): ...
-8 8 | 
-9 9 | 
-10 10 | class D(int, str, Enum): ...
+   - from enum import Enum
+1  + from enum import Enum, StrEnum
+2  | 
+3  | 
+4  | class A(str, Enum): ...
+5  | 
+6  | 
+   - class B(Enum, str): ...
+7  + class B(StrEnum): ...
+8  | 
+9  | 
+10 | class D(int, str, Enum): ...
+note: This is an unsafe fix and may change runtime behavior
 
 UP042 Class D inherits from both `str` and `enum.Enum`
   --> UP042.py:10:7
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap
index 18fb1a0b72..a58aaec987 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap
@@ -9,16 +9,14 @@ UP043 [*] Unnecessary default type arguments
 5 |     yield 42
   |
 help: Remove default type arguments
-
-ℹ Safe fix
-1 1 | from collections.abc import Generator, AsyncGenerator
-2 2 | 
-3 3 | 
-4   |-def func() -> Generator[int, None, None]:
-  4 |+def func() -> Generator[int]:
-5 5 |     yield 42
-6 6 | 
-7 7 | 
+1 | from collections.abc import Generator, AsyncGenerator
+2 | 
+3 | 
+  - def func() -> Generator[int, None, None]:
+4 + def func() -> Generator[int]:
+5 |     yield 42
+6 | 
+7 | 
 
 UP043 [*] Unnecessary default type arguments
  --> UP043.py:8:15
@@ -28,16 +26,14 @@ UP043 [*] Unnecessary default type arguments
 9 |     yield 42
   |
 help: Remove default type arguments
-
-ℹ Safe fix
-5 5 |     yield 42
-6 6 | 
-7 7 | 
-8   |-def func() -> Generator[int, None]:
-  8 |+def func() -> Generator[int]:
-9 9 |     yield 42
-10 10 | 
-11 11 | 
+5  |     yield 42
+6  | 
+7  | 
+   - def func() -> Generator[int, None]:
+8  + def func() -> Generator[int]:
+9  |     yield 42
+10 | 
+11 | 
 
 UP043 [*] Unnecessary default type arguments
   --> UP043.py:21:15
@@ -48,16 +44,14 @@ UP043 [*] Unnecessary default type arguments
 23 |     return None
    |
 help: Remove default type arguments
-
-ℹ Safe fix
-18 18 |     return foo
-19 19 | 
-20 20 | 
-21    |-def func() -> Generator[int, int, None]:
-   21 |+def func() -> Generator[int, int]:
-22 22 |     _ = yield 42
-23 23 |     return None
-24 24 | 
+18 |     return foo
+19 | 
+20 | 
+   - def func() -> Generator[int, int, None]:
+21 + def func() -> Generator[int, int]:
+22 |     _ = yield 42
+23 |     return None
+24 | 
 
 UP043 [*] Unnecessary default type arguments
   --> UP043.py:31:21
@@ -67,16 +61,14 @@ UP043 [*] Unnecessary default type arguments
 32 |     yield 42
    |
 help: Remove default type arguments
-
-ℹ Safe fix
-28 28 |     return 42
-29 29 | 
-30 30 | 
-31    |-async def func() -> AsyncGenerator[int, None]:
-   31 |+async def func() -> AsyncGenerator[int]:
-32 32 |     yield 42
-33 33 | 
-34 34 | 
+28 |     return 42
+29 | 
+30 | 
+   - async def func() -> AsyncGenerator[int, None]:
+31 + async def func() -> AsyncGenerator[int]:
+32 |     yield 42
+33 | 
+34 | 
 
 UP043 [*] Unnecessary default type arguments
   --> UP043.py:47:15
@@ -86,16 +78,14 @@ UP043 [*] Unnecessary default type arguments
 48 |     yield "hello"
    |
 help: Remove default type arguments
-
-ℹ Safe fix
-44 44 | from typing import Generator, AsyncGenerator
-45 45 | 
-46 46 | 
-47    |-def func() -> Generator[str, None, None]:
-   47 |+def func() -> Generator[str]:
-48 48 |     yield "hello"
-49 49 | 
-50 50 | 
+44 | from typing import Generator, AsyncGenerator
+45 | 
+46 | 
+   - def func() -> Generator[str, None, None]:
+47 + def func() -> Generator[str]:
+48 |     yield "hello"
+49 | 
+50 | 
 
 UP043 [*] Unnecessary default type arguments
   --> UP043.py:51:21
@@ -105,16 +95,14 @@ UP043 [*] Unnecessary default type arguments
 52 |     yield "hello"
    |
 help: Remove default type arguments
-
-ℹ Safe fix
-48 48 |     yield "hello"
-49 49 | 
-50 50 | 
-51    |-async def func() -> AsyncGenerator[str, None]:
-   51 |+async def func() -> AsyncGenerator[str]:
-52 52 |     yield "hello"
-53 53 | 
-54 54 | 
+48 |     yield "hello"
+49 | 
+50 | 
+   - async def func() -> AsyncGenerator[str, None]:
+51 + async def func() -> AsyncGenerator[str]:
+52 |     yield "hello"
+53 | 
+54 | 
 
 UP043 [*] Unnecessary default type arguments
   --> UP043.py:55:21
@@ -128,14 +116,13 @@ UP043 [*] Unnecessary default type arguments
 59 |       yield "hello"
    |
 help: Remove default type arguments
-
-ℹ Unsafe fix
-52 52 |     yield "hello"
-53 53 | 
-54 54 | 
-55    |-async def func() -> AsyncGenerator[  # type: ignore
-56    |-    str,
-57    |-    None
-58    |-]:
-   55 |+async def func() -> AsyncGenerator[str]:
-59 56 |     yield "hello"
+52 |     yield "hello"
+53 | 
+54 | 
+   - async def func() -> AsyncGenerator[  # type: ignore
+   -     str,
+   -     None
+   - ]:
+55 + async def func() -> AsyncGenerator[str]:
+56 |     yield "hello"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.pyi__preview.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.pyi__preview.snap
new file mode 100644
index 0000000000..37b80bf63d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.pyi__preview.snap
@@ -0,0 +1,128 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+UP043 [*] Unnecessary default type arguments
+ --> UP043.pyi:4:15
+  |
+4 | def func() -> Generator[int, None, None]:
+  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 |     yield 42
+  |
+help: Remove default type arguments
+1 | from collections.abc import Generator, AsyncGenerator
+2 | 
+3 | 
+  - def func() -> Generator[int, None, None]:
+4 + def func() -> Generator[int]:
+5 |     yield 42
+6 | 
+7 | 
+
+UP043 [*] Unnecessary default type arguments
+ --> UP043.pyi:8:15
+  |
+8 | def func() -> Generator[int, None]:
+  |               ^^^^^^^^^^^^^^^^^^^^
+9 |     yield 42
+  |
+help: Remove default type arguments
+5  |     yield 42
+6  | 
+7  | 
+   - def func() -> Generator[int, None]:
+8  + def func() -> Generator[int]:
+9  |     yield 42
+10 | 
+11 | 
+
+UP043 [*] Unnecessary default type arguments
+  --> UP043.pyi:21:15
+   |
+21 | def func() -> Generator[int, int, None]:
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^
+22 |     _ = yield 42
+23 |     return None
+   |
+help: Remove default type arguments
+18 |     return foo
+19 | 
+20 | 
+   - def func() -> Generator[int, int, None]:
+21 + def func() -> Generator[int, int]:
+22 |     _ = yield 42
+23 |     return None
+24 | 
+
+UP043 [*] Unnecessary default type arguments
+  --> UP043.pyi:31:21
+   |
+31 | async def func() -> AsyncGenerator[int, None]:
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
+32 |     yield 42
+   |
+help: Remove default type arguments
+28 |     return 42
+29 | 
+30 | 
+   - async def func() -> AsyncGenerator[int, None]:
+31 + async def func() -> AsyncGenerator[int]:
+32 |     yield 42
+33 | 
+34 | 
+
+UP043 [*] Unnecessary default type arguments
+  --> UP043.pyi:47:15
+   |
+47 | def func() -> Generator[str, None, None]:
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^
+48 |     yield "hello"
+   |
+help: Remove default type arguments
+44 | from typing import Generator, AsyncGenerator
+45 | 
+46 | 
+   - def func() -> Generator[str, None, None]:
+47 + def func() -> Generator[str]:
+48 |     yield "hello"
+49 | 
+50 | 
+
+UP043 [*] Unnecessary default type arguments
+  --> UP043.pyi:51:21
+   |
+51 | async def func() -> AsyncGenerator[str, None]:
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
+52 |     yield "hello"
+   |
+help: Remove default type arguments
+48 |     yield "hello"
+49 | 
+50 | 
+   - async def func() -> AsyncGenerator[str, None]:
+51 + async def func() -> AsyncGenerator[str]:
+52 |     yield "hello"
+53 | 
+54 | 
+
+UP043 [*] Unnecessary default type arguments
+  --> UP043.pyi:55:21
+   |
+55 |   async def func() -> AsyncGenerator[  # type: ignore
+   |  _____________________^
+56 | |     str,
+57 | |     None
+58 | | ]:
+   | |_^
+59 |       yield "hello"
+   |
+help: Remove default type arguments
+52 |     yield "hello"
+53 | 
+54 | 
+   - async def func() -> AsyncGenerator[  # type: ignore
+   -     str,
+   -     None
+   - ]:
+55 + async def func() -> AsyncGenerator[str]:
+56 |     yield "hello"
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap
index e753f42872..77da4b9b21 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap
@@ -9,16 +9,14 @@ UP045 [*] Use `X | None` for type annotations
 6 |     ...
   |
 help: Convert to `X | None`
-
-ℹ Safe fix
-2 2 | from typing import Optional
-3 3 | 
-4 4 | 
-5   |-def f(x: Optional[str]) -> None:
-  5 |+def f(x: str | None) -> None:
-6 6 |     ...
-7 7 | 
-8 8 | 
+2 | from typing import Optional
+3 | 
+4 | 
+  - def f(x: Optional[str]) -> None:
+5 + def f(x: str | None) -> None:
+6 |     ...
+7 | 
+8 | 
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:9:10
@@ -28,16 +26,14 @@ UP045 [*] Use `X | None` for type annotations
 10 |     ...
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-def f(x: typing.Optional[str]) -> None:
-   9  |+def f(x: str | None) -> None:
-10 10 |     ...
-11 11 | 
-12 12 | 
+6  |     ...
+7  | 
+8  | 
+   - def f(x: typing.Optional[str]) -> None:
+9  + def f(x: str | None) -> None:
+10 |     ...
+11 | 
+12 | 
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:14:8
@@ -48,16 +44,14 @@ UP045 [*] Use `X | None` for type annotations
 15 |     x = Optional[str]
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 | def f() -> None:
-14    |-    x: Optional[str]
-   14 |+    x: str | None
-15 15 |     x = Optional[str]
-16 16 | 
-17 17 | 
+11 | 
+12 | 
+13 | def f() -> None:
+   -     x: Optional[str]
+14 +     x: str | None
+15 |     x = Optional[str]
+16 | 
+17 | 
 
 UP045 Use `X | None` for type annotations
   --> UP045.py:15:9
@@ -77,16 +71,14 @@ UP045 [*] Use `X | None` for type annotations
 19 |     ...
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-15 15 |     x = Optional[str]
-16 16 | 
-17 17 | 
-18    |-def f(x: list[Optional[int]]) -> None:
-   18 |+def f(x: list[int | None]) -> None:
-19 19 |     ...
-20 20 | 
-21 21 | 
+15 |     x = Optional[str]
+16 | 
+17 | 
+   - def f(x: list[Optional[int]]) -> None:
+18 + def f(x: list[int | None]) -> None:
+19 |     ...
+20 | 
+21 | 
 
 UP045 Use `X | None` for type annotations
   --> UP045.py:22:10
@@ -128,19 +120,17 @@ UP045 [*] Use `X | None` for type annotations
    | |_____^
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-33 33 | 
-34 34 | # Regression test for: https://github.com/astral-sh/ruff/issues/7131
-35 35 | class ServiceRefOrValue:
-36    |-    service_specification: Optional[
-37    |-        list[ServiceSpecificationRef]
-38    |-        | list[ServiceSpecification]
-39    |-    ] = None
-   36 |+    service_specification: list[ServiceSpecificationRef] | list[ServiceSpecification] | None = None
-40 37 | 
-41 38 | 
-42 39 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201
+33 | 
+34 | # Regression test for: https://github.com/astral-sh/ruff/issues/7131
+35 | class ServiceRefOrValue:
+   -     service_specification: Optional[
+   -         list[ServiceSpecificationRef]
+   -         | list[ServiceSpecification]
+   -     ] = None
+36 +     service_specification: list[ServiceSpecificationRef] | list[ServiceSpecification] | None = None
+37 | 
+38 | 
+39 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:44:28
@@ -151,16 +141,14 @@ UP045 [*] Use `X | None` for type annotations
    |                            ^^^^^^^^^^^^^
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-41 41 | 
-42 42 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201
-43 43 | class ServiceRefOrValue:
-44    |-    service_specification: Optional[str]is not True = None
-   44 |+    service_specification: str | None is not True = None
-45 45 | 
-46 46 | 
-47 47 | # Test for: https://github.com/astral-sh/ruff/issues/18508
+41 | 
+42 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201
+43 | class ServiceRefOrValue:
+   -     service_specification: Optional[str]is not True = None
+44 +     service_specification: str | None is not True = None
+45 | 
+46 | 
+47 | # Test for: https://github.com/astral-sh/ruff/issues/18508
 
 UP045 Use `X | None` for type annotations
   --> UP045.py:49:6
@@ -183,15 +171,13 @@ UP045 [*] Use `X | None` for type annotations
 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-73 73 | 
-74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
-75 75 | # Nested Optional types should be flattened
-76    |-nested_optional: Optional[Optional[str]] = None
-   76 |+nested_optional: str | None = None
-77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None
-78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
+73 | 
+74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
+75 | # Nested Optional types should be flattened
+   - nested_optional: Optional[Optional[str]] = None
+76 + nested_optional: str | None = None
+77 | nested_optional_typing: typing.Optional[Optional[int]] = None
+78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:76:27
@@ -204,15 +190,13 @@ UP045 [*] Use `X | None` for type annotations
 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-73 73 | 
-74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
-75 75 | # Nested Optional types should be flattened
-76    |-nested_optional: Optional[Optional[str]] = None
-   76 |+nested_optional: Optional[str | None] = None
-77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None
-78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
+73 | 
+74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
+75 | # Nested Optional types should be flattened
+   - nested_optional: Optional[Optional[str]] = None
+76 + nested_optional: Optional[str | None] = None
+77 | nested_optional_typing: typing.Optional[Optional[int]] = None
+78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:77:25
@@ -224,14 +208,12 @@ UP045 [*] Use `X | None` for type annotations
 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
-75 75 | # Nested Optional types should be flattened
-76 76 | nested_optional: Optional[Optional[str]] = None
-77    |-nested_optional_typing: typing.Optional[Optional[int]] = None
-   77 |+nested_optional_typing: int | None = None
-78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
+74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
+75 | # Nested Optional types should be flattened
+76 | nested_optional: Optional[Optional[str]] = None
+   - nested_optional_typing: typing.Optional[Optional[int]] = None
+77 + nested_optional_typing: int | None = None
+78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:77:41
@@ -243,14 +225,12 @@ UP045 [*] Use `X | None` for type annotations
 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
-75 75 | # Nested Optional types should be flattened
-76 76 | nested_optional: Optional[Optional[str]] = None
-77    |-nested_optional_typing: typing.Optional[Optional[int]] = None
-   77 |+nested_optional_typing: typing.Optional[int | None] = None
-78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
+74 | # Test for: https://github.com/astral-sh/ruff/issues/19746
+75 | # Nested Optional types should be flattened
+76 | nested_optional: Optional[Optional[str]] = None
+   - nested_optional_typing: typing.Optional[Optional[int]] = None
+77 + nested_optional_typing: typing.Optional[int | None] = None
+78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:78:25
@@ -261,13 +241,11 @@ UP045 [*] Use `X | None` for type annotations
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-75 75 | # Nested Optional types should be flattened
-76 76 | nested_optional: Optional[Optional[str]] = None
-77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None
-78    |-triple_nested_optional: Optional[Optional[Optional[str]]] = None
-   78 |+triple_nested_optional: str | None = None
+75 | # Nested Optional types should be flattened
+76 | nested_optional: Optional[Optional[str]] = None
+77 | nested_optional_typing: typing.Optional[Optional[int]] = None
+   - triple_nested_optional: Optional[Optional[Optional[str]]] = None
+78 + triple_nested_optional: str | None = None
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:78:34
@@ -278,13 +256,11 @@ UP045 [*] Use `X | None` for type annotations
    |                                  ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-75 75 | # Nested Optional types should be flattened
-76 76 | nested_optional: Optional[Optional[str]] = None
-77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None
-78    |-triple_nested_optional: Optional[Optional[Optional[str]]] = None
-   78 |+triple_nested_optional: Optional[str | None] = None
+75 | # Nested Optional types should be flattened
+76 | nested_optional: Optional[Optional[str]] = None
+77 | nested_optional_typing: typing.Optional[Optional[int]] = None
+   - triple_nested_optional: Optional[Optional[Optional[str]]] = None
+78 + triple_nested_optional: Optional[str | None] = None
 
 UP045 [*] Use `X | None` for type annotations
   --> UP045.py:78:43
@@ -295,10 +271,8 @@ UP045 [*] Use `X | None` for type annotations
    |                                           ^^^^^^^^^^^^^
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-75 75 | # Nested Optional types should be flattened
-76 76 | nested_optional: Optional[Optional[str]] = None
-77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None
-78    |-triple_nested_optional: Optional[Optional[Optional[str]]] = None
-   78 |+triple_nested_optional: Optional[Optional[str | None]] = None
+75 | # Nested Optional types should be flattened
+76 | nested_optional: Optional[Optional[str]] = None
+77 | nested_optional_typing: typing.Optional[Optional[int]] = None
+   - triple_nested_optional: Optional[Optional[Optional[str]]] = None
+78 + triple_nested_optional: Optional[Optional[str | None]] = None
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap
index 9707a08e07..3fbee88926 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap
@@ -10,16 +10,15 @@ UP046 [*] Generic class `A` uses `Generic` subclass instead of type parameters
 13 |     var: T
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-8  8  | P = ParamSpec("P")
-9  9  | 
-10 10 | 
-11    |-class A(Generic[T]):
-   11 |+class A[T: float]:
-12 12 |     # Comments in a class body are preserved
-13 13 |     var: T
-14 14 | 
+8  | P = ParamSpec("P")
+9  | 
+10 | 
+   - class A(Generic[T]):
+11 + class A[T: float]:
+12 |     # Comments in a class body are preserved
+13 |     var: T
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:16:9
@@ -29,16 +28,15 @@ UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters
 17 |     var: tuple[*Ts]
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-13 13 |     var: T
-14 14 | 
-15 15 | 
-16    |-class B(Generic[*Ts]):
-   16 |+class B[*Ts]:
-17 17 |     var: tuple[*Ts]
-18 18 | 
-19 19 | 
+13 |     var: T
+14 | 
+15 | 
+   - class B(Generic[*Ts]):
+16 + class B[*Ts]:
+17 |     var: tuple[*Ts]
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:20:9
@@ -48,16 +46,15 @@ UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters
 21 |     var: P
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-17 17 |     var: tuple[*Ts]
-18 18 | 
-19 19 | 
-20    |-class C(Generic[P]):
-   20 |+class C[**P]:
-21 21 |     var: P
-22 22 | 
-23 23 | 
+17 |     var: tuple[*Ts]
+18 | 
+19 | 
+   - class C(Generic[P]):
+20 + class C[**P]:
+21 |     var: P
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `Constrained` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:24:19
@@ -67,16 +64,15 @@ UP046 [*] Generic class `Constrained` uses `Generic` subclass instead of type pa
 25 |     var: S
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-21 21 |     var: P
-22 22 | 
-23 23 | 
-24    |-class Constrained(Generic[S]):
-   24 |+class Constrained[S: (str, bytes)]:
-25 25 |     var: S
-26 26 | 
-27 27 | 
+21 |     var: P
+22 | 
+23 | 
+   - class Constrained(Generic[S]):
+24 + class Constrained[S: (str, bytes)]:
+25 |     var: S
+26 | 
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 Generic class `ExternalType` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:30:20
@@ -100,16 +96,15 @@ UP046 [*] Generic class `MyStr` uses `Generic` subclass instead of type paramete
 38 |     s: AnyStr
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-34 34 | 
-35 35 | # typing.AnyStr is a common external type variable, so treat it specially as a
-36 36 | # known TypeVar
-37    |-class MyStr(Generic[AnyStr]):
-   37 |+class MyStr[AnyStr: (bytes, str)]:
-38 38 |     s: AnyStr
-39 39 | 
-40 40 | 
+34 | 
+35 | # typing.AnyStr is a common external type variable, so treat it specially as a
+36 | # known TypeVar
+   - class MyStr(Generic[AnyStr]):
+37 + class MyStr[AnyStr: (bytes, str)]:
+38 |     s: AnyStr
+39 | 
+40 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `MultipleGenerics` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:41:24
@@ -120,16 +115,15 @@ UP046 [*] Generic class `MultipleGenerics` uses `Generic` subclass instead of ty
 43 |     typ: T
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-38 38 |     s: AnyStr
-39 39 | 
-40 40 | 
-41    |-class MultipleGenerics(Generic[S, T, *Ts, P]):
-   41 |+class MultipleGenerics[S: (str, bytes), T: float, *Ts, **P]:
-42 42 |     var: S
-43 43 |     typ: T
-44 44 |     tup: tuple[*Ts]
+38 |     s: AnyStr
+39 | 
+40 | 
+   - class MultipleGenerics(Generic[S, T, *Ts, P]):
+41 + class MultipleGenerics[S: (str, bytes), T: float, *Ts, **P]:
+42 |     var: S
+43 |     typ: T
+44 |     tup: tuple[*Ts]
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `MultipleBaseClasses` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:48:33
@@ -139,16 +133,15 @@ UP046 [*] Generic class `MultipleBaseClasses` uses `Generic` subclass instead of
 49 |     var: T
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-45 45 |     pep: P
-46 46 | 
-47 47 | 
-48    |-class MultipleBaseClasses(list, Generic[T]):
-   48 |+class MultipleBaseClasses[T: float](list):
-49 49 |     var: T
-50 50 | 
-51 51 | 
+45 |     pep: P
+46 | 
+47 | 
+   - class MultipleBaseClasses(list, Generic[T]):
+48 + class MultipleBaseClasses[T: float](list):
+49 |     var: T
+50 | 
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `MoreBaseClasses` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:62:44
@@ -158,16 +151,15 @@ UP046 [*] Generic class `MoreBaseClasses` uses `Generic` subclass instead of typ
 63 |     var: T
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-59 59 | class Base3: ...
-60 60 | 
-61 61 | 
-62    |-class MoreBaseClasses(Base1, Base2, Base3, Generic[T]):
-   62 |+class MoreBaseClasses[T: float](Base1, Base2, Base3):
-63 63 |     var: T
-64 64 | 
-65 65 | 
+59 | class Base3: ...
+60 | 
+61 | 
+   - class MoreBaseClasses(Base1, Base2, Base3, Generic[T]):
+62 + class MoreBaseClasses[T: float](Base1, Base2, Base3):
+63 |     var: T
+64 | 
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `MultipleBaseAndGenerics` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:66:52
@@ -178,16 +170,15 @@ UP046 [*] Generic class `MultipleBaseAndGenerics` uses `Generic` subclass instea
 68 |     typ: T
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-63 63 |     var: T
-64 64 | 
-65 65 | 
-66    |-class MultipleBaseAndGenerics(Base1, Base2, Base3, Generic[S, T, *Ts, P]):
-   66 |+class MultipleBaseAndGenerics[S: (str, bytes), T: float, *Ts, **P](Base1, Base2, Base3):
-67 67 |     var: S
-68 68 |     typ: T
-69 69 |     tup: tuple[*Ts]
+63 |     var: T
+64 | 
+65 | 
+   - class MultipleBaseAndGenerics(Base1, Base2, Base3, Generic[S, T, *Ts, P]):
+66 + class MultipleBaseAndGenerics[S: (str, bytes), T: float, *Ts, **P](Base1, Base2, Base3):
+67 |     var: S
+68 |     typ: T
+69 |     tup: tuple[*Ts]
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `A` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:73:9
@@ -196,16 +187,15 @@ UP046 [*] Generic class `A` uses `Generic` subclass instead of type parameters
    |         ^^^^^^^^^^
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-70 70 |     pep: P
-71 71 | 
-72 72 | 
-73    |-class A(Generic[T]): ...
-   73 |+class A[T: float]: ...
-74 74 | 
-75 75 | 
-76 76 | class B(A[S], Generic[S]):
+70 |     pep: P
+71 | 
+72 | 
+   - class A(Generic[T]): ...
+73 + class A[T: float]: ...
+74 | 
+75 | 
+76 | class B(A[S], Generic[S]):
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:76:15
@@ -215,16 +205,15 @@ UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters
 77 |     var: S
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-73 73 | class A(Generic[T]): ...
-74 74 | 
-75 75 | 
-76    |-class B(A[S], Generic[S]):
-   76 |+class B[S: (str, bytes)](A[S]):
-77 77 |     var: S
-78 78 | 
-79 79 | 
+73 | class A(Generic[T]): ...
+74 | 
+75 | 
+   - class B(A[S], Generic[S]):
+76 + class B[S: (str, bytes)](A[S]):
+77 |     var: S
+78 | 
+79 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:80:15
@@ -234,16 +223,15 @@ UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters
 81 |     var: tuple[S, T]
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-77 77 |     var: S
-78 78 | 
-79 79 | 
-80    |-class C(A[S], Generic[S, T]):
-   80 |+class C[S: (str, bytes), T: float](A[S]):
-81 81 |     var: tuple[S, T]
-82 82 | 
-83 83 | 
+77 |     var: S
+78 | 
+79 | 
+   - class C(A[S], Generic[S, T]):
+80 + class C[S: (str, bytes), T: float](A[S]):
+81 |     var: tuple[S, T]
+82 | 
+83 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 [*] Generic class `D` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:84:17
@@ -253,16 +241,15 @@ UP046 [*] Generic class `D` uses `Generic` subclass instead of type parameters
 85 |     var: T
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-81 81 |     var: tuple[S, T]
-82 82 | 
-83 83 | 
-84    |-class D(A[int], Generic[T]):
-   84 |+class D[T: float](A[int]):
-85 85 |     var: T
-86 86 | 
-87 87 | 
+81 |     var: tuple[S, T]
+82 | 
+83 | 
+   - class D(A[int], Generic[T]):
+84 + class D[T: float](A[int]):
+85 |     var: T
+86 | 
+87 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP046 Generic class `NotLast` uses `Generic` subclass instead of type parameters
   --> UP046_0.py:88:15
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py__preview_diff.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py__preview_diff.snap
new file mode 100644
index 0000000000..3763460d1d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py__preview_diff.snap
@@ -0,0 +1,48 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 2
+
+--- Added ---
+UP046 [*] Generic class `DefaultTypeVar` uses `Generic` subclass instead of type parameters
+   --> UP046_0.py:129:22
+    |
+129 | class DefaultTypeVar(Generic[V]):  # -> [V: str = Any]
+    |                      ^^^^^^^^^^
+130 |     var: V
+    |
+help: Use type parameters
+126 | V = TypeVar("V", default=Any, bound=str)
+127 | 
+128 | 
+    - class DefaultTypeVar(Generic[V]):  # -> [V: str = Any]
+129 + class DefaultTypeVar[V: str = Any]:  # -> [V: str = Any]
+130 |     var: V
+131 | 
+132 | 
+note: This is an unsafe fix and may change runtime behavior
+
+
+UP046 [*] Generic class `DefaultOnlyTypeVar` uses `Generic` subclass instead of type parameters
+   --> UP046_0.py:137:26
+    |
+137 | class DefaultOnlyTypeVar(Generic[W]):  # -> [W = int]
+    |                          ^^^^^^^^^^
+138 |     var: W
+    |
+help: Use type parameters
+134 | W = TypeVar("W", default=int)
+135 | 
+136 | 
+    - class DefaultOnlyTypeVar(Generic[W]):  # -> [W = int]
+137 + class DefaultOnlyTypeVar[W = int]:  # -> [W = int]
+138 |     var: W
+139 | 
+140 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_1.py__preview_diff.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_1.py__preview_diff.snap
new file mode 100644
index 0000000000..7e33841de0
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_1.py__preview_diff.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 0
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap
index 6fdca3167f..9cbe736a7a 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap
@@ -9,16 +9,15 @@ UP047 [*] Generic function `f` should use type parameters
 13 |     return t
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-9  9  | P = ParamSpec("P")
-10 10 | 
-11 11 | 
-12    |-def f(t: T) -> T:
-   12 |+def f[T: float](t: T) -> T:
-13 13 |     return t
-14 14 | 
-15 15 | 
+9  | P = ParamSpec("P")
+10 | 
+11 | 
+   - def f(t: T) -> T:
+12 + def f[T: float](t: T) -> T:
+13 |     return t
+14 | 
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP047 [*] Generic function `g` should use type parameters
   --> UP047.py:16:5
@@ -28,16 +27,15 @@ UP047 [*] Generic function `g` should use type parameters
 17 |     return ts
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-13 13 |     return t
-14 14 | 
-15 15 | 
-16    |-def g(ts: tuple[*Ts]) -> tuple[*Ts]:
-   16 |+def g[*Ts](ts: tuple[*Ts]) -> tuple[*Ts]:
-17 17 |     return ts
-18 18 | 
-19 19 | 
+13 |     return t
+14 | 
+15 | 
+   - def g(ts: tuple[*Ts]) -> tuple[*Ts]:
+16 + def g[*Ts](ts: tuple[*Ts]) -> tuple[*Ts]:
+17 |     return ts
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP047 [*] Generic function `h` should use type parameters
   --> UP047.py:20:5
@@ -53,16 +51,15 @@ UP047 [*] Generic function `h` should use type parameters
 26 |       return p
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-17 17 |     return ts
-18 18 | 
-19 19 | 
-20    |-def h(
-   20 |+def h[**P, T: float](
-21 21 |     p: Callable[P, T],
-22 22 |     # Comment in the middle of a parameter list should be preserved
-23 23 |     another_param,
+17 |     return ts
+18 | 
+19 | 
+   - def h(
+20 + def h[**P, T: float](
+21 |     p: Callable[P, T],
+22 |     # Comment in the middle of a parameter list should be preserved
+23 |     another_param,
+note: This is an unsafe fix and may change runtime behavior
 
 UP047 [*] Generic function `i` should use type parameters
   --> UP047.py:29:5
@@ -72,16 +69,15 @@ UP047 [*] Generic function `i` should use type parameters
 30 |     return s
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-26 26 |     return p
-27 27 | 
-28 28 | 
-29    |-def i(s: S) -> S:
-   29 |+def i[S: (str, bytes)](s: S) -> S:
-30 30 |     return s
-31 31 | 
-32 32 | 
+26 |     return p
+27 | 
+28 | 
+   - def i(s: S) -> S:
+29 + def i[S: (str, bytes)](s: S) -> S:
+30 |     return s
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP047 [*] Generic function `broken_fix` should use type parameters
   --> UP047.py:39:5
@@ -93,16 +89,15 @@ UP047 [*] Generic function `broken_fix` should use type parameters
 40 |     return (okay, bad)
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-36 36 | # generic type parameter. This leads to code that mixes old-style standalone
-37 37 | # TypeVars with the new-style generic syntax and will be rejected by type
-38 38 | # checkers
-39    |-def broken_fix(okay: T, bad: Something) -> tuple[T, Something]:
-   39 |+def broken_fix[T: float](okay: T, bad: Something) -> tuple[T, Something]:
-40 40 |     return (okay, bad)
-41 41 | 
-42 42 | 
+36 | # generic type parameter. This leads to code that mixes old-style standalone
+37 | # TypeVars with the new-style generic syntax and will be rejected by type
+38 | # checkers
+   - def broken_fix(okay: T, bad: Something) -> tuple[T, Something]:
+39 + def broken_fix[T: float](okay: T, bad: Something) -> tuple[T, Something]:
+40 |     return (okay, bad)
+41 | 
+42 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP047 [*] Generic function `any_str_param` should use type parameters
   --> UP047.py:43:5
@@ -112,13 +107,12 @@ UP047 [*] Generic function `any_str_param` should use type parameters
 44 |     return s
    |
 help: Use type parameters
-
-ℹ Unsafe fix
-40 40 |     return (okay, bad)
-41 41 | 
-42 42 | 
-43    |-def any_str_param(s: AnyStr) -> AnyStr:
-   43 |+def any_str_param[AnyStr: (bytes, str)](s: AnyStr) -> AnyStr:
-44 44 |     return s
-45 45 | 
-46 46 |
+40 |     return (okay, bad)
+41 | 
+42 | 
+   - def any_str_param(s: AnyStr) -> AnyStr:
+43 + def any_str_param[AnyStr: (bytes, str)](s: AnyStr) -> AnyStr:
+44 |     return s
+45 | 
+46 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py__preview_diff.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py__preview_diff.snap
new file mode 100644
index 0000000000..2a11cd2e59
--- /dev/null
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py__preview_diff.snap
@@ -0,0 +1,29 @@
+---
+source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
+---
+--- Linter settings ---
+-linter.preview = disabled
++linter.preview = enabled
+
+--- Summary ---
+Removed: 0
+Added: 1
+
+--- Added ---
+UP047 [*] Generic function `default_var` should use type parameters
+  --> UP047.py:51:5
+   |
+51 | def default_var(v: V) -> V:
+   |     ^^^^^^^^^^^^^^^^^
+52 |     return v
+   |
+help: Use type parameters
+48 | V = TypeVar("V", default=Any, bound=str)
+49 | 
+50 | 
+   - def default_var(v: V) -> V:
+51 + def default_var[V: str = Any](v: V) -> V:
+52 |     return v
+53 | 
+54 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap
index 99eed28edc..6175b73921 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap
@@ -10,19 +10,17 @@ UP049 [*] Generic class uses private type parameters
 3 |     buf: list[_T]
   |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-1 1 | # simple case, replace _T in signature and body
-2   |-class Generic[_T]:
-3   |-    buf: list[_T]
-  2 |+class Generic[T]:
-  3 |+    buf: list[T]
-4 4 | 
-5   |-    def append(self, t: _T):
-  5 |+    def append(self, t: T):
-6 6 |         self.buf.append(t)
-7 7 | 
-8 8 | 
+1 | # simple case, replace _T in signature and body
+  - class Generic[_T]:
+  -     buf: list[_T]
+2 + class Generic[T]:
+3 +     buf: list[T]
+4 | 
+  -     def append(self, t: _T):
+5 +     def append(self, t: T):
+6 |         self.buf.append(t)
+7 | 
+8 | 
 
 UP049 [*] Generic function uses private type parameters
   --> UP049_0.py:10:12
@@ -34,18 +32,16 @@ UP049 [*] Generic function uses private type parameters
 12 |     return y
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-7  7  | 
-8  8  | 
-9  9  | # simple case, replace _T in signature and body
-10    |-def second[_T](var: tuple[_T]) -> _T:
-11    |-    y: _T = var[1]
-   10 |+def second[T](var: tuple[T]) -> T:
-   11 |+    y: T = var[1]
-12 12 |     return y
-13 13 | 
-14 14 | 
+7  | 
+8  | 
+9  | # simple case, replace _T in signature and body
+   - def second[_T](var: tuple[_T]) -> _T:
+   -     y: _T = var[1]
+10 + def second[T](var: tuple[T]) -> T:
+11 +     y: T = var[1]
+12 |     return y
+13 | 
+14 | 
 
 UP049 [*] Generic function uses private type parameters
   --> UP049_0.py:17:5
@@ -58,16 +54,14 @@ UP049 [*] Generic function uses private type parameters
 19 | ](args):
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-14 14 | 
-15 15 | # one diagnostic for each variable, comments are preserved
-16 16 | def many_generics[
-17    |-    _T,  # first generic
-   17 |+    T,  # first generic
-18 18 |     _U,  # second generic
-19 19 | ](args):
-20 20 |     return args
+14 | 
+15 | # one diagnostic for each variable, comments are preserved
+16 | def many_generics[
+   -     _T,  # first generic
+17 +     T,  # first generic
+18 |     _U,  # second generic
+19 | ](args):
+20 |     return args
 
 UP049 [*] Generic function uses private type parameters
   --> UP049_0.py:18:5
@@ -80,16 +74,14 @@ UP049 [*] Generic function uses private type parameters
 20 |     return args
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-15 15 | # one diagnostic for each variable, comments are preserved
-16 16 | def many_generics[
-17 17 |     _T,  # first generic
-18    |-    _U,  # second generic
-   18 |+    U,  # second generic
-19 19 | ](args):
-20 20 |     return args
-21 21 | 
+15 | # one diagnostic for each variable, comments are preserved
+16 | def many_generics[
+17 |     _T,  # first generic
+   -     _U,  # second generic
+18 +     U,  # second generic
+19 | ](args):
+20 |     return args
+21 | 
 
 UP049 [*] Generic function uses private type parameters
   --> UP049_0.py:27:7
@@ -100,15 +92,13 @@ UP049 [*] Generic function uses private type parameters
 29 |     cast("Literal['_T']")
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-24 24 | from typing import Literal, cast
-25 25 | 
-26 26 | 
-27    |-def f[_T](v):
-28    |-    cast("_T", v)
-   27 |+def f[T](v):
-   28 |+    cast("T", v)
-29 29 |     cast("Literal['_T']")
-30    |-    cast("list[_T]", v)
-   30 |+    cast("list[T]", v)
+24 | from typing import Literal, cast
+25 | 
+26 | 
+   - def f[_T](v):
+   -     cast("_T", v)
+27 + def f[T](v):
+28 +     cast("T", v)
+29 |     cast("Literal['_T']")
+   -     cast("list[_T]", v)
+30 +     cast("list[T]", v)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap
index 4c94954139..13ae7c4a1e 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap
@@ -10,16 +10,14 @@ UP049 [*] Generic class uses private type parameters
 3 |     var: _T
   |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-1 1 | # bound
-2   |-class Foo[_T: str]:
-3   |-    var: _T
-  2 |+class Foo[T: str]:
-  3 |+    var: T
-4 4 | 
-5 5 | 
-6 6 | # constraint
+1 | # bound
+  - class Foo[_T: str]:
+  -     var: _T
+2 + class Foo[T: str]:
+3 +     var: T
+4 | 
+5 | 
+6 | # constraint
 
 UP049 [*] Generic class uses private type parameters
  --> UP049_1.py:7:11
@@ -30,18 +28,16 @@ UP049 [*] Generic class uses private type parameters
 8 |     var: _T
   |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | # constraint
-7   |-class Foo[_T: (str, bytes)]:
-8   |-    var: _T
-  7 |+class Foo[T: (str, bytes)]:
-  8 |+    var: T
-9 9 | 
-10 10 | 
-11 11 | # python 3.13+ default
+4  | 
+5  | 
+6  | # constraint
+   - class Foo[_T: (str, bytes)]:
+   -     var: _T
+7  + class Foo[T: (str, bytes)]:
+8  +     var: T
+9  | 
+10 | 
+11 | # python 3.13+ default
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:12:11
@@ -52,18 +48,16 @@ UP049 [*] Generic class uses private type parameters
 13 |     var: _T
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-9  9  | 
-10 10 | 
-11 11 | # python 3.13+ default
-12    |-class Foo[_T = int]:
-13    |-    var: _T
-   12 |+class Foo[T = int]:
-   13 |+    var: T
-14 14 | 
-15 15 | 
-16 16 | # tuple
+9  | 
+10 | 
+11 | # python 3.13+ default
+   - class Foo[_T = int]:
+   -     var: _T
+12 + class Foo[T = int]:
+13 +     var: T
+14 | 
+15 | 
+16 | # tuple
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:17:12
@@ -74,18 +68,16 @@ UP049 [*] Generic class uses private type parameters
 18 |     var: tuple[*_Ts]
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-14 14 | 
-15 15 | 
-16 16 | # tuple
-17    |-class Foo[*_Ts]:
-18    |-    var: tuple[*_Ts]
-   17 |+class Foo[*Ts]:
-   18 |+    var: tuple[*Ts]
-19 19 | 
-20 20 | 
-21 21 | # paramspec
+14 | 
+15 | 
+16 | # tuple
+   - class Foo[*_Ts]:
+   -     var: tuple[*_Ts]
+17 + class Foo[*Ts]:
+18 +     var: tuple[*Ts]
+19 | 
+20 | 
+21 | # paramspec
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:22:11
@@ -96,18 +88,16 @@ UP049 [*] Generic class uses private type parameters
 23 |     var: _P
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | # paramspec
-22    |-class C[**_P]:
-23    |-    var: _P
-   22 |+class C[**P]:
-   23 |+    var: P
-24 24 | 
-25 25 | 
-26 26 | from typing import Callable
+19 | 
+20 | 
+21 | # paramspec
+   - class C[**_P]:
+   -     var: _P
+22 + class C[**P]:
+23 +     var: P
+24 | 
+25 | 
+26 | from typing import Callable
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:31:18
@@ -120,19 +110,17 @@ UP049 [*] Generic class uses private type parameters
 33 |     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-28 28 | 
-29 29 | # each of these will get a separate diagnostic, but at least they'll all get
-30 30 | # fixed
-31    |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
-   31 |+class Everything[T, _U: str, _V: (int, float), *_W, **_X]:
-32 32 |     @staticmethod
-33    |-    def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
-   33 |+    def transform(t: T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, T] | None:
-34 34 |         return None
-35 35 | 
-36 36 | 
+28 | 
+29 | # each of these will get a separate diagnostic, but at least they'll all get
+30 | # fixed
+   - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
+31 + class Everything[T, _U: str, _V: (int, float), *_W, **_X]:
+32 |     @staticmethod
+   -     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
+33 +     def transform(t: T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, T] | None:
+34 |         return None
+35 | 
+36 | 
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:31:22
@@ -145,19 +133,17 @@ UP049 [*] Generic class uses private type parameters
 33 |     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-28 28 | 
-29 29 | # each of these will get a separate diagnostic, but at least they'll all get
-30 30 | # fixed
-31    |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
-   31 |+class Everything[_T, U: str, _V: (int, float), *_W, **_X]:
-32 32 |     @staticmethod
-33    |-    def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
-   33 |+    def transform(t: _T, u: U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
-34 34 |         return None
-35 35 | 
-36 36 | 
+28 | 
+29 | # each of these will get a separate diagnostic, but at least they'll all get
+30 | # fixed
+   - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
+31 + class Everything[_T, U: str, _V: (int, float), *_W, **_X]:
+32 |     @staticmethod
+   -     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
+33 +     def transform(t: _T, u: U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
+34 |         return None
+35 | 
+36 | 
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:31:31
@@ -170,19 +156,17 @@ UP049 [*] Generic class uses private type parameters
 33 |     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-28 28 | 
-29 29 | # each of these will get a separate diagnostic, but at least they'll all get
-30 30 | # fixed
-31    |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
-   31 |+class Everything[_T, _U: str, V: (int, float), *_W, **_X]:
-32 32 |     @staticmethod
-33    |-    def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
-   33 |+    def transform(t: _T, u: _U, v: V) -> tuple[*_W] | Callable[_X, _T] | None:
-34 34 |         return None
-35 35 | 
-36 36 | 
+28 | 
+29 | # each of these will get a separate diagnostic, but at least they'll all get
+30 | # fixed
+   - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
+31 + class Everything[_T, _U: str, V: (int, float), *_W, **_X]:
+32 |     @staticmethod
+   -     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
+33 +     def transform(t: _T, u: _U, v: V) -> tuple[*_W] | Callable[_X, _T] | None:
+34 |         return None
+35 | 
+36 | 
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:31:50
@@ -195,19 +179,17 @@ UP049 [*] Generic class uses private type parameters
 33 |     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-28 28 | 
-29 29 | # each of these will get a separate diagnostic, but at least they'll all get
-30 30 | # fixed
-31    |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
-   31 |+class Everything[_T, _U: str, _V: (int, float), *W, **_X]:
-32 32 |     @staticmethod
-33    |-    def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
-   33 |+    def transform(t: _T, u: _U, v: _V) -> tuple[*W] | Callable[_X, _T] | None:
-34 34 |         return None
-35 35 | 
-36 36 | 
+28 | 
+29 | # each of these will get a separate diagnostic, but at least they'll all get
+30 | # fixed
+   - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
+31 + class Everything[_T, _U: str, _V: (int, float), *W, **_X]:
+32 |     @staticmethod
+   -     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
+33 +     def transform(t: _T, u: _U, v: _V) -> tuple[*W] | Callable[_X, _T] | None:
+34 |         return None
+35 | 
+36 | 
 
 UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:31:56
@@ -220,19 +202,17 @@ UP049 [*] Generic class uses private type parameters
 33 |     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Safe fix
-28 28 | 
-29 29 | # each of these will get a separate diagnostic, but at least they'll all get
-30 30 | # fixed
-31    |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
-   31 |+class Everything[_T, _U: str, _V: (int, float), *_W, **X]:
-32 32 |     @staticmethod
-33    |-    def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
-   33 |+    def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[X, _T] | None:
-34 34 |         return None
-35 35 | 
-36 36 | 
+28 | 
+29 | # each of these will get a separate diagnostic, but at least they'll all get
+30 | # fixed
+   - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]:
+31 + class Everything[_T, _U: str, _V: (int, float), *_W, **X]:
+32 |     @staticmethod
+   -     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None:
+33 +     def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[X, _T] | None:
+34 |         return None
+35 | 
+36 | 
 
 UP049 Generic class uses private type parameters
   --> UP049_1.py:39:9
@@ -282,7 +262,7 @@ UP049 Generic class uses private type parameters
    |
 help: Rename type parameter to remove leading underscores
 
-UP049 Generic class uses private type parameters
+UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:71:9
    |
 71 | class C[_T]:
@@ -291,32 +271,31 @@ UP049 Generic class uses private type parameters
 73 |     v2 = cast('_T', ...)
    |
 help: Rename type parameter to remove leading underscores
+68 | class C[_T, T]: ...
+69 | 
+70 | 
+   - class C[_T]:
+   -     v1 = cast(_T, ...)
+   -     v2 = cast('_T', ...)
+   -     v3 = cast("\u005fT", ...)
+71 + class C[T]:
+72 +     v1 = cast(T, ...)
+73 +     v2 = cast('T', ...)
+74 +     v3 = cast(T, ...)
+75 | 
+76 |     def _(self):
+   -         v1 = cast(_T, ...)
+   -         v2 = cast('_T', ...)
+   -         v3 = cast("\u005fT", ...)
+77 +         v1 = cast(T, ...)
+78 +         v2 = cast('T', ...)
+79 +         v3 = cast(T, ...)
+80 | 
+81 | 
+82 | class C[_T]:
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-68 68 | class C[_T, T]: ...
-69 69 | 
-70 70 | 
-71    |-class C[_T]:
-72    |-    v1 = cast(_T, ...)
-73    |-    v2 = cast('_T', ...)
-74    |-    v3 = cast("\u005fT", ...)
-   71 |+class C[T]:
-   72 |+    v1 = cast(T, ...)
-   73 |+    v2 = cast('T', ...)
-   74 |+    v3 = cast(T, ...)
-75 75 | 
-76 76 |     def _(self):
-77    |-        v1 = cast(_T, ...)
-78    |-        v2 = cast('_T', ...)
-79    |-        v3 = cast("\u005fT", ...)
-   77 |+        v1 = cast(T, ...)
-   78 |+        v2 = cast('T', ...)
-   79 |+        v3 = cast(T, ...)
-80 80 | 
-81 81 | 
-82 82 | class C[_T]:
-
-UP049 Generic class uses private type parameters
+UP049 [*] Generic class uses private type parameters
   --> UP049_1.py:82:9
    |
 82 | class C[_T]:
@@ -324,18 +303,17 @@ UP049 Generic class uses private type parameters
 83 |     v = cast('Literal[\'foo\'] | _T', ...)
    |
 help: Rename type parameter to remove leading underscores
-
-ℹ Display-only fix
-79 79 |         v3 = cast("\u005fT", ...)
-80 80 | 
-81 81 | 
-82    |-class C[_T]:
-83    |-    v = cast('Literal[\'foo\'] | _T', ...)
-   82 |+class C[T]:
-   83 |+    v = cast(T, ...)
-84 84 | 
-85 85 | 
-86 86 | ## Name collision
+79 |         v3 = cast("\u005fT", ...)
+80 | 
+81 | 
+   - class C[_T]:
+   -     v = cast('Literal[\'foo\'] | _T', ...)
+82 + class C[T]:
+83 +     v = cast(T, ...)
+84 | 
+85 | 
+86 | ## Name collision
+note: This is a display-only fix and is likely to be incorrect
 
 UP049 Generic function uses private type parameters
   --> UP049_1.py:88:11
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap
index 904d235e79..63449018ae 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap
@@ -9,16 +9,14 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 6 |     ...
   |
 help: Remove `metaclass=type`
-
-ℹ Safe fix
-2 2 |     ...
-3 3 | 
-4 4 | 
-5   |-class A(metaclass=type):
-  5 |+class A:
-6 6 |     ...
-7 7 | 
-8 8 | 
+2 |     ...
+3 | 
+4 | 
+  - class A(metaclass=type):
+5 + class A:
+6 |     ...
+7 | 
+8 | 
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:10:5
@@ -30,18 +28,16 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 12 |     ...
    |
 help: Remove `metaclass=type`
-
-ℹ Safe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-class A(
-10    |-    metaclass=type
-11    |-):
-   9  |+class A:
-12 10 |     ...
-13 11 | 
-14 12 | 
+6  |     ...
+7  | 
+8  | 
+   - class A(
+   -     metaclass=type
+   - ):
+9  + class A:
+10 |     ...
+11 | 
+12 | 
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:16:5
@@ -53,19 +49,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 18 | ):
    |
 help: Remove `metaclass=type`
-
-ℹ Unsafe fix
-12 12 |     ...
-13 13 | 
-14 14 | 
-15    |-class A(
-16    |-    metaclass=type
-17    |-    #
-18    |-):
-   15 |+class A:
-19 16 |     ...
-20 17 | 
-21 18 | 
+12 |     ...
+13 | 
+14 | 
+   - class A(
+   -     metaclass=type
+   -     #
+   - ):
+15 + class A:
+16 |     ...
+17 | 
+18 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:24:5
@@ -78,19 +73,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 26 |     ...
    |
 help: Remove `metaclass=type`
-
-ℹ Unsafe fix
-19 19 |     ...
-20 20 | 
-21 21 | 
-22    |-class A(
-23    |-    #
-24    |-    metaclass=type
-25    |-):
-   22 |+class A:
-26 23 |     ...
-27 24 | 
-28 25 | 
+19 |     ...
+20 | 
+21 | 
+   - class A(
+   -     #
+   -     metaclass=type
+   - ):
+22 + class A:
+23 |     ...
+24 | 
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:30:5
@@ -102,19 +96,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 32 | ):
    |
 help: Remove `metaclass=type`
-
-ℹ Unsafe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-class A(
-30    |-    metaclass=type,
-31    |-    #
-32    |-):
-   29 |+class A:
-33 30 |     ...
-34 31 | 
-35 32 | 
+26 |     ...
+27 | 
+28 | 
+   - class A(
+   -     metaclass=type,
+   -     #
+   - ):
+29 + class A:
+30 |     ...
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:38:5
@@ -127,20 +120,19 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 40 | ):
    |
 help: Remove `metaclass=type`
-
-ℹ Unsafe fix
-33 33 |     ...
-34 34 | 
-35 35 | 
-36    |-class A(
-37    |-    #
-38    |-    metaclass=type,
-39    |-    #
-40    |-):
-   36 |+class A:
-41 37 |     ...
-42 38 | 
-43 39 | 
+33 |     ...
+34 | 
+35 | 
+   - class A(
+   -     #
+   -     metaclass=type,
+   -     #
+   - ):
+36 + class A:
+37 |     ...
+38 | 
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP050 [*] Class `B` uses `metaclass=type`, which is redundant
   --> UP050.py:44:12
@@ -150,16 +142,14 @@ UP050 [*] Class `B` uses `metaclass=type`, which is redundant
 45 |     ...
    |
 help: Remove `metaclass=type`
-
-ℹ Safe fix
-41 41 |     ...
-42 42 | 
-43 43 | 
-44    |-class B(A, metaclass=type):
-   44 |+class B(A):
-45 45 |     ...
-46 46 | 
-47 47 | 
+41 |     ...
+42 | 
+43 | 
+   - class B(A, metaclass=type):
+44 + class B(A):
+45 |     ...
+46 | 
+47 | 
 
 UP050 [*] Class `B` uses `metaclass=type`, which is redundant
   --> UP050.py:50:5
@@ -172,15 +162,13 @@ UP050 [*] Class `B` uses `metaclass=type`, which is redundant
 52 |     ...
    |
 help: Remove `metaclass=type`
-
-ℹ Safe fix
-47 47 | 
-48 48 | class B(
-49 49 |     A,
-50    |-    metaclass=type,
-51 50 | ):
-52 51 |     ...
-53 52 | 
+47 | 
+48 | class B(
+49 |     A,
+   -     metaclass=type,
+50 | ):
+51 |     ...
+52 | 
 
 UP050 [*] Class `B` uses `metaclass=type`, which is redundant
   --> UP050.py:58:5
@@ -193,16 +181,15 @@ UP050 [*] Class `B` uses `metaclass=type`, which is redundant
 60 |     ...
    |
 help: Remove `metaclass=type`
-
-ℹ Unsafe fix
-54 54 | 
-55 55 | class B(
-56 56 |     A,
-57    |-    # comment
-58    |-    metaclass=type,
-59 57 | ):
-60 58 |     ...
-61 59 | 
+54 | 
+55 | class B(
+56 |     A,
+   -     # comment
+   -     metaclass=type,
+57 | ):
+58 |     ...
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:69:5
@@ -214,19 +201,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 71 | ):
    |
 help: Remove `metaclass=type`
-
-ℹ Unsafe fix
-65 65 |         ...
-66 66 | 
-67 67 | 
-68    |-class A(
-69    |-    metaclass=type  # comment
-70    |-    ,
-71    |-):
-   68 |+class A:
-72 69 |     ...
-73 70 | 
-74 71 | 
+65 |         ...
+66 | 
+67 | 
+   - class A(
+   -     metaclass=type  # comment
+   -     ,
+   - ):
+68 + class A:
+69 |     ...
+70 | 
+71 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP050 [*] Class `A` uses `metaclass=type`, which is redundant
   --> UP050.py:83:9
@@ -238,11 +224,9 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant
 84 |     ...
    |
 help: Remove `metaclass=type`
-
-ℹ Safe fix
-80 80 | 
-81 81 | import builtins
-82 82 | 
-83    |-class A(metaclass=builtins.type):
-   83 |+class A:
-84 84 |     ...
+80 | 
+81 | import builtins
+82 | 
+   - class A(metaclass=builtins.type):
+83 + class A:
+84 |     ...
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap
index 2c67e9da5a..3040870f87 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap
@@ -9,16 +9,14 @@ UP037 [*] Remove quotes from type annotation
 19 |     x: "MyClass"
    |
 help: Remove quotes
-
-ℹ Safe fix
-15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
-16 16 | 
-17 17 | 
-18    |-def foo(var: "MyClass") -> "MyClass":
-   18 |+def foo(var: MyClass) -> "MyClass":
-19 19 |     x: "MyClass"
-20 20 | 
-21 21 | 
+15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
+16 | 
+17 | 
+   - def foo(var: "MyClass") -> "MyClass":
+18 + def foo(var: MyClass) -> "MyClass":
+19 |     x: "MyClass"
+20 | 
+21 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:18:28
@@ -28,16 +26,14 @@ UP037 [*] Remove quotes from type annotation
 19 |     x: "MyClass"
    |
 help: Remove quotes
-
-ℹ Safe fix
-15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
-16 16 | 
-17 17 | 
-18    |-def foo(var: "MyClass") -> "MyClass":
-   18 |+def foo(var: "MyClass") -> MyClass:
-19 19 |     x: "MyClass"
-20 20 | 
-21 21 | 
+15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg
+16 | 
+17 | 
+   - def foo(var: "MyClass") -> "MyClass":
+18 + def foo(var: "MyClass") -> MyClass:
+19 |     x: "MyClass"
+20 | 
+21 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:19:8
@@ -47,16 +43,14 @@ UP037 [*] Remove quotes from type annotation
    |        ^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-16 16 | 
-17 17 | 
-18 18 | def foo(var: "MyClass") -> "MyClass":
-19    |-    x: "MyClass"
-   19 |+    x: MyClass
-20 20 | 
-21 21 | 
-22 22 | def foo(*, inplace: "bool"):
+16 | 
+17 | 
+18 | def foo(var: "MyClass") -> "MyClass":
+   -     x: "MyClass"
+19 +     x: MyClass
+20 | 
+21 | 
+22 | def foo(*, inplace: "bool"):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:22:21
@@ -66,16 +60,14 @@ UP037 [*] Remove quotes from type annotation
 23 |     pass
    |
 help: Remove quotes
-
-ℹ Safe fix
-19 19 |     x: "MyClass"
-20 20 | 
-21 21 | 
-22    |-def foo(*, inplace: "bool"):
-   22 |+def foo(*, inplace: bool):
-23 23 |     pass
-24 24 | 
-25 25 | 
+19 |     x: "MyClass"
+20 | 
+21 | 
+   - def foo(*, inplace: "bool"):
+22 + def foo(*, inplace: bool):
+23 |     pass
+24 | 
+25 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:26:16
@@ -85,16 +77,14 @@ UP037 [*] Remove quotes from type annotation
 27 |     pass
    |
 help: Remove quotes
-
-ℹ Safe fix
-23 23 |     pass
-24 24 | 
-25 25 | 
-26    |-def foo(*args: "str", **kwargs: "int"):
-   26 |+def foo(*args: str, **kwargs: "int"):
-27 27 |     pass
-28 28 | 
-29 29 | 
+23 |     pass
+24 | 
+25 | 
+   - def foo(*args: "str", **kwargs: "int"):
+26 + def foo(*args: str, **kwargs: "int"):
+27 |     pass
+28 | 
+29 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:26:33
@@ -104,16 +94,14 @@ UP037 [*] Remove quotes from type annotation
 27 |     pass
    |
 help: Remove quotes
-
-ℹ Safe fix
-23 23 |     pass
-24 24 | 
-25 25 | 
-26    |-def foo(*args: "str", **kwargs: "int"):
-   26 |+def foo(*args: "str", **kwargs: int):
-27 27 |     pass
-28 28 | 
-29 29 | 
+23 |     pass
+24 | 
+25 | 
+   - def foo(*args: "str", **kwargs: "int"):
+26 + def foo(*args: "str", **kwargs: int):
+27 |     pass
+28 | 
+29 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:30:10
@@ -124,16 +112,14 @@ UP037 [*] Remove quotes from type annotation
 32 | x: Callable[["MyClass"], None]
    |
 help: Remove quotes
-
-ℹ Safe fix
-27 27 |     pass
-28 28 | 
-29 29 | 
-30    |-x: Tuple["MyClass"]
-   30 |+x: Tuple[MyClass]
-31 31 | 
-32 32 | x: Callable[["MyClass"], None]
-33 33 | 
+27 |     pass
+28 | 
+29 | 
+   - x: Tuple["MyClass"]
+30 + x: Tuple[MyClass]
+31 | 
+32 | x: Callable[["MyClass"], None]
+33 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:32:14
@@ -144,16 +130,14 @@ UP037 [*] Remove quotes from type annotation
    |              ^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-29 29 | 
-30 30 | x: Tuple["MyClass"]
-31 31 | 
-32    |-x: Callable[["MyClass"], None]
-   32 |+x: Callable[[MyClass], None]
-33 33 | 
-34 34 | 
-35 35 | class Foo(NamedTuple):
+29 | 
+30 | x: Tuple["MyClass"]
+31 | 
+   - x: Callable[["MyClass"], None]
+32 + x: Callable[[MyClass], None]
+33 | 
+34 | 
+35 | class Foo(NamedTuple):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:36:8
@@ -163,16 +147,14 @@ UP037 [*] Remove quotes from type annotation
    |        ^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-33 33 | 
-34 34 | 
-35 35 | class Foo(NamedTuple):
-36    |-    x: "MyClass"
-   36 |+    x: MyClass
-37 37 | 
-38 38 | 
-39 39 | class D(TypedDict):
+33 | 
+34 | 
+35 | class Foo(NamedTuple):
+   -     x: "MyClass"
+36 +     x: MyClass
+37 | 
+38 | 
+39 | class D(TypedDict):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:40:27
@@ -182,16 +164,14 @@ UP037 [*] Remove quotes from type annotation
    |                           ^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-37 37 | 
-38 38 | 
-39 39 | class D(TypedDict):
-40    |-    E: TypedDict("E", foo="int", total=False)
-   40 |+    E: TypedDict("E", foo=int, total=False)
-41 41 | 
-42 42 | 
-43 43 | class D(TypedDict):
+37 | 
+38 | 
+39 | class D(TypedDict):
+   -     E: TypedDict("E", foo="int", total=False)
+40 +     E: TypedDict("E", foo=int, total=False)
+41 | 
+42 | 
+43 | class D(TypedDict):
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:44:31
@@ -201,16 +181,14 @@ UP037 [*] Remove quotes from type annotation
    |                               ^^^^^
    |
 help: Remove quotes
-
-ℹ Safe fix
-41 41 | 
-42 42 | 
-43 43 | class D(TypedDict):
-44    |-    E: TypedDict("E", {"foo": "int"})
-   44 |+    E: TypedDict("E", {"foo": int})
-45 45 | 
-46 46 | 
-47 47 | x: Annotated["str", "metadata"]
+41 | 
+42 | 
+43 | class D(TypedDict):
+   -     E: TypedDict("E", {"foo": "int"})
+44 +     E: TypedDict("E", {"foo": int})
+45 | 
+46 | 
+47 | x: Annotated["str", "metadata"]
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:47:14
@@ -221,16 +199,14 @@ UP037 [*] Remove quotes from type annotation
 49 | x: Arg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-44 44 |     E: TypedDict("E", {"foo": "int"})
-45 45 | 
-46 46 | 
-47    |-x: Annotated["str", "metadata"]
-   47 |+x: Annotated[str, "metadata"]
-48 48 | 
-49 49 | x: Arg("str", "name")
-50 50 | 
+44 |     E: TypedDict("E", {"foo": "int"})
+45 | 
+46 | 
+   - x: Annotated["str", "metadata"]
+47 + x: Annotated[str, "metadata"]
+48 | 
+49 | x: Arg("str", "name")
+50 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:49:8
@@ -243,16 +219,14 @@ UP037 [*] Remove quotes from type annotation
 51 | x: DefaultArg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-46 46 | 
-47 47 | x: Annotated["str", "metadata"]
-48 48 | 
-49    |-x: Arg("str", "name")
-   49 |+x: Arg(str, "name")
-50 50 | 
-51 51 | x: DefaultArg("str", "name")
-52 52 | 
+46 | 
+47 | x: Annotated["str", "metadata"]
+48 | 
+   - x: Arg("str", "name")
+49 + x: Arg(str, "name")
+50 | 
+51 | x: DefaultArg("str", "name")
+52 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:51:15
@@ -265,16 +239,14 @@ UP037 [*] Remove quotes from type annotation
 53 | x: NamedArg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-48 48 | 
-49 49 | x: Arg("str", "name")
-50 50 | 
-51    |-x: DefaultArg("str", "name")
-   51 |+x: DefaultArg(str, "name")
-52 52 | 
-53 53 | x: NamedArg("str", "name")
-54 54 | 
+48 | 
+49 | x: Arg("str", "name")
+50 | 
+   - x: DefaultArg("str", "name")
+51 + x: DefaultArg(str, "name")
+52 | 
+53 | x: NamedArg("str", "name")
+54 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:53:13
@@ -287,16 +259,14 @@ UP037 [*] Remove quotes from type annotation
 55 | x: DefaultNamedArg("str", "name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-50 50 | 
-51 51 | x: DefaultArg("str", "name")
-52 52 | 
-53    |-x: NamedArg("str", "name")
-   53 |+x: NamedArg(str, "name")
-54 54 | 
-55 55 | x: DefaultNamedArg("str", "name")
-56 56 | 
+50 | 
+51 | x: DefaultArg("str", "name")
+52 | 
+   - x: NamedArg("str", "name")
+53 + x: NamedArg(str, "name")
+54 | 
+55 | x: DefaultNamedArg("str", "name")
+56 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:55:20
@@ -309,16 +279,14 @@ UP037 [*] Remove quotes from type annotation
 57 | x: DefaultNamedArg("str", name="name")
    |
 help: Remove quotes
-
-ℹ Safe fix
-52 52 | 
-53 53 | x: NamedArg("str", "name")
-54 54 | 
-55    |-x: DefaultNamedArg("str", "name")
-   55 |+x: DefaultNamedArg(str, "name")
-56 56 | 
-57 57 | x: DefaultNamedArg("str", name="name")
-58 58 | 
+52 | 
+53 | x: NamedArg("str", "name")
+54 | 
+   - x: DefaultNamedArg("str", "name")
+55 + x: DefaultNamedArg(str, "name")
+56 | 
+57 | x: DefaultNamedArg("str", name="name")
+58 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:57:20
@@ -331,16 +299,14 @@ UP037 [*] Remove quotes from type annotation
 59 | x: VarArg("str")
    |
 help: Remove quotes
-
-ℹ Safe fix
-54 54 | 
-55 55 | x: DefaultNamedArg("str", "name")
-56 56 | 
-57    |-x: DefaultNamedArg("str", name="name")
-   57 |+x: DefaultNamedArg(str, name="name")
-58 58 | 
-59 59 | x: VarArg("str")
-60 60 | 
+54 | 
+55 | x: DefaultNamedArg("str", "name")
+56 | 
+   - x: DefaultNamedArg("str", name="name")
+57 + x: DefaultNamedArg(str, name="name")
+58 | 
+59 | x: VarArg("str")
+60 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:59:11
@@ -353,16 +319,14 @@ UP037 [*] Remove quotes from type annotation
 61 | x: List[List[List["MyClass"]]]
    |
 help: Remove quotes
-
-ℹ Safe fix
-56 56 | 
-57 57 | x: DefaultNamedArg("str", name="name")
-58 58 | 
-59    |-x: VarArg("str")
-   59 |+x: VarArg(str)
-60 60 | 
-61 61 | x: List[List[List["MyClass"]]]
-62 62 | 
+56 | 
+57 | x: DefaultNamedArg("str", name="name")
+58 | 
+   - x: VarArg("str")
+59 + x: VarArg(str)
+60 | 
+61 | x: List[List[List["MyClass"]]]
+62 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:61:19
@@ -375,16 +339,14 @@ UP037 [*] Remove quotes from type annotation
 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-58 58 | 
-59 59 | x: VarArg("str")
-60 60 | 
-61    |-x: List[List[List["MyClass"]]]
-   61 |+x: List[List[List[MyClass]]]
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
+58 | 
+59 | x: VarArg("str")
+60 | 
+   - x: List[List[List["MyClass"]]]
+61 + x: List[List[List[MyClass]]]
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:63:29
@@ -397,16 +359,14 @@ UP037 [*] Remove quotes from type annotation
 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-60 60 | 
-61 61 | x: List[List[List["MyClass"]]]
-62 62 | 
-63    |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-   63 |+x: NamedTuple("X", [("foo", int), ("bar", "str")])
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
+60 | 
+61 | x: List[List[List["MyClass"]]]
+62 | 
+   - x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+63 + x: NamedTuple("X", [("foo", int), ("bar", "str")])
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:63:45
@@ -419,16 +379,14 @@ UP037 [*] Remove quotes from type annotation
 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-60 60 | 
-61 61 | x: List[List[List["MyClass"]]]
-62 62 | 
-63    |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-   63 |+x: NamedTuple("X", [("foo", "int"), ("bar", str)])
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
+60 | 
+61 | x: List[List[List["MyClass"]]]
+62 | 
+   - x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+63 + x: NamedTuple("X", [("foo", "int"), ("bar", str)])
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:29
@@ -441,16 +399,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:36
@@ -463,16 +419,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[("foo", int), ("bar", "str")])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[("foo", int), ("bar", "str")])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:45
@@ -485,16 +439,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:65:52
@@ -507,16 +459,14 @@ UP037 [*] Remove quotes from type annotation
 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
    |
 help: Remove quotes
-
-ℹ Safe fix
-62 62 | 
-63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
-64 64 | 
-65    |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-   65 |+x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)])
-66 66 | 
-67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
-68 68 | 
+62 | 
+63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")])
+64 | 
+   - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+65 + x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)])
+66 | 
+67 | x: NamedTuple(typename="X", fields=[("foo", "int")])
+68 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:67:24
@@ -529,16 +479,14 @@ UP037 [*] Remove quotes from type annotation
 69 | X: MyCallable("X")
    |
 help: Remove quotes
-
-ℹ Safe fix
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
-67    |-x: NamedTuple(typename="X", fields=[("foo", "int")])
-   67 |+x: NamedTuple(typename=X, fields=[("foo", "int")])
-68 68 | 
-69 69 | X: MyCallable("X")
-70 70 | 
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
+   - x: NamedTuple(typename="X", fields=[("foo", "int")])
+67 + x: NamedTuple(typename=X, fields=[("foo", "int")])
+68 | 
+69 | X: MyCallable("X")
+70 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:67:38
@@ -551,16 +499,14 @@ UP037 [*] Remove quotes from type annotation
 69 | X: MyCallable("X")
    |
 help: Remove quotes
-
-ℹ Safe fix
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
-67    |-x: NamedTuple(typename="X", fields=[("foo", "int")])
-   67 |+x: NamedTuple(typename="X", fields=[(foo, "int")])
-68 68 | 
-69 69 | X: MyCallable("X")
-70 70 | 
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
+   - x: NamedTuple(typename="X", fields=[("foo", "int")])
+67 + x: NamedTuple(typename="X", fields=[(foo, "int")])
+68 | 
+69 | X: MyCallable("X")
+70 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_0.py:67:45
@@ -573,16 +519,14 @@ UP037 [*] Remove quotes from type annotation
 69 | X: MyCallable("X")
    |
 help: Remove quotes
-
-ℹ Safe fix
-64 64 | 
-65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
-66 66 | 
-67    |-x: NamedTuple(typename="X", fields=[("foo", "int")])
-   67 |+x: NamedTuple(typename="X", fields=[("foo", int)])
-68 68 | 
-69 69 | X: MyCallable("X")
-70 70 | 
+64 | 
+65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")])
+66 | 
+   - x: NamedTuple(typename="X", fields=[("foo", "int")])
+67 + x: NamedTuple(typename="X", fields=[("foo", int)])
+68 | 
+69 | X: MyCallable("X")
+70 | 
 
 UP037 [*] Remove quotes from type annotation
    --> UP037_0.py:112:12
@@ -594,17 +538,15 @@ UP037 [*] Remove quotes from type annotation
 113 |     return 0
     |
 help: Remove quotes
-
-ℹ Safe fix
-109 109 | 
-110 110 | # Handle end of line comment in string annotation
-111 111 | # See https://github.com/astral-sh/ruff/issues/15816
-112     |-def f() -> "Literal[0]#":
-    112 |+def f() -> (Literal[0]#
-    113 |+):
-113 114 |     return 0
-114 115 | 
-115 116 | def g(x: "Literal['abc']#") -> None:
+109 | 
+110 | # Handle end of line comment in string annotation
+111 | # See https://github.com/astral-sh/ruff/issues/15816
+    - def f() -> "Literal[0]#":
+112 + def f() -> (Literal[0]#
+113 + ):
+114 |     return 0
+115 | 
+116 | def g(x: "Literal['abc']#") -> None:
 
 UP037 [*] Remove quotes from type annotation
    --> UP037_0.py:115:10
@@ -616,17 +558,15 @@ UP037 [*] Remove quotes from type annotation
 116 |     return
     |
 help: Remove quotes
-
-ℹ Safe fix
-112 112 | def f() -> "Literal[0]#":
-113 113 |     return 0
-114 114 | 
-115     |-def g(x: "Literal['abc']#") -> None:
-    115 |+def g(x: (Literal['abc']#
-    116 |+)) -> None:
-116 117 |     return
-117 118 | 
-118 119 | def f() -> """Literal[0]
+112 | def f() -> "Literal[0]#":
+113 |     return 0
+114 | 
+    - def g(x: "Literal['abc']#") -> None:
+115 + def g(x: (Literal['abc']#
+116 + )) -> None:
+117 |     return
+118 | 
+119 | def f() -> """Literal[0]
 
 UP037 [*] Remove quotes from type annotation
    --> UP037_0.py:118:12
@@ -642,15 +582,13 @@ UP037 [*] Remove quotes from type annotation
 122 |       return 0
     |
 help: Remove quotes
-
-ℹ Safe fix
-115 115 | def g(x: "Literal['abc']#") -> None:
-116 116 |     return
-117 117 | 
-118     |-def f() -> """Literal[0]
-    118 |+def f() -> (Literal[0]
-119 119 |     #
-120 120 |     
-121     |-    """:
-    121 |+    ):
-122 122 |     return 0
+115 | def g(x: "Literal['abc']#") -> None:
+116 |     return
+117 | 
+    - def f() -> """Literal[0]
+118 + def f() -> (Literal[0]
+119 |     #
+120 |     
+    -     """:
+121 +     ):
+122 |     return 0
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap
index c6844b63cf..04fbed2e63 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap
@@ -11,16 +11,14 @@ UP037 [*] Remove quotes from type annotation
 10 |     print(x)
    |
 help: Remove quotes
-
-ℹ Safe fix
-6  6  | 
-7  7  | def foo():
-8  8  |     # UP037
-9     |-    x: "Tuple[int, int]" = (0, 0)
-   9  |+    x: Tuple[int, int] = (0, 0)
-10 10 |     print(x)
-11 11 | 
-12 12 | 
+6  | 
+7  | def foo():
+8  |     # UP037
+   -     x: "Tuple[int, int]" = (0, 0)
+9  +     x: Tuple[int, int] = (0, 0)
+10 |     print(x)
+11 | 
+12 | 
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_1.py:14:4
@@ -30,15 +28,8 @@ UP037 [*] Remove quotes from type annotation
    |    ^^^^^^^^^^^^^^^^^
    |
 help: Remove quotes
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import TYPE_CHECKING
-2  3  | 
-3  4  | if TYPE_CHECKING:
---------------------------------------------------------------------------------
-11 12 | 
-12 13 | 
-13 14 | # OK
-14    |-X: "Tuple[int, int]" = (0, 0)
-   15 |+X: Tuple[int, int] = (0, 0)
+11 | 
+12 | 
+13 | # OK
+   - X: "Tuple[int, int]" = (0, 0)
+14 + X: Tuple[int, int] = (0, 0)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap
index e10f3761d3..93fe2fa475 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap
@@ -10,16 +10,14 @@ UP037 [*] Remove quotes from type annotation
   |              ^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Remove quotes
-
-ℹ Safe fix
-1 1 | # https://github.com/astral-sh/ruff/issues/7102
-2 2 | 
-3   |-def f(a: Foo['SingleLine  # Comment']): ...
-  3 |+def f(a: Foo[(SingleLine  # Comment
-  4 |+)]): ...
-4 5 | 
-5 6 | 
-6 7 | def f(a: Foo['''Bar[
+1 | # https://github.com/astral-sh/ruff/issues/7102
+2 | 
+  - def f(a: Foo['SingleLine  # Comment']): ...
+3 + def f(a: Foo[(SingleLine  # Comment
+4 + )]): ...
+5 | 
+6 | 
+7 | def f(a: Foo['''Bar[
 
 UP037 [*] Remove quotes from type annotation
  --> UP037_2.pyi:6:14
@@ -31,19 +29,17 @@ UP037 [*] Remove quotes from type annotation
   | |____________^
   |
 help: Remove quotes
-
-ℹ Safe fix
-3 3 | def f(a: Foo['SingleLine  # Comment']): ...
-4 4 | 
-5 5 | 
-6   |-def f(a: Foo['''Bar[
-  6 |+def f(a: Foo[Bar[
-7 7 |     Multi |
-8   |-    Line]''']): ...
-  8 |+    Line]]): ...
-9 9 | 
-10 10 | 
-11 11 | def f(a: Foo['''Bar[
+3  | def f(a: Foo['SingleLine  # Comment']): ...
+4  | 
+5  | 
+   - def f(a: Foo['''Bar[
+6  + def f(a: Foo[Bar[
+7  |     Multi |
+   -     Line]''']): ...
+8  +     Line]]): ...
+9  | 
+10 | 
+11 | def f(a: Foo['''Bar[
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:11:14
@@ -56,20 +52,18 @@ UP037 [*] Remove quotes from type annotation
    | |____^
    |
 help: Remove quotes
-
-ℹ Safe fix
-8  8  |     Line]''']): ...
-9  9  | 
-10 10 | 
-11    |-def f(a: Foo['''Bar[
-   11 |+def f(a: Foo[Bar[
-12 12 |     Multi |
-13 13 |     Line  # Comment
-14    |-]''']): ...
-   14 |+]]): ...
-15 15 | 
-16 16 | 
-17 17 | def f(a: Foo['''Bar[
+8  |     Line]''']): ...
+9  | 
+10 | 
+   - def f(a: Foo['''Bar[
+11 + def f(a: Foo[Bar[
+12 |     Multi |
+13 |     Line  # Comment
+   - ]''']): ...
+14 + ]]): ...
+15 | 
+16 | 
+17 | def f(a: Foo['''Bar[
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:17:14
@@ -81,20 +75,18 @@ UP037 [*] Remove quotes from type annotation
    | |_______________________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-14 14 | ]''']): ...
-15 15 | 
-16 16 | 
-17    |-def f(a: Foo['''Bar[
-   17 |+def f(a: Foo[(Bar[
-18 18 |     Multi |
-19    |-    Line]  # Comment''']): ...
-   19 |+    Line]  # Comment
-   20 |+)]): ...
-20 21 | 
-21 22 | 
-22 23 | def f(a: Foo['''
+14 | ]''']): ...
+15 | 
+16 | 
+   - def f(a: Foo['''Bar[
+17 + def f(a: Foo[(Bar[
+18 |     Multi |
+   -     Line]  # Comment''']): ...
+19 +     Line]  # Comment
+20 + )]): ...
+21 | 
+22 | 
+23 | def f(a: Foo['''
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:22:14
@@ -107,21 +99,19 @@ UP037 [*] Remove quotes from type annotation
    | |_______________________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-19 19 |     Line]  # Comment''']): ...
-20 20 | 
-21 21 | 
-22    |-def f(a: Foo['''
-   22 |+def f(a: Foo[(
-23 23 | Bar[
-24 24 |     Multi |
-25    |-    Line]  # Comment''']): ...
-   25 |+    Line]  # Comment
-   26 |+)]): ...
-26 27 | 
-27 28 | 
-28 29 | def f(a: '''list[int]
+19 |     Line]  # Comment''']): ...
+20 | 
+21 | 
+   - def f(a: Foo['''
+22 + def f(a: Foo[(
+23 | Bar[
+24 |     Multi |
+   -     Line]  # Comment''']): ...
+25 +     Line]  # Comment
+26 + )]): ...
+27 | 
+28 | 
+29 | def f(a: '''list[int]
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:28:10
@@ -132,18 +122,16 @@ UP037 [*] Remove quotes from type annotation
    | |_______^
    |
 help: Remove quotes
-
-ℹ Safe fix
-25 25 |     Line]  # Comment''']): ...
-26 26 | 
-27 27 | 
-28    |-def f(a: '''list[int]
-29    |-	''' = []): ...
-   28 |+def f(a: list[int]
-   29 |+	 = []): ...
-30 30 | 
-31 31 | 
-32 32 | a: '''\\
+25 |     Line]  # Comment''']): ...
+26 | 
+27 | 
+   - def f(a: '''list[int]
+   - 	''' = []): ...
+28 + def f(a: list[int]
+29 + 	 = []): ...
+30 | 
+31 | 
+32 | a: '''\\
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:32:4
@@ -154,18 +142,16 @@ UP037 [*] Remove quotes from type annotation
    | |____________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-29 29 | 	''' = []): ...
-30 30 | 
-31 31 | 
-32    |-a: '''\\
-33    |-list[int]''' = [42]
-   32 |+a: (\
-   33 |+list[int]) = [42]
-34 34 | 
-35 35 | 
-36 36 | def f(a: '''
+29 | 	''' = []): ...
+30 | 
+31 | 
+   - a: '''\\
+   - list[int]''' = [42]
+32 + a: (\
+33 + list[int]) = [42]
+34 | 
+35 | 
+36 | def f(a: '''
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:36:10
@@ -177,19 +163,17 @@ UP037 [*] Remove quotes from type annotation
    | |_______^
    |
 help: Remove quotes
-
-ℹ Safe fix
-33 33 | list[int]''' = [42]
-34 34 | 
-35 35 | 
-36    |-def f(a: '''
-   36 |+def f(a: 
-37 37 | 	list[int]
-38    |-	''' = []): ...
-   38 |+	 = []): ...
-39 39 | 
-40 40 | 
-41 41 | def f(a: Foo['''
+33 | list[int]''' = [42]
+34 | 
+35 | 
+   - def f(a: '''
+36 + def f(a: 
+37 | 	list[int]
+   - 	''' = []): ...
+38 + 	 = []): ...
+39 | 
+40 | 
+41 | def f(a: Foo['''
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:41:14
@@ -204,23 +188,21 @@ UP037 [*] Remove quotes from type annotation
    | |___________________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-38 38 | 	''' = []): ...
-39 39 | 
-40 40 | 
-41    |-def f(a: Foo['''
-   41 |+def f(a: Foo[(
-42 42 |     Bar
-43 43 |     [
-44 44 |     Multi |
-45 45 |     Line
-46    |-    ]  # Comment''']): ...
-   46 |+    ]  # Comment
-   47 |+)]): ...
-47 48 | 
-48 49 | 
-49 50 | a: '''list
+38 | 	''' = []): ...
+39 | 
+40 | 
+   - def f(a: Foo['''
+41 + def f(a: Foo[(
+42 |     Bar
+43 |     [
+44 |     Multi |
+45 |     Line
+   -     ]  # Comment''']): ...
+46 +     ]  # Comment
+47 + )]): ...
+48 | 
+49 | 
+50 | a: '''list
 
 UP037 [*] Remove quotes from type annotation
   --> UP037_2.pyi:49:4
@@ -231,12 +213,10 @@ UP037 [*] Remove quotes from type annotation
    | |________^
    |
 help: Remove quotes
-
-ℹ Safe fix
-46 46 |     ]  # Comment''']): ...
-47 47 | 
-48 48 | 
-49    |-a: '''list
-50    |-[int]''' = [42]
-   49 |+a: (list
-   50 |+[int]) = [42]
+46 |     ]  # Comment''']): ...
+47 | 
+48 | 
+   - a: '''list
+   - [int]''' = [42]
+49 + a: (list
+50 + [int]) = [42]
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap
index be9313bc3f..4f4d2ab057 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap
@@ -11,16 +11,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 11 |     pass
    |
 help: Replace `socket.timeout` with builtin `TimeoutError`
-
-ℹ Safe fix
-7  7  | 
-8  8  | try:
-9  9  |     pass
-10    |-except socket.timeout:
-   10 |+except TimeoutError:
-11 11 |     pass
-12 12 | 
-13 13 | # Should NOT be in parentheses when replaced
+7  | 
+8  | try:
+9  |     pass
+   - except socket.timeout:
+10 + except TimeoutError:
+11 |     pass
+12 | 
+13 | # Should NOT be in parentheses when replaced
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:22:8
@@ -32,16 +30,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 23 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-19 19 | 
-20 20 | try:
-21 21 |     pass
-22    |-except (socket.timeout,):
-   22 |+except TimeoutError:
-23 23 |     pass
-24 24 | 
-25 25 | try:
+19 | 
+20 | try:
+21 |     pass
+   - except (socket.timeout,):
+22 + except TimeoutError:
+23 |     pass
+24 | 
+25 | try:
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:27:8
@@ -53,16 +49,14 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 28 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-24 24 | 
-25 25 | try:
-26 26 |     pass
-27    |-except (asyncio.TimeoutError, socket.timeout,):
-   27 |+except (TimeoutError, asyncio.TimeoutError):
-28 28 |     pass
-29 29 | 
-30 30 | # Should be kept in parentheses (because multiple)
+24 | 
+25 | try:
+26 |     pass
+   - except (asyncio.TimeoutError, socket.timeout,):
+27 + except (TimeoutError, asyncio.TimeoutError):
+28 |     pass
+29 | 
+30 | # Should be kept in parentheses (because multiple)
 
 UP041 [*] Replace aliased errors with `TimeoutError`
   --> UP041.py:34:8
@@ -74,13 +68,11 @@ UP041 [*] Replace aliased errors with `TimeoutError`
 35 |     pass
    |
 help: Replace with builtin `TimeoutError`
-
-ℹ Safe fix
-31 31 | 
-32 32 | try:
-33 33 |     pass
-34    |-except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError):
-   34 |+except (asyncio.TimeoutError, KeyError, TimeoutError):
-35 35 |     pass
-36 36 | 
-37 37 | # First should change, second should not
+31 | 
+32 | try:
+33 |     pass
+   - except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError):
+34 + except (asyncio.TimeoutError, KeyError, TimeoutError):
+35 |     pass
+36 | 
+37 | # First should change, second should not
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap
index d3293b6ea9..1f92bdb01b 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap
@@ -10,21 +10,19 @@ UP017 [*] Use `datetime.UTC` alias
    |           ^^^^^^^^^^^^
    |
 help: Convert to `datetime.UTC` alias
-
-ℹ Safe fix
-   1  |+from datetime import UTC
-1  2  | def func():
-2  3  |     import datetime
-3  4  | 
+1  + from datetime import UTC
+2  | def func():
+3  |     import datetime
+4  | 
 --------------------------------------------------------------------------------
-7  8  | def func():
-8  9  |     from datetime import timezone
-9  10 | 
-10    |-    print(timezone.utc)
-   11 |+    print(UTC)
-11 12 | 
-12 13 | 
-13 14 | def func():
+8  | def func():
+9  |     from datetime import timezone
+10 | 
+   -     print(timezone.utc)
+11 +     print(UTC)
+12 | 
+13 | 
+14 | def func():
 
 UP017 [*] Use `datetime.UTC` alias
   --> UP017.py:16:11
@@ -35,21 +33,19 @@ UP017 [*] Use `datetime.UTC` alias
    |           ^^^^^^
    |
 help: Convert to `datetime.UTC` alias
-
-ℹ Safe fix
-   1  |+from datetime import UTC
-1  2  | def func():
-2  3  |     import datetime
-3  4  | 
+1  + from datetime import UTC
+2  | def func():
+3  |     import datetime
+4  | 
 --------------------------------------------------------------------------------
-13 14 | def func():
-14 15 |     from datetime import timezone as tz
-15 16 | 
-16    |-    print(tz.utc)
-   17 |+    print(UTC)
-17 18 | 
-18 19 | 
-19 20 | def func():
+14 | def func():
+15 |     from datetime import timezone as tz
+16 | 
+   -     print(tz.utc)
+17 +     print(UTC)
+18 | 
+19 | 
+20 | def func():
 
 UP017 [*] Use `datetime.UTC` alias
   --> UP017.py:22:11
@@ -60,16 +56,14 @@ UP017 [*] Use `datetime.UTC` alias
    |           ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Convert to `datetime.UTC` alias
-
-ℹ Safe fix
-19 19 | def func():
-20 20 |     import datetime
-21 21 | 
-22    |-    print(datetime.timezone.utc)
-   22 |+    print(datetime.UTC)
-23 23 | 
-24 24 | 
-25 25 | def func():
+19 | def func():
+20 |     import datetime
+21 | 
+   -     print(datetime.timezone.utc)
+22 +     print(datetime.UTC)
+23 | 
+24 | 
+25 | def func():
 
 UP017 [*] Use `datetime.UTC` alias
   --> UP017.py:28:11
@@ -80,10 +74,8 @@ UP017 [*] Use `datetime.UTC` alias
    |           ^^^^^^^^^^^^^^^
    |
 help: Convert to `datetime.UTC` alias
-
-ℹ Safe fix
-25 25 | def func():
-26 26 |     import datetime as dt
-27 27 | 
-28    |-    print(dt.timezone.utc)
-   28 |+    print(dt.UTC)
+25 | def func():
+26 |     import datetime as dt
+27 | 
+   -     print(dt.timezone.utc)
+28 +     print(dt.UTC)
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap
index 6721f49726..6841e62ff9 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap
@@ -10,16 +10,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 36 |     y.append(x)
    |
 help: Replace with `list`
-
-ℹ Safe fix
-31 31 |         return cls(x=0, y=0)
-32 32 | 
-33 33 | 
-34    |-def f(x: int) -> List[int]:
-   34 |+def f(x: int) -> list[int]:
-35 35 |     y = List[int]()
-36 36 |     y.append(x)
-37 37 |     return y
+31 |         return cls(x=0, y=0)
+32 | 
+33 | 
+   - def f(x: int) -> List[int]:
+34 + def f(x: int) -> list[int]:
+35 |     y = List[int]()
+36 |     y.append(x)
+37 |     return y
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> future_annotations.py:35:9
@@ -31,16 +29,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 37 |     return y
    |
 help: Replace with `list`
-
-ℹ Safe fix
-32 32 | 
-33 33 | 
-34 34 | def f(x: int) -> List[int]:
-35    |-    y = List[int]()
-   35 |+    y = list[int]()
-36 36 |     y.append(x)
-37 37 |     return y
-38 38 | 
+32 | 
+33 | 
+34 | def f(x: int) -> List[int]:
+   -     y = List[int]()
+35 +     y = list[int]()
+36 |     y.append(x)
+37 |     return y
+38 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> future_annotations.py:42:27
@@ -51,13 +47,11 @@ UP006 [*] Use `list` instead of `List` for type annotation
    |                           ^^^^
    |
 help: Replace with `list`
-
-ℹ Safe 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]]
+39 | 
+40 | x: Optional[int] = None
+41 | 
+   - MyList: TypeAlias = Union[List[int], List[str]]
+42 + MyList: TypeAlias = Union[list[int], List[str]]
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> future_annotations.py:42:38
@@ -68,10 +62,8 @@ UP006 [*] Use `list` instead of `List` for type annotation
    |                                      ^^^^
    |
 help: Replace with `list`
-
-ℹ Safe 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]]
+39 | 
+40 | x: Optional[int] = None
+41 | 
+   - MyList: TypeAlias = Union[List[int], List[str]]
+42 + MyList: TypeAlias = Union[List[int], list[str]]
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap
index 0958d4f9ed..45d9d11dab 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap
@@ -10,13 +10,12 @@ UP006 [*] Use `list` instead of `List` for type annotation
 36 |     y.append(x)
    |
 help: Replace with `list`
-
-ℹ Unsafe fix
-31 31 |         return cls(x=0, y=0)
-32 32 | 
-33 33 | 
-34    |-def f(x: int) -> List[int]:
-   34 |+def f(x: int) -> list[int]:
-35 35 |     y = List[int]()
-36 36 |     y.append(x)
-37 37 |     return y
+31 |         return cls(x=0, y=0)
+32 | 
+33 | 
+   - def f(x: int) -> List[int]:
+34 + def f(x: int) -> list[int]:
+35 |     y = List[int]()
+36 |     y.append(x)
+37 |     return y
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap
index 6721f49726..6841e62ff9 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap
@@ -10,16 +10,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 36 |     y.append(x)
    |
 help: Replace with `list`
-
-ℹ Safe fix
-31 31 |         return cls(x=0, y=0)
-32 32 | 
-33 33 | 
-34    |-def f(x: int) -> List[int]:
-   34 |+def f(x: int) -> list[int]:
-35 35 |     y = List[int]()
-36 36 |     y.append(x)
-37 37 |     return y
+31 |         return cls(x=0, y=0)
+32 | 
+33 | 
+   - def f(x: int) -> List[int]:
+34 + def f(x: int) -> list[int]:
+35 |     y = List[int]()
+36 |     y.append(x)
+37 |     return y
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> future_annotations.py:35:9
@@ -31,16 +29,14 @@ UP006 [*] Use `list` instead of `List` for type annotation
 37 |     return y
    |
 help: Replace with `list`
-
-ℹ Safe fix
-32 32 | 
-33 33 | 
-34 34 | def f(x: int) -> List[int]:
-35    |-    y = List[int]()
-   35 |+    y = list[int]()
-36 36 |     y.append(x)
-37 37 |     return y
-38 38 | 
+32 | 
+33 | 
+34 | def f(x: int) -> List[int]:
+   -     y = List[int]()
+35 +     y = list[int]()
+36 |     y.append(x)
+37 |     return y
+38 | 
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> future_annotations.py:42:27
@@ -51,13 +47,11 @@ UP006 [*] Use `list` instead of `List` for type annotation
    |                           ^^^^
    |
 help: Replace with `list`
-
-ℹ Safe 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]]
+39 | 
+40 | x: Optional[int] = None
+41 | 
+   - MyList: TypeAlias = Union[List[int], List[str]]
+42 + MyList: TypeAlias = Union[list[int], List[str]]
 
 UP006 [*] Use `list` instead of `List` for type annotation
   --> future_annotations.py:42:38
@@ -68,10 +62,8 @@ UP006 [*] Use `list` instead of `List` for type annotation
    |                                      ^^^^
    |
 help: Replace with `list`
-
-ℹ Safe 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]]
+39 | 
+40 | x: Optional[int] = None
+41 | 
+   - MyList: TypeAlias = Union[List[int], List[str]]
+42 + MyList: TypeAlias = Union[List[int], list[str]]
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap
index 51b92eec81..006f551cf3 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap
@@ -10,12 +10,11 @@ UP045 [*] Use `X | None` for type annotations
 42 | MyList: TypeAlias = Union[List[int], List[str]]
    |
 help: Convert to `X | None`
-
-ℹ Unsafe fix
-37 37 |     return y
-38 38 | 
-39 39 | 
-40    |-x: Optional[int] = None
-   40 |+x: int | None = None
-41 41 | 
-42 42 | MyList: TypeAlias = Union[List[int], List[str]]
+37 |     return y
+38 | 
+39 | 
+   - x: Optional[int] = None
+40 + x: int | None = None
+41 | 
+42 | MyList: TypeAlias = Union[List[int], List[str]]
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap
index dffe011bc4..459cd642a6 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap
@@ -10,15 +10,13 @@ UP045 [*] Use `X | None` for type annotations
 42 | MyList: TypeAlias = Union[List[int], List[str]]
    |
 help: Convert to `X | None`
-
-ℹ Safe fix
-37 37 |     return y
-38 38 | 
-39 39 | 
-40    |-x: Optional[int] = None
-   40 |+x: int | None = None
-41 41 | 
-42 42 | MyList: TypeAlias = Union[List[int], List[str]]
+37 |     return y
+38 | 
+39 | 
+   - x: Optional[int] = None
+40 + x: int | None = None
+41 | 
+42 | MyList: TypeAlias = Union[List[int], List[str]]
 
 UP007 [*] Use `X | Y` for type annotations
   --> future_annotations.py:42:21
@@ -29,10 +27,8 @@ UP007 [*] Use `X | Y` for type annotations
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Convert to `X | Y`
-
-ℹ Safe fix
-39 39 | 
-40 40 | x: Optional[int] = None
-41 41 | 
-42    |-MyList: TypeAlias = Union[List[int], List[str]]
-   42 |+MyList: TypeAlias = List[int] | List[str]
+39 | 
+40 | x: Optional[int] = None
+41 | 
+   - MyList: TypeAlias = Union[List[int], List[str]]
+42 + MyList: TypeAlias = List[int] | List[str]
diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap
index d87e952262..c9a6b5d388 100644
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap
@@ -9,16 +9,15 @@ UP044 [*] Use `*` for unpacking
 7 |     pass
   |
 help: Convert to `*` for unpacking
-
-ℹ Unsafe fix
-3 3 | Shape = TypeVarTuple("Shape")
-4 4 | 
-5 5 | 
-6   |-class C(Generic[Unpack[Shape]]):
-  6 |+class C(Generic[*Shape]):
-7 7 |     pass
-8 8 | 
-9 9 | 
+3 | Shape = TypeVarTuple("Shape")
+4 | 
+5 | 
+  - class C(Generic[Unpack[Shape]]):
+6 + class C(Generic[*Shape]):
+7 |     pass
+8 | 
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP044 [*] Use `*` for unpacking
   --> UP044.py:10:17
@@ -28,16 +27,15 @@ UP044 [*] Use `*` for unpacking
 11 |     pass
    |
 help: Convert to `*` for unpacking
-
-ℹ Unsafe fix
-7  7  |     pass
-8  8  | 
-9  9  | 
-10    |-class D(Generic[Unpack[Shape]]):
-   10 |+class D(Generic[*Shape]):
-11 11 |     pass
-12 12 | 
-13 13 | 
+7  |     pass
+8  | 
+9  | 
+   - class D(Generic[Unpack[Shape]]):
+10 + class D(Generic[*Shape]):
+11 |     pass
+12 | 
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP044 [*] Use `*` for unpacking
   --> UP044.py:14:14
@@ -47,16 +45,15 @@ UP044 [*] Use `*` for unpacking
 15 |     pass
    |
 help: Convert to `*` for unpacking
-
-ℹ Unsafe fix
-11 11 |     pass
-12 12 | 
-13 13 | 
-14    |-def f(*args: Unpack[tuple[int, ...]]):
-   14 |+def f(*args: *tuple[int, ...]):
-15 15 |     pass
-16 16 | 
-17 17 | 
+11 |     pass
+12 | 
+13 | 
+   - def f(*args: Unpack[tuple[int, ...]]):
+14 + def f(*args: *tuple[int, ...]):
+15 |     pass
+16 | 
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP044 [*] Use `*` for unpacking
   --> UP044.py:18:14
@@ -66,16 +63,15 @@ UP044 [*] Use `*` for unpacking
 19 |     pass
    |
 help: Convert to `*` for unpacking
-
-ℹ Unsafe fix
-15 15 |     pass
-16 16 | 
-17 17 | 
-18    |-def f(*args: Unpack[other.Type]):
-   18 |+def f(*args: *other.Type):
-19 19 |     pass
-20 20 | 
-21 21 | 
+15 |     pass
+16 | 
+17 | 
+   - def f(*args: Unpack[other.Type]):
+18 + def f(*args: *other.Type):
+19 |     pass
+20 | 
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 UP044 [*] Use `*` for unpacking
   --> UP044.py:22:27
@@ -85,13 +81,12 @@ UP044 [*] Use `*` for unpacking
 23 |     pass
    |
 help: Convert to `*` for unpacking
-
-ℹ Unsafe fix
-19 19 |     pass
-20 20 | 
-21 21 | 
-22    |-def f(*args: Generic[int, Unpack[int]]):
-   22 |+def f(*args: Generic[int, *int]):
-23 23 |     pass
-24 24 | 
-25 25 |
+19 |     pass
+20 | 
+21 | 
+   - def f(*args: Generic[int, Unpack[int]]):
+22 + def f(*args: Generic[int, *int]):
+23 |     pass
+24 | 
+25 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/helpers.rs b/crates/ruff_linter/src/rules/refurb/helpers.rs
index 0c6749af8c..0a09d70aba 100644
--- a/crates/ruff_linter/src/rules/refurb/helpers.rs
+++ b/crates/ruff_linter/src/rules/refurb/helpers.rs
@@ -1,14 +1,13 @@
 use std::borrow::Cow;
 
-use ruff_python_ast::name::Name;
-use ruff_python_ast::{self as ast, Expr, parenthesize::parenthesized_range};
+use ruff_python_ast::PythonVersion;
+use ruff_python_ast::{self as ast, Expr, name::Name, parenthesize::parenthesized_range};
 use ruff_python_codegen::Generator;
 use ruff_python_semantic::{BindingId, ResolvedReference, SemanticModel};
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
 use crate::{Applicability, Edit, Fix};
-use ruff_python_ast::PythonVersion;
 
 /// Format a code snippet to call `name.method()`.
 pub(super) fn generate_method_call(name: Name, method: &str, generator: Generator) -> String {
@@ -17,7 +16,7 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato
         id: name,
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Construct `name.method`.
     let attr = ast::ExprAttribute {
@@ -25,7 +24,7 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato
         attr: ast::Identifier::new(method.to_string(), TextRange::default()),
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Make it into a call `name.method()`
     let call = ast::ExprCall {
@@ -34,16 +33,16 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato
             args: Box::from([]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // And finally, turn it into a statement.
     let stmt = ast::StmtExpr {
         value: Box::new(call.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     generator.stmt(&stmt.into())
 }
@@ -69,7 +68,7 @@ pub(super) fn replace_with_identity_check(
         ops: [op].into(),
         comparators: [ast::ExprNoneLiteral::default().into()].into(),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     });
 
     let new_content = generator.expr(&new_expr);
@@ -345,12 +344,8 @@ pub(super) fn parenthesize_loop_iter_if_necessary<'a>(
     let iter_in_source = locator.slice(iter);
 
     match iter {
-        ast::Expr::Tuple(tuple) if !tuple.parenthesized => {
-            Cow::Owned(format!("({iter_in_source})"))
-        }
-        ast::Expr::Lambda(_) | ast::Expr::If(_)
-            if matches!(location, IterLocation::Comprehension) =>
-        {
+        Expr::Tuple(tuple) if !tuple.parenthesized => Cow::Owned(format!("({iter_in_source})")),
+        Expr::Lambda(_) | Expr::If(_) if matches!(location, IterLocation::Comprehension) => {
             Cow::Owned(format!("({iter_in_source})"))
         }
         _ => Cow::Borrowed(iter_in_source),
diff --git a/crates/ruff_linter/src/rules/refurb/mod.rs b/crates/ruff_linter/src/rules/refurb/mod.rs
index 9187853141..97d9fae7a6 100644
--- a/crates/ruff_linter/src/rules/refurb/mod.rs
+++ b/crates/ruff_linter/src/rules/refurb/mod.rs
@@ -12,6 +12,7 @@ mod tests {
     use test_case::test_case;
 
     use crate::registry::Rule;
+    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
@@ -62,6 +63,25 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::ReadWholeFile, Path::new("FURB101.py"))]
+    #[test_case(Rule::WriteWholeFile, Path::new("FURB103.py"))]
+    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!(
+            "preview_{}_{}",
+            rule_code.noqa_code(),
+            path.to_string_lossy()
+        );
+        let diagnostics = test_path(
+            Path::new("refurb").join(path).as_path(),
+            &settings::LinterSettings {
+                preview: PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
+
     #[test]
     fn write_whole_file_python_39() -> Result<()> {
         let diagnostics = test_path(
diff --git a/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs b/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs
index 1dd8d9c89e..b86c6e9d9e 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs
@@ -39,6 +39,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// ## References
 /// - [Python documentation:`int.bit_count`](https://docs.python.org/3/library/stdtypes.html#int.bit_count)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct BitCount {
     existing: SourceCodeSnippet,
     replacement: SourceCodeSnippet,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs b/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs
index ed2494f24b..b28b06d4a9 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs
@@ -40,6 +40,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `set.discard()`](https://docs.python.org/3/library/stdtypes.html?highlight=list#frozenset.discard)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct CheckAndRemoveFromSet {
     element: SourceCodeSnippet,
     set: String,
@@ -185,7 +186,7 @@ fn make_suggestion(set: &ast::ExprName, element: &Expr, generator: Generator) ->
         attr: ast::Identifier::new("discard".to_string(), TextRange::default()),
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Make the actual call `set.discard(element)`
     let call = ast::ExprCall {
@@ -194,16 +195,16 @@ fn make_suggestion(set: &ast::ExprName, element: &Expr, generator: Generator) ->
             args: Box::from([element.clone()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // And finally, turn it into a statement.
     let stmt = ast::StmtExpr {
         value: Box::new(call.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     generator.stmt(&stmt.into())
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs b/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs
index 2fce83de33..08ffd45463 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs
@@ -44,6 +44,7 @@ use crate::rules::refurb::helpers::generate_method_call;
 /// - [Python documentation: Mutable Sequence Types](https://docs.python.org/3/library/stdtypes.html?highlight=list#mutable-sequence-types)
 /// - [Python documentation: `dict.clear()`](https://docs.python.org/3/library/stdtypes.html?highlight=list#dict.clear)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.287")]
 pub(crate) struct DeleteFullSlice;
 
 impl Violation for DeleteFullSlice {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/for_loop_set_mutations.rs b/crates/ruff_linter/src/rules/refurb/rules/for_loop_set_mutations.rs
index 609c0dd260..202f509557 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/for_loop_set_mutations.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/for_loop_set_mutations.rs
@@ -44,6 +44,7 @@ use crate::rules::refurb::helpers::parenthesize_loop_iter_if_necessary;
 /// ## References
 /// - [Python documentation: `set`](https://docs.python.org/3/library/stdtypes.html#set)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.5")]
 pub(crate) struct ForLoopSetMutations {
     method_name: &'static str,
     batch_method_name: &'static str,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/for_loop_writes.rs b/crates/ruff_linter/src/rules/refurb/rules/for_loop_writes.rs
index 8f20877817..23d24788ca 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/for_loop_writes.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/for_loop_writes.rs
@@ -47,6 +47,7 @@ use crate::rules::refurb::helpers::parenthesize_loop_iter_if_necessary;
 /// ## References
 /// - [Python documentation: `io.IOBase.writelines`](https://docs.python.org/3/library/io.html#io.IOBase.writelines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct ForLoopWrites {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/fromisoformat_replace_z.rs b/crates/ruff_linter/src/rules/refurb/rules/fromisoformat_replace_z.rs
index def4bf832e..3622148fbf 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/fromisoformat_replace_z.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/fromisoformat_replace_z.rs
@@ -67,6 +67,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// [iso-8601]: https://www.iso.org/obp/ui/#iso:std:iso:8601
 /// [fromisoformat]: https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct FromisoformatReplaceZ;
 
 impl AlwaysFixableViolation for FromisoformatReplaceZ {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/fstring_number_format.rs b/crates/ruff_linter/src/rules/refurb/rules/fstring_number_format.rs
index c06fe722b0..68c95def5d 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/fstring_number_format.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/fstring_number_format.rs
@@ -31,6 +31,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// are display-only, as they may change the runtime behaviour of the program
 /// or introduce syntax errors.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct FStringNumberFormat {
     replacement: Option<SourceCodeSnippet>,
     base: Base,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/hardcoded_string_charset.rs b/crates/ruff_linter/src/rules/refurb/rules/hardcoded_string_charset.rs
index 0bc22b3a33..151bdc3113 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/hardcoded_string_charset.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/hardcoded_string_charset.rs
@@ -29,6 +29,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: String constants](https://docs.python.org/3/library/string.html#string-constants)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.7.0")]
 pub(crate) struct HardcodedStringCharset {
     name: &'static str,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/hashlib_digest_hex.rs b/crates/ruff_linter/src/rules/refurb/rules/hashlib_digest_hex.rs
index 837e5ed79f..deac83a9d0 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/hashlib_digest_hex.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/hashlib_digest_hex.rs
@@ -31,6 +31,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `hashlib`](https://docs.python.org/3/library/hashlib.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct HashlibDigestHex;
 
 impl Violation for HashlibDigestHex {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/if_exp_instead_of_or_operator.rs b/crates/ruff_linter/src/rules/refurb/rules/if_exp_instead_of_or_operator.rs
index 51047f15bb..fa660587ef 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/if_exp_instead_of_or_operator.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/if_exp_instead_of_or_operator.rs
@@ -39,6 +39,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// (assuming `foo()` returns a truthy value), but only once in
 /// `foo() or bar()`.
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.6")]
 pub(crate) struct IfExpInsteadOfOrOperator;
 
 impl Violation for IfExpInsteadOfOrOperator {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/if_expr_min_max.rs b/crates/ruff_linter/src/rules/refurb/rules/if_expr_min_max.rs
index a514b8704e..a3bfcdd0dd 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/if_expr_min_max.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/if_expr_min_max.rs
@@ -31,6 +31,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `min`](https://docs.python.org/3.11/library/functions.html#min)
 /// - [Python documentation: `max`](https://docs.python.org/3.11/library/functions.html#max)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct IfExprMinMax {
     min_max: MinMax,
     expression: SourceCodeSnippet,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/implicit_cwd.rs b/crates/ruff_linter/src/rules/refurb/rules/implicit_cwd.rs
index 8be3695d80..dffe4feee6 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/implicit_cwd.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/implicit_cwd.rs
@@ -29,6 +29,7 @@ use crate::{checkers::ast::Checker, importer::ImportRequest};
 /// ## References
 /// - [Python documentation: `Path.cwd`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.cwd)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct ImplicitCwd;
 
 impl Violation for ImplicitCwd {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/int_on_sliced_str.rs b/crates/ruff_linter/src/rules/refurb/rules/int_on_sliced_str.rs
index 588569f397..f84fdac8ed 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/int_on_sliced_str.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/int_on_sliced_str.rs
@@ -48,6 +48,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `int`](https://docs.python.org/3/library/functions.html#int)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct IntOnSlicedStr {
     base: u8,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/isinstance_type_none.rs b/crates/ruff_linter/src/rules/refurb/rules/isinstance_type_none.rs
index 4ff1f1c4af..27715d00f8 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/isinstance_type_none.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/isinstance_type_none.rs
@@ -32,6 +32,7 @@ use crate::{FixAvailability, Violation};
 /// - [Python documentation: `type`](https://docs.python.org/3/library/functions.html#type)
 /// - [Python documentation: Identity comparisons](https://docs.python.org/3/reference/expressions.html#is-not)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct IsinstanceTypeNone;
 
 impl Violation for IsinstanceTypeNone {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/list_reverse_copy.rs b/crates/ruff_linter/src/rules/refurb/rules/list_reverse_copy.rs
index bf8e6c6207..b9f894177e 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/list_reverse_copy.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/list_reverse_copy.rs
@@ -47,6 +47,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: More on Lists](https://docs.python.org/3/tutorial/datastructures.html#more-on-lists)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct ListReverseCopy {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/math_constant.rs b/crates/ruff_linter/src/rules/refurb/rules/math_constant.rs
index c2db8c2c7e..8672237644 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/math_constant.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/math_constant.rs
@@ -28,6 +28,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `math` constants](https://docs.python.org/3/library/math.html#constants)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.6")]
 pub(crate) struct MathConstant {
     literal: String,
     constant: &'static str,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/metaclass_abcmeta.rs b/crates/ruff_linter/src/rules/refurb/rules/metaclass_abcmeta.rs
index cdc1646e85..7e5a432968 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/metaclass_abcmeta.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/metaclass_abcmeta.rs
@@ -47,6 +47,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python documentation: `abc.ABC`](https://docs.python.org/3/library/abc.html#abc.ABC)
 /// - [Python documentation: `abc.ABCMeta`](https://docs.python.org/3/library/abc.html#abc.ABCMeta)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.0")]
 pub(crate) struct MetaClassABCMeta;
 
 impl AlwaysFixableViolation for MetaClassABCMeta {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs b/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs
index b0b17456ab..2b8ecfab45 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs
@@ -30,9 +30,15 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// print()
 /// ```
 ///
+/// ## Fix safety
+/// This fix is marked as unsafe if it removes an unused `sep` keyword argument
+/// that may have side effects. Removing such arguments may change the program's
+/// behavior by skipping the execution of those side effects.
+///
 /// ## References
 /// - [Python documentation: `print`](https://docs.python.org/3/library/functions.html#print)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct PrintEmptyString {
     reason: Reason,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs b/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs
index cb18f0ff90..b64f91829a 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs
@@ -1,14 +1,17 @@
+use ruff_diagnostics::{Applicability, Edit, Fix};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::visitor::{self, Visitor};
-use ruff_python_ast::{self as ast, Expr};
+use ruff_python_ast::{
+    self as ast, Expr, Stmt,
+    visitor::{self, Visitor},
+};
 use ruff_python_codegen::Generator;
 use ruff_text_size::{Ranged, TextRange};
 
-use crate::Violation;
 use crate::checkers::ast::Checker;
 use crate::fix::snippet::SourceCodeSnippet;
-
+use crate::importer::ImportRequest;
 use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
+use crate::{FixAvailability, Violation};
 
 /// ## What it does
 /// Checks for uses of `open` and `read` that can be replaced by `pathlib`
@@ -31,23 +34,36 @@ use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
 ///
 /// contents = Path(filename).read_text()
 /// ```
+/// ## Fix Safety
+/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
 ///
 /// ## References
 /// - [Python documentation: `Path.read_bytes`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.read_bytes)
 /// - [Python documentation: `Path.read_text`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.read_text)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.2")]
 pub(crate) struct ReadWholeFile {
     filename: SourceCodeSnippet,
     suggestion: SourceCodeSnippet,
 }
 
 impl Violation for ReadWholeFile {
+    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let filename = self.filename.truncated_display();
         let suggestion = self.suggestion.truncated_display();
         format!("`open` and `read` should be replaced by `Path({filename}).{suggestion}`")
     }
+
+    fn fix_title(&self) -> Option<String> {
+        Some(format!(
+            "Replace with `Path({}).{}`",
+            self.filename.truncated_display(),
+            self.suggestion.truncated_display(),
+        ))
+    }
 }
 
 /// FURB101
@@ -64,7 +80,7 @@ pub(crate) fn read_whole_file(checker: &Checker, with: &ast::StmtWith) {
     }
 
     // Then we need to match each `open` operation with exactly one `read` call.
-    let mut matcher = ReadMatcher::new(checker, candidates);
+    let mut matcher = ReadMatcher::new(checker, candidates, with);
     visitor::walk_body(&mut matcher, &with.body);
 }
 
@@ -72,13 +88,19 @@ pub(crate) fn read_whole_file(checker: &Checker, with: &ast::StmtWith) {
 struct ReadMatcher<'a, 'b> {
     checker: &'a Checker<'b>,
     candidates: Vec<FileOpen<'a>>,
+    with_stmt: &'a ast::StmtWith,
 }
 
 impl<'a, 'b> ReadMatcher<'a, 'b> {
-    fn new(checker: &'a Checker<'b>, candidates: Vec<FileOpen<'a>>) -> Self {
+    fn new(
+        checker: &'a Checker<'b>,
+        candidates: Vec<FileOpen<'a>>,
+        with_stmt: &'a ast::StmtWith,
+    ) -> Self {
         Self {
             checker,
             candidates,
+            with_stmt,
         }
     }
 }
@@ -92,15 +114,38 @@ impl<'a> Visitor<'a> for ReadMatcher<'a, '_> {
                 .position(|open| open.is_ref(read_from))
             {
                 let open = self.candidates.remove(open);
-                self.checker.report_diagnostic(
+                let suggestion = make_suggestion(&open, self.checker.generator());
+                let mut diagnostic = self.checker.report_diagnostic(
                     ReadWholeFile {
                         filename: SourceCodeSnippet::from_str(
                             &self.checker.generator().expr(open.filename),
                         ),
-                        suggestion: make_suggestion(&open, self.checker.generator()),
+                        suggestion: SourceCodeSnippet::from_str(&suggestion),
                     },
                     open.item.range(),
                 );
+
+                if !crate::preview::is_fix_read_whole_file_enabled(self.checker.settings()) {
+                    return;
+                }
+
+                let target = match self.with_stmt.body.first() {
+                    Some(Stmt::Assign(assign))
+                        if assign.value.range().contains_range(expr.range()) =>
+                    {
+                        match assign.targets.first() {
+                            Some(Expr::Name(name)) => Some(name.id.as_str()),
+                            _ => None,
+                        }
+                    }
+                    _ => None,
+                };
+
+                if let Some(fix) =
+                    generate_fix(self.checker, &open, target, self.with_stmt, &suggestion)
+                {
+                    diagnostic.set_fix(fix);
+                }
             }
             return;
         }
@@ -125,12 +170,12 @@ fn match_read_call(expr: &Expr) -> Option<&Expr> {
     Some(&*attr.value)
 }
 
-fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> SourceCodeSnippet {
+fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> String {
     let name = ast::ExprName {
         id: open.mode.pathlib_method(),
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let call = ast::ExprCall {
         func: Box::new(name.into()),
@@ -138,10 +183,51 @@ fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> SourceCodeSnipp
             args: Box::from([]),
             keywords: open.keywords.iter().copied().cloned().collect(),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
-    SourceCodeSnippet::from_str(&generator.expr(&call.into()))
+    generator.expr(&call.into())
+}
+
+fn generate_fix(
+    checker: &Checker,
+    open: &FileOpen,
+    target: Option<&str>,
+    with_stmt: &ast::StmtWith,
+    suggestion: &str,
+) -> Option<Fix> {
+    if !(with_stmt.items.len() == 1 && matches!(with_stmt.body.as_slice(), [Stmt::Assign(_)])) {
+        return None;
+    }
+
+    let locator = checker.locator();
+    let filename_code = locator.slice(open.filename.range());
+
+    let (import_edit, binding) = checker
+        .importer()
+        .get_or_import_symbol(
+            &ImportRequest::import("pathlib", "Path"),
+            with_stmt.start(),
+            checker.semantic(),
+        )
+        .ok()?;
+
+    let replacement = match target {
+        Some(var) => format!("{var} = {binding}({filename_code}).{suggestion}"),
+        None => format!("{binding}({filename_code}).{suggestion}"),
+    };
+
+    let applicability = if checker.comment_ranges().intersects(with_stmt.range()) {
+        Applicability::Unsafe
+    } else {
+        Applicability::Safe
+    };
+
+    Some(Fix::applicable_edits(
+        Edit::range_replacement(replacement, with_stmt.range()),
+        [import_edit],
+        applicability,
+    ))
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/readlines_in_for.rs b/crates/ruff_linter/src/rules/refurb/rules/readlines_in_for.rs
index 6bdbf94184..a6ea1eb570 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/readlines_in_for.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/readlines_in_for.rs
@@ -48,6 +48,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `io.IOBase.readlines`](https://docs.python.org/3/library/io.html#io.IOBase.readlines)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct ReadlinesInFor;
 
 impl AlwaysFixableViolation for ReadlinesInFor {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/redundant_log_base.rs b/crates/ruff_linter/src/rules/refurb/rules/redundant_log_base.rs
index dc8081cc63..a54bd261d1 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/redundant_log_base.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/redundant_log_base.rs
@@ -51,6 +51,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `math.log10`](https://docs.python.org/3/library/math.html#math.log10)
 /// - [Python documentation: `math.e`](https://docs.python.org/3/library/math.html#math.e)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct RedundantLogBase {
     base: Base,
     arg: String,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/regex_flag_alias.rs b/crates/ruff_linter/src/rules/refurb/rules/regex_flag_alias.rs
index 3ea5561cd8..5d8b332475 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/regex_flag_alias.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/regex_flag_alias.rs
@@ -32,6 +32,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct RegexFlagAlias {
     flag: RegexFlag,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_operator.rs b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_operator.rs
index 9f2a227538..963a094498 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_operator.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_operator.rs
@@ -69,6 +69,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// [descriptors]: https://docs.python.org/3/howto/descriptor.html
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.9")]
 pub(crate) struct ReimplementedOperator {
     operator: Operator,
     target: FunctionLikeKind,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs
index 874e6620d2..d9501a645b 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs
@@ -46,6 +46,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// [PEP 709]: https://peps.python.org/pep-0709/
 /// [#7771]: https://github.com/astral-sh/ruff/issues/7771
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.291")]
 pub(crate) struct ReimplementedStarmap;
 
 impl Violation for ReimplementedStarmap {
@@ -298,7 +299,7 @@ fn construct_starmap_call(starmap_binding: Name, iter: &Expr, func: &Expr) -> as
         id: starmap_binding,
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     ast::ExprCall {
         func: Box::new(starmap.into()),
@@ -306,10 +307,10 @@ fn construct_starmap_call(starmap_binding: Name, iter: &Expr, func: &Expr) -> as
             args: Box::from([func.clone(), iter.clone()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     }
 }
 
@@ -319,7 +320,7 @@ fn wrap_with_call_to(call: ast::ExprCall, func_name: Name) -> ast::ExprCall {
         id: func_name,
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     ast::ExprCall {
         func: Box::new(name.into()),
@@ -327,10 +328,10 @@ fn wrap_with_call_to(call: ast::ExprCall, func_name: Name) -> ast::ExprCall {
             args: Box::from([call.into()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     }
 }
 
diff --git a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs
index d3c8259ec9..8d797d9c54 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs
@@ -45,6 +45,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: More on Lists](https://docs.python.org/3/tutorial/datastructures.html#more-on-lists)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.287")]
 pub(crate) struct RepeatedAppend {
     name: String,
     replacement: SourceCodeSnippet,
@@ -342,7 +343,7 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String {
         elts,
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         parenthesized: true,
     };
     // Make `var.extend`.
@@ -352,7 +353,7 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String {
         attr: ast::Identifier::new("extend".to_string(), TextRange::default()),
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Make the actual call `var.extend((elt1, elt2, ..., eltN))`
     let call = ast::ExprCall {
@@ -361,16 +362,16 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String {
             args: Box::from([tuple.into()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // And finally, turn it into a statement.
     let stmt = ast::StmtExpr {
         value: Box::new(call.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     generator.stmt(&stmt.into())
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/repeated_global.rs b/crates/ruff_linter/src/rules/refurb/rules/repeated_global.rs
index 685f7124cc..b7aaeb106a 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/repeated_global.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/repeated_global.rs
@@ -37,6 +37,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// - [Python documentation: the `global` statement](https://docs.python.org/3/reference/simple_stmts.html#the-global-statement)
 /// - [Python documentation: the `nonlocal` statement](https://docs.python.org/3/reference/simple_stmts.html#the-nonlocal-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.4.9")]
 pub(crate) struct RepeatedGlobal {
     global_kind: GlobalKind,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/single_item_membership_test.rs b/crates/ruff_linter/src/rules/refurb/rules/single_item_membership_test.rs
index baecccb9e8..1df2fdde78 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/single_item_membership_test.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/single_item_membership_test.rs
@@ -6,7 +6,7 @@ use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::fix::edits::pad;
-use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
+use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
 /// Checks for membership tests against single-item containers.
@@ -27,18 +27,22 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ```
 ///
 /// ## Fix safety
+/// The fix is always marked as unsafe.
 ///
-/// When the right-hand side is a string, the fix is marked as unsafe.
-/// This is because `c in "a"` is true both when `c` is `"a"` and when `c` is the empty string,
-/// so the fix can change the behavior of your program in these cases.
+/// When the right-hand side is a string, this fix can change the behavior of your program.
+/// This is because `c in "a"` is true both when `c` is `"a"` and when `c` is the empty string.
 ///
-/// Additionally, if there are comments within the fix's range,
-/// it will also be marked as unsafe.
+/// Additionally, converting `in`/`not in` against a single-item container to `==`/`!=` can
+/// change runtime behavior: `in` may consider identity (e.g., `NaN`) and always
+/// yields a `bool`.
+///
+/// Comments within the replacement range will also be removed.
 ///
 /// ## References
 /// - [Python documentation: Comparisons](https://docs.python.org/3/reference/expressions.html#comparisons)
 /// - [Python documentation: Membership test operations](https://docs.python.org/3/reference/expressions.html#membership-test-operations)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.1.0")]
 pub(crate) struct SingleItemMembershipTest {
     membership_test: MembershipTest,
 }
@@ -100,14 +104,8 @@ pub(crate) fn single_item_membership_test(
         expr.range(),
     );
 
-    let applicability =
-        if right.is_string_literal_expr() || checker.comment_ranges().intersects(expr.range()) {
-            Applicability::Unsafe
-        } else {
-            Applicability::Safe
-        };
-
-    let fix = Fix::applicable_edit(edit, applicability);
+    // All supported cases can change runtime behavior; mark as unsafe.
+    let fix = Fix::unsafe_edit(edit);
 
     checker
         .report_diagnostic(SingleItemMembershipTest { membership_test }, expr.range())
diff --git a/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs b/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs
index 91b7903889..33cdeb1bd6 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs
@@ -37,6 +37,7 @@ use crate::rules::refurb::helpers::generate_method_call;
 /// ## References
 /// - [Python documentation: Mutable Sequence Types](https://docs.python.org/3/library/stdtypes.html#mutable-sequence-types)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.290")]
 pub(crate) struct SliceCopy;
 
 impl Violation for SliceCopy {
diff --git a/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs b/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs
index 0cfd94f3bc..10c0f8d8a3 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs
@@ -38,6 +38,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     text = text.removeprefix("pre")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct SliceToRemovePrefixOrSuffix {
     affix_kind: AffixKind,
     stmt_or_expression: StmtOrExpr,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/sorted_min_max.rs b/crates/ruff_linter/src/rules/refurb/rules/sorted_min_max.rs
index 41965dc04f..a6187ccaee 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/sorted_min_max.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/sorted_min_max.rs
@@ -47,6 +47,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `min`](https://docs.python.org/3/library/functions.html#min)
 /// - [Python documentation: `max`](https://docs.python.org/3/library/functions.html#max)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.4.2")]
 pub(crate) struct SortedMinMax {
     min_max: MinMax,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/subclass_builtin.rs b/crates/ruff_linter/src/rules/refurb/rules/subclass_builtin.rs
index 7d92379b36..20cb03109a 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/subclass_builtin.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/subclass_builtin.rs
@@ -57,6 +57,7 @@ use crate::{checkers::ast::Checker, importer::ImportRequest};
 ///
 /// - [Python documentation: `collections`](https://docs.python.org/3/library/collections.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.7.3")]
 pub(crate) struct SubclassBuiltin {
     subclass: String,
     replacement: String,
diff --git a/crates/ruff_linter/src/rules/refurb/rules/type_none_comparison.rs b/crates/ruff_linter/src/rules/refurb/rules/type_none_comparison.rs
index b498a5ee49..7057458aef 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/type_none_comparison.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/type_none_comparison.rs
@@ -32,6 +32,7 @@ use crate::rules::refurb::helpers::replace_with_identity_check;
 /// - [Python documentation: `type`](https://docs.python.org/3/library/functions.html#type)
 /// - [Python documentation: Identity comparisons](https://docs.python.org/3/reference/expressions.html#is-not)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct TypeNoneComparison {
     replacement: IdentityCheck,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs
index db8e3fb1c3..420fe0f8c6 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs
@@ -58,6 +58,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `range`](https://docs.python.org/3/library/stdtypes.html#range)
 /// - [Python documentation: `len`](https://docs.python.org/3/library/functions.html#len)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.0.291")]
 pub(crate) struct UnnecessaryEnumerate {
     subset: EnumerateSubset,
 }
@@ -232,7 +233,7 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String {
         id: name,
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Construct `len(name)`.
     let len = ast::ExprCall {
@@ -241,7 +242,7 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String {
                 id: Name::new_static("len"),
                 ctx: ast::ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
         ),
@@ -249,10 +250,10 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String {
             args: Box::from([var.into()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Construct `range(len(name))`.
     let range = ast::ExprCall {
@@ -261,7 +262,7 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String {
                 id: Name::new_static("range"),
                 ctx: ast::ExprContext::Load,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }
             .into(),
         ),
@@ -269,16 +270,16 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String {
             args: Box::from([len.into()]),
             keywords: Box::from([]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // And finally, turn it into a statement.
     let stmt = ast::StmtExpr {
         value: Box::new(range.into()),
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     generator.stmt(&stmt.into())
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_from_float.rs b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_from_float.rs
index dfa074a55a..e34357bd55 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_from_float.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_from_float.rs
@@ -60,6 +60,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `decimal`](https://docs.python.org/3/library/decimal.html)
 /// - [Python documentation: `fractions`](https://docs.python.org/3/library/fractions.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.5")]
 pub(crate) struct UnnecessaryFromFloat {
     method_name: MethodName,
     constructor: Constructor,
@@ -293,7 +294,19 @@ fn handle_non_finite_float_special_case(
         return None;
     };
     let normalized = as_non_finite_float_string_literal(float_arg)?;
-    let replacement_text = format!(r#"{constructor_name}("{normalized}")"#);
+    let replacement_text = format!(
+        r#"{constructor_name}("{}")"#,
+        // `Decimal.from_float(float(" -nan")) == Decimal("nan")`
+        if normalized == "-nan" {
+            // Here we do not attempt to remove just the '-' character.
+            // It may have been encoded (e.g. as '\N{hyphen-minus}')
+            // in the original source slice, and the added complexity
+            // does not make sense for this edge case.
+            "nan"
+        } else {
+            normalized
+        }
+    );
     Some(Edit::range_replacement(replacement_text, call.range()))
 }
 
diff --git a/crates/ruff_linter/src/rules/refurb/rules/verbose_decimal_constructor.rs b/crates/ruff_linter/src/rules/refurb/rules/verbose_decimal_constructor.rs
index b4c7e8a493..04d169e3f6 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/verbose_decimal_constructor.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/verbose_decimal_constructor.rs
@@ -47,6 +47,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `decimal`](https://docs.python.org/3/library/decimal.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct VerboseDecimalConstructor {
     replacement: String,
 }
diff --git a/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs b/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs
index 2440f4236c..bbee6dcb5a 100644
--- a/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs
@@ -1,15 +1,19 @@
+use ruff_diagnostics::{Applicability, Edit, Fix};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::relocate::relocate_expr;
-use ruff_python_ast::visitor::{self, Visitor};
-use ruff_python_ast::{self as ast, Expr, Stmt};
+use ruff_python_ast::{
+    self as ast, Expr, Stmt,
+    relocate::relocate_expr,
+    visitor::{self, Visitor},
+};
+
 use ruff_python_codegen::Generator;
 use ruff_text_size::{Ranged, TextRange};
 
-use crate::Violation;
 use crate::checkers::ast::Checker;
 use crate::fix::snippet::SourceCodeSnippet;
-
+use crate::importer::ImportRequest;
 use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
+use crate::{FixAvailability, Violation};
 
 /// ## What it does
 /// Checks for uses of `open` and `write` that can be replaced by `pathlib`
@@ -33,22 +37,35 @@ use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
 /// Path(filename).write_text(contents)
 /// ```
 ///
+/// ## Fix Safety
+/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
+///
 /// ## References
 /// - [Python documentation: `Path.write_bytes`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.write_bytes)
 /// - [Python documentation: `Path.write_text`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.write_text)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.3.6")]
 pub(crate) struct WriteWholeFile {
     filename: SourceCodeSnippet,
     suggestion: SourceCodeSnippet,
 }
 
 impl Violation for WriteWholeFile {
+    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let filename = self.filename.truncated_display();
         let suggestion = self.suggestion.truncated_display();
         format!("`open` and `write` should be replaced by `Path({filename}).{suggestion}`")
     }
+    fn fix_title(&self) -> Option<String> {
+        Some(format!(
+            "Replace with `Path({}).{}`",
+            self.filename.truncated_display(),
+            self.suggestion.truncated_display(),
+        ))
+    }
 }
 
 /// FURB103
@@ -65,7 +82,7 @@ pub(crate) fn write_whole_file(checker: &Checker, with: &ast::StmtWith) {
     }
 
     // Then we need to match each `open` operation with exactly one `write` call.
-    let mut matcher = WriteMatcher::new(checker, candidates);
+    let mut matcher = WriteMatcher::new(checker, candidates, with);
     visitor::walk_body(&mut matcher, &with.body);
 }
 
@@ -74,21 +91,27 @@ struct WriteMatcher<'a, 'b> {
     checker: &'a Checker<'b>,
     candidates: Vec<FileOpen<'a>>,
     loop_counter: u32,
+    with_stmt: &'a ast::StmtWith,
 }
 
 impl<'a, 'b> WriteMatcher<'a, 'b> {
-    fn new(checker: &'a Checker<'b>, candidates: Vec<FileOpen<'a>>) -> Self {
+    fn new(
+        checker: &'a Checker<'b>,
+        candidates: Vec<FileOpen<'a>>,
+        with_stmt: &'a ast::StmtWith,
+    ) -> Self {
         Self {
             checker,
             candidates,
             loop_counter: 0,
+            with_stmt,
         }
     }
 }
 
 impl<'a> Visitor<'a> for WriteMatcher<'a, '_> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        if matches!(stmt, ast::Stmt::While(_) | ast::Stmt::For(_)) {
+        if matches!(stmt, Stmt::While(_) | Stmt::For(_)) {
             self.loop_counter += 1;
             visitor::walk_stmt(self, stmt);
             self.loop_counter -= 1;
@@ -104,19 +127,30 @@ impl<'a> Visitor<'a> for WriteMatcher<'a, '_> {
                 .iter()
                 .position(|open| open.is_ref(write_to))
             {
+                let open = self.candidates.remove(open);
+
                 if self.loop_counter == 0 {
-                    let open = self.candidates.remove(open);
-                    self.checker.report_diagnostic(
+                    let suggestion = make_suggestion(&open, content, self.checker.generator());
+
+                    let mut diagnostic = self.checker.report_diagnostic(
                         WriteWholeFile {
                             filename: SourceCodeSnippet::from_str(
                                 &self.checker.generator().expr(open.filename),
                             ),
-                            suggestion: make_suggestion(&open, content, self.checker.generator()),
+                            suggestion: SourceCodeSnippet::from_str(&suggestion),
                         },
                         open.item.range(),
                     );
-                } else {
-                    self.candidates.remove(open);
+
+                    if !crate::preview::is_fix_write_whole_file_enabled(self.checker.settings()) {
+                        return;
+                    }
+
+                    if let Some(fix) =
+                        generate_fix(self.checker, &open, self.with_stmt, &suggestion)
+                    {
+                        diagnostic.set_fix(fix);
+                    }
                 }
             }
             return;
@@ -143,12 +177,12 @@ fn match_write_call(expr: &Expr) -> Option<(&Expr, &Expr)> {
     Some((&*attr.value, call.arguments.args.first()?))
 }
 
-fn make_suggestion(open: &FileOpen<'_>, arg: &Expr, generator: Generator) -> SourceCodeSnippet {
+fn make_suggestion(open: &FileOpen<'_>, arg: &Expr, generator: Generator) -> String {
     let name = ast::ExprName {
         id: open.mode.pathlib_method(),
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let mut arg = arg.clone();
     relocate_expr(&mut arg, TextRange::default());
@@ -158,10 +192,47 @@ fn make_suggestion(open: &FileOpen<'_>, arg: &Expr, generator: Generator) -> Sou
             args: Box::new([arg]),
             keywords: open.keywords.iter().copied().cloned().collect(),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         },
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
-    SourceCodeSnippet::from_str(&generator.expr(&call.into()))
+    generator.expr(&call.into())
+}
+
+fn generate_fix(
+    checker: &Checker,
+    open: &FileOpen,
+    with_stmt: &ast::StmtWith,
+    suggestion: &str,
+) -> Option<Fix> {
+    if !(with_stmt.items.len() == 1 && matches!(with_stmt.body.as_slice(), [Stmt::Expr(_)])) {
+        return None;
+    }
+
+    let locator = checker.locator();
+    let filename_code = locator.slice(open.filename.range());
+
+    let (import_edit, binding) = checker
+        .importer()
+        .get_or_import_symbol(
+            &ImportRequest::import("pathlib", "Path"),
+            with_stmt.start(),
+            checker.semantic(),
+        )
+        .ok()?;
+
+    let replacement = format!("{binding}({filename_code}).{suggestion}");
+
+    let applicability = if checker.comment_ranges().intersects(with_stmt.range()) {
+        Applicability::Unsafe
+    } else {
+        Applicability::Safe
+    };
+
+    Some(Fix::applicable_edits(
+        Edit::range_replacement(replacement, with_stmt.range()),
+        [import_edit],
+        applicability,
+    ))
 }
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101.py.snap
index c5a417db0d..3f851c3f12 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101.py.snap
@@ -9,6 +9,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
    |      ^^^^^^^^^^^^^^^^^^^^^
 13 |     x = f.read()
    |
+help: Replace with `Path("file.txt").read_text()`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
   --> FURB101.py:16:6
@@ -18,6 +19,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 17 |     x = f.read()
    |
+help: Replace with `Path("file.txt").read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
   --> FURB101.py:20:6
@@ -27,6 +29,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 21 |     x = f.read()
    |
+help: Replace with `Path("file.txt").read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf8")`
   --> FURB101.py:24:6
@@ -36,6 +39,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(enco
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 25 |     x = f.read()
    |
+help: Replace with `Path("file.txt").read_text(encoding="utf8")`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(errors="ignore")`
   --> FURB101.py:28:6
@@ -45,6 +49,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(erro
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 29 |     x = f.read()
    |
+help: Replace with `Path("file.txt").read_text(errors="ignore")`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
   --> FURB101.py:32:6
@@ -54,6 +59,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 33 |     x = f.read()
    |
+help: Replace with `Path("file.txt").read_text()`
 
 FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
   --> FURB101.py:36:6
@@ -64,6 +70,7 @@ FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
 37 |     # The body of `with` is non-trivial, but the recommendation holds.
 38 |     bar("pre")
    |
+help: Replace with `Path(foo()).read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
   --> FURB101.py:44:6
@@ -74,6 +81,7 @@ FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
 45 |     x = a.read()
 46 |     y = b.read()
    |
+help: Replace with `Path("a.txt").read_text()`
 
 FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
   --> FURB101.py:44:26
@@ -84,6 +92,7 @@ FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
 45 |     x = a.read()
 46 |     y = b.read()
    |
+help: Replace with `Path("b.txt").read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
   --> FURB101.py:49:18
@@ -94,3 +103,4 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
 50 |     # We have other things in here, multiple with items, but
 51 |     # the user reads the whole file and that bit they can replace.
    |
+help: Replace with `Path("file.txt").read_text()`
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103.py.snap
index 908ac8f6f7..dfb111341e 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103.py.snap
@@ -9,6 +9,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text("t
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^
 13 |     f.write("test")
    |
+help: Replace with `Path("file.txt").write_text("test")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
   --> FURB103.py:16:6
@@ -18,6 +19,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(f
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 17 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_bytes(foobar)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
   --> FURB103.py:20:6
@@ -27,6 +29,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(b
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 21 |     f.write(b"abc")
    |
+help: Replace with `Path("file.txt").write_bytes(b"abc")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
   --> FURB103.py:24:6
@@ -36,6 +39,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 25 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
   --> FURB103.py:28:6
@@ -45,6 +49,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 29 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
   --> FURB103.py:32:6
@@ -54,6 +59,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 33 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar)`
 
 FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
   --> FURB103.py:36:6
@@ -64,6 +70,7 @@ FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())
 37 |     # The body of `with` is non-trivial, but the recommendation holds.
 38 |     bar("pre")
    |
+help: Replace with `Path(foo()).write_bytes(bar())`
 
 FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
   --> FURB103.py:44:6
@@ -74,6 +81,7 @@ FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
 45 |     a.write(x)
 46 |     b.write(y)
    |
+help: Replace with `Path("a.txt").write_text(x)`
 
 FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
   --> FURB103.py:44:31
@@ -84,6 +92,7 @@ FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
 45 |     a.write(x)
 46 |     b.write(y)
    |
+help: Replace with `Path("b.txt").write_bytes(y)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
   --> FURB103.py:49:18
@@ -94,6 +103,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(ba
 50 |     # We have other things in here, multiple with items, but the user
 51 |     # writes a single time to file and that bit they can replace.
    |
+help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
   --> FURB103.py:58:6
@@ -103,6 +113,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 59 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
   --> FURB103.py:66:6
@@ -112,6 +123,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 67 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
   --> FURB103.py:74:6
@@ -121,3 +133,4 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 75 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap
index 7896595ffa..e258e208cb 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap
@@ -12,15 +12,13 @@ FURB105 [*] Unnecessary empty string passed to `print`
 5 | print("", end="bar")
   |
 help: Remove empty string
-
-ℹ Safe fix
-1 1 | # Errors.
-2 2 | 
-3   |-print("")
-  3 |+print()
-4 4 | print("", sep=",")
-5 5 | print("", end="bar")
-6 6 | print("", sep=",", end="bar")
+1 | # Errors.
+2 | 
+  - print("")
+3 + print()
+4 | print("", sep=",")
+5 | print("", end="bar")
+6 | print("", sep=",", end="bar")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
  --> FURB105.py:4:1
@@ -32,16 +30,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 6 | print("", sep=",", end="bar")
   |
 help: Remove empty string and separator
-
-ℹ Safe fix
-1 1 | # Errors.
-2 2 | 
-3 3 | print("")
-4   |-print("", sep=",")
-  4 |+print()
-5 5 | print("", end="bar")
-6 6 | print("", sep=",", end="bar")
-7 7 | print(sep="")
+1 | # Errors.
+2 | 
+3 | print("")
+  - print("", sep=",")
+4 + print()
+5 | print("", end="bar")
+6 | print("", sep=",", end="bar")
+7 | print(sep="")
 
 FURB105 [*] Unnecessary empty string passed to `print`
  --> FURB105.py:5:1
@@ -54,16 +50,14 @@ FURB105 [*] Unnecessary empty string passed to `print`
 7 | print(sep="")
   |
 help: Remove empty string
-
-ℹ Safe fix
-2 2 | 
-3 3 | print("")
-4 4 | print("", sep=",")
-5   |-print("", end="bar")
-  5 |+print(end="bar")
-6 6 | print("", sep=",", end="bar")
-7 7 | print(sep="")
-8 8 | print("", sep="")
+2 | 
+3 | print("")
+4 | print("", sep=",")
+  - print("", end="bar")
+5 + print(end="bar")
+6 | print("", sep=",", end="bar")
+7 | print(sep="")
+8 | print("", sep="")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
  --> FURB105.py:6:1
@@ -76,16 +70,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 8 | print("", sep="")
   |
 help: Remove empty string and separator
-
-ℹ Safe fix
-3 3 | print("")
-4 4 | print("", sep=",")
-5 5 | print("", end="bar")
-6   |-print("", sep=",", end="bar")
-  6 |+print(end="bar")
-7 7 | print(sep="")
-8 8 | print("", sep="")
-9 9 | print("", "", sep="")
+3 | print("")
+4 | print("", sep=",")
+5 | print("", end="bar")
+  - print("", sep=",", end="bar")
+6 + print(end="bar")
+7 | print(sep="")
+8 | print("", sep="")
+9 | print("", "", sep="")
 
 FURB105 [*] Unnecessary separator passed to `print`
  --> FURB105.py:7:1
@@ -98,16 +90,14 @@ FURB105 [*] Unnecessary separator passed to `print`
 9 | print("", "", sep="")
   |
 help: Remove separator
-
-ℹ Safe fix
-4 4 | print("", sep=",")
-5 5 | print("", end="bar")
-6 6 | print("", sep=",", end="bar")
-7   |-print(sep="")
-  7 |+print()
-8 8 | print("", sep="")
-9 9 | print("", "", sep="")
-10 10 | print("", "", sep="", end="")
+4  | print("", sep=",")
+5  | print("", end="bar")
+6  | print("", sep=",", end="bar")
+   - print(sep="")
+7  + print()
+8  | print("", sep="")
+9  | print("", "", sep="")
+10 | print("", "", sep="", end="")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:8:1
@@ -120,16 +110,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 10 | print("", "", sep="", end="")
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-5 5 | print("", end="bar")
-6 6 | print("", sep=",", end="bar")
-7 7 | print(sep="")
-8   |-print("", sep="")
-  8 |+print()
-9 9 | print("", "", sep="")
-10 10 | print("", "", sep="", end="")
-11 11 | print("", "", sep="", end="bar")
+5  | print("", end="bar")
+6  | print("", sep=",", end="bar")
+7  | print(sep="")
+   - print("", sep="")
+8  + print()
+9  | print("", "", sep="")
+10 | print("", "", sep="", end="")
+11 | print("", "", sep="", end="bar")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:9:1
@@ -142,16 +130,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 11 | print("", "", sep="", end="bar")
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-6  6  | print("", sep=",", end="bar")
-7  7  | print(sep="")
-8  8  | print("", sep="")
-9     |-print("", "", sep="")
-   9  |+print()
-10 10 | print("", "", sep="", end="")
-11 11 | print("", "", sep="", end="bar")
-12 12 | print("", sep="", end="bar")
+6  | print("", sep=",", end="bar")
+7  | print(sep="")
+8  | print("", sep="")
+   - print("", "", sep="")
+9  + print()
+10 | print("", "", sep="", end="")
+11 | print("", "", sep="", end="bar")
+12 | print("", sep="", end="bar")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:10:1
@@ -164,16 +150,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 12 | print("", sep="", end="bar")
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-7  7  | print(sep="")
-8  8  | print("", sep="")
-9  9  | print("", "", sep="")
-10    |-print("", "", sep="", end="")
-   10 |+print(end="")
-11 11 | print("", "", sep="", end="bar")
-12 12 | print("", sep="", end="bar")
-13 13 | print(sep="", end="bar")
+7  | print(sep="")
+8  | print("", sep="")
+9  | print("", "", sep="")
+   - print("", "", sep="", end="")
+10 + print(end="")
+11 | print("", "", sep="", end="bar")
+12 | print("", sep="", end="bar")
+13 | print(sep="", end="bar")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:11:1
@@ -186,16 +170,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 13 | print(sep="", end="bar")
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-8  8  | print("", sep="")
-9  9  | print("", "", sep="")
-10 10 | print("", "", sep="", end="")
-11    |-print("", "", sep="", end="bar")
-   11 |+print(end="bar")
-12 12 | print("", sep="", end="bar")
-13 13 | print(sep="", end="bar")
-14 14 | print("", "foo", sep="")
+8  | print("", sep="")
+9  | print("", "", sep="")
+10 | print("", "", sep="", end="")
+   - print("", "", sep="", end="bar")
+11 + print(end="bar")
+12 | print("", sep="", end="bar")
+13 | print(sep="", end="bar")
+14 | print("", "foo", sep="")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:12:1
@@ -208,16 +190,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 14 | print("", "foo", sep="")
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-9  9  | print("", "", sep="")
-10 10 | print("", "", sep="", end="")
-11 11 | print("", "", sep="", end="bar")
-12    |-print("", sep="", end="bar")
-   12 |+print(end="bar")
-13 13 | print(sep="", end="bar")
-14 14 | print("", "foo", sep="")
-15 15 | print("foo", "", sep="")
+9  | print("", "", sep="")
+10 | print("", "", sep="", end="")
+11 | print("", "", sep="", end="bar")
+   - print("", sep="", end="bar")
+12 + print(end="bar")
+13 | print(sep="", end="bar")
+14 | print("", "foo", sep="")
+15 | print("foo", "", sep="")
 
 FURB105 [*] Unnecessary separator passed to `print`
   --> FURB105.py:13:1
@@ -230,16 +210,14 @@ FURB105 [*] Unnecessary separator passed to `print`
 15 | print("foo", "", sep="")
    |
 help: Remove separator
-
-ℹ Safe fix
-10 10 | print("", "", sep="", end="")
-11 11 | print("", "", sep="", end="bar")
-12 12 | print("", sep="", end="bar")
-13    |-print(sep="", end="bar")
-   13 |+print(end="bar")
-14 14 | print("", "foo", sep="")
-15 15 | print("foo", "", sep="")
-16 16 | print("foo", "", "bar", sep="")
+10 | print("", "", sep="", end="")
+11 | print("", "", sep="", end="bar")
+12 | print("", sep="", end="bar")
+   - print(sep="", end="bar")
+13 + print(end="bar")
+14 | print("", "foo", sep="")
+15 | print("foo", "", sep="")
+16 | print("foo", "", "bar", sep="")
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:14:1
@@ -252,16 +230,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 16 | print("foo", "", "bar", sep="")
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-11 11 | print("", "", sep="", end="bar")
-12 12 | print("", sep="", end="bar")
-13 13 | print(sep="", end="bar")
-14    |-print("", "foo", sep="")
-   14 |+print("foo")
-15 15 | print("foo", "", sep="")
-16 16 | print("foo", "", "bar", sep="")
-17 17 | print("", *args)
+11 | print("", "", sep="", end="bar")
+12 | print("", sep="", end="bar")
+13 | print(sep="", end="bar")
+   - print("", "foo", sep="")
+14 + print("foo")
+15 | print("foo", "", sep="")
+16 | print("foo", "", "bar", sep="")
+17 | print("", *args)
 
 FURB105 [*] Unnecessary empty string and separator passed to `print`
   --> FURB105.py:15:1
@@ -274,16 +250,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print`
 17 | print("", *args)
    |
 help: Remove empty string and separator
-
-ℹ Safe fix
-12 12 | print("", sep="", end="bar")
-13 13 | print(sep="", end="bar")
-14 14 | print("", "foo", sep="")
-15    |-print("foo", "", sep="")
-   15 |+print("foo")
-16 16 | print("foo", "", "bar", sep="")
-17 17 | print("", *args)
-18 18 | print("", *args, sep="")
+12 | print("", sep="", end="bar")
+13 | print(sep="", end="bar")
+14 | print("", "foo", sep="")
+   - print("foo", "", sep="")
+15 + print("foo")
+16 | print("foo", "", "bar", sep="")
+17 | print("", *args)
+18 | print("", *args, sep="")
 
 FURB105 [*] Unnecessary empty string passed to `print`
   --> FURB105.py:16:1
@@ -296,16 +270,14 @@ FURB105 [*] Unnecessary empty string passed to `print`
 18 | print("", *args, sep="")
    |
 help: Remove empty string
-
-ℹ Safe fix
-13 13 | print(sep="", end="bar")
-14 14 | print("", "foo", sep="")
-15 15 | print("foo", "", sep="")
-16    |-print("foo", "", "bar", sep="")
-   16 |+print("foo", "bar", sep="")
-17 17 | print("", *args)
-18 18 | print("", *args, sep="")
-19 19 | print("", **kwargs)
+13 | print(sep="", end="bar")
+14 | print("", "foo", sep="")
+15 | print("foo", "", sep="")
+   - print("foo", "", "bar", sep="")
+16 + print("foo", "bar", sep="")
+17 | print("", *args)
+18 | print("", *args, sep="")
+19 | print("", **kwargs)
 
 FURB105 [*] Unnecessary empty string passed to `print`
   --> FURB105.py:18:1
@@ -318,16 +290,14 @@ FURB105 [*] Unnecessary empty string passed to `print`
 20 | print(sep="\t")
    |
 help: Remove empty string
-
-ℹ Safe fix
-15 15 | print("foo", "", sep="")
-16 16 | print("foo", "", "bar", sep="")
-17 17 | print("", *args)
-18    |-print("", *args, sep="")
-   18 |+print(*args, sep="")
-19 19 | print("", **kwargs)
-20 20 | print(sep="\t")
-21 21 | print(sep=print(1))
+15 | print("foo", "", sep="")
+16 | print("foo", "", "bar", sep="")
+17 | print("", *args)
+   - print("", *args, sep="")
+18 + print(*args, sep="")
+19 | print("", **kwargs)
+20 | print(sep="\t")
+21 | print(sep=print(1))
 
 FURB105 [*] Unnecessary empty string passed to `print`
   --> FURB105.py:19:1
@@ -340,16 +310,14 @@ FURB105 [*] Unnecessary empty string passed to `print`
 21 | print(sep=print(1))
    |
 help: Remove empty string
-
-ℹ Safe fix
-16 16 | print("foo", "", "bar", sep="")
-17 17 | print("", *args)
-18 18 | print("", *args, sep="")
-19    |-print("", **kwargs)
-   19 |+print(**kwargs)
-20 20 | print(sep="\t")
-21 21 | print(sep=print(1))
-22 22 | 
+16 | print("foo", "", "bar", sep="")
+17 | print("", *args)
+18 | print("", *args, sep="")
+   - print("", **kwargs)
+19 + print(**kwargs)
+20 | print(sep="\t")
+21 | print(sep=print(1))
+22 | 
 
 FURB105 [*] Unnecessary separator passed to `print`
   --> FURB105.py:20:1
@@ -361,16 +329,14 @@ FURB105 [*] Unnecessary separator passed to `print`
 21 | print(sep=print(1))
    |
 help: Remove separator
-
-ℹ Safe fix
-17 17 | print("", *args)
-18 18 | print("", *args, sep="")
-19 19 | print("", **kwargs)
-20    |-print(sep="\t")
-   20 |+print()
-21 21 | print(sep=print(1))
-22 22 | 
-23 23 | # OK.
+17 | print("", *args)
+18 | print("", *args, sep="")
+19 | print("", **kwargs)
+   - print(sep="\t")
+20 + print()
+21 | print(sep=print(1))
+22 | 
+23 | # OK.
 
 FURB105 [*] Unnecessary separator passed to `print`
   --> FURB105.py:21:1
@@ -383,13 +349,12 @@ FURB105 [*] Unnecessary separator passed to `print`
 23 | # OK.
    |
 help: Remove separator
-
-ℹ Unsafe fix
-18 18 | print("", *args, sep="")
-19 19 | print("", **kwargs)
-20 20 | print(sep="\t")
-21    |-print(sep=print(1))
-   21 |+print()
-22 22 | 
-23 23 | # OK.
-24 24 |
+18 | print("", *args, sep="")
+19 | print("", **kwargs)
+20 | print(sep="\t")
+   - print(sep=print(1))
+21 + print()
+22 | 
+23 | # OK.
+24 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap
index 5ef02ebcf2..44eef8b8ff 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap
@@ -10,13 +10,11 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 3 | z = x \
   |
 help: Replace with `or` operator
-
-ℹ Safe fix
-1   |-z = x if x else y  # FURB110
-  1 |+z = x or y  # FURB110
-2 2 | 
-3 3 | z = x \
-4 4 |     if x else y  # FURB110
+  - z = x if x else y  # FURB110
+1 + z = x or y  # FURB110
+2 | 
+3 | z = x \
+4 |     if x else y  # FURB110
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
  --> FURB110.py:3:5
@@ -31,16 +29,14 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 6 |   z = x if x \
   |
 help: Replace with `or` operator
-
-ℹ Safe fix
-1 1 | z = x if x else y  # FURB110
-2 2 | 
-3   |-z = x \
-4   |-    if x else y  # FURB110
-  3 |+z = x or y  # FURB110
-5 4 | 
-6 5 | z = x if x \
-7 6 |     else  \
+1 | z = x if x else y  # FURB110
+2 | 
+  - z = x \
+  -     if x else y  # FURB110
+3 + z = x or y  # FURB110
+4 | 
+5 | z = x if x \
+6 |     else  \
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
   --> FURB110.py:6:5
@@ -56,18 +52,16 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 10 |   z = x() if x() else y()  # FURB110
    |
 help: Replace with `or` operator
-
-ℹ Safe fix
-3 3 | z = x \
-4 4 |     if x else y  # FURB110
-5 5 | 
-6   |-z = x if x \
-7   |-    else  \
-8   |-        y  # FURB110
-  6 |+z = x or y  # FURB110
-9 7 | 
-10 8 | z = x() if x() else y()  # FURB110
-11 9 | 
+3 | z = x \
+4 |     if x else y  # FURB110
+5 | 
+  - z = x if x \
+  -     else  \
+  -         y  # FURB110
+6 + z = x or y  # FURB110
+7 | 
+8 | z = x() if x() else y()  # FURB110
+9 | 
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
   --> FURB110.py:10:5
@@ -80,16 +74,15 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 12 | # FURB110
    |
 help: Replace with `or` operator
-
-ℹ Unsafe fix
-7  7  |     else  \
-8  8  |         y  # FURB110
-9  9  | 
-10    |-z = x() if x() else y()  # FURB110
-   10 |+z = x() or y()  # FURB110
-11 11 | 
-12 12 | # FURB110
-13 13 | z = x if (
+7  |     else  \
+8  |         y  # FURB110
+9  | 
+   - z = x() if x() else y()  # FURB110
+10 + z = x() or y()  # FURB110
+11 | 
+12 | # FURB110
+13 | z = x if (
+note: This is an unsafe fix and may change runtime behavior
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
   --> FURB110.py:13:5
@@ -108,20 +101,18 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 21 |   # FURB110
    |
 help: Replace with `or` operator
-
-ℹ Safe fix
-10 10 | z = x() if x() else y()  # FURB110
-11 11 | 
-12 12 | # FURB110
-13    |-z = x if (
-   13 |+z = (
-14 14 |     # Test for x.
-15 15 |     x
-16    |-) else (
-   16 |+) or (
-17 17 |     # Test for y.
-18 18 |     y
-19 19 | )
+10 | z = x() if x() else y()  # FURB110
+11 | 
+12 | # FURB110
+   - z = x if (
+13 + z = (
+14 |     # Test for x.
+15 |     x
+   - ) else (
+16 + ) or (
+17 |     # Test for y.
+18 |     y
+19 | )
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
   --> FURB110.py:23:5
@@ -139,20 +130,18 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 30 |   )
    |
 help: Replace with `or` operator
-
-ℹ Safe fix
-20 20 | 
-21 21 | # FURB110
-22 22 | z = (
-23    |-    x if (
-   23 |+    (
-24 24 |         # Test for x.
-25 25 |         x
-26    |-    ) else (
-   26 |+    ) or (
-27 27 |         # Test for y.
-28 28 |         y
-29 29 |     )
+20 | 
+21 | # FURB110
+22 | z = (
+   -     x if (
+23 +     (
+24 |         # Test for x.
+25 |         x
+   -     ) else (
+26 +     ) or (
+27 |         # Test for y.
+28 |         y
+29 |     )
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
   --> FURB110.py:34:5
@@ -169,21 +158,19 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 40 |   )
    |
 help: Replace with `or` operator
-
-ℹ Safe fix
-31 31 | 
-32 32 | # FURB110
-33 33 | z = (
-34    |-    x if
-35    |-    # If true, use x.
-36    |-    x
-37    |-    # Otherwise, use y.
-38    |-    else
-39    |-    y
-   34 |+    x or y
-40 35 | )
-41 36 | 
-42 37 | # FURB110
+31 | 
+32 | # FURB110
+33 | z = (
+   -     x if
+   -     # If true, use x.
+   -     x
+   -     # Otherwise, use y.
+   -     else
+   -     y
+34 +     x or y
+35 | )
+36 | 
+37 | # FURB110
 
 FURB110 [*] Replace ternary `if` expression with `or` operator
   --> FURB110.py:44:5
@@ -199,16 +186,14 @@ FURB110 [*] Replace ternary `if` expression with `or` operator
 49 |   )
    |
 help: Replace with `or` operator
-
-ℹ Safe fix
-41 41 | 
-42 42 | # FURB110
-43 43 | z = (
-44    |-    x
-45    |-    if x
-46    |-    else y
-   44 |+    x or (y
-47 45 |     if y > 0
-48    |-    else None
-   46 |+    else None)
-49 47 | )
+41 | 
+42 | # FURB110
+43 | z = (
+   -     x
+   -     if x
+   -     else y
+44 +     x or (y
+45 |     if y > 0
+   -     else None
+46 +     else None)
+47 | )
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap
index dae98919ee..e44c5ec453 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap
@@ -11,17 +11,16 @@ FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append
 25 |   pass
    |
 help: Replace with `nums.extend((1, 2))`
-
-ℹ Unsafe fix
-20 20 | 
-21 21 | 
-22 22 | # FURB113
-23    |-nums.append(1)
-24    |-nums.append(2)
-   23 |+nums.extend((1, 2))
-25 24 | pass
-26 25 | 
-27 26 | 
+20 | 
+21 | 
+22 | # FURB113
+   - nums.append(1)
+   - nums.append(2)
+23 + nums.extend((1, 2))
+24 | pass
+25 | 
+26 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `nums3.extend((1, 2))` instead of repeatedly calling `nums3.append()`
   --> FURB113.py:29:1
@@ -33,17 +32,16 @@ FURB113 [*] Use `nums3.extend((1, 2))` instead of repeatedly calling `nums3.appe
 31 |   pass
    |
 help: Replace with `nums3.extend((1, 2))`
-
-ℹ Unsafe fix
-26 26 | 
-27 27 | 
-28 28 | # FURB113
-29    |-nums3.append(1)
-30    |-nums3.append(2)
-   29 |+nums3.extend((1, 2))
-31 30 | pass
-32 31 | 
-33 32 | 
+26 | 
+27 | 
+28 | # FURB113
+   - nums3.append(1)
+   - nums3.append(2)
+29 + nums3.extend((1, 2))
+30 | pass
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `nums4.extend((1, 2))` instead of repeatedly calling `nums4.append()`
   --> FURB113.py:35:1
@@ -55,17 +53,16 @@ FURB113 [*] Use `nums4.extend((1, 2))` instead of repeatedly calling `nums4.appe
 37 |   pass
    |
 help: Replace with `nums4.extend((1, 2))`
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | 
-34 34 | # FURB113
-35    |-nums4.append(1)
-36    |-nums4.append(2)
-   35 |+nums4.extend((1, 2))
-37 36 | pass
-38 37 | 
-39 38 | 
+32 | 
+33 | 
+34 | # FURB113
+   - nums4.append(1)
+   - nums4.append(2)
+35 + nums4.extend((1, 2))
+36 | pass
+37 | 
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()`
   --> FURB113.py:41:1
@@ -124,17 +121,16 @@ FURB113 [*] Use `nums4.extend((1, 2))` instead of repeatedly calling `nums4.appe
 59 |   pass
    |
 help: Replace with `nums4.extend((1, 2))`
-
-ℹ Unsafe fix
-53 53 | nums3.append(1)
-54 54 | nums.append(3)
-55 55 | # FURB113
-56    |-nums4.append(1)
-57    |-nums4.append(2)
-   56 |+nums4.extend((1, 2))
-58 57 | nums3.append(2)
-59 58 | pass
-60 59 | 
+53 | nums3.append(1)
+54 | nums.append(3)
+55 | # FURB113
+   - nums4.append(1)
+   - nums4.append(2)
+56 + nums4.extend((1, 2))
+57 | nums3.append(2)
+58 | pass
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()`
   --> FURB113.py:62:1
@@ -146,18 +142,17 @@ FURB113 [*] Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.app
    | |______________^
    |
 help: Replace with `nums.extend((1, 2, 3))`
-
-ℹ Unsafe fix
-59 59 | pass
-60 60 | 
-61 61 | # FURB113
-62    |-nums.append(1)
-63    |-nums.append(2)
-64    |-nums.append(3)
-   62 |+nums.extend((1, 2, 3))
-65 63 | 
-66 64 | 
-67 65 | if True:
+59 | pass
+60 | 
+61 | # FURB113
+   - nums.append(1)
+   - nums.append(2)
+   - nums.append(3)
+62 + nums.extend((1, 2, 3))
+63 | 
+64 | 
+65 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append()`
   --> FURB113.py:69:5
@@ -169,17 +164,16 @@ FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append
    | |__________________^
    |
 help: Replace with `nums.extend((1, 2))`
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | if True:
-68 68 |     # FURB113
-69    |-    nums.append(1)
-70    |-    nums.append(2)
-   69 |+    nums.extend((1, 2))
-71 70 | 
-72 71 | 
-73 72 | if True:
+66 | 
+67 | if True:
+68 |     # FURB113
+   -     nums.append(1)
+   -     nums.append(2)
+69 +     nums.extend((1, 2))
+70 | 
+71 | 
+72 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append()`
   --> FURB113.py:75:5
@@ -192,17 +186,16 @@ FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append
 77 |       pass
    |
 help: Replace with `nums.extend((1, 2))`
-
-ℹ Unsafe fix
-72 72 | 
-73 73 | if True:
-74 74 |     # FURB113
-75    |-    nums.append(1)
-76    |-    nums.append(2)
-   75 |+    nums.extend((1, 2))
-77 76 |     pass
-78 77 | 
-79 78 | 
+72 | 
+73 | if True:
+74 |     # FURB113
+   -     nums.append(1)
+   -     nums.append(2)
+75 +     nums.extend((1, 2))
+76 |     pass
+77 | 
+78 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()`
   --> FURB113.py:82:5
@@ -227,17 +220,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
    | |_______________^
    |
 help: Replace with `x.extend((1, 2))`
-
-ℹ Unsafe fix
-87 87 | 
-88 88 | def yes_one(x: list[int]):
-89 89 |     # FURB113
-90    |-    x.append(1)
-91    |-    x.append(2)
-   90 |+    x.extend((1, 2))
-92 91 | 
-93 92 | 
-94 93 | def yes_two(x: List[int]):
+87 | 
+88 | def yes_one(x: list[int]):
+89 |     # FURB113
+   -     x.append(1)
+   -     x.append(2)
+90 +     x.extend((1, 2))
+91 | 
+92 | 
+93 | def yes_two(x: List[int]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
   --> FURB113.py:96:5
@@ -249,17 +241,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
    | |_______________^
    |
 help: Replace with `x.extend((1, 2))`
-
-ℹ Unsafe fix
-93 93 | 
-94 94 | def yes_two(x: List[int]):
-95 95 |     # FURB113
-96    |-    x.append(1)
-97    |-    x.append(2)
-   96 |+    x.extend((1, 2))
-98 97 | 
-99 98 | 
-100 99 | def yes_three(*, x: list[int]):
+93 | 
+94 | def yes_two(x: List[int]):
+95 |     # FURB113
+   -     x.append(1)
+   -     x.append(2)
+96 +     x.extend((1, 2))
+97 | 
+98 | 
+99 | def yes_three(*, x: list[int]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
    --> FURB113.py:102:5
@@ -271,17 +262,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
     | |_______________^
     |
 help: Replace with `x.extend((1, 2))`
-
-ℹ Unsafe fix
-99  99  | 
-100 100 | def yes_three(*, x: list[int]):
-101 101 |     # FURB113
-102     |-    x.append(1)
-103     |-    x.append(2)
-    102 |+    x.extend((1, 2))
-104 103 | 
-105 104 | 
-106 105 | def yes_four(x: list[int], /):
+99  | 
+100 | def yes_three(*, x: list[int]):
+101 |     # FURB113
+    -     x.append(1)
+    -     x.append(2)
+102 +     x.extend((1, 2))
+103 | 
+104 | 
+105 | def yes_four(x: list[int], /):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
    --> FURB113.py:108:5
@@ -293,17 +283,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
     | |_______________^
     |
 help: Replace with `x.extend((1, 2))`
-
-ℹ Unsafe fix
-105 105 | 
-106 106 | def yes_four(x: list[int], /):
-107 107 |     # FURB113
-108     |-    x.append(1)
-109     |-    x.append(2)
-    108 |+    x.extend((1, 2))
-110 109 | 
-111 110 | 
-112 111 | def yes_five(x: list[int], y: list[int]):
+105 | 
+106 | def yes_four(x: list[int], /):
+107 |     # FURB113
+    -     x.append(1)
+    -     x.append(2)
+108 +     x.extend((1, 2))
+109 | 
+110 | 
+111 | def yes_five(x: list[int], y: list[int]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 Use `x.extend((1, 2, 3))` instead of repeatedly calling `x.append()`
    --> FURB113.py:114:5
@@ -328,17 +317,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()`
     | |_______________^
     |
 help: Replace with `x.extend((1, 2))`
-
-ℹ Unsafe fix
-119 119 | 
-120 120 | def yes_six(x: list):
-121 121 |     # FURB113
-122     |-    x.append(1)
-123     |-    x.append(2)
-    122 |+    x.extend((1, 2))
-124 123 | 
-125 124 | 
-126 125 | if True:
+119 | 
+120 | def yes_six(x: list):
+121 |     # FURB113
+    -     x.append(1)
+    -     x.append(2)
+122 +     x.extend((1, 2))
+123 | 
+124 | 
+125 | if True:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB113 Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()`
    --> FURB113.py:128:5
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap
index 803fd4aec3..6b3566c216 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
-FURB116 Replace `oct` call with `f"{num:o}"`
+FURB116 [*] Replace `oct` call with `f"{num:o}"`
   --> FURB116.py:9:7
    |
  7 |     return num
@@ -12,18 +12,17 @@ FURB116 Replace `oct` call with `f"{num:o}"`
 11 | print(bin(num)[2:])  # FURB116
    |
 help: Replace with `f"{num:o}"`
+6  | def return_num() -> int:
+7  |     return num
+8  | 
+   - print(oct(num)[2:])  # FURB116
+9  + print(f"{num:o}")  # FURB116
+10 | print(hex(num)[2:])  # FURB116
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-6  6  | def return_num() -> int:
-7  7  |     return num
-8  8  | 
-9     |-print(oct(num)[2:])  # FURB116
-   9  |+print(f"{num:o}")  # FURB116
-10 10 | print(hex(num)[2:])  # FURB116
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-
-FURB116 Replace `hex` call with `f"{num:x}"`
+FURB116 [*] Replace `hex` call with `f"{num:x}"`
   --> FURB116.py:10:7
    |
  9 | print(oct(num)[2:])  # FURB116
@@ -32,18 +31,17 @@ FURB116 Replace `hex` call with `f"{num:x}"`
 11 | print(bin(num)[2:])  # FURB116
    |
 help: Replace with `f"{num:x}"`
+7  |     return num
+8  | 
+9  | print(oct(num)[2:])  # FURB116
+   - print(hex(num)[2:])  # FURB116
+10 + print(f"{num:x}")  # FURB116
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-7  7  |     return num
-8  8  | 
-9  9  | print(oct(num)[2:])  # FURB116
-10    |-print(hex(num)[2:])  # FURB116
-   10 |+print(f"{num:x}")  # FURB116
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-
-FURB116 Replace `bin` call with `f"{num:b}"`
+FURB116 [*] Replace `bin` call with `f"{num:b}"`
   --> FURB116.py:11:7
    |
  9 | print(oct(num)[2:])  # FURB116
@@ -54,16 +52,15 @@ FURB116 Replace `bin` call with `f"{num:b}"`
 13 | print(oct(1337)[2:])  # FURB116
    |
 help: Replace with `f"{num:b}"`
-
-ℹ Display-only fix
-8  8  | 
-9  9  | print(oct(num)[2:])  # FURB116
-10 10 | print(hex(num)[2:])  # FURB116
-11    |-print(bin(num)[2:])  # FURB116
-   11 |+print(f"{num:b}")  # FURB116
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
+8  | 
+9  | print(oct(num)[2:])  # FURB116
+10 | print(hex(num)[2:])  # FURB116
+   - print(bin(num)[2:])  # FURB116
+11 + print(f"{num:b}")  # FURB116
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+note: This is a display-only fix and is likely to be incorrect
 
 FURB116 [*] Replace `oct` call with `f"{1337:o}"`
   --> FURB116.py:13:7
@@ -76,16 +73,14 @@ FURB116 [*] Replace `oct` call with `f"{1337:o}"`
 15 | print(bin(1337)[2:])  # FURB116
    |
 help: Replace with `f"{1337:o}"`
-
-ℹ Safe fix
-10 10 | print(hex(num)[2:])  # FURB116
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-13    |-print(oct(1337)[2:])  # FURB116
-   13 |+print(f"{1337:o}")  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
-15 15 | print(bin(1337)[2:])  # FURB116
-16 16 | print(bin(+1337)[2:])  # FURB116
+10 | print(hex(num)[2:])  # FURB116
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+   - print(oct(1337)[2:])  # FURB116
+13 + print(f"{1337:o}")  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+15 | print(bin(1337)[2:])  # FURB116
+16 | print(bin(+1337)[2:])  # FURB116
 
 FURB116 [*] Replace `hex` call with `f"{1337:x}"`
   --> FURB116.py:14:7
@@ -97,16 +92,14 @@ FURB116 [*] Replace `hex` call with `f"{1337:x}"`
 16 | print(bin(+1337)[2:])  # FURB116
    |
 help: Replace with `f"{1337:x}"`
-
-ℹ Safe fix
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-14    |-print(hex(1337)[2:])  # FURB116
-   14 |+print(f"{1337:x}")  # FURB116
-15 15 | print(bin(1337)[2:])  # FURB116
-16 16 | print(bin(+1337)[2:])  # FURB116
-17 17 | 
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+   - print(hex(1337)[2:])  # FURB116
+14 + print(f"{1337:x}")  # FURB116
+15 | print(bin(1337)[2:])  # FURB116
+16 | print(bin(+1337)[2:])  # FURB116
+17 | 
 
 FURB116 [*] Replace `bin` call with `f"{1337:b}"`
   --> FURB116.py:15:7
@@ -118,16 +111,14 @@ FURB116 [*] Replace `bin` call with `f"{1337:b}"`
 16 | print(bin(+1337)[2:])  # FURB116
    |
 help: Replace with `f"{1337:b}"`
-
-ℹ Safe fix
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
-15    |-print(bin(1337)[2:])  # FURB116
-   15 |+print(f"{1337:b}")  # FURB116
-16 16 | print(bin(+1337)[2:])  # FURB116
-17 17 | 
-18 18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+   - print(bin(1337)[2:])  # FURB116
+15 + print(f"{1337:b}")  # FURB116
+16 | print(bin(+1337)[2:])  # FURB116
+17 | 
+18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
 
 FURB116 [*] Replace `bin` call with `f"{+1337:b}"`
   --> FURB116.py:16:7
@@ -140,16 +131,14 @@ FURB116 [*] Replace `bin` call with `f"{+1337:b}"`
 18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
    |
 help: Replace with `f"{+1337:b}"`
-
-ℹ Safe fix
-13 13 | print(oct(1337)[2:])  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
-15 15 | print(bin(1337)[2:])  # FURB116
-16    |-print(bin(+1337)[2:])  # FURB116
-   16 |+print(f"{+1337:b}")  # FURB116
-17 17 | 
-18 18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
-19 19 | print(bin(int(f"{num}"))[2:])  # FURB116 (no autofix)
+13 | print(oct(1337)[2:])  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+15 | print(bin(1337)[2:])  # FURB116
+   - print(bin(+1337)[2:])  # FURB116
+16 + print(f"{+1337:b}")  # FURB116
+17 | 
+18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
+19 | print(bin(int(f"{num}"))[2:])  # FURB116 (no autofix)
 
 FURB116 Replace `bin` call with f-string
   --> FURB116.py:18:7
@@ -173,7 +162,7 @@ FURB116 Replace `bin` call with f-string
    |
 help: Replace with f-string
 
-FURB116 Replace `bin` call with `f"{d:b}"`
+FURB116 [*] Replace `bin` call with `f"{d:b}"`
   --> FURB116.py:32:7
    |
 30 | d = datetime.datetime.now(tz=datetime.UTC)
@@ -184,18 +173,17 @@ FURB116 Replace `bin` call with `f"{d:b}"`
 34 | print(bin(len("xyz").numerator)[2:])
    |
 help: Replace with `f"{d:b}"`
+29 | 
+30 | d = datetime.datetime.now(tz=datetime.UTC)
+31 | # autofix is display-only
+   - print(bin(d)[2:])
+32 + print(f"{d:b}")
+33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+34 | print(bin(len("xyz").numerator)[2:])
+35 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-29 29 | 
-30 30 | d = datetime.datetime.now(tz=datetime.UTC)
-31 31 | # autofix is display-only
-32    |-print(bin(d)[2:])
-   32 |+print(f"{d:b}")
-33 33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-34 34 | print(bin(len("xyz").numerator)[2:])
-35 35 | 
-
-FURB116 Replace `bin` call with `f"{len("xyz").numerator:b}"`
+FURB116 [*] Replace `bin` call with `f"{len("xyz").numerator:b}"`
   --> FURB116.py:34:7
    |
 32 | print(bin(d)[2:])
@@ -206,18 +194,17 @@ FURB116 Replace `bin` call with `f"{len("xyz").numerator:b}"`
 36 | # autofix is display-only
    |
 help: Replace with `f"{len("xyz").numerator:b}"`
+31 | # autofix is display-only
+32 | print(bin(d)[2:])
+33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+   - print(bin(len("xyz").numerator)[2:])
+34 + print(f"{len("xyz").numerator:b}")
+35 | 
+36 | # autofix is display-only
+37 | print(bin({0: 1}[0].numerator)[2:])
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-31 31 | # autofix is display-only
-32 32 | print(bin(d)[2:])
-33 33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-34    |-print(bin(len("xyz").numerator)[2:])
-   34 |+print(f"{len("xyz").numerator:b}")
-35 35 | 
-36 36 | # autofix is display-only
-37 37 | print(bin({0: 1}[0].numerator)[2:])
-
-FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"`
+FURB116 [*] Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"`
   --> FURB116.py:37:7
    |
 36 | # autofix is display-only
@@ -227,18 +214,17 @@ FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"`
 39 | print(bin(ord("\\").numerator)[2:])
    |
 help: Replace with `f"{ {0: 1}[0].numerator:b}"`
+34 | print(bin(len("xyz").numerator)[2:])
+35 | 
+36 | # autofix is display-only
+   - print(bin({0: 1}[0].numerator)[2:])
+37 + print(f"{ {0: 1}[0].numerator:b}")
+38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+39 | print(bin(ord("\\").numerator)[2:])
+40 | print(hex(sys
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-34 34 | print(bin(len("xyz").numerator)[2:])
-35 35 | 
-36 36 | # autofix is display-only
-37    |-print(bin({0: 1}[0].numerator)[2:])
-   37 |+print(f"{ {0: 1}[0].numerator:b}")
-38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-39 39 | print(bin(ord("\\").numerator)[2:])
-40 40 | print(hex(sys
-
-FURB116 Replace `bin` call with `f"{ord("\\").numerator:b}"`
+FURB116 [*] Replace `bin` call with `f"{ord("\\").numerator:b}"`
   --> FURB116.py:39:7
    |
 37 | print(bin({0: 1}[0].numerator)[2:])
@@ -249,18 +235,17 @@ FURB116 Replace `bin` call with `f"{ord("\\").numerator:b}"`
 41 | .maxunicode)[2:])
    |
 help: Replace with `f"{ord("\\").numerator:b}"`
+36 | # autofix is display-only
+37 | print(bin({0: 1}[0].numerator)[2:])
+38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+   - print(bin(ord("\\").numerator)[2:])
+39 + print(f"{ord("\\").numerator:b}")
+40 | print(hex(sys
+41 | .maxunicode)[2:])
+42 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-36 36 | # autofix is display-only
-37 37 | print(bin({0: 1}[0].numerator)[2:])
-38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-39    |-print(bin(ord("\\").numerator)[2:])
-   39 |+print(f"{ord("\\").numerator:b}")
-40 40 | print(hex(sys
-41 41 | .maxunicode)[2:])
-42 42 | 
-
-FURB116 Replace `hex` call with f-string
+FURB116 [*] Replace `hex` call with f-string
   --> FURB116.py:40:7
    |
 38 |   # no autofix for Python 3.11 and earlier, as it introduces a syntax error
@@ -273,20 +258,19 @@ FURB116 Replace `hex` call with f-string
 43 |   # for negatives numbers autofix is display-only
    |
 help: Replace with f-string
+37 | print(bin({0: 1}[0].numerator)[2:])
+38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+39 | print(bin(ord("\\").numerator)[2:])
+   - print(hex(sys
+   - .maxunicode)[2:])
+40 + print(f"{sys
+41 + .maxunicode:x}")
+42 | 
+43 | # for negatives numbers autofix is display-only
+44 | print(bin(-1)[2:])
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-37 37 | print(bin({0: 1}[0].numerator)[2:])
-38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-39 39 | print(bin(ord("\\").numerator)[2:])
-40    |-print(hex(sys
-41    |-.maxunicode)[2:])
-   40 |+print(f"{sys
-   41 |+.maxunicode:x}")
-42 42 | 
-43 43 | # for negatives numbers autofix is display-only
-44 44 | print(bin(-1)[2:])
-
-FURB116 Replace `bin` call with `f"{-1:b}"`
+FURB116 [*] Replace `bin` call with `f"{-1:b}"`
   --> FURB116.py:44:7
    |
 43 | # for negatives numbers autofix is display-only
@@ -294,10 +278,9 @@ FURB116 Replace `bin` call with `f"{-1:b}"`
    |       ^^^^^^^^^^^
    |
 help: Replace with `f"{-1:b}"`
-
-ℹ Display-only fix
-41 41 | .maxunicode)[2:])
-42 42 | 
-43 43 | # for negatives numbers autofix is display-only
-44    |-print(bin(-1)[2:])
-   44 |+print(f"{-1:b}")
+41 | .maxunicode)[2:])
+42 | 
+43 | # for negatives numbers autofix is display-only
+   - print(bin(-1)[2:])
+44 + print(f"{-1:b}")
+note: This is a display-only fix and is likely to be incorrect
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap
index 175879f35c..c4118d4bba 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap
@@ -11,15 +11,14 @@ FURB118 [*] Use `operator.invert` instead of defining a lambda
 4 | op_pos = lambda x: +x
   |
 help: Replace with `operator.invert`
-
-ℹ Unsafe fix
-1 1 | # Errors.
-2   |-op_bitnot = lambda x: ~x
-  2 |+import operator
-  3 |+op_bitnot = operator.invert
-3 4 | op_not = lambda x: not x
-4 5 | op_pos = lambda x: +x
-5 6 | op_neg = lambda x: -x
+1 | # Errors.
+  - op_bitnot = lambda x: ~x
+2 + import operator
+3 + op_bitnot = operator.invert
+4 | op_not = lambda x: not x
+5 | op_pos = lambda x: +x
+6 | op_neg = lambda x: -x
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.not_` instead of defining a lambda
  --> FURB118.py:3:10
@@ -32,16 +31,15 @@ FURB118 [*] Use `operator.not_` instead of defining a lambda
 5 | op_neg = lambda x: -x
   |
 help: Replace with `operator.not_`
-
-ℹ Unsafe fix
-1 1 | # Errors.
-  2 |+import operator
-2 3 | op_bitnot = lambda x: ~x
-3   |-op_not = lambda x: not x
-  4 |+op_not = operator.not_
-4 5 | op_pos = lambda x: +x
-5 6 | op_neg = lambda x: -x
-6 7 | 
+1 | # Errors.
+2 + import operator
+3 | op_bitnot = lambda x: ~x
+  - op_not = lambda x: not x
+4 + op_not = operator.not_
+5 | op_pos = lambda x: +x
+6 | op_neg = lambda x: -x
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.pos` instead of defining a lambda
  --> FURB118.py:4:10
@@ -53,17 +51,16 @@ FURB118 [*] Use `operator.pos` instead of defining a lambda
 5 | op_neg = lambda x: -x
   |
 help: Replace with `operator.pos`
-
-ℹ Unsafe fix
-1 1 | # Errors.
-  2 |+import operator
-2 3 | op_bitnot = lambda x: ~x
-3 4 | op_not = lambda x: not x
-4   |-op_pos = lambda x: +x
-  5 |+op_pos = operator.pos
-5 6 | op_neg = lambda x: -x
-6 7 | 
-7 8 | op_add = lambda x, y: x + y
+1 | # Errors.
+2 + import operator
+3 | op_bitnot = lambda x: ~x
+4 | op_not = lambda x: not x
+  - op_pos = lambda x: +x
+5 + op_pos = operator.pos
+6 | op_neg = lambda x: -x
+7 | 
+8 | op_add = lambda x, y: x + y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.neg` instead of defining a lambda
  --> FURB118.py:5:10
@@ -76,18 +73,17 @@ FURB118 [*] Use `operator.neg` instead of defining a lambda
 7 | op_add = lambda x, y: x + y
   |
 help: Replace with `operator.neg`
-
-ℹ Unsafe fix
-1 1 | # Errors.
-  2 |+import operator
-2 3 | op_bitnot = lambda x: ~x
-3 4 | op_not = lambda x: not x
-4 5 | op_pos = lambda x: +x
-5   |-op_neg = lambda x: -x
-  6 |+op_neg = operator.neg
-6 7 | 
-7 8 | op_add = lambda x, y: x + y
-8 9 | op_sub = lambda x, y: x - y
+1 | # Errors.
+2 + import operator
+3 | op_bitnot = lambda x: ~x
+4 | op_not = lambda x: not x
+5 | op_pos = lambda x: +x
+  - op_neg = lambda x: -x
+6 + op_neg = operator.neg
+7 | 
+8 | op_add = lambda x, y: x + y
+9 | op_sub = lambda x, y: x - y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.add` instead of defining a lambda
  --> FURB118.py:7:10
@@ -100,20 +96,19 @@ FURB118 [*] Use `operator.add` instead of defining a lambda
 9 | op_mult = lambda x, y: x * y
   |
 help: Replace with `operator.add`
-
-ℹ Unsafe fix
-1 1 | # Errors.
-  2 |+import operator
-2 3 | op_bitnot = lambda x: ~x
-3 4 | op_not = lambda x: not x
-4 5 | op_pos = lambda x: +x
-5 6 | op_neg = lambda x: -x
-6 7 | 
-7   |-op_add = lambda x, y: x + y
-  8 |+op_add = operator.add
-8 9 | op_sub = lambda x, y: x - y
-9 10 | op_mult = lambda x, y: x * y
-10 11 | op_matmutl = lambda x, y: x @ y
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
+6  | op_neg = lambda x: -x
+7  | 
+   - op_add = lambda x, y: x + y
+8  + op_add = operator.add
+9  | op_sub = lambda x, y: x - y
+10 | op_mult = lambda x, y: x * y
+11 | op_matmutl = lambda x, y: x @ y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.sub` instead of defining a lambda
   --> FURB118.py:8:10
@@ -125,21 +120,20 @@ FURB118 [*] Use `operator.sub` instead of defining a lambda
 10 | op_matmutl = lambda x, y: x @ y
    |
 help: Replace with `operator.sub`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
-5  6  | op_neg = lambda x: -x
-6  7  | 
-7  8  | op_add = lambda x, y: x + y
-8     |-op_sub = lambda x, y: x - y
-   9  |+op_sub = operator.sub
-9  10 | op_mult = lambda x, y: x * y
-10 11 | op_matmutl = lambda x, y: x @ y
-11 12 | op_truediv = lambda x, y: x / y
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
+6  | op_neg = lambda x: -x
+7  | 
+8  | op_add = lambda x, y: x + y
+   - op_sub = lambda x, y: x - y
+9  + op_sub = operator.sub
+10 | op_mult = lambda x, y: x * y
+11 | op_matmutl = lambda x, y: x @ y
+12 | op_truediv = lambda x, y: x / y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.mul` instead of defining a lambda
   --> FURB118.py:9:11
@@ -152,22 +146,21 @@ FURB118 [*] Use `operator.mul` instead of defining a lambda
 11 | op_truediv = lambda x, y: x / y
    |
 help: Replace with `operator.mul`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-6  7  | 
-7  8  | op_add = lambda x, y: x + y
-8  9  | op_sub = lambda x, y: x - y
-9     |-op_mult = lambda x, y: x * y
-   10 |+op_mult = operator.mul
-10 11 | op_matmutl = lambda x, y: x @ y
-11 12 | op_truediv = lambda x, y: x / y
-12 13 | op_mod = lambda x, y: x % y
+7  | 
+8  | op_add = lambda x, y: x + y
+9  | op_sub = lambda x, y: x - y
+   - op_mult = lambda x, y: x * y
+10 + op_mult = operator.mul
+11 | op_matmutl = lambda x, y: x @ y
+12 | op_truediv = lambda x, y: x / y
+13 | op_mod = lambda x, y: x % y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.matmul` instead of defining a lambda
   --> FURB118.py:10:14
@@ -180,22 +173,21 @@ FURB118 [*] Use `operator.matmul` instead of defining a lambda
 12 | op_mod = lambda x, y: x % y
    |
 help: Replace with `operator.matmul`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-7  8  | op_add = lambda x, y: x + y
-8  9  | op_sub = lambda x, y: x - y
-9  10 | op_mult = lambda x, y: x * y
-10    |-op_matmutl = lambda x, y: x @ y
-   11 |+op_matmutl = operator.matmul
-11 12 | op_truediv = lambda x, y: x / y
-12 13 | op_mod = lambda x, y: x % y
-13 14 | op_pow = lambda x, y: x ** y
+8  | op_add = lambda x, y: x + y
+9  | op_sub = lambda x, y: x - y
+10 | op_mult = lambda x, y: x * y
+   - op_matmutl = lambda x, y: x @ y
+11 + op_matmutl = operator.matmul
+12 | op_truediv = lambda x, y: x / y
+13 | op_mod = lambda x, y: x % y
+14 | op_pow = lambda x, y: x ** y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.truediv` instead of defining a lambda
   --> FURB118.py:11:14
@@ -208,22 +200,21 @@ FURB118 [*] Use `operator.truediv` instead of defining a lambda
 13 | op_pow = lambda x, y: x ** y
    |
 help: Replace with `operator.truediv`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-8  9  | op_sub = lambda x, y: x - y
-9  10 | op_mult = lambda x, y: x * y
-10 11 | op_matmutl = lambda x, y: x @ y
-11    |-op_truediv = lambda x, y: x / y
-   12 |+op_truediv = operator.truediv
-12 13 | op_mod = lambda x, y: x % y
-13 14 | op_pow = lambda x, y: x ** y
-14 15 | op_lshift = lambda x, y: x << y
+9  | op_sub = lambda x, y: x - y
+10 | op_mult = lambda x, y: x * y
+11 | op_matmutl = lambda x, y: x @ y
+   - op_truediv = lambda x, y: x / y
+12 + op_truediv = operator.truediv
+13 | op_mod = lambda x, y: x % y
+14 | op_pow = lambda x, y: x ** y
+15 | op_lshift = lambda x, y: x << y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.mod` instead of defining a lambda
   --> FURB118.py:12:10
@@ -236,22 +227,21 @@ FURB118 [*] Use `operator.mod` instead of defining a lambda
 14 | op_lshift = lambda x, y: x << y
    |
 help: Replace with `operator.mod`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-9  10 | op_mult = lambda x, y: x * y
-10 11 | op_matmutl = lambda x, y: x @ y
-11 12 | op_truediv = lambda x, y: x / y
-12    |-op_mod = lambda x, y: x % y
-   13 |+op_mod = operator.mod
-13 14 | op_pow = lambda x, y: x ** y
-14 15 | op_lshift = lambda x, y: x << y
-15 16 | op_rshift = lambda x, y: x >> y
+10 | op_mult = lambda x, y: x * y
+11 | op_matmutl = lambda x, y: x @ y
+12 | op_truediv = lambda x, y: x / y
+   - op_mod = lambda x, y: x % y
+13 + op_mod = operator.mod
+14 | op_pow = lambda x, y: x ** y
+15 | op_lshift = lambda x, y: x << y
+16 | op_rshift = lambda x, y: x >> y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.pow` instead of defining a lambda
   --> FURB118.py:13:10
@@ -264,22 +254,21 @@ FURB118 [*] Use `operator.pow` instead of defining a lambda
 15 | op_rshift = lambda x, y: x >> y
    |
 help: Replace with `operator.pow`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-10 11 | op_matmutl = lambda x, y: x @ y
-11 12 | op_truediv = lambda x, y: x / y
-12 13 | op_mod = lambda x, y: x % y
-13    |-op_pow = lambda x, y: x ** y
-   14 |+op_pow = operator.pow
-14 15 | op_lshift = lambda x, y: x << y
-15 16 | op_rshift = lambda x, y: x >> y
-16 17 | op_bitor = lambda x, y: x | y
+11 | op_matmutl = lambda x, y: x @ y
+12 | op_truediv = lambda x, y: x / y
+13 | op_mod = lambda x, y: x % y
+   - op_pow = lambda x, y: x ** y
+14 + op_pow = operator.pow
+15 | op_lshift = lambda x, y: x << y
+16 | op_rshift = lambda x, y: x >> y
+17 | op_bitor = lambda x, y: x | y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.lshift` instead of defining a lambda
   --> FURB118.py:14:13
@@ -292,22 +281,21 @@ FURB118 [*] Use `operator.lshift` instead of defining a lambda
 16 | op_bitor = lambda x, y: x | y
    |
 help: Replace with `operator.lshift`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-11 12 | op_truediv = lambda x, y: x / y
-12 13 | op_mod = lambda x, y: x % y
-13 14 | op_pow = lambda x, y: x ** y
-14    |-op_lshift = lambda x, y: x << y
-   15 |+op_lshift = operator.lshift
-15 16 | op_rshift = lambda x, y: x >> y
-16 17 | op_bitor = lambda x, y: x | y
-17 18 | op_xor = lambda x, y: x ^ y
+12 | op_truediv = lambda x, y: x / y
+13 | op_mod = lambda x, y: x % y
+14 | op_pow = lambda x, y: x ** y
+   - op_lshift = lambda x, y: x << y
+15 + op_lshift = operator.lshift
+16 | op_rshift = lambda x, y: x >> y
+17 | op_bitor = lambda x, y: x | y
+18 | op_xor = lambda x, y: x ^ y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.rshift` instead of defining a lambda
   --> FURB118.py:15:13
@@ -320,22 +308,21 @@ FURB118 [*] Use `operator.rshift` instead of defining a lambda
 17 | op_xor = lambda x, y: x ^ y
    |
 help: Replace with `operator.rshift`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-12 13 | op_mod = lambda x, y: x % y
-13 14 | op_pow = lambda x, y: x ** y
-14 15 | op_lshift = lambda x, y: x << y
-15    |-op_rshift = lambda x, y: x >> y
-   16 |+op_rshift = operator.rshift
-16 17 | op_bitor = lambda x, y: x | y
-17 18 | op_xor = lambda x, y: x ^ y
-18 19 | op_bitand = lambda x, y: x & y
+13 | op_mod = lambda x, y: x % y
+14 | op_pow = lambda x, y: x ** y
+15 | op_lshift = lambda x, y: x << y
+   - op_rshift = lambda x, y: x >> y
+16 + op_rshift = operator.rshift
+17 | op_bitor = lambda x, y: x | y
+18 | op_xor = lambda x, y: x ^ y
+19 | op_bitand = lambda x, y: x & y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.or_` instead of defining a lambda
   --> FURB118.py:16:12
@@ -348,22 +335,21 @@ FURB118 [*] Use `operator.or_` instead of defining a lambda
 18 | op_bitand = lambda x, y: x & y
    |
 help: Replace with `operator.or_`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-13 14 | op_pow = lambda x, y: x ** y
-14 15 | op_lshift = lambda x, y: x << y
-15 16 | op_rshift = lambda x, y: x >> y
-16    |-op_bitor = lambda x, y: x | y
-   17 |+op_bitor = operator.or_
-17 18 | op_xor = lambda x, y: x ^ y
-18 19 | op_bitand = lambda x, y: x & y
-19 20 | op_floordiv = lambda x, y: x // y
+14 | op_pow = lambda x, y: x ** y
+15 | op_lshift = lambda x, y: x << y
+16 | op_rshift = lambda x, y: x >> y
+   - op_bitor = lambda x, y: x | y
+17 + op_bitor = operator.or_
+18 | op_xor = lambda x, y: x ^ y
+19 | op_bitand = lambda x, y: x & y
+20 | op_floordiv = lambda x, y: x // y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.xor` instead of defining a lambda
   --> FURB118.py:17:10
@@ -376,22 +362,21 @@ FURB118 [*] Use `operator.xor` instead of defining a lambda
 19 | op_floordiv = lambda x, y: x // y
    |
 help: Replace with `operator.xor`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-14 15 | op_lshift = lambda x, y: x << y
-15 16 | op_rshift = lambda x, y: x >> y
-16 17 | op_bitor = lambda x, y: x | y
-17    |-op_xor = lambda x, y: x ^ y
-   18 |+op_xor = operator.xor
-18 19 | op_bitand = lambda x, y: x & y
-19 20 | op_floordiv = lambda x, y: x // y
-20 21 | 
+15 | op_lshift = lambda x, y: x << y
+16 | op_rshift = lambda x, y: x >> y
+17 | op_bitor = lambda x, y: x | y
+   - op_xor = lambda x, y: x ^ y
+18 + op_xor = operator.xor
+19 | op_bitand = lambda x, y: x & y
+20 | op_floordiv = lambda x, y: x // y
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.and_` instead of defining a lambda
   --> FURB118.py:18:13
@@ -403,22 +388,21 @@ FURB118 [*] Use `operator.and_` instead of defining a lambda
 19 | op_floordiv = lambda x, y: x // y
    |
 help: Replace with `operator.and_`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-15 16 | op_rshift = lambda x, y: x >> y
-16 17 | op_bitor = lambda x, y: x | y
-17 18 | op_xor = lambda x, y: x ^ y
-18    |-op_bitand = lambda x, y: x & y
-   19 |+op_bitand = operator.and_
-19 20 | op_floordiv = lambda x, y: x // y
-20 21 | 
-21 22 | op_eq = lambda x, y: x == y
+16 | op_rshift = lambda x, y: x >> y
+17 | op_bitor = lambda x, y: x | y
+18 | op_xor = lambda x, y: x ^ y
+   - op_bitand = lambda x, y: x & y
+19 + op_bitand = operator.and_
+20 | op_floordiv = lambda x, y: x // y
+21 | 
+22 | op_eq = lambda x, y: x == y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.floordiv` instead of defining a lambda
   --> FURB118.py:19:15
@@ -431,22 +415,21 @@ FURB118 [*] Use `operator.floordiv` instead of defining a lambda
 21 | op_eq = lambda x, y: x == y
    |
 help: Replace with `operator.floordiv`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-16 17 | op_bitor = lambda x, y: x | y
-17 18 | op_xor = lambda x, y: x ^ y
-18 19 | op_bitand = lambda x, y: x & y
-19    |-op_floordiv = lambda x, y: x // y
-   20 |+op_floordiv = operator.floordiv
-20 21 | 
-21 22 | op_eq = lambda x, y: x == y
-22 23 | op_ne = lambda x, y: x != y
+17 | op_bitor = lambda x, y: x | y
+18 | op_xor = lambda x, y: x ^ y
+19 | op_bitand = lambda x, y: x & y
+   - op_floordiv = lambda x, y: x // y
+20 + op_floordiv = operator.floordiv
+21 | 
+22 | op_eq = lambda x, y: x == y
+23 | op_ne = lambda x, y: x != y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.eq` instead of defining a lambda
   --> FURB118.py:21:9
@@ -459,22 +442,21 @@ FURB118 [*] Use `operator.eq` instead of defining a lambda
 23 | op_lt = lambda x, y: x < y
    |
 help: Replace with `operator.eq`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-18 19 | op_bitand = lambda x, y: x & y
-19 20 | op_floordiv = lambda x, y: x // y
-20 21 | 
-21    |-op_eq = lambda x, y: x == y
-   22 |+op_eq = operator.eq
-22 23 | op_ne = lambda x, y: x != y
-23 24 | op_lt = lambda x, y: x < y
-24 25 | op_lte = lambda x, y: x <= y
+19 | op_bitand = lambda x, y: x & y
+20 | op_floordiv = lambda x, y: x // y
+21 | 
+   - op_eq = lambda x, y: x == y
+22 + op_eq = operator.eq
+23 | op_ne = lambda x, y: x != y
+24 | op_lt = lambda x, y: x < y
+25 | op_lte = lambda x, y: x <= y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.ne` instead of defining a lambda
   --> FURB118.py:22:9
@@ -486,22 +468,21 @@ FURB118 [*] Use `operator.ne` instead of defining a lambda
 24 | op_lte = lambda x, y: x <= y
    |
 help: Replace with `operator.ne`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-19 20 | op_floordiv = lambda x, y: x // y
-20 21 | 
-21 22 | op_eq = lambda x, y: x == y
-22    |-op_ne = lambda x, y: x != y
-   23 |+op_ne = operator.ne
-23 24 | op_lt = lambda x, y: x < y
-24 25 | op_lte = lambda x, y: x <= y
-25 26 | op_gt = lambda x, y: x > y
+20 | op_floordiv = lambda x, y: x // y
+21 | 
+22 | op_eq = lambda x, y: x == y
+   - op_ne = lambda x, y: x != y
+23 + op_ne = operator.ne
+24 | op_lt = lambda x, y: x < y
+25 | op_lte = lambda x, y: x <= y
+26 | op_gt = lambda x, y: x > y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.lt` instead of defining a lambda
   --> FURB118.py:23:9
@@ -514,22 +495,21 @@ FURB118 [*] Use `operator.lt` instead of defining a lambda
 25 | op_gt = lambda x, y: x > y
    |
 help: Replace with `operator.lt`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-20 21 | 
-21 22 | op_eq = lambda x, y: x == y
-22 23 | op_ne = lambda x, y: x != y
-23    |-op_lt = lambda x, y: x < y
-   24 |+op_lt = operator.lt
-24 25 | op_lte = lambda x, y: x <= y
-25 26 | op_gt = lambda x, y: x > y
-26 27 | op_gte = lambda x, y: x >= y
+21 | 
+22 | op_eq = lambda x, y: x == y
+23 | op_ne = lambda x, y: x != y
+   - op_lt = lambda x, y: x < y
+24 + op_lt = operator.lt
+25 | op_lte = lambda x, y: x <= y
+26 | op_gt = lambda x, y: x > y
+27 | op_gte = lambda x, y: x >= y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.le` instead of defining a lambda
   --> FURB118.py:24:10
@@ -542,22 +522,21 @@ FURB118 [*] Use `operator.le` instead of defining a lambda
 26 | op_gte = lambda x, y: x >= y
    |
 help: Replace with `operator.le`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-21 22 | op_eq = lambda x, y: x == y
-22 23 | op_ne = lambda x, y: x != y
-23 24 | op_lt = lambda x, y: x < y
-24    |-op_lte = lambda x, y: x <= y
-   25 |+op_lte = operator.le
-25 26 | op_gt = lambda x, y: x > y
-26 27 | op_gte = lambda x, y: x >= y
-27 28 | op_is = lambda x, y: x is y
+22 | op_eq = lambda x, y: x == y
+23 | op_ne = lambda x, y: x != y
+24 | op_lt = lambda x, y: x < y
+   - op_lte = lambda x, y: x <= y
+25 + op_lte = operator.le
+26 | op_gt = lambda x, y: x > y
+27 | op_gte = lambda x, y: x >= y
+28 | op_is = lambda x, y: x is y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.gt` instead of defining a lambda
   --> FURB118.py:25:9
@@ -570,22 +549,21 @@ FURB118 [*] Use `operator.gt` instead of defining a lambda
 27 | op_is = lambda x, y: x is y
    |
 help: Replace with `operator.gt`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-22 23 | op_ne = lambda x, y: x != y
-23 24 | op_lt = lambda x, y: x < y
-24 25 | op_lte = lambda x, y: x <= y
-25    |-op_gt = lambda x, y: x > y
-   26 |+op_gt = operator.gt
-26 27 | op_gte = lambda x, y: x >= y
-27 28 | op_is = lambda x, y: x is y
-28 29 | op_isnot = lambda x, y: x is not y
+23 | op_ne = lambda x, y: x != y
+24 | op_lt = lambda x, y: x < y
+25 | op_lte = lambda x, y: x <= y
+   - op_gt = lambda x, y: x > y
+26 + op_gt = operator.gt
+27 | op_gte = lambda x, y: x >= y
+28 | op_is = lambda x, y: x is y
+29 | op_isnot = lambda x, y: x is not y
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.ge` instead of defining a lambda
   --> FURB118.py:26:10
@@ -598,22 +576,21 @@ FURB118 [*] Use `operator.ge` instead of defining a lambda
 28 | op_isnot = lambda x, y: x is not y
    |
 help: Replace with `operator.ge`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-23 24 | op_lt = lambda x, y: x < y
-24 25 | op_lte = lambda x, y: x <= y
-25 26 | op_gt = lambda x, y: x > y
-26    |-op_gte = lambda x, y: x >= y
-   27 |+op_gte = operator.ge
-27 28 | op_is = lambda x, y: x is y
-28 29 | op_isnot = lambda x, y: x is not y
-29 30 | op_in = lambda x, y: y in x
+24 | op_lt = lambda x, y: x < y
+25 | op_lte = lambda x, y: x <= y
+26 | op_gt = lambda x, y: x > y
+   - op_gte = lambda x, y: x >= y
+27 + op_gte = operator.ge
+28 | op_is = lambda x, y: x is y
+29 | op_isnot = lambda x, y: x is not y
+30 | op_in = lambda x, y: y in x
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.is_` instead of defining a lambda
   --> FURB118.py:27:9
@@ -626,22 +603,21 @@ FURB118 [*] Use `operator.is_` instead of defining a lambda
 29 | op_in = lambda x, y: y in x
    |
 help: Replace with `operator.is_`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-24 25 | op_lte = lambda x, y: x <= y
-25 26 | op_gt = lambda x, y: x > y
-26 27 | op_gte = lambda x, y: x >= y
-27    |-op_is = lambda x, y: x is y
-   28 |+op_is = operator.is_
-28 29 | op_isnot = lambda x, y: x is not y
-29 30 | op_in = lambda x, y: y in x
-30 31 | op_itemgetter = lambda x: x[0]
+25 | op_lte = lambda x, y: x <= y
+26 | op_gt = lambda x, y: x > y
+27 | op_gte = lambda x, y: x >= y
+   - op_is = lambda x, y: x is y
+28 + op_is = operator.is_
+29 | op_isnot = lambda x, y: x is not y
+30 | op_in = lambda x, y: y in x
+31 | op_itemgetter = lambda x: x[0]
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.is_not` instead of defining a lambda
   --> FURB118.py:28:12
@@ -654,22 +630,21 @@ FURB118 [*] Use `operator.is_not` instead of defining a lambda
 30 | op_itemgetter = lambda x: x[0]
    |
 help: Replace with `operator.is_not`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-25 26 | op_gt = lambda x, y: x > y
-26 27 | op_gte = lambda x, y: x >= y
-27 28 | op_is = lambda x, y: x is y
-28    |-op_isnot = lambda x, y: x is not y
-   29 |+op_isnot = operator.is_not
-29 30 | op_in = lambda x, y: y in x
-30 31 | op_itemgetter = lambda x: x[0]
-31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+26 | op_gt = lambda x, y: x > y
+27 | op_gte = lambda x, y: x >= y
+28 | op_is = lambda x, y: x is y
+   - op_isnot = lambda x, y: x is not y
+29 + op_isnot = operator.is_not
+30 | op_in = lambda x, y: y in x
+31 | op_itemgetter = lambda x: x[0]
+32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.contains` instead of defining a lambda
   --> FURB118.py:29:9
@@ -682,22 +657,21 @@ FURB118 [*] Use `operator.contains` instead of defining a lambda
 31 | op_itemgetter = lambda x: (x[0], x[1], x[2])
    |
 help: Replace with `operator.contains`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-26 27 | op_gte = lambda x, y: x >= y
-27 28 | op_is = lambda x, y: x is y
-28 29 | op_isnot = lambda x, y: x is not y
-29    |-op_in = lambda x, y: y in x
-   30 |+op_in = operator.contains
-30 31 | op_itemgetter = lambda x: x[0]
-31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
-32 33 | op_itemgetter = lambda x: (x[1:], x[2])
+27 | op_gte = lambda x, y: x >= y
+28 | op_is = lambda x, y: x is y
+29 | op_isnot = lambda x, y: x is not y
+   - op_in = lambda x, y: y in x
+30 + op_in = operator.contains
+31 | op_itemgetter = lambda x: x[0]
+32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+33 | op_itemgetter = lambda x: (x[1:], x[2])
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter(0)` instead of defining a lambda
   --> FURB118.py:30:17
@@ -710,22 +684,21 @@ FURB118 [*] Use `operator.itemgetter(0)` instead of defining a lambda
 32 | op_itemgetter = lambda x: (x[1:], x[2])
    |
 help: Replace with `operator.itemgetter(0)`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-27 28 | op_is = lambda x, y: x is y
-28 29 | op_isnot = lambda x, y: x is not y
-29 30 | op_in = lambda x, y: y in x
-30    |-op_itemgetter = lambda x: x[0]
-   31 |+op_itemgetter = operator.itemgetter(0)
-31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
-32 33 | op_itemgetter = lambda x: (x[1:], x[2])
-33 34 | op_itemgetter = lambda x: x[:]
+28 | op_is = lambda x, y: x is y
+29 | op_isnot = lambda x, y: x is not y
+30 | op_in = lambda x, y: y in x
+   - op_itemgetter = lambda x: x[0]
+31 + op_itemgetter = operator.itemgetter(0)
+32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+33 | op_itemgetter = lambda x: (x[1:], x[2])
+34 | op_itemgetter = lambda x: x[:]
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter(0, 1, 2)` instead of defining a lambda
   --> FURB118.py:31:17
@@ -738,22 +711,21 @@ FURB118 [*] Use `operator.itemgetter(0, 1, 2)` instead of defining a lambda
 33 | op_itemgetter = lambda x: x[:]
    |
 help: Replace with `operator.itemgetter(0, 1, 2)`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-28 29 | op_isnot = lambda x, y: x is not y
-29 30 | op_in = lambda x, y: y in x
-30 31 | op_itemgetter = lambda x: x[0]
-31    |-op_itemgetter = lambda x: (x[0], x[1], x[2])
-   32 |+op_itemgetter = operator.itemgetter(0, 1, 2)
-32 33 | op_itemgetter = lambda x: (x[1:], x[2])
-33 34 | op_itemgetter = lambda x: x[:]
-34 35 | op_itemgetter = lambda x: x[0, 1]
+29 | op_isnot = lambda x, y: x is not y
+30 | op_in = lambda x, y: y in x
+31 | op_itemgetter = lambda x: x[0]
+   - op_itemgetter = lambda x: (x[0], x[1], x[2])
+32 + op_itemgetter = operator.itemgetter(0, 1, 2)
+33 | op_itemgetter = lambda x: (x[1:], x[2])
+34 | op_itemgetter = lambda x: x[:]
+35 | op_itemgetter = lambda x: x[0, 1]
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter(slice(1, None), 2)` instead of defining a lambda
   --> FURB118.py:32:17
@@ -766,22 +738,21 @@ FURB118 [*] Use `operator.itemgetter(slice(1, None), 2)` instead of defining a l
 34 | op_itemgetter = lambda x: x[0, 1]
    |
 help: Replace with `operator.itemgetter(slice(1, None), 2)`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-29 30 | op_in = lambda x, y: y in x
-30 31 | op_itemgetter = lambda x: x[0]
-31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
-32    |-op_itemgetter = lambda x: (x[1:], x[2])
-   33 |+op_itemgetter = operator.itemgetter(slice(1, None), 2)
-33 34 | op_itemgetter = lambda x: x[:]
-34 35 | op_itemgetter = lambda x: x[0, 1]
-35 36 | op_itemgetter = lambda x: x[(0, 1)]
+30 | op_in = lambda x, y: y in x
+31 | op_itemgetter = lambda x: x[0]
+32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+   - op_itemgetter = lambda x: (x[1:], x[2])
+33 + op_itemgetter = operator.itemgetter(slice(1, None), 2)
+34 | op_itemgetter = lambda x: x[:]
+35 | op_itemgetter = lambda x: x[0, 1]
+36 | op_itemgetter = lambda x: x[(0, 1)]
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter(slice(None))` instead of defining a lambda
   --> FURB118.py:33:17
@@ -794,22 +765,21 @@ FURB118 [*] Use `operator.itemgetter(slice(None))` instead of defining a lambda
 35 | op_itemgetter = lambda x: x[(0, 1)]
    |
 help: Replace with `operator.itemgetter(slice(None))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-30 31 | op_itemgetter = lambda x: x[0]
-31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
-32 33 | op_itemgetter = lambda x: (x[1:], x[2])
-33    |-op_itemgetter = lambda x: x[:]
-   34 |+op_itemgetter = operator.itemgetter(slice(None))
-34 35 | op_itemgetter = lambda x: x[0, 1]
-35 36 | op_itemgetter = lambda x: x[(0, 1)]
-36 37 | 
+31 | op_itemgetter = lambda x: x[0]
+32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+33 | op_itemgetter = lambda x: (x[1:], x[2])
+   - op_itemgetter = lambda x: x[:]
+34 + op_itemgetter = operator.itemgetter(slice(None))
+35 | op_itemgetter = lambda x: x[0, 1]
+36 | op_itemgetter = lambda x: x[(0, 1)]
+37 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda
   --> FURB118.py:34:17
@@ -821,22 +791,21 @@ FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda
 35 | op_itemgetter = lambda x: x[(0, 1)]
    |
 help: Replace with `operator.itemgetter((0, 1))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
-32 33 | op_itemgetter = lambda x: (x[1:], x[2])
-33 34 | op_itemgetter = lambda x: x[:]
-34    |-op_itemgetter = lambda x: x[0, 1]
-   35 |+op_itemgetter = operator.itemgetter((0, 1))
-35 36 | op_itemgetter = lambda x: x[(0, 1)]
-36 37 | 
-37 38 | 
+32 | op_itemgetter = lambda x: (x[0], x[1], x[2])
+33 | op_itemgetter = lambda x: (x[1:], x[2])
+34 | op_itemgetter = lambda x: x[:]
+   - op_itemgetter = lambda x: x[0, 1]
+35 + op_itemgetter = operator.itemgetter((0, 1))
+36 | op_itemgetter = lambda x: x[(0, 1)]
+37 | 
+38 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda
   --> FURB118.py:35:17
@@ -847,22 +816,21 @@ FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda
    |                 ^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `operator.itemgetter((0, 1))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-32 33 | op_itemgetter = lambda x: (x[1:], x[2])
-33 34 | op_itemgetter = lambda x: x[:]
-34 35 | op_itemgetter = lambda x: x[0, 1]
-35    |-op_itemgetter = lambda x: x[(0, 1)]
-   36 |+op_itemgetter = operator.itemgetter((0, 1))
-36 37 | 
-37 38 | 
-38 39 | def op_not2(x):
+33 | op_itemgetter = lambda x: (x[1:], x[2])
+34 | op_itemgetter = lambda x: x[:]
+35 | op_itemgetter = lambda x: x[0, 1]
+   - op_itemgetter = lambda x: x[(0, 1)]
+36 + op_itemgetter = operator.itemgetter((0, 1))
+37 | 
+38 | 
+39 | def op_not2(x):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 Use `operator.not_` instead of defining a function
   --> FURB118.py:38:5
@@ -891,22 +859,21 @@ FURB118 [*] Use `operator.itemgetter((slice(None), 1))` instead of defining a la
 89 | op_itemgetter = lambda x: x[1, :]
    |
 help: Replace with `operator.itemgetter((slice(None), 1))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-85 86 |         return x + y
-86 87 | 
-87 88 | # See https://github.com/astral-sh/ruff/issues/13508
-88    |-op_itemgetter = lambda x: x[:, 1]
-   89 |+op_itemgetter = operator.itemgetter((slice(None), 1))
-89 90 | op_itemgetter = lambda x: x[1, :]
-90 91 | 
-91 92 | # With a slice, trivia is dropped
+86 |         return x + y
+87 | 
+88 | # See https://github.com/astral-sh/ruff/issues/13508
+   - op_itemgetter = lambda x: x[:, 1]
+89 + op_itemgetter = operator.itemgetter((slice(None), 1))
+90 | op_itemgetter = lambda x: x[1, :]
+91 | 
+92 | # With a slice, trivia is dropped
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a lambda
   --> FURB118.py:89:17
@@ -919,22 +886,21 @@ FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a la
 91 | # With a slice, trivia is dropped
    |
 help: Replace with `operator.itemgetter((1, slice(None)))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-86 87 | 
-87 88 | # See https://github.com/astral-sh/ruff/issues/13508
-88 89 | op_itemgetter = lambda x: x[:, 1]
-89    |-op_itemgetter = lambda x: x[1, :]
-   90 |+op_itemgetter = operator.itemgetter((1, slice(None)))
-90 91 | 
-91 92 | # With a slice, trivia is dropped
-92 93 | op_itemgetter = lambda x: x[1,          :]
+87 | 
+88 | # See https://github.com/astral-sh/ruff/issues/13508
+89 | op_itemgetter = lambda x: x[:, 1]
+   - op_itemgetter = lambda x: x[1, :]
+90 + op_itemgetter = operator.itemgetter((1, slice(None)))
+91 | 
+92 | # With a slice, trivia is dropped
+93 | op_itemgetter = lambda x: x[1,          :]
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a lambda
   --> FURB118.py:92:17
@@ -946,22 +912,21 @@ FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a la
 94 | # Without a slice, trivia is retained
    |
 help: Replace with `operator.itemgetter((1, slice(None)))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-89 90 | op_itemgetter = lambda x: x[1, :]
-90 91 | 
-91 92 | # With a slice, trivia is dropped
-92    |-op_itemgetter = lambda x: x[1,          :]
-   93 |+op_itemgetter = operator.itemgetter((1, slice(None)))
-93 94 | 
-94 95 | # Without a slice, trivia is retained
-95 96 | op_itemgetter = lambda x: x[1,          2]
+90 | op_itemgetter = lambda x: x[1, :]
+91 | 
+92 | # With a slice, trivia is dropped
+   - op_itemgetter = lambda x: x[1,          :]
+93 + op_itemgetter = operator.itemgetter((1, slice(None)))
+94 | 
+95 | # Without a slice, trivia is retained
+96 | op_itemgetter = lambda x: x[1,          2]
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter((1,          2))` instead of defining a lambda
   --> FURB118.py:95:17
@@ -971,22 +936,21 @@ FURB118 [*] Use `operator.itemgetter((1,          2))` instead of defining a lam
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `operator.itemgetter((1,          2))`
-
-ℹ Unsafe fix
-1  1  | # Errors.
-   2  |+import operator
-2  3  | op_bitnot = lambda x: ~x
-3  4  | op_not = lambda x: not x
-4  5  | op_pos = lambda x: +x
+1  | # Errors.
+2  + import operator
+3  | op_bitnot = lambda x: ~x
+4  | op_not = lambda x: not x
+5  | op_pos = lambda x: +x
 --------------------------------------------------------------------------------
-92 93 | op_itemgetter = lambda x: x[1,          :]
-93 94 | 
-94 95 | # Without a slice, trivia is retained
-95    |-op_itemgetter = lambda x: x[1,          2]
-   96 |+op_itemgetter = operator.itemgetter((1,          2))
-96 97 | 
-97 98 | 
-98 99 | # All methods in classes are ignored, even those defined using lambdas:
+93 | op_itemgetter = lambda x: x[1,          :]
+94 | 
+95 | # Without a slice, trivia is retained
+   - op_itemgetter = lambda x: x[1,          2]
+96 + op_itemgetter = operator.itemgetter((1,          2))
+97 | 
+98 | 
+99 | # All methods in classes are ignored, even those defined using lambdas:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter(slice(-2, None))` instead of defining a lambda
    --> FURB118.py:129:14
@@ -999,24 +963,23 @@ FURB118 [*] Use `operator.itemgetter(slice(-2, None))` instead of defining a lam
 131 |         ],
     |
 help: Replace with `operator.itemgetter(slice(-2, None))`
-
-ℹ Unsafe fix
-111 111 | # Lambdas wrapped in function calls could also still be method definitions!
-112 112 | # To avoid false positives, we shouldn't flag any of these either:
-113 113 | from typing import final, override, no_type_check
-    114 |+import operator
-114 115 | 
-115 116 | 
-116 117 | class Foo:
+111 | # Lambdas wrapped in function calls could also still be method definitions!
+112 | # To avoid false positives, we shouldn't flag any of these either:
+113 | from typing import final, override, no_type_check
+114 + import operator
+115 | 
+116 | 
+117 | class Foo:
 --------------------------------------------------------------------------------
-126 127 |     @pytest.mark.parametrize(
-127 128 |         "slicer, expected",
-128 129 |         [
-129     |-            (lambda x: x[-2:], "foo"),
-    130 |+            (operator.itemgetter(slice(-2, None)), "foo"),
-130 131 |             (lambda x: x[-5:-3], "bar"),
-131 132 |         ],
-132 133 |     )
+127 |     @pytest.mark.parametrize(
+128 |         "slicer, expected",
+129 |         [
+    -             (lambda x: x[-2:], "foo"),
+130 +             (operator.itemgetter(slice(-2, None)), "foo"),
+131 |             (lambda x: x[-5:-3], "bar"),
+132 |         ],
+133 |     )
+note: This is an unsafe fix and may change runtime behavior
 
 FURB118 [*] Use `operator.itemgetter(slice(-5, -3))` instead of defining a lambda
    --> FURB118.py:130:14
@@ -1029,21 +992,20 @@ FURB118 [*] Use `operator.itemgetter(slice(-5, -3))` instead of defining a lambd
 132 |     )
     |
 help: Replace with `operator.itemgetter(slice(-5, -3))`
-
-ℹ Unsafe fix
-111 111 | # Lambdas wrapped in function calls could also still be method definitions!
-112 112 | # To avoid false positives, we shouldn't flag any of these either:
-113 113 | from typing import final, override, no_type_check
-    114 |+import operator
-114 115 | 
-115 116 | 
-116 117 | class Foo:
+111 | # Lambdas wrapped in function calls could also still be method definitions!
+112 | # To avoid false positives, we shouldn't flag any of these either:
+113 | from typing import final, override, no_type_check
+114 + import operator
+115 | 
+116 | 
+117 | class Foo:
 --------------------------------------------------------------------------------
-127 128 |         "slicer, expected",
-128 129 |         [
-129 130 |             (lambda x: x[-2:], "foo"),
-130     |-            (lambda x: x[-5:-3], "bar"),
-    131 |+            (operator.itemgetter(slice(-5, -3)), "bar"),
-131 132 |         ],
-132 133 |     )
-133 134 |     def test_inlet_asset_alias_extra_slice(self, slicer, expected):
+128 |         "slicer, expected",
+129 |         [
+130 |             (lambda x: x[-2:], "foo"),
+    -             (lambda x: x[-5:-3], "bar"),
+131 +             (operator.itemgetter(slice(-5, -3)), "bar"),
+132 |         ],
+133 |     )
+134 |     def test_inlet_asset_alias_extra_slice(self, slicer, expected):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap
index a80f7a6764..1673b1924c 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap
@@ -11,17 +11,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-7  7  | 
-8  8  | def _():
-9  9  |     with open("file", "w") as f:
-10    |-        for line in lines:
-11    |-            f.write(line)
-   10 |+        f.writelines(lines)
-12 11 | 
-13 12 | 
-14 13 | def _():
+7  | 
+8  | def _():
+9  |     with open("file", "w") as f:
+   -         for line in lines:
+   -             f.write(line)
+10 +         f.writelines(lines)
+11 | 
+12 | 
+13 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:17:9
@@ -33,17 +31,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_______________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-14 14 | def _():
-15 15 |     other_line = "other line"
-16 16 |     with Path("file").open("w") as f:
-17    |-        for line in lines:
-18    |-            f.write(other_line)
-   17 |+        f.writelines(other_line for line in lines)
-19 18 | 
-20 19 | 
-21 20 | def _():
+14 | def _():
+15 |     other_line = "other line"
+16 |     with Path("file").open("w") as f:
+   -         for line in lines:
+   -             f.write(other_line)
+17 +         f.writelines(other_line for line in lines)
+18 | 
+19 | 
+20 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:23:9
@@ -55,17 +51,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-20 20 | 
-21 21 | def _():
-22 22 |     with Path("file").open("w") as f:
-23    |-        for line in lines:
-24    |-            f.write(line)
-   23 |+        f.writelines(lines)
-25 24 | 
-26 25 | 
-27 26 | def _():
+20 | 
+21 | def _():
+22 |     with Path("file").open("w") as f:
+   -         for line in lines:
+   -             f.write(line)
+23 +         f.writelines(lines)
+24 | 
+25 | 
+26 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:29:9
@@ -77,17 +71,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |__________________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-26 26 | 
-27 27 | def _():
-28 28 |     with Path("file").open("wb") as f:
-29    |-        for line in lines:
-30    |-            f.write(line.encode())
-   29 |+        f.writelines(line.encode() for line in lines)
-31 30 | 
-32 31 | 
-33 32 | def _():
+26 | 
+27 | def _():
+28 |     with Path("file").open("wb") as f:
+   -         for line in lines:
+   -             f.write(line.encode())
+29 +         f.writelines(line.encode() for line in lines)
+30 | 
+31 | 
+32 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:35:9
@@ -99,17 +91,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_________________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-32 32 | 
-33 33 | def _():
-34 34 |     with Path("file").open("w") as f:
-35    |-        for line in lines:
-36    |-            f.write(line.upper())
-   35 |+        f.writelines(line.upper() for line in lines)
-37 36 | 
-38 37 | 
-39 38 | def _():
+32 | 
+33 | def _():
+34 |     with Path("file").open("w") as f:
+   -         for line in lines:
+   -             f.write(line.upper())
+35 +         f.writelines(line.upper() for line in lines)
+36 | 
+37 | 
+38 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:43:9
@@ -121,17 +111,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-40 40 |     with Path("file").open("w") as f:
-41 41 |         pass
-42 42 | 
-43    |-        for line in lines:
-44    |-            f.write(line)
-   43 |+        f.writelines(lines)
-45 44 | 
-46 45 | 
-47 46 | def _():
+40 |     with Path("file").open("w") as f:
+41 |         pass
+42 | 
+   -         for line in lines:
+   -             f.write(line)
+43 +         f.writelines(lines)
+44 | 
+45 | 
+46 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:50:9
@@ -144,18 +132,17 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Unsafe fix
-47 47 | def _():
-48 48 |     # Offer unsafe fix if it would delete comments
-49 49 |     with open("file","w") as f:
-50    |-        for line in lines:
-51    |-            # a really important comment
-52    |-            f.write(line)
-   50 |+        f.writelines(lines)
-53 51 | 
-54 52 | 
-55 53 | def _():
+47 | def _():
+48 |     # Offer unsafe fix if it would delete comments
+49 |     with open("file","w") as f:
+   -         for line in lines:
+   -             # a really important comment
+   -             f.write(line)
+50 +         f.writelines(lines)
+51 | 
+52 | 
+53 | def _():
+note: This is an unsafe fix and may change runtime behavior
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:57:9
@@ -167,17 +154,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_______________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-54 54 | 
-55 55 | def _():
-56 56 |     with open("file", "w") as f:
-57    |-        for () in a:
-58    |-            f.write(())
-   57 |+        f.writelines(() for () in a)
-59 58 | 
-60 59 | 
-61 60 | def _():
+54 | 
+55 | def _():
+56 |     with open("file", "w") as f:
+   -         for () in a:
+   -             f.write(())
+57 +         f.writelines(() for () in a)
+58 | 
+59 | 
+60 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:63:9
@@ -189,17 +174,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |___________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-60 60 | 
-61 61 | def _():
-62 62 |     with open("file", "w") as f:
-63    |-        for a, b, c in d:
-64    |-            f.write((a, b))
-   63 |+        f.writelines((a, b) for a, b, c in d)
-65 64 | 
-66 65 | 
-67 66 | def _():
+60 | 
+61 | def _():
+62 |     with open("file", "w") as f:
+   -         for a, b, c in d:
+   -             f.write((a, b))
+63 +         f.writelines((a, b) for a, b, c in d)
+64 | 
+65 | 
+66 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:69:9
@@ -211,17 +194,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_______________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-66 66 | 
-67 67 | def _():
-68 68 |     with open("file", "w") as f:
-69    |-        for [(), [a.b], (c,)] in d:
-70    |-            f.write(())
-   69 |+        f.writelines(() for [(), [a.b], (c,)] in d)
-71 70 | 
-72 71 | 
-73 72 | def _():
+66 | 
+67 | def _():
+68 |     with open("file", "w") as f:
+   -         for [(), [a.b], (c,)] in d:
+   -             f.write(())
+69 +         f.writelines(() for [(), [a.b], (c,)] in d)
+70 | 
+71 | 
+72 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:75:9
@@ -233,17 +214,15 @@ FURB122 [*] Use of `f.write` in a for loop
    | |_______________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-72 72 | 
-73 73 | def _():
-74 74 |     with open("file", "w") as f:
-75    |-        for [([([a[b]],)],), [], (c[d],)] in e:
-76    |-            f.write(())
-   75 |+        f.writelines(() for [([([a[b]],)],), [], (c[d],)] in e)
-77 76 | 
-78 77 | 
-79 78 | def _():
+72 | 
+73 | def _():
+74 |     with open("file", "w") as f:
+   -         for [([([a[b]],)],), [], (c[d],)] in e:
+   -             f.write(())
+75 +         f.writelines(() for [([([a[b]],)],), [], (c[d],)] in e)
+76 | 
+77 | 
+78 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:82:9
@@ -257,17 +236,15 @@ FURB122 [*] Use of `f.write` in a for loop
 85 |   def _():
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-79 79 | def _():
-80 80 |     # https://github.com/astral-sh/ruff/issues/15936
-81 81 |     with open("file", "w") as f:
-82    |-        for char in "a", "b":
-83    |-            f.write(char)
-   82 |+        f.writelines(("a", "b"))
-84 83 | 
-85 84 | def _():
-86 85 |     # https://github.com/astral-sh/ruff/issues/15936
+79 | def _():
+80 |     # https://github.com/astral-sh/ruff/issues/15936
+81 |     with open("file", "w") as f:
+   -         for char in "a", "b":
+   -             f.write(char)
+82 +         f.writelines(("a", "b"))
+83 | 
+84 | def _():
+85 |     # https://github.com/astral-sh/ruff/issues/15936
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:88:9
@@ -281,17 +258,15 @@ FURB122 [*] Use of `f.write` in a for loop
 91 |   def _():
    |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-85 85 | def _():
-86 86 |     # https://github.com/astral-sh/ruff/issues/15936
-87 87 |     with open("file", "w") as f:
-88    |-        for char in "a", "b":
-89    |-            f.write(f"{char}")
-   88 |+        f.writelines(f"{char}" for char in ("a", "b"))
-90 89 | 
-91 90 | def _():
-92 91 |     with open("file", "w") as f:
+85 | def _():
+86 |     # https://github.com/astral-sh/ruff/issues/15936
+87 |     with open("file", "w") as f:
+   -         for char in "a", "b":
+   -             f.write(f"{char}")
+88 +         f.writelines(f"{char}" for char in ("a", "b"))
+89 | 
+90 | def _():
+91 |     with open("file", "w") as f:
 
 FURB122 [*] Use of `f.write` in a for loop
   --> FURB122.py:93:9
@@ -306,21 +281,20 @@ FURB122 [*] Use of `f.write` in a for loop
    | |______________________________^
    |
 help: Replace with `f.writelines`
-
-ℹ Unsafe fix
-90 90 | 
-91 91 | def _():
-92 92 |     with open("file", "w") as f:
-93    |-        for char in (
-   93 |+        f.writelines(f"{char}" for char in (
-94 94 |             "a",  # Comment
-95 95 |             "b"
-96    |-        ):
-97    |-            f.write(f"{char}")
-   96 |+        ))
-98 97 | 
-99 98 | 
-100 99 | # OK
+90 | 
+91 | def _():
+92 |     with open("file", "w") as f:
+   -         for char in (
+93 +         f.writelines(f"{char}" for char in (
+94 |             "a",  # Comment
+95 |             "b"
+   -         ):
+   -             f.write(f"{char}")
+96 +         ))
+97 | 
+98 | 
+99 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 FURB122 [*] Use of `f.write` in a for loop
    --> FURB122.py:183:9
@@ -332,17 +306,15 @@ FURB122 [*] Use of `f.write` in a for loop
     | |_____________________________^
     |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-180 180 | 
-181 181 | def _():
-182 182 |     with Path("file.txt").open("w", encoding="utf-8") as f:
-183     |-        for l in lambda: 0:
-184     |-            f.write(f"[{l}]")
-    183 |+        f.writelines(f"[{l}]" for l in (lambda: 0))
-185 184 | 
-186 185 | 
-187 186 | def _():
+180 | 
+181 | def _():
+182 |     with Path("file.txt").open("w", encoding="utf-8") as f:
+    -         for l in lambda: 0:
+    -             f.write(f"[{l}]")
+183 +         f.writelines(f"[{l}]" for l in (lambda: 0))
+184 | 
+185 | 
+186 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
    --> FURB122.py:189:9
@@ -354,17 +326,15 @@ FURB122 [*] Use of `f.write` in a for loop
     | |_____________________________^
     |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-186 186 | 
-187 187 | def _():
-188 188 |     with Path("file.txt").open("w", encoding="utf-8") as f:
-189     |-        for l in (1,) if True else (2,):
-190     |-            f.write(f"[{l}]")
-    189 |+        f.writelines(f"[{l}]" for l in ((1,) if True else (2,)))
-191 190 | 
-192 191 | 
-193 192 | # don't need to add parentheses when making a function argument
+186 | 
+187 | def _():
+188 |     with Path("file.txt").open("w", encoding="utf-8") as f:
+    -         for l in (1,) if True else (2,):
+    -             f.write(f"[{l}]")
+189 +         f.writelines(f"[{l}]" for l in ((1,) if True else (2,)))
+190 | 
+191 | 
+192 | # don't need to add parentheses when making a function argument
 
 FURB122 [*] Use of `f.write` in a for loop
    --> FURB122.py:196:9
@@ -376,17 +346,15 @@ FURB122 [*] Use of `f.write` in a for loop
     | |_________________________^
     |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-193 193 | # don't need to add parentheses when making a function argument
-194 194 | def _():
-195 195 |     with open("file", "w") as f:
-196     |-        for line in lambda: 0:
-197     |-            f.write(line)
-    196 |+        f.writelines(lambda: 0)
-198 197 | 
-199 198 | 
-200 199 | def _():
+193 | # don't need to add parentheses when making a function argument
+194 | def _():
+195 |     with open("file", "w") as f:
+    -         for line in lambda: 0:
+    -             f.write(line)
+196 +         f.writelines(lambda: 0)
+197 | 
+198 | 
+199 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
    --> FURB122.py:202:9
@@ -398,17 +366,15 @@ FURB122 [*] Use of `f.write` in a for loop
     | |_________________________^
     |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-199 199 | 
-200 200 | def _():
-201 201 |     with open("file", "w") as f:
-202     |-        for line in (1,) if True else (2,):
-203     |-            f.write(line)
-    202 |+        f.writelines((1,) if True else (2,))
-204 203 | 
-205 204 | 
-206 205 | # don't add extra parentheses if they're already parenthesized
+199 | 
+200 | def _():
+201 |     with open("file", "w") as f:
+    -         for line in (1,) if True else (2,):
+    -             f.write(line)
+202 +         f.writelines((1,) if True else (2,))
+203 | 
+204 | 
+205 | # don't add extra parentheses if they're already parenthesized
 
 FURB122 [*] Use of `f.write` in a for loop
    --> FURB122.py:209:9
@@ -420,17 +386,15 @@ FURB122 [*] Use of `f.write` in a for loop
     | |______________________________^
     |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-206 206 | # don't add extra parentheses if they're already parenthesized
-207 207 | def _():
-208 208 |     with open("file", "w") as f:
-209     |-        for line in (lambda: 0):
-210     |-            f.write(f"{line}")
-    209 |+        f.writelines(f"{line}" for line in (lambda: 0))
-211 210 | 
-212 211 | 
-213 212 | def _():
+206 | # don't add extra parentheses if they're already parenthesized
+207 | def _():
+208 |     with open("file", "w") as f:
+    -         for line in (lambda: 0):
+    -             f.write(f"{line}")
+209 +         f.writelines(f"{line}" for line in (lambda: 0))
+210 | 
+211 | 
+212 | def _():
 
 FURB122 [*] Use of `f.write` in a for loop
    --> FURB122.py:215:9
@@ -442,11 +406,9 @@ FURB122 [*] Use of `f.write` in a for loop
     | |______________________________^
     |
 help: Replace with `f.writelines`
-
-ℹ Safe fix
-212 212 | 
-213 213 | def _():
-214 214 |     with open("file", "w") as f:
-215     |-        for line in ((1,) if True else (2,)):
-216     |-            f.write(f"{line}")
-    215 |+        f.writelines(f"{line}" for line in ((1,) if True else (2,)))
+212 | 
+213 | def _():
+214 |     with open("file", "w") as f:
+    -         for line in ((1,) if True else (2,)):
+    -             f.write(f"{line}")
+215 +         f.writelines(f"{line}" for line in ((1,) if True else (2,)))
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap
index 5a7985327d..2daffe28c1 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap
@@ -12,16 +12,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 9 |     a = [line.lower() for line in f.readlines()]
   |
 help: Remove `readlines()`
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Errors
-6 6 | with open("FURB129.py") as f:
-7   |-    for _line in f.readlines():
-  7 |+    for _line in f:
-8 8 |         pass
-9 9 |     a = [line.lower() for line in f.readlines()]
-10 10 |     b = {line.upper() for line in f.readlines()}
+4  | 
+5  | # Errors
+6  | with open("FURB129.py") as f:
+   -     for _line in f.readlines():
+7  +     for _line in f:
+8  |         pass
+9  |     a = [line.lower() for line in f.readlines()]
+10 |     b = {line.upper() for line in f.readlines()}
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:9:35
@@ -34,16 +32,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 11 |     c = {line.lower(): line.upper() for line in f.readlines()}
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-6  6  | with open("FURB129.py") as f:
-7  7  |     for _line in f.readlines():
-8  8  |         pass
-9     |-    a = [line.lower() for line in f.readlines()]
-   9  |+    a = [line.lower() for line in f]
-10 10 |     b = {line.upper() for line in f.readlines()}
-11 11 |     c = {line.lower(): line.upper() for line in f.readlines()}
-12 12 | 
+6  | with open("FURB129.py") as f:
+7  |     for _line in f.readlines():
+8  |         pass
+   -     a = [line.lower() for line in f.readlines()]
+9  +     a = [line.lower() for line in f]
+10 |     b = {line.upper() for line in f.readlines()}
+11 |     c = {line.lower(): line.upper() for line in f.readlines()}
+12 | 
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:10:35
@@ -55,16 +51,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 11 |     c = {line.lower(): line.upper() for line in f.readlines()}
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-7  7  |     for _line in f.readlines():
-8  8  |         pass
-9  9  |     a = [line.lower() for line in f.readlines()]
-10    |-    b = {line.upper() for line in f.readlines()}
-   10 |+    b = {line.upper() for line in f}
-11 11 |     c = {line.lower(): line.upper() for line in f.readlines()}
-12 12 | 
-13 13 | with Path("FURB129.py").open() as f:
+7  |     for _line in f.readlines():
+8  |         pass
+9  |     a = [line.lower() for line in f.readlines()]
+   -     b = {line.upper() for line in f.readlines()}
+10 +     b = {line.upper() for line in f}
+11 |     c = {line.lower(): line.upper() for line in f.readlines()}
+12 | 
+13 | with Path("FURB129.py").open() as f:
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:11:49
@@ -77,16 +71,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 13 | with Path("FURB129.py").open() as f:
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-8  8  |         pass
-9  9  |     a = [line.lower() for line in f.readlines()]
-10 10 |     b = {line.upper() for line in f.readlines()}
-11    |-    c = {line.lower(): line.upper() for line in f.readlines()}
-   11 |+    c = {line.lower(): line.upper() for line in f}
-12 12 | 
-13 13 | with Path("FURB129.py").open() as f:
-14 14 |     for _line in f.readlines():
+8  |         pass
+9  |     a = [line.lower() for line in f.readlines()]
+10 |     b = {line.upper() for line in f.readlines()}
+   -     c = {line.lower(): line.upper() for line in f.readlines()}
+11 +     c = {line.lower(): line.upper() for line in f}
+12 | 
+13 | with Path("FURB129.py").open() as f:
+14 |     for _line in f.readlines():
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:14:18
@@ -97,16 +89,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 15 |         pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-11 11 |     c = {line.lower(): line.upper() for line in f.readlines()}
-12 12 | 
-13 13 | with Path("FURB129.py").open() as f:
-14    |-    for _line in f.readlines():
-   14 |+    for _line in f:
-15 15 |         pass
-16 16 | 
-17 17 | for _line in open("FURB129.py").readlines():
+11 |     c = {line.lower(): line.upper() for line in f.readlines()}
+12 | 
+13 | with Path("FURB129.py").open() as f:
+   -     for _line in f.readlines():
+14 +     for _line in f:
+15 |         pass
+16 | 
+17 | for _line in open("FURB129.py").readlines():
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:17:14
@@ -118,16 +108,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 18 |     pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-14 14 |     for _line in f.readlines():
-15 15 |         pass
-16 16 | 
-17    |-for _line in open("FURB129.py").readlines():
-   17 |+for _line in open("FURB129.py"):
-18 18 |     pass
-19 19 | 
-20 20 | for _line in Path("FURB129.py").open().readlines():
+14 |     for _line in f.readlines():
+15 |         pass
+16 | 
+   - for _line in open("FURB129.py").readlines():
+17 + for _line in open("FURB129.py"):
+18 |     pass
+19 | 
+20 | for _line in Path("FURB129.py").open().readlines():
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:20:14
@@ -139,16 +127,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 21 |     pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-17 17 | for _line in open("FURB129.py").readlines():
-18 18 |     pass
-19 19 | 
-20    |-for _line in Path("FURB129.py").open().readlines():
-   20 |+for _line in Path("FURB129.py").open():
-21 21 |     pass
-22 22 | 
-23 23 | 
+17 | for _line in open("FURB129.py").readlines():
+18 |     pass
+19 | 
+   - for _line in Path("FURB129.py").open().readlines():
+20 + for _line in Path("FURB129.py").open():
+21 |     pass
+22 | 
+23 | 
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:26:18
@@ -161,16 +147,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 28 |     f.close()
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-23 23 | 
-24 24 | def func():
-25 25 |     f = Path("FURB129.py").open()
-26    |-    for _line in f.readlines():
-   26 |+    for _line in f:
-27 27 |         pass
-28 28 |     f.close()
-29 29 | 
+23 | 
+24 | def func():
+25 |     f = Path("FURB129.py").open()
+   -     for _line in f.readlines():
+26 +     for _line in f:
+27 |         pass
+28 |     f.close()
+29 | 
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:32:18
@@ -181,16 +165,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 33 |         pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-29 29 | 
-30 30 | 
-31 31 | def func(f: io.BytesIO):
-32    |-    for _line in f.readlines():
-   32 |+    for _line in f:
-33 33 |         pass
-34 34 | 
-35 35 | 
+29 | 
+30 | 
+31 | def func(f: io.BytesIO):
+   -     for _line in f.readlines():
+32 +     for _line in f:
+33 |         pass
+34 | 
+35 | 
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:38:22
@@ -203,16 +185,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 40 |         for _line in bar.readlines():
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-35 35 | 
-36 36 | def func():
-37 37 |     with (open("FURB129.py") as f, foo as bar):
-38    |-        for _line in f.readlines():
-   38 |+        for _line in f:
-39 39 |             pass
-40 40 |         for _line in bar.readlines():
-41 41 |             pass
+35 | 
+36 | def func():
+37 |     with (open("FURB129.py") as f, foo as bar):
+   -         for _line in f.readlines():
+38 +         for _line in f:
+39 |             pass
+40 |         for _line in bar.readlines():
+41 |             pass
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:47:17
@@ -223,16 +203,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 48 |         pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-44 44 | import builtins
-45 45 | 
-46 46 | with builtins.open("FURB129.py") as f:
-47    |-    for line in f.readlines():
-   47 |+    for line in f:
-48 48 |         pass
-49 49 | 
-50 50 | 
+44 | import builtins
+45 | 
+46 | with builtins.open("FURB129.py") as f:
+   -     for line in f.readlines():
+47 +     for line in f:
+48 |         pass
+49 | 
+50 | 
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:54:17
@@ -243,16 +221,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 55 |         pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-51 51 | from builtins import open as o
-52 52 | 
-53 53 | with o("FURB129.py") as f:
-54    |-    for line in f.readlines():
-   54 |+    for line in f:
-55 55 |         pass
-56 56 | 
-57 57 | 
+51 | from builtins import open as o
+52 | 
+53 | with o("FURB129.py") as f:
+   -     for line in f.readlines():
+54 +     for line in f:
+55 |         pass
+56 | 
+57 | 
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:93:17
@@ -264,16 +240,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 94 |         pass
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-90 90 | 
-91 91 | # https://github.com/astral-sh/ruff/issues/18231
-92 92 | with open("furb129.py") as f:
-93    |-    for line in (f).readlines():
-   93 |+    for line in (f):
-94 94 |         pass
-95 95 | 
-96 96 | with open("furb129.py") as f:
+90 | 
+91 | # https://github.com/astral-sh/ruff/issues/18231
+92 | with open("furb129.py") as f:
+   -     for line in (f).readlines():
+93 +     for line in (f):
+94 |         pass
+95 | 
+96 | with open("furb129.py") as f:
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
   --> FURB129.py:97:23
@@ -283,16 +257,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
    |                       ^^^^^^^^^^^^^^^
    |
 help: Remove `readlines()`
-
-ℹ Safe fix
-94 94 |         pass
-95 95 | 
-96 96 | with open("furb129.py") as f:
-97    |-    [line for line in (f).readlines()]
-   97 |+    [line for line in (f)]
-98 98 | 
-99 99 | 
-100 100 | with open("furb129.py") as f:
+94  |         pass
+95  | 
+96  | with open("furb129.py") as f:
+    -     [line for line in (f).readlines()]
+97  +     [line for line in (f)]
+98  | 
+99  | 
+100 | with open("furb129.py") as f:
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
    --> FURB129.py:101:17
@@ -304,16 +276,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 103 |     for line in(f).readlines():
     |
 help: Remove `readlines()`
-
-ℹ Safe fix
-98  98  | 
-99  99  | 
-100 100 | with open("furb129.py") as f:
-101     |-    for line in (((f))).readlines():
-    101 |+    for line in (((f))):
-102 102 |         pass
-103 103 |     for line in(f).readlines():
-104 104 |         pass
+98  | 
+99  | 
+100 | with open("furb129.py") as f:
+    -     for line in (((f))).readlines():
+101 +     for line in (((f))):
+102 |         pass
+103 |     for line in(f).readlines():
+104 |         pass
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
    --> FURB129.py:103:16
@@ -325,16 +295,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 104 |         pass
     |
 help: Remove `readlines()`
-
-ℹ Safe fix
-100 100 | with open("furb129.py") as f:
-101 101 |     for line in (((f))).readlines():
-102 102 |         pass
-103     |-    for line in(f).readlines():
-    103 |+    for line in(f):
-104 104 |         pass
-105 105 | 
-106 106 |     # Test case for issue #17683 (missing space before keyword)
+100 | with open("furb129.py") as f:
+101 |     for line in (((f))).readlines():
+102 |         pass
+    -     for line in(f).readlines():
+103 +     for line in(f):
+104 |         pass
+105 | 
+106 |     # Test case for issue #17683 (missing space before keyword)
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
    --> FURB129.py:107:29
@@ -346,16 +314,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 109 | # https://github.com/astral-sh/ruff/issues/18843
     |
 help: Remove `readlines()`
-
-ℹ Safe fix
-104 104 |         pass
-105 105 | 
-106 106 |     # Test case for issue #17683 (missing space before keyword)
-107     |-    print([line for line in f.readlines()if True])
-    107 |+    print([line for line in f if True])
-108 108 | 
-109 109 | # https://github.com/astral-sh/ruff/issues/18843
-110 110 | with open("file.txt") as fp:
+104 |         pass
+105 | 
+106 |     # Test case for issue #17683 (missing space before keyword)
+    -     print([line for line in f.readlines()if True])
+107 +     print([line for line in f if True])
+108 | 
+109 | # https://github.com/astral-sh/ruff/issues/18843
+110 | with open("file.txt") as fp:
 
 FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
    --> FURB129.py:112:9
@@ -370,14 +336,13 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly
 116 |           ...
     |
 help: Remove `readlines()`
-
-ℹ Unsafe fix
-109 109 | # https://github.com/astral-sh/ruff/issues/18843
-110 110 | with open("file.txt") as fp:
-111 111 |     for line in (  # 1
-112     |-        fp.  # 3  # 2
-113     |-        readlines(  # 4
-114     |-        )  # 5
-    112 |+        fp  # 5
-115 113 |     ):
-116 114 |         ...
+109 | # https://github.com/astral-sh/ruff/issues/18843
+110 | with open("file.txt") as fp:
+111 |     for line in (  # 1
+    -         fp.  # 3  # 2
+    -         readlines(  # 4
+    -         )  # 5
+112 +         fp  # 5
+113 |     ):
+114 |         ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap
index ad12904da8..a6c6729426 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap
@@ -9,16 +9,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
    | ^^^^^^^^^^^
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-8  8  | # these should match
-9  9  | 
-10 10 | # FURB131
-11    |-del nums[:]
-   11 |+nums.clear()
-12 12 | 
-13 13 | 
-14 14 | # FURB131
+8  | # these should match
+9  | 
+10 | # FURB131
+   - del nums[:]
+11 + nums.clear()
+12 | 
+13 | 
+14 | # FURB131
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 [*] Prefer `clear` over deleting a full slice
   --> FURB131.py:15:1
@@ -28,16 +27,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
    | ^^^^^^^^^^^^
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | 
-14 14 | # FURB131
-15    |-del names[:]
-   15 |+names.clear()
-16 16 | 
-17 17 | 
-18 18 | # FURB131
+12 | 
+13 | 
+14 | # FURB131
+   - del names[:]
+15 + names.clear()
+16 | 
+17 | 
+18 | # FURB131
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 Prefer `clear` over deleting a full slice
   --> FURB131.py:19:1
@@ -66,16 +64,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
    |     ^^^^^^^^
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-25 25 | 
-26 26 | def yes_one(x: list[int]):
-27 27 |     # FURB131
-28    |-    del x[:]
-   28 |+    x.clear()
-29 29 | 
-30 30 | 
-31 31 | def yes_two(x: dict[int, str]):
+25 | 
+26 | def yes_one(x: list[int]):
+27 |     # FURB131
+   -     del x[:]
+28 +     x.clear()
+29 | 
+30 | 
+31 | def yes_two(x: dict[int, str]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 [*] Prefer `clear` over deleting a full slice
   --> FURB131.py:33:5
@@ -86,16 +83,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
    |     ^^^^^^^^
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | def yes_two(x: dict[int, str]):
-32 32 |     # FURB131
-33    |-    del x[:]
-   33 |+    x.clear()
-34 34 | 
-35 35 | 
-36 36 | def yes_three(x: List[int]):
+30 | 
+31 | def yes_two(x: dict[int, str]):
+32 |     # FURB131
+   -     del x[:]
+33 +     x.clear()
+34 | 
+35 | 
+36 | def yes_three(x: List[int]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 [*] Prefer `clear` over deleting a full slice
   --> FURB131.py:38:5
@@ -106,16 +102,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
    |     ^^^^^^^^
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | def yes_three(x: List[int]):
-37 37 |     # FURB131
-38    |-    del x[:]
-   38 |+    x.clear()
-39 39 | 
-40 40 | 
-41 41 | def yes_four(x: Dict[int, str]):
+35 | 
+36 | def yes_three(x: List[int]):
+37 |     # FURB131
+   -     del x[:]
+38 +     x.clear()
+39 | 
+40 | 
+41 | def yes_four(x: Dict[int, str]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 [*] Prefer `clear` over deleting a full slice
   --> FURB131.py:43:5
@@ -126,16 +121,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
    |     ^^^^^^^^
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-40 40 | 
-41 41 | def yes_four(x: Dict[int, str]):
-42 42 |     # FURB131
-43    |-    del x[:]
-   43 |+    x.clear()
-44 44 | 
-45 45 | 
-46 46 | def yes_five(x: Dict[int, str]):
+40 | 
+41 | def yes_four(x: Dict[int, str]):
+42 |     # FURB131
+   -     del x[:]
+43 +     x.clear()
+44 | 
+45 | 
+46 | def yes_five(x: Dict[int, str]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 [*] Prefer `clear` over deleting a full slice
   --> FURB131.py:48:5
@@ -148,16 +142,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice
 50 |     x = 1
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-45 45 | 
-46 46 | def yes_five(x: Dict[int, str]):
-47 47 |     # FURB131
-48    |-    del x[:]
-   48 |+    x.clear()
-49 49 | 
-50 50 |     x = 1
-51 51 | 
+45 | 
+46 | def yes_five(x: Dict[int, str]):
+47 |     # FURB131
+   -     del x[:]
+48 +     x.clear()
+49 | 
+50 |     x = 1
+51 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB131 [*] Prefer `clear` over deleting a full slice
   --> FURB131.py:58:1
@@ -170,13 +163,12 @@ FURB131 [*] Prefer `clear` over deleting a full slice
 60 | # these should not
    |
 help: Replace with `clear()`
-
-ℹ Unsafe fix
-55 55 | 
-56 56 | sneaky = SneakyList()
-57 57 | # FURB131
-58    |-del sneaky[:]
-   58 |+sneaky.clear()
-59 59 | 
-60 60 | # these should not
-61 61 |
+55 | 
+56 | sneaky = SneakyList()
+57 | # FURB131
+   - del sneaky[:]
+58 + sneaky.clear()
+59 | 
+60 | # these should not
+61 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap
index 33f04dcf7c..96036e508d 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap
@@ -10,17 +10,16 @@ FURB132 [*] Use `s.discard("x")` instead of check and `remove`
    | |_________________^
    |
 help: Replace with `s.discard("x")`
-
-ℹ Unsafe fix
-9  9  | # these should match
-10 10 | 
-11 11 | # FURB132
-12    |-if "x" in s:
-13    |-    s.remove("x")
-   12 |+s.discard("x")
-14 13 | 
-15 14 | 
-16 15 | # FURB132
+9  | # these should match
+10 | 
+11 | # FURB132
+   - if "x" in s:
+   -     s.remove("x")
+12 + s.discard("x")
+13 | 
+14 | 
+15 | # FURB132
+note: This is an unsafe fix and may change runtime behavior
 
 FURB132 [*] Use `s3.discard("x")` instead of check and `remove`
   --> FURB132.py:22:1
@@ -31,17 +30,16 @@ FURB132 [*] Use `s3.discard("x")` instead of check and `remove`
    | |__________________^
    |
 help: Replace with `s3.discard("x")`
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | 
-21 21 | # FURB132
-22    |-if "x" in s3:
-23    |-    s3.remove("x")
-   22 |+s3.discard("x")
-24 23 | 
-25 24 | 
-26 25 | var = "y"
+19 | 
+20 | 
+21 | # FURB132
+   - if "x" in s3:
+   -     s3.remove("x")
+22 + s3.discard("x")
+23 | 
+24 | 
+25 | var = "y"
+note: This is an unsafe fix and may change runtime behavior
 
 FURB132 [*] Use `s.discard(var)` instead of check and `remove`
   --> FURB132.py:28:1
@@ -53,17 +51,16 @@ FURB132 [*] Use `s.discard(var)` instead of check and `remove`
    | |_________________^
    |
 help: Replace with `s.discard(var)`
-
-ℹ Unsafe fix
-25 25 | 
-26 26 | var = "y"
-27 27 | # FURB132
-28    |-if var in s:
-29    |-    s.remove(var)
-   28 |+s.discard(var)
-30 29 | 
-31 30 | 
-32 31 | if f"{var}:{var}" in s:
+25 | 
+26 | var = "y"
+27 | # FURB132
+   - if var in s:
+   -     s.remove(var)
+28 + s.discard(var)
+29 | 
+30 | 
+31 | if f"{var}:{var}" in s:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB132 [*] Use `s.discard(f"{var}:{var}")` instead of check and `remove`
   --> FURB132.py:32:1
@@ -73,14 +70,13 @@ FURB132 [*] Use `s.discard(f"{var}:{var}")` instead of check and `remove`
    | |____________________________^
    |
 help: Replace with `s.discard(f"{var}:{var}")`
-
-ℹ Unsafe fix
-29 29 |     s.remove(var)
-30 30 | 
-31 31 | 
-32    |-if f"{var}:{var}" in s:
-33    |-    s.remove(f"{var}:{var}")
-   32 |+s.discard(f"{var}:{var}")
-34 33 | 
-35 34 | 
-36 35 | def identity(x):
+29 |     s.remove(var)
+30 | 
+31 | 
+   - if f"{var}:{var}" in s:
+   -     s.remove(f"{var}:{var}")
+32 + s.discard(f"{var}:{var}")
+33 | 
+34 | 
+35 | def identity(x):
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap
index 6cb09b7785..f5b0efd703 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap
@@ -12,16 +12,14 @@ FURB136 [*] Replace `x if x > y else y` with `max(y, x)`
 6 | x if x >= y else y  # FURB136
   |
 help: Replace with `max(y, x)`
-
-ℹ Safe fix
-1 1 | x = 1
-2 2 | y = 2
-3 3 | 
-4   |-x if x > y else y  # FURB136
-  4 |+max(y, x)  # FURB136
-5 5 | 
-6 6 | x if x >= y else y  # FURB136
-7 7 | 
+1 | x = 1
+2 | y = 2
+3 | 
+  - x if x > y else y  # FURB136
+4 + max(y, x)  # FURB136
+5 | 
+6 | x if x >= y else y  # FURB136
+7 | 
 
 FURB136 [*] Replace `x if x >= y else y` with `max(x, y)`
  --> FURB136.py:6:1
@@ -34,16 +32,14 @@ FURB136 [*] Replace `x if x >= y else y` with `max(x, y)`
 8 | x if x < y else y  # FURB136
   |
 help: Replace with `max(x, y)`
-
-ℹ Safe fix
-3 3 | 
-4 4 | x if x > y else y  # FURB136
-5 5 | 
-6   |-x if x >= y else y  # FURB136
-  6 |+max(x, y)  # FURB136
-7 7 | 
-8 8 | x if x < y else y  # FURB136
-9 9 | 
+3 | 
+4 | x if x > y else y  # FURB136
+5 | 
+  - x if x >= y else y  # FURB136
+6 + max(x, y)  # FURB136
+7 | 
+8 | x if x < y else y  # FURB136
+9 | 
 
 FURB136 [*] Replace `x if x < y else y` with `min(y, x)`
   --> FURB136.py:8:1
@@ -56,16 +52,14 @@ FURB136 [*] Replace `x if x < y else y` with `min(y, x)`
 10 | x if x <= y else y  # FURB136
    |
 help: Replace with `min(y, x)`
-
-ℹ Safe fix
-5 5 | 
-6 6 | x if x >= y else y  # FURB136
-7 7 | 
-8   |-x if x < y else y  # FURB136
-  8 |+min(y, x)  # FURB136
-9 9 | 
-10 10 | x if x <= y else y  # FURB136
-11 11 | 
+5  | 
+6  | x if x >= y else y  # FURB136
+7  | 
+   - x if x < y else y  # FURB136
+8  + min(y, x)  # FURB136
+9  | 
+10 | x if x <= y else y  # FURB136
+11 | 
 
 FURB136 [*] Replace `x if x <= y else y` with `min(x, y)`
   --> FURB136.py:10:1
@@ -78,16 +72,14 @@ FURB136 [*] Replace `x if x <= y else y` with `min(x, y)`
 12 | y if x > y else x  # FURB136
    |
 help: Replace with `min(x, y)`
-
-ℹ Safe fix
-7  7  | 
-8  8  | x if x < y else y  # FURB136
-9  9  | 
-10    |-x if x <= y else y  # FURB136
-   10 |+min(x, y)  # FURB136
-11 11 | 
-12 12 | y if x > y else x  # FURB136
-13 13 | 
+7  | 
+8  | x if x < y else y  # FURB136
+9  | 
+   - x if x <= y else y  # FURB136
+10 + min(x, y)  # FURB136
+11 | 
+12 | y if x > y else x  # FURB136
+13 | 
 
 FURB136 [*] Replace `y if x > y else x` with `min(x, y)`
   --> FURB136.py:12:1
@@ -100,16 +92,14 @@ FURB136 [*] Replace `y if x > y else x` with `min(x, y)`
 14 | y if x >= y else x  # FURB136
    |
 help: Replace with `min(x, y)`
-
-ℹ Safe fix
-9  9  | 
-10 10 | x if x <= y else y  # FURB136
-11 11 | 
-12    |-y if x > y else x  # FURB136
-   12 |+min(x, y)  # FURB136
-13 13 | 
-14 14 | y if x >= y else x  # FURB136
-15 15 | 
+9  | 
+10 | x if x <= y else y  # FURB136
+11 | 
+   - y if x > y else x  # FURB136
+12 + min(x, y)  # FURB136
+13 | 
+14 | y if x >= y else x  # FURB136
+15 | 
 
 FURB136 [*] Replace `y if x >= y else x` with `min(y, x)`
   --> FURB136.py:14:1
@@ -122,16 +112,14 @@ FURB136 [*] Replace `y if x >= y else x` with `min(y, x)`
 16 | y if x < y else x  # FURB136
    |
 help: Replace with `min(y, x)`
-
-ℹ Safe fix
-11 11 | 
-12 12 | y if x > y else x  # FURB136
-13 13 | 
-14    |-y if x >= y else x  # FURB136
-   14 |+min(y, x)  # FURB136
-15 15 | 
-16 16 | y if x < y else x  # FURB136
-17 17 | 
+11 | 
+12 | y if x > y else x  # FURB136
+13 | 
+   - y if x >= y else x  # FURB136
+14 + min(y, x)  # FURB136
+15 | 
+16 | y if x < y else x  # FURB136
+17 | 
 
 FURB136 [*] Replace `y if x < y else x` with `max(x, y)`
   --> FURB136.py:16:1
@@ -144,16 +132,14 @@ FURB136 [*] Replace `y if x < y else x` with `max(x, y)`
 18 | y if x <= y else x  # FURB136
    |
 help: Replace with `max(x, y)`
-
-ℹ Safe fix
-13 13 | 
-14 14 | y if x >= y else x  # FURB136
-15 15 | 
-16    |-y if x < y else x  # FURB136
-   16 |+max(x, y)  # FURB136
-17 17 | 
-18 18 | y if x <= y else x  # FURB136
-19 19 | 
+13 | 
+14 | y if x >= y else x  # FURB136
+15 | 
+   - y if x < y else x  # FURB136
+16 + max(x, y)  # FURB136
+17 | 
+18 | y if x <= y else x  # FURB136
+19 | 
 
 FURB136 [*] Replace `y if x <= y else x` with `max(y, x)`
   --> FURB136.py:18:1
@@ -166,16 +152,14 @@ FURB136 [*] Replace `y if x <= y else x` with `max(y, x)`
 20 | x + y if x > y else y  # OK
    |
 help: Replace with `max(y, x)`
-
-ℹ Safe fix
-15 15 | 
-16 16 | y if x < y else x  # FURB136
-17 17 | 
-18    |-y if x <= y else x  # FURB136
-   18 |+max(y, x)  # FURB136
-19 19 | 
-20 20 | x + y if x > y else y  # OK
-21 21 | 
+15 | 
+16 | y if x < y else x  # FURB136
+17 | 
+   - y if x <= y else x  # FURB136
+18 + max(y, x)  # FURB136
+19 | 
+20 | x + y if x > y else y  # OK
+21 | 
 
 FURB136 [*] Replace `if` expression with `max(y, x)`
   --> FURB136.py:22:1
@@ -189,13 +173,11 @@ FURB136 [*] Replace `if` expression with `max(y, x)`
    | |________^
    |
 help: Replace with `max(y, x)`
-
-ℹ Safe fix
-19 19 | 
-20 20 | x + y if x > y else y  # OK
-21 21 | 
-22    |-x if (
-23    |-    x
-24    |-    > y
-25    |-) else y  # FURB136
-   22 |+max(y, x)  # FURB136
+19 | 
+20 | x + y if x > y else y  # OK
+21 | 
+   - x if (
+   -     x
+   -     > y
+   - ) else y  # FURB136
+22 + max(y, x)  # FURB136
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap
index 28058f73ce..515d7764bb 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap
@@ -11,20 +11,18 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 9 | # FURB140
   |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-  1 |+from itertools import starmap
-1 2 | def zipped():
-2 3 |     return zip([1, 2, 3], "ABC")
-3 4 | 
-4 5 | # Errors.
-5 6 | 
-6 7 | # FURB140
-7   |-[print(x, y) for x, y in zipped()]
-  8 |+list(starmap(print, zipped()))
-8 9 | 
-9 10 | # FURB140
-10 11 | (print(x, y) for x, y in zipped())
+1  + from itertools import starmap
+2  | def zipped():
+3  |     return zip([1, 2, 3], "ABC")
+4  | 
+5  | # Errors.
+6  | 
+7  | # FURB140
+   - [print(x, y) for x, y in zipped()]
+8  + list(starmap(print, zipped()))
+9  | 
+10 | # FURB140
+11 | (print(x, y) for x, y in zipped())
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:10:1
@@ -36,21 +34,19 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 12 | # FURB140
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-   1  |+from itertools import starmap
-1  2  | def zipped():
-2  3  |     return zip([1, 2, 3], "ABC")
-3  4  | 
+1  + from itertools import starmap
+2  | def zipped():
+3  |     return zip([1, 2, 3], "ABC")
+4  | 
 --------------------------------------------------------------------------------
-7  8  | [print(x, y) for x, y in zipped()]
-8  9  | 
-9  10 | # FURB140
-10    |-(print(x, y) for x, y in zipped())
-   11 |+starmap(print, zipped())
-11 12 | 
-12 13 | # FURB140
-13 14 | {print(x, y) for x, y in zipped()}
+8  | [print(x, y) for x, y in zipped()]
+9  | 
+10 | # FURB140
+   - (print(x, y) for x, y in zipped())
+11 + starmap(print, zipped())
+12 | 
+13 | # FURB140
+14 | {print(x, y) for x, y in zipped()}
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:13:1
@@ -60,21 +56,19 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-   1  |+from itertools import starmap
-1  2  | def zipped():
-2  3  |     return zip([1, 2, 3], "ABC")
-3  4  | 
+1  + from itertools import starmap
+2  | def zipped():
+3  |     return zip([1, 2, 3], "ABC")
+4  | 
 --------------------------------------------------------------------------------
-10 11 | (print(x, y) for x, y in zipped())
-11 12 | 
-12 13 | # FURB140
-13    |-{print(x, y) for x, y in zipped()}
-   14 |+set(starmap(print, zipped()))
-14 15 | 
-15 16 | 
-16 17 | from itertools import starmap as sm
+11 | (print(x, y) for x, y in zipped())
+12 | 
+13 | # FURB140
+   - {print(x, y) for x, y in zipped()}
+14 + set(starmap(print, zipped()))
+15 | 
+16 | 
+17 | from itertools import starmap as sm
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:19:1
@@ -86,16 +80,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 21 | # FURB140
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-16 16 | from itertools import starmap as sm
-17 17 | 
-18 18 | # FURB140
-19    |-[print(x, y) for x, y in zipped()]
-   19 |+list(sm(print, zipped()))
-20 20 | 
-21 21 | # FURB140
-22 22 | (print(x, y) for x, y in zipped())
+16 | from itertools import starmap as sm
+17 | 
+18 | # FURB140
+   - [print(x, y) for x, y in zipped()]
+19 + list(sm(print, zipped()))
+20 | 
+21 | # FURB140
+22 | (print(x, y) for x, y in zipped())
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:22:1
@@ -107,16 +99,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 24 | # FURB140
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-19 19 | [print(x, y) for x, y in zipped()]
-20 20 | 
-21 21 | # FURB140
-22    |-(print(x, y) for x, y in zipped())
-   22 |+sm(print, zipped())
-23 23 | 
-24 24 | # FURB140
-25 25 | {print(x, y) for x, y in zipped()}
+19 | [print(x, y) for x, y in zipped()]
+20 | 
+21 | # FURB140
+   - (print(x, y) for x, y in zipped())
+22 + sm(print, zipped())
+23 | 
+24 | # FURB140
+25 | {print(x, y) for x, y in zipped()}
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:25:1
@@ -128,16 +118,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 27 | # FURB140 (check it still flags starred arguments).
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-22 22 | (print(x, y) for x, y in zipped())
-23 23 | 
-24 24 | # FURB140
-25    |-{print(x, y) for x, y in zipped()}
-   25 |+set(sm(print, zipped()))
-26 26 | 
-27 27 | # FURB140 (check it still flags starred arguments).
-28 28 | # See https://github.com/astral-sh/ruff/issues/7636
+22 | (print(x, y) for x, y in zipped())
+23 | 
+24 | # FURB140
+   - {print(x, y) for x, y in zipped()}
+25 + set(sm(print, zipped()))
+26 | 
+27 | # FURB140 (check it still flags starred arguments).
+28 | # See https://github.com/astral-sh/ruff/issues/7636
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:29:1
@@ -150,16 +138,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 31 | {foo(*t) for t in [(85, 60), (100, 80)]}
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-26 26 | 
-27 27 | # FURB140 (check it still flags starred arguments).
-28 28 | # See https://github.com/astral-sh/ruff/issues/7636
-29    |-[foo(*t) for t in [(85, 60), (100, 80)]]
-   29 |+list(sm(foo, [(85, 60), (100, 80)]))
-30 30 | (foo(*t) for t in [(85, 60), (100, 80)])
-31 31 | {foo(*t) for t in [(85, 60), (100, 80)]}
-32 32 | 
+26 | 
+27 | # FURB140 (check it still flags starred arguments).
+28 | # See https://github.com/astral-sh/ruff/issues/7636
+   - [foo(*t) for t in [(85, 60), (100, 80)]]
+29 + list(sm(foo, [(85, 60), (100, 80)]))
+30 | (foo(*t) for t in [(85, 60), (100, 80)])
+31 | {foo(*t) for t in [(85, 60), (100, 80)]}
+32 | 
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:30:1
@@ -171,16 +157,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 31 | {foo(*t) for t in [(85, 60), (100, 80)]}
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-27 27 | # FURB140 (check it still flags starred arguments).
-28 28 | # See https://github.com/astral-sh/ruff/issues/7636
-29 29 | [foo(*t) for t in [(85, 60), (100, 80)]]
-30    |-(foo(*t) for t in [(85, 60), (100, 80)])
-   30 |+sm(foo, [(85, 60), (100, 80)])
-31 31 | {foo(*t) for t in [(85, 60), (100, 80)]}
-32 32 | 
-33 33 | # Non-errors.
+27 | # FURB140 (check it still flags starred arguments).
+28 | # See https://github.com/astral-sh/ruff/issues/7636
+29 | [foo(*t) for t in [(85, 60), (100, 80)]]
+   - (foo(*t) for t in [(85, 60), (100, 80)])
+30 + sm(foo, [(85, 60), (100, 80)])
+31 | {foo(*t) for t in [(85, 60), (100, 80)]}
+32 | 
+33 | # Non-errors.
 
 FURB140 [*] Use `itertools.starmap` instead of the generator
   --> FURB140.py:31:1
@@ -193,13 +177,11 @@ FURB140 [*] Use `itertools.starmap` instead of the generator
 33 | # Non-errors.
    |
 help: Replace with `itertools.starmap`
-
-ℹ Safe fix
-28 28 | # See https://github.com/astral-sh/ruff/issues/7636
-29 29 | [foo(*t) for t in [(85, 60), (100, 80)]]
-30 30 | (foo(*t) for t in [(85, 60), (100, 80)])
-31    |-{foo(*t) for t in [(85, 60), (100, 80)]}
-   31 |+set(sm(foo, [(85, 60), (100, 80)]))
-32 32 | 
-33 33 | # Non-errors.
-34 34 |
+28 | # See https://github.com/astral-sh/ruff/issues/7636
+29 | [foo(*t) for t in [(85, 60), (100, 80)]]
+30 | (foo(*t) for t in [(85, 60), (100, 80)])
+   - {foo(*t) for t in [(85, 60), (100, 80)]}
+31 + set(sm(foo, [(85, 60), (100, 80)]))
+32 | 
+33 | # Non-errors.
+34 |
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap
index b37a7c2d17..4133f63c72 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap
@@ -13,17 +13,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 8 |   for x in {1, 2, 3}:
   |
 help: Replace with `.update()`
-
-ℹ Safe fix
-2 2 | 
-3 3 | s = set()
-4 4 | 
-5   |-for x in [1, 2, 3]:
-6   |-    s.add(x)
-  5 |+s.update([1, 2, 3])
-7 6 | 
-8 7 | for x in {1, 2, 3}:
-9 8 |     s.add(x)
+2 | 
+3 | s = set()
+4 | 
+  - for x in [1, 2, 3]:
+  -     s.add(x)
+5 + s.update([1, 2, 3])
+6 | 
+7 | for x in {1, 2, 3}:
+8 |     s.add(x)
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:8:1
@@ -37,17 +35,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 11 |   for x in (1, 2, 3):
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-5  5  | for x in [1, 2, 3]:
-6  6  |     s.add(x)
-7  7  | 
-8     |-for x in {1, 2, 3}:
-9     |-    s.add(x)
-   8  |+s.update({1, 2, 3})
-10 9  | 
-11 10 | for x in (1, 2, 3):
-12 11 |     s.add(x)
+5  | for x in [1, 2, 3]:
+6  |     s.add(x)
+7  | 
+   - for x in {1, 2, 3}:
+   -     s.add(x)
+8  + s.update({1, 2, 3})
+9  | 
+10 | for x in (1, 2, 3):
+11 |     s.add(x)
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:11:1
@@ -61,17 +57,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 14 |   for x in (1, 2, 3):
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-8  8  | for x in {1, 2, 3}:
-9  9  |     s.add(x)
-10 10 | 
-11    |-for x in (1, 2, 3):
-12    |-    s.add(x)
-   11 |+s.update((1, 2, 3))
-13 12 | 
-14 13 | for x in (1, 2, 3):
-15 14 |     s.discard(x)
+8  | for x in {1, 2, 3}:
+9  |     s.add(x)
+10 | 
+   - for x in (1, 2, 3):
+   -     s.add(x)
+11 + s.update((1, 2, 3))
+12 | 
+13 | for x in (1, 2, 3):
+14 |     s.discard(x)
 
 FURB142 [*] Use of `set.discard()` in a for loop
   --> FURB142.py:14:1
@@ -85,17 +79,15 @@ FURB142 [*] Use of `set.discard()` in a for loop
 17 |   for x in (1, 2, 3):
    |
 help: Replace with `.difference_update()`
-
-ℹ Safe fix
-11 11 | for x in (1, 2, 3):
-12 12 |     s.add(x)
-13 13 | 
-14    |-for x in (1, 2, 3):
-15    |-    s.discard(x)
-   14 |+s.difference_update((1, 2, 3))
-16 15 | 
-17 16 | for x in (1, 2, 3):
-18 17 |     s.add(x + 1)
+11 | for x in (1, 2, 3):
+12 |     s.add(x)
+13 | 
+   - for x in (1, 2, 3):
+   -     s.discard(x)
+14 + s.difference_update((1, 2, 3))
+15 | 
+16 | for x in (1, 2, 3):
+17 |     s.add(x + 1)
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:17:1
@@ -109,17 +101,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 20 |   for x, y in ((1, 2), (3, 4)):
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-14 14 | for x in (1, 2, 3):
-15 15 |     s.discard(x)
-16 16 | 
-17    |-for x in (1, 2, 3):
-18    |-    s.add(x + 1)
-   17 |+s.update(x + 1 for x in (1, 2, 3))
-19 18 | 
-20 19 | for x, y in ((1, 2), (3, 4)):
-21 20 |     s.add((x, y))
+14 | for x in (1, 2, 3):
+15 |     s.discard(x)
+16 | 
+   - for x in (1, 2, 3):
+   -     s.add(x + 1)
+17 + s.update(x + 1 for x in (1, 2, 3))
+18 | 
+19 | for x, y in ((1, 2), (3, 4)):
+20 |     s.add((x, y))
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:20:1
@@ -133,17 +123,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 23 |   num = 123
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-17 17 | for x in (1, 2, 3):
-18 18 |     s.add(x + 1)
-19 19 | 
-20    |-for x, y in ((1, 2), (3, 4)):
-21    |-    s.add((x, y))
-   20 |+s.update((x, y) for x, y in ((1, 2), (3, 4)))
-22 21 | 
-23 22 | num = 123
-24 23 | 
+17 | for x in (1, 2, 3):
+18 |     s.add(x + 1)
+19 | 
+   - for x, y in ((1, 2), (3, 4)):
+   -     s.add((x, y))
+20 + s.update((x, y) for x, y in ((1, 2), (3, 4)))
+21 | 
+22 | num = 123
+23 | 
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:25:1
@@ -157,17 +145,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 28 |   for x in (1, 2, 3):
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-22 22 | 
-23 23 | num = 123
-24 24 | 
-25    |-for x in (1, 2, 3):
-26    |-    s.add(num)
-   25 |+s.update(num for x in (1, 2, 3))
-27 26 | 
-28 27 | for x in (1, 2, 3):
-29 28 |     s.add((num, x))
+22 | 
+23 | num = 123
+24 | 
+   - for x in (1, 2, 3):
+   -     s.add(num)
+25 + s.update(num for x in (1, 2, 3))
+26 | 
+27 | for x in (1, 2, 3):
+28 |     s.add((num, x))
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:28:1
@@ -181,17 +167,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 31 |   for x in (1, 2, 3):
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-25 25 | for x in (1, 2, 3):
-26 26 |     s.add(num)
-27 27 | 
-28    |-for x in (1, 2, 3):
-29    |-    s.add((num, x))
-   28 |+s.update((num, x) for x in (1, 2, 3))
-30 29 | 
-31 30 | for x in (1, 2, 3):
-32 31 |     s.add(x + num)
+25 | for x in (1, 2, 3):
+26 |     s.add(num)
+27 | 
+   - for x in (1, 2, 3):
+   -     s.add((num, x))
+28 + s.update((num, x) for x in (1, 2, 3))
+29 | 
+30 | for x in (1, 2, 3):
+31 |     s.add(x + num)
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:31:1
@@ -205,17 +189,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 34 |   # https://github.com/astral-sh/ruff/issues/15936
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-28 28 | for x in (1, 2, 3):
-29 29 |     s.add((num, x))
-30 30 | 
-31    |-for x in (1, 2, 3):
-32    |-    s.add(x + num)
-   31 |+s.update(x + num for x in (1, 2, 3))
-33 32 | 
-34 33 | # https://github.com/astral-sh/ruff/issues/15936
-35 34 | for x in 1, 2, 3:
+28 | for x in (1, 2, 3):
+29 |     s.add((num, x))
+30 | 
+   - for x in (1, 2, 3):
+   -     s.add(x + num)
+31 + s.update(x + num for x in (1, 2, 3))
+32 | 
+33 | # https://github.com/astral-sh/ruff/issues/15936
+34 | for x in 1, 2, 3:
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:35:1
@@ -228,17 +210,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 38 |   for x in 1, 2, 3:
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-32 32 |     s.add(x + num)
-33 33 | 
-34 34 | # https://github.com/astral-sh/ruff/issues/15936
-35    |-for x in 1, 2, 3:
-36    |-    s.add(x)
-   35 |+s.update((1, 2, 3))
-37 36 | 
-38 37 | for x in 1, 2, 3:
-39 38 |     s.add(f"{x}")
+32 |     s.add(x + num)
+33 | 
+34 | # https://github.com/astral-sh/ruff/issues/15936
+   - for x in 1, 2, 3:
+   -     s.add(x)
+35 + s.update((1, 2, 3))
+36 | 
+37 | for x in 1, 2, 3:
+38 |     s.add(f"{x}")
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:38:1
@@ -252,17 +232,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 41 |   for x in (
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-35 35 | for x in 1, 2, 3:
-36 36 |     s.add(x)
-37 37 | 
-38    |-for x in 1, 2, 3:
-39    |-    s.add(f"{x}")
-   38 |+s.update(f"{x}" for x in (1, 2, 3))
-40 39 | 
-41 40 | for x in (
-42 41 |     1,  # Comment
+35 | for x in 1, 2, 3:
+36 |     s.add(x)
+37 | 
+   - for x in 1, 2, 3:
+   -     s.add(f"{x}")
+38 + s.update(f"{x}" for x in (1, 2, 3))
+39 | 
+40 | for x in (
+41 |     1,  # Comment
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:41:1
@@ -277,21 +255,20 @@ FURB142 [*] Use of `set.add()` in a for loop
    | |_________________^
    |
 help: Replace with `.update()`
-
-ℹ Unsafe fix
-38 38 | for x in 1, 2, 3:
-39 39 |     s.add(f"{x}")
-40 40 | 
-41    |-for x in (
-   41 |+s.update(f"{x}" for x in (
-42 42 |     1,  # Comment
-43 43 |     2, 3
-44    |-):
-45    |-    s.add(f"{x}")
-   44 |+))
-46 45 | 
-47 46 | 
-48 47 | # False negative
+38 | for x in 1, 2, 3:
+39 |     s.add(f"{x}")
+40 | 
+   - for x in (
+41 + s.update(f"{x}" for x in (
+42 |     1,  # Comment
+43 |     2, 3
+   - ):
+   -     s.add(f"{x}")
+44 + ))
+45 | 
+46 | 
+47 | # False negative
+note: This is an unsafe fix and may change runtime behavior
 
 FURB142 [*] Use of `set.discard()` in a for loop
   --> FURB142.py:83:1
@@ -305,17 +282,15 @@ FURB142 [*] Use of `set.discard()` in a for loop
 86 |   for x in (1,) if True else (2,):
    |
 help: Replace with `.difference_update()`
-
-ℹ Safe fix
-80 80 | 
-81 81 | s = set()
-82 82 | 
-83    |-for x in lambda: 0:
-84    |-    s.discard(-x)
-   83 |+s.difference_update(-x for x in (lambda: 0))
-85 84 | 
-86 85 | for x in (1,) if True else (2,):
-87 86 |     s.add(-x)
+80 | 
+81 | s = set()
+82 | 
+   - for x in lambda: 0:
+   -     s.discard(-x)
+83 + s.difference_update(-x for x in (lambda: 0))
+84 | 
+85 | for x in (1,) if True else (2,):
+86 |     s.add(-x)
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:86:1
@@ -329,17 +304,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 89 |   # don't add extra parens
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-83 83 | for x in lambda: 0:
-84 84 |     s.discard(-x)
-85 85 | 
-86    |-for x in (1,) if True else (2,):
-87    |-    s.add(-x)
-   86 |+s.update(-x for x in ((1,) if True else (2,)))
-88 87 | 
-89 88 | # don't add extra parens
-90 89 | for x in (lambda: 0):
+83 | for x in lambda: 0:
+84 |     s.discard(-x)
+85 | 
+   - for x in (1,) if True else (2,):
+   -     s.add(-x)
+86 + s.update(-x for x in ((1,) if True else (2,)))
+87 | 
+88 | # don't add extra parens
+89 | for x in (lambda: 0):
 
 FURB142 [*] Use of `set.discard()` in a for loop
   --> FURB142.py:90:1
@@ -352,17 +325,15 @@ FURB142 [*] Use of `set.discard()` in a for loop
 93 |   for x in ((1,) if True else (2,)):
    |
 help: Replace with `.difference_update()`
-
-ℹ Safe fix
-87 87 |     s.add(-x)
-88 88 | 
-89 89 | # don't add extra parens
-90    |-for x in (lambda: 0):
-91    |-    s.discard(-x)
-   90 |+s.difference_update(-x for x in (lambda: 0))
-92 91 | 
-93 92 | for x in ((1,) if True else (2,)):
-94 93 |     s.add(-x)
+87 |     s.add(-x)
+88 | 
+89 | # don't add extra parens
+   - for x in (lambda: 0):
+   -     s.discard(-x)
+90 + s.difference_update(-x for x in (lambda: 0))
+91 | 
+92 | for x in ((1,) if True else (2,)):
+93 |     s.add(-x)
 
 FURB142 [*] Use of `set.add()` in a for loop
   --> FURB142.py:93:1
@@ -376,17 +347,15 @@ FURB142 [*] Use of `set.add()` in a for loop
 96 |   # don't add parens directly in function call
    |
 help: Replace with `.update()`
-
-ℹ Safe fix
-90 90 | for x in (lambda: 0):
-91 91 |     s.discard(-x)
-92 92 | 
-93    |-for x in ((1,) if True else (2,)):
-94    |-    s.add(-x)
-   93 |+s.update(-x for x in ((1,) if True else (2,)))
-95 94 | 
-96 95 | # don't add parens directly in function call
-97 96 | for x in lambda: 0:
+90 | for x in (lambda: 0):
+91 |     s.discard(-x)
+92 | 
+   - for x in ((1,) if True else (2,)):
+   -     s.add(-x)
+93 + s.update(-x for x in ((1,) if True else (2,)))
+94 | 
+95 | # don't add parens directly in function call
+96 | for x in lambda: 0:
 
 FURB142 [*] Use of `set.discard()` in a for loop
    --> FURB142.py:97:1
@@ -399,17 +368,15 @@ FURB142 [*] Use of `set.discard()` in a for loop
 100 |   for x in (1,) if True else (2,):
     |
 help: Replace with `.difference_update()`
-
-ℹ Safe fix
-94 94 |     s.add(-x)
-95 95 | 
-96 96 | # don't add parens directly in function call
-97    |-for x in lambda: 0:
-98    |-    s.discard(x)
-   97 |+s.difference_update(lambda: 0)
-99 98 | 
-100 99 | for x in (1,) if True else (2,):
-101 100 |     s.add(x)
+94  |     s.add(-x)
+95  | 
+96  | # don't add parens directly in function call
+    - for x in lambda: 0:
+    -     s.discard(x)
+97  + s.difference_update(lambda: 0)
+98  | 
+99  | for x in (1,) if True else (2,):
+100 |     s.add(x)
 
 FURB142 [*] Use of `set.add()` in a for loop
    --> FURB142.py:100:1
@@ -421,11 +388,9 @@ FURB142 [*] Use of `set.add()` in a for loop
     | |____________^
     |
 help: Replace with `.update()`
-
-ℹ Safe fix
-97  97  | for x in lambda: 0:
-98  98  |     s.discard(x)
-99  99  | 
-100     |-for x in (1,) if True else (2,):
-101     |-    s.add(x)
-    100 |+s.update((1,) if True else (2,))
+97  | for x in lambda: 0:
+98  |     s.discard(x)
+99  | 
+    - for x in (1,) if True else (2,):
+    -     s.add(x)
+100 + s.update((1,) if True else (2,))
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap
index 1c83a4a236..6fa1035217 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap
@@ -11,16 +11,14 @@ FURB145 [*] Prefer `copy` method over slicing
 6 | d, e = l[:], 1
   |
 help: Replace with `copy()`
-
-ℹ Safe fix
-1 1 | l = [1, 2, 3, 4, 5]
-2 2 | 
-3 3 | # Errors.
-4   |-a = l[:]
-  4 |+a = l.copy()
-5 5 | b, c = 1, l[:]
-6 6 | d, e = l[:], 1
-7 7 | m = l[::]
+1 | l = [1, 2, 3, 4, 5]
+2 | 
+3 | # Errors.
+  - a = l[:]
+4 + a = l.copy()
+5 | b, c = 1, l[:]
+6 | d, e = l[:], 1
+7 | m = l[::]
 
 FURB145 [*] Prefer `copy` method over slicing
  --> FURB145.py:5:11
@@ -33,16 +31,14 @@ FURB145 [*] Prefer `copy` method over slicing
 7 | m = l[::]
   |
 help: Replace with `copy()`
-
-ℹ Safe fix
-2 2 | 
-3 3 | # Errors.
-4 4 | a = l[:]
-5   |-b, c = 1, l[:]
-  5 |+b, c = 1, l.copy()
-6 6 | d, e = l[:], 1
-7 7 | m = l[::]
-8 8 | l[:]
+2 | 
+3 | # Errors.
+4 | a = l[:]
+  - b, c = 1, l[:]
+5 + b, c = 1, l.copy()
+6 | d, e = l[:], 1
+7 | m = l[::]
+8 | l[:]
 
 FURB145 [*] Prefer `copy` method over slicing
  --> FURB145.py:6:8
@@ -55,16 +51,14 @@ FURB145 [*] Prefer `copy` method over slicing
 8 | l[:]
   |
 help: Replace with `copy()`
-
-ℹ Safe fix
-3 3 | # Errors.
-4 4 | a = l[:]
-5 5 | b, c = 1, l[:]
-6   |-d, e = l[:], 1
-  6 |+d, e = l.copy(), 1
-7 7 | m = l[::]
-8 8 | l[:]
-9 9 | print(l[:])
+3 | # Errors.
+4 | a = l[:]
+5 | b, c = 1, l[:]
+  - d, e = l[:], 1
+6 + d, e = l.copy(), 1
+7 | m = l[::]
+8 | l[:]
+9 | print(l[:])
 
 FURB145 [*] Prefer `copy` method over slicing
  --> FURB145.py:7:5
@@ -77,16 +71,14 @@ FURB145 [*] Prefer `copy` method over slicing
 9 | print(l[:])
   |
 help: Replace with `copy()`
-
-ℹ Safe fix
-4 4 | a = l[:]
-5 5 | b, c = 1, l[:]
-6 6 | d, e = l[:], 1
-7   |-m = l[::]
-  7 |+m = l.copy()
-8 8 | l[:]
-9 9 | print(l[:])
-10 10 | 
+4  | a = l[:]
+5  | b, c = 1, l[:]
+6  | d, e = l[:], 1
+   - m = l[::]
+7  + m = l.copy()
+8  | l[:]
+9  | print(l[:])
+10 | 
 
 FURB145 [*] Prefer `copy` method over slicing
  --> FURB145.py:8:1
@@ -98,16 +90,14 @@ FURB145 [*] Prefer `copy` method over slicing
 9 | print(l[:])
   |
 help: Replace with `copy()`
-
-ℹ Safe fix
-5 5 | b, c = 1, l[:]
-6 6 | d, e = l[:], 1
-7 7 | m = l[::]
-8   |-l[:]
-  8 |+l.copy()
-9 9 | print(l[:])
-10 10 | 
-11 11 | # False negatives.
+5  | b, c = 1, l[:]
+6  | d, e = l[:], 1
+7  | m = l[::]
+   - l[:]
+8  + l.copy()
+9  | print(l[:])
+10 | 
+11 | # False negatives.
 
 FURB145 [*] Prefer `copy` method over slicing
   --> FURB145.py:9:7
@@ -120,13 +110,11 @@ FURB145 [*] Prefer `copy` method over slicing
 11 | # False negatives.
    |
 help: Replace with `copy()`
-
-ℹ Safe fix
-6  6  | d, e = l[:], 1
-7  7  | m = l[::]
-8  8  | l[:]
-9     |-print(l[:])
-   9  |+print(l.copy())
-10 10 | 
-11 11 | # False negatives.
-12 12 | aa = a[:]  # Type inference.
+6  | d, e = l[:], 1
+7  | m = l[::]
+8  | l[:]
+   - print(l[:])
+9  + print(l.copy())
+10 | 
+11 | # False negatives.
+12 | aa = a[:]  # Type inference.
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap
index bc19dd98ab..0297e6c65d 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap
@@ -10,16 +10,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 15 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-11 11 | books_tuple = ("Dune", "Foundation", "Neuromancer")
-12 12 | 
-13 13 | # Errors
-14    |-for index, _ in enumerate(books):
-   14 |+for index in range(len(books)):
-15 15 |     print(index)
-16 16 | 
-17 17 | for index, _ in enumerate(books, start=0):
+11 | books_tuple = ("Dune", "Foundation", "Neuromancer")
+12 | 
+13 | # Errors
+   - for index, _ in enumerate(books):
+14 + for index in range(len(books)):
+15 |     print(index)
+16 | 
+17 | for index, _ in enumerate(books, start=0):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:17:17
@@ -31,16 +30,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 18 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-14 14 | for index, _ in enumerate(books):
-15 15 |     print(index)
-16 16 | 
-17    |-for index, _ in enumerate(books, start=0):
-   17 |+for index in range(len(books)):
-18 18 |     print(index)
-19 19 | 
-20 20 | for index, _ in enumerate(books, 0):
+14 | for index, _ in enumerate(books):
+15 |     print(index)
+16 | 
+   - for index, _ in enumerate(books, start=0):
+17 + for index in range(len(books)):
+18 |     print(index)
+19 | 
+20 | for index, _ in enumerate(books, 0):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:20:17
@@ -52,16 +50,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 21 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-17 17 | for index, _ in enumerate(books, start=0):
-18 18 |     print(index)
-19 19 | 
-20    |-for index, _ in enumerate(books, 0):
-   20 |+for index in range(len(books)):
-21 21 |     print(index)
-22 22 | 
-23 23 | for index, _ in enumerate(books, start=1):
+17 | for index, _ in enumerate(books, start=0):
+18 |     print(index)
+19 | 
+   - for index, _ in enumerate(books, 0):
+20 + for index in range(len(books)):
+21 |     print(index)
+22 | 
+23 | for index, _ in enumerate(books, start=1):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:23:17
@@ -117,16 +114,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 36 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-32 32 | for index, _ in enumerate(books, x):
-33 33 |     print(book)
-34 34 | 
-35    |-for _, book in enumerate(books):
-   35 |+for book in books:
-36 36 |     print(book)
-37 37 | 
-38 38 | for _, book in enumerate(books, start=0):
+32 | for index, _ in enumerate(books, x):
+33 |     print(book)
+34 | 
+   - for _, book in enumerate(books):
+35 + for book in books:
+36 |     print(book)
+37 | 
+38 | for _, book in enumerate(books, start=0):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:38:16
@@ -138,16 +134,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 39 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-35 35 | for _, book in enumerate(books):
-36 36 |     print(book)
-37 37 | 
-38    |-for _, book in enumerate(books, start=0):
-   38 |+for book in books:
-39 39 |     print(book)
-40 40 | 
-41 41 | for _, book in enumerate(books, 0):
+35 | for _, book in enumerate(books):
+36 |     print(book)
+37 | 
+   - for _, book in enumerate(books, start=0):
+38 + for book in books:
+39 |     print(book)
+40 | 
+41 | for _, book in enumerate(books, 0):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:41:16
@@ -159,16 +154,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 42 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-38 38 | for _, book in enumerate(books, start=0):
-39 39 |     print(book)
-40 40 | 
-41    |-for _, book in enumerate(books, 0):
-   41 |+for book in books:
-42 42 |     print(book)
-43 43 | 
-44 44 | for _, book in enumerate(books, start=1):
+38 | for _, book in enumerate(books, start=0):
+39 |     print(book)
+40 | 
+   - for _, book in enumerate(books, 0):
+41 + for book in books:
+42 |     print(book)
+43 | 
+44 | for _, book in enumerate(books, start=1):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:44:16
@@ -180,16 +174,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 45 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-41 41 | for _, book in enumerate(books, 0):
-42 42 |     print(book)
-43 43 | 
-44    |-for _, book in enumerate(books, start=1):
-   44 |+for book in books:
-45 45 |     print(book)
-46 46 | 
-47 47 | for _, book in enumerate(books, 1):
+41 | for _, book in enumerate(books, 0):
+42 |     print(book)
+43 | 
+   - for _, book in enumerate(books, start=1):
+44 + for book in books:
+45 |     print(book)
+46 | 
+47 | for _, book in enumerate(books, 1):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:47:16
@@ -201,16 +194,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 48 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-44 44 | for _, book in enumerate(books, start=1):
-45 45 |     print(book)
-46 46 | 
-47    |-for _, book in enumerate(books, 1):
-   47 |+for book in books:
-48 48 |     print(book)
-49 49 | 
-50 50 | for _, book in enumerate(books, start=x):
+44 | for _, book in enumerate(books, start=1):
+45 |     print(book)
+46 | 
+   - for _, book in enumerate(books, 1):
+47 + for book in books:
+48 |     print(book)
+49 | 
+50 | for _, book in enumerate(books, start=x):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:50:16
@@ -222,16 +214,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 51 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-47 47 | for _, book in enumerate(books, 1):
-48 48 |     print(book)
-49 49 | 
-50    |-for _, book in enumerate(books, start=x):
-   50 |+for book in books:
-51 51 |     print(book)
-52 52 | 
-53 53 | for _, book in enumerate(books, x):
+47 | for _, book in enumerate(books, 1):
+48 |     print(book)
+49 | 
+   - for _, book in enumerate(books, start=x):
+50 + for book in books:
+51 |     print(book)
+52 | 
+53 | for _, book in enumerate(books, x):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:53:16
@@ -243,16 +234,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 54 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-50 50 | for _, book in enumerate(books, start=x):
-51 51 |     print(book)
-52 52 | 
-53    |-for _, book in enumerate(books, x):
-   53 |+for book in books:
-54 54 |     print(book)
-55 55 | 
-56 56 | for index, (_, _) in enumerate(books):
+50 | for _, book in enumerate(books, start=x):
+51 |     print(book)
+52 | 
+   - for _, book in enumerate(books, x):
+53 + for book in books:
+54 |     print(book)
+55 | 
+56 | for index, (_, _) in enumerate(books):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:56:22
@@ -264,16 +254,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 57 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-53 53 | for _, book in enumerate(books, x):
-54 54 |     print(book)
-55 55 | 
-56    |-for index, (_, _) in enumerate(books):
-   56 |+for index in range(len(books)):
-57 57 |     print(index)
-58 58 | 
-59 59 | for (_, _), book in enumerate(books):
+53 | for _, book in enumerate(books, x):
+54 |     print(book)
+55 | 
+   - for index, (_, _) in enumerate(books):
+56 + for index in range(len(books)):
+57 |     print(index)
+58 | 
+59 | for (_, _), book in enumerate(books):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:59:21
@@ -285,16 +274,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 60 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-56 56 | for index, (_, _) in enumerate(books):
-57 57 |     print(index)
-58 58 | 
-59    |-for (_, _), book in enumerate(books):
-   59 |+for book in books:
-60 60 |     print(book)
-61 61 | 
-62 62 | for(index, _)in enumerate(books):
+56 | for index, (_, _) in enumerate(books):
+57 |     print(index)
+58 | 
+   - for (_, _), book in enumerate(books):
+59 + for book in books:
+60 |     print(book)
+61 | 
+62 | for(index, _)in enumerate(books):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:62:17
@@ -306,16 +294,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 63 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-59 59 | for (_, _), book in enumerate(books):
-60 60 |     print(book)
-61 61 | 
-62    |-for(index, _)in enumerate(books):
-   62 |+for index in range(len(books)):
-63 63 |     print(index)
-64 64 | 
-65 65 | for(index), _ in enumerate(books):
+59 | for (_, _), book in enumerate(books):
+60 |     print(book)
+61 | 
+   - for(index, _)in enumerate(books):
+62 + for index in range(len(books)):
+63 |     print(index)
+64 | 
+65 | for(index), _ in enumerate(books):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:65:18
@@ -327,16 +314,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 66 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-62 62 | for(index, _)in enumerate(books):
-63 63 |     print(index)
-64 64 | 
-65    |-for(index), _ in enumerate(books):
-   65 |+for index in range(len(books)):
-66 66 |     print(index)
-67 67 | 
-68 68 | for index, _ in enumerate(books_and_authors):
+62 | for(index, _)in enumerate(books):
+63 |     print(index)
+64 | 
+   - for(index), _ in enumerate(books):
+65 + for index in range(len(books)):
+66 |     print(index)
+67 | 
+68 | for index, _ in enumerate(books_and_authors):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:68:17
@@ -348,16 +334,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 69 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-65 65 | for(index), _ in enumerate(books):
-66 66 |     print(index)
-67 67 | 
-68    |-for index, _ in enumerate(books_and_authors):
-   68 |+for index in range(len(books_and_authors)):
-69 69 |     print(index)
-70 70 | 
-71 71 | for _, book in enumerate(books_and_authors):
+65 | for(index), _ in enumerate(books):
+66 |     print(index)
+67 | 
+   - for index, _ in enumerate(books_and_authors):
+68 + for index in range(len(books_and_authors)):
+69 |     print(index)
+70 | 
+71 | for _, book in enumerate(books_and_authors):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:71:16
@@ -369,16 +354,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 72 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-68 68 | for index, _ in enumerate(books_and_authors):
-69 69 |     print(index)
-70 70 | 
-71    |-for _, book in enumerate(books_and_authors):
-   71 |+for book in books_and_authors:
-72 72 |     print(book)
-73 73 | 
-74 74 | for index, _ in enumerate(books_set):
+68 | for index, _ in enumerate(books_and_authors):
+69 |     print(index)
+70 | 
+   - for _, book in enumerate(books_and_authors):
+71 + for book in books_and_authors:
+72 |     print(book)
+73 | 
+74 | for index, _ in enumerate(books_set):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:74:17
@@ -390,16 +374,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 75 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-71 71 | for _, book in enumerate(books_and_authors):
-72 72 |     print(book)
-73 73 | 
-74    |-for index, _ in enumerate(books_set):
-   74 |+for index in range(len(books_set)):
-75 75 |     print(index)
-76 76 | 
-77 77 | for _, book in enumerate(books_set):
+71 | for _, book in enumerate(books_and_authors):
+72 |     print(book)
+73 | 
+   - for index, _ in enumerate(books_set):
+74 + for index in range(len(books_set)):
+75 |     print(index)
+76 | 
+77 | for _, book in enumerate(books_set):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:77:16
@@ -411,16 +394,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 78 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-74 74 | for index, _ in enumerate(books_set):
-75 75 |     print(index)
-76 76 | 
-77    |-for _, book in enumerate(books_set):
-   77 |+for book in books_set:
-78 78 |     print(book)
-79 79 | 
-80 80 | for index, _ in enumerate(books_tuple):
+74 | for index, _ in enumerate(books_set):
+75 |     print(index)
+76 | 
+   - for _, book in enumerate(books_set):
+77 + for book in books_set:
+78 |     print(book)
+79 | 
+80 | for index, _ in enumerate(books_tuple):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
   --> FURB148.py:80:17
@@ -432,16 +414,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead
 81 |     print(index)
    |
 help: Replace with `range(len(...))`
-
-ℹ Unsafe fix
-77 77 | for _, book in enumerate(books_set):
-78 78 |     print(book)
-79 79 | 
-80    |-for index, _ in enumerate(books_tuple):
-   80 |+for index in range(len(books_tuple)):
-81 81 |     print(index)
-82 82 | 
-83 83 | for _, book in enumerate(books_tuple):
+77 | for _, book in enumerate(books_set):
+78 |     print(book)
+79 | 
+   - for index, _ in enumerate(books_tuple):
+80 + for index in range(len(books_tuple)):
+81 |     print(index)
+82 | 
+83 | for _, book in enumerate(books_tuple):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB148 [*] `enumerate` index is unused, use `for x in y` instead
   --> FURB148.py:83:16
@@ -453,13 +434,12 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead
 84 |     print(book)
    |
 help: Remove `enumerate`
-
-ℹ Unsafe fix
-80 80 | for index, _ in enumerate(books_tuple):
-81 81 |     print(index)
-82 82 | 
-83    |-for _, book in enumerate(books_tuple):
-   83 |+for book in books_tuple:
-84 84 |     print(book)
-85 85 | 
-86 86 | # OK
+80 | for index, _ in enumerate(books_tuple):
+81 |     print(index)
+82 | 
+   - for _, book in enumerate(books_tuple):
+83 + for book in books_tuple:
+84 |     print(book)
+85 | 
+86 | # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap
index 160659757e..2dda6eb163 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap
@@ -12,16 +12,14 @@ FURB152 [*] Replace `3.14` with `math.pi`
 5 | C = 6.28 * r  # FURB152
   |
 help: Use `math.pi`
-
-ℹ Safe fix
-  1 |+import math
-1 2 | r = 3.1  # OK
-2 3 | 
-3   |-A = 3.14 * r ** 2  # FURB152
-  4 |+A = math.pi * r ** 2  # FURB152
-4 5 | 
-5 6 | C = 6.28 * r  # FURB152
-6 7 | 
+1 + import math
+2 | r = 3.1  # OK
+3 | 
+  - A = 3.14 * r ** 2  # FURB152
+4 + A = math.pi * r ** 2  # FURB152
+5 | 
+6 | C = 6.28 * r  # FURB152
+7 | 
 
 FURB152 [*] Replace `6.28` with `math.tau`
  --> FURB152.py:5:5
@@ -34,18 +32,16 @@ FURB152 [*] Replace `6.28` with `math.tau`
 7 | e = 2.71  # FURB152
   |
 help: Use `math.tau`
-
-ℹ Safe fix
-  1 |+import math
-1 2 | r = 3.1  # OK
-2 3 | 
-3 4 | A = 3.14 * r ** 2  # FURB152
-4 5 | 
-5   |-C = 6.28 * r  # FURB152
-  6 |+C = math.tau * r  # FURB152
-6 7 | 
-7 8 | e = 2.71  # FURB152
-8 9 | 
+1 + import math
+2 | r = 3.1  # OK
+3 | 
+4 | A = 3.14 * r ** 2  # FURB152
+5 | 
+  - C = 6.28 * r  # FURB152
+6 + C = math.tau * r  # FURB152
+7 | 
+8 | e = 2.71  # FURB152
+9 | 
 
 FURB152 [*] Replace `2.71` with `math.e`
  --> FURB152.py:7:5
@@ -58,20 +54,18 @@ FURB152 [*] Replace `2.71` with `math.e`
 9 | r = 3.15  # OK
   |
 help: Use `math.e`
-
-ℹ Safe fix
-  1 |+import math
-1 2 | r = 3.1  # OK
-2 3 | 
-3 4 | A = 3.14 * r ** 2  # FURB152
-4 5 | 
-5 6 | C = 6.28 * r  # FURB152
-6 7 | 
-7   |-e = 2.71  # FURB152
-  8 |+e = math.e  # FURB152
-8 9 | 
-9 10 | r = 3.15  # OK
-10 11 | 
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
+5  | 
+6  | C = 6.28 * r  # FURB152
+7  | 
+   - e = 2.71  # FURB152
+8  + e = math.e  # FURB152
+9  | 
+10 | r = 3.15  # OK
+11 | 
 
 FURB152 [*] Replace `3.141` with `math.pi`
   --> FURB152.py:11:5
@@ -84,21 +78,19 @@ FURB152 [*] Replace `3.141` with `math.pi`
 13 | r = 3.142  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-8  9  | 
-9  10 | r = 3.15  # OK
-10 11 | 
-11    |-r = 3.141  # FURB152
-   12 |+r = math.pi  # FURB152
-12 13 | 
-13 14 | r = 3.142  # FURB152
-14 15 | 
+9  | 
+10 | r = 3.15  # OK
+11 | 
+   - r = 3.141  # FURB152
+12 + r = math.pi  # FURB152
+13 | 
+14 | r = 3.142  # FURB152
+15 | 
 
 FURB152 [*] Replace `3.142` with `math.pi`
   --> FURB152.py:13:5
@@ -111,21 +103,19 @@ FURB152 [*] Replace `3.142` with `math.pi`
 15 | r = 3.1415  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-10 11 | 
-11 12 | r = 3.141  # FURB152
-12 13 | 
-13    |-r = 3.142  # FURB152
-   14 |+r = math.pi  # FURB152
-14 15 | 
-15 16 | r = 3.1415  # FURB152
-16 17 | 
+11 | 
+12 | r = 3.141  # FURB152
+13 | 
+   - r = 3.142  # FURB152
+14 + r = math.pi  # FURB152
+15 | 
+16 | r = 3.1415  # FURB152
+17 | 
 
 FURB152 [*] Replace `3.1415` with `math.pi`
   --> FURB152.py:15:5
@@ -138,21 +128,19 @@ FURB152 [*] Replace `3.1415` with `math.pi`
 17 | r = 3.1416  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-12 13 | 
-13 14 | r = 3.142  # FURB152
-14 15 | 
-15    |-r = 3.1415  # FURB152
-   16 |+r = math.pi  # FURB152
-16 17 | 
-17 18 | r = 3.1416  # FURB152
-18 19 | 
+13 | 
+14 | r = 3.142  # FURB152
+15 | 
+   - r = 3.1415  # FURB152
+16 + r = math.pi  # FURB152
+17 | 
+18 | r = 3.1416  # FURB152
+19 | 
 
 FURB152 [*] Replace `3.1416` with `math.pi`
   --> FURB152.py:17:5
@@ -165,21 +153,19 @@ FURB152 [*] Replace `3.1416` with `math.pi`
 19 | r = 3.141592  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-14 15 | 
-15 16 | r = 3.1415  # FURB152
-16 17 | 
-17    |-r = 3.1416  # FURB152
-   18 |+r = math.pi  # FURB152
-18 19 | 
-19 20 | r = 3.141592  # FURB152
-20 21 | 
+15 | 
+16 | r = 3.1415  # FURB152
+17 | 
+   - r = 3.1416  # FURB152
+18 + r = math.pi  # FURB152
+19 | 
+20 | r = 3.141592  # FURB152
+21 | 
 
 FURB152 [*] Replace `3.141592` with `math.pi`
   --> FURB152.py:19:5
@@ -192,21 +178,19 @@ FURB152 [*] Replace `3.141592` with `math.pi`
 21 | r = 3.141593  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-16 17 | 
-17 18 | r = 3.1416  # FURB152
-18 19 | 
-19    |-r = 3.141592  # FURB152
-   20 |+r = math.pi  # FURB152
-20 21 | 
-21 22 | r = 3.141593  # FURB152
-22 23 | 
+17 | 
+18 | r = 3.1416  # FURB152
+19 | 
+   - r = 3.141592  # FURB152
+20 + r = math.pi  # FURB152
+21 | 
+22 | r = 3.141593  # FURB152
+23 | 
 
 FURB152 [*] Replace `3.141593` with `math.pi`
   --> FURB152.py:21:5
@@ -219,21 +203,19 @@ FURB152 [*] Replace `3.141593` with `math.pi`
 23 | r = 3.14159265  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-18 19 | 
-19 20 | r = 3.141592  # FURB152
-20 21 | 
-21    |-r = 3.141593  # FURB152
-   22 |+r = math.pi  # FURB152
-22 23 | 
-23 24 | r = 3.14159265  # FURB152
-24 25 | 
+19 | 
+20 | r = 3.141592  # FURB152
+21 | 
+   - r = 3.141593  # FURB152
+22 + r = math.pi  # FURB152
+23 | 
+24 | r = 3.14159265  # FURB152
+25 | 
 
 FURB152 [*] Replace `3.14159265` with `math.pi`
   --> FURB152.py:23:5
@@ -246,21 +228,19 @@ FURB152 [*] Replace `3.14159265` with `math.pi`
 25 | r = 3.141592653589793238462643383279  # FURB152
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-20 21 | 
-21 22 | r = 3.141593  # FURB152
-22 23 | 
-23    |-r = 3.14159265  # FURB152
-   24 |+r = math.pi  # FURB152
-24 25 | 
-25 26 | r = 3.141592653589793238462643383279  # FURB152
-26 27 | 
+21 | 
+22 | r = 3.141593  # FURB152
+23 | 
+   - r = 3.14159265  # FURB152
+24 + r = math.pi  # FURB152
+25 | 
+26 | r = 3.141592653589793238462643383279  # FURB152
+27 | 
 
 FURB152 [*] Replace `3.141592653589793238462643383279` with `math.pi`
   --> FURB152.py:25:5
@@ -273,21 +253,19 @@ FURB152 [*] Replace `3.141592653589793238462643383279` with `math.pi`
 27 | r = 3.14159266  # OK
    |
 help: Use `math.pi`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-22 23 | 
-23 24 | r = 3.14159265  # FURB152
-24 25 | 
-25    |-r = 3.141592653589793238462643383279  # FURB152
-   26 |+r = math.pi  # FURB152
-26 27 | 
-27 28 | r = 3.14159266  # OK
-28 29 | 
+23 | 
+24 | r = 3.14159265  # FURB152
+25 | 
+   - r = 3.141592653589793238462643383279  # FURB152
+26 + r = math.pi  # FURB152
+27 | 
+28 | r = 3.14159266  # OK
+29 | 
 
 FURB152 [*] Replace `2.718` with `math.e`
   --> FURB152.py:31:5
@@ -300,21 +278,19 @@ FURB152 [*] Replace `2.718` with `math.e`
 33 | e = 2.7182  # FURB152
    |
 help: Use `math.e`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-28 29 | 
-29 30 | e = 2.7 # OK
-30 31 | 
-31    |-e = 2.718  # FURB152
-   32 |+e = math.e  # FURB152
-32 33 | 
-33 34 | e = 2.7182  # FURB152
-34 35 | 
+29 | 
+30 | e = 2.7 # OK
+31 | 
+   - e = 2.718  # FURB152
+32 + e = math.e  # FURB152
+33 | 
+34 | e = 2.7182  # FURB152
+35 | 
 
 FURB152 [*] Replace `2.7182` with `math.e`
   --> FURB152.py:33:5
@@ -327,21 +303,19 @@ FURB152 [*] Replace `2.7182` with `math.e`
 35 | e = 2.7183  # FURB152
    |
 help: Use `math.e`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-30 31 | 
-31 32 | e = 2.718  # FURB152
-32 33 | 
-33    |-e = 2.7182  # FURB152
-   34 |+e = math.e  # FURB152
-34 35 | 
-35 36 | e = 2.7183  # FURB152
-36 37 | 
+31 | 
+32 | e = 2.718  # FURB152
+33 | 
+   - e = 2.7182  # FURB152
+34 + e = math.e  # FURB152
+35 | 
+36 | e = 2.7183  # FURB152
+37 | 
 
 FURB152 [*] Replace `2.7183` with `math.e`
   --> FURB152.py:35:5
@@ -354,21 +328,19 @@ FURB152 [*] Replace `2.7183` with `math.e`
 37 | e = 2.719  # OK
    |
 help: Use `math.e`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-32 33 | 
-33 34 | e = 2.7182  # FURB152
-34 35 | 
-35    |-e = 2.7183  # FURB152
-   36 |+e = math.e  # FURB152
-36 37 | 
-37 38 | e = 2.719  # OK
-38 39 | 
+33 | 
+34 | e = 2.7182  # FURB152
+35 | 
+   - e = 2.7183  # FURB152
+36 + e = math.e  # FURB152
+37 | 
+38 | e = 2.719  # OK
+39 | 
 
 FURB152 [*] Replace `2.7182000000000001` with `math.e`
   --> FURB152.py:45:5
@@ -379,15 +351,13 @@ FURB152 [*] Replace `2.7182000000000001` with `math.e`
    |     ^^^^^^^^^^^^^^^^^^
    |
 help: Use `math.e`
-
-ℹ Safe fix
-   1  |+import math
-1  2  | r = 3.1  # OK
-2  3  | 
-3  4  | A = 3.14 * r ** 2  # FURB152
+1  + import math
+2  | r = 3.1  # OK
+3  | 
+4  | A = 3.14 * r ** 2  # FURB152
 --------------------------------------------------------------------------------
-42 43 | 
-43 44 | e = 2.718200000000001  # OK
-44 45 | 
-45    |-e = 2.7182000000000001  # FURB152
-   46 |+e = math.e  # FURB152
+43 | 
+44 | e = 2.718200000000001  # OK
+45 | 
+   - e = 2.7182000000000001  # FURB152
+46 + e = math.e  # FURB152
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap
index 31a980d84d..28f6c6a842 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap
@@ -10,17 +10,15 @@ FURB154 [*] Use of repeated consecutive `global`
   | |____________^
   |
 help: Merge `global` statements
-
-ℹ Safe fix
-1 1 | # Errors
-2 2 | 
-3 3 | def f1():
-4   |-    global x
-5   |-    global y
-  4 |+    global x, y
-6 5 | 
-7 6 | 
-8 7 | def f3():
+1 | # Errors
+2 | 
+3 | def f1():
+  -     global x
+  -     global y
+4 +     global x, y
+5 | 
+6 | 
+7 | def f3():
 
 FURB154 [*] Use of repeated consecutive `global`
   --> FURB154.py:9:5
@@ -32,18 +30,16 @@ FURB154 [*] Use of repeated consecutive `global`
    | |____________^
    |
 help: Merge `global` statements
-
-ℹ Safe fix
-6  6  | 
-7  7  | 
-8  8  | def f3():
-9     |-    global x
-10    |-    global y
-11    |-    global z
-   9  |+    global x, y, z
-12 10 | 
-13 11 | 
-14 12 | def f4():
+6  | 
+7  | 
+8  | def f3():
+   -     global x
+   -     global y
+   -     global z
+9  +     global x, y, z
+10 | 
+11 | 
+12 | def f4():
 
 FURB154 [*] Use of repeated consecutive `global`
   --> FURB154.py:15:5
@@ -56,17 +52,15 @@ FURB154 [*] Use of repeated consecutive `global`
 18 |       global x
    |
 help: Merge `global` statements
-
-ℹ Safe fix
-12 12 | 
-13 13 | 
-14 14 | def f4():
-15    |-    global x
-16    |-    global y
-   15 |+    global x, y
-17 16 |     pass
-18 17 |     global x
-19 18 |     global y
+12 | 
+13 | 
+14 | def f4():
+   -     global x
+   -     global y
+15 +     global x, y
+16 |     pass
+17 |     global x
+18 |     global y
 
 FURB154 [*] Use of repeated consecutive `global`
   --> FURB154.py:18:5
@@ -78,17 +72,15 @@ FURB154 [*] Use of repeated consecutive `global`
    | |____________^
    |
 help: Merge `global` statements
-
-ℹ Safe fix
-15 15 |     global x
-16 16 |     global y
-17 17 |     pass
-18    |-    global x
-19    |-    global y
-   18 |+    global x, y
-20 19 | 
-21 20 | 
-22 21 | def f2():
+15 |     global x
+16 |     global y
+17 |     pass
+   -     global x
+   -     global y
+18 +     global x, y
+19 | 
+20 | 
+21 | def f2():
 
 FURB154 [*] Use of repeated consecutive `nonlocal`
   --> FURB154.py:26:9
@@ -101,17 +93,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal`
 29 |       def inner2():
    |
 help: Merge `nonlocal` statements
-
-ℹ Safe fix
-23 23 |     x = y = z = 1
-24 24 | 
-25 25 |     def inner():
-26    |-        nonlocal x
-27    |-        nonlocal y
-   26 |+        nonlocal x, y
-28 27 | 
-29 28 |     def inner2():
-30 29 |         nonlocal x
+23 |     x = y = z = 1
+24 | 
+25 |     def inner():
+   -         nonlocal x
+   -         nonlocal y
+26 +         nonlocal x, y
+27 | 
+28 |     def inner2():
+29 |         nonlocal x
 
 FURB154 [*] Use of repeated consecutive `nonlocal`
   --> FURB154.py:30:9
@@ -125,18 +115,16 @@ FURB154 [*] Use of repeated consecutive `nonlocal`
 34 |       def inner3():
    |
 help: Merge `nonlocal` statements
-
-ℹ Safe fix
-27 27 |         nonlocal y
-28 28 | 
-29 29 |     def inner2():
-30    |-        nonlocal x
-31    |-        nonlocal y
-32    |-        nonlocal z
-   30 |+        nonlocal x, y, z
-33 31 | 
-34 32 |     def inner3():
-35 33 |         nonlocal x
+27 |         nonlocal y
+28 | 
+29 |     def inner2():
+   -         nonlocal x
+   -         nonlocal y
+   -         nonlocal z
+30 +         nonlocal x, y, z
+31 | 
+32 |     def inner3():
+33 |         nonlocal x
 
 FURB154 [*] Use of repeated consecutive `nonlocal`
   --> FURB154.py:35:9
@@ -149,17 +137,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal`
 38 |           nonlocal x
    |
 help: Merge `nonlocal` statements
-
-ℹ Safe fix
-32 32 |         nonlocal z
-33 33 | 
-34 34 |     def inner3():
-35    |-        nonlocal x
-36    |-        nonlocal y
-   35 |+        nonlocal x, y
-37 36 |         pass
-38 37 |         nonlocal x
-39 38 |         nonlocal y
+32 |         nonlocal z
+33 | 
+34 |     def inner3():
+   -         nonlocal x
+   -         nonlocal y
+35 +         nonlocal x, y
+36 |         pass
+37 |         nonlocal x
+38 |         nonlocal y
 
 FURB154 [*] Use of repeated consecutive `nonlocal`
   --> FURB154.py:38:9
@@ -171,17 +157,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal`
    | |__________________^
    |
 help: Merge `nonlocal` statements
-
-ℹ Safe fix
-35 35 |         nonlocal x
-36 36 |         nonlocal y
-37 37 |         pass
-38    |-        nonlocal x
-39    |-        nonlocal y
-   38 |+        nonlocal x, y
-40 39 | 
-41 40 | 
-42 41 | def f5():
+35 |         nonlocal x
+36 |         nonlocal y
+37 |         pass
+   -         nonlocal x
+   -         nonlocal y
+38 +         nonlocal x, y
+39 | 
+40 | 
+41 | def f5():
 
 FURB154 [*] Use of repeated consecutive `global`
   --> FURB154.py:46:9
@@ -194,17 +178,15 @@ FURB154 [*] Use of repeated consecutive `global`
 49 |           nonlocal z
    |
 help: Merge `global` statements
-
-ℹ Safe fix
-43 43 |     w = x = y = z = 1
-44 44 | 
-45 45 |     def inner():
-46    |-        global w
-47    |-        global x
-   46 |+        global w, x
-48 47 |         nonlocal y
-49 48 |         nonlocal z
-50 49 | 
+43 |     w = x = y = z = 1
+44 | 
+45 |     def inner():
+   -         global w
+   -         global x
+46 +         global w, x
+47 |         nonlocal y
+48 |         nonlocal z
+49 | 
 
 FURB154 [*] Use of repeated consecutive `nonlocal`
   --> FURB154.py:48:9
@@ -218,17 +200,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal`
 51 |       def inner2():
    |
 help: Merge `nonlocal` statements
-
-ℹ Safe fix
-45 45 |     def inner():
-46 46 |         global w
-47 47 |         global x
-48    |-        nonlocal y
-49    |-        nonlocal z
-   48 |+        nonlocal y, z
-50 49 | 
-51 50 |     def inner2():
-52 51 |         global x
+45 |     def inner():
+46 |         global w
+47 |         global x
+   -         nonlocal y
+   -         nonlocal z
+48 +         nonlocal y, z
+49 | 
+50 |     def inner2():
+51 |         global x
 
 FURB154 [*] Use of repeated consecutive `nonlocal`
   --> FURB154.py:53:9
@@ -240,17 +220,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal`
    | |__________________^
    |
 help: Merge `nonlocal` statements
-
-ℹ Safe fix
-50 50 | 
-51 51 |     def inner2():
-52 52 |         global x
-53    |-        nonlocal y
-54    |-        nonlocal z
-   53 |+        nonlocal y, z
-55 54 | 
-56 55 | 
-57 56 | def f6():
+50 | 
+51 |     def inner2():
+52 |         global x
+   -         nonlocal y
+   -         nonlocal z
+53 +         nonlocal y, z
+54 | 
+55 | 
+56 | def f6():
 
 FURB154 [*] Use of repeated consecutive `global`
   --> FURB154.py:58:5
@@ -262,15 +240,13 @@ FURB154 [*] Use of repeated consecutive `global`
    | |__________________^
    |
 help: Merge `global` statements
-
-ℹ Safe fix
-55 55 | 
-56 56 | 
-57 57 | def f6():
-58    |-    global x, y, z
-59    |-    global a, b, c
-60    |-    global d, e, f
-   58 |+    global x, y, z, a, b, c, d, e, f
-61 59 | 
-62 60 | 
-63 61 | # Ok
+55 | 
+56 | 
+57 | def f6():
+   -     global x, y, z
+   -     global a, b, c
+   -     global d, e, f
+58 +     global x, y, z, a, b, c, d, e, f
+59 | 
+60 | 
+61 | # Ok
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap
index 110c33052e..dee2d3685a 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap
@@ -12,16 +12,14 @@ FURB156 [*] Use of hardcoded string charset
 5 | _ = "0123456789abcdefABCDEF"
   |
 help: Replace hardcoded charset with `string.digits`
-
-ℹ Safe fix
-1 1 | # Errors
-  2 |+import string
-2 3 | 
-3   |-_ = "0123456789"
-  4 |+_ = string.digits
-4 5 | _ = "01234567"
-5 6 | _ = "0123456789abcdefABCDEF"
-6 7 | _ = "abcdefghijklmnopqrstuvwxyz"
+1 | # Errors
+2 + import string
+3 | 
+  - _ = "0123456789"
+4 + _ = string.digits
+5 | _ = "01234567"
+6 | _ = "0123456789abcdefABCDEF"
+7 | _ = "abcdefghijklmnopqrstuvwxyz"
 
 FURB156 [*] Use of hardcoded string charset
  --> FURB156.py:4:5
@@ -33,17 +31,15 @@ FURB156 [*] Use of hardcoded string charset
 6 | _ = "abcdefghijklmnopqrstuvwxyz"
   |
 help: Replace hardcoded charset with `string.octdigits`
-
-ℹ Safe fix
-1 1 | # Errors
-  2 |+import string
-2 3 | 
-3 4 | _ = "0123456789"
-4   |-_ = "01234567"
-  5 |+_ = string.octdigits
-5 6 | _ = "0123456789abcdefABCDEF"
-6 7 | _ = "abcdefghijklmnopqrstuvwxyz"
-7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+1 | # Errors
+2 + import string
+3 | 
+4 | _ = "0123456789"
+  - _ = "01234567"
+5 + _ = string.octdigits
+6 | _ = "0123456789abcdefABCDEF"
+7 | _ = "abcdefghijklmnopqrstuvwxyz"
+8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 FURB156 [*] Use of hardcoded string charset
  --> FURB156.py:5:5
@@ -56,18 +52,16 @@ FURB156 [*] Use of hardcoded string charset
 7 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
   |
 help: Replace hardcoded charset with `string.hexdigits`
-
-ℹ Safe fix
-1 1 | # Errors
-  2 |+import string
-2 3 | 
-3 4 | _ = "0123456789"
-4 5 | _ = "01234567"
-5   |-_ = "0123456789abcdefABCDEF"
-  6 |+_ = string.hexdigits
-6 7 | _ = "abcdefghijklmnopqrstuvwxyz"
-7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+1 | # Errors
+2 + import string
+3 | 
+4 | _ = "0123456789"
+5 | _ = "01234567"
+  - _ = "0123456789abcdefABCDEF"
+6 + _ = string.hexdigits
+7 | _ = "abcdefghijklmnopqrstuvwxyz"
+8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 FURB156 [*] Use of hardcoded string charset
  --> FURB156.py:6:5
@@ -80,19 +74,17 @@ FURB156 [*] Use of hardcoded string charset
 8 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
   |
 help: Replace hardcoded charset with `string.ascii_lowercase`
-
-ℹ Safe fix
-1 1 | # Errors
-  2 |+import string
-2 3 | 
-3 4 | _ = "0123456789"
-4 5 | _ = "01234567"
-5 6 | _ = "0123456789abcdefABCDEF"
-6   |-_ = "abcdefghijklmnopqrstuvwxyz"
-  7 |+_ = string.ascii_lowercase
-7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
+6  | _ = "0123456789abcdefABCDEF"
+   - _ = "abcdefghijklmnopqrstuvwxyz"
+7  + _ = string.ascii_lowercase
+8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+9  | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
 
 FURB156 [*] Use of hardcoded string charset
  --> FURB156.py:7:5
@@ -105,20 +97,18 @@ FURB156 [*] Use of hardcoded string charset
 9 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
   |
 help: Replace hardcoded charset with `string.ascii_uppercase`
-
-ℹ Safe fix
-1 1 | # Errors
-  2 |+import string
-2 3 | 
-3 4 | _ = "0123456789"
-4 5 | _ = "01234567"
-5 6 | _ = "0123456789abcdefABCDEF"
-6 7 | _ = "abcdefghijklmnopqrstuvwxyz"
-7   |-_ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-  8 |+_ = string.ascii_uppercase
-8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-10 11 | _ = " \t\n\r\v\f"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
+6  | _ = "0123456789abcdefABCDEF"
+7  | _ = "abcdefghijklmnopqrstuvwxyz"
+   - _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+8  + _ = string.ascii_uppercase
+9  | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+11 | _ = " \t\n\r\v\f"
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:8:5
@@ -131,21 +121,19 @@ FURB156 [*] Use of hardcoded string charset
 10 | _ = " \t\n\r\v\f"
    |
 help: Replace hardcoded charset with `string.ascii_letters`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
-5  6  | _ = "0123456789abcdefABCDEF"
-6  7  | _ = "abcdefghijklmnopqrstuvwxyz"
-7  8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-8     |-_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-   9  |+_ = string.ascii_letters
-9  10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-10 11 | _ = " \t\n\r\v\f"
-11 12 | 
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
+6  | _ = "0123456789abcdefABCDEF"
+7  | _ = "abcdefghijklmnopqrstuvwxyz"
+8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+   - _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+9  + _ = string.ascii_letters
+10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+11 | _ = " \t\n\r\v\f"
+12 | 
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:9:5
@@ -157,22 +145,20 @@ FURB156 [*] Use of hardcoded string charset
 10 | _ = " \t\n\r\v\f"
    |
 help: Replace hardcoded charset with `string.punctuation`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-6  7  | _ = "abcdefghijklmnopqrstuvwxyz"
-7  8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-8  9  | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-9     |-_ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-   10 |+_ = string.punctuation
-10 11 | _ = " \t\n\r\v\f"
-11 12 | 
-12 13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
+7  | _ = "abcdefghijklmnopqrstuvwxyz"
+8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+9  | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+   - _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+10 + _ = string.punctuation
+11 | _ = " \t\n\r\v\f"
+12 | 
+13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:10:5
@@ -185,22 +171,20 @@ FURB156 [*] Use of hardcoded string charset
 12 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
    |
 help: Replace hardcoded charset with `string.whitespace`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-7  8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-8  9  | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-9  10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-10    |-_ = " \t\n\r\v\f"
-   11 |+_ = string.whitespace
-11 12 | 
-12 13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
-13 14 | _ = (
+8  | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+9  | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+   - _ = " \t\n\r\v\f"
+11 + _ = string.whitespace
+12 | 
+13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
+14 | _ = (
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:12:5
@@ -213,22 +197,20 @@ FURB156 [*] Use of hardcoded string charset
 14 |     '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
    |
 help: Replace hardcoded charset with `string.printable`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-9  10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-10 11 | _ = " \t\n\r\v\f"
-11 12 | 
-12    |-_ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
-   13 |+_ = string.printable
-13 14 | _ = (
-14 15 |     '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
-15 16 |     "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c"
+10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+11 | _ = " \t\n\r\v\f"
+12 | 
+   - _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
+13 + _ = string.printable
+14 | _ = (
+15 |     '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
+16 |     "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c"
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:14:5
@@ -242,23 +224,21 @@ FURB156 [*] Use of hardcoded string charset
 17 |   _ = id("0123"
    |
 help: Replace hardcoded charset with `string.printable`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-11 12 | 
-12 13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
-13 14 | _ = (
-14    |-    '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
-15    |-    "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c"
-   15 |+    string.printable
-16 16 | )
-17 17 | _ = id("0123"
-18 18 |        "4567"
+12 | 
+13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
+14 | _ = (
+   -     '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
+   -     "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c"
+15 +     string.printable
+16 | )
+17 | _ = id("0123"
+18 |        "4567"
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:17:8
@@ -274,24 +254,22 @@ FURB156 [*] Use of hardcoded string charset
 21 |   _ = (
    |
 help: Replace hardcoded charset with `string.digits`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-14 15 |     '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
-15 16 |     "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c"
-16 17 | )
-17    |-_ = id("0123"
-18    |-       "4567"
-19    |-       "89")
-   18 |+_ = id(string.digits)
-20 19 | 
-21 20 | _ = (
-22 21 |     "0123456789"
+15 |     '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&'
+16 |     "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c"
+17 | )
+   - _ = id("0123"
+   -        "4567"
+   -        "89")
+18 + _ = id(string.digits)
+19 | 
+20 | _ = (
+21 |     "0123456789"
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:22:5
@@ -302,22 +280,20 @@ FURB156 [*] Use of hardcoded string charset
 23 | ).capitalize()
    |
 help: Replace hardcoded charset with `string.digits`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-19 20 |        "89")
-20 21 | 
-21 22 | _ = (
-22    |-    "0123456789"
-   23 |+    string.digits
-23 24 | ).capitalize()
-24 25 | 
-25 26 | _ = (
+20 |        "89")
+21 | 
+22 | _ = (
+   -     "0123456789"
+23 +     string.digits
+24 | ).capitalize()
+25 | 
+26 | _ = (
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:26:5
@@ -329,22 +305,20 @@ FURB156 [*] Use of hardcoded string charset
 28 | ).capitalize()
    |
 help: Replace hardcoded charset with `string.digits`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-23 24 | ).capitalize()
-24 25 | 
-25 26 | _ = (
-26    |-    "0123456789"
-   27 |+    string.digits
-27 28 |     # with comment
-28 29 | ).capitalize()
-29 30 | 
+24 | ).capitalize()
+25 | 
+26 | _ = (
+   -     "0123456789"
+27 +     string.digits
+28 |     # with comment
+29 | ).capitalize()
+30 | 
 
 FURB156 [*] Use of hardcoded string charset
   --> FURB156.py:31:6
@@ -356,19 +330,17 @@ FURB156 [*] Use of hardcoded string charset
 33 | # OK
    |
 help: Replace hardcoded charset with `string.digits`
-
-ℹ Safe fix
-1  1  | # Errors
-   2  |+import string
-2  3  | 
-3  4  | _ = "0123456789"
-4  5  | _ = "01234567"
+1  | # Errors
+2  + import string
+3  | 
+4  | _ = "0123456789"
+5  | _ = "01234567"
 --------------------------------------------------------------------------------
-28 29 | ).capitalize()
-29 30 | 
-30 31 | # example with augmented assignment
-31    |-_ += "0123456789"
-   32 |+_ += string.digits
-32 33 | 
-33 34 | # OK
-34 35 |
+29 | ).capitalize()
+30 | 
+31 | # example with augmented assignment
+   - _ += "0123456789"
+32 + _ += string.digits
+33 | 
+34 | # OK
+35 |
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap
index 8b422fc66a..3bb10588ab 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap
@@ -11,16 +11,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 7 | Decimal(float("Infinity"))
   |
 help: Replace with `0`
-
-ℹ Safe fix
-2 2 | from decimal import Decimal
-3 3 | 
-4 4 | # Errors
-5   |-Decimal("0")
-  5 |+Decimal(0)
-6 6 | Decimal("-42")
-7 7 | Decimal(float("Infinity"))
-8 8 | Decimal(float("-Infinity"))
+2 | from decimal import Decimal
+3 | 
+4 | # Errors
+  - Decimal("0")
+5 + Decimal(0)
+6 | Decimal("-42")
+7 | Decimal(float("Infinity"))
+8 | Decimal(float("-Infinity"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
  --> FURB157.py:6:9
@@ -33,16 +31,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 8 | Decimal(float("-Infinity"))
   |
 help: Replace with `-42`
-
-ℹ Safe fix
-3 3 | 
-4 4 | # Errors
-5 5 | Decimal("0")
-6   |-Decimal("-42")
-  6 |+Decimal(-42)
-7 7 | Decimal(float("Infinity"))
-8 8 | Decimal(float("-Infinity"))
-9 9 | Decimal(float("inf"))
+3 | 
+4 | # Errors
+5 | Decimal("0")
+  - Decimal("-42")
+6 + Decimal(-42)
+7 | Decimal(float("Infinity"))
+8 | Decimal(float("-Infinity"))
+9 | Decimal(float("inf"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
  --> FURB157.py:7:9
@@ -55,16 +51,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 9 | Decimal(float("inf"))
   |
 help: Replace with `"Infinity"`
-
-ℹ Safe fix
-4 4 | # Errors
-5 5 | Decimal("0")
-6 6 | Decimal("-42")
-7   |-Decimal(float("Infinity"))
-  7 |+Decimal("Infinity")
-8 8 | Decimal(float("-Infinity"))
-9 9 | Decimal(float("inf"))
-10 10 | Decimal(float("-inf"))
+4  | # Errors
+5  | Decimal("0")
+6  | Decimal("-42")
+   - Decimal(float("Infinity"))
+7  + Decimal("Infinity")
+8  | Decimal(float("-Infinity"))
+9  | Decimal(float("inf"))
+10 | Decimal(float("-inf"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:8:9
@@ -77,16 +71,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 10 | Decimal(float("-inf"))
    |
 help: Replace with `"-Infinity"`
-
-ℹ Safe fix
-5 5 | Decimal("0")
-6 6 | Decimal("-42")
-7 7 | Decimal(float("Infinity"))
-8   |-Decimal(float("-Infinity"))
-  8 |+Decimal("-Infinity")
-9 9 | Decimal(float("inf"))
-10 10 | Decimal(float("-inf"))
-11 11 | Decimal(float("nan"))
+5  | Decimal("0")
+6  | Decimal("-42")
+7  | Decimal(float("Infinity"))
+   - Decimal(float("-Infinity"))
+8  + Decimal("-Infinity")
+9  | Decimal(float("inf"))
+10 | Decimal(float("-inf"))
+11 | Decimal(float("nan"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:9:9
@@ -99,16 +91,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 11 | Decimal(float("nan"))
    |
 help: Replace with `"inf"`
-
-ℹ Safe fix
-6  6  | Decimal("-42")
-7  7  | Decimal(float("Infinity"))
-8  8  | Decimal(float("-Infinity"))
-9     |-Decimal(float("inf"))
-   9  |+Decimal("inf")
-10 10 | Decimal(float("-inf"))
-11 11 | Decimal(float("nan"))
-12 12 | decimal.Decimal("0")
+6  | Decimal("-42")
+7  | Decimal(float("Infinity"))
+8  | Decimal(float("-Infinity"))
+   - Decimal(float("inf"))
+9  + Decimal("inf")
+10 | Decimal(float("-inf"))
+11 | Decimal(float("nan"))
+12 | decimal.Decimal("0")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:10:9
@@ -121,16 +111,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 12 | decimal.Decimal("0")
    |
 help: Replace with `"-inf"`
-
-ℹ Safe fix
-7  7  | Decimal(float("Infinity"))
-8  8  | Decimal(float("-Infinity"))
-9  9  | Decimal(float("inf"))
-10    |-Decimal(float("-inf"))
-   10 |+Decimal("-inf")
-11 11 | Decimal(float("nan"))
-12 12 | decimal.Decimal("0")
-13 13 | 
+7  | Decimal(float("Infinity"))
+8  | Decimal(float("-Infinity"))
+9  | Decimal(float("inf"))
+   - Decimal(float("-inf"))
+10 + Decimal("-inf")
+11 | Decimal(float("nan"))
+12 | decimal.Decimal("0")
+13 | 
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:11:9
@@ -142,16 +130,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 12 | decimal.Decimal("0")
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-8  8  | Decimal(float("-Infinity"))
-9  9  | Decimal(float("inf"))
-10 10 | Decimal(float("-inf"))
-11    |-Decimal(float("nan"))
-   11 |+Decimal("nan")
-12 12 | decimal.Decimal("0")
-13 13 | 
-14 14 | # OK
+8  | Decimal(float("-Infinity"))
+9  | Decimal(float("inf"))
+10 | Decimal(float("-inf"))
+   - Decimal(float("nan"))
+11 + Decimal("nan")
+12 | decimal.Decimal("0")
+13 | 
+14 | # OK
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:12:17
@@ -164,16 +150,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 14 | # OK
    |
 help: Replace with `0`
-
-ℹ Safe fix
-9  9  | Decimal(float("inf"))
-10 10 | Decimal(float("-inf"))
-11 11 | Decimal(float("nan"))
-12    |-decimal.Decimal("0")
-   12 |+decimal.Decimal(0)
-13 13 | 
-14 14 | # OK
-15 15 | Decimal(0)
+9  | Decimal(float("inf"))
+10 | Decimal(float("-inf"))
+11 | Decimal(float("nan"))
+   - decimal.Decimal("0")
+12 + decimal.Decimal(0)
+13 | 
+14 | # OK
+15 | Decimal(0)
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:23:9
@@ -184,16 +168,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 24 | Decimal("__1____000") 
    |
 help: Replace with `1000`
-
-ℹ Safe fix
-20 20 | # See https://github.com/astral-sh/ruff/issues/13807
-21 21 | 
-22 22 | # Errors
-23    |-Decimal("1_000")
-   23 |+Decimal(1000)
-24 24 | Decimal("__1____000") 
-25 25 | 
-26 26 | # Ok
+20 | # See https://github.com/astral-sh/ruff/issues/13807
+21 | 
+22 | # Errors
+   - Decimal("1_000")
+23 + Decimal(1000)
+24 | Decimal("__1____000") 
+25 | 
+26 | # Ok
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:24:9
@@ -206,16 +188,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 26 | # Ok
    |
 help: Replace with `1000`
-
-ℹ Safe fix
-21 21 | 
-22 22 | # Errors
-23 23 | Decimal("1_000")
-24    |-Decimal("__1____000") 
-   24 |+Decimal(1000) 
-25 25 | 
-26 26 | # Ok
-27 27 | Decimal("2e-4")
+21 | 
+22 | # Errors
+23 | Decimal("1_000")
+   - Decimal("__1____000") 
+24 + Decimal(1000) 
+25 | 
+26 | # Ok
+27 | Decimal("2e-4")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:48:9
@@ -228,16 +208,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 50 | # In this one case, " -nan ", the fix has to be
    |
 help: Replace with `" nan "`
-
-ℹ Safe fix
-45 45 | 
-46 46 | # Non-finite variants
-47 47 | # https://github.com/astral-sh/ruff/issues/14587
-48    |-Decimal(float(" nan "))          # Decimal(" nan ") 
-   48 |+Decimal(" nan ")          # Decimal(" nan ") 
-49 49 | Decimal(float(" +nan "))         # Decimal(" +nan ")
-50 50 | # In this one case, " -nan ", the fix has to be
-51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
+45 | 
+46 | # Non-finite variants
+47 | # https://github.com/astral-sh/ruff/issues/14587
+   - Decimal(float(" nan "))          # Decimal(" nan ") 
+48 + Decimal(" nan ")          # Decimal(" nan ") 
+49 | Decimal(float(" +nan "))         # Decimal(" +nan ")
+50 | # In this one case, " -nan ", the fix has to be
+51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:49:9
@@ -250,16 +228,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
    |
 help: Replace with `" +nan "`
-
-ℹ Safe fix
-46 46 | # Non-finite variants
-47 47 | # https://github.com/astral-sh/ruff/issues/14587
-48 48 | Decimal(float(" nan "))          # Decimal(" nan ") 
-49    |-Decimal(float(" +nan "))         # Decimal(" +nan ")
-   49 |+Decimal(" +nan ")         # Decimal(" +nan ")
-50 50 | # In this one case, " -nan ", the fix has to be
-51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
-52 52 | Decimal(float(" -nan "))         # Decimal("nan")
+46 | # Non-finite variants
+47 | # https://github.com/astral-sh/ruff/issues/14587
+48 | Decimal(float(" nan "))          # Decimal(" nan ") 
+   - Decimal(float(" +nan "))         # Decimal(" +nan ")
+49 + Decimal(" +nan ")         # Decimal(" +nan ")
+50 | # In this one case, " -nan ", the fix has to be
+51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
+52 | Decimal(float(" -nan "))         # Decimal("nan")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:52:9
@@ -272,16 +248,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-49 49 | Decimal(float(" +nan "))         # Decimal(" +nan ")
-50 50 | # In this one case, " -nan ", the fix has to be
-51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
-52    |-Decimal(float(" -nan "))         # Decimal("nan")
-   52 |+Decimal("nan")         # Decimal("nan")
-53 53 | Decimal(float(" inf "))          # Decimal(" inf ")
-54 54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
-55 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
+49 | Decimal(float(" +nan "))         # Decimal(" +nan ")
+50 | # In this one case, " -nan ", the fix has to be
+51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
+   - Decimal(float(" -nan "))         # Decimal("nan")
+52 + Decimal("nan")         # Decimal("nan")
+53 | Decimal(float(" inf "))          # Decimal(" inf ")
+54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
+55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:53:9
@@ -294,16 +268,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
    |
 help: Replace with `" inf "`
-
-ℹ Safe fix
-50 50 | # In this one case, " -nan ", the fix has to be
-51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
-52 52 | Decimal(float(" -nan "))         # Decimal("nan")
-53    |-Decimal(float(" inf "))          # Decimal(" inf ")
-   53 |+Decimal(" inf ")          # Decimal(" inf ")
-54 54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
-55 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
-56 56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
+50 | # In this one case, " -nan ", the fix has to be
+51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
+52 | Decimal(float(" -nan "))         # Decimal("nan")
+   - Decimal(float(" inf "))          # Decimal(" inf ")
+53 + Decimal(" inf ")          # Decimal(" inf ")
+54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
+55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
+56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:54:9
@@ -316,16 +288,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
    |
 help: Replace with `" +inf "`
-
-ℹ Safe fix
-51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
-52 52 | Decimal(float(" -nan "))         # Decimal("nan")
-53 53 | Decimal(float(" inf "))          # Decimal(" inf ")
-54    |-Decimal(float(" +inf "))         # Decimal(" +inf ")
-   54 |+Decimal(" +inf ")         # Decimal(" +inf ")
-55 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
-56 56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
-57 57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
+51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))`
+52 | Decimal(float(" -nan "))         # Decimal("nan")
+53 | Decimal(float(" inf "))          # Decimal(" inf ")
+   - Decimal(float(" +inf "))         # Decimal(" +inf ")
+54 + Decimal(" +inf ")         # Decimal(" +inf ")
+55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
+56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
+57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:55:9
@@ -338,16 +308,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
    |
 help: Replace with `" -inf "`
-
-ℹ Safe fix
-52 52 | Decimal(float(" -nan "))         # Decimal("nan")
-53 53 | Decimal(float(" inf "))          # Decimal(" inf ")
-54 54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
-55    |-Decimal(float(" -inf "))         # Decimal(" -inf ")
-   55 |+Decimal(" -inf ")         # Decimal(" -inf ")
-56 56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
-57 57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
-58 58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
+52 | Decimal(float(" -nan "))         # Decimal("nan")
+53 | Decimal(float(" inf "))          # Decimal(" inf ")
+54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
+   - Decimal(float(" -inf "))         # Decimal(" -inf ")
+55 + Decimal(" -inf ")         # Decimal(" -inf ")
+56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
+57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
+58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:56:9
@@ -360,16 +328,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
    |
 help: Replace with `" infinity "`
-
-ℹ Safe fix
-53 53 | Decimal(float(" inf "))          # Decimal(" inf ")
-54 54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
-55 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
-56    |-Decimal(float(" infinity "))     # Decimal(" infinity ")
-   56 |+Decimal(" infinity ")     # Decimal(" infinity ")
-57 57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
-58 58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
-59 59 | 
+53 | Decimal(float(" inf "))          # Decimal(" inf ")
+54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
+55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
+   - Decimal(float(" infinity "))     # Decimal(" infinity ")
+56 + Decimal(" infinity ")     # Decimal(" infinity ")
+57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
+58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
+59 | 
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:57:9
@@ -381,16 +347,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
    |
 help: Replace with `" +infinity "`
-
-ℹ Safe fix
-54 54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
-55 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
-56 56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
-57    |-Decimal(float(" +infinity "))    # Decimal(" +infinity ")
-   57 |+Decimal(" +infinity ")    # Decimal(" +infinity ")
-58 58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
-59 59 | 
-60 60 | # Escape sequence handling in "-nan" case
+54 | Decimal(float(" +inf "))         # Decimal(" +inf ")
+55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
+56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
+   - Decimal(float(" +infinity "))    # Decimal(" +infinity ")
+57 + Decimal(" +infinity ")    # Decimal(" +infinity ")
+58 | Decimal(float(" -infinity "))    # Decimal(" -infinity ")
+59 | 
+60 | # Escape sequence handling in "-nan" case
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:58:9
@@ -403,16 +367,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 60 | # Escape sequence handling in "-nan" case
    |
 help: Replace with `" -infinity "`
-
-ℹ Safe fix
-55 55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
-56 56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
-57 57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
-58    |-Decimal(float(" -infinity "))    # Decimal(" -infinity ")
-   58 |+Decimal(" -infinity ")    # Decimal(" -infinity ")
-59 59 | 
-60 60 | # Escape sequence handling in "-nan" case
-61 61 | # Here we do not bother respecting the original whitespace
+55 | Decimal(float(" -inf "))         # Decimal(" -inf ")
+56 | Decimal(float(" infinity "))     # Decimal(" infinity ")
+57 | Decimal(float(" +infinity "))    # Decimal(" +infinity ")
+   - Decimal(float(" -infinity "))    # Decimal(" -infinity ")
+58 + Decimal(" -infinity ")    # Decimal(" -infinity ")
+59 | 
+60 | # Escape sequence handling in "-nan" case
+61 | # Here we do not bother respecting the original whitespace
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:64:9
@@ -425,16 +387,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 66 | Decimal(float("\x20\u002dnan"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-61 61 | # Here we do not bother respecting the original whitespace
-62 62 | # and other trivia when offering a fix.
-63 63 | # https://github.com/astral-sh/ruff/issues/16771
-64    |-Decimal(float("\x2dnan"))
-   64 |+Decimal("nan")
-65 65 | Decimal(float("\x20\x2dnan"))
-66 66 | Decimal(float("\x20\u002dnan"))
-67 67 | Decimal(float("\x20\U0000002dnan"))
+61 | # Here we do not bother respecting the original whitespace
+62 | # and other trivia when offering a fix.
+63 | # https://github.com/astral-sh/ruff/issues/16771
+   - Decimal(float("\x2dnan"))
+64 + Decimal("nan")
+65 | Decimal(float("\x20\x2dnan"))
+66 | Decimal(float("\x20\u002dnan"))
+67 | Decimal(float("\x20\U0000002dnan"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:65:9
@@ -447,16 +407,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 67 | Decimal(float("\x20\U0000002dnan"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-62 62 | # and other trivia when offering a fix.
-63 63 | # https://github.com/astral-sh/ruff/issues/16771
-64 64 | Decimal(float("\x2dnan"))
-65    |-Decimal(float("\x20\x2dnan"))
-   65 |+Decimal("nan")
-66 66 | Decimal(float("\x20\u002dnan"))
-67 67 | Decimal(float("\x20\U0000002dnan"))
-68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+62 | # and other trivia when offering a fix.
+63 | # https://github.com/astral-sh/ruff/issues/16771
+64 | Decimal(float("\x2dnan"))
+   - Decimal(float("\x20\x2dnan"))
+65 + Decimal("nan")
+66 | Decimal(float("\x20\u002dnan"))
+67 | Decimal(float("\x20\U0000002dnan"))
+68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:66:9
@@ -469,16 +427,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-63 63 | # https://github.com/astral-sh/ruff/issues/16771
-64 64 | Decimal(float("\x2dnan"))
-65 65 | Decimal(float("\x20\x2dnan"))
-66    |-Decimal(float("\x20\u002dnan"))
-   66 |+Decimal("nan")
-67 67 | Decimal(float("\x20\U0000002dnan"))
-68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
-69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
+63 | # https://github.com/astral-sh/ruff/issues/16771
+64 | Decimal(float("\x2dnan"))
+65 | Decimal(float("\x20\x2dnan"))
+   - Decimal(float("\x20\u002dnan"))
+66 + Decimal("nan")
+67 | Decimal(float("\x20\U0000002dnan"))
+68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:67:9
@@ -491,16 +447,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-64 64 | Decimal(float("\x2dnan"))
-65 65 | Decimal(float("\x20\x2dnan"))
-66 66 | Decimal(float("\x20\u002dnan"))
-67    |-Decimal(float("\x20\U0000002dnan"))
-   67 |+Decimal("nan")
-68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
-69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
-70 70 | Decimal(float("   -" "nan"))
+64 | Decimal(float("\x2dnan"))
+65 | Decimal(float("\x20\x2dnan"))
+66 | Decimal(float("\x20\u002dnan"))
+   - Decimal(float("\x20\U0000002dnan"))
+67 + Decimal("nan")
+68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
+70 | Decimal(float("   -" "nan"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:68:9
@@ -513,16 +467,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 70 | Decimal(float("   -" "nan"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-65 65 | Decimal(float("\x20\x2dnan"))
-66 66 | Decimal(float("\x20\u002dnan"))
-67 67 | Decimal(float("\x20\U0000002dnan"))
-68    |-Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
-   68 |+Decimal("nan")
-69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
-70 70 | Decimal(float("   -" "nan"))
-71 71 | Decimal(float("-nAn"))
+65 | Decimal(float("\x20\x2dnan"))
+66 | Decimal(float("\x20\u002dnan"))
+67 | Decimal(float("\x20\U0000002dnan"))
+   - Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+68 + Decimal("nan")
+69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
+70 | Decimal(float("   -" "nan"))
+71 | Decimal(float("-nAn"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:69:9
@@ -535,15 +487,13 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 71 | Decimal(float("-nAn"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-66 66 | Decimal(float("\x20\u002dnan"))
-67 67 | Decimal(float("\x20\U0000002dnan"))
-68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
-69    |-Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
-   69 |+Decimal("nan")
-70 70 | Decimal(float("   -" "nan"))
-71 71 | Decimal(float("-nAn"))
+66 | Decimal(float("\x20\u002dnan"))
+67 | Decimal(float("\x20\U0000002dnan"))
+68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+   - Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
+69 + Decimal("nan")
+70 | Decimal(float("   -" "nan"))
+71 | Decimal(float("-nAn"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:70:9
@@ -555,14 +505,12 @@ FURB157 [*] Verbose expression in `Decimal` constructor
 71 | Decimal(float("-nAn"))
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-67 67 | Decimal(float("\x20\U0000002dnan"))
-68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
-69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
-70    |-Decimal(float("   -" "nan"))
-   70 |+Decimal("nan")
-71 71 | Decimal(float("-nAn"))
+67 | Decimal(float("\x20\U0000002dnan"))
+68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
+   - Decimal(float("   -" "nan"))
+70 + Decimal("nan")
+71 | Decimal(float("-nAn"))
 
 FURB157 [*] Verbose expression in `Decimal` constructor
   --> FURB157.py:71:9
@@ -573,10 +521,8 @@ FURB157 [*] Verbose expression in `Decimal` constructor
    |         ^^^^^^^^^^^^^
    |
 help: Replace with `"nan"`
-
-ℹ Safe fix
-68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
-69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
-70 70 | Decimal(float("   -" "nan"))
-71    |-Decimal(float("-nAn"))
-   71 |+Decimal("nan")
+68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan"))
+69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan"))
+70 | Decimal(float("   -" "nan"))
+   - Decimal(float("-nAn"))
+71 + Decimal("nan")
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap
index 8c499ed411..3930eed181 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap
@@ -12,16 +12,15 @@ FURB161 [*] Use of `bin(x).count('1')`
 8 | count = bin(0b1010).count("1")  # FURB161
   |
 help: Replace with `(x).bit_count()`
-
-ℹ Unsafe fix
-3 3 | def ten() -> int:
-4 4 |     return 10
-5 5 | 
-6   |-count = bin(x).count("1")  # FURB161
-  6 |+count = (x).bit_count()  # FURB161
-7 7 | count = bin(10).count("1")  # FURB161
-8 8 | count = bin(0b1010).count("1")  # FURB161
-9 9 | count = bin(0xA).count("1")  # FURB161
+3 | def ten() -> int:
+4 |     return 10
+5 | 
+  - count = bin(x).count("1")  # FURB161
+6 + count = (x).bit_count()  # FURB161
+7 | count = bin(10).count("1")  # FURB161
+8 | count = bin(0b1010).count("1")  # FURB161
+9 | count = bin(0xA).count("1")  # FURB161
+note: This is an unsafe fix and may change runtime behavior
 
 FURB161 [*] Use of `bin(10).count('1')`
  --> FURB161.py:7:9
@@ -33,16 +32,14 @@ FURB161 [*] Use of `bin(10).count('1')`
 9 | count = bin(0xA).count("1")  # FURB161
   |
 help: Replace with `(10).bit_count()`
-
-ℹ Safe fix
-4 4 |     return 10
-5 5 | 
-6 6 | count = bin(x).count("1")  # FURB161
-7   |-count = bin(10).count("1")  # FURB161
-  7 |+count = (10).bit_count()  # FURB161
-8 8 | count = bin(0b1010).count("1")  # FURB161
-9 9 | count = bin(0xA).count("1")  # FURB161
-10 10 | count = bin(0o12).count("1")  # FURB161
+4  |     return 10
+5  | 
+6  | count = bin(x).count("1")  # FURB161
+   - count = bin(10).count("1")  # FURB161
+7  + count = (10).bit_count()  # FURB161
+8  | count = bin(0b1010).count("1")  # FURB161
+9  | count = bin(0xA).count("1")  # FURB161
+10 | count = bin(0o12).count("1")  # FURB161
 
 FURB161 [*] Use of `bin(0b1010).count('1')`
   --> FURB161.py:8:9
@@ -55,16 +52,14 @@ FURB161 [*] Use of `bin(0b1010).count('1')`
 10 | count = bin(0o12).count("1")  # FURB161
    |
 help: Replace with `0b1010.bit_count()`
-
-ℹ Safe fix
-5 5 | 
-6 6 | count = bin(x).count("1")  # FURB161
-7 7 | count = bin(10).count("1")  # FURB161
-8   |-count = bin(0b1010).count("1")  # FURB161
-  8 |+count = 0b1010.bit_count()  # FURB161
-9 9 | count = bin(0xA).count("1")  # FURB161
-10 10 | count = bin(0o12).count("1")  # FURB161
-11 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
+5  | 
+6  | count = bin(x).count("1")  # FURB161
+7  | count = bin(10).count("1")  # FURB161
+   - count = bin(0b1010).count("1")  # FURB161
+8  + count = 0b1010.bit_count()  # FURB161
+9  | count = bin(0xA).count("1")  # FURB161
+10 | count = bin(0o12).count("1")  # FURB161
+11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
 
 FURB161 [*] Use of `bin(0xA).count('1')`
   --> FURB161.py:9:9
@@ -77,16 +72,14 @@ FURB161 [*] Use of `bin(0xA).count('1')`
 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
    |
 help: Replace with `0xA.bit_count()`
-
-ℹ Safe fix
-6  6  | count = bin(x).count("1")  # FURB161
-7  7  | count = bin(10).count("1")  # FURB161
-8  8  | count = bin(0b1010).count("1")  # FURB161
-9     |-count = bin(0xA).count("1")  # FURB161
-   9  |+count = 0xA.bit_count()  # FURB161
-10 10 | count = bin(0o12).count("1")  # FURB161
-11 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
-12 12 | count = bin(ten()).count("1")  # FURB161
+6  | count = bin(x).count("1")  # FURB161
+7  | count = bin(10).count("1")  # FURB161
+8  | count = bin(0b1010).count("1")  # FURB161
+   - count = bin(0xA).count("1")  # FURB161
+9  + count = 0xA.bit_count()  # FURB161
+10 | count = bin(0o12).count("1")  # FURB161
+11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
+12 | count = bin(ten()).count("1")  # FURB161
 
 FURB161 [*] Use of `bin(0o12).count('1')`
   --> FURB161.py:10:9
@@ -99,16 +92,14 @@ FURB161 [*] Use of `bin(0o12).count('1')`
 12 | count = bin(ten()).count("1")  # FURB161
    |
 help: Replace with `0o12.bit_count()`
-
-ℹ Safe fix
-7  7  | count = bin(10).count("1")  # FURB161
-8  8  | count = bin(0b1010).count("1")  # FURB161
-9  9  | count = bin(0xA).count("1")  # FURB161
-10    |-count = bin(0o12).count("1")  # FURB161
-   10 |+count = 0o12.bit_count()  # FURB161
-11 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
-12 12 | count = bin(ten()).count("1")  # FURB161
-13 13 | count = bin((10)).count("1")  # FURB161
+7  | count = bin(10).count("1")  # FURB161
+8  | count = bin(0b1010).count("1")  # FURB161
+9  | count = bin(0xA).count("1")  # FURB161
+   - count = bin(0o12).count("1")  # FURB161
+10 + count = 0o12.bit_count()  # FURB161
+11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
+12 | count = bin(ten()).count("1")  # FURB161
+13 | count = bin((10)).count("1")  # FURB161
 
 FURB161 [*] Use of `bin(0x10 + 0x1000).count('1')`
   --> FURB161.py:11:9
@@ -121,16 +112,14 @@ FURB161 [*] Use of `bin(0x10 + 0x1000).count('1')`
 13 | count = bin((10)).count("1")  # FURB161
    |
 help: Replace with `(0x10 + 0x1000).bit_count()`
-
-ℹ Safe fix
-8  8  | count = bin(0b1010).count("1")  # FURB161
-9  9  | count = bin(0xA).count("1")  # FURB161
-10 10 | count = bin(0o12).count("1")  # FURB161
-11    |-count = bin(0x10 + 0x1000).count("1")  # FURB161
-   11 |+count = (0x10 + 0x1000).bit_count()  # FURB161
-12 12 | count = bin(ten()).count("1")  # FURB161
-13 13 | count = bin((10)).count("1")  # FURB161
-14 14 | count = bin("10" "15").count("1")  # FURB161
+8  | count = bin(0b1010).count("1")  # FURB161
+9  | count = bin(0xA).count("1")  # FURB161
+10 | count = bin(0o12).count("1")  # FURB161
+   - count = bin(0x10 + 0x1000).count("1")  # FURB161
+11 + count = (0x10 + 0x1000).bit_count()  # FURB161
+12 | count = bin(ten()).count("1")  # FURB161
+13 | count = bin((10)).count("1")  # FURB161
+14 | count = bin("10" "15").count("1")  # FURB161
 
 FURB161 [*] Use of `bin(ten()).count('1')`
   --> FURB161.py:12:9
@@ -143,16 +132,15 @@ FURB161 [*] Use of `bin(ten()).count('1')`
 14 | count = bin("10" "15").count("1")  # FURB161
    |
 help: Replace with `ten().bit_count()`
-
-ℹ Unsafe fix
-9  9  | count = bin(0xA).count("1")  # FURB161
-10 10 | count = bin(0o12).count("1")  # FURB161
-11 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
-12    |-count = bin(ten()).count("1")  # FURB161
-   12 |+count = ten().bit_count()  # FURB161
-13 13 | count = bin((10)).count("1")  # FURB161
-14 14 | count = bin("10" "15").count("1")  # FURB161
-15 15 | count = bin("123").count("1") # FURB161
+9  | count = bin(0xA).count("1")  # FURB161
+10 | count = bin(0o12).count("1")  # FURB161
+11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
+   - count = bin(ten()).count("1")  # FURB161
+12 + count = ten().bit_count()  # FURB161
+13 | count = bin((10)).count("1")  # FURB161
+14 | count = bin("10" "15").count("1")  # FURB161
+15 | count = bin("123").count("1") # FURB161
+note: This is an unsafe fix and may change runtime behavior
 
 FURB161 [*] Use of `bin(10).count('1')`
   --> FURB161.py:13:9
@@ -165,16 +153,14 @@ FURB161 [*] Use of `bin(10).count('1')`
 15 | count = bin("123").count("1") # FURB161
    |
 help: Replace with `(10).bit_count()`
-
-ℹ Safe fix
-10 10 | count = bin(0o12).count("1")  # FURB161
-11 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
-12 12 | count = bin(ten()).count("1")  # FURB161
-13    |-count = bin((10)).count("1")  # FURB161
-   13 |+count = (10).bit_count()  # FURB161
-14 14 | count = bin("10" "15").count("1")  # FURB161
-15 15 | count = bin("123").count("1") # FURB161
-16 16 | 
+10 | count = bin(0o12).count("1")  # FURB161
+11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
+12 | count = bin(ten()).count("1")  # FURB161
+   - count = bin((10)).count("1")  # FURB161
+13 + count = (10).bit_count()  # FURB161
+14 | count = bin("10" "15").count("1")  # FURB161
+15 | count = bin("123").count("1") # FURB161
+16 | 
 
 FURB161 [*] Use of `bin("10" "15").count('1')`
   --> FURB161.py:14:9
@@ -186,16 +172,15 @@ FURB161 [*] Use of `bin("10" "15").count('1')`
 15 | count = bin("123").count("1") # FURB161
    |
 help: Replace with `("10" "15").bit_count()`
-
-ℹ Unsafe fix
-11 11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
-12 12 | count = bin(ten()).count("1")  # FURB161
-13 13 | count = bin((10)).count("1")  # FURB161
-14    |-count = bin("10" "15").count("1")  # FURB161
-   14 |+count = ("10" "15").bit_count()  # FURB161
-15 15 | count = bin("123").count("1") # FURB161
-16 16 | 
-17 17 | count = x.bit_count()  # OK
+11 | count = bin(0x10 + 0x1000).count("1")  # FURB161
+12 | count = bin(ten()).count("1")  # FURB161
+13 | count = bin((10)).count("1")  # FURB161
+   - count = bin("10" "15").count("1")  # FURB161
+14 + count = ("10" "15").bit_count()  # FURB161
+15 | count = bin("123").count("1") # FURB161
+16 | 
+17 | count = x.bit_count()  # OK
+note: This is an unsafe fix and may change runtime behavior
 
 FURB161 [*] Use of `bin("123").count('1')`
   --> FURB161.py:15:9
@@ -208,13 +193,12 @@ FURB161 [*] Use of `bin("123").count('1')`
 17 | count = x.bit_count()  # OK
    |
 help: Replace with `"123".bit_count()`
-
-ℹ Unsafe fix
-12 12 | count = bin(ten()).count("1")  # FURB161
-13 13 | count = bin((10)).count("1")  # FURB161
-14 14 | count = bin("10" "15").count("1")  # FURB161
-15    |-count = bin("123").count("1") # FURB161
-   15 |+count = "123".bit_count() # FURB161
-16 16 | 
-17 17 | count = x.bit_count()  # OK
-18 18 | count = (10).bit_count()  # OK
+12 | count = bin(ten()).count("1")  # FURB161
+13 | count = bin((10)).count("1")  # FURB161
+14 | count = bin("10" "15").count("1")  # FURB161
+   - count = bin("123").count("1") # FURB161
+15 + count = "123".bit_count() # FURB161
+16 | 
+17 | count = x.bit_count()  # OK
+18 | count = (10).bit_count()  # OK
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap
index d34aad2d15..048da43128 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap
@@ -11,16 +11,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 9 | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
   |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | ### Errors
-7 7 | 
-8   |-datetime.fromisoformat(date.replace("Z", "+00:00"))
-  8 |+datetime.fromisoformat(date)
-9 9 | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
-10 10 | 
-11 11 | datetime.fromisoformat(date[:-1] + "-00")
+5  | 
+6  | ### Errors
+7  | 
+   - datetime.fromisoformat(date.replace("Z", "+00:00"))
+8  + datetime.fromisoformat(date)
+9  | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
+10 | 
+11 | datetime.fromisoformat(date[:-1] + "-00")
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:9:24
@@ -32,16 +31,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 11 | datetime.fromisoformat(date[:-1] + "-00")
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-6  6  | ### Errors
-7  7  | 
-8  8  | datetime.fromisoformat(date.replace("Z", "+00:00"))
-9     |-datetime.fromisoformat(date.replace("Z", "-00:" "00"))
-   9  |+datetime.fromisoformat(date)
-10 10 | 
-11 11 | datetime.fromisoformat(date[:-1] + "-00")
-12 12 | datetime.fromisoformat(date[:-1:] + "-0000")
+6  | ### Errors
+7  | 
+8  | datetime.fromisoformat(date.replace("Z", "+00:00"))
+   - datetime.fromisoformat(date.replace("Z", "-00:" "00"))
+9  + datetime.fromisoformat(date)
+10 | 
+11 | datetime.fromisoformat(date[:-1] + "-00")
+12 | datetime.fromisoformat(date[:-1:] + "-0000")
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:11:24
@@ -53,16 +51,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 12 | datetime.fromisoformat(date[:-1:] + "-0000")
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-8  8  | datetime.fromisoformat(date.replace("Z", "+00:00"))
-9  9  | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
-10 10 | 
-11    |-datetime.fromisoformat(date[:-1] + "-00")
-   11 |+datetime.fromisoformat(date)
-12 12 | datetime.fromisoformat(date[:-1:] + "-0000")
-13 13 | 
-14 14 | datetime.fromisoformat(date.strip("Z") + """+0"""
+8  | datetime.fromisoformat(date.replace("Z", "+00:00"))
+9  | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
+10 | 
+   - datetime.fromisoformat(date[:-1] + "-00")
+11 + datetime.fromisoformat(date)
+12 | datetime.fromisoformat(date[:-1:] + "-0000")
+13 | 
+14 | datetime.fromisoformat(date.strip("Z") + """+0"""
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:12:24
@@ -74,16 +71,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 14 | datetime.fromisoformat(date.strip("Z") + """+0"""
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-9  9  | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
-10 10 | 
-11 11 | datetime.fromisoformat(date[:-1] + "-00")
-12    |-datetime.fromisoformat(date[:-1:] + "-0000")
-   12 |+datetime.fromisoformat(date)
-13 13 | 
-14 14 | datetime.fromisoformat(date.strip("Z") + """+0"""
-15 15 |                                          """0""")
+9  | datetime.fromisoformat(date.replace("Z", "-00:" "00"))
+10 | 
+11 | datetime.fromisoformat(date[:-1] + "-00")
+   - datetime.fromisoformat(date[:-1:] + "-0000")
+12 + datetime.fromisoformat(date)
+13 | 
+14 | datetime.fromisoformat(date.strip("Z") + """+0"""
+15 |                                          """0""")
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:14:24
@@ -97,17 +93,16 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 16 |   datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}')
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-11 11 | datetime.fromisoformat(date[:-1] + "-00")
-12 12 | datetime.fromisoformat(date[:-1:] + "-0000")
-13 13 | 
-14    |-datetime.fromisoformat(date.strip("Z") + """+0"""
-15    |-                                         """0""")
-   14 |+datetime.fromisoformat(date)
-16 15 | datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}')
-17 16 | 
-18 17 | datetime.fromisoformat(
+11 | datetime.fromisoformat(date[:-1] + "-00")
+12 | datetime.fromisoformat(date[:-1:] + "-0000")
+13 | 
+   - datetime.fromisoformat(date.strip("Z") + """+0"""
+   -                                          """0""")
+14 + datetime.fromisoformat(date)
+15 | datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}')
+16 | 
+17 | datetime.fromisoformat(
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:16:24
@@ -120,16 +115,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 18 | datetime.fromisoformat(
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | datetime.fromisoformat(date.strip("Z") + """+0"""
-15 15 |                                          """0""")
-16    |-datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}')
-   16 |+datetime.fromisoformat(date)
-17 17 | 
-18 18 | datetime.fromisoformat(
-19 19 |     # Preserved
+13 | 
+14 | datetime.fromisoformat(date.strip("Z") + """+0"""
+15 |                                          """0""")
+   - datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}')
+16 + datetime.fromisoformat(date)
+17 | 
+18 | datetime.fromisoformat(
+19 |     # Preserved
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:20:5
@@ -143,16 +137,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 23 |   )
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-19 19 |     # Preserved
-20 20 |     (  # Preserved
-21 21 |         date
-22    |-    ).replace("Z", "+00")
-   22 |+    )
-23 23 | )
-24 24 | 
-25 25 | datetime.fromisoformat(
+19 |     # Preserved
+20 |     (  # Preserved
+21 |         date
+   -     ).replace("Z", "+00")
+22 +     )
+23 | )
+24 | 
+25 | datetime.fromisoformat(
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:26:5
@@ -169,20 +162,19 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 33 |   )
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-25 25 | datetime.fromisoformat(
-26 26 |     (date
-27 27 |      # Preserved
-28    |-    )
-29    |-      .
-30    |-        rstrip("Z"
-31    |-               # Unsafe
-32    |-               ) + "-00" # Preserved
-   28 |+    ) # Preserved
-33 29 | )
-34 30 | 
-35 31 | datetime.fromisoformat(
+25 | datetime.fromisoformat(
+26 |     (date
+27 |      # Preserved
+   -     )
+   -       .
+   -         rstrip("Z"
+   -                # Unsafe
+   -                ) + "-00" # Preserved
+28 +     ) # Preserved
+29 | )
+30 | 
+31 | datetime.fromisoformat(
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:36:5
@@ -195,16 +187,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 39 |   )
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-35 35 | datetime.fromisoformat(
-36 36 |     (  # Preserved
-37 37 |         date
-38    |-    ).strip("Z") + "+0000"
-   38 |+    )
-39 39 | )
-40 40 | 
-41 41 | datetime.fromisoformat(
+35 | datetime.fromisoformat(
+36 |     (  # Preserved
+37 |         date
+   -     ).strip("Z") + "+0000"
+38 +     )
+39 | )
+40 | 
+41 | datetime.fromisoformat(
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:42:5
@@ -220,17 +211,16 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
 48 |   )
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-42 42 |     (date
-43 43 |      # Preserved
-44 44 |     )
-45    |-    [  # Unsafe
-46    |-        :-1
-47    |-    ] + "-00"
-48 45 | )
-49 46 | 
-50 47 | 
+42 |     (date
+43 |      # Preserved
+44 |     )
+   -     [  # Unsafe
+   -         :-1
+   -     ] + "-00"
+45 | )
+46 | 
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB162 [*] Unnecessary timezone replacement with zero offset
   --> FURB162.py:52:24
@@ -240,13 +230,12 @@ FURB162 [*] Unnecessary timezone replacement with zero offset
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove `.replace()` call
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | 
-51 51 | # Edge case
-52    |-datetime.fromisoformat("Z2025-01-01T00:00:00Z".strip("Z") + "+00:00")
-   52 |+datetime.fromisoformat("Z2025-01-01T00:00:00Z")
-53 53 | 
-54 54 | 
-55 55 | ### No errors
+49 | 
+50 | 
+51 | # Edge case
+   - datetime.fromisoformat("Z2025-01-01T00:00:00Z".strip("Z") + "+00:00")
+52 + datetime.fromisoformat("Z2025-01-01T00:00:00Z")
+53 | 
+54 | 
+55 | ### No errors
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap
index 3966ed43d0..9c8c186546 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap
@@ -11,16 +11,15 @@ FURB163 [*] Prefer `math.log2(1)` over `math.log` with a redundant base
 6 | math.log(1, math.e)
   |
 help: Replace with `math.log2(1)`
-
-ℹ Unsafe fix
-1 1 | import math
-2 2 | 
-3 3 | # Errors
-4   |-math.log(1, 2)
-  4 |+math.log2(1)
-5 5 | math.log(1, 10)
-6 6 | math.log(1, math.e)
-7 7 | foo = ...
+1 | import math
+2 | 
+3 | # Errors
+  - math.log(1, 2)
+4 + math.log2(1)
+5 | math.log(1, 10)
+6 | math.log(1, math.e)
+7 | foo = ...
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
  --> FURB163.py:5:1
@@ -33,16 +32,15 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
 7 | foo = ...
   |
 help: Replace with `math.log10(1)`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | # Errors
-4 4 | math.log(1, 2)
-5   |-math.log(1, 10)
-  5 |+math.log10(1)
-6 6 | math.log(1, math.e)
-7 7 | foo = ...
-8 8 | math.log(foo, 2)
+2 | 
+3 | # Errors
+4 | math.log(1, 2)
+  - math.log(1, 10)
+5 + math.log10(1)
+6 | math.log(1, math.e)
+7 | foo = ...
+8 | math.log(foo, 2)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log(1)` over `math.log` with a redundant base
  --> FURB163.py:6:1
@@ -55,16 +53,14 @@ FURB163 [*] Prefer `math.log(1)` over `math.log` with a redundant base
 8 | math.log(foo, 2)
   |
 help: Replace with `math.log(1)`
-
-ℹ Safe fix
-3 3 | # Errors
-4 4 | math.log(1, 2)
-5 5 | math.log(1, 10)
-6   |-math.log(1, math.e)
-  6 |+math.log(1)
-7 7 | foo = ...
-8 8 | math.log(foo, 2)
-9 9 | math.log(foo, 10)
+3 | # Errors
+4 | math.log(1, 2)
+5 | math.log(1, 10)
+  - math.log(1, math.e)
+6 + math.log(1)
+7 | foo = ...
+8 | math.log(foo, 2)
+9 | math.log(foo, 10)
 
 FURB163 [*] Prefer `math.log2(foo)` over `math.log` with a redundant base
   --> FURB163.py:8:1
@@ -77,16 +73,15 @@ FURB163 [*] Prefer `math.log2(foo)` over `math.log` with a redundant base
 10 | math.log(foo, math.e)
    |
 help: Replace with `math.log2(foo)`
-
-ℹ Unsafe fix
-5 5 | math.log(1, 10)
-6 6 | math.log(1, math.e)
-7 7 | foo = ...
-8   |-math.log(foo, 2)
-  8 |+math.log2(foo)
-9 9 | math.log(foo, 10)
-10 10 | math.log(foo, math.e)
-11 11 | math.log(1, 2.0)
+5  | math.log(1, 10)
+6  | math.log(1, math.e)
+7  | foo = ...
+   - math.log(foo, 2)
+8  + math.log2(foo)
+9  | math.log(foo, 10)
+10 | math.log(foo, math.e)
+11 | math.log(1, 2.0)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(foo)` over `math.log` with a redundant base
   --> FURB163.py:9:1
@@ -99,16 +94,15 @@ FURB163 [*] Prefer `math.log10(foo)` over `math.log` with a redundant base
 11 | math.log(1, 2.0)
    |
 help: Replace with `math.log10(foo)`
-
-ℹ Unsafe fix
-6  6  | math.log(1, math.e)
-7  7  | foo = ...
-8  8  | math.log(foo, 2)
-9     |-math.log(foo, 10)
-   9  |+math.log10(foo)
-10 10 | math.log(foo, math.e)
-11 11 | math.log(1, 2.0)
-12 12 | math.log(1, 10.0)
+6  | math.log(1, math.e)
+7  | foo = ...
+8  | math.log(foo, 2)
+   - math.log(foo, 10)
+9  + math.log10(foo)
+10 | math.log(foo, math.e)
+11 | math.log(1, 2.0)
+12 | math.log(1, 10.0)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log(foo)` over `math.log` with a redundant base
   --> FURB163.py:10:1
@@ -121,16 +115,14 @@ FURB163 [*] Prefer `math.log(foo)` over `math.log` with a redundant base
 12 | math.log(1, 10.0)
    |
 help: Replace with `math.log(foo)`
-
-ℹ Safe fix
-7  7  | foo = ...
-8  8  | math.log(foo, 2)
-9  9  | math.log(foo, 10)
-10    |-math.log(foo, math.e)
-   10 |+math.log(foo)
-11 11 | math.log(1, 2.0)
-12 12 | math.log(1, 10.0)
-13 13 | 
+7  | foo = ...
+8  | math.log(foo, 2)
+9  | math.log(foo, 10)
+   - math.log(foo, math.e)
+10 + math.log(foo)
+11 | math.log(1, 2.0)
+12 | math.log(1, 10.0)
+13 | 
 
 FURB163 [*] Prefer `math.log2(1)` over `math.log` with a redundant base
   --> FURB163.py:11:1
@@ -142,16 +134,15 @@ FURB163 [*] Prefer `math.log2(1)` over `math.log` with a redundant base
 12 | math.log(1, 10.0)
    |
 help: Replace with `math.log2(1)`
-
-ℹ Unsafe fix
-8  8  | math.log(foo, 2)
-9  9  | math.log(foo, 10)
-10 10 | math.log(foo, math.e)
-11    |-math.log(1, 2.0)
-   11 |+math.log2(1)
-12 12 | math.log(1, 10.0)
-13 13 | 
-14 14 | # OK
+8  | math.log(foo, 2)
+9  | math.log(foo, 10)
+10 | math.log(foo, math.e)
+   - math.log(1, 2.0)
+11 + math.log2(1)
+12 | math.log(1, 10.0)
+13 | 
+14 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
   --> FURB163.py:12:1
@@ -164,16 +155,15 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
 14 | # OK
    |
 help: Replace with `math.log10(1)`
-
-ℹ Unsafe fix
-9  9  | math.log(foo, 10)
-10 10 | math.log(foo, math.e)
-11 11 | math.log(1, 2.0)
-12    |-math.log(1, 10.0)
-   12 |+math.log10(1)
-13 13 | 
-14 14 | # OK
-15 15 | math.log2(1)
+9  | math.log(foo, 10)
+10 | math.log(foo, math.e)
+11 | math.log(1, 2.0)
+   - math.log(1, 10.0)
+12 + math.log10(1)
+13 | 
+14 | # OK
+15 | math.log2(1)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log(yield)` over `math.log` with a redundant base
   --> FURB163.py:49:11
@@ -184,16 +174,14 @@ FURB163 [*] Prefer `math.log(yield)` over `math.log` with a redundant base
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `math.log(yield)`
-
-ℹ Safe fix
-46 46 | 
-47 47 | # https://github.com/astral-sh/ruff/issues/18747
-48 48 | def log():
-49    |-    yield math.log((yield), math.e)
-   49 |+    yield math.log((yield))
-50 50 | 
-51 51 | 
-52 52 | def log():
+46 | 
+47 | # https://github.com/astral-sh/ruff/issues/18747
+48 | def log():
+   -     yield math.log((yield), math.e)
+49 +     yield math.log((yield))
+50 | 
+51 | 
+52 | def log():
 
 FURB163 [*] Prefer `math.log(yield from x)` over `math.log` with a redundant base
   --> FURB163.py:53:11
@@ -205,16 +193,14 @@ FURB163 [*] Prefer `math.log(yield from x)` over `math.log` with a redundant bas
 55 | # see: https://github.com/astral-sh/ruff/issues/18639
    |
 help: Replace with `math.log(yield from x)`
-
-ℹ Safe fix
-50 50 | 
-51 51 | 
-52 52 | def log():
-53    |-    yield math.log((yield from x), math.e)
-   53 |+    yield math.log((yield from x))
-54 54 | 
-55 55 | # see: https://github.com/astral-sh/ruff/issues/18639
-56 56 | math.log(1, 10 # comment
+50 | 
+51 | 
+52 | def log():
+   -     yield math.log((yield from x), math.e)
+53 +     yield math.log((yield from x))
+54 | 
+55 | # see: https://github.com/astral-sh/ruff/issues/18639
+56 | math.log(1, 10 # comment
 
 FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
   --> FURB163.py:56:1
@@ -227,17 +213,16 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
 59 |   math.log(1,
    |
 help: Replace with `math.log10(1)`
-
-ℹ Unsafe fix
-53 53 |     yield math.log((yield from x), math.e)
-54 54 | 
-55 55 | # see: https://github.com/astral-sh/ruff/issues/18639
-56    |-math.log(1, 10 # comment
-57    |-         )
-   56 |+math.log10(1)
-58 57 | 
-59 58 | math.log(1,
-60 59 |          10 # comment
+53 |     yield math.log((yield from x), math.e)
+54 | 
+55 | # see: https://github.com/astral-sh/ruff/issues/18639
+   - math.log(1, 10 # comment
+   -          )
+56 + math.log10(1)
+57 | 
+58 | math.log(1,
+59 |          10 # comment
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
   --> FURB163.py:59:1
@@ -252,18 +237,17 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
 63 |   math.log(1 # comment
    |
 help: Replace with `math.log10(1)`
-
-ℹ Unsafe fix
-56 56 | math.log(1, 10 # comment
-57 57 |          )
-58 58 | 
-59    |-math.log(1,
-60    |-         10 # comment
-61    |-         )
-   59 |+math.log10(1)
-62 60 | 
-63 61 | math.log(1 # comment
-64 62 |          , # comment
+56 | math.log(1, 10 # comment
+57 |          )
+58 | 
+   - math.log(1,
+   -          10 # comment
+   -          )
+59 + math.log10(1)
+60 | 
+61 | math.log(1 # comment
+62 |          , # comment
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
   --> FURB163.py:63:1
@@ -279,19 +263,18 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
 68 |   math.log(
    |
 help: Replace with `math.log10(1)`
-
-ℹ Unsafe fix
-60 60 |          10 # comment
-61 61 |          )
-62 62 | 
-63    |-math.log(1 # comment
-64    |-         , # comment
-65    |-         10 # comment
-66    |-         )
-   63 |+math.log10(1)
-67 64 | 
-68 65 | math.log(
-69 66 |     1 # comment
+60 |          10 # comment
+61 |          )
+62 | 
+   - math.log(1 # comment
+   -          , # comment
+   -          10 # comment
+   -          )
+63 + math.log10(1)
+64 | 
+65 | math.log(
+66 |     1 # comment
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
   --> FURB163.py:68:1
@@ -308,20 +291,19 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base
 74 |   math.log(4.13e223, 2)
    |
 help: Replace with `math.log10(1)`
-
-ℹ Unsafe fix
-65 65 |          10 # comment
-66 66 |          )
-67 67 | 
-68    |-math.log(
-69    |-    1 # comment
-70    |-    ,
-71    |-    10 # comment
-72    |-)
-   68 |+math.log10(1)
-73 69 | 
-74 70 | math.log(4.13e223, 2)
-75 71 | math.log(4.14e223, 10)
+65 |          10 # comment
+66 |          )
+67 | 
+   - math.log(
+   -     1 # comment
+   -     ,
+   -     10 # comment
+   - )
+68 + math.log10(1)
+69 | 
+70 | math.log(4.13e223, 2)
+71 | math.log(4.14e223, 10)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log2(4.13e223)` over `math.log` with a redundant base
   --> FURB163.py:74:1
@@ -333,16 +315,15 @@ FURB163 [*] Prefer `math.log2(4.13e223)` over `math.log` with a redundant base
 75 | math.log(4.14e223, 10)
    |
 help: Replace with `math.log2(4.13e223)`
-
-ℹ Unsafe fix
-71 71 |     10 # comment
-72 72 | )
-73 73 | 
-74    |-math.log(4.13e223, 2)
-   74 |+math.log2(4.13e223)
-75 75 | math.log(4.14e223, 10)
-76 76 | 
-77 77 | 
+71 |     10 # comment
+72 | )
+73 | 
+   - math.log(4.13e223, 2)
+74 + math.log2(4.13e223)
+75 | math.log(4.14e223, 10)
+76 | 
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log10(4.14e223)` over `math.log` with a redundant base
   --> FURB163.py:75:1
@@ -352,16 +333,15 @@ FURB163 [*] Prefer `math.log10(4.14e223)` over `math.log` with a redundant base
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `math.log10(4.14e223)`
-
-ℹ Unsafe fix
-72 72 | )
-73 73 | 
-74 74 | math.log(4.13e223, 2)
-75    |-math.log(4.14e223, 10)
-   75 |+math.log10(4.14e223)
-76 76 | 
-77 77 | 
-78 78 | def print_log(*args):
+72 | )
+73 | 
+74 | math.log(4.13e223, 2)
+   - math.log(4.14e223, 10)
+75 + math.log10(4.14e223)
+76 | 
+77 | 
+78 | def print_log(*args):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB163 [*] Prefer `math.log(*args)` over `math.log` with a redundant base
   --> FURB163.py:80:15
@@ -374,12 +354,11 @@ FURB163 [*] Prefer `math.log(*args)` over `math.log` with a redundant base
 82 |         print(repr(e))
    |
 help: Replace with `math.log(*args)`
-
-ℹ Unsafe fix
-77 77 | 
-78 78 | def print_log(*args):
-79 79 |     try:
-80    |-        print(math.log(*args, math.e))
-   80 |+        print(math.log(*args))
-81 81 |     except TypeError as e:
-82 82 |         print(repr(e))
+77 | 
+78 | def print_log(*args):
+79 |     try:
+   -         print(math.log(*args, math.e))
+80 +         print(math.log(*args))
+81 |     except TypeError as e:
+82 |         print(repr(e))
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap
index 2d866ca424..e917928a64 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap
@@ -11,16 +11,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction
 9 | _ = Fraction.from_float(5.0)
   |
 help: Replace with `Fraction` constructor
-
-ℹ Safe fix
-4 4 | import fractions
-5 5 | 
-6 6 | # Errors
-7   |-_ = Fraction.from_float(0.1)
-  7 |+_ = Fraction(0.1)
-8 8 | _ = Fraction.from_float(-0.5)
-9 9 | _ = Fraction.from_float(5.0)
-10 10 | _ = fractions.Fraction.from_float(4.2)
+4  | import fractions
+5  | 
+6  | # Errors
+   - _ = Fraction.from_float(0.1)
+7  + _ = Fraction(0.1)
+8  | _ = Fraction.from_float(-0.5)
+9  | _ = Fraction.from_float(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
 
 FURB164 [*] Verbose method `from_float` in `Fraction` construction
   --> FURB164.py:8:5
@@ -33,16 +31,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction
 10 | _ = fractions.Fraction.from_float(4.2)
    |
 help: Replace with `Fraction` constructor
-
-ℹ Safe fix
-5 5 | 
-6 6 | # Errors
-7 7 | _ = Fraction.from_float(0.1)
-8   |-_ = Fraction.from_float(-0.5)
-  8 |+_ = Fraction(-0.5)
-9 9 | _ = Fraction.from_float(5.0)
-10 10 | _ = fractions.Fraction.from_float(4.2)
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
+5  | 
+6  | # Errors
+7  | _ = Fraction.from_float(0.1)
+   - _ = Fraction.from_float(-0.5)
+8  + _ = Fraction(-0.5)
+9  | _ = Fraction.from_float(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
 
 FURB164 [*] Verbose method `from_float` in `Fraction` construction
   --> FURB164.py:9:5
@@ -55,16 +51,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction
 11 | _ = Fraction.from_decimal(Decimal("4.2"))
    |
 help: Replace with `Fraction` constructor
-
-ℹ Safe fix
-6  6  | # Errors
-7  7  | _ = Fraction.from_float(0.1)
-8  8  | _ = Fraction.from_float(-0.5)
-9     |-_ = Fraction.from_float(5.0)
-   9  |+_ = Fraction(5.0)
-10 10 | _ = fractions.Fraction.from_float(4.2)
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+6  | # Errors
+7  | _ = Fraction.from_float(0.1)
+8  | _ = Fraction.from_float(-0.5)
+   - _ = Fraction.from_float(5.0)
+9  + _ = Fraction(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
 
 FURB164 [*] Verbose method `from_float` in `Fraction` construction
   --> FURB164.py:10:5
@@ -77,16 +71,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction
 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
    |
 help: Replace with `Fraction` constructor
-
-ℹ Safe fix
-7  7  | _ = Fraction.from_float(0.1)
-8  8  | _ = Fraction.from_float(-0.5)
-9  9  | _ = Fraction.from_float(5.0)
-10    |-_ = fractions.Fraction.from_float(4.2)
-   10 |+_ = fractions.Fraction(4.2)
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
-13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
+7  | _ = Fraction.from_float(0.1)
+8  | _ = Fraction.from_float(-0.5)
+9  | _ = Fraction.from_float(5.0)
+   - _ = fractions.Fraction.from_float(4.2)
+10 + _ = fractions.Fraction(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
 
 FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
   --> FURB164.py:11:5
@@ -99,16 +91,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
    |
 help: Replace with `Fraction` constructor
-
-ℹ Unsafe fix
-8  8  | _ = Fraction.from_float(-0.5)
-9  9  | _ = Fraction.from_float(5.0)
-10 10 | _ = fractions.Fraction.from_float(4.2)
-11    |-_ = Fraction.from_decimal(Decimal("4.2"))
-   11 |+_ = Fraction(Decimal("4.2"))
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
-13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
-14 14 | _ = Decimal.from_float(0.1)
+8  | _ = Fraction.from_float(-0.5)
+9  | _ = Fraction.from_float(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
+   - _ = Fraction.from_decimal(Decimal("4.2"))
+11 + _ = Fraction(Decimal("4.2"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
+14 | _ = Decimal.from_float(0.1)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
   --> FURB164.py:12:5
@@ -121,16 +112,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
 14 | _ = Decimal.from_float(0.1)
    |
 help: Replace with `Fraction` constructor
-
-ℹ Unsafe fix
-9  9  | _ = Fraction.from_float(5.0)
-10 10 | _ = fractions.Fraction.from_float(4.2)
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
-12    |-_ = Fraction.from_decimal(Decimal("-4.2"))
-   12 |+_ = Fraction(Decimal("-4.2"))
-13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
-14 14 | _ = Decimal.from_float(0.1)
-15 15 | _ = Decimal.from_float(-0.5)
+9  | _ = Fraction.from_float(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
+   - _ = Fraction.from_decimal(Decimal("-4.2"))
+12 + _ = Fraction(Decimal("-4.2"))
+13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
+14 | _ = Decimal.from_float(0.1)
+15 | _ = Decimal.from_float(-0.5)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
   --> FURB164.py:13:5
@@ -143,16 +133,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
 15 | _ = Decimal.from_float(-0.5)
    |
 help: Replace with `Fraction` constructor
-
-ℹ Unsafe fix
-10 10 | _ = fractions.Fraction.from_float(4.2)
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
-13    |-_ = Fraction.from_decimal(Decimal.from_float(4.2))
-   13 |+_ = Fraction(Decimal.from_float(4.2))
-14 14 | _ = Decimal.from_float(0.1)
-15 15 | _ = Decimal.from_float(-0.5)
-16 16 | _ = Decimal.from_float(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+   - _ = Fraction.from_decimal(Decimal.from_float(4.2))
+13 + _ = Fraction(Decimal.from_float(4.2))
+14 | _ = Decimal.from_float(0.1)
+15 | _ = Decimal.from_float(-0.5)
+16 | _ = Decimal.from_float(5.0)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:13:27
@@ -165,16 +154,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 15 | _ = Decimal.from_float(-0.5)
    |
 help: Replace with `Decimal` constructor
-
-ℹ Unsafe fix
-10 10 | _ = fractions.Fraction.from_float(4.2)
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
-13    |-_ = Fraction.from_decimal(Decimal.from_float(4.2))
-   13 |+_ = Fraction.from_decimal(Decimal(4.2))
-14 14 | _ = Decimal.from_float(0.1)
-15 15 | _ = Decimal.from_float(-0.5)
-16 16 | _ = Decimal.from_float(5.0)
+10 | _ = fractions.Fraction.from_float(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+   - _ = Fraction.from_decimal(Decimal.from_float(4.2))
+13 + _ = Fraction.from_decimal(Decimal(4.2))
+14 | _ = Decimal.from_float(0.1)
+15 | _ = Decimal.from_float(-0.5)
+16 | _ = Decimal.from_float(5.0)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:14:5
@@ -187,16 +175,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 16 | _ = Decimal.from_float(5.0)
    |
 help: Replace with `Decimal` constructor
-
-ℹ Unsafe fix
-11 11 | _ = Fraction.from_decimal(Decimal("4.2"))
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
-13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
-14    |-_ = Decimal.from_float(0.1)
-   14 |+_ = Decimal(0.1)
-15 15 | _ = Decimal.from_float(-0.5)
-16 16 | _ = Decimal.from_float(5.0)
-17 17 | _ = decimal.Decimal.from_float(4.2)
+11 | _ = Fraction.from_decimal(Decimal("4.2"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
+   - _ = Decimal.from_float(0.1)
+14 + _ = Decimal(0.1)
+15 | _ = Decimal.from_float(-0.5)
+16 | _ = Decimal.from_float(5.0)
+17 | _ = decimal.Decimal.from_float(4.2)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:15:5
@@ -209,16 +196,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 17 | _ = decimal.Decimal.from_float(4.2)
    |
 help: Replace with `Decimal` constructor
-
-ℹ Unsafe fix
-12 12 | _ = Fraction.from_decimal(Decimal("-4.2"))
-13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
-14 14 | _ = Decimal.from_float(0.1)
-15    |-_ = Decimal.from_float(-0.5)
-   15 |+_ = Decimal(-0.5)
-16 16 | _ = Decimal.from_float(5.0)
-17 17 | _ = decimal.Decimal.from_float(4.2)
-18 18 | _ = Decimal.from_float(float("inf"))
+12 | _ = Fraction.from_decimal(Decimal("-4.2"))
+13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
+14 | _ = Decimal.from_float(0.1)
+   - _ = Decimal.from_float(-0.5)
+15 + _ = Decimal(-0.5)
+16 | _ = Decimal.from_float(5.0)
+17 | _ = decimal.Decimal.from_float(4.2)
+18 | _ = Decimal.from_float(float("inf"))
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:16:5
@@ -231,16 +217,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 18 | _ = Decimal.from_float(float("inf"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Unsafe fix
-13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
-14 14 | _ = Decimal.from_float(0.1)
-15 15 | _ = Decimal.from_float(-0.5)
-16    |-_ = Decimal.from_float(5.0)
-   16 |+_ = Decimal(5.0)
-17 17 | _ = decimal.Decimal.from_float(4.2)
-18 18 | _ = Decimal.from_float(float("inf"))
-19 19 | _ = Decimal.from_float(float("-inf"))
+13 | _ = Fraction.from_decimal(Decimal.from_float(4.2))
+14 | _ = Decimal.from_float(0.1)
+15 | _ = Decimal.from_float(-0.5)
+   - _ = Decimal.from_float(5.0)
+16 + _ = Decimal(5.0)
+17 | _ = decimal.Decimal.from_float(4.2)
+18 | _ = Decimal.from_float(float("inf"))
+19 | _ = Decimal.from_float(float("-inf"))
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:17:5
@@ -253,16 +238,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 19 | _ = Decimal.from_float(float("-inf"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Unsafe fix
-14 14 | _ = Decimal.from_float(0.1)
-15 15 | _ = Decimal.from_float(-0.5)
-16 16 | _ = Decimal.from_float(5.0)
-17    |-_ = decimal.Decimal.from_float(4.2)
-   17 |+_ = decimal.Decimal(4.2)
-18 18 | _ = Decimal.from_float(float("inf"))
-19 19 | _ = Decimal.from_float(float("-inf"))
-20 20 | _ = Decimal.from_float(float("Infinity"))
+14 | _ = Decimal.from_float(0.1)
+15 | _ = Decimal.from_float(-0.5)
+16 | _ = Decimal.from_float(5.0)
+   - _ = decimal.Decimal.from_float(4.2)
+17 + _ = decimal.Decimal(4.2)
+18 | _ = Decimal.from_float(float("inf"))
+19 | _ = Decimal.from_float(float("-inf"))
+20 | _ = Decimal.from_float(float("Infinity"))
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:18:5
@@ -275,16 +259,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 20 | _ = Decimal.from_float(float("Infinity"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-15 15 | _ = Decimal.from_float(-0.5)
-16 16 | _ = Decimal.from_float(5.0)
-17 17 | _ = decimal.Decimal.from_float(4.2)
-18    |-_ = Decimal.from_float(float("inf"))
-   18 |+_ = Decimal("inf")
-19 19 | _ = Decimal.from_float(float("-inf"))
-20 20 | _ = Decimal.from_float(float("Infinity"))
-21 21 | _ = Decimal.from_float(float("-Infinity"))
+15 | _ = Decimal.from_float(-0.5)
+16 | _ = Decimal.from_float(5.0)
+17 | _ = decimal.Decimal.from_float(4.2)
+   - _ = Decimal.from_float(float("inf"))
+18 + _ = Decimal("inf")
+19 | _ = Decimal.from_float(float("-inf"))
+20 | _ = Decimal.from_float(float("Infinity"))
+21 | _ = Decimal.from_float(float("-Infinity"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:19:5
@@ -297,16 +279,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 21 | _ = Decimal.from_float(float("-Infinity"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-16 16 | _ = Decimal.from_float(5.0)
-17 17 | _ = decimal.Decimal.from_float(4.2)
-18 18 | _ = Decimal.from_float(float("inf"))
-19    |-_ = Decimal.from_float(float("-inf"))
-   19 |+_ = Decimal("-inf")
-20 20 | _ = Decimal.from_float(float("Infinity"))
-21 21 | _ = Decimal.from_float(float("-Infinity"))
-22 22 | _ = Decimal.from_float(float("nan"))
+16 | _ = Decimal.from_float(5.0)
+17 | _ = decimal.Decimal.from_float(4.2)
+18 | _ = Decimal.from_float(float("inf"))
+   - _ = Decimal.from_float(float("-inf"))
+19 + _ = Decimal("-inf")
+20 | _ = Decimal.from_float(float("Infinity"))
+21 | _ = Decimal.from_float(float("-Infinity"))
+22 | _ = Decimal.from_float(float("nan"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:20:5
@@ -319,16 +299,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 22 | _ = Decimal.from_float(float("nan"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-17 17 | _ = decimal.Decimal.from_float(4.2)
-18 18 | _ = Decimal.from_float(float("inf"))
-19 19 | _ = Decimal.from_float(float("-inf"))
-20    |-_ = Decimal.from_float(float("Infinity"))
-   20 |+_ = Decimal("infinity")
-21 21 | _ = Decimal.from_float(float("-Infinity"))
-22 22 | _ = Decimal.from_float(float("nan"))
-23 23 | _ = Decimal.from_float(float("-NaN "))
+17 | _ = decimal.Decimal.from_float(4.2)
+18 | _ = Decimal.from_float(float("inf"))
+19 | _ = Decimal.from_float(float("-inf"))
+   - _ = Decimal.from_float(float("Infinity"))
+20 + _ = Decimal("infinity")
+21 | _ = Decimal.from_float(float("-Infinity"))
+22 | _ = Decimal.from_float(float("nan"))
+23 | _ = Decimal.from_float(float("-NaN "))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:21:5
@@ -341,16 +319,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 23 | _ = Decimal.from_float(float("-NaN "))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-18 18 | _ = Decimal.from_float(float("inf"))
-19 19 | _ = Decimal.from_float(float("-inf"))
-20 20 | _ = Decimal.from_float(float("Infinity"))
-21    |-_ = Decimal.from_float(float("-Infinity"))
-   21 |+_ = Decimal("-infinity")
-22 22 | _ = Decimal.from_float(float("nan"))
-23 23 | _ = Decimal.from_float(float("-NaN "))
-24 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
+18 | _ = Decimal.from_float(float("inf"))
+19 | _ = Decimal.from_float(float("-inf"))
+20 | _ = Decimal.from_float(float("Infinity"))
+   - _ = Decimal.from_float(float("-Infinity"))
+21 + _ = Decimal("-infinity")
+22 | _ = Decimal.from_float(float("nan"))
+23 | _ = Decimal.from_float(float("-NaN "))
+24 | _ = Decimal.from_float(float(" \n+nan   \t"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:22:5
@@ -363,16 +339,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-19 19 | _ = Decimal.from_float(float("-inf"))
-20 20 | _ = Decimal.from_float(float("Infinity"))
-21 21 | _ = Decimal.from_float(float("-Infinity"))
-22    |-_ = Decimal.from_float(float("nan"))
-   22 |+_ = Decimal("nan")
-23 23 | _ = Decimal.from_float(float("-NaN "))
-24 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
-25 25 | _ = Decimal.from_float(float("  iNf \n\t "))
+19 | _ = Decimal.from_float(float("-inf"))
+20 | _ = Decimal.from_float(float("Infinity"))
+21 | _ = Decimal.from_float(float("-Infinity"))
+   - _ = Decimal.from_float(float("nan"))
+22 + _ = Decimal("nan")
+23 | _ = Decimal.from_float(float("-NaN "))
+24 | _ = Decimal.from_float(float(" \n+nan   \t"))
+25 | _ = Decimal.from_float(float("  iNf \n\t "))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:23:5
@@ -385,16 +359,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 25 | _ = Decimal.from_float(float("  iNf \n\t "))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-20 20 | _ = Decimal.from_float(float("Infinity"))
-21 21 | _ = Decimal.from_float(float("-Infinity"))
-22 22 | _ = Decimal.from_float(float("nan"))
-23    |-_ = Decimal.from_float(float("-NaN "))
-   23 |+_ = Decimal("-nan")
-24 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
-25 25 | _ = Decimal.from_float(float("  iNf \n\t "))
-26 26 | _ = Decimal.from_float(float("   -inF\n \t"))
+20 | _ = Decimal.from_float(float("Infinity"))
+21 | _ = Decimal.from_float(float("-Infinity"))
+22 | _ = Decimal.from_float(float("nan"))
+   - _ = Decimal.from_float(float("-NaN "))
+23 + _ = Decimal("nan")
+24 | _ = Decimal.from_float(float(" \n+nan   \t"))
+25 | _ = Decimal.from_float(float("  iNf \n\t "))
+26 | _ = Decimal.from_float(float("   -inF\n \t"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:24:5
@@ -407,16 +379,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 26 | _ = Decimal.from_float(float("   -inF\n \t"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-21 21 | _ = Decimal.from_float(float("-Infinity"))
-22 22 | _ = Decimal.from_float(float("nan"))
-23 23 | _ = Decimal.from_float(float("-NaN "))
-24    |-_ = Decimal.from_float(float(" \n+nan   \t"))
-   24 |+_ = Decimal("+nan")
-25 25 | _ = Decimal.from_float(float("  iNf \n\t "))
-26 26 | _ = Decimal.from_float(float("   -inF\n \t"))
-27 27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
+21 | _ = Decimal.from_float(float("-Infinity"))
+22 | _ = Decimal.from_float(float("nan"))
+23 | _ = Decimal.from_float(float("-NaN "))
+   - _ = Decimal.from_float(float(" \n+nan   \t"))
+24 + _ = Decimal("+nan")
+25 | _ = Decimal.from_float(float("  iNf \n\t "))
+26 | _ = Decimal.from_float(float("   -inF\n \t"))
+27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:25:5
@@ -429,16 +399,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-22 22 | _ = Decimal.from_float(float("nan"))
-23 23 | _ = Decimal.from_float(float("-NaN "))
-24 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
-25    |-_ = Decimal.from_float(float("  iNf \n\t "))
-   25 |+_ = Decimal("inf")
-26 26 | _ = Decimal.from_float(float("   -inF\n \t"))
-27 27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
-28 28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
+22 | _ = Decimal.from_float(float("nan"))
+23 | _ = Decimal.from_float(float("-NaN "))
+24 | _ = Decimal.from_float(float(" \n+nan   \t"))
+   - _ = Decimal.from_float(float("  iNf \n\t "))
+25 + _ = Decimal("inf")
+26 | _ = Decimal.from_float(float("   -inF\n \t"))
+27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
+28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:26:5
@@ -451,16 +419,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-23 23 | _ = Decimal.from_float(float("-NaN "))
-24 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
-25 25 | _ = Decimal.from_float(float("  iNf \n\t "))
-26    |-_ = Decimal.from_float(float("   -inF\n \t"))
-   26 |+_ = Decimal("-inf")
-27 27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
-28 28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
-29 29 | 
+23 | _ = Decimal.from_float(float("-NaN "))
+24 | _ = Decimal.from_float(float(" \n+nan   \t"))
+25 | _ = Decimal.from_float(float("  iNf \n\t "))
+   - _ = Decimal.from_float(float("   -inF\n \t"))
+26 + _ = Decimal("-inf")
+27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
+28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
+29 | 
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:27:5
@@ -472,16 +438,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-24 24 | _ = Decimal.from_float(float(" \n+nan   \t"))
-25 25 | _ = Decimal.from_float(float("  iNf \n\t "))
-26 26 | _ = Decimal.from_float(float("   -inF\n \t"))
-27    |-_ = Decimal.from_float(float("  InfinIty \n\t "))
-   27 |+_ = Decimal("infinity")
-28 28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
-29 29 | 
-30 30 | # Cases with keyword arguments - should produce unsafe fixes
+24 | _ = Decimal.from_float(float(" \n+nan   \t"))
+25 | _ = Decimal.from_float(float("  iNf \n\t "))
+26 | _ = Decimal.from_float(float("   -inF\n \t"))
+   - _ = Decimal.from_float(float("  InfinIty \n\t "))
+27 + _ = Decimal("infinity")
+28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
+29 | 
+30 | # Cases with keyword arguments - should produce unsafe fixes
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:28:5
@@ -494,16 +458,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 30 | # Cases with keyword arguments - should produce unsafe fixes
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-25 25 | _ = Decimal.from_float(float("  iNf \n\t "))
-26 26 | _ = Decimal.from_float(float("   -inF\n \t"))
-27 27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
-28    |-_ = Decimal.from_float(float("   -InfinIty\n \t"))
-   28 |+_ = Decimal("-infinity")
-29 29 | 
-30 30 | # Cases with keyword arguments - should produce unsafe fixes
-31 31 | _ = Fraction.from_decimal(dec=Decimal("4.2"))
+25 | _ = Decimal.from_float(float("  iNf \n\t "))
+26 | _ = Decimal.from_float(float("   -inF\n \t"))
+27 | _ = Decimal.from_float(float("  InfinIty \n\t "))
+   - _ = Decimal.from_float(float("   -InfinIty\n \t"))
+28 + _ = Decimal("-infinity")
+29 | 
+30 | # Cases with keyword arguments - should produce unsafe fixes
+31 | _ = Fraction.from_decimal(dec=Decimal("4.2"))
 
 FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
   --> FURB164.py:31:5
@@ -514,16 +476,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
 32 | _ = Decimal.from_float(f=4.2)
    |
 help: Replace with `Fraction` constructor
-
-ℹ Unsafe fix
-28 28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
-29 29 | 
-30 30 | # Cases with keyword arguments - should produce unsafe fixes
-31    |-_ = Fraction.from_decimal(dec=Decimal("4.2"))
-   31 |+_ = Fraction(Decimal("4.2"))
-32 32 | _ = Decimal.from_float(f=4.2)
-33 33 | 
-34 34 | # Cases with invalid argument counts - should not get fixes
+28 | _ = Decimal.from_float(float("   -InfinIty\n \t"))
+29 | 
+30 | # Cases with keyword arguments - should produce unsafe fixes
+   - _ = Fraction.from_decimal(dec=Decimal("4.2"))
+31 + _ = Fraction(Decimal("4.2"))
+32 | _ = Decimal.from_float(f=4.2)
+33 | 
+34 | # Cases with invalid argument counts - should not get fixes
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:32:5
@@ -591,16 +552,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 45 | _ = Fraction.from_float("4.2")  # Invalid type for from_float
    |
 help: Replace with `Decimal` constructor
-
-ℹ Unsafe fix
-40 40 | _ = Decimal.from_float(value=4.2)
-41 41 | 
-42 42 | # Cases with type validation issues - should produce unsafe fixes
-43    |-_ = Decimal.from_float("4.2")  # Invalid type for from_float
-   43 |+_ = Decimal("4.2")  # Invalid type for from_float
-44 44 | _ = Fraction.from_decimal(4.2)  # Invalid type for from_decimal
-45 45 | _ = Fraction.from_float("4.2")  # Invalid type for from_float
-46 46 | 
+40 | _ = Decimal.from_float(value=4.2)
+41 | 
+42 | # Cases with type validation issues - should produce unsafe fixes
+   - _ = Decimal.from_float("4.2")  # Invalid type for from_float
+43 + _ = Decimal("4.2")  # Invalid type for from_float
+44 | _ = Fraction.from_decimal(4.2)  # Invalid type for from_decimal
+45 | _ = Fraction.from_float("4.2")  # Invalid type for from_float
+46 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
   --> FURB164.py:44:5
@@ -612,16 +572,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction
 45 | _ = Fraction.from_float("4.2")  # Invalid type for from_float
    |
 help: Replace with `Fraction` constructor
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | # Cases with type validation issues - should produce unsafe fixes
-43 43 | _ = Decimal.from_float("4.2")  # Invalid type for from_float
-44    |-_ = Fraction.from_decimal(4.2)  # Invalid type for from_decimal
-   44 |+_ = Fraction(4.2)  # Invalid type for from_decimal
-45 45 | _ = Fraction.from_float("4.2")  # Invalid type for from_float
-46 46 | 
-47 47 | # OK - should not trigger the rule
+41 | 
+42 | # Cases with type validation issues - should produce unsafe fixes
+43 | _ = Decimal.from_float("4.2")  # Invalid type for from_float
+   - _ = Fraction.from_decimal(4.2)  # Invalid type for from_decimal
+44 + _ = Fraction(4.2)  # Invalid type for from_decimal
+45 | _ = Fraction.from_float("4.2")  # Invalid type for from_float
+46 | 
+47 | # OK - should not trigger the rule
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Fraction` construction
   --> FURB164.py:45:5
@@ -634,16 +593,15 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction
 47 | # OK - should not trigger the rule
    |
 help: Replace with `Fraction` constructor
-
-ℹ Unsafe fix
-42 42 | # Cases with type validation issues - should produce unsafe fixes
-43 43 | _ = Decimal.from_float("4.2")  # Invalid type for from_float
-44 44 | _ = Fraction.from_decimal(4.2)  # Invalid type for from_decimal
-45    |-_ = Fraction.from_float("4.2")  # Invalid type for from_float
-   45 |+_ = Fraction("4.2")  # Invalid type for from_float
-46 46 | 
-47 47 | # OK - should not trigger the rule
-48 48 | _ = Fraction(0.1)
+42 | # Cases with type validation issues - should produce unsafe fixes
+43 | _ = Decimal.from_float("4.2")  # Invalid type for from_float
+44 | _ = Fraction.from_decimal(4.2)  # Invalid type for from_decimal
+   - _ = Fraction.from_float("4.2")  # Invalid type for from_float
+45 + _ = Fraction("4.2")  # Invalid type for from_float
+46 | 
+47 | # OK - should not trigger the rule
+48 | _ = Fraction(0.1)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:60:5
@@ -654,16 +612,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 61 | _ = Decimal.from_float(True)
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-57 57 | _ = decimal.Decimal(4.2)
-58 58 | 
-59 59 | # Cases with int and bool - should produce safe fixes
-60    |-_ = Decimal.from_float(1)
-   60 |+_ = Decimal(1)
-61 61 | _ = Decimal.from_float(True)
-62 62 | 
-63 63 | # Cases with non-finite floats - should produce safe fixes
+57 | _ = decimal.Decimal(4.2)
+58 | 
+59 | # Cases with int and bool - should produce safe fixes
+   - _ = Decimal.from_float(1)
+60 + _ = Decimal(1)
+61 | _ = Decimal.from_float(True)
+62 | 
+63 | # Cases with non-finite floats - should produce safe fixes
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:61:5
@@ -676,16 +632,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 63 | # Cases with non-finite floats - should produce safe fixes
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-58 58 | 
-59 59 | # Cases with int and bool - should produce safe fixes
-60 60 | _ = Decimal.from_float(1)
-61    |-_ = Decimal.from_float(True)
-   61 |+_ = Decimal(True)
-62 62 | 
-63 63 | # Cases with non-finite floats - should produce safe fixes
-64 64 | _ = Decimal.from_float(float("-nan"))
+58 | 
+59 | # Cases with int and bool - should produce safe fixes
+60 | _ = Decimal.from_float(1)
+   - _ = Decimal.from_float(True)
+61 + _ = Decimal(True)
+62 | 
+63 | # Cases with non-finite floats - should produce safe fixes
+64 | _ = Decimal.from_float(float("-nan"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:64:5
@@ -697,15 +651,13 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-61 61 | _ = Decimal.from_float(True)
-62 62 | 
-63 63 | # Cases with non-finite floats - should produce safe fixes
-64    |-_ = Decimal.from_float(float("-nan"))
-   64 |+_ = Decimal("-nan")
-65 65 | _ = Decimal.from_float(float("\x2dnan"))
-66 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
+61 | _ = Decimal.from_float(True)
+62 | 
+63 | # Cases with non-finite floats - should produce safe fixes
+   - _ = Decimal.from_float(float("-nan"))
+64 + _ = Decimal("nan")
+65 | _ = Decimal.from_float(float("\x2dnan"))
+66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:65:5
@@ -717,14 +669,12 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-62 62 | 
-63 63 | # Cases with non-finite floats - should produce safe fixes
-64 64 | _ = Decimal.from_float(float("-nan"))
-65    |-_ = Decimal.from_float(float("\x2dnan"))
-   65 |+_ = Decimal("-nan")
-66 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
+62 | 
+63 | # Cases with non-finite floats - should produce safe fixes
+64 | _ = Decimal.from_float(float("-nan"))
+   - _ = Decimal.from_float(float("\x2dnan"))
+65 + _ = Decimal("nan")
+66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
 
 FURB164 [*] Verbose method `from_float` in `Decimal` construction
   --> FURB164.py:66:5
@@ -735,10 +685,8 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `Decimal` constructor
-
-ℹ Safe fix
-63 63 | # Cases with non-finite floats - should produce safe fixes
-64 64 | _ = Decimal.from_float(float("-nan"))
-65 65 | _ = Decimal.from_float(float("\x2dnan"))
-66    |-_ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
-   66 |+_ = Decimal("-nan")
+63 | # Cases with non-finite floats - should produce safe fixes
+64 | _ = Decimal.from_float(float("-nan"))
+65 | _ = Decimal.from_float(float("\x2dnan"))
+   - _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan"))
+66 + _ = Decimal("nan")
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap
index 2ea45e5340..ada47f04be 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap
@@ -12,15 +12,14 @@ FURB166 [*] Use of `int` with explicit `base=2` after removing prefix
 5 | _ = int("0xFFFF"[2:], 16)
   |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-1 1 | # Errors
-2 2 | 
-3   |-_ = int("0b1010"[2:], 2)
-  3 |+_ = int("0b1010", 0)
-4 4 | _ = int("0o777"[2:], 8)
-5 5 | _ = int("0xFFFF"[2:], 16)
-6 6 | 
+1 | # Errors
+2 | 
+  - _ = int("0b1010"[2:], 2)
+3 + _ = int("0b1010", 0)
+4 | _ = int("0o777"[2:], 8)
+5 | _ = int("0xFFFF"[2:], 16)
+6 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB166 [*] Use of `int` with explicit `base=8` after removing prefix
  --> FURB166.py:4:5
@@ -31,16 +30,15 @@ FURB166 [*] Use of `int` with explicit `base=8` after removing prefix
 5 | _ = int("0xFFFF"[2:], 16)
   |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-1 1 | # Errors
-2 2 | 
-3 3 | _ = int("0b1010"[2:], 2)
-4   |-_ = int("0o777"[2:], 8)
-  4 |+_ = int("0o777", 0)
-5 5 | _ = int("0xFFFF"[2:], 16)
-6 6 | 
-7 7 | b = "0b11"
+1 | # Errors
+2 | 
+3 | _ = int("0b1010"[2:], 2)
+  - _ = int("0o777"[2:], 8)
+4 + _ = int("0o777", 0)
+5 | _ = int("0xFFFF"[2:], 16)
+6 | 
+7 | b = "0b11"
+note: This is an unsafe fix and may change runtime behavior
 
 FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
  --> FURB166.py:5:5
@@ -53,16 +51,15 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
 7 | b = "0b11"
   |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | _ = int("0b1010"[2:], 2)
-4 4 | _ = int("0o777"[2:], 8)
-5   |-_ = int("0xFFFF"[2:], 16)
-  5 |+_ = int("0xFFFF", 0)
-6 6 | 
-7 7 | b = "0b11"
-8 8 | _ = int(b[2:], 2)
+2 | 
+3 | _ = int("0b1010"[2:], 2)
+4 | _ = int("0o777"[2:], 8)
+  - _ = int("0xFFFF"[2:], 16)
+5 + _ = int("0xFFFF", 0)
+6 | 
+7 | b = "0b11"
+8 | _ = int(b[2:], 2)
+note: This is an unsafe fix and may change runtime behavior
 
 FURB166 [*] Use of `int` with explicit `base=2` after removing prefix
   --> FURB166.py:8:5
@@ -74,16 +71,15 @@ FURB166 [*] Use of `int` with explicit `base=2` after removing prefix
 10 | _ = int("0xFFFF"[2:], base=16)
    |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-5 5 | _ = int("0xFFFF"[2:], 16)
-6 6 | 
-7 7 | b = "0b11"
-8   |-_ = int(b[2:], 2)
-  8 |+_ = int(b, 0)
-9 9 | 
-10 10 | _ = int("0xFFFF"[2:], base=16)
-11 11 | 
+5  | _ = int("0xFFFF"[2:], 16)
+6  | 
+7  | b = "0b11"
+   - _ = int(b[2:], 2)
+8  + _ = int(b, 0)
+9  | 
+10 | _ = int("0xFFFF"[2:], base=16)
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
   --> FURB166.py:10:5
@@ -96,16 +92,15 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
 12 | _ = int(b"0xFFFF"[2:], 16)
    |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-7  7  | b = "0b11"
-8  8  | _ = int(b[2:], 2)
-9  9  | 
-10    |-_ = int("0xFFFF"[2:], base=16)
-   10 |+_ = int("0xFFFF", base=0)
-11 11 | 
-12 12 | _ = int(b"0xFFFF"[2:], 16)
-13 13 | 
+7  | b = "0b11"
+8  | _ = int(b[2:], 2)
+9  | 
+   - _ = int("0xFFFF"[2:], base=16)
+10 + _ = int("0xFFFF", base=0)
+11 | 
+12 | _ = int(b"0xFFFF"[2:], 16)
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
   --> FURB166.py:12:5
@@ -116,16 +111,15 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | _ = int("0xFFFF"[2:], base=16)
-11 11 | 
-12    |-_ = int(b"0xFFFF"[2:], 16)
-   12 |+_ = int(b"0xFFFF", 0)
-13 13 | 
-14 14 | 
-15 15 | def get_str():
+9  | 
+10 | _ = int("0xFFFF"[2:], base=16)
+11 | 
+   - _ = int(b"0xFFFF"[2:], 16)
+12 + _ = int(b"0xFFFF", 0)
+13 | 
+14 | 
+15 | def get_str():
+note: This is an unsafe fix and may change runtime behavior
 
 FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
   --> FURB166.py:19:5
@@ -136,13 +130,12 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix
 21 | # OK
    |
 help: Replace with `base=0`
-
-ℹ Unsafe fix
-16 16 |     return "0xFFF"
-17 17 | 
-18 18 | 
-19    |-_ = int(get_str()[2:], 16)
-   19 |+_ = int(get_str(), 0)
-20 20 | 
-21 21 | # OK
-22 22 |
+16 |     return "0xFFF"
+17 | 
+18 | 
+   - _ = int(get_str()[2:], 16)
+19 + _ = int(get_str(), 0)
+20 | 
+21 | # OK
+22 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap
index 63c13cf4d4..9f70110621 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap
@@ -10,16 +10,14 @@ FURB167 [*] Use of regular expression alias `re.I`
 14 |         pass
    |
 help: Replace with `re.IGNORECASE`
-
-ℹ Safe fix
-10 10 |     import re
-11 11 | 
-12 12 |     # FURB167
-13    |-    if re.match("^hello", "hello world", re.I):
-   13 |+    if re.match("^hello", "hello world", re.IGNORECASE):
-14 14 |         pass
-15 15 | 
-16 16 | 
+10 |     import re
+11 | 
+12 |     # FURB167
+   -     if re.match("^hello", "hello world", re.I):
+13 +     if re.match("^hello", "hello world", re.IGNORECASE):
+14 |         pass
+15 | 
+16 | 
 
 FURB167 [*] Use of regular expression alias `re.I`
   --> FURB167.py:21:39
@@ -30,16 +28,14 @@ FURB167 [*] Use of regular expression alias `re.I`
 22 |         pass
    |
 help: Replace with `re.IGNORECASE`
-
-ℹ Safe fix
-   1  |+import re
-1  2  | def func():
-2  3  |     import re
-3  4  | 
+1  + import re
+2  | def func():
+3  |     import re
+4  | 
 --------------------------------------------------------------------------------
-18 19 |     from re import match, I
-19 20 | 
-20 21 |     # FURB167
-21    |-    if match("^hello", "hello world", I):
-   22 |+    if match("^hello", "hello world", re.IGNORECASE):
-22 23 |         pass
+19 |     from re import match, I
+20 | 
+21 |     # FURB167
+   -     if match("^hello", "hello world", I):
+22 +     if match("^hello", "hello world", re.IGNORECASE):
+23 |         pass
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap
index b8a8552814..d4bd261b5f 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap
@@ -11,16 +11,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 6 |     pass
   |
 help: Replace with `is` operator
-
-ℹ Safe fix
-2 2 | 
-3 3 | # Errors.
-4 4 | 
-5   |-if isinstance(foo, type(None)):
-  5 |+if foo is None:
-6 6 |     pass
-7 7 | 
-8 8 | if isinstance(foo and bar, type(None)):
+2 | 
+3 | # Errors.
+4 | 
+  - if isinstance(foo, type(None)):
+5 + if foo is None:
+6 |     pass
+7 | 
+8 | if isinstance(foo and bar, type(None)):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
  --> FURB168.py:8:4
@@ -32,16 +30,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 9 |     pass
   |
 help: Replace with `is` operator
-
-ℹ Safe fix
-5 5 | if isinstance(foo, type(None)):
-6 6 |     pass
-7 7 | 
-8   |-if isinstance(foo and bar, type(None)):
-  8 |+if (foo and bar) is None:
-9 9 |     pass
-10 10 | 
-11 11 | if isinstance(foo, (type(None), type(None), type(None))):
+5  | if isinstance(foo, type(None)):
+6  |     pass
+7  | 
+   - if isinstance(foo and bar, type(None)):
+8  + if (foo and bar) is None:
+9  |     pass
+10 | 
+11 | if isinstance(foo, (type(None), type(None), type(None))):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:11:4
@@ -53,16 +49,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 12 |     pass
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-8  8  | if isinstance(foo and bar, type(None)):
-9  9  |     pass
-10 10 | 
-11    |-if isinstance(foo, (type(None), type(None), type(None))):
-   11 |+if foo is None:
-12 12 |     pass
-13 13 | 
-14 14 | if isinstance(foo, type(None)) is True:
+8  | if isinstance(foo and bar, type(None)):
+9  |     pass
+10 | 
+   - if isinstance(foo, (type(None), type(None), type(None))):
+11 + if foo is None:
+12 |     pass
+13 | 
+14 | if isinstance(foo, type(None)) is True:
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:14:4
@@ -74,16 +68,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 15 |     pass
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-11 11 | if isinstance(foo, (type(None), type(None), type(None))):
-12 12 |     pass
-13 13 | 
-14    |-if isinstance(foo, type(None)) is True:
-   14 |+if (foo is None) is True:
-15 15 |     pass
-16 16 | 
-17 17 | if -isinstance(foo, type(None)):
+11 | if isinstance(foo, (type(None), type(None), type(None))):
+12 |     pass
+13 | 
+   - if isinstance(foo, type(None)) is True:
+14 + if (foo is None) is True:
+15 |     pass
+16 | 
+17 | if -isinstance(foo, type(None)):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:17:5
@@ -95,16 +87,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 18 |     pass
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-14 14 | if isinstance(foo, type(None)) is True:
-15 15 |     pass
-16 16 | 
-17    |-if -isinstance(foo, type(None)):
-   17 |+if -(foo is None):
-18 18 |     pass
-19 19 | 
-20 20 | if isinstance(foo, None | type(None)):
+14 | if isinstance(foo, type(None)) is True:
+15 |     pass
+16 | 
+   - if -isinstance(foo, type(None)):
+17 + if -(foo is None):
+18 |     pass
+19 | 
+20 | if isinstance(foo, None | type(None)):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:20:4
@@ -116,16 +106,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 21 |     pass
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-17 17 | if -isinstance(foo, type(None)):
-18 18 |     pass
-19 19 | 
-20    |-if isinstance(foo, None | type(None)):
-   20 |+if foo is None:
-21 21 |     pass
-22 22 | 
-23 23 | if isinstance(foo, type(None) | type(None)):
+17 | if -isinstance(foo, type(None)):
+18 |     pass
+19 | 
+   - if isinstance(foo, None | type(None)):
+20 + if foo is None:
+21 |     pass
+22 | 
+23 | if isinstance(foo, type(None) | type(None)):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:23:4
@@ -137,16 +125,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 24 |     pass
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-20 20 | if isinstance(foo, None | type(None)):
-21 21 |     pass
-22 22 | 
-23    |-if isinstance(foo, type(None) | type(None)):
-   23 |+if foo is None:
-24 24 |     pass
-25 25 | 
-26 26 | # A bit contrived, but is both technically valid and equivalent to the above.
+20 | if isinstance(foo, None | type(None)):
+21 |     pass
+22 | 
+   - if isinstance(foo, type(None) | type(None)):
+23 + if foo is None:
+24 |     pass
+25 | 
+26 | # A bit contrived, but is both technically valid and equivalent to the above.
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:27:4
@@ -157,16 +143,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 28 |     pass
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-24 24 |     pass
-25 25 | 
-26 26 | # A bit contrived, but is both technically valid and equivalent to the above.
-27    |-if isinstance(foo, (type(None) | ((((type(None))))) | ((None | type(None))))):
-   27 |+if foo is None:
-28 28 |     pass
-29 29 | 
-30 30 | if isinstance(
+24 |     pass
+25 | 
+26 | # A bit contrived, but is both technically valid and equivalent to the above.
+   - if isinstance(foo, (type(None) | ((((type(None))))) | ((None | type(None))))):
+27 + if foo is None:
+28 |     pass
+29 | 
+30 | if isinstance(
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:38:4
@@ -178,16 +162,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 39 |     ...
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-35 35 | 
-36 36 | from typing import Union
-37 37 | 
-38    |-if isinstance(foo, Union[None]):
-   38 |+if foo is None:
-39 39 |     ...
-40 40 | 
-41 41 | if isinstance(foo, Union[None, None]):
+35 | 
+36 | from typing import Union
+37 | 
+   - if isinstance(foo, Union[None]):
+38 + if foo is None:
+39 |     ...
+40 | 
+41 | if isinstance(foo, Union[None, None]):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:41:4
@@ -199,16 +181,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 42 |     ...
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-38 38 | if isinstance(foo, Union[None]):
-39 39 |     ...
-40 40 | 
-41    |-if isinstance(foo, Union[None, None]):
-   41 |+if foo is None:
-42 42 |     ...
-43 43 | 
-44 44 | if isinstance(foo, Union[None, type(None)]):
+38 | if isinstance(foo, Union[None]):
+39 |     ...
+40 | 
+   - if isinstance(foo, Union[None, None]):
+41 + if foo is None:
+42 |     ...
+43 | 
+44 | if isinstance(foo, Union[None, type(None)]):
 
 FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None`
   --> FURB168.py:44:4
@@ -220,13 +200,11 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non
 45 |     ...
    |
 help: Replace with `is` operator
-
-ℹ Safe fix
-41 41 | if isinstance(foo, Union[None, None]):
-42 42 |     ...
-43 43 | 
-44    |-if isinstance(foo, Union[None, type(None)]):
-   44 |+if foo is None:
-45 45 |     ...
-46 46 | 
-47 47 |
+41 | if isinstance(foo, Union[None, None]):
+42 |     ...
+43 | 
+   - if isinstance(foo, Union[None, type(None)]):
+44 + if foo is None:
+45 |     ...
+46 | 
+47 |
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap
index 93c3f0d88b..78132e701c 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap
@@ -12,16 +12,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 7 | type(None) is type(foo)
   |
 help: Replace with `is None`
-
-ℹ Safe fix
-2 2 | 
-3 3 | # Error.
-4 4 | 
-5   |-type(foo) is type(None)
-  5 |+foo is None
-6 6 | 
-7 7 | type(None) is type(foo)
-8 8 | 
+2 | 
+3 | # Error.
+4 | 
+  - type(foo) is type(None)
+5 + foo is None
+6 | 
+7 | type(None) is type(foo)
+8 | 
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
  --> FURB169.py:7:1
@@ -34,16 +32,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 9 | type(None) is type(None)
   |
 help: Replace with `is None`
-
-ℹ Safe fix
-4 4 | 
-5 5 | type(foo) is type(None)
-6 6 | 
-7   |-type(None) is type(foo)
-  7 |+foo is None
-8 8 | 
-9 9 | type(None) is type(None)
-10 10 | 
+4  | 
+5  | type(foo) is type(None)
+6  | 
+   - type(None) is type(foo)
+7  + foo is None
+8  | 
+9  | type(None) is type(None)
+10 | 
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
   --> FURB169.py:9:1
@@ -56,16 +52,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 11 | type(foo) is not type(None)
    |
 help: Replace with `is None`
-
-ℹ Safe fix
-6  6  | 
-7  7  | type(None) is type(foo)
-8  8  | 
-9     |-type(None) is type(None)
-   9  |+None is None
-10 10 | 
-11 11 | type(foo) is not type(None)
-12 12 | 
+6  | 
+7  | type(None) is type(foo)
+8  | 
+   - type(None) is type(None)
+9  + None is None
+10 | 
+11 | type(foo) is not type(None)
+12 | 
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:11:1
@@ -78,16 +72,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 13 | type(None) is not type(foo)
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-8  8  | 
-9  9  | type(None) is type(None)
-10 10 | 
-11    |-type(foo) is not type(None)
-   11 |+foo is not None
-12 12 | 
-13 13 | type(None) is not type(foo)
-14 14 | 
+8  | 
+9  | type(None) is type(None)
+10 | 
+   - type(foo) is not type(None)
+11 + foo is not None
+12 | 
+13 | type(None) is not type(foo)
+14 | 
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:13:1
@@ -100,16 +92,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 15 | type(None) is not type(None)
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-10 10 | 
-11 11 | type(foo) is not type(None)
-12 12 | 
-13    |-type(None) is not type(foo)
-   13 |+foo is not None
-14 14 | 
-15 15 | type(None) is not type(None)
-16 16 | 
+10 | 
+11 | type(foo) is not type(None)
+12 | 
+   - type(None) is not type(foo)
+13 + foo is not None
+14 | 
+15 | type(None) is not type(None)
+16 | 
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:15:1
@@ -122,16 +112,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 17 | type(foo) == type(None)
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-12 12 | 
-13 13 | type(None) is not type(foo)
-14 14 | 
-15    |-type(None) is not type(None)
-   15 |+None is not None
-16 16 | 
-17 17 | type(foo) == type(None)
-18 18 | 
+12 | 
+13 | type(None) is not type(foo)
+14 | 
+   - type(None) is not type(None)
+15 + None is not None
+16 | 
+17 | type(foo) == type(None)
+18 | 
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
   --> FURB169.py:17:1
@@ -144,16 +132,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 19 | type(None) == type(foo)
    |
 help: Replace with `is None`
-
-ℹ Safe fix
-14 14 | 
-15 15 | type(None) is not type(None)
-16 16 | 
-17    |-type(foo) == type(None)
-   17 |+foo is None
-18 18 | 
-19 19 | type(None) == type(foo)
-20 20 | 
+14 | 
+15 | type(None) is not type(None)
+16 | 
+   - type(foo) == type(None)
+17 + foo is None
+18 | 
+19 | type(None) == type(foo)
+20 | 
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
   --> FURB169.py:19:1
@@ -166,16 +152,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 21 | type(None) == type(None)
    |
 help: Replace with `is None`
-
-ℹ Safe fix
-16 16 | 
-17 17 | type(foo) == type(None)
-18 18 | 
-19    |-type(None) == type(foo)
-   19 |+foo is None
-20 20 | 
-21 21 | type(None) == type(None)
-22 22 | 
+16 | 
+17 | type(foo) == type(None)
+18 | 
+   - type(None) == type(foo)
+19 + foo is None
+20 | 
+21 | type(None) == type(None)
+22 | 
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
   --> FURB169.py:21:1
@@ -188,16 +172,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 23 | type(foo) != type(None)
    |
 help: Replace with `is None`
-
-ℹ Safe fix
-18 18 | 
-19 19 | type(None) == type(foo)
-20 20 | 
-21    |-type(None) == type(None)
-   21 |+None is None
-22 22 | 
-23 23 | type(foo) != type(None)
-24 24 | 
+18 | 
+19 | type(None) == type(foo)
+20 | 
+   - type(None) == type(None)
+21 + None is None
+22 | 
+23 | type(foo) != type(None)
+24 | 
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:23:1
@@ -210,16 +192,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 25 | type(None) != type(foo)
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-20 20 | 
-21 21 | type(None) == type(None)
-22 22 | 
-23    |-type(foo) != type(None)
-   23 |+foo is not None
-24 24 | 
-25 25 | type(None) != type(foo)
-26 26 | 
+20 | 
+21 | type(None) == type(None)
+22 | 
+   - type(foo) != type(None)
+23 + foo is not None
+24 | 
+25 | type(None) != type(foo)
+26 | 
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:25:1
@@ -232,16 +212,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 27 | type(None) != type(None)
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-22 22 | 
-23 23 | type(foo) != type(None)
-24 24 | 
-25    |-type(None) != type(foo)
-   25 |+foo is not None
-26 26 | 
-27 27 | type(None) != type(None)
-28 28 | 
+22 | 
+23 | type(foo) != type(None)
+24 | 
+   - type(None) != type(foo)
+25 + foo is not None
+26 | 
+27 | type(None) != type(None)
+28 | 
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:27:1
@@ -254,16 +232,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 29 | type(a.b) is type(None)
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-24 24 | 
-25 25 | type(None) != type(foo)
-26 26 | 
-27    |-type(None) != type(None)
-   27 |+None is not None
-28 28 | 
-29 29 | type(a.b) is type(None)
-30 30 | 
+24 | 
+25 | type(None) != type(foo)
+26 | 
+   - type(None) != type(None)
+27 + None is not None
+28 | 
+29 | type(a.b) is type(None)
+30 | 
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
   --> FURB169.py:29:1
@@ -276,16 +252,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 31 | type(
    |
 help: Replace with `is None`
-
-ℹ Safe fix
-26 26 | 
-27 27 | type(None) != type(None)
-28 28 | 
-29    |-type(a.b) is type(None)
-   29 |+a.b is None
-30 30 | 
-31 31 | type(
-32 32 |     a(
+26 | 
+27 | type(None) != type(None)
+28 | 
+   - type(a.b) is type(None)
+29 + a.b is None
+30 | 
+31 | type(
+32 |     a(
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:31:1
@@ -302,20 +276,19 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
 37 |   type(
    |
 help: Replace with `is not None`
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | type(a.b) is type(None)
-30 30 | 
-31    |-type(
-32    |-    a(
-33    |-        # Comment
-34    |-    )
-35    |-) != type(None)
-   31 |+a() is not None
-36 32 | 
-37 33 | type(
-38 34 |     a := 1
+28 | 
+29 | type(a.b) is type(None)
+30 | 
+   - type(
+   -     a(
+   -         # Comment
+   -     )
+   - ) != type(None)
+31 + a() is not None
+32 | 
+33 | type(
+34 |     a := 1
+note: This is an unsafe fix and may change runtime behavior
 
 FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)`
   --> FURB169.py:37:1
@@ -330,18 +303,16 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t
 41 |   type(
    |
 help: Replace with `is None`
-
-ℹ Safe fix
-34 34 |     )
-35 35 | ) != type(None)
-36 36 | 
-37    |-type(
-38    |-    a := 1
-39    |-) == type(None)
-   37 |+(a := 1) is None
-40 38 | 
-41 39 | type(
-42 40 |     a for a in range(0)
+34 |     )
+35 | ) != type(None)
+36 | 
+   - type(
+   -     a := 1
+   - ) == type(None)
+37 + (a := 1) is None
+38 | 
+39 | type(
+40 |     a for a in range(0)
 
 FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)`
   --> FURB169.py:41:1
@@ -354,15 +325,13 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit
    | |___________________^
    |
 help: Replace with `is not None`
-
-ℹ Safe fix
-38 38 |     a := 1
-39 39 | ) == type(None)
-40 40 | 
-41    |-type(
-42    |-    a for a in range(0)
-43    |-) is not type(None)
-   41 |+(a for a in range(0)) is not None
-44 42 | 
-45 43 | 
-46 44 | # Ok.
+38 |     a := 1
+39 | ) == type(None)
+40 | 
+   - type(
+   -     a for a in range(0)
+   - ) is not type(None)
+41 + (a for a in range(0)) is not None
+42 | 
+43 | 
+44 | # Ok.
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap
index d9a8c46147..9e38c7e109 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap
@@ -11,15 +11,14 @@ FURB171 [*] Membership test against single-item container
 4 |     print("Single-element tuple")
   |
 help: Convert to equality test
-
-ℹ Safe fix
-1 1 | # Errors.
-2 2 | 
-3   |-if 1 in (1,):
-  3 |+if 1 == 1:
-4 4 |     print("Single-element tuple")
-5 5 | 
-6 6 | if 1 in [1]:
+1 | # Errors.
+2 | 
+  - if 1 in (1,):
+3 + if 1 == 1:
+4 |     print("Single-element tuple")
+5 | 
+6 | if 1 in [1]:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
  --> FURB171_0.py:6:4
@@ -31,16 +30,15 @@ FURB171 [*] Membership test against single-item container
 7 |     print("Single-element list")
   |
 help: Convert to equality test
-
-ℹ Safe fix
-3 3 | if 1 in (1,):
-4 4 |     print("Single-element tuple")
-5 5 | 
-6   |-if 1 in [1]:
-  6 |+if 1 == 1:
-7 7 |     print("Single-element list")
-8 8 | 
-9 9 | if 1 in {1}:
+3 | if 1 in (1,):
+4 |     print("Single-element tuple")
+5 | 
+  - if 1 in [1]:
+6 + if 1 == 1:
+7 |     print("Single-element list")
+8 | 
+9 | if 1 in {1}:
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:9:4
@@ -52,16 +50,15 @@ FURB171 [*] Membership test against single-item container
 10 |     print("Single-element set")
    |
 help: Convert to equality test
-
-ℹ Safe fix
-6  6  | if 1 in [1]:
-7  7  |     print("Single-element list")
-8  8  | 
-9     |-if 1 in {1}:
-   9  |+if 1 == 1:
-10 10 |     print("Single-element set")
-11 11 | 
-12 12 | if "a" in "a":
+6  | if 1 in [1]:
+7  |     print("Single-element list")
+8  | 
+   - if 1 in {1}:
+9  + if 1 == 1:
+10 |     print("Single-element set")
+11 | 
+12 | if "a" in "a":
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:12:4
@@ -73,16 +70,15 @@ FURB171 [*] Membership test against single-item container
 13 |     print("Single-element string")
    |
 help: Convert to equality test
-
-ℹ Unsafe fix
-9  9  | if 1 in {1}:
-10 10 |     print("Single-element set")
-11 11 | 
-12    |-if "a" in "a":
-   12 |+if "a" == "a":
-13 13 |     print("Single-element string")
-14 14 | 
-15 15 | if 1 not in (1,):
+9  | if 1 in {1}:
+10 |     print("Single-element set")
+11 | 
+   - if "a" in "a":
+12 + if "a" == "a":
+13 |     print("Single-element string")
+14 | 
+15 | if 1 not in (1,):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:15:4
@@ -94,16 +90,15 @@ FURB171 [*] Membership test against single-item container
 16 |     print("Check `not in` membership test")
    |
 help: Convert to inequality test
-
-ℹ Safe fix
-12 12 | if "a" in "a":
-13 13 |     print("Single-element string")
-14 14 | 
-15    |-if 1 not in (1,):
-   15 |+if 1 != 1:
-16 16 |     print("Check `not in` membership test")
-17 17 | 
-18 18 | if not 1 in (1,):
+12 | if "a" in "a":
+13 |     print("Single-element string")
+14 | 
+   - if 1 not in (1,):
+15 + if 1 != 1:
+16 |     print("Check `not in` membership test")
+17 | 
+18 | if not 1 in (1,):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:18:8
@@ -115,16 +110,15 @@ FURB171 [*] Membership test against single-item container
 19 |     print("Check the negated membership test")
    |
 help: Convert to equality test
-
-ℹ Safe fix
-15 15 | if 1 not in (1,):
-16 16 |     print("Check `not in` membership test")
-17 17 | 
-18    |-if not 1 in (1,):
-   18 |+if not 1 == 1:
-19 19 |     print("Check the negated membership test")
-20 20 | 
-21 21 | # Non-errors.
+15 | if 1 not in (1,):
+16 |     print("Check `not in` membership test")
+17 | 
+   - if not 1 in (1,):
+18 + if not 1 == 1:
+19 |     print("Check the negated membership test")
+20 | 
+21 | # Non-errors.
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:52:5
@@ -140,19 +134,18 @@ FURB171 [*] Membership test against single-item container
 57 |   _ = a in (  # Foo1
    |
 help: Convert to equality test
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | 
-51 51 | # https://github.com/astral-sh/ruff/issues/10063
-52    |-_ = a in (
-53    |-    # Foo
-54    |-    b,
-55    |-)
-   52 |+_ = a == b
-56 53 | 
-57 54 | _ = a in (  # Foo1
-58 55 |     (  # Foo2
+49 | 
+50 | 
+51 | # https://github.com/astral-sh/ruff/issues/10063
+   - _ = a in (
+   -     # Foo
+   -     b,
+   - )
+52 + _ = a == b
+53 | 
+54 | _ = a in (  # Foo1
+55 |     (  # Foo2
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:57:5
@@ -181,31 +174,30 @@ FURB171 [*] Membership test against single-item container
 74 |   foo = (
    |
 help: Convert to equality test
-
-ℹ Unsafe fix
-54 54 |     b,
-55 55 | )
-56 56 | 
-57    |-_ = a in (  # Foo1
-58    |-    (  # Foo2
-59    |-    # Foo3
-60    |-        (  # Tuple
-61    |-            (  # Bar
-   57 |+_ = a == (  # Bar
-62 58 |        (b
-63 59 |         # Bar
-64 60 |         )
-65 61 |   )
-66    |-       # Foo4
-67    |-            # Foo5
-68    |-     ,
-69    |-       )
-70    |-        # Foo6
-71    |-    )
-72    |-)
-73 62 | 
-74 63 | foo = (
-75 64 |     lorem()
+54 |     b,
+55 | )
+56 | 
+   - _ = a in (  # Foo1
+   -     (  # Foo2
+   -     # Foo3
+   -         (  # Tuple
+   -             (  # Bar
+57 + _ = a == (  # Bar
+58 |        (b
+59 |         # Bar
+60 |         )
+61 |   )
+   -        # Foo4
+   -             # Foo5
+   -      ,
+   -        )
+   -         # Foo6
+   -     )
+   - )
+62 | 
+63 | foo = (
+64 |     lorem()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:77:28
@@ -222,20 +214,19 @@ FURB171 [*] Membership test against single-item container
 82 |   )
    |
 help: Convert to equality test
-
-ℹ Unsafe fix
-74 74 | foo = (
-75 75 |     lorem()
-76 76 |         .ipsum()
-77    |-        .dolor(lambda sit: sit in (
-78    |-            # Foo1
-79    |-            # Foo2
-80    |-            amet,
-81    |-        ))
-   77 |+        .dolor(lambda sit: sit == amet)
-82 78 | )
-83 79 | 
-84 80 | foo = (
+74 | foo = (
+75 |     lorem()
+76 |         .ipsum()
+   -         .dolor(lambda sit: sit in (
+   -             # Foo1
+   -             # Foo2
+   -             amet,
+   -         ))
+77 +         .dolor(lambda sit: sit == amet)
+78 | )
+79 | 
+80 | foo = (
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_0.py:87:28
@@ -254,23 +245,22 @@ FURB171 [*] Membership test against single-item container
 94 |   )
    |
 help: Convert to equality test
-
-ℹ Unsafe fix
-84 84 | foo = (
-85 85 |     lorem()
-86 86 |         .ipsum()
-87    |-        .dolor(lambda sit: sit in (
-88    |-            (
-   87 |+        .dolor(lambda sit: sit == (
-89 88 |                 # Foo1
-90 89 |                 # Foo2
-91 90 |                 amet
-92    |-            ),
-93    |-        ))
-   91 |+            ))
-94 92 | )
-95 93 | 
-96 94 | foo = lorem() \
+84 | foo = (
+85 |     lorem()
+86 |         .ipsum()
+   -         .dolor(lambda sit: sit in (
+   -             (
+87 +         .dolor(lambda sit: sit == (
+88 |                 # Foo1
+89 |                 # Foo2
+90 |                 amet
+   -             ),
+   -         ))
+91 +             ))
+92 | )
+93 | 
+94 | foo = lorem() \
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
    --> FURB171_0.py:98:24
@@ -288,20 +278,19 @@ FURB171 [*] Membership test against single-item container
 104 |   def _():
     |
 help: Convert to equality test
-
-ℹ Unsafe fix
-95  95  | 
-96  96  | foo = lorem() \
-97  97  |     .ipsum() \
-98      |-    .dolor(lambda sit: sit in (
-99      |-        # Foo1
-100     |-        # Foo2
-101     |-        amet,
-102     |-    ))
-    98  |+    .dolor(lambda sit: sit == amet)
-103 99  | 
-104 100 | def _():
-105 101 |     if foo not \
+95  | 
+96  | foo = lorem() \
+97  |     .ipsum() \
+    -     .dolor(lambda sit: sit in (
+    -         # Foo1
+    -         # Foo2
+    -         amet,
+    -     ))
+98  +     .dolor(lambda sit: sit == amet)
+99  | 
+100 | def _():
+101 |     if foo not \
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
    --> FURB171_0.py:105:8
@@ -319,21 +308,20 @@ FURB171 [*] Membership test against single-item container
 112 |   def _():
     |
 help: Convert to inequality test
-
-ℹ Unsafe fix
-102 102 |     ))
-103 103 | 
-104 104 | def _():
-105     |-    if foo not \
-106     |-        in [
-107     |-        # Before
-108     |-        bar
-109     |-        # After
-110     |-    ]: ...
-    105 |+    if foo != bar: ...
-111 106 | 
-112 107 | def _():
-113 108 |     if foo not \
+102 |     ))
+103 | 
+104 | def _():
+    -     if foo not \
+    -         in [
+    -         # Before
+    -         bar
+    -         # After
+    -     ]: ...
+105 +     if foo != bar: ...
+106 | 
+107 | def _():
+108 |     if foo not \
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
    --> FURB171_0.py:113:8
@@ -350,16 +338,133 @@ FURB171 [*] Membership test against single-item container
 119 |           0 < 1: ...
     |
 help: Convert to inequality test
+110 |     ]: ...
+111 | 
+112 | def _():
+    -     if foo not \
+    -         in [
+    -         # Before
+    -         bar
+    -         # After
+    -     ] and \
+113 +     if foo != bar and \
+114 |         0 < 1: ...
+115 | 
+116 | # https://github.com/astral-sh/ruff/issues/20255
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-110 110 |     ]: ...
-111 111 | 
-112 112 | def _():
-113     |-    if foo not \
-114     |-        in [
-115     |-        # Before
-116     |-        bar
-117     |-        # After
-118     |-    ] and \
-    113 |+    if foo != bar and \
-119 114 |         0 < 1: ...
+FURB171 [*] Membership test against single-item container
+   --> FURB171_0.py:125:4
+    |
+124 | # NaN behavior differences
+125 | if math.nan in [math.nan]:
+    |    ^^^^^^^^^^^^^^^^^^^^^^
+126 |     print("This is True")
+    |
+help: Convert to equality test
+122 | import math
+123 | 
+124 | # NaN behavior differences
+    - if math.nan in [math.nan]:
+125 + if math.nan == math.nan:
+126 |     print("This is True")
+127 | 
+128 | if math.nan in (math.nan,):
+note: This is an unsafe fix and may change runtime behavior
+
+FURB171 [*] Membership test against single-item container
+   --> FURB171_0.py:128:4
+    |
+126 |     print("This is True")
+127 |
+128 | if math.nan in (math.nan,):
+    |    ^^^^^^^^^^^^^^^^^^^^^^^
+129 |     print("This is True")
+    |
+help: Convert to equality test
+125 | if math.nan in [math.nan]:
+126 |     print("This is True")
+127 | 
+    - if math.nan in (math.nan,):
+128 + if math.nan == math.nan:
+129 |     print("This is True")
+130 | 
+131 | if math.nan in {math.nan}:
+note: This is an unsafe fix and may change runtime behavior
+
+FURB171 [*] Membership test against single-item container
+   --> FURB171_0.py:131:4
+    |
+129 |     print("This is True")
+130 |
+131 | if math.nan in {math.nan}:
+    |    ^^^^^^^^^^^^^^^^^^^^^^
+132 |     print("This is True")
+    |
+help: Convert to equality test
+128 | if math.nan in (math.nan,):
+129 |     print("This is True")
+130 | 
+    - if math.nan in {math.nan}:
+131 + if math.nan == math.nan:
+132 |     print("This is True")
+133 | 
+134 | # Potential type differences with custom __eq__ methods
+note: This is an unsafe fix and may change runtime behavior
+
+FURB171 [*] Membership test against single-item container
+   --> FURB171_0.py:140:4
+    |
+139 | obj = CustomEq()
+140 | if obj in [CustomEq()]:
+    |    ^^^^^^^^^^^^^^^^^^^
+141 |     pass
+    |
+help: Convert to equality test
+137 |         return "custom"
+138 | 
+139 | obj = CustomEq()
+    - if obj in [CustomEq()]:
+140 + if obj == CustomEq():
+141 |     pass
+142 | 
+143 | if obj in (CustomEq(),):
+note: This is an unsafe fix and may change runtime behavior
+
+FURB171 [*] Membership test against single-item container
+   --> FURB171_0.py:143:4
+    |
+141 |     pass
+142 |
+143 | if obj in (CustomEq(),):
+    |    ^^^^^^^^^^^^^^^^^^^^
+144 |     pass
+    |
+help: Convert to equality test
+140 | if obj in [CustomEq()]:
+141 |     pass
+142 | 
+    - if obj in (CustomEq(),):
+143 + if obj == CustomEq():
+144 |     pass
+145 | 
+146 | if obj in {CustomEq()}:
+note: This is an unsafe fix and may change runtime behavior
+
+FURB171 [*] Membership test against single-item container
+   --> FURB171_0.py:146:4
+    |
+144 |     pass
+145 |
+146 | if obj in {CustomEq()}:
+    |    ^^^^^^^^^^^^^^^^^^^
+147 |     pass
+    |
+help: Convert to equality test
+143 | if obj in (CustomEq(),):
+144 |     pass
+145 | 
+    - if obj in {CustomEq()}:
+146 + if obj == CustomEq():
+147 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap
index 06bb3cfc0d..ece6d276be 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap
@@ -11,15 +11,14 @@ FURB171 [*] Membership test against single-item container
 4 |     print("Single-element set")
   |
 help: Convert to equality test
-
-ℹ Safe fix
-1 1 | # Errors.
-2 2 | 
-3   |-if 1 in set([1]):
-  3 |+if 1 == 1:
-4 4 |     print("Single-element set")
-5 5 | 
-6 6 | if 1 in set((1,)):
+1 | # Errors.
+2 | 
+  - if 1 in set([1]):
+3 + if 1 == 1:
+4 |     print("Single-element set")
+5 | 
+6 | if 1 in set((1,)):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
  --> FURB171_1.py:6:4
@@ -31,16 +30,15 @@ FURB171 [*] Membership test against single-item container
 7 |     print("Single-element set")
   |
 help: Convert to equality test
-
-ℹ Safe fix
-3 3 | if 1 in set([1]):
-4 4 |     print("Single-element set")
-5 5 | 
-6   |-if 1 in set((1,)):
-  6 |+if 1 == 1:
-7 7 |     print("Single-element set")
-8 8 | 
-9 9 | if 1 in set({1}):
+3 | if 1 in set([1]):
+4 |     print("Single-element set")
+5 | 
+  - if 1 in set((1,)):
+6 + if 1 == 1:
+7 |     print("Single-element set")
+8 | 
+9 | if 1 in set({1}):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_1.py:9:4
@@ -52,16 +50,15 @@ FURB171 [*] Membership test against single-item container
 10 |     print("Single-element set")
    |
 help: Convert to equality test
-
-ℹ Safe fix
-6  6  | if 1 in set((1,)):
-7  7  |     print("Single-element set")
-8  8  | 
-9     |-if 1 in set({1}):
-   9  |+if 1 == 1:
-10 10 |     print("Single-element set")
-11 11 | 
-12 12 | if 1 in frozenset([1]):
+6  | if 1 in set((1,)):
+7  |     print("Single-element set")
+8  | 
+   - if 1 in set({1}):
+9  + if 1 == 1:
+10 |     print("Single-element set")
+11 | 
+12 | if 1 in frozenset([1]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_1.py:12:4
@@ -73,16 +70,15 @@ FURB171 [*] Membership test against single-item container
 13 |     print("Single-element set")
    |
 help: Convert to equality test
-
-ℹ Safe fix
-9  9  | if 1 in set({1}):
-10 10 |     print("Single-element set")
-11 11 | 
-12    |-if 1 in frozenset([1]):
-   12 |+if 1 == 1:
-13 13 |     print("Single-element set")
-14 14 | 
-15 15 | if 1 in frozenset((1,)):
+9  | if 1 in set({1}):
+10 |     print("Single-element set")
+11 | 
+   - if 1 in frozenset([1]):
+12 + if 1 == 1:
+13 |     print("Single-element set")
+14 | 
+15 | if 1 in frozenset((1,)):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_1.py:15:4
@@ -94,16 +90,15 @@ FURB171 [*] Membership test against single-item container
 16 |     print("Single-element set")
    |
 help: Convert to equality test
-
-ℹ Safe fix
-12 12 | if 1 in frozenset([1]):
-13 13 |     print("Single-element set")
-14 14 | 
-15    |-if 1 in frozenset((1,)):
-   15 |+if 1 == 1:
-16 16 |     print("Single-element set")
-17 17 | 
-18 18 | if 1 in frozenset({1}):
+12 | if 1 in frozenset([1]):
+13 |     print("Single-element set")
+14 | 
+   - if 1 in frozenset((1,)):
+15 + if 1 == 1:
+16 |     print("Single-element set")
+17 | 
+18 | if 1 in frozenset({1}):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_1.py:18:4
@@ -115,16 +110,15 @@ FURB171 [*] Membership test against single-item container
 19 |     print("Single-element set")
    |
 help: Convert to equality test
-
-ℹ Safe fix
-15 15 | if 1 in frozenset((1,)):
-16 16 |     print("Single-element set")
-17 17 | 
-18    |-if 1 in frozenset({1}):
-   18 |+if 1 == 1:
-19 19 |     print("Single-element set")
-20 20 | 
-21 21 | if 1 in set(set([1])):
+15 | if 1 in frozenset((1,)):
+16 |     print("Single-element set")
+17 | 
+   - if 1 in frozenset({1}):
+18 + if 1 == 1:
+19 |     print("Single-element set")
+20 | 
+21 | if 1 in set(set([1])):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB171 [*] Membership test against single-item container
   --> FURB171_1.py:21:4
@@ -136,13 +130,49 @@ FURB171 [*] Membership test against single-item container
 22 |     print('Recursive solution')
    |
 help: Convert to equality test
+18 | if 1 in frozenset({1}):
+19 |     print("Single-element set")
+20 | 
+   - if 1 in set(set([1])):
+21 + if 1 == 1:
+22 |     print('Recursive solution')
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Safe fix
-18 18 | if 1 in frozenset({1}):
-19 19 |     print("Single-element set")
-20 20 | 
-21    |-if 1 in set(set([1])):
-   21 |+if 1 == 1:
-22 22 |     print('Recursive solution')
-23 23 | 
-24 24 |
+FURB171 [*] Membership test against single-item container
+  --> FURB171_1.py:59:4
+   |
+58 | # set() and frozenset() with NaN
+59 | if math.nan in set([math.nan]):
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+60 |     print("This should be marked unsafe")
+   |
+help: Convert to equality test
+56 | import math
+57 | 
+58 | # set() and frozenset() with NaN
+   - if math.nan in set([math.nan]):
+59 + if math.nan == math.nan:
+60 |     print("This should be marked unsafe")
+61 | 
+62 | if math.nan in frozenset([math.nan]):
+note: This is an unsafe fix and may change runtime behavior
+
+FURB171 [*] Membership test against single-item container
+  --> FURB171_1.py:62:4
+   |
+60 |     print("This should be marked unsafe")
+61 |
+62 | if math.nan in frozenset([math.nan]):
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+63 |     print("This should be marked unsafe")
+   |
+help: Convert to equality test
+59 | if math.nan in set([math.nan]):
+60 |     print("This should be marked unsafe")
+61 | 
+   - if math.nan in frozenset([math.nan]):
+62 + if math.nan == math.nan:
+63 |     print("This should be marked unsafe")
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap
index d93305cf69..3f5159c903 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap
@@ -10,16 +10,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 6 | _ = pathlib.Path().resolve()
   |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-2 2 | from pathlib import Path
-3 3 | 
-4 4 | # Errors
-5   |-_ = Path().resolve()
-  5 |+_ = Path.cwd()
-6 6 | _ = pathlib.Path().resolve()
-7 7 | 
-8 8 | _ = Path("").resolve()
+2 | from pathlib import Path
+3 | 
+4 | # Errors
+  - _ = Path().resolve()
+5 + _ = Path.cwd()
+6 | _ = pathlib.Path().resolve()
+7 | 
+8 | _ = Path("").resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
  --> FURB177.py:6:5
@@ -32,16 +31,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 8 | _ = Path("").resolve()
   |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | # Errors
-5 5 | _ = Path().resolve()
-6   |-_ = pathlib.Path().resolve()
-  6 |+_ = Path.cwd()
-7 7 | 
-8 8 | _ = Path("").resolve()
-9 9 | _ = pathlib.Path("").resolve()
+3 | 
+4 | # Errors
+5 | _ = Path().resolve()
+  - _ = pathlib.Path().resolve()
+6 + _ = Path.cwd()
+7 | 
+8 | _ = Path("").resolve()
+9 | _ = pathlib.Path("").resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
  --> FURB177.py:8:5
@@ -53,16 +51,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 9 | _ = pathlib.Path("").resolve()
   |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-5 5 | _ = Path().resolve()
-6 6 | _ = pathlib.Path().resolve()
-7 7 | 
-8   |-_ = Path("").resolve()
-  8 |+_ = Path.cwd()
-9 9 | _ = pathlib.Path("").resolve()
-10 10 | 
-11 11 | _ = Path(".").resolve()
+5  | _ = Path().resolve()
+6  | _ = pathlib.Path().resolve()
+7  | 
+   - _ = Path("").resolve()
+8  + _ = Path.cwd()
+9  | _ = pathlib.Path("").resolve()
+10 | 
+11 | _ = Path(".").resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:9:5
@@ -74,16 +71,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 11 | _ = Path(".").resolve()
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-6  6  | _ = pathlib.Path().resolve()
-7  7  | 
-8  8  | _ = Path("").resolve()
-9     |-_ = pathlib.Path("").resolve()
-   9  |+_ = Path.cwd()
-10 10 | 
-11 11 | _ = Path(".").resolve()
-12 12 | _ = pathlib.Path(".").resolve()
+6  | _ = pathlib.Path().resolve()
+7  | 
+8  | _ = Path("").resolve()
+   - _ = pathlib.Path("").resolve()
+9  + _ = Path.cwd()
+10 | 
+11 | _ = Path(".").resolve()
+12 | _ = pathlib.Path(".").resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:11:5
@@ -95,16 +91,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 12 | _ = pathlib.Path(".").resolve()
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-8  8  | _ = Path("").resolve()
-9  9  | _ = pathlib.Path("").resolve()
-10 10 | 
-11    |-_ = Path(".").resolve()
-   11 |+_ = Path.cwd()
-12 12 | _ = pathlib.Path(".").resolve()
-13 13 | 
-14 14 | _ = Path("", **kwargs).resolve()
+8  | _ = Path("").resolve()
+9  | _ = pathlib.Path("").resolve()
+10 | 
+   - _ = Path(".").resolve()
+11 + _ = Path.cwd()
+12 | _ = pathlib.Path(".").resolve()
+13 | 
+14 | _ = Path("", **kwargs).resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:12:5
@@ -116,16 +111,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 14 | _ = Path("", **kwargs).resolve()
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-9  9  | _ = pathlib.Path("").resolve()
-10 10 | 
-11 11 | _ = Path(".").resolve()
-12    |-_ = pathlib.Path(".").resolve()
-   12 |+_ = Path.cwd()
-13 13 | 
-14 14 | _ = Path("", **kwargs).resolve()
-15 15 | _ = pathlib.Path("", **kwargs).resolve()
+9  | _ = pathlib.Path("").resolve()
+10 | 
+11 | _ = Path(".").resolve()
+   - _ = pathlib.Path(".").resolve()
+12 + _ = Path.cwd()
+13 | 
+14 | _ = Path("", **kwargs).resolve()
+15 | _ = pathlib.Path("", **kwargs).resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:14:5
@@ -137,16 +131,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 15 | _ = pathlib.Path("", **kwargs).resolve()
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-11 11 | _ = Path(".").resolve()
-12 12 | _ = pathlib.Path(".").resolve()
-13 13 | 
-14    |-_ = Path("", **kwargs).resolve()
-   14 |+_ = Path.cwd()
-15 15 | _ = pathlib.Path("", **kwargs).resolve()
-16 16 | 
-17 17 | _ = Path(".", **kwargs).resolve()
+11 | _ = Path(".").resolve()
+12 | _ = pathlib.Path(".").resolve()
+13 | 
+   - _ = Path("", **kwargs).resolve()
+14 + _ = Path.cwd()
+15 | _ = pathlib.Path("", **kwargs).resolve()
+16 | 
+17 | _ = Path(".", **kwargs).resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:15:5
@@ -158,16 +151,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 17 | _ = Path(".", **kwargs).resolve()
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-12 12 | _ = pathlib.Path(".").resolve()
-13 13 | 
-14 14 | _ = Path("", **kwargs).resolve()
-15    |-_ = pathlib.Path("", **kwargs).resolve()
-   15 |+_ = Path.cwd()
-16 16 | 
-17 17 | _ = Path(".", **kwargs).resolve()
-18 18 | _ = pathlib.Path(".", **kwargs).resolve()
+12 | _ = pathlib.Path(".").resolve()
+13 | 
+14 | _ = Path("", **kwargs).resolve()
+   - _ = pathlib.Path("", **kwargs).resolve()
+15 + _ = Path.cwd()
+16 | 
+17 | _ = Path(".", **kwargs).resolve()
+18 | _ = pathlib.Path(".", **kwargs).resolve()
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:17:5
@@ -179,16 +171,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 18 | _ = pathlib.Path(".", **kwargs).resolve()
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-14 14 | _ = Path("", **kwargs).resolve()
-15 15 | _ = pathlib.Path("", **kwargs).resolve()
-16 16 | 
-17    |-_ = Path(".", **kwargs).resolve()
-   17 |+_ = Path.cwd()
-18 18 | _ = pathlib.Path(".", **kwargs).resolve()
-19 19 | 
-20 20 | # OK
+14 | _ = Path("", **kwargs).resolve()
+15 | _ = pathlib.Path("", **kwargs).resolve()
+16 | 
+   - _ = Path(".", **kwargs).resolve()
+17 + _ = Path.cwd()
+18 | _ = pathlib.Path(".", **kwargs).resolve()
+19 | 
+20 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
   --> FURB177.py:18:5
@@ -200,13 +191,12 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo
 20 | # OK
    |
 help: Replace `Path().resolve()` with `Path.cwd()`
-
-ℹ Unsafe fix
-15 15 | _ = pathlib.Path("", **kwargs).resolve()
-16 16 | 
-17 17 | _ = Path(".", **kwargs).resolve()
-18    |-_ = pathlib.Path(".", **kwargs).resolve()
-   18 |+_ = Path.cwd()
-19 19 | 
-20 20 | # OK
-21 21 | _ = Path.cwd()
+15 | _ = pathlib.Path("", **kwargs).resolve()
+16 | 
+17 | _ = Path(".", **kwargs).resolve()
+   - _ = pathlib.Path(".", **kwargs).resolve()
+18 + _ = Path.cwd()
+19 | 
+20 | # OK
+21 | _ = Path.cwd()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap
index 5461e27403..be994f1cc5 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap
@@ -12,16 +12,14 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
 9 |     def foo(self): pass
   |
 help: Replace with `abc.ABC`
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Errors
-6 6 | 
-7   |-class A0(metaclass=abc.ABCMeta):
-  7 |+class A0(abc.ABC):
-8 8 |     @abstractmethod
-9 9 |     def foo(self): pass
-10 10 | 
+4  | 
+5  | # Errors
+6  | 
+   - class A0(metaclass=abc.ABCMeta):
+7  + class A0(abc.ABC):
+8  |     @abstractmethod
+9  |     def foo(self): pass
+10 | 
 
 FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
   --> FURB180.py:12:10
@@ -32,16 +30,14 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
 14 |     def foo(self): pass
    |
 help: Replace with `abc.ABC`
-
-ℹ Safe fix
-9  9  |     def foo(self): pass
-10 10 | 
-11 11 | 
-12    |-class A1(metaclass=ABCMeta):
-   12 |+class A1(abc.ABC):
-13 13 |     @abstractmethod
-14 14 |     def foo(self): pass
-15 15 | 
+9  |     def foo(self): pass
+10 | 
+11 | 
+   - class A1(metaclass=ABCMeta):
+12 + class A1(abc.ABC):
+13 |     @abstractmethod
+14 |     def foo(self): pass
+15 | 
 
 FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
   --> FURB180.py:26:18
@@ -52,16 +48,15 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
 28 |     def foo(self): pass
    |
 help: Replace with `abc.ABC`
-
-ℹ Unsafe fix
-23 23 |     pass
-24 24 | 
-25 25 | 
-26    |-class A2(B0, B1, metaclass=ABCMeta):
-   26 |+class A2(B0, B1, abc.ABC):
-27 27 |     @abstractmethod
-28 28 |     def foo(self): pass
-29 29 | 
+23 |     pass
+24 | 
+25 | 
+   - class A2(B0, B1, metaclass=ABCMeta):
+26 + class A2(B0, B1, abc.ABC):
+27 |     @abstractmethod
+28 |     def foo(self): pass
+29 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
   --> FURB180.py:31:34
@@ -71,13 +66,12 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class
 32 |     pass
    |
 help: Replace with `abc.ABC`
-
-ℹ Unsafe fix
-28 28 |     def foo(self): pass
-29 29 | 
-30 30 | 
-31    |-class A3(B0, before_metaclass=1, metaclass=abc.ABCMeta):
-   31 |+class A3(B0, abc.ABC, before_metaclass=1):
-32 32 |     pass
-33 33 | 
-34 34 |
+28 |     def foo(self): pass
+29 | 
+30 | 
+   - class A3(B0, before_metaclass=1, metaclass=abc.ABCMeta):
+31 + class A3(B0, abc.ABC, before_metaclass=1):
+32 |     pass
+33 | 
+34 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap
index 8bf362eba6..d437b1ae07 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap
@@ -12,16 +12,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 21 | md5().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-16 16 | 
-17 17 | # these will match
-18 18 | 
-19    |-blake2b().digest().hex()
-   19 |+blake2b().hexdigest()
-20 20 | blake2s().digest().hex()
-21 21 | md5().digest().hex()
-22 22 | sha1().digest().hex()
+16 | 
+17 | # these will match
+18 | 
+   - blake2b().digest().hex()
+19 + blake2b().hexdigest()
+20 | blake2s().digest().hex()
+21 | md5().digest().hex()
+22 | sha1().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:20:1
@@ -33,16 +31,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 22 | sha1().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-17 17 | # these will match
-18 18 | 
-19 19 | blake2b().digest().hex()
-20    |-blake2s().digest().hex()
-   20 |+blake2s().hexdigest()
-21 21 | md5().digest().hex()
-22 22 | sha1().digest().hex()
-23 23 | sha224().digest().hex()
+17 | # these will match
+18 | 
+19 | blake2b().digest().hex()
+   - blake2s().digest().hex()
+20 + blake2s().hexdigest()
+21 | md5().digest().hex()
+22 | sha1().digest().hex()
+23 | sha224().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:21:1
@@ -55,16 +51,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 23 | sha224().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-18 18 | 
-19 19 | blake2b().digest().hex()
-20 20 | blake2s().digest().hex()
-21    |-md5().digest().hex()
-   21 |+md5().hexdigest()
-22 22 | sha1().digest().hex()
-23 23 | sha224().digest().hex()
-24 24 | sha256().digest().hex()
+18 | 
+19 | blake2b().digest().hex()
+20 | blake2s().digest().hex()
+   - md5().digest().hex()
+21 + md5().hexdigest()
+22 | sha1().digest().hex()
+23 | sha224().digest().hex()
+24 | sha256().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:22:1
@@ -77,16 +71,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 24 | sha256().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-19 19 | blake2b().digest().hex()
-20 20 | blake2s().digest().hex()
-21 21 | md5().digest().hex()
-22    |-sha1().digest().hex()
-   22 |+sha1().hexdigest()
-23 23 | sha224().digest().hex()
-24 24 | sha256().digest().hex()
-25 25 | sha384().digest().hex()
+19 | blake2b().digest().hex()
+20 | blake2s().digest().hex()
+21 | md5().digest().hex()
+   - sha1().digest().hex()
+22 + sha1().hexdigest()
+23 | sha224().digest().hex()
+24 | sha256().digest().hex()
+25 | sha384().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:23:1
@@ -99,16 +91,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 25 | sha384().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-20 20 | blake2s().digest().hex()
-21 21 | md5().digest().hex()
-22 22 | sha1().digest().hex()
-23    |-sha224().digest().hex()
-   23 |+sha224().hexdigest()
-24 24 | sha256().digest().hex()
-25 25 | sha384().digest().hex()
-26 26 | sha3_224().digest().hex()
+20 | blake2s().digest().hex()
+21 | md5().digest().hex()
+22 | sha1().digest().hex()
+   - sha224().digest().hex()
+23 + sha224().hexdigest()
+24 | sha256().digest().hex()
+25 | sha384().digest().hex()
+26 | sha3_224().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:24:1
@@ -121,16 +111,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 26 | sha3_224().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-21 21 | md5().digest().hex()
-22 22 | sha1().digest().hex()
-23 23 | sha224().digest().hex()
-24    |-sha256().digest().hex()
-   24 |+sha256().hexdigest()
-25 25 | sha384().digest().hex()
-26 26 | sha3_224().digest().hex()
-27 27 | sha3_256().digest().hex()
+21 | md5().digest().hex()
+22 | sha1().digest().hex()
+23 | sha224().digest().hex()
+   - sha256().digest().hex()
+24 + sha256().hexdigest()
+25 | sha384().digest().hex()
+26 | sha3_224().digest().hex()
+27 | sha3_256().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:25:1
@@ -143,16 +131,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 27 | sha3_256().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-22 22 | sha1().digest().hex()
-23 23 | sha224().digest().hex()
-24 24 | sha256().digest().hex()
-25    |-sha384().digest().hex()
-   25 |+sha384().hexdigest()
-26 26 | sha3_224().digest().hex()
-27 27 | sha3_256().digest().hex()
-28 28 | sha3_384().digest().hex()
+22 | sha1().digest().hex()
+23 | sha224().digest().hex()
+24 | sha256().digest().hex()
+   - sha384().digest().hex()
+25 + sha384().hexdigest()
+26 | sha3_224().digest().hex()
+27 | sha3_256().digest().hex()
+28 | sha3_384().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:26:1
@@ -165,16 +151,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 28 | sha3_384().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-23 23 | sha224().digest().hex()
-24 24 | sha256().digest().hex()
-25 25 | sha384().digest().hex()
-26    |-sha3_224().digest().hex()
-   26 |+sha3_224().hexdigest()
-27 27 | sha3_256().digest().hex()
-28 28 | sha3_384().digest().hex()
-29 29 | sha3_512().digest().hex()
+23 | sha224().digest().hex()
+24 | sha256().digest().hex()
+25 | sha384().digest().hex()
+   - sha3_224().digest().hex()
+26 + sha3_224().hexdigest()
+27 | sha3_256().digest().hex()
+28 | sha3_384().digest().hex()
+29 | sha3_512().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:27:1
@@ -187,16 +171,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 29 | sha3_512().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-24 24 | sha256().digest().hex()
-25 25 | sha384().digest().hex()
-26 26 | sha3_224().digest().hex()
-27    |-sha3_256().digest().hex()
-   27 |+sha3_256().hexdigest()
-28 28 | sha3_384().digest().hex()
-29 29 | sha3_512().digest().hex()
-30 30 | sha512().digest().hex()
+24 | sha256().digest().hex()
+25 | sha384().digest().hex()
+26 | sha3_224().digest().hex()
+   - sha3_256().digest().hex()
+27 + sha3_256().hexdigest()
+28 | sha3_384().digest().hex()
+29 | sha3_512().digest().hex()
+30 | sha512().digest().hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:28:1
@@ -209,16 +191,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 30 | sha512().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-25 25 | sha384().digest().hex()
-26 26 | sha3_224().digest().hex()
-27 27 | sha3_256().digest().hex()
-28    |-sha3_384().digest().hex()
-   28 |+sha3_384().hexdigest()
-29 29 | sha3_512().digest().hex()
-30 30 | sha512().digest().hex()
-31 31 | shake_128().digest(10).hex()
+25 | sha384().digest().hex()
+26 | sha3_224().digest().hex()
+27 | sha3_256().digest().hex()
+   - sha3_384().digest().hex()
+28 + sha3_384().hexdigest()
+29 | sha3_512().digest().hex()
+30 | sha512().digest().hex()
+31 | shake_128().digest(10).hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:29:1
@@ -231,16 +211,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 31 | shake_128().digest(10).hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-26 26 | sha3_224().digest().hex()
-27 27 | sha3_256().digest().hex()
-28 28 | sha3_384().digest().hex()
-29    |-sha3_512().digest().hex()
-   29 |+sha3_512().hexdigest()
-30 30 | sha512().digest().hex()
-31 31 | shake_128().digest(10).hex()
-32 32 | shake_256().digest(10).hex()
+26 | sha3_224().digest().hex()
+27 | sha3_256().digest().hex()
+28 | sha3_384().digest().hex()
+   - sha3_512().digest().hex()
+29 + sha3_512().hexdigest()
+30 | sha512().digest().hex()
+31 | shake_128().digest(10).hex()
+32 | shake_256().digest(10).hex()
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:30:1
@@ -253,16 +231,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 32 | shake_256().digest(10).hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-27 27 | sha3_256().digest().hex()
-28 28 | sha3_384().digest().hex()
-29 29 | sha3_512().digest().hex()
-30    |-sha512().digest().hex()
-   30 |+sha512().hexdigest()
-31 31 | shake_128().digest(10).hex()
-32 32 | shake_256().digest(10).hex()
-33 33 | 
+27 | sha3_256().digest().hex()
+28 | sha3_384().digest().hex()
+29 | sha3_512().digest().hex()
+   - sha512().digest().hex()
+30 + sha512().hexdigest()
+31 | shake_128().digest(10).hex()
+32 | shake_256().digest(10).hex()
+33 | 
 
 FURB181 Use of hashlib's `.digest().hex()`
   --> FURB181.py:31:1
@@ -298,16 +274,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 36 | sha256(b"text").digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-31 31 | shake_128().digest(10).hex()
-32 32 | shake_256().digest(10).hex()
-33 33 | 
-34    |-hashlib.sha256().digest().hex()
-   34 |+hashlib.sha256().hexdigest()
-35 35 | 
-36 36 | sha256(b"text").digest().hex()
-37 37 | 
+31 | shake_128().digest(10).hex()
+32 | shake_256().digest(10).hex()
+33 | 
+   - hashlib.sha256().digest().hex()
+34 + hashlib.sha256().hexdigest()
+35 | 
+36 | sha256(b"text").digest().hex()
+37 | 
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:36:1
@@ -320,16 +294,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 38 | hash_algo().digest().hex()
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-33 33 | 
-34 34 | hashlib.sha256().digest().hex()
-35 35 | 
-36    |-sha256(b"text").digest().hex()
-   36 |+sha256(b"text").hexdigest()
-37 37 | 
-38 38 | hash_algo().digest().hex()
-39 39 | 
+33 | 
+34 | hashlib.sha256().digest().hex()
+35 | 
+   - sha256(b"text").digest().hex()
+36 + sha256(b"text").hexdigest()
+37 | 
+38 | hash_algo().digest().hex()
+39 | 
 
 FURB181 [*] Use of hashlib's `.digest().hex()`
   --> FURB181.py:38:1
@@ -342,13 +314,11 @@ FURB181 [*] Use of hashlib's `.digest().hex()`
 40 | # not yet supported
    |
 help: Replace with `.hexdigest()`
-
-ℹ Safe fix
-35 35 | 
-36 36 | sha256(b"text").digest().hex()
-37 37 | 
-38    |-hash_algo().digest().hex()
-   38 |+hash_algo().hexdigest()
-39 39 | 
-40 40 | # not yet supported
-41 41 | h = sha256()
+35 | 
+36 | sha256(b"text").digest().hex()
+37 | 
+   - hash_algo().digest().hex()
+38 + hash_algo().hexdigest()
+39 | 
+40 | # not yet supported
+41 | h = sha256()
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap
index 4287365e6a..7a1cc9bf24 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap
@@ -10,16 +10,15 @@ FURB187 [*] Use of assignment of `reversed` on list `l`
   |     ^^^^^^^^^^^^^^^
   |
 help: Replace with `l.reverse()`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | def a():
-5 5 |     l = []
-6   |-    l = reversed(l)
-  6 |+    l.reverse()
-7 7 | 
-8 8 | 
-9 9 | def b():
+3 | 
+4 | def a():
+5 |     l = []
+  -     l = reversed(l)
+6 +     l.reverse()
+7 | 
+8 | 
+9 | def b():
+note: This is an unsafe fix and may change runtime behavior
 
 FURB187 [*] Use of assignment of `reversed` on list `l`
   --> FURB187.py:11:5
@@ -30,16 +29,15 @@ FURB187 [*] Use of assignment of `reversed` on list `l`
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `l.reverse()`
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | def b():
-10 10 |     l = []
-11    |-    l = list(reversed(l))
-   11 |+    l.reverse()
-12 12 | 
-13 13 | 
-14 14 | def c():
+8  | 
+9  | def b():
+10 |     l = []
+   -     l = list(reversed(l))
+11 +     l.reverse()
+12 | 
+13 | 
+14 | def c():
+note: This is an unsafe fix and may change runtime behavior
 
 FURB187 [*] Use of assignment of `reversed` on list `l`
   --> FURB187.py:16:5
@@ -50,13 +48,12 @@ FURB187 [*] Use of assignment of `reversed` on list `l`
    |     ^^^^^^^^^^^
    |
 help: Replace with `l.reverse()`
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | def c():
-15 15 |     l = []
-16    |-    l = l[::-1]
-   16 |+    l.reverse()
-17 17 | 
-18 18 | 
-19 19 | # False negative
+13 | 
+14 | def c():
+15 |     l = []
+   -     l = l[::-1]
+16 +     l.reverse()
+17 | 
+18 | 
+19 | # False negative
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap
index 6231a0d701..21e50d3130 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap
@@ -12,17 +12,15 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
 10 |       return filename
    |
 help: Use removesuffix instead of assignment conditional upon endswith.
-
-ℹ Safe fix
-4 4 | # these should match
-5 5 | 
-6 6 | def remove_extension_via_slice(filename: str) -> str:
-7   |-    if filename.endswith(".txt"):
-8   |-        filename = filename[:-4]
-  7 |+    filename = filename.removesuffix(".txt")
-9 8 | 
-10 9 |     return filename
-11 10 | 
+4  | # these should match
+5  | 
+6  | def remove_extension_via_slice(filename: str) -> str:
+   -     if filename.endswith(".txt"):
+   -         filename = filename[:-4]
+7  +     filename = filename.removesuffix(".txt")
+8  | 
+9  |     return filename
+10 | 
 
 FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
   --> FURB188.py:14:5
@@ -35,17 +33,15 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
 17 |       return filename
    |
 help: Use removesuffix instead of assignment conditional upon endswith.
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 | def remove_extension_via_slice_len(filename: str, extension: str) -> str:
-14    |-    if filename.endswith(extension):
-15    |-        filename = filename[:-len(extension)]
-   14 |+    filename = filename.removesuffix(extension)
-16 15 | 
-17 16 |     return filename
-18 17 | 
+11 | 
+12 | 
+13 | def remove_extension_via_slice_len(filename: str, extension: str) -> str:
+   -     if filename.endswith(extension):
+   -         filename = filename[:-len(extension)]
+14 +     filename = filename.removesuffix(extension)
+15 | 
+16 |     return filename
+17 | 
 
 FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
   --> FURB188.py:21:12
@@ -55,16 +51,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use removesuffix instead of ternary expression conditional upon endswith.
-
-ℹ Safe fix
-18 18 | 
-19 19 | 
-20 20 | def remove_extension_via_ternary(filename: str) -> str:
-21    |-    return filename[:-4] if filename.endswith(".txt") else filename
-   21 |+    return filename.removesuffix(".txt")
-22 22 | 
-23 23 | 
-24 24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str:
+18 | 
+19 | 
+20 | def remove_extension_via_ternary(filename: str) -> str:
+   -     return filename[:-4] if filename.endswith(".txt") else filename
+21 +     return filename.removesuffix(".txt")
+22 | 
+23 | 
+24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str:
 
 FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
   --> FURB188.py:25:12
@@ -74,16 +68,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use removesuffix instead of ternary expression conditional upon endswith.
-
-ℹ Safe fix
-22 22 | 
-23 23 | 
-24 24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str:
-25    |-    return filename[:-len(extension)] if filename.endswith(extension) else filename
-   25 |+    return filename.removesuffix(extension)
-26 26 | 
-27 27 | 
-28 28 | def remove_prefix(filename: str) -> str:
+22 | 
+23 | 
+24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str:
+   -     return filename[:-len(extension)] if filename.endswith(extension) else filename
+25 +     return filename.removesuffix(extension)
+26 | 
+27 | 
+28 | def remove_prefix(filename: str) -> str:
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
   --> FURB188.py:29:12
@@ -93,16 +85,14 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use removeprefix instead of ternary expression conditional upon startswith.
-
-ℹ Safe fix
-26 26 | 
-27 27 | 
-28 28 | def remove_prefix(filename: str) -> str:
-29    |-    return filename[4:] if filename.startswith("abc-") else filename
-   29 |+    return filename.removeprefix("abc-")
-30 30 | 
-31 31 | 
-32 32 | def remove_prefix_via_len(filename: str, prefix: str) -> str:
+26 | 
+27 | 
+28 | def remove_prefix(filename: str) -> str:
+   -     return filename[4:] if filename.startswith("abc-") else filename
+29 +     return filename.removeprefix("abc-")
+30 | 
+31 | 
+32 | def remove_prefix_via_len(filename: str, prefix: str) -> str:
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
   --> FURB188.py:33:12
@@ -112,16 +102,14 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use removeprefix instead of ternary expression conditional upon startswith.
-
-ℹ Safe fix
-30 30 | 
-31 31 | 
-32 32 | def remove_prefix_via_len(filename: str, prefix: str) -> str:
-33    |-    return filename[len(prefix):] if filename.startswith(prefix) else filename
-   33 |+    return filename.removeprefix(prefix)
-34 34 | 
-35 35 | 
-36 36 | # these should not
+30 | 
+31 | 
+32 | def remove_prefix_via_len(filename: str, prefix: str) -> str:
+   -     return filename[len(prefix):] if filename.startswith(prefix) else filename
+33 +     return filename.removeprefix(prefix)
+34 | 
+35 | 
+36 | # these should not
 
 FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
    --> FURB188.py:146:9
@@ -134,16 +122,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
 148 | def remove_prefix_comparable_literal_expr() -> None:
     |
 help: Use removesuffix instead of ternary expression conditional upon endswith.
-
-ℹ Safe fix
-143 143 | 
-144 144 |     SUFFIX = "suffix"
-145 145 | 
-146     |-    x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz
-    146 |+    x = foo.bar.baz.removesuffix(SUFFIX)
-147 147 | 
-148 148 | def remove_prefix_comparable_literal_expr() -> None:
-149 149 |     return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def"
+143 | 
+144 |     SUFFIX = "suffix"
+145 | 
+    -     x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz
+146 +     x = foo.bar.baz.removesuffix(SUFFIX)
+147 | 
+148 | def remove_prefix_comparable_literal_expr() -> None:
+149 |     return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def"
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:149:12
@@ -155,16 +141,14 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
 151 | def shadow_builtins(filename: str, extension: str) -> None:
     |
 help: Use removeprefix instead of ternary expression conditional upon startswith.
-
-ℹ Safe fix
-146 146 |     x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz
-147 147 | 
-148 148 | def remove_prefix_comparable_literal_expr() -> None:
-149     |-    return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def"
-    149 |+    return "abc" "def".removeprefix("abc")
-150 150 | 
-151 151 | def shadow_builtins(filename: str, extension: str) -> None:
-152 152 |     from builtins import len as builtins_len
+146 |     x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz
+147 | 
+148 | def remove_prefix_comparable_literal_expr() -> None:
+    -     return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def"
+149 +     return "abc" "def".removeprefix("abc")
+150 | 
+151 | def shadow_builtins(filename: str, extension: str) -> None:
+152 |     from builtins import len as builtins_len
 
 FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
    --> FURB188.py:154:12
@@ -177,16 +161,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
 156 | def okay_steps():
     |
 help: Use removesuffix instead of ternary expression conditional upon endswith.
-
-ℹ Safe fix
-151 151 | def shadow_builtins(filename: str, extension: str) -> None:
-152 152 |     from builtins import len as builtins_len
-153 153 | 
-154     |-    return filename[:-builtins_len(extension)] if filename.endswith(extension) else filename
-    154 |+    return filename.removesuffix(extension)
-155 155 | 
-156 156 | def okay_steps():
-157 157 |     text = "!x!y!z"
+151 | def shadow_builtins(filename: str, extension: str) -> None:
+152 |     from builtins import len as builtins_len
+153 | 
+    -     return filename[:-builtins_len(extension)] if filename.endswith(extension) else filename
+154 +     return filename.removesuffix(extension)
+155 | 
+156 | def okay_steps():
+157 |     text = "!x!y!z"
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:158:5
@@ -200,17 +182,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
 161 |           text = text[1::True]
     |
 help: Use removeprefix instead of assignment conditional upon startswith.
-
-ℹ Safe fix
-155 155 | 
-156 156 | def okay_steps():
-157 157 |     text = "!x!y!z"
-158     |-    if text.startswith("!"):
-159     |-        text = text[1::1]
-    158 |+    text = text.removeprefix("!")
-160 159 |     if text.startswith("!"):
-161 160 |         text = text[1::True]
-162 161 |     if text.startswith("!"):
+155 | 
+156 | def okay_steps():
+157 |     text = "!x!y!z"
+    -     if text.startswith("!"):
+    -         text = text[1::1]
+158 +     text = text.removeprefix("!")
+159 |     if text.startswith("!"):
+160 |         text = text[1::True]
+161 |     if text.startswith("!"):
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:160:5
@@ -224,17 +204,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
 163 |           text = text[1::None]
     |
 help: Use removeprefix instead of assignment conditional upon startswith.
-
-ℹ Safe fix
-157 157 |     text = "!x!y!z"
-158 158 |     if text.startswith("!"):
-159 159 |         text = text[1::1]
-160     |-    if text.startswith("!"):
-161     |-        text = text[1::True]
-    160 |+    text = text.removeprefix("!")
-162 161 |     if text.startswith("!"):
-163 162 |         text = text[1::None]
-164 163 |     print(text)
+157 |     text = "!x!y!z"
+158 |     if text.startswith("!"):
+159 |         text = text[1::1]
+    -     if text.startswith("!"):
+    -         text = text[1::True]
+160 +     text = text.removeprefix("!")
+161 |     if text.startswith("!"):
+162 |         text = text[1::None]
+163 |     print(text)
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:162:5
@@ -247,17 +225,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
 164 |       print(text)
     |
 help: Use removeprefix instead of assignment conditional upon startswith.
-
-ℹ Safe fix
-159 159 |         text = text[1::1]
-160 160 |     if text.startswith("!"):
-161 161 |         text = text[1::True]
-162     |-    if text.startswith("!"):
-163     |-        text = text[1::None]
-    162 |+    text = text.removeprefix("!")
-164 163 |     print(text)
-165 164 | 
-166 165 | 
+159 |         text = text[1::1]
+160 |     if text.startswith("!"):
+161 |         text = text[1::True]
+    -     if text.startswith("!"):
+    -         text = text[1::None]
+162 +     text = text.removeprefix("!")
+163 |     print(text)
+164 | 
+165 | 
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:183:5
@@ -269,17 +245,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
     | |_______________________^
     |
 help: Use removeprefix instead of assignment conditional upon startswith.
-
-ℹ Safe fix
-180 180 |     # should be linted
-181 181 |     # with fix `text = text.removeprefix("ř")`
-182 182 |     text = "řetězec"
-183     |-    if text.startswith("ř"): 
-184     |-        text = text[1:]
-    183 |+    text = text.removeprefix("ř")
-185 184 | 
-186 185 | 
-187 186 | def handle_surrogates():
+180 |     # should be linted
+181 |     # with fix `text = text.removeprefix("ř")`
+182 |     text = "řetězec"
+    -     if text.startswith("ř"): 
+    -         text = text[1:]
+183 +     text = text.removeprefix("ř")
+184 | 
+185 | 
+186 | def handle_surrogates():
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:190:5
@@ -293,17 +267,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
 193 |       if text.startswith("\U00010000"):
     |
 help: Use removeprefix instead of assignment conditional upon startswith.
-
-ℹ Safe fix
-187 187 | def handle_surrogates():
-188 188 |     # should be linted
-189 189 |     text = "\ud800\udc00heythere"
-190     |-    if text.startswith("\ud800\udc00"):
-191     |-        text = text[2:]
-    190 |+    text = text.removeprefix("\ud800\udc00")
-192 191 |     text = "\U00010000heythere"
-193 192 |     if text.startswith("\U00010000"):
-194 193 |         text = text[1:]
+187 | def handle_surrogates():
+188 |     # should be linted
+189 |     text = "\ud800\udc00heythere"
+    -     if text.startswith("\ud800\udc00"):
+    -         text = text[2:]
+190 +     text = text.removeprefix("\ud800\udc00")
+191 |     text = "\U00010000heythere"
+192 |     if text.startswith("\U00010000"):
+193 |         text = text[1:]
 
 FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
    --> FURB188.py:193:5
@@ -317,17 +289,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice.
 196 |       # should not be linted
     |
 help: Use removeprefix instead of assignment conditional upon startswith.
-
-ℹ Safe fix
-190 190 |     if text.startswith("\ud800\udc00"):
-191 191 |         text = text[2:]
-192 192 |     text = "\U00010000heythere"
-193     |-    if text.startswith("\U00010000"):
-194     |-        text = text[1:]
-    193 |+    text = text.removeprefix("\U00010000")
-195 194 |     
-196 195 |     # should not be linted
-197 196 |     text = "\ud800\udc00heythere"
+190 |     if text.startswith("\ud800\udc00"):
+191 |         text = text[2:]
+192 |     text = "\U00010000heythere"
+    -     if text.startswith("\U00010000"):
+    -         text = text[1:]
+193 +     text = text.removeprefix("\U00010000")
+194 |     
+195 |     # should not be linted
+196 |     text = "\ud800\udc00heythere"
 
 FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
    --> FURB188.py:205:5
@@ -340,12 +310,10 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice.
 207 |       print(a)
     |
 help: Use removesuffix instead of assignment conditional upon endswith.
-
-ℹ Safe fix
-202 202 | # https://github.com/astral-sh/ruff/issues/16231
-203 203 | def func():
-204 204 |     a = "sjdfaskldjfakljklfoo"
-205     |-    if a.endswith("foo"):
-206     |-        a = a[: -len("foo")]
-    205 |+    a = a.removesuffix("foo")
-207 206 |     print(a)
+202 | # https://github.com/astral-sh/ruff/issues/16231
+203 | def func():
+204 |     a = "sjdfaskldjfakljklfoo"
+    -     if a.endswith("foo"):
+    -         a = a[: -len("foo")]
+205 +     a = a.removesuffix("foo")
+206 |     print(a)
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap
index 24184590d2..c484e558a9 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap
@@ -10,24 +10,23 @@ FURB189 [*] Subclassing `dict` can be error prone, use `collections.UserDict` in
 18 |     pass
    |
 help: Replace with `collections.UserDict`
-
-ℹ Unsafe fix
-1  1  | # setup
-2  2  | from enum import Enum, EnumMeta
-3     |-from collections import UserList as UL
-   3  |+from collections import UserList as UL, UserDict
-4  4  | 
-5  5  | class SetOnceMappingMixin:
-6  6  |     __slots__ = ()
+1  | # setup
+2  | from enum import Enum, EnumMeta
+   - from collections import UserList as UL
+3  + from collections import UserList as UL, UserDict
+4  | 
+5  | class SetOnceMappingMixin:
+6  |     __slots__ = ()
 --------------------------------------------------------------------------------
-14 14 |     pass
-15 15 | 
-16 16 | # positives
-17    |-class D(dict):
-   17 |+class D(UserDict):
-18 18 |     pass
-19 19 | 
-20 20 | class L(list):
+14 |     pass
+15 | 
+16 | # positives
+   - class D(dict):
+17 + class D(UserDict):
+18 |     pass
+19 | 
+20 | class L(list):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` instead
   --> FURB189.py:20:9
@@ -39,16 +38,15 @@ FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` in
 21 |     pass
    |
 help: Replace with `collections.UserList`
-
-ℹ Unsafe fix
-17 17 | class D(dict):
-18 18 |     pass
-19 19 | 
-20    |-class L(list):
-   20 |+class L(UL):
-21 21 |     pass
-22 22 | 
-23 23 | class S(str):
+17 | class D(dict):
+18 |     pass
+19 | 
+   - class L(list):
+20 + class L(UL):
+21 |     pass
+22 | 
+23 | class S(str):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB189 [*] Subclassing `str` can be error prone, use `collections.UserString` instead
   --> FURB189.py:23:9
@@ -60,24 +58,23 @@ FURB189 [*] Subclassing `str` can be error prone, use `collections.UserString` i
 24 |     pass
    |
 help: Replace with `collections.UserString`
-
-ℹ Unsafe fix
-1  1  | # setup
-2  2  | from enum import Enum, EnumMeta
-3     |-from collections import UserList as UL
-   3  |+from collections import UserList as UL, UserString
-4  4  | 
-5  5  | class SetOnceMappingMixin:
-6  6  |     __slots__ = ()
+1  | # setup
+2  | from enum import Enum, EnumMeta
+   - from collections import UserList as UL
+3  + from collections import UserList as UL, UserString
+4  | 
+5  | class SetOnceMappingMixin:
+6  |     __slots__ = ()
 --------------------------------------------------------------------------------
-20 20 | class L(list):
-21 21 |     pass
-22 22 | 
-23    |-class S(str):
-   23 |+class S(UserString):
-24 24 |     pass
-25 25 | 
-26 26 | class SubscriptDict(dict[str, str]):
+20 | class L(list):
+21 |     pass
+22 | 
+   - class S(str):
+23 + class S(UserString):
+24 |     pass
+25 | 
+26 | class SubscriptDict(dict[str, str]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB189 [*] Subclassing `dict` can be error prone, use `collections.UserDict` instead
   --> FURB189.py:26:21
@@ -89,24 +86,23 @@ FURB189 [*] Subclassing `dict` can be error prone, use `collections.UserDict` in
 27 |     pass
    |
 help: Replace with `collections.UserDict`
-
-ℹ Unsafe fix
-1  1  | # setup
-2  2  | from enum import Enum, EnumMeta
-3     |-from collections import UserList as UL
-   3  |+from collections import UserList as UL, UserDict
-4  4  | 
-5  5  | class SetOnceMappingMixin:
-6  6  |     __slots__ = ()
+1  | # setup
+2  | from enum import Enum, EnumMeta
+   - from collections import UserList as UL
+3  + from collections import UserList as UL, UserDict
+4  | 
+5  | class SetOnceMappingMixin:
+6  |     __slots__ = ()
 --------------------------------------------------------------------------------
-23 23 | class S(str):
-24 24 |     pass
-25 25 | 
-26    |-class SubscriptDict(dict[str, str]):
-   26 |+class SubscriptDict(UserDict[str, str]):
-27 27 |     pass
-28 28 | 
-29 29 | class SubscriptList(list[str]):
+23 | class S(str):
+24 |     pass
+25 | 
+   - class SubscriptDict(dict[str, str]):
+26 + class SubscriptDict(UserDict[str, str]):
+27 |     pass
+28 | 
+29 | class SubscriptList(list[str]):
+note: This is an unsafe fix and may change runtime behavior
 
 FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` instead
   --> FURB189.py:29:21
@@ -118,13 +114,12 @@ FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` in
 30 |     pass
    |
 help: Replace with `collections.UserList`
-
-ℹ Unsafe fix
-26 26 | class SubscriptDict(dict[str, str]):
-27 27 |     pass
-28 28 | 
-29    |-class SubscriptList(list[str]):
-   29 |+class SubscriptList(UL[str]):
-30 30 |     pass
-31 31 | 
-32 32 | # currently not detected
+26 | class SubscriptDict(dict[str, str]):
+27 |     pass
+28 | 
+   - class SubscriptList(list[str]):
+29 + class SubscriptList(UL[str]):
+30 |     pass
+31 | 
+32 | # currently not detected
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap
index 8db1953f8f..120e2db30f 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap
@@ -12,15 +12,13 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque
 5 | sorted(l)[-1]
   |
 help: Replace with `min`
-
-ℹ Safe fix
-1 1 | # Errors
-2 2 | 
-3   |-sorted(l)[0]
-  3 |+min(l)
-4 4 | 
-5 5 | sorted(l)[-1]
-6 6 | 
+1 | # Errors
+2 | 
+  - sorted(l)[0]
+3 + min(l)
+4 | 
+5 | sorted(l)[-1]
+6 | 
 
 FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a sequence
  --> FURB192.py:5:1
@@ -33,16 +31,14 @@ FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a seque
 7 | sorted(l, reverse=False)[-1]
   |
 help: Replace with `max`
-
-ℹ Safe fix
-2 2 | 
-3 3 | sorted(l)[0]
-4 4 | 
-5   |-sorted(l)[-1]
-  5 |+max(l)
-6 6 | 
-7 7 | sorted(l, reverse=False)[-1]
-8 8 | 
+2 | 
+3 | sorted(l)[0]
+4 | 
+  - sorted(l)[-1]
+5 + max(l)
+6 | 
+7 | sorted(l, reverse=False)[-1]
+8 | 
 
 FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a sequence
  --> FURB192.py:7:1
@@ -55,16 +51,14 @@ FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a seque
 9 | sorted(l, key=lambda x: x)[0]
   |
 help: Replace with `max`
-
-ℹ Safe fix
-4 4 | 
-5 5 | sorted(l)[-1]
-6 6 | 
-7   |-sorted(l, reverse=False)[-1]
-  7 |+max(l)
-8 8 | 
-9 9 | sorted(l, key=lambda x: x)[0]
-10 10 | 
+4  | 
+5  | sorted(l)[-1]
+6  | 
+   - sorted(l, reverse=False)[-1]
+7  + max(l)
+8  | 
+9  | sorted(l, key=lambda x: x)[0]
+10 | 
 
 FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence
   --> FURB192.py:9:1
@@ -77,16 +71,14 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque
 11 | sorted(l, key=key_fn)[0]
    |
 help: Replace with `min`
-
-ℹ Safe fix
-6  6  | 
-7  7  | sorted(l, reverse=False)[-1]
-8  8  | 
-9     |-sorted(l, key=lambda x: x)[0]
-   9  |+min(l, key=lambda x: x)
-10 10 | 
-11 11 | sorted(l, key=key_fn)[0]
-12 12 | 
+6  | 
+7  | sorted(l, reverse=False)[-1]
+8  | 
+   - sorted(l, key=lambda x: x)[0]
+9  + min(l, key=lambda x: x)
+10 | 
+11 | sorted(l, key=key_fn)[0]
+12 | 
 
 FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence
   --> FURB192.py:11:1
@@ -99,16 +91,14 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque
 13 | sorted([1, 2, 3])[0]
    |
 help: Replace with `min`
-
-ℹ Safe fix
-8  8  | 
-9  9  | sorted(l, key=lambda x: x)[0]
-10 10 | 
-11    |-sorted(l, key=key_fn)[0]
-   11 |+min(l, key=key_fn)
-12 12 | 
-13 13 | sorted([1, 2, 3])[0]
-14 14 | 
+8  | 
+9  | sorted(l, key=lambda x: x)[0]
+10 | 
+   - sorted(l, key=key_fn)[0]
+11 + min(l, key=key_fn)
+12 | 
+13 | sorted([1, 2, 3])[0]
+14 | 
 
 FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence
   --> FURB192.py:13:1
@@ -121,16 +111,14 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque
 15 | # Unsafe
    |
 help: Replace with `min`
-
-ℹ Safe fix
-10 10 | 
-11 11 | sorted(l, key=key_fn)[0]
-12 12 | 
-13    |-sorted([1, 2, 3])[0]
-   13 |+min([1, 2, 3])
-14 14 | 
-15 15 | # Unsafe
-16 16 | 
+10 | 
+11 | sorted(l, key=key_fn)[0]
+12 | 
+   - sorted([1, 2, 3])[0]
+13 + min([1, 2, 3])
+14 | 
+15 | # Unsafe
+16 | 
 
 FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence
   --> FURB192.py:17:1
@@ -143,16 +131,15 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque
 19 | sorted(l, reverse=True)[0]
    |
 help: Replace with `min`
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | # Unsafe
-16 16 | 
-17    |-sorted(l, key=key_fn, reverse=True)[-1]
-   17 |+min(l, key=key_fn)
-18 18 | 
-19 19 | sorted(l, reverse=True)[0]
-20 20 | 
+14 | 
+15 | # Unsafe
+16 | 
+   - sorted(l, key=key_fn, reverse=True)[-1]
+17 + min(l, key=key_fn)
+18 | 
+19 | sorted(l, reverse=True)[0]
+20 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a sequence
   --> FURB192.py:19:1
@@ -165,16 +152,15 @@ FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a seque
 21 | sorted(l, reverse=True)[-1]
    |
 help: Replace with `max`
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | sorted(l, key=key_fn, reverse=True)[-1]
-18 18 | 
-19    |-sorted(l, reverse=True)[0]
-   19 |+max(l)
-20 20 | 
-21 21 | sorted(l, reverse=True)[-1]
-22 22 | 
+16 | 
+17 | sorted(l, key=key_fn, reverse=True)[-1]
+18 | 
+   - sorted(l, reverse=True)[0]
+19 + max(l)
+20 | 
+21 | sorted(l, reverse=True)[-1]
+22 | 
+note: This is an unsafe fix and may change runtime behavior
 
 FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence
   --> FURB192.py:21:1
@@ -187,13 +173,12 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque
 23 | # Non-errors
    |
 help: Replace with `min`
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | sorted(l, reverse=True)[0]
-20 20 | 
-21    |-sorted(l, reverse=True)[-1]
-   21 |+min(l)
-22 22 | 
-23 23 | # Non-errors
-24 24 |
+18 | 
+19 | sorted(l, reverse=True)[0]
+20 | 
+   - sorted(l, reverse=True)[-1]
+21 + min(l)
+22 | 
+23 | # Non-errors
+24 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap
index a6796cea74..5a2810bb6e 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
-FURB116 Replace `oct` call with `f"{num:o}"`
+FURB116 [*] Replace `oct` call with `f"{num:o}"`
   --> FURB116.py:9:7
    |
  7 |     return num
@@ -12,18 +12,17 @@ FURB116 Replace `oct` call with `f"{num:o}"`
 11 | print(bin(num)[2:])  # FURB116
    |
 help: Replace with `f"{num:o}"`
+6  | def return_num() -> int:
+7  |     return num
+8  | 
+   - print(oct(num)[2:])  # FURB116
+9  + print(f"{num:o}")  # FURB116
+10 | print(hex(num)[2:])  # FURB116
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-6  6  | def return_num() -> int:
-7  7  |     return num
-8  8  | 
-9     |-print(oct(num)[2:])  # FURB116
-   9  |+print(f"{num:o}")  # FURB116
-10 10 | print(hex(num)[2:])  # FURB116
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-
-FURB116 Replace `hex` call with `f"{num:x}"`
+FURB116 [*] Replace `hex` call with `f"{num:x}"`
   --> FURB116.py:10:7
    |
  9 | print(oct(num)[2:])  # FURB116
@@ -32,18 +31,17 @@ FURB116 Replace `hex` call with `f"{num:x}"`
 11 | print(bin(num)[2:])  # FURB116
    |
 help: Replace with `f"{num:x}"`
+7  |     return num
+8  | 
+9  | print(oct(num)[2:])  # FURB116
+   - print(hex(num)[2:])  # FURB116
+10 + print(f"{num:x}")  # FURB116
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-7  7  |     return num
-8  8  | 
-9  9  | print(oct(num)[2:])  # FURB116
-10    |-print(hex(num)[2:])  # FURB116
-   10 |+print(f"{num:x}")  # FURB116
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-
-FURB116 Replace `bin` call with `f"{num:b}"`
+FURB116 [*] Replace `bin` call with `f"{num:b}"`
   --> FURB116.py:11:7
    |
  9 | print(oct(num)[2:])  # FURB116
@@ -54,16 +52,15 @@ FURB116 Replace `bin` call with `f"{num:b}"`
 13 | print(oct(1337)[2:])  # FURB116
    |
 help: Replace with `f"{num:b}"`
-
-ℹ Display-only fix
-8  8  | 
-9  9  | print(oct(num)[2:])  # FURB116
-10 10 | print(hex(num)[2:])  # FURB116
-11    |-print(bin(num)[2:])  # FURB116
-   11 |+print(f"{num:b}")  # FURB116
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
+8  | 
+9  | print(oct(num)[2:])  # FURB116
+10 | print(hex(num)[2:])  # FURB116
+   - print(bin(num)[2:])  # FURB116
+11 + print(f"{num:b}")  # FURB116
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+note: This is a display-only fix and is likely to be incorrect
 
 FURB116 [*] Replace `oct` call with `f"{1337:o}"`
   --> FURB116.py:13:7
@@ -76,16 +73,14 @@ FURB116 [*] Replace `oct` call with `f"{1337:o}"`
 15 | print(bin(1337)[2:])  # FURB116
    |
 help: Replace with `f"{1337:o}"`
-
-ℹ Safe fix
-10 10 | print(hex(num)[2:])  # FURB116
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-13    |-print(oct(1337)[2:])  # FURB116
-   13 |+print(f"{1337:o}")  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
-15 15 | print(bin(1337)[2:])  # FURB116
-16 16 | print(bin(+1337)[2:])  # FURB116
+10 | print(hex(num)[2:])  # FURB116
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+   - print(oct(1337)[2:])  # FURB116
+13 + print(f"{1337:o}")  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+15 | print(bin(1337)[2:])  # FURB116
+16 | print(bin(+1337)[2:])  # FURB116
 
 FURB116 [*] Replace `hex` call with `f"{1337:x}"`
   --> FURB116.py:14:7
@@ -97,16 +92,14 @@ FURB116 [*] Replace `hex` call with `f"{1337:x}"`
 16 | print(bin(+1337)[2:])  # FURB116
    |
 help: Replace with `f"{1337:x}"`
-
-ℹ Safe fix
-11 11 | print(bin(num)[2:])  # FURB116
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-14    |-print(hex(1337)[2:])  # FURB116
-   14 |+print(f"{1337:x}")  # FURB116
-15 15 | print(bin(1337)[2:])  # FURB116
-16 16 | print(bin(+1337)[2:])  # FURB116
-17 17 | 
+11 | print(bin(num)[2:])  # FURB116
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+   - print(hex(1337)[2:])  # FURB116
+14 + print(f"{1337:x}")  # FURB116
+15 | print(bin(1337)[2:])  # FURB116
+16 | print(bin(+1337)[2:])  # FURB116
+17 | 
 
 FURB116 [*] Replace `bin` call with `f"{1337:b}"`
   --> FURB116.py:15:7
@@ -118,16 +111,14 @@ FURB116 [*] Replace `bin` call with `f"{1337:b}"`
 16 | print(bin(+1337)[2:])  # FURB116
    |
 help: Replace with `f"{1337:b}"`
-
-ℹ Safe fix
-12 12 | 
-13 13 | print(oct(1337)[2:])  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
-15    |-print(bin(1337)[2:])  # FURB116
-   15 |+print(f"{1337:b}")  # FURB116
-16 16 | print(bin(+1337)[2:])  # FURB116
-17 17 | 
-18 18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
+12 | 
+13 | print(oct(1337)[2:])  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+   - print(bin(1337)[2:])  # FURB116
+15 + print(f"{1337:b}")  # FURB116
+16 | print(bin(+1337)[2:])  # FURB116
+17 | 
+18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
 
 FURB116 [*] Replace `bin` call with `f"{+1337:b}"`
   --> FURB116.py:16:7
@@ -140,16 +131,14 @@ FURB116 [*] Replace `bin` call with `f"{+1337:b}"`
 18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
    |
 help: Replace with `f"{+1337:b}"`
-
-ℹ Safe fix
-13 13 | print(oct(1337)[2:])  # FURB116
-14 14 | print(hex(1337)[2:])  # FURB116
-15 15 | print(bin(1337)[2:])  # FURB116
-16    |-print(bin(+1337)[2:])  # FURB116
-   16 |+print(f"{+1337:b}")  # FURB116
-17 17 | 
-18 18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
-19 19 | print(bin(int(f"{num}"))[2:])  # FURB116 (no autofix)
+13 | print(oct(1337)[2:])  # FURB116
+14 | print(hex(1337)[2:])  # FURB116
+15 | print(bin(1337)[2:])  # FURB116
+   - print(bin(+1337)[2:])  # FURB116
+16 + print(f"{+1337:b}")  # FURB116
+17 | 
+18 | print(bin(return_num())[2:])  # FURB116 (no autofix)
+19 | print(bin(int(f"{num}"))[2:])  # FURB116 (no autofix)
 
 FURB116 Replace `bin` call with f-string
   --> FURB116.py:18:7
@@ -173,7 +162,7 @@ FURB116 Replace `bin` call with f-string
    |
 help: Replace with f-string
 
-FURB116 Replace `bin` call with `f"{d:b}"`
+FURB116 [*] Replace `bin` call with `f"{d:b}"`
   --> FURB116.py:32:7
    |
 30 | d = datetime.datetime.now(tz=datetime.UTC)
@@ -184,16 +173,15 @@ FURB116 Replace `bin` call with `f"{d:b}"`
 34 | print(bin(len("xyz").numerator)[2:])
    |
 help: Replace with `f"{d:b}"`
-
-ℹ Display-only fix
-29 29 | 
-30 30 | d = datetime.datetime.now(tz=datetime.UTC)
-31 31 | # autofix is display-only
-32    |-print(bin(d)[2:])
-   32 |+print(f"{d:b}")
-33 33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-34 34 | print(bin(len("xyz").numerator)[2:])
-35 35 | 
+29 | 
+30 | d = datetime.datetime.now(tz=datetime.UTC)
+31 | # autofix is display-only
+   - print(bin(d)[2:])
+32 + print(f"{d:b}")
+33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+34 | print(bin(len("xyz").numerator)[2:])
+35 | 
+note: This is a display-only fix and is likely to be incorrect
 
 FURB116 Replace `bin` call with f-string
   --> FURB116.py:34:7
@@ -207,7 +195,7 @@ FURB116 Replace `bin` call with f-string
    |
 help: Replace with f-string
 
-FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"`
+FURB116 [*] Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"`
   --> FURB116.py:37:7
    |
 36 | # autofix is display-only
@@ -217,16 +205,15 @@ FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"`
 39 | print(bin(ord("\\").numerator)[2:])
    |
 help: Replace with `f"{ {0: 1}[0].numerator:b}"`
-
-ℹ Display-only fix
-34 34 | print(bin(len("xyz").numerator)[2:])
-35 35 | 
-36 36 | # autofix is display-only
-37    |-print(bin({0: 1}[0].numerator)[2:])
-   37 |+print(f"{ {0: 1}[0].numerator:b}")
-38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
-39 39 | print(bin(ord("\\").numerator)[2:])
-40 40 | print(hex(sys
+34 | print(bin(len("xyz").numerator)[2:])
+35 | 
+36 | # autofix is display-only
+   - print(bin({0: 1}[0].numerator)[2:])
+37 + print(f"{ {0: 1}[0].numerator:b}")
+38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error
+39 | print(bin(ord("\\").numerator)[2:])
+40 | print(hex(sys
+note: This is a display-only fix and is likely to be incorrect
 
 FURB116 Replace `bin` call with f-string
   --> FURB116.py:39:7
@@ -254,7 +241,7 @@ FURB116 Replace `hex` call with f-string
    |
 help: Replace with f-string
 
-FURB116 Replace `bin` call with `f"{-1:b}"`
+FURB116 [*] Replace `bin` call with `f"{-1:b}"`
   --> FURB116.py:44:7
    |
 43 | # for negatives numbers autofix is display-only
@@ -262,10 +249,9 @@ FURB116 Replace `bin` call with `f"{-1:b}"`
    |       ^^^^^^^^^^^
    |
 help: Replace with `f"{-1:b}"`
-
-ℹ Display-only fix
-41 41 | .maxunicode)[2:])
-42 42 | 
-43 43 | # for negatives numbers autofix is display-only
-44    |-print(bin(-1)[2:])
-   44 |+print(f"{-1:b}")
+41 | .maxunicode)[2:])
+42 | 
+43 | # for negatives numbers autofix is display-only
+   - print(bin(-1)[2:])
+44 + print(f"{-1:b}")
+note: This is a display-only fix and is likely to be incorrect
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__preview_FURB101_FURB101.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__preview_FURB101_FURB101.py.snap
new file mode 100644
index 0000000000..4131499c0c
--- /dev/null
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__preview_FURB101_FURB101.py.snap
@@ -0,0 +1,191 @@
+---
+source: crates/ruff_linter/src/rules/refurb/mod.rs
+---
+FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text()`
+  --> FURB101.py:12:6
+   |
+11 | # FURB101
+12 | with open("file.txt") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^
+13 |     x = f.read()
+   |
+help: Replace with `Path("file.txt").read_text()`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+10 | # Errors.
+11 | 
+12 | # FURB101
+   - with open("file.txt") as f:
+   -     x = f.read()
+13 + x = pathlib.Path("file.txt").read_text()
+14 | 
+15 | # FURB101
+16 | with open("file.txt", "rb") as f:
+
+FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
+  --> FURB101.py:16:6
+   |
+15 | # FURB101
+16 | with open("file.txt", "rb") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17 |     x = f.read()
+   |
+help: Replace with `Path("file.txt").read_bytes()`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+14 |     x = f.read()
+15 | 
+16 | # FURB101
+   - with open("file.txt", "rb") as f:
+   -     x = f.read()
+17 + x = pathlib.Path("file.txt").read_bytes()
+18 | 
+19 | # FURB101
+20 | with open("file.txt", mode="rb") as f:
+
+FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
+  --> FURB101.py:20:6
+   |
+19 | # FURB101
+20 | with open("file.txt", mode="rb") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21 |     x = f.read()
+   |
+help: Replace with `Path("file.txt").read_bytes()`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+18 |     x = f.read()
+19 | 
+20 | # FURB101
+   - with open("file.txt", mode="rb") as f:
+   -     x = f.read()
+21 + x = pathlib.Path("file.txt").read_bytes()
+22 | 
+23 | # FURB101
+24 | with open("file.txt", encoding="utf8") as f:
+
+FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf8")`
+  --> FURB101.py:24:6
+   |
+23 | # FURB101
+24 | with open("file.txt", encoding="utf8") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+25 |     x = f.read()
+   |
+help: Replace with `Path("file.txt").read_text(encoding="utf8")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+22 |     x = f.read()
+23 | 
+24 | # FURB101
+   - with open("file.txt", encoding="utf8") as f:
+   -     x = f.read()
+25 + x = pathlib.Path("file.txt").read_text(encoding="utf8")
+26 | 
+27 | # FURB101
+28 | with open("file.txt", errors="ignore") as f:
+
+FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(errors="ignore")`
+  --> FURB101.py:28:6
+   |
+27 | # FURB101
+28 | with open("file.txt", errors="ignore") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+29 |     x = f.read()
+   |
+help: Replace with `Path("file.txt").read_text(errors="ignore")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+26 |     x = f.read()
+27 | 
+28 | # FURB101
+   - with open("file.txt", errors="ignore") as f:
+   -     x = f.read()
+29 + x = pathlib.Path("file.txt").read_text(errors="ignore")
+30 | 
+31 | # FURB101
+32 | with open("file.txt", mode="r") as f:  # noqa: FURB120
+
+FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text()`
+  --> FURB101.py:32:6
+   |
+31 | # FURB101
+32 | with open("file.txt", mode="r") as f:  # noqa: FURB120
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+33 |     x = f.read()
+   |
+help: Replace with `Path("file.txt").read_text()`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+30 |     x = f.read()
+31 | 
+32 | # FURB101
+   - with open("file.txt", mode="r") as f:  # noqa: FURB120
+   -     x = f.read()
+33 + x = pathlib.Path("file.txt").read_text()
+34 | 
+35 | # FURB101
+36 | with open(foo(), "rb") as f:
+note: This is an unsafe fix and may change runtime behavior
+
+FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
+  --> FURB101.py:36:6
+   |
+35 | # FURB101
+36 | with open(foo(), "rb") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^
+37 |     # The body of `with` is non-trivial, but the recommendation holds.
+38 |     bar("pre")
+   |
+help: Replace with `Path(foo()).read_bytes()`
+
+FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
+  --> FURB101.py:44:6
+   |
+43 | # FURB101
+44 | with open("a.txt") as a, open("b.txt", "rb") as b:
+   |      ^^^^^^^^^^^^^^^^^^
+45 |     x = a.read()
+46 |     y = b.read()
+   |
+help: Replace with `Path("a.txt").read_text()`
+
+FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
+  --> FURB101.py:44:26
+   |
+43 | # FURB101
+44 | with open("a.txt") as a, open("b.txt", "rb") as b:
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^
+45 |     x = a.read()
+46 |     y = b.read()
+   |
+help: Replace with `Path("b.txt").read_bytes()`
+
+FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
+  --> FURB101.py:49:18
+   |
+48 | # FURB101
+49 | with foo() as a, open("file.txt") as b, foo() as c:
+   |                  ^^^^^^^^^^^^^^^^^^^^^
+50 |     # We have other things in here, multiple with items, but
+51 |     # the user reads the whole file and that bit they can replace.
+   |
+help: Replace with `Path("file.txt").read_text()`
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__preview_FURB103_FURB103.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__preview_FURB103_FURB103.py.snap
new file mode 100644
index 0000000000..eef0992839
--- /dev/null
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__preview_FURB103_FURB103.py.snap
@@ -0,0 +1,260 @@
+---
+source: crates/ruff_linter/src/rules/refurb/mod.rs
+---
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text("test")`
+  --> FURB103.py:12:6
+   |
+11 | # FURB103
+12 | with open("file.txt", "w") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^
+13 |     f.write("test")
+   |
+help: Replace with `Path("file.txt").write_text("test")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+10 | # Errors.
+11 | 
+12 | # FURB103
+   - with open("file.txt", "w") as f:
+   -     f.write("test")
+13 + pathlib.Path("file.txt").write_text("test")
+14 | 
+15 | # FURB103
+16 | with open("file.txt", "wb") as f:
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
+  --> FURB103.py:16:6
+   |
+15 | # FURB103
+16 | with open("file.txt", "wb") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_bytes(foobar)`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+14 |     f.write("test")
+15 | 
+16 | # FURB103
+   - with open("file.txt", "wb") as f:
+   -     f.write(foobar)
+17 + pathlib.Path("file.txt").write_bytes(foobar)
+18 | 
+19 | # FURB103
+20 | with open("file.txt", mode="wb") as f:
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
+  --> FURB103.py:20:6
+   |
+19 | # FURB103
+20 | with open("file.txt", mode="wb") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21 |     f.write(b"abc")
+   |
+help: Replace with `Path("file.txt").write_bytes(b"abc")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+18 |     f.write(foobar)
+19 | 
+20 | # FURB103
+   - with open("file.txt", mode="wb") as f:
+   -     f.write(b"abc")
+21 + pathlib.Path("file.txt").write_bytes(b"abc")
+22 | 
+23 | # FURB103
+24 | with open("file.txt", "w", encoding="utf8") as f:
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
+  --> FURB103.py:24:6
+   |
+23 | # FURB103
+24 | with open("file.txt", "w", encoding="utf8") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+25 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+22 |     f.write(b"abc")
+23 | 
+24 | # FURB103
+   - with open("file.txt", "w", encoding="utf8") as f:
+   -     f.write(foobar)
+25 + pathlib.Path("file.txt").write_text(foobar, encoding="utf8")
+26 | 
+27 | # FURB103
+28 | with open("file.txt", "w", errors="ignore") as f:
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
+  --> FURB103.py:28:6
+   |
+27 | # FURB103
+28 | with open("file.txt", "w", errors="ignore") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+29 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+26 |     f.write(foobar)
+27 | 
+28 | # FURB103
+   - with open("file.txt", "w", errors="ignore") as f:
+   -     f.write(foobar)
+29 + pathlib.Path("file.txt").write_text(foobar, errors="ignore")
+30 | 
+31 | # FURB103
+32 | with open("file.txt", mode="w") as f:
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
+  --> FURB103.py:32:6
+   |
+31 | # FURB103
+32 | with open("file.txt", mode="w") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+33 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_text(foobar)`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+30 |     f.write(foobar)
+31 | 
+32 | # FURB103
+   - with open("file.txt", mode="w") as f:
+   -     f.write(foobar)
+33 + pathlib.Path("file.txt").write_text(foobar)
+34 | 
+35 | # FURB103
+36 | with open(foo(), "wb") as f:
+
+FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
+  --> FURB103.py:36:6
+   |
+35 | # FURB103
+36 | with open(foo(), "wb") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^
+37 |     # The body of `with` is non-trivial, but the recommendation holds.
+38 |     bar("pre")
+   |
+help: Replace with `Path(foo()).write_bytes(bar())`
+
+FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
+  --> FURB103.py:44:6
+   |
+43 | # FURB103
+44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^
+45 |     a.write(x)
+46 |     b.write(y)
+   |
+help: Replace with `Path("a.txt").write_text(x)`
+
+FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
+  --> FURB103.py:44:31
+   |
+43 | # FURB103
+44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^
+45 |     a.write(x)
+46 |     b.write(y)
+   |
+help: Replace with `Path("b.txt").write_bytes(y)`
+
+FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
+  --> FURB103.py:49:18
+   |
+48 | # FURB103
+49 | with foo() as a, open("file.txt", "w") as b, foo() as c:
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^
+50 |     # We have other things in here, multiple with items, but the user
+51 |     # writes a single time to file and that bit they can replace.
+   |
+help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
+  --> FURB103.py:58:6
+   |
+57 | # FURB103
+58 | with open("file.txt", "w", newline="\r\n") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+59 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
+1  + import pathlib
+2  | def foo():
+3  |     ...
+4  | 
+--------------------------------------------------------------------------------
+56 | 
+57 | 
+58 | # FURB103
+   - with open("file.txt", "w", newline="\r\n") as f:
+   -     f.write(foobar)
+59 + pathlib.Path("file.txt").write_text(foobar, newline="\r\n")
+60 | 
+61 | 
+62 | import builtins
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
+  --> FURB103.py:66:6
+   |
+65 | # FURB103
+66 | with builtins.open("file.txt", "w", newline="\r\n") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+67 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
+60 | 
+61 | 
+62 | import builtins
+63 + import pathlib
+64 | 
+65 | 
+66 | # FURB103
+   - with builtins.open("file.txt", "w", newline="\r\n") as f:
+   -     f.write(foobar)
+67 + pathlib.Path("file.txt").write_text(foobar, newline="\r\n")
+68 | 
+69 | 
+70 | from builtins import open as o
+
+FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
+  --> FURB103.py:74:6
+   |
+73 | # FURB103
+74 | with o("file.txt", "w", newline="\r\n") as f:
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+75 |     f.write(foobar)
+   |
+help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
+68 | 
+69 | 
+70 | from builtins import open as o
+71 + import pathlib
+72 | 
+73 | 
+74 | # FURB103
+   - with o("file.txt", "w", newline="\r\n") as f:
+   -     f.write(foobar)
+75 + pathlib.Path("file.txt").write_text(foobar, newline="\r\n")
+76 | 
+77 | # Non-errors.
+78 |
diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__write_whole_file_python_39.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__write_whole_file_python_39.snap
index de6a020f87..81eea0c159 100644
--- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__write_whole_file_python_39.snap
+++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__write_whole_file_python_39.snap
@@ -9,6 +9,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text("t
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^
 13 |     f.write("test")
    |
+help: Replace with `Path("file.txt").write_text("test")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
   --> FURB103.py:16:6
@@ -18,6 +19,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(f
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 17 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_bytes(foobar)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
   --> FURB103.py:20:6
@@ -27,6 +29,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_bytes(b
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 21 |     f.write(b"abc")
    |
+help: Replace with `Path("file.txt").write_bytes(b"abc")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
   --> FURB103.py:24:6
@@ -36,6 +39,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 25 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
   --> FURB103.py:28:6
@@ -45,6 +49,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 29 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
   --> FURB103.py:32:6
@@ -54,6 +59,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(fo
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 33 |     f.write(foobar)
    |
+help: Replace with `Path("file.txt").write_text(foobar)`
 
 FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
   --> FURB103.py:36:6
@@ -64,6 +70,7 @@ FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())
 37 |     # The body of `with` is non-trivial, but the recommendation holds.
 38 |     bar("pre")
    |
+help: Replace with `Path(foo()).write_bytes(bar())`
 
 FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
   --> FURB103.py:44:6
@@ -74,6 +81,7 @@ FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
 45 |     a.write(x)
 46 |     b.write(y)
    |
+help: Replace with `Path("a.txt").write_text(x)`
 
 FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
   --> FURB103.py:44:31
@@ -84,6 +92,7 @@ FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
 45 |     a.write(x)
 46 |     b.write(y)
    |
+help: Replace with `Path("b.txt").write_bytes(y)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
   --> FURB103.py:49:18
@@ -94,3 +103,4 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(ba
 50 |     # We have other things in here, multiple with items, but the user
 51 |     # writes a single time to file and that bit they can replace.
    |
+help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
diff --git a/crates/ruff_linter/src/rules/ruff/mod.rs b/crates/ruff_linter/src/rules/ruff/mod.rs
index 84534c17ad..7cdc557841 100644
--- a/crates/ruff_linter/src/rules/ruff/mod.rs
+++ b/crates/ruff_linter/src/rules/ruff/mod.rs
@@ -22,7 +22,7 @@ mod tests {
     use crate::settings::LinterSettings;
     use crate::settings::types::{CompiledPerFileIgnoreList, PerFileIgnore, PreviewMode};
     use crate::test::{test_path, test_resource_path};
-    use crate::{assert_diagnostics, settings};
+    use crate::{assert_diagnostics, assert_diagnostics_diff, settings};
 
     #[test_case(Rule::CollectionLiteralConcatenation, Path::new("RUF005.py"))]
     #[test_case(Rule::CollectionLiteralConcatenation, Path::new("RUF005_slices.py"))]
@@ -85,6 +85,7 @@ mod tests {
     #[test_case(Rule::InvalidAssertMessageLiteralArgument, Path::new("RUF040.py"))]
     #[test_case(Rule::UnnecessaryNestedLiteral, Path::new("RUF041.py"))]
     #[test_case(Rule::UnnecessaryNestedLiteral, Path::new("RUF041.pyi"))]
+    #[test_case(Rule::PytestRaisesAmbiguousPattern, Path::new("RUF043.py"))]
     #[test_case(Rule::UnnecessaryCastToInt, Path::new("RUF046.py"))]
     #[test_case(Rule::UnnecessaryCastToInt, Path::new("RUF046_CR.py"))]
     #[test_case(Rule::UnnecessaryCastToInt, Path::new("RUF046_LF.py"))]
@@ -111,6 +112,7 @@ mod tests {
     #[test_case(Rule::LegacyFormPytestRaises, Path::new("RUF061_warns.py"))]
     #[test_case(Rule::LegacyFormPytestRaises, Path::new("RUF061_deprecated_call.py"))]
     #[test_case(Rule::NonOctalPermissions, Path::new("RUF064.py"))]
+    #[test_case(Rule::LoggingEagerConversion, Path::new("RUF065.py"))]
     #[test_case(Rule::RedirectedNOQA, Path::new("RUF101_0.py"))]
     #[test_case(Rule::RedirectedNOQA, Path::new("RUF101_1.py"))]
     #[test_case(Rule::InvalidRuleCode, Path::new("RUF102.py"))]
@@ -243,6 +245,32 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn confusables_deferred_annotations_diff() -> Result<()> {
+        assert_diagnostics_diff!(
+            Path::new("ruff/confusables.py"),
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY313.into(),
+                allowed_confusables: FxHashSet::from_iter(['−', 'ρ', '∗']),
+                ..settings::LinterSettings::for_rules(vec![
+                    Rule::AmbiguousUnicodeCharacterString,
+                    Rule::AmbiguousUnicodeCharacterDocstring,
+                    Rule::AmbiguousUnicodeCharacterComment,
+                ])
+            },
+            &LinterSettings {
+                unresolved_target_version: PythonVersion::PY314.into(),
+                allowed_confusables: FxHashSet::from_iter(['−', 'ρ', '∗']),
+                ..settings::LinterSettings::for_rules(vec![
+                    Rule::AmbiguousUnicodeCharacterString,
+                    Rule::AmbiguousUnicodeCharacterDocstring,
+                    Rule::AmbiguousUnicodeCharacterComment,
+                ])
+            },
+        );
+        Ok(())
+    }
+
     #[test]
     fn preview_confusables() -> Result<()> {
         let diagnostics = test_path(
@@ -535,7 +563,6 @@ mod tests {
     #[test_case(Rule::UnnecessaryRegularExpression, Path::new("RUF055_1.py"))]
     #[test_case(Rule::UnnecessaryRegularExpression, Path::new("RUF055_2.py"))]
     #[test_case(Rule::UnnecessaryRegularExpression, Path::new("RUF055_3.py"))]
-    #[test_case(Rule::PytestRaisesAmbiguousPattern, Path::new("RUF043.py"))]
     #[test_case(Rule::IndentedFormFeed, Path::new("RUF054.py"))]
     #[test_case(Rule::ImplicitClassVarInDataclass, Path::new("RUF045.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
@@ -649,7 +676,6 @@ mod tests {
         let diagnostics = test_path(
             Path::new("ruff").join(path).as_path(),
             &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
                 future_annotations: true,
                 unresolved_target_version: PythonVersion::PY39.into(),
                 ..settings::LinterSettings::for_rule(rule_code)
diff --git a/crates/ruff_linter/src/rules/ruff/rules/access_annotations_from_class_dict.rs b/crates/ruff_linter/src/rules/ruff/rules/access_annotations_from_class_dict.rs
index f314d38c1a..33435c648e 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/access_annotations_from_class_dict.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/access_annotations_from_class_dict.rs
@@ -74,6 +74,7 @@ use ruff_text_size::Ranged;
 /// ## References
 /// - [Python Annotations Best Practices](https://docs.python.org/3.14/howto/annotations.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.12.1")]
 pub(crate) struct AccessAnnotationsFromClassDict {
     python_version: PythonVersion,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/ambiguous_unicode_character.rs b/crates/ruff_linter/src/rules/ruff/rules/ambiguous_unicode_character.rs
index 9ee9352c64..ba1c696d27 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/ambiguous_unicode_character.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/ambiguous_unicode_character.rs
@@ -46,6 +46,7 @@ use crate::rules::ruff::rules::confusables::confusable;
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.102")]
 pub(crate) struct AmbiguousUnicodeCharacterString {
     confusable: char,
     representant: char,
@@ -99,6 +100,7 @@ impl Violation for AmbiguousUnicodeCharacterString {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.102")]
 pub(crate) struct AmbiguousUnicodeCharacterDocstring {
     confusable: char,
     representant: char,
@@ -152,6 +154,7 @@ impl Violation for AmbiguousUnicodeCharacterDocstring {
 ///
 /// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.108")]
 pub(crate) struct AmbiguousUnicodeCharacterComment {
     confusable: char,
     representant: char,
diff --git a/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs b/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs
index 41f72bbdc5..186b09cb4a 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs
@@ -38,6 +38,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## References
 /// - [Python documentation: `assert`](https://docs.python.org/3/reference/simple_stmts.html#the-assert-statement)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct AssertWithPrintMessage;
 
 impl AlwaysFixableViolation for AssertWithPrintMessage {
@@ -68,7 +69,7 @@ pub(crate) fn assert_with_print_message(checker: &Checker, stmt: &ast::StmtAsser
                     test: stmt.test.clone(),
                     msg: print_arguments::to_expr(&call.arguments, checker).map(Box::new),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 })),
                 // We have to replace the entire statement,
                 // as the `print` could be empty and thus `call.range()`
@@ -114,7 +115,7 @@ mod print_arguments {
                     InterpolatedStringElement::Literal(InterpolatedStringLiteralElement {
                         value: part.value.clone(),
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     })
                 })
                 .collect(),
@@ -131,7 +132,7 @@ mod print_arguments {
                     conversion: ConversionFlag::None,
                     format_spec: None,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 },
             )],
         }
@@ -154,7 +155,7 @@ mod print_arguments {
                     value: literal.value.clone(),
                     flags,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 });
                 Some(acc)
             } else {
@@ -212,7 +213,7 @@ mod print_arguments {
             value: combined_string.into(),
             flags,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         }))
     }
 
@@ -246,10 +247,10 @@ mod print_arguments {
                 elements: InterpolatedStringElements::from(fstring_elements),
                 flags,
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             }),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         }))
     }
 
@@ -285,7 +286,7 @@ mod print_arguments {
                 vec![InterpolatedStringElement::Literal(
                     InterpolatedStringLiteralElement {
                         range: TextRange::default(),
-                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                         value: " ".into(),
                     },
                 )]
diff --git a/crates/ruff_linter/src/rules/ruff/rules/assignment_in_assert.rs b/crates/ruff_linter/src/rules/ruff/rules/assignment_in_assert.rs
index 1de48b6454..5787eaf6bf 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/assignment_in_assert.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/assignment_in_assert.rs
@@ -48,6 +48,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `-O`](https://docs.python.org/3/using/cmdline.html#cmdoption-O)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct AssignmentInAssert;
 
 impl Violation for AssignmentInAssert {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/asyncio_dangling_task.rs b/crates/ruff_linter/src/rules/ruff/rules/asyncio_dangling_task.rs
index 17657e6f9c..e93433377f 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/asyncio_dangling_task.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/asyncio_dangling_task.rs
@@ -53,6 +53,7 @@ use crate::checkers::ast::Checker;
 /// - [_The Heisenbug lurking in your async code_](https://textual.textualize.io/blog/2023/02/11/the-heisenbug-lurking-in-your-async-code/)
 /// - [The Python Standard Library](https://docs.python.org/3/library/asyncio-task.html#asyncio.create_task)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.247")]
 pub(crate) struct AsyncioDanglingTask {
     expr: String,
     method: Method,
diff --git a/crates/ruff_linter/src/rules/ruff/rules/class_with_mixed_type_vars.rs b/crates/ruff_linter/src/rules/ruff/rules/class_with_mixed_type_vars.rs
index 1f4a553714..4178217718 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/class_with_mixed_type_vars.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/class_with_mixed_type_vars.rs
@@ -62,6 +62,7 @@ use ruff_python_ast::PythonVersion;
 /// [PEP 695]: https://peps.python.org/pep-0695/
 /// [type parameter lists]: https://docs.python.org/3/reference/compound_stmts.html#type-params
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct ClassWithMixedTypeVars;
 
 impl Violation for ClassWithMixedTypeVars {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs
index f8cd2b9c36..cc79c64761 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs
@@ -43,6 +43,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [PEP 448 – Additional Unpacking Generalizations](https://peps.python.org/pep-0448/)
 /// - [Python documentation: Sequence Types — `list`, `tuple`, `range`](https://docs.python.org/3/library/stdtypes.html#sequence-types-list-tuple-range)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.227")]
 pub(crate) struct CollectionLiteralConcatenation {
     expression: SourceCodeSnippet,
 }
@@ -78,7 +79,7 @@ fn make_splat_elts(
         value: Box::from(splat_element.clone()),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     let splat = node.into();
     if splat_at_left {
@@ -166,14 +167,14 @@ fn concatenate_expressions(expr: &Expr) -> Option<(Expr, Type)> {
             elts: new_elts,
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         }
         .into(),
         Type::Tuple => ast::ExprTuple {
             elts: new_elts,
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             parenthesized: true,
         }
         .into(),
diff --git a/crates/ruff_linter/src/rules/ruff/rules/dataclass_enum.rs b/crates/ruff_linter/src/rules/ruff/rules/dataclass_enum.rs
index 9744cff0ae..04bcb06662 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/dataclass_enum.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/dataclass_enum.rs
@@ -45,6 +45,7 @@ use crate::rules::ruff::helpers::{DataclassKind, dataclass_kind};
 /// ## References
 /// - [Python documentation: Enum HOWTO &sect; Dataclass support](https://docs.python.org/3/howto/enum.html#dataclass-support)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct DataclassEnum;
 
 impl Violation for DataclassEnum {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/decimal_from_float_literal.rs b/crates/ruff_linter/src/rules/ruff/rules/decimal_from_float_literal.rs
index a3bbaa608e..7de91824ce 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/decimal_from_float_literal.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/decimal_from_float_literal.rs
@@ -33,6 +33,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// of the `Decimal` instance that is constructed. This can lead to unexpected
 /// behavior if your program relies on the previous value (whether deliberately or not).
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct DecimalFromFloatLiteral;
 
 impl AlwaysFixableViolation for DecimalFromFloatLiteral {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/default_factory_kwarg.rs b/crates/ruff_linter/src/rules/ruff/rules/default_factory_kwarg.rs
index 355aa47519..ea792ce97c 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/default_factory_kwarg.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/default_factory_kwarg.rs
@@ -51,6 +51,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// defaultdict(list)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct DefaultFactoryKwarg {
     default_factory: SourceCodeSnippet,
 }
@@ -123,7 +124,8 @@ fn is_non_callable_value(value: &Expr) -> bool {
             | Expr::SetComp(_)
             | Expr::DictComp(_)
             | Expr::Generator(_)
-            | Expr::FString(_))
+            | Expr::FString(_)
+            | Expr::TString(_))
 }
 
 /// Generate an [`Expr`] to replace `defaultdict(default_factory=callable)` with
diff --git a/crates/ruff_linter/src/rules/ruff/rules/explicit_f_string_type_conversion.rs b/crates/ruff_linter/src/rules/ruff/rules/explicit_f_string_type_conversion.rs
index 56dcdb6930..8dcd347fe3 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/explicit_f_string_type_conversion.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/explicit_f_string_type_conversion.rs
@@ -40,6 +40,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// f"{a!r}"
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.267")]
 pub(crate) struct ExplicitFStringTypeConversion;
 
 impl Violation for ExplicitFStringTypeConversion {
@@ -110,10 +111,7 @@ pub(crate) fn explicit_f_string_type_conversion(checker: &Checker, f_string: &as
             return;
         }
 
-        let mut diagnostic =
-            checker.report_diagnostic(ExplicitFStringTypeConversion, expression.range());
-
-        // Don't support fixing f-string with debug text.
+        // Don't report diagnostic for f-string with debug text.
         if element
             .as_interpolation()
             .is_some_and(|interpolation| interpolation.debug_text.is_some())
@@ -121,6 +119,9 @@ pub(crate) fn explicit_f_string_type_conversion(checker: &Checker, f_string: &as
             return;
         }
 
+        let mut diagnostic =
+            checker.report_diagnostic(ExplicitFStringTypeConversion, expression.range());
+
         diagnostic.try_set_fix(|| {
             convert_call_to_conversion_flag(checker, conversion, f_string, index, arg)
         });
diff --git a/crates/ruff_linter/src/rules/ruff/rules/falsy_dict_get_fallback.rs b/crates/ruff_linter/src/rules/ruff/rules/falsy_dict_get_fallback.rs
index 8e55965694..a19a9c451a 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/falsy_dict_get_fallback.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/falsy_dict_get_fallback.rs
@@ -40,6 +40,7 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 ///
 /// [documentation]: https://docs.python.org/3.13/library/stdtypes.html#dict.get
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.8.5")]
 pub(crate) struct FalsyDictGetFallback;
 
 impl Violation for FalsyDictGetFallback {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/function_call_in_dataclass_default.rs b/crates/ruff_linter/src/rules/ruff/rules/function_call_in_dataclass_default.rs
index 2e1045ba76..000dd2587a 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/function_call_in_dataclass_default.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/function_call_in_dataclass_default.rs
@@ -2,10 +2,10 @@ use ruff_python_ast::{self as ast, Expr, Stmt};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::name::{QualifiedName, UnqualifiedName};
-use ruff_python_semantic::SemanticModel;
 use ruff_python_semantic::analyze::typing::{
     is_immutable_annotation, is_immutable_func, is_immutable_newtype_call,
 };
+use ruff_python_semantic::{ScopeId, SemanticModel};
 use ruff_text_size::Ranged;
 
 use crate::Violation;
@@ -61,6 +61,7 @@ use crate::rules::ruff::helpers::{
 /// ## Options
 /// - `lint.flake8-bugbear.extend-immutable-calls`
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct FunctionCallInDataclassDefaultArgument {
     name: Option<String>,
 }
@@ -77,7 +78,11 @@ impl Violation for FunctionCallInDataclassDefaultArgument {
 }
 
 /// RUF009
-pub(crate) fn function_call_in_dataclass_default(checker: &Checker, class_def: &ast::StmtClassDef) {
+pub(crate) fn function_call_in_dataclass_default(
+    checker: &Checker,
+    class_def: &ast::StmtClassDef,
+    scope_id: ScopeId,
+) {
     let semantic = checker.semantic();
 
     let Some((dataclass_kind, _)) = dataclass_kind(class_def, semantic) else {
@@ -144,7 +149,7 @@ pub(crate) fn function_call_in_dataclass_default(checker: &Checker, class_def: &
             || func.as_name_expr().is_some_and(|name| {
                 is_immutable_newtype_call(name, checker.semantic(), &extend_immutable_calls)
             })
-            || is_frozen_dataclass_instantiation(func, semantic)
+            || is_frozen_dataclass_instantiation(func, semantic, scope_id)
         {
             continue;
         }
@@ -165,16 +170,22 @@ fn any_annotated(class_body: &[Stmt]) -> bool {
 
 /// Checks that the passed function is an instantiation of the class,
 /// retrieves the ``StmtClassDef`` and verifies that it is a frozen dataclass
-fn is_frozen_dataclass_instantiation(func: &Expr, semantic: &SemanticModel) -> bool {
-    semantic.lookup_attribute(func).is_some_and(|id| {
-        let binding = &semantic.binding(id);
-        let Some(Stmt::ClassDef(class_def)) = binding.statement(semantic) else {
-            return false;
-        };
+fn is_frozen_dataclass_instantiation(
+    func: &Expr,
+    semantic: &SemanticModel,
+    scope_id: ScopeId,
+) -> bool {
+    semantic
+        .lookup_attribute_in_scope(func, scope_id)
+        .is_some_and(|id| {
+            let binding = &semantic.binding(id);
+            let Some(Stmt::ClassDef(class_def)) = binding.statement(semantic) else {
+                return false;
+            };
 
-        let Some((_, dataclass_decorator)) = dataclass_kind(class_def, semantic) else {
-            return false;
-        };
-        is_frozen_dataclass(dataclass_decorator, semantic)
-    })
+            let Some((_, dataclass_decorator)) = dataclass_kind(class_def, semantic) else {
+                return false;
+            };
+            is_frozen_dataclass(dataclass_decorator, semantic)
+        })
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/if_key_in_dict_del.rs b/crates/ruff_linter/src/rules/ruff/rules/if_key_in_dict_del.rs
index 969aff55b2..3b590f07ff 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/if_key_in_dict_del.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/if_key_in_dict_del.rs
@@ -30,6 +30,7 @@ type Dict = ExprName;
 /// ## Fix safety
 /// This rule's fix is marked as safe, unless the if statement contains comments.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct IfKeyInDictDel;
 
 impl AlwaysFixableViolation for IfKeyInDictDel {
@@ -45,6 +46,10 @@ impl AlwaysFixableViolation for IfKeyInDictDel {
 
 /// RUF051
 pub(crate) fn if_key_in_dict_del(checker: &Checker, stmt: &StmtIf) {
+    if !stmt.elif_else_clauses.is_empty() {
+        return;
+    }
+
     let [Stmt::Delete(delete)] = &stmt.body[..] else {
         return;
     };
diff --git a/crates/ruff_linter/src/rules/ruff/rules/implicit_classvar_in_dataclass.rs b/crates/ruff_linter/src/rules/ruff/rules/implicit_classvar_in_dataclass.rs
index 47e3fc4d8e..46a29cd05e 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/implicit_classvar_in_dataclass.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/implicit_classvar_in_dataclass.rs
@@ -52,6 +52,7 @@ use crate::rules::ruff::helpers::{DataclassKind, dataclass_kind};
 /// ## Options
 /// - [`lint.dummy-variable-rgx`]
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.7")]
 pub(crate) struct ImplicitClassVarInDataclass;
 
 impl Violation for ImplicitClassVarInDataclass {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs b/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs
index 83c0065d8b..4217c837f5 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs
@@ -19,6 +19,10 @@ use crate::rules::ruff::typing::type_hint_explicitly_allows_none;
 /// Checks for the use of implicit `Optional` in type annotations when the
 /// default parameter value is `None`.
 ///
+/// If [`lint.future-annotations`] is set to `true`, `from __future__ import
+/// annotations` will be added if doing so would allow using the `|` operator on
+/// a Python version before 3.10.
+///
 /// ## Why is this bad?
 /// Implicit `Optional` is prohibited by [PEP 484]. It is confusing and
 /// inconsistent with the rest of the type system.
@@ -73,12 +77,6 @@ use crate::rules::ruff::typing::type_hint_explicitly_allows_none;
 /// - `target-version`
 /// - `lint.future-annotations`
 ///
-/// ## Preview
-///
-/// When [preview] is enabled, if [`lint.future-annotations`] is set to `true`,
-/// `from __future__ import annotations` will be added if doing so would allow using the `|`
-/// operator on a Python version before 3.10.
-///
 /// ## Fix safety
 ///
 /// This fix is always marked as unsafe because it can change the behavior of code that relies on
@@ -86,6 +84,7 @@ use crate::rules::ruff::typing::type_hint_explicitly_allows_none;
 ///
 /// [PEP 484]: https://peps.python.org/pep-0484/#union-types
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct ImplicitOptional {
     conversion_type: ConversionType,
 }
@@ -140,7 +139,7 @@ fn generate_fix(checker: &Checker, conversion_type: ConversionType, expr: &Expr)
                 op: Operator::BitOr,
                 right: Box::new(Expr::NoneLiteral(ast::ExprNoneLiteral::default())),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let content = checker.generator().expr(&new_expr);
             let edit = Edit::range_replacement(content, expr.range());
@@ -160,12 +159,12 @@ fn generate_fix(checker: &Checker, conversion_type: ConversionType, expr: &Expr)
             let (import_edit, binding) = importer.import(expr.start())?;
             let new_expr = Expr::Subscript(ast::ExprSubscript {
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 value: Box::new(Expr::Name(ast::ExprName {
                     id: Name::new(binding),
                     ctx: ast::ExprContext::Store,
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 })),
                 slice: Box::new(expr.clone()),
                 ctx: ast::ExprContext::Load,
@@ -217,7 +216,7 @@ pub(crate) fn implicit_optional(checker: &Checker, parameters: &Parameters) {
             };
 
             let conversion_type = if checker.target_version() >= PythonVersion::PY310
-                || checker.settings().future_annotations()
+                || checker.settings().future_annotations
             {
                 ConversionType::BinOpOr
             } else {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/in_empty_collection.rs b/crates/ruff_linter/src/rules/ruff/rules/in_empty_collection.rs
index 30f4ff8bc7..ba1ae5368d 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/in_empty_collection.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/in_empty_collection.rs
@@ -1,5 +1,5 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast, CmpOp, Expr};
+use ruff_python_ast::{self as ast, CmpOp, Expr, helpers::is_empty_f_string};
 use ruff_python_semantic::SemanticModel;
 use ruff_text_size::Ranged;
 
@@ -25,6 +25,7 @@ use crate::checkers::ast::Checker;
 /// print("got it!")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.11.9")]
 pub(crate) struct InEmptyCollection;
 
 impl Violation for InEmptyCollection {
@@ -75,10 +76,7 @@ fn is_empty(expr: &Expr, semantic: &SemanticModel) -> bool {
         Expr::Dict(ast::ExprDict { items, .. }) => items.is_empty(),
         Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => value.is_empty(),
         Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.is_empty(),
-        Expr::FString(s) => s
-            .value
-            .elements()
-            .all(|elt| elt.as_literal().is_some_and(|elt| elt.is_empty())),
+        Expr::FString(s) => is_empty_f_string(s),
         Expr::Call(ast::ExprCall {
             func,
             arguments,
diff --git a/crates/ruff_linter/src/rules/ruff/rules/incorrectly_parenthesized_tuple_in_subscript.rs b/crates/ruff_linter/src/rules/ruff/rules/incorrectly_parenthesized_tuple_in_subscript.rs
index e0c537f0b0..0c676e465c 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/incorrectly_parenthesized_tuple_in_subscript.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/incorrectly_parenthesized_tuple_in_subscript.rs
@@ -38,6 +38,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## Options
 /// - `lint.ruff.parenthesize-tuple-in-subscript`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.5.7")]
 pub(crate) struct IncorrectlyParenthesizedTupleInSubscript {
     prefer_parentheses: bool,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/indented_form_feed.rs b/crates/ruff_linter/src/rules/ruff/rules/indented_form_feed.rs
index b943c65536..d0e579367d 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/indented_form_feed.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/indented_form_feed.rs
@@ -31,6 +31,7 @@ use crate::{Violation, checkers::ast::LintContext};
 ///
 /// [lexical-analysis-indentation]: https://docs.python.org/3/reference/lexical_analysis.html#indentation
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.6")]
 pub(crate) struct IndentedFormFeed;
 
 impl Violation for IndentedFormFeed {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_assert_message_literal_argument.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_assert_message_literal_argument.rs
index 3d2bbbaa83..1f6c25677e 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/invalid_assert_message_literal_argument.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_assert_message_literal_argument.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// assert len(fruits) == 2
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct InvalidAssertMessageLiteralArgument;
 
 impl Violation for InvalidAssertMessageLiteralArgument {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs
index 81d8215225..f414c47899 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs
@@ -55,6 +55,7 @@ use super::suppression_comment_visitor::{
 /// This fix is always marked as unsafe because it deletes the invalid suppression comment,
 /// rather than trying to move it to a valid position, which the user more likely intended.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct InvalidFormatterSuppressionComment {
     reason: IgnoredReason,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_index_type.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_index_type.rs
index 067a074718..dff668d028 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/invalid_index_type.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_index_type.rs
@@ -26,6 +26,7 @@ use crate::checkers::ast::Checker;
 /// var = [1, 2, 3][0]
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.278")]
 pub(crate) struct InvalidIndexType {
     value_type: String,
     index_type: String,
@@ -89,7 +90,9 @@ pub(crate) fn invalid_index_type(checker: &Checker, expr: &ExprSubscript) {
 
     if index_type.is_literal() {
         // If the index is a literal, require an integer
-        if index_type != CheckableExprType::IntLiteral {
+        if index_type != CheckableExprType::IntLiteral
+            && index_type != CheckableExprType::BooleanLiteral
+        {
             checker.report_diagnostic(
                 InvalidIndexType {
                     value_type: value_type.to_string(),
@@ -111,7 +114,9 @@ pub(crate) fn invalid_index_type(checker: &Checker, expr: &ExprSubscript) {
                 // If the index is a slice, require integer or null bounds
                 if !matches!(
                     is_slice_type,
-                    CheckableExprType::IntLiteral | CheckableExprType::NoneLiteral
+                    CheckableExprType::IntLiteral
+                        | CheckableExprType::NoneLiteral
+                        | CheckableExprType::BooleanLiteral
                 ) {
                     checker.report_diagnostic(
                         InvalidIndexType {
@@ -154,6 +159,7 @@ pub(crate) fn invalid_index_type(checker: &Checker, expr: &ExprSubscript) {
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 enum CheckableExprType {
     FString,
+    TString,
     StringLiteral,
     BytesLiteral,
     IntLiteral,
@@ -170,12 +176,15 @@ enum CheckableExprType {
     Dict,
     Tuple,
     Slice,
+    Generator,
+    Lambda,
 }
 
 impl fmt::Display for CheckableExprType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::FString => f.write_str("str"),
+            Self::TString => f.write_str("Template"),
             Self::StringLiteral => f.write_str("str"),
             Self::BytesLiteral => f.write_str("bytes"),
             Self::IntLiteral => f.write_str("int"),
@@ -192,6 +201,8 @@ impl fmt::Display for CheckableExprType {
             Self::Slice => f.write_str("slice"),
             Self::Dict => f.write_str("dict"),
             Self::Tuple => f.write_str("tuple"),
+            Self::Generator => f.write_str("generator"),
+            Self::Lambda => f.write_str("lambda"),
         }
     }
 }
@@ -209,6 +220,7 @@ impl CheckableExprType {
             Expr::BooleanLiteral(_) => Some(Self::BooleanLiteral),
             Expr::NoneLiteral(_) => Some(Self::NoneLiteral),
             Expr::EllipsisLiteral(_) => Some(Self::EllipsisLiteral),
+            Expr::TString(_) => Some(Self::TString),
             Expr::FString(_) => Some(Self::FString),
             Expr::List(_) => Some(Self::List),
             Expr::ListComp(_) => Some(Self::ListComp),
@@ -218,6 +230,8 @@ impl CheckableExprType {
             Expr::Dict(_) => Some(Self::Dict),
             Expr::Tuple(_) => Some(Self::Tuple),
             Expr::Slice(_) => Some(Self::Slice),
+            Expr::Generator(_) => Some(Self::Generator),
+            Expr::Lambda(_) => Some(Self::Lambda),
             _ => None,
         }
     }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs
index bc91f9cf54..4da7ce2996 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs
@@ -31,6 +31,7 @@ use crate::{FixAvailability, Violation};
 /// - [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)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.271")]
 pub(crate) struct InvalidPyprojectToml {
     pub message: String,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_rule_code.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_rule_code.rs
index 734a544b72..3c9cde312e 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/invalid_rule_code.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_rule_code.rs
@@ -6,6 +6,7 @@ use crate::checkers::ast::LintContext;
 use crate::noqa::{Code, Directive};
 use crate::noqa::{Codes, NoqaDirectives};
 use crate::registry::Rule;
+use crate::rule_redirects::get_redirect_target;
 use crate::{AlwaysFixableViolation, Edit, Fix};
 
 /// ## What it does
@@ -32,6 +33,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// ## Options
 /// - `lint.external`
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.11.4")]
 pub(crate) struct InvalidRuleCode {
     pub(crate) rule_code: String,
 }
@@ -81,7 +83,8 @@ pub(crate) fn invalid_noqa_code(
 
 fn code_is_valid(code: &Code, external: &[String]) -> bool {
     let code_str = code.as_str();
-    Rule::from_code(code_str).is_ok() || external.iter().any(|ext| code_str.starts_with(ext))
+    Rule::from_code(get_redirect_target(code_str).unwrap_or(code_str)).is_ok()
+        || external.iter().any(|ext| code_str.starts_with(ext))
 }
 
 fn all_codes_invalid_diagnostic(
diff --git a/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs b/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs
index 5dc94542da..b48a2520f2 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs
@@ -44,6 +44,7 @@ use crate::{FixAvailability, Violation, checkers::ast::Checker};
 /// - [`pytest` documentation: `pytest.warns`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-warns)
 /// - [`pytest` documentation: `pytest.deprecated_call`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-deprecated-call)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.12.0")]
 pub(crate) struct LegacyFormPytestRaises {
     context_type: PytestContextType,
 }
@@ -245,16 +246,16 @@ fn generate_with_statement(
         });
 
     let context_call = ast::ExprCall {
-        node_index: AtomicNodeIndex::dummy(),
+        node_index: AtomicNodeIndex::NONE,
         range: TextRange::default(),
         func: legacy_call.func.clone(),
         arguments: ast::Arguments {
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             range: TextRange::default(),
             args: expected.cloned().as_slice().into(),
             keywords: match_arg
                 .map(|expr| ast::Keyword {
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                     // Take range from the original expression so that the keyword
                     // argument is generated after positional arguments
                     range: expr.range(),
@@ -267,11 +268,11 @@ fn generate_with_statement(
     };
 
     let func_call = ast::ExprCall {
-        node_index: AtomicNodeIndex::dummy(),
+        node_index: AtomicNodeIndex::NONE,
         range: TextRange::default(),
         func: Box::new(func.clone()),
         arguments: ast::Arguments {
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             range: TextRange::default(),
             args: func_args.into(),
             keywords: func_keywords.into(),
@@ -280,25 +281,25 @@ fn generate_with_statement(
 
     let body = if let Some(assign_targets) = assign_targets {
         Stmt::Assign(ast::StmtAssign {
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             range: TextRange::default(),
             targets: assign_targets.to_vec(),
             value: Box::new(func_call.into()),
         })
     } else {
         Stmt::Expr(StmtExpr {
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             range: TextRange::default(),
             value: Box::new(func_call.into()),
         })
     };
 
     Some(StmtWith {
-        node_index: AtomicNodeIndex::dummy(),
+        node_index: AtomicNodeIndex::NONE,
         range: TextRange::default(),
         is_async: false,
         items: vec![WithItem {
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             range: TextRange::default(),
             context_expr: context_call.into(),
             optional_vars: optional_vars.map(|var| Box::new(var.clone())),
diff --git a/crates/ruff_linter/src/rules/ruff/rules/logging_eager_conversion.rs b/crates/ruff_linter/src/rules/ruff/rules/logging_eager_conversion.rs
new file mode 100644
index 0000000000..a1bfc622cc
--- /dev/null
+++ b/crates/ruff_linter/src/rules/ruff/rules/logging_eager_conversion.rs
@@ -0,0 +1,130 @@
+use std::str::FromStr;
+
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{self as ast, Expr};
+use ruff_python_literal::cformat::{CFormatPart, CFormatString, CFormatType};
+use ruff_python_literal::format::FormatConversion;
+use ruff_text_size::Ranged;
+
+use crate::Violation;
+use crate::checkers::ast::Checker;
+use crate::rules::flake8_logging_format::rules::{LoggingCallType, find_logging_call};
+
+/// ## What it does
+/// Checks for eager string conversion of arguments to `logging` calls.
+///
+/// ## Why is this bad?
+/// Arguments to `logging` calls will be formatted as strings automatically, so it
+/// is unnecessary and less efficient to eagerly format the arguments before passing
+/// them in.
+///
+/// ## Known problems
+///
+/// This rule detects uses of the `logging` module via a heuristic.
+/// Specifically, it matches against:
+///
+/// - Uses of the `logging` module itself (e.g., `import logging; logging.info(...)`).
+/// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
+/// - Objects whose name starts with `log` or ends with `logger` or `logging`,
+///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
+///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
+///
+/// ## Example
+/// ```python
+/// import logging
+///
+/// logging.basicConfig(format="%(message)s", level=logging.INFO)
+///
+/// user = "Maria"
+///
+/// logging.info("%s - Something happened", str(user))
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import logging
+///
+/// logging.basicConfig(format="%(message)s", level=logging.INFO)
+///
+/// user = "Maria"
+///
+/// logging.info("%s - Something happened", user)
+/// ```
+///
+/// ## Options
+/// - `lint.logger-objects`
+///
+/// ## References
+/// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
+/// - [Python documentation: Optimization](https://docs.python.org/3/howto/logging.html#optimization)
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.13.2")]
+pub(crate) struct LoggingEagerConversion {
+    pub(crate) format_conversion: FormatConversion,
+}
+
+impl Violation for LoggingEagerConversion {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let LoggingEagerConversion { format_conversion } = self;
+        let (format_str, call_arg) = match format_conversion {
+            FormatConversion::Str => ("%s", "str()"),
+            FormatConversion::Repr => ("%r", "repr()"),
+            FormatConversion::Ascii => ("%a", "ascii()"),
+            FormatConversion::Bytes => ("%b", "bytes()"),
+        };
+        format!("Unnecessary `{call_arg}` conversion when formatting with `{format_str}`")
+    }
+}
+
+/// RUF065
+pub(crate) fn logging_eager_conversion(checker: &Checker, call: &ast::ExprCall) {
+    let Some((logging_call_type, _range)) = find_logging_call(checker, call) else {
+        return;
+    };
+
+    let msg_pos = match logging_call_type {
+        LoggingCallType::LevelCall(_) => 0,
+        LoggingCallType::LogCall => 1,
+    };
+
+    // Extract a format string from the logging statement msg argument
+    let Some(Expr::StringLiteral(string_literal)) =
+        call.arguments.find_argument_value("msg", msg_pos)
+    else {
+        return;
+    };
+    let Ok(format_string) = CFormatString::from_str(string_literal.value.to_str()) else {
+        return;
+    };
+
+    // Iterate over % placeholders in format string and zip with logging statement arguments
+    for (spec, arg) in format_string
+        .iter()
+        .filter_map(|(_, part)| {
+            if let CFormatPart::Spec(spec) = part {
+                Some(spec)
+            } else {
+                None
+            }
+        })
+        .zip(call.arguments.args.iter().skip(msg_pos + 1))
+    {
+        // Check if the argument is a call to eagerly format a value
+        if let Expr::Call(ast::ExprCall { func, .. }) = arg {
+            let CFormatType::String(format_conversion) = spec.format_type else {
+                continue;
+            };
+
+            // Check for use of %s with str()
+            if checker.semantic().match_builtin_expr(func.as_ref(), "str")
+                && matches!(format_conversion, FormatConversion::Str)
+            {
+                checker
+                    .report_diagnostic(LoggingEagerConversion { format_conversion }, arg.range());
+            }
+        }
+    }
+}
diff --git a/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs b/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs
index 4b7fa7e69f..efc1b60f13 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs
@@ -35,6 +35,7 @@ use crate::checkers::ast::Checker;
 ///
 /// [version-specifier]: https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct MapIntVersionParsing;
 
 impl Violation for MapIntVersionParsing {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/missing_fstring_syntax.rs b/crates/ruff_linter/src/rules/ruff/rules/missing_fstring_syntax.rs
index 9194d758da..229abff0d7 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/missing_fstring_syntax.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/missing_fstring_syntax.rs
@@ -62,6 +62,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// [gettext]: https://docs.python.org/3/library/gettext.html
 /// [FastAPI path]: https://fastapi.tiangolo.com/tutorial/path-params/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.2.1")]
 pub(crate) struct MissingFStringSyntax;
 
 impl AlwaysFixableViolation for MissingFStringSyntax {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/mod.rs b/crates/ruff_linter/src/rules/ruff/rules/mod.rs
index 420b8c310a..9d5ade77f3 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/mod.rs
@@ -23,6 +23,7 @@ pub(crate) use invalid_index_type::*;
 pub(crate) use invalid_pyproject_toml::*;
 pub(crate) use invalid_rule_code::*;
 pub(crate) use legacy_form_pytest_raises::*;
+pub(crate) use logging_eager_conversion::*;
 pub(crate) use map_int_version_parsing::*;
 pub(crate) use missing_fstring_syntax::*;
 pub(crate) use mutable_class_default::*;
@@ -86,6 +87,7 @@ mod invalid_index_type;
 mod invalid_pyproject_toml;
 mod invalid_rule_code;
 mod legacy_form_pytest_raises;
+mod logging_eager_conversion;
 mod map_int_version_parsing;
 mod missing_fstring_syntax;
 mod mutable_class_default;
diff --git a/crates/ruff_linter/src/rules/ruff/rules/mutable_class_default.rs b/crates/ruff_linter/src/rules/ruff/rules/mutable_class_default.rs
index 4114c553f1..6dd1e1df59 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/mutable_class_default.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/mutable_class_default.rs
@@ -84,6 +84,7 @@ use crate::rules::ruff::helpers::{
 ///
 /// [ClassVar]: https://docs.python.org/3/library/typing.html#typing.ClassVar
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.273")]
 pub(crate) struct MutableClassDefault;
 
 impl Violation for MutableClassDefault {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/mutable_dataclass_default.rs b/crates/ruff_linter/src/rules/ruff/rules/mutable_dataclass_default.rs
index 736ab510ce..f5ad048a9d 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/mutable_dataclass_default.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/mutable_dataclass_default.rs
@@ -55,6 +55,7 @@ use crate::rules::ruff::helpers::{dataclass_kind, is_class_var_annotation};
 ///     mutable_default: ClassVar[list[int]] = []
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.262")]
 pub(crate) struct MutableDataclassDefault;
 
 impl Violation for MutableDataclassDefault {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs b/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs
index 5b60d38c1a..9026431df7 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs
@@ -49,6 +49,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `dict.fromkeys`](https://docs.python.org/3/library/stdtypes.html#dict.fromkeys)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct MutableFromkeysValue;
 
 impl Violation for MutableFromkeysValue {
@@ -102,7 +103,7 @@ fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator)
         id: Name::new_static("key"),
         ctx: ast::ExprContext::Load,
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     // Construct `key in keys`.
     let comp = ast::Comprehension {
@@ -110,7 +111,7 @@ fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator)
         iter: keys.clone(),
         ifs: vec![],
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         is_async: false,
     };
     // Construct the dict comprehension.
@@ -119,7 +120,7 @@ fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator)
         value: Box::new(value.clone()),
         generators: vec![comp],
         range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
     };
     generator.expr(&dict_comp.into())
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/needless_else.rs b/crates/ruff_linter/src/rules/ruff/rules/needless_else.rs
index ca510970d6..a60b6bde2e 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/needless_else.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/needless_else.rs
@@ -31,6 +31,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     bar()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.3")]
 pub(crate) struct NeedlessElse;
 
 impl AlwaysFixableViolation for NeedlessElse {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/never_union.rs b/crates/ruff_linter/src/rules/ruff/rules/never_union.rs
index 8be1156a0a..a13fc69459 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/never_union.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/never_union.rs
@@ -35,6 +35,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// - [Python documentation: `typing.Never`](https://docs.python.org/3/library/typing.html#typing.Never)
 /// - [Python documentation: `typing.NoReturn`](https://docs.python.org/3/library/typing.html#typing.NoReturn)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct NeverUnion {
     never_like: NeverLike,
     union_like: UnionLike,
@@ -164,12 +165,12 @@ pub(crate) fn never_union(checker: &Checker, expr: &Expr) {
                                         elts: rest,
                                         ctx: ast::ExprContext::Load,
                                         range: TextRange::default(),
-                                        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                                         parenthesized: true,
                                     })),
                                     ctx: ast::ExprContext::Load,
                                     range: TextRange::default(),
-                                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                                 }))
                         },
                         expr.range(),
diff --git a/crates/ruff_linter/src/rules/ruff/rules/non_octal_permissions.rs b/crates/ruff_linter/src/rules/ruff/rules/non_octal_permissions.rs
index ed4c2aad65..461972614b 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/non_octal_permissions.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/non_octal_permissions.rs
@@ -72,6 +72,7 @@ use crate::{FixAvailability, Violation};
 ///
 /// A fix is only available if the integer literal matches a set of common modes.
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.12.1")]
 pub(crate) struct NonOctalPermissions;
 
 impl Violation for NonOctalPermissions {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs b/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs
index d69c9cd567..b45bd3877a 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs
@@ -30,6 +30,7 @@ use crate::checkers::ast::Checker;
 /// - [Python documentation: `typing.Optional`](https://docs.python.org/3/library/typing.html#typing.Optional)
 /// - [Python documentation: `None`](https://docs.python.org/3/library/constants.html#None)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.7.4")]
 pub(crate) struct NoneNotAtEndOfUnion;
 
 impl Violation for NoneNotAtEndOfUnion {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/parenthesize_chained_operators.rs b/crates/ruff_linter/src/rules/ruff/rules/parenthesize_chained_operators.rs
index e7ad588a8b..7433f63f2b 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/parenthesize_chained_operators.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/parenthesize_chained_operators.rs
@@ -34,6 +34,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// y = (d and e) or f
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct ParenthesizeChainedOperators;
 
 impl AlwaysFixableViolation for ParenthesizeChainedOperators {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/post_init_default.rs b/crates/ruff_linter/src/rules/ruff/rules/post_init_default.rs
index dbce5d423f..36941a98c9 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/post_init_default.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/post_init_default.rs
@@ -74,6 +74,7 @@ use crate::rules::ruff::helpers::{DataclassKind, dataclass_kind};
 ///
 /// [documentation]: https://docs.python.org/3/library/dataclasses.html#init-only-variables
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct PostInitDefault;
 
 impl Violation for PostInitDefault {
@@ -186,7 +187,7 @@ fn use_initvar(
 
     let indentation = indentation_at_offset(post_init_def.start(), checker.source())
         .context("Failed to calculate leading indentation of `__post_init__` method")?;
-    let content = textwrap::indent(&content, indentation);
+    let content = textwrap::indent_first_line(&content, indentation);
 
     let initvar_edit = Edit::insertion(
         content.into_owned(),
diff --git a/crates/ruff_linter/src/rules/ruff/rules/pytest_raises_ambiguous_pattern.rs b/crates/ruff_linter/src/rules/ruff/rules/pytest_raises_ambiguous_pattern.rs
index 5199c0e966..612a832bb8 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/pytest_raises_ambiguous_pattern.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/pytest_raises_ambiguous_pattern.rs
@@ -27,7 +27,8 @@ use crate::rules::flake8_pytest_style::rules::is_pytest_raises;
 ///     do_thing_that_raises()
 /// ```
 ///
-/// Use instead:
+/// If the pattern is intended to be a regular expression, use a raw string to signal this
+/// intention:
 ///
 /// ```python
 /// import pytest
@@ -37,7 +38,7 @@ use crate::rules::flake8_pytest_style::rules::is_pytest_raises;
 ///     do_thing_that_raises()
 /// ```
 ///
-/// Alternatively:
+/// Alternatively, escape any regex metacharacters with `re.escape`:
 ///
 /// ```python
 /// import pytest
@@ -48,7 +49,7 @@ use crate::rules::flake8_pytest_style::rules::is_pytest_raises;
 ///     do_thing_that_raises()
 /// ```
 ///
-/// or:
+/// or directly with backslashes:
 ///
 /// ```python
 /// import pytest
@@ -63,6 +64,7 @@ use crate::rules::flake8_pytest_style::rules::is_pytest_raises;
 /// - [Python documentation: `re.escape`](https://docs.python.org/3/library/re.html#re.escape)
 /// - [`pytest` documentation: `pytest.raises`](https://docs.pytest.org/en/latest/reference/reference.html#pytest-raises)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct PytestRaisesAmbiguousPattern;
 
 impl Violation for PytestRaisesAmbiguousPattern {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/quadratic_list_summation.rs b/crates/ruff_linter/src/rules/ruff/rules/quadratic_list_summation.rs
index 4321e004c3..d4e062ad71 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/quadratic_list_summation.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/quadratic_list_summation.rs
@@ -60,6 +60,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// [microbenchmarks]: https://github.com/astral-sh/ruff/issues/5073#issuecomment-1591836349
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.285")]
 pub(crate) struct QuadraticListSummation;
 
 impl AlwaysFixableViolation for QuadraticListSummation {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/redirected_noqa.rs b/crates/ruff_linter/src/rules/ruff/rules/redirected_noqa.rs
index e11a9a7ad1..010679cf23 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/redirected_noqa.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/redirected_noqa.rs
@@ -25,6 +25,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// x = eval(command)  # noqa: S307
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.6.0")]
 pub(crate) struct RedirectedNOQA {
     original: String,
     target: String,
diff --git a/crates/ruff_linter/src/rules/ruff/rules/redundant_bool_literal.rs b/crates/ruff_linter/src/rules/ruff/rules/redundant_bool_literal.rs
index 3c0fafc623..4111f9522c 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/redundant_bool_literal.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/redundant_bool_literal.rs
@@ -55,6 +55,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// [#14764]: https://github.com/python/mypy/issues/14764
 /// [#5421]: https://github.com/microsoft/pyright/issues/5421
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.8.0")]
 pub(crate) struct RedundantBoolLiteral {
     seen_others: bool,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_all.rs b/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_all.rs
index 70fd5acd6c..f2dbf87474 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_all.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_all.rs
@@ -89,6 +89,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// iteration order of the items in `__all__`, in which case this
 /// rule's fix could theoretically cause breakage.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct UnsortedDunderAll;
 
 impl Violation for UnsortedDunderAll {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs b/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs
index e626ac8535..4038a9508a 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs
@@ -83,6 +83,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// `__slots__` definition occurs, in which case this rule's fix could
 /// theoretically cause breakage.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.8.0")]
 pub(crate) struct UnsortedDunderSlots {
     class_name: ast::name::Name,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/starmap_zip.rs b/crates/ruff_linter/src/rules/ruff/rules/starmap_zip.rs
index a92f7afb7b..f814bf980b 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/starmap_zip.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/starmap_zip.rs
@@ -41,6 +41,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// This rule will emit a diagnostic but not suggest a fix if `map` has been shadowed from its
 /// builtin binding.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct StarmapZip;
 
 impl Violation for StarmapZip {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/static_key_dict_comprehension.rs b/crates/ruff_linter/src/rules/ruff/rules/static_key_dict_comprehension.rs
index 63fd8e3614..3cb7aa5633 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/static_key_dict_comprehension.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/static_key_dict_comprehension.rs
@@ -28,6 +28,7 @@ use crate::Violation;
 ///
 /// [B035]: https://docs.astral.sh/ruff/rules/static-key-dict-comprehension/
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "v0.2.0")]
 pub(crate) struct RuffStaticKeyDictComprehension;
 
 impl Violation for RuffStaticKeyDictComprehension {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/test_rules.rs b/crates/ruff_linter/src/rules/ruff/rules/test_rules.rs
index 3fc282ad3a..d261e05ef8 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/test_rules.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/test_rules.rs
@@ -46,6 +46,7 @@ pub(crate) const TEST_RULES: &[Rule] = &[
     Rule::RedirectedFromTestRule,
     Rule::RedirectedToTestRule,
     Rule::RedirectedFromPrefixTestRule,
+    Rule::PanicyTestRule,
 ];
 
 pub(crate) trait TestRule {
@@ -68,6 +69,7 @@ pub(crate) trait TestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.0.0")]
 pub(crate) struct StableTestRule;
 
 impl Violation for StableTestRule {
@@ -101,6 +103,7 @@ impl TestRule for StableTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.0.0")]
 pub(crate) struct StableTestRuleSafeFix;
 
 impl Violation for StableTestRuleSafeFix {
@@ -139,6 +142,7 @@ impl TestRule for StableTestRuleSafeFix {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.0.0")]
 pub(crate) struct StableTestRuleUnsafeFix;
 
 impl Violation for StableTestRuleUnsafeFix {
@@ -180,6 +184,7 @@ impl TestRule for StableTestRuleUnsafeFix {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.0.0")]
 pub(crate) struct StableTestRuleDisplayOnlyFix;
 
 impl Violation for StableTestRuleDisplayOnlyFix {
@@ -224,6 +229,7 @@ impl TestRule for StableTestRuleDisplayOnlyFix {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.0.0")]
 pub(crate) struct PreviewTestRule;
 
 impl Violation for PreviewTestRule {
@@ -257,6 +263,7 @@ impl TestRule for PreviewTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(deprecated_since = "0.0.0")]
 pub(crate) struct DeprecatedTestRule;
 
 impl Violation for DeprecatedTestRule {
@@ -290,6 +297,7 @@ impl TestRule for DeprecatedTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(deprecated_since = "0.0.0")]
 pub(crate) struct AnotherDeprecatedTestRule;
 
 impl Violation for AnotherDeprecatedTestRule {
@@ -326,6 +334,7 @@ impl TestRule for AnotherDeprecatedTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.0.0")]
 pub(crate) struct RemovedTestRule;
 
 impl Violation for RemovedTestRule {
@@ -359,6 +368,7 @@ impl TestRule for RemovedTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.0.0")]
 pub(crate) struct AnotherRemovedTestRule;
 
 impl Violation for AnotherRemovedTestRule {
@@ -392,6 +402,7 @@ impl TestRule for AnotherRemovedTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.0.0")]
 pub(crate) struct RedirectedFromTestRule;
 
 impl Violation for RedirectedFromTestRule {
@@ -425,6 +436,7 @@ impl TestRule for RedirectedFromTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.0.0")]
 pub(crate) struct RedirectedToTestRule;
 
 impl Violation for RedirectedToTestRule {
@@ -458,6 +470,7 @@ impl TestRule for RedirectedToTestRule {
 /// bar
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.0.0")]
 pub(crate) struct RedirectedFromPrefixTestRule;
 
 impl Violation for RedirectedFromPrefixTestRule {
@@ -477,3 +490,40 @@ impl TestRule for RedirectedFromPrefixTestRule {
         );
     }
 }
+
+/// # What it does
+/// Fake rule for testing panics.
+///
+/// # Why is this bad?
+/// Panics are bad.
+///
+/// # Example
+/// ```python
+/// foo
+/// ```
+///
+/// Use instead:
+/// ```python
+/// bar
+/// ```
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.0.0")]
+pub(crate) struct PanicyTestRule;
+
+impl Violation for PanicyTestRule {
+    const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        "If you see this, maybe panic!".to_string()
+    }
+}
+
+impl TestRule for PanicyTestRule {
+    fn diagnostic(_locator: &Locator, _comment_ranges: &CommentRanges, context: &LintContext) {
+        assert!(
+            !context.source_file().name().ends_with("panic.py"),
+            "This is a fake panic for testing."
+        );
+    }
+}
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_cast_to_int.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_cast_to_int.rs
index 39c45b19e8..b3c34c29e0 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_cast_to_int.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_cast_to_int.rs
@@ -45,6 +45,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// overriding the `__round__`, `__ceil__`, `__floor__`, or `__trunc__` dunder methods
 /// such that they don't return an integer.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct UnnecessaryCastToInt;
 
 impl AlwaysFixableViolation for UnnecessaryCastToInt {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_iterable_allocation_for_first_element.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_iterable_allocation_for_first_element.rs
index ae09b7f544..06e72cbd98 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_iterable_allocation_for_first_element.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_iterable_allocation_for_first_element.rs
@@ -48,12 +48,13 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///    element. As such, any side effects that occur during iteration will be
 ///    delayed.
 /// 2. Second, accessing members of a collection via square bracket notation
-///    `[0]` of the `pop()` function will raise `IndexError` if the collection
+///    `[0]` or the `pop()` function will raise `IndexError` if the collection
 ///    is empty, while `next(iter(...))` will raise `StopIteration`.
 ///
 /// ## References
 /// - [Iterators and Iterables in Python: Run Efficient Iterations](https://realpython.com/python-iterators-iterables/#when-to-use-an-iterator-in-python)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.278")]
 pub(crate) struct UnnecessaryIterableAllocationForFirstElement {
     iterable: SourceCodeSnippet,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_key_check.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_key_check.rs
index 72887978b3..7c13fb3d1c 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_key_check.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_key_check.rs
@@ -29,6 +29,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///     ...
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.2.0")]
 pub(crate) struct UnnecessaryKeyCheck;
 
 impl AlwaysFixableViolation for UnnecessaryKeyCheck {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_literal_within_deque_call.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_literal_within_deque_call.rs
index 51561e4e1f..fd31765715 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_literal_within_deque_call.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_literal_within_deque_call.rs
@@ -1,5 +1,7 @@
 use ruff_diagnostics::{Applicability, Edit};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+
+use ruff_python_ast::helpers::is_empty_f_string;
 use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr};
 use ruff_text_size::Ranged;
@@ -44,6 +46,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `collections.deque`](https://docs.python.org/3/library/collections.html#collections.deque)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.9.0")]
 pub(crate) struct UnnecessaryEmptyIterableWithinDequeCall {
     has_maxlen: bool,
 }
@@ -102,7 +105,8 @@ pub(crate) fn unnecessary_literal_within_deque_call(checker: &Checker, deque: &a
         }
         Expr::StringLiteral(string) => string.value.is_empty(),
         Expr::BytesLiteral(bytes) => bytes.value.is_empty(),
-        Expr::FString(fstring) => fstring.value.is_empty_literal(),
+        Expr::FString(fstring) => is_empty_f_string(fstring),
+        Expr::TString(tstring) => tstring.value.is_empty_iterable(),
         _ => false,
     };
     if !is_empty_literal {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs
index 8e815c601b..d8d3dd7151 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs
@@ -59,6 +59,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 ///
 /// [PEP 586](https://peps.python.org/pep-0586/)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.10.0")]
 pub(crate) struct UnnecessaryNestedLiteral;
 
 impl Violation for UnnecessaryNestedLiteral {
@@ -116,14 +117,14 @@ pub(crate) fn unnecessary_nested_literal<'a>(checker: &Checker, literal_expr: &'
                 Expr::Tuple(ExprTuple {
                     elts: nodes.into_iter().cloned().collect(),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                     ctx: ExprContext::Load,
                     parenthesized: false,
                 })
             }),
             value: subscript.value.clone(),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
         });
         let fix = Fix::applicable_edit(
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs
index 3b9c1a4673..5ccc516ee3 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs
@@ -55,6 +55,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python Regular Expression HOWTO: Common Problems - Use String Methods](https://docs.python.org/3/howto/regex.html#use-string-methods)
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.8.1")]
 pub(crate) struct UnnecessaryRegularExpression {
     replacement: Option<String>,
 }
@@ -303,7 +304,7 @@ impl<'a> ReFunc<'a> {
                     op: UnaryOp::Not,
                     operand: Box::new(expr),
                     range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
                 });
                 Some(negated_expr)
             }
@@ -327,7 +328,7 @@ impl<'a> ReFunc<'a> {
             ops: Box::new([op]),
             comparators: Box::new([right.clone()]),
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })
     }
 
@@ -339,7 +340,7 @@ impl<'a> ReFunc<'a> {
             attr: Identifier::new(method, TextRange::default()),
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         });
         Expr::Call(ExprCall {
             func: Box::new(method),
@@ -347,10 +348,10 @@ impl<'a> ReFunc<'a> {
                 args: args.into_boxed_slice(),
                 keywords: Box::new([]),
                 range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             },
             range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
+            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         })
     }
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_round.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_round.rs
index baf5ea38a5..c7fe4687e8 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_round.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_round.rs
@@ -34,6 +34,7 @@ use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 /// The fix is marked unsafe if it is not possible to guarantee that the first argument of
 /// `round()` is of type `int`, or if the fix deletes comments.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.12.0")]
 pub(crate) struct UnnecessaryRound;
 
 impl AlwaysFixableViolation for UnnecessaryRound {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unraw_re_pattern.rs b/crates/ruff_linter/src/rules/ruff/rules/unraw_re_pattern.rs
index 8a10129d74..74c23da2a9 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unraw_re_pattern.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unraw_re_pattern.rs
@@ -59,6 +59,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// re.compile(r"foo\bar")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.8.0")]
 pub(crate) struct UnrawRePattern {
     module: RegexModule,
     func: String,
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unsafe_markup_use.rs b/crates/ruff_linter/src/rules/ruff/rules/unsafe_markup_use.rs
index 2cc04e602b..3adf4bc5d1 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unsafe_markup_use.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unsafe_markup_use.rs
@@ -73,6 +73,7 @@ use crate::Violation;
 /// [markupsafe-markup]: https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup
 /// [flake8-markupsafe]: https://github.com/vmagamedov/flake8-markupsafe
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "0.10.0")]
 pub(crate) struct RuffUnsafeMarkupUse {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unused_async.rs b/crates/ruff_linter/src/rules/ruff/rules/unused_async.rs
index b7c55dc0b0..ca442de8ce 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unused_async.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unused_async.rs
@@ -31,6 +31,7 @@ use crate::rules::fastapi::rules::is_fastapi_route;
 ///     bar()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "v0.4.0")]
 pub(crate) struct UnusedAsync {
     name: String,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unused_noqa.rs b/crates/ruff_linter/src/rules/ruff/rules/unused_noqa.rs
index 52e367500b..e4645a5541 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unused_noqa.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unused_noqa.rs
@@ -43,6 +43,7 @@ pub(crate) struct UnusedCodes {
 /// ## References
 /// - [Ruff error suppression](https://docs.astral.sh/ruff/linter/#error-suppression)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.155")]
 pub(crate) struct UnusedNOQA {
     pub codes: Option<UnusedCodes>,
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/unused_unpacked_variable.rs b/crates/ruff_linter/src/rules/ruff/rules/unused_unpacked_variable.rs
index 16a893d1ea..a14bd35cd5 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/unused_unpacked_variable.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/unused_unpacked_variable.rs
@@ -36,9 +36,17 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///     return x
 /// ```
 ///
+/// ## See also
+///
+/// This rule applies only to unpacked assignments. For regular assignments, see
+/// [`unused-variable`][F841].
+///
 /// ## Options
 /// - `lint.dummy-variable-rgx`
+///
+/// [F841]: https://docs.astral.sh/ruff/rules/unused-variable/
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.13.0")]
 pub(crate) struct UnusedUnpackedVariable {
     pub name: String,
 }
@@ -93,4 +101,6 @@ pub(crate) fn unused_unpacked_variable(checker: &Checker, name: &str, binding: &
     if let Some(fix) = remove_unused_variable(binding, checker) {
         diagnostic.set_fix(fix);
     }
+    // Add Unnecessary tag for unused unpacked variables
+    diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
 }
diff --git a/crates/ruff_linter/src/rules/ruff/rules/used_dummy_variable.rs b/crates/ruff_linter/src/rules/ruff/rules/used_dummy_variable.rs
index a87fc40273..a63e2f679f 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/used_dummy_variable.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/used_dummy_variable.rs
@@ -68,6 +68,7 @@ use crate::{
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.8.2")]
 pub(crate) struct UsedDummyVariable {
     name: String,
     shadowed_kind: Option<ShadowedKind>,
diff --git a/crates/ruff_linter/src/rules/ruff/rules/useless_if_else.rs b/crates/ruff_linter/src/rules/ruff/rules/useless_if_else.rs
index 6d7502dd56..bbaa49f0fa 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/useless_if_else.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/useless_if_else.rs
@@ -22,6 +22,7 @@ use crate::checkers::ast::Checker;
 /// foo = x
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.9.0")]
 pub(crate) struct UselessIfElse;
 
 impl Violation for UselessIfElse {
diff --git a/crates/ruff_linter/src/rules/ruff/rules/zip_instead_of_pairwise.rs b/crates/ruff_linter/src/rules/ruff/rules/zip_instead_of_pairwise.rs
index 2c5396f8b5..70cb828790 100644
--- a/crates/ruff_linter/src/rules/ruff/rules/zip_instead_of_pairwise.rs
+++ b/crates/ruff_linter/src/rules/ruff/rules/zip_instead_of_pairwise.rs
@@ -40,6 +40,7 @@ use crate::{checkers::ast::Checker, importer::ImportRequest};
 /// ## References
 /// - [Python documentation: `itertools.pairwise`](https://docs.python.org/3/library/itertools.html#itertools.pairwise)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.257")]
 pub(crate) struct ZipInsteadOfPairwise;
 
 impl Violation for ZipInsteadOfPairwise {
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap
index b72fdd934e..d420f81376 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap
@@ -9,16 +9,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 21 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-17 17 |     pass
-18 18 | 
-19 19 | 
-20    |-def f(arg: int = None):  # RUF013
-   20 |+def f(arg: Optional[int] = None):  # RUF013
-21 21 |     pass
-22 22 | 
-23 23 | 
+17 |     pass
+18 | 
+19 | 
+   - def f(arg: int = None):  # RUF013
+20 + def f(arg: Optional[int] = None):  # RUF013
+21 |     pass
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:24:12
@@ -28,16 +27,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 25 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-21 21 |     pass
-22 22 | 
-23 23 | 
-24    |-def f(arg: str = None):  # RUF013
-   24 |+def f(arg: Optional[str] = None):  # RUF013
-25 25 |     pass
-26 26 | 
-27 27 | 
+21 |     pass
+22 | 
+23 | 
+   - def f(arg: str = None):  # RUF013
+24 + def f(arg: Optional[str] = None):  # RUF013
+25 |     pass
+26 | 
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:28:12
@@ -47,16 +45,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 29 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-25 25 |     pass
-26 26 | 
-27 27 | 
-28    |-def f(arg: Tuple[str] = None):  # RUF013
-   28 |+def f(arg: Optional[Tuple[str]] = None):  # RUF013
-29 29 |     pass
-30 30 | 
-31 31 | 
+25 |     pass
+26 | 
+27 | 
+   - def f(arg: Tuple[str] = None):  # RUF013
+28 + def f(arg: Optional[Tuple[str]] = None):  # RUF013
+29 |     pass
+30 | 
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:58:12
@@ -66,16 +63,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 59 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-55 55 |     pass
-56 56 | 
-57 57 | 
-58    |-def f(arg: Union = None):  # RUF013
-   58 |+def f(arg: Optional[Union] = None):  # RUF013
-59 59 |     pass
-60 60 | 
-61 61 | 
+55 |     pass
+56 | 
+57 | 
+   - def f(arg: Union = None):  # RUF013
+58 + def f(arg: Optional[Union] = None):  # RUF013
+59 |     pass
+60 | 
+61 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:62:12
@@ -85,16 +81,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 63 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-59 59 |     pass
-60 60 | 
-61 61 | 
-62    |-def f(arg: Union[int] = None):  # RUF013
-   62 |+def f(arg: Optional[Union[int]] = None):  # RUF013
-63 63 |     pass
-64 64 | 
-65 65 | 
+59 |     pass
+60 | 
+61 | 
+   - def f(arg: Union[int] = None):  # RUF013
+62 + def f(arg: Optional[Union[int]] = None):  # RUF013
+63 |     pass
+64 | 
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:66:12
@@ -104,16 +99,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 67 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-63 63 |     pass
-64 64 | 
-65 65 | 
-66    |-def f(arg: Union[int, str] = None):  # RUF013
-   66 |+def f(arg: Optional[Union[int, str]] = None):  # RUF013
-67 67 |     pass
-68 68 | 
-69 69 | 
+63 |     pass
+64 | 
+65 | 
+   - def f(arg: Union[int, str] = None):  # RUF013
+66 + def f(arg: Optional[Union[int, str]] = None):  # RUF013
+67 |     pass
+68 | 
+69 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:85:12
@@ -123,16 +117,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 86 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-82 82 |     pass
-83 83 | 
-84 84 | 
-85    |-def f(arg: int | float = None):  # RUF013
-   85 |+def f(arg: Optional[int | float] = None):  # RUF013
-86 86 |     pass
-87 87 | 
-88 88 | 
+82 |     pass
+83 | 
+84 | 
+   - def f(arg: int | float = None):  # RUF013
+85 + def f(arg: Optional[int | float] = None):  # RUF013
+86 |     pass
+87 | 
+88 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:89:12
@@ -142,16 +135,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 90 |     pass
    |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-86 86 |     pass
-87 87 | 
-88 88 | 
-89    |-def f(arg: int | float | str | bytes = None):  # RUF013
-   89 |+def f(arg: Optional[int | float | str | bytes] = None):  # RUF013
-90 90 |     pass
-91 91 | 
-92 92 | 
+86 |     pass
+87 | 
+88 | 
+   - def f(arg: int | float | str | bytes = None):  # RUF013
+89 + def f(arg: Optional[int | float | str | bytes] = None):  # RUF013
+90 |     pass
+91 | 
+92 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:108:12
@@ -161,16 +153,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 109 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-105 105 |     pass
-106 106 | 
-107 107 | 
-108     |-def f(arg: Literal[1] = None):  # RUF013
-    108 |+def f(arg: Optional[Literal[1]] = None):  # RUF013
-109 109 |     pass
-110 110 | 
-111 111 | 
+105 |     pass
+106 | 
+107 | 
+    - def f(arg: Literal[1] = None):  # RUF013
+108 + def f(arg: Optional[Literal[1]] = None):  # RUF013
+109 |     pass
+110 | 
+111 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:112:12
@@ -180,16 +171,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 113 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-109 109 |     pass
-110 110 | 
-111 111 | 
-112     |-def f(arg: Literal[1, "foo"] = None):  # RUF013
-    112 |+def f(arg: Optional[Literal[1, "foo"]] = None):  # RUF013
-113 113 |     pass
-114 114 | 
-115 115 | 
+109 |     pass
+110 | 
+111 | 
+    - def f(arg: Literal[1, "foo"] = None):  # RUF013
+112 + def f(arg: Optional[Literal[1, "foo"]] = None):  # RUF013
+113 |     pass
+114 | 
+115 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:131:22
@@ -199,16 +189,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 132 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-128 128 |     pass
-129 129 | 
-130 130 | 
-131     |-def f(arg: Annotated[int, ...] = None):  # RUF013
-    131 |+def f(arg: Annotated[Optional[int], ...] = None):  # RUF013
-132 132 |     pass
-133 133 | 
-134 134 | 
+128 |     pass
+129 | 
+130 | 
+    - def f(arg: Annotated[int, ...] = None):  # RUF013
+131 + def f(arg: Annotated[Optional[int], ...] = None):  # RUF013
+132 |     pass
+133 | 
+134 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:135:32
@@ -218,16 +207,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 136 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-132 132 |     pass
-133 133 | 
-134 134 | 
-135     |-def f(arg: Annotated[Annotated[int | str, ...], ...] = None):  # RUF013
-    135 |+def f(arg: Annotated[Annotated[Optional[int | str], ...], ...] = None):  # RUF013
-136 136 |     pass
-137 137 | 
-138 138 | 
+132 |     pass
+133 | 
+134 | 
+    - def f(arg: Annotated[Annotated[int | str, ...], ...] = None):  # RUF013
+135 + def f(arg: Annotated[Annotated[Optional[int | str], ...], ...] = None):  # RUF013
+136 |     pass
+137 | 
+138 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:151:11
@@ -239,16 +227,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-148 148 | 
-149 149 | 
-150 150 | def f(
-151     |-    arg1: int = None,  # RUF013
-    151 |+    arg1: Optional[int] = None,  # RUF013
-152 152 |     arg2: Union[int, float] = None,  # RUF013
-153 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
-154 154 | ):
+148 | 
+149 | 
+150 | def f(
+    -     arg1: int = None,  # RUF013
+151 +     arg1: Optional[int] = None,  # RUF013
+152 |     arg2: Union[int, float] = None,  # RUF013
+153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
+154 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:152:11
@@ -261,16 +248,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 154 | ):
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-149 149 | 
-150 150 | def f(
-151 151 |     arg1: int = None,  # RUF013
-152     |-    arg2: Union[int, float] = None,  # RUF013
-    152 |+    arg2: Optional[Union[int, float]] = None,  # RUF013
-153 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
-154 154 | ):
-155 155 |     pass
+149 | 
+150 | def f(
+151 |     arg1: int = None,  # RUF013
+    -     arg2: Union[int, float] = None,  # RUF013
+152 +     arg2: Optional[Union[int, float]] = None,  # RUF013
+153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
+154 | ):
+155 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:153:11
@@ -283,16 +269,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 155 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-150 150 | def f(
-151 151 |     arg1: int = None,  # RUF013
-152 152 |     arg2: Union[int, float] = None,  # RUF013
-153     |-    arg3: Literal[1, 2, 3] = None,  # RUF013
-    153 |+    arg3: Optional[Literal[1, 2, 3]] = None,  # RUF013
-154 154 | ):
-155 155 |     pass
-156 156 | 
+150 | def f(
+151 |     arg1: int = None,  # RUF013
+152 |     arg2: Union[int, float] = None,  # RUF013
+    -     arg3: Literal[1, 2, 3] = None,  # RUF013
+153 +     arg3: Optional[Literal[1, 2, 3]] = None,  # RUF013
+154 | ):
+155 |     pass
+156 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:181:12
@@ -302,16 +287,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 182 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-178 178 |     pass
-179 179 | 
-180 180 | 
-181     |-def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None):  # RUF013
-    181 |+def f(arg: Optional[Union[Annotated[int, ...], Union[str, bytes]]] = None):  # RUF013
-182 182 |     pass
-183 183 | 
-184 184 | 
+178 |     pass
+179 | 
+180 | 
+    - def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None):  # RUF013
+181 + def f(arg: Optional[Union[Annotated[int, ...], Union[str, bytes]]] = None):  # RUF013
+182 |     pass
+183 | 
+184 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:188:13
@@ -321,16 +305,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 189 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-185 185 | # Quoted
-186 186 | 
-187 187 | 
-188     |-def f(arg: "int" = None):  # RUF013
-    188 |+def f(arg: "Optional[int]" = None):  # RUF013
-189 189 |     pass
-190 190 | 
-191 191 | 
+185 | # Quoted
+186 | 
+187 | 
+    - def f(arg: "int" = None):  # RUF013
+188 + def f(arg: "Optional[int]" = None):  # RUF013
+189 |     pass
+190 | 
+191 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:192:13
@@ -340,16 +323,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 193 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-189 189 |     pass
-190 190 | 
-191 191 | 
-192     |-def f(arg: "str" = None):  # RUF013
-    192 |+def f(arg: "Optional[str]" = None):  # RUF013
-193 193 |     pass
-194 194 | 
-195 195 | 
+189 |     pass
+190 | 
+191 | 
+    - def f(arg: "str" = None):  # RUF013
+192 + def f(arg: "Optional[str]" = None):  # RUF013
+193 |     pass
+194 | 
+195 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:196:12
@@ -368,13 +350,12 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 205 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-201 201 |     pass
-202 202 | 
-203 203 | 
-204     |-def f(arg: Union["int", "str"] = None):  # RUF013
-    204 |+def f(arg: Optional[Union["int", "str"]] = None):  # RUF013
-205 205 |     pass
-206 206 | 
-207 207 |
+201 |     pass
+202 | 
+203 | 
+    - def f(arg: Union["int", "str"] = None):  # RUF013
+204 + def f(arg: Optional[Union["int", "str"]] = None):  # RUF013
+205 |     pass
+206 | 
+207 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap
index 05e593b1d1..63e5b089eb 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap
@@ -9,12 +9,11 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 5 |     pass
   |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-1 1 | # No `typing.Optional` import
-  2 |+from typing import Optional
-2 3 | 
-3 4 | 
-4   |-def f(arg: int = None):  # RUF013
-  5 |+def f(arg: Optional[int] = None):  # RUF013
-5 6 |     pass
+1 | # No `typing.Optional` import
+2 + from typing import Optional
+3 | 
+4 | 
+  - def f(arg: int = None):  # RUF013
+5 + def f(arg: Optional[int] = None):  # RUF013
+6 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap
index e9c0fc8f02..83ecad8d84 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap
@@ -55,16 +55,15 @@ RUF005 [*] Consider `[1, 2, 3, *foo]` instead of concatenation
 41 | quux = (7, 8, 9) + zoob
    |
 help: Replace with `[1, 2, 3, *foo]`
-
-ℹ Unsafe fix
-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)
+36 | yay = Fun().yay
+37 | 
+38 | foo = [4, 5, 6]
+   - bar = [1, 2, 3] + foo
+39 + bar = [1, 2, 3, *foo]
+40 | zoob = tuple(bar)
+41 | quux = (7, 8, 9) + zoob
+42 | spam = quux + (10, 11, 12)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `(7, 8, 9, *zoob)` instead of concatenation
   --> RUF005.py:41:8
@@ -77,16 +76,15 @@ RUF005 [*] Consider `(7, 8, 9, *zoob)` instead of concatenation
 43 | spom = list(spam)
    |
 help: Replace with `(7, 8, 9, *zoob)`
-
-ℹ Unsafe fix
-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]
+38 | foo = [4, 5, 6]
+39 | bar = [1, 2, 3] + foo
+40 | zoob = tuple(bar)
+   - quux = (7, 8, 9) + zoob
+41 + quux = (7, 8, 9, *zoob)
+42 | spam = quux + (10, 11, 12)
+43 | spom = list(spam)
+44 | eggs = spom + [13, 14, 15]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `(*quux, 10, 11, 12)` instead of concatenation
   --> RUF005.py:42:8
@@ -99,16 +97,15 @@ RUF005 [*] Consider `(*quux, 10, 11, 12)` instead of concatenation
 44 | eggs = spom + [13, 14, 15]
    |
 help: Replace with `(*quux, 10, 11, 12)`
-
-ℹ Unsafe fix
-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()
+39 | bar = [1, 2, 3] + foo
+40 | zoob = tuple(bar)
+41 | quux = (7, 8, 9) + zoob
+   - spam = quux + (10, 11, 12)
+42 + spam = (*quux, 10, 11, 12)
+43 | spom = list(spam)
+44 | eggs = spom + [13, 14, 15]
+45 | elatement = ("we all say",) + yay()
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[*spom, 13, 14, 15]` instead of concatenation
   --> RUF005.py:44:8
@@ -121,16 +118,15 @@ RUF005 [*] Consider `[*spom, 13, 14, 15]` instead of concatenation
 46 | excitement = ("we all think",) + Fun().yay()
    |
 help: Replace with `[*spom, 13, 14, 15]`
-
-ℹ Unsafe fix
-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
+41 | quux = (7, 8, 9) + zoob
+42 | spam = quux + (10, 11, 12)
+43 | spom = list(spam)
+   - eggs = spom + [13, 14, 15]
+44 + eggs = [*spom, 13, 14, 15]
+45 | elatement = ("we all say",) + yay()
+46 | excitement = ("we all think",) + Fun().yay()
+47 | astonishment = ("we all feel",) + Fun.words
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `("we all say", *yay())` instead of concatenation
   --> RUF005.py:45:13
@@ -143,16 +139,15 @@ RUF005 [*] Consider `("we all say", *yay())` instead of concatenation
 47 | astonishment = ("we all feel",) + Fun.words
    |
 help: Replace with `("we all say", *yay())`
-
-ℹ Unsafe fix
-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 | 
+42 | spam = quux + (10, 11, 12)
+43 | spom = list(spam)
+44 | eggs = spom + [13, 14, 15]
+   - elatement = ("we all say",) + yay()
+45 + elatement = ("we all say", *yay())
+46 | excitement = ("we all think",) + Fun().yay()
+47 | astonishment = ("we all feel",) + Fun.words
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `("we all think", *Fun().yay())` instead of concatenation
   --> RUF005.py:46:14
@@ -164,16 +159,15 @@ RUF005 [*] Consider `("we all think", *Fun().yay())` instead of concatenation
 47 | astonishment = ("we all feel",) + Fun.words
    |
 help: Replace with `("we all think", *Fun().yay())`
-
-ℹ Unsafe fix
-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)
+43 | spom = list(spam)
+44 | eggs = spom + [13, 14, 15]
+45 | elatement = ("we all say",) + yay()
+   - excitement = ("we all think",) + Fun().yay()
+46 + excitement = ("we all think", *Fun().yay())
+47 | astonishment = ("we all feel",) + Fun.words
+48 | 
+49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `("we all feel", *Fun.words)` instead of concatenation
   --> RUF005.py:47:16
@@ -186,16 +180,15 @@ RUF005 [*] Consider `("we all feel", *Fun.words)` instead of concatenation
 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
    |
 help: Replace with `("we all feel", *Fun.words)`
-
-ℹ Unsafe fix
-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 | 
+44 | eggs = spom + [13, 14, 15]
+45 | elatement = ("we all say",) + yay()
+46 | excitement = ("we all think",) + Fun().yay()
+   - astonishment = ("we all feel",) + Fun.words
+47 + astonishment = ("we all feel", *Fun.words)
+48 | 
+49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+50 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider iterable unpacking instead of concatenation
   --> RUF005.py:49:9
@@ -208,16 +201,15 @@ RUF005 [*] Consider iterable unpacking instead of concatenation
 51 | baz = () + zoob
    |
 help: Replace with iterable unpacking
-
-ℹ Unsafe fix
-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 | 
+46 | excitement = ("we all think",) + Fun().yay()
+47 | astonishment = ("we all feel",) + Fun.words
+48 | 
+   - chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+49 + chain = ["a", "b", "c", *eggs, *list(("yes", "no", "pants") + zoob)]
+50 | 
+51 | baz = () + zoob
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `("yes", "no", "pants", *zoob)` instead of concatenation
   --> RUF005.py:49:39
@@ -230,16 +222,15 @@ RUF005 [*] Consider `("yes", "no", "pants", *zoob)` instead of concatenation
 51 | baz = () + zoob
    |
 help: Replace with `("yes", "no", "pants", *zoob)`
-
-ℹ Unsafe fix
-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 | 
+46 | excitement = ("we all think",) + Fun().yay()
+47 | astonishment = ("we all feel",) + Fun.words
+48 | 
+   - chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+49 + chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants", *zoob))
+50 | 
+51 | baz = () + zoob
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `(*zoob,)` instead of concatenation
   --> RUF005.py:51:7
@@ -252,16 +243,15 @@ RUF005 [*] Consider `(*zoob,)` instead of concatenation
 53 | [] + foo + [
    |
 help: Replace with `(*zoob,)`
-
-ℹ Unsafe fix
-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 | ]
+48 | 
+49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+50 | 
+   - baz = () + zoob
+51 + baz = (*zoob,)
+52 | 
+53 | [] + foo + [
+54 | ]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[*foo]` instead of concatenation
   --> RUF005.py:53:1
@@ -275,17 +265,16 @@ RUF005 [*] Consider `[*foo]` instead of concatenation
 56 |   pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
    |
 help: Replace with `[*foo]`
-
-ℹ Unsafe 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)
+50 | 
+51 | baz = () + zoob
+52 | 
+   - [] + foo + [
+   - ]
+53 + [*foo]
+54 | 
+55 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+56 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[sys.executable, "-m", "pylint", *args, path]` instead of concatenation
   --> RUF005.py:56:15
@@ -298,16 +287,15 @@ RUF005 [*] Consider `[sys.executable, "-m", "pylint", *args, path]` instead of c
 58 | b = a + [2, 3] + [4]
    |
 help: Replace with `[sys.executable, "-m", "pylint", *args, path]`
-
-ℹ Unsafe fix
-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 | 
+53 | [] + foo + [
+54 | ]
+55 | 
+   - pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+56 + pylint_call = [sys.executable, "-m", "pylint", *args, path]
+57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+58 | b = a + [2, 3] + [4]
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider iterable unpacking instead of concatenation
   --> RUF005.py:57:21
@@ -318,16 +306,15 @@ RUF005 [*] Consider iterable unpacking instead of concatenation
 58 | b = a + [2, 3] + [4]
    |
 help: Replace with iterable unpacking
-
-ℹ Unsafe 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.
+54 | ]
+55 | 
+56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+   - pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+57 + pylint_call_tuple = (sys.executable, "-m", "pylint", *args, path, path2)
+58 | b = a + [2, 3] + [4]
+59 | 
+60 | # Uses the non-preferred quote style, which should be retained.
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[*a, 2, 3, 4]` instead of concatenation
   --> RUF005.py:58:5
@@ -340,16 +327,15 @@ RUF005 [*] Consider `[*a, 2, 3, 4]` instead of concatenation
 60 | # Uses the non-preferred quote style, which should be retained.
    |
 help: Replace with `[*a, 2, 3, 4]`
-
-ℹ Unsafe 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']}"
+55 | 
+56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+   - b = a + [2, 3] + [4]
+58 + b = [*a, 2, 3, 4]
+59 | 
+60 | # Uses the non-preferred quote style, which should be retained.
+61 | f"{a() + ['b']}"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[*a(), 'b']` instead of concatenation
   --> RUF005.py:61:4
@@ -361,13 +347,12 @@ RUF005 [*] Consider `[*a(), 'b']` instead of concatenation
 63 | ###
    |
 help: Replace with `[*a(), 'b']`
-
-ℹ Unsafe fix
-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.
+58 | b = a + [2, 3] + [4]
+59 | 
+60 | # Uses the non-preferred quote style, which should be retained.
+   - f"{a() + ['b']}"
+61 + f"{[*a(), 'b']}"
+62 | 
+63 | ###
+64 | # Non-errors.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap
index 3b32b1c582..e304a88615 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap
@@ -11,14 +11,13 @@ RUF005 [*] Consider `[1, 2, 3, *foo]` instead of concatenation
 4 | slicing2 = [7, 8, 9] + bar[1:]
   |
 help: Replace with `[1, 2, 3, *foo]`
-
-ℹ Unsafe fix
-1 1 | foo = [4, 5, 6]
-2   |-bar = [1, 2, 3] + foo
-  2 |+bar = [1, 2, 3, *foo]
-3 3 | slicing1 = foo[:1] + [7, 8, 9]
-4 4 | slicing2 = [7, 8, 9] + bar[1:]
-5 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
+1 | foo = [4, 5, 6]
+  - bar = [1, 2, 3] + foo
+2 + bar = [1, 2, 3, *foo]
+3 | slicing1 = foo[:1] + [7, 8, 9]
+4 | slicing2 = [7, 8, 9] + bar[1:]
+5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[*foo[:1], 7, 8, 9]` instead of concatenation
  --> RUF005_slices.py:3:12
@@ -31,15 +30,14 @@ RUF005 [*] Consider `[*foo[:1], 7, 8, 9]` instead of concatenation
 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
   |
 help: Replace with `[*foo[:1], 7, 8, 9]`
-
-ℹ Unsafe fix
-1 1 | foo = [4, 5, 6]
-2 2 | bar = [1, 2, 3] + foo
-3   |-slicing1 = foo[:1] + [7, 8, 9]
-  3 |+slicing1 = [*foo[:1], 7, 8, 9]
-4 4 | slicing2 = [7, 8, 9] + bar[1:]
-5 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
-6 6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
+1 | foo = [4, 5, 6]
+2 | bar = [1, 2, 3] + foo
+  - slicing1 = foo[:1] + [7, 8, 9]
+3 + slicing1 = [*foo[:1], 7, 8, 9]
+4 | slicing2 = [7, 8, 9] + bar[1:]
+5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
+6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[7, 8, 9, *bar[1:]]` instead of concatenation
  --> RUF005_slices.py:4:12
@@ -52,15 +50,14 @@ RUF005 [*] Consider `[7, 8, 9, *bar[1:]]` instead of concatenation
 6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
   |
 help: Replace with `[7, 8, 9, *bar[1:]]`
-
-ℹ Unsafe fix
-1 1 | foo = [4, 5, 6]
-2 2 | bar = [1, 2, 3] + foo
-3 3 | slicing1 = foo[:1] + [7, 8, 9]
-4   |-slicing2 = [7, 8, 9] + bar[1:]
-  4 |+slicing2 = [7, 8, 9, *bar[1:]]
-5 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
-6 6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
+1 | foo = [4, 5, 6]
+2 | bar = [1, 2, 3] + foo
+3 | slicing1 = foo[:1] + [7, 8, 9]
+  - slicing2 = [7, 8, 9] + bar[1:]
+4 + slicing2 = [7, 8, 9, *bar[1:]]
+5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
+6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
+note: This is an unsafe fix and may change runtime behavior
 
 RUF005 [*] Consider `[*foo[:1], 7, 8, 9, *bar[1:]]` instead of concatenation
  --> RUF005_slices.py:5:12
@@ -72,11 +69,10 @@ RUF005 [*] Consider `[*foo[:1], 7, 8, 9, *bar[1:]]` instead of concatenation
 6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
   |
 help: Replace with `[*foo[:1], 7, 8, 9, *bar[1:]]`
-
-ℹ Unsafe fix
-2 2 | bar = [1, 2, 3] + foo
-3 3 | slicing1 = foo[:1] + [7, 8, 9]
-4 4 | slicing2 = [7, 8, 9] + bar[1:]
-5   |-slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
-  5 |+slicing3 = [*foo[:1], 7, 8, 9, *bar[1:]]
-6 6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
+2 | bar = [1, 2, 3] + foo
+3 | slicing1 = foo[:1] + [7, 8, 9]
+4 | slicing2 = [7, 8, 9] + bar[1:]
+  - slicing3 = foo[:1] + [7, 8, 9] + bar[1:]
+5 + slicing3 = [*foo[:1], 7, 8, 9, *bar[1:]]
+6 | indexing = foo[0] + [7, 8, 9] + bar[1]  # Not changed; looks a little suspect for concatenation.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap
index 660348b7da..7fac92db9c 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap
@@ -11,21 +11,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 18 | zip(input[:-1], input[1:])
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-13 14 | zip(foo[:-1], foo[1:], foo, strict=True)  # more than 2 inputs
-14 15 | 
-15 16 | # Errors
-16    |-zip(input, input[1:])
-   17 |+itertools.pairwise(input)
-17 18 | zip(input, input[1::1])
-18 19 | zip(input[:-1], input[1:])
-19 20 | zip(input[1:], input[2:])
+14 | zip(foo[:-1], foo[1:], foo, strict=True)  # more than 2 inputs
+15 | 
+16 | # Errors
+   - zip(input, input[1:])
+17 + itertools.pairwise(input)
+18 | zip(input, input[1::1])
+19 | zip(input[:-1], input[1:])
+20 | zip(input[1:], input[2:])
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:17:1
@@ -38,21 +37,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 19 | zip(input[1:], input[2:])
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-14 15 | 
-15 16 | # Errors
-16 17 | zip(input, input[1:])
-17    |-zip(input, input[1::1])
-   18 |+itertools.pairwise(input)
-18 19 | zip(input[:-1], input[1:])
-19 20 | zip(input[1:], input[2:])
-20 21 | zip(input[1:-1], input[2:])
+15 | 
+16 | # Errors
+17 | zip(input, input[1:])
+   - zip(input, input[1::1])
+18 + itertools.pairwise(input)
+19 | zip(input[:-1], input[1:])
+20 | zip(input[1:], input[2:])
+21 | zip(input[1:-1], input[2:])
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:18:1
@@ -65,21 +63,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 20 | zip(input[1:-1], input[2:])
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-15 16 | # Errors
-16 17 | zip(input, input[1:])
-17 18 | zip(input, input[1::1])
-18    |-zip(input[:-1], input[1:])
-   19 |+itertools.pairwise(input)
-19 20 | zip(input[1:], input[2:])
-20 21 | zip(input[1:-1], input[2:])
-21 22 | list(zip(input, input[1:]))
+16 | # Errors
+17 | zip(input, input[1:])
+18 | zip(input, input[1::1])
+   - zip(input[:-1], input[1:])
+19 + itertools.pairwise(input)
+20 | zip(input[1:], input[2:])
+21 | zip(input[1:-1], input[2:])
+22 | list(zip(input, input[1:]))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:19:1
@@ -92,21 +89,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 21 | list(zip(input, input[1:]))
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-16 17 | zip(input, input[1:])
-17 18 | zip(input, input[1::1])
-18 19 | zip(input[:-1], input[1:])
-19    |-zip(input[1:], input[2:])
-   20 |+itertools.pairwise(input)
-20 21 | zip(input[1:-1], input[2:])
-21 22 | list(zip(input, input[1:]))
-22 23 | list(zip(input[:-1], input[1:]))
+17 | zip(input, input[1:])
+18 | zip(input, input[1::1])
+19 | zip(input[:-1], input[1:])
+   - zip(input[1:], input[2:])
+20 + itertools.pairwise(input)
+21 | zip(input[1:-1], input[2:])
+22 | list(zip(input, input[1:]))
+23 | list(zip(input[:-1], input[1:]))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:20:1
@@ -119,21 +115,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 22 | list(zip(input[:-1], input[1:]))
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-17 18 | zip(input, input[1::1])
-18 19 | zip(input[:-1], input[1:])
-19 20 | zip(input[1:], input[2:])
-20    |-zip(input[1:-1], input[2:])
-   21 |+itertools.pairwise(input)
-21 22 | list(zip(input, input[1:]))
-22 23 | list(zip(input[:-1], input[1:]))
-23 24 | zip(foo[:-1], foo[1:], strict=True)
+18 | zip(input, input[1::1])
+19 | zip(input[:-1], input[1:])
+20 | zip(input[1:], input[2:])
+   - zip(input[1:-1], input[2:])
+21 + itertools.pairwise(input)
+22 | list(zip(input, input[1:]))
+23 | list(zip(input[:-1], input[1:]))
+24 | zip(foo[:-1], foo[1:], strict=True)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:21:6
@@ -146,21 +141,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 23 | zip(foo[:-1], foo[1:], strict=True)
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-18 19 | zip(input[:-1], input[1:])
-19 20 | zip(input[1:], input[2:])
-20 21 | zip(input[1:-1], input[2:])
-21    |-list(zip(input, input[1:]))
-   22 |+list(itertools.pairwise(input))
-22 23 | list(zip(input[:-1], input[1:]))
-23 24 | zip(foo[:-1], foo[1:], strict=True)
-24 25 | zip(foo[:-1], foo[1:], strict=False)
+19 | zip(input[:-1], input[1:])
+20 | zip(input[1:], input[2:])
+21 | zip(input[1:-1], input[2:])
+   - list(zip(input, input[1:]))
+22 + list(itertools.pairwise(input))
+23 | list(zip(input[:-1], input[1:]))
+24 | zip(foo[:-1], foo[1:], strict=True)
+25 | zip(foo[:-1], foo[1:], strict=False)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:22:6
@@ -173,21 +167,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 24 | zip(foo[:-1], foo[1:], strict=False)
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-19 20 | zip(input[1:], input[2:])
-20 21 | zip(input[1:-1], input[2:])
-21 22 | list(zip(input, input[1:]))
-22    |-list(zip(input[:-1], input[1:]))
-   23 |+list(itertools.pairwise(input))
-23 24 | zip(foo[:-1], foo[1:], strict=True)
-24 25 | zip(foo[:-1], foo[1:], strict=False)
-25 26 | zip(foo[:-1], foo[1:], strict=bool(foo))
+20 | zip(input[1:], input[2:])
+21 | zip(input[1:-1], input[2:])
+22 | list(zip(input, input[1:]))
+   - list(zip(input[:-1], input[1:]))
+23 + list(itertools.pairwise(input))
+24 | zip(foo[:-1], foo[1:], strict=True)
+25 | zip(foo[:-1], foo[1:], strict=False)
+26 | zip(foo[:-1], foo[1:], strict=bool(foo))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:23:1
@@ -200,20 +193,19 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 25 | zip(foo[:-1], foo[1:], strict=bool(foo))
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-20 21 | zip(input[1:-1], input[2:])
-21 22 | list(zip(input, input[1:]))
-22 23 | list(zip(input[:-1], input[1:]))
-23    |-zip(foo[:-1], foo[1:], strict=True)
-   24 |+itertools.pairwise(foo)
-24 25 | zip(foo[:-1], foo[1:], strict=False)
-25 26 | zip(foo[:-1], foo[1:], strict=bool(foo))
+21 | zip(input[1:-1], input[2:])
+22 | list(zip(input, input[1:]))
+23 | list(zip(input[:-1], input[1:]))
+   - zip(foo[:-1], foo[1:], strict=True)
+24 + itertools.pairwise(foo)
+25 | zip(foo[:-1], foo[1:], strict=False)
+26 | zip(foo[:-1], foo[1:], strict=bool(foo))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:24:1
@@ -225,19 +217,18 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
 25 | zip(foo[:-1], foo[1:], strict=bool(foo))
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-21 22 | list(zip(input, input[1:]))
-22 23 | list(zip(input[:-1], input[1:]))
-23 24 | zip(foo[:-1], foo[1:], strict=True)
-24    |-zip(foo[:-1], foo[1:], strict=False)
-   25 |+itertools.pairwise(foo)
-25 26 | zip(foo[:-1], foo[1:], strict=bool(foo))
+22 | list(zip(input, input[1:]))
+23 | list(zip(input[:-1], input[1:]))
+24 | zip(foo[:-1], foo[1:], strict=True)
+   - zip(foo[:-1], foo[1:], strict=False)
+25 + itertools.pairwise(foo)
+26 | zip(foo[:-1], foo[1:], strict=bool(foo))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs
   --> RUF007.py:25:1
@@ -248,15 +239,14 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes
    | ^^^
    |
 help: Replace `zip()` with `itertools.pairwise()`
-
-ℹ Unsafe fix
-   1  |+import itertools
-1  2  | input = [1, 2, 3]
-2  3  | otherInput = [2, 3, 4]
-3  4  | foo = [1, 2, 3, 4]
+1  + import itertools
+2  | input = [1, 2, 3]
+3  | otherInput = [2, 3, 4]
+4  | foo = [1, 2, 3, 4]
 --------------------------------------------------------------------------------
-22 23 | list(zip(input[:-1], input[1:]))
-23 24 | zip(foo[:-1], foo[1:], strict=True)
-24 25 | zip(foo[:-1], foo[1:], strict=False)
-25    |-zip(foo[:-1], foo[1:], strict=bool(foo))
-   26 |+itertools.pairwise(foo)
+23 | list(zip(input[:-1], input[1:]))
+24 | zip(foo[:-1], foo[1:], strict=True)
+25 | zip(foo[:-1], foo[1:], strict=False)
+   - zip(foo[:-1], foo[1:], strict=bool(foo))
+26 + itertools.pairwise(foo)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap
index 0ebd46dd4f..8ef03b90fc 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap
@@ -10,16 +10,14 @@ RUF010 [*] Use explicit conversion flag
 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+6  |     pass
+7  | 
+8  | 
+   - f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+9  + f"{bla!s}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:9:16
@@ -30,16 +28,14 @@ RUF010 [*] Use explicit conversion flag
 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+6  |     pass
+7  | 
+8  | 
+   - f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+9  + f"{str(bla)}, {bla!r}, {ascii(bla)}"  # RUF010
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:9:29
@@ -50,16 +46,14 @@ RUF010 [*] Use explicit conversion flag
 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+6  |     pass
+7  | 
+8  | 
+   - f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+9  + f"{str(bla)}, {repr(bla)}, {bla!a}"  # RUF010
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:11:4
@@ -72,16 +66,14 @@ RUF010 [*] Use explicit conversion flag
 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+8  | 
+9  | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 | 
+   - f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+11 + f"{d['a']!s}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
+13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:11:19
@@ -94,16 +86,14 @@ RUF010 [*] Use explicit conversion flag
 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+8  | 
+9  | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 | 
+   - f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+11 + f"{str(d['a'])}, {d['b']!r}, {ascii(d['c'])}"  # RUF010
+12 | 
+13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:11:35
@@ -116,16 +106,14 @@ RUF010 [*] Use explicit conversion flag
 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+8  | 
+9  | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 | 
+   - f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+11 + f"{str(d['a'])}, {repr(d['b'])}, {d['c']!a}"  # RUF010
+12 | 
+13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:13:5
@@ -138,16 +126,14 @@ RUF010 [*] Use explicit conversion flag
 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
+   - f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+13 + f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 | 
+15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:13:19
@@ -160,16 +146,14 @@ RUF010 [*] Use explicit conversion flag
 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
+   - f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+13 + f"{(str(bla))}, {bla!r}, {(ascii(bla))}"  # RUF010
+14 | 
+15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:13:34
@@ -182,16 +166,14 @@ RUF010 [*] Use explicit conversion flag
 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 | 
+   - f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+13 + f"{(str(bla))}, {(repr(bla))}, {bla!a}"  # RUF010
+14 | 
+15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:15:14
@@ -204,16 +186,14 @@ RUF010 [*] Use explicit conversion flag
 17 | f"{foo(bla)}"  # OK
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+12 | 
+13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 | 
+   - f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+15 + f"{bla!s}, {bla!r}, {(ascii(bla))}"  # RUF010
+16 | 
+17 | f"{foo(bla)}"  # OK
+18 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:15:29
@@ -226,16 +206,14 @@ RUF010 [*] Use explicit conversion flag
 17 | f"{foo(bla)}"  # OK
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | 
+12 | 
+13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 | 
+   - f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+15 + f"{bla!s}, {(repr(bla))}, {bla!a}"  # RUF010
+16 | 
+17 | f"{foo(bla)}"  # OK
+18 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:35:20
@@ -247,16 +225,14 @@ RUF010 [*] Use explicit conversion flag
 36 | )
    |
 help: Replace with conversion flag
-
-ℹ Safe 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 | )
-37 37 | 
-38 38 | 
+32 | (
+33 |     f"Member of tuple mismatches type at index {i}. Expected {of_shape_i}. Got "
+34 |     " intermediary content "
+   -     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 | )
+37 | 
+38 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:40:4
@@ -268,16 +244,14 @@ RUF010 [*] Use explicit conversion flag
 42 | f"{str({} | {})}"
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-37 37 | 
-38 38 | 
-39 39 | # https://github.com/astral-sh/ruff/issues/16325
-40    |-f"{str({})}"
-   40 |+f"{ {}!s}"
-41 41 | 
-42 42 | f"{str({} | {})}"
-43 43 | 
+37 | 
+38 | 
+39 | # https://github.com/astral-sh/ruff/issues/16325
+   - f"{str({})}"
+40 + f"{ {}!s}"
+41 | 
+42 | f"{str({} | {})}"
+43 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:42:4
@@ -290,16 +264,14 @@ RUF010 [*] Use explicit conversion flag
 44 | import builtins
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-39 39 | # https://github.com/astral-sh/ruff/issues/16325
-40 40 | f"{str({})}"
-41 41 | 
-42    |-f"{str({} | {})}"
-   42 |+f"{ {} | {}!s}"
-43 43 | 
-44 44 | import builtins
-45 45 | 
+39 | # https://github.com/astral-sh/ruff/issues/16325
+40 | f"{str({})}"
+41 | 
+   - f"{str({} | {})}"
+42 + f"{ {} | {}!s}"
+43 | 
+44 | import builtins
+45 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:46:4
@@ -312,28 +284,14 @@ RUF010 [*] Use explicit conversion flag
 48 | f"{repr(1)=}"
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-43 43 | 
-44 44 | import builtins
-45 45 | 
-46    |-f"{builtins.repr(1)}"
-   46 |+f"{1!r}"
-47 47 | 
-48 48 | f"{repr(1)=}"
-49 49 | 
-
-RUF010 Use explicit conversion flag
-  --> RUF010.py:48:4
-   |
-46 | f"{builtins.repr(1)}"
-47 |
+43 | 
+44 | import builtins
+45 | 
+   - f"{builtins.repr(1)}"
+46 + f"{1!r}"
+47 | 
 48 | f"{repr(1)=}"
-   |    ^^^^^^^
-49 |
-50 | f"{repr(lambda: 1)}"
-   |
-help: Replace with conversion flag
+49 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:50:4
@@ -346,16 +304,14 @@ RUF010 [*] Use explicit conversion flag
 52 | f"{repr(x := 2)}"
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-47 47 | 
-48 48 | f"{repr(1)=}"
-49 49 | 
-50    |-f"{repr(lambda: 1)}"
-   50 |+f"{(lambda: 1)!r}"
-51 51 | 
-52 52 | f"{repr(x := 2)}"
-53 53 | 
+47 | 
+48 | f"{repr(1)=}"
+49 | 
+   - f"{repr(lambda: 1)}"
+50 + f"{(lambda: 1)!r}"
+51 | 
+52 | f"{repr(x := 2)}"
+53 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:52:4
@@ -368,16 +324,14 @@ RUF010 [*] Use explicit conversion flag
 54 | f"{str(object=3)}"
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-49 49 | 
-50 50 | f"{repr(lambda: 1)}"
-51 51 | 
-52    |-f"{repr(x := 2)}"
-   52 |+f"{(x := 2)!r}"
-53 53 | 
-54 54 | f"{str(object=3)}"
-55 55 | 
+49 | 
+50 | f"{repr(lambda: 1)}"
+51 | 
+   - f"{repr(x := 2)}"
+52 + f"{(x := 2)!r}"
+53 | 
+54 | f"{str(object=3)}"
+55 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:54:4
@@ -390,16 +344,14 @@ RUF010 [*] Use explicit conversion flag
 56 | f"{str(x for x in [])}"
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-51 51 | 
-52 52 | f"{repr(x := 2)}"
-53 53 | 
-54    |-f"{str(object=3)}"
-   54 |+f"{3!s}"
-55 55 | 
-56 56 | f"{str(x for x in [])}"
-57 57 | 
+51 | 
+52 | f"{repr(x := 2)}"
+53 | 
+   - f"{str(object=3)}"
+54 + f"{3!s}"
+55 | 
+56 | f"{str(x for x in [])}"
+57 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:56:4
@@ -412,15 +364,14 @@ RUF010 [*] Use explicit conversion flag
 58 | f"{str((x for x in []))}"
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-53 53 | 
-54 54 | f"{str(object=3)}"
-55 55 | 
-56    |-f"{str(x for x in [])}"
-   56 |+f"{(x for x in [])!s}"
-57 57 | 
-58 58 | f"{str((x for x in []))}"
+53 | 
+54 | f"{str(object=3)}"
+55 | 
+   - f"{str(x for x in [])}"
+56 + f"{(x for x in [])!s}"
+57 | 
+58 | f"{str((x for x in []))}"
+59 | 
 
 RUF010 [*] Use explicit conversion flag
   --> RUF010.py:58:4
@@ -429,12 +380,15 @@ RUF010 [*] Use explicit conversion flag
 57 |
 58 | f"{str((x for x in []))}"
    |    ^^^^^^^^^^^^^^^^^^^^
+59 |
+60 | # Debug text cases - should not trigger RUF010
    |
 help: Replace with conversion flag
-
-ℹ Safe fix
-55 55 | 
-56 56 | f"{str(x for x in [])}"
-57 57 | 
-58    |-f"{str((x for x in []))}"
-   58 |+f"{(x for x in [])!s}"
+55 | 
+56 | f"{str(x for x in [])}"
+57 | 
+   - f"{str((x for x in []))}"
+58 + f"{(x for x in [])!s}"
+59 | 
+60 | # Debug text cases - should not trigger RUF010
+61 | f"{str(1)=}"
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap
index 7c2a377ade..4c04be3042 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap
@@ -9,16 +9,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 21 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-17 17 |     pass
-18 18 | 
-19 19 | 
-20    |-def f(arg: int = None):  # RUF013
-   20 |+def f(arg: int | None = None):  # RUF013
-21 21 |     pass
-22 22 | 
-23 23 | 
+17 |     pass
+18 | 
+19 | 
+   - def f(arg: int = None):  # RUF013
+20 + def f(arg: int | None = None):  # RUF013
+21 |     pass
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:24:12
@@ -28,16 +27,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 25 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-21 21 |     pass
-22 22 | 
-23 23 | 
-24    |-def f(arg: str = None):  # RUF013
-   24 |+def f(arg: str | None = None):  # RUF013
-25 25 |     pass
-26 26 | 
-27 27 | 
+21 |     pass
+22 | 
+23 | 
+   - def f(arg: str = None):  # RUF013
+24 + def f(arg: str | None = None):  # RUF013
+25 |     pass
+26 | 
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:28:12
@@ -47,16 +45,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 29 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-25 25 |     pass
-26 26 | 
-27 27 | 
-28    |-def f(arg: Tuple[str] = None):  # RUF013
-   28 |+def f(arg: Tuple[str] | None = None):  # RUF013
-29 29 |     pass
-30 30 | 
-31 31 | 
+25 |     pass
+26 | 
+27 | 
+   - def f(arg: Tuple[str] = None):  # RUF013
+28 + def f(arg: Tuple[str] | None = None):  # RUF013
+29 |     pass
+30 | 
+31 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:58:12
@@ -66,16 +63,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 59 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-55 55 |     pass
-56 56 | 
-57 57 | 
-58    |-def f(arg: Union = None):  # RUF013
-   58 |+def f(arg: Union | None = None):  # RUF013
-59 59 |     pass
-60 60 | 
-61 61 | 
+55 |     pass
+56 | 
+57 | 
+   - def f(arg: Union = None):  # RUF013
+58 + def f(arg: Union | None = None):  # RUF013
+59 |     pass
+60 | 
+61 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:62:12
@@ -85,16 +81,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 63 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-59 59 |     pass
-60 60 | 
-61 61 | 
-62    |-def f(arg: Union[int] = None):  # RUF013
-   62 |+def f(arg: Union[int] | None = None):  # RUF013
-63 63 |     pass
-64 64 | 
-65 65 | 
+59 |     pass
+60 | 
+61 | 
+   - def f(arg: Union[int] = None):  # RUF013
+62 + def f(arg: Union[int] | None = None):  # RUF013
+63 |     pass
+64 | 
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:66:12
@@ -104,16 +99,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 67 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-63 63 |     pass
-64 64 | 
-65 65 | 
-66    |-def f(arg: Union[int, str] = None):  # RUF013
-   66 |+def f(arg: Union[int, str] | None = None):  # RUF013
-67 67 |     pass
-68 68 | 
-69 69 | 
+63 |     pass
+64 | 
+65 | 
+   - def f(arg: Union[int, str] = None):  # RUF013
+66 + def f(arg: Union[int, str] | None = None):  # RUF013
+67 |     pass
+68 | 
+69 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:85:12
@@ -123,16 +117,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 86 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-82 82 |     pass
-83 83 | 
-84 84 | 
-85    |-def f(arg: int | float = None):  # RUF013
-   85 |+def f(arg: int | float | None = None):  # RUF013
-86 86 |     pass
-87 87 | 
-88 88 | 
+82 |     pass
+83 | 
+84 | 
+   - def f(arg: int | float = None):  # RUF013
+85 + def f(arg: int | float | None = None):  # RUF013
+86 |     pass
+87 | 
+88 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:89:12
@@ -142,16 +135,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 90 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-86 86 |     pass
-87 87 | 
-88 88 | 
-89    |-def f(arg: int | float | str | bytes = None):  # RUF013
-   89 |+def f(arg: int | float | str | bytes | None = None):  # RUF013
-90 90 |     pass
-91 91 | 
-92 92 | 
+86 |     pass
+87 | 
+88 | 
+   - def f(arg: int | float | str | bytes = None):  # RUF013
+89 + def f(arg: int | float | str | bytes | None = None):  # RUF013
+90 |     pass
+91 | 
+92 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:108:12
@@ -161,16 +153,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 109 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-105 105 |     pass
-106 106 | 
-107 107 | 
-108     |-def f(arg: Literal[1] = None):  # RUF013
-    108 |+def f(arg: Literal[1] | None = None):  # RUF013
-109 109 |     pass
-110 110 | 
-111 111 | 
+105 |     pass
+106 | 
+107 | 
+    - def f(arg: Literal[1] = None):  # RUF013
+108 + def f(arg: Literal[1] | None = None):  # RUF013
+109 |     pass
+110 | 
+111 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:112:12
@@ -180,16 +171,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 113 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-109 109 |     pass
-110 110 | 
-111 111 | 
-112     |-def f(arg: Literal[1, "foo"] = None):  # RUF013
-    112 |+def f(arg: Literal[1, "foo"] | None = None):  # RUF013
-113 113 |     pass
-114 114 | 
-115 115 | 
+109 |     pass
+110 | 
+111 | 
+    - def f(arg: Literal[1, "foo"] = None):  # RUF013
+112 + def f(arg: Literal[1, "foo"] | None = None):  # RUF013
+113 |     pass
+114 | 
+115 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:131:22
@@ -199,16 +189,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 132 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-128 128 |     pass
-129 129 | 
-130 130 | 
-131     |-def f(arg: Annotated[int, ...] = None):  # RUF013
-    131 |+def f(arg: Annotated[int | None, ...] = None):  # RUF013
-132 132 |     pass
-133 133 | 
-134 134 | 
+128 |     pass
+129 | 
+130 | 
+    - def f(arg: Annotated[int, ...] = None):  # RUF013
+131 + def f(arg: Annotated[int | None, ...] = None):  # RUF013
+132 |     pass
+133 | 
+134 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:135:32
@@ -218,16 +207,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 136 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-132 132 |     pass
-133 133 | 
-134 134 | 
-135     |-def f(arg: Annotated[Annotated[int | str, ...], ...] = None):  # RUF013
-    135 |+def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None):  # RUF013
-136 136 |     pass
-137 137 | 
-138 138 | 
+132 |     pass
+133 | 
+134 | 
+    - def f(arg: Annotated[Annotated[int | str, ...], ...] = None):  # RUF013
+135 + def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None):  # RUF013
+136 |     pass
+137 | 
+138 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:151:11
@@ -239,16 +227,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-148 148 | 
-149 149 | 
-150 150 | def f(
-151     |-    arg1: int = None,  # RUF013
-    151 |+    arg1: int | None = None,  # RUF013
-152 152 |     arg2: Union[int, float] = None,  # RUF013
-153 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
-154 154 | ):
+148 | 
+149 | 
+150 | def f(
+    -     arg1: int = None,  # RUF013
+151 +     arg1: int | None = None,  # RUF013
+152 |     arg2: Union[int, float] = None,  # RUF013
+153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
+154 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:152:11
@@ -261,16 +248,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 154 | ):
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-149 149 | 
-150 150 | def f(
-151 151 |     arg1: int = None,  # RUF013
-152     |-    arg2: Union[int, float] = None,  # RUF013
-    152 |+    arg2: Union[int, float] | None = None,  # RUF013
-153 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
-154 154 | ):
-155 155 |     pass
+149 | 
+150 | def f(
+151 |     arg1: int = None,  # RUF013
+    -     arg2: Union[int, float] = None,  # RUF013
+152 +     arg2: Union[int, float] | None = None,  # RUF013
+153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
+154 | ):
+155 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:153:11
@@ -283,16 +269,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 155 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-150 150 | def f(
-151 151 |     arg1: int = None,  # RUF013
-152 152 |     arg2: Union[int, float] = None,  # RUF013
-153     |-    arg3: Literal[1, 2, 3] = None,  # RUF013
-    153 |+    arg3: Literal[1, 2, 3] | None = None,  # RUF013
-154 154 | ):
-155 155 |     pass
-156 156 | 
+150 | def f(
+151 |     arg1: int = None,  # RUF013
+152 |     arg2: Union[int, float] = None,  # RUF013
+    -     arg3: Literal[1, 2, 3] = None,  # RUF013
+153 +     arg3: Literal[1, 2, 3] | None = None,  # RUF013
+154 | ):
+155 |     pass
+156 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:181:12
@@ -302,16 +287,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 182 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-178 178 |     pass
-179 179 | 
-180 180 | 
-181     |-def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None):  # RUF013
-    181 |+def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None):  # RUF013
-182 182 |     pass
-183 183 | 
-184 184 | 
+178 |     pass
+179 | 
+180 | 
+    - def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None):  # RUF013
+181 + def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None):  # RUF013
+182 |     pass
+183 | 
+184 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:188:13
@@ -321,16 +305,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 189 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-185 185 | # Quoted
-186 186 | 
-187 187 | 
-188     |-def f(arg: "int" = None):  # RUF013
-    188 |+def f(arg: "int | None" = None):  # RUF013
-189 189 |     pass
-190 190 | 
-191 191 | 
+185 | # Quoted
+186 | 
+187 | 
+    - def f(arg: "int" = None):  # RUF013
+188 + def f(arg: "int | None" = None):  # RUF013
+189 |     pass
+190 | 
+191 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:192:13
@@ -340,16 +323,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 193 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-189 189 |     pass
-190 190 | 
-191 191 | 
-192     |-def f(arg: "str" = None):  # RUF013
-    192 |+def f(arg: "str | None" = None):  # RUF013
-193 193 |     pass
-194 194 | 
-195 195 | 
+189 |     pass
+190 | 
+191 | 
+    - def f(arg: "str" = None):  # RUF013
+192 + def f(arg: "str | None" = None):  # RUF013
+193 |     pass
+194 | 
+195 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:196:12
@@ -368,13 +350,12 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 205 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-201 201 |     pass
-202 202 | 
-203 203 | 
-204     |-def f(arg: Union["int", "str"] = None):  # RUF013
-    204 |+def f(arg: Union["int", "str"] | None = None):  # RUF013
-205 205 |     pass
-206 206 | 
-207 207 |
+201 |     pass
+202 | 
+203 | 
+    - def f(arg: Union["int", "str"] = None):  # RUF013
+204 + def f(arg: Union["int", "str"] | None = None):  # RUF013
+205 |     pass
+206 | 
+207 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap
index c91c0f4574..9c2dccbd4c 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap
@@ -9,11 +9,10 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 5 |     pass
   |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-1 1 | # No `typing.Optional` import
-2 2 | 
-3 3 | 
-4   |-def f(arg: int = None):  # RUF013
-  4 |+def f(arg: int | None = None):  # RUF013
-5 5 |     pass
+1 | # No `typing.Optional` import
+2 | 
+3 | 
+  - def f(arg: int = None):  # RUF013
+4 + def f(arg: int | None = None):  # RUF013
+5 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap
index d56804b898..43dc92c128 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap
@@ -9,16 +9,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 5 |     pass
   |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-1 1 | import typing
-2 2 | 
-3 3 | 
-4   |-def f(arg: typing.List[str] = None):  # RUF013
-  4 |+def f(arg: typing.List[str] | None = None):  # RUF013
-5 5 |     pass
-6 6 | 
-7 7 | 
+1 | import typing
+2 | 
+3 | 
+  - def f(arg: typing.List[str] = None):  # RUF013
+4 + def f(arg: typing.List[str] | None = None):  # RUF013
+5 |     pass
+6 | 
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_3.py:22:12
@@ -28,16 +27,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 23 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-19 19 |     pass
-20 20 | 
-21 21 | 
-22    |-def f(arg: typing.Union[int, str] = None):  # RUF013
-   22 |+def f(arg: typing.Union[int, str] | None = None):  # RUF013
-23 23 |     pass
-24 24 | 
-25 25 | 
+19 |     pass
+20 | 
+21 | 
+   - def f(arg: typing.Union[int, str] = None):  # RUF013
+22 + def f(arg: typing.Union[int, str] | None = None):  # RUF013
+23 |     pass
+24 | 
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_3.py:29:12
@@ -47,11 +45,10 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 30 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-26 26 | # Literal
-27 27 | 
-28 28 | 
-29    |-def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
-   29 |+def f(arg: typing.Literal[1, "foo", True] | None = None):  # RUF013
-30 30 |     pass
+26 | # Literal
+27 | 
+28 | 
+   - def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
+29 + def f(arg: typing.Literal[1, "foo", True] | None = None):  # RUF013
+30 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap
index a32c119f25..8674b1a3e6 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap
@@ -8,13 +8,12 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
    |                                                             ^^^
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-12 12 | def multiple_1(arg1: Optional, arg2: Optional = None): ...
-13 13 | 
-14 14 | 
-15    |-def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ...
-   15 |+def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ...
-16 16 | 
-17 17 | 
-18 18 | def return_type(arg: Optional = None) -> Optional: ...
+12 | def multiple_1(arg1: Optional, arg2: Optional = None): ...
+13 | 
+14 | 
+   - def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ...
+15 + def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ...
+16 | 
+17 | 
+18 | def return_type(arg: Optional = None) -> Optional: ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap
index a079cdb11d..ede065800b 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap
@@ -11,16 +11,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 6 | list(i for i in x)[0]
   |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-1 1 | x = range(10)
-2 2 | 
-3 3 | # RUF015
-4   |-list(x)[0]
-  4 |+next(iter(x))
-5 5 | tuple(x)[0]
-6 6 | list(i for i in x)[0]
-7 7 | [i for i in x][0]
+1 | x = range(10)
+2 | 
+3 | # RUF015
+  - list(x)[0]
+4 + next(iter(x))
+5 | tuple(x)[0]
+6 | list(i for i in x)[0]
+7 | [i for i in x][0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x))` over single element slice
  --> RUF015.py:5:1
@@ -33,16 +32,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 7 | [i for i in x][0]
   |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | # RUF015
-4 4 | list(x)[0]
-5   |-tuple(x)[0]
-  5 |+next(iter(x))
-6 6 | list(i for i in x)[0]
-7 7 | [i for i in x][0]
-8 8 | 
+2 | 
+3 | # RUF015
+4 | list(x)[0]
+  - tuple(x)[0]
+5 + next(iter(x))
+6 | list(i for i in x)[0]
+7 | [i for i in x][0]
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x))` over single element slice
  --> RUF015.py:6:1
@@ -54,16 +52,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 7 | [i for i in x][0]
   |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-3 3 | # RUF015
-4 4 | list(x)[0]
-5 5 | tuple(x)[0]
-6   |-list(i for i in x)[0]
-  6 |+next(iter(x))
-7 7 | [i for i in x][0]
-8 8 | 
-9 9 | # OK (not indexing (solely) the first element)
+3 | # RUF015
+4 | list(x)[0]
+5 | tuple(x)[0]
+  - list(i for i in x)[0]
+6 + next(iter(x))
+7 | [i for i in x][0]
+8 | 
+9 | # OK (not indexing (solely) the first element)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x))` over single element slice
  --> RUF015.py:7:1
@@ -76,16 +73,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 9 | # OK (not indexing (solely) the first element)
   |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-4 4 | list(x)[0]
-5 5 | tuple(x)[0]
-6 6 | list(i for i in x)[0]
-7   |-[i for i in x][0]
-  7 |+next(iter(x))
-8 8 | 
-9 9 | # OK (not indexing (solely) the first element)
-10 10 | list(x)
+4  | list(x)[0]
+5  | tuple(x)[0]
+6  | list(i for i in x)[0]
+   - [i for i in x][0]
+7  + next(iter(x))
+8  | 
+9  | # OK (not indexing (solely) the first element)
+10 | list(x)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(i + 1 for i in x)` over single element slice
   --> RUF015.py:29:1
@@ -97,16 +93,15 @@ RUF015 [*] Prefer `next(i + 1 for i in x)` over single element slice
 31 | [(i, i + 1) for i in x][0]
    |
 help: Replace with `next(i + 1 for i in x)`
-
-ℹ Unsafe fix
-26 26 | [i for i in x][::]
-27 27 | 
-28 28 | # RUF015 (doesn't mirror the underlying list)
-29    |-[i + 1 for i in x][0]
-   29 |+next(i + 1 for i in x)
-30 30 | [i for i in x if i > 5][0]
-31 31 | [(i, i + 1) for i in x][0]
-32 32 | 
+26 | [i for i in x][::]
+27 | 
+28 | # RUF015 (doesn't mirror the underlying list)
+   - [i + 1 for i in x][0]
+29 + next(i + 1 for i in x)
+30 | [i for i in x if i > 5][0]
+31 | [(i, i + 1) for i in x][0]
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(i for i in x if i > 5)` over single element slice
   --> RUF015.py:30:1
@@ -118,16 +113,15 @@ RUF015 [*] Prefer `next(i for i in x if i > 5)` over single element slice
 31 | [(i, i + 1) for i in x][0]
    |
 help: Replace with `next(i for i in x if i > 5)`
-
-ℹ Unsafe fix
-27 27 | 
-28 28 | # RUF015 (doesn't mirror the underlying list)
-29 29 | [i + 1 for i in x][0]
-30    |-[i for i in x if i > 5][0]
-   30 |+next(i for i in x if i > 5)
-31 31 | [(i, i + 1) for i in x][0]
-32 32 | 
-33 33 | # RUF015 (multiple generators)
+27 | 
+28 | # RUF015 (doesn't mirror the underlying list)
+29 | [i + 1 for i in x][0]
+   - [i for i in x if i > 5][0]
+30 + next(i for i in x if i > 5)
+31 | [(i, i + 1) for i in x][0]
+32 | 
+33 | # RUF015 (multiple generators)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next((i, i + 1) for i in x)` over single element slice
   --> RUF015.py:31:1
@@ -140,16 +134,15 @@ RUF015 [*] Prefer `next((i, i + 1) for i in x)` over single element slice
 33 | # RUF015 (multiple generators)
    |
 help: Replace with `next((i, i + 1) for i in x)`
-
-ℹ Unsafe fix
-28 28 | # RUF015 (doesn't mirror the underlying list)
-29 29 | [i + 1 for i in x][0]
-30 30 | [i for i in x if i > 5][0]
-31    |-[(i, i + 1) for i in x][0]
-   31 |+next((i, i + 1) for i in x)
-32 32 | 
-33 33 | # RUF015 (multiple generators)
-34 34 | y = range(10)
+28 | # RUF015 (doesn't mirror the underlying list)
+29 | [i + 1 for i in x][0]
+30 | [i for i in x if i > 5][0]
+   - [(i, i + 1) for i in x][0]
+31 + next((i, i + 1) for i in x)
+32 | 
+33 | # RUF015 (multiple generators)
+34 | y = range(10)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(i + j for i in x for j in y)` over single element slice
   --> RUF015.py:35:1
@@ -162,16 +155,15 @@ RUF015 [*] Prefer `next(i + j for i in x for j in y)` over single element slice
 37 | # RUF015
    |
 help: Replace with `next(i + j for i in x for j in y)`
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | # RUF015 (multiple generators)
-34 34 | y = range(10)
-35    |-[i + j for i in x for j in y][0]
-   35 |+next(i + j for i in x for j in y)
-36 36 | 
-37 37 | # RUF015
-38 38 | list(range(10))[0]
+32 | 
+33 | # RUF015 (multiple generators)
+34 | y = range(10)
+   - [i + j for i in x for j in y][0]
+35 + next(i + j for i in x for j in y)
+36 | 
+37 | # RUF015
+38 | list(range(10))[0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(range(10)))` over single element slice
   --> RUF015.py:38:1
@@ -183,16 +175,15 @@ RUF015 [*] Prefer `next(iter(range(10)))` over single element slice
 40 | list(x["y"])[0]
    |
 help: Replace with `next(iter(range(10)))`
-
-ℹ Unsafe fix
-35 35 | [i + j for i in x for j in y][0]
-36 36 | 
-37 37 | # RUF015
-38    |-list(range(10))[0]
-   38 |+next(iter(range(10)))
-39 39 | list(x.y)[0]
-40 40 | list(x["y"])[0]
-41 41 | [*range(10)][0]
+35 | [i + j for i in x for j in y][0]
+36 | 
+37 | # RUF015
+   - list(range(10))[0]
+38 + next(iter(range(10)))
+39 | list(x.y)[0]
+40 | list(x["y"])[0]
+41 | [*range(10)][0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x.y))` over single element slice
   --> RUF015.py:39:1
@@ -205,16 +196,15 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice
 41 | [*range(10)][0]
    |
 help: Replace with `next(iter(x.y))`
-
-ℹ Unsafe fix
-36 36 | 
-37 37 | # RUF015
-38 38 | list(range(10))[0]
-39    |-list(x.y)[0]
-   39 |+next(iter(x.y))
-40 40 | list(x["y"])[0]
-41 41 | [*range(10)][0]
-42 42 | [*x["y"]][0]
+36 | 
+37 | # RUF015
+38 | list(range(10))[0]
+   - list(x.y)[0]
+39 + next(iter(x.y))
+40 | list(x["y"])[0]
+41 | [*range(10)][0]
+42 | [*x["y"]][0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice
   --> RUF015.py:40:1
@@ -227,16 +217,15 @@ RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice
 42 | [*x["y"]][0]
    |
 help: Replace with `next(iter(x["y"]))`
-
-ℹ Unsafe fix
-37 37 | # RUF015
-38 38 | list(range(10))[0]
-39 39 | list(x.y)[0]
-40    |-list(x["y"])[0]
-   40 |+next(iter(x["y"]))
-41 41 | [*range(10)][0]
-42 42 | [*x["y"]][0]
-43 43 | [*x.y][0]
+37 | # RUF015
+38 | list(range(10))[0]
+39 | list(x.y)[0]
+   - list(x["y"])[0]
+40 + next(iter(x["y"]))
+41 | [*range(10)][0]
+42 | [*x["y"]][0]
+43 | [*x.y][0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(range(10)))` over single element slice
   --> RUF015.py:41:1
@@ -249,16 +238,15 @@ RUF015 [*] Prefer `next(iter(range(10)))` over single element slice
 43 | [*x.y][0]
    |
 help: Replace with `next(iter(range(10)))`
-
-ℹ Unsafe fix
-38 38 | list(range(10))[0]
-39 39 | list(x.y)[0]
-40 40 | list(x["y"])[0]
-41    |-[*range(10)][0]
-   41 |+next(iter(range(10)))
-42 42 | [*x["y"]][0]
-43 43 | [*x.y][0]
-44 44 | [* x.y][0]
+38 | list(range(10))[0]
+39 | list(x.y)[0]
+40 | list(x["y"])[0]
+   - [*range(10)][0]
+41 + next(iter(range(10)))
+42 | [*x["y"]][0]
+43 | [*x.y][0]
+44 | [* x.y][0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice
   --> RUF015.py:42:1
@@ -271,16 +259,15 @@ RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice
 44 | [* x.y][0]
    |
 help: Replace with `next(iter(x["y"]))`
-
-ℹ Unsafe fix
-39 39 | list(x.y)[0]
-40 40 | list(x["y"])[0]
-41 41 | [*range(10)][0]
-42    |-[*x["y"]][0]
-   42 |+next(iter(x["y"]))
-43 43 | [*x.y][0]
-44 44 | [* x.y][0]
-45 45 | [
+39 | list(x.y)[0]
+40 | list(x["y"])[0]
+41 | [*range(10)][0]
+   - [*x["y"]][0]
+42 + next(iter(x["y"]))
+43 | [*x.y][0]
+44 | [* x.y][0]
+45 | [
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x.y))` over single element slice
   --> RUF015.py:43:1
@@ -293,16 +280,15 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice
 45 | [
    |
 help: Replace with `next(iter(x.y))`
-
-ℹ Unsafe fix
-40 40 | list(x["y"])[0]
-41 41 | [*range(10)][0]
-42 42 | [*x["y"]][0]
-43    |-[*x.y][0]
-   43 |+next(iter(x.y))
-44 44 | [* x.y][0]
-45 45 | [
-46 46 |     *x.y
+40 | list(x["y"])[0]
+41 | [*range(10)][0]
+42 | [*x["y"]][0]
+   - [*x.y][0]
+43 + next(iter(x.y))
+44 | [* x.y][0]
+45 | [
+46 |     *x.y
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x.y))` over single element slice
   --> RUF015.py:44:1
@@ -315,16 +301,15 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice
 46 |     *x.y
    |
 help: Replace with `next(iter(x.y))`
-
-ℹ Unsafe fix
-41 41 | [*range(10)][0]
-42 42 | [*x["y"]][0]
-43 43 | [*x.y][0]
-44    |-[* x.y][0]
-   44 |+next(iter(x.y))
-45 45 | [
-46 46 |     *x.y
-47 47 | ][0]
+41 | [*range(10)][0]
+42 | [*x["y"]][0]
+43 | [*x.y][0]
+   - [* x.y][0]
+44 + next(iter(x.y))
+45 | [
+46 |     *x.y
+47 | ][0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x.y))` over single element slice
   --> RUF015.py:45:1
@@ -339,18 +324,17 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice
 49 |   # RUF015 (multi-line)
    |
 help: Replace with `next(iter(x.y))`
-
-ℹ Unsafe fix
-42 42 | [*x["y"]][0]
-43 43 | [*x.y][0]
-44 44 | [* x.y][0]
-45    |-[
-46    |-    *x.y
-47    |-][0]
-   45 |+next(iter(x.y))
-48 46 | 
-49 47 | # RUF015 (multi-line)
-50 48 | revision_heads_map_ast = [
+42 | [*x["y"]][0]
+43 | [*x.y][0]
+44 | [* x.y][0]
+   - [
+   -     *x.y
+   - ][0]
+45 + next(iter(x.y))
+46 | 
+47 | # RUF015 (multi-line)
+48 | revision_heads_map_ast = [
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(...)` over single element slice
   --> RUF015.py:50:26
@@ -367,21 +351,20 @@ RUF015 [*] Prefer `next(...)` over single element slice
 56 |   # RUF015 (zip)
    |
 help: Replace with `next(...)`
-
-ℹ Unsafe fix
-47 47 | ][0]
-48 48 | 
-49 49 | # RUF015 (multi-line)
-50    |-revision_heads_map_ast = [
-   50 |+revision_heads_map_ast = next(
-51 51 |     a
-52 52 |     for a in revision_heads_map_ast_obj.body
-53 53 |     if isinstance(a, ast.Assign) and a.targets[0].id == "REVISION_HEADS_MAP"
-54    |-][0]
-   54 |+)
-55 55 | 
-56 56 | # RUF015 (zip)
-57 57 | list(zip(x, y))[0]
+47 | ][0]
+48 | 
+49 | # RUF015 (multi-line)
+   - revision_heads_map_ast = [
+50 + revision_heads_map_ast = next(
+51 |     a
+52 |     for a in revision_heads_map_ast_obj.body
+53 |     if isinstance(a, ast.Assign) and a.targets[0].id == "REVISION_HEADS_MAP"
+   - ][0]
+54 + )
+55 | 
+56 | # RUF015 (zip)
+57 | list(zip(x, y))[0]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(zip(x, y))` over single element slice
   --> RUF015.py:57:1
@@ -392,16 +375,15 @@ RUF015 [*] Prefer `next(zip(x, y))` over single element slice
 58 | [*zip(x, y)][0]
    |
 help: Replace with `next(zip(x, y))`
-
-ℹ Unsafe fix
-54 54 | ][0]
-55 55 | 
-56 56 | # RUF015 (zip)
-57    |-list(zip(x, y))[0]
-   57 |+next(zip(x, y))
-58 58 | [*zip(x, y)][0]
-59 59 | 
-60 60 | # RUF015 (pop)
+54 | ][0]
+55 | 
+56 | # RUF015 (zip)
+   - list(zip(x, y))[0]
+57 + next(zip(x, y))
+58 | [*zip(x, y)][0]
+59 | 
+60 | # RUF015 (pop)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(zip(x, y))` over single element slice
   --> RUF015.py:58:1
@@ -414,16 +396,15 @@ RUF015 [*] Prefer `next(zip(x, y))` over single element slice
 60 | # RUF015 (pop)
    |
 help: Replace with `next(zip(x, y))`
-
-ℹ Unsafe fix
-55 55 | 
-56 56 | # RUF015 (zip)
-57 57 | list(zip(x, y))[0]
-58    |-[*zip(x, y)][0]
-   58 |+next(zip(x, y))
-59 59 | 
-60 60 | # RUF015 (pop)
-61 61 | list(x).pop(0)
+55 | 
+56 | # RUF015 (zip)
+57 | list(zip(x, y))[0]
+   - [*zip(x, y)][0]
+58 + next(zip(x, y))
+59 | 
+60 | # RUF015 (pop)
+61 | list(x).pop(0)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x))` over single element slice
   --> RUF015.py:61:1
@@ -435,16 +416,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 63 | list(i for i in x).pop(0)
    |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-58 58 | [*zip(x, y)][0]
-59 59 | 
-60 60 | # RUF015 (pop)
-61    |-list(x).pop(0)
-   61 |+next(iter(x))
-62 62 | [i for i in x].pop(0)
-63 63 | list(i for i in x).pop(0)
-64 64 | 
+58 | [*zip(x, y)][0]
+59 | 
+60 | # RUF015 (pop)
+   - list(x).pop(0)
+61 + next(iter(x))
+62 | [i for i in x].pop(0)
+63 | list(i for i in x).pop(0)
+64 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x))` over single element slice
   --> RUF015.py:62:1
@@ -456,16 +436,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 63 | list(i for i in x).pop(0)
    |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | # RUF015 (pop)
-61 61 | list(x).pop(0)
-62    |-[i for i in x].pop(0)
-   62 |+next(iter(x))
-63 63 | list(i for i in x).pop(0)
-64 64 | 
-65 65 | # OK
+59 | 
+60 | # RUF015 (pop)
+61 | list(x).pop(0)
+   - [i for i in x].pop(0)
+62 + next(iter(x))
+63 | list(i for i in x).pop(0)
+64 | 
+65 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(x))` over single element slice
   --> RUF015.py:63:1
@@ -478,16 +457,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice
 65 | # OK
    |
 help: Replace with `next(iter(x))`
-
-ℹ Unsafe fix
-60 60 | # RUF015 (pop)
-61 61 | list(x).pop(0)
-62 62 | [i for i in x].pop(0)
-63    |-list(i for i in x).pop(0)
-   63 |+next(iter(x))
-64 64 | 
-65 65 | # OK
-66 66 | list(x).pop(1)
+60 | # RUF015 (pop)
+61 | list(x).pop(0)
+62 | [i for i in x].pop(0)
+   - list(i for i in x).pop(0)
+63 + next(iter(x))
+64 | 
+65 | # OK
+66 | list(x).pop(1)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF015 [*] Prefer `next(iter(zip(x, y)))` over single element slice
   --> RUF015.py:73:5
@@ -498,10 +476,9 @@ RUF015 [*] Prefer `next(iter(zip(x, y)))` over single element slice
    |     ^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `next(iter(zip(x, y)))`
-
-ℹ Unsafe fix
-70 70 | 
-71 71 | def test():
-72 72 |     zip = list  # Overwrite the builtin zip
-73    |-    list(zip(x, y))[0]
-   73 |+    next(iter(zip(x, y)))
+70 | 
+71 | def test():
+72 |     zip = list  # Overwrite the builtin zip
+   -     list(zip(x, y))[0]
+73 +     next(iter(zip(x, y)))
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF016_RUF016.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF016_RUF016.py.snap
index e2f4ab0278..22917b601a 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF016_RUF016.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF016_RUF016.py.snap
@@ -415,3 +415,31 @@ RUF016 Indexed access to type `list` uses type `str` instead of an integer or sl
 95 |
 96 | # Cannot emit on invalid access using variable in index
    |
+
+RUF016 Indexed access to type `list` uses type `Template` instead of an integer or slice
+   --> RUF016.py:124:14
+    |
+123 | # Should emit for invalid access using t-string
+124 | var = [1, 2][t"x"]
+    |              ^^^^
+125 |
+126 | # Should emit for invalid access using lambda
+    |
+
+RUF016 Indexed access to type `list` uses type `lambda` instead of an integer or slice
+   --> RUF016.py:127:17
+    |
+126 | # Should emit for invalid access using lambda
+127 | var = [1, 2, 3][lambda: 0]
+    |                 ^^^^^^^^^
+128 |
+129 | # Should emit for invalid access using generator
+    |
+
+RUF016 Indexed access to type `list` uses type `generator` instead of an integer or slice
+   --> RUF016.py:130:17
+    |
+129 | # Should emit for invalid access using generator
+130 | var = [1, 2, 3][(x for x in ())]
+    |                 ^^^^^^^^^^^^^^^
+    |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap
index 298419f4b3..f030213a1e 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap
@@ -11,19 +11,18 @@ RUF017 [*] Avoid quadratic list summation
 7 | sum([[1, 2, 3], [4, 5, 6]], start=[])
   |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-  1 |+import functools
-  2 |+import operator
-1 3 | x = [1, 2, 3]
-2 4 | y = [4, 5, 6]
-3 5 | 
-4 6 | # RUF017
-5   |-sum([x, y], start=[])
-  7 |+functools.reduce(operator.iadd, [x, y], [])
-6 8 | sum([x, y], [])
-7 9 | sum([[1, 2, 3], [4, 5, 6]], start=[])
-8 10 | sum([[1, 2, 3], [4, 5, 6]], [])
+1  + import functools
+2  + import operator
+3  | x = [1, 2, 3]
+4  | y = [4, 5, 6]
+5  | 
+6  | # RUF017
+   - sum([x, y], start=[])
+7  + functools.reduce(operator.iadd, [x, y], [])
+8  | sum([x, y], [])
+9  | sum([[1, 2, 3], [4, 5, 6]], start=[])
+10 | sum([[1, 2, 3], [4, 5, 6]], [])
+note: This is an unsafe fix and may change runtime behavior
 
 RUF017 [*] Avoid quadratic list summation
  --> RUF017_0.py:6:1
@@ -36,20 +35,19 @@ RUF017 [*] Avoid quadratic list summation
 8 | sum([[1, 2, 3], [4, 5, 6]], [])
   |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-  1 |+import functools
-  2 |+import operator
-1 3 | x = [1, 2, 3]
-2 4 | y = [4, 5, 6]
-3 5 | 
-4 6 | # RUF017
-5 7 | sum([x, y], start=[])
-6   |-sum([x, y], [])
-  8 |+functools.reduce(operator.iadd, [x, y], [])
-7 9 | sum([[1, 2, 3], [4, 5, 6]], start=[])
-8 10 | sum([[1, 2, 3], [4, 5, 6]], [])
-9 11 | sum([[1, 2, 3], [4, 5, 6]],
+1  + import functools
+2  + import operator
+3  | x = [1, 2, 3]
+4  | y = [4, 5, 6]
+5  | 
+6  | # RUF017
+7  | sum([x, y], start=[])
+   - sum([x, y], [])
+8  + functools.reduce(operator.iadd, [x, y], [])
+9  | sum([[1, 2, 3], [4, 5, 6]], start=[])
+10 | sum([[1, 2, 3], [4, 5, 6]], [])
+11 | sum([[1, 2, 3], [4, 5, 6]],
+note: This is an unsafe fix and may change runtime behavior
 
 RUF017 [*] Avoid quadratic list summation
  --> RUF017_0.py:7:1
@@ -62,21 +60,20 @@ RUF017 [*] Avoid quadratic list summation
 9 | sum([[1, 2, 3], [4, 5, 6]],
   |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-   1  |+import functools
-   2  |+import operator
-1  3  | x = [1, 2, 3]
-2  4  | y = [4, 5, 6]
-3  5  | 
-4  6  | # RUF017
-5  7  | sum([x, y], start=[])
-6  8  | sum([x, y], [])
-7     |-sum([[1, 2, 3], [4, 5, 6]], start=[])
-   9  |+functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], [])
-8  10 | sum([[1, 2, 3], [4, 5, 6]], [])
-9  11 | sum([[1, 2, 3], [4, 5, 6]],
-10 12 |     [])
+1  + import functools
+2  + import operator
+3  | x = [1, 2, 3]
+4  | y = [4, 5, 6]
+5  | 
+6  | # RUF017
+7  | sum([x, y], start=[])
+8  | sum([x, y], [])
+   - sum([[1, 2, 3], [4, 5, 6]], start=[])
+9  + functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], [])
+10 | sum([[1, 2, 3], [4, 5, 6]], [])
+11 | sum([[1, 2, 3], [4, 5, 6]],
+12 |     [])
+note: This is an unsafe fix and may change runtime behavior
 
 RUF017 [*] Avoid quadratic list summation
   --> RUF017_0.py:8:1
@@ -89,22 +86,21 @@ RUF017 [*] Avoid quadratic list summation
 10 |     [])
    |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-   1  |+import functools
-   2  |+import operator
-1  3  | x = [1, 2, 3]
-2  4  | y = [4, 5, 6]
-3  5  | 
+1  + import functools
+2  + import operator
+3  | x = [1, 2, 3]
+4  | y = [4, 5, 6]
+5  | 
 --------------------------------------------------------------------------------
-5  7  | sum([x, y], start=[])
-6  8  | sum([x, y], [])
-7  9  | sum([[1, 2, 3], [4, 5, 6]], start=[])
-8     |-sum([[1, 2, 3], [4, 5, 6]], [])
-   10 |+functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], [])
-9  11 | sum([[1, 2, 3], [4, 5, 6]],
-10 12 |     [])
-11 13 | 
+7  | sum([x, y], start=[])
+8  | sum([x, y], [])
+9  | sum([[1, 2, 3], [4, 5, 6]], start=[])
+   - sum([[1, 2, 3], [4, 5, 6]], [])
+10 + functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], [])
+11 | sum([[1, 2, 3], [4, 5, 6]],
+12 |     [])
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF017 [*] Avoid quadratic list summation
   --> RUF017_0.py:9:1
@@ -118,23 +114,22 @@ RUF017 [*] Avoid quadratic list summation
 12 |   # OK
    |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-   1  |+import functools
-   2  |+import operator
-1  3  | x = [1, 2, 3]
-2  4  | y = [4, 5, 6]
-3  5  | 
+1  + import functools
+2  + import operator
+3  | x = [1, 2, 3]
+4  | y = [4, 5, 6]
+5  | 
 --------------------------------------------------------------------------------
-6  8  | sum([x, y], [])
-7  9  | sum([[1, 2, 3], [4, 5, 6]], start=[])
-8  10 | sum([[1, 2, 3], [4, 5, 6]], [])
-9     |-sum([[1, 2, 3], [4, 5, 6]],
-10    |-    [])
-   11 |+functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], [])
-11 12 | 
-12 13 | # OK
-13 14 | sum([x, y])
+8  | sum([x, y], [])
+9  | sum([[1, 2, 3], [4, 5, 6]], start=[])
+10 | sum([[1, 2, 3], [4, 5, 6]], [])
+   - sum([[1, 2, 3], [4, 5, 6]],
+   -     [])
+11 + functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], [])
+12 | 
+13 | # OK
+14 | sum([x, y])
+note: This is an unsafe fix and may change runtime behavior
 
 RUF017 [*] Avoid quadratic list summation
   --> RUF017_0.py:21:5
@@ -145,16 +140,15 @@ RUF017 [*] Avoid quadratic list summation
    |     ^^^^^^^^^^^^^^^
    |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-18 18 | def func():
-19 19 |     import functools, operator
-20 20 | 
-21    |-    sum([x, y], [])
-   21 |+    functools.reduce(operator.iadd, [x, y], [])
-22 22 | 
-23 23 | 
-24 24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718
+18 | def func():
+19 |     import functools, operator
+20 | 
+   -     sum([x, y], [])
+21 +     functools.reduce(operator.iadd, [x, y], [])
+22 | 
+23 | 
+24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718
+note: This is an unsafe fix and may change runtime behavior
 
 RUF017 [*] Avoid quadratic list summation
   --> RUF017_0.py:26:5
@@ -165,16 +159,15 @@ RUF017 [*] Avoid quadratic list summation
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-   1  |+import functools
-   2  |+import operator
-1  3  | x = [1, 2, 3]
-2  4  | y = [4, 5, 6]
-3  5  | 
+1  + import functools
+2  + import operator
+3  | x = [1, 2, 3]
+4  | y = [4, 5, 6]
+5  | 
 --------------------------------------------------------------------------------
-23 25 | 
-24 26 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718
-25 27 | def func():
-26    |-    sum((factor.dims for factor in bases), [])
-   28 |+    functools.reduce(operator.iadd, (factor.dims for factor in bases), [])
+25 | 
+26 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718
+27 | def func():
+   -     sum((factor.dims for factor in bases), [])
+28 +     functools.reduce(operator.iadd, (factor.dims for factor in bases), [])
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap
index f85dbf7125..371f5b8a6d 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap
@@ -8,9 +8,8 @@ RUF017 [*] Avoid quadratic list summation
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `functools.reduce`
-
-ℹ Unsafe fix
-1   |-sum((factor.dims for factor in bases), [])
-  1 |+import functools
-  2 |+import operator
-  3 |+functools.reduce(operator.iadd, (factor.dims for factor in bases), [])
+  - sum((factor.dims for factor in bases), [])
+1 + import functools
+2 + import operator
+3 + functools.reduce(operator.iadd, (factor.dims for factor in bases), [])
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap
index 18047142fa..ba96087e04 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap
@@ -11,15 +11,13 @@ RUF019 [*] Unnecessary key check before dictionary access
 4 |     pass
   |
 help: Replace with `dict.get`
-
-ℹ Safe fix
-1 1 | d = {}
-2 2 | # RUF019
-3   |-if "k" in d and d["k"]:
-  3 |+if d.get("k"):
-4 4 |     pass
-5 5 | 
-6 6 | k = "k"
+1 | d = {}
+2 | # RUF019
+  - if "k" in d and d["k"]:
+3 + if d.get("k"):
+4 |     pass
+5 | 
+6 | k = "k"
 
 RUF019 [*] Unnecessary key check before dictionary access
  --> RUF019.py:7:4
@@ -30,16 +28,14 @@ RUF019 [*] Unnecessary key check before dictionary access
 8 |     pass
   |
 help: Replace with `dict.get`
-
-ℹ Safe fix
-4 4 |     pass
-5 5 | 
-6 6 | k = "k"
-7   |-if k in d and d[k]:
-  7 |+if d.get(k):
-8 8 |     pass
-9 9 | 
-10 10 | if (k) in d and d[k]:
+4  |     pass
+5  | 
+6  | k = "k"
+   - if k in d and d[k]:
+7  + if d.get(k):
+8  |     pass
+9  | 
+10 | if (k) in d and d[k]:
 
 RUF019 [*] Unnecessary key check before dictionary access
   --> RUF019.py:10:4
@@ -51,16 +47,14 @@ RUF019 [*] Unnecessary key check before dictionary access
 11 |     pass
    |
 help: Replace with `dict.get`
-
-ℹ Safe fix
-7  7  | if k in d and d[k]:
-8  8  |     pass
-9  9  | 
-10    |-if (k) in d and d[k]:
-   10 |+if d.get(k):
-11 11 |     pass
-12 12 | 
-13 13 | if k in d and d[(k)]:
+7  | if k in d and d[k]:
+8  |     pass
+9  | 
+   - if (k) in d and d[k]:
+10 + if d.get(k):
+11 |     pass
+12 | 
+13 | if k in d and d[(k)]:
 
 RUF019 [*] Unnecessary key check before dictionary access
   --> RUF019.py:13:4
@@ -72,16 +66,14 @@ RUF019 [*] Unnecessary key check before dictionary access
 14 |     pass
    |
 help: Replace with `dict.get`
-
-ℹ Safe fix
-10 10 | if (k) in d and d[k]:
-11 11 |     pass
-12 12 | 
-13    |-if k in d and d[(k)]:
-   13 |+if d.get((k)):
-14 14 |     pass
-15 15 | 
-16 16 | not ("key" in dct and dct["key"])
+10 | if (k) in d and d[k]:
+11 |     pass
+12 | 
+   - if k in d and d[(k)]:
+13 + if d.get((k)):
+14 |     pass
+15 | 
+16 | not ("key" in dct and dct["key"])
 
 RUF019 [*] Unnecessary key check before dictionary access
   --> RUF019.py:16:6
@@ -94,16 +86,14 @@ RUF019 [*] Unnecessary key check before dictionary access
 18 | bool("key" in dct and dct["key"])
    |
 help: Replace with `dict.get`
-
-ℹ Safe fix
-13 13 | if k in d and d[(k)]:
-14 14 |     pass
-15 15 | 
-16    |-not ("key" in dct and dct["key"])
-   16 |+not (dct.get("key"))
-17 17 | 
-18 18 | bool("key" in dct and dct["key"])
-19 19 | 
+13 | if k in d and d[(k)]:
+14 |     pass
+15 | 
+   - not ("key" in dct and dct["key"])
+16 + not (dct.get("key"))
+17 | 
+18 | bool("key" in dct and dct["key"])
+19 | 
 
 RUF019 [*] Unnecessary key check before dictionary access
   --> RUF019.py:18:6
@@ -116,13 +106,11 @@ RUF019 [*] Unnecessary key check before dictionary access
 20 | # OK
    |
 help: Replace with `dict.get`
-
-ℹ Safe fix
-15 15 | 
-16 16 | not ("key" in dct and dct["key"])
-17 17 | 
-18    |-bool("key" in dct and dct["key"])
-   18 |+bool(dct.get("key"))
-19 19 | 
-20 20 | # OK
-21 21 | v = "k" in d and d["k"]
+15 | 
+16 | not ("key" in dct and dct["key"])
+17 | 
+   - bool("key" in dct and dct["key"])
+18 + bool(dct.get("key"))
+19 | 
+20 | # OK
+21 | v = "k" in d and d["k"]
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap
index 622af1339b..2f048321b6 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap
@@ -12,15 +12,13 @@ RUF020 [*] `Union[Never, T]` is equivalent to `T`
 5 | Never | int
   |
 help: Remove `Never`
-
-ℹ Safe fix
-1 1 | from typing import Never, NoReturn, Union
-2 2 | 
-3   |-Union[Never, int]
-  3 |+int
-4 4 | Union[NoReturn, int]
-5 5 | Never | int
-6 6 | NoReturn | int
+1 | from typing import Never, NoReturn, Union
+2 | 
+  - Union[Never, int]
+3 + int
+4 | Union[NoReturn, int]
+5 | Never | int
+6 | NoReturn | int
 
 RUF020 [*] `Union[NoReturn, T]` is equivalent to `T`
  --> RUF020.py:4:7
@@ -32,16 +30,14 @@ RUF020 [*] `Union[NoReturn, T]` is equivalent to `T`
 6 | NoReturn | int
   |
 help: Remove `NoReturn`
-
-ℹ Safe fix
-1 1 | from typing import Never, NoReturn, Union
-2 2 | 
-3 3 | Union[Never, int]
-4   |-Union[NoReturn, int]
-  4 |+int
-5 5 | Never | int
-6 6 | NoReturn | int
-7 7 | Union[Union[Never, int], Union[NoReturn, int]]
+1 | from typing import Never, NoReturn, Union
+2 | 
+3 | Union[Never, int]
+  - Union[NoReturn, int]
+4 + int
+5 | Never | int
+6 | NoReturn | int
+7 | Union[Union[Never, int], Union[NoReturn, int]]
 
 RUF020 [*] `Never | T` is equivalent to `T`
  --> RUF020.py:5:1
@@ -54,16 +50,14 @@ RUF020 [*] `Never | T` is equivalent to `T`
 7 | Union[Union[Never, int], Union[NoReturn, int]]
   |
 help: Remove `Never`
-
-ℹ Safe fix
-2 2 | 
-3 3 | Union[Never, int]
-4 4 | Union[NoReturn, int]
-5   |-Never | int
-  5 |+int
-6 6 | NoReturn | int
-7 7 | Union[Union[Never, int], Union[NoReturn, int]]
-8 8 | Union[NoReturn, int, float]
+2 | 
+3 | Union[Never, int]
+4 | Union[NoReturn, int]
+  - Never | int
+5 + int
+6 | NoReturn | int
+7 | Union[Union[Never, int], Union[NoReturn, int]]
+8 | Union[NoReturn, int, float]
 
 RUF020 [*] `NoReturn | T` is equivalent to `T`
  --> RUF020.py:6:1
@@ -76,16 +70,14 @@ RUF020 [*] `NoReturn | T` is equivalent to `T`
 8 | Union[NoReturn, int, float]
   |
 help: Remove `NoReturn`
-
-ℹ Safe fix
-3 3 | Union[Never, int]
-4 4 | Union[NoReturn, int]
-5 5 | Never | int
-6   |-NoReturn | int
-  6 |+int
-7 7 | Union[Union[Never, int], Union[NoReturn, int]]
-8 8 | Union[NoReturn, int, float]
-9 9 | 
+3 | Union[Never, int]
+4 | Union[NoReturn, int]
+5 | Never | int
+  - NoReturn | int
+6 + int
+7 | Union[Union[Never, int], Union[NoReturn, int]]
+8 | Union[NoReturn, int, float]
+9 | 
 
 RUF020 [*] `Union[Never, T]` is equivalent to `T`
  --> RUF020.py:7:13
@@ -97,16 +89,14 @@ RUF020 [*] `Union[Never, T]` is equivalent to `T`
 8 | Union[NoReturn, int, float]
   |
 help: Remove `Never`
-
-ℹ Safe fix
-4 4 | Union[NoReturn, int]
-5 5 | Never | int
-6 6 | NoReturn | int
-7   |-Union[Union[Never, int], Union[NoReturn, int]]
-  7 |+Union[int, Union[NoReturn, int]]
-8 8 | Union[NoReturn, int, float]
-9 9 | 
-10 10 | 
+4  | Union[NoReturn, int]
+5  | Never | int
+6  | NoReturn | int
+   - Union[Union[Never, int], Union[NoReturn, int]]
+7  + Union[int, Union[NoReturn, int]]
+8  | Union[NoReturn, int, float]
+9  | 
+10 | 
 
 RUF020 [*] `Union[NoReturn, T]` is equivalent to `T`
  --> RUF020.py:7:32
@@ -118,16 +108,14 @@ RUF020 [*] `Union[NoReturn, T]` is equivalent to `T`
 8 | Union[NoReturn, int, float]
   |
 help: Remove `NoReturn`
-
-ℹ Safe fix
-4 4 | Union[NoReturn, int]
-5 5 | Never | int
-6 6 | NoReturn | int
-7   |-Union[Union[Never, int], Union[NoReturn, int]]
-  7 |+Union[Union[Never, int], int]
-8 8 | Union[NoReturn, int, float]
-9 9 | 
-10 10 | 
+4  | Union[NoReturn, int]
+5  | Never | int
+6  | NoReturn | int
+   - Union[Union[Never, int], Union[NoReturn, int]]
+7  + Union[Union[Never, int], int]
+8  | Union[NoReturn, int, float]
+9  | 
+10 | 
 
 RUF020 [*] `Union[NoReturn, T]` is equivalent to `T`
  --> RUF020.py:8:7
@@ -138,16 +126,14 @@ RUF020 [*] `Union[NoReturn, T]` is equivalent to `T`
   |       ^^^^^^^^
   |
 help: Remove `NoReturn`
-
-ℹ Safe fix
-5 5 | Never | int
-6 6 | NoReturn | int
-7 7 | Union[Union[Never, int], Union[NoReturn, int]]
-8   |-Union[NoReturn, int, float]
-  8 |+Union[int, float]
-9 9 | 
-10 10 | 
-11 11 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
+5  | Never | int
+6  | NoReturn | int
+7  | Union[Union[Never, int], Union[NoReturn, int]]
+   - Union[NoReturn, int, float]
+8  + Union[int, float]
+9  | 
+10 | 
+11 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567
 
 RUF020 `Never | T` is equivalent to `T`
   --> RUF020.py:12:11
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap
index 6ea60e2fbe..3da0741c5f 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap
@@ -10,16 +10,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 13 | x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-9  9  | # as part of a chain.
-10 10 | 
-11 11 | a, b, c = 1, 0, 2
-12    |-x = a or b and c  # RUF021: => `a or (b and c)`
-   12 |+x = a or (b and c)  # RUF021: => `a or (b and c)`
-13 13 | x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
-14 14 | 
-15 15 | a, b, c = 0, 1, 2
+9  | # as part of a chain.
+10 | 
+11 | a, b, c = 1, 0, 2
+   - x = a or b and c  # RUF021: => `a or (b and c)`
+12 + x = a or (b and c)  # RUF021: => `a or (b and c)`
+13 | x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
+14 | 
+15 | a, b, c = 0, 1, 2
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:13:10
@@ -32,16 +30,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 15 | a, b, c = 0, 1, 2
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-10 10 | 
-11 11 | a, b, c = 1, 0, 2
-12 12 | x = a or b and c  # RUF021: => `a or (b and c)`
-13    |-x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
-   13 |+x = a or (b and c)  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
-14 14 | 
-15 15 | a, b, c = 0, 1, 2
-16 16 | y = a and b or c  # RUF021: => `(a and b) or c`
+10 | 
+11 | a, b, c = 1, 0, 2
+12 | x = a or b and c  # RUF021: => `a or (b and c)`
+   - x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
+13 + x = a or (b and c)  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
+14 | 
+15 | a, b, c = 0, 1, 2
+16 | y = a and b or c  # RUF021: => `(a and b) or c`
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:16:5
@@ -53,16 +49,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 18 | a, b, c, d = 1, 2, 0, 3
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-13 13 | x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
-14 14 | 
-15 15 | a, b, c = 0, 1, 2
-16    |-y = a and b or c  # RUF021: => `(a and b) or c`
-   16 |+y = (a and b) or c  # RUF021: => `(a and b) or c`
-17 17 | 
-18 18 | a, b, c, d = 1, 2, 0, 3
-19 19 | if a or b or c and d:  # RUF021: => `a or b or (c and d)`
+13 | x = a or b and c  # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix
+14 | 
+15 | a, b, c = 0, 1, 2
+   - y = a and b or c  # RUF021: => `(a and b) or c`
+16 + y = (a and b) or c  # RUF021: => `(a and b) or c`
+17 | 
+18 | a, b, c, d = 1, 2, 0, 3
+19 | if a or b or c and d:  # RUF021: => `a or b or (c and d)`
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:19:14
@@ -73,16 +67,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 20 |     pass
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-16 16 | y = a and b or c  # RUF021: => `(a and b) or c`
-17 17 | 
-18 18 | a, b, c, d = 1, 2, 0, 3
-19    |-if a or b or c and d:  # RUF021: => `a or b or (c and d)`
-   19 |+if a or b or (c and d):  # RUF021: => `a or b or (c and d)`
-20 20 |     pass
-21 21 | 
-22 22 | a, b, c, d = 0, 0, 2, 3
+16 | y = a and b or c  # RUF021: => `(a and b) or c`
+17 | 
+18 | a, b, c, d = 1, 2, 0, 3
+   - if a or b or c and d:  # RUF021: => `a or b or (c and d)`
+19 + if a or b or (c and d):  # RUF021: => `a or b or (c and d)`
+20 |     pass
+21 | 
+22 | a, b, c, d = 0, 0, 2, 3
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:26:11
@@ -94,16 +86,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 27 |     pass
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-23 23 | 
-24 24 | if bool():
-25 25 |     pass
-26    |-elif a or b and c or d:  # RUF021: => `a or (b and c) or d`
-   26 |+elif a or (b and c) or d:  # RUF021: => `a or (b and c) or d`
-27 27 |     pass
-28 28 | 
-29 29 | a, b, c, d = 0, 1, 0, 2
+23 | 
+24 | if bool():
+25 |     pass
+   - elif a or b and c or d:  # RUF021: => `a or (b and c) or d`
+26 + elif a or (b and c) or d:  # RUF021: => `a or (b and c) or d`
+27 |     pass
+28 | 
+29 | a, b, c, d = 0, 1, 0, 2
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:30:7
@@ -114,16 +104,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 31 |     pass
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-27 27 |     pass
-28 28 | 
-29 29 | a, b, c, d = 0, 1, 0, 2
-30    |-while a and b or c and d:  # RUF021: => `(and b) or (c and d)`
-   30 |+while (a and b) or c and d:  # RUF021: => `(and b) or (c and d)`
-31 31 |     pass
-32 32 | 
-33 33 | b, c, d, e = 2, 3, 0, 4
+27 |     pass
+28 | 
+29 | a, b, c, d = 0, 1, 0, 2
+   - while a and b or c and d:  # RUF021: => `(and b) or (c and d)`
+30 + while (a and b) or c and d:  # RUF021: => `(and b) or (c and d)`
+31 |     pass
+32 | 
+33 | b, c, d, e = 2, 3, 0, 4
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:30:18
@@ -134,16 +122,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 31 |     pass
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-27 27 |     pass
-28 28 | 
-29 29 | a, b, c, d = 0, 1, 0, 2
-30    |-while a and b or c and d:  # RUF021: => `(and b) or (c and d)`
-   30 |+while a and b or (c and d):  # RUF021: => `(and b) or (c and d)`
-31 31 |     pass
-32 32 | 
-33 33 | b, c, d, e = 2, 3, 0, 4
+27 |     pass
+28 | 
+29 | a, b, c, d = 0, 1, 0, 2
+   - while a and b or c and d:  # RUF021: => `(and b) or (c and d)`
+30 + while a and b or (c and d):  # RUF021: => `(and b) or (c and d)`
+31 |     pass
+32 | 
+33 | b, c, d, e = 2, 3, 0, 4
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:35:44
@@ -156,16 +142,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 37 | a, b, c, d = 0, 1, 3, 0
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-32 32 | 
-33 33 | b, c, d, e = 2, 3, 0, 4
-34 34 | # RUF021: => `a or b or c or (d and e)`:
-35    |-z = [a for a in range(5) if a or b or c or d and e]
-   35 |+z = [a for a in range(5) if a or b or c or (d and e)]
-36 36 | 
-37 37 | a, b, c, d = 0, 1, 3, 0
-38 38 | assert not a and b or c or d  # RUF021: => `(not a and b) or c or d`
+32 | 
+33 | b, c, d, e = 2, 3, 0, 4
+34 | # RUF021: => `a or b or c or (d and e)`:
+   - z = [a for a in range(5) if a or b or c or d and e]
+35 + z = [a for a in range(5) if a or b or c or (d and e)]
+36 | 
+37 | a, b, c, d = 0, 1, 3, 0
+38 | assert not a and b or c or d  # RUF021: => `(not a and b) or c or d`
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:38:8
@@ -177,16 +161,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 40 | if (not a) and b or c or d:  # RUF021: => `((not a) and b) or c or d`
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-35 35 | z = [a for a in range(5) if a or b or c or d and e]
-36 36 | 
-37 37 | a, b, c, d = 0, 1, 3, 0
-38    |-assert not a and b or c or d  # RUF021: => `(not a and b) or c or d`
-   38 |+assert (not a and b) or c or d  # RUF021: => `(not a and b) or c or d`
-39 39 | 
-40 40 | if (not a) and b or c or d:  # RUF021: => `((not a) and b) or c or d`
-41 41 |     if (not a and b) or c or d:  # OK
+35 | z = [a for a in range(5) if a or b or c or d and e]
+36 | 
+37 | a, b, c, d = 0, 1, 3, 0
+   - assert not a and b or c or d  # RUF021: => `(not a and b) or c or d`
+38 + assert (not a and b) or c or d  # RUF021: => `(not a and b) or c or d`
+39 | 
+40 | if (not a) and b or c or d:  # RUF021: => `((not a) and b) or c or d`
+41 |     if (not a and b) or c or d:  # OK
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:40:4
@@ -199,16 +181,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 42 |         pass
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-37 37 | a, b, c, d = 0, 1, 3, 0
-38 38 | assert not a and b or c or d  # RUF021: => `(not a and b) or c or d`
-39 39 | 
-40    |-if (not a) and b or c or d:  # RUF021: => `((not a) and b) or c or d`
-   40 |+if ((not a) and b) or c or d:  # RUF021: => `((not a) and b) or c or d`
-41 41 |     if (not a and b) or c or d:  # OK
-42 42 |         pass
-43 43 | 
+37 | a, b, c, d = 0, 1, 3, 0
+38 | assert not a and b or c or d  # RUF021: => `(not a and b) or c or d`
+39 | 
+   - if (not a) and b or c or d:  # RUF021: => `((not a) and b) or c or d`
+40 + if ((not a) and b) or c or d:  # RUF021: => `((not a) and b) or c or d`
+41 |     if (not a and b) or c or d:  # OK
+42 |         pass
+43 | 
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:46:8
@@ -223,18 +203,16 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 49 |       and some_fifth_reasonably_long_condition
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-43 43 | 
-44 44 | if (
-45 45 |     some_reasonably_long_condition
-46    |-    or some_other_reasonably_long_condition
-47    |-    and some_third_reasonably_long_condition
-   46 |+    or (some_other_reasonably_long_condition
-   47 |+    and some_third_reasonably_long_condition)
-48 48 |     or some_fourth_reasonably_long_condition
-49 49 |     and some_fifth_reasonably_long_condition
-50 50 |     # a comment
+43 | 
+44 | if (
+45 |     some_reasonably_long_condition
+   -     or some_other_reasonably_long_condition
+   -     and some_third_reasonably_long_condition
+46 +     or (some_other_reasonably_long_condition
+47 +     and some_third_reasonably_long_condition)
+48 |     or some_fourth_reasonably_long_condition
+49 |     and some_fifth_reasonably_long_condition
+50 |     # a comment
 
 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
   --> RUF021.py:48:8
@@ -252,18 +230,16 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget
 54 |       or some_eighth_reasonably_long_condition
    |
 help: Parenthesize the `and` subexpression
-
-ℹ Safe fix
-45 45 |     some_reasonably_long_condition
-46 46 |     or some_other_reasonably_long_condition
-47 47 |     and some_third_reasonably_long_condition
-48    |-    or some_fourth_reasonably_long_condition
-   48 |+    or (some_fourth_reasonably_long_condition
-49 49 |     and some_fifth_reasonably_long_condition
-50 50 |     # a comment
-51 51 |     and some_sixth_reasonably_long_condition
-52    |-    and some_seventh_reasonably_long_condition
-   52 |+    and some_seventh_reasonably_long_condition)
-53 53 |     # another comment
-54 54 |     or some_eighth_reasonably_long_condition
-55 55 | ):
+45 |     some_reasonably_long_condition
+46 |     or some_other_reasonably_long_condition
+47 |     and some_third_reasonably_long_condition
+   -     or some_fourth_reasonably_long_condition
+48 +     or (some_fourth_reasonably_long_condition
+49 |     and some_fifth_reasonably_long_condition
+50 |     # a comment
+51 |     and some_sixth_reasonably_long_condition
+   -     and some_seventh_reasonably_long_condition
+52 +     and some_seventh_reasonably_long_condition)
+53 |     # another comment
+54 |     or some_eighth_reasonably_long_condition
+55 | ):
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap
index bc41f1e126..4b78a27794 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap
@@ -12,16 +12,14 @@ RUF022 [*] `__all__` is not sorted
 7 | __all__ = ("d", "c", "b", "a")
   |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-2 2 | # Single-line __all__ definitions (nice 'n' easy!)
-3 3 | ##################################################
-4 4 | 
-5   |-__all__ = ["d", "c", "b", "a"]  # a comment that is untouched
-  5 |+__all__ = ["a", "b", "c", "d"]  # a comment that is untouched
-6 6 | __all__ += ["foo", "bar", "antipasti"]
-7 7 | __all__ = ("d", "c", "b", "a")
-8 8 | 
+2 | # Single-line __all__ definitions (nice 'n' easy!)
+3 | ##################################################
+4 | 
+  - __all__ = ["d", "c", "b", "a"]  # a comment that is untouched
+5 + __all__ = ["a", "b", "c", "d"]  # a comment that is untouched
+6 | __all__ += ["foo", "bar", "antipasti"]
+7 | __all__ = ("d", "c", "b", "a")
+8 | 
 
 RUF022 [*] `__all__` is not sorted
  --> RUF022.py:6:12
@@ -32,16 +30,14 @@ RUF022 [*] `__all__` is not sorted
 7 | __all__ = ("d", "c", "b", "a")
   |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-3 3 | ##################################################
-4 4 | 
-5 5 | __all__ = ["d", "c", "b", "a"]  # a comment that is untouched
-6   |-__all__ += ["foo", "bar", "antipasti"]
-  6 |+__all__ += ["antipasti", "bar", "foo"]
-7 7 | __all__ = ("d", "c", "b", "a")
-8 8 | 
-9 9 | # Quoting style is retained,
+3 | ##################################################
+4 | 
+5 | __all__ = ["d", "c", "b", "a"]  # a comment that is untouched
+  - __all__ += ["foo", "bar", "antipasti"]
+6 + __all__ += ["antipasti", "bar", "foo"]
+7 | __all__ = ("d", "c", "b", "a")
+8 | 
+9 | # Quoting style is retained,
 
 RUF022 [*] `__all__` is not sorted
  --> RUF022.py:7:11
@@ -54,16 +50,14 @@ RUF022 [*] `__all__` is not sorted
 9 | # Quoting style is retained,
   |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-4 4 | 
-5 5 | __all__ = ["d", "c", "b", "a"]  # a comment that is untouched
-6 6 | __all__ += ["foo", "bar", "antipasti"]
-7   |-__all__ = ("d", "c", "b", "a")
-  7 |+__all__ = ("a", "b", "c", "d")
-8 8 | 
-9 9 | # Quoting style is retained,
-10 10 | # but unnecessary parens are not
+4  | 
+5  | __all__ = ["d", "c", "b", "a"]  # a comment that is untouched
+6  | __all__ += ["foo", "bar", "antipasti"]
+   - __all__ = ("d", "c", "b", "a")
+7  + __all__ = ("a", "b", "c", "d")
+8  | 
+9  | # Quoting style is retained,
+10 | # but unnecessary parens are not
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:11:17
@@ -76,16 +70,14 @@ RUF022 [*] `__all__` is not sorted
 13 | # (but they are in multiline `__all__` definitions)
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-8  8  | 
-9  9  | # Quoting style is retained,
-10 10 | # but unnecessary parens are not
-11    |-__all__: list = ['b', "c", ((('a')))]
-   11 |+__all__: list = ['a', 'b', "c"]
-12 12 | # Trailing commas are also not retained in single-line `__all__` definitions
-13 13 | # (but they are in multiline `__all__` definitions)
-14 14 | __all__: tuple = ("b", "c", "a",)
+8  | 
+9  | # Quoting style is retained,
+10 | # but unnecessary parens are not
+   - __all__: list = ['b', "c", ((('a')))]
+11 + __all__: list = ['a', 'b', "c"]
+12 | # Trailing commas are also not retained in single-line `__all__` definitions
+13 | # (but they are in multiline `__all__` definitions)
+14 | __all__: tuple = ("b", "c", "a",)
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:14:18
@@ -98,16 +90,14 @@ RUF022 [*] `__all__` is not sorted
 16 | if bool():
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-11 11 | __all__: list = ['b', "c", ((('a')))]
-12 12 | # Trailing commas are also not retained in single-line `__all__` definitions
-13 13 | # (but they are in multiline `__all__` definitions)
-14    |-__all__: tuple = ("b", "c", "a",)
-   14 |+__all__: tuple = ("a", "b", "c")
-15 15 | 
-16 16 | if bool():
-17 17 |     __all__ += ("x", "m", "a", "s")
+11 | __all__: list = ['b', "c", ((('a')))]
+12 | # Trailing commas are also not retained in single-line `__all__` definitions
+13 | # (but they are in multiline `__all__` definitions)
+   - __all__: tuple = ("b", "c", "a",)
+14 + __all__: tuple = ("a", "b", "c")
+15 | 
+16 | if bool():
+17 |     __all__ += ("x", "m", "a", "s")
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:17:16
@@ -119,16 +109,14 @@ RUF022 [*] `__all__` is not sorted
 19 |     __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-14 14 | __all__: tuple = ("b", "c", "a",)
-15 15 | 
-16 16 | if bool():
-17    |-    __all__ += ("x", "m", "a", "s")
-   17 |+    __all__ += ("a", "m", "s", "x")
-18 18 | else:
-19 19 |     __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-20 20 | 
+14 | __all__: tuple = ("b", "c", "a",)
+15 | 
+16 | if bool():
+   -     __all__ += ("x", "m", "a", "s")
+17 +     __all__ += ("a", "m", "s", "x")
+18 | else:
+19 |     __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+20 | 
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:19:16
@@ -141,16 +129,14 @@ RUF022 [*] `__all__` is not sorted
 21 | __all__: list[str] = ["the", "three", "little", "pigs"]
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-16 16 | if bool():
-17 17 |     __all__ += ("x", "m", "a", "s")
-18 18 | else:
-19    |-    __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-   19 |+    __all__ += "foo1", "foo2", "foo3"  # NB: an implicit tuple (without parens)
-20 20 | 
-21 21 | __all__: list[str] = ["the", "three", "little", "pigs"]
-22 22 | 
+16 | if bool():
+17 |     __all__ += ("x", "m", "a", "s")
+18 | else:
+   -     __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+19 +     __all__ += "foo1", "foo2", "foo3"  # NB: an implicit tuple (without parens)
+20 | 
+21 | __all__: list[str] = ["the", "three", "little", "pigs"]
+22 | 
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:21:22
@@ -163,16 +149,14 @@ RUF022 [*] `__all__` is not sorted
 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-18 18 | else:
-19 19 |     __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-20 20 | 
-21    |-__all__: list[str] = ["the", "three", "little", "pigs"]
-   21 |+__all__: list[str] = ["little", "pigs", "the", "three"]
-22 22 | 
-23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-24 24 | __all__.extend(["foo", "bar"])
+18 | else:
+19 |     __all__ += "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+20 | 
+   - __all__: list[str] = ["the", "three", "little", "pigs"]
+21 + __all__: list[str] = ["little", "pigs", "the", "three"]
+22 | 
+23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+24 | __all__.extend(["foo", "bar"])
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:23:11
@@ -185,16 +169,14 @@ RUF022 [*] `__all__` is not sorted
 25 | __all__.extend(("foo", "bar"))
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-20 20 | 
-21 21 | __all__: list[str] = ["the", "three", "little", "pigs"]
-22 22 | 
-23    |-__all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-   23 |+__all__ = "an_unparenthesized_tuple", "in", "parenthesized_item"
-24 24 | __all__.extend(["foo", "bar"])
-25 25 | __all__.extend(("foo", "bar"))
-26 26 | __all__.extend((((["foo", "bar"]))))
+20 | 
+21 | __all__: list[str] = ["the", "three", "little", "pigs"]
+22 | 
+   - __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+23 + __all__ = "an_unparenthesized_tuple", "in", "parenthesized_item"
+24 | __all__.extend(["foo", "bar"])
+25 | __all__.extend(("foo", "bar"))
+26 | __all__.extend((((["foo", "bar"]))))
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:24:16
@@ -206,16 +188,14 @@ RUF022 [*] `__all__` is not sorted
 26 | __all__.extend((((["foo", "bar"]))))
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-21 21 | __all__: list[str] = ["the", "three", "little", "pigs"]
-22 22 | 
-23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-24    |-__all__.extend(["foo", "bar"])
-   24 |+__all__.extend(["bar", "foo"])
-25 25 | __all__.extend(("foo", "bar"))
-26 26 | __all__.extend((((["foo", "bar"]))))
-27 27 | 
+21 | __all__: list[str] = ["the", "three", "little", "pigs"]
+22 | 
+23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+   - __all__.extend(["foo", "bar"])
+24 + __all__.extend(["bar", "foo"])
+25 | __all__.extend(("foo", "bar"))
+26 | __all__.extend((((["foo", "bar"]))))
+27 | 
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:25:16
@@ -227,16 +207,14 @@ RUF022 [*] `__all__` is not sorted
 26 | __all__.extend((((["foo", "bar"]))))
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-22 22 | 
-23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-24 24 | __all__.extend(["foo", "bar"])
-25    |-__all__.extend(("foo", "bar"))
-   25 |+__all__.extend(("bar", "foo"))
-26 26 | __all__.extend((((["foo", "bar"]))))
-27 27 | 
-28 28 | ####################################
+22 | 
+23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+24 | __all__.extend(["foo", "bar"])
+   - __all__.extend(("foo", "bar"))
+25 + __all__.extend(("bar", "foo"))
+26 | __all__.extend((((["foo", "bar"]))))
+27 | 
+28 | ####################################
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:26:19
@@ -249,16 +227,14 @@ RUF022 [*] `__all__` is not sorted
 28 | ####################################
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-24 24 | __all__.extend(["foo", "bar"])
-25 25 | __all__.extend(("foo", "bar"))
-26    |-__all__.extend((((["foo", "bar"]))))
-   26 |+__all__.extend((((["bar", "foo"]))))
-27 27 | 
-28 28 | ####################################
-29 29 | # Neat multiline __all__ definitions
+23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+24 | __all__.extend(["foo", "bar"])
+25 | __all__.extend(("foo", "bar"))
+   - __all__.extend((((["foo", "bar"]))))
+26 + __all__.extend((((["bar", "foo"]))))
+27 | 
+28 | ####################################
+29 | # Neat multiline __all__ definitions
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:32:11
@@ -278,23 +254,22 @@ RUF022 [*] `__all__` is not sorted
 40 |   __all__ = [
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-30 30 | ####################################
-31 31 | 
-32 32 | __all__ = (
-33    |-    "d0",
-   33 |+    # a comment regarding 'a0':
-   34 |+    "a0",
-   35 |+    "b0",
-34 36 |     "c0",  # a comment regarding 'c0'
-35    |-    "b0",
-36    |-    # a comment regarding 'a0':
-37    |-    "a0"
-   37 |+    "d0"
-38 38 | )
-39 39 | 
-40 40 | __all__ = [
+30 | ####################################
+31 | 
+32 | __all__ = (
+   -     "d0",
+33 +     # a comment regarding 'a0':
+34 +     "a0",
+35 +     "b0",
+36 |     "c0",  # a comment regarding 'c0'
+   -     "b0",
+   -     # a comment regarding 'a0':
+   -     "a0"
+37 +     "d0"
+38 | )
+39 | 
+40 | __all__ = [
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:40:11
@@ -314,23 +289,22 @@ RUF022 [*] `__all__` is not sorted
 48 |   # we implement an "isort-style sort":
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-38 38 | )
-39 39 | 
-40 40 | __all__ = [
-41    |-    "d",
-   41 |+    # a comment regarding 'a':
-   42 |+    "a",
-   43 |+    "b",
-42 44 |     "c",  # a comment regarding 'c'
-43    |-    "b",
-44    |-    # a comment regarding 'a':
-45    |-    "a"
-   45 |+    "d"
-46 46 | ]
-47 47 | 
-48 48 | # we implement an "isort-style sort":
+38 | )
+39 | 
+40 | __all__ = [
+   -     "d",
+41 +     # a comment regarding 'a':
+42 +     "a",
+43 +     "b",
+44 |     "c",  # a comment regarding 'c'
+   -     "b",
+   -     # a comment regarding 'a':
+   -     "a"
+45 +     "d"
+46 | ]
+47 | 
+48 | # we implement an "isort-style sort":
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:54:11
@@ -374,51 +348,49 @@ RUF022 [*] `__all__` is not sorted
 86 |   ##########################################
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-54 54 | __all__ = [
-55 55 |     "APRIL",
-56 56 |     "AUGUST",
-57    |-    "Calendar",
-58 57 |     "DECEMBER",
-59    |-    "Day",
-60 58 |     "FEBRUARY",
-61 59 |     "FRIDAY",
-62    |-    "HTMLCalendar",
-63    |-    "IllegalMonthError",
-64 60 |     "JANUARY",
-65 61 |     "JULY",
-66 62 |     "JUNE",
-67    |-    "LocaleHTMLCalendar",
-68 63 |     "MARCH",
-69 64 |     "MAY",
-70 65 |     "MONDAY",
-71    |-    "Month",
-72 66 |     "NOVEMBER",
-73 67 |     "OCTOBER",
-74 68 |     "SATURDAY",
+54 | __all__ = [
+55 |     "APRIL",
+56 |     "AUGUST",
+   -     "Calendar",
+57 |     "DECEMBER",
+   -     "Day",
+58 |     "FEBRUARY",
+59 |     "FRIDAY",
+   -     "HTMLCalendar",
+   -     "IllegalMonthError",
+60 |     "JANUARY",
+61 |     "JULY",
+62 |     "JUNE",
+   -     "LocaleHTMLCalendar",
+63 |     "MARCH",
+64 |     "MAY",
+65 |     "MONDAY",
+   -     "Month",
+66 |     "NOVEMBER",
+67 |     "OCTOBER",
+68 |     "SATURDAY",
 --------------------------------------------------------------------------------
-76 70 |     "SUNDAY",
-77 71 |     "THURSDAY",
-78 72 |     "TUESDAY",
-79    |-    "TextCalendar",
-80 73 |     "WEDNESDAY",
-   74 |+    "Calendar",
-   75 |+    "Day",
-   76 |+    "HTMLCalendar",
-   77 |+    "IllegalMonthError",
-   78 |+    "LocaleHTMLCalendar",
-   79 |+    "Month",
-   80 |+    "TextCalendar",
-81 81 |     "calendar",
-82 82 |     "timegm",
-83 83 |     "weekday",
-84    |-    "weekheader"]
-   84 |+    "weekheader",
-   85 |+]
-85 86 | 
-86 87 | ##########################################
-87 88 | # Messier multiline __all__ definitions...
+70 |     "SUNDAY",
+71 |     "THURSDAY",
+72 |     "TUESDAY",
+   -     "TextCalendar",
+73 |     "WEDNESDAY",
+74 +     "Calendar",
+75 +     "Day",
+76 +     "HTMLCalendar",
+77 +     "IllegalMonthError",
+78 +     "LocaleHTMLCalendar",
+79 +     "Month",
+80 +     "TextCalendar",
+81 |     "calendar",
+82 |     "timegm",
+83 |     "weekday",
+   -     "weekheader"]
+84 +     "weekheader",
+85 + ]
+86 | 
+87 | ##########################################
+88 | # Messier multiline __all__ definitions...
 
 RUF022 [*] `__all__` is not sorted
   --> RUF022.py:91:11
@@ -437,28 +409,27 @@ RUF022 [*] `__all__` is not sorted
 99 |   # comment7
    |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-88  88  | ##########################################
-89  89  | 
-90  90  | # comment0
-91      |-__all__ = ("d", "a",  # comment1
-92      |-           # comment2
-93      |-           "f", "b",
-94      |-                                        "strangely",  # comment3
-95      |-            # comment4
-    91  |+__all__ = (
-    92  |+    "a",
-    93  |+    "b",
-    94  |+    "d",  # comment1
-    95  |+    # comment2
-    96  |+    "f",
-    97  |+    # comment4
-96  98  |     "formatted",
-    99  |+    "strangely",  # comment3
-97  100 |     # comment5
-98  101 | )  # comment6
-99  102 | # comment7
+88  | ##########################################
+89  | 
+90  | # comment0
+    - __all__ = ("d", "a",  # comment1
+    -            # comment2
+    -            "f", "b",
+    -                                         "strangely",  # comment3
+    -             # comment4
+91  + __all__ = (
+92  +     "a",
+93  +     "b",
+94  +     "d",  # comment1
+95  +     # comment2
+96  +     "f",
+97  +     # comment4
+98  |     "formatted",
+99  +     "strangely",  # comment3
+100 |     # comment5
+101 | )  # comment6
+102 | # comment7
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:101:11
@@ -479,21 +450,20 @@ RUF022 [*] `__all__` is not sorted
 110 |   __all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE",
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-99  99  | # comment7
-100 100 | 
-101 101 | __all__ = [  # comment0
-    102 |+    "ax",
-    103 |+    "bx",
-    104 |+    "cx",
-102 105 |     # comment1
-103 106 |     # comment2
-104     |-    "dx", "cx", "bx", "ax"  # comment3
-    107 |+    "dx"  # comment3
-105 108 |     # comment4
-106 109 |     # comment5
-107 110 |     # comment6
+99  | # comment7
+100 | 
+101 | __all__ = [  # comment0
+102 +     "ax",
+103 +     "bx",
+104 +     "cx",
+105 |     # comment1
+106 |     # comment2
+    -     "dx", "cx", "bx", "ax"  # comment3
+107 +     "dx"  # comment3
+108 |     # comment4
+109 |     # comment5
+110 |     # comment6
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:110:11
@@ -520,74 +490,72 @@ RUF022 [*] `__all__` is not sorted
 125 |   __all__: tuple[str, ...] = (  # a comment about the opening paren
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-107 107 |     # comment6
-108 108 | ]  # comment7
-109 109 | 
-110     |-__all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE",
-111     |-           "BOM_LE", "BOM32_BE", "BOM32_LE", "BOM64_BE", "BOM64_LE",
-112     |-           "BOM_UTF8", "BOM_UTF16", "BOM_UTF16_LE", "BOM_UTF16_BE",
-113     |-           "BOM_UTF32", "BOM_UTF32_LE", "BOM_UTF32_BE",
-114     |-           "CodecInfo", "Codec", "IncrementalEncoder", "IncrementalDecoder",
-115     |-           "StreamReader", "StreamWriter",
-116     |-           "StreamReaderWriter", "StreamRecoder",
-117     |-           "getencoder", "getdecoder", "getincrementalencoder",
-118     |-           "getincrementaldecoder", "getreader", "getwriter",
-119     |-           "encode", "decode", "iterencode", "iterdecode",
-120     |-           "strict_errors", "ignore_errors", "replace_errors",
-121     |-           "xmlcharrefreplace_errors",
-122     |-           "backslashreplace_errors", "namereplace_errors",
-123     |-           "register_error", "lookup_error"]
-    110 |+__all__ = [
-    111 |+    "BOM",
-    112 |+    "BOM32_BE",
-    113 |+    "BOM32_LE",
-    114 |+    "BOM64_BE",
-    115 |+    "BOM64_LE",
-    116 |+    "BOM_BE",
-    117 |+    "BOM_LE",
-    118 |+    "BOM_UTF8",
-    119 |+    "BOM_UTF16",
-    120 |+    "BOM_UTF16_BE",
-    121 |+    "BOM_UTF16_LE",
-    122 |+    "BOM_UTF32",
-    123 |+    "BOM_UTF32_BE",
-    124 |+    "BOM_UTF32_LE",
-    125 |+    "Codec",
-    126 |+    "CodecInfo",
-    127 |+    "EncodedFile",
-    128 |+    "IncrementalDecoder",
-    129 |+    "IncrementalEncoder",
-    130 |+    "StreamReader",
-    131 |+    "StreamReaderWriter",
-    132 |+    "StreamRecoder",
-    133 |+    "StreamWriter",
-    134 |+    "backslashreplace_errors",
-    135 |+    "decode",
-    136 |+    "encode",
-    137 |+    "getdecoder",
-    138 |+    "getencoder",
-    139 |+    "getincrementaldecoder",
-    140 |+    "getincrementalencoder",
-    141 |+    "getreader",
-    142 |+    "getwriter",
-    143 |+    "ignore_errors",
-    144 |+    "iterdecode",
-    145 |+    "iterencode",
-    146 |+    "lookup",
-    147 |+    "lookup_error",
-    148 |+    "namereplace_errors",
-    149 |+    "open",
-    150 |+    "register",
-    151 |+    "register_error",
-    152 |+    "replace_errors",
-    153 |+    "strict_errors",
-    154 |+    "xmlcharrefreplace_errors",
-    155 |+]
-124 156 | 
-125 157 | __all__: tuple[str, ...] = (  # a comment about the opening paren
-126 158 |     # multiline comment about "bbb" part 1
+107 |     # comment6
+108 | ]  # comment7
+109 | 
+    - __all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE",
+    -            "BOM_LE", "BOM32_BE", "BOM32_LE", "BOM64_BE", "BOM64_LE",
+    -            "BOM_UTF8", "BOM_UTF16", "BOM_UTF16_LE", "BOM_UTF16_BE",
+    -            "BOM_UTF32", "BOM_UTF32_LE", "BOM_UTF32_BE",
+    -            "CodecInfo", "Codec", "IncrementalEncoder", "IncrementalDecoder",
+    -            "StreamReader", "StreamWriter",
+    -            "StreamReaderWriter", "StreamRecoder",
+    -            "getencoder", "getdecoder", "getincrementalencoder",
+    -            "getincrementaldecoder", "getreader", "getwriter",
+    -            "encode", "decode", "iterencode", "iterdecode",
+    -            "strict_errors", "ignore_errors", "replace_errors",
+    -            "xmlcharrefreplace_errors",
+    -            "backslashreplace_errors", "namereplace_errors",
+    -            "register_error", "lookup_error"]
+110 + __all__ = [
+111 +     "BOM",
+112 +     "BOM32_BE",
+113 +     "BOM32_LE",
+114 +     "BOM64_BE",
+115 +     "BOM64_LE",
+116 +     "BOM_BE",
+117 +     "BOM_LE",
+118 +     "BOM_UTF8",
+119 +     "BOM_UTF16",
+120 +     "BOM_UTF16_BE",
+121 +     "BOM_UTF16_LE",
+122 +     "BOM_UTF32",
+123 +     "BOM_UTF32_BE",
+124 +     "BOM_UTF32_LE",
+125 +     "Codec",
+126 +     "CodecInfo",
+127 +     "EncodedFile",
+128 +     "IncrementalDecoder",
+129 +     "IncrementalEncoder",
+130 +     "StreamReader",
+131 +     "StreamReaderWriter",
+132 +     "StreamRecoder",
+133 +     "StreamWriter",
+134 +     "backslashreplace_errors",
+135 +     "decode",
+136 +     "encode",
+137 +     "getdecoder",
+138 +     "getencoder",
+139 +     "getincrementaldecoder",
+140 +     "getincrementalencoder",
+141 +     "getreader",
+142 +     "getwriter",
+143 +     "ignore_errors",
+144 +     "iterdecode",
+145 +     "iterencode",
+146 +     "lookup",
+147 +     "lookup_error",
+148 +     "namereplace_errors",
+149 +     "open",
+150 +     "register",
+151 +     "register_error",
+152 +     "replace_errors",
+153 +     "strict_errors",
+154 +     "xmlcharrefreplace_errors",
+155 + ]
+156 | 
+157 | __all__: tuple[str, ...] = (  # a comment about the opening paren
+158 |     # multiline comment about "bbb" part 1
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:125:28
@@ -608,23 +576,22 @@ RUF022 [*] `__all__` is not sorted
 134 |   # we use natural sort for `__all__`,
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-123 123 |            "register_error", "lookup_error"]
-124 124 | 
-125 125 | __all__: tuple[str, ...] = (  # a comment about the opening paren
-    126 |+    # multiline comment about "aaa" part 1
-    127 |+    # multiline comment about "aaa" part 2
-    128 |+    "aaa",
-126 129 |     # multiline comment about "bbb" part 1
-127 130 |     # multiline comment about "bbb" part 2
-128 131 |     "bbb",
-129     |-    # multiline comment about "aaa" part 1
-130     |-    # multiline comment about "aaa" part 2
-131     |-    "aaa",
-132 132 | )
-133 133 | 
-134 134 | # we use natural sort for `__all__`,
+123 |            "register_error", "lookup_error"]
+124 | 
+125 | __all__: tuple[str, ...] = (  # a comment about the opening paren
+126 +     # multiline comment about "aaa" part 1
+127 +     # multiline comment about "aaa" part 2
+128 +     "aaa",
+129 |     # multiline comment about "bbb" part 1
+130 |     # multiline comment about "bbb" part 2
+131 |     "bbb",
+    -     # multiline comment about "aaa" part 1
+    -     # multiline comment about "aaa" part 2
+    -     "aaa",
+132 | )
+133 | 
+134 | # we use natural sort for `__all__`,
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:138:11
@@ -643,21 +610,19 @@ RUF022 [*] `__all__` is not sorted
 145 |   __all__.extend((  # comment0
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-136 136 | # Also, this doesn't end with a trailing comma,
-137 137 | # so the autofix shouldn't introduce one:
-138 138 | __all__ = (
-    139 |+    "aadvark174",         # the very long whitespace span before this comment is retained
-139 140 |     "aadvark237",
-140     |-    "aadvark10092",
-141     |-    "aadvark174",         # the very long whitespace span before this comment is retained
-142     |-    "aadvark532"                       # the even longer whitespace span before this comment is retained
-    141 |+    "aadvark532",                       # the even longer whitespace span before this comment is retained
-    142 |+    "aadvark10092"
-143 143 | )
-144 144 | 
-145 145 | __all__.extend((  # comment0
+136 | # Also, this doesn't end with a trailing comma,
+137 | # so the autofix shouldn't introduce one:
+138 | __all__ = (
+139 +     "aadvark174",         # the very long whitespace span before this comment is retained
+140 |     "aadvark237",
+    -     "aadvark10092",
+    -     "aadvark174",         # the very long whitespace span before this comment is retained
+    -     "aadvark532"                       # the even longer whitespace span before this comment is retained
+141 +     "aadvark532",                       # the even longer whitespace span before this comment is retained
+142 +     "aadvark10092"
+143 | )
+144 | 
+145 | __all__.extend((  # comment0
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:145:16
@@ -677,21 +642,20 @@ RUF022 [*] `__all__` is not sorted
 153 |   __all__.extend(  # comment0
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-143 143 | )
-144 144 | 
-145 145 | __all__.extend((  # comment0
-    146 |+    # comment about bar
-    147 |+    "bar",  # comment about bar
-146 148 |     # comment about foo
-147     |-    "foo",  # comment about foo
-148     |-    # comment about bar
-149     |-    "bar"  # comment about bar
-    149 |+    "foo"  # comment about foo
-150 150 |     # comment1
-151 151 | ))  # comment2
-152 152 | 
+143 | )
+144 | 
+145 | __all__.extend((  # comment0
+146 +     # comment about bar
+147 +     "bar",  # comment about bar
+148 |     # comment about foo
+    -     "foo",  # comment about foo
+    -     # comment about bar
+    -     "bar"  # comment about bar
+149 +     "foo"  # comment about foo
+150 |     # comment1
+151 | ))  # comment2
+152 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:155:5
@@ -709,21 +673,20 @@ RUF022 [*] `__all__` is not sorted
 162 |   )  # comment2
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-153 153 | __all__.extend(  # comment0
-154 154 |     # comment1
-155 155 |     (  # comment2
-    156 |+        # comment about bar
-    157 |+        "bar",  # comment about bar
-156 158 |         # comment about foo
-157     |-        "foo",  # comment about foo
-158     |-        # comment about bar
-159     |-        "bar"  # comment about bar
-    159 |+        "foo"  # comment about foo
-160 160 |         # comment3
-161 161 |     )  # comment4
-162 162 | )  # comment2
+153 | __all__.extend(  # comment0
+154 |     # comment1
+155 |     (  # comment2
+156 +         # comment about bar
+157 +         "bar",  # comment about bar
+158 |         # comment about foo
+    -         "foo",  # comment about foo
+    -         # comment about bar
+    -         "bar"  # comment about bar
+159 +         "foo"  # comment about foo
+160 |         # comment3
+161 |     )  # comment4
+162 | )  # comment2
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:164:16
@@ -743,21 +706,20 @@ RUF022 [*] `__all__` is not sorted
 172 |   __all__.extend(  # comment0
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-162 162 | )  # comment2
-163 163 | 
-164 164 | __all__.extend([  # comment0
-    165 |+    # comment about bar
-    166 |+    "bar",  # comment about bar
-165 167 |     # comment about foo
-166     |-    "foo",  # comment about foo
-167     |-    # comment about bar
-168     |-    "bar"  # comment about bar
-    168 |+    "foo"  # comment about foo
-169 169 |     # comment1
-170 170 | ])  # comment2
-171 171 | 
+162 | )  # comment2
+163 | 
+164 | __all__.extend([  # comment0
+165 +     # comment about bar
+166 +     "bar",  # comment about bar
+167 |     # comment about foo
+    -     "foo",  # comment about foo
+    -     # comment about bar
+    -     "bar"  # comment about bar
+168 +     "foo"  # comment about foo
+169 |     # comment1
+170 | ])  # comment2
+171 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:174:5
@@ -775,21 +737,20 @@ RUF022 [*] `__all__` is not sorted
 181 |   )  # comment2
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-172 172 | __all__.extend(  # comment0
-173 173 |     # comment1
-174 174 |     [  # comment2
-    175 |+        # comment about bar
-    176 |+        "bar",  # comment about bar
-175 177 |         # comment about foo
-176     |-        "foo",  # comment about foo
-177     |-        # comment about bar
-178     |-        "bar"  # comment about bar
-    178 |+        "foo"  # comment about foo
-179 179 |         # comment3
-180 180 |     ]  # comment4
-181 181 | )  # comment2
+172 | __all__.extend(  # comment0
+173 |     # comment1
+174 |     [  # comment2
+175 +         # comment about bar
+176 +         "bar",  # comment about bar
+177 |         # comment about foo
+    -         "foo",  # comment about foo
+    -         # comment about bar
+    -         "bar"  # comment about bar
+178 +         "foo"  # comment about foo
+179 |         # comment3
+180 |     ]  # comment4
+181 | )  # comment2
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:183:11
@@ -806,23 +767,22 @@ RUF022 [*] `__all__` is not sorted
 188 |   __all__ = ["Awaitable", "Coroutine",
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-180 180 |     ]  # comment4
-181 181 | )  # comment2
-182 182 | 
-183     |-__all__ = ["Style", "Treeview",
-184     |-           # Extensions
-185     |-           "LabeledScale", "OptionMenu",
-    183 |+__all__ = [
-    184 |+    # Extensions
-    185 |+    "LabeledScale",
-    186 |+    "OptionMenu",
-    187 |+    "Style",
-    188 |+    "Treeview",
-186 189 | ]
-187 190 | 
-188 191 | __all__ = ["Awaitable", "Coroutine",
+180 |     ]  # comment4
+181 | )  # comment2
+182 | 
+    - __all__ = ["Style", "Treeview",
+    -            # Extensions
+    -            "LabeledScale", "OptionMenu",
+183 + __all__ = [
+184 +     # Extensions
+185 +     "LabeledScale",
+186 +     "OptionMenu",
+187 +     "Style",
+188 +     "Treeview",
+189 | ]
+190 | 
+191 | __all__ = ["Awaitable", "Coroutine",
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:188:11
@@ -838,24 +798,22 @@ RUF022 [*] `__all__` is not sorted
 192 |   __all__ = [
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-185 185 |            "LabeledScale", "OptionMenu",
-186 186 | ]
-187 187 | 
-188     |-__all__ = ["Awaitable", "Coroutine",
-189     |-           "AsyncIterable", "AsyncIterator", "AsyncGenerator",
-190     |-           ]
-    188 |+__all__ = [
-    189 |+    "AsyncGenerator",
-    190 |+    "AsyncIterable",
-    191 |+    "AsyncIterator",
-    192 |+    "Awaitable",
-    193 |+    "Coroutine",
-    194 |+]
-191 195 | 
-192 196 | __all__ = [
-193 197 |     "foo",
+185 |            "LabeledScale", "OptionMenu",
+186 | ]
+187 | 
+    - __all__ = ["Awaitable", "Coroutine",
+    -            "AsyncIterable", "AsyncIterator", "AsyncGenerator",
+    -            ]
+188 + __all__ = [
+189 +     "AsyncGenerator",
+190 +     "AsyncIterable",
+191 +     "AsyncIterator",
+192 +     "Awaitable",
+193 +     "Coroutine",
+194 + ]
+195 | 
+196 | __all__ = [
+197 |     "foo",
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:192:11
@@ -873,18 +831,16 @@ RUF022 [*] `__all__` is not sorted
 198 |   #########################################################################
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-190 190 |            ]
-191 191 | 
-192 192 | __all__ = [
-193     |-    "foo",
-194 193 |     "bar",
-195 194 |     "baz",
-    195 |+    "foo",
-196 196 |     ]
-197 197 | 
-198 198 | #########################################################################
+190 |            ]
+191 | 
+192 | __all__ = [
+    -     "foo",
+193 |     "bar",
+194 |     "baz",
+195 +     "foo",
+196 |     ]
+197 | 
+198 | #########################################################################
 
 RUF022 `__all__` is not sorted
    --> RUF022.py:204:11
@@ -949,18 +905,16 @@ RUF022 [*] `__all__` is not sorted
 229 |   __all__ = [
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-223 223 | ############################################################
-224 224 | 
-225 225 | __all__ = (
-    226 |+    "dumps",
-226 227 |     "loads",
-227     |-    "dumps",)
-    228 |+)
-228 229 | 
-229 230 | __all__ = [
-230 231 |     "loads",
+223 | ############################################################
+224 | 
+225 | __all__ = (
+226 +     "dumps",
+227 |     "loads",
+    -     "dumps",)
+228 + )
+229 | 
+230 | __all__ = [
+231 |     "loads",
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:229:11
@@ -976,18 +930,16 @@ RUF022 [*] `__all__` is not sorted
 233 |   __all__ = ['xp', 'yp',
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-227 227 |     "dumps",)
-228 228 | 
-229 229 | __all__ = [
-230     |-    "loads",
-231     |-    "dumps"       ,     ]
-    230 |+    "dumps",
-    231 |+    "loads"       ,     ]
-232 232 | 
-233 233 | __all__ = ['xp', 'yp',
-234 234 |                 'canvas'
+227 |     "dumps",)
+228 | 
+229 | __all__ = [
+    -     "loads",
+    -     "dumps"       ,     ]
+230 +     "dumps",
+231 +     "loads"       ,     ]
+232 | 
+233 | __all__ = ['xp', 'yp',
+234 |                 'canvas'
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:233:11
@@ -1009,20 +961,18 @@ RUF022 [*] `__all__` is not sorted
 243 |   __all__ = (
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Safe fix
-230 230 |     "loads",
-231 231 |     "dumps"       ,     ]
-232 232 | 
-233     |-__all__ = ['xp', 'yp',
-234     |-                'canvas'
-    233 |+__all__ = [
-    234 |+    'canvas',
-    235 |+    'xp',
-    236 |+    'yp'
-235 237 | 
-236 238 |                 # very strangely placed comment
-237 239 | 
+230 |     "loads",
+231 |     "dumps"       ,     ]
+232 | 
+    - __all__ = ['xp', 'yp',
+    -                 'canvas'
+233 + __all__ = [
+234 +     'canvas',
+235 +     'xp',
+236 +     'yp'
+237 | 
+238 |                 # very strangely placed comment
+239 | 
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:243:11
@@ -1044,21 +994,20 @@ RUF022 [*] `__all__` is not sorted
 253 |   __all__ = (  # comment about the opening paren
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-241 241 |                 ]
-242 242 | 
-243 243 | __all__ = (
-244     |-    "foo"
-245 244 |     # strange comment 1
-246     |-    ,
-247 245 |     # comment about bar
-248     |-    "bar"
-    246 |+    "bar",
-    247 |+    "foo"
-249 248 |     # strange comment 2
-250 249 |     ,
-251 250 | )
+241 |                 ]
+242 | 
+243 | __all__ = (
+    -     "foo"
+244 |     # strange comment 1
+    -     ,
+245 |     # comment about bar
+    -     "bar"
+246 +     "bar",
+247 +     "foo"
+248 |     # strange comment 2
+249 |     ,
+250 | )
+note: This is an unsafe fix and may change runtime behavior
 
 RUF022 [*] `__all__` is not sorted
    --> RUF022.py:253:11
@@ -1087,25 +1036,24 @@ RUF022 [*] `__all__` is not sorted
 270 |   ###################################
     |
 help: Apply an isort-style sorting to `__all__`
-
-ℹ Unsafe fix
-251 251 | )
-252 252 | 
-253 253 | __all__ = (  # comment about the opening paren
-254     |-    # multiline strange comment 0a
-255     |-    # multiline strange comment 0b
-256     |-    "foo"  # inline comment about foo
-257 254 |     # multiline strange comment 1a
-258 255 |     # multiline strange comment 1b
-259     |-    ,  # comment about the comma??
-    256 |+      # comment about the comma??
-260 257 |     # comment about bar part a
-261 258 |     # comment about bar part b
-262     |-    "bar"  # inline comment about bar
-    259 |+    "bar",  # inline comment about bar
-    260 |+    # multiline strange comment 0a
-    261 |+    # multiline strange comment 0b
-    262 |+    "foo"  # inline comment about foo
-263 263 |     # strange multiline comment comment 2a
-264 264 |     # strange multiline comment 2b
-265 265 |     ,
+251 | )
+252 | 
+253 | __all__ = (  # comment about the opening paren
+    -     # multiline strange comment 0a
+    -     # multiline strange comment 0b
+    -     "foo"  # inline comment about foo
+254 |     # multiline strange comment 1a
+255 |     # multiline strange comment 1b
+    -     ,  # comment about the comma??
+256 +       # comment about the comma??
+257 |     # comment about bar part a
+258 |     # comment about bar part b
+    -     "bar"  # inline comment about bar
+259 +     "bar",  # inline comment about bar
+260 +     # multiline strange comment 0a
+261 +     # multiline strange comment 0b
+262 +     "foo"  # inline comment about foo
+263 |     # strange multiline comment comment 2a
+264 |     # strange multiline comment 2b
+265 |     ,
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap
index a65d4c791d..31141c4872 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap
@@ -10,16 +10,14 @@ RUF023 [*] `Klass.__slots__` is not sorted
 7 |     __slots__ = ("d", "c", "b", "a")
   |
 help: Apply a natural sort to `Klass.__slots__`
-
-ℹ Safe fix
-3 3 | #########################
-4 4 | 
-5 5 | class Klass:
-6   |-    __slots__ = ["d", "c", "b", "a"]  # a comment that is untouched
-  6 |+    __slots__ = ["a", "b", "c", "d"]  # a comment that is untouched
-7 7 |     __slots__ = ("d", "c", "b", "a")
-8 8 | 
-9 9 |     # Quoting style is retained,
+3 | #########################
+4 | 
+5 | class Klass:
+  -     __slots__ = ["d", "c", "b", "a"]  # a comment that is untouched
+6 +     __slots__ = ["a", "b", "c", "d"]  # a comment that is untouched
+7 |     __slots__ = ("d", "c", "b", "a")
+8 | 
+9 |     # Quoting style is retained,
 
 RUF023 [*] `Klass.__slots__` is not sorted
  --> RUF023.py:7:17
@@ -32,16 +30,14 @@ RUF023 [*] `Klass.__slots__` is not sorted
 9 |     # Quoting style is retained,
   |
 help: Apply a natural sort to `Klass.__slots__`
-
-ℹ Safe fix
-4 4 | 
-5 5 | class Klass:
-6 6 |     __slots__ = ["d", "c", "b", "a"]  # a comment that is untouched
-7   |-    __slots__ = ("d", "c", "b", "a")
-  7 |+    __slots__ = ("a", "b", "c", "d")
-8 8 | 
-9 9 |     # Quoting style is retained,
-10 10 |     # but unnecessary parens are not
+4  | 
+5  | class Klass:
+6  |     __slots__ = ["d", "c", "b", "a"]  # a comment that is untouched
+   -     __slots__ = ("d", "c", "b", "a")
+7  +     __slots__ = ("a", "b", "c", "d")
+8  | 
+9  |     # Quoting style is retained,
+10 |     # but unnecessary parens are not
 
 RUF023 [*] `Klass.__slots__` is not sorted
   --> RUF023.py:11:22
@@ -54,16 +50,14 @@ RUF023 [*] `Klass.__slots__` is not sorted
 13 |     # (but they are in multiline definitions)
    |
 help: Apply a natural sort to `Klass.__slots__`
-
-ℹ Safe fix
-8  8  | 
-9  9  |     # Quoting style is retained,
-10 10 |     # but unnecessary parens are not
-11    |-    __slots__: set = {'b', "c", ((('a')))}
-   11 |+    __slots__: set = {'a', 'b', "c"}
-12 12 |     # Trailing commas are also not retained for single-line definitions
-13 13 |     # (but they are in multiline definitions)
-14 14 |     __slots__: tuple = ("b", "c", "a",)
+8  | 
+9  |     # Quoting style is retained,
+10 |     # but unnecessary parens are not
+   -     __slots__: set = {'b', "c", ((('a')))}
+11 +     __slots__: set = {'a', 'b', "c"}
+12 |     # Trailing commas are also not retained for single-line definitions
+13 |     # (but they are in multiline definitions)
+14 |     __slots__: tuple = ("b", "c", "a",)
 
 RUF023 [*] `Klass.__slots__` is not sorted
   --> RUF023.py:14:24
@@ -76,16 +70,14 @@ RUF023 [*] `Klass.__slots__` is not sorted
 16 | class Klass2:
    |
 help: Apply a natural sort to `Klass.__slots__`
-
-ℹ Safe fix
-11 11 |     __slots__: set = {'b', "c", ((('a')))}
-12 12 |     # Trailing commas are also not retained for single-line definitions
-13 13 |     # (but they are in multiline definitions)
-14    |-    __slots__: tuple = ("b", "c", "a",)
-   14 |+    __slots__: tuple = ("a", "b", "c")
-15 15 | 
-16 16 | class Klass2:
-17 17 |     if bool():
+11 |     __slots__: set = {'b', "c", ((('a')))}
+12 |     # Trailing commas are also not retained for single-line definitions
+13 |     # (but they are in multiline definitions)
+   -     __slots__: tuple = ("b", "c", "a",)
+14 +     __slots__: tuple = ("a", "b", "c")
+15 | 
+16 | class Klass2:
+17 |     if bool():
 
 RUF023 [*] `Klass2.__slots__` is not sorted
   --> RUF023.py:18:21
@@ -98,16 +90,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted
 20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
    |
 help: Apply a natural sort to `Klass2.__slots__`
-
-ℹ Safe fix
-15 15 | 
-16 16 | class Klass2:
-17 17 |     if bool():
-18    |-        __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"}
-   18 |+        __slots__ = {"a": "docs for a", "m": "docs for m", "x": "docs for x"}
-19 19 |     else:
-20 20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-21 21 | 
+15 | 
+16 | class Klass2:
+17 |     if bool():
+   -         __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"}
+18 +         __slots__ = {"a": "docs for a", "m": "docs for m", "x": "docs for x"}
+19 |     else:
+20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+21 | 
 
 RUF023 [*] `Klass2.__slots__` is not sorted
   --> RUF023.py:20:21
@@ -120,16 +110,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted
 22 |     __slots__: list[str] = ["the", "three", "little", "pigs"]
    |
 help: Apply a natural sort to `Klass2.__slots__`
-
-ℹ Safe fix
-17 17 |     if bool():
-18 18 |         __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"}
-19 19 |     else:
-20    |-        __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-   20 |+        __slots__ = "foo1", "foo2", "foo3"  # NB: an implicit tuple (without parens)
-21 21 | 
-22 22 |     __slots__: list[str] = ["the", "three", "little", "pigs"]
-23 23 |     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+17 |     if bool():
+18 |         __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"}
+19 |     else:
+   -         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+20 +         __slots__ = "foo1", "foo2", "foo3"  # NB: an implicit tuple (without parens)
+21 | 
+22 |     __slots__: list[str] = ["the", "three", "little", "pigs"]
+23 |     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
 
 RUF023 [*] `Klass2.__slots__` is not sorted
   --> RUF023.py:22:28
@@ -142,16 +130,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted
 24 |     # we use natural sort,
    |
 help: Apply a natural sort to `Klass2.__slots__`
-
-ℹ Safe fix
-19 19 |     else:
-20 20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-21 21 | 
-22    |-    __slots__: list[str] = ["the", "three", "little", "pigs"]
-   22 |+    __slots__: list[str] = ["little", "pigs", "the", "three"]
-23 23 |     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-24 24 |     # we use natural sort,
-25 25 |     # not alphabetical sort or "isort-style" sort
+19 |     else:
+20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+21 | 
+   -     __slots__: list[str] = ["the", "three", "little", "pigs"]
+22 +     __slots__: list[str] = ["little", "pigs", "the", "three"]
+23 |     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+24 |     # we use natural sort,
+25 |     # not alphabetical sort or "isort-style" sort
 
 RUF023 [*] `Klass2.__slots__` is not sorted
   --> RUF023.py:23:17
@@ -163,16 +149,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted
 25 |     # not alphabetical sort or "isort-style" sort
    |
 help: Apply a natural sort to `Klass2.__slots__`
-
-ℹ Safe fix
-20 20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
-21 21 | 
-22 22 |     __slots__: list[str] = ["the", "three", "little", "pigs"]
-23    |-    __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-   23 |+    __slots__ = "an_unparenthesized_tuple", "in", "parenthesized_item"
-24 24 |     # we use natural sort,
-25 25 |     # not alphabetical sort or "isort-style" sort
-26 26 |     __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"}
+20 |         __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+21 | 
+22 |     __slots__: list[str] = ["the", "three", "little", "pigs"]
+   -     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+23 +     __slots__ = "an_unparenthesized_tuple", "in", "parenthesized_item"
+24 |     # we use natural sort,
+25 |     # not alphabetical sort or "isort-style" sort
+26 |     __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"}
 
 RUF023 [*] `Klass2.__slots__` is not sorted
   --> RUF023.py:26:17
@@ -185,16 +169,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted
 28 | ############################
    |
 help: Apply a natural sort to `Klass2.__slots__`
-
-ℹ Safe fix
-23 23 |     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
-24 24 |     # we use natural sort,
-25 25 |     # not alphabetical sort or "isort-style" sort
-26    |-    __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"}
-   26 |+    __slots__ = {"aadvark174", "aadvark237", "aadvark532", "aadvark10092"}
-27 27 | 
-28 28 | ############################
-29 29 | # Neat multiline definitions
+23 |     __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+24 |     # we use natural sort,
+25 |     # not alphabetical sort or "isort-style" sort
+   -     __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"}
+26 +     __slots__ = {"aadvark174", "aadvark237", "aadvark532", "aadvark10092"}
+27 | 
+28 | ############################
+29 | # Neat multiline definitions
 
 RUF023 [*] `Klass3.__slots__` is not sorted
   --> RUF023.py:33:17
@@ -213,23 +195,22 @@ RUF023 [*] `Klass3.__slots__` is not sorted
 41 |           "d",
    |
 help: Apply a natural sort to `Klass3.__slots__`
-
-ℹ Unsafe fix
-31 31 | 
-32 32 | class Klass3:
-33 33 |     __slots__ = (
-34    |-        "d0",
-   34 |+        # a comment regarding 'a0':
-   35 |+        "a0",
-   36 |+        "b0",
-35 37 |         "c0",  # a comment regarding 'c0'
-36    |-        "b0",
-37    |-        # a comment regarding 'a0':
-38    |-        "a0"
-   38 |+        "d0"
-39 39 |     )
-40 40 |     __slots__ = [
-41 41 |         "d",
+31 | 
+32 | class Klass3:
+33 |     __slots__ = (
+   -         "d0",
+34 +         # a comment regarding 'a0':
+35 +         "a0",
+36 +         "b0",
+37 |         "c0",  # a comment regarding 'c0'
+   -         "b0",
+   -         # a comment regarding 'a0':
+   -         "a0"
+38 +         "d0"
+39 |     )
+40 |     __slots__ = [
+41 |         "d",
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 [*] `Klass3.__slots__` is not sorted
   --> RUF023.py:40:17
@@ -249,23 +230,22 @@ RUF023 [*] `Klass3.__slots__` is not sorted
 48 |   ##################################
    |
 help: Apply a natural sort to `Klass3.__slots__`
-
-ℹ Unsafe fix
-38 38 |         "a0"
-39 39 |     )
-40 40 |     __slots__ = [
-41    |-        "d",
-   41 |+        # a comment regarding 'a':
-   42 |+        "a",
-   43 |+        "b",
-42 44 |         "c",  # a comment regarding 'c'
-43    |-        "b",
-44    |-        # a comment regarding 'a':
-45    |-        "a"
-   45 |+        "d"
-46 46 |     ]
-47 47 | 
-48 48 | ##################################
+38 |         "a0"
+39 |     )
+40 |     __slots__ = [
+   -         "d",
+41 +         # a comment regarding 'a':
+42 +         "a",
+43 +         "b",
+44 |         "c",  # a comment regarding 'c'
+   -         "b",
+   -         # a comment regarding 'a':
+   -         "a"
+45 +         "d"
+46 |     ]
+47 | 
+48 | ##################################
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 [*] `Klass4.__slots__` is not sorted
   --> RUF023.py:54:17
@@ -285,28 +265,27 @@ RUF023 [*] `Klass4.__slots__` is not sorted
 62 |       # comment7
    |
 help: Apply a natural sort to `Klass4.__slots__`
-
-ℹ Unsafe fix
-51 51 | 
-52 52 | class Klass4:
-53 53 |     # comment0
-54    |-    __slots__ = ("d", "a",  # comment1
-55    |-            # comment2
-56    |-            "f", "b",
-57    |-                                            "strangely",  # comment3
-58    |-                # comment4
-   54 |+    __slots__ = (
-   55 |+        "a",
-   56 |+        "b",
-   57 |+        "d",  # comment1
-   58 |+        # comment2
-   59 |+        "f",
-   60 |+        # comment4
-59 61 |         "formatted",
-   62 |+        "strangely",  # comment3
-60 63 |         # comment5
-61 64 |     )  # comment6
-62 65 |     # comment7
+51 | 
+52 | class Klass4:
+53 |     # comment0
+   -     __slots__ = ("d", "a",  # comment1
+   -             # comment2
+   -             "f", "b",
+   -                                             "strangely",  # comment3
+   -                 # comment4
+54 +     __slots__ = (
+55 +         "a",
+56 +         "b",
+57 +         "d",  # comment1
+58 +         # comment2
+59 +         "f",
+60 +         # comment4
+61 |         "formatted",
+62 +         "strangely",  # comment3
+63 |         # comment5
+64 |     )  # comment6
+65 |     # comment7
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 [*] `Klass4.__slots__` is not sorted
   --> RUF023.py:64:17
@@ -327,21 +306,20 @@ RUF023 [*] `Klass4.__slots__` is not sorted
 73 |   # from cpython/Lib/pathlib/__init__.py
    |
 help: Apply a natural sort to `Klass4.__slots__`
-
-ℹ Unsafe fix
-62 62 |     # comment7
-63 63 | 
-64 64 |     __slots__ = [  # comment0
-   65 |+        "ax",
-   66 |+        "bx",
-   67 |+        "cx",
-65 68 |         # comment1
-66 69 |         # comment2
-67    |-        "dx", "cx", "bx", "ax"  # comment3
-   70 |+        "dx"  # comment3
-68 71 |         # comment4
-69 72 |         # comment5
-70 73 |         # comment6
+62 |     # comment7
+63 | 
+64 |     __slots__ = [  # comment0
+65 +         "ax",
+66 +         "bx",
+67 +         "cx",
+68 |         # comment1
+69 |         # comment2
+   -         "dx", "cx", "bx", "ax"  # comment3
+70 +         "dx"  # comment3
+71 |         # comment4
+72 |         # comment5
+73 |         # comment6
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 [*] `PurePath.__slots__` is not sorted
    --> RUF023.py:75:17
@@ -389,61 +367,60 @@ RUF023 [*] `PurePath.__slots__` is not sorted
 111 |   # From cpython/Lib/pickletools.py
     |
 help: Apply a natural sort to `PurePath.__slots__`
-
-ℹ Unsafe fix
-73  73  | # from cpython/Lib/pathlib/__init__.py
-74  74  | class PurePath:
-75  75  |     __slots__ = (
-76      |-        # The `_raw_paths` slot stores unnormalized string paths. This is set
-77      |-        # in the `__init__()` method.
-78      |-        '_raw_paths',
-79      |-
-80  76  |         # The `_drv`, `_root` and `_tail_cached` slots store parsed and
-81  77  |         # normalized parts of the path. They are set when any of the `drive`,
-82  78  |         # `root` or `_tail` properties are accessed for the first time. The
+73  | # from cpython/Lib/pathlib/__init__.py
+74  | class PurePath:
+75  |     __slots__ = (
+    -         # The `_raw_paths` slot stores unnormalized string paths. This is set
+    -         # in the `__init__()` method.
+    -         '_raw_paths',
+    - 
+76  |         # The `_drv`, `_root` and `_tail_cached` slots store parsed and
+77  |         # normalized parts of the path. They are set when any of the `drive`,
+78  |         # `root` or `_tail` properties are accessed for the first time. The
 --------------------------------------------------------------------------------
-84  80  |         # `os.path.splitroot()`, except that the tail is further split on path
-85  81  |         # separators (i.e. it is a list of strings), and that the root and
-86  82  |         # tail are normalized.
-87      |-        '_drv', '_root', '_tail_cached',
-88      |-
-    83  |+        '_drv',
-    84  |+        # The `_hash` slot stores the hash of the case-normalized string
-    85  |+        # path. It's set when `__hash__()` is called for the first time.
-    86  |+        '_hash',
-    87  |+        # The `_parts_normcase_cached` slot stores the case-normalized
-    88  |+        # string path after splitting on path separators. It's set when the
-    89  |+        # `_parts_normcase` property is accessed for the first time. It's used
-    90  |+        # to implement comparison methods like `__lt__()`.
-    91  |+        '_parts_normcase_cached',
-    92  |+        # The `_raw_paths` slot stores unnormalized string paths. This is set
-    93  |+        # in the `__init__()` method.
-    94  |+        '_raw_paths',
-    95  |+        '_root',
-89  96  |         # The `_str` slot stores the string representation of the path,
-90  97  |         # computed from the drive, root and tail when `__str__()` is called
-91  98  |         # for the first time. It's used to implement `_str_normcase`
-92  99  |         '_str',
-93      |-
-94  100 |         # The `_str_normcase_cached` slot stores the string path with
-95  101 |         # normalized case. It is set when the `_str_normcase` property is
-96  102 |         # accessed for the first time. It's used to implement `__eq__()`
-97  103 |         # `__hash__()`, and `_parts_normcase`
-98  104 |         '_str_normcase_cached',
-99      |-
-100     |-        # The `_parts_normcase_cached` slot stores the case-normalized
-101     |-        # string path after splitting on path separators. It's set when the
-102     |-        # `_parts_normcase` property is accessed for the first time. It's used
-103     |-        # to implement comparison methods like `__lt__()`.
-104     |-        '_parts_normcase_cached',
-105     |-
-106     |-        # The `_hash` slot stores the hash of the case-normalized string
-107     |-        # path. It's set when `__hash__()` is called for the first time.
-108     |-        '_hash',
-    105 |+        '_tail_cached',
-109 106 |     )
-110 107 | 
-111 108 | # From cpython/Lib/pickletools.py
+80  |         # `os.path.splitroot()`, except that the tail is further split on path
+81  |         # separators (i.e. it is a list of strings), and that the root and
+82  |         # tail are normalized.
+    -         '_drv', '_root', '_tail_cached',
+    - 
+83  +         '_drv',
+84  +         # The `_hash` slot stores the hash of the case-normalized string
+85  +         # path. It's set when `__hash__()` is called for the first time.
+86  +         '_hash',
+87  +         # The `_parts_normcase_cached` slot stores the case-normalized
+88  +         # string path after splitting on path separators. It's set when the
+89  +         # `_parts_normcase` property is accessed for the first time. It's used
+90  +         # to implement comparison methods like `__lt__()`.
+91  +         '_parts_normcase_cached',
+92  +         # The `_raw_paths` slot stores unnormalized string paths. This is set
+93  +         # in the `__init__()` method.
+94  +         '_raw_paths',
+95  +         '_root',
+96  |         # The `_str` slot stores the string representation of the path,
+97  |         # computed from the drive, root and tail when `__str__()` is called
+98  |         # for the first time. It's used to implement `_str_normcase`
+99  |         '_str',
+    - 
+100 |         # The `_str_normcase_cached` slot stores the string path with
+101 |         # normalized case. It is set when the `_str_normcase` property is
+102 |         # accessed for the first time. It's used to implement `__eq__()`
+103 |         # `__hash__()`, and `_parts_normcase`
+104 |         '_str_normcase_cached',
+    - 
+    -         # The `_parts_normcase_cached` slot stores the case-normalized
+    -         # string path after splitting on path separators. It's set when the
+    -         # `_parts_normcase` property is accessed for the first time. It's used
+    -         # to implement comparison methods like `__lt__()`.
+    -         '_parts_normcase_cached',
+    - 
+    -         # The `_hash` slot stores the hash of the case-normalized string
+    -         # path. It's set when `__hash__()` is called for the first time.
+    -         '_hash',
+105 +         '_tail_cached',
+106 |     )
+107 | 
+108 | # From cpython/Lib/pickletools.py
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 [*] `ArgumentDescriptor.__slots__` is not sorted
    --> RUF023.py:113:17
@@ -473,33 +450,32 @@ RUF023 [*] `ArgumentDescriptor.__slots__` is not sorted
 131 |   ####################################
     |
 help: Apply a natural sort to `ArgumentDescriptor.__slots__`
-
-ℹ Unsafe fix
-111 111 | # From cpython/Lib/pickletools.py
-112 112 | class ArgumentDescriptor(object):
-113 113 |     __slots__ = (
-114     |-        # name of descriptor record, also a module global name; a string
-115     |-        'name',
-116     |-
-    114 |+        # human-readable docs for this arg descriptor; a string
-    115 |+        'doc',
-117 116 |         # length of argument, in bytes; an int; UP_TO_NEWLINE and
-118 117 |         # TAKEN_FROM_ARGUMENT{1,4,8} are negative values for variable-length
-119 118 |         # cases
-120 119 |         'n',
-121     |-
-    120 |+        # name of descriptor record, also a module global name; a string
-    121 |+        'name',
-122 122 |         # a function taking a file-like object, reading this kind of argument
-123 123 |         # from the object at the current position, advancing the current
-124 124 |         # position by n bytes, and returning the value of the argument
-125 125 |         'reader',
-126     |-
-127     |-        # human-readable docs for this arg descriptor; a string
-128     |-        'doc',
-129 126 |     )
-130 127 | 
-131 128 | ####################################
+111 | # From cpython/Lib/pickletools.py
+112 | class ArgumentDescriptor(object):
+113 |     __slots__ = (
+    -         # name of descriptor record, also a module global name; a string
+    -         'name',
+    - 
+114 +         # human-readable docs for this arg descriptor; a string
+115 +         'doc',
+116 |         # length of argument, in bytes; an int; UP_TO_NEWLINE and
+117 |         # TAKEN_FROM_ARGUMENT{1,4,8} are negative values for variable-length
+118 |         # cases
+119 |         'n',
+    - 
+120 +         # name of descriptor record, also a module global name; a string
+121 +         'name',
+122 |         # a function taking a file-like object, reading this kind of argument
+123 |         # from the object at the current position, advancing the current
+124 |         # position by n bytes, and returning the value of the argument
+125 |         'reader',
+    - 
+    -         # human-readable docs for this arg descriptor; a string
+    -         'doc',
+126 |     )
+127 | 
+128 | ####################################
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 `SlotUser.__slots__` is not sorted
    --> RUF023.py:138:17
@@ -574,21 +550,19 @@ RUF023 [*] `BezierBuilder.__slots__` is not sorted
 165 |   class BezierBuilder2:
     |
 help: Apply a natural sort to `BezierBuilder.__slots__`
-
-ℹ Safe fix
-159 159 | ############################################################
-160 160 | 
-161 161 | class BezierBuilder:
-162     |-    __slots__ = ('xp', 'yp',
-163     |-                 'canvas',)
-    162 |+    __slots__ = (
-    163 |+        'canvas',
-    164 |+        'xp',
-    165 |+        'yp',
-    166 |+    )
-164 167 | 
-165 168 | class BezierBuilder2:
-166 169 |     __slots__ = {'xp', 'yp',
+159 | ############################################################
+160 | 
+161 | class BezierBuilder:
+    -     __slots__ = ('xp', 'yp',
+    -                  'canvas',)
+162 +     __slots__ = (
+163 +         'canvas',
+164 +         'xp',
+165 +         'yp',
+166 +     )
+167 | 
+168 | class BezierBuilder2:
+169 |     __slots__ = {'xp', 'yp',
 
 RUF023 [*] `BezierBuilder2.__slots__` is not sorted
    --> RUF023.py:166:17
@@ -602,20 +576,18 @@ RUF023 [*] `BezierBuilder2.__slots__` is not sorted
 169 |   class BezierBuilder3:
     |
 help: Apply a natural sort to `BezierBuilder2.__slots__`
-
-ℹ Safe fix
-163 163 |                  'canvas',)
-164 164 | 
-165 165 | class BezierBuilder2:
-166     |-    __slots__ = {'xp', 'yp',
-167     |-                 'canvas'      ,          }
-    166 |+    __slots__ = {
-    167 |+        'canvas',
-    168 |+        'xp',
-    169 |+        'yp'      ,          }
-168 170 | 
-169 171 | class BezierBuilder3:
-170 172 |     __slots__ = ['xp', 'yp',
+163 |                  'canvas',)
+164 | 
+165 | class BezierBuilder2:
+    -     __slots__ = {'xp', 'yp',
+    -                  'canvas'      ,          }
+166 +     __slots__ = {
+167 +         'canvas',
+168 +         'xp',
+169 +         'yp'      ,          }
+170 | 
+171 | class BezierBuilder3:
+172 |     __slots__ = ['xp', 'yp',
 
 RUF023 [*] `BezierBuilder3.__slots__` is not sorted
    --> RUF023.py:170:17
@@ -636,20 +608,18 @@ RUF023 [*] `BezierBuilder3.__slots__` is not sorted
 180 |   class BezierBuilder4:
     |
 help: Apply a natural sort to `BezierBuilder3.__slots__`
-
-ℹ Safe fix
-167 167 |                  'canvas'      ,          }
-168 168 | 
-169 169 | class BezierBuilder3:
-170     |-    __slots__ = ['xp', 'yp',
-171     |-                 'canvas'
-    170 |+    __slots__ = [
-    171 |+        'canvas',
-    172 |+        'xp',
-    173 |+        'yp'
-172 174 | 
-173 175 |                  # very strangely placed comment
-174 176 | 
+167 |                  'canvas'      ,          }
+168 | 
+169 | class BezierBuilder3:
+    -     __slots__ = ['xp', 'yp',
+    -                  'canvas'
+170 +     __slots__ = [
+171 +         'canvas',
+172 +         'xp',
+173 +         'yp'
+174 | 
+175 |                  # very strangely placed comment
+176 | 
 
 RUF023 [*] `BezierBuilder4.__slots__` is not sorted
    --> RUF023.py:181:17
@@ -670,21 +640,20 @@ RUF023 [*] `BezierBuilder4.__slots__` is not sorted
 191 |       __slots__ = {"foo", "bar",
     |
 help: Apply a natural sort to `BezierBuilder4.__slots__`
-
-ℹ Unsafe fix
-179 179 | 
-180 180 | class BezierBuilder4:
-181 181 |     __slots__ = (
-182     |-        "foo"
-183 182 |         # strange comment 1
-184     |-        ,
-185 183 |         # comment about bar
-186     |-        "bar"
-    184 |+        "bar",
-    185 |+        "foo"
-187 186 |         # strange comment 2
-188 187 |         ,
-189 188 |     )
+179 | 
+180 | class BezierBuilder4:
+181 |     __slots__ = (
+    -         "foo"
+182 |         # strange comment 1
+    -         ,
+183 |         # comment about bar
+    -         "bar"
+184 +         "bar",
+185 +         "foo"
+186 |         # strange comment 2
+187 |         ,
+188 |     )
+note: This is an unsafe fix and may change runtime behavior
 
 RUF023 [*] `BezierBuilder4.__slots__` is not sorted
    --> RUF023.py:191:17
@@ -698,23 +667,21 @@ RUF023 [*] `BezierBuilder4.__slots__` is not sorted
     | |__________________^
     |
 help: Apply a natural sort to `BezierBuilder4.__slots__`
-
-ℹ Safe fix
-188 188 |         ,
-189 189 |     )
-190 190 | 
-191     |-    __slots__ = {"foo", "bar",
-192     |-                 "baz", "bingo"
-193     |-                 }
-    191 |+    __slots__ = {
-    192 |+        "bar",
-    193 |+        "baz",
-    194 |+        "bingo",
-    195 |+        "foo"
-    196 |+    }
-194 197 | 
-195 198 | 
-196 199 | class VeryDRY:
+188 |         ,
+189 |     )
+190 | 
+    -     __slots__ = {"foo", "bar",
+    -                  "baz", "bingo"
+    -                  }
+191 +     __slots__ = {
+192 +         "bar",
+193 +         "baz",
+194 +         "bingo",
+195 +         "foo"
+196 +     }
+197 | 
+198 | 
+199 | class VeryDRY:
 
 RUF023 [*] `VeryDRY.__slots__` is not sorted
    --> RUF023.py:199:17
@@ -726,13 +693,12 @@ RUF023 [*] `VeryDRY.__slots__` is not sorted
 200 |     __match_args__ = __slots__
     |
 help: Apply a natural sort to `VeryDRY.__slots__`
-
-ℹ Unsafe fix
-196 196 | class VeryDRY:
-197 197 |     # This should get flagged, *but* the fix is unsafe,
-198 198 |     # since the `__slots__` binding is used by the `__match_args__` definition
-199     |-    __slots__ = ("foo", "bar")
-    199 |+    __slots__ = ("bar", "foo")
-200 200 |     __match_args__ = __slots__
-201 201 | 
-202 202 |
+196 | class VeryDRY:
+197 |     # This should get flagged, *but* the fix is unsafe,
+198 |     # since the `__slots__` binding is used by the `__match_args__` definition
+    -     __slots__ = ("foo", "bar")
+199 +     __slots__ = ("bar", "foo")
+200 |     __match_args__ = __slots__
+201 | 
+202 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap
index ce97d23957..7074716545 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap
@@ -11,16 +11,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 11 | dict.fromkeys(pierogi_fillings, {})
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-6  6  | ]
-7  7  | 
-8  8  | # Errors.
-9     |-dict.fromkeys(pierogi_fillings, [])
-   9  |+{key: [] for key in pierogi_fillings}
-10 10 | dict.fromkeys(pierogi_fillings, list())
-11 11 | dict.fromkeys(pierogi_fillings, {})
-12 12 | dict.fromkeys(pierogi_fillings, set())
+6  | ]
+7  | 
+8  | # Errors.
+   - dict.fromkeys(pierogi_fillings, [])
+9  + {key: [] for key in pierogi_fillings}
+10 | dict.fromkeys(pierogi_fillings, list())
+11 | dict.fromkeys(pierogi_fillings, {})
+12 | dict.fromkeys(pierogi_fillings, set())
+note: This is an unsafe fix and may change runtime behavior
 
 RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
   --> RUF024.py:10:1
@@ -33,16 +32,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 12 | dict.fromkeys(pierogi_fillings, set())
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | # Errors.
-9  9  | dict.fromkeys(pierogi_fillings, [])
-10    |-dict.fromkeys(pierogi_fillings, list())
-   10 |+{key: list() for key in pierogi_fillings}
-11 11 | dict.fromkeys(pierogi_fillings, {})
-12 12 | dict.fromkeys(pierogi_fillings, set())
-13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+7  | 
+8  | # Errors.
+9  | dict.fromkeys(pierogi_fillings, [])
+   - dict.fromkeys(pierogi_fillings, list())
+10 + {key: list() for key in pierogi_fillings}
+11 | dict.fromkeys(pierogi_fillings, {})
+12 | dict.fromkeys(pierogi_fillings, set())
+13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+note: This is an unsafe fix and may change runtime behavior
 
 RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
   --> RUF024.py:11:1
@@ -55,16 +53,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-8  8  | # Errors.
-9  9  | dict.fromkeys(pierogi_fillings, [])
-10 10 | dict.fromkeys(pierogi_fillings, list())
-11    |-dict.fromkeys(pierogi_fillings, {})
-   11 |+{key: {} for key in pierogi_fillings}
-12 12 | dict.fromkeys(pierogi_fillings, set())
-13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
-14 14 | dict.fromkeys(pierogi_fillings, dict())
+8  | # Errors.
+9  | dict.fromkeys(pierogi_fillings, [])
+10 | dict.fromkeys(pierogi_fillings, list())
+   - dict.fromkeys(pierogi_fillings, {})
+11 + {key: {} for key in pierogi_fillings}
+12 | dict.fromkeys(pierogi_fillings, set())
+13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+14 | dict.fromkeys(pierogi_fillings, dict())
+note: This is an unsafe fix and may change runtime behavior
 
 RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
   --> RUF024.py:12:1
@@ -77,16 +74,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 14 | dict.fromkeys(pierogi_fillings, dict())
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-9  9  | dict.fromkeys(pierogi_fillings, [])
-10 10 | dict.fromkeys(pierogi_fillings, list())
-11 11 | dict.fromkeys(pierogi_fillings, {})
-12    |-dict.fromkeys(pierogi_fillings, set())
-   12 |+{key: set() for key in pierogi_fillings}
-13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
-14 14 | dict.fromkeys(pierogi_fillings, dict())
-15 15 | import builtins
+9  | dict.fromkeys(pierogi_fillings, [])
+10 | dict.fromkeys(pierogi_fillings, list())
+11 | dict.fromkeys(pierogi_fillings, {})
+   - dict.fromkeys(pierogi_fillings, set())
+12 + {key: set() for key in pierogi_fillings}
+13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+14 | dict.fromkeys(pierogi_fillings, dict())
+15 | import builtins
+note: This is an unsafe fix and may change runtime behavior
 
 RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
   --> RUF024.py:13:1
@@ -99,16 +95,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 15 | import builtins
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-10 10 | dict.fromkeys(pierogi_fillings, list())
-11 11 | dict.fromkeys(pierogi_fillings, {})
-12 12 | dict.fromkeys(pierogi_fillings, set())
-13    |-dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
-   13 |+{key: {"pre": "populated!"} for key in pierogi_fillings}
-14 14 | dict.fromkeys(pierogi_fillings, dict())
-15 15 | import builtins
-16 16 | builtins.dict.fromkeys(pierogi_fillings, dict())
+10 | dict.fromkeys(pierogi_fillings, list())
+11 | dict.fromkeys(pierogi_fillings, {})
+12 | dict.fromkeys(pierogi_fillings, set())
+   - dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+13 + {key: {"pre": "populated!"} for key in pierogi_fillings}
+14 | dict.fromkeys(pierogi_fillings, dict())
+15 | import builtins
+16 | builtins.dict.fromkeys(pierogi_fillings, dict())
+note: This is an unsafe fix and may change runtime behavior
 
 RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
   --> RUF024.py:14:1
@@ -121,16 +116,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 16 | builtins.dict.fromkeys(pierogi_fillings, dict())
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-11 11 | dict.fromkeys(pierogi_fillings, {})
-12 12 | dict.fromkeys(pierogi_fillings, set())
-13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
-14    |-dict.fromkeys(pierogi_fillings, dict())
-   14 |+{key: dict() for key in pierogi_fillings}
-15 15 | import builtins
-16 16 | builtins.dict.fromkeys(pierogi_fillings, dict())
-17 17 | 
+11 | dict.fromkeys(pierogi_fillings, {})
+12 | dict.fromkeys(pierogi_fillings, set())
+13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+   - dict.fromkeys(pierogi_fillings, dict())
+14 + {key: dict() for key in pierogi_fillings}
+15 | import builtins
+16 | builtins.dict.fromkeys(pierogi_fillings, dict())
+17 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
   --> RUF024.py:16:1
@@ -143,13 +137,12 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys`
 18 | # Okay.
    |
 help: Replace with comprehension
-
-ℹ Unsafe fix
-13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
-14 14 | dict.fromkeys(pierogi_fillings, dict())
-15 15 | import builtins
-16    |-builtins.dict.fromkeys(pierogi_fillings, dict())
-   16 |+{key: dict() for key in pierogi_fillings}
-17 17 | 
-18 18 | # Okay.
-19 19 | dict.fromkeys(pierogi_fillings)
+13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+14 | dict.fromkeys(pierogi_fillings, dict())
+15 | import builtins
+   - builtins.dict.fromkeys(pierogi_fillings, dict())
+16 + {key: dict() for key in pierogi_fillings}
+17 | 
+18 | # Okay.
+19 | dict.fromkeys(pierogi_fillings)
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap
index d04a3b3768..1cff1f125a 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap
@@ -9,16 +9,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=int)`
-
-ℹ Unsafe fix
-8  8  | 
-9  9  | 
-10 10 | def func():
-11    |-    defaultdict(default_factory=int)  # RUF026
-   11 |+    defaultdict(int)  # RUF026
-12 12 | 
-13 13 | 
-14 14 | def func():
+8  | 
+9  | 
+10 | def func():
+   -     defaultdict(default_factory=int)  # RUF026
+11 +     defaultdict(int)  # RUF026
+12 | 
+13 | 
+14 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:15:5
@@ -28,16 +27,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=float)`
-
-ℹ Unsafe fix
-12 12 | 
-13 13 | 
-14 14 | def func():
-15    |-    defaultdict(default_factory=float)  # RUF026
-   15 |+    defaultdict(float)  # RUF026
-16 16 | 
-17 17 | 
-18 18 | def func():
+12 | 
+13 | 
+14 | def func():
+   -     defaultdict(default_factory=float)  # RUF026
+15 +     defaultdict(float)  # RUF026
+16 | 
+17 | 
+18 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:19:5
@@ -47,16 +45,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=dict)`
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | 
-18 18 | def func():
-19    |-    defaultdict(default_factory=dict)  # RUF026
-   19 |+    defaultdict(dict)  # RUF026
-20 20 | 
-21 21 | 
-22 22 | def func():
+16 | 
+17 | 
+18 | def func():
+   -     defaultdict(default_factory=dict)  # RUF026
+19 +     defaultdict(dict)  # RUF026
+20 | 
+21 | 
+22 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:23:5
@@ -66,16 +63,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=list)`
-
-ℹ Unsafe fix
-20 20 | 
-21 21 | 
-22 22 | def func():
-23    |-    defaultdict(default_factory=list)  # RUF026
-   23 |+    defaultdict(list)  # RUF026
-24 24 | 
-25 25 | 
-26 26 | def func():
+20 | 
+21 | 
+22 | def func():
+   -     defaultdict(default_factory=list)  # RUF026
+23 +     defaultdict(list)  # RUF026
+24 | 
+25 | 
+26 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:27:5
@@ -85,16 +81,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=tuple)`
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | 
-26 26 | def func():
-27    |-    defaultdict(default_factory=tuple)  # RUF026
-   27 |+    defaultdict(tuple)  # RUF026
-28 28 | 
-29 29 | 
-30 30 | def func():
+24 | 
+25 | 
+26 | def func():
+   -     defaultdict(default_factory=tuple)  # RUF026
+27 +     defaultdict(tuple)  # RUF026
+28 | 
+29 | 
+30 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:34:5
@@ -105,16 +100,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=foo)`
-
-ℹ Unsafe fix
-31 31 |     def foo():
-32 32 |         pass
-33 33 | 
-34    |-    defaultdict(default_factory=foo)  # RUF026
-   34 |+    defaultdict(foo)  # RUF026
-35 35 | 
-36 36 | 
-37 37 | def func():
+31 |     def foo():
+32 |         pass
+33 | 
+   -     defaultdict(default_factory=foo)  # RUF026
+34 +     defaultdict(foo)  # RUF026
+35 | 
+36 | 
+37 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:38:5
@@ -124,16 +118,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=lambda: 1)`
-
-ℹ Unsafe fix
-35 35 | 
-36 36 | 
-37 37 | def func():
-38    |-    defaultdict(default_factory=lambda: 1)  # RUF026
-   38 |+    defaultdict(lambda: 1)  # RUF026
-39 39 | 
-40 40 | 
-41 41 | def func():
+35 | 
+36 | 
+37 | def func():
+   -     defaultdict(default_factory=lambda: 1)  # RUF026
+38 +     defaultdict(lambda: 1)  # RUF026
+39 | 
+40 | 
+41 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:44:5
@@ -144,16 +137,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=deque)`
-
-ℹ Unsafe fix
-41 41 | def func():
-42 42 |     from collections import deque
-43 43 | 
-44    |-    defaultdict(default_factory=deque)  # RUF026
-   44 |+    defaultdict(deque)  # RUF026
-45 45 | 
-46 46 | 
-47 47 | def func():
+41 | def func():
+42 |     from collections import deque
+43 | 
+   -     defaultdict(default_factory=deque)  # RUF026
+44 +     defaultdict(deque)  # RUF026
+45 | 
+46 | 
+47 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:52:5
@@ -164,16 +156,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=MyCallable())`
-
-ℹ Unsafe fix
-49 49 |         def __call__(self):
-50 50 |             pass
-51 51 | 
-52    |-    defaultdict(default_factory=MyCallable())  # RUF026
-   52 |+    defaultdict(MyCallable())  # RUF026
-53 53 | 
-54 54 | 
-55 55 | def func():
+49 |         def __call__(self):
+50 |             pass
+51 | 
+   -     defaultdict(default_factory=MyCallable())  # RUF026
+52 +     defaultdict(MyCallable())  # RUF026
+53 | 
+54 | 
+55 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:56:5
@@ -183,16 +174,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=tuple)`
-
-ℹ Unsafe fix
-53 53 | 
-54 54 | 
-55 55 | def func():
-56    |-    defaultdict(default_factory=tuple, member=1)  # RUF026
-   56 |+    defaultdict(tuple, member=1)  # RUF026
-57 57 | 
-58 58 | 
-59 59 | def func():
+53 | 
+54 | 
+55 | def func():
+   -     defaultdict(default_factory=tuple, member=1)  # RUF026
+56 +     defaultdict(tuple, member=1)  # RUF026
+57 | 
+58 | 
+59 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:60:5
@@ -202,16 +192,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=tuple)`
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | 
-59 59 | def func():
-60    |-    defaultdict(member=1, default_factory=tuple)  # RUF026
-   60 |+    defaultdict(tuple, member=1)  # RUF026
-61 61 | 
-62 62 | 
-63 63 | def func():
+57 | 
+58 | 
+59 | def func():
+   -     defaultdict(member=1, default_factory=tuple)  # RUF026
+60 +     defaultdict(tuple, member=1)  # RUF026
+61 | 
+62 | 
+63 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:64:5
@@ -221,16 +210,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `defaultdict(default_factory=tuple)`
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | 
-63 63 | def func():
-64    |-    defaultdict(member=1, default_factory=tuple,)  # RUF026
-   64 |+    defaultdict(tuple, member=1,)  # RUF026
-65 65 | 
-66 66 | 
-67 67 | def func():
+61 | 
+62 | 
+63 | def func():
+   -     defaultdict(member=1, default_factory=tuple,)  # RUF026
+64 +     defaultdict(tuple, member=1,)  # RUF026
+65 | 
+66 | 
+67 | def func():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:68:5
@@ -243,17 +231,16 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    | |_____^
    |
 help: Replace with `defaultdict(default_factory=tuple)`
-
-ℹ Unsafe fix
-66 66 | 
-67 67 | def func():
-68 68 |     defaultdict(
-69    |-        member=1,
-70    |-        default_factory=tuple,
-   69 |+        tuple, member=1,
-71 70 |     )  # RUF026
-72 71 | 
-73 72 | 
+66 | 
+67 | def func():
+68 |     defaultdict(
+   -         member=1,
+   -         default_factory=tuple,
+69 +         tuple, member=1,
+70 |     )  # RUF026
+71 | 
+72 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
   --> RUF026.py:75:5
@@ -266,14 +253,13 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict`
    | |_____^
    |
 help: Replace with `defaultdict(default_factory=tuple)`
-
-ℹ Unsafe fix
-73 73 | 
-74 74 | def func():
-75 75 |     defaultdict(
-76    |-        default_factory=tuple,
-77    |-        member=1,
-   76 |+        tuple, member=1,
-78 77 |     )  # RUF026
-79 78 | 
-80 79 |
+73 | 
+74 | def func():
+75 |     defaultdict(
+   -         default_factory=tuple,
+   -         member=1,
+76 +         tuple, member=1,
+77 |     )  # RUF026
+78 | 
+79 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap
index 755a39d5df..fcac406153 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap
@@ -10,16 +10,15 @@ RUF027 [*] Possible f-string without an `f` prefix
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | "always ignore this: {val}"
-4 4 | 
-5   |-print("but don't ignore this: {val}")  # RUF027
-  5 |+print(f"but don't ignore this: {val}")  # RUF027
-6 6 | 
-7 7 | 
-8 8 | def simple_cases():
+2 | 
+3 | "always ignore this: {val}"
+4 | 
+  - print("but don't ignore this: {val}")  # RUF027
+5 + print(f"but don't ignore this: {val}")  # RUF027
+6 | 
+7 | 
+8 | def simple_cases():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:10:9
@@ -31,16 +30,15 @@ RUF027 [*] Possible f-string without an `f` prefix
 11 |     c = "{a} {b} f'{val}' "  # RUF027
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | def simple_cases():
-9  9  |     a = 4
-10    |-    b = "{a}"  # RUF027
-   10 |+    b = f"{a}"  # RUF027
-11 11 |     c = "{a} {b} f'{val}' "  # RUF027
-12 12 | 
-13 13 | 
+7  | 
+8  | def simple_cases():
+9  |     a = 4
+   -     b = "{a}"  # RUF027
+10 +     b = f"{a}"  # RUF027
+11 |     c = "{a} {b} f'{val}' "  # RUF027
+12 | 
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:11:9
@@ -51,16 +49,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    |         ^^^^^^^^^^^^^^^^^^^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-8  8  | def simple_cases():
-9  9  |     a = 4
-10 10 |     b = "{a}"  # RUF027
-11    |-    c = "{a} {b} f'{val}' "  # RUF027
-   11 |+    c = f"{a} {b} f'{val}' "  # RUF027
-12 12 | 
-13 13 | 
-14 14 | def escaped_string():
+8  | def simple_cases():
+9  |     a = 4
+10 |     b = "{a}"  # RUF027
+   -     c = "{a} {b} f'{val}' "  # RUF027
+11 +     c = f"{a} {b} f'{val}' "  # RUF027
+12 | 
+13 | 
+14 | def escaped_string():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:21:9
@@ -72,16 +69,15 @@ RUF027 [*] Possible f-string without an `f` prefix
 22 |     c = r"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-18 18 | 
-19 19 | def raw_string():
-20 20 |     a = 4
-21    |-    b = r"raw string with formatting: {a}"  # RUF027
-   21 |+    b = fr"raw string with formatting: {a}"  # RUF027
-22 22 |     c = r"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
-23 23 | 
-24 24 | 
+18 | 
+19 | def raw_string():
+20 |     a = 4
+   -     b = r"raw string with formatting: {a}"  # RUF027
+21 +     b = fr"raw string with formatting: {a}"  # RUF027
+22 |     c = r"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:22:9
@@ -92,16 +88,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-19 19 | def raw_string():
-20 20 |     a = 4
-21 21 |     b = r"raw string with formatting: {a}"  # RUF027
-22    |-    c = r"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
-   22 |+    c = fr"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
-23 23 | 
-24 24 | 
-25 25 | def print_name(name: str):
+19 | def raw_string():
+20 |     a = 4
+21 |     b = r"raw string with formatting: {a}"  # RUF027
+   -     c = r"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
+22 +     c = fr"raw string with \backslashes\ and \"escaped quotes\": {a}"  # RUF027
+23 | 
+24 | 
+25 | def print_name(name: str):
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:27:11
@@ -113,16 +108,15 @@ RUF027 [*] Possible f-string without an `f` prefix
 28 |     print("The test value we're using today is {a}")  # RUF027
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | def print_name(name: str):
-26 26 |     a = 4
-27    |-    print("Hello, {name}!")  # RUF027
-   27 |+    print(f"Hello, {name}!")  # RUF027
-28 28 |     print("The test value we're using today is {a}")  # RUF027
-29 29 | 
-30 30 | 
+24 | 
+25 | def print_name(name: str):
+26 |     a = 4
+   -     print("Hello, {name}!")  # RUF027
+27 +     print(f"Hello, {name}!")  # RUF027
+28 |     print("The test value we're using today is {a}")  # RUF027
+29 | 
+30 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:28:11
@@ -133,16 +127,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-25 25 | def print_name(name: str):
-26 26 |     a = 4
-27 27 |     print("Hello, {name}!")  # RUF027
-28    |-    print("The test value we're using today is {a}")  # RUF027
-   28 |+    print(f"The test value we're using today is {a}")  # RUF027
-29 29 | 
-30 30 | 
-31 31 | def nested_funcs():
+25 | def print_name(name: str):
+26 |     a = 4
+27 |     print("Hello, {name}!")  # RUF027
+   -     print("The test value we're using today is {a}")  # RUF027
+28 +     print(f"The test value we're using today is {a}")  # RUF027
+29 | 
+30 | 
+31 | def nested_funcs():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:33:33
@@ -153,16 +146,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    |                                 ^^^^^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | def nested_funcs():
-32 32 |     a = 4
-33    |-    print(do_nothing(do_nothing("{a}")))  # RUF027
-   33 |+    print(do_nothing(do_nothing(f"{a}")))  # RUF027
-34 34 | 
-35 35 | 
-36 36 | def tripled_quoted():
+30 | 
+31 | def nested_funcs():
+32 |     a = 4
+   -     print(do_nothing(do_nothing("{a}")))  # RUF027
+33 +     print(do_nothing(do_nothing(f"{a}")))  # RUF027
+34 | 
+35 | 
+36 | def tripled_quoted():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:39:19
@@ -175,16 +167,15 @@ RUF027 [*] Possible f-string without an `f` prefix
 41 |     multi_line = a = """b { # comment
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-36 36 | def tripled_quoted():
-37 37 |     a = 4
-38 38 |     c = a
-39    |-    single_line = """ {a} """  # RUF027
-   39 |+    single_line = f""" {a} """  # RUF027
-40 40 |     # RUF027
-41 41 |     multi_line = a = """b { # comment
-42 42 |     c}  d
+36 | def tripled_quoted():
+37 |     a = 4
+38 |     c = a
+   -     single_line = """ {a} """  # RUF027
+39 +     single_line = f""" {a} """  # RUF027
+40 |     # RUF027
+41 |     multi_line = a = """b { # comment
+42 |     c}  d
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:41:22
@@ -198,16 +189,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    | |_______^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-38 38 |     c = a
-39 39 |     single_line = """ {a} """  # RUF027
-40 40 |     # RUF027
-41    |-    multi_line = a = """b { # comment
-   41 |+    multi_line = a = f"""b { # comment
-42 42 |     c}  d
-43 43 |     """
-44 44 | 
+38 |     c = a
+39 |     single_line = """ {a} """  # RUF027
+40 |     # RUF027
+   -     multi_line = a = """b { # comment
+41 +     multi_line = a = f"""b { # comment
+42 |     c}  d
+43 |     """
+44 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:49:9
@@ -221,16 +211,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    | |_____^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-46 46 | def single_quoted_multi_line():
-47 47 |     a = 4
-48 48 |     # RUF027
-49    |-    b = " {\
-   49 |+    b = f" {\
-50 50 |     a} \
-51 51 |     "
-52 52 | 
+46 | def single_quoted_multi_line():
+47 |     a = 4
+48 |     # RUF027
+   -     b = " {\
+49 +     b = f" {\
+50 |     a} \
+51 |     "
+52 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:56:9
@@ -242,16 +231,15 @@ RUF027 [*] Possible f-string without an `f` prefix
 57 |     print(f"{a}" "{a}" f"{b}")  # RUF027
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-53 53 | 
-54 54 | def implicit_concat():
-55 55 |     a = 4
-56    |-    b = "{a}" "+" "{b}" r" \\ "  # RUF027 for the first part only
-   56 |+    b = f"{a}" "+" "{b}" r" \\ "  # RUF027 for the first part only
-57 57 |     print(f"{a}" "{a}" f"{b}")  # RUF027
-58 58 | 
-59 59 | 
+53 | 
+54 | def implicit_concat():
+55 |     a = 4
+   -     b = "{a}" "+" "{b}" r" \\ "  # RUF027 for the first part only
+56 +     b = f"{a}" "+" "{b}" r" \\ "  # RUF027 for the first part only
+57 |     print(f"{a}" "{a}" f"{b}")  # RUF027
+58 | 
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:57:18
@@ -262,16 +250,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    |                  ^^^^^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-54 54 | def implicit_concat():
-55 55 |     a = 4
-56 56 |     b = "{a}" "+" "{b}" r" \\ "  # RUF027 for the first part only
-57    |-    print(f"{a}" "{a}" f"{b}")  # RUF027
-   57 |+    print(f"{a}" f"{a}" f"{b}")  # RUF027
-58 58 | 
-59 59 | 
-60 60 | def escaped_chars():
+54 | def implicit_concat():
+55 |     a = 4
+56 |     b = "{a}" "+" "{b}" r" \\ "  # RUF027 for the first part only
+   -     print(f"{a}" "{a}" f"{b}")  # RUF027
+57 +     print(f"{a}" f"{a}" f"{b}")  # RUF027
+58 | 
+59 | 
+60 | def escaped_chars():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:62:9
@@ -282,16 +269,15 @@ RUF027 [*] Possible f-string without an `f` prefix
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | def escaped_chars():
-61 61 |     a = 4
-62    |-    b = "\"not escaped:\" '{a}' \"escaped:\": '{{c}}'"  # RUF027
-   62 |+    b = f"\"not escaped:\" '{a}' \"escaped:\": '{{c}}'"  # RUF027
-63 63 | 
-64 64 | 
-65 65 | def method_calls():
+59 | 
+60 | def escaped_chars():
+61 |     a = 4
+   -     b = "\"not escaped:\" '{a}' \"escaped:\": '{{c}}'"  # RUF027
+62 +     b = f"\"not escaped:\" '{a}' \"escaped:\": '{{c}}'"  # RUF027
+63 | 
+64 | 
+65 | def method_calls():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:70:18
@@ -304,16 +290,15 @@ RUF027 [*] Possible f-string without an `f` prefix
 72 | def format_specifiers():
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-67 67 |     value.method = print_name
-68 68 |     first = "Wendy"
-69 69 |     last = "Appleseed"
-70    |-    value.method("{first} {last}")  # RUF027
-   70 |+    value.method(f"{first} {last}")  # RUF027
-71 71 | 
-72 72 | def format_specifiers():
-73 73 |     a = 4
+67 |     value.method = print_name
+68 |     first = "Wendy"
+69 |     last = "Appleseed"
+   -     value.method("{first} {last}")  # RUF027
+70 +     value.method(f"{first} {last}")  # RUF027
+71 | 
+72 | def format_specifiers():
+73 |     a = 4
+note: This is an unsafe fix and may change runtime behavior
 
 RUF027 [*] Possible f-string without an `f` prefix
   --> RUF027_0.py:74:9
@@ -326,13 +311,12 @@ RUF027 [*] Possible f-string without an `f` prefix
 76 | # fstrings are never correct as type definitions
    |
 help: Add `f` prefix
-
-ℹ Unsafe fix
-71 71 | 
-72 72 | def format_specifiers():
-73 73 |     a = 4
-74    |-    b = "{a:b} {a:^5}"
-   74 |+    b = f"{a:b} {a:^5}"
-75 75 | 
-76 76 | # fstrings are never correct as type definitions
-77 77 | # so we should always skip those
+71 | 
+72 | def format_specifiers():
+73 |     a = 4
+   -     b = "{a:b} {a:^5}"
+74 +     b = f"{a:b} {a:^5}"
+75 | 
+76 | # fstrings are never correct as type definitions
+77 | # so we should always skip those
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap
index 4c37b85d0a..871026607a 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap
@@ -12,14 +12,13 @@ RUF028 [*] This suppression comment is invalid because it cannot be in an expres
 5 |         2,
   |
 help: Remove this comment
-
-ℹ Unsafe fix
-1 1 | def fmt_off_between_lists():
-2 2 |     test_list = [
-3   |-        # fmt: off
-4 3 |         1,
-5 4 |         2,
-6 5 |         3,
+1 | def fmt_off_between_lists():
+2 |     test_list = [
+  -         # fmt: off
+3 |         1,
+4 |         2,
+5 |         3,
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be on its own line
   --> RUF028.py:12:5
@@ -31,15 +30,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be on its own l
 13 |     pass  # fmt: skip
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | # note: the second `fmt: skip`` should be OK
-11 11 | def fmt_skip_on_own_line():
-12    |-    # fmt: skip
-13 12 |     pass  # fmt: skip
-14 13 | 
-15 14 | 
+9  | 
+10 | # note: the second `fmt: skip`` should be OK
+11 | def fmt_skip_on_own_line():
+   -     # fmt: skip
+12 |     pass  # fmt: skip
+13 | 
+14 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be after a decorator
   --> RUF028.py:17:1
@@ -51,15 +49,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be after a deco
 19 | def fmt_off_between_decorators():
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | 
-16 16 | @fmt_skip_on_own_line
-17    |-# fmt: off
-18 17 | @fmt_off_between_lists
-19 18 | def fmt_off_between_decorators():
-20 19 |     pass
+14 | 
+15 | 
+16 | @fmt_skip_on_own_line
+   - # fmt: off
+17 | @fmt_off_between_lists
+18 | def fmt_off_between_decorators():
+19 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be after a decorator
   --> RUF028.py:24:1
@@ -71,15 +68,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be after a deco
 26 |     ...
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | @fmt_off_between_decorators
-24    |-# fmt: off
-25 24 | class FmtOffBetweenClassDecorators:
-26 25 |     ...
-27 26 | 
+21 | 
+22 | 
+23 | @fmt_off_between_decorators
+   - # fmt: off
+24 | class FmtOffBetweenClassDecorators:
+25 |     ...
+26 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be directly above an alternate body
   --> RUF028.py:33:5
@@ -92,15 +88,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be directly abo
 35 |         print("done")
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-30 30 |     x = [1, 2, 3]
-31 31 |     for val in x:
-32 32 |         print(x)
-33    |-    # fmt: off
-34 33 |     else:
-35 34 |         print("done")
-36 35 |     while False:
+30 |     x = [1, 2, 3]
+31 |     for val in x:
+32 |         print(x)
+   -     # fmt: off
+33 |     else:
+34 |         print("done")
+35 |     while False:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be directly above an alternate body
   --> RUF028.py:39:5
@@ -113,15 +108,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be directly abo
 41 |         print("done")
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-36 36 |     while False:
-37 37 |         print("while")
-38 38 |         # fmt: off
-39    |-    # fmt: off
-40 39 |     else:
-41 40 |         print("done")
-42 41 |     if len(x) > 3:
+36 |     while False:
+37 |         print("while")
+38 |         # fmt: off
+   -     # fmt: off
+39 |     else:
+40 |         print("done")
+41 |     if len(x) > 3:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be directly above an alternate body
   --> RUF028.py:45:5
@@ -134,15 +128,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be directly abo
 47 |         print("expected")
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-42 42 |     if len(x) > 3:
-43 43 |         print("huh?")
-44 44 |     # fmt: on
-45    |-    # fmt: off
-46 45 |     else:
-47 46 |         print("expected")
-48 47 | 
+42 |     if len(x) > 3:
+43 |         print("huh?")
+44 |     # fmt: on
+   -     # fmt: off
+45 |     else:
+46 |         print("expected")
+47 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be after a decorator
   --> RUF028.py:52:5
@@ -155,15 +148,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be after a deco
 54 |         # fmt: off
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-49 49 | 
-50 50 | class Test:
-51 51 |     @classmethod
-52    |-    # fmt: off
-53 52 |     def cls_method_a(
-54 53 |         # fmt: off
-55 54 |         cls,
+49 | 
+50 | class Test:
+51 |     @classmethod
+   -     # fmt: off
+52 |     def cls_method_a(
+53 |         # fmt: off
+54 |         cls,
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be in an expression, pattern, argument list, or other non-statement
   --> RUF028.py:54:9
@@ -176,15 +168,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be in an expres
 56 |     ) -> None: # noqa: test # fmt: skip
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-51 51 |     @classmethod
-52 52 |     # fmt: off
-53 53 |     def cls_method_a(
-54    |-        # fmt: off
-55 54 |         cls,
-56 55 |     ) -> None: # noqa: test # fmt: skip
-57 56 |         pass
+51 |     @classmethod
+52 |     # fmt: off
+53 |     def cls_method_a(
+   -         # fmt: off
+54 |         cls,
+55 |     ) -> None: # noqa: test # fmt: skip
+56 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be at the end of a line
   --> RUF028.py:62:13
@@ -196,16 +187,15 @@ RUF028 [*] This suppression comment is invalid because it cannot be at the end o
 63 |     pass # fmt: on
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | def fmt_on_trailing():
-61 61 |     # fmt: off
-62    |-    val = 5 # fmt: on
-   62 |+    val = 5
-63 63 |     pass # fmt: on
-64 64 | 
-65 65 | 
+59 | 
+60 | def fmt_on_trailing():
+61 |     # fmt: off
+   -     val = 5 # fmt: on
+62 +     val = 5
+63 |     pass # fmt: on
+64 | 
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF028 [*] This suppression comment is invalid because it cannot be at the end of a line
   --> RUF028.py:63:10
@@ -216,13 +206,12 @@ RUF028 [*] This suppression comment is invalid because it cannot be at the end o
    |          ^^^^^^^^^
    |
 help: Remove this comment
-
-ℹ Unsafe fix
-60 60 | def fmt_on_trailing():
-61 61 |     # fmt: off
-62 62 |     val = 5 # fmt: on
-63    |-    pass # fmt: on
-   63 |+    pass
-64 64 | 
-65 65 | 
-66 66 | # all of these should be fine
+60 | def fmt_on_trailing():
+61 |     # fmt: off
+62 |     val = 5 # fmt: on
+   -     pass # fmt: on
+63 +     pass
+64 | 
+65 | 
+66 | # all of these should be fine
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap
index 72d4b03736..bb1fc392e9 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap
@@ -12,16 +12,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 8 | # Concatenated string literals
   |
 help: Remove `print`
-
-ℹ Unsafe fix
-3 3 | # Standard Case
-4 4 | # Expects:
-5 5 | # - single StringLiteral
-6   |-assert True, print("This print is not intentional.")
-  6 |+assert True, "This print is not intentional."
-7 7 | 
-8 8 | # Concatenated string literals
-9 9 | # Expects:
+3 | # Standard Case
+4 | # Expects:
+5 | # - single StringLiteral
+  - assert True, print("This print is not intentional.")
+6 + assert True, "This print is not intentional."
+7 | 
+8 | # Concatenated string literals
+9 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:11:14
@@ -34,16 +33,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 13 | # Positional arguments, string literals
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-8  8  | # Concatenated string literals
-9  9  | # Expects:
-10 10 | # - single StringLiteral
-11    |-assert True, print("This print" " is not intentional.")
-   11 |+assert True, "This print is not intentional."
-12 12 | 
-13 13 | # Positional arguments, string literals
-14 14 | # Expects:
+8  | # Concatenated string literals
+9  | # Expects:
+10 | # - single StringLiteral
+   - assert True, print("This print" " is not intentional.")
+11 + assert True, "This print is not intentional."
+12 | 
+13 | # Positional arguments, string literals
+14 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:16:14
@@ -56,16 +54,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 18 | # Concatenated string literals combined with Positional arguments
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-13 13 | # Positional arguments, string literals
-14 14 | # Expects:
-15 15 | # - single StringLiteral concatenated with " "
-16    |-assert True, print("This print", "is not intentional")
-   16 |+assert True, "This print is not intentional"
-17 17 | 
-18 18 | # Concatenated string literals combined with Positional arguments
-19 19 | # Expects:
+13 | # Positional arguments, string literals
+14 | # Expects:
+15 | # - single StringLiteral concatenated with " "
+   - assert True, print("This print", "is not intentional")
+16 + assert True, "This print is not intentional"
+17 | 
+18 | # Concatenated string literals combined with Positional arguments
+19 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:21:14
@@ -78,16 +75,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 23 | # Positional arguments, string literals with a variable
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-18 18 | # Concatenated string literals combined with Positional arguments
-19 19 | # Expects:
-20 20 | # - single stringliteral concatenated with " " only between `print` and `is`
-21    |-assert True, print("This " "print", "is not intentional.")
-   21 |+assert True, "This print is not intentional."
-22 22 | 
-23 23 | # Positional arguments, string literals with a variable
-24 24 | # Expects:
+18 | # Concatenated string literals combined with Positional arguments
+19 | # Expects:
+20 | # - single stringliteral concatenated with " " only between `print` and `is`
+   - assert True, print("This " "print", "is not intentional.")
+21 + assert True, "This print is not intentional."
+22 | 
+23 | # Positional arguments, string literals with a variable
+24 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:26:14
@@ -100,16 +96,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 28 | # Mixed brackets string literals
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-23 23 | # Positional arguments, string literals with a variable
-24 24 | # Expects:
-25 25 | # - single FString concatenated with " "
-26    |-assert True, print("This", print.__name__, "is not intentional.")
-   26 |+assert True, f"This {print.__name__} is not intentional."
-27 27 | 
-28 28 | # Mixed brackets string literals
-29 29 | # Expects:
+23 | # Positional arguments, string literals with a variable
+24 | # Expects:
+25 | # - single FString concatenated with " "
+   - assert True, print("This", print.__name__, "is not intentional.")
+26 + assert True, f"This {print.__name__} is not intentional."
+27 | 
+28 | # Mixed brackets string literals
+29 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:31:14
@@ -122,16 +117,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 33 | # Mixed brackets with other brackets inside
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-28 28 | # Mixed brackets string literals
-29 29 | # Expects:
-30 30 | # - single StringLiteral concatenated with " "
-31    |-assert True, print("This print", 'is not intentional', """and should be removed""")
-   31 |+assert True, "This print is not intentional and should be removed"
-32 32 | 
-33 33 | # Mixed brackets with other brackets inside
-34 34 | # Expects:
+28 | # Mixed brackets string literals
+29 | # Expects:
+30 | # - single StringLiteral concatenated with " "
+   - assert True, print("This print", 'is not intentional', """and should be removed""")
+31 + assert True, "This print is not intentional and should be removed"
+32 | 
+33 | # Mixed brackets with other brackets inside
+34 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:36:14
@@ -144,16 +138,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 38 | # Positional arguments, string literals with a separator
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-33 33 | # Mixed brackets with other brackets inside
-34 34 | # Expects:
-35 35 | # - single StringLiteral concatenated with " " and escaped brackets
-36    |-assert True, print("This print", 'is not "intentional"', """and "should" be 'removed'""")
-   36 |+assert True, "This print is not \"intentional\" and \"should\" be 'removed'"
-37 37 | 
-38 38 | # Positional arguments, string literals with a separator
-39 39 | # Expects:
+33 | # Mixed brackets with other brackets inside
+34 | # Expects:
+35 | # - single StringLiteral concatenated with " " and escaped brackets
+   - assert True, print("This print", 'is not "intentional"', """and "should" be 'removed'""")
+36 + assert True, "This print is not \"intentional\" and \"should\" be 'removed'"
+37 | 
+38 | # Positional arguments, string literals with a separator
+39 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:41:14
@@ -166,16 +159,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 43 | # Positional arguments, string literals with None as separator
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-38 38 | # Positional arguments, string literals with a separator
-39 39 | # Expects:
-40 40 | # - single StringLiteral concatenated with "|"
-41    |-assert True, print("This print", "is not intentional", sep="|")
-   41 |+assert True, "This print|is not intentional"
-42 42 | 
-43 43 | # Positional arguments, string literals with None as separator
-44 44 | # Expects:
+38 | # Positional arguments, string literals with a separator
+39 | # Expects:
+40 | # - single StringLiteral concatenated with "|"
+   - assert True, print("This print", "is not intentional", sep="|")
+41 + assert True, "This print|is not intentional"
+42 | 
+43 | # Positional arguments, string literals with None as separator
+44 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:46:14
@@ -188,16 +180,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 48 | # Positional arguments, string literals with variable as separator, needs f-string
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-43 43 | # Positional arguments, string literals with None as separator
-44 44 | # Expects:
-45 45 | # - single StringLiteral concatenated with " "
-46    |-assert True, print("This print", "is not intentional", sep=None)
-   46 |+assert True, "This print is not intentional"
-47 47 | 
-48 48 | # Positional arguments, string literals with variable as separator, needs f-string
-49 49 | # Expects:
+43 | # Positional arguments, string literals with None as separator
+44 | # Expects:
+45 | # - single StringLiteral concatenated with " "
+   - assert True, print("This print", "is not intentional", sep=None)
+46 + assert True, "This print is not intentional"
+47 | 
+48 | # Positional arguments, string literals with variable as separator, needs f-string
+49 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:51:14
@@ -210,16 +201,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 53 | # Unnecessary f-string
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-48 48 | # Positional arguments, string literals with variable as separator, needs f-string
-49 49 | # Expects:
-50 50 | # - single FString concatenated with "{U00A0}"
-51    |-assert True, print("This print", "is not intentional", sep=U00A0)
-   51 |+assert True, f"This print{U00A0}is not intentional"
-52 52 | 
-53 53 | # Unnecessary f-string
-54 54 | # Expects:
+48 | # Positional arguments, string literals with variable as separator, needs f-string
+49 | # Expects:
+50 | # - single FString concatenated with "{U00A0}"
+   - assert True, print("This print", "is not intentional", sep=U00A0)
+51 + assert True, f"This print{U00A0}is not intentional"
+52 | 
+53 | # Unnecessary f-string
+54 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:56:14
@@ -232,16 +222,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 58 | # Positional arguments, string literals and f-strings
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-53 53 | # Unnecessary f-string
-54 54 | # Expects:
-55 55 | # - single StringLiteral
-56    |-assert True, print(f"This f-string is just a literal.")
-   56 |+assert True, "This f-string is just a literal."
-57 57 | 
-58 58 | # Positional arguments, string literals and f-strings
-59 59 | # Expects:
+53 | # Unnecessary f-string
+54 | # Expects:
+55 | # - single StringLiteral
+   - assert True, print(f"This f-string is just a literal.")
+56 + assert True, "This f-string is just a literal."
+57 | 
+58 | # Positional arguments, string literals and f-strings
+59 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:61:14
@@ -254,16 +243,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 63 | # Positional arguments, string literals and f-strings with a separator
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-58 58 | # Positional arguments, string literals and f-strings
-59 59 | # Expects:
-60 60 | # - single FString concatenated with " "
-61    |-assert True, print("This print", f"is not {'intentional':s}")
-   61 |+assert True, f"This print is not {'intentional':s}"
-62 62 | 
-63 63 | # Positional arguments, string literals and f-strings with a separator
-64 64 | # Expects:
+58 | # Positional arguments, string literals and f-strings
+59 | # Expects:
+60 | # - single FString concatenated with " "
+   - assert True, print("This print", f"is not {'intentional':s}")
+61 + assert True, f"This print is not {'intentional':s}"
+62 | 
+63 | # Positional arguments, string literals and f-strings with a separator
+64 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:66:14
@@ -276,16 +264,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 68 | # A single f-string
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-63 63 | # Positional arguments, string literals and f-strings with a separator
-64 64 | # Expects:
-65 65 | # - single FString concatenated with "|"
-66    |-assert True, print("This print", f"is not {'intentional':s}", sep="|")
-   66 |+assert True, f"This print|is not {'intentional':s}"
-67 67 | 
-68 68 | # A single f-string
-69 69 | # Expects:
+63 | # Positional arguments, string literals and f-strings with a separator
+64 | # Expects:
+65 | # - single FString concatenated with "|"
+   - assert True, print("This print", f"is not {'intentional':s}", sep="|")
+66 + assert True, f"This print|is not {'intentional':s}"
+67 | 
+68 | # A single f-string
+69 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:71:14
@@ -298,16 +285,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 73 | # A single f-string with a redundant separator
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-68 68 | # A single f-string
-69 69 | # Expects:
-70 70 | # - single FString
-71    |-assert True, print(f"This print is not {'intentional':s}")
-   71 |+assert True, f"This print is not {'intentional':s}"
-72 72 | 
-73 73 | # A single f-string with a redundant separator
-74 74 | # Expects:
+68 | # A single f-string
+69 | # Expects:
+70 | # - single FString
+   - assert True, print(f"This print is not {'intentional':s}")
+71 + assert True, f"This print is not {'intentional':s}"
+72 | 
+73 | # A single f-string with a redundant separator
+74 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:76:14
@@ -320,16 +306,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 78 | # Complex f-string with variable as separator
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-73 73 | # A single f-string with a redundant separator
-74 74 | # Expects:
-75 75 | # - single FString
-76    |-assert True, print(f"This print is not {'intentional':s}", sep="|")
-   76 |+assert True, f"This print is not {'intentional':s}"
-77 77 | 
-78 78 | # Complex f-string with variable as separator
-79 79 | # Expects:
+73 | # A single f-string with a redundant separator
+74 | # Expects:
+75 | # - single FString
+   - assert True, print(f"This print is not {'intentional':s}", sep="|")
+76 + assert True, f"This print is not {'intentional':s}"
+77 | 
+78 | # Complex f-string with variable as separator
+79 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:83:14
@@ -342,16 +327,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 85 | # Empty print
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-80 80 | # - single FString concatenated with "{U00A0}", all placeholders preserved
-81 81 | condition = "True is True"
-82 82 | maintainer = "John Doe"
-83    |-assert True, print("Unreachable due to", condition, f", ask {maintainer} for advice", sep=U00A0)
-   83 |+assert True, f"Unreachable due to{U00A0}{condition}{U00A0}, ask {maintainer} for advice"
-84 84 | 
-85 85 | # Empty print
-86 86 | # Expects:
+80 | # - single FString concatenated with "{U00A0}", all placeholders preserved
+81 | condition = "True is True"
+82 | maintainer = "John Doe"
+   - assert True, print("Unreachable due to", condition, f", ask {maintainer} for advice", sep=U00A0)
+83 + assert True, f"Unreachable due to{U00A0}{condition}{U00A0}, ask {maintainer} for advice"
+84 | 
+85 | # Empty print
+86 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:88:14
@@ -364,16 +348,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 90 | # Empty print with separator
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-85 85 | # Empty print
-86 86 | # Expects:
-87 87 | # - `msg` entirely removed from assertion
-88    |-assert True, print()
-   88 |+assert True
-89 89 | 
-90 90 | # Empty print with separator
-91 91 | # Expects:
+85 | # Empty print
+86 | # Expects:
+87 | # - `msg` entirely removed from assertion
+   - assert True, print()
+88 + assert True
+89 | 
+90 | # Empty print with separator
+91 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
   --> RUF030.py:93:14
@@ -386,16 +369,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
 95 | # Custom print function that actually returns a string
    |
 help: Remove `print`
-
-ℹ Unsafe fix
-90 90 | # Empty print with separator
-91 91 | # Expects:
-92 92 | # - `msg` entirely removed from assertion
-93    |-assert True, print(sep=" ")
-   93 |+assert True
-94 94 | 
-95 95 | # Custom print function that actually returns a string
-96 96 | # Expects:
+90 | # Empty print with separator
+91 | # Expects:
+92 | # - `msg` entirely removed from assertion
+   - assert True, print(sep=" ")
+93 + assert True
+94 | 
+95 | # Custom print function that actually returns a string
+96 | # Expects:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF030 [*] `print()` call in `assert` statement is likely unintentional
    --> RUF030.py:108:14
@@ -406,10 +388,9 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Remove `print`
-
-ℹ Unsafe fix
-105 105 | # Use of `builtins.print`
-106 106 | # Expects:
-107 107 | # - single StringLiteral
-108     |-assert True, builtins.print("This print should be removed.")
-    108 |+assert True, "This print should be removed."
+105 | # Use of `builtins.print`
+106 | # Expects:
+107 | # - single StringLiteral
+    - assert True, builtins.print("This print should be removed.")
+108 + assert True, "This print should be removed."
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap
index 95d2710e2c..6801d5bf38 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap
@@ -11,14 +11,12 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 4 |     1,
   |
 help: Remove parentheses
-
-ℹ Safe fix
-1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
-2   |-d[(1,2)]
-  2 |+d[1,2]
-3 3 | d[(
-4 4 |     1,
-5 5 |     2
+1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
+  - d[(1,2)]
+2 + d[1,2]
+3 | d[(
+4 |     1,
+5 |     2
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
  --> RUF031.py:3:3
@@ -35,19 +33,17 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 8 |       1,
   |
 help: Remove parentheses
-
-ℹ Safe fix
-1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
-2 2 | d[(1,2)]
-3   |-d[(
-  3 |+d[
-4 4 |     1,
-5 5 |     2
-6   |-)]
-  6 |+]
-7 7 | d[
-8 8 |     1,
-9 9 |     2
+1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
+2 | d[(1,2)]
+  - d[(
+3 + d[
+4 |     1,
+5 |     2
+  - )]
+6 + ]
+7 | d[
+8 |     1,
+9 |     2
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:11:3
@@ -60,16 +56,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 13 | d[(8,)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-8  8  |     1,
-9  9  |     2
-10 10 | ]
-11    |-d[(2,4)]
-   11 |+d[2,4]
-12 12 | d[(5,6,7)]
-13 13 | d[(8,)]
-14 14 | d[tuple(1,2)]
+8  |     1,
+9  |     2
+10 | ]
+   - d[(2,4)]
+11 + d[2,4]
+12 | d[(5,6,7)]
+13 | d[(8,)]
+14 | d[tuple(1,2)]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:12:3
@@ -82,16 +76,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 14 | d[tuple(1,2)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-9  9  |     2
-10 10 | ]
-11 11 | d[(2,4)]
-12    |-d[(5,6,7)]
-   12 |+d[5,6,7]
-13 13 | d[(8,)]
-14 14 | d[tuple(1,2)]
-15 15 | d[tuple(8)]
+9  |     2
+10 | ]
+11 | d[(2,4)]
+   - d[(5,6,7)]
+12 + d[5,6,7]
+13 | d[(8,)]
+14 | d[tuple(1,2)]
+15 | d[tuple(8)]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:13:3
@@ -104,16 +96,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 15 | d[tuple(8)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-10 10 | ]
-11 11 | d[(2,4)]
-12 12 | d[(5,6,7)]
-13    |-d[(8,)]
-   13 |+d[8,]
-14 14 | d[tuple(1,2)]
-15 15 | d[tuple(8)]
-16 16 | d[1,2]
+10 | ]
+11 | d[(2,4)]
+12 | d[(5,6,7)]
+   - d[(8,)]
+13 + d[8,]
+14 | d[tuple(1,2)]
+15 | d[tuple(8)]
+16 | d[1,2]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:20:3
@@ -125,17 +115,15 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 21 | e[(1,2),(3,4)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-17 17 | d[3,4]
-18 18 | d[5,6,7]
-19 19 | e = {((1,2),(3,4)):"a"}
-20    |-e[((1,2),(3,4))]
-21 20 | e[(1,2),(3,4)]
-   21 |+e[(1,2),(3,4)]
-22 22 | 
-23 23 | token_features[
-24 24 |     (window_position, feature_name)
+17 | d[3,4]
+18 | d[5,6,7]
+19 | e = {((1,2),(3,4)):"a"}
+   - e[((1,2),(3,4))]
+20 | e[(1,2),(3,4)]
+21 + e[(1,2),(3,4)]
+22 | 
+23 | token_features[
+24 |     (window_position, feature_name)
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:24:5
@@ -146,16 +134,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 25 | ] = self._extract_raw_features_from_token
    |
 help: Remove parentheses
-
-ℹ Safe fix
-21 21 | e[(1,2),(3,4)]
-22 22 | 
-23 23 | token_features[
-24    |-    (window_position, feature_name)
-   24 |+    window_position, feature_name
-25 25 | ] = self._extract_raw_features_from_token
-26 26 | 
-27 27 | d[1,]
+21 | e[(1,2),(3,4)]
+22 | 
+23 | token_features[
+   -     (window_position, feature_name)
+24 +     window_position, feature_name
+25 | ] = self._extract_raw_features_from_token
+26 | 
+27 | d[1,]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:28:3
@@ -167,16 +153,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 30 | d[:,] # slices in the subscript lead to syntax error if parens are added
    |
 help: Remove parentheses
-
-ℹ Safe fix
-25 25 | ] = self._extract_raw_features_from_token
-26 26 | 
-27 27 | d[1,]
-28    |-d[(1,)]
-   28 |+d[1,]
-29 29 | d[()] # empty tuples should be ignored
-30 30 | d[:,] # slices in the subscript lead to syntax error if parens are added
-31 31 | d[1,2,:]
+25 | ] = self._extract_raw_features_from_token
+26 | 
+27 | d[1,]
+   - d[(1,)]
+28 + d[1,]
+29 | d[()] # empty tuples should be ignored
+30 | d[:,] # slices in the subscript lead to syntax error if parens are added
+31 | d[1,2,:]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:36:3
@@ -189,13 +173,11 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 38 | x: dict[str, int]  # tuples inside type annotations should never be altered
    |
 help: Remove parentheses
-
-ℹ Safe fix
-33 33 | # Should keep these parentheses in
-34 34 | # Python <=3.10 to avoid syntax error.
-35 35 | # https://github.com/astral-sh/ruff/issues/12776
-36    |-d[(*foo,bar)]
-   36 |+d[*foo,bar]
-37 37 | 
-38 38 | x: dict[str, int]  # tuples inside type annotations should never be altered
-39 39 |
+33 | # Should keep these parentheses in
+34 | # Python <=3.10 to avoid syntax error.
+35 | # https://github.com/astral-sh/ruff/issues/12776
+   - d[(*foo,bar)]
+36 + d[*foo,bar]
+37 | 
+38 | x: dict[str, int]  # tuples inside type annotations should never be altered
+39 |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap
index 03c1b8af41..f28d3d9702 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap
@@ -12,16 +12,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 8 | decimal.Decimal("0.0")
   |
 help: Replace with string literal
-
-ℹ Unsafe fix
-3 3 | # Tests with fully qualified import
-4 4 | decimal.Decimal(0)
-5 5 | 
-6   |-decimal.Decimal(0.0)  # Should error
-  6 |+decimal.Decimal("0.0")  # Should error
-7 7 | 
-8 8 | decimal.Decimal("0.0")
-9 9 | 
+3 | # Tests with fully qualified import
+4 | decimal.Decimal(0)
+5 | 
+  - decimal.Decimal(0.0)  # Should error
+6 + decimal.Decimal("0.0")  # Should error
+7 | 
+8 | decimal.Decimal("0.0")
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:12:17
@@ -34,16 +33,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 14 | decimal.Decimal("10.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | decimal.Decimal(10)
-11 11 | 
-12    |-decimal.Decimal(10.0)  # Should error
-   12 |+decimal.Decimal("10.0")  # Should error
-13 13 | 
-14 14 | decimal.Decimal("10.0")
-15 15 | 
+9  | 
+10 | decimal.Decimal(10)
+11 | 
+   - decimal.Decimal(10.0)  # Should error
+12 + decimal.Decimal("10.0")  # Should error
+13 | 
+14 | decimal.Decimal("10.0")
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:18:17
@@ -56,16 +54,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 20 | decimal.Decimal("-10.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-15 15 | 
-16 16 | decimal.Decimal(-10)
-17 17 | 
-18    |-decimal.Decimal(-10.0)  # Should error
-   18 |+decimal.Decimal("-10.0")  # Should error
-19 19 | 
-20 20 | decimal.Decimal("-10.0")
-21 21 | 
+15 | 
+16 | decimal.Decimal(-10)
+17 | 
+   - decimal.Decimal(-10.0)  # Should error
+18 + decimal.Decimal("-10.0")  # Should error
+19 | 
+20 | decimal.Decimal("-10.0")
+21 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:33:15
@@ -78,16 +75,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 35 | val = Decimal("0.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-30 30 | 
-31 31 | val = Decimal(0)
-32 32 | 
-33    |-val = Decimal(0.0)  # Should error
-   33 |+val = Decimal("0.0")  # Should error
-34 34 | 
-35 35 | val = Decimal("0.0")
-36 36 | 
+30 | 
+31 | val = Decimal(0)
+32 | 
+   - val = Decimal(0.0)  # Should error
+33 + val = Decimal("0.0")  # Should error
+34 | 
+35 | val = Decimal("0.0")
+36 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:39:15
@@ -100,16 +96,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 41 | val = Decimal("10.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-36 36 | 
-37 37 | val = Decimal(10)
-38 38 | 
-39    |-val = Decimal(10.0)  # Should error
-   39 |+val = Decimal("10.0")  # Should error
-40 40 | 
-41 41 | val = Decimal("10.0")
-42 42 | 
+36 | 
+37 | val = Decimal(10)
+38 | 
+   - val = Decimal(10.0)  # Should error
+39 + val = Decimal("10.0")  # Should error
+40 | 
+41 | val = Decimal("10.0")
+42 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:45:15
@@ -122,16 +117,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 47 | val = Decimal("-10.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-42 42 | 
-43 43 | val = Decimal(-10)
-44 44 | 
-45    |-val = Decimal(-10.0)  # Should error
-   45 |+val = Decimal("-10.0")  # Should error
-46 46 | 
-47 47 | val = Decimal("-10.0")
-48 48 | 
+42 | 
+43 | val = Decimal(-10)
+44 | 
+   - val = Decimal(-10.0)  # Should error
+45 + val = Decimal("-10.0")  # Should error
+46 | 
+47 | val = Decimal("-10.0")
+48 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:56:15
@@ -144,16 +138,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 58 | val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` 
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-53 53 | # See https://github.com/astral-sh/ruff/issues/13258
-54 54 | val = Decimal(~4.0) # Skip
-55 55 | 
-56    |-val = Decimal(++4.0) # Suggest `Decimal("4.0")`
-   56 |+val = Decimal("4.0") # Suggest `Decimal("4.0")`
-57 57 | 
-58 58 | val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` 
-59 59 | 
+53 | # See https://github.com/astral-sh/ruff/issues/13258
+54 | val = Decimal(~4.0) # Skip
+55 | 
+   - val = Decimal(++4.0) # Suggest `Decimal("4.0")`
+56 + val = Decimal("4.0") # Suggest `Decimal("4.0")`
+57 | 
+58 | val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` 
+59 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:58:15
@@ -164,16 +157,15 @@ RUF032 [*] `Decimal()` called with float literal argument
    |               ^^^^^^^^^^^
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-55 55 | 
-56 56 | val = Decimal(++4.0) # Suggest `Decimal("4.0")`
-57 57 | 
-58    |-val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` 
-   58 |+val = Decimal("-4.0") # Suggest `Decimal("-4.0")` 
-59 59 | 
-60 60 | 
-61 61 | # Tests with shadowed name
+55 | 
+56 | val = Decimal(++4.0) # Suggest `Decimal("4.0")`
+57 | 
+   - val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` 
+58 + val = Decimal("-4.0") # Suggest `Decimal("-4.0")` 
+59 | 
+60 | 
+61 | # Tests with shadowed name
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:88:23
@@ -186,16 +178,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 90 | val = decimal.Decimal("0.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-85 85 | 
-86 86 | # Retest with fully qualified import
-87 87 | 
-88    |-val = decimal.Decimal(0.0)  # Should error
-   88 |+val = decimal.Decimal("0.0")  # Should error
-89 89 | 
-90 90 | val = decimal.Decimal("0.0")
-91 91 | 
+85 | 
+86 | # Retest with fully qualified import
+87 | 
+   - val = decimal.Decimal(0.0)  # Should error
+88 + val = decimal.Decimal("0.0")  # Should error
+89 | 
+90 | val = decimal.Decimal("0.0")
+91 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:92:23
@@ -208,16 +199,15 @@ RUF032 [*] `Decimal()` called with float literal argument
 94 | val = decimal.Decimal("10.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-89 89 | 
-90 90 | val = decimal.Decimal("0.0")
-91 91 | 
-92    |-val = decimal.Decimal(10.0)  # Should error
-   92 |+val = decimal.Decimal("10.0")  # Should error
-93 93 | 
-94 94 | val = decimal.Decimal("10.0")
-95 95 | 
+89 | 
+90 | val = decimal.Decimal("0.0")
+91 | 
+   - val = decimal.Decimal(10.0)  # Should error
+92 + val = decimal.Decimal("10.0")  # Should error
+93 | 
+94 | val = decimal.Decimal("10.0")
+95 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF032 [*] `Decimal()` called with float literal argument
   --> RUF032.py:96:23
@@ -230,13 +220,12 @@ RUF032 [*] `Decimal()` called with float literal argument
 98 | val = decimal.Decimal("-10.0")
    |
 help: Replace with string literal
-
-ℹ Unsafe fix
-93 93 | 
-94 94 | val = decimal.Decimal("10.0")
-95 95 | 
-96    |-val = decimal.Decimal(-10.0)  # Should error
-   96 |+val = decimal.Decimal("-10.0")  # Should error
-97 97 | 
-98 98 | val = decimal.Decimal("-10.0")
-99 99 |
+93 | 
+94 | val = decimal.Decimal("10.0")
+95 | 
+   - val = decimal.Decimal(-10.0)  # Should error
+96 + val = decimal.Decimal("-10.0")  # Should error
+97 | 
+98 | val = decimal.Decimal("-10.0")
+99 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap
index f73734afe8..a0b00883ab 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap
@@ -30,17 +30,16 @@ RUF033 [*] `__post_init__` method with argument defaults
    |                                   ^^
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-22 22 | # RUF033
-23 23 | @dataclass
-24 24 | class Foo:
-25    |-    def __post_init__(self, bar = 11, baz = 11) -> None: ...
-   25 |+    bar: InitVar = 11
-   26 |+    def __post_init__(self, bar, baz = 11) -> None: ...
-26 27 | 
-27 28 | 
-28 29 | # OK
+22 | # RUF033
+23 | @dataclass
+24 | class Foo:
+   -     def __post_init__(self, bar = 11, baz = 11) -> None: ...
+25 +     bar: InitVar = 11
+26 +     def __post_init__(self, bar, baz = 11) -> None: ...
+27 | 
+28 | 
+29 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:25:45
@@ -51,17 +50,16 @@ RUF033 [*] `__post_init__` method with argument defaults
    |                                             ^^
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-22 22 | # RUF033
-23 23 | @dataclass
-24 24 | class Foo:
-25    |-    def __post_init__(self, bar = 11, baz = 11) -> None: ...
-   25 |+    baz: InitVar = 11
-   26 |+    def __post_init__(self, bar = 11, baz) -> None: ...
-26 27 | 
-27 28 | 
-28 29 | # OK
+22 | # RUF033
+23 | @dataclass
+24 | class Foo:
+   -     def __post_init__(self, bar = 11, baz = 11) -> None: ...
+25 +     baz: InitVar = 11
+26 +     def __post_init__(self, bar = 11, baz) -> None: ...
+27 | 
+28 | 
+29 | # OK
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:46:40
@@ -72,17 +70,16 @@ RUF033 [*] `__post_init__` method with argument defaults
    |                                        ^^
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-43 43 | # RUF033
-44 44 | @dataclass
-45 45 | class Foo:
-46    |-    def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ...
-   46 |+    bar: InitVar[int] = 11
-   47 |+    def __post_init__(self, bar: int, baz: Something[Whatever | None] = 11) -> None: ...
-47 48 | 
-48 49 | 
-49 50 | # RUF033
+43 | # RUF033
+44 | @dataclass
+45 | class Foo:
+   -     def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ...
+46 +     bar: InitVar[int] = 11
+47 +     def __post_init__(self, bar: int, baz: Something[Whatever | None] = 11) -> None: ...
+48 | 
+49 | 
+50 | # RUF033
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:46:78
@@ -93,17 +90,16 @@ RUF033 [*] `__post_init__` method with argument defaults
    |                                                                              ^^
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-43 43 | # RUF033
-44 44 | @dataclass
-45 45 | class Foo:
-46    |-    def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ...
-   46 |+    baz: InitVar[Something[Whatever | None]] = 11
-   47 |+    def __post_init__(self, bar: int = 11, baz: Something[Whatever | None]) -> None: ...
-47 48 | 
-48 49 | 
-49 50 | # RUF033
+43 | # RUF033
+44 | @dataclass
+45 | class Foo:
+   -     def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ...
+46 +     baz: InitVar[Something[Whatever | None]] = 11
+47 +     def __post_init__(self, bar: int = 11, baz: Something[Whatever | None]) -> None: ...
+48 | 
+49 | 
+50 | # RUF033
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:59:40
@@ -114,17 +110,16 @@ RUF033 [*] `__post_init__` method with argument defaults
    |                                        ^^
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-56 56 | 
-57 57 |     ping = "pong"
-58 58 | 
-59    |-    def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ...
-   59 |+    bar: InitVar[int] = 11
-   60 |+    def __post_init__(self, bar: int, baz: int = 12) -> None: ...
-60 61 | 
-61 62 | 
-62 63 | # RUF033
+56 | 
+57 |     ping = "pong"
+58 | 
+   -     def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ...
+59 +     bar: InitVar[int] = 11
+60 +     def __post_init__(self, bar: int, baz: int = 12) -> None: ...
+61 | 
+62 | 
+63 | # RUF033
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:59:55
@@ -135,17 +130,16 @@ RUF033 [*] `__post_init__` method with argument defaults
    |                                                       ^^
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-56 56 | 
-57 57 |     ping = "pong"
-58 58 | 
-59    |-    def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ...
-   59 |+    baz: InitVar[int] = 12
-   60 |+    def __post_init__(self, bar: int = 11, baz: int) -> None: ...
-60 61 | 
-61 62 | 
-62 63 | # RUF033
+56 | 
+57 |     ping = "pong"
+58 | 
+   -     def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ...
+59 +     baz: InitVar[int] = 12
+60 +     def __post_init__(self, bar: int = 11, baz: int) -> None: ...
+61 | 
+62 | 
+63 | # RUF033
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 `__post_init__` method with argument defaults
   --> RUF033.py:67:40
@@ -177,17 +171,16 @@ RUF033 [*] `__post_init__` method with argument defaults
 74 |         pass
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-70 70 | # https://github.com/astral-sh/ruff/issues/18950
-71 71 | @dataclass
-72 72 | class Foo:
-73    |-    def __post_init__(self, bar: int = (x := 1)) -> None:
-   73 |+    bar: InitVar[int] = (x := 1)
-   74 |+    def __post_init__(self, bar: int) -> None:
-74 75 |         pass
-75 76 | 
-76 77 | 
+70 | # https://github.com/astral-sh/ruff/issues/18950
+71 | @dataclass
+72 | class Foo:
+   -     def __post_init__(self, bar: int = (x := 1)) -> None:
+73 +     bar: InitVar[int] = (x := 1)
+74 +     def __post_init__(self, bar: int) -> None:
+75 |         pass
+76 | 
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:81:21
@@ -200,19 +193,18 @@ RUF033 [*] `__post_init__` method with argument defaults
 83 |         baz: int = (y := 2),  # comment
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | @dataclass
-78 78 | class Foo:
-   79 |+    bar: InitVar[int] = (x := 1)
-79 80 |     def __post_init__(
-80 81 |         self,
-81    |-        bar: int = (x := 1)  #  comment
-   82 |+        bar: int  #  comment
-82 83 |         ,
-83 84 |         baz: int = (y := 2),  # comment
-84 85 |         foo = (a := 1)  #  comment
+76 | 
+77 | @dataclass
+78 | class Foo:
+79 +     bar: InitVar[int] = (x := 1)
+80 |     def __post_init__(
+81 |         self,
+   -         bar: int = (x := 1)  #  comment
+82 +         bar: int  #  comment
+83 |         ,
+84 |         baz: int = (y := 2),  # comment
+85 |         foo = (a := 1)  #  comment
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:83:21
@@ -225,21 +217,20 @@ RUF033 [*] `__post_init__` method with argument defaults
 85 |         ,
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | @dataclass
-78 78 | class Foo:
-   79 |+    baz: InitVar[int] = (y := 2)
-79 80 |     def __post_init__(
-80 81 |         self,
-81 82 |         bar: int = (x := 1)  #  comment
-82 83 |         ,
-83    |-        baz: int = (y := 2),  # comment
-   84 |+        baz: int,  # comment
-84 85 |         foo = (a := 1)  #  comment
-85 86 |         ,
-86 87 |         faz = (b := 2),  # comment
+76 | 
+77 | @dataclass
+78 | class Foo:
+79 +     baz: InitVar[int] = (y := 2)
+80 |     def __post_init__(
+81 |         self,
+82 |         bar: int = (x := 1)  #  comment
+83 |         ,
+   -         baz: int = (y := 2),  # comment
+84 +         baz: int,  # comment
+85 |         foo = (a := 1)  #  comment
+86 |         ,
+87 |         faz = (b := 2),  # comment
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:84:16
@@ -252,22 +243,21 @@ RUF033 [*] `__post_init__` method with argument defaults
 86 |         faz = (b := 2),  # comment
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | @dataclass
-78 78 | class Foo:
-   79 |+    foo: InitVar = (a := 1)
-79 80 |     def __post_init__(
-80 81 |         self,
-81 82 |         bar: int = (x := 1)  #  comment
-82 83 |         ,
-83 84 |         baz: int = (y := 2),  # comment
-84    |-        foo = (a := 1)  #  comment
-   85 |+        foo  #  comment
-85 86 |         ,
-86 87 |         faz = (b := 2),  # comment
-87 88 |     ) -> None:
+76 | 
+77 | @dataclass
+78 | class Foo:
+79 +     foo: InitVar = (a := 1)
+80 |     def __post_init__(
+81 |         self,
+82 |         bar: int = (x := 1)  #  comment
+83 |         ,
+84 |         baz: int = (y := 2),  # comment
+   -         foo = (a := 1)  #  comment
+85 +         foo  #  comment
+86 |         ,
+87 |         faz = (b := 2),  # comment
+88 |     ) -> None:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:86:16
@@ -280,24 +270,23 @@ RUF033 [*] `__post_init__` method with argument defaults
 88 |         pass
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | @dataclass
-78 78 | class Foo:
-   79 |+    faz: InitVar = (b := 2)
-79 80 |     def __post_init__(
-80 81 |         self,
-81 82 |         bar: int = (x := 1)  #  comment
+76 | 
+77 | @dataclass
+78 | class Foo:
+79 +     faz: InitVar = (b := 2)
+80 |     def __post_init__(
+81 |         self,
+82 |         bar: int = (x := 1)  #  comment
 --------------------------------------------------------------------------------
-83 84 |         baz: int = (y := 2),  # comment
-84 85 |         foo = (a := 1)  #  comment
-85 86 |         ,
-86    |-        faz = (b := 2),  # comment
-   87 |+        faz,  # comment
-87 88 |     ) -> None:
-88 89 |         pass
-89 90 | 
+84 |         baz: int = (y := 2),  # comment
+85 |         foo = (a := 1)  #  comment
+86 |         ,
+   -         faz = (b := 2),  # comment
+87 +         faz,  # comment
+88 |     ) -> None:
+89 |         pass
+90 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:95:20
@@ -310,19 +299,18 @@ RUF033 [*] `__post_init__` method with argument defaults
 97 |     ) -> None:
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-90 90 | 
-91 91 | @dataclass
-92 92 | class Foo:
-   93 |+    bar: InitVar[int] = 1
-93 94 |     def __post_init__(
-94 95 |         self,
-95    |-        bar: int = 1,  # comment
-   96 |+        bar: int,  # comment
-96 97 |         baz: int = 2,  # comment
-97 98 |     ) -> None:
-98 99 |         pass
+90 | 
+91 | @dataclass
+92 | class Foo:
+93 +     bar: InitVar[int] = 1
+94 |     def __post_init__(
+95 |         self,
+   -         bar: int = 1,  # comment
+96 +         bar: int,  # comment
+97 |         baz: int = 2,  # comment
+98 |     ) -> None:
+99 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
   --> RUF033.py:96:20
@@ -335,20 +323,19 @@ RUF033 [*] `__post_init__` method with argument defaults
 98 |         pass
    |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-90 90 | 
-91 91 | @dataclass
-92 92 | class Foo:
-   93 |+    baz: InitVar[int] = 2
-93 94 |     def __post_init__(
-94 95 |         self,
-95 96 |         bar: int = 1,  # comment
-96    |-        baz: int = 2,  # comment
-   97 |+        baz: int,  # comment
-97 98 |     ) -> None:
-98 99 |         pass
-99 100 | 
+90  | 
+91  | @dataclass
+92  | class Foo:
+93  +     baz: InitVar[int] = 2
+94  |     def __post_init__(
+95  |         self,
+96  |         bar: int = 1,  # comment
+    -         baz: int = 2,  # comment
+97  +         baz: int,  # comment
+98  |     ) -> None:
+99  |         pass
+100 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
    --> RUF033.py:105:22
@@ -361,19 +348,18 @@ RUF033 [*] `__post_init__` method with argument defaults
 107 |         arg2: int = ((1))  # comment
     |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | @dataclass
-102 102 | class Foo:
-    103 |+    arg1: InitVar[int] = (1)
-103 104 |     def __post_init__(
-104 105 |         self,
-105     |-        arg1: int = (1)  # comment
-    106 |+        arg1: int  # comment
-106 107 |         ,
-107 108 |         arg2: int = ((1))  # comment
-108 109 |         ,
+100 | 
+101 | @dataclass
+102 | class Foo:
+103 +     arg1: InitVar[int] = (1)
+104 |     def __post_init__(
+105 |         self,
+    -         arg1: int = (1)  # comment
+106 +         arg1: int  # comment
+107 |         ,
+108 |         arg2: int = ((1))  # comment
+109 |         ,
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
    --> RUF033.py:107:23
@@ -386,21 +372,20 @@ RUF033 [*] `__post_init__` method with argument defaults
 109 |         arg2: int = (i for i in range(10))  # comment
     |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | @dataclass
-102 102 | class Foo:
-    103 |+    arg2: InitVar[int] = ((1))
-103 104 |     def __post_init__(
-104 105 |         self,
-105 106 |         arg1: int = (1)  # comment
-106 107 |         ,
-107     |-        arg2: int = ((1))  # comment
-    108 |+        arg2: int  # comment
-108 109 |         ,
-109 110 |         arg2: int = (i for i in range(10))  # comment
-110 111 |         ,
+100 | 
+101 | @dataclass
+102 | class Foo:
+103 +     arg2: InitVar[int] = ((1))
+104 |     def __post_init__(
+105 |         self,
+106 |         arg1: int = (1)  # comment
+107 |         ,
+    -         arg2: int = ((1))  # comment
+108 +         arg2: int  # comment
+109 |         ,
+110 |         arg2: int = (i for i in range(10))  # comment
+111 |         ,
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
    --> RUF033.py:109:21
@@ -413,23 +398,22 @@ RUF033 [*] `__post_init__` method with argument defaults
 111 |     ) -> None:
     |
 help: Use `dataclasses.InitVar` instead
-
-ℹ Unsafe fix
-100 100 | 
-101 101 | @dataclass
-102 102 | class Foo:
-    103 |+    arg2: InitVar[int] = (i for i in range(10))
-103 104 |     def __post_init__(
-104 105 |         self,
-105 106 |         arg1: int = (1)  # comment
-106 107 |         ,
-107 108 |         arg2: int = ((1))  # comment
-108 109 |         ,
-109     |-        arg2: int = (i for i in range(10))  # comment
-    110 |+        arg2: int  # comment
-110 111 |         ,
-111 112 |     ) -> None:
-112 113 |         pass
+100 | 
+101 | @dataclass
+102 | class Foo:
+103 +     arg2: InitVar[int] = (i for i in range(10))
+104 |     def __post_init__(
+105 |         self,
+106 |         arg1: int = (1)  # comment
+107 |         ,
+108 |         arg2: int = ((1))  # comment
+109 |         ,
+    -         arg2: int = (i for i in range(10))  # comment
+110 +         arg2: int  # comment
+111 |         ,
+112 |     ) -> None:
+113 |         pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF033 [*] `__post_init__` method with argument defaults
    --> RUF033.py:121:27
@@ -442,16 +426,67 @@ RUF033 [*] `__post_init__` method with argument defaults
 123 |         ) -> None:
     |
 help: Use `dataclasses.InitVar` instead
+116 | def fun_with_python_syntax():
+117 |     @dataclass
+118 |     class Foo:
+119 +         bar: InitVar[int] = (yield from range(5))
+120 |         def __post_init__(
+121 |             self,
+    -             bar: (int) = (yield from range(5))  # comment
+122 +             bar: (int)  # comment
+123 |             ,
+124 |         ) -> None:
+125 |             ...
+note: This is an unsafe fix and may change runtime behavior
 
-ℹ Unsafe fix
-116 116 | def fun_with_python_syntax():
-117 117 |     @dataclass
-118 118 |     class Foo:
-    119 |+        bar: InitVar[int] = (yield from range(5))
-119 120 |         def __post_init__(
-120 121 |             self,
-121     |-            bar: (int) = (yield from range(5))  # comment
-    122 |+            bar: (int)  # comment
-122 123 |             ,
-123 124 |         ) -> None:
-124 125 |             ...
+RUF033 [*] `__post_init__` method with argument defaults
+   --> RUF033.py:131:50
+    |
+129 |   @dataclass
+130 |   class C:
+131 |       def __post_init__(self, x: tuple[int, ...] = (
+    |  __________________________________________________^
+132 | |         1,
+133 | |         2,
+134 | |     )) -> None:
+    | |_____^
+135 |           self.x = x
+    |
+help: Use `dataclasses.InitVar` instead
+128 | 
+129 | @dataclass
+130 | class C:
+    -     def __post_init__(self, x: tuple[int, ...] = (
+131 +     x: InitVar[tuple[int, ...]] = (
+132 |         1,
+133 |         2,
+    -     )) -> None:
+134 +     )
+135 +     def __post_init__(self, x: tuple[int, ...]) -> None:
+136 |         self.x = x
+137 | 
+138 | 
+note: This is an unsafe fix and may change runtime behavior
+
+RUF033 [*] `__post_init__` method with argument defaults
+   --> RUF033.py:140:38
+    |
+138 |   @dataclass
+139 |   class D:
+140 |       def __post_init__(self, x: int = """
+    |  ______________________________________^
+141 | |     """) -> None:
+    | |_______^
+142 |           self.x = x
+    |
+help: Use `dataclasses.InitVar` instead
+137 | 
+138 | @dataclass
+139 | class D:
+    -     def __post_init__(self, x: int = """
+    -     """) -> None:
+140 +     x: InitVar[int] = """
+141 +     """
+142 +     def __post_init__(self, x: int) -> None:
+143 |         self.x = x
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap
index f396239316..97644c428a 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap
@@ -9,16 +9,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
   |             ^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `deque()`
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | def f():
-6   |-    queue = collections.deque([])  # RUF037
-  6 |+    queue = collections.deque()  # RUF037
-7 7 | 
-8 8 | 
-9 9 | def f():
+3 | 
+4 | 
+5 | def f():
+  -     queue = collections.deque([])  # RUF037
+6 +     queue = collections.deque()  # RUF037
+7 | 
+8 | 
+9 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:10:13
@@ -28,16 +26,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `deque(maxlen=...)`
-
-ℹ Safe fix
-7  7  | 
-8  8  | 
-9  9  | def f():
-10    |-    queue = collections.deque([], maxlen=10)  # RUF037
-   10 |+    queue = collections.deque(maxlen=10)  # RUF037
-11 11 | 
-12 12 | 
-13 13 | def f():
+7  | 
+8  | 
+9  | def f():
+   -     queue = collections.deque([], maxlen=10)  # RUF037
+10 +     queue = collections.deque(maxlen=10)  # RUF037
+11 | 
+12 | 
+13 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:14:13
@@ -47,16 +43,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-11 11 | 
-12 12 | 
-13 13 | def f():
-14    |-    queue = deque([])  # RUF037
-   14 |+    queue = deque()  # RUF037
-15 15 | 
-16 16 | 
-17 17 | def f():
+11 | 
+12 | 
+13 | def f():
+   -     queue = deque([])  # RUF037
+14 +     queue = deque()  # RUF037
+15 | 
+16 | 
+17 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:18:13
@@ -66,16 +60,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-15 15 | 
-16 16 | 
-17 17 | def f():
-18    |-    queue = deque(())  # RUF037
-   18 |+    queue = deque()  # RUF037
-19 19 | 
-20 20 | 
-21 21 | def f():
+15 | 
+16 | 
+17 | def f():
+   -     queue = deque(())  # RUF037
+18 +     queue = deque()  # RUF037
+19 | 
+20 | 
+21 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:22:13
@@ -85,16 +77,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-19 19 | 
-20 20 | 
-21 21 | def f():
-22    |-    queue = deque({})  # RUF037
-   22 |+    queue = deque()  # RUF037
-23 23 | 
-24 24 | 
-25 25 | def f():
+19 | 
+20 | 
+21 | def f():
+   -     queue = deque({})  # RUF037
+22 +     queue = deque()  # RUF037
+23 | 
+24 | 
+25 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:26:13
@@ -104,16 +94,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^^^^
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-23 23 | 
-24 24 | 
-25 25 | def f():
-26    |-    queue = deque(set())  # RUF037
-   26 |+    queue = deque()  # RUF037
-27 27 | 
-28 28 | 
-29 29 | def f():
+23 | 
+24 | 
+25 | def f():
+   -     queue = deque(set())  # RUF037
+26 +     queue = deque()  # RUF037
+27 | 
+28 | 
+29 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:30:13
@@ -123,16 +111,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `deque(maxlen=...)`
-
-ℹ Safe fix
-27 27 | 
-28 28 | 
-29 29 | def f():
-30    |-    queue = collections.deque([], maxlen=10)  # RUF037
-   30 |+    queue = collections.deque(maxlen=10)  # RUF037
-31 31 | 
-32 32 | 
-33 33 | def f():
+27 | 
+28 | 
+29 | def f():
+   -     queue = collections.deque([], maxlen=10)  # RUF037
+30 +     queue = collections.deque(maxlen=10)  # RUF037
+31 | 
+32 | 
+33 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:61:13
@@ -142,16 +128,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |             ^^^^^^^^^^^
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-58 58 |     queue = deque()  # Ok
-59 59 | 
-60 60 | def f():
-61    |-    x = 0 or(deque)([])
-   61 |+    x = 0 or(deque)()
-62 62 | 
-63 63 | 
-64 64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612
+58 |     queue = deque()  # Ok
+59 | 
+60 | def f():
+   -     x = 0 or(deque)([])
+61 +     x = 0 or(deque)()
+62 | 
+63 | 
+64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612
 
 RUF037 Unnecessary empty iterable within a deque call
   --> RUF037.py:66:5
@@ -175,16 +159,15 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 68 |     deque([], foo=1)  # RUF037
    |
 help: Replace with `deque()`
-
-ℹ Unsafe fix
-64 64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612
-65 65 | def f():
-66 66 |     deque([], *[10])  # RUF037 but no fix
-67    |-    deque([], **{"maxlen": 10})  # RUF037
-   67 |+    deque(**{"maxlen": 10})  # RUF037
-68 68 |     deque([], foo=1)  # RUF037
-69 69 | 
-70 70 | 
+64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612
+65 | def f():
+66 |     deque([], *[10])  # RUF037 but no fix
+   -     deque([], **{"maxlen": 10})  # RUF037
+67 +     deque(**{"maxlen": 10})  # RUF037
+68 |     deque([], foo=1)  # RUF037
+69 | 
+70 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:68:5
@@ -195,16 +178,15 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |     ^^^^^^^^^^^^^^^^
    |
 help: Replace with `deque()`
-
-ℹ Unsafe fix
-65 65 | def f():
-66 66 |     deque([], *[10])  # RUF037 but no fix
-67 67 |     deque([], **{"maxlen": 10})  # RUF037
-68    |-    deque([], foo=1)  # RUF037
-   68 |+    deque(foo=1)  # RUF037
-69 69 | 
-70 70 | 
-71 71 | # Somewhat related to the issue, both okay because we can't generally look
+65 | def f():
+66 |     deque([], *[10])  # RUF037 but no fix
+67 |     deque([], **{"maxlen": 10})  # RUF037
+   -     deque([], foo=1)  # RUF037
+68 +     deque(foo=1)  # RUF037
+69 | 
+70 | 
+71 | # Somewhat related to the issue, both okay because we can't generally look
+note: This is an unsafe fix and may change runtime behavior
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:80:5
@@ -219,20 +201,19 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    | |_________^
    |
 help: Replace with `deque(maxlen=...)`
-
-ℹ Unsafe fix
-77 77 | # The fix was actually always unsafe in the presence of comments. all of these
-78 78 | # are deleted
-79 79 | def f():
-80    |-    deque(  # a comment in deque, deleted
-81    |-        [  # a comment _in_ the list, deleted
-82    |-        ],  # a comment after the list, deleted
-83    |-        maxlen=10,  # a comment on maxlen, deleted
-84    |-        )  # only this is preserved
-   80 |+    deque(maxlen=10)  # only this is preserved
-85 81 | 
-86 82 | 
-87 83 | # `maxlen` can also be passed positionally
+77 | # The fix was actually always unsafe in the presence of comments. all of these
+78 | # are deleted
+79 | def f():
+   -     deque(  # a comment in deque, deleted
+   -         [  # a comment _in_ the list, deleted
+   -         ],  # a comment after the list, deleted
+   -         maxlen=10,  # a comment on maxlen, deleted
+   -         )  # only this is preserved
+80 +     deque(maxlen=10)  # only this is preserved
+81 | 
+82 | 
+83 | # `maxlen` can also be passed positionally
+note: This is an unsafe fix and may change runtime behavior
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:89:5
@@ -243,16 +224,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
    |     ^^^^^^^^^^^^^
    |
 help: Replace with `deque(maxlen=...)`
-
-ℹ Safe fix
-86 86 | 
-87 87 | # `maxlen` can also be passed positionally
-88 88 | def f():
-89    |-    deque([], 10)
-   89 |+    deque(maxlen=10)
-90 90 | 
-91 91 | 
-92 92 | def f():
+86 | 
+87 | # `maxlen` can also be passed positionally
+88 | def f():
+   -     deque([], 10)
+89 +     deque(maxlen=10)
+90 | 
+91 | 
+92 | def f():
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:93:5
@@ -264,16 +243,15 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 95 | # https://github.com/astral-sh/ruff/issues/18854
    |
 help: Replace with `deque()`
-
-ℹ Unsafe fix
-90 90 | 
-91 91 | 
-92 92 | def f():
-93    |-    deque([], iterable=[])
-   93 |+    deque([])
-94 94 | 
-95 95 | # https://github.com/astral-sh/ruff/issues/18854
-96 96 | deque("")
+90 | 
+91 | 
+92 | def f():
+   -     deque([], iterable=[])
+93 +     deque([])
+94 | 
+95 | # https://github.com/astral-sh/ruff/issues/18854
+96 | deque("")
+note: This is an unsafe fix and may change runtime behavior
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:96:1
@@ -285,16 +263,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 98 | deque(f"")
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-93 93 |     deque([], iterable=[])
-94 94 | 
-95 95 | # https://github.com/astral-sh/ruff/issues/18854
-96    |-deque("")
-   96 |+deque()
-97 97 | deque(b"")
-98 98 | deque(f"")
-99 99 | deque(f"" "")
+93 |     deque([], iterable=[])
+94 | 
+95 | # https://github.com/astral-sh/ruff/issues/18854
+   - deque("")
+96 + deque()
+97 | deque(b"")
+98 | deque(f"")
+99 | deque(f"" "")
 
 RUF037 [*] Unnecessary empty iterable within a deque call
   --> RUF037.py:97:1
@@ -307,16 +283,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 99 | deque(f"" "")
    |
 help: Replace with `deque()`
-
-ℹ Safe fix
-94 94 | 
-95 95 | # https://github.com/astral-sh/ruff/issues/18854
-96 96 | deque("")
-97    |-deque(b"")
-   97 |+deque()
-98 98 | deque(f"")
-99 99 | deque(f"" "")
-100 100 | deque(f"" f"")
+94  | 
+95  | # https://github.com/astral-sh/ruff/issues/18854
+96  | deque("")
+    - deque(b"")
+97  + deque()
+98  | deque(f"")
+99  | deque(f"" "")
+100 | deque(f"" f"")
 
 RUF037 [*] Unnecessary empty iterable within a deque call
    --> RUF037.py:98:1
@@ -329,16 +303,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 100 | deque(f"" f"")
     |
 help: Replace with `deque()`
-
-ℹ Safe fix
-95 95 | # https://github.com/astral-sh/ruff/issues/18854
-96 96 | deque("")
-97 97 | deque(b"")
-98    |-deque(f"")
-   98 |+deque()
-99 99 | deque(f"" "")
-100 100 | deque(f"" f"")
-101 101 | deque("abc") # OK
+95  | # https://github.com/astral-sh/ruff/issues/18854
+96  | deque("")
+97  | deque(b"")
+    - deque(f"")
+98  + deque()
+99  | deque(f"" "")
+100 | deque(f"" f"")
+101 | deque("abc") # OK
 
 RUF037 [*] Unnecessary empty iterable within a deque call
    --> RUF037.py:99:1
@@ -351,16 +323,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 101 | deque("abc") # OK
     |
 help: Replace with `deque()`
-
-ℹ Safe fix
-96  96  | deque("")
-97  97  | deque(b"")
-98  98  | deque(f"")
-99      |-deque(f"" "")
-    99  |+deque()
-100 100 | deque(f"" f"")
-101 101 | deque("abc") # OK
-102 102 | deque(b"abc") # OK
+96  | deque("")
+97  | deque(b"")
+98  | deque(f"")
+    - deque(f"" "")
+99  + deque()
+100 | deque(f"" f"")
+101 | deque("abc") # OK
+102 | deque(b"abc") # OK
 
 RUF037 [*] Unnecessary empty iterable within a deque call
    --> RUF037.py:100:1
@@ -373,13 +343,68 @@ RUF037 [*] Unnecessary empty iterable within a deque call
 102 | deque(b"abc") # OK
     |
 help: Replace with `deque()`
+97  | deque(b"")
+98  | deque(f"")
+99  | deque(f"" "")
+    - deque(f"" f"")
+100 + deque()
+101 | deque("abc") # OK
+102 | deque(b"abc") # OK
+103 | deque(f"" "a")  # OK
 
-ℹ Safe fix
-97  97  | deque(b"")
-98  98  | deque(f"")
-99  99  | deque(f"" "")
-100     |-deque(f"" f"")
-    100 |+deque()
-101 101 | deque("abc") # OK
-102 102 | deque(b"abc") # OK
-103 103 | deque(f"" "a")  # OK
+RUF037 [*] Unnecessary empty iterable within a deque call
+   --> RUF037.py:107:1
+    |
+106 | # https://github.com/astral-sh/ruff/issues/19951
+107 | deque(t"")
+    | ^^^^^^^^^^
+108 | deque(t""  t"")
+109 | deque(t"{""}") # OK
+    |
+help: Replace with `deque()`
+104 | deque(f"{x}" "")  # OK
+105 | 
+106 | # https://github.com/astral-sh/ruff/issues/19951
+    - deque(t"")
+107 + deque()
+108 | deque(t""  t"")
+109 | deque(t"{""}") # OK
+110 | 
+
+RUF037 [*] Unnecessary empty iterable within a deque call
+   --> RUF037.py:108:1
+    |
+106 | # https://github.com/astral-sh/ruff/issues/19951
+107 | deque(t"")
+108 | deque(t""  t"")
+    | ^^^^^^^^^^^^^^^
+109 | deque(t"{""}") # OK
+    |
+help: Replace with `deque()`
+105 | 
+106 | # https://github.com/astral-sh/ruff/issues/19951
+107 | deque(t"")
+    - deque(t""  t"")
+108 + deque()
+109 | deque(t"{""}") # OK
+110 | 
+111 | # https://github.com/astral-sh/ruff/issues/20050
+
+RUF037 [*] Unnecessary empty iterable within a deque call
+   --> RUF037.py:112:1
+    |
+111 | # https://github.com/astral-sh/ruff/issues/20050
+112 | deque(f"{""}")  # RUF037
+    | ^^^^^^^^^^^^^^
+113 |
+114 | deque(f"{b""}")
+    |
+help: Replace with `deque()`
+109 | deque(t"{""}") # OK
+110 | 
+111 | # https://github.com/astral-sh/ruff/issues/20050
+    - deque(f"{""}")  # RUF037
+112 + deque()  # RUF037
+113 | 
+114 | deque(f"{b""}")
+115 | deque(f"{""=}")
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap
index a52ca0b528..ea56bd8a4d 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap
@@ -9,16 +9,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 5 |     ...
   |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-1 1 | from typing import Literal
-2 2 | 
-3 3 | 
-4   |-def func1(arg1: Literal[True, False]): 
-  4 |+def func1(arg1: bool): 
-5 5 |     ...
-6 6 | 
-7 7 | 
+1 | from typing import Literal
+2 | 
+3 | 
+  - def func1(arg1: Literal[True, False]): 
+4 + def func1(arg1: bool): 
+5 |     ...
+6 | 
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
  --> RUF038.py:8:17
@@ -28,16 +27,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 9 |     ...
   |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-5 5 |     ...
-6 6 | 
-7 7 | 
-8   |-def func2(arg1: Literal[True, False, True]): 
-  8 |+def func2(arg1: bool): 
-9 9 |     ...
-10 10 | 
-11 11 | 
+5  |     ...
+6  | 
+7  | 
+   - def func2(arg1: Literal[True, False, True]): 
+8  + def func2(arg1: bool): 
+9  |     ...
+10 | 
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
   --> RUF038.py:12:16
@@ -47,16 +45,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 13 |     ...
    |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-9  9  |     ...
-10 10 | 
-11 11 | 
-12    |-def func3() -> Literal[True, False]: 
-   12 |+def func3() -> bool: 
-13 13 |     ...
-14 14 | 
-15 15 | 
+9  |     ...
+10 | 
+11 | 
+   - def func3() -> Literal[True, False]: 
+12 + def func3() -> bool: 
+13 |     ...
+14 | 
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
   --> RUF038.py:16:17
@@ -66,16 +63,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 17 |     ...
    |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-13 13 |     ...
-14 14 | 
-15 15 | 
-16    |-def func4(arg1: Literal[True, False] | bool): 
-   16 |+def func4(arg1: bool | bool): 
-17 17 |     ...
-18 18 | 
-19 19 | 
+13 |     ...
+14 | 
+15 | 
+   - def func4(arg1: Literal[True, False] | bool): 
+16 + def func4(arg1: bool | bool): 
+17 |     ...
+18 | 
+19 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
   --> RUF038.py:20:17
@@ -85,16 +81,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 21 |     ...
    |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-17 17 |     ...
-18 18 | 
-19 19 | 
-20    |-def func5(arg1: Literal[False, True]):
-   20 |+def func5(arg1: bool):
-21 21 |     ...
-22 22 | 
-23 23 | 
+17 |     ...
+18 | 
+19 | 
+   - def func5(arg1: Literal[False, True]):
+20 + def func5(arg1: bool):
+21 |     ...
+22 | 
+23 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 `Literal[True, False, ...]` can be replaced with `Literal[...] | bool`
   --> RUF038.py:24:17
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap
index 0f4170e303..164e51b31b 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap
@@ -10,16 +10,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 6 | def func2(arg1: Literal[True, False, True]): ...
   |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-1 1 | from typing import Literal
-2 2 | 
-3 3 | 
-4   |-def func1(arg1: Literal[True, False]): ...
-  4 |+def func1(arg1: bool): ...
-5 5 | 
-6 6 | def func2(arg1: Literal[True, False, True]): ...
-7 7 | 
+1 | from typing import Literal
+2 | 
+3 | 
+  - def func1(arg1: Literal[True, False]): ...
+4 + def func1(arg1: bool): ...
+5 | 
+6 | def func2(arg1: Literal[True, False, True]): ...
+7 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
  --> RUF038.pyi:6:17
@@ -32,16 +31,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 8 | def func3() -> Literal[True, False]: ...
   |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | def func1(arg1: Literal[True, False]): ...
-5 5 | 
-6   |-def func2(arg1: Literal[True, False, True]): ...
-  6 |+def func2(arg1: bool): ...
-7 7 | 
-8 8 | def func3() -> Literal[True, False]: ...
-9 9 | 
+3 | 
+4 | def func1(arg1: Literal[True, False]): ...
+5 | 
+  - def func2(arg1: Literal[True, False, True]): ...
+6 + def func2(arg1: bool): ...
+7 | 
+8 | def func3() -> Literal[True, False]: ...
+9 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
   --> RUF038.pyi:8:16
@@ -54,16 +52,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 10 | def func4(arg1: Literal[True, False] | bool): ...
    |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | def func2(arg1: Literal[True, False, True]): ...
-7 7 | 
-8   |-def func3() -> Literal[True, False]: ...
-  8 |+def func3() -> bool: ...
-9 9 | 
-10 10 | def func4(arg1: Literal[True, False] | bool): ...
-11 11 | 
+5  | 
+6  | def func2(arg1: Literal[True, False, True]): ...
+7  | 
+   - def func3() -> Literal[True, False]: ...
+8  + def func3() -> bool: ...
+9  | 
+10 | def func4(arg1: Literal[True, False] | bool): ...
+11 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
   --> RUF038.pyi:10:17
@@ -76,16 +73,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 12 | def func5(arg1: Literal[False, True]): ...
    |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | def func3() -> Literal[True, False]: ...
-9  9  | 
-10    |-def func4(arg1: Literal[True, False] | bool): ...
-   10 |+def func4(arg1: bool | bool): ...
-11 11 | 
-12 12 | def func5(arg1: Literal[False, True]): ...
-13 13 | 
+7  | 
+8  | def func3() -> Literal[True, False]: ...
+9  | 
+   - def func4(arg1: Literal[True, False] | bool): ...
+10 + def func4(arg1: bool | bool): ...
+11 | 
+12 | def func5(arg1: Literal[False, True]): ...
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 [*] `Literal[True, False]` can be replaced with `bool`
   --> RUF038.pyi:12:17
@@ -98,16 +94,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool`
 14 | def func6(arg1: Literal[True, False, "hello", "world"]): ...
    |
 help: Replace with `bool`
-
-ℹ Unsafe fix
-9  9  | 
-10 10 | def func4(arg1: Literal[True, False] | bool): ...
-11 11 | 
-12    |-def func5(arg1: Literal[False, True]): ...
-   12 |+def func5(arg1: bool): ...
-13 13 | 
-14 14 | def func6(arg1: Literal[True, False, "hello", "world"]): ...
-15 15 | 
+9  | 
+10 | def func4(arg1: Literal[True, False] | bool): ...
+11 | 
+   - def func5(arg1: Literal[False, True]): ...
+12 + def func5(arg1: bool): ...
+13 | 
+14 | def func6(arg1: Literal[True, False, "hello", "world"]): ...
+15 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF038 `Literal[True, False, ...]` can be replaced with `Literal[...] | bool`
   --> RUF038.pyi:14:17
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap
index 3f44d5eee8..272f8a43bb 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap
@@ -10,16 +10,14 @@ RUF041 [*] Unnecessary nested `Literal`
 8 | Literal[1, 2, Literal[1, 2]]
   |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-3 3 | import typing_extensions
-4 4 | 
-5 5 | 
-6   |-y: Literal[1, print("hello"), 3, Literal[4, 1]]
-  6 |+y: Literal[1, print("hello"), 3, 4, 1]
-7 7 | Literal[1, Literal[1]]
-8 8 | Literal[1, 2, Literal[1, 2]]
-9 9 | Literal[1, Literal[1], Literal[1]]
+3 | import typing_extensions
+4 | 
+5 | 
+  - y: Literal[1, print("hello"), 3, Literal[4, 1]]
+6 + y: Literal[1, print("hello"), 3, 4, 1]
+7 | Literal[1, Literal[1]]
+8 | Literal[1, 2, Literal[1, 2]]
+9 | Literal[1, Literal[1], Literal[1]]
 
 RUF041 [*] Unnecessary nested `Literal`
  --> RUF041.py:7:1
@@ -31,16 +29,14 @@ RUF041 [*] Unnecessary nested `Literal`
 9 | Literal[1, Literal[1], Literal[1]]
   |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]]
-7   |-Literal[1, Literal[1]]
-  7 |+Literal[1, 1]
-8 8 | Literal[1, 2, Literal[1, 2]]
-9 9 | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
+4  | 
+5  | 
+6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
+   - Literal[1, Literal[1]]
+7  + Literal[1, 1]
+8  | Literal[1, 2, Literal[1, 2]]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:8:1
@@ -53,16 +49,14 @@ RUF041 [*] Unnecessary nested `Literal`
 10 | Literal[1, Literal[2], Literal[2]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-5 5 | 
-6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]]
-7 7 | Literal[1, Literal[1]]
-8   |-Literal[1, 2, Literal[1, 2]]
-  8 |+Literal[1, 2, 1, 2]
-9 9 | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+5  | 
+6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
+7  | Literal[1, Literal[1]]
+   - Literal[1, 2, Literal[1, 2]]
+8  + Literal[1, 2, 1, 2]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:9:1
@@ -75,16 +69,14 @@ RUF041 [*] Unnecessary nested `Literal`
 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-6  6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
-7  7  | Literal[1, Literal[1]]
-8  8  | Literal[1, 2, Literal[1, 2]]
-9     |-Literal[1, Literal[1], Literal[1]]
-   9  |+Literal[1, 1, 1]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
-12 12 | Literal[
+6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
+7  | Literal[1, Literal[1]]
+8  | Literal[1, 2, Literal[1, 2]]
+   - Literal[1, Literal[1], Literal[1]]
+9  + Literal[1, 1, 1]
+10 | Literal[1, Literal[2], Literal[2]]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+12 | Literal[
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:10:1
@@ -97,16 +89,14 @@ RUF041 [*] Unnecessary nested `Literal`
 12 | Literal[
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-7  7  | Literal[1, Literal[1]]
-8  8  | Literal[1, 2, Literal[1, 2]]
-9  9  | Literal[1, Literal[1], Literal[1]]
-10    |-Literal[1, Literal[2], Literal[2]]
-   10 |+Literal[1, 2, 2]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
-12 12 | Literal[
-13 13 |     1, # comment 1
+7  | Literal[1, Literal[1]]
+8  | Literal[1, 2, Literal[1, 2]]
+9  | Literal[1, Literal[1], Literal[1]]
+   - Literal[1, Literal[2], Literal[2]]
+10 + Literal[1, 2, 2]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+12 | Literal[
+13 |     1, # comment 1
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:11:1
@@ -119,16 +109,14 @@ RUF041 [*] Unnecessary nested `Literal`
 13 |     1, # comment 1
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-8  8  | Literal[1, 2, Literal[1, 2]]
-9  9  | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11    |-t.Literal[1, t.Literal[2, t.Literal[1]]]
-   11 |+t.Literal[1, 2, 1]
-12 12 | Literal[
-13 13 |     1, # comment 1
-14 14 |     Literal[ # another comment
+8  | Literal[1, 2, Literal[1, 2]]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
+   - t.Literal[1, t.Literal[2, t.Literal[1]]]
+11 + t.Literal[1, 2, 1]
+12 | Literal[
+13 |     1, # comment 1
+14 |     Literal[ # another comment
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:12:1
@@ -146,21 +134,20 @@ RUF041 [*] Unnecessary nested `Literal`
 19 |   # Ensure issue is only raised once, even on nested literals
    |
 help: Replace with flattened `Literal`
-
-ℹ Unsafe fix
-9  9  | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
-12    |-Literal[
-13    |-    1, # comment 1
-14    |-    Literal[ # another comment
-15    |-        1 # yet another comment
-16    |-    ]
-17    |-]  # once
-   12 |+Literal[1, 1]  # once
-18 13 | 
-19 14 | # Ensure issue is only raised once, even on nested literals
-20 15 | MyType = Literal["foo", Literal[True, False, True], "bar"]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+   - Literal[
+   -     1, # comment 1
+   -     Literal[ # another comment
+   -         1 # yet another comment
+   -     ]
+   - ]  # once
+12 + Literal[1, 1]  # once
+13 | 
+14 | # Ensure issue is only raised once, even on nested literals
+15 | MyType = Literal["foo", Literal[True, False, True], "bar"]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:20:10
@@ -172,16 +159,14 @@ RUF041 [*] Unnecessary nested `Literal`
 22 | # nested literals, all equivalent to `Literal[1]`
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-17 17 | ]  # once
-18 18 | 
-19 19 | # Ensure issue is only raised once, even on nested literals
-20    |-MyType = Literal["foo", Literal[True, False, True], "bar"]
-   20 |+MyType = Literal["foo", True, False, True, "bar"]
-21 21 | 
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23 23 | Literal[Literal[1]]
+17 | ]  # once
+18 | 
+19 | # Ensure issue is only raised once, even on nested literals
+   - MyType = Literal["foo", Literal[True, False, True], "bar"]
+20 + MyType = Literal["foo", True, False, True, "bar"]
+21 | 
+22 | # nested literals, all equivalent to `Literal[1]`
+23 | Literal[Literal[1]]
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:23:1
@@ -193,16 +178,14 @@ RUF041 [*] Unnecessary nested `Literal`
 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-20 20 | MyType = Literal["foo", Literal[True, False, True], "bar"]
-21 21 | 
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23    |-Literal[Literal[1]]
-   23 |+Literal[1]
-24 24 | Literal[Literal[Literal[1], Literal[1]]]
-25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
-26 26 | 
+20 | MyType = Literal["foo", Literal[True, False, True], "bar"]
+21 | 
+22 | # nested literals, all equivalent to `Literal[1]`
+   - Literal[Literal[1]]
+23 + Literal[1]
+24 | Literal[Literal[Literal[1], Literal[1]]]
+25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
+26 | 
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:24:1
@@ -214,16 +197,14 @@ RUF041 [*] Unnecessary nested `Literal`
 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-21 21 | 
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23 23 | Literal[Literal[1]]
-24    |-Literal[Literal[Literal[1], Literal[1]]]
-   24 |+Literal[1, 1]
-25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
-26 26 | 
-27 27 | # OK
+21 | 
+22 | # nested literals, all equivalent to `Literal[1]`
+23 | Literal[Literal[1]]
+   - Literal[Literal[Literal[1], Literal[1]]]
+24 + Literal[1, 1]
+25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
+26 | 
+27 | # OK
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.py:25:1
@@ -236,13 +217,11 @@ RUF041 [*] Unnecessary nested `Literal`
 27 | # OK
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23 23 | Literal[Literal[1]]
-24 24 | Literal[Literal[Literal[1], Literal[1]]]
-25    |-Literal[Literal[1], Literal[Literal[Literal[1]]]]
-   25 |+Literal[1, 1]
-26 26 | 
-27 27 | # OK
-28 28 | x: Literal[True, False, True, False]
+22 | # nested literals, all equivalent to `Literal[1]`
+23 | Literal[Literal[1]]
+24 | Literal[Literal[Literal[1], Literal[1]]]
+   - Literal[Literal[1], Literal[Literal[Literal[1]]]]
+25 + Literal[1, 1]
+26 | 
+27 | # OK
+28 | x: Literal[True, False, True, False]
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap
index c62475a490..17fad72a99 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap
@@ -10,16 +10,14 @@ RUF041 [*] Unnecessary nested `Literal`
 8 | Literal[1, 2, Literal[1, 2]]
   |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-3 3 | import typing_extensions
-4 4 | 
-5 5 | 
-6   |-y: Literal[1, print("hello"), 3, Literal[4, 1]]
-  6 |+y: Literal[1, print("hello"), 3, 4, 1]
-7 7 | Literal[1, Literal[1]]
-8 8 | Literal[1, 2, Literal[1, 2]]
-9 9 | Literal[1, Literal[1], Literal[1]]
+3 | import typing_extensions
+4 | 
+5 | 
+  - y: Literal[1, print("hello"), 3, Literal[4, 1]]
+6 + y: Literal[1, print("hello"), 3, 4, 1]
+7 | Literal[1, Literal[1]]
+8 | Literal[1, 2, Literal[1, 2]]
+9 | Literal[1, Literal[1], Literal[1]]
 
 RUF041 [*] Unnecessary nested `Literal`
  --> RUF041.pyi:7:1
@@ -31,16 +29,14 @@ RUF041 [*] Unnecessary nested `Literal`
 9 | Literal[1, Literal[1], Literal[1]]
   |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]]
-7   |-Literal[1, Literal[1]]
-  7 |+Literal[1, 1]
-8 8 | Literal[1, 2, Literal[1, 2]]
-9 9 | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
+4  | 
+5  | 
+6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
+   - Literal[1, Literal[1]]
+7  + Literal[1, 1]
+8  | Literal[1, 2, Literal[1, 2]]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:8:1
@@ -53,16 +49,14 @@ RUF041 [*] Unnecessary nested `Literal`
 10 | Literal[1, Literal[2], Literal[2]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-5 5 | 
-6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]]
-7 7 | Literal[1, Literal[1]]
-8   |-Literal[1, 2, Literal[1, 2]]
-  8 |+Literal[1, 2, 1, 2]
-9 9 | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+5  | 
+6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
+7  | Literal[1, Literal[1]]
+   - Literal[1, 2, Literal[1, 2]]
+8  + Literal[1, 2, 1, 2]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:9:1
@@ -75,16 +69,14 @@ RUF041 [*] Unnecessary nested `Literal`
 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-6  6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
-7  7  | Literal[1, Literal[1]]
-8  8  | Literal[1, 2, Literal[1, 2]]
-9     |-Literal[1, Literal[1], Literal[1]]
-   9  |+Literal[1, 1, 1]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
-12 12 | Literal[
+6  | y: Literal[1, print("hello"), 3, Literal[4, 1]]
+7  | Literal[1, Literal[1]]
+8  | Literal[1, 2, Literal[1, 2]]
+   - Literal[1, Literal[1], Literal[1]]
+9  + Literal[1, 1, 1]
+10 | Literal[1, Literal[2], Literal[2]]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+12 | Literal[
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:10:1
@@ -97,16 +89,14 @@ RUF041 [*] Unnecessary nested `Literal`
 12 | Literal[
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-7  7  | Literal[1, Literal[1]]
-8  8  | Literal[1, 2, Literal[1, 2]]
-9  9  | Literal[1, Literal[1], Literal[1]]
-10    |-Literal[1, Literal[2], Literal[2]]
-   10 |+Literal[1, 2, 2]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
-12 12 | Literal[
-13 13 |     1, # comment 1
+7  | Literal[1, Literal[1]]
+8  | Literal[1, 2, Literal[1, 2]]
+9  | Literal[1, Literal[1], Literal[1]]
+   - Literal[1, Literal[2], Literal[2]]
+10 + Literal[1, 2, 2]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+12 | Literal[
+13 |     1, # comment 1
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:11:1
@@ -119,16 +109,14 @@ RUF041 [*] Unnecessary nested `Literal`
 13 |     1, # comment 1
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-8  8  | Literal[1, 2, Literal[1, 2]]
-9  9  | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11    |-t.Literal[1, t.Literal[2, t.Literal[1]]]
-   11 |+t.Literal[1, 2, 1]
-12 12 | Literal[
-13 13 |     1, # comment 1
-14 14 |     Literal[ # another comment
+8  | Literal[1, 2, Literal[1, 2]]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
+   - t.Literal[1, t.Literal[2, t.Literal[1]]]
+11 + t.Literal[1, 2, 1]
+12 | Literal[
+13 |     1, # comment 1
+14 |     Literal[ # another comment
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:12:1
@@ -146,21 +134,20 @@ RUF041 [*] Unnecessary nested `Literal`
 19 |   # Ensure issue is only raised once, even on nested literals
    |
 help: Replace with flattened `Literal`
-
-ℹ Unsafe fix
-9  9  | Literal[1, Literal[1], Literal[1]]
-10 10 | Literal[1, Literal[2], Literal[2]]
-11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
-12    |-Literal[
-13    |-    1, # comment 1
-14    |-    Literal[ # another comment
-15    |-        1 # yet another comment
-16    |-    ]
-17    |-]  # once
-   12 |+Literal[1, 1]  # once
-18 13 | 
-19 14 | # Ensure issue is only raised once, even on nested literals
-20 15 | MyType = Literal["foo", Literal[True, False, True], "bar"]
+9  | Literal[1, Literal[1], Literal[1]]
+10 | Literal[1, Literal[2], Literal[2]]
+11 | t.Literal[1, t.Literal[2, t.Literal[1]]]
+   - Literal[
+   -     1, # comment 1
+   -     Literal[ # another comment
+   -         1 # yet another comment
+   -     ]
+   - ]  # once
+12 + Literal[1, 1]  # once
+13 | 
+14 | # Ensure issue is only raised once, even on nested literals
+15 | MyType = Literal["foo", Literal[True, False, True], "bar"]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:20:10
@@ -172,16 +159,14 @@ RUF041 [*] Unnecessary nested `Literal`
 22 | # nested literals, all equivalent to `Literal[1]`
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-17 17 | ]  # once
-18 18 | 
-19 19 | # Ensure issue is only raised once, even on nested literals
-20    |-MyType = Literal["foo", Literal[True, False, True], "bar"]
-   20 |+MyType = Literal["foo", True, False, True, "bar"]
-21 21 | 
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23 23 | Literal[Literal[1]]
+17 | ]  # once
+18 | 
+19 | # Ensure issue is only raised once, even on nested literals
+   - MyType = Literal["foo", Literal[True, False, True], "bar"]
+20 + MyType = Literal["foo", True, False, True, "bar"]
+21 | 
+22 | # nested literals, all equivalent to `Literal[1]`
+23 | Literal[Literal[1]]
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:23:1
@@ -193,16 +178,14 @@ RUF041 [*] Unnecessary nested `Literal`
 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-20 20 | MyType = Literal["foo", Literal[True, False, True], "bar"]
-21 21 | 
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23    |-Literal[Literal[1]]
-   23 |+Literal[1]
-24 24 | Literal[Literal[Literal[1], Literal[1]]]
-25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
-26 26 | 
+20 | MyType = Literal["foo", Literal[True, False, True], "bar"]
+21 | 
+22 | # nested literals, all equivalent to `Literal[1]`
+   - Literal[Literal[1]]
+23 + Literal[1]
+24 | Literal[Literal[Literal[1], Literal[1]]]
+25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
+26 | 
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:24:1
@@ -214,16 +197,14 @@ RUF041 [*] Unnecessary nested `Literal`
 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-21 21 | 
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23 23 | Literal[Literal[1]]
-24    |-Literal[Literal[Literal[1], Literal[1]]]
-   24 |+Literal[1, 1]
-25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
-26 26 | 
-27 27 | # OK
+21 | 
+22 | # nested literals, all equivalent to `Literal[1]`
+23 | Literal[Literal[1]]
+   - Literal[Literal[Literal[1], Literal[1]]]
+24 + Literal[1, 1]
+25 | Literal[Literal[1], Literal[Literal[Literal[1]]]]
+26 | 
+27 | # OK
 
 RUF041 [*] Unnecessary nested `Literal`
   --> RUF041.pyi:25:1
@@ -236,13 +217,11 @@ RUF041 [*] Unnecessary nested `Literal`
 27 | # OK
    |
 help: Replace with flattened `Literal`
-
-ℹ Safe fix
-22 22 | # nested literals, all equivalent to `Literal[1]`
-23 23 | Literal[Literal[1]]
-24 24 | Literal[Literal[Literal[1], Literal[1]]]
-25    |-Literal[Literal[1], Literal[Literal[Literal[1]]]]
-   25 |+Literal[1, 1]
-26 26 | 
-27 27 | # OK
-28 28 | x: Literal[True, False, True, False]
+22 | # nested literals, all equivalent to `Literal[1]`
+23 | Literal[Literal[1]]
+24 | Literal[Literal[Literal[1], Literal[1]]]
+   - Literal[Literal[1], Literal[Literal[Literal[1]]]]
+25 + Literal[1, 1]
+26 | 
+27 | # OK
+28 | x: Literal[True, False, True, False]
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF043_RUF043.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF043_RUF043.py.snap
similarity index 100%
rename from crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF043_RUF043.py.snap
rename to crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF043_RUF043.py.snap
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap
index 31fdadacf3..e9b6399c96 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap
@@ -12,16 +12,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 12 | int(ord(foo))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-7  7  | 
-8  8  | ### Safely fixable
-9  9  | 
-10    |-int(id())
-   10 |+id()
-11 11 | int(len([]))
-12 12 | int(ord(foo))
-13 13 | int(hash(foo, bar))
+7  | 
+8  | ### Safely fixable
+9  | 
+   - int(id())
+10 + id()
+11 | int(len([]))
+12 | int(ord(foo))
+13 | int(hash(foo, bar))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:11:1
@@ -33,16 +31,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 13 | int(hash(foo, bar))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-8  8  | ### Safely fixable
-9  9  | 
-10 10 | int(id())
-11    |-int(len([]))
-   11 |+len([])
-12 12 | int(ord(foo))
-13 13 | int(hash(foo, bar))
-14 14 | int(int(''))
+8  | ### Safely fixable
+9  | 
+10 | int(id())
+   - int(len([]))
+11 + len([])
+12 | int(ord(foo))
+13 | int(hash(foo, bar))
+14 | int(int(''))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:12:1
@@ -55,16 +51,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 14 | int(int(''))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-9  9  | 
-10 10 | int(id())
-11 11 | int(len([]))
-12    |-int(ord(foo))
-   12 |+ord(foo)
-13 13 | int(hash(foo, bar))
-14 14 | int(int(''))
-15 15 | 
+9  | 
+10 | int(id())
+11 | int(len([]))
+   - int(ord(foo))
+12 + ord(foo)
+13 | int(hash(foo, bar))
+14 | int(int(''))
+15 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:13:1
@@ -76,16 +70,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 14 | int(int(''))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-10 10 | int(id())
-11 11 | int(len([]))
-12 12 | int(ord(foo))
-13    |-int(hash(foo, bar))
-   13 |+hash(foo, bar)
-14 14 | int(int(''))
-15 15 | 
-16 16 | int(math.comb())
+10 | int(id())
+11 | int(len([]))
+12 | int(ord(foo))
+   - int(hash(foo, bar))
+13 + hash(foo, bar)
+14 | int(int(''))
+15 | 
+16 | int(math.comb())
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:14:1
@@ -98,16 +90,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 16 | int(math.comb())
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-11 11 | int(len([]))
-12 12 | int(ord(foo))
-13 13 | int(hash(foo, bar))
-14    |-int(int(''))
-   14 |+int('')
-15 15 | 
-16 16 | int(math.comb())
-17 17 | int(math.factorial())
+11 | int(len([]))
+12 | int(ord(foo))
+13 | int(hash(foo, bar))
+   - int(int(''))
+14 + int('')
+15 | 
+16 | int(math.comb())
+17 | int(math.factorial())
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:16:1
@@ -120,16 +110,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 18 | int(math.gcd())
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-13 13 | int(hash(foo, bar))
-14 14 | int(int(''))
-15 15 | 
-16    |-int(math.comb())
-   16 |+math.comb()
-17 17 | int(math.factorial())
-18 18 | int(math.gcd())
-19 19 | int(math.lcm())
+13 | int(hash(foo, bar))
+14 | int(int(''))
+15 | 
+   - int(math.comb())
+16 + math.comb()
+17 | int(math.factorial())
+18 | int(math.gcd())
+19 | int(math.lcm())
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:17:1
@@ -141,16 +129,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 19 | int(math.lcm())
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-14 14 | int(int(''))
-15 15 | 
-16 16 | int(math.comb())
-17    |-int(math.factorial())
-   17 |+math.factorial()
-18 18 | int(math.gcd())
-19 19 | int(math.lcm())
-20 20 | int(math.isqrt())
+14 | int(int(''))
+15 | 
+16 | int(math.comb())
+   - int(math.factorial())
+17 + math.factorial()
+18 | int(math.gcd())
+19 | int(math.lcm())
+20 | int(math.isqrt())
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:18:1
@@ -163,16 +149,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 20 | int(math.isqrt())
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-15 15 | 
-16 16 | int(math.comb())
-17 17 | int(math.factorial())
-18    |-int(math.gcd())
-   18 |+math.gcd()
-19 19 | int(math.lcm())
-20 20 | int(math.isqrt())
-21 21 | int(math.perm())
+15 | 
+16 | int(math.comb())
+17 | int(math.factorial())
+   - int(math.gcd())
+18 + math.gcd()
+19 | int(math.lcm())
+20 | int(math.isqrt())
+21 | int(math.perm())
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:19:1
@@ -185,16 +169,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 21 | int(math.perm())
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-16 16 | int(math.comb())
-17 17 | int(math.factorial())
-18 18 | int(math.gcd())
-19    |-int(math.lcm())
-   19 |+math.lcm()
-20 20 | int(math.isqrt())
-21 21 | int(math.perm())
-22 22 | 
+16 | int(math.comb())
+17 | int(math.factorial())
+18 | int(math.gcd())
+   - int(math.lcm())
+19 + math.lcm()
+20 | int(math.isqrt())
+21 | int(math.perm())
+22 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:20:1
@@ -206,16 +188,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 21 | int(math.perm())
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-17 17 | int(math.factorial())
-18 18 | int(math.gcd())
-19 19 | int(math.lcm())
-20    |-int(math.isqrt())
-   20 |+math.isqrt()
-21 21 | int(math.perm())
-22 22 | 
-23 23 | int(round(1, 0))
+17 | int(math.factorial())
+18 | int(math.gcd())
+19 | int(math.lcm())
+   - int(math.isqrt())
+20 + math.isqrt()
+21 | int(math.perm())
+22 | 
+23 | int(round(1, 0))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:21:1
@@ -228,16 +208,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 23 | int(round(1, 0))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-18 18 | int(math.gcd())
-19 19 | int(math.lcm())
-20 20 | int(math.isqrt())
-21    |-int(math.perm())
-   21 |+math.perm()
-22 22 | 
-23 23 | int(round(1, 0))
-24 24 | int(round(1, 10))
+18 | int(math.gcd())
+19 | int(math.lcm())
+20 | int(math.isqrt())
+   - int(math.perm())
+21 + math.perm()
+22 | 
+23 | int(round(1, 0))
+24 | int(round(1, 10))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:23:1
@@ -249,16 +227,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 24 | int(round(1, 10))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-20 20 | int(math.isqrt())
-21 21 | int(math.perm())
-22 22 | 
-23    |-int(round(1, 0))
-   23 |+round(1, 0)
-24 24 | int(round(1, 10))
-25 25 | 
-26 26 | int(round(1))
+20 | int(math.isqrt())
+21 | int(math.perm())
+22 | 
+   - int(round(1, 0))
+23 + round(1, 0)
+24 | int(round(1, 10))
+25 | 
+26 | int(round(1))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:24:1
@@ -270,16 +246,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 26 | int(round(1))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-21 21 | int(math.perm())
-22 22 | 
-23 23 | int(round(1, 0))
-24    |-int(round(1, 10))
-   24 |+round(1, 10)
-25 25 | 
-26 26 | int(round(1))
-27 27 | int(round(1, None))
+21 | int(math.perm())
+22 | 
+23 | int(round(1, 0))
+   - int(round(1, 10))
+24 + round(1, 10)
+25 | 
+26 | int(round(1))
+27 | int(round(1, None))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:26:1
@@ -291,16 +265,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 27 | int(round(1, None))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-23 23 | int(round(1, 0))
-24 24 | int(round(1, 10))
-25 25 | 
-26    |-int(round(1))
-   26 |+round(1)
-27 27 | int(round(1, None))
-28 28 | 
-29 29 | int(round(1.))
+23 | int(round(1, 0))
+24 | int(round(1, 10))
+25 | 
+   - int(round(1))
+26 + round(1)
+27 | int(round(1, None))
+28 | 
+29 | int(round(1.))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:27:1
@@ -312,16 +284,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 29 | int(round(1.))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-24 24 | int(round(1, 10))
-25 25 | 
-26 26 | int(round(1))
-27    |-int(round(1, None))
-   27 |+round(1, None)
-28 28 | 
-29 29 | int(round(1.))
-30 30 | int(round(1., None))
+24 | int(round(1, 10))
+25 | 
+26 | int(round(1))
+   - int(round(1, None))
+27 + round(1, None)
+28 | 
+29 | int(round(1.))
+30 | int(round(1., None))
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:29:1
@@ -333,16 +303,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 30 | int(round(1., None))
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-26 26 | int(round(1))
-27 27 | int(round(1, None))
-28 28 | 
-29    |-int(round(1.))
-   29 |+round(1.)
-30 30 | int(round(1., None))
-31 31 | 
-32 32 | int(1)
+26 | int(round(1))
+27 | int(round(1, None))
+28 | 
+   - int(round(1.))
+29 + round(1.)
+30 | int(round(1., None))
+31 | 
+32 | int(1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:30:1
@@ -354,16 +322,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 32 | int(1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-27 27 | int(round(1, None))
-28 28 | 
-29 29 | int(round(1.))
-30    |-int(round(1., None))
-   30 |+round(1., None)
-31 31 | 
-32 32 | int(1)
-33 33 | int(v := 1)
+27 | int(round(1, None))
+28 | 
+29 | int(round(1.))
+   - int(round(1., None))
+30 + round(1., None)
+31 | 
+32 | int(1)
+33 | int(v := 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:32:1
@@ -376,16 +342,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 34 | int(~1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-29 29 | int(round(1.))
-30 30 | int(round(1., None))
-31 31 | 
-32    |-int(1)
-   32 |+1
-33 33 | int(v := 1)
-34 34 | int(~1)
-35 35 | int(-1)
+29 | int(round(1.))
+30 | int(round(1., None))
+31 | 
+   - int(1)
+32 + 1
+33 | int(v := 1)
+34 | int(~1)
+35 | int(-1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:33:1
@@ -397,16 +361,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 35 | int(-1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-30 30 | int(round(1., None))
-31 31 | 
-32 32 | int(1)
-33    |-int(v := 1)
-   33 |+(v := 1)
-34 34 | int(~1)
-35 35 | int(-1)
-36 36 | int(+1)
+30 | int(round(1., None))
+31 | 
+32 | int(1)
+   - int(v := 1)
+33 + (v := 1)
+34 | int(~1)
+35 | int(-1)
+36 | int(+1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:34:1
@@ -419,16 +381,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 36 | int(+1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-31 31 | 
-32 32 | int(1)
-33 33 | int(v := 1)
-34    |-int(~1)
-   34 |+~1
-35 35 | int(-1)
-36 36 | int(+1)
-37 37 | 
+31 | 
+32 | int(1)
+33 | int(v := 1)
+   - int(~1)
+34 + ~1
+35 | int(-1)
+36 | int(+1)
+37 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:35:1
@@ -440,16 +400,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 36 | int(+1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-32 32 | int(1)
-33 33 | int(v := 1)
-34 34 | int(~1)
-35    |-int(-1)
-   35 |+-1
-36 36 | int(+1)
-37 37 | 
-38 38 | int(1 + 1)
+32 | int(1)
+33 | int(v := 1)
+34 | int(~1)
+   - int(-1)
+35 + -1
+36 | int(+1)
+37 | 
+38 | int(1 + 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:36:1
@@ -462,16 +420,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 38 | int(1 + 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-33 33 | int(v := 1)
-34 34 | int(~1)
-35 35 | int(-1)
-36    |-int(+1)
-   36 |++1
-37 37 | 
-38 38 | int(1 + 1)
-39 39 | int(1 - 1)
+33 | int(v := 1)
+34 | int(~1)
+35 | int(-1)
+   - int(+1)
+36 + +1
+37 | 
+38 | int(1 + 1)
+39 | int(1 - 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:38:1
@@ -484,16 +440,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 40 | int(1 * 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-35 35 | int(-1)
-36 36 | int(+1)
-37 37 | 
-38    |-int(1 + 1)
-   38 |+1 + 1
-39 39 | int(1 - 1)
-40 40 | int(1 * 1)
-41 41 | int(1 % 1)
+35 | int(-1)
+36 | int(+1)
+37 | 
+   - int(1 + 1)
+38 + 1 + 1
+39 | int(1 - 1)
+40 | int(1 * 1)
+41 | int(1 % 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:39:1
@@ -505,16 +459,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 41 | int(1 % 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-36 36 | int(+1)
-37 37 | 
-38 38 | int(1 + 1)
-39    |-int(1 - 1)
-   39 |+1 - 1
-40 40 | int(1 * 1)
-41 41 | int(1 % 1)
-42 42 | int(1 ** 1)
+36 | int(+1)
+37 | 
+38 | int(1 + 1)
+   - int(1 - 1)
+39 + 1 - 1
+40 | int(1 * 1)
+41 | int(1 % 1)
+42 | int(1 ** 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:40:1
@@ -527,16 +479,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 42 | int(1 ** 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-37 37 | 
-38 38 | int(1 + 1)
-39 39 | int(1 - 1)
-40    |-int(1 * 1)
-   40 |+1 * 1
-41 41 | int(1 % 1)
-42 42 | int(1 ** 1)
-43 43 | int(1 << 1)
+37 | 
+38 | int(1 + 1)
+39 | int(1 - 1)
+   - int(1 * 1)
+40 + 1 * 1
+41 | int(1 % 1)
+42 | int(1 ** 1)
+43 | int(1 << 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:41:1
@@ -549,16 +499,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 43 | int(1 << 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-38 38 | int(1 + 1)
-39 39 | int(1 - 1)
-40 40 | int(1 * 1)
-41    |-int(1 % 1)
-   41 |+1 % 1
-42 42 | int(1 ** 1)
-43 43 | int(1 << 1)
-44 44 | int(1 >> 1)
+38 | int(1 + 1)
+39 | int(1 - 1)
+40 | int(1 * 1)
+   - int(1 % 1)
+41 + 1 % 1
+42 | int(1 ** 1)
+43 | int(1 << 1)
+44 | int(1 >> 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:42:1
@@ -571,16 +519,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 44 | int(1 >> 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-39 39 | int(1 - 1)
-40 40 | int(1 * 1)
-41 41 | int(1 % 1)
-42    |-int(1 ** 1)
-   42 |+1 ** 1
-43 43 | int(1 << 1)
-44 44 | int(1 >> 1)
-45 45 | int(1 | 1)
+39 | int(1 - 1)
+40 | int(1 * 1)
+41 | int(1 % 1)
+   - int(1 ** 1)
+42 + 1 ** 1
+43 | int(1 << 1)
+44 | int(1 >> 1)
+45 | int(1 | 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:43:1
@@ -593,16 +539,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 45 | int(1 | 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-40 40 | int(1 * 1)
-41 41 | int(1 % 1)
-42 42 | int(1 ** 1)
-43    |-int(1 << 1)
-   43 |+1 << 1
-44 44 | int(1 >> 1)
-45 45 | int(1 | 1)
-46 46 | int(1 ^ 1)
+40 | int(1 * 1)
+41 | int(1 % 1)
+42 | int(1 ** 1)
+   - int(1 << 1)
+43 + 1 << 1
+44 | int(1 >> 1)
+45 | int(1 | 1)
+46 | int(1 ^ 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:44:1
@@ -615,16 +559,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 46 | int(1 ^ 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-41 41 | int(1 % 1)
-42 42 | int(1 ** 1)
-43 43 | int(1 << 1)
-44    |-int(1 >> 1)
-   44 |+1 >> 1
-45 45 | int(1 | 1)
-46 46 | int(1 ^ 1)
-47 47 | int(1 & 1)
+41 | int(1 % 1)
+42 | int(1 ** 1)
+43 | int(1 << 1)
+   - int(1 >> 1)
+44 + 1 >> 1
+45 | int(1 | 1)
+46 | int(1 ^ 1)
+47 | int(1 & 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:45:1
@@ -637,16 +579,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 47 | int(1 & 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-42 42 | int(1 ** 1)
-43 43 | int(1 << 1)
-44 44 | int(1 >> 1)
-45    |-int(1 | 1)
-   45 |+1 | 1
-46 46 | int(1 ^ 1)
-47 47 | int(1 & 1)
-48 48 | int(1 // 1)
+42 | int(1 ** 1)
+43 | int(1 << 1)
+44 | int(1 >> 1)
+   - int(1 | 1)
+45 + 1 | 1
+46 | int(1 ^ 1)
+47 | int(1 & 1)
+48 | int(1 // 1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:46:1
@@ -659,16 +599,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 48 | int(1 // 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-43 43 | int(1 << 1)
-44 44 | int(1 >> 1)
-45 45 | int(1 | 1)
-46    |-int(1 ^ 1)
-   46 |+1 ^ 1
-47 47 | int(1 & 1)
-48 48 | int(1 // 1)
-49 49 | 
+43 | int(1 << 1)
+44 | int(1 >> 1)
+45 | int(1 | 1)
+   - int(1 ^ 1)
+46 + 1 ^ 1
+47 | int(1 & 1)
+48 | int(1 // 1)
+49 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:47:1
@@ -680,16 +618,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 48 | int(1 // 1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-44 44 | int(1 >> 1)
-45 45 | int(1 | 1)
-46 46 | int(1 ^ 1)
-47    |-int(1 & 1)
-   47 |+1 & 1
-48 48 | int(1 // 1)
-49 49 | 
-50 50 | int(1 if ... else 2)
+44 | int(1 >> 1)
+45 | int(1 | 1)
+46 | int(1 ^ 1)
+   - int(1 & 1)
+47 + 1 & 1
+48 | int(1 // 1)
+49 | 
+50 | int(1 if ... else 2)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:48:1
@@ -702,16 +638,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 50 | int(1 if ... else 2)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-45 45 | int(1 | 1)
-46 46 | int(1 ^ 1)
-47 47 | int(1 & 1)
-48    |-int(1 // 1)
-   48 |+1 // 1
-49 49 | 
-50 50 | int(1 if ... else 2)
-51 51 | 
+45 | int(1 | 1)
+46 | int(1 ^ 1)
+47 | int(1 & 1)
+   - int(1 // 1)
+48 + 1 // 1
+49 | 
+50 | int(1 if ... else 2)
+51 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:50:1
@@ -724,16 +658,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 52 | int(1 and 0)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-47 47 | int(1 & 1)
-48 48 | int(1 // 1)
-49 49 | 
-50    |-int(1 if ... else 2)
-   50 |+1 if ... else 2
-51 51 | 
-52 52 | int(1 and 0)
-53 53 | int(0 or -1)
+47 | int(1 & 1)
+48 | int(1 // 1)
+49 | 
+   - int(1 if ... else 2)
+50 + 1 if ... else 2
+51 | 
+52 | int(1 and 0)
+53 | int(0 or -1)
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:52:1
@@ -745,16 +677,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 53 | int(0 or -1)
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-49 49 | 
-50 50 | int(1 if ... else 2)
-51 51 | 
-52    |-int(1 and 0)
-   52 |+1 and 0
-53 53 | int(0 or -1)
-54 54 | 
-55 55 | 
+49 | 
+50 | int(1 if ... else 2)
+51 | 
+   - int(1 and 0)
+52 + 1 and 0
+53 | int(0 or -1)
+54 | 
+55 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:53:1
@@ -764,16 +694,14 @@ RUF046 [*] Value being cast to `int` is already an integer
    | ^^^^^^^^^^^^
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-50 50 | int(1 if ... else 2)
-51 51 | 
-52 52 | int(1 and 0)
-53    |-int(0 or -1)
-   53 |+0 or -1
-54 54 | 
-55 55 | 
-56 56 | if int(1 + 2) * 3:
+50 | int(1 if ... else 2)
+51 | 
+52 | int(1 and 0)
+   - int(0 or -1)
+53 + 0 or -1
+54 | 
+55 | 
+56 | if int(1 + 2) * 3:
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:56:4
@@ -783,16 +711,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 57 |     ...
    |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-53 53 | int(0 or -1)
-54 54 | 
-55 55 | 
-56    |-if int(1 + 2) * 3:
-   56 |+if (1 + 2) * 3:
-57 57 |     ...
-58 58 | 
-59 59 | 
+53 | int(0 or -1)
+54 | 
+55 | 
+   - if int(1 + 2) * 3:
+56 + if (1 + 2) * 3:
+57 |     ...
+58 | 
+59 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:62:1
@@ -805,16 +731,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 64 | int(math.trunc())
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-59 59 | 
-60 60 | ### Unsafe
-61 61 | 
-62    |-int(math.ceil())
-   62 |+math.ceil()
-63 63 | int(math.floor())
-64 64 | int(math.trunc())
-65 65 | 
+59 | 
+60 | ### Unsafe
+61 | 
+   - int(math.ceil())
+62 + math.ceil()
+63 | int(math.floor())
+64 | int(math.trunc())
+65 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:63:1
@@ -825,16 +750,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 64 | int(math.trunc())
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-60 60 | ### Unsafe
-61 61 | 
-62 62 | int(math.ceil())
-63    |-int(math.floor())
-   63 |+math.floor()
-64 64 | int(math.trunc())
-65 65 | 
-66 66 | int(round(inferred_int, 0))
+60 | ### Unsafe
+61 | 
+62 | int(math.ceil())
+   - int(math.floor())
+63 + math.floor()
+64 | int(math.trunc())
+65 | 
+66 | int(round(inferred_int, 0))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:64:1
@@ -847,16 +771,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 66 | int(round(inferred_int, 0))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-61 61 | 
-62 62 | int(math.ceil())
-63 63 | int(math.floor())
-64    |-int(math.trunc())
-   64 |+math.trunc()
-65 65 | 
-66 66 | int(round(inferred_int, 0))
-67 67 | int(round(inferred_int, 10))
+61 | 
+62 | int(math.ceil())
+63 | int(math.floor())
+   - int(math.trunc())
+64 + math.trunc()
+65 | 
+66 | int(round(inferred_int, 0))
+67 | int(round(inferred_int, 10))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:66:1
@@ -868,16 +791,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 67 | int(round(inferred_int, 10))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-63 63 | int(math.floor())
-64 64 | int(math.trunc())
-65 65 | 
-66    |-int(round(inferred_int, 0))
-   66 |+round(inferred_int, 0)
-67 67 | int(round(inferred_int, 10))
-68 68 | 
-69 69 | int(round(inferred_int))
+63 | int(math.floor())
+64 | int(math.trunc())
+65 | 
+   - int(round(inferred_int, 0))
+66 + round(inferred_int, 0)
+67 | int(round(inferred_int, 10))
+68 | 
+69 | int(round(inferred_int))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:67:1
@@ -889,16 +811,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 69 | int(round(inferred_int))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-64 64 | int(math.trunc())
-65 65 | 
-66 66 | int(round(inferred_int, 0))
-67    |-int(round(inferred_int, 10))
-   67 |+round(inferred_int, 10)
-68 68 | 
-69 69 | int(round(inferred_int))
-70 70 | int(round(inferred_int, None))
+64 | int(math.trunc())
+65 | 
+66 | int(round(inferred_int, 0))
+   - int(round(inferred_int, 10))
+67 + round(inferred_int, 10)
+68 | 
+69 | int(round(inferred_int))
+70 | int(round(inferred_int, None))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:69:1
@@ -910,16 +831,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 70 | int(round(inferred_int, None))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-66 66 | int(round(inferred_int, 0))
-67 67 | int(round(inferred_int, 10))
-68 68 | 
-69    |-int(round(inferred_int))
-   69 |+round(inferred_int)
-70 70 | int(round(inferred_int, None))
-71 71 | 
-72 72 | int(round(inferred_float))
+66 | int(round(inferred_int, 0))
+67 | int(round(inferred_int, 10))
+68 | 
+   - int(round(inferred_int))
+69 + round(inferred_int)
+70 | int(round(inferred_int, None))
+71 | 
+72 | int(round(inferred_float))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:70:1
@@ -931,16 +851,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 72 | int(round(inferred_float))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-67 67 | int(round(inferred_int, 10))
-68 68 | 
-69 69 | int(round(inferred_int))
-70    |-int(round(inferred_int, None))
-   70 |+round(inferred_int, None)
-71 71 | 
-72 72 | int(round(inferred_float))
-73 73 | int(round(inferred_float, None))
+67 | int(round(inferred_int, 10))
+68 | 
+69 | int(round(inferred_int))
+   - int(round(inferred_int, None))
+70 + round(inferred_int, None)
+71 | 
+72 | int(round(inferred_float))
+73 | int(round(inferred_float, None))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:72:1
@@ -952,16 +871,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 73 | int(round(inferred_float, None))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-69 69 | int(round(inferred_int))
-70 70 | int(round(inferred_int, None))
-71 71 | 
-72    |-int(round(inferred_float))
-   72 |+round(inferred_float)
-73 73 | int(round(inferred_float, None))
-74 74 | 
-75 75 | int(round(unknown))
+69 | int(round(inferred_int))
+70 | int(round(inferred_int, None))
+71 | 
+   - int(round(inferred_float))
+72 + round(inferred_float)
+73 | int(round(inferred_float, None))
+74 | 
+75 | int(round(unknown))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:73:1
@@ -973,16 +891,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 75 | int(round(unknown))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-70 70 | int(round(inferred_int, None))
-71 71 | 
-72 72 | int(round(inferred_float))
-73    |-int(round(inferred_float, None))
-   73 |+round(inferred_float, None)
-74 74 | 
-75 75 | int(round(unknown))
-76 76 | int(round(unknown, None))
+70 | int(round(inferred_int, None))
+71 | 
+72 | int(round(inferred_float))
+   - int(round(inferred_float, None))
+73 + round(inferred_float, None)
+74 | 
+75 | int(round(unknown))
+76 | int(round(unknown, None))
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:75:1
@@ -994,16 +911,15 @@ RUF046 [*] Value being cast to `int` is already an integer
 76 | int(round(unknown, None))
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-72 72 | int(round(inferred_float))
-73 73 | int(round(inferred_float, None))
-74 74 | 
-75    |-int(round(unknown))
-   75 |+round(unknown)
-76 76 | int(round(unknown, None))
-77 77 | 
-78 78 | 
+72 | int(round(inferred_float))
+73 | int(round(inferred_float, None))
+74 | 
+   - int(round(unknown))
+75 + round(unknown)
+76 | int(round(unknown, None))
+77 | 
+78 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
   --> RUF046.py:76:1
@@ -1013,16 +929,15 @@ RUF046 [*] Value being cast to `int` is already an integer
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-73 73 | int(round(inferred_float, None))
-74 74 | 
-75 75 | int(round(unknown))
-76    |-int(round(unknown, None))
-   76 |+round(unknown, None)
-77 77 | 
-78 78 | 
-79 79 | ### No errors
+73 | int(round(inferred_float, None))
+74 | 
+75 | int(round(unknown))
+   - int(round(unknown, None))
+76 + round(unknown, None)
+77 | 
+78 | 
+79 | ### No errors
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:158:1
@@ -1036,16 +951,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 161 |   int(round(1,
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-155 155 | 
-156 156 | int(1. if ... else .2)
-157 157 | 
-158     |-int(1 +
-    158 |+(1 +
-159 159 |     1)
-160 160 | 
-161 161 | int(round(1,
+155 | 
+156 | int(1. if ... else .2)
+157 | 
+    - int(1 +
+158 + (1 +
+159 |     1)
+160 | 
+161 | int(round(1,
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:161:1
@@ -1059,18 +972,16 @@ RUF046 [*] Value being cast to `int` is already an integer
 164 |   # function calls may need to retain parentheses
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-158 158 | int(1 +
-159 159 |     1)
-160 160 | 
-161     |-int(round(1,
-162     |-          0))
-    161 |+round(1,
-    162 |+          0)
-163 163 | 
-164 164 | # function calls may need to retain parentheses
-165 165 | # if the parentheses for the call itself
+158 | int(1 +
+159 |     1)
+160 | 
+    - int(round(1,
+    -           0))
+161 + round(1,
+162 +           0)
+163 | 
+164 | # function calls may need to retain parentheses
+165 | # if the parentheses for the call itself
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:168:1
@@ -1084,16 +995,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 171 |   int(round # a comment
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-165 165 | # if the parentheses for the call itself
-166 166 | # lie on the next line.
-167 167 | # See https://github.com/astral-sh/ruff/issues/15263
-168     |-int(round
-    168 |+(round
-169 169 | (1))
-170 170 | 
-171 171 | int(round # a comment
+165 | # if the parentheses for the call itself
+166 | # lie on the next line.
+167 | # See https://github.com/astral-sh/ruff/issues/15263
+    - int(round
+168 + (round
+169 | (1))
+170 | 
+171 | int(round # a comment
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:171:1
@@ -1109,20 +1018,18 @@ RUF046 [*] Value being cast to `int` is already an integer
 176 |   int(round (17)) # this is safe without parens
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-168 168 | int(round
-169 169 | (1))
-170 170 | 
-171     |-int(round # a comment
-    171 |+(round # a comment
-172 172 | # and another comment
-173     |-(10)
-174     |-)
-    173 |+(10))
-175 174 | 
-176 175 | int(round (17)) # this is safe without parens
-177 176 | 
+168 | int(round
+169 | (1))
+170 | 
+    - int(round # a comment
+171 + (round # a comment
+172 | # and another comment
+    - (10)
+    - )
+173 + (10))
+174 | 
+175 | int(round (17)) # this is safe without parens
+176 | 
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:176:1
@@ -1135,16 +1042,14 @@ RUF046 [*] Value being cast to `int` is already an integer
 178 | int( round (
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-173 173 | (10)
-174 174 | )
-175 175 | 
-176     |-int(round (17)) # this is safe without parens
-    176 |+round (17) # this is safe without parens
-177 177 | 
-178 178 | int( round (
-179 179 |                 17
+173 | (10)
+174 | )
+175 | 
+    - int(round (17)) # this is safe without parens
+176 + round (17) # this is safe without parens
+177 | 
+178 | int( round (
+179 |                 17
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:178:1
@@ -1159,19 +1064,17 @@ RUF046 [*] Value being cast to `int` is already an integer
 182 |   int((round)  # Comment
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-175 175 | 
-176 176 | int(round (17)) # this is safe without parens
-177 177 | 
-178     |-int( round (
-    178 |+round (
-179 179 |                 17
-180     |-            )) # this is also safe without parens
-    180 |+            ) # this is also safe without parens
-181 181 | 
-182 182 | int((round)  # Comment
-183 183 | (42)
+175 | 
+176 | int(round (17)) # this is safe without parens
+177 | 
+    - int( round (
+178 + round (
+179 |                 17
+    -             )) # this is also safe without parens
+180 +             ) # this is also safe without parens
+181 | 
+182 | int((round)  # Comment
+183 | (42)
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:182:1
@@ -1186,19 +1089,17 @@ RUF046 [*] Value being cast to `int` is already an integer
 186 |   int((round  # Comment
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-179 179 |                 17
-180 180 |             )) # this is also safe without parens
-181 181 | 
-182     |-int((round)  # Comment
-183     |-(42)
-184     |-)
-    182 |+((round)  # Comment
-    183 |+(42))
-185 184 | 
-186 185 | int((round  # Comment
-187 186 | )(42)
+179 |                 17
+180 |             )) # this is also safe without parens
+181 | 
+    - int((round)  # Comment
+    - (42)
+    - )
+182 + ((round)  # Comment
+183 + (42))
+184 | 
+185 | int((round  # Comment
+186 | )(42)
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:186:1
@@ -1213,18 +1114,16 @@ RUF046 [*] Value being cast to `int` is already an integer
 190 |   int(  # Unsafe fix because of this comment
     |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-183 183 | (42)
-184 184 | )
-185 185 | 
-186     |-int((round  # Comment
-    186 |+(round  # Comment
-187 187 | )(42)
-188     |-)
-189 188 | 
-190 189 | int(  # Unsafe fix because of this comment
-191 190 | (  # Comment
+183 | (42)
+184 | )
+185 | 
+    - int((round  # Comment
+186 + (round  # Comment
+187 | )(42)
+    - )
+188 | 
+189 | int(  # Unsafe fix because of this comment
+190 | (  # Comment
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:190:1
@@ -1242,20 +1141,19 @@ RUF046 [*] Value being cast to `int` is already an integer
 197 |   int(
     |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-187 187 | )(42)
-188 188 | )
-189 189 | 
-190     |-int(  # Unsafe fix because of this comment
-191 190 | (  # Comment
-192 191 |     (round
-193 192 | )  # Comment
-194 193 | )(42)
-195     |-)
-196 194 | 
-197 195 | int(
-198 196 |     round(
+187 | )(42)
+188 | )
+189 | 
+    - int(  # Unsafe fix because of this comment
+190 | (  # Comment
+191 |     (round
+192 | )  # Comment
+193 | )(42)
+    - )
+194 | 
+195 | int(
+196 |     round(
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:197:1
@@ -1272,21 +1170,20 @@ RUF046 [*] Value being cast to `int` is already an integer
 203 |   int(
     |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-194 194 | )(42)
-195 195 | )
-196 196 | 
-197     |-int(
-198     |-    round(
-    197 |+round(
-199 198 |         42
-200     |-    ) # unsafe fix because of this comment
-201     |-)
-    199 |+    )
-202 200 | 
-203 201 | int(
-204 202 |     round(
+194 | )(42)
+195 | )
+196 | 
+    - int(
+    -     round(
+197 + round(
+198 |         42
+    -     ) # unsafe fix because of this comment
+    - )
+199 +     )
+200 | 
+201 | int(
+202 |     round(
+note: This is an unsafe fix and may change runtime behavior
 
 RUF046 [*] Value being cast to `int` is already an integer
    --> RUF046.py:203:1
@@ -1302,16 +1199,15 @@ RUF046 [*] Value being cast to `int` is already an integer
     | |_^
     |
 help: Remove unnecessary `int` call
-
-ℹ Unsafe fix
-200 200 |     ) # unsafe fix because of this comment
-201 201 | )
-202 202 | 
-203     |-int(
-204     |-    round(
-    203 |+round(
-205 204 |         42
-206     |-    ) 
-207     |-# unsafe fix because of this comment
-208     |-)
-    205 |+    )
+200 |     ) # unsafe fix because of this comment
+201 | )
+202 | 
+    - int(
+    -     round(
+203 + round(
+204 |         42
+    -     ) 
+    - # unsafe fix because of this comment
+    - )
+205 +     )
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap
index 9451245979..b130cd1233 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap
@@ -9,6 +9,4 @@ RUF046 [*] Value being cast to `int` is already an integer
   | |______^
   |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-1   |-int(-
  1 |+(-
2 2 |     1) # Carriage return as newline
+  - int(-
1 + (-
2 |     1) # Carriage return as newline
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap
index 97b2815ed0..d2e413a39e 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap
@@ -10,9 +10,7 @@ RUF046 [*] Value being cast to `int` is already an integer
   | |______^
   |
 help: Remove unnecessary `int` call
-
-ℹ Safe fix
-1 1 | # \n as newline
-2   |-int(-
-  2 |+(-
-3 3 |     1)
+1 | # \n as newline
+  - int(-
+2 + (-
+3 |     1)
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap
index d3418eb4ab..8ca8916d3f 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap
@@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause
   | |________^
   |
 help: Remove the `else` clause
-
-ℹ Safe fix
-3 3 | for _ in range(0):
-4 4 |     loop_body_is_not_checked()
-5 5 |     break
-6   |-else:
-7   |-    pass
-8 6 | 
-9 7 | 
-10 8 | for this in comment:
+3 | for _ in range(0):
+4 |     loop_body_is_not_checked()
+5 |     break
+  - else:
+  -     pass
+6 | 
+7 | 
+8 | for this in comment:
 
 RUF047 [*] Empty `else` clause
   --> RUF047_for.py:12:1
@@ -32,13 +30,11 @@ RUF047 [*] Empty `else` clause
    | |_______^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-9  9  | 
-10 10 | for this in comment:
-11 11 |     belongs_to()  # `for`
-12    |-else:
-13    |-    ...
-14 12 | 
-15 13 | 
-16 14 | for of in course():
+9  | 
+10 | for this in comment:
+11 |     belongs_to()  # `for`
+   - else:
+   -     ...
+12 | 
+13 | 
+14 | for of in course():
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap
index dedd1f90f0..45bc6e2a70 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap
@@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause
   | |________^
   |
 help: Remove the `else` clause
-
-ℹ Safe fix
-2 2 | 
-3 3 | if False:
-4 4 |     condition_is_not_evaluated()
-5   |-else:
-6   |-    pass
-7 5 | 
-8 6 | 
-9 7 | if this_comment():
+2 | 
+3 | if False:
+4 |     condition_is_not_evaluated()
+  - else:
+  -     pass
+5 | 
+6 | 
+7 | if this_comment():
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:11:1
@@ -32,16 +30,14 @@ RUF047 [*] Empty `else` clause
    | |_______^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-8  8  | 
-9  9  | if this_comment():
-10 10 |     belongs_to()  # `if`
-11    |-else:
-12    |-    ...
-13 11 | 
-14 12 | 
-15 13 | if elif_is():
+8  | 
+9  | if this_comment():
+10 |     belongs_to()  # `if`
+   - else:
+   -     ...
+11 | 
+12 | 
+13 | if elif_is():
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:19:1
@@ -53,16 +49,14 @@ RUF047 [*] Empty `else` clause
    | |________^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-16 16 |     treated()
-17 17 | elif the_same():
-18 18 |     as_if()
-19    |-else:
-20    |-    pass
-21 19 | 
-22 20 | 
-23 21 | if this_second_comment():
+16 |     treated()
+17 | elif the_same():
+18 |     as_if()
+   - else:
+   -     pass
+19 | 
+20 | 
+21 | if this_second_comment():
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:26:1
@@ -76,16 +70,14 @@ RUF047 [*] Empty `else` clause
 29 |   if this_second_comment():
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-23 23 | if this_second_comment():
-24 24 |     belongs()  # to
-25 25 |       # `if`
-26    |-else:
-27    |-    pass
-28 26 | 
-29 27 | if this_second_comment():
-30 28 |     belongs()  # to
+23 | if this_second_comment():
+24 |     belongs()  # to
+25 |       # `if`
+   - else:
+   -     pass
+26 | 
+27 | if this_second_comment():
+28 |     belongs()  # to
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:32:1
@@ -97,16 +89,14 @@ RUF047 [*] Empty `else` clause
    | |________^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-29 29 | if this_second_comment():
-30 30 |     belongs()  # to
-31 31 |     # `if`
-32    |-else:
-33    |-    pass
-34 32 | 
-35 33 | 
-36 34 | if of_course():
+29 | if this_second_comment():
+30 |     belongs()  # to
+31 |     # `if`
+   - else:
+   -     pass
+32 | 
+33 | 
+34 | if of_course():
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:44:1
@@ -116,15 +106,13 @@ RUF047 [*] Empty `else` clause
    | ^^^^^^^^^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-41 41 | 
-42 42 | 
-43 43 | if of_course: this()
-44    |-else: ...
-45 44 | 
-46 45 | 
-47 46 | if of_course:
+41 | 
+42 | 
+43 | if of_course: this()
+   - else: ...
+44 | 
+45 | 
+46 | if of_course:
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:49:1
@@ -135,15 +123,13 @@ RUF047 [*] Empty `else` clause
    | ^^^^^^^^^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-46 46 | 
-47 47 | if of_course:
-48 48 |     this() # comment
-49    |-else: ...
-50 49 | 
-51 50 | 
-52 51 | def nested():
+46 | 
+47 | if of_course:
+48 |     this() # comment
+   - else: ...
+49 | 
+50 | 
+51 | def nested():
 
 RUF047 [*] Empty `else` clause
   --> RUF047_if.py:55:5
@@ -155,13 +141,11 @@ RUF047 [*] Empty `else` clause
    | |___________^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-52 52 | def nested():
-53 53 |     if a:
-54 54 |         b()
-55    |-    else:
-56    |-        ...
-57 55 | 
-58 56 | 
-59 57 | ### No errors
+52 | def nested():
+53 |     if a:
+54 |         b()
+   -     else:
+   -         ...
+55 | 
+56 | 
+57 | ### No errors
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap
index 1677b1ca0d..7690c8b504 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap
@@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause
   | |________^
   |
 help: Remove the `else` clause
-
-ℹ Safe fix
-4 4 |     raise try_body_is_not_checked()
-5 5 | except:
-6 6 |     pass
-7   |-else:
-8   |-    pass
-9 7 | 
-10 8 | 
-11 9 | try:
+4 |     raise try_body_is_not_checked()
+5 | except:
+6 |     pass
+  - else:
+  -     pass
+7 | 
+8 | 
+9 | try:
 
 RUF047 [*] Empty `else` clause
   --> RUF047_try.py:17:1
@@ -32,13 +30,11 @@ RUF047 [*] Empty `else` clause
    | |_______^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-14 14 |     belongs()
-15 15 | except:
-16 16 |     to()  # `except`
-17    |-else:
-18    |-    ...
-19 17 | 
-20 18 | 
-21 19 | try:
+14 |     belongs()
+15 | except:
+16 |     to()  # `except`
+   - else:
+   -     ...
+17 | 
+18 | 
+19 | try:
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap
index dd8bbd01fc..bb90b60015 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap
@@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause
   | |________^
   |
 help: Remove the `else` clause
-
-ℹ Safe fix
-3 3 | while True:
-4 4 |     loop_body_is_not_checked()
-5 5 |     break
-6   |-else:
-7   |-    pass
-8 6 | 
-9 7 | 
-10 8 | while this_comment:
+3 | while True:
+4 |     loop_body_is_not_checked()
+5 |     break
+  - else:
+  -     pass
+6 | 
+7 | 
+8 | while this_comment:
 
 RUF047 [*] Empty `else` clause
   --> RUF047_while.py:12:1
@@ -32,13 +30,11 @@ RUF047 [*] Empty `else` clause
    | |_______^
    |
 help: Remove the `else` clause
-
-ℹ Safe fix
-9  9  | 
-10 10 | while this_comment:
-11 11 |     belongs_to()  # `for`
-12    |-else:
-13    |-    ...
-14 12 | 
-15 13 | 
-16 14 | while of_course():
+9  | 
+10 | while this_comment:
+11 |     belongs_to()  # `for`
+   - else:
+   -     ...
+12 | 
+13 | 
+14 | while of_course():
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap
index c64bab5ddc..54def0c584 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap
@@ -11,17 +11,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 10 | if '' in d:                         # String
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-4 4 | 
-5 5 | ### Errors
-6 6 | 
-7   |-if k in d:                          # Bare name
-8   |-    del d[k]
-  7 |+d.pop(k, None)
-9 8 | 
-10 9 | if '' in d:                         # String
-11 10 |     del d[""]                       # Different quotes
+4  | 
+5  | ### Errors
+6  | 
+   - if k in d:                          # Bare name
+   -     del d[k]
+7  + d.pop(k, None)
+8  | 
+9  | if '' in d:                         # String
+10 |     del d[""]                       # Different quotes
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:11:5
@@ -33,17 +32,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 13 | if b"" in d:                        # Bytes
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-7  7  | if k in d:                          # Bare name
-8  8  |     del d[k]
-9  9  | 
-10    |-if '' in d:                         # String
-11    |-    del d[""]                       # Different quotes
-   10 |+d.pop('', None)                       # Different quotes
-12 11 | 
-13 12 | if b"" in d:                        # Bytes
-14 13 |     del d[                          # Multiline slice
+7  | if k in d:                          # Bare name
+8  |     del d[k]
+9  | 
+   - if '' in d:                         # String
+   -     del d[""]                       # Different quotes
+10 + d.pop('', None)                       # Different quotes
+11 | 
+12 | if b"" in d:                        # Bytes
+13 |     del d[                          # Multiline slice
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:14:5
@@ -57,19 +55,18 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 18 |   if 0 in d: del d[0]                 # Single-line statement
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-10 10 | if '' in d:                         # String
-11 11 |     del d[""]                       # Different quotes
-12 12 | 
-13    |-if b"" in d:                        # Bytes
-14    |-    del d[                          # Multiline slice
-15    |-        b''''''                     # Triple quotes
-16    |-    ]
-   13 |+d.pop(b"", None)
-17 14 | 
-18 15 | if 0 in d: del d[0]                 # Single-line statement
-19 16 | 
+10 | if '' in d:                         # String
+11 |     del d[""]                       # Different quotes
+12 | 
+   - if b"" in d:                        # Bytes
+   -     del d[                          # Multiline slice
+   -         b''''''                     # Triple quotes
+   -     ]
+13 + d.pop(b"", None)
+14 | 
+15 | if 0 in d: del d[0]                 # Single-line statement
+16 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:18:12
@@ -82,16 +79,14 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 20 | if 3j in d:                         # Complex
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-15 15 |         b''''''                     # Triple quotes
-16 16 |     ]
-17 17 | 
-18    |-if 0 in d: del d[0]                 # Single-line statement
-   18 |+d.pop(0, None)                 # Single-line statement
-19 19 | 
-20 20 | if 3j in d:                         # Complex
-21 21 |     del d[3j]
+15 |         b''''''                     # Triple quotes
+16 |     ]
+17 | 
+   - if 0 in d: del d[0]                 # Single-line statement
+18 + d.pop(0, None)                 # Single-line statement
+19 | 
+20 | if 3j in d:                         # Complex
+21 |     del d[3j]
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:21:5
@@ -103,17 +98,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 23 | if 0.1234 in d:                     # Float
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | if 0 in d: del d[0]                 # Single-line statement
-19 19 | 
-20    |-if 3j in d:                         # Complex
-21    |-    del d[3j]
-   20 |+d.pop(3j, None)
-22 21 | 
-23 22 | if 0.1234 in d:                     # Float
-24 23 |     del d[.1_2_3_4]                 # Number separators and shorthand syntax
+17 | 
+18 | if 0 in d: del d[0]                 # Single-line statement
+19 | 
+   - if 3j in d:                         # Complex
+   -     del d[3j]
+20 + d.pop(3j, None)
+21 | 
+22 | if 0.1234 in d:                     # Float
+23 |     del d[.1_2_3_4]                 # Number separators and shorthand syntax
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:24:5
@@ -125,17 +119,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 26 | if True in d:                       # True
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-20 20 | if 3j in d:                         # Complex
-21 21 |     del d[3j]
-22 22 | 
-23    |-if 0.1234 in d:                     # Float
-24    |-    del d[.1_2_3_4]                 # Number separators and shorthand syntax
-   23 |+d.pop(0.1234, None)                 # Number separators and shorthand syntax
-25 24 | 
-26 25 | if True in d:                       # True
-27 26 |     del d[True]
+20 | if 3j in d:                         # Complex
+21 |     del d[3j]
+22 | 
+   - if 0.1234 in d:                     # Float
+   -     del d[.1_2_3_4]                 # Number separators and shorthand syntax
+23 + d.pop(0.1234, None)                 # Number separators and shorthand syntax
+24 | 
+25 | if True in d:                       # True
+26 |     del d[True]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:27:5
@@ -147,17 +140,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 29 | if False in d:                      # False
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-23 23 | if 0.1234 in d:                     # Float
-24 24 |     del d[.1_2_3_4]                 # Number separators and shorthand syntax
-25 25 | 
-26    |-if True in d:                       # True
-27    |-    del d[True]
-   26 |+d.pop(True, None)
-28 27 | 
-29 28 | if False in d:                      # False
-30 29 |     del d[False]
+23 | if 0.1234 in d:                     # Float
+24 |     del d[.1_2_3_4]                 # Number separators and shorthand syntax
+25 | 
+   - if True in d:                       # True
+   -     del d[True]
+26 + d.pop(True, None)
+27 | 
+28 | if False in d:                      # False
+29 |     del d[False]
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:30:5
@@ -169,17 +161,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 32 | if None in d:                       # None
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-26 26 | if True in d:                       # True
-27 27 |     del d[True]
-28 28 | 
-29    |-if False in d:                      # False
-30    |-    del d[False]
-   29 |+d.pop(False, None)
-31 30 | 
-32 31 | if None in d:                       # None
-33 32 |     del d[
+26 | if True in d:                       # True
+27 |     del d[True]
+28 | 
+   - if False in d:                      # False
+   -     del d[False]
+29 + d.pop(False, None)
+30 | 
+31 | if None in d:                       # None
+32 |     del d[
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:33:5
@@ -194,20 +185,19 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 38 |   if ... in d:                        # Ellipsis
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-29 29 | if False in d:                      # False
-30 30 |     del d[False]
-31 31 | 
-32    |-if None in d:                       # None
-33    |-    del d[
-34    |-        # Comment in the middle
-35    |-        None
-36    |-    ]
-   32 |+d.pop(None, None)
-37 33 | 
-38 34 | if ... in d:                        # Ellipsis
-39 35 |     del d[
+29 | if False in d:                      # False
+30 |     del d[False]
+31 | 
+   - if None in d:                       # None
+   -     del d[
+   -         # Comment in the middle
+   -         None
+   -     ]
+32 + d.pop(None, None)
+33 | 
+34 | if ... in d:                        # Ellipsis
+35 |     del d[
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:39:5
@@ -221,19 +211,18 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 43 |   if "a" "bc" in d:                   # String concatenation
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-35 35 |         None
-36 36 |     ]
-37 37 | 
-38    |-if ... in d:                        # Ellipsis
-39    |-    del d[
-40    |-                                    # Comment in the middle, indented
-41    |-        ...]
-   38 |+d.pop(..., None)
-42 39 | 
-43 40 | if "a" "bc" in d:                   # String concatenation
-44 41 |     del d['abc']
+35 |         None
+36 |     ]
+37 | 
+   - if ... in d:                        # Ellipsis
+   -     del d[
+   -                                     # Comment in the middle, indented
+   -         ...]
+38 + d.pop(..., None)
+39 | 
+40 | if "a" "bc" in d:                   # String concatenation
+41 |     del d['abc']
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:44:5
@@ -245,17 +234,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 46 | if r"\foo" in d:                    # Raw string
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-40 40 |                                     # Comment in the middle, indented
-41 41 |         ...]
-42 42 | 
-43    |-if "a" "bc" in d:                   # String concatenation
-44    |-    del d['abc']
-   43 |+d.pop("a" "bc", None)
-45 44 | 
-46 45 | if r"\foo" in d:                    # Raw string
-47 46 |     del d['\\foo']
+40 |                                     # Comment in the middle, indented
+41 |         ...]
+42 | 
+   - if "a" "bc" in d:                   # String concatenation
+   -     del d['abc']
+43 + d.pop("a" "bc", None)
+44 | 
+45 | if r"\foo" in d:                    # Raw string
+46 |     del d['\\foo']
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:47:5
@@ -267,17 +255,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 49 | if b'yt' b'es' in d:                # Bytes concatenation
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-43 43 | if "a" "bc" in d:                   # String concatenation
-44 44 |     del d['abc']
-45 45 | 
-46    |-if r"\foo" in d:                    # Raw string
-47    |-    del d['\\foo']
-   46 |+d.pop(r"\foo", None)
-48 47 | 
-49 48 | if b'yt' b'es' in d:                # Bytes concatenation
-50 49 |     del d[rb"""ytes"""]             # Raw bytes
+43 | if "a" "bc" in d:                   # String concatenation
+44 |     del d['abc']
+45 | 
+   - if r"\foo" in d:                    # Raw string
+   -     del d['\\foo']
+46 + d.pop(r"\foo", None)
+47 | 
+48 | if b'yt' b'es' in d:                # Bytes concatenation
+49 |     del d[rb"""ytes"""]             # Raw bytes
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:50:5
@@ -289,17 +276,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 52 | if k in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-46 46 | if r"\foo" in d:                    # Raw string
-47 47 |     del d['\\foo']
-48 48 | 
-49    |-if b'yt' b'es' in d:                # Bytes concatenation
-50    |-    del d[rb"""ytes"""]             # Raw bytes
-   49 |+d.pop(b'yt' b'es', None)             # Raw bytes
-51 50 | 
-52 51 | if k in d:
-53 52 |     # comment that gets dropped
+46 | if r"\foo" in d:                    # Raw string
+47 |     del d['\\foo']
+48 | 
+   - if b'yt' b'es' in d:                # Bytes concatenation
+   -     del d[rb"""ytes"""]             # Raw bytes
+49 + d.pop(b'yt' b'es', None)             # Raw bytes
+50 | 
+51 | if k in d:
+52 |     # comment that gets dropped
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:54:5
@@ -312,18 +298,17 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 56 | ### Safely fixable
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Unsafe fix
-49 49 | if b'yt' b'es' in d:                # Bytes concatenation
-50 50 |     del d[rb"""ytes"""]             # Raw bytes
-51 51 | 
-52    |-if k in d:
-53    |-    # comment that gets dropped
-54    |-    del d[k]
-   52 |+d.pop(k, None)
-55 53 | 
-56 54 | ### Safely fixable
-57 55 | 
+49 | if b'yt' b'es' in d:                # Bytes concatenation
+50 |     del d[rb"""ytes"""]             # Raw bytes
+51 | 
+   - if k in d:
+   -     # comment that gets dropped
+   -     del d[k]
+52 + d.pop(k, None)
+53 | 
+54 | ### Safely fixable
+55 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:59:5
@@ -335,17 +320,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 61 | if '' in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-55 55 | 
-56 56 | ### Safely fixable
-57 57 | 
-58    |-if k in d:
-59    |-    del d[k]
-   58 |+d.pop(k, None)
-60 59 | 
-61 60 | if '' in d:
-62 61 |     del d[""]
+55 | 
+56 | ### Safely fixable
+57 | 
+   - if k in d:
+   -     del d[k]
+58 + d.pop(k, None)
+59 | 
+60 | if '' in d:
+61 |     del d[""]
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:62:5
@@ -357,17 +340,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 64 | if b"" in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-58 58 | if k in d:
-59 59 |     del d[k]
-60 60 | 
-61    |-if '' in d:
-62    |-    del d[""]
-   61 |+d.pop('', None)
-63 62 | 
-64 63 | if b"" in d:
-65 64 |     del d[
+58 | if k in d:
+59 |     del d[k]
+60 | 
+   - if '' in d:
+   -     del d[""]
+61 + d.pop('', None)
+62 | 
+63 | if b"" in d:
+64 |     del d[
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:65:5
@@ -381,19 +362,17 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 69 |   if 0 in d: del d[0]
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-61 61 | if '' in d:
-62 62 |     del d[""]
-63 63 | 
-64    |-if b"" in d:
-65    |-    del d[
-66    |-        b''''''
-67    |-    ]
-   64 |+d.pop(b"", None)
-68 65 | 
-69 66 | if 0 in d: del d[0]
-70 67 | 
+61 | if '' in d:
+62 |     del d[""]
+63 | 
+   - if b"" in d:
+   -     del d[
+   -         b''''''
+   -     ]
+64 + d.pop(b"", None)
+65 | 
+66 | if 0 in d: del d[0]
+67 | 
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:69:12
@@ -406,16 +385,14 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 71 | if 3j in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-66 66 |         b''''''
-67 67 |     ]
-68 68 | 
-69    |-if 0 in d: del d[0]
-   69 |+d.pop(0, None)
-70 70 | 
-71 71 | if 3j in d:
-72 72 |     del d[3j]
+66 |         b''''''
+67 |     ]
+68 | 
+   - if 0 in d: del d[0]
+69 + d.pop(0, None)
+70 | 
+71 | if 3j in d:
+72 |     del d[3j]
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:72:5
@@ -427,17 +404,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 74 | if 0.1234 in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-68 68 | 
-69 69 | if 0 in d: del d[0]
-70 70 | 
-71    |-if 3j in d:
-72    |-    del d[3j]
-   71 |+d.pop(3j, None)
-73 72 | 
-74 73 | if 0.1234 in d:
-75 74 |     del d[.1_2_3_4]
+68 | 
+69 | if 0 in d: del d[0]
+70 | 
+   - if 3j in d:
+   -     del d[3j]
+71 + d.pop(3j, None)
+72 | 
+73 | if 0.1234 in d:
+74 |     del d[.1_2_3_4]
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:75:5
@@ -449,17 +424,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 77 | if True in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-71 71 | if 3j in d:
-72 72 |     del d[3j]
-73 73 | 
-74    |-if 0.1234 in d:
-75    |-    del d[.1_2_3_4]
-   74 |+d.pop(0.1234, None)
-76 75 | 
-77 76 | if True in d:
-78 77 |     del d[True]
+71 | if 3j in d:
+72 |     del d[3j]
+73 | 
+   - if 0.1234 in d:
+   -     del d[.1_2_3_4]
+74 + d.pop(0.1234, None)
+75 | 
+76 | if True in d:
+77 |     del d[True]
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:78:5
@@ -471,17 +444,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 80 | if False in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-74 74 | if 0.1234 in d:
-75 75 |     del d[.1_2_3_4]
-76 76 | 
-77    |-if True in d:
-78    |-    del d[True]
-   77 |+d.pop(True, None)
-79 78 | 
-80 79 | if False in d:
-81 80 |     del d[False]
+74 | if 0.1234 in d:
+75 |     del d[.1_2_3_4]
+76 | 
+   - if True in d:
+   -     del d[True]
+77 + d.pop(True, None)
+78 | 
+79 | if False in d:
+80 |     del d[False]
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:81:5
@@ -493,17 +464,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 83 | if None in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-77 77 | if True in d:
-78 78 |     del d[True]
-79 79 | 
-80    |-if False in d:
-81    |-    del d[False]
-   80 |+d.pop(False, None)
-82 81 | 
-83 82 | if None in d:
-84 83 |     del d[
+77 | if True in d:
+78 |     del d[True]
+79 | 
+   - if False in d:
+   -     del d[False]
+80 + d.pop(False, None)
+81 | 
+82 | if None in d:
+83 |     del d[
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:84:5
@@ -517,19 +486,17 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 88 |   if ... in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-80 80 | if False in d:
-81 81 |     del d[False]
-82 82 | 
-83    |-if None in d:
-84    |-    del d[
-85    |-        None
-86    |-    ]
-   83 |+d.pop(None, None)
-87 84 | 
-88 85 | if ... in d:
-89 86 |     del d[
+80 | if False in d:
+81 |     del d[False]
+82 | 
+   - if None in d:
+   -     del d[
+   -         None
+   -     ]
+83 + d.pop(None, None)
+84 | 
+85 | if ... in d:
+86 |     del d[
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:89:5
@@ -542,18 +509,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 92 |   if "a" "bc" in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-85 85 |         None
-86 86 |     ]
-87 87 | 
-88    |-if ... in d:
-89    |-    del d[
-90    |-        ...]
-   88 |+d.pop(..., None)
-91 89 | 
-92 90 | if "a" "bc" in d:
-93 91 |     del d['abc']
+85 |         None
+86 |     ]
+87 | 
+   - if ... in d:
+   -     del d[
+   -         ...]
+88 + d.pop(..., None)
+89 | 
+90 | if "a" "bc" in d:
+91 |     del d['abc']
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:93:5
@@ -565,17 +530,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 95 | if r"\foo" in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-89 89 |     del d[
-90 90 |         ...]
-91 91 | 
-92    |-if "a" "bc" in d:
-93    |-    del d['abc']
-   92 |+d.pop("a" "bc", None)
-94 93 | 
-95 94 | if r"\foo" in d:
-96 95 |     del d['\\foo']
+89 |     del d[
+90 |         ...]
+91 | 
+   - if "a" "bc" in d:
+   -     del d['abc']
+92 + d.pop("a" "bc", None)
+93 | 
+94 | if r"\foo" in d:
+95 |     del d['\\foo']
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:96:5
@@ -587,17 +550,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
 98 | if b'yt' b'es' in d:
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-92 92 | if "a" "bc" in d:
-93 93 |     del d['abc']
-94 94 | 
-95    |-if r"\foo" in d:
-96    |-    del d['\\foo']
-   95 |+d.pop(r"\foo", None)
-97 96 | 
-98 97 | if b'yt' b'es' in d:
-99 98 |     del d[rb"""ytes"""]             # This should not make the fix unsafe
+92 | if "a" "bc" in d:
+93 |     del d['abc']
+94 | 
+   - if r"\foo" in d:
+   -     del d['\\foo']
+95 + d.pop(r"\foo", None)
+96 | 
+97 | if b'yt' b'es' in d:
+98 |     del d[rb"""ytes"""]             # This should not make the fix unsafe
 
 RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
   --> RUF051.py:99:5
@@ -607,14 +568,12 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]`
    |     ^^^^^^^^^^^^^^^^^^^
    |
 help: Replace `if` statement with `.pop(..., None)`
-
-ℹ Safe fix
-95  95  | if r"\foo" in d:
-96  96  |     del d['\\foo']
-97  97  | 
-98      |-if b'yt' b'es' in d:
-99      |-    del d[rb"""ytes"""]             # This should not make the fix unsafe
-    98  |+d.pop(b'yt' b'es', None)             # This should not make the fix unsafe
-100 99  | 
-101 100 | 
-102 101 |
+95  | if r"\foo" in d:
+96  |     del d['\\foo']
+97  | 
+    - if b'yt' b'es' in d:
+    -     del d[rb"""ytes"""]             # This should not make the fix unsafe
+98  + d.pop(b'yt' b'es', None)             # This should not make the fix unsafe
+99  | 
+100 | 
+101 |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap
index 9c7eaadd88..d6c759ad67 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap
@@ -11,18 +11,17 @@ RUF052 [*] Local dummy variable `_var` is accessed
 93 |         return _var
    |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-89 89 | 
-90 90 | class Class_:
-91 91 |     def fun(self):
-92    |-        _var = "method variable" # [RUF052]
-93    |-        return _var
-   92 |+        var = "method variable" # [RUF052]
-   93 |+        return var
-94 94 | 
-95 95 | def fun(_var): # parameters are ignored
-96 96 |     return _var
+89 | 
+90 | class Class_:
+91 |     def fun(self):
+   -         _var = "method variable" # [RUF052]
+   -         return _var
+92 +         var = "method variable" # [RUF052]
+93 +         return var
+94 | 
+95 | def fun(_var): # parameters are ignored
+96 |     return _var
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_list` is accessed
    --> RUF052.py:99:5
@@ -33,18 +32,17 @@ RUF052 [*] Local dummy variable `_list` is accessed
 100 |     return _list
     |
 help: Prefer using trailing underscores to avoid shadowing a built-in
-
-ℹ Unsafe fix
-96  96  |     return _var
-97  97  | 
-98  98  | def fun():
-99      |-    _list = "built-in" # [RUF052]
-100     |-    return _list
-    99  |+    list_ = "built-in" # [RUF052]
-    100 |+    return list_
-101 101 | 
-102 102 | x = "global"
-103 103 | 
+96  |     return _var
+97  | 
+98  | def fun():
+    -     _list = "built-in" # [RUF052]
+    -     return _list
+99  +     list_ = "built-in" # [RUF052]
+100 +     return list_
+101 | 
+102 | x = "global"
+103 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_x` is accessed
    --> RUF052.py:106:5
@@ -56,18 +54,17 @@ RUF052 [*] Local dummy variable `_x` is accessed
 107 |     return _x
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | def fun():
-105 105 |     global x
-106     |-    _x = "shadows global" # [RUF052]
-107     |-    return _x
-    106 |+    x_ = "shadows global" # [RUF052]
-    107 |+    return x_
-108 108 | 
-109 109 | def foo():
-110 110 |   x = "outer"
+103 | 
+104 | def fun():
+105 |     global x
+    -     _x = "shadows global" # [RUF052]
+    -     return _x
+106 +     x_ = "shadows global" # [RUF052]
+107 +     return x_
+108 | 
+109 | def foo():
+110 |   x = "outer"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_x` is accessed
    --> RUF052.py:113:5
@@ -80,18 +77,17 @@ RUF052 [*] Local dummy variable `_x` is accessed
 115 |   bar()
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-110 110 |   x = "outer"
-111 111 |   def bar():
-112 112 |     nonlocal x
-113     |-    _x = "shadows nonlocal" # [RUF052]
-114     |-    return _x
-    113 |+    x_ = "shadows nonlocal" # [RUF052]
-    114 |+    return x_
-115 115 |   bar()
-116 116 |   return x
-117 117 | 
+110 |   x = "outer"
+111 |   def bar():
+112 |     nonlocal x
+    -     _x = "shadows nonlocal" # [RUF052]
+    -     return _x
+113 +     x_ = "shadows nonlocal" # [RUF052]
+114 +     return x_
+115 |   bar()
+116 |   return x
+117 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_x` is accessed
    --> RUF052.py:120:5
@@ -103,18 +99,17 @@ RUF052 [*] Local dummy variable `_x` is accessed
 121 |     return _x
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-117 117 | 
-118 118 | def fun():
-119 119 |     x = "local"
-120     |-    _x = "shadows local" # [RUF052]
-121     |-    return _x
-    120 |+    x_ = "shadows local" # [RUF052]
-    121 |+    return x_
-122 122 | 
-123 123 | 
-124 124 | GLOBAL_1 = "global 1"
+117 | 
+118 | def fun():
+119 |     x = "local"
+    -     _x = "shadows local" # [RUF052]
+    -     return _x
+120 +     x_ = "shadows local" # [RUF052]
+121 +     return x_
+122 | 
+123 | 
+124 | GLOBAL_1 = "global 1"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 Local dummy variable `_GLOBAL_1` is accessed
    --> RUF052.py:128:5
@@ -169,25 +164,24 @@ RUF052 [*] Local dummy variable `_P` is accessed
 155 |     _NT = NamedTuple("_NT", [("foo", int)])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-150 150 |     from enum import Enum
-151 151 |     from collections import namedtuple
-152 152 | 
-153     |-    _P = ParamSpec("_P")
-    153 |+    P = ParamSpec("P")
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
+150 |     from enum import Enum
+151 |     from collections import namedtuple
+152 | 
+    -     _P = ParamSpec("_P")
+153 +     P = ParamSpec("P")
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
 --------------------------------------------------------------------------------
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_T` is accessed
    --> RUF052.py:154:5
@@ -199,25 +193,24 @@ RUF052 [*] Local dummy variable `_T` is accessed
 156 |     _E = Enum("_E", ["a", "b", "c"])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-151 151 |     from collections import namedtuple
-152 152 | 
-153 153 |     _P = ParamSpec("_P")
-154     |-    _T = TypeVar(name="_T", covariant=True, bound=int|str)
-    154 |+    T = TypeVar(name="T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+151 |     from collections import namedtuple
+152 | 
+153 |     _P = ParamSpec("_P")
+    -     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+154 +     T = TypeVar(name="T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
 --------------------------------------------------------------------------------
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NT` is accessed
    --> RUF052.py:155:5
@@ -230,24 +223,23 @@ RUF052 [*] Local dummy variable `_NT` is accessed
 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-152 152 | 
-153 153 |     _P = ParamSpec("_P")
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155     |-    _NT = NamedTuple("_NT", [("foo", int)])
-    155 |+    NT = NamedTuple("NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+152 | 
+153 |     _P = ParamSpec("_P")
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+    -     _NT = NamedTuple("_NT", [("foo", int)])
+155 +     NT = NamedTuple("NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_E` is accessed
    --> RUF052.py:156:5
@@ -260,23 +252,22 @@ RUF052 [*] Local dummy variable `_E` is accessed
 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-153 153 |     _P = ParamSpec("_P")
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156     |-    _E = Enum("_E", ["a", "b", "c"])
-    156 |+    E = Enum("E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+153 |     _P = ParamSpec("_P")
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+    -     _E = Enum("_E", ["a", "b", "c"])
+156 +     E = Enum("E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NT2` is accessed
    --> RUF052.py:157:5
@@ -289,22 +280,21 @@ RUF052 [*] Local dummy variable `_NT2` is accessed
 159 |     _DynamicClass = type("_DynamicClass", (), {})
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157     |-    _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-    157 |+    NT2 = namedtuple("NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+    -     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+157 +     NT2 = namedtuple("NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NT3` is accessed
    --> RUF052.py:158:5
@@ -317,21 +307,20 @@ RUF052 [*] Local dummy variable `_NT3` is accessed
 160 |     _NotADynamicClass = type("_NotADynamicClass")
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158     |-    _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-    158 |+    NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+    -     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+158 +     NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_DynamicClass` is accessed
    --> RUF052.py:159:5
@@ -343,20 +332,19 @@ RUF052 [*] Local dummy variable `_DynamicClass` is accessed
 160 |     _NotADynamicClass = type("_NotADynamicClass")
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159     |-    _DynamicClass = type("_DynamicClass", (), {})
-    159 |+    DynamicClass = type("DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+    -     _DynamicClass = type("_DynamicClass", (), {})
+159 +     DynamicClass = type("DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed
    --> RUF052.py:160:5
@@ -369,19 +357,18 @@ RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed
 162 |     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160     |-    _NotADynamicClass = type("_NotADynamicClass")
-    160 |+    NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+    -     _NotADynamicClass = type("_NotADynamicClass")
+160 +     NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_dummy_var` is accessed
    --> RUF052.py:182:5
@@ -393,21 +380,20 @@ RUF052 [*] Local dummy variable `_dummy_var` is accessed
 184 |     def bar():
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-179 179 | 
-180 180 | 
-181 181 | def foo():
-182     |-    _dummy_var = 42
-    182 |+    dummy_var_ = 42
-183 183 | 
-184 184 |     def bar():
-185 185 |         dummy_var = 43
-186     |-        print(_dummy_var)
-    186 |+        print(dummy_var_)
-187 187 | 
-188 188 | 
-189 189 | def foo():
+179 | 
+180 | 
+181 | def foo():
+    -     _dummy_var = 42
+182 +     dummy_var_ = 42
+183 | 
+184 |     def bar():
+185 |         dummy_var = 43
+    -         print(_dummy_var)
+186 +         print(dummy_var_)
+187 | 
+188 | 
+189 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 Local dummy variable `_dummy_var` is accessed
    --> RUF052.py:192:5
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap
index c1c1e734e1..6796ee91b8 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap
@@ -12,16 +12,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 25 | class C[T](int, Generic[_C]): ...
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-20 20 | 
-21 21 | ### Errors
-22 22 | 
-23    |-class C[T](Generic[_A]): ...
-   23 |+class C[T, _A]: ...
-24 24 | class C[T](Generic[_B], str): ...
-25 25 | class C[T](int, Generic[_C]): ...
-26 26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
+20 | 
+21 | ### Errors
+22 | 
+   - class C[T](Generic[_A]): ...
+23 + class C[T, _A]: ...
+24 | class C[T](Generic[_B], str): ...
+25 | class C[T](int, Generic[_C]): ...
+26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:24:12
@@ -33,16 +32,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-21 21 | ### Errors
-22 22 | 
-23 23 | class C[T](Generic[_A]): ...
-24    |-class C[T](Generic[_B], str): ...
-   24 |+class C[T, _B: int](str): ...
-25 25 | class C[T](int, Generic[_C]): ...
-26 26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
-27 27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
+21 | ### Errors
+22 | 
+23 | class C[T](Generic[_A]): ...
+   - class C[T](Generic[_B], str): ...
+24 + class C[T, _B: int](str): ...
+25 | class C[T](int, Generic[_C]): ...
+26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
+27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:25:17
@@ -55,16 +53,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | class C[T](Generic[_A]): ...
-24 24 | class C[T](Generic[_B], str): ...
-25    |-class C[T](int, Generic[_C]): ...
-   25 |+class C[T, _C: (str, bytes)](int): ...
-26 26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
-27 27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
-28 28 | class C[T](list[_F], Generic[_F]): ...  # TODO: Type parameter defaults
+22 | 
+23 | class C[T](Generic[_A]): ...
+24 | class C[T](Generic[_B], str): ...
+   - class C[T](int, Generic[_C]): ...
+25 + class C[T, _C: (str, bytes)](int): ...
+26 | class C[T](bytes, Generic[_D], bool): ...  # TODO: Type parameter defaults
+27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
+28 | class C[T](list[_F], Generic[_F]): ...  # TODO: Type parameter defaults
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:26:19
@@ -112,16 +109,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ...
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-27 27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
-28 28 | class C[T](list[_F], Generic[_F]): ...  # TODO: Type parameter defaults
-29 29 | 
-30    |-class C[*Ts](Generic[*_As]): ...
-   30 |+class C[*Ts, *_As]: ...
-31 31 | class C[*Ts](Generic[Unpack[_As]]): ...
-32 32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ...
-33 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
+27 | class C[T](Generic[_E], list[_E]): ...  # TODO: Type parameter defaults
+28 | class C[T](list[_F], Generic[_F]): ...  # TODO: Type parameter defaults
+29 | 
+   - class C[*Ts](Generic[*_As]): ...
+30 + class C[*Ts, *_As]: ...
+31 | class C[*Ts](Generic[Unpack[_As]]): ...
+32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ...
+33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:31:14
@@ -133,16 +129,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-28 28 | class C[T](list[_F], Generic[_F]): ...  # TODO: Type parameter defaults
-29 29 | 
-30 30 | class C[*Ts](Generic[*_As]): ...
-31    |-class C[*Ts](Generic[Unpack[_As]]): ...
-   31 |+class C[*Ts, *_As]: ...
-32 32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ...
-33 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
-34 34 | 
+28 | class C[T](list[_F], Generic[_F]): ...  # TODO: Type parameter defaults
+29 | 
+30 | class C[*Ts](Generic[*_As]): ...
+   - class C[*Ts](Generic[Unpack[_As]]): ...
+31 + class C[*Ts, *_As]: ...
+32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ...
+33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:32:14
@@ -174,16 +169,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 38 | class C[**P](Generic[_P3]): ...  # TODO: Type parameter defaults
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-33 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
-34 34 | 
-35 35 | 
-36    |-class C[**P](Generic[_P1]): ...
-   36 |+class C[**P, **_P1]: ...
-37 37 | class C[**P](Generic[_P2]): ...
-38 38 | class C[**P](Generic[_P3]): ...  # TODO: Type parameter defaults
-39 39 | 
+33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ...  # TODO: Type parameter defaults
+34 | 
+35 | 
+   - class C[**P](Generic[_P1]): ...
+36 + class C[**P, **_P1]: ...
+37 | class C[**P](Generic[_P2]): ...
+38 | class C[**P](Generic[_P3]): ...  # TODO: Type parameter defaults
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:37:14
@@ -212,16 +206,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
    |            ^^^^^^^^^^^^^^
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-38 38 | class C[**P](Generic[_P3]): ...  # TODO: Type parameter defaults
-39 39 | 
-40 40 | 
-41    |-class C[T](Generic[T, _A]): ...
-   41 |+class C[T, _A]: ...
-42 42 | 
-43 43 | 
-44 44 | # See `is_existing_param_of_same_class`.
+38 | class C[**P](Generic[_P3]): ...  # TODO: Type parameter defaults
+39 | 
+40 | 
+   - class C[T](Generic[T, _A]): ...
+41 + class C[T, _A]: ...
+42 | 
+43 | 
+44 | # See `is_existing_param_of_same_class`.
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:47:35
@@ -241,16 +234,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
    |                ^^^^^^^^^^^^^^
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-48 48 | 
-49 49 | 
-50 50 | class C(Generic[_B]):
-51    |-    class D[T](Generic[_B, T]): ...
-   51 |+    class D[T, _B: int]: ...
-52 52 | 
-53 53 | 
-54 54 | class C[T]:
+48 | 
+49 | 
+50 | class C(Generic[_B]):
+   -     class D[T](Generic[_B, T]): ...
+51 +     class D[T, _B: int]: ...
+52 | 
+53 | 
+54 | class C[T]:
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:55:16
@@ -271,16 +263,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 61 | class C[T, _C: (str, bytes)](Generic[_D]): ...  # TODO: Type parameter defaults
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-57 57 | 
-58 58 | # In a single run, only the first is reported.
-59 59 | # Others will be reported/fixed in following iterations.
-60    |-class C[T](Generic[_C], Generic[_D]): ...
-   60 |+class C[T, _C: (str, bytes)](Generic[_D]): ...
-61 61 | class C[T, _C: (str, bytes)](Generic[_D]): ...  # TODO: Type parameter defaults
-62 62 | 
-63 63 | 
+57 | 
+58 | # In a single run, only the first is reported.
+59 | # Others will be reported/fixed in following iterations.
+   - class C[T](Generic[_C], Generic[_D]): ...
+60 + class C[T, _C: (str, bytes)](Generic[_D]): ...
+61 | class C[T, _C: (str, bytes)](Generic[_D]): ...  # TODO: Type parameter defaults
+62 | 
+63 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:61:30
@@ -377,16 +368,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 79 | class C[T](Generic[*_As, _A]): ...
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-74 74 | class C[T](Generic[Unpack[_As, _Bs]]): ...
-75 75 | 
-76 76 | 
-77    |-class C[T](Generic[_A, _A]): ...
-   77 |+class C[T, _A]: ...
-78 78 | class C[T](Generic[_A, Unpack[_As]]): ...
-79 79 | class C[T](Generic[*_As, _A]): ...
-80 80 | 
+74 | class C[T](Generic[Unpack[_As, _Bs]]): ...
+75 | 
+76 | 
+   - class C[T](Generic[_A, _A]): ...
+77 + class C[T, _A]: ...
+78 | class C[T](Generic[_A, Unpack[_As]]): ...
+79 | class C[T](Generic[*_As, _A]): ...
+80 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:78:12
@@ -397,16 +387,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 79 | class C[T](Generic[*_As, _A]): ...
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-75 75 | 
-76 76 | 
-77 77 | class C[T](Generic[_A, _A]): ...
-78    |-class C[T](Generic[_A, Unpack[_As]]): ...
-   78 |+class C[T, _A, *_As]: ...
-79 79 | class C[T](Generic[*_As, _A]): ...
-80 80 | 
-81 81 | 
+75 | 
+76 | 
+77 | class C[T](Generic[_A, _A]): ...
+   - class C[T](Generic[_A, Unpack[_As]]): ...
+78 + class C[T, _A, *_As]: ...
+79 | class C[T](Generic[*_As, _A]): ...
+80 | 
+81 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:79:12
@@ -417,16 +406,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
    |            ^^^^^^^^^^^^^^^^^
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | class C[T](Generic[_A, _A]): ...
-78 78 | class C[T](Generic[_A, Unpack[_As]]): ...
-79    |-class C[T](Generic[*_As, _A]): ...
-   79 |+class C[T, *_As, _A]: ...
-80 80 | 
-81 81 | 
-82 82 | from somewhere import APublicTypeVar
+76 | 
+77 | class C[T](Generic[_A, _A]): ...
+78 | class C[T](Generic[_A, Unpack[_As]]): ...
+   - class C[T](Generic[*_As, _A]): ...
+79 + class C[T, *_As, _A]: ...
+80 | 
+81 | 
+82 | from somewhere import APublicTypeVar
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 Class with type parameter list inherits from `Generic`
   --> RUF053.py:83:12
@@ -457,16 +445,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
    |            ^^^^^^^^^^^
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-88 88 | # The latter cannot be used as a PEP 695 constraint,
-89 89 | # as named expressions are forbidden within type parameter lists.
-90 90 | # See also the `_Z` example above.
-91    |-class C[T](Generic[_G]): ...  # Should be moved down below eventually
-   91 |+class C[T, _G: (str, a := int)]: ...  # Should be moved down below eventually
-92 92 | 
-93 93 | 
-94 94 | # Single-element constraints should not be converted to a bound.
+88 | # The latter cannot be used as a PEP 695 constraint,
+89 | # as named expressions are forbidden within type parameter lists.
+90 | # See also the `_Z` example above.
+   - class C[T](Generic[_G]): ...  # Should be moved down below eventually
+91 + class C[T, _G: (str, a := int)]: ...  # Should be moved down below eventually
+92 | 
+93 | 
+94 | # Single-element constraints should not be converted to a bound.
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:95:20
@@ -477,16 +464,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
 96 | class C[T: [a]](Generic[_A]): ...
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-92 92 | 
-93 93 | 
-94 94 | # Single-element constraints should not be converted to a bound.
-95    |-class C[T: (str,)](Generic[_A]): ...
-   95 |+class C[T: (str), _A]: ...
-96 96 | class C[T: [a]](Generic[_A]): ...
-97 97 | 
-98 98 | 
+92 | 
+93 | 
+94 | # Single-element constraints should not be converted to a bound.
+   - class C[T: (str,)](Generic[_A]): ...
+95 + class C[T: (str), _A]: ...
+96 | class C[T: [a]](Generic[_A]): ...
+97 | 
+98 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF053 [*] Class with type parameter list inherits from `Generic`
   --> RUF053.py:96:17
@@ -497,13 +483,12 @@ RUF053 [*] Class with type parameter list inherits from `Generic`
    |                 ^^^^^^^^^^^
    |
 help: Remove `Generic` base class
-
-ℹ Unsafe fix
-93 93 | 
-94 94 | # Single-element constraints should not be converted to a bound.
-95 95 | class C[T: (str,)](Generic[_A]): ...
-96    |-class C[T: [a]](Generic[_A]): ...
-   96 |+class C[T: [a], _A]: ...
-97 97 | 
-98 98 | 
-99 99 | # Existing bounds should not be deparenthesized.
+93 | 
+94 | # Single-element constraints should not be converted to a bound.
+95 | class C[T: (str,)](Generic[_A]): ...
+   - class C[T: [a]](Generic[_A]): ...
+96 + class C[T: [a], _A]: ...
+97 | 
+98 | 
+99 | # Existing bounds should not be deparenthesized.
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap
index a54df64cc7..0e4c71d6d1 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap
@@ -11,16 +11,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 119 | # dict.get in an if statement
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-114 114 | # Invalid falsy fallbacks are when the call to dict.get is used in a boolean context
-115 115 | 
-116 116 | # dict.get in ternary expression
-117     |-value = "not found" if my_dict.get("key", False) else "default"  # [RUF056]
-    117 |+value = "not found" if my_dict.get("key") else "default"  # [RUF056]
-118 118 | 
-119 119 | # dict.get in an if statement
-120 120 | if my_dict.get("key", False):  # [RUF056]
+114 | # Invalid falsy fallbacks are when the call to dict.get is used in a boolean context
+115 | 
+116 | # dict.get in ternary expression
+    - value = "not found" if my_dict.get("key", False) else "default"  # [RUF056]
+117 + value = "not found" if my_dict.get("key") else "default"  # [RUF056]
+118 | 
+119 | # dict.get in an if statement
+120 | if my_dict.get("key", False):  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:120:23
@@ -31,16 +29,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 121 |     pass
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-117 117 | value = "not found" if my_dict.get("key", False) else "default"  # [RUF056]
-118 118 | 
-119 119 | # dict.get in an if statement
-120     |-if my_dict.get("key", False):  # [RUF056]
-    120 |+if my_dict.get("key"):  # [RUF056]
-121 121 |     pass
-122 122 | 
-123 123 | # dict.get in compound if statement
+117 | value = "not found" if my_dict.get("key", False) else "default"  # [RUF056]
+118 | 
+119 | # dict.get in an if statement
+    - if my_dict.get("key", False):  # [RUF056]
+120 + if my_dict.get("key"):  # [RUF056]
+121 |     pass
+122 | 
+123 | # dict.get in compound if statement
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:124:32
@@ -51,16 +47,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 125 |     pass
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-121 121 |     pass
-122 122 | 
-123 123 | # dict.get in compound if statement
-124     |-if True and my_dict.get("key", False):  # [RUF056]
-    124 |+if True and my_dict.get("key"):  # [RUF056]
-125 125 |     pass
-126 126 | 
-127 127 | if my_dict.get("key", False) or True:  # [RUF056]
+121 |     pass
+122 | 
+123 | # dict.get in compound if statement
+    - if True and my_dict.get("key", False):  # [RUF056]
+124 + if True and my_dict.get("key"):  # [RUF056]
+125 |     pass
+126 | 
+127 | if my_dict.get("key", False) or True:  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:127:23
@@ -72,16 +66,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 128 |     pass
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-124 124 | if True and my_dict.get("key", False):  # [RUF056]
-125 125 |     pass
-126 126 | 
-127     |-if my_dict.get("key", False) or True:  # [RUF056]
-    127 |+if my_dict.get("key") or True:  # [RUF056]
-128 128 |     pass
-129 129 | 
-130 130 | # dict.get in an assert statement
+124 | if True and my_dict.get("key", False):  # [RUF056]
+125 |     pass
+126 | 
+    - if my_dict.get("key", False) or True:  # [RUF056]
+127 + if my_dict.get("key") or True:  # [RUF056]
+128 |     pass
+129 | 
+130 | # dict.get in an assert statement
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:131:27
@@ -93,16 +85,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 133 | # dict.get in a while statement
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-128 128 |     pass
-129 129 | 
-130 130 | # dict.get in an assert statement
-131     |-assert my_dict.get("key", False)  # [RUF056]
-    131 |+assert my_dict.get("key")  # [RUF056]
-132 132 | 
-133 133 | # dict.get in a while statement
-134 134 | while my_dict.get("key", False):  # [RUF056]
+128 |     pass
+129 | 
+130 | # dict.get in an assert statement
+    - assert my_dict.get("key", False)  # [RUF056]
+131 + assert my_dict.get("key")  # [RUF056]
+132 | 
+133 | # dict.get in a while statement
+134 | while my_dict.get("key", False):  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:134:26
@@ -113,16 +103,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 135 |     pass
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-131 131 | assert my_dict.get("key", False)  # [RUF056]
-132 132 | 
-133 133 | # dict.get in a while statement
-134     |-while my_dict.get("key", False):  # [RUF056]
-    134 |+while my_dict.get("key"):  # [RUF056]
-135 135 |     pass
-136 136 | 
-137 137 | # dict.get in unary not expression
+131 | assert my_dict.get("key", False)  # [RUF056]
+132 | 
+133 | # dict.get in a while statement
+    - while my_dict.get("key", False):  # [RUF056]
+134 + while my_dict.get("key"):  # [RUF056]
+135 |     pass
+136 | 
+137 | # dict.get in unary not expression
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:138:32
@@ -134,16 +122,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 140 | # testing all falsy fallbacks
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-135 135 |     pass
-136 136 | 
-137 137 | # dict.get in unary not expression
-138     |-value = not my_dict.get("key", False)  # [RUF056]
-    138 |+value = not my_dict.get("key")  # [RUF056]
-139 139 | 
-140 140 | # testing all falsy fallbacks
-141 141 | value = not my_dict.get("key", False)  # [RUF056]
+135 |     pass
+136 | 
+137 | # dict.get in unary not expression
+    - value = not my_dict.get("key", False)  # [RUF056]
+138 + value = not my_dict.get("key")  # [RUF056]
+139 | 
+140 | # testing all falsy fallbacks
+141 | value = not my_dict.get("key", False)  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:141:32
@@ -155,16 +141,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 143 | value = not my_dict.get("key", list())  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-138 138 | value = not my_dict.get("key", False)  # [RUF056]
-139 139 | 
-140 140 | # testing all falsy fallbacks
-141     |-value = not my_dict.get("key", False)  # [RUF056]
-    141 |+value = not my_dict.get("key")  # [RUF056]
-142 142 | value = not my_dict.get("key", [])  # [RUF056]
-143 143 | value = not my_dict.get("key", list())  # [RUF056]
-144 144 | value = not my_dict.get("key", {})  # [RUF056]
+138 | value = not my_dict.get("key", False)  # [RUF056]
+139 | 
+140 | # testing all falsy fallbacks
+    - value = not my_dict.get("key", False)  # [RUF056]
+141 + value = not my_dict.get("key")  # [RUF056]
+142 | value = not my_dict.get("key", [])  # [RUF056]
+143 | value = not my_dict.get("key", list())  # [RUF056]
+144 | value = not my_dict.get("key", {})  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:142:32
@@ -177,16 +161,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 144 | value = not my_dict.get("key", {})  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-139 139 | 
-140 140 | # testing all falsy fallbacks
-141 141 | value = not my_dict.get("key", False)  # [RUF056]
-142     |-value = not my_dict.get("key", [])  # [RUF056]
-    142 |+value = not my_dict.get("key")  # [RUF056]
-143 143 | value = not my_dict.get("key", list())  # [RUF056]
-144 144 | value = not my_dict.get("key", {})  # [RUF056]
-145 145 | value = not my_dict.get("key", dict())  # [RUF056]
+139 | 
+140 | # testing all falsy fallbacks
+141 | value = not my_dict.get("key", False)  # [RUF056]
+    - value = not my_dict.get("key", [])  # [RUF056]
+142 + value = not my_dict.get("key")  # [RUF056]
+143 | value = not my_dict.get("key", list())  # [RUF056]
+144 | value = not my_dict.get("key", {})  # [RUF056]
+145 | value = not my_dict.get("key", dict())  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:143:32
@@ -199,16 +181,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 145 | value = not my_dict.get("key", dict())  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-140 140 | # testing all falsy fallbacks
-141 141 | value = not my_dict.get("key", False)  # [RUF056]
-142 142 | value = not my_dict.get("key", [])  # [RUF056]
-143     |-value = not my_dict.get("key", list())  # [RUF056]
-    143 |+value = not my_dict.get("key")  # [RUF056]
-144 144 | value = not my_dict.get("key", {})  # [RUF056]
-145 145 | value = not my_dict.get("key", dict())  # [RUF056]
-146 146 | value = not my_dict.get("key", set())  # [RUF056]
+140 | # testing all falsy fallbacks
+141 | value = not my_dict.get("key", False)  # [RUF056]
+142 | value = not my_dict.get("key", [])  # [RUF056]
+    - value = not my_dict.get("key", list())  # [RUF056]
+143 + value = not my_dict.get("key")  # [RUF056]
+144 | value = not my_dict.get("key", {})  # [RUF056]
+145 | value = not my_dict.get("key", dict())  # [RUF056]
+146 | value = not my_dict.get("key", set())  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:144:32
@@ -221,16 +201,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 146 | value = not my_dict.get("key", set())  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-141 141 | value = not my_dict.get("key", False)  # [RUF056]
-142 142 | value = not my_dict.get("key", [])  # [RUF056]
-143 143 | value = not my_dict.get("key", list())  # [RUF056]
-144     |-value = not my_dict.get("key", {})  # [RUF056]
-    144 |+value = not my_dict.get("key")  # [RUF056]
-145 145 | value = not my_dict.get("key", dict())  # [RUF056]
-146 146 | value = not my_dict.get("key", set())  # [RUF056]
-147 147 | value = not my_dict.get("key", None)  # [RUF056]
+141 | value = not my_dict.get("key", False)  # [RUF056]
+142 | value = not my_dict.get("key", [])  # [RUF056]
+143 | value = not my_dict.get("key", list())  # [RUF056]
+    - value = not my_dict.get("key", {})  # [RUF056]
+144 + value = not my_dict.get("key")  # [RUF056]
+145 | value = not my_dict.get("key", dict())  # [RUF056]
+146 | value = not my_dict.get("key", set())  # [RUF056]
+147 | value = not my_dict.get("key", None)  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:145:32
@@ -243,16 +221,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 147 | value = not my_dict.get("key", None)  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-142 142 | value = not my_dict.get("key", [])  # [RUF056]
-143 143 | value = not my_dict.get("key", list())  # [RUF056]
-144 144 | value = not my_dict.get("key", {})  # [RUF056]
-145     |-value = not my_dict.get("key", dict())  # [RUF056]
-    145 |+value = not my_dict.get("key")  # [RUF056]
-146 146 | value = not my_dict.get("key", set())  # [RUF056]
-147 147 | value = not my_dict.get("key", None)  # [RUF056]
-148 148 | value = not my_dict.get("key", 0)  # [RUF056]
+142 | value = not my_dict.get("key", [])  # [RUF056]
+143 | value = not my_dict.get("key", list())  # [RUF056]
+144 | value = not my_dict.get("key", {})  # [RUF056]
+    - value = not my_dict.get("key", dict())  # [RUF056]
+145 + value = not my_dict.get("key")  # [RUF056]
+146 | value = not my_dict.get("key", set())  # [RUF056]
+147 | value = not my_dict.get("key", None)  # [RUF056]
+148 | value = not my_dict.get("key", 0)  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:146:32
@@ -265,16 +241,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 148 | value = not my_dict.get("key", 0)  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-143 143 | value = not my_dict.get("key", list())  # [RUF056]
-144 144 | value = not my_dict.get("key", {})  # [RUF056]
-145 145 | value = not my_dict.get("key", dict())  # [RUF056]
-146     |-value = not my_dict.get("key", set())  # [RUF056]
-    146 |+value = not my_dict.get("key")  # [RUF056]
-147 147 | value = not my_dict.get("key", None)  # [RUF056]
-148 148 | value = not my_dict.get("key", 0)  # [RUF056]
-149 149 | value = not my_dict.get("key", 0.0)  # [RUF056]
+143 | value = not my_dict.get("key", list())  # [RUF056]
+144 | value = not my_dict.get("key", {})  # [RUF056]
+145 | value = not my_dict.get("key", dict())  # [RUF056]
+    - value = not my_dict.get("key", set())  # [RUF056]
+146 + value = not my_dict.get("key")  # [RUF056]
+147 | value = not my_dict.get("key", None)  # [RUF056]
+148 | value = not my_dict.get("key", 0)  # [RUF056]
+149 | value = not my_dict.get("key", 0.0)  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:147:32
@@ -287,16 +261,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 149 | value = not my_dict.get("key", 0.0)  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-144 144 | value = not my_dict.get("key", {})  # [RUF056]
-145 145 | value = not my_dict.get("key", dict())  # [RUF056]
-146 146 | value = not my_dict.get("key", set())  # [RUF056]
-147     |-value = not my_dict.get("key", None)  # [RUF056]
-    147 |+value = not my_dict.get("key")  # [RUF056]
-148 148 | value = not my_dict.get("key", 0)  # [RUF056]
-149 149 | value = not my_dict.get("key", 0.0)  # [RUF056]
-150 150 | value = not my_dict.get("key", "")  # [RUF056]
+144 | value = not my_dict.get("key", {})  # [RUF056]
+145 | value = not my_dict.get("key", dict())  # [RUF056]
+146 | value = not my_dict.get("key", set())  # [RUF056]
+    - value = not my_dict.get("key", None)  # [RUF056]
+147 + value = not my_dict.get("key")  # [RUF056]
+148 | value = not my_dict.get("key", 0)  # [RUF056]
+149 | value = not my_dict.get("key", 0.0)  # [RUF056]
+150 | value = not my_dict.get("key", "")  # [RUF056]
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:148:32
@@ -309,16 +281,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 150 | value = not my_dict.get("key", "")  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-145 145 | value = not my_dict.get("key", dict())  # [RUF056]
-146 146 | value = not my_dict.get("key", set())  # [RUF056]
-147 147 | value = not my_dict.get("key", None)  # [RUF056]
-148     |-value = not my_dict.get("key", 0)  # [RUF056]
-    148 |+value = not my_dict.get("key")  # [RUF056]
-149 149 | value = not my_dict.get("key", 0.0)  # [RUF056]
-150 150 | value = not my_dict.get("key", "")  # [RUF056]
-151 151 | 
+145 | value = not my_dict.get("key", dict())  # [RUF056]
+146 | value = not my_dict.get("key", set())  # [RUF056]
+147 | value = not my_dict.get("key", None)  # [RUF056]
+    - value = not my_dict.get("key", 0)  # [RUF056]
+148 + value = not my_dict.get("key")  # [RUF056]
+149 | value = not my_dict.get("key", 0.0)  # [RUF056]
+150 | value = not my_dict.get("key", "")  # [RUF056]
+151 | 
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:149:32
@@ -330,16 +300,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 150 | value = not my_dict.get("key", "")  # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-146 146 | value = not my_dict.get("key", set())  # [RUF056]
-147 147 | value = not my_dict.get("key", None)  # [RUF056]
-148 148 | value = not my_dict.get("key", 0)  # [RUF056]
-149     |-value = not my_dict.get("key", 0.0)  # [RUF056]
-    149 |+value = not my_dict.get("key")  # [RUF056]
-150 150 | value = not my_dict.get("key", "")  # [RUF056]
-151 151 | 
-152 152 | # testing invalid dict.get call with inline comment
+146 | value = not my_dict.get("key", set())  # [RUF056]
+147 | value = not my_dict.get("key", None)  # [RUF056]
+148 | value = not my_dict.get("key", 0)  # [RUF056]
+    - value = not my_dict.get("key", 0.0)  # [RUF056]
+149 + value = not my_dict.get("key")  # [RUF056]
+150 | value = not my_dict.get("key", "")  # [RUF056]
+151 | 
+152 | # testing invalid dict.get call with inline comment
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:150:32
@@ -352,16 +320,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 152 | # testing invalid dict.get call with inline comment
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-147 147 | value = not my_dict.get("key", None)  # [RUF056]
-148 148 | value = not my_dict.get("key", 0)  # [RUF056]
-149 149 | value = not my_dict.get("key", 0.0)  # [RUF056]
-150     |-value = not my_dict.get("key", "")  # [RUF056]
-    150 |+value = not my_dict.get("key")  # [RUF056]
-151 151 | 
-152 152 | # testing invalid dict.get call with inline comment
-153 153 | value = not my_dict.get("key", # comment1
+147 | value = not my_dict.get("key", None)  # [RUF056]
+148 | value = not my_dict.get("key", 0)  # [RUF056]
+149 | value = not my_dict.get("key", 0.0)  # [RUF056]
+    - value = not my_dict.get("key", "")  # [RUF056]
+150 + value = not my_dict.get("key")  # [RUF056]
+151 | 
+152 | # testing invalid dict.get call with inline comment
+153 | value = not my_dict.get("key", # comment1
 
 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:154:22
@@ -373,17 +339,16 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
 155 |                      ) # [RUF056]
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Unsafe fix
-150 150 | value = not my_dict.get("key", "")  # [RUF056]
-151 151 | 
-152 152 | # testing invalid dict.get call with inline comment
-153     |-value = not my_dict.get("key", # comment1
-154     |-                     [] # comment2
-    153 |+value = not my_dict.get("key" # comment2
-155 154 |                      ) # [RUF056]
-156 155 | 
-157 156 | # regression tests for https://github.com/astral-sh/ruff/issues/18628
+150 | value = not my_dict.get("key", "")  # [RUF056]
+151 | 
+152 | # testing invalid dict.get call with inline comment
+    - value = not my_dict.get("key", # comment1
+    -                      [] # comment2
+153 + value = not my_dict.get("key" # comment2
+154 |                      ) # [RUF056]
+155 | 
+156 | # regression tests for https://github.com/astral-sh/ruff/issues/18628
+note: This is an unsafe fix and may change runtime behavior
 
 RUF056 Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy.
    --> RUF056.py:163:24
@@ -511,10 +476,8 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi
     |                   ^^^^^
     |
 help: Remove falsy fallback from `dict.get()`
-
-ℹ Safe fix
-188 188 | 
-189 189 | # https://github.com/astral-sh/ruff/issues/18798
-190 190 | d = {}
-191     |-not d.get("key", (False))
-    191 |+not d.get("key")
+188 | 
+189 | # https://github.com/astral-sh/ruff/issues/18798
+190 | d = {}
+    - not d.get("key", (False))
+191 + not d.get("key")
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap
index 63e33ff282..abace6c8b4 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap
@@ -10,16 +10,14 @@ RUF057 [*] Value being rounded is already an integer
 8 | round(42, 2)                                      # Error (safe)
   |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-3 3 | 
-4 4 | 
-5 5 | 
-6   |-round(42)                                         # Error (safe)
-  6 |+42                                         # Error (safe)
-7 7 | round(42, None)                                   # Error (safe)
-8 8 | round(42, 2)                                      # Error (safe)
-9 9 | round(42, -2)                                     # No error
+3 | 
+4 | 
+5 | 
+  - round(42)                                         # Error (safe)
+6 + 42                                         # Error (safe)
+7 | round(42, None)                                   # Error (safe)
+8 | round(42, 2)                                      # Error (safe)
+9 | round(42, -2)                                     # No error
 
 RUF057 [*] Value being rounded is already an integer
  --> RUF057.py:7:1
@@ -31,16 +29,14 @@ RUF057 [*] Value being rounded is already an integer
 9 | round(42, -2)                                     # No error
   |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-4 4 | 
-5 5 | 
-6 6 | round(42)                                         # Error (safe)
-7   |-round(42, None)                                   # Error (safe)
-  7 |+42                                   # Error (safe)
-8 8 | round(42, 2)                                      # Error (safe)
-9 9 | round(42, -2)                                     # No error
-10 10 | round(42, inferred_int)                           # No error
+4  | 
+5  | 
+6  | round(42)                                         # Error (safe)
+   - round(42, None)                                   # Error (safe)
+7  + 42                                   # Error (safe)
+8  | round(42, 2)                                      # Error (safe)
+9  | round(42, -2)                                     # No error
+10 | round(42, inferred_int)                           # No error
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:8:1
@@ -53,16 +49,14 @@ RUF057 [*] Value being rounded is already an integer
 10 | round(42, inferred_int)                           # No error
    |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-5 5 | 
-6 6 | round(42)                                         # Error (safe)
-7 7 | round(42, None)                                   # Error (safe)
-8   |-round(42, 2)                                      # Error (safe)
-  8 |+42                                      # Error (safe)
-9 9 | round(42, -2)                                     # No error
-10 10 | round(42, inferred_int)                           # No error
-11 11 | round(42, 3 + 4)                                  # No error
+5  | 
+6  | round(42)                                         # Error (safe)
+7  | round(42, None)                                   # Error (safe)
+   - round(42, 2)                                      # Error (safe)
+8  + 42                                      # Error (safe)
+9  | round(42, -2)                                     # No error
+10 | round(42, inferred_int)                           # No error
+11 | round(42, 3 + 4)                                  # No error
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:24:1
@@ -73,16 +67,14 @@ RUF057 [*] Value being rounded is already an integer
 26 | round(4 + 2, 2)                                   # Error (safe)
    |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-21 21 | round(42., foo)                                   # No error
-22 22 | 
-23 23 | 
-24    |-round(4 + 2)                                      # Error (safe)
-   24 |+4 + 2                                      # Error (safe)
-25 25 | round(4 + 2, None)                                # Error (safe)
-26 26 | round(4 + 2, 2)                                   # Error (safe)
-27 27 | round(4 + 2, -2)                                  # No error
+21 | round(42., foo)                                   # No error
+22 | 
+23 | 
+   - round(4 + 2)                                      # Error (safe)
+24 + 4 + 2                                      # Error (safe)
+25 | round(4 + 2, None)                                # Error (safe)
+26 | round(4 + 2, 2)                                   # Error (safe)
+27 | round(4 + 2, -2)                                  # No error
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:25:1
@@ -94,16 +86,14 @@ RUF057 [*] Value being rounded is already an integer
 27 | round(4 + 2, -2)                                  # No error
    |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-22 22 | 
-23 23 | 
-24 24 | round(4 + 2)                                      # Error (safe)
-25    |-round(4 + 2, None)                                # Error (safe)
-   25 |+4 + 2                                # Error (safe)
-26 26 | round(4 + 2, 2)                                   # Error (safe)
-27 27 | round(4 + 2, -2)                                  # No error
-28 28 | round(4 + 2, inferred_int)                        # No error
+22 | 
+23 | 
+24 | round(4 + 2)                                      # Error (safe)
+   - round(4 + 2, None)                                # Error (safe)
+25 + 4 + 2                                # Error (safe)
+26 | round(4 + 2, 2)                                   # Error (safe)
+27 | round(4 + 2, -2)                                  # No error
+28 | round(4 + 2, inferred_int)                        # No error
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:26:1
@@ -116,16 +106,14 @@ RUF057 [*] Value being rounded is already an integer
 28 | round(4 + 2, inferred_int)                        # No error
    |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-23 23 | 
-24 24 | round(4 + 2)                                      # Error (safe)
-25 25 | round(4 + 2, None)                                # Error (safe)
-26    |-round(4 + 2, 2)                                   # Error (safe)
-   26 |+4 + 2                                   # Error (safe)
-27 27 | round(4 + 2, -2)                                  # No error
-28 28 | round(4 + 2, inferred_int)                        # No error
-29 29 | round(4 + 2, 3 + 4)                               # No error
+23 | 
+24 | round(4 + 2)                                      # Error (safe)
+25 | round(4 + 2, None)                                # Error (safe)
+   - round(4 + 2, 2)                                   # Error (safe)
+26 + 4 + 2                                   # Error (safe)
+27 | round(4 + 2, -2)                                  # No error
+28 | round(4 + 2, inferred_int)                        # No error
+29 | round(4 + 2, 3 + 4)                               # No error
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:42:1
@@ -136,16 +124,15 @@ RUF057 [*] Value being rounded is already an integer
 44 | round(inferred_int, 2)                            # Error (unsafe)
    |
 help: Remove unnecessary `round` call
-
-ℹ Unsafe fix
-39 39 | round(4. + 2., foo)                               # No error
-40 40 | 
-41 41 | 
-42    |-round(inferred_int)                               # Error (unsafe)
-   42 |+inferred_int                               # Error (unsafe)
-43 43 | round(inferred_int, None)                         # Error (unsafe)
-44 44 | round(inferred_int, 2)                            # Error (unsafe)
-45 45 | round(inferred_int, -2)                           # No error
+39 | round(4. + 2., foo)                               # No error
+40 | 
+41 | 
+   - round(inferred_int)                               # Error (unsafe)
+42 + inferred_int                               # Error (unsafe)
+43 | round(inferred_int, None)                         # Error (unsafe)
+44 | round(inferred_int, 2)                            # Error (unsafe)
+45 | round(inferred_int, -2)                           # No error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:43:1
@@ -157,16 +144,15 @@ RUF057 [*] Value being rounded is already an integer
 45 | round(inferred_int, -2)                           # No error
    |
 help: Remove unnecessary `round` call
-
-ℹ Unsafe fix
-40 40 | 
-41 41 | 
-42 42 | round(inferred_int)                               # Error (unsafe)
-43    |-round(inferred_int, None)                         # Error (unsafe)
-   43 |+inferred_int                         # Error (unsafe)
-44 44 | round(inferred_int, 2)                            # Error (unsafe)
-45 45 | round(inferred_int, -2)                           # No error
-46 46 | round(inferred_int, inferred_int)                 # No error
+40 | 
+41 | 
+42 | round(inferred_int)                               # Error (unsafe)
+   - round(inferred_int, None)                         # Error (unsafe)
+43 + inferred_int                         # Error (unsafe)
+44 | round(inferred_int, 2)                            # Error (unsafe)
+45 | round(inferred_int, -2)                           # No error
+46 | round(inferred_int, inferred_int)                 # No error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:44:1
@@ -179,16 +165,15 @@ RUF057 [*] Value being rounded is already an integer
 46 | round(inferred_int, inferred_int)                 # No error
    |
 help: Remove unnecessary `round` call
-
-ℹ Unsafe fix
-41 41 | 
-42 42 | round(inferred_int)                               # Error (unsafe)
-43 43 | round(inferred_int, None)                         # Error (unsafe)
-44    |-round(inferred_int, 2)                            # Error (unsafe)
-   44 |+inferred_int                            # Error (unsafe)
-45 45 | round(inferred_int, -2)                           # No error
-46 46 | round(inferred_int, inferred_int)                 # No error
-47 47 | round(inferred_int, 3 + 4)                        # No error
+41 | 
+42 | round(inferred_int)                               # Error (unsafe)
+43 | round(inferred_int, None)                         # Error (unsafe)
+   - round(inferred_int, 2)                            # Error (unsafe)
+44 + inferred_int                            # Error (unsafe)
+45 | round(inferred_int, -2)                           # No error
+46 | round(inferred_int, inferred_int)                 # No error
+47 | round(inferred_int, 3 + 4)                        # No error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:71:1
@@ -202,16 +187,14 @@ RUF057 [*] Value being rounded is already an integer
 74 |   *1
    |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-68 68 | # Fixes should preserve parentheses when argument
-69 69 | # contains newline.
-70 70 | # See https://github.com/astral-sh/ruff/issues/15598
-71    |-round(-
-   71 |+(-
-72 72 | 1)
-73 73 | round(1
-74 74 | *1
+68 | # Fixes should preserve parentheses when argument
+69 | # contains newline.
+70 | # See https://github.com/astral-sh/ruff/issues/15598
+   - round(-
+71 + (-
+72 | 1)
+73 | round(1
+74 | *1
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:73:1
@@ -226,19 +209,17 @@ RUF057 [*] Value being rounded is already an integer
 77 |   # fix should be unsafe if comment is in call range
    |
 help: Remove unnecessary `round` call
-
-ℹ Safe fix
-70 70 | # See https://github.com/astral-sh/ruff/issues/15598
-71 71 | round(-
-72 72 | 1)
-73    |-round(1
-74    |-*1
-75    |-)
-   73 |+(1
-   74 |+*1)
-76 75 | 
-77 76 | # fix should be unsafe if comment is in call range
-78 77 | round(# a comment
+70 | # See https://github.com/astral-sh/ruff/issues/15598
+71 | round(-
+72 | 1)
+   - round(1
+   - *1
+   - )
+73 + (1
+74 + *1)
+75 | 
+76 | # fix should be unsafe if comment is in call range
+77 | round(# a comment
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:78:1
@@ -252,17 +233,16 @@ RUF057 [*] Value being rounded is already an integer
 82 |       17 # a comment
    |
 help: Remove unnecessary `round` call
-
-ℹ Unsafe fix
-75 75 | )
-76 76 | 
-77 77 | # fix should be unsafe if comment is in call range
-78    |-round(# a comment
-79 78 | 17
-80    |-)
-81 79 | round(
-82 80 |     17 # a comment
-83 81 | )
+75 | )
+76 | 
+77 | # fix should be unsafe if comment is in call range
+   - round(# a comment
+78 | 17
+   - )
+79 | round(
+80 |     17 # a comment
+81 | )
+note: This is an unsafe fix and may change runtime behavior
 
 RUF057 [*] Value being rounded is already an integer
   --> RUF057.py:81:1
@@ -275,12 +255,11 @@ RUF057 [*] Value being rounded is already an integer
    | |_^
    |
 help: Remove unnecessary `round` call
-
-ℹ Unsafe fix
-78 78 | round(# a comment
-79 79 | 17
-80 80 | )
-81    |-round(
-82    |-    17 # a comment
-83    |-)
-   81 |+17
+78 | round(# a comment
+79 | 17
+80 | )
+   - round(
+   -     17 # a comment
+   - )
+81 + 17
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap
index faec036b07..62756e9e9e 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap
@@ -11,16 +11,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
 8 | starmap(func, zip([]))
   |
 help: Use `map` instead
-
-ℹ Safe fix
-4 4 | 
-5 5 | # Errors
-6 6 | 
-7   |-starmap(func, zip())
-  7 |+map(func, [])
-8 8 | starmap(func, zip([]))
-9 9 | 
-10 10 | 
+4  | 
+5  | # Errors
+6  | 
+   - starmap(func, zip())
+7  + map(func, [])
+8  | starmap(func, zip([]))
+9  | 
+10 | 
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
  --> RUF058_0.py:8:1
@@ -30,16 +28,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
   | ^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Use `map` instead
-
-ℹ Safe fix
-5 5 | # Errors
-6 6 | 
-7 7 | starmap(func, zip())
-8   |-starmap(func, zip([]))
-  8 |+map(func, [])
-9 9 | 
-10 10 | 
-11 11 | starmap(func, zip(a, b, c,),)
+5  | # Errors
+6  | 
+7  | starmap(func, zip())
+   - starmap(func, zip([]))
+8  + map(func, [])
+9  | 
+10 | 
+11 | starmap(func, zip(a, b, c,),)
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
   --> RUF058_0.py:11:1
@@ -48,16 +44,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `map` instead
-
-ℹ Safe fix
-8  8  | starmap(func, zip([]))
-9  9  | 
-10 10 | 
-11    |-starmap(func, zip(a, b, c,),)
-   11 |+map(func, a, b, c,)
-12 12 | 
-13 13 | 
-14 14 | starmap(
+8  | starmap(func, zip([]))
+9  | 
+10 | 
+   - starmap(func, zip(a, b, c,),)
+11 + map(func, a, b, c,)
+12 | 
+13 | 
+14 | starmap(
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
   --> RUF058_0.py:14:1
@@ -74,23 +68,22 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
 22 |   (  # Foo
    |
 help: Use `map` instead
-
-ℹ Unsafe fix
-11 11 | starmap(func, zip(a, b, c,),)
-12 12 | 
-13 13 | 
-14    |-starmap(
-   14 |+map(
-15 15 |     func,  # Foo
-16    |-    zip(
-   16 |+    []
-17 17 |         # Foo
-18 18 | 
-19    |-    )
-   19 |+    
-20 20 | )
-21 21 | 
-22 22 | (  # Foo
+11 | starmap(func, zip(a, b, c,),)
+12 | 
+13 | 
+   - starmap(
+14 + map(
+15 |     func,  # Foo
+   -     zip(
+16 +     []
+17 |         # Foo
+18 | 
+   -     )
+19 +     
+20 | )
+21 | 
+22 | (  # Foo
+note: This is an unsafe fix and may change runtime behavior
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
   --> RUF058_0.py:22:1
@@ -110,24 +103,23 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
 31 |   (  # Foobar
    |
 help: Use `map` instead
-
-ℹ Unsafe fix
-19 19 |     )
-20 20 | )
-21 21 | 
-22    |-(  # Foo
-23    |-    itertools
-24    |-    ) . starmap (
-   22 |+map (
-25 23 | 
-26    |-    func,  zip (
-   24 |+    func,   
-27 25 |         a, b, c,
-28    |-    ),
-   26 |+    
-29 27 | )
-30 28 | 
-31 29 | (  # Foobar
+19 |     )
+20 | )
+21 | 
+   - (  # Foo
+   -     itertools
+   -     ) . starmap (
+22 + map (
+23 | 
+   -     func,  zip (
+24 +     func,   
+25 |         a, b, c,
+   -     ),
+26 +     
+27 | )
+28 | 
+29 | (  # Foobar
+note: This is an unsafe fix and may change runtime behavior
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
   --> RUF058_0.py:31:1
@@ -158,35 +150,34 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
 51 |   starmap(
    |
 help: Use `map` instead
-
-ℹ Unsafe fix
-29 29 | )
-30 30 | 
-31 31 | (  # Foobar
-32    |-  (  starmap  )
-   32 |+  (  map  )
-33 33 |     # Bazqux
-34 34 | ) \
-35 35 | (func,
-36    |- ( (
-37    |-     (  # Zip
-38    |-    (
-39    |-        (  zip
-40    |-           # Zip
-41    |-           )
-42    |-    )
-43    |-  )
-44    |-     (a,  # A
-   36 |+ 
-   37 |+     a,  # A
-45 38 |          b,  # B
-46 39 |          c,  # C
-47    |-   )      )
-48    |-   ),
-   40 |+   
-49 41 | )
-50 42 | 
-51 43 | starmap(
+29 | )
+30 | 
+31 | (  # Foobar
+   -   (  starmap  )
+32 +   (  map  )
+33 |     # Bazqux
+34 | ) \
+35 | (func,
+   -  ( (
+   -      (  # Zip
+   -     (
+   -         (  zip
+   -            # Zip
+   -            )
+   -     )
+   -   )
+   -      (a,  # A
+36 +  
+37 +      a,  # A
+38 |          b,  # B
+39 |          c,  # C
+   -    )      )
+   -    ),
+40 +    
+41 | )
+42 | 
+43 | starmap(
+note: This is an unsafe fix and may change runtime behavior
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
   --> RUF058_0.py:51:1
@@ -206,24 +197,80 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
    | |_^
    |
 help: Use `map` instead
+48 |    ),
+49 | )
+50 | 
+   - starmap(
+51 + map(
+52 |     func \
+53 |     , \
+   -     zip \
+   -         (
+54 +      \
+55 +         
+56 |             a,\
+57 |             b,\
+58 |             c,\
+   -         )
+59 +         
+60 | )
+61 | 
+62 | 
 
-ℹ Safe fix
-48 48 |    ),
-49 49 | )
-50 50 | 
-51    |-starmap(
-   51 |+map(
-52 52 |     func \
-53 53 |     , \
-54    |-    zip \
-55    |-        (
-   54 |+     \
-   55 |+        
-56 56 |             a,\
-57 57 |             b,\
-58 58 |             c,\
-59    |-        )
-   59 |+        
-60 60 | )
-61 61 | 
-62 62 |
+RUF058 [*] `itertools.starmap` called on `zip` iterable
+  --> RUF058_0.py:71:1
+   |
+69 | starmap(func, zip(a, b, c), lorem=ipsum)
+70 |
+71 | starmap(func, zip(a, b, c, strict=True))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+72 | starmap(func, zip(a, b, c, strict=False))
+73 | starmap(func, zip(a, b, c, strict=strict))
+   |
+help: Use `map` instead
+68 | starmap(func, zip(a, b, c, lorem=ipsum))
+69 | starmap(func, zip(a, b, c), lorem=ipsum)
+70 | 
+   - starmap(func, zip(a, b, c, strict=True))
+71 + map(func, a, b, c, strict=True)
+72 | starmap(func, zip(a, b, c, strict=False))
+73 | starmap(func, zip(a, b, c, strict=strict))
+74 | 
+
+RUF058 [*] `itertools.starmap` called on `zip` iterable
+  --> RUF058_0.py:72:1
+   |
+71 | starmap(func, zip(a, b, c, strict=True))
+72 | starmap(func, zip(a, b, c, strict=False))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+73 | starmap(func, zip(a, b, c, strict=strict))
+   |
+help: Use `map` instead
+69 | starmap(func, zip(a, b, c), lorem=ipsum)
+70 | 
+71 | starmap(func, zip(a, b, c, strict=True))
+   - starmap(func, zip(a, b, c, strict=False))
+72 + map(func, a, b, c, strict=False)
+73 | starmap(func, zip(a, b, c, strict=strict))
+74 | 
+75 | # https://github.com/astral-sh/ruff/issues/15742
+
+RUF058 [*] `itertools.starmap` called on `zip` iterable
+  --> RUF058_0.py:73:1
+   |
+71 | starmap(func, zip(a, b, c, strict=True))
+72 | starmap(func, zip(a, b, c, strict=False))
+73 | starmap(func, zip(a, b, c, strict=strict))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+74 |
+75 | # https://github.com/astral-sh/ruff/issues/15742
+   |
+help: Use `map` instead
+70 | 
+71 | starmap(func, zip(a, b, c, strict=True))
+72 | starmap(func, zip(a, b, c, strict=False))
+   - starmap(func, zip(a, b, c, strict=strict))
+73 + map(func, a, b, c, strict=strict)
+74 | 
+75 | # https://github.com/astral-sh/ruff/issues/15742
+76 | starmap(func, zip(*a))
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap
index a6d9e9ab12..1ad51e4521 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap
@@ -11,16 +11,15 @@ RUF059 [*] Unpacked variable `c` is never used
 26 |     (x, y) = baz = bar
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-21 21 |     (a, b) = (1, 2)
-22 22 | 
-23 23 |     bar = (1, 2)
-24    |-    (c, d) = bar
-   24 |+    (_c, d) = bar
-25 25 | 
-26 26 |     (x, y) = baz = bar
-27 27 | 
+21 |     (a, b) = (1, 2)
+22 | 
+23 |     bar = (1, 2)
+   -     (c, d) = bar
+24 +     (_c, d) = bar
+25 | 
+26 |     (x, y) = baz = bar
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `d` is never used
   --> RUF059_0.py:24:9
@@ -32,16 +31,15 @@ RUF059 [*] Unpacked variable `d` is never used
 26 |     (x, y) = baz = bar
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-21 21 |     (a, b) = (1, 2)
-22 22 | 
-23 23 |     bar = (1, 2)
-24    |-    (c, d) = bar
-   24 |+    (c, _d) = bar
-25 25 | 
-26 26 |     (x, y) = baz = bar
-27 27 | 
+21 |     (a, b) = (1, 2)
+22 | 
+23 |     bar = (1, 2)
+   -     (c, d) = bar
+24 +     (c, _d) = bar
+25 | 
+26 |     (x, y) = baz = bar
+27 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `x` is never used
   --> RUF059_0.py:26:6
@@ -52,16 +50,15 @@ RUF059 [*] Unpacked variable `x` is never used
    |      ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
-25 25 | 
-26    |-    (x, y) = baz = bar
-   26 |+    (_x, y) = baz = bar
-27 27 | 
-28 28 | 
-29 29 | def f():
+23 |     bar = (1, 2)
+24 |     (c, d) = bar
+25 | 
+   -     (x, y) = baz = bar
+26 +     (_x, y) = baz = bar
+27 | 
+28 | 
+29 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y` is never used
   --> RUF059_0.py:26:9
@@ -72,16 +69,15 @@ RUF059 [*] Unpacked variable `y` is never used
    |         ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
-25 25 | 
-26    |-    (x, y) = baz = bar
-   26 |+    (x, _y) = baz = bar
-27 27 | 
-28 28 | 
-29 29 | def f():
+23 |     bar = (1, 2)
+24 |     (c, d) = bar
+25 | 
+   -     (x, y) = baz = bar
+26 +     (x, _y) = baz = bar
+27 | 
+28 | 
+29 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `connection` is never used
   --> RUF059_0.py:66:24
@@ -93,16 +89,15 @@ RUF059 [*] Unpacked variable `connection` is never used
 67 |         cursor.execute("SELECT * FROM users")
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-63 63 |     def connect():
-64 64 |         return None, None
-65 65 | 
-66    |-    with connect() as (connection, cursor):
-   66 |+    with connect() as (_connection, cursor):
-67 67 |         cursor.execute("SELECT * FROM users")
-68 68 | 
-69 69 | 
+63 |     def connect():
+64 |         return None, None
+65 | 
+   -     with connect() as (connection, cursor):
+66 +     with connect() as (_connection, cursor):
+67 |         cursor.execute("SELECT * FROM users")
+68 | 
+69 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `connection` is never used
   --> RUF059_0.py:74:24
@@ -114,16 +109,15 @@ RUF059 [*] Unpacked variable `connection` is never used
 75 |         cursor.execute("SELECT * FROM users")
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-71 71 |     def connect():
-72 72 |         return None, None
-73 73 | 
-74    |-    with connect() as (connection, cursor):
-   74 |+    with connect() as (_connection, cursor):
-75 75 |         cursor.execute("SELECT * FROM users")
-76 76 | 
-77 77 | 
+71 |     def connect():
+72 |         return None, None
+73 | 
+   -     with connect() as (connection, cursor):
+74 +     with connect() as (_connection, cursor):
+75 |         cursor.execute("SELECT * FROM users")
+76 | 
+77 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `this` is never used
   --> RUF059_0.py:79:49
@@ -134,16 +128,15 @@ RUF059 [*] Unpacked variable `this` is never used
 80 |         print("hello")
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | 
-78 78 | def f():
-79    |-    with open("file") as my_file, open("") as ((this, that)):
-   79 |+    with open("file") as my_file, open("") as ((_this, that)):
-80 80 |         print("hello")
-81 81 | 
-82 82 | 
+76 | 
+77 | 
+78 | def f():
+   -     with open("file") as my_file, open("") as ((this, that)):
+79 +     with open("file") as my_file, open("") as ((_this, that)):
+80 |         print("hello")
+81 | 
+82 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `that` is never used
   --> RUF059_0.py:79:55
@@ -154,16 +147,15 @@ RUF059 [*] Unpacked variable `that` is never used
 80 |         print("hello")
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-76 76 | 
-77 77 | 
-78 78 | def f():
-79    |-    with open("file") as my_file, open("") as ((this, that)):
-   79 |+    with open("file") as my_file, open("") as ((this, _that)):
-80 80 |         print("hello")
-81 81 | 
-82 82 | 
+76 | 
+77 | 
+78 | def f():
+   -     with open("file") as my_file, open("") as ((this, that)):
+79 +     with open("file") as my_file, open("") as ((this, _that)):
+80 |         print("hello")
+81 | 
+82 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `this` is never used
   --> RUF059_0.py:86:23
@@ -176,16 +168,15 @@ RUF059 [*] Unpacked variable `this` is never used
 88 |         print("hello")
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-83 83 | def f():
-84 84 |     with (
-85 85 |         open("file") as my_file,
-86    |-        open("") as ((this, that)),
-   86 |+        open("") as ((_this, that)),
-87 87 |     ):
-88 88 |         print("hello")
-89 89 | 
+83 | def f():
+84 |     with (
+85 |         open("file") as my_file,
+   -         open("") as ((this, that)),
+86 +         open("") as ((_this, that)),
+87 |     ):
+88 |         print("hello")
+89 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `that` is never used
   --> RUF059_0.py:86:29
@@ -198,16 +189,15 @@ RUF059 [*] Unpacked variable `that` is never used
 88 |         print("hello")
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-83 83 | def f():
-84 84 |     with (
-85 85 |         open("file") as my_file,
-86    |-        open("") as ((this, that)),
-   86 |+        open("") as ((this, _that)),
-87 87 |     ):
-88 88 |         print("hello")
-89 89 | 
+83 | def f():
+84 |     with (
+85 |         open("file") as my_file,
+   -         open("") as ((this, that)),
+86 +         open("") as ((this, _that)),
+87 |     ):
+88 |         print("hello")
+89 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 Unpacked variable `x` is never used
    --> RUF059_0.py:101:5
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap
index b748594e1f..dbecc86b23 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap
@@ -9,14 +9,13 @@ RUF059 [*] Unpacked variable `x` is never used
   |     ^
   |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-1 1 | def f(tup):
-2   |-    x, y = tup
-  2 |+    _x, y = tup
-3 3 | 
-4 4 | 
-5 5 | def f():
+1 | def f(tup):
+  -     x, y = tup
+2 +     _x, y = tup
+3 | 
+4 | 
+5 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y` is never used
  --> RUF059_1.py:2:8
@@ -26,14 +25,13 @@ RUF059 [*] Unpacked variable `y` is never used
   |        ^
   |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-1 1 | def f(tup):
-2   |-    x, y = tup
-  2 |+    x, _y = tup
-3 3 | 
-4 4 | 
-5 5 | def f():
+1 | def f(tup):
+  -     x, y = tup
+2 +     x, _y = tup
+3 | 
+4 | 
+5 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y` is never used
   --> RUF059_1.py:10:9
@@ -45,16 +43,15 @@ RUF059 [*] Unpacked variable `y` is never used
 12 |         print(coords)
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-7  7  | 
-8  8  | 
-9  9  | def f():
-10    |-    (x, y) = coords = 1, 2
-   10 |+    (x, _y) = coords = 1, 2
-11 11 |     if x > 1:
-12 12 |         print(coords)
-13 13 | 
+7  | 
+8  | 
+9  | def f():
+   -     (x, y) = coords = 1, 2
+10 +     (x, _y) = coords = 1, 2
+11 |     if x > 1:
+12 |         print(coords)
+13 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `x` is never used
   --> RUF059_1.py:16:6
@@ -64,16 +61,15 @@ RUF059 [*] Unpacked variable `x` is never used
    |      ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | def f():
-16    |-    (x, y) = coords = 1, 2
-   16 |+    (_x, y) = coords = 1, 2
-17 17 | 
-18 18 | 
-19 19 | def f():
+13 | 
+14 | 
+15 | def f():
+   -     (x, y) = coords = 1, 2
+16 +     (_x, y) = coords = 1, 2
+17 | 
+18 | 
+19 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y` is never used
   --> RUF059_1.py:16:9
@@ -83,16 +79,15 @@ RUF059 [*] Unpacked variable `y` is never used
    |         ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | def f():
-16    |-    (x, y) = coords = 1, 2
-   16 |+    (x, _y) = coords = 1, 2
-17 17 | 
-18 18 | 
-19 19 | def f():
+13 | 
+14 | 
+15 | def f():
+   -     (x, y) = coords = 1, 2
+16 +     (x, _y) = coords = 1, 2
+17 | 
+18 | 
+19 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `x` is never used
   --> RUF059_1.py:20:15
@@ -102,16 +97,15 @@ RUF059 [*] Unpacked variable `x` is never used
    |               ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    coords = (x, y) = 1, 2
-   20 |+    coords = (_x, y) = 1, 2
-21 21 | 
-22 22 | 
-23 23 | def f():
+17 | 
+18 | 
+19 | def f():
+   -     coords = (x, y) = 1, 2
+20 +     coords = (_x, y) = 1, 2
+21 | 
+22 | 
+23 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y` is never used
   --> RUF059_1.py:20:18
@@ -121,13 +115,12 @@ RUF059 [*] Unpacked variable `y` is never used
    |                  ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def f():
-20    |-    coords = (x, y) = 1, 2
-   20 |+    coords = (x, _y) = 1, 2
-21 21 | 
-22 22 | 
-23 23 | def f():
+17 | 
+18 | 
+19 | def f():
+   -     coords = (x, y) = 1, 2
+20 +     coords = (x, _y) = 1, 2
+21 | 
+22 | 
+23 | def f():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap
index 9ff869dde6..dfc5ca2041 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap
@@ -11,16 +11,15 @@ RUF059 [*] Unpacked variable `x2` is never used
 9 |         pass
   |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-5 5 |     with foo() as x1:
-6 6 |         pass
-7 7 | 
-8   |-    with foo() as (x2, y2):
-  8 |+    with foo() as (_x2, y2):
-9 9 |         pass
-10 10 | 
-11 11 |     with (foo() as x3, foo() as y3, foo() as z3):
+5  |     with foo() as x1:
+6  |         pass
+7  | 
+   -     with foo() as (x2, y2):
+8  +     with foo() as (_x2, y2):
+9  |         pass
+10 | 
+11 |     with (foo() as x3, foo() as y3, foo() as z3):
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y2` is never used
  --> RUF059_2.py:8:24
@@ -32,16 +31,15 @@ RUF059 [*] Unpacked variable `y2` is never used
 9 |         pass
   |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-5 5 |     with foo() as x1:
-6 6 |         pass
-7 7 | 
-8   |-    with foo() as (x2, y2):
-  8 |+    with foo() as (x2, _y2):
-9 9 |         pass
-10 10 | 
-11 11 |     with (foo() as x3, foo() as y3, foo() as z3):
+5  |     with foo() as x1:
+6  |         pass
+7  | 
+   -     with foo() as (x2, y2):
+8  +     with foo() as (x2, _y2):
+9  |         pass
+10 | 
+11 |     with (foo() as x3, foo() as y3, foo() as z3):
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `x2` is never used
   --> RUF059_2.py:17:6
@@ -53,16 +51,15 @@ RUF059 [*] Unpacked variable `x2` is never used
 18 |     coords3 = (x3, y3) = (1, 2)
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | def f():
-16 16 |     (x1, y1) = (1, 2)
-17    |-    (x2, y2) = coords2 = (1, 2)
-   17 |+    (_x2, y2) = coords2 = (1, 2)
-18 18 |     coords3 = (x3, y3) = (1, 2)
-19 19 | 
-20 20 | 
+14 | 
+15 | def f():
+16 |     (x1, y1) = (1, 2)
+   -     (x2, y2) = coords2 = (1, 2)
+17 +     (_x2, y2) = coords2 = (1, 2)
+18 |     coords3 = (x3, y3) = (1, 2)
+19 | 
+20 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y2` is never used
   --> RUF059_2.py:17:10
@@ -74,16 +71,15 @@ RUF059 [*] Unpacked variable `y2` is never used
 18 |     coords3 = (x3, y3) = (1, 2)
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-14 14 | 
-15 15 | def f():
-16 16 |     (x1, y1) = (1, 2)
-17    |-    (x2, y2) = coords2 = (1, 2)
-   17 |+    (x2, _y2) = coords2 = (1, 2)
-18 18 |     coords3 = (x3, y3) = (1, 2)
-19 19 | 
-20 20 | 
+14 | 
+15 | def f():
+16 |     (x1, y1) = (1, 2)
+   -     (x2, y2) = coords2 = (1, 2)
+17 +     (x2, _y2) = coords2 = (1, 2)
+18 |     coords3 = (x3, y3) = (1, 2)
+19 | 
+20 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `x3` is never used
   --> RUF059_2.py:18:16
@@ -94,16 +90,15 @@ RUF059 [*] Unpacked variable `x3` is never used
    |                ^^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-15 15 | def f():
-16 16 |     (x1, y1) = (1, 2)
-17 17 |     (x2, y2) = coords2 = (1, 2)
-18    |-    coords3 = (x3, y3) = (1, 2)
-   18 |+    coords3 = (_x3, y3) = (1, 2)
-19 19 | 
-20 20 | 
-21 21 | def f():
+15 | def f():
+16 |     (x1, y1) = (1, 2)
+17 |     (x2, y2) = coords2 = (1, 2)
+   -     coords3 = (x3, y3) = (1, 2)
+18 +     coords3 = (_x3, y3) = (1, 2)
+19 | 
+20 | 
+21 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y3` is never used
   --> RUF059_2.py:18:20
@@ -114,16 +109,15 @@ RUF059 [*] Unpacked variable `y3` is never used
    |                    ^^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-15 15 | def f():
-16 16 |     (x1, y1) = (1, 2)
-17 17 |     (x2, y2) = coords2 = (1, 2)
-18    |-    coords3 = (x3, y3) = (1, 2)
-   18 |+    coords3 = (x3, _y3) = (1, 2)
-19 19 | 
-20 20 | 
-21 21 | def f():
+15 | def f():
+16 |     (x1, y1) = (1, 2)
+17 |     (x2, y2) = coords2 = (1, 2)
+   -     coords3 = (x3, y3) = (1, 2)
+18 +     coords3 = (x3, _y3) = (1, 2)
+19 | 
+20 | 
+21 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `x` is never used
   --> RUF059_2.py:22:24
@@ -134,16 +128,15 @@ RUF059 [*] Unpacked variable `x` is never used
 23 |         pass
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | 
-21 21 | def f():
-22    |-    with Nested(m) as (x, y):
-   22 |+    with Nested(m) as (_x, y):
-23 23 |         pass
-24 24 | 
-25 25 | 
+19 | 
+20 | 
+21 | def f():
+   -     with Nested(m) as (x, y):
+22 +     with Nested(m) as (_x, y):
+23 |         pass
+24 | 
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `y` is never used
   --> RUF059_2.py:22:27
@@ -154,16 +147,15 @@ RUF059 [*] Unpacked variable `y` is never used
 23 |         pass
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-19 19 | 
-20 20 | 
-21 21 | def f():
-22    |-    with Nested(m) as (x, y):
-   22 |+    with Nested(m) as (x, _y):
-23 23 |         pass
-24 24 | 
-25 25 | 
+19 | 
+20 | 
+21 | def f():
+   -     with Nested(m) as (x, y):
+22 +     with Nested(m) as (x, _y):
+23 |         pass
+24 | 
+25 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `a` is never used
   --> RUF059_2.py:27:17
@@ -173,16 +165,15 @@ RUF059 [*] Unpacked variable `a` is never used
    |                 ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | 
-26 26 | def f():
-27    |-    toplevel = (a, b) = lexer.get_token()
-   27 |+    toplevel = (_a, b) = lexer.get_token()
-28 28 | 
-29 29 | 
-30 30 | def f():
+24 | 
+25 | 
+26 | def f():
+   -     toplevel = (a, b) = lexer.get_token()
+27 +     toplevel = (_a, b) = lexer.get_token()
+28 | 
+29 | 
+30 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `b` is never used
   --> RUF059_2.py:27:20
@@ -192,16 +183,15 @@ RUF059 [*] Unpacked variable `b` is never used
    |                    ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | 
-26 26 | def f():
-27    |-    toplevel = (a, b) = lexer.get_token()
-   27 |+    toplevel = (a, _b) = lexer.get_token()
-28 28 | 
-29 29 | 
-30 30 | def f():
+24 | 
+25 | 
+26 | def f():
+   -     toplevel = (a, b) = lexer.get_token()
+27 +     toplevel = (a, _b) = lexer.get_token()
+28 | 
+29 | 
+30 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `a` is never used
   --> RUF059_2.py:31:6
@@ -211,13 +201,12 @@ RUF059 [*] Unpacked variable `a` is never used
    |      ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | 
-30 30 | def f():
-31    |-    (a, b) = toplevel = lexer.get_token()
-   31 |+    (_a, b) = toplevel = lexer.get_token()
+28 | 
+29 | 
+30 | def f():
+   -     (a, b) = toplevel = lexer.get_token()
+31 +     (_a, b) = toplevel = lexer.get_token()
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `b` is never used
   --> RUF059_2.py:31:9
@@ -227,10 +216,9 @@ RUF059 [*] Unpacked variable `b` is never used
    |         ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | 
-30 30 | def f():
-31    |-    (a, b) = toplevel = lexer.get_token()
-   31 |+    (a, _b) = toplevel = lexer.get_token()
+28 | 
+29 | 
+30 | def f():
+   -     (a, b) = toplevel = lexer.get_token()
+31 +     (a, _b) = toplevel = lexer.get_token()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap
index 4f8d754651..cc61f87b5a 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap
@@ -10,16 +10,15 @@ RUF059 [*] Unpacked variable `b` is never used
    |     ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-10 10 | 
-11 11 | def bar():
-12 12 |     a = foo()
-13    |-    b, c = foo()
-   13 |+    _b, c = foo()
-14 14 | 
-15 15 | 
-16 16 | def baz():
+10 | 
+11 | def bar():
+12 |     a = foo()
+   -     b, c = foo()
+13 +     _b, c = foo()
+14 | 
+15 | 
+16 | def baz():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF059 [*] Unpacked variable `c` is never used
   --> RUF059_3.py:13:8
@@ -30,13 +29,12 @@ RUF059 [*] Unpacked variable `c` is never used
    |        ^
    |
 help: Prefix it with an underscore or any other dummy variable pattern
-
-ℹ Unsafe fix
-10 10 | 
-11 11 | def bar():
-12 12 |     a = foo()
-13    |-    b, c = foo()
-   13 |+    b, _c = foo()
-14 14 | 
-15 15 | 
-16 16 | def baz():
+10 | 
+11 | def bar():
+12 |     a = foo()
+   -     b, c = foo()
+13 +     b, _c = foo()
+14 | 
+15 | 
+16 | def baz():
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF060_RUF060.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF060_RUF060.py.snap
index 20e8cf9f42..cd8375a506 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF060_RUF060.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF060_RUF060.py.snap
@@ -251,3 +251,12 @@ RUF060 Unnecessary membership test on empty collection
 25 |
 26 | # OK
    |
+
+RUF060 Unnecessary membership test on empty collection
+  --> RUF060.py:47:1
+   |
+46 | # https://github.com/astral-sh/ruff/issues/20238
+47 | "b" in f"" "" # Error
+   | ^^^^^^^^^^^^^
+48 | "b" in f"" "x" # OK
+   |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap
index f25897d788..7cb614a440 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap
@@ -9,17 +9,16 @@ RUF061 [*] Use context-manager form of `pytest.deprecated_call()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.deprecated_call()` as a context-manager
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | def test_error_trivial():
-16    |-    pytest.deprecated_call(raise_deprecation_warning, "deprecated")
-   16 |+    with pytest.deprecated_call():
-   17 |+        raise_deprecation_warning("deprecated")
-17 18 | 
-18 19 | 
-19 20 | def test_error_assign():
+13 | 
+14 | 
+15 | def test_error_trivial():
+   -     pytest.deprecated_call(raise_deprecation_warning, "deprecated")
+16 +     with pytest.deprecated_call():
+17 +         raise_deprecation_warning("deprecated")
+18 | 
+19 | 
+20 | def test_error_assign():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.deprecated_call()`
   --> RUF061_deprecated_call.py:20:9
@@ -30,17 +29,16 @@ RUF061 [*] Use context-manager form of `pytest.deprecated_call()`
 21 |     print(s)
    |
 help: Use `pytest.deprecated_call()` as a context-manager
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def test_error_assign():
-20    |-    s = pytest.deprecated_call(raise_deprecation_warning, "deprecated")
-   20 |+    with pytest.deprecated_call():
-   21 |+        s = raise_deprecation_warning("deprecated")
-21 22 |     print(s)
-22 23 | 
-23 24 | 
+17 | 
+18 | 
+19 | def test_error_assign():
+   -     s = pytest.deprecated_call(raise_deprecation_warning, "deprecated")
+20 +     with pytest.deprecated_call():
+21 +         s = raise_deprecation_warning("deprecated")
+22 |     print(s)
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.deprecated_call()`
   --> RUF061_deprecated_call.py:25:5
@@ -50,11 +48,10 @@ RUF061 [*] Use context-manager form of `pytest.deprecated_call()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.deprecated_call()` as a context-manager
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | 
-24 24 | def test_error_lambda():
-25    |-    pytest.deprecated_call(lambda: warnings.warn("", DeprecationWarning))
-   25 |+    with pytest.deprecated_call():
-   26 |+        (lambda: warnings.warn("", DeprecationWarning))()
+22 | 
+23 | 
+24 | def test_error_lambda():
+   -     pytest.deprecated_call(lambda: warnings.warn("", DeprecationWarning))
+25 +     with pytest.deprecated_call():
+26 +         (lambda: warnings.warn("", DeprecationWarning))()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap
index 59cd74756d..d6f7b220c5 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap
@@ -9,17 +9,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.raises()` as a context-manager
-
-ℹ Unsafe fix
-16 16 | 
-17 17 | 
-18 18 | def test_error_trivial():
-19    |-    pytest.raises(ZeroDivisionError, func, 1, b=0)
-   19 |+    with pytest.raises(ZeroDivisionError):
-   20 |+        func(1, b=0)
-20 21 | 
-21 22 | 
-22 23 | def test_error_match():
+16 | 
+17 | 
+18 | def test_error_trivial():
+   -     pytest.raises(ZeroDivisionError, func, 1, b=0)
+19 +     with pytest.raises(ZeroDivisionError):
+20 +         func(1, b=0)
+21 | 
+22 | 
+23 | def test_error_match():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.raises()`
   --> RUF061_raises.py:23:5
@@ -29,17 +28,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.raises()` as a context-manager
-
-ℹ Unsafe fix
-20 20 | 
-21 21 | 
-22 22 | def test_error_match():
-23    |-    pytest.raises(ZeroDivisionError, func, 1, b=0).match("division by zero")
-   23 |+    with pytest.raises(ZeroDivisionError, match="division by zero"):
-   24 |+        func(1, b=0)
-24 25 | 
-25 26 | 
-26 27 | def test_error_assign():
+20 | 
+21 | 
+22 | def test_error_match():
+   -     pytest.raises(ZeroDivisionError, func, 1, b=0).match("division by zero")
+23 +     with pytest.raises(ZeroDivisionError, match="division by zero"):
+24 +         func(1, b=0)
+25 | 
+26 | 
+27 | def test_error_assign():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.raises()`
   --> RUF061_raises.py:27:15
@@ -49,17 +47,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()`
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.raises()` as a context-manager
-
-ℹ Unsafe fix
-24 24 | 
-25 25 | 
-26 26 | def test_error_assign():
-27    |-    excinfo = pytest.raises(ZeroDivisionError, func, 1, b=0)
-   27 |+    with pytest.raises(ZeroDivisionError) as excinfo:
-   28 |+        func(1, b=0)
-28 29 | 
-29 30 | 
-30 31 | def test_error_kwargs():
+24 | 
+25 | 
+26 | def test_error_assign():
+   -     excinfo = pytest.raises(ZeroDivisionError, func, 1, b=0)
+27 +     with pytest.raises(ZeroDivisionError) as excinfo:
+28 +         func(1, b=0)
+29 | 
+30 | 
+31 | def test_error_kwargs():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.raises()`
   --> RUF061_raises.py:31:5
@@ -69,17 +66,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.raises()` as a context-manager
-
-ℹ Unsafe fix
-28 28 | 
-29 29 | 
-30 30 | def test_error_kwargs():
-31    |-    pytest.raises(func=func, expected_exception=ZeroDivisionError)
-   31 |+    with pytest.raises(ZeroDivisionError):
-   32 |+        func()
-32 33 | 
-33 34 | 
-34 35 | def test_error_multi_statement():
+28 | 
+29 | 
+30 | def test_error_kwargs():
+   -     pytest.raises(func=func, expected_exception=ZeroDivisionError)
+31 +     with pytest.raises(ZeroDivisionError):
+32 +         func()
+33 | 
+34 | 
+35 | def test_error_multi_statement():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.raises()`
   --> RUF061_raises.py:35:15
@@ -90,17 +86,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()`
 36 |     assert excinfo.match("^invalid literal")
    |
 help: Use `pytest.raises()` as a context-manager
-
-ℹ Unsafe fix
-32 32 | 
-33 33 | 
-34 34 | def test_error_multi_statement():
-35    |-    excinfo = pytest.raises(ValueError, int, "hello")
-   35 |+    with pytest.raises(ValueError) as excinfo:
-   36 |+        int("hello")
-36 37 |     assert excinfo.match("^invalid literal")
-37 38 | 
-38 39 | 
+32 | 
+33 | 
+34 | def test_error_multi_statement():
+   -     excinfo = pytest.raises(ValueError, int, "hello")
+35 +     with pytest.raises(ValueError) as excinfo:
+36 +         int("hello")
+37 |     assert excinfo.match("^invalid literal")
+38 | 
+39 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.raises()`
   --> RUF061_raises.py:40:5
@@ -110,11 +105,10 @@ RUF061 [*] Use context-manager form of `pytest.raises()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.raises()` as a context-manager
-
-ℹ Unsafe fix
-37 37 | 
-38 38 | 
-39 39 | def test_error_lambda():
-40    |-    pytest.raises(ZeroDivisionError, lambda: 1 / 0)
-   40 |+    with pytest.raises(ZeroDivisionError):
-   41 |+        (lambda: 1 / 0)()
+37 | 
+38 | 
+39 | def test_error_lambda():
+   -     pytest.raises(ZeroDivisionError, lambda: 1 / 0)
+40 +     with pytest.raises(ZeroDivisionError):
+41 +         (lambda: 1 / 0)()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap
index cbe5d04a21..eca30980c7 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap
@@ -9,17 +9,16 @@ RUF061 [*] Use context-manager form of `pytest.warns()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.warns()` as a context-manager
-
-ℹ Unsafe fix
-13 13 | 
-14 14 | 
-15 15 | def test_error_trivial():
-16    |-    pytest.warns(UserWarning, raise_user_warning, "warning")
-   16 |+    with pytest.warns(UserWarning):
-   17 |+        raise_user_warning("warning")
-17 18 | 
-18 19 | 
-19 20 | def test_error_assign():
+13 | 
+14 | 
+15 | def test_error_trivial():
+   -     pytest.warns(UserWarning, raise_user_warning, "warning")
+16 +     with pytest.warns(UserWarning):
+17 +         raise_user_warning("warning")
+18 | 
+19 | 
+20 | def test_error_assign():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.warns()`
   --> RUF061_warns.py:20:9
@@ -30,17 +29,16 @@ RUF061 [*] Use context-manager form of `pytest.warns()`
 21 |     print(s)
    |
 help: Use `pytest.warns()` as a context-manager
-
-ℹ Unsafe fix
-17 17 | 
-18 18 | 
-19 19 | def test_error_assign():
-20    |-    s = pytest.warns(UserWarning, raise_user_warning, "warning")
-   20 |+    with pytest.warns(UserWarning):
-   21 |+        s = raise_user_warning("warning")
-21 22 |     print(s)
-22 23 | 
-23 24 | 
+17 | 
+18 | 
+19 | def test_error_assign():
+   -     s = pytest.warns(UserWarning, raise_user_warning, "warning")
+20 +     with pytest.warns(UserWarning):
+21 +         s = raise_user_warning("warning")
+22 |     print(s)
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF061 [*] Use context-manager form of `pytest.warns()`
   --> RUF061_warns.py:25:5
@@ -50,11 +48,10 @@ RUF061 [*] Use context-manager form of `pytest.warns()`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Use `pytest.warns()` as a context-manager
-
-ℹ Unsafe fix
-22 22 | 
-23 23 | 
-24 24 | def test_error_lambda():
-25    |-    pytest.warns(UserWarning, lambda: warnings.warn("", UserWarning))
-   25 |+    with pytest.warns(UserWarning):
-   26 |+        (lambda: warnings.warn("", UserWarning))()
+22 | 
+23 | 
+24 | def test_error_lambda():
+   -     pytest.warns(UserWarning, lambda: warnings.warn("", UserWarning))
+25 +     with pytest.warns(UserWarning):
+26 +         (lambda: warnings.warn("", UserWarning))()
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap
index 4aace6b857..9a88ad5557 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap
@@ -12,16 +12,15 @@ RUF064 [*] Non-octal mode
 8 | os.chmod("foo", 7777)  # Error
   |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-3 3 | import os
-4 4 | from pathlib import Path
-5 5 | 
-6   |-os.chmod("foo", 444)  # Error
-  6 |+os.chmod("foo", 0o444)  # Error
-7 7 | os.chmod("foo", 0o444)  # OK
-8 8 | os.chmod("foo", 7777)  # Error
-9 9 | os.chmod("foo", 10000)  # Error
+3 | import os
+4 | from pathlib import Path
+5 | 
+  - os.chmod("foo", 444)  # Error
+6 + os.chmod("foo", 0o444)  # Error
+7 | os.chmod("foo", 0o444)  # OK
+8 | os.chmod("foo", 7777)  # Error
+9 | os.chmod("foo", 10000)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 Non-octal mode
   --> RUF064.py:8:17
@@ -68,16 +67,15 @@ RUF064 [*] Non-octal mode
 13 | os.umask(0o777)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-9  9  | os.chmod("foo", 10000)  # Error
-10 10 | os.chmod("foo", 99999)  # Error
-11 11 | 
-12    |-os.umask(777)  # Error
-   12 |+os.umask(0o777)  # Error
-13 13 | os.umask(0o777)  # OK
-14 14 | 
-15 15 | os.fchmod(0, 400)  # Error
+9  | os.chmod("foo", 10000)  # Error
+10 | os.chmod("foo", 99999)  # Error
+11 | 
+   - os.umask(777)  # Error
+12 + os.umask(0o777)  # Error
+13 | os.umask(0o777)  # OK
+14 | 
+15 | os.fchmod(0, 400)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:15:14
@@ -89,16 +87,15 @@ RUF064 [*] Non-octal mode
 16 | os.fchmod(0, 0o400)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-12 12 | os.umask(777)  # Error
-13 13 | os.umask(0o777)  # OK
-14 14 | 
-15    |-os.fchmod(0, 400)  # Error
-   15 |+os.fchmod(0, 0o400)  # Error
-16 16 | os.fchmod(0, 0o400)  # OK
-17 17 | 
-18 18 | os.lchmod("foo", 755)  # Error
+12 | os.umask(777)  # Error
+13 | os.umask(0o777)  # OK
+14 | 
+   - os.fchmod(0, 400)  # Error
+15 + os.fchmod(0, 0o400)  # Error
+16 | os.fchmod(0, 0o400)  # OK
+17 | 
+18 | os.lchmod("foo", 755)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:18:18
@@ -110,16 +107,15 @@ RUF064 [*] Non-octal mode
 19 | os.lchmod("foo", 0o755)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-15 15 | os.fchmod(0, 400)  # Error
-16 16 | os.fchmod(0, 0o400)  # OK
-17 17 | 
-18    |-os.lchmod("foo", 755)  # Error
-   18 |+os.lchmod("foo", 0o755)  # Error
-19 19 | os.lchmod("foo", 0o755)  # OK
-20 20 | 
-21 21 | os.mkdir("foo", 600)  # Error
+15 | os.fchmod(0, 400)  # Error
+16 | os.fchmod(0, 0o400)  # OK
+17 | 
+   - os.lchmod("foo", 755)  # Error
+18 + os.lchmod("foo", 0o755)  # Error
+19 | os.lchmod("foo", 0o755)  # OK
+20 | 
+21 | os.mkdir("foo", 600)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:21:17
@@ -131,16 +127,15 @@ RUF064 [*] Non-octal mode
 22 | os.mkdir("foo", 0o600)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-18 18 | os.lchmod("foo", 755)  # Error
-19 19 | os.lchmod("foo", 0o755)  # OK
-20 20 | 
-21    |-os.mkdir("foo", 600)  # Error
-   21 |+os.mkdir("foo", 0o600)  # Error
-22 22 | os.mkdir("foo", 0o600)  # OK
-23 23 | 
-24 24 | os.makedirs("foo", 644)  # Error
+18 | os.lchmod("foo", 755)  # Error
+19 | os.lchmod("foo", 0o755)  # OK
+20 | 
+   - os.mkdir("foo", 600)  # Error
+21 + os.mkdir("foo", 0o600)  # Error
+22 | os.mkdir("foo", 0o600)  # OK
+23 | 
+24 | os.makedirs("foo", 644)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:24:20
@@ -152,16 +147,15 @@ RUF064 [*] Non-octal mode
 25 | os.makedirs("foo", 0o644)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-21 21 | os.mkdir("foo", 600)  # Error
-22 22 | os.mkdir("foo", 0o600)  # OK
-23 23 | 
-24    |-os.makedirs("foo", 644)  # Error
-   24 |+os.makedirs("foo", 0o644)  # Error
-25 25 | os.makedirs("foo", 0o644)  # OK
-26 26 | 
-27 27 | os.mkfifo("foo", 640)  # Error
+21 | os.mkdir("foo", 600)  # Error
+22 | os.mkdir("foo", 0o600)  # OK
+23 | 
+   - os.makedirs("foo", 644)  # Error
+24 + os.makedirs("foo", 0o644)  # Error
+25 | os.makedirs("foo", 0o644)  # OK
+26 | 
+27 | os.mkfifo("foo", 640)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:27:18
@@ -173,16 +167,15 @@ RUF064 [*] Non-octal mode
 28 | os.mkfifo("foo", 0o640)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-24 24 | os.makedirs("foo", 644)  # Error
-25 25 | os.makedirs("foo", 0o644)  # OK
-26 26 | 
-27    |-os.mkfifo("foo", 640)  # Error
-   27 |+os.mkfifo("foo", 0o640)  # Error
-28 28 | os.mkfifo("foo", 0o640)  # OK
-29 29 | 
-30 30 | os.mknod("foo", 660)  # Error
+24 | os.makedirs("foo", 644)  # Error
+25 | os.makedirs("foo", 0o644)  # OK
+26 | 
+   - os.mkfifo("foo", 640)  # Error
+27 + os.mkfifo("foo", 0o640)  # Error
+28 | os.mkfifo("foo", 0o640)  # OK
+29 | 
+30 | os.mknod("foo", 660)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:30:17
@@ -194,16 +187,15 @@ RUF064 [*] Non-octal mode
 31 | os.mknod("foo", 0o660)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-27 27 | os.mkfifo("foo", 640)  # Error
-28 28 | os.mkfifo("foo", 0o640)  # OK
-29 29 | 
-30    |-os.mknod("foo", 660)  # Error
-   30 |+os.mknod("foo", 0o660)  # Error
-31 31 | os.mknod("foo", 0o660)  # OK
-32 32 | 
-33 33 | os.open("foo", os.O_CREAT, 644)  # Error
+27 | os.mkfifo("foo", 640)  # Error
+28 | os.mkfifo("foo", 0o640)  # OK
+29 | 
+   - os.mknod("foo", 660)  # Error
+30 + os.mknod("foo", 0o660)  # Error
+31 | os.mknod("foo", 0o660)  # OK
+32 | 
+33 | os.open("foo", os.O_CREAT, 644)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:33:28
@@ -215,16 +207,15 @@ RUF064 [*] Non-octal mode
 34 | os.open("foo", os.O_CREAT, 0o644)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-30 30 | os.mknod("foo", 660)  # Error
-31 31 | os.mknod("foo", 0o660)  # OK
-32 32 | 
-33    |-os.open("foo", os.O_CREAT, 644)  # Error
-   33 |+os.open("foo", os.O_CREAT, 0o644)  # Error
-34 34 | os.open("foo", os.O_CREAT, 0o644)  # OK
-35 35 | 
-36 36 | Path("bar").chmod(755)  # Error
+30 | os.mknod("foo", 660)  # Error
+31 | os.mknod("foo", 0o660)  # OK
+32 | 
+   - os.open("foo", os.O_CREAT, 644)  # Error
+33 + os.open("foo", os.O_CREAT, 0o644)  # Error
+34 | os.open("foo", os.O_CREAT, 0o644)  # OK
+35 | 
+36 | Path("bar").chmod(755)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:36:19
@@ -236,16 +227,15 @@ RUF064 [*] Non-octal mode
 37 | Path("bar").chmod(0o755)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-33 33 | os.open("foo", os.O_CREAT, 644)  # Error
-34 34 | os.open("foo", os.O_CREAT, 0o644)  # OK
-35 35 | 
-36    |-Path("bar").chmod(755)  # Error
-   36 |+Path("bar").chmod(0o755)  # Error
-37 37 | Path("bar").chmod(0o755)  # OK
-38 38 | 
-39 39 | path = Path("bar")
+33 | os.open("foo", os.O_CREAT, 644)  # Error
+34 | os.open("foo", os.O_CREAT, 0o644)  # OK
+35 | 
+   - Path("bar").chmod(755)  # Error
+36 + Path("bar").chmod(0o755)  # Error
+37 | Path("bar").chmod(0o755)  # OK
+38 | 
+39 | path = Path("bar")
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:40:12
@@ -256,16 +246,15 @@ RUF064 [*] Non-octal mode
 41 | path.chmod(0o755)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-37 37 | Path("bar").chmod(0o755)  # OK
-38 38 | 
-39 39 | path = Path("bar")
-40    |-path.chmod(755)  # Error
-   40 |+path.chmod(0o755)  # Error
-41 41 | path.chmod(0o755)  # OK
-42 42 | 
-43 43 | dbm.open("db", "r", 600)  # Error
+37 | Path("bar").chmod(0o755)  # OK
+38 | 
+39 | path = Path("bar")
+   - path.chmod(755)  # Error
+40 + path.chmod(0o755)  # Error
+41 | path.chmod(0o755)  # OK
+42 | 
+43 | dbm.open("db", "r", 600)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:43:21
@@ -277,16 +266,15 @@ RUF064 [*] Non-octal mode
 44 | dbm.open("db", "r", 0o600)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-40 40 | path.chmod(755)  # Error
-41 41 | path.chmod(0o755)  # OK
-42 42 | 
-43    |-dbm.open("db", "r", 600)  # Error
-   43 |+dbm.open("db", "r", 0o600)  # Error
-44 44 | dbm.open("db", "r", 0o600)  # OK
-45 45 | 
-46 46 | dbm.gnu.open("db", "r", 600)  # Error
+40 | path.chmod(755)  # Error
+41 | path.chmod(0o755)  # OK
+42 | 
+   - dbm.open("db", "r", 600)  # Error
+43 + dbm.open("db", "r", 0o600)  # Error
+44 | dbm.open("db", "r", 0o600)  # OK
+45 | 
+46 | dbm.gnu.open("db", "r", 600)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:46:25
@@ -298,16 +286,15 @@ RUF064 [*] Non-octal mode
 47 | dbm.gnu.open("db", "r", 0o600)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-43 43 | dbm.open("db", "r", 600)  # Error
-44 44 | dbm.open("db", "r", 0o600)  # OK
-45 45 | 
-46    |-dbm.gnu.open("db", "r", 600)  # Error
-   46 |+dbm.gnu.open("db", "r", 0o600)  # Error
-47 47 | dbm.gnu.open("db", "r", 0o600)  # OK
-48 48 | 
-49 49 | dbm.ndbm.open("db", "r", 600)  # Error
+43 | dbm.open("db", "r", 600)  # Error
+44 | dbm.open("db", "r", 0o600)  # OK
+45 | 
+   - dbm.gnu.open("db", "r", 600)  # Error
+46 + dbm.gnu.open("db", "r", 0o600)  # Error
+47 | dbm.gnu.open("db", "r", 0o600)  # OK
+48 | 
+49 | dbm.ndbm.open("db", "r", 600)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:49:26
@@ -319,16 +306,15 @@ RUF064 [*] Non-octal mode
 50 | dbm.ndbm.open("db", "r", 0o600)  # OK
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-46 46 | dbm.gnu.open("db", "r", 600)  # Error
-47 47 | dbm.gnu.open("db", "r", 0o600)  # OK
-48 48 | 
-49    |-dbm.ndbm.open("db", "r", 600)  # Error
-   49 |+dbm.ndbm.open("db", "r", 0o600)  # Error
-50 50 | dbm.ndbm.open("db", "r", 0o600)  # OK
-51 51 | 
-52 52 | os.fchmod(0, 256)  # 0o400
+46 | dbm.gnu.open("db", "r", 600)  # Error
+47 | dbm.gnu.open("db", "r", 0o600)  # OK
+48 | 
+   - dbm.ndbm.open("db", "r", 600)  # Error
+49 + dbm.ndbm.open("db", "r", 0o600)  # Error
+50 | dbm.ndbm.open("db", "r", 0o600)  # OK
+51 | 
+52 | os.fchmod(0, 256)  # 0o400
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:52:14
@@ -340,16 +326,15 @@ RUF064 [*] Non-octal mode
 53 | os.fchmod(0, 493)  # 0o755
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-49 49 | dbm.ndbm.open("db", "r", 600)  # Error
-50 50 | dbm.ndbm.open("db", "r", 0o600)  # OK
-51 51 | 
-52    |-os.fchmod(0, 256)  # 0o400
-   52 |+os.fchmod(0, 0o400)  # 0o400
-53 53 | os.fchmod(0, 493)  # 0o755
-54 54 | 
-55 55 | # https://github.com/astral-sh/ruff/issues/19010
+49 | dbm.ndbm.open("db", "r", 600)  # Error
+50 | dbm.ndbm.open("db", "r", 0o600)  # OK
+51 | 
+   - os.fchmod(0, 256)  # 0o400
+52 + os.fchmod(0, 0o400)  # 0o400
+53 | os.fchmod(0, 493)  # 0o755
+54 | 
+55 | # https://github.com/astral-sh/ruff/issues/19010
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:53:14
@@ -361,16 +346,15 @@ RUF064 [*] Non-octal mode
 55 | # https://github.com/astral-sh/ruff/issues/19010
    |
 help: Replace with octal literal
-
-ℹ Unsafe fix
-50 50 | dbm.ndbm.open("db", "r", 0o600)  # OK
-51 51 | 
-52 52 | os.fchmod(0, 256)  # 0o400
-53    |-os.fchmod(0, 493)  # 0o755
-   53 |+os.fchmod(0, 0o755)  # 0o755
-54 54 | 
-55 55 | # https://github.com/astral-sh/ruff/issues/19010
-56 56 | os.chmod("foo", 000)  # Error
+50 | dbm.ndbm.open("db", "r", 0o600)  # OK
+51 | 
+52 | os.fchmod(0, 256)  # 0o400
+   - os.fchmod(0, 493)  # 0o755
+53 + os.fchmod(0, 0o755)  # 0o755
+54 | 
+55 | # https://github.com/astral-sh/ruff/issues/19010
+56 | os.chmod("foo", 000)  # Error
+note: This is an unsafe fix and may change runtime behavior
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:56:17
@@ -381,16 +365,14 @@ RUF064 [*] Non-octal mode
 57 | os.chmod("foo", 0000)  # Error
    |
 help: Replace with octal literal
-
-ℹ Safe fix
-53 53 | os.fchmod(0, 493)  # 0o755
-54 54 | 
-55 55 | # https://github.com/astral-sh/ruff/issues/19010
-56    |-os.chmod("foo", 000)  # Error
-   56 |+os.chmod("foo", 0o000)  # Error
-57 57 | os.chmod("foo", 0000)  # Error
-58 58 | 
-59 59 | os.chmod("foo", 0b0)  # Error
+53 | os.fchmod(0, 493)  # 0o755
+54 | 
+55 | # https://github.com/astral-sh/ruff/issues/19010
+   - os.chmod("foo", 000)  # Error
+56 + os.chmod("foo", 0o000)  # Error
+57 | os.chmod("foo", 0000)  # Error
+58 | 
+59 | os.chmod("foo", 0b0)  # Error
 
 RUF064 [*] Non-octal mode
   --> RUF064.py:57:17
@@ -403,16 +385,14 @@ RUF064 [*] Non-octal mode
 59 | os.chmod("foo", 0b0)  # Error
    |
 help: Replace with octal literal
-
-ℹ Safe fix
-54 54 | 
-55 55 | # https://github.com/astral-sh/ruff/issues/19010
-56 56 | os.chmod("foo", 000)  # Error
-57    |-os.chmod("foo", 0000)  # Error
-   57 |+os.chmod("foo", 0o0000)  # Error
-58 58 | 
-59 59 | os.chmod("foo", 0b0)  # Error
-60 60 | os.chmod("foo", 0x0)  # Error
+54 | 
+55 | # https://github.com/astral-sh/ruff/issues/19010
+56 | os.chmod("foo", 000)  # Error
+   - os.chmod("foo", 0000)  # Error
+57 + os.chmod("foo", 0o0000)  # Error
+58 | 
+59 | os.chmod("foo", 0b0)  # Error
+60 | os.chmod("foo", 0x0)  # Error
 
 RUF064 Non-octal mode
   --> RUF064.py:59:17
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF065_RUF065.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF065_RUF065.py.snap
new file mode 100644
index 0000000000..9589c4555d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF065_RUF065.py.snap
@@ -0,0 +1,42 @@
+---
+source: crates/ruff_linter/src/rules/ruff/mod.rs
+---
+RUF065 Unnecessary `str()` conversion when formatting with `%s`
+ --> RUF065.py:4:26
+  |
+3 | # %s + str()
+4 | logging.info("Hello %s", str("World!"))
+  |                          ^^^^^^^^^^^^^
+5 | logging.log(logging.INFO, "Hello %s", str("World!"))
+  |
+
+RUF065 Unnecessary `str()` conversion when formatting with `%s`
+ --> RUF065.py:5:39
+  |
+3 | # %s + str()
+4 | logging.info("Hello %s", str("World!"))
+5 | logging.log(logging.INFO, "Hello %s", str("World!"))
+  |                                       ^^^^^^^^^^^^^
+6 |
+7 | # %s + repr()
+  |
+
+RUF065 Unnecessary `str()` conversion when formatting with `%s`
+  --> RUF065.py:22:18
+   |
+21 | # %s + str()
+22 | info("Hello %s", str("World!"))
+   |                  ^^^^^^^^^^^^^
+23 | log(logging.INFO, "Hello %s", str("World!"))
+   |
+
+RUF065 Unnecessary `str()` conversion when formatting with `%s`
+  --> RUF065.py:23:31
+   |
+21 | # %s + str()
+22 | info("Hello %s", str("World!"))
+23 | log(logging.INFO, "Hello %s", str("World!"))
+   |                               ^^^^^^^^^^^^^
+24 |
+25 | # %s + repr()
+   |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap
index 2041f3a696..d13c67ba1a 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap
@@ -10,14 +10,12 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
 3 | x = 2 # noqa: RUF940, RUF950
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-1   |-x = 2 # noqa: RUF940
-2 1 | x = 2 # noqa: RUF950
-  2 |+x = 2 # noqa: RUF950
-3 3 | x = 2 # noqa: RUF940, RUF950
-4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-5 5 | x = 2 # noqa: RUF940, RUF950, RUF940
+  - x = 2 # noqa: RUF940
+1 | x = 2 # noqa: RUF950
+2 + x = 2 # noqa: RUF950
+3 | x = 2 # noqa: RUF940, RUF950
+4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+5 | x = 2 # noqa: RUF940, RUF950, RUF940
 
 RUF101 [*] `RUF940` is a redirect to `RUF950`
  --> RUF101_0.py:3:15
@@ -30,15 +28,13 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
 5 | x = 2 # noqa: RUF940, RUF950, RUF940
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-1 1 | x = 2 # noqa: RUF940
-2 2 | x = 2 # noqa: RUF950
-3   |-x = 2 # noqa: RUF940, RUF950
-  3 |+x = 2 # noqa: RUF950, RUF950
-4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-5 5 | x = 2 # noqa: RUF940, RUF950, RUF940
-6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
+1 | x = 2 # noqa: RUF940
+2 | x = 2 # noqa: RUF950
+  - x = 2 # noqa: RUF940, RUF950
+3 + x = 2 # noqa: RUF950, RUF950
+4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+5 | x = 2 # noqa: RUF940, RUF950, RUF940
+6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
 
 RUF101 [*] `RUF940` is a redirect to `RUF950`
  --> RUF101_0.py:4:23
@@ -51,15 +47,13 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-1 1 | x = 2 # noqa: RUF940
-2 2 | x = 2 # noqa: RUF950
-3 3 | x = 2 # noqa: RUF940, RUF950
-4   |-x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-  4 |+x = 2 # noqa: RUF950, RUF950, RUF950, RUF950, RUF950
-5 5 | x = 2 # noqa: RUF940, RUF950, RUF940
-6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
+1 | x = 2 # noqa: RUF940
+2 | x = 2 # noqa: RUF950
+3 | x = 2 # noqa: RUF940, RUF950
+  - x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+4 + x = 2 # noqa: RUF950, RUF950, RUF950, RUF950, RUF950
+5 | x = 2 # noqa: RUF940, RUF950, RUF940
+6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
 
 RUF101 [*] `RUF940` is a redirect to `RUF950`
  --> RUF101_0.py:5:15
@@ -71,14 +65,12 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-2 2 | x = 2 # noqa: RUF950
-3 3 | x = 2 # noqa: RUF940, RUF950
-4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-5   |-x = 2 # noqa: RUF940, RUF950, RUF940
-  5 |+x = 2 # noqa: RUF950, RUF950, RUF940
-6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
+2 | x = 2 # noqa: RUF950
+3 | x = 2 # noqa: RUF940, RUF950
+4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+  - x = 2 # noqa: RUF940, RUF950, RUF940
+5 + x = 2 # noqa: RUF950, RUF950, RUF940
+6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
 
 RUF101 [*] `RUF940` is a redirect to `RUF950`
  --> RUF101_0.py:5:31
@@ -90,14 +82,12 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-2 2 | x = 2 # noqa: RUF950
-3 3 | x = 2 # noqa: RUF940, RUF950
-4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-5   |-x = 2 # noqa: RUF940, RUF950, RUF940
-  5 |+x = 2 # noqa: RUF940, RUF950, RUF950
-6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
+2 | x = 2 # noqa: RUF950
+3 | x = 2 # noqa: RUF940, RUF950
+4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+  - x = 2 # noqa: RUF940, RUF950, RUF940
+5 + x = 2 # noqa: RUF940, RUF950, RUF950
+6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
 
 RUF101 [*] `RUF940` is a redirect to `RUF950`
  --> RUF101_0.py:6:15
@@ -108,13 +98,11 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
   |               ^^^^^^
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-3 3 | x = 2 # noqa: RUF940, RUF950
-4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-5 5 | x = 2 # noqa: RUF940, RUF950, RUF940
-6   |-x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
-  6 |+x = 2 # noqa: RUF950, RUF950, RUF940, RUF950
+3 | x = 2 # noqa: RUF940, RUF950
+4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+5 | x = 2 # noqa: RUF940, RUF950, RUF940
+  - x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
+6 + x = 2 # noqa: RUF950, RUF950, RUF940, RUF950
 
 RUF101 [*] `RUF940` is a redirect to `RUF950`
  --> RUF101_0.py:6:31
@@ -125,10 +113,8 @@ RUF101 [*] `RUF940` is a redirect to `RUF950`
   |                               ^^^^^^
   |
 help: Replace with `RUF950`
-
-ℹ Safe fix
-3 3 | x = 2 # noqa: RUF940, RUF950
-4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
-5 5 | x = 2 # noqa: RUF940, RUF950, RUF940
-6   |-x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
-  6 |+x = 2 # noqa: RUF940, RUF950, RUF950, RUF950
+3 | x = 2 # noqa: RUF940, RUF950
+4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950
+5 | x = 2 # noqa: RUF940, RUF950, RUF940
+  - x = 2 # noqa: RUF940, RUF950, RUF940, RUF950
+6 + x = 2 # noqa: RUF940, RUF950, RUF950, RUF950
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap
index 2f65f2f208..fad41bd8f2 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap
@@ -12,13 +12,11 @@ RUF101 [*] `TCH002` is a redirect to `TC002`
 7 | from __future__ import annotations
   |
 help: Replace with `TC002`
-
-ℹ Safe fix
-2 2 | 
-3 3 | RUF101 should trigger here because the TCH rules have been recoded to TC.
-4 4 | """
-5   |-# ruff: noqa: TCH002
-  5 |+# ruff: noqa: TC002
-6 6 | 
-7 7 | from __future__ import annotations
-8 8 |
+2 | 
+3 | RUF101 should trigger here because the TCH rules have been recoded to TC.
+4 | """
+  - # ruff: noqa: TCH002
+5 + # ruff: noqa: TC002
+6 | 
+7 | from __future__ import annotations
+8 |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap
index c29d27335f..9c2cb5a1f7 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap
@@ -11,14 +11,12 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123
 4 | import re  # noqa: V123
   |
 help: Remove the rule code
-
-ℹ Safe fix
-1 1 | # Invalid code
-2   |-import os  # noqa: INVALID123
-  2 |+import os  
-3 3 | # External code
-4 4 | import re  # noqa: V123
-5 5 | # Valid noqa
+1 | # Invalid code
+  - import os  # noqa: INVALID123
+2 + import os  
+3 | # External code
+4 | import re  # noqa: V123
+5 | # Valid noqa
 
 RUF102 [*] Invalid rule code in `# noqa`: V123
  --> RUF102.py:4:12
@@ -31,16 +29,14 @@ RUF102 [*] Invalid rule code in `# noqa`: V123
 6 | import sys  # noqa: E402
   |
 help: Remove the rule code
-
-ℹ Safe fix
-1 1 | # Invalid code
-2 2 | import os  # noqa: INVALID123
-3 3 | # External code
-4   |-import re  # noqa: V123
-  4 |+import re  
-5 5 | # Valid noqa
-6 6 | import sys  # noqa: E402
-7 7 | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+1 | # Invalid code
+2 | import os  # noqa: INVALID123
+3 | # External code
+  - import re  # noqa: V123
+4 + import re  
+5 | # Valid noqa
+6 | import sys  # noqa: E402
+7 | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID456
  --> RUF102.py:7:65
@@ -53,16 +49,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID456
 9 | # Succeeding comment
   |
 help: Remove the rule code
-
-ℹ Safe fix
-4 4 | import re  # noqa: V123
-5 5 | # Valid noqa
-6 6 | import sys  # noqa: E402
-7   |-from functools import cache  # Preceeding comment # noqa: F401, INVALID456
-  7 |+from functools import cache  # Preceeding comment # noqa: F401
-8 8 | from itertools import product  # Preceeding comment # noqa: INVALID789
-9 9 | # Succeeding comment
-10 10 | import math # noqa: INVALID000 # Succeeding comment
+4  | import re  # noqa: V123
+5  | # Valid noqa
+6  | import sys  # noqa: E402
+   - from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+7  + from functools import cache  # Preceeding comment # noqa: F401
+8  | from itertools import product  # Preceeding comment # noqa: INVALID789
+9  | # Succeeding comment
+10 | import math # noqa: INVALID000 # Succeeding comment
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID789
   --> RUF102.py:8:53
@@ -75,16 +69,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID789
 10 | import math # noqa: INVALID000 # Succeeding comment
    |
 help: Remove the rule code
-
-ℹ Safe fix
-5 5 | # Valid noqa
-6 6 | import sys  # noqa: E402
-7 7 | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
-8   |-from itertools import product  # Preceeding comment # noqa: INVALID789
-  8 |+from itertools import product  # Preceeding comment 
-9 9 | # Succeeding comment
-10 10 | import math # noqa: INVALID000 # Succeeding comment
-11 11 | # Mixed valid and invalid
+5  | # Valid noqa
+6  | import sys  # noqa: E402
+7  | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+   - from itertools import product  # Preceeding comment # noqa: INVALID789
+8  + from itertools import product  # Preceeding comment 
+9  | # Succeeding comment
+10 | import math # noqa: INVALID000 # Succeeding comment
+11 | # Mixed valid and invalid
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID000
   --> RUF102.py:10:13
@@ -97,16 +89,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID000
 12 | from typing import List  # noqa: F401, INVALID123
    |
 help: Remove the rule code
-
-ℹ Safe fix
-7  7  | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
-8  8  | from itertools import product  # Preceeding comment # noqa: INVALID789
-9  9  | # Succeeding comment
-10    |-import math # noqa: INVALID000 # Succeeding comment
-   10 |+import math  # Succeeding comment
-11 11 | # Mixed valid and invalid
-12 12 | from typing import List  # noqa: F401, INVALID123
-13 13 | # Test for multiple invalid
+7  | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+8  | from itertools import product  # Preceeding comment # noqa: INVALID789
+9  | # Succeeding comment
+   - import math # noqa: INVALID000 # Succeeding comment
+10 + import math  # Succeeding comment
+11 | # Mixed valid and invalid
+12 | from typing import List  # noqa: F401, INVALID123
+13 | # Test for multiple invalid
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID123
   --> RUF102.py:12:40
@@ -119,16 +109,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123
 14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
    |
 help: Remove the rule code
-
-ℹ Safe fix
-9  9  | # Succeeding comment
-10 10 | import math # noqa: INVALID000 # Succeeding comment
-11 11 | # Mixed valid and invalid
-12    |-from typing import List  # noqa: F401, INVALID123
-   12 |+from typing import List  # noqa: F401
-13 13 | # Test for multiple invalid
-14 14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-15 15 | # Test for preserving valid codes when fixing
+9  | # Succeeding comment
+10 | import math # noqa: INVALID000 # Succeeding comment
+11 | # Mixed valid and invalid
+   - from typing import List  # noqa: F401, INVALID123
+12 + from typing import List  # noqa: F401
+13 | # Test for multiple invalid
+14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+15 | # Test for preserving valid codes when fixing
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID100
   --> RUF102.py:14:46
@@ -141,16 +129,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID100
 16 | from itertools import chain  # noqa: E402, INVALID300, F401
    |
 help: Remove the rule code
-
-ℹ Safe fix
-11 11 | # Mixed valid and invalid
-12 12 | from typing import List  # noqa: F401, INVALID123
-13 13 | # Test for multiple invalid
-14    |-from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-   14 |+from collections import defaultdict  # noqa: INVALID200, F401
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
+11 | # Mixed valid and invalid
+12 | from typing import List  # noqa: F401, INVALID123
+13 | # Test for multiple invalid
+   - from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+14 + from collections import defaultdict  # noqa: INVALID200, F401
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID200
   --> RUF102.py:14:58
@@ -163,16 +149,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID200
 16 | from itertools import chain  # noqa: E402, INVALID300, F401
    |
 help: Remove the rule code
-
-ℹ Safe fix
-11 11 | # Mixed valid and invalid
-12 12 | from typing import List  # noqa: F401, INVALID123
-13 13 | # Test for multiple invalid
-14    |-from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-   14 |+from collections import defaultdict  # noqa: INVALID100, F401
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
+11 | # Mixed valid and invalid
+12 | from typing import List  # noqa: F401, INVALID123
+13 | # Test for multiple invalid
+   - from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+14 + from collections import defaultdict  # noqa: INVALID100, F401
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID300
   --> RUF102.py:16:44
@@ -185,15 +169,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID300
 18 | import json  # noqa: E402, INVALID400, V100
    |
 help: Remove the rule code
-
-ℹ Safe fix
-13 13 | # Test for multiple invalid
-14 14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-15 15 | # Test for preserving valid codes when fixing
-16    |-from itertools import chain  # noqa: E402, INVALID300, F401
-   16 |+from itertools import chain  # noqa: E402, F401
-17 17 | # Test for mixed code types
-18 18 | import json  # noqa: E402, INVALID400, V100
+13 | # Test for multiple invalid
+14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+15 | # Test for preserving valid codes when fixing
+   - from itertools import chain  # noqa: E402, INVALID300, F401
+16 + from itertools import chain  # noqa: E402, F401
+17 | # Test for mixed code types
+18 | import json  # noqa: E402, INVALID400, V100
+19 | # Test for rule redirects
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID400
   --> RUF102.py:18:28
@@ -202,15 +185,17 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID400
 17 | # Test for mixed code types
 18 | import json  # noqa: E402, INVALID400, V100
    |                            ^^^^^^^^^^
+19 | # Test for rule redirects
+20 | import pandas as pd  # noqa: TCH002
    |
 help: Remove the rule code
-
-ℹ Safe fix
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
-18    |-import json  # noqa: E402, INVALID400, V100
-   18 |+import json  # noqa: E402, V100
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
+   - import json  # noqa: E402, INVALID400, V100
+18 + import json  # noqa: E402, V100
+19 | # Test for rule redirects
+20 | import pandas as pd  # noqa: TCH002
 
 RUF102 [*] Invalid rule code in `# noqa`: V100
   --> RUF102.py:18:40
@@ -219,12 +204,14 @@ RUF102 [*] Invalid rule code in `# noqa`: V100
 17 | # Test for mixed code types
 18 | import json  # noqa: E402, INVALID400, V100
    |                                        ^^^^
+19 | # Test for rule redirects
+20 | import pandas as pd  # noqa: TCH002
    |
 help: Remove the rule code
-
-ℹ Safe fix
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
-18    |-import json  # noqa: E402, INVALID400, V100
-   18 |+import json  # noqa: E402, INVALID400
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
+   - import json  # noqa: E402, INVALID400, V100
+18 + import json  # noqa: E402, INVALID400
+19 | # Test for rule redirects
+20 | import pandas as pd  # noqa: TCH002
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap
index 08859675d6..88a6a8f794 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap
@@ -9,21 +9,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 21 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-17 18 |     pass
-18 19 | 
-19 20 | 
-20    |-def f(arg: int = None):  # RUF013
-   21 |+def f(arg: int | None = None):  # RUF013
-21 22 |     pass
-22 23 | 
-23 24 | 
+18 |     pass
+19 | 
+20 | 
+   - def f(arg: int = None):  # RUF013
+21 + def f(arg: int | None = None):  # RUF013
+22 |     pass
+23 | 
+24 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:24:12
@@ -33,21 +32,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 25 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-21 22 |     pass
-22 23 | 
-23 24 | 
-24    |-def f(arg: str = None):  # RUF013
-   25 |+def f(arg: str | None = None):  # RUF013
-25 26 |     pass
-26 27 | 
-27 28 | 
+22 |     pass
+23 | 
+24 | 
+   - def f(arg: str = None):  # RUF013
+25 + def f(arg: str | None = None):  # RUF013
+26 |     pass
+27 | 
+28 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:28:12
@@ -57,21 +55,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 29 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-25 26 |     pass
-26 27 | 
-27 28 | 
-28    |-def f(arg: Tuple[str] = None):  # RUF013
-   29 |+def f(arg: Tuple[str] | None = None):  # RUF013
-29 30 |     pass
-30 31 | 
-31 32 | 
+26 |     pass
+27 | 
+28 | 
+   - def f(arg: Tuple[str] = None):  # RUF013
+29 + def f(arg: Tuple[str] | None = None):  # RUF013
+30 |     pass
+31 | 
+32 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:58:12
@@ -81,21 +78,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 59 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-55 56 |     pass
-56 57 | 
-57 58 | 
-58    |-def f(arg: Union = None):  # RUF013
-   59 |+def f(arg: Union | None = None):  # RUF013
-59 60 |     pass
-60 61 | 
-61 62 | 
+56 |     pass
+57 | 
+58 | 
+   - def f(arg: Union = None):  # RUF013
+59 + def f(arg: Union | None = None):  # RUF013
+60 |     pass
+61 | 
+62 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:62:12
@@ -105,21 +101,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 63 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-59 60 |     pass
-60 61 | 
-61 62 | 
-62    |-def f(arg: Union[int] = None):  # RUF013
-   63 |+def f(arg: Union[int] | None = None):  # RUF013
-63 64 |     pass
-64 65 | 
-65 66 | 
+60 |     pass
+61 | 
+62 | 
+   - def f(arg: Union[int] = None):  # RUF013
+63 + def f(arg: Union[int] | None = None):  # RUF013
+64 |     pass
+65 | 
+66 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:66:12
@@ -129,21 +124,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 67 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-63 64 |     pass
-64 65 | 
-65 66 | 
-66    |-def f(arg: Union[int, str] = None):  # RUF013
-   67 |+def f(arg: Union[int, str] | None = None):  # RUF013
-67 68 |     pass
-68 69 | 
-69 70 | 
+64 |     pass
+65 | 
+66 | 
+   - def f(arg: Union[int, str] = None):  # RUF013
+67 + def f(arg: Union[int, str] | None = None):  # RUF013
+68 |     pass
+69 | 
+70 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:85:12
@@ -153,21 +147,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 86 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-82 83 |     pass
-83 84 | 
-84 85 | 
-85    |-def f(arg: int | float = None):  # RUF013
-   86 |+def f(arg: int | float | None = None):  # RUF013
-86 87 |     pass
-87 88 | 
-88 89 | 
+83 |     pass
+84 | 
+85 | 
+   - def f(arg: int | float = None):  # RUF013
+86 + def f(arg: int | float | None = None):  # RUF013
+87 |     pass
+88 | 
+89 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_0.py:89:12
@@ -177,21 +170,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 90 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-86 87 |     pass
-87 88 | 
-88 89 | 
-89    |-def f(arg: int | float | str | bytes = None):  # RUF013
-   90 |+def f(arg: int | float | str | bytes | None = None):  # RUF013
-90 91 |     pass
-91 92 | 
-92 93 | 
+87 |     pass
+88 | 
+89 | 
+   - def f(arg: int | float | str | bytes = None):  # RUF013
+90 + def f(arg: int | float | str | bytes | None = None):  # RUF013
+91 |     pass
+92 | 
+93 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:108:12
@@ -201,21 +193,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 109 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-105 106 |     pass
-106 107 | 
-107 108 | 
-108     |-def f(arg: Literal[1] = None):  # RUF013
-    109 |+def f(arg: Literal[1] | None = None):  # RUF013
-109 110 |     pass
-110 111 | 
-111 112 | 
+106 |     pass
+107 | 
+108 | 
+    - def f(arg: Literal[1] = None):  # RUF013
+109 + def f(arg: Literal[1] | None = None):  # RUF013
+110 |     pass
+111 | 
+112 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:112:12
@@ -225,21 +216,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 113 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-109 110 |     pass
-110 111 | 
-111 112 | 
-112     |-def f(arg: Literal[1, "foo"] = None):  # RUF013
-    113 |+def f(arg: Literal[1, "foo"] | None = None):  # RUF013
-113 114 |     pass
-114 115 | 
-115 116 | 
+110 |     pass
+111 | 
+112 | 
+    - def f(arg: Literal[1, "foo"] = None):  # RUF013
+113 + def f(arg: Literal[1, "foo"] | None = None):  # RUF013
+114 |     pass
+115 | 
+116 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:131:22
@@ -249,21 +239,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 132 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-128 129 |     pass
-129 130 | 
-130 131 | 
-131     |-def f(arg: Annotated[int, ...] = None):  # RUF013
-    132 |+def f(arg: Annotated[int | None, ...] = None):  # RUF013
-132 133 |     pass
-133 134 | 
-134 135 | 
+129 |     pass
+130 | 
+131 | 
+    - def f(arg: Annotated[int, ...] = None):  # RUF013
+132 + def f(arg: Annotated[int | None, ...] = None):  # RUF013
+133 |     pass
+134 | 
+135 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:135:32
@@ -273,21 +262,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 136 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-132 133 |     pass
-133 134 | 
-134 135 | 
-135     |-def f(arg: Annotated[Annotated[int | str, ...], ...] = None):  # RUF013
-    136 |+def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None):  # RUF013
-136 137 |     pass
-137 138 | 
-138 139 | 
+133 |     pass
+134 | 
+135 | 
+    - def f(arg: Annotated[Annotated[int | str, ...], ...] = None):  # RUF013
+136 + def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None):  # RUF013
+137 |     pass
+138 | 
+139 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:151:11
@@ -299,21 +287,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 153 |     arg3: Literal[1, 2, 3] = None,  # RUF013
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-148 149 | 
-149 150 | 
-150 151 | def f(
-151     |-    arg1: int = None,  # RUF013
-    152 |+    arg1: int | None = None,  # RUF013
-152 153 |     arg2: Union[int, float] = None,  # RUF013
-153 154 |     arg3: Literal[1, 2, 3] = None,  # RUF013
-154 155 | ):
+149 | 
+150 | 
+151 | def f(
+    -     arg1: int = None,  # RUF013
+152 +     arg1: int | None = None,  # RUF013
+153 |     arg2: Union[int, float] = None,  # RUF013
+154 |     arg3: Literal[1, 2, 3] = None,  # RUF013
+155 | ):
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:152:11
@@ -326,21 +313,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 154 | ):
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-149 150 | 
-150 151 | def f(
-151 152 |     arg1: int = None,  # RUF013
-152     |-    arg2: Union[int, float] = None,  # RUF013
-    153 |+    arg2: Union[int, float] | None = None,  # RUF013
-153 154 |     arg3: Literal[1, 2, 3] = None,  # RUF013
-154 155 | ):
-155 156 |     pass
+150 | 
+151 | def f(
+152 |     arg1: int = None,  # RUF013
+    -     arg2: Union[int, float] = None,  # RUF013
+153 +     arg2: Union[int, float] | None = None,  # RUF013
+154 |     arg3: Literal[1, 2, 3] = None,  # RUF013
+155 | ):
+156 |     pass
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:153:11
@@ -353,21 +339,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 155 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-150 151 | def f(
-151 152 |     arg1: int = None,  # RUF013
-152 153 |     arg2: Union[int, float] = None,  # RUF013
-153     |-    arg3: Literal[1, 2, 3] = None,  # RUF013
-    154 |+    arg3: Literal[1, 2, 3] | None = None,  # RUF013
-154 155 | ):
-155 156 |     pass
-156 157 | 
+151 | def f(
+152 |     arg1: int = None,  # RUF013
+153 |     arg2: Union[int, float] = None,  # RUF013
+    -     arg3: Literal[1, 2, 3] = None,  # RUF013
+154 +     arg3: Literal[1, 2, 3] | None = None,  # RUF013
+155 | ):
+156 |     pass
+157 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:181:12
@@ -377,21 +362,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 182 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-178 179 |     pass
-179 180 | 
-180 181 | 
-181     |-def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None):  # RUF013
-    182 |+def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None):  # RUF013
-182 183 |     pass
-183 184 | 
-184 185 | 
+179 |     pass
+180 | 
+181 | 
+    - def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None):  # RUF013
+182 + def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None):  # RUF013
+183 |     pass
+184 | 
+185 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:188:13
@@ -401,16 +385,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 189 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-185 185 | # Quoted
-186 186 | 
-187 187 | 
-188     |-def f(arg: "int" = None):  # RUF013
-    188 |+def f(arg: "Optional[int]" = None):  # RUF013
-189 189 |     pass
-190 190 | 
-191 191 | 
+185 | # Quoted
+186 | 
+187 | 
+    - def f(arg: "int" = None):  # RUF013
+188 + def f(arg: "Optional[int]" = None):  # RUF013
+189 |     pass
+190 | 
+191 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:192:13
@@ -420,16 +403,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 193 |     pass
     |
 help: Convert to `Optional[T]`
-
-ℹ Unsafe fix
-189 189 |     pass
-190 190 | 
-191 191 | 
-192     |-def f(arg: "str" = None):  # RUF013
-    192 |+def f(arg: "Optional[str]" = None):  # RUF013
-193 193 |     pass
-194 194 | 
-195 195 | 
+189 |     pass
+190 | 
+191 | 
+    - def f(arg: "str" = None):  # RUF013
+192 + def f(arg: "Optional[str]" = None):  # RUF013
+193 |     pass
+194 | 
+195 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 PEP 484 prohibits implicit `Optional`
    --> RUF013_0.py:196:12
@@ -448,18 +430,17 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 205 |     pass
     |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-    1   |+from __future__ import annotations
-1   2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
-2   3   | 
-3   4   | 
+1   + from __future__ import annotations
+2   | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
+3   | 
+4   | 
 --------------------------------------------------------------------------------
-201 202 |     pass
-202 203 | 
-203 204 | 
-204     |-def f(arg: Union["int", "str"] = None):  # RUF013
-    205 |+def f(arg: Union["int", "str"] | None = None):  # RUF013
-205 206 |     pass
-206 207 | 
-207 208 |
+202 |     pass
+203 | 
+204 | 
+    - def f(arg: Union["int", "str"] = None):  # RUF013
+205 + def f(arg: Union["int", "str"] | None = None):  # RUF013
+206 |     pass
+207 | 
+208 | 
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap
index 753c4d86f3..dfcdf2c124 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap
@@ -9,12 +9,11 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 5 |     pass
   |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-1 1 | # No `typing.Optional` import
-  2 |+from __future__ import annotations
-2 3 | 
-3 4 | 
-4   |-def f(arg: int = None):  # RUF013
-  5 |+def f(arg: int | None = None):  # RUF013
-5 6 |     pass
+1 | # No `typing.Optional` import
+2 + from __future__ import annotations
+3 | 
+4 | 
+  - def f(arg: int = None):  # RUF013
+5 + def f(arg: int | None = None):  # RUF013
+6 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap
index f02a76cb38..fc6c5e2f3e 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap
@@ -9,17 +9,16 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 5 |     pass
   |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-  1 |+from __future__ import annotations
-1 2 | import typing
-2 3 | 
-3 4 | 
-4   |-def f(arg: typing.List[str] = None):  # RUF013
-  5 |+def f(arg: typing.List[str] | None = None):  # RUF013
-5 6 |     pass
-6 7 | 
-7 8 | 
+1 + from __future__ import annotations
+2 | import typing
+3 | 
+4 | 
+  - def f(arg: typing.List[str] = None):  # RUF013
+5 + def f(arg: typing.List[str] | None = None):  # RUF013
+6 |     pass
+7 | 
+8 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_3.py:22:12
@@ -29,21 +28,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 23 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | import typing
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | import typing
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-19 20 |     pass
-20 21 | 
-21 22 | 
-22    |-def f(arg: typing.Union[int, str] = None):  # RUF013
-   23 |+def f(arg: typing.Union[int, str] | None = None):  # RUF013
-23 24 |     pass
-24 25 | 
-25 26 | 
+20 |     pass
+21 | 
+22 | 
+   - def f(arg: typing.Union[int, str] = None):  # RUF013
+23 + def f(arg: typing.Union[int, str] | None = None):  # RUF013
+24 |     pass
+25 | 
+26 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF013 [*] PEP 484 prohibits implicit `Optional`
   --> RUF013_3.py:29:12
@@ -53,16 +51,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
 30 |     pass
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-   1  |+from __future__ import annotations
-1  2  | import typing
-2  3  | 
-3  4  | 
+1  + from __future__ import annotations
+2  | import typing
+3  | 
+4  | 
 --------------------------------------------------------------------------------
-26 27 | # Literal
-27 28 | 
-28 29 | 
-29    |-def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
-   30 |+def f(arg: typing.Literal[1, "foo", True] | None = None):  # RUF013
-30 31 |     pass
+27 | # Literal
+28 | 
+29 | 
+   - def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
+30 + def f(arg: typing.Literal[1, "foo", True] | None = None):  # RUF013
+31 |     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap
index f9bcd454d3..d1a4078a12 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap
@@ -8,19 +8,18 @@ RUF013 [*] PEP 484 prohibits implicit `Optional`
    |                                                             ^^^
    |
 help: Convert to `T | None`
-
-ℹ Unsafe fix
-1  1  | # https://github.com/astral-sh/ruff/issues/13833
-   2  |+from __future__ import annotations
-2  3  | 
-3  4  | from typing import Optional
-4  5  | 
+1  | # https://github.com/astral-sh/ruff/issues/13833
+2  + from __future__ import annotations
+3  | 
+4  | from typing import Optional
+5  | 
 --------------------------------------------------------------------------------
-12 13 | def multiple_1(arg1: Optional, arg2: Optional = None): ...
-13 14 | 
-14 15 | 
-15    |-def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ...
-   16 |+def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ...
-16 17 | 
-17 18 | 
-18 19 | def return_type(arg: Optional = None) -> Optional: ...
+13 | def multiple_1(arg1: Optional, arg2: Optional = None): ...
+14 | 
+15 | 
+   - def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ...
+16 + def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ...
+17 | 
+18 | 
+19 | def return_type(arg: Optional = None) -> Optional: ...
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables.snap
index 4e9ab5604c..27e8db6209 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables.snap
@@ -191,11 +191,3 @@ RUF001 String contains ambiguous `𝐁` (MATHEMATICAL BOLD CAPITAL B). Did you m
 59 |
 60 | from typing import Literal
    |
-
-RUF001 String contains ambiguous `ﮨ` (ARABIC LETTER HEH GOAL INITIAL FORM). Did you mean `o` (LATIN SMALL LETTER O)?
-  --> confusables.py:61:20
-   |
-60 | from typing import Literal
-61 | x: '''"""'Literal["ﮨ"]'"""'''
-   |                    ^
-   |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables_deferred_annotations_diff.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables_deferred_annotations_diff.snap
new file mode 100644
index 0000000000..3411053a0d
--- /dev/null
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__confusables_deferred_annotations_diff.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff_linter/src/rules/ruff/mod.rs
+---
+--- Linter settings ---
+-linter.unresolved_target_version = 3.13
++linter.unresolved_target_version = 3.14
+
+--- Summary ---
+Removed: 1
+Added: 0
+
+--- Removed ---
+RUF001 String contains ambiguous `ﮨ` (ARABIC LETTER HEH GOAL INITIAL FORM). Did you mean `o` (LATIN SMALL LETTER O)?
+  --> confusables.py:61:20
+   |
+60 | from typing import Literal
+61 | x: '''"""'Literal["ﮨ"]'"""'''
+   |                    ^
+   |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap
index 9c7eaadd88..d6c759ad67 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap
@@ -11,18 +11,17 @@ RUF052 [*] Local dummy variable `_var` is accessed
 93 |         return _var
    |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-89 89 | 
-90 90 | class Class_:
-91 91 |     def fun(self):
-92    |-        _var = "method variable" # [RUF052]
-93    |-        return _var
-   92 |+        var = "method variable" # [RUF052]
-   93 |+        return var
-94 94 | 
-95 95 | def fun(_var): # parameters are ignored
-96 96 |     return _var
+89 | 
+90 | class Class_:
+91 |     def fun(self):
+   -         _var = "method variable" # [RUF052]
+   -         return _var
+92 +         var = "method variable" # [RUF052]
+93 +         return var
+94 | 
+95 | def fun(_var): # parameters are ignored
+96 |     return _var
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_list` is accessed
    --> RUF052.py:99:5
@@ -33,18 +32,17 @@ RUF052 [*] Local dummy variable `_list` is accessed
 100 |     return _list
     |
 help: Prefer using trailing underscores to avoid shadowing a built-in
-
-ℹ Unsafe fix
-96  96  |     return _var
-97  97  | 
-98  98  | def fun():
-99      |-    _list = "built-in" # [RUF052]
-100     |-    return _list
-    99  |+    list_ = "built-in" # [RUF052]
-    100 |+    return list_
-101 101 | 
-102 102 | x = "global"
-103 103 | 
+96  |     return _var
+97  | 
+98  | def fun():
+    -     _list = "built-in" # [RUF052]
+    -     return _list
+99  +     list_ = "built-in" # [RUF052]
+100 +     return list_
+101 | 
+102 | x = "global"
+103 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_x` is accessed
    --> RUF052.py:106:5
@@ -56,18 +54,17 @@ RUF052 [*] Local dummy variable `_x` is accessed
 107 |     return _x
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-103 103 | 
-104 104 | def fun():
-105 105 |     global x
-106     |-    _x = "shadows global" # [RUF052]
-107     |-    return _x
-    106 |+    x_ = "shadows global" # [RUF052]
-    107 |+    return x_
-108 108 | 
-109 109 | def foo():
-110 110 |   x = "outer"
+103 | 
+104 | def fun():
+105 |     global x
+    -     _x = "shadows global" # [RUF052]
+    -     return _x
+106 +     x_ = "shadows global" # [RUF052]
+107 +     return x_
+108 | 
+109 | def foo():
+110 |   x = "outer"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_x` is accessed
    --> RUF052.py:113:5
@@ -80,18 +77,17 @@ RUF052 [*] Local dummy variable `_x` is accessed
 115 |   bar()
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-110 110 |   x = "outer"
-111 111 |   def bar():
-112 112 |     nonlocal x
-113     |-    _x = "shadows nonlocal" # [RUF052]
-114     |-    return _x
-    113 |+    x_ = "shadows nonlocal" # [RUF052]
-    114 |+    return x_
-115 115 |   bar()
-116 116 |   return x
-117 117 | 
+110 |   x = "outer"
+111 |   def bar():
+112 |     nonlocal x
+    -     _x = "shadows nonlocal" # [RUF052]
+    -     return _x
+113 +     x_ = "shadows nonlocal" # [RUF052]
+114 +     return x_
+115 |   bar()
+116 |   return x
+117 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_x` is accessed
    --> RUF052.py:120:5
@@ -103,18 +99,17 @@ RUF052 [*] Local dummy variable `_x` is accessed
 121 |     return _x
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-117 117 | 
-118 118 | def fun():
-119 119 |     x = "local"
-120     |-    _x = "shadows local" # [RUF052]
-121     |-    return _x
-    120 |+    x_ = "shadows local" # [RUF052]
-    121 |+    return x_
-122 122 | 
-123 123 | 
-124 124 | GLOBAL_1 = "global 1"
+117 | 
+118 | def fun():
+119 |     x = "local"
+    -     _x = "shadows local" # [RUF052]
+    -     return _x
+120 +     x_ = "shadows local" # [RUF052]
+121 +     return x_
+122 | 
+123 | 
+124 | GLOBAL_1 = "global 1"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 Local dummy variable `_GLOBAL_1` is accessed
    --> RUF052.py:128:5
@@ -169,25 +164,24 @@ RUF052 [*] Local dummy variable `_P` is accessed
 155 |     _NT = NamedTuple("_NT", [("foo", int)])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-150 150 |     from enum import Enum
-151 151 |     from collections import namedtuple
-152 152 | 
-153     |-    _P = ParamSpec("_P")
-    153 |+    P = ParamSpec("P")
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
+150 |     from enum import Enum
+151 |     from collections import namedtuple
+152 | 
+    -     _P = ParamSpec("_P")
+153 +     P = ParamSpec("P")
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
 --------------------------------------------------------------------------------
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_T` is accessed
    --> RUF052.py:154:5
@@ -199,25 +193,24 @@ RUF052 [*] Local dummy variable `_T` is accessed
 156 |     _E = Enum("_E", ["a", "b", "c"])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-151 151 |     from collections import namedtuple
-152 152 | 
-153 153 |     _P = ParamSpec("_P")
-154     |-    _T = TypeVar(name="_T", covariant=True, bound=int|str)
-    154 |+    T = TypeVar(name="T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+151 |     from collections import namedtuple
+152 | 
+153 |     _P = ParamSpec("_P")
+    -     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+154 +     T = TypeVar(name="T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
 --------------------------------------------------------------------------------
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NT` is accessed
    --> RUF052.py:155:5
@@ -230,24 +223,23 @@ RUF052 [*] Local dummy variable `_NT` is accessed
 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-152 152 | 
-153 153 |     _P = ParamSpec("_P")
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155     |-    _NT = NamedTuple("_NT", [("foo", int)])
-    155 |+    NT = NamedTuple("NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+152 | 
+153 |     _P = ParamSpec("_P")
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+    -     _NT = NamedTuple("_NT", [("foo", int)])
+155 +     NT = NamedTuple("NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_E` is accessed
    --> RUF052.py:156:5
@@ -260,23 +252,22 @@ RUF052 [*] Local dummy variable `_E` is accessed
 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-153 153 |     _P = ParamSpec("_P")
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156     |-    _E = Enum("_E", ["a", "b", "c"])
-    156 |+    E = Enum("E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+153 |     _P = ParamSpec("_P")
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+    -     _E = Enum("_E", ["a", "b", "c"])
+156 +     E = Enum("E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NT2` is accessed
    --> RUF052.py:157:5
@@ -289,22 +280,21 @@ RUF052 [*] Local dummy variable `_NT2` is accessed
 159 |     _DynamicClass = type("_DynamicClass", (), {})
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-154 154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157     |-    _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-    157 |+    NT2 = namedtuple("NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+154 |     _T = TypeVar(name="_T", covariant=True, bound=int|str)
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+    -     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+157 +     NT2 = namedtuple("NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NT3` is accessed
    --> RUF052.py:158:5
@@ -317,21 +307,20 @@ RUF052 [*] Local dummy variable `_NT3` is accessed
 160 |     _NotADynamicClass = type("_NotADynamicClass")
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-155 155 |     _NT = NamedTuple("_NT", [("foo", int)])
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158     |-    _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-    158 |+    NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+155 |     _NT = NamedTuple("_NT", [("foo", int)])
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+    -     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+158 +     NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_DynamicClass` is accessed
    --> RUF052.py:159:5
@@ -343,20 +332,19 @@ RUF052 [*] Local dummy variable `_DynamicClass` is accessed
 160 |     _NotADynamicClass = type("_NotADynamicClass")
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-156 156 |     _E = Enum("_E", ["a", "b", "c"])
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159     |-    _DynamicClass = type("_DynamicClass", (), {})
-    159 |+    DynamicClass = type("DynamicClass", (), {})
-160 160 |     _NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+156 |     _E = Enum("_E", ["a", "b", "c"])
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+    -     _DynamicClass = type("_DynamicClass", (), {})
+159 +     DynamicClass = type("DynamicClass", (), {})
+160 |     _NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed
    --> RUF052.py:160:5
@@ -369,19 +357,18 @@ RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed
 162 |     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
     |
 help: Remove leading underscores
-
-ℹ Unsafe fix
-157 157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
-158 158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
-159 159 |     _DynamicClass = type("_DynamicClass", (), {})
-160     |-    _NotADynamicClass = type("_NotADynamicClass")
-    160 |+    NotADynamicClass = type("_NotADynamicClass")
-161 161 | 
-162     |-    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
-    162 |+    print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass)
-163 163 | 
-164 164 | # Do not emit diagnostic if parameter is private
-165 165 | # even if it is later shadowed in the body of the function
+157 |     _NT2 = namedtuple("_NT2", ['x', 'y', 'z'])
+158 |     _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z'])
+159 |     _DynamicClass = type("_DynamicClass", (), {})
+    -     _NotADynamicClass = type("_NotADynamicClass")
+160 +     NotADynamicClass = type("_NotADynamicClass")
+161 | 
+    -     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass)
+162 +     print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass)
+163 | 
+164 | # Do not emit diagnostic if parameter is private
+165 | # even if it is later shadowed in the body of the function
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 [*] Local dummy variable `_dummy_var` is accessed
    --> RUF052.py:182:5
@@ -393,21 +380,20 @@ RUF052 [*] Local dummy variable `_dummy_var` is accessed
 184 |     def bar():
     |
 help: Prefer using trailing underscores to avoid shadowing a variable
-
-ℹ Unsafe fix
-179 179 | 
-180 180 | 
-181 181 | def foo():
-182     |-    _dummy_var = 42
-    182 |+    dummy_var_ = 42
-183 183 | 
-184 184 |     def bar():
-185 185 |         dummy_var = 43
-186     |-        print(_dummy_var)
-    186 |+        print(dummy_var_)
-187 187 | 
-188 188 | 
-189 189 | def foo():
+179 | 
+180 | 
+181 | def foo():
+    -     _dummy_var = 42
+182 +     dummy_var_ = 42
+183 | 
+184 |     def bar():
+185 |         dummy_var = 43
+    -         print(_dummy_var)
+186 +         print(dummy_var_)
+187 | 
+188 | 
+189 | def foo():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF052 Local dummy variable `_dummy_var` is accessed
    --> RUF052.py:192:5
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap
index 81f24cd251..e9b7890bf3 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap
@@ -11,14 +11,12 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123
 4 | import re  # noqa: V123
   |
 help: Remove the rule code
-
-ℹ Safe fix
-1 1 | # Invalid code
-2   |-import os  # noqa: INVALID123
-  2 |+import os  
-3 3 | # External code
-4 4 | import re  # noqa: V123
-5 5 | # Valid noqa
+1 | # Invalid code
+  - import os  # noqa: INVALID123
+2 + import os  
+3 | # External code
+4 | import re  # noqa: V123
+5 | # Valid noqa
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID456
  --> RUF102.py:7:65
@@ -31,16 +29,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID456
 9 | # Succeeding comment
   |
 help: Remove the rule code
-
-ℹ Safe fix
-4 4 | import re  # noqa: V123
-5 5 | # Valid noqa
-6 6 | import sys  # noqa: E402
-7   |-from functools import cache  # Preceeding comment # noqa: F401, INVALID456
-  7 |+from functools import cache  # Preceeding comment # noqa: F401
-8 8 | from itertools import product  # Preceeding comment # noqa: INVALID789
-9 9 | # Succeeding comment
-10 10 | import math # noqa: INVALID000 # Succeeding comment
+4  | import re  # noqa: V123
+5  | # Valid noqa
+6  | import sys  # noqa: E402
+   - from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+7  + from functools import cache  # Preceeding comment # noqa: F401
+8  | from itertools import product  # Preceeding comment # noqa: INVALID789
+9  | # Succeeding comment
+10 | import math # noqa: INVALID000 # Succeeding comment
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID789
   --> RUF102.py:8:53
@@ -53,16 +49,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID789
 10 | import math # noqa: INVALID000 # Succeeding comment
    |
 help: Remove the rule code
-
-ℹ Safe fix
-5 5 | # Valid noqa
-6 6 | import sys  # noqa: E402
-7 7 | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
-8   |-from itertools import product  # Preceeding comment # noqa: INVALID789
-  8 |+from itertools import product  # Preceeding comment 
-9 9 | # Succeeding comment
-10 10 | import math # noqa: INVALID000 # Succeeding comment
-11 11 | # Mixed valid and invalid
+5  | # Valid noqa
+6  | import sys  # noqa: E402
+7  | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+   - from itertools import product  # Preceeding comment # noqa: INVALID789
+8  + from itertools import product  # Preceeding comment 
+9  | # Succeeding comment
+10 | import math # noqa: INVALID000 # Succeeding comment
+11 | # Mixed valid and invalid
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID000
   --> RUF102.py:10:13
@@ -75,16 +69,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID000
 12 | from typing import List  # noqa: F401, INVALID123
    |
 help: Remove the rule code
-
-ℹ Safe fix
-7  7  | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
-8  8  | from itertools import product  # Preceeding comment # noqa: INVALID789
-9  9  | # Succeeding comment
-10    |-import math # noqa: INVALID000 # Succeeding comment
-   10 |+import math  # Succeeding comment
-11 11 | # Mixed valid and invalid
-12 12 | from typing import List  # noqa: F401, INVALID123
-13 13 | # Test for multiple invalid
+7  | from functools import cache  # Preceeding comment # noqa: F401, INVALID456
+8  | from itertools import product  # Preceeding comment # noqa: INVALID789
+9  | # Succeeding comment
+   - import math # noqa: INVALID000 # Succeeding comment
+10 + import math  # Succeeding comment
+11 | # Mixed valid and invalid
+12 | from typing import List  # noqa: F401, INVALID123
+13 | # Test for multiple invalid
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID123
   --> RUF102.py:12:40
@@ -97,16 +89,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123
 14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
    |
 help: Remove the rule code
-
-ℹ Safe fix
-9  9  | # Succeeding comment
-10 10 | import math # noqa: INVALID000 # Succeeding comment
-11 11 | # Mixed valid and invalid
-12    |-from typing import List  # noqa: F401, INVALID123
-   12 |+from typing import List  # noqa: F401
-13 13 | # Test for multiple invalid
-14 14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-15 15 | # Test for preserving valid codes when fixing
+9  | # Succeeding comment
+10 | import math # noqa: INVALID000 # Succeeding comment
+11 | # Mixed valid and invalid
+   - from typing import List  # noqa: F401, INVALID123
+12 + from typing import List  # noqa: F401
+13 | # Test for multiple invalid
+14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+15 | # Test for preserving valid codes when fixing
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID100
   --> RUF102.py:14:46
@@ -119,16 +109,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID100
 16 | from itertools import chain  # noqa: E402, INVALID300, F401
    |
 help: Remove the rule code
-
-ℹ Safe fix
-11 11 | # Mixed valid and invalid
-12 12 | from typing import List  # noqa: F401, INVALID123
-13 13 | # Test for multiple invalid
-14    |-from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-   14 |+from collections import defaultdict  # noqa: INVALID200, F401
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
+11 | # Mixed valid and invalid
+12 | from typing import List  # noqa: F401, INVALID123
+13 | # Test for multiple invalid
+   - from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+14 + from collections import defaultdict  # noqa: INVALID200, F401
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID200
   --> RUF102.py:14:58
@@ -141,16 +129,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID200
 16 | from itertools import chain  # noqa: E402, INVALID300, F401
    |
 help: Remove the rule code
-
-ℹ Safe fix
-11 11 | # Mixed valid and invalid
-12 12 | from typing import List  # noqa: F401, INVALID123
-13 13 | # Test for multiple invalid
-14    |-from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-   14 |+from collections import defaultdict  # noqa: INVALID100, F401
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
+11 | # Mixed valid and invalid
+12 | from typing import List  # noqa: F401, INVALID123
+13 | # Test for multiple invalid
+   - from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+14 + from collections import defaultdict  # noqa: INVALID100, F401
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID300
   --> RUF102.py:16:44
@@ -163,15 +149,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID300
 18 | import json  # noqa: E402, INVALID400, V100
    |
 help: Remove the rule code
-
-ℹ Safe fix
-13 13 | # Test for multiple invalid
-14 14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
-15 15 | # Test for preserving valid codes when fixing
-16    |-from itertools import chain  # noqa: E402, INVALID300, F401
-   16 |+from itertools import chain  # noqa: E402, F401
-17 17 | # Test for mixed code types
-18 18 | import json  # noqa: E402, INVALID400, V100
+13 | # Test for multiple invalid
+14 | from collections import defaultdict  # noqa: INVALID100, INVALID200, F401
+15 | # Test for preserving valid codes when fixing
+   - from itertools import chain  # noqa: E402, INVALID300, F401
+16 + from itertools import chain  # noqa: E402, F401
+17 | # Test for mixed code types
+18 | import json  # noqa: E402, INVALID400, V100
+19 | # Test for rule redirects
 
 RUF102 [*] Invalid rule code in `# noqa`: INVALID400
   --> RUF102.py:18:28
@@ -180,12 +165,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID400
 17 | # Test for mixed code types
 18 | import json  # noqa: E402, INVALID400, V100
    |                            ^^^^^^^^^^
+19 | # Test for rule redirects
+20 | import pandas as pd  # noqa: TCH002
    |
 help: Remove the rule code
-
-ℹ Safe fix
-15 15 | # Test for preserving valid codes when fixing
-16 16 | from itertools import chain  # noqa: E402, INVALID300, F401
-17 17 | # Test for mixed code types
-18    |-import json  # noqa: E402, INVALID400, V100
-   18 |+import json  # noqa: E402, V100
+15 | # Test for preserving valid codes when fixing
+16 | from itertools import chain  # noqa: E402, INVALID300, F401
+17 | # Test for mixed code types
+   - import json  # noqa: E402, INVALID400, V100
+18 + import json  # noqa: E402, V100
+19 | # Test for rule redirects
+20 | import pandas as pd  # noqa: TCH002
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap
index df2659be72..f26f83731b 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap
@@ -11,14 +11,12 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 4 |     1,
   |
 help: Remove parentheses
-
-ℹ Safe fix
-1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
-2   |-d[(1,2)]
-  2 |+d[1,2]
-3 3 | d[(
-4 4 |     1,
-5 5 |     2
+1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
+  - d[(1,2)]
+2 + d[1,2]
+3 | d[(
+4 |     1,
+5 |     2
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
  --> RUF031.py:3:3
@@ -35,19 +33,17 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 8 |       1,
   |
 help: Remove parentheses
-
-ℹ Safe fix
-1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
-2 2 | d[(1,2)]
-3   |-d[(
-  3 |+d[
-4 4 |     1,
-5 5 |     2
-6   |-)]
-  6 |+]
-7 7 | d[
-8 8 |     1,
-9 9 |     2
+1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
+2 | d[(1,2)]
+  - d[(
+3 + d[
+4 |     1,
+5 |     2
+  - )]
+6 + ]
+7 | d[
+8 |     1,
+9 |     2
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:11:3
@@ -60,16 +56,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 13 | d[(8,)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-8  8  |     1,
-9  9  |     2
-10 10 | ]
-11    |-d[(2,4)]
-   11 |+d[2,4]
-12 12 | d[(5,6,7)]
-13 13 | d[(8,)]
-14 14 | d[tuple(1,2)]
+8  |     1,
+9  |     2
+10 | ]
+   - d[(2,4)]
+11 + d[2,4]
+12 | d[(5,6,7)]
+13 | d[(8,)]
+14 | d[tuple(1,2)]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:12:3
@@ -82,16 +76,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 14 | d[tuple(1,2)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-9  9  |     2
-10 10 | ]
-11 11 | d[(2,4)]
-12    |-d[(5,6,7)]
-   12 |+d[5,6,7]
-13 13 | d[(8,)]
-14 14 | d[tuple(1,2)]
-15 15 | d[tuple(8)]
+9  |     2
+10 | ]
+11 | d[(2,4)]
+   - d[(5,6,7)]
+12 + d[5,6,7]
+13 | d[(8,)]
+14 | d[tuple(1,2)]
+15 | d[tuple(8)]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:13:3
@@ -104,16 +96,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 15 | d[tuple(8)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-10 10 | ]
-11 11 | d[(2,4)]
-12 12 | d[(5,6,7)]
-13    |-d[(8,)]
-   13 |+d[8,]
-14 14 | d[tuple(1,2)]
-15 15 | d[tuple(8)]
-16 16 | d[1,2]
+10 | ]
+11 | d[(2,4)]
+12 | d[(5,6,7)]
+   - d[(8,)]
+13 + d[8,]
+14 | d[tuple(1,2)]
+15 | d[tuple(8)]
+16 | d[1,2]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:20:3
@@ -125,17 +115,15 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 21 | e[(1,2),(3,4)]
    |
 help: Remove parentheses
-
-ℹ Safe fix
-17 17 | d[3,4]
-18 18 | d[5,6,7]
-19 19 | e = {((1,2),(3,4)):"a"}
-20    |-e[((1,2),(3,4))]
-21 20 | e[(1,2),(3,4)]
-   21 |+e[(1,2),(3,4)]
-22 22 | 
-23 23 | token_features[
-24 24 |     (window_position, feature_name)
+17 | d[3,4]
+18 | d[5,6,7]
+19 | e = {((1,2),(3,4)):"a"}
+   - e[((1,2),(3,4))]
+20 | e[(1,2),(3,4)]
+21 + e[(1,2),(3,4)]
+22 | 
+23 | token_features[
+24 |     (window_position, feature_name)
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:24:5
@@ -146,16 +134,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 25 | ] = self._extract_raw_features_from_token
    |
 help: Remove parentheses
-
-ℹ Safe fix
-21 21 | e[(1,2),(3,4)]
-22 22 | 
-23 23 | token_features[
-24    |-    (window_position, feature_name)
-   24 |+    window_position, feature_name
-25 25 | ] = self._extract_raw_features_from_token
-26 26 | 
-27 27 | d[1,]
+21 | e[(1,2),(3,4)]
+22 | 
+23 | token_features[
+   -     (window_position, feature_name)
+24 +     window_position, feature_name
+25 | ] = self._extract_raw_features_from_token
+26 | 
+27 | d[1,]
 
 RUF031 [*] Avoid parentheses for tuples in subscripts
   --> RUF031.py:28:3
@@ -167,13 +153,11 @@ RUF031 [*] Avoid parentheses for tuples in subscripts
 30 | d[:,] # slices in the subscript lead to syntax error if parens are added
    |
 help: Remove parentheses
-
-ℹ Safe fix
-25 25 | ] = self._extract_raw_features_from_token
-26 26 | 
-27 27 | d[1,]
-28    |-d[(1,)]
-   28 |+d[1,]
-29 29 | d[()] # empty tuples should be ignored
-30 30 | d[:,] # slices in the subscript lead to syntax error if parens are added
-31 31 | d[1,2,:]
+25 | ] = self._extract_raw_features_from_token
+26 | 
+27 | d[1,]
+   - d[(1,)]
+28 + d[1,]
+29 | d[()] # empty tuples should be ignored
+30 | d[:,] # slices in the subscript lead to syntax error if parens are added
+31 | d[1,2,:]
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap
index b3933fe5ce..2c1fd76469 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap
@@ -19,10 +19,9 @@ F841 [*] Local variable `I` is assigned to but never used
    |     ^
    |
 help: Remove assignment to unused variable `I`
-
-ℹ Unsafe fix
-21 21 | def f():
-22 22 |     # Neither of these are ignored and warning is
-23 23 |     # logged to user
-24    |-    I = 1  # noqa: E741.F841
-   24 |+    pass  # noqa: E741.F841
+21 | def f():
+22 |     # Neither of these are ignored and warning is
+23 |     # logged to user
+   -     I = 1  # noqa: E741.F841
+24 +     pass  # noqa: E741.F841
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap
index b645294b6b..099f7c4c35 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap
@@ -13,18 +13,16 @@ RUF031 [*] Use parentheses for tuples in subscripts
 11 |   d[(2,4)]
    |
 help: Parenthesize tuple
-
-ℹ Safe fix
-5  5  |     2
-6  6  | )]
-7  7  | d[
-8     |-    1,
-9     |-    2
-   8  |+    (1,
-   9  |+    2)
-10 10 | ]
-11 11 | d[(2,4)]
-12 12 | d[(5,6,7)]
+5  |     2
+6  | )]
+7  | d[
+   -     1,
+   -     2
+8  +     (1,
+9  +     2)
+10 | ]
+11 | d[(2,4)]
+12 | d[(5,6,7)]
 
 RUF031 [*] Use parentheses for tuples in subscripts
   --> RUF031_prefer_parens.py:16:3
@@ -37,16 +35,14 @@ RUF031 [*] Use parentheses for tuples in subscripts
 18 | d[5,6,7]
    |
 help: Parenthesize tuple
-
-ℹ Safe fix
-13 13 | d[(8,)]
-14 14 | d[tuple(1,2)]
-15 15 | d[tuple(8)]
-16    |-d[1,2]
-   16 |+d[(1,2)]
-17 17 | d[3,4]
-18 18 | d[5,6,7]
-19 19 | e = {((1,2),(3,4)):"a"}
+13 | d[(8,)]
+14 | d[tuple(1,2)]
+15 | d[tuple(8)]
+   - d[1,2]
+16 + d[(1,2)]
+17 | d[3,4]
+18 | d[5,6,7]
+19 | e = {((1,2),(3,4)):"a"}
 
 RUF031 [*] Use parentheses for tuples in subscripts
   --> RUF031_prefer_parens.py:17:3
@@ -59,16 +55,14 @@ RUF031 [*] Use parentheses for tuples in subscripts
 19 | e = {((1,2),(3,4)):"a"}
    |
 help: Parenthesize tuple
-
-ℹ Safe fix
-14 14 | d[tuple(1,2)]
-15 15 | d[tuple(8)]
-16 16 | d[1,2]
-17    |-d[3,4]
-   17 |+d[(3,4)]
-18 18 | d[5,6,7]
-19 19 | e = {((1,2),(3,4)):"a"}
-20 20 | e[((1,2),(3,4))]
+14 | d[tuple(1,2)]
+15 | d[tuple(8)]
+16 | d[1,2]
+   - d[3,4]
+17 + d[(3,4)]
+18 | d[5,6,7]
+19 | e = {((1,2),(3,4)):"a"}
+20 | e[((1,2),(3,4))]
 
 RUF031 [*] Use parentheses for tuples in subscripts
   --> RUF031_prefer_parens.py:18:3
@@ -81,16 +75,14 @@ RUF031 [*] Use parentheses for tuples in subscripts
 20 | e[((1,2),(3,4))]
    |
 help: Parenthesize tuple
-
-ℹ Safe fix
-15 15 | d[tuple(8)]
-16 16 | d[1,2]
-17 17 | d[3,4]
-18    |-d[5,6,7]
-   18 |+d[(5,6,7)]
-19 19 | e = {((1,2),(3,4)):"a"}
-20 20 | e[((1,2),(3,4))]
-21 21 | e[(1,2),(3,4)]
+15 | d[tuple(8)]
+16 | d[1,2]
+17 | d[3,4]
+   - d[5,6,7]
+18 + d[(5,6,7)]
+19 | e = {((1,2),(3,4)):"a"}
+20 | e[((1,2),(3,4))]
+21 | e[(1,2),(3,4)]
 
 RUF031 [*] Use parentheses for tuples in subscripts
   --> RUF031_prefer_parens.py:21:3
@@ -103,16 +95,14 @@ RUF031 [*] Use parentheses for tuples in subscripts
 23 | token_features[
    |
 help: Parenthesize tuple
-
-ℹ Safe fix
-18 18 | d[5,6,7]
-19 19 | e = {((1,2),(3,4)):"a"}
-20 20 | e[((1,2),(3,4))]
-21    |-e[(1,2),(3,4)]
-   21 |+e[((1,2),(3,4))]
-22 22 | 
-23 23 | token_features[
-24 24 |     (window_position, feature_name)
+18 | d[5,6,7]
+19 | e = {((1,2),(3,4)):"a"}
+20 | e[((1,2),(3,4))]
+   - e[(1,2),(3,4)]
+21 + e[((1,2),(3,4))]
+22 | 
+23 | token_features[
+24 |     (window_position, feature_name)
 
 RUF031 [*] Use parentheses for tuples in subscripts
   --> RUF031_prefer_parens.py:26:3
@@ -125,14 +115,12 @@ RUF031 [*] Use parentheses for tuples in subscripts
 28 | d[()] # empty tuples should be ignored
    |
 help: Parenthesize tuple
-
-ℹ Safe fix
-23 23 | token_features[
-24 24 |     (window_position, feature_name)
-25 25 | ] = self._extract_raw_features_from_token
-26    |-d[1,]
-27 26 | d[(1,)]
-   27 |+d[(1,)]
-28 28 | d[()] # empty tuples should be ignored
-29 29 | 
-30 30 | d[:,] # slices in the subscript lead to syntax error if parens are added
+23 | token_features[
+24 |     (window_position, feature_name)
+25 | ] = self._extract_raw_features_from_token
+   - d[1,]
+26 | d[(1,)]
+27 + d[(1,)]
+28 | d[()] # empty tuples should be ignored
+29 | 
+30 | d[:,] # slices in the subscript lead to syntax error if parens are added
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap
index 1717131599..b7ad058fab 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap
@@ -11,16 +11,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 7 | re.finditer("dou\ble")
   |
 help: Replace with raw string
-
-ℹ Safe fix
-2 2 | import regex
-3 3 | 
-4 4 | # Errors
-5   |-re.compile('single free-spacing', flags=re.X)
-  5 |+re.compile(r'single free-spacing', flags=re.X)
-6 6 | re.findall('si\ngle')
-7 7 | re.finditer("dou\ble")
-8 8 | re.fullmatch('''t\riple single''')
+2 | import regex
+3 | 
+4 | # Errors
+  - re.compile('single free-spacing', flags=re.X)
+5 + re.compile(r'single free-spacing', flags=re.X)
+6 | re.findall('si\ngle')
+7 | re.finditer("dou\ble")
+8 | re.fullmatch('''t\riple single''')
 
 RUF039 [*] First argument to `re.findall()` is not raw string
  --> RUF039.py:6:12
@@ -33,16 +31,15 @@ RUF039 [*] First argument to `re.findall()` is not raw string
 8 | re.fullmatch('''t\riple single''')
   |
 help: Replace with raw string
-
-ℹ Unsafe fix
-3 3 | 
-4 4 | # Errors
-5 5 | re.compile('single free-spacing', flags=re.X)
-6   |-re.findall('si\ngle')
-  6 |+re.findall(r'si\ngle')
-7 7 | re.finditer("dou\ble")
-8 8 | re.fullmatch('''t\riple single''')
-9 9 | re.match("""\triple double""")
+3 | 
+4 | # Errors
+5 | re.compile('single free-spacing', flags=re.X)
+  - re.findall('si\ngle')
+6 + re.findall(r'si\ngle')
+7 | re.finditer("dou\ble")
+8 | re.fullmatch('''t\riple single''')
+9 | re.match("""\triple double""")
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 First argument to `re.finditer()` is not raw string
  --> RUF039.py:7:13
@@ -67,16 +64,15 @@ RUF039 [*] First argument to `re.fullmatch()` is not raw string
 10 | re.search('two', 'args')
    |
 help: Replace with raw string
-
-ℹ Unsafe fix
-5 5 | re.compile('single free-spacing', flags=re.X)
-6 6 | re.findall('si\ngle')
-7 7 | re.finditer("dou\ble")
-8   |-re.fullmatch('''t\riple single''')
-  8 |+re.fullmatch(r'''t\riple single''')
-9 9 | re.match("""\triple double""")
-10 10 | re.search('two', 'args')
-11 11 | re.split("raw", r'second')
+5  | re.compile('single free-spacing', flags=re.X)
+6  | re.findall('si\ngle')
+7  | re.finditer("dou\ble")
+   - re.fullmatch('''t\riple single''')
+8  + re.fullmatch(r'''t\riple single''')
+9  | re.match("""\triple double""")
+10 | re.search('two', 'args')
+11 | re.split("raw", r'second')
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.match()` is not raw string
   --> RUF039.py:9:10
@@ -89,16 +85,15 @@ RUF039 [*] First argument to `re.match()` is not raw string
 11 | re.split("raw", r'second')
    |
 help: Replace with raw string
-
-ℹ Unsafe fix
-6  6  | re.findall('si\ngle')
-7  7  | re.finditer("dou\ble")
-8  8  | re.fullmatch('''t\riple single''')
-9     |-re.match("""\triple double""")
-   9  |+re.match(r"""\triple double""")
-10 10 | re.search('two', 'args')
-11 11 | re.split("raw", r'second')
-12 12 | re.sub(u'''nicode''', u"f(?i)rst")
+6  | re.findall('si\ngle')
+7  | re.finditer("dou\ble")
+8  | re.fullmatch('''t\riple single''')
+   - re.match("""\triple double""")
+9  + re.match(r"""\triple double""")
+10 | re.search('two', 'args')
+11 | re.split("raw", r'second')
+12 | re.sub(u'''nicode''', u"f(?i)rst")
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.search()` is not raw string
   --> RUF039.py:10:11
@@ -111,16 +106,14 @@ RUF039 [*] First argument to `re.search()` is not raw string
 12 | re.sub(u'''nicode''', u"f(?i)rst")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-7  7  | re.finditer("dou\ble")
-8  8  | re.fullmatch('''t\riple single''')
-9  9  | re.match("""\triple double""")
-10    |-re.search('two', 'args')
-   10 |+re.search(r'two', 'args')
-11 11 | re.split("raw", r'second')
-12 12 | re.sub(u'''nicode''', u"f(?i)rst")
-13 13 | re.subn(b"""ytes are""", f"\u006e")
+7  | re.finditer("dou\ble")
+8  | re.fullmatch('''t\riple single''')
+9  | re.match("""\triple double""")
+   - re.search('two', 'args')
+10 + re.search(r'two', 'args')
+11 | re.split("raw", r'second')
+12 | re.sub(u'''nicode''', u"f(?i)rst")
+13 | re.subn(b"""ytes are""", f"\u006e")
 
 RUF039 [*] First argument to `re.split()` is not raw string
   --> RUF039.py:11:10
@@ -133,16 +126,14 @@ RUF039 [*] First argument to `re.split()` is not raw string
 13 | re.subn(b"""ytes are""", f"\u006e")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-8  8  | re.fullmatch('''t\riple single''')
-9  9  | re.match("""\triple double""")
-10 10 | re.search('two', 'args')
-11    |-re.split("raw", r'second')
-   11 |+re.split(r"raw", r'second')
-12 12 | re.sub(u'''nicode''', u"f(?i)rst")
-13 13 | re.subn(b"""ytes are""", f"\u006e")
-14 14 | 
+8  | re.fullmatch('''t\riple single''')
+9  | re.match("""\triple double""")
+10 | re.search('two', 'args')
+   - re.split("raw", r'second')
+11 + re.split(r"raw", r'second')
+12 | re.sub(u'''nicode''', u"f(?i)rst")
+13 | re.subn(b"""ytes are""", f"\u006e")
+14 | 
 
 RUF039 First argument to `re.sub()` is not raw string
   --> RUF039.py:12:8
@@ -166,16 +157,14 @@ RUF039 [*] First argument to `re.subn()` is not raw bytes literal
 15 | regex.compile('single free-spacing', flags=regex.X)
    |
 help: Replace with raw bytes literal
-
-ℹ Safe fix
-10 10 | re.search('two', 'args')
-11 11 | re.split("raw", r'second')
-12 12 | re.sub(u'''nicode''', u"f(?i)rst")
-13    |-re.subn(b"""ytes are""", f"\u006e")
-   13 |+re.subn(rb"""ytes are""", f"\u006e")
-14 14 | 
-15 15 | regex.compile('single free-spacing', flags=regex.X)
-16 16 | regex.findall('si\ngle')
+10 | re.search('two', 'args')
+11 | re.split("raw", r'second')
+12 | re.sub(u'''nicode''', u"f(?i)rst")
+   - re.subn(b"""ytes are""", f"\u006e")
+13 + re.subn(rb"""ytes are""", f"\u006e")
+14 | 
+15 | regex.compile('single free-spacing', flags=regex.X)
+16 | regex.findall('si\ngle')
 
 RUF039 [*] First argument to `regex.compile()` is not raw string
   --> RUF039.py:15:15
@@ -188,16 +177,14 @@ RUF039 [*] First argument to `regex.compile()` is not raw string
 17 | regex.finditer("dou\ble")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-12 12 | re.sub(u'''nicode''', u"f(?i)rst")
-13 13 | re.subn(b"""ytes are""", f"\u006e")
-14 14 | 
-15    |-regex.compile('single free-spacing', flags=regex.X)
-   15 |+regex.compile(r'single free-spacing', flags=regex.X)
-16 16 | regex.findall('si\ngle')
-17 17 | regex.finditer("dou\ble")
-18 18 | regex.fullmatch('''t\riple single''')
+12 | re.sub(u'''nicode''', u"f(?i)rst")
+13 | re.subn(b"""ytes are""", f"\u006e")
+14 | 
+   - regex.compile('single free-spacing', flags=regex.X)
+15 + regex.compile(r'single free-spacing', flags=regex.X)
+16 | regex.findall('si\ngle')
+17 | regex.finditer("dou\ble")
+18 | regex.fullmatch('''t\riple single''')
 
 RUF039 [*] First argument to `regex.findall()` is not raw string
   --> RUF039.py:16:15
@@ -209,16 +196,15 @@ RUF039 [*] First argument to `regex.findall()` is not raw string
 18 | regex.fullmatch('''t\riple single''')
    |
 help: Replace with raw string
-
-ℹ Unsafe fix
-13 13 | re.subn(b"""ytes are""", f"\u006e")
-14 14 | 
-15 15 | regex.compile('single free-spacing', flags=regex.X)
-16    |-regex.findall('si\ngle')
-   16 |+regex.findall(r'si\ngle')
-17 17 | regex.finditer("dou\ble")
-18 18 | regex.fullmatch('''t\riple single''')
-19 19 | regex.match("""\triple double""")
+13 | re.subn(b"""ytes are""", f"\u006e")
+14 | 
+15 | regex.compile('single free-spacing', flags=regex.X)
+   - regex.findall('si\ngle')
+16 + regex.findall(r'si\ngle')
+17 | regex.finditer("dou\ble")
+18 | regex.fullmatch('''t\riple single''')
+19 | regex.match("""\triple double""")
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 First argument to `regex.finditer()` is not raw string
   --> RUF039.py:17:16
@@ -243,16 +229,15 @@ RUF039 [*] First argument to `regex.fullmatch()` is not raw string
 20 | regex.search('two', 'args')
    |
 help: Replace with raw string
-
-ℹ Unsafe fix
-15 15 | regex.compile('single free-spacing', flags=regex.X)
-16 16 | regex.findall('si\ngle')
-17 17 | regex.finditer("dou\ble")
-18    |-regex.fullmatch('''t\riple single''')
-   18 |+regex.fullmatch(r'''t\riple single''')
-19 19 | regex.match("""\triple double""")
-20 20 | regex.search('two', 'args')
-21 21 | regex.split("raw", r'second')
+15 | regex.compile('single free-spacing', flags=regex.X)
+16 | regex.findall('si\ngle')
+17 | regex.finditer("dou\ble")
+   - regex.fullmatch('''t\riple single''')
+18 + regex.fullmatch(r'''t\riple single''')
+19 | regex.match("""\triple double""")
+20 | regex.search('two', 'args')
+21 | regex.split("raw", r'second')
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `regex.match()` is not raw string
   --> RUF039.py:19:13
@@ -265,16 +250,15 @@ RUF039 [*] First argument to `regex.match()` is not raw string
 21 | regex.split("raw", r'second')
    |
 help: Replace with raw string
-
-ℹ Unsafe fix
-16 16 | regex.findall('si\ngle')
-17 17 | regex.finditer("dou\ble")
-18 18 | regex.fullmatch('''t\riple single''')
-19    |-regex.match("""\triple double""")
-   19 |+regex.match(r"""\triple double""")
-20 20 | regex.search('two', 'args')
-21 21 | regex.split("raw", r'second')
-22 22 | regex.sub(u'''nicode''', u"f(?i)rst")
+16 | regex.findall('si\ngle')
+17 | regex.finditer("dou\ble")
+18 | regex.fullmatch('''t\riple single''')
+   - regex.match("""\triple double""")
+19 + regex.match(r"""\triple double""")
+20 | regex.search('two', 'args')
+21 | regex.split("raw", r'second')
+22 | regex.sub(u'''nicode''', u"f(?i)rst")
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `regex.search()` is not raw string
   --> RUF039.py:20:14
@@ -287,16 +271,14 @@ RUF039 [*] First argument to `regex.search()` is not raw string
 22 | regex.sub(u'''nicode''', u"f(?i)rst")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-17 17 | regex.finditer("dou\ble")
-18 18 | regex.fullmatch('''t\riple single''')
-19 19 | regex.match("""\triple double""")
-20    |-regex.search('two', 'args')
-   20 |+regex.search(r'two', 'args')
-21 21 | regex.split("raw", r'second')
-22 22 | regex.sub(u'''nicode''', u"f(?i)rst")
-23 23 | regex.subn(b"""ytes are""", f"\u006e")
+17 | regex.finditer("dou\ble")
+18 | regex.fullmatch('''t\riple single''')
+19 | regex.match("""\triple double""")
+   - regex.search('two', 'args')
+20 + regex.search(r'two', 'args')
+21 | regex.split("raw", r'second')
+22 | regex.sub(u'''nicode''', u"f(?i)rst")
+23 | regex.subn(b"""ytes are""", f"\u006e")
 
 RUF039 [*] First argument to `regex.split()` is not raw string
   --> RUF039.py:21:13
@@ -309,16 +291,14 @@ RUF039 [*] First argument to `regex.split()` is not raw string
 23 | regex.subn(b"""ytes are""", f"\u006e")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-18 18 | regex.fullmatch('''t\riple single''')
-19 19 | regex.match("""\triple double""")
-20 20 | regex.search('two', 'args')
-21    |-regex.split("raw", r'second')
-   21 |+regex.split(r"raw", r'second')
-22 22 | regex.sub(u'''nicode''', u"f(?i)rst")
-23 23 | regex.subn(b"""ytes are""", f"\u006e")
-24 24 | 
+18 | regex.fullmatch('''t\riple single''')
+19 | regex.match("""\triple double""")
+20 | regex.search('two', 'args')
+   - regex.split("raw", r'second')
+21 + regex.split(r"raw", r'second')
+22 | regex.sub(u'''nicode''', u"f(?i)rst")
+23 | regex.subn(b"""ytes are""", f"\u006e")
+24 | 
 
 RUF039 First argument to `regex.sub()` is not raw string
   --> RUF039.py:22:11
@@ -342,16 +322,14 @@ RUF039 [*] First argument to `regex.subn()` is not raw bytes literal
 25 | regex.template("""(?m)
    |
 help: Replace with raw bytes literal
-
-ℹ Safe fix
-20 20 | regex.search('two', 'args')
-21 21 | regex.split("raw", r'second')
-22 22 | regex.sub(u'''nicode''', u"f(?i)rst")
-23    |-regex.subn(b"""ytes are""", f"\u006e")
-   23 |+regex.subn(rb"""ytes are""", f"\u006e")
-24 24 | 
-25 25 | regex.template("""(?m)
-26 26 |     (?:ulti)?
+20 | regex.search('two', 'args')
+21 | regex.split("raw", r'second')
+22 | regex.sub(u'''nicode''', u"f(?i)rst")
+   - regex.subn(b"""ytes are""", f"\u006e")
+23 + regex.subn(rb"""ytes are""", f"\u006e")
+24 | 
+25 | regex.template("""(?m)
+26 |     (?:ulti)?
 
 RUF039 [*] First argument to `regex.template()` is not raw string
   --> RUF039.py:25:16
@@ -367,16 +345,14 @@ RUF039 [*] First argument to `regex.template()` is not raw string
    | |___^
    |
 help: Replace with raw string
-
-ℹ Safe fix
-22 22 | regex.sub(u'''nicode''', u"f(?i)rst")
-23 23 | regex.subn(b"""ytes are""", f"\u006e")
-24 24 | 
-25    |-regex.template("""(?m)
-   25 |+regex.template(r"""(?m)
-26 26 |     (?:ulti)?
-27 27 |     (?=(?<!(?<=(?!l)))
-28 28 |     l(?i:ne)
+22 | regex.sub(u'''nicode''', u"f(?i)rst")
+23 | regex.subn(b"""ytes are""", f"\u006e")
+24 | 
+   - regex.template("""(?m)
+25 + regex.template(r"""(?m)
+26 |     (?:ulti)?
+27 |     (?=(?<!(?<=(?!l)))
+28 |     l(?i:ne)
 
 RUF039 [*] First argument to `re.compile()` is not raw string
   --> RUF039.py:59:12
@@ -388,16 +364,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 61 | re.compile("\"")  # without fix
    |
 help: Replace with raw string
-
-ℹ Unsafe fix
-56 56 | 
-57 57 | 
-58 58 | # https://github.com/astral-sh/ruff/issues/16713
-59    |-re.compile("\a\f\n\r\t\u27F2\U0001F0A1\v\x41")  # with unsafe fix
-   59 |+re.compile(r"\a\f\n\r\t\u27F2\U0001F0A1\v\x41")  # with unsafe fix
-60 60 | re.compile("\b")  # without fix
-61 61 | re.compile("\"")  # without fix
-62 62 | re.compile("\'")  # without fix
+56 | 
+57 | 
+58 | # https://github.com/astral-sh/ruff/issues/16713
+   - re.compile("\a\f\n\r\t\u27F2\U0001F0A1\v\x41")  # with unsafe fix
+59 + re.compile(r"\a\f\n\r\t\u27F2\U0001F0A1\v\x41")  # with unsafe fix
+60 | re.compile("\b")  # without fix
+61 | re.compile("\"")  # without fix
+62 | re.compile("\'")  # without fix
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 First argument to `re.compile()` is not raw string
   --> RUF039.py:60:12
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap
index 1ee8cf2707..a354539722 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap
@@ -11,16 +11,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 7 | )
   |
 help: Replace with raw string
-
-ℹ Safe fix
-2 2 | 
-3 3 | 
-4 4 | re.compile(
-5   |-    'implicit'
-  5 |+    r'implicit'
-6 6 |     'concatenation'
-7 7 | )
-8 8 | re.findall(
+2 | 
+3 | 
+4 | re.compile(
+  -     'implicit'
+5 +     r'implicit'
+6 |     'concatenation'
+7 | )
+8 | re.findall(
 
 RUF039 [*] First argument to `re.compile()` is not raw string
  --> RUF039_concat.py:6:5
@@ -33,16 +31,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 8 | re.findall(
   |
 help: Replace with raw string
-
-ℹ Safe fix
-3 3 | 
-4 4 | re.compile(
-5 5 |     'implicit'
-6   |-    'concatenation'
-  6 |+    r'concatenation'
-7 7 | )
-8 8 | re.findall(
-9 9 |     r'''
+3 | 
+4 | re.compile(
+5 |     'implicit'
+  -     'concatenation'
+6 +     r'concatenation'
+7 | )
+8 | re.findall(
+9 |     r'''
 
 RUF039 [*] First argument to `re.findall()` is not raw string
   --> RUF039_concat.py:12:5
@@ -57,16 +53,14 @@ RUF039 [*] First argument to `re.findall()` is not raw string
 16 |   re.finditer(
    |
 help: Replace with raw string
-
-ℹ Safe fix
-9  9  |     r'''
-10 10 |     multiline
-11 11 |     '''
-12    |-    """
-   12 |+    r"""
-13 13 |     concatenation
-14 14 |     """
-15 15 | )
+9  |     r'''
+10 |     multiline
+11 |     '''
+   -     """
+12 +     r"""
+13 |     concatenation
+14 |     """
+15 | )
 
 RUF039 [*] First argument to `re.match()` is not raw bytes literal
   --> RUF039_concat.py:26:5
@@ -79,16 +73,14 @@ RUF039 [*] First argument to `re.match()` is not raw bytes literal
 28 | )
    |
 help: Replace with raw bytes literal
-
-ℹ Safe fix
-23 23 |     f'much?'
-24 24 | )
-25 25 | re.match(
-26    |-    b'reak'
-   26 |+    rb'reak'
-27 27 |     br'eak'
-28 28 | )
-29 29 | re.search(
+23 |     f'much?'
+24 | )
+25 | re.match(
+   -     b'reak'
+26 +     rb'reak'
+27 |     br'eak'
+28 | )
+29 | re.search(
 
 RUF039 First argument to `re.search()` is not raw string
   --> RUF039_concat.py:30:8
@@ -113,16 +105,14 @@ RUF039 [*] First argument to `re.search()` is not raw string
 33 | re.split(''U"""w"""U'')
    |
 help: Replace with raw string
-
-ℹ Safe fix
-28 28 | )
-29 29 | re.search(
-30 30 |     r''u''
-31    |-    '''okay?'''
-   31 |+    r'''okay?'''
-32 32 | )
-33 33 | re.split(''U"""w"""U'')
-34 34 | re.sub(
+28 | )
+29 | re.search(
+30 |     r''u''
+   -     '''okay?'''
+31 +     r'''okay?'''
+32 | )
+33 | re.split(''U"""w"""U'')
+34 | re.sub(
 
 RUF039 [*] First argument to `re.split()` is not raw string
   --> RUF039_concat.py:33:10
@@ -135,16 +125,14 @@ RUF039 [*] First argument to `re.split()` is not raw string
 35 |     "I''m o"
    |
 help: Replace with raw string
-
-ℹ Safe fix
-30 30 |     r''u''
-31 31 |     '''okay?'''
-32 32 | )
-33    |-re.split(''U"""w"""U'')
-   33 |+re.split(r''U"""w"""U'')
-34 34 | re.sub(
-35 35 |     "I''m o"
-36 36 |     'utta ideas'
+30 |     r''u''
+31 |     '''okay?'''
+32 | )
+   - re.split(''U"""w"""U'')
+33 + re.split(r''U"""w"""U'')
+34 | re.sub(
+35 |     "I''m o"
+36 |     'utta ideas'
 
 RUF039 First argument to `re.split()` is not raw string
   --> RUF039_concat.py:33:12
@@ -181,16 +169,14 @@ RUF039 [*] First argument to `re.sub()` is not raw string
 37 | )
    |
 help: Replace with raw string
-
-ℹ Safe fix
-32 32 | )
-33 33 | re.split(''U"""w"""U'')
-34 34 | re.sub(
-35    |-    "I''m o"
-   35 |+    r"I''m o"
-36 36 |     'utta ideas'
-37 37 | )
-38 38 | re.subn("()"r' am I'"??")
+32 | )
+33 | re.split(''U"""w"""U'')
+34 | re.sub(
+   -     "I''m o"
+35 +     r"I''m o"
+36 |     'utta ideas'
+37 | )
+38 | re.subn("()"r' am I'"??")
 
 RUF039 [*] First argument to `re.sub()` is not raw string
   --> RUF039_concat.py:36:5
@@ -203,16 +189,14 @@ RUF039 [*] First argument to `re.sub()` is not raw string
 38 | re.subn("()"r' am I'"??")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-33 33 | re.split(''U"""w"""U'')
-34 34 | re.sub(
-35 35 |     "I''m o"
-36    |-    'utta ideas'
-   36 |+    r'utta ideas'
-37 37 | )
-38 38 | re.subn("()"r' am I'"??")
-39 39 | 
+33 | re.split(''U"""w"""U'')
+34 | re.sub(
+35 |     "I''m o"
+   -     'utta ideas'
+36 +     r'utta ideas'
+37 | )
+38 | re.subn("()"r' am I'"??")
+39 | 
 
 RUF039 [*] First argument to `re.subn()` is not raw string
   --> RUF039_concat.py:38:9
@@ -223,16 +207,14 @@ RUF039 [*] First argument to `re.subn()` is not raw string
    |         ^^^^
    |
 help: Replace with raw string
-
-ℹ Safe fix
-35 35 |     "I''m o"
-36 36 |     'utta ideas'
-37 37 | )
-38    |-re.subn("()"r' am I'"??")
-   38 |+re.subn(r"()"r' am I'"??")
-39 39 | 
-40 40 | 
-41 41 | import regex
+35 |     "I''m o"
+36 |     'utta ideas'
+37 | )
+   - re.subn("()"r' am I'"??")
+38 + re.subn(r"()"r' am I'"??")
+39 | 
+40 | 
+41 | import regex
 
 RUF039 [*] First argument to `re.subn()` is not raw string
   --> RUF039_concat.py:38:21
@@ -243,16 +225,14 @@ RUF039 [*] First argument to `re.subn()` is not raw string
    |                     ^^^^
    |
 help: Replace with raw string
-
-ℹ Safe fix
-35 35 |     "I''m o"
-36 36 |     'utta ideas'
-37 37 | )
-38    |-re.subn("()"r' am I'"??")
-   38 |+re.subn("()"r' am I'r"??")
-39 39 | 
-40 40 | 
-41 41 | import regex
+35 |     "I''m o"
+36 |     'utta ideas'
+37 | )
+   - re.subn("()"r' am I'"??")
+38 + re.subn("()"r' am I'r"??")
+39 | 
+40 | 
+41 | import regex
 
 RUF039 [*] First argument to `regex.compile()` is not raw string
   --> RUF039_concat.py:45:5
@@ -264,16 +244,14 @@ RUF039 [*] First argument to `regex.compile()` is not raw string
 47 | )
    |
 help: Replace with raw string
-
-ℹ Safe fix
-42 42 | 
-43 43 | 
-44 44 | regex.compile(
-45    |-    'implicit'
-   45 |+    r'implicit'
-46 46 |     'concatenation'
-47 47 | )
-48 48 | regex.findall(
+42 | 
+43 | 
+44 | regex.compile(
+   -     'implicit'
+45 +     r'implicit'
+46 |     'concatenation'
+47 | )
+48 | regex.findall(
 
 RUF039 [*] First argument to `regex.compile()` is not raw string
   --> RUF039_concat.py:46:5
@@ -286,16 +264,14 @@ RUF039 [*] First argument to `regex.compile()` is not raw string
 48 | regex.findall(
    |
 help: Replace with raw string
-
-ℹ Safe fix
-43 43 | 
-44 44 | regex.compile(
-45 45 |     'implicit'
-46    |-    'concatenation'
-   46 |+    r'concatenation'
-47 47 | )
-48 48 | regex.findall(
-49 49 |     r'''
+43 | 
+44 | regex.compile(
+45 |     'implicit'
+   -     'concatenation'
+46 +     r'concatenation'
+47 | )
+48 | regex.findall(
+49 |     r'''
 
 RUF039 [*] First argument to `regex.findall()` is not raw string
   --> RUF039_concat.py:52:5
@@ -310,16 +286,14 @@ RUF039 [*] First argument to `regex.findall()` is not raw string
 56 |   regex.finditer(
    |
 help: Replace with raw string
-
-ℹ Safe fix
-49 49 |     r'''
-50 50 |     multiline
-51 51 |     '''
-52    |-    """
-   52 |+    r"""
-53 53 |     concatenation
-54 54 |     """
-55 55 | )
+49 |     r'''
+50 |     multiline
+51 |     '''
+   -     """
+52 +     r"""
+53 |     concatenation
+54 |     """
+55 | )
 
 RUF039 [*] First argument to `regex.match()` is not raw bytes literal
   --> RUF039_concat.py:66:5
@@ -332,16 +306,14 @@ RUF039 [*] First argument to `regex.match()` is not raw bytes literal
 68 | )
    |
 help: Replace with raw bytes literal
-
-ℹ Safe fix
-63 63 |     f'much?'
-64 64 | )
-65 65 | regex.match(
-66    |-    b'reak'
-   66 |+    rb'reak'
-67 67 |     br'eak'
-68 68 | )
-69 69 | regex.search(
+63 |     f'much?'
+64 | )
+65 | regex.match(
+   -     b'reak'
+66 +     rb'reak'
+67 |     br'eak'
+68 | )
+69 | regex.search(
 
 RUF039 First argument to `regex.search()` is not raw string
   --> RUF039_concat.py:70:8
@@ -366,16 +338,14 @@ RUF039 [*] First argument to `regex.search()` is not raw string
 73 | regex.split(''U"""w"""U'')
    |
 help: Replace with raw string
-
-ℹ Safe fix
-68 68 | )
-69 69 | regex.search(
-70 70 |     r''u''
-71    |-    '''okay?'''
-   71 |+    r'''okay?'''
-72 72 | )
-73 73 | regex.split(''U"""w"""U'')
-74 74 | regex.sub(
+68 | )
+69 | regex.search(
+70 |     r''u''
+   -     '''okay?'''
+71 +     r'''okay?'''
+72 | )
+73 | regex.split(''U"""w"""U'')
+74 | regex.sub(
 
 RUF039 [*] First argument to `regex.split()` is not raw string
   --> RUF039_concat.py:73:13
@@ -388,16 +358,14 @@ RUF039 [*] First argument to `regex.split()` is not raw string
 75 |     "I''m o"
    |
 help: Replace with raw string
-
-ℹ Safe fix
-70 70 |     r''u''
-71 71 |     '''okay?'''
-72 72 | )
-73    |-regex.split(''U"""w"""U'')
-   73 |+regex.split(r''U"""w"""U'')
-74 74 | regex.sub(
-75 75 |     "I''m o"
-76 76 |     'utta ideas'
+70 |     r''u''
+71 |     '''okay?'''
+72 | )
+   - regex.split(''U"""w"""U'')
+73 + regex.split(r''U"""w"""U'')
+74 | regex.sub(
+75 |     "I''m o"
+76 |     'utta ideas'
 
 RUF039 First argument to `regex.split()` is not raw string
   --> RUF039_concat.py:73:15
@@ -434,16 +402,14 @@ RUF039 [*] First argument to `regex.sub()` is not raw string
 77 | )
    |
 help: Replace with raw string
-
-ℹ Safe fix
-72 72 | )
-73 73 | regex.split(''U"""w"""U'')
-74 74 | regex.sub(
-75    |-    "I''m o"
-   75 |+    r"I''m o"
-76 76 |     'utta ideas'
-77 77 | )
-78 78 | regex.subn("()"r' am I'"??")
+72 | )
+73 | regex.split(''U"""w"""U'')
+74 | regex.sub(
+   -     "I''m o"
+75 +     r"I''m o"
+76 |     'utta ideas'
+77 | )
+78 | regex.subn("()"r' am I'"??")
 
 RUF039 [*] First argument to `regex.sub()` is not raw string
   --> RUF039_concat.py:76:5
@@ -456,16 +422,14 @@ RUF039 [*] First argument to `regex.sub()` is not raw string
 78 | regex.subn("()"r' am I'"??")
    |
 help: Replace with raw string
-
-ℹ Safe fix
-73 73 | regex.split(''U"""w"""U'')
-74 74 | regex.sub(
-75 75 |     "I''m o"
-76    |-    'utta ideas'
-   76 |+    r'utta ideas'
-77 77 | )
-78 78 | regex.subn("()"r' am I'"??")
-79 79 | 
+73 | regex.split(''U"""w"""U'')
+74 | regex.sub(
+75 |     "I''m o"
+   -     'utta ideas'
+76 +     r'utta ideas'
+77 | )
+78 | regex.subn("()"r' am I'"??")
+79 | 
 
 RUF039 [*] First argument to `regex.subn()` is not raw string
   --> RUF039_concat.py:78:12
@@ -476,16 +440,14 @@ RUF039 [*] First argument to `regex.subn()` is not raw string
    |            ^^^^
    |
 help: Replace with raw string
-
-ℹ Safe fix
-75 75 |     "I''m o"
-76 76 |     'utta ideas'
-77 77 | )
-78    |-regex.subn("()"r' am I'"??")
-   78 |+regex.subn(r"()"r' am I'"??")
-79 79 | 
-80 80 | 
-81 81 | regex.template(
+75 |     "I''m o"
+76 |     'utta ideas'
+77 | )
+   - regex.subn("()"r' am I'"??")
+78 + regex.subn(r"()"r' am I'"??")
+79 | 
+80 | 
+81 | regex.template(
 
 RUF039 [*] First argument to `regex.subn()` is not raw string
   --> RUF039_concat.py:78:24
@@ -496,16 +458,14 @@ RUF039 [*] First argument to `regex.subn()` is not raw string
    |                        ^^^^
    |
 help: Replace with raw string
-
-ℹ Safe fix
-75 75 |     "I''m o"
-76 76 |     'utta ideas'
-77 77 | )
-78    |-regex.subn("()"r' am I'"??")
-   78 |+regex.subn("()"r' am I'r"??")
-79 79 | 
-80 80 | 
-81 81 | regex.template(
+75 |     "I''m o"
+76 |     'utta ideas'
+77 | )
+   - regex.subn("()"r' am I'"??")
+78 + regex.subn("()"r' am I'r"??")
+79 | 
+80 | 
+81 | regex.template(
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:98:5
@@ -518,16 +478,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
     |
 help: Replace with raw string
-
-ℹ Safe fix
-95 95 | 
-96 96 | # https://github.com/astral-sh/ruff/issues/16713
-97 97 | re.compile(
-98    |-    "["
-   98 |+    r"["
-99 99 |     "\U0001F600-\U0001F64F"  # emoticons
-100 100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
-101 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
+95  | 
+96  | # https://github.com/astral-sh/ruff/issues/16713
+97  | re.compile(
+    -     "["
+98  +     r"["
+99  |     "\U0001F600-\U0001F64F"  # emoticons
+100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
+101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:99:5
@@ -540,16 +498,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-96  96  | # https://github.com/astral-sh/ruff/issues/16713
-97  97  | re.compile(
-98  98  |     "["
-99      |-    "\U0001F600-\U0001F64F"  # emoticons
-    99  |+    r"\U0001F600-\U0001F64F"  # emoticons
-100 100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
-101 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
-102 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+96  | # https://github.com/astral-sh/ruff/issues/16713
+97  | re.compile(
+98  |     "["
+    -     "\U0001F600-\U0001F64F"  # emoticons
+99  +     r"\U0001F600-\U0001F64F"  # emoticons
+100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
+101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
+102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:100:5
@@ -562,16 +519,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-97  97  | re.compile(
-98  98  |     "["
-99  99  |     "\U0001F600-\U0001F64F"  # emoticons
-100     |-    "\U0001F300-\U0001F5FF"  # symbols & pictographs
-    100 |+    r"\U0001F300-\U0001F5FF"  # symbols & pictographs
-101 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
-102 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
-103 103 |     "\U00002702-\U000027B0"
+97  | re.compile(
+98  |     "["
+99  |     "\U0001F600-\U0001F64F"  # emoticons
+    -     "\U0001F300-\U0001F5FF"  # symbols & pictographs
+100 +     r"\U0001F300-\U0001F5FF"  # symbols & pictographs
+101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
+102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+103 |     "\U00002702-\U000027B0"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:101:5
@@ -584,16 +540,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 103 |     "\U00002702-\U000027B0"
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-98  98  |     "["
-99  99  |     "\U0001F600-\U0001F64F"  # emoticons
-100 100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
-101     |-    "\U0001F680-\U0001F6FF"  # transport & map symbols
-    101 |+    r"\U0001F680-\U0001F6FF"  # transport & map symbols
-102 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
-103 103 |     "\U00002702-\U000027B0"
-104 104 |     "\U000024C2-\U0001F251"
+98  |     "["
+99  |     "\U0001F600-\U0001F64F"  # emoticons
+100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
+    -     "\U0001F680-\U0001F6FF"  # transport & map symbols
+101 +     r"\U0001F680-\U0001F6FF"  # transport & map symbols
+102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+103 |     "\U00002702-\U000027B0"
+104 |     "\U000024C2-\U0001F251"
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:102:5
@@ -606,16 +561,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 104 |     "\U000024C2-\U0001F251"
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-99  99  |     "\U0001F600-\U0001F64F"  # emoticons
-100 100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
-101 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
-102     |-    "\U0001F1E0-\U0001F1FF"  # flags (iOS)
-    102 |+    r"\U0001F1E0-\U0001F1FF"  # flags (iOS)
-103 103 |     "\U00002702-\U000027B0"
-104 104 |     "\U000024C2-\U0001F251"
-105 105 |     "\u200d"  # zero width joiner
+99  |     "\U0001F600-\U0001F64F"  # emoticons
+100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
+101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
+    -     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+102 +     r"\U0001F1E0-\U0001F1FF"  # flags (iOS)
+103 |     "\U00002702-\U000027B0"
+104 |     "\U000024C2-\U0001F251"
+105 |     "\u200d"  # zero width joiner
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:103:5
@@ -628,16 +582,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 105 |     "\u200d"  # zero width joiner
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-100 100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
-101 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
-102 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
-103     |-    "\U00002702-\U000027B0"
-    103 |+    r"\U00002702-\U000027B0"
-104 104 |     "\U000024C2-\U0001F251"
-105 105 |     "\u200d"  # zero width joiner
-106 106 |     "\u200c"  # zero width non-joiner
+100 |     "\U0001F300-\U0001F5FF"  # symbols & pictographs
+101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
+102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+    -     "\U00002702-\U000027B0"
+103 +     r"\U00002702-\U000027B0"
+104 |     "\U000024C2-\U0001F251"
+105 |     "\u200d"  # zero width joiner
+106 |     "\u200c"  # zero width non-joiner
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:104:5
@@ -650,16 +603,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 106 |     "\u200c"  # zero width non-joiner
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-101 101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
-102 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
-103 103 |     "\U00002702-\U000027B0"
-104     |-    "\U000024C2-\U0001F251"
-    104 |+    r"\U000024C2-\U0001F251"
-105 105 |     "\u200d"  # zero width joiner
-106 106 |     "\u200c"  # zero width non-joiner
-107 107 |     "\\u200c" # must not be escaped in a raw string
+101 |     "\U0001F680-\U0001F6FF"  # transport & map symbols
+102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+103 |     "\U00002702-\U000027B0"
+    -     "\U000024C2-\U0001F251"
+104 +     r"\U000024C2-\U0001F251"
+105 |     "\u200d"  # zero width joiner
+106 |     "\u200c"  # zero width non-joiner
+107 |     "\\u200c" # must not be escaped in a raw string
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:105:5
@@ -672,16 +624,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 107 |     "\\u200c" # must not be escaped in a raw string
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-102 102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
-103 103 |     "\U00002702-\U000027B0"
-104 104 |     "\U000024C2-\U0001F251"
-105     |-    "\u200d"  # zero width joiner
-    105 |+    r"\u200d"  # zero width joiner
-106 106 |     "\u200c"  # zero width non-joiner
-107 107 |     "\\u200c" # must not be escaped in a raw string
-108 108 |     "]+",
+102 |     "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+103 |     "\U00002702-\U000027B0"
+104 |     "\U000024C2-\U0001F251"
+    -     "\u200d"  # zero width joiner
+105 +     r"\u200d"  # zero width joiner
+106 |     "\u200c"  # zero width non-joiner
+107 |     "\\u200c" # must not be escaped in a raw string
+108 |     "]+",
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 [*] First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:106:5
@@ -694,16 +645,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 108 |     "]+",
     |
 help: Replace with raw string
-
-ℹ Unsafe fix
-103 103 |     "\U00002702-\U000027B0"
-104 104 |     "\U000024C2-\U0001F251"
-105 105 |     "\u200d"  # zero width joiner
-106     |-    "\u200c"  # zero width non-joiner
-    106 |+    r"\u200c"  # zero width non-joiner
-107 107 |     "\\u200c" # must not be escaped in a raw string
-108 108 |     "]+",
-109 109 |     flags=re.UNICODE,
+103 |     "\U00002702-\U000027B0"
+104 |     "\U000024C2-\U0001F251"
+105 |     "\u200d"  # zero width joiner
+    -     "\u200c"  # zero width non-joiner
+106 +     r"\u200c"  # zero width non-joiner
+107 |     "\\u200c" # must not be escaped in a raw string
+108 |     "]+",
+109 |     flags=re.UNICODE,
+note: This is an unsafe fix and may change runtime behavior
 
 RUF039 First argument to `re.compile()` is not raw string
    --> RUF039_concat.py:107:5
@@ -728,12 +678,10 @@ RUF039 [*] First argument to `re.compile()` is not raw string
 110 | )
     |
 help: Replace with raw string
-
-ℹ Safe fix
-105 105 |     "\u200d"  # zero width joiner
-106 106 |     "\u200c"  # zero width non-joiner
-107 107 |     "\\u200c" # must not be escaped in a raw string
-108     |-    "]+",
-    108 |+    r"]+",
-109 109 |     flags=re.UNICODE,
-110 110 | )
+105 |     "\u200d"  # zero width joiner
+106 |     "\u200c"  # zero width non-joiner
+107 |     "\\u200c" # must not be escaped in a raw string
+    -     "]+",
+108 +     r"]+",
+109 |     flags=re.UNICODE,
+110 | )
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap
index 7c6ff021da..c9a75f25c2 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap
@@ -9,16 +9,14 @@ RUF055 [*] Plain string pattern passed to `re` function
   | ^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `s.replace("abc", "")`
-
-ℹ Safe fix
-3 3 | s = "str"
-4 4 | 
-5 5 | # this should be replaced with `s.replace("abc", "")`
-6   |-re.sub("abc", "", s)
-  6 |+s.replace("abc", "")
-7 7 | 
-8 8 | 
-9 9 | # this example, adapted from https://docs.python.org/3/library/re.html#re.sub,
+3 | s = "str"
+4 | 
+5 | # this should be replaced with `s.replace("abc", "")`
+  - re.sub("abc", "", s)
+6 + s.replace("abc", "")
+7 | 
+8 | 
+9 | # this example, adapted from https://docs.python.org/3/library/re.html#re.sub,
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:22:4
@@ -31,16 +29,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 24 | if m := re.match("abc", s):  # this should *not* be replaced
    |
 help: Replace with `s.startswith("abc")`
-
-ℹ Safe fix
-19 19 | 
-20 20 | # this one should be replaced with `s.startswith("abc")` because the Match is
-21 21 | # used in an if context for its truth value
-22    |-if re.match("abc", s):
-   22 |+if s.startswith("abc"):
-23 23 |     pass
-24 24 | if m := re.match("abc", s):  # this should *not* be replaced
-25 25 |     pass
+19 | 
+20 | # this one should be replaced with `s.startswith("abc")` because the Match is
+21 | # used in an if context for its truth value
+   - if re.match("abc", s):
+22 + if s.startswith("abc"):
+23 |     pass
+24 | if m := re.match("abc", s):  # this should *not* be replaced
+25 |     pass
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:29:4
@@ -52,16 +48,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 31 | re.search("abc", s)  # this should not be replaced
    |
 help: Replace with `"abc" in s`
-
-ℹ Safe fix
-26 26 | re.match("abc", s)  # this should not be replaced because match returns a Match
-27 27 | 
-28 28 | # this should be replaced with `"abc" in s`
-29    |-if re.search("abc", s):
-   29 |+if "abc" in s:
-30 30 |     pass
-31 31 | re.search("abc", s)  # this should not be replaced
-32 32 | 
+26 | re.match("abc", s)  # this should not be replaced because match returns a Match
+27 | 
+28 | # this should be replaced with `"abc" in s`
+   - if re.search("abc", s):
+29 + if "abc" in s:
+30 |     pass
+31 | re.search("abc", s)  # this should not be replaced
+32 | 
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:34:4
@@ -73,16 +67,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 36 | re.fullmatch("abc", s)  # this should not be replaced
    |
 help: Replace with `s == "abc"`
-
-ℹ Safe fix
-31 31 | re.search("abc", s)  # this should not be replaced
-32 32 | 
-33 33 | # this should be replaced with `"abc" == s`
-34    |-if re.fullmatch("abc", s):
-   34 |+if s == "abc":
-35 35 |     pass
-36 36 | re.fullmatch("abc", s)  # this should not be replaced
-37 37 | 
+31 | re.search("abc", s)  # this should not be replaced
+32 | 
+33 | # this should be replaced with `"abc" == s`
+   - if re.fullmatch("abc", s):
+34 + if s == "abc":
+35 |     pass
+36 | re.fullmatch("abc", s)  # this should not be replaced
+37 | 
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:39:1
@@ -94,16 +86,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 41 | # these currently should not be modified because the patterns contain regex
    |
 help: Replace with `s.split("abc")`
-
-ℹ Safe fix
-36 36 | re.fullmatch("abc", s)  # this should not be replaced
-37 37 | 
-38 38 | # this should be replaced with `s.split("abc")`
-39    |-re.split("abc", s)
-   39 |+s.split("abc")
-40 40 | 
-41 41 | # these currently should not be modified because the patterns contain regex
-42 42 | # metacharacters
+36 | re.fullmatch("abc", s)  # this should not be replaced
+37 | 
+38 | # this should be replaced with `s.split("abc")`
+   - re.split("abc", s)
+39 + s.split("abc")
+40 | 
+41 | # these currently should not be modified because the patterns contain regex
+42 | # metacharacters
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:71:1
@@ -121,22 +111,21 @@ RUF055 [*] Plain string pattern passed to `re` function
 79 |   # A diagnostic should not be emitted for `sub` replacements with backreferences or
    |
 help: Replace with `s.replace("abc", "")`
-
-ℹ Unsafe fix
-68 68 | re.split("abc", s, maxsplit=2)
-69 69 | 
-70 70 | # this should trigger an unsafe fix because of the presence of comments
-71    |-re.sub(
-72    |-    # pattern
-73    |-    "abc",
-74    |-    # repl
-75    |-    "",
-76    |-    s,  # string
-77    |-)
-   71 |+s.replace("abc", "")
-78 72 | 
-79 73 | # A diagnostic should not be emitted for `sub` replacements with backreferences or
-80 74 | # most other ASCII escapes
+68 | re.split("abc", s, maxsplit=2)
+69 | 
+70 | # this should trigger an unsafe fix because of the presence of comments
+   - re.sub(
+   -     # pattern
+   -     "abc",
+   -     # repl
+   -     "",
+   -     s,  # string
+   - )
+71 + s.replace("abc", "")
+72 | 
+73 | # A diagnostic should not be emitted for `sub` replacements with backreferences or
+74 | # most other ASCII escapes
+note: This is an unsafe fix and may change runtime behavior
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:89:1
@@ -149,16 +138,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 91 | re.sub(r"a", "\a", "a")
    |
 help: Replace with `"a".replace(r"a", "\n")`
-
-ℹ Safe fix
-86 86 | # `re.sub(r"a", r"\n", some_string)` is fixed to `some_string.replace("a", "\n")`
-87 87 | # *not* `some_string.replace("a", "\\n")`.
-88 88 | # We currently emit diagnostics for some of these without fixing them.
-89    |-re.sub(r"a", "\n", "a")
-   89 |+"a".replace(r"a", "\n")
-90 90 | re.sub(r"a", r"\n", "a")
-91 91 | re.sub(r"a", "\a", "a")
-92 92 | re.sub(r"a", r"\a", "a")
+86 | # `re.sub(r"a", r"\n", some_string)` is fixed to `some_string.replace("a", "\n")`
+87 | # *not* `some_string.replace("a", "\\n")`.
+88 | # We currently emit diagnostics for some of these without fixing them.
+   - re.sub(r"a", "\n", "a")
+89 + "a".replace(r"a", "\n")
+90 | re.sub(r"a", r"\n", "a")
+91 | re.sub(r"a", "\a", "a")
+92 | re.sub(r"a", r"\a", "a")
 
 RUF055 Plain string pattern passed to `re` function
   --> RUF055_0.py:90:1
@@ -181,16 +168,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 92 | re.sub(r"a", r"\a", "a")
    |
 help: Replace with `"a".replace(r"a", "\x07")`
-
-ℹ Safe fix
-88 88 | # We currently emit diagnostics for some of these without fixing them.
-89 89 | re.sub(r"a", "\n", "a")
-90 90 | re.sub(r"a", r"\n", "a")
-91    |-re.sub(r"a", "\a", "a")
-   91 |+"a".replace(r"a", "\x07")
-92 92 | re.sub(r"a", r"\a", "a")
-93 93 | 
-94 94 | re.sub(r"a", "\?", "a")
+88 | # We currently emit diagnostics for some of these without fixing them.
+89 | re.sub(r"a", "\n", "a")
+90 | re.sub(r"a", r"\n", "a")
+   - re.sub(r"a", "\a", "a")
+91 + "a".replace(r"a", "\x07")
+92 | re.sub(r"a", r"\a", "a")
+93 | 
+94 | re.sub(r"a", "\?", "a")
 
 RUF055 Plain string pattern passed to `re` function
   --> RUF055_0.py:92:1
@@ -213,16 +198,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 95 | re.sub(r"a", r"\?", "a")
    |
 help: Replace with `"a".replace(r"a", "\\?")`
-
-ℹ Safe fix
-91 91 | re.sub(r"a", "\a", "a")
-92 92 | re.sub(r"a", r"\a", "a")
-93 93 | 
-94    |-re.sub(r"a", "\?", "a")
-   94 |+"a".replace(r"a", "\\?")
-95 95 | re.sub(r"a", r"\?", "a")
-96 96 | 
-97 97 | # these double as tests for preserving raw string quoting style
+91 | re.sub(r"a", "\a", "a")
+92 | re.sub(r"a", r"\a", "a")
+93 | 
+   - re.sub(r"a", "\?", "a")
+94 + "a".replace(r"a", "\\?")
+95 | re.sub(r"a", r"\?", "a")
+96 | 
+97 | # these double as tests for preserving raw string quoting style
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_0.py:95:1
@@ -234,16 +217,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 97 | # these double as tests for preserving raw string quoting style
    |
 help: Replace with `"a".replace(r"a", r"\?")`
-
-ℹ Safe fix
-92 92 | re.sub(r"a", r"\a", "a")
-93 93 | 
-94 94 | re.sub(r"a", "\?", "a")
-95    |-re.sub(r"a", r"\?", "a")
-   95 |+"a".replace(r"a", r"\?")
-96 96 | 
-97 97 | # these double as tests for preserving raw string quoting style
-98 98 | re.sub(r'abc', "", s)
+92 | re.sub(r"a", r"\a", "a")
+93 | 
+94 | re.sub(r"a", "\?", "a")
+   - re.sub(r"a", r"\?", "a")
+95 + "a".replace(r"a", r"\?")
+96 | 
+97 | # these double as tests for preserving raw string quoting style
+98 | re.sub(r'abc', "", s)
 
 RUF055 [*] Plain string pattern passed to `re` function
    --> RUF055_0.py:98:1
@@ -255,15 +236,13 @@ RUF055 [*] Plain string pattern passed to `re` function
 100 | re.sub(r'''abc''', "", s)
     |
 help: Replace with `s.replace(r'abc', "")`
-
-ℹ Safe fix
-95 95 | re.sub(r"a", r"\?", "a")
-96 96 | 
-97 97 | # these double as tests for preserving raw string quoting style
-98    |-re.sub(r'abc', "", s)
-   98 |+s.replace(r'abc', "")
-99 99 | re.sub(r"""abc""", "", s)
-100 100 | re.sub(r'''abc''', "", s)
+95  | re.sub(r"a", r"\?", "a")
+96  | 
+97  | # these double as tests for preserving raw string quoting style
+    - re.sub(r'abc', "", s)
+98  + s.replace(r'abc', "")
+99  | re.sub(r"""abc""", "", s)
+100 | re.sub(r'''abc''', "", s)
 
 RUF055 [*] Plain string pattern passed to `re` function
    --> RUF055_0.py:99:1
@@ -275,14 +254,12 @@ RUF055 [*] Plain string pattern passed to `re` function
 100 | re.sub(r'''abc''', "", s)
     |
 help: Replace with `s.replace(r"""abc""", "")`
-
-ℹ Safe fix
-96  96  | 
-97  97  | # these double as tests for preserving raw string quoting style
-98  98  | re.sub(r'abc', "", s)
-99      |-re.sub(r"""abc""", "", s)
-    99  |+s.replace(r"""abc""", "")
-100 100 | re.sub(r'''abc''', "", s)
+96  | 
+97  | # these double as tests for preserving raw string quoting style
+98  | re.sub(r'abc', "", s)
+    - re.sub(r"""abc""", "", s)
+99  + s.replace(r"""abc""", "")
+100 | re.sub(r'''abc''', "", s)
 
 RUF055 [*] Plain string pattern passed to `re` function
    --> RUF055_0.py:100:1
@@ -293,10 +270,8 @@ RUF055 [*] Plain string pattern passed to `re` function
     | ^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace with `s.replace(r'''abc''', "")`
-
-ℹ Safe fix
-97  97  | # these double as tests for preserving raw string quoting style
-98  98  | re.sub(r'abc', "", s)
-99  99  | re.sub(r"""abc""", "", s)
-100     |-re.sub(r'''abc''', "", s)
-    100 |+s.replace(r'''abc''', "")
+97  | # these double as tests for preserving raw string quoting style
+98  | re.sub(r'abc', "", s)
+99  | re.sub(r"""abc""", "", s)
+    - re.sub(r'''abc''', "", s)
+100 + s.replace(r'''abc''', "")
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap
index 3fcd0eaaa2..44a1c811b6 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap
@@ -12,16 +12,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 11 | # aliases are not followed, so this one should not trigger the rule
    |
 help: Replace with `haystack.replace(pat1, "")`
-
-ℹ Safe fix
-6  6  | 
-7  7  | pat1 = "needle"
-8  8  | 
-9     |-re.sub(pat1, "", haystack)
-   9  |+haystack.replace(pat1, "")
-10 10 | 
-11 11 | # aliases are not followed, so this one should not trigger the rule
-12 12 | if pat4 := pat1:
+6  | 
+7  | pat1 = "needle"
+8  | 
+   - re.sub(pat1, "", haystack)
+9  + haystack.replace(pat1, "")
+10 | 
+11 | # aliases are not followed, so this one should not trigger the rule
+12 | if pat4 := pat1:
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_1.py:17:1
@@ -32,10 +30,8 @@ RUF055 [*] Plain string pattern passed to `re` function
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `haystack.replace(r"abc", repl)`
-
-ℹ Safe fix
-14 14 | 
-15 15 | # also works for the `repl` argument in sub
-16 16 | repl = "new"
-17    |-re.sub(r"abc", repl, haystack)
-   17 |+haystack.replace(r"abc", repl)
+14 | 
+15 | # also works for the `repl` argument in sub
+16 | repl = "new"
+   - re.sub(r"abc", repl, haystack)
+17 + haystack.replace(r"abc", repl)
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap
index 3c04d2be38..bccc67ba38 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap
@@ -9,16 +9,14 @@ RUF055 [*] Plain string pattern passed to `re` function
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with `"abc" not in s`
-
-ℹ Safe fix
-4 4 | s = "str"
-5 5 | 
-6 6 | # this should be replaced with `"abc" not in s`
-7   |-re.search("abc", s) is None
-  7 |+"abc" not in s
-8 8 | 
-9 9 | 
-10 10 | # this should be replaced with `"abc" in s`
+4  | s = "str"
+5  | 
+6  | # this should be replaced with `"abc" not in s`
+   - re.search("abc", s) is None
+7  + "abc" not in s
+8  | 
+9  | 
+10 | # this should be replaced with `"abc" in s`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:11:1
@@ -28,16 +26,14 @@ RUF055 [*] Plain string pattern passed to `re` function
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `"abc" in s`
-
-ℹ Safe fix
-8  8  | 
-9  9  | 
-10 10 | # this should be replaced with `"abc" in s`
-11    |-re.search("abc", s) is not None
-   11 |+"abc" in s
-12 12 | 
-13 13 | 
-14 14 | # this should be replaced with `not s.startswith("abc")`
+8  | 
+9  | 
+10 | # this should be replaced with `"abc" in s`
+   - re.search("abc", s) is not None
+11 + "abc" in s
+12 | 
+13 | 
+14 | # this should be replaced with `not s.startswith("abc")`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:15:1
@@ -47,16 +43,14 @@ RUF055 [*] Plain string pattern passed to `re` function
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `not s.startswith("abc")`
-
-ℹ Safe fix
-12 12 | 
-13 13 | 
-14 14 | # this should be replaced with `not s.startswith("abc")`
-15    |-re.match("abc", s) is None
-   15 |+not s.startswith("abc")
-16 16 | 
-17 17 | 
-18 18 | # this should be replaced with `s.startswith("abc")`
+12 | 
+13 | 
+14 | # this should be replaced with `not s.startswith("abc")`
+   - re.match("abc", s) is None
+15 + not s.startswith("abc")
+16 | 
+17 | 
+18 | # this should be replaced with `s.startswith("abc")`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:19:1
@@ -66,16 +60,14 @@ RUF055 [*] Plain string pattern passed to `re` function
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `s.startswith("abc")`
-
-ℹ Safe fix
-16 16 | 
-17 17 | 
-18 18 | # this should be replaced with `s.startswith("abc")`
-19    |-re.match("abc", s) is not None
-   19 |+s.startswith("abc")
-20 20 | 
-21 21 | 
-22 22 | # this should be replaced with `s != "abc"`
+16 | 
+17 | 
+18 | # this should be replaced with `s.startswith("abc")`
+   - re.match("abc", s) is not None
+19 + s.startswith("abc")
+20 | 
+21 | 
+22 | # this should be replaced with `s != "abc"`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:23:1
@@ -85,16 +77,14 @@ RUF055 [*] Plain string pattern passed to `re` function
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `s != "abc"`
-
-ℹ Safe fix
-20 20 | 
-21 21 | 
-22 22 | # this should be replaced with `s != "abc"`
-23    |-re.fullmatch("abc", s) is None
-   23 |+s != "abc"
-24 24 | 
-25 25 | 
-26 26 | # this should be replaced with `s == "abc"`
+20 | 
+21 | 
+22 | # this should be replaced with `s != "abc"`
+   - re.fullmatch("abc", s) is None
+23 + s != "abc"
+24 | 
+25 | 
+26 | # this should be replaced with `s == "abc"`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:27:1
@@ -104,16 +94,14 @@ RUF055 [*] Plain string pattern passed to `re` function
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `s == "abc"`
-
-ℹ Safe fix
-24 24 | 
-25 25 | 
-26 26 | # this should be replaced with `s == "abc"`
-27    |-re.fullmatch("abc", s) is not None
-   27 |+s == "abc"
-28 28 | 
-29 29 | 
-30 30 | # this should trigger an unsafe fix because of the presence of a comment within the
+24 | 
+25 | 
+26 | # this should be replaced with `s == "abc"`
+   - re.fullmatch("abc", s) is not None
+27 + s == "abc"
+28 | 
+29 | 
+30 | # this should trigger an unsafe fix because of the presence of a comment within the
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:33:5
@@ -131,21 +119,20 @@ RUF055 [*] Plain string pattern passed to `re` function
 40 |       pass
    |
 help: Replace with `s != "a really really really really long string"`
-
-ℹ Unsafe fix
-30 30 | # this should trigger an unsafe fix because of the presence of a comment within the
-31 31 | # expression being replaced (which we'd lose)
-32 32 | if (
-33    |-    re.fullmatch(
-34    |-        "a really really really really long string",
-35    |-        s,
-36    |-    )
-37    |-    # with a comment here
-38    |-    is None
-   33 |+    s != "a really really really really long string"
-39 34 | ):
-40 35 |     pass
-41 36 | 
+30 | # this should trigger an unsafe fix because of the presence of a comment within the
+31 | # expression being replaced (which we'd lose)
+32 | if (
+   -     re.fullmatch(
+   -         "a really really really really long string",
+   -         s,
+   -     )
+   -     # with a comment here
+   -     is None
+33 +     s != "a really really really really long string"
+34 | ):
+35 |     pass
+36 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_2.py:46:5
@@ -162,16 +149,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 52 |       pass
    |
 help: Replace with `s != "a really really really really long string"`
-
-ℹ Safe fix
-43 43 | # this should trigger a safe fix (comments are preserved given they're outside the
-44 44 | # expression)
-45 45 | if (  # leading
-46    |-    re.fullmatch(
-47    |-        "a really really really really long string",
-48    |-        s,
-49    |-    )
-50    |-    is None  # trailing
-   46 |+    s != "a really really really really long string"  # trailing
-51 47 | ):
-52 48 |     pass
+43 | # this should trigger a safe fix (comments are preserved given they're outside the
+44 | # expression)
+45 | if (  # leading
+   -     re.fullmatch(
+   -         "a really really really really long string",
+   -         s,
+   -     )
+   -     is None  # trailing
+46 +     s != "a really really really really long string"  # trailing
+47 | ):
+48 |     pass
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap
index f89aacd212..a9ce9ee638 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap
@@ -11,16 +11,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 8 | # Should be replaced with `b_src.startswith(rb"abc")`
   |
 help: Replace with `b_src.replace(rb"x", b"y")`
-
-ℹ Safe fix
-3 3 | b_src = b"abc"
-4 4 | 
-5 5 | # Should be replaced with `b_src.replace(rb"x", b"y")`
-6   |-re.sub(rb"x", b"y", b_src)
-  6 |+b_src.replace(rb"x", b"y")
-7 7 | 
-8 8 | # Should be replaced with `b_src.startswith(rb"abc")`
-9 9 | if re.match(rb"abc", b_src):
+3 | b_src = b"abc"
+4 | 
+5 | # Should be replaced with `b_src.replace(rb"x", b"y")`
+  - re.sub(rb"x", b"y", b_src)
+6 + b_src.replace(rb"x", b"y")
+7 | 
+8 | # Should be replaced with `b_src.startswith(rb"abc")`
+9 | if re.match(rb"abc", b_src):
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_3.py:9:4
@@ -31,16 +29,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 10 |     pass
    |
 help: Replace with `b_src.startswith(rb"abc")`
-
-ℹ Safe fix
-6  6  | re.sub(rb"x", b"y", b_src)
-7  7  | 
-8  8  | # Should be replaced with `b_src.startswith(rb"abc")`
-9     |-if re.match(rb"abc", b_src):
-   9  |+if b_src.startswith(rb"abc"):
-10 10 |     pass
-11 11 | 
-12 12 | # Should be replaced with `rb"x" in b_src`
+6  | re.sub(rb"x", b"y", b_src)
+7  | 
+8  | # Should be replaced with `b_src.startswith(rb"abc")`
+   - if re.match(rb"abc", b_src):
+9  + if b_src.startswith(rb"abc"):
+10 |     pass
+11 | 
+12 | # Should be replaced with `rb"x" in b_src`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_3.py:13:4
@@ -51,16 +47,14 @@ RUF055 [*] Plain string pattern passed to `re` function
 14 |     pass
    |
 help: Replace with `rb"x" in b_src`
-
-ℹ Safe fix
-10 10 |     pass
-11 11 | 
-12 12 | # Should be replaced with `rb"x" in b_src`
-13    |-if re.search(rb"x", b_src):
-   13 |+if rb"x" in b_src:
-14 14 |     pass
-15 15 | 
-16 16 | # Should be replaced with `b_src.split(rb"abc")`
+10 |     pass
+11 | 
+12 | # Should be replaced with `rb"x" in b_src`
+   - if re.search(rb"x", b_src):
+13 + if rb"x" in b_src:
+14 |     pass
+15 | 
+16 | # Should be replaced with `b_src.split(rb"abc")`
 
 RUF055 [*] Plain string pattern passed to `re` function
   --> RUF055_3.py:17:1
@@ -72,13 +66,11 @@ RUF055 [*] Plain string pattern passed to `re` function
 19 | # Patterns containing metacharacters should NOT be replaced
    |
 help: Replace with `b_src.split(rb"abc")`
-
-ℹ Safe fix
-14 14 |     pass
-15 15 | 
-16 16 | # Should be replaced with `b_src.split(rb"abc")`
-17    |-re.split(rb"abc", b_src)
-   17 |+b_src.split(rb"abc")
-18 18 | 
-19 19 | # Patterns containing metacharacters should NOT be replaced
-20 20 | re.sub(rb"ab[c]", b"", b_src)
+14 |     pass
+15 | 
+16 | # Should be replaced with `b_src.split(rb"abc")`
+   - re.split(rb"abc", b_src)
+17 + b_src.split(rb"abc")
+18 | 
+19 | # Patterns containing metacharacters should NOT be replaced
+20 | re.sub(rb"ab[c]", b"", b_src)
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap
index 556b134748..eaedab82a3 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap
@@ -10,9 +10,8 @@ RUF039 [*] First argument to `re.compile()` is not raw string
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Replace with raw string
-
-ℹ Unsafe fix
-1 1 | import re
-2 2 | 
-3   |-re.compile("\N{Partial Differential}")  # with unsafe fix if python target is 3.8 or higher, else without fix
-  3 |+re.compile(r"\N{Partial Differential}")  # with unsafe fix if python target is 3.8 or higher, else without fix
+1 | import re
+2 | 
+  - re.compile("\N{Partial Differential}")  # with unsafe fix if python target is 3.8 or higher, else without fix
+3 + re.compile(r"\N{Partial Differential}")  # with unsafe fix if python target is 3.8 or higher, else without fix
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview_confusables.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview_confusables.snap
index d9c235de30..332cf21fec 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview_confusables.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview_confusables.snap
@@ -200,11 +200,3 @@ RUF001 String contains ambiguous `𝐁` (MATHEMATICAL BOLD CAPITAL B). Did you m
 59 |
 60 | from typing import Literal
    |
-
-RUF001 String contains ambiguous `ﮨ` (ARABIC LETTER HEH GOAL INITIAL FORM). Did you mean `o` (LATIN SMALL LETTER O)?
-  --> confusables.py:61:20
-   |
-60 | from typing import Literal
-61 | x: '''"""'Literal["ﮨ"]'"""'''
-   |                    ^
-   |
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap
index 8128f18880..955ff7c970 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap
@@ -11,16 +11,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
 7 | starmap(func, zip(a, b, c, strict=strict))
   |
 help: Use `map` instead
-
-ℹ Safe fix
-2 2 | import itertools
-3 3 | 
-4 4 | # Errors in Python 3.14+
-5   |-starmap(func, zip(a, b, c, strict=True))
-  5 |+map(func, a, b, c, strict=True)
-6 6 | starmap(func, zip(a, b, c, strict=False))
-7 7 | starmap(func, zip(a, b, c, strict=strict))
-8 8 | 
+2 | import itertools
+3 | 
+4 | # Errors in Python 3.14+
+  - starmap(func, zip(a, b, c, strict=True))
+5 + map(func, a, b, c, strict=True)
+6 | starmap(func, zip(a, b, c, strict=False))
+7 | starmap(func, zip(a, b, c, strict=strict))
+8 | 
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
  --> RUF058_2.py:6:1
@@ -32,16 +30,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
 7 | starmap(func, zip(a, b, c, strict=strict))
   |
 help: Use `map` instead
-
-ℹ Safe fix
-3 3 | 
-4 4 | # Errors in Python 3.14+
-5 5 | starmap(func, zip(a, b, c, strict=True))
-6   |-starmap(func, zip(a, b, c, strict=False))
-  6 |+map(func, a, b, c, strict=False)
-7 7 | starmap(func, zip(a, b, c, strict=strict))
-8 8 | 
-9 9 | 
+3 | 
+4 | # Errors in Python 3.14+
+5 | starmap(func, zip(a, b, c, strict=True))
+  - starmap(func, zip(a, b, c, strict=False))
+6 + map(func, a, b, c, strict=False)
+7 | starmap(func, zip(a, b, c, strict=strict))
+8 | 
+9 | 
 
 RUF058 [*] `itertools.starmap` called on `zip` iterable
  --> RUF058_2.py:7:1
@@ -52,13 +48,11 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Use `map` instead
-
-ℹ Safe fix
-4 4 | # Errors in Python 3.14+
-5 5 | starmap(func, zip(a, b, c, strict=True))
-6 6 | starmap(func, zip(a, b, c, strict=False))
-7   |-starmap(func, zip(a, b, c, strict=strict))
-  7 |+map(func, a, b, c, strict=strict)
-8 8 | 
-9 9 | 
-10 10 | # No errors
+4  | # Errors in Python 3.14+
+5  | starmap(func, zip(a, b, c, strict=True))
+6  | starmap(func, zip(a, b, c, strict=False))
+   - starmap(func, zip(a, b, c, strict=strict))
+7  + map(func, a, b, c, strict=strict)
+8  | 
+9  | 
+10 | # No errors
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap
index 7dae78024e..1da7089332 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap
@@ -10,16 +10,14 @@ RUF100 [*] Unused blanket `noqa` directive
 10 |     print(c)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-6  6  |     b = 2  # noqa: F841
-7  7  | 
-8  8  |     # Invalid
-9     |-    c = 1  # noqa
-   9  |+    c = 1
-10 10 |     print(c)
-11 11 | 
-12 12 |     # Invalid
+6  |     b = 2  # noqa: F841
+7  | 
+8  |     # Invalid
+   -     c = 1  # noqa
+9  +     c = 1
+10 |     print(c)
+11 | 
+12 |     # Invalid
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:13:12
@@ -31,16 +29,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 15 |     # Invalid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-10 10 |     print(c)
-11 11 | 
-12 12 |     # Invalid
-13    |-    d = 1  # noqa: E501
-   13 |+    d = 1
-14 14 | 
-15 15 |     # Invalid
-16 16 |     d = 1  # noqa: F841, E501
+10 |     print(c)
+11 | 
+12 |     # Invalid
+   -     d = 1  # noqa: E501
+13 +     d = 1
+14 | 
+15 |     # Invalid
+16 |     d = 1  # noqa: F841, E501
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`)
   --> RUF100_0.py:16:12
@@ -52,16 +48,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`)
 18 |     # Invalid (and unimplemented or not enabled)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-13 13 |     d = 1  # noqa: E501
-14 14 | 
-15 15 |     # Invalid
-16    |-    d = 1  # noqa: F841, E501
-   16 |+    d = 1
-17 17 | 
-18 18 |     # Invalid (and unimplemented or not enabled)
-19 19 |     d = 1  # noqa: F841, W191, F821
+13 |     d = 1  # noqa: E501
+14 | 
+15 |     # Invalid
+   -     d = 1  # noqa: F841, E501
+16 +     d = 1
+17 | 
+18 |     # Invalid (and unimplemented or not enabled)
+19 |     d = 1  # noqa: F841, W191, F821
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`)
   --> RUF100_0.py:19:12
@@ -73,16 +67,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`)
 21 |     # Invalid (but external)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-16 16 |     d = 1  # noqa: F841, E501
-17 17 | 
-18 18 |     # Invalid (and unimplemented or not enabled)
-19    |-    d = 1  # noqa: F841, W191, F821
-   19 |+    d = 1
-20 20 | 
-21 21 |     # Invalid (but external)
-22 22 |     d = 1  # noqa: F841, V101
+16 |     d = 1  # noqa: F841, E501
+17 | 
+18 |     # Invalid (and unimplemented or not enabled)
+   -     d = 1  # noqa: F841, W191, F821
+19 +     d = 1
+20 | 
+21 |     # Invalid (but external)
+22 |     d = 1  # noqa: F841, V101
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`)
   --> RUF100_0.py:22:12
@@ -94,16 +86,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`)
 24 |     # Invalid (but external)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-19 19 |     d = 1  # noqa: F841, W191, F821
-20 20 | 
-21 21 |     # Invalid (but external)
-22    |-    d = 1  # noqa: F841, V101
-   22 |+    d = 1  # noqa: V101
-23 23 | 
-24 24 |     # Invalid (but external)
-25 25 |     d = 1  # noqa: V500
+19 |     d = 1  # noqa: F841, W191, F821
+20 | 
+21 |     # Invalid (but external)
+   -     d = 1  # noqa: F841, V101
+22 +     d = 1  # noqa: V101
+23 | 
+24 |     # Invalid (but external)
+25 |     d = 1  # noqa: V500
 
 RUF100 [*] Unused `noqa` directive (unknown: `V500`)
   --> RUF100_0.py:25:12
@@ -115,16 +105,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `V500`)
 27 |     # fmt: off
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-22 22 |     d = 1  # noqa: F841, V101
-23 23 | 
-24 24 |     # Invalid (but external)
-25    |-    d = 1  # noqa: V500
-   25 |+    d = 1
-26 26 | 
-27 27 |     # fmt: off
-28 28 |     # Invalid - no space before #
+22 |     d = 1  # noqa: F841, V101
+23 | 
+24 |     # Invalid (but external)
+   -     d = 1  # noqa: V500
+25 +     d = 1
+26 | 
+27 |     # fmt: off
+28 |     # Invalid - no space before #
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:29:12
@@ -137,16 +125,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 31 |     # Invalid - many spaces before #
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-26 26 | 
-27 27 |     # fmt: off
-28 28 |     # Invalid - no space before #
-29    |-    d = 1  # noqa: E501
-   29 |+    d = 1
-30 30 | 
-31 31 |     # Invalid - many spaces before #
-32 32 |     d = 1  # noqa: E501
+26 | 
+27 |     # fmt: off
+28 |     # Invalid - no space before #
+   -     d = 1  # noqa: E501
+29 +     d = 1
+30 | 
+31 |     # Invalid - many spaces before #
+32 |     d = 1  # noqa: E501
 
 F841 [*] Local variable `d` is assigned to but never used
   --> RUF100_0.py:32:5
@@ -157,15 +143,14 @@ F841 [*] Local variable `d` is assigned to but never used
 33 |     # fmt: on
    |
 help: Remove assignment to unused variable `d`
-
-ℹ Unsafe fix
-29 29 |     d = 1  # noqa: E501
-30 30 | 
-31 31 |     # Invalid - many spaces before #
-32    |-    d = 1  # noqa: E501
-33 32 |     # fmt: on
-34 33 | 
-35 34 | 
+29 |     d = 1  # noqa: E501
+30 | 
+31 |     # Invalid - many spaces before #
+   -     d = 1  # noqa: E501
+32 |     # fmt: on
+33 | 
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:32:12
@@ -176,16 +161,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 33 |     # fmt: on
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-29 29 |     d = 1  # noqa: E501
-30 30 | 
-31 31 |     # Invalid - many spaces before #
-32    |-    d = 1  # noqa: E501
-   32 |+    d = 1
-33 33 |     # fmt: on
-34 34 | 
-35 35 | 
+29 |     d = 1  # noqa: E501
+30 | 
+31 |     # Invalid - many spaces before #
+   -     d = 1  # noqa: E501
+32 +     d = 1
+33 |     # fmt: on
+34 | 
+35 | 
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`)
   --> RUF100_0.py:58:6
@@ -197,16 +180,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`)
 60 | # Invalid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-55 55 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-56 56 | 
-57 57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-58    |-"""  # noqa: E501, F841
-   58 |+"""  # noqa: E501
-59 59 | 
-60 60 | # Invalid
-61 61 | _ = """Lorem ipsum dolor sit amet.
+55 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
+56 | 
+57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+   - """  # noqa: E501, F841
+58 + """  # noqa: E501
+59 | 
+60 | # Invalid
+61 | _ = """Lorem ipsum dolor sit amet.
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:66:6
@@ -218,16 +199,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 68 | # Invalid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-63 63 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-64 64 | 
-65 65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
-66    |-"""  # noqa: E501
-   66 |+"""
-67 67 | 
-68 68 | # Invalid
-69 69 | _ = """Lorem ipsum dolor sit amet.
+63 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
+64 | 
+65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
+   - """  # noqa: E501
+66 + """
+67 | 
+68 | # Invalid
+69 | _ = """Lorem ipsum dolor sit amet.
 
 RUF100 [*] Unused blanket `noqa` directive
   --> RUF100_0.py:74:6
@@ -239,16 +218,14 @@ RUF100 [*] Unused blanket `noqa` directive
 76 | # Valid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-71 71 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-72 72 | 
-73 73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
-74    |-"""  # noqa
-   74 |+"""
-75 75 | 
-76 76 | # Valid
-77 77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment  # noqa: E501
+71 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
+72 | 
+73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
+   - """  # noqa
+74 + """
+75 | 
+76 | # Valid
+77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment  # noqa: E501
 
 F401 [*] `shelve` imported but unused
   --> RUF100_0.py:88:8
@@ -260,15 +237,13 @@ F401 [*] `shelve` imported but unused
 89 | import sys  # noqa: F401, RUF100
    |
 help: Remove unused import: `shelve`
-
-ℹ Safe fix
-85 85 | 
-86 86 | import collections  # noqa
-87 87 | import os  # noqa: F401, RUF100
-88    |-import shelve  # noqa: RUF100
-89 88 | import sys  # noqa: F401, RUF100
-90 89 | 
-91 90 | print(sys.path)
+85 | 
+86 | import collections  # noqa
+87 | import os  # noqa: F401, RUF100
+   - import shelve  # noqa: RUF100
+88 | import sys  # noqa: F401, RUF100
+89 | 
+90 | print(sys.path)
 
 E501 Line too long (89 > 88)
   --> RUF100_0.py:93:89
@@ -288,16 +263,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`)
    |                                                                                            ^^^^^^^^^^^^
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-90 90 | 
-91 91 | print(sys.path)
-92 92 | 
-93    |-"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
-   93 |+"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]"
-94 94 | 
-95 95 | 
-96 96 | def f():
+90 | 
+91 | print(sys.path)
+92 | 
+   - "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
+93 + "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]"
+94 | 
+95 | 
+96 | def f():
 
 RUF100 [*] Unused `noqa` directive (unknown: `E50`)
    --> RUF100_0.py:107:12
@@ -309,16 +282,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`)
 108 |     e = 1  # …noqa: E50
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-104 104 | 
-105 105 | def f():
-106 106 |     # Invalid - nonexistent error code with multibyte character
-107     |-    d = 1  # …noqa: F841, E50
-    107 |+    d = 1  # noqa: F841
-108 108 |     e = 1  # …noqa: E50
-109 109 | 
-110 110 | 
+104 | 
+105 | def f():
+106 |     # Invalid - nonexistent error code with multibyte character
+    -     d = 1  # …noqa: F841, E50
+107 +     d = 1  # noqa: F841
+108 |     e = 1  # …noqa: E50
+109 | 
+110 | 
 
 F841 [*] Local variable `e` is assigned to but never used
    --> RUF100_0.py:108:5
@@ -329,15 +300,14 @@ F841 [*] Local variable `e` is assigned to but never used
     |     ^
     |
 help: Remove assignment to unused variable `e`
-
-ℹ Unsafe fix
-105 105 | def f():
-106 106 |     # Invalid - nonexistent error code with multibyte character
-107 107 |     d = 1  # …noqa: F841, E50
-108     |-    e = 1  # …noqa: E50
-109 108 | 
-110 109 | 
-111 110 | def f():
+105 | def f():
+106 |     # Invalid - nonexistent error code with multibyte character
+107 |     d = 1  # …noqa: F841, E50
+    -     e = 1  # …noqa: E50
+108 | 
+109 | 
+110 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF100 [*] Unused `noqa` directive (unknown: `E50`)
    --> RUF100_0.py:108:12
@@ -348,16 +318,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`)
     |            ^^^^^^^^^^^
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-105 105 | def f():
-106 106 |     # Invalid - nonexistent error code with multibyte character
-107 107 |     d = 1  # …noqa: F841, E50
-108     |-    e = 1  # …noqa: E50
-    108 |+    e = 1
-109 109 | 
-110 110 | 
-111 111 | def f():
+105 | def f():
+106 |     # Invalid - nonexistent error code with multibyte character
+107 |     d = 1  # …noqa: F841, E50
+    -     e = 1  # …noqa: E50
+108 +     e = 1
+109 | 
+110 | 
+111 | def f():
 
 RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`)
    --> RUF100_0.py:118:12
@@ -370,16 +338,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`)
 120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-115 115 | 
-116 116 | # Check duplicate code detection
-117 117 | def f():
-118     |-    x = 2  # noqa: F841, F841, X200
-    118 |+    x = 2  # noqa: F841
-119 119 | 
-120 120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
-121 121 | 
+115 | 
+116 | # Check duplicate code detection
+117 | def f():
+    -     x = 2  # noqa: F841, F841, X200
+118 +     x = 2  # noqa: F841
+119 | 
+120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
+121 | 
 
 RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`)
    --> RUF100_0.py:120:19
@@ -392,16 +358,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`)
 122 |     z = 2  # noqa: F841 F841  F841, F841, F841
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-117 117 | def f():
-118 118 |     x = 2  # noqa: F841, F841, X200
-119 119 | 
-120     |-    y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
-    120 |+    y = 2 == bar  # noqa: SIM300, F841
-121 121 | 
-122 122 |     z = 2  # noqa: F841 F841  F841, F841, F841
-123 123 | 
+117 | def f():
+118 |     x = 2  # noqa: F841, F841, X200
+119 | 
+    -     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
+120 +     y = 2 == bar  # noqa: SIM300, F841
+121 | 
+122 |     z = 2  # noqa: F841 F841  F841, F841, F841
+123 | 
 
 RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`)
    --> RUF100_0.py:122:12
@@ -414,16 +378,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`)
 124 |     return
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-119 119 | 
-120 120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
-121 121 | 
-122     |-    z = 2  # noqa: F841 F841  F841, F841, F841
-    122 |+    z = 2  # noqa: F841
-123 123 | 
-124 124 |     return
-125 125 | 
+119 | 
+120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
+121 | 
+    -     z = 2  # noqa: F841 F841  F841, F841, F841
+122 +     z = 2  # noqa: F841
+123 | 
+124 |     return
+125 | 
 
 RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`)
    --> RUF100_0.py:129:20
@@ -436,15 +398,13 @@ RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`)
 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-126 126 | 
-127 127 | # Allow code redirects
-128 128 | x = eval(command)  # noqa: PGH001, S307
-129     |-x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
-    129 |+x = eval(command)  # noqa: S307, PGH001
-130 130 | x = eval(command)  # noqa: PGH001, S307, PGH001
-131 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
+126 | 
+127 | # Allow code redirects
+128 | x = eval(command)  # noqa: PGH001, S307
+    - x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
+129 + x = eval(command)  # noqa: S307, PGH001
+130 | x = eval(command)  # noqa: PGH001, S307, PGH001
+131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
 
 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`)
    --> RUF100_0.py:130:20
@@ -456,14 +416,12 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`)
 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-127 127 | # Allow code redirects
-128 128 | x = eval(command)  # noqa: PGH001, S307
-129 129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
-130     |-x = eval(command)  # noqa: PGH001, S307, PGH001
-    130 |+x = eval(command)  # noqa: PGH001, S307
-131 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
+127 | # Allow code redirects
+128 | x = eval(command)  # noqa: PGH001, S307
+129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
+    - x = eval(command)  # noqa: PGH001, S307, PGH001
+130 + x = eval(command)  # noqa: PGH001, S307
+131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
 
 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`)
    --> RUF100_0.py:131:20
@@ -474,10 +432,8 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`)
     |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-128 128 | x = eval(command)  # noqa: PGH001, S307
-129 129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
-130 130 | x = eval(command)  # noqa: PGH001, S307, PGH001
-131     |-x = eval(command)  # noqa: PGH001, S307, PGH001, S307
-    131 |+x = eval(command)  # noqa: PGH001, S307
+128 | x = eval(command)  # noqa: PGH001, S307
+129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
+130 | x = eval(command)  # noqa: PGH001, S307, PGH001
+    - x = eval(command)  # noqa: PGH001, S307, PGH001, S307
+131 + x = eval(command)  # noqa: PGH001, S307
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap
index 2b582730bc..4ff79c6ebc 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap
@@ -10,16 +10,14 @@ RUF100 [*] Unused blanket `noqa` directive
 10 |     print(c)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-6  6  |     b = 2  # noqa: F841
-7  7  | 
-8  8  |     # Invalid
-9     |-    c = 1  # noqa
-   9  |+    c = 1
-10 10 |     print(c)
-11 11 | 
-12 12 |     # Invalid
+6  |     b = 2  # noqa: F841
+7  | 
+8  |     # Invalid
+   -     c = 1  # noqa
+9  +     c = 1
+10 |     print(c)
+11 | 
+12 |     # Invalid
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:13:12
@@ -31,16 +29,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 15 |     # Invalid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-10 10 |     print(c)
-11 11 | 
-12 12 |     # Invalid
-13    |-    d = 1  # noqa: E501
-   13 |+    d = 1
-14 14 | 
-15 15 |     # Invalid
-16 16 |     d = 1  # noqa: F841, E501
+10 |     print(c)
+11 | 
+12 |     # Invalid
+   -     d = 1  # noqa: E501
+13 +     d = 1
+14 | 
+15 |     # Invalid
+16 |     d = 1  # noqa: F841, E501
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`)
   --> RUF100_0.py:16:12
@@ -52,16 +48,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`)
 18 |     # Invalid (and unimplemented or not enabled)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-13 13 |     d = 1  # noqa: E501
-14 14 | 
-15 15 |     # Invalid
-16    |-    d = 1  # noqa: F841, E501
-   16 |+    d = 1
-17 17 | 
-18 18 |     # Invalid (and unimplemented or not enabled)
-19 19 |     d = 1  # noqa: F841, W191, F821
+13 |     d = 1  # noqa: E501
+14 | 
+15 |     # Invalid
+   -     d = 1  # noqa: F841, E501
+16 +     d = 1
+17 | 
+18 |     # Invalid (and unimplemented or not enabled)
+19 |     d = 1  # noqa: F841, W191, F821
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`)
   --> RUF100_0.py:19:12
@@ -73,16 +67,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`)
 21 |     # Invalid (but external)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-16 16 |     d = 1  # noqa: F841, E501
-17 17 | 
-18 18 |     # Invalid (and unimplemented or not enabled)
-19    |-    d = 1  # noqa: F841, W191, F821
-   19 |+    d = 1
-20 20 | 
-21 21 |     # Invalid (but external)
-22 22 |     d = 1  # noqa: F841, V101
+16 |     d = 1  # noqa: F841, E501
+17 | 
+18 |     # Invalid (and unimplemented or not enabled)
+   -     d = 1  # noqa: F841, W191, F821
+19 +     d = 1
+20 | 
+21 |     # Invalid (but external)
+22 |     d = 1  # noqa: F841, V101
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`)
   --> RUF100_0.py:22:12
@@ -94,16 +86,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`)
 24 |     # Invalid (but external)
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-19 19 |     d = 1  # noqa: F841, W191, F821
-20 20 | 
-21 21 |     # Invalid (but external)
-22    |-    d = 1  # noqa: F841, V101
-   22 |+    d = 1  # noqa: V101
-23 23 | 
-24 24 |     # Invalid (but external)
-25 25 |     d = 1  # noqa: V500
+19 |     d = 1  # noqa: F841, W191, F821
+20 | 
+21 |     # Invalid (but external)
+   -     d = 1  # noqa: F841, V101
+22 +     d = 1  # noqa: V101
+23 | 
+24 |     # Invalid (but external)
+25 |     d = 1  # noqa: V500
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:29:12
@@ -116,16 +106,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 31 |     # Invalid - many spaces before #
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-26 26 | 
-27 27 |     # fmt: off
-28 28 |     # Invalid - no space before #
-29    |-    d = 1  # noqa: E501
-   29 |+    d = 1
-30 30 | 
-31 31 |     # Invalid - many spaces before #
-32 32 |     d = 1  # noqa: E501
+26 | 
+27 |     # fmt: off
+28 |     # Invalid - no space before #
+   -     d = 1  # noqa: E501
+29 +     d = 1
+30 | 
+31 |     # Invalid - many spaces before #
+32 |     d = 1  # noqa: E501
 
 F841 [*] Local variable `d` is assigned to but never used
   --> RUF100_0.py:32:5
@@ -136,15 +124,14 @@ F841 [*] Local variable `d` is assigned to but never used
 33 |     # fmt: on
    |
 help: Remove assignment to unused variable `d`
-
-ℹ Unsafe fix
-29 29 |     d = 1  # noqa: E501
-30 30 | 
-31 31 |     # Invalid - many spaces before #
-32    |-    d = 1  # noqa: E501
-33 32 |     # fmt: on
-34 33 | 
-35 34 | 
+29 |     d = 1  # noqa: E501
+30 | 
+31 |     # Invalid - many spaces before #
+   -     d = 1  # noqa: E501
+32 |     # fmt: on
+33 | 
+34 | 
+note: This is an unsafe fix and may change runtime behavior
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:32:12
@@ -155,16 +142,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 33 |     # fmt: on
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-29 29 |     d = 1  # noqa: E501
-30 30 | 
-31 31 |     # Invalid - many spaces before #
-32    |-    d = 1  # noqa: E501
-   32 |+    d = 1
-33 33 |     # fmt: on
-34 34 | 
-35 35 | 
+29 |     d = 1  # noqa: E501
+30 | 
+31 |     # Invalid - many spaces before #
+   -     d = 1  # noqa: E501
+32 +     d = 1
+33 |     # fmt: on
+34 | 
+35 | 
 
 RUF100 [*] Unused `noqa` directive (unused: `F841`)
   --> RUF100_0.py:58:6
@@ -176,16 +161,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`)
 60 | # Invalid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-55 55 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-56 56 | 
-57 57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-58    |-"""  # noqa: E501, F841
-   58 |+"""  # noqa: E501
-59 59 | 
-60 60 | # Invalid
-61 61 | _ = """Lorem ipsum dolor sit amet.
+55 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
+56 | 
+57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+   - """  # noqa: E501, F841
+58 + """  # noqa: E501
+59 | 
+60 | # Invalid
+61 | _ = """Lorem ipsum dolor sit amet.
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_0.py:66:6
@@ -197,16 +180,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 68 | # Invalid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-63 63 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-64 64 | 
-65 65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
-66    |-"""  # noqa: E501
-   66 |+"""
-67 67 | 
-68 68 | # Invalid
-69 69 | _ = """Lorem ipsum dolor sit amet.
+63 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
+64 | 
+65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
+   - """  # noqa: E501
+66 + """
+67 | 
+68 | # Invalid
+69 | _ = """Lorem ipsum dolor sit amet.
 
 RUF100 [*] Unused blanket `noqa` directive
   --> RUF100_0.py:74:6
@@ -218,16 +199,14 @@ RUF100 [*] Unused blanket `noqa` directive
 76 | # Valid
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-71 71 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-72 72 | 
-73 73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
-74    |-"""  # noqa
-   74 |+"""
-75 75 | 
-76 76 | # Valid
-77 77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment  # noqa: E501
+71 |     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
+72 | 
+73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
+   - """  # noqa
+74 + """
+75 | 
+76 | # Valid
+77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment  # noqa: E501
 
 F401 [*] `shelve` imported but unused
   --> RUF100_0.py:88:8
@@ -239,15 +218,13 @@ F401 [*] `shelve` imported but unused
 89 | import sys  # noqa: F401, RUF100
    |
 help: Remove unused import: `shelve`
-
-ℹ Safe fix
-85 85 | 
-86 86 | import collections  # noqa
-87 87 | import os  # noqa: F401, RUF100
-88    |-import shelve  # noqa: RUF100
-89 88 | import sys  # noqa: F401, RUF100
-90 89 | 
-91 90 | print(sys.path)
+85 | 
+86 | import collections  # noqa
+87 | import os  # noqa: F401, RUF100
+   - import shelve  # noqa: RUF100
+88 | import sys  # noqa: F401, RUF100
+89 | 
+90 | print(sys.path)
 
 E501 Line too long (89 > 88)
   --> RUF100_0.py:93:89
@@ -267,16 +244,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`)
    |                                                                                            ^^^^^^^^^^^^
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-90 90 | 
-91 91 | print(sys.path)
-92 92 | 
-93    |-"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
-   93 |+"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]"
-94 94 | 
-95 95 | 
-96 96 | def f():
+90 | 
+91 | print(sys.path)
+92 | 
+   - "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
+93 + "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]"
+94 | 
+95 | 
+96 | def f():
 
 RUF100 [*] Unused `noqa` directive (unknown: `E50`)
    --> RUF100_0.py:107:12
@@ -288,16 +263,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`)
 108 |     e = 1  # …noqa: E50
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-104 104 | 
-105 105 | def f():
-106 106 |     # Invalid - nonexistent error code with multibyte character
-107     |-    d = 1  # …noqa: F841, E50
-    107 |+    d = 1  # noqa: F841
-108 108 |     e = 1  # …noqa: E50
-109 109 | 
-110 110 | 
+104 | 
+105 | def f():
+106 |     # Invalid - nonexistent error code with multibyte character
+    -     d = 1  # …noqa: F841, E50
+107 +     d = 1  # noqa: F841
+108 |     e = 1  # …noqa: E50
+109 | 
+110 | 
 
 F841 [*] Local variable `e` is assigned to but never used
    --> RUF100_0.py:108:5
@@ -308,15 +281,14 @@ F841 [*] Local variable `e` is assigned to but never used
     |     ^
     |
 help: Remove assignment to unused variable `e`
-
-ℹ Unsafe fix
-105 105 | def f():
-106 106 |     # Invalid - nonexistent error code with multibyte character
-107 107 |     d = 1  # …noqa: F841, E50
-108     |-    e = 1  # …noqa: E50
-109 108 | 
-110 109 | 
-111 110 | def f():
+105 | def f():
+106 |     # Invalid - nonexistent error code with multibyte character
+107 |     d = 1  # …noqa: F841, E50
+    -     e = 1  # …noqa: E50
+108 | 
+109 | 
+110 | def f():
+note: This is an unsafe fix and may change runtime behavior
 
 RUF100 [*] Unused `noqa` directive (unknown: `E50`)
    --> RUF100_0.py:108:12
@@ -327,16 +299,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`)
     |            ^^^^^^^^^^^
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-105 105 | def f():
-106 106 |     # Invalid - nonexistent error code with multibyte character
-107 107 |     d = 1  # …noqa: F841, E50
-108     |-    e = 1  # …noqa: E50
-    108 |+    e = 1
-109 109 | 
-110 110 | 
-111 111 | def f():
+105 | def f():
+106 |     # Invalid - nonexistent error code with multibyte character
+107 |     d = 1  # …noqa: F841, E50
+    -     e = 1  # …noqa: E50
+108 +     e = 1
+109 | 
+110 | 
+111 | def f():
 
 RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`)
    --> RUF100_0.py:118:12
@@ -349,16 +319,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`)
 120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-115 115 | 
-116 116 | # Check duplicate code detection
-117 117 | def f():
-118     |-    x = 2  # noqa: F841, F841, X200
-    118 |+    x = 2  # noqa: F841
-119 119 | 
-120 120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
-121 121 | 
+115 | 
+116 | # Check duplicate code detection
+117 | def f():
+    -     x = 2  # noqa: F841, F841, X200
+118 +     x = 2  # noqa: F841
+119 | 
+120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
+121 | 
 
 RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`)
    --> RUF100_0.py:120:19
@@ -371,16 +339,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`)
 122 |     z = 2  # noqa: F841 F841  F841, F841, F841
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-117 117 | def f():
-118 118 |     x = 2  # noqa: F841, F841, X200
-119 119 | 
-120     |-    y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
-    120 |+    y = 2 == bar  # noqa: SIM300, F841
-121 121 | 
-122 122 |     z = 2  # noqa: F841 F841  F841, F841, F841
-123 123 | 
+117 | def f():
+118 |     x = 2  # noqa: F841, F841, X200
+119 | 
+    -     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
+120 +     y = 2 == bar  # noqa: SIM300, F841
+121 | 
+122 |     z = 2  # noqa: F841 F841  F841, F841, F841
+123 | 
 
 RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`)
    --> RUF100_0.py:122:12
@@ -393,16 +359,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`)
 124 |     return
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-119 119 | 
-120 120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
-121 121 | 
-122     |-    z = 2  # noqa: F841 F841  F841, F841, F841
-    122 |+    z = 2  # noqa: F841
-123 123 | 
-124 124 |     return
-125 125 | 
+119 | 
+120 |     y = 2 == bar  # noqa: SIM300, F841, SIM300, SIM300
+121 | 
+    -     z = 2  # noqa: F841 F841  F841, F841, F841
+122 +     z = 2  # noqa: F841
+123 | 
+124 |     return
+125 | 
 
 RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`)
    --> RUF100_0.py:129:20
@@ -415,15 +379,13 @@ RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`)
 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-126 126 | 
-127 127 | # Allow code redirects
-128 128 | x = eval(command)  # noqa: PGH001, S307
-129     |-x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
-    129 |+x = eval(command)  # noqa: S307, PGH001
-130 130 | x = eval(command)  # noqa: PGH001, S307, PGH001
-131 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
+126 | 
+127 | # Allow code redirects
+128 | x = eval(command)  # noqa: PGH001, S307
+    - x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
+129 + x = eval(command)  # noqa: S307, PGH001
+130 | x = eval(command)  # noqa: PGH001, S307, PGH001
+131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
 
 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`)
    --> RUF100_0.py:130:20
@@ -435,14 +397,12 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`)
 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-127 127 | # Allow code redirects
-128 128 | x = eval(command)  # noqa: PGH001, S307
-129 129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
-130     |-x = eval(command)  # noqa: PGH001, S307, PGH001
-    130 |+x = eval(command)  # noqa: PGH001, S307
-131 131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
+127 | # Allow code redirects
+128 | x = eval(command)  # noqa: PGH001, S307
+129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
+    - x = eval(command)  # noqa: PGH001, S307, PGH001
+130 + x = eval(command)  # noqa: PGH001, S307
+131 | x = eval(command)  # noqa: PGH001, S307, PGH001, S307
 
 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`)
    --> RUF100_0.py:131:20
@@ -453,10 +413,8 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`)
     |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-128 128 | x = eval(command)  # noqa: PGH001, S307
-129 129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
-130 130 | x = eval(command)  # noqa: PGH001, S307, PGH001
-131     |-x = eval(command)  # noqa: PGH001, S307, PGH001, S307
-    131 |+x = eval(command)  # noqa: PGH001, S307
+128 | x = eval(command)  # noqa: PGH001, S307
+129 | x = eval(command)  # noqa: S307, PGH001, S307, S307, S307
+130 | x = eval(command)  # noqa: PGH001, S307, PGH001
+    - x = eval(command)  # noqa: PGH001, S307, PGH001, S307
+131 + x = eval(command)  # noqa: PGH001, S307
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap
index e08e0b0fb3..ebcef60b15 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap
@@ -11,17 +11,15 @@ F401 [*] `typing.Union` imported but unused
 38 |     )
    |
 help: Remove unused import: `typing.Union`
-
-ℹ Safe fix
-34 34 |     # This should ignore the first error.
-35 35 |     from typing import (
-36 36 |         Mapping,  # noqa: F401
-37    |-        Union,
-38    |-    )
-   37 |+        )
-39 38 | 
-40 39 | 
-41 40 | def f():
+34 |     # This should ignore the first error.
+35 |     from typing import (
+36 |         Mapping,  # noqa: F401
+   -         Union,
+   -     )
+37 +         )
+38 | 
+39 | 
+40 | def f():
 
 RUF100 [*] Unused `noqa` directive (unused: `F401`)
   --> RUF100_1.py:52:20
@@ -33,16 +31,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`)
 53 |     )
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-49 49 | def f():
-50 50 |     # This should ignore the error, but the inner noqa should be marked as unused.
-51 51 |     from typing import (  # noqa: F401
-52    |-        Optional,  # noqa: F401
-   52 |+        Optional,
-53 53 |     )
-54 54 | 
-55 55 | 
+49 | def f():
+50 |     # This should ignore the error, but the inner noqa should be marked as unused.
+51 |     from typing import (  # noqa: F401
+   -         Optional,  # noqa: F401
+52 +         Optional,
+53 |     )
+54 | 
+55 | 
 
 RUF100 [*] Unused `noqa` directive (unused: `F401`)
   --> RUF100_1.py:59:20
@@ -54,16 +50,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`)
 60 |     )
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-56 56 | def f():
-57 57 |     # This should ignore the error, but the inner noqa should be marked as unused.
-58 58 |     from typing import (  # noqa
-59    |-        Optional,  # noqa: F401
-   59 |+        Optional,
-60 60 |     )
-61 61 | 
-62 62 | 
+56 | def f():
+57 |     # This should ignore the error, but the inner noqa should be marked as unused.
+58 |     from typing import (  # noqa
+   -         Optional,  # noqa: F401
+59 +         Optional,
+60 |     )
+61 | 
+62 | 
 
 RUF100 [*] Unused `noqa` directive (non-enabled: `F501`)
   --> RUF100_1.py:66:16
@@ -75,16 +69,14 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F501`)
 67 |     )
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-63 63 | def f():
-64 64 |     # This should ignore the error, but mark F501 as unused.
-65 65 |     from typing import (  # noqa: F401
-66    |-        Dict,  # noqa: F501
-   66 |+        Dict,
-67 67 |     )
-68 68 | 
-69 69 | 
+63 | def f():
+64 |     # This should ignore the error, but mark F501 as unused.
+65 |     from typing import (  # noqa: F401
+   -         Dict,  # noqa: F501
+66 +         Dict,
+67 |     )
+68 | 
+69 | 
 
 RUF100 [*] Unused `noqa` directive (non-enabled: `F501`)
   --> RUF100_1.py:72:27
@@ -97,16 +89,14 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F501`)
 74 |     )
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-69 69 | 
-70 70 | def f():
-71 71 |     # This should ignore the error, but mark F501 as unused.
-72    |-    from typing import (  # noqa: F501
-   72 |+    from typing import (
-73 73 |         Tuple,  # noqa: F401
-74 74 |     )
-75 75 | 
+69 | 
+70 | def f():
+71 |     # This should ignore the error, but mark F501 as unused.
+   -     from typing import (  # noqa: F501
+72 +     from typing import (
+73 |         Tuple,  # noqa: F401
+74 |     )
+75 | 
 
 F401 [*] `typing.Awaitable` imported but unused
   --> RUF100_1.py:89:24
@@ -117,13 +107,11 @@ F401 [*] `typing.Awaitable` imported but unused
    |                        ^^^^^^^^^
    |
 help: Remove unused import
-
-ℹ Safe fix
-86 86 | 
-87 87 | def f():
-88 88 |     # This should mark F501 as unused.
-89    |-    from typing import Awaitable, AwaitableGenerator  # noqa: F501
-   89 |+    pass  # noqa: F501
+86 | 
+87 | def f():
+88 |     # This should mark F501 as unused.
+   -     from typing import Awaitable, AwaitableGenerator  # noqa: F501
+89 +     pass  # noqa: F501
 
 F401 [*] `typing.AwaitableGenerator` imported but unused
   --> RUF100_1.py:89:35
@@ -134,13 +122,11 @@ F401 [*] `typing.AwaitableGenerator` imported but unused
    |                                   ^^^^^^^^^^^^^^^^^^
    |
 help: Remove unused import
-
-ℹ Safe fix
-86 86 | 
-87 87 | def f():
-88 88 |     # This should mark F501 as unused.
-89    |-    from typing import Awaitable, AwaitableGenerator  # noqa: F501
-   89 |+    pass  # noqa: F501
+86 | 
+87 | def f():
+88 |     # This should mark F501 as unused.
+   -     from typing import Awaitable, AwaitableGenerator  # noqa: F501
+89 +     pass  # noqa: F501
 
 RUF100 [*] Unused `noqa` directive (non-enabled: `F501`)
   --> RUF100_1.py:89:55
@@ -151,10 +137,8 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F501`)
    |                                                       ^^^^^^^^^^^^
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-86 86 | 
-87 87 | def f():
-88 88 |     # This should mark F501 as unused.
-89    |-    from typing import Awaitable, AwaitableGenerator  # noqa: F501
-   89 |+    from typing import Awaitable, AwaitableGenerator
+86 | 
+87 | def f():
+88 |     # This should mark F501 as unused.
+   -     from typing import Awaitable, AwaitableGenerator  # noqa: F501
+89 +     from typing import Awaitable, AwaitableGenerator
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap
index 01c4a00b32..788a7adb39 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap
@@ -8,7 +8,5 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F401`)
   |                   ^^^^^^^^^^^^
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1   |-import itertools  # noqa: F401
-  1 |+import itertools
+  - import itertools  # noqa: F401
+1 + import itertools
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap
index 0f41808525..1b289a01e0 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap
@@ -10,12 +10,10 @@ RUF100 [*] Unused blanket `noqa` directive
 3 | print()  # noqa
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1   |-# noqa
-2 1 | # noqa # comment
-3 2 | print()  # noqa
-4 3 | print()  # noqa # comment
+  - # noqa
+1 | # noqa # comment
+2 | print()  # noqa
+3 | print()  # noqa # comment
 
 RUF100 [*] Unused blanket `noqa` directive
  --> RUF100_3.py:2:1
@@ -27,14 +25,12 @@ RUF100 [*] Unused blanket `noqa` directive
 4 | print()  # noqa # comment
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1 1 | # noqa
-2   |-# noqa # comment
-  2 |+# comment
-3 3 | print()  # noqa
-4 4 | print()  # noqa # comment
-5 5 | print()  # noqa  # comment
+1 | # noqa
+  - # noqa # comment
+2 + # comment
+3 | print()  # noqa
+4 | print()  # noqa # comment
+5 | print()  # noqa  # comment
 
 RUF100 [*] Unused blanket `noqa` directive
  --> RUF100_3.py:3:10
@@ -47,15 +43,13 @@ RUF100 [*] Unused blanket `noqa` directive
 5 | print()  # noqa  # comment
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1 1 | # noqa
-2 2 | # noqa # comment
-3   |-print()  # noqa
-  3 |+print()
-4 4 | print()  # noqa # comment
-5 5 | print()  # noqa  # comment
-6 6 | print()  # noqa comment
+1 | # noqa
+2 | # noqa # comment
+  - print()  # noqa
+3 + print()
+4 | print()  # noqa # comment
+5 | print()  # noqa  # comment
+6 | print()  # noqa comment
 
 RUF100 [*] Unused blanket `noqa` directive
  --> RUF100_3.py:4:10
@@ -68,16 +62,14 @@ RUF100 [*] Unused blanket `noqa` directive
 6 | print()  # noqa comment
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1 1 | # noqa
-2 2 | # noqa # comment
-3 3 | print()  # noqa
-4   |-print()  # noqa # comment
-  4 |+print()  # comment
-5 5 | print()  # noqa  # comment
-6 6 | print()  # noqa comment
-7 7 | print()  # noqa  comment
+1 | # noqa
+2 | # noqa # comment
+3 | print()  # noqa
+  - print()  # noqa # comment
+4 + print()  # comment
+5 | print()  # noqa  # comment
+6 | print()  # noqa comment
+7 | print()  # noqa  comment
 
 RUF100 [*] Unused blanket `noqa` directive
  --> RUF100_3.py:5:10
@@ -90,16 +82,14 @@ RUF100 [*] Unused blanket `noqa` directive
 7 | print()  # noqa  comment
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-2 2 | # noqa # comment
-3 3 | print()  # noqa
-4 4 | print()  # noqa # comment
-5   |-print()  # noqa  # comment
-  5 |+print()  # comment
-6 6 | print()  # noqa comment
-7 7 | print()  # noqa  comment
-8 8 | print(a)  # noqa
+2 | # noqa # comment
+3 | print()  # noqa
+4 | print()  # noqa # comment
+  - print()  # noqa  # comment
+5 + print()  # comment
+6 | print()  # noqa comment
+7 | print()  # noqa  comment
+8 | print(a)  # noqa
 
 RUF100 [*] Unused blanket `noqa` directive
  --> RUF100_3.py:6:10
@@ -112,16 +102,14 @@ RUF100 [*] Unused blanket `noqa` directive
 8 | print(a)  # noqa
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-3 3 | print()  # noqa
-4 4 | print()  # noqa # comment
-5 5 | print()  # noqa  # comment
-6   |-print()  # noqa comment
-  6 |+print()
-7 7 | print()  # noqa  comment
-8 8 | print(a)  # noqa
-9 9 | print(a)  # noqa # comment
+3 | print()  # noqa
+4 | print()  # noqa # comment
+5 | print()  # noqa  # comment
+  - print()  # noqa comment
+6 + print()
+7 | print()  # noqa  comment
+8 | print(a)  # noqa
+9 | print(a)  # noqa # comment
 
 RUF100 [*] Unused blanket `noqa` directive
  --> RUF100_3.py:7:10
@@ -134,16 +122,14 @@ RUF100 [*] Unused blanket `noqa` directive
 9 | print(a)  # noqa # comment
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-4 4 | print()  # noqa # comment
-5 5 | print()  # noqa  # comment
-6 6 | print()  # noqa comment
-7   |-print()  # noqa  comment
-  7 |+print()
-8 8 | print(a)  # noqa
-9 9 | print(a)  # noqa # comment
-10 10 | print(a)  # noqa  # comment
+4  | print()  # noqa # comment
+5  | print()  # noqa  # comment
+6  | print()  # noqa comment
+   - print()  # noqa  comment
+7  + print()
+8  | print(a)  # noqa
+9  | print(a)  # noqa # comment
+10 | print(a)  # noqa  # comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:14:1
@@ -156,15 +142,13 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 16 | print()  # noqa: E501, F821
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-11 11 | print(a)  # noqa comment
-12 12 | print(a)  # noqa  comment
-13 13 | 
-14    |-# noqa: E501, F821
-15 14 | # noqa: E501, F821 # comment
-16 15 | print()  # noqa: E501, F821
-17 16 | print()  # noqa: E501, F821 # comment
+11 | print(a)  # noqa comment
+12 | print(a)  # noqa  comment
+13 | 
+   - # noqa: E501, F821
+14 | # noqa: E501, F821 # comment
+15 | print()  # noqa: E501, F821
+16 | print()  # noqa: E501, F821 # comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:15:1
@@ -176,16 +160,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 17 | print()  # noqa: E501, F821 # comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-12 12 | print(a)  # noqa  comment
-13 13 | 
-14 14 | # noqa: E501, F821
-15    |-# noqa: E501, F821 # comment
-   15 |+# comment
-16 16 | print()  # noqa: E501, F821
-17 17 | print()  # noqa: E501, F821 # comment
-18 18 | print()  # noqa: E501, F821  # comment
+12 | print(a)  # noqa  comment
+13 | 
+14 | # noqa: E501, F821
+   - # noqa: E501, F821 # comment
+15 + # comment
+16 | print()  # noqa: E501, F821
+17 | print()  # noqa: E501, F821 # comment
+18 | print()  # noqa: E501, F821  # comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:16:10
@@ -198,16 +180,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 18 | print()  # noqa: E501, F821  # comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-13 13 | 
-14 14 | # noqa: E501, F821
-15 15 | # noqa: E501, F821 # comment
-16    |-print()  # noqa: E501, F821
-   16 |+print()
-17 17 | print()  # noqa: E501, F821 # comment
-18 18 | print()  # noqa: E501, F821  # comment
-19 19 | print()  # noqa: E501, F821 comment
+13 | 
+14 | # noqa: E501, F821
+15 | # noqa: E501, F821 # comment
+   - print()  # noqa: E501, F821
+16 + print()
+17 | print()  # noqa: E501, F821 # comment
+18 | print()  # noqa: E501, F821  # comment
+19 | print()  # noqa: E501, F821 comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:17:10
@@ -220,16 +200,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 19 | print()  # noqa: E501, F821 comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-14 14 | # noqa: E501, F821
-15 15 | # noqa: E501, F821 # comment
-16 16 | print()  # noqa: E501, F821
-17    |-print()  # noqa: E501, F821 # comment
-   17 |+print()  # comment
-18 18 | print()  # noqa: E501, F821  # comment
-19 19 | print()  # noqa: E501, F821 comment
-20 20 | print()  # noqa: E501, F821  comment
+14 | # noqa: E501, F821
+15 | # noqa: E501, F821 # comment
+16 | print()  # noqa: E501, F821
+   - print()  # noqa: E501, F821 # comment
+17 + print()  # comment
+18 | print()  # noqa: E501, F821  # comment
+19 | print()  # noqa: E501, F821 comment
+20 | print()  # noqa: E501, F821  comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:18:10
@@ -242,16 +220,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 20 | print()  # noqa: E501, F821  comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-15 15 | # noqa: E501, F821 # comment
-16 16 | print()  # noqa: E501, F821
-17 17 | print()  # noqa: E501, F821 # comment
-18    |-print()  # noqa: E501, F821  # comment
-   18 |+print()  # comment
-19 19 | print()  # noqa: E501, F821 comment
-20 20 | print()  # noqa: E501, F821  comment
-21 21 | print(a)  # noqa: E501, F821
+15 | # noqa: E501, F821 # comment
+16 | print()  # noqa: E501, F821
+17 | print()  # noqa: E501, F821 # comment
+   - print()  # noqa: E501, F821  # comment
+18 + print()  # comment
+19 | print()  # noqa: E501, F821 comment
+20 | print()  # noqa: E501, F821  comment
+21 | print(a)  # noqa: E501, F821
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:19:10
@@ -264,16 +240,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 21 | print(a)  # noqa: E501, F821
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-16 16 | print()  # noqa: E501, F821
-17 17 | print()  # noqa: E501, F821 # comment
-18 18 | print()  # noqa: E501, F821  # comment
-19    |-print()  # noqa: E501, F821 comment
-   19 |+print()
-20 20 | print()  # noqa: E501, F821  comment
-21 21 | print(a)  # noqa: E501, F821
-22 22 | print(a)  # noqa: E501, F821 # comment
+16 | print()  # noqa: E501, F821
+17 | print()  # noqa: E501, F821 # comment
+18 | print()  # noqa: E501, F821  # comment
+   - print()  # noqa: E501, F821 comment
+19 + print()
+20 | print()  # noqa: E501, F821  comment
+21 | print(a)  # noqa: E501, F821
+22 | print(a)  # noqa: E501, F821 # comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
   --> RUF100_3.py:20:10
@@ -286,16 +260,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`)
 22 | print(a)  # noqa: E501, F821 # comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-17 17 | print()  # noqa: E501, F821 # comment
-18 18 | print()  # noqa: E501, F821  # comment
-19 19 | print()  # noqa: E501, F821 comment
-20    |-print()  # noqa: E501, F821  comment
-   20 |+print()
-21 21 | print(a)  # noqa: E501, F821
-22 22 | print(a)  # noqa: E501, F821 # comment
-23 23 | print(a)  # noqa: E501, F821  # comment
+17 | print()  # noqa: E501, F821 # comment
+18 | print()  # noqa: E501, F821  # comment
+19 | print()  # noqa: E501, F821 comment
+   - print()  # noqa: E501, F821  comment
+20 + print()
+21 | print(a)  # noqa: E501, F821
+22 | print(a)  # noqa: E501, F821 # comment
+23 | print(a)  # noqa: E501, F821  # comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:21:11
@@ -308,16 +280,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 23 | print(a)  # noqa: E501, F821  # comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-18 18 | print()  # noqa: E501, F821  # comment
-19 19 | print()  # noqa: E501, F821 comment
-20 20 | print()  # noqa: E501, F821  comment
-21    |-print(a)  # noqa: E501, F821
-   21 |+print(a)  # noqa: F821
-22 22 | print(a)  # noqa: E501, F821 # comment
-23 23 | print(a)  # noqa: E501, F821  # comment
-24 24 | print(a)  # noqa: E501, F821 comment
+18 | print()  # noqa: E501, F821  # comment
+19 | print()  # noqa: E501, F821 comment
+20 | print()  # noqa: E501, F821  comment
+   - print(a)  # noqa: E501, F821
+21 + print(a)  # noqa: F821
+22 | print(a)  # noqa: E501, F821 # comment
+23 | print(a)  # noqa: E501, F821  # comment
+24 | print(a)  # noqa: E501, F821 comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:22:11
@@ -330,16 +300,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 24 | print(a)  # noqa: E501, F821 comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-19 19 | print()  # noqa: E501, F821 comment
-20 20 | print()  # noqa: E501, F821  comment
-21 21 | print(a)  # noqa: E501, F821
-22    |-print(a)  # noqa: E501, F821 # comment
-   22 |+print(a)  # noqa: F821 # comment
-23 23 | print(a)  # noqa: E501, F821  # comment
-24 24 | print(a)  # noqa: E501, F821 comment
-25 25 | print(a)  # noqa: E501, F821  comment
+19 | print()  # noqa: E501, F821 comment
+20 | print()  # noqa: E501, F821  comment
+21 | print(a)  # noqa: E501, F821
+   - print(a)  # noqa: E501, F821 # comment
+22 + print(a)  # noqa: F821 # comment
+23 | print(a)  # noqa: E501, F821  # comment
+24 | print(a)  # noqa: E501, F821 comment
+25 | print(a)  # noqa: E501, F821  comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:23:11
@@ -352,16 +320,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 25 | print(a)  # noqa: E501, F821  comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-20 20 | print()  # noqa: E501, F821  comment
-21 21 | print(a)  # noqa: E501, F821
-22 22 | print(a)  # noqa: E501, F821 # comment
-23    |-print(a)  # noqa: E501, F821  # comment
-   23 |+print(a)  # noqa: F821  # comment
-24 24 | print(a)  # noqa: E501, F821 comment
-25 25 | print(a)  # noqa: E501, F821  comment
-26 26 | print(a)  # noqa: E501,,F821  comment
+20 | print()  # noqa: E501, F821  comment
+21 | print(a)  # noqa: E501, F821
+22 | print(a)  # noqa: E501, F821 # comment
+   - print(a)  # noqa: E501, F821  # comment
+23 + print(a)  # noqa: F821  # comment
+24 | print(a)  # noqa: E501, F821 comment
+25 | print(a)  # noqa: E501, F821  comment
+26 | print(a)  # noqa: E501,,F821  comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:24:11
@@ -374,16 +340,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 26 | print(a)  # noqa: E501,,F821  comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-21 21 | print(a)  # noqa: E501, F821
-22 22 | print(a)  # noqa: E501, F821 # comment
-23 23 | print(a)  # noqa: E501, F821  # comment
-24    |-print(a)  # noqa: E501, F821 comment
-   24 |+print(a)  # noqa: F821 comment
-25 25 | print(a)  # noqa: E501, F821  comment
-26 26 | print(a)  # noqa: E501,,F821  comment
-27 27 | print(a)  # noqa: E501, ,F821  comment
+21 | print(a)  # noqa: E501, F821
+22 | print(a)  # noqa: E501, F821 # comment
+23 | print(a)  # noqa: E501, F821  # comment
+   - print(a)  # noqa: E501, F821 comment
+24 + print(a)  # noqa: F821 comment
+25 | print(a)  # noqa: E501, F821  comment
+26 | print(a)  # noqa: E501,,F821  comment
+27 | print(a)  # noqa: E501, ,F821  comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:25:11
@@ -396,16 +360,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 27 | print(a)  # noqa: E501, ,F821  comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-22 22 | print(a)  # noqa: E501, F821 # comment
-23 23 | print(a)  # noqa: E501, F821  # comment
-24 24 | print(a)  # noqa: E501, F821 comment
-25    |-print(a)  # noqa: E501, F821  comment
-   25 |+print(a)  # noqa: F821  comment
-26 26 | print(a)  # noqa: E501,,F821  comment
-27 27 | print(a)  # noqa: E501, ,F821  comment
-28 28 | print(a)  # noqa: E501 F821  comment
+22 | print(a)  # noqa: E501, F821 # comment
+23 | print(a)  # noqa: E501, F821  # comment
+24 | print(a)  # noqa: E501, F821 comment
+   - print(a)  # noqa: E501, F821  comment
+25 + print(a)  # noqa: F821  comment
+26 | print(a)  # noqa: E501,,F821  comment
+27 | print(a)  # noqa: E501, ,F821  comment
+28 | print(a)  # noqa: E501 F821  comment
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:26:11
@@ -418,16 +380,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 28 | print(a)  # noqa: E501 F821  comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-23 23 | print(a)  # noqa: E501, F821  # comment
-24 24 | print(a)  # noqa: E501, F821 comment
-25 25 | print(a)  # noqa: E501, F821  comment
-26    |-print(a)  # noqa: E501,,F821  comment
-   26 |+print(a)  # noqa: F821  comment
-27 27 | print(a)  # noqa: E501, ,F821  comment
-28 28 | print(a)  # noqa: E501 F821  comment
-29 29 | 
+23 | print(a)  # noqa: E501, F821  # comment
+24 | print(a)  # noqa: E501, F821 comment
+25 | print(a)  # noqa: E501, F821  comment
+   - print(a)  # noqa: E501,,F821  comment
+26 + print(a)  # noqa: F821  comment
+27 | print(a)  # noqa: E501, ,F821  comment
+28 | print(a)  # noqa: E501 F821  comment
+29 | 
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:27:11
@@ -439,16 +399,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 28 | print(a)  # noqa: E501 F821  comment
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-24 24 | print(a)  # noqa: E501, F821 comment
-25 25 | print(a)  # noqa: E501, F821  comment
-26 26 | print(a)  # noqa: E501,,F821  comment
-27    |-print(a)  # noqa: E501, ,F821  comment
-   27 |+print(a)  # noqa: F821  comment
-28 28 | print(a)  # noqa: E501 F821  comment
-29 29 | 
-30 30 | print(a)  # comment with unicode µ    # noqa: E501
+24 | print(a)  # noqa: E501, F821 comment
+25 | print(a)  # noqa: E501, F821  comment
+26 | print(a)  # noqa: E501,,F821  comment
+   - print(a)  # noqa: E501, ,F821  comment
+27 + print(a)  # noqa: F821  comment
+28 | print(a)  # noqa: E501 F821  comment
+29 | 
+30 | print(a)  # comment with unicode µ    # noqa: E501
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:28:11
@@ -461,16 +419,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 30 | print(a)  # comment with unicode µ    # noqa: E501
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-25 25 | print(a)  # noqa: E501, F821  comment
-26 26 | print(a)  # noqa: E501,,F821  comment
-27 27 | print(a)  # noqa: E501, ,F821  comment
-28    |-print(a)  # noqa: E501 F821  comment
-   28 |+print(a)  # noqa: F821  comment
-29 29 | 
-30 30 | print(a)  # comment with unicode µ    # noqa: E501
-31 31 | print(a)  # comment with unicode µ    # noqa: E501, F821
+25 | print(a)  # noqa: E501, F821  comment
+26 | print(a)  # noqa: E501,,F821  comment
+27 | print(a)  # noqa: E501, ,F821  comment
+   - print(a)  # noqa: E501 F821  comment
+28 + print(a)  # noqa: F821  comment
+29 | 
+30 | print(a)  # comment with unicode µ    # noqa: E501
+31 | print(a)  # comment with unicode µ    # noqa: E501, F821
 
 F821 Undefined name `a`
   --> RUF100_3.py:30:7
@@ -492,14 +448,12 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 31 | print(a)  # comment with unicode µ    # noqa: E501, F821
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-27 27 | print(a)  # noqa: E501, ,F821  comment
-28 28 | print(a)  # noqa: E501 F821  comment
-29 29 | 
-30    |-print(a)  # comment with unicode µ    # noqa: E501
-   30 |+print(a)  # comment with unicode µ
-31 31 | print(a)  # comment with unicode µ    # noqa: E501, F821
+27 | print(a)  # noqa: E501, ,F821  comment
+28 | print(a)  # noqa: E501 F821  comment
+29 | 
+   - print(a)  # comment with unicode µ    # noqa: E501
+30 + print(a)  # comment with unicode µ
+31 | print(a)  # comment with unicode µ    # noqa: E501, F821
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_3.py:31:39
@@ -509,10 +463,8 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
    |                                       ^^^^^^^^^^^^^^^^^^
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-28 28 | print(a)  # noqa: E501 F821  comment
-29 29 | 
-30 30 | print(a)  # comment with unicode µ    # noqa: E501
-31    |-print(a)  # comment with unicode µ    # noqa: E501, F821
-   31 |+print(a)  # comment with unicode µ    # noqa: F821
+28 | print(a)  # noqa: E501 F821  comment
+29 | 
+30 | print(a)  # comment with unicode µ    # noqa: E501
+   - print(a)  # comment with unicode µ    # noqa: E501, F821
+31 + print(a)  # comment with unicode µ    # noqa: F821
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap
index e86fb19ddb..0ccb447ee6 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/ruff/mod.rs
 ---
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
  --> RUF100_5.py:7:5
   |
 5 |     # "key1": 123,  # noqa: ERA001
@@ -11,17 +11,16 @@ ERA001 Found commented-out code
 8 | }
   |
 help: Remove commented-out code
+4 | dictionary = {
+5 |     # "key1": 123,  # noqa: ERA001
+6 |     # "key2": 456,  # noqa
+  -     # "key3": 789,
+7 | }
+8 | 
+9 | 
+note: This is a display-only fix and is likely to be incorrect
 
-ℹ Display-only fix
-4 4 | dictionary = {
-5 5 |     # "key1": 123,  # noqa: ERA001
-6 6 |     # "key2": 456,  # noqa
-7   |-    # "key3": 789,
-8 7 | }
-9 8 | 
-10 9 | 
-
-ERA001 Found commented-out code
+ERA001 [*] Found commented-out code
   --> RUF100_5.py:11:1
    |
 11 | #import os  # noqa: E501
@@ -30,15 +29,14 @@ ERA001 Found commented-out code
 13 | def f():
    |
 help: Remove commented-out code
-
-ℹ Display-only fix
-8  8  | }
-9  9  | 
-10 10 | 
-11    |-#import os  # noqa: E501
-12 11 | 
-13 12 | def f():
-14 13 |     data = 1
+8  | }
+9  | 
+10 | 
+   - #import os  # noqa: E501
+11 | 
+12 | def f():
+13 |     data = 1
+note: This is a display-only fix and is likely to be incorrect
 
 RUF100 [*] Unused `noqa` directive (unused: `E501`)
   --> RUF100_5.py:11:13
@@ -49,16 +47,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 13 | def f():
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-8  8  | }
-9  9  | 
-10 10 | 
-11    |-#import os  # noqa: E501
-   11 |+#import os
-12 12 | 
-13 13 | def f():
-14 14 |     data = 1
+8  | }
+9  | 
+10 | 
+   - #import os  # noqa: E501
+11 + #import os
+12 | 
+13 | def f():
+14 |     data = 1
 
 RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`)
   --> RUF100_5.py:16:18
@@ -71,16 +67,14 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`)
 18 | def f():
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-13 13 | def f():
-14 14 |     data = 1
-15 15 |     # line below should autofix to `return data  # fmt: skip`
-16    |-    return data  # noqa: RET504 # fmt: skip
-   16 |+    return data  # fmt: skip
-17 17 | 
-18 18 | def f():
-19 19 |     data = 1
+13 | def f():
+14 |     data = 1
+15 |     # line below should autofix to `return data  # fmt: skip`
+   -     return data  # noqa: RET504 # fmt: skip
+16 +     return data  # fmt: skip
+17 | 
+18 | def f():
+19 |     data = 1
 
 RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`)
   --> RUF100_5.py:21:18
@@ -91,10 +85,8 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`)
    |                  ^^^^^^^^^^^^^^
    |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-18 18 | def f():
-19 19 |     data = 1
-20 20 |     # line below should autofix to `return data`
-21    |-    return data  # noqa: RET504 - intentional incorrect noqa, will be removed
-   21 |+    return data
+18 | def f():
+19 |     data = 1
+20 |     # line below should autofix to `return data`
+   -     return data  # noqa: RET504 - intentional incorrect noqa, will be removed
+21 +     return data
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap
index 89f28d6aa6..8127b974c0 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap
@@ -9,10 +9,9 @@ F841 [*] Local variable `x` is assigned to but never used
   |     ^
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-5 5 | 
-6 6 | 
-7 7 | def f():
-8   |-    x = 1
-  8 |+    pass
+5 | 
+6 | 
+7 | def f():
+  -     x = 1
+8 +     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap
index c51d812458..c1a52d4ea9 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap
@@ -8,7 +8,5 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F841`)
   | ^^^^^^^^^^^^^^^^^^
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1   |-# ruff: noqa: F841 -- intentional unused file directive; will be removed
-  1 |+
+  - # ruff: noqa: F841 -- intentional unused file directive; will be removed
+1 +
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap
index cf8ab449b9..79ec862b59 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap
@@ -9,13 +9,11 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`)
 2 | # ruff: noqa: E701, F541 -- unused followed by used code
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1   |-# flake8: noqa: F841, E501 -- used followed by unused code
-  1 |+# flake8: noqa: F841 -- used followed by unused code
-2 2 | # ruff: noqa: E701, F541 -- unused followed by used code
-3 3 | 
-4 4 | 
+  - # flake8: noqa: F841, E501 -- used followed by unused code
+1 + # flake8: noqa: F841 -- used followed by unused code
+2 | # ruff: noqa: E701, F541 -- unused followed by used code
+3 | 
+4 | 
 
 RUF100 [*] Unused `noqa` directive (non-enabled: `E701`)
  --> RUF100_7.py:2:1
@@ -25,11 +23,9 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `E701`)
   | ^^^^^^^^^^^^^^^^^^^^^^^^
   |
 help: Remove unused `noqa` directive
-
-ℹ Safe fix
-1 1 | # flake8: noqa: F841, E501 -- used followed by unused code
-2   |-# ruff: noqa: E701, F541 -- unused followed by used code
-  2 |+# ruff: noqa: F541 -- unused followed by used code
-3 3 | 
-4 4 | 
-5 5 | def a():
+1 | # flake8: noqa: F841, E501 -- used followed by unused code
+  - # ruff: noqa: E701, F541 -- unused followed by used code
+2 + # ruff: noqa: F541 -- unused followed by used code
+3 | 
+4 | 
+5 | def a():
diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap
index bcfd68f1b4..66c3a29c3c 100644
--- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap
+++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap
@@ -8,12 +8,10 @@ F401 [*] `os` imported but unused
   |        ^^
   |
 help: Remove unused import: `os`
-
-ℹ Safe fix
-1   |-import os  # ruff: noqa: F401
-2 1 | 
-3 2 | 
-4 3 | def f():
+  - import os  # ruff: noqa: F401
+1 | 
+2 | 
+3 | def f():
 
 F841 [*] Local variable `x` is assigned to but never used
  --> ruff_noqa_invalid.py:5:5
@@ -23,10 +21,9 @@ F841 [*] Local variable `x` is assigned to but never used
   |     ^
   |
 help: Remove assignment to unused variable `x`
-
-ℹ Unsafe fix
-2 2 | 
-3 3 | 
-4 4 | def f():
-5   |-    x = 1
-  5 |+    pass
+2 | 
+3 | 
+4 | def f():
+  -     x = 1
+5 +     pass
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/error_instead_of_exception.rs b/crates/ruff_linter/src/rules/tryceratops/rules/error_instead_of_exception.rs
index ebc2d40a75..289c318fd6 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/error_instead_of_exception.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/error_instead_of_exception.rs
@@ -52,6 +52,7 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `logging.exception`](https://docs.python.org/3/library/logging.html#logging.exception)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct ErrorInsteadOfException;
 
 impl Violation for ErrorInsteadOfException {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_args.rs b/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_args.rs
index c359367ded..bea012e05c 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_args.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_args.rs
@@ -44,6 +44,7 @@ use crate::checkers::ast::Checker;
 ///         raise CantBeNegative(x)
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct RaiseVanillaArgs;
 
 impl Violation for RaiseVanillaArgs {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_class.rs b/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_class.rs
index 6549f3caad..3de68c5f30 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_class.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/raise_vanilla_class.rs
@@ -53,6 +53,7 @@ use crate::checkers::ast::Checker;
 ///         logger.error("Oops")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.236")]
 pub(crate) struct RaiseVanillaClass;
 
 impl Violation for RaiseVanillaClass {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/raise_within_try.rs b/crates/ruff_linter/src/rules/tryceratops/rules/raise_within_try.rs
index ce14896377..cacab604c7 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/raise_within_try.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/raise_within_try.rs
@@ -50,6 +50,7 @@ use crate::checkers::ast::Checker;
 ///         raise
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.233")]
 pub(crate) struct RaiseWithinTry;
 
 impl Violation for RaiseWithinTry {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/reraise_no_cause.rs b/crates/ruff_linter/src/rules/tryceratops/rules/reraise_no_cause.rs
index a50d64136e..320869e13c 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/reraise_no_cause.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/reraise_no_cause.rs
@@ -37,6 +37,7 @@ use crate::Violation;
 ///
 /// [B904]: https://docs.astral.sh/ruff/rules/raise-without-from-inside-except/
 #[derive(ViolationMetadata)]
+#[violation_metadata(removed_since = "v0.2.0")]
 pub(crate) struct ReraiseNoCause;
 
 /// TRY200
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/try_consider_else.rs b/crates/ruff_linter/src/rules/tryceratops/rules/try_consider_else.rs
index feb5b7eb6c..317777e9fb 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/try_consider_else.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/try_consider_else.rs
@@ -29,6 +29,7 @@ use crate::checkers::ast::Checker;
 ///         return rec
 ///     except ZeroDivisionError:
 ///         logging.exception("Exception occurred")
+///         raise
 /// ```
 ///
 /// Use instead:
@@ -41,6 +42,7 @@ use crate::checkers::ast::Checker;
 ///         rec = 1 / n
 ///     except ZeroDivisionError:
 ///         logging.exception("Exception occurred")
+///         raise
 ///     else:
 ///         print(f"reciprocal of {n} is {rec}")
 ///         return rec
@@ -49,6 +51,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: Errors and Exceptions](https://docs.python.org/3/tutorial/errors.html)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.229")]
 pub(crate) struct TryConsiderElse;
 
 impl Violation for TryConsiderElse {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/type_check_without_type_error.rs b/crates/ruff_linter/src/rules/tryceratops/rules/type_check_without_type_error.rs
index 59eedace93..ee8b06cd90 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/type_check_without_type_error.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/type_check_without_type_error.rs
@@ -36,6 +36,7 @@ use crate::checkers::ast::Checker;
 /// ## References
 /// - [Python documentation: `TypeError`](https://docs.python.org/3/library/exceptions.html#TypeError)
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.230")]
 pub(crate) struct TypeCheckWithoutTypeError;
 
 impl Violation for TypeCheckWithoutTypeError {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs b/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs
index f52a3e95c2..d9023378ec 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs
@@ -29,6 +29,7 @@ use crate::checkers::ast::Checker;
 ///     bar()
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "0.7.0")]
 pub(crate) struct UselessTryExcept;
 
 impl Violation for UselessTryExcept {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/verbose_log_message.rs b/crates/ruff_linter/src/rules/tryceratops/rules/verbose_log_message.rs
index 9b8c6619c8..1c107065f4 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/verbose_log_message.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/verbose_log_message.rs
@@ -34,6 +34,7 @@ use crate::rules::tryceratops::helpers::LoggerCandidateVisitor;
 ///     logger.exception("Found an error")
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.250")]
 pub(crate) struct VerboseLogMessage;
 
 impl Violation for VerboseLogMessage {
diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/verbose_raise.rs b/crates/ruff_linter/src/rules/tryceratops/rules/verbose_raise.rs
index c330632c97..033f9a93f9 100644
--- a/crates/ruff_linter/src/rules/tryceratops/rules/verbose_raise.rs
+++ b/crates/ruff_linter/src/rules/tryceratops/rules/verbose_raise.rs
@@ -36,6 +36,7 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 /// This rule's fix is marked as unsafe, as it doesn't properly handle bound
 /// exceptions that are shadowed between the `except` and `raise` statements.
 #[derive(ViolationMetadata)]
+#[violation_metadata(stable_since = "v0.0.231")]
 pub(crate) struct VerboseRaise;
 
 impl AlwaysFixableViolation for VerboseRaise {
diff --git a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap
index 8afdb7dffe..82b0baf37d 100644
--- a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap
+++ b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap
@@ -12,16 +12,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
 15 |         if True:
    |
 help: Replace with `exception`
-
-ℹ Safe fix
-10 10 |     try:
-11 11 |         a = 1
-12 12 |     except Exception:
-13    |-        logging.error("Context message here")
-   13 |+        logging.exception("Context message here")
-14 14 | 
-15 15 |         if True:
-16 16 |             logging.error("Context message here")
+10 |     try:
+11 |         a = 1
+12 |     except Exception:
+   -         logging.error("Context message here")
+13 +         logging.exception("Context message here")
+14 | 
+15 |         if True:
+16 |             logging.error("Context message here")
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:16:13
@@ -31,16 +29,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `exception`
-
-ℹ Safe fix
-13 13 |         logging.error("Context message here")
-14 14 | 
-15 15 |         if True:
-16    |-            logging.error("Context message here")
-   16 |+            logging.exception("Context message here")
-17 17 | 
-18 18 | 
-19 19 | def bad():
+13 |         logging.error("Context message here")
+14 | 
+15 |         if True:
+   -             logging.error("Context message here")
+16 +             logging.exception("Context message here")
+17 | 
+18 | 
+19 | def bad():
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:27:9
@@ -53,16 +49,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
 29 |         if True:
    |
 help: Replace with `exception`
-
-ℹ Unsafe fix
-24 24 |     try:
-25 25 |         a = 1
-26 26 |     except Exception:
-27    |-        logger.error("Context message here")
-   27 |+        logger.exception("Context message here")
-28 28 | 
-29 29 |         if True:
-30 30 |             logger.error("Context message here")
+24 |     try:
+25 |         a = 1
+26 |     except Exception:
+   -         logger.error("Context message here")
+27 +         logger.exception("Context message here")
+28 | 
+29 |         if True:
+30 |             logger.error("Context message here")
+note: This is an unsafe fix and may change runtime behavior
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:30:13
@@ -72,16 +67,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `exception`
-
-ℹ Unsafe fix
-27 27 |         logger.error("Context message here")
-28 28 | 
-29 29 |         if True:
-30    |-            logger.error("Context message here")
-   30 |+            logger.exception("Context message here")
-31 31 | 
-32 32 | 
-33 33 | def bad():
+27 |         logger.error("Context message here")
+28 | 
+29 |         if True:
+   -             logger.error("Context message here")
+30 +             logger.exception("Context message here")
+31 | 
+32 | 
+33 | def bad():
+note: This is an unsafe fix and may change runtime behavior
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:37:9
@@ -94,16 +88,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
 39 |         if True:
    |
 help: Replace with `exception`
-
-ℹ Unsafe fix
-34 34 |     try:
-35 35 |         a = 1
-36 36 |     except Exception:
-37    |-        log.error("Context message here")
-   37 |+        log.exception("Context message here")
-38 38 | 
-39 39 |         if True:
-40 40 |             log.error("Context message here")
+34 |     try:
+35 |         a = 1
+36 |     except Exception:
+   -         log.error("Context message here")
+37 +         log.exception("Context message here")
+38 | 
+39 |         if True:
+40 |             log.error("Context message here")
+note: This is an unsafe fix and may change runtime behavior
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:40:13
@@ -113,16 +106,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `exception`
-
-ℹ Unsafe fix
-37 37 |         log.error("Context message here")
-38 38 | 
-39 39 |         if True:
-40    |-            log.error("Context message here")
-   40 |+            log.exception("Context message here")
-41 41 | 
-42 42 | 
-43 43 | def bad():
+37 |         log.error("Context message here")
+38 | 
+39 |         if True:
+   -             log.error("Context message here")
+40 +             log.exception("Context message here")
+41 | 
+42 | 
+43 | def bad():
+note: This is an unsafe fix and may change runtime behavior
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:47:9
@@ -135,16 +127,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
 49 |         if True:
    |
 help: Replace with `exception`
-
-ℹ Unsafe fix
-44 44 |     try:
-45 45 |         a = 1
-46 46 |     except Exception:
-47    |-        self.logger.error("Context message here")
-   47 |+        self.logger.exception("Context message here")
-48 48 | 
-49 49 |         if True:
-50 50 |             self.logger.error("Context message here")
+44 |     try:
+45 |         a = 1
+46 |     except Exception:
+   -         self.logger.error("Context message here")
+47 +         self.logger.exception("Context message here")
+48 | 
+49 |         if True:
+50 |             self.logger.error("Context message here")
+note: This is an unsafe fix and may change runtime behavior
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
   --> TRY400.py:50:13
@@ -154,16 +145,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Replace with `exception`
-
-ℹ Unsafe fix
-47 47 |         self.logger.error("Context message here")
-48 48 | 
-49 49 |         if True:
-50    |-            self.logger.error("Context message here")
-   50 |+            self.logger.exception("Context message here")
-51 51 | 
-52 52 | 
-53 53 | def good():
+47 |         self.logger.error("Context message here")
+48 | 
+49 |         if True:
+   -             self.logger.error("Context message here")
+50 +             self.logger.exception("Context message here")
+51 | 
+52 | 
+53 | def good():
+note: This is an unsafe fix and may change runtime behavior
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
    --> TRY400.py:100:9
@@ -176,16 +166,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
 102 |         if True:
     |
 help: Replace with `exception`
-
-ℹ Safe fix
-97  97  |     try:
-98  98  |         a = 1
-99  99  |     except Exception:
-100     |-        error("Context message here")
-    100 |+        exception("Context message here")
-101 101 | 
-102 102 |         if True:
-103 103 |             error("Context message here")
+97  |     try:
+98  |         a = 1
+99  |     except Exception:
+    -         error("Context message here")
+100 +         exception("Context message here")
+101 | 
+102 |         if True:
+103 |             error("Context message here")
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
    --> TRY400.py:103:13
@@ -195,16 +183,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace with `exception`
-
-ℹ Safe fix
-100 100 |         error("Context message here")
-101 101 | 
-102 102 |         if True:
-103     |-            error("Context message here")
-    103 |+            exception("Context message here")
-104 104 | 
-105 105 | 
-106 106 | def good():
+100 |         error("Context message here")
+101 | 
+102 |         if True:
+    -             error("Context message here")
+103 +             exception("Context message here")
+104 | 
+105 | 
+106 | def good():
 
 TRY400 [*] Use `logging.exception` instead of `logging.error`
    --> TRY400.py:143:13
@@ -215,10 +201,8 @@ TRY400 [*] Use `logging.exception` instead of `logging.error`
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Replace with `exception`
-
-ℹ Safe fix
-140 140 |         try:
-141 141 |             b = 2
-142 142 |         except Exception:
-143     |-            error("Context message here")
-    143 |+            exception("Context message here")
+140 |         try:
+141 |             b = 2
+142 |         except Exception:
+    -             error("Context message here")
+143 +             exception("Context message here")
diff --git a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap
index 59290aae78..35e96d834d 100644
--- a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap
+++ b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap
@@ -10,16 +10,15 @@ TRY201 [*] Use `raise` without specifying exception name
    |               ^
    |
 help: Remove exception name
-
-ℹ Unsafe fix
-17 17 |         process()
-18 18 |     except MyException as e:
-19 19 |         logger.exception("process failed")
-20    |-        raise e
-   20 |+        raise
-21 21 | 
-22 22 | 
-23 23 | def good():
+17 |         process()
+18 |     except MyException as e:
+19 |         logger.exception("process failed")
+   -         raise e
+20 +         raise
+21 | 
+22 | 
+23 | def good():
+note: This is an unsafe fix and may change runtime behavior
 
 TRY201 [*] Use `raise` without specifying exception name
   --> TRY201.py:63:19
@@ -30,16 +29,15 @@ TRY201 [*] Use `raise` without specifying exception name
    |                   ^
    |
 help: Remove exception name
-
-ℹ Unsafe fix
-60 60 |     except MyException as e:
-61 61 |         logger.exception("process failed")
-62 62 |         if True:
-63    |-            raise e
-   63 |+            raise
-64 64 | 
-65 65 | 
-66 66 | def bad_that_needs_recursion_2():
+60 |     except MyException as e:
+61 |         logger.exception("process failed")
+62 |         if True:
+   -             raise e
+63 +             raise
+64 | 
+65 | 
+66 | def bad_that_needs_recursion_2():
+note: This is an unsafe fix and may change runtime behavior
 
 TRY201 [*] Use `raise` without specifying exception name
   --> TRY201.py:74:23
@@ -49,10 +47,9 @@ TRY201 [*] Use `raise` without specifying exception name
    |                       ^
    |
 help: Remove exception name
-
-ℹ Unsafe fix
-71 71 |         if True:
-72 72 | 
-73 73 |             def foo():
-74    |-                raise e
-   74 |+                raise
+71 |         if True:
+72 | 
+73 |             def foo():
+   -                 raise e
+74 +                 raise
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs
index 4f0aa79194..b94e4edafb 100644
--- a/crates/ruff_linter/src/settings/mod.rs
+++ b/crates/ruff_linter/src/settings/mod.rs
@@ -475,11 +475,6 @@ impl LinterSettings {
             .is_match(path)
             .map_or(self.unresolved_target_version, TargetVersion::from)
     }
-
-    pub fn future_annotations(&self) -> bool {
-        // TODO(brent) we can just access the field directly once this is stabilized.
-        self.future_annotations && crate::preview::is_add_future_annotations_imports_enabled(self)
-    }
 }
 
 impl Default for LinterSettings {
diff --git a/crates/ruff_linter/src/settings/types.rs b/crates/ruff_linter/src/settings/types.rs
index a72e80284a..05cd13909b 100644
--- a/crates/ruff_linter/src/settings/types.rs
+++ b/crates/ruff_linter/src/settings/types.rs
@@ -9,6 +9,7 @@ use anyhow::{Context, Result, bail};
 use globset::{Glob, GlobMatcher, GlobSet, GlobSetBuilder};
 use log::debug;
 use pep440_rs::{VersionSpecifier, VersionSpecifiers};
+use ruff_db::diagnostic::DiagnosticFormat;
 use rustc_hash::FxHashMap;
 use serde::{Deserialize, Deserializer, Serialize, de};
 use strum_macros::EnumIter;
@@ -534,6 +535,20 @@ pub enum OutputFormat {
     Sarif,
 }
 
+impl OutputFormat {
+    /// Returns `true` if this format is intended for users to read directly, in contrast to
+    /// machine-readable or structured formats.
+    ///
+    /// This can be used to check whether information beyond the diagnostics, such as a header or
+    /// `Found N diagnostics` footer, should be included.
+    pub const fn is_human_readable(&self) -> bool {
+        matches!(
+            self,
+            OutputFormat::Full | OutputFormat::Concise | OutputFormat::Grouped
+        )
+    }
+}
+
 impl Display for OutputFormat {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -553,6 +568,34 @@ impl Display for OutputFormat {
     }
 }
 
+/// The subset of output formats only implemented in Ruff, not in `ruff_db` via `DisplayDiagnostics`.
+pub enum RuffOutputFormat {
+    Github,
+    Grouped,
+    Sarif,
+}
+
+impl TryFrom<OutputFormat> for DiagnosticFormat {
+    type Error = RuffOutputFormat;
+
+    fn try_from(format: OutputFormat) -> std::result::Result<Self, Self::Error> {
+        match format {
+            OutputFormat::Concise => Ok(DiagnosticFormat::Concise),
+            OutputFormat::Full => Ok(DiagnosticFormat::Full),
+            OutputFormat::Json => Ok(DiagnosticFormat::Json),
+            OutputFormat::JsonLines => Ok(DiagnosticFormat::JsonLines),
+            OutputFormat::Junit => Ok(DiagnosticFormat::Junit),
+            OutputFormat::Gitlab => Ok(DiagnosticFormat::Gitlab),
+            OutputFormat::Pylint => Ok(DiagnosticFormat::Pylint),
+            OutputFormat::Rdjson => Ok(DiagnosticFormat::Rdjson),
+            OutputFormat::Azure => Ok(DiagnosticFormat::Azure),
+            OutputFormat::Github => Err(RuffOutputFormat::Github),
+            OutputFormat::Grouped => Err(RuffOutputFormat::Grouped),
+            OutputFormat::Sarif => Err(RuffOutputFormat::Sarif),
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[serde(try_from = "String")]
 pub struct RequiredVersion(VersionSpecifiers);
@@ -574,12 +617,12 @@ impl TryFrom<String> for RequiredVersion {
 
 #[cfg(feature = "schemars")]
 impl schemars::JsonSchema for RequiredVersion {
-    fn schema_name() -> String {
-        "RequiredVersion".to_string()
+    fn schema_name() -> std::borrow::Cow<'static, str> {
+        std::borrow::Cow::Borrowed("RequiredVersion")
     }
 
-    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
-        generator.subschema_for::<String>()
+    fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
+        <String as schemars::JsonSchema>::json_schema(generator)
     }
 }
 
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap
index fffcf7e607..ab702311db 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap
@@ -10,15 +10,13 @@ PYI019 [*] Use `Self` instead of custom TypeVar `T`
 8 |               return cls
   |
 help: Replace TypeVar `T` with `Self`
-
-ℹ Safe fix
-1 1 | 
-2 2 | from typing import TypeVar
-  3 |+from typing_extensions import Self
-3 4 | 
-4 5 | T = TypeVar("T", bound="_NiceReprEnum")
-5 6 | 
-6 7 | class C:
-7   |-	def __new__(cls: type[T]) -> T:
-  8 |+	def __new__(cls) -> Self:
-8 9 |               return cls
+1 | 
+2 | from typing import TypeVar
+3 + from typing_extensions import Self
+4 | 
+5 | T = TypeVar("T", bound="_NiceReprEnum")
+6 | 
+7 | class C:
+  - 	def __new__(cls: type[T]) -> T:
+8 + 	def __new__(cls) -> Self:
+9 |               return cls
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap
index ada2e840bd..73079e7eec 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap
@@ -10,15 +10,13 @@ PYI019 [*] Use `Self` instead of custom TypeVar `T`
 8 |               return cls
   |
 help: Replace TypeVar `T` with `Self`
-
-ℹ Safe fix
-1 1 | 
-2   |-from typing import TypeVar
-  2 |+from typing import TypeVar, Self
-3 3 | 
-4 4 | T = TypeVar("T", bound="_NiceReprEnum")
-5 5 | 
-6 6 | class C:
-7   |-	def __new__(cls: type[T]) -> T:
-  7 |+	def __new__(cls) -> Self:
-8 8 |               return cls
+1 | 
+  - from typing import TypeVar
+2 + from typing import TypeVar, Self
+3 | 
+4 | T = TypeVar("T", bound="_NiceReprEnum")
+5 | 
+6 | class C:
+  - 	def __new__(cls: type[T]) -> T:
+7 + 	def __new__(cls) -> Self:
+8 |               return cls
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap
index ada2e840bd..73079e7eec 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap
@@ -10,15 +10,13 @@ PYI019 [*] Use `Self` instead of custom TypeVar `T`
 8 |               return cls
   |
 help: Replace TypeVar `T` with `Self`
-
-ℹ Safe fix
-1 1 | 
-2   |-from typing import TypeVar
-  2 |+from typing import TypeVar, Self
-3 3 | 
-4 4 | T = TypeVar("T", bound="_NiceReprEnum")
-5 5 | 
-6 6 | class C:
-7   |-	def __new__(cls: type[T]) -> T:
-  7 |+	def __new__(cls) -> Self:
-8 8 |               return cls
+1 | 
+  - from typing import TypeVar
+2 + from typing import TypeVar, Self
+3 | 
+4 | T = TypeVar("T", bound="_NiceReprEnum")
+5 | 
+6 | class C:
+  - 	def __new__(cls: type[T]) -> T:
+7 + 	def __new__(cls) -> Self:
+8 |               return cls
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap
index d4cb049469..acc1e8b711 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap
@@ -10,16 +10,12 @@ I001 [*] Import block is un-sorted or un-formatted
   | |___________^
   |
 help: Organize imports
-
-ℹ Safe fix
-  1 |+import math
-  2 |+import random
-1 3 | from pathlib import Path
-2   |-import random
-3   |-import math
-4 4 | from typing import Any
-5 5 | import collections
-6 6 | # Newline should be added here
+ ::: cell 1
+1 + import math
+2 + import random
+3 | from pathlib import Path
+  - import random
+  - import math
 
 I001 [*] Import block is un-sorted or un-formatted
  --> isort.ipynb:cell 2:1:1
@@ -31,19 +27,15 @@ I001 [*] Import block is un-sorted or un-formatted
 4 |   def foo():
   |
 help: Organize imports
-
-ℹ Safe fix
-1 1 | from pathlib import Path
-2 2 | import random
-3 3 | import math
-  4 |+import collections
-4 5 | from typing import Any
-5   |-import collections
-  6 |+
-  7 |+
-6 8 | # Newline should be added here
-7 9 | def foo():
-8 10 |     pass
+ ::: cell 2
+1 + import collections
+2 | from typing import Any
+  - import collections
+3 + 
+4 + 
+5 | # Newline should be added here
+6 | def foo():
+7 |     pass
 
 I001 [*] Import block is un-sorted or un-formatted
  --> isort.ipynb:cell 3:1:1
@@ -55,17 +47,13 @@ I001 [*] Import block is un-sorted or un-formatted
 4 |   %matplotlib \
   |
 help: Organize imports
-
-ℹ Safe fix
-6  6  | # Newline should be added here
-7  7  | def foo():
-8  8  |     pass
-   9  |+import sys
-9  10 | from pathlib import Path
-10    |-import sys
-11 11 | 
-12 12 | %matplotlib \
-13 13 |     --inline
+ ::: cell 3
+1 + import sys
+2 | from pathlib import Path
+  - import sys
+3 | 
+4 | %matplotlib \
+5 |     --inline
 
 I001 [*] Import block is un-sorted or un-formatted
  --> isort.ipynb:cell 3:7:1
@@ -77,11 +65,10 @@ I001 [*] Import block is un-sorted or un-formatted
   | |__________^
   |
 help: Organize imports
-
-ℹ Safe fix
-12 12 | %matplotlib \
-13 13 |     --inline
-14 14 | 
-   15 |+import abc
-15 16 | import math
-16    |-import abc
+ ::: cell 3
+4 | %matplotlib \
+5 |     --inline
+6 | 
+7 + import abc
+8 | import math
+  - import abc
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap
index d373e3d036..8ca1d09a11 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap
@@ -12,15 +12,13 @@ F401 [*] `os` imported but unused
 7 | _ = math.pi
   |
 help: Remove unused import: `os`
-
-ℹ Safe fix
-2 2 | 
-3 3 | %matplotlib inline
-4 4 | 
-5   |-import os
-6 5 | 
-7 6 | _ = math.pi
-8 7 | %%timeit
+ ::: cell 1
+2 | 
+3 | %matplotlib inline
+4 | 
+  - import os
+5 | 
+6 | _ = math.pi
 
 F401 [*] `sys` imported but unused
  --> ipy_escape_command.ipynb:cell 2:2:8
@@ -30,9 +28,6 @@ F401 [*] `sys` imported but unused
   |        ^^^
   |
 help: Remove unused import: `sys`
-
-ℹ Safe fix
-6 6 | 
-7 7 | _ = math.pi
-8 8 | %%timeit
-9   |-import sys
+ ::: cell 2
+1 | %%timeit
+  - import sys
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__semantic_syntax_error_GlobalParameter_global_parameter_3.10.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__semantic_syntax_error_GlobalParameter_global_parameter_3.10.snap
new file mode 100644
index 0000000000..c1c7fbd378
--- /dev/null
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__semantic_syntax_error_GlobalParameter_global_parameter_3.10.snap
@@ -0,0 +1,56 @@
+---
+source: crates/ruff_linter/src/linter.rs
+---
+invalid-syntax: name `a` is parameter and global
+ --> <filename>:3:12
+  |
+2 | def f(a):
+3 |     global a
+  |            ^
+4 |
+5 | def g(a):
+  |
+
+invalid-syntax: name `a` is parameter and global
+ --> <filename>:7:16
+  |
+5 | def g(a):
+6 |     if True:
+7 |         global a 
+  |                ^
+8 |
+9 | def h(a):
+  |
+
+invalid-syntax: name `a` is parameter and global
+  --> <filename>:15:16
+   |
+13 | def i(a):
+14 |     try:
+15 |         global a 
+   |                ^
+16 |     except Exception:
+17 |         pass
+   |
+
+invalid-syntax: name `a` is parameter and global
+  --> <filename>:21:12
+   |
+19 | def f(a):
+20 |     a = 1
+21 |     global a
+   |            ^
+22 |
+23 | def f(a):
+   |
+
+invalid-syntax: name `a` is parameter and global
+  --> <filename>:26:12
+   |
+24 |     a = 1
+25 |     a = 2
+26 |     global a
+   |            ^
+27 |
+28 | def f(a):
+   |
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap
index 3e51ee839d..03cd7b5a6d 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap
@@ -10,14 +10,12 @@ F841 [*] Local variable `foo1` is assigned to but never used
 3 |     foo2: list[str] = %matplotlib --list
   |
 help: Remove assignment to unused variable `foo1`
-
-ℹ Unsafe fix
-1 1 | def f():
-2   |-    foo1 = %matplotlib --list
-  2 |+    %matplotlib --list
-3 3 |     foo2: list[str] = %matplotlib --list
-4 4 | def f():
-5 5 |     bar1 = !pwd
+ ::: cell 1
+1 | def f():
+  -     foo1 = %matplotlib --list
+2 +     %matplotlib --list
+3 |     foo2: list[str] = %matplotlib --list
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `foo2` is assigned to but never used
  --> unused_variable.ipynb:cell 1:3:5
@@ -28,15 +26,12 @@ F841 [*] Local variable `foo2` is assigned to but never used
   |     ^^^^
   |
 help: Remove assignment to unused variable `foo2`
-
-ℹ Unsafe fix
-1 1 | def f():
-2 2 |     foo1 = %matplotlib --list
-3   |-    foo2: list[str] = %matplotlib --list
-  3 |+    %matplotlib --list
-4 4 | def f():
-5 5 |     bar1 = !pwd
-6 6 |     bar2: str = !pwd
+ ::: cell 1
+1 | def f():
+2 |     foo1 = %matplotlib --list
+  -     foo2: list[str] = %matplotlib --list
+3 +     %matplotlib --list
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `bar1` is assigned to but never used
  --> unused_variable.ipynb:cell 2:2:5
@@ -47,14 +42,12 @@ F841 [*] Local variable `bar1` is assigned to but never used
 3 |     bar2: str = !pwd
   |
 help: Remove assignment to unused variable `bar1`
-
-ℹ Unsafe fix
-2 2 |     foo1 = %matplotlib --list
-3 3 |     foo2: list[str] = %matplotlib --list
-4 4 | def f():
-5   |-    bar1 = !pwd
-  5 |+    !pwd
-6 6 |     bar2: str = !pwd
+ ::: cell 2
+1 | def f():
+  -     bar1 = !pwd
+2 +     !pwd
+3 |     bar2: str = !pwd
+note: This is an unsafe fix and may change runtime behavior
 
 F841 [*] Local variable `bar2` is assigned to but never used
  --> unused_variable.ipynb:cell 2:3:5
@@ -65,10 +58,9 @@ F841 [*] Local variable `bar2` is assigned to but never used
   |     ^^^^
   |
 help: Remove assignment to unused variable `bar2`
-
-ℹ Unsafe fix
-3 3 |     foo2: list[str] = %matplotlib --list
-4 4 | def f():
-5 5 |     bar1 = !pwd
-6   |-    bar2: str = !pwd
-  6 |+    !pwd
+ ::: cell 2
+1 | def f():
+2 |     bar1 = !pwd
+  -     bar2: str = !pwd
+3 +     !pwd
+note: This is an unsafe fix and may change runtime behavior
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap
index 8bdc926bd5..441f3f619d 100644
--- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap
@@ -10,8 +10,7 @@ F401 [*] `os` imported but unused
 3 | print("hello world")
   |
 help: Remove unused import: `os`
-
-ℹ Safe fix
-1   |-import os
-2 1 | 
-3 2 | print("hello world")
+ ::: cell 3
+  - import os
+1 | 
+2 | print("hello world")
diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__yield_from_in_async_function.py.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__yield_from_in_async_function.py.snap
new file mode 100644
index 0000000000..ab60900419
--- /dev/null
+++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__yield_from_in_async_function.py.snap
@@ -0,0 +1,9 @@
+---
+source: crates/ruff_linter/src/linter.rs
+---
+PLE1700 `yield from` statement in async function; use `async for` instead
+ --> resources/test/fixtures/syntax_errors/yield_from_in_async_function.py:1:16
+  |
+1 | async def f(): yield from x # error
+  |                ^^^^^^^^^^^^
+  |
diff --git a/crates/ruff_linter/src/test.rs b/crates/ruff_linter/src/test.rs
index 2dee7dcbb2..67a6728404 100644
--- a/crates/ruff_linter/src/test.rs
+++ b/crates/ruff_linter/src/test.rs
@@ -2,6 +2,7 @@
 //! Helper functions for the tests of rule implementations.
 
 use std::borrow::Cow;
+use std::fmt;
 use std::path::Path;
 
 #[cfg(not(fuzzing))]
@@ -9,7 +10,9 @@ use anyhow::Result;
 use itertools::Itertools;
 use rustc_hash::FxHashMap;
 
-use ruff_db::diagnostic::{Diagnostic, Span};
+use ruff_db::diagnostic::{
+    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics, Span,
+};
 use ruff_notebook::Notebook;
 #[cfg(not(fuzzing))]
 use ruff_notebook::NotebookError;
@@ -23,7 +26,7 @@ use ruff_source_file::SourceFileBuilder;
 use crate::codes::Rule;
 use crate::fix::{FixResult, fix_file};
 use crate::linter::check_path;
-use crate::message::{Emitter, EmitterContext, TextEmitter, create_syntax_error_diagnostic};
+use crate::message::EmitterContext;
 use crate::package::PackageRoot;
 use crate::packaging::detect_package_root;
 use crate::settings::types::UnsafeFixes;
@@ -32,6 +35,85 @@ use crate::source_kind::SourceKind;
 use crate::{Applicability, FixAvailability};
 use crate::{Locator, directives};
 
+/// Represents the difference between two diagnostic runs.
+#[derive(Debug)]
+pub(crate) struct DiagnosticsDiff {
+    /// Diagnostics that were removed (present in 'before' but not in 'after')
+    removed: Vec<Diagnostic>,
+    /// Diagnostics that were added (present in 'after' but not in 'before')
+    added: Vec<Diagnostic>,
+    /// Settings used before the change
+    settings_before: LinterSettings,
+    /// Settings used after the change
+    settings_after: LinterSettings,
+}
+
+impl fmt::Display for DiagnosticsDiff {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        writeln!(f, "--- Linter settings ---")?;
+        let settings_before_str = format!("{}", self.settings_before);
+        let settings_after_str = format!("{}", self.settings_after);
+        let diff = similar::TextDiff::from_lines(&settings_before_str, &settings_after_str);
+        for change in diff.iter_all_changes() {
+            match change.tag() {
+                similar::ChangeTag::Delete => write!(f, "-{change}")?,
+                similar::ChangeTag::Insert => write!(f, "+{change}")?,
+                similar::ChangeTag::Equal => (),
+            }
+        }
+        writeln!(f)?;
+
+        writeln!(f, "--- Summary ---")?;
+        writeln!(f, "Removed: {}", self.removed.len())?;
+        writeln!(f, "Added: {}", self.added.len())?;
+        writeln!(f)?;
+
+        if !self.removed.is_empty() {
+            writeln!(f, "--- Removed ---")?;
+            for diagnostic in &self.removed {
+                writeln!(f, "{}", print_messages(std::slice::from_ref(diagnostic)))?;
+            }
+            writeln!(f)?;
+        }
+
+        if !self.added.is_empty() {
+            writeln!(f, "--- Added ---")?;
+            for diagnostic in &self.added {
+                writeln!(f, "{}", print_messages(std::slice::from_ref(diagnostic)))?;
+            }
+            writeln!(f)?;
+        }
+
+        Ok(())
+    }
+}
+
+/// Compare two sets of diagnostics and return the differences
+fn diff_diagnostics(
+    before: Vec<Diagnostic>,
+    after: Vec<Diagnostic>,
+    settings_before: &LinterSettings,
+    settings_after: &LinterSettings,
+) -> DiagnosticsDiff {
+    let mut removed = Vec::new();
+    let mut added = after;
+
+    for old_diag in before {
+        let Some(pos) = added.iter().position(|diag| diag == &old_diag) else {
+            removed.push(old_diag);
+            continue;
+        };
+        added.remove(pos);
+    }
+
+    DiagnosticsDiff {
+        removed,
+        added,
+        settings_before: settings_before.clone(),
+        settings_after: settings_after.clone(),
+    }
+}
+
 #[cfg(not(fuzzing))]
 pub(crate) fn test_resource_path(path: impl AsRef<Path>) -> std::path::PathBuf {
     Path::new("./resources/test/").join(path)
@@ -49,6 +131,30 @@ pub(crate) fn test_path(
     Ok(test_contents(&source_kind, &path, settings).0)
 }
 
+/// Test a file with two different settings and return the differences
+#[cfg(not(fuzzing))]
+pub(crate) fn test_path_with_settings_diff(
+    path: impl AsRef<Path>,
+    settings_before: &LinterSettings,
+    settings_after: &LinterSettings,
+) -> Result<DiagnosticsDiff> {
+    assert!(
+        format!("{settings_before}") != format!("{settings_after}"),
+        "Settings must be different for differential testing"
+    );
+
+    let diagnostics_before = test_path(&path, settings_before)?;
+    let diagnostic_after = test_path(&path, settings_after)?;
+
+    let diff = diff_diagnostics(
+        diagnostics_before,
+        diagnostic_after,
+        settings_before,
+        settings_after,
+    );
+    Ok(diff)
+}
+
 #[cfg(not(fuzzing))]
 pub(crate) struct TestedNotebook {
     pub(crate) diagnostics: Vec<Diagnostic>,
@@ -279,24 +385,27 @@ Either ensure you always emit a fix or change `Violation::FIX_AVAILABILITY` to e
 
             // Not strictly necessary but adds some coverage for this code path by overriding the
             // noqa offset and the source file
-            let range = diagnostic.expect_range();
-            diagnostic.set_noqa_offset(directives.noqa_line_for.resolve(range.start()));
+            if let Some(range) = diagnostic.range() {
+                diagnostic.set_noqa_offset(directives.noqa_line_for.resolve(range.start()));
+            }
             // This part actually is necessary to avoid long relative paths in snapshots.
             for annotation in diagnostic.annotations_mut() {
-                let range = annotation.get_span().range().unwrap();
-                annotation.set_span(Span::from(source_code.clone()).with_range(range));
+                if let Some(range) = annotation.get_span().range() {
+                    annotation.set_span(Span::from(source_code.clone()).with_range(range));
+                }
             }
             for sub in diagnostic.sub_diagnostics_mut() {
                 for annotation in sub.annotations_mut() {
-                    let range = annotation.get_span().range().unwrap();
-                    annotation.set_span(Span::from(source_code.clone()).with_range(range));
+                    if let Some(range) = annotation.get_span().range() {
+                        annotation.set_span(Span::from(source_code.clone()).with_range(range));
+                    }
                 }
             }
 
             diagnostic
         })
         .chain(parsed.errors().iter().map(|parse_error| {
-            create_syntax_error_diagnostic(source_code.clone(), &parse_error.error, parse_error)
+            Diagnostic::invalid_syntax(source_code.clone(), &parse_error.error, parse_error)
         }))
         .sorted_by(Diagnostic::ruff_start_ordering)
         .collect();
@@ -310,7 +419,7 @@ fn print_syntax_errors(errors: &[ParseError], path: &Path, source: &SourceKind)
     let messages: Vec<_> = errors
         .iter()
         .map(|parse_error| {
-            create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
+            Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
         })
         .collect();
 
@@ -337,42 +446,38 @@ pub(crate) fn print_jupyter_messages(
     path: &Path,
     notebook: &Notebook,
 ) -> String {
-    let mut output = Vec::new();
-
-    TextEmitter::default()
+    let config = DisplayDiagnosticConfig::default()
+        .format(DiagnosticFormat::Full)
+        .hide_severity(true)
         .with_show_fix_status(true)
-        .with_show_fix_diff(true)
-        .with_show_source(true)
-        .with_unsafe_fixes(UnsafeFixes::Enabled)
-        .emit(
-            &mut output,
-            diagnostics,
-            &EmitterContext::new(&FxHashMap::from_iter([(
-                path.file_name().unwrap().to_string_lossy().to_string(),
-                notebook.index().clone(),
-            )])),
-        )
-        .unwrap();
+        .show_fix_diff(true)
+        .with_fix_applicability(Applicability::DisplayOnly);
 
-    String::from_utf8(output).unwrap()
+    DisplayDiagnostics::new(
+        &EmitterContext::new(&FxHashMap::from_iter([(
+            path.file_name().unwrap().to_string_lossy().to_string(),
+            notebook.index().clone(),
+        )])),
+        &config,
+        diagnostics,
+    )
+    .to_string()
 }
 
 pub(crate) fn print_messages(diagnostics: &[Diagnostic]) -> String {
-    let mut output = Vec::new();
-
-    TextEmitter::default()
+    let config = DisplayDiagnosticConfig::default()
+        .format(DiagnosticFormat::Full)
+        .hide_severity(true)
         .with_show_fix_status(true)
-        .with_show_fix_diff(true)
-        .with_show_source(true)
-        .with_unsafe_fixes(UnsafeFixes::Enabled)
-        .emit(
-            &mut output,
-            diagnostics,
-            &EmitterContext::new(&FxHashMap::default()),
-        )
-        .unwrap();
+        .show_fix_diff(true)
+        .with_fix_applicability(Applicability::DisplayOnly);
 
-    String::from_utf8(output).unwrap()
+    DisplayDiagnostics::new(
+        &EmitterContext::new(&FxHashMap::default()),
+        &config,
+        diagnostics,
+    )
+    .to_string()
 }
 
 #[macro_export]
@@ -400,3 +505,65 @@ macro_rules! assert_diagnostics {
         });
     }};
 }
+
+#[macro_export]
+macro_rules! assert_diagnostics_diff {
+    ($snapshot:expr, $path:expr, $settings_before:expr, $settings_after:expr $(,)?) => {{
+        let diff = $crate::test::test_path_with_settings_diff($path, $settings_before, $settings_after)?;
+        insta::with_settings!({ omit_expression => true }, {
+            insta::assert_snapshot!($snapshot, format!("{}", diff));
+        });
+    }};
+    ($path:expr, $settings_before:expr, $settings_after:expr $(,)?) => {{
+        let diff = $crate::test::test_path_with_settings_diff($path, $settings_before, $settings_after)?;
+        insta::with_settings!({ omit_expression => true }, {
+            insta::assert_snapshot!(format!("{}", diff));
+        });
+    }};
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_diff_diagnostics() -> Result<()> {
+        use crate::codes::Rule;
+        use ruff_db::diagnostic::{DiagnosticId, LintName};
+
+        let settings_before = LinterSettings::for_rule(Rule::Print);
+        let settings_after = LinterSettings::for_rule(Rule::UnusedImport);
+
+        let test_code = r#"
+import sys
+import unused_module
+
+def main():
+    print(sys.version)
+"#;
+
+        let temp_dir = std::env::temp_dir();
+        let test_file = temp_dir.join("test_diff.py");
+        std::fs::write(&test_file, test_code)?;
+
+        let diff =
+            super::test_path_with_settings_diff(&test_file, &settings_before, &settings_after)?;
+
+        assert_eq!(diff.removed.len(), 1, "Should remove 1 print diagnostic");
+        assert_eq!(
+            diff.removed[0].id(),
+            DiagnosticId::Lint(LintName::of("print")),
+            "Should remove the print diagnostic"
+        );
+        assert_eq!(diff.added.len(), 1, "Should add 1 unused import diagnostic");
+        assert_eq!(
+            diff.added[0].id(),
+            DiagnosticId::Lint(LintName::of("unused-import")),
+            "Should add the unused import diagnostic"
+        );
+
+        std::fs::remove_file(test_file)?;
+
+        Ok(())
+    }
+}
diff --git a/crates/ruff_linter/src/violation.rs b/crates/ruff_linter/src/violation.rs
index f32fa40e9a..dc77c99bdd 100644
--- a/crates/ruff_linter/src/violation.rs
+++ b/crates/ruff_linter/src/violation.rs
@@ -1,12 +1,17 @@
 use std::fmt::{Debug, Display};
 
+use serde::Serialize;
+
 use ruff_db::diagnostic::Diagnostic;
 use ruff_source_file::SourceFile;
 use ruff_text_size::TextRange;
 
-use crate::{codes::Rule, message::create_lint_diagnostic};
+use crate::{
+    codes::{Rule, RuleGroup},
+    message::create_lint_diagnostic,
+};
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Serialize)]
 pub enum FixAvailability {
     Sometimes,
     Always,
@@ -30,6 +35,15 @@ pub trait ViolationMetadata {
     /// Returns an explanation of what this violation catches,
     /// why it's bad, and what users should do instead.
     fn explain() -> Option<&'static str>;
+
+    /// Returns the rule group for this violation.
+    fn group() -> RuleGroup;
+
+    /// Returns the file where the violation is declared.
+    fn file() -> &'static str;
+
+    /// Returns the 1-based line where the violation is declared.
+    fn line() -> u32;
 }
 
 pub trait Violation: ViolationMetadata + Sized {
diff --git a/crates/ruff_macros/src/lib.rs b/crates/ruff_macros/src/lib.rs
index edc0c363df..f1c8edb047 100644
--- a/crates/ruff_macros/src/lib.rs
+++ b/crates/ruff_macros/src/lib.rs
@@ -82,7 +82,7 @@ pub fn cache_key(input: TokenStream) -> TokenStream {
     TokenStream::from(stream)
 }
 
-#[proc_macro_derive(ViolationMetadata)]
+#[proc_macro_derive(ViolationMetadata, attributes(violation_metadata))]
 pub fn derive_violation_metadata(item: TokenStream) -> TokenStream {
     let input: DeriveInput = parse_macro_input!(item);
 
diff --git a/crates/ruff_macros/src/map_codes.rs b/crates/ruff_macros/src/map_codes.rs
index cd20179cbe..08878fc315 100644
--- a/crates/ruff_macros/src/map_codes.rs
+++ b/crates/ruff_macros/src/map_codes.rs
@@ -20,8 +20,6 @@ struct Rule {
     linter: Ident,
     /// The code associated with the rule, e.g., `"E112"`.
     code: LitStr,
-    /// The rule group identifier, e.g., `RuleGroup::Preview`.
-    group: Path,
     /// The path to the struct implementing the rule, e.g.
     /// `rules::pycodestyle::rules::logical_lines::NoIndentedBlock`
     path: Path,
@@ -104,7 +102,7 @@ pub(crate) fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
             linter,
             rules
                 .iter()
-                .map(|(code, Rule { group, attrs, .. })| (code.as_str(), group, attrs)),
+                .map(|(code, Rule { attrs, .. })| (code.as_str(), attrs)),
         ));
 
         output.extend(quote! {
@@ -254,7 +252,6 @@ fn generate_rule_to_code(linter_to_rules: &BTreeMap<Ident, BTreeMap<String, Rule
     }
 
     let mut rule_noqa_code_match_arms = quote!();
-    let mut rule_group_match_arms = quote!();
 
     for (rule, codes) in rule_to_codes {
         let rule_name = rule.segments.last().unwrap();
@@ -279,7 +276,6 @@ See also https://github.com/astral-sh/ruff/issues/2186.
         let Rule {
             linter,
             code,
-            group,
             attrs,
             ..
         } = codes
@@ -291,10 +287,6 @@ See also https://github.com/astral-sh/ruff/issues/2186.
         rule_noqa_code_match_arms.extend(quote! {
             #(#attrs)* Rule::#rule_name => NoqaCode(crate::registry::Linter::#linter.common_prefix(), #code),
         });
-
-        rule_group_match_arms.extend(quote! {
-            #(#attrs)* Rule::#rule_name => #group,
-        });
     }
 
     let rule_to_code = quote! {
@@ -307,28 +299,20 @@ See also https://github.com/astral-sh/ruff/issues/2186.
                 }
             }
 
-            pub fn group(&self) -> RuleGroup {
-                use crate::registry::RuleNamespace;
-
-                match self {
-                    #rule_group_match_arms
-                }
-            }
-
             pub fn is_preview(&self) -> bool {
-                matches!(self.group(), RuleGroup::Preview)
+                matches!(self.group(), RuleGroup::Preview { .. })
             }
 
             pub(crate) fn is_stable(&self) -> bool {
-                matches!(self.group(), RuleGroup::Stable)
+                matches!(self.group(), RuleGroup::Stable { .. })
             }
 
             pub fn is_deprecated(&self) -> bool {
-                matches!(self.group(), RuleGroup::Deprecated)
+                matches!(self.group(), RuleGroup::Deprecated { .. })
             }
 
             pub fn is_removed(&self) -> bool {
-                matches!(self.group(), RuleGroup::Removed)
+                matches!(self.group(), RuleGroup::Removed { .. })
             }
         }
 
@@ -403,6 +387,9 @@ fn register_rules<'a>(input: impl Iterator<Item = &'a Rule>) -> TokenStream {
     let mut rule_message_formats_match_arms = quote!();
     let mut rule_fixable_match_arms = quote!();
     let mut rule_explanation_match_arms = quote!();
+    let mut rule_group_match_arms = quote!();
+    let mut rule_file_match_arms = quote!();
+    let mut rule_line_match_arms = quote!();
 
     for Rule {
         name, attrs, path, ..
@@ -420,6 +407,15 @@ fn register_rules<'a>(input: impl Iterator<Item = &'a Rule>) -> TokenStream {
             quote! {#(#attrs)* Self::#name => <#path as crate::Violation>::FIX_AVAILABILITY,},
         );
         rule_explanation_match_arms.extend(quote! {#(#attrs)* Self::#name => #path::explain(),});
+        rule_group_match_arms.extend(
+            quote! {#(#attrs)* Self::#name => <#path as crate::ViolationMetadata>::group(),},
+        );
+        rule_file_match_arms.extend(
+            quote! {#(#attrs)* Self::#name => <#path as crate::ViolationMetadata>::file(),},
+        );
+        rule_line_match_arms.extend(
+            quote! {#(#attrs)* Self::#name => <#path as crate::ViolationMetadata>::line(),},
+        );
     }
 
     quote! {
@@ -455,12 +451,24 @@ fn register_rules<'a>(input: impl Iterator<Item = &'a Rule>) -> TokenStream {
             pub const fn fixable(&self) -> crate::FixAvailability {
                 match self { #rule_fixable_match_arms }
             }
+
+            pub fn group(&self) -> crate::codes::RuleGroup {
+                match self { #rule_group_match_arms }
+            }
+
+            pub fn file(&self) -> &'static str {
+                match self { #rule_file_match_arms }
+            }
+
+            pub fn line(&self) -> u32 {
+                match self { #rule_line_match_arms }
+            }
         }
     }
 }
 
 impl Parse for Rule {
-    /// Parses a match arm such as `(Pycodestyle, "E112") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),`
+    /// Parses a match arm such as `(Pycodestyle, "E112") => rules::pycodestyle::rules::logical_lines::NoIndentedBlock,`
     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
         let attrs = Attribute::parse_outer(input)?;
         let pat_tuple;
@@ -469,18 +477,13 @@ impl Parse for Rule {
         let _: Token!(,) = pat_tuple.parse()?;
         let code: LitStr = pat_tuple.parse()?;
         let _: Token!(=>) = 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 rule_path: Path = input.parse()?;
         let _: Token!(,) = input.parse()?;
         let rule_name = rule_path.segments.last().unwrap().ident.clone();
         Ok(Rule {
             name: rule_name,
             linter,
             code,
-            group,
             path: rule_path,
             attrs,
         })
diff --git a/crates/ruff_macros/src/newtype_index.rs b/crates/ruff_macros/src/newtype_index.rs
index 99663542d7..73ebf50ddb 100644
--- a/crates/ruff_macros/src/newtype_index.rs
+++ b/crates/ruff_macros/src/newtype_index.rs
@@ -45,11 +45,7 @@ pub(super) fn generate_newtype_index(item: ItemStruct) -> syn::Result<proc_macro
                 // SAFETY:
                 // * The `value < u32::MAX` guarantees that the add doesn't overflow.
                 // * The `+ 1` guarantees that the index is not zero
-                //
-                // N.B. We have to use the unchecked variant here because we're
-                // in a const context and Option::unwrap isn't const yet.
-                #[expect(unsafe_code)]
-                Self(unsafe { std::num::NonZeroU32::new_unchecked((value as u32) + 1) })
+                Self(std::num::NonZeroU32::new((value as u32) + 1).unwrap())
             }
 
             #vis const fn from_u32(value: u32) -> Self {
@@ -58,11 +54,7 @@ pub(super) fn generate_newtype_index(item: ItemStruct) -> syn::Result<proc_macro
                 // SAFETY:
                 // * The `value < u32::MAX` guarantees that the add doesn't overflow.
                 // * The `+ 1` guarantees that the index is larger than zero.
-                //
-                // N.B. We have to use the unchecked variant here because we're
-                // in a const context and Option::unwrap isn't const yet.
-                #[expect(unsafe_code)]
-                Self(unsafe { std::num::NonZeroU32::new_unchecked(value + 1) })
+                Self(std::num::NonZeroU32::new(value + 1).unwrap())
             }
 
             /// Returns the index as a `u32` value
diff --git a/crates/ruff_macros/src/rule_code_prefix.rs b/crates/ruff_macros/src/rule_code_prefix.rs
index 489718cd68..3b3c74fc10 100644
--- a/crates/ruff_macros/src/rule_code_prefix.rs
+++ b/crates/ruff_macros/src/rule_code_prefix.rs
@@ -2,11 +2,11 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use proc_macro2::Span;
 use quote::quote;
-use syn::{Attribute, Ident, Path};
+use syn::{Attribute, Ident};
 
 pub(crate) fn expand<'a>(
     prefix_ident: &Ident,
-    variants: impl Iterator<Item = (&'a str, &'a Path, &'a Vec<Attribute>)>,
+    variants: impl Iterator<Item = (&'a str, &'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();
diff --git a/crates/ruff_macros/src/violation_metadata.rs b/crates/ruff_macros/src/violation_metadata.rs
index 3bdceb4079..2fdabfabcc 100644
--- a/crates/ruff_macros/src/violation_metadata.rs
+++ b/crates/ruff_macros/src/violation_metadata.rs
@@ -5,6 +5,13 @@ use syn::{Attribute, DeriveInput, Error, Lit, LitStr, Meta};
 pub(crate) fn violation_metadata(input: DeriveInput) -> syn::Result<TokenStream> {
     let docs = get_docs(&input.attrs)?;
 
+    let Some(group) = get_rule_status(&input.attrs)? else {
+        return Err(Error::new_spanned(
+            input,
+            "Missing required rule group metadata",
+        ));
+    };
+
     let name = input.ident;
 
     let (impl_generics, ty_generics, where_clause) = &input.generics.split_for_impl();
@@ -20,6 +27,18 @@ pub(crate) fn violation_metadata(input: DeriveInput) -> syn::Result<TokenStream>
             fn explain() -> Option<&'static str> {
                 Some(#docs)
             }
+
+            fn group() -> crate::codes::RuleGroup {
+                crate::codes::#group
+            }
+
+            fn file() -> &'static str {
+                file!()
+            }
+
+            fn line() -> u32 {
+                line!()
+            }
         }
     })
 }
@@ -43,6 +62,49 @@ fn get_docs(attrs: &[Attribute]) -> syn::Result<String> {
     Ok(explanation)
 }
 
+/// Extract the rule status attribute.
+///
+/// These attributes look like:
+///
+/// ```ignore
+/// #[violation_metadata(stable_since = "1.2.3")]
+/// struct MyRule;
+/// ```
+///
+/// The result is returned as a `TokenStream` so that the version string literal can be combined
+/// with the proper `RuleGroup` variant, e.g. `RuleGroup::Stable` for `stable_since` above.
+fn get_rule_status(attrs: &[Attribute]) -> syn::Result<Option<TokenStream>> {
+    let mut group = None;
+    for attr in attrs {
+        if attr.path().is_ident("violation_metadata") {
+            attr.parse_nested_meta(|meta| {
+                if meta.path.is_ident("stable_since") {
+                    let lit: LitStr = meta.value()?.parse()?;
+                    group = Some(quote!(RuleGroup::Stable { since: #lit }));
+                    return Ok(());
+                } else if meta.path.is_ident("preview_since") {
+                    let lit: LitStr = meta.value()?.parse()?;
+                    group = Some(quote!(RuleGroup::Preview { since: #lit }));
+                    return Ok(());
+                } else if meta.path.is_ident("deprecated_since") {
+                    let lit: LitStr = meta.value()?.parse()?;
+                    group = Some(quote!(RuleGroup::Deprecated { since: #lit }));
+                    return Ok(());
+                } else if meta.path.is_ident("removed_since") {
+                    let lit: LitStr = meta.value()?.parse()?;
+                    group = Some(quote!(RuleGroup::Removed { since: #lit }));
+                    return Ok(());
+                }
+                Err(Error::new_spanned(
+                    attr,
+                    "unimplemented violation metadata option",
+                ))
+            })?;
+        }
+    }
+    Ok(group)
+}
+
 fn parse_attr<'a, const LEN: usize>(
     path: [&'static str; LEN],
     attr: &'a Attribute,
diff --git a/crates/ruff_memory_usage/src/lib.rs b/crates/ruff_memory_usage/src/lib.rs
index d2002bc6bb..e75c75808e 100644
--- a/crates/ruff_memory_usage/src/lib.rs
+++ b/crates/ruff_memory_usage/src/lib.rs
@@ -1,7 +1,7 @@
 use std::sync::{LazyLock, Mutex};
 
 use get_size2::{GetSize, StandardTracker};
-use ordermap::OrderSet;
+use ordermap::{OrderMap, OrderSet};
 
 /// Returns the memory usage of the provided object, using a global tracker to avoid
 /// double-counting shared objects.
@@ -18,3 +18,11 @@ pub fn heap_size<T: GetSize>(value: &T) -> usize {
 pub fn order_set_heap_size<T: GetSize, S>(set: &OrderSet<T, S>) -> usize {
     (set.capacity() * T::get_stack_size()) + set.iter().map(heap_size).sum::<usize>()
 }
+
+/// An implementation of [`GetSize::get_heap_size`] for [`OrderMap`].
+pub fn order_map_heap_size<K: GetSize, V: GetSize, S>(map: &OrderMap<K, V, S>) -> usize {
+    (map.capacity() * (K::get_stack_size() + V::get_stack_size()))
+        + (map.iter())
+            .map(|(k, v)| heap_size(k) + heap_size(v))
+            .sum::<usize>()
+}
diff --git a/crates/ruff_notebook/src/cell.rs b/crates/ruff_notebook/src/cell.rs
index 56c1822341..0bcd613370 100644
--- a/crates/ruff_notebook/src/cell.rs
+++ b/crates/ruff_notebook/src/cell.rs
@@ -308,6 +308,13 @@ impl CellOffsets {
         })
         .is_ok()
     }
+
+    /// Returns an iterator over [`TextRange`]s covered by each cell.
+    pub fn ranges(&self) -> impl Iterator<Item = TextRange> {
+        self.iter()
+            .tuple_windows()
+            .map(|(start, end)| TextRange::new(*start, *end))
+    }
 }
 
 impl Deref for CellOffsets {
diff --git a/crates/ruff_notebook/src/index.rs b/crates/ruff_notebook/src/index.rs
index 35e4e07fcb..eff605aa6d 100644
--- a/crates/ruff_notebook/src/index.rs
+++ b/crates/ruff_notebook/src/index.rs
@@ -33,6 +33,14 @@ impl NotebookIndex {
         self.row_to_row_in_cell.get(row.to_zero_indexed()).copied()
     }
 
+    /// Returns an iterator over the row:cell-number pairs (both 1-based).
+    pub fn iter(&self) -> impl Iterator<Item = (OneIndexed, OneIndexed)> {
+        self.row_to_cell
+            .iter()
+            .enumerate()
+            .map(|(row, cell)| (OneIndexed::from_zero_indexed(row), *cell))
+    }
+
     /// Translates the given [`LineColumn`] based on the indexing table.
     ///
     /// This will translate the row/column in the concatenated source code
diff --git a/crates/ruff_python_ast/Cargo.toml b/crates/ruff_python_ast/Cargo.toml
index 5a50f4ee74..062870d3e4 100644
--- a/crates/ruff_python_ast/Cargo.toml
+++ b/crates/ruff_python_ast/Cargo.toml
@@ -30,10 +30,11 @@ rustc-hash = { workspace = true }
 salsa = { workspace = true, optional = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
 
 [features]
-schemars = ["dep:schemars"]
+schemars = ["dep:schemars", "dep:serde_json"]
 cache = ["dep:ruff_cache", "dep:ruff_macros"]
 serde = [
     "dep:serde",
diff --git a/crates/ruff_python_ast/ast.toml b/crates/ruff_python_ast/ast.toml
index 38a9415515..cbcde4e213 100644
--- a/crates/ruff_python_ast/ast.toml
+++ b/crates/ruff_python_ast/ast.toml
@@ -559,23 +559,73 @@ InterpolatedStringLiteralElement = { variant = "Literal" }
 [Pattern]
 doc = "See also [pattern](https://docs.python.org/3/library/ast.html#ast.pattern)"
 
-[Pattern.nodes]
-PatternMatchValue = {}
-PatternMatchSingleton = {}
-PatternMatchSequence = {}
-PatternMatchMapping = {}
-PatternMatchClass = {}
-PatternMatchStar = {}
-PatternMatchAs = {}
-PatternMatchOr = {}
+[Pattern.nodes.PatternMatchValue]
+doc = "See also [MatchValue](https://docs.python.org/3/library/ast.html#ast.MatchValue)"
+fields = [{ name = "value", type = "Box<Expr>" }]
+
+[Pattern.nodes.PatternMatchSingleton]
+doc = "See also [MatchSingleton](https://docs.python.org/3/library/ast.html#ast.MatchSingleton)"
+fields = [{ name = "value", type = "Singleton" }]
+
+[Pattern.nodes.PatternMatchSequence]
+doc = "See also [MatchSequence](https://docs.python.org/3/library/ast.html#ast.MatchSequence)"
+fields = [{ name = "patterns", type = "Pattern*" }]
+
+[Pattern.nodes.PatternMatchMapping]
+doc = "See also [MatchMapping](https://docs.python.org/3/library/ast.html#ast.MatchMapping)"
+fields = [
+  { name = "keys", type = "Expr*" },
+  { name = "patterns", type = "Pattern*" },
+  { name = "rest", type = "Identifier?" },
+]
+custom_source_order = true
+
+[Pattern.nodes.PatternMatchClass]
+doc = "See also [MatchClass](https://docs.python.org/3/library/ast.html#ast.MatchClass)"
+fields = [
+  { name = "cls", type = "Box<Expr>" },
+  { name = "arguments", type = "PatternArguments" },
+]
+
+[Pattern.nodes.PatternMatchStar]
+doc = "See also [MatchStar](https://docs.python.org/3/library/ast.html#ast.MatchStar)"
+fields = [{ name = "name", type = "Identifier?" }]
+
+[Pattern.nodes.PatternMatchAs]
+doc = "See also [MatchAs](https://docs.python.org/3/library/ast.html#ast.MatchAs)"
+fields = [
+  { name = "pattern", type = "Box<Pattern>?" },
+  { name = "name", type = "Identifier?" },
+]
+
+[Pattern.nodes.PatternMatchOr]
+doc = "See also [MatchOr](https://docs.python.org/3/library/ast.html#ast.MatchOr)"
+fields = [{ name = "patterns", type = "Pattern*" }]
 
 [TypeParam]
 doc = "See also [type_param](https://docs.python.org/3/library/ast.html#ast.type_param)"
 
-[TypeParam.nodes]
-TypeParamTypeVar = {}
-TypeParamTypeVarTuple = {}
-TypeParamParamSpec = {}
+[TypeParam.nodes.TypeParamTypeVar]
+doc = "See also [TypeVar](https://docs.python.org/3/library/ast.html#ast.TypeVar)"
+fields = [
+  { name = "name", type = "Identifier" },
+  { name = "bound", type = "Box<Expr>?" },
+  { name = "default", type = "Box<Expr>?" },
+]
+
+[TypeParam.nodes.TypeParamTypeVarTuple]
+doc = "See also [TypeVarTuple](https://docs.python.org/3/library/ast.html#ast.TypeVarTuple)"
+fields = [
+  { name = "name", type = "Identifier" },
+  { name = "default", type = "Box<Expr>?" },
+]
+
+[TypeParam.nodes.TypeParamParamSpec]
+doc = "See also [ParamSpec](https://docs.python.org/3/library/ast.html#ast.ParamSpec)"
+fields = [
+  { name = "name", type = "Identifier" },
+  { name = "default", type = "Box<Expr>?" },
+]
 
 [ungrouped.nodes]
 InterpolatedStringFormatSpec = {}
diff --git a/crates/ruff_python_ast/generate.py b/crates/ruff_python_ast/generate.py
index 2b8687b233..7ed8646f5b 100644
--- a/crates/ruff_python_ast/generate.py
+++ b/crates/ruff_python_ast/generate.py
@@ -38,6 +38,8 @@ types_requiring_crate_prefix = {
     "WithItem",
     "MatchCase",
     "Alias",
+    "Singleton",
+    "PatternArguments",
 }
 
 
diff --git a/crates/ruff_python_ast/src/generated.rs b/crates/ruff_python_ast/src/generated.rs
index 935595705d..547c50d631 100644
--- a/crates/ruff_python_ast/src/generated.rs
+++ b/crates/ruff_python_ast/src/generated.rs
@@ -9637,6 +9637,113 @@ pub struct ExprIpyEscapeCommand {
     pub value: Box<str>,
 }
 
+/// See also [MatchValue](https://docs.python.org/3/library/ast.html#ast.MatchValue)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchValue {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub value: Box<Expr>,
+}
+
+/// See also [MatchSingleton](https://docs.python.org/3/library/ast.html#ast.MatchSingleton)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchSingleton {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub value: crate::Singleton,
+}
+
+/// See also [MatchSequence](https://docs.python.org/3/library/ast.html#ast.MatchSequence)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchSequence {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub patterns: Vec<Pattern>,
+}
+
+/// See also [MatchMapping](https://docs.python.org/3/library/ast.html#ast.MatchMapping)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchMapping {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub keys: Vec<Expr>,
+    pub patterns: Vec<Pattern>,
+    pub rest: Option<crate::Identifier>,
+}
+
+/// See also [MatchClass](https://docs.python.org/3/library/ast.html#ast.MatchClass)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchClass {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub cls: Box<Expr>,
+    pub arguments: crate::PatternArguments,
+}
+
+/// See also [MatchStar](https://docs.python.org/3/library/ast.html#ast.MatchStar)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchStar {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub name: Option<crate::Identifier>,
+}
+
+/// See also [MatchAs](https://docs.python.org/3/library/ast.html#ast.MatchAs)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchAs {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub pattern: Option<Box<Pattern>>,
+    pub name: Option<crate::Identifier>,
+}
+
+/// See also [MatchOr](https://docs.python.org/3/library/ast.html#ast.MatchOr)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct PatternMatchOr {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub patterns: Vec<Pattern>,
+}
+
+/// See also [TypeVar](https://docs.python.org/3/library/ast.html#ast.TypeVar)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct TypeParamTypeVar {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub name: crate::Identifier,
+    pub bound: Option<Box<Expr>>,
+    pub default: Option<Box<Expr>>,
+}
+
+/// See also [TypeVarTuple](https://docs.python.org/3/library/ast.html#ast.TypeVarTuple)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct TypeParamTypeVarTuple {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub name: crate::Identifier,
+    pub default: Option<Box<Expr>>,
+}
+
+/// See also [ParamSpec](https://docs.python.org/3/library/ast.html#ast.ParamSpec)
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct TypeParamParamSpec {
+    pub node_index: crate::AtomicNodeIndex,
+    pub range: ruff_text_size::TextRange,
+    pub name: crate::Identifier,
+    pub default: Option<Box<Expr>>,
+}
+
 impl ModModule {
     pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
     where
@@ -10585,3 +10692,182 @@ impl ExprIpyEscapeCommand {
         } = self;
     }
 }
+
+impl PatternMatchValue {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchValue {
+            value,
+            range: _,
+            node_index: _,
+        } = self;
+        visitor.visit_expr(value);
+    }
+}
+
+impl PatternMatchSingleton {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchSingleton {
+            value,
+            range: _,
+            node_index: _,
+        } = self;
+        visitor.visit_singleton(value);
+    }
+}
+
+impl PatternMatchSequence {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchSequence {
+            patterns,
+            range: _,
+            node_index: _,
+        } = self;
+
+        for elm in patterns {
+            visitor.visit_pattern(elm);
+        }
+    }
+}
+
+impl PatternMatchClass {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchClass {
+            cls,
+            arguments,
+            range: _,
+            node_index: _,
+        } = self;
+        visitor.visit_expr(cls);
+        visitor.visit_pattern_arguments(arguments);
+    }
+}
+
+impl PatternMatchStar {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchStar {
+            name,
+            range: _,
+            node_index: _,
+        } = self;
+
+        if let Some(name) = name {
+            visitor.visit_identifier(name);
+        }
+    }
+}
+
+impl PatternMatchAs {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchAs {
+            pattern,
+            name,
+            range: _,
+            node_index: _,
+        } = self;
+
+        if let Some(pattern) = pattern {
+            visitor.visit_pattern(pattern);
+        }
+
+        if let Some(name) = name {
+            visitor.visit_identifier(name);
+        }
+    }
+}
+
+impl PatternMatchOr {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let PatternMatchOr {
+            patterns,
+            range: _,
+            node_index: _,
+        } = self;
+
+        for elm in patterns {
+            visitor.visit_pattern(elm);
+        }
+    }
+}
+
+impl TypeParamTypeVar {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let TypeParamTypeVar {
+            name,
+            bound,
+            default,
+            range: _,
+            node_index: _,
+        } = self;
+        visitor.visit_identifier(name);
+
+        if let Some(bound) = bound {
+            visitor.visit_expr(bound);
+        }
+
+        if let Some(default) = default {
+            visitor.visit_expr(default);
+        }
+    }
+}
+
+impl TypeParamTypeVarTuple {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let TypeParamTypeVarTuple {
+            name,
+            default,
+            range: _,
+            node_index: _,
+        } = self;
+        visitor.visit_identifier(name);
+
+        if let Some(default) = default {
+            visitor.visit_expr(default);
+        }
+    }
+}
+
+impl TypeParamParamSpec {
+    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
+    where
+        V: SourceOrderVisitor<'a> + ?Sized,
+    {
+        let TypeParamParamSpec {
+            name,
+            default,
+            range: _,
+            node_index: _,
+        } = self;
+        visitor.visit_identifier(name);
+
+        if let Some(default) = default {
+            visitor.visit_expr(default);
+        }
+    }
+}
diff --git a/crates/ruff_python_ast/src/helpers.rs b/crates/ruff_python_ast/src/helpers.rs
index 81787601b3..9d5159a829 100644
--- a/crates/ruff_python_ast/src/helpers.rs
+++ b/crates/ruff_python_ast/src/helpers.rs
@@ -12,7 +12,7 @@ use crate::parenthesize::parenthesized_range;
 use crate::statement_visitor::StatementVisitor;
 use crate::visitor::Visitor;
 use crate::{
-    self as ast, Arguments, AtomicNodeIndex, CmpOp, DictItem, ExceptHandler, Expr,
+    self as ast, Arguments, AtomicNodeIndex, CmpOp, DictItem, ExceptHandler, Expr, ExprNoneLiteral,
     InterpolatedStringElement, MatchCase, Operator, Pattern, Stmt, TypeParam,
 };
 use crate::{AnyNodeRef, ExprContext};
@@ -1219,6 +1219,8 @@ impl Truthiness {
         F: Fn(&str) -> bool,
     {
         match expr {
+            Expr::Lambda(_) => Self::Truthy,
+            Expr::Generator(_) => Self::Truthy,
             Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => {
                 if value.is_empty() {
                     Self::Falsey
@@ -1294,15 +1296,14 @@ impl Truthiness {
                     return Self::Falsey;
                 }
 
-                if dict.items.iter().all(|item| {
-                    matches!(
-                        item,
-                        DictItem {
-                            key: None,
-                            value: Expr::Name(..)
-                        }
-                    )
-                }) {
+                // If the dict consists only of double-starred items (e.g., {**x, **y}),
+                // consider its truthiness unknown. This matches lists/sets/tuples containing
+                // only starred elements, which are also Unknown.
+                if dict
+                    .items
+                    .iter()
+                    .all(|item| matches!(item, DictItem { key: None, .. }))
+                {
                     // {**foo} / {**foo, **bar}
                     Self::Unknown
                 } else {
@@ -1389,7 +1390,9 @@ fn is_non_empty_f_string(expr: &ast::ExprFString) -> bool {
             Expr::FString(f_string) => is_non_empty_f_string(f_string),
             // These literals may or may not be empty.
             Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => !value.is_empty(),
-            Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => !value.is_empty(),
+            // Confusingly, f"{b""}" renders as the string 'b""', which is non-empty.
+            // Therefore, any bytes interpolation is guaranteed non-empty when stringified.
+            Expr::BytesLiteral(_) => true,
         }
     }
 
@@ -1398,7 +1401,9 @@ fn is_non_empty_f_string(expr: &ast::ExprFString) -> bool {
         ast::FStringPart::FString(f_string) => {
             f_string.elements.iter().all(|element| match element {
                 InterpolatedStringElement::Literal(string_literal) => !string_literal.is_empty(),
-                InterpolatedStringElement::Interpolation(f_string) => inner(&f_string.expression),
+                InterpolatedStringElement::Interpolation(f_string) => {
+                    f_string.debug_text.is_some() || inner(&f_string.expression)
+                }
             })
         }
     })
@@ -1406,35 +1411,42 @@ fn is_non_empty_f_string(expr: &ast::ExprFString) -> bool {
 
 /// Returns `true` if the expression definitely resolves to the empty string, when used as an f-string
 /// expression.
-fn is_empty_f_string(expr: &ast::ExprFString) -> bool {
+pub fn is_empty_f_string(expr: &ast::ExprFString) -> bool {
     fn inner(expr: &Expr) -> bool {
         match expr {
             Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.is_empty(),
-            Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => value.is_empty(),
+            // Confusingly, `bool(f"{b""}") == True` even though
+            // `bool(b"") == False`. This is because `f"{b""}"`
+            // evaluates as the string `'b""'` of length 3.
+            Expr::BytesLiteral(_) => false,
             Expr::FString(ast::ExprFString { value, .. }) => {
-                value
-                    .elements()
-                    .all(|f_string_element| match f_string_element {
-                        InterpolatedStringElement::Literal(
-                            ast::InterpolatedStringLiteralElement { value, .. },
-                        ) => value.is_empty(),
-                        InterpolatedStringElement::Interpolation(ast::InterpolatedElement {
-                            expression,
-                            ..
-                        }) => inner(expression),
-                    })
+                is_empty_interpolated_elements(value.elements())
             }
             _ => false,
         }
     }
 
+    fn is_empty_interpolated_elements<'a>(
+        mut elements: impl Iterator<Item = &'a InterpolatedStringElement>,
+    ) -> bool {
+        elements.all(|element| match element {
+            InterpolatedStringElement::Literal(ast::InterpolatedStringLiteralElement {
+                value,
+                ..
+            }) => value.is_empty(),
+            InterpolatedStringElement::Interpolation(f_string) => {
+                f_string.debug_text.is_none()
+                    && f_string.conversion.is_none()
+                    && f_string.format_spec.is_none()
+                    && inner(&f_string.expression)
+            }
+        })
+    }
+
     expr.value.iter().all(|part| match part {
         ast::FStringPart::Literal(string_literal) => string_literal.is_empty(),
         ast::FStringPart::FString(f_string) => {
-            f_string.elements.iter().all(|element| match element {
-                InterpolatedStringElement::Literal(string_literal) => string_literal.is_empty(),
-                InterpolatedStringElement::Interpolation(f_string) => inner(&f_string.expression),
-            })
+            is_empty_interpolated_elements(f_string.elements.iter())
         }
     })
 }
@@ -1487,9 +1499,9 @@ pub fn pep_604_optional(expr: &Expr) -> Expr {
     ast::ExprBinOp {
         left: Box::new(expr.clone()),
         op: Operator::BitOr,
-        right: Box::new(Expr::NoneLiteral(ast::ExprNoneLiteral::default())),
+        right: Box::new(Expr::NoneLiteral(ExprNoneLiteral::default())),
         range: TextRange::default(),
-        node_index: AtomicNodeIndex::dummy(),
+        node_index: AtomicNodeIndex::NONE,
     }
     .into()
 }
@@ -1501,7 +1513,7 @@ pub fn pep_604_union(elts: &[Expr]) -> Expr {
             elts: vec![],
             ctx: ExprContext::Load,
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             parenthesized: true,
         }),
         [Expr::Tuple(ast::ExprTuple { elts, .. })] => pep_604_union(elts),
@@ -1511,7 +1523,7 @@ pub fn pep_604_union(elts: &[Expr]) -> Expr {
             op: Operator::BitOr,
             right: Box::new(pep_604_union(std::slice::from_ref(elt))),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }),
     }
 }
@@ -1522,13 +1534,13 @@ pub fn typing_optional(elt: Expr, binding: Name) -> Expr {
         value: Box::new(Expr::Name(ast::ExprName {
             id: binding,
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
         })),
         slice: Box::new(elt),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: AtomicNodeIndex::dummy(),
+        node_index: AtomicNodeIndex::NONE,
     })
 }
 
@@ -1541,19 +1553,19 @@ pub fn typing_union(elts: &[Expr], binding: Name) -> Expr {
         value: Box::new(Expr::Name(ast::ExprName {
             id: binding,
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
         })),
         slice: Box::new(Expr::Tuple(ast::ExprTuple {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             elts: elts.to_vec(),
             ctx: ExprContext::Load,
             parenthesized: false,
         })),
         ctx: ExprContext::Load,
         range: TextRange::default(),
-        node_index: AtomicNodeIndex::dummy(),
+        node_index: AtomicNodeIndex::NONE,
     })
 }
 
@@ -1686,34 +1698,34 @@ mod tests {
         let name = Expr::Name(ExprName {
             id: "x".into(),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             ctx: ExprContext::Load,
         });
         let constant_one = Expr::NumberLiteral(ExprNumberLiteral {
             value: Number::Int(Int::from(1u8)),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
         let constant_two = Expr::NumberLiteral(ExprNumberLiteral {
             value: Number::Int(Int::from(2u8)),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
         let constant_three = Expr::NumberLiteral(ExprNumberLiteral {
             value: Number::Int(Int::from(3u8)),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
         let type_var_one = TypeParam::TypeVar(TypeParamTypeVar {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             bound: Some(Box::new(constant_one.clone())),
             default: None,
             name: Identifier::new("x", TextRange::default()),
         });
         let type_var_two = TypeParam::TypeVar(TypeParamTypeVar {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             bound: None,
             default: Some(Box::new(constant_two.clone())),
             name: Identifier::new("x", TextRange::default()),
@@ -1723,11 +1735,11 @@ mod tests {
             type_params: Some(Box::new(TypeParams {
                 type_params: vec![type_var_one, type_var_two],
                 range: TextRange::default(),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             })),
             value: Box::new(constant_three.clone()),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
         assert!(!any_over_stmt(&type_alias, &|expr| {
             seen.borrow_mut().push(expr.clone());
@@ -1743,7 +1755,7 @@ mod tests {
     fn any_over_type_param_type_var() {
         let type_var_no_bound = TypeParam::TypeVar(TypeParamTypeVar {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             bound: None,
             default: None,
             name: Identifier::new("x", TextRange::default()),
@@ -1753,12 +1765,12 @@ mod tests {
         let constant = Expr::NumberLiteral(ExprNumberLiteral {
             value: Number::Int(Int::ONE),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
 
         let type_var_with_bound = TypeParam::TypeVar(TypeParamTypeVar {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             bound: Some(Box::new(constant.clone())),
             default: None,
             name: Identifier::new("x", TextRange::default()),
@@ -1776,7 +1788,7 @@ mod tests {
 
         let type_var_with_default = TypeParam::TypeVar(TypeParamTypeVar {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             default: Some(Box::new(constant.clone())),
             bound: None,
             name: Identifier::new("x", TextRange::default()),
@@ -1797,7 +1809,7 @@ mod tests {
     fn any_over_type_param_type_var_tuple() {
         let type_var_tuple = TypeParam::TypeVarTuple(TypeParamTypeVarTuple {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             name: Identifier::new("x", TextRange::default()),
             default: None,
         });
@@ -1809,12 +1821,12 @@ mod tests {
         let constant = Expr::NumberLiteral(ExprNumberLiteral {
             value: Number::Int(Int::ONE),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
 
         let type_var_tuple_with_default = TypeParam::TypeVarTuple(TypeParamTypeVarTuple {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             default: Some(Box::new(constant.clone())),
             name: Identifier::new("x", TextRange::default()),
         });
@@ -1834,7 +1846,7 @@ mod tests {
     fn any_over_type_param_param_spec() {
         let type_param_spec = TypeParam::ParamSpec(TypeParamParamSpec {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             name: Identifier::new("x", TextRange::default()),
             default: None,
         });
@@ -1846,12 +1858,12 @@ mod tests {
         let constant = Expr::NumberLiteral(ExprNumberLiteral {
             value: Number::Int(Int::ONE),
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         });
 
         let param_spec_with_default = TypeParam::TypeVarTuple(TypeParamTypeVarTuple {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             default: Some(Box::new(constant.clone())),
             name: Identifier::new("x", TextRange::default()),
         });
diff --git a/crates/ruff_python_ast/src/lib.rs b/crates/ruff_python_ast/src/lib.rs
index eddcb953ce..2642572e1b 100644
--- a/crates/ruff_python_ast/src/lib.rs
+++ b/crates/ruff_python_ast/src/lib.rs
@@ -78,7 +78,9 @@ pub enum TomlSourceType {
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum PySourceType {
-    /// The source is a Python file (`.py`).
+    /// The source is a Python file (`.py`, `.pyw`).
+    /// Note: `.pyw` files contain Python code, but do not represent importable namespaces.
+    /// Consider adding a separate source type later if combining the two causes issues.
     #[default]
     Python,
     /// The source is a Python stub file (`.pyi`).
@@ -100,6 +102,7 @@ impl PySourceType {
         let ty = match extension {
             "py" => Self::Python,
             "pyi" => Self::Stub,
+            "pyw" => Self::Python,
             "ipynb" => Self::Ipynb,
             _ => return None,
         };
diff --git a/crates/ruff_python_ast/src/name.rs b/crates/ruff_python_ast/src/name.rs
index a1e1376282..a4d8fe46c9 100644
--- a/crates/ruff_python_ast/src/name.rs
+++ b/crates/ruff_python_ast/src/name.rs
@@ -11,6 +11,11 @@ use crate::generated::ExprName;
 #[cfg_attr(feature = "cache", derive(ruff_macros::CacheKey))]
 #[cfg_attr(feature = "salsa", derive(salsa::Update))]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+#[cfg_attr(
+    feature = "schemars",
+    derive(schemars::JsonSchema),
+    schemars(with = "String")
+)]
 pub struct Name(compact_str::CompactString);
 
 impl Name {
@@ -201,35 +206,6 @@ impl PartialEq<Name> for &String {
     }
 }
 
-#[cfg(feature = "schemars")]
-impl schemars::JsonSchema for Name {
-    fn is_referenceable() -> bool {
-        String::is_referenceable()
-    }
-
-    fn schema_name() -> String {
-        String::schema_name()
-    }
-
-    fn schema_id() -> std::borrow::Cow<'static, str> {
-        String::schema_id()
-    }
-
-    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
-        String::json_schema(generator)
-    }
-
-    fn _schemars_private_non_optional_json_schema(
-        generator: &mut schemars::r#gen::SchemaGenerator,
-    ) -> schemars::schema::Schema {
-        String::_schemars_private_non_optional_json_schema(generator)
-    }
-
-    fn _schemars_private_is_option() -> bool {
-        String::_schemars_private_is_option()
-    }
-}
-
 /// A representation of a qualified name, like `typing.List`.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct QualifiedName<'a>(SegmentsVec<'a>);
diff --git a/crates/ruff_python_ast/src/node.rs b/crates/ruff_python_ast/src/node.rs
index 58ad37925c..518d7520e7 100644
--- a/crates/ruff_python_ast/src/node.rs
+++ b/crates/ruff_python_ast/src/node.rs
@@ -235,50 +235,6 @@ impl ast::ExceptHandlerExceptHandler {
     }
 }
 
-impl ast::PatternMatchValue {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchValue {
-            value,
-            range: _,
-            node_index: _,
-        } = self;
-        visitor.visit_expr(value);
-    }
-}
-
-impl ast::PatternMatchSingleton {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchSingleton {
-            value,
-            range: _,
-            node_index: _,
-        } = self;
-        visitor.visit_singleton(value);
-    }
-}
-
-impl ast::PatternMatchSequence {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchSequence {
-            patterns,
-            range: _,
-            node_index: _,
-        } = self;
-        for pattern in patterns {
-            visitor.visit_pattern(pattern);
-        }
-    }
-}
-
 impl ast::PatternMatchMapping {
     pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
     where
@@ -311,76 +267,6 @@ impl ast::PatternMatchMapping {
     }
 }
 
-impl ast::PatternMatchClass {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchClass {
-            cls,
-            arguments: parameters,
-            range: _,
-            node_index: _,
-        } = self;
-        visitor.visit_expr(cls);
-        visitor.visit_pattern_arguments(parameters);
-    }
-}
-
-impl ast::PatternMatchStar {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchStar {
-            range: _,
-            node_index: _,
-            name,
-        } = self;
-
-        if let Some(name) = name {
-            visitor.visit_identifier(name);
-        }
-    }
-}
-
-impl ast::PatternMatchAs {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchAs {
-            pattern,
-            range: _,
-            node_index: _,
-            name,
-        } = self;
-        if let Some(pattern) = pattern {
-            visitor.visit_pattern(pattern);
-        }
-
-        if let Some(name) = name {
-            visitor.visit_identifier(name);
-        }
-    }
-}
-
-impl ast::PatternMatchOr {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::PatternMatchOr {
-            patterns,
-            range: _,
-            node_index: _,
-        } = self;
-        for pattern in patterns {
-            visitor.visit_pattern(pattern);
-        }
-    }
-}
-
 impl ast::PatternArguments {
     pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
     where
@@ -620,67 +506,6 @@ impl ast::TypeParams {
     }
 }
 
-impl ast::TypeParamTypeVar {
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::TypeParamTypeVar {
-            bound,
-            default,
-            name,
-            range: _,
-            node_index: _,
-        } = self;
-
-        visitor.visit_identifier(name);
-        if let Some(expr) = bound {
-            visitor.visit_expr(expr);
-        }
-        if let Some(expr) = default {
-            visitor.visit_expr(expr);
-        }
-    }
-}
-
-impl ast::TypeParamTypeVarTuple {
-    #[inline]
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::TypeParamTypeVarTuple {
-            range: _,
-            node_index: _,
-            name,
-            default,
-        } = self;
-        visitor.visit_identifier(name);
-        if let Some(expr) = default {
-            visitor.visit_expr(expr);
-        }
-    }
-}
-
-impl ast::TypeParamParamSpec {
-    #[inline]
-    pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
-    where
-        V: SourceOrderVisitor<'a> + ?Sized,
-    {
-        let ast::TypeParamParamSpec {
-            range: _,
-            node_index: _,
-            name,
-            default,
-        } = self;
-        visitor.visit_identifier(name);
-        if let Some(expr) = default {
-            visitor.visit_expr(expr);
-        }
-    }
-}
-
 impl ast::FString {
     pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V)
     where
diff --git a/crates/ruff_python_ast/src/node_index.rs b/crates/ruff_python_ast/src/node_index.rs
index cb8042b04d..d40a7fc2bb 100644
--- a/crates/ruff_python_ast/src/node_index.rs
+++ b/crates/ruff_python_ast/src/node_index.rs
@@ -1,3 +1,4 @@
+use std::num::NonZeroU32;
 use std::sync::atomic::{AtomicU32, Ordering};
 
 /// An AST node that has an index.
@@ -16,64 +17,82 @@ where
 }
 
 /// A unique index for a node within an AST.
-///
-/// This type is interiorly mutable to allow assigning node indices
-/// on-demand after parsing.
-#[derive(Default)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash)]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct AtomicNodeIndex(AtomicU32);
-
-impl AtomicNodeIndex {
-    /// Returns a placeholder `AtomicNodeIndex`.
-    pub const fn dummy() -> AtomicNodeIndex {
-        AtomicNodeIndex(AtomicU32::new(u32::MAX))
-    }
-
-    /// Load the current value of the `AtomicNodeIndex`.
-    pub fn load(&self) -> NodeIndex {
-        NodeIndex(self.0.load(Ordering::Relaxed))
-    }
-
-    /// Set the value of the `AtomicNodeIndex`.
-    pub fn set(&self, value: u32) {
-        self.0.store(value, Ordering::Relaxed);
-    }
-}
-
-/// A unique index for a node within an AST.
-#[derive(PartialEq, Eq, Debug, PartialOrd, Ord, Clone, Copy, Hash)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct NodeIndex(u32);
+pub struct NodeIndex(NonZeroU32);
 
 impl NodeIndex {
-    pub fn as_usize(self) -> usize {
-        self.0 as _
-    }
+    /// A placeholder `NodeIndex`.
+    pub const NONE: NodeIndex = NodeIndex(NonZeroU32::new(NodeIndex::_NONE).unwrap());
 
-    pub fn as_u32(self) -> u32 {
-        self.0
+    // Note that the index `u32::MAX` is reserved for the `NonZeroU32` niche, and
+    // this placeholder also reserves the second highest index.
+    const _NONE: u32 = u32::MAX - 1;
+
+    /// Returns the index as a `u32`. or `None` for `NodeIndex::NONE`.
+    pub fn as_u32(self) -> Option<u32> {
+        if self == NodeIndex::NONE {
+            None
+        } else {
+            Some(self.0.get() - 1)
+        }
     }
 }
 
 impl From<u32> for NodeIndex {
     fn from(value: u32) -> Self {
-        NodeIndex(value)
+        match NonZeroU32::new(value + 1).map(NodeIndex) {
+            None | Some(NodeIndex::NONE) => panic!("exceeded maximum `NodeIndex`"),
+            Some(index) => index,
+        }
     }
 }
 
-impl From<u32> for AtomicNodeIndex {
-    fn from(value: u32) -> Self {
-        AtomicNodeIndex(AtomicU32::from(value))
+impl std::fmt::Debug for NodeIndex {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if *self == Self::NONE {
+            f.debug_tuple("NodeIndex(None)").finish()
+        } else {
+            f.debug_tuple("NodeIndex").field(&self.0).finish()
+        }
+    }
+}
+
+/// A unique index for a node within an AST.
+///
+/// This type is interiorly mutable to allow assigning node indices
+/// on-demand after parsing.
+#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
+pub struct AtomicNodeIndex(AtomicU32);
+
+#[allow(clippy::declare_interior_mutable_const)]
+impl AtomicNodeIndex {
+    /// A placeholder `AtomicNodeIndex`.
+    pub const NONE: AtomicNodeIndex = AtomicNodeIndex(AtomicU32::new(NodeIndex::_NONE));
+
+    /// Load the current value of the `AtomicNodeIndex`.
+    pub fn load(&self) -> NodeIndex {
+        let index = NonZeroU32::new(self.0.load(Ordering::Relaxed))
+            .expect("value stored was a valid `NodeIndex`");
+
+        NodeIndex(index)
+    }
+
+    /// Set the value of the `AtomicNodeIndex`.
+    pub fn set(&self, index: NodeIndex) {
+        self.0.store(index.0.get(), Ordering::Relaxed);
+    }
+}
+
+impl Default for AtomicNodeIndex {
+    fn default() -> Self {
+        Self::NONE
     }
 }
 
 impl std::fmt::Debug for AtomicNodeIndex {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if *self == AtomicNodeIndex::dummy() {
-            f.debug_tuple("AtomicNodeIndex").finish_non_exhaustive()
-        } else {
-            f.debug_tuple("AtomicNodeIndex").field(&self.0).finish()
-        }
+        std::fmt::Debug::fmt(&self.load(), f)
     }
 }
 
@@ -108,3 +127,26 @@ impl Clone for AtomicNodeIndex {
         Self(AtomicU32::from(self.0.load(Ordering::Relaxed)))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{AtomicNodeIndex, NodeIndex};
+
+    #[test]
+    fn test_node_index() {
+        let index = AtomicNodeIndex::NONE;
+
+        assert_eq!(index.load(), NodeIndex::NONE);
+        assert_eq!(format!("{index:?}"), "NodeIndex(None)");
+
+        index.set(NodeIndex::from(1));
+        assert_eq!(index.load(), NodeIndex::from(1));
+        assert_eq!(index.load().as_u32(), Some(1));
+
+        let index = NodeIndex::from(0);
+        assert_eq!(index.as_u32(), Some(0));
+
+        let index = NodeIndex::NONE;
+        assert_eq!(index.as_u32(), None);
+    }
+}
diff --git a/crates/ruff_python_ast/src/nodes.rs b/crates/ruff_python_ast/src/nodes.rs
index 3e241b8252..f71f420d09 100644
--- a/crates/ruff_python_ast/src/nodes.rs
+++ b/crates/ruff_python_ast/src/nodes.rs
@@ -3,7 +3,7 @@
 use crate::AtomicNodeIndex;
 use crate::generated::{
     ExprBytesLiteral, ExprDict, ExprFString, ExprList, ExprName, ExprSet, ExprStringLiteral,
-    ExprTString, ExprTuple, StmtClassDef,
+    ExprTString, ExprTuple, PatternMatchAs, PatternMatchOr, StmtClassDef,
 };
 use std::borrow::Cow;
 use std::fmt;
@@ -515,7 +515,7 @@ impl FStringValue {
 
     /// Returns `true` if the node represents an empty f-string literal.
     ///
-    /// Noteh that a [`FStringValue`] node will always have >= 1 [`FStringPart`]s inside it.
+    /// Note that a [`FStringValue`] node will always have >= 1 [`FStringPart`]s inside it.
     /// This method checks whether the value of the concatenated parts is equal to the empty
     /// f-string, not whether the f-string has 0 parts inside it.
     pub fn is_empty_literal(&self) -> bool {
@@ -681,6 +681,22 @@ impl TStringValue {
     pub fn elements(&self) -> impl Iterator<Item = &InterpolatedStringElement> {
         self.iter().flat_map(|tstring| tstring.elements.iter())
     }
+
+    /// Returns `true` if the node represents an empty t-string in the
+    /// sense that `__iter__` returns an empty iterable.
+    ///
+    /// Beware that empty t-strings are still truthy, i.e. `bool(t"") == True`.
+    ///
+    /// Note that a [`TStringValue`] node will always contain at least one
+    /// [`TString`] node. This method checks whether each of the constituent
+    /// t-strings (in an implicitly concatenated t-string) are empty
+    /// in the above sense.
+    pub fn is_empty_iterable(&self) -> bool {
+        match &self.inner {
+            TStringValueInner::Single(tstring) => tstring.is_empty(),
+            TStringValueInner::Concatenated(tstrings) => tstrings.iter().all(TString::is_empty),
+        }
+    }
 }
 
 impl<'a> IntoIterator for &'a TStringValue {
@@ -719,6 +735,8 @@ pub trait StringFlags: Copy {
 
     fn prefix(self) -> AnyStringPrefix;
 
+    fn is_unclosed(self) -> bool;
+
     /// Is the string triple-quoted, i.e.,
     /// does it begin and end with three consecutive quote characters?
     fn is_triple_quoted(self) -> bool {
@@ -763,6 +781,7 @@ pub trait StringFlags: Copy {
 
     fn as_any_string_flags(self) -> AnyStringFlags {
         AnyStringFlags::new(self.prefix(), self.quote_style(), self.triple_quotes())
+            .with_unclosed(self.is_unclosed())
     }
 
     fn display_contents(self, contents: &str) -> DisplayFlags<'_> {
@@ -813,6 +832,10 @@ bitflags! {
         /// for why we track the casing of the `r` prefix,
         /// but not for any other prefix
         const R_PREFIX_UPPER = 1 << 3;
+
+        /// The f-string is unclosed, meaning it is missing a closing quote.
+        /// For example: `f"{bar`
+        const UNCLOSED = 1 << 4;
     }
 }
 
@@ -871,6 +894,12 @@ impl FStringFlags {
         self
     }
 
+    #[must_use]
+    pub fn with_unclosed(mut self, unclosed: bool) -> Self {
+        self.0.set(InterpolatedStringFlagsInner::UNCLOSED, unclosed);
+        self
+    }
+
     #[must_use]
     pub fn with_prefix(mut self, prefix: FStringPrefix) -> Self {
         match prefix {
@@ -968,6 +997,12 @@ impl TStringFlags {
         self
     }
 
+    #[must_use]
+    pub fn with_unclosed(mut self, unclosed: bool) -> Self {
+        self.0.set(InterpolatedStringFlagsInner::UNCLOSED, unclosed);
+        self
+    }
+
     #[must_use]
     pub fn with_prefix(mut self, prefix: TStringPrefix) -> Self {
         match prefix {
@@ -1035,6 +1070,10 @@ impl StringFlags for FStringFlags {
     fn prefix(self) -> AnyStringPrefix {
         AnyStringPrefix::Format(self.prefix())
     }
+
+    fn is_unclosed(self) -> bool {
+        self.0.intersects(InterpolatedStringFlagsInner::UNCLOSED)
+    }
 }
 
 impl fmt::Debug for FStringFlags {
@@ -1043,6 +1082,7 @@ impl fmt::Debug for FStringFlags {
             .field("quote_style", &self.quote_style())
             .field("prefix", &self.prefix())
             .field("triple_quoted", &self.is_triple_quoted())
+            .field("unclosed", &self.is_unclosed())
             .finish()
     }
 }
@@ -1074,6 +1114,10 @@ impl StringFlags for TStringFlags {
     fn prefix(self) -> AnyStringPrefix {
         AnyStringPrefix::Template(self.prefix())
     }
+
+    fn is_unclosed(self) -> bool {
+        self.0.intersects(InterpolatedStringFlagsInner::UNCLOSED)
+    }
 }
 
 impl fmt::Debug for TStringFlags {
@@ -1082,6 +1126,7 @@ impl fmt::Debug for TStringFlags {
             .field("quote_style", &self.quote_style())
             .field("prefix", &self.prefix())
             .field("triple_quoted", &self.is_triple_quoted())
+            .field("unclosed", &self.is_unclosed())
             .finish()
     }
 }
@@ -1182,6 +1227,10 @@ impl TString {
     pub fn quote_style(&self) -> Quote {
         self.flags.quote_style()
     }
+
+    pub fn is_empty(&self) -> bool {
+        self.elements.is_empty()
+    }
 }
 
 impl From<TString> for Expr {
@@ -1407,6 +1456,9 @@ bitflags! {
 
         /// The string was deemed invalid by the parser.
         const INVALID = 1 << 5;
+
+        /// The string literal misses the matching closing quote(s).
+        const UNCLOSED = 1 << 6;
     }
 }
 
@@ -1459,6 +1511,12 @@ impl StringLiteralFlags {
         self
     }
 
+    #[must_use]
+    pub fn with_unclosed(mut self, unclosed: bool) -> Self {
+        self.0.set(StringLiteralFlagsInner::UNCLOSED, unclosed);
+        self
+    }
+
     #[must_use]
     pub fn with_prefix(self, prefix: StringLiteralPrefix) -> Self {
         let StringLiteralFlags(flags) = self;
@@ -1540,6 +1598,10 @@ impl StringFlags for StringLiteralFlags {
     fn prefix(self) -> AnyStringPrefix {
         AnyStringPrefix::Regular(self.prefix())
     }
+
+    fn is_unclosed(self) -> bool {
+        self.0.intersects(StringLiteralFlagsInner::UNCLOSED)
+    }
 }
 
 impl fmt::Debug for StringLiteralFlags {
@@ -1548,6 +1610,7 @@ impl fmt::Debug for StringLiteralFlags {
             .field("quote_style", &self.quote_style())
             .field("prefix", &self.prefix())
             .field("triple_quoted", &self.is_triple_quoted())
+            .field("unclosed", &self.is_unclosed())
             .finish()
     }
 }
@@ -1582,7 +1645,7 @@ impl StringLiteral {
         Self {
             range,
             value: "".into(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             flags: StringLiteralFlags::empty().with_invalid(),
         }
     }
@@ -1602,7 +1665,7 @@ impl From<StringLiteral> for Expr {
     fn from(payload: StringLiteral) -> Self {
         ExprStringLiteral {
             range: payload.range,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             value: StringLiteralValue::single(payload),
         }
         .into()
@@ -1826,6 +1889,9 @@ bitflags! {
 
         /// The bytestring was deemed invalid by the parser.
         const INVALID = 1 << 4;
+
+        /// The byte string misses the matching closing quote(s).
+        const UNCLOSED = 1 << 5;
     }
 }
 
@@ -1877,6 +1943,12 @@ impl BytesLiteralFlags {
         self
     }
 
+    #[must_use]
+    pub fn with_unclosed(mut self, unclosed: bool) -> Self {
+        self.0.set(BytesLiteralFlagsInner::UNCLOSED, unclosed);
+        self
+    }
+
     #[must_use]
     pub fn with_prefix(mut self, prefix: ByteStringPrefix) -> Self {
         match prefix {
@@ -1939,6 +2011,10 @@ impl StringFlags for BytesLiteralFlags {
     fn prefix(self) -> AnyStringPrefix {
         AnyStringPrefix::Bytes(self.prefix())
     }
+
+    fn is_unclosed(self) -> bool {
+        self.0.intersects(BytesLiteralFlagsInner::UNCLOSED)
+    }
 }
 
 impl fmt::Debug for BytesLiteralFlags {
@@ -1947,6 +2023,7 @@ impl fmt::Debug for BytesLiteralFlags {
             .field("quote_style", &self.quote_style())
             .field("prefix", &self.prefix())
             .field("triple_quoted", &self.is_triple_quoted())
+            .field("unclosed", &self.is_unclosed())
             .finish()
     }
 }
@@ -1981,7 +2058,7 @@ impl BytesLiteral {
         Self {
             range,
             value: Box::new([]),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             flags: BytesLiteralFlags::empty().with_invalid(),
         }
     }
@@ -1991,7 +2068,7 @@ impl From<BytesLiteral> for Expr {
     fn from(payload: BytesLiteral) -> Self {
         ExprBytesLiteral {
             range: payload.range,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             value: BytesLiteralValue::single(payload),
         }
         .into()
@@ -2008,7 +2085,7 @@ bitflags! {
     /// prefix flags is by calling the `as_flags()` method on the
     /// `StringPrefix` enum.
     #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Hash)]
-    struct AnyStringFlagsInner: u8 {
+    struct AnyStringFlagsInner: u16 {
         /// The string uses double quotes (`"`).
         /// If this flag is not set, the string uses single quotes (`'`).
         const DOUBLE = 1 << 0;
@@ -2051,6 +2128,9 @@ bitflags! {
         /// for why we track the casing of the `r` prefix,
         /// but not for any other prefix
         const R_PREFIX_UPPER = 1 << 7;
+
+        /// String without matching closing quote(s).
+        const UNCLOSED = 1 << 8;
     }
 }
 
@@ -2146,6 +2226,12 @@ impl AnyStringFlags {
             .set(AnyStringFlagsInner::TRIPLE_QUOTED, triple_quotes.is_yes());
         self
     }
+
+    #[must_use]
+    pub fn with_unclosed(mut self, unclosed: bool) -> Self {
+        self.0.set(AnyStringFlagsInner::UNCLOSED, unclosed);
+        self
+    }
 }
 
 impl StringFlags for AnyStringFlags {
@@ -2214,6 +2300,10 @@ impl StringFlags for AnyStringFlags {
         }
         AnyStringPrefix::Regular(StringLiteralPrefix::Empty)
     }
+
+    fn is_unclosed(self) -> bool {
+        self.0.intersects(AnyStringFlagsInner::UNCLOSED)
+    }
 }
 
 impl fmt::Debug for AnyStringFlags {
@@ -2222,6 +2312,7 @@ impl fmt::Debug for AnyStringFlags {
             .field("prefix", &self.prefix())
             .field("triple_quoted", &self.is_triple_quoted())
             .field("quote_style", &self.quote_style())
+            .field("unclosed", &self.is_unclosed())
             .finish()
     }
 }
@@ -2238,6 +2329,7 @@ impl From<AnyStringFlags> for StringLiteralFlags {
             .with_quote_style(value.quote_style())
             .with_prefix(prefix)
             .with_triple_quotes(value.triple_quotes())
+            .with_unclosed(value.is_unclosed())
     }
 }
 
@@ -2259,6 +2351,7 @@ impl From<AnyStringFlags> for BytesLiteralFlags {
             .with_quote_style(value.quote_style())
             .with_prefix(bytestring_prefix)
             .with_triple_quotes(value.triple_quotes())
+            .with_unclosed(value.is_unclosed())
     }
 }
 
@@ -2280,6 +2373,7 @@ impl From<AnyStringFlags> for FStringFlags {
             .with_quote_style(value.quote_style())
             .with_prefix(prefix)
             .with_triple_quotes(value.triple_quotes())
+            .with_unclosed(value.is_unclosed())
     }
 }
 
@@ -2301,6 +2395,7 @@ impl From<AnyStringFlags> for TStringFlags {
             .with_quote_style(value.quote_style())
             .with_prefix(prefix)
             .with_triple_quotes(value.triple_quotes())
+            .with_unclosed(value.is_unclosed())
     }
 }
 
@@ -2753,58 +2848,10 @@ pub enum IrrefutablePatternKind {
     Wildcard,
 }
 
-/// See also [MatchValue](https://docs.python.org/3/library/ast.html#ast.MatchValue)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchValue {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub value: Box<Expr>,
-}
-
-/// See also [MatchSingleton](https://docs.python.org/3/library/ast.html#ast.MatchSingleton)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchSingleton {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub value: Singleton,
-}
-
-/// See also [MatchSequence](https://docs.python.org/3/library/ast.html#ast.MatchSequence)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchSequence {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub patterns: Vec<Pattern>,
-}
-
-/// See also [MatchMapping](https://docs.python.org/3/library/ast.html#ast.MatchMapping)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchMapping {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub keys: Vec<Expr>,
-    pub patterns: Vec<Pattern>,
-    pub rest: Option<Identifier>,
-}
-
-/// See also [MatchClass](https://docs.python.org/3/library/ast.html#ast.MatchClass)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchClass {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub cls: Box<Expr>,
-    pub arguments: PatternArguments,
-}
-
-/// An AST node to represent the arguments to a [`PatternMatchClass`], i.e., the
+/// An AST node to represent the arguments to a [`crate::PatternMatchClass`], i.e., the
 /// parenthesized contents in `case Point(1, x=0, y=0)`.
 ///
-/// Like [`Arguments`], but for [`PatternMatchClass`].
+/// Like [`Arguments`], but for [`crate::PatternMatchClass`].
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
 pub struct PatternArguments {
@@ -2814,10 +2861,10 @@ pub struct PatternArguments {
     pub keywords: Vec<PatternKeyword>,
 }
 
-/// An AST node to represent the keyword arguments to a [`PatternMatchClass`], i.e., the
+/// An AST node to represent the keyword arguments to a [`crate::PatternMatchClass`], i.e., the
 /// `x=0` and `y=0` in `case Point(x=0, y=0)`.
 ///
-/// Like [`Keyword`], but for [`PatternMatchClass`].
+/// Like [`Keyword`], but for [`crate::PatternMatchClass`].
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
 pub struct PatternKeyword {
@@ -2827,34 +2874,6 @@ pub struct PatternKeyword {
     pub pattern: Pattern,
 }
 
-/// See also [MatchStar](https://docs.python.org/3/library/ast.html#ast.MatchStar)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchStar {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub name: Option<Identifier>,
-}
-
-/// See also [MatchAs](https://docs.python.org/3/library/ast.html#ast.MatchAs)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchAs {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub pattern: Option<Box<Pattern>>,
-    pub name: Option<Identifier>,
-}
-
-/// See also [MatchOr](https://docs.python.org/3/library/ast.html#ast.MatchOr)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct PatternMatchOr {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub patterns: Vec<Pattern>,
-}
-
 impl TypeParam {
     pub const fn name(&self) -> &Identifier {
         match self {
@@ -2873,37 +2892,6 @@ impl TypeParam {
     }
 }
 
-/// See also [TypeVar](https://docs.python.org/3/library/ast.html#ast.TypeVar)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct TypeParamTypeVar {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub name: Identifier,
-    pub bound: Option<Box<Expr>>,
-    pub default: Option<Box<Expr>>,
-}
-
-/// See also [ParamSpec](https://docs.python.org/3/library/ast.html#ast.ParamSpec)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct TypeParamParamSpec {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub name: Identifier,
-    pub default: Option<Box<Expr>>,
-}
-
-/// See also [TypeVarTuple](https://docs.python.org/3/library/ast.html#ast.TypeVarTuple)
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
-pub struct TypeParamTypeVarTuple {
-    pub range: TextRange,
-    pub node_index: AtomicNodeIndex,
-    pub name: Identifier,
-    pub default: Option<Box<Expr>>,
-}
-
 /// See also [decorator](https://docs.python.org/3/library/ast.html#ast.decorator)
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
@@ -3010,6 +2998,12 @@ impl Parameters {
             .find(|arg| arg.parameter.name.as_str() == name)
     }
 
+    /// Returns the index of the parameter with the given name
+    pub fn index(&self, name: &str) -> Option<usize> {
+        self.iter_non_variadic_params()
+            .position(|arg| arg.parameter.name.as_str() == name)
+    }
+
     /// Returns an iterator over all parameters included in this [`Parameters`] node.
     pub fn iter(&self) -> ParametersIterator<'_> {
         ParametersIterator::new(self)
@@ -3199,7 +3193,6 @@ impl<'a> IntoIterator for &'a Box<Parameters> {
 /// Used by `Arguments` original type.
 ///
 /// NOTE: This type is different from original Python AST.
-
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
 pub struct ParameterWithDefault {
@@ -3221,6 +3214,14 @@ impl ParameterWithDefault {
     pub fn annotation(&self) -> Option<&Expr> {
         self.parameter.annotation()
     }
+
+    /// Return `true` if the parameter name uses the pre-PEP-570 convention
+    /// (specified in PEP 484) to indicate to a type checker that it should be treated
+    /// as positional-only.
+    pub fn uses_pep_484_positional_only_convention(&self) -> bool {
+        let name = self.name();
+        name.starts_with("__") && !name.ends_with("__")
+    }
 }
 
 /// An AST node used to represent the arguments passed to a function call or class definition.
@@ -3525,7 +3526,7 @@ impl Identifier {
     pub fn new(id: impl Into<Name>, range: TextRange) -> Self {
         Self {
             id: id.into(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             range,
         }
     }
diff --git a/crates/ruff_python_ast/src/python_version.rs b/crates/ruff_python_ast/src/python_version.rs
index 7eab154ad1..6d472d9ab4 100644
--- a/crates/ruff_python_ast/src/python_version.rs
+++ b/crates/ruff_python_ast/src/python_version.rs
@@ -55,9 +55,8 @@ impl PythonVersion {
         Self::PY37
     }
 
-    // TODO: change this to 314 when it is released
     pub const fn latest() -> Self {
-        Self::PY313
+        Self::PY314
     }
 
     /// The latest Python version supported in preview
@@ -68,8 +67,8 @@ impl PythonVersion {
     }
 
     pub const fn latest_ty() -> Self {
-        // Make sure to update the default value for  `EnvironmentOptions::python_version` when bumping this version.
-        Self::PY313
+        // Make sure to update the default value for `EnvironmentOptions::python_version` when bumping this version.
+        Self::PY314
     }
 
     pub const fn as_tuple(self) -> (u8, u8) {
@@ -94,7 +93,7 @@ impl PythonVersion {
 
 impl Default for PythonVersion {
     fn default() -> Self {
-        Self::PY39
+        Self::PY310
     }
 }
 
@@ -189,42 +188,39 @@ mod serde {
 #[cfg(feature = "schemars")]
 mod schemars {
     use super::PythonVersion;
-    use schemars::_serde_json::Value;
-    use schemars::JsonSchema;
-    use schemars::schema::{Metadata, Schema, SchemaObject, SubschemaValidation};
+    use schemars::{JsonSchema, Schema, SchemaGenerator};
+    use serde_json::Value;
 
     impl JsonSchema for PythonVersion {
-        fn schema_name() -> String {
-            "PythonVersion".to_string()
+        fn schema_name() -> std::borrow::Cow<'static, str> {
+            std::borrow::Cow::Borrowed("PythonVersion")
         }
 
-        fn json_schema(_gen: &mut schemars::r#gen::SchemaGenerator) -> Schema {
-            let sub_schemas = std::iter::once(Schema::Object(SchemaObject {
-                instance_type: Some(schemars::schema::InstanceType::String.into()),
-                string: Some(Box::new(schemars::schema::StringValidation {
-                    pattern: Some(r"^\d+\.\d+$".to_string()),
-                    ..Default::default()
-                })),
-                ..Default::default()
-            }))
-            .chain(Self::iter().map(|v| {
-                Schema::Object(SchemaObject {
-                    const_value: Some(Value::String(v.to_string())),
-                    metadata: Some(Box::new(Metadata {
-                        description: Some(format!("Python {v}")),
-                        ..Metadata::default()
-                    })),
-                    ..SchemaObject::default()
+        fn json_schema(_gen: &mut SchemaGenerator) -> Schema {
+            let mut any_of: Vec<Value> = vec![
+                schemars::json_schema!({
+                    "type": "string",
+                    "pattern": r"^\d+\.\d+$",
                 })
-            }));
+                .into(),
+            ];
 
-            Schema::Object(SchemaObject {
-                subschemas: Some(Box::new(SubschemaValidation {
-                    any_of: Some(sub_schemas.collect()),
-                    ..Default::default()
-                })),
-                ..SchemaObject::default()
-            })
+            for version in Self::iter() {
+                let mut schema = schemars::json_schema!({
+                    "const": version.to_string(),
+                });
+                schema.ensure_object().insert(
+                    "description".to_string(),
+                    Value::String(format!("Python {version}")),
+                );
+                any_of.push(schema.into());
+            }
+
+            let mut schema = Schema::default();
+            schema
+                .ensure_object()
+                .insert("anyOf".to_string(), Value::Array(any_of));
+            schema
         }
     }
 }
diff --git a/crates/ruff_python_ast/src/str.rs b/crates/ruff_python_ast/src/str.rs
index a9096a5218..a058cf4c8e 100644
--- a/crates/ruff_python_ast/src/str.rs
+++ b/crates/ruff_python_ast/src/str.rs
@@ -210,6 +210,58 @@ pub const SINGLE_QUOTE_BYTE_PREFIXES: &[&str] = &[
     "b'",
 ];
 
+/// Includes all permutations of `t` and `rt`. This includes all possible orders, and all possible
+/// casings, for both single and triple quotes.
+///
+/// See: <https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals>
+#[rustfmt::skip]
+pub const TRIPLE_QUOTE_TEMPLATE_PREFIXES: &[&str] = &[
+    "TR\"\"\"",
+    "Tr\"\"\"",
+    "tR\"\"\"",
+    "tr\"\"\"",
+    "RT\"\"\"",
+    "Rt\"\"\"",
+    "rT\"\"\"",
+    "rt\"\"\"",
+    "TR'''",
+    "Tr'''",
+    "tR'''",
+    "tr'''",
+    "RT'''",
+    "Rt'''",
+    "rT'''",
+    "rt'''",
+    "T\"\"\"",
+    "t\"\"\"",
+    "T'''",
+    "t'''",
+];
+
+#[rustfmt::skip]
+pub const SINGLE_QUOTE_TEMPLATE_PREFIXES: &[&str] = &[
+    "TR\"",
+    "Tr\"",
+    "tR\"",
+    "tr\"",
+    "RT\"",
+    "Rt\"",
+    "rT\"",
+    "rt\"",
+    "TR'",
+    "Tr'",
+    "tR'",
+    "tr'",
+    "RT'",
+    "Rt'",
+    "rT'",
+    "rt'",
+    "T\"",
+    "t\"",
+    "T'",
+    "t'",
+];
+
 /// Strip the leading and trailing quotes from a string.
 /// Assumes that the string is a valid string literal, but does not verify that the string
 /// is a "simple" string literal (i.e., that it does not contain any implicit concatenations).
@@ -229,7 +281,7 @@ pub fn raw_contents_range(contents: &str) -> Option<TextRange> {
     ))
 }
 
-/// An [`AhoCorasick`] matcher for string and byte literal prefixes.
+/// An [`AhoCorasick`] matcher for string, template, and bytes literal prefixes.
 static PREFIX_MATCHER: LazyLock<AhoCorasick> = LazyLock::new(|| {
     AhoCorasick::builder()
         .start_kind(StartKind::Anchored)
@@ -239,19 +291,21 @@ static PREFIX_MATCHER: LazyLock<AhoCorasick> = LazyLock::new(|| {
             TRIPLE_QUOTE_STR_PREFIXES
                 .iter()
                 .chain(TRIPLE_QUOTE_BYTE_PREFIXES)
+                .chain(TRIPLE_QUOTE_TEMPLATE_PREFIXES)
                 .chain(SINGLE_QUOTE_STR_PREFIXES)
-                .chain(SINGLE_QUOTE_BYTE_PREFIXES),
+                .chain(SINGLE_QUOTE_BYTE_PREFIXES)
+                .chain(SINGLE_QUOTE_TEMPLATE_PREFIXES),
         )
         .unwrap()
 });
 
-/// Return the leading quote for a string or byte literal (e.g., `"""`).
+/// Return the leading quote for a string, template, or bytes literal (e.g., `"""`).
 pub fn leading_quote(content: &str) -> Option<&str> {
     let mat = PREFIX_MATCHER.find(Input::new(content).anchored(Anchored::Yes))?;
     Some(&content[mat.start()..mat.end()])
 }
 
-/// Return the trailing quote string for a string or byte literal (e.g., `"""`).
+/// Return the trailing quote string for a string, template, or bytes literal (e.g., `"""`).
 pub fn trailing_quote(content: &str) -> Option<&str> {
     if content.ends_with("'''") {
         Some("'''")
@@ -268,14 +322,16 @@ pub fn trailing_quote(content: &str) -> Option<&str> {
 
 /// Return `true` if the string is a triple-quote string or byte prefix.
 pub fn is_triple_quote(content: &str) -> bool {
-    TRIPLE_QUOTE_STR_PREFIXES.contains(&content) || TRIPLE_QUOTE_BYTE_PREFIXES.contains(&content)
+    TRIPLE_QUOTE_STR_PREFIXES.contains(&content)
+        || TRIPLE_QUOTE_BYTE_PREFIXES.contains(&content)
+        || TRIPLE_QUOTE_TEMPLATE_PREFIXES.contains(&content)
 }
 
 #[cfg(test)]
 mod tests {
     use super::{
-        SINGLE_QUOTE_BYTE_PREFIXES, SINGLE_QUOTE_STR_PREFIXES, TRIPLE_QUOTE_BYTE_PREFIXES,
-        TRIPLE_QUOTE_STR_PREFIXES,
+        SINGLE_QUOTE_BYTE_PREFIXES, SINGLE_QUOTE_STR_PREFIXES, SINGLE_QUOTE_TEMPLATE_PREFIXES,
+        TRIPLE_QUOTE_BYTE_PREFIXES, TRIPLE_QUOTE_STR_PREFIXES, TRIPLE_QUOTE_TEMPLATE_PREFIXES,
     };
 
     #[test]
@@ -283,8 +339,10 @@ mod tests {
         let prefixes = TRIPLE_QUOTE_STR_PREFIXES
             .iter()
             .chain(TRIPLE_QUOTE_BYTE_PREFIXES)
+            .chain(TRIPLE_QUOTE_TEMPLATE_PREFIXES)
             .chain(SINGLE_QUOTE_STR_PREFIXES)
             .chain(SINGLE_QUOTE_BYTE_PREFIXES)
+            .chain(SINGLE_QUOTE_TEMPLATE_PREFIXES)
             .collect::<Vec<_>>();
         for (i, prefix_i) in prefixes.iter().enumerate() {
             for (j, prefix_j) in prefixes.iter().enumerate() {
diff --git a/crates/ruff_python_codegen/src/generator.rs b/crates/ruff_python_codegen/src/generator.rs
index 1bd307da8d..af5b1dc80e 100644
--- a/crates/ruff_python_codegen/src/generator.rs
+++ b/crates/ruff_python_codegen/src/generator.rs
@@ -3,6 +3,7 @@
 use std::fmt::Write;
 use std::ops::Deref;
 
+use ruff_python_ast::str::Quote;
 use ruff_python_ast::{
     self as ast, Alias, AnyStringFlags, ArgOrKeyword, BoolOp, BytesLiteralFlags, CmpOp,
     Comprehension, ConversionFlag, DebugText, ExceptHandler, Expr, Identifier, MatchCase, Operator,
@@ -67,6 +68,8 @@ pub struct Generator<'a> {
     indent: &'a Indentation,
     /// The line ending to use.
     line_ending: LineEnding,
+    /// Preferred quote style to use. For more info see [`Generator::with_preferred_quote`].
+    preferred_quote: Option<Quote>,
     buffer: String,
     indent_depth: usize,
     num_newlines: usize,
@@ -78,6 +81,7 @@ impl<'a> From<&'a Stylist<'a>> for Generator<'a> {
         Self {
             indent: stylist.indentation(),
             line_ending: stylist.line_ending(),
+            preferred_quote: None,
             buffer: String::new(),
             indent_depth: 0,
             num_newlines: 0,
@@ -92,6 +96,7 @@ impl<'a> Generator<'a> {
             // Style preferences.
             indent,
             line_ending,
+            preferred_quote: None,
             // Internal state.
             buffer: String::new(),
             indent_depth: 0,
@@ -100,6 +105,16 @@ impl<'a> Generator<'a> {
         }
     }
 
+    /// Set a preferred quote style for generated source code.
+    ///
+    /// - If [`None`], the generator will attempt to preserve the existing quote style whenever possible.
+    /// - If [`Some`], the generator will prefer the specified quote style, ignoring the one found in the source.
+    #[must_use]
+    pub fn with_preferred_quote(mut self, quote: Option<Quote>) -> Self {
+        self.preferred_quote = quote;
+        self
+    }
+
     /// Generate source code from a [`Stmt`].
     pub fn stmt(mut self, stmt: &Stmt) -> String {
         self.unparse_stmt(stmt);
@@ -158,7 +173,8 @@ impl<'a> Generator<'a> {
                 return;
             }
         }
-        let escape = AsciiEscape::with_preferred_quote(s, flags.quote_style());
+        let quote_style = self.preferred_quote.unwrap_or_else(|| flags.quote_style());
+        let escape = AsciiEscape::with_preferred_quote(s, quote_style);
         if let Some(len) = escape.layout().len {
             self.buffer.reserve(len);
         }
@@ -176,7 +192,9 @@ impl<'a> Generator<'a> {
             return;
         }
         self.p(flags.prefix().as_str());
-        let escape = UnicodeEscape::with_preferred_quote(s, flags.quote_style());
+
+        let quote_style = self.preferred_quote.unwrap_or_else(|| flags.quote_style());
+        let escape = UnicodeEscape::with_preferred_quote(s, quote_style);
         if let Some(len) = escape.layout().len {
             self.buffer.reserve(len);
         }
@@ -1506,7 +1524,9 @@ impl<'a> Generator<'a> {
             self.buffer += &s;
             return;
         }
-        let escape = UnicodeEscape::with_preferred_quote(&s, flags.quote_style());
+
+        let quote_style = self.preferred_quote.unwrap_or_else(|| flags.quote_style());
+        let escape = UnicodeEscape::with_preferred_quote(&s, quote_style);
         if let Some(len) = escape.layout().len {
             self.buffer.reserve(len);
         }
@@ -1531,6 +1551,9 @@ impl<'a> Generator<'a> {
         flags: AnyStringFlags,
     ) {
         self.p(flags.prefix().as_str());
+
+        let flags =
+            flags.with_quote_style(self.preferred_quote.unwrap_or_else(|| flags.quote_style()));
         self.p(flags.quote_str());
         self.unparse_interpolated_string_body(values, flags);
         self.p(flags.quote_str());
@@ -1563,6 +1586,7 @@ impl<'a> Generator<'a> {
 
 #[cfg(test)]
 mod tests {
+    use ruff_python_ast::str::Quote;
     use ruff_python_ast::{Mod, ModModule};
     use ruff_python_parser::{self, Mode, ParseOptions, parse_module};
     use ruff_source_file::LineEnding;
@@ -1580,15 +1604,17 @@ mod tests {
         generator.generate()
     }
 
-    /// Like [`round_trip`] but configure the [`Generator`] with the requested `indentation` and
-    /// `line_ending` settings.
+    /// Like [`round_trip`] but configure the [`Generator`] with the requested
+    /// `indentation`, `line_ending` and `preferred_quote` settings.
     fn round_trip_with(
         indentation: &Indentation,
         line_ending: LineEnding,
+        preferred_quote: Option<Quote>,
         contents: &str,
     ) -> String {
         let module = parse_module(contents).unwrap();
-        let mut generator = Generator::new(indentation, line_ending);
+        let mut generator =
+            Generator::new(indentation, line_ending).with_preferred_quote(preferred_quote);
         generator.unparse_suite(module.suite());
         generator.generate()
     }
@@ -1974,6 +2000,7 @@ if True:
             round_trip_with(
                 &Indentation::new("    ".to_string()),
                 LineEnding::default(),
+                None,
                 r"
 if True:
   pass
@@ -1991,6 +2018,7 @@ if True:
             round_trip_with(
                 &Indentation::new("  ".to_string()),
                 LineEnding::default(),
+                None,
                 r"
 if True:
   pass
@@ -2008,6 +2036,7 @@ if True:
             round_trip_with(
                 &Indentation::new("\t".to_string()),
                 LineEnding::default(),
+                None,
                 r"
 if True:
   pass
@@ -2029,6 +2058,7 @@ if True:
             round_trip_with(
                 &Indentation::default(),
                 LineEnding::Lf,
+                None,
                 "if True:\n    print(42)",
             ),
             "if True:\n    print(42)",
@@ -2038,6 +2068,7 @@ if True:
             round_trip_with(
                 &Indentation::default(),
                 LineEnding::CrLf,
+                None,
                 "if True:\n    print(42)",
             ),
             "if True:\r\n    print(42)",
@@ -2047,9 +2078,32 @@ if True:
             round_trip_with(
                 &Indentation::default(),
                 LineEnding::Cr,
+                None,
                 "if True:\n    print(42)",
             ),
             "if True:\r    print(42)",
         );
     }
+
+    #[test_case::test_case(r#""'hello'""#, r#""'hello'""#, Quote::Single ; "basic str ignored")]
+    #[test_case::test_case(r#"b"'hello'""#, r#"b"'hello'""#, Quote::Single ; "basic bytes ignored")]
+    #[test_case::test_case("'hello'", r#""hello""#, Quote::Double ; "basic str double")]
+    #[test_case::test_case(r#""hello""#, "'hello'", Quote::Single ; "basic str single")]
+    #[test_case::test_case("b'hello'", r#"b"hello""#, Quote::Double ; "basic bytes double")]
+    #[test_case::test_case(r#"b"hello""#, "b'hello'", Quote::Single ; "basic bytes single")]
+    #[test_case::test_case(r#""hello""#,  r#""hello""#, Quote::Double ; "remain str double")]
+    #[test_case::test_case("'hello'", "'hello'", Quote::Single ; "remain str single")]
+    #[test_case::test_case("x: list['str']", r#"x: list["str"]"#, Quote::Double ; "type ann double")]
+    #[test_case::test_case(r#"x: list["str"]"#, "x: list['str']", Quote::Single ; "type ann single")]
+    #[test_case::test_case("f'hello'", r#"f"hello""#, Quote::Double ; "basic fstring double")]
+    #[test_case::test_case(r#"f"hello""#, "f'hello'", Quote::Single ; "basic fstring single")]
+    fn preferred_quote(inp: &str, out: &str, quote: Quote) {
+        let got = round_trip_with(
+            &Indentation::default(),
+            LineEnding::default(),
+            Some(quote),
+            inp,
+        );
+        assert_eq!(got, out);
+    }
 }
diff --git a/crates/ruff_python_codegen/src/lib.rs b/crates/ruff_python_codegen/src/lib.rs
index 81a25cef1c..aeeab4a747 100644
--- a/crates/ruff_python_codegen/src/lib.rs
+++ b/crates/ruff_python_codegen/src/lib.rs
@@ -1,6 +1,6 @@
 pub use generator::Generator;
 use ruff_python_parser::{ParseError, parse_module};
-pub use stylist::Stylist;
+pub use stylist::{Indentation, Stylist};
 
 mod generator;
 mod stylist;
diff --git a/crates/ruff_python_codegen/src/stylist.rs b/crates/ruff_python_codegen/src/stylist.rs
index d8165941bf..8daf9b3a4f 100644
--- a/crates/ruff_python_codegen/src/stylist.rs
+++ b/crates/ruff_python_codegen/src/stylist.rs
@@ -1,5 +1,6 @@
 //! Detect code style from Python source code.
 
+use std::borrow::Cow;
 use std::cell::OnceCell;
 use std::ops::Deref;
 
@@ -10,34 +11,43 @@ use ruff_text_size::Ranged;
 
 #[derive(Debug, Clone)]
 pub struct Stylist<'a> {
-    source: &'a str,
+    source: Cow<'a, str>,
     indentation: Indentation,
     quote: Quote,
     line_ending: OnceCell<LineEnding>,
 }
 
 impl<'a> Stylist<'a> {
-    pub fn indentation(&'a self) -> &'a Indentation {
+    pub fn indentation(&self) -> &Indentation {
         &self.indentation
     }
 
-    pub fn quote(&'a self) -> Quote {
+    pub fn quote(&self) -> Quote {
         self.quote
     }
 
-    pub fn line_ending(&'a self) -> LineEnding {
+    pub fn line_ending(&self) -> LineEnding {
         *self.line_ending.get_or_init(|| {
-            find_newline(self.source)
+            find_newline(&self.source)
                 .map(|(_, ending)| ending)
                 .unwrap_or_default()
         })
     }
 
+    pub fn into_owned(self) -> Stylist<'static> {
+        Stylist {
+            source: Cow::Owned(self.source.into_owned()),
+            indentation: self.indentation,
+            quote: self.quote,
+            line_ending: self.line_ending,
+        }
+    }
+
     pub fn from_tokens(tokens: &Tokens, source: &'a str) -> Self {
         let indentation = detect_indentation(tokens, source);
 
         Self {
-            source,
+            source: Cow::Borrowed(source),
             indentation,
             quote: detect_quote(tokens),
             line_ending: OnceCell::default(),
diff --git a/crates/ruff_python_formatter/Cargo.toml b/crates/ruff_python_formatter/Cargo.toml
index 1f351ca622..95ca60ee10 100644
--- a/crates/ruff_python_formatter/Cargo.toml
+++ b/crates/ruff_python_formatter/Cargo.toml
@@ -34,6 +34,7 @@ rustc-hash = { workspace = true }
 salsa = { workspace = true }
 serde = { workspace = true, optional = true }
 schemars = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 smallvec = { workspace = true }
 static_assertions = { workspace = true }
 thiserror = { workspace = true }
@@ -66,7 +67,7 @@ serde = [
     "ruff_source_file/serde",
     "ruff_python_ast/serde",
 ]
-schemars = ["dep:schemars", "ruff_formatter/schemars"]
+schemars = ["dep:schemars", "dep:serde_json", "ruff_formatter/schemars"]
 
 [lints]
 workspace = true
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py
new file mode 100644
index 0000000000..acba780f0d
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py
@@ -0,0 +1,7 @@
+# regression test for #1765
+class Foo:
+    def foo(self):
+        if True:
+            content_ids: Mapping[
+                str, Optional[ContentId]
+            ] = self.publisher_content_store.store_config_contents(files)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py.expect
new file mode 100644
index 0000000000..c256da26b7
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py.expect
@@ -0,0 +1,7 @@
+# regression test for #1765
+class Foo:
+    def foo(self):
+        if True:
+            content_ids: Mapping[str, Optional[ContentId]] = (
+                self.publisher_content_store.store_config_contents(files)
+            )
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/backslash_before_indent.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/backslash_before_indent.options.json
index 54724b66c5..717b73130f 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/backslash_before_indent.options.json
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/backslash_before_indent.options.json
@@ -1 +1 @@
-{"target_version": "3.10"}
+{"target_version": "3.10"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py
new file mode 100644
index 0000000000..df8ae398bf
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py
@@ -0,0 +1,35 @@
+# long variable name
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 0
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 1  # with a comment
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = [
+    1, 2, 3
+]
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function()
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    arg1, arg2, arg3
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+# long function name
+normal_name = but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying()
+normal_name = but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+    arg1, arg2, arg3
+)
+normal_name = but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+string_variable_name = (
+    "a string that is waaaaaaaayyyyyyyy too long, even in parens, there's nothing you can do"  # noqa
+)
+for key in """
+    hostname
+    port
+    username
+""".split():
+    if key in self.connect_kwargs:
+        raise ValueError(err.format(key))
+concatenated_strings = "some strings that are " "concatenated implicitly, so if you put them on separate " "lines it will fit"
+del concatenated_strings, string_variable_name, normal_function_name, normal_name, need_more_to_make_the_line_long_enough
+del ([], name_1, name_2), [(), [], name_4, name_3], name_1[[name_2 for name_1 in name_0]]
+del (),
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py.expect
new file mode 100644
index 0000000000..708959ceec
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py.expect
@@ -0,0 +1,61 @@
+# long variable name
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+    0
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+    1  # with a comment
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = [
+    1,
+    2,
+    3,
+]
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+    function()
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    arg1, arg2, arg3
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+# long function name
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying()
+)
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+        arg1, arg2, arg3
+    )
+)
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+        [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+    )
+)
+string_variable_name = "a string that is waaaaaaaayyyyyyyy too long, even in parens, there's nothing you can do"  # noqa
+for key in """
+    hostname
+    port
+    username
+""".split():
+    if key in self.connect_kwargs:
+        raise ValueError(err.format(key))
+concatenated_strings = (
+    "some strings that are "
+    "concatenated implicitly, so if you put them on separate "
+    "lines it will fit"
+)
+del (
+    concatenated_strings,
+    string_variable_name,
+    normal_function_name,
+    normal_name,
+    need_more_to_make_the_line_long_enough,
+)
+del (
+    ([], name_1, name_2),
+    [(), [], name_4, name_3],
+    name_1[[name_2 for name_1 in name_0]],
+)
+del ((),)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_38.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_38.options.json
index fa1bf06046..01777c6d8f 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_38.options.json
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_38.options.json
@@ -1 +1 @@
-{"target_version": "3.8"}
+{"target_version": "3.8"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py
index f0ae005363..ec4ceb907c 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py
@@ -82,3 +82,9 @@ async def func():
         argument1, argument2, argument3="some_value"
     ):
         pass
+
+
+
+# don't remove the brackets here, it changes the meaning of the code.
+with (x, y) as z:
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py.expect
index 1b8e865933..ccf073c802 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_39.py.expect
@@ -83,3 +83,8 @@ async def func():
         some_other_function(argument1, argument2, argument3="some_value"),
     ):
         pass
+
+
+# don't remove the brackets here, it changes the meaning of the code.
+with (x, y) as z:
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/docstring_newline.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/docstring_newline.py
new file mode 100644
index 0000000000..75b8db4817
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/docstring_newline.py
@@ -0,0 +1,3 @@
+"""
+87 characters ............................................................................
+"""
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/docstring_newline.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/docstring_newline.py.expect
new file mode 100644
index 0000000000..75b8db4817
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/docstring_newline.py.expect
@@ -0,0 +1,3 @@
+"""
+87 characters ............................................................................
+"""
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip9.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.options.json
similarity index 100%
rename from crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip9.options.json
rename to crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.options.json
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py
new file mode 100644
index 0000000000..f271d57aa8
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py
@@ -0,0 +1,8 @@
+def foo(): return "mock"  # fmt: skip
+if True: print("yay")  # fmt: skip
+for i in range(10): print(i)  # fmt: skip
+
+j =     1 # fmt: skip
+while j < 10: j += 1  # fmt: skip
+
+b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"] # fmt: skip
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py.expect
new file mode 100644
index 0000000000..f271d57aa8
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py.expect
@@ -0,0 +1,8 @@
+def foo(): return "mock"  # fmt: skip
+if True: print("yay")  # fmt: skip
+for i in range(10): print(i)  # fmt: skip
+
+j =     1 # fmt: skip
+while j < 10: j += 1  # fmt: skip
+
+b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"] # fmt: skip
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py
new file mode 100644
index 0000000000..5d3f7874e5
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py
@@ -0,0 +1,6 @@
+def foo():
+    pass
+
+
+# comment 1  # fmt: skip
+# comment 2
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py.expect
new file mode 100644
index 0000000000..5d3f7874e5
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py.expect
@@ -0,0 +1,6 @@
+def foo():
+    pass
+
+
+# comment 1  # fmt: skip
+# comment 2
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/format_unicode_escape_seq.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/format_unicode_escape_seq.py
new file mode 100644
index 0000000000..70699c5663
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/format_unicode_escape_seq.py
@@ -0,0 +1,15 @@
+x = "\x1F"
+x = "\\x1B"
+x = "\\\x1B"
+x = "\U0001F60E"
+x = "\u0001F60E"
+x = r"\u0001F60E"
+x = "don't format me"
+x = "\xA3"
+x = "\u2717"
+x = "\uFaCe"
+x = "\N{ox}\N{OX}"
+x = "\N{lAtIn smaLL letteR x}"
+x = "\N{CYRILLIC small LETTER BYELORUSSIAN-UKRAINIAN I}"
+x = b"\x1Fdon't byte"
+x = rb"\x1Fdon't format"
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/format_unicode_escape_seq.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/format_unicode_escape_seq.py.expect
new file mode 100644
index 0000000000..d12e858bf0
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/format_unicode_escape_seq.py.expect
@@ -0,0 +1,15 @@
+x = "\x1f"
+x = "\\x1B"
+x = "\\\x1b"
+x = "\U0001f60e"
+x = "\u0001F60E"
+x = r"\u0001F60E"
+x = "don't format me"
+x = "\xa3"
+x = "\u2717"
+x = "\uface"
+x = "\N{OX}\N{OX}"
+x = "\N{LATIN SMALL LETTER X}"
+x = "\N{CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I}"
+x = b"\x1fdon't byte"
+x = rb"\x1Fdon't format"
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring.options.json
deleted file mode 100644
index a97114e048..0000000000
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring.options.json
+++ /dev/null
@@ -1 +0,0 @@
-{"target_version": "3.12"}
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py
new file mode 100644
index 0000000000..d82ce7980f
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py
@@ -0,0 +1,34 @@
+# Regression tests for long f-strings, including examples from issue #3623
+
+a = (
+    'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+)
+
+a = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + \
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+
+a = f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"' + \
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+
+a = (
+    f'bbbbbbb"{"b"}"'
+    'aaaaaaaa'
+)
+
+a = (
+    f'"{"b"}"'
+)
+
+a = (
+    f'\"{"b"}\"'
+)
+
+a = (
+    r'\"{"b"}\"'
+)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py.expect
new file mode 100644
index 0000000000..30f456cd22
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py.expect
@@ -0,0 +1,29 @@
+# Regression tests for long f-strings, including examples from issue #3623
+
+a = (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+)
+
+a = (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = f'bbbbbbb"{"b"}"' "aaaaaaaa"
+
+a = f'"{"b"}"'
+
+a = f'"{"b"}"'
+
+a = r'\"{"b"}\"'
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json
index 1266ed1e66..717b73130f 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json
@@ -1 +1 @@
-{"preview": "enabled", "target_version": "3.10"}
\ No newline at end of file
+{"target_version": "3.10"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.options.json
new file mode 100644
index 0000000000..4295ffe1df
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.options.json
@@ -0,0 +1 @@
+{"target_version": "3.12"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py
new file mode 100644
index 0000000000..ab85998300
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py
@@ -0,0 +1,133 @@
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+def arg_magic[T, B](a: T, b: T,) -> T:
+    return a
+
+def type_param_magic[T, B,](a: T, b: T) -> T:
+    return a
+
+def both_magic[T, B,](a: T, b: T,) -> T:
+    return a
+
+
+def plain_multiline[
+    T,
+    B
+](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def arg_magic_multiline[
+    T,
+    B
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def type_param_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def both_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_mixed1[
+    T,
+    B
+](a: T, b: T) -> T:
+    return a
+
+def plain_mixed2[T, B](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def arg_magic_mixed1[
+    T,
+    B
+](a: T, b: T,) -> T:
+    return a
+
+def arg_magic_mixed2[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def type_param_magic_mixed1[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+def type_param_magic_mixed2[T, B,](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def both_magic_mixed1[
+    T,
+    B,
+](a: T, b: T,) -> T:
+    return a
+
+def both_magic_mixed2[T, B,](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def something_something_function[
+    T: Model
+](param: list[int], other_param: type[T], *, some_other_param: bool = True) -> QuerySet[
+    T
+]:
+    pass
+
+
+def func[A_LOT_OF_GENERIC_TYPES: AreBeingDefinedHere, LIKE_THIS, AND_THIS, ANOTHER_ONE, AND_YET_ANOTHER_ONE: ThisOneHasTyping](a: T, b: T, c: T, d: T, e: T, f: T, g: T, h: T, i: T, j: T, k: T, l: T, m: T, n: T, o: T, p: T) -> T:
+    return a
+
+
+def with_random_comments[
+    Z
+    # bye
+]():
+    return a
+
+
+def func[
+    T,  # comment
+    U  # comment
+    ,
+    Z:  # comment
+    int
+](): pass
+
+
+def func[
+    T,  # comment but it's long so it doesn't just move to the end of the line
+    U  # comment comment comm comm ent ent
+    ,
+    Z:  # comment ent ent comm comm comment
+    int
+](): pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py.expect
new file mode 100644
index 0000000000..1631dd320a
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py.expect
@@ -0,0 +1,170 @@
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def both_magic[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_multiline[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic_multiline[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def both_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def plain_mixed2[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_mixed1[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def arg_magic_mixed2[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic_mixed1[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def type_param_magic_mixed2[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def both_magic_mixed1[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def both_magic_mixed2[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def something_something_function[T: Model](
+    param: list[int], other_param: type[T], *, some_other_param: bool = True
+) -> QuerySet[T]:
+    pass
+
+
+def func[
+    A_LOT_OF_GENERIC_TYPES: AreBeingDefinedHere,
+    LIKE_THIS,
+    AND_THIS,
+    ANOTHER_ONE,
+    AND_YET_ANOTHER_ONE: ThisOneHasTyping,
+](
+    a: T,
+    b: T,
+    c: T,
+    d: T,
+    e: T,
+    f: T,
+    g: T,
+    h: T,
+    i: T,
+    j: T,
+    k: T,
+    l: T,
+    m: T,
+    n: T,
+    o: T,
+    p: T,
+) -> T:
+    return a
+
+
+def with_random_comments[
+    Z
+    # bye
+]():
+    return a
+
+
+def func[T, U, Z: int]():  # comment  # comment  # comment
+    pass
+
+
+def func[
+    T,  # comment but it's long so it doesn't just move to the end of the line
+    U,  # comment comment comm comm ent ent
+    Z: int,  # comment ent ent comm comm comment
+]():
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/import_comments.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/import_comments.py
new file mode 100644
index 0000000000..d65ea72720
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/import_comments.py
@@ -0,0 +1,47 @@
+# ensure trailing comments are preserved
+import x  # comment
+from x import a  # comment
+from x import a, b  # comment
+from x import a as b  # comment
+from x import a as b, b as c  # comment
+
+from x import (
+    a,  # comment
+)
+from x import (
+    a,  # comment
+    b,
+)
+
+# ensure comma is added
+from x import (
+    a  # comment
+)
+
+# follow black style by merging cases without own-line comments
+from x import (
+    a  # alpha
+    ,  # beta
+    b,
+)
+
+# ensure intermixed comments are all preserved
+from x import (  # one
+    # two
+    a  # three
+    # four
+    ,  # five
+    # six
+)  # seven
+
+from x import (  # alpha
+    # bravo
+    a  # charlie
+    # delta
+    as  # echo
+    # foxtrot
+    b  # golf
+    # hotel
+    ,  # india
+    # juliet
+)  # kilo
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/import_comments.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/import_comments.py.expect
new file mode 100644
index 0000000000..a493a13d91
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/import_comments.py.expect
@@ -0,0 +1,46 @@
+# ensure trailing comments are preserved
+import x  # comment
+from x import a  # comment
+from x import a, b  # comment
+from x import a as b  # comment
+from x import a as b, b as c  # comment
+
+from x import (
+    a,  # comment
+)
+from x import (
+    a,  # comment
+    b,
+)
+
+# ensure comma is added
+from x import (
+    a,  # comment
+)
+
+# follow black style by merging cases without own-line comments
+from x import (
+    a,  # alpha  # beta
+    b,
+)
+
+# ensure intermixed comments are all preserved
+from x import (  # one
+    # two
+    a  # three
+    # four
+    ,  # five
+    # six
+)  # seven
+
+from x import (  # alpha
+    # bravo
+    a  # charlie
+    # delta
+    as  # echo
+    # foxtrot
+    b  # golf
+    # hotel
+    ,  # india
+    # juliet
+)  # kilo
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py
index 3dc4e3af71..c39bb99bcf 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py
@@ -6,7 +6,7 @@ def foo2(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parame
 def foo3(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parameter_6, parameter_7): pass
 def foo4(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parameter_6, parameter_7): pass
 
-# Adding some unformatted code covering a wide range of syntaxes.
+# Adding some unformated code covering a wide range of syntaxes.
 
 if True:
       # Incorrectly indented prefix comments.
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py.expect
index 01c9c002e3..7fdfdfd0db 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_basic.py.expect
@@ -28,7 +28,7 @@ def foo3(
 
 def foo4(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parameter_6, parameter_7): pass
 
-# Adding some unformatted code covering a wide range of syntaxes.
+# Adding some unformated code covering a wide range of syntaxes.
 
 if True:
       # Incorrectly indented prefix comments.
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_decorator_edge_case.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_decorator_edge_case.py
new file mode 100644
index 0000000000..483fbe8c57
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_decorator_edge_case.py
@@ -0,0 +1,8 @@
+# flags: --line-ranges=6-7
+class Foo:
+
+    @overload
+    def foo(): ...
+
+    def fox(self):
+        print()
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_decorator_edge_case.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_decorator_edge_case.py.expect
new file mode 100644
index 0000000000..483fbe8c57
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/line_ranges_decorator_edge_case.py.expect
@@ -0,0 +1,8 @@
+# flags: --line-ranges=6-7
+class Foo:
+
+    @overload
+    def foo(): ...
+
+    def fox(self):
+        print()
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py
new file mode 100644
index 0000000000..4907fec71c
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py
@@ -0,0 +1,28 @@
+def func(
+    arg1,
+    arg2,
+) -> Set["this_is_a_very_long_module_name.AndAVeryLongClasName"
+         ".WithAVeryVeryVeryVeryVeryLongSubClassName"]:
+  pass
+
+
+def func(
+    argument: (
+        "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+        "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+    ),
+) -> (
+    "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+    "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+):
+  pass
+
+
+def func(
+    argument: (
+        "int |"
+        "str"
+    ),
+) -> Set["int |"
+         " str"]:
+  pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py.expect
new file mode 100644
index 0000000000..679df21eed
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py.expect
@@ -0,0 +1,26 @@
+def func(
+    arg1,
+    arg2,
+) -> Set[
+    "this_is_a_very_long_module_name.AndAVeryLongClasName"
+    ".WithAVeryVeryVeryVeryVeryLongSubClassName"
+]:
+    pass
+
+
+def func(
+    argument: (
+        "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+        "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+    ),
+) -> (
+    "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+    "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+):
+    pass
+
+
+def func(
+    argument: "int |" "str",
+) -> Set["int |" " str"]:
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py
index 0e29b14bf4..724e28cd4e 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py
@@ -1,6 +1,6 @@
 """I am a very helpful module docstring.
 
-With trailing spaces (only removed with unify_docstring_detection on):      
+With trailing spaces:      
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam,
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py.expect
index 7c31ef75cf..9b270c521b 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.py.expect
@@ -1,6 +1,6 @@
 """I am a very helpful module docstring.
 
-With trailing spaces (only removed with unify_docstring_detection on):
+With trailing spaces:
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam,
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/is_simple_lookup_for_doublestar_expression.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.options.json
similarity index 100%
rename from crates/ruff_python_formatter/resources/test/fixtures/black/cases/is_simple_lookup_for_doublestar_expression.options.json
rename to crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.options.json
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.py
new file mode 100644
index 0000000000..7374829c44
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.py
@@ -0,0 +1,9 @@
+#!/python
+
+# regression test for #4762
+"""
+docstring
+"""
+from __future__ import annotations
+
+import os
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.py.expect
new file mode 100644
index 0000000000..50c57b9d8a
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_after_comment.py.expect
@@ -0,0 +1,10 @@
+#!/python
+
+# regression test for #4762
+"""
+docstring
+"""
+
+from __future__ import annotations
+
+import os
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/no_blank_line_before_docstring.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/no_blank_line_before_docstring.py.expect
index 3e1118fba6..fa042f4933 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/no_blank_line_before_docstring.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/no_blank_line_before_docstring.py.expect
@@ -25,5 +25,4 @@ class MultilineDocstringsAsWell:
 
 
 class SingleQuotedDocstring:
-
     "I'm a docstring but I don't even get triple quotes."
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_with_if_stmt.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_with_if_stmt.options.json
index 1266ed1e66..717b73130f 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_with_if_stmt.options.json
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_with_if_stmt.options.json
@@ -1 +1 @@
-{"preview": "enabled", "target_version": "3.10"}
\ No newline at end of file
+{"target_version": "3.10"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py
index 930759735b..bd3e48417b 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py
@@ -19,7 +19,7 @@ z: (Short
 z: (int) = 2.3
 z: ((int)) = foo()
 
-# In case I go for not enforcing parentheses, this might get improved at the same time
+# In case I go for not enforcing parantheses, this might get improved at the same time
 x = (
     z
     == 9999999999999999999999999999999999999999
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py.expect
index e9c2f75f7e..ab0a4d9677 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py.expect
@@ -28,7 +28,7 @@ z: Short | Short2 | Short3 | Short4 = 8
 z: int = 2.3
 z: int = foo()
 
-# In case I go for not enforcing parentheses, this might get improved at the same time
+# In case I go for not enforcing parantheses, this might get improved at the same time
 x = (
     z
     == 9999999999999999999999999999999999999999
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.options.json
new file mode 100644
index 0000000000..dcb1b48257
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.options.json
@@ -0,0 +1 @@
+{"target_version": "3.11"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.py
new file mode 100644
index 0000000000..cd44304ce3
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.py
@@ -0,0 +1,5 @@
+def fn(*args: *tuple[*A, B]) -> None:
+    pass
+
+
+fn.__annotations__
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.py.expect
new file mode 100644
index 0000000000..cd44304ce3
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep646_typed_star_arg_type_var_tuple.py.expect
@@ -0,0 +1,5 @@
+def fn(*args: *tuple[*A, B]) -> None:
+    pass
+
+
+fn.__annotations__
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py
index 3487ac8536..defb0f99e3 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py
@@ -13,3 +13,8 @@ f(a := b + c for c in range(10))
 f((a := b + c for c in range(10)), x)
 f(y=(a := b + c for c in range(10)))
 f(x, (a := b + c for c in range(10)), y=z, **q)
+
+
+# Don't remove parens when assignment expr is one of the exprs in a with statement
+with x, (a := b):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py.expect
index 3487ac8536..defb0f99e3 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.py.expect
@@ -13,3 +13,8 @@ f(a := b + c for c in range(10))
 f((a := b + c for c in range(10)), x)
 f(y=(a := b + c for c in range(10)))
 f(x, (a := b + c for c in range(10)), y=z, **q)
+
+
+# Don't remove parens when assignment expr is one of the exprs in a with statement
+with x, (a := b):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py
index 8224f38ea2..eff207ff8a 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py
@@ -73,8 +73,9 @@ x = f"a{2+2:=^{foo(x+y**2):something else}}b"
 x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
 f'{(abc:=10)}'
 
-f"This is a really long string, but just make sure that you reflow fstrings {
-    2+2:d}"
+f"""This is a really long string, but just make sure that you reflow fstrings {
+    2+2:d
+}"""
 f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
 
 f"{2+2=}"
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py.expect
index 74a6ecd5e7..85b8db2ff6 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.py.expect
@@ -73,9 +73,9 @@ x = f"a{2+2:=^{foo(x+y**2):something else}}b"
 x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
 f"{(abc:=10)}"
 
-f"This is a really long string, but just make sure that you reflow fstrings {
+f"""This is a really long string, but just make sure that you reflow fstrings {
     2+2:d
-}"
+}"""
 f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
 
 f"{2+2=}"
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py
index 6d91909dfe..7cd0478474 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py
@@ -10,3 +10,12 @@ first_value, (m1, m2,), third_value = xxxxxx_yyyyyy_zzzzzz_wwwwww_uuuuuuu_vvvvvv
 # 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
+
+# Regression test for #1187
+print(
+    dict(
+        a=1,
+        b=2 if some_kind_of_data is not None else some_other_kind_of_data,  # some explanation of why this is actually necessary
+        c=3,
+    )
+)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py.expect
index 9a9ef1356e..392cb3ba15 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py.expect
@@ -19,3 +19,14 @@
 xxxxxxxxx_yyy_zzzzzzzz[
     xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxxx=1)
 ] = 1
+
+# Regression test for #1187
+print(
+    dict(
+        a=1,
+        b=(
+            2 if some_kind_of_data is not None else some_other_kind_of_data
+        ),  # some explanation of why this is actually necessary
+        c=3,
+    )
+)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_comments7.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_comments7.py.expect
index 9e583ab571..bddab7e5da 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_comments7.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_comments7.py.expect
@@ -29,7 +29,6 @@ from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component
     MyLovelyCompanyTeamProjectComponent as component,  # DRY
 )
 
-
 result = 1  # look ma, no comment migration xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 result = 1  # look ma, no comment migration xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.options.json
similarity index 100%
rename from crates/ruff_python_formatter/resources/test/fixtures/black/cases/module_docstring_2.options.json
rename to crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.options.json
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.py
new file mode 100644
index 0000000000..152cae13f0
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.py
@@ -0,0 +1 @@
+f"{''=}" f'{""=}'
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.py.expect
new file mode 100644
index 0000000000..152cae13f0
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_fstring.py.expect
@@ -0,0 +1 @@
+f"{''=}" f'{""=}'
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/typed_params_trailing_comma.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.options.json
similarity index 100%
rename from crates/ruff_python_formatter/resources/test/fixtures/black/cases/typed_params_trailing_comma.options.json
rename to crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.options.json
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py
new file mode 100644
index 0000000000..08195ec4cb
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py
@@ -0,0 +1,90 @@
+from middleman.authentication import validate_oauth_token
+
+
+logger = logging.getLogger(__name__)
+
+
+# case 2 comment after import
+from middleman.authentication import validate_oauth_token
+#comment
+
+logger = logging.getLogger(__name__)
+
+
+# case 3 comment after import
+from middleman.authentication import validate_oauth_token
+# comment
+logger = logging.getLogger(__name__)
+
+
+from middleman.authentication import validate_oauth_token
+
+
+
+logger = logging.getLogger(__name__)
+
+
+# case 4 try catch with import after import
+import os
+import os
+
+
+
+try:
+    import os
+except Exception:
+    pass
+
+try:
+    import os
+    def func():
+        a = 1
+except Exception:
+    pass
+
+
+# case 5 multiple imports
+import os
+import os
+
+import os
+import os
+
+
+
+
+
+for i in range(10):
+    print(i)
+
+
+# case 6 import in function
+def func():
+    print()
+    import os
+    def func():
+        pass
+    print()
+
+
+def func():
+    import os
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+
+
+    a = 1
+    print()
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py.expect
new file mode 100644
index 0000000000..c6dea1666e
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py.expect
@@ -0,0 +1,85 @@
+from middleman.authentication import validate_oauth_token
+
+logger = logging.getLogger(__name__)
+
+
+# case 2 comment after import
+from middleman.authentication import validate_oauth_token
+
+# comment
+
+logger = logging.getLogger(__name__)
+
+
+# case 3 comment after import
+from middleman.authentication import validate_oauth_token
+
+# comment
+logger = logging.getLogger(__name__)
+
+
+from middleman.authentication import validate_oauth_token
+
+logger = logging.getLogger(__name__)
+
+
+# case 4 try catch with import after import
+import os
+import os
+
+try:
+    import os
+except Exception:
+    pass
+
+try:
+    import os
+
+    def func():
+        a = 1
+
+except Exception:
+    pass
+
+
+# case 5 multiple imports
+import os
+import os
+
+import os
+import os
+
+for i in range(10):
+    print(i)
+
+
+# case 6 import in function
+def func():
+    print()
+    import os
+
+    def func():
+        pass
+
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py
index 04355270d9..a6e137e1f4 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py
@@ -1,3 +1,24 @@
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "foo": bar,
+    "foo": bar,
+    "foo": (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
+
 my_dict = {
     "something_something":
         r"Lorem ipsum dolor sit amet, an sed convenire eloquentiam \t"
@@ -5,23 +26,90 @@ my_dict = {
         r"signiferumque, duo ea vocibus consetetur scriptorem. Facer \t",
 }
 
+# Function calls as keys
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src,
+    loop.run_in_executor(): src,
+    loop.run_in_executor(xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx): src,
+    loop.run_in_executor(
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxx
+    ): src,
+    loop.run_in_executor(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+
+# Dictionary comprehensions
+tasks = {
+    key_name: (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {key_name: foobar for src in sources}
+tasks = {
+    get_key_name(
+        src,
+    ): "foo"
+    for src in sources
+}
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src
+    for src in sources
+}
+tasks = {
+    get_key_name(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {get_key_name(): foobar for src in sources}
+
+
+# Delimiters inside the value
+def foo():
+    def bar():
+        x = {
+            common.models.DateTimeField: datetime(2020, 1, 31, tzinfo=utc) + timedelta(
+                days=i
+            ),
+        }
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            "foobar": (123 + 456),
+        }
+        x = {
+            "foobar": (123) + 456,
+        }
+
+
 my_dict = {
     "a key in my dict": a_very_long_variable * and_a_very_long_function_call() / 100000.0
 }
-
 my_dict = {
     "a key in my dict": a_very_long_variable * and_a_very_long_function_call() * and_another_long_func() / 100000.0
 }
-
 my_dict = {
     "a key in my dict": MyClass.some_attribute.first_call().second_call().third_call(some_args="some value")
 }
 
 {
-    'xxxxxx':
+    "xxxxxx":
         xxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxx(
             xxxxxxxxxxxxxx={
-                'x':
+                "x":
                     xxxxxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxx(
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=(
                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -29,8 +117,8 @@ my_dict = {
                                 xxxxxxxxxxxxx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 .xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx(
                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx={
-                                        'x': x.xx,
-                                        'x': x.x,
+                                        "x": x.xx,
+                                        "x": x.x,
                                     }))))
             }),
 }
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py.expect
index 40582b3632..7d7e2fad5e 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py.expect
@@ -1,3 +1,24 @@
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "foo": bar,
+    "foo": bar,
+    "foo": (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
+
 my_dict = {
     "something_something": (
         r"Lorem ipsum dolor sit amet, an sed convenire eloquentiam \t"
@@ -6,12 +27,80 @@ my_dict = {
     ),
 }
 
+# Function calls as keys
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src,
+    loop.run_in_executor(): src,
+    loop.run_in_executor(xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx): src,
+    loop.run_in_executor(
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxx
+    ): src,
+    loop.run_in_executor(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+
+# Dictionary comprehensions
+tasks = {
+    key_name: (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {key_name: foobar for src in sources}
+tasks = {
+    get_key_name(
+        src,
+    ): "foo"
+    for src in sources
+}
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src
+    for src in sources
+}
+tasks = {
+    get_key_name(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {get_key_name(): foobar for src in sources}
+
+
+# Delimiters inside the value
+def foo():
+    def bar():
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            "foobar": 123 + 456,
+        }
+        x = {
+            "foobar": (123) + 456,
+        }
+
+
 my_dict = {
     "a key in my dict": (
         a_very_long_variable * and_a_very_long_function_call() / 100000.0
     )
 }
-
 my_dict = {
     "a key in my dict": (
         a_very_long_variable
@@ -20,7 +109,6 @@ my_dict = {
         / 100000.0
     )
 }
-
 my_dict = {
     "a key in my dict": (
         MyClass.some_attribute.first_call()
@@ -51,8 +139,8 @@ my_dict = {
 
 class Random:
     def func():
-        random_service.status.active_states.inactive = (
-            make_new_top_level_state_from_dict({
+        random_service.status.active_states.inactive = make_new_top_level_state_from_dict(
+            {
                 "topLevelBase": {
                     "secondaryBase": {
                         "timestamp": 1234,
@@ -63,5 +151,5 @@ class Random:
                         ),
                     }
                 },
-            })
+            }
         )
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py
index 017f679115..411c03f540 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py
@@ -278,7 +278,7 @@ string_with_escaped_nameescape = (
     "........................................................................... \\N{LAO KO LA}"
 )
 
-msg = lambda x: f"this is a very very very long lambda value {x} that doesn't fit on a single line"
+msg = lambda x: f"this is a very very very very long lambda value {x} that doesn't fit on a single line"
 
 dict_with_lambda_values = {
     "join": lambda j: (
@@ -327,3 +327,17 @@ log.info(f'''Skipping: {"a" == 'b'} {desc["ms_name"]} {money=} {dte=} {pos_share
 log.info(f'''Skipping: {'a' == "b"=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}''')
 
 log.info(f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}""")
+
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx",
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+    )
+}
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py.expect
index 4b7bdd86d2..f1b0985ef1 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py.expect
@@ -508,11 +508,9 @@ string_with_escaped_nameescape = (
     " \\N{LAO KO LA}"
 )
 
-msg = (
-    lambda x: (
-        f"this is a very very very long lambda value {x} that doesn't fit on a single"
-        " line"
-    )
+msg = lambda x: (
+    f"this is a very very very very long lambda value {x} that doesn't fit on a"
+    " single line"
 )
 
 dict_with_lambda_values = {
@@ -537,43 +535,43 @@ code = (
 call(body="%s %s" % (",".join(items), suffix))
 
 log.info(
-    "Skipping:"
-    f' {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]=} {desc["exposure_max"]=}'
+    f'Skipping: {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=}'
+    f' {desc["status"]=} {desc["exposure_max"]=}'
 )
 
 log.info(
-    "Skipping:"
-    f" {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']=} {desc['exposure_max']=}"
+    f"Skipping: {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=}"
+    f" {desc['status']=} {desc['exposure_max']=}"
 )
 
 log.info(
-    "Skipping:"
-    f" {desc['db_id']} {foo('bar',x=123)} {'foo' != 'bar'} {(x := 'abc=')} {pos_share=} {desc['status']} {desc['exposure_max']}"
+    f'Skipping: {desc["db_id"]} {foo("bar",x=123)} {"foo" != "bar"} {(x := "abc=")}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=}'
+    f' {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=}'
+    f' {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f" {'a' == 'b' == 'c' == 'd'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"
+    f'Skipping: {"a" == "b" == "c" == "d"} {desc["ms_name"]} {money=} {dte=}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
@@ -592,3 +590,17 @@ log.info(
 log.info(
     f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"""
 )
+
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py
index 74b6cd43a2..ac0d3a3585 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py
@@ -551,6 +551,7 @@ a_dict = {
 }
 
 # Regression test for https://github.com/psf/black/issues/3506.
+# Regressed again by https://github.com/psf/black/pull/4498
 s = (
     "With single quote: ' "
     f" {my_dict['foo']}"
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py.expect
index 15c91275af..bfbfaedef0 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py.expect
@@ -672,9 +672,15 @@ a_dict = {
 }
 
 # Regression test for https://github.com/psf/black/issues/3506.
-s = f"With single quote: '  {my_dict['foo']} With double quote: \"  {my_dict['bar']}"
+# Regressed again by https://github.com/psf/black/pull/4498
+s = (
+    "With single quote: ' "
+    f" {my_dict['foo']}"
+    ' With double quote: " '
+    f' {my_dict["bar"]}'
+)
 
 s = (
     "Lorem Ipsum is simply dummy text of the printing and typesetting"
-    f" industry:'{my_dict['foo']}'"
+    f' industry:\'{my_dict["foo"]}\''
 )
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py
index 82a8657d6e..8293424771 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py
@@ -180,3 +180,70 @@ test
 assert some_var == expected_result, f"""
 expected: {expected_result}
 actual: {some_var}"""
+
+
+def foo():
+    a = {
+        xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx: {
+            "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+            "xxxxxxxx": """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+        },
+    }
+
+
+xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx = {
+    "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+    "xxxxxxxx": (
+        """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+    xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+    ),
+    "xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": """
+a
+a
+a
+a
+a""",
+}
+
+a = """
+""" if """
+""" == """
+""" else """
+"""
+
+a = """
+""" if b else """
+"""
+
+a = """
+""" if """
+""" == """
+""" else b
+
+a = b if """
+""" == """
+""" else """
+"""
+
+a = """
+""" if b else c
+
+a = c if b else """
+"""
+
+a = b if """
+""" == """
+""" else c
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py.expect
index 942ee085ea..0259c82b3e 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py.expect
@@ -214,3 +214,106 @@ test
 assert some_var == expected_result, f"""
 expected: {expected_result}
 actual: {some_var}"""
+
+
+def foo():
+    a = {
+        xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx: {
+            "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+        },
+    }
+
+
+xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx = {
+    "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+    "xxxxxxxx": (
+        """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+    xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+    ),
+    "xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+}
+
+a = (
+    """
+"""
+    if """
+"""
+    == """
+"""
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if b
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if """
+"""
+    == """
+"""
+    else b
+)
+
+a = (
+    b
+    if """
+"""
+    == """
+"""
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if b
+    else c
+)
+
+a = (
+    c
+    if b
+    else """
+"""
+)
+
+a = (
+    b
+    if """
+"""
+    == """
+"""
+    else c
+)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.options.json
new file mode 100644
index 0000000000..ce7c52b163
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.options.json
@@ -0,0 +1 @@
+{"preview": "enabled"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py
new file mode 100644
index 0000000000..8c24f9e829
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py
@@ -0,0 +1,136 @@
+items  = [(x for x in [1])]
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2"}
+        if some_var == ""
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        if some_var == "long strings"
+        else "123467890123467890"
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    )
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    )
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    )
+]
+
+# Shouldn't remove trailing commas
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    ),
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    ),
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    ),
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    ),
+]
+
+# Shouldn't add parentheses
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Shouldn't crash with comments
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py.expect
new file mode 100644
index 0000000000..e4e9641e16
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py.expect
@@ -0,0 +1,106 @@
+items = [(x for x in [1])]
+
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+items = [
+    "123456890123457890123468901234567890"
+    if some_var == "long strings"
+    else "123467890123467890"
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    and some_var == "long strings"
+    and {"key": "val"}
+]
+items = [
+    "123456890123457890123468901234567890"
+    and some_var == "long strings"
+    and "123467890123467890"
+]
+items = [
+    long_variable_name
+    and even_longer_variable_name
+    and yet_another_very_long_variable_name
+]
+
+# Shouldn't remove trailing commas
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    ),
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    ),
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    ),
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    ),
+]
+
+# Shouldn't add parentheses
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Shouldn't crash with comments
+items = [  # comment
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]  # comment
+
+items = [  # comment
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]  # comment
+
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+
+items = [  # comment  # comment
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]  # comment  # comment
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.options.json
new file mode 100644
index 0000000000..9f5eb7c209
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.options.json
@@ -0,0 +1 @@
+{"preview": "enabled", "line_width": 79}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py
new file mode 100644
index 0000000000..ec7e802674
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py
@@ -0,0 +1,69 @@
+[a for graph_path_expression in refined_constraint.condition_as_predicate.variables]
+[
+    a
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression
+    in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+[
+    (foobar_very_long_key, foobar_very_long_value)
+    for foobar_very_long_key, foobar_very_long_value in foobar_very_long_dictionary.items()
+]
+
+# Don't split the `in` if it's not too long
+lcomp3 = [
+    element.split("\n", 1)[0]
+    for element in collection.select_elements()
+    # right
+    if element is not None
+]
+
+# Don't remove parens around ternaries
+expected = [i for i in (a if b else c)]
+
+# Nested arrays
+# First in will not be split because it would still be too long
+[[
+    x
+    for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+    for y in xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+]]
+
+# Multiple comprehensions, only split the second `in`
+graph_path_expressions_in_local_constraint_refinements = [
+    graph_path_expression
+    for refined_constraint in self._local_constraint_refinements.values()
+    if refined_constraint is not None
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+
+# Dictionary comprehensions
+dict_with_really_long_names = {
+    really_really_long_key_name: an_even_longer_really_really_long_key_value
+    for really_really_long_key_name, an_even_longer_really_really_long_key_value in really_really_really_long_dict_name.items()
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in dictionary_with_super_really_long_name
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name
+    in dictionary_with_super_really_long_name
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key in (
+        dictionary
+    )
+}
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py.expect
new file mode 100644
index 0000000000..00c23c0b5c
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py.expect
@@ -0,0 +1,88 @@
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+[
+    (foobar_very_long_key, foobar_very_long_value)
+    for foobar_very_long_key, foobar_very_long_value in (
+        foobar_very_long_dictionary.items()
+    )
+]
+
+# Don't split the `in` if it's not too long
+lcomp3 = [
+    element.split("\n", 1)[0]
+    for element in collection.select_elements()
+    # right
+    if element is not None
+]
+
+# Don't remove parens around ternaries
+expected = [i for i in (a if b else c)]
+
+# Nested arrays
+# First in will not be split because it would still be too long
+[
+    [
+        x
+        for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+        for y in (
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        )
+    ]
+]
+
+# Multiple comprehensions, only split the second `in`
+graph_path_expressions_in_local_constraint_refinements = [
+    graph_path_expression
+    for refined_constraint in self._local_constraint_refinements.values()
+    if refined_constraint is not None
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+# Dictionary comprehensions
+dict_with_really_long_names = {
+    really_really_long_key_name: an_even_longer_really_really_long_key_value
+    for really_really_long_key_name, an_even_longer_really_really_long_key_value in (
+        really_really_really_long_dict_name.items()
+    )
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in (
+        dictionary_with_super_really_long_name
+    )
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in (
+        dictionary_with_super_really_long_name
+    )
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key in dictionary
+}
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py
index 3fcf6e0ffc..d0ef56e1fa 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py
@@ -10,6 +10,7 @@ def g():
 
 
 async def func():
+    await ...
     if test:
         out_batched = [
             i
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py.expect
index 3fcf6e0ffc..d0ef56e1fa 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.py.expect
@@ -10,6 +10,7 @@ def g():
 
 
 async def func():
+    await ...
     if test:
         out_batched = [
             i
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.options.json
new file mode 100644
index 0000000000..084ace6a74
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.options.json
@@ -0,0 +1 @@
+{"preview": "enabled", "target_version": "3.14"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.py
new file mode 100644
index 0000000000..92914e7442
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.py
@@ -0,0 +1,123 @@
+# SEE PEP 758 FOR MORE DETAILS
+# remains unchanged
+try:
+    pass
+except:
+    pass
+
+# remains unchanged
+try:
+    pass
+except ValueError:
+    pass
+
+try:
+    pass
+except* ValueError:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError):
+    pass
+
+try:
+    pass
+except* (ValueError):
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError) as e:
+    pass
+
+try:
+    pass
+except* (ValueError) as e:
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,):
+    pass
+
+try:
+    pass
+except* (ValueError,):
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,) as e:
+    pass
+
+try:
+    pass
+except* (ValueError,) as e:
+    pass
+
+# remains unchanged
+try:
+    pass
+except ValueError, TypeError, KeyboardInterrupt:
+    pass
+
+try:
+    pass
+except* ValueError, TypeError, KeyboardInterrupt:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt):
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt):
+    pass
+
+# parenthesis are not removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError if True else TypeError):
+    pass
+
+try:
+    pass
+except* (ValueError if True else TypeError):
+    pass
+
+# inner except: parenthesis are removed
+# outer except: parenthsis are not removed
+try:
+    try:
+        pass
+    except (TypeError, KeyboardInterrupt):
+        pass
+except (ValueError,):
+    pass
+
+try:
+    try:
+        pass
+    except* (TypeError, KeyboardInterrupt):
+        pass
+except* (ValueError,):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.py.expect
new file mode 100644
index 0000000000..9b7021868f
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens.py.expect
@@ -0,0 +1,123 @@
+# SEE PEP 758 FOR MORE DETAILS
+# remains unchanged
+try:
+    pass
+except:
+    pass
+
+# remains unchanged
+try:
+    pass
+except ValueError:
+    pass
+
+try:
+    pass
+except* ValueError:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError:
+    pass
+
+try:
+    pass
+except* ValueError:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError as e:
+    pass
+
+try:
+    pass
+except* ValueError as e:
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,):
+    pass
+
+try:
+    pass
+except* (ValueError,):
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,) as e:
+    pass
+
+try:
+    pass
+except* (ValueError,) as e:
+    pass
+
+# remains unchanged
+try:
+    pass
+except ValueError, TypeError, KeyboardInterrupt:
+    pass
+
+try:
+    pass
+except* ValueError, TypeError, KeyboardInterrupt:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError, TypeError, KeyboardInterrupt:
+    pass
+
+try:
+    pass
+except* ValueError, TypeError, KeyboardInterrupt:
+    pass
+
+# parenthesis are not removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError if True else TypeError:
+    pass
+
+try:
+    pass
+except* ValueError if True else TypeError:
+    pass
+
+# inner except: parenthesis are removed
+# outer except: parenthsis are not removed
+try:
+    try:
+        pass
+    except TypeError, KeyboardInterrupt:
+        pass
+except (ValueError,):
+    pass
+
+try:
+    try:
+        pass
+    except* TypeError, KeyboardInterrupt:
+        pass
+except* (ValueError,):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.options.json
new file mode 100644
index 0000000000..938747847c
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.options.json
@@ -0,0 +1 @@
+{"preview": "enabled", "target_version": "3.11"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.py
new file mode 100644
index 0000000000..0164513c1f
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.py
@@ -0,0 +1,111 @@
+# SEE PEP 758 FOR MORE DETAILS
+# remains unchanged
+try:
+    pass
+except:
+    pass
+
+# remains unchanged
+try:
+    pass
+except ValueError:
+    pass
+
+try:
+    pass
+except* ValueError:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError):
+    pass
+
+try:
+    pass
+except* (ValueError):
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError) as e:
+    pass
+
+try:
+    pass
+except* (ValueError) as e:
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,):
+    pass
+
+try:
+    pass
+except* (ValueError,):
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,) as e:
+    pass
+
+try:
+    pass
+except* (ValueError,) as e:
+    pass
+
+# parenthesis are not removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt):
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt):
+    pass
+
+# parenthesis are not removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except (ValueError if True else TypeError):
+    pass
+
+try:
+    pass
+except* (ValueError if True else TypeError):
+    pass
+
+# parenthesis are not removed
+try:
+    try:
+        pass
+    except (TypeError, KeyboardInterrupt):
+        pass
+except (ValueError,):
+    pass
+
+try:
+    try:
+        pass
+    except* (TypeError, KeyboardInterrupt):
+        pass
+except* (ValueError,):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.py.expect
new file mode 100644
index 0000000000..86bdb37d3e
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_except_types_parens_pre_py314.py.expect
@@ -0,0 +1,111 @@
+# SEE PEP 758 FOR MORE DETAILS
+# remains unchanged
+try:
+    pass
+except:
+    pass
+
+# remains unchanged
+try:
+    pass
+except ValueError:
+    pass
+
+try:
+    pass
+except* ValueError:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError:
+    pass
+
+try:
+    pass
+except* ValueError:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError as e:
+    pass
+
+try:
+    pass
+except* ValueError as e:
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,):
+    pass
+
+try:
+    pass
+except* (ValueError,):
+    pass
+
+# remains unchanged
+try:
+    pass
+except (ValueError,) as e:
+    pass
+
+try:
+    pass
+except* (ValueError,) as e:
+    pass
+
+# parenthesis are not removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt):
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt):
+    pass
+
+# parenthesis are not removed
+try:
+    pass
+except (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+try:
+    pass
+except* (ValueError, TypeError, KeyboardInterrupt) as e:
+    pass
+
+# parenthesis are removed
+try:
+    pass
+except ValueError if True else TypeError:
+    pass
+
+try:
+    pass
+except* ValueError if True else TypeError:
+    pass
+
+# parenthesis are not removed
+try:
+    try:
+        pass
+    except (TypeError, KeyboardInterrupt):
+        pass
+except (ValueError,):
+    pass
+
+try:
+    try:
+        pass
+    except* (TypeError, KeyboardInterrupt):
+        pass
+except* (ValueError,):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py
new file mode 100644
index 0000000000..22a829da68
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py
@@ -0,0 +1,80 @@
+items = [(123)]
+items = [(True)]
+items = [(((((True)))))]
+items = [(((((True,)))))]
+items = [((((()))))]
+items = [(x for x in [1])]
+items = {(123)}
+items = {(True)}
+items = {(((((True)))))}
+
+# Requires `hug_parens_with_braces_and_square_brackets` unstable style to remove parentheses
+# around multiline values
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2"}
+        if some_var == ""
+        else {"key": "val"}
+    )
+]
+
+# Comments should not cause crashes
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py.expect
new file mode 100644
index 0000000000..71cfcd7026
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py.expect
@@ -0,0 +1,74 @@
+items = [123]
+items = [True]
+items = [True]
+items = [(True,)]
+items = [()]
+items = [(x for x in [1])]
+items = {123}
+items = {True}
+items = {True}
+
+# Requires `hug_parens_with_braces_and_square_brackets` unstable style to remove parentheses
+# around multiline values
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Comments should not cause crashes
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_redundant_parens_in_case_guard.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_redundant_parens_in_case_guard.options.json
index 172715c6e4..cd2518bb62 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_redundant_parens_in_case_guard.options.json
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_redundant_parens_in_case_guard.options.json
@@ -1 +1 @@
-{"preview": "enabled", "line_width": 79, "target_version": "3.10"}
\ No newline at end of file
+{"line_width": 79, "target_version": "3.10"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py
index 9634bab444..6113e5679c 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py
@@ -52,3 +52,16 @@ with ((((open("bla.txt")))) as f):
 
 with ((((CtxManager1()))) as example1, (((CtxManager2()))) as example2):
     ...
+
+# regression tests for #3678
+with (a, *b):
+    pass
+
+with (a, (b, *c)):
+    pass
+
+with (a for b in c):
+    pass
+
+with (a, (b for c in d)):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py.expect
index e70d01b18d..f08cd13ff1 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.py.expect
@@ -61,3 +61,16 @@ with open("bla.txt") as f:
 
 with CtxManager1() as example1, CtxManager2() as example2:
     ...
+
+# regression tests for #3678
+with (a, *b):
+    pass
+
+with a, (b, *c):
+    pass
+
+with (a for b in c):
+    pass
+
+with a, (b for c in d):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.options.json
new file mode 100644
index 0000000000..4d80c0fb92
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.options.json
@@ -0,0 +1 @@
+{"target_version": "3.12", "magic_trailing_comma": "ignore"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.py
new file mode 100644
index 0000000000..8d2a6b9299
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.py
@@ -0,0 +1,97 @@
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+def arg_magic[T, B](a: T, b: T,) -> T:
+    return a
+
+def type_param_magic[T, B,](a: T, b: T) -> T:
+    return a
+
+def both_magic[T, B,](a: T, b: T,) -> T:
+    return a
+
+
+def plain_multiline[
+    T,
+    B
+](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def arg_magic_multiline[
+    T,
+    B
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def type_param_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def both_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_mixed1[
+    T,
+    B
+](a: T, b: T) -> T:
+    return a
+
+def plain_mixed2[T, B](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def arg_magic_mixed1[
+    T,
+    B
+](a: T, b: T,) -> T:
+    return a
+
+def arg_magic_mixed2[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def type_param_magic_mixed1[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+def type_param_magic_mixed2[T, B,](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def both_magic_mixed1[
+    T,
+    B,
+](a: T, b: T,) -> T:
+    return a
+
+def both_magic_mixed2[T, B,](
+    a: T,
+    b: T,
+) -> T:
+    return a
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.py.expect
new file mode 100644
index 0000000000..54bab4e46b
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/skip_magic_trailing_comma_generic_wrap.py.expect
@@ -0,0 +1,62 @@
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic[T, B](a: T, b: T) -> T:
+    return a
+
+
+def type_param_magic[T, B](a: T, b: T) -> T:
+    return a
+
+
+def both_magic[T, B](a: T, b: T) -> T:
+    return a
+
+
+def plain_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def type_param_magic_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def both_magic_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def plain_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def plain_mixed2[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_mixed2[T, B](a: T, b: T) -> T:
+    return a
+
+
+def type_param_magic_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def type_param_magic_mixed2[T, B](a: T, b: T) -> T:
+    return a
+
+
+def both_magic_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def both_magic_mixed2[T, B](a: T, b: T) -> T:
+    return a
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.options.json
new file mode 100644
index 0000000000..4295ffe1df
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.options.json
@@ -0,0 +1 @@
+{"target_version": "3.12"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.py
new file mode 100644
index 0000000000..ff72fbe4b9
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.py
@@ -0,0 +1,4 @@
+# this is invalid in versions below py312
+class ClassA[T: str]:
+    def method1(self) -> T:
+        ...
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.py.expect
new file mode 100644
index 0000000000..6795f0fe09
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/target_version_flag.py.expect
@@ -0,0 +1,3 @@
+# this is invalid in versions below py312
+class ClassA[T: str]:
+    def method1(self) -> T: ...
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/tuple_with_stmt.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/tuple_with_stmt.py
new file mode 100644
index 0000000000..885a300f44
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/tuple_with_stmt.py
@@ -0,0 +1,30 @@
+# don't remove the brackets here, it changes the meaning of the code.
+# even though the code will always trigger a runtime error
+with (name_5, name_4), name_5:
+    pass
+
+
+with c, (a, b):
+    pass
+
+
+with c, (a, b), d:
+    pass
+
+
+with c, (a, b, e, f, g), d:
+    pass
+
+
+def test_tuple_as_contextmanager():
+    from contextlib import nullcontext
+
+    try:
+        with (nullcontext(), nullcontext()), nullcontext():
+            pass
+    except TypeError:
+        # test passed
+        pass
+    else:
+        # this should be a type error
+        assert False
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/tuple_with_stmt.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/tuple_with_stmt.py.expect
new file mode 100644
index 0000000000..885a300f44
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/tuple_with_stmt.py.expect
@@ -0,0 +1,30 @@
+# don't remove the brackets here, it changes the meaning of the code.
+# even though the code will always trigger a runtime error
+with (name_5, name_4), name_5:
+    pass
+
+
+with c, (a, b):
+    pass
+
+
+with c, (a, b), d:
+    pass
+
+
+with c, (a, b, e, f, g), d:
+    pass
+
+
+def test_tuple_as_contextmanager():
+    from contextlib import nullcontext
+
+    try:
+        with (nullcontext(), nullcontext()), nullcontext():
+            pass
+    except TypeError:
+        # test passed
+        pass
+    else:
+        # this should be a type error
+        assert False
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.options.json b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.options.json
new file mode 100644
index 0000000000..7b38e093e4
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.options.json
@@ -0,0 +1 @@
+{"preview": "enabled", "target_version": "3.12"}
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.py
new file mode 100644
index 0000000000..037f401511
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.py
@@ -0,0 +1,13 @@
+def f1[T: (int, str)](a,): pass
+
+def f2[T: (int, str)](a: int, b,): pass
+
+def g1[T: (int,)](a,): pass
+
+def g2[T: (int, str, bytes)](a,): pass
+
+def g3[T: ((int, str), (bytes,))](a,): pass
+
+def g4[T: (int, (str, bytes))](a,): pass
+
+def g5[T: ((int,),)](a: int, b,): pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.py.expect
new file mode 100644
index 0000000000..61ddf22789
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_expansion.py.expect
@@ -0,0 +1,42 @@
+def f1[T: (int, str)](
+    a,
+):
+    pass
+
+
+def f2[T: (int, str)](
+    a: int,
+    b,
+):
+    pass
+
+
+def g1[T: (int,)](
+    a,
+):
+    pass
+
+
+def g2[T: (int, str, bytes)](
+    a,
+):
+    pass
+
+
+def g3[T: ((int, str), (bytes,))](
+    a,
+):
+    pass
+
+
+def g4[T: (int, (str, bytes))](
+    a,
+):
+    pass
+
+
+def g5[T: ((int,),)](
+    a: int,
+    b,
+):
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py
index de25e7c9a9..ff5166c1cf 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py
@@ -17,3 +17,5 @@ def trailing_comma1[T=int,](a: str):
 
 def trailing_comma2[T=int](a: str,):
     pass
+
+def weird_syntax[T=lambda: 42, **P=lambda: 43, *Ts=lambda: 44](): pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py.expect
index af09a67e5c..1d9a2ee545 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py.expect
@@ -13,25 +13,31 @@ type something_that_is_long[
 ] = something_that_is_long
 
 
-def simple[
-    T = something_that_is_long
-](short1: int, short2: str, short3: bytes) -> float:
+def simple[T = something_that_is_long](
+    short1: int, short2: str, short3: bytes
+) -> float:
     pass
 
 
-def longer[
-    something_that_is_long = something_that_is_long
-](something_that_is_long: something_that_is_long) -> something_that_is_long:
+def longer[something_that_is_long = something_that_is_long](
+    something_that_is_long: something_that_is_long,
+) -> something_that_is_long:
     pass
 
 
 def trailing_comma1[
     T = int,
-](a: str):
+](
+    a: str,
+):
     pass
 
 
-def trailing_comma2[
-    T = int
-](a: str,):
+def trailing_comma2[T = int](
+    a: str,
+):
+    pass
+
+
+def weird_syntax[T = lambda: 42, **P = lambda: 43, *Ts = lambda: 44]():
     pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py
index 7ce47eb01f..ba4385116e 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py
@@ -11,3 +11,7 @@ def even_longer[WhatIsTheLongestTypeVarNameYouCanThinkOfEnoughToMakeBlackSplitTh
 def it_gets_worse[WhatIsTheLongestTypeVarNameYouCanThinkOfEnoughToMakeBlackSplitThisLine, ItCouldBeGenericOverMultipleTypeVars](): pass
 
 def magic[Trailing, Comma,](): pass
+
+def weird_syntax[T: lambda: 42, U: a or b](): pass
+
+def name_3[name_0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa if aaaaaaaaaaa else name_3](): pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py.expect
index 72b1e032f4..d14276130e 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.py.expect
@@ -38,3 +38,13 @@ def magic[
     Comma,
 ]():
     pass
+
+
+def weird_syntax[T: lambda: 42, U: a or b]():
+    pass
+
+
+def name_3[
+    name_0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa if aaaaaaaaaaa else name_3
+]():
+    pass
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py
index 3e3e63421f..1723d32d20 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py
@@ -1,4 +1,4 @@
-# This is testing an issue that is specific to the preview style
+# This is testing an issue that is specific to the preview style (wrap_long_dict_values_in_parens)
 {
     "is_update": (up := commit.hash in update_hashes)
 }
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py.expect b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py.expect
index 03aa2598fe..603ab02701 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py.expect
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/walrus_in_dict.py.expect
@@ -1,2 +1,2 @@
-# This is testing an issue that is specific to the preview style
+# This is testing an issue that is specific to the preview style (wrap_long_dict_values_in_parens)
 {"is_update": (up := commit.hash in update_hashes)}
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py b/crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py
index a9cbb2cc6d..c32bd71af7 100755
--- a/crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py
@@ -113,10 +113,10 @@ IGNORE_LIST = [
 # Specs for which to override the formatter options
 OPTIONS_OVERRIDES = {
     "context_managers_38.py": {
-        "target_version": "py38"
+        "target_version": "3.8"
     },
     "context_managers_autodetect_38.py" : {
-        "target_version": "py38"
+        "target_version": "3.8"
     }
 }
 
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/fstring.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/fstring.py
index fd658cc5ce..46322e38f2 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/fstring.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/fstring.py
@@ -748,3 +748,7 @@ print(f"{  # Tuple with multiple elements that doesn't fit on a single line gets
 
 # Regression tests for https://github.com/astral-sh/ruff/issues/15536
 print(f"{ {}, 1, }")
+
+
+# The inner quotes should not be changed to double quotes before Python 3.12
+f"{f'''{'nested'} inner'''} outer"
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.options.json b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.options.json
new file mode 100644
index 0000000000..f1fa9100c1
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.options.json
@@ -0,0 +1,8 @@
+[
+  {
+    "target_version": "3.13"
+  },
+  {
+    "target_version": "3.14"
+  }
+]
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.py
index a5cdf3ec9f..2e4a7634ef 100644
--- a/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.py
@@ -166,3 +166,40 @@ else:
 
 finally:
     pass
+
+
+try:
+    pass
+# These parens can be removed on 3.14+ but not earlier
+except (BaseException, Exception, ValueError):
+    pass
+# But black won't remove these parentheses
+except (ZeroDivisionError,):
+    pass
+except (  # We wrap these and preserve the parens
+        BaseException, Exception, ValueError):
+    pass
+except (
+        BaseException,
+        # Same with this comment
+        Exception,
+        ValueError
+):
+    pass
+
+try:
+    pass
+# They can also be omitted for `except*`
+except* (BaseException, Exception, ValueError):
+    pass
+
+# But parentheses are still required in the presence of an `as` binding
+try:
+    pass
+except (BaseException, Exception, ValueError) as e:
+    pass
+
+try:
+    pass
+except* (BaseException, Exception, ValueError) as e:
+    pass
diff --git a/crates/ruff_python_formatter/src/cli.rs b/crates/ruff_python_formatter/src/cli.rs
index 60f7cd413c..96da64e86e 100644
--- a/crates/ruff_python_formatter/src/cli.rs
+++ b/crates/ruff_python_formatter/src/cli.rs
@@ -6,7 +6,7 @@ use anyhow::{Context, Result};
 use clap::{Parser, ValueEnum, command};
 
 use ruff_formatter::SourceCode;
-use ruff_python_ast::PySourceType;
+use ruff_python_ast::{PySourceType, PythonVersion};
 use ruff_python_parser::{ParseOptions, parse};
 use ruff_python_trivia::CommentRanges;
 use ruff_text_size::Ranged;
@@ -42,13 +42,19 @@ pub struct Cli {
     pub print_comments: bool,
     #[clap(long, short = 'C')]
     pub skip_magic_trailing_comma: bool,
+    #[clap(long)]
+    pub target_version: PythonVersion,
 }
 
 pub fn format_and_debug_print(source: &str, cli: &Cli, source_path: &Path) -> Result<String> {
     let source_type = PySourceType::from(source_path);
 
     // Parse the AST.
-    let parsed = parse(source, ParseOptions::from(source_type)).context("Syntax error in input")?;
+    let parsed = parse(
+        source,
+        ParseOptions::from(source_type).with_target_version(cli.target_version),
+    )
+    .context("Syntax error in input")?;
 
     let options = PyFormatOptions::from_extension(source_path)
         .with_preview(if cli.preview {
@@ -60,7 +66,8 @@ pub fn format_and_debug_print(source: &str, cli: &Cli, source_path: &Path) -> Re
             MagicTrailingComma::Ignore
         } else {
             MagicTrailingComma::Respect
-        });
+        })
+        .with_target_version(cli.target_version);
 
     let source_code = SourceCode::new(source);
     let comment_ranges = CommentRanges::from(parsed.tokens());
diff --git a/crates/ruff_python_formatter/src/comments/debug.rs b/crates/ruff_python_formatter/src/comments/debug.rs
index 8cd374464f..3e4ae7c6bd 100644
--- a/crates/ruff_python_formatter/src/comments/debug.rs
+++ b/crates/ruff_python_formatter/src/comments/debug.rs
@@ -196,12 +196,12 @@ mod tests {
     fn debug() {
         let continue_statement = StmtContinue {
             range: TextRange::new(TextSize::new(18), TextSize::new(26)),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         };
 
         let break_statement = StmtBreak {
             range: TextRange::new(TextSize::new(55), TextSize::new(60)),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         };
 
         let source = r"# leading comment
diff --git a/crates/ruff_python_formatter/src/comments/node_key.rs b/crates/ruff_python_formatter/src/comments/node_key.rs
index 4d94ebe092..ec15ced488 100644
--- a/crates/ruff_python_formatter/src/comments/node_key.rs
+++ b/crates/ruff_python_formatter/src/comments/node_key.rs
@@ -69,7 +69,7 @@ mod tests {
     fn equality() {
         let continue_statement = StmtContinue {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         };
 
         let ref_a = NodeRefEqualityKey::from_ref(AnyNodeRef::from(&continue_statement));
@@ -83,7 +83,7 @@ mod tests {
     fn inequality() {
         let continue_statement = StmtContinue {
             range: TextRange::default(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         };
 
         let boxed = Box::new(continue_statement.clone());
diff --git a/crates/ruff_python_formatter/src/comments/placement.rs b/crates/ruff_python_formatter/src/comments/placement.rs
index 0ec2aa6d2f..234752ba53 100644
--- a/crates/ruff_python_formatter/src/comments/placement.rs
+++ b/crates/ruff_python_formatter/src/comments/placement.rs
@@ -311,7 +311,10 @@ fn handle_enclosed_comment<'a>(
         AnyNodeRef::StmtClassDef(class_def) => {
             handle_leading_class_with_decorators_comment(comment, class_def)
         }
-        AnyNodeRef::StmtImportFrom(import_from) => handle_import_from_comment(comment, import_from),
+        AnyNodeRef::StmtImportFrom(import_from) => {
+            handle_import_from_comment(comment, import_from, source)
+        }
+        AnyNodeRef::Alias(alias) => handle_alias_comment(comment, alias, source),
         AnyNodeRef::StmtWith(with_) => handle_with_comment(comment, with_),
         AnyNodeRef::ExprCall(_) => handle_call_comment(comment),
         AnyNodeRef::ExprStringLiteral(_) => match comment.enclosing_parent() {
@@ -1922,7 +1925,7 @@ fn handle_bracketed_end_of_line_comment<'a>(
     CommentPlacement::Default(comment)
 }
 
-/// Attach an enclosed end-of-line comment to a [`ast::StmtImportFrom`].
+/// Attach an enclosed comment to a [`ast::StmtImportFrom`].
 ///
 /// For example, given:
 /// ```python
@@ -1933,9 +1936,37 @@ fn handle_bracketed_end_of_line_comment<'a>(
 ///
 /// The comment will be attached to the [`ast::StmtImportFrom`] node as a dangling comment, to
 /// ensure that it remains on the same line as the [`ast::StmtImportFrom`] itself.
+///
+/// If the comment's preceding node is an alias, and the comment is *before* a comma:
+/// ```python
+/// from foo import (
+///     bar as baz  # comment
+///     ,
+/// )
+/// ```
+///
+/// The comment will then be attached to the [`ast::Alias`] node as a dangling comment instead,
+/// to ensure that it retains its position before the comma.
+///
+/// Otherwise, if the comment is *after* the comma or before a following alias:
+/// ```python
+/// from foo import (
+///     bar as baz,  # comment
+/// )
+///
+/// from foo import (
+///     bar,
+///     # comment
+///     baz,
+/// )
+/// ```
+///
+/// Then it will retain the default behavior of being attached to the relevant [`ast::Alias`] node
+/// as either a leading or trailing comment.
 fn handle_import_from_comment<'a>(
     comment: DecoratedComment<'a>,
     import_from: &'a ast::StmtImportFrom,
+    source: &str,
 ) -> CommentPlacement<'a> {
     // The comment needs to be on the same line, but before the first member. For example, we want
     // to treat this as a dangling comment:
@@ -1963,10 +1994,69 @@ fn handle_import_from_comment<'a>(
     {
         CommentPlacement::dangling(comment.enclosing_node(), comment)
     } else {
-        CommentPlacement::Default(comment)
+        if let Some(SimpleToken {
+            kind: SimpleTokenKind::Comma,
+            ..
+        }) = SimpleTokenizer::starts_at(comment.start(), source)
+            .skip_trivia()
+            .next()
+        {
+            // Treat comments before the comma as dangling, after as trailing (default)
+            if let Some(AnyNodeRef::Alias(alias)) = comment.preceding_node() {
+                CommentPlacement::dangling(alias, comment)
+            } else {
+                CommentPlacement::Default(comment)
+            }
+        } else {
+            CommentPlacement::Default(comment)
+        }
     }
 }
 
+/// Attach an enclosed comment to the appropriate [`ast::Identifier`]  within an [`ast::Alias`].
+///
+/// For example:
+/// ```python
+/// from foo import (
+///     bar  # comment
+///     as baz,
+/// )
+/// ```
+///
+/// Will attach the comment as a trailing comment on the first name [`ast::Identifier`].
+///
+/// Whereas:
+/// ```python
+/// from foo import (
+///     bar as  # comment
+///     baz,
+/// )
+/// ```
+///
+/// Will attach the comment as a leading comment on the second name [`ast::Identifier`].
+fn handle_alias_comment<'a>(
+    comment: DecoratedComment<'a>,
+    alias: &'a ruff_python_ast::Alias,
+    source: &str,
+) -> CommentPlacement<'a> {
+    if let Some(asname) = &alias.asname {
+        if let Some(SimpleToken {
+            kind: SimpleTokenKind::As,
+            range: as_range,
+        }) = SimpleTokenizer::starts_at(alias.name.end(), source)
+            .skip_trivia()
+            .next()
+        {
+            return if comment.start() < as_range.start() {
+                CommentPlacement::trailing(&alias.name, comment)
+            } else {
+                CommentPlacement::leading(asname, comment)
+            };
+        }
+    }
+    CommentPlacement::Default(comment)
+}
+
 /// Attach an enclosed end-of-line comment to a [`ast::StmtWith`].
 ///
 /// For example, given:
diff --git a/crates/ruff_python_formatter/src/context.rs b/crates/ruff_python_formatter/src/context.rs
index bc88b987ae..528afc6c71 100644
--- a/crates/ruff_python_formatter/src/context.rs
+++ b/crates/ruff_python_formatter/src/context.rs
@@ -144,6 +144,12 @@ pub(crate) enum InterpolatedStringState {
     ///
     /// The containing `FStringContext` is the surrounding f-string context.
     InsideInterpolatedElement(InterpolatedStringContext),
+    /// The formatter is inside more than one nested f-string, such as in `nested` in:
+    ///
+    /// ```py
+    /// f"{f'''{'nested'} inner'''} outer"
+    /// ```
+    NestedInterpolatedElement(InterpolatedStringContext),
     /// The formatter is outside an f-string.
     #[default]
     Outside,
@@ -152,12 +158,18 @@ pub(crate) enum InterpolatedStringState {
 impl InterpolatedStringState {
     pub(crate) fn can_contain_line_breaks(self) -> Option<bool> {
         match self {
-            InterpolatedStringState::InsideInterpolatedElement(context) => {
+            InterpolatedStringState::InsideInterpolatedElement(context)
+            | InterpolatedStringState::NestedInterpolatedElement(context) => {
                 Some(context.is_multiline())
             }
             InterpolatedStringState::Outside => None,
         }
     }
+
+    /// Returns `true` if the interpolated string state is [`NestedInterpolatedElement`].
+    pub(crate) fn is_nested(self) -> bool {
+        matches!(self, Self::NestedInterpolatedElement(..))
+    }
 }
 
 /// The position of a top-level statement in the module.
diff --git a/crates/ruff_python_formatter/src/expression/expr_tuple.rs b/crates/ruff_python_formatter/src/expression/expr_tuple.rs
index 6d95048673..8eba63a2ac 100644
--- a/crates/ruff_python_formatter/src/expression/expr_tuple.rs
+++ b/crates/ruff_python_formatter/src/expression/expr_tuple.rs
@@ -39,8 +39,8 @@ pub enum TupleParentheses {
     ///
     /// ```python
     /// return len(self.nodeseeeeeeeee), sum(
-    //     len(node.parents) for node in self.node_map.values()
-    // )
+    ///     len(node.parents) for node in self.node_map.values()
+    /// )
     /// ```
     OptionalParentheses,
 
diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs
index 3dbef73807..e6b2f9e7b8 100644
--- a/crates/ruff_python_formatter/src/lib.rs
+++ b/crates/ruff_python_formatter/src/lib.rs
@@ -1,3 +1,4 @@
+use ruff_db::diagnostic::{Diagnostic, DiagnosticId, Severity};
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
 use ruff_db::source::source_text;
@@ -10,7 +11,7 @@ use ruff_formatter::{FormatError, Formatted, PrintError, Printed, SourceCode, fo
 use ruff_python_ast::{AnyNodeRef, Mod};
 use ruff_python_parser::{ParseError, ParseOptions, Parsed, parse};
 use ruff_python_trivia::CommentRanges;
-use ruff_text_size::Ranged;
+use ruff_text_size::{Ranged, TextRange};
 
 use crate::comments::{
     Comments, SourceComment, has_skip_comment, leading_comments, trailing_comments,
@@ -117,6 +118,33 @@ pub enum FormatModuleError {
     PrintError(#[from] PrintError),
 }
 
+impl FormatModuleError {
+    pub fn range(&self) -> Option<TextRange> {
+        match self {
+            FormatModuleError::ParseError(parse_error) => Some(parse_error.range()),
+            FormatModuleError::FormatError(_) | FormatModuleError::PrintError(_) => None,
+        }
+    }
+}
+
+impl From<&FormatModuleError> for Diagnostic {
+    fn from(error: &FormatModuleError) -> Self {
+        match error {
+            FormatModuleError::ParseError(parse_error) => Diagnostic::new(
+                DiagnosticId::InternalError,
+                Severity::Error,
+                &parse_error.error,
+            ),
+            FormatModuleError::FormatError(format_error) => {
+                Diagnostic::new(DiagnosticId::InternalError, Severity::Error, format_error)
+            }
+            FormatModuleError::PrintError(print_error) => {
+                Diagnostic::new(DiagnosticId::InternalError, Severity::Error, print_error)
+            }
+        }
+    }
+}
+
 #[tracing::instrument(name = "format", level = Level::TRACE, skip_all)]
 pub fn format_module_source(
     source: &str,
diff --git a/crates/ruff_python_formatter/src/options.rs b/crates/ruff_python_formatter/src/options.rs
index 26916d66ea..5d19dec9cb 100644
--- a/crates/ruff_python_formatter/src/options.rs
+++ b/crates/ruff_python_formatter/src/options.rs
@@ -252,15 +252,20 @@ impl QuoteStyle {
     pub const fn is_preserve(self) -> bool {
         matches!(self, QuoteStyle::Preserve)
     }
+
+    /// Returns the string representation of the quote style.
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            QuoteStyle::Single => "single",
+            QuoteStyle::Double => "double",
+            QuoteStyle::Preserve => "preserve",
+        }
+    }
 }
 
 impl fmt::Display for QuoteStyle {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Single => write!(f, "single"),
-            Self::Double => write!(f, "double"),
-            Self::Preserve => write!(f, "preserve"),
-        }
+        f.write_str(self.as_str())
     }
 }
 
@@ -302,10 +307,10 @@ impl MagicTrailingComma {
 
 impl fmt::Display for MagicTrailingComma {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Respect => write!(f, "respect"),
-            Self::Ignore => write!(f, "ignore"),
-        }
+        f.write_str(match self {
+            MagicTrailingComma::Respect => "respect",
+            MagicTrailingComma::Ignore => "ignore",
+        })
     }
 }
 
@@ -398,15 +403,12 @@ pub enum DocstringCodeLineWidth {
 #[cfg(feature = "schemars")]
 mod schema {
     use ruff_formatter::LineWidth;
-    use schemars::r#gen::SchemaGenerator;
-    use schemars::schema::{Metadata, Schema, SubschemaValidation};
+    use schemars::{Schema, SchemaGenerator};
+    use serde_json::Value;
 
     /// A dummy type that is used to generate a schema for `DocstringCodeLineWidth::Dynamic`.
     pub(super) fn dynamic(_: &mut SchemaGenerator) -> Schema {
-        Schema::Object(schemars::schema::SchemaObject {
-            const_value: Some("dynamic".to_string().into()),
-            ..Default::default()
-        })
+        schemars::json_schema!({ "const": "dynamic" })
     }
 
     // We use a manual schema for `fixed` even thought it isn't strictly necessary according to the
@@ -417,19 +419,14 @@ mod schema {
     // `allOf`. There's no semantic difference between `allOf` and `oneOf` for single element lists.
     pub(super) fn fixed(generator: &mut SchemaGenerator) -> Schema {
         let schema = generator.subschema_for::<LineWidth>();
-        Schema::Object(schemars::schema::SchemaObject {
-            metadata: Some(Box::new(Metadata {
-                description: Some(
-                    "Wrap docstring code examples at a fixed line width.".to_string(),
-                ),
-                ..Metadata::default()
-            })),
-            subschemas: Some(Box::new(SubschemaValidation {
-                one_of: Some(vec![schema]),
-                ..SubschemaValidation::default()
-            })),
-            ..Default::default()
-        })
+        let mut schema_object = Schema::default();
+        let map = schema_object.ensure_object();
+        map.insert(
+            "description".to_string(),
+            Value::String("Wrap docstring code examples at a fixed line width.".to_string()),
+        );
+        map.insert("oneOf".to_string(), Value::Array(vec![schema.into()]));
+        schema_object
     }
 }
 
diff --git a/crates/ruff_python_formatter/src/other/alias.rs b/crates/ruff_python_formatter/src/other/alias.rs
index bce6485e12..9b997565fa 100644
--- a/crates/ruff_python_formatter/src/other/alias.rs
+++ b/crates/ruff_python_formatter/src/other/alias.rs
@@ -1,6 +1,7 @@
 use ruff_formatter::write;
 use ruff_python_ast::Alias;
 
+use crate::comments::trailing_comments;
 use crate::other::identifier::DotDelimitedIdentifier;
 use crate::prelude::*;
 
@@ -15,10 +16,89 @@ impl FormatNodeRule<Alias> for FormatAlias {
             name,
             asname,
         } = item;
-        DotDelimitedIdentifier::new(name).fmt(f)?;
-        if let Some(asname) = asname {
-            write!(f, [space(), token("as"), space(), asname.format()])?;
+        write!(f, [DotDelimitedIdentifier::new(name)])?;
+
+        let comments = f.context().comments().clone();
+
+        // ```python
+        // from foo import (
+        //     bar  # comment
+        //     as baz,
+        // )
+        // ```
+        if comments.has_trailing(name) {
+            write!(
+                f,
+                [
+                    trailing_comments(comments.trailing(name)),
+                    hard_line_break()
+                ]
+            )?;
+        } else if asname.is_some() {
+            write!(f, [space()])?;
         }
+
+        if let Some(asname) = asname {
+            write!(f, [token("as")])?;
+
+            // ```python
+            // from foo import (
+            //     bar as  # comment
+            //     baz,
+            // )
+            // ```
+            if comments.has_leading(asname) {
+                write!(
+                    f,
+                    [
+                        trailing_comments(comments.leading(asname)),
+                        hard_line_break()
+                    ]
+                )?;
+            } else {
+                write!(f, [space()])?;
+            }
+
+            write!(f, [asname.format()])?;
+        }
+
+        // Dangling comment between alias and comma on a following line
+        // ```python
+        // from foo import (
+        //     bar  # comment
+        //     ,
+        // )
+        // ```
+        let dangling = comments.dangling(item);
+        if !dangling.is_empty() {
+            write!(f, [trailing_comments(comments.dangling(item))])?;
+
+            // Black will move the comma and merge comments if there is no own-line comment between
+            // the alias and the comma.
+            //
+            // Eg:
+            // ```python
+            // from foo import (
+            //     bar  # one
+            //     ,  # two
+            // )
+            // ```
+            //
+            // Will become:
+            // ```python
+            // from foo import (
+            //     bar,  # one  # two)
+            // ```
+            //
+            // Only force a hard line break if an own-line dangling comment is present.
+            if dangling
+                .iter()
+                .any(|comment| comment.line_position().is_own_line())
+            {
+                write!(f, [hard_line_break()])?;
+            }
+        }
+
         Ok(())
     }
 }
diff --git a/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs b/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs
index 4f2f93a3e9..aefaaec182 100644
--- a/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs
+++ b/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs
@@ -1,10 +1,12 @@
 use ruff_formatter::FormatRuleWithOptions;
 use ruff_formatter::write;
-use ruff_python_ast::ExceptHandlerExceptHandler;
+use ruff_python_ast::{ExceptHandlerExceptHandler, Expr, PythonVersion};
 
+use crate::expression::expr_tuple::TupleParentheses;
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
+use crate::preview::is_remove_parens_around_except_types_enabled;
 use crate::statement::clause::{ClauseHeader, clause_body, clause_header};
 use crate::statement::suite::SuiteKind;
 
@@ -57,7 +59,7 @@ impl FormatNodeRule<ExceptHandlerExceptHandler> for FormatExceptHandlerExceptHan
                 clause_header(
                     ClauseHeader::ExceptHandler(item),
                     dangling_comments,
-                    &format_with(|f| {
+                    &format_with(|f: &mut PyFormatter| {
                         write!(
                             f,
                             [
@@ -69,21 +71,50 @@ impl FormatNodeRule<ExceptHandlerExceptHandler> for FormatExceptHandlerExceptHan
                             ]
                         )?;
 
-                        if let Some(type_) = type_ {
-                            write!(
-                                f,
-                                [
-                                    space(),
-                                    maybe_parenthesize_expression(
-                                        type_,
-                                        item,
-                                        Parenthesize::IfBreaks
+                        match type_.as_deref() {
+                            // For tuples of exception types without an `as` name and on 3.14+, the
+                            // parentheses are optional.
+                            //
+                            // ```py
+                            // try:
+                            //     ...
+                            // except BaseException, Exception:  # Ok
+                            //     ...
+                            // ```
+                            Some(Expr::Tuple(tuple))
+                                if f.options().target_version() >= PythonVersion::PY314
+                                    && is_remove_parens_around_except_types_enabled(
+                                        f.context(),
                                     )
-                                ]
-                            )?;
-                            if let Some(name) = name {
-                                write!(f, [space(), token("as"), space(), name.format()])?;
+                                    && name.is_none() =>
+                            {
+                                write!(
+                                    f,
+                                    [
+                                        space(),
+                                        tuple
+                                            .format()
+                                            .with_options(TupleParentheses::NeverPreserve)
+                                    ]
+                                )?;
                             }
+                            Some(type_) => {
+                                write!(
+                                    f,
+                                    [
+                                        space(),
+                                        maybe_parenthesize_expression(
+                                            type_,
+                                            item,
+                                            Parenthesize::IfBreaks
+                                        )
+                                    ]
+                                )?;
+                                if let Some(name) = name {
+                                    write!(f, [space(), token("as"), space(), name.format()])?;
+                                }
+                            }
+                            _ => {}
                         }
 
                         Ok(())
diff --git a/crates/ruff_python_formatter/src/other/interpolated_string_element.rs b/crates/ruff_python_formatter/src/other/interpolated_string_element.rs
index 13526c218f..49495aa646 100644
--- a/crates/ruff_python_formatter/src/other/interpolated_string_element.rs
+++ b/crates/ruff_python_formatter/src/other/interpolated_string_element.rs
@@ -181,10 +181,16 @@ impl Format<PyFormatContext<'_>> for FormatInterpolatedElement<'_> {
 
             let item = format_with(|f: &mut PyFormatter| {
                 // Update the context to be inside the f-string expression element.
-                let f = &mut WithInterpolatedStringState::new(
-                    InterpolatedStringState::InsideInterpolatedElement(self.context),
-                    f,
-                );
+                let state = match f.context().interpolated_string_state() {
+                    InterpolatedStringState::InsideInterpolatedElement(_)
+                    | InterpolatedStringState::NestedInterpolatedElement(_) => {
+                        InterpolatedStringState::NestedInterpolatedElement(self.context)
+                    }
+                    InterpolatedStringState::Outside => {
+                        InterpolatedStringState::InsideInterpolatedElement(self.context)
+                    }
+                };
+                let f = &mut WithInterpolatedStringState::new(state, f);
 
                 write!(f, [bracket_spacing, expression.format()])?;
 
diff --git a/crates/ruff_python_formatter/src/preview.rs b/crates/ruff_python_formatter/src/preview.rs
index ee9b378cb8..b6479ab1b4 100644
--- a/crates/ruff_python_formatter/src/preview.rs
+++ b/crates/ruff_python_formatter/src/preview.rs
@@ -27,3 +27,12 @@ pub(crate) const fn is_blank_line_before_decorated_class_in_stub_enabled(
 ) -> bool {
     context.is_preview()
 }
+
+/// Returns `true` if the
+/// [`remove_parens_around_except_types`](https://github.com/astral-sh/ruff/pull/20768) preview
+/// style is enabled.
+pub(crate) const fn is_remove_parens_around_except_types_enabled(
+    context: &PyFormatContext,
+) -> bool {
+    context.is_preview()
+}
diff --git a/crates/ruff_python_formatter/src/string/docstring.rs b/crates/ruff_python_formatter/src/string/docstring.rs
index 5ca5567774..ad357fc65e 100644
--- a/crates/ruff_python_formatter/src/string/docstring.rs
+++ b/crates/ruff_python_formatter/src/string/docstring.rs
@@ -1613,7 +1613,7 @@ pub(super) fn needs_chaperone_space(
     if is_no_chaperone_for_escaped_quote_in_triple_quoted_docstring_enabled(context) {
         if flags.is_triple_quoted() {
             if let Some(before_quote) = trim_end.strip_suffix(flags.quote_style().as_char()) {
-                if count_consecutive_chars_from_end(before_quote, '\\') % 2 == 0 {
+                if count_consecutive_chars_from_end(before_quote, '\\').is_multiple_of(2) {
                     // Even backslash count preceding quote;
                     // ```py
                     // """a "  """
diff --git a/crates/ruff_python_formatter/src/string/normalize.rs b/crates/ruff_python_formatter/src/string/normalize.rs
index fa60c4a13f..fabd10a029 100644
--- a/crates/ruff_python_formatter/src/string/normalize.rs
+++ b/crates/ruff_python_formatter/src/string/normalize.rs
@@ -46,8 +46,15 @@ impl<'a, 'src> StringNormalizer<'a, 'src> {
             .unwrap_or(self.context.options().quote_style());
         let supports_pep_701 = self.context.options().target_version().supports_pep_701();
 
+        // Preserve the existing quote style for nested interpolations more than one layer deep, if
+        // PEP 701 isn't supported.
+        if !supports_pep_701 && self.context.interpolated_string_state().is_nested() {
+            return QuoteStyle::Preserve;
+        }
+
         // For f-strings and t-strings prefer alternating the quotes unless The outer string is triple quoted and the inner isn't.
-        if let InterpolatedStringState::InsideInterpolatedElement(parent_context) =
+        if let InterpolatedStringState::InsideInterpolatedElement(parent_context)
+        | InterpolatedStringState::NestedInterpolatedElement(parent_context) =
             self.context.interpolated_string_state()
         {
             let parent_flags = parent_context.flags();
diff --git a/crates/ruff_python_formatter/tests/fixtures.rs b/crates/ruff_python_formatter/tests/fixtures.rs
index 49b207621f..33741bd744 100644
--- a/crates/ruff_python_formatter/tests/fixtures.rs
+++ b/crates/ruff_python_formatter/tests/fixtures.rs
@@ -1,10 +1,15 @@
 use crate::normalizer::Normalizer;
-use itertools::Itertools;
+use ruff_db::diagnostic::{
+    Annotation, Diagnostic, DiagnosticFormat, DiagnosticId, DisplayDiagnosticConfig,
+    DisplayDiagnostics, DummyFileResolver, Severity, Span, SubDiagnostic, SubDiagnosticSeverity,
+};
 use ruff_formatter::FormatOptions;
+use ruff_python_ast::Mod;
 use ruff_python_ast::comparable::ComparableMod;
+use ruff_python_ast::visitor::source_order::SourceOrderVisitor;
 use ruff_python_formatter::{PreviewMode, PyFormatOptions, format_module_source, format_range};
-use ruff_python_parser::{ParseOptions, UnsupportedSyntaxError, parse};
-use ruff_source_file::{LineIndex, OneIndexed};
+use ruff_python_parser::{ParseOptions, Parsed, UnsupportedSyntaxError, parse};
+use ruff_source_file::{LineIndex, OneIndexed, SourceFileBuilder};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 use rustc_hash::FxHashMap;
 use similar::TextDiff;
@@ -103,7 +108,8 @@ fn black_compatibility() {
         let expected_output = fs::read_to_string(&expected_path)
             .unwrap_or_else(|_| panic!("Expected Black output file '{expected_path:?}' to exist"));
 
-        ensure_unchanged_ast(&content, &formatted_code, &options, input_path);
+        let unsupported_syntax_errors =
+            ensure_unchanged_ast(&content, &formatted_code, &options, input_path);
 
         if formatted_code == expected_output {
             // Black and Ruff formatting matches. Delete any existing snapshot files because the Black output
@@ -158,6 +164,20 @@ fn black_compatibility() {
             write!(snapshot, "{}", Header::new("Black Output")).unwrap();
             write!(snapshot, "{}", CodeFrame::new("python", &expected_output)).unwrap();
 
+            if !unsupported_syntax_errors.is_empty() {
+                write!(snapshot, "{}", Header::new("New Unsupported Syntax Errors")).unwrap();
+                writeln!(
+                    snapshot,
+                    "{}",
+                    DisplayDiagnostics::new(
+                        &DummyFileResolver,
+                        &DisplayDiagnosticConfig::default().format(DiagnosticFormat::Full),
+                        &unsupported_syntax_errors
+                    )
+                )
+                .unwrap();
+            }
+
             insta::with_settings!({
                 omit_expression => true,
                 input_file => input_path,
@@ -193,7 +213,8 @@ fn format() {
             writeln!(snapshot, "## Outputs").unwrap();
 
             for (i, options) in options.into_iter().enumerate() {
-                let formatted_code = format_file(&content, &options, input_path);
+                let (formatted_code, unsupported_syntax_errors) =
+                    format_file(&content, &options, input_path);
 
                 writeln!(
                     snapshot,
@@ -210,7 +231,7 @@ fn format() {
 
                 // We want to capture the differences in the preview style in our fixtures
                 let options_preview = options.with_preview(PreviewMode::Enabled);
-                let formatted_preview = format_file(&content, &options_preview, input_path);
+                let (formatted_preview, _) = format_file(&content, &options_preview, input_path);
 
                 if formatted_code != formatted_preview {
                     // Having both snapshots makes it hard to see the difference, so we're keeping only
@@ -227,14 +248,28 @@ fn format() {
                     )
                     .unwrap();
                 }
+
+                if !unsupported_syntax_errors.is_empty() {
+                    writeln!(
+                        snapshot,
+                        "### Unsupported Syntax Errors\n{}",
+                        DisplayDiagnostics::new(
+                            &DummyFileResolver,
+                            &DisplayDiagnosticConfig::default().format(DiagnosticFormat::Full),
+                            &unsupported_syntax_errors
+                        )
+                    )
+                    .unwrap();
+                }
             }
         } else {
             // We want to capture the differences in the preview style in our fixtures
             let options = PyFormatOptions::from_extension(input_path);
-            let formatted_code = format_file(&content, &options, input_path);
+            let (formatted_code, unsupported_syntax_errors) =
+                format_file(&content, &options, input_path);
 
             let options_preview = options.with_preview(PreviewMode::Enabled);
-            let formatted_preview = format_file(&content, &options_preview, input_path);
+            let (formatted_preview, _) = format_file(&content, &options_preview, input_path);
 
             if formatted_code == formatted_preview {
                 writeln!(
@@ -259,6 +294,19 @@ fn format() {
                 )
                 .unwrap();
             }
+
+            if !unsupported_syntax_errors.is_empty() {
+                writeln!(
+                    snapshot,
+                    "## Unsupported Syntax Errors\n{}",
+                    DisplayDiagnostics::new(
+                        &DummyFileResolver,
+                        &DisplayDiagnosticConfig::default().format(DiagnosticFormat::Full),
+                        &unsupported_syntax_errors
+                    )
+                )
+                .unwrap();
+            }
         }
 
         insta::with_settings!({
@@ -277,7 +325,11 @@ fn format() {
     );
 }
 
-fn format_file(source: &str, options: &PyFormatOptions, input_path: &Path) -> String {
+fn format_file(
+    source: &str,
+    options: &PyFormatOptions,
+    input_path: &Path,
+) -> (String, Vec<Diagnostic>) {
     let (unformatted, formatted_code) = if source.contains("<RANGE_START>") {
         let mut content = source.to_string();
         let without_markers = content
@@ -337,9 +389,10 @@ fn format_file(source: &str, options: &PyFormatOptions, input_path: &Path) -> St
         (Cow::Borrowed(source), formatted_code)
     };
 
-    ensure_unchanged_ast(&unformatted, &formatted_code, options, input_path);
+    let unsupported_syntax_errors =
+        ensure_unchanged_ast(&unformatted, &formatted_code, options, input_path);
 
-    formatted_code
+    (formatted_code, unsupported_syntax_errors)
 }
 
 /// Format another time and make sure that there are no changes anymore
@@ -351,10 +404,18 @@ fn ensure_stability_when_formatting_twice(
     let reformatted = match format_module_source(formatted_code, options.clone()) {
         Ok(reformatted) => reformatted,
         Err(err) => {
+            let mut diag = Diagnostic::from(&err);
+            if let Some(range) = err.range() {
+                let file =
+                    SourceFileBuilder::new(input_path.to_string_lossy(), formatted_code).finish();
+                let span = Span::from(file).with_range(range);
+                diag.annotate(Annotation::primary(span));
+            }
             panic!(
                 "Expected formatted code of {} to be valid syntax: {err}:\
-                    \n---\n{formatted_code}---\n",
-                input_path.display()
+                    \n---\n{formatted_code}---\n{}",
+                input_path.display(),
+                diag.display(&DummyFileResolver, &DisplayDiagnosticConfig::default()),
             );
         }
     };
@@ -391,12 +452,23 @@ Formatted twice:
 /// Like Black, there are a few exceptions to this "invariant" which are encoded in
 /// [`NormalizedMod`] and related structs. Namely, formatting can change indentation within strings,
 /// and can also flatten tuples within `del` statements.
+///
+/// Returns any new [`UnsupportedSyntaxError`]s in the formatted code as [`Diagnostic`]s for
+/// snapshotting.
+///
+/// As noted in the sub-diagnostic message, new syntax errors should only be accepted when they are
+/// the result of an existing syntax error in the input. For example, the formatter knows that
+/// escapes in f-strings are only allowed after Python 3.12, so it can replace escaped quotes with
+/// reused outer quote characters, which are also valid after 3.12, even if the configured Python
+/// version is lower. Such cases disrupt the fingerprint filter because the syntax error, and thus
+/// its fingerprint, is different from the input syntax error. More typical cases like using a
+/// t-string before 3.14 will be filtered out and not included in snapshots.
 fn ensure_unchanged_ast(
     unformatted_code: &str,
     formatted_code: &str,
     options: &PyFormatOptions,
     input_path: &Path,
-) {
+) -> Vec<Diagnostic> {
     let source_type = options.source_type();
 
     // Parse the unformatted code.
@@ -407,7 +479,7 @@ fn ensure_unchanged_ast(
     .expect("Unformatted code to be valid syntax");
 
     let unformatted_unsupported_syntax_errors =
-        collect_unsupported_syntax_errors(unformatted_parsed.unsupported_syntax_errors());
+        collect_unsupported_syntax_errors(&unformatted_parsed);
     let mut unformatted_ast = unformatted_parsed.into_syntax();
 
     Normalizer.visit_module(&mut unformatted_ast);
@@ -422,29 +494,31 @@ fn ensure_unchanged_ast(
 
     // Assert that there are no new unsupported syntax errors
     let mut formatted_unsupported_syntax_errors =
-        collect_unsupported_syntax_errors(formatted_parsed.unsupported_syntax_errors());
+        collect_unsupported_syntax_errors(&formatted_parsed);
 
     formatted_unsupported_syntax_errors
         .retain(|fingerprint, _| !unformatted_unsupported_syntax_errors.contains_key(fingerprint));
 
-    if !formatted_unsupported_syntax_errors.is_empty() {
-        let index = LineIndex::from_source_text(formatted_code);
-        panic!(
-            "Formatted code `{}` introduced new unsupported syntax errors:\n---\n{}\n---",
-            input_path.display(),
-            formatted_unsupported_syntax_errors
-                .into_values()
-                .map(|error| {
-                    let location = index.line_column(error.start(), formatted_code);
-                    format!(
-                        "{row}:{col} {error}",
-                        row = location.line,
-                        col = location.column
-                    )
-                })
-                .join("\n")
-        );
-    }
+    let file = SourceFileBuilder::new(
+        input_path.file_name().unwrap().to_string_lossy(),
+        formatted_code,
+    )
+    .finish();
+    let diagnostics = formatted_unsupported_syntax_errors
+        .values()
+        .map(|error| {
+            let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, error);
+            let span = Span::from(file.clone()).with_range(error.range());
+            diag.annotate(Annotation::primary(span));
+            let sub = SubDiagnostic::new(
+                SubDiagnosticSeverity::Warning,
+                "Only accept new syntax errors if they are also present in the input. \
+                    The formatter should not introduce syntax errors.",
+            );
+            diag.sub(sub);
+            diag
+        })
+        .collect::<Vec<_>>();
 
     let mut formatted_ast = formatted_parsed.into_syntax();
     Normalizer.visit_module(&mut formatted_ast);
@@ -466,6 +540,8 @@ fn ensure_unchanged_ast(
             input_path.display(),
         );
     }
+
+    diagnostics
 }
 
 struct Header<'a> {
@@ -537,14 +613,56 @@ source_type                = {source_type:?}"#,
     }
 }
 
+/// A visitor to collect a sequence of node IDs for fingerprinting [`UnsupportedSyntaxError`]s.
+///
+/// It visits each statement in the AST in source order and saves its range. The index of the node
+/// enclosing a syntax error's range can then be retrieved with the `node_id` method. This `node_id`
+/// should be stable across formatting runs since the formatter won't add or remove statements.
+struct StmtVisitor {
+    nodes: Vec<TextRange>,
+}
+
+impl StmtVisitor {
+    fn new(parsed: &Parsed<Mod>) -> Self {
+        let mut visitor = Self { nodes: Vec::new() };
+        visitor.visit_mod(parsed.syntax());
+        visitor
+    }
+
+    /// Return the index of the statement node that contains `range`.
+    fn node_id(&self, range: TextRange) -> usize {
+        self.nodes
+            .iter()
+            .enumerate()
+            .filter(|(_, node)| node.contains_range(range))
+            .min_by_key(|(_, node)| node.len())
+            .expect("Expected an enclosing node in the AST")
+            .0
+    }
+}
+
+impl<'a> SourceOrderVisitor<'a> for StmtVisitor {
+    fn visit_stmt(&mut self, stmt: &'a ruff_python_ast::Stmt) {
+        self.nodes.push(stmt.range());
+        ruff_python_ast::visitor::source_order::walk_stmt(self, stmt);
+    }
+}
+
 /// Collects the unsupported syntax errors and assigns a unique hash to each error.
 fn collect_unsupported_syntax_errors(
-    errors: &[UnsupportedSyntaxError],
+    parsed: &Parsed<Mod>,
 ) -> FxHashMap<u64, UnsupportedSyntaxError> {
     let mut collected = FxHashMap::default();
 
-    for error in errors {
-        let mut error_fingerprint = fingerprint_unsupported_syntax_error(error, 0);
+    if parsed.unsupported_syntax_errors().is_empty() {
+        return collected;
+    }
+
+    let visitor = StmtVisitor::new(parsed);
+
+    for error in parsed.unsupported_syntax_errors() {
+        let node_id = visitor.node_id(error.range);
+        let mut error_fingerprint = fingerprint_unsupported_syntax_error(error, node_id, 0);
 
         // Make sure that we do not get a fingerprint that is already in use
         // by adding in the previously generated one.
@@ -552,7 +670,7 @@ fn collect_unsupported_syntax_errors(
             match collected.entry(error_fingerprint) {
                 Entry::Occupied(_) => {
                     error_fingerprint =
-                        fingerprint_unsupported_syntax_error(error, error_fingerprint);
+                        fingerprint_unsupported_syntax_error(error, node_id, error_fingerprint);
                 }
                 Entry::Vacant(entry) => {
                     entry.insert(error.clone());
@@ -565,7 +683,11 @@ fn collect_unsupported_syntax_errors(
     collected
 }
 
-fn fingerprint_unsupported_syntax_error(error: &UnsupportedSyntaxError, salt: u64) -> u64 {
+fn fingerprint_unsupported_syntax_error(
+    error: &UnsupportedSyntaxError,
+    node_id: usize,
+    salt: u64,
+) -> u64 {
     let mut hasher = DefaultHasher::new();
 
     let UnsupportedSyntaxError {
@@ -579,6 +701,7 @@ fn fingerprint_unsupported_syntax_error(error: &UnsupportedSyntaxError, salt: u6
     salt.hash(&mut hasher);
     kind.hash(&mut hasher);
     target_version.hash(&mut hasher);
+    node_id.hash(&mut hasher);
 
     hasher.finish()
 }
diff --git a/crates/ruff_python_formatter/tests/normalizer.rs b/crates/ruff_python_formatter/tests/normalizer.rs
index e5237f8c5f..d8fb8fd54e 100644
--- a/crates/ruff_python_formatter/tests/normalizer.rs
+++ b/crates/ruff_python_formatter/tests/normalizer.rs
@@ -1,8 +1,5 @@
+use regex::Regex;
 use std::sync::LazyLock;
-use {
-    itertools::Either::{Left, Right},
-    regex::Regex,
-};
 
 use ruff_python_ast::{
     self as ast, BytesLiteralFlags, Expr, FStringFlags, FStringPart, InterpolatedStringElement,
@@ -46,18 +43,9 @@ impl Transformer for Normalizer {
     fn visit_stmt(&self, stmt: &mut Stmt) {
         if let Stmt::Delete(delete) = stmt {
             // Treat `del a, b` and `del (a, b)` equivalently.
-            delete.targets = delete
-                .targets
-                .clone()
-                .into_iter()
-                .flat_map(|target| {
-                    if let Expr::Tuple(tuple) = target {
-                        Left(tuple.elts.into_iter())
-                    } else {
-                        Right(std::iter::once(target))
-                    }
-                })
-                .collect();
+            if let [Expr::Tuple(tuple)] = delete.targets.as_slice() {
+                delete.targets = tuple.elts.clone();
+            }
         }
 
         transformer::walk_stmt(self, stmt);
@@ -82,7 +70,7 @@ impl Transformer for Normalizer {
                             value: Box::from(string.value.to_str()),
                             range: string.range,
                             flags: StringLiteralFlags::empty(),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         });
                     }
                 }
@@ -99,7 +87,7 @@ impl Transformer for Normalizer {
                             value: bytes.value.bytes().collect(),
                             range: bytes.range,
                             flags: BytesLiteralFlags::empty(),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         });
                     }
                 }
@@ -143,7 +131,7 @@ impl Transformer for Normalizer {
                                         InterpolatedStringLiteralElement {
                                             range,
                                             value: literal.into(),
-                                            node_index: AtomicNodeIndex::dummy(),
+                                            node_index: AtomicNodeIndex::NONE,
                                         },
                                     ));
                                 }
@@ -185,7 +173,7 @@ impl Transformer for Normalizer {
                             elements: collector.elements.into(),
                             range: fstring.range,
                             flags: FStringFlags::empty(),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         });
                     }
                 }
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__cantfit.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__cantfit.py.snap
new file mode 100644
index 0000000000..68496fbb9a
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__cantfit.py.snap
@@ -0,0 +1,204 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py
+---
+## Input
+
+```python
+# long variable name
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 0
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 1  # with a comment
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = [
+    1, 2, 3
+]
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function()
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    arg1, arg2, arg3
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+# long function name
+normal_name = but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying()
+normal_name = but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+    arg1, arg2, arg3
+)
+normal_name = but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+string_variable_name = (
+    "a string that is waaaaaaaayyyyyyyy too long, even in parens, there's nothing you can do"  # noqa
+)
+for key in """
+    hostname
+    port
+    username
+""".split():
+    if key in self.connect_kwargs:
+        raise ValueError(err.format(key))
+concatenated_strings = "some strings that are " "concatenated implicitly, so if you put them on separate " "lines it will fit"
+del concatenated_strings, string_variable_name, normal_function_name, normal_name, need_more_to_make_the_line_long_enough
+del ([], name_1, name_2), [(), [], name_4, name_3], name_1[[name_2 for name_1 in name_0]]
+del (),
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,18 +1,12 @@
+ # long variable name
+-this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+-    0
+-)
+-this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+-    1  # with a comment
+-)
++this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 0
++this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 1  # with a comment
+ this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = [
+     1,
+     2,
+     3,
+ ]
+-this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+-    function()
+-)
++this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function()
+ this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+     arg1, arg2, arg3
+ )
+@@ -58,4 +52,4 @@
+     [(), [], name_4, name_3],
+     name_1[[name_2 for name_1 in name_0]],
+ )
+-del ((),)
++del ()
+```
+
+## Ruff Output
+
+```python
+# long variable name
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 0
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = 1  # with a comment
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = [
+    1,
+    2,
+    3,
+]
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function()
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    arg1, arg2, arg3
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+# long function name
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying()
+)
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+        arg1, arg2, arg3
+    )
+)
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+        [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+    )
+)
+string_variable_name = "a string that is waaaaaaaayyyyyyyy too long, even in parens, there's nothing you can do"  # noqa
+for key in """
+    hostname
+    port
+    username
+""".split():
+    if key in self.connect_kwargs:
+        raise ValueError(err.format(key))
+concatenated_strings = (
+    "some strings that are "
+    "concatenated implicitly, so if you put them on separate "
+    "lines it will fit"
+)
+del (
+    concatenated_strings,
+    string_variable_name,
+    normal_function_name,
+    normal_name,
+    need_more_to_make_the_line_long_enough,
+)
+del (
+    ([], name_1, name_2),
+    [(), [], name_4, name_3],
+    name_1[[name_2 for name_1 in name_0]],
+)
+del ()
+```
+
+## Black Output
+
+```python
+# long variable name
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+    0
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+    1  # with a comment
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = [
+    1,
+    2,
+    3,
+]
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = (
+    function()
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    arg1, arg2, arg3
+)
+this_is_a_ridiculously_long_name_and_nobody_in_their_right_mind_would_use_one_like_it = function(
+    [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+)
+# long function name
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying()
+)
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+        arg1, arg2, arg3
+    )
+)
+normal_name = (
+    but_the_function_name_is_now_ridiculously_long_and_it_is_still_super_annoying(
+        [1, 2, 3], arg1, [1, 2, 3], arg2, [1, 2, 3], arg3
+    )
+)
+string_variable_name = "a string that is waaaaaaaayyyyyyyy too long, even in parens, there's nothing you can do"  # noqa
+for key in """
+    hostname
+    port
+    username
+""".split():
+    if key in self.connect_kwargs:
+        raise ValueError(err.format(key))
+concatenated_strings = (
+    "some strings that are "
+    "concatenated implicitly, so if you put them on separate "
+    "lines it will fit"
+)
+del (
+    concatenated_strings,
+    string_variable_name,
+    normal_function_name,
+    normal_name,
+    need_more_to_make_the_line_long_enough,
+)
+del (
+    ([], name_1, name_2),
+    [(), [], name_4, name_3],
+    name_1[[name_2 for name_1 in name_0]],
+)
+del ((),)
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fmtskip10.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fmtskip10.py.snap
new file mode 100644
index 0000000000..81404baffc
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fmtskip10.py.snap
@@ -0,0 +1,76 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py
+---
+## Input
+
+```python
+def foo(): return "mock"  # fmt: skip
+if True: print("yay")  # fmt: skip
+for i in range(10): print(i)  # fmt: skip
+
+j =     1 # fmt: skip
+while j < 10: j += 1  # fmt: skip
+
+b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"] # fmt: skip
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,8 +1,14 @@
+-def foo(): return "mock"  # fmt: skip
+-if True: print("yay")  # fmt: skip
+-for i in range(10): print(i)  # fmt: skip
++def foo():
++    return "mock"  # fmt: skip
++
++
++if True:
++    print("yay")  # fmt: skip
++for i in range(10):
++    print(i)  # fmt: skip
+ 
+-j =     1 # fmt: skip
+-while j < 10: j += 1  # fmt: skip
++j =     1  # fmt: skip
++while j < 10:
++    j += 1  # fmt: skip
+ 
+-b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"] # fmt: skip
++b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"]  # fmt: skip
+```
+
+## Ruff Output
+
+```python
+def foo():
+    return "mock"  # fmt: skip
+
+
+if True:
+    print("yay")  # fmt: skip
+for i in range(10):
+    print(i)  # fmt: skip
+
+j =     1  # fmt: skip
+while j < 10:
+    j += 1  # fmt: skip
+
+b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"]  # fmt: skip
+```
+
+## Black Output
+
+```python
+def foo(): return "mock"  # fmt: skip
+if True: print("yay")  # fmt: skip
+for i in range(10): print(i)  # fmt: skip
+
+j =     1 # fmt: skip
+while j < 10: j += 1  # fmt: skip
+
+b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"] # fmt: skip
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring.py.snap
index 82def26815..f4140291a5 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring.py.snap
@@ -28,12 +28,11 @@ but none started with prefix {parentdir_prefix}"
  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"{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"}\''
-+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'}'"
@@ -49,7 +48,7 @@ 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'"{f"{nested} inner"}" outer'
 f"space between opening braces: { {a for a in (1, 2, 3)} }"
 f"Hello '{tricky + 'example'}'"
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring_quotations.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring_quotations.py.snap
new file mode 100644
index 0000000000..0657669f2e
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__fstring_quotations.py.snap
@@ -0,0 +1,126 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/fstring_quotations.py
+---
+## Input
+
+```python
+# Regression tests for long f-strings, including examples from issue #3623
+
+a = (
+    'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+)
+
+a = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + \
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+
+a = f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"' + \
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+
+a = (
+    f'bbbbbbb"{"b"}"'
+    'aaaaaaaa'
+)
+
+a = (
+    f'"{"b"}"'
+)
+
+a = (
+    f'\"{"b"}\"'
+)
+
+a = (
+    r'\"{"b"}\"'
+)
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -20,7 +20,7 @@
+     + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+ )
+ 
+-a = f'bbbbbbb"{"b"}"' "aaaaaaaa"
++a = f'bbbbbbb"{"b"}"aaaaaaaa'
+ 
+ a = f'"{"b"}"'
+ 
+```
+
+## Ruff Output
+
+```python
+# Regression tests for long f-strings, including examples from issue #3623
+
+a = (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+)
+
+a = (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = f'bbbbbbb"{"b"}"aaaaaaaa'
+
+a = f'"{"b"}"'
+
+a = f'"{"b"}"'
+
+a = r'\"{"b"}\"'
+```
+
+## Black Output
+
+```python
+# Regression tests for long f-strings, including examples from issue #3623
+
+a = (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+)
+
+a = (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = (
+    f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+    + f'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"{"b"}"'
+)
+
+a = f'bbbbbbb"{"b"}"' "aaaaaaaa"
+
+a = f'"{"b"}"'
+
+a = f'"{"b"}"'
+
+a = r'\"{"b"}\"'
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__generics_wrapping.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__generics_wrapping.py.snap
new file mode 100644
index 0000000000..6df7d9b964
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__generics_wrapping.py.snap
@@ -0,0 +1,561 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/generics_wrapping.py
+---
+## Input
+
+```python
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+def arg_magic[T, B](a: T, b: T,) -> T:
+    return a
+
+def type_param_magic[T, B,](a: T, b: T) -> T:
+    return a
+
+def both_magic[T, B,](a: T, b: T,) -> T:
+    return a
+
+
+def plain_multiline[
+    T,
+    B
+](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def arg_magic_multiline[
+    T,
+    B
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def type_param_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def both_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_mixed1[
+    T,
+    B
+](a: T, b: T) -> T:
+    return a
+
+def plain_mixed2[T, B](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def arg_magic_mixed1[
+    T,
+    B
+](a: T, b: T,) -> T:
+    return a
+
+def arg_magic_mixed2[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def type_param_magic_mixed1[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+def type_param_magic_mixed2[T, B,](
+    a: T,
+    b: T
+) -> T:
+    return a
+
+def both_magic_mixed1[
+    T,
+    B,
+](a: T, b: T,) -> T:
+    return a
+
+def both_magic_mixed2[T, B,](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+def something_something_function[
+    T: Model
+](param: list[int], other_param: type[T], *, some_other_param: bool = True) -> QuerySet[
+    T
+]:
+    pass
+
+
+def func[A_LOT_OF_GENERIC_TYPES: AreBeingDefinedHere, LIKE_THIS, AND_THIS, ANOTHER_ONE, AND_YET_ANOTHER_ONE: ThisOneHasTyping](a: T, b: T, c: T, d: T, e: T, f: T, g: T, h: T, i: T, j: T, k: T, l: T, m: T, n: T, o: T, p: T) -> T:
+    return a
+
+
+def with_random_comments[
+    Z
+    # bye
+]():
+    return a
+
+
+def func[
+    T,  # comment
+    U  # comment
+    ,
+    Z:  # comment
+    int
+](): pass
+
+
+def func[
+    T,  # comment but it's long so it doesn't just move to the end of the line
+    U  # comment comment comm comm ent ent
+    ,
+    Z:  # comment ent ent comm comm comment
+    int
+](): pass
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -12,9 +12,7 @@
+ def type_param_magic[
+     T,
+     B,
+-](
+-    a: T, b: T
+-) -> T:
++](a: T, b: T) -> T:
+     return a
+ 
+ 
+@@ -42,9 +40,7 @@
+ def type_param_magic_multiline[
+     T,
+     B,
+-](
+-    a: T, b: T
+-) -> T:
++](a: T, b: T) -> T:
+     return a
+ 
+ 
+@@ -83,18 +79,14 @@
+ def type_param_magic_mixed1[
+     T,
+     B,
+-](
+-    a: T, b: T
+-) -> T:
++](a: T, b: T) -> T:
+     return a
+ 
+ 
+ def type_param_magic_mixed2[
+     T,
+     B,
+-](
+-    a: T, b: T
+-) -> T:
++](a: T, b: T) -> T:
+     return a
+ 
+ 
+@@ -158,13 +150,19 @@
+     return a
+ 
+ 
+-def func[T, U, Z: int]():  # comment  # comment  # comment
++def func[
++    T,  # comment
++    U,  # comment
++    Z: # comment
++    int,
++]():
+     pass
+ 
+ 
+ def func[
+     T,  # comment but it's long so it doesn't just move to the end of the line
+     U,  # comment comment comm comm ent ent
+-    Z: int,  # comment ent ent comm comm comment
++    Z: # comment ent ent comm comm comment
++    int,
+ ]():
+     pass
+```
+
+## Ruff Output
+
+```python
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+
+def both_magic[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_multiline[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic_multiline[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+
+def both_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def plain_mixed2[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_mixed1[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def arg_magic_mixed2[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic_mixed1[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+
+def type_param_magic_mixed2[
+    T,
+    B,
+](a: T, b: T) -> T:
+    return a
+
+
+def both_magic_mixed1[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def both_magic_mixed2[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def something_something_function[T: Model](
+    param: list[int], other_param: type[T], *, some_other_param: bool = True
+) -> QuerySet[T]:
+    pass
+
+
+def func[
+    A_LOT_OF_GENERIC_TYPES: AreBeingDefinedHere,
+    LIKE_THIS,
+    AND_THIS,
+    ANOTHER_ONE,
+    AND_YET_ANOTHER_ONE: ThisOneHasTyping,
+](
+    a: T,
+    b: T,
+    c: T,
+    d: T,
+    e: T,
+    f: T,
+    g: T,
+    h: T,
+    i: T,
+    j: T,
+    k: T,
+    l: T,
+    m: T,
+    n: T,
+    o: T,
+    p: T,
+) -> T:
+    return a
+
+
+def with_random_comments[
+    Z
+    # bye
+]():
+    return a
+
+
+def func[
+    T,  # comment
+    U,  # comment
+    Z: # comment
+    int,
+]():
+    pass
+
+
+def func[
+    T,  # comment but it's long so it doesn't just move to the end of the line
+    U,  # comment comment comm comm ent ent
+    Z: # comment ent ent comm comm comment
+    int,
+]():
+    pass
+```
+
+## Black Output
+
+```python
+def plain[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def both_magic[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_multiline[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_multiline[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic_multiline[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def both_magic_multiline[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def plain_mixed1[T, B](a: T, b: T) -> T:
+    return a
+
+
+def plain_mixed2[T, B](a: T, b: T) -> T:
+    return a
+
+
+def arg_magic_mixed1[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def arg_magic_mixed2[T, B](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def type_param_magic_mixed1[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def type_param_magic_mixed2[
+    T,
+    B,
+](
+    a: T, b: T
+) -> T:
+    return a
+
+
+def both_magic_mixed1[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def both_magic_mixed2[
+    T,
+    B,
+](
+    a: T,
+    b: T,
+) -> T:
+    return a
+
+
+def something_something_function[T: Model](
+    param: list[int], other_param: type[T], *, some_other_param: bool = True
+) -> QuerySet[T]:
+    pass
+
+
+def func[
+    A_LOT_OF_GENERIC_TYPES: AreBeingDefinedHere,
+    LIKE_THIS,
+    AND_THIS,
+    ANOTHER_ONE,
+    AND_YET_ANOTHER_ONE: ThisOneHasTyping,
+](
+    a: T,
+    b: T,
+    c: T,
+    d: T,
+    e: T,
+    f: T,
+    g: T,
+    h: T,
+    i: T,
+    j: T,
+    k: T,
+    l: T,
+    m: T,
+    n: T,
+    o: T,
+    p: T,
+) -> T:
+    return a
+
+
+def with_random_comments[
+    Z
+    # bye
+]():
+    return a
+
+
+def func[T, U, Z: int]():  # comment  # comment  # comment
+    pass
+
+
+def func[
+    T,  # comment but it's long so it doesn't just move to the end of the line
+    U,  # comment comment comm comm ent ent
+    Z: int,  # comment ent ent comm comm comment
+]():
+    pass
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__long_strings__type_annotations.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__long_strings__type_annotations.py.snap
new file mode 100644
index 0000000000..903cb24cdb
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__long_strings__type_annotations.py.snap
@@ -0,0 +1,114 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/long_strings__type_annotations.py
+---
+## Input
+
+```python
+def func(
+    arg1,
+    arg2,
+) -> Set["this_is_a_very_long_module_name.AndAVeryLongClasName"
+         ".WithAVeryVeryVeryVeryVeryLongSubClassName"]:
+  pass
+
+
+def func(
+    argument: (
+        "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+        "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+    ),
+) -> (
+    "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+    "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+):
+  pass
+
+
+def func(
+    argument: (
+        "int |"
+        "str"
+    ),
+) -> Set["int |"
+         " str"]:
+  pass
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -21,6 +21,6 @@
+ 
+ 
+ def func(
+-    argument: "int |" "str",
+-) -> Set["int |" " str"]:
++    argument: ("int |str"),
++) -> Set["int | str"]:
+     pass
+```
+
+## Ruff Output
+
+```python
+def func(
+    arg1,
+    arg2,
+) -> Set[
+    "this_is_a_very_long_module_name.AndAVeryLongClasName"
+    ".WithAVeryVeryVeryVeryVeryLongSubClassName"
+]:
+    pass
+
+
+def func(
+    argument: (
+        "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+        "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+    ),
+) -> (
+    "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+    "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+):
+    pass
+
+
+def func(
+    argument: ("int |str"),
+) -> Set["int | str"]:
+    pass
+```
+
+## Black Output
+
+```python
+def func(
+    arg1,
+    arg2,
+) -> Set[
+    "this_is_a_very_long_module_name.AndAVeryLongClasName"
+    ".WithAVeryVeryVeryVeryVeryLongSubClassName"
+]:
+    pass
+
+
+def func(
+    argument: (
+        "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+        "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+    ),
+) -> (
+    "VeryLongClassNameWithAwkwardGenericSubtype[int] |"
+    "VeryLongClassNameWithAwkwardGenericSubtype[str]"
+):
+    pass
+
+
+def func(
+    argument: "int |" "str",
+) -> Set["int |" " str"]:
+    pass
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__no_blank_line_before_docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__no_blank_line_before_docstring.py.snap
deleted file mode 100644
index 379f746fae..0000000000
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__no_blank_line_before_docstring.py.snap
+++ /dev/null
@@ -1,122 +0,0 @@
----
-source: crates/ruff_python_formatter/tests/fixtures.rs
-input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/no_blank_line_before_docstring.py
-snapshot_kind: text
----
-## Input
-
-```python
-def line_before_docstring():
-
-    """Please move me up"""
-
-
-class LineBeforeDocstring:
-
-    """Please move me up"""
-
-
-class EvenIfThereIsAMethodAfter:
-
-    """I'm the docstring"""
-    def method(self):
-        pass
-
-
-class TwoLinesBeforeDocstring:
-
-
-    """I want to be treated the same as if I were closer"""
-
-
-class MultilineDocstringsAsWell:
-
-    """I'm so far
-
-    and on so many lines...
-    """
-
-class SingleQuotedDocstring:
-
-    "I'm a docstring but I don't even get triple quotes."
-```
-
-## Black Differences
-
-```diff
---- Black
-+++ Ruff
-@@ -25,5 +25,4 @@
- 
- 
- class SingleQuotedDocstring:
--
-     "I'm a docstring but I don't even get triple quotes."
-```
-
-## Ruff Output
-
-```python
-def line_before_docstring():
-    """Please move me up"""
-
-
-class LineBeforeDocstring:
-    """Please move me up"""
-
-
-class EvenIfThereIsAMethodAfter:
-    """I'm the docstring"""
-
-    def method(self):
-        pass
-
-
-class TwoLinesBeforeDocstring:
-    """I want to be treated the same as if I were closer"""
-
-
-class MultilineDocstringsAsWell:
-    """I'm so far
-
-    and on so many lines...
-    """
-
-
-class SingleQuotedDocstring:
-    "I'm a docstring but I don't even get triple quotes."
-```
-
-## Black Output
-
-```python
-def line_before_docstring():
-    """Please move me up"""
-
-
-class LineBeforeDocstring:
-    """Please move me up"""
-
-
-class EvenIfThereIsAMethodAfter:
-    """I'm the docstring"""
-
-    def method(self):
-        pass
-
-
-class TwoLinesBeforeDocstring:
-    """I want to be treated the same as if I were closer"""
-
-
-class MultilineDocstringsAsWell:
-    """I'm so far
-
-    and on so many lines...
-    """
-
-
-class SingleQuotedDocstring:
-
-    "I'm a docstring but I don't even get triple quotes."
-```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep604_union_types_line_breaks.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep604_union_types_line_breaks.py.snap
index dc61db96dc..f5eba916b2 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep604_union_types_line_breaks.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep604_union_types_line_breaks.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.py
-snapshot_kind: text
 ---
 ## Input
 
@@ -27,7 +26,7 @@ z: (Short
 z: (int) = 2.3
 z: ((int)) = foo()
 
-# In case I go for not enforcing parentheses, this might get improved at the same time
+# In case I go for not enforcing parantheses, this might get improved at the same time
 x = (
     z
     == 9999999999999999999999999999999999999999
@@ -166,7 +165,7 @@ z: Short | Short2 | Short3 | Short4 = 8
 z: int = 2.3
 z: int = foo()
 
-# In case I go for not enforcing parentheses, this might get improved at the same time
+# In case I go for not enforcing parantheses, this might get improved at the same time
 x = (
     z
     == 9999999999999999999999999999999999999999
@@ -270,7 +269,7 @@ z: Short | Short2 | Short3 | Short4 = 8
 z: int = 2.3
 z: int = foo()
 
-# In case I go for not enforcing parentheses, this might get improved at the same time
+# In case I go for not enforcing parantheses, this might get improved at the same time
 x = (
     z
     == 9999999999999999999999999999999999999999
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep_701.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep_701.py.snap
index 63d6544faa..0b1894126c 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep_701.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__pep_701.py.snap
@@ -80,8 +80,9 @@ x = f"a{2+2:=^{foo(x+y**2):something else}}b"
 x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
 f'{(abc:=10)}'
 
-f"This is a really long string, but just make sure that you reflow fstrings {
-    2+2:d}"
+f"""This is a really long string, but just make sure that you reflow fstrings {
+    2+2:d
+}"""
 f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
 
 f"{2+2=}"
@@ -168,7 +169,7 @@ rf"\{"a"}"
  
  x = """foo {{ {2 + 2}bar
  baz"""
-@@ -28,55 +26,48 @@
+@@ -28,55 +26,50 @@
  
  x = f"""foo {{ {2 + 2}bar {{ baz"""
  
@@ -231,16 +232,16 @@ rf"\{"a"}"
 +x = f"a{2 + 2:=^{foo(x + y**2):something else}one more}b"
 +f"{(abc := 10)}"
  
--f"This is a really long string, but just make sure that you reflow fstrings {
+ f"""This is a really long string, but just make sure that you reflow fstrings {
 -    2+2:d
--}"
++    2 + 2:d
+ }"""
 -f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
-+f"This is a really long string, but just make sure that you reflow fstrings {2 + 2:d}"
 +f"This is a really long string, but just make sure that you reflow fstrings correctly {2 + 2:d}"
  
  f"{2+2=}"
  f"{2+2    =    }"
-@@ -88,14 +79,10 @@
+@@ -88,14 +81,10 @@
  %d
  }"""
  
@@ -257,7 +258,7 @@ rf"\{"a"}"
  )
  
  f"`escape` only permitted in {{'html', 'latex', 'latex-math'}}, \
-@@ -105,8 +92,10 @@
+@@ -105,8 +94,10 @@
  rf"\{{\}}"
  
  f"""
@@ -270,7 +271,7 @@ rf"\{"a"}"
  """
  
  value: str = f"""foo
-@@ -124,13 +113,15 @@
+@@ -124,13 +115,15 @@
  
  f'{{\\"kind\\":\\"ConfigMap\\",\\"metadata\\":{{\\"annotations\\":{{}},\\"name\\":\\"cluster-info\\",\\"namespace\\":\\"amazon-cloudwatch\\"}}}}'
  
@@ -364,7 +365,9 @@ x = f"a{2 + 2:=^{foo(x + y**2):something else}}b"
 x = f"a{2 + 2:=^{foo(x + y**2):something else}one more}b"
 f"{(abc := 10)}"
 
-f"This is a really long string, but just make sure that you reflow fstrings {2 + 2:d}"
+f"""This is a really long string, but just make sure that you reflow fstrings {
+    2 + 2:d
+}"""
 f"This is a really long string, but just make sure that you reflow fstrings correctly {2 + 2:d}"
 
 f"{2+2=}"
@@ -503,9 +506,9 @@ x = f"a{2+2:=^{foo(x+y**2):something else}}b"
 x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
 f"{(abc:=10)}"
 
-f"This is a really long string, but just make sure that you reflow fstrings {
+f"""This is a really long string, but just make sure that you reflow fstrings {
     2+2:d
-}"
+}"""
 f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
 
 f"{2+2=}"
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__prefer_rhs_split_reformatted.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__prefer_rhs_split_reformatted.py.snap
new file mode 100644
index 0000000000..a21a90481e
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__prefer_rhs_split_reformatted.py.snap
@@ -0,0 +1,123 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/prefer_rhs_split_reformatted.py
+---
+## Input
+
+```python
+# 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
+
+# Regression test for #1187
+print(
+    dict(
+        a=1,
+        b=2 if some_kind_of_data is not None else some_other_kind_of_data,  # some explanation of why this is actually necessary
+        c=3,
+    )
+)
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -24,9 +24,9 @@
+ print(
+     dict(
+         a=1,
+-        b=(
+-            2 if some_kind_of_data is not None else some_other_kind_of_data
+-        ),  # some explanation of why this is actually necessary
++        b=2
++        if some_kind_of_data is not None
++        else some_other_kind_of_data,  # some explanation of why this is actually necessary
+         c=3,
+     )
+ )
+```
+
+## Ruff Output
+
+```python
+# 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
+
+# Regression test for #1187
+print(
+    dict(
+        a=1,
+        b=2
+        if some_kind_of_data is not None
+        else some_other_kind_of_data,  # some explanation of why this is actually necessary
+        c=3,
+    )
+)
+```
+
+## Black Output
+
+```python
+# 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
+
+# Regression test for #1187
+print(
+    dict(
+        a=1,
+        b=(
+            2 if some_kind_of_data is not None else some_other_kind_of_data
+        ),  # some explanation of why this is actually necessary
+        c=3,
+    )
+)
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_comments7.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_comments7.py.snap
index 36f29c9177..ab98186210 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_comments7.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_comments7.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_comments7.py
-snapshot_kind: text
 ---
 ## Input
 
@@ -157,7 +156,12 @@ square = Square(4) # type: Optional[Square]
 ```diff
 --- Black
 +++ Ruff
-@@ -34,13 +34,9 @@
+@@ -29,17 +29,14 @@
+     MyLovelyCompanyTeamProjectComponent as component,  # DRY
+ )
+ 
++
+ result = 1  # look ma, no comment migration xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
  
  result = 1  # look ma, no comment migration xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
  
@@ -173,7 +177,7 @@ square = Square(4) # type: Optional[Square]
  
  
  def func():
-@@ -52,12 +48,19 @@
+@@ -51,12 +48,19 @@
          0.0789,
          a[-1],  # type: ignore
      )
@@ -194,7 +198,7 @@ square = Square(4) # type: Optional[Square]
          0.0456,
          0.0789,
          0.0123,
-@@ -91,53 +94,39 @@
+@@ -90,53 +94,39 @@
              # metadata_version errors.
              (
                  {},
@@ -264,7 +268,7 @@ square = Square(4) # type: Optional[Square]
              ),
          ],
      )
-@@ -150,8 +139,8 @@
+@@ -149,8 +139,8 @@
  
  # Regression test for https://github.com/psf/black/issues/3756.
  [
@@ -466,7 +470,6 @@ from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component
     MyLovelyCompanyTeamProjectComponent as component,  # DRY
 )
 
-
 result = 1  # look ma, no comment migration xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 result = 1  # look ma, no comment migration xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_import_line_collapse.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_import_line_collapse.py.snap
new file mode 100644
index 0000000000..535c0d3426
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_import_line_collapse.py.snap
@@ -0,0 +1,325 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_import_line_collapse.py
+---
+## Input
+
+```python
+from middleman.authentication import validate_oauth_token
+
+
+logger = logging.getLogger(__name__)
+
+
+# case 2 comment after import
+from middleman.authentication import validate_oauth_token
+#comment
+
+logger = logging.getLogger(__name__)
+
+
+# case 3 comment after import
+from middleman.authentication import validate_oauth_token
+# comment
+logger = logging.getLogger(__name__)
+
+
+from middleman.authentication import validate_oauth_token
+
+
+
+logger = logging.getLogger(__name__)
+
+
+# case 4 try catch with import after import
+import os
+import os
+
+
+
+try:
+    import os
+except Exception:
+    pass
+
+try:
+    import os
+    def func():
+        a = 1
+except Exception:
+    pass
+
+
+# case 5 multiple imports
+import os
+import os
+
+import os
+import os
+
+
+
+
+
+for i in range(10):
+    print(i)
+
+
+# case 6 import in function
+def func():
+    print()
+    import os
+    def func():
+        pass
+    print()
+
+
+def func():
+    import os
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+
+
+    a = 1
+    print()
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,11 +1,11 @@
+ from middleman.authentication import validate_oauth_token
+ 
++
+ logger = logging.getLogger(__name__)
+ 
+ 
+ # case 2 comment after import
+ from middleman.authentication import validate_oauth_token
+-
+ # comment
+ 
+ logger = logging.getLogger(__name__)
+@@ -20,6 +20,7 @@
+ 
+ from middleman.authentication import validate_oauth_token
+ 
++
+ logger = logging.getLogger(__name__)
+ 
+ 
+@@ -27,6 +28,7 @@
+ import os
+ import os
+ 
++
+ try:
+     import os
+ except Exception:
+@@ -49,6 +51,7 @@
+ import os
+ import os
+ 
++
+ for i in range(10):
+     print(i)
+ 
+```
+
+## Ruff Output
+
+```python
+from middleman.authentication import validate_oauth_token
+
+
+logger = logging.getLogger(__name__)
+
+
+# case 2 comment after import
+from middleman.authentication import validate_oauth_token
+# comment
+
+logger = logging.getLogger(__name__)
+
+
+# case 3 comment after import
+from middleman.authentication import validate_oauth_token
+
+# comment
+logger = logging.getLogger(__name__)
+
+
+from middleman.authentication import validate_oauth_token
+
+
+logger = logging.getLogger(__name__)
+
+
+# case 4 try catch with import after import
+import os
+import os
+
+
+try:
+    import os
+except Exception:
+    pass
+
+try:
+    import os
+
+    def func():
+        a = 1
+
+except Exception:
+    pass
+
+
+# case 5 multiple imports
+import os
+import os
+
+import os
+import os
+
+
+for i in range(10):
+    print(i)
+
+
+# case 6 import in function
+def func():
+    print()
+    import os
+
+    def func():
+        pass
+
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+```
+
+## Black Output
+
+```python
+from middleman.authentication import validate_oauth_token
+
+logger = logging.getLogger(__name__)
+
+
+# case 2 comment after import
+from middleman.authentication import validate_oauth_token
+
+# comment
+
+logger = logging.getLogger(__name__)
+
+
+# case 3 comment after import
+from middleman.authentication import validate_oauth_token
+
+# comment
+logger = logging.getLogger(__name__)
+
+
+from middleman.authentication import validate_oauth_token
+
+logger = logging.getLogger(__name__)
+
+
+# case 4 try catch with import after import
+import os
+import os
+
+try:
+    import os
+except Exception:
+    pass
+
+try:
+    import os
+
+    def func():
+        a = 1
+
+except Exception:
+    pass
+
+
+# case 5 multiple imports
+import os
+import os
+
+import os
+import os
+
+for i in range(10):
+    print(i)
+
+
+# case 6 import in function
+def func():
+    print()
+    import os
+
+    def func():
+        pass
+
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+
+
+def func():
+    import os
+
+    a = 1
+    print()
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_dict_values.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_dict_values.py.snap
index f679636113..93f28b8669 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_dict_values.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_dict_values.py.snap
@@ -1,11 +1,31 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_dict_values.py
-snapshot_kind: text
 ---
 ## Input
 
 ```python
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "foo": bar,
+    "foo": bar,
+    "foo": (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
+
 my_dict = {
     "something_something":
         r"Lorem ipsum dolor sit amet, an sed convenire eloquentiam \t"
@@ -13,23 +33,90 @@ my_dict = {
         r"signiferumque, duo ea vocibus consetetur scriptorem. Facer \t",
 }
 
+# Function calls as keys
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src,
+    loop.run_in_executor(): src,
+    loop.run_in_executor(xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx): src,
+    loop.run_in_executor(
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxx
+    ): src,
+    loop.run_in_executor(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+
+# Dictionary comprehensions
+tasks = {
+    key_name: (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {key_name: foobar for src in sources}
+tasks = {
+    get_key_name(
+        src,
+    ): "foo"
+    for src in sources
+}
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src
+    for src in sources
+}
+tasks = {
+    get_key_name(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {get_key_name(): foobar for src in sources}
+
+
+# Delimiters inside the value
+def foo():
+    def bar():
+        x = {
+            common.models.DateTimeField: datetime(2020, 1, 31, tzinfo=utc) + timedelta(
+                days=i
+            ),
+        }
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            "foobar": (123 + 456),
+        }
+        x = {
+            "foobar": (123) + 456,
+        }
+
+
 my_dict = {
     "a key in my dict": a_very_long_variable * and_a_very_long_function_call() / 100000.0
 }
-
 my_dict = {
     "a key in my dict": a_very_long_variable * and_a_very_long_function_call() * and_another_long_func() / 100000.0
 }
-
 my_dict = {
     "a key in my dict": MyClass.some_attribute.first_call().second_call().third_call(some_args="some value")
 }
 
 {
-    'xxxxxx':
+    "xxxxxx":
         xxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxx(
             xxxxxxxxxxxxxx={
-                'x':
+                "x":
                     xxxxxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxx(
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=(
                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -37,8 +124,8 @@ my_dict = {
                                 xxxxxxxxxxxxx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 .xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx(
                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx={
-                                        'x': x.xx,
-                                        'x': x.x,
+                                        "x": x.xx,
+                                        "x": x.x,
                                     }))))
             }),
 }
@@ -69,7 +156,9 @@ class Random:
 ```diff
 --- Black
 +++ Ruff
-@@ -1,32 +1,26 @@
+@@ -20,11 +20,9 @@
+ }
+ 
  my_dict = {
 -    "something_something": (
 -        r"Lorem ipsum dolor sit amet, an sed convenire eloquentiam \t"
@@ -81,6 +170,31 @@ class Random:
 +    r"signiferumque, duo ea vocibus consetetur scriptorem. Facer \t",
  }
  
+ # Function calls as keys
+@@ -79,9 +77,8 @@
+ def foo():
+     def bar():
+         x = {
+-            common.models.DateTimeField: (
+-                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+-            ),
++            common.models.DateTimeField: datetime(2020, 1, 31, tzinfo=utc)
++            + timedelta(days=i),
+         }
+         x = {
+             common.models.DateTimeField: (
+@@ -89,7 +86,7 @@
+             ),
+         }
+         x = {
+-            "foobar": 123 + 456,
++            "foobar": (123 + 456),
+         }
+         x = {
+             "foobar": (123) + 456,
+@@ -97,24 +94,20 @@
+ 
+ 
  my_dict = {
 -    "a key in my dict": (
 -        a_very_long_variable * and_a_very_long_function_call() / 100000.0
@@ -89,7 +203,6 @@ class Random:
 +    * and_a_very_long_function_call()
 +    / 100000.0
  }
- 
  my_dict = {
 -    "a key in my dict": (
 -        a_very_long_variable
@@ -102,7 +215,6 @@ class Random:
 +    * and_another_long_func()
 +    / 100000.0
  }
- 
  my_dict = {
 -    "a key in my dict": (
 -        MyClass.some_attribute.first_call()
@@ -115,7 +227,16 @@ class Random:
  }
  
  {
-@@ -58,9 +52,9 @@
+@@ -139,17 +132,17 @@
+ 
+ class Random:
+     def func():
+-        random_service.status.active_states.inactive = make_new_top_level_state_from_dict(
+-            {
++        random_service.status.active_states.inactive = (
++            make_new_top_level_state_from_dict({
+                 "topLevelBase": {
+                     "secondaryBase": {
                          "timestamp": 1234,
                          "latitude": 1,
                          "longitude": 2,
@@ -127,31 +248,120 @@ class Random:
 +                        ).ToJsonString(),
                      }
                  },
-             })
+-            }
++            })
+         )
 ```
 
 ## Ruff Output
 
 ```python
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "foo": bar,
+    "foo": bar,
+    "foo": (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
+
 my_dict = {
     "something_something": r"Lorem ipsum dolor sit amet, an sed convenire eloquentiam \t"
     r"signiferumque, duo ea vocibus consetetur scriptorem. Facer \t"
     r"signiferumque, duo ea vocibus consetetur scriptorem. Facer \t",
 }
 
+# Function calls as keys
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src,
+    loop.run_in_executor(): src,
+    loop.run_in_executor(xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx): src,
+    loop.run_in_executor(
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxx
+    ): src,
+    loop.run_in_executor(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+
+# Dictionary comprehensions
+tasks = {
+    key_name: (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {key_name: foobar for src in sources}
+tasks = {
+    get_key_name(
+        src,
+    ): "foo"
+    for src in sources
+}
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src
+    for src in sources
+}
+tasks = {
+    get_key_name(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {get_key_name(): foobar for src in sources}
+
+
+# Delimiters inside the value
+def foo():
+    def bar():
+        x = {
+            common.models.DateTimeField: datetime(2020, 1, 31, tzinfo=utc)
+            + timedelta(days=i),
+        }
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            "foobar": (123 + 456),
+        }
+        x = {
+            "foobar": (123) + 456,
+        }
+
+
 my_dict = {
     "a key in my dict": a_very_long_variable
     * and_a_very_long_function_call()
     / 100000.0
 }
-
 my_dict = {
     "a key in my dict": a_very_long_variable
     * and_a_very_long_function_call()
     * and_another_long_func()
     / 100000.0
 }
-
 my_dict = {
     "a key in my dict": MyClass.some_attribute.first_call()
     .second_call()
@@ -199,6 +409,27 @@ class Random:
 ## Black Output
 
 ```python
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "foo": bar,
+    "foo": bar,
+    "foo": (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
+
 my_dict = {
     "something_something": (
         r"Lorem ipsum dolor sit amet, an sed convenire eloquentiam \t"
@@ -207,12 +438,80 @@ my_dict = {
     ),
 }
 
+# Function calls as keys
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src,
+    loop.run_in_executor(): src,
+    loop.run_in_executor(xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx): src,
+    loop.run_in_executor(
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxx
+    ): src,
+    loop.run_in_executor(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    ),
+}
+
+# Dictionary comprehensions
+tasks = {
+    key_name: (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {key_name: foobar for src in sources}
+tasks = {
+    get_key_name(
+        src,
+    ): "foo"
+    for src in sources
+}
+tasks = {
+    get_key_name(
+        foo,
+        bar,
+        baz,
+    ): src
+    for src in sources
+}
+tasks = {
+    get_key_name(): (
+        xx_xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxxxxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx
+    )
+    for src in sources
+}
+tasks = {get_key_name(): foobar for src in sources}
+
+
+# Delimiters inside the value
+def foo():
+    def bar():
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            common.models.DateTimeField: (
+                datetime(2020, 1, 31, tzinfo=utc) + timedelta(days=i)
+            ),
+        }
+        x = {
+            "foobar": 123 + 456,
+        }
+        x = {
+            "foobar": (123) + 456,
+        }
+
+
 my_dict = {
     "a key in my dict": (
         a_very_long_variable * and_a_very_long_function_call() / 100000.0
     )
 }
-
 my_dict = {
     "a key in my dict": (
         a_very_long_variable
@@ -221,7 +520,6 @@ my_dict = {
         / 100000.0
     )
 }
-
 my_dict = {
     "a key in my dict": (
         MyClass.some_attribute.first_call()
@@ -252,8 +550,8 @@ my_dict = {
 
 class Random:
     def func():
-        random_service.status.active_states.inactive = (
-            make_new_top_level_state_from_dict({
+        random_service.status.active_states.inactive = make_new_top_level_state_from_dict(
+            {
                 "topLevelBase": {
                     "secondaryBase": {
                         "timestamp": 1234,
@@ -264,6 +562,6 @@ class Random:
                         ),
                     }
                 },
-            })
+            }
         )
 ```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings.py.snap
index 3b7b47cb74..7b36236110 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings.py
-snapshot_kind: text
 ---
 ## Input
 
@@ -286,7 +285,7 @@ string_with_escaped_nameescape = (
     "........................................................................... \\N{LAO KO LA}"
 )
 
-msg = lambda x: f"this is a very very very long lambda value {x} that doesn't fit on a single line"
+msg = lambda x: f"this is a very very very very long lambda value {x} that doesn't fit on a single line"
 
 dict_with_lambda_values = {
     "join": lambda j: (
@@ -335,6 +334,20 @@ log.info(f'''Skipping: {"a" == 'b'} {desc["ms_name"]} {money=} {dte=} {pos_share
 log.info(f'''Skipping: {'a' == "b"=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}''')
 
 log.info(f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}""")
+
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx",
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+    )
+}
 ```
 
 ## Black Differences
@@ -841,7 +854,7 @@ log.info(f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share
  
  long_unmergable_string_with_pragma = (
      "This is a really long string that can't be merged because it has a likely pragma at the end"  # type: ignore
-@@ -468,51 +358,24 @@
+@@ -468,49 +358,24 @@
      " of it."
  )
  
@@ -893,16 +906,15 @@ log.info(f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share
 -)
 +string_with_escaped_nameescape = "........................................................................... \\N{LAO KO LA}"
  
- msg = (
--    lambda x: (
--        f"this is a very very very long lambda value {x} that doesn't fit on a single"
--        " line"
--    )
-+    lambda x: f"this is a very very very long lambda value {x} that doesn't fit on a single line"
+-msg = lambda x: (
+-    f"this is a very very very very long lambda value {x} that doesn't fit on a"
+-    " single line"
++msg = (
++    lambda x: f"this is a very very very very long lambda value {x} that doesn't fit on a single line"
  )
  
  dict_with_lambda_values = {
-@@ -524,65 +387,58 @@
+@@ -522,65 +387,58 @@
  
  # Complex string concatenations with a method call in the middle.
  code = (
@@ -927,50 +939,50 @@ log.info(f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share
 +call(body=("%s %s" % ((",".join(items)), suffix)))
  
  log.info(
--    "Skipping:"
--    f' {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]=} {desc["exposure_max"]=}'
+-    f'Skipping: {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=}'
+-    f' {desc["status"]=} {desc["exposure_max"]=}'
 +    f'Skipping: {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]=} {desc["exposure_max"]=}'
  )
  
  log.info(
--    "Skipping:"
--    f" {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']=} {desc['exposure_max']=}"
+-    f"Skipping: {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=}"
+-    f" {desc['status']=} {desc['exposure_max']=}"
 +    f"Skipping: {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']=} {desc['exposure_max']=}"
  )
  
  log.info(
--    "Skipping:"
--    f" {desc['db_id']} {foo('bar',x=123)} {'foo' != 'bar'} {(x := 'abc=')} {pos_share=} {desc['status']} {desc['exposure_max']}"
+-    f'Skipping: {desc["db_id"]} {foo("bar",x=123)} {"foo" != "bar"} {(x := "abc=")}'
+-    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 +    f"Skipping: {desc['db_id']} {foo('bar', x=123)} {'foo' != 'bar'} {(x := 'abc=')} {pos_share=} {desc['status']} {desc['exposure_max']}"
  )
  
  log.info(
--    "Skipping:"
--    f' {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+-    f'Skipping: {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=}'
+-    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 +    f'Skipping: {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
  )
  
  log.info(
--    "Skipping:"
--    f' {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+-    f'Skipping: {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=}'
+-    f' {desc["status"]} {desc["exposure_max"]}'
 +    f'Skipping: {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
  )
  
  log.info(
--    "Skipping:"
--    f' {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+-    f'Skipping: {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=}'
+-    f' {desc["status"]} {desc["exposure_max"]}'
 +    f'Skipping: {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
  )
  
  log.info(
--    "Skipping:"
--    f" {'a' == 'b' == 'c' == 'd'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"
+-    f'Skipping: {"a" == "b" == "c" == "d"} {desc["ms_name"]} {money=} {dte=}'
+-    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 +    f"Skipping: {'a' == 'b' == 'c' == 'd'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"
  )
  
  log.info(
--    "Skipping:"
--    f' {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+-    f'Skipping: {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=}'
+-    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 +    f'Skipping: {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
  )
  
@@ -986,13 +998,30 @@ log.info(f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share
  )
  
  log.info(
-@@ -590,5 +446,5 @@
+@@ -588,7 +446,7 @@
  )
  
  log.info(
 -    f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"""
 +    f"""Skipping: {"a" == "b"} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}"""
  )
+ 
+ x = {
+@@ -597,10 +455,10 @@
+     )
+ }
+ x = {
+-    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+-        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+-    ),
++    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx",
+ }
+ x = {
+-    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
++    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
++        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
++    )
+ }
 ```
 
 ## Ruff Output
@@ -1375,7 +1404,7 @@ string_with_escaped_nameescape = "..............................................
 string_with_escaped_nameescape = "........................................................................... \\N{LAO KO LA}"
 
 msg = (
-    lambda x: f"this is a very very very long lambda value {x} that doesn't fit on a single line"
+    lambda x: f"this is a very very very very long lambda value {x} that doesn't fit on a single line"
 )
 
 dict_with_lambda_values = {
@@ -1448,6 +1477,20 @@ log.info(
 log.info(
     f"""Skipping: {"a" == "b"} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}"""
 )
+
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx",
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+    )
+}
 ```
 
 ## Black Output
@@ -1963,11 +2006,9 @@ string_with_escaped_nameescape = (
     " \\N{LAO KO LA}"
 )
 
-msg = (
-    lambda x: (
-        f"this is a very very very long lambda value {x} that doesn't fit on a single"
-        " line"
-    )
+msg = lambda x: (
+    f"this is a very very very very long lambda value {x} that doesn't fit on a"
+    " single line"
 )
 
 dict_with_lambda_values = {
@@ -1992,43 +2033,43 @@ code = (
 call(body="%s %s" % (",".join(items), suffix))
 
 log.info(
-    "Skipping:"
-    f' {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]=} {desc["exposure_max"]=}'
+    f'Skipping: {desc["db_id"]=} {desc["ms_name"]} {money=} {dte=} {pos_share=}'
+    f' {desc["status"]=} {desc["exposure_max"]=}'
 )
 
 log.info(
-    "Skipping:"
-    f" {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']=} {desc['exposure_max']=}"
+    f"Skipping: {desc['db_id']=} {desc['ms_name']} {money=} {dte=} {pos_share=}"
+    f" {desc['status']=} {desc['exposure_max']=}"
 )
 
 log.info(
-    "Skipping:"
-    f" {desc['db_id']} {foo('bar',x=123)} {'foo' != 'bar'} {(x := 'abc=')} {pos_share=} {desc['status']} {desc['exposure_max']}"
+    f'Skipping: {desc["db_id"]} {foo("bar",x=123)} {"foo" != "bar"} {(x := "abc=")}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {desc["db_id"]} {desc["ms_name"]} {money=} {(x := "abc=")=}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {desc["db_id"]} {foo("bar",x=123)=} {money=} {dte=} {pos_share=}'
+    f' {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {foo("asdf")=} {desc["ms_name"]} {money=} {dte=} {pos_share=}'
+    f' {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f" {'a' == 'b' == 'c' == 'd'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"
+    f'Skipping: {"a" == "b" == "c" == "d"} {desc["ms_name"]} {money=} {dte=}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
-    "Skipping:"
-    f' {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=} {pos_share=} {desc["status"]} {desc["exposure_max"]}'
+    f'Skipping: {"a" == "b" == "c" == "d"=} {desc["ms_name"]} {money=} {dte=}'
+    f' {pos_share=} {desc["status"]} {desc["exposure_max"]}'
 )
 
 log.info(
@@ -2047,4 +2088,18 @@ log.info(
 log.info(
     f"""Skipping: {'a' == 'b'} {desc['ms_name']} {money=} {dte=} {pos_share=} {desc['status']} {desc['exposure_max']}"""
 )
+
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    )
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxxx{xx}xxx_xxxxx_xxxxxxxxx_xxxxxxxxxxxx_xxxx"
+    ),
+}
+x = {
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": "xx:xxxxxxxxxxxxxxxxx_xxxxx_xxxxxxx_xxxxxxxxxx"
+}
 ```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings__regression.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings__regression.py.snap
index 7f61408c3c..615da9cd12 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings__regression.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings__regression.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_long_strings__regression.py
-snapshot_kind: text
 ---
 ## Input
 
@@ -559,6 +558,7 @@ a_dict = {
 }
 
 # Regression test for https://github.com/psf/black/issues/3506.
+# Regressed again by https://github.com/psf/black/pull/4498
 s = (
     "With single quote: ' "
     f" {my_dict['foo']}"
@@ -684,7 +684,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
 +                (
 +                    "xxxxxxxxxx xxxx xx xxxxxx(%x) xx %x xxxx xx xxx %x.xx"
 +                    % (len(self) + 1, xxxx.xxxxxxxxxx, xxxx.xxxxxxxxxx)
-                 )
++                )
 +                + (
 +                    " %.3f (%s) to %.3f (%s).\n"
 +                    % (
@@ -693,7 +693,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
 +                        x,
 +                        xxxx.xxxxxxxxxxxxxx(xx),
 +                    )
-+                )
+                 )
              )
  
  
@@ -1171,13 +1171,21 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
  )
  
  # Regression test for https://github.com/psf/black/issues/3455.
-@@ -674,7 +621,4 @@
+@@ -673,14 +620,6 @@
+ 
  # Regression test for https://github.com/psf/black/issues/3506.
- s = f"With single quote: '  {my_dict['foo']} With double quote: \"  {my_dict['bar']}"
+ # Regressed again by https://github.com/psf/black/pull/4498
+-s = (
+-    "With single quote: ' "
+-    f" {my_dict['foo']}"
+-    ' With double quote: " '
+-    f' {my_dict["bar"]}'
+-)
++s = f"With single quote: '  {my_dict['foo']} With double quote: \"  {my_dict['bar']}"
  
 -s = (
 -    "Lorem Ipsum is simply dummy text of the printing and typesetting"
--    f" industry:'{my_dict['foo']}'"
+-    f' industry:\'{my_dict["foo"]}\''
 -)
 +s = f"Lorem Ipsum is simply dummy text of the printing and typesetting industry:'{my_dict['foo']}'"
 ```
@@ -1806,6 +1814,7 @@ a_dict = {
 }
 
 # Regression test for https://github.com/psf/black/issues/3506.
+# Regressed again by https://github.com/psf/black/pull/4498
 s = f"With single quote: '  {my_dict['foo']} With double quote: \"  {my_dict['bar']}"
 
 s = f"Lorem Ipsum is simply dummy text of the printing and typesetting industry:'{my_dict['foo']}'"
@@ -2488,10 +2497,16 @@ a_dict = {
 }
 
 # Regression test for https://github.com/psf/black/issues/3506.
-s = f"With single quote: '  {my_dict['foo']} With double quote: \"  {my_dict['bar']}"
+# Regressed again by https://github.com/psf/black/pull/4498
+s = (
+    "With single quote: ' "
+    f" {my_dict['foo']}"
+    ' With double quote: " '
+    f' {my_dict["bar"]}'
+)
 
 s = (
     "Lorem Ipsum is simply dummy text of the printing and typesetting"
-    f" industry:'{my_dict['foo']}'"
+    f' industry:\'{my_dict["foo"]}\''
 )
 ```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_multiline_strings.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_multiline_strings.py.snap
index 8d58214ce1..353d573496 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_multiline_strings.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_multiline_strings.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_multiline_strings.py
-snapshot_kind: text
 ---
 ## Input
 
@@ -188,6 +187,73 @@ test
 assert some_var == expected_result, f"""
 expected: {expected_result}
 actual: {some_var}"""
+
+
+def foo():
+    a = {
+        xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx: {
+            "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+            "xxxxxxxx": """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+        },
+    }
+
+
+xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx = {
+    "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+    "xxxxxxxx": (
+        """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+    xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+    ),
+    "xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": """
+a
+a
+a
+a
+a""",
+}
+
+a = """
+""" if """
+""" == """
+""" else """
+"""
+
+a = """
+""" if b else """
+"""
+
+a = """
+""" if """
+""" == """
+""" else b
+
+a = b if """
+""" == """
+""" else """
+"""
+
+a = """
+""" if b else c
+
+a = c if b else """
+"""
+
+a = b if """
+""" == """
+""" else c
 ```
 
 ## Black Differences
@@ -378,6 +444,36 @@ actual: {some_var}"""
  
  assert some_var == expected_result, """
  test
+@@ -224,10 +267,8 @@
+                 """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                 xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+             ),
+-            "xxxxxxxx": (
+-                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+-                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+-            ),
++            "xxxxxxxx": """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
++                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx""",
+         },
+     }
+ 
+@@ -246,14 +287,12 @@
+ a
+ a"""
+     ),
+-    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+-        """
++    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": """
+ a
+ a
+ a
+ a
+-a"""
+-    ),
++a""",
+ }
+ 
+ a = (
 ```
 
 ## Ruff Output
@@ -642,6 +738,105 @@ test
 assert some_var == expected_result, f"""
 expected: {expected_result}
 actual: {some_var}"""
+
+
+def foo():
+    a = {
+        xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx: {
+            "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+            "xxxxxxxx": """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx""",
+        },
+    }
+
+
+xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx = {
+    "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+    "xxxxxxxx": (
+        """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+    xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+    ),
+    "xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": """
+a
+a
+a
+a
+a""",
+}
+
+a = (
+    """
+"""
+    if """
+"""
+    == """
+"""
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if b
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if """
+"""
+    == """
+"""
+    else b
+)
+
+a = (
+    b
+    if """
+"""
+    == """
+"""
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if b
+    else c
+)
+
+a = (
+    c
+    if b
+    else """
+"""
+)
+
+a = (
+    b
+    if """
+"""
+    == """
+"""
+    else c
+)
 ```
 
 ## Black Output
@@ -863,4 +1058,107 @@ test
 assert some_var == expected_result, f"""
 expected: {expected_result}
 actual: {some_var}"""
+
+
+def foo():
+    a = {
+        xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx: {
+            "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+            "xxxxxxxx": (
+                """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+                xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+            ),
+        },
+    }
+
+
+xxxx_xxxxxxx.xxxxxx_xxxxxxxxxxxx_xxxxxx_xx_xxx_xxxxxx = {
+    "xxxxx": """Sxxxxx xxxxxxxxxxxx xxx xxxxx (xxxxxx xxx xxxxxxx)""",
+    "xxxxxxxx": (
+        """Sxxxxxxx xxxxxxxx, xxxxxxx xx xxxxxxxxx
+    xxxxxxxxxxxxx xxxxxxx xxxxxxxxx xxx-xxxxxxxxxx xxxxxx xx xxx-xxxxxx"""
+    ),
+    "xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+    "xx_xxxxx_xxxxxxxxxx_xxxxxxxxx_xx": (
+        """
+a
+a
+a
+a
+a"""
+    ),
+}
+
+a = (
+    """
+"""
+    if """
+"""
+    == """
+"""
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if b
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if """
+"""
+    == """
+"""
+    else b
+)
+
+a = (
+    b
+    if """
+"""
+    == """
+"""
+    else """
+"""
+)
+
+a = (
+    """
+"""
+    if b
+    else c
+)
+
+a = (
+    c
+    if b
+    else """
+"""
+)
+
+a = (
+    b
+    if """
+"""
+    == """
+"""
+    else c
+)
 ```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_remove_multiline_lone_list_item_parens.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_remove_multiline_lone_list_item_parens.py.snap
new file mode 100644
index 0000000000..1abf5ac61e
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_remove_multiline_lone_list_item_parens.py.snap
@@ -0,0 +1,535 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_remove_multiline_lone_list_item_parens.py
+---
+## Input
+
+```python
+items  = [(x for x in [1])]
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2"}
+        if some_var == ""
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        if some_var == "long strings"
+        else "123467890123467890"
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    )
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    )
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    )
+]
+
+# Shouldn't remove trailing commas
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    ),
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    ),
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    ),
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    ),
+]
+
+# Shouldn't add parentheses
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Shouldn't crash with comments
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,30 +1,40 @@
+ items = [(x for x in [1])]
+ 
+ items = [
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )
+ ]
+-items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
++items = [({"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"})]
+ items = [
+-    "123456890123457890123468901234567890"
+-    if some_var == "long strings"
+-    else "123467890123467890"
++    (
++        "123456890123457890123468901234567890"
++        if some_var == "long strings"
++        else "123467890123467890"
++    )
+ ]
+ items = [
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    and some_var == "long strings"
+-    and {"key": "val"}
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        and some_var == "long strings"
++        and {"key": "val"}
++    )
+ ]
+ items = [
+-    "123456890123457890123468901234567890"
+-    and some_var == "long strings"
+-    and "123467890123467890"
++    (
++        "123456890123457890123468901234567890"
++        and some_var == "long strings"
++        and "123467890123467890"
++    )
+ ]
+ items = [
+-    long_variable_name
+-    and even_longer_variable_name
+-    and yet_another_very_long_variable_name
++    (
++        long_variable_name
++        and even_longer_variable_name
++        and yet_another_very_long_variable_name
++    )
+ ]
+ 
+ # Shouldn't remove trailing commas
+@@ -66,41 +76,55 @@
+ items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+ 
+ # Shouldn't crash with comments
+-items = [  # comment
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
++items = [
++    (  # comment
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )
+ ]
+ items = [
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
+-]  # comment
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )  # comment
++]
+ 
+ items = [  # comment
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )
+ ]
+ items = [
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )
+ ]  # comment
+ 
+ items = [
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+-    if some_var == "long strings"
+-    else {"key": "val"}
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
++        if some_var == "long strings"
++        else {"key": "val"}
++    )
+ ]
+ 
+-items = [  # comment  # comment
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
++items = [  # comment
++    (  # comment
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )
+ ]
+ items = [
+-    {"key1": "val1", "key2": "val2", "key3": "val3"}
+-    if some_var == "long strings"
+-    else {"key": "val"}
+-]  # comment  # comment
++    (
++        {"key1": "val1", "key2": "val2", "key3": "val3"}
++        if some_var == "long strings"
++        else {"key": "val"}
++    )  # comment
++]  # comment
+```
+
+## Ruff Output
+
+```python
+items = [(x for x in [1])]
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [({"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"})]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        if some_var == "long strings"
+        else "123467890123467890"
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    )
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    )
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    )
+]
+
+# Shouldn't remove trailing commas
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    ),
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    ),
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    ),
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    ),
+]
+
+# Shouldn't add parentheses
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Shouldn't crash with comments
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
+```
+
+## Black Output
+
+```python
+items = [(x for x in [1])]
+
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+items = [
+    "123456890123457890123468901234567890"
+    if some_var == "long strings"
+    else "123467890123467890"
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    and some_var == "long strings"
+    and {"key": "val"}
+]
+items = [
+    "123456890123457890123468901234567890"
+    and some_var == "long strings"
+    and "123467890123467890"
+]
+items = [
+    long_variable_name
+    and even_longer_variable_name
+    and yet_another_very_long_variable_name
+]
+
+# Shouldn't remove trailing commas
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    ),
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        and some_var == "long strings"
+        and {"key": "val"}
+    ),
+]
+items = [
+    (
+        "123456890123457890123468901234567890"
+        and some_var == "long strings"
+        and "123467890123467890"
+    ),
+]
+items = [
+    (
+        long_variable_name
+        and even_longer_variable_name
+        and yet_another_very_long_variable_name
+    ),
+]
+
+# Shouldn't add parentheses
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Shouldn't crash with comments
+items = [  # comment
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]  # comment
+
+items = [  # comment
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]  # comment
+
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+
+items = [  # comment  # comment
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]
+items = [
+    {"key1": "val1", "key2": "val2", "key3": "val3"}
+    if some_var == "long strings"
+    else {"key": "val"}
+]  # comment  # comment
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_wrap_comprehension_in.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_wrap_comprehension_in.py.snap
new file mode 100644
index 0000000000..94553912b7
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_wrap_comprehension_in.py.snap
@@ -0,0 +1,335 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_wrap_comprehension_in.py
+---
+## Input
+
+```python
+[a for graph_path_expression in refined_constraint.condition_as_predicate.variables]
+[
+    a
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression
+    in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+[
+    (foobar_very_long_key, foobar_very_long_value)
+    for foobar_very_long_key, foobar_very_long_value in foobar_very_long_dictionary.items()
+]
+
+# Don't split the `in` if it's not too long
+lcomp3 = [
+    element.split("\n", 1)[0]
+    for element in collection.select_elements()
+    # right
+    if element is not None
+]
+
+# Don't remove parens around ternaries
+expected = [i for i in (a if b else c)]
+
+# Nested arrays
+# First in will not be split because it would still be too long
+[[
+    x
+    for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+    for y in xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+]]
+
+# Multiple comprehensions, only split the second `in`
+graph_path_expressions_in_local_constraint_refinements = [
+    graph_path_expression
+    for refined_constraint in self._local_constraint_refinements.values()
+    if refined_constraint is not None
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+
+# Dictionary comprehensions
+dict_with_really_long_names = {
+    really_really_long_key_name: an_even_longer_really_really_long_key_value
+    for really_really_long_key_name, an_even_longer_really_really_long_key_value in really_really_really_long_dict_name.items()
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in dictionary_with_super_really_long_name
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name
+    in dictionary_with_super_really_long_name
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key in (
+        dictionary
+    )
+}
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,20 +1,14 @@
+ [
+     a
+-    for graph_path_expression in (
+-        refined_constraint.condition_as_predicate.variables
+-    )
++    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+ ]
+ [
+     a
+-    for graph_path_expression in (
+-        refined_constraint.condition_as_predicate.variables
+-    )
++    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+ ]
+ [
+     a
+-    for graph_path_expression in (
+-        refined_constraint.condition_as_predicate.variables
+-    )
++    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+ ]
+ [
+     a
+@@ -25,9 +19,7 @@
+ 
+ [
+     (foobar_very_long_key, foobar_very_long_value)
+-    for foobar_very_long_key, foobar_very_long_value in (
+-        foobar_very_long_dictionary.items()
+-    )
++    for foobar_very_long_key, foobar_very_long_value in foobar_very_long_dictionary.items()
+ ]
+ 
+ # Don't split the `in` if it's not too long
+@@ -47,9 +39,7 @@
+     [
+         x
+         for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+-        for y in (
+-            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+-        )
++        for y in xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+     ]
+ ]
+ 
+@@ -58,31 +48,23 @@
+     graph_path_expression
+     for refined_constraint in self._local_constraint_refinements.values()
+     if refined_constraint is not None
+-    for graph_path_expression in (
+-        refined_constraint.condition_as_predicate.variables
+-    )
++    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+ ]
+ 
+ # Dictionary comprehensions
+ dict_with_really_long_names = {
+     really_really_long_key_name: an_even_longer_really_really_long_key_value
+-    for really_really_long_key_name, an_even_longer_really_really_long_key_value in (
+-        really_really_really_long_dict_name.items()
+-    )
++    for really_really_long_key_name, an_even_longer_really_really_long_key_value in really_really_really_long_dict_name.items()
+ }
+ {
+     key_with_super_really_long_name: key_with_super_really_long_name
+-    for key_with_super_really_long_name in (
+-        dictionary_with_super_really_long_name
+-    )
++    for key_with_super_really_long_name in dictionary_with_super_really_long_name
+ }
+ {
+     key_with_super_really_long_name: key_with_super_really_long_name
+-    for key_with_super_really_long_name in (
+-        dictionary_with_super_really_long_name
+-    )
++    for key_with_super_really_long_name in dictionary_with_super_really_long_name
+ }
+ {
+     key_with_super_really_long_name: key_with_super_really_long_name
+-    for key in dictionary
++    for key in (dictionary)
+ }
+```
+
+## Ruff Output
+
+```python
+[
+    a
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+[
+    (foobar_very_long_key, foobar_very_long_value)
+    for foobar_very_long_key, foobar_very_long_value in foobar_very_long_dictionary.items()
+]
+
+# Don't split the `in` if it's not too long
+lcomp3 = [
+    element.split("\n", 1)[0]
+    for element in collection.select_elements()
+    # right
+    if element is not None
+]
+
+# Don't remove parens around ternaries
+expected = [i for i in (a if b else c)]
+
+# Nested arrays
+# First in will not be split because it would still be too long
+[
+    [
+        x
+        for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+        for y in xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    ]
+]
+
+# Multiple comprehensions, only split the second `in`
+graph_path_expressions_in_local_constraint_refinements = [
+    graph_path_expression
+    for refined_constraint in self._local_constraint_refinements.values()
+    if refined_constraint is not None
+    for graph_path_expression in refined_constraint.condition_as_predicate.variables
+]
+
+# Dictionary comprehensions
+dict_with_really_long_names = {
+    really_really_long_key_name: an_even_longer_really_really_long_key_value
+    for really_really_long_key_name, an_even_longer_really_really_long_key_value in really_really_really_long_dict_name.items()
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in dictionary_with_super_really_long_name
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in dictionary_with_super_really_long_name
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key in (dictionary)
+}
+```
+
+## Black Output
+
+```python
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+[
+    a
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+[
+    (foobar_very_long_key, foobar_very_long_value)
+    for foobar_very_long_key, foobar_very_long_value in (
+        foobar_very_long_dictionary.items()
+    )
+]
+
+# Don't split the `in` if it's not too long
+lcomp3 = [
+    element.split("\n", 1)[0]
+    for element in collection.select_elements()
+    # right
+    if element is not None
+]
+
+# Don't remove parens around ternaries
+expected = [i for i in (a if b else c)]
+
+# Nested arrays
+# First in will not be split because it would still be too long
+[
+    [
+        x
+        for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+        for y in (
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        )
+    ]
+]
+
+# Multiple comprehensions, only split the second `in`
+graph_path_expressions_in_local_constraint_refinements = [
+    graph_path_expression
+    for refined_constraint in self._local_constraint_refinements.values()
+    if refined_constraint is not None
+    for graph_path_expression in (
+        refined_constraint.condition_as_predicate.variables
+    )
+]
+
+# Dictionary comprehensions
+dict_with_really_long_names = {
+    really_really_long_key_name: an_even_longer_really_really_long_key_value
+    for really_really_long_key_name, an_even_longer_really_really_long_key_value in (
+        really_really_really_long_dict_name.items()
+    )
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in (
+        dictionary_with_super_really_long_name
+    )
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key_with_super_really_long_name in (
+        dictionary_with_super_really_long_name
+    )
+}
+{
+    key_with_super_really_long_name: key_with_super_really_long_name
+    for key in dictionary
+}
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__remove_lone_list_item_parens.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__remove_lone_list_item_parens.py.snap
new file mode 100644
index 0000000000..4b3a527f74
--- /dev/null
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__remove_lone_list_item_parens.py.snap
@@ -0,0 +1,283 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_lone_list_item_parens.py
+---
+## Input
+
+```python
+items = [(123)]
+items = [(True)]
+items = [(((((True)))))]
+items = [(((((True,)))))]
+items = [((((()))))]
+items = [(x for x in [1])]
+items = {(123)}
+items = {(True)}
+items = {(((((True)))))}
+
+# Requires `hug_parens_with_braces_and_square_brackets` unstable style to remove parentheses
+# around multiline values
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2"}
+        if some_var == ""
+        else {"key": "val"}
+    )
+]
+
+# Comments should not cause crashes
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,12 +1,12 @@
+-items = [123]
+-items = [True]
+-items = [True]
+-items = [(True,)]
+-items = [()]
++items = [(123)]
++items = [(True)]
++items = [(True)]
++items = [((True,))]
++items = [(())]
+ items = [(x for x in [1])]
+-items = {123}
+-items = {True}
+-items = {True}
++items = {(123)}
++items = {(True)}
++items = {(True)}
+ 
+ # Requires `hug_parens_with_braces_and_square_brackets` unstable style to remove parentheses
+ # around multiline values
+@@ -17,7 +17,7 @@
+         else {"key": "val"}
+     )
+ ]
+-items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
++items = [({"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"})]
+ 
+ # Comments should not cause crashes
+ items = [
+```
+
+## Ruff Output
+
+```python
+items = [(123)]
+items = [(True)]
+items = [(True)]
+items = [((True,))]
+items = [(())]
+items = [(x for x in [1])]
+items = {(123)}
+items = {(True)}
+items = {(True)}
+
+# Requires `hug_parens_with_braces_and_square_brackets` unstable style to remove parentheses
+# around multiline values
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [({"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"})]
+
+# Comments should not cause crashes
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
+```
+
+## Black Output
+
+```python
+items = [123]
+items = [True]
+items = [True]
+items = [(True,)]
+items = [()]
+items = [(x for x in [1])]
+items = {123}
+items = {True}
+items = {True}
+
+# Requires `hug_parens_with_braces_and_square_brackets` unstable style to remove parentheses
+# around multiline values
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [{"key1": "val1", "key2": "val2"} if some_var == "" else {"key": "val"}]
+
+# Comments should not cause crashes
+items = [
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]
+
+items = [  # comment
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]  # comment
+
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}  # comment
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+
+items = [  # comment
+    (  # comment
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )
+]
+items = [
+    (
+        {"key1": "val1", "key2": "val2", "key3": "val3"}
+        if some_var == "long strings"
+        else {"key": "val"}
+    )  # comment
+]  # comment
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__type_param_defaults.py.snap b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__type_param_defaults.py.snap
index 3910a7cf56..f4a4a2163a 100644
--- a/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__type_param_defaults.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__type_param_defaults.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.py
-snapshot_kind: text
 ---
 ## Input
 
@@ -25,6 +24,8 @@ def trailing_comma1[T=int,](a: str):
 
 def trailing_comma2[T=int](a: str,):
     pass
+
+def weird_syntax[T=lambda: 42, **P=lambda: 43, *Ts=lambda: 44](): pass
 ```
 
 ## Black Differences
@@ -32,7 +33,7 @@ def trailing_comma2[T=int](a: str,):
 ```diff
 --- Black
 +++ Ruff
-@@ -8,20 +8,20 @@
+@@ -8,9 +8,9 @@
  type D[
      *something_that_is_very_very_very_long = *something_that_is_very_very_very_long
  ] = float
@@ -44,35 +45,18 @@ def trailing_comma2[T=int](a: str,):
 +)
  
  
--def simple[
--    T = something_that_is_long
--](short1: int, short2: str, short3: bytes) -> float:
-+def simple[T = something_that_is_long](
-+    short1: int, short2: str, short3: bytes
-+) -> float:
+ def simple[T = something_that_is_long](
+@@ -27,9 +27,7 @@
+ 
+ def trailing_comma1[
+     T = int,
+-](
+-    a: str,
+-):
++](a: str):
      pass
  
  
--def longer[
--    something_that_is_long = something_that_is_long
--](something_that_is_long: something_that_is_long) -> something_that_is_long:
-+def longer[something_that_is_long = something_that_is_long](
-+    something_that_is_long: something_that_is_long,
-+) -> something_that_is_long:
-     pass
- 
- 
-@@ -31,7 +31,7 @@
-     pass
- 
- 
--def trailing_comma2[
--    T = int
--](a: str,):
-+def trailing_comma2[T = int](
-+    a: str,
-+):
-     pass
 ```
 
 ## Ruff Output
@@ -115,6 +99,10 @@ def trailing_comma2[T = int](
     a: str,
 ):
     pass
+
+
+def weird_syntax[T = lambda: 42, **P = lambda: 43, *Ts = lambda: 44]():
+    pass
 ```
 
 ## Black Output
@@ -135,26 +123,32 @@ type something_that_is_long[
 ] = something_that_is_long
 
 
-def simple[
-    T = something_that_is_long
-](short1: int, short2: str, short3: bytes) -> float:
+def simple[T = something_that_is_long](
+    short1: int, short2: str, short3: bytes
+) -> float:
     pass
 
 
-def longer[
-    something_that_is_long = something_that_is_long
-](something_that_is_long: something_that_is_long) -> something_that_is_long:
+def longer[something_that_is_long = something_that_is_long](
+    something_that_is_long: something_that_is_long,
+) -> something_that_is_long:
     pass
 
 
 def trailing_comma1[
     T = int,
-](a: str):
+](
+    a: str,
+):
     pass
 
 
-def trailing_comma2[
-    T = int
-](a: str,):
+def trailing_comma2[T = int](
+    a: str,
+):
+    pass
+
+
+def weird_syntax[T = lambda: 42, **P = lambda: 43, *Ts = lambda: 44]():
     pass
 ```
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@blank_line_before_class_docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@blank_line_before_class_docstring.py.snap
index 58cfb7e492..60177086ce 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@blank_line_before_class_docstring.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@blank_line_before_class_docstring.py.snap
@@ -56,7 +56,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Enabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring.py.snap
index 9ca83e81de..e3117a2e39 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@docstring.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@docstring.py.snap
@@ -175,7 +175,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -351,7 +351,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -527,7 +527,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -703,7 +703,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -879,7 +879,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples.py.snap
index 024d662e0a..26fcfcff6c 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples.py.snap
@@ -1368,7 +1368,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -2740,7 +2740,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -4112,7 +4112,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -5484,7 +5484,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -6856,7 +6856,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -8221,7 +8221,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -9586,7 +9586,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -10960,7 +10960,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -12325,7 +12325,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = 60
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -13699,7 +13699,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap
index 9b1dc4ba52..c40ab98413 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap
@@ -27,7 +27,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_dynamic_line_width.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_dynamic_line_width.py.snap
index 7112865500..628910f153 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_dynamic_line_width.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_dynamic_line_width.py.snap
@@ -308,7 +308,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -879,7 +879,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -1425,7 +1425,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -1996,7 +1996,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring_tab_indentation.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring_tab_indentation.py.snap
index a7e5f5d84f..c6736bcfa9 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@docstring_tab_indentation.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@docstring_tab_indentation.py.snap
@@ -90,7 +90,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -184,7 +184,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__bytes.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__bytes.py.snap
index 0e9e65cf92..7b021391c9 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@expression__bytes.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@expression__bytes.py.snap
@@ -140,7 +140,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -296,7 +296,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring.py.snap
index c929f160df..4460667feb 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring.py.snap
@@ -754,6 +754,10 @@ print(f"{  # Tuple with multiple elements that doesn't fit on a single line gets
 
 # Regression tests for https://github.com/astral-sh/ruff/issues/15536
 print(f"{ {}, 1, }")
+
+
+# The inner quotes should not be changed to double quotes before Python 3.12
+f"{f'''{'nested'} inner'''} outer"
 ```
 
 ## Outputs
@@ -768,7 +772,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Enabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -1532,7 +1536,7 @@ f'{f"""other " """}'
 f'{1: hy "user"}'
 f'{1:hy "user"}'
 f'{1: abcd "{1}" }'
-f'{1: abcd "{"aa"}" }'
+f'{1: abcd "{'aa'}" }'
 f'{1=: "abcd {'aa'}}'
 f"{x:a{z:hy \"user\"}} '''"
 
@@ -1581,6 +1585,10 @@ print(
 
 # Regression tests for https://github.com/astral-sh/ruff/issues/15536
 print(f"{ {}, 1 }")
+
+
+# The inner quotes should not be changed to double quotes before Python 3.12
+f"{f'''{'nested'} inner'''} outer"
 ```
 
 
@@ -1595,7 +1603,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -2359,7 +2367,7 @@ f'{f"""other " """}'
 f'{1: hy "user"}'
 f'{1:hy "user"}'
 f'{1: abcd "{1}" }'
-f'{1: abcd "{"aa"}" }'
+f'{1: abcd "{'aa'}" }'
 f'{1=: "abcd {'aa'}}'
 f"{x:a{z:hy \"user\"}} '''"
 
@@ -2408,4 +2416,21 @@ print(
 
 # Regression tests for https://github.com/astral-sh/ruff/issues/15536
 print(f"{ {}, 1 }")
+
+
+# The inner quotes should not be changed to double quotes before Python 3.12
+f"{f'''{'nested'} inner'''} outer"
 ```
+
+
+### Unsupported Syntax Errors
+error[invalid-syntax]: Cannot reuse outer quote character in f-strings on Python 3.10 (syntax was added in Python 3.12)
+   --> fstring.py:178:8
+    |
+176 | # Here, the formatter will remove the escapes which is correct because they aren't allowed
+177 | # pre 3.12. This means we can assume that the f-string is used in the context of 3.12.
+178 | f"foo {"'bar'"}"
+    |        ^
+179 | f"foo {'"bar"'}"
+    |
+warning: Only accept new syntax errors if they are also present in the input. The formatter should not introduce syntax errors.
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring_preview.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring_preview.py.snap
index 508eda3e94..052758abce 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring_preview.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@expression__fstring_preview.py.snap
@@ -38,7 +38,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Enabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__join_implicit_concatenated_string_preserve.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__join_implicit_concatenated_string_preserve.py.snap
index a9d9f10827..526d24e02a 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@expression__join_implicit_concatenated_string_preserve.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@expression__join_implicit_concatenated_string_preserve.py.snap
@@ -40,7 +40,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__string.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__string.py.snap
index 953b2c34cb..0da0050e34 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@expression__string.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@expression__string.py.snap
@@ -232,7 +232,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -482,7 +482,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__fmt_off_docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__fmt_off_docstring.py.snap
index c7775aba83..db1d53e68b 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__fmt_off_docstring.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__fmt_off_docstring.py.snap
@@ -37,7 +37,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -75,7 +75,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__indent.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__indent.py.snap
index 8fd14d6634..3a68d9ceae 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__indent.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__indent.py.snap
@@ -18,7 +18,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -37,7 +37,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -56,7 +56,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__mixed_space_and_tab.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__mixed_space_and_tab.py.snap
index 99bde1d1d6..1c52065c5a 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__mixed_space_and_tab.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__mixed_space_and_tab.py.snap
@@ -33,7 +33,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -68,7 +68,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -103,7 +103,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@notebook_docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@notebook_docstring.py.snap
index 6018c9fc26..6195b43c21 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@notebook_docstring.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@notebook_docstring.py.snap
@@ -24,7 +24,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Ipynb
 ```
 
@@ -48,7 +48,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@preview.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@preview.py.snap
index 3557b8c478..f268f65783 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@preview.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@preview.py.snap
@@ -84,7 +84,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -167,7 +167,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Enabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@quote_style.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@quote_style.py.snap
index b79b0ead6e..a430dc1bb7 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@quote_style.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@quote_style.py.snap
@@ -68,7 +68,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -142,7 +142,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -216,7 +216,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__docstring_code_examples.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__docstring_code_examples.py.snap
index 0cb72a9fb4..cad5ee4f2a 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__docstring_code_examples.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__docstring_code_examples.py.snap
@@ -121,7 +121,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -273,7 +273,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Enabled
 docstring-code-line-width  = 88
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__indent.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__indent.py.snap
index 669f8f5eb5..1609cf657e 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__indent.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__indent.py.snap
@@ -81,7 +81,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -160,7 +160,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -239,7 +239,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__stub.pyi.snap b/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__stub.pyi.snap
index d2ec8f05d8..5610ef79ee 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__stub.pyi.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@range_formatting__stub.pyi.snap
@@ -34,7 +34,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Stub
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@skip_magic_trailing_comma.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@skip_magic_trailing_comma.py.snap
index 12521c9433..e427d077c7 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@skip_magic_trailing_comma.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@skip_magic_trailing_comma.py.snap
@@ -51,7 +51,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -109,7 +109,7 @@ magic-trailing-comma       = Ignore
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@statement__try.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@statement__try.py.snap
index fc6fcf4406..0dd13e8948 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@statement__try.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@statement__try.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/try.py
-snapshot_kind: text
 ---
 ## Input
 ```python
@@ -173,9 +172,61 @@ else:
 
 finally:
     pass
+
+
+try:
+    pass
+# These parens can be removed on 3.14+ but not earlier
+except (BaseException, Exception, ValueError):
+    pass
+# But black won't remove these parentheses
+except (ZeroDivisionError,):
+    pass
+except (  # We wrap these and preserve the parens
+        BaseException, Exception, ValueError):
+    pass
+except (
+        BaseException,
+        # Same with this comment
+        Exception,
+        ValueError
+):
+    pass
+
+try:
+    pass
+# They can also be omitted for `except*`
+except* (BaseException, Exception, ValueError):
+    pass
+
+# But parentheses are still required in the presence of an `as` binding
+try:
+    pass
+except (BaseException, Exception, ValueError) as e:
+    pass
+
+try:
+    pass
+except* (BaseException, Exception, ValueError) as e:
+    pass
+```
+
+## Outputs
+### Output 1
+```
+indent-style               = space
+line-width                 = 88
+indent-width               = 4
+quote-style                = Double
+line-ending                = LineFeed
+magic-trailing-comma       = Respect
+docstring-code             = Disabled
+docstring-code-line-width  = "dynamic"
+preview                    = Disabled
+target_version             = 3.13
+source_type                = Python
 ```
 
-## Output
 ```python
 try:
     pass
@@ -364,10 +415,50 @@ else:
 
 finally:
     pass
+
+
+try:
+    pass
+# These parens can be removed on 3.14+ but not earlier
+except (BaseException, Exception, ValueError):
+    pass
+# But black won't remove these parentheses
+except (ZeroDivisionError,):
+    pass
+except (  # We wrap these and preserve the parens
+    BaseException,
+    Exception,
+    ValueError,
+):
+    pass
+except (
+    BaseException,
+    # Same with this comment
+    Exception,
+    ValueError,
+):
+    pass
+
+try:
+    pass
+# They can also be omitted for `except*`
+except* (BaseException, Exception, ValueError):
+    pass
+
+# But parentheses are still required in the presence of an `as` binding
+try:
+    pass
+except (BaseException, Exception, ValueError) as e:
+    pass
+
+try:
+    pass
+except* (BaseException, Exception, ValueError) as e:
+    pass
 ```
 
 
-## Preview changes
+#### Preview changes
 ```diff
 --- Stable
 +++ Preview
@@ -392,3 +483,294 @@ finally:
  
      def f():
 ```
+
+
+### Output 2
+```
+indent-style               = space
+line-width                 = 88
+indent-width               = 4
+quote-style                = Double
+line-ending                = LineFeed
+magic-trailing-comma       = Respect
+docstring-code             = Disabled
+docstring-code-line-width  = "dynamic"
+preview                    = Disabled
+target_version             = 3.14
+source_type                = Python
+```
+
+```python
+try:
+    pass
+except:
+    pass
+
+try:
+    pass
+except KeyError:  # should remove brackets and be a single line
+    pass
+
+
+try:  # try
+    pass
+    # end of body
+# before except
+except (Exception, ValueError) as exc:  # except line
+    pass
+# before except 2
+except KeyError as key:  # except line 2
+    pass
+    # in body 2
+# before else
+else:
+    pass
+# before finally
+finally:
+    pass
+
+
+# with line breaks
+try:  # try
+    pass
+    # end of body
+
+# before except
+except (Exception, ValueError) as exc:  # except line
+    pass
+
+# before except 2
+except KeyError as key:  # except line 2
+    pass
+    # in body 2
+
+# before else
+else:
+    pass
+
+# before finally
+finally:
+    pass
+
+
+# with line breaks
+try:
+    pass
+
+except:
+    pass
+
+
+try:
+    pass
+except (
+    Exception,
+    Exception,
+    Exception,
+    Exception,
+    Exception,
+    Exception,
+    Exception,
+) as exc:  # splits exception over multiple lines
+    pass
+
+
+try:
+    pass
+except:
+    a = 10  # trailing comment1
+    b = 11  # trailing comment2
+
+
+# try/except*, mostly the same as try
+try:  # try
+    pass
+    # end of body
+# before except
+except* (Exception, ValueError) as exc:  # except line
+    pass
+# before except 2
+except* KeyError as key:  # except line 2
+    pass
+    # in body 2
+# before else
+else:
+    pass
+# before finally
+finally:
+    pass
+
+# try and try star are statements with body
+# Minimized from https://github.com/python/cpython/blob/99b00efd5edfd5b26bf9e2a35cbfc96277fdcbb1/Lib/getpass.py#L68-L91
+try:
+    try:
+        pass
+    finally:
+        print(1)  # issue7208
+except A:
+    pass
+
+try:
+    f()  # end-of-line last comment
+except RuntimeError:
+    raise
+
+try:
+
+    def f():
+        pass
+        # a
+except:
+
+    def f():
+        pass
+        # b
+else:
+
+    def f():
+        pass
+        # c
+finally:
+
+    def f():
+        pass
+        # d
+
+
+try:
+    pass  # a
+except ZeroDivisionError:
+    pass  # b
+except:
+    pass  # c
+else:
+    pass  # d
+finally:
+    pass  # e
+
+try:  # 1 preceding: any, following: first in body, enclosing: try
+    print(1)  # 2 preceding: last in body, following: fist in alt body, enclosing: try
+except (
+    ZeroDivisionError
+):  # 3 preceding: test, following: fist in alt body, enclosing: try
+    print(2)  # 4 preceding: last in body, following: fist in alt body, enclosing: exc
+except:  # 5 preceding: last in body, following: fist in alt body, enclosing: try
+    print(2)  # 6 preceding: last in body, following: fist in alt body, enclosing: exc
+else:  # 7 preceding: last in body, following: fist in alt body, enclosing: exc
+    print(3)  # 8 preceding: last in body, following: fist in alt body, enclosing: try
+finally:  # 9 preceding: last in body, following: fist in alt body, enclosing: try
+    print(3)  # 10 preceding: last in body, following: any, enclosing: try
+
+try:
+    pass
+except (
+    ZeroDivisionError
+    # comment
+):
+    pass
+
+
+try:
+    pass
+
+finally:
+    pass
+
+
+try:
+    pass
+
+except ZeroDivisonError:
+    pass
+
+else:
+    pass
+
+finally:
+    pass
+
+
+try:
+    pass
+# These parens can be removed on 3.14+ but not earlier
+except (BaseException, Exception, ValueError):
+    pass
+# But black won't remove these parentheses
+except (ZeroDivisionError,):
+    pass
+except (  # We wrap these and preserve the parens
+    BaseException,
+    Exception,
+    ValueError,
+):
+    pass
+except (
+    BaseException,
+    # Same with this comment
+    Exception,
+    ValueError,
+):
+    pass
+
+try:
+    pass
+# They can also be omitted for `except*`
+except* (BaseException, Exception, ValueError):
+    pass
+
+# But parentheses are still required in the presence of an `as` binding
+try:
+    pass
+except (BaseException, Exception, ValueError) as e:
+    pass
+
+try:
+    pass
+except* (BaseException, Exception, ValueError) as e:
+    pass
+```
+
+
+#### Preview changes
+```diff
+--- Stable
++++ Preview
+@@ -117,16 +117,19 @@
+     def f():
+         pass
+         # a
++
+ except:
+ 
+     def f():
+         pass
+         # b
++
+ else:
+ 
+     def f():
+         pass
+         # c
++
+ finally:
+ 
+     def f():
+@@ -190,7 +193,7 @@
+ try:
+     pass
+ # These parens can be removed on 3.14+ but not earlier
+-except (BaseException, Exception, ValueError):
++except BaseException, Exception, ValueError:
+     pass
+ # But black won't remove these parentheses
+ except (ZeroDivisionError,):
+@@ -212,7 +215,7 @@
+ try:
+     pass
+ # They can also be omitted for `except*`
+-except* (BaseException, Exception, ValueError):
++except* BaseException, Exception, ValueError:
+     pass
+ 
+ # But parentheses are still required in the presence of an `as` binding
+```
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class.pyi.snap b/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class.pyi.snap
index 1d7b8c7636..a1efd92a9c 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class.pyi.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class.pyi.snap
@@ -201,7 +201,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Enabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Stub
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class_eof.pyi.snap b/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class_eof.pyi.snap
index 55485257f3..9e9dc166fb 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class_eof.pyi.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@stub_files__blank_line_after_nested_stub_class_eof.pyi.snap
@@ -35,7 +35,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Enabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Stub
 ```
 
diff --git a/crates/ruff_python_formatter/tests/snapshots/format@tab_width.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@tab_width.py.snap
index ab1caa6805..51b77d3f16 100644
--- a/crates/ruff_python_formatter/tests/snapshots/format@tab_width.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@tab_width.py.snap
@@ -26,7 +26,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -53,7 +53,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
@@ -83,7 +83,7 @@ magic-trailing-comma       = Respect
 docstring-code             = Disabled
 docstring-code-line-width  = "dynamic"
 preview                    = Disabled
-target_version             = 3.9
+target_version             = 3.10
 source_type                = Python
 ```
 
diff --git a/crates/ruff_python_importer/Cargo.toml b/crates/ruff_python_importer/Cargo.toml
new file mode 100644
index 0000000000..96070a2400
--- /dev/null
+++ b/crates/ruff_python_importer/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "ruff_python_importer"
+version = "0.0.0"
+publish = false
+authors = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }
+homepage = { workspace = true }
+documentation = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+
+[dependencies]
+ruff_diagnostics = { workspace = true }
+ruff_python_ast = { workspace = true }
+ruff_python_codegen = { workspace = true }
+ruff_python_parser = { workspace = true }
+ruff_python_trivia = { workspace = true }
+ruff_source_file = { workspace = true, features = ["serde"] }
+ruff_text_size = { workspace = true }
+
+anyhow = { workspace = true }
+
+[dev-dependencies]
+insta = { workspace = true }
+
+[features]
+
+[lints]
+workspace = true
diff --git a/crates/ruff_linter/src/importer/insertion.rs b/crates/ruff_python_importer/src/insertion.rs
similarity index 59%
rename from crates/ruff_linter/src/importer/insertion.rs
rename to crates/ruff_python_importer/src/insertion.rs
index 69c9afbe6c..d9a0db538e 100644
--- a/crates/ruff_linter/src/importer/insertion.rs
+++ b/crates/ruff_python_importer/src/insertion.rs
@@ -1,6 +1,8 @@
 //! Insert statements into Python code.
+
 use std::ops::Add;
 
+use ruff_diagnostics::Edit;
 use ruff_python_ast::Stmt;
 use ruff_python_ast::helpers::is_docstring_stmt;
 use ruff_python_codegen::Stylist;
@@ -10,9 +12,6 @@ use ruff_python_trivia::{PythonWhitespace, textwrap::indent};
 use ruff_source_file::{LineRanges, UniversalNewlineIterator};
 use ruff_text_size::{Ranged, TextSize};
 
-use crate::Edit;
-use crate::Locator;
-
 #[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
@@ -25,7 +24,7 @@ pub(super) enum Placement<'a> {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub(super) struct Insertion<'a> {
+pub struct Insertion<'a> {
     /// The content to add before the insertion.
     prefix: &'a str,
     /// The location at which to insert.
@@ -50,33 +49,31 @@ impl<'a> Insertion<'a> {
     ///
     /// 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> {
+    pub fn start_of_file(body: &[Stmt], contents: &str, stylist: &Stylist) -> Insertion<'static> {
         // Skip over any docstrings.
         let mut location = if let Some(mut 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_semicolon(locator.after(location)) {
+            if let Some(offset) = match_semicolon(&contents[location.to_usize()..]) {
                 return Insertion::inline(" ", location.add(offset).add(TextSize::of(';')), ";");
             }
 
             // While the first token after the docstring is a continuation character (i.e. "\"), advance
             // additional rows to prevent inserting in the same logical line.
-            while match_continuation(locator.after(location)).is_some() {
-                location = locator.full_line_end(location);
+            while match_continuation(&contents[location.to_usize()..]).is_some() {
+                location = contents.full_line_end(location);
             }
 
             // Otherwise, advance to the next row.
-            locator.full_line_end(location)
+            contents.full_line_end(location)
         } else {
-            locator.bom_start_offset()
+            contents.bom_start_offset()
         };
 
         // Skip over commented lines, with whitespace separation.
-        for line in UniversalNewlineIterator::with_offset(locator.after(location), location) {
+        for line in
+            UniversalNewlineIterator::with_offset(&contents[location.to_usize()..], location)
+        {
             let trimmed_line = line.trim_whitespace_start();
             if trimmed_line.is_empty() {
                 continue;
@@ -111,17 +108,13 @@ impl<'a> Insertion<'a> {
     /// 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> {
+    pub fn end_of_statement(stmt: &Stmt, contents: &str, stylist: &Stylist) -> Insertion<'static> {
         let location = stmt.end();
-        if let Some(offset) = match_semicolon(locator.after(location)) {
+        if let Some(offset) = match_semicolon(&contents[location.to_usize()..]) {
             // 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 if match_continuation(locator.after(location)).is_some() {
+        } else if match_continuation(&contents[location.to_usize()..]).is_some() {
             // If the first token after the statement is a continuation, insert after the statement
             // with a semicolon.
             Insertion::inline("; ", location, "")
@@ -129,12 +122,63 @@ impl<'a> Insertion<'a> {
             // Otherwise, insert on the next line.
             Insertion::own_line(
                 "",
-                locator.full_line_end(location),
+                contents.full_line_end(location),
                 stylist.line_ending().as_str(),
             )
         }
     }
 
+    /// Create an [`Insertion`] to insert an additional member to import
+    /// into a `from <module> import member1, member2, ...` statement.
+    ///
+    /// For example, given the following code:
+    ///
+    /// ```python
+    /// """Hello, world!"""
+    ///
+    /// from collections import Counter
+    ///
+    ///
+    /// def foo():
+    ///     pass
+    /// ```
+    ///
+    /// The insertion returned will begin after `Counter` but before the
+    /// newline terminator. Callers can then call [`Insertion::into_edit`]
+    /// with the additional member to add. A comma delimiter is handled
+    /// automatically.
+    ///
+    /// The statement itself is assumed to be at the top-level of the module.
+    ///
+    /// This returns `None` when `stmt` isn't a `from ... import ...`
+    /// statement.
+    pub fn existing_import(stmt: &Stmt, tokens: &Tokens) -> Option<Insertion<'static>> {
+        let Stmt::ImportFrom(ref import_from) = *stmt else {
+            return None;
+        };
+        if let Some(at) = import_from.names.last().map(Ranged::end) {
+            return Some(Insertion::inline(", ", at, ""));
+        }
+        // Our AST can deal with partial `from ... import`
+        // statements, so we might not have any members
+        // yet. In this case, we don't need the comma.
+        //
+        // ... however, unless we can be certain that
+        // inserting this name leads to a valid AST, we
+        // give up.
+        let at = import_from.end();
+        if !matches!(
+            tokens
+                .before(at)
+                .last()
+                .map(ruff_python_parser::Token::kind),
+            Some(TokenKind::Import)
+        ) {
+            return None;
+        }
+        Some(Insertion::inline(" ", at, ""))
+    }
+
     /// 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.
     ///
@@ -149,9 +193,9 @@ impl<'a> Insertion<'a> {
     /// include a trailing newline.
     ///
     /// The block itself is assumed to be at the top-level of the module.
-    pub(super) fn start_of_block(
+    pub fn start_of_block(
         mut location: TextSize,
-        locator: &Locator<'a>,
+        contents: &'a str,
         stylist: &Stylist,
         tokens: &Tokens,
     ) -> Insertion<'a> {
@@ -204,7 +248,7 @@ impl<'a> Insertion<'a> {
                             "",
                             token.start(),
                             stylist.line_ending().as_str(),
-                            locator.slice(token),
+                            &contents[token.range()],
                         );
                     }
                     _ => {
@@ -220,7 +264,7 @@ impl<'a> Insertion<'a> {
     }
 
     /// Convert this [`Insertion`] into an [`Edit`] that inserts the given content.
-    pub(super) fn into_edit(self, content: &str) -> Edit {
+    pub fn into_edit(self, content: &str) -> Edit {
         let Insertion {
             prefix,
             location,
@@ -240,7 +284,7 @@ impl<'a> Insertion<'a> {
     }
 
     /// Returns `true` if this [`Insertion`] is inline.
-    pub(super) fn is_inline(&self) -> bool {
+    pub fn is_inline(&self) -> bool {
         matches!(self.placement, Placement::Inline)
     }
 
@@ -321,9 +365,7 @@ mod tests {
     use ruff_python_codegen::Stylist;
     use ruff_python_parser::parse_module;
     use ruff_source_file::LineEnding;
-    use ruff_text_size::TextSize;
-
-    use crate::Locator;
+    use ruff_text_size::{Ranged, TextSize};
 
     use super::Insertion;
 
@@ -331,9 +373,8 @@ mod tests {
     fn start_of_file() -> Result<()> {
         fn insert(contents: &str) -> Result<Insertion<'_>> {
             let parsed = parse_module(contents)?;
-            let locator = Locator::new(contents);
-            let stylist = Stylist::from_tokens(parsed.tokens(), locator.contents());
-            Ok(Insertion::start_of_file(parsed.suite(), &locator, &stylist))
+            let stylist = Stylist::from_tokens(parsed.tokens(), contents);
+            Ok(Insertion::start_of_file(parsed.suite(), contents, &stylist))
         }
 
         let contents = "";
@@ -463,9 +504,8 @@ x = 1
     fn start_of_block() {
         fn insert(contents: &str, offset: TextSize) -> Insertion<'_> {
             let parsed = parse_module(contents).unwrap();
-            let locator = Locator::new(contents);
-            let stylist = Stylist::from_tokens(parsed.tokens(), locator.contents());
-            Insertion::start_of_block(offset, &locator, &stylist, parsed.tokens())
+            let stylist = Stylist::from_tokens(parsed.tokens(), contents);
+            Insertion::start_of_block(offset, contents, &stylist, parsed.tokens())
         }
 
         let contents = "if True: pass";
@@ -484,4 +524,286 @@ if True:
             Insertion::indented("", TextSize::from(9), "\n", "    ")
         );
     }
+
+    #[test]
+    fn existing_import_works() {
+        fn snapshot(content: &str, member: &str) -> String {
+            let parsed = parse_module(content).unwrap();
+            let edit = Insertion::existing_import(parsed.suite().first().unwrap(), parsed.tokens())
+                .unwrap()
+                .into_edit(member);
+            let insert_text = edit.content().expect("edit should be non-empty");
+
+            let mut content = content.to_string();
+            content.replace_range(edit.range().to_std_range(), insert_text);
+            content
+        }
+
+        let source = r#"
+from collections import Counter
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import Counter, defaultdict
+        ",
+        );
+
+        let source = r#"
+from collections import Counter, OrderedDict
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import Counter, OrderedDict, defaultdict
+        ",
+        );
+
+        let source = r#"
+from collections import (Counter)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @"from collections import (Counter, defaultdict)",
+        );
+
+        let source = r#"
+from collections import (Counter, OrderedDict)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @"from collections import (Counter, OrderedDict, defaultdict)",
+        );
+
+        let source = r#"
+from collections import (Counter,)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @"from collections import (Counter, defaultdict,)",
+        );
+
+        let source = r#"
+from collections import (Counter, OrderedDict,)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @"from collections import (Counter, OrderedDict, defaultdict,)",
+        );
+
+        let source = r#"
+from collections import (
+  Counter
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter, defaultdict
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  Counter,
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter, defaultdict,
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  Counter,
+  OrderedDict
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter,
+          OrderedDict, defaultdict
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  Counter,
+  OrderedDict,
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter,
+          OrderedDict, defaultdict,
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import \
+  Counter
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import \
+          Counter, defaultdict
+        ",
+        );
+
+        let source = r#"
+from collections import \
+  Counter, OrderedDict
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import \
+          Counter, OrderedDict, defaultdict
+        ",
+        );
+
+        let source = r#"
+from collections import \
+  Counter, \
+  OrderedDict
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import \
+          Counter, \
+          OrderedDict, defaultdict
+        ",
+        );
+
+        /*
+        from collections import (
+            Collector # comment
+        )
+
+        from collections import (
+            Collector, # comment
+        )
+
+        from collections import (
+            Collector # comment
+            ,
+        )
+
+        from collections import (
+            Collector
+            # comment
+            ,
+        )
+                 */
+
+        let source = r#"
+from collections import (
+  Counter # comment
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter, defaultdict # comment
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  Counter, # comment
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter, defaultdict, # comment
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  Counter # comment
+  ,
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter, defaultdict # comment
+          ,
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  Counter
+  # comment
+  ,
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          Counter, defaultdict
+          # comment
+          ,
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import (
+  # comment 1
+  Counter # comment 2
+  # comment 3
+)
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @r"
+        from collections import (
+          # comment 1
+          Counter, defaultdict # comment 2
+          # comment 3
+        )
+        ",
+        );
+
+        let source = r#"
+from collections import Counter # comment
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @"from collections import Counter, defaultdict # comment",
+        );
+
+        let source = r#"
+from collections import Counter, OrderedDict # comment
+"#;
+        insta::assert_snapshot!(
+            snapshot(source, "defaultdict"),
+            @"from collections import Counter, OrderedDict, defaultdict # comment",
+        );
+    }
 }
diff --git a/crates/ruff_python_importer/src/lib.rs b/crates/ruff_python_importer/src/lib.rs
new file mode 100644
index 0000000000..557d9f5013
--- /dev/null
+++ b/crates/ruff_python_importer/src/lib.rs
@@ -0,0 +1,7 @@
+/*!
+Low-level helpers for manipulating Python import statements.
+*/
+
+pub use self::insertion::Insertion;
+
+mod insertion;
diff --git a/crates/ruff_python_index/src/indexer.rs b/crates/ruff_python_index/src/indexer.rs
index 82f913f484..04c44a7c4b 100644
--- a/crates/ruff_python_index/src/indexer.rs
+++ b/crates/ruff_python_index/src/indexer.rs
@@ -9,15 +9,17 @@ use ruff_python_trivia::{
 use ruff_source_file::LineRanges;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
-use crate::fstring_ranges::{FStringRanges, FStringRangesBuilder};
+use crate::interpolated_string_ranges::{
+    InterpolatedStringRanges, InterpolatedStringRangesBuilder,
+};
 use crate::multiline_ranges::{MultilineRanges, MultilineRangesBuilder};
 
 pub struct Indexer {
     /// Stores the start offset of continuation lines.
     continuation_lines: Vec<TextSize>,
 
-    /// The range of all f-string in the source document.
-    fstring_ranges: FStringRanges,
+    /// The range of all interpolated strings in the source document.
+    interpolated_string_ranges: InterpolatedStringRanges,
 
     /// The range of all multiline strings in the source document.
     multiline_ranges: MultilineRanges,
@@ -30,7 +32,7 @@ impl Indexer {
     pub fn from_tokens(tokens: &Tokens, source: &str) -> Self {
         assert!(TextSize::try_from(source.len()).is_ok());
 
-        let mut fstring_ranges_builder = FStringRangesBuilder::default();
+        let mut interpolated_string_ranges_builder = InterpolatedStringRangesBuilder::default();
         let mut multiline_ranges_builder = MultilineRangesBuilder::default();
         let mut continuation_lines = Vec::new();
         let mut comment_ranges = Vec::new();
@@ -59,7 +61,7 @@ impl Indexer {
                 }
             }
 
-            fstring_ranges_builder.visit_token(token);
+            interpolated_string_ranges_builder.visit_token(token);
             multiline_ranges_builder.visit_token(token);
 
             match token.kind() {
@@ -82,7 +84,7 @@ impl Indexer {
 
         Self {
             continuation_lines,
-            fstring_ranges: fstring_ranges_builder.finish(),
+            interpolated_string_ranges: interpolated_string_ranges_builder.finish(),
             multiline_ranges: multiline_ranges_builder.finish(),
             comment_ranges: CommentRanges::new(comment_ranges),
         }
@@ -93,9 +95,9 @@ impl Indexer {
         &self.comment_ranges
     }
 
-    /// Returns the byte offset ranges of f-strings.
-    pub const fn fstring_ranges(&self) -> &FStringRanges {
-        &self.fstring_ranges
+    /// Returns the byte offset ranges of interpolated strings.
+    pub const fn interpolated_string_ranges(&self) -> &InterpolatedStringRanges {
+        &self.interpolated_string_ranges
     }
 
     /// Returns the byte offset ranges of multiline strings.
@@ -356,7 +358,7 @@ f"implicit " f"concatenation"
         .trim();
         assert_eq!(
             new_indexer(contents)
-                .fstring_ranges()
+                .interpolated_string_ranges()
                 .values()
                 .copied()
                 .collect::<Vec<_>>(),
@@ -390,7 +392,7 @@ f-string"""}
         .trim();
         assert_eq!(
             new_indexer(contents)
-                .fstring_ranges()
+                .interpolated_string_ranges()
                 .values()
                 .copied()
                 .collect::<Vec<_>>(),
@@ -504,11 +506,17 @@ the end"""
             ),
         ] {
             assert_eq!(
-                indexer.fstring_ranges().innermost(offset).unwrap(),
+                indexer
+                    .interpolated_string_ranges()
+                    .innermost(offset)
+                    .unwrap(),
                 innermost_range
             );
             assert_eq!(
-                indexer.fstring_ranges().outermost(offset).unwrap(),
+                indexer
+                    .interpolated_string_ranges()
+                    .outermost(offset)
+                    .unwrap(),
                 outermost_range
             );
         }
diff --git a/crates/ruff_python_index/src/fstring_ranges.rs b/crates/ruff_python_index/src/interpolated_string_ranges.rs
similarity index 70%
rename from crates/ruff_python_index/src/fstring_ranges.rs
rename to crates/ruff_python_index/src/interpolated_string_ranges.rs
index 089050334e..45dc7c2765 100644
--- a/crates/ruff_python_index/src/fstring_ranges.rs
+++ b/crates/ruff_python_index/src/interpolated_string_ranges.rs
@@ -3,17 +3,17 @@ use std::collections::BTreeMap;
 use ruff_python_parser::{Token, TokenKind};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
-/// Stores the ranges of all f-strings in a file sorted by [`TextRange::start`].
-/// There can be multiple overlapping ranges for nested f-strings.
+/// Stores the ranges of all interpolated strings in a file sorted by [`TextRange::start`].
+/// There can be multiple overlapping ranges for nested interpolated strings.
 ///
-/// Note that the ranges for all unterminated f-strings are not stored.
+/// Note that the ranges for all unterminated interpolated strings are not stored.
 #[derive(Debug)]
-pub struct FStringRanges {
-    // Mapping from the f-string start location to its range.
+pub struct InterpolatedStringRanges {
+    // Mapping from the interpolated string start location to its range.
     raw: BTreeMap<TextSize, TextRange>,
 }
 
-impl FStringRanges {
+impl InterpolatedStringRanges {
     /// Returns `true` if the given range intersects with any f-string range.
     pub fn intersects(&self, target: TextRange) -> bool {
         self.raw
@@ -61,17 +61,17 @@ impl FStringRanges {
             .map(|(_, range)| *range)
     }
 
-    /// Returns an iterator over all f-string [`TextRange`] sorted by their
+    /// Returns an iterator over all interpolated string [`TextRange`] sorted by their
     /// start location.
     ///
-    /// For nested f-strings, the outermost f-string is yielded first, moving
+    /// For nested interpolated strings, the outermost interpolated string is yielded first, moving
     /// inwards with each iteration.
     #[inline]
     pub fn values(&self) -> impl Iterator<Item = &TextRange> + '_ {
         self.raw.values()
     }
 
-    /// Returns the number of f-string ranges stored.
+    /// Returns the number of interpolated string ranges stored.
     #[inline]
     pub fn len(&self) -> usize {
         self.raw.len()
@@ -79,18 +79,21 @@ impl FStringRanges {
 }
 
 #[derive(Default)]
-pub(crate) struct FStringRangesBuilder {
+pub(crate) struct InterpolatedStringRangesBuilder {
     start_locations: Vec<TextSize>,
     raw: BTreeMap<TextSize, TextRange>,
 }
 
-impl FStringRangesBuilder {
+impl InterpolatedStringRangesBuilder {
     pub(crate) fn visit_token(&mut self, token: &Token) {
+        // While the logic of this visitor makes it seem possible to pair, say,
+        // an `FStringStart` with a `TStringEnd`, it is not actually possible to
+        // encounter this in tokenized code free from lexical errors.
         match token.kind() {
-            TokenKind::FStringStart => {
+            TokenKind::FStringStart | TokenKind::TStringStart => {
                 self.start_locations.push(token.start());
             }
-            TokenKind::FStringEnd => {
+            TokenKind::FStringEnd | TokenKind::TStringEnd => {
                 if let Some(start) = self.start_locations.pop() {
                     self.raw.insert(start, TextRange::new(start, token.end()));
                 }
@@ -99,7 +102,7 @@ impl FStringRangesBuilder {
         }
     }
 
-    pub(crate) fn finish(self) -> FStringRanges {
-        FStringRanges { raw: self.raw }
+    pub(crate) fn finish(self) -> InterpolatedStringRanges {
+        InterpolatedStringRanges { raw: self.raw }
     }
 }
diff --git a/crates/ruff_python_index/src/lib.rs b/crates/ruff_python_index/src/lib.rs
index aabdef1d48..626585c3d4 100644
--- a/crates/ruff_python_index/src/lib.rs
+++ b/crates/ruff_python_index/src/lib.rs
@@ -1,5 +1,5 @@
-mod fstring_ranges;
 mod indexer;
+mod interpolated_string_ranges;
 mod multiline_ranges;
 
 pub use indexer::Indexer;
diff --git a/crates/ruff_python_parser/CONTRIBUTING.md b/crates/ruff_python_parser/CONTRIBUTING.md
index 90209ada78..ef328e01ce 100644
--- a/crates/ruff_python_parser/CONTRIBUTING.md
+++ b/crates/ruff_python_parser/CONTRIBUTING.md
@@ -62,7 +62,7 @@ To run the fuzzer, execute the following command
 (requires [`uv`](https://github.com/astral-sh/uv) to be installed):
 
 ```sh
-uvx --from ./python/py-fuzzer fuzz
+uv run --project=./python/py-fuzzer fuzz
 ```
 
 Refer to the [py-fuzzer](https://github.com/astral-sh/ruff/blob/main/python/py-fuzzer/fuzz.py)
diff --git a/crates/ruff_python_parser/resources/inline/err/different_match_pattern_bindings.py b/crates/ruff_python_parser/resources/inline/err/different_match_pattern_bindings.py
new file mode 100644
index 0000000000..f489953590
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/different_match_pattern_bindings.py
@@ -0,0 +1,13 @@
+match x:
+    case [a] | [b]: ...
+    case [a] | []: ...
+    case (x, y) | (x,): ...
+    case [a, _] | [a, b]: ...
+    case (x, (y | z)): ...
+    case [a] | [b] | [c]: ...
+    case [] | [a]: ...
+    case [a] | [C(x)]: ...
+    case [[a] | [b]]: ...
+    case [C(a)] | [C(b)]: ...
+    case [C(D(a))] | [C(D(b))]: ...
+    case [(a, b)] | [(c, d)]: ...
diff --git a/crates/ruff_python_parser/resources/inline/err/import_from_star.py b/crates/ruff_python_parser/resources/inline/err/import_from_star.py
new file mode 100644
index 0000000000..303492501b
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/import_from_star.py
@@ -0,0 +1,8 @@
+def f1():
+    from module import *
+class C:
+    from module import *
+def f2():
+    from ..module import *
+def f3():
+    from module import *, *
diff --git a/crates/ruff_python_parser/resources/inline/err/invalid_future_feature.py b/crates/ruff_python_parser/resources/inline/err/invalid_future_feature.py
new file mode 100644
index 0000000000..aa376ee3f3
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/invalid_future_feature.py
@@ -0,0 +1,3 @@
+from __future__ import invalid_feature
+from __future__ import annotations, invalid_feature
+from __future__ import invalid_feature_1, invalid_feature_2
diff --git a/crates/ruff_python_parser/resources/inline/err/multiple_starred_assignment_target.py b/crates/ruff_python_parser/resources/inline/err/multiple_starred_assignment_target.py
new file mode 100644
index 0000000000..fb25168769
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/multiple_starred_assignment_target.py
@@ -0,0 +1,5 @@
+(*a, *b) = (1, 2)
+[*a, *b] = (1, 2)
+(*a, *b, c) = (1, 2, 3)
+[*a, *b, c] = (1, 2, 3)
+(*a, *b, (*c, *d)) = (1, 2)
diff --git a/crates/ruff_python_parser/resources/inline/err/nested_quote_in_format_spec_py312.py b/crates/ruff_python_parser/resources/inline/err/nested_quote_in_format_spec_py312.py
new file mode 100644
index 0000000000..e11455f9c7
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/nested_quote_in_format_spec_py312.py
@@ -0,0 +1,2 @@
+# parse_options: {"target-version": "3.12"}
+f"{1:""}"  # this is a ParseError on all versions
diff --git a/crates/ruff_python_parser/resources/inline/err/pep701_nested_interpolation_py311.py b/crates/ruff_python_parser/resources/inline/err/pep701_nested_interpolation_py311.py
new file mode 100644
index 0000000000..3fbddf2285
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/pep701_nested_interpolation_py311.py
@@ -0,0 +1,4 @@
+# parse_options: {"target-version": "3.11"}
+# nested interpolations also need to be checked
+f'{1: abcd "{'aa'}" }'
+f'{1: abcd "{"\n"}" }'
diff --git a/crates/ruff_python_parser/resources/inline/err/tuple_context_manager_py38.py b/crates/ruff_python_parser/resources/inline/err/tuple_context_manager_py38.py
index bdc0639602..159f8d13e9 100644
--- a/crates/ruff_python_parser/resources/inline/err/tuple_context_manager_py38.py
+++ b/crates/ruff_python_parser/resources/inline/err/tuple_context_manager_py38.py
@@ -3,8 +3,6 @@
 # is parsed as a tuple, but this will always cause a runtime error, so we flag it
 # anyway
 with (foo, bar): ...
-with (
-  open('foo.txt')) as foo: ...
 with (
   foo,
   bar,
diff --git a/crates/ruff_python_parser/resources/inline/err/yield_from_in_async_function.py b/crates/ruff_python_parser/resources/inline/err/yield_from_in_async_function.py
new file mode 100644
index 0000000000..79354bc05c
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/err/yield_from_in_async_function.py
@@ -0,0 +1 @@
+async def f(): yield from x
diff --git a/crates/ruff_python_parser/resources/inline/ok/different_match_pattern_bindings.py b/crates/ruff_python_parser/resources/inline/ok/different_match_pattern_bindings.py
new file mode 100644
index 0000000000..b7fff1008e
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/ok/different_match_pattern_bindings.py
@@ -0,0 +1,6 @@
+match x:
+    case [a] | [a]: ...
+    case (x, y) | (x, y): ...
+    case (x, (y | y)): ...
+    case [a, _] | [a, _]: ...
+    case [a] | [C(a)]: ...
diff --git a/crates/ruff_python_parser/resources/inline/ok/import_from_star.py b/crates/ruff_python_parser/resources/inline/ok/import_from_star.py
new file mode 100644
index 0000000000..cbf8930347
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/ok/import_from_star.py
@@ -0,0 +1 @@
+from module import *
diff --git a/crates/ruff_python_parser/resources/inline/ok/multiple_starred_assignment_target.py b/crates/ruff_python_parser/resources/inline/ok/multiple_starred_assignment_target.py
new file mode 100644
index 0000000000..ae09bbb268
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/ok/multiple_starred_assignment_target.py
@@ -0,0 +1,2 @@
+(*a, b) = (1, 2)
+(*_, normed), *_ = [(1,), 2]
diff --git a/crates/ruff_python_parser/resources/inline/ok/non_nested_quote_in_format_spec_py311.py b/crates/ruff_python_parser/resources/inline/ok/non_nested_quote_in_format_spec_py311.py
new file mode 100644
index 0000000000..ce69b8518b
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/ok/non_nested_quote_in_format_spec_py311.py
@@ -0,0 +1,2 @@
+# parse_options: {"target-version": "3.11"}
+f"{1:''}"  # but this is okay on all versions
diff --git a/crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py311.py b/crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py311.py
index 40c0958df6..a50bc7593b 100644
--- a/crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py311.py
+++ b/crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py311.py
@@ -5,3 +5,5 @@ f"""{f'''{f'{"# not a comment"}'}'''}"""
 f"""{f'''# before expression {f'# aro{f"#{1+1}#"}und #'}'''} # after expression"""
 f"escape outside of \t {expr}\n"
 f"test\"abcd"
+f"{1:\x64}"  # escapes are valid in the format spec
+f"{1:\"d\"}"  # this also means that escaped outer quotes are valid
diff --git a/crates/ruff_python_parser/resources/inline/ok/single_parenthesized_item_context_manager_py38.py b/crates/ruff_python_parser/resources/inline/ok/single_parenthesized_item_context_manager_py38.py
new file mode 100644
index 0000000000..49238d151d
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/ok/single_parenthesized_item_context_manager_py38.py
@@ -0,0 +1,5 @@
+# parse_options: {"target-version": "3.8"}
+with (
+  open('foo.txt')) as foo: ...
+with (
+  open('foo.txt')): ...
diff --git a/crates/ruff_python_parser/resources/inline/ok/valid_future_feature.py b/crates/ruff_python_parser/resources/inline/ok/valid_future_feature.py
new file mode 100644
index 0000000000..9d48db4f9f
--- /dev/null
+++ b/crates/ruff_python_parser/resources/inline/ok/valid_future_feature.py
@@ -0,0 +1 @@
+from __future__ import annotations
diff --git a/crates/ruff_python_parser/src/lexer.rs b/crates/ruff_python_parser/src/lexer.rs
index ca58e72bec..dc864d71b6 100644
--- a/crates/ruff_python_parser/src/lexer.rs
+++ b/crates/ruff_python_parser/src/lexer.rs
@@ -13,6 +13,7 @@ use unicode_ident::{is_xid_continue, is_xid_start};
 use unicode_normalization::UnicodeNormalization;
 
 use ruff_python_ast::name::Name;
+use ruff_python_ast::str_prefix::{AnyStringPrefix, StringLiteralPrefix};
 use ruff_python_ast::{Int, IpyEscapeKind, StringFlags};
 use ruff_python_trivia::is_python_whitespace;
 use ruff_text_size::{TextLen, TextRange, TextSize};
@@ -24,6 +25,7 @@ use crate::lexer::indentation::{Indentation, Indentations, IndentationsCheckpoin
 use crate::lexer::interpolated_string::{
     InterpolatedStringContext, InterpolatedStrings, InterpolatedStringsCheckpoint,
 };
+use crate::string::InterpolatedStringKind;
 use crate::token::{TokenFlags, TokenKind, TokenValue};
 
 mod cursor;
@@ -782,6 +784,7 @@ impl<'src> Lexer<'src> {
         // SAFETY: Safe because the function is only called when `self.fstrings` is not empty.
         let interpolated_string = self.interpolated_strings.current().unwrap();
         let string_kind = interpolated_string.kind();
+        let interpolated_flags = interpolated_string.flags();
 
         // Check if we're at the end of the f-string.
         if interpolated_string.is_triple_quoted() {
@@ -819,15 +822,19 @@ impl<'src> Lexer<'src> {
                     } else {
                         InterpolatedStringErrorType::UnterminatedString
                     };
+
+                    self.nesting = interpolated_string.nesting();
                     self.interpolated_strings.pop();
-                    return Some(self.push_error(LexicalError::new(
+                    self.current_flags |= TokenFlags::UNCLOSED_STRING;
+                    self.push_error(LexicalError::new(
                         LexicalErrorType::from_interpolated_string_error(error, string_kind),
                         self.token_range(),
-                    )));
+                    ));
+
+                    break;
                 }
                 '\n' | '\r' if !interpolated_string.is_triple_quoted() => {
                     // https://github.com/astral-sh/ruff/issues/18632
-                    self.interpolated_strings.pop();
 
                     let error_type = if in_format_spec {
                         InterpolatedStringErrorType::NewlineInFormatSpec
@@ -835,10 +842,16 @@ impl<'src> Lexer<'src> {
                         InterpolatedStringErrorType::UnterminatedString
                     };
 
-                    return Some(self.push_error(LexicalError::new(
+                    self.nesting = interpolated_string.nesting();
+                    self.interpolated_strings.pop();
+                    self.current_flags |= TokenFlags::UNCLOSED_STRING;
+
+                    self.push_error(LexicalError::new(
                         LexicalErrorType::from_interpolated_string_error(error_type, string_kind),
                         self.token_range(),
-                    )));
+                    ));
+
+                    break;
                 }
                 '\\' => {
                     self.cursor.bump(); // '\'
@@ -913,7 +926,7 @@ impl<'src> Lexer<'src> {
 
         self.current_value = TokenValue::InterpolatedStringMiddle(value.into_boxed_str());
 
-        self.current_flags = interpolated_string.flags();
+        self.current_flags = interpolated_flags;
         Some(string_kind.middle_token())
     }
 
@@ -942,10 +955,12 @@ impl<'src> Lexer<'src> {
                 let Some(index) = memchr::memchr(quote_byte, self.cursor.rest().as_bytes()) else {
                     self.cursor.skip_to_end();
 
-                    return self.push_error(LexicalError::new(
+                    self.current_flags |= TokenFlags::UNCLOSED_STRING;
+                    self.push_error(LexicalError::new(
                         LexicalErrorType::UnclosedStringError,
                         self.token_range(),
                     ));
+                    break self.offset();
                 };
 
                 // Rare case: if there are an odd number of backslashes before the quote, then
@@ -977,11 +992,14 @@ impl<'src> Lexer<'src> {
                     memchr::memchr3(quote_byte, b'\r', b'\n', self.cursor.rest().as_bytes())
                 else {
                     self.cursor.skip_to_end();
+                    self.current_flags |= TokenFlags::UNCLOSED_STRING;
 
-                    return self.push_error(LexicalError::new(
-                        LexicalErrorType::StringError,
+                    self.push_error(LexicalError::new(
+                        LexicalErrorType::UnclosedStringError,
                         self.token_range(),
                     ));
+
+                    break self.offset();
                 };
 
                 // Rare case: if there are an odd number of backslashes before the quote, then
@@ -1009,10 +1027,12 @@ impl<'src> Lexer<'src> {
 
                 match quote_or_newline {
                     '\r' | '\n' => {
-                        return self.push_error(LexicalError::new(
+                        self.current_flags |= TokenFlags::UNCLOSED_STRING;
+                        self.push_error(LexicalError::new(
                             LexicalErrorType::UnclosedStringError,
                             self.token_range(),
                         ));
+                        break self.offset();
                     }
                     ch if ch == quote => {
                         let value_end = self.offset();
@@ -1331,7 +1351,20 @@ impl<'src> Lexer<'src> {
 
     fn consume_end(&mut self) -> TokenKind {
         // We reached end of file.
-        // First of all, we need all nestings to be finished.
+
+        // First, finish any unterminated interpolated-strings.
+        while let Some(interpolated_string) = self.interpolated_strings.pop() {
+            self.nesting = interpolated_string.nesting();
+            self.push_error(LexicalError::new(
+                LexicalErrorType::from_interpolated_string_error(
+                    InterpolatedStringErrorType::UnterminatedString,
+                    interpolated_string.kind(),
+                ),
+                self.token_range(),
+            ));
+        }
+
+        // Second, finish all nestings.
         // For Mode::ParenthesizedExpression we start with nesting level 1.
         // So we check if we end with that level.
         let init_nesting = u32::from(self.mode == Mode::ParenthesizedExpression);
@@ -1459,6 +1492,107 @@ impl<'src> Lexer<'src> {
         true
     }
 
+    /// Re-lexes an unclosed string token in the context of an interpolated string element.
+    ///
+    /// ```py
+    /// f'{a'
+    /// ```
+    ///
+    /// This method re-lexes the trailing `'` as the end of the f-string rather than the
+    /// start of a new string token for better error recovery.
+    pub(crate) fn re_lex_string_token_in_interpolation_element(
+        &mut self,
+        kind: InterpolatedStringKind,
+    ) {
+        let Some(interpolated_string) = self.interpolated_strings.current() else {
+            return;
+        };
+
+        let current_string_flags = self.current_flags().as_any_string_flags();
+
+        // Only unclosed strings, that have the same quote character
+        if !matches!(self.current_kind, TokenKind::String)
+            || !self.current_flags.is_unclosed()
+            || current_string_flags.prefix() != AnyStringPrefix::Regular(StringLiteralPrefix::Empty)
+            || current_string_flags.quote_style().as_char() != interpolated_string.quote_char()
+            || current_string_flags.is_triple_quoted() != interpolated_string.is_triple_quoted()
+        {
+            return;
+        }
+
+        // Only if the string's first line only contains whitespace,
+        // or ends in a comment (not `f"{"abc`)
+        let first_line = &self.source
+            [(self.current_range.start() + current_string_flags.quote_len()).to_usize()..];
+
+        for c in first_line.chars() {
+            if matches!(c, '\n' | '\r' | '#') {
+                break;
+            }
+
+            // `f'{'ab`, we want to parse `ab` as a normal string and not the closing element of the f-string
+            if !is_python_whitespace(c) {
+                return;
+            }
+        }
+
+        if self.errors.last().is_some_and(|error| {
+            error.location() == self.current_range
+                && matches!(error.error(), LexicalErrorType::UnclosedStringError)
+        }) {
+            self.errors.pop();
+        }
+
+        self.current_range =
+            TextRange::at(self.current_range.start(), self.current_flags.quote_len());
+        self.current_kind = kind.end_token();
+        self.current_value = TokenValue::None;
+        self.current_flags = TokenFlags::empty();
+
+        self.nesting = interpolated_string.nesting();
+        self.interpolated_strings.pop();
+
+        self.cursor = Cursor::new(self.source);
+        self.cursor.skip_bytes(self.current_range.end().to_usize());
+    }
+
+    /// Re-lex `r"` in a format specifier position.
+    ///
+    /// `r"` in a format specifier position is unlikely to be the start of a raw string.
+    /// Instead, it's the format specifier `!r` followed by the closing quote of the f-string,
+    /// when the `}` is missing.
+    ///
+    /// ```py
+    /// f"{test!r"
+    /// ```
+    ///
+    /// This function re-lexes the `r"` as `r` (a name token). The next `next_token` call will
+    /// return a unclosed string token for `"`, which [`Self::re_lex_string_token_in_interpolation_element`]
+    /// can then re-lex as the end of the f-string.
+    pub(crate) fn re_lex_raw_string_in_format_spec(&mut self) {
+        // Re-lex `r"` as `NAME r` followed by an unclosed string
+        // `f"{test!r"` -> `f"{test!`, `r`, `"`
+        if matches!(self.current_kind, TokenKind::String)
+            && self.current_flags.is_unclosed()
+            && self.current_flags.prefix()
+                == AnyStringPrefix::Regular(StringLiteralPrefix::Raw { uppercase: false })
+        {
+            if self.errors.last().is_some_and(|error| {
+                error.location() == self.current_range
+                    && matches!(error.error(), LexicalErrorType::UnclosedStringError)
+            }) {
+                self.errors.pop();
+            }
+
+            self.current_range = TextRange::at(self.current_range.start(), 'r'.text_len());
+            self.current_kind = TokenKind::Name;
+            self.current_value = TokenValue::Name(Name::new_static("r"));
+            self.current_flags = TokenFlags::empty();
+            self.cursor = Cursor::new(self.source);
+            self.cursor.skip_bytes(self.current_range.end().to_usize());
+        }
+    }
+
     #[inline]
     fn token_range(&self) -> TextRange {
         let end = self.offset();
@@ -2739,6 +2873,164 @@ t"{(lambda x:{x})}"
         }
     }
 
+    #[test]
+    fn lex_fstring_unclosed() {
+        let source = r#"f"hello"#;
+
+        assert_snapshot!(lex_invalid(source, Mode::Module), @r#"
+        ## Tokens
+        ```
+        [
+            (
+                FStringStart,
+                0..2,
+                TokenFlags(
+                    DOUBLE_QUOTES | F_STRING,
+                ),
+            ),
+            (
+                InterpolatedStringMiddle(
+                    "hello",
+                ),
+                2..7,
+                TokenFlags(
+                    DOUBLE_QUOTES | F_STRING,
+                ),
+            ),
+            (
+                Newline,
+                7..7,
+            ),
+        ]
+        ```
+        ## Errors
+        ```
+        [
+            LexicalError {
+                error: FStringError(
+                    UnterminatedString,
+                ),
+                location: 2..7,
+            },
+        ]
+        ```
+        "#);
+    }
+
+    #[test]
+    fn lex_fstring_missing_brace() {
+        let source = "f'{'";
+
+        assert_snapshot!(lex_invalid(source, Mode::Module), @r#"
+        ## Tokens
+        ```
+        [
+            (
+                FStringStart,
+                0..2,
+                TokenFlags(
+                    F_STRING,
+                ),
+            ),
+            (
+                Lbrace,
+                2..3,
+            ),
+            (
+                String(
+                    "",
+                ),
+                3..4,
+                TokenFlags(
+                    UNCLOSED_STRING,
+                ),
+            ),
+            (
+                Newline,
+                4..4,
+            ),
+        ]
+        ```
+        ## Errors
+        ```
+        [
+            LexicalError {
+                error: UnclosedStringError,
+                location: 3..4,
+            },
+            LexicalError {
+                error: FStringError(
+                    UnterminatedString,
+                ),
+                location: 4..4,
+            },
+        ]
+        ```
+        "#);
+    }
+
+    #[test]
+    fn lex_fstring_missing_brace_after_format_spec() {
+        let source = r#"f"{foo!r""#;
+
+        assert_snapshot!(lex_invalid(source, Mode::Module), @r#"
+        ## Tokens
+        ```
+        [
+            (
+                FStringStart,
+                0..2,
+                TokenFlags(
+                    DOUBLE_QUOTES | F_STRING,
+                ),
+            ),
+            (
+                Lbrace,
+                2..3,
+            ),
+            (
+                Name(
+                    Name("foo"),
+                ),
+                3..6,
+            ),
+            (
+                Exclamation,
+                6..7,
+            ),
+            (
+                String(
+                    "",
+                ),
+                7..9,
+                TokenFlags(
+                    DOUBLE_QUOTES | RAW_STRING_LOWERCASE | UNCLOSED_STRING,
+                ),
+            ),
+            (
+                Newline,
+                9..9,
+            ),
+        ]
+        ```
+        ## Errors
+        ```
+        [
+            LexicalError {
+                error: UnclosedStringError,
+                location: 7..9,
+            },
+            LexicalError {
+                error: FStringError(
+                    UnterminatedString,
+                ),
+                location: 9..9,
+            },
+        ]
+        ```
+        "#);
+    }
+
     #[test]
     fn test_tstring_error() {
         use InterpolatedStringErrorType::{
diff --git a/crates/ruff_python_parser/src/lib.rs b/crates/ruff_python_parser/src/lib.rs
index c25eea290c..ce409200ae 100644
--- a/crates/ruff_python_parser/src/lib.rs
+++ b/crates/ruff_python_parser/src/lib.rs
@@ -215,7 +215,7 @@ pub fn parse_parenthesized_expression_range(
 ///     value: "'''\n int | str'''".to_string().into_boxed_str(),
 ///     flags: StringLiteralFlags::empty(),
 ///     range: TextRange::new(TextSize::new(0), TextSize::new(16)),
-///     node_index: AtomicNodeIndex::dummy()
+///     node_index: AtomicNodeIndex::NONE
 /// };
 /// let parsed = parse_string_annotation("'''\n int | str'''", &string);
 /// assert!(!parsed.is_ok());
@@ -489,6 +489,23 @@ impl Tokens {
         TokenIterWithContext::new(&self.raw)
     }
 
+    /// Performs a binary search to find the index of the **first** token that starts at the given `offset`.
+    ///
+    /// Unlike `binary_search_by_key`, this method ensures that if multiple tokens start at the same offset,
+    /// it returns the index of the first one. Multiple tokens can start at the same offset in cases where
+    /// zero-length tokens are involved (like `Dedent` or `Newline` at the end of the file).
+    pub fn binary_search_by_start(&self, offset: TextSize) -> Result<usize, usize> {
+        let partition_point = self.partition_point(|token| token.start() < offset);
+
+        let after = &self[partition_point..];
+
+        if after.first().is_some_and(|first| first.start() == offset) {
+            Ok(partition_point)
+        } else {
+            Err(partition_point)
+        }
+    }
+
     /// Returns a slice of [`Token`] that are within the given `range`.
     ///
     /// The start and end offset of the given range should be either:
@@ -532,30 +549,7 @@ impl Tokens {
     pub fn in_range(&self, range: TextRange) -> &[Token] {
         let tokens_after_start = self.after(range.start());
 
-        match tokens_after_start.binary_search_by_key(&range.end(), Ranged::end) {
-            Ok(idx) => {
-                // If we found the token with the end offset, that token should be included in the
-                // return slice.
-                &tokens_after_start[..=idx]
-            }
-            Err(idx) => {
-                if let Some(token) = tokens_after_start.get(idx) {
-                    // If it's equal to the start offset, then it's at a token boundary which is
-                    // valid. If it's less than the start offset, then it's in the gap between the
-                    // tokens which is valid as well.
-                    assert!(
-                        range.end() <= token.start(),
-                        "End offset {:?} is inside a token range {:?}",
-                        range.end(),
-                        token.range()
-                    );
-                }
-
-                // This index is where the token with the offset _could_ be, so that token should
-                // be excluded from the return slice.
-                &tokens_after_start[..idx]
-            }
-        }
+        Self::before_impl(tokens_after_start, range.end())
     }
 
     /// Searches the token(s) at `offset`.
@@ -597,7 +591,7 @@ impl Tokens {
     /// assert_eq!(collect_tokens(TextSize::new(57)), vec! []);
     /// ```
     pub fn at_offset(&self, offset: TextSize) -> TokenAt {
-        match self.binary_search_by_key(&offset, ruff_text_size::Ranged::start) {
+        match self.binary_search_by_start(offset) {
             // The token at `index` starts exactly at `offset.
             // ```python
             // object.attribute
@@ -649,28 +643,25 @@ impl Tokens {
     /// If the given offset is inside a token range at any point
     /// other than the start of the range.
     pub fn before(&self, offset: TextSize) -> &[Token] {
-        match self.binary_search_by(|token| token.start().cmp(&offset)) {
-            Ok(idx) => &self[..idx],
-            Err(idx) => {
-                // We can't use `saturating_sub` here because a file could contain a BOM header, in
-                // which case the token starts at offset 3 for UTF-8 encoded file content.
-                if idx > 0 {
-                    if let Some(prev) = self.get(idx - 1) {
-                        // If it's equal to the end offset, then it's at a token boundary which is
-                        // valid. If it's greater than the end offset, then it's in the gap between
-                        // the tokens which is valid as well.
-                        assert!(
-                            offset >= prev.end(),
-                            "Offset {:?} is inside a token range {:?}",
-                            offset,
-                            prev.range()
-                        );
-                    }
-                }
+        Self::before_impl(&self.raw, offset)
+    }
 
-                &self[..idx]
-            }
+    fn before_impl(tokens: &[Token], offset: TextSize) -> &[Token] {
+        let partition_point = tokens.partition_point(|token| token.start() < offset);
+        let before = &tokens[..partition_point];
+
+        if let Some(last) = before.last() {
+            // If it's equal to the end offset, then it's at a token boundary which is
+            // valid. If it's greater than the end offset, then it's in the gap between
+            // the tokens which is valid as well.
+            assert!(
+                offset >= last.end(),
+                "Offset {:?} is inside a token range {:?}",
+                offset,
+                last.range()
+            );
         }
+        before
     }
 
     /// Returns a slice of tokens after the given [`TextSize`] offset.
@@ -684,28 +675,21 @@ impl Tokens {
     /// If the given offset is inside a token range at any point
     /// other than the start of the range.
     pub fn after(&self, offset: TextSize) -> &[Token] {
-        match self.binary_search_by(|token| token.start().cmp(&offset)) {
-            Ok(idx) => &self[idx..],
-            Err(idx) => {
-                // We can't use `saturating_sub` here because a file could contain a BOM header, in
-                // which case the token starts at offset 3 for UTF-8 encoded file content.
-                if idx > 0 {
-                    if let Some(prev) = self.get(idx - 1) {
-                        // If it's equal to the end offset, then it's at a token boundary which is
-                        // valid. If it's greater than the end offset, then it's in the gap between
-                        // the tokens which is valid as well.
-                        assert!(
-                            offset >= prev.end(),
-                            "Offset {:?} is inside a token range {:?}",
-                            offset,
-                            prev.range()
-                        );
-                    }
-                }
+        let partition_point = self.partition_point(|token| token.end() <= offset);
+        let after = &self[partition_point..];
 
-                &self[idx..]
-            }
+        if let Some(first) = after.first() {
+            // valid. If it's greater than the end offset, then it's in the gap between
+            // the tokens which is valid as well.
+            assert!(
+                offset <= first.start(),
+                "Offset {:?} is inside a token range {:?}",
+                offset,
+                first.range()
+            );
         }
+
+        after
     }
 }
 
@@ -1099,7 +1083,7 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "End offset 6 is inside a token range 4..7")]
+    #[should_panic(expected = "Offset 6 is inside a token range 4..7")]
     fn tokens_in_range_end_offset_inside_token() {
         let tokens = new_tokens(TEST_CASE_WITH_GAP.into_iter());
         tokens.in_range(TextRange::new(0.into(), 6.into()));
diff --git a/crates/ruff_python_parser/src/parser/expression.rs b/crates/ruff_python_parser/src/parser/expression.rs
index de9a1bad52..2ae786ce77 100644
--- a/crates/ruff_python_parser/src/parser/expression.rs
+++ b/crates/ruff_python_parser/src/parser/expression.rs
@@ -304,7 +304,7 @@ impl<'src> Parser<'src> {
                         op: bin_op,
                         right: Box::new(right.expr),
                         range: self.node_range(start),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })
                 }
             };
@@ -472,7 +472,7 @@ impl<'src> Parser<'src> {
             range: identifier.range,
             id: identifier.id,
             ctx,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -491,7 +491,7 @@ impl<'src> Parser<'src> {
             return ast::Identifier {
                 id: name,
                 range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             };
         }
 
@@ -501,7 +501,7 @@ impl<'src> Parser<'src> {
             return ast::Identifier {
                 id,
                 range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             };
         }
 
@@ -520,7 +520,7 @@ impl<'src> Parser<'src> {
             ast::Identifier {
                 id,
                 range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }
         } else {
             self.add_error(
@@ -531,7 +531,7 @@ impl<'src> Parser<'src> {
             ast::Identifier {
                 id: Name::empty(),
                 range: self.missing_node_range(),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }
         }
     }
@@ -551,7 +551,7 @@ impl<'src> Parser<'src> {
                 Expr::NumberLiteral(ast::ExprNumberLiteral {
                     value: Number::Float(value),
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Complex => {
@@ -561,7 +561,7 @@ impl<'src> Parser<'src> {
                 Expr::NumberLiteral(ast::ExprNumberLiteral {
                     value: Number::Complex { real, imag },
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Int => {
@@ -571,7 +571,7 @@ impl<'src> Parser<'src> {
                 Expr::NumberLiteral(ast::ExprNumberLiteral {
                     value: Number::Int(value),
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::True => {
@@ -579,7 +579,7 @@ impl<'src> Parser<'src> {
                 Expr::BooleanLiteral(ast::ExprBooleanLiteral {
                     value: true,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::False => {
@@ -587,21 +587,21 @@ impl<'src> Parser<'src> {
                 Expr::BooleanLiteral(ast::ExprBooleanLiteral {
                     value: false,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::None => {
                 self.bump(TokenKind::None);
                 Expr::NoneLiteral(ast::ExprNoneLiteral {
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Ellipsis => {
                 self.bump(TokenKind::Ellipsis);
                 Expr::EllipsisLiteral(ast::ExprEllipsisLiteral {
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Name => Expr::Name(self.parse_name()),
@@ -629,7 +629,7 @@ impl<'src> Parser<'src> {
                         range: self.missing_node_range(),
                         id: Name::empty(),
                         ctx: ExprContext::Invalid,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })
                 }
             }
@@ -672,7 +672,7 @@ impl<'src> Parser<'src> {
             func: Box::new(func),
             arguments,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -702,7 +702,7 @@ impl<'src> Parser<'src> {
                         arg: None,
                         value: value.expr,
                         range: parser.node_range(argument_start),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     });
 
                     seen_keyword_unpacking = true;
@@ -767,7 +767,7 @@ impl<'src> Parser<'src> {
                             ast::Identifier {
                                 id: ident_expr.id,
                                 range: ident_expr.range,
-                                node_index: AtomicNodeIndex::dummy(),
+                                node_index: AtomicNodeIndex::NONE,
                             }
                         } else {
                             // TODO(dhruvmanila): Parser shouldn't drop the `parsed_expr` if it's
@@ -780,7 +780,7 @@ impl<'src> Parser<'src> {
                             ast::Identifier {
                                 id: Name::empty(),
                                 range: parsed_expr.range(),
-                                node_index: AtomicNodeIndex::dummy(),
+                                node_index: AtomicNodeIndex::NONE,
                             }
                         };
 
@@ -790,7 +790,7 @@ impl<'src> Parser<'src> {
                             arg: Some(arg),
                             value: value.expr,
                             range: parser.node_range(argument_start),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         });
                     } else {
                         if !parsed_expr.is_unparenthesized_starred_expr() {
@@ -815,7 +815,7 @@ impl<'src> Parser<'src> {
 
         let arguments = ast::Arguments {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             args: args.into_boxed_slice(),
             keywords: keywords.into_boxed_slice(),
         };
@@ -857,11 +857,11 @@ impl<'src> Parser<'src> {
                     range: slice_range,
                     id: Name::empty(),
                     ctx: ExprContext::Invalid,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })),
                 ctx: ExprContext::Load,
                 range: self.node_range(start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             };
         }
 
@@ -881,7 +881,7 @@ impl<'src> Parser<'src> {
                 ctx: ExprContext::Load,
                 range: self.node_range(slice_start),
                 parenthesized: false,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         } else if slice.is_starred_expr() {
             // If the only slice element is a starred expression, that is represented
@@ -892,7 +892,7 @@ impl<'src> Parser<'src> {
                 ctx: ExprContext::Load,
                 range: self.node_range(slice_start),
                 parenthesized: false,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -941,7 +941,7 @@ impl<'src> Parser<'src> {
             slice: Box::new(slice),
             ctx: ExprContext::Load,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1035,7 +1035,7 @@ impl<'src> Parser<'src> {
 
         Expr::Slice(ast::ExprSlice {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             lower,
             upper,
             step,
@@ -1066,7 +1066,7 @@ impl<'src> Parser<'src> {
             op,
             operand: Box::new(operand.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1091,7 +1091,7 @@ impl<'src> Parser<'src> {
             attr,
             ctx: ExprContext::Load,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1135,7 +1135,7 @@ impl<'src> Parser<'src> {
             values,
             op,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1215,7 +1215,7 @@ impl<'src> Parser<'src> {
             ops: operators.into_boxed_slice(),
             comparators: comparators.into_boxed_slice(),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1285,22 +1285,22 @@ impl<'src> Parser<'src> {
                 StringType::Str(string) => Expr::StringLiteral(ast::ExprStringLiteral {
                     value: ast::StringLiteralValue::single(string),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 }),
                 StringType::Bytes(bytes) => Expr::BytesLiteral(ast::ExprBytesLiteral {
                     value: ast::BytesLiteralValue::single(bytes),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 }),
                 StringType::FString(fstring) => Expr::FString(ast::ExprFString {
                     value: ast::FStringValue::single(fstring),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 }),
                 StringType::TString(tstring) => Expr::TString(ast::ExprTString {
                     value: ast::TStringValue::single(tstring),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 }),
             },
             _ => self.handle_implicitly_concatenated_strings(strings, range),
@@ -1367,7 +1367,7 @@ impl<'src> Parser<'src> {
                 return Expr::from(ast::ExprBytesLiteral {
                     value: ast::BytesLiteralValue::concatenated(values),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 });
             }
         }
@@ -1395,7 +1395,7 @@ impl<'src> Parser<'src> {
                 return Expr::from(ast::ExprTString {
                     value: ast::TStringValue::concatenated(values),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 });
             }
         }
@@ -1433,7 +1433,7 @@ impl<'src> Parser<'src> {
             return Expr::from(ast::ExprStringLiteral {
                 value: ast::StringLiteralValue::concatenated(values),
                 range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -1457,7 +1457,7 @@ impl<'src> Parser<'src> {
         Expr::from(ast::ExprFString {
             value: ast::FStringValue::concatenated(parts),
             range,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         })
     }
 
@@ -1493,7 +1493,7 @@ impl<'src> Parser<'src> {
                         value: Box::new([]),
                         range,
                         flags: ast::BytesLiteralFlags::from(flags).with_invalid(),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })
                 } else {
                     // test_err invalid_string_literal
@@ -1503,7 +1503,7 @@ impl<'src> Parser<'src> {
                         value: "".into(),
                         range,
                         flags: ast::StringLiteralFlags::from(flags).with_invalid(),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })
                 }
             }
@@ -1526,7 +1526,7 @@ impl<'src> Parser<'src> {
         kind: InterpolatedStringKind,
     ) -> InterpolatedStringData {
         let start = self.node_start();
-        let flags = self.tokens.current_flags().as_any_string_flags();
+        let mut flags = self.tokens.current_flags().as_any_string_flags();
 
         self.bump(kind.start_token());
         let elements = self.parse_interpolated_string_elements(
@@ -1535,89 +1535,13 @@ impl<'src> Parser<'src> {
             kind,
         );
 
-        self.expect(kind.end_token());
-
-        // test_ok pep701_f_string_py312
-        // # parse_options: {"target-version": "3.12"}
-        // f'Magic wand: { bag['wand'] }'     # nested quotes
-        // f"{'\n'.join(a)}"                  # escape sequence
-        // f'''A complex trick: {
-        //     bag['bag']                     # comment
-        // }'''
-        // f"{f"{f"{f"{f"{f"{1+1}"}"}"}"}"}"  # arbitrary nesting
-        // f"{f'''{"nested"} inner'''} outer" # nested (triple) quotes
-        // f"test {a \
-        //     } more"                        # line continuation
-
-        // test_ok pep750_t_string_py314
-        // # parse_options: {"target-version": "3.14"}
-        // t'Magic wand: { bag['wand'] }'     # nested quotes
-        // t"{'\n'.join(a)}"                  # escape sequence
-        // t'''A complex trick: {
-        //     bag['bag']                     # comment
-        // }'''
-        // t"{t"{t"{t"{t"{t"{1+1}"}"}"}"}"}"  # arbitrary nesting
-        // t"{t'''{"nested"} inner'''} outer" # nested (triple) quotes
-        // t"test {a \
-        //     } more"                        # line continuation
-
-        // test_ok pep701_f_string_py311
-        // # parse_options: {"target-version": "3.11"}
-        // f"outer {'# not a comment'}"
-        // f'outer {x:{"# not a comment"} }'
-        // f"""{f'''{f'{"# not a comment"}'}'''}"""
-        // f"""{f'''# before expression {f'# aro{f"#{1+1}#"}und #'}'''} # after expression"""
-        // f"escape outside of \t {expr}\n"
-        // f"test\"abcd"
-
-        // test_err pep701_f_string_py311
-        // # parse_options: {"target-version": "3.11"}
-        // f'Magic wand: { bag['wand'] }'     # nested quotes
-        // f"{'\n'.join(a)}"                  # escape sequence
-        // f'''A complex trick: {
-        //     bag['bag']                     # comment
-        // }'''
-        // f"{f"{f"{f"{f"{f"{1+1}"}"}"}"}"}"  # arbitrary nesting
-        // f"{f'''{"nested"} inner'''} outer" # nested (triple) quotes
-        // f"test {a \
-        //     } more"                        # line continuation
-        // f"""{f"""{x}"""}"""                # mark the whole triple quote
-        // f"{'\n'.join(['\t', '\v', '\r'])}"  # multiple escape sequences, multiple errors
-
-        let range = self.node_range(start);
-
-        if !self.options.target_version.supports_pep_701()
-            && matches!(kind, InterpolatedStringKind::FString)
-        {
-            let quote_bytes = flags.quote_str().as_bytes();
-            let quote_len = flags.quote_len();
-            for expr in elements.interpolations() {
-                for slash_position in memchr::memchr_iter(b'\\', self.source[expr.range].as_bytes())
-                {
-                    let slash_position = TextSize::try_from(slash_position).unwrap();
-                    self.add_unsupported_syntax_error(
-                        UnsupportedSyntaxErrorKind::Pep701FString(FStringKind::Backslash),
-                        TextRange::at(expr.range.start() + slash_position, '\\'.text_len()),
-                    );
-                }
-
-                if let Some(quote_position) =
-                    memchr::memmem::find(self.source[expr.range].as_bytes(), quote_bytes)
-                {
-                    let quote_position = TextSize::try_from(quote_position).unwrap();
-                    self.add_unsupported_syntax_error(
-                        UnsupportedSyntaxErrorKind::Pep701FString(FStringKind::NestedQuote),
-                        TextRange::at(expr.range.start() + quote_position, quote_len),
-                    );
-                }
-            }
-
-            self.check_fstring_comments(range);
+        if !self.expect(kind.end_token()) {
+            flags = flags.with_unclosed(true);
         }
 
         InterpolatedStringData {
             elements,
-            range,
+            range: self.node_range(start),
             flags,
         }
     }
@@ -1677,7 +1601,7 @@ impl<'src> Parser<'src> {
                                     ast::InterpolatedStringLiteralElement {
                                         value: "".into(),
                                         range,
-                                        node_index: AtomicNodeIndex::dummy(),
+                                        node_index: AtomicNodeIndex::NONE,
                                     }
                                 }),
                         )
@@ -1719,6 +1643,9 @@ impl<'src> Parser<'src> {
         let start = self.node_start();
         self.bump(TokenKind::Lbrace);
 
+        self.tokens
+            .re_lex_string_token_in_interpolation_element(string_kind);
+
         // test_err f_string_empty_expression
         // f"{}"
         // f"{  }"
@@ -1740,6 +1667,7 @@ impl<'src> Parser<'src> {
         // t"{*}"
         // t"{*x and y}"
         // t"{*yield x}"
+
         let value = self.parse_expression_list(ExpressionContext::yield_or_starred_bitwise_or());
 
         if !value.is_parenthesized && value.expr.is_lambda_expr() {
@@ -1773,6 +1701,10 @@ impl<'src> Parser<'src> {
         };
 
         let conversion = if self.eat(TokenKind::Exclamation) {
+            // Ensure that the `r` is lexed as a `r` name token instead of a raw string
+            // in `f{abc!r"` (note the missing `}`).
+            self.tokens.re_lex_raw_string_in_format_spec();
+
             let conversion_flag_range = self.current_token_range();
             if self.at(TokenKind::Name) {
                 // test_err f_string_conversion_follows_exclamation
@@ -1846,12 +1778,15 @@ impl<'src> Parser<'src> {
             Some(Box::new(ast::InterpolatedStringFormatSpec {
                 range: self.node_range(spec_start),
                 elements,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }))
         } else {
             None
         };
 
+        self.tokens
+            .re_lex_string_token_in_interpolation_element(string_kind);
+
         // We're using `eat` here instead of `expect` to use the f-string specific error type.
         if !self.eat(TokenKind::Rbrace) {
             // TODO(dhruvmanila): This requires some changes in the lexer. One of them
@@ -1892,13 +1827,111 @@ impl<'src> Parser<'src> {
             );
         }
 
+        // test_ok pep701_f_string_py312
+        // # parse_options: {"target-version": "3.12"}
+        // f'Magic wand: { bag['wand'] }'     # nested quotes
+        // f"{'\n'.join(a)}"                  # escape sequence
+        // f'''A complex trick: {
+        //     bag['bag']                     # comment
+        // }'''
+        // f"{f"{f"{f"{f"{f"{1+1}"}"}"}"}"}"  # arbitrary nesting
+        // f"{f'''{"nested"} inner'''} outer" # nested (triple) quotes
+        // f"test {a \
+        //     } more"                        # line continuation
+
+        // test_ok pep750_t_string_py314
+        // # parse_options: {"target-version": "3.14"}
+        // t'Magic wand: { bag['wand'] }'     # nested quotes
+        // t"{'\n'.join(a)}"                  # escape sequence
+        // t'''A complex trick: {
+        //     bag['bag']                     # comment
+        // }'''
+        // t"{t"{t"{t"{t"{t"{1+1}"}"}"}"}"}"  # arbitrary nesting
+        // t"{t'''{"nested"} inner'''} outer" # nested (triple) quotes
+        // t"test {a \
+        //     } more"                        # line continuation
+
+        // test_ok pep701_f_string_py311
+        // # parse_options: {"target-version": "3.11"}
+        // f"outer {'# not a comment'}"
+        // f'outer {x:{"# not a comment"} }'
+        // f"""{f'''{f'{"# not a comment"}'}'''}"""
+        // f"""{f'''# before expression {f'# aro{f"#{1+1}#"}und #'}'''} # after expression"""
+        // f"escape outside of \t {expr}\n"
+        // f"test\"abcd"
+        // f"{1:\x64}"  # escapes are valid in the format spec
+        // f"{1:\"d\"}"  # this also means that escaped outer quotes are valid
+
+        // test_err pep701_f_string_py311
+        // # parse_options: {"target-version": "3.11"}
+        // f'Magic wand: { bag['wand'] }'     # nested quotes
+        // f"{'\n'.join(a)}"                  # escape sequence
+        // f'''A complex trick: {
+        //     bag['bag']                     # comment
+        // }'''
+        // f"{f"{f"{f"{f"{f"{1+1}"}"}"}"}"}"  # arbitrary nesting
+        // f"{f'''{"nested"} inner'''} outer" # nested (triple) quotes
+        // f"test {a \
+        //     } more"                        # line continuation
+        // f"""{f"""{x}"""}"""                # mark the whole triple quote
+        // f"{'\n'.join(['\t', '\v', '\r'])}"  # multiple escape sequences, multiple errors
+
+        // test_err pep701_nested_interpolation_py311
+        // # parse_options: {"target-version": "3.11"}
+        // # nested interpolations also need to be checked
+        // f'{1: abcd "{'aa'}" }'
+        // f'{1: abcd "{"\n"}" }'
+
+        // test_err nested_quote_in_format_spec_py312
+        // # parse_options: {"target-version": "3.12"}
+        // f"{1:""}"  # this is a ParseError on all versions
+
+        // test_ok non_nested_quote_in_format_spec_py311
+        // # parse_options: {"target-version": "3.11"}
+        // f"{1:''}"  # but this is okay on all versions
+        let range = self.node_range(start);
+
+        if !self.options.target_version.supports_pep_701()
+            && matches!(string_kind, InterpolatedStringKind::FString)
+        {
+            // We need to check the whole expression range, including any leading or trailing
+            // debug text, but exclude the format spec, where escapes and escaped, reused quotes
+            // are allowed.
+            let range = format_spec
+                .as_ref()
+                .map(|format_spec| TextRange::new(range.start(), format_spec.start()))
+                .unwrap_or(range);
+
+            let quote_bytes = flags.quote_str().as_bytes();
+            let quote_len = flags.quote_len();
+            for slash_position in memchr::memchr_iter(b'\\', self.source[range].as_bytes()) {
+                let slash_position = TextSize::try_from(slash_position).unwrap();
+                self.add_unsupported_syntax_error(
+                    UnsupportedSyntaxErrorKind::Pep701FString(FStringKind::Backslash),
+                    TextRange::at(range.start() + slash_position, '\\'.text_len()),
+                );
+            }
+
+            if let Some(quote_position) =
+                memchr::memmem::find(self.source[range].as_bytes(), quote_bytes)
+            {
+                let quote_position = TextSize::try_from(quote_position).unwrap();
+                self.add_unsupported_syntax_error(
+                    UnsupportedSyntaxErrorKind::Pep701FString(FStringKind::NestedQuote),
+                    TextRange::at(range.start() + quote_position, quote_len),
+                );
+            }
+
+            self.check_fstring_comments(range);
+        }
+
         ast::InterpolatedElement {
             expression: Box::new(value.expr),
             debug_text,
             conversion,
             format_spec,
-            range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            range,
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1928,7 +1961,7 @@ impl<'src> Parser<'src> {
                 elts: vec![],
                 ctx: ExprContext::Load,
                 range: self.node_range(start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -1980,7 +2013,7 @@ impl<'src> Parser<'src> {
             return Expr::Dict(ast::ExprDict {
                 items: vec![],
                 range: self.node_range(start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -2091,7 +2124,7 @@ impl<'src> Parser<'src> {
                 elts: vec![],
                 ctx: ExprContext::Load,
                 range: self.node_range(start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
                 parenthesized: true,
             })
             .into();
@@ -2180,7 +2213,7 @@ impl<'src> Parser<'src> {
             elts,
             ctx: ExprContext::Load,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             parenthesized: parenthesized.is_yes(),
         }
     }
@@ -2209,7 +2242,7 @@ impl<'src> Parser<'src> {
             elts,
             ctx: ExprContext::Load,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2258,7 +2291,7 @@ impl<'src> Parser<'src> {
 
         ast::ExprSet {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             elts,
         }
     }
@@ -2301,7 +2334,7 @@ impl<'src> Parser<'src> {
 
         ast::ExprDict {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             items,
         }
     }
@@ -2369,7 +2402,7 @@ impl<'src> Parser<'src> {
 
         ast::Comprehension {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             target: target.expr,
             iter: iter.expr,
             ifs,
@@ -2399,7 +2432,7 @@ impl<'src> Parser<'src> {
             elt: Box::new(element),
             generators,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             parenthesized: parenthesized.is_yes(),
         }
     }
@@ -2420,7 +2453,7 @@ impl<'src> Parser<'src> {
             elt: Box::new(element),
             generators,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2442,7 +2475,7 @@ impl<'src> Parser<'src> {
             value: Box::new(value),
             generators,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2462,7 +2495,7 @@ impl<'src> Parser<'src> {
             elt: Box::new(element),
             generators,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2499,7 +2532,7 @@ impl<'src> Parser<'src> {
             value: Box::new(parsed_expr.expr),
             ctx: ExprContext::Load,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2522,7 +2555,7 @@ impl<'src> Parser<'src> {
         ast::ExprAwait {
             value: Box::new(parsed_expr.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2571,7 +2604,7 @@ impl<'src> Parser<'src> {
         Expr::Yield(ast::ExprYield {
             value,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         })
     }
 
@@ -2611,7 +2644,7 @@ impl<'src> Parser<'src> {
         Expr::YieldFrom(ast::ExprYieldFrom {
             value: Box::new(expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         })
     }
 
@@ -2652,7 +2685,7 @@ impl<'src> Parser<'src> {
             target: Box::new(target),
             value: Box::new(value.expr),
             range,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2700,7 +2733,7 @@ impl<'src> Parser<'src> {
             body: Box::new(body.expr),
             parameters,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2725,7 +2758,7 @@ impl<'src> Parser<'src> {
             test: Box::new(test.expr),
             orelse: Box::new(orelse.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2751,7 +2784,7 @@ impl<'src> Parser<'src> {
 
         let command = ast::ExprIpyEscapeCommand {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
             kind,
             value,
         };
@@ -3010,7 +3043,7 @@ impl From<InterpolatedStringData> for FString {
             elements: value.elements,
             range: value.range,
             flags: value.flags.into(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 }
@@ -3021,7 +3054,7 @@ impl From<InterpolatedStringData> for TString {
             elements: value.elements,
             range: value.range,
             flags: value.flags.into(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 }
diff --git a/crates/ruff_python_parser/src/parser/mod.rs b/crates/ruff_python_parser/src/parser/mod.rs
index ccd44b2592..5f35b84b04 100644
--- a/crates/ruff_python_parser/src/parser/mod.rs
+++ b/crates/ruff_python_parser/src/parser/mod.rs
@@ -133,7 +133,7 @@ impl<'src> Parser<'src> {
         ModExpression {
             body: Box::new(parsed_expr.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -151,7 +151,7 @@ impl<'src> Parser<'src> {
         ModModule {
             body,
             range: TextRange::new(self.start_offset, self.current_token_range().end()),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
diff --git a/crates/ruff_python_parser/src/parser/pattern.rs b/crates/ruff_python_parser/src/parser/pattern.rs
index dd552410db..2839a7dcad 100644
--- a/crates/ruff_python_parser/src/parser/pattern.rs
+++ b/crates/ruff_python_parser/src/parser/pattern.rs
@@ -112,7 +112,7 @@ impl Parser<'_> {
             lhs = Pattern::MatchOr(ast::PatternMatchOr {
                 range: self.node_range(start),
                 patterns,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -128,7 +128,7 @@ impl Parser<'_> {
                 range: self.node_range(start),
                 name: Some(ident),
                 pattern: Some(Box::new(lhs)),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -255,7 +255,7 @@ impl Parser<'_> {
             keys,
             patterns,
             rest,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -279,7 +279,7 @@ impl Parser<'_> {
             } else {
                 Some(ident)
             },
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -319,7 +319,7 @@ impl Parser<'_> {
             return Pattern::MatchSequence(ast::PatternMatchSequence {
                 patterns: vec![],
                 range: self.node_range(start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         }
 
@@ -374,7 +374,7 @@ impl Parser<'_> {
         ast::PatternMatchSequence {
             range: self.node_range(start),
             patterns,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -389,7 +389,7 @@ impl Parser<'_> {
                 Pattern::MatchSingleton(ast::PatternMatchSingleton {
                     value: Singleton::None,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::True => {
@@ -397,7 +397,7 @@ impl Parser<'_> {
                 Pattern::MatchSingleton(ast::PatternMatchSingleton {
                     value: Singleton::True,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::False => {
@@ -405,7 +405,7 @@ impl Parser<'_> {
                 Pattern::MatchSingleton(ast::PatternMatchSingleton {
                     value: Singleton::False,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::String | TokenKind::FStringStart | TokenKind::TStringStart => {
@@ -414,7 +414,7 @@ impl Parser<'_> {
                 Pattern::MatchValue(ast::PatternMatchValue {
                     value: Box::new(str),
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Complex => {
@@ -427,10 +427,10 @@ impl Parser<'_> {
                     value: Box::new(Expr::NumberLiteral(ast::ExprNumberLiteral {
                         value: Number::Complex { real, imag },
                         range,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Int => {
@@ -443,10 +443,10 @@ impl Parser<'_> {
                     value: Box::new(Expr::NumberLiteral(ast::ExprNumberLiteral {
                         value: Number::Int(value),
                         range,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Float => {
@@ -459,10 +459,10 @@ impl Parser<'_> {
                     value: Box::new(Expr::NumberLiteral(ast::ExprNumberLiteral {
                         value: Number::Float(value),
                         range,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             kind => {
@@ -489,7 +489,7 @@ impl Parser<'_> {
                         return Pattern::MatchValue(ast::PatternMatchValue {
                             value: Box::new(Expr::UnaryOp(unary_expr)),
                             range: self.node_range(start),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         });
                     }
                 }
@@ -509,7 +509,7 @@ impl Parser<'_> {
                         Pattern::MatchValue(ast::PatternMatchValue {
                             value: Box::new(attribute),
                             range: self.node_range(start),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         })
                     } else {
                         // test_ok match_as_pattern_soft_keyword
@@ -530,7 +530,7 @@ impl Parser<'_> {
                             range: ident.range,
                             pattern: None,
                             name: if &ident == "_" { None } else { Some(ident) },
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         })
                     }
                 } else {
@@ -544,12 +544,12 @@ impl Parser<'_> {
                         range: self.missing_node_range(),
                         id: Name::empty(),
                         ctx: ExprContext::Invalid,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     });
                     Pattern::MatchValue(ast::PatternMatchValue {
                         range: invalid_node.range(),
                         value: Box::new(invalid_node),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })
                 }
             }
@@ -605,10 +605,10 @@ impl Parser<'_> {
                 op: operator,
                 right: rhs_value,
                 range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             })),
             range,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -648,14 +648,14 @@ impl Parser<'_> {
                         range: ident.range(),
                         id: ident.id,
                         ctx: ExprContext::Load,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     }))
                 } else {
                     Box::new(Expr::Name(ast::ExprName {
                         range: ident.range(),
                         id: Name::empty(),
                         ctx: ExprContext::Invalid,
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     }))
                 }
             }
@@ -707,7 +707,7 @@ impl Parser<'_> {
                         ast::Identifier {
                             id: Name::empty(),
                             range: parser.missing_node_range(),
-                            node_index: AtomicNodeIndex::dummy(),
+                            node_index: AtomicNodeIndex::NONE,
                         }
                     };
 
@@ -717,7 +717,7 @@ impl Parser<'_> {
                         attr: key,
                         pattern: value_pattern,
                         range: parser.node_range(pattern_start),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     });
                 } else {
                     has_seen_pattern = true;
@@ -743,10 +743,10 @@ impl Parser<'_> {
                 patterns,
                 keywords,
                 range: self.node_range(arguments_start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             },
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 }
diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap
index ab002c583a..714127298b 100644
--- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap
+++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap
@@ -4,7 +4,7 @@ expression: parsed.expr()
 ---
 Name(
     ExprName {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..5,
         id: Name("first"),
         ctx: Load,
diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap
index 8d6fbc000c..f181d200c0 100644
--- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap
+++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap
@@ -4,20 +4,20 @@ expression: parsed.syntax()
 ---
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..929,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..42,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..40,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 27..28,
                                     id: Name("a"),
                                     ctx: Load,
@@ -26,7 +26,7 @@ Module(
                             op: Mod,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 39..40,
                                     id: Name("b"),
                                     ctx: Load,
@@ -38,7 +38,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..73,
                     kind: Help2,
                     value: "a.foo",
@@ -46,7 +46,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..80,
                     kind: Help,
                     value: "a.foo",
@@ -54,7 +54,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 81..88,
                     kind: Help,
                     value: "a.foo",
@@ -62,7 +62,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 89..100,
                     kind: Help2,
                     value: "a.foo()",
@@ -70,7 +70,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 115..128,
                     kind: Magic,
                     value: "timeit a = b",
@@ -78,7 +78,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 129..147,
                     kind: Magic,
                     value: "timeit foo(b) % 3",
@@ -86,7 +86,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..176,
                     kind: Magic,
                     value: "alias showPath pwd && ls -a",
@@ -94,7 +94,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 177..205,
                     kind: Magic,
                     value: "timeit a =  foo(b); b = 2",
@@ -102,7 +102,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 206..226,
                     kind: Magic,
                     value: "matplotlib --inline",
@@ -110,7 +110,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 227..253,
                     kind: Magic,
                     value: "matplotlib     --inline",
@@ -118,7 +118,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 277..309,
                     kind: Shell,
                     value: "pwd && ls -a | sed 's/^/\\    /'",
@@ -126,7 +126,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 310..347,
                     kind: Shell,
                     value: "pwd   && ls -a | sed 's/^/\\\\    /'",
@@ -134,7 +134,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 348..393,
                     kind: ShCap,
                     value: "cd /Users/foo/Library/Application\\ Support/",
@@ -142,21 +142,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 566..626,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 570..573,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 573..575,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -167,16 +165,16 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 581..626,
                                 value: Some(
                                     Compare(
                                         ExprCompare {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 598..620,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 598..599,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -188,7 +186,7 @@ Module(
                                             comparators: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 619..620,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -205,7 +203,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 656..664,
                     kind: Paren,
                     value: "foo 1 2",
@@ -213,7 +211,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 665..673,
                     kind: Quote2,
                     value: "foo 1 2",
@@ -221,7 +219,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 674..682,
                     kind: Quote,
                     value: "foo 1 2",
@@ -229,12 +227,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 711..737,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 715..716,
                             id: Name("a"),
                             ctx: Store,
@@ -242,11 +240,11 @@ Module(
                     ),
                     iter: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 720..728,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 720..725,
                                     id: Name("range"),
                                     ctx: Load,
@@ -254,11 +252,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 725..728,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 726..727,
                                             value: Int(
                                                 5,
@@ -273,7 +271,7 @@ Module(
                     body: [
                         IpyEscapeCommand(
                             StmtIpyEscapeCommand {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 734..737,
                                 kind: Shell,
                                 value: "ls",
@@ -285,12 +283,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 739..748,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 739..741,
                                 id: Name("p1"),
                                 ctx: Store,
@@ -299,7 +297,7 @@ Module(
                     ],
                     value: IpyEscapeCommand(
                         ExprIpyEscapeCommand {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 744..748,
                             kind: Shell,
                             value: "pwd",
@@ -309,11 +307,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 749..763,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 749..751,
                             id: Name("p2"),
                             ctx: Store,
@@ -321,7 +319,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 753..756,
                             id: Name("str"),
                             ctx: Load,
@@ -330,7 +328,7 @@ Module(
                     value: Some(
                         IpyEscapeCommand(
                             ExprIpyEscapeCommand {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 759..763,
                                 kind: Shell,
                                 value: "pwd",
@@ -342,12 +340,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 764..784,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 764..767,
                                 id: Name("foo"),
                                 ctx: Store,
@@ -356,7 +354,7 @@ Module(
                     ],
                     value: IpyEscapeCommand(
                         ExprIpyEscapeCommand {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 770..784,
                             kind: Magic,
                             value: "foo     bar",
@@ -366,7 +364,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 786..791,
                     kind: Magic,
                     value: " foo",
@@ -374,12 +372,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 792..813,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 792..795,
                                 id: Name("foo"),
                                 ctx: Store,
@@ -388,7 +386,7 @@ Module(
                     ],
                     value: IpyEscapeCommand(
                         ExprIpyEscapeCommand {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 798..813,
                             kind: Magic,
                             value: "foo  # comment",
@@ -398,7 +396,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 838..842,
                     kind: Help,
                     value: "foo",
@@ -406,7 +404,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 843..852,
                     kind: Help2,
                     value: "foo.bar",
@@ -414,7 +412,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 853..865,
                     kind: Help,
                     value: "foo.bar.baz",
@@ -422,7 +420,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 866..874,
                     kind: Help2,
                     value: "foo[0]",
@@ -430,7 +428,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 875..885,
                     kind: Help,
                     value: "foo[0][1]",
@@ -438,7 +436,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 886..905,
                     kind: Help2,
                     value: "foo.bar[0].baz[1]",
@@ -446,7 +444,7 @@ Module(
             ),
             IpyEscapeCommand(
                 StmtIpyEscapeCommand {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 906..929,
                     kind: Help2,
                     value: "foo.bar[0].baz[2].egg",
diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap
index 6ee807fc8c..08e3e1b4f3 100644
--- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap
+++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap
@@ -5,12 +5,12 @@ expression: suite
 [
     Assign(
         StmtAssign {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..37,
             targets: [
                 Name(
                     ExprName {
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                         range: 0..1,
                         id: Name("x"),
                         ctx: Store,
@@ -19,18 +19,19 @@ expression: suite
             ],
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..37,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 4..37,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{8}another cool trick",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/parser/statement.rs b/crates/ruff_python_parser/src/parser/statement.rs
index d738fc78d6..134c9c40fd 100644
--- a/crates/ruff_python_parser/src/parser/statement.rs
+++ b/crates/ruff_python_parser/src/parser/statement.rs
@@ -312,7 +312,7 @@ impl<'src> Parser<'src> {
                     Stmt::Expr(ast::StmtExpr {
                         range: self.node_range(start),
                         value: Box::new(parsed_expr.expr),
-                        node_index: AtomicNodeIndex::dummy(),
+                        node_index: AtomicNodeIndex::NONE,
                     })
                 }
             }
@@ -368,7 +368,7 @@ impl<'src> Parser<'src> {
         ast::StmtDelete {
             targets,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -417,7 +417,7 @@ impl<'src> Parser<'src> {
         ast::StmtReturn {
             range: self.node_range(start),
             value,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -523,7 +523,7 @@ impl<'src> Parser<'src> {
             range: self.node_range(start),
             exc,
             cause,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -564,7 +564,7 @@ impl<'src> Parser<'src> {
         ast::StmtImport {
             range: self.node_range(start),
             names,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -676,7 +676,7 @@ impl<'src> Parser<'src> {
             names,
             level: leading_dots,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -693,11 +693,11 @@ impl<'src> Parser<'src> {
                 name: ast::Identifier {
                     id: Name::new_static("*"),
                     range,
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 },
                 asname: None,
                 range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             };
         }
 
@@ -730,7 +730,7 @@ impl<'src> Parser<'src> {
             range: self.node_range(start),
             name,
             asname,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -759,7 +759,7 @@ impl<'src> Parser<'src> {
         ast::Identifier {
             id: Name::from(dotted_name),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -775,7 +775,7 @@ impl<'src> Parser<'src> {
         self.bump(TokenKind::Pass);
         ast::StmtPass {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -791,7 +791,7 @@ impl<'src> Parser<'src> {
         self.bump(TokenKind::Continue);
         ast::StmtContinue {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -807,7 +807,7 @@ impl<'src> Parser<'src> {
         self.bump(TokenKind::Break);
         ast::StmtBreak {
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -857,7 +857,7 @@ impl<'src> Parser<'src> {
             test: Box::new(test.expr),
             msg,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -896,7 +896,7 @@ impl<'src> Parser<'src> {
         ast::StmtGlobal {
             range: self.node_range(start),
             names,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -942,7 +942,7 @@ impl<'src> Parser<'src> {
         ast::StmtNonlocal {
             range: self.node_range(start),
             names,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -995,7 +995,7 @@ impl<'src> Parser<'src> {
             type_params: type_params.map(Box::new),
             value: Box::new(value.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1022,7 +1022,7 @@ impl<'src> Parser<'src> {
             range,
             kind,
             value,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1119,7 +1119,7 @@ impl<'src> Parser<'src> {
             value: value.into_boxed_str(),
             kind,
             range: self.node_range(parsed_expr.start()),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1187,7 +1187,7 @@ impl<'src> Parser<'src> {
             targets,
             value: Box::new(value.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1267,7 +1267,7 @@ impl<'src> Parser<'src> {
             value,
             simple,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1322,7 +1322,7 @@ impl<'src> Parser<'src> {
             op,
             value: Box::new(value.expr),
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1378,7 +1378,7 @@ impl<'src> Parser<'src> {
             body,
             elif_else_clauses,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1422,7 +1422,7 @@ impl<'src> Parser<'src> {
             test,
             body,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1572,7 +1572,7 @@ impl<'src> Parser<'src> {
             finalbody,
             is_star,
             range: self.node_range(try_start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1722,7 +1722,7 @@ impl<'src> Parser<'src> {
                 name,
                 body: except_body,
                 range: self.node_range(start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }),
             block_kind,
         )
@@ -1834,7 +1834,7 @@ impl<'src> Parser<'src> {
             body,
             orelse,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -1882,7 +1882,7 @@ impl<'src> Parser<'src> {
             body,
             orelse,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2012,7 +2012,7 @@ impl<'src> Parser<'src> {
             is_async: false,
             returns,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2082,7 +2082,7 @@ impl<'src> Parser<'src> {
             type_params: type_params.map(Box::new),
             arguments,
             body,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2109,7 +2109,7 @@ impl<'src> Parser<'src> {
             body,
             is_async: false,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2130,7 +2130,7 @@ impl<'src> Parser<'src> {
         let open_paren_range = self.current_token_range();
 
         if self.at(TokenKind::Lpar) {
-            if let Some(items) = self.try_parse_parenthesized_with_items() {
+            if let (Some(items), has_trailing_comma) = self.try_parse_parenthesized_with_items() {
                 // test_ok tuple_context_manager_py38
                 // # parse_options: {"target-version": "3.8"}
                 // with (
@@ -2139,6 +2139,13 @@ impl<'src> Parser<'src> {
                 //   baz,
                 // ) as tup: ...
 
+                // test_ok single_parenthesized_item_context_manager_py38
+                // # parse_options: {"target-version": "3.8"}
+                // with (
+                //   open('foo.txt')) as foo: ...
+                // with (
+                //   open('foo.txt')): ...
+
                 // test_err tuple_context_manager_py38
                 // # parse_options: {"target-version": "3.8"}
                 // # these cases are _syntactically_ valid before Python 3.9 because the `with` item
@@ -2146,8 +2153,6 @@ impl<'src> Parser<'src> {
                 // # anyway
                 // with (foo, bar): ...
                 // with (
-                //   open('foo.txt')) as foo: ...
-                // with (
                 //   foo,
                 //   bar,
                 //   baz,
@@ -2165,10 +2170,12 @@ impl<'src> Parser<'src> {
                 // with (foo as x, bar as y): ...
                 // with (foo, bar as y): ...
                 // with (foo as x, bar): ...
-                self.add_unsupported_syntax_error(
-                    UnsupportedSyntaxErrorKind::ParenthesizedContextManager,
-                    open_paren_range,
-                );
+                if items.len() > 1 || has_trailing_comma {
+                    self.add_unsupported_syntax_error(
+                        UnsupportedSyntaxErrorKind::ParenthesizedContextManager,
+                        open_paren_range,
+                    );
+                }
 
                 self.expect(TokenKind::Rpar);
                 items
@@ -2228,7 +2235,7 @@ impl<'src> Parser<'src> {
     /// If the parser isn't positioned at a `(` token.
     ///
     /// See: <https://docs.python.org/3/reference/compound_stmts.html#grammar-token-python-grammar-with_stmt_contents>
-    fn try_parse_parenthesized_with_items(&mut self) -> Option<Vec<WithItem>> {
+    fn try_parse_parenthesized_with_items(&mut self) -> (Option<Vec<WithItem>>, bool) {
         let checkpoint = self.checkpoint();
 
         // We'll start with the assumption that the with items are parenthesized.
@@ -2245,11 +2252,12 @@ impl<'src> Parser<'src> {
         // with (item1, item2 item3, item4): ...
         // with (item1, item2 as f1 item3, item4): ...
         // with (item1, item2: ...
-        self.parse_comma_separated_list(RecoveryContextKind::WithItems(with_item_kind), |p| {
-            let parsed_with_item = p.parse_with_item(WithItemParsingState::Speculative);
-            has_optional_vars |= parsed_with_item.item.optional_vars.is_some();
-            parsed_with_items.push(parsed_with_item);
-        });
+        let has_trailing_comma =
+            self.parse_comma_separated_list(RecoveryContextKind::WithItems(with_item_kind), |p| {
+                let parsed_with_item = p.parse_with_item(WithItemParsingState::Speculative);
+                has_optional_vars |= parsed_with_item.item.optional_vars.is_some();
+                parsed_with_items.push(parsed_with_item);
+            });
 
         // Check if our assumption is incorrect and it's actually a parenthesized expression.
         if has_optional_vars {
@@ -2319,7 +2327,7 @@ impl<'src> Parser<'src> {
             with_item_kind = WithItemKind::ParenthesizedExpression;
         }
 
-        if with_item_kind.is_parenthesized() {
+        let with_items = if with_item_kind.is_parenthesized() {
             Some(
                 parsed_with_items
                     .into_iter()
@@ -2330,7 +2338,9 @@ impl<'src> Parser<'src> {
             self.rewind(checkpoint);
 
             None
-        }
+        };
+
+        (with_items, has_trailing_comma)
     }
 
     /// Parses a single `with` item.
@@ -2378,7 +2388,7 @@ impl<'src> Parser<'src> {
                 range: self.node_range(start),
                 context_expr: context_expr.expr,
                 optional_vars,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             },
         }
     }
@@ -2447,7 +2457,7 @@ impl<'src> Parser<'src> {
                     subject: Box::new(subject),
                     cases,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             TokenKind::Newline if matches!(self.peek2(), (TokenKind::Indent, TokenKind::Case)) => {
@@ -2470,7 +2480,7 @@ impl<'src> Parser<'src> {
                     subject: Box::new(subject),
                     cases,
                     range: self.node_range(start),
-                    node_index: AtomicNodeIndex::dummy(),
+                    node_index: AtomicNodeIndex::NONE,
                 })
             }
             _ => {
@@ -2518,7 +2528,7 @@ impl<'src> Parser<'src> {
             subject: Box::new(subject),
             cases,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2697,7 +2707,7 @@ impl<'src> Parser<'src> {
             guard,
             body,
             range: self.node_range(start),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -2866,7 +2876,7 @@ impl<'src> Parser<'src> {
             decorators.push(ast::Decorator {
                 expression: parsed_expr.expr,
                 range: self.node_range(decorator_start),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
 
             // test_err decorator_missing_newline
@@ -3080,7 +3090,7 @@ impl<'src> Parser<'src> {
             range: self.node_range(start),
             name,
             annotation,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -3130,7 +3140,7 @@ impl<'src> Parser<'src> {
             range: self.node_range(start),
             parameter,
             default,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -3448,7 +3458,7 @@ impl<'src> Parser<'src> {
         ast::TypeParams {
             range: self.node_range(start),
             type_params,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }
     }
 
@@ -3511,7 +3521,7 @@ impl<'src> Parser<'src> {
                 range: self.node_range(start),
                 name,
                 default,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             })
 
         // test_ok type_param_param_spec
@@ -3551,7 +3561,7 @@ impl<'src> Parser<'src> {
                 range: self.node_range(start),
                 name,
                 default,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             })
             // test_ok type_param_type_var
             // type X[T] = int
@@ -3635,7 +3645,7 @@ impl<'src> Parser<'src> {
                 name,
                 bound,
                 default,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             })
         }
     }
diff --git a/crates/ruff_python_parser/src/semantic_errors.rs b/crates/ruff_python_parser/src/semantic_errors.rs
index 6a3ce2a850..aba6e5ed7c 100644
--- a/crates/ruff_python_parser/src/semantic_errors.rs
+++ b/crates/ruff_python_parser/src/semantic_errors.rs
@@ -3,16 +3,16 @@
 //! This checker is not responsible for traversing the AST itself. Instead, its
 //! [`SemanticSyntaxChecker::visit_stmt`] and [`SemanticSyntaxChecker::visit_expr`] methods should
 //! be called in a parent `Visitor`'s `visit_stmt` and `visit_expr` methods, respectively.
-use std::fmt::Display;
-
 use ruff_python_ast::{
     self as ast, Expr, ExprContext, IrrefutablePatternKind, Pattern, PythonVersion, Stmt, StmtExpr,
     StmtImportFrom,
     comparable::ComparableExpr,
+    helpers,
     visitor::{Visitor, walk_expr},
 };
 use ruff_text_size::{Ranged, TextRange, TextSize};
 use rustc_hash::{FxBuildHasher, FxHashSet};
+use std::fmt::Display;
 
 #[derive(Debug, Default)]
 pub struct SemanticSyntaxChecker {
@@ -58,9 +58,59 @@ impl SemanticSyntaxChecker {
 
     fn check_stmt<Ctx: SemanticSyntaxContext>(&mut self, stmt: &ast::Stmt, ctx: &Ctx) {
         match stmt {
-            Stmt::ImportFrom(StmtImportFrom { range, module, .. }) => {
-                if self.seen_futures_boundary && matches!(module.as_deref(), Some("__future__")) {
-                    Self::add_error(ctx, SemanticSyntaxErrorKind::LateFutureImport, *range);
+            Stmt::ImportFrom(StmtImportFrom {
+                range,
+                module,
+                level,
+                names,
+                ..
+            }) => {
+                if matches!(module.as_deref(), Some("__future__")) {
+                    for name in names {
+                        if !is_known_future_feature(&name.name) {
+                            // test_ok valid_future_feature
+                            // from __future__ import annotations
+
+                            // test_err invalid_future_feature
+                            // from __future__ import invalid_feature
+                            // from __future__ import annotations, invalid_feature
+                            // from __future__ import invalid_feature_1, invalid_feature_2
+                            Self::add_error(
+                                ctx,
+                                SemanticSyntaxErrorKind::FutureFeatureNotDefined(
+                                    name.name.to_string(),
+                                ),
+                                name.range,
+                            );
+                        }
+                    }
+                    if self.seen_futures_boundary {
+                        Self::add_error(ctx, SemanticSyntaxErrorKind::LateFutureImport, *range);
+                    }
+                }
+                for alias in names {
+                    if alias.name.as_str() == "*" && !ctx.in_module_scope() {
+                        // test_err import_from_star
+                        // def f1():
+                        //     from module import *
+                        // class C:
+                        //     from module import *
+                        // def f2():
+                        //     from ..module import *
+                        // def f3():
+                        //     from module import *, *
+
+                        // test_ok import_from_star
+                        // from module import *
+                        Self::add_error(
+                            ctx,
+                            SemanticSyntaxErrorKind::NonModuleImportStar(
+                                helpers::format_import_from(*level, module.as_deref()).to_string(),
+                            ),
+                            *range,
+                        );
+                        break;
+                    }
                 }
             }
             Stmt::Match(match_stmt) => {
@@ -83,6 +133,17 @@ impl SemanticSyntaxChecker {
                 }
                 Self::duplicate_parameter_name(parameters, ctx);
             }
+            Stmt::Global(ast::StmtGlobal { names, .. }) => {
+                for name in names {
+                    if ctx.is_bound_parameter(name) {
+                        Self::add_error(
+                            ctx,
+                            SemanticSyntaxErrorKind::GlobalParameter(name.to_string()),
+                            name.range,
+                        );
+                    }
+                }
+            }
             Stmt::ClassDef(ast::StmtClassDef { type_params, .. })
             | Stmt::TypeAlias(ast::StmtTypeAlias { type_params, .. }) => {
                 if let Some(type_params) = type_params {
@@ -174,6 +235,16 @@ impl SemanticSyntaxChecker {
                     );
                 }
             }
+            Stmt::Break(ast::StmtBreak { range, .. }) => {
+                if !ctx.in_loop_context() {
+                    Self::add_error(ctx, SemanticSyntaxErrorKind::BreakOutsideLoop, *range);
+                }
+            }
+            Stmt::Continue(ast::StmtContinue { range, .. }) => {
+                if !ctx.in_loop_context() {
+                    Self::add_error(ctx, SemanticSyntaxErrorKind::ContinueOutsideLoop, *range);
+                }
+            }
             _ => {}
         }
 
@@ -359,6 +430,40 @@ impl SemanticSyntaxChecker {
         }
     }
 
+    fn multiple_star_expression<Ctx: SemanticSyntaxContext>(
+        ctx: &Ctx,
+        expr_ctx: ExprContext,
+        elts: &[Expr],
+        range: TextRange,
+    ) {
+        if expr_ctx.is_store() {
+            let mut has_starred = false;
+            for elt in elts {
+                if elt.is_starred_expr() {
+                    if has_starred {
+                        // test_err multiple_starred_assignment_target
+                        // (*a, *b) = (1, 2)
+                        // [*a, *b] = (1, 2)
+                        // (*a, *b, c) = (1, 2, 3)
+                        // [*a, *b, c] = (1, 2, 3)
+                        // (*a, *b, (*c, *d)) = (1, 2)
+
+                        // test_ok multiple_starred_assignment_target
+                        // (*a, b) = (1, 2)
+                        // (*_, normed), *_ = [(1,), 2]
+                        Self::add_error(
+                            ctx,
+                            SemanticSyntaxErrorKind::MultipleStarredExpressions,
+                            range,
+                        );
+                        return;
+                    }
+                    has_starred = true;
+                }
+            }
+        }
+    }
+
     /// Check for [`SemanticSyntaxErrorKind::WriteToDebug`] in `stmt`.
     fn debug_shadowing<Ctx: SemanticSyntaxContext>(stmt: &ast::Stmt, ctx: &Ctx) {
         match stmt {
@@ -709,11 +814,35 @@ impl SemanticSyntaxChecker {
             }
             Expr::YieldFrom(_) => {
                 Self::yield_outside_function(ctx, expr, YieldOutsideFunctionKind::YieldFrom);
+                if ctx.in_function_scope() && ctx.in_async_context() {
+                    // test_err yield_from_in_async_function
+                    // async def f(): yield from x
+
+                    Self::add_error(
+                        ctx,
+                        SemanticSyntaxErrorKind::YieldFromInAsyncFunction,
+                        expr.range(),
+                    );
+                }
             }
             Expr::Await(_) => {
                 Self::yield_outside_function(ctx, expr, YieldOutsideFunctionKind::Await);
                 Self::await_outside_async_function(ctx, expr, AwaitOutsideAsyncFunctionKind::Await);
             }
+            Expr::Tuple(ast::ExprTuple {
+                elts,
+                ctx: expr_ctx,
+                range,
+                ..
+            })
+            | Expr::List(ast::ExprList {
+                elts,
+                ctx: expr_ctx,
+                range,
+                ..
+            }) => {
+                Self::multiple_star_expression(ctx, *expr_ctx, elts, *range);
+            }
             Expr::Lambda(ast::ExprLambda {
                 parameters: Some(parameters),
                 ..
@@ -890,6 +1019,22 @@ impl SemanticSyntaxChecker {
     }
 }
 
+fn is_known_future_feature(name: &str) -> bool {
+    matches!(
+        name,
+        "nested_scopes"
+            | "generators"
+            | "division"
+            | "absolute_import"
+            | "with_statement"
+            | "print_function"
+            | "unicode_literals"
+            | "barry_as_FLUFL"
+            | "generator_stop"
+            | "annotations"
+    )
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
 pub struct SemanticSyntaxError {
     pub kind: SemanticSyntaxErrorKind,
@@ -989,6 +1134,26 @@ impl Display for SemanticSyntaxError {
             SemanticSyntaxErrorKind::AnnotatedNonlocal(name) => {
                 write!(f, "annotated name `{name}` can't be nonlocal")
             }
+            SemanticSyntaxErrorKind::YieldFromInAsyncFunction => {
+                f.write_str("`yield from` statement in async function; use `async for` instead")
+            }
+            SemanticSyntaxErrorKind::NonModuleImportStar(name) => {
+                write!(f, "`from {name} import *` only allowed at module level")
+            }
+            SemanticSyntaxErrorKind::MultipleStarredExpressions => {
+                write!(f, "Two starred expressions in assignment")
+            }
+            SemanticSyntaxErrorKind::FutureFeatureNotDefined(name) => {
+                write!(f, "Future feature `{name}` is not defined")
+            }
+            SemanticSyntaxErrorKind::BreakOutsideLoop => f.write_str("`break` outside loop"),
+            SemanticSyntaxErrorKind::ContinueOutsideLoop => f.write_str("`continue` outside loop"),
+            SemanticSyntaxErrorKind::GlobalParameter(name) => {
+                write!(f, "name `{name}` is parameter and global")
+            }
+            SemanticSyntaxErrorKind::DifferentMatchPatternBindings => {
+                write!(f, "alternative patterns bind different names")
+            }
         }
     }
 }
@@ -1346,6 +1511,49 @@ pub enum SemanticSyntaxErrorKind {
 
     /// Represents a type annotation on a variable that's been declared nonlocal
     AnnotatedNonlocal(String),
+
+    /// Represents the use of `yield from` inside an asynchronous function.
+    YieldFromInAsyncFunction,
+
+    /// Represents the use of `from <module> import *` outside module scope.
+    NonModuleImportStar(String),
+
+    /// Represents the use of more than one starred expression in an assignment.
+    ///
+    /// Python only allows a single starred target when unpacking values on the
+    /// left-hand side of an assignment. Using multiple starred expressions makes
+    /// the statement invalid and results in a `SyntaxError`.
+    MultipleStarredExpressions,
+
+    /// Represents the use of a `__future__` feature that is not defined.
+    FutureFeatureNotDefined(String),
+
+    /// Represents the use of a `break` statement outside of a loop.
+    BreakOutsideLoop,
+
+    /// Represents the use of a `continue` statement outside of a loop.
+    ContinueOutsideLoop,
+
+    /// Represents a function parameter that is also declared as `global`.
+    ///
+    /// Declaring a parameter as `global` is invalid, since parameters are already
+    /// bound in the local scope of the function. Using `global` on them introduces
+    /// ambiguity and will result in a `SyntaxError`.
+    GlobalParameter(String),
+
+    /// Represents the use of alternative patterns in a `match` statement that bind different names.
+    ///
+    /// Python requires all alternatives in an OR pattern (`|`) to bind the same set of names.
+    /// Using different names results in a `SyntaxError`.
+    ///
+    /// ## Example:
+    ///
+    /// ```python
+    /// match 5:
+    ///     case [x] | [y]:  # error
+    ///         ...
+    /// ```
+    DifferentMatchPatternBindings,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, get_size2::GetSize)]
@@ -1588,7 +1796,9 @@ impl<'a, Ctx: SemanticSyntaxContext> MatchPatternVisitor<'a, Ctx> {
                     self.insert(name);
                 }
             }
-            Pattern::MatchOr(ast::PatternMatchOr { patterns, .. }) => {
+            Pattern::MatchOr(ast::PatternMatchOr {
+                patterns, range, ..
+            }) => {
                 // each of these patterns should be visited separately because patterns can only be
                 // duplicated within a single arm of the or pattern. For example, the case below is
                 // a valid pattern.
@@ -1596,12 +1806,48 @@ impl<'a, Ctx: SemanticSyntaxContext> MatchPatternVisitor<'a, Ctx> {
                 // test_ok multiple_assignment_in_case_pattern
                 // match 2:
                 //     case Class(x) | [x] | x: ...
+
+                let mut previous_names: Option<FxHashSet<&ast::name::Name>> = None;
                 for pattern in patterns {
                     let mut visitor = Self {
                         names: FxHashSet::default(),
                         ctx: self.ctx,
                     };
                     visitor.visit_pattern(pattern);
+                    let Some(prev) = &previous_names else {
+                        previous_names = Some(visitor.names);
+                        continue;
+                    };
+                    if prev.symmetric_difference(&visitor.names).next().is_some() {
+                        // test_err different_match_pattern_bindings
+                        // match x:
+                        //     case [a] | [b]: ...
+                        //     case [a] | []: ...
+                        //     case (x, y) | (x,): ...
+                        //     case [a, _] | [a, b]: ...
+                        //     case (x, (y | z)): ...
+                        //     case [a] | [b] | [c]: ...
+                        //     case [] | [a]: ...
+                        //     case [a] | [C(x)]: ...
+                        //     case [[a] | [b]]: ...
+                        //     case [C(a)] | [C(b)]: ...
+                        //     case [C(D(a))] | [C(D(b))]: ...
+                        //     case [(a, b)] | [(c, d)]: ...
+
+                        // test_ok different_match_pattern_bindings
+                        // match x:
+                        //     case [a] | [a]: ...
+                        //     case (x, y) | (x, y): ...
+                        //     case (x, (y | y)): ...
+                        //     case [a, _] | [a, _]: ...
+                        //     case [a] | [C(a)]: ...
+                        SemanticSyntaxChecker::add_error(
+                            self.ctx,
+                            SemanticSyntaxErrorKind::DifferentMatchPatternBindings,
+                            *range,
+                        );
+                        break;
+                    }
                 }
             }
         }
@@ -1827,6 +2073,10 @@ pub trait SemanticSyntaxContext {
     fn in_notebook(&self) -> bool;
 
     fn report_semantic_error(&self, error: SemanticSyntaxError);
+
+    fn in_loop_context(&self) -> bool;
+
+    fn is_bound_parameter(&self, name: &str) -> bool;
 }
 
 /// Modified version of [`std::str::EscapeDefault`] that does not escape single or double quotes.
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_newline_format_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_newline_format_spec.snap
index 868a705a31..4f6fb2e8cc 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_newline_format_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_newline_format_spec.snap
@@ -44,11 +44,16 @@ expression: "lex_invalid(source, Mode::Module)"
         12..13,
     ),
     (
-        Unknown,
+        InterpolatedStringMiddle(
+            "d",
+        ),
         13..14,
+        TokenFlags(
+            F_STRING,
+        ),
     ),
     (
-        NonLogicalNewline,
+        Newline,
         14..15,
     ),
     (
@@ -62,8 +67,13 @@ expression: "lex_invalid(source, Mode::Module)"
         16..18,
     ),
     (
-        Unknown,
+        String(
+            "",
+        ),
         18..19,
+        TokenFlags(
+            UNCLOSED_STRING,
+        ),
     ),
     (
         Newline,
@@ -104,13 +114,22 @@ expression: "lex_invalid(source, Mode::Module)"
         31..32,
     ),
     (
-        Unknown,
+        InterpolatedStringMiddle(
+            "a",
+        ),
         32..33,
+        TokenFlags(
+            F_STRING,
+        ),
     ),
     (
-        NonLogicalNewline,
+        Newline,
         33..34,
     ),
+    (
+        Indent,
+        34..42,
+    ),
     (
         Name(
             Name("b"),
@@ -118,9 +137,13 @@ expression: "lex_invalid(source, Mode::Module)"
         42..43,
     ),
     (
-        NonLogicalNewline,
+        Newline,
         43..44,
     ),
+    (
+        Dedent,
+        44..44,
+    ),
     (
         Rbrace,
         44..45,
@@ -132,8 +155,13 @@ expression: "lex_invalid(source, Mode::Module)"
         45..47,
     ),
     (
-        Unknown,
+        String(
+            "",
+        ),
         47..48,
+        TokenFlags(
+            UNCLOSED_STRING,
+        ),
     ),
     (
         Newline,
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__tstring_newline_format_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__tstring_newline_format_spec.snap
index c4db37da4c..810ce6592e 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__tstring_newline_format_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__tstring_newline_format_spec.snap
@@ -44,11 +44,16 @@ expression: "lex_invalid(source, Mode::Module)"
         12..13,
     ),
     (
-        Unknown,
+        InterpolatedStringMiddle(
+            "d",
+        ),
         13..14,
+        TokenFlags(
+            T_STRING,
+        ),
     ),
     (
-        NonLogicalNewline,
+        Newline,
         14..15,
     ),
     (
@@ -62,8 +67,13 @@ expression: "lex_invalid(source, Mode::Module)"
         16..18,
     ),
     (
-        Unknown,
+        String(
+            "",
+        ),
         18..19,
+        TokenFlags(
+            UNCLOSED_STRING,
+        ),
     ),
     (
         Newline,
@@ -104,13 +114,22 @@ expression: "lex_invalid(source, Mode::Module)"
         31..32,
     ),
     (
-        Unknown,
+        InterpolatedStringMiddle(
+            "a",
+        ),
         32..33,
+        TokenFlags(
+            T_STRING,
+        ),
     ),
     (
-        NonLogicalNewline,
+        Newline,
         33..34,
     ),
+    (
+        Indent,
+        34..42,
+    ),
     (
         Name(
             Name("b"),
@@ -118,9 +137,13 @@ expression: "lex_invalid(source, Mode::Module)"
         42..43,
     ),
     (
-        NonLogicalNewline,
+        Newline,
         43..44,
     ),
+    (
+        Dedent,
+        44..44,
+    ),
     (
         Rbrace,
         44..45,
@@ -132,8 +155,13 @@ expression: "lex_invalid(source, Mode::Module)"
         45..47,
     ),
     (
-        Unknown,
+        String(
+            "",
+        ),
         47..48,
+        TokenFlags(
+            UNCLOSED_STRING,
+        ),
     ),
     (
         Newline,
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap
index 04e5596e74..c6c8e9cf85 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..15,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{8}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap
index 8f28967afe..5c6fd12129 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..9,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{7}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap
index 258440c8d4..56bda12a56 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..21,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..21,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..21,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\r",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap
index 447e6a7e41..783e8c736e 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..45,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..45,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..45,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{89}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap
index ac810427d1..68c017dfc7 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..12,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{7f}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap
index ccac176830..5e04b08423 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap
@@ -5,12 +5,12 @@ expression: suite
 [
     Assign(
         StmtAssign {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..16,
             targets: [
                 Name(
                     ExprName {
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                         range: 0..4,
                         id: Name("bold"),
                         ctx: Store,
@@ -19,18 +19,19 @@ expression: suite
             ],
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..16,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 7..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{3}8[1m",
                                 flags: StringLiteralFlags {
                                     quote_style: Single,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap
index 59f9b5213b..0b61a51378 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap
@@ -5,17 +5,17 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..738,
             value: BytesLiteral(
                 ExprBytesLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..738,
                     value: BytesLiteralValue {
                         inner: Single(
                             BytesLiteral {
                                 range: 0..738,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: [
                                     0,
                                     1,
@@ -278,6 +278,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap
index 4f706e1fde..e271519126 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..12,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{1b}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap
index aad2af9894..36ed21596e 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap
@@ -5,17 +5,17 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: BytesLiteral(
                 ExprBytesLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: BytesLiteralValue {
                         inner: Single(
                             BytesLiteral {
                                 range: 0..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: [
                                     111,
                                     109,
@@ -32,6 +32,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap
index cfc7e3ee09..f4f90563ab 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap
@@ -5,17 +5,17 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..14,
             value: BytesLiteral(
                 ExprBytesLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     value: BytesLiteralValue {
                         inner: Single(
                             BytesLiteral {
                                 range: 0..14,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: [
                                     35,
                                     97,
@@ -27,6 +27,7 @@ expression: suite
                                     quote_style: Single,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap
index 21c8747c01..a2121c46f8 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..15,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{c}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap
index b418df379e..a04a2f4118 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap
@@ -5,33 +5,33 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..22,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..22,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 2..5,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "aaa",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 5..10,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 6..9,
                                                         id: Name("bbb"),
                                                         ctx: Load,
@@ -45,17 +45,17 @@ expression: suite
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 10..13,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "ccc",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 13..18,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 14..17,
                                                         id: Name("ddd"),
                                                         ctx: Load,
@@ -69,7 +69,7 @@ expression: suite
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 18..21,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "eee",
                                             },
                                         ),
@@ -78,6 +78,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap
index 8cb891a551..c356bd1c08 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap
@@ -5,33 +5,33 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..8,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..8,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 2..4,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "\\",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 4..7,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5..6,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -47,6 +47,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap
index b1df67c78f..998a2269ed 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap
@@ -5,33 +5,33 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..8,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..8,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 2..4,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "\n",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 4..7,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5..6,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -47,6 +47,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap
index c3fd51c096..44540b29c3 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap
@@ -5,33 +5,33 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..9,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 3..5,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "\\\n",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 5..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 6..7,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -49,6 +49,7 @@ expression: suite
                                             uppercase_r: false,
                                         },
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap
index 35e090916c..e1a4f80cca 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..10,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..9,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..7,
                                                         id: Name("user"),
                                                         ctx: Load,
@@ -45,6 +45,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap
index e05de72bc4..a6617dd01c 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap
@@ -5,33 +5,33 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..38,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..38,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..38,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 2..6,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "mix ",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 6..13,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 7..11,
                                                         id: Name("user"),
                                                         ctx: Load,
@@ -50,17 +50,17 @@ expression: suite
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 13..28,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: " with text and ",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 28..37,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 29..35,
                                                         id: Name("second"),
                                                         ctx: Load,
@@ -81,6 +81,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap
index 932339c359..861fc69c1c 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..14,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..14,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..13,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..7,
                                                         id: Name("user"),
                                                         ctx: Load,
@@ -40,12 +40,12 @@ expression: suite
                                                 format_spec: Some(
                                                     InterpolatedStringFormatSpec {
                                                         range: 9..12,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         elements: [
                                                             Literal(
                                                                 InterpolatedStringLiteralElement {
                                                                     range: 9..12,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: ">10",
                                                                 },
                                                             ),
@@ -59,6 +59,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap
index f651b99dff..0e871901fc 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap
@@ -5,33 +5,33 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..11,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..11,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 4..5,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "\n",
                                             },
                                         ),
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 5..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 6..7,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -47,6 +47,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: true,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap
index 4d694d9dca..392be7a93c 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..9,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "\u{88}",
                                 flags: StringLiteralFlags {
                                     quote_style: Double,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap
index 52bb0728d3..db0275af32 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap
@@ -5,23 +5,24 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..3,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..3,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [],
                                     flags: FStringFlags {
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap
index 8a95e3a166..bfb2d6218a 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..3,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..3,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [],
                                 flags: TStringFlags {
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap
index 291eb7e8f4..b5a212b25b 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..17,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: FStringValue {
                         inner: Concatenated(
@@ -17,24 +17,25 @@ expression: suite
                                 Literal(
                                     StringLiteral {
                                         range: 0..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 FString(
                                     FString {
                                         range: 9..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 11..16,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "world",
                                                 },
                                             ),
@@ -43,6 +44,7 @@ expression: suite
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap
index 291eb7e8f4..b5a212b25b 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..17,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: FStringValue {
                         inner: Concatenated(
@@ -17,24 +17,25 @@ expression: suite
                                 Literal(
                                     StringLiteral {
                                         range: 0..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 FString(
                                     FString {
                                         range: 9..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 11..16,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "world",
                                                 },
                                             ),
@@ -43,6 +44,7 @@ expression: suite
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap
index 66e0a2cbd9..c0997152c4 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..22,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     value: FStringValue {
                         inner: Concatenated(
@@ -17,45 +17,47 @@ expression: suite
                                 Literal(
                                     StringLiteral {
                                         range: 0..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 FString(
                                     FString {
                                         range: 9..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 11..16,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "world",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 16..21,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 17..20,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 17..20,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "!",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -72,6 +74,7 @@ expression: suite
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap
index d7830a63d0..e9634e20e3 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..31,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..31,
                     value: FStringValue {
                         inner: Concatenated(
@@ -17,45 +17,47 @@ expression: suite
                                 Literal(
                                     StringLiteral {
                                         range: 0..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 FString(
                                     FString {
                                         range: 9..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 11..16,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "world",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 16..21,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 17..20,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 17..20,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "!",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -72,18 +74,20 @@ expression: suite
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 Literal(
                                     StringLiteral {
                                         range: 23..31,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "again!",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap
index d4d4e01a4a..7123b8431c 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..18,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..18,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..5,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..4,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -38,10 +38,10 @@ expression: suite
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 5..10,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 7..8,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -55,7 +55,7 @@ expression: suite
                                         Literal(
                                             InterpolatedStringLiteralElement {
                                                 range: 10..17,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "{foo}",
                                             },
                                         ),
@@ -64,6 +64,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap
index 93333df2aa..7a9edf207f 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap
@@ -5,30 +5,30 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..13,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..12,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Compare(
                                                     ExprCompare {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..11,
                                                         left: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..5,
                                                                 value: Int(
                                                                     42,
@@ -41,7 +41,7 @@ expression: suite
                                                         comparators: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 9..11,
                                                                     value: Int(
                                                                         42,
@@ -61,6 +61,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap
index 2e0f5c6474..7bfb2a5b22 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..16,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..16,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..15,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..6,
                                                         id: Name("foo"),
                                                         ctx: Load,
@@ -35,15 +35,15 @@ expression: suite
                                                 format_spec: Some(
                                                     InterpolatedStringFormatSpec {
                                                         range: 7..14,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         elements: [
                                                             Interpolation(
                                                                 InterpolatedElement {
                                                                     range: 7..14,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     expression: StringLiteral(
                                                                         ExprStringLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 8..13,
                                                                             value: StringLiteralValue {
                                                                                 inner: Concatenated(
@@ -51,22 +51,24 @@ expression: suite
                                                                                         strings: [
                                                                                             StringLiteral {
                                                                                                 range: 8..10,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "",
                                                                                                 flags: StringLiteralFlags {
                                                                                                     quote_style: Single,
                                                                                                     prefix: Empty,
                                                                                                     triple_quoted: false,
+                                                                                                    unclosed: false,
                                                                                                 },
                                                                                             },
                                                                                             StringLiteral {
                                                                                                 range: 11..13,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "",
                                                                                                 flags: StringLiteralFlags {
                                                                                                     quote_style: Single,
                                                                                                     prefix: Empty,
                                                                                                     triple_quoted: false,
+                                                                                                    unclosed: false,
                                                                                                 },
                                                                                             },
                                                                                         ],
@@ -91,6 +93,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap
index 479ea844b6..f938542df6 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..15,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..15,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..14,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..6,
                                                         id: Name("foo"),
                                                         ctx: Load,
@@ -35,15 +35,15 @@ expression: suite
                                                 format_spec: Some(
                                                     InterpolatedStringFormatSpec {
                                                         range: 7..13,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         elements: [
                                                             Interpolation(
                                                                 InterpolatedElement {
                                                                     range: 7..13,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     expression: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 8..12,
                                                                             id: Name("spec"),
                                                                             ctx: Load,
@@ -64,6 +64,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap
index c9ef305e70..66f2aecbec 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..13,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..12,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..6,
                                                         id: Name("foo"),
                                                         ctx: Load,
@@ -35,26 +35,27 @@ expression: suite
                                                 format_spec: Some(
                                                     InterpolatedStringFormatSpec {
                                                         range: 7..11,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         elements: [
                                                             Interpolation(
                                                                 InterpolatedElement {
                                                                     range: 7..11,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     expression: StringLiteral(
                                                                         ExprStringLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 8..10,
                                                                             value: StringLiteralValue {
                                                                                 inner: Single(
                                                                                     StringLiteral {
                                                                                         range: 8..10,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         value: "",
                                                                                         flags: StringLiteralFlags {
                                                                                             quote_style: Single,
                                                                                             prefix: Empty,
                                                                                             triple_quoted: false,
+                                                                                            unclosed: false,
                                                                                         },
                                                                                     },
                                                                                 ),
@@ -76,6 +77,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap
index 42ef942c16..3ab964282e 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap
@@ -5,30 +5,30 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..11,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..11,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..10,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Compare(
                                                     ExprCompare {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..9,
                                                         left: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..4,
                                                                 value: Int(
                                                                     1,
@@ -41,7 +41,7 @@ expression: suite
                                                         comparators: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 8..9,
                                                                     value: Int(
                                                                         2,
@@ -61,6 +61,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap
index 3b428b4148..b9a2229626 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..13,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..12,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..6,
                                                         id: Name("foo"),
                                                         ctx: Load,
@@ -35,12 +35,12 @@ expression: suite
                                                 format_spec: Some(
                                                     InterpolatedStringFormatSpec {
                                                         range: 7..11,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         elements: [
                                                             Literal(
                                                                 InterpolatedStringLiteralElement {
                                                                     range: 7..11,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "spec",
                                                                 },
                                                             ),
@@ -54,6 +54,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap
index 764c3768a4..43ce4660a4 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..10,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..9,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..4,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -45,6 +45,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap
index 869d7ff2d3..766de86c5f 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..10,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..9,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..4,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -45,6 +45,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap
index 1989651e7f..1f59b2a5ba 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..10,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 2..9,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Yield(
                                                     ExprYield {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3..8,
                                                         value: None,
                                                     },
@@ -39,6 +39,7 @@ expression: suite
                                         quote_style: Double,
                                         prefix: Regular,
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap
index c5e7745a97..8b7e266d6d 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..16,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     value: StringLiteralValue {
                         inner: Concatenated(
@@ -17,22 +17,24 @@ expression: suite
                                 strings: [
                                     StringLiteral {
                                         range: 0..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                     StringLiteral {
                                         range: 9..16,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "world",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ],
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap
index 295d3fd634..bbacfc3e4a 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..20,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..20,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "Hello, world!",
                                 flags: StringLiteralFlags {
                                     quote_style: Single,
                                     prefix: Unicode,
                                     triple_quoted: true,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap
index f7e45b3308..67b4c41365 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..18,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..5,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..4,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -37,10 +37,10 @@ expression: suite
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 5..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 7..8,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -54,7 +54,7 @@ expression: suite
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 10..17,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "{foo}",
                                         },
                                     ),
@@ -63,6 +63,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap
index 655c257691..c7baa8a513 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap
@@ -5,29 +5,29 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Compare(
                                                 ExprCompare {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..11,
                                                     left: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3..5,
                                                             value: Int(
                                                                 42,
@@ -40,7 +40,7 @@ expression: suite
                                                     comparators: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 9..11,
                                                                 value: Int(
                                                                     42,
@@ -60,6 +60,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap
index 8b719bdbef..93cfa48dd1 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..16,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..15,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..6,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -34,15 +34,15 @@ expression: suite
                                             format_spec: Some(
                                                 InterpolatedStringFormatSpec {
                                                     range: 7..14,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Interpolation(
                                                             InterpolatedElement {
                                                                 range: 7..14,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 expression: StringLiteral(
                                                                     ExprStringLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 8..13,
                                                                         value: StringLiteralValue {
                                                                             inner: Concatenated(
@@ -50,22 +50,24 @@ expression: suite
                                                                                     strings: [
                                                                                         StringLiteral {
                                                                                             range: 8..10,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Single,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                         StringLiteral {
                                                                                             range: 11..13,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Single,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ],
@@ -90,6 +92,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap
index 11102f6346..70f42c3139 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..15,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..14,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..6,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -34,15 +34,15 @@ expression: suite
                                             format_spec: Some(
                                                 InterpolatedStringFormatSpec {
                                                     range: 7..13,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Interpolation(
                                                             InterpolatedElement {
                                                                 range: 7..13,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 expression: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 8..12,
                                                                         id: Name("spec"),
                                                                         ctx: Load,
@@ -63,6 +63,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap
index 789ef89073..38b4e902ba 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..6,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -34,26 +34,27 @@ expression: suite
                                             format_spec: Some(
                                                 InterpolatedStringFormatSpec {
                                                     range: 7..11,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Interpolation(
                                                             InterpolatedElement {
                                                                 range: 7..11,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 expression: StringLiteral(
                                                                     ExprStringLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 8..10,
                                                                         value: StringLiteralValue {
                                                                             inner: Single(
                                                                                 StringLiteral {
                                                                                     range: 8..10,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: "",
                                                                                     flags: StringLiteralFlags {
                                                                                         quote_style: Single,
                                                                                         prefix: Empty,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -75,6 +76,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap
index 151ac16383..bf1180fe07 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap
@@ -5,29 +5,29 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..11,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..11,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Compare(
                                                 ExprCompare {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..9,
                                                     left: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3..4,
                                                             value: Int(
                                                                 1,
@@ -40,7 +40,7 @@ expression: suite
                                                     comparators: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 8..9,
                                                                 value: Int(
                                                                     2,
@@ -60,6 +60,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap
index 38fb62b089..32d1997a5a 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..13,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..6,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -34,12 +34,12 @@ expression: suite
                                             format_spec: Some(
                                                 InterpolatedStringFormatSpec {
                                                     range: 7..11,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Literal(
                                                             InterpolatedStringLiteralElement {
                                                                 range: 7..11,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "spec",
                                                             },
                                                         ),
@@ -53,6 +53,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap
index b1972bb8c2..102f40910a 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..4,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -44,6 +44,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap
index 0abdf4feea..24b1b36cd8 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..4,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -44,6 +44,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap
index 2efd41e5a3..b16d33cefb 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..8,
                                                     value: None,
                                                 },
@@ -38,6 +38,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap
index 0b9244c730..ac951c2811 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..18,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     value: FStringValue {
                         inner: Concatenated(
@@ -17,24 +17,25 @@ expression: suite
                                 Literal(
                                     StringLiteral {
                                         range: 0..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Unicode,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 FString(
                                     FString {
                                         range: 10..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 12..17,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "world",
                                                 },
                                             ),
@@ -43,6 +44,7 @@ expression: suite
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap
index 76de944bab..21f69ed5ed 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..22,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     value: FStringValue {
                         inner: Concatenated(
@@ -17,24 +17,25 @@ expression: suite
                                 Literal(
                                     StringLiteral {
                                         range: 0..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Unicode,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 FString(
                                     FString {
                                         range: 10..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 12..17,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "world",
                                                 },
                                             ),
@@ -43,18 +44,20 @@ expression: suite
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
                                 Literal(
                                     StringLiteral {
                                         range: 19..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "!",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap
index b6c48ef5d8..6c75165710 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..17,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: StringLiteralValue {
                         inner: Concatenated(
@@ -17,22 +17,24 @@ expression: suite
                                 strings: [
                                     StringLiteral {
                                         range: 0..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                     StringLiteral {
                                         range: 9..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "world",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Unicode,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ],
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap
index 7ad459df3f..aca2fefc21 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap
@@ -5,11 +5,11 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..17,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: StringLiteralValue {
                         inner: Concatenated(
@@ -17,22 +17,24 @@ expression: suite
                                 strings: [
                                     StringLiteral {
                                         range: 0..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello ",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Unicode,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                     StringLiteral {
                                         range: 10..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "world",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ],
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap
index 8c3cd6bc04..68e5a30fee 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap
@@ -5,17 +5,17 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..8,
             value: BytesLiteral(
                 ExprBytesLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: BytesLiteralValue {
                         inner: Single(
                             BytesLiteral {
                                 range: 0..8,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: [
                                     92,
                                     120,
@@ -28,6 +28,7 @@ expression: suite
                                         uppercase_r: false,
                                     },
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap
index f3a05cb297..76ddf8520d 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap
@@ -5,17 +5,17 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..6,
             value: BytesLiteral(
                 ExprBytesLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: BytesLiteralValue {
                         inner: Single(
                             BytesLiteral {
                                 range: 0..6,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: [
                                     92,
                                     92,
@@ -26,6 +26,7 @@ expression: suite
                                         uppercase_r: false,
                                     },
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap
index 7156cd9073..eb8b1a3e6d 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..7,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..7,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 3..6,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4..5,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -42,6 +42,7 @@ expression: suite
                                             uppercase_r: false,
                                         },
                                         triple_quoted: false,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap
index 5200cdade1..b97792d742 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..7,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..7,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 3..6,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 4..5,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -41,6 +41,7 @@ expression: suite
                                         uppercase_r: false,
                                     },
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap
index b85749f0dc..b919928dc5 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap
@@ -5,17 +5,17 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..738,
             value: BytesLiteral(
                 ExprBytesLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..738,
                     value: BytesLiteralValue {
                         inner: Single(
                             BytesLiteral {
                                 range: 0..738,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: [
                                     0,
                                     1,
@@ -278,6 +278,7 @@ expression: suite
                                     quote_style: Single,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap
index 432c43fcf4..4352fb34d4 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..18,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "text more text",
                                 flags: StringLiteralFlags {
                                     quote_style: Single,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap
index 432c43fcf4..4352fb34d4 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..18,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "text more text",
                                 flags: StringLiteralFlags {
                                     quote_style: Single,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap
index dfaefc86f8..58ff7730d8 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap
@@ -5,22 +5,23 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..19,
             value: StringLiteral(
                 ExprStringLiteral {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     value: StringLiteralValue {
                         inner: Single(
                             StringLiteral {
                                 range: 0..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 value: "text more text",
                                 flags: StringLiteralFlags {
                                     quote_style: Single,
                                     prefix: Empty,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap
index a65a7d4b39..8877e5956f 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap
@@ -5,26 +5,26 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..11,
             value: FString(
                 ExprFString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: FStringValue {
                         inner: Single(
                             FString(
                                 FString {
                                     range: 0..11,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     elements: [
                                         Interpolation(
                                             InterpolatedElement {
                                                 range: 5..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 expression: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 6..7,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -42,6 +42,7 @@ expression: suite
                                             uppercase_r: false,
                                         },
                                         triple_quoted: true,
+                                        unclosed: false,
                                     },
                                 },
                             ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap
index 71a7e8c067..4cf02baf48 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..11,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..11,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 5..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 6..7,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -41,6 +41,7 @@ expression: suite
                                         uppercase_r: false,
                                     },
                                     triple_quoted: true,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap
index d87b9c51f3..f8825a1412 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap
@@ -5,32 +5,32 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..22,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..22,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 2..5,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "aaa",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 5..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 6..9,
                                                     id: Name("bbb"),
                                                     ctx: Load,
@@ -44,17 +44,17 @@ expression: suite
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 10..13,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "ccc",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 13..18,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 14..17,
                                                     id: Name("ddd"),
                                                     ctx: Load,
@@ -68,7 +68,7 @@ expression: suite
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 18..21,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "eee",
                                         },
                                     ),
@@ -77,6 +77,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap
index 416ad8570a..a10e0fc996 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap
@@ -5,32 +5,32 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..8,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..8,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 2..4,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "\\",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 4..7,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5..6,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -46,6 +46,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap
index 85e4ce745b..071d5af2c4 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap
@@ -5,32 +5,32 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..8,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..8,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 2..4,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "\n",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 4..7,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5..6,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -46,6 +46,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap
index 04ca645b9e..ae7da0c069 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap
@@ -5,32 +5,32 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..9,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 3..5,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "\\\n",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 5..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 6..7,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -48,6 +48,7 @@ expression: suite
                                         uppercase_r: false,
                                     },
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap
index 147b6c7b10..5169493e0a 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..10,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..7,
                                                     id: Name("user"),
                                                     ctx: Load,
@@ -44,6 +44,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap
index 8f098418fc..e9b8a959fc 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap
@@ -5,32 +5,32 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..38,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..38,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..38,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 2..6,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "mix ",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 6..13,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 7..11,
                                                     id: Name("user"),
                                                     ctx: Load,
@@ -49,17 +49,17 @@ expression: suite
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 13..28,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: " with text and ",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 28..37,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 29..35,
                                                     id: Name("second"),
                                                     ctx: Load,
@@ -80,6 +80,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap
index c11b0164f6..18ce2cfc63 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap
@@ -5,25 +5,25 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..14,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..14,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 2..13,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3..7,
                                                     id: Name("user"),
                                                     ctx: Load,
@@ -39,12 +39,12 @@ expression: suite
                                             format_spec: Some(
                                                 InterpolatedStringFormatSpec {
                                                     range: 9..12,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Literal(
                                                             InterpolatedStringLiteralElement {
                                                                 range: 9..12,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: ">10",
                                                             },
                                                         ),
@@ -58,6 +58,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: false,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap
index 728682c92c..2c5a1b47c4 100644
--- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap
+++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap
@@ -5,32 +5,32 @@ expression: suite
 [
     Expr(
         StmtExpr {
-            node_index: AtomicNodeIndex(..),
+            node_index: NodeIndex(None),
             range: 0..11,
             value: TString(
                 ExprTString {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: TStringValue {
                         inner: Single(
                             TString {
                                 range: 0..11,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 elements: [
                                     Literal(
                                         InterpolatedStringLiteralElement {
                                             range: 4..5,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "\n",
                                         },
                                     ),
                                     Interpolation(
                                         InterpolatedElement {
                                             range: 5..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             expression: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 6..7,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -46,6 +46,7 @@ expression: suite
                                     quote_style: Double,
                                     prefix: Regular,
                                     triple_quoted: true,
+                                    unclosed: false,
                                 },
                             },
                         ),
diff --git a/crates/ruff_python_parser/src/string.rs b/crates/ruff_python_parser/src/string.rs
index 8a0342ded2..4510934685 100644
--- a/crates/ruff_python_parser/src/string.rs
+++ b/crates/ruff_python_parser/src/string.rs
@@ -287,7 +287,7 @@ impl StringParser {
             return Ok(ast::InterpolatedStringLiteralElement {
                 value: self.source,
                 range: self.range,
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             });
         };
 
@@ -365,7 +365,7 @@ impl StringParser {
         Ok(ast::InterpolatedStringLiteralElement {
             value: value.into_boxed_str(),
             range: self.range,
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         })
     }
 
@@ -387,7 +387,7 @@ impl StringParser {
                 value: self.source.into_boxed_bytes(),
                 range: self.range,
                 flags: self.flags.into(),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }));
         }
 
@@ -397,7 +397,7 @@ impl StringParser {
                 value: self.source.into_boxed_bytes(),
                 range: self.range,
                 flags: self.flags.into(),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }));
         };
 
@@ -435,7 +435,7 @@ impl StringParser {
             value: value.into_boxed_slice(),
             range: self.range,
             flags: self.flags.into(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }))
     }
 
@@ -446,7 +446,7 @@ impl StringParser {
                 value: self.source,
                 range: self.range,
                 flags: self.flags.into(),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }));
         }
 
@@ -456,7 +456,7 @@ impl StringParser {
                 value: self.source,
                 range: self.range,
                 flags: self.flags.into(),
-                node_index: AtomicNodeIndex::dummy(),
+                node_index: AtomicNodeIndex::NONE,
             }));
         };
 
@@ -494,7 +494,7 @@ impl StringParser {
             value: value.into_boxed_str(),
             range: self.range,
             flags: self.flags.into(),
-            node_index: AtomicNodeIndex::dummy(),
+            node_index: AtomicNodeIndex::NONE,
         }))
     }
 
diff --git a/crates/ruff_python_parser/src/token.rs b/crates/ruff_python_parser/src/token.rs
index 240e015a3b..18b7648c4c 100644
--- a/crates/ruff_python_parser/src/token.rs
+++ b/crates/ruff_python_parser/src/token.rs
@@ -486,7 +486,7 @@ impl TokenKind {
     ///
     /// [`as_unary_operator`]: TokenKind::as_unary_operator
     #[inline]
-    pub(crate) const fn as_unary_arithmetic_operator(self) -> Option<UnaryOp> {
+    pub const fn as_unary_arithmetic_operator(self) -> Option<UnaryOp> {
         Some(match self {
             TokenKind::Plus => UnaryOp::UAdd,
             TokenKind::Minus => UnaryOp::USub,
@@ -501,7 +501,7 @@ impl TokenKind {
     ///
     /// [`as_unary_arithmetic_operator`]: TokenKind::as_unary_arithmetic_operator
     #[inline]
-    pub(crate) const fn as_unary_operator(self) -> Option<UnaryOp> {
+    pub const fn as_unary_operator(self) -> Option<UnaryOp> {
         Some(match self {
             TokenKind::Plus => UnaryOp::UAdd,
             TokenKind::Minus => UnaryOp::USub,
@@ -514,7 +514,7 @@ impl TokenKind {
     /// Returns the [`BoolOp`] that corresponds to this token kind, if it is a boolean operator,
     /// otherwise return [None].
     #[inline]
-    pub(crate) const fn as_bool_operator(self) -> Option<BoolOp> {
+    pub const fn as_bool_operator(self) -> Option<BoolOp> {
         Some(match self {
             TokenKind::And => BoolOp::And,
             TokenKind::Or => BoolOp::Or,
@@ -528,7 +528,7 @@ impl TokenKind {
     /// Use [`as_augmented_assign_operator`] to match against an augmented assignment token.
     ///
     /// [`as_augmented_assign_operator`]: TokenKind::as_augmented_assign_operator
-    pub(crate) const fn as_binary_operator(self) -> Option<Operator> {
+    pub const fn as_binary_operator(self) -> Option<Operator> {
         Some(match self {
             TokenKind::Plus => Operator::Add,
             TokenKind::Minus => Operator::Sub,
@@ -550,7 +550,7 @@ impl TokenKind {
     /// Returns the [`Operator`] that corresponds to this token kind, if it is
     /// an augmented assignment operator, or [`None`] otherwise.
     #[inline]
-    pub(crate) const fn as_augmented_assign_operator(self) -> Option<Operator> {
+    pub const fn as_augmented_assign_operator(self) -> Option<Operator> {
         Some(match self {
             TokenKind::PlusEqual => Operator::Add,
             TokenKind::MinusEqual => Operator::Sub,
@@ -729,7 +729,7 @@ impl fmt::Display for TokenKind {
 
 bitflags! {
     #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-    pub(crate) struct TokenFlags: u8 {
+    pub(crate) struct TokenFlags: u16 {
         /// The token is a string with double quotes (`"`).
         const DOUBLE_QUOTES = 1 << 0;
         /// The token is a triple-quoted string i.e., it starts and ends with three consecutive
@@ -748,9 +748,12 @@ bitflags! {
         const RAW_STRING_LOWERCASE = 1 << 6;
         /// The token is a raw string and the prefix character is in uppercase.
         const RAW_STRING_UPPERCASE = 1 << 7;
+        /// String without matching closing quote(s)
+        const UNCLOSED_STRING = 1 << 8;
 
         /// The token is a raw string i.e., prefixed with `r` or `R`
         const RAW_STRING = Self::RAW_STRING_LOWERCASE.bits() | Self::RAW_STRING_UPPERCASE.bits();
+
     }
 }
 
@@ -808,6 +811,10 @@ impl StringFlags for TokenFlags {
             AnyStringPrefix::Regular(StringLiteralPrefix::Empty)
         }
     }
+
+    fn is_unclosed(self) -> bool {
+        self.intersects(TokenFlags::UNCLOSED_STRING)
+    }
 }
 
 impl TokenFlags {
diff --git a/crates/ruff_python_parser/src/token_source.rs b/crates/ruff_python_parser/src/token_source.rs
index 26088c7a12..f24fb4771f 100644
--- a/crates/ruff_python_parser/src/token_source.rs
+++ b/crates/ruff_python_parser/src/token_source.rs
@@ -3,6 +3,7 @@ use ruff_text_size::{Ranged, TextRange, TextSize};
 use crate::Mode;
 use crate::error::LexicalError;
 use crate::lexer::{Lexer, LexerCheckpoint};
+use crate::string::InterpolatedStringKind;
 use crate::token::{Token, TokenFlags, TokenKind, TokenValue};
 
 /// Token source for the parser that skips over any trivia tokens.
@@ -88,6 +89,18 @@ impl<'src> TokenSource<'src> {
         }
     }
 
+    pub(crate) fn re_lex_string_token_in_interpolation_element(
+        &mut self,
+        kind: InterpolatedStringKind,
+    ) {
+        self.lexer
+            .re_lex_string_token_in_interpolation_element(kind);
+    }
+
+    pub(crate) fn re_lex_raw_string_in_format_spec(&mut self) {
+        self.lexer.re_lex_raw_string_in_format_spec();
+    }
+
     /// Returns the next non-trivia token without consuming it.
     ///
     /// Use [`peek2`] to get the next two tokens.
diff --git a/crates/ruff_python_parser/tests/fixtures.rs b/crates/ruff_python_parser/tests/fixtures.rs
index 7aa7a6f2e2..c646fe525b 100644
--- a/crates/ruff_python_parser/tests/fixtures.rs
+++ b/crates/ruff_python_parser/tests/fixtures.rs
@@ -465,7 +465,7 @@ impl<'ast> SourceOrderVisitor<'ast> for ValidateAstVisitor<'ast> {
 
 enum Scope {
     Module,
-    Function,
+    Function { is_async: bool },
     Comprehension { is_async: bool },
     Class,
 }
@@ -528,7 +528,15 @@ impl SemanticSyntaxContext for SemanticSyntaxCheckerVisitor<'_> {
     }
 
     fn in_async_context(&self) -> bool {
-        true
+        if let Some(scope) = self.scopes.iter().next_back() {
+            match scope {
+                Scope::Class | Scope::Module => false,
+                Scope::Comprehension { is_async } => *is_async,
+                Scope::Function { is_async } => *is_async,
+            }
+        } else {
+            false
+        }
     }
 
     fn in_sync_comprehension(&self) -> bool {
@@ -563,6 +571,14 @@ impl SemanticSyntaxContext for SemanticSyntaxCheckerVisitor<'_> {
     fn in_generator_scope(&self) -> bool {
         true
     }
+
+    fn in_loop_context(&self) -> bool {
+        true
+    }
+
+    fn is_bound_parameter(&self, _name: &str) -> bool {
+        false
+    }
 }
 
 impl Visitor<'_> for SemanticSyntaxCheckerVisitor<'_> {
@@ -589,8 +605,10 @@ impl Visitor<'_> for SemanticSyntaxCheckerVisitor<'_> {
                 self.visit_body(body);
                 self.scopes.pop().unwrap();
             }
-            ast::Stmt::FunctionDef(ast::StmtFunctionDef { .. }) => {
-                self.scopes.push(Scope::Function);
+            ast::Stmt::FunctionDef(ast::StmtFunctionDef { is_async, .. }) => {
+                self.scopes.push(Scope::Function {
+                    is_async: *is_async,
+                });
                 ast::visitor::walk_stmt(self, stmt);
                 self.scopes.pop().unwrap();
             }
@@ -604,7 +622,7 @@ impl Visitor<'_> for SemanticSyntaxCheckerVisitor<'_> {
         self.with_semantic_checker(|semantic, context| semantic.visit_expr(expr, context));
         match expr {
             ast::Expr::Lambda(_) => {
-                self.scopes.push(Scope::Function);
+                self.scopes.push(Scope::Function { is_async: false });
                 ast::visitor::walk_expr(self, expr);
                 self.scopes.pop().unwrap();
             }
diff --git a/crates/ruff_python_parser/tests/generate_inline_tests.rs b/crates/ruff_python_parser/tests/generate_inline_tests.rs
index 908f7c6337..16da01d5e2 100644
--- a/crates/ruff_python_parser/tests/generate_inline_tests.rs
+++ b/crates/ruff_python_parser/tests/generate_inline_tests.rs
@@ -30,7 +30,7 @@ fn generate_inline_tests() -> Result<()> {
     test_files += install_tests(&tests.err, "crates/ruff_python_parser/resources/inline/err")?;
 
     if !test_files.is_empty() {
-        anyhow::bail!("{}", test_files);
+        anyhow::bail!("{test_files}");
     }
 
     Ok(())
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap
index 172e4daa89..21eb2b1619 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_inval
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..63,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -24,11 +24,11 @@ Module(
                     ),
                     annotation: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..7,
                                     id: Name("int"),
                                     ctx: Load,
@@ -40,7 +40,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..11,
                                 value: Int(
                                     1,
@@ -53,11 +53,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..26,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..13,
                             id: Name("x"),
                             ctx: Store,
@@ -65,12 +65,12 @@ Module(
                     ),
                     annotation: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..22,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..22,
                                         id: Name("a"),
                                         ctx: Load,
@@ -82,7 +82,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..26,
                                 value: Int(
                                     1,
@@ -95,11 +95,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..46,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..28,
                             id: Name("x"),
                             ctx: Store,
@@ -107,11 +107,11 @@ Module(
                     ),
                     annotation: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..42,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..42,
                                     id: Name("b"),
                                     ctx: Load,
@@ -122,7 +122,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 45..46,
                                 value: Int(
                                     1,
@@ -135,11 +135,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..51,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("x"),
                             ctx: Store,
@@ -147,7 +147,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..51,
                             id: Name("y"),
                             ctx: Load,
@@ -159,12 +159,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..62,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 55..58,
                                 id: Name("int"),
                                 ctx: Store,
@@ -173,7 +173,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..62,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap
index 4a80fdc2f5..1e58991d17 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap
@@ -7,27 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_inval
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..170,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     target: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 0..5,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "abc",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -36,7 +37,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..10,
                             id: Name("str"),
                             ctx: Load,
@@ -45,18 +46,19 @@ Module(
                     value: Some(
                         StringLiteral(
                             ExprStringLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..18,
                                 value: StringLiteralValue {
                                     inner: Single(
                                         StringLiteral {
                                             range: 13..18,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "def",
                                             flags: StringLiteralFlags {
                                                 quote_style: Double,
                                                 prefix: Empty,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -69,15 +71,15 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..37,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..25,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..23,
                                     id: Name("call"),
                                     ctx: Load,
@@ -85,7 +87,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 23..25,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -93,7 +95,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..30,
                             id: Name("str"),
                             ctx: Load,
@@ -102,18 +104,19 @@ Module(
                     value: Some(
                         StringLiteral(
                             ExprStringLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 33..37,
                                 value: StringLiteralValue {
                                     inner: Single(
                                         StringLiteral {
                                             range: 33..37,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "no",
                                             flags: StringLiteralFlags {
                                                 quote_style: Double,
                                                 prefix: Empty,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -126,15 +129,15 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..52,
                     target: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..40,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 39..40,
                                     id: Name("x"),
                                     ctx: Store,
@@ -145,7 +148,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 42..45,
                             id: Name("int"),
                             ctx: Load,
@@ -154,12 +157,12 @@ Module(
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 48..52,
                                 elts: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 48..49,
                                             value: Int(
                                                 1,
@@ -168,7 +171,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 51..52,
                                             value: Int(
                                                 2,
@@ -186,16 +189,16 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..83,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..74,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..73,
                                         id: Name("x"),
                                         ctx: Store,
@@ -208,7 +211,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 76..79,
                             id: Name("int"),
                             ctx: Load,
@@ -217,7 +220,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 82..83,
                                 value: Int(
                                     1,
@@ -230,16 +233,16 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..100,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..88,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..85,
                                         id: Name("x"),
                                         ctx: Store,
@@ -247,7 +250,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 87..88,
                                         id: Name("y"),
                                         ctx: Store,
@@ -260,7 +263,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..93,
                             id: Name("int"),
                             ctx: Load,
@@ -269,12 +272,12 @@ Module(
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 96..100,
                                 elts: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..97,
                                             value: Int(
                                                 1,
@@ -283,7 +286,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 99..100,
                                             value: Int(
                                                 2,
@@ -301,16 +304,16 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 101..119,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 101..107,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 102..103,
                                         id: Name("x"),
                                         ctx: Store,
@@ -318,7 +321,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 105..106,
                                         id: Name("y"),
                                         ctx: Store,
@@ -331,7 +334,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 109..112,
                             id: Name("int"),
                             ctx: Load,
@@ -340,12 +343,12 @@ Module(
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 115..119,
                                 elts: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 115..116,
                                             value: Int(
                                                 1,
@@ -354,7 +357,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 118..119,
                                             value: Int(
                                                 2,
@@ -372,16 +375,16 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 138..150,
                     target: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 138..141,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 139..140,
                                         id: Name("x"),
                                         ctx: Store,
@@ -393,7 +396,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 143..146,
                             id: Name("int"),
                             ctx: Load,
@@ -402,7 +405,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 149..150,
                                 value: Int(
                                     1,
@@ -415,16 +418,16 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 151..169,
                     target: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 151..157,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 152..153,
                                         id: Name("x"),
                                         ctx: Store,
@@ -432,7 +435,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 155..156,
                                         id: Name("y"),
                                         ctx: Store,
@@ -444,7 +447,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 159..162,
                             id: Name("int"),
                             ctx: Load,
@@ -453,12 +456,12 @@ Module(
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 165..169,
                                 elts: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 165..166,
                                             value: Int(
                                                 1,
@@ -467,7 +470,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 168..169,
                                             value: Int(
                                                 2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap
index 1d69453670..f9ad11979a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_inval
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..65,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -24,7 +24,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..6,
                             id: Name("Any"),
                             ctx: Load,
@@ -33,17 +33,17 @@ Module(
                     value: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..17,
                                 value: BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 10..17,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 10..11,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -51,7 +51,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 16..17,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -69,11 +69,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..28,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..19,
                             id: Name("x"),
                             ctx: Store,
@@ -81,7 +81,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..24,
                             id: Name("Any"),
                             ctx: Load,
@@ -90,7 +90,7 @@ Module(
                     value: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..28,
                                 id: Name("x"),
                                 ctx: Load,
@@ -102,11 +102,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..33,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..33,
                             value: Int(
                                 1,
@@ -117,11 +117,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..64,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..35,
                             id: Name("x"),
                             ctx: Store,
@@ -129,7 +129,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..41,
                             id: Name("list"),
                             ctx: Load,
@@ -138,12 +138,12 @@ Module(
                     value: Some(
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..64,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 45..46,
                                             id: Name("x"),
                                             ctx: Load,
@@ -151,15 +151,15 @@ Module(
                                     ),
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 48..54,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 49..54,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 49..50,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -168,7 +168,7 @@ Module(
                                                     op: BitOr,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 53..54,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -181,17 +181,17 @@ Module(
                                     ),
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 56..63,
                                             value: BoolOp(
                                                 ExprBoolOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 57..63,
                                                     op: Or,
                                                     values: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 57..58,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -199,7 +199,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 62..63,
                                                                 id: Name("b"),
                                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap
index b1a6700394..babd340987 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..9,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -24,7 +24,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..6,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap
index 957104e6d2..8c2e51d0cd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_type_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..37,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("a"),
                             ctx: Store,
@@ -24,7 +24,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             id: Name("type"),
                             ctx: Load,
@@ -36,12 +36,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..15,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 8..9,
                                 id: Name("X"),
                                 ctx: Store,
@@ -50,7 +50,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..15,
                             id: Name("int"),
                             ctx: Load,
@@ -60,16 +60,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..28,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..28,
                             parameters: None,
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..28,
                                     id: Name("type"),
                                     ctx: Load,
@@ -81,12 +81,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..36,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..30,
                                 id: Name("X"),
                                 ctx: Store,
@@ -95,7 +95,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..36,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap
index 745c8c8c40..13b2bd4292 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/args_unparenthesized_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..92,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..28,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..3,
                                     id: Name("sum"),
                                     ctx: Load,
@@ -28,15 +28,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 3..28,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4..24,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 4..5,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -45,10 +45,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 6..24,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 10..11,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -56,11 +56,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 15..24,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 15..20,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -68,11 +68,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 20..24,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 21..23,
                                                                             value: Int(
                                                                                 10,
@@ -93,7 +93,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 26..27,
                                             value: Int(
                                                 5,
@@ -109,15 +109,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..64,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..64,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..34,
                                     id: Name("total"),
                                     ctx: Load,
@@ -125,11 +125,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 34..64,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             value: Int(
                                                 1,
@@ -138,7 +138,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 38..39,
                                             value: Int(
                                                 2,
@@ -147,11 +147,11 @@ Module(
                                     ),
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 41..60,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 41..42,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -160,10 +160,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 43..60,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..48,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -171,11 +171,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 52..60,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 52..57,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -183,11 +183,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 57..60,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 58..59,
                                                                             value: Int(
                                                                                 5,
@@ -208,7 +208,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..63,
                                             value: Int(
                                                 6,
@@ -224,15 +224,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..91,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..91,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..68,
                                     id: Name("sum"),
                                     ctx: Load,
@@ -240,15 +240,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 68..91,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 69..89,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 69..70,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -257,10 +257,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 71..89,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 75..76,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -268,11 +268,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 80..89,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 80..85,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -280,11 +280,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 85..89,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 86..88,
                                                                             value: Int(
                                                                                 10,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap
index e4f9844f73..fd78d8760b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_empty_msg.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..8,
                             id: Name("x"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap
index 8722a03c2e..2c64815756 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_empty_test.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..7,
         body: [
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..6,
                             id: Name(""),
                             ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap
index bfef697184..2cc454ed48 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_invalid_msg_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..83,
         body: [
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..12,
                             value: false,
                         },
@@ -24,11 +24,11 @@ Module(
                     msg: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..16,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..16,
                                         id: Name("x"),
                                         ctx: Load,
@@ -42,11 +42,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..30,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..29,
                             value: false,
                         },
@@ -56,11 +56,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 31..39,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..39,
                             id: Name("x"),
                             ctx: Load,
@@ -71,11 +71,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..61,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..52,
                             value: false,
                         },
@@ -83,12 +83,12 @@ Module(
                     msg: Some(
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 54..61,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 60..61,
                                             id: Name("x"),
                                             ctx: Load,
@@ -102,11 +102,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 62..77,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 69..74,
                             value: false,
                         },
@@ -114,7 +114,7 @@ Module(
                     msg: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 76..77,
                                 id: Name("x"),
                                 ctx: Load,
@@ -125,11 +125,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 81..82,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 81..82,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap
index 1f87e7e7b6..1a843b29c9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_invalid_test_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..55,
         body: [
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     test: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..9,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     id: Name("x"),
                                     ctx: Load,
@@ -34,11 +34,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..23,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..23,
                             id: Name("assert"),
                             ctx: Load,
@@ -49,11 +49,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..25,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..25,
                             id: Name("x"),
                             ctx: Load,
@@ -63,16 +63,16 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..40,
                     test: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..40,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..40,
                                         id: Name("x"),
                                         ctx: Load,
@@ -86,11 +86,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..49,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 48..49,
                             id: Name("x"),
                             ctx: Load,
@@ -101,11 +101,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..54,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..54,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap
index e317e4b49c..7516e2d842 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_invalid_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..58,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     targets: [
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 value: Int(
                                     1,
@@ -27,7 +27,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             value: Int(
                                 1,
@@ -38,12 +38,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..15,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..7,
                                 id: Name("x"),
                                 ctx: Store,
@@ -51,7 +51,7 @@ Module(
                         ),
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..11,
                                 value: Int(
                                     1,
@@ -61,7 +61,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..15,
                             value: Int(
                                 2,
@@ -72,12 +72,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..33,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..17,
                                 id: Name("x"),
                                 ctx: Store,
@@ -85,7 +85,7 @@ Module(
                         ),
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..21,
                                 value: Int(
                                     1,
@@ -94,7 +94,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..25,
                                 id: Name("y"),
                                 ctx: Store,
@@ -102,7 +102,7 @@ Module(
                         ),
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..29,
                                 value: Int(
                                     2,
@@ -112,7 +112,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..33,
                             id: Name("z"),
                             ctx: Load,
@@ -122,28 +122,29 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..57,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 34..44,
                                 elts: [
                                     StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..38,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 35..38,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "a",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -152,18 +153,19 @@ Module(
                                     ),
                                     StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 40..43,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 40..43,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "b",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -177,23 +179,24 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..57,
                             elts: [
                                 StringLiteral(
                                     ExprStringLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 48..51,
                                         value: StringLiteralValue {
                                             inner: Single(
                                                 StringLiteral {
                                                     range: 48..51,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "a",
                                                     flags: StringLiteralFlags {
                                                         quote_style: Double,
                                                         prefix: Empty,
                                                         triple_quoted: false,
+                                                        unclosed: false,
                                                     },
                                                 },
                                             ),
@@ -202,18 +205,19 @@ Module(
                                 ),
                                 StringLiteral(
                                     ExprStringLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..56,
                                         value: StringLiteralValue {
                                             inner: Single(
                                                 StringLiteral {
                                                     range: 53..56,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "b",
                                                     flags: StringLiteralFlags {
                                                         quote_style: Double,
                                                         prefix: Empty,
                                                         triple_quoted: false,
+                                                        unclosed: false,
                                                     },
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap
index 65ac6baf43..6fe406354b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_invalid_v
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..90,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("x"),
                                 ctx: Store,
@@ -26,22 +26,22 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..15,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..13,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..13,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 6..7,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -49,7 +49,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 12..13,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -70,12 +70,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..34,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..17,
                                 id: Name("x"),
                                 ctx: Store,
@@ -84,12 +84,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..34,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..23,
                                         value: Int(
                                             42,
@@ -98,16 +98,16 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..33,
                                         value: Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..33,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 32..33,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -128,12 +128,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..58,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 35..36,
                                 id: Name("x"),
                                 ctx: Store,
@@ -142,12 +142,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..58,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..42,
                                         value: Int(
                                             42,
@@ -156,15 +156,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..57,
                                         value: YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 45..57,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 56..57,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -184,12 +184,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..78,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 59..60,
                                 id: Name("x"),
                                 ctx: Store,
@@ -198,35 +198,33 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..78,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 64..76,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 65..76,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 72..73,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 72..73,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 72..73,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 72..73,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -240,7 +238,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 75..76,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -260,12 +258,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..84,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 79..80,
                                 id: Name("x"),
                                 ctx: Store,
@@ -274,7 +272,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..84,
                             id: Name("x"),
                             ctx: Load,
@@ -284,11 +282,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..89,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 88..89,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap
index 0f58eff527..6264d907b5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_keyword_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..42,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("a"),
                                 ctx: Store,
@@ -25,7 +25,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..8,
                                 id: Name("pass"),
                                 ctx: Store,
@@ -34,7 +34,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..12,
                             id: Name("c"),
                             ctx: Load,
@@ -44,15 +44,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..18,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..18,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     id: Name("a"),
                                     ctx: Load,
@@ -61,7 +61,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..18,
                                     id: Name("b"),
                                     ctx: Load,
@@ -73,12 +73,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..35,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..20,
                                 id: Name("a"),
                                 ctx: Store,
@@ -86,7 +86,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..24,
                                 id: Name("b"),
                                 ctx: Store,
@@ -94,7 +94,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..31,
                                 id: Name("pass"),
                                 ctx: Store,
@@ -103,7 +103,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..35,
                             id: Name("c"),
                             ctx: Load,
@@ -113,15 +113,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 36..41,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..41,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..37,
                                     id: Name("a"),
                                     ctx: Load,
@@ -130,7 +130,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 40..41,
                                     id: Name("b"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap
index 6ef39d8045..8a1f050533 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_missing_r
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..38,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("x"),
                                 ctx: Store,
@@ -26,7 +26,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..3,
                             id: Name(""),
                             ctx: Invalid,
@@ -36,15 +36,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..9,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..9,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     value: Int(
                                         1,
@@ -54,7 +54,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     value: Int(
                                         1,
@@ -67,12 +67,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..17,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..11,
                                 id: Name("x"),
                                 ctx: Store,
@@ -80,7 +80,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..15,
                                 id: Name("y"),
                                 ctx: Store,
@@ -89,7 +89,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..17,
                             id: Name(""),
                             ctx: Invalid,
@@ -99,15 +99,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..23,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..23,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
                                     value: Int(
                                         2,
@@ -117,7 +117,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
                                     value: Int(
                                         2,
@@ -130,12 +130,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..31,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..25,
                                 id: Name("x"),
                                 ctx: Store,
@@ -143,7 +143,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..27,
                                 id: Name(""),
                                 ctx: Store,
@@ -152,7 +152,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..31,
                             id: Name("y"),
                             ctx: Load,
@@ -162,15 +162,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..37,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..37,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 32..33,
                                     value: Int(
                                         3,
@@ -180,7 +180,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..37,
                                     value: Int(
                                         3,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap
index 5af1853e86..45bda59ff0 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_starred_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..45,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("_"),
                                 ctx: Store,
@@ -26,16 +26,16 @@ Module(
                     ],
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..9,
                             value: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..9,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..8,
                                                 value: Int(
                                                     42,
@@ -53,12 +53,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..19,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..11,
                                 id: Name("_"),
                                 ctx: Store,
@@ -67,16 +67,16 @@ Module(
                     ],
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..19,
                             value: Set(
                                 ExprSet {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 15..19,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..18,
                                                 value: Int(
                                                     42,
@@ -93,12 +93,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..31,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..21,
                                 id: Name("_"),
                                 ctx: Store,
@@ -107,15 +107,15 @@ Module(
                     ],
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..31,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 25..31,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 25..29,
                                             id: Name("list"),
                                             ctx: Load,
@@ -123,7 +123,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 29..31,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -136,12 +136,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..44,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 32..33,
                                 id: Name("_"),
                                 ctx: Store,
@@ -150,15 +150,15 @@ Module(
                     ],
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..44,
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 38..43,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 38..39,
                                             id: Name("p"),
                                             ctx: Load,
@@ -167,7 +167,7 @@ Module(
                                     op: Add,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 42..43,
                                             id: Name("q"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap
index 7ebaaad4b7..2dd2bddfc4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/async_unexpected_toke
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..116,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..20,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 12..15,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..20,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..20,
                                     },
                                 ),
@@ -40,11 +40,11 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..42,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..37,
                             id: Name("test"),
                             ctx: Load,
@@ -53,11 +53,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 39..42,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..42,
                                     },
                                 ),
@@ -69,12 +69,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..54,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..50,
                                 id: Name("x"),
                                 ctx: Store,
@@ -83,7 +83,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..54,
                             value: Int(
                                 1,
@@ -94,21 +94,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..81,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 71..74,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 74..76,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -119,11 +117,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 78..81,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 78..81,
                                     },
                                 ),
@@ -134,11 +132,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..115,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..98,
                             id: Name("test"),
                             ctx: Load,
@@ -147,11 +145,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 104..115,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 109..110,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -160,11 +158,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 112..115,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 112..115,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap
index 78da56cda6..0d1311ca25 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/aug_assign_stmt_inval
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..59,
         body: [
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             value: Int(
                                 1,
@@ -26,7 +26,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             value: Int(
                                 1,
@@ -37,22 +37,23 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..17,
                     target: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..10,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 7..10,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "a",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -62,18 +63,19 @@ Module(
                     op: Add,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..17,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 14..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "b",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -84,15 +86,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..25,
                     target: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..20,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..20,
                                     id: Name("x"),
                                     ctx: Store,
@@ -104,7 +106,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..25,
                             value: Int(
                                 1,
@@ -115,17 +117,17 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..30,
                 },
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..35,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..35,
                             value: Int(
                                 1,
@@ -136,11 +138,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 36..45,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..37,
                             id: Name("x"),
                             ctx: Store,
@@ -149,7 +151,7 @@ Module(
                     op: Add,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..45,
                             id: Name("pass"),
                             ctx: Load,
@@ -159,15 +161,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..58,
                     target: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..52,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..48,
                                     id: Name("x"),
                                     ctx: Load,
@@ -176,7 +178,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     id: Name("y"),
                                     ctx: Load,
@@ -187,7 +189,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..58,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap
index cfc583f1b8..eeec973fc9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/aug_assign_stmt_inval
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..77,
         body: [
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -25,17 +25,17 @@ Module(
                     op: Add,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..13,
                             value: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..13,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..7,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 12..13,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -59,11 +59,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..27,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..15,
                             id: Name("x"),
                             ctx: Store,
@@ -72,16 +72,16 @@ Module(
                     op: Add,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..27,
                             value: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 20..27,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..27,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -97,11 +97,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..46,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..29,
                             id: Name("x"),
                             ctx: Store,
@@ -110,15 +110,15 @@ Module(
                     op: Add,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..46,
                             value: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..46,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 45..46,
                                             id: Name("x"),
                                             ctx: Load,
@@ -133,11 +133,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..64,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("x"),
                             ctx: Store,
@@ -146,30 +146,28 @@ Module(
                     op: Add,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..64,
                             value: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..64,
                                     parameters: Some(
                                         Parameters {
                                             range: 60..61,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 60..61,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 60..61,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 60..61,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -183,7 +181,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 63..64,
                                             id: Name("x"),
                                             ctx: Load,
@@ -198,11 +196,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..71,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..66,
                             id: Name("x"),
                             ctx: Store,
@@ -211,7 +209,7 @@ Module(
                     op: Add,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..71,
                             id: Name("y"),
                             ctx: Load,
@@ -221,11 +219,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 75..76,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 75..76,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap
index 50e27a1c5e..f367265ec7 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/aug_assign_stmt_missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..27,
         body: [
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..4,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     op: Add,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..4,
                             id: Name(""),
                             ctx: Invalid,
@@ -35,15 +35,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..10,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     value: Int(
                                         1,
@@ -53,7 +53,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         1,
@@ -66,11 +66,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..17,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..12,
                             id: Name("x"),
                             ctx: Store,
@@ -79,7 +79,7 @@ Module(
                     op: Add,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..17,
                             id: Name("y"),
                             ctx: Load,
@@ -89,15 +89,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..26,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..26,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
                                     value: Int(
                                         2,
@@ -107,7 +107,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 25..26,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap
index 0e0305e26b..952ba305f7 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/case_expect_indented_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..43,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..42,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,14 +25,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 19..26,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 24..25,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 24..25,
                                             value: Int(
                                                 1,
@@ -46,14 +46,14 @@ Module(
                         },
                         MatchCase {
                             range: 31..42,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 36..37,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..37,
                                             value: Int(
                                                 2,
@@ -66,11 +66,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..42,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 39..42,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap
index 48a479382f..b12cc050bf 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap
@@ -7,18 +7,18 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_def_empty_body.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..31,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 6..9,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
@@ -27,19 +27,19 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..23,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 17..20,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 20..22,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -49,12 +49,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..30,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..25,
                                 id: Name("x"),
                                 ctx: Store,
@@ -63,7 +63,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..30,
                             value: Int(
                                 42,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap
index 6d68771f17..218b289dc4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_def_missing_nam
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     decorator_list: [],
                     name: Identifier {
                         id: Name(""),
                         range: 5..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 8..11,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..11,
                                     },
                                 ),
@@ -40,19 +40,19 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..25,
                     decorator_list: [],
                     name: Identifier {
                         id: Name(""),
                         range: 17..17,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 18..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -60,11 +60,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..25,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..25,
                                     },
                                 ),
@@ -75,34 +75,34 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..52,
                     decorator_list: [],
                     name: Identifier {
                         id: Name(""),
                         range: 31..31,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 32..47,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [
                                 Keyword {
                                     range: 33..46,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     arg: Some(
                                         Identifier {
                                             id: Name("metaclass"),
                                             range: 33..42,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 43..46,
                                             id: Name("ABC"),
                                             ctx: Load,
@@ -115,11 +115,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap
index 17f5d5b106..3246bdb0ce 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap
@@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_def_unclosed_ty
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..41,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..33,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 6..9,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 9..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 10..12,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T1"),
                                             range: 10..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -40,12 +40,12 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 14..17,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T2"),
                                             range: 15..17,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -56,11 +56,11 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 17..23,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         id: Name("a"),
                                         ctx: Load,
@@ -68,7 +68,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..22,
                                         id: Name("b"),
                                         ctx: Load,
@@ -81,7 +81,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..33,
                             },
                         ),
@@ -90,12 +90,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..40,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 34..35,
                                 id: Name("x"),
                                 ctx: Store,
@@ -104,7 +104,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..40,
                             value: Int(
                                 10,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap
index 9d91dbf072..69e2166048 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap
@@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_type_params_py3
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..113,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..95,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 50..53,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 53..90,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 54..69,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("S"),
                                             range: 54..55,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 57..69,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 58..61,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -50,7 +50,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 63..68,
                                                                 id: Name("bytes"),
                                                                 ctx: Load,
@@ -67,17 +67,17 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 71..79,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 71..72,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 74..79,
                                                     id: Name("float"),
                                                     ctx: Load,
@@ -89,24 +89,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 82..84,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 86..89,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 88..89,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -118,11 +118,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 92..95,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..95,
                                     },
                                 ),
@@ -133,18 +133,18 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 96..112,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 102..105,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 105..107,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [],
                         },
                     ),
@@ -152,11 +152,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 109..112,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..112,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap
index 52dcef4c18..32d4fbf051 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/clause_expect_indente
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..171,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..61,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..60,
                             value: true,
                         },
@@ -27,17 +27,17 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 62..66,
                 },
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 162..170,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 165..169,
                             value: true,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap
index 0cec1c5726..f43fda3f90 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/clause_expect_single_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..23,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -27,11 +27,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..22,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..16,
                             value: true,
                         },
@@ -39,7 +39,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 18..22,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap
index 749a5fa1ae..bf33de094f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..15,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..14,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..14,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 12..13,
                                             value: Int(
                                                 1,
@@ -43,11 +43,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 5..8,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 7..8,
                                                 id: Name("x"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap
index 3afc0336c3..5f39e94515 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..92,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..91,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..91,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..85,
                                         value: Int(
                                             0,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 87..88,
                                         value: Int(
                                             1,
@@ -39,7 +39,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 89..90,
                                         value: Int(
                                             2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap
index 0e1f29a3c0..07e9b5e272 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..12,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..11,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1..2,
                                         value: Int(
                                             0,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4..5,
                                         value: Int(
                                             1,
@@ -39,7 +39,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..10,
                                         value: Int(
                                             2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap
index 02c89d0035..5f23342613 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..9,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             value: Int(
                                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap
index 636c0bdbac..aee9bf7056 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/comprehension_missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1..6,
                             id: Name("async"),
                             ctx: Load,
@@ -26,15 +26,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..27,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..27,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     id: Name("x"),
                                     ctx: Load,
@@ -43,10 +43,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 11..26,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 17..18,
                                             id: Name("x"),
                                             ctx: Store,
@@ -54,7 +54,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..26,
                                             id: Name("iter"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap
index 91477355a3..d3f8cd86fd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_class.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..82,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("__debug__"),
                         range: 6..15,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..20,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..20,
                                     },
                                 ),
@@ -40,27 +40,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..58,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("C"),
                         range: 41..42,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 42..53,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 43..52,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("__debug__"),
                                             range: 43..52,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -73,11 +73,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 55..58,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..58,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap
index f31edee08a..710fc7ad51 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_function
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..125,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("__debug__"),
                         range: 4..13,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 13..15,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..20,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..20,
                                     },
                                 ),
@@ -52,28 +50,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..61,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 42..43,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 43..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 44..53,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("__debug__"),
                                             range: 44..53,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -84,9 +82,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 54..56,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -97,11 +93,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..61,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                     },
                                 ),
@@ -112,33 +108,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..106,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 89..90,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 90..101,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 91..100,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 91..100,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("__debug__"),
                                         range: 91..100,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -153,11 +147,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 103..106,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 103..106,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap
index 380240dd33..0e59d7d457 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_import.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..100,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     names: [
                         Alias {
                             range: 7..16,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("__debug__"),
                                 range: 7..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -30,22 +30,22 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..42,
                     names: [
                         Alias {
                             range: 24..42,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("debug"),
                                 range: 24..29,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("__debug__"),
                                     range: 33..42,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -54,23 +54,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..66,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 48..49,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 57..66,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("__debug__"),
                                 range: 57..66,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -80,29 +80,29 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..99,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 72..73,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 81..99,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("debug"),
                                 range: 81..86,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("__debug__"),
                                     range: 90..99,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap
index acb6dfcc11..0fe9d38d82 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_match.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..33,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..32,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 18..27,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("__debug__"),
                                             range: 18..27,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -44,11 +44,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 29..32,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap
index d638e10acc..1514d68600 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_try.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..44,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..43,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 5..8,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..8,
                                     },
                                 ),
@@ -32,11 +32,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 9..43,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..25,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -47,17 +47,17 @@ Module(
                                     Identifier {
                                         id: Name("__debug__"),
                                         range: 29..38,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 40..43,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 40..43,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap
index 06bce5209a..89647fd3a3 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_type_ali
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..95,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..14,
                             id: Name("__debug__"),
                             ctx: Store,
@@ -25,11 +25,11 @@ Module(
                     type_params: None,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..26,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..21,
                                     id: Name("list"),
                                     ctx: Load,
@@ -37,7 +37,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..25,
                                     id: Name("int"),
                                     ctx: Load,
@@ -50,11 +50,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..94,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..77,
                             id: Name("Debug"),
                             ctx: Store,
@@ -63,16 +63,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 77..88,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 78..87,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("__debug__"),
                                             range: 78..87,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -83,7 +83,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 91..94,
                             id: Name("str"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap
index 3d0560bf59..12c0003499 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_with.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..39,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..38,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 5..33,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..20,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..9,
                                             id: Name("open"),
                                             ctx: Load,
@@ -33,22 +33,23 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 9..20,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 10..19,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 10..19,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "foo.txt",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -63,7 +64,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..33,
                                         id: Name("__debug__"),
                                         ctx: Store,
@@ -75,11 +76,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 35..38,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 35..38,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap
index 9b42c0f684..7ca2868d31 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_await_expre
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..96,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..95,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 55..58,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 58..60,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,20 +35,20 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 66..95,
                                 is_async: false,
                                 decorator_list: [
                                     Decorator {
                                         range: 66..76,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         expression: Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..76,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 73..76,
                                                         id: Name("bar"),
                                                         ctx: Load,
@@ -63,14 +61,12 @@ Module(
                                 name: Identifier {
                                     id: Name("baz"),
                                     range: 85..88,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 88..90,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -81,11 +77,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 92..95,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 92..95,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap
index 0262ed63aa..0dd32e14c7 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_dict_litera
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..68,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..67,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..52,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Dict(
                                 ExprDict {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..52,
                                     items: [
                                         DictItem {
                                             key: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 47..48,
                                                         value: Int(
                                                             3,
@@ -38,7 +38,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 50..51,
                                                     value: Int(
                                                         3,
@@ -54,14 +54,12 @@ Module(
                     name: Identifier {
                         id: Name("bar"),
                         range: 57..60,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 60..62,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -72,11 +70,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 64..67,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 64..67,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap
index 5d24f31dd4..b277f5a73a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_expression_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..89,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..88,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..72,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..72,
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..64,
                                             value: Subscript(
                                                 ExprSubscript {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 46..56,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 46..53,
                                                             id: Name("buttons"),
                                                             ctx: Load,
@@ -41,7 +41,7 @@ Module(
                                                     ),
                                                     slice: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 54..55,
                                                             value: Int(
                                                                 0,
@@ -54,7 +54,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("clicked"),
                                                 range: 57..64,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -62,7 +62,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("connect"),
                                         range: 65..72,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -72,14 +72,12 @@ Module(
                     name: Identifier {
                         id: Name("spam"),
                         range: 77..81,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 81..83,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,11 +88,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 85..88,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..88,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap
index 666aa7e2ba..fe245de447 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_float_liter
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..66,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..65,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..50,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..50,
                                     value: Float(
                                         3.14,
@@ -33,14 +33,12 @@ Module(
                     name: Identifier {
                         id: Name("bar"),
                         range: 55..58,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 58..60,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -51,11 +49,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 62..65,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 62..65,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap
index a55f5868c2..b43a2254b9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_invalid_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..56,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..55,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 0..3,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..3,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2..3,
                                             id: Name("x"),
                                             ctx: Load,
@@ -37,14 +37,14 @@ Module(
                         },
                         Decorator {
                             range: 4..9,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..8,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             id: Name("x"),
                                             ctx: Load,
@@ -56,14 +56,14 @@ Module(
                         },
                         Decorator {
                             range: 10..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..15,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 14..15,
                                             id: Name("x"),
                                             ctx: Load,
@@ -75,15 +75,15 @@ Module(
                         },
                         Decorator {
                             range: 18..26,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..26,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 25..26,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -95,14 +95,14 @@ Module(
                         },
                         Decorator {
                             range: 27..40,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..40,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..40,
                                             id: Name("x"),
                                             ctx: Load,
@@ -115,14 +115,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 45..48,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 48..50,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -133,11 +131,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 52..55,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..55,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap
index 61a1b2b220..2c5bbd3a03 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_missing_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..51,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..15,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..8,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 8..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -36,7 +36,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..15,
                         },
                     ),
@@ -46,16 +46,16 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..32,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 16..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..17,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -66,14 +66,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 22..25,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 25..27,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -84,11 +82,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..32,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                     },
                                 ),
@@ -99,20 +97,20 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..50,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 33..35,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..35,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..34,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -121,7 +119,7 @@ Module(
                                     op: MatMult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..35,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -134,14 +132,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 40..43,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 43..45,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -152,11 +148,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 47..50,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 47..50,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap
index 88a78f186a..948fc24fe2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_missing_new
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..60,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 0..2,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..2,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,14 +32,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 7..10,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 10..12,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -50,11 +48,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..17,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..17,
                                     },
                                 ),
@@ -65,16 +63,16 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..41,
                     is_async: true,
                     decorator_list: [
                         Decorator {
                             range: 18..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..20,
                                     id: Name("x"),
                                     ctx: Load,
@@ -85,14 +83,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 31..34,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 34..36,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -103,11 +99,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..41,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..41,
                                     },
                                 ),
@@ -118,15 +114,15 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..59,
                     decorator_list: [
                         Decorator {
                             range: 42..44,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..44,
                                     id: Name("x"),
                                     ctx: Load,
@@ -137,18 +133,18 @@ Module(
                     name: Identifier {
                         id: Name("Foo"),
                         range: 51..54,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 56..59,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..59,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap
index 0cbedb3919..b852c09115 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_named_expre
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..85,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..84,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..69,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..69,
                                     func: Named(
                                         ExprNamed {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 47..63,
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 47..48,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -37,26 +37,24 @@ Module(
                                             ),
                                             value: Lambda(
                                                 ExprLambda {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 52..63,
                                                     parameters: Some(
                                                         Parameters {
                                                             range: 59..60,
-                                                            node_index: AtomicNodeIndex(
-                                                                0,
-                                                            ),
+                                                            node_index: NodeIndex(None),
                                                             posonlyargs: [],
                                                             args: [
                                                                 ParameterWithDefault {
                                                                     range: 59..60,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     parameter: Parameter {
                                                                         range: 59..60,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         name: Identifier {
                                                                             id: Name("x"),
                                                                             range: 59..60,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         annotation: None,
                                                                     },
@@ -70,7 +68,7 @@ Module(
                                                     ),
                                                     body: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 62..63,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -82,11 +80,11 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 64..69,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 65..68,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -102,14 +100,12 @@ Module(
                     name: Identifier {
                         id: Name("bar"),
                         range: 74..77,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 77..79,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -120,11 +116,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 81..84,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap
index 4172d61656..2429e4f3fd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_non_topleve
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..73,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..72,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..57,
                                     func: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..55,
                                             value: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 46..51,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 46..49,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -41,7 +41,7 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 49..51,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [],
                                                         keywords: [],
                                                     },
@@ -50,14 +50,14 @@ Module(
                                             attr: Identifier {
                                                 id: Name("bar"),
                                                 range: 52..55,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
                                     ),
                                     arguments: Arguments {
                                         range: 55..57,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -68,14 +68,12 @@ Module(
                     name: Identifier {
                         id: Name("baz"),
                         range: 62..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -86,11 +84,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..72,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..72,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap
index d76a5c7bff..a2e7b51517 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_unexpected_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..34,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..22,
                     is_async: true,
                     items: [
                         WithItem {
                             range: 16..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..17,
                                     id: Name("x"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..22,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                     },
                                 ),
@@ -48,12 +48,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..33,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..29,
                                 id: Name("x"),
                                 ctx: Store,
@@ -62,7 +62,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..33,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap
index 40a5517f37..83f2d82287 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/del_debug_py39.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..56,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 47..56,
                                 id: Name("__debug__"),
                                 ctx: Del,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap
index 2e3f2be0af..1ea6b54337 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/del_incomplete_target
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..5,
                                 id: Name("x"),
                                 ctx: Del,
@@ -25,11 +25,11 @@ Module(
                         ),
                         Attribute(
                             ExprAttribute {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 7..9,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 7..8,
                                         id: Name("y"),
                                         ctx: Load,
@@ -38,7 +38,7 @@ Module(
                                 attr: Identifier {
                                     id: Name(""),
                                     range: 9..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 ctx: Del,
                             },
@@ -48,11 +48,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..11,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..11,
                             id: Name("z"),
                             ctx: Load,
@@ -62,12 +62,12 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..24,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..17,
                                 id: Name("x"),
                                 ctx: Del,
@@ -75,11 +75,11 @@ Module(
                         ),
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..23,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..20,
                                         id: Name("y"),
                                         ctx: Load,
@@ -87,12 +87,12 @@ Module(
                                 ),
                                 slice: Slice(
                                     ExprSlice {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..23,
                                         lower: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 22..23,
                                                     id: Name("z"),
                                                     ctx: Load,
@@ -102,7 +102,7 @@ Module(
                                         upper: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 23..23,
                                                     id: Name(""),
                                                     ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap
index 412384af7c..a769520c8a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap
@@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/del_stmt_empty.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..4,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     targets: [],
                 },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap
new file mode 100644
index 0000000000..588dbe3cd8
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap
@@ -0,0 +1,1233 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/different_match_pattern_bindings.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..347,
+        body: [
+            Match(
+                StmtMatch {
+                    node_index: NodeIndex(None),
+                    range: 0..346,
+                    subject: Name(
+                        ExprName {
+                            node_index: NodeIndex(None),
+                            range: 6..7,
+                            id: Name("x"),
+                            ctx: Load,
+                        },
+                    ),
+                    cases: [
+                        MatchCase {
+                            range: 13..32,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 18..27,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 18..21,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 19..20,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 19..20,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 24..27,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 25..26,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("b"),
+                                                                    range: 25..26,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 29..32,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 29..32,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 37..55,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 42..50,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 42..45,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 43..44,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 43..44,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 48..50,
+                                                patterns: [],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 52..55,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 52..55,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 60..83,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 65..78,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 65..71,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 66..67,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("x"),
+                                                                    range: 66..67,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 69..70,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("y"),
+                                                                    range: 69..70,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 74..78,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 75..76,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("x"),
+                                                                    range: 75..76,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 80..83,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 80..83,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 88..113,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 93..108,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 93..99,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 94..95,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 94..95,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 97..98,
+                                                            pattern: None,
+                                                            name: None,
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 102..108,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 103..104,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 103..104,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 106..107,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("b"),
+                                                                    range: 106..107,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 110..113,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 110..113,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 118..140,
+                            node_index: NodeIndex(None),
+                            pattern: MatchSequence(
+                                PatternMatchSequence {
+                                    node_index: NodeIndex(None),
+                                    range: 123..135,
+                                    patterns: [
+                                        MatchAs(
+                                            PatternMatchAs {
+                                                node_index: NodeIndex(None),
+                                                range: 124..125,
+                                                pattern: None,
+                                                name: Some(
+                                                    Identifier {
+                                                        id: Name("x"),
+                                                        range: 124..125,
+                                                        node_index: NodeIndex(None),
+                                                    },
+                                                ),
+                                            },
+                                        ),
+                                        MatchOr(
+                                            PatternMatchOr {
+                                                node_index: NodeIndex(None),
+                                                range: 128..133,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 128..129,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("y"),
+                                                                    range: 128..129,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 132..133,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("z"),
+                                                                    range: 132..133,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 137..140,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 137..140,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 145..170,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 150..165,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 150..153,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 151..152,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 151..152,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 156..159,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 157..158,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("b"),
+                                                                    range: 157..158,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 162..165,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 163..164,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("c"),
+                                                                    range: 163..164,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 167..170,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 167..170,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 175..193,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 180..188,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 180..182,
+                                                patterns: [],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 185..188,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 186..187,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 186..187,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 190..193,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 190..193,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 198..220,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 203..215,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 203..206,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 204..205,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 204..205,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 209..215,
+                                                patterns: [
+                                                    MatchClass(
+                                                        PatternMatchClass {
+                                                            node_index: NodeIndex(None),
+                                                            range: 210..214,
+                                                            cls: Name(
+                                                                ExprName {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 210..211,
+                                                                    id: Name("C"),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            arguments: PatternArguments {
+                                                                range: 211..214,
+                                                                node_index: NodeIndex(None),
+                                                                patterns: [
+                                                                    MatchAs(
+                                                                        PatternMatchAs {
+                                                                            node_index: NodeIndex(None),
+                                                                            range: 212..213,
+                                                                            pattern: None,
+                                                                            name: Some(
+                                                                                Identifier {
+                                                                                    id: Name("x"),
+                                                                                    range: 212..213,
+                                                                                    node_index: NodeIndex(None),
+                                                                                },
+                                                                            ),
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                                keywords: [],
+                                                            },
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 217..220,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 217..220,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 225..246,
+                            node_index: NodeIndex(None),
+                            pattern: MatchSequence(
+                                PatternMatchSequence {
+                                    node_index: NodeIndex(None),
+                                    range: 230..241,
+                                    patterns: [
+                                        MatchOr(
+                                            PatternMatchOr {
+                                                node_index: NodeIndex(None),
+                                                range: 231..240,
+                                                patterns: [
+                                                    MatchSequence(
+                                                        PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
+                                                            range: 231..234,
+                                                            patterns: [
+                                                                MatchAs(
+                                                                    PatternMatchAs {
+                                                                        node_index: NodeIndex(None),
+                                                                        range: 232..233,
+                                                                        pattern: None,
+                                                                        name: Some(
+                                                                            Identifier {
+                                                                                id: Name("a"),
+                                                                                range: 232..233,
+                                                                                node_index: NodeIndex(None),
+                                                                            },
+                                                                        ),
+                                                                    },
+                                                                ),
+                                                            ],
+                                                        },
+                                                    ),
+                                                    MatchSequence(
+                                                        PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
+                                                            range: 237..240,
+                                                            patterns: [
+                                                                MatchAs(
+                                                                    PatternMatchAs {
+                                                                        node_index: NodeIndex(None),
+                                                                        range: 238..239,
+                                                                        pattern: None,
+                                                                        name: Some(
+                                                                            Identifier {
+                                                                                id: Name("b"),
+                                                                                range: 238..239,
+                                                                                node_index: NodeIndex(None),
+                                                                            },
+                                                                        ),
+                                                                    },
+                                                                ),
+                                                            ],
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 243..246,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 243..246,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 251..276,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 256..271,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 256..262,
+                                                patterns: [
+                                                    MatchClass(
+                                                        PatternMatchClass {
+                                                            node_index: NodeIndex(None),
+                                                            range: 257..261,
+                                                            cls: Name(
+                                                                ExprName {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 257..258,
+                                                                    id: Name("C"),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            arguments: PatternArguments {
+                                                                range: 258..261,
+                                                                node_index: NodeIndex(None),
+                                                                patterns: [
+                                                                    MatchAs(
+                                                                        PatternMatchAs {
+                                                                            node_index: NodeIndex(None),
+                                                                            range: 259..260,
+                                                                            pattern: None,
+                                                                            name: Some(
+                                                                                Identifier {
+                                                                                    id: Name("a"),
+                                                                                    range: 259..260,
+                                                                                    node_index: NodeIndex(None),
+                                                                                },
+                                                                            ),
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                                keywords: [],
+                                                            },
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 265..271,
+                                                patterns: [
+                                                    MatchClass(
+                                                        PatternMatchClass {
+                                                            node_index: NodeIndex(None),
+                                                            range: 266..270,
+                                                            cls: Name(
+                                                                ExprName {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 266..267,
+                                                                    id: Name("C"),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            arguments: PatternArguments {
+                                                                range: 267..270,
+                                                                node_index: NodeIndex(None),
+                                                                patterns: [
+                                                                    MatchAs(
+                                                                        PatternMatchAs {
+                                                                            node_index: NodeIndex(None),
+                                                                            range: 268..269,
+                                                                            pattern: None,
+                                                                            name: Some(
+                                                                                Identifier {
+                                                                                    id: Name("b"),
+                                                                                    range: 268..269,
+                                                                                    node_index: NodeIndex(None),
+                                                                                },
+                                                                            ),
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                                keywords: [],
+                                                            },
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 273..276,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 273..276,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 281..312,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 286..307,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 286..295,
+                                                patterns: [
+                                                    MatchClass(
+                                                        PatternMatchClass {
+                                                            node_index: NodeIndex(None),
+                                                            range: 287..294,
+                                                            cls: Name(
+                                                                ExprName {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 287..288,
+                                                                    id: Name("C"),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            arguments: PatternArguments {
+                                                                range: 288..294,
+                                                                node_index: NodeIndex(None),
+                                                                patterns: [
+                                                                    MatchClass(
+                                                                        PatternMatchClass {
+                                                                            node_index: NodeIndex(None),
+                                                                            range: 289..293,
+                                                                            cls: Name(
+                                                                                ExprName {
+                                                                                    node_index: NodeIndex(None),
+                                                                                    range: 289..290,
+                                                                                    id: Name("D"),
+                                                                                    ctx: Load,
+                                                                                },
+                                                                            ),
+                                                                            arguments: PatternArguments {
+                                                                                range: 290..293,
+                                                                                node_index: NodeIndex(None),
+                                                                                patterns: [
+                                                                                    MatchAs(
+                                                                                        PatternMatchAs {
+                                                                                            node_index: NodeIndex(None),
+                                                                                            range: 291..292,
+                                                                                            pattern: None,
+                                                                                            name: Some(
+                                                                                                Identifier {
+                                                                                                    id: Name("a"),
+                                                                                                    range: 291..292,
+                                                                                                    node_index: NodeIndex(None),
+                                                                                                },
+                                                                                            ),
+                                                                                        },
+                                                                                    ),
+                                                                                ],
+                                                                                keywords: [],
+                                                                            },
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                                keywords: [],
+                                                            },
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 298..307,
+                                                patterns: [
+                                                    MatchClass(
+                                                        PatternMatchClass {
+                                                            node_index: NodeIndex(None),
+                                                            range: 299..306,
+                                                            cls: Name(
+                                                                ExprName {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 299..300,
+                                                                    id: Name("C"),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            arguments: PatternArguments {
+                                                                range: 300..306,
+                                                                node_index: NodeIndex(None),
+                                                                patterns: [
+                                                                    MatchClass(
+                                                                        PatternMatchClass {
+                                                                            node_index: NodeIndex(None),
+                                                                            range: 301..305,
+                                                                            cls: Name(
+                                                                                ExprName {
+                                                                                    node_index: NodeIndex(None),
+                                                                                    range: 301..302,
+                                                                                    id: Name("D"),
+                                                                                    ctx: Load,
+                                                                                },
+                                                                            ),
+                                                                            arguments: PatternArguments {
+                                                                                range: 302..305,
+                                                                                node_index: NodeIndex(None),
+                                                                                patterns: [
+                                                                                    MatchAs(
+                                                                                        PatternMatchAs {
+                                                                                            node_index: NodeIndex(None),
+                                                                                            range: 303..304,
+                                                                                            pattern: None,
+                                                                                            name: Some(
+                                                                                                Identifier {
+                                                                                                    id: Name("b"),
+                                                                                                    range: 303..304,
+                                                                                                    node_index: NodeIndex(None),
+                                                                                                },
+                                                                                            ),
+                                                                                        },
+                                                                                    ),
+                                                                                ],
+                                                                                keywords: [],
+                                                                            },
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                                keywords: [],
+                                                            },
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 309..312,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 309..312,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 317..346,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 322..341,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 322..330,
+                                                patterns: [
+                                                    MatchSequence(
+                                                        PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
+                                                            range: 323..329,
+                                                            patterns: [
+                                                                MatchAs(
+                                                                    PatternMatchAs {
+                                                                        node_index: NodeIndex(None),
+                                                                        range: 324..325,
+                                                                        pattern: None,
+                                                                        name: Some(
+                                                                            Identifier {
+                                                                                id: Name("a"),
+                                                                                range: 324..325,
+                                                                                node_index: NodeIndex(None),
+                                                                            },
+                                                                        ),
+                                                                    },
+                                                                ),
+                                                                MatchAs(
+                                                                    PatternMatchAs {
+                                                                        node_index: NodeIndex(None),
+                                                                        range: 327..328,
+                                                                        pattern: None,
+                                                                        name: Some(
+                                                                            Identifier {
+                                                                                id: Name("b"),
+                                                                                range: 327..328,
+                                                                                node_index: NodeIndex(None),
+                                                                            },
+                                                                        ),
+                                                                    },
+                                                                ),
+                                                            ],
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 333..341,
+                                                patterns: [
+                                                    MatchSequence(
+                                                        PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
+                                                            range: 334..340,
+                                                            patterns: [
+                                                                MatchAs(
+                                                                    PatternMatchAs {
+                                                                        node_index: NodeIndex(None),
+                                                                        range: 335..336,
+                                                                        pattern: None,
+                                                                        name: Some(
+                                                                            Identifier {
+                                                                                id: Name("c"),
+                                                                                range: 335..336,
+                                                                                node_index: NodeIndex(None),
+                                                                            },
+                                                                        ),
+                                                                    },
+                                                                ),
+                                                                MatchAs(
+                                                                    PatternMatchAs {
+                                                                        node_index: NodeIndex(None),
+                                                                        range: 338..339,
+                                                                        pattern: None,
+                                                                        name: Some(
+                                                                            Identifier {
+                                                                                id: Name("d"),
+                                                                                range: 338..339,
+                                                                                node_index: NodeIndex(None),
+                                                                            },
+                                                                        ),
+                                                                    },
+                                                                ),
+                                                            ],
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 343..346,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 343..346,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                    ],
+                },
+            ),
+        ],
+    },
+)
+```
+## Semantic Syntax Errors
+
+  |
+1 | match x:
+2 |     case [a] | [b]: ...
+  |          ^^^^^^^^^ Syntax Error: alternative patterns bind different names
+3 |     case [a] | []: ...
+4 |     case (x, y) | (x,): ...
+  |
+
+
+  |
+1 | match x:
+2 |     case [a] | [b]: ...
+3 |     case [a] | []: ...
+  |          ^^^^^^^^ Syntax Error: alternative patterns bind different names
+4 |     case (x, y) | (x,): ...
+5 |     case [a, _] | [a, b]: ...
+  |
+
+
+  |
+2 |     case [a] | [b]: ...
+3 |     case [a] | []: ...
+4 |     case (x, y) | (x,): ...
+  |          ^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+5 |     case [a, _] | [a, b]: ...
+6 |     case (x, (y | z)): ...
+  |
+
+
+  |
+3 |     case [a] | []: ...
+4 |     case (x, y) | (x,): ...
+5 |     case [a, _] | [a, b]: ...
+  |          ^^^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+6 |     case (x, (y | z)): ...
+7 |     case [a] | [b] | [c]: ...
+  |
+
+
+  |
+4 |     case (x, y) | (x,): ...
+5 |     case [a, _] | [a, b]: ...
+6 |     case (x, (y | z)): ...
+  |               ^^^^^ Syntax Error: alternative patterns bind different names
+7 |     case [a] | [b] | [c]: ...
+8 |     case [] | [a]: ...
+  |
+
+
+  |
+5 |     case [a, _] | [a, b]: ...
+6 |     case (x, (y | z)): ...
+7 |     case [a] | [b] | [c]: ...
+  |          ^^^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+8 |     case [] | [a]: ...
+9 |     case [a] | [C(x)]: ...
+  |
+
+
+   |
+ 6 |     case (x, (y | z)): ...
+ 7 |     case [a] | [b] | [c]: ...
+ 8 |     case [] | [a]: ...
+   |          ^^^^^^^^ Syntax Error: alternative patterns bind different names
+ 9 |     case [a] | [C(x)]: ...
+10 |     case [[a] | [b]]: ...
+   |
+
+
+   |
+ 7 |     case [a] | [b] | [c]: ...
+ 8 |     case [] | [a]: ...
+ 9 |     case [a] | [C(x)]: ...
+   |          ^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+10 |     case [[a] | [b]]: ...
+11 |     case [C(a)] | [C(b)]: ...
+   |
+
+
+   |
+ 8 |     case [] | [a]: ...
+ 9 |     case [a] | [C(x)]: ...
+10 |     case [[a] | [b]]: ...
+   |           ^^^^^^^^^ Syntax Error: alternative patterns bind different names
+11 |     case [C(a)] | [C(b)]: ...
+12 |     case [C(D(a))] | [C(D(b))]: ...
+   |
+
+
+   |
+ 9 |     case [a] | [C(x)]: ...
+10 |     case [[a] | [b]]: ...
+11 |     case [C(a)] | [C(b)]: ...
+   |          ^^^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+12 |     case [C(D(a))] | [C(D(b))]: ...
+13 |     case [(a, b)] | [(c, d)]: ...
+   |
+
+
+   |
+10 |     case [[a] | [b]]: ...
+11 |     case [C(a)] | [C(b)]: ...
+12 |     case [C(D(a))] | [C(D(b))]: ...
+   |          ^^^^^^^^^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+13 |     case [(a, b)] | [(c, d)]: ...
+   |
+
+
+   |
+11 |     case [C(a)] | [C(b)]: ...
+12 |     case [C(D(a))] | [C(D(b))]: ...
+13 |     case [(a, b)] | [(c, d)]: ...
+   |          ^^^^^^^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+   |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap
index 3614aa08aa..06b5f87daa 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/dotted_name_multiple_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..25,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     names: [
                         Alias {
                             range: 7..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a..b"),
                                 range: 7..11,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -30,16 +30,16 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..20,
                     names: [
                         Alias {
                             range: 19..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 19..20,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -48,11 +48,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..23,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..23,
                         },
                     ),
@@ -60,11 +60,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..24,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             id: Name("b"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap
index 950b30f63d..83e2d732da 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/duplicate_match_class
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..231,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..230,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,14 +25,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..38,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 18..33,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 18..23,
                                             id: Name("Class"),
                                             ctx: Load,
@@ -40,24 +40,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 23..33,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 24..27,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 24..25,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 26..27,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 26..27,
                                                                 value: Int(
                                                                     1,
@@ -69,19 +69,19 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 29..32,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 29..30,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 31..32,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 31..32,
                                                                 value: Int(
                                                                     2,
@@ -99,11 +99,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 35..38,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 35..38,
                                             },
                                         ),
@@ -113,19 +113,19 @@ Module(
                         },
                         MatchCase {
                             range: 43..70,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 48..65,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchClass(
                                             PatternMatchClass {
+                                                node_index: NodeIndex(None),
                                                 range: 49..64,
-                                                node_index: AtomicNodeIndex(..),
                                                 cls: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 49..54,
                                                         id: Name("Class"),
                                                         ctx: Load,
@@ -133,24 +133,24 @@ Module(
                                                 ),
                                                 arguments: PatternArguments {
                                                     range: 54..64,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     patterns: [],
                                                     keywords: [
                                                         PatternKeyword {
                                                             range: 55..58,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("x"),
                                                                 range: 55..56,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 57..58,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 57..58,
                                                                             value: Int(
                                                                                 1,
@@ -162,19 +162,19 @@ Module(
                                                         },
                                                         PatternKeyword {
                                                             range: 60..63,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("x"),
                                                                 range: 60..61,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 62..63,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 62..63,
                                                                             value: Int(
                                                                                 2,
@@ -195,11 +195,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 67..70,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..70,
                                             },
                                         ),
@@ -209,26 +209,27 @@ Module(
                         },
                         MatchCase {
                             range: 75..113,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 80..108,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 81..84,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 81..84,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -237,18 +238,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 89..92,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 89..92,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "y",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -259,25 +261,25 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 86..87,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 86..87,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchClass(
                                             PatternMatchClass {
+                                                node_index: NodeIndex(None),
                                                 range: 94..107,
-                                                node_index: AtomicNodeIndex(..),
                                                 cls: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 94..97,
                                                         id: Name("Foo"),
                                                         ctx: Load,
@@ -285,24 +287,24 @@ Module(
                                                 ),
                                                 arguments: PatternArguments {
                                                     range: 97..107,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     patterns: [],
                                                     keywords: [
                                                         PatternKeyword {
                                                             range: 98..101,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("x"),
                                                                 range: 98..99,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 100..101,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 100..101,
                                                                             value: Int(
                                                                                 1,
@@ -314,19 +316,19 @@ Module(
                                                         },
                                                         PatternKeyword {
                                                             range: 103..106,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("x"),
                                                                 range: 103..104,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 105..106,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 105..106,
                                                                             value: Int(
                                                                                 2,
@@ -348,11 +350,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 110..113,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 110..113,
                                             },
                                         ),
@@ -362,16 +364,16 @@ Module(
                         },
                         MatchCase {
                             range: 118..162,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 123..157,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 124..126,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [],
                                                 patterns: [],
                                                 rest: None,
@@ -379,23 +381,24 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 128..156,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 129..132,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 129..132,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "x",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -404,18 +407,19 @@ Module(
                                                     ),
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 137..140,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 137..140,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "y",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -426,25 +430,25 @@ Module(
                                                 patterns: [
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 134..135,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: None,
                                                             name: Some(
                                                                 Identifier {
                                                                     id: Name("x"),
                                                                     range: 134..135,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
                                                     ),
                                                     MatchClass(
                                                         PatternMatchClass {
+                                                            node_index: NodeIndex(None),
                                                             range: 142..155,
-                                                            node_index: AtomicNodeIndex(..),
                                                             cls: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 142..145,
                                                                     id: Name("Foo"),
                                                                     ctx: Load,
@@ -452,24 +456,24 @@ Module(
                                                             ),
                                                             arguments: PatternArguments {
                                                                 range: 145..155,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 patterns: [],
                                                                 keywords: [
                                                                     PatternKeyword {
                                                                         range: 146..149,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         attr: Identifier {
                                                                             id: Name("x"),
                                                                             range: 146..147,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         pattern: MatchValue(
                                                                             PatternMatchValue {
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 148..149,
-                                                                                node_index: AtomicNodeIndex(..),
                                                                                 value: NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 148..149,
                                                                                         value: Int(
                                                                                             1,
@@ -481,19 +485,19 @@ Module(
                                                                     },
                                                                     PatternKeyword {
                                                                         range: 151..154,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         attr: Identifier {
                                                                             id: Name("x"),
                                                                             range: 151..152,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         pattern: MatchValue(
                                                                             PatternMatchValue {
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 153..154,
-                                                                                node_index: AtomicNodeIndex(..),
                                                                                 value: NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 153..154,
                                                                                         value: Int(
                                                                                             2,
@@ -518,11 +522,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 159..162,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 159..162,
                                             },
                                         ),
@@ -532,14 +536,14 @@ Module(
                         },
                         MatchCase {
                             range: 167..230,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 172..225,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 172..177,
                                             id: Name("Class"),
                                             ctx: Load,
@@ -547,24 +551,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 177..225,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 178..181,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 178..179,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 180..181,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 180..181,
                                                                 value: Int(
                                                                     1,
@@ -576,31 +580,32 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 183..201,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("d"),
                                                     range: 183..184,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchMapping(
                                                     PatternMatchMapping {
+                                                        node_index: NodeIndex(None),
                                                         range: 185..201,
-                                                        node_index: AtomicNodeIndex(..),
                                                         keys: [
                                                             StringLiteral(
                                                                 ExprStringLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 186..189,
                                                                     value: StringLiteralValue {
                                                                         inner: Single(
                                                                             StringLiteral {
                                                                                 range: 186..189,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "x",
                                                                                 flags: StringLiteralFlags {
                                                                                     quote_style: Double,
                                                                                     prefix: Empty,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -609,18 +614,19 @@ Module(
                                                             ),
                                                             StringLiteral(
                                                                 ExprStringLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 194..197,
                                                                     value: StringLiteralValue {
                                                                         inner: Single(
                                                                             StringLiteral {
                                                                                 range: 194..197,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "x",
                                                                                 flags: StringLiteralFlags {
                                                                                     quote_style: Double,
                                                                                     prefix: Empty,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -631,11 +637,11 @@ Module(
                                                         patterns: [
                                                             MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 191..192,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 191..192,
                                                                             value: Int(
                                                                                 1,
@@ -646,11 +652,11 @@ Module(
                                                             ),
                                                             MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 199..200,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 199..200,
                                                                             value: Int(
                                                                                 2,
@@ -666,19 +672,19 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 203..224,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("other"),
                                                     range: 203..208,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchClass(
                                                     PatternMatchClass {
+                                                        node_index: NodeIndex(None),
                                                         range: 209..224,
-                                                        node_index: AtomicNodeIndex(..),
                                                         cls: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 209..214,
                                                                 id: Name("Class"),
                                                                 ctx: Load,
@@ -686,24 +692,24 @@ Module(
                                                         ),
                                                         arguments: PatternArguments {
                                                             range: 214..224,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             patterns: [],
                                                             keywords: [
                                                                 PatternKeyword {
                                                                     range: 215..218,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     attr: Identifier {
                                                                         id: Name("x"),
                                                                         range: 215..216,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     pattern: MatchValue(
                                                                         PatternMatchValue {
+                                                                            node_index: NodeIndex(None),
                                                                             range: 217..218,
-                                                                            node_index: AtomicNodeIndex(..),
                                                                             value: NumberLiteral(
                                                                                 ExprNumberLiteral {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 217..218,
                                                                                     value: Int(
                                                                                         1,
@@ -715,19 +721,19 @@ Module(
                                                                 },
                                                                 PatternKeyword {
                                                                     range: 220..223,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     attr: Identifier {
                                                                         id: Name("x"),
                                                                         range: 220..221,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     pattern: MatchValue(
                                                                         PatternMatchValue {
+                                                                            node_index: NodeIndex(None),
                                                                             range: 222..223,
-                                                                            node_index: AtomicNodeIndex(..),
                                                                             value: NumberLiteral(
                                                                                 ExprNumberLiteral {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 222..223,
                                                                                     value: Int(
                                                                                         2,
@@ -750,11 +756,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 227..230,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 227..230,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap
index 4cfbb7011e..9ebc6f8748 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/duplicate_match_key.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..533,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..532,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,26 +25,27 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..39,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 18..34,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..22,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 19..22,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -53,18 +54,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..30,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 27..30,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -75,11 +77,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 24..25,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 24..25,
                                                         value: Int(
                                                             1,
@@ -90,11 +92,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 32..33,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 32..33,
                                                         value: Int(
                                                             2,
@@ -111,11 +113,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 36..39,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 36..39,
                                             },
                                         ),
@@ -125,21 +127,21 @@ Module(
                         },
                         MatchCase {
                             range: 44..72,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 49..67,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         BytesLiteral(
                                             ExprBytesLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 50..54,
                                                 value: BytesLiteralValue {
                                                     inner: Single(
                                                         BytesLiteral {
                                                             range: 50..54,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: [
                                                                 120,
                                                             ],
@@ -147,6 +149,7 @@ Module(
                                                                 quote_style: Double,
                                                                 prefix: Regular,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -155,13 +158,13 @@ Module(
                                         ),
                                         BytesLiteral(
                                             ExprBytesLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 59..63,
                                                 value: BytesLiteralValue {
                                                     inner: Single(
                                                         BytesLiteral {
                                                             range: 59..63,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: [
                                                                 120,
                                                             ],
@@ -169,6 +172,7 @@ Module(
                                                                 quote_style: Double,
                                                                 prefix: Regular,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -179,11 +183,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 56..57,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 56..57,
                                                         value: Int(
                                                             1,
@@ -194,11 +198,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 65..66,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 65..66,
                                                         value: Int(
                                                             2,
@@ -215,11 +219,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..72,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 69..72,
                                             },
                                         ),
@@ -229,15 +233,15 @@ Module(
                         },
                         MatchCase {
                             range: 77..99,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 82..94,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 83..84,
                                                 value: Int(
                                                     0,
@@ -246,7 +250,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 89..90,
                                                 value: Int(
                                                     0,
@@ -257,11 +261,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 86..87,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 86..87,
                                                         value: Int(
                                                             1,
@@ -272,11 +276,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 92..93,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 92..93,
                                                         value: Int(
                                                             2,
@@ -293,11 +297,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..99,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 96..99,
                                             },
                                         ),
@@ -307,15 +311,15 @@ Module(
                         },
                         MatchCase {
                             range: 104..130,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 109..125,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 110..113,
                                                 value: Float(
                                                     1.0,
@@ -324,7 +328,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 118..121,
                                                 value: Float(
                                                     1.0,
@@ -335,11 +339,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 115..116,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 115..116,
                                                         value: Int(
                                                             1,
@@ -350,11 +354,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 123..124,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 123..124,
                                                         value: Int(
                                                             2,
@@ -371,11 +375,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 127..130,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 127..130,
                                             },
                                         ),
@@ -385,19 +389,19 @@ Module(
                         },
                         MatchCase {
                             range: 135..171,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 140..166,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 141..149,
                                                 left: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 141..144,
                                                         value: Float(
                                                             1.0,
@@ -407,7 +411,7 @@ Module(
                                                 op: Add,
                                                 right: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 147..149,
                                                         value: Complex {
                                                             real: 0.0,
@@ -419,11 +423,11 @@ Module(
                                         ),
                                         BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 154..162,
                                                 left: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 154..157,
                                                         value: Float(
                                                             1.0,
@@ -433,7 +437,7 @@ Module(
                                                 op: Add,
                                                 right: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 160..162,
                                                         value: Complex {
                                                             real: 0.0,
@@ -447,11 +451,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 151..152,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 151..152,
                                                         value: Int(
                                                             1,
@@ -462,11 +466,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 164..165,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 164..165,
                                                         value: Int(
                                                             2,
@@ -483,11 +487,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 168..171,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 168..171,
                                             },
                                         ),
@@ -497,22 +501,22 @@ Module(
                         },
                         MatchCase {
                             range: 176..204,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 181..199,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 182..186,
                                                 value: true,
                                             },
                                         ),
                                         BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 191..195,
                                                 value: true,
                                             },
@@ -521,11 +525,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 188..189,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 188..189,
                                                         value: Int(
                                                             1,
@@ -536,11 +540,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 197..198,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 197..198,
                                                         value: Int(
                                                             2,
@@ -557,11 +561,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 201..204,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 201..204,
                                             },
                                         ),
@@ -571,21 +575,21 @@ Module(
                         },
                         MatchCase {
                             range: 209..237,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 214..232,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 215..219,
                                             },
                                         ),
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 224..228,
                                             },
                                         ),
@@ -593,11 +597,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 221..222,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 221..222,
                                                         value: Int(
                                                             1,
@@ -608,11 +612,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 230..231,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 230..231,
                                                         value: Int(
                                                             2,
@@ -629,11 +633,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 234..237,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 234..237,
                                             },
                                         ),
@@ -643,26 +647,27 @@ Module(
                         },
                         MatchCase {
                             range: 242..319,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 247..314,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 253..277,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 253..277,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x\n    y\n    z\n    ",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: true,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -671,18 +676,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 286..310,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 286..310,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x\n    y\n    z\n    ",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: true,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -693,11 +699,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 279..280,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 279..280,
                                                         value: Int(
                                                             1,
@@ -708,11 +714,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 312..313,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 312..313,
                                                         value: Int(
                                                             2,
@@ -729,11 +735,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 316..319,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 316..319,
                                             },
                                         ),
@@ -743,26 +749,27 @@ Module(
                         },
                         MatchCase {
                             range: 324..358,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 329..353,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 330..333,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 330..333,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -771,18 +778,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 338..341,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 338..341,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -791,18 +799,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 346..349,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 346..349,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -813,11 +822,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 335..336,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 335..336,
                                                         value: Int(
                                                             1,
@@ -828,11 +837,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 343..344,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 343..344,
                                                         value: Int(
                                                             2,
@@ -843,11 +852,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 351..352,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 351..352,
                                                         value: Int(
                                                             3,
@@ -864,11 +873,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 355..358,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 355..358,
                                             },
                                         ),
@@ -878,15 +887,15 @@ Module(
                         },
                         MatchCase {
                             range: 363..401,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 368..396,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 369..370,
                                                 value: Int(
                                                     0,
@@ -895,18 +904,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 375..378,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 375..378,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -915,7 +925,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 383..384,
                                                 value: Int(
                                                     0,
@@ -924,18 +934,19 @@ Module(
                                         ),
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 389..392,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 389..392,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "x",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -946,11 +957,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 372..373,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 372..373,
                                                         value: Int(
                                                             1,
@@ -961,11 +972,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 380..381,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 380..381,
                                                         value: Int(
                                                             1,
@@ -976,11 +987,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 386..387,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 386..387,
                                                         value: Int(
                                                             2,
@@ -991,11 +1002,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 394..395,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 394..395,
                                                         value: Int(
                                                             2,
@@ -1012,11 +1023,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 398..401,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 398..401,
                                             },
                                         ),
@@ -1026,31 +1037,32 @@ Module(
                         },
                         MatchCase {
                             range: 406..434,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 411..429,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 412..428,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 413..416,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 413..416,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "x",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -1059,18 +1071,19 @@ Module(
                                                     ),
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 421..424,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 421..424,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "x",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -1081,11 +1094,11 @@ Module(
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 418..419,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 418..419,
                                                                     value: Int(
                                                                         1,
@@ -1096,11 +1109,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 426..427,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 426..427,
                                                                     value: Int(
                                                                         2,
@@ -1120,11 +1133,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 431..434,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 431..434,
                                             },
                                         ),
@@ -1134,14 +1147,14 @@ Module(
                         },
                         MatchCase {
                             range: 439..477,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 444..472,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 444..447,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -1149,24 +1162,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 447..472,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 448..451,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 448..449,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 450..451,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 450..451,
                                                                 value: Int(
                                                                     1,
@@ -1178,31 +1191,32 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 453..471,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("y"),
                                                     range: 453..454,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchMapping(
                                                     PatternMatchMapping {
+                                                        node_index: NodeIndex(None),
                                                         range: 455..471,
-                                                        node_index: AtomicNodeIndex(..),
                                                         keys: [
                                                             StringLiteral(
                                                                 ExprStringLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 456..459,
                                                                     value: StringLiteralValue {
                                                                         inner: Single(
                                                                             StringLiteral {
                                                                                 range: 456..459,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "x",
                                                                                 flags: StringLiteralFlags {
                                                                                     quote_style: Double,
                                                                                     prefix: Empty,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -1211,18 +1225,19 @@ Module(
                                                             ),
                                                             StringLiteral(
                                                                 ExprStringLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 464..467,
                                                                     value: StringLiteralValue {
                                                                         inner: Single(
                                                                             StringLiteral {
                                                                                 range: 464..467,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "x",
                                                                                 flags: StringLiteralFlags {
                                                                                     quote_style: Double,
                                                                                     prefix: Empty,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -1233,11 +1248,11 @@ Module(
                                                         patterns: [
                                                             MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 461..462,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 461..462,
                                                                             value: Int(
                                                                                 1,
@@ -1248,11 +1263,11 @@ Module(
                                                             ),
                                                             MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 469..470,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 469..470,
                                                                             value: Int(
                                                                                 2,
@@ -1274,11 +1289,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 474..477,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 474..477,
                                             },
                                         ),
@@ -1288,19 +1303,19 @@ Module(
                         },
                         MatchCase {
                             range: 482..532,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 487..527,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchClass(
                                             PatternMatchClass {
+                                                node_index: NodeIndex(None),
                                                 range: 488..496,
-                                                node_index: AtomicNodeIndex(..),
                                                 cls: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 488..491,
                                                         id: Name("Foo"),
                                                         ctx: Load,
@@ -1308,24 +1323,24 @@ Module(
                                                 ),
                                                 arguments: PatternArguments {
                                                     range: 491..496,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     patterns: [],
                                                     keywords: [
                                                         PatternKeyword {
                                                             range: 492..495,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("x"),
                                                                 range: 492..493,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 494..495,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 494..495,
                                                                             value: Int(
                                                                                 1,
@@ -1341,11 +1356,11 @@ Module(
                                         ),
                                         MatchClass(
                                             PatternMatchClass {
+                                                node_index: NodeIndex(None),
                                                 range: 498..526,
-                                                node_index: AtomicNodeIndex(..),
                                                 cls: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 498..501,
                                                         id: Name("Foo"),
                                                         ctx: Load,
@@ -1353,24 +1368,24 @@ Module(
                                                 ),
                                                 arguments: PatternArguments {
                                                     range: 501..526,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     patterns: [],
                                                     keywords: [
                                                         PatternKeyword {
                                                             range: 502..505,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("x"),
                                                                 range: 502..503,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 504..505,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 504..505,
                                                                             value: Int(
                                                                                 1,
@@ -1382,31 +1397,32 @@ Module(
                                                         },
                                                         PatternKeyword {
                                                             range: 507..525,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("y"),
                                                                 range: 507..508,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchMapping(
                                                                 PatternMatchMapping {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 509..525,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     keys: [
                                                                         StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 510..513,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 510..513,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "x",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Double,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -1415,18 +1431,19 @@ Module(
                                                                         ),
                                                                         StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 518..521,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 518..521,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "x",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Double,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -1437,11 +1454,11 @@ Module(
                                                                     patterns: [
                                                                         MatchValue(
                                                                             PatternMatchValue {
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 515..516,
-                                                                                node_index: AtomicNodeIndex(..),
                                                                                 value: NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 515..516,
                                                                                         value: Int(
                                                                                             1,
@@ -1452,11 +1469,11 @@ Module(
                                                                         ),
                                                                         MatchValue(
                                                                             PatternMatchValue {
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 523..524,
-                                                                                node_index: AtomicNodeIndex(..),
                                                                                 value: NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 523..524,
                                                                                         value: Int(
                                                                                             2,
@@ -1481,11 +1498,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 529..532,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 529..532,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap
index 55e020ad84..6630565e33 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/duplicate_type_parame
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..261,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             id: Name("Alias"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 10..16,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 11..12,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 11..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -42,12 +42,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 14..15,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 14..15,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -58,7 +58,7 @@ Module(
                     ),
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..22,
                         },
                     ),
@@ -66,28 +66,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..45,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 27..28,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 28..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 29..30,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 29..30,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -95,12 +95,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 32..33,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 32..33,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -111,26 +111,24 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 34..40,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 35..39,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 35..39,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("t"),
                                         range: 35..36,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 38..39,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -149,11 +147,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 42..45,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 42..45,
                                     },
                                 ),
@@ -164,27 +162,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..64,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("C"),
                         range: 52..53,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 53..59,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 54..55,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -192,12 +190,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 57..58,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -210,11 +208,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 61..64,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 61..64,
                                     },
                                 ),
@@ -225,11 +223,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..132,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..75,
                             id: Name("Alias"),
                             ctx: Store,
@@ -238,16 +236,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 75..126,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 76..77,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 76..77,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -255,17 +253,17 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 79..85,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 79..80,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 82..85,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -277,22 +275,22 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 87..102,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("V"),
                                             range: 87..88,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 90..102,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 91..94,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -300,7 +298,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 96..101,
                                                                 id: Name("bytes"),
                                                                 ctx: Load,
@@ -317,42 +315,42 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 104..107,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 105..107,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 109..112,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 111..112,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 114..125,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 114..115,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 118..125,
                                                     id: Name("default"),
                                                     ctx: Load,
@@ -366,7 +364,7 @@ Module(
                     ),
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 129..132,
                         },
                     ),
@@ -374,28 +372,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..154,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 137..138,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 138..147,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 139..140,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 139..140,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -403,12 +401,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 142..143,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 142..143,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -416,12 +414,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 145..146,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 145..146,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -432,9 +430,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 147..149,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -445,11 +441,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 151..154,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 151..154,
                                     },
                                 ),
@@ -460,28 +456,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 169..188,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 173..174,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 174..181,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 175..176,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 175..176,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -489,12 +485,12 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 178..180,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 179..180,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -504,9 +500,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 181..183,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -517,11 +511,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 185..188,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 185..188,
                                     },
                                 ),
@@ -532,28 +526,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 218..238,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 222..223,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 223..231,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 224..225,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 224..225,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -561,12 +555,12 @@ Module(
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 227..230,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 229..230,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -576,9 +570,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 231..233,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -589,11 +581,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 235..238,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 235..238,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap
index 0530c751f8..668f37596b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_star_py310.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..126,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..125,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
@@ -32,11 +32,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 53..76,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 61..71,
                                             id: Name("ValueError"),
                                             ctx: Load,
@@ -47,11 +47,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 73..76,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 73..76,
                                                 },
                                             ),
@@ -63,11 +63,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 77..98,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 85..93,
                                             id: Name("KeyError"),
                                             ctx: Load,
@@ -78,11 +78,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 95..98,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 95..98,
                                                 },
                                             ),
@@ -94,11 +94,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 99..125,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 115..120,
                                             id: Name("Error"),
                                             ctx: Load,
@@ -109,11 +109,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 122..125,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 122..125,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap
index fb1f2b6181..475b5a7e2c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_invalid_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..74,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..38,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -26,16 +26,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 14..38,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 21..28,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 27..28,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -49,7 +49,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..38,
                                         },
                                     ),
@@ -64,12 +64,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 39..73,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 48..52,
                             },
                         ),
@@ -78,15 +78,15 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 53..73,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 61..63,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 62..63,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -100,7 +100,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 69..73,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap
index b9b370d139..bdc389bfcd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_missing_a
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..73,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..72,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -26,11 +26,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 14..43,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 21..30,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -41,7 +41,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..43,
                                         },
                                     ),
@@ -51,11 +51,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 44..72,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 51..60,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -66,7 +66,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 68..72,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap
index fa14993f79..e3f602dd24 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_missing_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..166,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..37,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -26,19 +26,19 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 14..37,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: Some(
                                     Identifier {
                                         id: Name("exc"),
                                         range: 24..27,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 33..37,
                                         },
                                     ),
@@ -53,12 +53,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..165,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 101..105,
                             },
                         ),
@@ -67,13 +67,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 106..123,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 119..123,
                                         },
                                     ),
@@ -83,13 +83,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 124..140,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 136..140,
                                         },
                                     ),
@@ -99,19 +99,19 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 141..165,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: Some(
                                     Identifier {
                                         id: Name("exc"),
                                         range: 152..155,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 161..165,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap
index fc9b78dde0..fe8b15dd88 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_missing_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..34,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..33,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -26,13 +26,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 14..33,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..33,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap
index ddc722c892..153f50e02e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_unparenth
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..86,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..42,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -26,16 +26,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 14..42,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 21..25,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 21..22,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 24..25,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -59,13 +59,13 @@ Module(
                                     Identifier {
                                         id: Name("exc"),
                                         range: 29..32,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 38..42,
                                         },
                                     ),
@@ -80,12 +80,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..85,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 52..56,
                             },
                         ),
@@ -94,16 +94,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 57..85,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..69,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 65..66,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -111,7 +111,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 68..69,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -127,13 +127,13 @@ Module(
                                     Identifier {
                                         id: Name("eg"),
                                         range: 73..75,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 81..85,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap
index 848e2c1299..671eed373c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_unparenth
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..117,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..79,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 53..57,
                             },
                         ),
@@ -26,16 +26,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 58..79,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..69,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 65..66,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 68..69,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -59,7 +59,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 75..79,
                                         },
                                     ),
@@ -74,12 +74,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 80..116,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 89..93,
                             },
                         ),
@@ -88,16 +88,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 94..116,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 102..106,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 102..103,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -105,7 +105,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 105..106,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -121,7 +121,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 112..116,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap
index 0637b78f08..e3f633b879 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/do
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..55,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..15,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,21 +28,21 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 5..14,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 7..14,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 13..14,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -60,15 +60,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..27,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..27,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..20,
                                     id: Name("call"),
                                     ctx: Load,
@@ -76,20 +76,20 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 20..27,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 21..26,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 24..26,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 25..26,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -107,15 +107,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..38,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..38,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..32,
                                     id: Name("call"),
                                     ctx: Load,
@@ -123,20 +123,20 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 32..38,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 33..37,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 35..37,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 36..37,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -154,15 +154,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..54,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..54,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 40..44,
                                     id: Name("call"),
                                     ctx: Load,
@@ -170,11 +170,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 44..54,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 52..53,
                                             value: Int(
                                                 1,
@@ -185,11 +185,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 45..48,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 47..48,
                                                 id: Name("x"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap
index 6e6e7699e2..9f5a0cfa41 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/du
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..28,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..3,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -28,22 +28,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 3..28,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 4..7,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("a"),
                                                 range: 4..5,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..7,
                                                 value: Int(
                                                     1,
@@ -53,17 +53,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 9..12,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("b"),
                                                 range: 9..10,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 11..12,
                                                 value: Int(
                                                     2,
@@ -73,17 +73,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 14..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("c"),
                                                 range: 14..15,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..17,
                                                 value: Int(
                                                     3,
@@ -93,17 +93,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 19..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("b"),
                                                 range: 19..20,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 21..22,
                                                 value: Int(
                                                     4,
@@ -113,17 +113,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 24..27,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("a"),
                                                 range: 24..25,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..27,
                                                 value: Int(
                                                     5,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap
index e517103c14..1e7f4b6192 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/in
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..67,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..15,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,22 +28,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 5..14,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name(""),
                                                 range: 5..10,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..14,
                                                 value: Int(
                                                     1,
@@ -59,15 +59,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..32,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..32,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..20,
                                     id: Name("call"),
                                     ctx: Load,
@@ -75,22 +75,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 20..32,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 21..31,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name(""),
                                                 range: 21..27,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 30..31,
                                                 value: Int(
                                                     1,
@@ -106,15 +106,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..47,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..47,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..38,
                                     id: Name("call"),
                                     ctx: Load,
@@ -122,16 +122,16 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 38..47,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..46,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 45..46,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -149,15 +149,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 48..66,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 48..66,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..52,
                                     id: Name("call"),
                                     ctx: Load,
@@ -165,15 +165,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 52..66,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 53..65,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 64..65,
                                                     id: Name("x"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap
index 99643af80e..00502dd679 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/in
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..69,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..17,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,27 +28,27 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..17,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 5..16,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 5..6,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 9..16,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 15..16,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -66,15 +66,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..40,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..40,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..22,
                                     id: Name("call"),
                                     ctx: Load,
@@ -82,26 +82,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 22..40,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 23..39,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 23..24,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..39,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 38..39,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -118,15 +118,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..53,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..53,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..45,
                                     id: Name("call"),
                                     ctx: Load,
@@ -134,26 +134,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 45..53,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 46..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 46..47,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 50..52,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 51..52,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -171,15 +171,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..68,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 54..68,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 54..58,
                                     id: Name("call"),
                                     ctx: Load,
@@ -187,26 +187,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 58..68,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 59..67,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 59..60,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 64..66,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 65..66,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap
index 2b60be9235..90c44de37c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/in
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..100,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..17,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..17,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 15..16,
                                             id: Name("x"),
                                             ctx: Load,
@@ -42,11 +42,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 5..13,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 7..13,
                                                 id: Name("kwargs"),
                                                 ctx: Load,
@@ -61,15 +61,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..30,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..30,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..22,
                                     id: Name("call"),
                                     ctx: Load,
@@ -77,11 +77,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 22..30,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 28..29,
                                             id: Name("y"),
                                             ctx: Load,
@@ -91,17 +91,17 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 23..26,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 23..24,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 25..26,
                                                 value: Int(
                                                     1,
@@ -117,15 +117,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 31..53,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..53,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 31..35,
                                     id: Name("call"),
                                     ctx: Load,
@@ -133,11 +133,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 35..53,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 51..52,
                                             id: Name("y"),
                                             ctx: Load,
@@ -147,17 +147,17 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 36..39,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 36..37,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 38..39,
                                                 value: Int(
                                                     1,
@@ -167,11 +167,11 @@ Module(
                                     },
                                     Keyword {
                                         range: 41..49,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 43..49,
                                                 id: Name("kwargs"),
                                                 ctx: Load,
@@ -186,15 +186,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..75,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 54..75,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 54..58,
                                     id: Name("call"),
                                     ctx: Load,
@@ -202,15 +202,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 58..75,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 69..74,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 70..74,
                                                     id: Name("args"),
                                                     ctx: Load,
@@ -223,11 +223,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 59..67,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 61..67,
                                                 id: Name("kwargs"),
                                                 ctx: Load,
@@ -242,15 +242,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 76..99,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 76..99,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 76..80,
                                     id: Name("call"),
                                     ctx: Load,
@@ -258,15 +258,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 80..99,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 92..97,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 93..97,
                                                     id: Name("args"),
                                                     ctx: Load,
@@ -279,11 +279,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 81..89,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 83..89,
                                                 id: Name("kwargs"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap
index bade10dafe..42fd265361 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/mi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("x"),
                                             ctx: Load,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..9,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap
index a17128ef2c..37e891b89a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/mi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..9,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..9,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("x"),
                                             ctx: Load,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap
index 1b515e8f95..83e062828f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/mi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..38,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..9,
                                             value: Int(
                                                 1,
@@ -48,15 +48,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..21,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..21,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..15,
                                     id: Name("call"),
                                     ctx: Load,
@@ -64,22 +64,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 15..21,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 16..19,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 16..17,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..19,
                                                 id: Name(""),
                                                 ctx: Invalid,
@@ -94,15 +94,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..32,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..32,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..26,
                                     id: Name("call"),
                                     ctx: Load,
@@ -110,15 +110,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 26..32,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 27..28,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 28..28,
                                                     id: Name(""),
                                                     ctx: Invalid,
@@ -129,7 +129,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 30..31,
                                             id: Name("y"),
                                             ctx: Load,
@@ -144,11 +144,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..37,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..37,
                             id: Name("foo"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap
index d9a820dcd8..d4e8773726 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/st
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..64,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..28,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,19 +28,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..28,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..27,
                                             elt: Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5..10,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 6..10,
                                                             id: Name("data"),
                                                             ctx: Load,
@@ -52,10 +52,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 11..27,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 15..19,
                                                             id: Name("data"),
                                                             ctx: Store,
@@ -63,7 +63,7 @@ Module(
                                                     ),
                                                     iter: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 23..27,
                                                             id: Name("iter"),
                                                             ctx: Load,
@@ -85,15 +85,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..43,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..43,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..33,
                                     id: Name("call"),
                                     ctx: Load,
@@ -101,20 +101,20 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 33..43,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..42,
                                             value: Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 35..42,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 41..42,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -135,15 +135,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..63,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..63,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..48,
                                     id: Name("call"),
                                     ctx: Load,
@@ -151,19 +151,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 48..63,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 49..62,
                                             value: YieldFrom(
                                                 ExprYieldFrom {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 50..62,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 61..62,
                                                             id: Name("x"),
                                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap
index 6eab954049..655f45ed24 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/un
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..26,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..5,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -38,21 +38,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..26,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 11..14,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 14..16,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -63,7 +61,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..26,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap
index d60f2bf871..99e0e4fbcd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/un
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..27,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..6,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..6,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("x"),
                                             ctx: Load,
@@ -47,21 +47,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..27,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 12..15,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 15..17,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -72,7 +70,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..27,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap
index ee3456db28..2b4270bf2c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/un
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..7,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..7,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("x"),
                                             ctx: Load,
@@ -47,21 +47,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..28,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 13..16,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 16..18,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -72,7 +70,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..28,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap
index f2eec9b2cb..67ca493c7d 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/attribute/in
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..16,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..1,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Load,
@@ -26,11 +26,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1..3,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1..3,
                             value: Float(
                                 0.1,
@@ -41,11 +41,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..5,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             id: Name("x"),
                             ctx: Load,
@@ -55,11 +55,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..7,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..7,
                             value: Float(
                                 0.1,
@@ -70,11 +70,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..9,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..9,
                             value: Float(
                                 0.0,
@@ -85,19 +85,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..15,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..15,
                             value: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..12,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 10..11,
                                             id: Name("x"),
                                             ctx: Load,
@@ -106,14 +106,14 @@ Module(
                                     attr: Identifier {
                                         id: Name(""),
                                         range: 12..12,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             slice: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     value: Int(
                                         0,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap
index efa04a319e..cbbf28892a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/attribute/mu
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..46,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             value: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..6,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 0..5,
                                             id: Name("extra"),
                                             ctx: Load,
@@ -33,7 +33,7 @@ Module(
                                     attr: Identifier {
                                         id: Name(""),
                                         range: 6..6,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -41,7 +41,7 @@ Module(
                             attr: Identifier {
                                 id: Name("dot"),
                                 range: 7..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -50,11 +50,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..19,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..19,
                             id: Name("multiple"),
                             ctx: Load,
@@ -64,22 +64,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..27,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..27,
                             value: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..22,
                                 },
                             ),
                             attr: Identifier {
                                 id: Name("dots"),
                                 range: 23..27,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -88,11 +88,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..36,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..36,
                             id: Name("multiple"),
                             ctx: Load,
@@ -102,26 +102,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 36..45,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..45,
                             value: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..40,
                                     value: EllipsisLiteral(
                                         ExprEllipsisLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..39,
                                         },
                                     ),
                                     attr: Identifier {
                                         id: Name(""),
                                         range: 40..40,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -129,7 +129,7 @@ Module(
                             attr: Identifier {
                                 id: Name("dots"),
                                 range: 41..45,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap
index 69af9f8041..04634b6766 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/attribute/no
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..141,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..93,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..93,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 87..92,
                                     id: Name("first"),
                                     ctx: Load,
@@ -29,7 +29,7 @@ Module(
                             attr: Identifier {
                                 id: Name(""),
                                 range: 93..93,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -38,11 +38,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 94..100,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..100,
                             id: Name("second"),
                             ctx: Load,
@@ -52,15 +52,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..141,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..141,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 136..140,
                                     id: Name("last"),
                                     ctx: Load,
@@ -69,7 +69,7 @@ Module(
                             attr: Identifier {
                                 id: Name(""),
                                 range: 141..141,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap
index f1e8020d1a..f9683c9fe6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/await/no_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..73,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..66,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..66,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 66..66,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -32,15 +32,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..73,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..73,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..69,
                                     id: Name("x"),
                                     ctx: Load,
@@ -49,7 +49,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 72..73,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap
index cf7d31d11b..10da259bcc 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/await/no_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..85,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..64,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..64,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 64..64,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -32,21 +32,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..85,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 70..73,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 73..75,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -57,7 +55,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 81..85,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap
index 029e1723d9..3eb3479394 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/await/recove
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..284,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 117..130,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 117..130,
                             value: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 123..130,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 129..130,
                                             id: Name("x"),
                                             ctx: Load,
@@ -38,19 +38,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 154..162,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 154..162,
                             value: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 160..162,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 161..162,
                                             id: Name("x"),
                                             ctx: Load,
@@ -65,19 +65,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 163..173,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 163..173,
                             value: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 170..172,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 171..172,
                                             id: Name("x"),
                                             ctx: Load,
@@ -92,20 +92,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 214..227,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 214..227,
                             value: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 220..227,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 226..227,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -120,34 +120,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 228..245,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 228..245,
                             value: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 234..245,
                                     parameters: Some(
                                         Parameters {
                                             range: 241..242,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 241..242,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 241..242,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 241..242,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -161,7 +159,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 244..245,
                                             id: Name("x"),
                                             ctx: Load,
@@ -175,20 +173,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 246..254,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 246..254,
                             value: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 252..254,
                                     op: UAdd,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 253..254,
                                             id: Name("x"),
                                             ctx: Load,
@@ -202,20 +200,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 255..263,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 255..263,
                             value: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 261..263,
                                     op: USub,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 262..263,
                                             id: Name("x"),
                                             ctx: Load,
@@ -229,20 +227,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 264..272,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 264..272,
                             value: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 270..272,
                                     op: Invert,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 271..272,
                                             id: Name("x"),
                                             ctx: Load,
@@ -256,20 +254,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 273..284,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 273..284,
                             value: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 279..284,
                                     op: Not,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 283..284,
                                             id: Name("x"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap
index fa628602c1..41d9904805 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/inval
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..15,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,26 +29,24 @@ Module(
                             op: Add,
                             right: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..15,
                                     parameters: Some(
                                         Parameters {
                                             range: 11..12,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 11..12,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 11..12,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("y"),
                                                             range: 11..12,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -62,7 +60,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 14..15,
                                             id: Name("y"),
                                             ctx: Load,
@@ -76,15 +74,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..28,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..28,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..18,
                                     id: Name("x"),
                                     ctx: Load,
@@ -93,12 +91,12 @@ Module(
                             op: Sub,
                             right: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 21..28,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..28,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap
index b9bd494cd7..1ba50a5e82 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2..3,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2..3,
                             id: Name("y"),
                             ctx: Load,
@@ -26,15 +26,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..10,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     value: Int(
                                         1,
@@ -44,7 +44,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap
index ab67484feb..baf12f2136 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..3,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     value: Int(
                                         0,
@@ -30,7 +30,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3..3,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -42,15 +42,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..10,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     value: Int(
                                         1,
@@ -60,7 +60,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap
index 9357c59dc3..1b39f2bac0 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/missi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..18,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..11,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..5,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 0..1,
                                             value: Int(
                                                 1,
@@ -34,7 +34,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4..5,
                                             value: Int(
                                                 2,
@@ -46,11 +46,11 @@ Module(
                             op: Sub,
                             right: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..11,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..9,
                                             value: Int(
                                                 3,
@@ -60,7 +60,7 @@ Module(
                                     op: Mult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 11..11,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -74,15 +74,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..18,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..18,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     value: Int(
                                         4,
@@ -92,7 +92,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..18,
                                     value: Int(
                                         5,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap
index 41adb471bf..cf81983e85 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/multi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..19,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..3,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,12 +29,12 @@ Module(
                             op: Add,
                             right: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2..3,
                                     op: UAdd,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3..3,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -48,15 +48,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..9,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..9,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     value: Int(
                                         1,
@@ -66,7 +66,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     value: Int(
                                         2,
@@ -79,15 +79,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..13,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..13,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     id: Name("x"),
                                     ctx: Load,
@@ -96,12 +96,12 @@ Module(
                             op: Sub,
                             right: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 12..13,
                                     op: USub,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..13,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -115,15 +115,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..19,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..19,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 14..15,
                                     value: Int(
                                         1,
@@ -133,7 +133,7 @@ Module(
                             op: Sub,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap
index 475add5dc2..8293f4b759 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/named
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..26,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,7 +29,7 @@ Module(
                             op: Sub,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("y"),
                                     ctx: Load,
@@ -41,16 +41,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..15,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..15,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 10..11,
                                         value: Int(
                                             1,
@@ -59,7 +59,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..14,
                                         value: Int(
                                             2,
@@ -75,15 +75,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..21,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..21,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..17,
                                     id: Name("x"),
                                     ctx: Load,
@@ -92,7 +92,7 @@ Module(
                             op: Div,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 20..21,
                                     id: Name("y"),
                                     ctx: Load,
@@ -104,11 +104,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..26,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 25..26,
                             value: Int(
                                 2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap
index 3fc18497c4..5080466f7f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/starr
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..14,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..6,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,11 +29,11 @@ Module(
                             op: Add,
                             right: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..6,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("y"),
                                             ctx: Load,
@@ -48,15 +48,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..14,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..14,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..8,
                                     id: Name("x"),
                                     ctx: Load,
@@ -65,11 +65,11 @@ Module(
                             op: Pow,
                             right: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 12..14,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..14,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap
index a3515f3a7f..8f10231161 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/inva
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..31,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..17,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 0..1,
                                         id: Name("x"),
                                         ctx: Load,
@@ -30,26 +30,24 @@ Module(
                                 ),
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 6..17,
                                         parameters: Some(
                                             Parameters {
                                                 range: 13..14,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 13..14,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 13..14,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("y"),
                                                                 range: 13..14,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -63,7 +61,7 @@ Module(
                                         ),
                                         body: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..17,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -78,17 +76,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..31,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..31,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..20,
                                         id: Name("x"),
                                         ctx: Load,
@@ -96,12 +94,12 @@ Module(
                                 ),
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..31,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 30..31,
                                                     id: Name("y"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap
index 68ff71e827..7becb2d219 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/miss
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..5,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..5,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             id: Name("y"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap
index 85ad8a317f..d40859437f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/miss
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..12,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 0..1,
                                         id: Name("x"),
                                         ctx: Load,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..5,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -43,15 +43,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..12,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..12,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..8,
                                     value: Int(
                                         1,
@@ -61,7 +61,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..12,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap
index e06f081716..c599119ee6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/name
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..7,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 0..1,
                                         id: Name("x"),
                                         ctx: Load,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 6..7,
                                         id: Name("a"),
                                         ctx: Load,
@@ -43,11 +43,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..12,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..12,
                             id: Name("b"),
                             ctx: Load,
@@ -57,17 +57,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..19,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..19,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..14,
                                         id: Name("x"),
                                         ctx: Load,
@@ -75,7 +75,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         id: Name("a"),
                                         ctx: Load,
@@ -88,11 +88,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..24,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             id: Name("b"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap
index 5369e4e69b..a63aa3e177 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/star
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..16,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..8,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 0..1,
                                         id: Name("x"),
                                         ctx: Load,
@@ -30,11 +30,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 6..8,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 7..8,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -50,17 +50,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..16,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..16,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..10,
                                         id: Name("x"),
                                         ctx: Load,
@@ -68,11 +68,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..16,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 15..16,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap
index a64df1f7b3..419cc7854b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/inva
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..131,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,12 +32,12 @@ Module(
                             comparators: [
                                 UnaryOp(
                                     ExprUnaryOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..10,
                                         op: Not,
                                         operand: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 9..10,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -52,12 +52,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..41,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 35..36,
                                 id: Name("x"),
                                 ctx: Store,
@@ -66,11 +66,11 @@ Module(
                     ],
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..41,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 38..38,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -82,7 +82,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..41,
                                         id: Name("y"),
                                         ctx: Load,
@@ -95,11 +95,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 120..121,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..121,
                             id: Name("x"),
                             ctx: Load,
@@ -109,16 +109,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..128,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..128,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 126..128,
                                     id: Name("is"),
                                     ctx: Load,
@@ -130,11 +130,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 129..130,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 129..130,
                             id: Name("y"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap
index a118b221db..22a228bba8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/inva
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..34,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..20,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,26 +32,24 @@ Module(
                             comparators: [
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..20,
                                         parameters: Some(
                                             Parameters {
                                                 range: 16..17,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 16..17,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 16..17,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("y"),
                                                                 range: 16..17,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -65,7 +63,7 @@ Module(
                                         ),
                                         body: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..20,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -80,15 +78,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..34,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..34,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
                                     id: Name("x"),
                                     ctx: Load,
@@ -100,12 +98,12 @@ Module(
                             comparators: [
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..34,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 33..34,
                                                     id: Name("y"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap
index a38a989312..4ca152d200 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2..3,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2..3,
                             id: Name("y"),
                             ctx: Load,
@@ -26,15 +26,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..10,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     value: Int(
                                         1,
@@ -44,7 +44,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap
index b41171207c..b40badc953 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..3,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,7 +32,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3..3,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -45,15 +45,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..10,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     value: Int(
                                         1,
@@ -63,7 +63,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap
index e58c0025af..d51319b5b9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..71,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..60,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..60,
                             id: Name("x"),
                             ctx: Load,
@@ -26,16 +26,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..64,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..64,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 64..64,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -47,15 +47,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..71,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..71,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 66..67,
                                     value: Int(
                                         1,
@@ -65,7 +65,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 70..71,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap
index f02148c958..a9019dc09e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..15,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..8,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,7 +32,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..8,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -45,15 +45,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..15,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..15,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     value: Int(
                                         1,
@@ -63,7 +63,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 14..15,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap
index 023e710c95..38297d62da 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/mult
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..41,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..32,
                     targets: [
                         Compare(
                             ExprCompare {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..29,
                                 left: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..26,
                                         id: Name("x"),
                                         ctx: Load,
@@ -33,7 +33,7 @@ Module(
                                 comparators: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..29,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -45,7 +45,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..32,
                             id: Name("y"),
                             ctx: Load,
@@ -55,16 +55,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..40,
                     targets: [
                         Compare(
                             ExprCompare {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 33..37,
                                 left: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 33..34,
                                         id: Name("x"),
                                         ctx: Load,
@@ -76,7 +76,7 @@ Module(
                                 comparators: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 37..37,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -88,7 +88,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..40,
                             id: Name("y"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap
index fdeafe1b4d..3bdec1455c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/name
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..31,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,7 +32,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..10,
                                         id: Name("y"),
                                         ctx: Load,
@@ -45,16 +45,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..20,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..20,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..16,
                                         value: Int(
                                             1,
@@ -63,7 +63,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         value: Int(
                                             2,
@@ -79,15 +79,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..26,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..26,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
                                     id: Name("x"),
                                     ctx: Load,
@@ -99,7 +99,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..26,
                                         id: Name("y"),
                                         ctx: Load,
@@ -112,11 +112,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..31,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..31,
                             value: Int(
                                 2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap
index 90dd6b2056..0de6ae37e0 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/star
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..39,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..7,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
                             comparators: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..7,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..7,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -52,15 +52,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..19,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..19,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     id: Name("x"),
                                     ctx: Load,
@@ -72,11 +72,11 @@ Module(
                             comparators: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..19,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 18..19,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -92,19 +92,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..27,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..27,
                             value: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..27,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..23,
                                             id: Name("x"),
                                             ctx: Load,
@@ -116,7 +116,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..27,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -132,19 +132,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..39,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..39,
                             value: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..39,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..30,
                                             id: Name("x"),
                                             ctx: Load,
@@ -156,7 +156,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 38..39,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap
index 7a00017491..6b8ee79f05 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/compreh
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..362,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..34,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..34,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
                                     id: Name("x"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
                                     id: Name("y"),
                                     ctx: Load,
@@ -37,10 +37,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 23..33,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 27..28,
                                             value: Int(
                                                 1,
@@ -49,7 +49,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..33,
                                             id: Name("y"),
                                             ctx: Load,
@@ -65,15 +65,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..54,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..54,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..37,
                                     id: Name("x"),
                                     ctx: Load,
@@ -81,7 +81,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 39..40,
                                     id: Name("y"),
                                     ctx: Load,
@@ -90,21 +90,22 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 41..53,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 45..48,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 45..48,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "a",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -113,7 +114,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 52..53,
                                             id: Name("y"),
                                             ctx: Load,
@@ -129,15 +130,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..77,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 55..77,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 56..57,
                                     id: Name("x"),
                                     ctx: Load,
@@ -145,7 +146,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..60,
                                     id: Name("y"),
                                     ctx: Load,
@@ -154,14 +155,14 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 61..76,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..71,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 65..69,
                                                     id: Name("call"),
                                                     ctx: Load,
@@ -169,7 +170,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 69..71,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -177,7 +178,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 75..76,
                                             id: Name("y"),
                                             ctx: Load,
@@ -193,15 +194,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..100,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 78..100,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 79..80,
                                     id: Name("x"),
                                     ctx: Load,
@@ -209,7 +210,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 82..83,
                                     id: Name("y"),
                                     ctx: Load,
@@ -218,15 +219,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 84..99,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Set(
                                         ExprSet {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 88..94,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 89..90,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -234,7 +235,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 92..93,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -245,7 +246,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 98..99,
                                             id: Name("y"),
                                             ctx: Load,
@@ -261,15 +262,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 117..135,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 117..135,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 118..119,
                                     id: Name("x"),
                                     ctx: Load,
@@ -277,7 +278,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 121..122,
                                     id: Name("y"),
                                     ctx: Load,
@@ -286,10 +287,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 123..134,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 127..128,
                                             id: Name("x"),
                                             ctx: Store,
@@ -297,11 +298,11 @@ Module(
                                     ),
                                     iter: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 132..134,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 133..134,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -320,15 +321,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..159,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..159,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 137..138,
                                     id: Name("x"),
                                     ctx: Load,
@@ -336,7 +337,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 140..141,
                                     id: Name("y"),
                                     ctx: Load,
@@ -345,10 +346,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 142..158,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 146..147,
                                             id: Name("x"),
                                             ctx: Store,
@@ -356,12 +357,12 @@ Module(
                                     ),
                                     iter: Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 151..158,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 157..158,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -380,15 +381,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 160..188,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..188,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 161..162,
                                     id: Name("x"),
                                     ctx: Load,
@@ -396,7 +397,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 164..165,
                                     id: Name("y"),
                                     ctx: Load,
@@ -405,10 +406,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 166..187,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 170..171,
                                             id: Name("x"),
                                             ctx: Store,
@@ -416,11 +417,11 @@ Module(
                                     ),
                                     iter: YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 175..187,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 186..187,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -438,15 +439,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 189..216,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 189..216,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 190..191,
                                     id: Name("x"),
                                     ctx: Load,
@@ -454,7 +455,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..194,
                                     id: Name("y"),
                                     ctx: Load,
@@ -463,10 +464,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 195..215,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 199..200,
                                             id: Name("x"),
                                             ctx: Store,
@@ -474,26 +475,24 @@ Module(
                                     ),
                                     iter: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 204..215,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 211..212,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 211..212,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 211..212,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 211..212,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -507,7 +506,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 214..215,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -525,15 +524,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 231..257,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 231..257,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 232..233,
                                     id: Name("x"),
                                     ctx: Load,
@@ -541,7 +540,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 235..236,
                                     id: Name("y"),
                                     ctx: Load,
@@ -550,10 +549,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 237..256,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 241..242,
                                             id: Name("x"),
                                             ctx: Store,
@@ -561,7 +560,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 246..250,
                                             id: Name("data"),
                                             ctx: Load,
@@ -570,11 +569,11 @@ Module(
                                     ifs: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 254..256,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 255..256,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -593,15 +592,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 258..289,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 258..289,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 259..260,
                                     id: Name("x"),
                                     ctx: Load,
@@ -609,7 +608,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 262..263,
                                     id: Name("y"),
                                     ctx: Load,
@@ -618,10 +617,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 264..288,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 268..269,
                                             id: Name("x"),
                                             ctx: Store,
@@ -629,7 +628,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 273..277,
                                             id: Name("data"),
                                             ctx: Load,
@@ -638,12 +637,12 @@ Module(
                                     ifs: [
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 281..288,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 287..288,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -662,15 +661,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 290..326,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 290..326,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 291..292,
                                     id: Name("x"),
                                     ctx: Load,
@@ -678,7 +677,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 294..295,
                                     id: Name("y"),
                                     ctx: Load,
@@ -687,10 +686,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 296..325,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 300..301,
                                             id: Name("x"),
                                             ctx: Store,
@@ -698,7 +697,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 305..309,
                                             id: Name("data"),
                                             ctx: Load,
@@ -707,11 +706,11 @@ Module(
                                     ifs: [
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 313..325,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 324..325,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -729,15 +728,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 327..362,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 327..362,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 328..329,
                                     id: Name("x"),
                                     ctx: Load,
@@ -745,7 +744,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 331..332,
                                     id: Name("y"),
                                     ctx: Load,
@@ -754,10 +753,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 333..361,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 337..338,
                                             id: Name("x"),
                                             ctx: Store,
@@ -765,7 +764,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 342..346,
                                             id: Name("data"),
                                             ctx: Load,
@@ -774,26 +773,24 @@ Module(
                                     ifs: [
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 350..361,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 357..358,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 357..358,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 357..358,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 357..358,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -807,7 +804,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 360..361,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap
index 2375e262a6..a579afac89 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/double_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..278,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..135,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 125..135,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 128..129,
                                             id: Name("x"),
                                             ctx: Load,
@@ -34,7 +34,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 133..134,
                                                 value: Int(
                                                     1,
@@ -44,7 +44,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 134..134,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -58,18 +58,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..162,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..162,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 137..138,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -78,7 +78,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 140..141,
                                             value: Int(
                                                 1,
@@ -90,18 +90,18 @@ Module(
                                     key: None,
                                     value: If(
                                         ExprIf {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 145..161,
                                             test: BooleanLiteral(
                                                 ExprBooleanLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 150..154,
                                                     value: true,
                                                 },
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 145..146,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -109,7 +109,7 @@ Module(
                                             ),
                                             orelse: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 160..161,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -125,37 +125,35 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 163..184,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 163..184,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 166..177,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 173..174,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 173..174,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 173..174,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("x"),
                                                                     range: 173..174,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -169,7 +167,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 176..177,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -182,7 +180,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 179..180,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -191,7 +189,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 182..183,
                                             value: Int(
                                                 2,
@@ -206,18 +204,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 185..201,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 185..201,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 186..187,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -226,7 +224,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 189..190,
                                             value: Int(
                                                 1,
@@ -238,13 +236,13 @@ Module(
                                     key: None,
                                     value: BoolOp(
                                         ExprBoolOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 194..200,
                                             op: Or,
                                             values: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 194..195,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -252,7 +250,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 199..200,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -269,24 +267,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 202..219,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 202..219,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: BoolOp(
                                         ExprBoolOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 205..212,
                                             op: And,
                                             values: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 205..206,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -294,7 +292,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 211..212,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -308,7 +306,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 214..215,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -317,7 +315,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 217..218,
                                             value: Int(
                                                 2,
@@ -332,18 +330,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 220..241,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 220..241,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 221..222,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -352,7 +350,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 224..225,
                                             value: Int(
                                                 1,
@@ -364,12 +362,12 @@ Module(
                                     key: None,
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 229..234,
                                             op: Not,
                                             operand: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 233..234,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -382,7 +380,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 236..237,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -391,7 +389,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 239..240,
                                             value: Int(
                                                 2,
@@ -406,22 +404,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 242..252,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 242..252,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Compare(
                                         ExprCompare {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 245..251,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 245..246,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -433,7 +431,7 @@ Module(
                                             comparators: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 250..251,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -450,22 +448,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 253..267,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 253..267,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Compare(
                                         ExprCompare {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 256..266,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 256..257,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -477,7 +475,7 @@ Module(
                                             comparators: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 265..266,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -494,22 +492,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 268..277,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 268..277,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Compare(
                                         ExprCompare {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 271..276,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 271..272,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -521,7 +519,7 @@ Module(
                                             comparators: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 275..276,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap
index 22ca3a3d36..9c0cde63d3 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/double_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..358,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..147,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..147,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 125..126,
                                             id: Name("x"),
                                             ctx: Load,
@@ -34,7 +34,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 128..129,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 130..133,
                                             id: Name("for"),
                                             ctx: Load,
@@ -54,7 +54,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 134..135,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -63,7 +63,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 135..135,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -74,11 +74,11 @@ Module(
                                     key: Some(
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 137..146,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 137..138,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -90,7 +90,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 142..146,
                                                             id: Name("data"),
                                                             ctx: Load,
@@ -102,7 +102,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 146..146,
                                             id: Name(""),
                                             ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap
index 3b205a80f1..99d310bc87 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..24,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1..2,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..8,
                                             id: Name("def"),
                                             ctx: Load,
@@ -43,11 +43,11 @@ Module(
                                     key: Some(
                                         Call(
                                             ExprCall {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 9..14,
                                                 func: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 9..12,
                                                         id: Name("foo"),
                                                         ctx: Load,
@@ -55,7 +55,7 @@ Module(
                                                 ),
                                                 arguments: Arguments {
                                                     range: 12..14,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     args: [],
                                                     keywords: [],
                                                 },
@@ -64,7 +64,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 20..24,
                                             id: Name("pass"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap
index 487654f51d..c53bcf8e92 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1..2,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -32,11 +32,11 @@ Module(
                                     ),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..10,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5..6,
                                                     value: Int(
                                                         1,
@@ -46,7 +46,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 9..10,
                                                     value: Int(
                                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap
index 474f5b3038..a5a08be0be 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..27,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..6,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1..2,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4..5,
                                             value: Int(
                                                 1,
@@ -47,21 +47,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..27,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 12..15,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 15..17,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -72,7 +70,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..27,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap
index a6bcfaa621..5db7a61381 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap
@@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/named_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..84,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..77,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 55..77,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 56..62,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 56..57,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -35,7 +35,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 61..62,
                                                         value: Int(
                                                             1,
@@ -47,7 +47,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 64..65,
                                             id: Name("y"),
                                             ctx: Load,
@@ -58,7 +58,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..68,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -67,7 +67,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 68..68,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -78,7 +78,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 72..73,
                                                 value: Int(
                                                     2,
@@ -88,7 +88,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 75..76,
                                             id: Name("a"),
                                             ctx: Load,
@@ -102,15 +102,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..84,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..84,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 79..80,
                                     id: Name("x"),
                                     ctx: Load,
@@ -119,7 +119,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..84,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap
index 47c76d0afc..58509cc935 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/named_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..86,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..79,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..79,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 58..59,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 61..62,
                                             id: Name("y"),
                                             ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 66..67,
                                                 value: Int(
                                                     1,
@@ -53,7 +53,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 67..67,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -64,7 +64,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 69..70,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -73,7 +73,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 72..73,
                                             id: Name("a"),
                                             ctx: Load,
@@ -84,7 +84,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 77..78,
                                                 value: Int(
                                                     2,
@@ -94,7 +94,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 78..78,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -108,15 +108,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 81..86,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 81..86,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 81..82,
                                     id: Name("x"),
                                     ctx: Load,
@@ -125,7 +125,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 85..86,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap
index ecfb8d7b9a..c4c4f242c8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/recover
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..346,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..91,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 88..91,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 89..89,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -34,18 +34,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..105,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..105,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 94..95,
                                                 value: Int(
                                                     1,
@@ -55,7 +55,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 97..98,
                                             value: Int(
                                                 2,
@@ -67,7 +67,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 value: Int(
                                                     3,
@@ -77,7 +77,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 103..104,
                                             value: Int(
                                                 4,
@@ -92,18 +92,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 107..115,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 107..115,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 108..109,
                                                 value: Int(
                                                     1,
@@ -113,7 +113,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 111..112,
                                             value: Int(
                                                 2,
@@ -128,18 +128,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..144,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 133..144,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 134..135,
                                                 value: Int(
                                                     1,
@@ -149,7 +149,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 137..138,
                                             value: Int(
                                                 2,
@@ -161,7 +161,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 139..140,
                                                 value: Int(
                                                     3,
@@ -171,7 +171,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 142..143,
                                             value: Int(
                                                 4,
@@ -186,18 +186,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 157..162,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 157..162,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 158..159,
                                                 value: Int(
                                                     1,
@@ -207,7 +207,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 160..160,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -221,18 +221,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 201..205,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 201..205,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 204..204,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -246,18 +246,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 206..222,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 206..222,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 207..208,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -266,7 +266,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 210..211,
                                             id: Name("y"),
                                             ctx: Load,
@@ -277,7 +277,7 @@ Module(
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 215..215,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -288,7 +288,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 217..218,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -297,7 +297,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 220..221,
                                             id: Name("b"),
                                             ctx: Load,
@@ -311,22 +311,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 310..330,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 310..330,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 311..313,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 312..313,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -338,7 +338,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 315..316,
                                             id: Name("y"),
                                             ctx: Load,
@@ -349,7 +349,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 318..319,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -358,7 +358,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 321..322,
                                             id: Name("a"),
                                             ctx: Load,
@@ -369,11 +369,11 @@ Module(
                                     key: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 324..326,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 325..326,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -385,7 +385,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 328..329,
                                             id: Name("c"),
                                             ctx: Load,
@@ -399,18 +399,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 331..345,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 331..345,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 332..333,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -419,11 +419,11 @@ Module(
                                     ),
                                     value: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 335..337,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 336..337,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -437,7 +437,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 339..340,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -446,11 +446,11 @@ Module(
                                     ),
                                     value: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 342..344,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 343..344,
                                                     id: Name("a"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap
index bf215d18b6..ba444eb959 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/emoji_identi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..64,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("a"),
                                 ctx: Store,
@@ -26,7 +26,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..5,
                             id: Name(""),
                             ctx: Invalid,
@@ -36,12 +36,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..37,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 32..33,
                                 id: Name("a"),
                                 ctx: Store,
@@ -50,7 +50,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..37,
                             id: Name(""),
                             ctx: Invalid,
@@ -60,16 +60,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..43,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 42..43,
                             op: UAdd,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..43,
                                     id: Name(""),
                                     ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap
index d4c139b3cc..20d9f0812e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap
@@ -7,7 +7,7 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/emoji_statem
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..5,
         body: [],
     },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap
index b480e99948..766ec9bebc 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_o
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..88,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..67,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..67,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 58..62,
                                     id: Name("expr"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     id: Name("x"),
                                     ctx: Load,
@@ -36,7 +36,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 67..67,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -48,21 +48,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 69..88,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 73..76,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 76..78,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -73,7 +71,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 84..88,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap
index beec6bcb14..20584cc80b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_o
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..76,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..69,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 55..69,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..64,
                                     id: Name("expr"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 55..56,
                                     id: Name("x"),
                                     ctx: Load,
@@ -36,7 +36,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 69..69,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -48,15 +48,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..76,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..76,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 71..72,
                                     value: Int(
                                         1,
@@ -66,7 +66,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 75..76,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap
index d3c3293580..38246f5155 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..76,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 51..55,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 51..55,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 55..55,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -28,7 +28,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     id: Name("x"),
                                     ctx: Load,
@@ -36,7 +36,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 55..55,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -48,21 +48,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..76,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 61..64,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 64..66,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -73,7 +71,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 72..76,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap
index 39ddb5266a..9ea573657d 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..64,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..57,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..57,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 57..57,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -28,7 +28,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     id: Name("x"),
                                     ctx: Load,
@@ -36,7 +36,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 57..57,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -48,15 +48,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..64,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..64,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..60,
                                     value: Int(
                                         1,
@@ -66,7 +66,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 63..64,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap
index e62779397c..38a8d3c530 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/recover.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..215,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..43,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..43,
                             test: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 31..36,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..36,
                                             id: Name("expr"),
                                             ctx: Load,
@@ -35,7 +35,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 26..27,
                                     id: Name("x"),
                                     ctx: Load,
@@ -43,7 +43,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..43,
                                     id: Name("y"),
                                     ctx: Load,
@@ -55,34 +55,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..67,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..67,
                             test: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..60,
                                     parameters: Some(
                                         Parameters {
                                             range: 56..57,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 56..57,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 56..57,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 56..57,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -96,7 +94,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..60,
                                             id: Name("x"),
                                             ctx: Load,
@@ -106,7 +104,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..45,
                                     id: Name("x"),
                                     ctx: Load,
@@ -114,7 +112,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 66..67,
                                     id: Name("y"),
                                     ctx: Load,
@@ -126,20 +124,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..87,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..87,
                             test: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 73..80,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 79..80,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -150,7 +148,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..69,
                                     id: Name("x"),
                                     ctx: Load,
@@ -158,7 +156,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 86..87,
                                     id: Name("y"),
                                     ctx: Load,
@@ -170,19 +168,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..112,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 88..112,
                             test: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 93..105,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 104..105,
                                             id: Name("x"),
                                             ctx: Load,
@@ -192,7 +190,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 88..89,
                                     id: Name("x"),
                                     ctx: Load,
@@ -200,7 +198,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 111..112,
                                     id: Name("y"),
                                     ctx: Load,
@@ -212,15 +210,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 142..164,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 142..164,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 147..151,
                                     id: Name("expr"),
                                     ctx: Load,
@@ -228,7 +226,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 142..143,
                                     id: Name("x"),
                                     ctx: Load,
@@ -236,11 +234,11 @@ Module(
                             ),
                             orelse: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 157..164,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 158..164,
                                             id: Name("orelse"),
                                             ctx: Load,
@@ -255,15 +253,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 165..187,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 165..187,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 170..174,
                                     id: Name("expr"),
                                     ctx: Load,
@@ -271,7 +269,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 165..166,
                                     id: Name("x"),
                                     ctx: Load,
@@ -279,12 +277,12 @@ Module(
                             ),
                             orelse: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 180..187,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 186..187,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -299,15 +297,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 188..215,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 188..215,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..197,
                                     id: Name("expr"),
                                     ctx: Load,
@@ -315,7 +313,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 188..189,
                                     id: Name("x"),
                                     ctx: Load,
@@ -323,11 +321,11 @@ Module(
                             ),
                             orelse: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 203..215,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 214..215,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap
index ac95e6aff7..7d2bfdb631 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap
@@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/lambda_defau
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..20,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..20,
                             parameters: Some(
                                 Parameters {
                                     range: 7..17,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 7..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 7..8,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -43,21 +41,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 10..14,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 10..11,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 10..11,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 12..14,
                                                         value: Int(
                                                             20,
@@ -68,14 +66,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 16..17,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 16..17,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 16..17,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -89,7 +87,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..20,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap
index 30e3bf68b1..986a07de03 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap
@@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/lambda_dupli
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..91,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..14,
                             parameters: Some(
                                 Parameters {
                                     range: 7..11,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 7..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 7..8,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -43,14 +41,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 10..11,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 10..11,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 10..11,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -64,7 +62,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     value: Int(
                                         1,
@@ -77,30 +75,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..33,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..33,
                             parameters: Some(
                                 Parameters {
                                     range: 23..30,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 23..24,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 23..24,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 23..24,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -111,14 +107,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 29..30,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 29..30,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 29..30,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -130,7 +126,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 32..33,
                                     value: Int(
                                         1,
@@ -143,30 +139,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..52,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..52,
                             parameters: Some(
                                 Parameters {
                                     range: 42..49,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 42..43,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 42..43,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 42..43,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -174,21 +168,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 45..49,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 45..46,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 45..46,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 47..49,
                                                         value: Int(
                                                             20,
@@ -205,7 +199,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     value: Int(
                                         1,
@@ -218,30 +212,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..69,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 54..69,
                             parameters: Some(
                                 Parameters {
                                     range: 61..66,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 61..62,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 61..62,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 61..62,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -251,11 +243,11 @@ Module(
                                     vararg: Some(
                                         Parameter {
                                             range: 64..66,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("a"),
                                                 range: 65..66,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -266,7 +258,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..69,
                                     value: Int(
                                         1,
@@ -279,30 +271,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..90,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..90,
                             parameters: Some(
                                 Parameters {
                                     range: 78..87,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 78..79,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 78..79,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 78..79,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -314,11 +304,11 @@ Module(
                                     kwarg: Some(
                                         Parameter {
                                             range: 84..87,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("a"),
                                                 range: 86..87,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -327,7 +317,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 89..90,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap
index 110db0cba9..480b1586fb 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/compreh
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..376,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..48,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..48,
                             elt: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..36,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             id: Name("x"),
                                             ctx: Load,
@@ -36,10 +36,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 37..47,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 41..42,
                                             id: Name("x"),
                                             ctx: Store,
@@ -47,7 +47,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..47,
                                             id: Name("y"),
                                             ctx: Load,
@@ -63,15 +63,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..81,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..81,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..69,
                                     id: Name("x"),
                                     ctx: Load,
@@ -80,10 +80,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 70..80,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 74..75,
                                             value: Int(
                                                 1,
@@ -92,7 +92,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 79..80,
                                             id: Name("y"),
                                             ctx: Load,
@@ -108,15 +108,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 82..98,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..98,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..84,
                                     id: Name("x"),
                                     ctx: Load,
@@ -125,21 +125,22 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 85..97,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 89..92,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 89..92,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "a",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -148,7 +149,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..97,
                                             id: Name("y"),
                                             ctx: Load,
@@ -164,15 +165,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 99..118,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 99..118,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..101,
                                     id: Name("x"),
                                     ctx: Load,
@@ -181,14 +182,14 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 102..117,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 106..112,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 106..110,
                                                     id: Name("call"),
                                                     ctx: Load,
@@ -196,7 +197,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 110..112,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -204,7 +205,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 116..117,
                                             id: Name("y"),
                                             ctx: Load,
@@ -220,15 +221,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..138,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..138,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 120..121,
                                     id: Name("x"),
                                     ctx: Load,
@@ -237,15 +238,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 122..137,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Set(
                                         ExprSet {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 126..132,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 127..128,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -253,7 +254,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 130..131,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -264,7 +265,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 136..137,
                                             id: Name("y"),
                                             ctx: Load,
@@ -280,15 +281,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..170,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..170,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 156..157,
                                     id: Name("x"),
                                     ctx: Load,
@@ -297,10 +298,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 158..169,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 162..163,
                                             id: Name("x"),
                                             ctx: Store,
@@ -308,11 +309,11 @@ Module(
                                     ),
                                     iter: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 167..169,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 168..169,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -331,15 +332,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 171..191,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 171..191,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 172..173,
                                     id: Name("x"),
                                     ctx: Load,
@@ -348,10 +349,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 174..190,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 178..179,
                                             id: Name("x"),
                                             ctx: Store,
@@ -359,12 +360,12 @@ Module(
                                     ),
                                     iter: Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 183..190,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 189..190,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -383,15 +384,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 192..217,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 192..217,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..194,
                                     id: Name("x"),
                                     ctx: Load,
@@ -400,10 +401,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 195..216,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 199..200,
                                             id: Name("x"),
                                             ctx: Store,
@@ -411,11 +412,11 @@ Module(
                                     ),
                                     iter: YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 204..216,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 215..216,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -433,15 +434,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 218..242,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 218..242,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 219..220,
                                     id: Name("x"),
                                     ctx: Load,
@@ -450,10 +451,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 221..241,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 225..226,
                                             id: Name("x"),
                                             ctx: Store,
@@ -461,26 +462,24 @@ Module(
                                     ),
                                     iter: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 230..241,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 237..238,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 237..238,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 237..238,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 237..238,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -494,7 +493,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 240..241,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -512,15 +511,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 257..280,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 257..280,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 258..259,
                                     id: Name("x"),
                                     ctx: Load,
@@ -529,10 +528,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 260..279,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 264..265,
                                             id: Name("x"),
                                             ctx: Store,
@@ -540,7 +539,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 269..273,
                                             id: Name("data"),
                                             ctx: Load,
@@ -549,11 +548,11 @@ Module(
                                     ifs: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 277..279,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 278..279,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -572,15 +571,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 281..309,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 281..309,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 282..283,
                                     id: Name("x"),
                                     ctx: Load,
@@ -589,10 +588,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 284..308,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 288..289,
                                             id: Name("x"),
                                             ctx: Store,
@@ -600,7 +599,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 293..297,
                                             id: Name("data"),
                                             ctx: Load,
@@ -609,12 +608,12 @@ Module(
                                     ifs: [
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 301..308,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 307..308,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -633,15 +632,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 310..343,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 310..343,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 311..312,
                                     id: Name("x"),
                                     ctx: Load,
@@ -650,10 +649,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 313..342,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 317..318,
                                             id: Name("x"),
                                             ctx: Store,
@@ -661,7 +660,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 322..326,
                                             id: Name("data"),
                                             ctx: Load,
@@ -670,11 +669,11 @@ Module(
                                     ifs: [
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 330..342,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 341..342,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -692,15 +691,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 344..376,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 344..376,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 345..346,
                                     id: Name("x"),
                                     ctx: Load,
@@ -709,10 +708,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 347..375,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 351..352,
                                             id: Name("x"),
                                             ctx: Store,
@@ -720,7 +719,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 356..360,
                                             id: Name("data"),
                                             ctx: Load,
@@ -729,26 +728,24 @@ Module(
                                     ifs: [
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 364..375,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 371..372,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 371..372,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 371..372,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 371..372,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -762,7 +759,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 374..375,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap
index 04f72aae23..27415fde73 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..43,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..43,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 42..43,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 43..43,
                                         id: Name(""),
                                         ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap
index da496ea1cd..d53b5a8291 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..133,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..133,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 125..133,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 128..133,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 128..129,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -34,7 +34,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 132..133,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap
index c65c7f3f8f..3bfaaa689e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..141,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 131..141,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 131..141,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 132..133,
                                         value: Int(
                                             1,
@@ -30,11 +30,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 136..141,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 136..137,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 140..141,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap
index 833765842b..4f21ca4ddf 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..140,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 114..119,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 114..119,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 115..116,
                                         value: Int(
                                             1,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 118..119,
                                         value: Int(
                                             2,
@@ -45,21 +45,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..140,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 125..128,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 128..130,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -70,7 +68,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 136..140,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap
index e3535344a6..3b1ba32aac 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/recover
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..208,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 82..85,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..85,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..83,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -35,16 +35,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..93,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..93,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 88..89,
                                         value: Int(
                                             1,
@@ -53,7 +53,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 91..92,
                                         value: Int(
                                             2,
@@ -68,16 +68,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..100,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..100,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..97,
                                         value: Int(
                                             1,
@@ -92,16 +92,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..123,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 118..123,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..120,
                                         value: Int(
                                             1,
@@ -110,7 +110,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 121..122,
                                         value: Int(
                                             2,
@@ -125,16 +125,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 156..162,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 156..162,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 157..158,
                                         value: Int(
                                             1,
@@ -143,7 +143,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 160..161,
                                         value: Int(
                                             2,
@@ -158,16 +158,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 185..194,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 185..194,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 186..187,
                                         value: Int(
                                             1,
@@ -176,11 +176,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 189..192,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 189..190,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -189,7 +189,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 192..192,
                                                 id: Name(""),
                                                 ctx: Invalid,
@@ -205,16 +205,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 196..202,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 196..202,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 197..198,
                                         value: Int(
                                             1,
@@ -223,7 +223,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 200..201,
                                         value: Int(
                                             2,
@@ -238,20 +238,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 204..207,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 204..207,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 205..206,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 206..206,
                                                 id: Name(""),
                                                 ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap
index caa6a5a30d..064ab37b92 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/star_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..200,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..93,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..93,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 86..88,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 87..88,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -36,7 +36,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 91..92,
                                         id: Name("y"),
                                         ctx: Load,
@@ -50,24 +50,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 94..106,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..106,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 95..102,
                                         value: Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 96..102,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 96..97,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -79,7 +79,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 101..102,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -93,7 +93,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 104..105,
                                         id: Name("z"),
                                         ctx: Load,
@@ -107,25 +107,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 107..118,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 107..118,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 108..114,
                                         value: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 109..114,
                                                 op: Not,
                                                 operand: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 113..114,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -138,7 +138,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 116..117,
                                         id: Name("z"),
                                         ctx: Load,
@@ -152,26 +152,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..132,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..132,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 120..128,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 121..128,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 121..122,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -179,7 +179,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 127..128,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -193,7 +193,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 130..131,
                                         id: Name("z"),
                                         ctx: Load,
@@ -207,26 +207,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..145,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 133..145,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 134..141,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 135..141,
                                                 op: Or,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 135..136,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -234,7 +234,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 140..141,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -248,7 +248,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 143..144,
                                         id: Name("z"),
                                         ctx: Load,
@@ -262,31 +262,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 146..168,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 146..168,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 147..164,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 148..164,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 153..157,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 148..149,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -294,7 +294,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 163..164,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -307,7 +307,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 166..167,
                                         id: Name("z"),
                                         ctx: Load,
@@ -321,39 +321,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 169..186,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 169..186,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 170..182,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 171..182,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 178..179,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 178..179,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 178..179,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 178..179,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -367,7 +365,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 181..182,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -380,7 +378,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 184..185,
                                         id: Name("z"),
                                         ctx: Load,
@@ -394,24 +392,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 187..199,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 187..199,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 188..195,
                                         target: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 188..190,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 189..190,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -422,7 +420,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 194..195,
                                                 value: Int(
                                                     2,
@@ -433,7 +431,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 197..198,
                                         id: Name("z"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap
index e19733fe68..80c4345b88 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/invali
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..109,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..68,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..67,
                             target: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..62,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..60,
                                             id: Name("x"),
                                             ctx: Load,
@@ -33,14 +33,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("y"),
                                         range: 61..62,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Store,
                                 },
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 66..67,
                                     value: Int(
                                         1,
@@ -53,19 +53,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 69..80,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..79,
                             target: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 70..74,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 70..71,
                                             id: Name("x"),
                                             ctx: Load,
@@ -73,7 +73,7 @@ Module(
                                     ),
                                     slice: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 72..73,
                                             id: Name("y"),
                                             ctx: Load,
@@ -84,7 +84,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 78..79,
                                     value: Int(
                                         1,
@@ -97,19 +97,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 81..90,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..89,
                             target: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 82..84,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 83..84,
                                             id: Name("x"),
                                             ctx: Store,
@@ -120,7 +120,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 88..89,
                                     value: Int(
                                         1,
@@ -133,20 +133,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 91..109,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..108,
                             target: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 92..98,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 93..94,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -154,7 +154,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 96..97,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -166,12 +166,12 @@ Module(
                             ),
                             value: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 102..108,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 103..104,
                                                 value: Int(
                                                     1,
@@ -180,7 +180,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 106..107,
                                                 value: Int(
                                                     2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap
index 8015e50f6a..d434114a50 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..75,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..72,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..72,
                             id: Name("x"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap
index af8dfa5210..d37bcfe97a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..33,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..33,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..33,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..30,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 33..33,
                                     id: Name(""),
                                     ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap
index aaa227cdfe..884fb234b2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..87,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..71,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..71,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..63,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..71,
                                     id: Name("def"),
                                     ctx: Load,
@@ -40,15 +40,15 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..87,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..77,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 72..75,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -56,7 +56,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 75..77,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -64,7 +64,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..87,
                             id: Name("pass"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap
index e7e25c0972..181c17c668 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..112,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..112,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 101..112,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 101..102,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,11 +28,11 @@ Module(
                             ),
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 107..112,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 107..108,
                                             id: Name("x"),
                                             ctx: Load,
@@ -41,7 +41,7 @@ Module(
                                     op: Add,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 111..112,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap
index dc699731ce..ee4effd12c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..78,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..71,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..69,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..66,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 69..69,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -40,15 +40,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 73..78,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..78,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 73..74,
                                     id: Name("x"),
                                     ctx: Load,
@@ -57,7 +57,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 77..78,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap
index 3ac0c1bdff..3e8a85dc97 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..36,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..15,
                             elt: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..3,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2..3,
                                             id: Name("x"),
                                             ctx: Load,
@@ -36,10 +36,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 4..14,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..9,
                                             id: Name("x"),
                                             ctx: Store,
@@ -47,7 +47,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..14,
                                             id: Name("y"),
                                             ctx: Load,
@@ -64,20 +64,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..24,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..24,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..23,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 17..18,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -85,7 +85,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 22..23,
                                                 value: Int(
                                                     1,
@@ -103,12 +103,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..35,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..30,
                             id: Name("x"),
                             ctx: Store,
@@ -116,7 +116,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..35,
                             id: Name("y"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap
index 1b1d87fe6d..ed9f13abc6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..47,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..47,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..47,
                             id: Name(""),
                             ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap
index 5dee13a8a2..80fe213fc2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..137,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 129..137,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 132..137,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 132..133,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,7 +29,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 136..137,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap
index b5721df967..fa0cdaade8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..146,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..146,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..146,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 137..138,
                                         value: Int(
                                             1,
@@ -30,11 +30,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 141..146,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 141..142,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 145..146,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap
index bbf1fb9749..b98aae283e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..144,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..123,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 118..123,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..120,
                                         value: Int(
                                             1,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 122..123,
                                         value: Int(
                                             2,
@@ -46,21 +46,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..144,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 129..132,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 132..134,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -71,7 +69,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 140..144,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap
index 9012f3e1be..2dc3440241 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..125,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..70,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..69,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..69,
                                     id: Name("x"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..120,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..120,
                             id: Name("x"),
                             ctx: Load,
@@ -47,11 +47,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 124..125,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 124..125,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap
index a44a6fc066..768381c483 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..267,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..86,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..86,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..84,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -36,16 +36,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..94,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 88..94,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 89..90,
                                         value: Int(
                                             1,
@@ -54,7 +54,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..93,
                                         value: Int(
                                             2,
@@ -70,16 +70,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 96..101,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 96..101,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 97..98,
                                         value: Int(
                                             1,
@@ -95,11 +95,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..121,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..121,
                             value: Int(
                                 1,
@@ -110,11 +110,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..123,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..123,
                             value: Int(
                                 2,
@@ -125,11 +125,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 157..162,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 158..159,
                             value: Int(
                                 1,
@@ -138,7 +138,7 @@ Module(
                     ),
                     annotation: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 161..162,
                             value: Int(
                                 2,
@@ -151,16 +151,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 186..195,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 186..195,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 187..188,
                                         value: Int(
                                             1,
@@ -169,11 +169,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 190..193,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 190..191,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -182,7 +182,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 193..193,
                                                 id: Name(""),
                                                 ctx: Invalid,
@@ -199,11 +199,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 197..199,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 198..199,
                             value: Int(
                                 1,
@@ -214,11 +214,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 201..202,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 201..202,
                             value: Int(
                                 2,
@@ -229,16 +229,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 255..267,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 255..267,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 255..256,
                                         id: Name("x"),
                                         ctx: Load,
@@ -246,7 +246,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 258..259,
                                         id: Name("y"),
                                         ctx: Load,
@@ -254,7 +254,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 263..264,
                                         value: Int(
                                             2,
@@ -263,7 +263,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 266..267,
                                         id: Name("z"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap
index b566c6a594..da92fa1991 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..532,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 157..178,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 157..178,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 158..165,
                                         value: Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 159..165,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 159..160,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -41,7 +41,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 164..165,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -55,7 +55,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 167..168,
                                         id: Name("z"),
                                         ctx: Load,
@@ -63,15 +63,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 170..177,
                                         value: Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 171..177,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 171..172,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -83,7 +83,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 176..177,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -104,25 +104,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 179..198,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 179..198,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 180..186,
                                         value: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 181..186,
                                                 op: Not,
                                                 operand: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 185..186,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -135,7 +135,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 188..189,
                                         id: Name("z"),
                                         ctx: Load,
@@ -143,16 +143,16 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 191..197,
                                         value: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 192..197,
                                                 op: Not,
                                                 operand: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 196..197,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -172,26 +172,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 199..222,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 199..222,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 200..208,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 201..208,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 201..202,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -199,7 +199,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 207..208,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -213,7 +213,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 210..211,
                                         id: Name("z"),
                                         ctx: Load,
@@ -221,17 +221,17 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 213..221,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 214..221,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 214..215,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -239,7 +239,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 220..221,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -260,26 +260,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 223..244,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 223..244,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 224..231,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 225..231,
                                                 op: Or,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 225..226,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -287,7 +287,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 230..231,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -301,7 +301,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 233..234,
                                         id: Name("z"),
                                         ctx: Load,
@@ -309,17 +309,17 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 236..243,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 237..243,
                                                 op: Or,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 237..238,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -327,7 +327,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 242..243,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -348,31 +348,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 245..286,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 245..286,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 246..263,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 247..263,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 252..256,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 247..248,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -380,7 +380,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 262..263,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -393,7 +393,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 265..266,
                                         id: Name("z"),
                                         ctx: Load,
@@ -401,22 +401,22 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 268..285,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 269..285,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 274..278,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 269..270,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -424,7 +424,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 284..285,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -444,39 +444,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 287..318,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 287..318,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 288..300,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 289..300,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 296..297,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 296..297,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 296..297,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 296..297,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -490,7 +488,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 299..300,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -503,7 +501,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 302..303,
                                         id: Name("z"),
                                         ctx: Load,
@@ -511,30 +509,28 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 305..317,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 306..317,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 313..314,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 313..314,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 313..314,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 313..314,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -548,7 +544,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 316..317,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -568,24 +564,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 319..340,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 319..340,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 320..327,
                                         target: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 320..322,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 321..322,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -596,7 +592,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 326..327,
                                                 value: Int(
                                                     2,
@@ -607,7 +603,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 329..330,
                                         id: Name("z"),
                                         ctx: Load,
@@ -615,15 +611,15 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 332..339,
                                         target: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 332..334,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 333..334,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -634,7 +630,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 338..339,
                                                 value: Int(
                                                     2,
@@ -652,24 +648,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 363..382,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 363..382,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 363..370,
                                         value: Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 364..370,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 364..365,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -681,7 +677,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 369..370,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -695,7 +691,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 372..373,
                                         id: Name("z"),
                                         ctx: Load,
@@ -703,15 +699,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 375..382,
                                         value: Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 376..382,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 376..377,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -723,7 +719,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 381..382,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -744,25 +740,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 383..400,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 383..400,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 383..389,
                                         value: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 384..389,
                                                 op: Not,
                                                 operand: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 388..389,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -775,7 +771,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 391..392,
                                         id: Name("z"),
                                         ctx: Load,
@@ -783,16 +779,16 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 394..400,
                                         value: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 395..400,
                                                 op: Not,
                                                 operand: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 399..400,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -812,26 +808,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 401..422,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 401..422,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 401..409,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 402..409,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 402..403,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -839,7 +835,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 408..409,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -853,7 +849,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 411..412,
                                         id: Name("z"),
                                         ctx: Load,
@@ -861,17 +857,17 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 414..422,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 415..422,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 415..416,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -879,7 +875,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 421..422,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -900,26 +896,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 423..442,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 423..442,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 423..430,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 424..430,
                                                 op: Or,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 424..425,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -927,7 +923,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 429..430,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -941,7 +937,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 432..433,
                                         id: Name("z"),
                                         ctx: Load,
@@ -949,17 +945,17 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 435..442,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 436..442,
                                                 op: Or,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 436..437,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -967,7 +963,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 441..442,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -988,31 +984,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 443..482,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 443..482,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 443..460,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 444..460,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 449..453,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 444..445,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1020,7 +1016,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 459..460,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1033,7 +1029,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 462..463,
                                         id: Name("z"),
                                         ctx: Load,
@@ -1041,22 +1037,22 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 465..482,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 466..482,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 471..475,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 466..467,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1064,7 +1060,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 481..482,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1084,39 +1080,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 483..512,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 483..512,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 483..495,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 484..495,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 491..492,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 491..492,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 491..492,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 491..492,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -1130,7 +1124,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 494..495,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1143,7 +1137,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 497..498,
                                         id: Name("z"),
                                         ctx: Load,
@@ -1151,30 +1145,28 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 500..512,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 501..512,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 508..509,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 508..509,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 508..509,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 508..509,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -1188,7 +1180,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 511..512,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1208,15 +1200,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 513..515,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 513..515,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 514..515,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1229,16 +1221,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 519..532,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 519..532,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 519..520,
                                         value: Int(
                                             2,
@@ -1247,7 +1239,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 522..523,
                                         id: Name("z"),
                                         ctx: Load,
@@ -1255,11 +1247,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 525..527,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 526..527,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1270,7 +1262,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 531..532,
                                         value: Int(
                                             2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap
index abf42e4b03..1ccec2050b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/comprehe
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..377,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..48,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..48,
                             elt: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..36,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             id: Name("x"),
                                             ctx: Load,
@@ -36,10 +36,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 37..47,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 41..42,
                                             id: Name("x"),
                                             ctx: Store,
@@ -47,7 +47,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..47,
                                             id: Name("y"),
                                             ctx: Load,
@@ -63,15 +63,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..81,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..81,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..69,
                                     id: Name("x"),
                                     ctx: Load,
@@ -80,10 +80,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 70..80,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 74..75,
                                             value: Int(
                                                 1,
@@ -92,7 +92,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 79..80,
                                             id: Name("y"),
                                             ctx: Load,
@@ -108,15 +108,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 82..98,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..98,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..84,
                                     id: Name("x"),
                                     ctx: Load,
@@ -125,21 +125,22 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 85..97,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 89..92,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 89..92,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "a",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -148,7 +149,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..97,
                                             id: Name("y"),
                                             ctx: Load,
@@ -164,15 +165,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 99..118,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 99..118,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..101,
                                     id: Name("x"),
                                     ctx: Load,
@@ -181,14 +182,14 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 102..117,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 106..112,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 106..110,
                                                     id: Name("call"),
                                                     ctx: Load,
@@ -196,7 +197,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 110..112,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -204,7 +205,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 116..117,
                                             id: Name("y"),
                                             ctx: Load,
@@ -220,15 +221,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..138,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..138,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 120..121,
                                     id: Name("x"),
                                     ctx: Load,
@@ -237,15 +238,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 122..137,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Set(
                                         ExprSet {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 126..132,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 127..128,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -253,7 +254,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 130..131,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -264,7 +265,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 136..137,
                                             id: Name("y"),
                                             ctx: Load,
@@ -280,15 +281,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..170,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..170,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 156..157,
                                     id: Name("x"),
                                     ctx: Load,
@@ -297,10 +298,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 158..169,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 162..163,
                                             id: Name("x"),
                                             ctx: Store,
@@ -308,11 +309,11 @@ Module(
                                     ),
                                     iter: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 167..169,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 168..169,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -331,15 +332,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 171..191,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 171..191,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 172..173,
                                     id: Name("x"),
                                     ctx: Load,
@@ -348,10 +349,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 174..190,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 178..179,
                                             id: Name("x"),
                                             ctx: Store,
@@ -359,12 +360,12 @@ Module(
                                     ),
                                     iter: Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 183..190,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 189..190,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -383,15 +384,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 192..217,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 192..217,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..194,
                                     id: Name("x"),
                                     ctx: Load,
@@ -400,10 +401,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 195..216,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 199..200,
                                             id: Name("x"),
                                             ctx: Store,
@@ -411,11 +412,11 @@ Module(
                                     ),
                                     iter: YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 204..216,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 215..216,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -433,15 +434,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 218..242,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 218..242,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 219..220,
                                     id: Name("x"),
                                     ctx: Load,
@@ -450,10 +451,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 221..241,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 225..226,
                                             id: Name("x"),
                                             ctx: Store,
@@ -461,26 +462,24 @@ Module(
                                     ),
                                     iter: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 230..241,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 237..238,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 237..238,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 237..238,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 237..238,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -494,7 +493,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 240..241,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -512,15 +511,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 257..280,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 257..280,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 258..259,
                                     id: Name("x"),
                                     ctx: Load,
@@ -529,10 +528,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 260..279,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 264..265,
                                             id: Name("x"),
                                             ctx: Store,
@@ -540,7 +539,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 269..273,
                                             id: Name("data"),
                                             ctx: Load,
@@ -549,11 +548,11 @@ Module(
                                     ifs: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 277..279,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 278..279,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -572,15 +571,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 281..309,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 281..309,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 282..283,
                                     id: Name("x"),
                                     ctx: Load,
@@ -589,10 +588,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 284..308,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 288..289,
                                             id: Name("x"),
                                             ctx: Store,
@@ -600,7 +599,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 293..297,
                                             id: Name("data"),
                                             ctx: Load,
@@ -609,12 +608,12 @@ Module(
                                     ifs: [
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 301..308,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 307..308,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -633,15 +632,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 310..343,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 310..343,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 311..312,
                                     id: Name("x"),
                                     ctx: Load,
@@ -650,10 +649,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 313..342,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 317..318,
                                             id: Name("x"),
                                             ctx: Store,
@@ -661,7 +660,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 322..326,
                                             id: Name("data"),
                                             ctx: Load,
@@ -670,11 +669,11 @@ Module(
                                     ifs: [
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 330..342,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 341..342,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -692,15 +691,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 344..376,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 344..376,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 345..346,
                                     id: Name("x"),
                                     ctx: Load,
@@ -709,10 +708,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 347..375,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 351..352,
                                             id: Name("x"),
                                             ctx: Store,
@@ -720,7 +719,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 356..360,
                                             id: Name("data"),
                                             ctx: Load,
@@ -729,26 +728,24 @@ Module(
                                     ifs: [
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 364..375,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 371..372,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 371..372,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 371..372,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 371..372,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -762,7 +759,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 374..375,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap
index 43438af0b7..759f2c99c0 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..47,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..47,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..47,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 47..47,
                                         id: Name(""),
                                         ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap
index b1a51ec0e1..01bfdf4692 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..136,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 128..136,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 128..136,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 131..136,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 131..132,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -34,7 +34,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 135..136,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap
index ee7e0553f3..ead70d568e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..144,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 134..144,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 134..144,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 135..136,
                                         value: Int(
                                             1,
@@ -30,11 +30,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 139..144,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 139..140,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 143..144,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap
index dd12017d4f..311eaae530 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..144,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..123,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 118..123,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..120,
                                         value: Int(
                                             1,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 122..123,
                                         value: Int(
                                             2,
@@ -44,21 +44,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..144,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 129..132,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 132..134,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -69,7 +67,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 140..144,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap
index fd02629ffd..b489b1c64f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/recover.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..323,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 197..200,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 197..200,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 198..198,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -34,16 +34,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 202..208,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 202..208,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 203..204,
                                         value: Int(
                                             1,
@@ -52,7 +52,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 206..207,
                                         value: Int(
                                             2,
@@ -66,16 +66,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 210..215,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 210..215,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 211..212,
                                         value: Int(
                                             1,
@@ -89,16 +89,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 233..238,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 233..238,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 234..235,
                                         value: Int(
                                             1,
@@ -107,7 +107,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 236..237,
                                         value: Int(
                                             2,
@@ -121,18 +121,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 271..277,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 271..277,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 272..273,
                                                 value: Int(
                                                     1,
@@ -142,7 +142,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 275..276,
                                             value: Int(
                                                 2,
@@ -157,16 +157,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 300..309,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 300..309,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 301..302,
                                         value: Int(
                                             1,
@@ -175,11 +175,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 304..307,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 304..305,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -188,7 +188,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 307..307,
                                                 id: Name(""),
                                                 ctx: Invalid,
@@ -203,16 +203,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 311..317,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 311..317,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 312..313,
                                         value: Int(
                                             1,
@@ -221,7 +221,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 315..316,
                                         value: Int(
                                             2,
@@ -235,20 +235,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 319..322,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 319..322,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 320..321,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 321..321,
                                                 id: Name(""),
                                                 ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap
index 18fb551839..d3c23a0ec3 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/star_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..198,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..92,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..92,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..87,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 86..87,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -36,7 +36,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 90..91,
                                         id: Name("y"),
                                         ctx: Load,
@@ -49,24 +49,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..105,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..105,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..101,
                                         value: Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 95..101,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 95..96,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -78,7 +78,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 100..101,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -92,7 +92,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 103..104,
                                         id: Name("z"),
                                         ctx: Load,
@@ -105,25 +105,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 106..117,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 106..117,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 107..113,
                                         value: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 108..113,
                                                 op: Not,
                                                 operand: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 112..113,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -136,7 +136,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 115..116,
                                         id: Name("z"),
                                         ctx: Load,
@@ -149,26 +149,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..131,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 118..131,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..127,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 120..127,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 120..121,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -176,7 +176,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 126..127,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -190,7 +190,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 129..130,
                                         id: Name("z"),
                                         ctx: Load,
@@ -203,26 +203,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 132..144,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 132..144,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 133..140,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 134..140,
                                                 op: Or,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 134..135,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -230,7 +230,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 139..140,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -244,7 +244,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 142..143,
                                         id: Name("z"),
                                         ctx: Load,
@@ -257,31 +257,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 145..167,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 145..167,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 146..163,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 147..163,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 152..156,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 147..148,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -289,7 +289,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 162..163,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -302,7 +302,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 165..166,
                                         id: Name("z"),
                                         ctx: Load,
@@ -315,39 +315,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 168..185,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 168..185,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 169..181,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 170..181,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 177..178,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 177..178,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 177..178,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 177..178,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -361,7 +359,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 180..181,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -374,7 +372,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 183..184,
                                         id: Name("z"),
                                         ctx: Load,
@@ -387,24 +385,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 186..198,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 186..198,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 187..194,
                                         target: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 187..189,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 188..189,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -415,7 +413,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 193..194,
                                                 value: Int(
                                                     2,
@@ -426,7 +424,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 196..197,
                                         id: Name("z"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap
index 133fc59208..2e4321abd9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/subscript/in
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..133,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -28,16 +28,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2..9,
                                     lower: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2..8,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2..3,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -45,7 +45,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 7..8,
                                                         value: Int(
                                                             1,
@@ -66,15 +66,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..39,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..39,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 33..34,
                                     id: Name("x"),
                                     ctx: Load,
@@ -82,16 +82,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 35..38,
                                     lower: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 35..37,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 36..37,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -112,15 +112,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..46,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..46,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 40..41,
                                     id: Name("x"),
                                     ctx: Load,
@@ -128,17 +128,17 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..45,
                                     lower: None,
                                     upper: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 43..45,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 44..45,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -158,15 +158,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..54,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..54,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..48,
                                     id: Name("x"),
                                     ctx: Load,
@@ -174,18 +174,18 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..53,
                                     lower: None,
                                     upper: None,
                                     step: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 51..53,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 52..53,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -204,15 +204,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 70..73,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..73,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 70..71,
                                     id: Name("x"),
                                     ctx: Load,
@@ -220,7 +220,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 72..73,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -233,15 +233,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 123..133,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 123..133,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 123..124,
                                     id: Name("x"),
                                     ctx: Load,
@@ -249,15 +249,15 @@ Module(
                             ),
                             slice: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 125..132,
                                     target: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 125..127,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 126..127,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -268,7 +268,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 131..132,
                                             value: Int(
                                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap
index 734e357a4a..b8b02d2973 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/subscript/un
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -28,17 +28,17 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2..10,
                                     lower: None,
                                     upper: Some(
                                         BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5..10,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5..6,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -47,7 +47,7 @@ Module(
                                                 op: Add,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 9..10,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap
index 0d95577060..d3e57ddfc0 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/subscript/un
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..25,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..9,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("x"),
                                     ctx: Load,
@@ -28,14 +28,14 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2..9,
                                     lower: None,
                                     upper: None,
                                     step: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..9,
                                                 id: Name("def"),
                                                 ctx: Load,
@@ -51,15 +51,15 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..25,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..15,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..13,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -67,7 +67,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 13..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -75,7 +75,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..25,
                             id: Name("pass"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap
index f024ef0b37..b8f917a7dd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("x"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..10,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..10,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap
index 952700a605..45a740ba23 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary/named_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..18,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..2,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..2,
                             op: USub,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..2,
                                     id: Name("x"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..7,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             value: Int(
                                 1,
@@ -48,16 +48,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..13,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..13,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 12..13,
                                     id: Name("x"),
                                     ctx: Load,
@@ -69,11 +69,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..18,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..18,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap
index 90fbf1bd9f..b11ca386f9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary/no_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..3,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3..3,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -33,15 +33,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..10,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     id: Name("x"),
                                     ctx: Load,
@@ -50,7 +50,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap
index 2b9353fc3b..48f2e1e00f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary/no_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..8,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..1,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             op: UAdd,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..1,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -33,15 +33,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3..8,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..8,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3..4,
                                     id: Name("x"),
                                     ctx: Load,
@@ -50,7 +50,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..8,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap
index 73536890ec..5feebcc55f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield/named_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..85,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..59,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..59,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..59,
                                         id: Name("x"),
                                         ctx: Load,
@@ -34,11 +34,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..64,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..64,
                             value: Int(
                                 1,
@@ -49,21 +49,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..84,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..84,
                             value: Some(
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..84,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 72..73,
                                                     value: Int(
                                                         1,
@@ -72,7 +72,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 75..76,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -80,7 +80,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 80..81,
                                                     value: Int(
                                                         2,
@@ -89,7 +89,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 83..84,
                                                     value: Int(
                                                         3,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap
index 6bd430e889..4238df7e8c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield/star_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..67,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..47,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..47,
                             value: Some(
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..46,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 45..46,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -41,31 +41,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..66,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..66,
                             value: Some(
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..66,
                                         elts: [
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 55..63,
                                                     value: BoolOp(
                                                         ExprBoolOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 56..63,
                                                             op: And,
                                                             values: [
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 56..57,
                                                                         id: Name("x"),
                                                                         ctx: Load,
@@ -73,7 +73,7 @@ Module(
                                                                 ),
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 62..63,
                                                                         id: Name("y"),
                                                                         ctx: Load,
@@ -87,7 +87,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 65..66,
                                                     id: Name("z"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap
index 72433f9e77..719d563ed2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield_from/s
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..100,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 70..83,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..83,
                             value: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 81..83,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..83,
                                             id: Name("x"),
                                             ctx: Load,
@@ -39,24 +39,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..100,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..100,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 95..100,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 95..97,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 96..97,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -67,7 +67,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 99..100,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap
index a14264ccfb..d521191aa7 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield_from/u
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..192,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..47,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..47,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..47,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 51..52,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 51..52,
                             value: Int(
                                 1,
@@ -47,20 +47,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 89..104,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 89..104,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..104,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -68,7 +68,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 103..104,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -85,20 +85,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 168..192,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 168..192,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 179..192,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 180..181,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -106,17 +106,17 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 183..191,
                                                 value: BoolOp(
                                                     ExprBoolOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 184..191,
                                                         op: And,
                                                         values: [
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 184..185,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -124,7 +124,7 @@ Module(
                                                             ),
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 190..191,
                                                                     id: Name("y"),
                                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap
index ac3df95658..63c3670334 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_conversion_f
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..30,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..9,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 2..8,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..4,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -47,6 +47,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -58,25 +59,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..19,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..19,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 10..19,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 12..18,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 13..14,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -92,6 +93,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -102,26 +104,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..29,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..29,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 20..29,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 22..28,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 23..24,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -137,6 +139,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap
index 42acb3033d..f18251146b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_empty_expres
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..14,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..5,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 2..4,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..3,
                                                                 id: Name(""),
                                                                 ctx: Invalid,
@@ -47,6 +47,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -58,26 +59,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..13,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 6..13,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 8..12,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 9..9,
                                                                 id: Name(""),
                                                                 ctx: Invalid,
@@ -93,6 +94,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap
index 0858ce958d..a5603a2dd3 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_invalid_conv
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..9,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..8,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 2..7,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..4,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -47,6 +47,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap
index 165a659e99..f69dee9e5c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_invalid_conv
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..22,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 2..9,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..4,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -47,6 +47,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -58,26 +59,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..21,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..21,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 11..21,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 13..20,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 14..15,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -93,6 +94,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap
index acdb317e91..20091bbe02 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap
@@ -7,35 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_invalid_star
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..112,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 77..83,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 77..83,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 77..83,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 79..82,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 80..81,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 81..81,
                                                                         id: Name(""),
                                                                         ctx: Invalid,
@@ -54,6 +54,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -65,36 +66,36 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..97,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..97,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 84..97,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 86..96,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 87..95,
                                                                 value: BoolOp(
                                                                     ExprBoolOp {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 88..95,
                                                                         op: And,
                                                                         values: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 88..89,
                                                                                     id: Name("x"),
                                                                                     ctx: Load,
@@ -102,7 +103,7 @@ Module(
                                                                             ),
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 94..95,
                                                                                     id: Name("y"),
                                                                                     ctx: Load,
@@ -124,6 +125,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -135,35 +137,35 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 98..111,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 98..111,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 98..111,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 100..110,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 101..109,
                                                                 value: Yield(
                                                                     ExprYield {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 102..109,
                                                                         value: Some(
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 108..109,
                                                                                     id: Name("x"),
                                                                                     ctx: Load,
@@ -185,6 +187,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap
index 3610b8d114..b7da154352 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap
@@ -7,50 +7,48 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_lambda_witho
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..17,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..16,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..16,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 2..12,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Lambda(
                                                             ExprLambda {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..12,
                                                                 parameters: Some(
                                                                     Parameters {
                                                                         range: 10..11,
-                                                                        node_index: AtomicNodeIndex(
-                                                                            0,
-                                                                        ),
+                                                                        node_index: NodeIndex(None),
                                                                         posonlyargs: [],
                                                                         args: [
                                                                             ParameterWithDefault {
                                                                                 range: 10..11,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 parameter: Parameter {
                                                                                     range: 10..11,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     name: Identifier {
                                                                                         id: Name("x"),
                                                                                         range: 10..11,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                     },
                                                                                     annotation: None,
                                                                                 },
@@ -64,7 +62,7 @@ Module(
                                                                 ),
                                                                 body: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 12..12,
                                                                         id: Name(""),
                                                                         ctx: Invalid,
@@ -80,7 +78,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 12..14,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " x",
                                                     },
                                                 ),
@@ -89,6 +87,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap
index 62c1efddfb..c8b75ce3f9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_unclosed_lbr
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..38,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..4,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..4,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..4,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 2..3,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3..3,
                                                                 id: Name(""),
                                                                 ctx: Invalid,
@@ -47,6 +47,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -58,33 +59,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..14,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..14,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 5..14,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
-                                                        range: 7..14,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        range: 7..13,
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 8..11,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
                                                             },
                                                         ),
                                                         debug_text: None,
-                                                        conversion: None,
+                                                        conversion: Repr,
                                                         format_spec: None,
                                                     },
                                                 ),
@@ -93,6 +94,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -104,26 +106,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..23,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..23,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 15..23,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 17..22,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 18..21,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -144,6 +146,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -155,76 +158,92 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
-                    range: 24..37,
+                    node_index: NodeIndex(None),
+                    range: 24..28,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
-                            range: 24..37,
+                            node_index: NodeIndex(None),
+                            range: 24..28,
                             value: FStringValue {
-                                inner: Concatenated(
-                                    [
-                                        FString(
-                                            FString {
-                                                range: 24..28,
-                                                node_index: AtomicNodeIndex(..),
-                                                elements: [
-                                                    Interpolation(
-                                                        InterpolatedElement {
-                                                            range: 26..27,
-                                                            node_index: AtomicNodeIndex(..),
-                                                            expression: Name(
-                                                                ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
-                                                                    range: 27..27,
-                                                                    id: Name(""),
-                                                                    ctx: Invalid,
-                                                                },
-                                                            ),
-                                                            debug_text: None,
-                                                            conversion: None,
-                                                            format_spec: None,
-                                                        },
-                                                    ),
-                                                ],
-                                                flags: FStringFlags {
-                                                    quote_style: Double,
-                                                    prefix: Regular,
-                                                    triple_quoted: false,
-                                                },
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 24..28,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 26..27,
+                                                        node_index: NodeIndex(None),
+                                                        expression: Name(
+                                                            ExprName {
+                                                                node_index: NodeIndex(None),
+                                                                range: 27..27,
+                                                                id: Name(""),
+                                                                ctx: Invalid,
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: None,
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Double,
+                                                prefix: Regular,
+                                                triple_quoted: false,
+                                                unclosed: false,
                                             },
-                                        ),
-                                        FString(
-                                            FString {
-                                                range: 29..37,
-                                                node_index: AtomicNodeIndex(..),
-                                                elements: [
-                                                    Interpolation(
-                                                        InterpolatedElement {
-                                                            range: 33..34,
-                                                            node_index: AtomicNodeIndex(..),
-                                                            expression: Name(
-                                                                ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
-                                                                    range: 34..34,
-                                                                    id: Name(""),
-                                                                    ctx: Invalid,
-                                                                },
-                                                            ),
-                                                            debug_text: None,
-                                                            conversion: None,
-                                                            format_spec: None,
-                                                        },
-                                                    ),
-                                                ],
-                                                flags: FStringFlags {
-                                                    quote_style: Double,
-                                                    prefix: Regular,
-                                                    triple_quoted: true,
-                                                },
+                                        },
+                                    ),
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 29..37,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 29..37,
+                            value: FStringValue {
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 29..37,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 33..34,
+                                                        node_index: NodeIndex(None),
+                                                        expression: Name(
+                                                            ExprName {
+                                                                node_index: NodeIndex(None),
+                                                                range: 34..34,
+                                                                id: Name(""),
+                                                                ctx: Invalid,
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: None,
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Double,
+                                                prefix: Regular,
+                                                triple_quoted: true,
+                                                unclosed: false,
                                             },
-                                        ),
-                                    ],
+                                        },
+                                    ),
                                 ),
                             },
                         },
@@ -239,23 +258,7 @@ Module(
 
   |
 1 | f"{"
-  |    ^ Syntax Error: missing closing quote in string literal
-2 | f"{foo!r"
-3 | f"{foo="
-  |
-
-
-  |
-1 | f"{"
-  |     ^ Syntax Error: f-string: unterminated string
-2 | f"{foo!r"
-3 | f"{foo="
-  |
-
-
-  |
-1 | f"{"
-  |     ^ Syntax Error: f-string: unterminated string
+  |    ^ Syntax Error: Expected an expression
 2 | f"{foo!r"
 3 | f"{foo="
   |
@@ -264,25 +267,7 @@ Module(
   |
 1 | f"{"
 2 | f"{foo!r"
-  |        ^^ Syntax Error: missing closing quote in string literal
-3 | f"{foo="
-4 | f"{"
-  |
-
-
-  |
-1 | f"{"
-2 | f"{foo!r"
-  |          ^ Syntax Error: f-string: unterminated string
-3 | f"{foo="
-4 | f"{"
-  |
-
-
-  |
-1 | f"{"
-2 | f"{foo!r"
-  |          ^ Syntax Error: f-string: unterminated string
+  |         ^ Syntax Error: f-string: expecting '}'
 3 | f"{foo="
 4 | f"{"
   |
@@ -292,46 +277,7 @@ Module(
 1 | f"{"
 2 | f"{foo!r"
 3 | f"{foo="
-  | ^^ Syntax Error: f-string: expecting '}'
-4 | f"{"
-5 | f"""{"""
-  |
-
-
-  |
-1 | f"{"
-2 | f"{foo!r"
-  |          ^ Syntax Error: Expected FStringEnd, found Unknown
-3 | f"{foo="
-4 | f"{"
-  |
-
-
-  |
-1 | f"{"
-2 | f"{foo!r"
-3 | f"{foo="
-  |        ^ Syntax Error: missing closing quote in string literal
-4 | f"{"
-5 | f"""{"""
-  |
-
-
-  |
-1 | f"{"
-2 | f"{foo!r"
-3 | f"{foo="
-  |         ^ Syntax Error: f-string: unterminated string
-4 | f"{"
-5 | f"""{"""
-  |
-
-
-  |
-1 | f"{"
-2 | f"{foo!r"
-3 | f"{foo="
-  |         ^ Syntax Error: f-string: unterminated string
+  |        ^ Syntax Error: f-string: expecting '}'
 4 | f"{"
 5 | f"""{"""
   |
@@ -341,36 +287,14 @@ Module(
 2 | f"{foo!r"
 3 | f"{foo="
 4 | f"{"
-  |    ^ Syntax Error: missing closing quote in string literal
+  |    ^ Syntax Error: Expected an expression
 5 | f"""{"""
   |
 
 
-  |
-3 | f"{foo="
-4 | f"{"
-5 | f"""{"""
-  | ^^^^ Syntax Error: Expected FStringEnd, found FStringStart
-  |
-
-
   |
 3 | f"{foo="
 4 | f"{"
 5 | f"""{"""
   |      ^^^ Syntax Error: Expected an expression
   |
-
-
-  |
-4 | f"{"
-5 | f"""{"""
-  |         ^ Syntax Error: unexpected EOF while parsing
-  |
-
-
-  |
-4 | f"{"
-5 | f"""{"""
-  |         ^ Syntax Error: f-string: unterminated string
-  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap
index 9d97896c80..cf843119c2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_unclosed_lbr
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..29,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..12,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 2..8,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 8..11,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 9..10,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -49,7 +49,7 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 11..11,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [],
                                                             },
                                                         ),
@@ -60,6 +60,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -71,33 +72,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..28,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..28,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 13..28,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 15..21,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 21..27,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 22..23,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -108,12 +109,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 24..27,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 24..27,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f",
                                                                         },
                                                                     ),
@@ -127,6 +128,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap
index cf2cb1c90b..36e244899b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_iter_unpack_py38.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..106,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..63,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("x"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..58,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..54,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 53..54,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -45,7 +45,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         id: Name("b"),
                                         ctx: Load,
@@ -59,11 +59,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 60..63,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 60..63,
                                     },
                                 ),
@@ -75,12 +75,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..84,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..69,
                             id: Name("x"),
                             ctx: Store,
@@ -88,12 +88,12 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 74..79,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
                                         id: Name("a"),
                                         ctx: Load,
@@ -101,11 +101,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..79,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 78..79,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -122,11 +122,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 81..84,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
                                     },
                                 ),
@@ -138,12 +138,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..105,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 89..90,
                             id: Name("x"),
                             ctx: Store,
@@ -151,16 +151,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..100,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..96,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 95..96,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -171,11 +171,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 98..100,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 99..100,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -192,11 +192,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 102..105,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 102..105,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap
index 2520538fcc..907c07e8ce 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_iter
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..71,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             id: Name("x"),
                             ctx: Store,
@@ -25,17 +25,17 @@ Module(
                     ),
                     iter: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..17,
                             value: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..17,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 10..11,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..17,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -58,11 +58,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..22,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                     },
                                 ),
@@ -74,12 +74,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..44,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..28,
                             id: Name("x"),
                             ctx: Store,
@@ -87,12 +87,12 @@ Module(
                     ),
                     iter: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..39,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..39,
                                         id: Name("a"),
                                         ctx: Load,
@@ -104,11 +104,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 41..44,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 41..44,
                                     },
                                 ),
@@ -120,12 +120,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..60,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..55,
                             id: Name("target"),
                             ctx: Store,
@@ -133,7 +133,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..60,
                             id: Name("x"),
                             ctx: Load,
@@ -145,11 +145,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..70,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 64..65,
                             value: Int(
                                 1,
@@ -158,7 +158,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..70,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap
index 491fd41a42..04caa94916 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_targ
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..154,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     is_async: false,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             value: Int(
                                 1,
@@ -26,7 +26,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..10,
                             id: Name("x"),
                             ctx: Load,
@@ -35,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 12..15,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 12..15,
                                     },
                                 ),
@@ -51,23 +51,24 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..33,
                     is_async: false,
                     target: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..23,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 20..23,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "a",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -76,7 +77,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..28,
                             id: Name("x"),
                             ctx: Load,
@@ -85,11 +86,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 30..33,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 30..33,
                                     },
                                 ),
@@ -101,22 +102,22 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..56,
                     is_async: false,
                     target: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..46,
                             value: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 39..46,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 39..40,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -124,7 +125,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 45..46,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -138,7 +139,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..51,
                             id: Name("z"),
                             ctx: Load,
@@ -147,11 +148,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 53..56,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..56,
                                     },
                                 ),
@@ -163,20 +164,20 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..77,
                     is_async: false,
                     target: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..67,
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..67,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..63,
                                             id: Name("x"),
                                             ctx: Load,
@@ -185,7 +186,7 @@ Module(
                                     op: BitOr,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 66..67,
                                             id: Name("y"),
                                             ctx: Load,
@@ -198,7 +199,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..72,
                             id: Name("z"),
                             ctx: Load,
@@ -207,11 +208,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 74..77,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..77,
                                     },
                                 ),
@@ -223,16 +224,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..99,
                     is_async: false,
                     target: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..89,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 88..89,
                                     id: Name("x"),
                                     ctx: Load,
@@ -242,7 +243,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..94,
                             id: Name("z"),
                             ctx: Load,
@@ -251,11 +252,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 96..99,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..99,
                                     },
                                 ),
@@ -267,21 +268,21 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..121,
                     is_async: false,
                     target: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 104..116,
                             value: Some(
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 110..116,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 110..111,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -293,7 +294,7 @@ Module(
                                         comparators: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 115..116,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -307,7 +308,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 116..116,
                             id: Name(""),
                             ctx: Invalid,
@@ -316,11 +317,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 118..121,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 118..121,
                                     },
                                 ),
@@ -332,17 +333,17 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..153,
                     is_async: false,
                     target: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 126..143,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 127..128,
                                         id: Name("x"),
                                         ctx: Store,
@@ -350,7 +351,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 130..131,
                                         value: Int(
                                             1,
@@ -359,7 +360,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 133..134,
                                         id: Name("y"),
                                         ctx: Store,
@@ -367,27 +368,28 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 136..142,
                                         value: List(
                                             ExprList {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 137..142,
                                                 elts: [
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 138..141,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 138..141,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "a",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -407,7 +409,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 147..148,
                             id: Name("z"),
                             ctx: Load,
@@ -416,11 +418,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 150..153,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 150..153,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap
index cb545e9b38..72cac3d156 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_targ
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..124,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     is_async: false,
                     target: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..14,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("x"),
                                     ctx: Load,
@@ -33,7 +33,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..14,
                                         id: Name("y"),
                                         ctx: Load,
@@ -44,7 +44,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..19,
                             id: Name("z"),
                             ctx: Load,
@@ -53,11 +53,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..24,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..24,
                                     },
                                 ),
@@ -69,16 +69,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..45,
                     is_async: false,
                     target: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..35,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..30,
                                     id: Name("x"),
                                     ctx: Load,
@@ -90,7 +90,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..35,
                                         id: Name("y"),
                                         ctx: Load,
@@ -101,7 +101,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..40,
                             id: Name("z"),
                             ctx: Load,
@@ -110,11 +110,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 42..45,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 42..45,
                                     },
                                 ),
@@ -126,18 +126,18 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..66,
                     is_async: false,
                     target: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..56,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 50..51,
                                         id: Name("x"),
                                         ctx: Load,
@@ -145,7 +145,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..56,
                                         id: Name("y"),
                                         ctx: Load,
@@ -156,7 +156,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..61,
                             id: Name("z"),
                             ctx: Load,
@@ -165,11 +165,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 63..66,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 63..66,
                                     },
                                 ),
@@ -181,17 +181,17 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..83,
                     is_async: false,
                     target: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..73,
                             op: USub,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 72..73,
                                     id: Name("x"),
                                     ctx: Store,
@@ -201,7 +201,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 77..78,
                             id: Name("y"),
                             ctx: Load,
@@ -210,11 +210,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 80..83,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..83,
                                     },
                                 ),
@@ -226,17 +226,17 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..103,
                     is_async: false,
                     target: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 88..93,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 92..93,
                                     id: Name("x"),
                                     ctx: Store,
@@ -246,7 +246,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 97..98,
                             id: Name("y"),
                             ctx: Load,
@@ -255,11 +255,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 100..103,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 100..103,
                                     },
                                 ),
@@ -271,16 +271,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 104..123,
                     is_async: false,
                     target: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 108..113,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 108..109,
                                     id: Name("x"),
                                     ctx: Load,
@@ -289,7 +289,7 @@ Module(
                             op: BitOr,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 112..113,
                                     id: Name("y"),
                                     ctx: Load,
@@ -299,7 +299,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 117..118,
                             id: Name("z"),
                             ctx: Load,
@@ -308,11 +308,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 120..123,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 120..123,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap
index 185ab4b7a7..d219ca921c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_targ
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..170,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..13,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("d"),
                                     ctx: Load,
@@ -29,15 +29,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 5..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Compare(
                                         ExprCompare {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 6..12,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 6..7,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -49,7 +49,7 @@ Module(
                                             comparators: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 11..12,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -65,7 +65,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..23,
                             id: Name("target"),
                             ctx: Load,
@@ -74,11 +74,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -90,20 +90,20 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..56,
                     is_async: false,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..43,
                             func: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..40,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..35,
                                             id: Name("x"),
                                             ctx: Load,
@@ -115,7 +115,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 39..40,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -126,7 +126,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 41..43,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -134,7 +134,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..51,
                             id: Name("iter"),
                             ctx: Load,
@@ -143,11 +143,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 53..56,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..56,
                                     },
                                 ),
@@ -159,16 +159,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..82,
                     is_async: false,
                     target: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..68,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..63,
                                     id: Name("x"),
                                     ctx: Load,
@@ -180,7 +180,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 67..68,
                                         id: Name("y"),
                                         ctx: Load,
@@ -191,7 +191,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..77,
                             id: Name("iter"),
                             ctx: Load,
@@ -200,11 +200,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 79..82,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 79..82,
                                     },
                                 ),
@@ -216,21 +216,21 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..111,
                     is_async: false,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..98,
                             elts: [
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 88..94,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 88..89,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -242,7 +242,7 @@ Module(
                                         comparators: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 93..94,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -253,7 +253,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..97,
                                         id: Name("z"),
                                         ctx: Store,
@@ -266,7 +266,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 102..106,
                             id: Name("iter"),
                             ctx: Load,
@@ -275,11 +275,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 108..111,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 108..111,
                                     },
                                 ),
@@ -291,21 +291,21 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 112..140,
                     is_async: false,
                     target: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 116..127,
                             elts: [
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 117..123,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 117..118,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -317,7 +317,7 @@ Module(
                                         comparators: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 122..123,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -328,7 +328,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 125..126,
                                         id: Name("z"),
                                         ctx: Store,
@@ -340,7 +340,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 131..135,
                             id: Name("iter"),
                             ctx: Load,
@@ -349,11 +349,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 137..140,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 137..140,
                                     },
                                 ),
@@ -365,21 +365,21 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 141..169,
                     is_async: false,
                     target: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 145..156,
                             elts: [
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 146..152,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 146..147,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -391,7 +391,7 @@ Module(
                                         comparators: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 151..152,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -402,7 +402,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 154..155,
                                         id: Name("z"),
                                         ctx: Load,
@@ -413,7 +413,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..164,
                             id: Name("iter"),
                             ctx: Load,
@@ -422,11 +422,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 166..169,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 166..169,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap
index d16e1ec4bc..8052c314b5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_missing_in_k
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             id: Name("a"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("b"),
                             ctx: Load,
@@ -34,11 +34,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..12,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..12,
                                     },
                                 ),
@@ -50,12 +50,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..23,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..18,
                             id: Name("a"),
                             ctx: Store,
@@ -63,7 +63,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..18,
                             id: Name(""),
                             ctx: Invalid,
@@ -72,11 +72,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..23,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..23,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap
index d258342309..f9640e450a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_missing_iter
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..20,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             id: Name("x"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..8,
                             id: Name(""),
                             ctx: Invalid,
@@ -34,12 +34,12 @@ Module(
                     body: [
                         Assign(
                             StmtAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..19,
                                 targets: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 14..15,
                                             id: Name("a"),
                                             ctx: Store,
@@ -48,7 +48,7 @@ Module(
                                 ],
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         value: Int(
                                             1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap
index 42ea10ed9f..84d8b4f8cd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_missing_targ
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..14,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..6,
                             id: Name("in"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..8,
                             id: Name("x"),
                             ctx: Load,
@@ -34,11 +34,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..13,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 10..13,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap
index 2c98db482e..2520cfbe49 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_dotted_na
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..67,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 14..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 14..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -38,33 +38,33 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..34,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 22..23,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 31..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 31..32,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 33..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 33..34,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -74,83 +74,83 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..66,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 40..41,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 49..50,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 49..50,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 52..53,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 52..53,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 54..55,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 54..55,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 57..58,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("d"),
                                 range: 57..58,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 60..61,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("e"),
                                 range: 60..61,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 62..63,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("f"),
                                 range: 62..63,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 65..66,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("g"),
                                 range: 65..66,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap
index b84eb9a41a..6534394ab2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap
@@ -7,18 +7,18 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_empty_nam
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..48,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [],
@@ -27,13 +27,13 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..30,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 19..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [],
@@ -42,13 +42,13 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 31..47,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 36..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [],
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap
index 9e3cbe4994..7f405b3edf 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap
@@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_missing_m
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..19,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..4,
                     module: None,
                     names: [],
@@ -21,17 +21,17 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..18,
                     module: None,
                     names: [
                         Alias {
                             range: 17..18,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("x"),
                                 range: 17..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap
index 761cbc2a7e..f53eb5aeff 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_missing_r
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 15..16,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 15..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 18..19,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 18..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -48,15 +48,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..25,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..25,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 20..21,
                                     value: Int(
                                         1,
@@ -66,7 +66,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..25,
                                     value: Int(
                                         1,
@@ -79,33 +79,33 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..46,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 31..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 41..42,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 41..42,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 44..45,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 44..45,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -115,15 +115,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..52,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..52,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..48,
                                     value: Int(
                                         2,
@@ -133,7 +133,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     value: Int(
                                         2,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap
index 0c0d1ff705..616bb3d4c5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_star_with
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..87,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 14..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("*"),
                                 range: 14..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 17..18,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 17..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -48,43 +48,43 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..40,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 24..25,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 33..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 33..34,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 36..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("*"),
                                 range: 36..37,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 39..40,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 39..40,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -94,39 +94,39 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..64,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 46..47,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 55..56,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("*"),
                                 range: 55..56,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 58..64,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 58..59,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("b"),
                                     range: 63..64,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -136,43 +136,43 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..86,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 70..71,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 79..80,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("*"),
                                 range: 79..80,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 82..83,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("*"),
                                 range: 82..83,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 85..86,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 85..86,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap
index 4708a3d670..778e7d2381 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_unparenth
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..59,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 14..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 14..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -38,29 +38,29 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..38,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 22..23,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 31..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 31..32,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("c"),
                                     range: 36..37,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -70,33 +70,33 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 39..58,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 44..45,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 53..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 53..54,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 56..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 56..57,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap
index 2b793eb3a0..8774db9904 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_empty_bo
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..36,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..9,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -39,21 +37,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..28,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 15..18,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 18..20,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -63,7 +59,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..27,
                                 id: Name("int"),
                                 ctx: Load,
@@ -75,12 +71,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..35,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..30,
                                 id: Name("x"),
                                 ctx: Store,
@@ -89,7 +85,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..35,
                             value: Int(
                                 42,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap
index 630b9274b7..a3bef4f4b9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_invalid_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..74,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..9,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -36,11 +34,11 @@ Module(
                     returns: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..17,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..17,
                                         id: Name("int"),
                                         ctx: Load,
@@ -53,11 +51,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..22,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                     },
                                 ),
@@ -68,21 +66,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..47,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 27..30,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 30..32,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -92,11 +88,11 @@ Module(
                     returns: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 37..41,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..41,
                                         id: Name("int"),
                                         ctx: Load,
@@ -109,11 +105,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..47,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..47,
                                     },
                                 ),
@@ -124,21 +120,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 48..73,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 52..55,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 55..57,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -148,12 +142,12 @@ Module(
                     returns: Some(
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 61..68,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 67..68,
                                             id: Name("x"),
                                             ctx: Load,
@@ -166,11 +160,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 70..73,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 70..73,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap
index 6b3b63253f..1ee0f8c743 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..31,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name(""),
                         range: 3..3,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 4..6,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 8..11,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..11,
                                     },
                                 ),
@@ -52,21 +50,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..30,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name(""),
                         range: 15..15,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 16..18,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -76,7 +72,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..25,
                                 id: Name("int"),
                                 ctx: Load,
@@ -86,11 +82,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..30,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..30,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap
index e8b2fbeeac..36593a9900 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..19,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..9,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 15..18,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..18,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap
index f3b024f7e5..9028296eeb 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap
@@ -7,43 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_unclosed
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..74,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..18,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..14,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..14,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 11..14,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -55,14 +53,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 16..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 16..18,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 16..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -79,21 +77,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..43,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 23..26,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 26..28,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -104,12 +100,12 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 34..43,
                                 value: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 41..43,
                                             value: Int(
                                                 42,
@@ -124,38 +120,36 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..74,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 48..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 51..74,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 52..58,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 52..58,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 52..53,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 55..58,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -167,19 +161,19 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 60..66,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 60..66,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 60..61,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 63..66,
                                                 id: Name("str"),
                                                 ctx: Load,
@@ -191,21 +185,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 67..73,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 67..68,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 67..68,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 71..73,
                                             value: Int(
                                                 10,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap
index f8ef4f8169..fa71509d1f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_unclosed
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..47,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..39,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 7..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 8..10,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T1"),
                                             range: 8..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -41,12 +41,12 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 12..15,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T2"),
                                             range: 13..15,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -56,21 +56,19 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 15..21,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 16..17,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 16..17,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 16..17,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -78,14 +76,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 19..20,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 19..20,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 19..20,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -100,16 +98,16 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..39,
                                 value: Some(
                                     BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..39,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 34..35,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -118,7 +116,7 @@ Module(
                                             op: Add,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 38..39,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -134,12 +132,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..46,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 40..41,
                                 id: Name("x"),
                                 ctx: Store,
@@ -148,7 +146,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..46,
                             value: Int(
                                 10,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap
index a2e19de94c..fc72f4209f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_unparent
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..50,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..9,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -36,12 +34,12 @@ Module(
                     returns: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..17,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..16,
                                             id: Name("int"),
                                             ctx: Load,
@@ -56,11 +54,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..22,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                     },
                                 ),
@@ -71,21 +69,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..49,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 27..30,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 30..32,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -95,12 +91,12 @@ Module(
                     returns: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 36..44,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..39,
                                             id: Name("int"),
                                             ctx: Load,
@@ -108,7 +104,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 41..44,
                                             id: Name("str"),
                                             ctx: Load,
@@ -123,11 +119,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 46..49,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 46..49,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap
index 18039d0ce0..5ab2a0d364 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_type_params_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..79,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..61,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 48..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 51..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 52..53,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 52..53,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -44,9 +44,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 54..56,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -57,11 +55,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..61,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                     },
                                 ),
@@ -72,27 +70,25 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 62..78,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 66..69,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 69..71,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [],
                         },
                     ),
                     parameters: Parameters {
                         range: 71..73,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -103,11 +99,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 75..78,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..78,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap
index 6255c8fe59..5971aa62c7 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap
@@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/global_stmt_empty.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..7,
         body: [
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     names: [],
                 },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap
index d179c96eef..c80bc04505 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap
@@ -7,34 +7,34 @@ input_file: crates/ruff_python_parser/resources/inline/err/global_stmt_expressio
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..13,
         body: [
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 7..8,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..12,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..12,
                             op: UAdd,
                             operand: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..12,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap
index 232acca04d..6891697042 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap
@@ -7,43 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/global_stmt_trailing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..32,
         body: [
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     names: [],
                 },
             ),
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..18,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 16..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
             ),
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..31,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 26..27,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                         Identifier {
                             id: Name("y"),
                             range: 29..30,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap
index 888e539c24..d8ac7c86be 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_elif_missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..46,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..45,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..4,
                             id: Name("x"),
                             ctx: Load,
@@ -25,7 +25,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..14,
                             },
                         ),
@@ -33,11 +33,11 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 15..30,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..21,
                                         id: Name("y"),
                                         ctx: Load,
@@ -47,7 +47,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..30,
                                     },
                                 ),
@@ -55,12 +55,12 @@ Module(
                         },
                         ElifElseClause {
                             range: 31..45,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 41..45,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap
index 0b8fecc048..1d74c36f48 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_empty_body.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..15,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -27,15 +27,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..14,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..14,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         1,
@@ -45,7 +45,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap
index ee46056de5..356e404b04 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_invalid_elif_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..56,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..55,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..4,
                             id: Name("x"),
                             ctx: Load,
@@ -25,7 +25,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..14,
                             },
                         ),
@@ -33,15 +33,15 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 15..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..22,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 21..22,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -54,7 +54,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..32,
                                     },
                                 ),
@@ -62,16 +62,16 @@ Module(
                         },
                         ElifElseClause {
                             range: 33..55,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..45,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 44..45,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -84,7 +84,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..55,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap
index 0562b031f9..c06836fcdb 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_invalid_test_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..48,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     test: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..5,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 7..10,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 7..10,
                                     },
                                 ),
@@ -48,16 +48,16 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..26,
                     test: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..21,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..21,
                                         id: Name("x"),
                                         ctx: Load,
@@ -69,11 +69,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..26,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..26,
                                     },
                                 ),
@@ -85,15 +85,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..47,
                     test: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..42,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..42,
                                     id: Name("x"),
                                     ctx: Load,
@@ -104,11 +104,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..47,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..47,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap
index 091fe218f5..8092bc7d7c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_missing_colon
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..25,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..4,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..4,
                             id: Name("x"),
                             ctx: Load,
@@ -28,11 +28,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..18,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..9,
                             id: Name("x"),
                             ctx: Load,
@@ -41,7 +41,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..18,
                             },
                         ),
@@ -51,12 +51,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..24,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..20,
                                 id: Name("a"),
                                 ctx: Store,
@@ -65,7 +65,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap
index 13cacd4b10..421ce18c82 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_missing_test.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..9,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2..2,
                             id: Name(""),
                             ctx: Invalid,
@@ -25,11 +25,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 5..8,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..8,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap
index bef4a1b852..e932a526c4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_misspelled_el
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..47,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -24,7 +24,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..17,
                             },
                         ),
@@ -34,11 +34,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..22,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..21,
                             id: Name("elf"),
                             ctx: Store,
@@ -46,7 +46,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..22,
                             id: Name(""),
                             ctx: Invalid,
@@ -58,13 +58,13 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..31,
                 },
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..46,
                 },
             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap
index 887ae67220..7dd649dafd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap
@@ -7,28 +7,45 @@ input_file: crates/ruff_python_parser/resources/inline/err/implicitly_concatenat
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..47,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
-                    range: 0..7,
+                    node_index: NodeIndex(None),
+                    range: 0..14,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
-                            range: 0..7,
+                            node_index: NodeIndex(None),
+                            range: 0..14,
                             value: StringLiteralValue {
-                                inner: Single(
-                                    StringLiteral {
-                                        range: 0..7,
-                                        node_index: AtomicNodeIndex(..),
-                                        value: "hello",
-                                        flags: StringLiteralFlags {
-                                            quote_style: Single,
-                                            prefix: Empty,
-                                            triple_quoted: false,
-                                        },
+                                inner: Concatenated(
+                                    ConcatenatedStringLiteral {
+                                        strings: [
+                                            StringLiteral {
+                                                range: 0..7,
+                                                node_index: NodeIndex(None),
+                                                value: "hello",
+                                                flags: StringLiteralFlags {
+                                                    quote_style: Single,
+                                                    prefix: Empty,
+                                                    triple_quoted: false,
+                                                    unclosed: false,
+                                                },
+                                            },
+                                            StringLiteral {
+                                                range: 8..14,
+                                                node_index: NodeIndex(None),
+                                                value: "world",
+                                                flags: StringLiteralFlags {
+                                                    quote_style: Single,
+                                                    prefix: Empty,
+                                                    triple_quoted: false,
+                                                    unclosed: true,
+                                                },
+                                            },
+                                        ],
+                                        value: "helloworld",
                                     },
                                 ),
                             },
@@ -38,15 +55,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..20,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..20,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 15..16,
                                     value: Int(
                                         1,
@@ -56,7 +73,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..20,
                                     value: Int(
                                         1,
@@ -69,11 +86,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..40,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..40,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -81,34 +98,35 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 21..28,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "hello",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 29..40,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 31..37,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "world ",
                                                         },
                                                     ),
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 37..40,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 38..39,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -124,6 +142,7 @@ Module(
                                                     quote_style: Single,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: true,
                                                 },
                                             },
                                         ),
@@ -136,15 +155,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..46,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..46,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..42,
                                     value: Int(
                                         2,
@@ -154,7 +173,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 45..46,
                                     value: Int(
                                         2,
@@ -179,15 +198,6 @@ Module(
   |
 
 
-  |
-1 | 'hello' 'world
-  |               ^ Syntax Error: Expected a statement
-2 | 1 + 1
-3 | 'hello' f'world {x}
-4 | 2 + 2
-  |
-
-
   |
 1 | 'hello' 'world
 2 | 1 + 1
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap
index 59016cc425..6d6ae6f83c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/implicitly_concatenat
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..85,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..31,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..31,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -24,34 +24,35 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 6..13,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "hello",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 18..31,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 20..26,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "world ",
                                                         },
                                                     ),
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 26..29,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 27..28,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -67,6 +68,7 @@ Module(
                                                     quote_style: Single,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: true,
                                                 },
                                             },
                                         ),
@@ -79,15 +81,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..37,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..37,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 32..33,
                                     value: Int(
                                         1,
@@ -97,7 +99,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..37,
                                     value: Int(
                                         1,
@@ -110,60 +112,63 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
-                    range: 38..51,
-                    value: StringLiteral(
-                        ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
-                            range: 44..51,
-                            value: StringLiteralValue {
-                                inner: Single(
-                                    StringLiteral {
-                                        range: 44..51,
-                                        node_index: AtomicNodeIndex(..),
-                                        value: "first",
-                                        flags: StringLiteralFlags {
-                                            quote_style: Single,
-                                            prefix: Empty,
-                                            triple_quoted: false,
-                                        },
-                                    },
-                                ),
-                            },
-                        },
-                    ),
-                },
-            ),
-            Expr(
-                StmtExpr {
-                    node_index: AtomicNodeIndex(..),
-                    range: 68..76,
+                    node_index: NodeIndex(None),
+                    range: 38..78,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
-                            range: 68..76,
+                            node_index: NodeIndex(None),
+                            range: 44..76,
                             value: FStringValue {
-                                inner: Single(
-                                    FString(
-                                        FString {
-                                            range: 68..76,
-                                            node_index: AtomicNodeIndex(..),
-                                            elements: [
-                                                Literal(
-                                                    InterpolatedStringLiteralElement {
-                                                        range: 70..75,
-                                                        node_index: AtomicNodeIndex(..),
-                                                        value: "third",
-                                                    },
-                                                ),
-                                            ],
-                                            flags: FStringFlags {
-                                                quote_style: Single,
-                                                prefix: Regular,
-                                                triple_quoted: false,
+                                inner: Concatenated(
+                                    [
+                                        Literal(
+                                            StringLiteral {
+                                                range: 44..51,
+                                                node_index: NodeIndex(None),
+                                                value: "first",
+                                                flags: StringLiteralFlags {
+                                                    quote_style: Single,
+                                                    prefix: Empty,
+                                                    triple_quoted: false,
+                                                    unclosed: false,
+                                                },
                                             },
-                                        },
-                                    ),
+                                        ),
+                                        Literal(
+                                            StringLiteral {
+                                                range: 56..63,
+                                                node_index: NodeIndex(None),
+                                                value: "second",
+                                                flags: StringLiteralFlags {
+                                                    quote_style: Single,
+                                                    prefix: Empty,
+                                                    triple_quoted: false,
+                                                    unclosed: true,
+                                                },
+                                            },
+                                        ),
+                                        FString(
+                                            FString {
+                                                range: 68..76,
+                                                node_index: NodeIndex(None),
+                                                elements: [
+                                                    Literal(
+                                                        InterpolatedStringLiteralElement {
+                                                            range: 70..75,
+                                                            node_index: NodeIndex(None),
+                                                            value: "third",
+                                                        },
+                                                    ),
+                                                ],
+                                                flags: FStringFlags {
+                                                    quote_style: Single,
+                                                    prefix: Regular,
+                                                    triple_quoted: false,
+                                                    unclosed: false,
+                                                },
+                                            },
+                                        ),
+                                    ],
                                 ),
                             },
                         },
@@ -172,15 +177,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..84,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..84,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 79..80,
                                     value: Int(
                                         2,
@@ -190,7 +195,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..84,
                                     value: Int(
                                         2,
@@ -246,21 +251,3 @@ Module(
  9 |     f'third'
 10 | )
    |
-
-
-   |
- 8 |     'second
- 9 |     f'third'
-10 | )
-   | ^ Syntax Error: Expected a statement
-11 | 2 + 2
-   |
-
-
-   |
- 8 |     'second
- 9 |     f'third'
-10 | )
-   |  ^ Syntax Error: Expected a statement
-11 | 2 + 2
-   |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap
index 23ff8ca3c4..33c7bf11e6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_alias_missing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..12,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     names: [
                         Alias {
                             range: 7..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("x"),
                                 range: 7..8,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap
new file mode 100644
index 0000000000..2e1c53fdbd
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap
@@ -0,0 +1,271 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/import_from_star.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..144,
+        body: [
+            FunctionDef(
+                StmtFunctionDef {
+                    node_index: NodeIndex(None),
+                    range: 0..34,
+                    is_async: false,
+                    decorator_list: [],
+                    name: Identifier {
+                        id: Name("f1"),
+                        range: 4..6,
+                        node_index: NodeIndex(None),
+                    },
+                    type_params: None,
+                    parameters: Parameters {
+                        range: 6..8,
+                        node_index: NodeIndex(None),
+                        posonlyargs: [],
+                        args: [],
+                        vararg: None,
+                        kwonlyargs: [],
+                        kwarg: None,
+                    },
+                    returns: None,
+                    body: [
+                        ImportFrom(
+                            StmtImportFrom {
+                                node_index: NodeIndex(None),
+                                range: 14..34,
+                                module: Some(
+                                    Identifier {
+                                        id: Name("module"),
+                                        range: 19..25,
+                                        node_index: NodeIndex(None),
+                                    },
+                                ),
+                                names: [
+                                    Alias {
+                                        range: 33..34,
+                                        node_index: NodeIndex(None),
+                                        name: Identifier {
+                                            id: Name("*"),
+                                            range: 33..34,
+                                            node_index: NodeIndex(None),
+                                        },
+                                        asname: None,
+                                    },
+                                ],
+                                level: 0,
+                            },
+                        ),
+                    ],
+                },
+            ),
+            ClassDef(
+                StmtClassDef {
+                    node_index: NodeIndex(None),
+                    range: 35..68,
+                    decorator_list: [],
+                    name: Identifier {
+                        id: Name("C"),
+                        range: 41..42,
+                        node_index: NodeIndex(None),
+                    },
+                    type_params: None,
+                    arguments: None,
+                    body: [
+                        ImportFrom(
+                            StmtImportFrom {
+                                node_index: NodeIndex(None),
+                                range: 48..68,
+                                module: Some(
+                                    Identifier {
+                                        id: Name("module"),
+                                        range: 53..59,
+                                        node_index: NodeIndex(None),
+                                    },
+                                ),
+                                names: [
+                                    Alias {
+                                        range: 67..68,
+                                        node_index: NodeIndex(None),
+                                        name: Identifier {
+                                            id: Name("*"),
+                                            range: 67..68,
+                                            node_index: NodeIndex(None),
+                                        },
+                                        asname: None,
+                                    },
+                                ],
+                                level: 0,
+                            },
+                        ),
+                    ],
+                },
+            ),
+            FunctionDef(
+                StmtFunctionDef {
+                    node_index: NodeIndex(None),
+                    range: 69..105,
+                    is_async: false,
+                    decorator_list: [],
+                    name: Identifier {
+                        id: Name("f2"),
+                        range: 73..75,
+                        node_index: NodeIndex(None),
+                    },
+                    type_params: None,
+                    parameters: Parameters {
+                        range: 75..77,
+                        node_index: NodeIndex(None),
+                        posonlyargs: [],
+                        args: [],
+                        vararg: None,
+                        kwonlyargs: [],
+                        kwarg: None,
+                    },
+                    returns: None,
+                    body: [
+                        ImportFrom(
+                            StmtImportFrom {
+                                node_index: NodeIndex(None),
+                                range: 83..105,
+                                module: Some(
+                                    Identifier {
+                                        id: Name("module"),
+                                        range: 90..96,
+                                        node_index: NodeIndex(None),
+                                    },
+                                ),
+                                names: [
+                                    Alias {
+                                        range: 104..105,
+                                        node_index: NodeIndex(None),
+                                        name: Identifier {
+                                            id: Name("*"),
+                                            range: 104..105,
+                                            node_index: NodeIndex(None),
+                                        },
+                                        asname: None,
+                                    },
+                                ],
+                                level: 2,
+                            },
+                        ),
+                    ],
+                },
+            ),
+            FunctionDef(
+                StmtFunctionDef {
+                    node_index: NodeIndex(None),
+                    range: 106..143,
+                    is_async: false,
+                    decorator_list: [],
+                    name: Identifier {
+                        id: Name("f3"),
+                        range: 110..112,
+                        node_index: NodeIndex(None),
+                    },
+                    type_params: None,
+                    parameters: Parameters {
+                        range: 112..114,
+                        node_index: NodeIndex(None),
+                        posonlyargs: [],
+                        args: [],
+                        vararg: None,
+                        kwonlyargs: [],
+                        kwarg: None,
+                    },
+                    returns: None,
+                    body: [
+                        ImportFrom(
+                            StmtImportFrom {
+                                node_index: NodeIndex(None),
+                                range: 120..143,
+                                module: Some(
+                                    Identifier {
+                                        id: Name("module"),
+                                        range: 125..131,
+                                        node_index: NodeIndex(None),
+                                    },
+                                ),
+                                names: [
+                                    Alias {
+                                        range: 139..140,
+                                        node_index: NodeIndex(None),
+                                        name: Identifier {
+                                            id: Name("*"),
+                                            range: 139..140,
+                                            node_index: NodeIndex(None),
+                                        },
+                                        asname: None,
+                                    },
+                                    Alias {
+                                        range: 142..143,
+                                        node_index: NodeIndex(None),
+                                        name: Identifier {
+                                            id: Name("*"),
+                                            range: 142..143,
+                                            node_index: NodeIndex(None),
+                                        },
+                                        asname: None,
+                                    },
+                                ],
+                                level: 0,
+                            },
+                        ),
+                    ],
+                },
+            ),
+        ],
+    },
+)
+```
+## Errors
+
+  |
+6 |     from ..module import *
+7 | def f3():
+8 |     from module import *, *
+  |                        ^^^^ Syntax Error: Star import must be the only import
+  |
+
+
+## Semantic Syntax Errors
+
+  |
+1 | def f1():
+2 |     from module import *
+  |     ^^^^^^^^^^^^^^^^^^^^ Syntax Error: `from module import *` only allowed at module level
+3 | class C:
+4 |     from module import *
+  |
+
+
+  |
+2 |     from module import *
+3 | class C:
+4 |     from module import *
+  |     ^^^^^^^^^^^^^^^^^^^^ Syntax Error: `from module import *` only allowed at module level
+5 | def f2():
+6 |     from ..module import *
+  |
+
+
+  |
+4 |     from module import *
+5 | def f2():
+6 |     from ..module import *
+  |     ^^^^^^^^^^^^^^^^^^^^^^ Syntax Error: `from ..module import *` only allowed at module level
+7 | def f3():
+8 |     from module import *, *
+  |
+
+
+  |
+6 |     from ..module import *
+7 | def f3():
+8 |     from module import *, *
+  |     ^^^^^^^^^^^^^^^^^^^^^^^ Syntax Error: `from module import *` only allowed at module level
+  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap
index b198a71477..74adfe2d52 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap
@@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_empty.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..7,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     names: [],
                 },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap
index dedb2fd84b..2db170e781 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_parenthes
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..25,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     names: [],
                 },
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..10,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..9,
                             id: Name("a"),
                             ctx: Load,
@@ -33,23 +33,23 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..17,
                     names: [],
                 },
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..24,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..24,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..20,
                                         id: Name("a"),
                                         ctx: Load,
@@ -57,7 +57,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..23,
                                         id: Name("b"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap
index 81439cdee2..84de08d960 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap
@@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_star_impo
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     names: [],
                 },
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..8,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..8,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..8,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -40,16 +40,16 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..18,
                     names: [
                         Alias {
                             range: 16..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("x"),
                                 range: 16..17,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -58,20 +58,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..23,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..23,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..20,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..20,
                                                 id: Name(""),
                                                 ctx: Invalid,
@@ -82,7 +82,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..23,
                                         id: Name("y"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap
index d9ea1890a5..5179defd2f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_trailing_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..22,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     names: [],
                 },
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..21,
                     names: [
                         Alias {
                             range: 16..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("x"),
                                 range: 16..17,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 19..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("y"),
                                 range: 19..20,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap
index 815e902255..3c8495804d 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap
@@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_cl
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..247,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("F"),
                         range: 6..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 7..10,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 8..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -44,15 +44,15 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 10..21,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 11..20,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 11..12,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -60,7 +60,7 @@ Module(
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..20,
                                                 id: Name("list"),
                                                 ctx: Load,
@@ -75,11 +75,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..26,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..26,
                                     },
                                 ),
@@ -90,27 +90,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..53,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("I"),
                         range: 33..34,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 34..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 35..36,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 35..36,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -122,16 +122,16 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 37..48,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..46,
                                         value: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 45..46,
                                                     value: Int(
                                                         1,
@@ -148,11 +148,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 50..53,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 50..53,
                                     },
                                 ),
@@ -163,27 +163,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..85,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("J"),
                         range: 60..61,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 61..64,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 62..63,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 62..63,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -195,15 +195,15 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 64..80,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 YieldFrom(
                                     ExprYieldFrom {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 66..78,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 77..78,
                                                 value: Int(
                                                     1,
@@ -219,11 +219,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 82..85,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 82..85,
                                     },
                                 ),
@@ -234,37 +234,37 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..112,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("K"),
                         range: 92..93,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 93..107,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 94..106,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 94..95,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 98..105,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 104..105,
                                                                 value: Int(
                                                                     1,
@@ -285,11 +285,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 109..112,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..112,
                                     },
                                 ),
@@ -300,36 +300,36 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..162,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("L"),
                         range: 143..144,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 144..157,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 145..156,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 145..146,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Named(
                                                 ExprNamed {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 149..155,
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 149..150,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -337,7 +337,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 154..155,
                                                             value: Int(
                                                                 1,
@@ -357,11 +357,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 159..162,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 159..162,
                                     },
                                 ),
@@ -372,27 +372,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 193..219,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("M"),
                         range: 199..200,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 200..203,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 201..202,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 201..202,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -404,15 +404,15 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 203..214,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 205..212,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 211..212,
                                                 value: Int(
                                                     1,
@@ -428,11 +428,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 216..219,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 216..219,
                                     },
                                 ),
@@ -443,36 +443,36 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 220..246,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("N"),
                         range: 226..227,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 227..241,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 228..240,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 228..229,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 232..239,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 238..239,
                                                             value: Int(
                                                                 1,
@@ -492,11 +492,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 243..246,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 243..246,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap
index 2953a62e55..682cbac08f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_fu
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..987,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("d"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 5..8,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 6..7,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 6..7,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -44,9 +44,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 8..10,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -56,11 +54,11 @@ Module(
                     returns: Some(
                         Await(
                             ExprAwait {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 15..22,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..22,
                                         value: Int(
                                             1,
@@ -73,11 +71,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -88,28 +86,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..58,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("e"),
                         range: 33..34,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 34..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 35..36,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 35..36,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -120,30 +118,28 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 37..53,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 38..52,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 38..52,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 38..41,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 44..51,
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 50..51,
                                                         value: Int(
                                                             1,
@@ -165,11 +161,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 55..58,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..58,
                                     },
                                 ),
@@ -180,28 +176,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..86,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 63..64,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 64..67,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 65..66,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 65..66,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -212,9 +208,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 67..69,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -224,11 +218,11 @@ Module(
                     returns: Some(
                         Named(
                             ExprNamed {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 74..80,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
                                         id: Name("y"),
                                         ctx: Store,
@@ -236,7 +230,7 @@ Module(
                                 ),
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 79..80,
                                         value: Int(
                                             3,
@@ -249,11 +243,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 83..86,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..86,
                                     },
                                 ),
@@ -264,28 +258,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..115,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 91..92,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 92..95,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 93..94,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 93..94,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -296,30 +290,28 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 95..110,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 96..109,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 96..109,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 96..99,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 102..108,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 102..103,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -327,7 +319,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 107..108,
                                                         value: Int(
                                                             1,
@@ -349,11 +341,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 112..115,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 112..115,
                                     },
                                 ),
@@ -364,28 +356,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 116..143,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("h"),
                         range: 120..121,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 121..124,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 122..123,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 122..123,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -396,31 +388,29 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 124..138,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 125..137,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 125..137,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 125..126,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 129..136,
                                                 value: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 135..136,
                                                             value: Int(
                                                                 1,
@@ -443,11 +433,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 140..143,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 140..143,
                                     },
                                 ),
@@ -458,28 +448,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 144..172,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("j"),
                         range: 148..149,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 149..152,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 150..151,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 150..151,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -490,9 +480,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 152..154,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -502,12 +490,12 @@ Module(
                     returns: Some(
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 159..166,
                                 value: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 165..166,
                                             value: Int(
                                                 1,
@@ -521,11 +509,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 169..172,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 169..172,
                                     },
                                 ),
@@ -536,28 +524,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 173..205,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("l"),
                         range: 177..178,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 178..181,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 179..180,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 179..180,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -568,30 +556,28 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 181..200,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 182..199,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 182..199,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 182..183,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 186..198,
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 197..198,
                                                         value: Int(
                                                             1,
@@ -613,11 +599,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 202..205,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 202..205,
                                     },
                                 ),
@@ -628,28 +614,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 206..239,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("n"),
                         range: 210..211,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 211..214,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 212..213,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 212..213,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -660,9 +646,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 214..216,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -672,11 +656,11 @@ Module(
                     returns: Some(
                         YieldFrom(
                             ExprYieldFrom {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 221..233,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 232..233,
                                         value: Int(
                                             1,
@@ -689,11 +673,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 236..239,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 236..239,
                                     },
                                 ),
@@ -704,38 +688,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 240..266,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("p"),
                         range: 244..245,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 245..259,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 246..258,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 246..247,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 250..257,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 256..257,
                                                                 value: Int(
                                                                     1,
@@ -754,9 +738,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 259..261,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -767,11 +749,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 263..266,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 263..266,
                                     },
                                 ),
@@ -782,39 +764,39 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 297..324,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("q"),
                         range: 301..302,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 302..317,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 303..316,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 303..304,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 308..315,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 314..315,
                                                                 value: Int(
                                                                     1,
@@ -832,9 +814,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 317..319,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -845,11 +825,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 321..324,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 321..324,
                                     },
                                 ),
@@ -860,38 +840,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 356..385,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("r"),
                         range: 360..361,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 361..378,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 362..377,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 363..365,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 369..376,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 375..376,
                                                                 value: Int(
                                                                     1,
@@ -909,9 +889,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 378..380,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -922,11 +900,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 382..385,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 382..385,
                                     },
                                 ),
@@ -937,38 +915,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 420..450,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("s"),
                         range: 424..425,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 425..443,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 426..442,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 428..430,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 434..441,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 440..441,
                                                                 value: Int(
                                                                     1,
@@ -986,9 +964,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 443..445,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -999,11 +975,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 447..450,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 447..450,
                                     },
                                 ),
@@ -1014,37 +990,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 481..506,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("t"),
                         range: 485..486,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 486..499,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 487..498,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 487..488,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Named(
                                                 ExprNamed {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 491..497,
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 491..492,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -1052,7 +1028,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 496..497,
                                                             value: Int(
                                                                 1,
@@ -1070,9 +1046,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 499..501,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1083,11 +1057,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 503..506,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 503..506,
                                     },
                                 ),
@@ -1098,38 +1072,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 543..569,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("u"),
                         range: 547..548,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 548..562,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 549..561,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 549..550,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Named(
                                                 ExprNamed {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 554..560,
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 554..555,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -1137,7 +1111,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 559..560,
                                                             value: Int(
                                                                 1,
@@ -1154,9 +1128,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 562..564,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1167,11 +1139,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 566..569,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 566..569,
                                     },
                                 ),
@@ -1182,37 +1154,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 607..635,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("v"),
                         range: 611..612,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 612..628,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 613..627,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 614..616,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Named(
                                                 ExprNamed {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 620..626,
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 620..621,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -1220,7 +1192,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 625..626,
                                                             value: Int(
                                                                 1,
@@ -1237,9 +1209,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 628..630,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1250,11 +1220,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 632..635,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 632..635,
                                     },
                                 ),
@@ -1265,37 +1235,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 676..705,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("w"),
                         range: 680..681,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 681..698,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 682..697,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 684..686,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Named(
                                                 ExprNamed {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 690..696,
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 690..691,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -1303,7 +1273,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 695..696,
                                                             value: Int(
                                                                 1,
@@ -1320,9 +1290,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 698..700,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1333,11 +1301,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 702..705,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 702..705,
                                     },
                                 ),
@@ -1348,37 +1316,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 742..768,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("t"),
                         range: 746..747,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 747..761,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 748..760,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 748..749,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 752..759,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 758..759,
                                                             value: Int(
                                                                 1,
@@ -1396,9 +1364,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 761..763,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1409,11 +1375,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 765..768,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 765..768,
                                     },
                                 ),
@@ -1424,38 +1390,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 800..827,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("u"),
                         range: 804..805,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 805..820,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 806..819,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 806..807,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 811..818,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 817..818,
                                                             value: Int(
                                                                 1,
@@ -1472,9 +1438,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 820..822,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1485,11 +1449,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 824..827,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 824..827,
                                     },
                                 ),
@@ -1500,37 +1464,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 860..889,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("v"),
                         range: 864..865,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 865..882,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 866..881,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 867..869,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 873..880,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 879..880,
                                                             value: Int(
                                                                 1,
@@ -1547,9 +1511,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 882..884,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1560,11 +1522,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 886..889,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 886..889,
                                     },
                                 ),
@@ -1575,37 +1537,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 925..955,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("w"),
                         range: 929..930,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 930..948,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 931..947,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 933..935,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 939..946,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 945..946,
                                                             value: Int(
                                                                 1,
@@ -1622,9 +1584,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 948..950,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -1635,11 +1595,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 952..955,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 952..955,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap
index 81e3240ff7..132507c7c7 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_fu
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..316,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..68,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 48..49,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 49..51,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -36,11 +34,11 @@ Module(
                     returns: Some(
                         Named(
                             ExprNamed {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 56..62,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..57,
                                         id: Name("y"),
                                         ctx: Store,
@@ -48,7 +46,7 @@ Module(
                                 ),
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 61..62,
                                         value: Int(
                                             3,
@@ -61,11 +59,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..68,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 65..68,
                                     },
                                 ),
@@ -76,42 +74,40 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 69..94,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 73..74,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 74..89,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 75..88,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 75..88,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 75..78,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 81..87,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 81..82,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -119,7 +115,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 86..87,
                                                         value: Int(
                                                             1,
@@ -141,11 +137,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 91..94,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 91..94,
                                     },
                                 ),
@@ -156,21 +152,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..235,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 99..104,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 104..106,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -181,43 +175,41 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 112..136,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("i"),
                                     range: 116..117,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 117..131,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 118..130,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 118..130,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 118..119,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: Some(
                                                     Yield(
                                                         ExprYield {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 122..129,
                                                             value: Some(
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 128..129,
                                                                         value: Int(
                                                                             1,
@@ -240,11 +232,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 133..136,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 133..136,
                                                 },
                                             ),
@@ -255,21 +247,19 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 141..166,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("k"),
                                     range: 145..146,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 146..148,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -279,12 +269,12 @@ Module(
                                 returns: Some(
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 153..160,
                                             value: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 159..160,
                                                         value: Int(
                                                             1,
@@ -298,11 +288,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 163..166,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 163..166,
                                                 },
                                             ),
@@ -313,42 +303,40 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 171..200,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("m"),
                                     range: 175..176,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 176..195,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 177..194,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 177..194,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 177..178,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: Some(
                                                     YieldFrom(
                                                         ExprYieldFrom {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 181..193,
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 192..193,
                                                                     value: Int(
                                                                         1,
@@ -370,11 +358,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 197..200,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 197..200,
                                                 },
                                             ),
@@ -385,21 +373,19 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 205..235,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("o"),
                                     range: 209..210,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 210..212,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -409,11 +395,11 @@ Module(
                                 returns: Some(
                                     YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 217..229,
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 228..229,
                                                     value: Int(
                                                         1,
@@ -426,11 +412,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 232..235,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 232..235,
                                                 },
                                             ),
@@ -444,21 +430,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 236..315,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 246..251,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 251..253,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -469,21 +453,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 259..284,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("f"),
                                     range: 263..264,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 264..266,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -493,11 +475,11 @@ Module(
                                 returns: Some(
                                     Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 271..278,
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 277..278,
                                                     value: Int(
                                                         1,
@@ -510,11 +492,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 281..284,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 281..284,
                                                 },
                                             ),
@@ -525,42 +507,40 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 289..315,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("g"),
                                     range: 293..294,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 294..310,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 295..309,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 295..309,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("arg"),
                                                     range: 295..298,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: Some(
                                                     Await(
                                                         ExprAwait {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 301..308,
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 307..308,
                                                                     value: Int(
                                                                         1,
@@ -582,11 +562,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 312..315,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 312..315,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap
index 78ac67583b..f3fdd11ffe 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..144,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..55,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..45,
                             id: Name("a"),
                             ctx: Store,
@@ -24,11 +24,11 @@ Module(
                     ),
                     annotation: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 48..54,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..49,
                                     id: Name("x"),
                                     ctx: Store,
@@ -36,7 +36,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     value: Int(
                                         1,
@@ -51,21 +51,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 56..107,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 60..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -76,11 +74,11 @@ Module(
                     body: [
                         AnnAssign(
                             StmtAnnAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 73..85,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 73..74,
                                         id: Name("b"),
                                         ctx: Store,
@@ -88,12 +86,12 @@ Module(
                                 ),
                                 annotation: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..84,
                                         value: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 83..84,
                                                     value: Int(
                                                         1,
@@ -109,11 +107,11 @@ Module(
                         ),
                         AnnAssign(
                             StmtAnnAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 90..107,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 90..91,
                                         id: Name("c"),
                                         ctx: Store,
@@ -121,11 +119,11 @@ Module(
                                 ),
                                 annotation: YieldFrom(
                                     ExprYieldFrom {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..106,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 105..106,
                                                 value: Int(
                                                     1,
@@ -143,21 +141,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 108..143,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 118..123,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 123..125,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -168,11 +164,11 @@ Module(
                     body: [
                         AnnAssign(
                             StmtAnnAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 131..143,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 131..132,
                                         id: Name("d"),
                                         ctx: Store,
@@ -180,11 +176,11 @@ Module(
                                 ),
                                 annotation: Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 135..142,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 141..142,
                                                 value: Int(
                                                     1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap
index 10e387a20b..5a05ef64f6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_ty
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..406,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,26 +25,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 7..19,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 11..18,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 17..18,
                                                                 value: Int(
                                                                     1,
@@ -63,7 +63,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..26,
                             id: Name("int"),
                             ctx: Load,
@@ -73,11 +73,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 48..75,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..54,
                             id: Name("X"),
                             ctx: Store,
@@ -86,27 +86,27 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 54..69,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 55..68,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 55..56,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 60..67,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 66..67,
                                                                 value: Int(
                                                                     1,
@@ -124,7 +124,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..75,
                             id: Name("int"),
                             ctx: Load,
@@ -134,11 +134,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 98..127,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 103..104,
                             id: Name("X"),
                             ctx: Store,
@@ -147,26 +147,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 104..121,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 105..120,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 106..108,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 112..119,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 118..119,
                                                                 value: Int(
                                                                     1,
@@ -184,7 +184,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 124..127,
                             id: Name("int"),
                             ctx: Load,
@@ -194,11 +194,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 153..183,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 158..159,
                             id: Name("X"),
                             ctx: Store,
@@ -207,26 +207,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 159..177,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 160..176,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 162..164,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 168..175,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 174..175,
                                                                 value: Int(
                                                                     1,
@@ -244,7 +244,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 180..183,
                             id: Name("int"),
                             ctx: Load,
@@ -254,11 +254,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 205..223,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 210..211,
                             id: Name("Y"),
                             ctx: Store,
@@ -267,12 +267,12 @@ Module(
                     type_params: None,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 215..222,
                             value: Some(
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 221..222,
                                         value: Int(
                                             1,
@@ -286,11 +286,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 254..271,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 259..260,
                             id: Name("Y"),
                             ctx: Store,
@@ -299,11 +299,11 @@ Module(
                     type_params: None,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 264..270,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 264..265,
                                     id: Name("x"),
                                     ctx: Store,
@@ -311,7 +311,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 269..270,
                                     value: Int(
                                         1,
@@ -324,11 +324,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 308..334,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 313..314,
                             id: Name("Y"),
                             ctx: Store,
@@ -337,25 +337,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 314..328,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 315..327,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 315..316,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 319..326,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 325..326,
                                                             value: Int(
                                                                 1,
@@ -373,7 +373,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 331..334,
                             id: Name("int"),
                             ctx: Load,
@@ -383,11 +383,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 357..375,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 362..363,
                             id: Name("Y"),
                             ctx: Store,
@@ -396,11 +396,11 @@ Module(
                     type_params: None,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 367..374,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 373..374,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap
index 67b56f4617..a330b1ce96 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap
@@ -7,27 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_byte_literal.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..44,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: BytesLiteral(
                         ExprBytesLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..12,
                             value: BytesLiteralValue {
                                 inner: Single(
                                     BytesLiteral {
                                         range: 0..12,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: [],
                                         flags: BytesLiteralFlags {
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -38,17 +39,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..26,
                     value: BytesLiteral(
                         ExprBytesLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..26,
                             value: BytesLiteralValue {
                                 inner: Single(
                                     BytesLiteral {
                                         range: 13..26,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: [],
                                         flags: BytesLiteralFlags {
                                             quote_style: Double,
@@ -56,6 +57,7 @@ Module(
                                                 uppercase_r: false,
                                             },
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -66,22 +68,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..43,
                     value: BytesLiteral(
                         ExprBytesLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..43,
                             value: BytesLiteralValue {
                                 inner: Single(
                                     BytesLiteral {
                                         range: 27..43,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: [],
                                         flags: BytesLiteralFlags {
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap
index 444e3dd979..5834d7311a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_del_target.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..75,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     targets: [
                         BinOp(
                             ExprBinOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..9,
                                 left: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4..5,
                                         id: Name("x"),
                                         ctx: Load,
@@ -30,7 +30,7 @@ Module(
                                 op: Add,
                                 right: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..9,
                                         value: Int(
                                             1,
@@ -44,30 +44,31 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..22,
                     targets: [
                         Dict(
                             ExprDict {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..22,
                                 items: [
                                     DictItem {
                                         key: Some(
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 15..18,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 15..18,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "x",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Single,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -77,7 +78,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..21,
                                                 value: Int(
                                                     1,
@@ -93,28 +94,29 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..37,
                     targets: [
                         Set(
                             ExprSet {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..37,
                                 elts: [
                                     StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 28..31,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 28..31,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "x",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -123,18 +125,19 @@ Module(
                                     ),
                                     StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 33..36,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 33..36,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "y",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -149,32 +152,32 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..74,
                     targets: [
                         NoneLiteral(
                             ExprNoneLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 42..46,
                             },
                         ),
                         BooleanLiteral(
                             ExprBooleanLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 48..52,
                                 value: true,
                             },
                         ),
                         BooleanLiteral(
                             ExprBooleanLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 54..59,
                                 value: false,
                             },
                         ),
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 61..62,
                                 value: Int(
                                     1,
@@ -183,7 +186,7 @@ Module(
                         ),
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 64..67,
                                 value: Float(
                                     1.0,
@@ -192,18 +195,19 @@ Module(
                         ),
                         StringLiteral(
                             ExprStringLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..74,
                                 value: StringLiteralValue {
                                     inner: Single(
                                         StringLiteral {
                                             range: 69..74,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "abc",
                                             flags: StringLiteralFlags {
                                                 quote_style: Double,
                                                 prefix: Empty,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap
index d401ee2d55..0d2f651c21 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_fstring_liter
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..58,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..26,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..26,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 2..25,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "",
                                                     },
                                                 ),
@@ -37,6 +37,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -48,23 +49,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..57,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..57,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 27..57,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 31..54,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "",
                                                     },
                                                 ),
@@ -73,6 +74,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap
new file mode 100644
index 0000000000..0de649a392
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap
@@ -0,0 +1,146 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/invalid_future_feature.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..151,
+        body: [
+            ImportFrom(
+                StmtImportFrom {
+                    node_index: NodeIndex(None),
+                    range: 0..38,
+                    module: Some(
+                        Identifier {
+                            id: Name("__future__"),
+                            range: 5..15,
+                            node_index: NodeIndex(None),
+                        },
+                    ),
+                    names: [
+                        Alias {
+                            range: 23..38,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("invalid_feature"),
+                                range: 23..38,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                    ],
+                    level: 0,
+                },
+            ),
+            ImportFrom(
+                StmtImportFrom {
+                    node_index: NodeIndex(None),
+                    range: 39..90,
+                    module: Some(
+                        Identifier {
+                            id: Name("__future__"),
+                            range: 44..54,
+                            node_index: NodeIndex(None),
+                        },
+                    ),
+                    names: [
+                        Alias {
+                            range: 62..73,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("annotations"),
+                                range: 62..73,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                        Alias {
+                            range: 75..90,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("invalid_feature"),
+                                range: 75..90,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                    ],
+                    level: 0,
+                },
+            ),
+            ImportFrom(
+                StmtImportFrom {
+                    node_index: NodeIndex(None),
+                    range: 91..150,
+                    module: Some(
+                        Identifier {
+                            id: Name("__future__"),
+                            range: 96..106,
+                            node_index: NodeIndex(None),
+                        },
+                    ),
+                    names: [
+                        Alias {
+                            range: 114..131,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("invalid_feature_1"),
+                                range: 114..131,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                        Alias {
+                            range: 133..150,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("invalid_feature_2"),
+                                range: 133..150,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                    ],
+                    level: 0,
+                },
+            ),
+        ],
+    },
+)
+```
+## Semantic Syntax Errors
+
+  |
+1 | from __future__ import invalid_feature
+  |                        ^^^^^^^^^^^^^^^ Syntax Error: Future feature `invalid_feature` is not defined
+2 | from __future__ import annotations, invalid_feature
+3 | from __future__ import invalid_feature_1, invalid_feature_2
+  |
+
+
+  |
+1 | from __future__ import invalid_feature
+2 | from __future__ import annotations, invalid_feature
+  |                                     ^^^^^^^^^^^^^^^ Syntax Error: Future feature `invalid_feature` is not defined
+3 | from __future__ import invalid_feature_1, invalid_feature_2
+  |
+
+
+  |
+1 | from __future__ import invalid_feature
+2 | from __future__ import annotations, invalid_feature
+3 | from __future__ import invalid_feature_1, invalid_feature_2
+  |                        ^^^^^^^^^^^^^^^^^ Syntax Error: Future feature `invalid_feature_1` is not defined
+  |
+
+
+  |
+1 | from __future__ import invalid_feature
+2 | from __future__ import annotations, invalid_feature
+3 | from __future__ import invalid_feature_1, invalid_feature_2
+  |                                           ^^^^^^^^^^^^^^^^^ Syntax Error: Future feature `invalid_feature_2` is not defined
+  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap
index 93f0879fae..72cdf3cf6a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap
@@ -7,27 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_string_litera
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..56,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..25,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..25,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 0..25,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -38,22 +39,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..55,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..55,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 26..55,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap
index 3853b04afd..e92cdb2db1 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/irrefutable_case_patt
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..317,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..61,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..26,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 18..21,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("var"),
                                             range: 18..21,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -44,11 +44,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..26,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 23..26,
                                             },
                                         ),
@@ -58,14 +58,14 @@ Module(
                         },
                         MatchCase {
                             range: 50..61,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 55..56,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 55..56,
                                             value: Int(
                                                 2,
@@ -78,11 +78,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 58..61,
                                             },
                                         ),
@@ -95,11 +95,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 62..102,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..69,
                             id: Name("x"),
                             ctx: Load,
@@ -108,11 +108,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 75..86,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 80..81,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -121,11 +121,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..86,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 83..86,
                                             },
                                         ),
@@ -135,14 +135,14 @@ Module(
                         },
                         MatchCase {
                             range: 91..102,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 96..97,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..97,
                                             value: Int(
                                                 2,
@@ -155,11 +155,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..102,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 99..102,
                                             },
                                         ),
@@ -172,11 +172,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..222,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 131..132,
                             id: Name("x"),
                             ctx: Load,
@@ -185,22 +185,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 138..160,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 143..155,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 143..147,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("var1"),
                                                         range: 143..147,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -210,7 +210,7 @@ Module(
                                         Identifier {
                                             id: Name("var2"),
                                             range: 151..155,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -219,11 +219,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 157..160,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 157..160,
                                             },
                                         ),
@@ -233,14 +233,14 @@ Module(
                         },
                         MatchCase {
                             range: 211..222,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 216..217,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 216..217,
                                             value: Int(
                                                 2,
@@ -253,11 +253,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 219..222,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 219..222,
                                             },
                                         ),
@@ -270,11 +270,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 223..316,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 229..230,
                             id: Name("x"),
                             ctx: Load,
@@ -283,23 +283,23 @@ Module(
                     cases: [
                         MatchCase {
                             range: 236..264,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 241..259,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 241..253,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Attribute(
                                                     ExprAttribute {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 241..253,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 241..245,
                                                                 id: Name("enum"),
                                                                 ctx: Load,
@@ -308,7 +308,7 @@ Module(
                                                         attr: Identifier {
                                                             id: Name("variant"),
                                                             range: 246..253,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         ctx: Load,
                                                     },
@@ -317,14 +317,14 @@ Module(
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 256..259,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("var"),
                                                         range: 256..259,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -336,11 +336,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 261..264,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 261..264,
                                             },
                                         ),
@@ -350,14 +350,14 @@ Module(
                         },
                         MatchCase {
                             range: 305..316,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 310..311,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 310..311,
                                             value: Int(
                                                 2,
@@ -370,11 +370,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 313..316,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 313..316,
                                             },
                                         ),
@@ -427,3 +427,12 @@ Module(
    |                         ^^^ Syntax Error: name capture `var` makes remaining patterns unreachable
 12 |     case 2: ...
    |
+
+
+   |
+ 9 |     case 2: ...
+10 | match x:
+11 |     case enum.variant | var: ...  # or pattern with irrefutable part
+   |          ^^^^^^^^^^^^^^^^^^ Syntax Error: alternative patterns bind different names
+12 |     case 2: ...
+   |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap
index 305adc1eea..cc4ffef040 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/iter_unpack_return_py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..91,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                                 id: Name("rest"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..59,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             4,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             5,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             6,
@@ -65,21 +65,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..90,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 64..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,17 +88,17 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..90,
                                 value: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 76..90,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 76..77,
                                                         value: Int(
                                                             1,
@@ -109,7 +107,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 79..80,
                                                         value: Int(
                                                             2,
@@ -118,7 +116,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 82..83,
                                                         value: Int(
                                                             3,
@@ -127,11 +125,11 @@ Module(
                                                 ),
                                                 Starred(
                                                     ExprStarred {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 85..90,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 86..90,
                                                                 id: Name("rest"),
                                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap
index f3e6ac63aa..09bb355569 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/iter_unpack_yield_py3
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..128,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                                 id: Name("rest"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..59,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             4,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             5,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             6,
@@ -65,21 +65,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..89,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 64..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,21 +88,21 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..89,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..89,
                                         value: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 75..89,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 75..76,
                                                                 value: Int(
                                                                     1,
@@ -113,7 +111,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 78..79,
                                                                 value: Int(
                                                                     2,
@@ -122,7 +120,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 81..82,
                                                                 value: Int(
                                                                     3,
@@ -131,11 +129,11 @@ Module(
                                                         ),
                                                         Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 84..89,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 85..89,
                                                                         id: Name("rest"),
                                                                         ctx: Load,
@@ -159,21 +157,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 90..127,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("h"),
                         range: 94..95,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 95..97,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -184,21 +180,21 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 99..127,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..127,
                                         value: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 105..127,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 105..106,
                                                                 value: Int(
                                                                     1,
@@ -207,17 +203,17 @@ Module(
                                                         ),
                                                         Yield(
                                                             ExprYield {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 109..123,
                                                                 value: Some(
                                                                     Tuple(
                                                                         ExprTuple {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 115..123,
                                                                             elts: [
                                                                                 NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 115..116,
                                                                                         value: Int(
                                                                                             2,
@@ -226,11 +222,11 @@ Module(
                                                                                 ),
                                                                                 Starred(
                                                                                     ExprStarred {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 118..123,
                                                                                         value: Name(
                                                                                             ExprName {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 119..123,
                                                                                                 id: Name("rest"),
                                                                                                 ctx: Load,
@@ -249,7 +245,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 126..127,
                                                                 value: Int(
                                                                     3,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap
index 920e8ab7d7..a438ef9c46 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap
@@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/lambda_body_with_star
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..62,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..12,
                             parameters: Some(
                                 Parameters {
                                     range: 7..8,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 7..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 7..8,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -49,11 +47,11 @@ Module(
                             ),
                             body: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..12,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 11..12,
                                             id: Name("y"),
                                             ctx: Load,
@@ -68,35 +66,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..26,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..26,
                             elts: [
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..25,
                                         parameters: Some(
                                             Parameters {
                                                 range: 20..21,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 20..21,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 20..21,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("x"),
                                                                 range: 20..21,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -110,11 +106,11 @@ Module(
                                         ),
                                         body: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 23..25,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 24..25,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -134,35 +130,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..42,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..42,
                             elts: [
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..39,
                                         parameters: Some(
                                             Parameters {
                                                 range: 34..35,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 34..35,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 34..35,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("x"),
                                                                 range: 34..35,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -176,11 +170,11 @@ Module(
                                         ),
                                         body: Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 37..39,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 38..39,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -193,7 +187,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 41..42,
                                         id: Name("z"),
                                         ctx: Load,
@@ -208,30 +202,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..61,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..61,
                             parameters: Some(
                                 Parameters {
                                     range: 50..51,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 50..51,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 50..51,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 50..51,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -245,17 +237,17 @@ Module(
                             ),
                             body: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..61,
                                     value: BoolOp(
                                         ExprBoolOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 54..61,
                                             op: And,
                                             values: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 54..55,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -263,7 +255,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 60..61,
                                                         id: Name("z"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap
index 1b3cd95472..50eb38666e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap
@@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/lambda_body_with_yiel
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..41,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..17,
                             parameters: Some(
                                 Parameters {
                                     range: 7..8,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 7..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 7..8,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -49,12 +47,12 @@ Module(
                             ),
                             body: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..17,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..17,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -69,30 +67,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..40,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..40,
                             parameters: Some(
                                 Parameters {
                                     range: 25..26,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 25..26,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 25..26,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 25..26,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -106,11 +102,11 @@ Module(
                             ),
                             body: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..40,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..40,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap
index f4cf349ddd..391c87863e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_before_py310.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..79,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..78,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 51..52,
                             value: Int(
                                 2,
@@ -26,14 +26,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 58..78,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 63..64,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 63..64,
                                             value: Int(
                                                 1,
@@ -46,7 +46,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..78,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap
index e4e0b0db63..47f410992c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_classify_as_key
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..33,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..32,
                     subject: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..15,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 12..15,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -33,11 +33,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 21..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 26..27,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -46,11 +46,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 29..32,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap
index 5ce94bf138..4696b90ac2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_classify_as_key
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..39,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..38,
                     subject: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..10,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..10,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 27..38,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 32..33,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -45,11 +45,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 35..38,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 35..38,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap
index 6415f9724a..f352512262 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_expected_colon.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..29,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     subject: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..12,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 7..8,
                                         value: Int(
                                             1,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 10..11,
                                         value: Int(
                                             2,
@@ -44,11 +44,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 17..28,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -57,11 +57,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 25..28,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap
index 273c444e53..60781de936 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_expect_ind
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..23,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..9,
                             id: Name("foo"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 11..22,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 16..17,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -38,11 +38,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..22,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap
index 528b87d4e7..8aaaa11d01 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_expected_c
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..61,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -27,12 +27,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..18,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..14,
                                 id: Name("x"),
                                 ctx: Store,
@@ -41,7 +41,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..18,
                             value: Int(
                                 1,
@@ -52,11 +52,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..32,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 25..26,
                             id: Name("x"),
                             ctx: Load,
@@ -67,11 +67,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..60,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..39,
                             id: Name("y"),
                             ctx: Load,
@@ -80,11 +80,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 49..60,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 54..55,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -93,11 +93,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..60,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 57..60,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap
index 0f5a1d34f4..967dfc2d2e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_invalid_gu
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..100,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..30,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..30,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 18..19,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -43,11 +43,11 @@ Module(
                             guard: Some(
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..25,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 24..25,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -60,11 +60,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..30,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..30,
                                             },
                                         ),
@@ -77,11 +77,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 31..63,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..38,
                             id: Name("x"),
                             ctx: Load,
@@ -90,17 +90,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 44..63,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 49..50,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 49..50,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -108,11 +108,11 @@ Module(
                             guard: Some(
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..57,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 56..57,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -125,11 +125,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 60..63,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 60..63,
                                             },
                                         ),
@@ -142,11 +142,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..99,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..71,
                             id: Name("x"),
                             ctx: Load,
@@ -155,17 +155,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 77..99,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 82..83,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 82..83,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -173,12 +173,12 @@ Module(
                             guard: Some(
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 87..94,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 93..94,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -191,11 +191,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..99,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 96..99,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap
index 13285ab3c4..537bf08d6b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_invalid_su
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..131,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..27,
                     subject: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..9,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 16..27,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -45,11 +45,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..27,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 24..27,
                                             },
                                         ),
@@ -62,26 +62,26 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..99,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..82,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 71..79,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 72..79,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 72..73,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -89,7 +89,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 78..79,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -103,7 +103,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..82,
                                         id: Name("z"),
                                         ctx: Load,
@@ -117,11 +117,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 88..99,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 93..94,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -130,11 +130,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..99,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 96..99,
                                             },
                                         ),
@@ -147,16 +147,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..130,
                     subject: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 106..113,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 112..113,
                                         id: Name("x"),
                                         ctx: Load,
@@ -168,11 +168,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 119..130,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 124..125,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -181,11 +181,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 127..130,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 127..130,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap
index bda3c6e5c3..bf66acae17 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_missing_gu
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..27,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..27,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 18..19,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -44,11 +44,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..27,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 24..27,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap
index 3b604f0505..84fad76972 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_missing_pa
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,14 +25,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..23,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 17..17,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 17..17,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -44,11 +44,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..23,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..23,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap
index f22cb551fc..324f3480ff 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_no_newline
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..23,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..9,
                             id: Name("foo"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 11..22,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 16..17,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -38,11 +38,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..22,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap
index 1bfa4ac064..67fa5c7067 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_single_sta
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..27,
                     subject: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..10,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..10,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 16..27,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -45,11 +45,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..27,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 24..27,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap
index 192d87e0b5..6ac75db9d5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/mixed_bytes_and_non_b
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..64,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..17,
                             value: StringLiteralValue {
                                 inner: Concatenated(
@@ -24,22 +24,24 @@ Module(
                                         strings: [
                                             StringLiteral {
                                                 range: 0..7,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "first",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                             StringLiteral {
                                                 range: 8..17,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ],
@@ -53,11 +55,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..36,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..36,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -65,12 +67,12 @@ Module(
                                         FString(
                                             FString {
                                                 range: 18..26,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 20..25,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "first",
                                                         },
                                                     ),
@@ -79,18 +81,20 @@ Module(
                                                     quote_style: Single,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 27..36,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -103,11 +107,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..63,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..63,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -115,24 +119,25 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 37..44,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "first",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 45..54,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 47..53,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "second",
                                                         },
                                                     ),
@@ -141,18 +146,20 @@ Module(
                                                     quote_style: Single,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 55..63,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap
index c3e7a8341c..3aed113557 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/multiple_assignment_i
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..456,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..444,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             value: Int(
                                 2,
@@ -26,50 +26,50 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 18..27,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 19..20,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 19..20,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 22..23,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("z"),
                                                         range: 22..23,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 25..26,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 25..26,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -81,11 +81,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 29..32,
                                             },
                                         ),
@@ -95,49 +95,49 @@ Module(
                         },
                         MatchCase {
                             range: 54..74,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 59..69,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 60..61,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 60..61,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 63..64,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("z"),
                                                         range: 63..64,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 66..68,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 67..68,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -149,11 +149,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 71..74,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 71..74,
                                             },
                                         ),
@@ -163,50 +163,50 @@ Module(
                         },
                         MatchCase {
                             range: 96..115,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 101..110,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 102..103,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 102..103,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 105..106,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 105..106,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 108..109,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 108..109,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -218,11 +218,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 112..115,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 112..115,
                                             },
                                         ),
@@ -232,15 +232,15 @@ Module(
                         },
                         MatchCase {
                             range: 146..168,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 151..163,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 152..153,
                                                 value: Int(
                                                     1,
@@ -249,7 +249,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 158..159,
                                                 value: Int(
                                                     2,
@@ -260,28 +260,28 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 155..156,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 155..156,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 161..162,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 161..162,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -294,11 +294,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 165..168,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 165..168,
                                             },
                                         ),
@@ -308,15 +308,15 @@ Module(
                         },
                         MatchCase {
                             range: 207..228,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 212..223,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 213..214,
                                                 value: Int(
                                                     1,
@@ -327,14 +327,14 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 216..217,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 216..217,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -344,7 +344,7 @@ Module(
                                         Identifier {
                                             id: Name("x"),
                                             range: 221..222,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -353,11 +353,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 225..228,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 225..228,
                                             },
                                         ),
@@ -367,14 +367,14 @@ Module(
                         },
                         MatchCase {
                             range: 269..290,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 274..285,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 274..279,
                                             id: Name("Class"),
                                             ctx: Load,
@@ -382,32 +382,32 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 279..285,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchAs(
                                                 PatternMatchAs {
+                                                    node_index: NodeIndex(None),
                                                     range: 280..281,
-                                                    node_index: AtomicNodeIndex(..),
                                                     pattern: None,
                                                     name: Some(
                                                         Identifier {
                                                             id: Name("x"),
                                                             range: 280..281,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                     ),
                                                 },
                                             ),
                                             MatchAs(
                                                 PatternMatchAs {
+                                                    node_index: NodeIndex(None),
                                                     range: 283..284,
-                                                    node_index: AtomicNodeIndex(..),
                                                     pattern: None,
                                                     name: Some(
                                                         Identifier {
                                                             id: Name("x"),
                                                             range: 283..284,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                     ),
                                                 },
@@ -421,11 +421,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 287..290,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 287..290,
                                             },
                                         ),
@@ -435,14 +435,14 @@ Module(
                         },
                         MatchCase {
                             range: 320..345,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 325..340,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 325..330,
                                             id: Name("Class"),
                                             ctx: Load,
@@ -450,27 +450,27 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 330..340,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 331..334,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("y"),
                                                     range: 331..332,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchAs(
                                                     PatternMatchAs {
+                                                        node_index: NodeIndex(None),
                                                         range: 333..334,
-                                                        node_index: AtomicNodeIndex(..),
                                                         pattern: None,
                                                         name: Some(
                                                             Identifier {
                                                                 id: Name("x"),
                                                                 range: 333..334,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                         ),
                                                     },
@@ -478,22 +478,22 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 336..339,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("z"),
                                                     range: 336..337,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchAs(
                                                     PatternMatchAs {
+                                                        node_index: NodeIndex(None),
                                                         range: 338..339,
-                                                        node_index: AtomicNodeIndex(..),
                                                         pattern: None,
                                                         name: Some(
                                                             Identifier {
                                                                 id: Name("x"),
                                                                 range: 338..339,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                         ),
                                                     },
@@ -507,11 +507,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 342..345,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 342..345,
                                             },
                                         ),
@@ -521,27 +521,27 @@ Module(
                         },
                         MatchCase {
                             range: 372..412,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 377..407,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 377..380,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 378..379,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: None,
                                                             name: Some(
                                                                 Identifier {
                                                                     id: Name("x"),
                                                                     range: 378..379,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
@@ -551,12 +551,12 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 383..389,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 384..385,
                                                             value: Int(
                                                                 1,
@@ -567,14 +567,14 @@ Module(
                                                 patterns: [
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 387..388,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: None,
                                                             name: Some(
                                                                 Identifier {
                                                                     id: Name("x"),
                                                                     range: 387..388,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
@@ -585,11 +585,11 @@ Module(
                                         ),
                                         MatchClass(
                                             PatternMatchClass {
+                                                node_index: NodeIndex(None),
                                                 range: 392..407,
-                                                node_index: AtomicNodeIndex(..),
                                                 cls: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 392..397,
                                                         id: Name("Class"),
                                                         ctx: Load,
@@ -597,27 +597,27 @@ Module(
                                                 ),
                                                 arguments: PatternArguments {
                                                     range: 397..407,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     patterns: [],
                                                     keywords: [
                                                         PatternKeyword {
                                                             range: 398..401,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("y"),
                                                                 range: 398..399,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchAs(
                                                                 PatternMatchAs {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 400..401,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     pattern: None,
                                                                     name: Some(
                                                                         Identifier {
                                                                             id: Name("x"),
                                                                             range: 400..401,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                     ),
                                                                 },
@@ -625,22 +625,22 @@ Module(
                                                         },
                                                         PatternKeyword {
                                                             range: 403..406,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             attr: Identifier {
                                                                 id: Name("z"),
                                                                 range: 403..404,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             pattern: MatchAs(
                                                                 PatternMatchAs {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 405..406,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     pattern: None,
                                                                     name: Some(
                                                                         Identifier {
                                                                             id: Name("x"),
                                                                             range: 405..406,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                     ),
                                                                 },
@@ -657,11 +657,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 409..412,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 409..412,
                                             },
                                         ),
@@ -671,22 +671,22 @@ Module(
                         },
                         MatchCase {
                             range: 428..444,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 433..439,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 433..434,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 433..434,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -696,7 +696,7 @@ Module(
                                         Identifier {
                                             id: Name("x"),
                                             range: 438..439,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -705,11 +705,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 441..444,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 441..444,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap
index e7bbeb557a..0fb6c83f46 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/multiple_clauses_on_s
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..258,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..41,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -24,7 +24,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -32,11 +32,11 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 14..30,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..24,
                                         value: false,
                                     },
@@ -45,7 +45,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..30,
                                     },
                                 ),
@@ -53,12 +53,12 @@ Module(
                         },
                         ElifElseClause {
                             range: 31..41,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 37..41,
                                     },
                                 ),
@@ -69,11 +69,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..85,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 45..49,
                             value: true,
                         },
@@ -81,7 +81,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 51..55,
                             },
                         ),
@@ -89,11 +89,11 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 57..73,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 62..67,
                                         value: false,
                                     },
@@ -102,7 +102,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..73,
                                     },
                                 ),
@@ -110,12 +110,12 @@ Module(
                         },
                         ElifElseClause {
                             range: 75..85,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..85,
                                     },
                                 ),
@@ -126,12 +126,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..117,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..91,
                             id: Name("x"),
                             ctx: Store,
@@ -139,7 +139,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..99,
                             id: Name("iter"),
                             ctx: Load,
@@ -148,7 +148,7 @@ Module(
                     body: [
                         Break(
                             StmtBreak {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 101..106,
                             },
                         ),
@@ -156,7 +156,7 @@ Module(
                     orelse: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 113..117,
                             },
                         ),
@@ -165,12 +165,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..150,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..123,
                             id: Name("x"),
                             ctx: Store,
@@ -178,7 +178,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 127..131,
                             id: Name("iter"),
                             ctx: Load,
@@ -187,7 +187,7 @@ Module(
                     body: [
                         Break(
                             StmtBreak {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 133..138,
                             },
                         ),
@@ -195,7 +195,7 @@ Module(
                     orelse: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 146..150,
                             },
                         ),
@@ -204,12 +204,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 151..202,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 156..160,
                             },
                         ),
@@ -218,11 +218,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 161..177,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 168..171,
                                             id: Name("exc"),
                                             ctx: Load,
@@ -233,7 +233,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 173..177,
                                         },
                                     ),
@@ -244,7 +244,7 @@ Module(
                     orelse: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 184..188,
                             },
                         ),
@@ -252,7 +252,7 @@ Module(
                     finalbody: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 198..202,
                             },
                         ),
@@ -262,12 +262,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 203..257,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 208..212,
                             },
                         ),
@@ -276,11 +276,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 214..230,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 221..224,
                                             id: Name("exc"),
                                             ctx: Load,
@@ -291,7 +291,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 226..230,
                                         },
                                     ),
@@ -302,7 +302,7 @@ Module(
                     orelse: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 238..242,
                             },
                         ),
@@ -310,7 +310,7 @@ Module(
                     finalbody: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 253..257,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap
new file mode 100644
index 0000000000..01b96d2fc4
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap
@@ -0,0 +1,520 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/multiple_starred_assignment_target.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..112,
+        body: [
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 0..17,
+                    targets: [
+                        Tuple(
+                            ExprTuple {
+                                node_index: NodeIndex(None),
+                                range: 0..8,
+                                elts: [
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 1..3,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 2..3,
+                                                    id: Name("a"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 5..7,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 6..7,
+                                                    id: Name("b"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                                parenthesized: true,
+                            },
+                        ),
+                    ],
+                    value: Tuple(
+                        ExprTuple {
+                            node_index: NodeIndex(None),
+                            range: 11..17,
+                            elts: [
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 12..13,
+                                        value: Int(
+                                            1,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 15..16,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                            parenthesized: true,
+                        },
+                    ),
+                },
+            ),
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 18..35,
+                    targets: [
+                        List(
+                            ExprList {
+                                node_index: NodeIndex(None),
+                                range: 18..26,
+                                elts: [
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 19..21,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 20..21,
+                                                    id: Name("a"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 23..25,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 24..25,
+                                                    id: Name("b"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                            },
+                        ),
+                    ],
+                    value: Tuple(
+                        ExprTuple {
+                            node_index: NodeIndex(None),
+                            range: 29..35,
+                            elts: [
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 30..31,
+                                        value: Int(
+                                            1,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 33..34,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                            parenthesized: true,
+                        },
+                    ),
+                },
+            ),
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 36..59,
+                    targets: [
+                        Tuple(
+                            ExprTuple {
+                                node_index: NodeIndex(None),
+                                range: 36..47,
+                                elts: [
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 37..39,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 38..39,
+                                                    id: Name("a"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 41..43,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 42..43,
+                                                    id: Name("b"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Name(
+                                        ExprName {
+                                            node_index: NodeIndex(None),
+                                            range: 45..46,
+                                            id: Name("c"),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                                parenthesized: true,
+                            },
+                        ),
+                    ],
+                    value: Tuple(
+                        ExprTuple {
+                            node_index: NodeIndex(None),
+                            range: 50..59,
+                            elts: [
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 51..52,
+                                        value: Int(
+                                            1,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 54..55,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 57..58,
+                                        value: Int(
+                                            3,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                            parenthesized: true,
+                        },
+                    ),
+                },
+            ),
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 60..83,
+                    targets: [
+                        List(
+                            ExprList {
+                                node_index: NodeIndex(None),
+                                range: 60..71,
+                                elts: [
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 61..63,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 62..63,
+                                                    id: Name("a"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 65..67,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 66..67,
+                                                    id: Name("b"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Name(
+                                        ExprName {
+                                            node_index: NodeIndex(None),
+                                            range: 69..70,
+                                            id: Name("c"),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                            },
+                        ),
+                    ],
+                    value: Tuple(
+                        ExprTuple {
+                            node_index: NodeIndex(None),
+                            range: 74..83,
+                            elts: [
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 75..76,
+                                        value: Int(
+                                            1,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 78..79,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 81..82,
+                                        value: Int(
+                                            3,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                            parenthesized: true,
+                        },
+                    ),
+                },
+            ),
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 84..111,
+                    targets: [
+                        Tuple(
+                            ExprTuple {
+                                node_index: NodeIndex(None),
+                                range: 84..102,
+                                elts: [
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 85..87,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 86..87,
+                                                    id: Name("a"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 89..91,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 90..91,
+                                                    id: Name("b"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Tuple(
+                                        ExprTuple {
+                                            node_index: NodeIndex(None),
+                                            range: 93..101,
+                                            elts: [
+                                                Starred(
+                                                    ExprStarred {
+                                                        node_index: NodeIndex(None),
+                                                        range: 94..96,
+                                                        value: Name(
+                                                            ExprName {
+                                                                node_index: NodeIndex(None),
+                                                                range: 95..96,
+                                                                id: Name("c"),
+                                                                ctx: Store,
+                                                            },
+                                                        ),
+                                                        ctx: Store,
+                                                    },
+                                                ),
+                                                Starred(
+                                                    ExprStarred {
+                                                        node_index: NodeIndex(None),
+                                                        range: 98..100,
+                                                        value: Name(
+                                                            ExprName {
+                                                                node_index: NodeIndex(None),
+                                                                range: 99..100,
+                                                                id: Name("d"),
+                                                                ctx: Store,
+                                                            },
+                                                        ),
+                                                        ctx: Store,
+                                                    },
+                                                ),
+                                            ],
+                                            ctx: Store,
+                                            parenthesized: true,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                                parenthesized: true,
+                            },
+                        ),
+                    ],
+                    value: Tuple(
+                        ExprTuple {
+                            node_index: NodeIndex(None),
+                            range: 105..111,
+                            elts: [
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 106..107,
+                                        value: Int(
+                                            1,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 109..110,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                            parenthesized: true,
+                        },
+                    ),
+                },
+            ),
+        ],
+    },
+)
+```
+## Semantic Syntax Errors
+
+  |
+1 | (*a, *b) = (1, 2)
+  | ^^^^^^^^ Syntax Error: Two starred expressions in assignment
+2 | [*a, *b] = (1, 2)
+3 | (*a, *b, c) = (1, 2, 3)
+  |
+
+
+  |
+1 | (*a, *b) = (1, 2)
+2 | [*a, *b] = (1, 2)
+  | ^^^^^^^^ Syntax Error: Two starred expressions in assignment
+3 | (*a, *b, c) = (1, 2, 3)
+4 | [*a, *b, c] = (1, 2, 3)
+  |
+
+
+  |
+1 | (*a, *b) = (1, 2)
+2 | [*a, *b] = (1, 2)
+3 | (*a, *b, c) = (1, 2, 3)
+  | ^^^^^^^^^^^ Syntax Error: Two starred expressions in assignment
+4 | [*a, *b, c] = (1, 2, 3)
+5 | (*a, *b, (*c, *d)) = (1, 2)
+  |
+
+
+  |
+2 | [*a, *b] = (1, 2)
+3 | (*a, *b, c) = (1, 2, 3)
+4 | [*a, *b, c] = (1, 2, 3)
+  | ^^^^^^^^^^^ Syntax Error: Two starred expressions in assignment
+5 | (*a, *b, (*c, *d)) = (1, 2)
+  |
+
+
+  |
+3 | (*a, *b, c) = (1, 2, 3)
+4 | [*a, *b, c] = (1, 2, 3)
+5 | (*a, *b, (*c, *d)) = (1, 2)
+  | ^^^^^^^^^^^^^^^^^^ Syntax Error: Two starred expressions in assignment
+  |
+
+
+  |
+3 | (*a, *b, c) = (1, 2, 3)
+4 | [*a, *b, c] = (1, 2, 3)
+5 | (*a, *b, (*c, *d)) = (1, 2)
+  |          ^^^^^^^^ Syntax Error: Two starred expressions in assignment
+  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap
index 0e70f2a74a..d521c935f4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/named_expr_slice.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..119,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 80..92,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 80..92,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 80..83,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,16 +28,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 84..91,
                                     lower: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 84..88,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 84..85,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -45,7 +45,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 87..88,
                                                         value: Int(
                                                             1,
@@ -58,12 +58,12 @@ Module(
                                     upper: Some(
                                         UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 89..91,
                                                 op: USub,
                                                 operand: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 90..91,
                                                         value: Int(
                                                             1,
@@ -83,15 +83,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..100,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..100,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 93..96,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -99,12 +99,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 97..100,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 97..98,
                                                 value: Int(
                                                     1,
@@ -115,7 +115,7 @@ Module(
                                     upper: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 99..100,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -132,11 +132,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 102..103,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 102..103,
                             value: Int(
                                 1,
@@ -147,15 +147,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 105..114,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 105..114,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 105..108,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -163,12 +163,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 109..114,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 109..110,
                                                 value: Int(
                                                     1,
@@ -179,7 +179,7 @@ Module(
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 111..112,
                                                 value: Int(
                                                     3,
@@ -190,7 +190,7 @@ Module(
                                     step: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 113..114,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -206,11 +206,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 116..117,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 116..117,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap
index 044df9bbb7..e282dc0cab 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/named_expr_slice_pars
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..130,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 117..129,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 117..129,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 117..120,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,16 +28,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 121..128,
                                     lower: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 121..125,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 121..122,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -45,7 +45,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 124..125,
                                                         value: Int(
                                                             1,
@@ -58,12 +58,12 @@ Module(
                                     upper: Some(
                                         UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 126..128,
                                                 op: USub,
                                                 operand: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 127..128,
                                                         value: Int(
                                                             1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap
index 9d6245421f..310c7d5336 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nested_async_comprehe
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..467,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..111,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 54..55,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 55..57,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,20 +35,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 59..111,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 66..111,
                                             elt: ListComp(
                                                 ExprListComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 67..92,
                                                     elt: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 68..69,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -59,10 +57,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 70..91,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 80..81,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -70,11 +68,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 85..91,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 85..88,
                                                                             id: Name("foo"),
                                                                             ctx: Load,
@@ -82,11 +80,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 88..91,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 89..90,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -106,10 +104,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 93..110,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 97..98,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -117,11 +115,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 102..110,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 102..107,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -129,11 +127,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 107..110,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 108..109,
                                                                             value: Int(
                                                                                 3,
@@ -159,21 +157,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..192,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 132..133,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 133..135,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -184,20 +180,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 137..192,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 144..192,
                                             elt: DictComp(
                                                 ExprDictComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 145..173,
                                                     key: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 146..147,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -205,7 +201,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 149..150,
                                                             value: Int(
                                                                 1,
@@ -215,10 +211,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 151..172,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 161..162,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -226,11 +222,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 166..172,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 166..169,
                                                                             id: Name("foo"),
                                                                             ctx: Load,
@@ -238,11 +234,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 169..172,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 170..171,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -262,10 +258,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 174..191,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 178..179,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -273,11 +269,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 183..191,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 183..188,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -285,11 +281,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 188..191,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 189..190,
                                                                             value: Int(
                                                                                 3,
@@ -315,21 +311,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 200..267,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("h"),
                         range: 210..211,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 211..213,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -340,20 +334,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 215..267,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 222..267,
                                             elt: SetComp(
                                                 ExprSetComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 223..248,
                                                     elt: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 224..225,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -362,10 +356,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 226..247,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 236..237,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -373,11 +367,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 241..247,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 241..244,
                                                                             id: Name("foo"),
                                                                             ctx: Load,
@@ -385,11 +379,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 244..247,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 245..246,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -409,10 +403,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 249..266,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 253..254,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -420,11 +414,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 258..266,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 258..263,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -432,11 +426,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 263..266,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 264..265,
                                                                             value: Int(
                                                                                 3,
@@ -462,21 +456,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 277..371,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("i"),
                         range: 287..288,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 288..290,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -487,25 +479,25 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 292..371,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 299..371,
                                             elt: Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 300..352,
                                                     elts: [
                                                         ListComp(
                                                             ExprListComp {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 301..328,
                                                                 elt: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 302..303,
                                                                         id: Name("y"),
                                                                         ctx: Load,
@@ -514,10 +506,10 @@ Module(
                                                                 generators: [
                                                                     Comprehension {
                                                                         range: 304..327,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         target: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 314..315,
                                                                                 id: Name("y"),
                                                                                 ctx: Store,
@@ -525,11 +517,11 @@ Module(
                                                                         ),
                                                                         iter: Call(
                                                                             ExprCall {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 319..327,
                                                                                 func: Name(
                                                                                     ExprName {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 319..324,
                                                                                         id: Name("range"),
                                                                                         ctx: Load,
@@ -537,11 +529,11 @@ Module(
                                                                                 ),
                                                                                 arguments: Arguments {
                                                                                     range: 324..327,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     args: [
                                                                                         NumberLiteral(
                                                                                             ExprNumberLiteral {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 325..326,
                                                                                                 value: Int(
                                                                                                     1,
@@ -561,11 +553,11 @@ Module(
                                                         ),
                                                         ListComp(
                                                             ExprListComp {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 330..351,
                                                                 elt: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 331..332,
                                                                         id: Name("z"),
                                                                         ctx: Load,
@@ -574,10 +566,10 @@ Module(
                                                                 generators: [
                                                                     Comprehension {
                                                                         range: 333..350,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         target: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 337..338,
                                                                                 id: Name("z"),
                                                                                 ctx: Store,
@@ -585,11 +577,11 @@ Module(
                                                                         ),
                                                                         iter: Call(
                                                                             ExprCall {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 342..350,
                                                                                 func: Name(
                                                                                     ExprName {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 342..347,
                                                                                         id: Name("range"),
                                                                                         ctx: Load,
@@ -597,11 +589,11 @@ Module(
                                                                                 ),
                                                                                 arguments: Arguments {
                                                                                     range: 347..350,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     args: [
                                                                                         NumberLiteral(
                                                                                             ExprNumberLiteral {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 348..349,
                                                                                                 value: Int(
                                                                                                     2,
@@ -627,10 +619,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 353..370,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 357..358,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -638,11 +630,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 362..370,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 362..367,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -650,11 +642,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 367..370,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 368..369,
                                                                             value: Int(
                                                                                 5,
@@ -680,21 +672,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 372..466,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("j"),
                         range: 382..383,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 383..385,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -705,25 +695,25 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 387..466,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 394..466,
                                             elt: Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 395..447,
                                                     elts: [
                                                         ListComp(
                                                             ExprListComp {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 396..417,
                                                                 elt: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 397..398,
                                                                         id: Name("y"),
                                                                         ctx: Load,
@@ -732,10 +722,10 @@ Module(
                                                                 generators: [
                                                                     Comprehension {
                                                                         range: 399..416,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         target: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 403..404,
                                                                                 id: Name("y"),
                                                                                 ctx: Store,
@@ -743,11 +733,11 @@ Module(
                                                                         ),
                                                                         iter: Call(
                                                                             ExprCall {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 408..416,
                                                                                 func: Name(
                                                                                     ExprName {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 408..413,
                                                                                         id: Name("range"),
                                                                                         ctx: Load,
@@ -755,11 +745,11 @@ Module(
                                                                                 ),
                                                                                 arguments: Arguments {
                                                                                     range: 413..416,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     args: [
                                                                                         NumberLiteral(
                                                                                             ExprNumberLiteral {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 414..415,
                                                                                                 value: Int(
                                                                                                     1,
@@ -779,11 +769,11 @@ Module(
                                                         ),
                                                         ListComp(
                                                             ExprListComp {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 419..446,
                                                                 elt: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 420..421,
                                                                         id: Name("z"),
                                                                         ctx: Load,
@@ -792,10 +782,10 @@ Module(
                                                                 generators: [
                                                                     Comprehension {
                                                                         range: 422..445,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         target: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 432..433,
                                                                                 id: Name("z"),
                                                                                 ctx: Store,
@@ -803,11 +793,11 @@ Module(
                                                                         ),
                                                                         iter: Call(
                                                                             ExprCall {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 437..445,
                                                                                 func: Name(
                                                                                     ExprName {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 437..442,
                                                                                         id: Name("range"),
                                                                                         ctx: Load,
@@ -815,11 +805,11 @@ Module(
                                                                                 ),
                                                                                 arguments: Arguments {
                                                                                     range: 442..445,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     args: [
                                                                                         NumberLiteral(
                                                                                             ExprNumberLiteral {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 443..444,
                                                                                                 value: Int(
                                                                                                     2,
@@ -845,10 +835,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 448..465,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 452..453,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -856,11 +846,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 457..465,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 457..462,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -868,11 +858,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 462..465,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 463..464,
                                                                             value: Int(
                                                                                 5,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap
new file mode 100644
index 0000000000..c39b322387
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap
@@ -0,0 +1,92 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/nested_quote_in_format_spec_py312.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..94,
+        body: [
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 44..53,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 44..53,
+                            value: FStringValue {
+                                inner: Concatenated(
+                                    [
+                                        FString(
+                                            FString {
+                                                range: 44..50,
+                                                node_index: NodeIndex(None),
+                                                elements: [
+                                                    Interpolation(
+                                                        InterpolatedElement {
+                                                            range: 46..49,
+                                                            node_index: NodeIndex(None),
+                                                            expression: NumberLiteral(
+                                                                ExprNumberLiteral {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 47..48,
+                                                                    value: Int(
+                                                                        1,
+                                                                    ),
+                                                                },
+                                                            ),
+                                                            debug_text: None,
+                                                            conversion: None,
+                                                            format_spec: Some(
+                                                                InterpolatedStringFormatSpec {
+                                                                    range: 49..49,
+                                                                    node_index: NodeIndex(None),
+                                                                    elements: [],
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                                flags: FStringFlags {
+                                                    quote_style: Double,
+                                                    prefix: Regular,
+                                                    triple_quoted: false,
+                                                    unclosed: false,
+                                                },
+                                            },
+                                        ),
+                                        Literal(
+                                            StringLiteral {
+                                                range: 50..53,
+                                                node_index: NodeIndex(None),
+                                                value: "}",
+                                                flags: StringLiteralFlags {
+                                                    quote_style: Double,
+                                                    prefix: Empty,
+                                                    triple_quoted: false,
+                                                    unclosed: false,
+                                                },
+                                            },
+                                        ),
+                                    ],
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+        ],
+    },
+)
+```
+## Errors
+
+  |
+1 | # parse_options: {"target-version": "3.12"}
+2 | f"{1:""}"  # this is a ParseError on all versions
+  |      ^ Syntax Error: f-string: expecting '}'
+  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap
index 95c44e302d..c3a8cdca25 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/node_range_with_gaps.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..41,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -39,21 +37,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..32,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("bar"),
                         range: 22..25,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 25..27,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -64,11 +60,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..32,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                     },
                                 ),
@@ -79,21 +75,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..40,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("baz"),
                         range: 37..40,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 40..40,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap
index d49417620b..ecfbbe06d2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap
@@ -7,36 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_declaration_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..25,
         body: [
             Nonlocal(
                 StmtNonlocal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 9..10,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
             ),
             Nonlocal(
                 StmtNonlocal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..24,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 20..21,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                         Identifier {
                             id: Name("y"),
                             range: 23..24,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap
index dde2775dc3..e7c4c552bd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_stmt_empty.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..22,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..21,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("_"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,7 +35,7 @@ Module(
                     body: [
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..21,
                                 names: [],
                             },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap
index 739b49643a..f82316bd46 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_stmt_express
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..28,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..27,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("_"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,29 +35,29 @@ Module(
                     body: [
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..23,
                                 names: [
                                     Identifier {
                                         id: Name("x"),
                                         range: 22..23,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ],
                             },
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..27,
                                 value: UnaryOp(
                                     ExprUnaryOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..27,
                                         op: UAdd,
                                         operand: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..27,
                                                 value: Int(
                                                     1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap
index 10cedaf7ba..d749245b98 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_stmt_trailin
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..59,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..58,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("_"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,38 +35,38 @@ Module(
                     body: [
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..23,
                                 names: [],
                             },
                         ),
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..39,
                                 names: [
                                     Identifier {
                                         id: Name("x"),
                                         range: 37..38,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ],
                             },
                         ),
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..58,
                                 names: [
                                     Identifier {
                                         id: Name("x"),
                                         range: 53..54,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     Identifier {
                                         id: Name("y"),
                                         range: 56..57,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ],
                             },
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap
index f23ebd2f93..16efd0233e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_missing_annotat
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..35,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..11,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..10,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -53,11 +51,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..16,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..16,
                                     },
                                 ),
@@ -68,33 +66,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..34,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 21..24,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 24..29,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 25..27,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 25..27,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 25..26,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -109,11 +105,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..34,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..34,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap
index ee03c9a0a6..fcb763f0a1 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_missing_default
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..41,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..11,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -53,11 +51,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..16,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..16,
                                     },
                                 ),
@@ -68,38 +66,36 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..40,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 21..24,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 24..35,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 25..33,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 25..31,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 25..26,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 28..31,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -118,11 +114,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 37..40,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 37..40,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap
index 779f868a44..149cc7b4ce 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap
@@ -7,47 +7,45 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_invalid_an
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..81,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..18,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..17,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..17,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 8..11,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..17,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 14..17,
                                                         id: Name("int"),
                                                         ctx: Load,
@@ -69,11 +67,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..23,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..23,
                                     },
                                 ),
@@ -84,43 +82,41 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..52,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 28..31,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 31..47,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 32..46,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 32..46,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 32..35,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 37..46,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 43..46,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -142,11 +138,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
@@ -157,38 +153,36 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..80,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 57..60,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 60..75,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 61..67,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 61..67,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 61..64,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 66..67,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -200,14 +194,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 71..74,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 71..74,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("int"),
                                         range: 71..74,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -222,11 +216,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 77..80,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..80,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap
index bec69b1894..fcc9686845 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap
@@ -7,49 +7,47 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_invalid_de
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..68,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..15,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..14,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 10..14,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 11..14,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -69,11 +67,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..20,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..20,
                                     },
                                 ),
@@ -84,44 +82,42 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..43,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 25..28,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 28..38,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 29..37,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 29..30,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 29..30,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..36,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 33..36,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -141,11 +137,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 40..43,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..43,
                                     },
                                 ),
@@ -156,45 +152,43 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..67,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 48..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 51..62,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 52..61,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 52..53,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 52..53,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 54..61,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 60..61,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -214,11 +208,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 64..67,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 64..67,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap
index 9360cfde29..c8ace07b1f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap
@@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_invalid_st
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..150,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..17,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 8..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 9..13,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 15..16,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 16..16,
                                                     id: Name(""),
                                                     ctx: Invalid,
@@ -64,11 +62,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..22,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                     },
                                 ),
@@ -79,44 +77,42 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..57,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 27..30,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 30..52,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 31..51,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 32..36,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..50,
                                             value: Subscript(
                                                 ExprSubscript {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 40..50,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 40..45,
                                                             id: Name("tuple"),
                                                             ctx: Load,
@@ -124,7 +120,7 @@ Module(
                                                     ),
                                                     slice: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 46..49,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -146,11 +142,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 54..57,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..57,
                                     },
                                 ),
@@ -161,46 +157,44 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..90,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 62..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..85,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 66..84,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 67..71,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 73..84,
                                             value: BoolOp(
                                                 ExprBoolOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 74..84,
                                                     op: Or,
                                                     values: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 74..77,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -208,7 +202,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 81..84,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -230,11 +224,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 87..90,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 87..90,
                                     },
                                 ),
@@ -245,45 +239,43 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 91..120,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 95..98,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 98..115,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 99..114,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 100..104,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 106..114,
                                             value: Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 107..114,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 113..114,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -305,11 +297,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 117..120,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 117..120,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap
index 224824a9e7..0add20fe0e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap
@@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_star_annot
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..69,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..68,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 48..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 51..63,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 52..62,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 53..57,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..62,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 60..62,
                                                     id: Name("Ts"),
                                                     ctx: Load,
@@ -64,11 +62,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..68,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 65..68,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap
index 9e0f94fdad..54ade04fb2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_duplicate_name
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..42,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..41,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..36,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -46,21 +44,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 11..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 11..12,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 11..12,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..15,
                                             value: Int(
                                                 10,
@@ -73,11 +71,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 17..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("a"),
                                     range: 18..19,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -85,14 +83,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 21..22,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 21..22,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 21..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -100,19 +98,19 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 24..30,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 24..30,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 24..25,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..30,
                                                 id: Name("str"),
                                                 ctx: Load,
@@ -126,11 +124,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 32..35,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("a"),
                                     range: 34..35,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -140,11 +138,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..41,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..41,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap
index c2fdb7f4d5..b1d8bdaa92 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_expected_after
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..98,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..10,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 12..15,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 12..15,
                                     },
                                 ),
@@ -52,21 +50,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..32,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 20..23,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 23..27,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -77,11 +73,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..32,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                     },
                                 ),
@@ -92,33 +88,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..51,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 37..40,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 40..46,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 41..42,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 41..42,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 41..42,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -133,11 +127,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 48..51,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 48..51,
                                     },
                                 ),
@@ -148,33 +142,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..71,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 56..59,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 59..66,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 60..61,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 60..61,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 60..61,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -189,11 +181,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 68..71,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 68..71,
                                     },
                                 ),
@@ -204,21 +196,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..97,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 76..79,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 79..92,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -226,11 +216,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 83..91,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 85..91,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -240,11 +230,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 94..97,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..97,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap
index 71846f8fc7..324b7246ea 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_kwarg_after_st
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..26,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..25,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..20,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -34,11 +32,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 11..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 13..19,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -48,11 +46,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..25,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..25,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap
index f26f826c50..156a962746 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_kwarg
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..38,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..37,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..32,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -50,11 +48,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 22..31,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs2"),
                                     range: 24..31,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -64,11 +62,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 34..37,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..37,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap
index 5bbcc79890..21a9f28820 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap
@@ -7,37 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_slash
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..19,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -47,14 +45,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 17..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 17..18,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 17..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -69,11 +67,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..24,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..24,
                                     },
                                 ),
@@ -84,32 +82,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..52,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 29..32,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 32..47,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 33..34,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 33..34,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 33..34,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -119,14 +115,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 39..40,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 39..40,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 39..40,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -134,14 +130,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 42..43,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 42..43,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 42..43,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -156,11 +152,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap
index 9e2ccfb2c9..4daa7f27f2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_star_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..19,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -49,14 +47,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 17..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 17..18,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 17..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -69,11 +67,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..24,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..24,
                                     },
                                 ),
@@ -84,33 +82,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..52,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 29..32,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 32..47,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 33..34,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 33..34,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 33..34,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -121,14 +117,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 39..40,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 39..40,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 39..40,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -136,14 +132,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 42..43,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 42..43,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 42..43,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -156,11 +152,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap
index a8a26d73bc..8fb783b1c1 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_varar
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..136,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..23,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -48,11 +46,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 14..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 15..19,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -60,14 +58,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 21..22,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 21..22,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 21..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -80,11 +78,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -95,33 +93,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..97,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 67..70,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 70..92,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 71..72,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 71..72,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 71..72,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -131,11 +127,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 74..80,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args1"),
                                     range: 75..80,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -143,14 +139,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 90..91,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 90..91,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 90..91,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -163,11 +159,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 94..97,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..97,
                                     },
                                 ),
@@ -178,33 +174,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 98..135,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 102..105,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 105..130,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 106..107,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 106..107,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 106..107,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -214,11 +208,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 109..115,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args1"),
                                     range: 110..115,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -226,14 +220,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 117..118,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 117..118,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 117..118,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -241,14 +235,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 120..121,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 120..121,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 120..121,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -261,11 +255,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 132..135,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 132..135,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap
index be7f6b1b35..7444c8148a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_no_arg_before_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..35,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..10,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 12..15,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 12..15,
                                     },
                                 ),
@@ -52,33 +50,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..34,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 20..23,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 23..29,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 27..28,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 27..28,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 27..28,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -93,11 +89,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..34,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..34,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap
index 4e01047ebb..4d23c7dde9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap
@@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_non_default_af
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..30,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..29,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..24,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 10..12,
                                             value: Int(
                                                 10,
@@ -56,14 +54,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 14..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 14..15,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 14..15,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -71,19 +69,19 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 17..23,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 17..23,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 17..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..23,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -102,11 +100,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 26..29,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..29,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap
index c2db1084e7..2015f10090 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap
@@ -7,36 +7,34 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_star_after_sla
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..105,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..14,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 8..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("a"),
                                     range: 9..10,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -48,11 +46,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..19,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 16..19,
                                     },
                                 ),
@@ -63,32 +61,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..48,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 24..27,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 27..43,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 28..29,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 28..29,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 28..29,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -99,11 +95,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 31..36,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 32..36,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -111,14 +107,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 38..39,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 38..39,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 38..39,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -131,11 +127,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 45..48,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 45..48,
                                     },
                                 ),
@@ -146,32 +142,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..73,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 53..56,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 56..68,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 57..58,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 57..58,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 57..58,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -183,14 +177,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 66..67,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 66..67,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 66..67,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -203,11 +197,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 70..73,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 70..73,
                                     },
                                 ),
@@ -218,32 +212,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..104,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 78..81,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 81..99,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 82..83,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 82..83,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 82..83,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -255,14 +247,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 88..89,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 88..89,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 88..89,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -270,14 +262,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 91..92,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 91..92,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 91..92,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -285,14 +277,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 97..98,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 97..98,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 97..98,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -305,11 +297,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 101..104,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 101..104,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap
index aa5149155a..fb13bd6095 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_star_separator
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..61,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..23,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -48,11 +46,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 11..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 12..16,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -60,14 +58,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 21..22,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 21..22,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 21..22,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -80,11 +78,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -95,33 +93,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..60,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 33..36,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 36..55,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 37..38,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 37..38,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 37..38,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -131,11 +127,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 40..45,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 41..45,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -143,14 +139,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 47..48,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 47..48,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 47..48,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -158,14 +154,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 50..51,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 50..51,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 50..51,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -178,11 +174,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 57..60,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..60,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap
index f56f7d96ab..3a8644b3a8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_var_keyword_wi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..43,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..36,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..20,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -50,11 +48,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 11..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 13..19,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -64,29 +62,30 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..36,
                                 value: Dict(
                                     ExprDict {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..36,
                                         items: [
                                             DictItem {
                                                 key: Some(
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 21..24,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 21..24,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "b",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Single,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -96,7 +95,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 26..27,
                                                         value: Int(
                                                             1,
@@ -108,18 +107,19 @@ Module(
                                                 key: Some(
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 29..32,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 29..32,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "c",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Single,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -129,7 +129,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 34..35,
                                                         value: Int(
                                                             2,
@@ -147,11 +147,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 39..42,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..42,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap
index 5ca631e7d1..1e84abfa40 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_var_positional
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..30,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..17,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..9,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -48,11 +46,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 11..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 12..16,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -64,16 +62,16 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..23,
                                 value: Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..23,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 18..19,
                                                     value: Int(
                                                         1,
@@ -82,7 +80,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 21..22,
                                                     value: Int(
                                                         2,
@@ -101,11 +99,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..29,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..29,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap
index ca32f57b18..c9fce5f081 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/parenthesized_context
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..126,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..73,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 49..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..52,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -30,7 +30,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..57,
                                         id: Name("x"),
                                         ctx: Store,
@@ -40,10 +40,10 @@ Module(
                         },
                         WithItem {
                             range: 59..67,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..62,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -52,7 +52,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 66..67,
                                         id: Name("y"),
                                         ctx: Store,
@@ -64,11 +64,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 70..73,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 70..73,
                                     },
                                 ),
@@ -79,16 +79,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..99,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 80..83,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 80..83,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -98,10 +98,10 @@ Module(
                         },
                         WithItem {
                             range: 85..93,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 85..88,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -110,7 +110,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..93,
                                         id: Name("y"),
                                         ctx: Store,
@@ -122,11 +122,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 96..99,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..99,
                                     },
                                 ),
@@ -137,16 +137,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..125,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 106..114,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 106..109,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -155,7 +155,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 113..114,
                                         id: Name("x"),
                                         ctx: Store,
@@ -165,10 +165,10 @@ Module(
                         },
                         WithItem {
                             range: 116..119,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 116..119,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -180,11 +180,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 122..125,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 122..125,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap
index 90fb2c97da..149fba6e35 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/parenthesized_kwarg_p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..77,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..51,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..51,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..44,
                                     id: Name("f"),
                                     ctx: Load,
@@ -28,22 +28,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 44..51,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 45..50,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("a"),
                                                 range: 46..47,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 49..50,
                                                 value: Int(
                                                     1,
@@ -59,15 +59,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..62,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..62,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 52..53,
                                     id: Name("f"),
                                     ctx: Load,
@@ -75,22 +75,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 53..62,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 54..61,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("a"),
                                                 range: 55..56,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 60..61,
                                                 value: Int(
                                                     1,
@@ -106,15 +106,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..76,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..76,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 63..64,
                                     id: Name("f"),
                                     ctx: Load,
@@ -122,22 +122,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 64..76,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 66..75,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("a"),
                                                 range: 68..69,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 74..75,
                                                 value: Int(
                                                     1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap
index 78be042c66..0551f2e991 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap
@@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/err/pep701_f_string_py311
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..549,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..74,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..74,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 44..74,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 46..58,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "Magic wand: ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 58..73,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Subscript(
                                                             ExprSubscript {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 60..71,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 60..63,
                                                                         id: Name("bag"),
                                                                         ctx: Load,
@@ -50,18 +50,19 @@ Module(
                                                                 ),
                                                                 slice: StringLiteral(
                                                                     ExprStringLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 64..70,
                                                                         value: StringLiteralValue {
                                                                             inner: Single(
                                                                                 StringLiteral {
                                                                                     range: 64..70,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: "wand",
                                                                                     flags: StringLiteralFlags {
                                                                                         quote_style: Single,
                                                                                         prefix: Empty,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -81,6 +82,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -92,45 +94,46 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..112,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..112,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 95..112,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 97..111,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Call(
                                                             ExprCall {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 98..110,
                                                                 func: Attribute(
                                                                     ExprAttribute {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 98..107,
                                                                         value: StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 98..102,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 98..102,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "\n",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Single,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -140,18 +143,18 @@ Module(
                                                                         attr: Identifier {
                                                                             id: Name("join"),
                                                                             range: 103..107,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         ctx: Load,
                                                                     },
                                                                 ),
                                                                 arguments: Arguments {
                                                                     range: 107..110,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     args: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 108..109,
                                                                                 id: Name("a"),
                                                                                 ctx: Load,
@@ -172,6 +175,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -183,37 +187,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..220,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..220,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 148..220,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 152..169,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "A complex trick: ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 169..217,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Subscript(
                                                             ExprSubscript {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 175..185,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 175..178,
                                                                         id: Name("bag"),
                                                                         ctx: Load,
@@ -221,18 +225,19 @@ Module(
                                                                 ),
                                                                 slice: StringLiteral(
                                                                     ExprStringLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 179..184,
                                                                         value: StringLiteralValue {
                                                                             inner: Single(
                                                                                 StringLiteral {
                                                                                     range: 179..184,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: "bag",
                                                                                     flags: StringLiteralFlags {
                                                                                         quote_style: Single,
                                                                                         prefix: Empty,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -252,6 +257,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -263,105 +269,105 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 221..254,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 221..254,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 221..254,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 223..253,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 224..252,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 224..252,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 226..251,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: FString(
                                                                                                 ExprFString {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 227..250,
                                                                                                     value: FStringValue {
                                                                                                         inner: Single(
                                                                                                             FString(
                                                                                                                 FString {
                                                                                                                     range: 227..250,
-                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                    node_index: NodeIndex(None),
                                                                                                                     elements: [
                                                                                                                         Interpolation(
                                                                                                                             InterpolatedElement {
                                                                                                                                 range: 229..249,
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 expression: FString(
                                                                                                                                     ExprFString {
-                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                         range: 230..248,
                                                                                                                                         value: FStringValue {
                                                                                                                                             inner: Single(
                                                                                                                                                 FString(
                                                                                                                                                     FString {
                                                                                                                                                         range: 230..248,
-                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                         elements: [
                                                                                                                                                             Interpolation(
                                                                                                                                                                 InterpolatedElement {
                                                                                                                                                                     range: 232..247,
-                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                     expression: FString(
                                                                                                                                                                         ExprFString {
-                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                             range: 233..246,
                                                                                                                                                                             value: FStringValue {
                                                                                                                                                                                 inner: Single(
                                                                                                                                                                                     FString(
                                                                                                                                                                                         FString {
                                                                                                                                                                                             range: 233..246,
-                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                             elements: [
                                                                                                                                                                                                 Interpolation(
                                                                                                                                                                                                     InterpolatedElement {
                                                                                                                                                                                                         range: 235..245,
-                                                                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                                                                         expression: FString(
                                                                                                                                                                                                             ExprFString {
-                                                                                                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                                                                                                 range: 236..244,
                                                                                                                                                                                                                 value: FStringValue {
                                                                                                                                                                                                                     inner: Single(
                                                                                                                                                                                                                         FString(
                                                                                                                                                                                                                             FString {
                                                                                                                                                                                                                                 range: 236..244,
-                                                                                                                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                                                                                                                 elements: [
                                                                                                                                                                                                                                     Interpolation(
                                                                                                                                                                                                                                         InterpolatedElement {
                                                                                                                                                                                                                                             range: 238..243,
-                                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                                             expression: BinOp(
                                                                                                                                                                                                                                                 ExprBinOp {
-                                                                                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                                                                                     range: 239..242,
                                                                                                                                                                                                                                                     left: NumberLiteral(
                                                                                                                                                                                                                                                         ExprNumberLiteral {
-                                                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                                                             range: 239..240,
                                                                                                                                                                                                                                                             value: Int(
                                                                                                                                                                                                                                                                 1,
@@ -371,7 +377,7 @@ Module(
                                                                                                                                                                                                                                                     op: Add,
                                                                                                                                                                                                                                                     right: NumberLiteral(
                                                                                                                                                                                                                                                         ExprNumberLiteral {
-                                                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                                                             range: 241..242,
                                                                                                                                                                                                                                                             value: Int(
                                                                                                                                                                                                                                                                 1,
@@ -390,6 +396,7 @@ Module(
                                                                                                                                                                                                                                     quote_style: Double,
                                                                                                                                                                                                                                     prefix: Regular,
                                                                                                                                                                                                                                     triple_quoted: false,
+                                                                                                                                                                                                                                    unclosed: false,
                                                                                                                                                                                                                                 },
                                                                                                                                                                                                                             },
                                                                                                                                                                                                                         ),
@@ -407,6 +414,7 @@ Module(
                                                                                                                                                                                                 quote_style: Double,
                                                                                                                                                                                                 prefix: Regular,
                                                                                                                                                                                                 triple_quoted: false,
+                                                                                                                                                                                                unclosed: false,
                                                                                                                                                                                             },
                                                                                                                                                                                         },
                                                                                                                                                                                     ),
@@ -424,6 +432,7 @@ Module(
                                                                                                                                                             quote_style: Double,
                                                                                                                                                             prefix: Regular,
                                                                                                                                                             triple_quoted: false,
+                                                                                                                                                            unclosed: false,
                                                                                                                                                         },
                                                                                                                                                     },
                                                                                                                                                 ),
@@ -441,6 +450,7 @@ Module(
                                                                                                                         quote_style: Double,
                                                                                                                         prefix: Regular,
                                                                                                                         triple_quoted: false,
+                                                                                                                        unclosed: false,
                                                                                                                     },
                                                                                                                 },
                                                                                                             ),
@@ -458,6 +468,7 @@ Module(
                                                                                     quote_style: Double,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -475,6 +486,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -486,52 +498,53 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 276..310,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 276..310,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 276..310,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 278..303,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 279..302,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 279..302,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 283..293,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: StringLiteral(
                                                                                                 ExprStringLiteral {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 284..292,
                                                                                                     value: StringLiteralValue {
                                                                                                         inner: Single(
                                                                                                             StringLiteral {
                                                                                                                 range: 284..292,
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 value: "nested",
                                                                                                                 flags: StringLiteralFlags {
                                                                                                                     quote_style: Double,
                                                                                                                     prefix: Empty,
                                                                                                                     triple_quoted: false,
+                                                                                                                    unclosed: false,
                                                                                                                 },
                                                                                                             },
                                                                                                         ),
@@ -546,7 +559,7 @@ Module(
                                                                                     Literal(
                                                                                         InterpolatedStringLiteralElement {
                                                                                             range: 293..299,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: " inner",
                                                                                         },
                                                                                     ),
@@ -555,6 +568,7 @@ Module(
                                                                                     quote_style: Single,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: true,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -570,7 +584,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 303..309,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " outer",
                                                     },
                                                 ),
@@ -579,6 +593,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -590,33 +605,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 336..359,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 336..359,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 336..359,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 338..343,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "test ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 343..353,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 344..345,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -630,7 +645,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 353..358,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " more",
                                                     },
                                                 ),
@@ -639,6 +654,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -650,41 +666,41 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 403..422,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 403..422,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 403..422,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 407..419,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 408..418,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 408..418,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 412..415,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: Name(
                                                                                                 ExprName {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 413..414,
                                                                                                     id: Name("x"),
                                                                                                     ctx: Load,
@@ -700,6 +716,7 @@ Module(
                                                                                     quote_style: Double,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: true,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -717,6 +734,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -728,45 +746,46 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 468..502,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 468..502,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 468..502,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 470..501,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Call(
                                                             ExprCall {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 471..500,
                                                                 func: Attribute(
                                                                     ExprAttribute {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 471..480,
                                                                         value: StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 471..475,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 471..475,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "\n",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Single,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -776,34 +795,35 @@ Module(
                                                                         attr: Identifier {
                                                                             id: Name("join"),
                                                                             range: 476..480,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         ctx: Load,
                                                                     },
                                                                 ),
                                                                 arguments: Arguments {
                                                                     range: 480..500,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     args: [
                                                                         List(
                                                                             ExprList {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 481..499,
                                                                                 elts: [
                                                                                     StringLiteral(
                                                                                         ExprStringLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 482..486,
                                                                                             value: StringLiteralValue {
                                                                                                 inner: Single(
                                                                                                     StringLiteral {
                                                                                                         range: 482..486,
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         value: "\t",
                                                                                                         flags: StringLiteralFlags {
                                                                                                             quote_style: Single,
                                                                                                             prefix: Empty,
                                                                                                             triple_quoted: false,
+                                                                                                            unclosed: false,
                                                                                                         },
                                                                                                     },
                                                                                                 ),
@@ -812,18 +832,19 @@ Module(
                                                                                     ),
                                                                                     StringLiteral(
                                                                                         ExprStringLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 488..492,
                                                                                             value: StringLiteralValue {
                                                                                                 inner: Single(
                                                                                                     StringLiteral {
                                                                                                         range: 488..492,
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         value: "\u{b}",
                                                                                                         flags: StringLiteralFlags {
                                                                                                             quote_style: Single,
                                                                                                             prefix: Empty,
                                                                                                             triple_quoted: false,
+                                                                                                            unclosed: false,
                                                                                                         },
                                                                                                     },
                                                                                                 ),
@@ -832,18 +853,19 @@ Module(
                                                                                     ),
                                                                                     StringLiteral(
                                                                                         ExprStringLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 494..498,
                                                                                             value: StringLiteralValue {
                                                                                                 inner: Single(
                                                                                                     StringLiteral {
                                                                                                         range: 494..498,
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         value: "\r",
                                                                                                         flags: StringLiteralFlags {
                                                                                                             quote_style: Single,
                                                                                                             prefix: Empty,
                                                                                                             triple_quoted: false,
+                                                                                                            unclosed: false,
                                                                                                         },
                                                                                                     },
                                                                                                 ),
@@ -869,6 +891,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap
new file mode 100644
index 0000000000..5699059e91
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap
@@ -0,0 +1,231 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/pep701_nested_interpolation_py311.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..138,
+        body: [
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 92..114,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 92..114,
+                            value: FStringValue {
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 92..114,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 94..113,
+                                                        node_index: NodeIndex(None),
+                                                        expression: NumberLiteral(
+                                                            ExprNumberLiteral {
+                                                                node_index: NodeIndex(None),
+                                                                range: 95..96,
+                                                                value: Int(
+                                                                    1,
+                                                                ),
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: Some(
+                                                            InterpolatedStringFormatSpec {
+                                                                range: 97..112,
+                                                                node_index: NodeIndex(None),
+                                                                elements: [
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 97..104,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: " abcd \"",
+                                                                        },
+                                                                    ),
+                                                                    Interpolation(
+                                                                        InterpolatedElement {
+                                                                            range: 104..110,
+                                                                            node_index: NodeIndex(None),
+                                                                            expression: StringLiteral(
+                                                                                ExprStringLiteral {
+                                                                                    node_index: NodeIndex(None),
+                                                                                    range: 105..109,
+                                                                                    value: StringLiteralValue {
+                                                                                        inner: Single(
+                                                                                            StringLiteral {
+                                                                                                range: 105..109,
+                                                                                                node_index: NodeIndex(None),
+                                                                                                value: "aa",
+                                                                                                flags: StringLiteralFlags {
+                                                                                                    quote_style: Single,
+                                                                                                    prefix: Empty,
+                                                                                                    triple_quoted: false,
+                                                                                                    unclosed: false,
+                                                                                                },
+                                                                                            },
+                                                                                        ),
+                                                                                    },
+                                                                                },
+                                                                            ),
+                                                                            debug_text: None,
+                                                                            conversion: None,
+                                                                            format_spec: None,
+                                                                        },
+                                                                    ),
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 110..112,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: "\" ",
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Single,
+                                                prefix: Regular,
+                                                triple_quoted: false,
+                                                unclosed: false,
+                                            },
+                                        },
+                                    ),
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 115..137,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 115..137,
+                            value: FStringValue {
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 115..137,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 117..136,
+                                                        node_index: NodeIndex(None),
+                                                        expression: NumberLiteral(
+                                                            ExprNumberLiteral {
+                                                                node_index: NodeIndex(None),
+                                                                range: 118..119,
+                                                                value: Int(
+                                                                    1,
+                                                                ),
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: Some(
+                                                            InterpolatedStringFormatSpec {
+                                                                range: 120..135,
+                                                                node_index: NodeIndex(None),
+                                                                elements: [
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 120..127,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: " abcd \"",
+                                                                        },
+                                                                    ),
+                                                                    Interpolation(
+                                                                        InterpolatedElement {
+                                                                            range: 127..133,
+                                                                            node_index: NodeIndex(None),
+                                                                            expression: StringLiteral(
+                                                                                ExprStringLiteral {
+                                                                                    node_index: NodeIndex(None),
+                                                                                    range: 128..132,
+                                                                                    value: StringLiteralValue {
+                                                                                        inner: Single(
+                                                                                            StringLiteral {
+                                                                                                range: 128..132,
+                                                                                                node_index: NodeIndex(None),
+                                                                                                value: "\n",
+                                                                                                flags: StringLiteralFlags {
+                                                                                                    quote_style: Double,
+                                                                                                    prefix: Empty,
+                                                                                                    triple_quoted: false,
+                                                                                                    unclosed: false,
+                                                                                                },
+                                                                                            },
+                                                                                        ),
+                                                                                    },
+                                                                                },
+                                                                            ),
+                                                                            debug_text: None,
+                                                                            conversion: None,
+                                                                            format_spec: None,
+                                                                        },
+                                                                    ),
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 133..135,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: "\" ",
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Single,
+                                                prefix: Regular,
+                                                triple_quoted: false,
+                                                unclosed: false,
+                                            },
+                                        },
+                                    ),
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+        ],
+    },
+)
+```
+## Unsupported Syntax Errors
+
+  |
+1 | # parse_options: {"target-version": "3.11"}
+2 | # nested interpolations also need to be checked
+3 | f'{1: abcd "{'aa'}" }'
+  |              ^ Syntax Error: Cannot reuse outer quote character in f-strings on Python 3.11 (syntax was added in Python 3.12)
+4 | f'{1: abcd "{"\n"}" }'
+  |
+
+
+  |
+2 | # nested interpolations also need to be checked
+3 | f'{1: abcd "{'aa'}" }'
+4 | f'{1: abcd "{"\n"}" }'
+  |               ^ Syntax Error: Cannot use an escape sequence (backslash) in f-strings on Python 3.11 (syntax was added in Python 3.12)
+  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap
index 6e1bdfaf6e..f6650bb5d9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap
@@ -7,37 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/err/pos_only_py37.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..136,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..61,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 47..50,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 50..56,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 51..52,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 51..52,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 51..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -53,11 +51,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..61,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                     },
                                 ),
@@ -68,32 +66,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 62..86,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 66..69,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 69..81,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 70..71,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 70..71,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 70..71,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -103,14 +99,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 76..77,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 76..77,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 76..77,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -125,11 +121,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 83..86,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..86,
                                     },
                                 ),
@@ -140,32 +136,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..115,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 91..94,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 94..110,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 95..96,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 95..96,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 95..96,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -176,11 +170,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 98..103,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 99..103,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -188,14 +182,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 108..109,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 108..109,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 108..109,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -208,11 +202,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 112..115,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 112..115,
                                     },
                                 ),
@@ -223,33 +217,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 116..135,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 120..123,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 123..130,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 124..125,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 124..125,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 124..125,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -264,11 +256,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 132..135,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 132..135,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap
index d6a06bfe2f..4e9bad06a4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap
@@ -7,18 +7,18 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_from_witho
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..31,
         body: [
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     exc: None,
                     cause: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 11..14,
                                 id: Name("exc"),
                                 ctx: Load,
@@ -29,13 +29,13 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..30,
                     exc: None,
                     cause: Some(
                         NoneLiteral(
                             ExprNoneLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 26..30,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap
index 969eb0b526..c9559c557f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_invalid_ca
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..7,
                                 id: Name("x"),
                                 ctx: Load,
@@ -27,11 +27,11 @@ Module(
                     cause: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..15,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..15,
                                         id: Name("y"),
                                         ctx: Load,
@@ -45,12 +45,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..36,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..23,
                                 id: Name("x"),
                                 ctx: Load,
@@ -60,12 +60,12 @@ Module(
                     cause: Some(
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..36,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             id: Name("y"),
                                             ctx: Load,
@@ -79,12 +79,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..51,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..44,
                                 id: Name("x"),
                                 ctx: Load,
@@ -94,7 +94,7 @@ Module(
                     cause: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 50..51,
                                 id: Name("y"),
                                 ctx: Load,
@@ -105,11 +105,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..56,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 55..56,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap
index fc1d86ea86..6886f22bad 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_invalid_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..36,
         body: [
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     exc: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..8,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 7..8,
                                         id: Name("x"),
                                         ctx: Load,
@@ -36,17 +36,17 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..22,
                     exc: Some(
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 15..22,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 21..22,
                                             id: Name("x"),
                                             ctx: Load,
@@ -61,12 +61,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..30,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..30,
                                 id: Name("x"),
                                 ctx: Load,
@@ -78,11 +78,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..35,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..35,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap
index d25483b1bc..40dc442afd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_unparenthe
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..34,
         body: [
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..7,
                                 id: Name("x"),
                                 ctx: Load,
@@ -27,12 +27,12 @@ Module(
                     cause: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..15,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..14,
                                             id: Name("y"),
                                             ctx: Load,
@@ -48,12 +48,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..33,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..23,
                                 id: Name("x"),
                                 ctx: Load,
@@ -63,12 +63,12 @@ Module(
                     cause: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..33,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..30,
                                             id: Name("y"),
                                             ctx: Load,
@@ -76,7 +76,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..33,
                                             id: Name("z"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap
index 36f4db810c..34510782dc 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_unparenthe
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..38,
         body: [
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     exc: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..8,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 6..7,
                                             id: Name("x"),
                                             ctx: Load,
@@ -39,17 +39,17 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..19,
                     exc: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 15..19,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 15..16,
                                             id: Name("x"),
                                             ctx: Load,
@@ -57,7 +57,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 18..19,
                                             id: Name("y"),
                                             ctx: Load,
@@ -74,17 +74,17 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..37,
                     exc: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 26..30,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 26..27,
                                             id: Name("x"),
                                             ctx: Load,
@@ -92,7 +92,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..30,
                                             id: Name("y"),
                                             ctx: Load,
@@ -107,7 +107,7 @@ Module(
                     cause: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 36..37,
                                 id: Name("z"),
                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap
index aec52e3b45..45a5b27c78 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lex_logical_token.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..979,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 48..59,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 51..59,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..55,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 55..59,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 56..59,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -49,21 +49,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..79,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("bar"),
                         range: 64..67,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 67..69,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -74,7 +72,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 75..79,
                             },
                         ),
@@ -83,15 +81,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 113..152,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 116..124,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 116..120,
                                     id: Name("call"),
                                     ctx: Load,
@@ -99,11 +97,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 120..124,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 121..124,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -117,21 +115,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 129..152,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 133..136,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 136..138,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -142,7 +138,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 148..152,
                                         },
                                     ),
@@ -155,15 +151,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 228..269,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 231..239,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 231..235,
                                     id: Name("call"),
                                     ctx: Load,
@@ -171,11 +167,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 235..239,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 236..239,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -189,21 +185,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 246..269,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 250..253,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 253..255,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -214,7 +208,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 265..269,
                                         },
                                     ),
@@ -227,15 +221,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 344..392,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 347..355,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 347..351,
                                     id: Name("call"),
                                     ctx: Load,
@@ -243,11 +237,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 351..355,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 352..355,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -261,21 +255,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 369..392,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 373..376,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 376..378,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -286,7 +278,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 388..392,
                                         },
                                     ),
@@ -299,15 +291,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 453..499,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 456..472,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 456..460,
                                     id: Name("call"),
                                     ctx: Load,
@@ -315,11 +307,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 460..472,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 461..464,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -327,12 +319,12 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 466..471,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 467..468,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -340,7 +332,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 470..471,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -358,21 +350,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 476..499,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 480..483,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 483..485,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -383,7 +373,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 495..499,
                                         },
                                     ),
@@ -396,15 +386,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 564..611,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 567..583,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 567..571,
                                     id: Name("call"),
                                     ctx: Load,
@@ -412,11 +402,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 571..583,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 572..575,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -424,12 +414,12 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 577..582,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 578..579,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -437,7 +427,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 581..582,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -455,21 +445,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 588..611,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 592..595,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 595..597,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -480,7 +468,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 607..611,
                                         },
                                     ),
@@ -493,15 +481,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 772..824,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 775..796,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 775..779,
                                     id: Name("call"),
                                     ctx: Load,
@@ -509,11 +497,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 779..796,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 780..783,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -521,12 +509,12 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 785..794,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 786..787,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -534,7 +522,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 793..794,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -552,21 +540,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 801..824,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 805..808,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 808..810,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -577,7 +563,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 820..824,
                                         },
                                     ),
@@ -590,49 +576,49 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 887..933,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
-                            range: 890..905,
+                            node_index: NodeIndex(None),
+                            range: 890..906,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 890..894,
                                     id: Name("call"),
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
-                                range: 894..905,
-                                node_index: AtomicNodeIndex(..),
+                                range: 894..906,
+                                node_index: NodeIndex(None),
                                 args: [
                                     FString(
                                         ExprFString {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 895..905,
                                             value: FStringValue {
                                                 inner: Single(
                                                     FString(
                                                         FString {
                                                             range: 895..905,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 897..903,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "hello ",
                                                                     },
                                                                 ),
                                                                 Interpolation(
                                                                     InterpolatedElement {
                                                                         range: 903..905,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         expression: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 904..905,
                                                                                 id: Name("x"),
                                                                                 ctx: Load,
@@ -648,6 +634,7 @@ Module(
                                                                 quote_style: Double,
                                                                 prefix: Regular,
                                                                 triple_quoted: false,
+                                                                unclosed: true,
                                                             },
                                                         },
                                                     ),
@@ -663,21 +650,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 910..933,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 914..917,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 917..919,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -688,7 +673,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 929..933,
                                         },
                                     ),
@@ -701,15 +686,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 936..956,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 939..956,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 939..943,
                                     id: Name("call"),
                                     ctx: Load,
@@ -717,23 +702,32 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 943..956,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     FString(
                                         ExprFString {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 944..951,
                                             value: FStringValue {
                                                 inner: Single(
                                                     FString(
                                                         FString {
                                                             range: 944..951,
-                                                            node_index: AtomicNodeIndex(..),
-                                                            elements: [],
+                                                            node_index: NodeIndex(None),
+                                                            elements: [
+                                                                Literal(
+                                                                    InterpolatedStringLiteralElement {
+                                                                        range: 946..951,
+                                                                        node_index: NodeIndex(None),
+                                                                        value: "hello",
+                                                                    },
+                                                                ),
+                                                            ],
                                                             flags: FStringFlags {
                                                                 quote_style: Double,
                                                                 prefix: Regular,
                                                                 triple_quoted: false,
+                                                                unclosed: true,
                                                             },
                                                         },
                                                     ),
@@ -752,21 +746,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 956..979,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("bar"),
                         range: 960..963,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 963..965,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -777,7 +769,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 975..979,
                             },
                         ),
@@ -906,7 +898,7 @@ Module(
    |
 49 | # F-strings uses normal list parsing, so test those as well
 50 | if call(f"hello {x
-   |                   ^ Syntax Error: Expected FStringEnd, found Unknown
+   |                   ^ Syntax Error: Expected FStringEnd, found NonLogicalNewline
 51 |     def bar():
 52 |         pass
    |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap
index 065645a7ac..d9082066b8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lex_logical_token_mac
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..46,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..46,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..19,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3..7,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 7..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..11,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -40,12 +40,12 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..18,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 14..15,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -53,7 +53,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 17..18,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -71,21 +71,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..46,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 27..30,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 30..32,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -96,7 +94,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 42..46,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap
index 37943705bb..c3b23f4fbd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lex_logical_token_win
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..50,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..48,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..20,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3..7,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 7..20,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..11,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -40,12 +40,12 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..18,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 14..15,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -53,7 +53,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 17..18,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -71,21 +71,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..48,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("bar"),
                                     range: 28..31,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 31..33,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -96,7 +94,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 44..48,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap
index 4cb5587c2a..1e2ad65fcf 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap
@@ -7,49 +7,50 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/fstring_format
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..298,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 162..192,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 162..192,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 162..192,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 164..171,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "middle ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 171..191,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 172..180,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 172..180,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "string",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Single,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -61,12 +62,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 181..191,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 181..191,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "        ",
                                                                         },
                                                                     ),
@@ -80,6 +81,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -91,11 +93,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 192..198,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 192..198,
                             id: Name("format"),
                             ctx: Load,
@@ -105,11 +107,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 199..203,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 199..203,
                             id: Name("spec"),
                             ctx: Load,
@@ -119,44 +121,72 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
+                    range: 203..205,
+                    value: StringLiteral(
+                        ExprStringLiteral {
+                            node_index: NodeIndex(None),
+                            range: 203..205,
+                            value: StringLiteralValue {
+                                inner: Single(
+                                    StringLiteral {
+                                        range: 203..205,
+                                        node_index: NodeIndex(None),
+                                        value: "}",
+                                        flags: StringLiteralFlags {
+                                            quote_style: Single,
+                                            prefix: Empty,
+                                            triple_quoted: false,
+                                            unclosed: true,
+                                        },
+                                    },
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
                     range: 207..228,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 207..228,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 207..228,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 209..216,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "middle ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 216..228,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 217..225,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 217..225,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "string",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Single,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -168,8 +198,16 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 226..228,
-                                                                node_index: AtomicNodeIndex(..),
-                                                                elements: [],
+                                                                node_index: NodeIndex(None),
+                                                                elements: [
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 226..228,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: "\\",
+                                                                        },
+                                                                    ),
+                                                                ],
                                                             },
                                                         ),
                                                     },
@@ -179,6 +217,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: true,
                                             },
                                         },
                                     ),
@@ -190,22 +229,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 237..250,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 237..250,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 237..250,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "format spec",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -216,44 +256,45 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 253..285,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 253..285,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 253..285,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 255..262,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "middle ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 262..284,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 263..271,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 263..271,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "string",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Single,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -265,12 +306,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 272..284,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 272..284,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "\\        ",
                                                                         },
                                                                     ),
@@ -284,6 +325,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -295,11 +337,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 285..291,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 285..291,
                             id: Name("format"),
                             ctx: Load,
@@ -309,11 +351,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 292..296,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 292..296,
                             id: Name("spec"),
                             ctx: Load,
@@ -321,6 +363,33 @@ Module(
                     ),
                 },
             ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 296..298,
+                    value: StringLiteral(
+                        ExprStringLiteral {
+                            node_index: NodeIndex(None),
+                            range: 296..298,
+                            value: StringLiteralValue {
+                                inner: Single(
+                                    StringLiteral {
+                                        range: 296..298,
+                                        node_index: NodeIndex(None),
+                                        value: "}",
+                                        flags: StringLiteralFlags {
+                                            quote_style: Single,
+                                            prefix: Empty,
+                                            triple_quoted: false,
+                                            unclosed: true,
+                                        },
+                                    },
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
         ],
     },
 )
@@ -363,16 +432,6 @@ Module(
   |
 
 
-  |
-5 | f'middle {'string':\
-6 |         'format spec'}
-  |                       ^ Syntax Error: Expected a statement
-7 |
-8 | f'middle {'string':\\
-9 |         'format spec'}
-  |
-
-
   |
 6 |         'format spec'}
 7 |
@@ -454,12 +513,5 @@ Module(
    |
 11 | f'middle {'string':\\\
 12 |         'format spec'}
-   |                     ^^ Syntax Error: Got unexpected string
-   |
-
-
-   |
-11 | f'middle {'string':\\\
-12 |         'format spec'}
-   |                       ^ Syntax Error: Expected a statement
+   |                     ^^ Syntax Error: missing closing quote in string literal
    |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap
index ae9e105919..54c66a5216 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/line_continuat
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..36,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..13,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("a"),
                                             ctx: Load,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..9,
                                             id: Name("b"),
                                             ctx: Load,
@@ -55,21 +55,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..35,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("bar"),
                         range: 20..23,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 23..25,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -80,7 +78,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..35,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap
index 97fbdf8b65..f1ae6a18c9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/line_continuat
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..46,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..4,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 4..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("a"),
                                             ctx: Load,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 8..9,
                                             id: Name("b"),
                                             ctx: Load,
@@ -55,21 +55,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..46,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("bar"),
                         range: 30..33,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 33..35,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -80,7 +78,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 42..46,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap
index 4aa6298cab..1a9af6dacc 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/triple_quoted_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..198,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 166..178,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 166..178,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 166..178,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 170..176,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 176..178,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 177..178,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -54,6 +54,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: true,
                                             },
                                         },
                                     ),
@@ -92,7 +93,7 @@ Module(
 5 |   f"""hello {x # comment    
   |  ___________________________^
 6 | | y = 1
-  | |_____^ Syntax Error: Expected FStringEnd, found Unknown
+  | |_____^ Syntax Error: Expected FStringEnd, found FStringMiddle
   |
 
 
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap
index 6a553051a5..50bb114c7e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/triple_quoted_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..183,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 167..183,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 167..183,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 167..183,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 171..180,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 172..175,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -42,12 +42,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 176..180,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 176..180,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f\n",
                                                                         },
                                                                     ),
@@ -61,6 +61,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap
index 2db1a776b1..174ebceee4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/triple_quoted_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..262,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 231..262,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 234..253,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 234..238,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,26 +28,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 238..253,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     FString(
                                         ExprFString {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 239..253,
                                             value: FStringValue {
                                                 inner: Single(
                                                     FString(
                                                         FString {
                                                             range: 239..253,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Interpolation(
                                                                     InterpolatedElement {
                                                                         range: 243..250,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         expression: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 244..245,
                                                                                 id: Name("x"),
                                                                                 ctx: Load,
@@ -58,12 +58,12 @@ Module(
                                                                         format_spec: Some(
                                                                             InterpolatedStringFormatSpec {
                                                                                 range: 246..250,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Literal(
                                                                                         InterpolatedStringLiteralElement {
                                                                                             range: 246..250,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: ".3f\n",
                                                                                         },
                                                                                     ),
@@ -77,6 +77,7 @@ Module(
                                                                 quote_style: Single,
                                                                 prefix: Regular,
                                                                 triple_quoted: true,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -92,7 +93,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 258..262,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap
index e14ea1a654..589ef950bf 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/rebound_comprehension
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..342,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..28,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2..8,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2..3,
                                             id: Name("a"),
                                             ctx: Store,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             value: Int(
                                                 0,
@@ -44,10 +44,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 10..27,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 14..15,
                                             id: Name("a"),
                                             ctx: Store,
@@ -55,11 +55,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 19..27,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 19..24,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -67,11 +67,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 24..27,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 25..26,
                                                             value: Int(
                                                                 0,
@@ -93,19 +93,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..57,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..57,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 31..37,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 31..32,
                                             id: Name("a"),
                                             ctx: Store,
@@ -113,7 +113,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..37,
                                             value: Int(
                                                 0,
@@ -125,10 +125,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 39..56,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 43..44,
                                             id: Name("a"),
                                             ctx: Store,
@@ -136,11 +136,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 48..56,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 48..53,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -148,11 +148,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 53..56,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 54..55,
                                                             value: Int(
                                                                 0,
@@ -174,19 +174,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..91,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..91,
                             key: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..66,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 60..61,
                                             id: Name("a"),
                                             ctx: Store,
@@ -194,7 +194,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..66,
                                             value: Int(
                                                 0,
@@ -205,7 +205,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 69..72,
                                     id: Name("val"),
                                     ctx: Load,
@@ -214,10 +214,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 73..90,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 77..78,
                                             id: Name("a"),
                                             ctx: Store,
@@ -225,11 +225,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..90,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 82..87,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -237,11 +237,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 87..90,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 88..89,
                                                             value: Int(
                                                                 0,
@@ -263,15 +263,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..125,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..125,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 93..96,
                                     id: Name("key"),
                                     ctx: Load,
@@ -279,11 +279,11 @@ Module(
                             ),
                             value: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 99..105,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 99..100,
                                             id: Name("a"),
                                             ctx: Store,
@@ -291,7 +291,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 104..105,
                                             value: Int(
                                                 0,
@@ -303,10 +303,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 107..124,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 111..112,
                                             id: Name("a"),
                                             ctx: Store,
@@ -314,11 +314,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 116..124,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 116..121,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -326,11 +326,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 121..124,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 122..123,
                                                             value: Int(
                                                                 0,
@@ -352,19 +352,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 126..154,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 126..154,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 128..134,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 128..129,
                                             id: Name("a"),
                                             ctx: Store,
@@ -372,7 +372,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 133..134,
                                             value: Int(
                                                 0,
@@ -384,10 +384,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 136..153,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 140..141,
                                             id: Name("a"),
                                             ctx: Store,
@@ -395,11 +395,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 145..153,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 145..150,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -407,11 +407,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 150..153,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 151..152,
                                                             value: Int(
                                                                 0,
@@ -434,24 +434,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..185,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..185,
                             elt: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 156..166,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 158..164,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 158..159,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -459,7 +459,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 163..164,
                                                         value: Int(
                                                             0,
@@ -475,10 +475,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 167..184,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 171..172,
                                             id: Name("a"),
                                             ctx: Store,
@@ -486,11 +486,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 176..184,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 176..181,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -498,11 +498,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 181..184,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 182..183,
                                                             value: Int(
                                                                 0,
@@ -524,19 +524,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 186..233,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 186..233,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 188..194,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 188..189,
                                             id: Name("a"),
                                             ctx: Store,
@@ -544,7 +544,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 193..194,
                                             value: Int(
                                                 0,
@@ -556,10 +556,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 196..214,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 200..201,
                                             id: Name("b"),
                                             ctx: Store,
@@ -567,11 +567,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 205..214,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 205..210,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -579,11 +579,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 211..214,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 212..213,
                                                             value: Int(
                                                                 0,
@@ -600,10 +600,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 215..232,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 219..220,
                                             id: Name("a"),
                                             ctx: Store,
@@ -611,11 +611,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 224..232,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 224..229,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -623,11 +623,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 229..232,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 230..231,
                                                             value: Int(
                                                                 0,
@@ -649,19 +649,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 234..281,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 234..281,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 236..242,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 236..237,
                                             id: Name("a"),
                                             ctx: Store,
@@ -669,7 +669,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 241..242,
                                             value: Int(
                                                 0,
@@ -681,10 +681,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 244..262,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 248..249,
                                             id: Name("a"),
                                             ctx: Store,
@@ -692,11 +692,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 253..262,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 253..258,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -704,11 +704,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 259..262,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 260..261,
                                                             value: Int(
                                                                 0,
@@ -725,10 +725,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 263..280,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 267..268,
                                             id: Name("b"),
                                             ctx: Store,
@@ -736,11 +736,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 272..280,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 272..277,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -748,11 +748,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 277..280,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 278..279,
                                                             value: Int(
                                                                 0,
@@ -774,24 +774,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 282..341,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 282..341,
                             elt: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 283..303,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 285..291,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 285..286,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -799,7 +799,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 290..291,
                                                         value: Int(
                                                             0,
@@ -810,11 +810,11 @@ Module(
                                         ),
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 295..301,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 295..296,
                                                         id: Name("b"),
                                                         ctx: Store,
@@ -822,7 +822,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 300..301,
                                                         value: Int(
                                                             1,
@@ -839,10 +839,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 304..322,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 308..309,
                                             id: Name("a"),
                                             ctx: Store,
@@ -850,11 +850,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 313..322,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 313..318,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -862,11 +862,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 319..322,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 320..321,
                                                             value: Int(
                                                                 0,
@@ -883,10 +883,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 323..340,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 327..328,
                                             id: Name("b"),
                                             ctx: Store,
@@ -894,11 +894,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 332..340,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 332..337,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -906,11 +906,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 337..340,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 338..339,
                                                             value: Int(
                                                                 0,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap
index b93edc683b..c6e921af83 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/return_stmt_invalid_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..74,
         body: [
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     value: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 7..8,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..8,
                                         id: Name(""),
                                         ctx: Invalid,
@@ -35,17 +35,17 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..23,
                     value: Some(
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..23,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..23,
                                             id: Name("x"),
                                             ctx: Load,
@@ -59,16 +59,16 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..43,
                     value: Some(
                         YieldFrom(
                             ExprYieldFrom {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..43,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 42..43,
                                         id: Name("x"),
                                         ctx: Load,
@@ -81,12 +81,12 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..52,
                     value: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 51..52,
                                 id: Name("x"),
                                 ctx: Load,
@@ -97,11 +97,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 56..57,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..57,
                             value: Int(
                                 1,
@@ -112,22 +112,22 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..73,
                     value: Some(
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..73,
                                 value: BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 66..73,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 66..67,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -135,7 +135,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 72..73,
                                                     id: Name("y"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap
index 208ce1f1b0..fe0e953b68 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_and_compound_s
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..17,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..1,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("a"),
                             ctx: Load,
@@ -26,11 +26,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3..16,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("b"),
                             ctx: Load,
@@ -39,17 +39,17 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 15..16,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..16,
                                         id: Name("b"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap
index 5c6e1ab082..9364793f00 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_and_compound_s
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..59,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -24,7 +24,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -34,11 +34,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..28,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..22,
                             value: false,
                         },
@@ -46,7 +46,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..28,
                             },
                         ),
@@ -56,11 +56,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..42,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..36,
                             value: true,
                         },
@@ -68,7 +68,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..42,
                             },
                         ),
@@ -78,11 +78,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..58,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..52,
                             value: false,
                         },
@@ -90,7 +90,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 54..58,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap
index 3e2eb8febc..2fdd57a51a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_stmts_on_same_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..1,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("a"),
                             ctx: Load,
@@ -26,11 +26,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2..3,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2..3,
                             id: Name("b"),
                             ctx: Load,
@@ -40,15 +40,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..9,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..9,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("a"),
                                     ctx: Load,
@@ -57,7 +57,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     id: Name("b"),
                                     ctx: Load,
@@ -69,15 +69,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..15,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..15,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     id: Name("c"),
                                     ctx: Load,
@@ -86,7 +86,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 14..15,
                                     id: Name("d"),
                                     ctx: Load,
@@ -98,31 +98,31 @@ Module(
             ),
             Break(
                 StmtBreak {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..21,
                 },
             ),
             Continue(
                 StmtContinue {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..31,
                 },
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..36,
                 },
             ),
             Continue(
                 StmtContinue {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..46,
                 },
             ),
             Break(
                 StmtBreak {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..52,
                 },
             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap
index 0e424616ad..99af157a8e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_stmts_on_same_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..46,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..45,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -24,31 +24,31 @@ Module(
                     body: [
                         Break(
                             StmtBreak {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..14,
                             },
                         ),
                         Continue(
                             StmtContinue {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..24,
                             },
                         ),
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..29,
                             },
                         ),
                         Continue(
                             StmtContinue {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..39,
                             },
                         ),
                         Break(
                             StmtBreak {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 40..45,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap
index 75ce9e0320..ad76a4b9a2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_star_for.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..35,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             id: Name("_"),
                             ctx: Store,
@@ -25,11 +25,11 @@ Module(
                     ),
                     iter: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..11,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     id: Name("x"),
                                     ctx: Load,
@@ -41,11 +41,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..16,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..16,
                                     },
                                 ),
@@ -57,16 +57,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..34,
                     is_async: false,
                     target: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..23,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
                                     id: Name("x"),
                                     ctx: Store,
@@ -77,7 +77,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..29,
                             id: Name("xs"),
                             ctx: Load,
@@ -86,11 +86,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..34,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..34,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap
index 8c08d4f66c..c9515b946e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_star_return.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..19,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,16 +35,16 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..18,
                                 value: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..18,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 17..18,
                                                     id: Name("x"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap
index 273bb6dd53..e4eaafb75c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_star_yield.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..18,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,20 +35,20 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..17,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..17,
                                         value: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 15..17,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 16..17,
                                                             id: Name("x"),
                                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap
index fd275c3a2e..c619b3d415 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_starred_assign
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     targets: [
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..2,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1..2,
                                         id: Name("a"),
                                         ctx: Store,
@@ -33,12 +33,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..9,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 6..7,
                                         value: Int(
                                             1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap
index 2f547ff272..23e829c384 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/star_index_py310.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..293,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..55,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..55,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..47,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,16 +28,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..54,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 48..54,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 49..54,
                                                         id: Name("index"),
                                                         ctx: Load,
@@ -58,27 +58,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..112,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Array"),
                         range: 78..83,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 83..107,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Subscript(
                                     ExprSubscript {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..106,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 84..91,
                                                 id: Name("Generic"),
                                                 ctx: Load,
@@ -86,12 +86,12 @@ Module(
                                         ),
                                         slice: Tuple(
                                             ExprTuple {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 92..105,
                                                 elts: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 92..97,
                                                             id: Name("DType"),
                                                             ctx: Load,
@@ -99,11 +99,11 @@ Module(
                                                     ),
                                                     Starred(
                                                         ExprStarred {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 99..105,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 100..105,
                                                                     id: Name("Shape"),
                                                                     ctx: Load,
@@ -127,11 +127,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 109..112,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..112,
                                     },
                                 ),
@@ -142,15 +142,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..161,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..161,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 148..151,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -158,12 +158,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 152..160,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 152..153,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -171,11 +171,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 155..157,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 156..157,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -186,7 +186,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 159..160,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -204,15 +204,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 185..198,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 185..198,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 185..188,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -220,12 +220,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 189..197,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 189..190,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -233,7 +233,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 192..193,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -241,11 +241,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 195..197,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 196..197,
                                                         id: Name("c"),
                                                         ctx: Load,
@@ -266,15 +266,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 222..233,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 222..233,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 222..225,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -282,16 +282,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 226..232,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 226..228,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 227..228,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -302,11 +302,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 230..232,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 231..232,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -327,15 +327,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 254..271,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 254..271,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 254..259,
                                     id: Name("array"),
                                     ctx: Load,
@@ -343,17 +343,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 260..270,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 260..263,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 260..261,
                                                             value: Int(
                                                                 3,
@@ -364,7 +364,7 @@ Module(
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 262..263,
                                                             value: Int(
                                                                 5,
@@ -377,11 +377,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 265..270,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 266..270,
                                                         id: Name("idxs"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap
index 4f9cc982f6..d4d9df070f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/star_slices.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..19,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..18,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..18,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..5,
                                     id: Name("array"),
                                     ctx: Load,
@@ -28,16 +28,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..17,
                                     lower: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 6..12,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 7..12,
                                                         id: Name("start"),
                                                         ctx: Load,
@@ -50,11 +50,11 @@ Module(
                                     upper: Some(
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..17,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 14..17,
                                                         id: Name("end"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap
index 5853cdff00..9618f4200b 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/function_type
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..988,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 796..824,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("keyword"),
                         range: 800..807,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 807..817,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 808..809,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("A"),
                                             range: 808..809,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -41,12 +41,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 811..816,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("await"),
                                             range: 811..816,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -57,9 +57,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 817..819,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -70,11 +68,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 821..824,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 821..824,
                                     },
                                 ),
@@ -85,28 +83,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 826..862,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("not_a_type_param"),
                         range: 830..846,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 846..855,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 847..848,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("A"),
                                             range: 847..848,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -114,12 +112,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 853..854,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("B"),
                                             range: 853..854,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -130,9 +128,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 855..857,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -143,11 +139,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 859..862,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 859..862,
                                     },
                                 ),
@@ -158,28 +154,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 864..896,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("multiple_commas"),
                         range: 868..883,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 883..889,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 884..885,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("A"),
                                             range: 884..885,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -187,12 +183,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 887..888,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("B"),
                                             range: 887..888,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -203,9 +199,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 889..891,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -216,11 +210,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 893..896,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 893..896,
                                     },
                                 ),
@@ -231,28 +225,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 898..938,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("multiple_trailing_commas"),
                         range: 902..926,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 926..931,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 927..928,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("A"),
                                             range: 927..928,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -263,9 +257,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 931..933,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -276,11 +268,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 935..938,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 935..938,
                                     },
                                 ),
@@ -291,28 +283,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 940..979,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("multiple_commas_and_recovery"),
                         range: 944..972,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 972..976,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 973..974,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("A"),
                                             range: 973..974,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -323,9 +315,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 976..976,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -336,11 +326,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 976..979,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 976..979,
                                         value: Int(
                                             100,
@@ -354,11 +344,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 980..987,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 980..982,
                             elts: [],
                             ctx: Store,
@@ -367,7 +357,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 984..987,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap
index 5ca66592b1..886c21590c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/if_extra_clos
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..110,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 90..97,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..97,
                             value: true,
                         },
@@ -27,7 +27,7 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 105..109,
                 },
             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap
index 0a04441bbb..6a36fcb277 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/if_extra_inde
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..153,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..134,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 106..110,
                             value: true,
                         },
@@ -24,21 +24,21 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 116..120,
                             },
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 129..134,
                                 value: BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 129..134,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 129..130,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -47,7 +47,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 133..134,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -63,18 +63,18 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 140..144,
                 },
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 146..152,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 146..147,
                                 id: Name("a"),
                                 ctx: Store,
@@ -83,7 +83,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 150..152,
                             value: Int(
                                 10,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap
index 26643d505d..cdf7785101 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/invalid_assig
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..788,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 201..206,
                     targets: [
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 201..202,
                                 value: Int(
                                     5,
@@ -27,7 +27,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 205..206,
                             value: Int(
                                 3,
@@ -38,11 +38,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 208..214,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 208..209,
                             value: Int(
                                 5,
@@ -52,7 +52,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 213..214,
                             value: Int(
                                 3,
@@ -63,11 +63,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 216..228,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 217..218,
                             value: Int(
                                 5,
@@ -76,7 +76,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 221..224,
                             id: Name("int"),
                             ctx: Load,
@@ -85,7 +85,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 227..228,
                                 value: Int(
                                     3,
@@ -98,18 +98,18 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 303..314,
                     targets: [
                         BoolOp(
                             ExprBoolOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 303..309,
                                 op: Or,
                                 values: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 303..304,
                                             id: Name("x"),
                                             ctx: Load,
@@ -117,7 +117,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 308..309,
                                             id: Name("y"),
                                             ctx: Load,
@@ -129,7 +129,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 312..314,
                             value: Int(
                                 42,
@@ -140,16 +140,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 315..328,
                     targets: [
                         Named(
                             ExprNamed {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 316..322,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 316..317,
                                         id: Name("x"),
                                         ctx: Store,
@@ -157,7 +157,7 @@ Module(
                                 ),
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 321..322,
                                         value: Int(
                                             5,
@@ -169,7 +169,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 326..328,
                             value: Int(
                                 42,
@@ -180,16 +180,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 329..339,
                     targets: [
                         BinOp(
                             ExprBinOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 329..334,
                                 left: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 329..330,
                                         id: Name("x"),
                                         ctx: Load,
@@ -198,7 +198,7 @@ Module(
                                 op: Add,
                                 right: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 333..334,
                                         id: Name("y"),
                                         ctx: Load,
@@ -209,7 +209,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 337..339,
                             value: Int(
                                 42,
@@ -220,17 +220,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 340..347,
                     targets: [
                         UnaryOp(
                             ExprUnaryOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 340..342,
                                 op: USub,
                                 operand: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 341..342,
                                         id: Name("x"),
                                         ctx: Store,
@@ -241,7 +241,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 345..347,
                             value: Int(
                                 42,
@@ -252,31 +252,29 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 348..366,
                     targets: [
                         Lambda(
                             ExprLambda {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 349..360,
                                 parameters: Some(
                                     Parameters {
                                         range: 356..357,
-                                        node_index: AtomicNodeIndex(
-                                            0,
-                                        ),
+                                        node_index: NodeIndex(None),
                                         posonlyargs: [],
                                         args: [
                                             ParameterWithDefault {
                                                 range: 356..357,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 parameter: Parameter {
                                                     range: 356..357,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     name: Identifier {
                                                         id: Name("_"),
                                                         range: 356..357,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     annotation: None,
                                                 },
@@ -290,7 +288,7 @@ Module(
                                 ),
                                 body: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 359..360,
                                         value: Int(
                                             1,
@@ -302,7 +300,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 364..366,
                             value: Int(
                                 42,
@@ -313,16 +311,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 367..385,
                     targets: [
                         If(
                             ExprIf {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 367..380,
                                 test: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 372..373,
                                         id: Name("b"),
                                         ctx: Load,
@@ -330,7 +328,7 @@ Module(
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 367..368,
                                         id: Name("a"),
                                         ctx: Load,
@@ -338,7 +336,7 @@ Module(
                                 ),
                                 orelse: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 379..380,
                                         id: Name("c"),
                                         ctx: Load,
@@ -349,7 +347,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 383..385,
                             value: Int(
                                 42,
@@ -360,30 +358,31 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 386..399,
                     targets: [
                         Dict(
                             ExprDict {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 386..394,
                                 items: [
                                     DictItem {
                                         key: Some(
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 387..390,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 387..390,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "a",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -393,7 +392,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 392..393,
                                                 value: Int(
                                                     5,
@@ -407,7 +406,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 397..399,
                             value: Int(
                                 42,
@@ -418,17 +417,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 400..408,
                     targets: [
                         Set(
                             ExprSet {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 400..403,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 401..402,
                                             id: Name("a"),
                                             ctx: Load,
@@ -440,7 +439,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 406..408,
                             value: Int(
                                 42,
@@ -451,16 +450,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 409..429,
                     targets: [
                         ListComp(
                             ExprListComp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 409..424,
                                 elt: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 410..411,
                                         id: Name("x"),
                                         ctx: Load,
@@ -469,10 +468,10 @@ Module(
                                 generators: [
                                     Comprehension {
                                         range: 412..423,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 416..417,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -480,7 +479,7 @@ Module(
                                         ),
                                         iter: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 421..423,
                                                 id: Name("xs"),
                                                 ctx: Load,
@@ -495,7 +494,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 427..429,
                             value: Int(
                                 42,
@@ -506,16 +505,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 430..450,
                     targets: [
                         SetComp(
                             ExprSetComp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 430..445,
                                 elt: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 431..432,
                                         id: Name("x"),
                                         ctx: Load,
@@ -524,10 +523,10 @@ Module(
                                 generators: [
                                     Comprehension {
                                         range: 433..444,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 437..438,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -535,7 +534,7 @@ Module(
                                         ),
                                         iter: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 442..444,
                                                 id: Name("xs"),
                                                 ctx: Load,
@@ -550,7 +549,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 448..450,
                             value: Int(
                                 42,
@@ -561,16 +560,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 451..478,
                     targets: [
                         DictComp(
                             ExprDictComp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 451..473,
                                 key: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 452..453,
                                         id: Name("x"),
                                         ctx: Load,
@@ -578,11 +577,11 @@ Module(
                                 ),
                                 value: BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 455..460,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 455..456,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -591,7 +590,7 @@ Module(
                                         op: Mult,
                                         right: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 459..460,
                                                 value: Int(
                                                     2,
@@ -603,10 +602,10 @@ Module(
                                 generators: [
                                     Comprehension {
                                         range: 461..472,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 465..466,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -614,7 +613,7 @@ Module(
                                         ),
                                         iter: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 470..472,
                                                 id: Name("xs"),
                                                 ctx: Load,
@@ -629,7 +628,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 476..478,
                             value: Int(
                                 42,
@@ -640,16 +639,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 479..499,
                     targets: [
                         Generator(
                             ExprGenerator {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 479..494,
                                 elt: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 480..481,
                                         id: Name("x"),
                                         ctx: Load,
@@ -658,10 +657,10 @@ Module(
                                 generators: [
                                     Comprehension {
                                         range: 482..493,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 486..487,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -669,7 +668,7 @@ Module(
                                         ),
                                         iter: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 491..493,
                                                 id: Name("xs"),
                                                 ctx: Load,
@@ -685,7 +684,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 497..499,
                             value: Int(
                                 42,
@@ -696,16 +695,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 500..512,
                     targets: [
                         Await(
                             ExprAwait {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 500..507,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 506..507,
                                         id: Name("x"),
                                         ctx: Load,
@@ -716,7 +715,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 510..512,
                             value: Int(
                                 42,
@@ -727,17 +726,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 513..527,
                     targets: [
                         Yield(
                             ExprYield {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 514..521,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 520..521,
                                             id: Name("x"),
                                             ctx: Load,
@@ -749,7 +748,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 525..527,
                             value: Int(
                                 42,
@@ -760,16 +759,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 528..548,
                     targets: [
                         YieldFrom(
                             ExprYieldFrom {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 529..542,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 540..542,
                                         id: Name("xs"),
                                         ctx: Load,
@@ -780,7 +779,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 546..548,
                             value: Int(
                                 42,
@@ -791,16 +790,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 549..563,
                     targets: [
                         Compare(
                             ExprCompare {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 549..558,
                                 left: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 549..550,
                                         id: Name("a"),
                                         ctx: Load,
@@ -813,7 +812,7 @@ Module(
                                 comparators: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 553..554,
                                             id: Name("b"),
                                             ctx: Load,
@@ -821,7 +820,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 557..558,
                                             id: Name("c"),
                                             ctx: Load,
@@ -833,7 +832,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 561..563,
                             value: Int(
                                 42,
@@ -844,16 +843,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 564..574,
                     targets: [
                         Call(
                             ExprCall {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 564..569,
                                 func: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 564..567,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -861,7 +860,7 @@ Module(
                                 ),
                                 arguments: Arguments {
                                     range: 567..569,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     args: [],
                                     keywords: [],
                                 },
@@ -870,7 +869,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 572..574,
                             value: Int(
                                 42,
@@ -881,27 +880,27 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 576..590,
                     targets: [
                         FString(
                             ExprFString {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 576..585,
                                 value: FStringValue {
                                     inner: Single(
                                         FString(
                                             FString {
                                                 range: 576..585,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 578..584,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 579..583,
                                                                     id: Name("quux"),
                                                                     ctx: Load,
@@ -917,6 +916,7 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -927,7 +927,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 588..590,
                             value: Int(
                                 42,
@@ -938,27 +938,27 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 591..614,
                     targets: [
                         FString(
                             ExprFString {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 591..609,
                                 value: FStringValue {
                                     inner: Single(
                                         FString(
                                             FString {
                                                 range: 591..609,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 593..598,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 594..597,
                                                                     id: Name("foo"),
                                                                     ctx: Load,
@@ -972,17 +972,17 @@ Module(
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 598..603,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: " and ",
                                                         },
                                                     ),
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 603..608,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 604..607,
                                                                     id: Name("bar"),
                                                                     ctx: Load,
@@ -998,6 +998,7 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -1008,7 +1009,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 612..614,
                             value: Int(
                                 42,
@@ -1019,23 +1020,24 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 616..626,
                     targets: [
                         StringLiteral(
                             ExprStringLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 616..621,
                                 value: StringLiteralValue {
                                     inner: Single(
                                         StringLiteral {
                                             range: 616..621,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "foo",
                                             flags: StringLiteralFlags {
                                                 quote_style: Double,
                                                 prefix: Empty,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1045,7 +1047,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 624..626,
                             value: Int(
                                 42,
@@ -1056,18 +1058,18 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 627..638,
                     targets: [
                         BytesLiteral(
                             ExprBytesLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 627..633,
                                 value: BytesLiteralValue {
                                     inner: Single(
                                         BytesLiteral {
                                             range: 627..633,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: [
                                                 102,
                                                 111,
@@ -1077,6 +1079,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1086,7 +1089,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 636..638,
                             value: Int(
                                 42,
@@ -1097,12 +1100,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 639..647,
                     targets: [
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 639..642,
                                 value: Int(
                                     123,
@@ -1112,7 +1115,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 645..647,
                             value: Int(
                                 42,
@@ -1123,12 +1126,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 648..657,
                     targets: [
                         BooleanLiteral(
                             ExprBooleanLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 648..652,
                                 value: true,
                             },
@@ -1136,7 +1139,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 655..657,
                             value: Int(
                                 42,
@@ -1147,19 +1150,19 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 658..667,
                     targets: [
                         NoneLiteral(
                             ExprNoneLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 658..662,
                             },
                         ),
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 665..667,
                             value: Int(
                                 42,
@@ -1170,19 +1173,19 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 668..676,
                     targets: [
                         EllipsisLiteral(
                             ExprEllipsisLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 668..671,
                             },
                         ),
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 674..676,
                             value: Int(
                                 42,
@@ -1193,20 +1196,20 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 677..688,
                     targets: [
                         Starred(
                             ExprStarred {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 677..683,
                                 value: Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 678..683,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 678..681,
                                                 id: Name("foo"),
                                                 ctx: Load,
@@ -1214,7 +1217,7 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 681..683,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [],
                                             keywords: [],
                                         },
@@ -1226,7 +1229,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 686..688,
                             value: Int(
                                 42,
@@ -1237,17 +1240,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 689..717,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 689..702,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 690..691,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1255,11 +1258,11 @@ Module(
                                     ),
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 693..698,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 693..696,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -1267,7 +1270,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 696..698,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -1275,7 +1278,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 700..701,
                                             id: Name("y"),
                                             ctx: Store,
@@ -1288,12 +1291,12 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 705..717,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 706..708,
                                         value: Int(
                                             42,
@@ -1302,7 +1305,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 710..712,
                                         value: Int(
                                             42,
@@ -1311,7 +1314,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 714..716,
                                         value: Int(
                                             42,
@@ -1326,22 +1329,22 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 718..758,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 718..737,
                                 elts: [
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 719..725,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 720..721,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -1349,7 +1352,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 723..724,
                                                         id: Name("b"),
                                                         ctx: Store,
@@ -1361,17 +1364,17 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 727..733,
                                             elts: [
                                                 List(
                                                     ExprList {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 728..732,
                                                         elts: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 729..731,
                                                                     value: Int(
                                                                         42,
@@ -1388,7 +1391,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 735..736,
                                             id: Name("d"),
                                             ctx: Store,
@@ -1401,17 +1404,17 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 740..758,
                             elts: [
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 741..747,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 742..743,
                                                     value: Int(
                                                         1,
@@ -1420,7 +1423,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 745..746,
                                                     value: Int(
                                                         2,
@@ -1433,17 +1436,17 @@ Module(
                                 ),
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 749..754,
                                         elts: [
                                             List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 750..753,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 751..752,
                                                                 value: Int(
                                                                     3,
@@ -1460,7 +1463,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 756..757,
                                         value: Int(
                                             4,
@@ -1475,17 +1478,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 759..787,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 759..772,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 760..761,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1493,11 +1496,11 @@ Module(
                                     ),
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 763..768,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 763..766,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -1505,7 +1508,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 766..768,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -1513,7 +1516,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 770..771,
                                             id: Name("y"),
                                             ctx: Store,
@@ -1527,12 +1530,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 775..787,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 776..778,
                                         value: Int(
                                             42,
@@ -1541,7 +1544,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 780..782,
                                         value: Int(
                                             42,
@@ -1550,7 +1553,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 784..786,
                                         value: Int(
                                             42,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap
index 788a678251..66bb515f10 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/invalid_augme
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..611,
         body: [
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 97..109,
                     target: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 97..103,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 97..98,
                                         id: Name("x"),
                                         ctx: Load,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 102..103,
                                         id: Name("y"),
                                         ctx: Load,
@@ -42,7 +42,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 107..109,
                             value: Int(
                                 42,
@@ -53,15 +53,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 110..124,
                     target: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 111..117,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 111..112,
                                     id: Name("x"),
                                     ctx: Store,
@@ -69,7 +69,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 116..117,
                                     value: Int(
                                         5,
@@ -81,7 +81,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..124,
                             value: Int(
                                 42,
@@ -92,15 +92,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..136,
                     target: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 125..130,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 125..126,
                                     id: Name("x"),
                                     ctx: Load,
@@ -109,7 +109,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 129..130,
                                     id: Name("y"),
                                     ctx: Load,
@@ -120,7 +120,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 134..136,
                             value: Int(
                                 42,
@@ -131,16 +131,16 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..145,
                     target: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 137..139,
                             op: USub,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 138..139,
                                     id: Name("x"),
                                     ctx: Store,
@@ -151,7 +151,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 143..145,
                             value: Int(
                                 42,
@@ -162,30 +162,28 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 146..165,
                     target: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 147..158,
                             parameters: Some(
                                 Parameters {
                                     range: 154..155,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 154..155,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 154..155,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("_"),
                                                     range: 154..155,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -199,7 +197,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 157..158,
                                     value: Int(
                                         1,
@@ -211,7 +209,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 163..165,
                             value: Int(
                                 42,
@@ -222,15 +220,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 166..185,
                     target: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 166..179,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 171..172,
                                     id: Name("b"),
                                     ctx: Load,
@@ -238,7 +236,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 166..167,
                                     id: Name("a"),
                                     ctx: Load,
@@ -246,7 +244,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 178..179,
                                     id: Name("c"),
                                     ctx: Load,
@@ -257,7 +255,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 183..185,
                             value: Int(
                                 42,
@@ -268,29 +266,30 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 186..200,
                     target: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 186..194,
                             items: [
                                 DictItem {
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 187..190,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 187..190,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "a",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -300,7 +299,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 192..193,
                                             value: Int(
                                                 5,
@@ -314,7 +313,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 198..200,
                             value: Int(
                                 42,
@@ -325,16 +324,16 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 201..210,
                     target: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 201..204,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 202..203,
                                         id: Name("a"),
                                         ctx: Load,
@@ -346,7 +345,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 208..210,
                             value: Int(
                                 42,
@@ -357,15 +356,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 211..232,
                     target: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 211..226,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 212..213,
                                     id: Name("x"),
                                     ctx: Load,
@@ -374,10 +373,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 214..225,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 218..219,
                                             id: Name("x"),
                                             ctx: Store,
@@ -385,7 +384,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 223..225,
                                             id: Name("xs"),
                                             ctx: Load,
@@ -400,7 +399,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 230..232,
                             value: Int(
                                 42,
@@ -411,15 +410,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 233..254,
                     target: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 233..248,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 234..235,
                                     id: Name("x"),
                                     ctx: Load,
@@ -428,10 +427,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 236..247,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 240..241,
                                             id: Name("x"),
                                             ctx: Store,
@@ -439,7 +438,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 245..247,
                                             id: Name("xs"),
                                             ctx: Load,
@@ -454,7 +453,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 252..254,
                             value: Int(
                                 42,
@@ -465,15 +464,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 255..283,
                     target: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 255..277,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 256..257,
                                     id: Name("x"),
                                     ctx: Load,
@@ -481,11 +480,11 @@ Module(
                             ),
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 259..264,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 259..260,
                                             id: Name("x"),
                                             ctx: Load,
@@ -494,7 +493,7 @@ Module(
                                     op: Mult,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 263..264,
                                             value: Int(
                                                 2,
@@ -506,10 +505,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 265..276,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 269..270,
                                             id: Name("x"),
                                             ctx: Store,
@@ -517,7 +516,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 274..276,
                                             id: Name("xs"),
                                             ctx: Load,
@@ -532,7 +531,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 281..283,
                             value: Int(
                                 42,
@@ -543,15 +542,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 284..305,
                     target: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 284..299,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 285..286,
                                     id: Name("x"),
                                     ctx: Load,
@@ -560,10 +559,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 287..298,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 291..292,
                                             id: Name("x"),
                                             ctx: Store,
@@ -571,7 +570,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 296..298,
                                             id: Name("xs"),
                                             ctx: Load,
@@ -587,7 +586,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 303..305,
                             value: Int(
                                 42,
@@ -598,15 +597,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 306..319,
                     target: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 306..313,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 312..313,
                                     id: Name("x"),
                                     ctx: Load,
@@ -617,7 +616,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 317..319,
                             value: Int(
                                 42,
@@ -628,16 +627,16 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 320..335,
                     target: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 321..328,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 327..328,
                                         id: Name("x"),
                                         ctx: Load,
@@ -649,7 +648,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 333..335,
                             value: Int(
                                 42,
@@ -660,15 +659,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 336..357,
                     target: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 337..350,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 348..350,
                                     id: Name("xs"),
                                     ctx: Load,
@@ -679,7 +678,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 355..357,
                             value: Int(
                                 42,
@@ -690,15 +689,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 358..373,
                     target: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 358..367,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 358..359,
                                     id: Name("a"),
                                     ctx: Load,
@@ -711,7 +710,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 362..363,
                                         id: Name("b"),
                                         ctx: Load,
@@ -719,7 +718,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 366..367,
                                         id: Name("c"),
                                         ctx: Load,
@@ -731,7 +730,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 371..373,
                             value: Int(
                                 42,
@@ -742,15 +741,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 374..385,
                     target: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 374..379,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 374..377,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -758,7 +757,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 377..379,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -767,7 +766,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 383..385,
                             value: Int(
                                 42,
@@ -778,26 +777,26 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 387..402,
                     target: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 387..396,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 387..396,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 389..395,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 390..394,
                                                                 id: Name("quux"),
                                                                 ctx: Load,
@@ -813,6 +812,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -823,7 +823,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 400..402,
                             value: Int(
                                 42,
@@ -834,26 +834,26 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 403..427,
                     target: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 403..421,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 403..421,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 405..410,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 406..409,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -867,17 +867,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 410..415,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " and ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 415..420,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 416..419,
                                                                 id: Name("bar"),
                                                                 ctx: Load,
@@ -893,6 +893,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -903,7 +904,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 425..427,
                             value: Int(
                                 42,
@@ -914,22 +915,23 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 429..440,
                     target: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 429..434,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 429..434,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "foo",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -939,7 +941,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 438..440,
                             value: Int(
                                 42,
@@ -950,17 +952,17 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 441..453,
                     target: BytesLiteral(
                         ExprBytesLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 441..447,
                             value: BytesLiteralValue {
                                 inner: Single(
                                     BytesLiteral {
                                         range: 441..447,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: [
                                             102,
                                             111,
@@ -970,6 +972,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -979,7 +982,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 451..453,
                             value: Int(
                                 42,
@@ -990,11 +993,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 454..463,
                     target: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 454..457,
                             value: Int(
                                 123,
@@ -1004,7 +1007,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 461..463,
                             value: Int(
                                 42,
@@ -1015,11 +1018,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 464..474,
                     target: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 464..468,
                             value: true,
                         },
@@ -1027,7 +1030,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 472..474,
                             value: Int(
                                 42,
@@ -1038,18 +1041,18 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 475..485,
                     target: NoneLiteral(
                         ExprNoneLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 475..479,
                         },
                     ),
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 483..485,
                             value: Int(
                                 42,
@@ -1060,18 +1063,18 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 486..495,
                     target: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 486..489,
                         },
                     ),
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 493..495,
                             value: Int(
                                 42,
@@ -1082,19 +1085,19 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 496..508,
                     target: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 496..502,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 497..502,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 497..500,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -1102,7 +1105,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 500..502,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -1114,7 +1117,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 506..508,
                             value: Int(
                                 42,
@@ -1125,16 +1128,16 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 509..538,
                     target: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 509..522,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 510..511,
                                         id: Name("x"),
                                         ctx: Store,
@@ -1142,11 +1145,11 @@ Module(
                                 ),
                                 Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 513..518,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 513..516,
                                                 id: Name("foo"),
                                                 ctx: Load,
@@ -1154,7 +1157,7 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 516..518,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [],
                                             keywords: [],
                                         },
@@ -1162,7 +1165,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 520..521,
                                         id: Name("y"),
                                         ctx: Store,
@@ -1175,12 +1178,12 @@ Module(
                     op: Add,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 526..538,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 527..529,
                                         value: Int(
                                             42,
@@ -1189,7 +1192,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 531..533,
                                         value: Int(
                                             42,
@@ -1198,7 +1201,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 535..537,
                                         value: Int(
                                             42,
@@ -1213,21 +1216,21 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 539..580,
                     target: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 539..558,
                             elts: [
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 540..546,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 541..542,
                                                     id: Name("a"),
                                                     ctx: Store,
@@ -1235,7 +1238,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 544..545,
                                                     id: Name("b"),
                                                     ctx: Store,
@@ -1247,17 +1250,17 @@ Module(
                                 ),
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 548..554,
                                         elts: [
                                             List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 549..553,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 550..552,
                                                                 value: Int(
                                                                     42,
@@ -1274,7 +1277,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 556..557,
                                         id: Name("d"),
                                         ctx: Store,
@@ -1287,17 +1290,17 @@ Module(
                     op: Add,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 562..580,
                             elts: [
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 563..569,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 564..565,
                                                     value: Int(
                                                         1,
@@ -1306,7 +1309,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 567..568,
                                                     value: Int(
                                                         2,
@@ -1319,17 +1322,17 @@ Module(
                                 ),
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 571..576,
                                         elts: [
                                             List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 572..575,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 573..574,
                                                                 value: Int(
                                                                     3,
@@ -1346,7 +1349,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 578..579,
                                         value: Int(
                                             4,
@@ -1361,16 +1364,16 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 581..610,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 581..594,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 582..583,
                                         id: Name("x"),
                                         ctx: Store,
@@ -1378,11 +1381,11 @@ Module(
                                 ),
                                 Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 585..590,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 585..588,
                                                 id: Name("foo"),
                                                 ctx: Load,
@@ -1390,7 +1393,7 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 588..590,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [],
                                             keywords: [],
                                         },
@@ -1398,7 +1401,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 592..593,
                                         id: Name("y"),
                                         ctx: Store,
@@ -1412,12 +1415,12 @@ Module(
                     op: Add,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 598..610,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 599..601,
                                         value: Int(
                                             42,
@@ -1426,7 +1429,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 603..605,
                                         value: Int(
                                             42,
@@ -1435,7 +1438,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 607..609,
                                         value: Int(
                                             42,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap
index 58087f43bd..d03bfe08c8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..198,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..197,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,14 +25,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 127..197,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 132..146,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 133..139,
                                             id: Name(""),
                                             ctx: Invalid,
@@ -40,32 +40,32 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 140..146,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchAs(
                                                 PatternMatchAs {
+                                                    node_index: NodeIndex(None),
                                                     range: 141..142,
-                                                    node_index: AtomicNodeIndex(..),
                                                     pattern: None,
                                                     name: Some(
                                                         Identifier {
                                                             id: Name("a"),
                                                             range: 141..142,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                     ),
                                                 },
                                             ),
                                             MatchAs(
                                                 PatternMatchAs {
+                                                    node_index: NodeIndex(None),
                                                     range: 144..145,
-                                                    node_index: AtomicNodeIndex(..),
                                                     pattern: None,
                                                     name: Some(
                                                         Identifier {
                                                             id: Name("b"),
                                                             range: 144..145,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                     ),
                                                 },
@@ -79,7 +79,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 193..197,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap
index c33ba5de9a..34809d2560 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..210,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..209,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,18 +25,18 @@ Module(
                     cases: [
                         MatchCase {
                             range: 140..209,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 145..158,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 145..158,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 146..152,
                                                     id: Name(""),
                                                     ctx: Invalid,
@@ -45,7 +45,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 156..158,
                                                     value: Complex {
                                                         real: 0.0,
@@ -61,7 +61,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 205..209,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap
index 056268c64d..34e3500f26 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..190,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..176,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,22 +25,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 159..176,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 164..170,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 164..165,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 164..165,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -50,7 +50,7 @@ Module(
                                         Identifier {
                                             id: Name("y"),
                                             range: 169..170,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -59,16 +59,16 @@ Module(
                             body: [
                                 AnnAssign(
                                     StmtAnnAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 171..176,
                                         target: UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 171..175,
                                                 op: UAdd,
                                                 operand: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 173..175,
                                                         value: Complex {
                                                             real: 0.0,
@@ -80,7 +80,7 @@ Module(
                                         ),
                                         annotation: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 176..176,
                                                 id: Name(""),
                                                 ctx: Invalid,
@@ -97,7 +97,7 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 185..189,
                 },
             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap
index 6ebf0be44b..07cd1a64e6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..136,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..120,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,37 +25,37 @@ Module(
                     cases: [
                         MatchCase {
                             range: 103..120,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 108..117,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Dict(
                                         ExprDict {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 108..109,
                                             items: [],
                                         },
                                     ),
                                     arguments: PatternArguments {
                                         range: 109..117,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchAs(
                                                 PatternMatchAs {
+                                                    node_index: NodeIndex(None),
                                                     range: 110..116,
-                                                    node_index: AtomicNodeIndex(..),
                                                     pattern: Some(
                                                         MatchAs(
                                                             PatternMatchAs {
+                                                                node_index: NodeIndex(None),
                                                                 range: 110..111,
-                                                                node_index: AtomicNodeIndex(..),
                                                                 pattern: None,
                                                                 name: Some(
                                                                     Identifier {
                                                                         id: Name("x"),
                                                                         range: 110..111,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                 ),
                                                             },
@@ -65,7 +65,7 @@ Module(
                                                         Identifier {
                                                             id: Name("y"),
                                                             range: 115..116,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                     ),
                                                 },
@@ -79,11 +79,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..120,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 119..120,
                                                 value: Int(
                                                     1,
@@ -99,7 +99,7 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 131..135,
                 },
             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap
index 6d705cce3a..771706eaed 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..187,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..186,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,15 +25,15 @@ Module(
                     cases: [
                         MatchCase {
                             range: 156..186,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 161..172,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 162..163,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -41,7 +41,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 167..168,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -51,25 +51,25 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 164..166,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("as"),
                                                         range: 164..166,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 170..171,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 170..171,
                                                         value: Int(
                                                             1,
@@ -86,7 +86,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 182..186,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap
index 1687f42248..67b1874089 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/invalid
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..383,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..285,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..57,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,14 +25,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 63..97,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 68..83,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 68..71,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -40,24 +40,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 71..83,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 72..82,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name(""),
                                                     range: 80..80,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 81..82,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 81..82,
                                                                 value: Int(
                                                                     1,
@@ -75,7 +75,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 93..97,
                                     },
                                 ),
@@ -83,14 +83,14 @@ Module(
                         },
                         MatchCase {
                             range: 102..135,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 107..121,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 107..110,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -98,24 +98,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 110..121,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 111..120,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name(""),
                                                     range: 118..118,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 119..120,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 119..120,
                                                                 value: Int(
                                                                     1,
@@ -133,7 +133,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 131..135,
                                     },
                                 ),
@@ -141,14 +141,14 @@ Module(
                         },
                         MatchCase {
                             range: 140..174,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 145..160,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 145..148,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -156,24 +156,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 148..160,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 149..159,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name(""),
                                                     range: 157..157,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 158..159,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 158..159,
                                                                 value: Int(
                                                                     1,
@@ -191,7 +191,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 170..174,
                                     },
                                 ),
@@ -199,14 +199,14 @@ Module(
                         },
                         MatchCase {
                             range: 179..217,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 184..203,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 184..187,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -214,24 +214,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 187..203,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 188..202,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name(""),
                                                     range: 200..200,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 201..202,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 201..202,
                                                                 value: Int(
                                                                     1,
@@ -249,7 +249,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 213..217,
                                     },
                                 ),
@@ -257,14 +257,14 @@ Module(
                         },
                         MatchCase {
                             range: 222..249,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 227..235,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 227..230,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -272,24 +272,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 230..235,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 231..234,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name(""),
                                                     range: 233..233,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 233..234,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 233..234,
                                                                 value: Int(
                                                                     1,
@@ -307,7 +307,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 245..249,
                                     },
                                 ),
@@ -315,14 +315,14 @@ Module(
                         },
                         MatchCase {
                             range: 254..285,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 259..271,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 259..262,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -330,24 +330,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 262..271,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 263..270,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name(""),
                                                     range: 269..269,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 269..270,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 269..270,
                                                                 value: Int(
                                                                     1,
@@ -365,7 +365,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 281..285,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap
index abf680ec65..4f3a4512a1 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/invalid
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..695,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..332,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..25,
                             id: Name("invalid_lhs_pattern"),
                             ctx: Load,
@@ -25,22 +25,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 31..60,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 36..46,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..46,
                                             left: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 36..41,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 36..39,
                                                             id: Name("Foo"),
                                                             ctx: Load,
@@ -48,7 +48,7 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 39..41,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [],
                                                         keywords: [],
                                                     },
@@ -57,7 +57,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 44..46,
                                                     value: Complex {
                                                         real: 0.0,
@@ -73,7 +73,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..60,
                                     },
                                 ),
@@ -81,18 +81,18 @@ Module(
                         },
                         MatchCase {
                             range: 65..90,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 70..76,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 70..76,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 70..71,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -101,7 +101,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 74..76,
                                                     value: Complex {
                                                         real: 0.0,
@@ -117,7 +117,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 86..90,
                                     },
                                 ),
@@ -125,18 +125,18 @@ Module(
                         },
                         MatchCase {
                             range: 95..120,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 100..106,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 100..106,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 100..101,
                                                     id: Name("_"),
                                                     ctx: Store,
@@ -145,7 +145,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 104..106,
                                                     value: Complex {
                                                         real: 0.0,
@@ -161,7 +161,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 116..120,
                                     },
                                 ),
@@ -169,22 +169,22 @@ Module(
                         },
                         MatchCase {
                             range: 125..156,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 130..142,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 130..142,
                                             left: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 131..136,
                                                     left: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 131..132,
                                                             value: Int(
                                                                 1,
@@ -194,7 +194,7 @@ Module(
                                                     op: BitOr,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 135..136,
                                                             value: Int(
                                                                 2,
@@ -206,7 +206,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 140..142,
                                                     value: Complex {
                                                         real: 0.0,
@@ -222,7 +222,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 152..156,
                                     },
                                 ),
@@ -230,23 +230,23 @@ Module(
                         },
                         MatchCase {
                             range: 161..191,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 166..177,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 166..177,
                                             left: List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 166..172,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 167..168,
                                                                 value: Int(
                                                                     1,
@@ -255,7 +255,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 170..171,
                                                                 value: Int(
                                                                     2,
@@ -269,7 +269,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 175..177,
                                                     value: Complex {
                                                         real: 0.0,
@@ -285,7 +285,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 187..191,
                                     },
                                 ),
@@ -293,25 +293,25 @@ Module(
                         },
                         MatchCase {
                             range: 196..229,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 201..215,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 201..215,
                                             left: Dict(
                                                 ExprDict {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 201..210,
                                                     items: [
                                                         DictItem {
                                                             key: Some(
                                                                 BooleanLiteral(
                                                                     ExprBooleanLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 202..206,
                                                                         value: true,
                                                                     },
@@ -319,7 +319,7 @@ Module(
                                                             ),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 208..209,
                                                                     value: Int(
                                                                         1,
@@ -333,7 +333,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 213..215,
                                                     value: Complex {
                                                         real: 0.0,
@@ -349,7 +349,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 225..229,
                                     },
                                 ),
@@ -357,18 +357,18 @@ Module(
                         },
                         MatchCase {
                             range: 234..260,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 239..246,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 239..246,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 239..241,
                                                     value: Complex {
                                                         real: 0.0,
@@ -379,7 +379,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 244..246,
                                                     value: Complex {
                                                         real: 0.0,
@@ -395,7 +395,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 256..260,
                                     },
                                 ),
@@ -403,23 +403,23 @@ Module(
                         },
                         MatchCase {
                             range: 265..292,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 270..278,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 270..278,
                                             left: UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 270..273,
                                                     op: USub,
                                                     operand: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 271..273,
                                                             value: Complex {
                                                                 real: 0.0,
@@ -432,7 +432,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 276..278,
                                                     value: Complex {
                                                         real: 0.0,
@@ -448,7 +448,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 288..292,
                                     },
                                 ),
@@ -456,22 +456,22 @@ Module(
                         },
                         MatchCase {
                             range: 297..332,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 302..318,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 302..318,
                                             left: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 302..313,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 302..305,
                                                             id: Name("Foo"),
                                                             ctx: Load,
@@ -479,11 +479,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 305..313,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 306..312,
                                                                     id: Name(""),
                                                                     ctx: Invalid,
@@ -497,7 +497,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 316..318,
                                                     value: Complex {
                                                         real: 0.0,
@@ -513,7 +513,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 328..332,
                                     },
                                 ),
@@ -524,11 +524,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 334..625,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 340..359,
                             id: Name("invalid_rhs_pattern"),
                             ctx: Load,
@@ -537,18 +537,18 @@ Module(
                     cases: [
                         MatchCase {
                             range: 365..393,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 370..379,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 370..379,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 370..371,
                                                     value: Int(
                                                         1,
@@ -558,11 +558,11 @@ Module(
                                             op: Add,
                                             right: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 374..379,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 374..377,
                                                             id: Name("Foo"),
                                                             ctx: Load,
@@ -570,7 +570,7 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 377..379,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [],
                                                         keywords: [],
                                                     },
@@ -584,7 +584,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 389..393,
                                     },
                                 ),
@@ -592,18 +592,18 @@ Module(
                         },
                         MatchCase {
                             range: 398..422,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 403..408,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 403..408,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 403..404,
                                                     value: Int(
                                                         2,
@@ -613,7 +613,7 @@ Module(
                                             op: Add,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 407..408,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -627,7 +627,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 418..422,
                                     },
                                 ),
@@ -635,18 +635,18 @@ Module(
                         },
                         MatchCase {
                             range: 427..451,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 432..437,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 432..437,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 432..433,
                                                     value: Int(
                                                         3,
@@ -656,7 +656,7 @@ Module(
                                             op: Add,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 436..437,
                                                     id: Name("_"),
                                                     ctx: Store,
@@ -670,7 +670,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 447..451,
                                     },
                                 ),
@@ -678,18 +678,18 @@ Module(
                         },
                         MatchCase {
                             range: 456..486,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 461..472,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 461..472,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 461..462,
                                                     value: Int(
                                                         4,
@@ -699,11 +699,11 @@ Module(
                                             op: Add,
                                             right: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 466..471,
                                                     left: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 466..467,
                                                             value: Int(
                                                                 1,
@@ -713,7 +713,7 @@ Module(
                                                     op: BitOr,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 470..471,
                                                             value: Int(
                                                                 2,
@@ -730,7 +730,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 482..486,
                                     },
                                 ),
@@ -738,18 +738,18 @@ Module(
                         },
                         MatchCase {
                             range: 491..520,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 496..506,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 496..506,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 496..497,
                                                     value: Int(
                                                         5,
@@ -759,12 +759,12 @@ Module(
                                             op: Add,
                                             right: List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 500..506,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 501..502,
                                                                 value: Int(
                                                                     1,
@@ -773,7 +773,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 504..505,
                                                                 value: Int(
                                                                     2,
@@ -792,7 +792,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 516..520,
                                     },
                                 ),
@@ -800,18 +800,18 @@ Module(
                         },
                         MatchCase {
                             range: 525..557,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 530..543,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 530..543,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 530..531,
                                                     value: Int(
                                                         6,
@@ -821,14 +821,14 @@ Module(
                                             op: Add,
                                             right: Dict(
                                                 ExprDict {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 534..543,
                                                     items: [
                                                         DictItem {
                                                             key: Some(
                                                                 BooleanLiteral(
                                                                     ExprBooleanLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 535..539,
                                                                         value: true,
                                                                     },
@@ -836,7 +836,7 @@ Module(
                                                             ),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 541..542,
                                                                     value: Int(
                                                                         1,
@@ -855,7 +855,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 553..557,
                                     },
                                 ),
@@ -863,18 +863,18 @@ Module(
                         },
                         MatchCase {
                             range: 562..586,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 567..572,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 567..572,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 567..568,
                                                     value: Int(
                                                         1,
@@ -884,7 +884,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 571..572,
                                                     value: Int(
                                                         2,
@@ -899,7 +899,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 582..586,
                                     },
                                 ),
@@ -907,18 +907,18 @@ Module(
                         },
                         MatchCase {
                             range: 591..625,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 596..611,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 596..611,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 596..597,
                                                     value: Int(
                                                         1,
@@ -928,11 +928,11 @@ Module(
                                             op: Add,
                                             right: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 600..611,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 600..603,
                                                             id: Name("Foo"),
                                                             ctx: Load,
@@ -940,11 +940,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 603..611,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 604..610,
                                                                     id: Name(""),
                                                                     ctx: Invalid,
@@ -963,7 +963,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 621..625,
                                     },
                                 ),
@@ -974,11 +974,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 627..694,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 633..656,
                             id: Name("invalid_lhs_rhs_pattern"),
                             ctx: Load,
@@ -987,22 +987,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 662..694,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 667..680,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 667..680,
                                             left: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 667..672,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 667..670,
                                                             id: Name("Foo"),
                                                             ctx: Load,
@@ -1010,7 +1010,7 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 670..672,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [],
                                                         keywords: [],
                                                     },
@@ -1019,11 +1019,11 @@ Module(
                                             op: Add,
                                             right: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 675..680,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 675..678,
                                                             id: Name("Bar"),
                                                             ctx: Load,
@@ -1031,7 +1031,7 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 678..680,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [],
                                                         keywords: [],
                                                     },
@@ -1045,7 +1045,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 690..694,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap
index 69e3b740ee..5592524488 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/invalid
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..509,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..209,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..74,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,19 +25,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 80..105,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 85..91,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 86..90,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 87..90,
                                                         id: Name("key"),
                                                         ctx: Store,
@@ -50,11 +50,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 90..90,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 90..90,
                                                         id: Name(""),
                                                         ctx: Invalid,
@@ -70,7 +70,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 101..105,
                                     },
                                 ),
@@ -78,19 +78,19 @@ Module(
                         },
                         MatchCase {
                             range: 110..138,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 115..124,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 116..120,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 117..120,
                                                         id: Name("key"),
                                                         ctx: Store,
@@ -103,11 +103,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 122..123,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 122..123,
                                                         value: Int(
                                                             1,
@@ -124,7 +124,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 134..138,
                                     },
                                 ),
@@ -132,19 +132,19 @@ Module(
                         },
                         MatchCase {
                             range: 143..170,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 148..156,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 149..153,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 150..153,
                                                         id: Name("key"),
                                                         ctx: Store,
@@ -157,11 +157,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 154..155,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 154..155,
                                                         value: Int(
                                                             1,
@@ -178,7 +178,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 166..170,
                                     },
                                 ),
@@ -186,19 +186,19 @@ Module(
                         },
                         MatchCase {
                             range: 175..209,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 180..195,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 181..185,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 182..185,
                                                         id: Name("key"),
                                                         ctx: Store,
@@ -209,7 +209,7 @@ Module(
                                         ),
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 187..191,
                                             },
                                         ),
@@ -217,11 +217,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 185..185,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 185..185,
                                                         id: Name(""),
                                                         ctx: Invalid,
@@ -231,11 +231,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 193..194,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 193..194,
                                                         value: Int(
                                                             1,
@@ -252,7 +252,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 205..209,
                                     },
                                 ),
@@ -263,11 +263,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 305..462,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 311..318,
                             id: Name("subject"),
                             ctx: Load,
@@ -276,15 +276,15 @@ Module(
                     cases: [
                         MatchCase {
                             range: 324..360,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 329..346,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 338..342,
                                             },
                                         ),
@@ -292,11 +292,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 344..345,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 344..345,
                                                         value: Int(
                                                             1,
@@ -310,7 +310,7 @@ Module(
                                         Identifier {
                                             id: Name("rest"),
                                             range: 332..336,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -319,7 +319,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 356..360,
                                     },
                                 ),
@@ -327,15 +327,15 @@ Module(
                         },
                         MatchCase {
                             range: 365..411,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 370..397,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 389..393,
                                             },
                                         ),
@@ -343,11 +343,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 395..396,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 395..396,
                                                         value: Int(
                                                             1,
@@ -361,7 +361,7 @@ Module(
                                         Identifier {
                                             id: Name("rest2"),
                                             range: 382..387,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -370,7 +370,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 407..411,
                                     },
                                 ),
@@ -378,15 +378,15 @@ Module(
                         },
                         MatchCase {
                             range: 416..462,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 421..448,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 431..435,
                                             },
                                         ),
@@ -394,11 +394,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 437..438,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 437..438,
                                                         value: Int(
                                                             1,
@@ -412,7 +412,7 @@ Module(
                                         Identifier {
                                             id: Name("rest2"),
                                             range: 442..447,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -421,7 +421,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 458..462,
                                     },
                                 ),
@@ -432,11 +432,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 464..509,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 470..477,
                             id: Name("subject"),
                             ctx: Load,
@@ -445,19 +445,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 483..509,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 488..504,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Call(
                                             ExprCall {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 489..500,
                                                 func: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 489..492,
                                                         id: Name("Foo"),
                                                         ctx: Load,
@@ -465,11 +465,11 @@ Module(
                                                 ),
                                                 arguments: Arguments {
                                                     range: 492..500,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     args: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 493..499,
                                                                 id: Name(""),
                                                                 ctx: Invalid,
@@ -484,11 +484,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 502..503,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 502..503,
                                                         value: Int(
                                                             1,
@@ -505,11 +505,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 506..509,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 506..509,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap
index ca41862659..364d382ff2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/star_pa
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..408,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..407,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..70,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 76..97,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchStar(
                                 PatternMatchStar {
+                                    node_index: NodeIndex(None),
                                     range: 81..83,
-                                    node_index: AtomicNodeIndex(..),
                                     name: None,
                                 },
                             ),
@@ -37,7 +37,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 93..97,
                                     },
                                 ),
@@ -45,16 +45,16 @@ Module(
                         },
                         MatchCase {
                             range: 102..128,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 107..114,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 107..109,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
@@ -63,7 +63,7 @@ Module(
                                         Identifier {
                                             id: Name("x"),
                                             range: 113..114,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -72,7 +72,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 124..128,
                                     },
                                 ),
@@ -80,16 +80,16 @@ Module(
                         },
                         MatchCase {
                             range: 133..156,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchStar(
                                 PatternMatchStar {
+                                    node_index: NodeIndex(None),
                                     range: 138..142,
-                                    node_index: AtomicNodeIndex(..),
                                     name: Some(
                                         Identifier {
                                             id: Name("foo"),
                                             range: 139..142,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -98,7 +98,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 152..156,
                                     },
                                 ),
@@ -106,32 +106,32 @@ Module(
                         },
                         MatchCase {
                             range: 161..188,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 166..174,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 166..170,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("foo"),
                                                         range: 167..170,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 173..174,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 173..174,
                                                         value: Int(
                                                             1,
@@ -147,7 +147,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 184..188,
                                     },
                                 ),
@@ -155,19 +155,19 @@ Module(
                         },
                         MatchCase {
                             range: 193..220,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 198..206,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 198..199,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 198..199,
                                                         value: Int(
                                                             1,
@@ -178,13 +178,13 @@ Module(
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 202..206,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("foo"),
                                                         range: 203..206,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -196,7 +196,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 216..220,
                                     },
                                 ),
@@ -204,14 +204,14 @@ Module(
                         },
                         MatchCase {
                             range: 225..251,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 230..237,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 230..233,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -219,12 +219,12 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 233..237,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchStar(
                                                 PatternMatchStar {
+                                                    node_index: NodeIndex(None),
                                                     range: 234..236,
-                                                    node_index: AtomicNodeIndex(..),
                                                     name: None,
                                                 },
                                             ),
@@ -237,7 +237,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 247..251,
                                     },
                                 ),
@@ -245,14 +245,14 @@ Module(
                         },
                         MatchCase {
                             range: 256..284,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 261..270,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 261..264,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -260,21 +260,21 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 264..270,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 265..269,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 265..266,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchStar(
                                                     PatternMatchStar {
+                                                        node_index: NodeIndex(None),
                                                         range: 267..269,
-                                                        node_index: AtomicNodeIndex(..),
                                                         name: None,
                                                     },
                                                 ),
@@ -287,7 +287,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 280..284,
                                     },
                                 ),
@@ -295,19 +295,19 @@ Module(
                         },
                         MatchCase {
                             range: 289..312,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 294..298,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 295..297,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 296..297,
                                                         id: Name("_"),
                                                         ctx: Store,
@@ -320,11 +320,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 297..297,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 297..297,
                                                         id: Name(""),
                                                         ctx: Invalid,
@@ -340,7 +340,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 308..312,
                                     },
                                 ),
@@ -348,19 +348,19 @@ Module(
                         },
                         MatchCase {
                             range: 317..343,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 322..329,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 323..325,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 324..325,
                                                         id: Name("_"),
                                                         ctx: Store,
@@ -373,11 +373,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 327..328,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 327..328,
                                                         value: Int(
                                                             1,
@@ -394,7 +394,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 339..343,
                                     },
                                 ),
@@ -402,15 +402,15 @@ Module(
                         },
                         MatchCase {
                             range: 348..377,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 353..363,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 354..358,
                                             },
                                         ),
@@ -418,8 +418,8 @@ Module(
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 360..362,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
@@ -431,7 +431,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 373..377,
                                     },
                                 ),
@@ -439,18 +439,18 @@ Module(
                         },
                         MatchCase {
                             range: 382..407,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 387..393,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 387..393,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 387..388,
                                                     value: Int(
                                                         1,
@@ -460,11 +460,11 @@ Module(
                                             op: Add,
                                             right: Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 391..393,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 392..393,
                                                             id: Name("_"),
                                                             ctx: Store,
@@ -481,7 +481,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 403..407,
                                     },
                                 ),
@@ -613,3 +613,25 @@ Module(
    |              ^^ Syntax Error: Star pattern cannot be used here
 24 |         pass
    |
+
+
+## Semantic Syntax Errors
+
+   |
+ 7 |     case *foo:
+ 8 |         pass
+ 9 |     case *foo | 1:
+   |          ^^^^^^^^ Syntax Error: alternative patterns bind different names
+10 |         pass
+11 |     case 1 | *foo:
+   |
+
+
+   |
+ 9 |     case *foo | 1:
+10 |         pass
+11 |     case 1 | *foo:
+   |          ^^^^^^^^ Syntax Error: alternative patterns bind different names
+12 |         pass
+13 |     case Foo(*_):
+   |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap
index b0a9f945ab..2fcc8cad93 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/unary_a
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..269,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..268,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 80..87,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,19 +25,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 93..114,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 98..100,
-                                    node_index: AtomicNodeIndex(..),
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 98..100,
                                             op: UAdd,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 99..100,
                                                     value: Int(
                                                         1,
@@ -52,7 +52,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 110..114,
                                     },
                                 ),
@@ -60,19 +60,19 @@ Module(
                         },
                         MatchCase {
                             range: 119..149,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 124..135,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 124..125,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 124..125,
                                                         value: Int(
                                                             1,
@@ -83,16 +83,16 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 128..130,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 128..130,
                                                         op: UAdd,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 129..130,
                                                                 value: Int(
                                                                     2,
@@ -105,16 +105,16 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 133..135,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 133..135,
                                                         op: USub,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 134..135,
                                                                 value: Int(
                                                                     3,
@@ -132,7 +132,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 145..149,
                                     },
                                 ),
@@ -140,19 +140,19 @@ Module(
                         },
                         MatchCase {
                             range: 154..184,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 159..170,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 160..161,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 160..161,
                                                         value: Int(
                                                             1,
@@ -163,16 +163,16 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 163..165,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 163..165,
                                                         op: UAdd,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 164..165,
                                                                 value: Int(
                                                                     2,
@@ -185,16 +185,16 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 167..169,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 167..169,
                                                         op: USub,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 168..169,
                                                                 value: Int(
                                                                     3,
@@ -212,7 +212,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 180..184,
                                     },
                                 ),
@@ -220,14 +220,14 @@ Module(
                         },
                         MatchCase {
                             range: 189..223,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 194..209,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 194..197,
                                             id: Name("Foo"),
                                             ctx: Load,
@@ -235,29 +235,29 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 197..209,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 198..202,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 198..199,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 200..202,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: UnaryOp(
                                                             ExprUnaryOp {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 200..202,
                                                                 op: UAdd,
                                                                 operand: NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 201..202,
                                                                         value: Int(
                                                                             1,
@@ -271,24 +271,24 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 204..208,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("y"),
                                                     range: 204..205,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 206..208,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: UnaryOp(
                                                             ExprUnaryOp {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 206..208,
                                                                 op: USub,
                                                                 operand: NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 207..208,
                                                                         value: Int(
                                                                             2,
@@ -308,7 +308,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 219..223,
                                     },
                                 ),
@@ -316,22 +316,22 @@ Module(
                         },
                         MatchCase {
                             range: 228..268,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 233..254,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 234..238,
                                                 value: true,
                                             },
                                         ),
                                         BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 244..249,
                                                 value: false,
                                             },
@@ -340,16 +340,16 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 240..242,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 240..242,
                                                         op: UAdd,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 241..242,
                                                                 value: Int(
                                                                     1,
@@ -362,16 +362,16 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 251..253,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 251..253,
                                                         op: USub,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 252..253,
                                                                 value: Int(
                                                                     2,
@@ -390,7 +390,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 264..268,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap
index 3c07014614..9d872e920e 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap
@@ -7,26 +7,26 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/ambiguou
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..950,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 163..188,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 168..182,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 168..182,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 169..174,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -34,7 +34,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 176..181,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -51,11 +51,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 185..188,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 185..188,
                                     },
                                 ),
@@ -66,21 +66,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 189..219,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 194..208,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 194..208,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 195..200,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -88,7 +88,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 202..207,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -103,10 +103,10 @@ Module(
                         },
                         WithItem {
                             range: 213..214,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 213..214,
                                     id: Name("f"),
                                     ctx: Load,
@@ -118,11 +118,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 216..219,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 216..219,
                                     },
                                 ),
@@ -133,21 +133,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 220..252,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 225..239,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 225..239,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 226..231,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -155,7 +155,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 233..238,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -170,10 +170,10 @@ Module(
                         },
                         WithItem {
                             range: 241..246,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 241..246,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -185,11 +185,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 249..252,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 249..252,
                                     },
                                 ),
@@ -200,20 +200,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 253..270,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 258..265,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 259..264,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 260..264,
                                             id: Name("item"),
                                             ctx: Load,
@@ -228,11 +228,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 267..270,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 267..270,
                                     },
                                 ),
@@ -243,20 +243,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 271..293,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 276..288,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 277..282,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 278..282,
                                             id: Name("item"),
                                             ctx: Load,
@@ -268,7 +268,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 287..288,
                                         id: Name("f"),
                                         ctx: Store,
@@ -280,11 +280,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 290..293,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 290..293,
                                     },
                                 ),
@@ -295,20 +295,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 294..321,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 300..315,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 300..310,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 300..304,
                                             id: Name("item"),
                                             ctx: Store,
@@ -316,7 +316,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 308..310,
                                             value: Int(
                                                 10,
@@ -328,7 +328,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 314..315,
                                         id: Name("f"),
                                         ctx: Store,
@@ -340,11 +340,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 318..321,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 318..321,
                                     },
                                 ),
@@ -355,16 +355,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 322..357,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 328..333,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 328..333,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -374,14 +374,14 @@ Module(
                         },
                         WithItem {
                             range: 335..351,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 335..346,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 335..340,
                                             id: Name("item2"),
                                             ctx: Store,
@@ -389,7 +389,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 344..346,
                                             value: Int(
                                                 10,
@@ -401,7 +401,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 350..351,
                                         id: Name("f"),
                                         ctx: Store,
@@ -413,11 +413,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 354..357,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 354..357,
                                     },
                                 ),
@@ -428,20 +428,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 358..396,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 363..384,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 363..384,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 364..365,
                                             id: Name("x"),
                                             ctx: Load,
@@ -450,10 +450,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 366..384,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 370..371,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -461,11 +461,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 375..384,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 375..380,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -473,11 +473,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 380..384,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 381..383,
                                                                     value: Int(
                                                                         10,
@@ -500,10 +500,10 @@ Module(
                         },
                         WithItem {
                             range: 386..390,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 386..390,
                                     id: Name("item"),
                                     ctx: Load,
@@ -515,11 +515,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 393..396,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 393..396,
                                     },
                                 ),
@@ -530,21 +530,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 397..410,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 402..410,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 402..410,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 403..407,
                                                 id: Name("item"),
                                                 ctx: Load,
@@ -552,7 +552,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 409..410,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -571,12 +571,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 411..429,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 415..416,
                             id: Name("x"),
                             ctx: Store,
@@ -584,11 +584,11 @@ Module(
                     ),
                     iter: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 420..429,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 420..425,
                                     id: Name("range"),
                                     ctx: Load,
@@ -596,11 +596,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 425..429,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 426..428,
                                             value: Int(
                                                 10,
@@ -618,11 +618,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 432..435,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 432..435,
                         },
                     ),
@@ -630,20 +630,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 496..515,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 502..509,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 503..508,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 504..508,
                                             id: Name("item"),
                                             ctx: Load,
@@ -658,11 +658,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 512..515,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 512..515,
                                     },
                                 ),
@@ -673,24 +673,24 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 517..551,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 522..539,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 522..539,
                                     elt: Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 523..525,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 524..525,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -702,10 +702,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 526..539,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 530..531,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -713,7 +713,7 @@ Module(
                                             ),
                                             iter: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 535..539,
                                                     id: Name("iter"),
                                                     ctx: Load,
@@ -730,10 +730,10 @@ Module(
                         },
                         WithItem {
                             range: 541..545,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 541..545,
                                     id: Name("item"),
                                     ctx: Load,
@@ -745,11 +745,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 548..551,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 548..551,
                                     },
                                 ),
@@ -760,21 +760,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 552..567,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 557..567,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 557..567,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 558..563,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -782,11 +782,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 565..567,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 566..567,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -808,12 +808,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 568..588,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 572..573,
                             id: Name("x"),
                             ctx: Store,
@@ -821,12 +821,12 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 577..588,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 577..581,
                                         id: Name("iter"),
                                         ctx: Load,
@@ -834,7 +834,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 583..588,
                                         id: Name("item2"),
                                         ctx: Load,
@@ -851,11 +851,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 591..594,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 591..594,
                         },
                     ),
@@ -863,16 +863,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 595..617,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 601..607,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 601..602,
                                     id: Name("x"),
                                     ctx: Load,
@@ -881,7 +881,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 606..607,
                                         id: Name("f"),
                                         ctx: Store,
@@ -891,14 +891,14 @@ Module(
                         },
                         WithItem {
                             range: 609..611,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 609..611,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 610..611,
                                             id: Name("y"),
                                             ctx: Load,
@@ -913,11 +913,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 614..617,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 614..617,
                                     },
                                 ),
@@ -928,20 +928,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 618..640,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 624..626,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 624..626,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 625..626,
                                             id: Name("x"),
                                             ctx: Load,
@@ -954,10 +954,10 @@ Module(
                         },
                         WithItem {
                             range: 628..634,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 628..629,
                                     id: Name("y"),
                                     ctx: Load,
@@ -966,7 +966,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 633..634,
                                         id: Name("f"),
                                         ctx: Store,
@@ -978,11 +978,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 637..640,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 637..640,
                                     },
                                 ),
@@ -993,21 +993,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 641..663,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 646..658,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 646..658,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 647..648,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1015,12 +1015,12 @@ Module(
                                         ),
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 650..657,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 656..657,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -1040,11 +1040,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 660..663,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 660..663,
                                     },
                                 ),
@@ -1055,21 +1055,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 664..689,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 669..684,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 669..684,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 670..671,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1077,17 +1077,17 @@ Module(
                                         ),
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 673..683,
                                                 value: Some(
                                                     Tuple(
                                                         ExprTuple {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 679..683,
                                                             elts: [
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 679..680,
                                                                         id: Name("y"),
                                                                         ctx: Load,
@@ -1095,7 +1095,7 @@ Module(
                                                                 ),
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 682..683,
                                                                         id: Name("z"),
                                                                         ctx: Load,
@@ -1120,11 +1120,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 686..689,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 686..689,
                                     },
                                 ),
@@ -1135,21 +1135,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 690..717,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 695..712,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 695..712,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 696..697,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1157,11 +1157,11 @@ Module(
                                         ),
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 699..711,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 710..711,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1180,11 +1180,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 714..717,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 714..717,
                                     },
                                 ),
@@ -1195,16 +1195,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 718..734,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 724..730,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 724..725,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1213,7 +1213,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 729..730,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1223,10 +1223,10 @@ Module(
                         },
                         WithItem {
                             range: 732..733,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 732..733,
                                     id: Name("y"),
                                     ctx: Load,
@@ -1240,11 +1240,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 738..744,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 738..739,
                             id: Name("f"),
                             ctx: Store,
@@ -1252,7 +1252,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 741..744,
                         },
                     ),
@@ -1262,20 +1262,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 745..777,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 750..771,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 750..766,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 751..752,
                                             id: Name("x"),
                                             ctx: Load,
@@ -1284,10 +1284,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 753..766,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 757..758,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1295,7 +1295,7 @@ Module(
                                             ),
                                             iter: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 762..766,
                                                     id: Name("iter"),
                                                     ctx: Load,
@@ -1311,7 +1311,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 770..771,
                                         id: Name("y"),
                                         ctx: Store,
@@ -1323,11 +1323,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 774..777,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 774..777,
                                     },
                                 ),
@@ -1338,16 +1338,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 837..854,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 843..853,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 844..848,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1356,7 +1356,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 852..853,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1370,11 +1370,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 857..860,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 857..860,
                         },
                     ),
@@ -1382,16 +1382,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 862..878,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 868..877,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 868..872,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1400,7 +1400,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 876..877,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1414,11 +1414,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 880..886,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 880..881,
                             id: Name("x"),
                             ctx: Store,
@@ -1426,7 +1426,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 883..886,
                         },
                     ),
@@ -1436,16 +1436,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 887..904,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 893..903,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 893..897,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1454,7 +1454,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 901..903,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -1468,11 +1468,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 908..915,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 908..910,
                             id: Name("f2"),
                             ctx: Store,
@@ -1480,7 +1480,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 912..915,
                         },
                     ),
@@ -1490,16 +1490,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 916..950,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 922..932,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 922..927,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -1508,7 +1508,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 931..932,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1518,14 +1518,14 @@ Module(
                         },
                         WithItem {
                             range: 934..944,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 934..944,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 934..939,
                                             id: Name("item2"),
                                             ctx: Store,
@@ -1533,7 +1533,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 943..944,
                                             value: Int(
                                                 0,
@@ -1548,11 +1548,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 947..950,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 947..950,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap
index 1798ad6c23..6b0b38c2e3 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap
@@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/empty_wi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..105,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..98,
                     is_async: false,
                     items: [],
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 95..98,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 95..98,
                                     },
                                 ),
@@ -34,15 +34,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..105,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 100..105,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..101,
                                     id: Name("x"),
                                     ctx: Load,
@@ -51,7 +51,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 104..105,
                                     id: Name("y"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap
index 15bb2f058b..9c651474b8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/unclosed
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..14,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..6,
                                     id: Name(""),
                                     ctx: Invalid,
@@ -33,15 +33,15 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..14,
                                 value: BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..14,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 9..10,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -50,7 +50,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..14,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap
index ce5678ded9..317469f900 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/unclosed
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..6,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..6,
                                     id: Name(""),
                                     ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap
index c93979143a..7e2d808bc6 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/unparent
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..249,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..102,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 91..95,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 91..95,
                                     id: Name("item"),
                                     ctx: Load,
@@ -33,7 +33,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 98..102,
                             },
                         ),
@@ -42,16 +42,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..124,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 108..117,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 108..112,
                                     id: Name("item"),
                                     ctx: Load,
@@ -60,7 +60,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 116..117,
                                         id: Name("x"),
                                         ctx: Store,
@@ -72,7 +72,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 120..124,
                             },
                         ),
@@ -81,20 +81,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..141,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 130..135,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 130..135,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 131..135,
                                             id: Name("item"),
                                             ctx: Load,
@@ -109,7 +109,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 137..141,
                             },
                         ),
@@ -118,20 +118,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 142..163,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 147..157,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 147..152,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 148..152,
                                             id: Name("item"),
                                             ctx: Load,
@@ -143,7 +143,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 156..157,
                                         id: Name("x"),
                                         ctx: Store,
@@ -155,7 +155,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 159..163,
                             },
                         ),
@@ -164,20 +164,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 164..193,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 169..175,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 169..175,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 170..175,
                                             id: Name("item1"),
                                             ctx: Load,
@@ -190,10 +190,10 @@ Module(
                         },
                         WithItem {
                             range: 177..187,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 177..182,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -202,7 +202,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 186..187,
                                         id: Name("f"),
                                         ctx: Store,
@@ -214,7 +214,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 189..193,
                             },
                         ),
@@ -223,16 +223,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 194..223,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 199..209,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 199..204,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -241,7 +241,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 208..209,
                                         id: Name("f"),
                                         ctx: Store,
@@ -251,14 +251,14 @@ Module(
                         },
                         WithItem {
                             range: 211..217,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Starred(
                                 ExprStarred {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 211..217,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 212..217,
                                             id: Name("item2"),
                                             ctx: Load,
@@ -273,7 +273,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 219..223,
                             },
                         ),
@@ -282,16 +282,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 224..249,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 229..233,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 229..233,
                                     id: Name("item"),
                                     ctx: Load,
@@ -301,10 +301,10 @@ Module(
                         },
                         WithItem {
                             range: 237..243,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 237..238,
                                     value: Int(
                                         0,
@@ -314,7 +314,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 242..243,
                                         id: Name("f"),
                                         ctx: Store,
@@ -326,7 +326,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 245..249,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap
index 6fade07f51..de21eac870 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap
@@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_empty_expres
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..58,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..49,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..49,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..49,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..48,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..47,
                                                             id: Name(""),
                                                             ctx: Invalid,
@@ -46,6 +46,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -56,25 +57,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 50..57,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..57,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 50..57,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 52..56,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 53..53,
                                                             id: Name(""),
                                                             ctx: Invalid,
@@ -90,6 +91,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap
index 4666c540d1..b1b3890a11 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap
@@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_invalid_conv
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..52,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..52,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..51,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..48,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -46,6 +46,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap
index def26a3f18..ef9242f4f8 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap
@@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_invalid_conv
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..66,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..54,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..54,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..54,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..53,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..48,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -46,6 +46,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -56,25 +57,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..65,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 55..65,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 55..65,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 57..64,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 58..59,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -90,6 +91,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap
index ea5934128b..d906c8c837 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap
@@ -7,34 +7,34 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_invalid_star
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..156,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..127,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 121..127,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 121..127,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 123..126,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Starred(
                                                         ExprStarred {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 124..125,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 125..125,
                                                                     id: Name(""),
                                                                     ctx: Invalid,
@@ -53,6 +53,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -63,35 +64,35 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 128..141,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 128..141,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 128..141,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 130..140,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Starred(
                                                         ExprStarred {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 131..139,
                                                             value: BoolOp(
                                                                 ExprBoolOp {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 132..139,
                                                                     op: And,
                                                                     values: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 132..133,
                                                                                 id: Name("x"),
                                                                                 ctx: Load,
@@ -99,7 +100,7 @@ Module(
                                                                         ),
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 138..139,
                                                                                 id: Name("y"),
                                                                                 ctx: Load,
@@ -121,6 +122,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -131,34 +133,34 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 142..155,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 142..155,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 142..155,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 144..154,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Starred(
                                                         ExprStarred {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 145..153,
                                                             value: Yield(
                                                                 ExprYield {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 146..153,
                                                                     value: Some(
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 152..153,
                                                                                 id: Name("x"),
                                                                                 ctx: Load,
@@ -180,6 +182,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap
index ceeb8540da..0d23f0c0d2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap
@@ -7,49 +7,47 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_lambda_witho
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..61,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..60,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..60,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..60,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..56,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Lambda(
                                                         ExprLambda {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..56,
                                                             parameters: Some(
                                                                 Parameters {
                                                                     range: 54..55,
-                                                                    node_index: AtomicNodeIndex(
-                                                                        0,
-                                                                    ),
+                                                                    node_index: NodeIndex(None),
                                                                     posonlyargs: [],
                                                                     args: [
                                                                         ParameterWithDefault {
                                                                             range: 54..55,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             parameter: Parameter {
                                                                                 range: 54..55,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 name: Identifier {
                                                                                     id: Name("x"),
                                                                                     range: 54..55,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                 },
                                                                                 annotation: None,
                                                                             },
@@ -63,7 +61,7 @@ Module(
                                                             ),
                                                             body: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 56..56,
                                                                     id: Name(""),
                                                                     ctx: Invalid,
@@ -79,7 +77,7 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 56..58,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " x",
                                                 },
                                             ),
@@ -88,6 +86,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap
index 3078488a98..4ff0a7d78f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap
@@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_unclosed_lbr
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..82,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..48,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..48,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..48,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..47,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..47,
                                                             id: Name(""),
                                                             ctx: Invalid,
@@ -46,6 +46,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -56,32 +57,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..58,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..58,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 49..58,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
-                                                    range: 51..58,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    range: 51..57,
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 52..55,
                                                             id: Name("foo"),
                                                             ctx: Load,
                                                         },
                                                     ),
                                                     debug_text: None,
-                                                    conversion: None,
+                                                    conversion: Repr,
                                                     format_spec: None,
                                                 },
                                             ),
@@ -90,6 +91,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -100,25 +102,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..67,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..67,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 59..67,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 61..66,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 62..65,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -139,6 +141,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -149,72 +152,88 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
-                    range: 68..81,
+                    node_index: NodeIndex(None),
+                    range: 68..72,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
-                            range: 68..81,
+                            node_index: NodeIndex(None),
+                            range: 68..72,
                             value: TStringValue {
-                                inner: Concatenated(
-                                    [
-                                        TString {
-                                            range: 68..72,
-                                            node_index: AtomicNodeIndex(..),
-                                            elements: [
-                                                Interpolation(
-                                                    InterpolatedElement {
-                                                        range: 70..71,
-                                                        node_index: AtomicNodeIndex(..),
-                                                        expression: Name(
-                                                            ExprName {
-                                                                node_index: AtomicNodeIndex(..),
-                                                                range: 71..71,
-                                                                id: Name(""),
-                                                                ctx: Invalid,
-                                                            },
-                                                        ),
-                                                        debug_text: None,
-                                                        conversion: None,
-                                                        format_spec: None,
-                                                    },
-                                                ),
-                                            ],
-                                            flags: TStringFlags {
-                                                quote_style: Double,
-                                                prefix: Regular,
-                                                triple_quoted: false,
-                                            },
+                                inner: Single(
+                                    TString {
+                                        range: 68..72,
+                                        node_index: NodeIndex(None),
+                                        elements: [
+                                            Interpolation(
+                                                InterpolatedElement {
+                                                    range: 70..71,
+                                                    node_index: NodeIndex(None),
+                                                    expression: Name(
+                                                        ExprName {
+                                                            node_index: NodeIndex(None),
+                                                            range: 71..71,
+                                                            id: Name(""),
+                                                            ctx: Invalid,
+                                                        },
+                                                    ),
+                                                    debug_text: None,
+                                                    conversion: None,
+                                                    format_spec: None,
+                                                },
+                                            ),
+                                        ],
+                                        flags: TStringFlags {
+                                            quote_style: Double,
+                                            prefix: Regular,
+                                            triple_quoted: false,
+                                            unclosed: false,
                                         },
-                                        TString {
-                                            range: 73..81,
-                                            node_index: AtomicNodeIndex(..),
-                                            elements: [
-                                                Interpolation(
-                                                    InterpolatedElement {
-                                                        range: 77..78,
-                                                        node_index: AtomicNodeIndex(..),
-                                                        expression: Name(
-                                                            ExprName {
-                                                                node_index: AtomicNodeIndex(..),
-                                                                range: 78..78,
-                                                                id: Name(""),
-                                                                ctx: Invalid,
-                                                            },
-                                                        ),
-                                                        debug_text: None,
-                                                        conversion: None,
-                                                        format_spec: None,
-                                                    },
-                                                ),
-                                            ],
-                                            flags: TStringFlags {
-                                                quote_style: Double,
-                                                prefix: Regular,
-                                                triple_quoted: true,
-                                            },
+                                    },
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 73..81,
+                    value: TString(
+                        ExprTString {
+                            node_index: NodeIndex(None),
+                            range: 73..81,
+                            value: TStringValue {
+                                inner: Single(
+                                    TString {
+                                        range: 73..81,
+                                        node_index: NodeIndex(None),
+                                        elements: [
+                                            Interpolation(
+                                                InterpolatedElement {
+                                                    range: 77..78,
+                                                    node_index: NodeIndex(None),
+                                                    expression: Name(
+                                                        ExprName {
+                                                            node_index: NodeIndex(None),
+                                                            range: 78..78,
+                                                            id: Name(""),
+                                                            ctx: Invalid,
+                                                        },
+                                                    ),
+                                                    debug_text: None,
+                                                    conversion: None,
+                                                    format_spec: None,
+                                                },
+                                            ),
+                                        ],
+                                        flags: TStringFlags {
+                                            quote_style: Double,
+                                            prefix: Regular,
+                                            triple_quoted: true,
+                                            unclosed: false,
                                         },
-                                    ],
+                                    },
                                 ),
                             },
                         },
@@ -230,25 +249,7 @@ Module(
   |
 1 | # parse_options: {"target-version": "3.14"}
 2 | t"{"
-  |    ^ Syntax Error: missing closing quote in string literal
-3 | t"{foo!r"
-4 | t"{foo="
-  |
-
-
-  |
-1 | # parse_options: {"target-version": "3.14"}
-2 | t"{"
-  |     ^ Syntax Error: t-string: unterminated string
-3 | t"{foo!r"
-4 | t"{foo="
-  |
-
-
-  |
-1 | # parse_options: {"target-version": "3.14"}
-2 | t"{"
-  |     ^ Syntax Error: t-string: unterminated string
+  |    ^ Syntax Error: Expected an expression
 3 | t"{foo!r"
 4 | t"{foo="
   |
@@ -258,27 +259,7 @@ Module(
 1 | # parse_options: {"target-version": "3.14"}
 2 | t"{"
 3 | t"{foo!r"
-  |        ^^ Syntax Error: missing closing quote in string literal
-4 | t"{foo="
-5 | t"{"
-  |
-
-
-  |
-1 | # parse_options: {"target-version": "3.14"}
-2 | t"{"
-3 | t"{foo!r"
-  |          ^ Syntax Error: t-string: unterminated string
-4 | t"{foo="
-5 | t"{"
-  |
-
-
-  |
-1 | # parse_options: {"target-version": "3.14"}
-2 | t"{"
-3 | t"{foo!r"
-  |          ^ Syntax Error: t-string: unterminated string
+  |         ^ Syntax Error: t-string: expecting '}'
 4 | t"{foo="
 5 | t"{"
   |
@@ -288,47 +269,7 @@ Module(
 2 | t"{"
 3 | t"{foo!r"
 4 | t"{foo="
-  | ^^ Syntax Error: t-string: expecting '}'
-5 | t"{"
-6 | t"""{"""
-  |
-
-
-  |
-1 | # parse_options: {"target-version": "3.14"}
-2 | t"{"
-3 | t"{foo!r"
-  |          ^ Syntax Error: Expected TStringEnd, found Unknown
-4 | t"{foo="
-5 | t"{"
-  |
-
-
-  |
-2 | t"{"
-3 | t"{foo!r"
-4 | t"{foo="
-  |        ^ Syntax Error: missing closing quote in string literal
-5 | t"{"
-6 | t"""{"""
-  |
-
-
-  |
-2 | t"{"
-3 | t"{foo!r"
-4 | t"{foo="
-  |         ^ Syntax Error: t-string: unterminated string
-5 | t"{"
-6 | t"""{"""
-  |
-
-
-  |
-2 | t"{"
-3 | t"{foo!r"
-4 | t"{foo="
-  |         ^ Syntax Error: t-string: unterminated string
+  |        ^ Syntax Error: t-string: expecting '}'
 5 | t"{"
 6 | t"""{"""
   |
@@ -338,36 +279,14 @@ Module(
 3 | t"{foo!r"
 4 | t"{foo="
 5 | t"{"
-  |    ^ Syntax Error: missing closing quote in string literal
+  |    ^ Syntax Error: Expected an expression
 6 | t"""{"""
   |
 
 
-  |
-4 | t"{foo="
-5 | t"{"
-6 | t"""{"""
-  | ^^^^ Syntax Error: Expected TStringEnd, found TStringStart
-  |
-
-
   |
 4 | t"{foo="
 5 | t"{"
 6 | t"""{"""
   |      ^^^ Syntax Error: Expected an expression
   |
-
-
-  |
-5 | t"{"
-6 | t"""{"""
-  |         ^ Syntax Error: unexpected EOF while parsing
-  |
-
-
-  |
-5 | t"{"
-6 | t"""{"""
-  |         ^ Syntax Error: t-string: unterminated string
-  |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap
index 0a7f827af2..bc20f6172c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap
@@ -7,37 +7,37 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_unclosed_lbr
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..73,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..56,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..56,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..56,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 46..52,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "hello ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 52..55,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 53..54,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -48,7 +48,7 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 55..55,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [],
                                                         },
                                                     ),
@@ -59,6 +59,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -69,32 +70,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..72,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..72,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 57..72,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 59..65,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "hello ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 65..71,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 66..67,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -105,12 +106,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 68..71,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 68..71,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ".3f",
                                                                     },
                                                                 ),
@@ -124,6 +125,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap
index 8767d279bf..1eed668827 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap
@@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/template_strings_py31
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..89,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..52,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..52,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..51,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..50,
                                                             id: Name("hey"),
                                                             ctx: Load,
@@ -46,6 +46,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -56,25 +57,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..63,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..63,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 53..63,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 55..62,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 56..61,
                                                             id: Name("there"),
                                                             ctx: Load,
@@ -90,6 +91,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -100,22 +102,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..88,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 64..88,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 64..88,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 68..85,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "what's\nhappening?",
                                                 },
                                             ),
@@ -124,6 +126,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap
index 81e4bacde6..0bcf4355aa 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_invalid_orde
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..47,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..31,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -27,7 +27,7 @@ Module(
                     finalbody: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 27..31,
                             },
                         ),
@@ -37,7 +37,7 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..46,
                 },
             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap
index b86a2ad5bf..cdba080314 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_missing_exce
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..43,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -30,12 +30,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..42,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..27,
                             },
                         ),
@@ -44,7 +44,7 @@ Module(
                     orelse: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..42,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap
index 2bb1a1e828..1803efb100 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_misspelled_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..165,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -30,11 +30,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..20,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..19,
                             id: Name("exept"),
                             ctx: Store,
@@ -42,7 +42,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..20,
                             id: Name(""),
                             ctx: Invalid,
@@ -54,24 +54,24 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..58,
                 },
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..76,
                 },
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 77..82,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 77..78,
                                 id: Name("a"),
                                 ctx: Store,
@@ -80,7 +80,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 81..82,
                             value: Int(
                                 1,
@@ -91,12 +91,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..113,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 92..96,
                             },
                         ),
@@ -105,13 +105,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 97..113,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 109..113,
                                         },
                                     ),
@@ -126,11 +126,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 114..120,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 114..119,
                             id: Name("exept"),
                             ctx: Store,
@@ -138,7 +138,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..120,
                             id: Name(""),
                             ctx: Invalid,
@@ -150,18 +150,18 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 154..158,
                 },
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 159..164,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 159..160,
                                 id: Name("b"),
                                 ctx: Store,
@@ -170,7 +170,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 163..164,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap
index 689c42622e..98f032e8c9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_mixed_except
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..242,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..63,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -26,13 +26,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 14..30,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 26..30,
                                         },
                                     ),
@@ -42,11 +42,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 31..63,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..53,
                                             id: Name("ExceptionGroup"),
                                             ctx: Load,
@@ -57,7 +57,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..63,
                                         },
                                     ),
@@ -72,12 +72,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..127,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 73..77,
                             },
                         ),
@@ -86,11 +86,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 78..110,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 86..100,
                                             id: Name("ExceptionGroup"),
                                             ctx: Load,
@@ -101,7 +101,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 106..110,
                                         },
                                     ),
@@ -111,13 +111,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 111..127,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 123..127,
                                         },
                                     ),
@@ -132,12 +132,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 128..241,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 137..141,
                             },
                         ),
@@ -146,13 +146,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 142..158,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 154..158,
                                         },
                                     ),
@@ -162,13 +162,13 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 159..175,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 171..175,
                                         },
                                     ),
@@ -178,11 +178,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 176..208,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 184..198,
                                             id: Name("ExceptionGroup"),
                                             ctx: Load,
@@ -193,7 +193,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 204..208,
                                         },
                                     ),
@@ -203,11 +203,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 209..241,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 217..231,
                                             id: Name("ExceptionGroup"),
                                             ctx: Load,
@@ -218,7 +218,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 237..241,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap
index b0c18e8a43..be7cb746f5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/tuple_context_manager
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
-        range: 0..327,
+        node_index: NodeIndex(None),
+        range: 0..289,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 216..236,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 222..225,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 222..225,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -31,10 +31,10 @@ Module(
                         },
                         WithItem {
                             range: 227..230,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 227..230,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -46,11 +46,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 233..236,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 233..236,
                                     },
                                 ),
@@ -61,95 +61,17 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
-                    range: 237..274,
+                    node_index: NodeIndex(None),
+                    range: 237..271,
                     is_async: false,
                     items: [
                         WithItem {
-                            range: 242..269,
-                            node_index: AtomicNodeIndex(..),
-                            context_expr: Call(
-                                ExprCall {
-                                    node_index: AtomicNodeIndex(..),
-                                    range: 246..261,
-                                    func: Name(
-                                        ExprName {
-                                            node_index: AtomicNodeIndex(..),
-                                            range: 246..250,
-                                            id: Name("open"),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                    arguments: Arguments {
-                                        range: 250..261,
-                                        node_index: AtomicNodeIndex(..),
-                                        args: [
-                                            StringLiteral(
-                                                ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
-                                                    range: 251..260,
-                                                    value: StringLiteralValue {
-                                                        inner: Single(
-                                                            StringLiteral {
-                                                                range: 251..260,
-                                                                node_index: AtomicNodeIndex(..),
-                                                                value: "foo.txt",
-                                                                flags: StringLiteralFlags {
-                                                                    quote_style: Single,
-                                                                    prefix: Empty,
-                                                                    triple_quoted: false,
-                                                                },
-                                                            },
-                                                        ),
-                                                    },
-                                                },
-                                            ),
-                                        ],
-                                        keywords: [],
-                                    },
-                                },
-                            ),
-                            optional_vars: Some(
-                                Name(
-                                    ExprName {
-                                        node_index: AtomicNodeIndex(..),
-                                        range: 266..269,
-                                        id: Name("foo"),
-                                        ctx: Store,
-                                    },
-                                ),
-                            ),
-                        },
-                    ],
-                    body: [
-                        Expr(
-                            StmtExpr {
-                                node_index: AtomicNodeIndex(..),
-                                range: 271..274,
-                                value: EllipsisLiteral(
-                                    ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
-                                        range: 271..274,
-                                    },
-                                ),
-                            },
-                        ),
-                    ],
-                },
-            ),
-            With(
-                StmtWith {
-                    node_index: AtomicNodeIndex(..),
-                    range: 275..309,
-                    is_async: false,
-                    items: [
-                        WithItem {
-                            range: 284..287,
-                            node_index: AtomicNodeIndex(..),
+                            range: 246..249,
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
-                                    range: 284..287,
+                                    node_index: NodeIndex(None),
+                                    range: 246..249,
                                     id: Name("foo"),
                                     ctx: Load,
                                 },
@@ -157,12 +79,12 @@ Module(
                             optional_vars: None,
                         },
                         WithItem {
-                            range: 291..294,
-                            node_index: AtomicNodeIndex(..),
+                            range: 253..256,
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
-                                    range: 291..294,
+                                    node_index: NodeIndex(None),
+                                    range: 253..256,
                                     id: Name("bar"),
                                     ctx: Load,
                                 },
@@ -170,12 +92,12 @@ Module(
                             optional_vars: None,
                         },
                         WithItem {
-                            range: 298..301,
-                            node_index: AtomicNodeIndex(..),
+                            range: 260..263,
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
-                                    range: 298..301,
+                                    node_index: NodeIndex(None),
+                                    range: 260..263,
                                     id: Name("baz"),
                                     ctx: Load,
                                 },
@@ -186,12 +108,12 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
-                                range: 306..309,
+                                node_index: NodeIndex(None),
+                                range: 268..271,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
-                                        range: 306..309,
+                                        node_index: NodeIndex(None),
+                                        range: 268..271,
                                     },
                                 ),
                             },
@@ -201,17 +123,17 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
-                    range: 310..326,
+                    node_index: NodeIndex(None),
+                    range: 272..288,
                     is_async: false,
                     items: [
                         WithItem {
-                            range: 316..319,
-                            node_index: AtomicNodeIndex(..),
+                            range: 278..281,
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
-                                    range: 316..319,
+                                    node_index: NodeIndex(None),
+                                    range: 278..281,
                                     id: Name("foo"),
                                     ctx: Load,
                                 },
@@ -222,12 +144,12 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
-                                range: 323..326,
+                                node_index: NodeIndex(None),
+                                range: 285..288,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
-                                        range: 323..326,
+                                        node_index: NodeIndex(None),
+                                        range: 285..288,
                                     },
                                 ),
                             },
@@ -247,23 +169,23 @@ Module(
 5 | with (foo, bar): ...
   |      ^ Syntax Error: Cannot use parentheses within a `with` statement on Python 3.8 (syntax was added in Python 3.9)
 6 | with (
-7 |   open('foo.txt')) as foo: ...
+7 |   foo,
+  |
+
+
+  |
+4 | # anyway
+5 | with (foo, bar): ...
+6 | with (
+  |      ^ Syntax Error: Cannot use parentheses within a `with` statement on Python 3.8 (syntax was added in Python 3.9)
+7 |   foo,
+8 |   bar,
   |
 
 
    |
- 6 | with (
- 7 |   open('foo.txt')) as foo: ...
- 8 | with (
-   |      ^ Syntax Error: Cannot use parentheses within a `with` statement on Python 3.8 (syntax was added in Python 3.9)
- 9 |   foo,
-10 |   bar,
-   |
-
-
-   |
-11 |   baz,
-12 | ): ...
-13 | with (foo,): ...
+ 9 |   baz,
+10 | ): ...
+11 | with (foo,): ...
    |      ^ Syntax Error: Cannot use parentheses within a `with` statement on Python 3.8 (syntax was added in Python 3.9)
    |
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap
index 96e430a647..b035de8a7f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_alias_incomplete
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..21,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..4,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..4,
                             id: Name("type"),
                             ctx: Load,
@@ -26,11 +26,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5..9,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..9,
                             id: Name("type"),
                             ctx: Load,
@@ -40,11 +40,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..11,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..11,
                             id: Name("x"),
                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..20,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..18,
                             id: Name("x"),
                             ctx: Store,
@@ -67,7 +67,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..20,
                             id: Name(""),
                             ctx: Invalid,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap
index a7f11501f6..57d354e2fd 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_alias_invalid_va
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..67,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("x"),
                             ctx: Store,
@@ -25,11 +25,11 @@ Module(
                     type_params: None,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..11,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     id: Name("y"),
                                     ctx: Load,
@@ -42,11 +42,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..28,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..18,
                             id: Name("x"),
                             ctx: Store,
@@ -55,12 +55,12 @@ Module(
                     type_params: None,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..28,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..28,
                                         id: Name("y"),
                                         ctx: Load,
@@ -73,11 +73,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..50,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..35,
                             id: Name("x"),
                             ctx: Store,
@@ -86,11 +86,11 @@ Module(
                     type_params: None,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..50,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..50,
                                     id: Name("y"),
                                     ctx: Load,
@@ -102,11 +102,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 51..61,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..57,
                             id: Name("x"),
                             ctx: Store,
@@ -115,7 +115,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..61,
                             id: Name("x"),
                             ctx: Load,
@@ -125,11 +125,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..66,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..66,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap
index c9de513d8a..996be97aa4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_default_py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..149,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..65,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..50,
                             id: Name("X"),
                             ctx: Store,
@@ -25,22 +25,22 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 50..59,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 51..58,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 51..52,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 55..58,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -54,7 +54,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..65,
                             id: Name("int"),
                             ctx: Load,
@@ -64,34 +64,34 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..87,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 70..71,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 71..80,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 72..79,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 72..73,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 76..79,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -105,9 +105,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 80..82,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -118,11 +116,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 84..87,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..87,
                                     },
                                 ),
@@ -133,33 +131,33 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..111,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("C"),
                         range: 94..95,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 95..104,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 96..103,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 96..97,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 100..103,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -174,7 +172,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 104..106,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -182,11 +180,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 108..111,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 108..111,
                                     },
                                 ),
@@ -197,27 +195,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 112..148,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("D"),
                         range: 118..119,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 119..141,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 120..121,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("S"),
                                             range: 120..121,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -225,18 +223,18 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 123..130,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 123..124,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 127..130,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -247,18 +245,18 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 132..140,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 132..133,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 136..140,
                                                     id: Name("uint"),
                                                     ctx: Load,
@@ -273,7 +271,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 141..143,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -281,11 +279,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 145..148,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 145..148,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap
index ce4ecda18c..321704cd05 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_invalid_bo
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..103,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..21,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,25 +25,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 7..14,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 10..14,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 11..14,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -61,7 +61,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..21,
                             id: Name("int"),
                             ctx: Load,
@@ -71,11 +71,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..46,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..28,
                             id: Name("X"),
                             ctx: Store,
@@ -84,26 +84,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 28..40,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 29..39,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 29..30,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 32..39,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 38..39,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -121,7 +121,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..46,
                             id: Name("int"),
                             ctx: Load,
@@ -131,11 +131,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..76,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..53,
                             id: Name("X"),
                             ctx: Store,
@@ -144,25 +144,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 53..70,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 54..69,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 54..55,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             YieldFrom(
                                                 ExprYieldFrom {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 57..69,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 68..69,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -179,7 +179,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..76,
                             id: Name("int"),
                             ctx: Load,
@@ -189,11 +189,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 77..102,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..83,
                             id: Name("X"),
                             ctx: Store,
@@ -202,21 +202,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 83..96,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 84..88,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 84..85,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 87..88,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -228,12 +228,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 92..95,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("int"),
                                             range: 92..95,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -244,7 +244,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 99..102,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap
index 84551e10b6..d029828b20 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_missing_bo
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..41,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 7..9,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -45,7 +45,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..17,
                             id: Name("int"),
                             ctx: Load,
@@ -55,11 +55,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..40,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             id: Name("X"),
                             ctx: Store,
@@ -68,16 +68,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 24..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T1"),
                                             range: 25..27,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -85,12 +85,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 31..33,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T2"),
                                             range: 31..33,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -101,7 +101,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..40,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap
index 7b4e3d833c..de9da4848d 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_param_spec
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..23,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..10,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 7..10,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 9..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -44,7 +44,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..10,
                             id: Name(""),
                             ctx: Invalid,
@@ -54,11 +54,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..15,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..15,
                             id: Name("int"),
                             ctx: Load,
@@ -68,11 +68,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..22,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..22,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap
index 6cde8b6197..dad7c709de 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_param_spec
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..140,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,25 +25,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..18,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 7..17,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 9..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 13..17,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 14..17,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -60,7 +60,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..24,
                             id: Name("int"),
                             ctx: Load,
@@ -70,11 +70,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..52,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..31,
                             id: Name("X"),
                             ctx: Store,
@@ -83,26 +83,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 31..46,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 32..45,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 34..35,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 38..45,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 44..45,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -119,7 +119,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..52,
                             id: Name("int"),
                             ctx: Load,
@@ -129,11 +129,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..85,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..59,
                             id: Name("X"),
                             ctx: Store,
@@ -142,25 +142,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 59..79,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 60..78,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 62..63,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             YieldFrom(
                                                 ExprYieldFrom {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 66..78,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 77..78,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -176,7 +176,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..85,
                             id: Name("int"),
                             ctx: Load,
@@ -186,11 +186,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..114,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 91..92,
                             id: Name("X"),
                             ctx: Store,
@@ -199,21 +199,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 92..108,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 93..100,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 95..96,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 99..100,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -224,12 +224,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 104..107,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("int"),
                                             range: 104..107,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -240,7 +240,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 111..114,
                             id: Name("int"),
                             ctx: Load,
@@ -250,11 +250,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 115..139,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..121,
                             id: Name("X"),
                             ctx: Store,
@@ -263,25 +263,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 121..133,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 122..132,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 124..125,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 128..132,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 129..132,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -298,7 +298,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..139,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap
index ce7099a5e3..1036d8c59a 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_param_spec
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..44,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..13,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 7..12,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 9..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -44,7 +44,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..19,
                             id: Name("int"),
                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..43,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 25..26,
                             id: Name("X"),
                             ctx: Store,
@@ -67,28 +67,28 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 26..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 27..32,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 29..30,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 34..36,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T2"),
                                             range: 34..36,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -99,7 +99,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..43,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap
index 17ce8c72fd..2831009c20 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_i
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..163,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,26 +25,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..16,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 7..15,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 11..15,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 12..15,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -61,7 +61,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..22,
                             id: Name("int"),
                             ctx: Load,
@@ -71,11 +71,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..48,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..29,
                             id: Name("X"),
                             ctx: Store,
@@ -84,27 +84,27 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 29..42,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 30..41,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 30..31,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 34..41,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 40..41,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -121,7 +121,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 45..48,
                             id: Name("int"),
                             ctx: Load,
@@ -131,11 +131,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..76,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 54..55,
                             id: Name("X"),
                             ctx: Store,
@@ -144,27 +144,27 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 55..70,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 56..69,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 56..57,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 61..68,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 67..68,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -181,7 +181,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..76,
                             id: Name("int"),
                             ctx: Load,
@@ -191,11 +191,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 77..107,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..83,
                             id: Name("X"),
                             ctx: Store,
@@ -204,26 +204,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 83..101,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 84..100,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 84..85,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             YieldFrom(
                                                 ExprYieldFrom {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 88..100,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 99..100,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -239,7 +239,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 104..107,
                             id: Name("int"),
                             ctx: Load,
@@ -249,11 +249,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 108..134,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 113..114,
                             id: Name("X"),
                             ctx: Store,
@@ -262,22 +262,22 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 114..128,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 115..120,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 115..116,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 119..120,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -288,12 +288,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 124..127,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("int"),
                                             range: 124..127,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -304,7 +304,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 131..134,
                             id: Name("int"),
                             ctx: Load,
@@ -314,11 +314,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 135..162,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 140..141,
                             id: Name("X"),
                             ctx: Store,
@@ -327,21 +327,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 141..156,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 142..155,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 142..143,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 145..148,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -351,11 +351,11 @@ Module(
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 151..155,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 152..155,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -372,7 +372,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 159..162,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap
index 5ad35632e6..55290b5e18 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_m
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..64,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 7..10,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -45,7 +45,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..17,
                             id: Name("int"),
                             ctx: Load,
@@ -55,11 +55,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..40,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             id: Name("X"),
                             ctx: Store,
@@ -68,21 +68,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 24..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 25..33,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 25..26,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 28..31,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -97,7 +97,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..40,
                             id: Name("int"),
                             ctx: Load,
@@ -107,11 +107,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..63,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..47,
                             id: Name("X"),
                             ctx: Store,
@@ -120,16 +120,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 47..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 48..52,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T1"),
                                             range: 48..50,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -137,12 +137,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 54..56,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T2"),
                                             range: 54..56,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -153,7 +153,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..63,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap
index 3ffc891d81..e1693e1722 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..22,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..9,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 7..9,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 8..9,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -44,7 +44,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..9,
                             id: Name(""),
                             ctx: Invalid,
@@ -54,11 +54,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..14,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..14,
                             id: Name("int"),
                             ctx: Load,
@@ -68,11 +68,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..21,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..21,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap
index c6ab71d84f..9b2d1c6de9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..147,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,25 +25,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..18,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 7..17,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 8..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 13..17,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 14..17,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -60,7 +60,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..24,
                             id: Name("int"),
                             ctx: Load,
@@ -70,11 +70,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..56,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..31,
                             id: Name("X"),
                             ctx: Store,
@@ -83,31 +83,31 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 31..50,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 32..49,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 33..35,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 38..49,
                                                     value: BoolOp(
                                                         ExprBoolOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 39..49,
                                                             op: Or,
                                                             values: [
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 39..42,
                                                                         id: Name("int"),
                                                                         ctx: Load,
@@ -115,7 +115,7 @@ Module(
                                                                 ),
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 46..49,
                                                                         id: Name("str"),
                                                                         ctx: Load,
@@ -135,7 +135,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..56,
                             id: Name("int"),
                             ctx: Load,
@@ -145,11 +145,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..84,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..63,
                             id: Name("X"),
                             ctx: Store,
@@ -158,26 +158,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 63..78,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 64..77,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 65..67,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 70..77,
                                                     value: Some(
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 76..77,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -194,7 +194,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 81..84,
                             id: Name("int"),
                             ctx: Load,
@@ -204,11 +204,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..117,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..91,
                             id: Name("X"),
                             ctx: Store,
@@ -217,25 +217,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 91..111,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 92..110,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 93..95,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             YieldFrom(
                                                 ExprYieldFrom {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 98..110,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 109..110,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -251,7 +251,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 114..117,
                             id: Name("int"),
                             ctx: Load,
@@ -261,11 +261,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..146,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 123..124,
                             id: Name("X"),
                             ctx: Store,
@@ -274,21 +274,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 124..140,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 125..132,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 126..128,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 131..132,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -299,12 +299,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 136..139,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("int"),
                                             range: 136..139,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -315,7 +315,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 143..146,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap
index b7e862a105..313733b6e5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_t
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..44,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..13,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 7..12,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 8..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -44,7 +44,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..19,
                             id: Name("int"),
                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..43,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 25..26,
                             id: Name("X"),
                             ctx: Store,
@@ -67,28 +67,28 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 26..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 27..32,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 28..30,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 34..36,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T2"),
                                             range: 34..36,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -99,7 +99,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..43,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap
index fd3e6b168f..967dce60f4 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap
@@ -7,32 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_params_empty.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..52,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..21,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 7..9,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [],
                         },
                     ),
                     parameters: Parameters {
                         range: 9..11,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -43,7 +41,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..21,
                             },
                         ),
@@ -52,11 +50,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..51,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..36,
                             id: Name("ListOrSet"),
                             ctx: Store,
@@ -65,17 +63,17 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 36..38,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [],
                         },
                     ),
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..51,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..45,
                                     id: Name("list"),
                                     ctx: Load,
@@ -84,7 +82,7 @@ Module(
                             op: BitOr,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..51,
                                     id: Name("set"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap
index df2f28b34d..05bad9f457 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_stmt_py311.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..56,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..50,
                             id: Name("x"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..56,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap
index cbeb13482f..15c59e5cca 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/unparenthesized_named
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..52,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..52,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..46,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             slice: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..51,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 47..48,
                                             id: Name("x"),
                                             ctx: Store,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 50..51,
                                             value: Int(
                                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap
index abbb6e06fa..f907721b0f 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/unparenthesized_named
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..73,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..72,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..72,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..53,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 44..48,
                                             id: Name("last"),
                                             ctx: Store,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 52..53,
                                             id: Name("x"),
                                             ctx: Load,
@@ -43,10 +43,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 54..71,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 58..59,
                                             id: Name("x"),
                                             ctx: Store,
@@ -54,11 +54,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 63..71,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 63..68,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -66,11 +66,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 68..71,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 69..70,
                                                             value: Int(
                                                                 3,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap
index 16c0b89b53..bf277fe095 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/err/unparenthesized_named
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..88,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..57,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..57,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..50,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 44..45,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -33,7 +33,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 49..50,
                                                 value: Int(
                                                     1,
@@ -44,7 +44,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..53,
                                         value: Int(
                                             2,
@@ -53,7 +53,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..56,
                                         value: Int(
                                             3,
@@ -67,16 +67,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..72,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..72,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 59..60,
                                         value: Int(
                                             1,
@@ -85,11 +85,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 62..68,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 62..63,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -97,7 +97,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..68,
                                                 value: Int(
                                                     2,
@@ -108,7 +108,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 70..71,
                                         value: Int(
                                             3,
@@ -122,16 +122,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 73..87,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..87,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
                                         value: Int(
                                             1,
@@ -140,7 +140,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..78,
                                         value: Int(
                                             2,
@@ -149,11 +149,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..86,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 80..81,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -161,7 +161,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 85..86,
                                                 value: Int(
                                                     3,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap
index f02e2c45bd..0595f124f2 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap
@@ -7,28 +7,37 @@ input_file: crates/ruff_python_parser/resources/inline/err/unterminated_fstring_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..67,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..7,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..7,
-                                            node_index: AtomicNodeIndex(..),
-                                            elements: [],
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Literal(
+                                                    InterpolatedStringLiteralElement {
+                                                        range: 2..7,
+                                                        node_index: NodeIndex(None),
+                                                        value: "hello",
+                                                    },
+                                                ),
+                                            ],
                                             flags: FStringFlags {
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: true,
                                             },
                                         },
                                     ),
@@ -40,15 +49,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..13,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..13,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     value: Int(
                                         1,
@@ -58,7 +67,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 12..13,
                                     value: Int(
                                         1,
@@ -71,33 +80,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..24,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..24,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 14..24,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 16..22,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 22..24,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 23..24,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -113,6 +122,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: true,
                                             },
                                         },
                                     ),
@@ -124,15 +134,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..30,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 25..30,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 25..26,
                                     value: Int(
                                         2,
@@ -142,7 +152,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..30,
                                     value: Int(
                                         2,
@@ -155,33 +165,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 31..42,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..42,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 31..42,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 33..39,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 39..42,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 40..41,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -192,7 +202,7 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 42..42,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [],
                                                             },
                                                         ),
@@ -203,6 +213,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: true,
                                             },
                                         },
                                     ),
@@ -214,15 +225,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..48,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..48,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..44,
                                     value: Int(
                                         3,
@@ -232,7 +243,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..48,
                                     value: Int(
                                         3,
@@ -245,33 +256,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..60,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..60,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 49..60,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 51..57,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 57..60,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 58..59,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -287,6 +298,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: true,
                                             },
                                         },
                                     ),
@@ -298,15 +310,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..66,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..66,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 61..62,
                                     value: Int(
                                         4,
@@ -316,7 +328,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..66,
                                     value: Int(
                                         4,
@@ -374,9 +386,10 @@ Module(
 1 | f"hello
 2 | 1 + 1
 3 | f"hello {x
-  |           ^ Syntax Error: Expected FStringEnd, found Unknown
+  |           ^ Syntax Error: Expected FStringEnd, found newline
 4 | 2 + 2
 5 | f"hello {x:
+6 | 3 + 3
   |
 
 
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap
index 9949fa6cbc..dc64a3105d 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/walrus_py37.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..54,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..53,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..52,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..47,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap
index 4f87608d79..0af23c288c 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/while_stmt_invalid_te
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..70,
         body: [
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     test: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..8,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..8,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,11 +32,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 10..13,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 10..13,
                                     },
                                 ),
@@ -48,16 +48,16 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..32,
                     test: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..27,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..27,
                                         id: Name("x"),
                                         ctx: Load,
@@ -69,11 +69,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 29..32,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                     },
                                 ),
@@ -85,11 +85,11 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..40,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..40,
                             id: Name("a"),
                             ctx: Load,
@@ -101,11 +101,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..48,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 42..43,
                             id: Name("b"),
                             ctx: Store,
@@ -113,7 +113,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 45..48,
                         },
                     ),
@@ -123,15 +123,15 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..61,
                     test: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 55..61,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 55..56,
                                     id: Name("a"),
                                     ctx: Store,
@@ -139,7 +139,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..61,
                                     value: Int(
                                         1,
@@ -154,11 +154,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..69,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..64,
                             id: Name("b"),
                             ctx: Store,
@@ -166,7 +166,7 @@ Module(
                     ),
                     annotation: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..69,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap
index 7006daf690..67fb75a824 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/while_stmt_missing_co
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..40,
         body: [
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..39,
                     test: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..18,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 12..13,
                                     id: Name("a"),
                                     ctx: Load,
@@ -32,7 +32,7 @@ Module(
                             comparators: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 16..18,
                                         value: Int(
                                             30,
@@ -45,7 +45,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 35..39,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap
index e86db412de..be86004a04 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/while_stmt_missing_te
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..30,
         body: [
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..5,
                             id: Name(""),
                             ctx: Invalid,
@@ -25,11 +25,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 8..11,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..11,
                                     },
                                 ),
@@ -41,11 +41,11 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..29,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..17,
                             id: Name(""),
                             ctx: Invalid,
@@ -54,12 +54,12 @@ Module(
                     body: [
                         Assign(
                             StmtAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..29,
                                 targets: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 24..25,
                                             id: Name("a"),
                                             ctx: Store,
@@ -68,7 +68,7 @@ Module(
                                 ],
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..29,
                                         value: Int(
                                             1,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap
index 8a24d7009d..668c7c2c08 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/with_items_parenthesi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..56,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 34..39,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..39,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -31,10 +31,10 @@ Module(
                         },
                         WithItem {
                             range: 41..46,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..46,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -46,7 +46,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 52..56,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap
index 7a3cf04fb1..ea060453a9 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/with_items_parenthesi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..160,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 6..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..11,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -31,10 +31,10 @@ Module(
                         },
                         WithItem {
                             range: 12..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 12..17,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -46,11 +46,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..23,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..23,
                                     },
                                 ),
@@ -61,16 +61,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..53,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 30..41,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 30..35,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -79,7 +79,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..41,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -89,10 +89,10 @@ Module(
                         },
                         WithItem {
                             range: 42..47,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..47,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -104,11 +104,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 50..53,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 50..53,
                                     },
                                 ),
@@ -119,16 +119,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..91,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 60..65,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..65,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -138,10 +138,10 @@ Module(
                         },
                         WithItem {
                             range: 67..72,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 67..72,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -151,10 +151,10 @@ Module(
                         },
                         WithItem {
                             range: 73..78,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 73..78,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -164,10 +164,10 @@ Module(
                         },
                         WithItem {
                             range: 80..85,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 80..85,
                                     id: Name("item4"),
                                     ctx: Load,
@@ -179,11 +179,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 88..91,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 88..91,
                                     },
                                 ),
@@ -194,16 +194,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..135,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 98..103,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 98..103,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -213,10 +213,10 @@ Module(
                         },
                         WithItem {
                             range: 105..116,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 105..110,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -225,7 +225,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 114..116,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -235,10 +235,10 @@ Module(
                         },
                         WithItem {
                             range: 117..122,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 117..122,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -248,10 +248,10 @@ Module(
                         },
                         WithItem {
                             range: 124..129,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 124..129,
                                     id: Name("item4"),
                                     ctx: Load,
@@ -263,11 +263,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 132..135,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 132..135,
                                     },
                                 ),
@@ -278,21 +278,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..159,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 141..154,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 141..154,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 142..147,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -300,7 +300,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 149..154,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -317,11 +317,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 156..159,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 156..159,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap
index cf762a1792..cb9bd384b5 100644
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/write_to_debug_expr.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..83,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..13,
                                 id: Name("__debug__"),
                                 ctx: Del,
@@ -28,12 +28,12 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..36,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 18..19,
                                 id: Name("x"),
                                 ctx: Del,
@@ -41,7 +41,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..22,
                                 id: Name("y"),
                                 ctx: Del,
@@ -49,7 +49,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..33,
                                 id: Name("__debug__"),
                                 ctx: Del,
@@ -57,7 +57,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 35..36,
                                 id: Name("z"),
                                 ctx: Del,
@@ -68,12 +68,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..50,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 37..46,
                                 id: Name("__debug__"),
                                 ctx: Store,
@@ -82,7 +82,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..50,
                             value: Int(
                                 1,
@@ -93,17 +93,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 51..82,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 51..69,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 51..52,
                                             id: Name("x"),
                                             ctx: Store,
@@ -111,7 +111,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 54..55,
                                             id: Name("y"),
                                             ctx: Store,
@@ -119,7 +119,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 57..66,
                                             id: Name("__debug__"),
                                             ctx: Store,
@@ -127,7 +127,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 68..69,
                                             id: Name("z"),
                                             ctx: Store,
@@ -141,12 +141,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..82,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..73,
                                         value: Int(
                                             1,
@@ -155,7 +155,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..76,
                                         value: Int(
                                             2,
@@ -164,7 +164,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 78..79,
                                         value: Int(
                                             3,
@@ -173,7 +173,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..82,
                                         value: Int(
                                             4,
diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap
new file mode 100644
index 0000000000..86372e56d9
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap
@@ -0,0 +1,68 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/err/yield_from_in_async_function.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..28,
+        body: [
+            FunctionDef(
+                StmtFunctionDef {
+                    node_index: NodeIndex(None),
+                    range: 0..27,
+                    is_async: true,
+                    decorator_list: [],
+                    name: Identifier {
+                        id: Name("f"),
+                        range: 10..11,
+                        node_index: NodeIndex(None),
+                    },
+                    type_params: None,
+                    parameters: Parameters {
+                        range: 11..13,
+                        node_index: NodeIndex(None),
+                        posonlyargs: [],
+                        args: [],
+                        vararg: None,
+                        kwonlyargs: [],
+                        kwarg: None,
+                    },
+                    returns: None,
+                    body: [
+                        Expr(
+                            StmtExpr {
+                                node_index: NodeIndex(None),
+                                range: 15..27,
+                                value: YieldFrom(
+                                    ExprYieldFrom {
+                                        node_index: NodeIndex(None),
+                                        range: 15..27,
+                                        value: Name(
+                                            ExprName {
+                                                node_index: NodeIndex(None),
+                                                range: 26..27,
+                                                id: Name("x"),
+                                                ctx: Load,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            },
+                        ),
+                    ],
+                },
+            ),
+        ],
+    },
+)
+```
+## Semantic Syntax Errors
+
+  |
+1 | async def f(): yield from x
+  |                ^^^^^^^^^^^^ Syntax Error: `yield from` statement in async function; use `async for` instead
+  |
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap
index 411a58148d..7982e188e2 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/all_async_comprehensio
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..126,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..125,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("test"),
                         range: 54..58,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 58..60,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,20 +35,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 62..125,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 69..125,
                                             elt: ListComp(
                                                 ExprListComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 70..100,
                                                     elt: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 71..72,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -59,10 +57,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 73..99,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 83..84,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -70,11 +68,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 88..99,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 88..96,
                                                                             id: Name("elements"),
                                                                             ctx: Load,
@@ -82,11 +80,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 96..99,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 97..98,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -106,10 +104,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 101..124,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 111..112,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -117,11 +115,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 116..124,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 116..121,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -129,11 +127,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 121..124,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 122..123,
                                                                             value: Int(
                                                                                 3,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap
index 40c7d68cfd..0e73bb0c25 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap
@@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/ok/ambiguous_lpar_with_it
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..337,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 124..143,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 129..138,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 129..138,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 130..131,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -35,7 +35,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 137..138,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -50,11 +50,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 140..143,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 140..143,
                                     },
                                 ),
@@ -65,20 +65,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 144..166,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 149..161,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 149..161,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 150..151,
                                             id: Name("a"),
                                             ctx: Load,
@@ -90,7 +90,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 160..161,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -105,11 +105,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 163..166,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 163..166,
                                     },
                                 ),
@@ -120,22 +120,22 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 196..220,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 201..215,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 201..215,
                                     op: Or,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 202..203,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -143,13 +143,13 @@ Module(
                                         ),
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 208..215,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 208..209,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -157,7 +157,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 214..215,
                                                             id: Name("c"),
                                                             ctx: Load,
@@ -175,11 +175,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 217..220,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 217..220,
                                     },
                                 ),
@@ -190,28 +190,28 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 221..245,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 226..240,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 226..240,
                                     op: Or,
                                     values: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 226..235,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 227..228,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -219,7 +219,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 234..235,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -230,7 +230,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 239..240,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -245,11 +245,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 242..245,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 242..245,
                                     },
                                 ),
@@ -260,28 +260,28 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 246..272,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 251..267,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 251..267,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 251..263,
                                             left: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 252..257,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 252..253,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -290,7 +290,7 @@ Module(
                                                     op: BitOr,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 256..257,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -301,7 +301,7 @@ Module(
                                             op: LShift,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 262..263,
                                                     id: Name("c"),
                                                     ctx: Load,
@@ -312,7 +312,7 @@ Module(
                                     op: BitOr,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 266..267,
                                             id: Name("d"),
                                             ctx: Load,
@@ -326,11 +326,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 269..272,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 269..272,
                                     },
                                 ),
@@ -341,24 +341,24 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 312..336,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 317..331,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 317..331,
                                     left: Subscript(
                                         ExprSubscript {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 317..323,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 318..319,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -366,7 +366,7 @@ Module(
                                             ),
                                             slice: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 321..322,
                                                     value: Int(
                                                         0,
@@ -379,11 +379,11 @@ Module(
                                     op: Add,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 326..331,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 326..327,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -392,7 +392,7 @@ Module(
                                             op: Mult,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 330..331,
                                                     id: Name("c"),
                                                     ctx: Load,
@@ -408,11 +408,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 333..336,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 333..336,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap
index 00a32e1ab3..d035e3bff6 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap
@@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/ok/ambiguous_lpar_with_it
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..153,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 5..23,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..23,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 12..16,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 6..7,
                                             id: Name("x"),
                                             ctx: Load,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..23,
                                             id: Name("y"),
                                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -69,31 +69,31 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..71,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 34..66,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..66,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 55..59,
                                             value: true,
                                         },
                                     ),
                                     body: Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..51,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 35..36,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -102,10 +102,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 37..50,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 41..42,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -113,7 +113,7 @@ Module(
                                                     ),
                                                     iter: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 46..50,
                                                             id: Name("iter"),
                                                             ctx: Load,
@@ -128,7 +128,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..66,
                                             id: Name("y"),
                                             ctx: Load,
@@ -142,11 +142,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 68..71,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 68..71,
                                     },
                                 ),
@@ -157,31 +157,31 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..120,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 77..115,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 77..115,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 104..108,
                                             value: true,
                                         },
                                     ),
                                     body: Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 77..100,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 78..79,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -190,10 +190,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 80..99,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 90..91,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -201,7 +201,7 @@ Module(
                                                     ),
                                                     iter: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 95..99,
                                                             id: Name("iter"),
                                                             ctx: Load,
@@ -216,7 +216,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 114..115,
                                             id: Name("y"),
                                             ctx: Load,
@@ -230,11 +230,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 117..120,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 117..120,
                                     },
                                 ),
@@ -245,31 +245,31 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..152,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 126..147,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 126..147,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 136..140,
                                             value: true,
                                         },
                                     ),
                                     body: Subscript(
                                         ExprSubscript {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 126..132,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 127..128,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -277,7 +277,7 @@ Module(
                                             ),
                                             slice: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 130..131,
                                                     value: Int(
                                                         0,
@@ -289,7 +289,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 146..147,
                                             id: Name("y"),
                                             ctx: Load,
@@ -303,11 +303,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 149..152,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 149..152,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap
index c0dc9bb148..36a6809370 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/ann_assign_stmt_simple
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..45,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("a"),
                             ctx: Store,
@@ -24,7 +24,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..6,
                             id: Name("int"),
                             ctx: Load,
@@ -36,11 +36,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..25,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..19,
                             id: Name("a"),
                             ctx: Store,
@@ -48,7 +48,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..25,
                             id: Name("int"),
                             ctx: Load,
@@ -60,15 +60,15 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..34,
                     target: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..29,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 26..27,
                                     id: Name("a"),
                                     ctx: Load,
@@ -77,14 +77,14 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 28..29,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Store,
                         },
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..34,
                             id: Name("int"),
                             ctx: Load,
@@ -96,15 +96,15 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..44,
                     target: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..39,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 35..36,
                                     id: Name("a"),
                                     ctx: Load,
@@ -112,7 +112,7 @@ Module(
                             ),
                             slice: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 37..38,
                                     value: Int(
                                         0,
@@ -124,7 +124,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..44,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap
index 650a3b6e53..495601cfa5 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/args_unparenthesized_g
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..107,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..51,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..51,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..3,
                                     id: Name("zip"),
                                     ctx: Load,
@@ -28,15 +28,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 3..51,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4..26,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5..6,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -45,10 +45,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 7..25,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 11..12,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -56,11 +56,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 16..25,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 16..21,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -68,11 +68,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 21..25,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 22..24,
                                                                             value: Int(
                                                                                 10,
@@ -93,11 +93,11 @@ Module(
                                     ),
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 28..50,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 29..30,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -106,10 +106,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 31..49,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 35..36,
                                                             id: Name("y"),
                                                             ctx: Store,
@@ -117,11 +117,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 40..49,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 40..45,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -129,11 +129,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 45..49,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 46..48,
                                                                             value: Int(
                                                                                 10,
@@ -161,15 +161,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..77,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..77,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 52..55,
                                     id: Name("sum"),
                                     ctx: Load,
@@ -177,15 +177,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 55..77,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 56..76,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 56..57,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -194,10 +194,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 58..76,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 62..63,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -205,11 +205,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 67..76,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 67..72,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -217,11 +217,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 72..76,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 73..75,
                                                                             value: Int(
                                                                                 10,
@@ -249,15 +249,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..106,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 78..106,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 78..81,
                                     id: Name("sum"),
                                     ctx: Load,
@@ -265,15 +265,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 81..106,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..104,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 83..84,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -282,10 +282,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 85..103,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 89..90,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -293,11 +293,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 94..103,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 94..99,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -305,11 +305,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 99..103,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 100..102,
                                                                             value: Int(
                                                                                 10,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap
index a9a4f61078..1fe9bc4e9c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/assign_stmt_starred_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..36,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("_"),
                                 ctx: Store,
@@ -26,7 +26,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..5,
                             value: Int(
                                 4,
@@ -37,12 +37,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..13,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..7,
                                 id: Name("_"),
                                 ctx: Store,
@@ -51,12 +51,12 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..13,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 11..12,
                                         value: Int(
                                             4,
@@ -71,12 +71,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..25,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..15,
                                 id: Name("_"),
                                 ctx: Store,
@@ -85,21 +85,21 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..25,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..23,
                                         value: List(
                                             ExprList {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..23,
                                                 elts: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 21..22,
                                                             value: Int(
                                                                 1,
@@ -122,12 +122,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..35,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 26..27,
                                 id: Name("_"),
                                 ctx: Store,
@@ -136,21 +136,21 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..35,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 30..34,
                                         value: List(
                                             ExprList {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 31..34,
                                                 elts: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 32..33,
                                                             value: Int(
                                                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap
index 52e3ad2338..5d1a27f814 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/assign_targets_termina
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..39,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("x"),
                                 ctx: Store,
@@ -25,7 +25,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..5,
                                 id: Name("y"),
                                 ctx: Store,
@@ -33,7 +33,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 8..9,
                                 id: Name("z"),
                                 ctx: Store,
@@ -42,7 +42,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..13,
                             value: Int(
                                 1,
@@ -53,16 +53,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..19,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..19,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..16,
                                         id: Name("a"),
                                         ctx: Load,
@@ -70,7 +70,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         id: Name("b"),
                                         ctx: Load,
@@ -85,12 +85,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..33,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..21,
                                 id: Name("x"),
                                 ctx: Store,
@@ -98,7 +98,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..25,
                                 id: Name("y"),
                                 ctx: Store,
@@ -106,7 +106,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..29,
                                 id: Name("z"),
                                 ctx: Store,
@@ -115,7 +115,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..33,
                             value: Int(
                                 1,
@@ -126,16 +126,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..38,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..38,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..35,
                                         id: Name("a"),
                                         ctx: Load,
@@ -143,7 +143,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 37..38,
                                         id: Name("b"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap
index f01730187c..5443d07ff3 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/async_for_statement.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..30,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..29,
                     is_async: true,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..16,
                             id: Name("target"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..24,
                             id: Name("iter"),
                             ctx: Load,
@@ -34,11 +34,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 26..29,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..29,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap
index 52ec987c61..d3fe2817d2 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/async_function_definit
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..21,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 10..13,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 13..15,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,11 +35,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..20,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..20,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap
index be892875b2..d653933f32 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/async_with_statement.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..21,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     is_async: true,
                     items: [
                         WithItem {
                             range: 11..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..15,
                                     id: Name("item"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 17..20,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..20,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap
index d1f1b93250..19bfd3e342 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/ok/class_def_arguments.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..32,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..14,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 6..9,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 11..14,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 11..14,
                                     },
                                 ),
@@ -40,19 +40,19 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..31,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 21..24,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 24..26,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -60,11 +60,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..31,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..31,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap
index ad057f45f6..a732e866b3 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/class_keyword_in_case_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..34,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..33,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             value: Int(
                                 2,
@@ -26,14 +26,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..33,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 18..28,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 18..23,
                                             id: Name("Class"),
                                             ctx: Load,
@@ -41,27 +41,27 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 23..28,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 24..27,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 24..25,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchAs(
                                                     PatternMatchAs {
+                                                        node_index: NodeIndex(None),
                                                         range: 26..27,
-                                                        node_index: AtomicNodeIndex(..),
                                                         pattern: None,
                                                         name: Some(
                                                             Identifier {
                                                                 id: Name("x"),
                                                                 range: 26..27,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                         ),
                                                     },
@@ -75,11 +75,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 30..33,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 30..33,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap
index e55236a706..85a9bc9f78 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap
@@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/ok/class_type_params_py31
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..96,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..95,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Foo"),
                         range: 50..53,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 53..90,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 54..69,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("S"),
                                             range: 54..55,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 57..69,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 58..61,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -50,7 +50,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 63..68,
                                                                 id: Name("bytes"),
                                                                 ctx: Load,
@@ -67,17 +67,17 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 71..79,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 71..72,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 74..79,
                                                     id: Name("float"),
                                                     ctx: Load,
@@ -89,24 +89,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 82..84,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 86..89,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 88..89,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -118,11 +118,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 92..95,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..95,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap
index 9d9c72049a..c755a0542b 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/comma_separated_regula
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..181,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 141..144,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 141..144,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 142..143,
                                         value: Int(
                                             0,
@@ -36,16 +36,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 145..151,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 145..151,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 146..147,
                                         value: Int(
                                             0,
@@ -54,7 +54,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 149..150,
                                         value: Int(
                                             1,
@@ -69,16 +69,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 152..159,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 152..159,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 153..154,
                                         value: Int(
                                             0,
@@ -87,7 +87,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 156..157,
                                         value: Int(
                                             1,
@@ -102,16 +102,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 160..169,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..169,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 161..162,
                                         value: Int(
                                             0,
@@ -120,7 +120,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 164..165,
                                         value: Int(
                                             1,
@@ -129,7 +129,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 167..168,
                                         value: Int(
                                             2,
@@ -144,16 +144,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 170..180,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 170..180,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 171..172,
                                         value: Int(
                                             0,
@@ -162,7 +162,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 174..175,
                                         value: Int(
                                             1,
@@ -171,7 +171,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 177..178,
                                         value: Int(
                                             2,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap
index 3a7f83d488..f53b08abea 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap
@@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/ok/debug_rename_import.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..86,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..25,
                     names: [
                         Alias {
                             range: 7..25,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("__debug__"),
                                 range: 7..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("debug"),
                                     range: 20..25,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -36,23 +36,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..52,
                     module: Some(
                         Identifier {
                             id: Name("__debug__"),
                             range: 31..40,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 48..52,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("Some"),
                                 range: 48..52,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -62,29 +62,29 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..85,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 58..59,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 67..85,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("__debug__"),
                                 range: 67..76,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("debug"),
                                     range: 80..85,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap
index 14d34fa18b..7d009ac3d4 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_async_functi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..32,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..31,
                     is_async: true,
                     decorator_list: [
                         Decorator {
                             range: 0..10,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..10,
                                     id: Name("decorator"),
                                     ctx: Load,
@@ -32,14 +32,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 21..24,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 24..26,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -50,11 +48,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..31,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..31,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap
index 4ad9fb1dc8..957a81dd4f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_await_expres
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..96,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..95,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 55..58,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 58..60,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,20 +35,20 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 66..95,
                                 is_async: false,
                                 decorator_list: [
                                     Decorator {
                                         range: 66..76,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         expression: Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..76,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 73..76,
                                                         id: Name("bar"),
                                                         ctx: Load,
@@ -63,14 +61,12 @@ Module(
                                 name: Identifier {
                                     id: Name("baz"),
                                     range: 85..88,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 88..90,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -81,11 +77,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 92..95,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 92..95,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap
index 25bdacc747..578a528c1d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_d
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..86,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..85,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..69,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..69,
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..61,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 46..53,
                                                     id: Name("buttons"),
                                                     ctx: Load,
@@ -38,7 +38,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("clicked"),
                                                 range: 54..61,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -46,7 +46,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("connect"),
                                         range: 62..69,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -56,14 +56,12 @@ Module(
                     name: Identifier {
                         id: Name("spam"),
                         range: 74..78,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 78..80,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -74,11 +72,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 82..85,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 82..85,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap
index d3208630da..fb3322b7a7 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_e
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..97,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..96,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..80,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..80,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..50,
                                             id: Name("eval"),
                                             ctx: Load,
@@ -33,22 +33,23 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 50..80,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 51..79,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 51..79,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "buttons[0].clicked.connect",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -65,14 +66,12 @@ Module(
                     name: Identifier {
                         id: Name("spam"),
                         range: 85..89,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 89..91,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -83,11 +82,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 93..96,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 93..96,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap
index f83bba2ca6..3250a9ad0f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap
@@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_i
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..111,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..63,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("_"),
                         range: 49..50,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 50..53,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 51..52,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 51..52,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 51..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -53,12 +51,12 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 55..63,
                                 value: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..63,
                                             id: Name("x"),
                                             ctx: Load,
@@ -72,20 +70,20 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..110,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 64..94,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..94,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..66,
                                             id: Name("_"),
                                             ctx: Load,
@@ -93,23 +91,23 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 66..94,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Attribute(
                                                 ExprAttribute {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 67..93,
                                                     value: Attribute(
                                                         ExprAttribute {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 67..85,
                                                             value: Subscript(
                                                                 ExprSubscript {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 67..77,
                                                                     value: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 67..74,
                                                                             id: Name("buttons"),
                                                                             ctx: Load,
@@ -117,7 +115,7 @@ Module(
                                                                     ),
                                                                     slice: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 75..76,
                                                                             value: Int(
                                                                                 0,
@@ -130,7 +128,7 @@ Module(
                                                             attr: Identifier {
                                                                 id: Name("clicked"),
                                                                 range: 78..85,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             ctx: Load,
                                                         },
@@ -138,7 +136,7 @@ Module(
                                                     attr: Identifier {
                                                         id: Name("connect"),
                                                         range: 86..93,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     ctx: Load,
                                                 },
@@ -153,14 +151,12 @@ Module(
                     name: Identifier {
                         id: Name("spam"),
                         range: 99..103,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 103..105,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -171,11 +167,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 107..110,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 107..110,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap
index 500d2a4b23..dca975e0e9 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..129,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..88,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 45..72,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..72,
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..64,
                                             value: Subscript(
                                                 ExprSubscript {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 46..56,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 46..53,
                                                             id: Name("buttons"),
                                                             ctx: Load,
@@ -41,7 +41,7 @@ Module(
                                                     ),
                                                     slice: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 54..55,
                                                             value: Int(
                                                                 0,
@@ -54,7 +54,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("clicked"),
                                                 range: 57..64,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -62,7 +62,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("connect"),
                                         range: 65..72,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -72,14 +72,12 @@ Module(
                     name: Identifier {
                         id: Name("spam"),
                         range: 77..81,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 81..83,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,11 +88,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 85..88,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..88,
                                     },
                                 ),
@@ -105,24 +103,24 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 89..128,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 89..113,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 90..113,
                                     func: Named(
                                         ExprNamed {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 91..107,
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 91..92,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -130,26 +128,24 @@ Module(
                                             ),
                                             value: Lambda(
                                                 ExprLambda {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 96..107,
                                                     parameters: Some(
                                                         Parameters {
                                                             range: 103..104,
-                                                            node_index: AtomicNodeIndex(
-                                                                0,
-                                                            ),
+                                                            node_index: NodeIndex(None),
                                                             posonlyargs: [],
                                                             args: [
                                                                 ParameterWithDefault {
                                                                     range: 103..104,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     parameter: Parameter {
                                                                         range: 103..104,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         name: Identifier {
                                                                             id: Name("x"),
                                                                             range: 103..104,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         annotation: None,
                                                                     },
@@ -163,7 +159,7 @@ Module(
                                                     ),
                                                     body: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 106..107,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -175,11 +171,11 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 108..113,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 109..112,
                                                     id: Name("foo"),
                                                     ctx: Load,
@@ -195,14 +191,12 @@ Module(
                     name: Identifier {
                         id: Name("bar"),
                         range: 118..121,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 121..123,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -213,11 +207,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 125..128,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 125..128,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap
index ebaae1fd52..e3595cb157 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/del_debug_py38.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..56,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 47..56,
                                 id: Name("__debug__"),
                                 ctx: Del,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap
index cd953e9041..2c6467849c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/del_targets_terminator
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..29,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..5,
                                 id: Name("a"),
                                 ctx: Del,
@@ -25,7 +25,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 7..8,
                                 id: Name("b"),
                                 ctx: Del,
@@ -36,16 +36,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..14,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..14,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 10..11,
                                         id: Name("c"),
                                         ctx: Load,
@@ -53,7 +53,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..14,
                                         id: Name("d"),
                                         ctx: Load,
@@ -68,12 +68,12 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..23,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..20,
                                 id: Name("a"),
                                 ctx: Del,
@@ -81,7 +81,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 22..23,
                                 id: Name("b"),
                                 ctx: Del,
@@ -92,16 +92,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..28,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..28,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..25,
                                         id: Name("c"),
                                         ctx: Load,
@@ -109,7 +109,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..28,
                                         id: Name("d"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap
new file mode 100644
index 0000000000..2705218022
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap
@@ -0,0 +1,458 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/ok/different_match_pattern_bindings.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..147,
+        body: [
+            Match(
+                StmtMatch {
+                    node_index: NodeIndex(None),
+                    range: 0..146,
+                    subject: Name(
+                        ExprName {
+                            node_index: NodeIndex(None),
+                            range: 6..7,
+                            id: Name("x"),
+                            ctx: Load,
+                        },
+                    ),
+                    cases: [
+                        MatchCase {
+                            range: 13..32,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 18..27,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 18..21,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 19..20,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 19..20,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 24..27,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 25..26,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 25..26,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 29..32,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 29..32,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 37..62,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 42..57,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 42..48,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 43..44,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("x"),
+                                                                    range: 43..44,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 46..47,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("y"),
+                                                                    range: 46..47,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 51..57,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 52..53,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("x"),
+                                                                    range: 52..53,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 55..56,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("y"),
+                                                                    range: 55..56,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 59..62,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 59..62,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 67..89,
+                            node_index: NodeIndex(None),
+                            pattern: MatchSequence(
+                                PatternMatchSequence {
+                                    node_index: NodeIndex(None),
+                                    range: 72..84,
+                                    patterns: [
+                                        MatchAs(
+                                            PatternMatchAs {
+                                                node_index: NodeIndex(None),
+                                                range: 73..74,
+                                                pattern: None,
+                                                name: Some(
+                                                    Identifier {
+                                                        id: Name("x"),
+                                                        range: 73..74,
+                                                        node_index: NodeIndex(None),
+                                                    },
+                                                ),
+                                            },
+                                        ),
+                                        MatchOr(
+                                            PatternMatchOr {
+                                                node_index: NodeIndex(None),
+                                                range: 77..82,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 77..78,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("y"),
+                                                                    range: 77..78,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 81..82,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("y"),
+                                                                    range: 81..82,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 86..89,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 86..89,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 94..119,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 99..114,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 99..105,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 100..101,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 100..101,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 103..104,
+                                                            pattern: None,
+                                                            name: None,
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 108..114,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 109..110,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 109..110,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 112..113,
+                                                            pattern: None,
+                                                            name: None,
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 116..119,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 116..119,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                        MatchCase {
+                            range: 124..146,
+                            node_index: NodeIndex(None),
+                            pattern: MatchOr(
+                                PatternMatchOr {
+                                    node_index: NodeIndex(None),
+                                    range: 129..141,
+                                    patterns: [
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 129..132,
+                                                patterns: [
+                                                    MatchAs(
+                                                        PatternMatchAs {
+                                                            node_index: NodeIndex(None),
+                                                            range: 130..131,
+                                                            pattern: None,
+                                                            name: Some(
+                                                                Identifier {
+                                                                    id: Name("a"),
+                                                                    range: 130..131,
+                                                                    node_index: NodeIndex(None),
+                                                                },
+                                                            ),
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                        MatchSequence(
+                                            PatternMatchSequence {
+                                                node_index: NodeIndex(None),
+                                                range: 135..141,
+                                                patterns: [
+                                                    MatchClass(
+                                                        PatternMatchClass {
+                                                            node_index: NodeIndex(None),
+                                                            range: 136..140,
+                                                            cls: Name(
+                                                                ExprName {
+                                                                    node_index: NodeIndex(None),
+                                                                    range: 136..137,
+                                                                    id: Name("C"),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            arguments: PatternArguments {
+                                                                range: 137..140,
+                                                                node_index: NodeIndex(None),
+                                                                patterns: [
+                                                                    MatchAs(
+                                                                        PatternMatchAs {
+                                                                            node_index: NodeIndex(None),
+                                                                            range: 138..139,
+                                                                            pattern: None,
+                                                                            name: Some(
+                                                                                Identifier {
+                                                                                    id: Name("a"),
+                                                                                    range: 138..139,
+                                                                                    node_index: NodeIndex(None),
+                                                                                },
+                                                                            ),
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                                keywords: [],
+                                                            },
+                                                        },
+                                                    ),
+                                                ],
+                                            },
+                                        ),
+                                    ],
+                                },
+                            ),
+                            guard: None,
+                            body: [
+                                Expr(
+                                    StmtExpr {
+                                        node_index: NodeIndex(None),
+                                        range: 143..146,
+                                        value: EllipsisLiteral(
+                                            ExprEllipsisLiteral {
+                                                node_index: NodeIndex(None),
+                                                range: 143..146,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                        },
+                    ],
+                },
+            ),
+        ],
+    },
+)
+```
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap
index 9c3c3f576f..68d5a3ac0e 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/dotted_name_normalized
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..32,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     names: [
                         Alias {
                             range: 7..12,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a.b.c"),
                                 range: 7..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -30,16 +30,16 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..31,
                     names: [
                         Alias {
                             range: 20..31,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a.b.c"),
                                 range: 20..31,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap
index 277f35c150..e090cde339 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/duplicate_match_key_at
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..40,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..39,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,19 +25,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..39,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 18..34,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         Attribute(
                                             ExprAttribute {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..22,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 19..20,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -46,18 +46,18 @@ Module(
                                                 attr: Identifier {
                                                     id: Name("a"),
                                                     range: 21..22,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 ctx: Load,
                                             },
                                         ),
                                         Attribute(
                                             ExprAttribute {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..30,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 27..28,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -66,7 +66,7 @@ Module(
                                                 attr: Identifier {
                                                     id: Name("a"),
                                                     range: 29..30,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 ctx: Load,
                                             },
@@ -75,11 +75,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 24..25,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 24..25,
                                                         value: Int(
                                                             1,
@@ -90,11 +90,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 32..33,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 32..33,
                                                         value: Int(
                                                             2,
@@ -111,11 +111,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 36..39,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 36..39,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap
index c3efa0df92..f4f83b064f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/except_star_py311.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..77,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..76,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
@@ -32,11 +32,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 53..76,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 61..71,
                                             id: Name("ValueError"),
                                             ctx: Load,
@@ -47,11 +47,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 73..76,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 73..76,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap
index 07ef1ddbd3..d6f25ac1cc 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/except_stmt_as_name_so
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..100,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..99,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 5..8,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..8,
                                     },
                                 ),
@@ -32,11 +32,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 9..39,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..25,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -47,17 +47,17 @@ Module(
                                     Identifier {
                                         id: Name("match"),
                                         range: 29..34,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..39,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 36..39,
                                                 },
                                             ),
@@ -69,11 +69,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 40..69,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 47..56,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -84,17 +84,17 @@ Module(
                                     Identifier {
                                         id: Name("case"),
                                         range: 60..64,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 66..69,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 66..69,
                                                 },
                                             ),
@@ -106,11 +106,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 70..99,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 77..86,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -121,17 +121,17 @@ Module(
                                     Identifier {
                                         id: Name("type"),
                                         range: 90..94,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..99,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 96..99,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap
index bf94e92b01..2d4a97a396 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/except_stmt_unparenthe
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..117,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..79,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 53..57,
                             },
                         ),
@@ -26,16 +26,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 58..79,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..69,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 65..66,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -43,7 +43,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 68..69,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -59,7 +59,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 75..79,
                                         },
                                     ),
@@ -74,12 +74,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 80..116,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 89..93,
                             },
                         ),
@@ -88,16 +88,16 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 94..116,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 102..106,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 102..103,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -105,7 +105,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 105..106,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -121,7 +121,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 112..116,
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap
index d5977dbfc4..05f893a42c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/arguments.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..805,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 102..108,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 102..108,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 102..106,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 106..108,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -38,15 +38,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 109..119,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 109..119,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 109..113,
                                     id: Name("call"),
                                     ctx: Load,
@@ -54,11 +54,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 113..119,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 114..115,
                                             id: Name("x"),
                                             ctx: Load,
@@ -66,7 +66,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 117..118,
                                             id: Name("y"),
                                             ctx: Load,
@@ -81,15 +81,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 120..131,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..131,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 120..124,
                                     id: Name("call"),
                                     ctx: Load,
@@ -97,11 +97,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 124..131,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 125..126,
                                             id: Name("x"),
                                             ctx: Load,
@@ -109,7 +109,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 128..129,
                                             id: Name("y"),
                                             ctx: Load,
@@ -124,15 +124,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 150..164,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 150..164,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 150..154,
                                     id: Name("call"),
                                     ctx: Load,
@@ -140,22 +140,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 154..164,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 155..158,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 155..156,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 157..158,
                                                 value: Int(
                                                     1,
@@ -165,17 +165,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 160..163,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("y"),
                                                 range: 160..161,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 162..163,
                                                 value: Int(
                                                     2,
@@ -191,15 +191,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 165..173,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 165..173,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 165..169,
                                     id: Name("call"),
                                     ctx: Load,
@@ -207,15 +207,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 169..173,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 170..172,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 171..172,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -233,15 +233,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 174..183,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 174..183,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 174..178,
                                     id: Name("call"),
                                     ctx: Load,
@@ -249,16 +249,16 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 178..183,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 179..182,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 181..182,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -273,15 +273,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 193..205,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 193..205,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..197,
                                     id: Name("call"),
                                     ctx: Load,
@@ -289,11 +289,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 197..205,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 198..199,
                                             id: Name("x"),
                                             ctx: Load,
@@ -303,17 +303,17 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 201..204,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("y"),
                                                 range: 201..202,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 203..204,
                                                 value: Int(
                                                     1,
@@ -329,15 +329,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 206..217,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 206..217,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 206..210,
                                     id: Name("call"),
                                     ctx: Load,
@@ -345,11 +345,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 210..217,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 211..212,
                                             id: Name("x"),
                                             ctx: Load,
@@ -357,11 +357,11 @@ Module(
                                     ),
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 214..216,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 215..216,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -379,15 +379,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 218..230,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 218..230,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 218..222,
                                     id: Name("call"),
                                     ctx: Load,
@@ -395,11 +395,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 222..230,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 223..224,
                                             id: Name("x"),
                                             ctx: Load,
@@ -409,11 +409,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 226..229,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 228..229,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -428,15 +428,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 231..244,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 231..244,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 231..235,
                                     id: Name("call"),
                                     ctx: Load,
@@ -444,15 +444,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 235..244,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 241..243,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 242..243,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -465,17 +465,17 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 236..239,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 236..237,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 238..239,
                                                 value: Int(
                                                     1,
@@ -491,15 +491,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 245..259,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 245..259,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 245..249,
                                     id: Name("call"),
                                     ctx: Load,
@@ -507,22 +507,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 249..259,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 250..253,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 250..251,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 252..253,
                                                 value: Int(
                                                     1,
@@ -532,11 +532,11 @@ Module(
                                     },
                                     Keyword {
                                         range: 255..258,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 257..258,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -551,15 +551,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 260..273,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 260..273,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 260..264,
                                     id: Name("call"),
                                     ctx: Load,
@@ -567,15 +567,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 264..273,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 265..267,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 266..267,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -588,11 +588,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 269..272,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 271..272,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -607,15 +607,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 274..288,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 274..288,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 274..278,
                                     id: Name("call"),
                                     ctx: Load,
@@ -623,15 +623,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 278..288,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 279..281,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 280..281,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -642,7 +642,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 283..284,
                                             id: Name("y"),
                                             ctx: Load,
@@ -650,7 +650,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 286..287,
                                             id: Name("z"),
                                             ctx: Load,
@@ -665,15 +665,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 289..308,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 289..308,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 289..293,
                                     id: Name("call"),
                                     ctx: Load,
@@ -681,16 +681,16 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 293..308,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 294..297,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 296..297,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -699,17 +699,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 299..302,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("y"),
                                                 range: 299..300,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 301..302,
                                                 value: Int(
                                                     1,
@@ -719,17 +719,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 304..307,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("z"),
                                                 range: 304..305,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 306..307,
                                                 value: Int(
                                                     2,
@@ -745,15 +745,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 309..335,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 309..335,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 309..313,
                                     id: Name("call"),
                                     ctx: Load,
@@ -761,15 +761,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 313..335,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 314..317,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 315..317,
                                                     id: Name("x1"),
                                                     ctx: Load,
@@ -780,11 +780,11 @@ Module(
                                     ),
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 319..322,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 320..322,
                                                     id: Name("x2"),
                                                     ctx: Load,
@@ -797,11 +797,11 @@ Module(
                                 keywords: [
                                     Keyword {
                                         range: 324..328,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 326..328,
                                                 id: Name("y1"),
                                                 ctx: Load,
@@ -810,11 +810,11 @@ Module(
                                     },
                                     Keyword {
                                         range: 330..334,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 332..334,
                                                 id: Name("y2"),
                                                 ctx: Load,
@@ -829,15 +829,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 336..355,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 336..355,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 336..340,
                                     id: Name("call"),
                                     ctx: Load,
@@ -845,22 +845,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 340..355,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 341..344,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 341..342,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 343..344,
                                                 value: Int(
                                                     1,
@@ -870,11 +870,11 @@ Module(
                                     },
                                     Keyword {
                                         range: 346..349,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 348..349,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -883,17 +883,17 @@ Module(
                                     },
                                     Keyword {
                                         range: 351..354,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("z"),
                                                 range: 351..352,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 353..354,
                                                 value: Int(
                                                     1,
@@ -909,15 +909,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 378..402,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 378..402,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 378..382,
                                     id: Name("call"),
                                     ctx: Load,
@@ -925,33 +925,33 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 382..402,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 383..401,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 383..384,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 385..401,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 390..394,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 385..386,
                                                         value: Int(
                                                             1,
@@ -960,7 +960,7 @@ Module(
                                                 ),
                                                 orelse: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 400..401,
                                                         value: Int(
                                                             2,
@@ -978,15 +978,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 403..418,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 403..418,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 403..407,
                                     id: Name("call"),
                                     ctx: Load,
@@ -994,26 +994,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 407..418,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 408..417,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 408..409,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 410..417,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 416..417,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1030,15 +1030,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 419..438,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 419..438,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 419..423,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1046,41 +1046,39 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 423..438,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 424..437,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 424..425,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 426..437,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 433..434,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 433..434,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 433..434,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 433..434,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -1094,7 +1092,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 436..437,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1111,15 +1109,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 439..455,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 439..455,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 439..443,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1127,26 +1125,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 443..455,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 444..454,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("x"),
                                                 range: 444..445,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 447..453,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 447..448,
                                                         id: Name("y"),
                                                         ctx: Store,
@@ -1154,7 +1152,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 452..453,
                                                         value: Int(
                                                             1,
@@ -1172,15 +1170,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 476..491,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 476..491,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 476..480,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1188,16 +1186,16 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 480..491,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 482..489,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 488..489,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1215,15 +1213,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 492..512,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 492..512,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 492..496,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1231,15 +1229,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 496..512,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 498..510,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 509..510,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -1256,15 +1254,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 533..545,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 533..545,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 533..537,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1272,15 +1270,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 537..545,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Named(
                                         ExprNamed {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 538..544,
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 538..539,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1288,7 +1286,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 543..544,
                                                     value: Int(
                                                         1,
@@ -1306,15 +1304,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 546..572,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 546..572,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 546..550,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1322,19 +1320,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 550..572,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 551..571,
                                             elt: Named(
                                                 ExprNamed {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 551..557,
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 551..552,
                                                             id: Name("x"),
                                                             ctx: Store,
@@ -1342,7 +1340,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 556..557,
                                                             value: Int(
                                                                 1,
@@ -1354,10 +1352,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 558..571,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 562..563,
                                                             id: Name("i"),
                                                             ctx: Store,
@@ -1365,7 +1363,7 @@ Module(
                                                     ),
                                                     iter: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 567..571,
                                                             id: Name("iter"),
                                                             ctx: Load,
@@ -1387,15 +1385,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 596..610,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 596..610,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 596..600,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1403,21 +1401,21 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 600..610,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 601..609,
                                             value: BoolOp(
                                                 ExprBoolOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 602..609,
                                                     op: And,
                                                     values: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 602..603,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -1425,7 +1423,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 608..609,
                                                                 id: Name("y"),
                                                                 ctx: Load,
@@ -1446,15 +1444,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 611..623,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 611..623,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 611..615,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1462,19 +1460,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 615..623,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 616..622,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 617..622,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 617..618,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1483,7 +1481,7 @@ Module(
                                                     op: BitOr,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 621..622,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -1503,15 +1501,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 624..638,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 624..638,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 624..628,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1519,19 +1517,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 628..638,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 629..637,
                                             value: Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 630..637,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 636..637,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1551,15 +1549,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 639..657,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 639..657,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 639..643,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1567,34 +1565,32 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 643..657,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 644..656,
                                             value: Lambda(
                                                 ExprLambda {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 645..656,
                                                     parameters: Some(
                                                         Parameters {
                                                             range: 652..653,
-                                                            node_index: AtomicNodeIndex(
-                                                                0,
-                                                            ),
+                                                            node_index: NodeIndex(None),
                                                             posonlyargs: [],
                                                             args: [
                                                                 ParameterWithDefault {
                                                                     range: 652..653,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     parameter: Parameter {
                                                                         range: 652..653,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         name: Identifier {
                                                                             id: Name("x"),
                                                                             range: 652..653,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         annotation: None,
                                                                     },
@@ -1608,7 +1604,7 @@ Module(
                                                     ),
                                                     body: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 655..656,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1628,15 +1624,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 658..681,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 658..681,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 658..662,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1644,26 +1640,26 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 662..681,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 663..680,
                                             value: If(
                                                 ExprIf {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 664..680,
                                                     test: BooleanLiteral(
                                                         ExprBooleanLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 669..673,
                                                             value: true,
                                                         },
                                                     ),
                                                     body: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 664..665,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1671,7 +1667,7 @@ Module(
                                                     ),
                                                     orelse: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 679..680,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -1691,15 +1687,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 700..709,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 700..709,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 700..704,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1707,16 +1703,16 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 704..709,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 705..708,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 707..708,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1731,15 +1727,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 710..725,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 710..725,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 710..714,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1747,22 +1743,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 714..725,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 715..724,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 717..724,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 717..718,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1770,7 +1766,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 723..724,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -1788,15 +1784,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 726..741,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 726..741,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 726..730,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1804,20 +1800,20 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 730..741,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 731..740,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 733..740,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 739..740,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1834,15 +1830,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 742..766,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 742..766,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 742..746,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1850,27 +1846,27 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 746..766,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 747..765,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: If(
                                             ExprIf {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 749..765,
                                                 test: BooleanLiteral(
                                                     ExprBooleanLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 754..758,
                                                         value: true,
                                                     },
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 749..750,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1878,7 +1874,7 @@ Module(
                                                 ),
                                                 orelse: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 764..765,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1895,15 +1891,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 767..784,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 767..784,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 767..771,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1911,21 +1907,21 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 771..784,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 772..783,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 775..782,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 781..782,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1943,15 +1939,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 785..804,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 785..804,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 785..789,
                                     id: Name("call"),
                                     ctx: Load,
@@ -1959,35 +1955,33 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 789..804,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 790..803,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: None,
                                         value: Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 792..803,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 799..800,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 799..800,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 799..800,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 799..800,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -2001,7 +1995,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 802..803,
                                                         id: Name("x"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap
index e6b46d32b7..baa336d282 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/attribute.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..90,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..5,
                                     id: Name("value"),
                                     ctx: Load,
@@ -29,7 +29,7 @@ Module(
                             attr: Identifier {
                                 id: Name("attr"),
                                 range: 6..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -38,19 +38,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..23,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..23,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..21,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 11..16,
                                             id: Name("value"),
                                             ctx: Load,
@@ -59,14 +59,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("attr"),
                                         range: 17..21,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 21..23,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -76,19 +76,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..36,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..36,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..31,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 24..29,
                                             id: Name("value"),
                                             ctx: Load,
@@ -96,7 +96,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 29..31,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -105,7 +105,7 @@ Module(
                             attr: Identifier {
                                 id: Name("attr"),
                                 range: 32..36,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -114,27 +114,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..55,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..55,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 37..51,
                                     func: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 37..49,
                                             value: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 37..44,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 37..42,
                                                             id: Name("value"),
                                                             ctx: Load,
@@ -142,7 +142,7 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 42..44,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [],
                                                         keywords: [],
                                                     },
@@ -151,14 +151,14 @@ Module(
                                             attr: Identifier {
                                                 id: Name("attr"),
                                                 range: 45..49,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
                                     ),
                                     arguments: Arguments {
                                         range: 49..51,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -167,7 +167,7 @@ Module(
                             attr: Identifier {
                                 id: Name("foo"),
                                 range: 52..55,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -176,19 +176,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 56..70,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..70,
                             value: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 56..66,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 56..61,
                                             id: Name("value"),
                                             ctx: Load,
@@ -197,7 +197,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("attr"),
                                         range: 62..66,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -205,7 +205,7 @@ Module(
                             attr: Identifier {
                                 id: Name("foo"),
                                 range: 67..70,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -214,23 +214,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..89,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..89,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 71..85,
                                     func: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 71..83,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 72..77,
                                                     id: Name("value"),
                                                     ctx: Load,
@@ -239,14 +239,14 @@ Module(
                                             attr: Identifier {
                                                 id: Name("attr"),
                                                 range: 79..83,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
                                     ),
                                     arguments: Arguments {
                                         range: 83..85,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -255,7 +255,7 @@ Module(
                             attr: Identifier {
                                 id: Name("foo"),
                                 range: 86..89,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap
index d2791d35df..4b39468468 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/await.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..211,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..7,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..7,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,19 +32,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..19,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..19,
                             left: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..15,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 14..15,
                                             id: Name("x"),
                                             ctx: Load,
@@ -55,7 +55,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
                                     value: Int(
                                         1,
@@ -68,21 +68,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..33,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..33,
                             op: And,
                             values: [
                                 Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..27,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..27,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -92,7 +92,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 32..33,
                                         id: Name("b"),
                                         ctx: Load,
@@ -105,19 +105,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..43,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..43,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 40..43,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 40..41,
                                             id: Name("f"),
                                             ctx: Load,
@@ -125,7 +125,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 41..43,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -137,20 +137,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..56,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..56,
                             value: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 50..56,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 51..52,
                                                 value: Int(
                                                     1,
@@ -159,7 +159,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 54..55,
                                                 value: Int(
                                                     2,
@@ -176,20 +176,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..69,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..69,
                             value: Set(
                                 ExprSet {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 63..69,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 64..65,
                                                 value: Int(
                                                     3,
@@ -198,7 +198,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..68,
                                                 value: Int(
                                                     4,
@@ -214,22 +214,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 70..82,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..82,
                             value: Dict(
                                 ExprDict {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 76..82,
                                     items: [
                                         DictItem {
                                             key: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 77..78,
                                                         id: Name("i"),
                                                         ctx: Load,
@@ -238,7 +238,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 80..81,
                                                     value: Int(
                                                         5,
@@ -255,20 +255,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..93,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..93,
                             elts: [
                                 Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..90,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 89..90,
                                                 value: Int(
                                                     7,
@@ -279,7 +279,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..93,
                                         value: Int(
                                             8,
@@ -295,20 +295,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 94..107,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..107,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..107,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 101..102,
                                                 value: Int(
                                                     9,
@@ -317,7 +317,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 104..106,
                                                 value: Int(
                                                     10,
@@ -335,19 +335,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 108..120,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 108..120,
                             left: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 108..115,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 114..115,
                                             value: Int(
                                                 1,
@@ -362,7 +362,7 @@ Module(
                             comparators: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..120,
                                         value: Int(
                                             1,
@@ -376,26 +376,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..146,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 121..146,
                             test: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 132..136,
                                     value: true,
                                 },
                             ),
                             body: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 121..128,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 127..128,
                                             id: Name("x"),
                                             ctx: Load,
@@ -405,7 +405,7 @@ Module(
                             ),
                             orelse: NoneLiteral(
                                 ExprNoneLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 142..146,
                                 },
                             ),
@@ -415,24 +415,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 147..158,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 147..158,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 153..158,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 154..156,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 155..156,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -452,34 +452,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 159..178,
                     value: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 159..178,
                             value: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 166..177,
                                     parameters: Some(
                                         Parameters {
                                             range: 173..174,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 173..174,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 173..174,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 173..174,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -493,7 +491,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 176..177,
                                             id: Name("x"),
                                             ctx: Load,
@@ -507,19 +505,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 179..192,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 179..192,
                             left: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 179..186,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 185..186,
                                             id: Name("x"),
                                             ctx: Load,
@@ -530,12 +528,12 @@ Module(
                             op: Pow,
                             right: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 190..192,
                                     op: USub,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 191..192,
                                             id: Name("x"),
                                             ctx: Load,
@@ -549,19 +547,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 193..211,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 193..211,
                             left: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..200,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 199..200,
                                             id: Name("x"),
                                             ctx: Load,
@@ -572,11 +570,11 @@ Module(
                             op: Pow,
                             right: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 204..211,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 210..211,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap
index ac83b26a4d..3b4a7feb7b 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/bin_op.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..397,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..14,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..14,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         1,
@@ -30,7 +30,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     value: Int(
                                         2,
@@ -43,15 +43,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..20,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..20,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 15..16,
                                     value: Int(
                                         1,
@@ -61,7 +61,7 @@ Module(
                             op: Sub,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 19..20,
                                     value: Int(
                                         2,
@@ -74,15 +74,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..26,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..26,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
                                     value: Int(
                                         1,
@@ -92,7 +92,7 @@ Module(
                             op: Mult,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 25..26,
                                     value: Int(
                                         2,
@@ -105,15 +105,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..32,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..32,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 27..28,
                                     value: Int(
                                         1,
@@ -123,7 +123,7 @@ Module(
                             op: Div,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 31..32,
                                     value: Int(
                                         2,
@@ -136,15 +136,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..39,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..39,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 33..34,
                                     value: Int(
                                         1,
@@ -154,7 +154,7 @@ Module(
                             op: FloorDiv,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 38..39,
                                     value: Int(
                                         2,
@@ -167,15 +167,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..45,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..45,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 40..41,
                                     value: Int(
                                         1,
@@ -185,7 +185,7 @@ Module(
                             op: Mod,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..45,
                                     value: Int(
                                         2,
@@ -198,15 +198,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..52,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..52,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..47,
                                     value: Int(
                                         1,
@@ -216,7 +216,7 @@ Module(
                             op: Pow,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     value: Int(
                                         2,
@@ -229,15 +229,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..58,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..58,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     value: Int(
                                         1,
@@ -247,7 +247,7 @@ Module(
                             op: BitOr,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 57..58,
                                     value: Int(
                                         2,
@@ -260,15 +260,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..64,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..64,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..60,
                                     value: Int(
                                         1,
@@ -278,7 +278,7 @@ Module(
                             op: BitXor,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 63..64,
                                     value: Int(
                                         2,
@@ -291,15 +291,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..70,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..70,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..66,
                                     value: Int(
                                         1,
@@ -309,7 +309,7 @@ Module(
                             op: BitAnd,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 69..70,
                                     value: Int(
                                         2,
@@ -322,15 +322,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..77,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..77,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 71..72,
                                     value: Int(
                                         1,
@@ -340,7 +340,7 @@ Module(
                             op: RShift,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 76..77,
                                     value: Int(
                                         2,
@@ -353,15 +353,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..84,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 78..84,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 78..79,
                                     value: Int(
                                         1,
@@ -371,7 +371,7 @@ Module(
                             op: LShift,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..84,
                                     value: Int(
                                         2,
@@ -384,15 +384,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..90,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 85..90,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 85..86,
                                     value: Int(
                                         1,
@@ -402,7 +402,7 @@ Module(
                             op: MatMult,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 89..90,
                                     value: Int(
                                         2,
@@ -415,23 +415,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 110..123,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 110..123,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 110..119,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 110..115,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 110..111,
                                                     value: Int(
                                                         1,
@@ -441,7 +441,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 114..115,
                                                     value: Int(
                                                         2,
@@ -453,7 +453,7 @@ Module(
                                     op: Sub,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 118..119,
                                             value: Int(
                                                 3,
@@ -465,7 +465,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 122..123,
                                     value: Int(
                                         4,
@@ -478,31 +478,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 124..146,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 124..146,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 124..142,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 124..138,
                                             left: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 124..133,
                                                     left: BinOp(
                                                         ExprBinOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 124..129,
                                                             left: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 124..125,
                                                                     value: Int(
                                                                         1,
@@ -512,7 +512,7 @@ Module(
                                                             op: Mult,
                                                             right: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 128..129,
                                                                     value: Int(
                                                                         2,
@@ -524,7 +524,7 @@ Module(
                                                     op: Div,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 132..133,
                                                             value: Int(
                                                                 3,
@@ -536,7 +536,7 @@ Module(
                                             op: FloorDiv,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 137..138,
                                                     value: Int(
                                                         4,
@@ -548,7 +548,7 @@ Module(
                                     op: MatMult,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 141..142,
                                             value: Int(
                                                 5,
@@ -560,7 +560,7 @@ Module(
                             op: Mod,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 145..146,
                                     value: Int(
                                         6,
@@ -573,27 +573,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 147..168,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 147..168,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 147..163,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 147..158,
                                             left: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 147..153,
                                                     left: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 147..148,
                                                             value: Int(
                                                                 1,
@@ -603,7 +603,7 @@ Module(
                                                     op: LShift,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 152..153,
                                                             value: Int(
                                                                 2,
@@ -615,7 +615,7 @@ Module(
                                             op: RShift,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 157..158,
                                                     value: Int(
                                                         3,
@@ -627,7 +627,7 @@ Module(
                                     op: RShift,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 162..163,
                                             value: Int(
                                                 4,
@@ -639,7 +639,7 @@ Module(
                             op: LShift,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 167..168,
                                     value: Int(
                                         5,
@@ -652,15 +652,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 193..202,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 193..202,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..194,
                                     value: Int(
                                         1,
@@ -670,11 +670,11 @@ Module(
                             op: Add,
                             right: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 197..202,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 197..198,
                                             value: Int(
                                                 2,
@@ -684,7 +684,7 @@ Module(
                                     op: Mult,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 201..202,
                                             value: Int(
                                                 3,
@@ -699,19 +699,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 203..212,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 203..212,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 203..208,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 203..204,
                                             value: Int(
                                                 1,
@@ -721,7 +721,7 @@ Module(
                                     op: Mult,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 207..208,
                                             value: Int(
                                                 2,
@@ -733,7 +733,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 211..212,
                                     value: Int(
                                         3,
@@ -746,31 +746,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 213..244,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 213..244,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 213..235,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 213..231,
                                             left: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 213..223,
                                                     left: BinOp(
                                                         ExprBinOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 213..219,
                                                             left: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 213..214,
                                                                     value: Int(
                                                                         1,
@@ -780,7 +780,7 @@ Module(
                                                             op: Pow,
                                                             right: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 218..219,
                                                                     value: Int(
                                                                         2,
@@ -792,7 +792,7 @@ Module(
                                                     op: Mult,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 222..223,
                                                             value: Int(
                                                                 3,
@@ -804,11 +804,11 @@ Module(
                                             op: Sub,
                                             right: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 226..231,
                                                     left: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 226..227,
                                                             value: Int(
                                                                 4,
@@ -818,7 +818,7 @@ Module(
                                                     op: MatMult,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 230..231,
                                                             value: Int(
                                                                 5,
@@ -832,7 +832,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 234..235,
                                             value: Int(
                                                 6,
@@ -844,11 +844,11 @@ Module(
                             op: Sub,
                             right: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 238..244,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 238..239,
                                             value: Int(
                                                 7,
@@ -858,7 +858,7 @@ Module(
                                     op: FloorDiv,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 243..244,
                                             value: Int(
                                                 8,
@@ -873,15 +873,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 270..306,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 270..306,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 270..271,
                                     value: Int(
                                         1,
@@ -891,15 +891,15 @@ Module(
                             op: BitOr,
                             right: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 274..306,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 274..279,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 274..275,
                                                     value: Int(
                                                         2,
@@ -909,7 +909,7 @@ Module(
                                             op: BitAnd,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 278..279,
                                                     value: Int(
                                                         3,
@@ -921,19 +921,19 @@ Module(
                                     op: BitXor,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 282..306,
                                             left: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 282..301,
                                                     left: BinOp(
                                                         ExprBinOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 282..291,
                                                             left: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 282..283,
                                                                     value: Int(
                                                                         4,
@@ -943,11 +943,11 @@ Module(
                                                             op: Add,
                                                             right: BinOp(
                                                                 ExprBinOp {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 286..291,
                                                                     left: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 286..287,
                                                                             value: Int(
                                                                                 5,
@@ -957,7 +957,7 @@ Module(
                                                                     op: MatMult,
                                                                     right: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 290..291,
                                                                             value: Int(
                                                                                 6,
@@ -971,11 +971,11 @@ Module(
                                                     op: LShift,
                                                     right: BinOp(
                                                         ExprBinOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 295..301,
                                                             left: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 295..296,
                                                                     value: Int(
                                                                         7,
@@ -985,7 +985,7 @@ Module(
                                                             op: FloorDiv,
                                                             right: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 300..301,
                                                                     value: Int(
                                                                         8,
@@ -999,7 +999,7 @@ Module(
                                             op: RShift,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 305..306,
                                                     value: Int(
                                                         9,
@@ -1016,19 +1016,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 324..339,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 324..339,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 324..335,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 324..325,
                                             value: Int(
                                                 1,
@@ -1038,11 +1038,11 @@ Module(
                                     op: Add,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 329..334,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 329..330,
                                                     value: Int(
                                                         2,
@@ -1052,7 +1052,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 333..334,
                                                     value: Int(
                                                         3,
@@ -1066,7 +1066,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 338..339,
                                     value: Int(
                                         4,
@@ -1079,19 +1079,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 340..359,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 340..359,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 340..345,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 340..341,
                                             value: Int(
                                                 1,
@@ -1101,7 +1101,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 344..345,
                                             value: Int(
                                                 2,
@@ -1113,15 +1113,15 @@ Module(
                             op: Add,
                             right: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 349..358,
                                     left: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 349..354,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 349..350,
                                                     value: Int(
                                                         3,
@@ -1131,7 +1131,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 353..354,
                                                     value: Int(
                                                         4,
@@ -1143,7 +1143,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 357..358,
                                             value: Int(
                                                 5,
@@ -1158,15 +1158,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 390..396,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 390..396,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 390..391,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1175,12 +1175,12 @@ Module(
                             op: Add,
                             right: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 393..396,
                                     op: UAdd,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 395..396,
                                             id: Name("y"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap
index 7805f521fb..90362fa9dd 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/bool_op.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..142,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..7,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..7,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 0..1,
                                         id: Name("a"),
                                         ctx: Load,
@@ -30,7 +30,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 6..7,
                                         id: Name("b"),
                                         ctx: Load,
@@ -43,17 +43,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..21,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..21,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..9,
                                         id: Name("a"),
                                         ctx: Load,
@@ -61,7 +61,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..15,
                                         id: Name("b"),
                                         ctx: Load,
@@ -69,7 +69,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..21,
                                         id: Name("c"),
                                         ctx: Load,
@@ -82,17 +82,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..28,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..28,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..23,
                                         id: Name("a"),
                                         ctx: Load,
@@ -100,7 +100,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..28,
                                         id: Name("b"),
                                         ctx: Load,
@@ -113,17 +113,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..40,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..40,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..30,
                                         id: Name("a"),
                                         ctx: Load,
@@ -131,7 +131,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..35,
                                         id: Name("b"),
                                         ctx: Load,
@@ -139,7 +139,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..40,
                                         id: Name("c"),
                                         ctx: Load,
@@ -152,23 +152,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..53,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..53,
                             op: Or,
                             values: [
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 41..48,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 41..42,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -176,7 +176,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 47..48,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -187,7 +187,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..53,
                                         id: Name("c"),
                                         ctx: Load,
@@ -200,23 +200,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..88,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 54..88,
                             op: Or,
                             values: [
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..67,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 54..55,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -224,7 +224,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 60..61,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -232,7 +232,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 66..67,
                                                     id: Name("c"),
                                                     ctx: Load,
@@ -243,7 +243,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 71..72,
                                         id: Name("d"),
                                         ctx: Load,
@@ -251,13 +251,13 @@ Module(
                                 ),
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 76..83,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 76..77,
                                                     id: Name("e"),
                                                     ctx: Load,
@@ -265,7 +265,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 82..83,
                                                     id: Name("f"),
                                                     ctx: Load,
@@ -276,7 +276,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 87..88,
                                         id: Name("g"),
                                         ctx: Load,
@@ -289,23 +289,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 89..105,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 89..105,
                             op: Or,
                             values: [
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 89..100,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 89..90,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -313,12 +313,12 @@ Module(
                                             ),
                                             UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 95..100,
                                                     op: Not,
                                                     operand: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 99..100,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -331,7 +331,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 104..105,
                                         id: Name("c"),
                                         ctx: Load,
@@ -344,28 +344,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 106..124,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 106..124,
                             value: Some(
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 112..124,
                                         op: Or,
                                         values: [
                                             BoolOp(
                                                 ExprBoolOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 112..119,
                                                     op: And,
                                                     values: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 112..113,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -373,7 +373,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 118..119,
                                                                 id: Name("b"),
                                                                 ctx: Load,
@@ -384,7 +384,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 123..124,
                                                     id: Name("c"),
                                                     ctx: Load,
@@ -400,28 +400,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..141,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 125..141,
                             op: Or,
                             values: [
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 125..136,
                                         op: And,
                                         values: [
                                             UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 125..130,
                                                     op: Not,
                                                     operand: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 129..130,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -431,7 +431,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 135..136,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -442,7 +442,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 140..141,
                                         id: Name("c"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap
index 7a33b5db76..5f931e1947 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/call.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..349,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 114..120,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 114..120,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 114..118,
                                     id: Name("call"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 118..120,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -38,19 +38,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..132,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 121..132,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 121..130,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 121..125,
                                             id: Name("attr"),
                                             ctx: Load,
@@ -59,14 +59,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("expr"),
                                         range: 126..130,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 130..132,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -76,19 +76,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..150,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 133..150,
                             func: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 133..148,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 133..142,
                                             id: Name("subscript"),
                                             ctx: Load,
@@ -96,12 +96,12 @@ Module(
                                     ),
                                     slice: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 143..147,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 143..144,
                                                         value: Int(
                                                             1,
@@ -110,7 +110,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 146..147,
                                                         value: Int(
                                                             2,
@@ -127,7 +127,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 148..150,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -137,19 +137,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 151..162,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 151..162,
                             func: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 151..160,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 151..156,
                                             id: Name("slice"),
                                             ctx: Load,
@@ -157,13 +157,13 @@ Module(
                                     ),
                                     slice: Slice(
                                         ExprSlice {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 157..159,
                                             lower: None,
                                             upper: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 158..159,
                                                         value: Int(
                                                             1,
@@ -179,7 +179,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 160..162,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -189,20 +189,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 163..174,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 163..174,
                             func: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 163..172,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 164..165,
                                                 value: Int(
                                                     1,
@@ -211,7 +211,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 167..168,
                                                 value: Int(
                                                     2,
@@ -220,7 +220,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 170..171,
                                                 value: Int(
                                                     3,
@@ -233,7 +233,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 172..174,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -243,20 +243,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 175..186,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 175..186,
                             func: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 175..184,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 176..177,
                                                 value: Int(
                                                     1,
@@ -265,7 +265,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 179..180,
                                                 value: Int(
                                                     2,
@@ -274,7 +274,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 182..183,
                                                 value: Int(
                                                     3,
@@ -288,7 +288,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 184..186,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -298,19 +298,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 187..206,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 187..206,
                             func: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 187..204,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 188..189,
                                             id: Name("x"),
                                             ctx: Load,
@@ -319,10 +319,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 190..203,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 194..195,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -330,7 +330,7 @@ Module(
                                             ),
                                             iter: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 199..203,
                                                     id: Name("iter"),
                                                     ctx: Load,
@@ -345,7 +345,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 204..206,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -355,20 +355,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 207..218,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 207..218,
                             func: Set(
                                 ExprSet {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 207..216,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 208..209,
                                                 value: Int(
                                                     1,
@@ -377,7 +377,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 211..212,
                                                 value: Int(
                                                     2,
@@ -386,7 +386,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 214..215,
                                                 value: Int(
                                                     3,
@@ -398,7 +398,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 216..218,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -408,22 +408,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 219..233,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 219..233,
                             func: Dict(
                                 ExprDict {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 219..231,
                                     items: [
                                         DictItem {
                                             key: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 220..221,
                                                         value: Int(
                                                             1,
@@ -433,7 +433,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 223..224,
                                                     value: Int(
                                                         2,
@@ -445,7 +445,7 @@ Module(
                                             key: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 226..227,
                                                         value: Int(
                                                             3,
@@ -455,7 +455,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 229..230,
                                                     value: Int(
                                                         4,
@@ -468,7 +468,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 231..233,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -478,20 +478,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 234..245,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 234..245,
                             func: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 235..242,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 241..242,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -502,7 +502,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 243..245,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -512,22 +512,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 306..312,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 306..312,
                             func: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 306..310,
                                     value: true,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 310..312,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -537,22 +537,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 313..320,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 313..320,
                             func: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 313..318,
                                     value: false,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 318..320,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -562,21 +562,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 321..327,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 321..327,
                             func: NoneLiteral(
                                 ExprNoneLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 321..325,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 325..327,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -586,26 +586,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 328..338,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 328..338,
                             func: StringLiteral(
                                 ExprStringLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 328..336,
                                     value: StringLiteralValue {
                                         inner: Single(
                                             StringLiteral {
                                                 range: 328..336,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "string",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -614,7 +615,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 336..338,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -624,15 +625,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 339..342,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 339..342,
                             func: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 339..340,
                                     value: Int(
                                         1,
@@ -641,7 +642,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 340..342,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -651,15 +652,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 343..348,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 343..348,
                             func: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 343..346,
                                     value: Float(
                                         1.0,
@@ -668,7 +669,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 346..348,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap
index e2bd2b568c..ef4b3720a0 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/compare.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..542,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..15,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..15,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     id: Name("a"),
                                     ctx: Load,
@@ -32,7 +32,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..15,
                                         id: Name("b"),
                                         ctx: Load,
@@ -45,15 +45,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..21,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..21,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..17,
                                     id: Name("b"),
                                     ctx: Load,
@@ -65,7 +65,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..21,
                                         id: Name("a"),
                                         ctx: Load,
@@ -78,15 +78,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..27,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..27,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
                                     id: Name("b"),
                                     ctx: Load,
@@ -98,7 +98,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..27,
                                         id: Name("a"),
                                         ctx: Load,
@@ -111,15 +111,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..34,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..34,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..29,
                                     id: Name("a"),
                                     ctx: Load,
@@ -131,7 +131,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 33..34,
                                         id: Name("b"),
                                         ctx: Load,
@@ -144,15 +144,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..41,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..41,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 35..36,
                                     id: Name("a"),
                                     ctx: Load,
@@ -164,7 +164,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..41,
                                         id: Name("b"),
                                         ctx: Load,
@@ -177,15 +177,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..48,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 42..48,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..43,
                                     id: Name("a"),
                                     ctx: Load,
@@ -197,7 +197,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 47..48,
                                         id: Name("b"),
                                         ctx: Load,
@@ -210,15 +210,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..55,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..55,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..50,
                                     id: Name("a"),
                                     ctx: Load,
@@ -230,7 +230,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         id: Name("c"),
                                         ctx: Load,
@@ -243,15 +243,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 56..62,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..62,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 56..57,
                                     id: Name("a"),
                                     ctx: Load,
@@ -263,7 +263,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 61..62,
                                         id: Name("b"),
                                         ctx: Load,
@@ -276,15 +276,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..73,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..73,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 63..64,
                                     id: Name("a"),
                                     ctx: Load,
@@ -296,7 +296,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..73,
                                         id: Name("c"),
                                         ctx: Load,
@@ -309,15 +309,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..84,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 74..84,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 74..75,
                                     id: Name("a"),
                                     ctx: Load,
@@ -329,7 +329,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..84,
                                         id: Name("b"),
                                         ctx: Load,
@@ -342,15 +342,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 110..156,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 110..156,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 110..111,
                                     id: Name("a"),
                                     ctx: Load,
@@ -366,7 +366,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 119..120,
                                         id: Name("b"),
                                         ctx: Load,
@@ -374,7 +374,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 128..129,
                                         id: Name("c"),
                                         ctx: Load,
@@ -382,7 +382,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 137..138,
                                         id: Name("d"),
                                         ctx: Load,
@@ -390,7 +390,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 146..147,
                                         id: Name("e"),
                                         ctx: Load,
@@ -398,7 +398,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 155..156,
                                         id: Name("f"),
                                         ctx: Load,
@@ -411,19 +411,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 177..203,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 177..203,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 177..182,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 177..178,
                                             id: Name("a"),
                                             ctx: Load,
@@ -432,7 +432,7 @@ Module(
                                     op: BitOr,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 181..182,
                                             id: Name("b"),
                                             ctx: Load,
@@ -447,11 +447,11 @@ Module(
                             comparators: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 185..190,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 185..186,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -460,7 +460,7 @@ Module(
                                         op: BitOr,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 189..190,
                                                 id: Name("d"),
                                                 ctx: Load,
@@ -470,11 +470,11 @@ Module(
                                 ),
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 198..203,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 198..199,
                                                 id: Name("e"),
                                                 ctx: Load,
@@ -483,7 +483,7 @@ Module(
                                         op: BitAnd,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 202..203,
                                                 id: Name("f"),
                                                 ctx: Load,
@@ -498,20 +498,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 379..393,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 379..393,
                             op: Not,
                             operand: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 383..393,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 383..384,
                                             id: Name("x"),
                                             ctx: Load,
@@ -523,7 +523,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 392..393,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -538,17 +538,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 395..416,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 395..416,
                             op: Or,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 395..396,
                                         id: Name("x"),
                                         ctx: Load,
@@ -556,17 +556,17 @@ Module(
                                 ),
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 400..416,
                                         op: And,
                                         values: [
                                             Compare(
                                                 ExprCompare {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 400..410,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 400..401,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -578,7 +578,7 @@ Module(
                                                     comparators: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 409..410,
                                                                 id: Name("z"),
                                                                 ctx: Load,
@@ -589,7 +589,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 415..416,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -605,15 +605,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 417..429,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 417..429,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 417..418,
                                     id: Name("x"),
                                     ctx: Load,
@@ -625,11 +625,11 @@ Module(
                             comparators: [
                                 Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 422..429,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 428..429,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -644,15 +644,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 430..446,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 430..446,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 430..431,
                                     id: Name("x"),
                                     ctx: Load,
@@ -664,11 +664,11 @@ Module(
                             comparators: [
                                 Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 439..446,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 445..446,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -683,15 +683,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 489..541,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 489..541,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 489..490,
                                     id: Name("a"),
                                     ctx: Load,
@@ -711,7 +711,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 493..494,
                                         id: Name("b"),
                                         ctx: Load,
@@ -719,7 +719,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 498..499,
                                         id: Name("c"),
                                         ctx: Load,
@@ -727,7 +727,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 502..503,
                                         id: Name("d"),
                                         ctx: Load,
@@ -735,7 +735,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 507..508,
                                         id: Name("e"),
                                         ctx: Load,
@@ -743,7 +743,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 516..517,
                                         id: Name("f"),
                                         ctx: Load,
@@ -751,7 +751,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 525..526,
                                         id: Name("g"),
                                         ctx: Load,
@@ -759,7 +759,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 530..531,
                                         id: Name("h"),
                                         ctx: Load,
@@ -767,7 +767,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 535..536,
                                         id: Name("i"),
                                         ctx: Load,
@@ -775,7 +775,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 540..541,
                                         id: Name("j"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap
index d368b8654b..1eef98686d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/dictionary.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..622,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..11,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..11,
                             items: [],
                         },
@@ -25,18 +25,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..18,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..18,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..14,
                                                 value: Int(
                                                     1,
@@ -46,7 +46,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..17,
                                             value: Int(
                                                 2,
@@ -61,18 +61,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..43,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..43,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..21,
                                                 value: Int(
                                                     1,
@@ -82,7 +82,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 23..24,
                                             value: Int(
                                                 2,
@@ -94,7 +94,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..27,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -103,7 +103,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..30,
                                             value: Int(
                                                 1,
@@ -115,7 +115,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 32..33,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -124,18 +124,19 @@ Module(
                                     ),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..42,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 35..42,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -150,11 +151,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..69,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..69,
                             items: [],
                         },
@@ -163,18 +164,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 70..100,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..100,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 76..77,
                                                 value: Int(
                                                     1,
@@ -184,7 +185,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 83..84,
                                             value: Int(
                                                 2,
@@ -196,7 +197,7 @@ Module(
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 90..91,
                                                 value: Int(
                                                     3,
@@ -206,7 +207,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 97..98,
                                             value: Int(
                                                 4,
@@ -221,25 +222,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 111..132,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 111..132,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Dict(
                                             ExprDict {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 112..118,
                                                 items: [
                                                     DictItem {
                                                         key: Some(
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 113..114,
                                                                     value: Int(
                                                                         1,
@@ -249,7 +250,7 @@ Module(
                                                         ),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 116..117,
                                                                 value: Int(
                                                                     2,
@@ -263,14 +264,14 @@ Module(
                                     ),
                                     value: Dict(
                                         ExprDict {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 120..131,
                                             items: [
                                                 DictItem {
                                                     key: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 121..122,
                                                                 value: Int(
                                                                     3,
@@ -280,14 +281,14 @@ Module(
                                                     ),
                                                     value: Dict(
                                                         ExprDict {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 124..130,
                                                             items: [
                                                                 DictItem {
                                                                     key: Some(
                                                                         NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 125..126,
                                                                                 value: Int(
                                                                                     4,
@@ -297,7 +298,7 @@ Module(
                                                                     ),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 128..129,
                                                                             value: Int(
                                                                                 5,
@@ -320,37 +321,35 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..171,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..171,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 156..167,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 163..164,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 163..164,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 163..164,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 163..164,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -364,7 +363,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 166..167,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -375,7 +374,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 169..170,
                                             value: Int(
                                                 1,
@@ -390,29 +389,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 172..202,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 172..202,
                             items: [
                                 DictItem {
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 173..176,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 173..176,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "A",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Single,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -422,26 +422,24 @@ Module(
                                     ),
                                     value: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 178..192,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 185..186,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 185..186,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 185..186,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("p"),
                                                                     range: 185..186,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -455,7 +453,7 @@ Module(
                                             ),
                                             body: NoneLiteral(
                                                 ExprNoneLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 188..192,
                                                 },
                                             ),
@@ -466,18 +464,19 @@ Module(
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 194..197,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 194..197,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "B",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Single,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -487,7 +486,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 199..200,
                                             id: Name("C"),
                                             ctx: Load,
@@ -501,22 +500,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 224..237,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 224..237,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 226..232,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 226..227,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -524,7 +523,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 231..232,
                                                         value: Int(
                                                             1,
@@ -536,7 +535,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 235..236,
                                             id: Name("y"),
                                             ctx: Load,
@@ -550,22 +549,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 238..258,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 238..258,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 240..246,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 240..241,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -573,7 +572,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 245..246,
                                                         value: Int(
                                                             1,
@@ -585,11 +584,11 @@ Module(
                                     ),
                                     value: Named(
                                         ExprNamed {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 250..256,
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 250..251,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -597,7 +596,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 255..256,
                                                     value: Int(
                                                         2,
@@ -614,18 +613,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 284..289,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 284..289,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 287..288,
                                             id: Name("d"),
                                             ctx: Load,
@@ -639,18 +638,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 290..301,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 290..301,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 291..292,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -659,7 +658,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 294..295,
                                             id: Name("b"),
                                             ctx: Load,
@@ -670,7 +669,7 @@ Module(
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 299..300,
                                             id: Name("d"),
                                             ctx: Load,
@@ -684,18 +683,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 302..312,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 302..312,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 305..306,
                                             id: Name("a"),
                                             ctx: Load,
@@ -706,7 +705,7 @@ Module(
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 310..311,
                                             id: Name("b"),
                                             ctx: Load,
@@ -720,29 +719,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 313..338,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 313..338,
                             items: [
                                 DictItem {
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 314..317,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 314..317,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "a",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -752,18 +752,19 @@ Module(
                                     ),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 319..322,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 319..322,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "b",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -775,7 +776,7 @@ Module(
                                     key: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 326..327,
                                             id: Name("c"),
                                             ctx: Load,
@@ -786,18 +787,19 @@ Module(
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 329..332,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 329..332,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "d",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -807,18 +809,19 @@ Module(
                                     ),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 334..337,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 334..337,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "e",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -833,18 +836,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 339..367,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 339..367,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 340..341,
                                                 value: Int(
                                                     1,
@@ -854,7 +857,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 343..344,
                                             value: Int(
                                                 2,
@@ -866,25 +869,26 @@ Module(
                                     key: None,
                                     value: Dict(
                                         ExprDict {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 348..366,
                                             items: [
                                                 DictItem {
                                                     key: Some(
                                                         StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 349..357,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 349..357,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "nested",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Single,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -894,18 +898,19 @@ Module(
                                                     ),
                                                     value: StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 359..365,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 359..365,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "dict",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Single,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -924,22 +929,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 368..393,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 368..393,
                             items: [
                                 DictItem {
                                     key: Some(
                                         BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 369..374,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 369..370,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -948,7 +953,7 @@ Module(
                                                 op: Mult,
                                                 right: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 373..374,
                                                         value: Int(
                                                             1,
@@ -960,11 +965,11 @@ Module(
                                     ),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 376..382,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 376..377,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -973,7 +978,7 @@ Module(
                                             op: Pow,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 381..382,
                                                     value: Int(
                                                         2,
@@ -987,11 +992,11 @@ Module(
                                     key: None,
                                     value: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 386..392,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 386..390,
                                                     id: Name("call"),
                                                     ctx: Load,
@@ -999,7 +1004,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 390..392,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -1013,23 +1018,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 460..471,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 460..471,
                             items: [
                                 DictItem {
                                     key: None,
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 464..469,
                                             op: Not,
                                             operand: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 468..469,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -1045,18 +1050,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 494..515,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 494..515,
                             items: [
                                 DictItem {
                                     key: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 495..496,
                                                 value: Int(
                                                     1,
@@ -1066,18 +1071,18 @@ Module(
                                     ),
                                     value: If(
                                         ExprIf {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 498..514,
                                             test: BooleanLiteral(
                                                 ExprBooleanLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 503..507,
                                                     value: true,
                                                 },
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 498..499,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -1085,7 +1090,7 @@ Module(
                                             ),
                                             orelse: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 513..514,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -1101,26 +1106,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 516..575,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 516..575,
                             key: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 517..533,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 522..526,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 517..518,
                                             id: Name("x"),
                                             ctx: Load,
@@ -1128,7 +1133,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 532..533,
                                             id: Name("y"),
                                             ctx: Load,
@@ -1138,7 +1143,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 535..536,
                                     id: Name("y"),
                                     ctx: Load,
@@ -1147,10 +1152,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 537..555,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 541..542,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1158,11 +1163,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 546..555,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 546..551,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -1170,11 +1175,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 551..555,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 552..554,
                                                             value: Int(
                                                                 10,
@@ -1191,10 +1196,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 556..574,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 560..561,
                                             id: Name("y"),
                                             ctx: Store,
@@ -1202,11 +1207,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 565..574,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 565..570,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -1214,11 +1219,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 570..574,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 571..573,
                                                             value: Int(
                                                                 10,
@@ -1240,23 +1245,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 576..600,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 576..600,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Set(
                                             ExprSet {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 577..583,
                                                 elts: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 578..579,
                                                             value: Int(
                                                                 1,
@@ -1265,7 +1270,7 @@ Module(
                                                     ),
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 581..582,
                                                             value: Int(
                                                                 2,
@@ -1278,7 +1283,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 585..586,
                                             value: Int(
                                                 3,
@@ -1290,7 +1295,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 588..589,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1299,14 +1304,14 @@ Module(
                                     ),
                                     value: Dict(
                                         ExprDict {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 591..598,
                                             items: [
                                                 DictItem {
                                                     key: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 592..593,
                                                                 value: Int(
                                                                     1,
@@ -1316,7 +1321,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 595..596,
                                                             value: Int(
                                                                 2,
@@ -1335,18 +1340,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 601..621,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 601..621,
                             items: [
                                 DictItem {
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 603..604,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -1355,7 +1360,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 608..609,
                                             id: Name("y"),
                                             ctx: Load,
@@ -1366,7 +1371,7 @@ Module(
                                     key: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 613..614,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -1375,7 +1380,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 618..619,
                                             id: Name("a"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap
index d54aceae23..5046336486 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/dictionary_com
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..589,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..22,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..2,
                                     id: Name("y"),
                                     ctx: Load,
@@ -29,10 +29,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 3..21,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             id: Name("y"),
                                             ctx: Store,
@@ -40,12 +40,12 @@ Module(
                                     ),
                                     iter: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 12..21,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 13..14,
                                                         value: Int(
                                                             1,
@@ -54,7 +54,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 16..17,
                                                         value: Int(
                                                             2,
@@ -63,7 +63,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 19..20,
                                                         value: Int(
                                                             3,
@@ -85,15 +85,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..42,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..42,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..26,
                                     id: Name("x1"),
                                     ctx: Load,
@@ -101,7 +101,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..30,
                                     id: Name("x2"),
                                     ctx: Load,
@@ -110,10 +110,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 31..41,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             id: Name("y"),
                                             ctx: Store,
@@ -121,7 +121,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 40..41,
                                             id: Name("z"),
                                             ctx: Load,
@@ -137,19 +137,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..73,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..73,
                             key: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..49,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 44..45,
                                             id: Name("x"),
                                             ctx: Load,
@@ -158,7 +158,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 48..49,
                                             value: Int(
                                                 1,
@@ -169,18 +169,19 @@ Module(
                             ),
                             value: StringLiteral(
                                 ExprStringLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..54,
                                     value: StringLiteralValue {
                                         inner: Single(
                                             StringLiteral {
                                                 range: 51..54,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "x",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -190,10 +191,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 55..72,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..60,
                                             id: Name("i"),
                                             ctx: Store,
@@ -201,11 +202,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 64..72,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 64..69,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -213,11 +214,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 69..72,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 70..71,
                                                             value: Int(
                                                                 5,
@@ -239,15 +240,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..122,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 74..122,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 75..76,
                                     id: Name("b"),
                                     ctx: Load,
@@ -255,11 +256,11 @@ Module(
                             ),
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 78..83,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 78..79,
                                             id: Name("c"),
                                             ctx: Load,
@@ -268,7 +269,7 @@ Module(
                                     op: Mult,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..83,
                                             value: Int(
                                                 2,
@@ -280,10 +281,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 84..121,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 88..89,
                                             id: Name("c"),
                                             ctx: Store,
@@ -291,7 +292,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 93..94,
                                             id: Name("d"),
                                             ctx: Load,
@@ -300,11 +301,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 98..104,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 98..99,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -316,7 +317,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 103..104,
                                                             id: Name("w"),
                                                             ctx: Load,
@@ -327,13 +328,13 @@ Module(
                                         ),
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 108..116,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 108..109,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -341,7 +342,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 114..116,
                                                             id: Name("yy"),
                                                             ctx: Load,
@@ -352,7 +353,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 120..121,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -368,15 +369,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 123..176,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 123..176,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 124..125,
                                     id: Name("a"),
                                     ctx: Load,
@@ -384,11 +385,11 @@ Module(
                             ),
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 127..133,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 127..128,
                                             id: Name("a"),
                                             ctx: Load,
@@ -397,7 +398,7 @@ Module(
                                     op: Pow,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 132..133,
                                             value: Int(
                                                 2,
@@ -409,10 +410,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 134..155,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 138..139,
                                             id: Name("b"),
                                             ctx: Store,
@@ -420,7 +421,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 143..144,
                                             id: Name("c"),
                                             ctx: Load,
@@ -429,13 +430,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 148..155,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 148..149,
                                                             id: Name("d"),
                                                             ctx: Load,
@@ -443,7 +444,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 154..155,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -457,10 +458,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 156..175,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 160..161,
                                             id: Name("f"),
                                             ctx: Store,
@@ -468,7 +469,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 165..166,
                                             id: Name("j"),
                                             ctx: Load,
@@ -477,11 +478,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 170..175,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 170..171,
                                                         id: Name("k"),
                                                         ctx: Load,
@@ -493,7 +494,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 174..175,
                                                             id: Name("h"),
                                                             ctx: Load,
@@ -512,15 +513,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 177..231,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 177..231,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 178..179,
                                     id: Name("a"),
                                     ctx: Load,
@@ -528,7 +529,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 181..182,
                                     id: Name("b"),
                                     ctx: Load,
@@ -537,10 +538,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 183..204,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 187..188,
                                             id: Name("b"),
                                             ctx: Store,
@@ -548,7 +549,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 192..193,
                                             id: Name("c"),
                                             ctx: Load,
@@ -557,13 +558,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 197..204,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 197..198,
                                                             id: Name("d"),
                                                             ctx: Load,
@@ -571,7 +572,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 203..204,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -585,10 +586,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 205..230,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 215..216,
                                             id: Name("f"),
                                             ctx: Store,
@@ -596,7 +597,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 220..221,
                                             id: Name("j"),
                                             ctx: Load,
@@ -605,11 +606,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 225..230,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 225..226,
                                                         id: Name("k"),
                                                         ctx: Load,
@@ -621,7 +622,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 229..230,
                                                             id: Name("h"),
                                                             ctx: Load,
@@ -640,15 +641,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 232..252,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 232..252,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 233..234,
                                     id: Name("a"),
                                     ctx: Load,
@@ -656,7 +657,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 236..237,
                                     id: Name("a"),
                                     ctx: Load,
@@ -665,15 +666,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 238..251,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 242..246,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 242..243,
                                                         id: Name("b"),
                                                         ctx: Store,
@@ -681,7 +682,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 245..246,
                                                         id: Name("c"),
                                                         ctx: Store,
@@ -694,7 +695,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 250..251,
                                             id: Name("d"),
                                             ctx: Load,
@@ -710,15 +711,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 391..416,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 391..416,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 392..393,
                                     id: Name("x"),
                                     ctx: Load,
@@ -726,7 +727,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 395..396,
                                     id: Name("y"),
                                     ctx: Load,
@@ -735,10 +736,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 397..415,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 401..402,
                                             id: Name("x"),
                                             ctx: Store,
@@ -746,12 +747,12 @@ Module(
                                     ),
                                     iter: Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 407..414,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 413..414,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -770,15 +771,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 417..447,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 417..447,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 418..419,
                                     id: Name("x"),
                                     ctx: Load,
@@ -786,7 +787,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 421..422,
                                     id: Name("y"),
                                     ctx: Load,
@@ -795,10 +796,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 423..446,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 427..428,
                                             id: Name("x"),
                                             ctx: Store,
@@ -806,11 +807,11 @@ Module(
                                     ),
                                     iter: YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 433..445,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 444..445,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -828,15 +829,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 448..477,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 448..477,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 449..450,
                                     id: Name("x"),
                                     ctx: Load,
@@ -844,7 +845,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 452..453,
                                     id: Name("y"),
                                     ctx: Load,
@@ -853,10 +854,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 454..476,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 458..459,
                                             id: Name("x"),
                                             ctx: Store,
@@ -864,26 +865,24 @@ Module(
                                     ),
                                     iter: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 464..475,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 471..472,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 471..472,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 471..472,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 471..472,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -897,7 +896,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 474..475,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -915,15 +914,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 478..511,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 478..511,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 479..480,
                                     id: Name("x"),
                                     ctx: Load,
@@ -931,7 +930,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 482..483,
                                     id: Name("y"),
                                     ctx: Load,
@@ -940,10 +939,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 484..510,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 488..489,
                                             id: Name("x"),
                                             ctx: Store,
@@ -951,7 +950,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 493..497,
                                             id: Name("data"),
                                             ctx: Load,
@@ -960,12 +959,12 @@ Module(
                                     ifs: [
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 502..509,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 508..509,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -984,15 +983,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 512..550,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 512..550,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 513..514,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1000,7 +999,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 516..517,
                                     id: Name("y"),
                                     ctx: Load,
@@ -1009,10 +1008,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 518..549,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 522..523,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1020,7 +1019,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 527..531,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1029,11 +1028,11 @@ Module(
                                     ifs: [
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 536..548,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 547..548,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1051,15 +1050,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 551..588,
                     value: DictComp(
                         ExprDictComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 551..588,
                             key: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 552..553,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1067,7 +1066,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 555..556,
                                     id: Name("y"),
                                     ctx: Load,
@@ -1076,10 +1075,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 557..587,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 561..562,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1087,7 +1086,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 566..570,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1096,26 +1095,24 @@ Module(
                                     ifs: [
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 575..586,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 582..583,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 582..583,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 582..583,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 582..583,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -1129,7 +1126,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 585..586,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap
index 1fe9ef6fa7..a7a0f0c925 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap
@@ -7,28 +7,29 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/f_string.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..979,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..21,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..21,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 18..21,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [],
                                             flags: FStringFlags {
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -40,23 +41,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..25,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..25,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 22..25,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [],
                                             flags: FStringFlags {
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -68,23 +70,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..29,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..29,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 26..29,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [],
                                             flags: FStringFlags {
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -96,23 +99,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..37,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..37,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 30..37,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [],
                                             flags: FStringFlags {
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -124,23 +128,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..45,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..45,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 38..45,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [],
                                             flags: FStringFlags {
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -152,37 +157,38 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..56,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..56,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 47..56,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 49..55,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 50..54,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 50..54,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: " f",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Double,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -199,6 +205,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -210,26 +217,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..67,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..67,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 57..67,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 59..66,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 60..63,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -245,6 +252,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -256,31 +264,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..75,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..75,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 68..75,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 70..74,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Tuple(
                                                             ExprTuple {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 71..73,
                                                                 elts: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 71..72,
                                                                             value: Int(
                                                                                 3,
@@ -302,6 +310,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -313,30 +322,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 76..86,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 76..86,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 76..86,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 78..85,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Compare(
                                                             ExprCompare {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 79..83,
                                                                 left: NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 79..80,
                                                                         value: Int(
                                                                             3,
@@ -349,7 +358,7 @@ Module(
                                                                 comparators: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 82..83,
                                                                             value: Int(
                                                                                 4,
@@ -364,7 +373,7 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 84..84,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [],
                                                             },
                                                         ),
@@ -375,6 +384,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -386,26 +396,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..102,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..102,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 87..102,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 89..101,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 90..91,
                                                                 value: Int(
                                                                     3,
@@ -417,26 +427,27 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 92..100,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Interpolation(
                                                                         InterpolatedElement {
                                                                             range: 92..97,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             expression: StringLiteral(
                                                                                 ExprStringLiteral {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 93..96,
                                                                                     value: StringLiteralValue {
                                                                                         inner: Single(
                                                                                             StringLiteral {
                                                                                                 range: 93..96,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "}",
                                                                                                 flags: StringLiteralFlags {
                                                                                                     quote_style: Double,
                                                                                                     prefix: Empty,
                                                                                                     triple_quoted: false,
+                                                                                                    unclosed: false,
                                                                                                 },
                                                                                             },
                                                                                         ),
@@ -451,7 +462,7 @@ Module(
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 97..100,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ">10",
                                                                         },
                                                                     ),
@@ -465,6 +476,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -476,26 +488,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..118,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 103..118,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 103..118,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 105..117,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 106..107,
                                                                 value: Int(
                                                                     3,
@@ -507,26 +519,27 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 108..116,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Interpolation(
                                                                         InterpolatedElement {
                                                                             range: 108..113,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             expression: StringLiteral(
                                                                                 ExprStringLiteral {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 109..112,
                                                                                     value: StringLiteralValue {
                                                                                         inner: Single(
                                                                                             StringLiteral {
                                                                                                 range: 109..112,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "{",
                                                                                                 flags: StringLiteralFlags {
                                                                                                     quote_style: Double,
                                                                                                     prefix: Empty,
                                                                                                     triple_quoted: false,
+                                                                                                    unclosed: false,
                                                                                                 },
                                                                                             },
                                                                                         ),
@@ -541,7 +554,7 @@ Module(
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 113..116,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ">10",
                                                                         },
                                                                     ),
@@ -555,6 +568,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -566,26 +580,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..133,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..133,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 119..133,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 121..132,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 124..127,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -606,6 +620,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -617,26 +632,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 134..154,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 134..154,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 134..154,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 136..153,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 139..142,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -652,12 +667,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 147..152,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 147..152,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f  ",
                                                                         },
                                                                     ),
@@ -671,6 +686,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -682,26 +698,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..173,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..173,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 155..173,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 157..172,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 160..163,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -722,6 +738,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -733,31 +750,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 174..190,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 174..190,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 174..190,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 176..189,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Tuple(
                                                             ExprTuple {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 179..183,
                                                                 elts: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 179..180,
                                                                             value: Int(
                                                                                 1,
@@ -766,7 +783,7 @@ Module(
                                                                     ),
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 182..183,
                                                                             value: Int(
                                                                                 2,
@@ -793,6 +810,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -804,41 +822,41 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 191..217,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 191..217,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 191..217,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 193..216,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 194..210,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 194..210,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 196..209,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: NumberLiteral(
                                                                                                 ExprNumberLiteral {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 197..203,
                                                                                                     value: Float(
                                                                                                         3.1415,
@@ -855,12 +873,12 @@ Module(
                                                                                             format_spec: Some(
                                                                                                 InterpolatedStringFormatSpec {
                                                                                                     range: 205..208,
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     elements: [
                                                                                                         Literal(
                                                                                                             InterpolatedStringLiteralElement {
                                                                                                                 range: 205..208,
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 value: ".1f",
                                                                                                             },
                                                                                                         ),
@@ -874,6 +892,7 @@ Module(
                                                                                     quote_style: Double,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -886,12 +905,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 211..215,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 211..215,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "*^20",
                                                                         },
                                                                     ),
@@ -905,6 +924,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -916,18 +936,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 219..253,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 219..253,
                             items: [
                                 DictItem {
                                     key: Some(
                                         FString(
                                             ExprFString {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 220..248,
                                                 value: FStringValue {
                                                     inner: Concatenated(
@@ -935,38 +955,39 @@ Module(
                                                             Literal(
                                                                 StringLiteral {
                                                                     range: 220..226,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "foo ",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Double,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
                                                             FString(
                                                                 FString {
                                                                     range: 227..242,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     elements: [
                                                                         Literal(
                                                                             InterpolatedStringLiteralElement {
                                                                                 range: 229..233,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "bar ",
                                                                             },
                                                                         ),
                                                                         Interpolation(
                                                                             InterpolatedElement {
                                                                                 range: 233..240,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 expression: BinOp(
                                                                                     ExprBinOp {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 234..239,
                                                                                         left: Name(
                                                                                             ExprName {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 234..235,
                                                                                                 id: Name("x"),
                                                                                                 ctx: Load,
@@ -975,7 +996,7 @@ Module(
                                                                                         op: Add,
                                                                                         right: Name(
                                                                                             ExprName {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 238..239,
                                                                                                 id: Name("y"),
                                                                                                 ctx: Load,
@@ -991,7 +1012,7 @@ Module(
                                                                         Literal(
                                                                             InterpolatedStringLiteralElement {
                                                                                 range: 240..241,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: " ",
                                                                             },
                                                                         ),
@@ -1000,18 +1021,20 @@ Module(
                                                                         quote_style: Double,
                                                                         prefix: Regular,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
                                                             Literal(
                                                                 StringLiteral {
                                                                     range: 243..248,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "baz",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Double,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -1023,7 +1046,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 250..252,
                                             value: Int(
                                                 10,
@@ -1038,11 +1061,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 254..345,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 260..263,
                             id: Name("foo"),
                             ctx: Load,
@@ -1051,25 +1074,26 @@ Module(
                     cases: [
                         MatchCase {
                             range: 269..293,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 274..279,
-                                    node_index: AtomicNodeIndex(..),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 274..279,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 274..279,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "one",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -1082,7 +1106,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 289..293,
                                     },
                                 ),
@@ -1090,14 +1114,14 @@ Module(
                         },
                         MatchCase {
                             range: 298..345,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 303..331,
-                                    node_index: AtomicNodeIndex(..),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 303..331,
                                             value: StringLiteralValue {
                                                 inner: Concatenated(
@@ -1105,22 +1129,24 @@ Module(
                                                         strings: [
                                                             StringLiteral {
                                                                 range: 303..316,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "implicitly ",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                             StringLiteral {
                                                                 range: 317..331,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "concatenated",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ],
@@ -1136,7 +1162,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 341..345,
                                     },
                                 ),
@@ -1147,33 +1173,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 347..364,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 347..364,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 347..364,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 349..350,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "\\",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 350..355,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 351..354,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -1187,17 +1213,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 355..356,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "\\",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 356..363,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 357..360,
                                                                 id: Name("bar"),
                                                                 ctx: Load,
@@ -1208,12 +1234,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 361..362,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 361..362,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "\\",
                                                                         },
                                                                     ),
@@ -1227,6 +1253,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1238,23 +1265,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 365..379,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 365..379,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 365..379,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 367..378,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "\\{foo\\}",
                                                     },
                                                 ),
@@ -1263,6 +1290,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1274,26 +1302,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 380..420,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 380..420,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 380..420,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 384..417,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 390..393,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -1304,12 +1332,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 394..416,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 394..416,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "x\n        y\n        z\n",
                                                                         },
                                                                     ),
@@ -1323,6 +1351,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1334,26 +1363,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 421..439,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 421..439,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 421..439,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 423..438,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 428..431,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -1374,6 +1403,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1385,33 +1415,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 441..486,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 441..486,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 441..486,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 443..450,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "normal ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 450..455,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 451..454,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -1425,17 +1455,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 455..468,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " {another} ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 468..473,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 469..472,
                                                                 id: Name("bar"),
                                                                 ctx: Load,
@@ -1449,17 +1479,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 473..476,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " {",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 476..483,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 477..482,
                                                                 id: Name("three"),
                                                                 ctx: Load,
@@ -1473,7 +1503,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 483..485,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "}",
                                                     },
                                                 ),
@@ -1482,6 +1512,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1493,33 +1524,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 487..529,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 487..529,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 487..529,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 489..496,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "normal ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 496..503,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 497..500,
                                                                 id: Name("foo"),
                                                                 ctx: Load,
@@ -1533,17 +1564,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 503..504,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 504..511,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 505..508,
                                                                 id: Name("bar"),
                                                                 ctx: Load,
@@ -1557,17 +1588,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 511..512,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 512..519,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 513..516,
                                                                 id: Name("baz"),
                                                                 ctx: Load,
@@ -1581,17 +1612,17 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 519..520,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 520..528,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 521..527,
                                                                 id: Name("foobar"),
                                                                 ctx: Load,
@@ -1607,6 +1638,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1618,33 +1650,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 530..549,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 530..549,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 530..549,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 532..539,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "normal ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 539..548,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 540..541,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -1655,12 +1687,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 542..547,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 542..547,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "y + 2",
                                                                         },
                                                                     ),
@@ -1674,6 +1706,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1685,26 +1718,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 550..568,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 550..568,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 550..568,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 552..567,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 553..554,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -1715,28 +1748,28 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 555..566,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Interpolation(
                                                                         InterpolatedElement {
                                                                             range: 555..566,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             expression: Call(
                                                                                 ExprCall {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 556..565,
                                                                                     func: Attribute(
                                                                                         ExprAttribute {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 556..563,
                                                                                             value: Set(
                                                                                                 ExprSet {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 556..559,
                                                                                                     elts: [
                                                                                                         NumberLiteral(
                                                                                                             ExprNumberLiteral {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 557..558,
                                                                                                                 value: Int(
                                                                                                                     1,
@@ -1749,14 +1782,14 @@ Module(
                                                                                             attr: Identifier {
                                                                                                 id: Name("pop"),
                                                                                                 range: 560..563,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                             },
                                                                                             ctx: Load,
                                                                                         },
                                                                                     ),
                                                                                     arguments: Arguments {
                                                                                         range: 563..565,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         args: [],
                                                                                         keywords: [],
                                                                                     },
@@ -1777,6 +1810,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1788,45 +1822,43 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 569..588,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 569..588,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 569..588,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 571..587,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Lambda(
                                                             ExprLambda {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 573..585,
                                                                 parameters: Some(
                                                                     Parameters {
                                                                         range: 580..581,
-                                                                        node_index: AtomicNodeIndex(
-                                                                            0,
-                                                                        ),
+                                                                        node_index: NodeIndex(None),
                                                                         posonlyargs: [],
                                                                         args: [
                                                                             ParameterWithDefault {
                                                                                 range: 580..581,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 parameter: Parameter {
                                                                                     range: 580..581,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     name: Identifier {
                                                                                         id: Name("x"),
                                                                                         range: 580..581,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                     },
                                                                                     annotation: None,
                                                                                 },
@@ -1840,12 +1872,12 @@ Module(
                                                                 ),
                                                                 body: Set(
                                                                     ExprSet {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 582..585,
                                                                         elts: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 583..584,
                                                                                     id: Name("x"),
                                                                                     ctx: Load,
@@ -1866,6 +1898,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1877,26 +1910,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 589..597,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 589..597,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 589..597,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 591..596,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 592..593,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -1917,6 +1950,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1928,26 +1962,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 598..611,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 598..611,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 598..611,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 600..610,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 605..606,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -1968,6 +2002,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -1979,26 +2014,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 612..621,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 612..621,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 612..621,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 614..620,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 615..616,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2019,6 +2054,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -2030,26 +2066,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 622..636,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 622..636,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 622..636,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 624..635,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 625..626,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2060,12 +2096,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 627..634,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 627..634,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f!r =",
                                                                         },
                                                                     ),
@@ -2079,6 +2115,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -2090,26 +2127,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 637..653,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 637..653,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 637..653,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 639..652,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 640..641,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2125,12 +2162,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 648..651,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 648..651,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f",
                                                                         },
                                                                     ),
@@ -2144,6 +2181,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -2155,26 +2193,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 654..667,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 654..667,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 654..667,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 656..666,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 657..658,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2185,12 +2223,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 659..665,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 659..665,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f=!r",
                                                                         },
                                                                     ),
@@ -2204,6 +2242,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -2215,11 +2254,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 668..682,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 668..682,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2227,27 +2266,28 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 668..675,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "hello",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 676..682,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 678..681,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 679..680,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -2263,6 +2303,7 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2275,11 +2316,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 683..696,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 683..696,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2287,15 +2328,15 @@ Module(
                                         FString(
                                             FString {
                                                 range: 683..689,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 685..688,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 686..687,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -2311,21 +2352,22 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 690..696,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 692..695,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 693..694,
                                                                     id: Name("y"),
                                                                     ctx: Load,
@@ -2341,6 +2383,7 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2353,11 +2396,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 697..711,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 697..711,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2365,15 +2408,15 @@ Module(
                                         FString(
                                             FString {
                                                 range: 697..703,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 699..702,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 700..701,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -2389,18 +2432,20 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 704..711,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "world",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2413,38 +2458,38 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 712..756,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 712..756,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 712..756,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 714..739,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "Invalid args in command: ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 739..755,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Tuple(
                                                             ExprTuple {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 740..754,
                                                                 elts: [
                                                                     Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 740..747,
                                                                             id: Name("command"),
                                                                             ctx: Load,
@@ -2452,11 +2497,11 @@ Module(
                                                                     ),
                                                                     Starred(
                                                                         ExprStarred {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 749..754,
                                                                             value: Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 750..754,
                                                                                     id: Name("args"),
                                                                                     ctx: Load,
@@ -2480,6 +2525,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -2491,11 +2537,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 757..775,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 757..775,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2503,27 +2549,28 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 757..762,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "foo",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 763..769,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 765..768,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 766..767,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -2539,18 +2586,20 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 770..775,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "bar",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2563,11 +2612,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 776..825,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 782..823,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2575,12 +2624,12 @@ Module(
                                         FString(
                                             FString {
                                                 range: 782..786,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 784..785,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "a",
                                                         },
                                                     ),
@@ -2589,18 +2638,19 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 791..795,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 793..794,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "b",
                                                         },
                                                     ),
@@ -2609,30 +2659,32 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 800..803,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "c",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 808..813,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 811..812,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "d",
                                                         },
                                                     ),
@@ -2643,18 +2695,19 @@ Module(
                                                         uppercase_r: false,
                                                     },
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 818..823,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 821..822,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "e",
                                                         },
                                                     ),
@@ -2665,6 +2718,7 @@ Module(
                                                         uppercase_r: false,
                                                     },
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2677,11 +2731,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 850..879,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 850..879,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2689,27 +2743,28 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 850..856,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "foo",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Unicode,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 857..865,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 859..864,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 860..863,
                                                                     id: Name("bar"),
                                                                     ctx: Load,
@@ -2725,30 +2780,33 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 866..871,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "baz",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 872..879,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: " some",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2761,11 +2819,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 880..909,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 880..909,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2773,27 +2831,28 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 880..885,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "foo",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 886..894,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 888..893,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 889..892,
                                                                     id: Name("bar"),
                                                                     ctx: Load,
@@ -2809,30 +2868,33 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 895..901,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "baz",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Unicode,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 902..909,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: " some",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2845,11 +2907,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 910..939,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 910..939,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2857,27 +2919,28 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 910..915,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "foo",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 916..924,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 918..923,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 919..922,
                                                                     id: Name("bar"),
                                                                     ctx: Load,
@@ -2893,30 +2956,33 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 925..930,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "baz",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 931..939,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: " some",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Unicode,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -2929,11 +2995,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 940..978,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 940..978,
                             value: FStringValue {
                                 inner: Concatenated(
@@ -2941,34 +3007,35 @@ Module(
                                         Literal(
                                             StringLiteral {
                                                 range: 940..946,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "foo",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Unicode,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         FString(
                                             FString {
                                                 range: 947..966,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 elements: [
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 949..953,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "bar ",
                                                         },
                                                     ),
                                                     Interpolation(
                                                         InterpolatedElement {
                                                             range: 953..958,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             expression: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 954..957,
                                                                     id: Name("baz"),
                                                                     ctx: Load,
@@ -2982,7 +3049,7 @@ Module(
                                                     Literal(
                                                         InterpolatedStringLiteralElement {
                                                             range: 958..965,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: " really",
                                                         },
                                                     ),
@@ -2991,30 +3058,33 @@ Module(
                                                     quote_style: Double,
                                                     prefix: Regular,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 967..973,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "bar",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Unicode,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
                                         Literal(
                                             StringLiteral {
                                                 range: 974..978,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "no",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap
index 80e25b5146..da4fe251d0 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/generator.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..482,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..22,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..2,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,10 +29,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 3..21,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..13,
                                             id: Name("target"),
                                             ctx: Store,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 17..21,
                                             id: Name("iter"),
                                             ctx: Load,
@@ -57,15 +57,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..51,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..51,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..25,
                                     id: Name("x"),
                                     ctx: Load,
@@ -74,10 +74,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 26..50,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..42,
                                             id: Name("target"),
                                             ctx: Store,
@@ -85,7 +85,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..50,
                                             id: Name("iter"),
                                             ctx: Load,
@@ -102,15 +102,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..100,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..100,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     id: Name("x"),
                                     ctx: Load,
@@ -119,10 +119,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 55..99,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..65,
                                             id: Name("target"),
                                             ctx: Store,
@@ -130,7 +130,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 69..73,
                                             id: Name("iter"),
                                             ctx: Load,
@@ -139,11 +139,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 77..83,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 77..78,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -155,7 +155,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 82..83,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -166,13 +166,13 @@ Module(
                                         ),
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 87..94,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 87..88,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -180,7 +180,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 93..94,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -191,7 +191,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 98..99,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -208,15 +208,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 101..166,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 101..166,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 102..103,
                                     id: Name("x"),
                                     ctx: Load,
@@ -225,10 +225,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 104..135,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 108..115,
                                             id: Name("target1"),
                                             ctx: Store,
@@ -236,7 +236,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 119..124,
                                             id: Name("iter1"),
                                             ctx: Load,
@@ -245,13 +245,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 128..135,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 128..129,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -259,7 +259,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 134..135,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -273,10 +273,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 136..165,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 140..147,
                                             id: Name("target2"),
                                             ctx: Store,
@@ -284,7 +284,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 151..156,
                                             id: Name("iter2"),
                                             ctx: Load,
@@ -293,11 +293,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 160..165,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 160..161,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -309,7 +309,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 164..165,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -329,15 +329,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 167..238,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 167..238,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 168..169,
                                     id: Name("x"),
                                     ctx: Load,
@@ -346,10 +346,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 170..201,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 174..181,
                                             id: Name("target1"),
                                             ctx: Store,
@@ -357,7 +357,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 185..190,
                                             id: Name("iter1"),
                                             ctx: Load,
@@ -366,13 +366,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 194..201,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 194..195,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -380,7 +380,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 200..201,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -394,10 +394,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 202..237,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 212..219,
                                             id: Name("target2"),
                                             ctx: Store,
@@ -405,7 +405,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 223..228,
                                             id: Name("iter2"),
                                             ctx: Load,
@@ -414,11 +414,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 232..237,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 232..233,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -430,7 +430,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 236..237,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -450,19 +450,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 259..282,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 259..282,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 260..270,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 260..261,
                                             id: Name("x"),
                                             ctx: Store,
@@ -470,11 +470,11 @@ Module(
                                     ),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 265..270,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 265..266,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -483,7 +483,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 269..270,
                                                     value: Int(
                                                         1,
@@ -497,10 +497,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 271..281,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 275..276,
                                             id: Name("y"),
                                             ctx: Store,
@@ -508,7 +508,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 280..281,
                                             id: Name("z"),
                                             ctx: Load,
@@ -525,19 +525,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 300..326,
                     value: Generator(
                         ExprGenerator {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 300..326,
                             elt: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 301..314,
                                     test: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 306..307,
                                             id: Name("y"),
                                             ctx: Load,
@@ -545,7 +545,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 301..302,
                                             id: Name("x"),
                                             ctx: Load,
@@ -553,7 +553,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 313..314,
                                             id: Name("y"),
                                             ctx: Load,
@@ -564,10 +564,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 315..325,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 319..320,
                                             id: Name("y"),
                                             ctx: Store,
@@ -575,7 +575,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 324..325,
                                             id: Name("z"),
                                             ctx: Load,
@@ -592,30 +592,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 340..481,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 340..481,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 340..348,
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 340..343,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 340..343,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " ",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -625,22 +626,22 @@ Module(
                                     attr: Identifier {
                                         id: Name("join"),
                                         range: 344..348,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 348..481,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Generator(
                                         ExprGenerator {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 354..479,
                                             elt: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 354..357,
                                                     id: Name("sql"),
                                                     ctx: Load,
@@ -649,10 +650,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 362..479,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 366..369,
                                                             id: Name("sql"),
                                                             ctx: Store,
@@ -660,16 +661,16 @@ Module(
                                                     ),
                                                     iter: Tuple(
                                                         ExprTuple {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 373..479,
                                                             elts: [
                                                                 If(
                                                                     ExprIf {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 383..420,
                                                                         test: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 405..410,
                                                                                 id: Name("limit"),
                                                                                 ctx: Load,
@@ -677,22 +678,23 @@ Module(
                                                                         ),
                                                                         body: BinOp(
                                                                             ExprBinOp {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 383..401,
                                                                                 left: StringLiteral(
                                                                                     ExprStringLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 383..393,
                                                                                         value: StringLiteralValue {
                                                                                             inner: Single(
                                                                                                 StringLiteral {
                                                                                                     range: 383..393,
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     value: "LIMIT %d",
                                                                                                     flags: StringLiteralFlags {
                                                                                                         quote_style: Double,
                                                                                                         prefix: Empty,
                                                                                                         triple_quoted: false,
+                                                                                                        unclosed: false,
                                                                                                     },
                                                                                                 },
                                                                                             ),
@@ -702,7 +704,7 @@ Module(
                                                                                 op: Mod,
                                                                                 right: Name(
                                                                                     ExprName {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 396..401,
                                                                                         id: Name("limit"),
                                                                                         ctx: Load,
@@ -712,7 +714,7 @@ Module(
                                                                         ),
                                                                         orelse: NoneLiteral(
                                                                             ExprNoneLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 416..420,
                                                                             },
                                                                         ),
@@ -720,11 +722,11 @@ Module(
                                                                 ),
                                                                 If(
                                                                     ExprIf {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 430..472,
                                                                         test: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 456..462,
                                                                                 id: Name("offset"),
                                                                                 ctx: Load,
@@ -732,22 +734,23 @@ Module(
                                                                         ),
                                                                         body: BinOp(
                                                                             ExprBinOp {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 431..451,
                                                                                 left: StringLiteral(
                                                                                     ExprStringLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 431..442,
                                                                                         value: StringLiteralValue {
                                                                                             inner: Single(
                                                                                                 StringLiteral {
                                                                                                     range: 431..442,
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     value: "OFFSET %d",
                                                                                                     flags: StringLiteralFlags {
                                                                                                         quote_style: Double,
                                                                                                         prefix: Empty,
                                                                                                         triple_quoted: false,
+                                                                                                        unclosed: false,
                                                                                                     },
                                                                                                 },
                                                                                             ),
@@ -757,7 +760,7 @@ Module(
                                                                                 op: Mod,
                                                                                 right: Name(
                                                                                     ExprName {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 445..451,
                                                                                         id: Name("offset"),
                                                                                         ctx: Load,
@@ -767,7 +770,7 @@ Module(
                                                                         ),
                                                                         orelse: NoneLiteral(
                                                                             ExprNoneLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 468..472,
                                                                             },
                                                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap
index f21914594f..98ed6f9e96 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap
@@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/if.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..423,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..16,
                             test: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..9,
                                     value: true,
                                 },
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..1,
                                     id: Name("a"),
                                     ctx: Load,
@@ -35,7 +35,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 15..16,
                                     id: Name("b"),
                                     ctx: Load,
@@ -47,15 +47,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..35,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..35,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..25,
                                     id: Name("x"),
                                     ctx: Load,
@@ -63,11 +63,11 @@ Module(
                             ),
                             body: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..20,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 17..18,
                                             id: Name("f"),
                                             ctx: Load,
@@ -75,7 +75,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 18..20,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -83,7 +83,7 @@ Module(
                             ),
                             orelse: NoneLiteral(
                                 ExprNoneLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 31..35,
                                 },
                             ),
@@ -93,15 +93,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 36..61,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..61,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..42,
                                     id: Name("b"),
                                     ctx: Load,
@@ -109,7 +109,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..37,
                                     id: Name("a"),
                                     ctx: Load,
@@ -117,11 +117,11 @@ Module(
                             ),
                             orelse: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..61,
                                     test: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 53..54,
                                             id: Name("d"),
                                             ctx: Load,
@@ -129,7 +129,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 48..49,
                                             id: Name("c"),
                                             ctx: Load,
@@ -137,7 +137,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 60..61,
                                             id: Name("e"),
                                             ctx: Load,
@@ -151,19 +151,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 62..84,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..84,
                             test: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 71..76,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 71..72,
                                             value: Int(
                                                 1,
@@ -176,7 +176,7 @@ Module(
                                     comparators: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 75..76,
                                                 value: Int(
                                                     0,
@@ -188,11 +188,11 @@ Module(
                             ),
                             body: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..67,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..63,
                                             value: Int(
                                                 1,
@@ -202,7 +202,7 @@ Module(
                                     op: Add,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 66..67,
                                             id: Name("x"),
                                             ctx: Load,
@@ -212,12 +212,12 @@ Module(
                             ),
                             orelse: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 82..84,
                                     op: USub,
                                     operand: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 83..84,
                                             value: Int(
                                                 1,
@@ -232,15 +232,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..108,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 85..108,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 96..97,
                                     id: Name("x"),
                                     ctx: Load,
@@ -248,13 +248,13 @@ Module(
                             ),
                             body: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 85..92,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 85..86,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -262,7 +262,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 91..92,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -273,7 +273,7 @@ Module(
                             ),
                             orelse: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 103..108,
                                     value: false,
                                 },
@@ -284,15 +284,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 109..127,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 109..127,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 119..120,
                                     id: Name("y"),
                                     ctx: Load,
@@ -300,11 +300,11 @@ Module(
                             ),
                             body: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 109..115,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 109..110,
                                             id: Name("x"),
                                             ctx: Load,
@@ -316,7 +316,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 114..115,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -327,7 +327,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 126..127,
                                     id: Name("x"),
                                     ctx: Load,
@@ -339,21 +339,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 128..154,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 128..154,
                             test: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 136..143,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 136..137,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -361,7 +361,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 142..143,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -372,14 +372,14 @@ Module(
                             ),
                             body: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 128..132,
                                     value: true,
                                 },
                             ),
                             orelse: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 149..154,
                                     value: false,
                                 },
@@ -390,16 +390,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..171,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..171,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 155..156,
                                         value: Int(
                                             1,
@@ -408,11 +408,11 @@ Module(
                                 ),
                                 If(
                                     ExprIf {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 158..171,
                                         test: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 163..164,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -420,7 +420,7 @@ Module(
                                         ),
                                         body: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 158..159,
                                                 value: Int(
                                                     1,
@@ -429,7 +429,7 @@ Module(
                                         ),
                                         orelse: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 170..171,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -446,22 +446,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 214..240,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 214..240,
                             test: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 219..223,
                                     value: true,
                                 },
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 214..215,
                                     id: Name("x"),
                                     ctx: Load,
@@ -469,26 +469,24 @@ Module(
                             ),
                             orelse: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 229..240,
                                     parameters: Some(
                                         Parameters {
                                             range: 236..237,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 236..237,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 236..237,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("y"),
                                                             range: 236..237,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -502,7 +500,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 239..240,
                                             id: Name("y"),
                                             ctx: Load,
@@ -516,20 +514,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 302..323,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 302..323,
                             test: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 308..315,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 314..315,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -540,7 +538,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 302..303,
                                     id: Name("x"),
                                     ctx: Load,
@@ -548,7 +546,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 322..323,
                                     id: Name("y"),
                                     ctx: Load,
@@ -560,19 +558,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 324..350,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 324..350,
                             test: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 330..342,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 341..342,
                                             id: Name("x"),
                                             ctx: Load,
@@ -582,7 +580,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 324..325,
                                     id: Name("x"),
                                     ctx: Load,
@@ -590,7 +588,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 349..350,
                                     id: Name("y"),
                                     ctx: Load,
@@ -602,34 +600,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 351..376,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 351..376,
                             test: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 357..368,
                                     parameters: Some(
                                         Parameters {
                                             range: 364..365,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 364..365,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 364..365,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 364..365,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -643,7 +639,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 367..368,
                                             id: Name("x"),
                                             ctx: Load,
@@ -653,7 +649,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 351..352,
                                     id: Name("x"),
                                     ctx: Load,
@@ -661,7 +657,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 375..376,
                                     id: Name("y"),
                                     ctx: Load,
@@ -673,15 +669,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 408..423,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 409..422,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 414..415,
                                     id: Name("y"),
                                     ctx: Load,
@@ -689,7 +685,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 409..410,
                                     id: Name("x"),
                                     ctx: Load,
@@ -697,7 +693,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 421..422,
                                     id: Name("z"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap
index 9e614f6c7e..29db11b942 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/lambda.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..530,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..9,
                             parameters: None,
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     id: Name("a"),
                                     ctx: Load,
@@ -33,16 +33,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 10..19,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..19,
                             parameters: None,
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
                                     value: Int(
                                         1,
@@ -55,30 +55,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..31,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..31,
                             parameters: Some(
                                 Parameters {
                                     range: 27..28,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 27..28,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 27..28,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 27..28,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -92,7 +90,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 30..31,
                                     value: Int(
                                         1,
@@ -105,30 +103,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..48,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..48,
                             parameters: Some(
                                 Parameters {
                                     range: 39..43,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 39..40,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 39..40,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 39..40,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -136,14 +132,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 42..43,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 42..43,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("y"),
                                                     range: 42..43,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -157,7 +153,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 45..48,
                                 },
                             ),
@@ -167,30 +163,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..66,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..66,
                             parameters: Some(
                                 Parameters {
                                     range: 56..63,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 56..57,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 56..57,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 56..57,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -198,14 +192,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 59..60,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 59..60,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 59..60,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -213,14 +207,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 62..63,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 62..63,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 62..63,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -234,7 +228,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..66,
                                     value: Int(
                                         1,
@@ -247,30 +241,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..90,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..90,
                             parameters: Some(
                                 Parameters {
                                     range: 74..87,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 74..75,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 74..75,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 74..75,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -278,21 +270,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 77..81,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 77..78,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 77..78,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 79..81,
                                                         value: Int(
                                                             20,
@@ -303,21 +295,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 83..87,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 83..84,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 83..84,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 85..87,
                                                         value: Int(
                                                             30,
@@ -334,7 +326,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 89..90,
                                     value: Int(
                                         1,
@@ -347,30 +339,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 91..109,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 91..109,
                             parameters: Some(
                                 Parameters {
                                     range: 98..102,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 98..99,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 98..99,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 98..99,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -378,14 +368,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 101..102,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 101..102,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("y"),
                                                     range: 101..102,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -399,11 +389,11 @@ Module(
                             ),
                             body: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 104..109,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 104..105,
                                             id: Name("x"),
                                             ctx: Load,
@@ -412,7 +402,7 @@ Module(
                                     op: Mult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 108..109,
                                             id: Name("y"),
                                             ctx: Load,
@@ -426,30 +416,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 110..130,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 110..130,
                             parameters: Some(
                                 Parameters {
                                     range: 117..123,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 117..118,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 117..118,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("y"),
                                                     range: 117..118,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -457,21 +445,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 120..123,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 120..121,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("z"),
                                                     range: 120..121,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 122..123,
                                                         value: Int(
                                                             1,
@@ -488,11 +476,11 @@ Module(
                             ),
                             body: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 125..130,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 125..126,
                                             id: Name("z"),
                                             ctx: Load,
@@ -501,7 +489,7 @@ Module(
                                     op: Mult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 129..130,
                                             id: Name("y"),
                                             ctx: Load,
@@ -515,28 +503,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 131..143,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 131..143,
                             parameters: Some(
                                 Parameters {
                                     range: 138..140,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: Some(
                                         Parameter {
                                             range: 138..140,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("a"),
                                                 range: 139..140,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -547,7 +533,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 142..143,
                                     id: Name("a"),
                                     ctx: Load,
@@ -559,28 +545,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 144..166,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 144..166,
                             parameters: Some(
                                 Parameters {
                                     range: 151..161,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: Some(
                                         Parameter {
                                             range: 151..153,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("a"),
                                                 range: 152..153,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -588,14 +572,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 155..156,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 155..156,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("z"),
                                                     range: 155..156,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -603,21 +587,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 158..161,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 158..159,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 158..159,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 160..161,
                                                         value: Int(
                                                             0,
@@ -632,7 +616,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 163..166,
                                 },
                             ),
@@ -642,32 +626,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 167..187,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 167..187,
                             parameters: Some(
                                 Parameters {
                                     range: 174..184,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 177..178,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 177..178,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 177..178,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -675,14 +657,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 180..181,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 180..181,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 180..181,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -690,14 +672,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 183..184,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 183..184,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 183..184,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -709,7 +691,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 186..187,
                                     value: Int(
                                         1,
@@ -722,32 +704,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 188..214,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 188..214,
                             parameters: Some(
                                 Parameters {
                                     range: 195..211,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 198..199,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 198..199,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 198..199,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -755,21 +735,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 201..205,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 201..202,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 201..202,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 203..205,
                                                         value: Int(
                                                             20,
@@ -780,21 +760,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 207..211,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 207..208,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 207..208,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 209..211,
                                                         value: Int(
                                                             30,
@@ -809,7 +789,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 213..214,
                                     value: Int(
                                         1,
@@ -822,30 +802,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 215..241,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 215..241,
                             parameters: Some(
                                 Parameters {
                                     range: 222..238,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 222..223,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 222..223,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 222..223,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -853,14 +831,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 225..226,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 225..226,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 225..226,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -868,14 +846,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 228..229,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 228..229,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 228..229,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -886,14 +864,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 234..235,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 234..235,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("d"),
                                                     range: 234..235,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -901,14 +879,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 237..238,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 237..238,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("e"),
                                                     range: 237..238,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -920,7 +898,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 240..241,
                                     value: Int(
                                         0,
@@ -933,18 +911,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 242..262,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 242..262,
                             parameters: Some(
                                 Parameters {
                                     range: 249..257,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -952,11 +928,11 @@ Module(
                                     kwarg: Some(
                                         Parameter {
                                             range: 249..257,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("kwargs"),
                                                 range: 251..257,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -965,11 +941,11 @@ Module(
                             ),
                             body: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 259..262,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 259..260,
                                             id: Name("f"),
                                             ctx: Load,
@@ -977,7 +953,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 260..262,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -989,28 +965,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 263..294,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 263..294,
                             parameters: Some(
                                 Parameters {
                                     range: 270..285,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: Some(
                                         Parameter {
                                             range: 270..275,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("args"),
                                                 range: 271..275,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -1019,11 +993,11 @@ Module(
                                     kwarg: Some(
                                         Parameter {
                                             range: 277..285,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("kwargs"),
                                                 range: 279..285,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -1032,15 +1006,15 @@ Module(
                             ),
                             body: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 287..294,
                                     left: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 287..290,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 287..288,
                                                     id: Name("f"),
                                                     ctx: Load,
@@ -1048,7 +1022,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 288..290,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -1057,7 +1031,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 293..294,
                                             value: Int(
                                                 1,
@@ -1072,28 +1046,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 295..334,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 295..334,
                             parameters: Some(
                                 Parameters {
                                     range: 302..325,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: Some(
                                         Parameter {
                                             range: 302..307,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("args"),
                                                 range: 303..307,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -1101,14 +1073,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 309..310,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 309..310,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 309..310,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1116,21 +1088,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 312..315,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 312..313,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 312..313,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 314..315,
                                                         value: Int(
                                                             1,
@@ -1143,11 +1115,11 @@ Module(
                                     kwarg: Some(
                                         Parameter {
                                             range: 317..325,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("kwargs"),
                                                 range: 319..325,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -1156,15 +1128,15 @@ Module(
                             ),
                             body: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 327..334,
                                     left: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 327..330,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 327..328,
                                                     id: Name("f"),
                                                     ctx: Load,
@@ -1172,7 +1144,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 328..330,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -1181,7 +1153,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 333..334,
                                             value: Int(
                                                 1,
@@ -1196,29 +1168,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 335..351,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 335..351,
                             parameters: Some(
                                 Parameters {
                                     range: 342..346,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 342..343,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 342..343,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 342..343,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1233,7 +1203,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 348..351,
                                 },
                             ),
@@ -1243,29 +1213,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 352..371,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 352..371,
                             parameters: Some(
                                 Parameters {
                                     range: 359..366,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 359..360,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 359..360,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 359..360,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1275,14 +1243,14 @@ Module(
                                     args: [
                                         ParameterWithDefault {
                                             range: 365..366,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 365..366,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 365..366,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1296,7 +1264,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 368..371,
                                 },
                             ),
@@ -1306,36 +1274,34 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 372..391,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 372..391,
                             parameters: Some(
                                 Parameters {
                                     range: 379..386,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 379..382,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 379..380,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 379..380,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 381..382,
                                                         value: Int(
                                                             1,
@@ -1353,7 +1319,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 388..391,
                                 },
                             ),
@@ -1363,29 +1329,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 392..417,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 392..417,
                             parameters: Some(
                                 Parameters {
                                     range: 399..412,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 399..400,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 399..400,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 399..400,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1393,14 +1357,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 402..403,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 402..403,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 402..403,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1412,14 +1376,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 411..412,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 411..412,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 411..412,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1431,7 +1395,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 414..417,
                                 },
                             ),
@@ -1441,37 +1405,35 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 418..440,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 418..440,
                             parameters: Some(
                                 Parameters {
                                     range: 425..435,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 425..429,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 425..427,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("kw"),
                                                     range: 425..427,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 428..429,
                                                         value: Int(
                                                             1,
@@ -1485,14 +1447,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 434..435,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 434..435,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 434..435,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1504,7 +1466,7 @@ Module(
                             ),
                             body: EllipsisLiteral(
                                 ExprEllipsisLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 437..440,
                                 },
                             ),
@@ -1514,29 +1476,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 441..467,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 441..467,
                             parameters: Some(
                                 Parameters {
                                     range: 448..464,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 448..449,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 448..449,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 448..449,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1544,21 +1504,21 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 451..455,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 451..452,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 451..452,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 453..455,
                                                         value: Int(
                                                             20,
@@ -1571,21 +1531,21 @@ Module(
                                     args: [
                                         ParameterWithDefault {
                                             range: 460..464,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 460..461,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 460..461,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 462..464,
                                                         value: Int(
                                                             30,
@@ -1602,7 +1562,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 466..467,
                                     value: Int(
                                         1,
@@ -1615,29 +1575,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 468..497,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 468..497,
                             parameters: Some(
                                 Parameters {
                                     range: 475..494,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 475..476,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 475..476,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 475..476,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1645,14 +1603,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 478..479,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 478..479,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 478..479,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1662,14 +1620,14 @@ Module(
                                     args: [
                                         ParameterWithDefault {
                                             range: 484..485,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 484..485,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 484..485,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1680,14 +1638,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 490..491,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 490..491,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("d"),
                                                     range: 490..491,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1695,14 +1653,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 493..494,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 493..494,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("e"),
                                                     range: 493..494,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1714,7 +1672,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 496..497,
                                     value: Int(
                                         0,
@@ -1727,29 +1685,27 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 498..530,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 498..530,
                             parameters: Some(
                                 Parameters {
                                     range: 505..527,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [
                                         ParameterWithDefault {
                                             range: 505..506,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 505..506,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("a"),
                                                     range: 505..506,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1757,14 +1713,14 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 508..509,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 508..509,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("b"),
                                                     range: 508..509,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1774,14 +1730,14 @@ Module(
                                     args: [
                                         ParameterWithDefault {
                                             range: 514..515,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 514..515,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("c"),
                                                     range: 514..515,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1791,11 +1747,11 @@ Module(
                                     vararg: Some(
                                         Parameter {
                                             range: 517..519,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("d"),
                                                 range: 518..519,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -1803,14 +1759,14 @@ Module(
                                     kwonlyargs: [
                                         ParameterWithDefault {
                                             range: 521..522,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 521..522,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("e"),
                                                     range: 521..522,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -1820,11 +1776,11 @@ Module(
                                     kwarg: Some(
                                         Parameter {
                                             range: 524..527,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             name: Identifier {
                                                 id: Name("f"),
                                                 range: 526..527,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             annotation: None,
                                         },
@@ -1833,7 +1789,7 @@ Module(
                             ),
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 529..530,
                                     value: Int(
                                         0,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap
index dec8d0d279..a12de668bf 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/list.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..384,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..17,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..17,
                             elts: [],
                             ctx: Load,
@@ -26,16 +26,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..21,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..21,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..20,
                                         value: Int(
                                             1,
@@ -50,16 +50,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..26,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..26,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..24,
                                         value: Int(
                                             1,
@@ -74,16 +74,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..36,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..36,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..29,
                                         value: Int(
                                             1,
@@ -92,7 +92,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..32,
                                         value: Int(
                                             2,
@@ -101,7 +101,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..35,
                                         value: Int(
                                             3,
@@ -116,16 +116,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..47,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..47,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..39,
                                         value: Int(
                                             1,
@@ -134,7 +134,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 41..42,
                                         value: Int(
                                             2,
@@ -143,7 +143,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..45,
                                         value: Int(
                                             3,
@@ -158,11 +158,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 75..78,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 75..78,
                             elts: [],
                             ctx: Load,
@@ -172,16 +172,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..92,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..92,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 89..90,
                                         value: Int(
                                             1,
@@ -196,16 +196,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..114,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..114,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..100,
                                         value: Int(
                                             1,
@@ -214,7 +214,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 110..111,
                                         value: Int(
                                             2,
@@ -229,26 +229,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 125..132,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 125..132,
                             elts: [
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 126..131,
                                         elts: [
                                             List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 127..130,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 128..129,
                                                                 value: Int(
                                                                     1,
@@ -271,21 +271,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..149,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 133..149,
                             elts: [
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 134..140,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 135..136,
                                                     value: Int(
                                                         1,
@@ -294,7 +294,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 138..139,
                                                     value: Int(
                                                         2,
@@ -307,12 +307,12 @@ Module(
                                 ),
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 142..148,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 143..144,
                                                     value: Int(
                                                         3,
@@ -321,7 +321,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 146..147,
                                                     value: Int(
                                                         4,
@@ -340,20 +340,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 170..178,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 170..178,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 171..177,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 171..172,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -361,7 +361,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 176..177,
                                                 value: Int(
                                                     2,
@@ -378,20 +378,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 179..188,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 179..188,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 180..186,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 180..181,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -399,7 +399,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 185..186,
                                                 value: Int(
                                                     2,
@@ -416,16 +416,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 189..203,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 189..203,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 190..191,
                                         value: Int(
                                             1,
@@ -434,11 +434,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 193..199,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 193..194,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -446,7 +446,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 198..199,
                                                 value: Int(
                                                     2,
@@ -457,7 +457,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 201..202,
                                         value: Int(
                                             3,
@@ -472,16 +472,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 223..233,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 223..233,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 224..225,
                                         value: Int(
                                             1,
@@ -490,11 +490,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 227..229,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 228..229,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -505,7 +505,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 231..232,
                                         value: Int(
                                             3,
@@ -520,16 +520,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 234..248,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 234..248,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 235..236,
                                         value: Int(
                                             1,
@@ -538,15 +538,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 238..244,
                                         value: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 239..244,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 239..240,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -555,7 +555,7 @@ Module(
                                                 op: BitOr,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 243..244,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -568,7 +568,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 246..247,
                                         value: Int(
                                             3,
@@ -583,20 +583,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 271..334,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 271..334,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 272..277,
                                         left: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 272..273,
                                                 value: Int(
                                                     1,
@@ -606,7 +606,7 @@ Module(
                                         op: Add,
                                         right: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 276..277,
                                                 value: Int(
                                                     2,
@@ -617,12 +617,12 @@ Module(
                                 ),
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 279..291,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 280..281,
                                                     value: Int(
                                                         1,
@@ -631,7 +631,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 283..284,
                                                     value: Int(
                                                         2,
@@ -640,7 +640,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 286..287,
                                                     value: Int(
                                                         3,
@@ -649,7 +649,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 289..290,
                                                     value: Int(
                                                         4,
@@ -662,12 +662,12 @@ Module(
                                 ),
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 293..306,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 294..295,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -675,11 +675,11 @@ Module(
                                             ),
                                             BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 297..302,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 297..298,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -688,7 +688,7 @@ Module(
                                                     op: Add,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 301..302,
                                                             id: Name("c"),
                                                             ctx: Load,
@@ -698,7 +698,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 304..305,
                                                     id: Name("d"),
                                                     ctx: Load,
@@ -711,12 +711,12 @@ Module(
                                 ),
                                 Set(
                                     ExprSet {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 308..317,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 309..310,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -724,7 +724,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 312..313,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -732,7 +732,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 315..316,
                                                     id: Name("c"),
                                                     ctx: Load,
@@ -743,14 +743,14 @@ Module(
                                 ),
                                 Dict(
                                     ExprDict {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 319..325,
                                         items: [
                                             DictItem {
                                                 key: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 320..321,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -759,7 +759,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 323..324,
                                                         value: Int(
                                                             1,
@@ -772,11 +772,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 327..333,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 327..328,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -784,7 +784,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 332..333,
                                                 value: Int(
                                                     2,
@@ -801,20 +801,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 335..383,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 335..383,
                             elts: [
                                 Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 336..382,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 336..341,
                                                 id: Name("call1"),
                                                 ctx: Load,
@@ -822,19 +822,19 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 341..382,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [
                                                 Generator(
                                                     ExprGenerator {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 342..381,
                                                         elt: Call(
                                                             ExprCall {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 342..361,
                                                                 func: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 342..347,
                                                                         id: Name("call2"),
                                                                         ctx: Load,
@@ -842,19 +842,19 @@ Module(
                                                                 ),
                                                                 arguments: Arguments {
                                                                     range: 347..361,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     args: [
                                                                         Call(
                                                                             ExprCall {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 348..360,
                                                                                 func: Attribute(
                                                                                     ExprAttribute {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 348..358,
                                                                                         value: Name(
                                                                                             ExprName {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 348..353,
                                                                                                 id: Name("value"),
                                                                                                 ctx: Load,
@@ -863,14 +863,14 @@ Module(
                                                                                         attr: Identifier {
                                                                                             id: Name("attr"),
                                                                                             range: 354..358,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                         },
                                                                                         ctx: Load,
                                                                                     },
                                                                                 ),
                                                                                 arguments: Arguments {
                                                                                     range: 358..360,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     args: [],
                                                                                     keywords: [],
                                                                                 },
@@ -884,10 +884,10 @@ Module(
                                                         generators: [
                                                             Comprehension {
                                                                 range: 362..381,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 target: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 366..373,
                                                                         id: Name("element"),
                                                                         ctx: Store,
@@ -895,7 +895,7 @@ Module(
                                                                 ),
                                                                 iter: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 377..381,
                                                                         id: Name("iter"),
                                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap
index de7a7eb783..6f1310b33d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/list_comprehen
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..776,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("x"),
                                 ctx: Store,
@@ -26,11 +26,11 @@ Module(
                     ],
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..26,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..6,
                                     id: Name("y"),
                                     ctx: Load,
@@ -39,10 +39,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 7..25,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 11..12,
                                             id: Name("y"),
                                             ctx: Store,
@@ -50,12 +50,12 @@ Module(
                                     ),
                                     iter: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..25,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 17..18,
                                                         value: Int(
                                                             1,
@@ -64,7 +64,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 20..21,
                                                         value: Int(
                                                             2,
@@ -73,7 +73,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 23..24,
                                                         value: Int(
                                                             3,
@@ -95,15 +95,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..49,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..49,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 29..30,
                                     id: Name("x"),
                                     ctx: Load,
@@ -112,10 +112,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 31..48,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             id: Name("i"),
                                             ctx: Store,
@@ -123,11 +123,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 40..48,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 40..45,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -135,11 +135,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 45..48,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 46..47,
                                                             value: Int(
                                                                 5,
@@ -161,15 +161,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 50..91,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..91,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     id: Name("b"),
                                     ctx: Load,
@@ -178,10 +178,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 53..90,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 57..58,
                                             id: Name("c"),
                                             ctx: Store,
@@ -189,7 +189,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..63,
                                             id: Name("d"),
                                             ctx: Load,
@@ -198,11 +198,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 67..73,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 67..68,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -214,7 +214,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 72..73,
                                                             id: Name("w"),
                                                             ctx: Load,
@@ -225,13 +225,13 @@ Module(
                                         ),
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 77..85,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 77..78,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -239,7 +239,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 83..85,
                                                             id: Name("yy"),
                                                             ctx: Load,
@@ -250,7 +250,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 89..90,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -266,15 +266,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..137,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..137,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 93..94,
                                     id: Name("a"),
                                     ctx: Load,
@@ -283,10 +283,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 95..116,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 99..100,
                                             id: Name("b"),
                                             ctx: Store,
@@ -294,7 +294,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 104..105,
                                             id: Name("c"),
                                             ctx: Load,
@@ -303,13 +303,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 109..116,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 109..110,
                                                             id: Name("d"),
                                                             ctx: Load,
@@ -317,7 +317,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 115..116,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -331,10 +331,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 117..136,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 121..122,
                                             id: Name("f"),
                                             ctx: Store,
@@ -342,7 +342,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 126..127,
                                             id: Name("j"),
                                             ctx: Load,
@@ -351,11 +351,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 131..136,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 131..132,
                                                         id: Name("k"),
                                                         ctx: Load,
@@ -367,7 +367,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 135..136,
                                                             id: Name("h"),
                                                             ctx: Load,
@@ -386,15 +386,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 138..189,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 138..189,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 139..140,
                                     id: Name("a"),
                                     ctx: Load,
@@ -403,10 +403,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 141..162,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 145..146,
                                             id: Name("b"),
                                             ctx: Store,
@@ -414,7 +414,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 150..151,
                                             id: Name("c"),
                                             ctx: Load,
@@ -423,13 +423,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 155..162,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 155..156,
                                                             id: Name("d"),
                                                             ctx: Load,
@@ -437,7 +437,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 161..162,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -451,10 +451,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 163..188,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 173..174,
                                             id: Name("f"),
                                             ctx: Store,
@@ -462,7 +462,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 178..179,
                                             id: Name("j"),
                                             ctx: Load,
@@ -471,11 +471,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 183..188,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 183..184,
                                                         id: Name("k"),
                                                         ctx: Load,
@@ -487,7 +487,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 187..188,
                                                             id: Name("h"),
                                                             ctx: Load,
@@ -506,15 +506,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 190..209,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 190..209,
                             elt: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 191..192,
                                     value: Int(
                                         1,
@@ -524,10 +524,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 193..208,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 197..198,
                                             id: Name("i"),
                                             ctx: Store,
@@ -535,11 +535,11 @@ Module(
                                     ),
                                     iter: Compare(
                                         ExprCompare {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 202..208,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 202..203,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -551,7 +551,7 @@ Module(
                                             comparators: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 207..208,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -570,15 +570,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 210..227,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 210..227,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 211..212,
                                     id: Name("a"),
                                     ctx: Load,
@@ -587,15 +587,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 213..226,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 217..221,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 217..218,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -603,7 +603,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 220..221,
                                                         id: Name("b"),
                                                         ctx: Store,
@@ -616,7 +616,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 225..226,
                                             id: Name("G"),
                                             ctx: Load,
@@ -632,19 +632,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 228..257,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 228..257,
                             elt: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 234..241,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 240..241,
                                             id: Name("x"),
                                             ctx: Load,
@@ -655,15 +655,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 242..255,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 246..250,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 246..247,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -671,7 +671,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 249..250,
                                                         id: Name("b"),
                                                         ctx: Store,
@@ -684,7 +684,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 254..255,
                                             id: Name("C"),
                                             ctx: Load,
@@ -700,15 +700,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 258..300,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 258..300,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 259..260,
                                     id: Name("i"),
                                     ctx: Load,
@@ -717,10 +717,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 261..299,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 265..266,
                                             id: Name("i"),
                                             ctx: Store,
@@ -728,11 +728,11 @@ Module(
                                     ),
                                     iter: Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 270..277,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 276..277,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -743,11 +743,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 281..299,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 281..287,
                                                         id: Name("entity"),
                                                         ctx: Load,
@@ -759,7 +759,7 @@ Module(
                                                 comparators: [
                                                     NoneLiteral(
                                                         ExprNoneLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 295..299,
                                                         },
                                                     ),
@@ -776,15 +776,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 301..337,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 301..337,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 302..303,
                                     id: Name("x"),
                                     ctx: Load,
@@ -793,10 +793,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 304..336,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 308..309,
                                             id: Name("x"),
                                             ctx: Store,
@@ -804,18 +804,18 @@ Module(
                                     ),
                                     iter: If(
                                         ExprIf {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 314..330,
                                             test: BooleanLiteral(
                                                 ExprBooleanLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 319..323,
                                                     value: true,
                                                 },
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 314..315,
                                                     id: Name("l"),
                                                     ctx: Load,
@@ -823,7 +823,7 @@ Module(
                                             ),
                                             orelse: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 329..330,
                                                     id: Name("L"),
                                                     ctx: Load,
@@ -834,7 +834,7 @@ Module(
                                     ifs: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 335..336,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -850,15 +850,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 338..380,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 338..380,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 339..340,
                                     id: Name("i"),
                                     ctx: Load,
@@ -867,10 +867,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 341..379,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 345..346,
                                             id: Name("i"),
                                             ctx: Store,
@@ -878,22 +878,22 @@ Module(
                                     ),
                                     iter: If(
                                         ExprIf {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 351..373,
                                             test: BooleanLiteral(
                                                 ExprBooleanLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 362..366,
                                                     value: true,
                                                 },
                                             ),
                                             body: Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 351..358,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 357..358,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -903,7 +903,7 @@ Module(
                                             ),
                                             orelse: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 372..373,
                                                     id: Name("X"),
                                                     ctx: Load,
@@ -914,7 +914,7 @@ Module(
                                     ifs: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 378..379,
                                                 id: Name("F"),
                                                 ctx: Load,
@@ -930,15 +930,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 381..423,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 381..423,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 382..383,
                                     id: Name("i"),
                                     ctx: Load,
@@ -947,10 +947,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 384..422,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 388..389,
                                             id: Name("i"),
                                             ctx: Store,
@@ -958,22 +958,22 @@ Module(
                                     ),
                                     iter: Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 393..417,
                                             value: If(
                                                 ExprIf {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 400..416,
                                                     test: BooleanLiteral(
                                                         ExprBooleanLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 405..409,
                                                             value: true,
                                                         },
                                                     ),
                                                     body: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 400..401,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -981,7 +981,7 @@ Module(
                                                     ),
                                                     orelse: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 415..416,
                                                             id: Name("X"),
                                                             ctx: Load,
@@ -994,7 +994,7 @@ Module(
                                     ifs: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 421..422,
                                                 id: Name("F"),
                                                 ctx: Load,
@@ -1010,15 +1010,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 424..457,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 424..457,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 425..426,
                                     id: Name("f"),
                                     ctx: Load,
@@ -1027,10 +1027,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 427..456,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 431..432,
                                             id: Name("f"),
                                             ctx: Store,
@@ -1038,11 +1038,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 436..456,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 436..437,
                                                     id: Name("c"),
                                                     ctx: Load,
@@ -1050,22 +1050,22 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 437..456,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     If(
                                                         ExprIf {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 438..455,
                                                             test: BooleanLiteral(
                                                                 ExprBooleanLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 443..447,
                                                                     value: true,
                                                                 },
                                                             ),
                                                             body: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 438..439,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -1073,7 +1073,7 @@ Module(
                                                             ),
                                                             orelse: List(
                                                                 ExprList {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 453..455,
                                                                     elts: [],
                                                                     ctx: Load,
@@ -1096,15 +1096,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 596..618,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 596..618,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 597..598,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1113,10 +1113,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 599..617,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 603..604,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1124,12 +1124,12 @@ Module(
                                     ),
                                     iter: Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 609..616,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 615..616,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1148,15 +1148,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 619..646,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 619..646,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 620..621,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1165,10 +1165,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 622..645,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 626..627,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1176,11 +1176,11 @@ Module(
                                     ),
                                     iter: YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 632..644,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 643..644,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -1198,15 +1198,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 647..673,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 647..673,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 648..649,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1215,10 +1215,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 650..672,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 654..655,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1226,26 +1226,24 @@ Module(
                                     ),
                                     iter: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 660..671,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 667..668,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 667..668,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 667..668,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 667..668,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -1259,7 +1257,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 670..671,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -1277,15 +1275,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 674..704,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 674..704,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 675..676,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1294,10 +1292,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 677..703,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 681..682,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1305,7 +1303,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 686..690,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1314,12 +1312,12 @@ Module(
                                     ifs: [
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 695..702,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 701..702,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -1338,15 +1336,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 705..740,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 705..740,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 706..707,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1355,10 +1353,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 708..739,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 712..713,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1366,7 +1364,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 717..721,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1375,11 +1373,11 @@ Module(
                                     ifs: [
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 726..738,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 737..738,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1397,15 +1395,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 741..775,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 741..775,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 742..743,
                                     id: Name("x"),
                                     ctx: Load,
@@ -1414,10 +1412,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 744..774,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 748..749,
                                             id: Name("x"),
                                             ctx: Store,
@@ -1425,7 +1423,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 753..757,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1434,26 +1432,24 @@ Module(
                                     ifs: [
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 762..773,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 769..770,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 769..770,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 769..770,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 769..770,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -1467,7 +1463,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 772..773,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap
index 506ee52722..b32e08dff6 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/name.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..76,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..1,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("_"),
                             ctx: Load,
@@ -26,11 +26,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2..5,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..4,
                             id: Name("_"),
                             ctx: Load,
@@ -40,11 +40,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..8,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..8,
                             id: Name("__"),
                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..17,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..17,
                             id: Name("__init__"),
                             ctx: Load,
@@ -68,11 +68,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..22,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..22,
                             id: Name("name"),
                             ctx: Load,
@@ -82,11 +82,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..29,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..28,
                             id: Name("name"),
                             ctx: Load,
@@ -96,11 +96,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..65,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..65,
                             id: Name("match"),
                             ctx: Load,
@@ -110,11 +110,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..70,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..70,
                             id: Name("case"),
                             ctx: Load,
@@ -124,11 +124,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..75,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 71..75,
                             id: Name("type"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap
index 1ac703b53b..199a11eab6 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/named.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..157,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1..10,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..5,
                                     id: Name("name"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 9..10,
                                     value: Int(
                                         0,
@@ -41,15 +41,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..29,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..28,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..17,
                                     id: Name("name"),
                                     ctx: Store,
@@ -57,11 +57,11 @@ Module(
                             ),
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..27,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..23,
                                             id: Name("x"),
                                             ctx: Load,
@@ -70,7 +70,7 @@ Module(
                                     op: Mult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 26..27,
                                             id: Name("y"),
                                             ctx: Load,
@@ -84,15 +84,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..45,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..44,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 31..35,
                                     id: Name("name"),
                                     ctx: Store,
@@ -100,11 +100,11 @@ Module(
                             ),
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 39..44,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..40,
                                             value: Int(
                                                 1,
@@ -114,7 +114,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 43..44,
                                             value: Int(
                                                 1,
@@ -129,15 +129,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..63,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..62,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..51,
                                     id: Name("name"),
                                     ctx: Store,
@@ -145,16 +145,16 @@ Module(
                             ),
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 55..62,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 56..58,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 57..58,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -165,7 +165,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 60..61,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -182,15 +182,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..90,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..89,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..69,
                                     id: Name("name"),
                                     ctx: Store,
@@ -198,18 +198,18 @@ Module(
                             ),
                             value: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 73..89,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 78..82,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 73..74,
                                             id: Name("x"),
                                             ctx: Load,
@@ -217,7 +217,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 88..89,
                                             id: Name("y"),
                                             ctx: Load,
@@ -231,15 +231,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 91..112,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..111,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 92..96,
                                     id: Name("name"),
                                     ctx: Store,
@@ -247,26 +247,24 @@ Module(
                             ),
                             value: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..111,
                                     parameters: Some(
                                         Parameters {
                                             range: 107..108,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 107..108,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 107..108,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 107..108,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -280,7 +278,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 110..111,
                                             id: Name("x"),
                                             ctx: Load,
@@ -294,15 +292,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 113..132,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 114..131,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 114..118,
                                     id: Name("name"),
                                     ctx: Store,
@@ -310,12 +308,12 @@ Module(
                             ),
                             value: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 123..130,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 129..130,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -330,15 +328,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..157,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 134..156,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 134..138,
                                     id: Name("name"),
                                     ctx: Store,
@@ -346,11 +344,11 @@ Module(
                             ),
                             value: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 143..155,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 154..155,
                                             id: Name("x"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap
index 46dac564f0..ad313fbab1 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/number_literal
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..700,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("x"),
                                 ctx: Store,
@@ -26,7 +26,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..13,
                             value: Int(
                                 123456789,
@@ -37,12 +37,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..24,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..15,
                                 id: Name("x"),
                                 ctx: Store,
@@ -51,7 +51,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..24,
                             value: Int(
                                 123456,
@@ -62,12 +62,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..31,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..26,
                                 id: Name("x"),
                                 ctx: Store,
@@ -76,7 +76,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..31,
                             value: Float(
                                 0.1,
@@ -87,12 +87,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..38,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 32..33,
                                 id: Name("x"),
                                 ctx: Store,
@@ -101,7 +101,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..38,
                             value: Float(
                                 1.0,
@@ -112,12 +112,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 39..47,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 39..40,
                                 id: Name("x"),
                                 ctx: Store,
@@ -126,7 +126,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..47,
                             value: Float(
                                 10.0,
@@ -137,12 +137,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 48..56,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 48..49,
                                 id: Name("x"),
                                 ctx: Store,
@@ -151,7 +151,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..56,
                             value: Float(
                                 0.1,
@@ -162,12 +162,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..73,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 57..58,
                                 id: Name("x"),
                                 ctx: Store,
@@ -176,7 +176,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..73,
                             value: Float(
                                 1.00000001,
@@ -187,12 +187,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..97,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 74..75,
                                 id: Name("x"),
                                 ctx: Store,
@@ -201,7 +201,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 78..97,
                             value: Float(
                                 123456789.12345679,
@@ -212,12 +212,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 98..131,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 98..99,
                                 id: Name("x"),
                                 ctx: Store,
@@ -226,7 +226,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 102..131,
                             value: Float(
                                 inf,
@@ -237,12 +237,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 132..155,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 132..133,
                                 id: Name("x"),
                                 ctx: Store,
@@ -251,7 +251,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..155,
                             value: Float(
                                 inf,
@@ -262,12 +262,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 156..170,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 156..157,
                                 id: Name("x"),
                                 ctx: Store,
@@ -276,7 +276,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..170,
                             value: Complex {
                                 real: 0.0,
@@ -288,12 +288,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 171..195,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 171..172,
                                 id: Name("x"),
                                 ctx: Store,
@@ -302,7 +302,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 175..195,
                             value: Complex {
                                 real: 0.0,
@@ -314,12 +314,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 196..207,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 196..197,
                                 id: Name("x"),
                                 ctx: Store,
@@ -328,7 +328,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 200..207,
                             value: Int(
                                 727756,
@@ -339,12 +339,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 208..218,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 208..209,
                                 id: Name("x"),
                                 ctx: Store,
@@ -353,7 +353,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 212..218,
                             value: Int(
                                 11,
@@ -364,12 +364,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 219..228,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 219..220,
                                 id: Name("x"),
                                 ctx: Store,
@@ -378,7 +378,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 223..228,
                             value: Int(
                                 511,
@@ -389,12 +389,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 229..244,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 229..230,
                                 id: Name("x"),
                                 ctx: Store,
@@ -403,7 +403,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 233..244,
                             value: Float(
                                 6e-9,
@@ -414,12 +414,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 245..254,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 245..246,
                                 id: Name("x"),
                                 ctx: Store,
@@ -428,7 +428,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 249..254,
                             value: Int(
                                 10000,
@@ -439,12 +439,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 255..265,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 255..256,
                                 id: Name("x"),
                                 ctx: Store,
@@ -453,7 +453,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 259..265,
                             value: Int(
                                 133333,
@@ -464,12 +464,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 286..298,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 286..287,
                                 id: Name("x"),
                                 ctx: Store,
@@ -478,11 +478,11 @@ Module(
                     ],
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 290..298,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 290..292,
                                     value: Float(
                                         1.0,
@@ -492,7 +492,7 @@ Module(
                             attr: Identifier {
                                 id: Name("imag"),
                                 range: 294..298,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -501,12 +501,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 299..312,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 299..300,
                                 id: Name("x"),
                                 ctx: Store,
@@ -515,11 +515,11 @@ Module(
                     ],
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 303..312,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 303..307,
                                     value: Float(
                                         10.0,
@@ -529,7 +529,7 @@ Module(
                             attr: Identifier {
                                 id: Name("imag"),
                                 range: 308..312,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -538,12 +538,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 313..326,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 313..314,
                                 id: Name("x"),
                                 ctx: Store,
@@ -552,11 +552,11 @@ Module(
                     ],
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 317..326,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 317..321,
                                     value: Float(
                                         0.1,
@@ -566,7 +566,7 @@ Module(
                             attr: Identifier {
                                 id: Name("real"),
                                 range: 322..326,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -575,12 +575,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 327..356,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 327..328,
                                 id: Name("x"),
                                 ctx: Store,
@@ -589,15 +589,15 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 331..356,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 331..354,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 331..350,
                                             value: Float(
                                                 123456789.12345679,
@@ -607,14 +607,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("hex"),
                                         range: 351..354,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 354..356,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -624,12 +624,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 357..396,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 357..358,
                                 id: Name("x"),
                                 ctx: Store,
@@ -638,11 +638,11 @@ Module(
                     ],
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 361..396,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 361..390,
                                     value: Float(
                                         inf,
@@ -652,7 +652,7 @@ Module(
                             attr: Identifier {
                                 id: Name("real"),
                                 range: 392..396,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -661,12 +661,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 397..433,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 397..398,
                                 id: Name("x"),
                                 ctx: Store,
@@ -675,15 +675,15 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 401..433,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 401..431,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 401..420,
                                             value: Float(
                                                 inf,
@@ -693,14 +693,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("conjugate"),
                                         range: 422..431,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 431..433,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -710,12 +710,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 434..453,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 434..435,
                                 id: Name("x"),
                                 ctx: Store,
@@ -724,11 +724,11 @@ Module(
                     ],
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 438..453,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 438..448,
                                     value: Complex {
                                         real: 0.0,
@@ -739,7 +739,7 @@ Module(
                             attr: Identifier {
                                 id: Name("real"),
                                 range: 449..453,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -748,12 +748,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 454..507,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 454..455,
                                 id: Name("x"),
                                 ctx: Store,
@@ -762,15 +762,15 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 458..507,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 458..486,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 458..478,
                                             value: Complex {
                                                 real: 0.0,
@@ -781,26 +781,26 @@ Module(
                                     attr: Identifier {
                                         id: Name("__add__"),
                                         range: 479..486,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 486..507,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 487..506,
                                             func: Attribute(
                                                 ExprAttribute {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 487..504,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 487..493,
                                                             value: Int(
                                                                 11,
@@ -810,14 +810,14 @@ Module(
                                                     attr: Identifier {
                                                         id: Name("bit_length"),
                                                         range: 494..504,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     ctx: Load,
                                                 },
                                             ),
                                             arguments: Arguments {
                                                 range: 504..506,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -832,12 +832,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 508..531,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 508..509,
                                 id: Name("x"),
                                 ctx: Store,
@@ -846,15 +846,15 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 512..531,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 512..529,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 512..519,
                                             value: Int(
                                                 727756,
@@ -864,14 +864,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("conjugate"),
                                         range: 520..529,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 529..531,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -881,12 +881,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 532..555,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 532..533,
                                 id: Name("x"),
                                 ctx: Store,
@@ -895,15 +895,15 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 536..555,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 536..553,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 536..542,
                                             value: Int(
                                                 11,
@@ -913,14 +913,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("conjugate"),
                                         range: 544..553,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 553..555,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -930,12 +930,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 556..571,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 556..557,
                                 id: Name("x"),
                                 ctx: Store,
@@ -944,11 +944,11 @@ Module(
                     ],
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 560..571,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 560..565,
                                     value: Int(
                                         511,
@@ -958,7 +958,7 @@ Module(
                             attr: Identifier {
                                 id: Name("real"),
                                 range: 567..571,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -967,12 +967,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 572..595,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 572..573,
                                 id: Name("x"),
                                 ctx: Store,
@@ -981,15 +981,15 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 576..595,
                             func: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 576..593,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 576..587,
                                             value: Float(
                                                 6e-9,
@@ -999,14 +999,14 @@ Module(
                                     attr: Identifier {
                                         id: Name("hex"),
                                         range: 590..593,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
                             ),
                             arguments: Arguments {
                                 range: 593..595,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -1016,12 +1016,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 596..610,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 596..597,
                                 id: Name("x"),
                                 ctx: Store,
@@ -1030,12 +1030,12 @@ Module(
                     ],
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 600..610,
                             op: USub,
                             operand: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 601..610,
                                     value: Complex {
                                         real: 0.0,
@@ -1049,15 +1049,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 612..632,
                     test: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 615..623,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 615..617,
                                     value: Int(
                                         10,
@@ -1067,7 +1067,7 @@ Module(
                             attr: Identifier {
                                 id: Name("real"),
                                 range: 619..623,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -1075,11 +1075,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 629..632,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 629..632,
                                     },
                                 ),
@@ -1091,12 +1091,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 677..688,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 677..678,
                                 id: Name("y"),
                                 ctx: Store,
@@ -1105,11 +1105,11 @@ Module(
                     ],
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 681..688,
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 681..684,
                                     value: Int(
                                         100,
@@ -1118,7 +1118,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 685..687,
                                     id: Name("no"),
                                     ctx: Load,
@@ -1131,12 +1131,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 689..700,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 689..690,
                                 id: Name("y"),
                                 ctx: Store,
@@ -1145,11 +1145,11 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 693..700,
                             func: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 693..696,
                                     value: Int(
                                         100,
@@ -1158,11 +1158,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 696..700,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 697..699,
                                             id: Name("no"),
                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap
index 747ed8ee3d..9854d74ac1 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/parenthesized.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..92,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1..5,
                             id: Name("expr"),
                             ctx: Load,
@@ -26,15 +26,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..15,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..15,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..12,
                                     id: Name("expr"),
                                     ctx: Load,
@@ -42,7 +42,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 13..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -52,23 +52,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..28,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..28,
                             func: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..26,
                                     func: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..24,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 17..21,
                                                     id: Name("expr"),
                                                     ctx: Load,
@@ -76,7 +76,7 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 22..24,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [],
                                                 keywords: [],
                                             },
@@ -84,7 +84,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 24..26,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -92,7 +92,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 26..28,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -102,23 +102,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..44,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..43,
                             op: Or,
                             values: [
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..38,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 31..32,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -126,7 +126,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 37..38,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -137,7 +137,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 42..43,
                                         id: Name("c"),
                                         ctx: Load,
@@ -150,30 +150,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..58,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..57,
                             parameters: Some(
                                 Parameters {
                                     range: 53..54,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 53..54,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 53..54,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 53..54,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -187,7 +185,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 56..57,
                                     id: Name("x"),
                                     ctx: Load,
@@ -199,15 +197,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 59..67,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..66,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..61,
                                     id: Name("x"),
                                     ctx: Store,
@@ -215,7 +213,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 65..66,
                                     value: Int(
                                         2,
@@ -228,16 +226,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..77,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 69..76,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..76,
                                         id: Name("x"),
                                         ctx: Load,
@@ -250,15 +248,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..92,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..91,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 90..91,
                                     id: Name("x"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap
index eb99b5e4d0..e65e97a2b8 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/set.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..313,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..16,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..16,
                             items: [],
                         },
@@ -25,16 +25,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 17..20,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..20,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         value: Int(
                                             1,
@@ -48,16 +48,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..25,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..25,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 22..23,
                                         value: Int(
                                             1,
@@ -71,16 +71,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..35,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..35,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 27..28,
                                         value: Int(
                                             1,
@@ -89,7 +89,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 30..31,
                                         value: Int(
                                             2,
@@ -98,7 +98,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 33..34,
                                         value: Int(
                                             3,
@@ -112,16 +112,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 36..46,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..46,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 37..38,
                                         value: Int(
                                             1,
@@ -130,7 +130,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..41,
                                         value: Int(
                                             2,
@@ -139,7 +139,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 43..44,
                                         value: Int(
                                             3,
@@ -153,11 +153,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..77,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 74..77,
                             items: [],
                         },
@@ -166,16 +166,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..91,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 78..91,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 88..89,
                                         value: Int(
                                             1,
@@ -189,16 +189,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..113,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..113,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 98..99,
                                         value: Int(
                                             1,
@@ -207,7 +207,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..110,
                                         value: Int(
                                             2,
@@ -221,21 +221,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 124..129,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 124..129,
                             elts: [
                                 Set(
                                     ExprSet {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 125..128,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 126..127,
                                                     value: Int(
                                                         1,
@@ -252,21 +252,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 130..146,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 130..146,
                             elts: [
                                 Set(
                                     ExprSet {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 131..137,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 132..133,
                                                     value: Int(
                                                         1,
@@ -275,7 +275,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 135..136,
                                                     value: Int(
                                                         2,
@@ -287,12 +287,12 @@ Module(
                                 ),
                                 Set(
                                     ExprSet {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 139..145,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 140..141,
                                                     value: Int(
                                                         3,
@@ -301,7 +301,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 143..144,
                                                     value: Int(
                                                         4,
@@ -318,20 +318,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 167..175,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 167..175,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 168..174,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 168..169,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -339,7 +339,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 173..174,
                                                 value: Int(
                                                     2,
@@ -355,16 +355,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 176..190,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 176..190,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 177..178,
                                         value: Int(
                                             1,
@@ -373,11 +373,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 180..186,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 180..181,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -385,7 +385,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 185..186,
                                                 value: Int(
                                                     2,
@@ -396,7 +396,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 188..189,
                                         value: Int(
                                             3,
@@ -410,16 +410,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 191..205,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 191..205,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 192..193,
                                         value: Int(
                                             1,
@@ -428,11 +428,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 196..202,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 196..197,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -440,7 +440,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 201..202,
                                                 value: Int(
                                                     2,
@@ -456,16 +456,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 225..235,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 225..235,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 226..227,
                                         value: Int(
                                             1,
@@ -474,11 +474,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 229..231,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 230..231,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -489,7 +489,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 233..234,
                                         value: Int(
                                             3,
@@ -503,16 +503,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 236..250,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 236..250,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 237..238,
                                         value: Int(
                                             1,
@@ -521,15 +521,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 240..246,
                                         value: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 241..246,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 241..242,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -538,7 +538,7 @@ Module(
                                                 op: BitOr,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 245..246,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -551,7 +551,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 248..249,
                                         value: Int(
                                             3,
@@ -565,20 +565,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 273..312,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 273..312,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 274..279,
                                         left: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 274..275,
                                                 value: Int(
                                                     1,
@@ -588,7 +588,7 @@ Module(
                                         op: Add,
                                         right: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 278..279,
                                                 value: Int(
                                                     2,
@@ -599,12 +599,12 @@ Module(
                                 ),
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 281..287,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 282..283,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -612,7 +612,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 285..286,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -625,12 +625,12 @@ Module(
                                 ),
                                 Set(
                                     ExprSet {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 289..298,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 290..291,
                                                     value: Int(
                                                         1,
@@ -639,7 +639,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 293..294,
                                                     value: Int(
                                                         2,
@@ -648,7 +648,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 296..297,
                                                     value: Int(
                                                         3,
@@ -660,14 +660,14 @@ Module(
                                 ),
                                 Dict(
                                     ExprDict {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 300..311,
                                         items: [
                                             DictItem {
                                                 key: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 301..302,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -676,7 +676,7 @@ Module(
                                                 ),
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 304..305,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -687,7 +687,7 @@ Module(
                                                 key: None,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 309..310,
                                                         id: Name("d"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap
index 8ead74d20d..5482a567fc 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/set_comprehens
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..492,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..15,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..2,
                                     id: Name("x"),
                                     ctx: Load,
@@ -29,10 +29,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 3..14,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             id: Name("i"),
                                             ctx: Store,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 12..14,
                                             id: Name("ll"),
                                             ctx: Load,
@@ -56,15 +56,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..57,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..57,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 17..18,
                                     id: Name("b"),
                                     ctx: Load,
@@ -73,10 +73,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 19..56,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 23..24,
                                             id: Name("c"),
                                             ctx: Store,
@@ -84,7 +84,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 28..29,
                                             id: Name("d"),
                                             ctx: Load,
@@ -93,11 +93,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 33..39,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 33..34,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -109,7 +109,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 38..39,
                                                             id: Name("w"),
                                                             ctx: Load,
@@ -120,13 +120,13 @@ Module(
                                         ),
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 43..51,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 43..44,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -134,7 +134,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 49..51,
                                                             id: Name("yy"),
                                                             ctx: Load,
@@ -145,7 +145,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 55..56,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -161,15 +161,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..103,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..103,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..60,
                                     id: Name("a"),
                                     ctx: Load,
@@ -178,10 +178,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 61..82,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..66,
                                             id: Name("b"),
                                             ctx: Store,
@@ -189,7 +189,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 70..71,
                                             id: Name("c"),
                                             ctx: Load,
@@ -198,13 +198,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 75..82,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 75..76,
                                                             id: Name("d"),
                                                             ctx: Load,
@@ -212,7 +212,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 81..82,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -226,10 +226,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 83..102,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 87..88,
                                             id: Name("f"),
                                             ctx: Store,
@@ -237,7 +237,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 92..93,
                                             id: Name("j"),
                                             ctx: Load,
@@ -246,11 +246,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 97..102,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 97..98,
                                                         id: Name("k"),
                                                         ctx: Load,
@@ -262,7 +262,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 101..102,
                                                             id: Name("h"),
                                                             ctx: Load,
@@ -281,15 +281,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 104..155,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 104..155,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 105..106,
                                     id: Name("a"),
                                     ctx: Load,
@@ -298,10 +298,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 107..128,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 111..112,
                                             id: Name("b"),
                                             ctx: Store,
@@ -309,7 +309,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 116..117,
                                             id: Name("c"),
                                             ctx: Load,
@@ -318,13 +318,13 @@ Module(
                                     ifs: [
                                         BoolOp(
                                             ExprBoolOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 121..128,
                                                 op: And,
                                                 values: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 121..122,
                                                             id: Name("d"),
                                                             ctx: Load,
@@ -332,7 +332,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 127..128,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -346,10 +346,10 @@ Module(
                                 },
                                 Comprehension {
                                     range: 129..154,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 139..140,
                                             id: Name("f"),
                                             ctx: Store,
@@ -357,7 +357,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 144..145,
                                             id: Name("j"),
                                             ctx: Load,
@@ -366,11 +366,11 @@ Module(
                                     ifs: [
                                         Compare(
                                             ExprCompare {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 149..154,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 149..150,
                                                         id: Name("k"),
                                                         ctx: Load,
@@ -382,7 +382,7 @@ Module(
                                                 comparators: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 153..154,
                                                             id: Name("h"),
                                                             ctx: Load,
@@ -401,15 +401,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 156..173,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 156..173,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 157..158,
                                     id: Name("a"),
                                     ctx: Load,
@@ -418,15 +418,15 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 159..172,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 163..167,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 163..164,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -434,7 +434,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 166..167,
                                                         id: Name("b"),
                                                         ctx: Store,
@@ -447,7 +447,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 171..172,
                                             id: Name("G"),
                                             ctx: Load,
@@ -463,15 +463,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 312..334,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 312..334,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 313..314,
                                     id: Name("x"),
                                     ctx: Load,
@@ -480,10 +480,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 315..333,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 319..320,
                                             id: Name("x"),
                                             ctx: Store,
@@ -491,12 +491,12 @@ Module(
                                     ),
                                     iter: Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 325..332,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 331..332,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -515,15 +515,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 335..362,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 335..362,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 336..337,
                                     id: Name("x"),
                                     ctx: Load,
@@ -532,10 +532,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 338..361,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 342..343,
                                             id: Name("x"),
                                             ctx: Store,
@@ -543,11 +543,11 @@ Module(
                                     ),
                                     iter: YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 348..360,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 359..360,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -565,15 +565,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 363..389,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 363..389,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 364..365,
                                     id: Name("x"),
                                     ctx: Load,
@@ -582,10 +582,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 366..388,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 370..371,
                                             id: Name("x"),
                                             ctx: Store,
@@ -593,26 +593,24 @@ Module(
                                     ),
                                     iter: Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 376..387,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 383..384,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 383..384,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 383..384,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 383..384,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -626,7 +624,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 386..387,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -644,15 +642,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 390..420,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 390..420,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 391..392,
                                     id: Name("x"),
                                     ctx: Load,
@@ -661,10 +659,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 393..419,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 397..398,
                                             id: Name("x"),
                                             ctx: Store,
@@ -672,7 +670,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 402..406,
                                             id: Name("data"),
                                             ctx: Load,
@@ -681,12 +679,12 @@ Module(
                                     ifs: [
                                         Yield(
                                             ExprYield {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 411..418,
                                                 value: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 417..418,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -705,15 +703,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 421..456,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 421..456,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 422..423,
                                     id: Name("x"),
                                     ctx: Load,
@@ -722,10 +720,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 424..455,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 428..429,
                                             id: Name("x"),
                                             ctx: Store,
@@ -733,7 +731,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 433..437,
                                             id: Name("data"),
                                             ctx: Load,
@@ -742,11 +740,11 @@ Module(
                                     ifs: [
                                         YieldFrom(
                                             ExprYieldFrom {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 442..454,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 453..454,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -764,15 +762,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 457..491,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 457..491,
                             elt: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 458..459,
                                     id: Name("x"),
                                     ctx: Load,
@@ -781,10 +779,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 460..490,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 464..465,
                                             id: Name("x"),
                                             ctx: Store,
@@ -792,7 +790,7 @@ Module(
                                     ),
                                     iter: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 469..473,
                                             id: Name("data"),
                                             ctx: Load,
@@ -801,26 +799,24 @@ Module(
                                     ifs: [
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 478..489,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 485..486,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 485..486,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 485..486,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("y"),
                                                                         range: 485..486,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -834,7 +830,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 488..489,
                                                         id: Name("y"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap
index c04177fae7..d19e76dab3 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/slice.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..211,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..27,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..27,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 23..24,
                                     id: Name("x"),
                                     ctx: Load,
@@ -28,7 +28,7 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 25..26,
                                     lower: None,
                                     upper: None,
@@ -42,15 +42,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..33,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 28..33,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..29,
                                     id: Name("x"),
                                     ctx: Load,
@@ -58,12 +58,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 30..32,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 30..31,
                                                 value: Int(
                                                     1,
@@ -82,15 +82,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..39,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..39,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..35,
                                     id: Name("x"),
                                     ctx: Load,
@@ -98,13 +98,13 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 36..38,
                                     lower: None,
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 37..38,
                                                 value: Int(
                                                     2,
@@ -122,15 +122,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..46,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..46,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 40..41,
                                     id: Name("x"),
                                     ctx: Load,
@@ -138,12 +138,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..45,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 42..43,
                                                 value: Int(
                                                     1,
@@ -154,7 +154,7 @@ Module(
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 44..45,
                                                 value: Int(
                                                     2,
@@ -172,15 +172,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..52,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..52,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..48,
                                     id: Name("x"),
                                     ctx: Load,
@@ -188,7 +188,7 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..51,
                                     lower: None,
                                     upper: None,
@@ -202,15 +202,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..59,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..59,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     id: Name("x"),
                                     ctx: Load,
@@ -218,12 +218,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 55..58,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 55..56,
                                                 value: Int(
                                                     1,
@@ -242,15 +242,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..66,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..66,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..61,
                                     id: Name("x"),
                                     ctx: Load,
@@ -258,13 +258,13 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..65,
                                     lower: None,
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 63..64,
                                                 value: Int(
                                                     2,
@@ -282,15 +282,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..74,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..74,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 67..68,
                                     id: Name("x"),
                                     ctx: Load,
@@ -298,12 +298,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 69..73,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 69..70,
                                                 value: Int(
                                                     1,
@@ -314,7 +314,7 @@ Module(
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 71..72,
                                                 value: Int(
                                                     2,
@@ -332,15 +332,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 75..81,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 75..81,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 75..76,
                                     id: Name("x"),
                                     ctx: Load,
@@ -348,14 +348,14 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 77..80,
                                     lower: None,
                                     upper: None,
                                     step: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 79..80,
                                                 value: Int(
                                                     3,
@@ -372,15 +372,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 82..89,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..89,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 82..83,
                                     id: Name("x"),
                                     ctx: Load,
@@ -388,12 +388,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 84..88,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 84..85,
                                                 value: Int(
                                                     1,
@@ -405,7 +405,7 @@ Module(
                                     step: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 87..88,
                                                 value: Int(
                                                     3,
@@ -422,15 +422,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 90..97,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..97,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 90..91,
                                     id: Name("x"),
                                     ctx: Load,
@@ -438,13 +438,13 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 92..96,
                                     lower: None,
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 93..94,
                                                 value: Int(
                                                     2,
@@ -455,7 +455,7 @@ Module(
                                     step: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 95..96,
                                                 value: Int(
                                                     3,
@@ -472,15 +472,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 98..106,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 98..106,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 98..99,
                                     id: Name("x"),
                                     ctx: Load,
@@ -488,12 +488,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 100..105,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 value: Int(
                                                     1,
@@ -504,7 +504,7 @@ Module(
                                     upper: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 102..103,
                                                 value: Int(
                                                     2,
@@ -515,7 +515,7 @@ Module(
                                     step: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 104..105,
                                                 value: Int(
                                                     3,
@@ -532,15 +532,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 127..136,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 127..136,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 127..128,
                                     id: Name("x"),
                                     ctx: Load,
@@ -548,11 +548,11 @@ Module(
                             ),
                             slice: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 129..135,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 129..130,
                                             id: Name("y"),
                                             ctx: Store,
@@ -560,7 +560,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 134..135,
                                             value: Int(
                                                 2,
@@ -576,15 +576,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..149,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 137..149,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 137..138,
                                     id: Name("x"),
                                     ctx: Load,
@@ -592,16 +592,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 139..148,
                                     lower: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 140..146,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 140..141,
                                                         id: Name("y"),
                                                         ctx: Store,
@@ -609,7 +609,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 145..146,
                                                         value: Int(
                                                             2,
@@ -630,15 +630,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 150..160,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 150..160,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 150..151,
                                     id: Name("x"),
                                     ctx: Load,
@@ -646,16 +646,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 152..159,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 152..158,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 152..153,
                                                         id: Name("y"),
                                                         ctx: Store,
@@ -663,7 +663,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 157..158,
                                                         value: Int(
                                                             2,
@@ -684,15 +684,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 202..210,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 202..210,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 202..203,
                                     id: Name("x"),
                                     ctx: Load,
@@ -700,12 +700,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 204..209,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 204..205,
                                                 value: Int(
                                                     1,
@@ -714,13 +714,13 @@ Module(
                                         ),
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 206..208,
                                                 lower: None,
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 207..208,
                                                             value: Int(
                                                                 2,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap
index a4fe4f78b4..be5cfdc577 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/starred.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..172,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..2,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..2,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..2,
                                     id: Name("a"),
                                     ctx: Load,
@@ -33,19 +33,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3..11,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..11,
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5..10,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             id: Name("a"),
                                             ctx: Load,
@@ -54,7 +54,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 9..10,
                                             value: Int(
                                                 1,
@@ -70,19 +70,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..19,
                     value: Starred(
                         ExprStarred {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..19,
                             value: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..19,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..14,
                                             id: Name("x"),
                                             ctx: Load,
@@ -91,7 +91,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("attr"),
                                         range: 15..19,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -103,12 +103,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..57,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..32,
                                 id: Name("array_slice"),
                                 ctx: Store,
@@ -117,11 +117,11 @@ Module(
                     ],
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..57,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 35..40,
                                     id: Name("array"),
                                     ctx: Load,
@@ -129,12 +129,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..56,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 41..42,
                                                 value: Int(
                                                     0,
@@ -143,11 +143,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 44..52,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 45..52,
                                                         id: Name("indexes"),
                                                         ctx: Load,
@@ -158,12 +158,12 @@ Module(
                                         ),
                                         UnaryOp(
                                             ExprUnaryOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 54..56,
                                                 op: USub,
                                                 operand: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 55..56,
                                                         value: Int(
                                                             1,
@@ -184,16 +184,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..94,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..80,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..63,
                                         id: Name("array"),
                                         ctx: Load,
@@ -201,12 +201,12 @@ Module(
                                 ),
                                 slice: Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 64..79,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 64..65,
                                                     value: Int(
                                                         0,
@@ -215,11 +215,11 @@ Module(
                                             ),
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 67..75,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 68..75,
                                                             id: Name("indexes"),
                                                             ctx: Load,
@@ -230,12 +230,12 @@ Module(
                                             ),
                                             UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 77..79,
                                                     op: USub,
                                                     operand: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 78..79,
                                                             value: Int(
                                                                 1,
@@ -255,7 +255,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..94,
                             id: Name("array_slice"),
                             ctx: Load,
@@ -265,15 +265,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..140,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..140,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 95..100,
                                     id: Name("array"),
                                     ctx: Load,
@@ -281,16 +281,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 101..139,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 101..119,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 102..119,
                                                         id: Name("indexes_to_select"),
                                                         ctx: Load,
@@ -301,11 +301,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 121..139,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 122..139,
                                                         id: Name("indexes_to_select"),
                                                         ctx: Load,
@@ -326,15 +326,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 141..171,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 141..171,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 141..146,
                                     id: Name("array"),
                                     ctx: Load,
@@ -342,17 +342,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 147..170,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 147..150,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 147..148,
                                                             value: Int(
                                                                 3,
@@ -363,7 +363,7 @@ Module(
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 149..150,
                                                             value: Int(
                                                                 5,
@@ -376,11 +376,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 152..170,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 153..170,
                                                         id: Name("indexes_to_select"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap
index f9480bed42..0f376fd490 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap
@@ -7,27 +7,28 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/string.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..163,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..13,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 0..13,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Hello World",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -38,22 +39,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..20,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..20,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 14..20,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "😎",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -64,11 +66,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..32,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..32,
                             value: StringLiteralValue {
                                 inner: Concatenated(
@@ -76,22 +78,24 @@ Module(
                                         strings: [
                                             StringLiteral {
                                                 range: 21..26,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "Foo",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                             StringLiteral {
                                                 range: 27..32,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "Bar",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ],
@@ -105,11 +109,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..60,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..58,
                             value: StringLiteralValue {
                                 inner: Concatenated(
@@ -117,32 +121,35 @@ Module(
                                         strings: [
                                             StringLiteral {
                                                 range: 39..42,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "A",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                             StringLiteral {
                                                 range: 47..50,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "B",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                             StringLiteral {
                                                 range: 55..58,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "C",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ],
@@ -156,22 +163,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..79,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..79,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 61..79,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "Olá, Mundo!",
                                         flags: StringLiteralFlags {
                                             quote_style: Single,
                                             prefix: Empty,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -182,22 +190,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 80..91,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 80..91,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 80..91,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "ABCDE",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -208,11 +217,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..121,
                     value: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 98..119,
                             value: StringLiteralValue {
                                 inner: Concatenated(
@@ -220,22 +229,24 @@ Module(
                                         strings: [
                                             StringLiteral {
                                                 range: 98..106,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "aB",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: true,
+                                                    unclosed: false,
                                                 },
                                             },
                                             StringLiteral {
                                                 range: 111..119,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "cD",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Single,
                                                     prefix: Empty,
                                                     triple_quoted: true,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ],
@@ -249,17 +260,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..136,
                     value: BytesLiteral(
                         ExprBytesLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..136,
                             value: BytesLiteralValue {
                                 inner: Single(
                                     BytesLiteral {
                                         range: 122..136,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: [
                                             104,
                                             101,
@@ -277,6 +288,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -287,18 +299,18 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..161,
                     value: BytesLiteral(
                         ExprBytesLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 137..161,
                             value: BytesLiteralValue {
                                 inner: Concatenated(
                                     [
                                         BytesLiteral {
                                             range: 137..145,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: [
                                                 98,
                                                 121,
@@ -310,11 +322,12 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         BytesLiteral {
                                             range: 146..161,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: [
                                                 99,
                                                 111,
@@ -333,6 +346,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ],
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap
index f90b4a3033..8407b7a8d8 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/subscript.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..266,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..10,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..10,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..7,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 0..4,
                                             id: Name("data"),
                                             ctx: Load,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     slice: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5..6,
                                             value: Int(
                                                 0,
@@ -44,7 +44,7 @@ Module(
                             ),
                             slice: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     value: Int(
                                         0,
@@ -58,15 +58,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 11..21,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 11..21,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..15,
                                     id: Name("data"),
                                     ctx: Load,
@@ -74,12 +74,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..20,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 16..17,
                                                 value: Int(
                                                     0,
@@ -88,7 +88,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 19..20,
                                                 value: Int(
                                                     1,
@@ -107,15 +107,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..31,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..31,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..26,
                                     id: Name("data"),
                                     ctx: Load,
@@ -123,17 +123,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 27..30,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 27..29,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 27..28,
                                                             value: Int(
                                                                 0,
@@ -157,15 +157,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..43,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..43,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 32..36,
                                     id: Name("data"),
                                     ctx: Load,
@@ -173,17 +173,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 37..42,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 37..39,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 37..38,
                                                             value: Int(
                                                                 0,
@@ -197,7 +197,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 41..42,
                                                 value: Int(
                                                     1,
@@ -216,15 +216,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..56,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..56,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..48,
                                     id: Name("data"),
                                     ctx: Load,
@@ -232,17 +232,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..55,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 49..52,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 49..50,
                                                             value: Int(
                                                                 0,
@@ -253,7 +253,7 @@ Module(
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 51..52,
                                                             value: Int(
                                                                 1,
@@ -266,7 +266,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 54..55,
                                                 value: Int(
                                                     2,
@@ -285,15 +285,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..80,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..80,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 57..61,
                                     id: Name("data"),
                                     ctx: Load,
@@ -301,17 +301,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..79,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 62..67,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 62..63,
                                                             value: Int(
                                                                 0,
@@ -322,7 +322,7 @@ Module(
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 64..65,
                                                             value: Int(
                                                                 1,
@@ -333,7 +333,7 @@ Module(
                                                 step: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 66..67,
                                                             value: Int(
                                                                 2,
@@ -345,7 +345,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 69..70,
                                                 value: Int(
                                                     3,
@@ -354,12 +354,12 @@ Module(
                                         ),
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 72..79,
                                                 lower: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 72..73,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -369,11 +369,11 @@ Module(
                                                 upper: Some(
                                                     BinOp(
                                                         ExprBinOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 74..79,
                                                             left: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 74..75,
                                                                     id: Name("b"),
                                                                     ctx: Load,
@@ -382,7 +382,7 @@ Module(
                                                             op: Add,
                                                             right: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 78..79,
                                                                     value: Int(
                                                                         1,
@@ -407,15 +407,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 81..93,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 81..93,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 81..85,
                                     id: Name("data"),
                                     ctx: Load,
@@ -423,11 +423,11 @@ Module(
                             ),
                             slice: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 86..92,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 86..87,
                                             id: Name("a"),
                                             ctx: Store,
@@ -435,7 +435,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 91..92,
                                             id: Name("b"),
                                             ctx: Load,
@@ -450,15 +450,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 94..106,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..106,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 94..98,
                                     id: Name("data"),
                                     ctx: Load,
@@ -466,12 +466,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 99..105,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 99..100,
                                                 lower: None,
                                                 upper: None,
@@ -480,13 +480,13 @@ Module(
                                         ),
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 102..105,
                                                 lower: None,
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 103..105,
                                                             value: Int(
                                                                 11,
@@ -509,15 +509,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 107..120,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 107..120,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 107..111,
                                     id: Name("data"),
                                     ctx: Load,
@@ -525,12 +525,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 112..119,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 112..113,
                                                 value: Int(
                                                     1,
@@ -539,7 +539,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 115..116,
                                                 value: Int(
                                                     2,
@@ -548,7 +548,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 118..119,
                                                 value: Int(
                                                     3,
@@ -567,15 +567,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..132,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 121..132,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 121..125,
                                     id: Name("data"),
                                     ctx: Load,
@@ -583,12 +583,12 @@ Module(
                             ),
                             slice: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 126..131,
                                     op: Invert,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 127..131,
                                             id: Name("flag"),
                                             ctx: Load,
@@ -603,15 +603,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..148,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 133..148,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 133..137,
                                     id: Name("data"),
                                     ctx: Load,
@@ -619,16 +619,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 138..147,
                                     lower: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 139..145,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 139..140,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -636,7 +636,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 144..145,
                                                         value: Int(
                                                             0,
@@ -657,15 +657,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 149..165,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 149..165,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 149..153,
                                     id: Name("data"),
                                     ctx: Load,
@@ -673,16 +673,16 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 154..164,
                                     lower: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 155..161,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 155..156,
                                                         id: Name("a"),
                                                         ctx: Store,
@@ -690,7 +690,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 160..161,
                                                         value: Int(
                                                             0,
@@ -703,7 +703,7 @@ Module(
                                     upper: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 163..164,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -720,15 +720,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 226..234,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 226..234,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 226..230,
                                     id: Name("data"),
                                     ctx: Load,
@@ -736,16 +736,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 231..233,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 231..233,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 232..233,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -766,15 +766,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 235..249,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 235..249,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 235..239,
                                     id: Name("data"),
                                     ctx: Load,
@@ -782,22 +782,22 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 240..248,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 240..248,
                                                 value: BoolOp(
                                                     ExprBoolOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 241..248,
                                                         op: And,
                                                         values: [
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 241..242,
                                                                     id: Name("x"),
                                                                     ctx: Load,
@@ -805,7 +805,7 @@ Module(
                                                             ),
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 247..248,
                                                                     id: Name("y"),
                                                                     ctx: Load,
@@ -829,15 +829,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 250..265,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 250..265,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 250..254,
                                     id: Name("data"),
                                     ctx: Load,
@@ -845,20 +845,20 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 255..264,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 255..264,
                                                 value: Named(
                                                     ExprNamed {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 257..263,
                                                         target: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 257..258,
                                                                 id: Name("x"),
                                                                 ctx: Store,
@@ -866,7 +866,7 @@ Module(
                                                         ),
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 262..263,
                                                                 id: Name("y"),
                                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap
index c2ee44b3be..ad30629e3a 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap
@@ -7,27 +7,28 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/t_string.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..864,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..21,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..21,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 18..21,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [],
                                         flags: TStringFlags {
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -38,22 +39,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..25,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..25,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 22..25,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [],
                                         flags: TStringFlags {
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -64,22 +66,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..29,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..29,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 26..29,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [],
                                         flags: TStringFlags {
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -90,22 +93,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..37,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..37,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 30..37,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [],
                                         flags: TStringFlags {
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -116,22 +120,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..45,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..45,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 38..45,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [],
                                         flags: TStringFlags {
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -142,36 +147,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..56,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..56,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 47..56,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 49..55,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 50..54,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 50..54,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: " t",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -188,6 +194,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -198,25 +205,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..67,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..67,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 57..67,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 59..66,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 60..63,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -232,6 +239,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -242,30 +250,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..75,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..75,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 68..75,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 70..74,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Tuple(
                                                         ExprTuple {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 71..73,
                                                             elts: [
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 71..72,
                                                                         value: Int(
                                                                             3,
@@ -287,6 +295,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -297,29 +306,29 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 76..86,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 76..86,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 76..86,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 78..85,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Compare(
                                                         ExprCompare {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 79..83,
                                                             left: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 79..80,
                                                                     value: Int(
                                                                         3,
@@ -332,7 +341,7 @@ Module(
                                                             comparators: [
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 82..83,
                                                                         value: Int(
                                                                             4,
@@ -347,7 +356,7 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 84..84,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [],
                                                         },
                                                     ),
@@ -358,6 +367,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -368,25 +378,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..102,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..102,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 87..102,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 89..101,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 90..91,
                                                             value: Int(
                                                                 3,
@@ -398,26 +408,27 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 92..100,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Interpolation(
                                                                     InterpolatedElement {
                                                                         range: 92..97,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         expression: StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 93..96,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 93..96,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "}",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Double,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -432,7 +443,7 @@ Module(
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 97..100,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ">10",
                                                                     },
                                                                 ),
@@ -446,6 +457,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -456,25 +468,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..118,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 103..118,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 103..118,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 105..117,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 106..107,
                                                             value: Int(
                                                                 3,
@@ -486,26 +498,27 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 108..116,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Interpolation(
                                                                     InterpolatedElement {
                                                                         range: 108..113,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         expression: StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 109..112,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 109..112,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "{",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Double,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -520,7 +533,7 @@ Module(
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 113..116,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ">10",
                                                                     },
                                                                 ),
@@ -534,6 +547,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -544,25 +558,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..133,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..133,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 119..133,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 121..132,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 124..127,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -583,6 +597,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -593,25 +608,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 134..154,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 134..154,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 134..154,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 136..153,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 139..142,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -627,12 +642,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 147..152,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 147..152,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ".3f  ",
                                                                     },
                                                                 ),
@@ -646,6 +661,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -656,25 +672,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 155..173,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 155..173,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 155..173,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 157..172,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 160..163,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -695,6 +711,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -705,30 +722,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 174..190,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 174..190,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 174..190,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 176..189,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Tuple(
                                                         ExprTuple {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 179..183,
                                                             elts: [
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 179..180,
                                                                         value: Int(
                                                                             1,
@@ -737,7 +754,7 @@ Module(
                                                                 ),
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 182..183,
                                                                         value: Int(
                                                                             2,
@@ -764,6 +781,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -774,39 +792,39 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 191..217,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 191..217,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 191..217,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 193..216,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: TString(
                                                         ExprTString {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 194..210,
                                                             value: TStringValue {
                                                                 inner: Single(
                                                                     TString {
                                                                         range: 194..210,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         elements: [
                                                                             Interpolation(
                                                                                 InterpolatedElement {
                                                                                     range: 196..209,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     expression: NumberLiteral(
                                                                                         ExprNumberLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 197..203,
                                                                                             value: Float(
                                                                                                 3.1415,
@@ -823,12 +841,12 @@ Module(
                                                                                     format_spec: Some(
                                                                                         InterpolatedStringFormatSpec {
                                                                                             range: 205..208,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             elements: [
                                                                                                 Literal(
                                                                                                     InterpolatedStringLiteralElement {
                                                                                                         range: 205..208,
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         value: ".1f",
                                                                                                     },
                                                                                                 ),
@@ -842,6 +860,7 @@ Module(
                                                                             quote_style: Double,
                                                                             prefix: Regular,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -853,12 +872,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 211..215,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 211..215,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "*^20",
                                                                     },
                                                                 ),
@@ -872,6 +891,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -882,30 +902,30 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 219..255,
                     value: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 219..255,
                             items: [
                                 DictItem {
                                     key: Some(
                                         TString(
                                             ExprTString {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 220..250,
                                                 value: TStringValue {
                                                     inner: Concatenated(
                                                         [
                                                             TString {
                                                                 range: 220..227,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 222..226,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "foo ",
                                                                         },
                                                                     ),
@@ -914,30 +934,31 @@ Module(
                                                                     quote_style: Double,
                                                                     prefix: Regular,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                             TString {
                                                                 range: 228..243,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 230..234,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "bar ",
                                                                         },
                                                                     ),
                                                                     Interpolation(
                                                                         InterpolatedElement {
                                                                             range: 234..241,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             expression: BinOp(
                                                                                 ExprBinOp {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 235..240,
                                                                                     left: Name(
                                                                                         ExprName {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 235..236,
                                                                                             id: Name("x"),
                                                                                             ctx: Load,
@@ -946,7 +967,7 @@ Module(
                                                                                     op: Add,
                                                                                     right: Name(
                                                                                         ExprName {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 239..240,
                                                                                             id: Name("y"),
                                                                                             ctx: Load,
@@ -962,7 +983,7 @@ Module(
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 241..242,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: " ",
                                                                         },
                                                                     ),
@@ -971,16 +992,17 @@ Module(
                                                                     quote_style: Double,
                                                                     prefix: Regular,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                             TString {
                                                                 range: 244..250,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 246..249,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "baz",
                                                                         },
                                                                     ),
@@ -989,6 +1011,7 @@ Module(
                                                                     quote_style: Double,
                                                                     prefix: Regular,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ],
@@ -999,7 +1022,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 252..254,
                                             value: Int(
                                                 10,
@@ -1014,11 +1037,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 256..347,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 262..265,
                             id: Name("foo"),
                             ctx: Load,
@@ -1027,25 +1050,26 @@ Module(
                     cases: [
                         MatchCase {
                             range: 271..295,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 276..281,
-                                    node_index: AtomicNodeIndex(..),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 276..281,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 276..281,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "one",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -1058,7 +1082,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 291..295,
                                     },
                                 ),
@@ -1066,14 +1090,14 @@ Module(
                         },
                         MatchCase {
                             range: 300..347,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 305..333,
-                                    node_index: AtomicNodeIndex(..),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 305..333,
                                             value: StringLiteralValue {
                                                 inner: Concatenated(
@@ -1081,22 +1105,24 @@ Module(
                                                         strings: [
                                                             StringLiteral {
                                                                 range: 305..318,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "implicitly ",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                             StringLiteral {
                                                                 range: 319..333,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "concatenated",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ],
@@ -1112,7 +1138,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 343..347,
                                     },
                                 ),
@@ -1123,32 +1149,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 349..366,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 349..366,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 349..366,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 351..352,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "\\",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 352..357,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 353..356,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -1162,17 +1188,17 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 357..358,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "\\",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 358..365,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 359..362,
                                                             id: Name("bar"),
                                                             ctx: Load,
@@ -1183,12 +1209,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 363..364,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 363..364,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "\\",
                                                                     },
                                                                 ),
@@ -1202,6 +1228,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1212,22 +1239,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 367..381,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 367..381,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 367..381,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 369..380,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "\\{foo\\}",
                                                 },
                                             ),
@@ -1236,6 +1263,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1246,25 +1274,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 382..422,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 382..422,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 382..422,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 386..419,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 392..395,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -1275,12 +1303,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 396..418,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 396..418,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "x\n        y\n        z\n",
                                                                     },
                                                                 ),
@@ -1294,6 +1322,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1304,25 +1333,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 423..441,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 423..441,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 423..441,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 425..440,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 430..433,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -1343,6 +1372,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1353,32 +1383,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 443..488,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 443..488,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 443..488,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 445..452,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "normal ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 452..457,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 453..456,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -1392,17 +1422,17 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 457..470,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " {another} ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 470..475,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 471..474,
                                                             id: Name("bar"),
                                                             ctx: Load,
@@ -1416,17 +1446,17 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 475..478,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " {",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 478..485,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 479..484,
                                                             id: Name("three"),
                                                             ctx: Load,
@@ -1440,7 +1470,7 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 485..487,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "}",
                                                 },
                                             ),
@@ -1449,6 +1479,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1459,32 +1490,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 489..531,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 489..531,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 489..531,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 491..498,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "normal ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 498..505,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 499..502,
                                                             id: Name("foo"),
                                                             ctx: Load,
@@ -1498,17 +1529,17 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 505..506,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 506..513,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 507..510,
                                                             id: Name("bar"),
                                                             ctx: Load,
@@ -1522,17 +1553,17 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 513..514,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 514..521,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 515..518,
                                                             id: Name("baz"),
                                                             ctx: Load,
@@ -1546,17 +1577,17 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 521..522,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 522..530,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 523..529,
                                                             id: Name("foobar"),
                                                             ctx: Load,
@@ -1572,6 +1603,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1582,32 +1614,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 532..551,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 532..551,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 532..551,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 534..541,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "normal ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 541..550,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 542..543,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1618,12 +1650,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 544..549,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 544..549,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "y + 2",
                                                                     },
                                                                 ),
@@ -1637,6 +1669,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1647,25 +1680,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 552..570,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 552..570,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 552..570,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 554..569,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 555..556,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1676,28 +1709,28 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 557..568,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Interpolation(
                                                                     InterpolatedElement {
                                                                         range: 557..568,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         expression: Call(
                                                                             ExprCall {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 558..567,
                                                                                 func: Attribute(
                                                                                     ExprAttribute {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 558..565,
                                                                                         value: Set(
                                                                                             ExprSet {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 558..561,
                                                                                                 elts: [
                                                                                                     NumberLiteral(
                                                                                                         ExprNumberLiteral {
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                             range: 559..560,
                                                                                                             value: Int(
                                                                                                                 1,
@@ -1710,14 +1743,14 @@ Module(
                                                                                         attr: Identifier {
                                                                                             id: Name("pop"),
                                                                                             range: 562..565,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                         },
                                                                                         ctx: Load,
                                                                                     },
                                                                                 ),
                                                                                 arguments: Arguments {
                                                                                     range: 565..567,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     args: [],
                                                                                     keywords: [],
                                                                                 },
@@ -1738,6 +1771,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1748,44 +1782,42 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 571..590,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 571..590,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 571..590,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 573..589,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Lambda(
                                                         ExprLambda {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 575..587,
                                                             parameters: Some(
                                                                 Parameters {
                                                                     range: 582..583,
-                                                                    node_index: AtomicNodeIndex(
-                                                                        0,
-                                                                    ),
+                                                                    node_index: NodeIndex(None),
                                                                     posonlyargs: [],
                                                                     args: [
                                                                         ParameterWithDefault {
                                                                             range: 582..583,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             parameter: Parameter {
                                                                                 range: 582..583,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 name: Identifier {
                                                                                     id: Name("x"),
                                                                                     range: 582..583,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                 },
                                                                                 annotation: None,
                                                                             },
@@ -1799,12 +1831,12 @@ Module(
                                                             ),
                                                             body: Set(
                                                                 ExprSet {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 584..587,
                                                                     elts: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 585..586,
                                                                                 id: Name("x"),
                                                                                 ctx: Load,
@@ -1825,6 +1857,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1835,25 +1868,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 591..599,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 591..599,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 591..599,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 593..598,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 594..595,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1874,6 +1907,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1884,25 +1918,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 600..613,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 600..613,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 600..613,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 602..612,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 607..608,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1923,6 +1957,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1933,25 +1968,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 614..623,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 614..623,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 614..623,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 616..622,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 617..618,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -1972,6 +2007,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -1982,25 +2018,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 624..638,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 624..638,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 624..638,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 626..637,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 627..628,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -2011,12 +2047,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 629..636,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 629..636,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ".3f!r =",
                                                                     },
                                                                 ),
@@ -2030,6 +2066,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -2040,25 +2077,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 639..655,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 639..655,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 639..655,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 641..654,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 642..643,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -2074,12 +2111,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 650..653,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 650..653,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ".3f",
                                                                     },
                                                                 ),
@@ -2093,6 +2130,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -2103,25 +2141,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 656..669,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 656..669,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 656..669,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 658..668,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 659..660,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -2132,12 +2170,12 @@ Module(
                                                     format_spec: Some(
                                                         InterpolatedStringFormatSpec {
                                                             range: 661..667,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Literal(
                                                                     InterpolatedStringLiteralElement {
                                                                         range: 661..667,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: ".3f=!r",
                                                                     },
                                                                 ),
@@ -2151,6 +2189,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -2161,23 +2200,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 670..685,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 670..685,
                             value: TStringValue {
                                 inner: Concatenated(
                                     [
                                         TString {
                                             range: 670..678,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 672..677,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello",
                                                     },
                                                 ),
@@ -2186,19 +2225,20 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 679..685,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 681..684,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 682..683,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2214,6 +2254,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ],
@@ -2225,26 +2266,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 686..699,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 686..699,
                             value: TStringValue {
                                 inner: Concatenated(
                                     [
                                         TString {
                                             range: 686..692,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 688..691,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 689..690,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2260,19 +2301,20 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 693..699,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 695..698,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 696..697,
                                                                 id: Name("y"),
                                                                 ctx: Load,
@@ -2288,6 +2330,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ],
@@ -2299,26 +2342,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 700..715,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 700..715,
                             value: TStringValue {
                                 inner: Concatenated(
                                     [
                                         TString {
                                             range: 700..706,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 702..705,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 703..704,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2334,16 +2377,17 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 707..715,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 709..714,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "world",
                                                     },
                                                 ),
@@ -2352,6 +2396,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ],
@@ -2363,37 +2408,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 716..760,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 716..760,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 716..760,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 718..743,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "Invalid args in command: ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 743..759,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Tuple(
                                                         ExprTuple {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 744..758,
                                                             elts: [
                                                                 Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 744..751,
                                                                         id: Name("command"),
                                                                         ctx: Load,
@@ -2401,11 +2446,11 @@ Module(
                                                                 ),
                                                                 Starred(
                                                                     ExprStarred {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 753..758,
                                                                         value: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 754..758,
                                                                                 id: Name("args"),
                                                                                 ctx: Load,
@@ -2429,6 +2474,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -2439,23 +2485,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 761..781,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 761..781,
                             value: TStringValue {
                                 inner: Concatenated(
                                     [
                                         TString {
                                             range: 761..767,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 763..766,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "foo",
                                                     },
                                                 ),
@@ -2464,19 +2510,20 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 768..774,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 770..773,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 771..772,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -2492,16 +2539,17 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 775..781,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 777..780,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "bar",
                                                     },
                                                 ),
@@ -2510,6 +2558,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ],
@@ -2521,23 +2570,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 782..832,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 788..830,
                             value: TStringValue {
                                 inner: Concatenated(
                                     [
                                         TString {
                                             range: 788..792,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 790..791,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "a",
                                                     },
                                                 ),
@@ -2546,16 +2595,17 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 797..801,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 799..800,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "b",
                                                     },
                                                 ),
@@ -2564,16 +2614,17 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 806..810,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 808..809,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "c",
                                                     },
                                                 ),
@@ -2582,16 +2633,17 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 815..820,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 818..819,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "d",
                                                     },
                                                 ),
@@ -2602,16 +2654,17 @@ Module(
                                                     uppercase_r: false,
                                                 },
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                         TString {
                                             range: 825..830,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 828..829,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "e",
                                                     },
                                                 ),
@@ -2622,6 +2675,7 @@ Module(
                                                     uppercase_r: false,
                                                 },
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ],
@@ -2633,54 +2687,54 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 844..863,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 844..863,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 844..863,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 846..862,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: FString(
                                                         ExprFString {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 847..861,
                                                             value: FStringValue {
                                                                 inner: Single(
                                                                     FString(
                                                                         FString {
                                                                             range: 847..861,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             elements: [
                                                                                 Interpolation(
                                                                                     InterpolatedElement {
                                                                                         range: 849..860,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         expression: TString(
                                                                                             ExprTString {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 850..859,
                                                                                                 value: TStringValue {
                                                                                                     inner: Single(
                                                                                                         TString {
                                                                                                             range: 850..859,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                             elements: [
                                                                                                                 Interpolation(
                                                                                                                     InterpolatedElement {
                                                                                                                         range: 852..858,
-                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                        node_index: NodeIndex(None),
                                                                                                                         expression: Name(
                                                                                                                             ExprName {
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 range: 853..857,
                                                                                                                                 id: Name("this"),
                                                                                                                                 ctx: Load,
@@ -2696,6 +2750,7 @@ Module(
                                                                                                                 quote_style: Double,
                                                                                                                 prefix: Regular,
                                                                                                                 triple_quoted: false,
+                                                                                                                unclosed: false,
                                                                                                             },
                                                                                                         },
                                                                                                     ),
@@ -2712,6 +2767,7 @@ Module(
                                                                                 quote_style: Double,
                                                                                 prefix: Regular,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -2729,6 +2785,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap
index 4b019c8755..85d7b0c3f6 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/tuple.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..276,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..21,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..21,
                             elts: [],
                             ctx: Load,
@@ -27,11 +27,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..26,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..25,
                             elts: [],
                             ctx: Load,
@@ -42,16 +42,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..37,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 27..37,
                             elts: [
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..31,
                                         elts: [],
                                         ctx: Load,
@@ -60,7 +60,7 @@ Module(
                                 ),
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..36,
                                         elts: [],
                                         ctx: Load,
@@ -76,16 +76,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..42,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..42,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..40,
                                         id: Name("a"),
                                         ctx: Load,
@@ -100,16 +100,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..49,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..49,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..45,
                                         id: Name("a"),
                                         ctx: Load,
@@ -117,7 +117,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 47..48,
                                         id: Name("b"),
                                         ctx: Load,
@@ -132,16 +132,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 50..57,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..57,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         id: Name("a"),
                                         ctx: Load,
@@ -149,7 +149,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         id: Name("b"),
                                         ctx: Load,
@@ -164,16 +164,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..66,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..65,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 60..61,
                                         id: Name("a"),
                                         ctx: Load,
@@ -181,7 +181,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 63..64,
                                         id: Name("b"),
                                         ctx: Load,
@@ -196,16 +196,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 90..92,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..92,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 90..91,
                                         id: Name("a"),
                                         ctx: Load,
@@ -220,16 +220,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..97,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..97,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 93..94,
                                         id: Name("a"),
                                         ctx: Load,
@@ -237,7 +237,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..97,
                                         id: Name("b"),
                                         ctx: Load,
@@ -252,16 +252,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 98..103,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 98..103,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 98..99,
                                         id: Name("a"),
                                         ctx: Load,
@@ -269,7 +269,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 101..102,
                                         id: Name("b"),
                                         ctx: Load,
@@ -284,20 +284,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 126..129,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 126..129,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 126..128,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 127..128,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -315,16 +315,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 130..135,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 130..135,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 130..131,
                                         id: Name("a"),
                                         ctx: Load,
@@ -332,11 +332,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 133..135,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 134..135,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -354,24 +354,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..161,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..161,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 136..142,
                                         value: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 137..142,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 137..138,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -380,7 +380,7 @@ Module(
                                                 op: BitOr,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 141..142,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -393,15 +393,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 144..152,
                                         value: Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 145..152,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 151..152,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -414,7 +414,7 @@ Module(
                                 ),
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 154..156,
                                         elts: [],
                                         ctx: Load,
@@ -423,11 +423,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 158..161,
                                         value: Tuple(
                                             ExprTuple {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 159..161,
                                                 elts: [],
                                                 ctx: Load,
@@ -446,20 +446,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 162..167,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 162..167,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 163..165,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 164..165,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -477,16 +477,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 168..175,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 168..175,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 169..170,
                                         id: Name("a"),
                                         ctx: Load,
@@ -494,11 +494,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 172..174,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 173..174,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -516,24 +516,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 176..203,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 176..203,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 177..183,
                                         value: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 178..183,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 178..179,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -542,7 +542,7 @@ Module(
                                                 op: BitOr,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 182..183,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -555,15 +555,15 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 185..193,
                                         value: Await(
                                             ExprAwait {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 186..193,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 192..193,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -576,7 +576,7 @@ Module(
                                 ),
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 195..197,
                                         elts: [],
                                         ctx: Load,
@@ -585,11 +585,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 199..202,
                                         value: Tuple(
                                             ExprTuple {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 200..202,
                                                 elts: [],
                                                 ctx: Load,
@@ -608,20 +608,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 224..233,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 224..233,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 225..231,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 225..226,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -629,7 +629,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 230..231,
                                                 value: Int(
                                                     1,
@@ -647,16 +647,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 234..245,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 234..245,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 235..236,
                                         id: Name("x"),
                                         ctx: Load,
@@ -664,11 +664,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 238..244,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 238..239,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -676,7 +676,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 243..244,
                                                 value: Int(
                                                     2,
@@ -694,16 +694,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 246..260,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 246..260,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 247..248,
                                         id: Name("x"),
                                         ctx: Load,
@@ -711,11 +711,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 250..256,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 250..251,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -723,7 +723,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 255..256,
                                                 value: Int(
                                                     2,
@@ -734,7 +734,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 258..259,
                                         id: Name("z"),
                                         ctx: Load,
@@ -749,16 +749,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 261..275,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 261..275,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 261..262,
                                         id: Name("x"),
                                         ctx: Load,
@@ -766,11 +766,11 @@ Module(
                                 ),
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 265..271,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 265..266,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -778,7 +778,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 270..271,
                                                 value: Int(
                                                     2,
@@ -789,7 +789,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 274..275,
                                         id: Name("z"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap
index cf09c3dcf5..5098bc6044 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/unary_op.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..276,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..11,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..11,
                             op: USub,
                             operand: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     value: Int(
                                         1,
@@ -34,16 +34,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..14,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..14,
                             op: UAdd,
                             operand: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 13..14,
                                     value: Int(
                                         1,
@@ -56,16 +56,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..17,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..17,
                             op: Invert,
                             operand: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..17,
                                     value: Int(
                                         1,
@@ -78,16 +78,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..23,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..23,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
                                     id: Name("x"),
                                     ctx: Load,
@@ -99,26 +99,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 36..40,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..40,
                             op: USub,
                             operand: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 37..40,
                                     op: USub,
                                     operand: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 38..40,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 39..40,
                                                     value: Int(
                                                         1,
@@ -135,26 +135,26 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..45,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..45,
                             op: USub,
                             operand: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..45,
                                     op: UAdd,
                                     operand: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 43..45,
                                             op: Invert,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 44..45,
                                                     value: Int(
                                                         1,
@@ -171,31 +171,31 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..53,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..53,
                             op: Not,
                             operand: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..53,
                                     op: USub,
                                     operand: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 50..53,
                                             op: UAdd,
                                             operand: UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 51..53,
                                                     op: Invert,
                                                     operand: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 52..53,
                                                             value: Int(
                                                                 1,
@@ -214,21 +214,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 54..63,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 54..63,
                             op: Not,
                             operand: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 58..63,
                                     op: Not,
                                     operand: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..63,
                                             id: Name("x"),
                                             ctx: Load,
@@ -242,20 +242,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..93,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..93,
                             op: USub,
                             operand: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 86..93,
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 92..93,
                                             value: Int(
                                                 1,
@@ -270,24 +270,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 94..109,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..109,
                             op: UAdd,
                             operand: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 96..109,
                                     left: Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..103,
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 102..103,
                                                     value: Int(
                                                         1,
@@ -299,12 +299,12 @@ Module(
                                     op: Pow,
                                     right: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 107..109,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 108..109,
                                                     value: Int(
                                                         2,
@@ -321,21 +321,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 110..117,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 110..117,
                             op: Invert,
                             operand: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 111..117,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 112..113,
                                                 value: Int(
                                                     1,
@@ -344,7 +344,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 115..116,
                                                 value: Int(
                                                     2,
@@ -362,20 +362,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..124,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 118..124,
                             left: UnaryOp(
                                 ExprUnaryOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 118..120,
                                     op: USub,
                                     operand: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 119..120,
                                             value: Int(
                                                 1,
@@ -387,7 +387,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 123..124,
                                     value: Int(
                                         2,
@@ -400,28 +400,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 212..246,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 212..246,
                             op: Or,
                             values: [
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 212..223,
                                         op: And,
                                         values: [
                                             UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 212..217,
                                                     op: Not,
                                                     operand: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 216..217,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -431,7 +431,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 222..223,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -442,22 +442,22 @@ Module(
                                 ),
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 227..246,
                                         op: And,
                                         values: [
                                             UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 227..236,
                                                     op: Not,
                                                     operand: BinOp(
                                                         ExprBinOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 231..236,
                                                             left: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 231..232,
                                                                     id: Name("c"),
                                                                     ctx: Load,
@@ -466,7 +466,7 @@ Module(
                                                             op: BitOr,
                                                             right: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 235..236,
                                                                     id: Name("d"),
                                                                     ctx: Load,
@@ -478,12 +478,12 @@ Module(
                                             ),
                                             UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 241..246,
                                                     op: Not,
                                                     operand: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 245..246,
                                                             id: Name("e"),
                                                             ctx: Load,
@@ -501,20 +501,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 247..259,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 247..259,
                             op: Not,
                             operand: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 252..258,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 252..253,
                                             id: Name("x"),
                                             ctx: Store,
@@ -522,7 +522,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 257..258,
                                             value: Int(
                                                 1,
@@ -537,20 +537,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 260..275,
                     value: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 260..275,
                             op: Not,
                             operand: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 264..275,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 264..265,
                                             id: Name("a"),
                                             ctx: Load,
@@ -559,12 +559,12 @@ Module(
                                     op: BitOr,
                                     right: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 269..274,
                                             op: Not,
                                             operand: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 273..274,
                                                     id: Name("b"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap
index cafb60b460..e137cd09fc 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/yield.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..166,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             value: None,
                         },
@@ -25,16 +25,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..13,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 12..13,
                                         id: Name("x"),
                                         ctx: Load,
@@ -47,20 +47,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..25,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..25,
                             value: Some(
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..25,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..21,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -69,7 +69,7 @@ Module(
                                         op: Add,
                                         right: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 24..25,
                                                 value: Int(
                                                     1,
@@ -85,22 +85,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..39,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 26..39,
                             value: Some(
                                 BoolOp(
                                     ExprBoolOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 32..39,
                                         op: And,
                                         values: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 32..33,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -108,7 +108,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 38..39,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -124,20 +124,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..52,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 40..52,
                             value: Some(
                                 Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 46..52,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 46..50,
                                                 id: Name("call"),
                                                 ctx: Load,
@@ -145,7 +145,7 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 50..52,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [],
                                             keywords: [],
                                         },
@@ -158,21 +158,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..65,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..65,
                             value: Some(
                                 List(
                                     ExprList {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 59..65,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 60..61,
                                                     value: Int(
                                                         1,
@@ -181,7 +181,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 63..64,
                                                     value: Int(
                                                         2,
@@ -199,21 +199,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..78,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..78,
                             value: Some(
                                 Set(
                                     ExprSet {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..78,
                                         elts: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 73..74,
                                                     value: Int(
                                                         3,
@@ -222,7 +222,7 @@ Module(
                                             ),
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 76..77,
                                                     value: Int(
                                                         4,
@@ -239,23 +239,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..91,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..91,
                             value: Some(
                                 Dict(
                                     ExprDict {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..91,
                                         items: [
                                             DictItem {
                                                 key: Some(
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 86..87,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -264,7 +264,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 89..90,
                                                         value: Int(
                                                             5,
@@ -282,21 +282,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..102,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..102,
                             value: Some(
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 98..102,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 98..99,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -304,7 +304,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 101..102,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -322,21 +322,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..115,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 103..115,
                             value: Some(
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..115,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 110..111,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -344,7 +344,7 @@ Module(
                                             ),
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 113..114,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -362,20 +362,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 116..128,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 116..128,
                             value: Some(
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 122..128,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 122..123,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -387,7 +387,7 @@ Module(
                                         comparators: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 127..128,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -403,20 +403,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 129..143,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 129..143,
                             value: Some(
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 136..142,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 136..137,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -424,7 +424,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 141..142,
                                                 value: Int(
                                                     1,
@@ -440,21 +440,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 144..155,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 144..155,
                             value: Some(
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 150..155,
                                         elts: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 150..151,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -462,11 +462,11 @@ Module(
                                             ),
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 153..155,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 154..155,
                                                             id: Name("y"),
                                                             ctx: Load,
@@ -487,25 +487,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 156..165,
                     value: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 156..165,
                             value: Some(
                                 Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 162..165,
                                         elts: [
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 162..164,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 163..164,
                                                             id: Name("x"),
                                                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap
index 0d7bfe36e3..86e8a9ac06 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/yield_from.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..199,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..12,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..12,
                                     id: Name("x"),
                                     ctx: Load,
@@ -32,19 +32,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..29,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 13..29,
                             value: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..29,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 24..25,
                                             id: Name("x"),
                                             ctx: Load,
@@ -53,7 +53,7 @@ Module(
                                     op: Add,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 28..29,
                                             value: Int(
                                                 1,
@@ -68,21 +68,21 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..48,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 30..48,
                             value: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..48,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 41..42,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -90,7 +90,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 47..48,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -105,19 +105,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 49..66,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..66,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 60..66,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 60..64,
                                             id: Name("call"),
                                             ctx: Load,
@@ -125,7 +125,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 64..66,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -137,20 +137,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..84,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..84,
                             value: List(
                                 ExprList {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 78..84,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 79..80,
                                                 value: Int(
                                                     1,
@@ -159,7 +159,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 82..83,
                                                 value: Int(
                                                     2,
@@ -176,20 +176,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..102,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 85..102,
                             value: Set(
                                 ExprSet {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 96..102,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 97..98,
                                                 value: Int(
                                                     3,
@@ -198,7 +198,7 @@ Module(
                                         ),
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 value: Int(
                                                     4,
@@ -214,22 +214,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..120,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 103..120,
                             value: Dict(
                                 ExprDict {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 114..120,
                                     items: [
                                         DictItem {
                                             key: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 115..116,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -238,7 +238,7 @@ Module(
                                             ),
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 118..119,
                                                     value: Int(
                                                         5,
@@ -255,20 +255,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..138,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 121..138,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 132..138,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 133..134,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -276,7 +276,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 136..137,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -293,19 +293,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 139..156,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 139..156,
                             value: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 150..156,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 150..151,
                                             id: Name("x"),
                                             ctx: Load,
@@ -317,7 +317,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 155..156,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -332,19 +332,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 157..176,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 157..176,
                             value: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 169..175,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 169..170,
                                             id: Name("x"),
                                             ctx: Store,
@@ -352,7 +352,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 174..175,
                                             value: Int(
                                                 1,
@@ -367,20 +367,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 177..199,
                     value: YieldFrom(
                         ExprYieldFrom {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 177..199,
                             value: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 188..199,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 189..190,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -388,15 +388,15 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 192..198,
                                                 value: BinOp(
                                                     ExprBinOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 193..198,
                                                         left: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 193..194,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -405,7 +405,7 @@ Module(
                                                         op: BitOr,
                                                         right: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 197..198,
                                                                 id: Name("y"),
                                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap
index 8d3f2a8743..05a956dcf6 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/for_in_target_valid_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..89,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     target: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..13,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4..5,
                                     id: Name("d"),
                                     ctx: Load,
@@ -29,11 +29,11 @@ Module(
                             ),
                             slice: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..12,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 6..7,
                                             id: Name("x"),
                                             ctx: Load,
@@ -45,7 +45,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 11..12,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -59,7 +59,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..23,
                             id: Name("target"),
                             ctx: Load,
@@ -68,11 +68,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -84,20 +84,20 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..57,
                     is_async: false,
                     target: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..44,
                             value: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 34..40,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 34..35,
                                             id: Name("x"),
                                             ctx: Load,
@@ -109,7 +109,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 39..40,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -120,7 +120,7 @@ Module(
                             ),
                             slice: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..43,
                                     value: Int(
                                         0,
@@ -132,7 +132,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 48..52,
                             id: Name("iter"),
                             ctx: Load,
@@ -141,11 +141,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 54..57,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..57,
                                     },
                                 ),
@@ -157,20 +157,20 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..88,
                     is_async: false,
                     target: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..75,
                             value: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 63..69,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 63..64,
                                             id: Name("x"),
                                             ctx: Load,
@@ -182,7 +182,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 68..69,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -194,14 +194,14 @@ Module(
                             attr: Identifier {
                                 id: Name("attr"),
                                 range: 71..75,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Store,
                         },
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..83,
                             id: Name("iter"),
                             ctx: Load,
@@ -210,11 +210,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 85..88,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..88,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap
index e981ecdd5d..bebfeca6cb 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/for_iter_unpack_py38.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..112,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..65,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("x"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..60,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..55,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 54..55,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -45,7 +45,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..59,
                                         id: Name("b"),
                                         ctx: Load,
@@ -59,11 +59,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 62..65,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 62..65,
                                     },
                                 ),
@@ -75,12 +75,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..88,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..71,
                             id: Name("x"),
                             ctx: Store,
@@ -88,12 +88,12 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 75..83,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..78,
                                         id: Name("a"),
                                         ctx: Load,
@@ -101,11 +101,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..82,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 81..82,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -122,11 +122,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 85..88,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..88,
                                     },
                                 ),
@@ -138,12 +138,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 89..111,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..94,
                             id: Name("x"),
                             ctx: Store,
@@ -151,16 +151,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 98..106,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..101,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -171,11 +171,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 103..105,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 104..105,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -192,11 +192,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 108..111,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 108..111,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap
index 2579c5e35f..57ae9806a2 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/for_iter_unpack_py39.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..106,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..63,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("x"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..58,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..54,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 53..54,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -45,7 +45,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         id: Name("b"),
                                         ctx: Load,
@@ -59,11 +59,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 60..63,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 60..63,
                                     },
                                 ),
@@ -75,12 +75,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..84,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..69,
                             id: Name("x"),
                             ctx: Store,
@@ -88,12 +88,12 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 74..79,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
                                         id: Name("a"),
                                         ctx: Load,
@@ -101,11 +101,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..79,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 78..79,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -122,11 +122,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 81..84,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
                                     },
                                 ),
@@ -138,12 +138,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..105,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 89..90,
                             id: Name("x"),
                             ctx: Store,
@@ -151,16 +151,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 94..100,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..96,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 95..96,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -171,11 +171,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 98..100,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 99..100,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -192,11 +192,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 102..105,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 102..105,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap
index 4e27abaf58..dc39444395 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap
@@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/ok/from_import_no_space.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..30,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     module: None,
                     names: [
                         Alias {
                             range: 12..13,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("x"),
                                 range: 12..13,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -32,17 +32,17 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..29,
                     module: None,
                     names: [
                         Alias {
                             range: 28..29,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("x"),
                                 range: 28..29,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap
index ffbf2fa38d..6afb4d35ee 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/ok/from_import_soft_keywo
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..104,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..25,
                     module: Some(
                         Identifier {
                             id: Name("match"),
                             range: 5..10,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 18..25,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("pattern"),
                                 range: 18..25,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -38,23 +38,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 26..46,
                     module: Some(
                         Identifier {
                             id: Name("type"),
                             range: 31..35,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 43..46,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("bar"),
                                 range: 43..46,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -64,23 +64,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..71,
                     module: Some(
                         Identifier {
                             id: Name("case"),
                             range: 52..56,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 64..71,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("pattern"),
                                 range: 64..71,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -90,23 +90,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..103,
                     module: Some(
                         Identifier {
                             id: Name("match.type.case"),
                             range: 77..92,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 100..103,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("foo"),
                                 range: 100..103,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap
index afc649c201..5d66543330 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/from_import_stmt_termi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..97,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 15..16,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 15..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 18..19,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 18..19,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -48,33 +48,33 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..41,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 26..27,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 36..37,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 36..37,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 39..40,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 39..40,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -84,16 +84,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..47,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..47,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 43..44,
                                         id: Name("x"),
                                         ctx: Load,
@@ -101,7 +101,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 46..47,
                                         id: Name("y"),
                                         ctx: Load,
@@ -116,33 +116,33 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 48..66,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 53..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 62..63,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 62..63,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 65..66,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 65..66,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -152,16 +152,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..72,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..72,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 68..69,
                                         id: Name("x"),
                                         ctx: Load,
@@ -169,7 +169,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 71..72,
                                         id: Name("y"),
                                         ctx: Load,
@@ -184,33 +184,33 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 73..91,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 78..79,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 87..88,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 87..88,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 90..91,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 90..91,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -220,16 +220,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 92..96,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..96,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..93,
                                         id: Name("x"),
                                         ctx: Load,
@@ -237,7 +237,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 95..96,
                                         id: Name("y"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap
index 386e5a0f15..d3a6103ce0 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/fstring_format_spec_te
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..43,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..19,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 0..19,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 2..8,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 8..12,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 9..10,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -49,7 +49,7 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 11..11,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [],
                                                             },
                                                         ),
@@ -58,7 +58,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 12..18,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " world",
                                                     },
                                                 ),
@@ -67,6 +67,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -78,33 +79,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..42,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..42,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 20..42,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 22..28,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "hello ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 28..35,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 29..30,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -115,12 +116,12 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 31..34,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 31..34,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: ".3f",
                                                                         },
                                                                     ),
@@ -132,7 +133,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 35..41,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " world",
                                                     },
                                                 ),
@@ -141,6 +142,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap
index 68a01e322f..900be0a882 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap
@@ -7,43 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_def_parameter
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..56,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..55,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..43,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 13..23,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 13..23,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("first"),
                                         range: 13..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 20..23,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -55,19 +53,19 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 29..40,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 29..40,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("second"),
                                         range: 29..35,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 37..40,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -85,7 +83,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 47..50,
                                 id: Name("int"),
                                 ctx: Load,
@@ -95,11 +93,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 52..55,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..55,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap
index 2008c48ad0..207800f85e 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_def_parenthes
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..54,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..24,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..9,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -36,12 +34,12 @@ Module(
                     returns: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..19,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 14..17,
                                             id: Name("int"),
                                             ctx: Load,
@@ -56,11 +54,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..24,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..24,
                                     },
                                 ),
@@ -71,21 +69,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..53,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 29..32,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 32..34,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -95,12 +91,12 @@ Module(
                     returns: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..48,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..42,
                                             id: Name("int"),
                                             ctx: Load,
@@ -108,7 +104,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 44..47,
                                             id: Name("str"),
                                             ctx: Load,
@@ -123,11 +119,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 50..53,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 50..53,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap
index f3762e02fd..5415e94eee 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_def_valid_ret
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..97,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..27,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..9,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -36,11 +34,11 @@ Module(
                     returns: Some(
                         BinOp(
                             ExprBinOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..22,
                                 left: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..16,
                                         id: Name("int"),
                                         ctx: Load,
@@ -49,7 +47,7 @@ Module(
                                 op: BitOr,
                                 right: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                         id: Name("str"),
                                         ctx: Load,
@@ -61,11 +59,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..27,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..27,
                                     },
                                 ),
@@ -76,21 +74,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..57,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 32..35,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 35..37,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -100,26 +96,24 @@ Module(
                     returns: Some(
                         Lambda(
                             ExprLambda {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 41..52,
                                 parameters: Some(
                                     Parameters {
                                         range: 48..49,
-                                        node_index: AtomicNodeIndex(
-                                            0,
-                                        ),
+                                        node_index: NodeIndex(None),
                                         posonlyargs: [],
                                         args: [
                                             ParameterWithDefault {
                                                 range: 48..49,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 parameter: Parameter {
                                                     range: 48..49,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     name: Identifier {
                                                         id: Name("x"),
                                                         range: 48..49,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     annotation: None,
                                                 },
@@ -133,7 +127,7 @@ Module(
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         id: Name("x"),
                                         ctx: Load,
@@ -145,11 +139,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 54..57,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..57,
                                     },
                                 ),
@@ -160,21 +154,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..96,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 62..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -184,18 +176,18 @@ Module(
                     returns: Some(
                         If(
                             ExprIf {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 71..91,
                                 test: BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 78..82,
                                         value: true,
                                     },
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 71..74,
                                         id: Name("int"),
                                         ctx: Load,
@@ -203,7 +195,7 @@ Module(
                                 ),
                                 orelse: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 88..91,
                                         id: Name("str"),
                                         ctx: Load,
@@ -215,11 +207,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 93..96,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 93..96,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap
index c4bcad7813..c60829f2b7 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap
@@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_type_params_p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..62,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..61,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 48..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 51..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 52..53,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 52..53,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -44,9 +44,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 54..56,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -57,11 +55,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..61,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap
index e5a51faf37..2282955763 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap
@@ -7,41 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/global_stmt.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 7..8,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
             ),
             Global(
                 StmtGlobal {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..23,
                     names: [
                         Identifier {
                             id: Name("x"),
                             range: 16..17,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                         Identifier {
                             id: Name("y"),
                             range: 19..20,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                         Identifier {
                             id: Name("z"),
                             range: 22..23,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ],
                 },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap
index 15b856b9bc..12b0c4ea59 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap
@@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/ok/import_as_name_soft_ke
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..58,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     names: [
                         Alias {
                             range: 7..19,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("foo"),
                                 range: 7..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("match"),
                                     range: 14..19,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -36,22 +36,22 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 20..38,
                     names: [
                         Alias {
                             range: 27..38,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("bar"),
                                 range: 27..30,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("case"),
                                     range: 34..38,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -60,22 +60,22 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 39..57,
                     names: [
                         Alias {
                             range: 46..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("baz"),
                                 range: 46..49,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("type"),
                                     range: 53..57,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap
new file mode 100644
index 0000000000..05896bd1e3
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap
@@ -0,0 +1,42 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/ok/import_from_star.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..21,
+        body: [
+            ImportFrom(
+                StmtImportFrom {
+                    node_index: NodeIndex(None),
+                    range: 0..20,
+                    module: Some(
+                        Identifier {
+                            id: Name("module"),
+                            range: 5..11,
+                            node_index: NodeIndex(None),
+                        },
+                    ),
+                    names: [
+                        Alias {
+                            range: 19..20,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("*"),
+                                range: 19..20,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                    ],
+                    level: 0,
+                },
+            ),
+        ],
+    },
+)
+```
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap
index 507563d546..0412ecc38f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap
@@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/ok/import_stmt_terminator
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..42,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     names: [
                         Alias {
                             range: 7..8,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 7..8,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 10..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 10..11,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -40,26 +40,26 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..24,
                     names: [
                         Alias {
                             range: 20..21,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 20..21,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 23..24,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("d"),
                                 range: 23..24,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -68,26 +68,26 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 25..36,
                     names: [
                         Alias {
                             range: 32..33,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 32..33,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 35..36,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 35..36,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -96,16 +96,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 37..41,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..41,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 37..38,
                                         id: Name("c"),
                                         ctx: Load,
@@ -113,7 +113,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..41,
                                         id: Name("d"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap
index 4dc3301709..ee291df133 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/irrefutable_case_patte
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..176,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..42,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,14 +25,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..24,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 18..19,
                                             value: Int(
                                                 2,
@@ -45,11 +45,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..24,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 21..24,
                                             },
                                         ),
@@ -59,17 +59,17 @@ Module(
                         },
                         MatchCase {
                             range: 29..42,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 34..37,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("var"),
                                             range: 34..37,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -78,11 +78,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..42,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 39..42,
                                             },
                                         ),
@@ -95,11 +95,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..83,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..50,
                             id: Name("x"),
                             ctx: Load,
@@ -108,14 +108,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 56..67,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 61..62,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 61..62,
                                             value: Int(
                                                 2,
@@ -128,11 +128,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 64..67,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 64..67,
                                             },
                                         ),
@@ -142,11 +142,11 @@ Module(
                         },
                         MatchCase {
                             range: 72..83,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 77..78,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -155,11 +155,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..83,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 80..83,
                                             },
                                         ),
@@ -172,11 +172,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..175,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..91,
                             id: Name("x"),
                             ctx: Load,
@@ -185,17 +185,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 97..118,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 102..105,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("var"),
                                             range: 102..105,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -203,7 +203,7 @@ Module(
                             guard: Some(
                                 BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..113,
                                         value: true,
                                     },
@@ -212,11 +212,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 115..118,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 115..118,
                                             },
                                         ),
@@ -226,14 +226,14 @@ Module(
                         },
                         MatchCase {
                             range: 164..175,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 169..170,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 169..170,
                                             value: Int(
                                                 2,
@@ -246,11 +246,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 172..175,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 172..175,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap
index 470474aa7f..f98e1ddaa3 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_return_py3
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..93,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                                 id: Name("rest"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..59,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             4,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             5,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             6,
@@ -65,21 +65,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..92,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 64..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,17 +88,17 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..92,
                                 value: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 76..92,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 77..78,
                                                         value: Int(
                                                             1,
@@ -109,7 +107,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 80..81,
                                                         value: Int(
                                                             2,
@@ -118,7 +116,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 83..84,
                                                         value: Int(
                                                             3,
@@ -127,11 +125,11 @@ Module(
                                                 ),
                                                 Starred(
                                                     ExprStarred {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 86..91,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 87..91,
                                                                 id: Name("rest"),
                                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap
index e0f7c8ec22..4b66019a93 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_return_py3
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..91,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                                 id: Name("rest"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..59,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             4,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             5,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             6,
@@ -65,21 +65,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..90,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 64..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,17 +88,17 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..90,
                                 value: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 76..90,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 76..77,
                                                         value: Int(
                                                             1,
@@ -109,7 +107,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 79..80,
                                                         value: Int(
                                                             2,
@@ -118,7 +116,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 82..83,
                                                         value: Int(
                                                             3,
@@ -127,11 +125,11 @@ Module(
                                                 ),
                                                 Starred(
                                                     ExprStarred {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 85..90,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 86..90,
                                                                 id: Name("rest"),
                                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap
index 092f50c312..6738798560 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_yield_py37
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..92,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                                 id: Name("rest"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..59,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             4,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             5,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             6,
@@ -65,21 +65,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..91,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 64..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,21 +88,21 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..91,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..91,
                                         value: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 75..91,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 76..77,
                                                                 value: Int(
                                                                     1,
@@ -113,7 +111,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 79..80,
                                                                 value: Int(
                                                                     2,
@@ -122,7 +120,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 82..83,
                                                                 value: Int(
                                                                     3,
@@ -131,11 +129,11 @@ Module(
                                                         ),
                                                         Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 85..90,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 86..90,
                                                                         id: Name("rest"),
                                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap
index 78df654105..9f1c150b3d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_yield_py38
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..128,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                                 id: Name("rest"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 50..59,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             4,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             5,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             6,
@@ -65,21 +65,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..89,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 64..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -90,21 +88,21 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 69..89,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..89,
                                         value: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 75..89,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 75..76,
                                                                 value: Int(
                                                                     1,
@@ -113,7 +111,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 78..79,
                                                                 value: Int(
                                                                     2,
@@ -122,7 +120,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 81..82,
                                                                 value: Int(
                                                                     3,
@@ -131,11 +129,11 @@ Module(
                                                         ),
                                                         Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 84..89,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 85..89,
                                                                         id: Name("rest"),
                                                                         ctx: Load,
@@ -159,21 +157,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 90..127,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("h"),
                         range: 94..95,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 95..97,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -184,21 +180,21 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 99..127,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..127,
                                         value: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 105..127,
                                                     elts: [
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 105..106,
                                                                 value: Int(
                                                                     1,
@@ -207,17 +203,17 @@ Module(
                                                         ),
                                                         Yield(
                                                             ExprYield {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 109..123,
                                                                 value: Some(
                                                                     Tuple(
                                                                         ExprTuple {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 115..123,
                                                                             elts: [
                                                                                 NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 115..116,
                                                                                         value: Int(
                                                                                             2,
@@ -226,11 +222,11 @@ Module(
                                                                                 ),
                                                                                 Starred(
                                                                                     ExprStarred {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 118..123,
                                                                                         value: Name(
                                                                                             ExprName {
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 range: 119..123,
                                                                                                 id: Name("rest"),
                                                                                                 ctx: Load,
@@ -249,7 +245,7 @@ Module(
                                                         ),
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 126..127,
                                                                 value: Int(
                                                                     3,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap
index 7a76f5f14c..5976043695 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/lambda_with_no_paramet
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..10,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..9,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..9,
                             parameters: None,
                             body: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 8..9,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap
index c407279f9d..30d038eb10 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap
@@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/ok/lambda_with_valid_body
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..152,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..11,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..11,
                             parameters: Some(
                                 Parameters {
                                     range: 7..8,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 7..8,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 7..8,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -49,7 +47,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 10..11,
                                     id: Name("x"),
                                     ctx: Load,
@@ -61,30 +59,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 12..38,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..38,
                             parameters: Some(
                                 Parameters {
                                     range: 19..20,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 19..20,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 19..20,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 19..20,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -98,18 +94,18 @@ Module(
                             ),
                             body: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..38,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 27..31,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..23,
                                             id: Name("x"),
                                             ctx: Load,
@@ -117,7 +113,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 37..38,
                                             id: Name("y"),
                                             ctx: Load,
@@ -131,30 +127,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 39..56,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..56,
                             parameters: Some(
                                 Parameters {
                                     range: 46..47,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 46..47,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 46..47,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 46..47,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -168,11 +162,11 @@ Module(
                             ),
                             body: Await(
                                 ExprAwait {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..56,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 55..56,
                                             id: Name("x"),
                                             ctx: Load,
@@ -186,30 +180,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..82,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 57..82,
                             parameters: Some(
                                 Parameters {
                                     range: 64..65,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 64..65,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 64..65,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 64..65,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -223,26 +215,24 @@ Module(
                             ),
                             body: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 67..82,
                                     parameters: Some(
                                         Parameters {
                                             range: 74..75,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 74..75,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 74..75,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("y"),
                                                             range: 74..75,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -256,11 +246,11 @@ Module(
                                     ),
                                     body: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 77..82,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 77..78,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -269,7 +259,7 @@ Module(
                                             op: Add,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 81..82,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -285,30 +275,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..102,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..102,
                             parameters: Some(
                                 Parameters {
                                     range: 90..91,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 90..91,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 90..91,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 90..91,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -322,12 +310,12 @@ Module(
                             ),
                             body: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 94..101,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -342,35 +330,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 136..151,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 136..151,
                             elts: [
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 136..147,
                                         parameters: Some(
                                             Parameters {
                                                 range: 143..144,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 143..144,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 143..144,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("x"),
                                                                 range: 143..144,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -384,7 +370,7 @@ Module(
                                         ),
                                         body: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 146..147,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -394,11 +380,11 @@ Module(
                                 ),
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 149..151,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 150..151,
                                                 id: Name("y"),
                                                 ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap
index a4b1204457..8169fc8654 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_after_py310.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..80,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..79,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..53,
                             value: Int(
                                 2,
@@ -26,14 +26,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 59..79,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 64..65,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 64..65,
                                             value: Int(
                                                 1,
@@ -46,7 +46,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..79,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap
index c300ac4843..2ae3ea1e81 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_as_pattern.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..60,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..32,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..9,
                             id: Name("foo"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 15..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 20..27,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("foo_bar"),
                                             range: 20..27,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -44,11 +44,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..32,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 29..32,
                                             },
                                         ),
@@ -61,11 +61,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 33..59,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 39..42,
                             id: Name("foo"),
                             ctx: Load,
@@ -74,11 +74,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 48..59,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -87,11 +87,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..59,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 56..59,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap
index 6ca3b67057..1d32832797 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_as_pattern_soft_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..91,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..29,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..9,
                             id: Name("foo"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 15..29,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 20..24,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("case"),
                                             range: 20..24,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -44,11 +44,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..29,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..29,
                                             },
                                         ),
@@ -61,11 +61,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..60,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 36..39,
                             id: Name("foo"),
                             ctx: Load,
@@ -74,17 +74,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 45..60,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 50..55,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("match"),
                                             range: 50..55,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -93,11 +93,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..60,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 57..60,
                                             },
                                         ),
@@ -110,11 +110,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..90,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..70,
                             id: Name("foo"),
                             ctx: Load,
@@ -123,17 +123,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 76..90,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 81..85,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("type"),
                                             range: 81..85,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -142,11 +142,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 87..90,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 87..90,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap
index 17a7f854b3..5050a08ea5 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_attr_pattern_sof
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..131,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..130,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..9,
                             id: Name("foo"),
                             ctx: Load,
@@ -25,18 +25,18 @@ Module(
                     cases: [
                         MatchCase {
                             range: 15..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 20..29,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 20..29,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 20..25,
                                                     id: Name("match"),
                                                     ctx: Load,
@@ -45,7 +45,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("bar"),
                                                 range: 26..29,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -56,11 +56,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..34,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 31..34,
                                             },
                                         ),
@@ -70,18 +70,18 @@ Module(
                         },
                         MatchCase {
                             range: 39..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 44..52,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 44..52,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 44..48,
                                                     id: Name("case"),
                                                     ctx: Load,
@@ -90,7 +90,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("bar"),
                                                 range: 49..52,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -101,11 +101,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..57,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 54..57,
                                             },
                                         ),
@@ -115,18 +115,18 @@ Module(
                         },
                         MatchCase {
                             range: 62..80,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 67..75,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 67..75,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 67..71,
                                                     id: Name("type"),
                                                     ctx: Load,
@@ -135,7 +135,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("bar"),
                                                 range: 72..75,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -146,11 +146,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..80,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 77..80,
                                             },
                                         ),
@@ -160,38 +160,38 @@ Module(
                         },
                         MatchCase {
                             range: 85..130,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 90..125,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 90..125,
                                             value: Attribute(
                                                 ExprAttribute {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 90..119,
                                                     value: Attribute(
                                                         ExprAttribute {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 90..114,
                                                             value: Attribute(
                                                                 ExprAttribute {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 90..109,
                                                                     value: Attribute(
                                                                         ExprAttribute {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 90..105,
                                                                             value: Attribute(
                                                                                 ExprAttribute {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 90..100,
                                                                                     value: Name(
                                                                                         ExprName {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 90..95,
                                                                                             id: Name("match"),
                                                                                             ctx: Load,
@@ -200,7 +200,7 @@ Module(
                                                                                     attr: Identifier {
                                                                                         id: Name("case"),
                                                                                         range: 96..100,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                     },
                                                                                     ctx: Load,
                                                                                 },
@@ -208,7 +208,7 @@ Module(
                                                                             attr: Identifier {
                                                                                 id: Name("type"),
                                                                                 range: 101..105,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                             },
                                                                             ctx: Load,
                                                                         },
@@ -216,7 +216,7 @@ Module(
                                                                     attr: Identifier {
                                                                         id: Name("bar"),
                                                                         range: 106..109,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     ctx: Load,
                                                                 },
@@ -224,7 +224,7 @@ Module(
                                                             attr: Identifier {
                                                                 id: Name("type"),
                                                                 range: 110..114,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             ctx: Load,
                                                         },
@@ -232,7 +232,7 @@ Module(
                                                     attr: Identifier {
                                                         id: Name("case"),
                                                         range: 115..119,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     ctx: Load,
                                                 },
@@ -240,7 +240,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("match"),
                                                 range: 120..125,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -251,11 +251,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 127..130,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 127..130,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap
index 7c7131c6e5..7eb5caad29 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_iden
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..18,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..17,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..5,
                                     id: Name("match"),
                                     ctx: Load,
@@ -32,7 +32,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..17,
                                         id: Name("case"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap
index e0c274a03d..5377ee65ea 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_iden
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..149,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..5,
                             id: Name("match"),
                             ctx: Load,
@@ -26,15 +26,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..18,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..18,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..11,
                                     id: Name("match"),
                                     ctx: Load,
@@ -46,7 +46,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..18,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -59,16 +59,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 19..31,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..31,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..23,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -76,7 +76,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..30,
                                         id: Name("match"),
                                         ctx: Load,
@@ -91,16 +91,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..44,
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..44,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 33..36,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -108,7 +108,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..43,
                                         id: Name("match"),
                                         ctx: Load,
@@ -122,16 +122,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..57,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 45..57,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 46..49,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -139,7 +139,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..56,
                                         id: Name("match"),
                                         ctx: Load,
@@ -152,11 +152,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..63,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..63,
                             id: Name("match"),
                             ctx: Load,
@@ -166,11 +166,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..75,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 65..70,
                             id: Name("match"),
                             ctx: Store,
@@ -178,7 +178,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..75,
                             id: Name("int"),
                             ctx: Load,
@@ -190,16 +190,16 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 76..82,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 76..82,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 76..81,
                                         id: Name("match"),
                                         ctx: Load,
@@ -214,15 +214,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..92,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..92,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..88,
                                     id: Name("match"),
                                     ctx: Load,
@@ -231,7 +231,7 @@ Module(
                             attr: Identifier {
                                 id: Name("foo"),
                                 range: 89..92,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -240,15 +240,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..104,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..104,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 93..98,
                                     id: Name("match"),
                                     ctx: Load,
@@ -257,7 +257,7 @@ Module(
                             op: Div,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 101..104,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -269,15 +269,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 105..117,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 105..117,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 105..110,
                                     id: Name("match"),
                                     ctx: Load,
@@ -286,7 +286,7 @@ Module(
                             op: LShift,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 114..117,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -298,17 +298,17 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 118..131,
                     value: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 118..131,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 118..123,
                                         id: Name("match"),
                                         ctx: Load,
@@ -316,7 +316,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 128..131,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -329,15 +329,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 132..148,
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 132..148,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 132..137,
                                     id: Name("match"),
                                     ctx: Load,
@@ -349,7 +349,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 145..148,
                                         id: Name("foo"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap
index 2345dca249..3ff055535e 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_keyw
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..358,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..9,
                             id: Name("foo"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 15..26,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 20..21,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -38,11 +38,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..26,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 23..26,
                                             },
                                         ),
@@ -55,11 +55,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..51,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..34,
                             value: Int(
                                 1,
@@ -69,11 +69,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 40..51,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 45..46,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -82,11 +82,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 48..51,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 48..51,
                                             },
                                         ),
@@ -99,11 +99,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..78,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..61,
                             value: Float(
                                 1.0,
@@ -113,11 +113,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 67..78,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 72..73,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -126,11 +126,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..78,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 75..78,
                                             },
                                         ),
@@ -143,11 +143,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..104,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 85..87,
                             value: Complex {
                                 real: 0.0,
@@ -158,11 +158,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 93..104,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 98..99,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -171,11 +171,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 101..104,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 101..104,
                                             },
                                         ),
@@ -188,22 +188,23 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 105..133,
                     subject: StringLiteral(
                         ExprStringLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 111..116,
                             value: StringLiteralValue {
                                 inner: Single(
                                     StringLiteral {
                                         range: 111..116,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         value: "foo",
                                         flags: StringLiteralFlags {
                                             quote_style: Double,
                                             prefix: Empty,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -213,11 +214,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 122..133,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 127..128,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -226,11 +227,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 130..133,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 130..133,
                                             },
                                         ),
@@ -243,33 +244,33 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 134..167,
                     subject: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 140..150,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 140..150,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 142..146,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "foo ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 146..149,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 147..148,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -285,6 +286,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -295,11 +297,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 156..167,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 161..162,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -308,11 +310,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 164..167,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 164..167,
                                             },
                                         ),
@@ -325,16 +327,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 168..197,
                     subject: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 174..180,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 175..176,
                                         value: Int(
                                             1,
@@ -343,7 +345,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 178..179,
                                         value: Int(
                                             2,
@@ -356,11 +358,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 186..197,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 191..192,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -369,11 +371,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 194..197,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 194..197,
                                             },
                                         ),
@@ -386,16 +388,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 198..225,
                     subject: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 204..208,
                             op: Invert,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 205..208,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -406,11 +408,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 214..225,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 219..220,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -419,11 +421,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 222..225,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 222..225,
                                             },
                                         ),
@@ -436,22 +438,22 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 226..252,
                     subject: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 232..235,
                         },
                     ),
                     cases: [
                         MatchCase {
                             range: 241..252,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 246..247,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -460,11 +462,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 249..252,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 249..252,
                                             },
                                         ),
@@ -477,16 +479,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 253..283,
                     subject: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 259..266,
                             op: Not,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 263..266,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -497,11 +499,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 272..283,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 277..278,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -510,11 +512,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 280..283,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 280..283,
                                             },
                                         ),
@@ -527,19 +529,19 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 284..318,
                     subject: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 290..301,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 296..301,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 296..299,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -547,7 +549,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 299..301,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -558,11 +560,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 307..318,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 312..313,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -571,11 +573,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 315..318,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 315..318,
                                             },
                                         ),
@@ -588,30 +590,28 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 319..357,
                     subject: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 325..340,
                             parameters: Some(
                                 Parameters {
                                     range: 332..335,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 332..335,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 332..335,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("foo"),
                                                     range: 332..335,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -625,7 +625,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 337..340,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -636,11 +636,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 346..357,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 351..352,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -649,11 +649,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 354..357,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 354..357,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap
index d4d62a6c6f..84a0f8c747 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_keyw
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..170,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..11,
                             id: Name("match"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 17..28,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 22..23,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -38,11 +38,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 25..28,
                                             },
                                         ),
@@ -55,11 +55,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..56,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..39,
                             id: Name("case"),
                             ctx: Load,
@@ -68,11 +68,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 45..56,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 50..51,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -81,11 +81,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..56,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 53..56,
                                             },
                                         ),
@@ -98,11 +98,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 57..84,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..67,
                             id: Name("type"),
                             ctx: Load,
@@ -111,11 +111,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 73..84,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 78..79,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -124,11 +124,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 81..84,
                                             },
                                         ),
@@ -141,22 +141,22 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..112,
                     subject: NoneLiteral(
                         ExprNoneLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 91..95,
                         },
                     ),
                     cases: [
                         MatchCase {
                             range: 101..112,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 106..107,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -165,11 +165,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..112,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 109..112,
                                             },
                                         ),
@@ -182,11 +182,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 113..140,
                     subject: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..123,
                             value: true,
                         },
@@ -194,11 +194,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 129..140,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 134..135,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -207,11 +207,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 137..140,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 137..140,
                                             },
                                         ),
@@ -224,11 +224,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 141..169,
                     subject: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 147..152,
                             value: false,
                         },
@@ -236,11 +236,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 158..169,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 163..164,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -249,11 +249,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 166..169,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 166..169,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap
index 849251e03e..40eb8aafef 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_keyw
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..225,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..12,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 0..5,
                                     id: Name("match"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 6..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 7..8,
                                             value: Int(
                                                 1,
@@ -41,7 +41,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 10..11,
                                             value: Int(
                                                 2,
@@ -57,16 +57,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..67,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..39,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..35,
                                         value: Int(
                                             1,
@@ -75,7 +75,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 37..38,
                                         value: Int(
                                             2,
@@ -90,11 +90,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 56..67,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 61..62,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -103,11 +103,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 64..67,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 64..67,
                                             },
                                         ),
@@ -120,15 +120,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 68..78,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..78,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 68..73,
                                     id: Name("match"),
                                     ctx: Load,
@@ -136,12 +136,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 75..77,
                                     lower: Some(
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 75..76,
                                                 value: Int(
                                                     1,
@@ -160,16 +160,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..133,
                     subject: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 99..105,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 100..101,
                                         value: Int(
                                             1,
@@ -178,7 +178,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 103..104,
                                         value: Int(
                                             2,
@@ -192,11 +192,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 122..133,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 127..128,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -205,11 +205,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 130..133,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 130..133,
                                             },
                                         ),
@@ -222,15 +222,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 134..145,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 134..145,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 134..139,
                                     id: Name("match"),
                                     ctx: Load,
@@ -239,7 +239,7 @@ Module(
                             op: Mult,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 142..145,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -251,15 +251,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 160..171,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..171,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 160..165,
                                     id: Name("match"),
                                     ctx: Load,
@@ -268,7 +268,7 @@ Module(
                             op: Sub,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 168..171,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -280,16 +280,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 186..224,
                     subject: UnaryOp(
                         ExprUnaryOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 192..196,
                             op: USub,
                             operand: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 193..196,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -300,11 +300,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 213..224,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 218..219,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -313,11 +313,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 221..224,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 221..224,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap
index 7416b29f05..4cc16363d2 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_sequence_pattern
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..56,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,36 +25,36 @@ Module(
                     cases: [
                         MatchCase {
                             range: 19..35,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 24..30,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 25..26,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 25..26,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 28..29,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("b"),
                                                         range: 28..29,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -66,11 +66,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 32..35,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 32..35,
                                             },
                                         ),
@@ -80,36 +80,36 @@ Module(
                         },
                         MatchCase {
                             range: 40..56,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 45..51,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 46..47,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 46..47,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 49..50,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("b"),
                                                         range: 49..50,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -121,11 +121,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..56,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 53..56,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap
index 91f128eafc..361c36bae4 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_sequence_pattern
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..95,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..94,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..13,
                             id: Name("subject"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 19..35,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 24..25,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("a"),
                                             range: 24..25,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -43,7 +43,7 @@ Module(
                             guard: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 29..30,
                                         id: Name("x"),
                                         ctx: Load,
@@ -53,11 +53,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 32..35,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 32..35,
                                             },
                                         ),
@@ -67,36 +67,36 @@ Module(
                         },
                         MatchCase {
                             range: 40..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 45..49,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 45..46,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 45..46,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 48..49,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("b"),
                                                         range: 48..49,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -108,11 +108,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..54,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 51..54,
                                             },
                                         ),
@@ -122,36 +122,36 @@ Module(
                         },
                         MatchCase {
                             range: 59..78,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 64..68,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 64..65,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 64..65,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 67..68,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("b"),
                                                         range: 67..68,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -162,7 +162,7 @@ Module(
                             guard: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..73,
                                         id: Name("x"),
                                         ctx: Load,
@@ -172,11 +172,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..78,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 75..78,
                                             },
                                         ),
@@ -186,17 +186,17 @@ Module(
                         },
                         MatchCase {
                             range: 83..94,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 88..89,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("a"),
                                             range: 88..89,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -205,11 +205,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 91..94,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 91..94,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap
index e0042a2cc5..de49fc65c0 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_stmt_subject_exp
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..185,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..29,
                     subject: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..12,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 6..7,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 11..12,
                                     value: Int(
                                         1,
@@ -40,11 +40,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 18..29,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 23..24,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -53,11 +53,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..29,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..29,
                                             },
                                         ),
@@ -70,15 +70,15 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..61,
                     subject: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..43,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 37..38,
                                     id: Name("x"),
                                     ctx: Store,
@@ -86,7 +86,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 42..43,
                                     value: Int(
                                         1,
@@ -98,11 +98,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 50..61,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 55..56,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -111,11 +111,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 58..61,
                                             },
                                         ),
@@ -128,24 +128,24 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..153,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 127..136,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 127..133,
                                         value: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 128..133,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 128..129,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -154,7 +154,7 @@ Module(
                                                 op: BitOr,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 132..133,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -167,7 +167,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 135..136,
                                         id: Name("z"),
                                         ctx: Load,
@@ -181,11 +181,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 142..153,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 147..148,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -194,11 +194,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 150..153,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 150..153,
                                             },
                                         ),
@@ -211,15 +211,15 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 154..184,
                     subject: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..167,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 166..167,
                                     id: Name("x"),
                                     ctx: Load,
@@ -230,11 +230,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 173..184,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 178..179,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -243,11 +243,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 181..184,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 181..184,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap
index 32f6791cd4..643a0bac5b 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_stmt_valid_guard
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..158,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..34,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,17 +25,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 18..19,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 18..19,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -43,11 +43,11 @@ Module(
                             guard: Some(
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 23..29,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 23..24,
                                                 id: Name("a"),
                                                 ctx: Store,
@@ -55,7 +55,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 28..29,
                                                 value: Int(
                                                     1,
@@ -68,11 +68,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..34,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 31..34,
                                             },
                                         ),
@@ -85,11 +85,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..79,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..42,
                             id: Name("x"),
                             ctx: Load,
@@ -98,17 +98,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 48..79,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 53..54,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -116,18 +116,18 @@ Module(
                             guard: Some(
                                 If(
                                     ExprIf {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..74,
                                         test: BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 63..67,
                                                 value: true,
                                             },
                                         ),
                                         body: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 58..59,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -135,7 +135,7 @@ Module(
                                         ),
                                         orelse: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 73..74,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -147,11 +147,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 76..79,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 76..79,
                                             },
                                         ),
@@ -164,11 +164,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 80..119,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 86..87,
                             id: Name("x"),
                             ctx: Load,
@@ -177,17 +177,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 93..119,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 98..99,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 98..99,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -195,26 +195,24 @@ Module(
                             guard: Some(
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 103..114,
                                         parameters: Some(
                                             Parameters {
                                                 range: 110..111,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 110..111,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 110..111,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("a"),
                                                                 range: 110..111,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -228,7 +226,7 @@ Module(
                                         ),
                                         body: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 113..114,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -240,11 +238,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 116..119,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 116..119,
                                             },
                                         ),
@@ -257,11 +255,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 120..157,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 126..127,
                             id: Name("x"),
                             ctx: Load,
@@ -270,17 +268,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 133..157,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 138..139,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("y"),
                                             range: 138..139,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -288,12 +286,12 @@ Module(
                             guard: Some(
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 144..151,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 150..151,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -306,11 +304,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 154..157,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 154..157,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap
index b61390df0d..a37747203d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/multiple_assignment_in
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..42,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..41,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             value: Int(
                                 2,
@@ -26,19 +26,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 13..41,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 18..36,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchClass(
                                             PatternMatchClass {
+                                                node_index: NodeIndex(None),
                                                 range: 18..26,
-                                                node_index: AtomicNodeIndex(..),
                                                 cls: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 18..23,
                                                         id: Name("Class"),
                                                         ctx: Load,
@@ -46,18 +46,18 @@ Module(
                                                 ),
                                                 arguments: PatternArguments {
                                                     range: 23..26,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     patterns: [
                                                         MatchAs(
                                                             PatternMatchAs {
+                                                                node_index: NodeIndex(None),
                                                                 range: 24..25,
-                                                                node_index: AtomicNodeIndex(..),
                                                                 pattern: None,
                                                                 name: Some(
                                                                     Identifier {
                                                                         id: Name("x"),
                                                                         range: 24..25,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                 ),
                                                             },
@@ -69,19 +69,19 @@ Module(
                                         ),
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 29..32,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 30..31,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: None,
                                                             name: Some(
                                                                 Identifier {
                                                                     id: Name("x"),
                                                                     range: 30..31,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
@@ -91,14 +91,14 @@ Module(
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 35..36,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 35..36,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -110,11 +110,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..41,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 38..41,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap
new file mode 100644
index 0000000000..ee5dde4187
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap
@@ -0,0 +1,188 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/ok/multiple_starred_assignment_target.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..46,
+        body: [
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 0..16,
+                    targets: [
+                        Tuple(
+                            ExprTuple {
+                                node_index: NodeIndex(None),
+                                range: 0..7,
+                                elts: [
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 1..3,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 2..3,
+                                                    id: Name("a"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    Name(
+                                        ExprName {
+                                            node_index: NodeIndex(None),
+                                            range: 5..6,
+                                            id: Name("b"),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                                parenthesized: true,
+                            },
+                        ),
+                    ],
+                    value: Tuple(
+                        ExprTuple {
+                            node_index: NodeIndex(None),
+                            range: 10..16,
+                            elts: [
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 11..12,
+                                        value: Int(
+                                            1,
+                                        ),
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 14..15,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                            parenthesized: true,
+                        },
+                    ),
+                },
+            ),
+            Assign(
+                StmtAssign {
+                    node_index: NodeIndex(None),
+                    range: 17..45,
+                    targets: [
+                        Tuple(
+                            ExprTuple {
+                                node_index: NodeIndex(None),
+                                range: 17..33,
+                                elts: [
+                                    Tuple(
+                                        ExprTuple {
+                                            node_index: NodeIndex(None),
+                                            range: 17..29,
+                                            elts: [
+                                                Starred(
+                                                    ExprStarred {
+                                                        node_index: NodeIndex(None),
+                                                        range: 18..20,
+                                                        value: Name(
+                                                            ExprName {
+                                                                node_index: NodeIndex(None),
+                                                                range: 19..20,
+                                                                id: Name("_"),
+                                                                ctx: Store,
+                                                            },
+                                                        ),
+                                                        ctx: Store,
+                                                    },
+                                                ),
+                                                Name(
+                                                    ExprName {
+                                                        node_index: NodeIndex(None),
+                                                        range: 22..28,
+                                                        id: Name("normed"),
+                                                        ctx: Store,
+                                                    },
+                                                ),
+                                            ],
+                                            ctx: Store,
+                                            parenthesized: true,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            node_index: NodeIndex(None),
+                                            range: 31..33,
+                                            value: Name(
+                                                ExprName {
+                                                    node_index: NodeIndex(None),
+                                                    range: 32..33,
+                                                    id: Name("_"),
+                                                    ctx: Store,
+                                                },
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                ],
+                                ctx: Store,
+                                parenthesized: false,
+                            },
+                        ),
+                    ],
+                    value: List(
+                        ExprList {
+                            node_index: NodeIndex(None),
+                            range: 36..45,
+                            elts: [
+                                Tuple(
+                                    ExprTuple {
+                                        node_index: NodeIndex(None),
+                                        range: 37..41,
+                                        elts: [
+                                            NumberLiteral(
+                                                ExprNumberLiteral {
+                                                    node_index: NodeIndex(None),
+                                                    range: 38..39,
+                                                    value: Int(
+                                                        1,
+                                                    ),
+                                                },
+                                            ),
+                                        ],
+                                        ctx: Load,
+                                        parenthesized: true,
+                                    },
+                                ),
+                                NumberLiteral(
+                                    ExprNumberLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 43..44,
+                                        value: Int(
+                                            2,
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                        },
+                    ),
+                },
+            ),
+        ],
+    },
+)
+```
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap
index b36ef0858e..9c269d6c69 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nested_async_comprehen
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..181,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..116,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 54..55,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 55..57,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,15 +35,15 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 63..84,
                                 value: ListComp(
                                     ExprListComp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 63..84,
                                         elt: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 64..65,
                                                 id: Name("_"),
                                                 ctx: Load,
@@ -54,10 +52,10 @@ Module(
                                         generators: [
                                             Comprehension {
                                                 range: 66..83,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 70..71,
                                                         id: Name("n"),
                                                         ctx: Store,
@@ -65,11 +63,11 @@ Module(
                                                 ),
                                                 iter: Call(
                                                     ExprCall {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 75..83,
                                                         func: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 75..80,
                                                                 id: Name("range"),
                                                                 ctx: Load,
@@ -77,11 +75,11 @@ Module(
                                                         ),
                                                         arguments: Arguments {
                                                             range: 80..83,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             args: [
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 81..82,
                                                                         value: Int(
                                                                             3,
@@ -103,15 +101,15 @@ Module(
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 89..116,
                                 value: ListComp(
                                     ExprListComp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 89..116,
                                         elt: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 90..91,
                                                 id: Name("_"),
                                                 ctx: Load,
@@ -120,10 +118,10 @@ Module(
                                         generators: [
                                             Comprehension {
                                                 range: 92..115,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 102..103,
                                                         id: Name("n"),
                                                         ctx: Store,
@@ -131,11 +129,11 @@ Module(
                                                 ),
                                                 iter: Call(
                                                     ExprCall {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 107..115,
                                                         func: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 107..112,
                                                                 id: Name("range"),
                                                                 ctx: Load,
@@ -143,11 +141,11 @@ Module(
                                                         ),
                                                         arguments: Arguments {
                                                             range: 112..115,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             args: [
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 113..114,
                                                                         value: Int(
                                                                             3,
@@ -172,21 +170,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 117..180,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 127..128,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 128..130,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -197,21 +193,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 136..148,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("g"),
                                     range: 140..141,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 141..143,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -222,11 +216,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 145..148,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 145..148,
                                                 },
                                             ),
@@ -237,15 +231,15 @@ Module(
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 153..180,
                                 value: ListComp(
                                     ExprListComp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 153..180,
                                         elt: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 154..155,
                                                 id: Name("_"),
                                                 ctx: Load,
@@ -254,10 +248,10 @@ Module(
                                         generators: [
                                             Comprehension {
                                                 range: 156..179,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 166..167,
                                                         id: Name("n"),
                                                         ctx: Store,
@@ -265,11 +259,11 @@ Module(
                                                 ),
                                                 iter: Call(
                                                     ExprCall {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 171..179,
                                                         func: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 171..176,
                                                                 id: Name("range"),
                                                                 ctx: Load,
@@ -277,11 +271,11 @@ Module(
                                                         ),
                                                         arguments: Arguments {
                                                             range: 176..179,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             args: [
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 177..178,
                                                                         value: Int(
                                                                             3,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap
index 2a0a766dab..3754f5f1ba 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nested_async_comprehen
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..277,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..111,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 54..55,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 55..57,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,20 +35,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 59..111,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 66..111,
                                             elt: ListComp(
                                                 ExprListComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 67..92,
                                                     elt: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 68..69,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -59,10 +57,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 70..91,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 80..81,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -70,11 +68,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 85..91,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 85..88,
                                                                             id: Name("foo"),
                                                                             ctx: Load,
@@ -82,11 +80,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 88..91,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 89..90,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -106,10 +104,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 93..110,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 97..98,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -117,11 +115,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 102..110,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 102..107,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -129,11 +127,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 107..110,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 108..109,
                                                                             value: Int(
                                                                                 3,
@@ -159,21 +157,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..192,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 132..133,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 133..135,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -184,20 +180,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 137..192,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 144..192,
                                             elt: DictComp(
                                                 ExprDictComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 145..173,
                                                     key: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 146..147,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -205,7 +201,7 @@ Module(
                                                     ),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 149..150,
                                                             value: Int(
                                                                 1,
@@ -215,10 +211,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 151..172,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 161..162,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -226,11 +222,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 166..172,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 166..169,
                                                                             id: Name("foo"),
                                                                             ctx: Load,
@@ -238,11 +234,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 169..172,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 170..171,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -262,10 +258,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 174..191,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 178..179,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -273,11 +269,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 183..191,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 183..188,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -285,11 +281,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 188..191,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 189..190,
                                                                             value: Int(
                                                                                 3,
@@ -315,21 +311,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 200..267,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("h"),
                         range: 210..211,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 211..213,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -340,20 +334,20 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 215..267,
                                 value: Some(
                                     ListComp(
                                         ExprListComp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 222..267,
                                             elt: SetComp(
                                                 ExprSetComp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 223..248,
                                                     elt: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 224..225,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -362,10 +356,10 @@ Module(
                                                     generators: [
                                                         Comprehension {
                                                             range: 226..247,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             target: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 236..237,
                                                                     id: Name("x"),
                                                                     ctx: Store,
@@ -373,11 +367,11 @@ Module(
                                                             ),
                                                             iter: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 241..247,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 241..244,
                                                                             id: Name("foo"),
                                                                             ctx: Load,
@@ -385,11 +379,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 244..247,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 245..246,
                                                                                     id: Name("n"),
                                                                                     ctx: Load,
@@ -409,10 +403,10 @@ Module(
                                             generators: [
                                                 Comprehension {
                                                     range: 249..266,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     target: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 253..254,
                                                             id: Name("n"),
                                                             ctx: Store,
@@ -420,11 +414,11 @@ Module(
                                                     ),
                                                     iter: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 258..266,
                                                             func: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 258..263,
                                                                     id: Name("range"),
                                                                     ctx: Load,
@@ -432,11 +426,11 @@ Module(
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 263..266,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 264..265,
                                                                             value: Int(
                                                                                 3,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap
index 76ed4f5937..91e9cabf55 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/non_duplicate_type_par
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..150,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..10,
                             id: Name("Alias"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 10..13,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 11..12,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 11..12,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -45,11 +45,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 16..23,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 16..20,
                                     id: Name("list"),
                                     ctx: Load,
@@ -57,7 +57,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 21..22,
                                     id: Name("T"),
                                     ctx: Load,
@@ -70,28 +70,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..43,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 28..29,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 29..32,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 30..31,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 30..31,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -102,26 +102,24 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 32..38,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 33..37,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 33..37,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("t"),
                                         range: 33..34,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 36..37,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -140,11 +138,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 40..43,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..43,
                                     },
                                 ),
@@ -155,27 +153,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..59,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("C"),
                         range: 50..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 51..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 52..53,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 52..53,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -188,11 +186,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 56..59,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..59,
                                     },
                                 ),
@@ -203,27 +201,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..81,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("C"),
                         range: 66..67,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 67..76,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 68..69,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 68..69,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -231,12 +229,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 71..72,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 71..72,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -244,12 +242,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("V"),
                                             range: 74..75,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -262,11 +260,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 78..81,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 78..81,
                                     },
                                 ),
@@ -277,11 +275,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 82..149,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..92,
                             id: Name("Alias"),
                             ctx: Store,
@@ -290,16 +288,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 92..143,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 93..94,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 93..94,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -307,17 +305,17 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 96..102,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 96..97,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 99..102,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -329,22 +327,22 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 104..119,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("V"),
                                             range: 104..105,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 107..119,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 108..111,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -352,7 +350,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 113..118,
                                                                 id: Name("bytes"),
                                                                 ctx: Load,
@@ -369,42 +367,42 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 121..124,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 122..124,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 126..129,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 128..129,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 131..142,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("D"),
                                             range: 131..132,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 135..142,
                                                     id: Name("default"),
                                                     ctx: Load,
@@ -418,7 +416,7 @@ Module(
                     ),
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 146..149,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap
new file mode 100644
index 0000000000..76a3604fd6
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap
@@ -0,0 +1,78 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/ok/non_nested_quote_in_format_spec_py311.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..90,
+        body: [
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 44..53,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 44..53,
+                            value: FStringValue {
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 44..53,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 46..52,
+                                                        node_index: NodeIndex(None),
+                                                        expression: NumberLiteral(
+                                                            ExprNumberLiteral {
+                                                                node_index: NodeIndex(None),
+                                                                range: 47..48,
+                                                                value: Int(
+                                                                    1,
+                                                                ),
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: Some(
+                                                            InterpolatedStringFormatSpec {
+                                                                range: 49..51,
+                                                                node_index: NodeIndex(None),
+                                                                elements: [
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 49..51,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: "''",
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Double,
+                                                prefix: Regular,
+                                                triple_quoted: false,
+                                                unclosed: false,
+                                            },
+                                        },
+                                    ),
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+        ],
+    },
+)
+```
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap
index 3e80ba428d..32f31b1690 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/non_rebound_comprehens
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..27,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..26,
                     value: ListComp(
                         ExprListComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..26,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..7,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1..2,
                                             id: Name("a"),
                                             ctx: Store,
@@ -32,7 +32,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 6..7,
                                             value: Int(
                                                 0,
@@ -44,10 +44,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 8..25,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 12..13,
                                             id: Name("x"),
                                             ctx: Store,
@@ -55,11 +55,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 17..25,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 17..22,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -67,11 +67,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 22..25,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 23..24,
                                                             value: Int(
                                                                 0,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap
index c3a1f13b03..f8015717e3 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nonlocal_declaration_a
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..24,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("_"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,13 +35,13 @@ Module(
                     body: [
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..23,
                                 names: [
                                     Identifier {
                                         id: Name("x"),
                                         range: 22..23,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ],
                             },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap
index 6ff8f3a685..da1fa3289e 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nonlocal_stmt.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..45,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..44,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("_"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,36 +35,36 @@ Module(
                     body: [
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..23,
                                 names: [
                                     Identifier {
                                         id: Name("x"),
                                         range: 22..23,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ],
                             },
                         ),
                         Nonlocal(
                             StmtNonlocal {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..44,
                                 names: [
                                     Identifier {
                                         id: Name("x"),
                                         range: 37..38,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     Identifier {
                                         id: Name("y"),
                                         range: 40..41,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     Identifier {
                                         id: Name("z"),
                                         range: 43..44,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ],
                             },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap
index c990da6f6e..07f19ba72a 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/other/atom.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..73,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..3,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..3,
                         },
                     ),
@@ -24,11 +24,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4..8,
                     value: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..8,
                             value: true,
                         },
@@ -37,11 +37,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..14,
                     value: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..14,
                             value: false,
                         },
@@ -50,11 +50,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..19,
                     value: NoneLiteral(
                         ExprNoneLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 15..19,
                         },
                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap
index 4278651bd2..f90d87e8c7 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/other/decorator.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..407,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..40,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 0..19,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1..19,
                                     id: Name("function_decorator"),
                                     ctx: Load,
@@ -32,14 +32,12 @@ Module(
                     name: Identifier {
                         id: Name("test"),
                         range: 24..28,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 28..30,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -50,7 +48,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 36..40,
                             },
                         ),
@@ -59,15 +57,15 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..80,
                     decorator_list: [
                         Decorator {
                             range: 43..59,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..59,
                                     id: Name("class_decorator"),
                                     ctx: Load,
@@ -78,14 +76,14 @@ Module(
                     name: Identifier {
                         id: Name("Test"),
                         range: 66..70,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 76..80,
                             },
                         ),
@@ -94,16 +92,16 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..106,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 83..93,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 84..93,
                                     id: Name("decorator"),
                                     ctx: Load,
@@ -114,14 +112,12 @@ Module(
                     name: Identifier {
                         id: Name("f"),
                         range: 98..99,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 99..101,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -132,11 +128,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 103..106,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 103..106,
                                     },
                                 ),
@@ -147,24 +143,24 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 109..128,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 109..115,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 110..115,
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 110..113,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 110..111,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -173,7 +169,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("b"),
                                                 range: 112..113,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -181,7 +177,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("c"),
                                         range: 114..115,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -191,14 +187,12 @@ Module(
                     name: Identifier {
                         id: Name("f"),
                         range: 120..121,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 121..123,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -209,11 +203,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 125..128,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 125..128,
                                     },
                                 ),
@@ -224,16 +218,16 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 131..153,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 131..133,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 132..133,
                                     id: Name("a"),
                                     ctx: Load,
@@ -242,18 +236,18 @@ Module(
                         },
                         Decorator {
                             range: 134..140,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 135..140,
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 135..138,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 135..136,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -262,7 +256,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("b"),
                                                 range: 137..138,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -270,7 +264,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("c"),
                                         range: 139..140,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -280,14 +274,12 @@ Module(
                     name: Identifier {
                         id: Name("f"),
                         range: 145..146,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 146..148,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -298,11 +290,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 150..153,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 150..153,
                                     },
                                 ),
@@ -313,15 +305,15 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 156..185,
                     decorator_list: [
                         Decorator {
                             range: 156..158,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 157..158,
                                     id: Name("a"),
                                     ctx: Load,
@@ -330,14 +322,14 @@ Module(
                         },
                         Decorator {
                             range: 159..165,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 160..165,
                                     left: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 160..161,
                                             value: Int(
                                                 1,
@@ -347,7 +339,7 @@ Module(
                                     op: BitOr,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 164..165,
                                             value: Int(
                                                 2,
@@ -359,18 +351,18 @@ Module(
                         },
                         Decorator {
                             range: 166..172,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Attribute(
                                 ExprAttribute {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 167..172,
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 167..170,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 167..168,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -379,7 +371,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("b"),
                                                 range: 169..170,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -387,7 +379,7 @@ Module(
                                     attr: Identifier {
                                         id: Name("c"),
                                         range: 171..172,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     ctx: Load,
                                 },
@@ -397,18 +389,18 @@ Module(
                     name: Identifier {
                         id: Name("T"),
                         range: 179..180,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 182..185,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 182..185,
                                     },
                                 ),
@@ -419,20 +411,20 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 188..269,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 188..195,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 189..195,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 189..190,
                                             id: Name("x"),
                                             ctx: Store,
@@ -440,7 +432,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 194..195,
                                             value: Int(
                                                 1,
@@ -452,21 +444,21 @@ Module(
                         },
                         Decorator {
                             range: 196..213,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 197..213,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 202..206,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 197..198,
                                             id: Name("x"),
                                             ctx: Load,
@@ -474,7 +466,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 212..213,
                                             id: Name("y"),
                                             ctx: Load,
@@ -485,29 +477,27 @@ Module(
                         },
                         Decorator {
                             range: 214..226,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Lambda(
                                 ExprLambda {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 215..226,
                                     parameters: Some(
                                         Parameters {
                                             range: 222..223,
-                                            node_index: AtomicNodeIndex(
-                                                0,
-                                            ),
+                                            node_index: NodeIndex(None),
                                             posonlyargs: [],
                                             args: [
                                                 ParameterWithDefault {
                                                     range: 222..223,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     parameter: Parameter {
                                                         range: 222..223,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         name: Identifier {
                                                             id: Name("x"),
                                                             range: 222..223,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         annotation: None,
                                                     },
@@ -521,7 +511,7 @@ Module(
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 225..226,
                                             id: Name("x"),
                                             ctx: Load,
@@ -532,16 +522,16 @@ Module(
                         },
                         Decorator {
                             range: 227..235,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: BoolOp(
                                 ExprBoolOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 228..235,
                                     op: And,
                                     values: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 228..229,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -549,7 +539,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 234..235,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -561,15 +551,15 @@ Module(
                         },
                         Decorator {
                             range: 236..246,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 238..245,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 244..245,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -581,19 +571,19 @@ Module(
                         },
                         Decorator {
                             range: 247..256,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 248..256,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 249..251,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 250..251,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -604,11 +594,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 253..255,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 254..255,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -627,14 +617,12 @@ Module(
                     name: Identifier {
                         id: Name("f"),
                         range: 261..262,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 262..264,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -645,11 +633,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 266..269,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 266..269,
                                     },
                                 ),
@@ -660,20 +648,20 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 360..380,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 360..365,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 361..365,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 361..362,
                                             id: Name("x"),
                                             ctx: Load,
@@ -682,7 +670,7 @@ Module(
                                     op: MatMult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 364..365,
                                             id: Name("y"),
                                             ctx: Load,
@@ -695,14 +683,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 370..373,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 373..375,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -713,11 +699,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 377..380,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 377..380,
                                     },
                                 ),
@@ -728,16 +714,16 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 383..407,
                     is_async: false,
                     decorator_list: [
                         Decorator {
                             range: 383..385,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 384..385,
                                     id: Name("x"),
                                     ctx: Load,
@@ -746,10 +732,10 @@ Module(
                         },
                         Decorator {
                             range: 388..390,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             expression: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 389..390,
                                     id: Name("y"),
                                     ctx: Load,
@@ -760,14 +746,12 @@ Module(
                     name: Identifier {
                         id: Name("foo"),
                         range: 397..400,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 400..402,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -778,11 +762,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 404..407,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 404..407,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap
index af944be2fb..03b7fab965 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap
@@ -7,43 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_annotation.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..54,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..22,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..17,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..16,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 8..11,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..16,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -62,11 +60,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 19..22,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 19..22,
                                     },
                                 ),
@@ -77,57 +75,53 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 23..53,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 27..30,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 30..48,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 31..47,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 31..47,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 31..34,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Lambda(
                                             ExprLambda {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 36..47,
                                                 parameters: Some(
                                                     Parameters {
                                                         range: 43..44,
-                                                        node_index: AtomicNodeIndex(
-                                                            0,
-                                                        ),
+                                                        node_index: NodeIndex(None),
                                                         posonlyargs: [],
                                                         args: [
                                                             ParameterWithDefault {
                                                                 range: 43..44,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 parameter: Parameter {
                                                                     range: 43..44,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     name: Identifier {
                                                                         id: Name("x"),
                                                                         range: 43..44,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     annotation: None,
                                                                 },
@@ -141,7 +135,7 @@ Module(
                                                 ),
                                                 body: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 46..47,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -162,11 +156,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 50..53,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 50..53,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap
index 7951972b14..97ade21863 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap
@@ -7,64 +7,60 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_default.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..111,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..27,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..22,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..21,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 10..21,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 17..18,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 17..18,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 17..18,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("y"),
                                                                     range: 17..18,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -78,7 +74,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 20..21,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -97,11 +93,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..27,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 24..27,
                                     },
                                 ),
@@ -112,51 +108,49 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 28..60,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 32..35,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 35..55,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 36..54,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 36..37,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 36..37,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     If(
                                         ExprIf {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 38..54,
                                             test: BooleanLiteral(
                                                 ExprBooleanLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 43..47,
                                                     value: true,
                                                 },
                                             ),
                                             body: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 38..39,
                                                     value: Int(
                                                         1,
@@ -165,7 +159,7 @@ Module(
                                             ),
                                             orelse: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 53..54,
                                                     value: Int(
                                                         2,
@@ -185,11 +179,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 57..60,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..60,
                                     },
                                 ),
@@ -200,44 +194,42 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..84,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 65..68,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 68..79,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 69..78,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 69..70,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 69..70,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 71..78,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 77..78,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -256,11 +248,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 81..84,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
                                     },
                                 ),
@@ -271,45 +263,43 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 85..110,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 89..92,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 92..105,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 93..104,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 93..94,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 93..94,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..103,
                                             value: Some(
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 102..103,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -329,11 +319,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 107..110,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 107..110,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap
index a9987458b0..6a3c7ccc9c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap
@@ -7,49 +7,47 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_star_annota
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..67,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..31,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..26,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 8..25,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 9..13,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 15..25,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 16..25,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 16..19,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -58,7 +56,7 @@ Module(
                                                     op: BitOr,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 22..25,
                                                             id: Name("str"),
                                                             ctx: Load,
@@ -79,11 +77,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..31,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..31,
                                     },
                                 ),
@@ -94,46 +92,44 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..66,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 36..39,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 39..61,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 40..60,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 41..45,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 47..60,
                                             value: BoolOp(
                                                 ExprBoolOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 49..59,
                                                     op: Or,
                                                     values: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 49..52,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -141,7 +137,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 56..59,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -163,11 +159,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 63..66,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 63..66,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap
index 8e1d5b24be..3213ff7743 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap
@@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_star_annota
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..432,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 169..206,
                     module: Some(
                         Identifier {
                             id: Name("typing"),
                             range: 174..180,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 188..197,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("Annotated"),
                                 range: 188..197,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 199..206,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("Literal"),
                                 range: 199..206,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -48,36 +48,34 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 207..230,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 211..214,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 214..225,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 215..224,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 216..220,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 222..224,
                                             id: Name("Ts"),
                                             ctx: Load,
@@ -93,11 +91,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 227..230,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 227..230,
                                     },
                                 ),
@@ -108,40 +106,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 231..295,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 235..238,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 238..290,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 239..289,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("x"),
                                     range: 240..241,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Subscript(
                                         ExprSubscript {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 243..289,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 243..250,
                                                     id: Name("Literal"),
                                                     ctx: Load,
@@ -149,18 +145,19 @@ Module(
                                             ),
                                             slice: StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 251..288,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 251..288,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "this should allow arbitrary strings",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -180,11 +177,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 292..295,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 292..295,
                                     },
                                 ),
@@ -195,40 +192,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 296..367,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 300..303,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 303..362,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 304..361,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("x"),
                                     range: 305..306,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Subscript(
                                         ExprSubscript {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 308..361,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 308..317,
                                                     id: Name("Annotated"),
                                                     ctx: Load,
@@ -236,12 +231,12 @@ Module(
                                             ),
                                             slice: Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 318..360,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 318..321,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -249,18 +244,19 @@ Module(
                                                         ),
                                                         StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 323..360,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 323..360,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "this should allow arbitrary strings",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Double,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -285,11 +281,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 364..367,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 364..367,
                                     },
                                 ),
@@ -300,36 +296,34 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 368..405,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 372..375,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 375..400,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 376..386,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 377..381,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 383..386,
                                             id: Name("str"),
                                             ctx: Load,
@@ -342,16 +336,16 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 388..399,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwds"),
                                     range: 390..394,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 396..399,
                                             id: Name("int"),
                                             ctx: Load,
@@ -365,11 +359,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 402..405,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 402..405,
                                     },
                                 ),
@@ -380,40 +374,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 406..431,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("union"),
                         range: 410..415,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 415..426,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 416..425,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("x"),
                                     range: 417..418,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 420..425,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 420..421,
                                                     id: Name("A"),
                                                     ctx: Load,
@@ -422,7 +414,7 @@ Module(
                                             op: BitOr,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 424..425,
                                                     id: Name("B"),
                                                     ctx: Load,
@@ -440,11 +432,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 428..431,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 428..431,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap
index 0f1eed04f9..0853afb16c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap
@@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_star_annota
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..69,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..68,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 48..51,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 51..63,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 52..62,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 53..57,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..62,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 60..62,
                                                     id: Name("Ts"),
                                                     ctx: Load,
@@ -64,11 +62,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..68,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 65..68,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap
index 2a4bdc6a75..fba5d8d3ec 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap
@@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/ok/params_non_default_aft
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..72,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..33,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..28,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 8..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 8..9,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 8..9,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 10..12,
                                             value: Int(
                                                 10,
@@ -59,14 +57,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 17..18,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 17..18,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 17..18,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -74,21 +72,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 20..24,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 20..21,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 20..21,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 22..24,
                                             value: Int(
                                                 11,
@@ -99,14 +97,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 26..27,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 26..27,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 26..27,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -119,11 +117,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 30..33,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 30..33,
                                     },
                                 ),
@@ -134,40 +132,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 34..71,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 38..41,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 41..66,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 42..46,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 42..43,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 42..43,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 44..46,
                                             value: Int(
                                                 10,
@@ -180,11 +176,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 48..53,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 49..53,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -192,14 +188,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 55..56,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 55..56,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 55..56,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -207,21 +203,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 58..62,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 58..59,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 58..59,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 60..62,
                                             value: Int(
                                                 11,
@@ -232,14 +228,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 64..65,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 64..65,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 64..65,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -252,11 +248,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 68..71,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 68..71,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap
index 458f38d329..7559480388 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap
@@ -7,40 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/params_seen_keyword_on
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..61,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 4..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 7..23,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 11..12,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 11..12,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 11..12,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -50,11 +48,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 14..22,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 16..22,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -64,11 +62,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..28,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..28,
                                     },
                                 ),
@@ -79,42 +77,40 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..60,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 33..36,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 36..55,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 40..44,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 40..41,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 40..41,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 42..44,
                                             value: Int(
                                                 10,
@@ -127,11 +123,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 46..54,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 48..54,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -141,11 +137,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 57..60,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..60,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap
index b8b9b08747..9d627ba68f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_context_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..126,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..73,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 49..57,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 49..52,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -30,7 +30,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..57,
                                         id: Name("x"),
                                         ctx: Store,
@@ -40,10 +40,10 @@ Module(
                         },
                         WithItem {
                             range: 59..67,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..62,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -52,7 +52,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 66..67,
                                         id: Name("y"),
                                         ctx: Store,
@@ -64,11 +64,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 70..73,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 70..73,
                                     },
                                 ),
@@ -79,16 +79,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 74..99,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 80..83,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 80..83,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -98,10 +98,10 @@ Module(
                         },
                         WithItem {
                             range: 85..93,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 85..88,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -110,7 +110,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 92..93,
                                         id: Name("y"),
                                         ctx: Store,
@@ -122,11 +122,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 96..99,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 96..99,
                                     },
                                 ),
@@ -137,16 +137,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..125,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 106..114,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 106..109,
                                     id: Name("foo"),
                                     ctx: Load,
@@ -155,7 +155,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 113..114,
                                         id: Name("x"),
                                         ctx: Store,
@@ -165,10 +165,10 @@ Module(
                         },
                         WithItem {
                             range: 116..119,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 116..119,
                                     id: Name("bar"),
                                     ctx: Load,
@@ -180,11 +180,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 122..125,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 122..125,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap
index 15feb12d38..91e6d3ec22 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_kwarg_py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..52,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..51,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..51,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..44,
                                     id: Name("f"),
                                     ctx: Load,
@@ -28,22 +28,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 44..51,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 45..50,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("a"),
                                                 range: 46..47,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 49..50,
                                                 value: Int(
                                                     1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap
index b5b5b300e5..a422908b73 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_named_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..55,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..54,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..54,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..46,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             slice: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..52,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 48..49,
                                             id: Name("x"),
                                             ctx: Store,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 51..52,
                                             value: Int(
                                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap
index c1f65ffc1d..1f14d31def 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_named_ex
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..92,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..59,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..59,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 45..51,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 45..46,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -33,7 +33,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 50..51,
                                                 value: Int(
                                                     1,
@@ -44,7 +44,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 54..55,
                                         value: Int(
                                             2,
@@ -53,7 +53,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 57..58,
                                         value: Int(
                                             3,
@@ -67,19 +67,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 60..91,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 60..91,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 62..71,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 62..66,
                                             id: Name("last"),
                                             ctx: Store,
@@ -87,7 +87,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 70..71,
                                             id: Name("x"),
                                             ctx: Load,
@@ -98,10 +98,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 73..90,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 77..78,
                                             id: Name("x"),
                                             ctx: Store,
@@ -109,11 +109,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..90,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 82..87,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -121,11 +121,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 87..90,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 88..89,
                                                             value: Int(
                                                                 3,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap
index a1f2cd011d..cfae3dd052 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_star_ind
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..94,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..93,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..89,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..47,
                                         id: Name("out"),
                                         ctx: Load,
@@ -29,24 +29,24 @@ Module(
                                 ),
                                 slice: Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 48..88,
                                         elts: [
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 49..81,
                                                     value: Generator(
                                                         ExprGenerator {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 50..81,
                                                             elt: Call(
                                                                 ExprCall {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 51..62,
                                                                     func: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 51..56,
                                                                             id: Name("slice"),
                                                                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
                                                                     ),
                                                                     arguments: Arguments {
                                                                         range: 56..62,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         args: [
                                                                             NoneLiteral(
                                                                                 ExprNoneLiteral {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 57..61,
                                                                                 },
                                                                             ),
@@ -70,10 +70,10 @@ Module(
                                                             generators: [
                                                                 Comprehension {
                                                                     range: 63..80,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     target: Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 67..68,
                                                                             id: Name("_"),
                                                                             ctx: Store,
@@ -81,11 +81,11 @@ Module(
                                                                     ),
                                                                     iter: Call(
                                                                         ExprCall {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 72..80,
                                                                             func: Name(
                                                                                 ExprName {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 72..77,
                                                                                     id: Name("range"),
                                                                                     ctx: Load,
@@ -93,11 +93,11 @@ Module(
                                                                             ),
                                                                             arguments: Arguments {
                                                                                 range: 77..80,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 args: [
                                                                                     NumberLiteral(
                                                                                         ExprNumberLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 78..79,
                                                                                             value: Int(
                                                                                                 2,
@@ -121,11 +121,11 @@ Module(
                                             ),
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 83..87,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 84..87,
                                                             id: Name("ind"),
                                                             ctx: Load,
@@ -145,7 +145,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 92..93,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap
index 6f728ba6da..676cadad44 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap
@@ -7,49 +7,50 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py311.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
-        range: 0..278,
+        node_index: NodeIndex(None),
+        range: 0..398,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..72,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..72,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 44..72,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 46..52,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "outer ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 52..71,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: StringLiteral(
                                                             ExprStringLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 53..70,
                                                                 value: StringLiteralValue {
                                                                     inner: Single(
                                                                         StringLiteral {
                                                                             range: 53..70,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: "# not a comment",
                                                                             flags: StringLiteralFlags {
                                                                                 quote_style: Single,
                                                                                 prefix: Empty,
                                                                                 triple_quoted: false,
+                                                                                unclosed: false,
                                                                             },
                                                                         },
                                                                     ),
@@ -66,6 +67,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -77,33 +79,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 73..106,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..106,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 73..106,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 75..81,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "outer ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 81..105,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 82..83,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -114,26 +116,27 @@ Module(
                                                         format_spec: Some(
                                                             InterpolatedStringFormatSpec {
                                                                 range: 84..104,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 elements: [
                                                                     Interpolation(
                                                                         InterpolatedElement {
                                                                             range: 84..103,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             expression: StringLiteral(
                                                                                 ExprStringLiteral {
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 85..102,
                                                                                     value: StringLiteralValue {
                                                                                         inner: Single(
                                                                                             StringLiteral {
                                                                                                 range: 85..102,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "# not a comment",
                                                                                                 flags: StringLiteralFlags {
                                                                                                     quote_style: Double,
                                                                                                     prefix: Empty,
                                                                                                     triple_quoted: false,
+                                                                                                    unclosed: false,
                                                                                                 },
                                                                                             },
                                                                                         ),
@@ -148,7 +151,7 @@ Module(
                                                                     Literal(
                                                                         InterpolatedStringLiteralElement {
                                                                             range: 103..104,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             value: " ",
                                                                         },
                                                                     ),
@@ -162,6 +165,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -173,67 +177,68 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 107..147,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 107..147,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 107..147,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 111..144,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 112..143,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 112..143,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 116..140,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: FString(
                                                                                                 ExprFString {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 117..139,
                                                                                                     value: FStringValue {
                                                                                                         inner: Single(
                                                                                                             FString(
                                                                                                                 FString {
                                                                                                                     range: 117..139,
-                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                    node_index: NodeIndex(None),
                                                                                                                     elements: [
                                                                                                                         Interpolation(
                                                                                                                             InterpolatedElement {
                                                                                                                                 range: 119..138,
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 expression: StringLiteral(
                                                                                                                                     ExprStringLiteral {
-                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                         range: 120..137,
                                                                                                                                         value: StringLiteralValue {
                                                                                                                                             inner: Single(
                                                                                                                                                 StringLiteral {
                                                                                                                                                     range: 120..137,
-                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                     value: "# not a comment",
                                                                                                                                                     flags: StringLiteralFlags {
                                                                                                                                                         quote_style: Double,
                                                                                                                                                         prefix: Empty,
                                                                                                                                                         triple_quoted: false,
+                                                                                                                                                        unclosed: false,
                                                                                                                                                     },
                                                                                                                                                 },
                                                                                                                                             ),
@@ -250,6 +255,7 @@ Module(
                                                                                                                         quote_style: Single,
                                                                                                                         prefix: Regular,
                                                                                                                         triple_quoted: false,
+                                                                                                                        unclosed: false,
                                                                                                                     },
                                                                                                                 },
                                                                                                             ),
@@ -267,6 +273,7 @@ Module(
                                                                                     quote_style: Single,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: true,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -284,6 +291,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -295,96 +303,96 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..230,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..230,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 148..230,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 152..208,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 153..207,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 153..207,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Literal(
                                                                                         InterpolatedStringLiteralElement {
                                                                                             range: 157..177,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "# before expression ",
                                                                                         },
                                                                                     ),
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 177..204,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: FString(
                                                                                                 ExprFString {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 178..203,
                                                                                                     value: FStringValue {
                                                                                                         inner: Single(
                                                                                                             FString(
                                                                                                                 FString {
                                                                                                                     range: 178..203,
-                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                    node_index: NodeIndex(None),
                                                                                                                     elements: [
                                                                                                                         Literal(
                                                                                                                             InterpolatedStringLiteralElement {
                                                                                                                                 range: 180..185,
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 value: "# aro",
                                                                                                                             },
                                                                                                                         ),
                                                                                                                         Interpolation(
                                                                                                                             InterpolatedElement {
                                                                                                                                 range: 185..197,
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 expression: FString(
                                                                                                                                     ExprFString {
-                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                         range: 186..196,
                                                                                                                                         value: FStringValue {
                                                                                                                                             inner: Single(
                                                                                                                                                 FString(
                                                                                                                                                     FString {
                                                                                                                                                         range: 186..196,
-                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                         elements: [
                                                                                                                                                             Literal(
                                                                                                                                                                 InterpolatedStringLiteralElement {
                                                                                                                                                                     range: 188..189,
-                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                     value: "#",
                                                                                                                                                                 },
                                                                                                                                                             ),
                                                                                                                                                             Interpolation(
                                                                                                                                                                 InterpolatedElement {
                                                                                                                                                                     range: 189..194,
-                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                     expression: BinOp(
                                                                                                                                                                         ExprBinOp {
-                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                             range: 190..193,
                                                                                                                                                                             left: NumberLiteral(
                                                                                                                                                                                 ExprNumberLiteral {
-                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                     range: 190..191,
                                                                                                                                                                                     value: Int(
                                                                                                                                                                                         1,
@@ -394,7 +402,7 @@ Module(
                                                                                                                                                                             op: Add,
                                                                                                                                                                             right: NumberLiteral(
                                                                                                                                                                                 ExprNumberLiteral {
-                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                     range: 192..193,
                                                                                                                                                                                     value: Int(
                                                                                                                                                                                         1,
@@ -411,7 +419,7 @@ Module(
                                                                                                                                                             Literal(
                                                                                                                                                                 InterpolatedStringLiteralElement {
                                                                                                                                                                     range: 194..195,
-                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                     value: "#",
                                                                                                                                                                 },
                                                                                                                                                             ),
@@ -420,6 +428,7 @@ Module(
                                                                                                                                                             quote_style: Double,
                                                                                                                                                             prefix: Regular,
                                                                                                                                                             triple_quoted: false,
+                                                                                                                                                            unclosed: false,
                                                                                                                                                         },
                                                                                                                                                     },
                                                                                                                                                 ),
@@ -435,7 +444,7 @@ Module(
                                                                                                                         Literal(
                                                                                                                             InterpolatedStringLiteralElement {
                                                                                                                                 range: 197..202,
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 value: "und #",
                                                                                                                             },
                                                                                                                         ),
@@ -444,6 +453,7 @@ Module(
                                                                                                                         quote_style: Single,
                                                                                                                         prefix: Regular,
                                                                                                                         triple_quoted: false,
+                                                                                                                        unclosed: false,
                                                                                                                     },
                                                                                                                 },
                                                                                                             ),
@@ -461,6 +471,7 @@ Module(
                                                                                     quote_style: Single,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: true,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -476,7 +487,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 208..227,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " # after expression",
                                                     },
                                                 ),
@@ -485,6 +496,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -496,33 +508,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 231..263,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 231..263,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 231..263,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 233..254,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "escape outside of \t ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 254..260,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 255..259,
                                                                 id: Name("expr"),
                                                                 ctx: Load,
@@ -536,7 +548,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 260..262,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "\n",
                                                     },
                                                 ),
@@ -545,6 +557,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -556,23 +569,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 264..277,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 264..277,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 264..277,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 266..276,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "test\"abcd",
                                                     },
                                                 ),
@@ -581,6 +594,131 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
+                                            },
+                                        },
+                                    ),
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 278..289,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 278..289,
+                            value: FStringValue {
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 278..289,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 280..288,
+                                                        node_index: NodeIndex(None),
+                                                        expression: NumberLiteral(
+                                                            ExprNumberLiteral {
+                                                                node_index: NodeIndex(None),
+                                                                range: 281..282,
+                                                                value: Int(
+                                                                    1,
+                                                                ),
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: Some(
+                                                            InterpolatedStringFormatSpec {
+                                                                range: 283..287,
+                                                                node_index: NodeIndex(None),
+                                                                elements: [
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 283..287,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: "d",
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Double,
+                                                prefix: Regular,
+                                                triple_quoted: false,
+                                                unclosed: false,
+                                            },
+                                        },
+                                    ),
+                                ),
+                            },
+                        },
+                    ),
+                },
+            ),
+            Expr(
+                StmtExpr {
+                    node_index: NodeIndex(None),
+                    range: 330..342,
+                    value: FString(
+                        ExprFString {
+                            node_index: NodeIndex(None),
+                            range: 330..342,
+                            value: FStringValue {
+                                inner: Single(
+                                    FString(
+                                        FString {
+                                            range: 330..342,
+                                            node_index: NodeIndex(None),
+                                            elements: [
+                                                Interpolation(
+                                                    InterpolatedElement {
+                                                        range: 332..341,
+                                                        node_index: NodeIndex(None),
+                                                        expression: NumberLiteral(
+                                                            ExprNumberLiteral {
+                                                                node_index: NodeIndex(None),
+                                                                range: 333..334,
+                                                                value: Int(
+                                                                    1,
+                                                                ),
+                                                            },
+                                                        ),
+                                                        debug_text: None,
+                                                        conversion: None,
+                                                        format_spec: Some(
+                                                            InterpolatedStringFormatSpec {
+                                                                range: 335..340,
+                                                                node_index: NodeIndex(None),
+                                                                elements: [
+                                                                    Literal(
+                                                                        InterpolatedStringLiteralElement {
+                                                                            range: 335..340,
+                                                                            node_index: NodeIndex(None),
+                                                                            value: "\"d\"",
+                                                                        },
+                                                                    ),
+                                                                ],
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                            ],
+                                            flags: FStringFlags {
+                                                quote_style: Double,
+                                                prefix: Regular,
+                                                triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap
index aad89368d1..91ec761efa 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap
@@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py312.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..403,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..74,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..74,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 44..74,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 46..58,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "Magic wand: ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 58..73,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Subscript(
                                                             ExprSubscript {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 60..71,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 60..63,
                                                                         id: Name("bag"),
                                                                         ctx: Load,
@@ -50,18 +50,19 @@ Module(
                                                                 ),
                                                                 slice: StringLiteral(
                                                                     ExprStringLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 64..70,
                                                                         value: StringLiteralValue {
                                                                             inner: Single(
                                                                                 StringLiteral {
                                                                                     range: 64..70,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: "wand",
                                                                                     flags: StringLiteralFlags {
                                                                                         quote_style: Single,
                                                                                         prefix: Empty,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -81,6 +82,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -92,45 +94,46 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..112,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..112,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 95..112,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 97..111,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Call(
                                                             ExprCall {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 98..110,
                                                                 func: Attribute(
                                                                     ExprAttribute {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 98..107,
                                                                         value: StringLiteral(
                                                                             ExprStringLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 98..102,
                                                                                 value: StringLiteralValue {
                                                                                     inner: Single(
                                                                                         StringLiteral {
                                                                                             range: 98..102,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: "\n",
                                                                                             flags: StringLiteralFlags {
                                                                                                 quote_style: Single,
                                                                                                 prefix: Empty,
                                                                                                 triple_quoted: false,
+                                                                                                unclosed: false,
                                                                                             },
                                                                                         },
                                                                                     ),
@@ -140,18 +143,18 @@ Module(
                                                                         attr: Identifier {
                                                                             id: Name("join"),
                                                                             range: 103..107,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                         },
                                                                         ctx: Load,
                                                                     },
                                                                 ),
                                                                 arguments: Arguments {
                                                                     range: 107..110,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     args: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 108..109,
                                                                                 id: Name("a"),
                                                                                 ctx: Load,
@@ -172,6 +175,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -183,37 +187,37 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..220,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..220,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 148..220,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 152..169,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "A complex trick: ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 169..217,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Subscript(
                                                             ExprSubscript {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 175..185,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 175..178,
                                                                         id: Name("bag"),
                                                                         ctx: Load,
@@ -221,18 +225,19 @@ Module(
                                                                 ),
                                                                 slice: StringLiteral(
                                                                     ExprStringLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 179..184,
                                                                         value: StringLiteralValue {
                                                                             inner: Single(
                                                                                 StringLiteral {
                                                                                     range: 179..184,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: "bag",
                                                                                     flags: StringLiteralFlags {
                                                                                         quote_style: Single,
                                                                                         prefix: Empty,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -252,6 +257,7 @@ Module(
                                                 quote_style: Single,
                                                 prefix: Regular,
                                                 triple_quoted: true,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -263,105 +269,105 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 221..254,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 221..254,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 221..254,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 223..253,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 224..252,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 224..252,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 226..251,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: FString(
                                                                                                 ExprFString {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 227..250,
                                                                                                     value: FStringValue {
                                                                                                         inner: Single(
                                                                                                             FString(
                                                                                                                 FString {
                                                                                                                     range: 227..250,
-                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                    node_index: NodeIndex(None),
                                                                                                                     elements: [
                                                                                                                         Interpolation(
                                                                                                                             InterpolatedElement {
                                                                                                                                 range: 229..249,
-                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                 expression: FString(
                                                                                                                                     ExprFString {
-                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                         range: 230..248,
                                                                                                                                         value: FStringValue {
                                                                                                                                             inner: Single(
                                                                                                                                                 FString(
                                                                                                                                                     FString {
                                                                                                                                                         range: 230..248,
-                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                         elements: [
                                                                                                                                                             Interpolation(
                                                                                                                                                                 InterpolatedElement {
                                                                                                                                                                     range: 232..247,
-                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                     expression: FString(
                                                                                                                                                                         ExprFString {
-                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                             range: 233..246,
                                                                                                                                                                             value: FStringValue {
                                                                                                                                                                                 inner: Single(
                                                                                                                                                                                     FString(
                                                                                                                                                                                         FString {
                                                                                                                                                                                             range: 233..246,
-                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                             elements: [
                                                                                                                                                                                                 Interpolation(
                                                                                                                                                                                                     InterpolatedElement {
                                                                                                                                                                                                         range: 235..245,
-                                                                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                                                                         expression: FString(
                                                                                                                                                                                                             ExprFString {
-                                                                                                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                                                                                                 range: 236..244,
                                                                                                                                                                                                                 value: FStringValue {
                                                                                                                                                                                                                     inner: Single(
                                                                                                                                                                                                                         FString(
                                                                                                                                                                                                                             FString {
                                                                                                                                                                                                                                 range: 236..244,
-                                                                                                                                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                node_index: NodeIndex(None),
                                                                                                                                                                                                                                 elements: [
                                                                                                                                                                                                                                     Interpolation(
                                                                                                                                                                                                                                         InterpolatedElement {
                                                                                                                                                                                                                                             range: 238..243,
-                                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                                             expression: BinOp(
                                                                                                                                                                                                                                                 ExprBinOp {
-                                                                                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                                                                                     range: 239..242,
                                                                                                                                                                                                                                                     left: NumberLiteral(
                                                                                                                                                                                                                                                         ExprNumberLiteral {
-                                                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                                                             range: 239..240,
                                                                                                                                                                                                                                                             value: Int(
                                                                                                                                                                                                                                                                 1,
@@ -371,7 +377,7 @@ Module(
                                                                                                                                                                                                                                                     op: Add,
                                                                                                                                                                                                                                                     right: NumberLiteral(
                                                                                                                                                                                                                                                         ExprNumberLiteral {
-                                                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                                                             range: 241..242,
                                                                                                                                                                                                                                                             value: Int(
                                                                                                                                                                                                                                                                 1,
@@ -390,6 +396,7 @@ Module(
                                                                                                                                                                                                                                     quote_style: Double,
                                                                                                                                                                                                                                     prefix: Regular,
                                                                                                                                                                                                                                     triple_quoted: false,
+                                                                                                                                                                                                                                    unclosed: false,
                                                                                                                                                                                                                                 },
                                                                                                                                                                                                                             },
                                                                                                                                                                                                                         ),
@@ -407,6 +414,7 @@ Module(
                                                                                                                                                                                                 quote_style: Double,
                                                                                                                                                                                                 prefix: Regular,
                                                                                                                                                                                                 triple_quoted: false,
+                                                                                                                                                                                                unclosed: false,
                                                                                                                                                                                             },
                                                                                                                                                                                         },
                                                                                                                                                                                     ),
@@ -424,6 +432,7 @@ Module(
                                                                                                                                                             quote_style: Double,
                                                                                                                                                             prefix: Regular,
                                                                                                                                                             triple_quoted: false,
+                                                                                                                                                            unclosed: false,
                                                                                                                                                         },
                                                                                                                                                     },
                                                                                                                                                 ),
@@ -441,6 +450,7 @@ Module(
                                                                                                                         quote_style: Double,
                                                                                                                         prefix: Regular,
                                                                                                                         triple_quoted: false,
+                                                                                                                        unclosed: false,
                                                                                                                     },
                                                                                                                 },
                                                                                                             ),
@@ -458,6 +468,7 @@ Module(
                                                                                     quote_style: Double,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -475,6 +486,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -486,52 +498,53 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 276..310,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 276..310,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 276..310,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 278..303,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: FString(
                                                             ExprFString {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 279..302,
                                                                 value: FStringValue {
                                                                     inner: Single(
                                                                         FString(
                                                                             FString {
                                                                                 range: 279..302,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 elements: [
                                                                                     Interpolation(
                                                                                         InterpolatedElement {
                                                                                             range: 283..293,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             expression: StringLiteral(
                                                                                                 ExprStringLiteral {
-                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                    node_index: NodeIndex(None),
                                                                                                     range: 284..292,
                                                                                                     value: StringLiteralValue {
                                                                                                         inner: Single(
                                                                                                             StringLiteral {
                                                                                                                 range: 284..292,
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 value: "nested",
                                                                                                                 flags: StringLiteralFlags {
                                                                                                                     quote_style: Double,
                                                                                                                     prefix: Empty,
                                                                                                                     triple_quoted: false,
+                                                                                                                    unclosed: false,
                                                                                                                 },
                                                                                                             },
                                                                                                         ),
@@ -546,7 +559,7 @@ Module(
                                                                                     Literal(
                                                                                         InterpolatedStringLiteralElement {
                                                                                             range: 293..299,
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             value: " inner",
                                                                                         },
                                                                                     ),
@@ -555,6 +568,7 @@ Module(
                                                                                     quote_style: Single,
                                                                                     prefix: Regular,
                                                                                     triple_quoted: true,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -570,7 +584,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 303..309,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " outer",
                                                     },
                                                 ),
@@ -579,6 +593,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -590,33 +605,33 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 336..359,
                     value: FString(
                         ExprFString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 336..359,
                             value: FStringValue {
                                 inner: Single(
                                     FString(
                                         FString {
                                             range: 336..359,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             elements: [
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 338..343,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "test ",
                                                     },
                                                 ),
                                                 Interpolation(
                                                     InterpolatedElement {
                                                         range: 343..353,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         expression: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 344..345,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -630,7 +645,7 @@ Module(
                                                 Literal(
                                                     InterpolatedStringLiteralElement {
                                                         range: 353..358,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: " more",
                                                     },
                                                 ),
@@ -639,6 +654,7 @@ Module(
                                                 quote_style: Double,
                                                 prefix: Regular,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap
index 217b66b09c..0d5db2d14d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap
@@ -7,41 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pep750_t_string_py314.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..403,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..74,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..74,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..74,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 46..58,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "Magic wand: ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 58..73,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Subscript(
                                                         ExprSubscript {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 60..71,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 60..63,
                                                                     id: Name("bag"),
                                                                     ctx: Load,
@@ -49,18 +49,19 @@ Module(
                                                             ),
                                                             slice: StringLiteral(
                                                                 ExprStringLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 64..70,
                                                                     value: StringLiteralValue {
                                                                         inner: Single(
                                                                             StringLiteral {
                                                                                 range: 64..70,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "wand",
                                                                                 flags: StringLiteralFlags {
                                                                                     quote_style: Single,
                                                                                     prefix: Empty,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -80,6 +81,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -90,44 +92,45 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..112,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..112,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 95..112,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 97..111,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Call(
                                                         ExprCall {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 98..110,
                                                             func: Attribute(
                                                                 ExprAttribute {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 98..107,
                                                                     value: StringLiteral(
                                                                         ExprStringLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 98..102,
                                                                             value: StringLiteralValue {
                                                                                 inner: Single(
                                                                                     StringLiteral {
                                                                                         range: 98..102,
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         value: "\n",
                                                                                         flags: StringLiteralFlags {
                                                                                             quote_style: Single,
                                                                                             prefix: Empty,
                                                                                             triple_quoted: false,
+                                                                                            unclosed: false,
                                                                                         },
                                                                                     },
                                                                                 ),
@@ -137,18 +140,18 @@ Module(
                                                                     attr: Identifier {
                                                                         id: Name("join"),
                                                                         range: 103..107,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                     },
                                                                     ctx: Load,
                                                                 },
                                                             ),
                                                             arguments: Arguments {
                                                                 range: 107..110,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 args: [
                                                                     Name(
                                                                         ExprName {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 108..109,
                                                                             id: Name("a"),
                                                                             ctx: Load,
@@ -169,6 +172,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -179,36 +183,36 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..220,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..220,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 148..220,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 152..169,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "A complex trick: ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 169..217,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Subscript(
                                                         ExprSubscript {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 175..185,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 175..178,
                                                                     id: Name("bag"),
                                                                     ctx: Load,
@@ -216,18 +220,19 @@ Module(
                                                             ),
                                                             slice: StringLiteral(
                                                                 ExprStringLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 179..184,
                                                                     value: StringLiteralValue {
                                                                         inner: Single(
                                                                             StringLiteral {
                                                                                 range: 179..184,
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 value: "bag",
                                                                                 flags: StringLiteralFlags {
                                                                                     quote_style: Single,
                                                                                     prefix: Empty,
                                                                                     triple_quoted: false,
+                                                                                    unclosed: false,
                                                                                 },
                                                                             },
                                                                         ),
@@ -247,6 +252,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -257,99 +263,99 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 221..254,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 221..254,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 221..254,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 223..253,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: TString(
                                                         ExprTString {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 224..252,
                                                             value: TStringValue {
                                                                 inner: Single(
                                                                     TString {
                                                                         range: 224..252,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         elements: [
                                                                             Interpolation(
                                                                                 InterpolatedElement {
                                                                                     range: 226..251,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     expression: TString(
                                                                                         ExprTString {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 227..250,
                                                                                             value: TStringValue {
                                                                                                 inner: Single(
                                                                                                     TString {
                                                                                                         range: 227..250,
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         elements: [
                                                                                                             Interpolation(
                                                                                                                 InterpolatedElement {
                                                                                                                     range: 229..249,
-                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                    node_index: NodeIndex(None),
                                                                                                                     expression: TString(
                                                                                                                         ExprTString {
-                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                            node_index: NodeIndex(None),
                                                                                                                             range: 230..248,
                                                                                                                             value: TStringValue {
                                                                                                                                 inner: Single(
                                                                                                                                     TString {
                                                                                                                                         range: 230..248,
-                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                         elements: [
                                                                                                                                             Interpolation(
                                                                                                                                                 InterpolatedElement {
                                                                                                                                                     range: 232..247,
-                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                     expression: TString(
                                                                                                                                                         ExprTString {
-                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                             range: 233..246,
                                                                                                                                                             value: TStringValue {
                                                                                                                                                                 inner: Single(
                                                                                                                                                                     TString {
                                                                                                                                                                         range: 233..246,
-                                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                                         elements: [
                                                                                                                                                                             Interpolation(
                                                                                                                                                                                 InterpolatedElement {
                                                                                                                                                                                     range: 235..245,
-                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                     expression: TString(
                                                                                                                                                                                         ExprTString {
-                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                             range: 236..244,
                                                                                                                                                                                             value: TStringValue {
                                                                                                                                                                                                 inner: Single(
                                                                                                                                                                                                     TString {
                                                                                                                                                                                                         range: 236..244,
-                                                                                                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                        node_index: NodeIndex(None),
                                                                                                                                                                                                         elements: [
                                                                                                                                                                                                             Interpolation(
                                                                                                                                                                                                                 InterpolatedElement {
                                                                                                                                                                                                                     range: 238..243,
-                                                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                                                     expression: BinOp(
                                                                                                                                                                                                                         ExprBinOp {
-                                                                                                                                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                            node_index: NodeIndex(None),
                                                                                                                                                                                                                             range: 239..242,
                                                                                                                                                                                                                             left: NumberLiteral(
                                                                                                                                                                                                                                 ExprNumberLiteral {
-                                                                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                                                                     range: 239..240,
                                                                                                                                                                                                                                     value: Int(
                                                                                                                                                                                                                                         1,
@@ -359,7 +365,7 @@ Module(
                                                                                                                                                                                                                             op: Add,
                                                                                                                                                                                                                             right: NumberLiteral(
                                                                                                                                                                                                                                 ExprNumberLiteral {
-                                                                                                                                                                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                                                                                                                                                                    node_index: NodeIndex(None),
                                                                                                                                                                                                                                     range: 241..242,
                                                                                                                                                                                                                                     value: Int(
                                                                                                                                                                                                                                         1,
@@ -378,6 +384,7 @@ Module(
                                                                                                                                                                                                             quote_style: Double,
                                                                                                                                                                                                             prefix: Regular,
                                                                                                                                                                                                             triple_quoted: false,
+                                                                                                                                                                                                            unclosed: false,
                                                                                                                                                                                                         },
                                                                                                                                                                                                     },
                                                                                                                                                                                                 ),
@@ -394,6 +401,7 @@ Module(
                                                                                                                                                                             quote_style: Double,
                                                                                                                                                                             prefix: Regular,
                                                                                                                                                                             triple_quoted: false,
+                                                                                                                                                                            unclosed: false,
                                                                                                                                                                         },
                                                                                                                                                                     },
                                                                                                                                                                 ),
@@ -410,6 +418,7 @@ Module(
                                                                                                                                             quote_style: Double,
                                                                                                                                             prefix: Regular,
                                                                                                                                             triple_quoted: false,
+                                                                                                                                            unclosed: false,
                                                                                                                                         },
                                                                                                                                     },
                                                                                                                                 ),
@@ -426,6 +435,7 @@ Module(
                                                                                                             quote_style: Double,
                                                                                                             prefix: Regular,
                                                                                                             triple_quoted: false,
+                                                                                                            unclosed: false,
                                                                                                         },
                                                                                                     },
                                                                                                 ),
@@ -442,6 +452,7 @@ Module(
                                                                             quote_style: Double,
                                                                             prefix: Regular,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -458,6 +469,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -468,50 +480,51 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 276..310,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 276..310,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 276..310,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 278..303,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: TString(
                                                         ExprTString {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 279..302,
                                                             value: TStringValue {
                                                                 inner: Single(
                                                                     TString {
                                                                         range: 279..302,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         elements: [
                                                                             Interpolation(
                                                                                 InterpolatedElement {
                                                                                     range: 283..293,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     expression: StringLiteral(
                                                                                         ExprStringLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 284..292,
                                                                                             value: StringLiteralValue {
                                                                                                 inner: Single(
                                                                                                     StringLiteral {
                                                                                                         range: 284..292,
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         value: "nested",
                                                                                                         flags: StringLiteralFlags {
                                                                                                             quote_style: Double,
                                                                                                             prefix: Empty,
                                                                                                             triple_quoted: false,
+                                                                                                            unclosed: false,
                                                                                                         },
                                                                                                     },
                                                                                                 ),
@@ -526,7 +539,7 @@ Module(
                                                                             Literal(
                                                                                 InterpolatedStringLiteralElement {
                                                                                     range: 293..299,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: " inner",
                                                                                 },
                                                                             ),
@@ -535,6 +548,7 @@ Module(
                                                                             quote_style: Single,
                                                                             prefix: Regular,
                                                                             triple_quoted: true,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -549,7 +563,7 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 303..309,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " outer",
                                                 },
                                             ),
@@ -558,6 +572,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -568,32 +583,32 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 336..359,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 336..359,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 336..359,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 338..343,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "test ",
                                                 },
                                             ),
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 343..353,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 344..345,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -607,7 +622,7 @@ Module(
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 353..358,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: " more",
                                                 },
                                             ),
@@ -616,6 +631,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap
index 69b218e419..fbf17fc861 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap
@@ -7,37 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pos_only_py38.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..62,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..61,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 47..50,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 50..56,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 51..52,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 51..52,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 51..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -53,11 +51,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..61,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap
index 7d3b052d80..993a3512aa 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/read_from_debug.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..32,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..12,
                             id: Name("__debug__"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..17,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..17,
                                     },
                                 ),
@@ -41,12 +41,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..31,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 18..19,
                                 id: Name("x"),
                                 ctx: Store,
@@ -55,7 +55,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..31,
                             id: Name("__debug__"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap
index 46c8be7e44..6dbd6b9fbf 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/simple_stmts_in_block.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..84,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..7,
                             value: true,
                         },
@@ -24,7 +24,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..13,
                             },
                         ),
@@ -34,11 +34,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..27,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 17..21,
                             value: true,
                         },
@@ -46,7 +46,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..27,
                             },
                         ),
@@ -56,11 +56,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..52,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..36,
                             value: true,
                         },
@@ -68,13 +68,13 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..42,
                             },
                         ),
                         Continue(
                             StmtContinue {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..52,
                             },
                         ),
@@ -84,11 +84,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..76,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..60,
                             value: true,
                         },
@@ -96,13 +96,13 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 62..66,
                             },
                         ),
                         Continue(
                             StmtContinue {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 68..76,
                             },
                         ),
@@ -112,12 +112,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 78..83,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 78..79,
                                 id: Name("x"),
                                 ctx: Store,
@@ -126,7 +126,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 82..83,
                             value: Int(
                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap
index 41be29071f..0f302ff4d1 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/ok/simple_stmts_with_semi
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..51,
         body: [
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: None,
                 },
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..16,
                     names: [
                         Alias {
                             range: 15..16,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 15..16,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -37,23 +37,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..33,
                     module: Some(
                         Identifier {
                             id: Name("x"),
                             range: 23..24,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 32..33,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("y"),
                                 range: 32..33,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -63,11 +63,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..36,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 35..36,
                             id: Name("z"),
                             ctx: Load,
@@ -77,11 +77,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..50,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..44,
                             id: Name("T"),
                             ctx: Store,
@@ -90,7 +90,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..50,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap
new file mode 100644
index 0000000000..09e2f6d782
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap
@@ -0,0 +1,165 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/ok/single_parenthesized_item_context_manager_py38.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..112,
+        body: [
+            With(
+                StmtWith {
+                    node_index: NodeIndex(None),
+                    range: 43..80,
+                    is_async: false,
+                    items: [
+                        WithItem {
+                            range: 48..75,
+                            node_index: NodeIndex(None),
+                            context_expr: Call(
+                                ExprCall {
+                                    node_index: NodeIndex(None),
+                                    range: 52..67,
+                                    func: Name(
+                                        ExprName {
+                                            node_index: NodeIndex(None),
+                                            range: 52..56,
+                                            id: Name("open"),
+                                            ctx: Load,
+                                        },
+                                    ),
+                                    arguments: Arguments {
+                                        range: 56..67,
+                                        node_index: NodeIndex(None),
+                                        args: [
+                                            StringLiteral(
+                                                ExprStringLiteral {
+                                                    node_index: NodeIndex(None),
+                                                    range: 57..66,
+                                                    value: StringLiteralValue {
+                                                        inner: Single(
+                                                            StringLiteral {
+                                                                range: 57..66,
+                                                                node_index: NodeIndex(None),
+                                                                value: "foo.txt",
+                                                                flags: StringLiteralFlags {
+                                                                    quote_style: Single,
+                                                                    prefix: Empty,
+                                                                    triple_quoted: false,
+                                                                    unclosed: false,
+                                                                },
+                                                            },
+                                                        ),
+                                                    },
+                                                },
+                                            ),
+                                        ],
+                                        keywords: [],
+                                    },
+                                },
+                            ),
+                            optional_vars: Some(
+                                Name(
+                                    ExprName {
+                                        node_index: NodeIndex(None),
+                                        range: 72..75,
+                                        id: Name("foo"),
+                                        ctx: Store,
+                                    },
+                                ),
+                            ),
+                        },
+                    ],
+                    body: [
+                        Expr(
+                            StmtExpr {
+                                node_index: NodeIndex(None),
+                                range: 77..80,
+                                value: EllipsisLiteral(
+                                    ExprEllipsisLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 77..80,
+                                    },
+                                ),
+                            },
+                        ),
+                    ],
+                },
+            ),
+            With(
+                StmtWith {
+                    node_index: NodeIndex(None),
+                    range: 81..111,
+                    is_async: false,
+                    items: [
+                        WithItem {
+                            range: 90..105,
+                            node_index: NodeIndex(None),
+                            context_expr: Call(
+                                ExprCall {
+                                    node_index: NodeIndex(None),
+                                    range: 90..105,
+                                    func: Name(
+                                        ExprName {
+                                            node_index: NodeIndex(None),
+                                            range: 90..94,
+                                            id: Name("open"),
+                                            ctx: Load,
+                                        },
+                                    ),
+                                    arguments: Arguments {
+                                        range: 94..105,
+                                        node_index: NodeIndex(None),
+                                        args: [
+                                            StringLiteral(
+                                                ExprStringLiteral {
+                                                    node_index: NodeIndex(None),
+                                                    range: 95..104,
+                                                    value: StringLiteralValue {
+                                                        inner: Single(
+                                                            StringLiteral {
+                                                                range: 95..104,
+                                                                node_index: NodeIndex(None),
+                                                                value: "foo.txt",
+                                                                flags: StringLiteralFlags {
+                                                                    quote_style: Single,
+                                                                    prefix: Empty,
+                                                                    triple_quoted: false,
+                                                                    unclosed: false,
+                                                                },
+                                                            },
+                                                        ),
+                                                    },
+                                                },
+                                            ),
+                                        ],
+                                        keywords: [],
+                                    },
+                                },
+                            ),
+                            optional_vars: None,
+                        },
+                    ],
+                    body: [
+                        Expr(
+                            StmtExpr {
+                                node_index: NodeIndex(None),
+                                range: 108..111,
+                                value: EllipsisLiteral(
+                                    ExprEllipsisLiteral {
+                                        node_index: NodeIndex(None),
+                                        range: 108..111,
+                                    },
+                                ),
+                            },
+                        ),
+                    ],
+                },
+            ),
+        ],
+    },
+)
+```
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap
index 4c44c9cbb3..ca0b875086 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/single_star_in_tuple.p
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..84,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..20,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 4..5,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 5..7,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,25 +35,25 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..20,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..20,
                                         value: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 15..20,
                                                     elts: [
                                                         Starred(
                                                             ExprStarred {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 16..18,
                                                                 value: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 17..18,
                                                                         id: Name("x"),
                                                                         ctx: Load,
@@ -79,21 +77,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 21..42,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 25..26,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 26..28,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -104,21 +100,21 @@ Module(
                     body: [
                         Return(
                             StmtReturn {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 30..42,
                                 value: Some(
                                     Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 37..42,
                                             elts: [
                                                 Starred(
                                                     ExprStarred {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 38..40,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 39..40,
                                                                 id: Name("x"),
                                                                 ctx: Load,
@@ -140,12 +136,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..62,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("_"),
                             ctx: Store,
@@ -153,16 +149,16 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 52..57,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 53..55,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 54..55,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -179,11 +175,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 59..62,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 59..62,
                                     },
                                 ),
@@ -195,21 +191,21 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..83,
                     is_async: false,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 67..72,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 68..70,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 69..70,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -225,7 +221,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 76..78,
                             id: Name("xs"),
                             ctx: Load,
@@ -234,11 +230,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 80..83,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..83,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap
index b202252533..05dfde51fa 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap
@@ -7,26 +7,26 @@ input_file: crates/ruff_python_parser/resources/inline/ok/single_starred_assignm
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..36,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..5,
                                 elts: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1..3,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2..3,
                                                     id: Name("a"),
                                                     ctx: Store,
@@ -43,12 +43,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 8..12,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..10,
                                         value: Int(
                                             1,
@@ -64,21 +64,21 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..23,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..16,
                                 elts: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 13..15,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 14..15,
                                                     id: Name("a"),
                                                     ctx: Store,
@@ -95,12 +95,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..23,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..21,
                                         value: Int(
                                             1,
@@ -116,21 +116,21 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..35,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..28,
                                 elts: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 25..27,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 26..27,
                                                     id: Name("a"),
                                                     ctx: Store,
@@ -146,12 +146,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 31..35,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 32..33,
                                         value: Int(
                                             1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap
index daf54439c2..562a74ae6d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/star_index_py311.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..293,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..55,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..55,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 44..47,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,16 +28,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..54,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 48..54,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 49..54,
                                                         id: Name("index"),
                                                         ctx: Load,
@@ -58,27 +58,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..112,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Array"),
                         range: 78..83,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 83..107,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Subscript(
                                     ExprSubscript {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..106,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 84..91,
                                                 id: Name("Generic"),
                                                 ctx: Load,
@@ -86,12 +86,12 @@ Module(
                                         ),
                                         slice: Tuple(
                                             ExprTuple {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 92..105,
                                                 elts: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 92..97,
                                                             id: Name("DType"),
                                                             ctx: Load,
@@ -99,11 +99,11 @@ Module(
                                                     ),
                                                     Starred(
                                                         ExprStarred {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 99..105,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 100..105,
                                                                     id: Name("Shape"),
                                                                     ctx: Load,
@@ -127,11 +127,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 109..112,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 109..112,
                                     },
                                 ),
@@ -142,15 +142,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..161,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..161,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 148..151,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -158,12 +158,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 152..160,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 152..153,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -171,11 +171,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 155..157,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 156..157,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -186,7 +186,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 159..160,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -204,15 +204,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 185..198,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 185..198,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 185..188,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -220,12 +220,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 189..197,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 189..190,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -233,7 +233,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 192..193,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -241,11 +241,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 195..197,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 196..197,
                                                         id: Name("c"),
                                                         ctx: Load,
@@ -266,15 +266,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 222..233,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 222..233,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 222..225,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -282,16 +282,16 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 226..232,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 226..228,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 227..228,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -302,11 +302,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 230..232,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 231..232,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -327,15 +327,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 254..271,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 254..271,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 254..259,
                                     id: Name("array"),
                                     ctx: Load,
@@ -343,17 +343,17 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 260..270,
                                     elts: [
                                         Slice(
                                             ExprSlice {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 260..263,
                                                 lower: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 260..261,
                                                             value: Int(
                                                                 3,
@@ -364,7 +364,7 @@ Module(
                                                 upper: Some(
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 262..263,
                                                             value: Int(
                                                                 5,
@@ -377,11 +377,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 265..270,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 266..270,
                                                         id: Name("idxs"),
                                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap
index df0e3f80ed..5e948486b8 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/ambiguous_lpar_w
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..3620,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 588..604,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 594..598,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 594..598,
                                     id: Name("item"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 601..604,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 601..604,
                                     },
                                 ),
@@ -48,16 +48,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 605..622,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 611..615,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 611..615,
                                     id: Name("item"),
                                     ctx: Load,
@@ -69,11 +69,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 619..622,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 619..622,
                                     },
                                 ),
@@ -84,16 +84,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 648..668,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 654..662,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 656..660,
                                     id: Name("item"),
                                     ctx: Load,
@@ -105,11 +105,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 665..668,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 665..668,
                                     },
                                 ),
@@ -120,16 +120,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 669..693,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 675..680,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 675..680,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -139,10 +139,10 @@ Module(
                         },
                         WithItem {
                             range: 682..687,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 682..687,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -154,11 +154,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 690..693,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 690..693,
                                     },
                                 ),
@@ -169,16 +169,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 694..719,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 700..705,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 700..705,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -188,10 +188,10 @@ Module(
                         },
                         WithItem {
                             range: 707..712,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 707..712,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -203,11 +203,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 716..719,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 716..719,
                                     },
                                 ),
@@ -218,16 +218,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 745..794,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 751..758,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 752..757,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -237,10 +237,10 @@ Module(
                         },
                         WithItem {
                             range: 760..767,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 761..766,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -250,10 +250,10 @@ Module(
                         },
                         WithItem {
                             range: 769..779,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 769..774,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -262,7 +262,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 778..779,
                                         id: Name("f"),
                                         ctx: Store,
@@ -272,10 +272,10 @@ Module(
                         },
                         WithItem {
                             range: 781..788,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 782..787,
                                     id: Name("item4"),
                                     ctx: Load,
@@ -287,11 +287,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 791..794,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 791..794,
                                     },
                                 ),
@@ -302,21 +302,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 795..828,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 801..815,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 801..815,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 802..807,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -324,7 +324,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 809..814,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -339,10 +339,10 @@ Module(
                         },
                         WithItem {
                             range: 817..822,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 817..822,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -354,11 +354,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 825..828,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 825..828,
                                     },
                                 ),
@@ -369,21 +369,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 829..852,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 835..846,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 835..841,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 836..837,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -391,7 +391,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 839..840,
                                                 id: Name("y"),
                                                 ctx: Load,
@@ -405,7 +405,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 845..846,
                                         id: Name("f"),
                                         ctx: Store,
@@ -417,11 +417,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 849..852,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 849..852,
                                     },
                                 ),
@@ -432,16 +432,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 853..889,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 859..870,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 859..864,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -450,7 +450,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 868..870,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -460,10 +460,10 @@ Module(
                         },
                         WithItem {
                             range: 872..883,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 872..877,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -472,7 +472,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 881..883,
                                         id: Name("f2"),
                                         ctx: Store,
@@ -484,11 +484,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 886..889,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 886..889,
                                     },
                                 ),
@@ -499,16 +499,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 890..927,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 896..907,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 896..901,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -517,7 +517,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 905..907,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -527,10 +527,10 @@ Module(
                         },
                         WithItem {
                             range: 909..920,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 909..914,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -539,7 +539,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 918..920,
                                         id: Name("f2"),
                                         ctx: Store,
@@ -551,11 +551,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 924..927,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 924..927,
                                     },
                                 ),
@@ -566,20 +566,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 953..976,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 959..969,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 959..969,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 959..963,
                                             id: Name("item"),
                                             ctx: Load,
@@ -591,7 +591,7 @@ Module(
                                     comparators: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 967..969,
                                                 value: Int(
                                                     10,
@@ -607,11 +607,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 973..976,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 973..976,
                                     },
                                 ),
@@ -622,20 +622,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 977..1001,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 983..995,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 984..994,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 984..988,
                                             id: Name("item"),
                                             ctx: Store,
@@ -643,7 +643,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 992..994,
                                             value: Int(
                                                 10,
@@ -658,11 +658,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 998..1001,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 998..1001,
                                     },
                                 ),
@@ -673,25 +673,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1002..1027,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1008..1021,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1008..1021,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1009..1019,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1009..1013,
                                                         id: Name("item"),
                                                         ctx: Store,
@@ -699,7 +699,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1017..1019,
                                                         value: Int(
                                                             10,
@@ -719,11 +719,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1024..1027,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1024..1027,
                                     },
                                 ),
@@ -734,25 +734,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1028..1048,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1034..1042,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1034..1042,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1035..1040,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1036..1040,
                                                         id: Name("item"),
                                                         ctx: Load,
@@ -772,11 +772,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1045..1048,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1045..1048,
                                     },
                                 ),
@@ -787,20 +787,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1049..1081,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1055..1068,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1056..1067,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1056..1061,
                                             id: Name("item1"),
                                             ctx: Store,
@@ -808,7 +808,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1065..1067,
                                             value: Int(
                                                 10,
@@ -821,10 +821,10 @@ Module(
                         },
                         WithItem {
                             range: 1070..1075,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1070..1075,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -836,11 +836,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1078..1081,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1078..1081,
                                     },
                                 ),
@@ -851,16 +851,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1082..1119,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1088..1098,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1088..1093,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -869,7 +869,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1097..1098,
                                         id: Name("f"),
                                         ctx: Store,
@@ -879,14 +879,14 @@ Module(
                         },
                         WithItem {
                             range: 1100..1113,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1101..1112,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1101..1106,
                                             id: Name("item2"),
                                             ctx: Store,
@@ -894,7 +894,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1110..1112,
                                             value: Int(
                                                 10,
@@ -909,11 +909,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1116..1119,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1116..1119,
                                     },
                                 ),
@@ -924,20 +924,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1120..1137,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1126..1131,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1126..1131,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1126..1129,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -945,7 +945,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1129..1131,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -957,11 +957,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1134..1137,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1134..1137,
                                     },
                                 ),
@@ -972,20 +972,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1138..1156,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1144..1149,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1144..1149,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1144..1147,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -993,7 +993,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1147..1149,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -1005,11 +1005,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1153..1156,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1153..1156,
                                     },
                                 ),
@@ -1020,20 +1020,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1157..1179,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1163..1173,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1163..1168,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1163..1166,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -1041,7 +1041,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1166..1168,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -1050,7 +1050,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1172..1173,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1062,11 +1062,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1176..1179,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1176..1179,
                                     },
                                 ),
@@ -1077,31 +1077,31 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1180..1207,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1186..1201,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: FString(
                                 ExprFString {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1186..1201,
                                     value: FStringValue {
                                         inner: Single(
                                             FString(
                                                 FString {
                                                     range: 1186..1201,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Interpolation(
                                                             InterpolatedElement {
                                                                 range: 1188..1200,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 expression: Name(
                                                                     ExprName {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 1189..1193,
                                                                         id: Name("item"),
                                                                         ctx: Load,
@@ -1112,12 +1112,12 @@ Module(
                                                                 format_spec: Some(
                                                                     InterpolatedStringFormatSpec {
                                                                         range: 1195..1199,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         elements: [
                                                                             Literal(
                                                                                 InterpolatedStringLiteralElement {
                                                                                     range: 1195..1199,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     value: "= 42",
                                                                                 },
                                                                             ),
@@ -1131,6 +1131,7 @@ Module(
                                                         quote_style: Double,
                                                         prefix: Regular,
                                                         triple_quoted: false,
+                                                        unclosed: false,
                                                     },
                                                 },
                                             ),
@@ -1144,11 +1145,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1204..1207,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1204..1207,
                                     },
                                 ),
@@ -1159,35 +1160,35 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1208..1237,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1214..1231,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: FString(
                                 ExprFString {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1214..1231,
                                     value: FStringValue {
                                         inner: Single(
                                             FString(
                                                 FString {
                                                     range: 1214..1231,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     elements: [
                                                         Interpolation(
                                                             InterpolatedElement {
                                                                 range: 1216..1230,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 expression: Named(
                                                                     ExprNamed {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 1218..1228,
                                                                         target: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 1218..1222,
                                                                                 id: Name("item"),
                                                                                 ctx: Store,
@@ -1195,7 +1196,7 @@ Module(
                                                                         ),
                                                                         value: NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 1226..1228,
                                                                                 value: Int(
                                                                                     42,
@@ -1214,6 +1215,7 @@ Module(
                                                         quote_style: Double,
                                                         prefix: Regular,
                                                         triple_quoted: false,
+                                                        unclosed: false,
                                                     },
                                                 },
                                             ),
@@ -1227,11 +1229,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1234..1237,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1234..1237,
                                     },
                                 ),
@@ -1242,20 +1244,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1238..1278,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1244..1266,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1244..1266,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1245..1246,
                                             id: Name("x"),
                                             ctx: Load,
@@ -1264,10 +1266,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 1247..1265,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1251..1252,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1275,11 +1277,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1256..1265,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1256..1261,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -1287,11 +1289,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 1261..1265,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 1262..1264,
                                                                     value: Int(
                                                                         10,
@@ -1314,10 +1316,10 @@ Module(
                         },
                         WithItem {
                             range: 1268..1272,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1268..1272,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1329,11 +1331,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1275..1278,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1275..1278,
                                     },
                                 ),
@@ -1344,16 +1346,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1279..1319,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1285..1289,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1285..1289,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1363,14 +1365,14 @@ Module(
                         },
                         WithItem {
                             range: 1291..1313,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1291..1313,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1292..1293,
                                             id: Name("x"),
                                             ctx: Load,
@@ -1379,10 +1381,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 1294..1312,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1298..1299,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1390,11 +1392,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1303..1312,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1303..1308,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -1402,11 +1404,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 1308..1312,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 1309..1311,
                                                                     value: Int(
                                                                         10,
@@ -1431,11 +1433,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1316..1319,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1316..1319,
                                     },
                                 ),
@@ -1446,16 +1448,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1320..1366,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1326..1330,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1326..1330,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1465,14 +1467,14 @@ Module(
                         },
                         WithItem {
                             range: 1332..1354,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1332..1354,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1333..1334,
                                             id: Name("x"),
                                             ctx: Load,
@@ -1481,10 +1483,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 1335..1353,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1339..1340,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1492,11 +1494,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1344..1353,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1344..1349,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -1504,11 +1506,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 1349..1353,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 1350..1352,
                                                                     value: Int(
                                                                         10,
@@ -1531,10 +1533,10 @@ Module(
                         },
                         WithItem {
                             range: 1356..1360,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1356..1360,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1546,11 +1548,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1363..1366,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1363..1366,
                                     },
                                 ),
@@ -1561,20 +1563,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1367..1388,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1373..1382,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1373..1382,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1373..1377,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1582,12 +1584,12 @@ Module(
                                     ),
                                     slice: Slice(
                                         ExprSlice {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1378..1381,
                                             lower: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1378..1379,
                                                         value: Int(
                                                             1,
@@ -1598,7 +1600,7 @@ Module(
                                             upper: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1380..1381,
                                                         value: Int(
                                                             2,
@@ -1618,11 +1620,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1385..1388,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1385..1388,
                                     },
                                 ),
@@ -1633,20 +1635,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1389..1415,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1395..1409,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1395..1404,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1395..1399,
                                             id: Name("data"),
                                             ctx: Load,
@@ -1654,12 +1656,12 @@ Module(
                                     ),
                                     slice: Slice(
                                         ExprSlice {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1400..1403,
                                             lower: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1400..1401,
                                                         value: Int(
                                                             1,
@@ -1670,7 +1672,7 @@ Module(
                                             upper: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1402..1403,
                                                         value: Int(
                                                             2,
@@ -1687,7 +1689,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1408..1409,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1699,11 +1701,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1412..1415,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1412..1415,
                                     },
                                 ),
@@ -1714,20 +1716,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1416..1450,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1422..1444,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1422..1439,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1423..1424,
                                             id: Name("x"),
                                             ctx: Load,
@@ -1736,10 +1738,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 1425..1438,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1429..1430,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1747,7 +1749,7 @@ Module(
                                             ),
                                             iter: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1434..1438,
                                                     id: Name("iter"),
                                                     ctx: Load,
@@ -1763,7 +1765,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1443..1444,
                                         id: Name("y"),
                                         ctx: Store,
@@ -1775,11 +1777,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1447..1450,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1447..1450,
                                     },
                                 ),
@@ -1790,16 +1792,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1663..1684,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1668..1679,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1669..1673,
                                     id: Name("item"),
                                     ctx: Load,
@@ -1808,7 +1810,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1678..1679,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1820,11 +1822,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1681..1684,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1681..1684,
                                     },
                                 ),
@@ -1835,20 +1837,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1685..1707,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1690..1702,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1691..1701,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1691..1695,
                                             id: Name("item"),
                                             ctx: Store,
@@ -1856,7 +1858,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1699..1701,
                                             value: Int(
                                                 10,
@@ -1871,11 +1873,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1704..1707,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1704..1707,
                                     },
                                 ),
@@ -1886,20 +1888,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1708..1735,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1713..1730,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1714..1724,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1714..1718,
                                             id: Name("item"),
                                             ctx: Store,
@@ -1907,7 +1909,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1722..1724,
                                             value: Int(
                                                 10,
@@ -1919,7 +1921,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1729..1730,
                                         id: Name("f"),
                                         ctx: Store,
@@ -1931,11 +1933,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1732..1735,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1732..1735,
                                     },
                                 ),
@@ -1946,20 +1948,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1736..1762,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1741..1757,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1744..1753,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1744..1748,
                                             id: Name("item"),
                                             ctx: Store,
@@ -1967,7 +1969,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1752..1753,
                                             value: Int(
                                                 1,
@@ -1982,11 +1984,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1759..1762,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1759..1762,
                                     },
                                 ),
@@ -1997,20 +1999,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1763..1793,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1768..1781,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1769..1780,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1769..1774,
                                             id: Name("item1"),
                                             ctx: Store,
@@ -2018,7 +2020,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1778..1780,
                                             value: Int(
                                                 42,
@@ -2031,10 +2033,10 @@ Module(
                         },
                         WithItem {
                             range: 1783..1788,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1783..1788,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -2046,11 +2048,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1790..1793,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1790..1793,
                                     },
                                 ),
@@ -2061,28 +2063,28 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1794..1828,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1799..1823,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1799..1823,
                                     func: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1799..1821,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1800..1815,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1800..1804,
                                                             id: Name("root"),
                                                             ctx: Load,
@@ -2091,7 +2093,7 @@ Module(
                                                     op: Add,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1807..1815,
                                                             id: Name("filename"),
                                                             ctx: Load,
@@ -2102,14 +2104,14 @@ Module(
                                             attr: Identifier {
                                                 id: Name("read"),
                                                 range: 1817..1821,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
                                     ),
                                     arguments: Arguments {
                                         range: 1821..1823,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2121,11 +2123,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1825..1828,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1825..1828,
                                     },
                                 ),
@@ -2136,28 +2138,28 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1851..1890,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1856..1885,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1856..1880,
                                     func: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1856..1878,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1857..1872,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1857..1861,
                                                             id: Name("root"),
                                                             ctx: Load,
@@ -2166,7 +2168,7 @@ Module(
                                                     op: Add,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1864..1872,
                                                             id: Name("filename"),
                                                             ctx: Load,
@@ -2177,14 +2179,14 @@ Module(
                                             attr: Identifier {
                                                 id: Name("read"),
                                                 range: 1874..1878,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
                                     ),
                                     arguments: Arguments {
                                         range: 1878..1880,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2193,7 +2195,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1884..1885,
                                         id: Name("f"),
                                         ctx: Store,
@@ -2205,11 +2207,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1887..1890,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1887..1890,
                                     },
                                 ),
@@ -2220,20 +2222,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1913..1930,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1918..1925,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1918..1925,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1919..1922,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -2241,7 +2243,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1923..1925,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2253,11 +2255,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1927..1930,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1927..1930,
                                     },
                                 ),
@@ -2268,20 +2270,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1953..1975,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 1958..1970,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1958..1965,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1959..1962,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -2289,7 +2291,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1963..1965,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2298,7 +2300,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1969..1970,
                                         id: Name("f"),
                                         ctx: Store,
@@ -2310,11 +2312,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1972..1975,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1972..1975,
                                     },
                                 ),
@@ -2325,20 +2327,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1998..2020,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2003..2015,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2004..2009,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2004..2007,
                                             id: Name("foo"),
                                             ctx: Load,
@@ -2346,7 +2348,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 2007..2009,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2355,7 +2357,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2014..2015,
                                         id: Name("f"),
                                         ctx: Store,
@@ -2367,11 +2369,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2017..2020,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2017..2020,
                                     },
                                 ),
@@ -2382,20 +2384,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2021..2047,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2026..2042,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2027..2036,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2027..2031,
                                             id: Name("data"),
                                             ctx: Load,
@@ -2403,12 +2405,12 @@ Module(
                                     ),
                                     slice: Slice(
                                         ExprSlice {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2032..2035,
                                             lower: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2032..2033,
                                                         value: Int(
                                                             1,
@@ -2419,7 +2421,7 @@ Module(
                                             upper: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2034..2035,
                                                         value: Int(
                                                             2,
@@ -2436,7 +2438,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2041..2042,
                                         id: Name("f"),
                                         ctx: Store,
@@ -2448,11 +2450,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2044..2047,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2044..2047,
                                     },
                                 ),
@@ -2463,25 +2465,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2048..2070,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2053..2065,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2053..2065,
                                     value: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2053..2062,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2054..2055,
                                                         value: Int(
                                                             1,
@@ -2490,7 +2492,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2057..2058,
                                                         value: Int(
                                                             2,
@@ -2499,7 +2501,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2060..2061,
                                                         value: Int(
                                                             3,
@@ -2513,7 +2515,7 @@ Module(
                                     ),
                                     slice: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2063..2064,
                                             value: Int(
                                                 0,
@@ -2529,11 +2531,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2067..2070,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2067..2070,
                                     },
                                 ),
@@ -2544,25 +2546,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2093..2120,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2098..2115,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2098..2110,
                                     value: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2098..2107,
                                             elts: [
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2099..2100,
                                                         value: Int(
                                                             1,
@@ -2571,7 +2573,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2102..2103,
                                                         value: Int(
                                                             2,
@@ -2580,7 +2582,7 @@ Module(
                                                 ),
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2105..2106,
                                                         value: Int(
                                                             3,
@@ -2594,7 +2596,7 @@ Module(
                                     ),
                                     slice: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2108..2109,
                                             value: Int(
                                                 0,
@@ -2607,7 +2609,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2114..2115,
                                         id: Name("f"),
                                         ctx: Store,
@@ -2619,11 +2621,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2117..2120,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2117..2120,
                                     },
                                 ),
@@ -2634,16 +2636,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2143..2169,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2148..2155,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2149..2154,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -2653,10 +2655,10 @@ Module(
                         },
                         WithItem {
                             range: 2157..2164,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2158..2163,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -2668,11 +2670,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2166..2169,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2166..2169,
                                     },
                                 ),
@@ -2683,20 +2685,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2170..2210,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2175..2189,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2176..2188,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2176..2180,
                                             id: Name("open"),
                                             ctx: Load,
@@ -2704,22 +2706,23 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 2180..2188,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2181..2187,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 2181..2187,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "a.py",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Single,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -2735,14 +2738,14 @@ Module(
                         },
                         WithItem {
                             range: 2191..2205,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2192..2204,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2192..2196,
                                             id: Name("open"),
                                             ctx: Load,
@@ -2750,22 +2753,23 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 2196..2204,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2197..2203,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 2197..2203,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "b.py",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Single,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -2783,11 +2787,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2207..2210,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2207..2210,
                                     },
                                 ),
@@ -2798,21 +2802,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2211..2230,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2216..2225,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2217..2224,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2223..2224,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -2827,11 +2831,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2227..2230,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2227..2230,
                                     },
                                 ),
@@ -2842,21 +2846,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2231..2252,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2237..2246,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2238..2245,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2244..2245,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -2871,11 +2875,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2249..2252,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2249..2252,
                                     },
                                 ),
@@ -2886,20 +2890,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2253..2277,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2258..2272,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2259..2271,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2270..2271,
                                             id: Name("x"),
                                             ctx: Load,
@@ -2913,11 +2917,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2274..2277,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2274..2277,
                                     },
                                 ),
@@ -2928,20 +2932,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2278..2304,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2284..2298,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: YieldFrom(
                                 ExprYieldFrom {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2285..2297,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2296..2297,
                                             id: Name("x"),
                                             ctx: Load,
@@ -2955,11 +2959,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2301..2304,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2301..2304,
                                     },
                                 ),
@@ -2970,21 +2974,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2305..2329,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2310..2324,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2311..2318,
                                     value: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2317..2318,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -2996,7 +3000,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2323..2324,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3008,11 +3012,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2326..2329,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2326..2329,
                                     },
                                 ),
@@ -3023,26 +3027,26 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2330..2355,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2335..2350,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Yield(
                                 ExprYield {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2336..2344,
                                     value: Some(
                                         Tuple(
                                             ExprTuple {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2342..2344,
                                                 elts: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 2342..2343,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -3059,7 +3063,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2349..2350,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3071,11 +3075,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2352..2355,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2352..2355,
                                     },
                                 ),
@@ -3086,16 +3090,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2741..2753,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2746..2748,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2746..2748,
                                     elts: [],
                                     ctx: Load,
@@ -3108,11 +3112,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2750..2753,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2750..2753,
                                     },
                                 ),
@@ -3123,16 +3127,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2754..2771,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2759..2766,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2759..2761,
                                     elts: [],
                                     ctx: Load,
@@ -3142,7 +3146,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2765..2766,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3154,11 +3158,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2768..2771,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2768..2771,
                                     },
                                 ),
@@ -3169,25 +3173,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2772..2795,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2777..2790,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2777..2790,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2778..2788,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2778..2782,
                                                         id: Name("item"),
                                                         ctx: Store,
@@ -3195,7 +3199,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2786..2788,
                                                         value: Int(
                                                             42,
@@ -3215,11 +3219,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2792..2795,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2792..2795,
                                     },
                                 ),
@@ -3230,21 +3234,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2796..2820,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2801..2815,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2801..2815,
                                     elts: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2802..2803,
                                                 value: Int(
                                                     1,
@@ -3253,11 +3257,11 @@ Module(
                                         ),
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2805..2814,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2805..2809,
                                                         id: Name("item"),
                                                         ctx: Store,
@@ -3265,7 +3269,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2813..2814,
                                                         value: Int(
                                                             2,
@@ -3285,11 +3289,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2817..2820,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2817..2820,
                                     },
                                 ),
@@ -3300,25 +3304,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2821..2851,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2826..2846,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2826..2846,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2827..2838,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2827..2832,
                                                         id: Name("item1"),
                                                         ctx: Store,
@@ -3326,7 +3330,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2836..2838,
                                                         value: Int(
                                                             10,
@@ -3337,7 +3341,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2840..2845,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -3354,11 +3358,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2848..2851,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2848..2851,
                                     },
                                 ),
@@ -3369,21 +3373,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2852..2893,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2857..2888,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2857..2883,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2858..2863,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -3391,11 +3395,11 @@ Module(
                                         ),
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2865..2875,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2865..2870,
                                                         id: Name("item2"),
                                                         ctx: Store,
@@ -3403,7 +3407,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2874..2875,
                                                         value: Int(
                                                             2,
@@ -3414,7 +3418,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2877..2882,
                                                 id: Name("item3"),
                                                 ctx: Load,
@@ -3428,7 +3432,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2887..2888,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3440,11 +3444,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2890..2893,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2890..2893,
                                     },
                                 ),
@@ -3455,21 +3459,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2894..2916,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2899..2911,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2899..2906,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2900..2904,
                                                 id: Name("item"),
                                                 ctx: Load,
@@ -3483,7 +3487,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2910..2911,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3495,11 +3499,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2913..2916,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2913..2916,
                                     },
                                 ),
@@ -3510,25 +3514,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2917..2935,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2922..2930,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2922..2930,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2923..2928,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2924..2928,
                                                         id: Name("item"),
                                                         ctx: Load,
@@ -3548,11 +3552,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2932..2935,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2932..2935,
                                     },
                                 ),
@@ -3563,25 +3567,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2936..2959,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2941..2954,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2941..2949,
                                     elts: [
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2942..2947,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2943..2947,
                                                         id: Name("item"),
                                                         ctx: Load,
@@ -3598,7 +3602,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2953..2954,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3610,11 +3614,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2956..2959,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2956..2959,
                                     },
                                 ),
@@ -3625,21 +3629,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2960..2989,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2965..2984,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2965..2979,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2966..2971,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -3647,7 +3651,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2973..2978,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -3661,7 +3665,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2983..2984,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3673,11 +3677,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2986..2989,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2986..2989,
                                     },
                                 ),
@@ -3688,21 +3692,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2990..3020,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 2995..3015,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 2995..3010,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2996..3001,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -3710,7 +3714,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3003..3008,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -3724,7 +3728,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3014..3015,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3736,11 +3740,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3017..3020,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3017..3020,
                                     },
                                 ),
@@ -3751,21 +3755,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3021..3052,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3026..3040,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3026..3040,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3027..3032,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -3773,7 +3777,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3034..3039,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -3788,10 +3792,10 @@ Module(
                         },
                         WithItem {
                             range: 3042..3047,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3042..3047,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -3803,11 +3807,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3049..3052,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3049..3052,
                                     },
                                 ),
@@ -3818,26 +3822,26 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3053..3091,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3058..3086,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3058..3081,
                                     elts: [
                                         Tuple(
                                             ExprTuple {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3059..3073,
                                                 elts: [
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3060..3065,
                                                             id: Name("item1"),
                                                             ctx: Load,
@@ -3845,7 +3849,7 @@ Module(
                                                     ),
                                                     Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3067..3072,
                                                             id: Name("item2"),
                                                             ctx: Load,
@@ -3858,7 +3862,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3075..3080,
                                                 id: Name("item3"),
                                                 ctx: Load,
@@ -3872,7 +3876,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3085..3086,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3884,11 +3888,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3088..3091,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3088..3091,
                                     },
                                 ),
@@ -3899,21 +3903,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3092..3138,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3097..3105,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3097..3105,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3098..3103,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -3928,10 +3932,10 @@ Module(
                         },
                         WithItem {
                             range: 3107..3112,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3107..3112,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -3941,15 +3945,15 @@ Module(
                         },
                         WithItem {
                             range: 3114..3133,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3114..3128,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3115..3120,
                                                 id: Name("item3"),
                                                 ctx: Load,
@@ -3957,7 +3961,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3122..3127,
                                                 id: Name("item4"),
                                                 ctx: Load,
@@ -3971,7 +3975,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3132..3133,
                                         id: Name("f"),
                                         ctx: Store,
@@ -3983,11 +3987,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3135..3138,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3135..3138,
                                     },
                                 ),
@@ -3998,21 +4002,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3139..3182,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3144..3164,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3144..3158,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3145..3150,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -4020,7 +4024,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3152..3157,
                                                 id: Name("item2"),
                                                 ctx: Load,
@@ -4034,7 +4038,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3162..3164,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -4044,10 +4048,10 @@ Module(
                         },
                         WithItem {
                             range: 3166..3177,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3166..3171,
                                     id: Name("item3"),
                                     ctx: Load,
@@ -4056,7 +4060,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3175..3177,
                                         id: Name("f2"),
                                         ctx: Store,
@@ -4068,11 +4072,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3179..3182,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3179..3182,
                                     },
                                 ),
@@ -4083,21 +4087,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3183..3208,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3188..3203,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3188..3203,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3189..3194,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -4105,11 +4109,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3196..3202,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3197..3202,
                                                         id: Name("item2"),
                                                         ctx: Load,
@@ -4129,11 +4133,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3205..3208,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3205..3208,
                                     },
                                 ),
@@ -4144,21 +4148,21 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3209..3239,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3214..3234,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3214..3229,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3215..3220,
                                                 id: Name("item1"),
                                                 ctx: Load,
@@ -4166,11 +4170,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3222..3228,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3223..3228,
                                                         id: Name("item2"),
                                                         ctx: Load,
@@ -4187,7 +4191,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3233..3234,
                                         id: Name("f"),
                                         ctx: Store,
@@ -4199,11 +4203,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3236..3239,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3236..3239,
                                     },
                                 ),
@@ -4214,25 +4218,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3240..3271,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3245..3266,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3245..3266,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3246..3257,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3246..3251,
                                                         id: Name("item1"),
                                                         ctx: Store,
@@ -4240,7 +4244,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3255..3257,
                                                         value: Int(
                                                             10,
@@ -4251,11 +4255,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3259..3265,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3260..3265,
                                                         id: Name("item2"),
                                                         ctx: Load,
@@ -4275,11 +4279,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3268..3271,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3268..3271,
                                     },
                                 ),
@@ -4290,25 +4294,25 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3272..3305,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3277..3300,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3277..3300,
                                     elts: [
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3279..3290,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3279..3284,
                                                         id: Name("item1"),
                                                         ctx: Store,
@@ -4316,7 +4320,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3288..3290,
                                                         value: Int(
                                                             10,
@@ -4327,11 +4331,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3293..3299,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3294..3299,
                                                         id: Name("item2"),
                                                         ctx: Load,
@@ -4351,11 +4355,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3302..3305,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3302..3305,
                                     },
                                 ),
@@ -4366,20 +4370,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3510..3542,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3515..3537,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3515..3537,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3516..3517,
                                             id: Name("x"),
                                             ctx: Load,
@@ -4388,10 +4392,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 3518..3536,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3522..3523,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -4399,11 +4403,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3527..3536,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3527..3532,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -4411,11 +4415,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 3532..3536,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 3533..3535,
                                                                     value: Int(
                                                                         10,
@@ -4440,11 +4444,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3539..3542,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3539..3542,
                                     },
                                 ),
@@ -4455,20 +4459,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3543..3581,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3548..3576,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3548..3576,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3549..3550,
                                             id: Name("x"),
                                             ctx: Load,
@@ -4477,10 +4481,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 3551..3575,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3561..3562,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -4488,11 +4492,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3566..3575,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3566..3571,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -4500,11 +4504,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 3571..3575,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 3572..3574,
                                                                     value: Int(
                                                                         10,
@@ -4529,11 +4533,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3578..3581,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3578..3581,
                                     },
                                 ),
@@ -4544,20 +4548,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3582..3620,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 3587..3609,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Generator(
                                 ExprGenerator {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3587..3609,
                                     elt: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3588..3589,
                                             id: Name("x"),
                                             ctx: Load,
@@ -4566,10 +4570,10 @@ Module(
                                     generators: [
                                         Comprehension {
                                             range: 3590..3608,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             target: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3594..3595,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -4577,11 +4581,11 @@ Module(
                                             ),
                                             iter: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3599..3608,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3599..3604,
                                                             id: Name("range"),
                                                             ctx: Load,
@@ -4589,11 +4593,11 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 3604..3608,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 3605..3607,
                                                                     value: Int(
                                                                         10,
@@ -4616,10 +4620,10 @@ Module(
                         },
                         WithItem {
                             range: 3611..3615,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 3611..3615,
                                     id: Name("item"),
                                     ctx: Load,
@@ -4631,11 +4635,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 3617..3620,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3617..3620,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap
index 4f2c579ca3..dfcabffa76 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/annotated_assign
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..103,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -24,7 +24,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..6,
                             id: Name("int"),
                             ctx: Load,
@@ -36,11 +36,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..17,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..8,
                             id: Name("x"),
                             ctx: Store,
@@ -48,7 +48,7 @@ Module(
                     ),
                     annotation: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 10..13,
                             id: Name("int"),
                             ctx: Load,
@@ -57,7 +57,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..17,
                                 value: Int(
                                     1,
@@ -70,11 +70,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..28,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 19..20,
                             id: Name("x"),
                             ctx: Store,
@@ -82,11 +82,11 @@ Module(
                     ),
                     annotation: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..28,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 23..24,
                                     value: Int(
                                         1,
@@ -96,7 +96,7 @@ Module(
                             op: Add,
                             right: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 27..28,
                                     value: Int(
                                         2,
@@ -111,11 +111,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 29..55,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 29..30,
                             id: Name("x"),
                             ctx: Store,
@@ -123,15 +123,15 @@ Module(
                     ),
                     annotation: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..48,
                             left: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 32..42,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..37,
                                             id: Name("tuple"),
                                             ctx: Load,
@@ -139,7 +139,7 @@ Module(
                                     ),
                                     slice: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 38..41,
                                             id: Name("int"),
                                             ctx: Load,
@@ -151,7 +151,7 @@ Module(
                             op: BitOr,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 45..48,
                                     id: Name("int"),
                                     ctx: Load,
@@ -162,12 +162,12 @@ Module(
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 51..55,
                                 elts: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 52..53,
                                             value: Int(
                                                 1,
@@ -185,11 +185,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 56..83,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..57,
                             id: Name("x"),
                             ctx: Store,
@@ -197,18 +197,18 @@ Module(
                     ),
                     annotation: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..79,
                             test: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 66..70,
                                     value: true,
                                 },
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..62,
                                     id: Name("int"),
                                     ctx: Load,
@@ -216,7 +216,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 76..79,
                                     id: Name("str"),
                                     ctx: Load,
@@ -227,7 +227,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 82..83,
                                 value: Int(
                                     1,
@@ -240,11 +240,11 @@ Module(
             ),
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 84..102,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..85,
                             id: Name("x"),
                             ctx: Store,
@@ -252,26 +252,24 @@ Module(
                     ),
                     annotation: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 87..98,
                             parameters: Some(
                                 Parameters {
                                     range: 94..95,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 94..95,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 94..95,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 94..95,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -285,7 +283,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 97..98,
                                     id: Name("y"),
                                     ctx: Load,
@@ -296,7 +294,7 @@ Module(
                     value: Some(
                         NumberLiteral(
                             ExprNumberLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 101..102,
                                 value: Int(
                                     1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap
index e73517455e..ae3131d0c1 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/statement/assert.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..186,
         body: [
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     test: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..12,
                             left: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..8,
                                     value: Int(
                                         1,
@@ -33,7 +33,7 @@ Module(
                             comparators: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 11..12,
                                         value: Int(
                                             2,
@@ -48,15 +48,15 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..26,
                     test: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 20..26,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 20..24,
                                     id: Name("call"),
                                     ctx: Load,
@@ -64,7 +64,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 24..26,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -75,17 +75,17 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..41,
                     test: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..41,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 34..35,
                                         id: Name("a"),
                                         ctx: Load,
@@ -93,7 +93,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 40..41,
                                         id: Name("b"),
                                         ctx: Load,
@@ -107,30 +107,28 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..60,
                     test: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..60,
                             parameters: Some(
                                 Parameters {
                                     range: 56..57,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 56..57,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 56..57,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 56..57,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -144,7 +142,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..60,
                                     id: Name("y"),
                                     ctx: Load,
@@ -157,15 +155,15 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..75,
                     test: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..75,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 74..75,
                                     id: Name("x"),
                                     ctx: Load,
@@ -178,22 +176,22 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 76..99,
                     test: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 83..99,
                             test: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 88..92,
                                     value: true,
                                 },
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 83..84,
                                     id: Name("x"),
                                     ctx: Load,
@@ -201,7 +199,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 98..99,
                                     id: Name("y"),
                                     ctx: Load,
@@ -214,11 +212,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 101..118,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 108..109,
                             id: Name("x"),
                             ctx: Load,
@@ -227,18 +225,19 @@ Module(
                     msg: Some(
                         StringLiteral(
                             ExprStringLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 111..118,
                                 value: StringLiteralValue {
                                     inner: Single(
                                         StringLiteral {
                                             range: 111..118,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             value: "error",
                                             flags: StringLiteralFlags {
                                                 quote_style: Double,
                                                 prefix: Empty,
                                                 triple_quoted: false,
+                                                unclosed: false,
                                             },
                                         },
                                     ),
@@ -250,11 +249,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..140,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 126..127,
                             id: Name("x"),
                             ctx: Load,
@@ -263,26 +262,24 @@ Module(
                     msg: Some(
                         Lambda(
                             ExprLambda {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 129..140,
                                 parameters: Some(
                                     Parameters {
                                         range: 136..137,
-                                        node_index: AtomicNodeIndex(
-                                            0,
-                                        ),
+                                        node_index: NodeIndex(None),
                                         posonlyargs: [],
                                         args: [
                                             ParameterWithDefault {
                                                 range: 136..137,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 parameter: Parameter {
                                                     range: 136..137,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     name: Identifier {
                                                         id: Name("x"),
                                                         range: 136..137,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     annotation: None,
                                                 },
@@ -296,7 +293,7 @@ Module(
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 139..140,
                                         id: Name("y"),
                                         ctx: Load,
@@ -309,11 +306,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 141..158,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 148..149,
                             id: Name("x"),
                             ctx: Load,
@@ -322,11 +319,11 @@ Module(
                     msg: Some(
                         Await(
                             ExprAwait {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 151..158,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 157..158,
                                         id: Name("x"),
                                         ctx: Load,
@@ -339,11 +336,11 @@ Module(
             ),
             Assert(
                 StmtAssert {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 159..185,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 166..167,
                             id: Name("x"),
                             ctx: Load,
@@ -352,18 +349,18 @@ Module(
                     msg: Some(
                         If(
                             ExprIf {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 169..185,
                                 test: BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 174..178,
                                         value: true,
                                     },
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 169..170,
                                         id: Name("x"),
                                         ctx: Load,
@@ -371,7 +368,7 @@ Module(
                                 ),
                                 orelse: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 184..185,
                                         id: Name("y"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap
index d649315b7d..7239c8b530 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/statement/assignment.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..729,
         body: [
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..13,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 0..1,
                                 id: Name("x"),
                                 ctx: Store,
@@ -26,12 +26,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..13,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5..6,
                                         value: Int(
                                             1,
@@ -40,7 +40,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..9,
                                         value: Int(
                                             2,
@@ -49,7 +49,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 11..12,
                                         value: Int(
                                             3,
@@ -65,17 +65,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 15..33,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 15..21,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 16..17,
                                             id: Name("x"),
                                             ctx: Store,
@@ -83,7 +83,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 19..20,
                                             id: Name("y"),
                                             ctx: Store,
@@ -97,12 +97,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..33,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..26,
                                         value: Int(
                                             1,
@@ -111,7 +111,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 28..29,
                                         value: Int(
                                             2,
@@ -120,7 +120,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 31..32,
                                         value: Int(
                                             3,
@@ -136,17 +136,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..53,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 35..41,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 36..37,
                                             id: Name("x"),
                                             ctx: Store,
@@ -154,7 +154,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 39..40,
                                             id: Name("y"),
                                             ctx: Store,
@@ -167,12 +167,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..53,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 45..46,
                                         value: Int(
                                             1,
@@ -181,7 +181,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 48..49,
                                         value: Int(
                                             2,
@@ -190,7 +190,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             3,
@@ -206,16 +206,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..70,
                     targets: [
                         Attribute(
                             ExprAttribute {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 55..58,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..56,
                                         id: Name("x"),
                                         ctx: Load,
@@ -224,7 +224,7 @@ Module(
                                 attr: Identifier {
                                     id: Name("y"),
                                     range: 57..58,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 ctx: Store,
                             },
@@ -232,12 +232,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..70,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 62..63,
                                         value: Int(
                                             1,
@@ -246,7 +246,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 65..66,
                                         value: Int(
                                             2,
@@ -255,7 +255,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 68..69,
                                         value: Int(
                                             3,
@@ -271,16 +271,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 72..88,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 72..76,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 72..73,
                                         id: Name("x"),
                                         ctx: Load,
@@ -288,7 +288,7 @@ Module(
                                 ),
                                 slice: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
                                         id: Name("y"),
                                         ctx: Load,
@@ -300,12 +300,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 79..88,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..81,
                                         value: Int(
                                             1,
@@ -314,7 +314,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..84,
                                         value: Int(
                                             2,
@@ -323,7 +323,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 86..87,
                                         value: Int(
                                             3,
@@ -339,17 +339,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 90..109,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 90..97,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 91..92,
                                             id: Name("x"),
                                             ctx: Store,
@@ -357,11 +357,11 @@ Module(
                                     ),
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 94..96,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 95..96,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -378,12 +378,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 100..109,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 101..102,
                                         value: Int(
                                             1,
@@ -392,7 +392,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 104..105,
                                         value: Int(
                                             2,
@@ -401,7 +401,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 107..108,
                                         value: Int(
                                             3,
@@ -417,17 +417,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 259..280,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 259..268,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 260..261,
                                             id: Name("x"),
                                             ctx: Store,
@@ -435,7 +435,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 263..264,
                                             id: Name("y"),
                                             ctx: Store,
@@ -443,7 +443,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 266..267,
                                             id: Name("z"),
                                             ctx: Store,
@@ -456,12 +456,12 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 271..280,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 272..273,
                                         value: Int(
                                             1,
@@ -470,7 +470,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 275..276,
                                         value: Int(
                                             2,
@@ -479,7 +479,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 278..279,
                                         value: Int(
                                             3,
@@ -494,17 +494,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 282..303,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 282..291,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 283..284,
                                             id: Name("x"),
                                             ctx: Store,
@@ -512,7 +512,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 286..287,
                                             id: Name("y"),
                                             ctx: Store,
@@ -520,7 +520,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 289..290,
                                             id: Name("z"),
                                             ctx: Store,
@@ -534,12 +534,12 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 294..303,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 295..296,
                                         value: Int(
                                             1,
@@ -548,7 +548,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 298..299,
                                         value: Int(
                                             2,
@@ -557,7 +557,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 301..302,
                                         value: Int(
                                             3,
@@ -573,16 +573,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 304..313,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 304..308,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 304..305,
                                         id: Name("x"),
                                         ctx: Load,
@@ -590,7 +590,7 @@ Module(
                                 ),
                                 slice: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 306..307,
                                         value: Int(
                                             0,
@@ -603,7 +603,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 311..313,
                             value: Int(
                                 42,
@@ -614,16 +614,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 410..419,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 410..414,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 410..411,
                                         value: Int(
                                             5,
@@ -632,7 +632,7 @@ Module(
                                 ),
                                 slice: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 412..413,
                                         value: Int(
                                             0,
@@ -645,7 +645,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 417..419,
                             value: Int(
                                 42,
@@ -656,16 +656,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 420..433,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 420..426,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 420..421,
                                         id: Name("x"),
                                         ctx: Load,
@@ -673,12 +673,12 @@ Module(
                                 ),
                                 slice: Slice(
                                     ExprSlice {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 422..425,
                                         lower: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 422..423,
                                                     value: Int(
                                                         1,
@@ -689,7 +689,7 @@ Module(
                                         upper: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 424..425,
                                                     value: Int(
                                                         2,
@@ -706,12 +706,12 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 429..433,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 430..432,
                                         value: Int(
                                             42,
@@ -726,16 +726,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 529..542,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 529..535,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 529..530,
                                         value: Int(
                                             5,
@@ -744,12 +744,12 @@ Module(
                                 ),
                                 slice: Slice(
                                     ExprSlice {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 531..534,
                                         lower: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 531..532,
                                                     value: Int(
                                                         1,
@@ -760,7 +760,7 @@ Module(
                                         upper: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 533..534,
                                                     value: Int(
                                                         2,
@@ -777,12 +777,12 @@ Module(
                     ],
                     value: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 538..542,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 539..541,
                                         value: Int(
                                             42,
@@ -797,16 +797,16 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 544..556,
                     targets: [
                         Attribute(
                             ExprAttribute {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 544..551,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 544..547,
                                         id: Name("foo"),
                                         ctx: Load,
@@ -815,7 +815,7 @@ Module(
                                 attr: Identifier {
                                     id: Name("bar"),
                                     range: 548..551,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 ctx: Store,
                             },
@@ -823,7 +823,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 554..556,
                             value: Int(
                                 42,
@@ -834,27 +834,28 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 658..670,
                     targets: [
                         Attribute(
                             ExprAttribute {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 658..665,
                                 value: StringLiteral(
                                     ExprStringLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 658..663,
                                         value: StringLiteralValue {
                                             inner: Single(
                                                 StringLiteral {
                                                     range: 658..663,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "foo",
                                                     flags: StringLiteralFlags {
                                                         quote_style: Double,
                                                         prefix: Empty,
                                                         triple_quoted: false,
+                                                        unclosed: false,
                                                     },
                                                 },
                                             ),
@@ -864,7 +865,7 @@ Module(
                                 attr: Identifier {
                                     id: Name("y"),
                                     range: 664..665,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 ctx: Store,
                             },
@@ -872,7 +873,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 668..670,
                             value: Int(
                                 42,
@@ -883,12 +884,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 672..680,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 672..675,
                                 id: Name("foo"),
                                 ctx: Store,
@@ -897,7 +898,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 678..680,
                             value: Int(
                                 42,
@@ -908,12 +909,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 682..695,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 682..684,
                                 elts: [],
                                 ctx: Store,
@@ -922,16 +923,16 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 687..695,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 688..693,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 689..693,
                                                 id: Name("data"),
                                                 ctx: Load,
@@ -949,12 +950,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 696..709,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 696..698,
                                 elts: [],
                                 ctx: Store,
@@ -964,16 +965,16 @@ Module(
                     ],
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 701..709,
                             elts: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 702..707,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 703..707,
                                                 id: Name("data"),
                                                 ctx: Load,
@@ -991,17 +992,17 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 710..719,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 710..714,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 710..711,
                                             id: Name("a"),
                                             ctx: Store,
@@ -1009,7 +1010,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 713..714,
                                             id: Name("b"),
                                             ctx: Store,
@@ -1023,7 +1024,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 717..719,
                             id: Name("ab"),
                             ctx: Load,
@@ -1033,12 +1034,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 720..729,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 720..721,
                                 id: Name("a"),
                                 ctx: Store,
@@ -1046,7 +1047,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 724..725,
                                 id: Name("b"),
                                 ctx: Store,
@@ -1055,7 +1056,7 @@ Module(
                     ],
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 728..729,
                             id: Name("c"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap
index aabb6b245b..3b4ad5727e 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/augmented_assign
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..212,
         body: [
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 0..1,
                             id: Name("x"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             value: Int(
                                 1,
@@ -36,15 +36,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..23,
                     target: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 7..10,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 7..8,
                                     id: Name("x"),
                                     ctx: Load,
@@ -53,7 +53,7 @@ Module(
                             attr: Identifier {
                                 id: Name("y"),
                                 range: 9..10,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Store,
                         },
@@ -61,12 +61,12 @@ Module(
                     op: Add,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..23,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 15..16,
                                         value: Int(
                                             1,
@@ -75,7 +75,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 18..19,
                                         value: Int(
                                             2,
@@ -84,7 +84,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 21..22,
                                         value: Int(
                                             3,
@@ -100,15 +100,15 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..41,
                     target: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..28,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 24..25,
                                     id: Name("x"),
                                     ctx: Load,
@@ -116,7 +116,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 26..27,
                                     id: Name("y"),
                                     ctx: Load,
@@ -128,12 +128,12 @@ Module(
                     op: Add,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 32..41,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 33..34,
                                         value: Int(
                                             1,
@@ -142,7 +142,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 36..37,
                                         value: Int(
                                             2,
@@ -151,7 +151,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..40,
                                         value: Int(
                                             3,
@@ -167,11 +167,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..92,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 86..87,
                             id: Name("x"),
                             ctx: Store,
@@ -180,7 +180,7 @@ Module(
                     op: Add,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 91..92,
                             value: Int(
                                 1,
@@ -191,11 +191,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..99,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..94,
                             id: Name("x"),
                             ctx: Store,
@@ -204,7 +204,7 @@ Module(
                     op: Sub,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 98..99,
                             value: Int(
                                 1,
@@ -215,11 +215,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 100..106,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 100..101,
                             id: Name("x"),
                             ctx: Store,
@@ -228,7 +228,7 @@ Module(
                     op: Mult,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 105..106,
                             value: Int(
                                 1,
@@ -239,11 +239,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 107..113,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 107..108,
                             id: Name("x"),
                             ctx: Store,
@@ -252,7 +252,7 @@ Module(
                     op: Div,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 112..113,
                             value: Int(
                                 1,
@@ -263,11 +263,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 114..121,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 114..115,
                             id: Name("x"),
                             ctx: Store,
@@ -276,7 +276,7 @@ Module(
                     op: FloorDiv,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..121,
                             value: Int(
                                 1,
@@ -287,11 +287,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 122..128,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..123,
                             id: Name("x"),
                             ctx: Store,
@@ -300,7 +300,7 @@ Module(
                     op: Mod,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 127..128,
                             value: Int(
                                 1,
@@ -311,11 +311,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 129..136,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 129..130,
                             id: Name("x"),
                             ctx: Store,
@@ -324,7 +324,7 @@ Module(
                     op: Pow,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 135..136,
                             value: Int(
                                 1,
@@ -335,11 +335,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..143,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 137..138,
                             id: Name("x"),
                             ctx: Store,
@@ -348,7 +348,7 @@ Module(
                     op: BitAnd,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 142..143,
                             value: Int(
                                 1,
@@ -359,11 +359,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 144..150,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 144..145,
                             id: Name("x"),
                             ctx: Store,
@@ -372,7 +372,7 @@ Module(
                     op: BitOr,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 149..150,
                             value: Int(
                                 1,
@@ -383,11 +383,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 151..157,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 151..152,
                             id: Name("x"),
                             ctx: Store,
@@ -396,7 +396,7 @@ Module(
                     op: BitXor,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 156..157,
                             value: Int(
                                 1,
@@ -407,11 +407,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 158..165,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 158..159,
                             id: Name("x"),
                             ctx: Store,
@@ -420,7 +420,7 @@ Module(
                     op: LShift,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 164..165,
                             value: Int(
                                 1,
@@ -431,11 +431,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 166..173,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 166..167,
                             id: Name("x"),
                             ctx: Store,
@@ -444,7 +444,7 @@ Module(
                     op: RShift,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 172..173,
                             value: Int(
                                 1,
@@ -455,11 +455,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 174..180,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 174..175,
                             id: Name("x"),
                             ctx: Store,
@@ -468,7 +468,7 @@ Module(
                     op: MatMult,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 179..180,
                             value: Int(
                                 1,
@@ -479,11 +479,11 @@ Module(
             ),
             AugAssign(
                 StmtAugAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 190..212,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 190..191,
                             id: Name("a"),
                             ctx: Store,
@@ -492,15 +492,15 @@ Module(
                     op: FloorDiv,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 196..212,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 197..202,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 197..198,
                                             id: Name("a"),
                                             ctx: Load,
@@ -509,7 +509,7 @@ Module(
                                     op: Add,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 201..202,
                                             id: Name("b"),
                                             ctx: Load,
@@ -520,11 +520,11 @@ Module(
                             op: Sub,
                             right: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 206..212,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 206..207,
                                             id: Name("c"),
                                             ctx: Load,
@@ -533,7 +533,7 @@ Module(
                                     op: Pow,
                                     right: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 211..212,
                                             value: Int(
                                                 2,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap
index 9882e26371..9ce6fb674c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap
@@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/valid/statement/class.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..1023,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..19,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 6..10,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 16..19,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 16..19,
                                     },
                                 ),
@@ -40,19 +40,19 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..80,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 28..32,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 32..34,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -60,33 +60,31 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 44..80,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("__init__"),
                                     range: 48..56,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 56..62,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 57..61,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 57..61,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("self"),
                                                     range: 57..61,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -101,7 +99,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 76..80,
                                         },
                                     ),
@@ -113,27 +111,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 83..116,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 89..93,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 93..107,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Starred(
                                     ExprStarred {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..101,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 100..101,
                                                 id: Name("A"),
                                                 ctx: Load,
@@ -146,17 +144,17 @@ Module(
                             keywords: [
                                 Keyword {
                                     range: 94..97,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     arg: Some(
                                         Identifier {
                                             id: Name("a"),
                                             range: 94..95,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..97,
                                             value: Int(
                                                 1,
@@ -166,11 +164,11 @@ Module(
                                 },
                                 Keyword {
                                     range: 103..106,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     arg: None,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 105..106,
                                             id: Name("k"),
                                             ctx: Load,
@@ -183,11 +181,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 113..116,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 113..116,
                                     },
                                 ),
@@ -198,34 +196,32 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..168,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 125..129,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 135..168,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("method"),
                                     range: 139..145,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 145..147,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -236,17 +232,17 @@ Module(
                                 body: [
                                     Assign(
                                         StmtAssign {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 157..168,
                                             targets: [
                                                 Tuple(
                                                     ExprTuple {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 157..161,
                                                         elts: [
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 157..158,
                                                                     id: Name("a"),
                                                                     ctx: Store,
@@ -254,7 +250,7 @@ Module(
                                                             ),
                                                             Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 160..161,
                                                                     id: Name("b"),
                                                                     ctx: Store,
@@ -268,7 +264,7 @@ Module(
                                             ],
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 164..168,
                                                     id: Name("data"),
                                                     ctx: Load,
@@ -284,23 +280,23 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 171..289,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 177..181,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 181..187,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 182..183,
                                         id: Name("A"),
                                         ctx: Load,
@@ -308,7 +304,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 185..186,
                                         id: Name("B"),
                                         ctx: Load,
@@ -321,33 +317,31 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 193..225,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("__init__"),
                                     range: 197..205,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 205..211,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 206..210,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 206..210,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("self"),
                                                     range: 206..210,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -362,7 +356,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 221..225,
                                         },
                                     ),
@@ -371,33 +365,31 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 231..289,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("method_with_default"),
                                     range: 235..254,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 254..275,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 255..259,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 255..259,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("self"),
                                                     range: 255..259,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -405,32 +397,33 @@ Module(
                                         },
                                         ParameterWithDefault {
                                             range: 261..274,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 261..264,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("arg"),
                                                     range: 261..264,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
                                             default: Some(
                                                 StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 265..274,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 265..274,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "default",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Single,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -448,7 +441,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 285..289,
                                         },
                                     ),
@@ -460,27 +453,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 331..351,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 337..341,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 341..344,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 342..343,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 342..343,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -492,7 +485,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 344..346,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -500,11 +493,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 348..351,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 348..351,
                                     },
                                 ),
@@ -515,33 +508,33 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 376..402,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 382..386,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 386..395,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 387..394,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 387..388,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 391..394,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -556,7 +549,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 395..397,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -564,11 +557,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 399..402,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 399..402,
                                     },
                                 ),
@@ -579,32 +572,32 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 425..450,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 431..435,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 435..443,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 436..442,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 436..437,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 439..442,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -620,7 +613,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 443..445,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -628,11 +621,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 447..450,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 447..450,
                                     },
                                 ),
@@ -643,36 +636,36 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 485..522,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 491..495,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 495..515,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 496..514,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 496..497,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 499..508,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 499..502,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -681,7 +674,7 @@ Module(
                                                     op: BitOr,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 505..508,
                                                             id: Name("str"),
                                                             ctx: Load,
@@ -693,7 +686,7 @@ Module(
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 511..514,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -708,7 +701,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 515..517,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -716,11 +709,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 519..522,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 519..522,
                                     },
                                 ),
@@ -731,37 +724,37 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 551..585,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 557..561,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 561..578,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 562..577,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 562..563,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 565..577,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 566..569,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -769,7 +762,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 571..576,
                                                                 id: Name("bytes"),
                                                                 ctx: Load,
@@ -790,7 +783,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 578..580,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -798,11 +791,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 582..585,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 582..585,
                                     },
                                 ),
@@ -813,27 +806,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 606..629,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 612..616,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 616..622,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 617..618,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 617..618,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -841,12 +834,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 620..621,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 620..621,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -858,7 +851,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 622..624,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -866,11 +859,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 626..629,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 626..629,
                                     },
                                 ),
@@ -881,27 +874,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 648..672,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 654..658,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 658..665,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 659..660,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 659..660,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -909,12 +902,12 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 662..663,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 662..663,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -926,7 +919,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 665..667,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -934,11 +927,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 669..672,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 669..672,
                                     },
                                 ),
@@ -949,27 +942,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 689..711,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 695..699,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 699..704,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 700..703,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 701..703,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -980,7 +973,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 704..706,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -988,11 +981,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 708..711,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 708..711,
                                     },
                                 ),
@@ -1003,36 +996,36 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 741..789,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 747..751,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 751..782,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 752..781,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 753..755,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Subscript(
                                                 ExprSubscript {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 758..781,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 758..764,
                                                             id: Name("Unpack"),
                                                             ctx: Load,
@@ -1040,11 +1033,11 @@ Module(
                                                     ),
                                                     slice: Subscript(
                                                         ExprSubscript {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 765..780,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 765..770,
                                                                     id: Name("tuple"),
                                                                     ctx: Load,
@@ -1052,12 +1045,12 @@ Module(
                                                             ),
                                                             slice: Tuple(
                                                                 ExprTuple {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 771..779,
                                                                     elts: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 771..774,
                                                                                 id: Name("int"),
                                                                                 ctx: Load,
@@ -1065,7 +1058,7 @@ Module(
                                                                         ),
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 776..779,
                                                                                 id: Name("str"),
                                                                                 ctx: Load,
@@ -1091,7 +1084,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 782..784,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -1099,11 +1092,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 786..789,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 786..789,
                                     },
                                 ),
@@ -1114,40 +1107,40 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 827..868,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 833..837,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 837..861,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 838..860,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 839..841,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 844..860,
                                                     value: Subscript(
                                                         ExprSubscript {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 845..860,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 845..850,
                                                                     id: Name("tuple"),
                                                                     ctx: Load,
@@ -1155,12 +1148,12 @@ Module(
                                                             ),
                                                             slice: Tuple(
                                                                 ExprTuple {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 851..859,
                                                                     elts: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 851..854,
                                                                                 id: Name("int"),
                                                                                 ctx: Load,
@@ -1168,7 +1161,7 @@ Module(
                                                                         ),
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 856..859,
                                                                                 id: Name("str"),
                                                                                 ctx: Load,
@@ -1194,7 +1187,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 861..863,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -1202,11 +1195,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 865..868,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 865..868,
                                     },
                                 ),
@@ -1217,27 +1210,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 882..904,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 888..892,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 892..897,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 893..896,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 895..896,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -1248,7 +1241,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 897..899,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -1256,11 +1249,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 901..904,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 901..904,
                                     },
                                 ),
@@ -1271,37 +1264,37 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 931..966,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 937..941,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 941..959,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 942..958,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 944..945,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 948..958,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 949..952,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -1309,7 +1302,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 954..957,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -1328,7 +1321,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 959..961,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -1336,11 +1329,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 963..966,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 963..966,
                                     },
                                 ),
@@ -1351,27 +1344,27 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 982..1022,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("Test"),
                         range: 988..992,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 992..1012,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 993..994,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("X"),
                                             range: 993..994,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -1379,17 +1372,17 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 996..1002,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Y"),
                                             range: 996..997,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 999..1002,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -1401,24 +1394,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 1004..1006,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 1005..1006,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 1008..1011,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 1010..1011,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -1429,7 +1422,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 1012..1014,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -1437,7 +1430,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1018..1022,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap
index bc20d70fae..50f3cb4b0b 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/statement/delete.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..122,
         body: [
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..5,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 4..5,
                                 id: Name("x"),
                                 ctx: Del,
@@ -28,12 +28,12 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 6..13,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 11..12,
                                 id: Name("x"),
                                 ctx: Del,
@@ -44,12 +44,12 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..23,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 18..19,
                                 id: Name("a"),
                                 ctx: Del,
@@ -57,7 +57,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 21..22,
                                 id: Name("b"),
                                 ctx: Del,
@@ -68,12 +68,12 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..40,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..29,
                                 id: Name("a"),
                                 ctx: Del,
@@ -81,12 +81,12 @@ Module(
                         ),
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 31..37,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..33,
                                             id: Name("b"),
                                             ctx: Del,
@@ -94,7 +94,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 35..36,
                                             id: Name("c"),
                                             ctx: Del,
@@ -107,7 +107,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 39..40,
                                 id: Name("d"),
                                 ctx: Del,
@@ -118,17 +118,17 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 41..51,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 45..51,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 46..47,
                                             id: Name("a"),
                                             ctx: Del,
@@ -136,7 +136,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 49..50,
                                             id: Name("b"),
                                             ctx: Del,
@@ -151,17 +151,17 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 52..70,
                     targets: [
                         List(
                             ExprList {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 56..70,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 57..58,
                                             id: Name("a"),
                                             ctx: Del,
@@ -169,12 +169,12 @@ Module(
                                     ),
                                     List(
                                         ExprList {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 60..66,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 61..62,
                                                         id: Name("b"),
                                                         ctx: Del,
@@ -182,7 +182,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 64..65,
                                                         id: Name("c"),
                                                         ctx: Del,
@@ -194,7 +194,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 68..69,
                                             id: Name("d"),
                                             ctx: Del,
@@ -209,16 +209,16 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 71..78,
                     targets: [
                         Attribute(
                             ExprAttribute {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 75..78,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..76,
                                         id: Name("x"),
                                         ctx: Load,
@@ -227,7 +227,7 @@ Module(
                                 attr: Identifier {
                                     id: Name("y"),
                                     range: 77..78,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 ctx: Del,
                             },
@@ -237,16 +237,16 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..87,
                     targets: [
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 83..87,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..84,
                                         id: Name("x"),
                                         ctx: Load,
@@ -254,7 +254,7 @@ Module(
                                 ),
                                 slice: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 85..86,
                                         id: Name("y"),
                                         ctx: Load,
@@ -268,17 +268,17 @@ Module(
             ),
             Delete(
                 StmtDelete {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..121,
                     targets: [
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 92..121,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 98..99,
                                             id: Name("x"),
                                             ctx: Del,
@@ -286,11 +286,11 @@ Module(
                                     ),
                                     Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 105..108,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 105..106,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -299,18 +299,18 @@ Module(
                                             attr: Identifier {
                                                 id: Name("y"),
                                                 range: 107..108,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Del,
                                         },
                                     ),
                                     Subscript(
                                         ExprSubscript {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 114..118,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 114..115,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -318,7 +318,7 @@ Module(
                                             ),
                                             slice: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 116..117,
                                                     id: Name("y"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap
index a003c4896d..2687f08bc2 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap
@@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/statement/for.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..523,
         body: [
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4..10,
                             id: Name("target"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..18,
                             id: Name("iter"),
                             ctx: Load,
@@ -34,7 +34,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 24..28,
                             },
                         ),
@@ -44,12 +44,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..63,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..40,
                             id: Name("target"),
                             ctx: Store,
@@ -57,12 +57,12 @@ Module(
                     ),
                     iter: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..53,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 45..46,
                                         value: Int(
                                             1,
@@ -71,7 +71,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 48..49,
                                         value: Int(
                                             2,
@@ -80,7 +80,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 51..52,
                                         value: Int(
                                             3,
@@ -95,7 +95,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 59..63,
                             },
                         ),
@@ -105,16 +105,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..100,
                     is_async: false,
                     target: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 69..80,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 69..75,
                                     id: Name("target"),
                                     ctx: Load,
@@ -123,18 +123,18 @@ Module(
                             attr: Identifier {
                                 id: Name("attr"),
                                 range: 76..80,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Store,
                         },
                     ),
                     iter: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..90,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 84..88,
                                     id: Name("call"),
                                     ctx: Load,
@@ -142,7 +142,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 88..90,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -151,7 +151,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 96..100,
                             },
                         ),
@@ -161,16 +161,16 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 102..135,
                     is_async: false,
                     target: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 106..115,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 106..112,
                                     id: Name("target"),
                                     ctx: Load,
@@ -178,7 +178,7 @@ Module(
                             ),
                             slice: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 113..114,
                                     value: Int(
                                         0,
@@ -190,11 +190,11 @@ Module(
                     ),
                     iter: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 119..125,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 119..120,
                                     id: Name("x"),
                                     ctx: Load,
@@ -203,7 +203,7 @@ Module(
                             attr: Identifier {
                                 id: Name("attr"),
                                 range: 121..125,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -211,7 +211,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 131..135,
                             },
                         ),
@@ -221,12 +221,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..167,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 141..147,
                             id: Name("target"),
                             ctx: Store,
@@ -234,11 +234,11 @@ Module(
                     ),
                     iter: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 151..157,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 151..152,
                                     id: Name("x"),
                                     ctx: Load,
@@ -250,7 +250,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 156..157,
                                         id: Name("y"),
                                         ctx: Load,
@@ -262,7 +262,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 163..167,
                             },
                         ),
@@ -272,12 +272,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 169..200,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 173..179,
                             id: Name("target"),
                             ctx: Store,
@@ -285,13 +285,13 @@ Module(
                     ),
                     iter: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 183..190,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 183..184,
                                         id: Name("a"),
                                         ctx: Load,
@@ -299,7 +299,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 189..190,
                                         id: Name("b"),
                                         ctx: Load,
@@ -311,7 +311,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 196..200,
                             },
                         ),
@@ -321,17 +321,17 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 202..232,
                     is_async: false,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 206..214,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 206..207,
                                         id: Name("a"),
                                         ctx: Store,
@@ -339,7 +339,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 209..210,
                                         id: Name("b"),
                                         ctx: Store,
@@ -347,7 +347,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 212..213,
                                         id: Name("c"),
                                         ctx: Store,
@@ -360,7 +360,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 218..222,
                             id: Name("iter"),
                             ctx: Load,
@@ -369,7 +369,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 228..232,
                             },
                         ),
@@ -379,17 +379,17 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 234..262,
                     is_async: false,
                     target: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 238..244,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 239..240,
                                         id: Name("a"),
                                         ctx: Store,
@@ -397,7 +397,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 242..243,
                                         id: Name("b"),
                                         ctx: Store,
@@ -410,7 +410,7 @@ Module(
                     ),
                     iter: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 248..252,
                             id: Name("iter"),
                             ctx: Load,
@@ -419,7 +419,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 258..262,
                             },
                         ),
@@ -429,12 +429,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 264..294,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 268..274,
                             id: Name("target"),
                             ctx: Store,
@@ -442,12 +442,12 @@ Module(
                     ),
                     iter: List(
                         ExprList {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 278..284,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 279..280,
                                         value: Int(
                                             1,
@@ -456,7 +456,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 282..283,
                                         value: Int(
                                             2,
@@ -470,7 +470,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 290..294,
                             },
                         ),
@@ -480,12 +480,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 296..322,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 300..306,
                             id: Name("target"),
                             ctx: Store,
@@ -493,11 +493,11 @@ Module(
                     ),
                     iter: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 310..317,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 316..317,
                                     id: Name("x"),
                                     ctx: Load,
@@ -508,11 +508,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 319..322,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 319..322,
                                     },
                                 ),
@@ -524,12 +524,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 323..353,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 327..333,
                             id: Name("target"),
                             ctx: Store,
@@ -537,26 +537,24 @@ Module(
                     ),
                     iter: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 337..348,
                             parameters: Some(
                                 Parameters {
                                     range: 344..345,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 344..345,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 344..345,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 344..345,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -570,7 +568,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 347..348,
                                     id: Name("x"),
                                     ctx: Load,
@@ -581,11 +579,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 350..353,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 350..353,
                                     },
                                 ),
@@ -597,12 +595,12 @@ Module(
             ),
             For(
                 StmtFor {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 354..389,
                     is_async: false,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 358..364,
                             id: Name("target"),
                             ctx: Store,
@@ -610,18 +608,18 @@ Module(
                     ),
                     iter: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 368..384,
                             test: BooleanLiteral(
                                 ExprBooleanLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 373..377,
                                     value: true,
                                 },
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 368..369,
                                     id: Name("x"),
                                     ctx: Load,
@@ -629,7 +627,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 383..384,
                                     id: Name("y"),
                                     ctx: Load,
@@ -640,11 +638,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 386..389,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 386..389,
                                     },
                                 ),
@@ -656,11 +654,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 391..522,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 394..395,
                             id: Name("x"),
                             ctx: Load,
@@ -669,12 +667,12 @@ Module(
                     body: [
                         For(
                             StmtFor {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 401..433,
                                 is_async: false,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 405..411,
                                         id: Name("target"),
                                         ctx: Store,
@@ -682,7 +680,7 @@ Module(
                                 ),
                                 iter: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 415..419,
                                         id: Name("iter"),
                                         ctx: Load,
@@ -691,7 +689,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 429..433,
                                         },
                                     ),
@@ -703,12 +701,12 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 508..522,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 518..522,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap
index d6f6e50158..c962949c16 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/valid/statement/from_import.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..259,
         body: [
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 5..6,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 14..15,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 14..15,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -38,17 +38,17 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 27..42,
                     module: None,
                     names: [
                         Alias {
                             range: 41..42,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 41..42,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -58,45 +58,45 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..85,
                     module: Some(
                         Identifier {
                             id: Name("foo.bar"),
                             range: 48..55,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 63..71,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("baz"),
                                 range: 63..66,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("b"),
                                     range: 70..71,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
                         Alias {
                             range: 73..85,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("FooBar"),
                                 range: 73..79,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("fb"),
                                     range: 83..85,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -106,23 +106,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..102,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 92..93,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 101..102,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 101..102,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -132,17 +132,17 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 103..120,
                     module: None,
                     names: [
                         Alias {
                             range: 119..120,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 119..120,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -152,17 +152,17 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 121..161,
                     module: None,
                     names: [
                         Alias {
                             range: 160..161,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("d"),
                                 range: 160..161,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -172,23 +172,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 162..207,
                     module: Some(
                         Identifier {
                             id: Name("a.b.c"),
                             range: 193..198,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 206..207,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("d"),
                                 range: 206..207,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -198,49 +198,49 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 208..242,
                     module: Some(
                         Identifier {
                             id: Name("module"),
                             range: 213..219,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 228..229,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 228..229,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 231..237,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 231..232,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("B"),
                                     range: 236..237,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
                         Alias {
                             range: 239..240,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 239..240,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -250,23 +250,23 @@ Module(
             ),
             ImportFrom(
                 StmtImportFrom {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 243..258,
                     module: Some(
                         Identifier {
                             id: Name("a"),
                             range: 248..249,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                         },
                     ),
                     names: [
                         Alias {
                             range: 257..258,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("*"),
                                 range: 257..258,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap
index d2b7caef14..b115bcc409 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/valid/statement/function.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..2399,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..29,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("no_parameters"),
                         range: 4..17,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 17..19,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -37,7 +35,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 25..29,
                             },
                         ),
@@ -46,33 +44,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..76,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_parameters"),
                         range: 36..57,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 57..66,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 58..59,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 58..59,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 58..59,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -80,14 +76,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 61..62,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 61..62,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 61..62,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -95,14 +91,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 64..65,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 64..65,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 64..65,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -117,7 +113,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 72..76,
                             },
                         ),
@@ -126,33 +122,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..149,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_parameters_with_default_values"),
                         range: 83..124,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 124..139,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 125..126,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 125..126,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 125..126,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -160,21 +154,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 128..132,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 128..129,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 128..129,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 130..132,
                                             value: Int(
                                                 20,
@@ -185,21 +179,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 134..138,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 134..135,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 134..135,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 136..138,
                                             value: Int(
                                                 30,
@@ -217,7 +211,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 145..149,
                             },
                         ),
@@ -226,32 +220,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 152..226,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_parameters_with_default_values2"),
                         range: 156..198,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 198..216,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 199..200,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 199..200,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 199..200,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -259,21 +251,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 202..206,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 202..203,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 202..203,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 204..206,
                                             value: Int(
                                                 20,
@@ -286,21 +278,21 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 211..215,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 211..212,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 211..212,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 213..215,
                                             value: Int(
                                                 30,
@@ -318,7 +310,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 222..226,
                             },
                         ),
@@ -327,32 +319,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 229..296,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_only_and_positional_parameters"),
                         range: 233..274,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 274..286,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 275..276,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 275..276,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 275..276,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -362,14 +352,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 281..282,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 281..282,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 281..282,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -377,14 +367,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 284..285,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 284..285,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 284..285,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -399,7 +389,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 292..296,
                             },
                         ),
@@ -408,32 +398,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 299..393,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("pos_args_with_defaults_and_varargs_and_kwargs"),
                         range: 303..348,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 348..383,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 349..350,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 349..350,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 349..350,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -441,21 +429,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 352..356,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 352..353,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 352..353,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 354..356,
                                             value: Int(
                                                 20,
@@ -468,21 +456,21 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 361..365,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 361..362,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 361..362,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 363..365,
                                             value: Int(
                                                 30,
@@ -495,11 +483,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 367..372,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 368..372,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -508,11 +496,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 374..382,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 376..382,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -522,7 +510,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 389..393,
                             },
                         ),
@@ -531,35 +519,33 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 396..445,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("keyword_only_parameters"),
                         range: 400..423,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 423..435,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 427..428,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 427..428,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 427..428,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -567,14 +553,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 430..431,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 430..431,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 430..431,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -582,14 +568,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 433..434,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 433..434,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 433..434,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -602,7 +588,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 441..445,
                             },
                         ),
@@ -611,35 +597,33 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 448..517,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("keyword_only_parameters_with_defaults"),
                         range: 452..489,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 489..507,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 493..494,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 493..494,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 493..494,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -647,21 +631,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 496..500,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 496..497,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 496..497,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 498..500,
                                             value: Int(
                                                 20,
@@ -672,21 +656,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 502..506,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 502..503,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 502..503,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 504..506,
                                             value: Int(
                                                 30,
@@ -702,7 +686,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 513..517,
                             },
                         ),
@@ -711,31 +695,29 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 520..594,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("kw_only_args_with_defaults_and_varargs"),
                         range: 524..562,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 562..584,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 563..568,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 564..568,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -743,14 +725,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 570..571,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 570..571,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 570..571,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -758,21 +740,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 573..577,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 573..574,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 573..574,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 575..577,
                                             value: Int(
                                                 20,
@@ -783,21 +765,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 579..583,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 579..580,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 579..580,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 581..583,
                                             value: Int(
                                                 30,
@@ -813,7 +795,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 590..594,
                             },
                         ),
@@ -822,35 +804,33 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 597..676,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("kw_only_args_with_defaults_and_kwargs"),
                         range: 601..638,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 638..666,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 642..643,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 642..643,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 642..643,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -858,21 +838,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 645..649,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 645..646,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 645..646,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 647..649,
                                             value: Int(
                                                 20,
@@ -883,21 +863,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 651..655,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 651..652,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 651..652,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 653..655,
                                             value: Int(
                                                 30,
@@ -910,11 +890,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 657..665,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 659..665,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -924,7 +904,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 672..676,
                             },
                         ),
@@ -933,31 +913,29 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 679..774,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("kw_only_args_with_defaults_and_varargs_and_kwargs"),
                         range: 683..732,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 732..764,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 733..738,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 734..738,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -965,14 +943,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 740..741,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 740..741,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 740..741,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -980,21 +958,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 743..747,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 743..744,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 743..744,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 745..747,
                                             value: Int(
                                                 20,
@@ -1005,21 +983,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 749..753,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 749..750,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 749..750,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 751..753,
                                             value: Int(
                                                 30,
@@ -1032,11 +1010,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 755..763,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 757..763,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -1046,7 +1024,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 770..774,
                             },
                         ),
@@ -1055,32 +1033,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 777..835,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("pos_and_kw_only_args"),
                         range: 781..801,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 801..825,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 802..803,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 802..803,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 802..803,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1088,14 +1064,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 805..806,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 805..806,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 805..806,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1105,14 +1081,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 811..812,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 811..812,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 811..812,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1123,14 +1099,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 817..818,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 817..818,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 817..818,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1138,14 +1114,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 820..821,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 820..821,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 820..821,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1153,14 +1129,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 823..824,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 823..824,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 823..824,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1173,7 +1149,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 831..835,
                             },
                         ),
@@ -1182,32 +1158,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 838..916,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("pos_and_kw_only_args_with_defaults"),
                         range: 842..876,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 876..906,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 877..878,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 877..878,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 877..878,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1215,14 +1189,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 880..881,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 880..881,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 880..881,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1232,14 +1206,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 886..887,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 886..887,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 886..887,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1250,14 +1224,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 892..893,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 892..893,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 892..893,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1265,21 +1239,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 895..899,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 895..896,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 895..896,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 897..899,
                                             value: Int(
                                                 20,
@@ -1290,21 +1264,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 901..905,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 901..902,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 901..902,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 903..905,
                                             value: Int(
                                                 30,
@@ -1320,7 +1294,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 912..916,
                             },
                         ),
@@ -1329,32 +1303,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 919..1013,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("pos_and_kw_only_args_with_defaults_and_varargs"),
                         range: 923..969,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 969..1003,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 970..971,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 970..971,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 970..971,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1362,14 +1334,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 973..974,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 973..974,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 973..974,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1379,14 +1351,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 979..980,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 979..980,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 979..980,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1396,11 +1368,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 982..987,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 983..987,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -1408,14 +1380,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 989..990,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 989..990,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 989..990,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1423,21 +1395,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 992..996,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 992..993,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 992..993,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 994..996,
                                             value: Int(
                                                 20,
@@ -1448,21 +1420,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 998..1002,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 998..999,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 998..999,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1000..1002,
                                             value: Int(
                                                 30,
@@ -1478,7 +1450,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1009..1013,
                             },
                         ),
@@ -1487,32 +1459,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1016..1121,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("pos_and_kw_only_args_with_defaults_and_kwargs"),
                         range: 1020..1065,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1065..1111,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 1071..1072,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1071..1072,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1071..1072,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1520,14 +1490,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1074..1075,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1074..1075,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 1074..1075,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1537,14 +1507,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 1080..1081,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1080..1081,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 1080..1081,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1555,14 +1525,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 1086..1087,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1086..1087,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 1086..1087,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1570,21 +1540,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1089..1093,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1089..1090,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 1089..1090,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1091..1093,
                                             value: Int(
                                                 20,
@@ -1595,21 +1565,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1095..1099,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1095..1096,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 1095..1096,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1097..1099,
                                             value: Int(
                                                 30,
@@ -1622,11 +1592,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 1101..1109,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 1103..1109,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -1636,7 +1606,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1117..1121,
                             },
                         ),
@@ -1645,32 +1615,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1124..1245,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs"),
                         range: 1128..1185,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1185..1235,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 1191..1192,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1191..1192,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1191..1192,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1678,14 +1646,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1194..1195,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1194..1195,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 1194..1195,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1695,14 +1663,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 1200..1201,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1200..1201,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 1200..1201,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1712,11 +1680,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 1203..1208,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 1204..1208,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -1724,14 +1692,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 1210..1211,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1210..1211,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 1210..1211,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1739,21 +1707,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1213..1217,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1213..1214,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 1213..1214,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1215..1217,
                                             value: Int(
                                                 20,
@@ -1764,21 +1732,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1219..1223,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1219..1220,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 1219..1220,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1221..1223,
                                             value: Int(
                                                 30,
@@ -1791,11 +1759,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 1225..1233,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 1227..1233,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -1805,7 +1773,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1241..1245,
                             },
                         ),
@@ -1814,33 +1782,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1248..1316,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_and_keyword_parameters"),
                         range: 1252..1285,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1285..1306,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1286..1287,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1286..1287,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1286..1287,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1848,14 +1814,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1289..1290,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1289..1290,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 1289..1290,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1863,14 +1829,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1292..1293,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1292..1293,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 1292..1293,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1881,14 +1847,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 1298..1299,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1298..1299,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 1298..1299,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1896,14 +1862,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1301..1302,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1301..1302,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 1301..1302,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1911,14 +1877,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1304..1305,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1304..1305,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 1304..1305,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1931,7 +1897,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1312..1316,
                             },
                         ),
@@ -1940,33 +1906,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1319..1407,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_and_keyword_parameters_with_defaults"),
                         range: 1323..1370,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1370..1397,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1371..1372,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1371..1372,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1371..1372,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1974,14 +1938,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1374..1375,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1374..1375,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 1374..1375,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -1989,14 +1953,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1377..1378,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1377..1378,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 1377..1378,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2007,14 +1971,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 1383..1384,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1383..1384,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 1383..1384,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2022,21 +1986,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1386..1390,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1386..1387,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 1386..1387,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1388..1390,
                                             value: Int(
                                                 20,
@@ -2047,21 +2011,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1392..1396,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1392..1393,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 1392..1393,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1394..1396,
                                             value: Int(
                                                 30,
@@ -2077,7 +2041,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1403..1407,
                             },
                         ),
@@ -2086,33 +2050,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1410..1520,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_and_keyword_parameters_with_defaults_and_varargs"),
                         range: 1414..1473,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1473..1510,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1479..1480,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1479..1480,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1479..1480,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2120,14 +2082,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1482..1483,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1482..1483,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 1482..1483,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2135,14 +2097,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1485..1486,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1485..1486,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 1485..1486,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2152,11 +2114,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 1488..1493,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 1489..1493,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -2164,14 +2126,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 1495..1496,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1495..1496,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 1495..1496,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2179,21 +2141,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1498..1502,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1498..1499,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 1498..1499,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1500..1502,
                                             value: Int(
                                                 20,
@@ -2204,21 +2166,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1504..1508,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1504..1505,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 1504..1505,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1506..1508,
                                             value: Int(
                                                 30,
@@ -2234,7 +2196,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1516..1520,
                             },
                         ),
@@ -2243,33 +2205,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1523..1654,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("positional_and_keyword_parameters_with_defaults_and_varargs_and_kwargs"),
                         range: 1527..1597,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1597..1644,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1603..1604,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1603..1604,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1603..1604,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2277,14 +2237,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1606..1607,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1606..1607,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 1606..1607,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2292,14 +2252,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1609..1610,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1609..1610,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 1609..1610,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2309,11 +2269,11 @@ Module(
                         vararg: Some(
                             Parameter {
                                 range: 1612..1617,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 1613..1617,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -2321,14 +2281,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 1619..1620,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1619..1620,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("d"),
                                         range: 1619..1620,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -2336,21 +2296,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1622..1626,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1622..1623,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("e"),
                                         range: 1622..1623,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1624..1626,
                                             value: Int(
                                                 20,
@@ -2361,21 +2321,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 1628..1632,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1628..1629,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("f"),
                                         range: 1628..1629,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1630..1632,
                                             value: Int(
                                                 30,
@@ -2388,11 +2348,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 1634..1642,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 1636..1642,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -2402,7 +2362,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1650..1654,
                             },
                         ),
@@ -2411,28 +2371,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1703..1735,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("func"),
                         range: 1707..1711,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 1711..1714,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1712..1713,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 1712..1713,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -2443,26 +2403,24 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 1714..1720,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1715..1719,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1715..1719,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1715..1716,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1718..1719,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -2480,7 +2438,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1724..1725,
                                 id: Name("T"),
                                 ctx: Load,
@@ -2490,7 +2448,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1731..1735,
                             },
                         ),
@@ -2499,33 +2457,33 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1738..1775,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("func"),
                         range: 1742..1746,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 1746..1754,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1747..1753,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 1747..1748,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1750..1753,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -2540,26 +2498,24 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 1754..1760,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1755..1759,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1755..1759,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1755..1756,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1758..1759,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -2577,7 +2533,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1764..1765,
                                 id: Name("T"),
                                 ctx: Load,
@@ -2587,7 +2543,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1771..1775,
                             },
                         ),
@@ -2596,38 +2552,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1778..1824,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("func"),
                         range: 1782..1786,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 1786..1803,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1787..1802,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 1787..1788,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1790..1802,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 1791..1794,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -2635,7 +2591,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 1796..1801,
                                                                 id: Name("bytes"),
                                                                 ctx: Load,
@@ -2655,26 +2611,24 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 1803..1809,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 1804..1808,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 1804..1808,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 1804..1805,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1807..1808,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -2692,7 +2646,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1813..1814,
                                 id: Name("T"),
                                 ctx: Load,
@@ -2702,7 +2656,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1820..1824,
                             },
                         ),
@@ -2711,28 +2665,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1827..1873,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("func"),
                         range: 1831..1835,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 1835..1840,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 1836..1839,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 1837..1839,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -2742,28 +2696,26 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 1840..1849,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 1841..1848,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("a"),
                                     range: 1842..1843,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1845..1848,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1846..1848,
                                                     id: Name("Ts"),
                                                     ctx: Load,
@@ -2781,11 +2733,11 @@ Module(
                     returns: Some(
                         Subscript(
                             ExprSubscript {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1853..1863,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1853..1858,
                                         id: Name("Tuple"),
                                         ctx: Load,
@@ -2793,16 +2745,16 @@ Module(
                                 ),
                                 slice: Tuple(
                                     ExprTuple {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1859..1862,
                                         elts: [
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1859..1862,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1860..1862,
                                                             id: Name("Ts"),
                                                             ctx: Load,
@@ -2823,7 +2775,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1869..1873,
                             },
                         ),
@@ -2832,28 +2784,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1876..1934,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("func"),
                         range: 1880..1884,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 1884..1889,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 1885..1888,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 1887..1888,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -2863,28 +2815,26 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 1889..1924,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 1890..1903,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 1891..1895,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1897..1903,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1897..1898,
                                                     id: Name("P"),
                                                     ctx: Load,
@@ -2893,7 +2843,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("args"),
                                                 range: 1899..1903,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -2905,20 +2855,20 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 1905..1923,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 1907..1913,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: Some(
                                     Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1915..1923,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1915..1916,
                                                     id: Name("P"),
                                                     ctx: Load,
@@ -2927,7 +2877,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("kwargs"),
                                                 range: 1917..1923,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -2940,7 +2890,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1930..1934,
                             },
                         ),
@@ -2949,28 +2899,28 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1937..1978,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("func"),
                         range: 1941..1945,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 1945..1966,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1946..1947,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 1946..1947,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -2978,17 +2928,17 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1949..1955,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 1949..1950,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1952..1955,
                                                     id: Name("str"),
                                                     ctx: Load,
@@ -3000,24 +2950,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 1957..1960,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 1958..1960,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 1962..1965,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 1964..1965,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -3027,9 +2977,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 1966..1968,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -3040,7 +2988,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1974..1978,
                             },
                         ),
@@ -3049,21 +2997,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1981..2000,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("ellipsis"),
                         range: 1985..1993,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 1993..1995,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -3074,11 +3020,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1997..2000,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1997..2000,
                                     },
                                 ),
@@ -3089,21 +3035,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2003..2064,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("multiple_statements"),
                         range: 2007..2026,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2026..2028,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -3113,7 +3057,7 @@ Module(
                     returns: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2032..2035,
                                 id: Name("int"),
                                 ctx: Load,
@@ -3123,15 +3067,15 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2041..2047,
                                 value: Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2041..2047,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2041..2045,
                                                 id: Name("call"),
                                                 ctx: Load,
@@ -3139,7 +3083,7 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 2045..2047,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [],
                                             keywords: [],
                                         },
@@ -3149,17 +3093,17 @@ Module(
                         ),
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2052..2056,
                             },
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2061..2064,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2061..2064,
                                     },
                                 ),
@@ -3170,31 +3114,29 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2067..2091,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2071..2074,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2074..2081,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 2075..2080,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 2076..2080,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -3206,7 +3148,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2087..2091,
                             },
                         ),
@@ -3215,21 +3157,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2094..2121,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2098..2101,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2101..2111,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -3237,11 +3177,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 2102..2110,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 2104..2110,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -3251,7 +3191,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2117..2121,
                             },
                         ),
@@ -3260,31 +3200,29 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2124..2158,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2128..2131,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2131..2148,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: Some(
                             Parameter {
                                 range: 2132..2137,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("args"),
                                     range: 2133..2137,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -3293,11 +3231,11 @@ Module(
                         kwarg: Some(
                             Parameter {
                                 range: 2139..2147,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 name: Identifier {
                                     id: Name("kwargs"),
                                     range: 2141..2147,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 annotation: None,
                             },
@@ -3307,7 +3245,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2154..2158,
                             },
                         ),
@@ -3316,32 +3254,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2161..2184,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2165..2168,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2168..2174,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 2169..2170,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2169..2170,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 2169..2170,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3357,7 +3293,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2180..2184,
                             },
                         ),
@@ -3366,32 +3302,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2187..2213,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2191..2194,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2194..2203,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 2195..2196,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2195..2196,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 2195..2196,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3401,14 +3335,14 @@ Module(
                         args: [
                             ParameterWithDefault {
                                 range: 2201..2202,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2201..2202,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 2201..2202,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3423,7 +3357,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2209..2213,
                             },
                         ),
@@ -3432,39 +3366,37 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2216..2242,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2220..2223,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2223..2232,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 2224..2227,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2224..2225,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 2224..2225,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2226..2227,
                                             value: Int(
                                                 1,
@@ -3483,7 +3415,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2238..2242,
                             },
                         ),
@@ -3492,32 +3424,30 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2245..2277,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2249..2252,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2252..2267,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [
                             ParameterWithDefault {
                                 range: 2253..2254,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2253..2254,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 2253..2254,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3525,14 +3455,14 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 2256..2257,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2256..2257,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 2256..2257,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3544,14 +3474,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 2265..2266,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2265..2266,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 2265..2266,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3564,7 +3494,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2273..2277,
                             },
                         ),
@@ -3573,40 +3503,38 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2280..2309,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2284..2287,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2287..2299,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 2288..2292,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2288..2290,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("kw"),
                                         range: 2288..2290,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2291..2292,
                                             value: Int(
                                                 1,
@@ -3620,14 +3548,14 @@ Module(
                         kwonlyargs: [
                             ParameterWithDefault {
                                 range: 2297..2298,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2297..2298,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 2297..2298,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3640,7 +3568,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2305..2309,
                             },
                         ),
@@ -3649,38 +3577,36 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2312..2357,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2316..2319,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2319..2347,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 2320..2326,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2320..2326,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("x"),
                                         range: 2320..2321,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2323..2326,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -3692,30 +3618,31 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 2328..2336,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2328..2336,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("y"),
                                         range: 2328..2329,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2331..2336,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 2331..2336,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "str",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -3728,23 +3655,23 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 2338..2346,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2338..2346,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("z"),
                                         range: 2338..2339,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2341..2346,
                                                 left: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2341..2342,
                                                         value: Int(
                                                             1,
@@ -3754,7 +3681,7 @@ Module(
                                                 op: Add,
                                                 right: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2345..2346,
                                                         value: Int(
                                                             2,
@@ -3776,7 +3703,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2353..2357,
                             },
                         ),
@@ -3785,33 +3712,31 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2360..2398,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("foo"),
                         range: 2364..2367,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 2367..2388,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 2368..2372,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2368..2372,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("self"),
                                         range: 2368..2372,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
@@ -3819,21 +3744,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 2374..2377,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2374..2375,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("a"),
                                         range: 2374..2375,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2376..2377,
                                             value: Int(
                                                 1,
@@ -3844,21 +3769,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 2379..2382,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2379..2380,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("b"),
                                         range: 2379..2380,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2381..2382,
                                             value: Int(
                                                 2,
@@ -3869,21 +3794,21 @@ Module(
                             },
                             ParameterWithDefault {
                                 range: 2384..2387,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 2384..2385,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("c"),
                                         range: 2384..2385,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: None,
                                 },
                                 default: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2386..2387,
                                             value: Int(
                                                 3,
@@ -3901,7 +3826,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 2394..2398,
                             },
                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap
index 51edcda294..8a4b8262da 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/if.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..375,
         body: [
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     test: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3..4,
                             value: Int(
                                 1,
@@ -26,11 +26,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 6..8,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 6..8,
                                         value: Int(
                                             10,
@@ -43,11 +43,11 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 9..19,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 14..15,
                                         value: Int(
                                             2,
@@ -58,11 +58,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 17..19,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 17..19,
                                                 value: Int(
                                                     20,
@@ -75,16 +75,16 @@ Module(
                         },
                         ElifElseClause {
                             range: 20..28,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 26..28,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 26..28,
                                                 value: Int(
                                                     30,
@@ -100,11 +100,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..52,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 33..37,
                             value: true,
                         },
@@ -112,11 +112,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..44,
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 43..44,
                                         value: Int(
                                             1,
@@ -127,11 +127,11 @@ Module(
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 49..52,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 49..52,
                                     },
                                 ),
@@ -143,15 +143,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..85,
                     test: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 56..61,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 56..57,
                                     id: Name("x"),
                                     ctx: Load,
@@ -163,7 +163,7 @@ Module(
                             comparators: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 60..61,
                                         value: Int(
                                             1,
@@ -176,11 +176,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 67..70,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 67..70,
                                     },
                                 ),
@@ -190,12 +190,12 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 71..85,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..85,
                                     },
                                 ),
@@ -206,11 +206,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..117,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..91,
                             id: Name("a"),
                             ctx: Load,
@@ -219,7 +219,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 97..101,
                             },
                         ),
@@ -227,11 +227,11 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 102..117,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 107..108,
                                         id: Name("b"),
                                         ctx: Load,
@@ -241,11 +241,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 114..117,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 114..117,
                                             },
                                         ),
@@ -258,17 +258,17 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 119..203,
                     test: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..129,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 122..123,
                                         id: Name("a"),
                                         ctx: Load,
@@ -276,7 +276,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 128..129,
                                         id: Name("b"),
                                         ctx: Load,
@@ -288,11 +288,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 135..138,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 135..138,
                                     },
                                 ),
@@ -302,11 +302,11 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 139..157,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 144..148,
                                         value: true,
                                     },
@@ -315,11 +315,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 154..157,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 154..157,
                                             },
                                         ),
@@ -329,11 +329,11 @@ Module(
                         },
                         ElifElseClause {
                             range: 158..173,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 163..164,
                                         id: Name("c"),
                                         ctx: Load,
@@ -343,11 +343,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 170..173,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 170..173,
                                             },
                                         ),
@@ -357,11 +357,11 @@ Module(
                         },
                         ElifElseClause {
                             range: 174..189,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 179..180,
                                         id: Name("d"),
                                         ctx: Load,
@@ -371,11 +371,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 186..189,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 186..189,
                                             },
                                         ),
@@ -385,20 +385,20 @@ Module(
                         },
                         ElifElseClause {
                             range: 190..203,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 200..203,
                                         value: Call(
                                             ExprCall {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 200..203,
                                                 func: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 200..201,
                                                         id: Name("f"),
                                                         ctx: Load,
@@ -406,7 +406,7 @@ Module(
                                                 ),
                                                 arguments: Arguments {
                                                     range: 201..203,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     args: [],
                                                     keywords: [],
                                                 },
@@ -421,15 +421,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 229..260,
                     test: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 232..238,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 232..233,
                                     id: Name("a"),
                                     ctx: Store,
@@ -437,7 +437,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 237..238,
                                     id: Name("b"),
                                     ctx: Load,
@@ -448,11 +448,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 240..243,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 240..243,
                                     },
                                 ),
@@ -462,15 +462,15 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 244..260,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 249..255,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 249..250,
                                                 id: Name("a"),
                                                 ctx: Store,
@@ -478,7 +478,7 @@ Module(
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 254..255,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -490,11 +490,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 257..260,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 257..260,
                                             },
                                         ),
@@ -507,30 +507,28 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 261..302,
                     test: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 264..275,
                             parameters: Some(
                                 Parameters {
                                     range: 271..272,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 271..272,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 271..272,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 271..272,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -544,7 +542,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 274..275,
                                     id: Name("x"),
                                     ctx: Load,
@@ -555,11 +553,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 277..280,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 277..280,
                                     },
                                 ),
@@ -569,30 +567,28 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 281..302,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Lambda(
                                     ExprLambda {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 286..297,
                                         parameters: Some(
                                             Parameters {
                                                 range: 293..294,
-                                                node_index: AtomicNodeIndex(
-                                                    0,
-                                                ),
+                                                node_index: NodeIndex(None),
                                                 posonlyargs: [],
                                                 args: [
                                                     ParameterWithDefault {
                                                         range: 293..294,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         parameter: Parameter {
                                                             range: 293..294,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             name: Identifier {
                                                                 id: Name("x"),
                                                                 range: 293..294,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             annotation: None,
                                                         },
@@ -606,7 +602,7 @@ Module(
                                         ),
                                         body: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 296..297,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -618,11 +614,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 299..302,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 299..302,
                                             },
                                         ),
@@ -635,15 +631,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 303..336,
                     test: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 306..313,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 312..313,
                                     id: Name("x"),
                                     ctx: Load,
@@ -654,11 +650,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 315..318,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 315..318,
                                     },
                                 ),
@@ -668,15 +664,15 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 319..336,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 324..331,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 330..331,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -688,11 +684,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 333..336,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 333..336,
                                             },
                                         ),
@@ -705,16 +701,16 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 337..374,
                     test: Yield(
                         ExprYield {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 341..348,
                             value: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 347..348,
                                         id: Name("x"),
                                         ctx: Load,
@@ -726,11 +722,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 351..354,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 351..354,
                                     },
                                 ),
@@ -740,16 +736,16 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 355..374,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: Some(
                                 Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 361..368,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 367..368,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -762,11 +758,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 371..374,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 371..374,
                                             },
                                         ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap
index 4d4d08b963..56388f8862 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/import.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..92,
         body: [
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..8,
                     names: [
                         Alias {
                             range: 7..8,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 7..8,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -30,16 +30,16 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 9..21,
                     names: [
                         Alias {
                             range: 16..21,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a.b.c"),
                                 range: 16..21,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -48,22 +48,22 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..39,
                     names: [
                         Alias {
                             range: 29..39,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a.b.c"),
                                 range: 29..34,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("d"),
                                     range: 38..39,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
@@ -72,36 +72,36 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 40..54,
                     names: [
                         Alias {
                             range: 47..48,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a"),
                                 range: 47..48,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 50..51,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("b"),
                                 range: 50..51,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
                         Alias {
                             range: 53..54,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("c"),
                                 range: 53..54,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: None,
                         },
@@ -110,38 +110,38 @@ Module(
             ),
             Import(
                 StmtImport {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 55..91,
                     names: [
                         Alias {
                             range: 62..74,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("foo.bar"),
                                 range: 62..69,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("a"),
                                     range: 73..74,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
                         Alias {
                             range: 76..91,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             name: Identifier {
                                 id: Name("a.b.c.d"),
                                 range: 76..83,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             asname: Some(
                                 Identifier {
                                     id: Name("abcd"),
                                     range: 87..91,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                             ),
                         },
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap
index 1a7192474d..496319ea71 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/match.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..5770,
         body: [
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..103,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..74,
                             id: Name("x"),
                             ctx: Load,
@@ -25,19 +25,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 80..103,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 85..88,
-                                    node_index: AtomicNodeIndex(..),
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 85..88,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 86..88,
                                                     value: Complex {
                                                         real: 0.0,
@@ -53,12 +53,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 98..103,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 98..99,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -67,7 +67,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 102..103,
                                                 value: Int(
                                                     0,
@@ -83,11 +83,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 126..167,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 132..133,
                             id: Name("x"),
                             ctx: Load,
@@ -96,14 +96,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 139..167,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 144..152,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 144..149,
                                             id: Name("bytes"),
                                             ctx: Load,
@@ -111,18 +111,18 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 149..152,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchAs(
                                                 PatternMatchAs {
+                                                    node_index: NodeIndex(None),
                                                     range: 150..151,
-                                                    node_index: AtomicNodeIndex(..),
                                                     pattern: None,
                                                     name: Some(
                                                         Identifier {
                                                             id: Name("z"),
                                                             range: 150..151,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                     ),
                                                 },
@@ -136,12 +136,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 162..167,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 162..163,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -150,7 +150,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 166..167,
                                                 value: Int(
                                                     0,
@@ -166,11 +166,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 190..260,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 196..197,
                             id: Name("x"),
                             ctx: Load,
@@ -179,14 +179,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 203..229,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 208..209,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 208..209,
                                             value: Int(
                                                 0,
@@ -198,7 +198,7 @@ Module(
                             guard: Some(
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 213..214,
                                         value: Int(
                                             0,
@@ -209,12 +209,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 224..229,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 224..225,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -223,7 +223,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 228..229,
                                                 value: Int(
                                                     0,
@@ -236,14 +236,14 @@ Module(
                         },
                         MatchCase {
                             range: 234..260,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 239..240,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 239..240,
                                             value: Int(
                                                 0,
@@ -255,7 +255,7 @@ Module(
                             guard: Some(
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 244..245,
                                         value: Int(
                                             1,
@@ -266,12 +266,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 255..260,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 255..256,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -280,7 +280,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 259..260,
                                                 value: Int(
                                                     1,
@@ -296,11 +296,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 283..332,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 289..290,
                             value: Int(
                                 3,
@@ -310,19 +310,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 296..332,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 301..314,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 301..302,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 301..302,
                                                         value: Int(
                                                             0,
@@ -333,11 +333,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 305..306,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 305..306,
                                                         value: Int(
                                                             1,
@@ -348,11 +348,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 309..310,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 309..310,
                                                         value: Int(
                                                             2,
@@ -363,11 +363,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 313..314,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 313..314,
                                                         value: Int(
                                                             3,
@@ -383,12 +383,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 324..332,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 324..325,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -397,7 +397,7 @@ Module(
                                         ],
                                         value: BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 328..332,
                                                 value: true,
                                             },
@@ -411,11 +411,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 355..403,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 361..362,
                             id: Name("x"),
                             ctx: Load,
@@ -424,24 +424,24 @@ Module(
                     cases: [
                         MatchCase {
                             range: 368..403,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 373..388,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 373..379,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 374..375,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 374..375,
                                                                     value: Int(
                                                                         0,
@@ -452,11 +452,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 377..378,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 377..378,
                                                                     value: Int(
                                                                         1,
@@ -470,16 +470,16 @@ Module(
                                         ),
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 382..388,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 383..384,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 383..384,
                                                                     value: Int(
                                                                         1,
@@ -490,11 +490,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 386..387,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 386..387,
                                                                     value: Int(
                                                                         0,
@@ -513,12 +513,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 398..403,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 398..399,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -527,7 +527,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 402..403,
                                                 value: Int(
                                                     0,
@@ -543,11 +543,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 445..523,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 451..452,
                             id: Name("x"),
                             ctx: Load,
@@ -556,16 +556,16 @@ Module(
                     cases: [
                         MatchCase {
                             range: 458..489,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 463..467,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 464..466,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
@@ -576,23 +576,24 @@ Module(
                             body: [
                                 Return(
                                     StmtReturn {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 477..489,
                                         value: Some(
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 484..489,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 484..489,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "seq",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -606,11 +607,11 @@ Module(
                         },
                         MatchCase {
                             range: 494..523,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 499..501,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [],
                                     patterns: [],
                                     rest: None,
@@ -620,23 +621,24 @@ Module(
                             body: [
                                 Return(
                                     StmtReturn {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 511..523,
                                         value: Some(
                                             StringLiteral(
                                                 ExprStringLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 518..523,
                                                     value: StringLiteralValue {
                                                         inner: Single(
                                                             StringLiteral {
                                                                 range: 518..523,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 value: "map",
                                                                 flags: StringLiteralFlags {
                                                                     quote_style: Double,
                                                                     prefix: Empty,
                                                                     triple_quoted: false,
+                                                                    unclosed: false,
                                                                 },
                                                             },
                                                         ),
@@ -653,11 +655,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 546..714,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 552..553,
                             id: Name("x"),
                             ctx: Load,
@@ -666,15 +668,15 @@ Module(
                     cases: [
                         MatchCase {
                             range: 559..594,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 564..579,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 565..566,
                                                 value: Int(
                                                     0,
@@ -685,16 +687,16 @@ Module(
                                     patterns: [
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 568..578,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 569..570,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 569..570,
                                                                     value: Int(
                                                                         1,
@@ -705,11 +707,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 572..573,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 572..573,
                                                                     value: Int(
                                                                         2,
@@ -720,8 +722,8 @@ Module(
                                                     ),
                                                     MatchMapping(
                                                         PatternMatchMapping {
+                                                            node_index: NodeIndex(None),
                                                             range: 575..577,
-                                                            node_index: AtomicNodeIndex(..),
                                                             keys: [],
                                                             patterns: [],
                                                             rest: None,
@@ -738,12 +740,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 589..594,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 589..590,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -752,7 +754,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 593..594,
                                                 value: Int(
                                                     0,
@@ -765,20 +767,20 @@ Module(
                         },
                         MatchCase {
                             range: 599..687,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 604..672,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 604..626,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 605..606,
                                                             value: Int(
                                                                 0,
@@ -789,21 +791,21 @@ Module(
                                                 patterns: [
                                                     MatchOr(
                                                         PatternMatchOr {
+                                                            node_index: NodeIndex(None),
                                                             range: 608..625,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchSequence(
                                                                     PatternMatchSequence {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 608..618,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         patterns: [
                                                                             MatchValue(
                                                                                 PatternMatchValue {
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 609..610,
-                                                                                    node_index: AtomicNodeIndex(..),
                                                                                     value: NumberLiteral(
                                                                                         ExprNumberLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 609..610,
                                                                                             value: Int(
                                                                                                 1,
@@ -814,11 +816,11 @@ Module(
                                                                             ),
                                                                             MatchValue(
                                                                                 PatternMatchValue {
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 612..613,
-                                                                                    node_index: AtomicNodeIndex(..),
                                                                                     value: NumberLiteral(
                                                                                         ExprNumberLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 612..613,
                                                                                             value: Int(
                                                                                                 2,
@@ -829,8 +831,8 @@ Module(
                                                                             ),
                                                                             MatchMapping(
                                                                                 PatternMatchMapping {
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 615..617,
-                                                                                    node_index: AtomicNodeIndex(..),
                                                                                     keys: [],
                                                                                     patterns: [],
                                                                                     rest: None,
@@ -841,8 +843,8 @@ Module(
                                                                 ),
                                                                 MatchSingleton(
                                                                     PatternMatchSingleton {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 621..625,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: True,
                                                                     },
                                                                 ),
@@ -855,12 +857,12 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 629..638,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 630..631,
                                                             value: Int(
                                                                 1,
@@ -871,13 +873,13 @@ Module(
                                                 patterns: [
                                                     MatchSequence(
                                                         PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
                                                             range: 633..637,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchSequence(
                                                                     PatternMatchSequence {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 634..636,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         patterns: [],
                                                                     },
                                                                 ),
@@ -890,12 +892,12 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 641..656,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 642..643,
                                                             value: Int(
                                                                 0,
@@ -906,16 +908,16 @@ Module(
                                                 patterns: [
                                                     MatchSequence(
                                                         PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
                                                             range: 645..655,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchValue(
                                                                     PatternMatchValue {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 646..647,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 646..647,
                                                                                 value: Int(
                                                                                     1,
@@ -926,11 +928,11 @@ Module(
                                                                 ),
                                                                 MatchValue(
                                                                     PatternMatchValue {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 649..650,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 649..650,
                                                                                 value: Int(
                                                                                     2,
@@ -941,8 +943,8 @@ Module(
                                                                 ),
                                                                 MatchMapping(
                                                                     PatternMatchMapping {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 652..654,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         keys: [],
                                                                         patterns: [],
                                                                         rest: None,
@@ -957,29 +959,30 @@ Module(
                                         ),
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 659..661,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [],
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 664..667,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 664..667,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 664..667,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "X",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Double,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -990,8 +993,8 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 670..672,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [],
                                                 patterns: [],
                                                 rest: None,
@@ -1004,12 +1007,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 682..687,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 682..683,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1018,7 +1021,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 686..687,
                                                 value: Int(
                                                     1,
@@ -1031,11 +1034,11 @@ Module(
                         },
                         MatchCase {
                             range: 692..714,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 697..699,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [],
                                 },
                             ),
@@ -1043,12 +1046,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 709..714,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 709..710,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1057,7 +1060,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 713..714,
                                                 value: Int(
                                                     2,
@@ -1073,11 +1076,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 737..782,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 743..744,
                             id: Name("x"),
                             ctx: Load,
@@ -1086,18 +1089,18 @@ Module(
                     cases: [
                         MatchCase {
                             range: 750..782,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 755..767,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 755..767,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 755..759,
                                                     value: Float(
                                                         0.25,
@@ -1107,7 +1110,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 762..767,
                                                     value: Complex {
                                                         real: 0.0,
@@ -1123,12 +1126,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 777..782,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 777..778,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1137,7 +1140,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 781..782,
                                                 value: Int(
                                                     0,
@@ -1153,11 +1156,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 805..841,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 811..812,
                             id: Name("x"),
                             ctx: Load,
@@ -1166,19 +1169,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 818..841,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 823..826,
-                                    node_index: AtomicNodeIndex(..),
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 823..826,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 824..826,
                                                     value: Complex {
                                                         real: 0.0,
@@ -1194,12 +1197,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 836..841,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 836..837,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1208,7 +1211,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 840..841,
                                                 value: Int(
                                                     0,
@@ -1224,11 +1227,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 864..913,
                     subject: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 870..871,
                             value: Int(
                                 4,
@@ -1238,19 +1241,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 877..913,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 882..895,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 882..883,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 882..883,
                                                         value: Int(
                                                             0,
@@ -1261,11 +1264,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 886..887,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 886..887,
                                                         value: Int(
                                                             1,
@@ -1276,11 +1279,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 890..891,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 890..891,
                                                         value: Int(
                                                             2,
@@ -1291,11 +1294,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 894..895,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 894..895,
                                                         value: Int(
                                                             3,
@@ -1311,12 +1314,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 905..913,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 905..906,
                                                     id: Name("x"),
                                                     ctx: Store,
@@ -1325,7 +1328,7 @@ Module(
                                         ],
                                         value: BooleanLiteral(
                                             ExprBooleanLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 909..913,
                                                 value: true,
                                             },
@@ -1339,11 +1342,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 936..975,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 942..943,
                             id: Name("x"),
                             ctx: Load,
@@ -1352,14 +1355,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 949..975,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 954..955,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 954..955,
                                             value: Int(
                                                 0,
@@ -1371,7 +1374,7 @@ Module(
                             guard: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 959..960,
                                         id: Name("x"),
                                         ctx: Load,
@@ -1381,12 +1384,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 970..975,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 970..971,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1395,7 +1398,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 974..975,
                                                 value: Int(
                                                     0,
@@ -1411,11 +1414,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 998..1098,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1004..1005,
                             id: Name("x"),
                             ctx: Load,
@@ -1424,15 +1427,15 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1011..1037,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 1016..1022,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1017..1018,
                                                 value: Int(
                                                     1,
@@ -1443,11 +1446,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1020..1021,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1020..1021,
                                                         value: Int(
                                                             0,
@@ -1464,12 +1467,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1032..1037,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1032..1033,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1478,7 +1481,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1036..1037,
                                                 value: Int(
                                                     0,
@@ -1491,15 +1494,15 @@ Module(
                         },
                         MatchCase {
                             range: 1042..1068,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 1047..1053,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1048..1049,
                                                 value: Int(
                                                     0,
@@ -1510,11 +1513,11 @@ Module(
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1051..1052,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1051..1052,
                                                         value: Int(
                                                             0,
@@ -1531,12 +1534,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1063..1068,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1063..1064,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1545,7 +1548,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1067..1068,
                                                 value: Int(
                                                     1,
@@ -1558,18 +1561,18 @@ Module(
                         },
                         MatchCase {
                             range: 1073..1098,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 1078..1083,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [],
                                     patterns: [],
                                     rest: Some(
                                         Identifier {
                                             id: Name("z"),
                                             range: 1081..1082,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -1578,12 +1581,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1093..1098,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1093..1094,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1592,7 +1595,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1097..1098,
                                                 value: Int(
                                                     2,
@@ -1608,15 +1611,15 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1121..1162,
                     subject: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1127..1132,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1127..1130,
                                     id: Name("Seq"),
                                     ctx: Load,
@@ -1624,7 +1627,7 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 1130..1132,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [],
                             },
@@ -1633,16 +1636,16 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1138..1162,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1143..1147,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 1144..1146,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
@@ -1653,12 +1656,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1157..1162,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1157..1158,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1667,7 +1670,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1161..1162,
                                                 value: Int(
                                                     0,
@@ -1683,11 +1686,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1185..1245,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1191..1192,
                             id: Name("x"),
                             ctx: Load,
@@ -1696,14 +1699,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1198..1219,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 1203..1204,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1203..1204,
                                             value: Int(
                                                 1,
@@ -1716,12 +1719,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1214..1219,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1214..1215,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1730,7 +1733,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1218..1219,
                                                 value: Int(
                                                     0,
@@ -1743,14 +1746,14 @@ Module(
                         },
                         MatchCase {
                             range: 1224..1245,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 1229..1230,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1229..1230,
                                             value: Int(
                                                 1,
@@ -1763,12 +1766,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1240..1245,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1240..1241,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1777,7 +1780,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1244..1245,
                                                 value: Int(
                                                     1,
@@ -1793,11 +1796,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1268..1315,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1274..1275,
                             id: Name("x"),
                             ctx: Load,
@@ -1806,26 +1809,27 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1281..1315,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 1286..1298,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1287..1292,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 1287..1292,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "foo",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -1836,14 +1840,14 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 1294..1297,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("bar"),
                                                         range: 1294..1297,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -1856,12 +1860,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1308..1315,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1308..1309,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -1870,7 +1874,7 @@ Module(
                                         ],
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1312..1315,
                                                 id: Name("bar"),
                                                 ctx: Load,
@@ -1885,16 +1889,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1338..1392,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1344..1353,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1345..1346,
                                         value: Int(
                                             0,
@@ -1903,7 +1907,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1348..1349,
                                         value: Int(
                                             1,
@@ -1912,7 +1916,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1351..1352,
                                         value: Int(
                                             2,
@@ -1927,19 +1931,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1359..1392,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1364..1377,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1365..1366,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1365..1366,
                                                         value: Int(
                                                             0,
@@ -1950,11 +1954,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1368..1369,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1368..1369,
                                                         value: Int(
                                                             1,
@@ -1965,24 +1969,24 @@ Module(
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 1371..1373,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 1372..1373,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1375..1376,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1375..1376,
                                                         value: Int(
                                                             2,
@@ -1998,12 +2002,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1387..1392,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1387..1388,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2012,7 +2016,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1391..1392,
                                                 value: Int(
                                                     0,
@@ -2028,11 +2032,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1415..1529,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1421..1422,
                             id: Name("x"),
                             ctx: Load,
@@ -2041,19 +2045,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1428..1451,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1433..1436,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1434..1435,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1434..1435,
                                                         value: Int(
                                                             0,
@@ -2069,12 +2073,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1446..1451,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1446..1447,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2083,7 +2087,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1450..1451,
                                                 value: Int(
                                                     0,
@@ -2096,19 +2100,19 @@ Module(
                         },
                         MatchCase {
                             range: 1456..1498,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1461..1467,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1462..1463,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1462..1463,
                                                         value: Int(
                                                             1,
@@ -2119,11 +2123,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1465..1466,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1465..1466,
                                                         value: Int(
                                                             0,
@@ -2138,11 +2142,11 @@ Module(
                             guard: Some(
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1472..1482,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1472..1473,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -2150,11 +2154,11 @@ Module(
                                         ),
                                         value: Subscript(
                                             ExprSubscript {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1477..1482,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1477..1478,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -2162,13 +2166,13 @@ Module(
                                                 ),
                                                 slice: Slice(
                                                     ExprSlice {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1479..1481,
                                                         lower: None,
                                                         upper: Some(
                                                             NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 1480..1481,
                                                                     value: Int(
                                                                         0,
@@ -2188,12 +2192,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1493..1498,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1493..1494,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2202,7 +2206,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1497..1498,
                                                 value: Int(
                                                     1,
@@ -2215,19 +2219,19 @@ Module(
                         },
                         MatchCase {
                             range: 1503..1529,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1508..1514,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1509..1510,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1509..1510,
                                                         value: Int(
                                                             1,
@@ -2238,11 +2242,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 1512..1513,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1512..1513,
                                                         value: Int(
                                                             0,
@@ -2258,12 +2262,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1524..1529,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1524..1525,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2272,7 +2276,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1528..1529,
                                                 value: Int(
                                                     2,
@@ -2288,11 +2292,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1552..1595,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1558..1559,
                             id: Name("w"),
                             ctx: Load,
@@ -2301,44 +2305,44 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1565..1595,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1570..1580,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 1571..1572,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 1571..1572,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 1574..1575,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 1574..1575,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 1577..1579,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
@@ -2349,12 +2353,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1590..1595,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1590..1591,
                                                     id: Name("z"),
                                                     ctx: Store,
@@ -2363,7 +2367,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1594..1595,
                                                 value: Int(
                                                     0,
@@ -2379,11 +2383,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1618..1664,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1624..1625,
                             id: Name("x"),
                             ctx: Load,
@@ -2392,23 +2396,23 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1631..1664,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 1636..1649,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1636..1649,
                                             left: UnaryOp(
                                                 ExprUnaryOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1636..1641,
                                                     op: USub,
                                                     operand: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1637..1641,
                                                             value: Float(
                                                                 0.25,
@@ -2420,7 +2424,7 @@ Module(
                                             op: Sub,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1644..1649,
                                                     value: Complex {
                                                         real: 0.0,
@@ -2436,12 +2440,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1659..1664,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1659..1660,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2450,7 +2454,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1663..1664,
                                                 value: Int(
                                                     0,
@@ -2466,16 +2470,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1687..1726,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1693..1697,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1694..1695,
                                         id: Name("x"),
                                         ctx: Load,
@@ -2489,22 +2493,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1703..1726,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 1708..1711,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 1709..1710,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 1709..1710,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -2516,12 +2520,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1721..1726,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1721..1722,
                                                     id: Name("z"),
                                                     ctx: Store,
@@ -2530,7 +2534,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1725..1726,
                                                 value: Int(
                                                     0,
@@ -2546,11 +2550,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1749..1789,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1755..1756,
                             id: Name("x"),
                             ctx: Load,
@@ -2559,26 +2563,26 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1762..1789,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 1767..1774,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1767..1774,
                                             value: Attribute(
                                                 ExprAttribute {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1767..1772,
                                                     value: Attribute(
                                                         ExprAttribute {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1767..1770,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 1767..1768,
                                                                     id: Name("A"),
                                                                     ctx: Load,
@@ -2587,7 +2591,7 @@ Module(
                                                             attr: Identifier {
                                                                 id: Name("B"),
                                                                 range: 1769..1770,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                             },
                                                             ctx: Load,
                                                         },
@@ -2595,7 +2599,7 @@ Module(
                                                     attr: Identifier {
                                                         id: Name("C"),
                                                         range: 1771..1772,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     ctx: Load,
                                                 },
@@ -2603,7 +2607,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("D"),
                                                 range: 1773..1774,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -2614,12 +2618,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1784..1789,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1784..1785,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2628,7 +2632,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1788..1789,
                                                 value: Int(
                                                     0,
@@ -2644,11 +2648,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1812..1849,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1818..1819,
                             id: Name("x"),
                             ctx: Load,
@@ -2657,11 +2661,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1825..1849,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSingleton(
                                 PatternMatchSingleton {
+                                    node_index: NodeIndex(None),
                                     range: 1830..1834,
-                                    node_index: AtomicNodeIndex(..),
                                     value: None,
                                 },
                             ),
@@ -2669,12 +2673,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1844..1849,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1844..1845,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2683,7 +2687,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1848..1849,
                                                 value: Int(
                                                     0,
@@ -2699,11 +2703,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1872..1906,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1878..1879,
                             id: Name("x"),
                             ctx: Load,
@@ -2712,14 +2716,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1885..1906,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 1890..1891,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1890..1891,
                                             value: Int(
                                                 0,
@@ -2732,12 +2736,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1901..1906,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1901..1902,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2746,7 +2750,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1905..1906,
                                                 value: Int(
                                                     0,
@@ -2762,11 +2766,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1929..1967,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1935..1936,
                             id: Name("x"),
                             ctx: Load,
@@ -2775,11 +2779,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 1942..1967,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSingleton(
                                 PatternMatchSingleton {
+                                    node_index: NodeIndex(None),
                                     range: 1947..1952,
-                                    node_index: AtomicNodeIndex(..),
                                     value: False,
                                 },
                             ),
@@ -2787,12 +2791,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1962..1967,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1962..1963,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2801,7 +2805,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1966..1967,
                                                 value: Int(
                                                     0,
@@ -2817,11 +2821,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1990..2081,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1996..1997,
                             id: Name("x"),
                             ctx: Load,
@@ -2830,11 +2834,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2003..2025,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2008..2010,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [],
                                 },
                             ),
@@ -2842,12 +2846,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2020..2025,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2020..2021,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2856,7 +2860,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2024..2025,
                                                 value: Int(
                                                     0,
@@ -2869,30 +2873,31 @@ Module(
                         },
                         MatchCase {
                             range: 2030..2054,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2035..2039,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 2036..2038,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2036..2038,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 2036..2038,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Double,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -2908,12 +2913,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2049..2054,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2049..2050,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2922,7 +2927,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2053..2054,
                                                 value: Int(
                                                     1,
@@ -2935,25 +2940,26 @@ Module(
                         },
                         MatchCase {
                             range: 2059..2081,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 2064..2066,
-                                    node_index: AtomicNodeIndex(..),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2064..2066,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 2064..2066,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -2966,12 +2972,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2076..2081,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2076..2077,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -2980,7 +2986,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2080..2081,
                                                 value: Int(
                                                     2,
@@ -2996,11 +3002,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2104..2138,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2110..2111,
                             id: Name("x"),
                             ctx: Load,
@@ -3009,17 +3015,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2117..2138,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 2122..2123,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("z"),
                                             range: 2122..2123,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -3028,12 +3034,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2133..2138,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2133..2134,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3042,7 +3048,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2137..2138,
                                                 value: Int(
                                                     0,
@@ -3058,11 +3064,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2161..2207,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2167..2168,
                             id: Name("w"),
                             ctx: Load,
@@ -3071,49 +3077,49 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2174..2207,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2179..2192,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2180..2181,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 2180..2181,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2183..2184,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 2183..2184,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 2186..2191,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("rest"),
                                                         range: 2187..2191,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -3125,12 +3131,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2202..2207,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2202..2203,
                                                     id: Name("z"),
                                                     ctx: Store,
@@ -3139,7 +3145,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2206..2207,
                                                 value: Int(
                                                     0,
@@ -3155,11 +3161,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2230..2307,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2236..2237,
                             id: Name("x"),
                             ctx: Load,
@@ -3168,24 +3174,24 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2243..2307,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 2248..2278,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2249..2255,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: Some(
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 2249..2250,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 2249..2250,
                                                                     value: Int(
                                                                         0,
@@ -3199,23 +3205,23 @@ Module(
                                                     Identifier {
                                                         id: Name("z"),
                                                         range: 2254..2255,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2260..2266,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: Some(
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 2260..2261,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 2260..2261,
                                                                     value: Int(
                                                                         1,
@@ -3229,23 +3235,23 @@ Module(
                                                     Identifier {
                                                         id: Name("z"),
                                                         range: 2265..2266,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2271..2277,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: Some(
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 2271..2272,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 2271..2272,
                                                                     value: Int(
                                                                         2,
@@ -3259,7 +3265,7 @@ Module(
                                                     Identifier {
                                                         id: Name("z"),
                                                         range: 2276..2277,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -3270,11 +3276,11 @@ Module(
                             guard: Some(
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2282..2292,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2282..2283,
                                                 id: Name("z"),
                                                 ctx: Load,
@@ -3286,11 +3292,11 @@ Module(
                                         comparators: [
                                             BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2287..2292,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 2287..2288,
                                                             id: Name("x"),
                                                             ctx: Load,
@@ -3299,7 +3305,7 @@ Module(
                                                     op: Mod,
                                                     right: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 2291..2292,
                                                             value: Int(
                                                                 2,
@@ -3315,12 +3321,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2302..2307,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2302..2303,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3329,7 +3335,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2306..2307,
                                                 value: Int(
                                                     0,
@@ -3345,11 +3351,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2330..2499,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2336..2337,
                             id: Name("x"),
                             ctx: Load,
@@ -3358,15 +3364,15 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2343..2378,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 2348..2363,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2349..2350,
                                                 value: Int(
                                                     0,
@@ -3377,16 +3383,16 @@ Module(
                                     patterns: [
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 2352..2362,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 2353..2354,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 2353..2354,
                                                                     value: Int(
                                                                         1,
@@ -3397,11 +3403,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 2356..2357,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 2356..2357,
                                                                     value: Int(
                                                                         2,
@@ -3412,8 +3418,8 @@ Module(
                                                     ),
                                                     MatchMapping(
                                                         PatternMatchMapping {
+                                                            node_index: NodeIndex(None),
                                                             range: 2359..2361,
-                                                            node_index: AtomicNodeIndex(..),
                                                             keys: [],
                                                             patterns: [],
                                                             rest: None,
@@ -3430,12 +3436,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2373..2378,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2373..2374,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3444,7 +3450,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2377..2378,
                                                 value: Int(
                                                     0,
@@ -3457,20 +3463,20 @@ Module(
                         },
                         MatchCase {
                             range: 2383..2472,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 2388..2457,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 2388..2411,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 2389..2390,
                                                             value: Int(
                                                                 0,
@@ -3481,21 +3487,21 @@ Module(
                                                 patterns: [
                                                     MatchOr(
                                                         PatternMatchOr {
+                                                            node_index: NodeIndex(None),
                                                             range: 2392..2410,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchSequence(
                                                                     PatternMatchSequence {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 2392..2402,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         patterns: [
                                                                             MatchValue(
                                                                                 PatternMatchValue {
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 2393..2394,
-                                                                                    node_index: AtomicNodeIndex(..),
                                                                                     value: NumberLiteral(
                                                                                         ExprNumberLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 2393..2394,
                                                                                             value: Int(
                                                                                                 1,
@@ -3506,11 +3512,11 @@ Module(
                                                                             ),
                                                                             MatchValue(
                                                                                 PatternMatchValue {
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 2396..2397,
-                                                                                    node_index: AtomicNodeIndex(..),
                                                                                     value: NumberLiteral(
                                                                                         ExprNumberLiteral {
-                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                            node_index: NodeIndex(None),
                                                                                             range: 2396..2397,
                                                                                             value: Int(
                                                                                                 2,
@@ -3521,8 +3527,8 @@ Module(
                                                                             ),
                                                                             MatchMapping(
                                                                                 PatternMatchMapping {
+                                                                                    node_index: NodeIndex(None),
                                                                                     range: 2399..2401,
-                                                                                    node_index: AtomicNodeIndex(..),
                                                                                     keys: [],
                                                                                     patterns: [],
                                                                                     rest: None,
@@ -3533,8 +3539,8 @@ Module(
                                                                 ),
                                                                 MatchSingleton(
                                                                     PatternMatchSingleton {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 2405..2410,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: False,
                                                                     },
                                                                 ),
@@ -3547,12 +3553,12 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 2414..2423,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 2415..2416,
                                                             value: Int(
                                                                 1,
@@ -3563,13 +3569,13 @@ Module(
                                                 patterns: [
                                                     MatchSequence(
                                                         PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
                                                             range: 2418..2422,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchSequence(
                                                                     PatternMatchSequence {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 2419..2421,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         patterns: [],
                                                                     },
                                                                 ),
@@ -3582,12 +3588,12 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 2426..2441,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 2427..2428,
                                                             value: Int(
                                                                 0,
@@ -3598,16 +3604,16 @@ Module(
                                                 patterns: [
                                                     MatchSequence(
                                                         PatternMatchSequence {
+                                                            node_index: NodeIndex(None),
                                                             range: 2430..2440,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchValue(
                                                                     PatternMatchValue {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 2431..2432,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 2431..2432,
                                                                                 value: Int(
                                                                                     1,
@@ -3618,11 +3624,11 @@ Module(
                                                                 ),
                                                                 MatchValue(
                                                                     PatternMatchValue {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 2434..2435,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 2434..2435,
                                                                                 value: Int(
                                                                                     2,
@@ -3633,8 +3639,8 @@ Module(
                                                                 ),
                                                                 MatchMapping(
                                                                     PatternMatchMapping {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 2437..2439,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         keys: [],
                                                                         patterns: [],
                                                                         rest: None,
@@ -3649,29 +3655,30 @@ Module(
                                         ),
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 2444..2446,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [],
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 2449..2452,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2449..2452,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 2449..2452,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "X",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Double,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -3682,8 +3689,8 @@ Module(
                                         ),
                                         MatchMapping(
                                             PatternMatchMapping {
+                                                node_index: NodeIndex(None),
                                                 range: 2455..2457,
-                                                node_index: AtomicNodeIndex(..),
                                                 keys: [],
                                                 patterns: [],
                                                 rest: None,
@@ -3696,12 +3703,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2467..2472,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2467..2468,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3710,7 +3717,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2471..2472,
                                                 value: Int(
                                                     1,
@@ -3723,11 +3730,11 @@ Module(
                         },
                         MatchCase {
                             range: 2477..2499,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2482..2484,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [],
                                 },
                             ),
@@ -3735,12 +3742,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2494..2499,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2494..2495,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3749,7 +3756,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2498..2499,
                                                 value: Int(
                                                     2,
@@ -3765,16 +3772,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2522..2568,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2528..2537,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2529..2530,
                                         value: Int(
                                             0,
@@ -3783,7 +3790,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2532..2533,
                                         value: Int(
                                             1,
@@ -3792,7 +3799,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2535..2536,
                                         value: Int(
                                             2,
@@ -3807,19 +3814,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2543..2568,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2548..2553,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 2548..2549,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2548..2549,
                                                         value: Int(
                                                             0,
@@ -3830,13 +3837,13 @@ Module(
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 2551..2553,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 2552..2553,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -3848,12 +3855,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2563..2568,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2563..2564,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3862,7 +3869,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2567..2568,
                                                 value: Int(
                                                     0,
@@ -3878,16 +3885,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2591..2638,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2597..2606,
                             elts: [
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2598..2599,
                                         value: Int(
                                             0,
@@ -3896,7 +3903,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2601..2602,
                                         value: Int(
                                             1,
@@ -3905,7 +3912,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2604..2605,
                                         value: Int(
                                             2,
@@ -3920,32 +3927,32 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2612..2638,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2617..2623,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 2617..2619,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("x"),
                                                         range: 2618..2619,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 2621..2622,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 2621..2622,
                                                         value: Int(
                                                             2,
@@ -3961,12 +3968,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2633..2638,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2633..2634,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -3975,7 +3982,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2637..2638,
                                                 value: Int(
                                                     0,
@@ -3991,16 +3998,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2661..2697,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2667..2669,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2667..2668,
                                         id: Name("x"),
                                         ctx: Load,
@@ -4014,22 +4021,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2675..2697,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2680..2682,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2680..2681,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 2680..2681,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -4041,12 +4048,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2692..2697,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2692..2693,
                                                     id: Name("z"),
                                                     ctx: Store,
@@ -4055,7 +4062,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2696..2697,
                                                 value: Int(
                                                     0,
@@ -4071,16 +4078,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2720..2760,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2726..2730,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2726..2727,
                                         id: Name("w"),
                                         ctx: Load,
@@ -4088,7 +4095,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2729..2730,
                                         id: Name("x"),
                                         ctx: Load,
@@ -4102,36 +4109,36 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2736..2760,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2741..2745,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2741..2742,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("y"),
                                                         range: 2741..2742,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2744..2745,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("z"),
                                                         range: 2744..2745,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -4143,12 +4150,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2755..2760,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2755..2756,
                                                     id: Name("v"),
                                                     ctx: Store,
@@ -4157,7 +4164,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2759..2760,
                                                 value: Int(
                                                     0,
@@ -4173,20 +4180,20 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2783..2829,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2789..2796,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2789..2795,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2789..2790,
                                                 id: Name("w"),
                                                 ctx: Store,
@@ -4194,7 +4201,7 @@ Module(
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2794..2795,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -4210,27 +4217,27 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2802..2829,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 2807..2814,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 2807..2813,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: Some(
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 2807..2808,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: None,
                                                             name: Some(
                                                                 Identifier {
                                                                     id: Name("y"),
                                                                     range: 2807..2808,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
@@ -4240,7 +4247,7 @@ Module(
                                                     Identifier {
                                                         id: Name("v"),
                                                         range: 2812..2813,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -4252,12 +4259,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2824..2829,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 2824..2825,
                                                     id: Name("z"),
                                                     ctx: Store,
@@ -4266,7 +4273,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2828..2829,
                                                 value: Int(
                                                     0,
@@ -4282,11 +4289,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2831..2952,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2837..2838,
                             id: Name("x"),
                             ctx: Load,
@@ -4295,29 +4302,29 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2927..2952,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 2932..2938,
-                                    node_index: AtomicNodeIndex(..),
                                     value: FString(
                                         ExprFString {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2932..2938,
                                             value: FStringValue {
                                                 inner: Single(
                                                     FString(
                                                         FString {
                                                             range: 2932..2938,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             elements: [
                                                                 Interpolation(
                                                                     InterpolatedElement {
                                                                         range: 2934..2937,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         expression: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 2935..2936,
                                                                                 id: Name("y"),
                                                                                 ctx: Load,
@@ -4333,6 +4340,7 @@ Module(
                                                                 quote_style: Double,
                                                                 prefix: Regular,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -4346,7 +4354,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 2948..2952,
                                     },
                                 ),
@@ -4357,29 +4365,30 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 2953..3025,
                     subject: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 2959..2970,
                             items: [
                                 DictItem {
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 2960..2966,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 2960..2966,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "test",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -4389,7 +4398,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 2968..2969,
                                             value: Int(
                                                 1,
@@ -4403,18 +4412,18 @@ Module(
                     cases: [
                         MatchCase {
                             range: 2976..3025,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 2981..3004,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [],
                                     patterns: [],
                                     rest: Some(
                                         Identifier {
                                             id: Name("rest"),
                                             range: 2993..2997,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -4423,15 +4432,15 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3014..3025,
                                         value: Call(
                                             ExprCall {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3014..3025,
                                                 func: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3014..3019,
                                                         id: Name("print"),
                                                         ctx: Load,
@@ -4439,11 +4448,11 @@ Module(
                                                 ),
                                                 arguments: Arguments {
                                                     range: 3019..3025,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     args: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3020..3024,
                                                                 id: Name("rest"),
                                                                 ctx: Load,
@@ -4463,29 +4472,30 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3026..3129,
                     subject: Dict(
                         ExprDict {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3032..3049,
                             items: [
                                 DictItem {
                                     key: Some(
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3033..3040,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 3033..3040,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "label",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -4495,18 +4505,19 @@ Module(
                                     ),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3042..3048,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 3042..3048,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "test",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -4520,26 +4531,27 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3055..3129,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 3060..3107,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3070..3077,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 3070..3077,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "label",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Double,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -4550,21 +4562,21 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 3079..3100,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: Some(
                                                     MatchOr(
                                                         PatternMatchOr {
+                                                            node_index: NodeIndex(None),
                                                             range: 3079..3091,
-                                                            node_index: AtomicNodeIndex(..),
                                                             patterns: [
                                                                 MatchClass(
                                                                     PatternMatchClass {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 3079..3084,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         cls: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 3079..3082,
                                                                                 id: Name("str"),
                                                                                 ctx: Load,
@@ -4572,7 +4584,7 @@ Module(
                                                                         ),
                                                                         arguments: PatternArguments {
                                                                             range: 3082..3084,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             patterns: [],
                                                                             keywords: [],
                                                                         },
@@ -4580,8 +4592,8 @@ Module(
                                                                 ),
                                                                 MatchSingleton(
                                                                     PatternMatchSingleton {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 3087..3091,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: None,
                                                                     },
                                                                 ),
@@ -4593,7 +4605,7 @@ Module(
                                                     Identifier {
                                                         id: Name("label"),
                                                         range: 3095..3100,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -4606,15 +4618,15 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3117..3129,
                                         value: Call(
                                             ExprCall {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3117..3129,
                                                 func: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3117..3122,
                                                         id: Name("print"),
                                                         ctx: Load,
@@ -4622,11 +4634,11 @@ Module(
                                                 ),
                                                 arguments: Arguments {
                                                     range: 3122..3129,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     args: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3123..3128,
                                                                 id: Name("label"),
                                                                 ctx: Load,
@@ -4646,11 +4658,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3130..3170,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3136..3137,
                             id: Name("x"),
                             ctx: Load,
@@ -4659,19 +4671,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3143..3170,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 3148..3155,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3149..3150,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3149..3150,
                                                         value: Int(
                                                             0,
@@ -4682,11 +4694,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3152..3153,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3152..3153,
                                                         value: Int(
                                                             1,
@@ -4702,12 +4714,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3165..3170,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3165..3166,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -4716,7 +4728,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3169..3170,
                                                 value: Int(
                                                     0,
@@ -4732,11 +4744,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3171..3211,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3177..3178,
                             id: Name("x"),
                             ctx: Load,
@@ -4745,19 +4757,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3184..3211,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 3189..3196,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3190..3191,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3190..3191,
                                                         value: Int(
                                                             0,
@@ -4768,11 +4780,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3193..3194,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3193..3194,
                                                         value: Int(
                                                             1,
@@ -4788,12 +4800,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3206..3211,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3206..3207,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -4802,7 +4814,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3210..3211,
                                                 value: Int(
                                                     0,
@@ -4818,11 +4830,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3212..3249,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3218..3219,
                             id: Name("x"),
                             ctx: Load,
@@ -4831,19 +4843,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3225..3249,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 3230..3234,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3231..3232,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3231..3232,
                                                         value: Int(
                                                             0,
@@ -4859,12 +4871,12 @@ Module(
                             body: [
                                 Assign(
                                     StmtAssign {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3244..3249,
                                         targets: [
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3244..3245,
                                                     id: Name("y"),
                                                     ctx: Store,
@@ -4873,7 +4885,7 @@ Module(
                                         ],
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3248..3249,
                                                 value: Int(
                                                     0,
@@ -4889,16 +4901,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3250..3284,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3256..3258,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3256..3257,
                                         id: Name("x"),
                                         ctx: Load,
@@ -4912,17 +4924,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3264..3284,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 3269..3270,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("z"),
                                             range: 3269..3270,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -4931,7 +4943,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3280..3284,
                                     },
                                 ),
@@ -4942,16 +4954,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3285..3321,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3291..3295,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3291..3292,
                                         id: Name("x"),
                                         ctx: Load,
@@ -4959,7 +4971,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3294..3295,
                                         id: Name("y"),
                                         ctx: Load,
@@ -4973,17 +4985,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3301..3321,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 3306..3307,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("z"),
                                             range: 3306..3307,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -4992,7 +5004,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3317..3321,
                                     },
                                 ),
@@ -5003,16 +5015,16 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3322..3359,
                     subject: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3328..3333,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3328..3329,
                                         id: Name("x"),
                                         ctx: Load,
@@ -5020,7 +5032,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3331..3332,
                                         id: Name("y"),
                                         ctx: Load,
@@ -5034,17 +5046,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3339..3359,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 3344..3345,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("z"),
                                             range: 3344..3345,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -5053,7 +5065,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3355..3359,
                                     },
                                 ),
@@ -5064,11 +5076,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3385..3475,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3391..3392,
                             id: Name("x"),
                             ctx: Load,
@@ -5077,11 +5089,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3398..3420,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSingleton(
                                 PatternMatchSingleton {
+                                    node_index: NodeIndex(None),
                                     range: 3403..3407,
-                                    node_index: AtomicNodeIndex(..),
                                     value: None,
                                 },
                             ),
@@ -5089,11 +5101,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3417..3420,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3417..3420,
                                             },
                                         ),
@@ -5103,11 +5115,11 @@ Module(
                         },
                         MatchCase {
                             range: 3425..3447,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSingleton(
                                 PatternMatchSingleton {
+                                    node_index: NodeIndex(None),
                                     range: 3430..3434,
-                                    node_index: AtomicNodeIndex(..),
                                     value: True,
                                 },
                             ),
@@ -5115,11 +5127,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3444..3447,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3444..3447,
                                             },
                                         ),
@@ -5129,11 +5141,11 @@ Module(
                         },
                         MatchCase {
                             range: 3452..3475,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSingleton(
                                 PatternMatchSingleton {
+                                    node_index: NodeIndex(None),
                                     range: 3457..3462,
-                                    node_index: AtomicNodeIndex(..),
                                     value: False,
                                 },
                             ),
@@ -5141,11 +5153,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3472..3475,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3472..3475,
                                             },
                                         ),
@@ -5158,11 +5170,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3497..3821,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3503..3504,
                             id: Name("x"),
                             ctx: Load,
@@ -5171,18 +5183,18 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3510..3531,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3515..3518,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3515..3518,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3515..3516,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -5191,7 +5203,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("b"),
                                                 range: 3517..3518,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -5202,11 +5214,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3528..3531,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3528..3531,
                                             },
                                         ),
@@ -5216,22 +5228,22 @@ Module(
                         },
                         MatchCase {
                             range: 3536..3559,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3541..3546,
-                                    node_index: AtomicNodeIndex(..),
                                     value: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3541..3546,
                                             value: Attribute(
                                                 ExprAttribute {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3541..3544,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 3541..3542,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -5240,7 +5252,7 @@ Module(
                                                     attr: Identifier {
                                                         id: Name("b"),
                                                         range: 3543..3544,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     ctx: Load,
                                                 },
@@ -5248,7 +5260,7 @@ Module(
                                             attr: Identifier {
                                                 id: Name("c"),
                                                 range: 3545..3546,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
@@ -5259,11 +5271,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3556..3559,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3556..3559,
                                             },
                                         ),
@@ -5273,25 +5285,26 @@ Module(
                         },
                         MatchCase {
                             range: 3564..3584,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3569..3571,
-                                    node_index: AtomicNodeIndex(..),
                                     value: StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3569..3571,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 3569..3571,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -5304,11 +5317,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3581..3584,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3581..3584,
                                             },
                                         ),
@@ -5318,25 +5331,26 @@ Module(
                         },
                         MatchCase {
                             range: 3589..3610,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3594..3597,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BytesLiteral(
                                         ExprBytesLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3594..3597,
                                             value: BytesLiteralValue {
                                                 inner: Single(
                                                     BytesLiteral {
                                                         range: 3594..3597,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: [],
                                                         flags: BytesLiteralFlags {
                                                             quote_style: Single,
                                                             prefix: Regular,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -5349,11 +5363,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3607..3610,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3607..3610,
                                             },
                                         ),
@@ -5363,14 +5377,14 @@ Module(
                         },
                         MatchCase {
                             range: 3615..3634,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3620..3621,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3620..3621,
                                             value: Int(
                                                 1,
@@ -5383,11 +5397,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3631..3634,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3631..3634,
                                             },
                                         ),
@@ -5397,14 +5411,14 @@ Module(
                         },
                         MatchCase {
                             range: 3639..3660,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3644..3647,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3644..3647,
                                             value: Float(
                                                 1.0,
@@ -5417,11 +5431,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3657..3660,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3657..3660,
                                             },
                                         ),
@@ -5431,14 +5445,14 @@ Module(
                         },
                         MatchCase {
                             range: 3665..3687,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3670..3674,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3670..3674,
                                             value: Complex {
                                                 real: 0.0,
@@ -5452,11 +5466,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3684..3687,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3684..3687,
                                             },
                                         ),
@@ -5466,18 +5480,18 @@ Module(
                         },
                         MatchCase {
                             range: 3692..3716,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3697..3703,
-                                    node_index: AtomicNodeIndex(..),
                                     value: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3697..3703,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3697..3698,
                                                     value: Int(
                                                         1,
@@ -5487,7 +5501,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3701..3703,
                                                     value: Complex {
                                                         real: 0.0,
@@ -5503,11 +5517,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3713..3716,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3713..3716,
                                             },
                                         ),
@@ -5517,19 +5531,19 @@ Module(
                         },
                         MatchCase {
                             range: 3721..3741,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3726..3728,
-                                    node_index: AtomicNodeIndex(..),
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3726..3728,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3727..3728,
                                                     value: Int(
                                                         1,
@@ -5544,11 +5558,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3738..3741,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3738..3741,
                                             },
                                         ),
@@ -5558,19 +5572,19 @@ Module(
                         },
                         MatchCase {
                             range: 3746..3767,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3751..3754,
-                                    node_index: AtomicNodeIndex(..),
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3751..3754,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3752..3754,
                                                     value: Float(
                                                         1.0,
@@ -5585,11 +5599,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3764..3767,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3764..3767,
                                             },
                                         ),
@@ -5599,19 +5613,19 @@ Module(
                         },
                         MatchCase {
                             range: 3772..3795,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3777..3782,
-                                    node_index: AtomicNodeIndex(..),
                                     value: UnaryOp(
                                         ExprUnaryOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3777..3782,
                                             op: USub,
                                             operand: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 3778..3782,
                                                     value: Int(
                                                         1,
@@ -5626,11 +5640,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3792..3795,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3792..3795,
                                             },
                                         ),
@@ -5640,14 +5654,14 @@ Module(
                         },
                         MatchCase {
                             range: 3800..3821,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 3806..3807,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 3806..3807,
                                             value: Int(
                                                 1,
@@ -5660,11 +5674,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3818..3821,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3818..3821,
                                             },
                                         ),
@@ -5677,11 +5691,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3840..3927,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3846..3847,
                             id: Name("x"),
                             ctx: Load,
@@ -5690,19 +5704,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3853..3876,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 3858..3863,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3858..3859,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3858..3859,
                                                         value: Int(
                                                             1,
@@ -5713,11 +5727,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3862..3863,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3862..3863,
                                                         value: Int(
                                                             2,
@@ -5733,11 +5747,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3873..3876,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3873..3876,
                                             },
                                         ),
@@ -5747,30 +5761,31 @@ Module(
                         },
                         MatchCase {
                             range: 3881..3927,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchOr(
                                 PatternMatchOr {
+                                    node_index: NodeIndex(None),
                                     range: 3886..3914,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3886..3888,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3886..3888,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 3886..3888,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Single,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -5781,11 +5796,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3891..3894,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3891..3894,
                                                         value: Float(
                                                             1.1,
@@ -5796,16 +5811,16 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3897..3899,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: UnaryOp(
                                                     ExprUnaryOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3897..3899,
                                                         op: USub,
                                                         operand: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3898..3899,
                                                                 value: Int(
                                                                     1,
@@ -5818,15 +5833,15 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3902..3908,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: BinOp(
                                                     ExprBinOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3902..3908,
                                                         left: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3902..3903,
                                                                 value: Int(
                                                                     1,
@@ -5836,7 +5851,7 @@ Module(
                                                         op: Add,
                                                         right: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3906..3908,
                                                                 value: Complex {
                                                                     real: 0.0,
@@ -5850,15 +5865,15 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 3911..3914,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Attribute(
                                                     ExprAttribute {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 3911..3914,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 3911..3912,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -5867,7 +5882,7 @@ Module(
                                                         attr: Identifier {
                                                             id: Name("b"),
                                                             range: 3913..3914,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         ctx: Load,
                                                     },
@@ -5881,11 +5896,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3924..3927,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3924..3927,
                                             },
                                         ),
@@ -5898,11 +5913,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3946..3978,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3952..3953,
                             id: Name("x"),
                             ctx: Load,
@@ -5911,17 +5926,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3959..3978,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 3964..3965,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("a"),
                                             range: 3964..3965,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -5930,11 +5945,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 3975..3978,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 3975..3978,
                                             },
                                         ),
@@ -5947,11 +5962,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 3979..4016,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 3985..3986,
                             id: Name("x"),
                             ctx: Load,
@@ -5960,22 +5975,22 @@ Module(
                     cases: [
                         MatchCase {
                             range: 3992..4016,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 3997..4003,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 3997..3998,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 3997..3998,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -5985,7 +6000,7 @@ Module(
                                         Identifier {
                                             id: Name("b"),
                                             range: 4002..4003,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -5994,11 +6009,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4013..4016,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4013..4016,
                                             },
                                         ),
@@ -6011,11 +6026,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4017..4157,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4023..4024,
                             id: Name("x"),
                             ctx: Load,
@@ -6024,24 +6039,24 @@ Module(
                     cases: [
                         MatchCase {
                             range: 4030..4060,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 4035..4047,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchOr(
                                             PatternMatchOr {
+                                                node_index: NodeIndex(None),
                                                 range: 4035..4040,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 4035..4036,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 4035..4036,
                                                                     value: Int(
                                                                         1,
@@ -6052,11 +6067,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 4039..4040,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 4039..4040,
                                                                     value: Int(
                                                                         2,
@@ -6073,7 +6088,7 @@ Module(
                                         Identifier {
                                             id: Name("two"),
                                             range: 4044..4047,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -6082,11 +6097,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4057..4060,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4057..4060,
                                             },
                                         ),
@@ -6096,23 +6111,23 @@ Module(
                         },
                         MatchCase {
                             range: 4065..4096,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 4070..4083,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4070..4076,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: BinOp(
                                                     ExprBinOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4070..4076,
                                                         left: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4070..4071,
                                                                 value: Int(
                                                                     1,
@@ -6122,7 +6137,7 @@ Module(
                                                         op: Add,
                                                         right: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4074..4076,
                                                                 value: Complex {
                                                                     real: 0.0,
@@ -6139,7 +6154,7 @@ Module(
                                         Identifier {
                                             id: Name("sum"),
                                             range: 4080..4083,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -6148,11 +6163,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4093..4096,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4093..4096,
                                             },
                                         ),
@@ -6162,23 +6177,23 @@ Module(
                         },
                         MatchCase {
                             range: 4101..4128,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 4106..4115,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4106..4109,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Attribute(
                                                     ExprAttribute {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4106..4109,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4106..4107,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -6187,7 +6202,7 @@ Module(
                                                         attr: Identifier {
                                                             id: Name("b"),
                                                             range: 4108..4109,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         ctx: Load,
                                                     },
@@ -6199,7 +6214,7 @@ Module(
                                         Identifier {
                                             id: Name("ab"),
                                             range: 4113..4115,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -6208,11 +6223,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4125..4128,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4125..4128,
                                             },
                                         ),
@@ -6222,16 +6237,16 @@ Module(
                         },
                         MatchCase {
                             range: 4133..4157,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 4138..4144,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 4138..4139,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: None,
                                             },
@@ -6241,7 +6256,7 @@ Module(
                                         Identifier {
                                             id: Name("x"),
                                             range: 4143..4144,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -6250,11 +6265,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4154..4157,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4154..4157,
                                             },
                                         ),
@@ -6267,11 +6282,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4158..4190,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4164..4165,
                             id: Name("x"),
                             ctx: Load,
@@ -6280,11 +6295,11 @@ Module(
                     cases: [
                         MatchCase {
                             range: 4171..4190,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 4176..4177,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: None,
                                 },
@@ -6293,11 +6308,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4187..4190,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4187..4190,
                                             },
                                         ),
@@ -6310,11 +6325,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4215..4466,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4221..4222,
                             id: Name("x"),
                             ctx: Load,
@@ -6323,19 +6338,19 @@ Module(
                     cases: [
                         MatchCase {
                             range: 4228..4253,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4233..4240,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4233..4234,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4233..4234,
                                                         value: Int(
                                                             1,
@@ -6346,11 +6361,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4236..4237,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4236..4237,
                                                         value: Int(
                                                             2,
@@ -6361,11 +6376,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4239..4240,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4239..4240,
                                                         value: Int(
                                                             3,
@@ -6381,11 +6396,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4250..4253,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4250..4253,
                                             },
                                         ),
@@ -6395,19 +6410,19 @@ Module(
                         },
                         MatchCase {
                             range: 4258..4286,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4263..4273,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4264..4265,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4264..4265,
                                                         value: Int(
                                                             1,
@@ -6418,11 +6433,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4267..4268,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4267..4268,
                                                         value: Int(
                                                             2,
@@ -6433,11 +6448,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4270..4271,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4270..4271,
                                                         value: Int(
                                                             3,
@@ -6453,11 +6468,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4283..4286,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4283..4286,
                                             },
                                         ),
@@ -6467,23 +6482,23 @@ Module(
                         },
                         MatchCase {
                             range: 4291..4331,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4296..4318,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4297..4303,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: BinOp(
                                                     ExprBinOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4297..4303,
                                                         left: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4297..4298,
                                                                 value: Int(
                                                                     1,
@@ -6493,7 +6508,7 @@ Module(
                                                         op: Add,
                                                         right: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4301..4303,
                                                                 value: Complex {
                                                                     real: 0.0,
@@ -6507,36 +6522,36 @@ Module(
                                         ),
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 4305..4306,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 4305..4306,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchSingleton(
                                             PatternMatchSingleton {
+                                                node_index: NodeIndex(None),
                                                 range: 4308..4312,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: None,
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4314..4317,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: Attribute(
                                                     ExprAttribute {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4314..4317,
                                                         value: Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4314..4315,
                                                                 id: Name("a"),
                                                                 ctx: Load,
@@ -6545,7 +6560,7 @@ Module(
                                                         attr: Identifier {
                                                             id: Name("b"),
                                                             range: 4316..4317,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                         },
                                                         ctx: Load,
                                                     },
@@ -6559,11 +6574,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4328..4331,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4328..4331,
                                             },
                                         ),
@@ -6573,29 +6588,29 @@ Module(
                         },
                         MatchCase {
                             range: 4336..4370,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 4341..4357,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: Some(
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 4341..4352,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 4342..4348,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: Some(
                                                                 MatchValue(
                                                                     PatternMatchValue {
+                                                                        node_index: NodeIndex(None),
                                                                         range: 4342..4343,
-                                                                        node_index: AtomicNodeIndex(..),
                                                                         value: NumberLiteral(
                                                                             ExprNumberLiteral {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 4342..4343,
                                                                                 value: Int(
                                                                                     1,
@@ -6609,21 +6624,21 @@ Module(
                                                                 Identifier {
                                                                     id: Name("X"),
                                                                     range: 4347..4348,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
                                                     ),
                                                     MatchAs(
                                                         PatternMatchAs {
+                                                            node_index: NodeIndex(None),
                                                             range: 4350..4351,
-                                                            node_index: AtomicNodeIndex(..),
                                                             pattern: None,
                                                             name: Some(
                                                                 Identifier {
                                                                     id: Name("b"),
                                                                     range: 4350..4351,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                             ),
                                                         },
@@ -6636,7 +6651,7 @@ Module(
                                         Identifier {
                                             id: Name("S"),
                                             range: 4356..4357,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -6645,11 +6660,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4367..4370,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4367..4370,
                                             },
                                         ),
@@ -6659,19 +6674,19 @@ Module(
                         },
                         MatchCase {
                             range: 4375..4407,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4380..4394,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4381..4382,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4381..4382,
                                                         value: Int(
                                                             1,
@@ -6682,11 +6697,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4384..4385,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4384..4385,
                                                         value: Int(
                                                             2,
@@ -6697,15 +6712,15 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4387..4393,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: BinOp(
                                                     ExprBinOp {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4387..4393,
                                                         left: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4387..4388,
                                                                 value: Int(
                                                                     3,
@@ -6715,7 +6730,7 @@ Module(
                                                         op: Add,
                                                         right: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4391..4393,
                                                                 value: Complex {
                                                                     real: 0.0,
@@ -6734,11 +6749,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4404..4407,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4404..4407,
                                             },
                                         ),
@@ -6748,24 +6763,24 @@ Module(
                         },
                         MatchCase {
                             range: 4412..4440,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4417..4427,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 4418..4423,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 4419..4420,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 4419..4420,
                                                                     value: Int(
                                                                         1,
@@ -6776,11 +6791,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 4421..4422,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 4421..4422,
                                                                     value: Int(
                                                                         2,
@@ -6794,11 +6809,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4425..4426,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4425..4426,
                                                         value: Int(
                                                             3,
@@ -6814,11 +6829,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4437..4440,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4437..4440,
                                             },
                                         ),
@@ -6828,19 +6843,19 @@ Module(
                         },
                         MatchCase {
                             range: 4445..4466,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4450..4453,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4451..4452,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4451..4452,
                                                         value: Int(
                                                             1,
@@ -6856,11 +6871,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4463..4466,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4463..4466,
                                             },
                                         ),
@@ -6873,11 +6888,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4487..4616,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4493..4494,
                             id: Name("x"),
                             ctx: Load,
@@ -6886,21 +6901,21 @@ Module(
                     cases: [
                         MatchCase {
                             range: 4500..4521,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4505..4508,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 4505..4507,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 4506..4507,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -6912,11 +6927,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4518..4521,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4518..4521,
                                             },
                                         ),
@@ -6926,16 +6941,16 @@ Module(
                         },
                         MatchCase {
                             range: 4526..4547,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4531..4534,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 4531..4533,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
@@ -6946,11 +6961,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4544..4547,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4544..4547,
                                             },
                                         ),
@@ -6960,19 +6975,19 @@ Module(
                         },
                         MatchCase {
                             range: 4552..4583,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4557..4570,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4558..4559,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4558..4559,
                                                         value: Int(
                                                             1,
@@ -6983,11 +6998,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4561..4562,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4561..4562,
                                                         value: Int(
                                                             2,
@@ -6998,13 +7013,13 @@ Module(
                                         ),
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 4564..4569,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("rest"),
                                                         range: 4565..4569,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
@@ -7016,11 +7031,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4580..4583,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4580..4583,
                                             },
                                         ),
@@ -7030,26 +7045,26 @@ Module(
                         },
                         MatchCase {
                             range: 4588..4616,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchSequence(
                                 PatternMatchSequence {
+                                    node_index: NodeIndex(None),
                                     range: 4593..4603,
-                                    node_index: AtomicNodeIndex(..),
                                     patterns: [
                                         MatchStar(
                                             PatternMatchStar {
+                                                node_index: NodeIndex(None),
                                                 range: 4594..4596,
-                                                node_index: AtomicNodeIndex(..),
                                                 name: None,
                                             },
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4598..4599,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4598..4599,
                                                         value: Int(
                                                             1,
@@ -7060,11 +7075,11 @@ Module(
                                         ),
                                         MatchValue(
                                             PatternMatchValue {
+                                                node_index: NodeIndex(None),
                                                 range: 4601..4602,
-                                                node_index: AtomicNodeIndex(..),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 4601..4602,
                                                         value: Int(
                                                             2,
@@ -7080,11 +7095,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4613..4616,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4613..4616,
                                             },
                                         ),
@@ -7097,11 +7112,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4638..4910,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4644..4645,
                             id: Name("x"),
                             ctx: Load,
@@ -7110,14 +7125,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 4651..4676,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4656..4663,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4656..4661,
                                             id: Name("Point"),
                                             ctx: Load,
@@ -7125,7 +7140,7 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 4661..4663,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [],
                                     },
@@ -7135,11 +7150,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4673..4676,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4673..4676,
                                             },
                                         ),
@@ -7149,22 +7164,22 @@ Module(
                         },
                         MatchCase {
                             range: 4681..4710,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4686..4697,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Attribute(
                                         ExprAttribute {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4686..4695,
                                             value: Attribute(
                                                 ExprAttribute {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 4686..4689,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 4686..4687,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -7173,7 +7188,7 @@ Module(
                                                     attr: Identifier {
                                                         id: Name("b"),
                                                         range: 4688..4689,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     ctx: Load,
                                                 },
@@ -7181,14 +7196,14 @@ Module(
                                             attr: Identifier {
                                                 id: Name("Point"),
                                                 range: 4690..4695,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                             ctx: Load,
                                         },
                                     ),
                                     arguments: PatternArguments {
                                         range: 4695..4697,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [],
                                     },
@@ -7198,11 +7213,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4707..4710,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4707..4710,
                                             },
                                         ),
@@ -7212,14 +7227,14 @@ Module(
                         },
                         MatchCase {
                             range: 4715..4745,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4720..4732,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4720..4727,
                                             id: Name("Point2D"),
                                             ctx: Load,
@@ -7227,24 +7242,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 4727..4732,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 4728..4731,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 4728..4729,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 4730..4731,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4730..4731,
                                                                 value: Int(
                                                                     0,
@@ -7262,11 +7277,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4742..4745,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4742..4745,
                                             },
                                         ),
@@ -7276,14 +7291,14 @@ Module(
                         },
                         MatchCase {
                             range: 4750..4786,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4755..4773,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4755..4762,
                                             id: Name("Point2D"),
                                             ctx: Load,
@@ -7291,24 +7306,24 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 4762..4773,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 4763..4766,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 4763..4764,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 4765..4766,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4765..4766,
                                                                 value: Int(
                                                                     0,
@@ -7320,19 +7335,19 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 4768..4771,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("y"),
                                                     range: 4768..4769,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 4770..4771,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4770..4771,
                                                                 value: Int(
                                                                     0,
@@ -7350,11 +7365,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4783..4786,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4783..4786,
                                             },
                                         ),
@@ -7364,14 +7379,14 @@ Module(
                         },
                         MatchCase {
                             range: 4791..4822,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4796..4809,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4796..4803,
                                             id: Name("Point2D"),
                                             ctx: Load,
@@ -7379,15 +7394,15 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 4803..4809,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchValue(
                                                 PatternMatchValue {
+                                                    node_index: NodeIndex(None),
                                                     range: 4804..4805,
-                                                    node_index: AtomicNodeIndex(..),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 4804..4805,
                                                             value: Int(
                                                                 0,
@@ -7398,11 +7413,11 @@ Module(
                                             ),
                                             MatchValue(
                                                 PatternMatchValue {
+                                                    node_index: NodeIndex(None),
                                                     range: 4807..4808,
-                                                    node_index: AtomicNodeIndex(..),
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 4807..4808,
                                                             value: Int(
                                                                 1,
@@ -7420,11 +7435,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4819..4822,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4819..4822,
                                             },
                                         ),
@@ -7434,14 +7449,14 @@ Module(
                         },
                         MatchCase {
                             range: 4827..4865,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4832..4852,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4832..4839,
                                             id: Name("Point2D"),
                                             ctx: Load,
@@ -7449,20 +7464,20 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 4839..4852,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [
                                             MatchSequence(
                                                 PatternMatchSequence {
+                                                    node_index: NodeIndex(None),
                                                     range: 4840..4846,
-                                                    node_index: AtomicNodeIndex(..),
                                                     patterns: [
                                                         MatchValue(
                                                             PatternMatchValue {
+                                                                node_index: NodeIndex(None),
                                                                 range: 4841..4842,
-                                                                node_index: AtomicNodeIndex(..),
                                                                 value: NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 4841..4842,
                                                                         value: Int(
                                                                             0,
@@ -7473,11 +7488,11 @@ Module(
                                                         ),
                                                         MatchValue(
                                                             PatternMatchValue {
+                                                                node_index: NodeIndex(None),
                                                                 range: 4844..4845,
-                                                                node_index: AtomicNodeIndex(..),
                                                                 value: NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 4844..4845,
                                                                         value: Int(
                                                                             1,
@@ -7493,19 +7508,19 @@ Module(
                                         keywords: [
                                             PatternKeyword {
                                                 range: 4848..4851,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("y"),
                                                     range: 4848..4849,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 4850..4851,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4850..4851,
                                                                 value: Int(
                                                                     1,
@@ -7523,11 +7538,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4862..4865,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4862..4865,
                                             },
                                         ),
@@ -7537,14 +7552,14 @@ Module(
                         },
                         MatchCase {
                             range: 4870..4910,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchClass(
                                 PatternMatchClass {
+                                    node_index: NodeIndex(None),
                                     range: 4875..4897,
-                                    node_index: AtomicNodeIndex(..),
                                     cls: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 4875..4882,
                                             id: Name("Point2D"),
                                             ctx: Load,
@@ -7552,29 +7567,29 @@ Module(
                                     ),
                                     arguments: PatternArguments {
                                         range: 4882..4897,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         patterns: [],
                                         keywords: [
                                             PatternKeyword {
                                                 range: 4883..4891,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("x"),
                                                     range: 4883..4884,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchSequence(
                                                     PatternMatchSequence {
+                                                        node_index: NodeIndex(None),
                                                         range: 4885..4891,
-                                                        node_index: AtomicNodeIndex(..),
                                                         patterns: [
                                                             MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 4886..4887,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 4886..4887,
                                                                             value: Int(
                                                                                 0,
@@ -7585,11 +7600,11 @@ Module(
                                                             ),
                                                             MatchValue(
                                                                 PatternMatchValue {
+                                                                    node_index: NodeIndex(None),
                                                                     range: 4889..4890,
-                                                                    node_index: AtomicNodeIndex(..),
                                                                     value: NumberLiteral(
                                                                         ExprNumberLiteral {
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             range: 4889..4890,
                                                                             value: Int(
                                                                                 1,
@@ -7604,19 +7619,19 @@ Module(
                                             },
                                             PatternKeyword {
                                                 range: 4893..4896,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 attr: Identifier {
                                                     id: Name("y"),
                                                     range: 4893..4894,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 pattern: MatchValue(
                                                     PatternMatchValue {
+                                                        node_index: NodeIndex(None),
                                                         range: 4895..4896,
-                                                        node_index: AtomicNodeIndex(..),
                                                         value: NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 4895..4896,
                                                                 value: Int(
                                                                     1,
@@ -7634,11 +7649,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4907..4910,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4907..4910,
                                             },
                                         ),
@@ -7651,15 +7666,15 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 4934..5028,
                     subject: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 4940..4946,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4940..4941,
                                     id: Name("x"),
                                     ctx: Store,
@@ -7667,7 +7682,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 4945..4946,
                                     id: Name("b"),
                                     ctx: Load,
@@ -7678,15 +7693,15 @@ Module(
                     cases: [
                         MatchCase {
                             range: 4952..4976,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 4957..4963,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4958..4959,
                                                 value: Int(
                                                     1,
@@ -7697,8 +7712,8 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 4961..4962,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: None,
                                             },
@@ -7711,11 +7726,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 4973..4976,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4973..4976,
                                             },
                                         ),
@@ -7725,26 +7740,27 @@ Module(
                         },
                         MatchCase {
                             range: 4981..5028,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchMapping(
                                 PatternMatchMapping {
+                                    node_index: NodeIndex(None),
                                     range: 4986..5015,
-                                    node_index: AtomicNodeIndex(..),
                                     keys: [
                                         StringLiteral(
                                             ExprStringLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4987..4989,
                                                 value: StringLiteralValue {
                                                     inner: Single(
                                                         StringLiteral {
                                                             range: 4987..4989,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             value: "",
                                                             flags: StringLiteralFlags {
                                                                 quote_style: Single,
                                                                 prefix: Empty,
                                                                 triple_quoted: false,
+                                                                unclosed: false,
                                                             },
                                                         },
                                                     ),
@@ -7753,7 +7769,7 @@ Module(
                                         ),
                                         NoneLiteral(
                                             ExprNoneLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 4994..4998,
                                             },
                                         ),
@@ -7761,30 +7777,30 @@ Module(
                                     patterns: [
                                         MatchAs(
                                             PatternMatchAs {
+                                                node_index: NodeIndex(None),
                                                 range: 4991..4992,
-                                                node_index: AtomicNodeIndex(..),
                                                 pattern: None,
                                                 name: Some(
                                                     Identifier {
                                                         id: Name("a"),
                                                         range: 4991..4992,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                 ),
                                             },
                                         ),
                                         MatchSequence(
                                             PatternMatchSequence {
+                                                node_index: NodeIndex(None),
                                                 range: 5000..5006,
-                                                node_index: AtomicNodeIndex(..),
                                                 patterns: [
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 5001..5002,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 5001..5002,
                                                                     value: Int(
                                                                         1,
@@ -7795,11 +7811,11 @@ Module(
                                                     ),
                                                     MatchValue(
                                                         PatternMatchValue {
+                                                            node_index: NodeIndex(None),
                                                             range: 5004..5005,
-                                                            node_index: AtomicNodeIndex(..),
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 5004..5005,
                                                                     value: Int(
                                                                         2,
@@ -7816,7 +7832,7 @@ Module(
                                         Identifier {
                                             id: Name("rest"),
                                             range: 5010..5014,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -7825,11 +7841,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5025..5028,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5025..5028,
                                             },
                                         ),
@@ -7842,11 +7858,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5046..5106,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5052..5053,
                             id: Name("y"),
                             ctx: Load,
@@ -7855,17 +7871,17 @@ Module(
                     cases: [
                         MatchCase {
                             range: 5059..5080,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 5064..5065,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("a"),
                                             range: 5064..5065,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -7873,11 +7889,11 @@ Module(
                             guard: Some(
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5069..5075,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5069..5070,
                                                 id: Name("b"),
                                                 ctx: Store,
@@ -7885,7 +7901,7 @@ Module(
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5074..5075,
                                                 id: Name("c"),
                                                 ctx: Load,
@@ -7897,11 +7913,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5077..5080,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5077..5080,
                                             },
                                         ),
@@ -7911,17 +7927,17 @@ Module(
                         },
                         MatchCase {
                             range: 5085..5106,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchAs(
                                 PatternMatchAs {
+                                    node_index: NodeIndex(None),
                                     range: 5090..5091,
-                                    node_index: AtomicNodeIndex(..),
                                     pattern: None,
                                     name: Some(
                                         Identifier {
                                             id: Name("e"),
                                             range: 5090..5091,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                     ),
                                 },
@@ -7929,11 +7945,11 @@ Module(
                             guard: Some(
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5096..5101,
                                         left: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5096..5097,
                                                 value: Int(
                                                     1,
@@ -7946,7 +7962,7 @@ Module(
                                         comparators: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5100..5101,
                                                     value: Int(
                                                         2,
@@ -7960,11 +7976,11 @@ Module(
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5103..5106,
                                         value: EllipsisLiteral(
                                             ExprEllipsisLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5103..5106,
                                             },
                                         ),
@@ -7977,24 +7993,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5135..5150,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5135..5150,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5135..5147,
                                         left: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5135..5143,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5135..5140,
                                                         id: Name("match"),
                                                         ctx: Load,
@@ -8003,7 +8019,7 @@ Module(
                                                 op: Mult,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5142..5143,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -8014,7 +8030,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5146..5147,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -8024,7 +8040,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5149..5150,
                                         id: Name("c"),
                                         ctx: Load,
@@ -8039,20 +8055,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5176..5193,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5176..5193,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5176..5190,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5176..5181,
                                                 id: Name("match"),
                                                 ctx: Load,
@@ -8061,11 +8077,11 @@ Module(
                                         op: Mult,
                                         right: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5184..5189,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5184..5185,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -8074,7 +8090,7 @@ Module(
                                                 op: Add,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5188..5189,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -8086,7 +8102,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5192..5193,
                                         id: Name("c"),
                                         ctx: Load,
@@ -8101,15 +8117,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5219..5236,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5219..5236,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5219..5224,
                                     id: Name("match"),
                                     ctx: Load,
@@ -8117,19 +8133,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 5225..5236,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5226..5232,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5227..5232,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 5227..5228,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -8138,7 +8154,7 @@ Module(
                                                     op: Add,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 5231..5232,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -8151,7 +8167,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5234..5235,
                                             id: Name("c"),
                                             ctx: Load,
@@ -8166,19 +8182,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5263..5279,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5263..5279,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5263..5275,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5263..5268,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8187,11 +8203,11 @@ Module(
                                     op: Sub,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5270..5275,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5270..5271,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -8200,7 +8216,7 @@ Module(
                                             op: Mult,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5274..5275,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -8213,7 +8229,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5278..5279,
                                     id: Name("c"),
                                     ctx: Load,
@@ -8225,19 +8241,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5306..5324,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5306..5324,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5306..5320,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5306..5311,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8246,11 +8262,11 @@ Module(
                                     op: Sub,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5314..5319,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5314..5315,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -8259,7 +8275,7 @@ Module(
                                             op: Mult,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5318..5319,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -8272,7 +8288,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5323..5324,
                                     id: Name("c"),
                                     ctx: Load,
@@ -8284,23 +8300,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5351..5369,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5351..5369,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5351..5365,
                                     left: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5351..5361,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5351..5356,
                                                     id: Name("match"),
                                                     ctx: Load,
@@ -8308,16 +8324,16 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 5357..5361,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     UnaryOp(
                                                         ExprUnaryOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 5358..5360,
                                                             op: USub,
                                                             operand: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 5359..5360,
                                                                     id: Name("a"),
                                                                     ctx: Load,
@@ -8333,7 +8349,7 @@ Module(
                                     op: Mult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5364..5365,
                                             id: Name("b"),
                                             ctx: Load,
@@ -8344,7 +8360,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5368..5369,
                                     id: Name("c"),
                                     ctx: Load,
@@ -8356,19 +8372,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5397..5407,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5397..5407,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5397..5405,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5397..5402,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8376,7 +8392,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 5403..5405,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -8385,7 +8401,7 @@ Module(
                             attr: Identifier {
                                 id: Name("a"),
                                 range: 5406..5407,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -8394,19 +8410,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5424..5436,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5424..5436,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5424..5434,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5424..5429,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8414,11 +8430,11 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 5430..5434,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5431..5433,
                                                     elts: [],
                                                     ctx: Load,
@@ -8433,7 +8449,7 @@ Module(
                             attr: Identifier {
                                 id: Name("a"),
                                 range: 5435..5436,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -8442,19 +8458,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5455..5468,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5455..5468,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5455..5466,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5455..5460,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8462,11 +8478,11 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 5461..5466,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5462..5464,
                                                     elts: [],
                                                     ctx: Load,
@@ -8481,7 +8497,7 @@ Module(
                             attr: Identifier {
                                 id: Name("a"),
                                 range: 5467..5468,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -8490,19 +8506,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5487..5498,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5487..5498,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5487..5496,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5487..5492,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8510,7 +8526,7 @@ Module(
                                     ),
                                     slice: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5494..5495,
                                             id: Name("a"),
                                             ctx: Load,
@@ -8522,7 +8538,7 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 5497..5498,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -8531,19 +8547,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5516..5528,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5516..5528,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5516..5526,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5516..5521,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8551,12 +8567,12 @@ Module(
                                     ),
                                     slice: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5523..5525,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5523..5524,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -8573,7 +8589,7 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 5527..5528,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -8582,19 +8598,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5569..5583,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5569..5583,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5569..5581,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5569..5574,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8602,12 +8618,12 @@ Module(
                                     ),
                                     slice: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5576..5580,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 5577..5578,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -8624,7 +8640,7 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 5582..5583,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -8633,19 +8649,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5604..5621,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5604..5621,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5604..5611,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5604..5609,
                                             id: Name("match"),
                                             ctx: Load,
@@ -8653,7 +8669,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 5609..5611,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -8661,12 +8677,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5612..5620,
                                     lower: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5612..5613,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -8676,7 +8692,7 @@ Module(
                                     upper: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5619..5620,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -8693,15 +8709,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5641..5660,
                     test: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5644..5654,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5644..5649,
                                     id: Name("match"),
                                     ctx: Store,
@@ -8709,7 +8725,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5653..5654,
                                     value: Int(
                                         1,
@@ -8721,7 +8737,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 5656..5660,
                             },
                         ),
@@ -8731,11 +8747,11 @@ Module(
             ),
             Match(
                 StmtMatch {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5661..5715,
                     subject: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5667..5672,
                             id: Name("match"),
                             ctx: Load,
@@ -8744,14 +8760,14 @@ Module(
                     cases: [
                         MatchCase {
                             range: 5678..5690,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 5683..5684,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5683..5684,
                                             value: Int(
                                                 1,
@@ -8764,7 +8780,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5686..5690,
                                     },
                                 ),
@@ -8772,14 +8788,14 @@ Module(
                         },
                         MatchCase {
                             range: 5695..5715,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             pattern: MatchValue(
                                 PatternMatchValue {
+                                    node_index: NodeIndex(None),
                                     range: 5700..5701,
-                                    node_index: AtomicNodeIndex(..),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5700..5701,
                                             value: Int(
                                                 2,
@@ -8792,7 +8808,7 @@ Module(
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 5711..5715,
                                     },
                                 ),
@@ -8803,12 +8819,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5716..5752,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 5716..5721,
                                 id: Name("match"),
                                 ctx: Store,
@@ -8817,26 +8833,24 @@ Module(
                     ],
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5724..5752,
                             parameters: Some(
                                 Parameters {
                                     range: 5731..5736,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 5731..5736,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 5731..5736,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("query"),
                                                     range: 5731..5736,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -8850,11 +8864,11 @@ Module(
                             ),
                             body: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5738..5752,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5738..5743,
                                             id: Name("query"),
                                             ctx: Load,
@@ -8866,7 +8880,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 5747..5752,
                                                 id: Name("event"),
                                                 ctx: Load,
@@ -8881,15 +8895,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 5753..5769,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5753..5769,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 5753..5758,
                                     id: Name("print"),
                                     ctx: Load,
@@ -8897,15 +8911,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 5758..5769,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 5759..5768,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 5759..5764,
                                                     id: Name("match"),
                                                     ctx: Load,
@@ -8913,11 +8927,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 5764..5768,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 5765..5767,
                                                             value: Int(
                                                                 12,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap
index 7329f1e3a9..698cce3151 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap
@@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/valid/statement/raise.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..289,
         body: [
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 8..13,
                     exc: None,
                     cause: None,
@@ -20,12 +20,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 14..21,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..21,
                                 id: Name("a"),
                                 ctx: Load,
@@ -37,17 +37,17 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 22..34,
                     exc: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 28..34,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 29..30,
                                             id: Name("a"),
                                             ctx: Load,
@@ -55,7 +55,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 32..33,
                                             id: Name("b"),
                                             ctx: Load,
@@ -72,16 +72,16 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 35..46,
                     exc: Some(
                         Compare(
                             ExprCompare {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 41..46,
                                 left: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 41..42,
                                         value: Int(
                                             1,
@@ -94,7 +94,7 @@ Module(
                                 comparators: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 45..46,
                                             value: Int(
                                                 2,
@@ -110,18 +110,18 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 47..60,
                     exc: Some(
                         BoolOp(
                             ExprBoolOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 53..60,
                                 op: And,
                                 values: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 53..54,
                                             id: Name("a"),
                                             ctx: Load,
@@ -129,7 +129,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..60,
                                             id: Name("b"),
                                             ctx: Load,
@@ -144,31 +144,29 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..78,
                     exc: Some(
                         Lambda(
                             ExprLambda {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 67..78,
                                 parameters: Some(
                                     Parameters {
                                         range: 74..75,
-                                        node_index: AtomicNodeIndex(
-                                            0,
-                                        ),
+                                        node_index: NodeIndex(None),
                                         posonlyargs: [],
                                         args: [
                                             ParameterWithDefault {
                                                 range: 74..75,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 parameter: Parameter {
                                                     range: 74..75,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     name: Identifier {
                                                         id: Name("x"),
                                                         range: 74..75,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     annotation: None,
                                                 },
@@ -182,7 +180,7 @@ Module(
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..78,
                                         id: Name("y"),
                                         ctx: Load,
@@ -196,16 +194,16 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 79..92,
                     exc: Some(
                         Await(
                             ExprAwait {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 85..92,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 91..92,
                                         id: Name("x"),
                                         ctx: Load,
@@ -219,23 +217,23 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 93..115,
                     exc: Some(
                         If(
                             ExprIf {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 99..115,
                                 test: BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 104..108,
                                         value: true,
                                     },
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 99..100,
                                         id: Name("x"),
                                         ctx: Load,
@@ -243,7 +241,7 @@ Module(
                                 ),
                                 orelse: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 114..115,
                                         id: Name("y"),
                                         ctx: Load,
@@ -257,12 +255,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 138..152,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 144..145,
                                 id: Name("x"),
                                 ctx: Load,
@@ -272,7 +270,7 @@ Module(
                     cause: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 151..152,
                                 id: Name("a"),
                                 ctx: Load,
@@ -283,12 +281,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 153..172,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 159..160,
                                 id: Name("x"),
                                 ctx: Load,
@@ -298,12 +296,12 @@ Module(
                     cause: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 166..172,
                                 elts: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 167..168,
                                             id: Name("a"),
                                             ctx: Load,
@@ -311,7 +309,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 170..171,
                                             id: Name("b"),
                                             ctx: Load,
@@ -327,12 +325,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 173..191,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 179..180,
                                 id: Name("x"),
                                 ctx: Load,
@@ -342,11 +340,11 @@ Module(
                     cause: Some(
                         Compare(
                             ExprCompare {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 186..191,
                                 left: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 186..187,
                                         value: Int(
                                             1,
@@ -359,7 +357,7 @@ Module(
                                 comparators: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 190..191,
                                             value: Int(
                                                 2,
@@ -374,12 +372,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 192..212,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 198..199,
                                 id: Name("x"),
                                 ctx: Load,
@@ -389,13 +387,13 @@ Module(
                     cause: Some(
                         BoolOp(
                             ExprBoolOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 205..212,
                                 op: And,
                                 values: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 205..206,
                                             id: Name("a"),
                                             ctx: Load,
@@ -403,7 +401,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 211..212,
                                             id: Name("b"),
                                             ctx: Load,
@@ -417,12 +415,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 213..237,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 219..220,
                                 id: Name("x"),
                                 ctx: Load,
@@ -432,26 +430,24 @@ Module(
                     cause: Some(
                         Lambda(
                             ExprLambda {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 226..237,
                                 parameters: Some(
                                     Parameters {
                                         range: 233..234,
-                                        node_index: AtomicNodeIndex(
-                                            0,
-                                        ),
+                                        node_index: NodeIndex(None),
                                         posonlyargs: [],
                                         args: [
                                             ParameterWithDefault {
                                                 range: 233..234,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 parameter: Parameter {
                                                     range: 233..234,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     name: Identifier {
                                                         id: Name("x"),
                                                         range: 233..234,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     annotation: None,
                                                 },
@@ -465,7 +461,7 @@ Module(
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 236..237,
                                         id: Name("y"),
                                         ctx: Load,
@@ -478,12 +474,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 238..258,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 244..245,
                                 id: Name("x"),
                                 ctx: Load,
@@ -493,11 +489,11 @@ Module(
                     cause: Some(
                         Await(
                             ExprAwait {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 251..258,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 257..258,
                                         id: Name("x"),
                                         ctx: Load,
@@ -510,12 +506,12 @@ Module(
             ),
             Raise(
                 StmtRaise {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 259..288,
                     exc: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 265..266,
                                 id: Name("x"),
                                 ctx: Load,
@@ -525,18 +521,18 @@ Module(
                     cause: Some(
                         If(
                             ExprIf {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 272..288,
                                 test: BooleanLiteral(
                                     ExprBooleanLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 277..281,
                                         value: true,
                                     },
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 272..273,
                                         id: Name("x"),
                                         ctx: Load,
@@ -544,7 +540,7 @@ Module(
                                 ),
                                 orelse: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 287..288,
                                         id: Name("y"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap
index 7cb3690ead..cfedbc7332 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap
@@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/valid/statement/return.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..167,
         body: [
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..6,
                     value: None,
                 },
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 7..15,
                     value: Some(
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 14..15,
                                 id: Name("x"),
                                 ctx: Load,
@@ -35,21 +35,21 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..29,
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 23..29,
                                 elts: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 23..25,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 24..25,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -60,11 +60,11 @@ Module(
                                     ),
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 27..29,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 28..29,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -83,16 +83,16 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..45,
                     value: Some(
                         Named(
                             ExprNamed {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 38..44,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 38..39,
                                         id: Name("x"),
                                         ctx: Store,
@@ -100,7 +100,7 @@ Module(
                                 ),
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 43..44,
                                         value: Int(
                                             1,
@@ -114,12 +114,12 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 46..57,
                     value: Some(
                         NoneLiteral(
                             ExprNoneLiteral {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 53..57,
                             },
                         ),
@@ -128,18 +128,18 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..72,
                     value: Some(
                         BoolOp(
                             ExprBoolOp {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..72,
                                 op: And,
                                 values: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 65..66,
                                             id: Name("x"),
                                             ctx: Load,
@@ -147,7 +147,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 71..72,
                                             id: Name("y"),
                                             ctx: Load,
@@ -161,16 +161,16 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 73..85,
                     value: Some(
                         Compare(
                             ExprCompare {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 80..85,
                                 left: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 80..81,
                                         value: Int(
                                             1,
@@ -183,7 +183,7 @@ Module(
                                 comparators: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 84..85,
                                             value: Int(
                                                 2,
@@ -198,17 +198,17 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 86..98,
                     value: Some(
                         Tuple(
                             ExprTuple {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 93..98,
                                 elts: [
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 93..94,
                                             value: Int(
                                                 1,
@@ -217,7 +217,7 @@ Module(
                                     ),
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 96..97,
                                             value: Int(
                                                 2,
@@ -234,16 +234,16 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 99..112,
                     value: Some(
                         Call(
                             ExprCall {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 106..112,
                                 func: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 106..110,
                                         id: Name("call"),
                                         ctx: Load,
@@ -251,7 +251,7 @@ Module(
                                 ),
                                 arguments: Arguments {
                                     range: 110..112,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     args: [],
                                     keywords: [],
                                 },
@@ -262,20 +262,20 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 113..132,
                     value: Some(
                         Call(
                             ExprCall {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 120..132,
                                 func: Attribute(
                                     ExprAttribute {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 120..130,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 120..124,
                                                 id: Name("attr"),
                                                 ctx: Load,
@@ -284,14 +284,14 @@ Module(
                                         attr: Identifier {
                                             id: Name("value"),
                                             range: 125..130,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         ctx: Load,
                                     },
                                 ),
                                 arguments: Arguments {
                                     range: 130..132,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     args: [],
                                     keywords: [],
                                 },
@@ -302,16 +302,16 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 133..147,
                     value: Some(
                         Await(
                             ExprAwait {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 140..147,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 146..147,
                                         id: Name("x"),
                                         ctx: Load,
@@ -324,31 +324,29 @@ Module(
             ),
             Return(
                 StmtReturn {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 148..166,
                     value: Some(
                         Lambda(
                             ExprLambda {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 155..166,
                                 parameters: Some(
                                     Parameters {
                                         range: 162..163,
-                                        node_index: AtomicNodeIndex(
-                                            0,
-                                        ),
+                                        node_index: NodeIndex(None),
                                         posonlyargs: [],
                                         args: [
                                             ParameterWithDefault {
                                                 range: 162..163,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 parameter: Parameter {
                                                     range: 162..163,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     name: Identifier {
                                                         id: Name("x"),
                                                         range: 162..163,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                     },
                                                     annotation: None,
                                                 },
@@ -362,7 +360,7 @@ Module(
                                 ),
                                 body: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 165..166,
                                         id: Name("y"),
                                         ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap
index 3865245dce..ee65e7f1fd 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap
@@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/valid/statement/simple.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..172,
         body: [
             Continue(
                 StmtContinue {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..69,
                 },
             ),
             Break(
                 StmtBreak {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 70..75,
                 },
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 77..86,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 80..81,
                             id: Name("x"),
                             ctx: Load,
@@ -37,11 +37,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 83..86,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 83..86,
                                     },
                                 ),
@@ -53,11 +53,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 87..100,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 90..94,
                             value: true,
                         },
@@ -65,7 +65,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 96..100,
                             },
                         ),
@@ -75,11 +75,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 101..102,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 101..102,
                             value: Int(
                                 1,
@@ -90,11 +90,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 104..105,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 104..105,
                             value: Int(
                                 2,
@@ -105,17 +105,17 @@ Module(
             ),
             Pass(
                 StmtPass {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 107..111,
                 },
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 112..113,
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 112..113,
                             value: Int(
                                 1,
@@ -126,11 +126,11 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 115..118,
                     value: EllipsisLiteral(
                         ExprEllipsisLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 115..118,
                         },
                     ),
@@ -138,15 +138,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 120..133,
                     value: If(
                         ExprIf {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 120..133,
                             test: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 125..126,
                                     id: Name("b"),
                                     ctx: Load,
@@ -154,7 +154,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 120..121,
                                     id: Name("a"),
                                     ctx: Load,
@@ -162,7 +162,7 @@ Module(
                             ),
                             orelse: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 132..133,
                                     id: Name("c"),
                                     ctx: Load,
@@ -174,11 +174,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 135..157,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 138..139,
                             id: Name("c"),
                             ctx: Load,
@@ -187,11 +187,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 141..142,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 141..142,
                                         id: Name("B"),
                                         ctx: Load,
@@ -201,12 +201,12 @@ Module(
                         ),
                         Delete(
                             StmtDelete {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 144..149,
                                 targets: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 148..149,
                                             id: Name("A"),
                                             ctx: Del,
@@ -219,16 +219,16 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 150..157,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Expr(
                                     StmtExpr {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 156..157,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 156..157,
                                                 id: Name("C"),
                                                 ctx: Load,
@@ -243,11 +243,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 158..171,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 161..162,
                             id: Name("x"),
                             ctx: Load,
@@ -256,16 +256,16 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 164..171,
                                 value: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 164..171,
                                         value: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 170..171,
                                                     id: Name("x"),
                                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap
index e6021299e9..6aae2f4228 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/try.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..1223,
         body: [
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..28,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 9..12,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 9..12,
                                     },
                                 ),
@@ -32,17 +32,17 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 13..28,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 25..28,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 25..28,
                                                 },
                                             ),
@@ -59,16 +59,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 30..106,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 39..42,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 39..42,
                                     },
                                 ),
@@ -79,11 +79,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 43..74,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 50..60,
                                             id: Name("Exception1"),
                                             ctx: Load,
@@ -94,17 +94,17 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 64..65,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 71..74,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 71..74,
                                                 },
                                             ),
@@ -116,11 +116,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 75..106,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..92,
                                             id: Name("Exception2"),
                                             ctx: Load,
@@ -131,17 +131,17 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 96..97,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 103..106,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 103..106,
                                                 },
                                             ),
@@ -158,16 +158,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 108..184,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 117..120,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 117..120,
                                     },
                                 ),
@@ -178,11 +178,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 121..151,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 128..137,
                                             id: Name("Exception"),
                                             ctx: Load,
@@ -193,17 +193,17 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 141..142,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 148..151,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 148..151,
                                                 },
                                             ),
@@ -215,17 +215,17 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 152..167,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 164..167,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 164..167,
                                                 },
                                             ),
@@ -239,11 +239,11 @@ Module(
                     finalbody: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 181..184,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 181..184,
                                     },
                                 ),
@@ -255,16 +255,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 186..228,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 195..198,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 195..198,
                                     },
                                 ),
@@ -275,17 +275,17 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 199..214,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 211..214,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 211..214,
                                                 },
                                             ),
@@ -298,11 +298,11 @@ Module(
                     orelse: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 225..228,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 225..228,
                                     },
                                 ),
@@ -315,16 +315,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 230..289,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 239..242,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 239..242,
                                     },
                                 ),
@@ -335,17 +335,17 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 243..258,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: None,
                                 name: None,
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 255..258,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 255..258,
                                                 },
                                             ),
@@ -358,11 +358,11 @@ Module(
                     orelse: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 269..272,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 269..272,
                                     },
                                 ),
@@ -372,11 +372,11 @@ Module(
                     finalbody: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 286..289,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 286..289,
                                     },
                                 ),
@@ -388,16 +388,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 291..320,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 300..303,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 300..303,
                                     },
                                 ),
@@ -409,11 +409,11 @@ Module(
                     finalbody: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 317..320,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 317..320,
                                     },
                                 ),
@@ -425,16 +425,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 322..365,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 331..334,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 331..334,
                                     },
                                 ),
@@ -445,11 +445,11 @@ Module(
                     orelse: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 345..348,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 345..348,
                                     },
                                 ),
@@ -459,11 +459,11 @@ Module(
                     finalbody: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 362..365,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 362..365,
                                     },
                                 ),
@@ -475,16 +475,16 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 367..441,
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 376..379,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 376..379,
                                     },
                                 ),
@@ -495,11 +495,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 380..409,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 388..394,
                                             id: Name("GroupA"),
                                             ctx: Load,
@@ -510,17 +510,17 @@ Module(
                                     Identifier {
                                         id: Name("eg"),
                                         range: 398..400,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 406..409,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 406..409,
                                                 },
                                             ),
@@ -532,11 +532,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 410..441,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 418..432,
                                             id: Name("ExceptionGroup"),
                                             ctx: Load,
@@ -547,11 +547,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 438..441,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 438..441,
                                                 },
                                             ),
@@ -568,21 +568,21 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 443..577,
                     body: [
                         Raise(
                             StmtRaise {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 452..471,
                                 exc: Some(
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 458..471,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 458..468,
                                                     id: Name("ValueError"),
                                                     ctx: Load,
@@ -590,11 +590,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 468..471,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 469..470,
                                                             value: Int(
                                                                 1,
@@ -615,11 +615,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 472..525,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 479..488,
                                             id: Name("TypeError"),
                                             ctx: Load,
@@ -630,21 +630,21 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 492..493,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 499..525,
                                             value: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 499..525,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 499..504,
                                                             id: Name("print"),
                                                             ctx: Load,
@@ -652,37 +652,37 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 504..525,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             FString(
                                                                 ExprFString {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 505..524,
                                                                     value: FStringValue {
                                                                         inner: Single(
                                                                             FString(
                                                                                 FString {
                                                                                     range: 505..524,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     elements: [
                                                                                         Literal(
                                                                                             InterpolatedStringLiteralElement {
                                                                                                 range: 507..514,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "caught ",
                                                                                             },
                                                                                         ),
                                                                                         Interpolation(
                                                                                             InterpolatedElement {
                                                                                                 range: 514..523,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 expression: Call(
                                                                                                     ExprCall {
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         range: 515..522,
                                                                                                         func: Name(
                                                                                                             ExprName {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 515..519,
                                                                                                                 id: Name("type"),
                                                                                                                 ctx: Load,
@@ -690,11 +690,11 @@ Module(
                                                                                                         ),
                                                                                                         arguments: Arguments {
                                                                                                             range: 519..522,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                             args: [
                                                                                                                 Name(
                                                                                                                     ExprName {
-                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                        node_index: NodeIndex(None),
                                                                                                                         range: 520..521,
                                                                                                                         id: Name("e"),
                                                                                                                         ctx: Load,
@@ -715,6 +715,7 @@ Module(
                                                                                         quote_style: Double,
                                                                                         prefix: Regular,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -735,11 +736,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 526..577,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 533..540,
                                             id: Name("OSError"),
                                             ctx: Load,
@@ -750,21 +751,21 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 544..545,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 551..577,
                                             value: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 551..577,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 551..556,
                                                             id: Name("print"),
                                                             ctx: Load,
@@ -772,37 +773,37 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 556..577,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             FString(
                                                                 ExprFString {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 557..576,
                                                                     value: FStringValue {
                                                                         inner: Single(
                                                                             FString(
                                                                                 FString {
                                                                                     range: 557..576,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     elements: [
                                                                                         Literal(
                                                                                             InterpolatedStringLiteralElement {
                                                                                                 range: 559..566,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "caught ",
                                                                                             },
                                                                                         ),
                                                                                         Interpolation(
                                                                                             InterpolatedElement {
                                                                                                 range: 566..575,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 expression: Call(
                                                                                                     ExprCall {
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         range: 567..574,
                                                                                                         func: Name(
                                                                                                             ExprName {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 567..571,
                                                                                                                 id: Name("type"),
                                                                                                                 ctx: Load,
@@ -810,11 +811,11 @@ Module(
                                                                                                         ),
                                                                                                         arguments: Arguments {
                                                                                                             range: 571..574,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                             args: [
                                                                                                                 Name(
                                                                                                                     ExprName {
-                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                        node_index: NodeIndex(None),
                                                                                                                         range: 572..573,
                                                                                                                         id: Name("e"),
                                                                                                                         ctx: Load,
@@ -835,6 +836,7 @@ Module(
                                                                                         quote_style: Double,
                                                                                         prefix: Regular,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -860,21 +862,21 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 579..831,
                     body: [
                         Raise(
                             StmtRaise {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 588..669,
                                 exc: Some(
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 594..669,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 594..608,
                                                     id: Name("ExceptionGroup"),
                                                     ctx: Load,
@@ -882,22 +884,23 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 608..669,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     StringLiteral(
                                                         ExprStringLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 609..613,
                                                             value: StringLiteralValue {
                                                                 inner: Single(
                                                                     StringLiteral {
                                                                         range: 609..613,
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         value: "eg",
                                                                         flags: StringLiteralFlags {
                                                                             quote_style: Double,
                                                                             prefix: Empty,
                                                                             triple_quoted: false,
+                                                                            unclosed: false,
                                                                         },
                                                                     },
                                                                 ),
@@ -906,16 +909,16 @@ Module(
                                                     ),
                                                     List(
                                                         ExprList {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 615..668,
                                                             elts: [
                                                                 Call(
                                                                     ExprCall {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 616..629,
                                                                         func: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 616..626,
                                                                                 id: Name("ValueError"),
                                                                                 ctx: Load,
@@ -923,11 +926,11 @@ Module(
                                                                         ),
                                                                         arguments: Arguments {
                                                                             range: 626..629,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             args: [
                                                                                 NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 627..628,
                                                                                         value: Int(
                                                                                             1,
@@ -941,11 +944,11 @@ Module(
                                                                 ),
                                                                 Call(
                                                                     ExprCall {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 631..643,
                                                                         func: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 631..640,
                                                                                 id: Name("TypeError"),
                                                                                 ctx: Load,
@@ -953,11 +956,11 @@ Module(
                                                                         ),
                                                                         arguments: Arguments {
                                                                             range: 640..643,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             args: [
                                                                                 NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 641..642,
                                                                                         value: Int(
                                                                                             2,
@@ -971,11 +974,11 @@ Module(
                                                                 ),
                                                                 Call(
                                                                     ExprCall {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 645..655,
                                                                         func: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 645..652,
                                                                                 id: Name("OSError"),
                                                                                 ctx: Load,
@@ -983,11 +986,11 @@ Module(
                                                                         ),
                                                                         arguments: Arguments {
                                                                             range: 652..655,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             args: [
                                                                                 NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 653..654,
                                                                                         value: Int(
                                                                                             3,
@@ -1001,11 +1004,11 @@ Module(
                                                                 ),
                                                                 Call(
                                                                     ExprCall {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 657..667,
                                                                         func: Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 657..664,
                                                                                 id: Name("OSError"),
                                                                                 ctx: Load,
@@ -1013,11 +1016,11 @@ Module(
                                                                         ),
                                                                         arguments: Arguments {
                                                                             range: 664..667,
-                                                                            node_index: AtomicNodeIndex(..),
+                                                                            node_index: NodeIndex(None),
                                                                             args: [
                                                                                 NumberLiteral(
                                                                                     ExprNumberLiteral {
-                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                        node_index: NodeIndex(None),
                                                                                         range: 665..666,
                                                                                         value: Int(
                                                                                             4,
@@ -1047,11 +1050,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 670..751,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 678..687,
                                             id: Name("TypeError"),
                                             ctx: Load,
@@ -1062,21 +1065,21 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 691..692,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 698..751,
                                             value: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 698..751,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 698..703,
                                                             id: Name("print"),
                                                             ctx: Load,
@@ -1084,37 +1087,37 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 703..751,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             FString(
                                                                 ExprFString {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 704..750,
                                                                     value: FStringValue {
                                                                         inner: Single(
                                                                             FString(
                                                                                 FString {
                                                                                     range: 704..750,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     elements: [
                                                                                         Literal(
                                                                                             InterpolatedStringLiteralElement {
                                                                                                 range: 706..713,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "caught ",
                                                                                             },
                                                                                         ),
                                                                                         Interpolation(
                                                                                             InterpolatedElement {
                                                                                                 range: 713..722,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 expression: Call(
                                                                                                     ExprCall {
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         range: 714..721,
                                                                                                         func: Name(
                                                                                                             ExprName {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 714..718,
                                                                                                                 id: Name("type"),
                                                                                                                 ctx: Load,
@@ -1122,11 +1125,11 @@ Module(
                                                                                                         ),
                                                                                                         arguments: Arguments {
                                                                                                             range: 718..721,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                             args: [
                                                                                                                 Name(
                                                                                                                     ExprName {
-                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                        node_index: NodeIndex(None),
                                                                                                                         range: 719..720,
                                                                                                                         id: Name("e"),
                                                                                                                         ctx: Load,
@@ -1145,21 +1148,21 @@ Module(
                                                                                         Literal(
                                                                                             InterpolatedStringLiteralElement {
                                                                                                 range: 722..735,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: " with nested ",
                                                                                             },
                                                                                         ),
                                                                                         Interpolation(
                                                                                             InterpolatedElement {
                                                                                                 range: 735..749,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 expression: Attribute(
                                                                                                     ExprAttribute {
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         range: 736..748,
                                                                                                         value: Name(
                                                                                                             ExprName {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 736..737,
                                                                                                                 id: Name("e"),
                                                                                                                 ctx: Load,
@@ -1168,7 +1171,7 @@ Module(
                                                                                                         attr: Identifier {
                                                                                                             id: Name("exceptions"),
                                                                                                             range: 738..748,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                         },
                                                                                                         ctx: Load,
                                                                                                     },
@@ -1183,6 +1186,7 @@ Module(
                                                                                         quote_style: Double,
                                                                                         prefix: Regular,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -1203,11 +1207,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 752..831,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 760..767,
                                             id: Name("OSError"),
                                             ctx: Load,
@@ -1218,21 +1222,21 @@ Module(
                                     Identifier {
                                         id: Name("e"),
                                         range: 771..772,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                 ),
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 778..831,
                                             value: Call(
                                                 ExprCall {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 778..831,
                                                     func: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 778..783,
                                                             id: Name("print"),
                                                             ctx: Load,
@@ -1240,37 +1244,37 @@ Module(
                                                     ),
                                                     arguments: Arguments {
                                                         range: 783..831,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         args: [
                                                             FString(
                                                                 ExprFString {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 784..830,
                                                                     value: FStringValue {
                                                                         inner: Single(
                                                                             FString(
                                                                                 FString {
                                                                                     range: 784..830,
-                                                                                    node_index: AtomicNodeIndex(..),
+                                                                                    node_index: NodeIndex(None),
                                                                                     elements: [
                                                                                         Literal(
                                                                                             InterpolatedStringLiteralElement {
                                                                                                 range: 786..793,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: "caught ",
                                                                                             },
                                                                                         ),
                                                                                         Interpolation(
                                                                                             InterpolatedElement {
                                                                                                 range: 793..802,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 expression: Call(
                                                                                                     ExprCall {
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         range: 794..801,
                                                                                                         func: Name(
                                                                                                             ExprName {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 794..798,
                                                                                                                 id: Name("type"),
                                                                                                                 ctx: Load,
@@ -1278,11 +1282,11 @@ Module(
                                                                                                         ),
                                                                                                         arguments: Arguments {
                                                                                                             range: 798..801,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                             args: [
                                                                                                                 Name(
                                                                                                                     ExprName {
-                                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                                        node_index: NodeIndex(None),
                                                                                                                         range: 799..800,
                                                                                                                         id: Name("e"),
                                                                                                                         ctx: Load,
@@ -1301,21 +1305,21 @@ Module(
                                                                                         Literal(
                                                                                             InterpolatedStringLiteralElement {
                                                                                                 range: 802..815,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 value: " with nested ",
                                                                                             },
                                                                                         ),
                                                                                         Interpolation(
                                                                                             InterpolatedElement {
                                                                                                 range: 815..829,
-                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                node_index: NodeIndex(None),
                                                                                                 expression: Attribute(
                                                                                                     ExprAttribute {
-                                                                                                        node_index: AtomicNodeIndex(..),
+                                                                                                        node_index: NodeIndex(None),
                                                                                                         range: 816..828,
                                                                                                         value: Name(
                                                                                                             ExprName {
-                                                                                                                node_index: AtomicNodeIndex(..),
+                                                                                                                node_index: NodeIndex(None),
                                                                                                                 range: 816..817,
                                                                                                                 id: Name("e"),
                                                                                                                 ctx: Load,
@@ -1324,7 +1328,7 @@ Module(
                                                                                                         attr: Identifier {
                                                                                                             id: Name("exceptions"),
                                                                                                             range: 818..828,
-                                                                                                            node_index: AtomicNodeIndex(..),
+                                                                                                            node_index: NodeIndex(None),
                                                                                                         },
                                                                                                         ctx: Load,
                                                                                                     },
@@ -1339,6 +1343,7 @@ Module(
                                                                                         quote_style: Double,
                                                                                         prefix: Regular,
                                                                                         triple_quoted: false,
+                                                                                        unclosed: false,
                                                                                     },
                                                                                 },
                                                                             ),
@@ -1364,12 +1369,12 @@ Module(
             ),
             Try(
                 StmtTry {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 833..1075,
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 842..846,
                             },
                         ),
@@ -1378,22 +1383,23 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 847..875,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     StringLiteral(
                                         ExprStringLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 854..865,
                                             value: StringLiteralValue {
                                                 inner: Single(
                                                     StringLiteral {
                                                         range: 854..865,
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         value: "exception",
                                                         flags: StringLiteralFlags {
                                                             quote_style: Double,
                                                             prefix: Empty,
                                                             triple_quoted: false,
+                                                            unclosed: false,
                                                         },
                                                     },
                                                 ),
@@ -1405,7 +1411,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 871..875,
                                         },
                                     ),
@@ -1415,11 +1421,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 876..894,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 883..884,
                                             value: Int(
                                                 1,
@@ -1431,7 +1437,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 890..894,
                                         },
                                     ),
@@ -1441,11 +1447,11 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 895..916,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 902..906,
                                             value: true,
                                         },
@@ -1455,7 +1461,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 912..916,
                                         },
                                     ),
@@ -1465,15 +1471,15 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 917..939,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 924..929,
                                             left: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 924..925,
                                                     value: Int(
                                                         1,
@@ -1483,7 +1489,7 @@ Module(
                                             op: Add,
                                             right: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 928..929,
                                                     value: Int(
                                                         1,
@@ -1497,7 +1503,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 935..939,
                                         },
                                     ),
@@ -1507,15 +1513,15 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 940..962,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 947..952,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 947..948,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -1524,7 +1530,7 @@ Module(
                                             op: BitOr,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 951..952,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -1537,7 +1543,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 958..962,
                                         },
                                     ),
@@ -1547,17 +1553,17 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 963..987,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     BoolOp(
                                         ExprBoolOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 970..977,
                                             op: And,
                                             values: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 970..971,
                                                         id: Name("x"),
                                                         ctx: Load,
@@ -1565,7 +1571,7 @@ Module(
                                                 ),
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 976..977,
                                                         id: Name("y"),
                                                         ctx: Load,
@@ -1579,7 +1585,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 983..987,
                                         },
                                     ),
@@ -1589,15 +1595,15 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 988..1012,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 995..1002,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1001..1002,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -1610,7 +1616,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1008..1012,
                                         },
                                     ),
@@ -1620,30 +1626,28 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 1013..1041,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     Lambda(
                                         ExprLambda {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1020..1031,
                                             parameters: Some(
                                                 Parameters {
                                                     range: 1027..1028,
-                                                    node_index: AtomicNodeIndex(
-                                                        0,
-                                                    ),
+                                                    node_index: NodeIndex(None),
                                                     posonlyargs: [],
                                                     args: [
                                                         ParameterWithDefault {
                                                             range: 1027..1028,
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             parameter: Parameter {
                                                                 range: 1027..1028,
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 name: Identifier {
                                                                     id: Name("x"),
                                                                     range: 1027..1028,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                 },
                                                                 annotation: None,
                                                             },
@@ -1657,7 +1661,7 @@ Module(
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1030..1031,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -1670,7 +1674,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1037..1041,
                                         },
                                     ),
@@ -1680,22 +1684,22 @@ Module(
                         ExceptHandler(
                             ExceptHandlerExceptHandler {
                                 range: 1042..1075,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 type_: Some(
                                     If(
                                         ExprIf {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1049..1065,
                                             test: BooleanLiteral(
                                                 ExprBooleanLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1054..1058,
                                                     value: true,
                                                 },
                                             ),
                                             body: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1049..1050,
                                                     id: Name("x"),
                                                     ctx: Load,
@@ -1703,7 +1707,7 @@ Module(
                                             ),
                                             orelse: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1064..1065,
                                                     id: Name("y"),
                                                     ctx: Load,
@@ -1716,7 +1720,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1071..1075,
                                         },
                                     ),
@@ -1731,11 +1735,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1077..1222,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1080..1084,
                             value: true,
                         },
@@ -1743,12 +1747,12 @@ Module(
                     body: [
                         Try(
                             StmtTry {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1090..1133,
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1103..1107,
                                         },
                                     ),
@@ -1758,7 +1762,7 @@ Module(
                                 finalbody: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1129..1133,
                                         },
                                     ),
@@ -1770,12 +1774,12 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 1208..1222,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1218..1222,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap
index ca837dcde3..6b807b46b0 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/type.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..1828,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..12,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 9..12,
                             id: Name("int"),
                             ctx: Load,
@@ -35,11 +35,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 13..31,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 18..19,
                             id: Name("X"),
                             ctx: Store,
@@ -48,11 +48,11 @@ Module(
                     type_params: None,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 22..31,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 22..25,
                                     id: Name("int"),
                                     ctx: Load,
@@ -61,7 +61,7 @@ Module(
                             op: BitOr,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 28..31,
                                     id: Name("str"),
                                     ctx: Load,
@@ -73,11 +73,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 32..60,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 37..38,
                             id: Name("X"),
                             ctx: Store,
@@ -86,11 +86,11 @@ Module(
                     type_params: None,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 41..60,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 41..44,
                                     id: Name("int"),
                                     ctx: Load,
@@ -99,18 +99,19 @@ Module(
                             op: BitOr,
                             right: StringLiteral(
                                 ExprStringLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..60,
                                     value: StringLiteralValue {
                                         inner: Single(
                                             StringLiteral {
                                                 range: 47..60,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 value: "ForwardRefY",
                                                 flags: StringLiteralFlags {
                                                     quote_style: Double,
                                                     prefix: Empty,
                                                     triple_quoted: false,
+                                                    unclosed: false,
                                                 },
                                             },
                                         ),
@@ -123,11 +124,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 61..87,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 66..67,
                             id: Name("X"),
                             ctx: Store,
@@ -136,16 +137,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 67..70,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 68..69,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 68..69,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -156,11 +157,11 @@ Module(
                     ),
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 73..87,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 73..74,
                                     id: Name("T"),
                                     ctx: Load,
@@ -169,11 +170,11 @@ Module(
                             op: BitOr,
                             right: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 77..87,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 77..81,
                                             id: Name("list"),
                                             ctx: Load,
@@ -181,11 +182,11 @@ Module(
                                     ),
                                     slice: Subscript(
                                         ExprSubscript {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 82..86,
                                             value: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 82..83,
                                                     id: Name("X"),
                                                     ctx: Load,
@@ -193,7 +194,7 @@ Module(
                                             ),
                                             slice: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 84..85,
                                                     id: Name("T"),
                                                     ctx: Load,
@@ -211,11 +212,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 101..116,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 106..107,
                             id: Name("X"),
                             ctx: Store,
@@ -224,16 +225,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 107..110,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 108..109,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 108..109,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -244,7 +245,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 113..116,
                             id: Name("int"),
                             ctx: Load,
@@ -254,11 +255,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 117..145,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 122..123,
                             id: Name("X"),
                             ctx: Store,
@@ -267,16 +268,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 123..126,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 124..125,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 124..125,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -287,15 +288,15 @@ Module(
                     ),
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 129..145,
                             left: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 129..136,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 129..133,
                                             id: Name("list"),
                                             ctx: Load,
@@ -303,7 +304,7 @@ Module(
                                     ),
                                     slice: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 134..135,
                                             id: Name("T"),
                                             ctx: Load,
@@ -315,11 +316,11 @@ Module(
                             op: BitOr,
                             right: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 139..145,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 139..142,
                                             id: Name("set"),
                                             ctx: Load,
@@ -327,7 +328,7 @@ Module(
                                     ),
                                     slice: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 143..144,
                                             id: Name("T"),
                                             ctx: Load,
@@ -342,11 +343,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 146..178,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 151..152,
                             id: Name("X"),
                             ctx: Store,
@@ -355,16 +356,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 152..165,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 153..154,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 153..154,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -372,24 +373,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 156..159,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 157..159,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 161..164,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 163..164,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -399,12 +400,12 @@ Module(
                     ),
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 168..178,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 169..170,
                                         id: Name("T"),
                                         ctx: Load,
@@ -412,7 +413,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 172..174,
                                         id: Name("Ts"),
                                         ctx: Load,
@@ -420,7 +421,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 176..177,
                                         id: Name("P"),
                                         ctx: Load,
@@ -435,11 +436,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 179..216,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 184..185,
                             id: Name("X"),
                             ctx: Store,
@@ -448,21 +449,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 185..203,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 186..192,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 186..187,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 189..192,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -474,24 +475,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 194..197,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 195..197,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 199..202,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 201..202,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -501,12 +502,12 @@ Module(
                     ),
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 206..216,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 207..208,
                                         id: Name("T"),
                                         ctx: Load,
@@ -514,7 +515,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 210..212,
                                         id: Name("Ts"),
                                         ctx: Load,
@@ -522,7 +523,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 214..215,
                                         id: Name("P"),
                                         ctx: Load,
@@ -537,11 +538,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 217..261,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 222..223,
                             id: Name("X"),
                             ctx: Store,
@@ -550,26 +551,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 223..248,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 224..237,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 224..225,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 227..237,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 228..231,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -577,7 +578,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 233..236,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -594,24 +595,24 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 239..242,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 240..242,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 244..247,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 246..247,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -621,12 +622,12 @@ Module(
                     ),
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 251..261,
                             elts: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 252..253,
                                         id: Name("T"),
                                         ctx: Load,
@@ -634,7 +635,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 255..257,
                                         id: Name("Ts"),
                                         ctx: Load,
@@ -642,7 +643,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 259..260,
                                         id: Name("P"),
                                         ctx: Load,
@@ -657,11 +658,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 262..287,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 267..268,
                             id: Name("X"),
                             ctx: Store,
@@ -670,22 +671,22 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 268..277,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 269..276,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 269..270,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 273..276,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -699,11 +700,11 @@ Module(
                     ),
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 280..287,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 280..281,
                                     id: Name("T"),
                                     ctx: Load,
@@ -712,7 +713,7 @@ Module(
                             op: BitOr,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 284..287,
                                     id: Name("str"),
                                     ctx: Load,
@@ -724,11 +725,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 288..330,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 293..294,
                             id: Name("X"),
                             ctx: Store,
@@ -737,25 +738,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 294..314,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 295..313,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 295..296,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 298..307,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 298..301,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -764,7 +765,7 @@ Module(
                                                     op: BitOr,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 304..307,
                                                             id: Name("str"),
                                                             ctx: Load,
@@ -776,7 +777,7 @@ Module(
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 310..313,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -790,15 +791,15 @@ Module(
                     ),
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 317..330,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 317..324,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 317..318,
                                             id: Name("T"),
                                             ctx: Load,
@@ -807,7 +808,7 @@ Module(
                                     op: BitOr,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 321..324,
                                             id: Name("int"),
                                             ctx: Load,
@@ -818,7 +819,7 @@ Module(
                             op: BitOr,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 327..330,
                                     id: Name("str"),
                                     ctx: Load,
@@ -830,11 +831,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 331..384,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 336..337,
                             id: Name("X"),
                             ctx: Store,
@@ -843,29 +844,29 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 337..361,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 338..360,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 339..341,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 344..360,
                                                     value: Subscript(
                                                         ExprSubscript {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 345..360,
                                                             value: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 345..350,
                                                                     id: Name("tuple"),
                                                                     ctx: Load,
@@ -873,12 +874,12 @@ Module(
                                                             ),
                                                             slice: Tuple(
                                                                 ExprTuple {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 351..359,
                                                                     elts: [
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 351..354,
                                                                                 id: Name("int"),
                                                                                 ctx: Load,
@@ -886,7 +887,7 @@ Module(
                                                                         ),
                                                                         Name(
                                                                             ExprName {
-                                                                                node_index: AtomicNodeIndex(..),
+                                                                                node_index: NodeIndex(None),
                                                                                 range: 356..359,
                                                                                 id: Name("str"),
                                                                                 ctx: Load,
@@ -911,11 +912,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 364..384,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 364..369,
                                     id: Name("tuple"),
                                     ctx: Load,
@@ -923,12 +924,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 370..383,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 370..373,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -936,11 +937,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 375..378,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 376..378,
                                                         id: Name("Ts"),
                                                         ctx: Load,
@@ -951,7 +952,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 380..383,
                                                 id: Name("str"),
                                                 ctx: Load,
@@ -969,11 +970,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 385..428,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 390..391,
                             id: Name("X"),
                             ctx: Store,
@@ -982,26 +983,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 391..409,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 392..408,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 394..395,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             List(
                                                 ExprList {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 398..408,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 399..402,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -1009,7 +1010,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 404..407,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -1027,11 +1028,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 412..428,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 412..420,
                                     id: Name("Callable"),
                                     ctx: Load,
@@ -1039,12 +1040,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 421..427,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 421..422,
                                                 id: Name("P"),
                                                 ctx: Load,
@@ -1052,7 +1053,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 424..427,
                                                 id: Name("str"),
                                                 ctx: Load,
@@ -1070,11 +1071,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 459..474,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 464..468,
                             id: Name("type"),
                             ctx: Store,
@@ -1083,7 +1084,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 471..474,
                             id: Name("int"),
                             ctx: Load,
@@ -1093,11 +1094,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 475..491,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 480..485,
                             id: Name("match"),
                             ctx: Store,
@@ -1106,7 +1107,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 488..491,
                             id: Name("int"),
                             ctx: Load,
@@ -1116,11 +1117,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 492..507,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 497..501,
                             id: Name("case"),
                             ctx: Store,
@@ -1129,7 +1130,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 504..507,
                             id: Name("int"),
                             ctx: Load,
@@ -1139,11 +1140,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 533..548,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 538..541,
                             id: Name("foo"),
                             ctx: Store,
@@ -1152,7 +1153,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 544..548,
                             id: Name("type"),
                             ctx: Load,
@@ -1162,11 +1163,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 549..565,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 554..557,
                             id: Name("foo"),
                             ctx: Store,
@@ -1175,7 +1176,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 560..565,
                             id: Name("match"),
                             ctx: Load,
@@ -1185,11 +1186,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 566..581,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 571..574,
                             id: Name("foo"),
                             ctx: Store,
@@ -1198,7 +1199,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 577..581,
                             id: Name("case"),
                             ctx: Load,
@@ -1208,11 +1209,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 605..620,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 613..614,
                             id: Name("X"),
                             ctx: Store,
@@ -1221,7 +1222,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 617..620,
                             id: Name("int"),
                             ctx: Load,
@@ -1231,11 +1232,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 621..636,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 626..627,
                             id: Name("X"),
                             ctx: Store,
@@ -1244,7 +1245,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 633..636,
                             id: Name("int"),
                             ctx: Load,
@@ -1254,11 +1255,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 637..652,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 642..643,
                             id: Name("X"),
                             ctx: Store,
@@ -1267,7 +1268,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 649..652,
                             id: Name("int"),
                             ctx: Load,
@@ -1277,11 +1278,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 653..673,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 658..659,
                             id: Name("X"),
                             ctx: Store,
@@ -1290,7 +1291,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 668..671,
                             id: Name("int"),
                             ctx: Load,
@@ -1300,11 +1301,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 674..693,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 685..686,
                             id: Name("X"),
                             ctx: Store,
@@ -1313,16 +1314,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 686..689,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 687..688,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 687..688,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -1333,7 +1334,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 692..693,
                             id: Name("T"),
                             ctx: Load,
@@ -1343,11 +1344,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 694..714,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 699..700,
                             id: Name("X"),
                             ctx: Store,
@@ -1356,16 +1357,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 707..710,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 708..709,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 708..709,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -1376,7 +1377,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 713..714,
                             id: Name("T"),
                             ctx: Load,
@@ -1386,11 +1387,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 715..734,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 720..721,
                             id: Name("X"),
                             ctx: Store,
@@ -1399,16 +1400,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 721..724,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 722..723,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 722..723,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -1419,7 +1420,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 733..734,
                             id: Name("T"),
                             ctx: Load,
@@ -1429,11 +1430,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 756..768,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 761..762,
                             id: Name("X"),
                             ctx: Store,
@@ -1442,7 +1443,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 765..768,
                             id: Name("int"),
                             ctx: Load,
@@ -1452,11 +1453,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 770..782,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 775..776,
                             id: Name("X"),
                             ctx: Store,
@@ -1465,7 +1466,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 779..782,
                             id: Name("str"),
                             ctx: Load,
@@ -1475,11 +1476,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 784..797,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 789..790,
                             id: Name("X"),
                             ctx: Store,
@@ -1488,7 +1489,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 793..797,
                             id: Name("type"),
                             ctx: Load,
@@ -1498,24 +1499,24 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 798..819,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("X"),
                         range: 804..805,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: None,
                     body: [
                         TypeAlias(
                             StmtTypeAlias {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 807..819,
                                 name: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 812..813,
                                         id: Name("X"),
                                         ctx: Store,
@@ -1524,7 +1525,7 @@ Module(
                                 type_params: None,
                                 value: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 816..819,
                                         id: Name("int"),
                                         ctx: Load,
@@ -1537,11 +1538,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 821..853,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 826..831,
                             id: Name("Point"),
                             ctx: Store,
@@ -1550,11 +1551,11 @@ Module(
                     type_params: None,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 834..853,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 834..839,
                                     id: Name("tuple"),
                                     ctx: Load,
@@ -1562,12 +1563,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 840..852,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 840..845,
                                                 id: Name("float"),
                                                 ctx: Load,
@@ -1575,7 +1576,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 847..852,
                                                 id: Name("float"),
                                                 ctx: Load,
@@ -1593,11 +1594,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 854..881,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 859..864,
                             id: Name("Point"),
                             ctx: Store,
@@ -1606,16 +1607,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 864..867,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 865..866,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 865..866,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -1626,11 +1627,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 870..881,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 870..875,
                                     id: Name("tuple"),
                                     ctx: Load,
@@ -1638,12 +1639,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 876..880,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 876..877,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -1651,7 +1652,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 879..880,
                                                 id: Name("T"),
                                                 ctx: Load,
@@ -1669,11 +1670,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 882..918,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 887..894,
                             id: Name("IntFunc"),
                             ctx: Store,
@@ -1682,16 +1683,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 894..899,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 895..898,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 897..898,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -1701,11 +1702,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 902..918,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 902..910,
                                     id: Name("Callable"),
                                     ctx: Load,
@@ -1713,12 +1714,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 911..917,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 911..912,
                                                 id: Name("P"),
                                                 ctx: Load,
@@ -1726,7 +1727,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 914..917,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -1744,11 +1745,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 932..972,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 937..949,
                             id: Name("LabeledTuple"),
                             ctx: Store,
@@ -1757,16 +1758,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 949..954,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 950..953,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 951..953,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -1776,11 +1777,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 957..972,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 957..962,
                                     id: Name("tuple"),
                                     ctx: Load,
@@ -1788,12 +1789,12 @@ Module(
                             ),
                             slice: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 963..971,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 963..966,
                                                 id: Name("str"),
                                                 ctx: Load,
@@ -1801,11 +1802,11 @@ Module(
                                         ),
                                         Starred(
                                             ExprStarred {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 968..971,
                                                 value: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 969..971,
                                                         id: Name("Ts"),
                                                         ctx: Load,
@@ -1826,11 +1827,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 989..1037,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 994..1010,
                             id: Name("HashableSequence"),
                             ctx: Store,
@@ -1839,21 +1840,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 1010..1023,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1011..1022,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 1011..1012,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1014..1022,
                                                     id: Name("Hashable"),
                                                     ctx: Load,
@@ -1868,11 +1869,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1026..1037,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1026..1034,
                                     id: Name("Sequence"),
                                     ctx: Load,
@@ -1880,7 +1881,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1035..1036,
                                     id: Name("T"),
                                     ctx: Load,
@@ -1893,11 +1894,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1060..1110,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1065..1081,
                             id: Name("IntOrStrSequence"),
                             ctx: Store,
@@ -1906,26 +1907,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 1081..1096,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 1082..1095,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 1082..1083,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1085..1095,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 1086..1089,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -1933,7 +1934,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 1091..1094,
                                                                 id: Name("str"),
                                                                 ctx: Load,
@@ -1953,11 +1954,11 @@ Module(
                     ),
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1099..1110,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1099..1107,
                                     id: Name("Sequence"),
                                     ctx: Load,
@@ -1965,7 +1966,7 @@ Module(
                             ),
                             slice: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1108..1109,
                                     id: Name("T"),
                                     ctx: Load,
@@ -1978,24 +1979,24 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1164..1178,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1164..1178,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1164..1175,
                                         left: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1164..1171,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1164..1168,
                                                         id: Name("type"),
                                                         ctx: Load,
@@ -2004,7 +2005,7 @@ Module(
                                                 op: Mult,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1170..1171,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -2015,7 +2016,7 @@ Module(
                                         op: Add,
                                         right: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1174..1175,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -2025,7 +2026,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1177..1178,
                                         id: Name("c"),
                                         ctx: Load,
@@ -2040,20 +2041,20 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1203..1219,
                     value: Tuple(
                         ExprTuple {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1203..1219,
                             elts: [
                                 BinOp(
                                     ExprBinOp {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1203..1216,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1203..1207,
                                                 id: Name("type"),
                                                 ctx: Load,
@@ -2062,11 +2063,11 @@ Module(
                                         op: Mult,
                                         right: BinOp(
                                             ExprBinOp {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1210..1215,
                                                 left: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1210..1211,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -2075,7 +2076,7 @@ Module(
                                                 op: Add,
                                                 right: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1214..1215,
                                                         id: Name("b"),
                                                         ctx: Load,
@@ -2087,7 +2088,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1218..1219,
                                         id: Name("c"),
                                         ctx: Load,
@@ -2102,15 +2103,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1244..1260,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1244..1260,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1244..1248,
                                     id: Name("type"),
                                     ctx: Load,
@@ -2118,19 +2119,19 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 1249..1260,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Starred(
                                         ExprStarred {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1250..1256,
                                             value: BinOp(
                                                 ExprBinOp {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1251..1256,
                                                     left: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1251..1252,
                                                             id: Name("a"),
                                                             ctx: Load,
@@ -2139,7 +2140,7 @@ Module(
                                                     op: Add,
                                                     right: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1255..1256,
                                                             id: Name("b"),
                                                             ctx: Load,
@@ -2152,7 +2153,7 @@ Module(
                                     ),
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1258..1259,
                                             id: Name("c"),
                                             ctx: Load,
@@ -2167,19 +2168,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1286..1301,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1286..1301,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1286..1297,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1286..1290,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2188,11 +2189,11 @@ Module(
                                     op: Sub,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1292..1297,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1292..1293,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -2201,7 +2202,7 @@ Module(
                                             op: Mult,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1296..1297,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -2214,7 +2215,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1300..1301,
                                     id: Name("c"),
                                     ctx: Load,
@@ -2226,19 +2227,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1327..1344,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1327..1344,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1327..1340,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1327..1331,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2247,11 +2248,11 @@ Module(
                                     op: Sub,
                                     right: BinOp(
                                         ExprBinOp {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1334..1339,
                                             left: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1334..1335,
                                                     id: Name("a"),
                                                     ctx: Load,
@@ -2260,7 +2261,7 @@ Module(
                                             op: Mult,
                                             right: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1338..1339,
                                                     id: Name("b"),
                                                     ctx: Load,
@@ -2273,7 +2274,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1343..1344,
                                     id: Name("c"),
                                     ctx: Load,
@@ -2285,23 +2286,23 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1370..1387,
                     value: BinOp(
                         ExprBinOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1370..1387,
                             left: BinOp(
                                 ExprBinOp {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1370..1383,
                                     left: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1370..1379,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1370..1374,
                                                     id: Name("type"),
                                                     ctx: Load,
@@ -2309,16 +2310,16 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 1375..1379,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     UnaryOp(
                                                         ExprUnaryOp {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1376..1378,
                                                             op: USub,
                                                             operand: Name(
                                                                 ExprName {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 1377..1378,
                                                                     id: Name("a"),
                                                                     ctx: Load,
@@ -2334,7 +2335,7 @@ Module(
                                     op: Mult,
                                     right: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1382..1383,
                                             id: Name("b"),
                                             ctx: Load,
@@ -2345,7 +2346,7 @@ Module(
                             op: Add,
                             right: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1386..1387,
                                     id: Name("c"),
                                     ctx: Load,
@@ -2357,19 +2358,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1414..1423,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1414..1423,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1414..1421,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1414..1418,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2377,7 +2378,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1419..1421,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2386,7 +2387,7 @@ Module(
                             attr: Identifier {
                                 id: Name("a"),
                                 range: 1422..1423,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -2395,19 +2396,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1439..1450,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1439..1450,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1439..1448,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1439..1443,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2415,11 +2416,11 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1444..1448,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1445..1447,
                                                     elts: [],
                                                     ctx: Load,
@@ -2434,7 +2435,7 @@ Module(
                             attr: Identifier {
                                 id: Name("a"),
                                 range: 1449..1450,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -2443,19 +2444,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1468..1480,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1468..1480,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1468..1478,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1468..1472,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2463,11 +2464,11 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1473..1478,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1474..1476,
                                                     elts: [],
                                                     ctx: Load,
@@ -2482,7 +2483,7 @@ Module(
                             attr: Identifier {
                                 id: Name("a"),
                                 range: 1479..1480,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -2491,19 +2492,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1498..1508,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1498..1508,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1498..1506,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1498..1502,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2511,7 +2512,7 @@ Module(
                                     ),
                                     slice: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1504..1505,
                                             id: Name("a"),
                                             ctx: Load,
@@ -2523,7 +2524,7 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 1507..1508,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -2532,19 +2533,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1525..1536,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1525..1536,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1525..1534,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1525..1529,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2552,12 +2553,12 @@ Module(
                                     ),
                                     slice: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1531..1533,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1531..1532,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -2574,7 +2575,7 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 1535..1536,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -2583,19 +2584,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1575..1588,
                     value: Attribute(
                         ExprAttribute {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1575..1588,
                             value: Subscript(
                                 ExprSubscript {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1575..1586,
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1575..1579,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2603,12 +2604,12 @@ Module(
                                     ),
                                     slice: Tuple(
                                         ExprTuple {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1581..1585,
                                             elts: [
                                                 Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 1582..1583,
                                                         id: Name("a"),
                                                         ctx: Load,
@@ -2625,7 +2626,7 @@ Module(
                             attr: Identifier {
                                 id: Name("b"),
                                 range: 1587..1588,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                             },
                             ctx: Load,
                         },
@@ -2634,19 +2635,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1608..1624,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1608..1624,
                             value: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1608..1614,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1608..1612,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2654,7 +2655,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 1612..1614,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -2662,12 +2663,12 @@ Module(
                             ),
                             slice: Slice(
                                 ExprSlice {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1615..1623,
                                     lower: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1615..1616,
                                                 id: Name("a"),
                                                 ctx: Load,
@@ -2677,7 +2678,7 @@ Module(
                                     upper: Some(
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1622..1623,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -2694,15 +2695,15 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1643..1661,
                     test: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1646..1655,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1646..1650,
                                     id: Name("type"),
                                     ctx: Store,
@@ -2710,7 +2711,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1654..1655,
                                     value: Int(
                                         1,
@@ -2722,7 +2723,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1657..1661,
                             },
                         ),
@@ -2732,12 +2733,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1662..1697,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1662..1666,
                                 id: Name("type"),
                                 ctx: Store,
@@ -2746,26 +2747,24 @@ Module(
                     ],
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1669..1697,
                             parameters: Some(
                                 Parameters {
                                     range: 1676..1681,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 1676..1681,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 1676..1681,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("query"),
                                                     range: 1676..1681,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -2779,11 +2778,11 @@ Module(
                             ),
                             body: Compare(
                                 ExprCompare {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1683..1697,
                                     left: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1683..1688,
                                             id: Name("query"),
                                             ctx: Load,
@@ -2795,7 +2794,7 @@ Module(
                                     comparators: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1692..1697,
                                                 id: Name("event"),
                                                 ctx: Load,
@@ -2810,15 +2809,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1698..1713,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1698..1713,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1698..1703,
                                     id: Name("print"),
                                     ctx: Load,
@@ -2826,15 +2825,15 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 1703..1713,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1704..1712,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 1704..1708,
                                                     id: Name("type"),
                                                     ctx: Load,
@@ -2842,11 +2841,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 1708..1712,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 1709..1711,
                                                             value: Int(
                                                                 12,
@@ -2867,15 +2866,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1714..1724,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1714..1724,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1714..1718,
                                     id: Name("type"),
                                     ctx: Load,
@@ -2883,11 +2882,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 1718..1724,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1719..1723,
                                             id: Name("type"),
                                             ctx: Load,
@@ -2902,12 +2901,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1725..1743,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1725..1726,
                                 id: Name("a"),
                                 ctx: Store,
@@ -2916,11 +2915,11 @@ Module(
                     ],
                     value: Compare(
                         ExprCompare {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1732..1741,
                             left: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1732..1736,
                                     id: Name("type"),
                                     ctx: Load,
@@ -2932,7 +2931,7 @@ Module(
                             comparators: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 1740..1741,
                                         id: Name("C"),
                                         ctx: Load,
@@ -2945,12 +2944,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1744..1760,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1744..1745,
                                 id: Name("a"),
                                 ctx: Store,
@@ -2959,11 +2958,11 @@ Module(
                     ],
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1751..1758,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1751..1755,
                                     id: Name("type"),
                                     ctx: Load,
@@ -2971,11 +2970,11 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 1755..1758,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [
                                     Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 1756..1757,
                                             id: Name("b"),
                                             ctx: Load,
@@ -2990,15 +2989,15 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1761..1778,
                     value: Call(
                         ExprCall {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1761..1778,
                             func: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1761..1765,
                                     id: Name("type"),
                                     ctx: Load,
@@ -3006,22 +3005,22 @@ Module(
                             ),
                             arguments: Arguments {
                                 range: 1766..1778,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 args: [],
                                 keywords: [
                                     Keyword {
                                         range: 1769..1776,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         arg: Some(
                                             Identifier {
                                                 id: Name("X"),
                                                 range: 1769..1770,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                             },
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 1773..1776,
                                                 id: Name("int"),
                                                 ctx: Load,
@@ -3036,12 +3035,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1779..1787,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1779..1783,
                                 id: Name("type"),
                                 ctx: Store,
@@ -3050,7 +3049,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1786..1787,
                             value: Int(
                                 1,
@@ -3061,12 +3060,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1788..1800,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1788..1792,
                                 id: Name("type"),
                                 ctx: Store,
@@ -3074,7 +3073,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1795..1796,
                                 id: Name("x"),
                                 ctx: Store,
@@ -3083,7 +3082,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1799..1800,
                             value: Int(
                                 1,
@@ -3094,12 +3093,12 @@ Module(
             ),
             Assign(
                 StmtAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1801..1813,
                     targets: [
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1801..1802,
                                 id: Name("x"),
                                 ctx: Store,
@@ -3107,7 +3106,7 @@ Module(
                         ),
                         Name(
                             ExprName {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 1805..1809,
                                 id: Name("type"),
                                 ctx: Store,
@@ -3116,7 +3115,7 @@ Module(
                     ],
                     value: NumberLiteral(
                         ExprNumberLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1812..1813,
                             value: Int(
                                 1,
@@ -3127,30 +3126,28 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 1814..1828,
                     value: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 1814..1828,
                             parameters: Some(
                                 Parameters {
                                     range: 1821..1822,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 1821..1822,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 1821..1822,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 1821..1822,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -3164,7 +3161,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 1824..1828,
                                     id: Name("type"),
                                     ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap
index 5c2e2603e1..211ddf7e05 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/while.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..314,
         body: [
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..16,
                     test: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 6..7,
                             id: Name("x"),
                             ctx: Load,
@@ -25,11 +25,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 13..16,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 13..16,
                                     },
                                 ),
@@ -41,21 +41,21 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..61,
                     test: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 24..37,
                             op: And,
                             values: [
                                 Compare(
                                     ExprCompare {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 25..30,
                                         left: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 25..26,
                                                 id: Name("x"),
                                                 ctx: Load,
@@ -67,7 +67,7 @@ Module(
                                         comparators: [
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 29..30,
                                                     value: Int(
                                                         1,
@@ -79,7 +79,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 36..37,
                                         id: Name("y"),
                                         ctx: Load,
@@ -91,7 +91,7 @@ Module(
                     body: [
                         Pass(
                             StmtPass {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 43..47,
                             },
                         ),
@@ -99,11 +99,11 @@ Module(
                     orelse: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 58..61,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 58..61,
                                     },
                                 ),
@@ -114,17 +114,17 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..152,
                     test: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 69..76,
                             op: And,
                             values: [
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 69..70,
                                         id: Name("x"),
                                         ctx: Load,
@@ -132,7 +132,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 75..76,
                                         id: Name("y"),
                                         ctx: Load,
@@ -144,11 +144,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 82..85,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 82..85,
                                     },
                                 ),
@@ -156,15 +156,15 @@ Module(
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 90..111,
                                 value: Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 90..111,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 90..95,
                                                 id: Name("print"),
                                                 ctx: Load,
@@ -172,22 +172,23 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 95..111,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [
                                                 StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 96..110,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 96..110,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "Hello World!",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Single,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -205,15 +206,15 @@ Module(
                     orelse: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 123..144,
                                 value: Call(
                                     ExprCall {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 123..144,
                                         func: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 123..128,
                                                 id: Name("print"),
                                                 ctx: Load,
@@ -221,22 +222,23 @@ Module(
                                         ),
                                         arguments: Arguments {
                                             range: 128..144,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             args: [
                                                 StringLiteral(
                                                     ExprStringLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 129..143,
                                                         value: StringLiteralValue {
                                                             inner: Single(
                                                                 StringLiteral {
                                                                     range: 129..143,
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     value: "Olá, Mundo!",
                                                                     flags: StringLiteralFlags {
                                                                         quote_style: Single,
                                                                         prefix: Empty,
                                                                         triple_quoted: false,
+                                                                        unclosed: false,
                                                                     },
                                                                 },
                                                             ),
@@ -252,11 +254,11 @@ Module(
                         ),
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 149..152,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 149..152,
                                     },
                                 ),
@@ -267,15 +269,15 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 154..171,
                     test: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 160..166,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 160..161,
                                     id: Name("a"),
                                     ctx: Store,
@@ -283,7 +285,7 @@ Module(
                             ),
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 165..166,
                                     id: Name("b"),
                                     ctx: Load,
@@ -294,11 +296,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 168..171,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 168..171,
                                     },
                                 ),
@@ -310,21 +312,21 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 172..197,
                     test: BoolOp(
                         ExprBoolOp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 178..192,
                             op: And,
                             values: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 179..185,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 179..180,
                                                 id: Name("a"),
                                                 ctx: Store,
@@ -332,7 +334,7 @@ Module(
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 184..185,
                                                 id: Name("b"),
                                                 ctx: Load,
@@ -342,7 +344,7 @@ Module(
                                 ),
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 191..192,
                                         id: Name("c"),
                                         ctx: Load,
@@ -354,11 +356,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 194..197,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 194..197,
                                     },
                                 ),
@@ -370,30 +372,28 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 198..220,
                     test: Lambda(
                         ExprLambda {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 204..215,
                             parameters: Some(
                                 Parameters {
                                     range: 211..212,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 211..212,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 211..212,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 211..212,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: None,
                                             },
@@ -407,7 +407,7 @@ Module(
                             ),
                             body: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 214..215,
                                     id: Name("x"),
                                     ctx: Load,
@@ -418,11 +418,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 217..220,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 217..220,
                                     },
                                 ),
@@ -434,15 +434,15 @@ Module(
             ),
             While(
                 StmtWhile {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 221..239,
                     test: Await(
                         ExprAwait {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 227..234,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 233..234,
                                     id: Name("x"),
                                     ctx: Load,
@@ -453,11 +453,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 236..239,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 236..239,
                                     },
                                 ),
@@ -469,11 +469,11 @@ Module(
             ),
             If(
                 StmtIf {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 241..313,
                     test: BooleanLiteral(
                         ExprBooleanLiteral {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 244..248,
                             value: true,
                         },
@@ -481,11 +481,11 @@ Module(
                     body: [
                         While(
                             StmtWhile {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 254..298,
                                 test: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 260..261,
                                         id: Name("x"),
                                         ctx: Load,
@@ -494,7 +494,7 @@ Module(
                                 body: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 271..275,
                                         },
                                     ),
@@ -502,7 +502,7 @@ Module(
                                 orelse: [
                                     Pass(
                                         StmtPass {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 294..298,
                                         },
                                     ),
@@ -513,12 +513,12 @@ Module(
                     elif_else_clauses: [
                         ElifElseClause {
                             range: 299..313,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             test: None,
                             body: [
                                 Pass(
                                     StmtPass {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 309..313,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap
index 993b8cc48a..7919e803c8 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap
@@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/with.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..361,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 137..151,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 142..146,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 142..146,
                                     id: Name("item"),
                                     ctx: Load,
@@ -33,11 +33,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 148..151,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 148..151,
                                     },
                                 ),
@@ -48,16 +48,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 152..171,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 157..166,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 157..161,
                                     id: Name("item"),
                                     ctx: Load,
@@ -66,7 +66,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 165..166,
                                         id: Name("f"),
                                         ctx: Store,
@@ -78,11 +78,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 168..171,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 168..171,
                                     },
                                 ),
@@ -93,16 +93,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 172..194,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 177..182,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 177..182,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -112,10 +112,10 @@ Module(
                         },
                         WithItem {
                             range: 184..189,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 184..189,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -127,11 +127,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 191..194,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 191..194,
                                     },
                                 ),
@@ -142,16 +142,16 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 195..229,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 200..211,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 200..205,
                                     id: Name("item1"),
                                     ctx: Load,
@@ -160,7 +160,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 209..211,
                                         id: Name("f1"),
                                         ctx: Store,
@@ -170,10 +170,10 @@ Module(
                         },
                         WithItem {
                             range: 213..224,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 213..218,
                                     id: Name("item2"),
                                     ctx: Load,
@@ -182,7 +182,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 222..224,
                                         id: Name("f2"),
                                         ctx: Store,
@@ -194,11 +194,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 226..229,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 226..229,
                                     },
                                 ),
@@ -209,27 +209,27 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 231..257,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 236..252,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 236..252,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 241..245,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 236..237,
                                             id: Name("x"),
                                             ctx: Load,
@@ -237,7 +237,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 251..252,
                                             id: Name("y"),
                                             ctx: Load,
@@ -251,11 +251,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 254..257,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 254..257,
                                     },
                                 ),
@@ -266,27 +266,27 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 258..289,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 263..284,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: If(
                                 ExprIf {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 263..279,
                                     test: BooleanLiteral(
                                         ExprBooleanLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 268..272,
                                             value: true,
                                         },
                                     ),
                                     body: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 263..264,
                                             id: Name("x"),
                                             ctx: Load,
@@ -294,7 +294,7 @@ Module(
                                     ),
                                     orelse: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 278..279,
                                             id: Name("y"),
                                             ctx: Load,
@@ -305,7 +305,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 283..284,
                                         id: Name("f"),
                                         ctx: Store,
@@ -317,11 +317,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 286..289,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 286..289,
                                     },
                                 ),
@@ -332,20 +332,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 313..334,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 318..329,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 318..324,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 318..322,
                                             id: Name("open"),
                                             ctx: Load,
@@ -353,7 +353,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 322..324,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -362,7 +362,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 328..329,
                                         id: Name("f"),
                                         ctx: Store,
@@ -374,11 +374,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 331..334,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 331..334,
                                     },
                                 ),
@@ -389,20 +389,20 @@ Module(
             ),
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 335..361,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 340..356,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Call(
                                 ExprCall {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 340..346,
                                     func: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 340..344,
                                             id: Name("open"),
                                             ctx: Load,
@@ -410,7 +410,7 @@ Module(
                                     ),
                                     arguments: Arguments {
                                         range: 344..346,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [],
                                         keywords: [],
                                     },
@@ -419,11 +419,11 @@ Module(
                             optional_vars: Some(
                                 Attribute(
                                     ExprAttribute {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 350..356,
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 350..351,
                                                 id: Name("f"),
                                                 ctx: Load,
@@ -432,7 +432,7 @@ Module(
                                         attr: Identifier {
                                             id: Name("attr"),
                                             range: 352..356,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         ctx: Store,
                                     },
@@ -443,11 +443,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 358..361,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 358..361,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap
index ba9ecb9c20..e714e59451 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap
@@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/ok/template_strings_py314
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..89,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..52,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..52,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 44..52,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 46..51,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 47..50,
                                                             id: Name("hey"),
                                                             ctx: Load,
@@ -46,6 +46,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -56,25 +57,25 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 53..63,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..63,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 53..63,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Interpolation(
                                                 InterpolatedElement {
                                                     range: 55..62,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     expression: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 56..61,
                                                             id: Name("there"),
                                                             ctx: Load,
@@ -90,6 +91,7 @@ Module(
                                             quote_style: Single,
                                             prefix: Regular,
                                             triple_quoted: false,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
@@ -100,22 +102,22 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 64..88,
                     value: TString(
                         ExprTString {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 64..88,
                             value: TStringValue {
                                 inner: Single(
                                     TString {
                                         range: 64..88,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         elements: [
                                             Literal(
                                                 InterpolatedStringLiteralElement {
                                                     range: 68..85,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     value: "what's\nhappening?",
                                                 },
                                             ),
@@ -124,6 +126,7 @@ Module(
                                             quote_style: Double,
                                             prefix: Regular,
                                             triple_quoted: true,
+                                            unclosed: false,
                                         },
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap
index 46550ad231..230855ad42 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap
@@ -7,26 +7,26 @@ input_file: crates/ruff_python_parser/resources/inline/ok/tuple_context_manager_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..85,
         body: [
             With(
                 StmtWith {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..84,
                     is_async: false,
                     items: [
                         WithItem {
                             range: 48..79,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             context_expr: Tuple(
                                 ExprTuple {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..72,
                                     elts: [
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 52..55,
                                                 id: Name("foo"),
                                                 ctx: Load,
@@ -34,7 +34,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 59..62,
                                                 id: Name("bar"),
                                                 ctx: Load,
@@ -42,7 +42,7 @@ Module(
                                         ),
                                         Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 66..69,
                                                 id: Name("baz"),
                                                 ctx: Load,
@@ -56,7 +56,7 @@ Module(
                             optional_vars: Some(
                                 Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 76..79,
                                         id: Name("tup"),
                                         ctx: Store,
@@ -68,11 +68,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 81..84,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 81..84,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap
index 8387c4e874..df2192d1fb 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_default_py3
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..112,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..65,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..50,
                             id: Name("X"),
                             ctx: Store,
@@ -25,22 +25,22 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 50..59,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 51..58,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 51..52,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 55..58,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -54,7 +54,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 62..65,
                             id: Name("int"),
                             ctx: Load,
@@ -64,34 +64,34 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 66..87,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 70..71,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 71..80,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 72..79,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 72..73,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 76..79,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -105,9 +105,7 @@ Module(
                     ),
                     parameters: Parameters {
                         range: 80..82,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -118,11 +116,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 84..87,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 84..87,
                                     },
                                 ),
@@ -133,33 +131,33 @@ Module(
             ),
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..111,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("C"),
                         range: 94..95,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: Some(
                         TypeParams {
                             range: 95..104,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 96..103,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 96..97,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 100..103,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -174,7 +172,7 @@ Module(
                     arguments: Some(
                         Arguments {
                             range: 104..106,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [],
                             keywords: [],
                         },
@@ -182,11 +180,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 108..111,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 108..111,
                                     },
                                 ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap
index 18801458d7..abeecd8020 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_param_spec.
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..90,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 7..10,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 9..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -44,7 +44,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..17,
                             id: Name("int"),
                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..41,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             id: Name("X"),
                             ctx: Store,
@@ -67,21 +67,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 24..35,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 25..34,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 27..28,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 31..34,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -95,7 +95,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..41,
                             id: Name("int"),
                             ctx: Load,
@@ -105,11 +105,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..62,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("X"),
                             ctx: Store,
@@ -118,16 +118,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 48..56,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 49..50,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 49..50,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -135,12 +135,12 @@ Module(
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 52..55,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 54..55,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -150,7 +150,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 59..62,
                             id: Name("int"),
                             ctx: Load,
@@ -160,11 +160,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 63..89,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 68..69,
                             id: Name("X"),
                             ctx: Store,
@@ -173,16 +173,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 69..83,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 70..71,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 70..71,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -190,17 +190,17 @@ Module(
                                 ),
                                 ParamSpec(
                                     TypeParamParamSpec {
+                                        node_index: NodeIndex(None),
                                         range: 73..82,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("P"),
                                             range: 75..76,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 79..82,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -214,7 +214,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 86..89,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap
index 1e340b41b1..e3aad35342 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_type_var.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..147,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..15,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..9,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 7..8,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 7..8,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -45,7 +45,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 12..15,
                             id: Name("int"),
                             ctx: Load,
@@ -55,11 +55,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 16..37,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 21..22,
                             id: Name("X"),
                             ctx: Store,
@@ -68,22 +68,22 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 22..31,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 23..30,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 23..24,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 27..30,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -97,7 +97,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 34..37,
                             id: Name("int"),
                             ctx: Load,
@@ -107,11 +107,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 38..64,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..44,
                             id: Name("X"),
                             ctx: Store,
@@ -120,21 +120,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 44..58,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 45..57,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 45..46,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 48..51,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -144,7 +144,7 @@ Module(
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 54..57,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -158,7 +158,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 61..64,
                             id: Name("int"),
                             ctx: Load,
@@ -168,11 +168,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 65..98,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 70..71,
                             id: Name("X"),
                             ctx: Store,
@@ -181,26 +181,26 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 71..92,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 72..91,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 72..73,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 75..85,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 76..79,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -208,7 +208,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 81..84,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -223,7 +223,7 @@ Module(
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 88..91,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -237,7 +237,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 95..98,
                             id: Name("int"),
                             ctx: Load,
@@ -247,11 +247,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 99..146,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 104..105,
                             id: Name("X"),
                             ctx: Store,
@@ -260,21 +260,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 105..140,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 106..118,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 106..107,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 109..112,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -284,7 +284,7 @@ Module(
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 115..118,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -295,22 +295,22 @@ Module(
                                 ),
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 120..139,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("U"),
                                             range: 120..121,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: Some(
                                             Tuple(
                                                 ExprTuple {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 123..133,
                                                     elts: [
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 124..127,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -318,7 +318,7 @@ Module(
                                                         ),
                                                         Name(
                                                             ExprName {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 129..132,
                                                                 id: Name("int"),
                                                                 ctx: Load,
@@ -333,7 +333,7 @@ Module(
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 136..139,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -347,7 +347,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 143..146,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap
index aa50926d78..715499e6fd 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_type_var_tu
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..115,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..17,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 5..6,
                             id: Name("X"),
                             ctx: Store,
@@ -25,16 +25,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 6..11,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 7..10,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 8..10,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -44,7 +44,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 14..17,
                             id: Name("int"),
                             ctx: Load,
@@ -54,11 +54,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 18..41,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 23..24,
                             id: Name("X"),
                             ctx: Store,
@@ -67,21 +67,21 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 24..35,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 25..34,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 26..28,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 31..34,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -95,7 +95,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 38..41,
                             id: Name("int"),
                             ctx: Load,
@@ -105,11 +105,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 42..66,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 47..48,
                             id: Name("X"),
                             ctx: Store,
@@ -118,25 +118,25 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 48..60,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 49..59,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 50..52,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Starred(
                                                 ExprStarred {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 55..59,
                                                     value: Name(
                                                         ExprName {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 56..59,
                                                             id: Name("int"),
                                                             ctx: Load,
@@ -153,7 +153,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 63..66,
                             id: Name("int"),
                             ctx: Load,
@@ -163,11 +163,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 67..87,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 72..73,
                             id: Name("X"),
                             ctx: Store,
@@ -176,16 +176,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 73..81,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 74..75,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 74..75,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -193,12 +193,12 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 77..80,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 78..80,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: None,
                                     },
@@ -208,7 +208,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 84..87,
                             id: Name("int"),
                             ctx: Load,
@@ -218,11 +218,11 @@ Module(
             ),
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 88..114,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 93..94,
                             id: Name("X"),
                             ctx: Store,
@@ -231,16 +231,16 @@ Module(
                     type_params: Some(
                         TypeParams {
                             range: 94..108,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             type_params: [
                                 TypeVar(
                                     TypeParamTypeVar {
+                                        node_index: NodeIndex(None),
                                         range: 95..96,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("T"),
                                             range: 95..96,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         bound: None,
                                         default: None,
@@ -248,17 +248,17 @@ Module(
                                 ),
                                 TypeVarTuple(
                                     TypeParamTypeVarTuple {
+                                        node_index: NodeIndex(None),
                                         range: 98..107,
-                                        node_index: AtomicNodeIndex(..),
                                         name: Identifier {
                                             id: Name("Ts"),
                                             range: 99..101,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                         },
                                         default: Some(
                                             Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 104..107,
                                                     id: Name("int"),
                                                     ctx: Load,
@@ -272,7 +272,7 @@ Module(
                     ),
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 111..114,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap
index 7e590b4515..c1849f86cc 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_stmt_py312.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..57,
         body: [
             TypeAlias(
                 StmtTypeAlias {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..56,
                     name: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 49..50,
                             id: Name("x"),
                             ctx: Store,
@@ -25,7 +25,7 @@ Module(
                     type_params: None,
                     value: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 53..56,
                             id: Name("int"),
                             ctx: Load,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap
index 92c7cefb86..1f121dbd2d 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/unparenthesized_named_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..53,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..52,
                     value: Subscript(
                         ExprSubscript {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..52,
                             value: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 43..46,
                                     id: Name("lst"),
                                     ctx: Load,
@@ -28,11 +28,11 @@ Module(
                             ),
                             slice: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 47..51,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 47..48,
                                             id: Name("x"),
                                             ctx: Store,
@@ -40,7 +40,7 @@ Module(
                                     ),
                                     value: NumberLiteral(
                                         ExprNumberLiteral {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 50..51,
                                             value: Int(
                                                 1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap
index 0f8b9f47b7..e95fef868f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap
@@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/ok/unparenthesized_named_
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..88,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 43..57,
                     value: Set(
                         ExprSet {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 43..57,
                             elts: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 44..50,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 44..45,
                                                 id: Name("x"),
                                                 ctx: Store,
@@ -33,7 +33,7 @@ Module(
                                         ),
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 49..50,
                                                 value: Int(
                                                     1,
@@ -44,7 +44,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 52..53,
                                         value: Int(
                                             2,
@@ -53,7 +53,7 @@ Module(
                                 ),
                                 NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 55..56,
                                         value: Int(
                                             3,
@@ -67,19 +67,19 @@ Module(
             ),
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 58..87,
                     value: SetComp(
                         ExprSetComp {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 58..87,
                             elt: Named(
                                 ExprNamed {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 59..68,
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 59..63,
                                             id: Name("last"),
                                             ctx: Store,
@@ -87,7 +87,7 @@ Module(
                                     ),
                                     value: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 67..68,
                                             id: Name("x"),
                                             ctx: Load,
@@ -98,10 +98,10 @@ Module(
                             generators: [
                                 Comprehension {
                                     range: 69..86,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     target: Name(
                                         ExprName {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 73..74,
                                             id: Name("x"),
                                             ctx: Store,
@@ -109,11 +109,11 @@ Module(
                                     ),
                                     iter: Call(
                                         ExprCall {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 78..86,
                                             func: Name(
                                                 ExprName {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 78..83,
                                                     id: Name("range"),
                                                     ctx: Load,
@@ -121,11 +121,11 @@ Module(
                                             ),
                                             arguments: Arguments {
                                                 range: 83..86,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 args: [
                                                     NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 84..85,
                                                             value: Int(
                                                                 3,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap
index f4de814c8d..87c63be67c 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap
@@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/ok/valid_annotation_class
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..137,
         body: [
             ClassDef(
                 StmtClassDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 0..23,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("F"),
                         range: 6..7,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     arguments: Some(
                         Arguments {
                             range: 7..18,
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             args: [
                                 Named(
                                     ExprNamed {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 8..17,
                                         target: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 8..9,
                                                 id: Name("y"),
                                                 ctx: Store,
@@ -40,7 +40,7 @@ Module(
                                         ),
                                         value: Name(
                                             ExprName {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 13..17,
                                                 id: Name("list"),
                                                 ctx: Load,
@@ -55,11 +55,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 20..23,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 20..23,
                                     },
                                 ),
@@ -70,21 +70,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 24..93,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 28..29,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 29..31,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -95,28 +93,28 @@ Module(
                     body: [
                         ClassDef(
                             StmtClassDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 37..60,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("G"),
                                     range: 43..44,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 arguments: Some(
                                     Arguments {
                                         range: 44..55,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Yield(
                                                 ExprYield {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 46..53,
                                                     value: Some(
                                                         NumberLiteral(
                                                             ExprNumberLiteral {
-                                                                node_index: AtomicNodeIndex(..),
+                                                                node_index: NodeIndex(None),
                                                                 range: 52..53,
                                                                 value: Int(
                                                                     1,
@@ -133,11 +131,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 57..60,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 57..60,
                                                 },
                                             ),
@@ -148,27 +146,27 @@ Module(
                         ),
                         ClassDef(
                             StmtClassDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..93,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("H"),
                                     range: 71..72,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 arguments: Some(
                                     Arguments {
                                         range: 72..88,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             YieldFrom(
                                                 ExprYieldFrom {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 74..86,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 85..86,
                                                             value: Int(
                                                                 1,
@@ -184,11 +182,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 90..93,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 90..93,
                                                 },
                                             ),
@@ -202,21 +200,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 94..136,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 104..105,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 105..107,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -227,27 +223,27 @@ Module(
                     body: [
                         ClassDef(
                             StmtClassDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 113..136,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("G"),
                                     range: 119..120,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 arguments: Some(
                                     Arguments {
                                         range: 120..131,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         args: [
                                             Await(
                                                 ExprAwait {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 122..129,
                                                     value: NumberLiteral(
                                                         ExprNumberLiteral {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 128..129,
                                                             value: Int(
                                                                 1,
@@ -263,11 +259,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 133..136,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 133..136,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap
index c1c32f5605..c70dedf89f 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap
@@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/valid_annotation_funct
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..316,
         body: [
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..68,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("f"),
                         range: 48..49,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 49..51,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -36,11 +34,11 @@ Module(
                     returns: Some(
                         Named(
                             ExprNamed {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 56..62,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 56..57,
                                         id: Name("y"),
                                         ctx: Store,
@@ -48,7 +46,7 @@ Module(
                                 ),
                                 value: NumberLiteral(
                                     ExprNumberLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 61..62,
                                         value: Int(
                                             3,
@@ -61,11 +59,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 65..68,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 65..68,
                                     },
                                 ),
@@ -76,42 +74,40 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 69..94,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("g"),
                         range: 73..74,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 74..89,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [
                             ParameterWithDefault {
                                 range: 75..88,
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 parameter: Parameter {
                                     range: 75..88,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     name: Identifier {
                                         id: Name("arg"),
                                         range: 75..78,
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                     },
                                     annotation: Some(
                                         Named(
                                             ExprNamed {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 81..87,
                                                 target: Name(
                                                     ExprName {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 81..82,
                                                         id: Name("x"),
                                                         ctx: Store,
@@ -119,7 +115,7 @@ Module(
                                                 ),
                                                 value: NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 86..87,
                                                         value: Int(
                                                             1,
@@ -141,11 +137,11 @@ Module(
                     body: [
                         Expr(
                             StmtExpr {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 91..94,
                                 value: EllipsisLiteral(
                                     ExprEllipsisLiteral {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 91..94,
                                     },
                                 ),
@@ -156,21 +152,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 95..235,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 99..104,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 104..106,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -181,43 +175,41 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 112..136,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("i"),
                                     range: 116..117,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 117..131,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 118..130,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 118..130,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 118..119,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: Some(
                                                     Yield(
                                                         ExprYield {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 122..129,
                                                             value: Some(
                                                                 NumberLiteral(
                                                                     ExprNumberLiteral {
-                                                                        node_index: AtomicNodeIndex(..),
+                                                                        node_index: NodeIndex(None),
                                                                         range: 128..129,
                                                                         value: Int(
                                                                             1,
@@ -240,11 +232,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 133..136,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 133..136,
                                                 },
                                             ),
@@ -255,21 +247,19 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 141..166,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("k"),
                                     range: 145..146,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 146..148,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -279,12 +269,12 @@ Module(
                                 returns: Some(
                                     Yield(
                                         ExprYield {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 153..160,
                                             value: Some(
                                                 NumberLiteral(
                                                     ExprNumberLiteral {
-                                                        node_index: AtomicNodeIndex(..),
+                                                        node_index: NodeIndex(None),
                                                         range: 159..160,
                                                         value: Int(
                                                             1,
@@ -298,11 +288,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 163..166,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 163..166,
                                                 },
                                             ),
@@ -313,42 +303,40 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 171..200,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("m"),
                                     range: 175..176,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 176..195,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 177..194,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 177..194,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("x"),
                                                     range: 177..178,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: Some(
                                                     YieldFrom(
                                                         ExprYieldFrom {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 181..193,
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 192..193,
                                                                     value: Int(
                                                                         1,
@@ -370,11 +358,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 197..200,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 197..200,
                                                 },
                                             ),
@@ -385,21 +373,19 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 205..235,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("o"),
                                     range: 209..210,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 210..212,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -409,11 +395,11 @@ Module(
                                 returns: Some(
                                     YieldFrom(
                                         ExprYieldFrom {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 217..229,
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 228..229,
                                                     value: Int(
                                                         1,
@@ -426,11 +412,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 232..235,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 232..235,
                                                 },
                                             ),
@@ -444,21 +430,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 236..315,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 246..251,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 251..253,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -469,21 +453,19 @@ Module(
                     body: [
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 259..284,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("f"),
                                     range: 263..264,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 264..266,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [],
                                     vararg: None,
@@ -493,11 +475,11 @@ Module(
                                 returns: Some(
                                     Await(
                                         ExprAwait {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 271..278,
                                             value: NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 277..278,
                                                     value: Int(
                                                         1,
@@ -510,11 +492,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 281..284,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 281..284,
                                                 },
                                             ),
@@ -525,42 +507,40 @@ Module(
                         ),
                         FunctionDef(
                             StmtFunctionDef {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 289..315,
                                 is_async: false,
                                 decorator_list: [],
                                 name: Identifier {
                                     id: Name("g"),
                                     range: 293..294,
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                 },
                                 type_params: None,
                                 parameters: Parameters {
                                     range: 294..310,
-                                    node_index: AtomicNodeIndex(
-                                        0,
-                                    ),
+                                    node_index: NodeIndex(None),
                                     posonlyargs: [],
                                     args: [
                                         ParameterWithDefault {
                                             range: 295..309,
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             parameter: Parameter {
                                                 range: 295..309,
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 name: Identifier {
                                                     id: Name("arg"),
                                                     range: 295..298,
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                 },
                                                 annotation: Some(
                                                     Await(
                                                         ExprAwait {
-                                                            node_index: AtomicNodeIndex(..),
+                                                            node_index: NodeIndex(None),
                                                             range: 301..308,
                                                             value: NumberLiteral(
                                                                 ExprNumberLiteral {
-                                                                    node_index: AtomicNodeIndex(..),
+                                                                    node_index: NodeIndex(None),
                                                                     range: 307..308,
                                                                     value: Int(
                                                                         1,
@@ -582,11 +562,11 @@ Module(
                                 body: [
                                     Expr(
                                         StmtExpr {
-                                            node_index: AtomicNodeIndex(..),
+                                            node_index: NodeIndex(None),
                                             range: 312..315,
                                             value: EllipsisLiteral(
                                                 ExprEllipsisLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 312..315,
                                                 },
                                             ),
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap
index be4b3961e8..b8f364cf8b 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap
@@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/valid_annotation_py313
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..144,
         body: [
             AnnAssign(
                 StmtAnnAssign {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 44..55,
                     target: Name(
                         ExprName {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 44..45,
                             id: Name("a"),
                             ctx: Store,
@@ -24,11 +24,11 @@ Module(
                     ),
                     annotation: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 48..54,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 48..49,
                                     id: Name("x"),
                                     ctx: Store,
@@ -36,7 +36,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 53..54,
                                     value: Int(
                                         1,
@@ -51,21 +51,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 56..107,
                     is_async: false,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 60..65,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 65..67,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -76,11 +74,11 @@ Module(
                     body: [
                         AnnAssign(
                             StmtAnnAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 73..85,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 73..74,
                                         id: Name("b"),
                                         ctx: Store,
@@ -88,12 +86,12 @@ Module(
                                 ),
                                 annotation: Yield(
                                     ExprYield {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 77..84,
                                         value: Some(
                                             NumberLiteral(
                                                 ExprNumberLiteral {
-                                                    node_index: AtomicNodeIndex(..),
+                                                    node_index: NodeIndex(None),
                                                     range: 83..84,
                                                     value: Int(
                                                         1,
@@ -109,11 +107,11 @@ Module(
                         ),
                         AnnAssign(
                             StmtAnnAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 90..107,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 90..91,
                                         id: Name("c"),
                                         ctx: Store,
@@ -121,11 +119,11 @@ Module(
                                 ),
                                 annotation: YieldFrom(
                                     ExprYieldFrom {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 94..106,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 105..106,
                                                 value: Int(
                                                     1,
@@ -143,21 +141,19 @@ Module(
             ),
             FunctionDef(
                 StmtFunctionDef {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 108..143,
                     is_async: true,
                     decorator_list: [],
                     name: Identifier {
                         id: Name("outer"),
                         range: 118..123,
-                        node_index: AtomicNodeIndex(..),
+                        node_index: NodeIndex(None),
                     },
                     type_params: None,
                     parameters: Parameters {
                         range: 123..125,
-                        node_index: AtomicNodeIndex(
-                            0,
-                        ),
+                        node_index: NodeIndex(None),
                         posonlyargs: [],
                         args: [],
                         vararg: None,
@@ -168,11 +164,11 @@ Module(
                     body: [
                         AnnAssign(
                             StmtAnnAssign {
-                                node_index: AtomicNodeIndex(..),
+                                node_index: NodeIndex(None),
                                 range: 131..143,
                                 target: Name(
                                     ExprName {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 131..132,
                                         id: Name("d"),
                                         ctx: Store,
@@ -180,11 +176,11 @@ Module(
                                 ),
                                 annotation: Await(
                                     ExprAwait {
-                                        node_index: AtomicNodeIndex(..),
+                                        node_index: NodeIndex(None),
                                         range: 135..142,
                                         value: NumberLiteral(
                                             ExprNumberLiteral {
-                                                node_index: AtomicNodeIndex(..),
+                                                node_index: NodeIndex(None),
                                                 range: 141..142,
                                                 value: Int(
                                                     1,
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap
new file mode 100644
index 0000000000..ea367acd4a
--- /dev/null
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap
@@ -0,0 +1,42 @@
+---
+source: crates/ruff_python_parser/tests/fixtures.rs
+input_file: crates/ruff_python_parser/resources/inline/ok/valid_future_feature.py
+---
+## AST
+
+```
+Module(
+    ModModule {
+        node_index: NodeIndex(None),
+        range: 0..35,
+        body: [
+            ImportFrom(
+                StmtImportFrom {
+                    node_index: NodeIndex(None),
+                    range: 0..34,
+                    module: Some(
+                        Identifier {
+                            id: Name("__future__"),
+                            range: 5..15,
+                            node_index: NodeIndex(None),
+                        },
+                    ),
+                    names: [
+                        Alias {
+                            range: 23..34,
+                            node_index: NodeIndex(None),
+                            name: Identifier {
+                                id: Name("annotations"),
+                                range: 23..34,
+                                node_index: NodeIndex(None),
+                            },
+                            asname: None,
+                        },
+                    ],
+                    level: 0,
+                },
+            ),
+        ],
+    },
+)
+```
diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap
index 16008f3821..0dba7ff0cd 100644
--- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap
+++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap
@@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/walrus_py38.py
 ```
 Module(
     ModModule {
-        node_index: AtomicNodeIndex(..),
+        node_index: NodeIndex(None),
         range: 0..54,
         body: [
             Expr(
                 StmtExpr {
-                    node_index: AtomicNodeIndex(..),
+                    node_index: NodeIndex(None),
                     range: 45..53,
                     value: Named(
                         ExprNamed {
-                            node_index: AtomicNodeIndex(..),
+                            node_index: NodeIndex(None),
                             range: 46..52,
                             target: Name(
                                 ExprName {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 46..47,
                                     id: Name("x"),
                                     ctx: Store,
@@ -28,7 +28,7 @@ Module(
                             ),
                             value: NumberLiteral(
                                 ExprNumberLiteral {
-                                    node_index: AtomicNodeIndex(..),
+                                    node_index: NodeIndex(None),
                                     range: 51..52,
                                     value: Int(
                                         1,
diff --git a/crates/ruff_python_semantic/src/analyze/typing.rs b/crates/ruff_python_semantic/src/analyze/typing.rs
index 01220fea0e..4b30993a15 100644
--- a/crates/ruff_python_semantic/src/analyze/typing.rs
+++ b/crates/ruff_python_semantic/src/analyze/typing.rs
@@ -8,11 +8,10 @@ use ruff_python_ast::{
     StmtAssign,
 };
 use ruff_python_stdlib::typing::{
-    as_pep_585_generic, has_pep_585_generic, is_immutable_generic_type,
-    is_immutable_non_generic_type, is_immutable_return_type, is_literal_member,
-    is_mutable_return_type, is_pep_593_generic_member, is_pep_593_generic_type,
-    is_standard_library_generic, is_standard_library_generic_member, is_standard_library_literal,
-    is_typed_dict, is_typed_dict_member,
+    as_pep_585_generic, is_immutable_generic_type, is_immutable_non_generic_type,
+    is_immutable_return_type, is_literal_member, is_mutable_return_type, is_pep_593_generic_member,
+    is_pep_593_generic_type, is_standard_library_generic, is_standard_library_generic_member,
+    is_standard_library_literal, is_typed_dict, is_typed_dict_member,
 };
 use ruff_text_size::Ranged;
 use smallvec::{SmallVec, smallvec};
@@ -148,14 +147,46 @@ pub fn to_pep585_generic(expr: &Expr, semantic: &SemanticModel) -> Option<Module
 }
 
 /// Return whether a given expression uses a PEP 585 standard library generic.
-pub fn is_pep585_generic(expr: &Expr, semantic: &SemanticModel) -> bool {
+pub fn is_pep585_generic(
+    expr: &Expr,
+    semantic: &SemanticModel,
+    include_preview_generics: bool,
+) -> bool {
     semantic
         .resolve_qualified_name(expr)
-        .is_some_and(|qualified_name| {
-            let [module, name] = qualified_name.segments() else {
-                return false;
-            };
-            has_pep_585_generic(module, name)
+        .is_some_and(|qualified_name| match qualified_name.segments() {
+            ["", "dict" | "frozenset" | "list" | "set" | "tuple" | "type"]
+            | ["collections", "deque" | "defaultdict"] => true,
+            ["asyncio", "Future" | "Task"]
+            | ["collections", "ChainMap" | "Counter" | "OrderedDict"]
+            | [
+                "contextlib",
+                "AbstractAsyncContextManager" | "AbstractContextManager",
+            ]
+            | ["dataclasses", "Field"]
+            | ["functools", "cached_property" | "partialmethod"]
+            | ["os", "PathLike"]
+            | [
+                "queue",
+                "LifoQueue" | "PriorityQueue" | "Queue" | "SimpleQueue",
+            ]
+            | ["re", "Match" | "Pattern"]
+            | ["shelve", "BsdDbShelf" | "DbfilenameShelf" | "Shelf"]
+            | ["types", "MappingProxyType"]
+            | [
+                "weakref",
+                "WeakKeyDictionary" | "WeakMethod" | "WeakSet" | "WeakValueDictionary",
+            ]
+            | [
+                "collections",
+                "abc",
+                "AsyncGenerator" | "AsyncIterable" | "AsyncIterator" | "Awaitable" | "ByteString"
+                | "Callable" | "Collection" | "Container" | "Coroutine" | "Generator" | "ItemsView"
+                | "Iterable" | "Iterator" | "KeysView" | "Mapping" | "MappingView"
+                | "MutableMapping" | "MutableSequence" | "MutableSet" | "Reversible" | "Sequence"
+                | "Set" | "ValuesView",
+            ] => include_preview_generics,
+            _ => false,
         })
 }
 
diff --git a/crates/ruff_python_semantic/src/binding.rs b/crates/ruff_python_semantic/src/binding.rs
index e762d5d95c..9254a5b528 100644
--- a/crates/ruff_python_semantic/src/binding.rs
+++ b/crates/ruff_python_semantic/src/binding.rs
@@ -446,7 +446,7 @@ impl Ranged for Binding<'_> {
 /// ID uniquely identifying a [Binding] in a program.
 ///
 /// Using a `u32` to identify [Binding]s should be 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`
+/// 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).
 #[newtype_index]
 pub struct BindingId;
@@ -672,6 +672,24 @@ pub enum BindingKind<'a> {
     /// Stores the ID of the binding that was shadowed in the enclosing
     /// scope, if any.
     UnboundException(Option<BindingId>),
+
+    /// A binding to `__class__` in the implicit closure created around every method in a class
+    /// body, if any method refers to either `__class__` or `super`.
+    ///
+    /// ```python
+    /// class C:
+    ///     __class__  # NameError: name '__class__' is not defined
+    ///
+    ///     def f():
+    ///         print(__class__)  # allowed
+    ///
+    ///     def g():
+    ///         nonlocal __class__  # also allowed because the scope is *not* the function scope
+    /// ```
+    ///
+    /// See <https://docs.python.org/3/reference/datamodel.html#creating-the-class-object> for more
+    /// details.
+    DunderClassCell,
 }
 
 bitflags! {
diff --git a/crates/ruff_python_semantic/src/imports.rs b/crates/ruff_python_semantic/src/imports.rs
index 9f1188a9db..95c54ced42 100644
--- a/crates/ruff_python_semantic/src/imports.rs
+++ b/crates/ruff_python_semantic/src/imports.rs
@@ -274,15 +274,11 @@ impl<'de> serde::de::Deserialize<'de> for NameImports {
 
 #[cfg(feature = "schemars")]
 impl schemars::JsonSchema for NameImports {
-    fn schema_name() -> String {
-        "NameImports".to_string()
+    fn schema_name() -> std::borrow::Cow<'static, str> {
+        std::borrow::Cow::Borrowed("NameImports")
     }
 
-    fn json_schema(_gen: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
-        schemars::schema::SchemaObject {
-            instance_type: Some(schemars::schema::InstanceType::String.into()),
-            ..Default::default()
-        }
-        .into()
+    fn json_schema(_gen: &mut schemars::SchemaGenerator) -> schemars::Schema {
+        schemars::json_schema!({ "type": "string" })
     }
 }
diff --git a/crates/ruff_python_semantic/src/model.rs b/crates/ruff_python_semantic/src/model.rs
index 3d8d39febe..4f2dc47162 100644
--- a/crates/ruff_python_semantic/src/model.rs
+++ b/crates/ruff_python_semantic/src/model.rs
@@ -404,22 +404,11 @@ impl<'a> SemanticModel<'a> {
             }
         }
 
-        let mut seen_function = false;
         let mut import_starred = false;
         let mut class_variables_visible = true;
         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!(name.id.as_str(), "__class__") {
-                    return ReadResult::ImplicitGlobal;
-                }
                 // Do not allow usages of class symbols unless it is the immediate parent
                 // (excluding type scopes), e.g.:
                 //
@@ -442,7 +431,13 @@ impl<'a> SemanticModel<'a> {
             // Allow class variables to be visible for an additional scope level
             // when a type scope is seen — this covers the type scope present between
             // function and class definitions and their parent class scope.
-            class_variables_visible = scope.kind.is_type() && index == 0;
+            //
+            // Also allow an additional level beyond that to cover the implicit
+            // `__class__` closure created around methods and enclosing the type scope.
+            class_variables_visible = matches!(
+                (scope.kind, index),
+                (ScopeKind::Type, 0) | (ScopeKind::DunderClassCell, 1)
+            );
 
             if let Some(binding_id) = scope.get(name.id.as_str()) {
                 // Mark the binding as used.
@@ -614,7 +609,6 @@ impl<'a> SemanticModel<'a> {
                 }
             }
 
-            seen_function |= scope.kind.is_function();
             import_starred = import_starred || scope.uses_star_imports();
         }
 
@@ -658,21 +652,19 @@ impl<'a> SemanticModel<'a> {
             }
         }
 
-        let mut seen_function = false;
         let mut class_variables_visible = true;
         for (index, scope_id) in self.scopes.ancestor_ids(scope_id).enumerate() {
             let scope = &self.scopes[scope_id];
             if scope.kind.is_class() {
-                if seen_function && matches!(symbol, "__class__") {
-                    return None;
-                }
                 if !class_variables_visible {
                     continue;
                 }
             }
 
-            class_variables_visible = scope.kind.is_type() && index == 0;
-            seen_function |= scope.kind.is_function();
+            class_variables_visible = matches!(
+                (scope.kind, index),
+                (ScopeKind::Type, 0) | (ScopeKind::DunderClassCell, 1)
+            );
 
             if let Some(binding_id) = scope.get(symbol) {
                 match self.bindings[binding_id].kind {
@@ -786,15 +778,15 @@ impl<'a> SemanticModel<'a> {
             }
 
             if scope.kind.is_class() {
-                if seen_function && matches!(symbol, "__class__") {
-                    return None;
-                }
                 if !class_variables_visible {
                     continue;
                 }
             }
 
-            class_variables_visible = scope.kind.is_type() && index == 0;
+            class_variables_visible = matches!(
+                (scope.kind, index),
+                (ScopeKind::Type, 0) | (ScopeKind::DunderClassCell, 1)
+            );
             seen_function |= scope.kind.is_function();
 
             if let Some(binding_id) = scope.get(symbol) {
@@ -867,11 +859,17 @@ impl<'a> SemanticModel<'a> {
     /// associated with `Class`, then the `BindingKind::FunctionDefinition` associated with
     /// `Class.method`.
     pub fn lookup_attribute(&self, value: &Expr) -> Option<BindingId> {
+        self.lookup_attribute_in_scope(value, self.scope_id)
+    }
+
+    /// Lookup a qualified attribute in the certain scope.
+    pub fn lookup_attribute_in_scope(&self, value: &Expr, scope_id: ScopeId) -> Option<BindingId> {
         let unqualified_name = UnqualifiedName::from_expr(value)?;
 
         // Find the symbol in the current scope.
         let (symbol, attribute) = unqualified_name.segments().split_first()?;
-        let mut binding_id = self.lookup_symbol(symbol)?;
+        let mut binding_id =
+            self.lookup_symbol_in_scope(symbol, scope_id, self.in_forward_reference())?;
 
         // Recursively resolve class attributes, e.g., `foo.bar.baz` in.
         let mut tail = attribute;
@@ -1353,11 +1351,12 @@ impl<'a> SemanticModel<'a> {
         self.scopes[scope_id].parent
     }
 
-    /// Returns the first parent of the given [`Scope`] that is not of [`ScopeKind::Type`], if any.
+    /// Returns the first parent of the given [`Scope`] that is not of [`ScopeKind::Type`] or
+    /// [`ScopeKind::DunderClassCell`], if any.
     pub fn first_non_type_parent_scope(&self, scope: &Scope) -> Option<&Scope<'a>> {
         let mut current_scope = scope;
         while let Some(parent) = self.parent_scope(current_scope) {
-            if parent.kind.is_type() {
+            if matches!(parent.kind, ScopeKind::Type | ScopeKind::DunderClassCell) {
                 current_scope = parent;
             } else {
                 return Some(parent);
@@ -1366,11 +1365,15 @@ impl<'a> SemanticModel<'a> {
         None
     }
 
-    /// Returns the first parent of the given [`ScopeId`] that is not of [`ScopeKind::Type`], if any.
+    /// Returns the first parent of the given [`ScopeId`] that is not of [`ScopeKind::Type`] or
+    /// [`ScopeKind::DunderClassCell`], if any.
     pub fn first_non_type_parent_scope_id(&self, scope_id: ScopeId) -> Option<ScopeId> {
         let mut current_scope_id = scope_id;
         while let Some(parent_id) = self.parent_scope_id(current_scope_id) {
-            if self.scopes[parent_id].kind.is_type() {
+            if matches!(
+                self.scopes[parent_id].kind,
+                ScopeKind::Type | ScopeKind::DunderClassCell
+            ) {
                 current_scope_id = parent_id;
             } else {
                 return Some(parent_id);
@@ -2098,7 +2101,7 @@ impl<'a> SemanticModel<'a> {
     /// Finds and returns the [`Scope`] corresponding to a given [`ast::StmtFunctionDef`].
     ///
     /// This method searches all scopes created by a function definition, comparing the
-    /// [`TextRange`] of the provided `function_def` with the the range of the function
+    /// [`TextRange`] of the provided `function_def` with the range of the function
     /// associated with the scope.
     pub fn function_scope(&self, function_def: &ast::StmtFunctionDef) -> Option<&Scope<'_>> {
         self.scopes.iter().find(|scope| {
@@ -2649,16 +2652,16 @@ pub enum ReadResult {
     /// The `x` in `print(x)` is resolved to the binding of `x` in `x = 1`.
     Resolved(BindingId),
 
-    /// The read reference is resolved to a context-specific, implicit global (e.g., `__class__`
+    /// The read reference is resolved to a context-specific, implicit global (e.g., `__qualname__`
     /// within a class scope).
     ///
     /// For example, given:
     /// ```python
     /// class C:
-    ///    print(__class__)
+    ///    print(__qualname__)
     /// ```
     ///
-    /// The `__class__` in `print(__class__)` is resolved to the implicit global `__class__`.
+    /// The `__qualname__` in `print(__qualname__)` is resolved to the implicit global `__qualname__`.
     ImplicitGlobal,
 
     /// The read reference is unresolved, but at least one of the containing scopes contains a
diff --git a/crates/ruff_python_semantic/src/scope.rs b/crates/ruff_python_semantic/src/scope.rs
index 0ac31f26cc..f44ac019a5 100644
--- a/crates/ruff_python_semantic/src/scope.rs
+++ b/crates/ruff_python_semantic/src/scope.rs
@@ -166,9 +166,49 @@ bitflags! {
     }
 }
 
-#[derive(Debug, is_macro::Is)]
+#[derive(Clone, Copy, Debug, is_macro::Is)]
 pub enum ScopeKind<'a> {
     Class(&'a ast::StmtClassDef),
+    /// The implicit `__class__` scope surrounding a method which allows code in the
+    ///  method to access `__class__` at runtime. The closure sits in between the class
+    ///  scope and the function scope.
+    ///
+    /// Parameter defaults in methods cannot access `__class__`:
+    ///
+    /// ```pycon
+    /// >>> class Bar:
+    /// ...     def method(self, x=__class__): ...
+    /// ...
+    /// Traceback (most recent call last):
+    /// File "<python-input-6>", line 1, in <module>
+    ///     class Bar:
+    ///         def method(self, x=__class__): ...
+    /// File "<python-input-6>", line 2, in Bar
+    ///     def method(self, x=__class__): ...
+    ///                     ^^^^^^^^^
+    /// NameError: name '__class__' is not defined
+    /// ```
+    ///
+    /// However, type parameters in methods *can* access `__class__`:
+    ///
+    /// ```pycon
+    /// >>> class Foo:
+    /// ...     def bar[T: __class__](): ...
+    /// ...
+    /// >>> Foo.bar.__type_params__[0].__bound__
+    /// <class '__main__.Foo'>
+    /// ```
+    ///
+    /// Note that this is still not 100% accurate! At runtime, the implicit `__class__`
+    /// closure is only added if the name `super` (has to be a name -- `builtins.super`
+    /// and similar don't count!) or the name `__class__` is used in any method of the
+    /// class. However, accurately emulating that would be both complex and probably
+    /// quite expensive unless we moved to a double-traversal of each scope similar to
+    /// ty. It would also only matter in extreme and unlikely edge cases. So we ignore
+    /// that subtlety for now.
+    ///
+    /// See <https://docs.python.org/3/reference/datamodel.html#creating-the-class-object>.
+    DunderClassCell,
     Function(&'a ast::StmtFunctionDef),
     Generator {
         kind: GeneratorKind,
diff --git a/crates/ruff_python_stdlib/src/builtins.rs b/crates/ruff_python_stdlib/src/builtins.rs
index 02830f9360..5176de6a22 100644
--- a/crates/ruff_python_stdlib/src/builtins.rs
+++ b/crates/ruff_python_stdlib/src/builtins.rs
@@ -20,9 +20,15 @@ pub const MAGIC_GLOBALS: &[&str] = &[
     "__annotations__",
     "__builtins__",
     "__cached__",
+    "__warningregistry__",
     "__file__",
 ];
 
+/// Magic globals that are only available starting in specific Python versions.
+///
+/// `__annotate__` was introduced in Python 3.14.
+static PY314_PLUS_MAGIC_GLOBALS: &[&str] = &["__annotate__"];
+
 static ALWAYS_AVAILABLE_BUILTINS: &[&str] = &[
     "ArithmeticError",
     "AssertionError",
@@ -216,6 +222,21 @@ pub fn python_builtins(minor_version: u8, is_notebook: bool) -> impl Iterator<It
         .copied()
 }
 
+/// Return the list of magic globals for the given Python minor version.
+pub fn python_magic_globals(minor_version: u8) -> impl Iterator<Item = &'static str> {
+    let py314_magic_globals = if minor_version >= 14 {
+        Some(PY314_PLUS_MAGIC_GLOBALS)
+    } else {
+        None
+    };
+
+    py314_magic_globals
+        .into_iter()
+        .flatten()
+        .chain(MAGIC_GLOBALS)
+        .copied()
+}
+
 /// Returns `true` if the given name is that of a Python builtin.
 ///
 /// Intended to be kept in sync with [`python_builtins`].
diff --git a/crates/ruff_python_stdlib/src/future.rs b/crates/ruff_python_stdlib/src/future.rs
deleted file mode 100644
index b1adaadedf..0000000000
--- a/crates/ruff_python_stdlib/src/future.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-/// Returns `true` if `name` is a valid `__future__` feature name, as defined by
-/// `__future__.all_feature_names`.
-pub fn is_feature_name(name: &str) -> bool {
-    matches!(
-        name,
-        "nested_scopes"
-            | "generators"
-            | "division"
-            | "absolute_import"
-            | "with_statement"
-            | "print_function"
-            | "unicode_literals"
-            | "barry_as_FLUFL"
-            | "generator_stop"
-            | "annotations"
-    )
-}
diff --git a/crates/ruff_python_stdlib/src/lib.rs b/crates/ruff_python_stdlib/src/lib.rs
index a57f4315d6..632e9bb4e3 100644
--- a/crates/ruff_python_stdlib/src/lib.rs
+++ b/crates/ruff_python_stdlib/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod builtins;
-pub mod future;
 pub mod identifiers;
 pub mod keyword;
 pub mod logging;
diff --git a/crates/ruff_python_stdlib/src/typing.rs b/crates/ruff_python_stdlib/src/typing.rs
index 54dd230931..63d7ccf32e 100644
--- a/crates/ruff_python_stdlib/src/typing.rs
+++ b/crates/ruff_python_stdlib/src/typing.rs
@@ -354,20 +354,6 @@ pub fn as_pep_585_generic(module: &str, member: &str) -> Option<ModuleMember> {
     }
 }
 
-/// Given a typing member, returns `true` if a generic equivalent exists in the Python standard
-/// library (e.g., `list` for `typing.List`), as introduced by [PEP 585].
-///
-/// [PEP 585]: https://peps.python.org/pep-0585/
-pub fn has_pep_585_generic(module: &str, member: &str) -> bool {
-    // Constructed by taking every pattern from `as_pep_585_generic`, removing all but
-    // the last element in each pattern, and de-duplicating the values.
-    matches!(
-        (module, member),
-        ("", "dict" | "frozenset" | "list" | "set" | "tuple" | "type")
-            | ("collections", "deque" | "defaultdict")
-    )
-}
-
 /// Returns the expected return type for a magic method.
 ///
 /// See: <https://github.com/JelleZijlstra/autotyping/blob/0adba5ba0eee33c1de4ad9d0c79acfd737321dd9/autotyping/autotyping.py#L69-L91>
diff --git a/crates/ruff_python_trivia/src/textwrap.rs b/crates/ruff_python_trivia/src/textwrap.rs
index ce5f46671a..50ce0cd08c 100644
--- a/crates/ruff_python_trivia/src/textwrap.rs
+++ b/crates/ruff_python_trivia/src/textwrap.rs
@@ -71,6 +71,66 @@ pub fn indent<'a>(text: &'a str, prefix: &str) -> Cow<'a, str> {
     Cow::Owned(result)
 }
 
+/// Indent only the first line by the given prefix.
+///
+/// This function is useful when you want to indent the first line of a multi-line
+/// expression while preserving the relative indentation of subsequent lines.
+///
+/// # Examples
+///
+/// ```
+/// # use ruff_python_trivia::textwrap::indent_first_line;
+///
+/// assert_eq!(indent_first_line("First line.\nSecond line.\n", "  "),
+///            "  First line.\nSecond line.\n");
+/// ```
+///
+/// When indenting, trailing whitespace is stripped from the prefix.
+/// This means that empty lines remain empty afterwards:
+///
+/// ```
+/// # use ruff_python_trivia::textwrap::indent_first_line;
+///
+/// assert_eq!(indent_first_line("\n\n\nSecond line.\n", "  "),
+///            "\n\n\nSecond line.\n");
+/// ```
+///
+/// Leading and trailing whitespace coming from the text itself is
+/// kept unchanged:
+///
+/// ```
+/// # use ruff_python_trivia::textwrap::indent_first_line;
+///
+/// assert_eq!(indent_first_line(" \t  Foo   ", "->"), "-> \t  Foo   ");
+/// ```
+pub fn indent_first_line<'a>(text: &'a str, prefix: &str) -> Cow<'a, str> {
+    if prefix.is_empty() {
+        return Cow::Borrowed(text);
+    }
+
+    let mut lines = text.universal_newlines();
+    let Some(first_line) = lines.next() else {
+        return Cow::Borrowed(text);
+    };
+
+    let mut result = String::with_capacity(text.len() + prefix.len());
+
+    // Indent only the first line
+    if first_line.trim_whitespace().is_empty() {
+        result.push_str(prefix.trim_whitespace_end());
+    } else {
+        result.push_str(prefix);
+    }
+    result.push_str(first_line.as_full_str());
+
+    // Add remaining lines without indentation
+    for line in lines {
+        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
@@ -409,6 +469,61 @@ mod tests {
         assert_eq!(dedent(text), text);
     }
 
+    #[test]
+    fn indent_first_line_empty() {
+        assert_eq!(indent_first_line("\n", "  "), "\n");
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn indent_first_line_nonempty() {
+        let text = [
+            "  foo\n",
+            "bar\n",
+            "  baz\n",
+        ].join("");
+        let expected = [
+            "//   foo\n",
+            "bar\n",
+            "  baz\n",
+        ].join("");
+        assert_eq!(indent_first_line(&text, "// "), expected);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn indent_first_line_empty_line() {
+        let text = [
+            "  foo",
+            "bar",
+            "",
+            "  baz",
+        ].join("\n");
+        let expected = [
+            "//   foo",
+            "bar",
+            "",
+            "  baz",
+        ].join("\n");
+        assert_eq!(indent_first_line(&text, "// "), expected);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn indent_first_line_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_first_line(&text, "// "), expected);
+    }
+
     #[test]
     #[rustfmt::skip]
     fn adjust_indent() {
diff --git a/crates/ruff_python_trivia/src/tokenizer.rs b/crates/ruff_python_trivia/src/tokenizer.rs
index 8b59197b77..8e508d1049 100644
--- a/crates/ruff_python_trivia/src/tokenizer.rs
+++ b/crates/ruff_python_trivia/src/tokenizer.rs
@@ -599,6 +599,16 @@ impl<'a> SimpleTokenizer<'a> {
                             | "rb"
                             | "rf"
                             | "u"
+                            | "T"
+                            | "TR"
+                            | "Tr"
+                            | "RT"
+                            | "Rt"
+                            | "t"
+                            | "tR"
+                            | "tr"
+                            | "rT"
+                            | "rt"
                     )
                 {
                     self.bogus = true;
diff --git a/crates/ruff_python_trivia_integration_tests/tests/simple_tokenizer.rs b/crates/ruff_python_trivia_integration_tests/tests/simple_tokenizer.rs
index b26218732b..26ff34f08e 100644
--- a/crates/ruff_python_trivia_integration_tests/tests/simple_tokenizer.rs
+++ b/crates/ruff_python_trivia_integration_tests/tests/simple_tokenizer.rs
@@ -169,6 +169,22 @@ fn string_with_byte_kind() {
     // note: not reversible: [other, bogus] vs [bogus, other]
 }
 
+#[test]
+fn fstring() {
+    let source = "f'foo'";
+
+    let test_case = tokenize(source);
+    assert_debug_snapshot!(test_case.tokens());
+}
+
+#[test]
+fn tstring() {
+    let source = "t'foo'";
+
+    let test_case = tokenize(source);
+    assert_debug_snapshot!(test_case.tokens());
+}
+
 #[test]
 fn string_with_invalid_kind() {
     let source = "abc'foo'";
diff --git a/crates/ruff_python_trivia_integration_tests/tests/snapshots/simple_tokenizer__fstring.snap b/crates/ruff_python_trivia_integration_tests/tests/snapshots/simple_tokenizer__fstring.snap
new file mode 100644
index 0000000000..4f20942cc6
--- /dev/null
+++ b/crates/ruff_python_trivia_integration_tests/tests/snapshots/simple_tokenizer__fstring.snap
@@ -0,0 +1,14 @@
+---
+source: crates/ruff_python_trivia_integration_tests/tests/simple_tokenizer.rs
+expression: test_case.tokens()
+---
+[
+    SimpleToken {
+        kind: Other,
+        range: 0..1,
+    },
+    SimpleToken {
+        kind: Bogus,
+        range: 1..6,
+    },
+]
diff --git a/crates/ruff_python_trivia_integration_tests/tests/snapshots/simple_tokenizer__tstring.snap b/crates/ruff_python_trivia_integration_tests/tests/snapshots/simple_tokenizer__tstring.snap
new file mode 100644
index 0000000000..4f20942cc6
--- /dev/null
+++ b/crates/ruff_python_trivia_integration_tests/tests/snapshots/simple_tokenizer__tstring.snap
@@ -0,0 +1,14 @@
+---
+source: crates/ruff_python_trivia_integration_tests/tests/simple_tokenizer.rs
+expression: test_case.tokens()
+---
+[
+    SimpleToken {
+        kind: Other,
+        range: 0..1,
+    },
+    SimpleToken {
+        kind: Bogus,
+        range: 1..6,
+    },
+]
diff --git a/crates/ruff_server/Cargo.toml b/crates/ruff_server/Cargo.toml
index 4bfaf47663..0d53439406 100644
--- a/crates/ruff_server/Cargo.toml
+++ b/crates/ruff_server/Cargo.toml
@@ -50,5 +50,8 @@ insta = { workspace = true }
 [target.'cfg(target_vendor = "apple")'.dependencies]
 libc = { workspace = true }
 
+[features]
+test-uv = []
+
 [lints]
 workspace = true
diff --git a/crates/ruff_server/src/format.rs b/crates/ruff_server/src/format.rs
index d63d94f5ec..38455514a9 100644
--- a/crates/ruff_server/src/format.rs
+++ b/crates/ruff_server/src/format.rs
@@ -1,18 +1,52 @@
+use std::io::Write;
 use std::path::Path;
+use std::process::{Command, Stdio};
 
-use ruff_formatter::PrintedRange;
+use anyhow::Context;
+
+use ruff_formatter::{FormatOptions, PrintedRange};
 use ruff_python_ast::PySourceType;
-use ruff_python_formatter::{FormatModuleError, format_module_source};
+use ruff_python_formatter::{FormatModuleError, PyFormatOptions, format_module_source};
+use ruff_source_file::LineIndex;
 use ruff_text_size::TextRange;
 use ruff_workspace::FormatterSettings;
 
 use crate::edit::TextDocument;
 
+/// The backend to use for formatting.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, serde::Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub(crate) enum FormatBackend {
+    /// Use the built-in Ruff formatter.
+    ///
+    /// The formatter version will match the LSP version.
+    #[default]
+    Internal,
+    /// Use uv for formatting.
+    ///
+    /// The formatter version may differ from the LSP version.
+    Uv,
+}
+
 pub(crate) fn format(
     document: &TextDocument,
     source_type: PySourceType,
     formatter_settings: &FormatterSettings,
     path: &Path,
+    backend: FormatBackend,
+) -> crate::Result<Option<String>> {
+    match backend {
+        FormatBackend::Uv => format_external(document, source_type, formatter_settings, path),
+        FormatBackend::Internal => format_internal(document, source_type, formatter_settings, path),
+    }
+}
+
+/// Format using the built-in Ruff formatter.
+fn format_internal(
+    document: &TextDocument,
+    source_type: PySourceType,
+    formatter_settings: &FormatterSettings,
+    path: &Path,
 ) -> crate::Result<Option<String>> {
     let format_options =
         formatter_settings.to_format_options(source_type, document.contents(), Some(path));
@@ -35,12 +69,44 @@ pub(crate) fn format(
     }
 }
 
+/// Format using an external uv command.
+fn format_external(
+    document: &TextDocument,
+    source_type: PySourceType,
+    formatter_settings: &FormatterSettings,
+    path: &Path,
+) -> crate::Result<Option<String>> {
+    let format_options =
+        formatter_settings.to_format_options(source_type, document.contents(), Some(path));
+    let uv_command = UvFormatCommand::from(format_options);
+    uv_command.format_document(document.contents(), path)
+}
+
 pub(crate) fn format_range(
     document: &TextDocument,
     source_type: PySourceType,
     formatter_settings: &FormatterSettings,
     range: TextRange,
     path: &Path,
+    backend: FormatBackend,
+) -> crate::Result<Option<PrintedRange>> {
+    match backend {
+        FormatBackend::Uv => {
+            format_range_external(document, source_type, formatter_settings, range, path)
+        }
+        FormatBackend::Internal => {
+            format_range_internal(document, source_type, formatter_settings, range, path)
+        }
+    }
+}
+
+/// Format range using the built-in Ruff formatter
+fn format_range_internal(
+    document: &TextDocument,
+    source_type: PySourceType,
+    formatter_settings: &FormatterSettings,
+    range: TextRange,
+    path: &Path,
 ) -> crate::Result<Option<PrintedRange>> {
     let format_options =
         formatter_settings.to_format_options(source_type, document.contents(), Some(path));
@@ -63,6 +129,198 @@ pub(crate) fn format_range(
     }
 }
 
+/// Format range using an external command, i.e., `uv`.
+fn format_range_external(
+    document: &TextDocument,
+    source_type: PySourceType,
+    formatter_settings: &FormatterSettings,
+    range: TextRange,
+    path: &Path,
+) -> crate::Result<Option<PrintedRange>> {
+    let format_options =
+        formatter_settings.to_format_options(source_type, document.contents(), Some(path));
+    let uv_command = UvFormatCommand::from(format_options);
+
+    // Format the range using uv and convert the result to `PrintedRange`
+    match uv_command.format_range(document.contents(), range, path, document.index())? {
+        Some(formatted) => Ok(Some(PrintedRange::new(formatted, range))),
+        None => Ok(None),
+    }
+}
+
+/// Builder for uv format commands
+#[derive(Debug)]
+pub(crate) struct UvFormatCommand {
+    options: PyFormatOptions,
+}
+
+impl From<PyFormatOptions> for UvFormatCommand {
+    fn from(options: PyFormatOptions) -> Self {
+        Self { options }
+    }
+}
+
+impl UvFormatCommand {
+    /// Build the command with all necessary arguments
+    fn build_command(
+        &self,
+        path: &Path,
+        range_with_index: Option<(TextRange, &LineIndex, &str)>,
+    ) -> Command {
+        let mut command = Command::new("uv");
+        command.arg("format");
+        command.arg("--");
+
+        let target_version = format!(
+            "py{}{}",
+            self.options.target_version().major,
+            self.options.target_version().minor
+        );
+
+        // Add only the formatting options that the CLI supports
+        command.arg("--target-version");
+        command.arg(&target_version);
+
+        command.arg("--line-length");
+        command.arg(self.options.line_width().to_string());
+
+        if self.options.preview().is_enabled() {
+            command.arg("--preview");
+        }
+
+        // Pass other formatting options via --config
+        command.arg("--config");
+        command.arg(format!(
+            "format.indent-style = '{}'",
+            self.options.indent_style()
+        ));
+
+        command.arg("--config");
+        command.arg(format!("indent-width = {}", self.options.indent_width()));
+
+        command.arg("--config");
+        command.arg(format!(
+            "format.quote-style = '{}'",
+            self.options.quote_style()
+        ));
+
+        command.arg("--config");
+        command.arg(format!(
+            "format.line-ending = '{}'",
+            self.options.line_ending().as_setting_str()
+        ));
+
+        command.arg("--config");
+        command.arg(format!(
+            "format.skip-magic-trailing-comma = {}",
+            match self.options.magic_trailing_comma() {
+                ruff_python_formatter::MagicTrailingComma::Respect => "false",
+                ruff_python_formatter::MagicTrailingComma::Ignore => "true",
+            }
+        ));
+
+        if let Some((range, line_index, source)) = range_with_index {
+            // The CLI expects line:column format
+            let start_pos = line_index.line_column(range.start(), source);
+            let end_pos = line_index.line_column(range.end(), source);
+            let range_str = format!(
+                "{}:{}-{}:{}",
+                start_pos.line.get(),
+                start_pos.column.get(),
+                end_pos.line.get(),
+                end_pos.column.get()
+            );
+            command.arg("--range");
+            command.arg(&range_str);
+        }
+
+        command.arg("--stdin-filename");
+        command.arg(path.to_string_lossy().as_ref());
+
+        command.stdin(Stdio::piped());
+        command.stdout(Stdio::piped());
+        command.stderr(Stdio::piped());
+
+        command
+    }
+
+    /// Execute the format command on the given source.
+    pub(crate) fn format(
+        &self,
+        source: &str,
+        path: &Path,
+        range_with_index: Option<(TextRange, &LineIndex)>,
+    ) -> crate::Result<Option<String>> {
+        let mut command =
+            self.build_command(path, range_with_index.map(|(r, idx)| (r, idx, source)));
+        let mut child = match command.spawn() {
+            Ok(child) => child,
+            Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
+                anyhow::bail!("uv was not found; is it installed and on the PATH?")
+            }
+            Err(err) => return Err(err).context("Failed to spawn uv"),
+        };
+
+        let mut stdin = child
+            .stdin
+            .take()
+            .context("Failed to get stdin from format subprocess")?;
+        stdin
+            .write_all(source.as_bytes())
+            .context("Failed to write to stdin")?;
+        drop(stdin);
+
+        let result = child
+            .wait_with_output()
+            .context("Failed to get output from format subprocess")?;
+
+        if !result.status.success() {
+            let stderr = String::from_utf8_lossy(&result.stderr);
+            // We don't propagate format errors due to invalid syntax
+            if stderr.contains("Failed to parse") {
+                tracing::warn!("Unable to format document: {}", stderr);
+                return Ok(None);
+            }
+            // Special-case for when `uv format` is not available
+            if stderr.contains("unrecognized subcommand 'format'") {
+                anyhow::bail!(
+                    "The installed version of uv does not support `uv format`; upgrade to a newer version"
+                );
+            }
+            anyhow::bail!("Failed to format document: {stderr}");
+        }
+
+        let formatted = String::from_utf8(result.stdout)
+            .context("Failed to parse stdout from format subprocess as utf-8")?;
+
+        if formatted == source {
+            Ok(None)
+        } else {
+            Ok(Some(formatted))
+        }
+    }
+
+    /// Format the entire document.
+    pub(crate) fn format_document(
+        &self,
+        source: &str,
+        path: &Path,
+    ) -> crate::Result<Option<String>> {
+        self.format(source, path, None)
+    }
+
+    /// Format a specific range.
+    pub(crate) fn format_range(
+        &self,
+        source: &str,
+        range: TextRange,
+        path: &Path,
+        line_index: &LineIndex,
+    ) -> crate::Result<Option<String>> {
+        self.format(source, path, Some((range, line_index)))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::path::Path;
@@ -74,7 +332,7 @@ mod tests {
     use ruff_workspace::FormatterSettings;
 
     use crate::TextDocument;
-    use crate::format::{format, format_range};
+    use crate::format::{FormatBackend, format, format_range};
 
     #[test]
     fn format_per_file_version() {
@@ -98,6 +356,7 @@ with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a
                 ..Default::default()
             },
             Path::new("test.py"),
+            FormatBackend::Internal,
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -120,6 +379,7 @@ with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a
                 ..Default::default()
             },
             Path::new("test.py"),
+            FormatBackend::Internal,
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -168,6 +428,7 @@ sys.exit(
             },
             range,
             Path::new("test.py"),
+            FormatBackend::Internal,
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -191,6 +452,7 @@ sys.exit(
             },
             range,
             Path::new("test.py"),
+            FormatBackend::Internal,
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -204,4 +466,279 @@ sys.exit(
 
         Ok(())
     }
+
+    #[cfg(feature = "test-uv")]
+    mod uv_tests {
+        use super::*;
+
+        #[test]
+        fn test_uv_format_document() {
+            let document = TextDocument::new(
+                r#"
+def hello(  x,y ,z  ):
+    return x+y  +z
+
+
+def world(  ):
+    pass
+"#
+                .to_string(),
+                0,
+            );
+
+            let result = format(
+                &document,
+                PySourceType::Python,
+                &FormatterSettings::default(),
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors when formatting with uv")
+            .expect("Expected formatting changes");
+
+            // uv should format this to a consistent style
+            assert_snapshot!(result, @r#"
+            def hello(x, y, z):
+                return x + y + z
+
+
+            def world():
+                pass
+            "#);
+        }
+
+        #[test]
+        fn test_uv_format_range() -> anyhow::Result<()> {
+            let document = TextDocument::new(
+                r#"
+def messy_function(  a,  b,c   ):
+    return a+b+c
+
+def another_function(x,y,z):
+    result=x+y+z
+    return result
+"#
+                .to_string(),
+                0,
+            );
+
+            // Find the range of the second function
+            let start = document.contents().find("def another_function").unwrap();
+            let end = document.contents().find("return result").unwrap() + "return result".len();
+            let range = TextRange::new(TextSize::try_from(start)?, TextSize::try_from(end)?);
+
+            let result = format_range(
+                &document,
+                PySourceType::Python,
+                &FormatterSettings::default(),
+                range,
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors when formatting range with uv")
+            .expect("Expected formatting changes");
+
+            assert_snapshot!(result.as_code(), @r#"
+            def messy_function(  a,  b,c   ):
+                return a+b+c
+
+            def another_function(x, y, z):
+                result = x + y + z
+                return result
+            "#);
+
+            Ok(())
+        }
+
+        #[test]
+        fn test_uv_format_with_line_length() {
+            use ruff_formatter::LineWidth;
+
+            let document = TextDocument::new(
+                r#"
+def hello(very_long_parameter_name_1, very_long_parameter_name_2, very_long_parameter_name_3):
+    return very_long_parameter_name_1 + very_long_parameter_name_2 + very_long_parameter_name_3
+"#
+                .to_string(),
+                0,
+            );
+
+            // Test with shorter line length
+            let formatter_settings = FormatterSettings {
+                line_width: LineWidth::try_from(60).unwrap(),
+                ..Default::default()
+            };
+
+            let result = format(
+                &document,
+                PySourceType::Python,
+                &formatter_settings,
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors when formatting with uv")
+            .expect("Expected formatting changes");
+
+            // With line length 60, the function should be wrapped
+            assert_snapshot!(result, @r#"
+            def hello(
+                very_long_parameter_name_1,
+                very_long_parameter_name_2,
+                very_long_parameter_name_3,
+            ):
+                return (
+                    very_long_parameter_name_1
+                    + very_long_parameter_name_2
+                    + very_long_parameter_name_3
+                )
+            "#);
+        }
+
+        #[test]
+        fn test_uv_format_with_indent_style() {
+            use ruff_formatter::IndentStyle;
+
+            let document = TextDocument::new(
+                r#"
+def hello():
+    if True:
+        print("Hello")
+        if False:
+            print("World")
+"#
+                .to_string(),
+                0,
+            );
+
+            // Test with tabs instead of spaces
+            let formatter_settings = FormatterSettings {
+                indent_style: IndentStyle::Tab,
+                ..Default::default()
+            };
+
+            let result = format(
+                &document,
+                PySourceType::Python,
+                &formatter_settings,
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors when formatting with uv")
+            .expect("Expected formatting changes");
+
+            // Should have formatting changes (spaces to tabs)
+            assert_snapshot!(result, @r#"
+            def hello():
+            	if True:
+            		print("Hello")
+            		if False:
+            			print("World")
+            "#);
+        }
+
+        #[test]
+        fn test_uv_format_syntax_error() {
+            let document = TextDocument::new(
+                r#"
+def broken(:
+    pass
+"#
+                .to_string(),
+                0,
+            );
+
+            // uv should return None for syntax errors (as indicated by the TODO comment)
+            let result = format(
+                &document,
+                PySourceType::Python,
+                &FormatterSettings::default(),
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors from format function");
+
+            // Should return None since the syntax is invalid
+            assert_eq!(result, None, "Expected None for syntax error");
+        }
+
+        #[test]
+        fn test_uv_format_with_quote_style() {
+            use ruff_python_formatter::QuoteStyle;
+
+            let document = TextDocument::new(
+                r#"
+x = "hello"
+y = 'world'
+z = '''multi
+line'''
+"#
+                .to_string(),
+                0,
+            );
+
+            // Test with single quotes
+            let formatter_settings = FormatterSettings {
+                quote_style: QuoteStyle::Single,
+                ..Default::default()
+            };
+
+            let result = format(
+                &document,
+                PySourceType::Python,
+                &formatter_settings,
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors when formatting with uv")
+            .expect("Expected formatting changes");
+
+            assert_snapshot!(result, @r#"
+            x = 'hello'
+            y = 'world'
+            z = """multi
+            line"""
+            "#);
+        }
+
+        #[test]
+        fn test_uv_format_with_magic_trailing_comma() {
+            use ruff_python_formatter::MagicTrailingComma;
+
+            let document = TextDocument::new(
+                r#"
+foo = [
+    1,
+    2,
+    3,
+]
+
+bar = [1, 2, 3,]
+"#
+                .to_string(),
+                0,
+            );
+
+            // Test with ignore magic trailing comma
+            let formatter_settings = FormatterSettings {
+                magic_trailing_comma: MagicTrailingComma::Ignore,
+                ..Default::default()
+            };
+
+            let result = format(
+                &document,
+                PySourceType::Python,
+                &formatter_settings,
+                Path::new("test.py"),
+                FormatBackend::Uv,
+            )
+            .expect("Expected no errors when formatting with uv")
+            .expect("Expected formatting changes");
+
+            assert_snapshot!(result, @r#"
+            foo = [1, 2, 3]
+
+            bar = [1, 2, 3]
+            "#);
+        }
+    }
 }
diff --git a/crates/ruff_server/src/lint.rs b/crates/ruff_server/src/lint.rs
index 5c764bfa58..073587a386 100644
--- a/crates/ruff_server/src/lint.rs
+++ b/crates/ruff_server/src/lint.rs
@@ -234,7 +234,7 @@ fn to_lsp_diagnostic(
     index: &LineIndex,
     encoding: PositionEncoding,
 ) -> (usize, lsp_types::Diagnostic) {
-    let diagnostic_range = diagnostic.expect_range();
+    let diagnostic_range = diagnostic.range().unwrap_or_default();
     let name = diagnostic.name();
     let body = diagnostic.body().to_string();
     let fix = diagnostic.fix();
@@ -287,7 +287,7 @@ fn to_lsp_diagnostic(
         let code = code.to_string();
         (
             Some(severity(&code)),
-            tags(&code),
+            tags(diagnostic),
             Some(lsp_types::NumberOrString::String(code)),
         )
     } else {
@@ -338,12 +338,17 @@ fn severity(code: &str) -> lsp_types::DiagnosticSeverity {
     }
 }
 
-fn tags(code: &str) -> Option<Vec<lsp_types::DiagnosticTag>> {
-    match code {
-        // F401: <module> imported but unused
-        // F841: local variable <name> is assigned to but never used
-        // RUF059: Unused unpacked variable
-        "F401" | "F841" | "RUF059" => Some(vec![lsp_types::DiagnosticTag::UNNECESSARY]),
-        _ => None,
-    }
+fn tags(diagnostic: &Diagnostic) -> Option<Vec<lsp_types::DiagnosticTag>> {
+    diagnostic.primary_tags().map(|tags| {
+        tags.iter()
+            .map(|tag| match tag {
+                ruff_db::diagnostic::DiagnosticTag::Unnecessary => {
+                    lsp_types::DiagnosticTag::UNNECESSARY
+                }
+                ruff_db::diagnostic::DiagnosticTag::Deprecated => {
+                    lsp_types::DiagnosticTag::DEPRECATED
+                }
+            })
+            .collect()
+    })
 }
diff --git a/crates/ruff_server/src/server/api/requests/format.rs b/crates/ruff_server/src/server/api/requests/format.rs
index 9066111217..407c5eb229 100644
--- a/crates/ruff_server/src/server/api/requests/format.rs
+++ b/crates/ruff_server/src/server/api/requests/format.rs
@@ -33,6 +33,10 @@ impl super::BackgroundDocumentRequestHandler for Format {
 pub(super) fn format_full_document(snapshot: &DocumentSnapshot) -> Result<Fixes> {
     let mut fixes = Fixes::default();
     let query = snapshot.query();
+    let backend = snapshot
+        .client_settings()
+        .editor_settings()
+        .format_backend();
 
     match snapshot.query() {
         DocumentQuery::Notebook { notebook, .. } => {
@@ -41,7 +45,7 @@ pub(super) fn format_full_document(snapshot: &DocumentSnapshot) -> Result<Fixes>
                 .map(|url| (url.clone(), notebook.cell_document_by_uri(url).unwrap()))
             {
                 if let Some(changes) =
-                    format_text_document(text_document, query, snapshot.encoding(), true)?
+                    format_text_document(text_document, query, snapshot.encoding(), true, backend)?
                 {
                     fixes.insert(url, changes);
                 }
@@ -49,7 +53,7 @@ pub(super) fn format_full_document(snapshot: &DocumentSnapshot) -> Result<Fixes>
         }
         DocumentQuery::Text { document, .. } => {
             if let Some(changes) =
-                format_text_document(document, query, snapshot.encoding(), false)?
+                format_text_document(document, query, snapshot.encoding(), false, backend)?
             {
                 fixes.insert(snapshot.query().make_key().into_url(), changes);
             }
@@ -68,11 +72,16 @@ pub(super) fn format_document(snapshot: &DocumentSnapshot) -> Result<super::Form
         .context("Failed to get text document for the format request")
         .unwrap();
     let query = snapshot.query();
+    let backend = snapshot
+        .client_settings()
+        .editor_settings()
+        .format_backend();
     format_text_document(
         text_document,
         query,
         snapshot.encoding(),
         query.as_notebook().is_some(),
+        backend,
     )
 }
 
@@ -81,6 +90,7 @@ fn format_text_document(
     query: &DocumentQuery,
     encoding: PositionEncoding,
     is_notebook: bool,
+    backend: crate::format::FormatBackend,
 ) -> Result<super::FormatResponse> {
     let settings = query.settings();
     let file_path = query.virtual_file_path();
@@ -101,6 +111,7 @@ fn format_text_document(
         query.source_type(),
         &settings.formatter,
         &file_path,
+        backend,
     )
     .with_failure_code(lsp_server::ErrorCode::InternalError)?;
     let Some(mut formatted) = formatted else {
diff --git a/crates/ruff_server/src/server/api/requests/format_range.rs b/crates/ruff_server/src/server/api/requests/format_range.rs
index 4e4cddae1a..d1d98583a9 100644
--- a/crates/ruff_server/src/server/api/requests/format_range.rs
+++ b/crates/ruff_server/src/server/api/requests/format_range.rs
@@ -36,7 +36,11 @@ fn format_document_range(
         .context("Failed to get text document for the format range request")
         .unwrap();
     let query = snapshot.query();
-    format_text_document_range(text_document, range, query, snapshot.encoding())
+    let backend = snapshot
+        .client_settings()
+        .editor_settings()
+        .format_backend();
+    format_text_document_range(text_document, range, query, snapshot.encoding(), backend)
 }
 
 /// Formats the specified [`Range`] in the [`TextDocument`].
@@ -45,6 +49,7 @@ fn format_text_document_range(
     range: Range,
     query: &DocumentQuery,
     encoding: PositionEncoding,
+    backend: crate::format::FormatBackend,
 ) -> Result<super::FormatResponse> {
     let settings = query.settings();
     let file_path = query.virtual_file_path();
@@ -68,6 +73,7 @@ fn format_text_document_range(
         &settings.formatter,
         range,
         &file_path,
+        backend,
     )
     .with_failure_code(lsp_server::ErrorCode::InternalError)?;
 
diff --git a/crates/ruff_server/src/session/index.rs b/crates/ruff_server/src/session/index.rs
index 820f48ccbd..42220ffa9d 100644
--- a/crates/ruff_server/src/session/index.rs
+++ b/crates/ruff_server/src/session/index.rs
@@ -187,12 +187,9 @@ impl Index {
             anyhow!("Failed to convert workspace URL to file path: {workspace_url}")
         })?;
 
-        self.settings.remove(&workspace_path).ok_or_else(|| {
-            anyhow!(
-                "Tried to remove non-existent workspace URI {}",
-                workspace_url
-            )
-        })?;
+        self.settings
+            .remove(&workspace_path)
+            .ok_or_else(|| anyhow!("Tried to remove non-existent workspace URI {workspace_url}"))?;
 
         // O(n) complexity, which isn't ideal... but this is an uncommon operation.
         self.documents
@@ -330,7 +327,7 @@ impl Index {
         };
 
         let Some(_) = self.documents.remove(&url) else {
-            anyhow::bail!("tried to close document that didn't exist at {}", url)
+            anyhow::bail!("tried to close document that didn't exist at {url}")
         };
         Ok(())
     }
@@ -351,7 +348,7 @@ impl Index {
             anyhow::bail!("Tried to open unavailable document `{key}`");
         };
         let Some(controller) = self.documents.get_mut(&url) else {
-            anyhow::bail!("Document controller not available at `{}`", url);
+            anyhow::bail!("Document controller not available at `{url}`");
         };
         Ok(controller)
     }
diff --git a/crates/ruff_server/src/session/index/ruff_settings.rs b/crates/ruff_server/src/session/index/ruff_settings.rs
index 658a2a08cc..93dc739d87 100644
--- a/crates/ruff_server/src/session/index/ruff_settings.rs
+++ b/crates/ruff_server/src/session/index/ruff_settings.rs
@@ -401,6 +401,7 @@ impl ConfigurationTransformer for EditorConfigurationTransformer<'_> {
             configuration,
             format_preview,
             lint_preview,
+            format_backend: _,
             select,
             extend_select,
             ignore,
diff --git a/crates/ruff_server/src/session/options.rs b/crates/ruff_server/src/session/options.rs
index 0a23e712c7..dba88c99ae 100644
--- a/crates/ruff_server/src/session/options.rs
+++ b/crates/ruff_server/src/session/options.rs
@@ -7,9 +7,12 @@ use serde_json::{Map, Value};
 
 use ruff_linter::{RuleSelector, line_width::LineLength, rule_selector::ParseError};
 
-use crate::session::{
-    Client,
-    settings::{ClientSettings, EditorSettings, GlobalClientSettings, ResolvedConfiguration},
+use crate::{
+    format::FormatBackend,
+    session::{
+        Client,
+        settings::{ClientSettings, EditorSettings, GlobalClientSettings, ResolvedConfiguration},
+    },
 };
 
 pub(crate) type WorkspaceOptionsMap = FxHashMap<Url, ClientOptions>;
@@ -124,6 +127,7 @@ impl ClientOptions {
             configuration,
             lint_preview: lint.preview,
             format_preview: format.preview,
+            format_backend: format.backend,
             select: lint.select.and_then(|select| {
                 Self::resolve_rules(
                     &select,
@@ -283,11 +287,13 @@ impl Combine for LintOptions {
 #[serde(rename_all = "camelCase")]
 struct FormatOptions {
     preview: Option<bool>,
+    backend: Option<FormatBackend>,
 }
 
 impl Combine for FormatOptions {
     fn combine_with(&mut self, other: Self) {
         self.preview.combine_with(other.preview);
+        self.backend.combine_with(other.backend);
     }
 }
 
@@ -443,6 +449,12 @@ pub(crate) trait Combine {
     fn combine_with(&mut self, other: Self);
 }
 
+impl Combine for FormatBackend {
+    fn combine_with(&mut self, other: Self) {
+        *self = other;
+    }
+}
+
 impl<T> Combine for Option<T>
 where
     T: Combine,
@@ -584,6 +596,7 @@ mod tests {
                     format: Some(
                         FormatOptions {
                             preview: None,
+                            backend: None,
                         },
                     ),
                     code_action: Some(
@@ -640,6 +653,7 @@ mod tests {
                         format: Some(
                             FormatOptions {
                                 preview: None,
+                                backend: None,
                             },
                         ),
                         code_action: Some(
@@ -704,6 +718,7 @@ mod tests {
                         format: Some(
                             FormatOptions {
                                 preview: None,
+                                backend: None,
                             },
                         ),
                         code_action: Some(
@@ -782,6 +797,7 @@ mod tests {
                     configuration: None,
                     lint_preview: Some(true),
                     format_preview: None,
+                    format_backend: None,
                     select: Some(vec![
                         RuleSelector::Linter(Linter::Pyflakes),
                         RuleSelector::Linter(Linter::Isort)
@@ -819,6 +835,7 @@ mod tests {
                     configuration: None,
                     lint_preview: Some(false),
                     format_preview: None,
+                    format_backend: None,
                     select: Some(vec![
                         RuleSelector::Linter(Linter::Pyflakes),
                         RuleSelector::Linter(Linter::Isort)
@@ -919,6 +936,7 @@ mod tests {
                     configuration: None,
                     lint_preview: None,
                     format_preview: None,
+                    format_backend: None,
                     select: None,
                     extend_select: None,
                     ignore: Some(vec![RuleSelector::from_str("RUF001").unwrap()]),
diff --git a/crates/ruff_server/src/session/settings.rs b/crates/ruff_server/src/session/settings.rs
index 94cf41c827..1aff2b0eca 100644
--- a/crates/ruff_server/src/session/settings.rs
+++ b/crates/ruff_server/src/session/settings.rs
@@ -8,6 +8,7 @@ use ruff_workspace::options::Options;
 
 use crate::{
     ClientOptions,
+    format::FormatBackend,
     session::{
         Client,
         options::{ClientConfiguration, ConfigurationPreference},
@@ -84,6 +85,7 @@ pub(crate) struct EditorSettings {
     pub(super) configuration: Option<ResolvedConfiguration>,
     pub(super) lint_preview: Option<bool>,
     pub(super) format_preview: Option<bool>,
+    pub(super) format_backend: Option<FormatBackend>,
     pub(super) select: Option<Vec<RuleSelector>>,
     pub(super) extend_select: Option<Vec<RuleSelector>>,
     pub(super) ignore: Option<Vec<RuleSelector>>,
@@ -163,3 +165,9 @@ impl ClientSettings {
         &self.editor_settings
     }
 }
+
+impl EditorSettings {
+    pub(crate) fn format_backend(&self) -> FormatBackend {
+        self.format_backend.unwrap_or_default()
+    }
+}
diff --git a/crates/ruff_source_file/Cargo.toml b/crates/ruff_source_file/Cargo.toml
index ffc41ca462..33d28a449e 100644
--- a/crates/ruff_source_file/Cargo.toml
+++ b/crates/ruff_source_file/Cargo.toml
@@ -22,7 +22,7 @@ serde = { workspace = true, optional = true }
 [dev-dependencies]
 
 [features]
-get-size = ["dep:get-size2"]
+get-size = ["dep:get-size2", "ruff_text_size/get-size"]
 serde = ["dep:serde", "ruff_text_size/serde"]
 
 [lints]
diff --git a/crates/ruff_source_file/src/line_index.rs b/crates/ruff_source_file/src/line_index.rs
index 1f04aef240..4adb9d17b7 100644
--- a/crates/ruff_source_file/src/line_index.rs
+++ b/crates/ruff_source_file/src/line_index.rs
@@ -622,6 +622,33 @@ impl OneIndexed {
     pub fn checked_sub(self, rhs: Self) -> Option<Self> {
         self.0.get().checked_sub(rhs.get()).and_then(Self::new)
     }
+
+    /// Calculate the number of digits in `self`.
+    ///
+    /// This is primarily intended for computing the length of the string representation for
+    /// formatted printing.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use ruff_source_file::OneIndexed;
+    ///
+    /// let one = OneIndexed::new(1).unwrap();
+    /// assert_eq!(one.digits().get(), 1);
+    ///
+    /// let hundred = OneIndexed::new(100).unwrap();
+    /// assert_eq!(hundred.digits().get(), 3);
+    ///
+    /// let thousand = OneIndexed::new(1000).unwrap();
+    /// assert_eq!(thousand.digits().get(), 4);
+    /// ```
+    pub const fn digits(self) -> NonZeroUsize {
+        // Safety: the 1+ ensures this is always non-zero, and
+        // `usize::MAX.ilog10()` << `usize::MAX`, so the result is always safe
+        // to cast to a usize, even though it's returned as a u32
+        // (u64::MAX.ilog10() is 19).
+        NonZeroUsize::new(1 + self.0.get().ilog10() as usize).unwrap()
+    }
 }
 
 impl Default for OneIndexed {
diff --git a/crates/ruff_text_size/src/range.rs b/crates/ruff_text_size/src/range.rs
index 895cfea530..302568e8e3 100644
--- a/crates/ruff_text_size/src/range.rs
+++ b/crates/ruff_text_size/src/range.rs
@@ -425,6 +425,22 @@ impl TextRange {
     }
 }
 
+/// Conversion methods.
+impl TextRange {
+    /// A convenience routine for converting this range to a
+    /// standard library range that satisfies the `RangeBounds`
+    /// trait.
+    ///
+    /// This is also available as a `From` trait implementation,
+    /// but this method avoids the need to specify types to help
+    /// inference.
+    #[inline]
+    #[must_use]
+    pub fn to_std_range(&self) -> Range<usize> {
+        (*self).into()
+    }
+}
+
 impl Index<TextRange> for str {
     type Output = str;
     #[inline]
diff --git a/crates/ruff_text_size/src/schemars_impls.rs b/crates/ruff_text_size/src/schemars_impls.rs
index 4bc9ba2e01..9653334354 100644
--- a/crates/ruff_text_size/src/schemars_impls.rs
+++ b/crates/ruff_text_size/src/schemars_impls.rs
@@ -6,11 +6,12 @@
 //! bindings to the Workspace API
 
 use crate::{TextRange, TextSize};
-use schemars::{JsonSchema, r#gen::SchemaGenerator, schema::Schema};
+use schemars::{JsonSchema, Schema, SchemaGenerator};
+use std::borrow::Cow;
 
 impl JsonSchema for TextSize {
-    fn schema_name() -> String {
-        String::from("TextSize")
+    fn schema_name() -> Cow<'static, str> {
+        Cow::Borrowed("TextSize")
     }
 
     fn json_schema(r#gen: &mut SchemaGenerator) -> Schema {
@@ -21,8 +22,8 @@ impl JsonSchema for TextSize {
 }
 
 impl JsonSchema for TextRange {
-    fn schema_name() -> String {
-        String::from("TextRange")
+    fn schema_name() -> Cow<'static, str> {
+        Cow::Borrowed("TextRange")
     }
 
     fn json_schema(r#gen: &mut SchemaGenerator) -> Schema {
diff --git a/crates/ruff_wasm/Cargo.toml b/crates/ruff_wasm/Cargo.toml
index 9b6c0ed914..f399ef1007 100644
--- a/crates/ruff_wasm/Cargo.toml
+++ b/crates/ruff_wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_wasm"
-version = "0.12.9"
+version = "0.14.2"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/crates/ruff_wasm/README.md b/crates/ruff_wasm/README.md
index 59f5b486b1..973f157a08 100644
--- a/crates/ruff_wasm/README.md
+++ b/crates/ruff_wasm/README.md
@@ -19,7 +19,7 @@ There are multiple versions for the different wasm-pack targets. See [here](http
 This example uses the wasm-pack web target and is known to work with Vite.
 
 ```ts
-import init, { Workspace, type Diagnostic } from '@astral-sh/ruff-api';
+import init, { Workspace, type Diagnostic, PositionEncoding } from '@astral-sh/ruff-wasm-web';
 
 const exampleDocument = `print('hello'); print("world")`
 
@@ -42,7 +42,7 @@ const workspace = new Workspace({
       'F'
     ],
   },
-});
+}, PositionEncoding.UTF16);
 
 // Will contain 1 diagnostic code for E702: Multiple statements on one line
 const diagnostics: Diagnostic[] = workspace.check(exampleDocument);
diff --git a/crates/ruff_wasm/src/lib.rs b/crates/ruff_wasm/src/lib.rs
index bc11dfc310..8c18111d16 100644
--- a/crates/ruff_wasm/src/lib.rs
+++ b/crates/ruff_wasm/src/lib.rs
@@ -19,7 +19,7 @@ use ruff_python_formatter::{PyFormatContext, QuoteStyle, format_module_ast, pret
 use ruff_python_index::Indexer;
 use ruff_python_parser::{Mode, ParseOptions, Parsed, parse, parse_unchecked};
 use ruff_python_trivia::CommentRanges;
-use ruff_source_file::{LineColumn, OneIndexed};
+use ruff_source_file::{OneIndexed, PositionEncoding as SourcePositionEncoding, SourceLocation};
 use ruff_text_size::Ranged;
 use ruff_workspace::Settings;
 use ruff_workspace::configuration::Configuration;
@@ -117,6 +117,7 @@ pub fn run() {
 #[wasm_bindgen]
 pub struct Workspace {
     settings: Settings,
+    position_encoding: SourcePositionEncoding,
 }
 
 #[wasm_bindgen]
@@ -126,7 +127,7 @@ impl Workspace {
     }
 
     #[wasm_bindgen(constructor)]
-    pub fn new(options: JsValue) -> Result<Workspace, Error> {
+    pub fn new(options: JsValue, position_encoding: PositionEncoding) -> Result<Workspace, Error> {
         let options: Options = serde_wasm_bindgen::from_value(options).map_err(into_error)?;
         let configuration =
             Configuration::from_options(options, Some(Path::new(".")), Path::new("."))
@@ -135,7 +136,10 @@ impl Workspace {
             .into_settings(Path::new("."))
             .map_err(into_error)?;
 
-        Ok(Workspace { settings })
+        Ok(Workspace {
+            settings,
+            position_encoding: position_encoding.into(),
+        })
     }
 
     #[wasm_bindgen(js_name = defaultSettings)]
@@ -203,7 +207,7 @@ impl Workspace {
         // Extract the `# noqa` and `# isort: skip` directives from the source.
         let directives = directives::extract_directives(
             parsed.tokens(),
-            directives::Flags::empty(),
+            directives::Flags::from_settings(&self.settings.linter),
             &locator,
             &indexer,
         );
@@ -228,23 +232,34 @@ impl Workspace {
 
         let messages: Vec<ExpandedMessage> = diagnostics
             .into_iter()
-            .map(|msg| ExpandedMessage {
-                code: msg.secondary_code_or_id().to_string(),
-                message: msg.body().to_string(),
-                start_location: source_code.line_column(msg.expect_range().start()).into(),
-                end_location: source_code.line_column(msg.expect_range().end()).into(),
-                fix: msg.fix().map(|fix| ExpandedFix {
-                    message: msg.first_help_text().map(ToString::to_string),
-                    edits: fix
-                        .edits()
-                        .iter()
-                        .map(|edit| ExpandedEdit {
-                            location: source_code.line_column(edit.start()).into(),
-                            end_location: source_code.line_column(edit.end()).into(),
-                            content: edit.content().map(ToString::to_string),
-                        })
-                        .collect(),
-                }),
+            .map(|msg| {
+                let range = msg.range().unwrap_or_default();
+                ExpandedMessage {
+                    code: msg.secondary_code_or_id().to_string(),
+                    message: msg.body().to_string(),
+                    start_location: source_code
+                        .source_location(range.start(), self.position_encoding)
+                        .into(),
+                    end_location: source_code
+                        .source_location(range.end(), self.position_encoding)
+                        .into(),
+                    fix: msg.fix().map(|fix| ExpandedFix {
+                        message: msg.first_help_text().map(ToString::to_string),
+                        edits: fix
+                            .edits()
+                            .iter()
+                            .map(|edit| ExpandedEdit {
+                                location: source_code
+                                    .source_location(edit.start(), self.position_encoding)
+                                    .into(),
+                                end_location: source_code
+                                    .source_location(edit.end(), self.position_encoding)
+                                    .into(),
+                                content: edit.content().map(ToString::to_string),
+                            })
+                            .collect(),
+                    }),
+                }
             })
             .collect();
 
@@ -327,14 +342,37 @@ impl<'a> ParsedModule<'a> {
 #[derive(Serialize, Deserialize, Eq, PartialEq, Debug)]
 pub struct Location {
     pub row: OneIndexed,
+    /// The character offset from the start of the line.
+    ///
+    /// The semantic of the offset depends on the [`PositionEncoding`] used when creating
+    /// the [`Workspace`].
     pub column: OneIndexed,
 }
 
-impl From<LineColumn> for Location {
-    fn from(value: LineColumn) -> Self {
+impl From<SourceLocation> for Location {
+    fn from(value: SourceLocation) -> Self {
         Self {
             row: value.line,
-            column: value.column,
+            column: value.character_offset,
+        }
+    }
+}
+
+#[derive(Default, Copy, Clone)]
+#[wasm_bindgen]
+pub enum PositionEncoding {
+    #[default]
+    Utf8,
+    Utf16,
+    Utf32,
+}
+
+impl From<PositionEncoding> for SourcePositionEncoding {
+    fn from(value: PositionEncoding) -> Self {
+        match value {
+            PositionEncoding::Utf8 => Self::Utf8,
+            PositionEncoding::Utf16 => Self::Utf16,
+            PositionEncoding::Utf32 => Self::Utf32,
         }
     }
 }
diff --git a/crates/ruff_wasm/tests/api.rs b/crates/ruff_wasm/tests/api.rs
index 8dada44a5b..22a1c98c38 100644
--- a/crates/ruff_wasm/tests/api.rs
+++ b/crates/ruff_wasm/tests/api.rs
@@ -4,12 +4,15 @@ use wasm_bindgen_test::wasm_bindgen_test;
 
 use ruff_linter::registry::Rule;
 use ruff_source_file::OneIndexed;
-use ruff_wasm::{ExpandedMessage, Location, Workspace};
+use ruff_wasm::{ExpandedMessage, Location, PositionEncoding, Workspace};
 
 macro_rules! check {
     ($source:expr, $config:expr, $expected:expr) => {{
         let config = js_sys::JSON::parse($config).unwrap();
-        match Workspace::new(config).unwrap().check($source) {
+        match Workspace::new(config, PositionEncoding::Utf8)
+            .unwrap()
+            .check($source)
+        {
             Ok(output) => {
                 let result: Vec<ExpandedMessage> = serde_wasm_bindgen::from_value(output).unwrap();
                 assert_eq!(result, $expected);
diff --git a/crates/ruff_workspace/Cargo.toml b/crates/ruff_workspace/Cargo.toml
index 7b075f0344..9ef114df94 100644
--- a/crates/ruff_workspace/Cargo.toml
+++ b/crates/ruff_workspace/Cargo.toml
@@ -42,6 +42,7 @@ regex = { workspace = true }
 rustc-hash = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_json = { workspace = true, optional = true }
 shellexpand = { workspace = true }
 strum = { workspace = true }
 toml = { workspace = true }
@@ -63,7 +64,9 @@ ignored = ["colored"]
 default = []
 schemars = [
     "dep:schemars",
+    "dep:serde_json",
     "ruff_formatter/schemars",
+    "ruff_linter/schemars",
     "ruff_python_formatter/schemars",
     "ruff_python_semantic/schemars",
 ]
diff --git a/crates/ruff_workspace/src/configuration.rs b/crates/ruff_workspace/src/configuration.rs
index fef7148f64..8ca5350d11 100644
--- a/crates/ruff_workspace/src/configuration.rs
+++ b/crates/ruff_workspace/src/configuration.rs
@@ -55,7 +55,8 @@ use crate::options::{
     PydoclintOptions, PydocstyleOptions, PyflakesOptions, PylintOptions, RuffOptions,
 };
 use crate::settings::{
-    EXCLUDE, FileResolverSettings, FormatterSettings, INCLUDE, LineEnding, Settings,
+    EXCLUDE, FileResolverSettings, FormatterSettings, INCLUDE, INCLUDE_PREVIEW, LineEnding,
+    Settings,
 };
 
 #[derive(Clone, Debug, Default)]
@@ -158,9 +159,7 @@ impl Configuration {
                 .expect("RUFF_PKG_VERSION is not a valid PEP 440 version specifier");
             if !required_version.contains(&ruff_pkg_version) {
                 return Err(anyhow!(
-                    "Required version `{}` does not match the running version `{}`",
-                    required_version,
-                    RUFF_PKG_VERSION
+                    "Required version `{required_version}` does not match the running version `{RUFF_PKG_VERSION}`"
                 ));
             }
         }
@@ -257,12 +256,6 @@ impl Configuration {
         conflicting_import_settings(&isort, &flake8_import_conventions)?;
 
         let future_annotations = lint.future_annotations.unwrap_or_default();
-        if lint_preview.is_disabled() && future_annotations {
-            warn_user_once!(
-                "The `lint.future-annotations` setting will have no effect \
-                    because `preview` is disabled"
-            );
-        }
 
         Ok(Settings {
             cache_dir: self
@@ -282,9 +275,14 @@ impl Configuration {
                 extend_exclude: FilePatternSet::try_from_iter(self.extend_exclude)?,
                 extend_include: FilePatternSet::try_from_iter(self.extend_include)?,
                 force_exclude: self.force_exclude.unwrap_or(false),
-                include: FilePatternSet::try_from_iter(
-                    self.include.unwrap_or_else(|| INCLUDE.to_vec()),
-                )?,
+                include: match global_preview {
+                    PreviewMode::Disabled => FilePatternSet::try_from_iter(
+                        self.include.unwrap_or_else(|| INCLUDE.to_vec()),
+                    )?,
+                    PreviewMode::Enabled => FilePatternSet::try_from_iter(
+                        self.include.unwrap_or_else(|| INCLUDE_PREVIEW.to_vec()),
+                    )?,
+                },
                 respect_gitignore: self.respect_gitignore.unwrap_or(true),
                 project_root: project_root.to_path_buf(),
             },
diff --git a/crates/ruff_workspace/src/options.rs b/crates/ruff_workspace/src/options.rs
index 5578f4e504..47ee0fe738 100644
--- a/crates/ruff_workspace/src/options.rs
+++ b/crates/ruff_workspace/src/options.rs
@@ -251,7 +251,7 @@ pub struct Options {
     ///
     /// For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).
     #[option(
-        default = r#"["*.py", "*.pyi", "*.ipynb", "**/pyproject.toml"]"#,
+        default = r#"["*.py", "*.pyi", "*.pyw", "*.ipynb", "**/pyproject.toml"]"#,
         value_type = "list[str]",
         example = r#"
             include = ["*.py"]
@@ -299,8 +299,8 @@ pub struct Options {
     /// code upgrades, like rewriting type annotations. Ruff will not propose
     /// changes using features that are not available in the given version.
     ///
-    /// For example, to represent supporting Python >=3.10 or ==3.10
-    /// specify `target-version = "py310"`.
+    /// For example, to represent supporting Python >=3.11 or ==3.11
+    /// specify `target-version = "py311"`.
     ///
     /// If you're already using a `pyproject.toml` file, we recommend
     /// `project.requires-python` instead, as it's based on Python packaging
@@ -327,8 +327,8 @@ pub struct Options {
     /// file than it would for an equivalent runtime file with the same target
     /// version.
     #[option(
-        default = r#""py39""#,
-        value_type = r#""py37" | "py38" | "py39" | "py310" | "py311" | "py312" | "py313""#,
+        default = r#""py310""#,
+        value_type = r#""py37" | "py38" | "py39" | "py310" | "py311" | "py312" | "py313" | "py314""#,
         example = r#"
             # Always generate Python 3.7-compatible code.
             target-version = "py37"
@@ -469,6 +469,7 @@ pub struct Options {
     deny_unknown_fields,
     rename_all = "kebab-case"
 )]
+#[cfg_attr(feature = "schemars", schemars(!from))]
 pub struct LintOptions {
     #[serde(flatten)]
     pub common: LintCommonOptions,
@@ -537,8 +538,6 @@ pub struct LintOptions {
     /// For example, `TC001`, `TC002`, and `TC003` can move more imports into `TYPE_CHECKING` blocks
     /// if `__future__` annotations are enabled.
     ///
-    /// This setting is currently in [preview](https://docs.astral.sh/ruff/preview/) and requires
-    /// preview mode to be enabled to have any effect.
     #[option(
         default = "false",
         value_type = "bool",
@@ -565,8 +564,8 @@ impl OptionsMetadata for DeprecatedTopLevelLintOptions {
 
 #[cfg(feature = "schemars")]
 impl schemars::JsonSchema for DeprecatedTopLevelLintOptions {
-    fn schema_name() -> String {
-        "DeprecatedTopLevelLintOptions".to_owned()
+    fn schema_name() -> std::borrow::Cow<'static, str> {
+        std::borrow::Cow::Borrowed("DeprecatedTopLevelLintOptions")
     }
     fn schema_id() -> std::borrow::Cow<'static, str> {
         std::borrow::Cow::Borrowed(concat!(
@@ -575,28 +574,25 @@ impl schemars::JsonSchema for DeprecatedTopLevelLintOptions {
             "DeprecatedTopLevelLintOptions"
         ))
     }
-    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
-        use schemars::schema::Schema;
+    fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
+        use serde_json::Value;
 
-        let common_schema = LintCommonOptions::json_schema(generator);
-        let mut schema_obj = common_schema.into_object();
-
-        if let Some(object) = schema_obj.object.as_mut() {
-            for property in object.properties.values_mut() {
-                if let Schema::Object(property_object) = property {
-                    if let Some(metadata) = &mut property_object.metadata {
-                        metadata.deprecated = true;
-                    } else {
-                        property_object.metadata = Some(Box::new(schemars::schema::Metadata {
-                            deprecated: true,
-                            ..schemars::schema::Metadata::default()
-                        }));
-                    }
+        let mut schema = LintCommonOptions::json_schema(generator);
+        if let Some(properties) = schema
+            .ensure_object()
+            .get_mut("properties")
+            .and_then(|value| value.as_object_mut())
+        {
+            for property in properties.values_mut() {
+                if let Ok(property_schema) = <&mut schemars::Schema>::try_from(property) {
+                    property_schema
+                        .ensure_object()
+                        .insert("deprecated".to_string(), Value::Bool(true));
                 }
             }
         }
 
-        Schema::Object(schema_obj)
+        schema
     }
 }
 
@@ -2170,7 +2166,8 @@ pub struct Flake8TypeCheckingOptions {
     ///
     /// Note that this setting has no effect when `from __future__ import annotations`
     /// is present, as `__future__` annotations are always treated equivalently
-    /// to quoted annotations.
+    /// to quoted annotations. Similarly, this setting has no effect on Python
+    /// versions after 3.14 because these annotations are also deferred.
     #[option(
         default = "false",
         value_type = "bool",
@@ -2304,6 +2301,9 @@ pub struct IsortOptions {
 
     /// Order imports by type, which is determined by case, in addition to
     /// alphabetically.
+    ///
+    /// Note that this option takes precedence over the
+    /// [`case-sensitive`](#lint_isort_case-sensitive) setting when enabled.
     #[option(
         default = r#"true"#,
         value_type = "bool",
@@ -2326,6 +2326,9 @@ pub struct IsortOptions {
     pub force_sort_within_sections: Option<bool>,
 
     /// Sort imports taking into account case sensitivity.
+    ///
+    /// Note that the [`order-by-type`](#lint_isort_order-by-type) setting will
+    /// take precedence over this one when enabled.
     #[option(
         default = r#"false"#,
         value_type = "bool",
@@ -3862,6 +3865,13 @@ pub struct AnalyzeOptions {
     /// This setting is only relevant when [`detect-string-imports`](#detect-string-imports) is enabled.
     /// For example, if this is set to `2`, then only strings with at least two dots (e.g., `"path.to.module"`)
     /// would be considered valid imports.
+    #[option(
+        default = "2",
+        value_type = "usize",
+        example = r#"
+            string-imports-min-dots = 2
+        "#
+    )]
     pub string_imports_min_dots: Option<usize>,
     /// A map from file path to the list of Python or non-Python file paths or globs that should be
     /// considered dependencies of that file, regardless of whether relevant imports are detected.
diff --git a/crates/ruff_workspace/src/pyproject.rs b/crates/ruff_workspace/src/pyproject.rs
index f849487aa5..0f2251ee11 100644
--- a/crates/ruff_workspace/src/pyproject.rs
+++ b/crates/ruff_workspace/src/pyproject.rs
@@ -114,7 +114,6 @@ pub fn find_fallback_target_version<P: AsRef<Path>>(path: P) -> Option<PythonVer
 #[cfg(not(target_arch = "wasm32"))]
 pub fn find_user_settings_toml() -> Option<PathBuf> {
     use etcetera::BaseStrategy;
-    use ruff_linter::warn_user_once;
 
     let strategy = etcetera::base_strategy::choose_base_strategy().ok()?;
     let config_dir = strategy.config_dir().join("ruff");
@@ -127,23 +126,6 @@ pub fn find_user_settings_toml() -> Option<PathBuf> {
         }
     }
 
-    // On macOS, we used to support reading from `/Users/Alice/Library/Application Support`.
-    if cfg!(target_os = "macos") {
-        let strategy = etcetera::base_strategy::Apple::new().ok()?;
-        let deprecated_config_dir = strategy.data_dir().join("ruff");
-
-        for file in [".ruff.toml", "ruff.toml", "pyproject.toml"] {
-            let path = deprecated_config_dir.join(file);
-            if path.is_file() {
-                warn_user_once!(
-                    "Reading configuration from `~/Library/Application Support` is deprecated. Please move your configuration to `{}/{file}`.",
-                    config_dir.display(),
-                );
-                return Some(path);
-            }
-        }
-    }
-
     None
 }
 
diff --git a/crates/ruff_workspace/src/resolver.rs b/crates/ruff_workspace/src/resolver.rs
index 84a31ebbee..1452583fcd 100644
--- a/crates/ruff_workspace/src/resolver.rs
+++ b/crates/ruff_workspace/src/resolver.rs
@@ -427,7 +427,7 @@ impl From<ConfigurationOrigin> for Relativity {
     }
 }
 
-/// Find all Python (`.py`, `.pyi` and `.ipynb` files) in a set of paths.
+/// Find all Python (`.py`, `.pyi`, `.pyw`, and `.ipynb` files) in a set of paths.
 pub fn python_files_in_path<'a>(
     paths: &[PathBuf],
     pyproject_config: &'a PyprojectConfig,
@@ -523,10 +523,42 @@ impl<'config> WalkPythonFilesState<'config> {
         let (files, error) = self.merged.into_inner().unwrap();
         error?;
 
-        Ok((files, self.resolver.into_inner().unwrap()))
+        let deduplicated_files = deduplicate_files(files);
+
+        Ok((deduplicated_files, self.resolver.into_inner().unwrap()))
     }
 }
 
+/// Deduplicate files by path, prioritizing `Root` files over `Nested` files.
+///
+/// When the same path appears both as a directly specified input (`Root`)
+/// and via directory traversal (`Nested`), keep the `Root` entry and drop
+/// the `Nested` entry.
+///
+/// Dropping the root entry means that the explicitly passed path may be
+/// unintentionally ignored, since it is treated as nested and can be excluded
+/// despite being requested.
+///
+/// Concretely, with `lint.exclude = ["foo.py"]` and `ruff check . foo.py`,
+/// we must keep `Root(foo.py)` and drop `Nested(foo.py)` so `foo.py` is
+/// linted as the user requested.
+fn deduplicate_files(mut files: ResolvedFiles) -> ResolvedFiles {
+    // Sort by path; for identical paths, prefer Root over Nested; place errors after files
+    files.sort_by(|a, b| match (a, b) {
+        (Ok(a_file), Ok(b_file)) => a_file.cmp(b_file),
+        (Ok(_), Err(_)) => Ordering::Less,
+        (Err(_), Ok(_)) => Ordering::Greater,
+        (Err(_), Err(_)) => Ordering::Equal,
+    });
+
+    files.dedup_by(|a, b| match (a, b) {
+        (Ok(a_file), Ok(b_file)) => a_file.path() == b_file.path(),
+        _ => false,
+    });
+
+    files
+}
+
 struct PythonFilesVisitorBuilder<'s, 'config> {
     state: &'s WalkPythonFilesState<'config>,
     transformer: &'s (dyn ConfigurationTransformer + Sync),
@@ -682,7 +714,7 @@ impl Drop for PythonFilesVisitor<'_, '_> {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd)]
 pub enum ResolvedFile {
     /// File explicitly passed to the CLI
     Root(PathBuf),
@@ -715,18 +747,6 @@ impl ResolvedFile {
     }
 }
 
-impl PartialOrd for ResolvedFile {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for ResolvedFile {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.path().cmp(other.path())
-    }
-}
-
 /// Return `true` if the Python file at [`Path`] is _not_ excluded.
 pub fn python_file_at_path(
     path: &Path,
diff --git a/crates/ruff_workspace/src/settings.rs b/crates/ruff_workspace/src/settings.rs
index a20bee0c9d..6e3159e526 100644
--- a/crates/ruff_workspace/src/settings.rs
+++ b/crates/ruff_workspace/src/settings.rs
@@ -144,6 +144,13 @@ pub(crate) static INCLUDE: &[FilePattern] = &[
     FilePattern::Builtin("*.ipynb"),
     FilePattern::Builtin("**/pyproject.toml"),
 ];
+pub(crate) static INCLUDE_PREVIEW: &[FilePattern] = &[
+    FilePattern::Builtin("*.py"),
+    FilePattern::Builtin("*.pyi"),
+    FilePattern::Builtin("*.pyw"),
+    FilePattern::Builtin("*.ipynb"),
+    FilePattern::Builtin("**/pyproject.toml"),
+];
 
 impl FileResolverSettings {
     fn new(project_root: &Path) -> Self {
diff --git a/crates/ty/docs/cli.md b/crates/ty/docs/cli.md
index 9fff1e8876..4c44f523d7 100644
--- a/crates/ty/docs/cli.md
+++ b/crates/ty/docs/cli.md
@@ -54,27 +54,29 @@ over all configuration files.</p>
 </dd><dt id="ty-check--exclude"><a href="#ty-check--exclude"><code>--exclude</code></a> <i>exclude</i></dt><dd><p>Glob patterns for files to exclude from type checking.</p>
 <p>Uses gitignore-style syntax to exclude files and directories from type checking. Supports patterns like <code>tests/</code>, <code>*.tmp</code>, <code>**/__pycache__/**</code>.</p>
 </dd><dt id="ty-check--exit-zero"><a href="#ty-check--exit-zero"><code>--exit-zero</code></a></dt><dd><p>Always use exit code 0, even when there are error-level diagnostics</p>
-</dd><dt id="ty-check--extra-search-path"><a href="#ty-check--extra-search-path"><code>--extra-search-path</code></a> <i>path</i></dt><dd><p>Additional path to use as a module-resolution source (can be passed multiple times)</p>
+</dd><dt id="ty-check--extra-search-path"><a href="#ty-check--extra-search-path"><code>--extra-search-path</code></a> <i>path</i></dt><dd><p>Additional path to use as a module-resolution source (can be passed multiple times).</p>
+<p>This is an advanced option that should usually only be used for first-party or third-party modules that are not installed into your Python environment in a conventional way. Use <code>--python</code> to point ty to your Python environment if it is in an unusual location.</p>
 </dd><dt id="ty-check--help"><a href="#ty-check--help"><code>--help</code></a>, <code>-h</code></dt><dd><p>Print help (see a summary with '-h')</p>
 </dd><dt id="ty-check--ignore"><a href="#ty-check--ignore"><code>--ignore</code></a> <i>rule</i></dt><dd><p>Disables the rule. Can be specified multiple times.</p>
 </dd><dt id="ty-check--output-format"><a href="#ty-check--output-format"><code>--output-format</code></a> <i>output-format</i></dt><dd><p>The format to use for printing diagnostic messages</p>
 <p>Possible values:</p>
 <ul>
-<li><code>full</code>:  Print diagnostics verbosely, with context and helpful hints [default]</li>
+<li><code>full</code>:  Print diagnostics verbosely, with context and helpful hints (default)</li>
 <li><code>concise</code>:  Print diagnostics concisely, one per line</li>
+<li><code>gitlab</code>:  Print diagnostics in the JSON format expected by GitLab Code Quality reports</li>
+<li><code>github</code>:  Print diagnostics in the format used by GitHub Actions workflow error annotations</li>
 </ul></dd><dt id="ty-check--project"><a href="#ty-check--project"><code>--project</code></a> <i>project</i></dt><dd><p>Run the command within the given project directory.</p>
 <p>All <code>pyproject.toml</code> files will be discovered by walking up the directory tree from the given project directory, as will the project's virtual environment (<code>.venv</code>) unless the <code>venv-path</code> option is set.</p>
 <p>Other command-line arguments (such as relative paths) will be resolved relative to the current working directory.</p>
-</dd><dt id="ty-check--python"><a href="#ty-check--python"><code>--python</code></a> <i>path</i></dt><dd><p>Path to the Python environment.</p>
-<p>ty uses the Python environment to resolve type information and third-party dependencies.</p>
-<p>If not specified, ty will attempt to infer it from the <code>VIRTUAL_ENV</code> or <code>CONDA_PREFIX</code> environment variables, or discover a <code>.venv</code> directory in the project root or working directory.</p>
-<p>If a path to a Python interpreter is provided, e.g., <code>.venv/bin/python3</code>, ty will attempt to find an environment two directories up from the interpreter's path, e.g., <code>.venv</code>. At this time, ty does not invoke the interpreter to determine the location of the environment. This means that ty will not resolve dynamic executables such as a shim.</p>
-<p>ty will search in the resolved environment's <code>site-packages</code> directories for type information and third-party imports.</p>
+</dd><dt id="ty-check--python"><a href="#ty-check--python"><code>--python</code></a>, <code>--venv</code> <i>path</i></dt><dd><p>Path to your project's Python environment or interpreter.</p>
+<p>ty uses your Python environment to resolve third-party imports in your code.</p>
+<p>If you're using a project management tool such as uv or you have an activated Conda or virtual environment, you should not generally need to specify this option.</p>
+<p>This option can be used to point to virtual or system Python environments.</p>
 </dd><dt id="ty-check--python-platform"><a href="#ty-check--python-platform"><code>--python-platform</code></a>, <code>--platform</code> <i>platform</i></dt><dd><p>Target platform to assume when resolving types.</p>
 <p>This is used to specialize the type of <code>sys.platform</code> and will affect the visibility of platform-specific functions and attributes. If the value is set to <code>all</code>, no assumptions are made about the target platform. If unspecified, the current system's platform will be used.</p>
 </dd><dt id="ty-check--python-version"><a href="#ty-check--python-version"><code>--python-version</code></a>, <code>--target-version</code> <i>version</i></dt><dd><p>Python version to assume when resolving types.</p>
 <p>The Python version affects allowed syntax, type definitions of the standard library, and type definitions of first- and third-party modules that are conditional on the Python version.</p>
-<p>If a version is not specified on the command line or in a configuration file, ty will try the following techniques in order of preference to determine a value: 1. Check for the <code>project.requires-python</code> setting in a <code>pyproject.toml</code> file and use the minimum version from the specified range 2. Check for an activated or configured Python environment and attempt to infer the Python version of that environment 3. Fall back to the latest stable Python version supported by ty (currently Python 3.13)</p>
+<p>If a version is not specified on the command line or in a configuration file, ty will try the following techniques in order of preference to determine a value: 1. Check for the <code>project.requires-python</code> setting in a <code>pyproject.toml</code> file and use the minimum version from the specified range 2. Check for an activated or configured Python environment and attempt to infer the Python version of that environment 3. Fall back to the latest stable Python version supported by ty (see <code>ty check --help</code> output)</p>
 <p>Possible values:</p>
 <ul>
 <li><code>3.7</code></li>
@@ -84,6 +86,7 @@ over all configuration files.</p>
 <li><code>3.11</code></li>
 <li><code>3.12</code></li>
 <li><code>3.13</code></li>
+<li><code>3.14</code></li>
 </ul></dd><dt id="ty-check--quiet"><a href="#ty-check--quiet"><code>--quiet</code></a>, <code>-q</code></dt><dd><p>Use quiet output (or <code>-qq</code> for silent output)</p>
 </dd><dt id="ty-check--respect-ignore-files"><a href="#ty-check--respect-ignore-files"><code>--respect-ignore-files</code></a></dt><dd><p>Respect file exclusions via <code>.gitignore</code> and other standard ignore files. Use <code>--no-respect-gitignore</code> to disable</p>
 </dd><dt id="ty-check--typeshed"><a href="#ty-check--typeshed"><code>--typeshed</code></a>, <code>--custom-typeshed-dir</code> <i>path</i></dt><dd><p>Custom directory to use for stdlib typeshed stubs</p>
diff --git a/crates/ty/docs/configuration.md b/crates/ty/docs/configuration.md
index 946c814a5d..4ecf8f8399 100644
--- a/crates/ty/docs/configuration.md
+++ b/crates/ty/docs/configuration.md
@@ -32,9 +32,14 @@ division-by-zero = "ignore"
 
 ### `extra-paths`
 
-List of user-provided paths that should take first priority in the module resolution.
-Examples in other type checkers are mypy's `MYPYPATH` environment variable,
-or pyright's `stubPath` configuration setting.
+User-provided paths that should take first priority in module resolution.
+
+This is an advanced option that should usually only be used for first-party or third-party
+modules that are not installed into your Python environment in a conventional way.
+Use the `python` option to specify the location of your Python environment.
+
+This option is similar to mypy's `MYPYPATH` environment variable and pyright's `stubPath`
+configuration setting.
 
 **Default value**: `[]`
 
@@ -51,12 +56,21 @@ extra-paths = ["./shared/my-search-path"]
 
 ### `python`
 
-Path to the Python installation from which ty resolves type information and third-party dependencies.
+Path to your project's Python environment or interpreter.
 
-ty will search in the path's `site-packages` directories for type information and
-third-party imports.
+ty uses the `site-packages` directory of your project's Python environment
+to resolve third-party (and, in some cases, first-party) imports in your code.
 
-This option is commonly used to specify the path to a virtual environment.
+If you're using a project management tool such as uv, you should not generally need
+to specify this option, as commands such as `uv run` will set the `VIRTUAL_ENV`
+environment variable to point to your project's virtual environment. ty can also infer
+the location of your environment from an activated Conda environment, and will look for
+a `.venv` directory in the project root if none of the above apply.
+
+Passing a path to a Python executable is supported, but passing a path to a dynamic executable
+(such as a shim) is not currently supported.
+
+This option can be used to point to virtual or system Python environments.
 
 **Default value**: `null`
 
@@ -66,7 +80,7 @@ This option is commonly used to specify the path to a virtual environment.
 
 ```toml
 [tool.ty.environment]
-python = "./.venv"
+python = "./custom-venv-location/.venv"
 ```
 
 ---
@@ -119,9 +133,9 @@ For some language features, ty can also understand conditionals based on compari
 with `sys.version_info`. These are commonly found in typeshed, for example,
 to reflect the differing contents of the standard library across Python versions.
 
-**Default value**: `"3.13"`
+**Default value**: `"3.14"`
 
-**Type**: `"3.7" | "3.8" | "3.9" | "3.10" | "3.11" | "3.12" | "3.13" | <major>.<minor>`
+**Type**: `"3.7" | "3.8" | "3.9" | "3.10" | "3.11" | "3.12" | "3.13" | "3.14" | <major>.<minor>`
 
 **Example usage** (`pyproject.toml`):
 
@@ -144,7 +158,7 @@ If left unspecified, ty will try to detect common project layouts and initialize
 * if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path
 * otherwise, default to `.` (flat layout)
 
-Besides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file),
+Besides, if a `./python` or `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` or `__init__.pyi` file),
 it will also be included in the first party search path.
 
 **Default value**: `null`
diff --git a/crates/ty/docs/environment.md b/crates/ty/docs/environment.md
index 30935a8a09..29c15b6bd0 100644
--- a/crates/ty/docs/environment.md
+++ b/crates/ty/docs/environment.md
@@ -33,11 +33,22 @@ when necessary, e.g. to watch for file system changes or a dedicated UI thread.
 
 ty also reads the following externally defined environment variables:
 
+### `CONDA_DEFAULT_ENV`
+
+Used to determine the name of the active Conda environment.
+
 ### `CONDA_PREFIX`
 
-Used to detect an activated Conda environment location.
+Used to detect the path of an active Conda environment.
 If both `VIRTUAL_ENV` and `CONDA_PREFIX` are present, `VIRTUAL_ENV` will be preferred.
 
+### `PYTHONPATH`
+
+Adds additional directories to ty's search paths.
+The format is the same as the shell’s PATH:
+one or more directory pathnames separated by os appropriate pathsep
+(e.g. colons on Unix or semicolons on Windows).
+
 ### `RAYON_NUM_THREADS`
 
 Specifies an upper limit for the number of threads ty uses when performing work in parallel.
@@ -53,3 +64,7 @@ Used to detect an activated virtual environment.
 
 Path to user-level configuration directory on Unix systems.
 
+### `_CONDA_ROOT`
+
+Used to determine the root install path of Conda.
+
diff --git a/crates/ty/docs/rules.md b/crates/ty/docs/rules.md
index cd207b21f3..858f1f0c7c 100644
--- a/crates/ty/docs/rules.md
+++ b/crates/ty/docs/rules.md
@@ -5,11 +5,13 @@
 ## `byte-string-type-annotation`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20byte-string-type-annotation) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L36)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20byte-string-type-annotation" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L36" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for byte-strings in type annotation positions.
@@ -34,11 +36,13 @@ def test(): -> "int":
 ## `call-non-callable`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-non-callable) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L109)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-non-callable" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L117" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for calls to non-callable objects.
@@ -56,11 +60,13 @@ Calling a non-callable object will raise a `TypeError` at runtime.
 ## `conflicting-argument-forms`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-argument-forms) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L153)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-argument-forms" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L161" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks whether an argument is used as both a value and a type form in a call.
@@ -86,11 +92,13 @@ f(int)  # error
 ## `conflicting-declarations`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-declarations) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L179)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-declarations" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L187" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks whether a variable has been declared as two conflicting types.
@@ -115,11 +123,13 @@ a = 1
 ## `conflicting-metaclass`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-metaclass) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L204)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-metaclass" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L212" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for class definitions where the metaclass of the class
@@ -145,11 +155,13 @@ class C(A, B): ...
 ## `cyclic-class-definition`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-class-definition) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L230)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-class-definition" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L238" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for class definitions in stub files that inherit
@@ -175,11 +187,13 @@ class B(A): ...
 ## `duplicate-base`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-base) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L295)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-base" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L303" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for class definitions with duplicate bases.
@@ -200,11 +214,13 @@ class B(A, A): ...
 ## `duplicate-kw-only`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-kw-only) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L316)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-kw-only" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L324" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for dataclass definitions with more than one field
@@ -236,21 +252,25 @@ class A:  # Crash at runtime
 ## `escape-character-in-forward-annotation`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20escape-character-in-forward-annotation) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L120)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20escape-character-in-forward-annotation" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L120" target="_blank">View source</a>
 </small>
 
+
 TODO #14889
 
 ## `fstring-type-annotation`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20fstring-type-annotation) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L11)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20fstring-type-annotation" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L11" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for f-strings in type annotation positions.
@@ -275,11 +295,13 @@ def test(): -> "int":
 ## `implicit-concatenated-string-type-annotation`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20implicit-concatenated-string-type-annotation) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L86)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20implicit-concatenated-string-type-annotation" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L86" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for implicit concatenated strings in type annotation positions.
@@ -304,11 +326,13 @@ def test(): -> "Literal[5]":
 ## `inconsistent-mro`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20inconsistent-mro) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L519)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20inconsistent-mro" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L528" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for classes with an inconsistent [method resolution order] (MRO).
@@ -332,11 +356,13 @@ class C(A, B): ...
 ## `index-out-of-bounds`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20index-out-of-bounds) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L543)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20index-out-of-bounds" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L552" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for attempts to use an out of bounds index to get an item from
@@ -356,11 +382,13 @@ t[3]  # IndexError: tuple index out of range
 ## `instance-layout-conflict`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20instance-layout-conflict) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L348)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20instance-layout-conflict" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L356" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for classes definitions which will fail at runtime due to
@@ -422,7 +450,7 @@ class D(A, B, C): ...
 **Known problems**
 
 Classes that have "dynamic" definitions of `__slots__` (definitions do not consist
-of string literals, or tuples of string literals) are not currently considered solid
+of string literals, or tuples of string literals) are not currently considered disjoint
 bases by ty.
 
 Additionally, this check is not exhaustive: many C extensions (including several in
@@ -443,11 +471,13 @@ an atypical memory layout.
 ## `invalid-argument-type`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-argument-type) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L588)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-argument-type" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L598" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Detects call arguments whose type is not assignable to the corresponding typed parameter.
@@ -468,11 +498,13 @@ func("foo")  # error: [invalid-argument-type]
 ## `invalid-assignment`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-assignment) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L628)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-assignment" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L638" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for assignments where the type of the value
@@ -494,11 +526,13 @@ a: int = ''
 ## `invalid-attribute-access`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-attribute-access) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1662)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-attribute-access" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1749" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for assignments to class variables from instances
@@ -526,11 +560,13 @@ C.instance_var = 3  # error: Cannot assign to instance variable
 ## `invalid-await`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-await) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L650)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-await" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L660" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for `await` being used with types that are not [Awaitable].
@@ -560,11 +596,13 @@ asyncio.run(main())
 ## `invalid-base`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-base) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L680)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-base" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L690" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for class definitions that have bases which are not instances of `type`.
@@ -582,11 +620,13 @@ class A(42): ...  # error: [invalid-base]
 ## `invalid-context-manager`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-context-manager) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L731)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-context-manager" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L741" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for expressions used in `with` statements
@@ -607,11 +647,13 @@ with 1:
 ## `invalid-declaration`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-declaration) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L752)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-declaration" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L762" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for declarations where the inferred type of an existing symbol
@@ -634,11 +676,13 @@ a: str
 ## `invalid-exception-caught`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-exception-caught) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L775)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-exception-caught" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L785" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for exception handlers that catch non-exception classes.
@@ -676,11 +720,13 @@ except ZeroDivisionError:
 ## `invalid-generic-class`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-generic-class) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L811)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-generic-class" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L821" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for the creation of invalid generic classes
@@ -707,11 +753,13 @@ class C[U](Generic[T]): ...
 ## `invalid-key`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-key) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L563)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.17">0.0.1-alpha.17</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-key" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L573" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for subscript accesses with invalid keys.
@@ -736,11 +784,13 @@ alice["height"]  # KeyError: 'height'
 ## `invalid-legacy-type-variable`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-legacy-type-variable) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L837)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-legacy-type-variable" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L847" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for the creation of invalid legacy `TypeVar`s
@@ -769,11 +819,13 @@ def f(t: TypeVar("U")): ...
 ## `invalid-metaclass`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-metaclass) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L886)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-metaclass" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L896" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for arguments to `metaclass=` that are invalid.
@@ -801,11 +853,13 @@ class B(metaclass=f): ...
 ## `invalid-named-tuple`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-named-tuple) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L493)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-named-tuple" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L502" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for invalidly defined `NamedTuple` classes.
@@ -831,11 +885,13 @@ TypeError: can only inherit from a NamedTuple type and Generic
 ## `invalid-overload`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-overload) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L913)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-overload" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L923" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for various invalid `@overload` usages.
@@ -879,11 +935,13 @@ def foo(x: int) -> int: ...
 ## `invalid-parameter-default`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-parameter-default) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L956)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-parameter-default" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1022" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for default values that can't be
@@ -903,11 +961,13 @@ def f(a: int = ''): ...
 ## `invalid-protocol`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-protocol) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L430)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-protocol" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L438" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for protocol classes that will raise `TypeError` at runtime.
@@ -935,11 +995,13 @@ TypeError: Protocols can only inherit from other protocols, got <class 'int'>
 ## `invalid-raise`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-raise) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L976)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-raise" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1042" target="_blank">View source</a>
 </small>
 
+
 Checks for `raise` statements that raise non-exceptions or use invalid
 causes for their raised exceptions.
 
@@ -982,11 +1044,13 @@ def g():
 ## `invalid-return-type`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-return-type) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L609)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-return-type" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L619" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Detects returned values that can't be assigned to the function's annotated return type.
@@ -1005,11 +1069,13 @@ def func() -> int:
 ## `invalid-super-argument`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-super-argument) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1019)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-super-argument" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1085" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Detects `super()` calls where:
@@ -1049,21 +1115,25 @@ super(B, A)  # error: `A` does not satisfy `issubclass(A, B)`
 ## `invalid-syntax-in-forward-annotation`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-syntax-in-forward-annotation) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L111)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-syntax-in-forward-annotation" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L111" target="_blank">View source</a>
 </small>
 
+
 TODO #14889
 
 ## `invalid-type-alias-type`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-alias-type) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L865)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.6">0.0.1-alpha.6</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-alias-type" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L875" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for the creation of invalid `TypeAliasType`s
@@ -1084,11 +1154,13 @@ NewAlias = TypeAliasType(get_name(), int)        # error: TypeAliasType name mus
 ## `invalid-type-checking-constant`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-checking-constant) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1058)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-checking-constant" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1124" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for a value other than `False` assigned to the `TYPE_CHECKING` variable, or an
@@ -1112,11 +1184,13 @@ TYPE_CHECKING = ''
 ## `invalid-type-form`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-form) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1082)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-form" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1148" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for expressions that are used as [type expressions]
@@ -1140,11 +1214,13 @@ b: Annotated[int]  # `Annotated` expects at least two arguments
 ## `invalid-type-guard-call`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-call) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1134)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-call" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1200" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for type guard function calls without a valid target.
@@ -1172,11 +1248,13 @@ f(10)  # Error
 ## `invalid-type-guard-definition`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-definition) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1106)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-definition" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1172" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for type guard functions without
@@ -1204,11 +1282,13 @@ class C:
 ## `invalid-type-variable-constraints`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-variable-constraints) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1162)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-variable-constraints" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1228" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for constrained [type variables] with only one constraint.
@@ -1237,11 +1317,13 @@ T = TypeVar('T', bound=str)  # valid bound TypeVar
 ## `missing-argument`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-argument) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1191)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-argument" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1257" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for missing required arguments in a call.
@@ -1257,14 +1339,49 @@ def func(x: int): ...
 func()  # TypeError: func() missing 1 required positional argument: 'x'
 ```
 
+## `missing-typed-dict-key`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-typed-dict-key" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1850" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Detects missing required keys in `TypedDict` constructor calls.
+
+**Why is this bad?**
+
+`TypedDict` requires all non-optional keys to be provided during construction.
+Missing items can lead to a `KeyError` at runtime.
+
+**Example**
+
+```python
+from typing import TypedDict
+
+class Person(TypedDict):
+    name: str
+    age: int
+
+alice: Person = {"name": "Alice"}  # missing required key 'age'
+
+alice["age"]  # KeyError
+```
+
 ## `no-matching-overload`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20no-matching-overload) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1210)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20no-matching-overload" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1276" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for calls to an overloaded function that do not match any of the overloads.
@@ -1287,11 +1404,13 @@ func("string")  # error: [no-matching-overload]
 ## `non-subscriptable`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20non-subscriptable) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1233)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20non-subscriptable" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1299" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for subscripting objects that do not support subscripting.
@@ -1309,11 +1428,13 @@ Subscripting an object that does not support it will raise a `TypeError` at runt
 ## `not-iterable`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20not-iterable) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1251)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20not-iterable" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1317" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for objects that are not iterable but are used in a context that requires them to be.
@@ -1333,11 +1454,13 @@ for i in 34:  # TypeError: 'int' object is not iterable
 ## `parameter-already-assigned`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20parameter-already-assigned) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1302)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20parameter-already-assigned" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1368" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for calls which provide more than one argument for a single parameter.
@@ -1355,14 +1478,43 @@ def f(x: int) -> int: ...
 f(1, x=2)  # Error raised here
 ```
 
+## `positional-only-parameter-as-kwarg`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20positional-only-parameter-as-kwarg" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1603" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for keyword arguments in calls that match positional-only parameters of the callable.
+
+**Why is this bad?**
+
+Providing a positional-only parameter as a keyword argument will raise `TypeError` at runtime.
+
+**Example**
+
+
+```python
+def f(x: int, /) -> int: ...
+
+f(x=1)  # Error raised here
+```
+
 ## `raw-string-type-annotation`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20raw-string-type-annotation) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L61)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20raw-string-type-annotation" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L61" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for raw-strings in type annotation positions.
@@ -1387,11 +1539,13 @@ def test(): -> "int":
 ## `static-assert-error`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20static-assert-error) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1638)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20static-assert-error" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1725" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Makes sure that the argument of `static_assert` is statically known to be true.
@@ -1415,11 +1569,13 @@ static_assert(int(2.0 * 3.0) == 6)  # error: does not have a statically known tr
 ## `subclass-of-final-class`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20subclass-of-final-class) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1393)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20subclass-of-final-class" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1459" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for classes that subclass final classes.
@@ -1442,11 +1598,13 @@ class B(A): ...  # Error raised here
 ## `too-many-positional-arguments`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20too-many-positional-arguments) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1438)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20too-many-positional-arguments" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1504" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for calls that pass more positional arguments than the callable can accept.
@@ -1467,11 +1625,13 @@ f("foo")  # Error raised here
 ## `type-assertion-failure`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20type-assertion-failure) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1416)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20type-assertion-failure" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1482" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for `assert_type()` and `assert_never()` calls where the actual type
@@ -1493,11 +1653,13 @@ def _(x: int):
 ## `unavailable-implicit-super-arguments`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unavailable-implicit-super-arguments) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1459)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unavailable-implicit-super-arguments" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1525" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Detects invalid `super()` calls where implicit arguments like the enclosing class or first method argument are unavailable.
@@ -1537,11 +1699,13 @@ class A:
 ## `unknown-argument`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-argument) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1516)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-argument" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1582" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for keyword arguments in calls that don't match any parameter of the callable.
@@ -1562,11 +1726,13 @@ f(x=1, y=2)  # Error raised here
 ## `unresolved-attribute`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-attribute) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1537)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-attribute" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1624" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for unresolved attributes.
@@ -1588,11 +1754,13 @@ A().foo  # AttributeError: 'A' object has no attribute 'foo'
 ## `unresolved-import`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-import) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1559)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-import" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1646" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for import statements for which the module cannot be resolved.
@@ -1611,11 +1779,13 @@ import foo  # ModuleNotFoundError: No module named 'foo'
 ## `unresolved-reference`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-reference) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1578)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-reference" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1665" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for references to names that are not defined.
@@ -1634,11 +1804,13 @@ print(x)  # NameError: name 'x' is not defined
 ## `unsupported-bool-conversion`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-bool-conversion) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1271)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-bool-conversion" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1337" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for bool conversions where the object doesn't correctly implement `__bool__`.
@@ -1669,11 +1841,13 @@ b1 < b2 < b1  # exception raised here
 ## `unsupported-operator`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-operator) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1597)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-operator" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1684" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for binary expressions, comparisons, and unary expressions where
@@ -1695,11 +1869,13 @@ A() + A()  # TypeError: unsupported operand type(s) for +: 'A' and 'A'
 ## `zero-stepsize-in-slice`
 
 <small>
-Default level: [`error`](../rules.md#rule-levels "This lint has a default level of 'error'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20zero-stepsize-in-slice) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1619)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20zero-stepsize-in-slice" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1706" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for step size 0 in slices.
@@ -1718,11 +1894,13 @@ l[1:10:0]  # ValueError: slice step cannot be zero
 ## `ambiguous-protocol-member`
 
 <small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ambiguous-protocol-member) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L458)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ambiguous-protocol-member" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L467" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for protocol classes with members that will lead to ambiguous interfaces.
@@ -1757,11 +1935,13 @@ class SubProto(BaseProto, Protocol):
 ## `deprecated`
 
 <small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20deprecated) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L274)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.16">0.0.1-alpha.16</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20deprecated" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L282" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for uses of deprecated items
@@ -1779,174 +1959,15 @@ def old_func(): ...
 old_func()  # emits [deprecated] diagnostic
 ```
 
-## `invalid-ignore-comment`
+## `ignore-comment-unknown-rule`
 
 <small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-ignore-comment) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L65)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ignore-comment-unknown-rule" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L40" target="_blank">View source</a>
 </small>
 
-**What it does**
-
-Checks for `type: ignore` and `ty: ignore` comments that are syntactically incorrect.
-
-**Why is this bad?**
-
-A syntactically incorrect ignore comment is probably a mistake and is useless.
-
-**Examples**
-
-```py
-a = 20 / 0  # type: ignoree
-```
-
-Use instead:
-
-```py
-a = 20 / 0  # type: ignore
-```
-
-## `possibly-unbound-attribute`
-
-<small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unbound-attribute) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1323)
-</small>
-
-**What it does**
-
-Checks for possibly unbound attributes.
-
-**Why is this bad?**
-
-Attempting to access an unbound attribute will raise an `AttributeError` at runtime.
-
-**Examples**
-
-```python
-class A:
-    if b:
-        c = 0
-
-A.c  # AttributeError: type object 'A' has no attribute 'c'
-```
-
-## `possibly-unbound-implicit-call`
-
-<small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unbound-implicit-call) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L127)
-</small>
-
-**What it does**
-
-Checks for implicit calls to possibly unbound methods.
-
-**Why is this bad?**
-
-Expressions such as `x[y]` and `x * y` call methods
-under the hood (`__getitem__` and `__mul__` respectively).
-Calling an unbound method will raise an `AttributeError` at runtime.
-
-**Examples**
-
-```python
-import datetime
-
-class A:
-    if datetime.date.today().weekday() != 6:
-        def __getitem__(self, v): ...
-
-A()[0]  # TypeError: 'A' object is not subscriptable
-```
-
-## `possibly-unbound-import`
-
-<small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unbound-import) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1345)
-</small>
-
-**What it does**
-
-Checks for imports of symbols that may be unbound.
-
-**Why is this bad?**
-
-Importing an unbound module or name will raise a `ModuleNotFoundError`
-or `ImportError` at runtime.
-
-**Examples**
-
-```python
-# module.py
-import datetime
-
-if datetime.date.today().weekday() != 6:
-    a = 1
-
-# main.py
-from module import a  # ImportError: cannot import name 'a' from 'module'
-```
-
-## `redundant-cast`
-
-<small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20redundant-cast) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1690)
-</small>
-
-**What it does**
-
-Detects redundant `cast` calls where the value already has the target type.
-
-**Why is this bad?**
-
-These casts have no effect and can be removed.
-
-**Example**
-
-```python
-def f() -> int:
-    return 10
-
-cast(int, f())  # Redundant
-```
-
-## `undefined-reveal`
-
-<small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20undefined-reveal) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1498)
-</small>
-
-**What it does**
-
-Checks for calls to `reveal_type` without importing it.
-
-**Why is this bad?**
-
-Using `reveal_type` without importing it will raise a `NameError` at runtime.
-
-**Examples**
-
-```python
-reveal_type(1)  # NameError: name 'reveal_type' is not defined
-```
-
-## `unknown-rule`
-
-<small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-rule) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L40)
-</small>
 
 **What it does**
 
@@ -1969,14 +1990,189 @@ Use instead:
 a = 20 / 0  # ty: ignore[division-by-zero]
 ```
 
+## `invalid-ignore-comment`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-ignore-comment" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L65" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for `type: ignore` and `ty: ignore` comments that are syntactically incorrect.
+
+**Why is this bad?**
+
+A syntactically incorrect ignore comment is probably a mistake and is useless.
+
+**Examples**
+
+```py
+a = 20 / 0  # type: ignoree
+```
+
+Use instead:
+
+```py
+a = 20 / 0  # type: ignore
+```
+
+## `possibly-missing-attribute`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-attribute" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1389" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for possibly missing attributes.
+
+**Why is this bad?**
+
+Attempting to access a missing attribute will raise an `AttributeError` at runtime.
+
+**Examples**
+
+```python
+class A:
+    if b:
+        c = 0
+
+A.c  # AttributeError: type object 'A' has no attribute 'c'
+```
+
+## `possibly-missing-implicit-call`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-implicit-call" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L135" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for implicit calls to possibly missing methods.
+
+**Why is this bad?**
+
+Expressions such as `x[y]` and `x * y` call methods
+under the hood (`__getitem__` and `__mul__` respectively).
+Calling a missing method will raise an `AttributeError` at runtime.
+
+**Examples**
+
+```python
+import datetime
+
+class A:
+    if datetime.date.today().weekday() != 6:
+        def __getitem__(self, v): ...
+
+A()[0]  # TypeError: 'A' object is not subscriptable
+```
+
+## `possibly-missing-import`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-import" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1411" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for imports of symbols that may be missing.
+
+**Why is this bad?**
+
+Importing a missing module or name will raise a `ModuleNotFoundError`
+or `ImportError` at runtime.
+
+**Examples**
+
+```python
+# module.py
+import datetime
+
+if datetime.date.today().weekday() != 6:
+    a = 1
+
+# main.py
+from module import a  # ImportError: cannot import name 'a' from 'module'
+```
+
+## `redundant-cast`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20redundant-cast" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1777" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Detects redundant `cast` calls where the value already has the target type.
+
+**Why is this bad?**
+
+These casts have no effect and can be removed.
+
+**Example**
+
+```python
+def f() -> int:
+    return 10
+
+cast(int, f())  # Redundant
+```
+
+## `undefined-reveal`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20undefined-reveal" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1564" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for calls to `reveal_type` without importing it.
+
+**Why is this bad?**
+
+Using `reveal_type` without importing it will raise a `NameError` at runtime.
+
+**Examples**
+
+```python
+reveal_type(1)  # NameError: name 'reveal_type' is not defined
+```
+
 ## `unresolved-global`
 
 <small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-global) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1711)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.15">0.0.1-alpha.15</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-global" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1798" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Detects variables declared as `global` in an inner scope that have no explicit
@@ -2000,6 +2196,7 @@ def g():
 ```
 
 Use instead:
+
 ```python
 x: int
 
@@ -2012,6 +2209,7 @@ def g():
 ```
 
 Or:
+
 ```python
 x: int | None = None
 
@@ -2026,11 +2224,13 @@ def g():
 ## `unsupported-base`
 
 <small>
-Default level: [`warn`](../rules.md#rule-levels "This lint has a default level of 'warn'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-base) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L698)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.7">0.0.1-alpha.7</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-base" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L708" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for class definitions that have bases which are unsupported by ty.
@@ -2060,14 +2260,79 @@ class D(C): ...  # error: [unsupported-base]
 
 [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
 
+## `useless-overload-body`
+
+<small>
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20useless-overload-body" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L966" target="_blank">View source</a>
+</small>
+
+
+**What it does**
+
+Checks for various `@overload`-decorated functions that have non-stub bodies.
+
+**Why is this bad?**
+
+Functions decorated with `@overload` are ignored at runtime; they are overridden
+by the implementation function that follows the series of overloads. While it is
+not illegal to provide a body for an `@overload`-decorated function, it may indicate
+a misunderstanding of how the `@overload` decorator works.
+
+**Example**
+
+
+```py
+from typing import overload
+
+@overload
+def foo(x: int) -> int:
+    return x + 1  # will never be executed
+
+@overload
+def foo(x: str) -> str:
+    return "Oh no, got a string"  # will never be executed
+
+def foo(x: int | str) -> int | str:
+    raise Exception("unexpected type encountered")
+```
+
+Use instead:
+
+```py
+from typing import assert_never, overload
+
+@overload
+def foo(x: int) -> int: ...
+
+@overload
+def foo(x: str) -> str: ...
+
+def foo(x: int | str) -> int | str:
+    if isinstance(x, int):
+        return x + 1
+    elif isinstance(x, str):
+        return "Oh no, got a string"
+    else:
+        assert_never(x)
+```
+
+**References**
+
+- [Python documentation: `@overload`](https://docs.python.org/3/library/typing.html#typing.overload)
+
 ## `division-by-zero`
 
 <small>
-Default level: [`ignore`](../rules.md#rule-levels "This lint has a default level of 'ignore'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20division-by-zero) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L256)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
+Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a>) ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20division-by-zero" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L264" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 It detects division by zero.
@@ -2085,11 +2350,13 @@ Dividing by zero raises a `ZeroDivisionError` at runtime.
 ## `possibly-unresolved-reference`
 
 <small>
-Default level: [`ignore`](../rules.md#rule-levels "This lint has a default level of 'ignore'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unresolved-reference) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1371)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unresolved-reference" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1437" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for references to names that are possibly not defined.
@@ -2111,11 +2378,13 @@ print(x)  # NameError: name 'x' is not defined
 ## `unused-ignore-comment`
 
 <small>
-Default level: [`ignore`](../rules.md#rule-levels "This lint has a default level of 'ignore'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unused-ignore-comment) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L15)
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
+Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
+<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unused-ignore-comment" target="_blank">Related issues</a> ·
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L15" target="_blank">View source</a>
 </small>
 
+
 **What it does**
 
 Checks for `type: ignore` or `ty: ignore` directives that are no longer applicable.
diff --git a/crates/ty/src/args.rs b/crates/ty/src/args.rs
index f518e028db..f1be98ea46 100644
--- a/crates/ty/src/args.rs
+++ b/crates/ty/src/args.rs
@@ -51,22 +51,15 @@ pub(crate) struct CheckCommand {
     #[arg(long, value_name = "PROJECT")]
     pub(crate) project: Option<SystemPathBuf>,
 
-    /// Path to the Python environment.
+    /// Path to your project's Python environment or interpreter.
     ///
-    /// ty uses the Python environment to resolve type information and third-party dependencies.
+    /// ty uses your Python environment to resolve third-party imports in your code.
     ///
-    /// If not specified, ty will attempt to infer it from the `VIRTUAL_ENV` or `CONDA_PREFIX`
-    /// environment variables, or discover a `.venv` directory in the project root or working
-    /// directory.
+    /// If you're using a project management tool such as uv or you have an activated Conda or virtual
+    /// environment, you should not generally need to specify this option.
     ///
-    /// If a path to a Python interpreter is provided, e.g., `.venv/bin/python3`, ty will attempt to
-    /// find an environment two directories up from the interpreter's path, e.g., `.venv`. At this
-    /// time, ty does not invoke the interpreter to determine the location of the environment. This
-    /// means that ty will not resolve dynamic executables such as a shim.
-    ///
-    /// ty will search in the resolved environment's `site-packages` directories for type
-    /// information and third-party imports.
-    #[arg(long, value_name = "PATH")]
+    /// This option can be used to point to virtual or system Python environments.
+    #[arg(long, value_name = "PATH", alias = "venv")]
     pub(crate) python: Option<SystemPathBuf>,
 
     /// Custom directory to use for stdlib typeshed stubs.
@@ -74,6 +67,10 @@ pub(crate) struct CheckCommand {
     pub(crate) typeshed: Option<SystemPathBuf>,
 
     /// Additional path to use as a module-resolution source (can be passed multiple times).
+    ///
+    /// This is an advanced option that should usually only be used for first-party or third-party
+    /// modules that are not installed into your Python environment in a conventional way.
+    /// Use `--python` to point ty to your Python environment if it is in an unusual location.
     #[arg(long, value_name = "PATH")]
     pub(crate) extra_search_path: Option<Vec<SystemPathBuf>>,
 
@@ -88,7 +85,7 @@ pub(crate) struct CheckCommand {
     ///    and use the minimum version from the specified range
     /// 2. Check for an activated or configured Python environment
     ///    and attempt to infer the Python version of that environment
-    /// 3. Fall back to the latest stable Python version supported by ty (currently Python 3.13)
+    /// 3. Fall back to the latest stable Python version supported by ty (see `ty check --help` output)
     #[arg(long, value_name = "VERSION", alias = "target-version")]
     pub(crate) python_version: Option<PythonVersion>,
 
@@ -306,7 +303,7 @@ impl clap::Args for RulesArg {
 /// The diagnostic output format.
 #[derive(Copy, Clone, Hash, Debug, PartialEq, Eq, PartialOrd, Ord, Default, clap::ValueEnum)]
 pub enum OutputFormat {
-    /// Print diagnostics verbosely, with context and helpful hints \[default\].
+    /// Print diagnostics verbosely, with context and helpful hints (default).
     ///
     /// Diagnostic messages may include additional context and
     /// annotations on the input to help understand the message.
@@ -321,6 +318,12 @@ pub enum OutputFormat {
     /// dropped.
     #[value(name = "concise")]
     Concise,
+    /// Print diagnostics in the JSON format expected by GitLab Code Quality reports.
+    #[value(name = "gitlab")]
+    Gitlab,
+    #[value(name = "github")]
+    /// Print diagnostics in the format used by GitHub Actions workflow error annotations.
+    Github,
 }
 
 impl From<OutputFormat> for ty_project::metadata::options::OutputFormat {
@@ -328,6 +331,8 @@ impl From<OutputFormat> for ty_project::metadata::options::OutputFormat {
         match format {
             OutputFormat::Full => Self::Full,
             OutputFormat::Concise => Self::Concise,
+            OutputFormat::Gitlab => Self::Gitlab,
+            OutputFormat::Github => Self::Github,
         }
     }
 }
diff --git a/crates/ty/src/lib.rs b/crates/ty/src/lib.rs
index 3e11a3bedf..e1bb4e1f10 100644
--- a/crates/ty/src/lib.rs
+++ b/crates/ty/src/lib.rs
@@ -14,14 +14,14 @@ use anyhow::Result;
 use std::sync::Mutex;
 
 use crate::args::{CheckCommand, Command, TerminalColor};
-use crate::logging::setup_tracing;
+use crate::logging::{VerbosityLevel, setup_tracing};
 use crate::printer::Printer;
 use anyhow::{Context, anyhow};
 use clap::{CommandFactory, Parser};
 use colored::Colorize;
 use crossbeam::channel as crossbeam_channel;
 use rayon::ThreadPoolBuilder;
-use ruff_db::diagnostic::{Diagnostic, DisplayDiagnosticConfig, Severity};
+use ruff_db::diagnostic::{Diagnostic, DisplayDiagnosticConfig, DisplayDiagnostics, Severity};
 use ruff_db::files::File;
 use ruff_db::max_parallelism;
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
@@ -73,11 +73,6 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
 
     let printer = Printer::default().with_verbosity(verbosity);
 
-    tracing::warn!(
-        "ty is pre-release software and not ready for production use. \
-            Expect to encounter bugs, missing features, and fatal errors.",
-    );
-
     tracing::debug!("Version: {}", version::version());
 
     // The base path to which all CLI arguments are relative to.
@@ -133,6 +128,8 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
 
     let mut db = ProjectDatabase::new(project_metadata, system)?;
 
+    db.project()
+        .set_verbose(&mut db, verbosity >= VerbosityLevel::Verbose);
     if !check_paths.is_empty() {
         db.project().set_included_paths(&mut db, check_paths);
     }
@@ -319,37 +316,48 @@ impl MainLoop {
                             return Ok(ExitStatus::Success);
                         }
 
+                        let is_human_readable = terminal_settings.output_format.is_human_readable();
+
                         if result.is_empty() {
-                            writeln!(
-                                self.printer.stream_for_success_summary(),
-                                "{}",
-                                "All checks passed!".green().bold()
-                            )?;
+                            if is_human_readable {
+                                writeln!(
+                                    self.printer.stream_for_success_summary(),
+                                    "{}",
+                                    "All checks passed!".green().bold()
+                                )?;
+                            }
 
                             if self.watcher.is_none() {
                                 return Ok(ExitStatus::Success);
                             }
                         } else {
-                            let mut max_severity = Severity::Info;
                             let diagnostics_count = result.len();
 
                             let mut stdout = self.printer.stream_for_details().lock();
-                            for diagnostic in result {
-                                // Only render diagnostics if they're going to be displayed, since doing
-                                // so is expensive.
-                                if stdout.is_enabled() {
-                                    write!(stdout, "{}", diagnostic.display(db, &display_config))?;
-                                }
+                            let max_severity = result
+                                .iter()
+                                .map(Diagnostic::severity)
+                                .max()
+                                .unwrap_or(Severity::Info);
 
-                                max_severity = max_severity.max(diagnostic.severity());
+                            // Only render diagnostics if they're going to be displayed, since doing
+                            // so is expensive.
+                            if stdout.is_enabled() {
+                                write!(
+                                    stdout,
+                                    "{}",
+                                    DisplayDiagnostics::new(db, &display_config, &result)
+                                )?;
                             }
 
-                            writeln!(
-                                self.printer.stream_for_failure_summary(),
-                                "Found {} diagnostic{}",
-                                diagnostics_count,
-                                if diagnostics_count > 1 { "s" } else { "" }
-                            )?;
+                            if is_human_readable {
+                                writeln!(
+                                    self.printer.stream_for_failure_summary(),
+                                    "Found {} diagnostic{}",
+                                    diagnostics_count,
+                                    if diagnostics_count > 1 { "s" } else { "" }
+                                )?;
+                            }
 
                             if max_severity.is_fatal() {
                                 tracing::warn!(
diff --git a/crates/ty/src/logging.rs b/crates/ty/src/logging.rs
index e0d254f819..0e1c4a9efd 100644
--- a/crates/ty/src/logging.rs
+++ b/crates/ty/src/logging.rs
@@ -120,8 +120,10 @@ pub(crate) fn setup_tracing(
     } else {
         match level {
             VerbosityLevel::Default => {
-                // Show warning traces
-                EnvFilter::default().add_directive(LevelFilter::WARN.into())
+                // Show warning traces for ty and ruff but not for other crates
+                EnvFilter::default()
+                    .add_directive("ty=warn".parse().unwrap())
+                    .add_directive("ruff=warn".parse().unwrap())
             }
             level => {
                 let level_filter = level.level_filter();
diff --git a/crates/ty/src/python_version.rs b/crates/ty/src/python_version.rs
index 09ce15f526..694e81b55e 100644
--- a/crates/ty/src/python_version.rs
+++ b/crates/ty/src/python_version.rs
@@ -7,9 +7,9 @@ pub enum PythonVersion {
     Py37,
     #[value(name = "3.8")]
     Py38,
-    #[default]
     #[value(name = "3.9")]
     Py39,
+    #[default]
     #[value(name = "3.10")]
     Py310,
     #[value(name = "3.11")]
@@ -18,6 +18,8 @@ pub enum PythonVersion {
     Py312,
     #[value(name = "3.13")]
     Py313,
+    #[value(name = "3.14")]
+    Py314,
 }
 
 impl PythonVersion {
@@ -30,6 +32,7 @@ impl PythonVersion {
             Self::Py311 => "3.11",
             Self::Py312 => "3.12",
             Self::Py313 => "3.13",
+            Self::Py314 => "3.14",
         }
     }
 }
@@ -50,6 +53,7 @@ impl From<PythonVersion> for ruff_python_ast::PythonVersion {
             PythonVersion::Py311 => Self::PY311,
             PythonVersion::Py312 => Self::PY312,
             PythonVersion::Py313 => Self::PY313,
+            PythonVersion::Py314 => Self::PY314,
         }
     }
 }
diff --git a/crates/ty/tests/cli/config_option.rs b/crates/ty/tests/cli/config_option.rs
index 4732b28236..997696967d 100644
--- a/crates/ty/tests/cli/config_option.rs
+++ b/crates/ty/tests/cli/config_option.rs
@@ -7,7 +7,7 @@ fn cli_config_args_toml_string_basic() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", r"print(x)  # [unresolved-reference]")?;
 
     // Long flag
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config").arg("terminal.error-on-warning=true"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config").arg("terminal.error-on-warning=true"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -22,11 +22,10 @@ fn cli_config_args_toml_string_basic() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Short flag
-    assert_cmd_snapshot!(case.command().arg("-c").arg("terminal.error-on-warning=true"), @r"
+    assert_cmd_snapshot!(case.command().arg("-c").arg("terminal.error-on-warning=true"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -41,8 +40,7 @@ fn cli_config_args_toml_string_basic() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -61,7 +59,7 @@ fn cli_config_args_overrides_ty_toml() -> anyhow::Result<()> {
     ])?;
 
     // Exit code of 1 due to the setting in `ty.toml`
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -76,11 +74,10 @@ fn cli_config_args_overrides_ty_toml() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Exit code of 0 because the `ty.toml` setting is overwritten by `--config`
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config").arg("terminal.error-on-warning=false"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config").arg("terminal.error-on-warning=false"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -95,8 +92,7 @@ fn cli_config_args_overrides_ty_toml() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -104,7 +100,7 @@ fn cli_config_args_overrides_ty_toml() -> anyhow::Result<()> {
 #[test]
 fn cli_config_args_later_overrides_earlier() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", r"print(x)  # [unresolved-reference]")?;
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config").arg("terminal.error-on-warning=true").arg("--config").arg("terminal.error-on-warning=false"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config").arg("terminal.error-on-warning=true").arg("--config").arg("terminal.error-on-warning=false"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -119,8 +115,7 @@ fn cli_config_args_later_overrides_earlier() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -165,7 +160,7 @@ fn config_file_override() -> anyhow::Result<()> {
     ])?;
 
     // Ensure flag works via CLI arg
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config-file").arg("ty-override.toml"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config-file").arg("ty-override.toml"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -180,11 +175,10 @@ fn config_file_override() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Ensure the flag works via an environment variable
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").env("TY_CONFIG_FILE", "ty-override.toml"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").env("TY_CONFIG_FILE", "ty-override.toml"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -199,8 +193,7 @@ fn config_file_override() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
diff --git a/crates/ty/tests/cli/exit_code.rs b/crates/ty/tests/cli/exit_code.rs
index 7c7a93e488..5aceafbbbc 100644
--- a/crates/ty/tests/cli/exit_code.rs
+++ b/crates/ty/tests/cli/exit_code.rs
@@ -6,7 +6,7 @@ use crate::CliTest;
 fn only_warnings() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", r"print(x)  # [unresolved-reference]")?;
 
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -21,8 +21,7 @@ fn only_warnings() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -37,7 +36,7 @@ fn only_info() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -52,8 +51,7 @@ fn only_info() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -68,7 +66,7 @@ fn only_info_and_error_on_warning_is_true() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--error-on-warning"), @r"
+    assert_cmd_snapshot!(case.command().arg("--error-on-warning"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -83,8 +81,7 @@ fn only_info_and_error_on_warning_is_true() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -93,7 +90,7 @@ fn only_info_and_error_on_warning_is_true() -> anyhow::Result<()> {
 fn no_errors_but_error_on_warning_is_true() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", r"print(x)  # [unresolved-reference]")?;
 
-    assert_cmd_snapshot!(case.command().arg("--error-on-warning").arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--error-on-warning").arg("--warn").arg("unresolved-reference"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -108,8 +105,7 @@ fn no_errors_but_error_on_warning_is_true() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -127,7 +123,7 @@ fn no_errors_but_error_on_warning_is_enabled_in_configuration() -> anyhow::Resul
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -142,8 +138,7 @@ fn no_errors_but_error_on_warning_is_enabled_in_configuration() -> anyhow::Resul
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -158,7 +153,7 @@ fn both_warnings_and_errors() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -183,8 +178,7 @@ fn both_warnings_and_errors() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -199,7 +193,7 @@ fn both_warnings_and_errors_and_error_on_warning_is_true() -> anyhow::Result<()>
         "###,
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--error-on-warning"), @r"
+    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--error-on-warning"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -224,8 +218,7 @@ fn both_warnings_and_errors_and_error_on_warning_is_true() -> anyhow::Result<()>
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -240,7 +233,7 @@ fn exit_zero_is_true() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--exit-zero").arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exit-zero").arg("--warn").arg("unresolved-reference"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -265,8 +258,7 @@ fn exit_zero_is_true() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
diff --git a/crates/ty/tests/cli/file_selection.rs b/crates/ty/tests/cli/file_selection.rs
index ca6918343c..5668e5829d 100644
--- a/crates/ty/tests/cli/file_selection.rs
+++ b/crates/ty/tests/cli/file_selection.rs
@@ -27,7 +27,7 @@ fn exclude_argument() -> anyhow::Result<()> {
     ])?;
 
     // Test that exclude argument is recognized and works
-    assert_cmd_snapshot!(case.command().arg("--exclude").arg("tests/"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exclude").arg("tests/"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -50,11 +50,10 @@ fn exclude_argument() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Test multiple exclude patterns
-    assert_cmd_snapshot!(case.command().arg("--exclude").arg("tests/").arg("--exclude").arg("temp_*.py"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exclude").arg("tests/").arg("--exclude").arg("temp_*.py"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -69,8 +68,7 @@ fn exclude_argument() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -108,7 +106,7 @@ fn configuration_include() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -123,8 +121,7 @@ fn configuration_include() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Test multiple include patterns via configuration
     case.write_file(
@@ -135,7 +132,7 @@ fn configuration_include() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -158,8 +155,7 @@ fn configuration_include() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -197,7 +193,7 @@ fn configuration_exclude() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -220,8 +216,7 @@ fn configuration_exclude() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Test multiple exclude patterns via configuration
     case.write_file(
@@ -232,7 +227,7 @@ fn configuration_exclude() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -247,8 +242,7 @@ fn configuration_exclude() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -287,7 +281,7 @@ fn exclude_precedence_over_include() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -302,8 +296,7 @@ fn exclude_precedence_over_include() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -356,7 +349,6 @@ fn exclude_argument_precedence_include_argument() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "###);
 
     Ok(())
@@ -381,7 +373,7 @@ fn remove_default_exclude() -> anyhow::Result<()> {
     ])?;
 
     // By default, 'dist' directory should be excluded (see default excludes)
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -396,8 +388,7 @@ fn remove_default_exclude() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Now override the default exclude by using a negated pattern to re-include 'dist'
     case.write_file(
@@ -408,7 +399,7 @@ fn remove_default_exclude() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -431,8 +422,7 @@ fn remove_default_exclude() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -465,7 +455,7 @@ fn cli_removes_config_exclude() -> anyhow::Result<()> {
     )?;
 
     // Verify that build/ is excluded by configuration
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -480,11 +470,10 @@ fn cli_removes_config_exclude() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Now remove the configuration exclude via CLI negation
-    assert_cmd_snapshot!(case.command().arg("--exclude").arg("!build/"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exclude").arg("!build/"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -507,8 +496,7 @@ fn cli_removes_config_exclude() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -545,7 +533,7 @@ fn explicit_path_overrides_exclude() -> anyhow::Result<()> {
     ])?;
 
     // dist is excluded by default and `tests/generated` is excluded in the project, so only src/main.py should be checked
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -560,11 +548,10 @@ fn explicit_path_overrides_exclude() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Explicitly checking a file in an excluded directory should still check that file
-    assert_cmd_snapshot!(case.command().arg("tests/generated.py"), @r"
+    assert_cmd_snapshot!(case.command().arg("tests/generated.py"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -579,11 +566,10 @@ fn explicit_path_overrides_exclude() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Explicitly checking the entire excluded directory should check all files in it
-    assert_cmd_snapshot!(case.command().arg("dist/"), @r"
+    assert_cmd_snapshot!(case.command().arg("dist/"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -598,8 +584,7 @@ fn explicit_path_overrides_exclude() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -625,13 +610,12 @@ fn invalid_include_pattern() -> anyhow::Result<()> {
     ])?;
 
     // By default, dist/ is excluded, so only src/main.py should be checked
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: error[invalid-glob]: Invalid include pattern
      --> ty.toml:4:5
@@ -642,7 +626,7 @@ fn invalid_include_pattern() -> anyhow::Result<()> {
       |     ^^^^^^^^^^^^^ Too many stars at position 5
     5 | ]
       |
-    "#);
+    "###);
 
     Ok(())
 }
@@ -668,16 +652,15 @@ fn invalid_include_pattern_concise_output() -> anyhow::Result<()> {
     ])?;
 
     // By default, dist/ is excluded, so only src/main.py should be checked
-    assert_cmd_snapshot!(case.command().arg("--output-format").arg("concise"), @r"
+    assert_cmd_snapshot!(case.command().arg("--output-format").arg("concise"), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: ty.toml:4:5: error[invalid-glob] Invalid include pattern: Too many stars at position 5
-    ");
+    "###);
 
     Ok(())
 }
@@ -703,13 +686,12 @@ fn invalid_exclude_pattern() -> anyhow::Result<()> {
     ])?;
 
     // By default, dist/ is excluded, so only src/main.py should be checked
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: error[invalid-glob]: Invalid exclude pattern
      --> ty.toml:4:5
@@ -720,7 +702,7 @@ fn invalid_exclude_pattern() -> anyhow::Result<()> {
       |     ^^^^^^^^ The parent directory operator (`..`) at position 1 is not allowed
     5 | ]
       |
-    "#);
+    "###);
 
     Ok(())
 }
@@ -772,7 +754,7 @@ print(other_undefined)  # error: unresolved-reference
 
     // Change to the bazel-out directory and run ty from there
     // The symlinks should be followed and errors should be found
-    assert_cmd_snapshot!(case.command().current_dir(case.project_dir.join("bazel-out/k8-fastbuild/bin")), @r"
+    assert_cmd_snapshot!(case.command().current_dir(case.project_dir.join("bazel-out/k8-fastbuild/bin")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -797,11 +779,10 @@ print(other_undefined)  # error: unresolved-reference
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Test that when checking a specific symlinked file from the bazel-out directory, it works correctly
-    assert_cmd_snapshot!(case.command().current_dir(case.project_dir.join("bazel-out/k8-fastbuild/bin")).arg("main.py"), @r"
+    assert_cmd_snapshot!(case.command().current_dir(case.project_dir.join("bazel-out/k8-fastbuild/bin")).arg("main.py"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -817,8 +798,7 @@ print(other_undefined)  # error: unresolved-reference
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -857,7 +837,7 @@ print(regular_undefined)  # error: unresolved-reference
     case.write_symlink("src/utils.py", "generated_utils.py")?;
 
     // Exclude pattern should match on the symlink name (generated_*), not the target name
-    assert_cmd_snapshot!(case.command().arg("--exclude").arg("generated_*.py"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exclude").arg("generated_*.py"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -890,11 +870,10 @@ print(regular_undefined)  # error: unresolved-reference
     Found 3 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Exclude pattern on target path should not affect symlinks with different names
-    assert_cmd_snapshot!(case.command().arg("--exclude").arg("src/*.py"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exclude").arg("src/*.py"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -927,11 +906,10 @@ print(regular_undefined)  # error: unresolved-reference
     Found 3 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Test that explicitly passing a symlink always checks it, even if excluded
-    assert_cmd_snapshot!(case.command().arg("--exclude").arg("generated_*.py").arg("generated_module.py"), @r"
+    assert_cmd_snapshot!(case.command().arg("--exclude").arg("generated_*.py").arg("generated_module.py"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -947,8 +925,7 @@ print(regular_undefined)  # error: unresolved-reference
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
diff --git a/crates/ty/tests/cli/main.rs b/crates/ty/tests/cli/main.rs
index 82edcda8c7..e911e300c0 100644
--- a/crates/ty/tests/cli/main.rs
+++ b/crates/ty/tests/cli/main.rs
@@ -19,15 +19,14 @@ fn test_quiet_output() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", "x: int = 1")?;
 
     // By default, we emit an "all checks passed" message
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // With `quiet`, the message is not displayed
     assert_cmd_snapshot!(case.command().arg("--quiet"), @r"
@@ -41,7 +40,7 @@ fn test_quiet_output() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", "x: int = 'foo'")?;
 
     // By default, we emit a diagnostic
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -56,8 +55,7 @@ fn test_quiet_output() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     // With `quiet`, the diagnostic is not displayed, just the summary message
     assert_cmd_snapshot!(case.command().arg("--quiet"), @r"
@@ -98,17 +96,16 @@ fn test_run_in_sub_directory() -> anyhow::Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Expected an expression
      --> <temp_dir>/test.py:1:2
       |
     1 | ~
-      |  ^ Expected an expression
+      |  ^
       |
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
     Ok(())
 }
@@ -120,17 +117,16 @@ fn test_include_hidden_files_by_default() -> anyhow::Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Expected an expression
      --> .test.py:1:2
       |
     1 | ~
-      |  ^ Expected an expression
+      |  ^
       |
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
     Ok(())
 }
@@ -139,33 +135,31 @@ fn test_include_hidden_files_by_default() -> anyhow::Result<()> {
 fn test_respect_ignore_files() -> anyhow::Result<()> {
     // First test that the default option works correctly (the file is skipped)
     let case = CliTest::with_files([(".ignore", "test.py"), ("test.py", "~")])?;
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     WARN No python files found under the given path(s)
-    ");
+    "###);
 
     // Test that we can set to false via CLI
     assert_cmd_snapshot!(case.command().arg("--no-respect-ignore-files"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Expected an expression
      --> test.py:1:2
       |
     1 | ~
-      |  ^ Expected an expression
+      |  ^
       |
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
     // Test that we can set to false via config file
@@ -174,17 +168,16 @@ fn test_respect_ignore_files() -> anyhow::Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Expected an expression
      --> test.py:1:2
       |
     1 | ~
-      |  ^ Expected an expression
+      |  ^
       |
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
     // Ensure CLI takes precedence
@@ -193,17 +186,16 @@ fn test_respect_ignore_files() -> anyhow::Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Expected an expression
      --> test.py:1:2
       |
     1 | ~
-      |  ^ Expected an expression
+      |  ^
       |
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
     Ok(())
 }
@@ -251,7 +243,7 @@ fn cli_arguments_are_relative_to_the_current_directory() -> anyhow::Result<()> {
     ])?;
 
     // Make sure that the CLI fails when the `libs` directory is not in the search path.
-    assert_cmd_snapshot!(case.command().current_dir(case.root().join("child")), @r"
+    assert_cmd_snapshot!(case.command().current_dir(case.root().join("child")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -263,24 +255,25 @@ fn cli_arguments_are_relative_to_the_current_directory() -> anyhow::Result<()> {
     3 |
     4 | stat = add(10, 15)
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
-    assert_cmd_snapshot!(case.command().current_dir(case.root().join("child")).arg("--extra-search-path").arg("../libs"), @r"
+    assert_cmd_snapshot!(case.command().current_dir(case.root().join("child")).arg("--extra-search-path").arg("../libs"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -326,15 +319,14 @@ fn paths_in_configuration_files_are_relative_to_the_project_root() -> anyhow::Re
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command().current_dir(case.root().join("child")), @r"
+    assert_cmd_snapshot!(case.command().current_dir(case.root().join("child")), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -371,7 +363,7 @@ fn user_configuration() -> anyhow::Result<()> {
 
     assert_cmd_snapshot!(
         case.command().current_dir(case.root().join("project")).env(config_env_var, config_directory.as_os_str()),
-        @r"
+        @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -398,8 +390,7 @@ fn user_configuration() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "
+    "###
     );
 
     // The user-level configuration sets the severity for `unresolved-reference` to warn.
@@ -416,7 +407,7 @@ fn user_configuration() -> anyhow::Result<()> {
 
     assert_cmd_snapshot!(
         case.command().current_dir(case.root().join("project")).env(config_env_var, config_directory.as_os_str()),
-        @r"
+        @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -443,8 +434,7 @@ fn user_configuration() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "
+    "###
     );
 
     Ok(())
@@ -489,6 +479,9 @@ fn check_specific_paths() -> anyhow::Result<()> {
     3 |
     4 | print(z)
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
@@ -498,13 +491,15 @@ fn check_specific_paths() -> anyhow::Result<()> {
     2 | import does_not_exist  # error: unresolved-import
       |        ^^^^^^^^^^^^^^
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "###
     );
 
@@ -512,7 +507,7 @@ fn check_specific_paths() -> anyhow::Result<()> {
     // We should no longer see any diagnostics related to `main.py`.
     assert_cmd_snapshot!(
         case.command().arg("project/tests").arg("project/other.py"),
-        @r"
+        @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -524,6 +519,9 @@ fn check_specific_paths() -> anyhow::Result<()> {
     3 |
     4 | print(z)
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
@@ -533,14 +531,16 @@ fn check_specific_paths() -> anyhow::Result<()> {
     2 | import does_not_exist  # error: unresolved-import
       |        ^^^^^^^^^^^^^^
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "
+    "###
     );
 
     Ok(())
@@ -559,7 +559,7 @@ fn check_non_existing_path() -> anyhow::Result<()> {
 
     assert_cmd_snapshot!(
         case.command().arg("project/main.py").arg("project/tests"),
-        @r"
+        @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -570,9 +570,8 @@ fn check_non_existing_path() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     WARN No python files found under the given path(s)
-    "
+    "###
     );
 
     Ok(())
@@ -588,7 +587,7 @@ fn concise_diagnostics() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--output-format=concise").arg("--warn").arg("unresolved-reference"), @r"
+    assert_cmd_snapshot!(case.command().arg("--output-format=concise").arg("--warn").arg("unresolved-reference"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -597,8 +596,95 @@ fn concise_diagnostics() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
+
+    Ok(())
+}
+
+#[test]
+fn gitlab_diagnostics() -> anyhow::Result<()> {
+    let case = CliTest::with_file(
+        "test.py",
+        r#"
+        print(x)     # [unresolved-reference]
+        print(4[1])  # [non-subscriptable]
+        "#,
+    )?;
+
+    let mut settings = insta::Settings::clone_current();
+    settings.add_filter(r#"("fingerprint": ")[a-z0-9]+(",)"#, "$1[FINGERPRINT]$2");
+    let _s = settings.bind_to_scope();
+
+    assert_cmd_snapshot!(case.command().arg("--output-format=gitlab").arg("--warn").arg("unresolved-reference")
+        .env("CI_PROJECT_DIR", case.project_dir), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    [
+      {
+        "check_name": "unresolved-reference",
+        "description": "unresolved-reference: Name `x` used when not defined",
+        "severity": "minor",
+        "fingerprint": "[FINGERPRINT]",
+        "location": {
+          "path": "test.py",
+          "positions": {
+            "begin": {
+              "line": 2,
+              "column": 7
+            },
+            "end": {
+              "line": 2,
+              "column": 8
+            }
+          }
+        }
+      },
+      {
+        "check_name": "non-subscriptable",
+        "description": "non-subscriptable: Cannot subscript object of type `Literal[4]` with no `__getitem__` method",
+        "severity": "major",
+        "fingerprint": "[FINGERPRINT]",
+        "location": {
+          "path": "test.py",
+          "positions": {
+            "begin": {
+              "line": 3,
+              "column": 7
+            },
+            "end": {
+              "line": 3,
+              "column": 8
+            }
+          }
+        }
+      }
+    ]
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}
+
+#[test]
+fn github_diagnostics() -> anyhow::Result<()> {
+    let case = CliTest::with_file(
+        "test.py",
+        r#"
+        print(x)     # [unresolved-reference]
+        print(4[1])  # [non-subscriptable]
+        "#,
+    )?;
+
+    assert_cmd_snapshot!(case.command().arg("--output-format=github").arg("--warn").arg("unresolved-reference"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    ::warning title=ty (unresolved-reference),file=<temp_dir>/test.py,line=2,col=7,endLine=2,endColumn=8::test.py:2:7: unresolved-reference: Name `x` used when not defined
+    ::error title=ty (non-subscriptable),file=<temp_dir>/test.py,line=3,col=7,endLine=3,endColumn=8::test.py:3:7: non-subscriptable: Cannot subscript object of type `Literal[4]` with no `__getitem__` method
+
+    ----- stderr -----
+    "###);
 
     Ok(())
 }
@@ -623,7 +709,7 @@ fn concise_revealed_type() -> anyhow::Result<()> {
         "#,
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--output-format=concise"), @r#"
+    assert_cmd_snapshot!(case.command().arg("--output-format=concise"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -631,8 +717,7 @@ fn concise_revealed_type() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -652,7 +737,7 @@ fn can_handle_large_binop_expressions() -> anyhow::Result<()> {
 
     let case = CliTest::with_file("test.py", &ruff_python_trivia::textwrap::dedent(&content))?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -668,8 +753,7 @@ fn can_handle_large_binop_expressions() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -698,6 +782,8 @@ impl CliTest {
         let mut settings = insta::Settings::clone_current();
         settings.add_filter(&tempdir_filter(&project_dir), "<temp_dir>/");
         settings.add_filter(r#"\\(\w\w|\s|\.|")"#, "/$1");
+        // 0.003s
+        settings.add_filter(r"\d.\d\d\ds", "0.000s");
         settings.add_filter(
             r#"The system cannot find the file specified."#,
             "No such file or directory",
diff --git a/crates/ty/tests/cli/python_environment.rs b/crates/ty/tests/cli/python_environment.rs
index 3c9714d00e..04fa8be88f 100644
--- a/crates/ty/tests/cli/python_environment.rs
+++ b/crates/ty/tests/cli/python_environment.rs
@@ -26,34 +26,39 @@ fn config_override_python_version() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r#"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-attribute]: Type `<module 'sys'>` has no attribute `last_exc`
+    error[unresolved-attribute]: Module `sys` has no member `last_exc`
      --> test.py:5:7
       |
     4 | # Access `sys.last_exc` that was only added in Python 3.12
     5 | print(sys.last_exc)
       |       ^^^^^^^^^^^^
       |
+    info: Python 3.11 was assumed when accessing `last_exc`
+     --> pyproject.toml:3:18
+      |
+    2 | [tool.ty.environment]
+    3 | python-version = "3.11"
+      |                  ^^^^^^ Python 3.11 assumed due to this configuration setting
+      |
     info: rule `unresolved-attribute` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "#);
 
-    assert_cmd_snapshot!(case.command().arg("--python-version").arg("3.12"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python-version").arg("3.12"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -80,7 +85,7 @@ fn config_override_python_platform() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -96,10 +101,9 @@ fn config_override_python_platform() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
-    assert_cmd_snapshot!(case.command().arg("--python-platform").arg("all"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python-platform").arg("all"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -115,8 +119,7 @@ fn config_override_python_platform() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -139,7 +142,7 @@ fn config_file_annotation_showing_where_python_version_set_typing_error() -> any
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -162,10 +165,9 @@ fn config_file_annotation_showing_where_python_version_set_typing_error() -> any
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
-    assert_cmd_snapshot!(case.command().arg("--python-version=3.9"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python-version=3.9"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -182,8 +184,40 @@ fn config_file_annotation_showing_where_python_version_set_typing_error() -> any
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
+
+    Ok(())
+}
+
+/// If `.` and `./src` are both registered as first-party search paths,
+/// the `./src` directory should take precedence for module resolution,
+/// because it is relative to `.`.
+#[test]
+fn src_subdirectory_takes_precedence_over_repo_root() -> anyhow::Result<()> {
+    let case = CliTest::with_files([(
+        "src/package/__init__.py",
+        "from . import nonexistent_submodule",
+    )])?;
+
+    // If `./src` didn't take priority over `.` here, we would report
+    // "Module `src.package` has no member `nonexistent_submodule`"
+    // instead of "Module `package` has no member `nonexistent_submodule`".
+    assert_cmd_snapshot!(case.command(), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package` has no member `nonexistent_submodule`
+     --> src/package/__init__.py:1:15
+      |
+    1 | from . import nonexistent_submodule
+      |               ^^^^^^^^^^^^^^^^^^^^^
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
 
     Ok(())
 }
@@ -208,7 +242,7 @@ fn python_version_inferred_from_system_installation() -> anyhow::Result<()> {
         ("test.py", "aiter"),
     ])?;
 
-    assert_cmd_snapshot!(cpython_case.command().arg("--python").arg("pythons/Python3.8/bin/python"), @r"
+    assert_cmd_snapshot!(cpython_case.command().arg("--python").arg("pythons/Python3.8/bin/python"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -227,8 +261,7 @@ fn python_version_inferred_from_system_installation() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     let pypy_case = CliTest::with_files([
         ("pythons/pypy3.8/bin/python", ""),
@@ -236,7 +269,7 @@ fn python_version_inferred_from_system_installation() -> anyhow::Result<()> {
         ("test.py", "aiter"),
     ])?;
 
-    assert_cmd_snapshot!(pypy_case.command().arg("--python").arg("pythons/pypy3.8/bin/python"), @r"
+    assert_cmd_snapshot!(pypy_case.command().arg("--python").arg("pythons/pypy3.8/bin/python"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -255,8 +288,7 @@ fn python_version_inferred_from_system_installation() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     let free_threaded_case = CliTest::with_files([
         ("pythons/Python3.13t/bin/python", ""),
@@ -267,7 +299,7 @@ fn python_version_inferred_from_system_installation() -> anyhow::Result<()> {
         ("test.py", "import string.templatelib"),
     ])?;
 
-    assert_cmd_snapshot!(free_threaded_case.command().arg("--python").arg("pythons/Python3.13t/bin/python"), @r"
+    assert_cmd_snapshot!(free_threaded_case.command().arg("--python").arg("pythons/Python3.13t/bin/python"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -286,8 +318,7 @@ fn python_version_inferred_from_system_installation() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -322,7 +353,7 @@ import bar",
         "strange-venv-location/bin/python",
     )?;
 
-    assert_cmd_snapshot!(case.command().arg("--python").arg("strange-venv-location/bin/python"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg("strange-venv-location/bin/python"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -333,14 +364,17 @@ import bar",
       |        ^^^
     2 | import bar
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info:   3. <temp_dir>/strange-venv-location/lib/python3.13/site-packages (site-packages)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -368,7 +402,7 @@ fn lib64_site_packages_directory_on_unix() -> anyhow::Result<()> {
         ("test.py", "import foo, bar, baz"),
     ])?;
 
-    assert_cmd_snapshot!(case.command().arg("--python").arg(".venv"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg(".venv"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -378,15 +412,107 @@ fn lib64_site_packages_directory_on_unix() -> anyhow::Result<()> {
     1 | import foo, bar, baz
       |                  ^^^
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info:   3. <temp_dir>/.venv/lib/python3.13/site-packages (site-packages)
+    info:   4. <temp_dir>/.venv/lib64/python3.13/site-packages (site-packages)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}
+
+#[test]
+fn many_search_paths() -> anyhow::Result<()> {
+    let case = CliTest::with_files([
+        ("extra1/foo1.py", ""),
+        ("extra2/foo2.py", ""),
+        ("extra3/foo3.py", ""),
+        ("extra4/foo4.py", ""),
+        ("extra5/foo5.py", ""),
+        ("extra6/foo6.py", ""),
+        ("test.py", "import foo1, baz"),
+    ])?;
+
+    assert_cmd_snapshot!(
+        case.command()
+            .arg("--python-platform").arg("linux")
+            .arg("--extra-search-path").arg("extra1")
+            .arg("--extra-search-path").arg("extra2")
+            .arg("--extra-search-path").arg("extra3")
+            .arg("--extra-search-path").arg("extra4")
+            .arg("--extra-search-path").arg("extra5")
+            .arg("--extra-search-path").arg("extra6"),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Cannot resolve imported module `baz`
+     --> test.py:1:14
+      |
+    1 | import foo1, baz
+      |              ^^^
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/extra1 (extra search path specified on the CLI or in your config file)
+    info:   2. <temp_dir>/extra2 (extra search path specified on the CLI or in your config file)
+    info:   3. <temp_dir>/extra3 (extra search path specified on the CLI or in your config file)
+    info:   4. <temp_dir>/extra4 (extra search path specified on the CLI or in your config file)
+    info:   5. <temp_dir>/extra5 (extra search path specified on the CLI or in your config file)
+    info:   ... and 3 more paths. Run with `-v` to see all paths.
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
+    // Shows all with `-v`
+    assert_cmd_snapshot!(
+        case.command()
+            .arg("--python-platform").arg("linux")
+            .arg("--extra-search-path").arg("extra1")
+            .arg("--extra-search-path").arg("extra2")
+            .arg("--extra-search-path").arg("extra3")
+            .arg("--extra-search-path").arg("extra4")
+            .arg("--extra-search-path").arg("extra5")
+            .arg("--extra-search-path").arg("extra6")
+            .arg("-v"),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Cannot resolve imported module `baz`
+     --> test.py:1:14
+      |
+    1 | import foo1, baz
+      |              ^^^
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/extra1 (extra search path specified on the CLI or in your config file)
+    info:   2. <temp_dir>/extra2 (extra search path specified on the CLI or in your config file)
+    info:   3. <temp_dir>/extra3 (extra search path specified on the CLI or in your config file)
+    info:   4. <temp_dir>/extra4 (extra search path specified on the CLI or in your config file)
+    info:   5. <temp_dir>/extra5 (extra search path specified on the CLI or in your config file)
+    info:   6. <temp_dir>/extra6 (extra search path specified on the CLI or in your config file)
+    info:   7. <temp_dir>/ (first-party code)
+    info:   8. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    INFO Python version: Python 3.14, platform: linux
+    INFO Indexed 7 file(s) in 0.000s
+    ");
     Ok(())
 }
 
@@ -420,7 +546,7 @@ fn pyvenv_cfg_file_annotation_showing_where_python_version_set() -> anyhow::Resu
         ("test.py", "aiter"),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -444,8 +570,7 @@ fn pyvenv_cfg_file_annotation_showing_where_python_version_set() -> anyhow::Resu
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -480,7 +605,7 @@ fn pyvenv_cfg_file_annotation_no_trailing_newline() -> anyhow::Result<()> {
         ("test.py", "aiter"),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -503,8 +628,7 @@ fn pyvenv_cfg_file_annotation_no_trailing_newline() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -535,11 +659,11 @@ fn config_file_annotation_showing_where_python_version_set_syntax_error() -> any
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Cannot use `match` statement on Python 3.8 (syntax was added in Python 3.10)
      --> test.py:2:1
       |
     2 | match object():
-      | ^^^^^ Cannot use `match` statement on Python 3.8 (syntax was added in Python 3.10)
+      | ^^^^^
     3 |     case int():
     4 |         pass
       |
@@ -554,18 +678,17 @@ fn config_file_annotation_showing_where_python_version_set_syntax_error() -> any
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "#);
 
     assert_cmd_snapshot!(case.command().arg("--python-version=3.9"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[invalid-syntax]
+    error[invalid-syntax]: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
      --> test.py:2:1
       |
     2 | match object():
-      | ^^^^^ Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+      | ^^^^^
     3 |     case int():
     4 |         pass
       |
@@ -574,7 +697,6 @@ fn config_file_annotation_showing_where_python_version_set_syntax_error() -> any
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
     Ok(())
@@ -605,51 +727,47 @@ fn python_cli_argument_virtual_environment() -> anyhow::Result<()> {
     ])?;
 
     // Passing a path to the installation works
-    assert_cmd_snapshot!(case.command().arg("--python").arg("my-venv"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg("my-venv"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // And so does passing a path to the executable inside the installation
-    assert_cmd_snapshot!(case.command().arg("--python").arg(path_to_executable), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg(path_to_executable), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // But random other paths inside the installation are rejected
-    assert_cmd_snapshot!(case.command().arg("--python").arg(other_venv_path), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg(other_venv_path), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: Invalid `--python` argument `<temp_dir>/my-venv/foo/some_other_file.txt`: does not point to a Python executable or a directory on disk
-    ");
+    "###);
 
     // And so are paths that do not exist on disk
-    assert_cmd_snapshot!(case.command().arg("--python").arg("not-a-directory-or-executable"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg("not-a-directory-or-executable"), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: Invalid `--python` argument `<temp_dir>/not-a-directory-or-executable`: does not point to a Python executable or a directory on disk
       Cause: No such file or directory (os error 2)
-    ");
+    "###);
 
     Ok(())
 }
@@ -676,26 +794,24 @@ fn python_cli_argument_system_installation() -> anyhow::Result<()> {
     ])?;
 
     // Passing a path to the installation works
-    assert_cmd_snapshot!(case.command().arg("--python").arg("Python3.11"), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg("Python3.11"), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // And so does passing a path to the executable inside the installation
-    assert_cmd_snapshot!(case.command().arg("--python").arg(path_to_executable), @r"
+    assert_cmd_snapshot!(case.command().arg("--python").arg(path_to_executable), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -721,13 +837,12 @@ fn config_file_broken_python_setting() -> anyhow::Result<()> {
         ("test.py", ""),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: Invalid `environment.python` setting
 
@@ -740,7 +855,7 @@ fn config_file_broken_python_setting() -> anyhow::Result<()> {
        |
 
       Cause: No such file or directory (os error 2)
-    "#);
+    "###);
 
     Ok(())
 }
@@ -759,13 +874,12 @@ fn config_file_python_setting_directory_with_no_site_packages() -> anyhow::Resul
         ("test.py", ""),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: Failed to discover the site-packages directory
       Cause: Invalid `environment.python` setting
@@ -777,7 +891,7 @@ fn config_file_python_setting_directory_with_no_site_packages() -> anyhow::Resul
     3 | python = "directory-but-no-site-packages"
       |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not find a `site-packages` directory for this Python installation/executable
       |
-    "#);
+    "###);
 
     Ok(())
 }
@@ -798,13 +912,12 @@ fn unix_system_installation_with_no_lib_directory() -> anyhow::Result<()> {
         ("test.py", ""),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: Failed to discover the site-packages directory
       Cause: Failed to iterate over the contents of the `lib`/`lib64` directories of the Python installation
@@ -816,7 +929,7 @@ fn unix_system_installation_with_no_lib_directory() -> anyhow::Result<()> {
     3 | python = "directory-but-no-site-packages"
       |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
-    "#);
+    "###);
 
     Ok(())
 }
@@ -845,11 +958,11 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r#"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-attribute]: Type `<module 'os'>` has no attribute `grantpt`
+    error[unresolved-attribute]: Module `os` has no member `grantpt`
      --> main.py:4:1
       |
     2 | import os
@@ -857,13 +970,20 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
     4 | os.grantpt(1) # only available on unix, Python 3.13 or newer
       | ^^^^^^^^^^
       |
+    info: Python 3.10 was assumed when accessing `grantpt`
+     --> ty.toml:3:18
+      |
+    2 | [environment]
+    3 | python-version = "3.10"
+      |                  ^^^^^^ Python 3.10 assumed due to this configuration setting
+    4 | python-platform = "linux"
+      |
     info: rule `unresolved-attribute` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "#);
 
     // Use default (which should be latest supported)
     let case = CliTest::with_files([
@@ -884,15 +1004,14 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -900,9 +1019,10 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
 /// The `site-packages` directory is used by ty for external import.
 /// Ty does the following checks to discover the `site-packages` directory in the order:
 /// 1) If `VIRTUAL_ENV` environment variable is set
-/// 2) If `CONDA_PREFIX` environment variable is set (and .filename != `CONDA_DEFAULT_ENV`)
+/// 2) If `CONDA_PREFIX` environment variable is set (and .filename == `CONDA_DEFAULT_ENV`)
 /// 3) If a `.venv` directory exists at the project root
-/// 4) If `CONDA_PREFIX` environment variable is set (and .filename == `CONDA_DEFAULT_ENV`)
+/// 4) If `CONDA_PREFIX` environment variable is set (and .filename != `CONDA_DEFAULT_ENV`)
+///    or if `_CONDA_ROOT` is set (and `_CONDA_ROOT` == `CONDA_PREFIX`)
 ///
 /// This test (and the next one) is aiming at validating the logic around these cases.
 ///
@@ -943,15 +1063,14 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
 /// │           └── site-packages
 /// │               └── package1
 /// │                   └── __init__.py
-/// ├── conda-env
-/// │   └── lib
-/// │       └── python3.13
-/// │           └── site-packages
-/// │               └── package1
-/// │                   └── __init__.py
 /// └── conda
+///     ├── lib
+///     │   └── python3.13
+///     │       └── site-packages
+///     │           └── package1
+///     │               └── __init__.py
 ///     └── envs
-///         └── base
+///         └── conda-env
 ///             └── lib
 ///                 └── python3.13
 ///                     └── site-packages
@@ -963,15 +1082,15 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
 #[test]
 fn check_venv_resolution_with_working_venv() -> anyhow::Result<()> {
     let child_conda_package1_path = if cfg!(windows) {
-        "conda-env/Lib/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda-env/lib/python3.13/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let base_conda_package1_path = if cfg!(windows) {
-        "conda/envs/base/Lib/site-packages/package1/__init__.py"
+        "conda/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda/envs/base/lib/python3.13/site-packages/package1/__init__.py"
+        "conda//lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let working_venv_package1_path = if cfg!(windows) {
@@ -1046,7 +1165,7 @@ home = ./
 
     // Run with nothing set, should find the working venv
     assert_cmd_snapshot!(case.command()
-        .current_dir(case.root().join("project")), @r"
+        .current_dir(case.root().join("project")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1064,13 +1183,12 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Run with VIRTUAL_ENV set, should find the active venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r"
+        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1087,13 +1205,12 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // run with CONDA_PREFIX set, should find the child conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env")), @r"
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1111,24 +1228,23 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find child conda
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find working venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
-        .env("CONDA_DEFAULT_ENV", "base"), @r"
+        .env("CONDA_PREFIX", case.root().join("conda"))
+        .env("CONDA_DEFAULT_ENV", "base"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `ChildConda`
-     --> test.py:3:22
+    error[unresolved-import]: Module `package1` has no member `WorkingVenv`
+     --> test.py:4:22
       |
     2 | from package1 import ActiveVenv
     3 | from package1 import ChildConda
-      |                      ^^^^^^^^^^
     4 | from package1 import WorkingVenv
+      |                      ^^^^^^^^^^^
     5 | from package1 import BaseConda
       |
     info: rule `unresolved-import` is enabled by default
@@ -1136,16 +1252,15 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (unequal) and VIRTUAL_ENV set,
     // should find child active venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
         .env("CONDA_DEFAULT_ENV", "base")
-        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r"
+        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1162,24 +1277,23 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (equal!) set, should find working venv
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (equal!) set, should find ChildConda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda/envs/base"))
-        .env("CONDA_DEFAULT_ENV", "base"), @r"
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env"))
+        .env("CONDA_DEFAULT_ENV", "conda-env"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `WorkingVenv`
-     --> test.py:4:22
+    error[unresolved-import]: Module `package1` has no member `ChildConda`
+     --> test.py:3:22
       |
     2 | from package1 import ActiveVenv
     3 | from package1 import ChildConda
+      |                      ^^^^^^^^^^
     4 | from package1 import WorkingVenv
-      |                      ^^^^^^^^^^^
     5 | from package1 import BaseConda
       |
     info: rule `unresolved-import` is enabled by default
@@ -1187,8 +1301,54 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
+
+    // run with _CONDA_ROOT and CONDA_PREFIX (unequal!) set, should find ChildConda
+    assert_cmd_snapshot!(case.command()
+        .current_dir(case.root().join("project"))
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env"))
+        .env("_CONDA_ROOT", "conda"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package1` has no member `ChildConda`
+     --> test.py:3:22
+      |
+    2 | from package1 import ActiveVenv
+    3 | from package1 import ChildConda
+      |                      ^^^^^^^^^^
+    4 | from package1 import WorkingVenv
+    5 | from package1 import BaseConda
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    // run with _CONDA_ROOT and CONDA_PREFIX (equal!) set, should find BaseConda
+    assert_cmd_snapshot!(case.command()
+        .current_dir(case.root().join("project"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
+        .env("_CONDA_ROOT", "conda"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package1` has no member `BaseConda`
+     --> test.py:5:22
+      |
+    3 | from package1 import ChildConda
+    4 | from package1 import WorkingVenv
+    5 | from package1 import BaseConda
+      |                      ^^^^^^^^^
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
 
     Ok(())
 }
@@ -1199,15 +1359,15 @@ home = ./
 #[test]
 fn check_venv_resolution_without_working_venv() -> anyhow::Result<()> {
     let child_conda_package1_path = if cfg!(windows) {
-        "conda-env/Lib/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda-env/lib/python3.13/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let base_conda_package1_path = if cfg!(windows) {
-        "conda/envs/base/Lib/site-packages/package1/__init__.py"
+        "conda/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda/envs/base/lib/python3.13/site-packages/package1/__init__.py"
+        "conda/lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let active_venv_package1_path = if cfg!(windows) {
@@ -1261,7 +1421,7 @@ home = ./
 
     // Run with nothing set, should fail to find anything
     assert_cmd_snapshot!(case.command()
-        .current_dir(case.root().join("project")), @r"
+        .current_dir(case.root().join("project")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1273,6 +1433,9 @@ home = ./
     3 | from package1 import ChildConda
     4 | from package1 import WorkingVenv
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/project (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
@@ -1285,6 +1448,9 @@ home = ./
     4 | from package1 import WorkingVenv
     5 | from package1 import BaseConda
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/project (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
@@ -1297,6 +1463,9 @@ home = ./
       |      ^^^^^^^^
     5 | from package1 import BaseConda
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/project (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
@@ -1308,19 +1477,21 @@ home = ./
     5 | from package1 import BaseConda
       |      ^^^^^^^^
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/project (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 4 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // Run with VIRTUAL_ENV set, should find the active venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r"
+        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1337,13 +1508,12 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     // run with CONDA_PREFIX set, should find the child conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env")), @r"
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env")), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1361,65 +1531,13 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find child conda
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find base conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
-        .env("CONDA_DEFAULT_ENV", "base"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `ChildConda`
-     --> test.py:3:22
-      |
-    2 | from package1 import ActiveVenv
-    3 | from package1 import ChildConda
-      |                      ^^^^^^^^^^
-    4 | from package1 import WorkingVenv
-    5 | from package1 import BaseConda
-      |
-    info: rule `unresolved-import` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
-
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (unequal) and VIRTUAL_ENV set,
-    // should find child active venv
-    assert_cmd_snapshot!(case.command()
-        .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
-        .env("CONDA_DEFAULT_ENV", "base")
-        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `ActiveVenv`
-     --> test.py:2:22
-      |
-    2 | from package1 import ActiveVenv
-      |                      ^^^^^^^^^^
-    3 | from package1 import ChildConda
-    4 | from package1 import WorkingVenv
-      |
-    info: rule `unresolved-import` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
-
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (equal!) set, should find base conda
-    assert_cmd_snapshot!(case.command()
-        .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda/envs/base"))
-        .env("CONDA_DEFAULT_ENV", "base"), @r"
+        .env("CONDA_PREFIX", case.root().join("conda"))
+        .env("CONDA_DEFAULT_ENV", "base"), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1436,8 +1554,102 @@ home = ./
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
+
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (unequal) and VIRTUAL_ENV set,
+    // should find child active venv
+    assert_cmd_snapshot!(case.command()
+        .current_dir(case.root().join("project"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
+        .env("CONDA_DEFAULT_ENV", "base")
+        .env("VIRTUAL_ENV", case.root().join("myvenv")), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package1` has no member `ActiveVenv`
+     --> test.py:2:22
+      |
+    2 | from package1 import ActiveVenv
+      |                      ^^^^^^^^^^
+    3 | from package1 import ChildConda
+    4 | from package1 import WorkingVenv
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (unequal!) set, should find base conda
+    assert_cmd_snapshot!(case.command()
+        .current_dir(case.root().join("project"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
+        .env("CONDA_DEFAULT_ENV", "base"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package1` has no member `BaseConda`
+     --> test.py:5:22
+      |
+    3 | from package1 import ChildConda
+    4 | from package1 import WorkingVenv
+    5 | from package1 import BaseConda
+      |                      ^^^^^^^^^
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    // run with _CONDA_ROOT and CONDA_PREFIX (unequal!) set, should find ChildConda
+    assert_cmd_snapshot!(case.command()
+        .current_dir(case.root().join("project"))
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env"))
+        .env("_CONDA_ROOT", "conda"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package1` has no member `ChildConda`
+     --> test.py:3:22
+      |
+    2 | from package1 import ActiveVenv
+    3 | from package1 import ChildConda
+      |                      ^^^^^^^^^^
+    4 | from package1 import WorkingVenv
+    5 | from package1 import BaseConda
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    // run with _CONDA_ROOT and CONDA_PREFIX (equal!) set, should find BaseConda
+    assert_cmd_snapshot!(case.command()
+        .current_dir(case.root().join("project"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
+        .env("_CONDA_ROOT", "conda"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Module `package1` has no member `BaseConda`
+     --> test.py:5:22
+      |
+    3 | from package1 import ChildConda
+    4 | from package1 import WorkingVenv
+    5 | from package1 import BaseConda
+      |                      ^^^^^^^^^
+      |
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
 
     Ok(())
 }
@@ -1455,7 +1667,7 @@ fn src_root_deprecation_warning() -> anyhow::Result<()> {
         ("src/test.py", ""),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1470,8 +1682,7 @@ fn src_root_deprecation_warning() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -1492,7 +1703,7 @@ fn src_root_deprecation_warning_with_environment_root() -> anyhow::Result<()> {
         ("app/test.py", ""),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1510,8 +1721,7 @@ fn src_root_deprecation_warning_with_environment_root() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -1538,7 +1748,7 @@ fn environment_root_takes_precedence_over_src_root() -> anyhow::Result<()> {
 
     // The test should pass because environment.root points to ./app where my_module.py exists
     // If src.root took precedence, it would fail because my_module.py doesn't exist in ./src
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -1556,8 +1766,7 @@ fn environment_root_takes_precedence_over_src_root() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -1578,15 +1787,14 @@ fn default_root_src_layout() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -1614,15 +1822,14 @@ fn default_root_project_name_folder() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -1643,15 +1850,14 @@ fn default_root_flat_layout() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -1672,15 +1878,14 @@ fn default_root_tests_folder() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
     All checks passed!
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -1703,7 +1908,7 @@ fn default_root_tests_package() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1716,14 +1921,261 @@ fn default_root_tests_package() -> anyhow::Result<()> {
     4 |
     5 | print(f"{foo} {bar}")
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/src (first-party code)
+    info:   2. <temp_dir>/ (first-party code)
+    info:   3. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
+
+    Ok(())
+}
+
+#[test]
+fn default_root_python_folder() -> anyhow::Result<()> {
+    let case = CliTest::with_files([
+        ("src/foo.py", "foo = 10"),
+        ("python/bar.py", "bar = 20"),
+        (
+            "python/test_bar.py",
+            r#"
+            from foo import foo
+            from bar import bar
+
+            print(f"{foo} {bar}")
+            "#,
+        ),
+    ])?;
+
+    assert_cmd_snapshot!(case.command(), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}
+
+/// If `python/__init__.py` is present, it is considered a package and `python` is not added to search paths.
+#[test]
+fn default_root_python_package() -> anyhow::Result<()> {
+    let case = CliTest::with_files([
+        ("src/foo.py", "foo = 10"),
+        ("python/__init__.py", ""),
+        ("python/bar.py", "bar = 20"),
+        (
+            "python/test_bar.py",
+            r#"
+            from foo import foo
+            from bar import bar  # expected unresolved import
+
+            print(f"{foo} {bar}")
+            "#,
+        ),
+    ])?;
+
+    assert_cmd_snapshot!(case.command(), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Cannot resolve imported module `bar`
+     --> python/test_bar.py:3:6
+      |
+    2 | from foo import foo
+    3 | from bar import bar  # expected unresolved import
+      |      ^^^
+    4 |
+    5 | print(f"{foo} {bar}")
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/src (first-party code)
+    info:   2. <temp_dir>/ (first-party code)
+    info:   3. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}
+
+/// Similarly, if `python/__init__.pyi` is present, it is considered a package and `python` is not added to search paths.
+#[test]
+fn default_root_python_package_pyi() -> anyhow::Result<()> {
+    let case = CliTest::with_files([
+        ("src/foo.py", "foo = 10"),
+        ("python/__init__.pyi", ""),
+        ("python/bar.py", "bar = 20"),
+        (
+            "python/test_bar.py",
+            r#"
+            from foo import foo
+            from bar import bar  # expected unresolved import
+
+            print(f"{foo} {bar}")
+            "#,
+        ),
+    ])?;
+
+    assert_cmd_snapshot!(case.command(), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Cannot resolve imported module `bar`
+     --> python/test_bar.py:3:6
+      |
+    2 | from foo import foo
+    3 | from bar import bar  # expected unresolved import
+      |      ^^^
+    4 |
+    5 | print(f"{foo} {bar}")
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/src (first-party code)
+    info:   2. <temp_dir>/ (first-party code)
+    info:   3. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}
+
+#[test]
+fn pythonpath_is_respected() -> anyhow::Result<()> {
+    let case = CliTest::with_files([
+        ("baz-dir/baz.py", "it = 42"),
+        (
+            "src/foo.py",
+            r#"
+            import baz
+            print(f"{baz.it}")
+            "#,
+        ),
+    ])?;
+
+    assert_cmd_snapshot!(case.command(),
+        @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Cannot resolve imported module `baz`
+     --> src/foo.py:2:8
+      |
+    2 | import baz
+      |        ^^^
+    3 | print(f"{baz.it}")
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/src (first-party code)
+    info:   2. <temp_dir>/ (first-party code)
+    info:   3. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    "###);
+
+    assert_cmd_snapshot!(case.command()
+        .env("PYTHONPATH", case.root().join("baz-dir")),
+        @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}
+
+#[test]
+fn pythonpath_multiple_dirs_is_respected() -> anyhow::Result<()> {
+    let case = CliTest::with_files([
+        ("baz-dir/baz.py", "it = 42"),
+        ("foo-dir/foo.py", "it = 42"),
+        (
+            "src/main.py",
+            r#"
+            import baz
+            import foo
+
+            print(f"{baz.it}")
+            print(f"{foo.it}")
+            "#,
+        ),
+    ])?;
+
+    assert_cmd_snapshot!(case.command(),
+        @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-import]: Cannot resolve imported module `baz`
+     --> src/main.py:2:8
+      |
+    2 | import baz
+      |        ^^^
+    3 | import foo
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/src (first-party code)
+    info:   2. <temp_dir>/ (first-party code)
+    info:   3. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    error[unresolved-import]: Cannot resolve imported module `foo`
+     --> src/main.py:3:8
+      |
+    2 | import baz
+    3 | import foo
+      |        ^^^
+    4 |
+    5 | print(f"{baz.it}")
+      |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/src (first-party code)
+    info:   2. <temp_dir>/ (first-party code)
+    info:   3. vendored://stdlib (stdlib typeshed stubs vendored by ty)
+    info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
+    info: rule `unresolved-import` is enabled by default
+
+    Found 2 diagnostics
+
+    ----- stderr -----
+    "###);
+
+    let pythonpath =
+        std::env::join_paths([case.root().join("baz-dir"), case.root().join("foo-dir")])?;
+    assert_cmd_snapshot!(case.command()
+        .env("PYTHONPATH", pythonpath),
+        @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!
+
+    ----- stderr -----
+    "###);
 
     Ok(())
 }
diff --git a/crates/ty/tests/cli/rule_selection.rs b/crates/ty/tests/cli/rule_selection.rs
index 16a1d4eb74..4a4c26b69c 100644
--- a/crates/ty/tests/cli/rule_selection.rs
+++ b/crates/ty/tests/cli/rule_selection.rs
@@ -35,7 +35,6 @@ fn configuration_rule_severity() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "###);
 
     case.write_file(
@@ -47,7 +46,7 @@ fn configuration_rule_severity() -> anyhow::Result<()> {
     "#,
     )?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -64,8 +63,7 @@ fn configuration_rule_severity() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -101,6 +99,9 @@ fn cli_rule_severity() -> anyhow::Result<()> {
     3 |
     4 | y = 4 / 0
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` is enabled by default
 
@@ -117,7 +118,6 @@ fn cli_rule_severity() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "###);
 
     assert_cmd_snapshot!(
@@ -129,7 +129,7 @@ fn cli_rule_severity() -> anyhow::Result<()> {
             .arg("division-by-zero")
             .arg("--warn")
             .arg("unresolved-import"),
-        @r"
+        @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -141,6 +141,9 @@ fn cli_rule_severity() -> anyhow::Result<()> {
     3 |
     4 | y = 4 / 0
       |
+    info: Searched in the following paths during module resolution:
+    info:   1. <temp_dir>/ (first-party code)
+    info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
     info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
     info: rule `unresolved-import` was selected on the command line
 
@@ -159,8 +162,7 @@ fn cli_rule_severity() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "
+    "###
     );
 
     Ok(())
@@ -200,7 +202,6 @@ fn cli_rule_severity_precedence() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "###);
 
     assert_cmd_snapshot!(
@@ -212,7 +213,7 @@ fn cli_rule_severity_precedence() -> anyhow::Result<()> {
             .arg("division-by-zero")
             .arg("--ignore")
             .arg("unresolved-reference"),
-        @r"
+        @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -229,8 +230,7 @@ fn cli_rule_severity_precedence() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "
+    "###
     );
 
     Ok(())
@@ -254,7 +254,7 @@ fn configuration_unknown_rules() -> anyhow::Result<()> {
     success: true
     exit_code: 0
     ----- stdout -----
-    warning[unknown-rule]: Unknown lint rule `division-by-zer`
+    warning[unknown-rule]: Unknown rule `division-by-zer`. Did you mean `division-by-zero`?
      --> pyproject.toml:3:1
       |
     2 | [tool.ty.rules]
@@ -265,7 +265,6 @@ fn configuration_unknown_rules() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "#);
 
     Ok(())
@@ -280,12 +279,11 @@ fn cli_unknown_rules() -> anyhow::Result<()> {
     success: true
     exit_code: 0
     ----- stdout -----
-    warning[unknown-rule]: Unknown lint rule `division-by-zer`
+    warning[unknown-rule]: Unknown rule `division-by-zer`. Did you mean `division-by-zero`?
 
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
     Ok(())
@@ -365,7 +363,6 @@ fn overrides_basic() -> anyhow::Result<()> {
     Found 3 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     "###);
 
     Ok(())
@@ -408,7 +405,7 @@ fn overrides_precedence() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -423,8 +420,7 @@ fn overrides_precedence() -> anyhow::Result<()> {
     Found 1 diagnostic
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -460,7 +456,7 @@ fn overrides_exclude() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -483,8 +479,7 @@ fn overrides_exclude() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
+    "###);
 
     Ok(())
 }
@@ -524,7 +519,7 @@ fn overrides_inherit_global() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -558,8 +553,7 @@ fn overrides_inherit_global() -> anyhow::Result<()> {
     Found 3 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -588,13 +582,12 @@ fn overrides_invalid_include_glob() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: error[invalid-glob]: Invalid include pattern
      --> pyproject.toml:6:12
@@ -605,7 +598,7 @@ fn overrides_invalid_include_glob() -> anyhow::Result<()> {
     7 | [tool.ty.overrides.rules]
     8 | division-by-zero = "warn"
       |
-    "#);
+    "###);
 
     Ok(())
 }
@@ -635,13 +628,12 @@ fn overrides_invalid_exclude_glob() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ty failed
       Cause: error[invalid-glob]: Invalid exclude pattern
      --> pyproject.toml:7:12
@@ -653,7 +645,7 @@ fn overrides_invalid_exclude_glob() -> anyhow::Result<()> {
     8 | [tool.ty.overrides.rules]
     9 | division-by-zero = "warn"
       |
-    "#);
+    "###);
 
     Ok(())
 }
@@ -682,7 +674,7 @@ fn overrides_missing_include_exclude() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -711,8 +703,7 @@ fn overrides_missing_include_exclude() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -741,7 +732,7 @@ fn overrides_empty_include() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -767,8 +758,7 @@ fn overrides_empty_include() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -796,7 +786,7 @@ fn overrides_no_actual_overrides() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r#"
+    assert_cmd_snapshot!(case.command(), @r###"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -825,8 +815,7 @@ fn overrides_no_actual_overrides() -> anyhow::Result<()> {
     Found 2 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
+    "###);
 
     Ok(())
 }
@@ -863,7 +852,7 @@ fn overrides_unknown_rules() -> anyhow::Result<()> {
         ),
     ])?;
 
-    assert_cmd_snapshot!(case.command(), @r###"
+    assert_cmd_snapshot!(case.command(), @r#"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -875,7 +864,7 @@ fn overrides_unknown_rules() -> anyhow::Result<()> {
       |
     info: rule `division-by-zero` was selected in the configuration file
 
-    warning[unknown-rule]: Unknown lint rule `division-by-zer`
+    warning[unknown-rule]: Unknown rule `division-by-zer`. Did you mean `division-by-zero`?
       --> pyproject.toml:10:1
        |
      8 | [tool.ty.overrides.rules]
@@ -895,8 +884,7 @@ fn overrides_unknown_rules() -> anyhow::Result<()> {
     Found 3 diagnostics
 
     ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "###);
+    "#);
 
     Ok(())
 }
diff --git a/crates/ty/tests/file_watching.rs b/crates/ty/tests/file_watching.rs
index e40722d395..5a738b5fd5 100644
--- a/crates/ty/tests/file_watching.rs
+++ b/crates/ty/tests/file_watching.rs
@@ -240,7 +240,7 @@ impl TestCase {
             .module(parent_module_name)
             .all_submodules(self.db())
             .iter()
-            .map(|name| name.as_str().to_string())
+            .map(|submodule| submodule.name(self.db()).to_string())
             .collect::<Vec<String>>();
         names.sort();
         names
@@ -1112,11 +1112,11 @@ print(sys.last_exc, os.getegid())
     assert_eq!(diagnostics.len(), 2);
     assert_eq!(
         diagnostics[0].primary_message(),
-        "Type `<module 'sys'>` has no attribute `last_exc`"
+        "Module `sys` has no member `last_exc`"
     );
     assert_eq!(
         diagnostics[1].primary_message(),
-        "Type `<module 'os'>` has no attribute `getegid`"
+        "Module `os` has no member `getegid`"
     );
 
     // Change the python version
@@ -1912,7 +1912,7 @@ fn submodule_cache_invalidation_created() -> anyhow::Result<()> {
 
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
-        @"foo",
+        @"bar.foo",
     );
 
     std::fs::write(case.project_path("bar/wazoo.py").as_std_path(), "")?;
@@ -1922,8 +1922,8 @@ fn submodule_cache_invalidation_created() -> anyhow::Result<()> {
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
         @r"
-    foo
-    wazoo
+    bar.foo
+    bar.wazoo
     ",
     );
 
@@ -1944,8 +1944,8 @@ fn submodule_cache_invalidation_deleted() -> anyhow::Result<()> {
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
         @r"
-    foo
-    wazoo
+    bar.foo
+    bar.wazoo
     ",
     );
 
@@ -1955,7 +1955,7 @@ fn submodule_cache_invalidation_deleted() -> anyhow::Result<()> {
 
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
-        @"foo",
+        @"bar.foo",
     );
 
     Ok(())
@@ -1969,7 +1969,7 @@ fn submodule_cache_invalidation_created_then_deleted() -> anyhow::Result<()> {
 
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
-        @"foo",
+        @"bar.foo",
     );
 
     std::fs::write(case.project_path("bar/wazoo.py").as_std_path(), "")?;
@@ -1982,7 +1982,7 @@ fn submodule_cache_invalidation_created_then_deleted() -> anyhow::Result<()> {
 
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
-        @"foo",
+        @"bar.foo",
     );
 
     Ok(())
@@ -1997,7 +1997,7 @@ fn submodule_cache_invalidation_after_pyproject_created() -> anyhow::Result<()>
 
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
-        @"foo",
+        @"bar.foo",
     );
 
     case.update_options(Options::default())?;
@@ -2009,8 +2009,8 @@ fn submodule_cache_invalidation_after_pyproject_created() -> anyhow::Result<()>
     insta::assert_snapshot!(
         case.sorted_submodule_names("bar").join("\n"),
         @r"
-    foo
-    wazoo
+    bar.foo
+    bar.wazoo
     ",
     );
 
diff --git a/crates/ty_combine/src/lib.rs b/crates/ty_combine/src/lib.rs
index ab8b7a013b..d2033cadd5 100644
--- a/crates/ty_combine/src/lib.rs
+++ b/crates/ty_combine/src/lib.rs
@@ -1,3 +1,8 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods in ty crates"
+)]
+
 use std::{collections::HashMap, hash::BuildHasher};
 
 use ordermap::OrderMap;
diff --git a/crates/ty_completion_eval/Cargo.toml b/crates/ty_completion_eval/Cargo.toml
new file mode 100644
index 0000000000..50fcc46466
--- /dev/null
+++ b/crates/ty_completion_eval/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "ty_completion_eval"
+version = "0.0.0"
+publish = false
+authors = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }
+homepage = { workspace = true }
+documentation = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+
+[dependencies]
+ruff_db = { workspace = true, features = ["os"] }
+ruff_text_size = { workspace = true }
+
+ty_ide = { workspace = true }
+ty_project = { workspace = true }
+ty_python_semantic = { workspace = true }
+
+anyhow = { workspace = true }
+bstr = { workspace = true }
+clap = { workspace = true, features = ["wrap_help", "string", "env"] }
+csv = { workspace = true }
+regex = { workspace = true }
+serde = { workspace = true }
+tempfile = { workspace = true }
+toml = { workspace = true }
+walkdir = { workspace = true }
+
+[lints]
+workspace = true
diff --git a/crates/ty_completion_eval/README.md b/crates/ty_completion_eval/README.md
new file mode 100644
index 0000000000..748c6e9d0d
--- /dev/null
+++ b/crates/ty_completion_eval/README.md
@@ -0,0 +1,143 @@
+This directory contains a framework for evaluating completion suggestions
+returned by the ty LSP.
+
+# Running an evaluation
+
+To run a full evaluation, run the `ty_completion_eval` crate with the
+`all` command from the root of this repository:
+
+```console
+cargo run --profile profiling --package ty_completion_eval -- all
+```
+
+The output should look like this:
+
+```text
+    Finished `release` profile [optimized] target(s) in 0.09s
+     Running `target/release/ty_completion_eval all`
+mean reciprocal rank: 0.20409790112917506
+MRR exceeds threshold of 0.001
+```
+
+If you want to look at the results of each individual evaluation task,
+you can ask the evaluation to write CSV data that contains the rank of
+the expected answer in each completion request:
+
+```console
+cargo r --profile profiling -p ty_completion_eval -- all --tasks ./crates/ty_completion_eval/completion-evaluation-tasks.csv
+```
+
+To debug a _specific_ task and look at the actual results, use the `show-one`
+command:
+
+```console
+cargo r -q -p ty_completion_eval show-one higher-level-symbols-preferred --index 1
+```
+
+(The `--index` flag is only needed if there are multiple `<CURSOR>` directives in the same file.)
+
+Has output that should look like this:
+
+```text
+ZQZQZQ_SOMETHING_IMPORTANT (*, 1/31)
+__annotations__
+__class__
+__delattr__
+__dict__
+__dir__
+__doc__
+__eq__
+__file__
+__format__
+__getattr__
+__getattribute__
+__getstate__
+__hash__
+__init__
+__init_subclass__
+__loader__
+__module__
+__name__
+__ne__
+__new__
+__package__
+__path__
+__reduce__
+__reduce_ex__
+__repr__
+__setattr__
+__sizeof__
+__spec__
+__str__
+__subclasshook__
+-----
+found 31 completions
+```
+
+The expected answer is marked with a `*`. The higher the rank, the better. In this example, the
+rank is perfect. Note that the expected answer may not always appear in the completion results!
+(Which is considered the worst possible outcome by this evaluation framework.)
+
+# Evaluation model
+
+This evaluation is based on [mean reciprocal rank] (MRR). That is, it assumes
+that for every evaluation task (i.e., a single completion request) there is
+precisely one correct answer. The higher the correct answer appears in each
+completion request, the better. The mean reciprocal rank is computed as the
+average of `1/rank` across all evaluation tasks. The higher the mean reciprocal
+rank, the better.
+
+The evaluation starts by preparing its truth data, which is contained in the `./truth` directory.
+Within `./truth` is a list of Python projects. Every project contains one or more `<CURSOR>`
+directives. Each `<CURSOR>` directive corresponds to an instruction to initiate a completion
+request at that position. For example:
+
+```python
+class Foo:
+    def frobnicate(self): pass
+
+foo = Foo()
+foo.frob<CURSOR: frobnicate>
+```
+
+The above example says that completions should be requested immediately after `foo.frob`
+_and_ that the expected answer is `frobnicate`.
+
+When testing auto-import, one should also include the module in the expected answer.
+For example:
+
+```python
+RegexFl<CURSOR: re.RegexFlag>
+```
+
+Settings for completion requests can be configured via a `completion.toml` file within
+each Python project directory.
+
+When an evaluation is run, the truth data is copied to a temporary directory.
+`uv sync` is then run within each directory to prepare it.
+
+# Continuous Integration
+
+At time of writing (2025-10-07), an evaluation is run in CI. CI will fail if the MRR is
+below a set threshold. When this occurs, it means that the evaluation's results have likely
+gotten worse in some measurable way. Ideally, the way to fix this would be to fix whatever
+regression occurred in ranking. One can follow the steps above to run an evaluation and
+emit the individual task results in CSV format. This difference between this CSV data and
+whatever is committed at `./crates/ty_completion_eval/completion-evaluation-tasks.csv` should
+point to where the regression occurs.
+
+If the change is not a regression or is otherwise expected, then the MRR threshold can be
+lowered. This requires changing how `ty_completion_eval` is executed within CI.
+
+CI will also fail if the individual task results have changed.
+To make CI pass, you can just re-run the evaluation locally and commit the results:
+
+```console
+cargo r --profile profiling -p ty_completion_eval -- all --tasks ./crates/ty_completion_eval/completion-evaluation-tasks.csv
+```
+
+CI fails in this case because it would be best to scrutinize the differences here.
+It's possible that the ranking has improved in some measurable way, for example.
+(Think of this as if it were a snapshot test.)
+
+[mean reciprocal rank]: https://en.wikipedia.org/wiki/Mean_reciprocal_rank
diff --git a/crates/ty_completion_eval/completion-evaluation-tasks.csv b/crates/ty_completion_eval/completion-evaluation-tasks.csv
new file mode 100644
index 0000000000..cf73a817e1
--- /dev/null
+++ b/crates/ty_completion_eval/completion-evaluation-tasks.csv
@@ -0,0 +1,25 @@
+name,file,index,rank
+fstring-completions,main.py,0,1
+higher-level-symbols-preferred,main.py,0,
+higher-level-symbols-preferred,main.py,1,1
+import-deprioritizes-dunder,main.py,0,1
+import-deprioritizes-sunder,main.py,0,1
+import-deprioritizes-type_check_only,main.py,0,1
+import-deprioritizes-type_check_only,main.py,1,1
+import-deprioritizes-type_check_only,main.py,2,1
+import-deprioritizes-type_check_only,main.py,3,2
+import-deprioritizes-type_check_only,main.py,4,3
+internal-typeshed-hidden,main.py,0,4
+none-completion,main.py,0,11
+numpy-array,main.py,0,
+numpy-array,main.py,1,1
+object-attr-instance-methods,main.py,0,1
+object-attr-instance-methods,main.py,1,1
+raise-uses-base-exception,main.py,0,2
+scope-existing-over-new-import,main.py,0,474
+scope-prioritize-closer,main.py,0,2
+scope-simple-long-identifier,main.py,0,1
+tstring-completions,main.py,0,1
+ty-extensions-lower-stdlib,main.py,0,7
+type-var-typing-over-ast,main.py,0,3
+type-var-typing-over-ast,main.py,1,270
diff --git a/crates/ty_completion_eval/src/main.rs b/crates/ty_completion_eval/src/main.rs
new file mode 100644
index 0000000000..146041a278
--- /dev/null
+++ b/crates/ty_completion_eval/src/main.rs
@@ -0,0 +1,629 @@
+/*!
+A simple command line tool for running a completion evaluation.
+
+See `crates/ty_completion_eval/README.md` for examples and more docs.
+*/
+
+use std::io::Write;
+use std::process::ExitCode;
+use std::sync::LazyLock;
+
+use anyhow::{Context, anyhow};
+use clap::Parser;
+use regex::bytes::Regex;
+
+use ruff_db::files::system_path_to_file;
+use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
+use ty_ide::Completion;
+use ty_project::metadata::Options;
+use ty_project::metadata::options::EnvironmentOptions;
+use ty_project::metadata::value::RelativePathBuf;
+use ty_project::{ProjectDatabase, ProjectMetadata};
+use ty_python_semantic::ModuleName;
+
+#[derive(Debug, clap::Parser)]
+#[command(
+    author,
+    name = "ty_completion_eval",
+    about = "Run a information retrieval evaluation on ty-powered completions."
+)]
+struct Cli {
+    #[command(subcommand)]
+    command: Command,
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum Command {
+    /// Run an evaluation on all tasks.
+    All(AllCommand),
+    /// Show the completions for a single task.
+    ///
+    /// This is useful for debugging one single completion task. For
+    /// example, let's say you make a change to a ranking heuristic and
+    /// everything looks good except for a few tasks where the rank for
+    /// the expected answer regressed. Just use this command to run a
+    /// specific task and you'll get the actual completions for that
+    /// task printed to stdout.
+    ///
+    /// If the expected answer is found in the completion list, then
+    /// it is marked with an `*` along with its rank.
+    ShowOne(ShowOneCommand),
+}
+
+#[derive(Debug, clap::Parser)]
+struct AllCommand {
+    /// The mean reciprocal rank threshold that the evaluation must
+    /// meet or exceed in order for the evaluation to pass.
+    #[arg(
+        long,
+        help = "The mean reciprocal rank threshold.",
+        value_name = "FLOAT",
+        default_value_t = 0.001
+    )]
+    threshold: f64,
+    /// If given, a CSV file of the results for each individual task
+    /// is written to the path given.
+    #[arg(
+        long,
+        help = "When provided, write individual task results in CSV format.",
+        value_name = "FILE"
+    )]
+    tasks: Option<String>,
+    /// Whether to keep the temporary evaluation directory around
+    /// after finishing or not. Keeping it around is useful for
+    /// debugging when something has gone wrong.
+    #[arg(
+        long,
+        help = "Whether to keep the temporary evaluation directory around or not."
+    )]
+    keep_tmp_dir: bool,
+}
+
+#[derive(Debug, clap::Parser)]
+struct ShowOneCommand {
+    /// The name of one or more completion tasks to run in isolation.
+    ///
+    /// The name corresponds to the name of a directory in
+    /// `./crates/ty_completion_eval/truth/`.
+    #[arg(help = "The task name to run.", value_name = "TASK_NAME")]
+    task_name: String,
+    /// The name of the file, relative to the root of the
+    /// Python project, that contains one or more completion
+    /// tasks to run in isolation.
+    #[arg(long, help = "The file name to run.", value_name = "FILE_NAME")]
+    file_name: Option<String>,
+    /// The index of the cursor directive within `file_name`
+    /// to select.
+    #[arg(
+        long,
+        help = "The index of the cursor directive to run.",
+        value_name = "INDEX"
+    )]
+    index: Option<usize>,
+    /// Whether to keep the temporary evaluation directory around
+    /// after finishing or not. Keeping it around is useful for
+    /// debugging when something has gone wrong.
+    #[arg(
+        long,
+        help = "Whether to keep the temporary evaluation directory around or not."
+    )]
+    keep_tmp_dir: bool,
+}
+
+impl ShowOneCommand {
+    fn matches_source_task(&self, task_source: &TaskSource) -> bool {
+        self.task_name == task_source.name
+    }
+
+    fn matches_task(&self, task: &Task) -> bool {
+        self.task_name == task.name
+            && self
+                .file_name
+                .as_ref()
+                .is_none_or(|name| name == task.cursor_name())
+            && self.index.is_none_or(|index| index == task.cursor.index)
+    }
+}
+
+fn main() -> anyhow::Result<ExitCode> {
+    let args = Cli::parse();
+
+    // The base path to which all CLI arguments are relative to.
+    let cwd = {
+        let cwd = std::env::current_dir().context("Failed to get the current working directory")?;
+        SystemPathBuf::from_path_buf(cwd).map_err(|path| {
+            anyhow!(
+                "The current working directory `{}` contains non-Unicode characters. \
+                 ty only supports Unicode paths.",
+                path.display()
+            )
+        })?
+    };
+    // Where we store our truth data.
+    let truth = cwd.join("crates").join("ty_completion_eval").join("truth");
+    anyhow::ensure!(
+        truth.as_std_path().exists(),
+        "{truth} does not exist: ty's completion evaluation must be run from the root \
+         of the ruff repository",
+        truth = truth.as_std_path().display(),
+    );
+
+    // The temporary directory at which we copy our truth
+    // data to. We do this because we can't use the truth
+    // data as-is with its `<CURSOR>` annotations (and perhaps
+    // any other future annotations we add).
+    let mut tmp_eval_dir = tempfile::Builder::new()
+        .prefix("ty-completion-eval-")
+        .tempdir()
+        .context("Failed to create temporary directory")?;
+    let tmp_eval_path = SystemPath::from_std_path(tmp_eval_dir.path())
+        .ok_or_else(|| {
+            anyhow::anyhow!(
+                "Temporary directory path is not valid UTF-8: {}",
+                tmp_eval_dir.path().display()
+            )
+        })?
+        .to_path_buf();
+
+    let sources = TaskSource::all(&truth)?;
+    match args.command {
+        Command::ShowOne(ref cmd) => {
+            tmp_eval_dir.disable_cleanup(cmd.keep_tmp_dir);
+
+            let Some(source) = sources
+                .iter()
+                .find(|source| cmd.matches_source_task(source))
+            else {
+                anyhow::bail!("could not find task named `{}`", cmd.task_name);
+            };
+            let tasks = source.to_tasks(&tmp_eval_path)?;
+            let matching: Vec<&Task> = tasks.iter().filter(|task| cmd.matches_task(task)).collect();
+            anyhow::ensure!(
+                !matching.is_empty(),
+                "could not find any tasks matching the given criteria",
+            );
+            anyhow::ensure!(
+                matching.len() < 2,
+                "found more than one task matching the given criteria",
+            );
+            let task = &matching[0];
+            let completions = task.completions()?;
+
+            let mut stdout = std::io::stdout().lock();
+            for (i, c) in completions.iter().enumerate() {
+                write!(stdout, "{}", c.name.as_str())?;
+                if let Some(module_name) = c.module_name {
+                    write!(stdout, " (module: {module_name})")?;
+                }
+                if task.cursor.answer.matches(c) {
+                    write!(stdout, " (*, {}/{})", i + 1, completions.len())?;
+                }
+                writeln!(stdout)?;
+            }
+            writeln!(stdout, "-----")?;
+            writeln!(stdout, "found {} completions", completions.len())?;
+            Ok(ExitCode::SUCCESS)
+        }
+        Command::All(AllCommand {
+            threshold,
+            tasks,
+            keep_tmp_dir,
+        }) => {
+            tmp_eval_dir.disable_cleanup(keep_tmp_dir);
+
+            let mut precision_sum = 0.0;
+            let mut task_count = 0.0f64;
+            let mut results_wtr = None;
+            if let Some(ref tasks) = tasks {
+                let mut wtr = csv::Writer::from_path(SystemPath::new(tasks))?;
+                wtr.serialize(("name", "file", "index", "rank"))?;
+                results_wtr = Some(wtr);
+            }
+            for source in &sources {
+                for task in source.to_tasks(&tmp_eval_path)? {
+                    task_count += 1.0;
+
+                    let completions = task.completions()?;
+                    let rank = task.rank(&completions)?;
+                    precision_sum += rank.map(|rank| 1.0 / f64::from(rank)).unwrap_or(0.0);
+                    if let Some(ref mut wtr) = results_wtr {
+                        wtr.serialize((&task.name, &task.cursor_name(), task.cursor.index, rank))?;
+                    }
+                }
+            }
+            let mrr = precision_sum / task_count;
+            if let Some(ref mut wtr) = results_wtr {
+                wtr.flush()?;
+            }
+
+            let mut out = std::io::stdout().lock();
+            writeln!(out, "mean reciprocal rank: {mrr:.4}")?;
+            if mrr < threshold {
+                writeln!(
+                    out,
+                    "Failure: MRR does not exceed minimum threshold of {threshold}"
+                )?;
+                Ok(ExitCode::FAILURE)
+            } else {
+                writeln!(out, "Success: MRR exceeds minimum threshold of {threshold}")?;
+                Ok(ExitCode::SUCCESS)
+            }
+        }
+    }
+}
+
+/// A single completion task.
+///
+/// The task is oriented in such a way that we have a single "cursor"
+/// position in a Python project. This allows us to ask for completions
+/// at that position.
+struct Task {
+    db: ProjectDatabase,
+    dir: SystemPathBuf,
+    name: String,
+    cursor: Cursor,
+    settings: ty_ide::CompletionSettings,
+}
+
+impl Task {
+    /// Create a new task for the Python project at `project_path`.
+    ///
+    /// `truth` should correspond to the completion configuration and the
+    /// expected answer for completions at the given `cursor` position.
+    fn new(
+        project_path: &SystemPath,
+        truth: &CompletionTruth,
+        cursor: Cursor,
+    ) -> anyhow::Result<Task> {
+        let name = project_path.file_name().ok_or_else(|| {
+            anyhow::anyhow!("project directory `{project_path}` does not contain a base name")
+        })?;
+
+        let system = OsSystem::new(project_path);
+        let mut project_metadata = ProjectMetadata::discover(project_path, &system)?;
+        // Explicitly point ty to the .venv to avoid any set VIRTUAL_ENV variable to take precedence.
+        project_metadata.apply_options(Options {
+            environment: Some(EnvironmentOptions {
+                python: Some(RelativePathBuf::cli(".venv")),
+                ..EnvironmentOptions::default()
+            }),
+            ..Options::default()
+        });
+        project_metadata.apply_configuration_files(&system)?;
+        let db = ProjectDatabase::new(project_metadata, system)?;
+        Ok(Task {
+            db,
+            dir: project_path.to_path_buf(),
+            name: name.to_string(),
+            cursor,
+            settings: (&truth.settings).into(),
+        })
+    }
+
+    /// Returns the rank of the expected answer in the completions
+    /// given.
+    ///
+    /// The rank is the position (one indexed) at which the expected
+    /// answer appears in the slice given, or `None` if the answer
+    /// isn't found at all. A position of zero is maximally correct. A
+    /// missing position is maximally wrong. Anything in the middle is
+    /// a grey area with a lower rank being better.
+    ///
+    /// Because the rank is one indexed, if this returns a rank, then
+    /// it is guaranteed to be non-zero.
+    fn rank(&self, completions: &[Completion<'_>]) -> anyhow::Result<Option<u32>> {
+        completions
+            .iter()
+            .position(|completion| self.cursor.answer.matches(completion))
+            .map(|rank| u32::try_from(rank + 1).context("rank of completion is too big"))
+            .transpose()
+    }
+
+    /// Return completions for this task.
+    fn completions(&self) -> anyhow::Result<Vec<Completion<'_>>> {
+        let file = system_path_to_file(&self.db, &self.cursor.path)
+            .with_context(|| format!("failed to get database file for `{}`", self.cursor.path))?;
+        let offset = ruff_text_size::TextSize::try_from(self.cursor.offset).with_context(|| {
+            format!(
+                "failed to convert `<CURSOR>` file offset `{}` to 32-bit integer",
+                self.cursor.offset
+            )
+        })?;
+        let completions = ty_ide::completion(&self.db, &self.settings, file, offset);
+        Ok(completions)
+    }
+
+    /// Returns the file name, relative to this project's root
+    /// directory, that contains the cursor directive that we
+    /// are evaluating.
+    fn cursor_name(&self) -> &str {
+        self.cursor
+            .path
+            .strip_prefix(&self.dir)
+            .expect("task directory is a parent of cursor")
+            .as_str()
+    }
+}
+
+impl std::fmt::Debug for Task {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.debug_struct("Test")
+            .field("db", &"<ProjectDatabase>")
+            .field("dir", &self.dir)
+            .field("name", &self.name)
+            .field("cursor", &self.cursor)
+            .field("settings", &self.settings)
+            .finish()
+    }
+}
+
+/// Truth data for a single completion evaluation test.
+#[derive(Debug, Default, serde::Deserialize)]
+#[serde(rename_all = "kebab-case")]
+struct CompletionTruth {
+    #[serde(default)]
+    settings: CompletionSettings,
+}
+
+/// Settings to forward to our completion routine.
+#[derive(Debug, Default, serde::Deserialize)]
+#[serde(rename_all = "kebab-case")]
+struct CompletionSettings {
+    #[serde(default)]
+    auto_import: bool,
+}
+
+impl From<&CompletionSettings> for ty_ide::CompletionSettings {
+    fn from(x: &CompletionSettings) -> ty_ide::CompletionSettings {
+        ty_ide::CompletionSettings {
+            auto_import: x.auto_import,
+        }
+    }
+}
+
+/// The "source" of a task, as found in ty's git repository.
+#[derive(Debug)]
+struct TaskSource {
+    /// The directory containing this task.
+    dir: SystemPathBuf,
+    /// The name of this task (the basename of `dir`).
+    name: String,
+    /// The "truth" data for this task along with any
+    /// settings. This is pulled from `{dir}/completion.toml`.
+    truth: CompletionTruth,
+}
+
+impl TaskSource {
+    fn all(src_dir: &SystemPath) -> anyhow::Result<Vec<TaskSource>> {
+        let mut sources = vec![];
+        let read_dir = src_dir
+            .as_std_path()
+            .read_dir()
+            .with_context(|| format!("failed to read directory entries in `{src_dir}`"))?;
+        for result in read_dir {
+            let dent = result
+                .with_context(|| format!("failed to get directory entry from `{src_dir}`"))?;
+            let path = dent.path();
+            if !path.is_dir() {
+                continue;
+            }
+
+            let dir = SystemPath::from_std_path(&path).ok_or_else(|| {
+                anyhow::anyhow!(
+                    "truth source directory `{path}` contains invalid UTF-8",
+                    path = path.display()
+                )
+            })?;
+            sources.push(TaskSource::new(dir)?);
+        }
+        // Sort our sources so that we always run in the same order.
+        // And also so that the CSV output is deterministic across
+        // all platforms.
+        sources.sort_by(|source1, source2| source1.name.cmp(&source2.name));
+        Ok(sources)
+    }
+
+    fn new(dir: &SystemPath) -> anyhow::Result<TaskSource> {
+        let name = dir.file_name().ok_or_else(|| {
+            anyhow::anyhow!("truth source directory `{dir}` does not contain a base name")
+        })?;
+
+        let truth_path = dir.join("completion.toml");
+        let truth_data = std::fs::read(truth_path.as_std_path())
+            .with_context(|| format!("failed to read truth data at `{truth_path}`"))?;
+        let truth = toml::from_slice(&truth_data).with_context(|| {
+            format!("failed to parse TOML completion truth data from `{truth_path}`")
+        })?;
+
+        Ok(TaskSource {
+            dir: dir.to_path_buf(),
+            name: name.to_string(),
+            truth,
+        })
+    }
+
+    /// Convert this "source" task (from the Ruff repository) into
+    /// one or more evaluation tasks within a single Python project.
+    /// Exactly one task is created for each cursor directive found in
+    /// this source task.
+    ///
+    /// This includes running `uv sync` to set up a full virtual
+    /// environment.
+    fn to_tasks(&self, parent_dst_dir: &SystemPath) -> anyhow::Result<Vec<Task>> {
+        let dir = parent_dst_dir.join(&self.name);
+        let cursors = copy_project(&self.dir, &dir)?;
+        let uv_sync_output = std::process::Command::new("uv")
+            .arg("sync")
+            .current_dir(dir.as_std_path())
+            .output()
+            .with_context(|| format!("failed to run `uv sync` in `{dir}`"))?;
+        if !uv_sync_output.status.success() {
+            let code = uv_sync_output
+                .status
+                .code()
+                .map(|code| code.to_string())
+                .unwrap_or_else(|| "UNKNOWN".to_string());
+            let stderr = bstr::BStr::new(&uv_sync_output.stderr);
+            anyhow::bail!("`uv sync` failed to run with exit code `{code}`, stderr: {stderr}")
+        }
+        cursors
+            .into_iter()
+            .map(|cursor| Task::new(&dir, &self.truth, cursor))
+            .collect()
+    }
+}
+
+/// A single cursor directive within a single Python project.
+///
+/// Each cursor directive looks like:
+/// `<CURSOR [expected-module.]expected-symbol>`.
+///
+/// That is, each cursor directive corresponds to a single completion
+/// request, and each request is a single evaluation task.
+#[derive(Clone, Debug)]
+struct Cursor {
+    /// The path to the file containing this directive.
+    path: SystemPathBuf,
+    /// The index (starting at 0) of this cursor directive
+    /// within `path`.
+    index: usize,
+    /// The byte offset at which this cursor was located
+    /// within `path`.
+    offset: usize,
+    /// The expected symbol (and optionally module) for this
+    /// completion request.
+    answer: CompletionAnswer,
+}
+
+/// The answer for a single completion request.
+#[derive(Clone, Debug, Default, serde::Deserialize)]
+#[serde(rename_all = "kebab-case")]
+struct CompletionAnswer {
+    symbol: String,
+    module: Option<String>,
+}
+
+impl CompletionAnswer {
+    /// Returns true when this answer matches the completion given.
+    fn matches(&self, completion: &Completion) -> bool {
+        self.symbol == completion.name.as_str()
+            && self.module.as_deref() == completion.module_name.map(ModuleName::as_str)
+    }
+}
+
+/// Copy the Python project from `src_dir` to `dst_dir`.
+///
+/// This also looks for occurrences of cursor directives among the
+/// project files and returns them. The original cursor directives are
+/// deleted.
+///
+/// Hidden files or directories are skipped.
+///
+/// # Errors
+///
+/// Any underlying I/O errors are bubbled up. Also, if no cursor
+/// directives are found, then an error is returned. This guarantees
+/// that the `Vec<Cursor>` is always non-empty.
+fn copy_project(src_dir: &SystemPath, dst_dir: &SystemPath) -> anyhow::Result<Vec<Cursor>> {
+    std::fs::create_dir_all(dst_dir).with_context(|| dst_dir.to_string())?;
+
+    let mut cursors = vec![];
+    for result in walkdir::WalkDir::new(src_dir.as_std_path()) {
+        let dent =
+            result.with_context(|| format!("failed to get directory entry from {src_dir}"))?;
+        if dent
+            .file_name()
+            .to_str()
+            .is_some_and(|name| name.starts_with('.'))
+        {
+            continue;
+        }
+
+        let src = SystemPath::from_std_path(dent.path()).ok_or_else(|| {
+            anyhow::anyhow!("path `{}` is not valid UTF-8", dent.path().display())
+        })?;
+        let name = src
+            .strip_prefix(src_dir)
+            .expect("descendent of `src_dir` must start with `src`");
+        // let name = src
+        // .file_name()
+        // .ok_or_else(|| anyhow::anyhow!("path `{src}` is missing a basename"))?;
+        let dst = dst_dir.join(name);
+        if dent.file_type().is_dir() {
+            std::fs::create_dir_all(dst.as_std_path())
+                .with_context(|| format!("failed to create directory `{dst}`"))?;
+        } else {
+            cursors.extend(copy_file(src, &dst)?);
+        }
+    }
+    anyhow::ensure!(
+        !cursors.is_empty(),
+        "could not find any `<CURSOR>` directives in any of the files in `{src_dir}`",
+    );
+    Ok(cursors)
+}
+
+/// Copies `src` to `dst` while looking for cursor directives.
+///
+/// Each cursor directive looks like:
+/// `<CURSOR [expected-module.]expected-symbol>`.
+///
+/// When occurrences of cursor directives are found, then they are
+/// replaced with the empty string. The position of each occurrence is
+/// recorded, which points to the correct place in a document where all
+/// cursor directives are omitted.
+///
+/// # Errors
+///
+/// When an underlying I/O error occurs.
+fn copy_file(src: &SystemPath, dst: &SystemPath) -> anyhow::Result<Vec<Cursor>> {
+    static RE: LazyLock<Regex> = LazyLock::new(|| {
+        // Our module/symbol identifier regex here is certainly more
+        // permissive than necessary, but I think that should be fine
+        // for this silly little syntax. ---AG
+        Regex::new(r"<CURSOR:\s*(?:(?<module>[\S--.]+)\.)?(?<symbol>[\S--.]+)>").unwrap()
+    });
+
+    let src_data =
+        std::fs::read(src).with_context(|| format!("failed to read `{src}` for copying"))?;
+    let mut cursors = vec![];
+    // The new data, without cursor directives.
+    let mut new = Vec::with_capacity(src_data.len());
+    // An index into `src_data` corresponding to either the start of
+    // the data or the end of the previous cursor directive that we
+    // found.
+    let mut prev_match_end = 0;
+    // The total bytes removed so far by replacing cursor directives
+    // with empty strings.
+    let mut bytes_removed = 0;
+    for (index, caps) in RE.captures_iter(&src_data).enumerate() {
+        let overall = caps.get(0).expect("zeroth group is always available");
+        new.extend_from_slice(&src_data[prev_match_end..overall.start()]);
+        prev_match_end = overall.end();
+        let offset = overall.start() - bytes_removed;
+        bytes_removed += overall.len();
+
+        let symbol = str::from_utf8(&caps["symbol"])
+            .context("expected symbol in cursor directive in `{src}` is not valid UTF-8")?
+            .to_string();
+        let module = caps
+            .name("module")
+            .map(|module| {
+                str::from_utf8(module.as_bytes())
+                    .context("expected module in cursor directive in `{src}` is not valid UTF-8")
+            })
+            .transpose()?
+            .map(ToString::to_string);
+        let answer = CompletionAnswer { symbol, module };
+        cursors.push(Cursor {
+            path: dst.to_path_buf(),
+            index,
+            offset,
+            answer,
+        });
+    }
+    new.extend_from_slice(&src_data[prev_match_end..]);
+    std::fs::write(dst, &new)
+        .with_context(|| format!("failed to write contents of `{src}` to `{dst}`"))?;
+    Ok(cursors)
+}
diff --git a/crates/ty_completion_eval/truth/README.md b/crates/ty_completion_eval/truth/README.md
new file mode 100644
index 0000000000..04faaff120
--- /dev/null
+++ b/crates/ty_completion_eval/truth/README.md
@@ -0,0 +1,11 @@
+This directory contains truth data for ty's completion evaluation.
+
+# Adding new truth data
+
+To add new truth data, you can either add a new `<CURSOR>` directive to an
+existing Python project in this directory or create a new Python project. To
+create a new directory, just `cp -a existing new` and modify it as needed. Then:
+
+1. Check `completion.toml` for relevant settings.
+2. Run `uv.lock` after updating `pyproject.toml` (if necessary) to ensure the
+   dependency versions are locked.
diff --git a/crates/ty_completion_eval/truth/fstring-completions/completion.toml b/crates/ty_completion_eval/truth/fstring-completions/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/fstring-completions/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/fstring-completions/main.py b/crates/ty_completion_eval/truth/fstring-completions/main.py
new file mode 100644
index 0000000000..767245df1e
--- /dev/null
+++ b/crates/ty_completion_eval/truth/fstring-completions/main.py
@@ -0,0 +1,3 @@
+zqzqzq_identifier = 1
+
+print(f"{zqzqzq_<CURSOR: zqzqzq_identifier>}")
diff --git a/crates/ty_completion_eval/truth/fstring-completions/pyproject.toml b/crates/ty_completion_eval/truth/fstring-completions/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/fstring-completions/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/fstring-completions/uv.lock b/crates/ty_completion_eval/truth/fstring-completions/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/fstring-completions/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/higher-level-symbols-preferred/completion.toml b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/higher-level-symbols-preferred/main.py b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/main.py
new file mode 100644
index 0000000000..1b51434c34
--- /dev/null
+++ b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/main.py
@@ -0,0 +1,9 @@
+# This is similar to the `numpy-array` test case,
+# where the completions returned don't contain
+# the expected symbol at all.
+ZQZQZQ_<CURSOR: sub1.ZQZQZQ_SOMETHING_IMPORTANT>
+
+import sub1
+# This works though, so ty sees the symbol where
+# as our auto-import symbol finder does not.
+sub1.ZQZQZQ_<CURSOR: ZQZQZQ_SOMETHING_IMPORTANT>
diff --git a/crates/ty_completion_eval/truth/higher-level-symbols-preferred/pyproject.toml b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/higher-level-symbols-preferred/sub1/__init__.py b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/sub1/__init__.py
new file mode 100644
index 0000000000..bb63d6e6fa
--- /dev/null
+++ b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/sub1/__init__.py
@@ -0,0 +1 @@
+from .sub2 import ZQZQZQ_SOMETHING_IMPORTANT
diff --git a/crates/ty_completion_eval/truth/higher-level-symbols-preferred/sub1/sub2.py b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/sub1/sub2.py
new file mode 100644
index 0000000000..80af7480e8
--- /dev/null
+++ b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/sub1/sub2.py
@@ -0,0 +1 @@
+ZQZQZQ_SOMETHING_IMPORTANT = 1
diff --git a/crates/ty_completion_eval/truth/higher-level-symbols-preferred/uv.lock b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/higher-level-symbols-preferred/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-dunder/__zqzqzq/__init__.py b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/__zqzqzq/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-dunder/completion.toml b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-dunder/main.py b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/main.py
new file mode 100644
index 0000000000..b01754269f
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/main.py
@@ -0,0 +1,4 @@
+# This checks that we prioritize modules without
+# preceding double underscores over modules with
+# preceding double underscores.
+import zqzq<CURSOR: zqzqzq>
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-dunder/pyproject.toml b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-dunder/uv.lock b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-dunder/zqzqzq/__init__.py b/crates/ty_completion_eval/truth/import-deprioritizes-dunder/zqzqzq/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-sunder/_zqzqzq/__init__.py b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/_zqzqzq/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-sunder/completion.toml b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-sunder/main.py b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/main.py
new file mode 100644
index 0000000000..3e235fee41
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/main.py
@@ -0,0 +1,4 @@
+# This checks that we prioritize modules without
+# preceding underscores over modules with
+# preceding underscores.
+import zqzq<CURSOR: zqzqzq>
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-sunder/pyproject.toml b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-sunder/uv.lock b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-sunder/zqzqzq/__init__.py b/crates/ty_completion_eval/truth/import-deprioritizes-sunder/zqzqzq/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/completion.toml b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/main.py b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/main.py
new file mode 100644
index 0000000000..52dd9ee9f8
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/main.py
@@ -0,0 +1,12 @@
+from module import UniquePrefixA<CURSOR:UniquePrefixAzurous>
+from module import unique_prefix_<CURSOR:unique_prefix_azurous>
+
+from module import Class
+
+Class.meth_<CURSOR:meth_azurous>
+
+# TODO: bound methods don't preserve type-check-only-ness, this is a bug
+Class().meth_<CURSOR:meth_azurous>
+
+# TODO: auto-imports don't take type-check-only-ness into account, this is a bug
+UniquePrefixA<CURSOR:module.UniquePrefixAzurous>
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/module.py b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/module.py
new file mode 100644
index 0000000000..9fd5998768
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/module.py
@@ -0,0 +1,20 @@
+from typing import type_check_only
+
+
+@type_check_only
+class UniquePrefixApple: pass
+
+class UniquePrefixAzurous: pass
+
+
+@type_check_only
+def unique_prefix_apple() -> None: pass
+
+def unique_prefix_azurous() -> None: pass
+
+
+class Class:
+    @type_check_only
+    def meth_apple(self) -> None: pass
+
+    def meth_azurous(self) -> None: pass
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/pyproject.toml b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/uv.lock b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/import-deprioritizes-type_check_only/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/internal-typeshed-hidden/completion.toml b/crates/ty_completion_eval/truth/internal-typeshed-hidden/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/internal-typeshed-hidden/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/internal-typeshed-hidden/main.py b/crates/ty_completion_eval/truth/internal-typeshed-hidden/main.py
new file mode 100644
index 0000000000..e6deffd78c
--- /dev/null
+++ b/crates/ty_completion_eval/truth/internal-typeshed-hidden/main.py
@@ -0,0 +1,9 @@
+# This is a case where a symbol from an internal module appears
+# before the desired symbol from `typing`.
+#
+# We use a slightly different example than the one reported in
+# the issue to capture the deficiency via ranking. That is, in
+# astral-sh/ty#1274, the (current) top suggestion is the correct one.
+#
+# ref: https://github.com/astral-sh/ty/issues/1274#issuecomment-3345923575
+NoneTy<CURSOR: types.NoneType>
diff --git a/crates/ty_completion_eval/truth/internal-typeshed-hidden/pyproject.toml b/crates/ty_completion_eval/truth/internal-typeshed-hidden/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/internal-typeshed-hidden/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/internal-typeshed-hidden/uv.lock b/crates/ty_completion_eval/truth/internal-typeshed-hidden/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/internal-typeshed-hidden/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/none-completion/completion.toml b/crates/ty_completion_eval/truth/none-completion/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/none-completion/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/none-completion/main.py b/crates/ty_completion_eval/truth/none-completion/main.py
new file mode 100644
index 0000000000..4f5674c1ee
--- /dev/null
+++ b/crates/ty_completion_eval/truth/none-completion/main.py
@@ -0,0 +1 @@
+x = Non<CURSOR: None>
diff --git a/crates/ty_completion_eval/truth/none-completion/pyproject.toml b/crates/ty_completion_eval/truth/none-completion/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/none-completion/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/none-completion/uv.lock b/crates/ty_completion_eval/truth/none-completion/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/none-completion/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/numpy-array/completion.toml b/crates/ty_completion_eval/truth/numpy-array/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/numpy-array/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/numpy-array/main.py b/crates/ty_completion_eval/truth/numpy-array/main.py
new file mode 100644
index 0000000000..2821f8d2ef
--- /dev/null
+++ b/crates/ty_completion_eval/truth/numpy-array/main.py
@@ -0,0 +1,16 @@
+# This one is tricky because `array` is an exported
+# symbol in a whole bunch of numpy internal modules.
+#
+# At time of writing (2025-10-07), the right completion
+# doesn't actually show up at all in the suggestions
+# returned. In fact, nothing from the top-level `numpy`
+# module shows up.
+arra<CURSOR: numpy.array>
+
+import numpy as np
+# In contrast to above, this *does* include the correct
+# completion. So there is likely some kind of bug in our
+# symbol discovery code for auto-import that isn't present
+# when using ty to discover symbols (which is likely far
+# too expensive to use across all dependencies).
+np.arra<CURSOR: array>
diff --git a/crates/ty_completion_eval/truth/numpy-array/pyproject.toml b/crates/ty_completion_eval/truth/numpy-array/pyproject.toml
new file mode 100644
index 0000000000..d6d826a55a
--- /dev/null
+++ b/crates/ty_completion_eval/truth/numpy-array/pyproject.toml
@@ -0,0 +1,7 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = [
+    "numpy>=2.3.3",
+]
diff --git a/crates/ty_completion_eval/truth/numpy-array/uv.lock b/crates/ty_completion_eval/truth/numpy-array/uv.lock
new file mode 100644
index 0000000000..e8c432b755
--- /dev/null
+++ b/crates/ty_completion_eval/truth/numpy-array/uv.lock
@@ -0,0 +1,66 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "numpy"
+version = "2.3.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d0/19/95b3d357407220ed24c139018d2518fab0a61a948e68286a25f1a4d049ff/numpy-2.3.3.tar.gz", hash = "sha256:ddc7c39727ba62b80dfdbedf400d1c10ddfa8eefbd7ec8dcb118be8b56d31029", size = 20576648, upload-time = "2025-09-09T16:54:12.543Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7d/b9/984c2b1ee61a8b803bf63582b4ac4242cf76e2dbd663efeafcb620cc0ccb/numpy-2.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f5415fb78995644253370985342cd03572ef8620b934da27d77377a2285955bf", size = 20949588, upload-time = "2025-09-09T15:56:59.087Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/e4/07970e3bed0b1384d22af1e9912527ecbeb47d3b26e9b6a3bced068b3bea/numpy-2.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d00de139a3324e26ed5b95870ce63be7ec7352171bc69a4cf1f157a48e3eb6b7", size = 14177802, upload-time = "2025-09-09T15:57:01.73Z" },
+    { url = "https://files.pythonhosted.org/packages/35/c7/477a83887f9de61f1203bad89cf208b7c19cc9fef0cebef65d5a1a0619f2/numpy-2.3.3-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:9dc13c6a5829610cc07422bc74d3ac083bd8323f14e2827d992f9e52e22cd6a6", size = 5106537, upload-time = "2025-09-09T15:57:03.765Z" },
+    { url = "https://files.pythonhosted.org/packages/52/47/93b953bd5866a6f6986344d045a207d3f1cfbad99db29f534ea9cee5108c/numpy-2.3.3-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:d79715d95f1894771eb4e60fb23f065663b2298f7d22945d66877aadf33d00c7", size = 6640743, upload-time = "2025-09-09T15:57:07.921Z" },
+    { url = "https://files.pythonhosted.org/packages/23/83/377f84aaeb800b64c0ef4de58b08769e782edcefa4fea712910b6f0afd3c/numpy-2.3.3-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:952cfd0748514ea7c3afc729a0fc639e61655ce4c55ab9acfab14bda4f402b4c", size = 14278881, upload-time = "2025-09-09T15:57:11.349Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/a5/bf3db6e66c4b160d6ea10b534c381a1955dfab34cb1017ea93aa33c70ed3/numpy-2.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5b83648633d46f77039c29078751f80da65aa64d5622a3cd62aaef9d835b6c93", size = 16636301, upload-time = "2025-09-09T15:57:14.245Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/59/1287924242eb4fa3f9b3a2c30400f2e17eb2707020d1c5e3086fe7330717/numpy-2.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b001bae8cea1c7dfdb2ae2b017ed0a6f2102d7a70059df1e338e307a4c78a8ae", size = 16053645, upload-time = "2025-09-09T15:57:16.534Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/93/b3d47ed882027c35e94ac2320c37e452a549f582a5e801f2d34b56973c97/numpy-2.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8e9aced64054739037d42fb84c54dd38b81ee238816c948c8f3ed134665dcd86", size = 18578179, upload-time = "2025-09-09T15:57:18.883Z" },
+    { url = "https://files.pythonhosted.org/packages/20/d9/487a2bccbf7cc9d4bfc5f0f197761a5ef27ba870f1e3bbb9afc4bbe3fcc2/numpy-2.3.3-cp313-cp313-win32.whl", hash = "sha256:9591e1221db3f37751e6442850429b3aabf7026d3b05542d102944ca7f00c8a8", size = 6312250, upload-time = "2025-09-09T15:57:21.296Z" },
+    { url = "https://files.pythonhosted.org/packages/1b/b5/263ebbbbcede85028f30047eab3d58028d7ebe389d6493fc95ae66c636ab/numpy-2.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:f0dadeb302887f07431910f67a14d57209ed91130be0adea2f9793f1a4f817cf", size = 12783269, upload-time = "2025-09-09T15:57:23.034Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/75/67b8ca554bbeaaeb3fac2e8bce46967a5a06544c9108ec0cf5cece559b6c/numpy-2.3.3-cp313-cp313-win_arm64.whl", hash = "sha256:3c7cf302ac6e0b76a64c4aecf1a09e51abd9b01fc7feee80f6c43e3ab1b1dbc5", size = 10195314, upload-time = "2025-09-09T15:57:25.045Z" },
+    { url = "https://files.pythonhosted.org/packages/11/d0/0d1ddec56b162042ddfafeeb293bac672de9b0cfd688383590090963720a/numpy-2.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:eda59e44957d272846bb407aad19f89dc6f58fecf3504bd144f4c5cf81a7eacc", size = 21048025, upload-time = "2025-09-09T15:57:27.257Z" },
+    { url = "https://files.pythonhosted.org/packages/36/9e/1996ca6b6d00415b6acbdd3c42f7f03ea256e2c3f158f80bd7436a8a19f3/numpy-2.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:823d04112bc85ef5c4fda73ba24e6096c8f869931405a80aa8b0e604510a26bc", size = 14301053, upload-time = "2025-09-09T15:57:30.077Z" },
+    { url = "https://files.pythonhosted.org/packages/05/24/43da09aa764c68694b76e84b3d3f0c44cb7c18cdc1ba80e48b0ac1d2cd39/numpy-2.3.3-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:40051003e03db4041aa325da2a0971ba41cf65714e65d296397cc0e32de6018b", size = 5229444, upload-time = "2025-09-09T15:57:32.733Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/14/50ffb0f22f7218ef8af28dd089f79f68289a7a05a208db9a2c5dcbe123c1/numpy-2.3.3-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:6ee9086235dd6ab7ae75aba5662f582a81ced49f0f1c6de4260a78d8f2d91a19", size = 6738039, upload-time = "2025-09-09T15:57:34.328Z" },
+    { url = "https://files.pythonhosted.org/packages/55/52/af46ac0795e09657d45a7f4db961917314377edecf66db0e39fa7ab5c3d3/numpy-2.3.3-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:94fcaa68757c3e2e668ddadeaa86ab05499a70725811e582b6a9858dd472fb30", size = 14352314, upload-time = "2025-09-09T15:57:36.255Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/b1/dc226b4c90eb9f07a3fff95c2f0db3268e2e54e5cce97c4ac91518aee71b/numpy-2.3.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:da1a74b90e7483d6ce5244053399a614b1d6b7bc30a60d2f570e5071f8959d3e", size = 16701722, upload-time = "2025-09-09T15:57:38.622Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/9d/9d8d358f2eb5eced14dba99f110d83b5cd9a4460895230f3b396ad19a323/numpy-2.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:2990adf06d1ecee3b3dcbb4977dfab6e9f09807598d647f04d385d29e7a3c3d3", size = 16132755, upload-time = "2025-09-09T15:57:41.16Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/27/b3922660c45513f9377b3fb42240bec63f203c71416093476ec9aa0719dc/numpy-2.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:ed635ff692483b8e3f0fcaa8e7eb8a75ee71aa6d975388224f70821421800cea", size = 18651560, upload-time = "2025-09-09T15:57:43.459Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/8e/3ab61a730bdbbc201bb245a71102aa609f0008b9ed15255500a99cd7f780/numpy-2.3.3-cp313-cp313t-win32.whl", hash = "sha256:a333b4ed33d8dc2b373cc955ca57babc00cd6f9009991d9edc5ddbc1bac36bcd", size = 6442776, upload-time = "2025-09-09T15:57:45.793Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/3a/e22b766b11f6030dc2decdeff5c2fb1610768055603f9f3be88b6d192fb2/numpy-2.3.3-cp313-cp313t-win_amd64.whl", hash = "sha256:4384a169c4d8f97195980815d6fcad04933a7e1ab3b530921c3fef7a1c63426d", size = 12927281, upload-time = "2025-09-09T15:57:47.492Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/42/c2e2bc48c5e9b2a83423f99733950fbefd86f165b468a3d85d52b30bf782/numpy-2.3.3-cp313-cp313t-win_arm64.whl", hash = "sha256:75370986cc0bc66f4ce5110ad35aae6d182cc4ce6433c40ad151f53690130bf1", size = 10265275, upload-time = "2025-09-09T15:57:49.647Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/01/342ad585ad82419b99bcf7cebe99e61da6bedb89e213c5fd71acc467faee/numpy-2.3.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:cd052f1fa6a78dee696b58a914b7229ecfa41f0a6d96dc663c1220a55e137593", size = 20951527, upload-time = "2025-09-09T15:57:52.006Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/d8/204e0d73fc1b7a9ee80ab1fe1983dd33a4d64a4e30a05364b0208e9a241a/numpy-2.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:414a97499480067d305fcac9716c29cf4d0d76db6ebf0bf3cbce666677f12652", size = 14186159, upload-time = "2025-09-09T15:57:54.407Z" },
+    { url = "https://files.pythonhosted.org/packages/22/af/f11c916d08f3a18fb8ba81ab72b5b74a6e42ead4c2846d270eb19845bf74/numpy-2.3.3-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:50a5fe69f135f88a2be9b6ca0481a68a136f6febe1916e4920e12f1a34e708a7", size = 5114624, upload-time = "2025-09-09T15:57:56.5Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/11/0ed919c8381ac9d2ffacd63fd1f0c34d27e99cab650f0eb6f110e6ae4858/numpy-2.3.3-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:b912f2ed2b67a129e6a601e9d93d4fa37bef67e54cac442a2f588a54afe5c67a", size = 6642627, upload-time = "2025-09-09T15:57:58.206Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/83/deb5f77cb0f7ba6cb52b91ed388b47f8f3c2e9930d4665c600408d9b90b9/numpy-2.3.3-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9e318ee0596d76d4cb3d78535dc005fa60e5ea348cd131a51e99d0bdbe0b54fe", size = 14296926, upload-time = "2025-09-09T15:58:00.035Z" },
+    { url = "https://files.pythonhosted.org/packages/77/cc/70e59dcb84f2b005d4f306310ff0a892518cc0c8000a33d0e6faf7ca8d80/numpy-2.3.3-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ce020080e4a52426202bdb6f7691c65bb55e49f261f31a8f506c9f6bc7450421", size = 16638958, upload-time = "2025-09-09T15:58:02.738Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/5a/b2ab6c18b4257e099587d5b7f903317bd7115333ad8d4ec4874278eafa61/numpy-2.3.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e6687dc183aa55dae4a705b35f9c0f8cb178bcaa2f029b241ac5356221d5c021", size = 16071920, upload-time = "2025-09-09T15:58:05.029Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/f1/8b3fdc44324a259298520dd82147ff648979bed085feeacc1250ef1656c0/numpy-2.3.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d8f3b1080782469fdc1718c4ed1d22549b5fb12af0d57d35e992158a772a37cf", size = 18577076, upload-time = "2025-09-09T15:58:07.745Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/a1/b87a284fb15a42e9274e7fcea0dad259d12ddbf07c1595b26883151ca3b4/numpy-2.3.3-cp314-cp314-win32.whl", hash = "sha256:cb248499b0bc3be66ebd6578b83e5acacf1d6cb2a77f2248ce0e40fbec5a76d0", size = 6366952, upload-time = "2025-09-09T15:58:10.096Z" },
+    { url = "https://files.pythonhosted.org/packages/70/5f/1816f4d08f3b8f66576d8433a66f8fa35a5acfb3bbd0bf6c31183b003f3d/numpy-2.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:691808c2b26b0f002a032c73255d0bd89751425f379f7bcd22d140db593a96e8", size = 12919322, upload-time = "2025-09-09T15:58:12.138Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/de/072420342e46a8ea41c324a555fa90fcc11637583fb8df722936aed1736d/numpy-2.3.3-cp314-cp314-win_arm64.whl", hash = "sha256:9ad12e976ca7b10f1774b03615a2a4bab8addce37ecc77394d8e986927dc0dfe", size = 10478630, upload-time = "2025-09-09T15:58:14.64Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/df/ee2f1c0a9de7347f14da5dd3cd3c3b034d1b8607ccb6883d7dd5c035d631/numpy-2.3.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9cc48e09feb11e1db00b320e9d30a4151f7369afb96bd0e48d942d09da3a0d00", size = 21047987, upload-time = "2025-09-09T15:58:16.889Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/92/9453bdc5a4e9e69cf4358463f25e8260e2ffc126d52e10038b9077815989/numpy-2.3.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:901bf6123879b7f251d3631967fd574690734236075082078e0571977c6a8e6a", size = 14301076, upload-time = "2025-09-09T15:58:20.343Z" },
+    { url = "https://files.pythonhosted.org/packages/13/77/1447b9eb500f028bb44253105bd67534af60499588a5149a94f18f2ca917/numpy-2.3.3-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:7f025652034199c301049296b59fa7d52c7e625017cae4c75d8662e377bf487d", size = 5229491, upload-time = "2025-09-09T15:58:22.481Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/f9/d72221b6ca205f9736cb4b2ce3b002f6e45cd67cd6a6d1c8af11a2f0b649/numpy-2.3.3-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:533ca5f6d325c80b6007d4d7fb1984c303553534191024ec6a524a4c92a5935a", size = 6737913, upload-time = "2025-09-09T15:58:24.569Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/5f/d12834711962ad9c46af72f79bb31e73e416ee49d17f4c797f72c96b6ca5/numpy-2.3.3-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0edd58682a399824633b66885d699d7de982800053acf20be1eaa46d92009c54", size = 14352811, upload-time = "2025-09-09T15:58:26.416Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/0d/fdbec6629d97fd1bebed56cd742884e4eead593611bbe1abc3eb40d304b2/numpy-2.3.3-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:367ad5d8fbec5d9296d18478804a530f1191e24ab4d75ab408346ae88045d25e", size = 16702689, upload-time = "2025-09-09T15:58:28.831Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/09/0a35196dc5575adde1eb97ddfbc3e1687a814f905377621d18ca9bc2b7dd/numpy-2.3.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8f6ac61a217437946a1fa48d24c47c91a0c4f725237871117dea264982128097", size = 16133855, upload-time = "2025-09-09T15:58:31.349Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/ca/c9de3ea397d576f1b6753eaa906d4cdef1bf97589a6d9825a349b4729cc2/numpy-2.3.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:179a42101b845a816d464b6fe9a845dfaf308fdfc7925387195570789bb2c970", size = 18652520, upload-time = "2025-09-09T15:58:33.762Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/c2/e5ed830e08cd0196351db55db82f65bc0ab05da6ef2b72a836dcf1936d2f/numpy-2.3.3-cp314-cp314t-win32.whl", hash = "sha256:1250c5d3d2562ec4174bce2e3a1523041595f9b651065e4a4473f5f48a6bc8a5", size = 6515371, upload-time = "2025-09-09T15:58:36.04Z" },
+    { url = "https://files.pythonhosted.org/packages/47/c7/b0f6b5b67f6788a0725f744496badbb604d226bf233ba716683ebb47b570/numpy-2.3.3-cp314-cp314t-win_amd64.whl", hash = "sha256:b37a0b2e5935409daebe82c1e42274d30d9dd355852529eab91dab8dcca7419f", size = 13112576, upload-time = "2025-09-09T15:58:37.927Z" },
+    { url = "https://files.pythonhosted.org/packages/06/b9/33bba5ff6fb679aa0b1f8a07e853f002a6b04b9394db3069a1270a7784ca/numpy-2.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:78c9f6560dc7e6b3990e32df7ea1a50bbd0e2a111e05209963f5ddcab7073b0b", size = 10545953, upload-time = "2025-09-09T15:58:40.576Z" },
+]
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
+dependencies = [
+    { name = "numpy" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "numpy", specifier = ">=2.3.3" }]
diff --git a/crates/ty_completion_eval/truth/object-attr-instance-methods/completion.toml b/crates/ty_completion_eval/truth/object-attr-instance-methods/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/object-attr-instance-methods/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/object-attr-instance-methods/main.py b/crates/ty_completion_eval/truth/object-attr-instance-methods/main.py
new file mode 100644
index 0000000000..7385033b84
--- /dev/null
+++ b/crates/ty_completion_eval/truth/object-attr-instance-methods/main.py
@@ -0,0 +1,16 @@
+class Quux:
+    def __init__(self): pass
+    def lion(self): pass
+    def tiger(self): pass
+    def bear(self): pass
+    def chicken(self): pass
+    def turkey(self): pass
+    def wasp(self): pass
+    def rabbit(self): pass
+    def squirrel(self): pass
+
+quux = Quux()
+quux.tur<CURSOR: turkey>
+
+quux = Quux()
+quux.be<CURSOR: bear>
diff --git a/crates/ty_completion_eval/truth/object-attr-instance-methods/pyproject.toml b/crates/ty_completion_eval/truth/object-attr-instance-methods/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/object-attr-instance-methods/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/object-attr-instance-methods/uv.lock b/crates/ty_completion_eval/truth/object-attr-instance-methods/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/object-attr-instance-methods/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/raise-uses-base-exception/completion.toml b/crates/ty_completion_eval/truth/raise-uses-base-exception/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/raise-uses-base-exception/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/raise-uses-base-exception/main.py b/crates/ty_completion_eval/truth/raise-uses-base-exception/main.py
new file mode 100644
index 0000000000..e97f40c6dc
--- /dev/null
+++ b/crates/ty_completion_eval/truth/raise-uses-base-exception/main.py
@@ -0,0 +1,2 @@
+# ref: https://github.com/astral-sh/ty/issues/1262
+raise NotImplement<CURSOR: NotImplementedError>
diff --git a/crates/ty_completion_eval/truth/raise-uses-base-exception/pyproject.toml b/crates/ty_completion_eval/truth/raise-uses-base-exception/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/raise-uses-base-exception/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/raise-uses-base-exception/uv.lock b/crates/ty_completion_eval/truth/raise-uses-base-exception/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/raise-uses-base-exception/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/scope-existing-over-new-import/completion.toml b/crates/ty_completion_eval/truth/scope-existing-over-new-import/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-existing-over-new-import/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/scope-existing-over-new-import/main.py b/crates/ty_completion_eval/truth/scope-existing-over-new-import/main.py
new file mode 100644
index 0000000000..846883dfe2
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-existing-over-new-import/main.py
@@ -0,0 +1,3 @@
+# ref: https://github.com/astral-sh/ty/issues/1274#issuecomment-3345942698
+from typing import Iterator
+Iter<CURSOR: Iterator>
diff --git a/crates/ty_completion_eval/truth/scope-existing-over-new-import/pyproject.toml b/crates/ty_completion_eval/truth/scope-existing-over-new-import/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-existing-over-new-import/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/scope-existing-over-new-import/uv.lock b/crates/ty_completion_eval/truth/scope-existing-over-new-import/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-existing-over-new-import/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/scope-prioritize-closer/completion.toml b/crates/ty_completion_eval/truth/scope-prioritize-closer/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-prioritize-closer/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/scope-prioritize-closer/main.py b/crates/ty_completion_eval/truth/scope-prioritize-closer/main.py
new file mode 100644
index 0000000000..a04fe2a67f
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-prioritize-closer/main.py
@@ -0,0 +1,5 @@
+zqzqzq_global_identifier = 1
+
+def foo():
+    zqzqzq_local_identifier = 1
+    zqzqzq_<CURSOR: zqzqzq_local_identifier>
diff --git a/crates/ty_completion_eval/truth/scope-prioritize-closer/pyproject.toml b/crates/ty_completion_eval/truth/scope-prioritize-closer/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-prioritize-closer/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/scope-prioritize-closer/uv.lock b/crates/ty_completion_eval/truth/scope-prioritize-closer/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-prioritize-closer/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/scope-simple-long-identifier/completion.toml b/crates/ty_completion_eval/truth/scope-simple-long-identifier/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-simple-long-identifier/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/scope-simple-long-identifier/main.py b/crates/ty_completion_eval/truth/scope-simple-long-identifier/main.py
new file mode 100644
index 0000000000..34c263ded1
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-simple-long-identifier/main.py
@@ -0,0 +1,2 @@
+simple_long_identifier = 1
+simple<CURSOR: simple_long_identifier>
diff --git a/crates/ty_completion_eval/truth/scope-simple-long-identifier/pyproject.toml b/crates/ty_completion_eval/truth/scope-simple-long-identifier/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-simple-long-identifier/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/scope-simple-long-identifier/uv.lock b/crates/ty_completion_eval/truth/scope-simple-long-identifier/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/scope-simple-long-identifier/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/tstring-completions/completion.toml b/crates/ty_completion_eval/truth/tstring-completions/completion.toml
new file mode 100644
index 0000000000..1c3c4b8ea4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/tstring-completions/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = false
diff --git a/crates/ty_completion_eval/truth/tstring-completions/main.py b/crates/ty_completion_eval/truth/tstring-completions/main.py
new file mode 100644
index 0000000000..01f65e4536
--- /dev/null
+++ b/crates/ty_completion_eval/truth/tstring-completions/main.py
@@ -0,0 +1,3 @@
+zqzqzq_identifier = 1
+
+print(t"{zqzqzq_<CURSOR: zqzqzq_identifier>}")
diff --git a/crates/ty_completion_eval/truth/tstring-completions/pyproject.toml b/crates/ty_completion_eval/truth/tstring-completions/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/tstring-completions/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/tstring-completions/uv.lock b/crates/ty_completion_eval/truth/tstring-completions/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/tstring-completions/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/completion.toml b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/main.py b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/main.py
new file mode 100644
index 0000000000..7f888f5bed
--- /dev/null
+++ b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/main.py
@@ -0,0 +1,2 @@
+# ref: https://github.com/astral-sh/ty/issues/1274#issuecomment-3345879257
+reveal<CURSOR: typing.reveal_type>
diff --git a/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/pyproject.toml b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/uv.lock b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/ty-extensions-lower-stdlib/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_completion_eval/truth/type-var-typing-over-ast/completion.toml b/crates/ty_completion_eval/truth/type-var-typing-over-ast/completion.toml
new file mode 100644
index 0000000000..cbd5805f07
--- /dev/null
+++ b/crates/ty_completion_eval/truth/type-var-typing-over-ast/completion.toml
@@ -0,0 +1,2 @@
+[settings]
+auto-import = true
diff --git a/crates/ty_completion_eval/truth/type-var-typing-over-ast/main.py b/crates/ty_completion_eval/truth/type-var-typing-over-ast/main.py
new file mode 100644
index 0000000000..8f3ecd84b4
--- /dev/null
+++ b/crates/ty_completion_eval/truth/type-var-typing-over-ast/main.py
@@ -0,0 +1,12 @@
+# This one demands that `TypeVa` complete to `typing.TypeVar`
+# even though there is also an `ast.TypeVar`. Getting this one
+# right seems tricky, and probably requires module-specific
+# heuristics.
+#
+# ref: https://github.com/astral-sh/ty/issues/1274#issuecomment-3345884227
+TypeVa<CURSOR: typing.TypeVar>
+
+# This is a similar case of `ctypes.cast` being preferred over
+# `typing.cast`. Maybe `typing` should just get a slightly higher
+# weight than most other stdlib modules?
+cas<CURSOR: typing.cast>
diff --git a/crates/ty_completion_eval/truth/type-var-typing-over-ast/pyproject.toml b/crates/ty_completion_eval/truth/type-var-typing-over-ast/pyproject.toml
new file mode 100644
index 0000000000..cd277d8097
--- /dev/null
+++ b/crates/ty_completion_eval/truth/type-var-typing-over-ast/pyproject.toml
@@ -0,0 +1,5 @@
+[project]
+name = "test"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = []
diff --git a/crates/ty_completion_eval/truth/type-var-typing-over-ast/uv.lock b/crates/ty_completion_eval/truth/type-var-typing-over-ast/uv.lock
new file mode 100644
index 0000000000..a4937d10d3
--- /dev/null
+++ b/crates/ty_completion_eval/truth/type-var-typing-over-ast/uv.lock
@@ -0,0 +1,8 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "test"
+version = "0.1.0"
+source = { virtual = "." }
diff --git a/crates/ty_ide/Cargo.toml b/crates/ty_ide/Cargo.toml
index 5f1b245397..4be5d49fe2 100644
--- a/crates/ty_ide/Cargo.toml
+++ b/crates/ty_ide/Cargo.toml
@@ -13,22 +13,31 @@ license = { workspace = true }
 [dependencies]
 bitflags = { workspace = true }
 ruff_db = { workspace = true }
+ruff_diagnostics = { workspace = true }
+ruff_index = { workspace = true }
+ruff_memory_usage = { workspace = true }
 ruff_python_ast = { workspace = true }
+ruff_python_codegen = { workspace = true }
+ruff_python_importer = { workspace = true }
 ruff_python_parser = { workspace = true }
 ruff_python_trivia = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
 ty_python_semantic = { workspace = true }
 ty_project = { workspace = true, features = ["testing"] }
+ty_vendored = { workspace = true }
 
+get-size2 = { workspace = true }
 itertools = { workspace = true }
+rayon = { workspace = true }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
+salsa = { workspace = true, features = ["compact_str"] }
 smallvec = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-
+camino = { workspace = true }
 insta = { workspace = true, features = ["filters"] }
 
 [lints]
diff --git a/crates/ty_ide/src/all_symbols.rs b/crates/ty_ide/src/all_symbols.rs
new file mode 100644
index 0000000000..cf32c03904
--- /dev/null
+++ b/crates/ty_ide/src/all_symbols.rs
@@ -0,0 +1,188 @@
+use ruff_db::files::File;
+use ty_project::Db;
+use ty_python_semantic::{Module, all_modules};
+
+use crate::symbols::{QueryPattern, SymbolInfo, symbols_for_file_global_only};
+
+/// Get all symbols matching the query string.
+///
+/// Returns symbols from all files in the workspace and dependencies, filtered
+/// by the query.
+pub fn all_symbols<'db>(db: &'db dyn Db, query: &str) -> Vec<AllSymbolInfo<'db>> {
+    // If the query is empty, return immediately to avoid expensive file scanning
+    if query.is_empty() {
+        return Vec::new();
+    }
+
+    let query = QueryPattern::new(query);
+    let results = std::sync::Mutex::new(Vec::new());
+    {
+        let modules = all_modules(db);
+        let db = db.dyn_clone();
+        let results = &results;
+        let query = &query;
+
+        rayon::scope(move |s| {
+            // For each file, extract symbols and add them to results
+            for module in modules {
+                let db = db.dyn_clone();
+                let Some(file) = module.file(&*db) else {
+                    continue;
+                };
+                s.spawn(move |_| {
+                    for (_, symbol) in symbols_for_file_global_only(&*db, file).search(query) {
+                        // It seems like we could do better here than
+                        // locking `results` for every single symbol,
+                        // but this works pretty well as it is.
+                        results.lock().unwrap().push(AllSymbolInfo {
+                            symbol: symbol.to_owned(),
+                            module,
+                            file,
+                        });
+                    }
+                });
+            }
+        });
+    }
+
+    let mut results = results.into_inner().unwrap();
+    results.sort_by(|s1, s2| {
+        let key1 = (&s1.symbol.name, s1.file.path(db).as_str());
+        let key2 = (&s2.symbol.name, s2.file.path(db).as_str());
+        key1.cmp(&key2)
+    });
+    results
+}
+
+/// A symbol found in the workspace and dependencies, including the
+/// file it was found in.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AllSymbolInfo<'db> {
+    /// The symbol information.
+    pub symbol: SymbolInfo<'static>,
+    /// The module containing the symbol.
+    pub module: Module<'db>,
+    /// The file containing the symbol.
+    ///
+    /// This `File` is guaranteed to be the same
+    /// as the `File` underlying `module`.
+    pub file: File,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::tests::CursorTest;
+    use crate::tests::IntoDiagnostic;
+    use insta::assert_snapshot;
+    use ruff_db::diagnostic::{
+        Annotation, Diagnostic, DiagnosticId, LintName, Severity, Span, SubDiagnostic,
+        SubDiagnosticSeverity,
+    };
+
+    #[test]
+    fn test_all_symbols_multi_file() {
+        // We use odd symbol names here so that we can
+        // write queries that target them specifically
+        // and (hopefully) nothing else.
+        let test = CursorTest::builder()
+            .source(
+                "utils.py",
+                "
+def abcdefghijklmnop():
+    '''A helpful utility function'''
+    pass
+",
+            )
+            .source(
+                "models.py",
+                "
+class Abcdefghijklmnop:
+    '''A data model class'''
+    def __init__(self):
+        pass
+",
+            )
+            .source(
+                "constants.py",
+                "
+ABCDEFGHIJKLMNOP = 'https://api.example.com'
+<CURSOR>",
+            )
+            .build();
+
+        assert_snapshot!(test.all_symbols("acegikmo"), @r"
+        info[all-symbols]: AllSymbolInfo
+         --> constants.py:2:1
+          |
+        2 | ABCDEFGHIJKLMNOP = 'https://api.example.com'
+          | ^^^^^^^^^^^^^^^^
+          |
+        info: Constant ABCDEFGHIJKLMNOP
+
+        info[all-symbols]: AllSymbolInfo
+         --> models.py:2:7
+          |
+        2 | class Abcdefghijklmnop:
+          |       ^^^^^^^^^^^^^^^^
+        3 |     '''A data model class'''
+        4 |     def __init__(self):
+          |
+        info: Class Abcdefghijklmnop
+
+        info[all-symbols]: AllSymbolInfo
+         --> utils.py:2:5
+          |
+        2 | def abcdefghijklmnop():
+          |     ^^^^^^^^^^^^^^^^
+        3 |     '''A helpful utility function'''
+        4 |     pass
+          |
+        info: Function abcdefghijklmnop
+        ");
+    }
+
+    impl CursorTest {
+        fn all_symbols(&self, query: &str) -> String {
+            let symbols = all_symbols(&self.db, query);
+
+            if symbols.is_empty() {
+                return "No symbols found".to_string();
+            }
+
+            self.render_diagnostics(symbols.into_iter().map(AllSymbolDiagnostic::new))
+        }
+    }
+
+    struct AllSymbolDiagnostic<'db> {
+        symbol_info: AllSymbolInfo<'db>,
+    }
+
+    impl<'db> AllSymbolDiagnostic<'db> {
+        fn new(symbol_info: AllSymbolInfo<'db>) -> Self {
+            Self { symbol_info }
+        }
+    }
+
+    impl IntoDiagnostic for AllSymbolDiagnostic<'_> {
+        fn into_diagnostic(self) -> Diagnostic {
+            let symbol_kind_str = self.symbol_info.symbol.kind.to_string();
+
+            let info_text = format!("{} {}", symbol_kind_str, self.symbol_info.symbol.name);
+
+            let sub = SubDiagnostic::new(SubDiagnosticSeverity::Info, info_text);
+
+            let mut main = Diagnostic::new(
+                DiagnosticId::Lint(LintName::of("all-symbols")),
+                Severity::Info,
+                "AllSymbolInfo".to_string(),
+            );
+            main.annotate(Annotation::primary(
+                Span::from(self.symbol_info.file).with_range(self.symbol_info.symbol.name_range),
+            ));
+            main.sub(sub);
+
+            main
+        }
+    }
+}
diff --git a/crates/ty_ide/src/completion.rs b/crates/ty_ide/src/completion.rs
index a52e0588b7..dc3da14149 100644
--- a/crates/ty_ide/src/completion.rs
+++ b/crates/ty_ide/src/completion.rs
@@ -2,18 +2,225 @@ use std::cmp::Ordering;
 
 use ruff_db::files::File;
 use ruff_db::parsed::{ParsedModuleRef, parsed_module};
+use ruff_db::source::source_text;
+use ruff_diagnostics::Edit;
 use ruff_python_ast as ast;
-use ruff_python_parser::{Token, TokenAt, TokenKind};
+use ruff_python_ast::name::Name;
+use ruff_python_codegen::Stylist;
+use ruff_python_parser::{Token, TokenAt, TokenKind, Tokens};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use ty_python_semantic::{Completion, NameKind, SemanticModel};
+use ty_python_semantic::{
+    Completion as SemanticCompletion, ModuleName, NameKind, SemanticModel,
+    types::{CycleDetector, Type},
+};
 
-use crate::Db;
 use crate::docstring::Docstring;
 use crate::find_node::covering_node;
 use crate::goto::DefinitionsOrTargets;
+use crate::importer::{ImportRequest, Importer};
+use crate::symbols::QueryPattern;
+use crate::{Db, all_symbols};
 
-pub fn completion(db: &dyn Db, file: File, offset: TextSize) -> Vec<DetailedCompletion<'_>> {
+#[derive(Clone, Debug)]
+pub struct Completion<'db> {
+    /// The label shown to the user for this suggestion.
+    pub name: Name,
+    /// The text that should be inserted at the cursor
+    /// when the completion is selected.
+    ///
+    /// When this is not set, `name` is used.
+    pub insert: Option<Box<str>>,
+    /// The type of this completion, if available.
+    ///
+    /// Generally speaking, this is always available
+    /// *unless* this was a completion corresponding to
+    /// an unimported symbol. In that case, computing the
+    /// type of all such symbols could be quite expensive.
+    pub ty: Option<Type<'db>>,
+    /// The "kind" of this completion.
+    ///
+    /// When this is set, it takes priority over any kind
+    /// inferred from `ty`.
+    ///
+    /// Usually this is set when `ty` is `None`, since it
+    /// may be cheaper to compute at scale (e.g., for
+    /// unimported symbol completions).
+    ///
+    /// Callers should use [`Completion::kind`] to get the
+    /// kind, which will take type information into account
+    /// if this kind is not present.
+    pub kind: Option<CompletionKind>,
+    /// The name of the module that this completion comes from.
+    ///
+    /// This is generally only present when this is a completion
+    /// suggestion for an unimported symbol.
+    pub module_name: Option<&'db ModuleName>,
+    /// An import statement to insert (or ensure is already
+    /// present) when this completion is selected.
+    pub import: Option<Edit>,
+    /// Whether this suggestion came from builtins or not.
+    ///
+    /// At time of writing (2025-06-26), this information
+    /// doesn't make it into the LSP response. Instead, we
+    /// use it mainly in tests so that we can write less
+    /// noisy tests.
+    pub builtin: bool,
+    /// Whether this item only exists for type checking purposes and
+    /// will be missing at runtime
+    pub is_type_check_only: bool,
+    /// The documentation associated with this item, if
+    /// available.
+    pub documentation: Option<Docstring>,
+}
+
+impl<'db> Completion<'db> {
+    fn from_semantic_completion(
+        db: &'db dyn Db,
+        semantic: SemanticCompletion<'db>,
+    ) -> Completion<'db> {
+        let definition = semantic
+            .ty
+            .and_then(|ty| DefinitionsOrTargets::from_ty(db, ty));
+        let documentation = definition.and_then(|def| def.docstring(db));
+        let is_type_check_only = semantic.is_type_check_only(db);
+        Completion {
+            name: semantic.name,
+            insert: None,
+            ty: semantic.ty,
+            kind: None,
+            module_name: None,
+            import: None,
+            builtin: semantic.builtin,
+            is_type_check_only,
+            documentation,
+        }
+    }
+
+    /// Returns the "kind" of this completion.
+    ///
+    /// This is meant to be a very general classification of this completion.
+    /// Typically, this is communicated from the LSP server to a client, and
+    /// the client uses this information to help improve the UX (perhaps by
+    /// assigning an icon of some kind to the completion).
+    pub fn kind(&self, db: &'db dyn Db) -> Option<CompletionKind> {
+        type CompletionKindVisitor<'db> =
+            CycleDetector<CompletionKind, Type<'db>, Option<CompletionKind>>;
+
+        fn imp<'db>(
+            db: &'db dyn Db,
+            ty: Type<'db>,
+            visitor: &CompletionKindVisitor<'db>,
+        ) -> Option<CompletionKind> {
+            Some(match ty {
+                Type::FunctionLiteral(_)
+                | Type::DataclassDecorator(_)
+                | Type::WrapperDescriptor(_)
+                | Type::DataclassTransformer(_)
+                | Type::Callable(_) => CompletionKind::Function,
+                Type::BoundMethod(_) | Type::KnownBoundMethod(_) => CompletionKind::Method,
+                Type::ModuleLiteral(_) => CompletionKind::Module,
+                Type::ClassLiteral(_) | Type::GenericAlias(_) | Type::SubclassOf(_) => {
+                    CompletionKind::Class
+                }
+                // This is a little weird for "struct." I'm mostly interpreting
+                // "struct" here as a more general "object." ---AG
+                Type::NominalInstance(_)
+                | Type::PropertyInstance(_)
+                | Type::BoundSuper(_)
+                | Type::TypedDict(_) => CompletionKind::Struct,
+                Type::IntLiteral(_)
+                | Type::BooleanLiteral(_)
+                | Type::TypeIs(_)
+                | Type::StringLiteral(_)
+                | Type::LiteralString
+                | Type::BytesLiteral(_) => CompletionKind::Value,
+                Type::EnumLiteral(_) => CompletionKind::Enum,
+                Type::ProtocolInstance(_) => CompletionKind::Interface,
+                Type::TypeVar(_) => CompletionKind::TypeParameter,
+                Type::Union(union) => union
+                    .elements(db)
+                    .iter()
+                    .find_map(|&ty| imp(db, ty, visitor))?,
+                Type::Intersection(intersection) => intersection
+                    .iter_positive(db)
+                    .find_map(|ty| imp(db, ty, visitor))?,
+                Type::Dynamic(_)
+                | Type::Never
+                | Type::SpecialForm(_)
+                | Type::KnownInstance(_)
+                | Type::AlwaysTruthy
+                | Type::AlwaysFalsy => return None,
+                Type::TypeAlias(alias) => {
+                    visitor.visit(ty, || imp(db, alias.value_type(db), visitor))?
+                }
+            })
+        }
+        self.kind.or_else(|| {
+            self.ty
+                .and_then(|ty| imp(db, ty, &CompletionKindVisitor::default()))
+        })
+    }
+}
+
+/// The "kind" of a completion.
+///
+/// This is taken directly from the LSP completion specification:
+/// <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#completionItemKind>
+///
+/// The idea here is that [`Completion::kind`] defines the mapping to this from
+/// `Type` (and possibly other information), which might be interesting and
+/// contentious. Then the outer edges map this to the LSP types, which is
+/// expected to be mundane and boring.
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum CompletionKind {
+    Text,
+    Method,
+    Function,
+    Constructor,
+    Field,
+    Variable,
+    Class,
+    Interface,
+    Module,
+    Property,
+    Unit,
+    Value,
+    Enum,
+    Keyword,
+    Snippet,
+    Color,
+    File,
+    Reference,
+    Folder,
+    EnumMember,
+    Constant,
+    Struct,
+    Event,
+    Operator,
+    TypeParameter,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct CompletionSettings {
+    pub auto_import: bool,
+}
+
+pub fn completion<'db>(
+    db: &'db dyn Db,
+    settings: &CompletionSettings,
+    file: File,
+    offset: TextSize,
+) -> Vec<Completion<'db>> {
     let parsed = parsed_module(db, file).load(db);
+    if is_in_comment(&parsed, offset) || is_in_string(&parsed, offset) {
+        return vec![];
+    }
+
+    let typed = find_typed_text(db, file, &parsed, offset);
+    let typed_query = typed
+        .as_deref()
+        .map(QueryPattern::new)
+        .unwrap_or_else(QueryPattern::matches_all_symbols);
 
     let Some(target_token) = CompletionTargetTokens::find(&parsed, offset) else {
         return vec![];
@@ -23,45 +230,125 @@ pub fn completion(db: &dyn Db, file: File, offset: TextSize) -> Vec<DetailedComp
     };
 
     let model = SemanticModel::new(db, file);
-    let mut completions = match target {
-        CompletionTargetAst::ObjectDot { expr } => model.attribute_completions(expr),
+    let (semantic_completions, scoped) = match target {
+        CompletionTargetAst::ObjectDot { expr } => (model.attribute_completions(expr), None),
         CompletionTargetAst::ObjectDotInImport { import, name } => {
-            model.import_submodule_completions(import, name)
+            (model.import_submodule_completions(import, name), None)
         }
         CompletionTargetAst::ObjectDotInImportFrom { import } => {
-            model.from_import_submodule_completions(import)
+            (model.from_import_submodule_completions(import), None)
         }
         CompletionTargetAst::ImportFrom { import, name } => {
-            model.from_import_completions(import, name)
+            (model.from_import_completions(import, name), None)
         }
         CompletionTargetAst::Import { .. } | CompletionTargetAst::ImportViaFrom { .. } => {
-            model.import_completions()
+            (model.import_completions(), None)
+        }
+        CompletionTargetAst::Scoped(scoped) => {
+            (model.scoped_completions(scoped.node), Some(scoped))
         }
-        CompletionTargetAst::Scoped { node } => model.scoped_completions(node),
     };
-    completions.sort_by(compare_suggestions);
-    completions.dedup_by(|c1, c2| c1.name == c2.name);
-    completions
+    let mut completions: Vec<Completion<'_>> = semantic_completions
         .into_iter()
-        .map(|completion| {
-            let definition = DefinitionsOrTargets::from_ty(db, completion.ty);
-            let documentation = definition.and_then(|def| def.docstring(db));
-            DetailedCompletion {
-                inner: completion,
-                documentation,
-            }
-        })
-        .collect()
+        .filter(|c| typed_query.is_match_symbol_name(c.name.as_str()))
+        .map(|c| Completion::from_semantic_completion(db, c))
+        .collect();
+
+    if scoped.is_some() {
+        add_keyword_value_completions(db, &typed_query, &mut completions);
+    }
+    if settings.auto_import {
+        if let Some(scoped) = scoped {
+            add_unimported_completions(
+                db,
+                file,
+                &parsed,
+                scoped,
+                typed.as_deref(),
+                &mut completions,
+            );
+        }
+    }
+    completions.sort_by(compare_suggestions);
+    completions.dedup_by(|c1, c2| (&c1.name, c1.module_name) == (&c2.name, c2.module_name));
+    completions
 }
 
-pub struct DetailedCompletion<'db> {
-    pub inner: Completion<'db>,
-    pub documentation: Option<Docstring>,
+/// Adds a subset of completions derived from keywords.
+///
+/// Note that at present, these should only be added to "scoped"
+/// completions. i.e., This will include `None`, `True`, `False`, etc.
+fn add_keyword_value_completions<'db>(
+    db: &'db dyn Db,
+    query: &QueryPattern,
+    completions: &mut Vec<Completion<'db>>,
+) {
+    let keywords = [
+        ("None", Type::none(db)),
+        ("True", Type::BooleanLiteral(true)),
+        ("False", Type::BooleanLiteral(false)),
+    ];
+    for (name, ty) in keywords {
+        if !query.is_match_symbol_name(name) {
+            continue;
+        }
+        completions.push(Completion {
+            name: ast::name::Name::new(name),
+            insert: None,
+            ty: Some(ty),
+            kind: None,
+            module_name: None,
+            import: None,
+            is_type_check_only: false,
+            builtin: true,
+            documentation: None,
+        });
+    }
 }
-impl<'db> std::ops::Deref for DetailedCompletion<'db> {
-    type Target = Completion<'db>;
-    fn deref(&self) -> &Self::Target {
-        &self.inner
+
+/// Adds completions not in scope.
+///
+/// `scoped` should be information about the identified scope
+/// in which the cursor is currently placed.
+///
+/// The completions returned will auto-insert import statements
+/// when selected into `File`.
+fn add_unimported_completions<'db>(
+    db: &'db dyn Db,
+    file: File,
+    parsed: &ParsedModuleRef,
+    scoped: ScopedTarget<'_>,
+    typed: Option<&str>,
+    completions: &mut Vec<Completion<'db>>,
+) {
+    let Some(typed) = typed else {
+        return;
+    };
+    let source = source_text(db, file);
+    let stylist = Stylist::from_tokens(parsed.tokens(), source.as_str());
+    let importer = Importer::new(db, &stylist, file, source.as_str(), parsed);
+    let members = importer.members_in_scope_at(scoped.node, scoped.node.start());
+
+    for symbol in all_symbols(db, typed) {
+        let request =
+            ImportRequest::import_from(symbol.module.name(db).as_str(), &symbol.symbol.name);
+        // FIXME: `all_symbols` doesn't account for wildcard imports.
+        // Since we're looking at every module, this is probably
+        // "fine," but it might mean that we import a symbol from the
+        // "wrong" module.
+        let import_action = importer.import(request, &members);
+        completions.push(Completion {
+            name: ast::name::Name::new(&symbol.symbol.name),
+            insert: Some(import_action.symbol_text().into()),
+            ty: None,
+            kind: symbol.symbol.kind.to_completion_kind(),
+            module_name: Some(symbol.module.name(db)),
+            import: import_action.import().cloned(),
+            builtin: false,
+            // TODO: `is_type_check_only` requires inferring the type of the symbol
+            is_type_check_only: false,
+            documentation: None,
+        });
     }
 }
 
@@ -130,7 +417,7 @@ impl<'t> CompletionTargetTokens<'t> {
             TokenAt::Single(tok) => tok.end(),
             TokenAt::Between(_, tok) => tok.start(),
         };
-        let before = parsed.tokens().before(offset);
+        let before = tokens_start_before(parsed.tokens(), offset);
         Some(
             // Our strategy when it comes to `object.attribute` here is
             // to look for the `.` and then take the token immediately
@@ -258,17 +545,15 @@ impl<'t> CompletionTargetTokens<'t> {
                 }
             }
             CompletionTargetTokens::Generic { token } => {
-                let covering_node = covering_node(parsed.syntax().into(), token.range());
-                Some(CompletionTargetAst::Scoped {
-                    node: covering_node.node(),
-                })
+                let node = covering_node(parsed.syntax().into(), token.range()).node();
+                Some(CompletionTargetAst::Scoped(ScopedTarget { node }))
             }
             CompletionTargetTokens::Unknown => {
                 let range = TextRange::empty(offset);
                 let covering_node = covering_node(parsed.syntax().into(), range);
-                Some(CompletionTargetAst::Scoped {
+                Some(CompletionTargetAst::Scoped(ScopedTarget {
                     node: covering_node.node(),
-                })
+                }))
             }
         }
     }
@@ -321,7 +606,31 @@ enum CompletionTargetAst<'t> {
     },
     /// A scoped scenario, where we want to list all items available in
     /// the most narrow scope containing the giving AST node.
-    Scoped { node: ast::AnyNodeRef<'t> },
+    Scoped(ScopedTarget<'t>),
+}
+
+#[derive(Clone, Copy, Debug)]
+struct ScopedTarget<'t> {
+    /// The node with the smallest range that fully covers
+    /// the token under the cursor.
+    node: ast::AnyNodeRef<'t>,
+}
+
+/// Returns a slice of tokens that all start before the given
+/// [`TextSize`] offset.
+///
+/// If the given offset is between two tokens, the returned slice will end just
+/// before the following token. In other words, if the offset is between the
+/// end of previous token and start of next token, the returned slice will end
+/// just before the next token.
+///
+/// Unlike `Tokens::before`, this never panics. If `offset` is within a token's
+/// range (including if it's at the very beginning), then that token will be
+/// included in the slice returned.
+fn tokens_start_before(tokens: &Tokens, offset: TextSize) -> &[Token] {
+    let partition_point = tokens.partition_point(|token| token.start() < offset);
+
+    &tokens[..partition_point]
 }
 
 /// Returns a suffix of `tokens` corresponding to the `kinds` given.
@@ -444,7 +753,7 @@ fn import_from_tokens(tokens: &[Token]) -> Option<&Token> {
 /// This also handles cases like `import foo, c<CURSOR>, bar`.
 ///
 /// If found, a token corresponding to the `import` or `from` keyword
-/// and the the closest point of the `<CURSOR>` is returned.
+/// and the closest point of the `<CURSOR>` is returned.
 ///
 /// It is assumed that callers will call `from_import_tokens` first to
 /// try and recognize a `from ... import ...` statement before using
@@ -485,16 +794,72 @@ fn import_tokens(tokens: &[Token]) -> Option<(&Token, &Token)> {
     None
 }
 
-/// Order completions lexicographically, with these exceptions:
+/// Looks for the text typed immediately before the cursor offset
+/// given.
 ///
-/// 1) A `_[^_]` prefix sorts last and
-/// 2) A `__` prefix sorts last except before (1)
+/// If there isn't any typed text or it could not otherwise be found,
+/// then `None` is returned.
+fn find_typed_text(
+    db: &dyn Db,
+    file: File,
+    parsed: &ParsedModuleRef,
+    offset: TextSize,
+) -> Option<String> {
+    let source = source_text(db, file);
+    let tokens = tokens_start_before(parsed.tokens(), offset);
+    let last = tokens.last()?;
+    if !matches!(last.kind(), TokenKind::Name) {
+        return None;
+    }
+    // This one's weird, but if the cursor is beyond
+    // what is in the closest `Name` token, then it's
+    // likely we can't infer anything about what has
+    // been typed. This likely means there is whitespace
+    // or something that isn't represented in the token
+    // stream. So just give up.
+    if last.end() < offset {
+        return None;
+    }
+    Some(source[last.range()].to_string())
+}
+
+/// Whether the given offset within the parsed module is within
+/// a comment or not.
+fn is_in_comment(parsed: &ParsedModuleRef, offset: TextSize) -> bool {
+    let tokens = tokens_start_before(parsed.tokens(), offset);
+    tokens.last().is_some_and(|t| t.kind().is_comment())
+}
+
+/// Returns true when the cursor at `offset` is positioned within
+/// a string token (regular, f-string, t-string, etc).
+///
+/// Note that this will return `false` when positioned within an
+/// interpolation block in an f-string or a t-string.
+fn is_in_string(parsed: &ParsedModuleRef, offset: TextSize) -> bool {
+    let tokens = tokens_start_before(parsed.tokens(), offset);
+    tokens.last().is_some_and(|t| {
+        matches!(
+            t.kind(),
+            TokenKind::String | TokenKind::FStringMiddle | TokenKind::TStringMiddle
+        )
+    })
+}
+
+/// Order completions according to the following rules:
+///
+/// 1) Names with no underscore prefix
+/// 2) Names starting with `_` but not dunders
+/// 3) `__dunder__` names
+///
+/// Among each category, type-check-only items are sorted last,
+/// and otherwise completions are sorted lexicographically.
 ///
 /// This has the effect of putting all dunder attributes after "normal"
 /// attributes, and all single-underscore attributes after dunder attributes.
 fn compare_suggestions(c1: &Completion, c2: &Completion) -> Ordering {
     let (kind1, kind2) = (NameKind::classify(&c1.name), NameKind::classify(&c2.name));
-    kind1.cmp(&kind2).then_with(|| c1.name.cmp(&c2.name))
+
+    (kind1, c1.is_type_check_only, &c1.name).cmp(&(kind2, c2.is_type_check_only, &c2.name))
 }
 
 #[cfg(test)]
@@ -502,10 +867,10 @@ mod tests {
     use insta::assert_snapshot;
     use ruff_python_parser::{Mode, ParseOptions, TokenKind, Tokens};
 
-    use crate::completion::{DetailedCompletion, completion};
+    use crate::completion::{Completion, completion};
     use crate::tests::{CursorTest, cursor_test};
 
-    use super::token_suffix_by_kinds;
+    use super::{CompletionKind, CompletionSettings, token_suffix_by_kinds};
 
     #[test]
     fn token_suffixes_match() {
@@ -811,7 +1176,7 @@ g<CURSOR>
 ",
         );
 
-        assert_snapshot!(test.completions_without_builtins(), @"foo");
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found after filtering out completions>");
     }
 
     #[test]
@@ -1099,6 +1464,21 @@ def frob(): ...
         ");
     }
 
+    /// Regression test for <https://github.com/astral-sh/ty/issues/1392>
+    ///
+    /// This test ensures completions work when the cursor is at the
+    /// start of a zero-length token.
+    #[test]
+    fn completion_at_eof() {
+        let test = cursor_test("def f(msg: str):\n    msg.<CURSOR>");
+        test.assert_completions_include("upper");
+        test.assert_completions_include("capitalize");
+
+        let test = cursor_test("def f(msg: str):\n    msg.u<CURSOR>");
+        test.assert_completions_include("upper");
+        test.assert_completions_do_not_include("capitalize");
+    }
+
     #[test]
     fn list_comprehension1() {
         let test = cursor_test(
@@ -1249,10 +1629,8 @@ class Foo:
         );
 
         assert_snapshot!(test.completions_without_builtins(), @r"
-        Foo
         bar
         frob
-        quux
         ");
     }
 
@@ -1266,11 +1644,7 @@ class Foo:
 ",
         );
 
-        assert_snapshot!(test.completions_without_builtins(), @r"
-        Foo
-        bar
-        quux
-        ");
+        assert_snapshot!(test.completions_without_builtins(), @"bar");
     }
 
     #[test]
@@ -1411,7 +1785,7 @@ quux.<CURSOR>
         __getstate__ :: bound method Quux.__getstate__() -> object
         __hash__ :: bound method Quux.__hash__() -> int
         __init__ :: bound method Quux.__init__() -> Unknown
-        __init_subclass__ :: bound method Quux.__init_subclass__() -> None
+        __init_subclass__ :: bound method type[Quux].__init_subclass__() -> None
         __module__ :: str
         __ne__ :: bound method Quux.__ne__(value: object, /) -> bool
         __new__ :: bound method Quux.__new__() -> Quux
@@ -1443,29 +1817,8 @@ quux.b<CURSOR>
         assert_snapshot!(test.completions_without_builtins_with_types(), @r"
         bar :: Unknown | Literal[2]
         baz :: Unknown | Literal[3]
-        foo :: Unknown | Literal[1]
-        __annotations__ :: dict[str, Any]
-        __class__ :: type[Quux]
-        __delattr__ :: bound method Quux.__delattr__(name: str, /) -> None
-        __dict__ :: dict[str, Any]
-        __dir__ :: bound method Quux.__dir__() -> Iterable[str]
-        __doc__ :: str | None
-        __eq__ :: bound method Quux.__eq__(value: object, /) -> bool
-        __format__ :: bound method Quux.__format__(format_spec: str, /) -> str
         __getattribute__ :: bound method Quux.__getattribute__(name: str, /) -> Any
-        __getstate__ :: bound method Quux.__getstate__() -> object
-        __hash__ :: bound method Quux.__hash__() -> int
-        __init__ :: bound method Quux.__init__() -> Unknown
-        __init_subclass__ :: bound method Quux.__init_subclass__() -> None
-        __module__ :: str
-        __ne__ :: bound method Quux.__ne__(value: object, /) -> bool
-        __new__ :: bound method Quux.__new__() -> Quux
-        __reduce__ :: bound method Quux.__reduce__() -> str | tuple[Any, ...]
-        __reduce_ex__ :: bound method Quux.__reduce_ex__(protocol: SupportsIndex, /) -> str | tuple[Any, ...]
-        __repr__ :: bound method Quux.__repr__() -> str
-        __setattr__ :: bound method Quux.__setattr__(name: str, value: Any, /) -> None
-        __sizeof__ :: bound method Quux.__sizeof__() -> int
-        __str__ :: bound method Quux.__str__() -> str
+        __init_subclass__ :: bound method type[Quux].__init_subclass__() -> None
         __subclasshook__ :: bound method type[Quux].__subclasshook__(subclass: type, /) -> bool
         ");
     }
@@ -1488,6 +1841,7 @@ C.<CURSOR>
         assert_snapshot!(test.completions_without_builtins_with_types(), @r"
         meta_attr :: int
         mro :: bound method <class 'C'>.mro() -> list[type]
+        __annotate__ :: @Todo | None
         __annotations__ :: dict[str, Any]
         __base__ :: type | None
         __bases__ :: tuple[type, ...]
@@ -1506,7 +1860,7 @@ C.<CURSOR>
         __getstate__ :: def __getstate__(self) -> object
         __hash__ :: def __hash__(self) -> int
         __init__ :: def __init__(self) -> None
-        __init_subclass__ :: def __init_subclass__(cls) -> None
+        __init_subclass__ :: bound method <class 'C'>.__init_subclass__() -> None
         __instancecheck__ :: bound method <class 'C'>.__instancecheck__(instance: Any, /) -> bool
         __itemsize__ :: int
         __module__ :: str
@@ -1514,13 +1868,13 @@ C.<CURSOR>
         __name__ :: str
         __ne__ :: def __ne__(self, value: object, /) -> bool
         __new__ :: def __new__(cls) -> Self@__new__
-        __or__ :: bound method <class 'C'>.__or__(value: Any, /) -> UnionType
+        __or__ :: bound method <class 'C'>.__or__[Self](value: Any, /) -> UnionType | Self@__or__
         __prepare__ :: bound method <class 'Meta'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
         __qualname__ :: str
         __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
         __reduce_ex__ :: def __reduce_ex__(self, protocol: SupportsIndex, /) -> str | tuple[Any, ...]
         __repr__ :: def __repr__(self) -> str
-        __ror__ :: bound method <class 'C'>.__ror__(value: Any, /) -> UnionType
+        __ror__ :: bound method <class 'C'>.__ror__[Self](value: Any, /) -> UnionType | Self@__ror__
         __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
         __sizeof__ :: def __sizeof__(self) -> int
         __str__ :: def __str__(self) -> str
@@ -1553,7 +1907,7 @@ Meta.<CURSOR>
             // whether we're in release mode or not. These differences
             // aren't really relevant for completion tests AFAIK, so
             // just redact them. ---AG
-            filters => [(r"(?m)\s*__(annotations|new)__.+$", "")]},
+            filters => [(r"(?m)\s*__(annotations|new|annotate)__.+$", "")]},
             {
                 assert_snapshot!(test.completions_without_builtins_with_types(), @r"
                 meta_attr :: property
@@ -1575,20 +1929,20 @@ Meta.<CURSOR>
                 __getstate__ :: def __getstate__(self) -> object
                 __hash__ :: def __hash__(self) -> int
                 __init__ :: Overload[(self, o: object, /) -> None, (self, name: str, bases: tuple[type, ...], dict: dict[str, Any], /, **kwds: Any) -> None]
-                __init_subclass__ :: def __init_subclass__(cls) -> None
+                __init_subclass__ :: bound method <class 'Meta'>.__init_subclass__() -> None
                 __instancecheck__ :: def __instancecheck__(self, instance: Any, /) -> bool
                 __itemsize__ :: int
                 __module__ :: str
                 __mro__ :: tuple[<class 'Meta'>, <class 'type'>, <class 'object'>]
                 __name__ :: str
                 __ne__ :: def __ne__(self, value: object, /) -> bool
-                __or__ :: def __or__(self, value: Any, /) -> UnionType
+                __or__ :: def __or__[Self](self: Self@__or__, value: Any, /) -> UnionType | Self@__or__
                 __prepare__ :: bound method <class 'Meta'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
                 __qualname__ :: str
                 __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
                 __reduce_ex__ :: def __reduce_ex__(self, protocol: SupportsIndex, /) -> str | tuple[Any, ...]
                 __repr__ :: def __repr__(self) -> str
-                __ror__ :: def __ror__(self, value: Any, /) -> UnionType
+                __ror__ :: def __ror__[Self](self: Self@__ror__, value: Any, /) -> UnionType | Self@__ror__
                 __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
                 __sizeof__ :: def __sizeof__(self) -> int
                 __str__ :: def __str__(self) -> str
@@ -1616,14 +1970,34 @@ class Quux:
 ",
         );
 
-        // FIXME: This should list completions on `self`, which should
-        // include, at least, `foo` and `bar`. At time of writing
-        // (2025-06-04), the type of `self` is inferred as `Unknown` in
-        // this context. This in turn prevents us from getting a list
-        // of available attributes.
-        //
-        // See: https://github.com/astral-sh/ty/issues/159
-        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+        assert_snapshot!(test.completions_without_builtins(), @r"
+        bar
+        baz
+        foo
+        __annotations__
+        __class__
+        __delattr__
+        __dict__
+        __dir__
+        __doc__
+        __eq__
+        __format__
+        __getattribute__
+        __getstate__
+        __hash__
+        __init__
+        __init_subclass__
+        __module__
+        __ne__
+        __new__
+        __reduce__
+        __reduce_ex__
+        __repr__
+        __setattr__
+        __sizeof__
+        __str__
+        __subclasshook__
+        ");
     }
 
     #[test]
@@ -1664,6 +2038,7 @@ Quux.<CURSOR>
         some_method :: def some_method(self) -> int
         some_property :: property
         some_static_method :: def some_static_method(self) -> int
+        __annotate__ :: @Todo | None
         __annotations__ :: dict[str, Any]
         __base__ :: type | None
         __bases__ :: tuple[type, ...]
@@ -1682,7 +2057,7 @@ Quux.<CURSOR>
         __getstate__ :: def __getstate__(self) -> object
         __hash__ :: def __hash__(self) -> int
         __init__ :: def __init__(self) -> Unknown
-        __init_subclass__ :: def __init_subclass__(cls) -> None
+        __init_subclass__ :: bound method <class 'Quux'>.__init_subclass__() -> None
         __instancecheck__ :: bound method <class 'Quux'>.__instancecheck__(instance: Any, /) -> bool
         __itemsize__ :: int
         __module__ :: str
@@ -1690,13 +2065,13 @@ Quux.<CURSOR>
         __name__ :: str
         __ne__ :: def __ne__(self, value: object, /) -> bool
         __new__ :: def __new__(cls) -> Self@__new__
-        __or__ :: bound method <class 'Quux'>.__or__(value: Any, /) -> UnionType
+        __or__ :: bound method <class 'Quux'>.__or__[Self](value: Any, /) -> UnionType | Self@__or__
         __prepare__ :: bound method <class 'type'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
         __qualname__ :: str
         __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
         __reduce_ex__ :: def __reduce_ex__(self, protocol: SupportsIndex, /) -> str | tuple[Any, ...]
         __repr__ :: def __repr__(self) -> str
-        __ror__ :: bound method <class 'Quux'>.__ror__(value: Any, /) -> UnionType
+        __ror__ :: bound method <class 'Quux'>.__ror__[Self](value: Any, /) -> UnionType | Self@__ror__
         __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
         __sizeof__ :: def __sizeof__(self) -> int
         __str__ :: def __str__(self) -> str
@@ -1726,7 +2101,7 @@ Answer.<CURSOR>
         insta::with_settings!({
             // See above: filter out some members which contain @Todo types that are
             // rendered differently in release mode.
-            filters => [(r"(?m)\s*__(call|reduce_ex)__.+$", "")]},
+            filters => [(r"(?m)\s*__(call|reduce_ex|annotate|signature)__.+$", "")]},
             {
                 assert_snapshot!(test.completions_without_builtins_with_types(), @r"
                 NO :: Literal[Answer.NO]
@@ -1756,7 +2131,7 @@ Answer.<CURSOR>
                 __getstate__ :: def __getstate__(self) -> object
                 __hash__ :: def __hash__(self) -> int
                 __init__ :: def __init__(self) -> None
-                __init_subclass__ :: def __init_subclass__(cls) -> None
+                __init_subclass__ :: bound method <class 'Answer'>.__init_subclass__() -> None
                 __instancecheck__ :: bound method <class 'Answer'>.__instancecheck__(instance: Any, /) -> bool
                 __itemsize__ :: int
                 __iter__ :: bound method <class 'Answer'>.__iter__[_EnumMemberT]() -> Iterator[_EnumMemberT@__iter__]
@@ -1767,16 +2142,15 @@ Answer.<CURSOR>
                 __name__ :: str
                 __ne__ :: def __ne__(self, value: object, /) -> bool
                 __new__ :: def __new__(cls, value: object) -> Self@__new__
-                __or__ :: bound method <class 'Answer'>.__or__(value: Any, /) -> UnionType
+                __or__ :: bound method <class 'Answer'>.__or__[Self](value: Any, /) -> UnionType | Self@__or__
                 __order__ :: str
                 __prepare__ :: bound method <class 'EnumMeta'>.__prepare__(cls: str, bases: tuple[type, ...], **kwds: Any) -> _EnumDict
                 __qualname__ :: str
                 __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
                 __repr__ :: def __repr__(self) -> str
                 __reversed__ :: bound method <class 'Answer'>.__reversed__[_EnumMemberT]() -> Iterator[_EnumMemberT@__reversed__]
-                __ror__ :: bound method <class 'Answer'>.__ror__(value: Any, /) -> UnionType
+                __ror__ :: bound method <class 'Answer'>.__ror__[Self](value: Any, /) -> UnionType | Self@__ror__
                 __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
-                __signature__ :: bound method <class 'Answer'>.__signature__() -> str
                 __sizeof__ :: def __sizeof__(self) -> int
                 __str__ :: def __str__(self) -> str
                 __subclasscheck__ :: bound method <class 'Answer'>.__subclasscheck__(subclass: type, /) -> bool
@@ -1814,10 +2188,7 @@ bar(o<CURSOR>
 ",
         );
 
-        assert_snapshot!(test.completions_without_builtins(), @r"
-        bar
-        foo
-        ");
+        assert_snapshot!(test.completions_without_builtins(), @"foo");
     }
 
     #[test]
@@ -1852,8 +2223,6 @@ class C:
         );
 
         assert_snapshot!(test.completions_without_builtins(), @r"
-        C
-        bar
         foo
         self
         ");
@@ -1888,8 +2257,6 @@ class C:
         // that is only a method that can be called on
         // `self`.
         assert_snapshot!(test.completions_without_builtins(), @r"
-        C
-        bar
         foo
         self
         ");
@@ -1934,7 +2301,7 @@ hidden_<CURSOR>
 
         assert_snapshot!(
             test.completions_without_builtins(),
-            @"<No completions found after filtering out completions>",
+            @"<No completions found>",
         );
     }
 
@@ -1954,7 +2321,10 @@ if sys.platform == \"not-my-current-platform\":
         // TODO: ideally, `only_available_in_this_branch` should be available here, but we
         // currently make no effort to provide a good IDE experience within sections that
         // are unreachable
-        assert_snapshot!(test.completions_without_builtins(), @"sys");
+        assert_snapshot!(
+            test.completions_without_builtins(),
+            @"<No completions found after filtering out completions>",
+        );
     }
 
     #[test]
@@ -2540,17 +2910,7 @@ f = Foo()
 "#,
         );
 
-        // TODO: This should not have any completions suggested for it.
-        // We do correctly avoid giving `object.attr` completions here,
-        // but we instead fall back to scope based completions. Since
-        // we're inside a string, we should avoid giving completions at
-        // all.
-        assert_snapshot!(test.completions_without_builtins(), @r"
-        Foo
-        bar
-        f
-        foo
-        ");
+        assert_snapshot!(test.completions_without_builtins(), @r"<No completions found>");
     }
 
     #[test]
@@ -2573,6 +2933,26 @@ f"{f.<CURSOR>
         test.assert_completions_include("method");
     }
 
+    #[test]
+    fn string_dot_attr3() {
+        let test = cursor_test(
+            r#"
+foo = 1
+bar = 2
+
+class Foo:
+    def method(self): ...
+
+f = Foo()
+
+# T-string, this is an attribute access
+t"{f.<CURSOR>
+"#,
+        );
+
+        test.assert_completions_include("method");
+    }
+
     #[test]
     fn no_panic_for_attribute_table_that_contains_subscript() {
         let test = cursor_test(
@@ -3013,6 +3393,83 @@ from os.<CURSOR>
         test.assert_completions_do_not_include("abspath");
     }
 
+    #[test]
+    fn auto_import_with_submodule() {
+        let test = CursorTest::builder()
+            .source("main.py", "Abra<CURSOR>")
+            .source("package/__init__.py", "AbraKadabra = 1")
+            .build();
+
+        let settings = CompletionSettings { auto_import: true };
+        let expected = "AbraKadabra";
+        let completions = completion(&test.db, &settings, test.cursor.file, test.cursor.offset);
+        assert!(
+            completions
+                .iter()
+                .any(|completion| completion.name == expected),
+            "Expected completions to include `{expected}`"
+        );
+    }
+
+    #[test]
+    fn import_type_check_only_lowers_ranking() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+                import foo
+                foo.A<CURSOR>
+                "#,
+            )
+            .source(
+                "foo/__init__.py",
+                r#"
+                from typing import type_check_only
+
+                @type_check_only
+                class Apple: pass
+
+                class Banana: pass
+                class Cat: pass
+                class Azorubine: pass
+                "#,
+            )
+            .build();
+
+        let settings = CompletionSettings::default();
+        let completions = completion(&test.db, &settings, test.cursor.file, test.cursor.offset);
+
+        let [apple_pos, banana_pos, cat_pos, azo_pos, ann_pos] =
+            ["Apple", "Banana", "Cat", "Azorubine", "__annotations__"].map(|name| {
+                completions
+                    .iter()
+                    .position(|comp| comp.name == name)
+                    .unwrap()
+            });
+
+        assert!(completions[apple_pos].is_type_check_only);
+        assert!(apple_pos > banana_pos.max(cat_pos).max(azo_pos));
+        assert!(ann_pos > apple_pos);
+    }
+
+    #[test]
+    fn type_check_only_is_type_check_only() {
+        // `@typing.type_check_only` is a function that's unavailable at runtime
+        // and so should be the last "non-underscore" completion in `typing`
+        let test = cursor_test("from typing import t<CURSOR>");
+
+        let settings = CompletionSettings::default();
+        let completions = completion(&test.db, &settings, test.cursor.file, test.cursor.offset);
+        let last_nonunderscore = completions
+            .into_iter()
+            .filter(|c| !c.name.starts_with('_'))
+            .next_back()
+            .unwrap();
+
+        assert_eq!(&last_nonunderscore.name, "type_check_only");
+        assert!(last_nonunderscore.is_type_check_only);
+    }
+
     #[test]
     fn regression_test_issue_642() {
         // Regression test for https://github.com/astral-sh/ty/issues/642
@@ -3031,6 +3488,572 @@ from os.<CURSOR>
         );
     }
 
+    #[test]
+    fn completion_kind_recursive_type_alias() {
+        let test = cursor_test(
+            r#"
+            type T = T | None
+            def f(rec: T):
+                re<CURSOR>
+            "#,
+        );
+
+        let completions = completion(
+            &test.db,
+            &CompletionSettings::default(),
+            test.cursor.file,
+            test.cursor.offset,
+        );
+        let completion = completions.iter().find(|c| c.name == "rec").unwrap();
+
+        assert_eq!(completion.kind(&test.db), Some(CompletionKind::Struct));
+    }
+
+    #[test]
+    fn no_completions_in_comment() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+# zqzq<CURSOR>
+",
+        );
+
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_double_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(\"zqzq<CURSOR>\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(\"Foo.zqzq<CURSOR>\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_incomplete_double_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(\"zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(\"Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_single_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print('zqzq<CURSOR>')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print('Foo.zqzq<CURSOR>')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_incomplete_single_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print('zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print('Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_double_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(\"\"\"zqzq<CURSOR>\"\"\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(\"\"\"Foo.zqzq<CURSOR>\"\"\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_incomplete_double_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(\"\"\"zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(\"\"\"Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_single_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print('''zqzq<CURSOR>''')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print('''Foo.zqzq<CURSOR>''')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_string_incomplete_single_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print('''zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print('''Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_double_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f\"zqzq<CURSOR>\")
+        ",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f\"{Foo} and Foo.zqzq<CURSOR>\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_incomplete_double_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f\"zqzq<CURSOR>
+        ",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f\"{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_single_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f'zqzq<CURSOR>')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f'{Foo} and Foo.zqzq<CURSOR>')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_incomplete_single_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f'zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f'{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_double_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f\"\"\"zqzq<CURSOR>\"\"\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f\"\"\"{Foo} and Foo.zqzq<CURSOR>\"\"\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_incomplete_double_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f\"\"\"zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f\"\"\"{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_single_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f'''zqzq<CURSOR>''')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f'''{Foo} and Foo.zqzq<CURSOR>''')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_fstring_incomplete_single_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(f'''zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(f'''{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_double_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t\"zqzq<CURSOR>\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t\"{Foo} and Foo.zqzq<CURSOR>\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_incomplete_double_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t\"zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t\"{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_single_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t'zqzq<CURSOR>')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t'{Foo} and Foo.zqzq<CURSOR>')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_incomplete_single_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t'zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t'{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_double_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t\"\"\"zqzq<CURSOR>\"\"\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t\"\"\"{Foo} and Foo.zqzq<CURSOR>\"\"\")
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_incomplete_double_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t\"\"\"zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t\"\"\"{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_single_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t'''zqzq<CURSOR>''')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t'''{Foo} and Foo.zqzq<CURSOR>''')
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn no_completions_in_tstring_incomplete_single_triple_quote() {
+        let test = cursor_test(
+            "\
+zqzqzq = 1
+print(t'''zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+
+        let test = cursor_test(
+            "\
+class Foo:
+    zqzqzq = 1
+print(t'''{Foo} and Foo.zqzq<CURSOR>
+",
+        );
+        assert_snapshot!(test.completions_without_builtins(), @"<No completions found>");
+    }
+
+    #[test]
+    fn typevar_with_upper_bound() {
+        let test = cursor_test(
+            "\
+def f[T: str](msg: T):
+    msg.<CURSOR>
+",
+        );
+        test.assert_completions_include("upper");
+        test.assert_completions_include("capitalize");
+    }
+
+    #[test]
+    fn typevar_with_constraints() {
+        // Test TypeVar with constraints
+        let test = cursor_test(
+            "\
+from typing import TypeVar
+
+class A:
+    only_on_a: int
+    on_a_and_b: str
+
+class B:
+    only_on_b: float
+    on_a_and_b: str
+
+T = TypeVar('T', A, B)
+
+def f(x: T):
+    x.<CURSOR>
+",
+        );
+        test.assert_completions_include("on_a_and_b");
+        test.assert_completions_do_not_include("only_on_a");
+        test.assert_completions_do_not_include("only_on_b");
+    }
+
+    #[test]
+    fn typevar_without_bounds_or_constraints() {
+        let test = cursor_test(
+            "\
+def f[T](x: T):
+    x.<CURSOR>
+",
+        );
+        test.assert_completions_include("__repr__");
+    }
+
+    // NOTE: The methods below are getting somewhat ridiculous.
+    // We should refactor this by converting to using a builder
+    // to set different modes. ---AG
+
     impl CursorTest {
         /// Returns all completions except for builtins.
         fn completions_without_builtins(&self) -> String {
@@ -3040,20 +4063,28 @@ from os.<CURSOR>
         fn completions_without_builtins_with_types(&self) -> String {
             self.completions_if_snapshot(
                 |c| !c.builtin,
-                |c| format!("{} :: {}", c.name, c.ty.display(&self.db)),
+                |c| {
+                    format!(
+                        "{} :: {}",
+                        c.name,
+                        c.ty.map(|ty| ty.display(&self.db).to_string())
+                            .unwrap_or_else(|| "Unavailable".to_string())
+                    )
+                },
             )
         }
 
-        fn completions_if(&self, predicate: impl Fn(&DetailedCompletion) -> bool) -> String {
+        fn completions_if(&self, predicate: impl Fn(&Completion) -> bool) -> String {
             self.completions_if_snapshot(predicate, |c| c.name.as_str().to_string())
         }
 
         fn completions_if_snapshot(
             &self,
-            predicate: impl Fn(&DetailedCompletion) -> bool,
-            snapshot: impl Fn(&DetailedCompletion) -> String,
+            predicate: impl Fn(&Completion) -> bool,
+            snapshot: impl Fn(&Completion) -> String,
         ) -> String {
-            let completions = completion(&self.db, self.cursor.file, self.cursor.offset);
+            let settings = CompletionSettings::default();
+            let completions = completion(&self.db, &settings, self.cursor.file, self.cursor.offset);
             if completions.is_empty() {
                 return "<No completions found>".to_string();
             }
@@ -3076,7 +4107,8 @@ from os.<CURSOR>
 
         #[track_caller]
         fn assert_completions_include(&self, expected: &str) {
-            let completions = completion(&self.db, self.cursor.file, self.cursor.offset);
+            let settings = CompletionSettings::default();
+            let completions = completion(&self.db, &settings, self.cursor.file, self.cursor.offset);
 
             assert!(
                 completions
@@ -3088,7 +4120,8 @@ from os.<CURSOR>
 
         #[track_caller]
         fn assert_completions_do_not_include(&self, unexpected: &str) {
-            let completions = completion(&self.db, self.cursor.file, self.cursor.offset);
+            let settings = CompletionSettings::default();
+            let completions = completion(&self.db, &settings, self.cursor.file, self.cursor.offset);
 
             assert!(
                 completions
diff --git a/crates/ty_ide/src/document_symbols.rs b/crates/ty_ide/src/document_symbols.rs
index f3f1356f90..8e426168dc 100644
--- a/crates/ty_ide/src/document_symbols.rs
+++ b/crates/ty_ide/src/document_symbols.rs
@@ -1,29 +1,16 @@
-use crate::symbols::{SymbolInfo, SymbolsOptions, symbols_for_file};
+use crate::symbols::{FlatSymbols, symbols_for_file};
 use ruff_db::files::File;
 use ty_project::Db;
 
 /// Get all document symbols for a file with the given options.
-pub fn document_symbols_with_options(
-    db: &dyn Db,
-    file: File,
-    options: &SymbolsOptions,
-) -> Vec<SymbolInfo> {
-    symbols_for_file(db, file, options)
-}
-
-/// Get all document symbols for a file (hierarchical by default).
-pub fn document_symbols(db: &dyn Db, file: File) -> Vec<SymbolInfo> {
-    let options = SymbolsOptions {
-        hierarchical: true,
-        global_only: false,
-        query_string: None,
-    };
-    document_symbols_with_options(db, file, &options)
+pub fn document_symbols(db: &dyn Db, file: File) -> &FlatSymbols {
+    symbols_for_file(db, file)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::symbols::{HierarchicalSymbols, SymbolId, SymbolInfo};
     use crate::tests::{CursorTest, IntoDiagnostic, cursor_test};
     use insta::assert_snapshot;
     use ruff_db::diagnostic::{
@@ -94,13 +81,13 @@ class MyClass:
     class_var = 100
     typed_class_var: str = 'class_typed'
     annotated_class_var: float
-    
+
     def __init__(self):
         self.instance_var = 0
-    
+
     def public_method(self):
         return self.instance_var
-    
+
     def _private_method(self):
         pass
 
@@ -198,7 +185,7 @@ def standalone_function():
         12 |     typed_class_var: str = 'class_typed'
         13 |     annotated_class_var: float
            |     ^^^^^^^^^^^^^^^^^^^
-        14 |     
+        14 |
         15 |     def __init__(self):
            |
         info: Field annotated_class_var
@@ -207,7 +194,7 @@ def standalone_function():
           --> main.py:15:9
            |
         13 |     annotated_class_var: float
-        14 |     
+        14 |
         15 |     def __init__(self):
            |         ^^^^^^^^
         16 |         self.instance_var = 0
@@ -218,7 +205,7 @@ def standalone_function():
           --> main.py:18:9
            |
         16 |         self.instance_var = 0
-        17 |     
+        17 |
         18 |     def public_method(self):
            |         ^^^^^^^^^^^^^
         19 |         return self.instance_var
@@ -229,7 +216,7 @@ def standalone_function():
           --> main.py:21:9
            |
         19 |         return self.instance_var
-        20 |     
+        20 |
         21 |     def _private_method(self):
            |         ^^^^^^^^^^^^^^^
         22 |         pass
@@ -256,10 +243,10 @@ def standalone_function():
             "
 class OuterClass:
     OUTER_CONSTANT = 100
-    
+
     def outer_method(self):
         return self.OUTER_CONSTANT
-    
+
     class InnerClass:
         def inner_method(self):
             pass
@@ -282,7 +269,7 @@ class OuterClass:
         2 | class OuterClass:
         3 |     OUTER_CONSTANT = 100
           |     ^^^^^^^^^^^^^^
-        4 |     
+        4 |
         5 |     def outer_method(self):
           |
         info: Constant OUTER_CONSTANT
@@ -291,7 +278,7 @@ class OuterClass:
          --> main.py:5:9
           |
         3 |     OUTER_CONSTANT = 100
-        4 |     
+        4 |
         5 |     def outer_method(self):
           |         ^^^^^^^^^^^^
         6 |         return self.OUTER_CONSTANT
@@ -302,7 +289,7 @@ class OuterClass:
           --> main.py:8:11
            |
          6 |         return self.OUTER_CONSTANT
-         7 |     
+         7 |
          8 |     class InnerClass:
            |           ^^^^^^^^^^
          9 |         def inner_method(self):
@@ -324,42 +311,45 @@ class OuterClass:
 
     impl CursorTest {
         fn document_symbols(&self) -> String {
-            let symbols = document_symbols(&self.db, self.cursor.file);
+            let symbols = document_symbols(&self.db, self.cursor.file).to_hierarchical();
 
             if symbols.is_empty() {
                 return "No symbols found".to_string();
             }
 
-            self.render_diagnostics(
-                symbols
-                    .into_iter()
-                    .flat_map(|symbol| symbol_to_diagnostics(symbol, self.cursor.file)),
-            )
+            self.render_diagnostics(symbols.iter().flat_map(|(id, symbol)| {
+                symbol_to_diagnostics(&symbols, id, symbol, self.cursor.file)
+            }))
         }
     }
 
-    fn symbol_to_diagnostics(symbol: SymbolInfo, file: File) -> Vec<DocumentSymbolDiagnostic> {
+    fn symbol_to_diagnostics<'db>(
+        symbols: &'db HierarchicalSymbols,
+        id: SymbolId,
+        symbol: SymbolInfo<'db>,
+        file: File,
+    ) -> Vec<DocumentSymbolDiagnostic<'db>> {
         // Output the symbol and recursively output all child symbols
-        let mut diagnostics = vec![DocumentSymbolDiagnostic::new(symbol.clone(), file)];
+        let mut diagnostics = vec![DocumentSymbolDiagnostic::new(symbol, file)];
 
-        for child in symbol.children {
-            diagnostics.extend(symbol_to_diagnostics(child, file));
+        for (child_id, child) in symbols.children(id) {
+            diagnostics.extend(symbol_to_diagnostics(symbols, child_id, child, file));
         }
 
         diagnostics
     }
-    struct DocumentSymbolDiagnostic {
-        symbol: SymbolInfo,
+    struct DocumentSymbolDiagnostic<'db> {
+        symbol: SymbolInfo<'db>,
         file: File,
     }
 
-    impl DocumentSymbolDiagnostic {
-        fn new(symbol: SymbolInfo, file: File) -> Self {
+    impl<'db> DocumentSymbolDiagnostic<'db> {
+        fn new(symbol: SymbolInfo<'db>, file: File) -> Self {
             Self { symbol, file }
         }
     }
 
-    impl IntoDiagnostic for DocumentSymbolDiagnostic {
+    impl IntoDiagnostic for DocumentSymbolDiagnostic<'_> {
         fn into_diagnostic(self) -> Diagnostic {
             let symbol_kind_str = self.symbol.kind.to_string();
 
diff --git a/crates/ty_ide/src/find_node.rs b/crates/ty_ide/src/find_node.rs
index a56be5f7b9..74c1de060b 100644
--- a/crates/ty_ide/src/find_node.rs
+++ b/crates/ty_ide/src/find_node.rs
@@ -116,10 +116,10 @@ impl<'a> CoveringNode<'a> {
         Ok(self)
     }
 
-    /// Returns an iterator over the ancestor nodes, starting from the root
-    /// and ending with the covering node.
-    pub(crate) fn ancestors(&self) -> impl Iterator<Item = AnyNodeRef<'a>> + '_ {
-        self.nodes.iter().copied()
+    /// Returns an iterator over the ancestor nodes, starting with the node itself
+    /// and walking towards the root.
+    pub(crate) fn ancestors(&self) -> impl DoubleEndedIterator<Item = AnyNodeRef<'a>> + '_ {
+        self.nodes.iter().copied().rev()
     }
 
     /// Finds the index of the node that fully covers the range and
diff --git a/crates/ty_ide/src/goto.rs b/crates/ty_ide/src/goto.rs
index 52af38896b..d7a7091f94 100644
--- a/crates/ty_ide/src/goto.rs
+++ b/crates/ty_ide/src/goto.rs
@@ -9,15 +9,17 @@ use crate::find_node::covering_node;
 use crate::stub_mapping::StubMapper;
 use ruff_db::parsed::ParsedModuleRef;
 use ruff_python_ast::{self as ast, AnyNodeRef};
-use ruff_python_parser::TokenKind;
+use ruff_python_parser::{TokenKind, Tokens};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use ty_python_semantic::HasDefinition;
-use ty_python_semantic::ImportAliasResolution;
+
 use ty_python_semantic::ResolvedDefinition;
 use ty_python_semantic::types::Type;
-use ty_python_semantic::types::definitions_for_keyword_argument;
+use ty_python_semantic::types::ide_support::{
+    call_signature_details, definitions_for_keyword_argument,
+};
 use ty_python_semantic::{
-    HasType, SemanticModel, definitions_for_imported_symbol, definitions_for_name,
+    HasDefinition, HasType, ImportAliasResolution, SemanticModel, definitions_for_imported_symbol,
+    definitions_for_name,
 };
 
 #[derive(Clone, Debug)]
@@ -27,6 +29,28 @@ pub(crate) enum GotoTarget<'a> {
     ClassDef(&'a ast::StmtClassDef),
     Parameter(&'a ast::Parameter),
 
+    /// Go to on the operator of a binary operation.
+    ///
+    /// ```py
+    /// a + b
+    ///   ^
+    /// ```
+    BinOp {
+        expression: &'a ast::ExprBinOp,
+        operator_range: TextRange,
+    },
+
+    /// Go to where the operator of a unary operation is defined.
+    ///
+    /// ```py
+    /// -a
+    /// ^
+    /// ```
+    UnaryOp {
+        expression: &'a ast::ExprUnaryOp,
+        operator_range: TextRange,
+    },
+
     /// Multi-part module names
     /// Handles both `import foo.bar` and `from foo.bar import baz` cases
     /// ```py
@@ -145,6 +169,26 @@ pub(crate) enum GotoTarget<'a> {
     Globals {
         identifier: &'a ast::Identifier,
     },
+    /// Go to on the invocation of a callable
+    ///
+    /// ```py
+    /// x = mymodule.MyClass(1, 2)
+    ///              ^^^^^^^
+    /// ```
+    ///
+    /// This is equivalent to `GotoTarget::Expression(callable)` but enriched
+    /// with information about the actual callable implementation.
+    ///
+    /// That is, if you click on `MyClass` in `MyClass()` it is *both* a
+    /// reference to the class and to the initializer of the class. Therefore
+    /// it would be ideal for goto-* and docstrings to be some intelligent
+    /// merging of both the class and the initializer.
+    Call {
+        /// The callable that can actually be selected by a cursor
+        callable: ast::ExprRef<'a>,
+        /// The call of the callable
+        call: &'a ast::ExprCall,
+    },
 }
 
 /// The resolved definitions for a `GotoTarget`
@@ -258,17 +302,30 @@ impl GotoTarget<'_> {
             GotoTarget::ImportModuleAlias { alias } => alias.inferred_type(model),
             GotoTarget::ExceptVariable(except) => except.inferred_type(model),
             GotoTarget::KeywordArgument { keyword, .. } => keyword.value.inferred_type(model),
+            // When asking the type of a callable, usually you want the callable itself?
+            // (i.e. the type of `MyClass` in `MyClass()` is `<class MyClass>` and not `() -> MyClass`)
+            GotoTarget::Call { callable, .. } => callable.inferred_type(model),
+            GotoTarget::TypeParamTypeVarName(typevar) => typevar.inferred_type(model),
             // TODO: Support identifier targets
             GotoTarget::PatternMatchRest(_)
             | GotoTarget::PatternKeywordArgument(_)
             | GotoTarget::PatternMatchStarName(_)
             | GotoTarget::PatternMatchAsName(_)
             | GotoTarget::ImportModuleComponent { .. }
-            | GotoTarget::TypeParamTypeVarName(_)
             | GotoTarget::TypeParamParamSpecName(_)
             | GotoTarget::TypeParamTypeVarTupleName(_)
             | GotoTarget::NonLocal { .. }
             | GotoTarget::Globals { .. } => return None,
+            GotoTarget::BinOp { expression, .. } => {
+                let (_, ty) =
+                    ty_python_semantic::definitions_for_bin_op(model.db(), model, expression)?;
+                ty
+            }
+            GotoTarget::UnaryOp { expression, .. } => {
+                let (_, ty) =
+                    ty_python_semantic::definitions_for_unary_op(model.db(), model, expression)?;
+                ty
+            }
         };
 
         Some(ty)
@@ -293,18 +350,10 @@ impl GotoTarget<'_> {
         alias_resolution: ImportAliasResolution,
     ) -> Option<DefinitionsOrTargets<'db>> {
         use crate::NavigationTarget;
-        use ruff_python_ast as ast;
 
         match self {
-            GotoTarget::Expression(expression) => match expression {
-                ast::ExprRef::Name(name) => Some(DefinitionsOrTargets::Definitions(
-                    definitions_for_name(db, file, name),
-                )),
-                ast::ExprRef::Attribute(attribute) => Some(DefinitionsOrTargets::Definitions(
-                    ty_python_semantic::definitions_for_attribute(db, file, attribute),
-                )),
-                _ => None,
-            },
+            GotoTarget::Expression(expression) => definitions_for_expression(db, file, expression)
+                .map(DefinitionsOrTargets::Definitions),
 
             // For already-defined symbols, they are their own definitions
             GotoTarget::FunctionDef(function) => {
@@ -417,6 +466,39 @@ impl GotoTarget<'_> {
                 }
             }
 
+            // For callables, both the definition of the callable and the actual function impl are relevant.
+            //
+            // Prefer the function impl over the callable so that its docstrings win if defined.
+            GotoTarget::Call { callable, call } => {
+                let mut definitions = definitions_for_callable(db, file, call);
+                let expr_definitions =
+                    definitions_for_expression(db, file, callable).unwrap_or_default();
+                definitions.extend(expr_definitions);
+
+                if definitions.is_empty() {
+                    None
+                } else {
+                    Some(DefinitionsOrTargets::Definitions(definitions))
+                }
+            }
+
+            GotoTarget::BinOp { expression, .. } => {
+                let model = SemanticModel::new(db, file);
+
+                let (definitions, _) =
+                    ty_python_semantic::definitions_for_bin_op(db, &model, expression)?;
+
+                Some(DefinitionsOrTargets::Definitions(definitions))
+            }
+
+            GotoTarget::UnaryOp { expression, .. } => {
+                let model = SemanticModel::new(db, file);
+                let (definitions, _) =
+                    ty_python_semantic::definitions_for_unary_op(db, &model, expression)?;
+
+                Some(DefinitionsOrTargets::Definitions(definitions))
+            }
+
             _ => None,
         }
     }
@@ -427,7 +509,11 @@ impl GotoTarget<'_> {
     /// to this goto target.
     pub(crate) fn to_string(&self) -> Option<Cow<'_, str>> {
         match self {
-            GotoTarget::Expression(expression) => match expression {
+            GotoTarget::Call {
+                callable: expression,
+                ..
+            }
+            | GotoTarget::Expression(expression) => match expression {
                 ast::ExprRef::Name(name) => Some(Cow::Borrowed(name.id.as_str())),
                 ast::ExprRef::Attribute(attr) => Some(Cow::Borrowed(attr.attr.as_str())),
                 _ => None,
@@ -486,6 +572,7 @@ impl GotoTarget<'_> {
             }
             GotoTarget::NonLocal { identifier, .. } => Some(Cow::Borrowed(identifier.as_str())),
             GotoTarget::Globals { identifier, .. } => Some(Cow::Borrowed(identifier.as_str())),
+            GotoTarget::BinOp { .. } | GotoTarget::UnaryOp { .. } => None,
         }
     }
 
@@ -493,6 +580,7 @@ impl GotoTarget<'_> {
     pub(crate) fn from_covering_node<'a>(
         covering_node: &crate::find_node::CoveringNode<'a>,
         offset: TextSize,
+        tokens: &Tokens,
     ) -> Option<GotoTarget<'a>> {
         tracing::trace!("Covering node is of kind {:?}", covering_node.node().kind());
 
@@ -627,7 +715,18 @@ impl GotoTarget<'_> {
                     Some(GotoTarget::TypeParamTypeVarTupleName(var_tuple))
                 }
                 Some(AnyNodeRef::ExprAttribute(attribute)) => {
-                    Some(GotoTarget::Expression(attribute.into()))
+                    // Check if this is seemingly a callable being invoked (the `y` in `x.y(...)`)
+                    let grandparent_expr = covering_node.ancestors().nth(2);
+                    let attribute_expr = attribute.into();
+                    if let Some(AnyNodeRef::ExprCall(call)) = grandparent_expr {
+                        if ruff_python_ast::ExprRef::from(&call.func) == attribute_expr {
+                            return Some(GotoTarget::Call {
+                                call,
+                                callable: attribute_expr,
+                            });
+                        }
+                    }
+                    Some(GotoTarget::Expression(attribute_expr))
                 }
                 Some(AnyNodeRef::StmtNonlocal(_)) => Some(GotoTarget::NonLocal { identifier }),
                 Some(AnyNodeRef::StmtGlobal(_)) => Some(GotoTarget::Globals { identifier }),
@@ -641,7 +740,57 @@ impl GotoTarget<'_> {
                 }
             },
 
-            node => node.as_expr_ref().map(GotoTarget::Expression),
+            AnyNodeRef::ExprBinOp(binary) => {
+                if offset >= binary.left.end() && offset < binary.right.start() {
+                    let between_operands =
+                        tokens.in_range(TextRange::new(binary.left.end(), binary.right.start()));
+                    if let Some(operator_token) = between_operands
+                        .iter()
+                        .find(|token| token.kind().as_binary_operator().is_some())
+                        && operator_token.range().contains_inclusive(offset)
+                    {
+                        return Some(GotoTarget::BinOp {
+                            expression: binary,
+                            operator_range: operator_token.range(),
+                        });
+                    }
+                }
+
+                Some(GotoTarget::Expression(binary.into()))
+            }
+
+            AnyNodeRef::ExprUnaryOp(unary) => {
+                if offset >= unary.start() && offset < unary.operand.start() {
+                    let before_operand =
+                        tokens.in_range(TextRange::new(unary.start(), unary.operand.start()));
+
+                    if let Some(operator_token) = before_operand
+                        .iter()
+                        .find(|token| token.kind().as_unary_operator().is_some())
+                        && operator_token.range().contains_inclusive(offset)
+                    {
+                        return Some(GotoTarget::UnaryOp {
+                            expression: unary,
+                            operator_range: operator_token.range(),
+                        });
+                    }
+                }
+                Some(GotoTarget::Expression(unary.into()))
+            }
+
+            node => {
+                // Check if this is seemingly a callable being invoked (the `x` in `x(...)`)
+                let parent = covering_node.parent();
+                if let (Some(AnyNodeRef::ExprCall(call)), AnyNodeRef::ExprName(name)) =
+                    (parent, node)
+                {
+                    return Some(GotoTarget::Call {
+                        call,
+                        callable: name.into(),
+                    });
+                }
+                node.as_expr_ref().map(GotoTarget::Expression)
+            }
         }
     }
 }
@@ -649,7 +798,11 @@ impl GotoTarget<'_> {
 impl Ranged for GotoTarget<'_> {
     fn range(&self) -> TextRange {
         match self {
-            GotoTarget::Expression(expression) => match expression {
+            GotoTarget::Call {
+                callable: expression,
+                ..
+            }
+            | GotoTarget::Expression(expression) => match expression {
                 ast::ExprRef::Attribute(attribute) => attribute.attr.range,
                 _ => expression.range(),
             },
@@ -672,6 +825,8 @@ impl Ranged for GotoTarget<'_> {
             GotoTarget::TypeParamTypeVarTupleName(tuple) => tuple.name.range,
             GotoTarget::NonLocal { identifier, .. } => identifier.range,
             GotoTarget::Globals { identifier, .. } => identifier.range,
+            GotoTarget::BinOp { operator_range, .. }
+            | GotoTarget::UnaryOp { operator_range, .. } => *operator_range,
         }
     }
 }
@@ -711,6 +866,35 @@ fn convert_resolved_definitions_to_targets(
         .collect()
 }
 
+/// Shared helper to get definitions for an expr (that is presumably a name/attr)
+fn definitions_for_expression<'db>(
+    db: &'db dyn crate::Db,
+    file: ruff_db::files::File,
+    expression: &ruff_python_ast::ExprRef<'_>,
+) -> Option<Vec<ResolvedDefinition<'db>>> {
+    match expression {
+        ast::ExprRef::Name(name) => Some(definitions_for_name(db, file, name)),
+        ast::ExprRef::Attribute(attribute) => Some(ty_python_semantic::definitions_for_attribute(
+            db, file, attribute,
+        )),
+        _ => None,
+    }
+}
+
+fn definitions_for_callable<'db>(
+    db: &'db dyn crate::Db,
+    file: ruff_db::files::File,
+    call: &ast::ExprCall,
+) -> Vec<ResolvedDefinition<'db>> {
+    let model = SemanticModel::new(db, file);
+    // Attempt to refine to a specific call
+    let signature_info = call_signature_details(db, &model, call);
+    signature_info
+        .into_iter()
+        .filter_map(|signature| signature.definition.map(ResolvedDefinition::Definition))
+        .collect()
+}
+
 /// Shared helper to map and convert resolved definitions into navigation targets.
 fn definitions_to_navigation_targets<'db>(
     db: &dyn crate::Db,
@@ -741,14 +925,24 @@ pub(crate) fn find_goto_target(
             | TokenKind::Complex
             | TokenKind::Float
             | TokenKind::Int => 1,
+
+            TokenKind::Comment => -1,
+
+            // if we have a<CURSOR>+b`, prefer the `+` token (by respecting the token ordering)
+            // This matches VS Code's behavior where it sends the start of the clicked token as offset.
+            kind if kind.as_binary_operator().is_some() || kind.as_unary_operator().is_some() => 1,
             _ => 0,
         })?;
 
+    if token.kind().is_comment() {
+        return None;
+    }
+
     let covering_node = covering_node(parsed.syntax().into(), token.range())
         .find_first(|node| node.is_identifier() || node.is_expression())
         .ok()?;
 
-    GotoTarget::from_covering_node(&covering_node, offset)
+    GotoTarget::from_covering_node(&covering_node, offset, parsed.tokens())
 }
 
 /// Helper function to resolve a module name and create a navigation target.
diff --git a/crates/ty_ide/src/goto_declaration.rs b/crates/ty_ide/src/goto_declaration.rs
index 52025ac6e2..bd67246b03 100644
--- a/crates/ty_ide/src/goto_declaration.rs
+++ b/crates/ty_ide/src/goto_declaration.rs
@@ -53,19 +53,19 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:17
+         --> main.py:2:5
           |
-        2 |             def my_function(x, y):
-          |                 ^^^^^^^^^^^
-        3 |                 return x + y
+        2 | def my_function(x, y):
+          |     ^^^^^^^^^^^
+        3 |     return x + y
           |
         info: Source
-         --> main.py:5:22
+         --> main.py:5:10
           |
-        3 |                 return x + y
+        3 |     return x + y
         4 |
-        5 |             result = my_function(1, 2)
-          |                      ^^^^^^^^^^^
+        5 | result = my_function(1, 2)
+          |          ^^^^^^^^^^^
           |
         ");
     }
@@ -81,18 +81,18 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:13
+         --> main.py:2:1
           |
-        2 |             x = 42
-          |             ^
-        3 |             y = x
+        2 | x = 42
+          | ^
+        3 | y = x
           |
         info: Source
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        2 |             x = 42
-        3 |             y = x
-          |                 ^
+        2 | x = 42
+        3 | y = x
+          |     ^
           |
         ");
     }
@@ -111,20 +111,37 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:19
+         --> main.py:2:7
           |
-        2 |             class MyClass:
-          |                   ^^^^^^^
-        3 |                 def __init__(self):
-        4 |                     pass
+        2 | class MyClass:
+          |       ^^^^^^^
+        3 |     def __init__(self):
+        4 |         pass
           |
         info: Source
-         --> main.py:6:24
+         --> main.py:6:12
           |
-        4 |                     pass
+        4 |         pass
         5 |
-        6 |             instance = MyClass()
-          |                        ^^^^^^^
+        6 | instance = MyClass()
+          |            ^^^^^^^
+          |
+
+        info[goto-declaration]: Declaration
+         --> main.py:3:9
+          |
+        2 | class MyClass:
+        3 |     def __init__(self):
+          |         ^^^^^^^^
+        4 |         pass
+          |
+        info: Source
+         --> main.py:6:12
+          |
+        4 |         pass
+        5 |
+        6 | instance = MyClass()
+          |            ^^^^^^^
           |
         ");
     }
@@ -140,18 +157,18 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:21
+         --> main.py:2:9
           |
-        2 |             def foo(param):
-          |                     ^^^^^
-        3 |                 return param * 2
+        2 | def foo(param):
+          |         ^^^^^
+        3 |     return param * 2
           |
         info: Source
-         --> main.py:3:24
+         --> main.py:3:12
           |
-        2 |             def foo(param):
-        3 |                 return param * 2
-          |                        ^^^^^
+        2 | def foo(param):
+        3 |     return param * 2
+          |            ^^^^^
           |
         ");
     }
@@ -168,20 +185,20 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:30
+         --> main.py:2:18
           |
-        2 |             def generic_func[T](value: T) -> T:
-          |                              ^
-        3 |                 v: T = value
-        4 |                 return v
+        2 | def generic_func[T](value: T) -> T:
+          |                  ^
+        3 |     v: T = value
+        4 |     return v
           |
         info: Source
-         --> main.py:3:20
+         --> main.py:3:8
           |
-        2 |             def generic_func[T](value: T) -> T:
-        3 |                 v: T = value
-          |                    ^
-        4 |                 return v
+        2 | def generic_func[T](value: T) -> T:
+        3 |     v: T = value
+          |        ^
+        4 |     return v
           |
         ");
     }
@@ -198,20 +215,20 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:32
+         --> main.py:2:20
           |
-        2 |             class GenericClass[T]:
-          |                                ^
-        3 |                 def __init__(self, value: T):
-        4 |                     self.value = value
+        2 | class GenericClass[T]:
+          |                    ^
+        3 |     def __init__(self, value: T):
+        4 |         self.value = value
           |
         info: Source
-         --> main.py:3:43
+         --> main.py:3:31
           |
-        2 |             class GenericClass[T]:
-        3 |                 def __init__(self, value: T):
-          |                                           ^
-        4 |                     self.value = value
+        2 | class GenericClass[T]:
+        3 |     def __init__(self, value: T):
+          |                               ^
+        4 |         self.value = value
           |
         ");
     }
@@ -230,21 +247,21 @@ mod tests {
 
         assert_snapshot!(test.goto_declaration(), @r#"
         info[goto-declaration]: Declaration
-         --> main.py:2:13
+         --> main.py:2:1
           |
-        2 |             x = "outer"
-          |             ^
-        3 |             def outer_func():
-        4 |                 def inner_func():
+        2 | x = "outer"
+          | ^
+        3 | def outer_func():
+        4 |     def inner_func():
           |
         info: Source
-         --> main.py:5:28
+         --> main.py:5:16
           |
-        3 |             def outer_func():
-        4 |                 def inner_func():
-        5 |                     return x  # Should find outer x
-          |                            ^
-        6 |                 return inner_func
+        3 | def outer_func():
+        4 |     def inner_func():
+        5 |         return x  # Should find outer x
+          |                ^
+        6 |     return inner_func
           |
         "#);
     }
@@ -852,21 +869,21 @@ def another_helper(path):
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:4:21
+         --> main.py:4:9
           |
-        2 |             class C:
-        3 |                 def __init__(self):
-        4 |                     self.x: int = 1
-          |                     ^^^^^^
+        2 | class C:
+        3 |     def __init__(self):
+        4 |         self.x: int = 1
+          |         ^^^^^^
         5 |
-        6 |             c = C()
+        6 | c = C()
           |
         info: Source
-         --> main.py:7:19
+         --> main.py:7:7
           |
-        6 |             c = C()
-        7 |             y = c.x
-          |                   ^
+        6 | c = C()
+        7 | y = c.x
+          |       ^
           |
         ");
     }
@@ -890,21 +907,21 @@ def another_helper(path):
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:4:21
+         --> main.py:4:9
           |
-        2 |             class C:
-        3 |                 def __init__(self):
-        4 |                     self.x: int = 1
-          |                     ^^^^^^
+        2 | class C:
+        3 |     def __init__(self):
+        4 |         self.x: int = 1
+          |         ^^^^^^
         5 |
-        6 |             class D:
+        6 | class D:
           |
         info: Source
-          --> main.py:11:21
+          --> main.py:11:9
            |
-        10 |             d = D()
-        11 |             y = d.y.x
-           |                     ^
+        10 | d = D()
+        11 | y = d.y.x
+           |         ^
            |
         ");
     }
@@ -924,21 +941,21 @@ def another_helper(path):
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:4:21
+         --> main.py:4:9
           |
-        2 |             class C:
-        3 |                 def __init__(self):
-        4 |                     self.x = 1
-          |                     ^^^^^^
+        2 | class C:
+        3 |     def __init__(self):
+        4 |         self.x = 1
+          |         ^^^^^^
         5 |
-        6 |             c = C()
+        6 | c = C()
           |
         info: Source
-         --> main.py:7:19
+         --> main.py:7:7
           |
-        6 |             c = C()
-        7 |             y = c.x
-          |                   ^
+        6 | c = C()
+        7 | y = c.x
+          |       ^
           |
         ");
     }
@@ -958,19 +975,19 @@ def another_helper(path):
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:3:21
+         --> main.py:3:9
           |
-        2 |             class C:
-        3 |                 def foo(self):
-          |                     ^^^
-        4 |                     return 42
+        2 | class C:
+        3 |     def foo(self):
+          |         ^^^
+        4 |         return 42
           |
         info: Source
-         --> main.py:7:21
+         --> main.py:7:9
           |
-        6 |             c = C()
-        7 |             res = c.foo()
-          |                     ^^^
+        6 | c = C()
+        7 | res = c.foo()
+          |         ^^^
           |
         ");
     }
@@ -1036,7 +1053,7 @@ def outer():
         2 | def outer():
         3 |     x = "outer_value"
           |     ^
-        4 |     
+        4 |
         5 |     def inner():
           |
         info: Source
@@ -1046,7 +1063,7 @@ def outer():
          7 |         x = "modified"
          8 |         return x  # Should find the nonlocal x declaration in outer scope
            |                ^
-         9 |     
+         9 |
         10 |     return inner
            |
         "#);
@@ -1103,20 +1120,20 @@ def function():
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        2 |             class A:
-        3 |                 x = 10
-          |                 ^
+        2 | class A:
+        3 |     x = 10
+          |     ^
         4 |
-        5 |             class B(A):
+        5 | class B(A):
           |
         info: Source
-         --> main.py:9:19
+         --> main.py:9:7
           |
-        8 |             b = B()
-        9 |             y = b.x
-          |                   ^
+        8 | b = B()
+        9 | y = b.x
+          |       ^
           |
         ");
     }
@@ -1140,19 +1157,19 @@ def function():
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:7:21
+         --> main.py:7:9
           |
-        6 |                 @property
-        7 |                 def value(self):
-          |                     ^^^^^
-        8 |                     return self._value
+        6 |     @property
+        7 |     def value(self):
+          |         ^^^^^
+        8 |         return self._value
           |
         info: Source
-          --> main.py:11:15
+          --> main.py:11:3
            |
-        10 |             c = C()
-        11 |             c.value = 42
-           |               ^^^^^
+        10 | c = C()
+        11 | c.value = 42
+           |   ^^^^^
            |
         ");
     }
@@ -1213,21 +1230,21 @@ def function():
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:6:17
+         --> main.py:6:5
           |
-        4 |             class Drawable(Protocol):
-        5 |                 def draw(self) -> None: ...
-        6 |                 name: str
-          |                 ^^^^
+        4 | class Drawable(Protocol):
+        5 |     def draw(self) -> None: ...
+        6 |     name: str
+          |     ^^^^
         7 |
-        8 |             def use_drawable(obj: Drawable):
+        8 | def use_drawable(obj: Drawable):
           |
         info: Source
-         --> main.py:9:21
+         --> main.py:9:9
           |
-        8 |             def use_drawable(obj: Drawable):
-        9 |                 obj.name
-          |                     ^^^^
+        8 | def use_drawable(obj: Drawable):
+        9 |     obj.name
+          |         ^^^^
           |
         ");
     }
@@ -1252,14 +1269,14 @@ class MyClass:
         2 | class MyClass:
         3 |     ClassType = int
           |     ^^^^^^^^^
-        4 |     
+        4 |
         5 |     def generic_method[T](self, value: ClassType) -> T:
           |
         info: Source
          --> main.py:5:40
           |
         3 |     ClassType = int
-        4 |     
+        4 |
         5 |     def generic_method[T](self, value: ClassType) -> T:
           |                                        ^^^^^^^^^
         6 |         return value
@@ -1280,19 +1297,19 @@ class MyClass:
 
         assert_snapshot!(test.goto_declaration(), @r"
         info[goto-declaration]: Declaration
-         --> main.py:2:32
+         --> main.py:2:20
           |
-        2 |             def my_function(x, y, z=10):
-          |                                ^
-        3 |                 return x + y + z
+        2 | def my_function(x, y, z=10):
+          |                    ^
+        3 |     return x + y + z
           |
         info: Source
-         --> main.py:5:37
+         --> main.py:5:25
           |
-        3 |                 return x + y + z
+        3 |     return x + y + z
         4 |
-        5 |             result = my_function(1, y=2, z=3)
-          |                                     ^
+        5 | result = my_function(1, y=2, z=3)
+          |                         ^
           |
         ");
     }
@@ -1320,41 +1337,497 @@ class MyClass:
         // Should navigate to the parameter in both matching overloads
         assert_snapshot!(test.goto_declaration(), @r#"
         info[goto-declaration]: Declaration
-         --> main.py:5:36
+         --> main.py:5:24
           |
-        4 |             @overload
-        5 |             def process(data: str, format: str) -> str: ...
-          |                                    ^^^^^^
+        4 | @overload
+        5 | def process(data: str, format: str) -> str: ...
+          |                        ^^^^^^
         6 |
-        7 |             @overload
+        7 | @overload
           |
         info: Source
-          --> main.py:14:39
+          --> main.py:14:27
            |
-        13 |             # Call the overloaded function
-        14 |             result = process("hello", format="json")
-           |                                       ^^^^^^
+        13 | # Call the overloaded function
+        14 | result = process("hello", format="json")
+           |                           ^^^^^^
            |
 
         info[goto-declaration]: Declaration
-          --> main.py:8:36
+          --> main.py:8:24
            |
-         7 |             @overload
-         8 |             def process(data: int, format: int) -> int: ...
-           |                                    ^^^^^^
+         7 | @overload
+         8 | def process(data: int, format: int) -> int: ...
+           |                        ^^^^^^
          9 |
-        10 |             def process(data, format):
+        10 | def process(data, format):
            |
         info: Source
-          --> main.py:14:39
+          --> main.py:14:27
            |
-        13 |             # Call the overloaded function
-        14 |             result = process("hello", format="json")
-           |                                       ^^^^^^
+        13 | # Call the overloaded function
+        14 | result = process("hello", format="json")
+           |                           ^^^^^^
            |
         "#);
     }
 
+    #[test]
+    fn goto_declaration_overload_type_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: str): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_declaration(), @r"
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:5:5
+          |
+        4 | @overload
+        5 | def ab(a: int): ...
+          |     ^^
+        6 |
+        7 | @overload
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:8:5
+          |
+        7 | @overload
+        8 | def ab(a: str): ...
+          |     ^^
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_declaration_overload_type_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+from mymodule import ab
+
+a<CURSOR>b("hello")
+"#,
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: str): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_declaration(), @r#"
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:5:5
+          |
+        4 | @overload
+        5 | def ab(a: int): ...
+          |     ^^
+        6 |
+        7 | @overload
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab("hello")
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:8:5
+          |
+        7 | @overload
+        8 | def ab(a: str): ...
+          |     ^^
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab("hello")
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_declaration_overload_arity_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, 2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int): ...
+
+@overload
+def ab(a: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_declaration(), @r"
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:5:5
+          |
+        4 | @overload
+        5 | def ab(a: int, b: int): ...
+          |     ^^
+        6 |
+        7 | @overload
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, 2)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:8:5
+          |
+        7 | @overload
+        8 | def ab(a: int): ...
+          |     ^^
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, 2)
+          | ^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_declaration_overload_arity_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int): ...
+
+@overload
+def ab(a: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_declaration(), @r"
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:5:5
+          |
+        4 | @overload
+        5 | def ab(a: int, b: int): ...
+          |     ^^
+        6 |
+        7 | @overload
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:8:5
+          |
+        7 | @overload
+        8 | def ab(a: int): ...
+          |     ^^
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_declaration_overload_keyword_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, b=2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: int, *, b: int): ...
+
+@overload
+def ab(a: int, *, c: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_declaration(), @r"
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:5:5
+          |
+        4 | @overload
+        5 | def ab(a: int): ...
+          |     ^^
+        6 |
+        7 | @overload
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, b=2)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+          --> mymodule.pyi:8:5
+           |
+         7 | @overload
+         8 | def ab(a: int, *, b: int): ...
+           |     ^^
+         9 |
+        10 | @overload
+           |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, b=2)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+          --> mymodule.pyi:11:5
+           |
+        10 | @overload
+        11 | def ab(a: int, *, c: int): ...
+           |     ^^
+           |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, b=2)
+          | ^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_declaration_overload_keyword_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, c=2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: int, *, b: int): ...
+
+@overload
+def ab(a: int, *, c: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_declaration(), @r"
+        info[goto-declaration]: Declaration
+         --> mymodule.pyi:5:5
+          |
+        4 | @overload
+        5 | def ab(a: int): ...
+          |     ^^
+        6 |
+        7 | @overload
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, c=2)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+          --> mymodule.pyi:8:5
+           |
+         7 | @overload
+         8 | def ab(a: int, *, b: int): ...
+           |     ^^
+         9 |
+        10 | @overload
+           |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, c=2)
+          | ^^
+          |
+
+        info[goto-declaration]: Declaration
+          --> mymodule.pyi:11:5
+           |
+        10 | @overload
+        11 | def ab(a: int, *, c: int): ...
+           |     ^^
+           |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, c=2)
+          | ^^
+          |
+        ");
+    }
+
     impl CursorTest {
         fn goto_declaration(&self) -> String {
             let Some(targets) = goto_declaration(&self.db, self.cursor.file, self.cursor.offset)
diff --git a/crates/ty_ide/src/goto_definition.rs b/crates/ty_ide/src/goto_definition.rs
index aaa02cd2a2..6cc6d0c23d 100644
--- a/crates/ty_ide/src/goto_definition.rs
+++ b/crates/ty_ide/src/goto_definition.rs
@@ -466,6 +466,22 @@ class MyOtherClass:
          --> main.py:3:5
           |
         2 | from mymodule import MyClass
+        3 | x = MyClass(0)
+          |     ^^^^^^^
+          |
+
+        info[goto-definition]: Definition
+         --> mymodule.py:3:9
+          |
+        2 | class MyClass:
+        3 |     def __init__(self, val):
+          |         ^^^^^^^^
+        4 |         self.val = val
+          |
+        info: Source
+         --> main.py:3:5
+          |
+        2 | from mymodule import MyClass
         3 | x = MyClass(0)
           |     ^^^^^^^
           |
@@ -630,6 +646,759 @@ class MyClass: ...
         ");
     }
 
+    /// goto-definition on a nested call using a keyword arg where both funcs have that arg name
+    ///
+    /// In this case they ultimately have different signatures.
+    #[test]
+    fn goto_definition_nested_keyword_arg1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+def my_func(ab, y, z = None): ...
+def my_other_func(ab, y): ...
+
+my_other_func(my_func(a<CURSOR>b=5, y=2), 0)
+my_func(my_other_func(ab=5, y=2), 0)
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:2:13
+          |
+        2 | def my_func(ab, y, z = None): ...
+          |             ^^
+        3 | def my_other_func(ab, y): ...
+          |
+        info: Source
+         --> main.py:5:23
+          |
+        3 | def my_other_func(ab, y): ...
+        4 |
+        5 | my_other_func(my_func(ab=5, y=2), 0)
+          |                       ^^
+        6 | my_func(my_other_func(ab=5, y=2), 0)
+          |
+        ");
+    }
+
+    /// goto-definition on a nested call using a keyword arg where both funcs have that arg name
+    ///
+    /// In this case they ultimately have different signatures.
+    #[test]
+    fn goto_definition_nested_keyword_arg2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+def my_func(ab, y, z = None): ...
+def my_other_func(ab, y): ...
+
+my_other_func(my_func(ab=5, y=2), 0)
+my_func(my_other_func(a<CURSOR>b=5, y=2), 0)
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:19
+          |
+        2 | def my_func(ab, y, z = None): ...
+        3 | def my_other_func(ab, y): ...
+          |                   ^^
+        4 |
+        5 | my_other_func(my_func(ab=5, y=2), 0)
+          |
+        info: Source
+         --> main.py:6:23
+          |
+        5 | my_other_func(my_func(ab=5, y=2), 0)
+        6 | my_func(my_other_func(ab=5, y=2), 0)
+          |                       ^^
+          |
+        ");
+    }
+
+    /// goto-definition on a nested call using a keyword arg where both funcs have that arg name
+    ///
+    /// In this case they have identical signatures.
+    #[test]
+    fn goto_definition_nested_keyword_arg3() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+def my_func(ab, y): ...
+def my_other_func(ab, y): ...
+
+my_other_func(my_func(a<CURSOR>b=5, y=2), 0)
+my_func(my_other_func(ab=5, y=2), 0)
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:2:13
+          |
+        2 | def my_func(ab, y): ...
+          |             ^^
+        3 | def my_other_func(ab, y): ...
+          |
+        info: Source
+         --> main.py:5:23
+          |
+        3 | def my_other_func(ab, y): ...
+        4 |
+        5 | my_other_func(my_func(ab=5, y=2), 0)
+          |                       ^^
+        6 | my_func(my_other_func(ab=5, y=2), 0)
+          |
+        ");
+    }
+
+    /// goto-definition on a nested call using a keyword arg where both funcs have that arg name
+    ///
+    /// In this case they have identical signatures.
+    #[test]
+    fn goto_definition_nested_keyword_arg4() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+def my_func(ab, y): ...
+def my_other_func(ab, y): ...
+
+my_other_func(my_func(ab=5, y=2), 0)
+my_func(my_other_func(a<CURSOR>b=5, y=2), 0)
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:19
+          |
+        2 | def my_func(ab, y): ...
+        3 | def my_other_func(ab, y): ...
+          |                   ^^
+        4 |
+        5 | my_other_func(my_func(ab=5, y=2), 0)
+          |
+        info: Source
+         --> main.py:6:23
+          |
+        5 | my_other_func(my_func(ab=5, y=2), 0)
+        6 | my_func(my_other_func(ab=5, y=2), 0)
+          |                       ^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_overload_type_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: str): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r#"
+        info[goto-definition]: Definition
+         --> mymodule.py:2:5
+          |
+        2 | def ab(a):
+          |     ^^
+        3 |     """the real implementation!"""
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_definition_overload_type_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+from mymodule import ab
+
+a<CURSOR>b("hello")
+"#,
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: str): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r#"
+        info[goto-definition]: Definition
+         --> mymodule.py:2:5
+          |
+        2 | def ab(a):
+          |     ^^
+        3 |     """the real implementation!"""
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab("hello")
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_definition_overload_arity_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, 2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int): ...
+
+@overload
+def ab(a: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r#"
+        info[goto-definition]: Definition
+         --> mymodule.py:2:5
+          |
+        2 | def ab(a, b = None):
+          |     ^^
+        3 |     """the real implementation!"""
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, 2)
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_definition_overload_arity_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int): ...
+
+@overload
+def ab(a: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r#"
+        info[goto-definition]: Definition
+         --> mymodule.py:2:5
+          |
+        2 | def ab(a, b = None):
+          |     ^^
+        3 |     """the real implementation!"""
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_definition_overload_keyword_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, b=2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: int, *, b: int): ...
+
+@overload
+def ab(a: int, *, c: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r#"
+        info[goto-definition]: Definition
+         --> mymodule.py:2:5
+          |
+        2 | def ab(a, *, b = None, c = None):
+          |     ^^
+        3 |     """the real implementation!"""
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, b=2)
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_definition_overload_keyword_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, c=2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int): ...
+
+@overload
+def ab(a: int, *, b: int): ...
+
+@overload
+def ab(a: int, *, c: int): ...
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r#"
+        info[goto-definition]: Definition
+         --> mymodule.py:2:5
+          |
+        2 | def ab(a, *, b = None, c = None):
+          |     ^^
+        3 |     """the real implementation!"""
+          |
+        info: Source
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, c=2)
+          | ^^
+          |
+        "#);
+    }
+
+    #[test]
+    fn goto_definition_binary_operator() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __add__(self, other):
+        return Test()
+
+
+a = Test()
+b = Test()
+
+a <CURSOR>+ b
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:9
+          |
+        2 | class Test:
+        3 |     def __add__(self, other):
+          |         ^^^^^^^
+        4 |         return Test()
+          |
+        info: Source
+          --> main.py:10:3
+           |
+         8 | b = Test()
+         9 |
+        10 | a + b
+           |   ^
+           |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_binary_operator_reflected_dunder() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class A:
+    def __radd__(self, other) -> A:
+        return self
+
+class B: ...
+
+B() <CURSOR>+ A()
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:9
+          |
+        2 | class A:
+        3 |     def __radd__(self, other) -> A:
+          |         ^^^^^^^^
+        4 |         return self
+          |
+        info: Source
+         --> main.py:8:5
+          |
+        6 | class B: ...
+        7 |
+        8 | B() + A()
+          |     ^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_binary_operator_no_spaces_before_operator() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __add__(self, other):
+        return Test()
+
+
+a = Test()
+b = Test()
+
+a<CURSOR>+b
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:9
+          |
+        2 | class Test:
+        3 |     def __add__(self, other):
+          |         ^^^^^^^
+        4 |         return Test()
+          |
+        info: Source
+          --> main.py:10:2
+           |
+         8 | b = Test()
+         9 |
+        10 | a+b
+           |  ^
+           |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_binary_operator_no_spaces_after_operator() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __add__(self, other):
+        return Test()
+
+
+a = Test()
+b = Test()
+
+a+<CURSOR>b
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+          --> main.py:8:1
+           |
+         7 | a = Test()
+         8 | b = Test()
+           | ^
+         9 |
+        10 | a+b
+           |
+        info: Source
+          --> main.py:10:3
+           |
+         8 | b = Test()
+         9 |
+        10 | a+b
+           |   ^
+           |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_binary_operator_comment() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __add__(self, other):
+        return Test()
+
+
+(
+    Test()  <CURSOR># comment
+    + Test()
+)
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @"No goto target found");
+    }
+
+    #[test]
+    fn goto_definition_unary_operator() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __bool__(self) -> bool: ...
+
+a = Test()
+
+<CURSOR>not a
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:9
+          |
+        2 | class Test:
+        3 |     def __bool__(self) -> bool: ...
+          |         ^^^^^^^^
+        4 |
+        5 | a = Test()
+          |
+        info: Source
+         --> main.py:7:1
+          |
+        5 | a = Test()
+        6 |
+        7 | not a
+          | ^^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_unary_after_operator() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __bool__(self) -> bool: ...
+
+a = Test()
+
+not<CURSOR> a
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:3:9
+          |
+        2 | class Test:
+        3 |     def __bool__(self) -> bool: ...
+          |         ^^^^^^^^
+        4 |
+        5 | a = Test()
+          |
+        info: Source
+         --> main.py:7:1
+          |
+        5 | a = Test()
+        6 |
+        7 | not a
+          | ^^^
+          |
+        ");
+    }
+
+    #[test]
+    fn goto_definition_unary_between_operator_and_operand() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+class Test:
+    def __bool__(self) -> bool: ...
+
+a = Test()
+
+-<CURSOR>a
+",
+            )
+            .build();
+
+        assert_snapshot!(test.goto_definition(), @r"
+        info[goto-definition]: Definition
+         --> main.py:5:1
+          |
+        3 |     def __bool__(self) -> bool: ...
+        4 |
+        5 | a = Test()
+          | ^
+        6 |
+        7 | -a
+          |
+        info: Source
+         --> main.py:7:2
+          |
+        5 | a = Test()
+        6 |
+        7 | -a
+          |  ^
+          |
+        ");
+    }
+
     impl CursorTest {
         fn goto_definition(&self) -> String {
             let Some(targets) = goto_definition(&self.db, self.cursor.file, self.cursor.offset)
diff --git a/crates/ty_ide/src/goto_references.rs b/crates/ty_ide/src/goto_references.rs
index 7860cfb169..067ee19ad7 100644
--- a/crates/ty_ide/src/goto_references.rs
+++ b/crates/ty_ide/src/goto_references.rs
@@ -786,7 +786,7 @@ class DataProcessor:
         5 |     def __init__(self):
         6 |         self.multiplier = func
           |                           ^^^^
-        7 |     
+        7 |
         8 |     def process(self, value):
           |
 
@@ -834,7 +834,7 @@ def process_model():
         2 | class MyModel:
         3 |     attr = 42
           |     ^^^^
-        4 |         
+        4 |
         5 |     def get_attribute(self):
           |
 
diff --git a/crates/ty_ide/src/goto_type_definition.rs b/crates/ty_ide/src/goto_type_definition.rs
index 4d8f06f354..f39e5dc4b6 100644
--- a/crates/ty_ide/src/goto_type_definition.rs
+++ b/crates/ty_ide/src/goto_type_definition.rs
@@ -50,20 +50,20 @@ mod tests {
 
         assert_snapshot!(test.goto_type_definition(), @r"
         info[goto-type-definition]: Type definition
-         --> main.py:2:19
+         --> main.py:2:7
           |
-        2 |             class Test: ...
-          |                   ^^^^
+        2 | class Test: ...
+          |       ^^^^
         3 |
-        4 |             ab = Test()
+        4 | ab = Test()
           |
         info: Source
-         --> main.py:4:13
+         --> main.py:4:1
           |
-        2 |             class Test: ...
+        2 | class Test: ...
         3 |
-        4 |             ab = Test()
-          |             ^^
+        4 | ab = Test()
+          | ^^
           |
         ");
     }
@@ -82,20 +82,20 @@ mod tests {
 
         assert_snapshot!(test.goto_type_definition(), @r"
         info[goto-type-definition]: Type definition
-         --> main.py:2:17
+         --> main.py:2:5
           |
-        2 |             def foo(a, b): ...
-          |                 ^^^
+        2 | def foo(a, b): ...
+          |     ^^^
         3 |
-        4 |             ab = foo
+        4 | ab = foo
           |
         info: Source
-         --> main.py:6:13
+         --> main.py:6:1
           |
-        4 |             ab = foo
+        4 | ab = foo
         5 |
-        6 |             ab
-          |             ^^
+        6 | ab
+          | ^^
           |
         ");
     }
@@ -120,39 +120,39 @@ mod tests {
 
         assert_snapshot!(test.goto_type_definition(), @r"
         info[goto-type-definition]: Type definition
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        3 |             def foo(a, b): ...
-          |                 ^^^
+        3 | def foo(a, b): ...
+          |     ^^^
         4 |
-        5 |             def bar(a, b): ...
+        5 | def bar(a, b): ...
           |
         info: Source
-          --> main.py:12:13
+          --> main.py:12:1
            |
-        10 |                 a = bar
+        10 |     a = bar
         11 |
-        12 |             a
-           |             ^
+        12 | a
+           | ^
            |
 
         info[goto-type-definition]: Type definition
-         --> main.py:5:17
+         --> main.py:5:5
           |
-        3 |             def foo(a, b): ...
+        3 | def foo(a, b): ...
         4 |
-        5 |             def bar(a, b): ...
-          |                 ^^^
+        5 | def bar(a, b): ...
+          |     ^^^
         6 |
-        7 |             if random.choice():
+        7 | if random.choice():
           |
         info: Source
-          --> main.py:12:13
+          --> main.py:12:1
            |
-        10 |                 a = bar
+        10 |     a = bar
         11 |
-        12 |             a
-           |             ^
+        12 | a
+           | ^
            |
         ");
     }
@@ -177,12 +177,12 @@ mod tests {
           | ^^^^^^
           |
         info: Source
-         --> main.py:4:13
+         --> main.py:4:1
           |
-        2 |             import lib
+        2 | import lib
         3 |
-        4 |             lib
-          |             ^^^
+        4 | lib
+          | ^^^
           |
         ");
     }
@@ -197,26 +197,25 @@ mod tests {
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:901:7
+           --> stdlib/builtins.pyi:913:7
             |
-        899 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        900 |
-        901 | class str(Sequence[str]):
+        912 | @disjoint_base
+        913 | class str(Sequence[str]):
             |       ^^^
-        902 |     """str(object='') -> str
-        903 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
+        914 |     """str(object='') -> str
+        915 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
             |
         info: Source
-         --> main.py:4:13
+         --> main.py:4:1
           |
-        2 |             a: str = "test"
+        2 | a: str = "test"
         3 |
-        4 |             a
-          |             ^
+        4 | a
+          | ^
           |
-        "###);
+        "#);
     }
     #[test]
     fn goto_type_of_expression_with_literal_node() {
@@ -226,24 +225,23 @@ mod tests {
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:901:7
+           --> stdlib/builtins.pyi:913:7
             |
-        899 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        900 |
-        901 | class str(Sequence[str]):
+        912 | @disjoint_base
+        913 | class str(Sequence[str]):
             |       ^^^
-        902 |     """str(object='') -> str
-        903 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
+        914 |     """str(object='') -> str
+        915 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
             |
         info: Source
-         --> main.py:2:22
+         --> main.py:2:10
           |
-        2 |             a: str = "test"
-          |                      ^^^^^^
+        2 | a: str = "test"
+          |          ^^^^^^
           |
-        "###);
+        "#);
     }
 
     #[test]
@@ -256,16 +254,16 @@ mod tests {
 
         assert_snapshot!(test.goto_type_definition(), @r"
         info[goto-type-definition]: Type definition
-         --> main.py:2:24
+         --> main.py:2:12
           |
-        2 |             type Alias[T: int = bool] = list[T]
-          |                        ^
+        2 | type Alias[T: int = bool] = list[T]
+          |            ^
           |
         info: Source
-         --> main.py:2:46
+         --> main.py:2:34
           |
-        2 |             type Alias[T: int = bool] = list[T]
-          |                                              ^
+        2 | type Alias[T: int = bool] = list[T]
+          |                                  ^
           |
         ");
     }
@@ -310,26 +308,8 @@ mod tests {
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-         --> main.py:4:13
-          |
-        2 |             from typing_extensions import TypeAliasType
-        3 |
-        4 |             Alias = TypeAliasType("Alias", tuple[int, int])
-          |             ^^^^^
-        5 |
-        6 |             Alias
-          |
-        info: Source
-         --> main.py:6:13
-          |
-        4 |             Alias = TypeAliasType("Alias", tuple[int, int])
-        5 |
-        6 |             Alias
-          |             ^^^^^
-          |
-        "#);
+        // TODO: This should jump to the definition of `Alias` above.
+        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
     }
 
     #[test]
@@ -342,26 +322,25 @@ mod tests {
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:901:7
+           --> stdlib/builtins.pyi:913:7
             |
-        899 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        900 |
-        901 | class str(Sequence[str]):
+        912 | @disjoint_base
+        913 | class str(Sequence[str]):
             |       ^^^
-        902 |     """str(object='') -> str
-        903 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
+        914 |     """str(object='') -> str
+        915 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
             |
         info: Source
-         --> main.py:4:18
+         --> main.py:4:6
           |
-        2 |             def test(a: str): ...
+        2 | def test(a: str): ...
         3 |
-        4 |             test(a= "123")
-          |                  ^
+        4 | test(a= "123")
+          |      ^
           |
-        "###);
+        "#);
     }
 
     #[test]
@@ -379,22 +358,21 @@ mod tests {
         //   is an int. Navigating to `str` would match pyright's behavior.
         assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:337:7
+           --> stdlib/builtins.pyi:346:7
             |
-        335 | _LiteralInteger = _PositiveInteger | _NegativeInteger | Literal[0]  # noqa: Y026  # TODO: Use TypeAlias once mypy bugs are fixed
-        336 |
-        337 | class int:
+        345 | @disjoint_base
+        346 | class int:
             |       ^^^
-        338 |     """int([x]) -> integer
-        339 |     int(x, base=10) -> integer
+        347 |     """int([x]) -> integer
+        348 |     int(x, base=10) -> integer
             |
         info: Source
-         --> main.py:4:18
+         --> main.py:4:6
           |
-        2 |             def test(a: str): ...
+        2 | def test(a: str): ...
         3 |
-        4 |             test(a= 123)
-          |                  ^
+        4 | test(a= 123)
+          |      ^
           |
         "#);
     }
@@ -411,16 +389,15 @@ f(**kwargs<CURSOR>)
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-            --> stdlib/builtins.pyi:2901:7
+            --> stdlib/builtins.pyi:2918:7
              |
-        2899 |         """See PEP 585"""
-        2900 |
-        2901 | class dict(MutableMapping[_KT, _VT]):
+        2917 | @disjoint_base
+        2918 | class dict(MutableMapping[_KT, _VT]):
              |       ^^^^
-        2902 |     """dict() -> new empty dictionary
-        2903 |     dict(mapping) -> new dictionary initialized from a mapping object's
+        2919 |     """dict() -> new empty dictionary
+        2920 |     dict(mapping) -> new dictionary initialized from a mapping object's
              |
         info: Source
          --> main.py:6:5
@@ -430,7 +407,7 @@ f(**kwargs<CURSOR>)
         6 | f(**kwargs)
           |     ^^^^^^
           |
-        "###);
+        "#);
     }
 
     #[test]
@@ -442,25 +419,24 @@ f(**kwargs<CURSOR>)
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:901:7
+           --> stdlib/builtins.pyi:913:7
             |
-        899 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        900 |
-        901 | class str(Sequence[str]):
+        912 | @disjoint_base
+        913 | class str(Sequence[str]):
             |       ^^^
-        902 |     """str(object='') -> str
-        903 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
+        914 |     """str(object='') -> str
+        915 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
             |
         info: Source
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        2 |             def foo(a: str):
-        3 |                 a
-          |                 ^
+        2 | def foo(a: str):
+        3 |     a
+          |     ^
           |
-        "###);
+        "#);
     }
 
     #[test]
@@ -478,19 +454,19 @@ f(**kwargs<CURSOR>)
 
         assert_snapshot!(test.goto_type_definition(), @r"
         info[goto-type-definition]: Type definition
-         --> main.py:2:19
+         --> main.py:2:7
           |
-        2 |             class X:
-          |                   ^
-        3 |                 def foo(a, b): ...
+        2 | class X:
+          |       ^
+        3 |     def foo(a, b): ...
           |
         info: Source
-         --> main.py:7:13
+         --> main.py:7:1
           |
-        5 |             x = X()
+        5 | x = X()
         6 |
-        7 |             x.foo()
-          |             ^
+        7 | x.foo()
+          | ^
           |
         ");
     }
@@ -507,20 +483,20 @@ f(**kwargs<CURSOR>)
 
         assert_snapshot!(test.goto_type_definition(), @r"
         info[goto-type-definition]: Type definition
-         --> main.py:2:17
+         --> main.py:2:5
           |
-        2 |             def foo(a, b): ...
-          |                 ^^^
+        2 | def foo(a, b): ...
+          |     ^^^
         3 |
-        4 |             foo()
+        4 | foo()
           |
         info: Source
-         --> main.py:4:13
+         --> main.py:4:1
           |
-        2 |             def foo(a, b): ...
+        2 | def foo(a, b): ...
         3 |
-        4 |             foo()
-          |             ^^^
+        4 | foo()
+          | ^^^
           |
         ");
     }
@@ -535,26 +511,25 @@ f(**kwargs<CURSOR>)
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:901:7
+           --> stdlib/builtins.pyi:913:7
             |
-        899 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        900 |
-        901 | class str(Sequence[str]):
+        912 | @disjoint_base
+        913 | class str(Sequence[str]):
             |       ^^^
-        902 |     """str(object='') -> str
-        903 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
+        914 |     """str(object='') -> str
+        915 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
             |
         info: Source
-         --> main.py:4:27
+         --> main.py:4:15
           |
-        2 |             def foo(a: str | None, b):
-        3 |                 if a is not None:
-        4 |                     print(a)
-          |                           ^
+        2 | def foo(a: str | None, b):
+        3 |     if a is not None:
+        4 |         print(a)
+          |               ^
           |
-        "###);
+        "#);
     }
 
     #[test]
@@ -566,42 +541,41 @@ f(**kwargs<CURSOR>)
             "#,
         );
 
-        assert_snapshot!(test.goto_type_definition(), @r###"
+        assert_snapshot!(test.goto_type_definition(), @r#"
         info[goto-type-definition]: Type definition
-           --> stdlib/types.pyi:922:11
+           --> stdlib/types.pyi:950:11
             |
-        920 | if sys.version_info >= (3, 10):
-        921 |     @final
-        922 |     class NoneType:
+        948 | if sys.version_info >= (3, 10):
+        949 |     @final
+        950 |     class NoneType:
             |           ^^^^^^^^
-        923 |         """The type of the None singleton."""
+        951 |         """The type of the None singleton."""
             |
         info: Source
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        2 |             def foo(a: str | None, b):
-        3 |                 a
-          |                 ^
+        2 | def foo(a: str | None, b):
+        3 |     a
+          |     ^
           |
 
         info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:901:7
+           --> stdlib/builtins.pyi:913:7
             |
-        899 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        900 |
-        901 | class str(Sequence[str]):
+        912 | @disjoint_base
+        913 | class str(Sequence[str]):
             |       ^^^
-        902 |     """str(object='') -> str
-        903 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
+        914 |     """str(object='') -> str
+        915 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
             |
         info: Source
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        2 |             def foo(a: str | None, b):
-        3 |                 a
-          |                 ^
+        2 | def foo(a: str | None, b):
+        3 |     a
+          |     ^
           |
-        "###);
+        "#);
     }
 
     impl CursorTest {
diff --git a/crates/ty_ide/src/hover.rs b/crates/ty_ide/src/hover.rs
index 5480d73b54..b555295678 100644
--- a/crates/ty_ide/src/hover.rs
+++ b/crates/ty_ide/src/hover.rs
@@ -6,7 +6,7 @@ use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
 use std::fmt;
 use std::fmt::Formatter;
-use ty_python_semantic::types::Type;
+use ty_python_semantic::types::{KnownInstanceType, Type, TypeVarVariance};
 use ty_python_semantic::{DisplaySettings, SemanticModel};
 
 pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Hover<'_>>> {
@@ -20,7 +20,7 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
     }
 
     let model = SemanticModel::new(db, file);
-    let ty = goto_target.inferred_type(&model).map(HoverContent::Type);
+    let ty = goto_target.inferred_type(&model);
     let docs = goto_target
         .get_definition_targets(
             file,
@@ -30,13 +30,20 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
         .and_then(|definitions| definitions.docstring(db))
         .map(HoverContent::Docstring);
 
-    if let Some(HoverContent::Type(ty)) = ty {
-        tracing::debug!("Inferred type of covering node is {}", ty.display(db));
-    }
-
     // TODO: Render the symbol's signature instead of just its type.
     let mut contents = Vec::new();
-    contents.extend(ty);
+    if let Some(ty) = ty {
+        tracing::debug!("Inferred type of covering node is {}", ty.display(db));
+        contents.push(match ty {
+            Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) => typevar
+                .bind_pep695(db)
+                .map_or(HoverContent::Type(ty, None), |typevar| {
+                    HoverContent::Type(Type::TypeVar(typevar), Some(typevar.variance(db)))
+                }),
+            Type::TypeVar(typevar) => HoverContent::Type(ty, Some(typevar.variance(db))),
+            _ => HoverContent::Type(ty, None),
+        });
+    }
     contents.extend(docs);
 
     if contents.is_empty() {
@@ -110,7 +117,7 @@ impl fmt::Display for DisplayHover<'_> {
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub enum HoverContent<'db> {
-    Type(Type<'db>),
+    Type(Type<'db>, Option<TypeVarVariance>),
     Docstring(Docstring),
 }
 
@@ -133,13 +140,24 @@ pub(crate) struct DisplayHoverContent<'a, 'db> {
 impl fmt::Display for DisplayHoverContent<'_, '_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.content {
-            HoverContent::Type(ty) => self
-                .kind
-                .fenced_code_block(
-                    ty.display_with(self.db, DisplaySettings::default().multiline()),
-                    "python",
-                )
-                .fmt(f),
+            HoverContent::Type(ty, variance) => {
+                let variance = match variance {
+                    Some(TypeVarVariance::Covariant) => " (covariant)",
+                    Some(TypeVarVariance::Contravariant) => " (contravariant)",
+                    Some(TypeVarVariance::Invariant) => " (invariant)",
+                    Some(TypeVarVariance::Bivariant) => " (bivariant)",
+                    None => "",
+                };
+                self.kind
+                    .fenced_code_block(
+                        format!(
+                            "{}{variance}",
+                            ty.display_with(self.db, DisplaySettings::default().multiline())
+                        ),
+                        "python",
+                    )
+                    .fmt(f)
+            }
             HoverContent::Docstring(docstring) => docstring.render(self.kind).fmt(f),
         }
     }
@@ -174,14 +192,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:4:9
+         --> main.py:4:1
           |
-        2 |         a = 10
+        2 | a = 10
         3 |
-        4 |         a
-          |         ^- Cursor offset
-          |         |
-          |         source
+        4 | a
+          | ^- Cursor offset
+          | |
+          | source
           |
         ");
     }
@@ -233,15 +251,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:11:9
+          --> main.py:11:1
            |
-         9 |             return 0
+         9 |     return 0
         10 |
-        11 |         my_func(1, 2)
-           |         ^^^^^-^
-           |         |    |
-           |         |    Cursor offset
-           |         source
+        11 | my_func(1, 2)
+           | ^^^^^-^
+           | |    |
+           | |    Cursor offset
+           | source
            |
         ");
     }
@@ -291,14 +309,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:13
+         --> main.py:2:5
           |
-        2 |         def my_func(a, b):
-          |             ^^^^^-^
-          |             |    |
-          |             |    Cursor offset
-          |             source
-        3 |             '''This is such a great func!!
+        2 | def my_func(a, b):
+          |     ^^^^^-^
+          |     |    |
+          |     |    Cursor offset
+          |     source
+        3 |     '''This is such a great func!!
           |
         ");
     }
@@ -312,14 +330,14 @@ mod tests {
                 This is such a great class!!
 
                     Don't you know?
-                
+
                 Everyone loves my class!!
 
             '''
             def __init__(self, val):
                 """initializes MyClass (perfectly)"""
                 self.val = val
-            
+
             def my_method(self, a, b):
                 '''This is such a great func!!
 
@@ -357,15 +375,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:24:9
+          --> main.py:24:1
            |
-        22 |                 return 0
+        22 |         return 0
         23 |
-        24 |         MyClass
-           |         ^^^^^-^
-           |         |    |
-           |         |    Cursor offset
-           |         source
+        24 | MyClass
+           | ^^^^^-^
+           | |    |
+           | |    Cursor offset
+           | source
            |
         ");
     }
@@ -379,14 +397,14 @@ mod tests {
                 This is such a great class!!
 
                     Don't you know?
-                
+
                 Everyone loves my class!!
 
             '''
             def __init__(self, val):
                 """initializes MyClass (perfectly)"""
                 self.val = val
-            
+
             def my_method(self, a, b):
                 '''This is such a great func!!
 
@@ -422,15 +440,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:15
+         --> main.py:2:7
           |
-        2 |         class MyClass:
-          |               ^^^^^-^
-          |               |    |
-          |               |    Cursor offset
-          |               source
-        3 |             '''
-        4 |                 This is such a great class!!
+        2 | class MyClass:
+          |       ^^^^^-^
+          |       |    |
+          |       |    Cursor offset
+          |       source
+        3 |     '''
+        4 |         This is such a great class!!
           |
         ");
     }
@@ -444,14 +462,131 @@ mod tests {
                 This is such a great class!!
 
                     Don't you know?
-                
+
                 Everyone loves my class!!
 
             '''
             def __init__(self, val):
                 """initializes MyClass (perfectly)"""
                 self.val = val
-            
+
+            def my_method(self, a, b):
+                '''This is such a great func!!
+
+                Args:
+                    a: first for a reason
+                    b: coming for `a`'s title
+                '''
+                return 0
+
+        x = MyCla<CURSOR>ss(0)
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        <class 'MyClass'>
+        ---------------------------------------------
+        initializes MyClass (perfectly)
+
+        ---------------------------------------------
+        ```python
+        <class 'MyClass'>
+        ```
+        ---
+        ```text
+        initializes MyClass (perfectly)
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+          --> main.py:24:5
+           |
+        22 |         return 0
+        23 |
+        24 | x = MyClass(0)
+           |     ^^^^^-^
+           |     |    |
+           |     |    Cursor offset
+           |     source
+           |
+        ");
+    }
+
+    #[test]
+    fn hover_class_init_attr() {
+        let test = CursorTest::builder()
+            .source(
+                "mymod.py",
+                r#"
+        class MyClass:
+            '''
+                This is such a great class!!
+
+                    Don't you know?
+
+                Everyone loves my class!!
+
+            '''
+            def __init__(self, val):
+                """initializes MyClass (perfectly)"""
+                self.val = val
+        "#,
+            )
+            .source(
+                "main.py",
+                r#"
+        import mymod
+
+        x = mymod.MyCla<CURSOR>ss(0)
+        "#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r"
+        <class 'MyClass'>
+        ---------------------------------------------
+        initializes MyClass (perfectly)
+
+        ---------------------------------------------
+        ```python
+        <class 'MyClass'>
+        ```
+        ---
+        ```text
+        initializes MyClass (perfectly)
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:11
+          |
+        2 | import mymod
+        3 |
+        4 | x = mymod.MyClass(0)
+          |           ^^^^^-^
+          |           |    |
+          |           |    Cursor offset
+          |           source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_class_init_no_init_docs() {
+        let test = cursor_test(
+            r#"
+        class MyClass:
+            '''
+                This is such a great class!!
+
+                    Don't you know?
+
+                Everyone loves my class!!
+
+            '''
+            def __init__(self, val):
+                self.val = val
+
             def my_method(self, a, b):
                 '''This is such a great func!!
 
@@ -489,15 +624,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:24:13
+          --> main.py:23:5
            |
-        22 |                 return 0
-        23 |
-        24 |         x = MyClass(0)
-           |             ^^^^^-^
-           |             |    |
-           |             |    Cursor offset
-           |             source
+        21 |         return 0
+        22 |
+        23 | x = MyClass(0)
+           |     ^^^^^-^
+           |     |    |
+           |     |    Cursor offset
+           |     source
            |
         ");
     }
@@ -511,14 +646,14 @@ mod tests {
                 This is such a great class!!
 
                     Don't you know?
-                
+
                 Everyone loves my class!!
 
             '''
             def __init__(self, val):
                 """initializes MyClass (perfectly)"""
                 self.val = val
-            
+
             def my_method(self, a, b):
                 '''This is such a great func!!
 
@@ -563,14 +698,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:25:11
+          --> main.py:25:3
            |
-        24 |         x = MyClass(0)
-        25 |         x.my_method(2, 3)
-           |           ^^^^^-^^^
-           |           |    |
-           |           |    Cursor offset
-           |           source
+        24 | x = MyClass(0)
+        25 | x.my_method(2, 3)
+           |   ^^^^^-^^^
+           |   |    |
+           |   |    Cursor offset
+           |   source
            |
         ");
     }
@@ -599,14 +734,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:10:13
+          --> main.py:10:5
            |
-         9 |         foo = Foo()
-        10 |         foo.a
-           |             -
-           |             |
-           |             source
-           |             Cursor offset
+         9 | foo = Foo()
+        10 | foo.a
+           |     -
+           |     |
+           |     source
+           |     Cursor offset
            |
         ");
     }
@@ -635,14 +770,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:4:13
+         --> main.py:4:1
           |
-        2 |             def foo(a, b): ...
+        2 | def foo(a, b): ...
         3 |
-        4 |             foo
-          |             ^^^- Cursor offset
-          |             |
-          |             source
+        4 | foo
+          | ^^^- Cursor offset
+          | |
+          | source
           |
         ");
     }
@@ -664,14 +799,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:3:17
+         --> main.py:3:5
           |
-        2 |             def foo(a: int, b: int, c: int):
-        3 |                 a + b == c
-          |                 ^^^^^^^^-^
-          |                 |       |
-          |                 |       Cursor offset
-          |                 source
+        2 | def foo(a: int, b: int, c: int):
+        3 |     a + b == c
+          |     ^^^^^^^^-^
+          |     |       |
+          |     |       Cursor offset
+          |     source
           |
         ");
     }
@@ -701,15 +836,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:10:18
+          --> main.py:10:6
            |
-         8 |                 return 0
+         8 |     return 0
          9 |
-        10 |             test(ab= 123)
-           |                  ^-
-           |                  ||
-           |                  |Cursor offset
-           |                  source
+        10 | test(ab= 123)
+           |      ^-
+           |      ||
+           |      |Cursor offset
+           |      source
            |
         ");
     }
@@ -736,14 +871,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:22
+         --> main.py:2:10
           |
-        2 |             def test(ab: int):
-          |                      ^-
-          |                      ||
-          |                      |Cursor offset
-          |                      source
-        3 |                 """my cool test
+        2 | def test(ab: int):
+          |          ^-
+          |          ||
+          |          |Cursor offset
+          |          source
+        3 |     """my cool test
           |
         "#);
     }
@@ -778,20 +913,466 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:16:13
+          --> main.py:16:1
            |
-        14 |                 a = bar
+        14 |     a = bar
         15 |
-        16 |             a
-           |             ^- Cursor offset
-           |             |
-           |             source
+        16 | a
+           | ^- Cursor offset
+           | |
+           | source
            |
         ");
     }
 
     #[test]
-    fn hover_overload() {
+    fn hover_overload_type_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """the int overload"""
+
+@overload
+def ab(a: str): ...
+    """the str overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r"
+        (a: int) -> Unknown
+        (a: str) -> Unknown
+        ---------------------------------------------
+        the int overload
+
+        ---------------------------------------------
+        ```python
+        (a: int) -> Unknown
+        (a: str) -> Unknown
+        ```
+        ---
+        ```text
+        the int overload
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_overload_type_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+from mymodule import ab
+
+a<CURSOR>b("hello")
+"#,
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """the int overload"""
+
+@overload
+def ab(a: str):
+    """the str overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r#"
+        (a: int) -> Unknown
+        (a: str) -> Unknown
+        ---------------------------------------------
+        the int overload
+
+        ---------------------------------------------
+        ```python
+        (a: int) -> Unknown
+        (a: str) -> Unknown
+        ```
+        ---
+        ```text
+        the int overload
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab("hello")
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
+          |
+        "#);
+    }
+
+    #[test]
+    fn hover_overload_arity_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, 2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int):
+    """the two arg overload"""
+
+@overload
+def ab(a: int):
+    """the one arg overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r"
+        (
+            a: int,
+            b: int
+        ) -> Unknown
+        (a: int) -> Unknown
+        ---------------------------------------------
+        the two arg overload
+
+        ---------------------------------------------
+        ```python
+        (
+            a: int,
+            b: int
+        ) -> Unknown
+        (a: int) -> Unknown
+        ```
+        ---
+        ```text
+        the two arg overload
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, 2)
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_overload_arity_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int):
+    """the two arg overload"""
+
+@overload
+def ab(a: int):
+    """the one arg overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r"
+        (
+            a: int,
+            b: int
+        ) -> Unknown
+        (a: int) -> Unknown
+        ---------------------------------------------
+        the two arg overload
+
+        ---------------------------------------------
+        ```python
+        (
+            a: int,
+            b: int
+        ) -> Unknown
+        (a: int) -> Unknown
+        ```
+        ---
+        ```text
+        the two arg overload
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1)
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_overload_keyword_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, b=2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """keywordless overload"""
+
+@overload
+def ab(a: int, *, b: int):
+    """b overload"""
+
+@overload
+def ab(a: int, *, c: int):
+    """c overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r"
+        (a: int) -> Unknown
+        (
+            a: int,
+            *,
+            b: int
+        ) -> Unknown
+        (
+            a: int,
+            *,
+            c: int
+        ) -> Unknown
+        ---------------------------------------------
+        keywordless overload
+
+        ---------------------------------------------
+        ```python
+        (a: int) -> Unknown
+        (
+            a: int,
+            *,
+            b: int
+        ) -> Unknown
+        (
+            a: int,
+            *,
+            c: int
+        ) -> Unknown
+        ```
+        ---
+        ```text
+        keywordless overload
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, b=2)
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_overload_keyword_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+a<CURSOR>b(1, c=2)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """keywordless overload"""
+
+@overload
+def ab(a: int, *, b: int):
+    """b overload"""
+
+@overload
+def ab(a: int, *, c: int):
+    """c overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.hover(), @r"
+        (a: int) -> Unknown
+        (
+            a: int,
+            *,
+            b: int
+        ) -> Unknown
+        (
+            a: int,
+            *,
+            c: int
+        ) -> Unknown
+        ---------------------------------------------
+        keywordless overload
+
+        ---------------------------------------------
+        ```python
+        (a: int) -> Unknown
+        (
+            a: int,
+            *,
+            b: int
+        ) -> Unknown
+        (
+            a: int,
+            *,
+            c: int
+        ) -> Unknown
+        ```
+        ---
+        ```text
+        keywordless overload
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from mymodule import ab
+        3 |
+        4 | ab(1, c=2)
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_overload_ambiguous() {
         let test = cursor_test(
             r#"
             from typing import overload
@@ -845,20 +1426,20 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:19:13
+          --> main.py:19:1
            |
-        17 |                 a = "hello"
+        17 |     a = "hello"
         18 |
-        19 |             foo(a, 2)
-           |             ^^^- Cursor offset
-           |             |
-           |             source
+        19 | foo(a, 2)
+           | ^^^- Cursor offset
+           | |
+           | source
            |
         "#);
     }
 
     #[test]
-    fn hover_overload_compact() {
+    fn hover_overload_ambiguous_compact() {
         let test = cursor_test(
             r#"
             from typing import overload
@@ -900,14 +1481,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:19:13
+          --> main.py:19:1
            |
-        17 |                 a = "hello"
+        17 |     a = "hello"
         18 |
-        19 |             foo(a)
-           |             ^^^- Cursor offset
-           |             |
-           |             source
+        19 | foo(a)
+           | ^^^- Cursor offset
+           | |
+           | source
            |
         "#);
     }
@@ -955,15 +1536,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:4:13
+         --> main.py:4:1
           |
-        2 |             import lib
+        2 | import lib
         3 |
-        4 |             lib
-          |             ^^-
-          |             | |
-          |             | Cursor offset
-          |             source
+        4 | lib
+          | ^^-
+          | | |
+          | | Cursor offset
+          | source
           |
         ");
     }
@@ -1005,15 +1586,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:20
+         --> main.py:2:8
           |
-        2 |             import lib
-          |                    ^^-
-          |                    | |
-          |                    | Cursor offset
-          |                    source
+        2 | import lib
+          |        ^^-
+          |        | |
+          |        | Cursor offset
+          |        source
         3 |
-        4 |             lib
+        4 | lib
           |
         ");
     }
@@ -1026,23 +1607,22 @@ mod tests {
             "#,
         );
 
-        // TODO: This should render T@Alias once we create GenericContexts for type alias scopes.
-        assert_snapshot!(test.hover(), @r###"
-        typing.TypeVar
+        assert_snapshot!(test.hover(), @r"
+        T@Alias (invariant)
         ---------------------------------------------
         ```python
-        typing.TypeVar
+        T@Alias (invariant)
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:46
+         --> main.py:2:34
           |
-        2 |             type Alias[T: int = bool] = list[T]
-          |                                              ^- Cursor offset
-          |                                              |
-          |                                              source
+        2 | type Alias[T: int = bool] = list[T]
+          |                                  ^- Cursor offset
+          |                                  |
+          |                                  source
           |
-        "###);
+        ");
     }
 
     #[test]
@@ -1061,12 +1641,12 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:53
+         --> main.py:2:41
           |
-        2 |             type Alias[**P = [int, str]] = Callable[P, int]
-          |                                                     ^- Cursor offset
-          |                                                     |
-          |                                                     source
+        2 | type Alias[**P = [int, str]] = Callable[P, int]
+          |                                         ^- Cursor offset
+          |                                         |
+          |                                         source
           |
         ");
     }
@@ -1087,12 +1667,12 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:43
+         --> main.py:2:31
           |
-        2 |             type Alias[*Ts = ()] = tuple[*Ts]
-          |                                           ^^- Cursor offset
-          |                                           |
-          |                                           source
+        2 | type Alias[*Ts = ()] = tuple[*Ts]
+          |                               ^^- Cursor offset
+          |                               |
+          |                               source
           |
         ");
     }
@@ -1113,12 +1693,12 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:2:13
+         --> main.py:2:1
           |
-        2 |             value = 1
-          |             ^^^^^- Cursor offset
-          |             |
-          |             source
+        2 | value = 1
+          | ^^^^^- Cursor offset
+          | |
+          | source
           |
         ");
     }
@@ -1144,13 +1724,13 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:3:13
+         --> main.py:3:1
           |
-        2 |             value = 1
-        3 |             value += 2
-          |             ^^^^^- Cursor offset
-          |             |
-          |             source
+        2 | value = 1
+        3 | value += 2
+          | ^^^^^- Cursor offset
+          | |
+          | source
           |
         ");
     }
@@ -1174,14 +1754,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:5:15
+         --> main.py:5:3
           |
-        3 |                 attr: int = 1
+        3 |     attr: int = 1
         4 |
-        5 |             C.attr = 2
-          |               ^^^^- Cursor offset
-          |               |
-          |               source
+        5 | C.attr = 2
+          |   ^^^^- Cursor offset
+          |   |
+          |   source
           |
         ");
     }
@@ -1207,14 +1787,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:5:15
+         --> main.py:5:3
           |
-        3 |                 attr = 1
+        3 |     attr = 1
         4 |
-        5 |             C.attr += 2
-          |               ^^^^- Cursor offset
-          |               |
-          |               source
+        5 | C.attr += 2
+          |   ^^^^- Cursor offset
+          |   |
+          |   source
           |
         ");
     }
@@ -1236,13 +1816,13 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:3:13
+         --> main.py:3:5
           |
-        2 |         class Foo:
-        3 |             a: int
-          |             ^- Cursor offset
-          |             |
-          |             source
+        2 | class Foo:
+        3 |     a: int
+          |     ^- Cursor offset
+          |     |
+          |     source
           |
         ");
     }
@@ -1264,13 +1844,13 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:3:13
+         --> main.py:3:5
           |
-        2 |         class Foo:
-        3 |             a: int = 1
-          |             ^- Cursor offset
-          |             |
-          |             source
+        2 | class Foo:
+        3 |     a: int = 1
+          |     ^- Cursor offset
+          |     |
+          |     source
           |
         ");
     }
@@ -1293,14 +1873,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:4:22
+         --> main.py:4:14
           |
-        2 |         class Foo:
-        3 |             def __init__(self, a: int):
-        4 |                 self.a: int = a
-          |                      ^- Cursor offset
-          |                      |
-          |                      source
+        2 | class Foo:
+        3 |     def __init__(self, a: int):
+        4 |         self.a: int = a
+          |              ^- Cursor offset
+          |              |
+          |              source
           |
         ");
     }
@@ -1312,9 +1892,9 @@ mod tests {
             def foo(a: str | None, b):
                 '''
                     My cool func
-                
+
                     Args:
-                        a: hopefully a string, right?!   
+                        a: hopefully a string, right?!
                 '''
                 if a is not None:
                     print(a<CURSOR>)
@@ -1329,14 +1909,14 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:10:27
+          --> main.py:10:15
            |
-         8 |                 '''
-         9 |                 if a is not None:
-        10 |                     print(a)
-           |                           ^- Cursor offset
-           |                           |
-           |                           source
+         8 |     '''
+         9 |     if a is not None:
+        10 |         print(a)
+           |               ^- Cursor offset
+           |               |
+           |               source
            |
         ");
     }
@@ -1407,15 +1987,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:5:9
+         --> main.py:5:1
           |
-        3 |         def ab(x: int, y: Callable[[int, int], Any], z: List[int]) -> int: ...
+        3 | def ab(x: int, y: Callable[[int, int], Any], z: List[int]) -> int: ...
         4 |
-        5 |         ab
-          |         ^-
-          |         ||
-          |         |Cursor offset
-          |         source
+        5 | ab
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
           |
         ");
     }
@@ -1439,15 +2019,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:5:9
+         --> main.py:5:1
           |
-        3 |         ab: Tuple[Any, int, Callable[[int, int], Any]] = ...
+        3 | ab: Tuple[Any, int, Callable[[int, int], Any]] = ...
         4 |
-        5 |         ab
-          |         ^-
-          |         ||
-          |         |Cursor offset
-          |         source
+        5 | ab
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
           |
         ");
     }
@@ -1471,15 +2051,15 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:5:9
+         --> main.py:5:1
           |
-        3 |         ab:  Callable[[int, int], Any] | None  = ...
+        3 | ab:  Callable[[int, int], Any] | None  = ...
         4 |
-        5 |         ab
-          |         ^-
-          |         ||
-          |         |Cursor offset
-          |         source
+        5 | ab
+          | ^-
+          | ||
+          | |Cursor offset
+          | source
           |
         ");
     }
@@ -1496,6 +2076,563 @@ mod tests {
         assert_snapshot!(test.hover(), @"Hover provided no content");
     }
 
+    #[test]
+    fn hover_class_typevar_variance() {
+        let test = cursor_test(
+            r#"
+        class Covariant[T<CURSOR>]:
+            def get(self) -> T:
+                raise ValueError
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@Covariant (covariant)
+        ---------------------------------------------
+        ```python
+        T@Covariant (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:17
+          |
+        2 | class Covariant[T]:
+          |                 ^- Cursor offset
+          |                 |
+          |                 source
+        3 |     def get(self) -> T:
+        4 |         raise ValueError
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        class Covariant[T]:
+            def get(self) -> T<CURSOR>:
+                raise ValueError
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@Covariant (covariant)
+        ---------------------------------------------
+        ```python
+        T@Covariant (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:3:22
+          |
+        2 | class Covariant[T]:
+        3 |     def get(self) -> T:
+          |                      ^- Cursor offset
+          |                      |
+          |                      source
+        4 |         raise ValueError
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        class Contravariant[T<CURSOR>]:
+            def set(self, x: T):
+                pass
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@Contravariant (contravariant)
+        ---------------------------------------------
+        ```python
+        T@Contravariant (contravariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:21
+          |
+        2 | class Contravariant[T]:
+          |                     ^- Cursor offset
+          |                     |
+          |                     source
+        3 |     def set(self, x: T):
+        4 |         pass
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        class Contravariant[T]:
+            def set(self, x: T<CURSOR>):
+                pass
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@Contravariant (contravariant)
+        ---------------------------------------------
+        ```python
+        T@Contravariant (contravariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:3:22
+          |
+        2 | class Contravariant[T]:
+        3 |     def set(self, x: T):
+          |                      ^- Cursor offset
+          |                      |
+          |                      source
+        4 |         pass
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_function_typevar_variance() {
+        let test = cursor_test(
+            r#"
+        def covariant[T<CURSOR>]() -> T:
+            raise ValueError
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@covariant (covariant)
+        ---------------------------------------------
+        ```python
+        T@covariant (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:15
+          |
+        2 | def covariant[T]() -> T:
+          |               ^- Cursor offset
+          |               |
+          |               source
+        3 |     raise ValueError
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        def covariant[T]() -> T<CURSOR>:
+            raise ValueError
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@covariant (covariant)
+        ---------------------------------------------
+        ```python
+        T@covariant (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:23
+          |
+        2 | def covariant[T]() -> T:
+          |                       ^- Cursor offset
+          |                       |
+          |                       source
+        3 |     raise ValueError
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        def contravariant[T<CURSOR>](x: T):
+            pass
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@contravariant (contravariant)
+        ---------------------------------------------
+        ```python
+        T@contravariant (contravariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:19
+          |
+        2 | def contravariant[T](x: T):
+          |                   ^- Cursor offset
+          |                   |
+          |                   source
+        3 |     pass
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        def contravariant[T](x: T<CURSOR>):
+            pass
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@contravariant (contravariant)
+        ---------------------------------------------
+        ```python
+        T@contravariant (contravariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:25
+          |
+        2 | def contravariant[T](x: T):
+          |                         ^- Cursor offset
+          |                         |
+          |                         source
+        3 |     pass
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_type_alias_typevar_variance() {
+        let test = cursor_test(
+            r#"
+        type List[T<CURSOR>] = list[T]
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@List (invariant)
+        ---------------------------------------------
+        ```python
+        T@List (invariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:11
+          |
+        2 | type List[T] = list[T]
+          |           ^- Cursor offset
+          |           |
+          |           source
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        type List[T] = list[T<CURSOR>]
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@List (invariant)
+        ---------------------------------------------
+        ```python
+        T@List (invariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:21
+          |
+        2 | type List[T] = list[T]
+          |                     ^- Cursor offset
+          |                     |
+          |                     source
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        type Tuple[T<CURSOR>] = tuple[T]
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@Tuple (covariant)
+        ---------------------------------------------
+        ```python
+        T@Tuple (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:12
+          |
+        2 | type Tuple[T] = tuple[T]
+          |            ^- Cursor offset
+          |            |
+          |            source
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        type Tuple[T] = tuple[T<CURSOR>]
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@Tuple (covariant)
+        ---------------------------------------------
+        ```python
+        T@Tuple (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:23
+          |
+        2 | type Tuple[T] = tuple[T]
+          |                       ^- Cursor offset
+          |                       |
+          |                       source
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_legacy_typevar_variance() {
+        let test = cursor_test(
+            r#"
+        from typing import TypeVar
+
+        T<CURSOR> = TypeVar('T', covariant=True)
+
+        def covariant() -> T:
+            raise ValueError
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        typing.TypeVar
+        ---------------------------------------------
+        ```python
+        typing.TypeVar
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from typing import TypeVar
+        3 |
+        4 | T = TypeVar('T', covariant=True)
+          | ^- Cursor offset
+          | |
+          | source
+        5 |
+        6 | def covariant() -> T:
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        from typing import TypeVar
+
+        T = TypeVar('T', covariant=True)
+
+        def covariant() -> T<CURSOR>:
+            raise ValueError
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@covariant (covariant)
+        ---------------------------------------------
+        ```python
+        T@covariant (covariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:6:20
+          |
+        4 | T = TypeVar('T', covariant=True)
+        5 |
+        6 | def covariant() -> T:
+          |                    ^- Cursor offset
+          |                    |
+          |                    source
+        7 |     raise ValueError
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        from typing import TypeVar
+
+        T<CURSOR> = TypeVar('T', contravariant=True)
+
+        def contravariant(x: T):
+            pass
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        typing.TypeVar
+        ---------------------------------------------
+        ```python
+        typing.TypeVar
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:4:1
+          |
+        2 | from typing import TypeVar
+        3 |
+        4 | T = TypeVar('T', contravariant=True)
+          | ^- Cursor offset
+          | |
+          | source
+        5 |
+        6 | def contravariant(x: T):
+          |
+        ");
+
+        let test = cursor_test(
+            r#"
+        from typing import TypeVar
+
+        T = TypeVar('T', contravariant=True)
+
+        def contravariant(x: T<CURSOR>):
+            pass
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        T@contravariant (contravariant)
+        ---------------------------------------------
+        ```python
+        T@contravariant (contravariant)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:6:22
+          |
+        4 | T = TypeVar('T', contravariant=True)
+        5 |
+        6 | def contravariant(x: T):
+          |                      ^- Cursor offset
+          |                      |
+          |                      source
+        7 |     pass
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_binary_operator_literal() {
+        let test = cursor_test(
+            r#"
+        result = 5 <CURSOR>+ 3
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        bound method int.__add__(value: int, /) -> int
+        ---------------------------------------------
+        Return self+value.
+
+        ---------------------------------------------
+        ```python
+        bound method int.__add__(value: int, /) -> int
+        ```
+        ---
+        ```text
+        Return self+value.
+
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+         --> main.py:2:12
+          |
+        2 | result = 5 + 3
+          |            -
+          |            |
+          |            source
+          |            Cursor offset
+          |
+        ");
+    }
+
+    #[test]
+    fn hover_binary_operator_overload() {
+        let test = cursor_test(
+            r#"
+            from __future__ import annotations
+            from typing import overload
+
+            class Test:
+                @overload
+                def __add__(self, other: Test, /) -> Test:  ...
+                @overload
+                def __add__(self, other: Other, /) -> Test: ...
+                def __add__(self, other: Test | Other, /) -> Test:
+                    return self
+
+            class Other: ...
+
+            Test() <CURSOR>+ Test()
+        "#,
+        );
+
+        // TODO: We should only show the matching overload here.
+        // https://github.com/astral-sh/ty/issues/73
+        assert_snapshot!(test.hover(), @r"
+        (other: Test, /) -> Test
+        (other: Other, /) -> Test
+        ---------------------------------------------
+        ```python
+        (other: Test, /) -> Test
+        (other: Other, /) -> Test
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+          --> main.py:15:8
+           |
+        13 | class Other: ...
+        14 |
+        15 | Test() + Test()
+           |        -
+           |        |
+           |        source
+           |        Cursor offset
+           |
+        ");
+    }
+
+    #[test]
+    fn hover_binary_operator_union() {
+        let test = cursor_test(
+            r#"
+            from __future__ import annotations
+
+            class Test:
+                def __add__(self, other: Other, /) -> Other:
+                    return other
+
+            class Other:
+                def __add__(self, other: Other, /) -> Other:
+                    return self
+
+            def _(a: Test | Other):
+                a +<CURSOR> Other()
+        "#,
+        );
+
+        assert_snapshot!(test.hover(), @r"
+        (bound method Test.__add__(other: Other, /) -> Other) | (bound method Other.__add__(other: Other, /) -> Other)
+        ---------------------------------------------
+        ```python
+        (bound method Test.__add__(other: Other, /) -> Other) | (bound method Other.__add__(other: Other, /) -> Other)
+        ```
+        ---------------------------------------------
+        info[hover]: Hovered content is
+          --> main.py:13:7
+           |
+        12 | def _(a: Test | Other):
+        13 |     a + Other()
+           |       ^- Cursor offset
+           |       |
+           |       source
+           |
+        ");
+    }
+
     impl CursorTest {
         fn hover(&self) -> String {
             use std::fmt::Write;
diff --git a/crates/ty_ide/src/importer.rs b/crates/ty_ide/src/importer.rs
new file mode 100644
index 0000000000..646f12e52a
--- /dev/null
+++ b/crates/ty_ide/src/importer.rs
@@ -0,0 +1,2115 @@
+#![allow(warnings)]
+
+/*!
+An abstraction for adding new imports to a single Python source file.
+
+This importer is based on a similar abstraction in `ruff_linter::importer`.
+Both of them use the lower-level `ruff_python_importer::Insertion` primitive.
+The main differences here are:
+
+1. This works with ty's semantic model instead of ruff's.
+2. This owns the task of visiting AST to extract imports. This
+   design was chosen because it's currently only used for inserting
+   imports for unimported completion suggestions. If it needs to be
+   used more broadly, it might make sense to roll construction of an
+   `Importer` into ty's `SemanticIndex`.
+3. It doesn't have as many facilities as `ruff_linter`'s importer.
+*/
+
+use rustc_hash::FxHashMap;
+
+use ruff_db::files::File;
+use ruff_db::parsed::ParsedModuleRef;
+use ruff_diagnostics::Edit;
+use ruff_python_ast as ast;
+use ruff_python_ast::name::Name;
+use ruff_python_ast::visitor::source_order::{SourceOrderVisitor, TraversalSignal, walk_stmt};
+use ruff_python_codegen::Stylist;
+use ruff_python_importer::Insertion;
+use ruff_python_parser::{Parsed, Tokens};
+use ruff_text_size::{Ranged, TextRange, TextSize};
+use ty_project::Db;
+use ty_python_semantic::semantic_index::definition::DefinitionKind;
+use ty_python_semantic::types::Type;
+use ty_python_semantic::{MemberDefinition, ModuleName, SemanticModel};
+
+pub(crate) struct Importer<'a> {
+    /// The ty Salsa database.
+    db: &'a dyn Db,
+    /// The file corresponding to the module that
+    /// we want to insert an import statement into.
+    file: File,
+    /// The parsed module ref.
+    parsed: &'a ParsedModuleRef,
+    /// The tokens representing the Python AST.
+    tokens: &'a Tokens,
+    /// The source code for `file`.
+    source: &'a str,
+    /// The [`Stylist`] for the Python AST.
+    stylist: &'a Stylist<'a>,
+    /// The list of visited, top-level runtime imports in the Python AST.
+    imports: Vec<AstImport<'a>>,
+}
+
+impl<'a> Importer<'a> {
+    /// Create a new importer.
+    ///
+    /// The [`Stylist`] dictates the code formatting options of any code
+    /// edit (if any) produced by this importer.
+    ///
+    /// The `file` given should correspond to the module that we want
+    /// to insert an import statement into.
+    ///
+    /// The `source` is used to get access to the original source
+    /// text for `file`, which is used to help produce code edits (if
+    /// any).
+    ///
+    /// The AST given (corresponding to the contents of `file`) is
+    /// traversed and top-level imports are extracted from it. This
+    /// permits adding imports in a way that is harmonious with
+    /// existing imports.
+    pub(crate) fn new(
+        db: &'a dyn Db,
+        stylist: &'a Stylist<'a>,
+        file: File,
+        source: &'a str,
+        parsed: &'a ParsedModuleRef,
+    ) -> Self {
+        let imports = TopLevelImports::find(parsed);
+        Self {
+            db,
+            file,
+            parsed,
+            tokens: parsed.tokens(),
+            source,
+            stylist,
+            imports,
+        }
+    }
+
+    /// Builds a set of members in scope at the given AST node and position.
+    ///
+    /// Callers should use this routine to build "in scope members" to be used
+    /// with repeated calls to `Importer::import`. This does some work up-front
+    /// to avoid doing it for every call to `Importer::import`.
+    ///
+    /// In general, `at` should be equivalent to `node.start()` (from the
+    /// [`ruff_text_size::Ranged`] trait). However, in some cases, identifying
+    /// a good AST node for where the cursor is can be difficult, where as
+    /// knowing the precise position of the cursor is easy. The AST node in
+    /// that circumstance may be a very poor approximation that may still
+    /// result in good auto-import results.
+    ///
+    /// This API is designed with completions in mind. That is, we might have
+    /// many possible candidates to add as an import while the position we want
+    /// to insert them remains invariant.
+    pub fn members_in_scope_at(
+        &self,
+        node: ast::AnyNodeRef<'_>,
+        at: TextSize,
+    ) -> MembersInScope<'a> {
+        MembersInScope::new(self.db, self.file, self.parsed, node, at)
+    }
+
+    /// Imports a symbol into this importer's module.
+    ///
+    /// The given request is assumed to be valid. That is, the module
+    /// is assumed to be importable and the member is assumed to be a
+    /// valid thing to import from the given module.
+    ///
+    /// When possible (particularly when there is no existing import
+    /// statement to satisfy the given request), the import style on
+    /// the request is respected. When there is an existing import,
+    /// then the existing style is always respected instead.
+    ///
+    /// `members` should be a map of symbols in scope at the position
+    /// where the imported symbol should be available. This is used
+    /// to craft import statements in a way that doesn't conflict with
+    /// symbols in scope. If it's not feasible to provide this map, then
+    /// providing an empty map is generally fine. But it does mean that
+    /// the resulting import may shadow (or be shadowed by) some other
+    /// symbol.
+    ///
+    /// The "import action" returned includes an edit for inserting
+    /// the actual import (if necessary) along with the symbol text
+    /// that should be used to refer to the imported symbol. While
+    /// the symbol text may be expected to just be equivalent to the
+    /// request's `member`, it can be different. For example, there
+    /// might be an alias, or the corresponding module might already be
+    /// imported in a qualified way.
+    pub(crate) fn import(
+        &self,
+        request: ImportRequest<'_>,
+        members: &MembersInScope,
+    ) -> ImportAction {
+        let request = request.avoid_conflicts(self.db, self.file, members);
+        let mut symbol_text: Box<str> = request.member.into();
+        let Some(response) = self.find(&request, members.at) else {
+            let insertion = if let Some(future) = self.find_last_future_import() {
+                Insertion::end_of_statement(future.stmt, self.source, self.stylist)
+            } else {
+                Insertion::start_of_file(self.parsed.suite(), self.source, self.stylist)
+            };
+            let import = insertion.into_edit(&request.to_string());
+            if matches!(request.style, ImportStyle::Import) {
+                symbol_text = format!("{}.{}", request.module, request.member).into();
+            }
+            return ImportAction {
+                import: Some(import),
+                symbol_text,
+            };
+        };
+        match response.kind {
+            ImportResponseKind::Unqualified { ast, alias } => {
+                let member = alias.asname.as_ref().unwrap_or(&alias.name).as_str();
+                // As long as it's not a wildcard import, we use whatever name
+                // the member is imported as when inserting the symbol.
+                if member != "*" {
+                    symbol_text = member.into();
+                }
+                ImportAction {
+                    import: None,
+                    symbol_text,
+                }
+            }
+            ImportResponseKind::Qualified { ast, alias } => {
+                let module = alias.asname.as_ref().unwrap_or(&alias.name).as_str();
+                ImportAction {
+                    import: None,
+                    symbol_text: format!("{module}.{symbol_text}").into(),
+                }
+            }
+            ImportResponseKind::Partial(ast) => {
+                let import = if let Some(insertion) =
+                    Insertion::existing_import(response.import.stmt, self.tokens)
+                {
+                    insertion.into_edit(request.member)
+                } else {
+                    Insertion::end_of_statement(response.import.stmt, self.source, self.stylist)
+                        .into_edit(&format!(
+                            "from {} import {}",
+                            request.module, request.member
+                        ))
+                };
+                ImportAction {
+                    import: Some(import),
+                    symbol_text,
+                }
+            }
+        }
+    }
+
+    /// Look for an import already in this importer's module that
+    /// satisfies the given request. If found, the corresponding
+    /// import is returned along with the way in which the import
+    /// satisfies the request.
+    fn find<'importer>(
+        &'importer self,
+        request: &ImportRequest<'_>,
+        available_at: TextSize,
+    ) -> Option<ImportResponse<'importer, 'a>> {
+        let mut choice = None;
+        for import in &self.imports {
+            // If the import statement comes after the spot where we
+            // need the symbol, then we conservatively assume that
+            // the import statement does not satisfy the request. It
+            // is possible the import statement *could* satisfy the
+            // request. For example, if `available_at` is inside a
+            // function defined before the import statement. But this
+            // only works if the function is known to be called *after*
+            // the import statement executes. So... it's complicated.
+            // In the worst case, we'll end up inserting a superfluous
+            // import statement at the top of the module.
+            //
+            // Also, we can stop here since our import statements are
+            // sorted by their start location in the source.
+            if import.stmt.start() >= available_at {
+                return choice;
+            }
+            if let Some(response) = import.satisfies(self.db, self.file, request) {
+                if choice
+                    .as_ref()
+                    .is_none_or(|c| !c.kind.is_prioritized_over(&response.kind))
+                {
+                    let is_top_priority =
+                        matches!(response.kind, ImportResponseKind::Unqualified { .. });
+                    choice = Some(response);
+                    // When we find an unqualified import, it's (currently)
+                    // impossible for any later import to override it in
+                    // priority. So we can just quit here.
+                    if is_top_priority {
+                        return choice;
+                    }
+                }
+            }
+        }
+        choice
+    }
+
+    /// Find the last `from __future__` import statement in the AST.
+    fn find_last_future_import(&self) -> Option<&'a AstImport> {
+        self.imports
+            .iter()
+            .take_while(|import| {
+                import
+                    .stmt
+                    .as_import_from_stmt()
+                    .is_some_and(|import_from| import_from.module.as_deref() == Some("__future__"))
+            })
+            .last()
+    }
+}
+
+/// A map of symbols in scope at a particular location in a module.
+///
+/// Users of an `Importer` must create this map via
+/// [`Importer::members_in_scope_at`] in order to use the [`Importer::import`]
+/// API. This map provides quick access to symbols in scope to help ensure that
+/// the imports inserted are correct and do not conflict with existing symbols.
+///
+/// Note that this isn't perfect. At time of writing (2025-09-16), the importer
+/// makes the trade-off that it's better to insert an incorrect import than to
+/// silently do nothing. Perhaps in the future we can find a way to prompt end
+/// users for a decision. This behavior is modeled after rust-analyzer, which
+/// does the same thing for auto-import on unimported completions.
+#[derive(Debug)]
+pub struct MembersInScope<'ast> {
+    at: TextSize,
+    map: FxHashMap<Name, MemberInScope<'ast>>,
+}
+
+impl<'ast> MembersInScope<'ast> {
+    fn new(
+        db: &'ast dyn Db,
+        file: File,
+        parsed: &'ast ParsedModuleRef,
+        node: ast::AnyNodeRef<'_>,
+        at: TextSize,
+    ) -> MembersInScope<'ast> {
+        let model = SemanticModel::new(db, file);
+        let map = model
+            .members_in_scope_at(node)
+            .into_iter()
+            .map(|(name, memberdef)| {
+                let Some(def) = memberdef.definition else {
+                    return (name, MemberInScope::other(memberdef.ty));
+                };
+                let kind = match *def.kind(db) {
+                    DefinitionKind::Import(ref kind) => {
+                        MemberImportKind::Imported(AstImportKind::Import(kind.import(parsed)))
+                    }
+                    DefinitionKind::ImportFrom(ref kind) => {
+                        MemberImportKind::Imported(AstImportKind::ImportFrom(kind.import(parsed)))
+                    }
+                    DefinitionKind::StarImport(ref kind) => {
+                        MemberImportKind::Imported(AstImportKind::ImportFrom(kind.import(parsed)))
+                    }
+                    _ => MemberImportKind::Other,
+                };
+                (
+                    name,
+                    MemberInScope {
+                        ty: memberdef.ty,
+                        kind,
+                    },
+                )
+            })
+            .collect();
+        MembersInScope { at, map }
+    }
+}
+
+#[derive(Debug)]
+struct MemberInScope<'ast> {
+    ty: Type<'ast>,
+    kind: MemberImportKind<'ast>,
+}
+
+impl<'ast> MemberInScope<'ast> {
+    /// Returns a member with the given type and "irrelevant"
+    /// definition site. That is, the only definition sites
+    /// we currently care about are import statements.
+    fn other(ty: Type<'ast>) -> MemberInScope<'ast> {
+        MemberInScope {
+            ty,
+            kind: MemberImportKind::Other,
+        }
+    }
+
+    /// Returns true if this symbol satisfies the given import request. This
+    /// attempts to take the definition site of the symbol into account.
+    fn satisfies(&self, db: &dyn Db, importing_file: File, request: &ImportRequest<'_>) -> bool {
+        let MemberImportKind::Imported(ref ast_import) = self.kind else {
+            return false;
+        };
+        ast_import.satisfies(db, importing_file, request).is_some()
+    }
+}
+
+/// A type describing how a symbol was defined.
+#[derive(Debug)]
+enum MemberImportKind<'ast> {
+    /// A symbol was introduced through an import statement.
+    Imported(AstImportKind<'ast>),
+    /// A symbol was introduced through something other
+    /// than an import statement.
+    Other,
+}
+
+/// The edits needed to insert the import statement.
+///
+/// While this is usually just an edit to add an import statement (or
+/// modify an existing one), it can also sometimes just be a change
+/// to the text that should be inserted for a particular symbol. For
+/// example, if one were to ask for `search` from the `re` module, and
+/// `re` was already imported, then we'd return no edits for import
+/// statements and the text `re.search` to use for the symbol.
+#[derive(Debug)]
+pub(crate) struct ImportAction {
+    import: Option<Edit>,
+    symbol_text: Box<str>,
+}
+
+impl ImportAction {
+    /// Returns an edit to insert an import statement.
+    pub(crate) fn import(&self) -> Option<&Edit> {
+        self.import.as_ref()
+    }
+
+    /// Returns the symbol text that should be used.
+    ///
+    /// Usually this is identical to the symbol text given to the corresponding
+    /// [`ImportRequest`], but this may sometimes be fully qualified based on
+    /// existing imports or import preferences.
+    pub(crate) fn symbol_text(&self) -> &str {
+        &*self.symbol_text
+    }
+}
+
+/// A borrowed AST of a Python import statement.
+#[derive(Debug)]
+struct AstImport<'ast> {
+    /// The original AST statement containing the import.
+    stmt: &'ast ast::Stmt,
+    /// The specific type of import.
+    ///
+    /// Storing this means we can do exhaustive case analysis
+    /// on the type of the import without needing to constantly
+    /// unwrap it from a more general `Stmt`. Still, we keep the
+    /// `Stmt` around because some APIs want that.
+    kind: AstImportKind<'ast>,
+}
+
+impl<'ast> AstImport<'ast> {
+    /// Returns whether this import satisfies the given request.
+    ///
+    /// If it does, then this returns *how* the import satisfies
+    /// the request.
+    fn satisfies<'importer>(
+        &'importer self,
+        db: &'_ dyn Db,
+        importing_file: File,
+        request: &ImportRequest<'_>,
+    ) -> Option<ImportResponse<'importer, 'ast>> {
+        self.kind
+            .satisfies(db, importing_file, request)
+            .map(|kind| ImportResponse { import: self, kind })
+    }
+}
+
+/// The specific kind of import.
+#[derive(Debug)]
+enum AstImportKind<'ast> {
+    Import(&'ast ast::StmtImport),
+    ImportFrom(&'ast ast::StmtImportFrom),
+}
+
+impl<'ast> AstImportKind<'ast> {
+    /// Returns whether this import satisfies the given request.
+    ///
+    /// If it does, then this returns *how* the import satisfies
+    /// the request.
+    fn satisfies<'importer>(
+        &'importer self,
+        db: &'_ dyn Db,
+        importing_file: File,
+        request: &ImportRequest<'_>,
+    ) -> Option<ImportResponseKind<'ast>> {
+        match *self {
+            AstImportKind::Import(ast) => {
+                if request.force_style && !matches!(request.style, ImportStyle::Import) {
+                    return None;
+                }
+                let alias = ast
+                    .names
+                    .iter()
+                    .find(|alias| alias.name.as_str() == request.module)?;
+                Some(ImportResponseKind::Qualified { ast, alias })
+            }
+            AstImportKind::ImportFrom(ast) => {
+                if request.force_style && !matches!(request.style, ImportStyle::ImportFrom) {
+                    return None;
+                }
+
+                let module = ModuleName::from_import_statement(db, importing_file, ast).ok()?;
+                if module.as_str() != request.module {
+                    return None;
+                }
+                let kind = ast
+                    .names
+                    .iter()
+                    .find(|alias| {
+                        alias.name.as_str() == "*" || alias.name.as_str() == request.member
+                    })
+                    .map(|alias| ImportResponseKind::Unqualified { ast, alias })
+                    .unwrap_or_else(|| ImportResponseKind::Partial(ast));
+                Some(kind)
+            }
+        }
+    }
+}
+
+/// A request to import a module into the global scope of a Python module.
+#[derive(Debug)]
+pub(crate) struct ImportRequest<'a> {
+    /// The module from which the symbol should 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`).
+    ///
+    /// This style isn't respected if the `module` already has
+    /// an import statement. In that case, the existing style is
+    /// respected.
+    style: ImportStyle,
+    /// Whether the import style ought to be forced for correctness
+    /// reasons. For example, to avoid shadowing or introducing a
+    /// conflicting name.
+    force_style: bool,
+}
+
+impl<'a> ImportRequest<'a> {
+    /// Create a new [`ImportRequest`] from a `module` and `member`.
+    ///
+    /// If `module` has no existing imports, 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,
+            force_style: false,
+        }
+    }
+
+    /// Create a new [`ImportRequest`] from a module and member.
+    ///
+    /// If `module` has no existing imports, 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,
+            force_style: false,
+        }
+    }
+
+    /// Attempts to change the import request style so that the chances
+    /// of an import conflict are minimized (although not always reduced
+    /// to zero).
+    fn avoid_conflicts(self, db: &dyn Db, importing_file: File, members: &MembersInScope) -> Self {
+        match (members.map.get(self.module), members.map.get(self.member)) {
+            // Neither symbol exists, so we can just proceed as
+            // normal.
+            (None, None) => self,
+            // The symbol we want to import already exists but
+            // the module symbol does not, so we can import the
+            // symbol in a qualified way safely.
+            (None, Some(member)) => {
+                // ... unless the symbol we want is already
+                // imported, then leave it as-is.
+                if member.satisfies(db, importing_file, &self) {
+                    return self;
+                }
+                Self {
+                    style: ImportStyle::Import,
+                    force_style: true,
+                    ..self
+                }
+            }
+            // The symbol we want to import doesn't exist but
+            // the module does. So we can import the symbol we
+            // want *unqualified* safely.
+            //
+            // ... unless the module symbol we found here is
+            // actually a module symbol.
+            (
+                Some(&MemberInScope {
+                    ty: Type::ModuleLiteral(_),
+                    ..
+                }),
+                None,
+            ) => self,
+            (Some(_), None) => Self {
+                style: ImportStyle::ImportFrom,
+                force_style: true,
+                ..self
+            },
+            // Both the module and the member symbols are in
+            // scope. We *assume* that the module symbol is in
+            // scope because it is imported. Since the member
+            // symbol is definitively in scope, we attempt a
+            // qualified import.
+            //
+            // This could lead to a situation where we add an
+            // `import` that is shadowed by some other symbol.
+            // This is unfortunate, but it's not clear what we
+            // should do instead. rust-analyzer will still add
+            // the conflicting import. I think that's the wiser
+            // choice, instead of silently doing nothing or
+            // silently omitting the symbol from completions.
+            // (I suppose the best choice would be to ask the
+            // user for an alias for the import or something.)
+            (Some(_), Some(_)) => Self {
+                style: ImportStyle::Import,
+                force_style: false,
+                ..self
+            },
+        }
+    }
+}
+
+impl std::fmt::Display for ImportRequest<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.style {
+            ImportStyle::Import => write!(f, "import {}", self.module),
+            ImportStyle::ImportFrom => write!(f, "from {} import {}", self.module, self.member),
+        }
+    }
+}
+
+/// The response to an import request.
+#[derive(Debug)]
+struct ImportResponse<'importer, 'ast> {
+    import: &'importer AstImport<'ast>,
+    kind: ImportResponseKind<'ast>,
+}
+
+/// The kind of response to an import request.
+///
+/// This encodes the answer to the question: how does a given import
+/// statement satisfy an [`ImportRequest`]? This encodes the different
+/// degrees to the request is satisfied.
+#[derive(Debug)]
+enum ImportResponseKind<'ast> {
+    /// The import satisfies the request as-is. The symbol is already
+    /// imported directly and may be used unqualified.
+    ///
+    /// This always corresponds to a `from <...> import <...>`
+    /// statement. Note that `<...>` may be a wildcard import!
+    Unqualified {
+        /// The AST of the import that satisfied the request.
+        ast: &'ast ast::StmtImportFrom,
+        /// The specific alias in the `from <...> import <...>`
+        /// statement that satisfied the request's `member`.
+        alias: &'ast ast::Alias,
+    },
+    /// The necessary module is imported, but the symbol itself is not
+    /// in scope. The symbol can be used via `module.symbol`.
+    ///
+    /// This always corresponds to a `import <...>` statement.
+    Qualified {
+        /// The AST of the import that satisfied the request.
+        ast: &'ast ast::StmtImport,
+        /// The specific alias in the import statement that
+        /// satisfied the request's `module`.
+        alias: &'ast ast::Alias,
+    },
+    /// The necessary module is imported via `from module import ...`,
+    /// but the desired symbol is not listed in `...`.
+    ///
+    /// This always corresponds to a `from <...> import <...>`
+    /// statement.
+    ///
+    /// It is guaranteed that this never contains a wildcard import.
+    /// (otherwise, this import wouldn't be partial).
+    Partial(&'ast ast::StmtImportFrom),
+}
+
+impl ImportResponseKind<'_> {
+    /// Returns true if this import statement kind should be
+    /// prioritized over the one given.
+    ///
+    /// This assumes that `self` occurs before `other` in the source
+    /// code.
+    fn is_prioritized_over(&self, other: &ImportResponseKind<'_>) -> bool {
+        self.priority() <= other.priority()
+    }
+
+    /// Returns an integer reflecting the "priority" of this
+    /// import kind relative to other import statements.
+    ///
+    /// Lower values indicate higher priority.
+    fn priority(&self) -> usize {
+        match *self {
+            ImportResponseKind::Unqualified { .. } => 0,
+            ImportResponseKind::Qualified { .. } => 1,
+            ImportResponseKind::Partial(_) => 2,
+        }
+    }
+}
+
+/// The style of a Python import statement.
+#[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,
+}
+
+/// An error that can occur when trying to add an import.
+#[derive(Debug)]
+pub(crate) enum AddImportError {
+    /// The symbol can't be imported, because another symbol is bound to the
+    /// same name.
+    ConflictingName(String),
+}
+
+impl std::fmt::Display for AddImportError {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            AddImportError::ConflictingName(binding) => std::write!(
+                fmt,
+                "Unable to insert `{binding}` into scope due to name conflict"
+            ),
+        }
+    }
+}
+
+impl std::error::Error for AddImportError {}
+
+/// An AST visitor for extracting top-level imports.
+#[derive(Debug, Default)]
+struct TopLevelImports<'ast> {
+    level: u64,
+    imports: Vec<AstImport<'ast>>,
+}
+
+impl<'ast> TopLevelImports<'ast> {
+    /// Find all top-level imports from the given AST of a Python module.
+    fn find(parsed: &'ast Parsed<ast::ModModule>) -> Vec<AstImport<'ast>> {
+        let mut visitor = TopLevelImports::default();
+        visitor.visit_body(parsed.suite());
+        visitor.imports
+    }
+}
+
+impl<'ast> SourceOrderVisitor<'ast> for TopLevelImports<'ast> {
+    fn visit_stmt(&mut self, stmt: &'ast ast::Stmt) {
+        match *stmt {
+            ast::Stmt::Import(ref node) => {
+                if self.level == 0 {
+                    let kind = AstImportKind::Import(node);
+                    self.imports.push(AstImport { stmt, kind });
+                }
+            }
+            ast::Stmt::ImportFrom(ref node) => {
+                if self.level == 0 {
+                    let kind = AstImportKind::ImportFrom(node);
+                    self.imports.push(AstImport { stmt, kind });
+                }
+            }
+            _ => {
+                // OK because it's not practical for the source code
+                // depth of a Python to exceed a u64.
+                //
+                // Also, it is perhaps a bit too eager to increment
+                // this for every non-import statement, particularly
+                // compared to the more refined scope tracking in the
+                // semantic index builder. However, I don't think
+                // we need anything more refined here. We only care
+                // about top-level imports. So as soon as we get into
+                // something nested, we can bail out.
+                //
+                // Although, this does mean, e.g.,
+                //
+                //     if predicate:
+                //         import whatever
+                //
+                // at the module scope is not caught here. If we
+                // need those imports, I think we'll just want some
+                // more case analysis with more careful `level`
+                // incrementing.
+                self.level = self.level.checked_add(1).unwrap();
+                walk_stmt(self, stmt);
+                // Always OK because we can only be here after
+                // a successful +1 from above.
+                self.level = self.level.checked_sub(1).unwrap();
+            }
+        }
+    }
+
+    #[inline]
+    fn enter_node(&mut self, node: ast::AnyNodeRef<'ast>) -> TraversalSignal {
+        if node.is_statement() {
+            TraversalSignal::Traverse
+        } else {
+            TraversalSignal::Skip
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use camino::Utf8Component;
+    use insta::assert_snapshot;
+    use insta::internals::SettingsBindDropGuard;
+
+    use crate::find_node::covering_node;
+    use crate::tests::{CursorTest, CursorTestBuilder, cursor_test};
+    use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};
+    use ruff_db::files::{File, FileRootKind, system_path_to_file};
+    use ruff_db::parsed::parsed_module;
+    use ruff_db::source::source_text;
+    use ruff_db::system::{DbWithWritableSystem, SystemPath, SystemPathBuf};
+    use ruff_db::{Db, system};
+    use ruff_python_codegen::Stylist;
+    use ruff_python_trivia::textwrap::dedent;
+    use ruff_text_size::TextSize;
+    use ty_project::ProjectMetadata;
+    use ty_python_semantic::{
+        Program, ProgramSettings, PythonPlatform, PythonVersionWithSource, SearchPathSettings,
+        SemanticModel,
+    };
+
+    use super::*;
+
+    impl CursorTest {
+        fn import(&self, module: &str, member: &str) -> String {
+            self.add(ImportRequest::import(module, member))
+        }
+
+        fn import_from(&self, module: &str, member: &str) -> String {
+            self.add(ImportRequest::import_from(module, member))
+        }
+
+        fn add(&self, request: ImportRequest<'_>) -> String {
+            let node = covering_node(
+                self.cursor.parsed.syntax().into(),
+                TextRange::empty(self.cursor.offset),
+            )
+            .node();
+            let importer = self.importer();
+            let members = importer.members_in_scope_at(node, self.cursor.offset);
+            let resp = importer.import(request, &members);
+
+            // We attempt to emulate what an LSP client would
+            // do here and "insert" the import into the original
+            // source document. I'm not 100% sure this models
+            // reality correctly, but in particular, we are
+            // careful to insert the symbol name first since
+            // it *should* come after the import.
+            let mut source = self.cursor.source.to_string();
+            source.insert_str(self.cursor.offset.to_usize(), &resp.symbol_text);
+            if let Some(edit) = resp.import() {
+                assert!(
+                    edit.range().start() <= self.cursor.offset,
+                    "import edit must come at or before <CURSOR>, \
+                     but <CURSOR> starts at {} and the import \
+                     edit is at {}..{}",
+                    self.cursor.offset.to_usize(),
+                    edit.range().start().to_usize(),
+                    edit.range().end().to_usize(),
+                );
+                source.replace_range(edit.range().to_std_range(), edit.content().unwrap_or(""));
+            }
+            source
+        }
+
+        fn importer(&self) -> Importer<'_> {
+            Importer::new(
+                &self.db,
+                &self.cursor.stylist,
+                self.cursor.file,
+                self.cursor.source.as_str(),
+                &self.cursor.parsed,
+            )
+        }
+    }
+
+    #[test]
+    fn empty_source_qualified() {
+        let test = cursor_test("<CURSOR>");
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        collections.defaultdict
+        ");
+    }
+
+    #[test]
+    fn empty_source_unqualified() {
+        let test = cursor_test("<CURSOR>");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_exists_qualified() {
+        let test = cursor_test(
+            "\
+import collections
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        collections.defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_exists_unqualified() {
+        let test = cursor_test(
+            "\
+from collections import defaultdict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_exists_glob() {
+        let test = cursor_test(
+            "\
+from collections import *
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import *
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_exists_qualified_aliased() {
+        let test = cursor_test(
+            "\
+import collections as c
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections as c
+        c.defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_exists_unqualified_aliased() {
+        let test = cursor_test(
+            "\
+from collections import defaultdict as ddict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict as ddict
+        ddict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_single() {
+        let test = cursor_test(
+            "\
+from collections import Counter
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import Counter, defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_aliased_single() {
+        let test = cursor_test(
+            "\
+from collections import Counter as C
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import Counter as C, defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_multi() {
+        let test = cursor_test(
+            "\
+from collections import Counter, OrderedDict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import Counter, OrderedDict, defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_aliased_multi() {
+        let test = cursor_test(
+            "\
+from collections import Counter as C, OrderedDict as OD
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import Counter as C, OrderedDict as OD, defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_semi_colon() {
+        let test = cursor_test(
+            "\
+from collections import Counter;
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import Counter, defaultdict;
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_continuation() {
+        let test = cursor_test(
+            "\
+from collections import Counter, \\
+  OrderedDict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import Counter, \
+          OrderedDict, defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_parentheses_single() {
+        let test = cursor_test(
+            "\
+from collections import (Counter)
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import (Counter, defaultdict)
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_parentheses_trailing_comma() {
+        let test = cursor_test(
+            "\
+from collections import (Counter,)
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import (Counter, defaultdict,)
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_parentheses_multi_line_trailing_comma() {
+        let test = cursor_test(
+            "\
+from collections import (
+    Counter,
+    OrderedDict,
+)
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import (
+            Counter,
+            OrderedDict, defaultdict,
+        )
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_parentheses_multi_line_no_trailing_comma() {
+        let test = cursor_test(
+            "\
+from collections import (
+    Counter,
+    OrderedDict
+)
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import (
+            Counter,
+            OrderedDict, defaultdict
+        )
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_relative() {
+        let test = CursorTest::builder()
+            .source("package/__init__.py", "")
+            .source("package/foo.py", "Foo = 1\nBar = 2\n")
+            .source(
+                "package/sub1/sub2/quux.py",
+                "from ...foo import Foo\n<CURSOR>\n",
+            )
+            .build();
+        assert_snapshot!(
+            test.import("package.foo", "Bar"), @r"
+        from ...foo import Foo, Bar
+        Bar
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_incomplete() {
+        let test = cursor_test(
+            "\
+from collections import
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn import_partially_exists_incomplete_parentheses1() {
+        let test = cursor_test(
+            "\
+from collections import ()
+<CURSOR>
+        ",
+        );
+        // In this case, because of the `()` being an
+        // invalid AST, our importer gives up and just
+        // adds a new line. We could add more heuristics
+        // to make this case work, but I think there will
+        // always be some cases like this that won't make
+        // sense.
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import ()
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn priority_unqualified_over_unqualified() {
+        let test = cursor_test(
+            "\
+from collections import defaultdict
+import re
+from collections import defaultdict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        import re
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn priority_unqualified_over_unqualified_between() {
+        let test = cursor_test(
+            "\
+from collections import defaultdict
+import re
+<CURSOR>
+from collections import defaultdict
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        import re
+        defaultdict
+        from collections import defaultdict
+        ");
+    }
+
+    #[test]
+    fn priority_unqualified_over_qualified() {
+        let test = cursor_test(
+            "\
+import collections
+from collections import defaultdict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn priority_unqualified_over_partial() {
+        let test = cursor_test(
+            "\
+from collections import OrderedDict
+from collections import defaultdict
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import OrderedDict
+        from collections import defaultdict
+        defaultdict
+        ");
+    }
+
+    #[test]
+    fn priority_qualified_over_partial() {
+        let test = cursor_test(
+            "\
+from collections import OrderedDict
+import collections
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import OrderedDict
+        import collections
+        collections.defaultdict
+        ");
+    }
+
+    #[test]
+    fn out_of_scope_ordering_top_level() {
+        let test = cursor_test(
+            "\
+<CURSOR>
+from collections import defaultdict
+        ",
+        );
+        // Since the import came after the cursor,
+        // we add another import at the top-level
+        // of the module.
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        collections.defaultdict
+        from collections import defaultdict
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        defaultdict
+        from collections import defaultdict
+        ");
+    }
+
+    #[test]
+    fn out_of_scope_ordering_within_function_add_import() {
+        let test = cursor_test(
+            "\
+def foo():
+    <CURSOR>
+from collections import defaultdict
+        ",
+        );
+        // Since the import came after the cursor,
+        // we add another import at the top-level
+        // of the module.
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        def foo():
+            collections.defaultdict
+        from collections import defaultdict
+        ");
+    }
+
+    #[test]
+    fn in_scope_ordering_within_function() {
+        let test = cursor_test(
+            "\
+from collections import defaultdict
+
+def foo():
+    <CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+
+        def foo():
+            defaultdict
+        ");
+    }
+
+    #[test]
+    fn existing_future_import() {
+        let test = cursor_test(
+            "\
+from __future__ import annotations
+
+<CURSOR>
+        ",
+        );
+        assert_snapshot!(
+            test.import("typing", "TypeVar"), @r"
+        from __future__ import annotations
+        import typing
+
+        typing.TypeVar
+        ");
+    }
+
+    #[test]
+    fn existing_future_import_after_docstring() {
+        let test = cursor_test(
+            r#"
+"This is a module level docstring"
+from __future__ import annotations
+
+<CURSOR>
+        "#,
+        );
+        assert_snapshot!(
+            test.import("typing", "TypeVar"), @r#"
+        "This is a module level docstring"
+        from __future__ import annotations
+        import typing
+
+        typing.TypeVar
+        "#);
+    }
+
+    #[test]
+    fn qualify_symbol_to_avoid_overwriting_other_symbol_in_scope() {
+        let test = cursor_test(
+            "\
+defaultdict = 1
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        defaultdict = 1
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        import collections
+        defaultdict = 1
+        (collections.defaultdict)
+        ");
+    }
+
+    #[test]
+    fn unqualify_symbol_to_avoid_overwriting_other_symbol_in_scope() {
+        let test = cursor_test(
+            "\
+collections = 1
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        collections = 1
+        (defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        collections = 1
+        (defaultdict)
+        ");
+    }
+
+    /// Tests a failure scenario where both the module
+    /// name and the member name are in scope and defined
+    /// as something other than a module. In this case,
+    /// it's very difficult to auto-insert an import in a
+    /// way that is correct.
+    ///
+    /// At time of writing (2025-09-15), we just insert a
+    /// qualified import anyway, even though this will result
+    /// in what is likely incorrect code. This seems better
+    /// than some alternatives:
+    ///
+    /// 1. Silently do nothing.
+    /// 2. Silently omit the symbol from completions.
+    /// 3. Come up with an alias for the symbol.
+    ///
+    /// I think it would perhaps be ideal if we could somehow
+    /// prompt the user for what they want to do. But I think
+    /// this is okay for now. ---AG
+    #[test]
+    fn import_results_in_conflict() {
+        let test = cursor_test(
+            "\
+collections = 1
+defaultdict = 2
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        collections = 1
+        defaultdict = 2
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        import collections
+        collections = 1
+        defaultdict = 2
+        (collections.defaultdict)
+        ");
+    }
+
+    #[test]
+    fn within_function_definition_simple() {
+        let test = cursor_test(
+            "\
+def foo():
+    (<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        def foo():
+            (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        def foo():
+            (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn within_function_definition_member_conflict() {
+        let test = cursor_test(
+            "\
+def defaultdict():
+    (<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        def defaultdict():
+            (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        import collections
+        def defaultdict():
+            (collections.defaultdict)
+        ");
+    }
+
+    #[test]
+    fn within_function_definition_module_conflict() {
+        let test = cursor_test(
+            "\
+def collections():
+    (<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        def collections():
+            (defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        def collections():
+            (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn member_conflict_with_other_import() {
+        let test = cursor_test(
+            "\
+import defaultdict
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        import defaultdict
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        import collections
+        import defaultdict
+
+        (collections.defaultdict)
+        ");
+    }
+
+    #[test]
+    fn module_conflict_with_other_import() {
+        let test = cursor_test(
+            "\
+from foo import collections
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        from foo import collections
+
+        (defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        from foo import collections
+
+        (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn member_conflict_with_other_member_import() {
+        let test = cursor_test(
+            "\
+from othermodule import defaultdict
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        from othermodule import defaultdict
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        import collections
+        from othermodule import defaultdict
+
+        (collections.defaultdict)
+        ");
+    }
+
+    #[test]
+    fn member_conflict_with_other_module_import_alias() {
+        let test = cursor_test(
+            "\
+import defaultdict as ddict
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        import defaultdict as ddict
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        import defaultdict as ddict
+
+        (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn member_conflict_with_other_member_import_alias() {
+        let test = cursor_test(
+            "\
+from othermodule import something as defaultdict
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        from othermodule import something as defaultdict
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        import collections
+        from othermodule import something as defaultdict
+
+        (collections.defaultdict)
+        ");
+    }
+
+    #[test]
+    fn no_conflict_alias_module() {
+        let test = cursor_test(
+            "\
+import defaultdict as ddict
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        import defaultdict as ddict
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        import defaultdict as ddict
+
+        (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn no_conflict_alias_member() {
+        let test = cursor_test(
+            "\
+from foo import defaultdict as ddict
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        from foo import defaultdict as ddict
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        from foo import defaultdict as ddict
+
+        (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn multiple_import_blocks_std() {
+        let test = cursor_test(
+            "\
+import json
+import re
+
+from whenever import ZonedDateTime
+import numpy as np
+
+(<CURSOR>)
+        ",
+        );
+
+        assert_snapshot!(
+            test.import("collections", "defaultdict"), @r"
+        import collections
+        import json
+        import re
+
+        from whenever import ZonedDateTime
+        import numpy as np
+
+        (collections.defaultdict)
+        ");
+        assert_snapshot!(
+            test.import_from("collections", "defaultdict"), @r"
+        from collections import defaultdict
+        import json
+        import re
+
+        from whenever import ZonedDateTime
+        import numpy as np
+
+        (defaultdict)
+        ");
+    }
+
+    #[test]
+    fn multiple_import_blocks_other() {
+        let test = CursorTest::builder()
+            .source("foo.py", "Foo = 1\nBar = 2\n")
+            .source(
+                "main.py",
+                "\
+import json
+import re
+
+from whenever import ZonedDateTime
+import numpy as np
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("foo", "Bar"), @r"
+        import foo
+        import json
+        import re
+
+        from whenever import ZonedDateTime
+        import numpy as np
+
+        (foo.Bar)
+        ");
+        assert_snapshot!(
+            test.import_from("foo", "Bar"), @r"
+        from foo import Bar
+        import json
+        import re
+
+        from whenever import ZonedDateTime
+        import numpy as np
+
+        (Bar)
+        ");
+    }
+
+    #[test]
+    fn conditional_imports_new_import() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+if os.getenv(\"WHATEVER\"):
+    from foo import MAGIC
+else:
+    from bar import MAGIC
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("quux", "MAGIC"), @r#"
+        import quux
+        if os.getenv("WHATEVER"):
+            from foo import MAGIC
+        else:
+            from bar import MAGIC
+
+        (quux.MAGIC)
+        "#);
+        assert_snapshot!(
+            test.import_from("quux", "MAGIC"), @r#"
+        import quux
+        if os.getenv("WHATEVER"):
+            from foo import MAGIC
+        else:
+            from bar import MAGIC
+
+        (quux.MAGIC)
+        "#);
+    }
+
+    // FIXME: This test (and the one below it) aren't
+    // quite right. Namely, because we aren't handling
+    // multiple binding sites correctly, we don't see the
+    // existing `MAGIC` symbol.
+    #[test]
+    fn conditional_imports_existing_import1() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+if os.getenv(\"WHATEVER\"):
+    from foo import MAGIC
+else:
+    from bar import MAGIC
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("foo", "MAGIC"), @r#"
+        import foo
+        if os.getenv("WHATEVER"):
+            from foo import MAGIC
+        else:
+            from bar import MAGIC
+
+        (foo.MAGIC)
+        "#);
+        assert_snapshot!(
+            test.import_from("foo", "MAGIC"), @r#"
+        import foo
+        if os.getenv("WHATEVER"):
+            from foo import MAGIC
+        else:
+            from bar import MAGIC
+
+        (foo.MAGIC)
+        "#);
+    }
+
+    #[test]
+    fn conditional_imports_existing_import2() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+if os.getenv(\"WHATEVER\"):
+    from foo import MAGIC
+else:
+    from bar import MAGIC
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("bar", "MAGIC"), @r#"
+        import bar
+        if os.getenv("WHATEVER"):
+            from foo import MAGIC
+        else:
+            from bar import MAGIC
+
+        (bar.MAGIC)
+        "#);
+        assert_snapshot!(
+            test.import_from("bar", "MAGIC"), @r#"
+        import bar
+        if os.getenv("WHATEVER"):
+            from foo import MAGIC
+        else:
+            from bar import MAGIC
+
+        (bar.MAGIC)
+        "#);
+    }
+
+    // FIXME: This test (and the one below it) aren't quite right. We
+    // don't recognize the multiple declaration sites for `fubar`.
+    //
+    // In this case, it's not totally clear what we should do. Since we
+    // are trying to import `MAGIC` from `foo`, we could add a `from
+    // foo import MAGIC` within the first `if` block. Or we could try
+    // and "infer" something about the code assuming that we know
+    // `MAGIC` is in both `foo` and `bar`.
+    #[test]
+    fn conditional_imports_existing_module1() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+if os.getenv(\"WHATEVER\"):
+    import foo as fubar
+else:
+    import bar as fubar
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("foo", "MAGIC"), @r#"
+        import foo
+        if os.getenv("WHATEVER"):
+            import foo as fubar
+        else:
+            import bar as fubar
+
+        (foo.MAGIC)
+        "#);
+        assert_snapshot!(
+            test.import_from("foo", "MAGIC"), @r#"
+        from foo import MAGIC
+        if os.getenv("WHATEVER"):
+            import foo as fubar
+        else:
+            import bar as fubar
+
+        (MAGIC)
+        "#);
+    }
+
+    #[test]
+    fn conditional_imports_existing_module2() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+if os.getenv(\"WHATEVER\"):
+    import foo as fubar
+else:
+    import bar as fubar
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("bar", "MAGIC"), @r#"
+        import bar
+        if os.getenv("WHATEVER"):
+            import foo as fubar
+        else:
+            import bar as fubar
+
+        (bar.MAGIC)
+        "#);
+        assert_snapshot!(
+            test.import_from("bar", "MAGIC"), @r#"
+        from bar import MAGIC
+        if os.getenv("WHATEVER"):
+            import foo as fubar
+        else:
+            import bar as fubar
+
+        (MAGIC)
+        "#);
+    }
+
+    #[test]
+    fn try_imports_new_import() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+try:
+    from foo import MAGIC
+except ImportError:
+    from bar import MAGIC
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("quux", "MAGIC"), @r"
+        import quux
+        try:
+            from foo import MAGIC
+        except ImportError:
+            from bar import MAGIC
+
+        (quux.MAGIC)
+        ");
+        assert_snapshot!(
+            test.import_from("quux", "MAGIC"), @r"
+        import quux
+        try:
+            from foo import MAGIC
+        except ImportError:
+            from bar import MAGIC
+
+        (quux.MAGIC)
+        ");
+    }
+
+    // FIXME: This test (and the one below it) aren't
+    // quite right. Namely, because we aren't handling
+    // multiple binding sites correctly, we don't see the
+    // existing `MAGIC` symbol.
+    #[test]
+    fn try_imports_existing_import1() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+try:
+    from foo import MAGIC
+except ImportError:
+    from bar import MAGIC
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("foo", "MAGIC"), @r"
+        import foo
+        try:
+            from foo import MAGIC
+        except ImportError:
+            from bar import MAGIC
+
+        (foo.MAGIC)
+        ");
+        assert_snapshot!(
+            test.import_from("foo", "MAGIC"), @r"
+        import foo
+        try:
+            from foo import MAGIC
+        except ImportError:
+            from bar import MAGIC
+
+        (foo.MAGIC)
+        ");
+    }
+
+    #[test]
+    fn try_imports_existing_import2() {
+        let test = CursorTest::builder()
+            .source("foo.py", "MAGIC = 1")
+            .source("bar.py", "MAGIC = 2")
+            .source("quux.py", "MAGIC = 3")
+            .source(
+                "main.py",
+                "\
+try:
+    from foo import MAGIC
+except ImportError:
+    from bar import MAGIC
+
+(<CURSOR>)
+        ",
+            )
+            .build();
+
+        assert_snapshot!(
+            test.import("bar", "MAGIC"), @r"
+        import bar
+        try:
+            from foo import MAGIC
+        except ImportError:
+            from bar import MAGIC
+
+        (bar.MAGIC)
+        ");
+        assert_snapshot!(
+            test.import_from("bar", "MAGIC"), @r"
+        import bar
+        try:
+            from foo import MAGIC
+        except ImportError:
+            from bar import MAGIC
+
+        (bar.MAGIC)
+        ");
+    }
+}
diff --git a/crates/ty_ide/src/inlay_hints.rs b/crates/ty_ide/src/inlay_hints.rs
index 1004f5b4d5..1e3f545aff 100644
--- a/crates/ty_ide/src/inlay_hints.rs
+++ b/crates/ty_ide/src/inlay_hints.rs
@@ -1,62 +1,129 @@
+use std::{fmt, vec};
+
 use crate::Db;
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor, TraversalSignal};
 use ruff_python_ast::{AnyNodeRef, Expr, Stmt};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use std::fmt;
-use std::fmt::Formatter;
-use ty_python_semantic::types::{Type, inlay_hint_function_argument_details};
+use ty_python_semantic::types::Type;
+use ty_python_semantic::types::ide_support::inlay_hint_function_argument_details;
 use ty_python_semantic::{HasType, SemanticModel};
 
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct InlayHint<'db> {
+#[derive(Debug, Clone)]
+pub struct InlayHint {
     pub position: TextSize,
-    pub content: InlayHintContent<'db>,
+    pub kind: InlayHintKind,
+    pub label: InlayHintLabel,
 }
 
-impl<'db> InlayHint<'db> {
-    pub const fn display(&self, db: &'db dyn Db) -> DisplayInlayHint<'_, 'db> {
-        self.content.display(db)
+impl InlayHint {
+    fn variable_type(position: TextSize, ty: Type, db: &dyn Db) -> Self {
+        let label_parts = vec![
+            ": ".into(),
+            InlayHintLabelPart::new(ty.display(db).to_string()),
+        ];
+
+        Self {
+            position,
+            kind: InlayHintKind::Type,
+            label: InlayHintLabel { parts: label_parts },
+        }
+    }
+
+    fn call_argument_name(position: TextSize, name: &str) -> Self {
+        let label_parts = vec![InlayHintLabelPart::new(name), "=".into()];
+
+        Self {
+            position,
+            kind: InlayHintKind::CallArgumentName,
+            label: InlayHintLabel { parts: label_parts },
+        }
+    }
+
+    pub fn display(&self) -> InlayHintDisplay<'_> {
+        InlayHintDisplay { inlay_hint: self }
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub enum InlayHintContent<'db> {
-    Type(Type<'db>),
-    CallArgumentName(String),
+#[derive(Debug, Clone)]
+pub enum InlayHintKind {
+    Type,
+    CallArgumentName,
 }
 
-impl<'db> InlayHintContent<'db> {
-    pub const fn display(&self, db: &'db dyn Db) -> DisplayInlayHint<'_, 'db> {
-        DisplayInlayHint { db, hint: self }
+#[derive(Debug, Clone)]
+pub struct InlayHintLabel {
+    parts: Vec<InlayHintLabelPart>,
+}
+
+impl InlayHintLabel {
+    pub fn parts(&self) -> &[InlayHintLabelPart] {
+        &self.parts
     }
 }
 
-pub struct DisplayInlayHint<'a, 'db> {
-    db: &'db dyn Db,
-    hint: &'a InlayHintContent<'db>,
+pub struct InlayHintDisplay<'a> {
+    inlay_hint: &'a InlayHint,
 }
 
-impl fmt::Display for DisplayInlayHint<'_, '_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self.hint {
-            InlayHintContent::Type(ty) => {
-                write!(f, ": {}", ty.display(self.db))
-            }
-            InlayHintContent::CallArgumentName(name) => {
-                write!(f, "{name}=")
-            }
+impl fmt::Display for InlayHintDisplay<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::fmt::Result {
+        for part in &self.inlay_hint.label.parts {
+            write!(f, "{}", part.text)?;
+        }
+        Ok(())
+    }
+}
+
+#[derive(Default, Debug, Clone)]
+pub struct InlayHintLabelPart {
+    text: String,
+
+    target: Option<crate::NavigationTarget>,
+}
+
+impl InlayHintLabelPart {
+    pub fn new(text: impl Into<String>) -> Self {
+        Self {
+            text: text.into(),
+            target: None,
+        }
+    }
+
+    pub fn text(&self) -> &str {
+        &self.text
+    }
+
+    pub fn target(&self) -> Option<&crate::NavigationTarget> {
+        self.target.as_ref()
+    }
+}
+
+impl From<String> for InlayHintLabelPart {
+    fn from(s: String) -> Self {
+        Self {
+            text: s,
+            target: None,
         }
     }
 }
 
-pub fn inlay_hints<'db>(
-    db: &'db dyn Db,
+impl From<&str> for InlayHintLabelPart {
+    fn from(s: &str) -> Self {
+        Self {
+            text: s.to_string(),
+            target: None,
+        }
+    }
+}
+
+pub fn inlay_hints(
+    db: &dyn Db,
     file: File,
     range: TextRange,
     settings: &InlayHintSettings,
-) -> Vec<InlayHint<'db>> {
+) -> Vec<InlayHint> {
     let mut visitor = InlayHintVisitor::new(db, file, range, settings);
 
     let ast = parsed_module(db, file).load(db);
@@ -106,7 +173,7 @@ impl Default for InlayHintSettings {
 struct InlayHintVisitor<'a, 'db> {
     db: &'db dyn Db,
     model: SemanticModel<'db>,
-    hints: Vec<InlayHint<'db>>,
+    hints: Vec<InlayHint>,
     in_assignment: bool,
     range: TextRange,
     settings: &'a InlayHintSettings,
@@ -128,13 +195,11 @@ impl<'a, 'db> InlayHintVisitor<'a, 'db> {
         if !self.settings.variable_types {
             return;
         }
-        self.hints.push(InlayHint {
-            position,
-            content: InlayHintContent::Type(ty),
-        });
+        self.hints
+            .push(InlayHint::variable_type(position, ty, self.db));
     }
 
-    fn add_call_argument_name(&mut self, position: TextSize, name: String) {
+    fn add_call_argument_name(&mut self, position: TextSize, name: &str) {
         if !self.settings.call_argument_names {
             return;
         }
@@ -143,10 +208,8 @@ impl<'a, 'db> InlayHintVisitor<'a, 'db> {
             return;
         }
 
-        self.hints.push(InlayHint {
-            position,
-            content: InlayHintContent::CallArgumentName(name),
-        });
+        self.hints
+            .push(InlayHint::call_argument_name(position, name));
     }
 }
 
@@ -202,6 +265,15 @@ impl SourceOrderVisitor<'_> for InlayHintVisitor<'_, '_> {
                 }
                 source_order::walk_expr(self, expr);
             }
+            Expr::Attribute(attribute) => {
+                if self.in_assignment {
+                    if attribute.ctx.is_store() {
+                        let ty = expr.inferred_type(&self.model);
+                        self.add_type_hint(expr.range().end(), ty);
+                    }
+                }
+                source_order::walk_expr(self, expr);
+            }
             Expr::Call(call) => {
                 let argument_names =
                     inlay_hint_function_argument_details(self.db, &self.model, call)
@@ -212,10 +284,7 @@ impl SourceOrderVisitor<'_> for InlayHintVisitor<'_, '_> {
 
                 for (index, arg_or_keyword) in call.arguments.arguments_source_order().enumerate() {
                     if let Some(name) = argument_names.get(&index) {
-                        self.add_call_argument_name(
-                            arg_or_keyword.range().start(),
-                            name.to_string(),
-                        );
+                        self.add_call_argument_name(arg_or_keyword.range().start(), name);
                     }
                     self.visit_expr(arg_or_keyword.value());
                 }
@@ -322,7 +391,7 @@ mod tests {
 
             for hint in hints {
                 let end_position = (hint.position.to_u32() as usize) + offset;
-                let hint_str = format!("[{}]", hint.display(&self.db));
+                let hint_str = format!("[{}]", hint.display());
                 buf.insert_str(end_position, &hint_str);
                 offset += hint_str.len();
             }
@@ -377,6 +446,31 @@ mod tests {
         ");
     }
 
+    #[test]
+    fn test_assign_attribute_of_instance() {
+        let test = inlay_hint_test(
+            "
+            class A:
+                def __init__(self, y):
+                    self.x = 1
+                    self.y = y
+
+            a = A(2)
+            a.y = 3
+            ",
+        );
+
+        assert_snapshot!(test.inlay_hints(), @r"
+        class A:
+            def __init__(self, y):
+                self.x[: Literal[1]] = 1
+                self.y[: Unknown] = y
+
+        a[: A] = A([y=]2)
+        a.y[: Literal[3]] = 3
+        ");
+    }
+
     #[test]
     fn test_disabled_variable_types() {
         let test = inlay_hint_test("x = 1");
diff --git a/crates/ty_ide/src/lib.rs b/crates/ty_ide/src/lib.rs
index 55e4a920f8..6a23302561 100644
--- a/crates/ty_ide/src/lib.rs
+++ b/crates/ty_ide/src/lib.rs
@@ -1,3 +1,8 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods in ty crates"
+)]
+mod all_symbols;
 mod completion;
 mod doc_highlights;
 mod docstring;
@@ -9,6 +14,7 @@ mod goto_definition;
 mod goto_references;
 mod goto_type_definition;
 mod hover;
+mod importer;
 mod inlay_hints;
 mod markup;
 mod references;
@@ -20,13 +26,14 @@ mod stub_mapping;
 mod symbols;
 mod workspace_symbols;
 
-pub use completion::completion;
+pub use all_symbols::{AllSymbolInfo, all_symbols};
+pub use completion::{Completion, CompletionKind, CompletionSettings, completion};
 pub use doc_highlights::document_highlights;
-pub use document_symbols::{document_symbols, document_symbols_with_options};
+pub use document_symbols::document_symbols;
 pub use goto::{goto_declaration, goto_definition, goto_type_definition};
 pub use goto_references::goto_references;
 pub use hover::hover;
-pub use inlay_hints::{InlayHintSettings, inlay_hints};
+pub use inlay_hints::{InlayHintKind, InlayHintLabel, InlayHintSettings, inlay_hints};
 pub use markup::MarkupKind;
 pub use references::ReferencesMode;
 pub use rename::{can_rename, rename};
@@ -35,10 +42,14 @@ pub use semantic_tokens::{
     SemanticToken, SemanticTokenModifier, SemanticTokenType, SemanticTokens, semantic_tokens,
 };
 pub use signature_help::{ParameterDetails, SignatureDetails, SignatureHelpInfo, signature_help};
-pub use symbols::{SymbolInfo, SymbolKind, SymbolsOptions};
+pub use symbols::{FlatSymbols, HierarchicalSymbols, SymbolId, SymbolInfo, SymbolKind};
 pub use workspace_symbols::{WorkspaceSymbolInfo, workspace_symbols};
 
-use ruff_db::files::{File, FileRange};
+use ruff_db::{
+    files::{File, FileRange},
+    system::SystemPathBuf,
+    vendored::VendoredPath,
+};
 use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::FxHashSet;
 use std::ops::{Deref, DerefMut};
@@ -280,13 +291,51 @@ impl HasNavigationTargets for TypeDefinition<'_> {
     }
 }
 
+/// Get the cache-relative path where vendored paths should be written to.
+pub fn relative_cached_vendored_root() -> SystemPathBuf {
+    // The vendored files are uniquely identified by the source commit.
+    SystemPathBuf::from(format!("vendored/typeshed/{}", ty_vendored::SOURCE_COMMIT))
+}
+
+/// Get the cached version of a vendored path in the cache, ensuring the file is written to disk.
+pub fn cached_vendored_path(
+    db: &dyn ty_python_semantic::Db,
+    path: &VendoredPath,
+) -> Option<SystemPathBuf> {
+    let writable = db.system().as_writable()?;
+    let mut relative_path = relative_cached_vendored_root();
+    relative_path.push(path.as_str());
+
+    // Extract the vendored file onto the system.
+    writable
+        .get_or_cache(&relative_path, &|| db.vendored().read_to_string(path))
+        .ok()
+        .flatten()
+}
+
+/// Get the absolute root path of all cached vendored paths.
+///
+/// This does not ensure that this path exists (this is only used for mapping cached paths
+/// back to vendored ones, so this only matters if we've already been handed a path inside here).
+pub fn cached_vendored_root(db: &dyn ty_python_semantic::Db) -> Option<SystemPathBuf> {
+    let writable = db.system().as_writable()?;
+    let relative_root = relative_cached_vendored_root();
+    Some(writable.cache_dir()?.join(relative_root))
+}
+
 #[cfg(test)]
 mod tests {
+    use camino::Utf8Component;
     use insta::internals::SettingsBindDropGuard;
+
     use ruff_db::Db;
     use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};
-    use ruff_db::files::{File, system_path_to_file};
+    use ruff_db::files::{File, FileRootKind, system_path_to_file};
+    use ruff_db::parsed::{ParsedModuleRef, parsed_module};
+    use ruff_db::source::{SourceText, source_text};
     use ruff_db::system::{DbWithWritableSystem, SystemPath, SystemPathBuf};
+    use ruff_python_codegen::Stylist;
+    use ruff_python_trivia::textwrap::dedent;
     use ruff_text_size::TextSize;
     use ty_project::ProjectMetadata;
     use ty_python_semantic::{
@@ -341,11 +390,17 @@ mod tests {
         }
     }
 
-    /// The file and offset into that file containing
-    /// a `<CURSOR>` marker.
+    /// The file and offset into that file where a `<CURSOR>` marker
+    /// is located.
+    ///
+    /// (Along with other information about that file, such as the
+    /// parsed AST.)
     pub(super) struct Cursor {
         pub(super) file: File,
         pub(super) offset: TextSize,
+        pub(super) parsed: ParsedModuleRef,
+        pub(super) source: SourceText,
+        pub(super) stylist: Stylist<'static>,
     }
 
     #[derive(Default)]
@@ -362,31 +417,6 @@ mod tests {
                 SystemPathBuf::from("/"),
             ));
 
-            let mut cursor: Option<Cursor> = None;
-
-            for &Source {
-                ref path,
-                ref contents,
-                cursor_offset,
-            } in &self.sources
-            {
-                db.write_file(path, contents)
-                    .expect("write to memory file system to be successful");
-
-                let file = system_path_to_file(&db, path).expect("newly written file to existing");
-
-                if let Some(offset) = cursor_offset {
-                    // This assert should generally never trip, since
-                    // we have an assert on `CursorTestBuilder::source`
-                    // to ensure we never have more than one marker.
-                    assert!(
-                        cursor.is_none(),
-                        "found more than one source that contains `<CURSOR>`"
-                    );
-                    cursor = Some(Cursor { file, offset });
-                }
-            }
-
             let search_paths = SearchPathSettings::new(vec![SystemPathBuf::from("/")])
                 .to_search_paths(db.system(), db.vendored())
                 .expect("Valid search path settings");
@@ -400,8 +430,55 @@ mod tests {
                 },
             );
 
+            let mut cursor: Option<Cursor> = None;
+            for &Source {
+                ref path,
+                ref contents,
+                cursor_offset,
+            } in &self.sources
+            {
+                db.write_file(path, contents)
+                    .expect("write to memory file system to be successful");
+
+                // Add a root for the top-most component.
+                let top = path.components().find_map(|c| match c {
+                    Utf8Component::Normal(c) => Some(c),
+                    _ => None,
+                });
+                if let Some(top) = top {
+                    let top = SystemPath::new(top);
+                    if db.system().is_directory(top) {
+                        db.files()
+                            .try_add_root(&db, top, FileRootKind::LibrarySearchPath);
+                    }
+                }
+
+                let file = system_path_to_file(&db, path).expect("newly written file to existing");
+
+                if let Some(offset) = cursor_offset {
+                    // This assert should generally never trip, since
+                    // we have an assert on `CursorTestBuilder::source`
+                    // to ensure we never have more than one marker.
+                    assert!(
+                        cursor.is_none(),
+                        "found more than one source that contains `<CURSOR>`"
+                    );
+                    let source = source_text(&db, file);
+                    let parsed = parsed_module(&db, file).load(&db);
+                    let stylist =
+                        Stylist::from_tokens(parsed.tokens(), source.as_str()).into_owned();
+                    cursor = Some(Cursor {
+                        file,
+                        offset,
+                        parsed,
+                        source,
+                        stylist,
+                    });
+                }
+            }
+
             let mut insta_settings = insta::Settings::clone_current();
-            insta_settings.add_filter(r#"\\(\w\w|\s|\.|")"#, "/$1");
+            insta_settings.add_filter(r#"\\(\w\w|\.|")"#, "/$1");
             // Filter out TODO types because they are different between debug and release builds.
             insta_settings.add_filter(r"@Todo\(.+\)", "@Todo");
 
@@ -417,12 +494,12 @@ mod tests {
         pub(super) fn source(
             &mut self,
             path: impl Into<SystemPathBuf>,
-            contents: impl Into<String>,
+            contents: impl AsRef<str>,
         ) -> &mut CursorTestBuilder {
             const MARKER: &str = "<CURSOR>";
 
             let path = path.into();
-            let contents = contents.into();
+            let contents = dedent(contents.as_ref()).into_owned();
             let Some(cursor_offset) = contents.find(MARKER) else {
                 self.sources.push(Source {
                     path,
diff --git a/crates/ty_ide/src/references.rs b/crates/ty_ide/src/references.rs
index 1dcd747418..62716fd6a5 100644
--- a/crates/ty_ide/src/references.rs
+++ b/crates/ty_ide/src/references.rs
@@ -18,6 +18,7 @@ use ruff_python_ast::{
     self as ast, AnyNodeRef,
     visitor::source_order::{SourceOrderVisitor, TraversalSignal},
 };
+use ruff_python_parser::Tokens;
 use ruff_text_size::{Ranged, TextRange};
 use ty_python_semantic::ImportAliasResolution;
 
@@ -127,6 +128,7 @@ fn references_for_file(
         target_definitions,
         references,
         mode,
+        tokens: module.tokens(),
         target_text,
         ancestors: Vec::new(),
     };
@@ -156,6 +158,7 @@ fn is_symbol_externally_visible(goto_target: &GotoTarget<'_>) -> bool {
 struct LocalReferencesFinder<'a> {
     db: &'a dyn Db,
     file: File,
+    tokens: &'a Tokens,
     target_definitions: &'a [NavigationTarget],
     references: &'a mut Vec<ReferenceTarget>,
     mode: ReferencesMode,
@@ -282,7 +285,9 @@ impl LocalReferencesFinder<'_> {
         // where the identifier might be a multi-part module name.
         let offset = covering_node.node().start();
 
-        if let Some(goto_target) = GotoTarget::from_covering_node(covering_node, offset) {
+        if let Some(goto_target) =
+            GotoTarget::from_covering_node(covering_node, offset, self.tokens)
+        {
             // Get the definitions for this goto target
             if let Some(current_definitions_nav) = goto_target
                 .get_definition_targets(self.file, self.db, ImportAliasResolution::PreserveAliases)
diff --git a/crates/ty_ide/src/selection_range.rs b/crates/ty_ide/src/selection_range.rs
index 9603ff39e7..139b8d433c 100644
--- a/crates/ty_ide/src/selection_range.rs
+++ b/crates/ty_ide/src/selection_range.rs
@@ -14,7 +14,8 @@ pub fn selection_range(db: &dyn Db, file: File, offset: TextSize) -> Vec<TextRan
     let covering = covering_node(parsed.syntax().into(), range);
 
     let mut ranges = Vec::new();
-    for node in covering.ancestors() {
+    // Start with the largest range (the root), so iterate ancestors backwards
+    for node in covering.ancestors().rev() {
         if should_include_in_selection(node) {
             let range = node.range();
             // Eliminate duplicates when parent and child nodes have the same range
diff --git a/crates/ty_ide/src/semantic_tokens.rs b/crates/ty_ide/src/semantic_tokens.rs
index 749671ad18..4e66881f48 100644
--- a/crates/ty_ide/src/semantic_tokens.rs
+++ b/crates/ty_ide/src/semantic_tokens.rs
@@ -1,5 +1,6 @@
 use crate::Db;
 use bitflags::bitflags;
+use itertools::Itertools;
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
 use ruff_python_ast as ast;
@@ -13,9 +14,8 @@ use ruff_python_ast::{
 use ruff_text_size::{Ranged, TextLen, TextRange};
 use std::ops::Deref;
 use ty_python_semantic::{
-    HasType, SemanticModel,
-    semantic_index::definition::DefinitionKind,
-    types::{Type, definition_kind_for_name},
+    HasType, SemanticModel, semantic_index::definition::DefinitionKind, types::Type,
+    types::ide_support::definition_kind_for_name,
 };
 
 // This module walks the AST and collects a set of "semantic tokens" for a file
@@ -337,9 +337,7 @@ impl<'db> SemanticTokenVisitor<'db> {
 
         match ty {
             Type::ClassLiteral(_) => (SemanticTokenType::Class, modifiers),
-            Type::NonInferableTypeVar(_) | Type::TypeVar(_) => {
-                (SemanticTokenType::TypeParameter, modifiers)
-            }
+            Type::TypeVar(_) => (SemanticTokenType::TypeParameter, modifiers),
             Type::FunctionLiteral(_) => {
                 // Check if this is a method based on current scope
                 if self.in_class_scope {
@@ -470,13 +468,6 @@ impl<'db> SemanticTokenVisitor<'db> {
         self.classify_from_type_and_name_str(ty, local_name.id.as_str())
     }
 
-    fn visit_type_annotation(&mut self, annotation: &ast::Expr) {
-        let prev_in_type_annotation = self.in_type_annotation;
-        self.in_type_annotation = true;
-        self.visit_expr(annotation);
-        self.in_type_annotation = prev_in_type_annotation;
-    }
-
     // Visit parameters for a function or lambda expression and classify
     // them as parameters, selfParameter, or clsParameter as appropriate.
     fn visit_parameters(
@@ -486,7 +477,20 @@ impl<'db> SemanticTokenVisitor<'db> {
     ) {
         let mut param_index = 0;
 
-        for any_param in parameters {
+        // The `parameters.iter` method does return the parameters in sorted order but only if
+        // the AST is well-formed, but e.g. not for:
+        // ```py
+        // def foo(self, **key, value):
+        //     return
+        // ```
+        // Ideally, the ast would use a single vec for all parameters to avoid this issue as
+        // discussed here https://github.com/astral-sh/ruff/issues/14315 and
+        // here https://github.com/astral-sh/ruff/blob/71f8389f61a243a0c7584adffc49134ccf792aba/crates/ruff_python_parser/src/parser/statement.rs#L3176-L3179
+        let parameters_by_start = parameters
+            .iter()
+            .sorted_by_key(ruff_text_size::Ranged::start);
+
+        for any_param in parameters_by_start {
             let parameter = any_param.as_parameter();
 
             let token_type = match any_param {
@@ -518,7 +522,11 @@ impl<'db> SemanticTokenVisitor<'db> {
 
             // Handle parameter type annotations
             if let Some(annotation) = &parameter.annotation {
-                self.visit_type_annotation(annotation);
+                self.visit_annotation(annotation);
+            }
+
+            if let Some(default) = any_param.default() {
+                self.visit_expr(default);
             }
         }
     }
@@ -570,7 +578,7 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
 
                 // Handle return type annotation
                 if let Some(returns) = &func.returns {
-                    self.visit_type_annotation(returns);
+                    self.visit_annotation(returns);
                 }
 
                 // Clear the in_class_scope flag so inner functions
@@ -617,21 +625,6 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
                 self.visit_body(&class.body);
                 self.in_class_scope = prev_in_class;
             }
-            ast::Stmt::AnnAssign(assign) => {
-                // Handle annotated assignments (e.g., x: int = 5)
-                if let ast::Expr::Name(name) = assign.target.as_ref() {
-                    let (token_type, modifiers) = self.classify_name(name);
-                    self.add_token(name, token_type, modifiers);
-                }
-
-                // Handle the type annotation
-                self.visit_type_annotation(&assign.annotation);
-
-                // Handle the value if present
-                if let Some(value) = &assign.value {
-                    self.visit_expr(value);
-                }
-            }
             ast::Stmt::Import(import) => {
                 for alias in &import.names {
                     if let Some(asname) = &alias.asname {
@@ -693,6 +686,13 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
         }
     }
 
+    fn visit_annotation(&mut self, expr: &'_ Expr) {
+        let prev_in_type_annotation = self.in_type_annotation;
+        self.in_type_annotation = true;
+        self.visit_expr(expr);
+        self.in_type_annotation = prev_in_type_annotation;
+    }
+
     fn visit_expr(&mut self, expr: &Expr) {
         match expr {
             ast::Expr::Name(name) => {
@@ -832,23 +832,25 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
         );
 
         // Visit bound expression (for TypeVar)
+        // TODO: We don't call `walk_type_param` here, because, as of today (20th Oct 2025),
+        // `walk_type_param` calls `visit_expr` instead of `visit_annotation`.
         match type_param {
             TypeParam::TypeVar(type_var) => {
                 if let Some(bound) = &type_var.bound {
-                    self.visit_type_annotation(bound);
+                    self.visit_annotation(bound);
                 }
                 if let Some(default) = &type_var.default {
-                    self.visit_type_annotation(default);
+                    self.visit_annotation(default);
                 }
             }
             TypeParam::ParamSpec(param_spec) => {
                 if let Some(default) = &param_spec.default {
-                    self.visit_type_annotation(default);
+                    self.visit_annotation(default);
                 }
             }
             TypeParam::TypeVarTuple(type_var_tuple) => {
                 if let Some(default) = &type_var_tuple.default {
-                    self.visit_type_annotation(default);
+                    self.visit_annotation(default);
                 }
             }
         }
@@ -1405,34 +1407,34 @@ u = List.__name__        # __name__ should be variable<CURSOR>
         "MyClass" @ 89..96: Class [definition]
         "CONSTANT" @ 102..110: Variable [readonly]
         "42" @ 113..115: Number
-        "method" @ 129..135: Method [definition]
-        "self" @ 136..140: SelfParameter
-        "/"hello/"" @ 158..165: String
-        "property" @ 176..184: Decorator
-        "prop" @ 193..197: Method [definition]
-        "self" @ 198..202: SelfParameter
-        "self" @ 220..224: Variable
-        "CONSTANT" @ 225..233: Variable [readonly]
-        "obj" @ 235..238: Variable
-        "MyClass" @ 241..248: Class
-        "x" @ 286..287: Namespace
-        "os" @ 290..292: Namespace
-        "path" @ 293..297: Namespace
-        "y" @ 347..348: Method
-        "obj" @ 351..354: Variable
-        "method" @ 355..361: Method
-        "z" @ 413..414: Variable
-        "obj" @ 417..420: Variable
-        "CONSTANT" @ 421..429: Variable [readonly]
-        "w" @ 491..492: Variable
-        "obj" @ 495..498: Variable
-        "prop" @ 499..503: Variable
-        "v" @ 542..543: Function
-        "MyClass" @ 546..553: Class
-        "method" @ 554..560: Method
-        "u" @ 604..605: Variable
-        "List" @ 608..612: Variable
-        "__name__" @ 613..621: Variable
+        "method" @ 125..131: Method [definition]
+        "self" @ 132..136: SelfParameter
+        "/"hello/"" @ 154..161: String
+        "property" @ 168..176: Decorator
+        "prop" @ 185..189: Method [definition]
+        "self" @ 190..194: SelfParameter
+        "self" @ 212..216: Variable
+        "CONSTANT" @ 217..225: Variable [readonly]
+        "obj" @ 227..230: Variable
+        "MyClass" @ 233..240: Class
+        "x" @ 278..279: Namespace
+        "os" @ 282..284: Namespace
+        "path" @ 285..289: Namespace
+        "y" @ 339..340: Method
+        "obj" @ 343..346: Variable
+        "method" @ 347..353: Method
+        "z" @ 405..406: Variable
+        "obj" @ 409..412: Variable
+        "CONSTANT" @ 413..421: Variable [readonly]
+        "w" @ 483..484: Variable
+        "obj" @ 487..490: Variable
+        "prop" @ 491..495: Variable
+        "v" @ 534..535: Function
+        "MyClass" @ 538..545: Class
+        "method" @ 546..552: Method
+        "u" @ 596..597: Variable
+        "List" @ 600..604: Variable
+        "__name__" @ 605..613: Variable
         "#);
     }
 
@@ -1456,14 +1458,14 @@ y = obj.unknown_attr     # Should fall back to variable<CURSOR>
         "MyClass" @ 7..14: Class [definition]
         "some_attr" @ 20..29: Variable
         "/"value/"" @ 32..39: String
-        "obj" @ 45..48: Variable
-        "MyClass" @ 51..58: Class
-        "x" @ 121..122: Variable
-        "obj" @ 125..128: Variable
-        "some_attr" @ 129..138: Variable
-        "y" @ 191..192: Variable
-        "obj" @ 195..198: Variable
-        "unknown_attr" @ 199..211: Variable
+        "obj" @ 41..44: Variable
+        "MyClass" @ 47..54: Class
+        "x" @ 117..118: Variable
+        "obj" @ 121..124: Variable
+        "some_attr" @ 125..134: Variable
+        "y" @ 187..188: Variable
+        "obj" @ 191..194: Variable
+        "unknown_attr" @ 195..207: Variable
         "#);
     }
 
@@ -1497,20 +1499,20 @@ w = obj.A             # Should not have readonly modifier (length == 1)<CURSOR>
         "12" @ 72..74: Number
         "A" @ 79..80: Variable
         "1" @ 83..84: Number
-        "obj" @ 90..93: Variable
-        "MyClass" @ 96..103: Class
-        "x" @ 106..107: Variable
-        "obj" @ 110..113: Variable
-        "UPPER_CASE" @ 114..124: Variable [readonly]
-        "y" @ 160..161: Variable
-        "obj" @ 164..167: Variable
-        "lower_case" @ 168..178: Variable
-        "z" @ 220..221: Variable
-        "obj" @ 224..227: Variable
-        "MixedCase" @ 228..237: Variable
-        "w" @ 278..279: Variable
-        "obj" @ 282..285: Variable
-        "A" @ 286..287: Variable
+        "obj" @ 86..89: Variable
+        "MyClass" @ 92..99: Class
+        "x" @ 102..103: Variable
+        "obj" @ 106..109: Variable
+        "UPPER_CASE" @ 110..120: Variable [readonly]
+        "y" @ 156..157: Variable
+        "obj" @ 160..163: Variable
+        "lower_case" @ 164..174: Variable
+        "z" @ 216..217: Variable
+        "obj" @ 220..223: Variable
+        "MixedCase" @ 224..233: Variable
+        "w" @ 274..275: Variable
+        "obj" @ 278..281: Variable
+        "A" @ 282..283: Variable
         "#);
     }
 
@@ -1636,7 +1638,7 @@ def test_function(param: int, other: MyClass) -> Optional[List[str]]:
         "List" @ 236..240: Variable
         "str" @ 241..244: Class
         "/"hello/"" @ 249..256: String
-        "None" @ 361..365: BuiltinConstant
+        "None" @ 357..361: BuiltinConstant
         "#);
     }
 
@@ -1796,36 +1798,40 @@ class BoundedContainer[T: int, U = str]:
         "T" @ 554..555: TypeParameter
         "value2" @ 557..563: Parameter
         "U" @ 565..566: TypeParameter
+        "self" @ 577..581: TypeParameter
+        "value1" @ 582..588: Variable
         "T" @ 590..591: TypeParameter
         "value1" @ 594..600: Parameter
+        "self" @ 609..613: TypeParameter
+        "value2" @ 614..620: Variable
         "U" @ 622..623: TypeParameter
         "value2" @ 626..632: Parameter
-        "get_first" @ 646..655: Method [definition]
-        "self" @ 656..660: SelfParameter
-        "T" @ 665..666: TypeParameter
-        "self" @ 683..687: Variable
-        "value1" @ 688..694: Variable
-        "get_second" @ 708..718: Method [definition]
-        "self" @ 719..723: SelfParameter
-        "U" @ 728..729: TypeParameter
-        "self" @ 746..750: Variable
-        "value2" @ 751..757: Variable
-        "BoundedContainer" @ 806..822: Class [definition]
-        "T" @ 823..824: TypeParameter [definition]
-        "int" @ 826..829: Class
-        "U" @ 831..832: TypeParameter [definition]
-        "str" @ 835..838: Class
-        "process" @ 849..856: Method [definition]
-        "self" @ 857..861: SelfParameter
-        "x" @ 863..864: Parameter
-        "T" @ 866..867: TypeParameter
-        "y" @ 869..870: Parameter
-        "U" @ 872..873: TypeParameter
-        "tuple" @ 878..883: Class
-        "T" @ 884..885: TypeParameter
-        "U" @ 887..888: TypeParameter
-        "x" @ 907..908: Parameter
-        "y" @ 910..911: Parameter
+        "get_first" @ 642..651: Method [definition]
+        "self" @ 652..656: SelfParameter
+        "T" @ 661..662: TypeParameter
+        "self" @ 679..683: TypeParameter
+        "value1" @ 684..690: Variable
+        "get_second" @ 700..710: Method [definition]
+        "self" @ 711..715: SelfParameter
+        "U" @ 720..721: TypeParameter
+        "self" @ 738..742: TypeParameter
+        "value2" @ 743..749: Variable
+        "BoundedContainer" @ 798..814: Class [definition]
+        "T" @ 815..816: TypeParameter [definition]
+        "int" @ 818..821: Class
+        "U" @ 823..824: TypeParameter [definition]
+        "str" @ 827..830: Class
+        "process" @ 841..848: Method [definition]
+        "self" @ 849..853: SelfParameter
+        "x" @ 855..856: Parameter
+        "T" @ 858..859: TypeParameter
+        "y" @ 861..862: Parameter
+        "U" @ 864..865: TypeParameter
+        "tuple" @ 870..875: Class
+        "T" @ 876..877: TypeParameter
+        "U" @ 879..880: TypeParameter
+        "x" @ 899..900: Parameter
+        "y" @ 902..903: Parameter
         "#);
     }
 
@@ -2071,24 +2077,24 @@ def outer():
         "/"outer_value/"" @ 63..76: String
         "z" @ 81..82: Variable
         "/"outer_local/"" @ 85..98: String
-        "inner" @ 112..117: Function [definition]
-        "x" @ 138..139: Variable
-        "z" @ 141..142: Variable
-        "y" @ 193..194: Variable
-        "x" @ 243..244: Variable
-        "/"modified/"" @ 247..257: String
-        "y" @ 266..267: Variable
-        "/"modified_global/"" @ 270..287: String
-        "z" @ 296..297: Variable
-        "/"modified_local/"" @ 300..316: String
-        "deeper" @ 338..344: Function [definition]
-        "x" @ 369..370: Variable
-        "y" @ 410..411: Variable
-        "x" @ 413..414: Variable
-        "x" @ 469..470: Variable
-        "y" @ 473..474: Variable
-        "deeper" @ 499..505: Function
-        "inner" @ 522..527: Function
+        "inner" @ 108..113: Function [definition]
+        "x" @ 134..135: Variable
+        "z" @ 137..138: Variable
+        "y" @ 189..190: Variable
+        "x" @ 239..240: Variable
+        "/"modified/"" @ 243..253: String
+        "y" @ 262..263: Variable
+        "/"modified_global/"" @ 266..283: String
+        "z" @ 292..293: Variable
+        "/"modified_local/"" @ 296..312: String
+        "deeper" @ 326..332: Function [definition]
+        "x" @ 357..358: Variable
+        "y" @ 398..399: Variable
+        "x" @ 401..402: Variable
+        "x" @ 457..458: Variable
+        "y" @ 461..462: Variable
+        "deeper" @ 479..485: Function
+        "inner" @ 498..503: Function
         "#);
     }
 
@@ -2115,20 +2121,20 @@ def test():
         "test" @ 34..38: Function [definition]
         "x" @ 53..54: Variable
         "y" @ 68..69: Variable
-        "a" @ 128..129: Variable
-        "b" @ 131..132: Variable
-        "c" @ 134..135: Variable
-        "d" @ 149..150: Variable
-        "e" @ 152..153: Variable
-        "f" @ 155..156: Variable
-        "x" @ 173..174: Variable
-        "y" @ 177..178: Variable
-        "a" @ 181..182: Variable
-        "b" @ 185..186: Variable
-        "c" @ 189..190: Variable
-        "d" @ 193..194: Variable
-        "e" @ 197..198: Variable
-        "f" @ 201..202: Variable
+        "a" @ 124..125: Variable
+        "b" @ 127..128: Variable
+        "c" @ 130..131: Variable
+        "d" @ 145..146: Variable
+        "e" @ 148..149: Variable
+        "f" @ 151..152: Variable
+        "x" @ 165..166: Variable
+        "y" @ 169..170: Variable
+        "a" @ 173..174: Variable
+        "b" @ 177..178: Variable
+        "c" @ 181..182: Variable
+        "d" @ 185..186: Variable
+        "e" @ 189..190: Variable
+        "f" @ 193..194: Variable
         "#);
     }
 
@@ -2225,4 +2231,67 @@ finally:
         "e" @ 146..147: Variable
         "#);
     }
+
+    #[test]
+    fn test_self_attribute_expression() {
+        let test = cursor_test(
+            r#"
+from typing import Self
+
+
+class C:
+    def __init__(self: Self):
+        self.annotated: int = 1
+        self.non_annotated = 1
+        self.x.test()
+        self.x()<CURSOR>
+
+
+"#,
+        );
+
+        let tokens = semantic_tokens_full_file(&test.db, test.cursor.file);
+
+        assert_snapshot!(semantic_tokens_to_snapshot(&test.db, test.cursor.file, &tokens), @r#"
+        "typing" @ 6..12: Namespace
+        "Self" @ 20..24: Variable
+        "C" @ 33..34: Class [definition]
+        "__init__" @ 44..52: Method [definition]
+        "self" @ 53..57: SelfParameter
+        "Self" @ 59..63: TypeParameter
+        "self" @ 74..78: Parameter
+        "annotated" @ 79..88: Variable
+        "int" @ 90..93: Class
+        "1" @ 96..97: Number
+        "self" @ 106..110: Parameter
+        "non_annotated" @ 111..124: Variable
+        "1" @ 127..128: Number
+        "self" @ 137..141: Parameter
+        "x" @ 142..143: Variable
+        "test" @ 144..148: Variable
+        "self" @ 159..163: Parameter
+        "x" @ 164..165: Variable
+        "#);
+    }
+
+    /// Regression test for <https://github.com/astral-sh/ty/issues/1406>
+    #[test]
+    fn test_invalid_kwargs() {
+        let test = cursor_test(
+            r#"
+def foo(self, **<CURSOR>key, value=10):
+    return
+"#,
+        );
+
+        let tokens = semantic_tokens_full_file(&test.db, test.cursor.file);
+
+        assert_snapshot!(semantic_tokens_to_snapshot(&test.db, test.cursor.file, &tokens), @r#"
+        "foo" @ 5..8: Function [definition]
+        "self" @ 9..13: Parameter
+        "key" @ 17..20: Parameter
+        "value" @ 22..27: Parameter
+        "10" @ 28..30: Number
+        "#);
+    }
 }
diff --git a/crates/ty_ide/src/signature_help.rs b/crates/ty_ide/src/signature_help.rs
index 4700f7e21b..d0648b2e25 100644
--- a/crates/ty_ide/src/signature_help.rs
+++ b/crates/ty_ide/src/signature_help.rs
@@ -12,11 +12,12 @@ use crate::{Db, find_node::covering_node};
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
 use ruff_python_ast::{self as ast, AnyNodeRef};
+use ruff_python_parser::TokenKind;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 use ty_python_semantic::ResolvedDefinition;
 use ty_python_semantic::SemanticModel;
 use ty_python_semantic::semantic_index::definition::Definition;
-use ty_python_semantic::types::{
+use ty_python_semantic::types::ide_support::{
     CallSignatureDetails, call_signature_details, find_active_signature_from_details,
 };
 
@@ -25,7 +26,7 @@ use ty_python_semantic::types::{
 // associated with the __new__ or __init__ call.
 
 /// Information about a function parameter
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ParameterDetails {
     /// The parameter name (e.g., "param1")
     pub name: String,
@@ -37,7 +38,7 @@ pub struct ParameterDetails {
 }
 
 /// Information about a function signature
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SignatureDetails {
     /// Text representation of the full signature (including input parameters and return type).
     pub label: String,
@@ -51,7 +52,7 @@ pub struct SignatureDetails {
 }
 
 /// Signature help information for function calls
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SignatureHelpInfo {
     /// Information about each of the signatures for the function call. We
     /// need to handle multiple because of unions, overloads, and composite
@@ -104,22 +105,42 @@ fn get_call_expr(
 ) -> Option<(&ast::ExprCall, usize)> {
     let root_node: AnyNodeRef = parsed.syntax().into();
 
-    // Create a range from the offset for the covering_node function.
-    // Use length 1 if it fits within the root node, otherwise use zero-length range.
-    let one_char_range = TextRange::at(offset, TextSize::from(1));
-    let range = if root_node.range().contains_range(one_char_range) {
-        one_char_range
-    } else {
-        TextRange::at(offset, TextSize::from(0))
-    };
+    // Find the token under the cursor and use its offset to find the node
+    let token = parsed
+        .tokens()
+        .at_offset(offset)
+        .max_by_key(|token| match token.kind() {
+            TokenKind::Name
+            | TokenKind::String
+            | TokenKind::Complex
+            | TokenKind::Float
+            | TokenKind::Int => 1,
+            _ => 0,
+        })?;
 
     // Find the covering node at the given position that is a function call.
-    let covering_node = covering_node(root_node, range)
-        .find_first(|node| matches!(node, AnyNodeRef::ExprCall(_)))
+    let call = covering_node(root_node, token.range())
+        .find_first(|node| {
+            if !node.is_expr_call() {
+                return false;
+            }
+
+            // Close the signature help if the cursor is at the closing parenthesis
+            if token.kind() == TokenKind::Rpar && node.end() == token.end() && offset == token.end()
+            {
+                return false;
+            }
+
+            if token.range().is_empty() && node.end() == token.end() {
+                return false;
+            }
+
+            true
+        })
         .ok()?;
 
     // Get the function call expression.
-    let AnyNodeRef::ExprCall(call_expr) = covering_node.node() else {
+    let AnyNodeRef::ExprCall(call_expr) = call.node() else {
         return None;
     };
 
@@ -237,6 +258,9 @@ fn create_parameters_from_offsets(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
+    use crate::MarkupKind;
     use crate::docstring::Docstring;
     use crate::signature_help::SignatureHelpInfo;
     use crate::tests::{CursorTest, cursor_test};
@@ -247,11 +271,11 @@ mod tests {
             r#"
         def example_function(param1: str, param2: int) -> str:
             """This is a docstring for the example function.
-            
+
             Args:
                 param1: The first parameter as a string
                 param2: The second parameter as an integer
-            
+
             Returns:
                 A formatted string combining both parameters
             """
@@ -449,6 +473,354 @@ mod tests {
         assert_eq!(param2.name, "value");
     }
 
+    #[test]
+    fn signature_help_overload_type_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+ab(1<CURSOR>)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """the int overload"""
+
+@overload
+def ab(a: str): ...
+    """the str overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.signature_help_render(), @r"
+        ============== active signature =============
+        (a: int) -> Unknown
+        ---------------------------------------------
+        the int overload
+
+        -------------- active parameter -------------
+        a: int
+        ---------------------------------------------
+
+        =============== other signature =============
+        (a: str) -> Unknown
+        ---------------------------------------------
+        the real implementation!
+
+        -------------- active parameter -------------
+        a: str
+        ---------------------------------------------
+        ");
+    }
+
+    #[test]
+    fn signature_help_overload_type_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                r#"
+from mymodule import ab
+
+ab("hello"<CURSOR>)
+"#,
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """the int overload"""
+
+@overload
+def ab(a: str):
+    """the str overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.signature_help_render(), @r"
+        ============== active signature =============
+        (a: int) -> Unknown
+        ---------------------------------------------
+        the int overload
+
+        -------------- active parameter -------------
+        a: int
+        ---------------------------------------------
+
+        =============== other signature =============
+        (a: str) -> Unknown
+        ---------------------------------------------
+        the str overload
+
+        -------------- active parameter -------------
+        a: str
+        ---------------------------------------------
+        ");
+    }
+
+    #[test]
+    fn signature_help_overload_arity_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+ab(1, 2<CURSOR>)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int):
+    """the two arg overload"""
+
+@overload
+def ab(a: int):
+    """the one arg overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.signature_help_render(), @r"
+        ============== active signature =============
+        (a: int, b: int) -> Unknown
+        ---------------------------------------------
+        the two arg overload
+
+        -------------- active parameter -------------
+        b: int
+        ---------------------------------------------
+
+        =============== other signature =============
+        (a: int) -> Unknown
+        ---------------------------------------------
+        the one arg overload
+
+        (no active parameter specified)
+        ");
+    }
+
+    #[test]
+    fn signature_help_overload_arity_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+ab(1<CURSOR>)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, b = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int, b: int):
+    """the two arg overload"""
+
+@overload
+def ab(a: int):
+    """the one arg overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.signature_help_render(), @r"
+        ============== active signature =============
+        (a: int, b: int) -> Unknown
+        ---------------------------------------------
+        the two arg overload
+
+        -------------- active parameter -------------
+        a: int
+        ---------------------------------------------
+
+        =============== other signature =============
+        (a: int) -> Unknown
+        ---------------------------------------------
+        the one arg overload
+
+        -------------- active parameter -------------
+        a: int
+        ---------------------------------------------
+        ");
+    }
+
+    #[test]
+    fn signature_help_overload_keyword_disambiguated1() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+ab(1, b=2<CURSOR>)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """keywordless overload"""
+
+@overload
+def ab(a: int, *, b: int):
+    """b overload"""
+
+@overload
+def ab(a: int, *, c: int):
+    """c overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.signature_help_render(), @r"
+        ============== active signature =============
+        (a: int, *, b: int) -> Unknown
+        ---------------------------------------------
+        b overload
+
+        -------------- active parameter -------------
+        b: int
+        ---------------------------------------------
+
+        =============== other signature =============
+        (a: int) -> Unknown
+        ---------------------------------------------
+        keywordless overload
+
+        (no active parameter specified)
+        =============== other signature =============
+        (a: int, *, c: int) -> Unknown
+        ---------------------------------------------
+        c overload
+
+        -------------- active parameter -------------
+        c: int
+        ---------------------------------------------
+        ");
+    }
+
+    #[test]
+    fn signature_help_overload_keyword_disambiguated2() {
+        let test = CursorTest::builder()
+            .source(
+                "main.py",
+                "
+from mymodule import ab
+
+ab(1, c=2<CURSOR>)
+",
+            )
+            .source(
+                "mymodule.py",
+                r#"
+def ab(a, *, b = None, c = None):
+    """the real implementation!"""
+"#,
+            )
+            .source(
+                "mymodule.pyi",
+                r#"
+from typing import overload
+
+@overload
+def ab(a: int):
+    """keywordless overload"""
+
+@overload
+def ab(a: int, *, b: int):
+    """b overload"""
+
+@overload
+def ab(a: int, *, c: int):
+    """c overload"""
+"#,
+            )
+            .build();
+
+        assert_snapshot!(test.signature_help_render(), @r"
+        ============== active signature =============
+        (a: int, *, c: int) -> Unknown
+        ---------------------------------------------
+        c overload
+
+        -------------- active parameter -------------
+        c: int
+        ---------------------------------------------
+
+        =============== other signature =============
+        (a: int) -> Unknown
+        ---------------------------------------------
+        keywordless overload
+
+        (no active parameter specified)
+        =============== other signature =============
+        (a: int, *, b: int) -> Unknown
+        ---------------------------------------------
+        b overload
+
+        -------------- active parameter -------------
+        b: int
+        ---------------------------------------------
+        ");
+    }
+
     #[test]
     fn signature_help_class_constructor() {
         let test = cursor_test(
@@ -627,7 +999,7 @@ mod tests {
             r#"
         def documented_function(param1: str, param2: int) -> str:
             """This is a function with parameter documentation.
-            
+
             Args:
                 param1: The first parameter description
                 param2: The second parameter description
@@ -706,6 +1078,57 @@ mod tests {
         assert_eq!(result.active_signature, Some(0));
     }
 
+    #[test]
+    fn signature_help_after_closing_paren_at_end_of_file() {
+        let test = cursor_test(
+            r#"
+            def test(a: int) -> int:
+                return 10
+
+            test("test")<CURSOR>"#,
+        );
+
+        // Should not return a signature help
+        assert_eq!(test.signature_help(), None);
+    }
+
+    #[test]
+    fn signature_help_after_closing_paren_in_expression() {
+        let test = cursor_test(
+            r#"
+            def test(a: int) -> int:
+                return 10
+
+            test("test")<CURSOR> + 10
+        "#,
+        );
+
+        // Should not return a signature help
+        assert_eq!(test.signature_help(), None);
+    }
+
+    #[test]
+    fn signature_help_after_closing_paren_nested() {
+        let test = cursor_test(
+            r#"
+        def inner(a: int) -> int:
+            return 10
+
+        def outer(a: int) -> None: ...
+
+        outer(inner("test")<CURSOR> + 10)
+        "#,
+        );
+
+        // Should return the outer signature help
+        let help = test.signature_help().expect("Should have outer help");
+
+        assert_eq!(help.signatures.len(), 1);
+
+        let signature = &help.signatures[0];
+        assert_eq!(signature.label, "(a: int) -> None");
+    }
+
     #[test]
     fn signature_help_stub_to_implementation_mapping() {
         // Test that when a function is called from a stub file with no docstring,
@@ -714,22 +1137,22 @@ mod tests {
             .source(
                 "main.py",
                 r#"
-from lib import func
-result = func(<CURSOR>
+                from lib import func
+                result = func(<CURSOR>
 "#,
             )
             .source(
                 "lib.pyi",
                 r#"
-def func() -> str: ...
+                def func() -> str: ...
 "#,
             )
             .source(
                 "lib.py",
                 r#"
-def func() -> str:
-    """This function does something."""
-    return ""
+                def func() -> str:
+                    """This function does something."""
+                    return ""
 "#,
             )
             .build();
@@ -754,5 +1177,94 @@ def func() -> str:
         fn signature_help(&self) -> Option<SignatureHelpInfo> {
             crate::signature_help::signature_help(&self.db, self.cursor.file, self.cursor.offset)
         }
+
+        fn signature_help_render(&self) -> String {
+            use std::fmt::Write;
+
+            let Some(signature_help) = self.signature_help() else {
+                return "Signature help found no signatures".to_string();
+            };
+            let active_sig_heading = "\n============== active signature =============\n";
+            let second_sig_heading = "\n=============== other signature =============\n";
+            let active_arg_heading = "\n-------------- active parameter -------------\n";
+
+            let mut buf = String::new();
+            if let Some(active_signature) = signature_help.active_signature {
+                let signature = signature_help
+                    .signatures
+                    .get(active_signature)
+                    .expect("failed to find active signature!");
+                write!(
+                    &mut buf,
+                    "{heading}{label}{line}{docs}",
+                    heading = active_sig_heading,
+                    label = signature.label,
+                    line = MarkupKind::PlainText.horizontal_line(),
+                    docs = signature
+                        .documentation
+                        .as_ref()
+                        .map(Docstring::render_plaintext)
+                        .unwrap_or_default(),
+                )
+                .unwrap();
+                if let Some(active_parameter) = signature.active_parameter {
+                    let parameter = signature
+                        .parameters
+                        .get(active_parameter)
+                        .expect("failed to find active parameter!");
+                    write!(
+                        &mut buf,
+                        "{heading}{label}{line}{docs}",
+                        heading = active_arg_heading,
+                        label = parameter.label,
+                        line = MarkupKind::PlainText.horizontal_line(),
+                        docs = parameter.documentation.as_deref().unwrap_or_default(),
+                    )
+                    .unwrap();
+                } else {
+                    writeln!(&mut buf, "\n(no active parameter specified)").unwrap();
+                }
+            } else {
+                writeln!(&mut buf, "\n(no active signature specified)").unwrap();
+            }
+
+            for (idx, signature) in signature_help.signatures.iter().enumerate() {
+                if Some(idx) == signature_help.active_signature {
+                    continue;
+                }
+                write!(
+                    &mut buf,
+                    "{heading}{label}{line}{docs}",
+                    heading = second_sig_heading,
+                    label = signature.label,
+                    line = MarkupKind::PlainText.horizontal_line(),
+                    docs = signature
+                        .documentation
+                        .as_ref()
+                        .map(Docstring::render_plaintext)
+                        .unwrap_or_default(),
+                )
+                .unwrap();
+                if let Some(active_parameter) = signature.active_parameter {
+                    let parameter = signature
+                        .parameters
+                        .get(active_parameter)
+                        .expect("failed to find active parameter!");
+                    write!(
+                        &mut buf,
+                        "{heading}{label}{line}{docs}",
+                        heading = active_arg_heading,
+                        label = parameter.label,
+                        line = MarkupKind::PlainText.horizontal_line(),
+                        docs = parameter.documentation.as_deref().unwrap_or_default(),
+                    )
+                    .unwrap();
+                } else {
+                    write!(&mut buf, "\n(no active parameter specified)").unwrap();
+                }
+            }
+
+            buf
+        }
     }
 }
diff --git a/crates/ty_ide/src/stub_mapping.rs b/crates/ty_ide/src/stub_mapping.rs
index d28823d145..5499fd5595 100644
--- a/crates/ty_ide/src/stub_mapping.rs
+++ b/crates/ty_ide/src/stub_mapping.rs
@@ -1,6 +1,9 @@
 use itertools::Either;
+use ruff_db::system::SystemPathBuf;
 use ty_python_semantic::{ResolvedDefinition, map_stub_definition};
 
+use crate::cached_vendored_root;
+
 /// Maps `ResolvedDefinitions` from stub files to corresponding definitions in source files.
 ///
 /// This mapper is used to implement "Go To Definition" functionality that navigates from
@@ -9,11 +12,16 @@ use ty_python_semantic::{ResolvedDefinition, map_stub_definition};
 /// docstrings for functions that resolve to stubs.
 pub(crate) struct StubMapper<'db> {
     db: &'db dyn crate::Db,
+    cached_vendored_root: Option<SystemPathBuf>,
 }
 
 impl<'db> StubMapper<'db> {
     pub(crate) fn new(db: &'db dyn crate::Db) -> Self {
-        Self { db }
+        let cached_vendored_root = cached_vendored_root(db);
+        Self {
+            db,
+            cached_vendored_root,
+        }
     }
 
     /// Map a `ResolvedDefinition` from a stub file to corresponding definitions in source files.
@@ -24,7 +32,9 @@ impl<'db> StubMapper<'db> {
         &self,
         def: ResolvedDefinition<'db>,
     ) -> impl Iterator<Item = ResolvedDefinition<'db>> {
-        if let Some(definitions) = map_stub_definition(self.db, &def) {
+        if let Some(definitions) =
+            map_stub_definition(self.db, &def, self.cached_vendored_root.as_deref())
+        {
             return Either::Left(definitions.into_iter());
         }
         Either::Right(std::iter::once(def))
diff --git a/crates/ty_ide/src/symbols.rs b/crates/ty_ide/src/symbols.rs
index f9c76bcb95..a5af219b98 100644
--- a/crates/ty_ide/src/symbols.rs
+++ b/crates/ty_ide/src/symbols.rs
@@ -1,41 +1,266 @@
 //! Implements logic used by the document symbol provider, workspace symbol
 //! provider, and auto-import feature of the completion provider.
 
+use std::borrow::Cow;
+use std::ops::Range;
+
+use regex::Regex;
+
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
+use ruff_index::{IndexVec, newtype_index};
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor};
 use ruff_python_ast::{Expr, Stmt};
 use ruff_text_size::{Ranged, TextRange};
 use ty_project::Db;
 
-/// Options that control which symbols are returned
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SymbolsOptions {
-    /// Return a hierarchy of symbols or a flattened list?
-    pub hierarchical: bool,
-    /// Include only symbols in the global scope
-    pub global_only: bool,
-    /// Query string for filtering symbol names
-    pub query_string: Option<String>,
+use crate::completion::CompletionKind;
+
+/// A compiled query pattern used for searching symbols.
+///
+/// This can be used with the `FlatSymbols::search` API.
+#[derive(Clone, Debug)]
+pub struct QueryPattern {
+    re: Option<Regex>,
+    original: String,
 }
 
+impl QueryPattern {
+    /// Create a new query pattern from a literal search string given.
+    pub fn new(literal_query_string: &str) -> QueryPattern {
+        let mut pattern = "(?i)".to_string();
+        for ch in literal_query_string.chars() {
+            pattern.push_str(&regex::escape(ch.encode_utf8(&mut [0; 4])));
+            pattern.push_str(".*");
+        }
+        // In theory regex compilation could fail if the pattern string
+        // was long enough to exceed the default regex compilation size
+        // limit. But this length would be approaching ~10MB or so. If
+        // is does somehow fail, we'll just fall back to simple substring
+        // search using `original`.
+        QueryPattern {
+            re: Regex::new(&pattern).ok(),
+            original: literal_query_string.to_string(),
+        }
+    }
+
+    /// Create a new query pattern that matches all symbols.
+    pub fn matches_all_symbols() -> QueryPattern {
+        QueryPattern {
+            re: None,
+            original: String::new(),
+        }
+    }
+
+    fn is_match_symbol(&self, symbol: &SymbolInfo<'_>) -> bool {
+        self.is_match_symbol_name(&symbol.name)
+    }
+
+    pub fn is_match_symbol_name(&self, symbol_name: &str) -> bool {
+        if let Some(ref re) = self.re {
+            re.is_match(symbol_name)
+        } else {
+            // This is a degenerate case. The only way
+            // we should get here is if the query string
+            // was thousands (or more) characters long.
+            // ... or, if "typed" text could not be found.
+            symbol_name.contains(&self.original)
+        }
+    }
+}
+
+impl From<&str> for QueryPattern {
+    fn from(literal_query_string: &str) -> QueryPattern {
+        QueryPattern::new(literal_query_string)
+    }
+}
+
+impl Eq for QueryPattern {}
+
+impl PartialEq for QueryPattern {
+    fn eq(&self, rhs: &QueryPattern) -> bool {
+        self.original == rhs.original
+    }
+}
+
+/// A flat list of indexed symbols for a single file.
+#[derive(Clone, Debug, Default, PartialEq, Eq, get_size2::GetSize)]
+pub struct FlatSymbols {
+    symbols: IndexVec<SymbolId, SymbolTree>,
+}
+
+impl FlatSymbols {
+    /// Get the symbol info for the symbol identified by the given ID.
+    ///
+    /// Returns `None` when the given ID does not reference a symbol in this
+    /// collection.
+    pub fn get(&self, id: SymbolId) -> Option<SymbolInfo<'_>> {
+        self.symbols.get(id).map(Into::into)
+    }
+
+    /// Returns true if and only if this collection is empty.
+    pub fn is_empty(&self) -> bool {
+        self.symbols.is_empty()
+    }
+
+    /// Returns the total number of symbols in this collection.
+    pub fn len(&self) -> usize {
+        self.symbols.len()
+    }
+
+    /// Returns an iterator over every symbol along with its ID.
+    pub fn iter(&self) -> impl Iterator<Item = (SymbolId, SymbolInfo<'_>)> {
+        self.symbols
+            .iter_enumerated()
+            .map(|(id, symbol)| (id, symbol.into()))
+    }
+
+    /// Returns a sequence of symbols that matches the given query.
+    pub fn search(&self, query: &QueryPattern) -> impl Iterator<Item = (SymbolId, SymbolInfo<'_>)> {
+        self.iter()
+            .filter(|(_, symbol)| query.is_match_symbol(symbol))
+    }
+
+    /// Turns this flat sequence of symbols into a hierarchy of symbols.
+    pub fn to_hierarchical(&self) -> HierarchicalSymbols {
+        let mut children_ids: IndexVec<SymbolId, Vec<SymbolId>> = IndexVec::new();
+        for (id, symbol) in self.symbols.iter_enumerated() {
+            children_ids.push(vec![]);
+            let Some(parent_id) = symbol.parent else {
+                continue;
+            };
+            // OK because the symbol visitor guarantees that
+            // all parents are ordered before their children.
+            assert!(parent_id.index() < id.index());
+            children_ids[parent_id].push(id);
+        }
+
+        // Now flatten our map of symbol ID to its children
+        // IDs into a single vec that doesn't nest allocations.
+        let mut symbols = IndexVec::new();
+        let mut children: Vec<SymbolId> = vec![];
+        let mut last_end: usize = 0;
+        for (tree, child_symbol_ids) in self.symbols.iter().zip(children_ids) {
+            let start = last_end;
+            let end = start + child_symbol_ids.len();
+            symbols.push(SymbolTreeWithChildren {
+                tree: tree.clone(),
+                children: start..end,
+            });
+            children.extend_from_slice(&child_symbol_ids);
+            last_end = end;
+        }
+
+        HierarchicalSymbols { symbols, children }
+    }
+}
+
+/// A collection of hierarchical indexed symbols for a single file.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct HierarchicalSymbols {
+    symbols: IndexVec<SymbolId, SymbolTreeWithChildren>,
+    children: Vec<SymbolId>,
+}
+
+impl HierarchicalSymbols {
+    /// Get the symbol info for the symbol identified by the given ID.
+    ///
+    /// Returns `None` when the given ID does not reference a symbol in this
+    /// collection.
+    pub fn get(&self, id: SymbolId) -> Option<SymbolInfo<'_>> {
+        self.symbols.get(id).map(Into::into)
+    }
+
+    /// Returns true if and only if this collection is empty.
+    pub fn is_empty(&self) -> bool {
+        self.symbols.is_empty()
+    }
+
+    /// Returns the total number of symbols in this collection.
+    pub fn len(&self) -> usize {
+        self.symbols.len()
+    }
+
+    /// Returns an iterator over every top-level symbol along with its ID.
+    pub fn iter(&self) -> impl Iterator<Item = (SymbolId, SymbolInfo<'_>)> {
+        self.symbols
+            .iter_enumerated()
+            .filter(|(_, symbol)| symbol.tree.parent.is_none())
+            .map(|(id, symbol)| (id, symbol.into()))
+    }
+
+    /// Returns an iterator over the child symbols for the symbol
+    /// identified by the given ID.
+    ///
+    /// Returns `None` when there aren't any children or when the given
+    /// ID does not reference a symbol in this collection.
+    pub fn children(&self, id: SymbolId) -> impl Iterator<Item = (SymbolId, SymbolInfo<'_>)> {
+        self.symbols
+            .get(id)
+            .into_iter()
+            .flat_map(|symbol| self.children[symbol.children.clone()].iter())
+            .copied()
+            .map(|id| (id, SymbolInfo::from(&self.symbols[id])))
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+struct SymbolTreeWithChildren {
+    tree: SymbolTree,
+    /// The index range into `HierarchicalSymbols::children`
+    /// corresponding to the children symbol IDs for this
+    /// symbol.
+    children: Range<usize>,
+}
+
+/// Uniquely identifies a symbol.
+#[newtype_index]
+#[derive(get_size2::GetSize)]
+pub struct SymbolId;
+
 /// Symbol information for IDE features like document outline.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SymbolInfo {
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct SymbolInfo<'a> {
     /// The name of the symbol
-    pub name: String,
+    pub name: Cow<'a, str>,
     /// The kind of symbol (function, class, variable, etc.)
     pub kind: SymbolKind,
     /// The range of the symbol name
     pub name_range: TextRange,
     /// The full range of the symbol (including body)
     pub full_range: TextRange,
-    /// Child symbols (e.g., methods in a class)
-    pub children: Vec<SymbolInfo>,
+}
+
+impl SymbolInfo<'_> {
+    pub fn to_owned(&self) -> SymbolInfo<'static> {
+        SymbolInfo {
+            name: Cow::Owned(self.name.to_string()),
+            kind: self.kind,
+            name_range: self.name_range,
+            full_range: self.full_range,
+        }
+    }
+}
+
+impl<'a> From<&'a SymbolTree> for SymbolInfo<'a> {
+    fn from(symbol: &'a SymbolTree) -> SymbolInfo<'a> {
+        SymbolInfo {
+            name: Cow::Borrowed(&symbol.name),
+            kind: symbol.kind,
+            name_range: symbol.name_range,
+            full_range: symbol.full_range,
+        }
+    }
+}
+
+impl<'a> From<&'a SymbolTreeWithChildren> for SymbolInfo<'a> {
+    fn from(symbol: &'a SymbolTreeWithChildren) -> SymbolInfo<'a> {
+        SymbolInfo::from(&symbol.tree)
+    }
 }
 
 /// The kind of symbol
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, get_size2::GetSize)]
 pub enum SymbolKind {
     Module,
     Class,
@@ -69,119 +294,140 @@ impl SymbolKind {
             SymbolKind::Import => "Import",
         }
     }
+
+    /// Maps this to a "completion" kind if a sensible mapping exists.
+    pub fn to_completion_kind(self) -> Option<CompletionKind> {
+        Some(match self {
+            SymbolKind::Module => CompletionKind::Module,
+            SymbolKind::Class => CompletionKind::Class,
+            SymbolKind::Method => CompletionKind::Method,
+            SymbolKind::Function => CompletionKind::Function,
+            SymbolKind::Variable => CompletionKind::Variable,
+            SymbolKind::Constant => CompletionKind::Constant,
+            SymbolKind::Property => CompletionKind::Property,
+            SymbolKind::Field => CompletionKind::Field,
+            SymbolKind::Constructor => CompletionKind::Constructor,
+            SymbolKind::Parameter => CompletionKind::Variable,
+            SymbolKind::TypeParameter => CompletionKind::TypeParameter,
+            // Not quite sure what to do with this one. I guess
+            // in theory the import should be "resolved" to its
+            // underlying kind, but that seems expensive.
+            SymbolKind::Import => return None,
+        })
+    }
 }
 
-pub(crate) fn symbols_for_file(
-    db: &dyn Db,
-    file: File,
-    options: &SymbolsOptions,
-) -> Vec<SymbolInfo> {
-    assert!(
-        !options.hierarchical || options.query_string.is_none(),
-        "Cannot use hierarchical mode with a query string"
-    );
-
+/// Returns a flat list of symbols in the file given.
+///
+/// The flattened list includes parent/child information and can be
+/// converted into a hierarchical collection of symbols.
+#[salsa::tracked(returns(ref), heap_size=ruff_memory_usage::heap_size)]
+pub(crate) fn symbols_for_file(db: &dyn Db, file: File) -> FlatSymbols {
     let parsed = parsed_module(db, file);
     let module = parsed.load(db);
 
-    let mut visitor = SymbolVisitor::new(options);
+    let mut visitor = SymbolVisitor {
+        symbols: IndexVec::new(),
+        symbol_stack: vec![],
+        in_function: false,
+        global_only: false,
+    };
     visitor.visit_body(&module.syntax().body);
-    visitor.symbols
+    FlatSymbols {
+        symbols: visitor.symbols,
+    }
 }
 
-struct SymbolVisitor<'a> {
-    symbols: Vec<SymbolInfo>,
-    symbol_stack: Vec<SymbolInfo>,
+/// Returns a flat list of *only global* symbols in the file given.
+///
+/// While callers can convert this into a hierarchical collection of
+/// symbols, it won't result in anything meaningful since the flat list
+/// returned doesn't include children.
+#[salsa::tracked(returns(ref), heap_size=ruff_memory_usage::heap_size)]
+pub(crate) fn symbols_for_file_global_only(db: &dyn Db, file: File) -> FlatSymbols {
+    let parsed = parsed_module(db, file);
+    let module = parsed.load(db);
+
+    let mut visitor = SymbolVisitor {
+        symbols: IndexVec::new(),
+        symbol_stack: vec![],
+        in_function: false,
+        global_only: true,
+    };
+    visitor.visit_body(&module.syntax().body);
+    FlatSymbols {
+        symbols: visitor.symbols,
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+struct SymbolTree {
+    parent: Option<SymbolId>,
+    name: String,
+    kind: SymbolKind,
+    name_range: TextRange,
+    full_range: TextRange,
+}
+
+/// A visitor over all symbols in a single file.
+///
+/// This guarantees that child symbols have a symbol ID greater
+/// than all of its parents.
+struct SymbolVisitor {
+    symbols: IndexVec<SymbolId, SymbolTree>,
+    symbol_stack: Vec<SymbolId>,
     /// Track if we're currently inside a function (to exclude local variables)
     in_function: bool,
-    /// Options controlling symbol collection
-    options: &'a SymbolsOptions,
+    global_only: bool,
 }
 
-impl<'a> SymbolVisitor<'a> {
-    fn new(options: &'a SymbolsOptions) -> Self {
-        Self {
-            symbols: Vec::new(),
-            symbol_stack: Vec::new(),
-            in_function: false,
-            options,
-        }
-    }
-
+impl SymbolVisitor {
     fn visit_body(&mut self, body: &[Stmt]) {
         for stmt in body {
             self.visit_stmt(stmt);
         }
     }
 
-    fn add_symbol(&mut self, symbol: SymbolInfo) {
-        // Filter by query string if provided
-        if let Some(ref query) = self.options.query_string {
-            if !Self::is_pattern_in_symbol(query, &symbol.name) {
-                return;
-            }
-        }
-
-        if self.options.hierarchical {
-            if let Some(parent) = self.symbol_stack.last_mut() {
-                parent.children.push(symbol);
-            } else {
-                self.symbols.push(symbol);
-            }
-        } else {
-            self.symbols.push(symbol);
+    fn add_symbol(&mut self, mut symbol: SymbolTree) -> SymbolId {
+        if let Some(&parent_id) = self.symbol_stack.last() {
+            symbol.parent = Some(parent_id);
         }
+        // It's important that we push the symbol and allocate
+        // an ID before visiting its child. This preserves the
+        // guarantee that parent IDs are always less than their
+        // children IDs.
+        let symbol_id = self.symbols.next_index();
+        self.symbols.push(symbol);
+        symbol_id
     }
 
-    fn push_symbol(&mut self, symbol: SymbolInfo) {
-        if self.options.hierarchical {
-            self.symbol_stack.push(symbol);
-        } else {
-            self.add_symbol(symbol);
-        }
+    fn push_symbol(&mut self, symbol: SymbolTree) {
+        let symbol_id = self.add_symbol(symbol);
+        self.symbol_stack.push(symbol_id);
     }
 
     fn pop_symbol(&mut self) {
-        if self.options.hierarchical {
-            if let Some(symbol) = self.symbol_stack.pop() {
-                self.add_symbol(symbol);
-            }
-        }
+        self.symbol_stack.pop().unwrap();
+    }
+
+    fn iter_symbol_stack(&self) -> impl Iterator<Item = &SymbolTree> {
+        self.symbol_stack
+            .iter()
+            .copied()
+            .map(|id| &self.symbols[id])
     }
 
     fn is_constant_name(name: &str) -> bool {
         name.chars().all(|c| c.is_ascii_uppercase() || c == '_')
     }
-
-    /// Returns true if symbol name contains all characters in the query
-    /// string in order. The comparison is case insensitive.
-    fn is_pattern_in_symbol(query_string: &str, symbol_name: &str) -> bool {
-        let typed_lower = query_string.to_lowercase();
-        let symbol_lower = symbol_name.to_lowercase();
-        let typed_chars: Vec<char> = typed_lower.chars().collect();
-        let symbol_chars: Vec<char> = symbol_lower.chars().collect();
-
-        let mut typed_pos = 0;
-        let mut symbol_pos = 0;
-
-        while typed_pos < typed_chars.len() && symbol_pos < symbol_chars.len() {
-            if typed_chars[typed_pos] == symbol_chars[symbol_pos] {
-                typed_pos += 1;
-            }
-            symbol_pos += 1;
-        }
-
-        typed_pos == typed_chars.len()
-    }
 }
 
-impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
+impl SourceOrderVisitor<'_> for SymbolVisitor {
     fn visit_stmt(&mut self, stmt: &Stmt) {
         match stmt {
             Stmt::FunctionDef(func_def) => {
                 let kind = if self
-                    .symbol_stack
-                    .iter()
+                    .iter_symbol_stack()
                     .any(|s| s.kind == SymbolKind::Class)
                 {
                     if func_def.name.as_str() == "__init__" {
@@ -193,15 +439,15 @@ impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
                     SymbolKind::Function
                 };
 
-                let symbol = SymbolInfo {
+                let symbol = SymbolTree {
+                    parent: None,
                     name: func_def.name.to_string(),
                     kind,
                     name_range: func_def.name.range(),
                     full_range: stmt.range(),
-                    children: Vec::new(),
                 };
 
-                if self.options.global_only {
+                if self.global_only {
                     self.add_symbol(symbol);
                     // If global_only, don't walk function bodies
                     return;
@@ -222,15 +468,15 @@ impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
             }
 
             Stmt::ClassDef(class_def) => {
-                let symbol = SymbolInfo {
+                let symbol = SymbolTree {
+                    parent: None,
                     name: class_def.name.to_string(),
                     kind: SymbolKind::Class,
                     name_range: class_def.name.range(),
                     full_range: stmt.range(),
-                    children: Vec::new(),
                 };
 
-                if self.options.global_only {
+                if self.global_only {
                     self.add_symbol(symbol);
                     // If global_only, don't walk class bodies
                     return;
@@ -243,62 +489,60 @@ impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
 
             Stmt::Assign(assign) => {
                 // Include assignments only when we're in global or class scope
-                if !self.in_function {
-                    for target in &assign.targets {
-                        if let Expr::Name(name) = target {
-                            let kind = if Self::is_constant_name(name.id.as_str()) {
-                                SymbolKind::Constant
-                            } else if self
-                                .symbol_stack
-                                .iter()
-                                .any(|s| s.kind == SymbolKind::Class)
-                            {
-                                SymbolKind::Field
-                            } else {
-                                SymbolKind::Variable
-                            };
+                if self.in_function {
+                    return;
+                }
+                for target in &assign.targets {
+                    let Expr::Name(name) = target else { continue };
+                    let kind = if Self::is_constant_name(name.id.as_str()) {
+                        SymbolKind::Constant
+                    } else if self
+                        .iter_symbol_stack()
+                        .any(|s| s.kind == SymbolKind::Class)
+                    {
+                        SymbolKind::Field
+                    } else {
+                        SymbolKind::Variable
+                    };
 
-                            let symbol = SymbolInfo {
-                                name: name.id.to_string(),
-                                kind,
-                                name_range: name.range(),
-                                full_range: stmt.range(),
-                                children: Vec::new(),
-                            };
-
-                            self.add_symbol(symbol);
-                        }
-                    }
+                    let symbol = SymbolTree {
+                        parent: None,
+                        name: name.id.to_string(),
+                        kind,
+                        name_range: name.range(),
+                        full_range: stmt.range(),
+                    };
+                    self.add_symbol(symbol);
                 }
             }
 
             Stmt::AnnAssign(ann_assign) => {
                 // Include assignments only when we're in global or class scope
-                if !self.in_function {
-                    if let Expr::Name(name) = &*ann_assign.target {
-                        let kind = if Self::is_constant_name(name.id.as_str()) {
-                            SymbolKind::Constant
-                        } else if self
-                            .symbol_stack
-                            .iter()
-                            .any(|s| s.kind == SymbolKind::Class)
-                        {
-                            SymbolKind::Field
-                        } else {
-                            SymbolKind::Variable
-                        };
-
-                        let symbol = SymbolInfo {
-                            name: name.id.to_string(),
-                            kind,
-                            name_range: name.range(),
-                            full_range: stmt.range(),
-                            children: Vec::new(),
-                        };
-
-                        self.add_symbol(symbol);
-                    }
+                if self.in_function {
+                    return;
                 }
+                let Expr::Name(name) = &*ann_assign.target else {
+                    return;
+                };
+                let kind = if Self::is_constant_name(name.id.as_str()) {
+                    SymbolKind::Constant
+                } else if self
+                    .iter_symbol_stack()
+                    .any(|s| s.kind == SymbolKind::Class)
+                {
+                    SymbolKind::Field
+                } else {
+                    SymbolKind::Variable
+                };
+
+                let symbol = SymbolTree {
+                    parent: None,
+                    name: name.id.to_string(),
+                    kind,
+                    name_range: name.range(),
+                    full_range: stmt.range(),
+                };
+                self.add_symbol(symbol);
             }
 
             _ => {
@@ -307,3 +551,41 @@ impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    fn matches(query: &str, symbol: &str) -> bool {
+        super::QueryPattern::new(query).is_match_symbol_name(symbol)
+    }
+
+    #[test]
+    fn various_yes() {
+        assert!(matches("", ""));
+        assert!(matches("", "a"));
+        assert!(matches("", "abc"));
+
+        assert!(matches("a", "a"));
+        assert!(matches("a", "abc"));
+        assert!(matches("a", "xaz"));
+        assert!(matches("a", "xza"));
+
+        assert!(matches("abc", "abc"));
+        assert!(matches("abc", "axbyc"));
+        assert!(matches("abc", "waxbycz"));
+        assert!(matches("abc", "WAXBYCZ"));
+        assert!(matches("ABC", "waxbycz"));
+        assert!(matches("ABC", "WAXBYCZ"));
+        assert!(matches("aBc", "wAXbyCZ"));
+
+        assert!(matches("δ", "Δ"));
+        assert!(matches("δΘπ", "ΔθΠ"));
+    }
+
+    #[test]
+    fn various_no() {
+        assert!(!matches("a", ""));
+        assert!(!matches("abc", "bac"));
+        assert!(!matches("abcd", "abc"));
+        assert!(!matches("δΘπ", "θΔΠ"));
+    }
+}
diff --git a/crates/ty_ide/src/workspace_symbols.rs b/crates/ty_ide/src/workspace_symbols.rs
index 6ac203327a..9d490bd700 100644
--- a/crates/ty_ide/src/workspace_symbols.rs
+++ b/crates/ty_ide/src/workspace_symbols.rs
@@ -1,4 +1,4 @@
-use crate::symbols::{SymbolInfo, SymbolsOptions, symbols_for_file};
+use crate::symbols::{QueryPattern, SymbolInfo, symbols_for_file_global_only};
 use ruff_db::files::File;
 use ty_project::Db;
 
@@ -10,38 +10,44 @@ pub fn workspace_symbols(db: &dyn Db, query: &str) -> Vec<WorkspaceSymbolInfo> {
         return Vec::new();
     }
 
-    let mut results = Vec::new();
     let project = db.project();
 
-    let options = SymbolsOptions {
-        hierarchical: false, // Workspace symbols are always flat
-        global_only: false,
-        query_string: Some(query.to_string()),
-    };
-
-    // Get all files in the project
+    let query = QueryPattern::new(query);
     let files = project.files(db);
+    let results = std::sync::Mutex::new(Vec::new());
+    {
+        let db = db.dyn_clone();
+        let files = &files;
+        let results = &results;
+        let query = &query;
 
-    // For each file, extract symbols and add them to results
-    for file in files.iter() {
-        let file_symbols = symbols_for_file(db, *file, &options);
-
-        for symbol in file_symbols {
-            results.push(WorkspaceSymbolInfo {
-                symbol,
-                file: *file,
-            });
-        }
+        rayon::scope(move |s| {
+            // For each file, extract symbols and add them to results
+            for file in files.iter() {
+                let db = db.dyn_clone();
+                s.spawn(move |_| {
+                    for (_, symbol) in symbols_for_file_global_only(&*db, *file).search(query) {
+                        // It seems like we could do better here than
+                        // locking `results` for every single symbol,
+                        // but this works pretty well as it is.
+                        results.lock().unwrap().push(WorkspaceSymbolInfo {
+                            symbol: symbol.to_owned(),
+                            file: *file,
+                        });
+                    }
+                });
+            }
+        });
     }
 
-    results
+    results.into_inner().unwrap()
 }
 
 /// A symbol found in the workspace, including the file it was found in.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct WorkspaceSymbolInfo {
     /// The symbol information
-    pub symbol: SymbolInfo,
+    pub symbol: SymbolInfo<'static>,
     /// The file containing the symbol
     pub file: File,
 }
diff --git a/crates/ty_project/Cargo.toml b/crates/ty_project/Cargo.toml
index 29411de0d8..74356dac24 100644
--- a/crates/ty_project/Cargo.toml
+++ b/crates/ty_project/Cargo.toml
@@ -22,6 +22,7 @@ ruff_python_formatter = { workspace = true, optional = true }
 ruff_text_size = { workspace = true }
 ty_combine = { workspace = true }
 ty_python_semantic = { workspace = true, features = ["serde"] }
+ty_static = { workspace = true }
 ty_vendored = { workspace = true }
 
 anyhow = { workspace = true }
@@ -40,6 +41,7 @@ rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true }
@@ -51,7 +53,13 @@ insta = { workspace = true, features = ["redactions", "ron"] }
 [features]
 default = ["zstd"]
 deflate = ["ty_vendored/deflate"]
-schemars = ["dep:schemars", "ruff_db/schemars", "ty_python_semantic/schemars"]
+schemars = [
+    "dep:schemars",
+    "dep:serde_json",
+    "ruff_db/schemars",
+    "ruff_python_ast/schemars",
+    "ty_python_semantic/schemars",
+]
 zstd = ["ty_vendored/zstd"]
 format = ["ruff_python_formatter"]
 testing = []
diff --git a/crates/ty_project/src/db.rs b/crates/ty_project/src/db.rs
index a59006689b..5e2105839e 100644
--- a/crates/ty_project/src/db.rs
+++ b/crates/ty_project/src/db.rs
@@ -4,8 +4,8 @@ use std::sync::Arc;
 use std::{cmp, fmt};
 
 pub use self::changes::ChangeResult;
+use crate::CollectReporter;
 use crate::metadata::settings::file_settings;
-use crate::{CollectReporter, DEFAULT_LINT_REGISTRY};
 use crate::{ProgressReporter, Project, ProjectMetadata};
 use ruff_db::Db as SourceDb;
 use ruff_db::diagnostic::Diagnostic;
@@ -455,7 +455,11 @@ impl SemanticDb for ProjectDatabase {
     }
 
     fn lint_registry(&self) -> &LintRegistry {
-        &DEFAULT_LINT_REGISTRY
+        ty_python_semantic::default_lint_registry()
+    }
+
+    fn verbose(&self) -> bool {
+        self.project().verbose(self)
     }
 }
 
@@ -518,7 +522,6 @@ pub(crate) mod tests {
     use ty_python_semantic::Program;
     use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 
-    use crate::DEFAULT_LINT_REGISTRY;
     use crate::db::Db;
     use crate::{Project, ProjectMetadata};
 
@@ -608,7 +611,11 @@ pub(crate) mod tests {
         }
 
         fn lint_registry(&self) -> &LintRegistry {
-            &DEFAULT_LINT_REGISTRY
+            ty_python_semantic::default_lint_registry()
+        }
+
+        fn verbose(&self) -> bool {
+            false
         }
     }
 
diff --git a/crates/ty_project/src/glob.rs b/crates/ty_project/src/glob.rs
index 7127f55f41..81842f4948 100644
--- a/crates/ty_project/src/glob.rs
+++ b/crates/ty_project/src/glob.rs
@@ -10,7 +10,7 @@ mod exclude;
 mod include;
 mod portable;
 
-/// Path filtering based on an an exclude and include glob pattern set.
+/// Path filtering based on an exclude and include glob pattern set.
 ///
 /// Exclude patterns take precedence over includes.
 #[derive(Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
diff --git a/crates/ty_project/src/lib.rs b/crates/ty_project/src/lib.rs
index f9809541b4..d47476c7dc 100644
--- a/crates/ty_project/src/lib.rs
+++ b/crates/ty_project/src/lib.rs
@@ -1,3 +1,7 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods in ty crates"
+)]
 use crate::glob::{GlobFilterCheckMode, IncludeResult};
 use crate::metadata::options::{OptionDiagnostic, ToSettingsError};
 use crate::walk::{ProjectFilesFilter, ProjectFilesWalker};
@@ -24,9 +28,9 @@ use std::panic::{AssertUnwindSafe, UnwindSafe};
 use std::sync::Arc;
 use thiserror::Error;
 use tracing::error;
-use ty_python_semantic::lint::{LintRegistry, LintRegistryBuilder, RuleSelection};
+use ty_python_semantic::add_inferred_python_version_hint_to_diagnostic;
+use ty_python_semantic::lint::RuleSelection;
 use ty_python_semantic::types::check_types;
-use ty_python_semantic::{add_inferred_python_version_hint_to_diagnostic, register_lints};
 
 mod db;
 mod files;
@@ -35,15 +39,6 @@ pub mod metadata;
 mod walk;
 pub mod watch;
 
-pub static DEFAULT_LINT_REGISTRY: std::sync::LazyLock<LintRegistry> =
-    std::sync::LazyLock::new(default_lints_registry);
-
-pub fn default_lints_registry() -> LintRegistry {
-    let mut builder = LintRegistryBuilder::default();
-    register_lints(&mut builder);
-    builder.build()
-}
-
 /// The project as a Salsa ingredient.
 ///
 /// ## How is a project different from a program?
@@ -118,6 +113,9 @@ pub struct Project {
     /// the project including the virtual files that might exists in the editor.
     #[default]
     check_mode: CheckMode,
+
+    #[default]
+    verbose_flag: bool,
 }
 
 /// A progress reporter.
@@ -373,6 +371,16 @@ impl Project {
         self.reload_files(db);
     }
 
+    pub fn set_verbose(self, db: &mut dyn Db, verbose: bool) {
+        if self.verbose_flag(db) != verbose {
+            self.set_verbose_flag(db).to(verbose);
+        }
+    }
+
+    pub fn verbose(self, db: &dyn Db) -> bool {
+        self.verbose_flag(db)
+    }
+
     /// Returns the paths that should be checked.
     ///
     /// The default is to check the entire project in which case this method returns
@@ -671,24 +679,7 @@ where
     }) {
         Ok(result) => Ok(result),
         Err(error) => {
-            use std::fmt::Write;
-            let mut message = String::new();
-            message.push_str("Panicked");
-
-            if let Some(location) = error.location {
-                let _ = write!(&mut message, " at {location}");
-            }
-
-            let _ = write!(
-                &mut message,
-                " when checking `{file}`",
-                file = file.path(db)
-            );
-
-            if let Some(payload) = error.payload.as_str() {
-                let _ = write!(&mut message, ": `{payload}`");
-            }
-
+            let message = error.to_diagnostic_message(Some(file.path(db)));
             let mut diagnostic = Diagnostic::new(DiagnosticId::Panic, Severity::Fatal, message);
             diagnostic.sub(SubDiagnostic::new(
                 SubDiagnosticSeverity::Info,
diff --git a/crates/ty_project/src/metadata/options.rs b/crates/ty_project/src/metadata/options.rs
index 5d21320049..bcd821c53d 100644
--- a/crates/ty_project/src/metadata/options.rs
+++ b/crates/ty_project/src/metadata/options.rs
@@ -28,12 +28,13 @@ use std::ops::Deref;
 use std::sync::Arc;
 use thiserror::Error;
 use ty_combine::Combine;
-use ty_python_semantic::lint::{GetLintError, Level, LintSource, RuleSelection};
+use ty_python_semantic::lint::{Level, LintSource, RuleSelection};
 use ty_python_semantic::{
     ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionFileSource,
     PythonVersionSource, PythonVersionWithSource, SearchPathSettings, SearchPathValidationError,
     SearchPaths, SitePackagesPaths, SysPrefixPathOrigin,
 };
+use ty_static::EnvVars;
 
 #[derive(
     Debug,
@@ -236,15 +237,16 @@ impl Options {
                 .map(|root| root.absolute(project_root, system))
                 .collect()
         } else {
+            let mut roots = vec![];
             let src = project_root.join("src");
 
-            let mut roots = if system.is_directory(&src) {
+            if system.is_directory(&src) {
                 // Default to `src` and the project root if `src` exists and the root hasn't been specified.
                 // This corresponds to the `src-layout`
                 tracing::debug!(
                     "Including `.` and `./src` in `environment.root` because a `./src` directory exists"
                 );
-                vec![project_root.to_path_buf(), src]
+                roots.push(src);
             } else if system.is_directory(&project_root.join(project_name).join(project_name)) {
                 // `src-layout` but when the folder isn't called `src` but has the same name as the project.
                 // For example, the "src" folder for `psycopg` is called `psycopg` and the python files are in `psycopg/psycopg/_adapters_map.py`
@@ -252,18 +254,35 @@ impl Options {
                     "Including `.` and `/{project_name}` in `environment.root` because a `./{project_name}/{project_name}` directory exists"
                 );
 
-                vec![project_root.to_path_buf(), project_root.join(project_name)]
+                roots.push(project_root.join(project_name));
             } else {
                 // Default to a [flat project structure](https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/).
                 tracing::debug!("Including `.` in `environment.root`");
-                vec![project_root.to_path_buf()]
-            };
+            }
+
+            let python = project_root.join("python");
+            if system.is_directory(&python)
+                && !system.is_file(&python.join("__init__.py"))
+                && !system.is_file(&python.join("__init__.pyi"))
+                && !roots.contains(&python)
+            {
+                // If a `./python` directory exists, include it as a source root. This is the recommended layout
+                // for maturin-based rust/python projects [1].
+                //
+                // https://github.com/PyO3/maturin/blob/979fe1db42bb9e58bc150fa6fc45360b377288bf/README.md?plain=1#L88-L99
+                tracing::debug!(
+                    "Including `./python` in `environment.root` because a `./python` directory exists"
+                );
+
+                roots.push(python);
+            }
 
             // Considering pytest test discovery conventions,
             // we also include the `tests` directory if it exists and is not a package.
             let tests_dir = project_root.join("tests");
             if system.is_directory(&tests_dir)
                 && !system.is_file(&tests_dir.join("__init__.py"))
+                && !system.is_file(&tests_dir.join("__init__.pyi"))
                 && !roots.contains(&tests_dir)
             {
                 // If the `tests` directory exists and is not a package, include it as a source root.
@@ -274,17 +293,58 @@ impl Options {
                 roots.push(tests_dir);
             }
 
+            // The project root should always be included, and should always come
+            // after any subdirectories such as `./src`, `./tests` and/or `./python`.
+            roots.push(project_root.to_path_buf());
+
             roots
         };
 
+        // collect the existing site packages
+        let mut extra_paths: Vec<SystemPathBuf> = environment
+            .extra_paths
+            .as_deref()
+            .unwrap_or_default()
+            .iter()
+            .map(|path| path.absolute(project_root, system))
+            .collect();
+
+        // read all the paths off the PYTHONPATH environment variable, check
+        // they exist as a directory, and add them to the vec of extra_paths
+        // as they should be checked before site-packages just like python
+        // interpreter does
+        if let Ok(python_path) = system.env_var(EnvVars::PYTHONPATH) {
+            for path in std::env::split_paths(python_path.as_str()) {
+                let path = match SystemPathBuf::from_path_buf(path) {
+                    Ok(path) => path,
+                    Err(path) => {
+                        tracing::debug!(
+                            "Skipping `{path}` listed in `PYTHONPATH` because the path is not valid UTF-8",
+                            path = path.display()
+                        );
+                        continue;
+                    }
+                };
+
+                let abspath = SystemPath::absolute(path, system.current_directory());
+
+                if !system.is_directory(&abspath) {
+                    tracing::debug!(
+                        "Skipping `{abspath}` listed in `PYTHONPATH` because the path doesn't exist or isn't a directory"
+                    );
+                    continue;
+                }
+
+                tracing::debug!(
+                    "Adding `{abspath}` from the `PYTHONPATH` environment variable to `extra_paths`"
+                );
+
+                extra_paths.push(abspath);
+            }
+        }
+
         let settings = SearchPathSettings {
-            extra_paths: environment
-                .extra_paths
-                .as_deref()
-                .unwrap_or_default()
-                .iter()
-                .map(|path| path.absolute(project_root, system))
-                .collect(),
+            extra_paths,
             src_roots,
             custom_typeshed: environment
                 .typeshed
@@ -428,7 +488,7 @@ pub struct EnvironmentOptions {
     /// * if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path
     /// * otherwise, default to `.` (flat layout)
     ///
-    /// Besides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file),
+    /// Besides, if a `./python` or `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` or `__init__.pyi` file),
     /// it will also be included in the first party search path.
     #[serde(skip_serializing_if = "Option::is_none")]
     #[option(
@@ -460,8 +520,8 @@ pub struct EnvironmentOptions {
     /// to reflect the differing contents of the standard library across Python versions.
     #[serde(skip_serializing_if = "Option::is_none")]
     #[option(
-        default = r#""3.13""#,
-        value_type = r#""3.7" | "3.8" | "3.9" | "3.10" | "3.11" | "3.12" | "3.13" | <major>.<minor>"#,
+        default = r#""3.14""#,
+        value_type = r#""3.7" | "3.8" | "3.9" | "3.10" | "3.11" | "3.12" | "3.13" | "3.14" | <major>.<minor>"#,
         example = r#"
             python-version = "3.12"
         "#
@@ -490,9 +550,14 @@ pub struct EnvironmentOptions {
     )]
     pub python_platform: Option<RangedValue<PythonPlatform>>,
 
-    /// List of user-provided paths that should take first priority in the module resolution.
-    /// Examples in other type checkers are mypy's `MYPYPATH` environment variable,
-    /// or pyright's `stubPath` configuration setting.
+    /// User-provided paths that should take first priority in module resolution.
+    ///
+    /// This is an advanced option that should usually only be used for first-party or third-party
+    /// modules that are not installed into your Python environment in a conventional way.
+    /// Use the `python` option to specify the location of your Python environment.
+    ///
+    /// This option is similar to mypy's `MYPYPATH` environment variable and pyright's `stubPath`
+    /// configuration setting.
     #[serde(skip_serializing_if = "Option::is_none")]
     #[option(
         default = r#"[]"#,
@@ -516,18 +581,27 @@ pub struct EnvironmentOptions {
     )]
     pub typeshed: Option<RelativePathBuf>,
 
-    /// Path to the Python installation from which ty resolves type information and third-party dependencies.
+    /// Path to your project's Python environment or interpreter.
     ///
-    /// ty will search in the path's `site-packages` directories for type information and
-    /// third-party imports.
+    /// ty uses the `site-packages` directory of your project's Python environment
+    /// to resolve third-party (and, in some cases, first-party) imports in your code.
     ///
-    /// This option is commonly used to specify the path to a virtual environment.
+    /// If you're using a project management tool such as uv, you should not generally need
+    /// to specify this option, as commands such as `uv run` will set the `VIRTUAL_ENV`
+    /// environment variable to point to your project's virtual environment. ty can also infer
+    /// the location of your environment from an activated Conda environment, and will look for
+    /// a `.venv` directory in the project root if none of the above apply.
+    ///
+    /// Passing a path to a Python executable is supported, but passing a path to a dynamic executable
+    /// (such as a shim) is not currently supported.
+    ///
+    /// This option can be used to point to virtual or system Python environments.
     #[serde(skip_serializing_if = "Option::is_none")]
     #[option(
         default = r#"null"#,
         value_type = "str",
         example = r#"
-            python = "./.venv"
+            python = "./custom-venv-location/.venv"
         "#
     )]
     pub python: Option<RelativePathBuf>,
@@ -710,9 +784,7 @@ impl SrcOptions {
     Debug, Default, Clone, Eq, PartialEq, Combine, Serialize, Deserialize, Hash, get_size2::GetSize,
 )]
 #[serde(rename_all = "kebab-case", transparent)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Rules {
-    #[cfg_attr(feature = "schemars", schemars(with = "schema::Rules"))]
     #[get_size(ignore)] // TODO: Add `GetSize` support for `OrderMap`.
     inner: OrderMap<RangedValue<String>, RangedValue<Level>, BuildHasherDefault<FxHasher>>,
 }
@@ -766,28 +838,11 @@ impl Rules {
                         .and_then(|path| system_path_to_file(db, path).ok());
 
                     // TODO: Add a note if the value was configured on the CLI
-                    let diagnostic = match error {
-                        GetLintError::Unknown(_) => OptionDiagnostic::new(
-                            DiagnosticId::UnknownRule,
-                            format!("Unknown lint rule `{rule_name}`"),
-                            Severity::Warning,
-                        ),
-                        GetLintError::PrefixedWithCategory { suggestion, .. } => {
-                            OptionDiagnostic::new(
-                                DiagnosticId::UnknownRule,
-                                format!(
-                                    "Unknown lint rule `{rule_name}`. Did you mean `{suggestion}`?"
-                                ),
-                                Severity::Warning,
-                            )
-                        }
-
-                        GetLintError::Removed(_) => OptionDiagnostic::new(
-                            DiagnosticId::UnknownRule,
-                            format!("Unknown lint rule `{rule_name}`"),
-                            Severity::Warning,
-                        ),
-                    };
+                    let diagnostic = OptionDiagnostic::new(
+                        DiagnosticId::UnknownRule,
+                        error.to_string(),
+                        Severity::Warning,
+                    );
 
                     let annotation = file.map(Span::from).map(|span| {
                         Annotation::primary(span.with_optional_range(rule_name.range()))
@@ -1055,6 +1110,25 @@ pub enum OutputFormat {
     ///
     /// This may use color when printing to a `tty`.
     Concise,
+    /// Print diagnostics in the JSON format expected by GitLab [Code Quality] reports.
+    ///
+    /// [Code Quality]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
+    Gitlab,
+    /// Print diagnostics in the format used by [GitHub Actions] workflow error annotations.
+    ///
+    /// [GitHub Actions]: https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#setting-an-error-message
+    Github,
+}
+
+impl OutputFormat {
+    /// Returns `true` if this format is intended for users to read directly, in contrast to
+    /// machine-readable or structured formats.
+    ///
+    /// This can be used to check whether information beyond the diagnostics, such as a header or
+    /// `Found N diagnostics` footer, should be included.
+    pub const fn is_human_readable(&self) -> bool {
+        matches!(self, OutputFormat::Full | OutputFormat::Concise)
+    }
 }
 
 impl From<OutputFormat> for DiagnosticFormat {
@@ -1062,6 +1136,8 @@ impl From<OutputFormat> for DiagnosticFormat {
         match value {
             OutputFormat::Full => Self::Full,
             OutputFormat::Concise => Self::Concise,
+            OutputFormat::Gitlab => Self::Gitlab,
+            OutputFormat::Github => Self::Github,
         }
     }
 }
@@ -1457,63 +1533,55 @@ impl std::error::Error for ToSettingsError {}
 
 #[cfg(feature = "schemars")]
 mod schema {
-    use crate::DEFAULT_LINT_REGISTRY;
-    use schemars::JsonSchema;
-    use schemars::r#gen::SchemaGenerator;
-    use schemars::schema::{
-        InstanceType, Metadata, ObjectValidation, Schema, SchemaObject, SubschemaValidation,
-    };
-    use ty_python_semantic::lint::Level;
-
-    pub(super) struct Rules;
-
-    impl JsonSchema for Rules {
-        fn schema_name() -> String {
-            "Rules".to_string()
+    impl schemars::JsonSchema for super::Rules {
+        fn schema_name() -> std::borrow::Cow<'static, str> {
+            std::borrow::Cow::Borrowed("Rules")
         }
 
-        fn json_schema(generator: &mut SchemaGenerator) -> Schema {
-            let registry = &*DEFAULT_LINT_REGISTRY;
+        fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
+            use serde_json::{Map, Value};
 
-            let level_schema = generator.subschema_for::<Level>();
+            let registry = ty_python_semantic::default_lint_registry();
+            let level_schema = generator.subschema_for::<super::Level>();
 
-            let properties: schemars::Map<String, Schema> = registry
+            let properties: Map<String, Value> = registry
                 .lints()
                 .iter()
                 .map(|lint| {
-                    (
-                        lint.name().to_string(),
-                        Schema::Object(SchemaObject {
-                            metadata: Some(Box::new(Metadata {
-                                title: Some(lint.summary().to_string()),
-                                description: Some(lint.documentation()),
-                                deprecated: lint.status.is_deprecated(),
-                                default: Some(lint.default_level.to_string().into()),
-                                ..Metadata::default()
-                            })),
-                            subschemas: Some(Box::new(SubschemaValidation {
-                                one_of: Some(vec![level_schema.clone()]),
-                                ..Default::default()
-                            })),
-                            ..Default::default()
-                        }),
-                    )
+                    let mut schema = schemars::Schema::default();
+                    let object = schema.ensure_object();
+                    object.insert(
+                        "title".to_string(),
+                        Value::String(lint.summary().to_string()),
+                    );
+                    object.insert(
+                        "description".to_string(),
+                        Value::String(lint.documentation()),
+                    );
+                    if lint.status.is_deprecated() {
+                        object.insert("deprecated".to_string(), Value::Bool(true));
+                    }
+                    object.insert(
+                        "default".to_string(),
+                        Value::String(lint.default_level.to_string()),
+                    );
+                    object.insert(
+                        "oneOf".to_string(),
+                        Value::Array(vec![level_schema.clone().into()]),
+                    );
+
+                    (lint.name().to_string(), schema.into())
                 })
                 .collect();
 
-            Schema::Object(SchemaObject {
-                instance_type: Some(InstanceType::Object.into()),
-                object: Some(Box::new(ObjectValidation {
-                    properties,
-                    // Allow unknown rules: ty will warn about them.
-                    // It gives a better experience when using an older ty version because
-                    // the schema will not deny rules that have been removed in newer versions.
-                    additional_properties: Some(Box::new(level_schema)),
-                    ..ObjectValidation::default()
-                })),
+            let mut schema = schemars::json_schema!({ "type": "object" });
+            let object = schema.ensure_object();
+            object.insert("properties".to_string(), Value::Object(properties));
+            // Allow unknown rules: ty will warn about them. It gives a better experience when using an older
+            // ty version because the schema will not deny rules that have been removed in newer versions.
+            object.insert("additionalProperties".to_string(), level_schema.into());
 
-                ..Default::default()
-            })
+            schema
         }
     }
 }
diff --git a/crates/ty_project/src/metadata/value.rs b/crates/ty_project/src/metadata/value.rs
index 95a157a451..f1f08d718a 100644
--- a/crates/ty_project/src/metadata/value.rs
+++ b/crates/ty_project/src/metadata/value.rs
@@ -86,7 +86,6 @@ impl Drop for ValueSourceGuard {
 /// or if the values were loaded from different sources.
 #[derive(Clone, serde::Serialize, get_size2::GetSize)]
 #[serde(transparent)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct RangedValue<T> {
     value: T,
     #[serde(skip)]
@@ -100,6 +99,34 @@ pub struct RangedValue<T> {
     range: Option<TextRange>,
 }
 
+#[cfg(feature = "schemars")]
+impl<T> schemars::JsonSchema for RangedValue<T>
+where
+    T: schemars::JsonSchema,
+{
+    fn schema_name() -> std::borrow::Cow<'static, str> {
+        T::schema_name()
+    }
+
+    fn schema_id() -> std::borrow::Cow<'static, str> {
+        T::schema_id()
+    }
+
+    fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
+        T::json_schema(generator)
+    }
+
+    fn _schemars_private_non_optional_json_schema(
+        generator: &mut schemars::SchemaGenerator,
+    ) -> schemars::Schema {
+        T::_schemars_private_non_optional_json_schema(generator)
+    }
+
+    fn _schemars_private_is_option() -> bool {
+        T::_schemars_private_is_option()
+    }
+}
+
 impl<T> RangedValue<T> {
     pub fn new(value: T, source: ValueSource) -> Self {
         Self::with_range(value, source, TextRange::default())
diff --git a/crates/ty_project/src/watch/watcher.rs b/crates/ty_project/src/watch/watcher.rs
index f3789a526b..83e10bbede 100644
--- a/crates/ty_project/src/watch/watcher.rs
+++ b/crates/ty_project/src/watch/watcher.rs
@@ -1,3 +1,8 @@
+#![allow(
+    clippy::disallowed_methods,
+    reason = "This implementation is specific to real file systems."
+)]
+
 use notify::event::{CreateKind, MetadataKind, ModifyKind, RemoveKind, RenameMode};
 use notify::{EventKind, RecommendedWatcher, RecursiveMode, Watcher as _, recommended_watcher};
 
diff --git a/crates/ty_python_semantic/Cargo.toml b/crates/ty_python_semantic/Cargo.toml
index ef81237b5e..faf5c37881 100644
--- a/crates/ty_python_semantic/Cargo.toml
+++ b/crates/ty_python_semantic/Cargo.toml
@@ -43,6 +43,7 @@ rustc-hash = { workspace = true }
 hashbrown = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 smallvec = { workspace = true }
 static_assertions = { workspace = true }
 test-case = { workspace = true }
@@ -62,12 +63,15 @@ ty_vendored = { workspace = true }
 anyhow = { workspace = true }
 dir-test = { workspace = true }
 glob = { workspace = true }
+indoc = { workspace = true }
 insta = { workspace = true }
+pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
 quickcheck = { version = "1.0.3", default-features = false }
 quickcheck_macros = { version = "1.0.0" }
 
 [features]
+schemars = ["dep:schemars", "dep:serde_json"]
 serde = ["ruff_db/serde", "dep:serde", "ruff_python_ast/serde"]
 testing = []
 
diff --git a/crates/ty_python_semantic/mdtest.py b/crates/ty_python_semantic/mdtest.py
index e238c9ce89..8eb272f39d 100644
--- a/crates/ty_python_semantic/mdtest.py
+++ b/crates/ty_python_semantic/mdtest.py
@@ -46,6 +46,7 @@ class MDTestRunner:
                 CRATE_NAME,
                 "--no-run",
                 "--color=always",
+                "--test=mdtest",
                 "--message-format",
                 message_format,
             ],
@@ -105,7 +106,12 @@ class MDTestRunner:
         return subprocess.run(
             [self.mdtest_executable, *arguments],
             cwd=CRATE_ROOT,
-            env=dict(os.environ, CLICOLOR_FORCE="1"),
+            env=dict(
+                os.environ,
+                CLICOLOR_FORCE="1",
+                INSTA_FORCE_PASS="1",
+                INSTA_OUTPUT="none",
+            ),
             capture_output=capture_output,
             text=True,
             check=False,
diff --git a/crates/ty_python_semantic/resources/mdtest/annotations/any.md b/crates/ty_python_semantic/resources/mdtest/annotations/any.md
index d4b1e6f502..e5244051f0 100644
--- a/crates/ty_python_semantic/resources/mdtest/annotations/any.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/any.md
@@ -137,6 +137,22 @@ from unittest.mock import MagicMock
 x: int = MagicMock()
 ```
 
+## Runtime properties
+
+`typing.Any` is a class at runtime on Python 3.11+, and `typing_extensions.Any` is always a class.
+On earlier versions of Python, `typing.Any` was an instance of `typing._SpecialForm`, but this is
+not currently modeled by ty. We currently infer `Any` has having all attributes a class would have
+on all versions of Python:
+
+```py
+from typing import Any
+from ty_extensions import TypeOf, static_assert, is_assignable_to
+
+reveal_type(Any.__base__)  # revealed: type | None
+reveal_type(Any.__bases__)  # revealed: tuple[type, ...]
+static_assert(is_assignable_to(TypeOf[Any], type))
+```
+
 ## Invalid
 
 `Any` cannot be parameterized:
@@ -144,7 +160,32 @@ x: int = MagicMock()
 ```py
 from typing import Any
 
-# error: [invalid-type-form] "Type `typing.Any` expected no type parameter"
+# error: [invalid-type-form] "Special form `typing.Any` expected no type parameter"
 def f(x: Any[int]):
     reveal_type(x)  # revealed: Unknown
 ```
+
+`Any` cannot be called (this leads to a `TypeError` at runtime):
+
+```py
+Any()  # error: [call-non-callable] "Object of type `typing.Any` is not callable"
+```
+
+`Any` also cannot be used as a metaclass (under the hood, this leads to an implicit call to `Any`):
+
+```py
+class F(metaclass=Any): ...  # error: [invalid-metaclass] "Metaclass type `typing.Any` is not callable"
+```
+
+And `Any` cannot be used in `isinstance()` checks:
+
+```py
+# error: [invalid-argument-type] "`typing.Any` cannot be used with `isinstance()`: This call will raise `TypeError` at runtime"
+isinstance("", Any)
+```
+
+But `issubclass()` checks are fine:
+
+```py
+issubclass(object, Any)  # no error!
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/annotations/callable.md b/crates/ty_python_semantic/resources/mdtest/annotations/callable.md
index 1a7974089e..780b2a87db 100644
--- a/crates/ty_python_semantic/resources/mdtest/annotations/callable.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/callable.md
@@ -366,7 +366,7 @@ on function-like callables:
 
 ```py
 def f_wrong(c: Callable[[], None]):
-    # error: [unresolved-attribute] "Type `() -> None` has no attribute `__qualname__`"
+    # error: [unresolved-attribute] "Object of type `() -> None` has no attribute `__qualname__`"
     c.__qualname__
 
     # error: [unresolved-attribute] "Unresolved attribute `__qualname__` on type `() -> None`."
@@ -392,13 +392,19 @@ from inspect import getattr_static
 
 def f_okay(c: Callable[[], None]):
     if hasattr(c, "__qualname__"):
-        c.__qualname__  # okay
+        reveal_type(c.__qualname__)  # revealed: object
+
+        # TODO: should be `property`
+        # (or complain that we don't know that `type(c)` has the attribute at all!)
+        reveal_type(type(c).__qualname__)  # revealed: @Todo(Intersection meta-type)
+
         # `hasattr` only guarantees that an attribute is readable.
+        #
         # error: [invalid-assignment] "Object of type `Literal["my_callable"]` is not assignable to attribute `__qualname__` on type `(() -> None) & <Protocol with members '__qualname__'>`"
         c.__qualname__ = "my_callable"
 
         result = getattr_static(c, "__qualname__")
-        reveal_type(result)  # revealed: Never
+        reveal_type(result)  # revealed: property
         if isinstance(result, property) and result.fset:
             c.__qualname__ = "my_callable"  # okay
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/annotations/invalid.md b/crates/ty_python_semantic/resources/mdtest/annotations/invalid.md
index 29542eb8d5..5202b0921d 100644
--- a/crates/ty_python_semantic/resources/mdtest/annotations/invalid.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/invalid.md
@@ -48,6 +48,24 @@ def _(
         reveal_type(h_)  # revealed: Unknown
         reveal_type(i_)  # revealed: Unknown
         reveal_type(j_)  # revealed: Unknown
+
+# Inspired by the conformance test suite at
+# https://github.com/python/typing/blob/d4f39b27a4a47aac8b6d4019e1b0b5b3156fabdc/conformance/tests/aliases_implicit.py#L88-L122
+B = [x for x in range(42)]
+C = {x for x in range(42)}
+D = {x: y for x, y in enumerate(range(42))}
+E = (x for x in range(42))
+
+def _(
+    b: B,  # error: [invalid-type-form]
+    c: C,  # error: [invalid-type-form]
+    d: D,  # error: [invalid-type-form]
+    e: E,  # error: [invalid-type-form]
+):
+    reveal_type(b)  # revealed: Unknown
+    reveal_type(c)  # revealed: Unknown
+    reveal_type(d)  # revealed: Unknown
+    reveal_type(e)  # revealed: Unknown
 ```
 
 ## Invalid AST nodes
@@ -56,8 +74,13 @@ def _(
 def bar() -> None:
     return None
 
+def outer_sync():  # `yield` from is only valid syntax inside a synchronous function
+    def _(
+        a: (yield from [1]),  # error: [invalid-type-form] "`yield from` expressions are not allowed in type expressions"
+    ): ...
+
 async def baz(): ...
-async def outer():  # avoid unrelated syntax errors on yield, yield from, and await
+async def outer_async():  # avoid unrelated syntax errors on `yield` and `await`
     def _(
         a: 1,  # error: [invalid-type-form] "Int literals are not allowed in this context in a type expression"
         b: 2.3,  # error: [invalid-type-form] "Float literals are not allowed in type expressions"
@@ -72,11 +95,10 @@ async def outer():  # avoid unrelated syntax errors on yield, yield from, and aw
         k: 1 if True else 2,  # error: [invalid-type-form] "`if` expressions are not allowed in type expressions"
         l: await baz(),  # error: [invalid-type-form] "`await` expressions are not allowed in type expressions"
         m: (yield 1),  # error: [invalid-type-form] "`yield` expressions are not allowed in type expressions"
-        n: (yield from [1]),  # error: [invalid-type-form] "`yield from` expressions are not allowed in type expressions"
-        o: 1 < 2,  # error: [invalid-type-form] "Comparison expressions are not allowed in type expressions"
-        p: bar(),  # error: [invalid-type-form] "Function calls are not allowed in type expressions"
-        q: int | f"foo",  # error: [invalid-type-form] "F-strings are not allowed in type expressions"
-        r: [1, 2, 3][1:2],  # error: [invalid-type-form] "Slices are not allowed in type expressions"
+        n: 1 < 2,  # error: [invalid-type-form] "Comparison expressions are not allowed in type expressions"
+        o: bar(),  # error: [invalid-type-form] "Function calls are not allowed in type expressions"
+        p: int | f"foo",  # error: [invalid-type-form] "F-strings are not allowed in type expressions"
+        q: [1, 2, 3][1:2],  # error: [invalid-type-form] "Slices are not allowed in type expressions"
     ):
         reveal_type(a)  # revealed: Unknown
         reveal_type(b)  # revealed: Unknown
@@ -89,9 +111,12 @@ async def outer():  # avoid unrelated syntax errors on yield, yield from, and aw
         reveal_type(i)  # revealed: Unknown
         reveal_type(j)  # revealed: Unknown
         reveal_type(k)  # revealed: Unknown
-        reveal_type(p)  # revealed: Unknown
-        reveal_type(q)  # revealed: int | Unknown
-        reveal_type(r)  # revealed: @Todo(unknown type subscript)
+        reveal_type(l)  # revealed: Unknown
+        reveal_type(m)  # revealed: Unknown
+        reveal_type(n)  # revealed: Unknown
+        reveal_type(o)  # revealed: Unknown
+        reveal_type(p)  # revealed: int | Unknown
+        reveal_type(q)  # revealed: @Todo(unknown type subscript)
 
 class Mat:
     def __init__(self, value: int):
diff --git a/crates/ty_python_semantic/resources/mdtest/annotations/self.md b/crates/ty_python_semantic/resources/mdtest/annotations/self.md
index e476e03a75..621db497c4 100644
--- a/crates/ty_python_semantic/resources/mdtest/annotations/self.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/self.md
@@ -2,7 +2,7 @@
 
 ```toml
 [environment]
-python-version = "3.11"
+python-version = "3.13"
 ```
 
 `Self` is treated as if it were a `TypeVar` bound to the class it's being used on.
@@ -30,16 +30,9 @@ class Shape:
 
     def nested_func_without_enclosing_binding(self):
         def inner(x: Self):
-            # TODO: revealed: Self@nested_func_without_enclosing_binding
-            # (The outer method binds an implicit `Self`)
-            reveal_type(x)  # revealed: Self@inner
+            reveal_type(x)  # revealed: Self@nested_func_without_enclosing_binding
         inner(self)
 
-    def implicit_self(self) -> Self:
-        # TODO: first argument in a method should be considered as "typing.Self"
-        reveal_type(self)  # revealed: Unknown
-        return self
-
 reveal_type(Shape().nested_type())  # revealed: list[Shape]
 reveal_type(Shape().nested_func())  # revealed: Shape
 
@@ -55,6 +48,160 @@ class Outer:
             return self
 ```
 
+## Type of (unannotated) `self` parameters
+
+In instance methods, the first parameter (regardless of its name) is assumed to have the type
+`typing.Self`, unless it has an explicit annotation. This does not apply to `@classmethod` and
+`@staticmethod`s.
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import Self
+
+class A:
+    def implicit_self(self) -> Self:
+        reveal_type(self)  # revealed: Self@implicit_self
+
+        return self
+
+    def implicit_self_generic[T](self, x: T) -> T:
+        reveal_type(self)  # revealed: Self@implicit_self_generic
+
+        return x
+
+    def method_a(self) -> None:
+        def first_param_is_not_self(a: int):
+            reveal_type(a)  # revealed: int
+            reveal_type(self)  # revealed: Self@method_a
+
+        def first_param_is_not_self_unannotated(a):
+            reveal_type(a)  # revealed: Unknown
+            reveal_type(self)  # revealed: Self@method_a
+
+        def first_param_is_also_not_self(self) -> None:
+            reveal_type(self)  # revealed: Unknown
+
+        def first_param_is_explicit_self(this: Self) -> None:
+            reveal_type(this)  # revealed: Self@method_a
+            reveal_type(self)  # revealed: Self@method_a
+
+    @classmethod
+    def a_classmethod(cls) -> Self:
+        # TODO: This should be type[Self@bar]
+        reveal_type(cls)  # revealed: Unknown
+        return cls()
+
+    @staticmethod
+    def a_staticmethod(x: int): ...
+
+a = A()
+
+reveal_type(a.implicit_self())  # revealed: A
+reveal_type(a.implicit_self)  # revealed: bound method A.implicit_self() -> A
+```
+
+Calling an instance method explicitly verifies the first argument:
+
+```py
+A.implicit_self(a)
+
+# error: [invalid-argument-type] "Argument to function `implicit_self` is incorrect: Argument type `Literal[1]` does not satisfy upper bound `A` of type variable `Self`"
+A.implicit_self(1)
+```
+
+Passing `self` implicitly also verifies the type:
+
+```py
+from typing import Never
+
+class Strange:
+    def can_not_be_called(self: Never) -> None: ...
+
+# error: [invalid-argument-type] "Argument to bound method `can_not_be_called` is incorrect: Expected `Never`, found `Strange`"
+Strange().can_not_be_called()
+```
+
+If the method is a class or static method then first argument is not inferred as `Self`:
+
+```py
+A.a_classmethod()
+A.a_classmethod(a)  # error: [too-many-positional-arguments]
+A.a_staticmethod(1)
+a.a_staticmethod(1)
+A.a_staticmethod(a)  # error: [invalid-argument-type]
+```
+
+The first parameter of instance methods always has type `Self`, if it is not explicitly annotated.
+The name `self` is not special in any way.
+
+```py
+class B:
+    def name_does_not_matter(this) -> Self:
+        reveal_type(this)  # revealed: Self@name_does_not_matter
+
+        return this
+
+    def positional_only(self, /, x: int) -> Self:
+        reveal_type(self)  # revealed: Self@positional_only
+        return self
+
+    def keyword_only(self, *, x: int) -> Self:
+        reveal_type(self)  # revealed: Self@keyword_only
+        return self
+
+    @property
+    def a_property(self) -> Self:
+        # TODO: Should reveal Self@a_property
+        reveal_type(self)  # revealed: Unknown
+        return self
+
+reveal_type(B().name_does_not_matter())  # revealed: B
+reveal_type(B().positional_only(1))  # revealed: B
+reveal_type(B().keyword_only(x=1))  # revealed: B
+
+# TODO: this should be B
+reveal_type(B().a_property)  # revealed: Unknown
+```
+
+This also works for generic classes:
+
+```py
+from typing import Self, Generic, TypeVar
+
+T = TypeVar("T")
+
+class G(Generic[T]):
+    def id(self) -> Self:
+        reveal_type(self)  # revealed: Self@id
+
+        return self
+
+reveal_type(G[int]().id())  # revealed: G[int]
+reveal_type(G[str]().id())  # revealed: G[str]
+```
+
+Free functions and nested functions do not use implicit `Self`:
+
+```py
+def not_a_method(self):
+    reveal_type(self)  # revealed: Unknown
+
+# error: [invalid-type-form]
+def does_not_return_self(self) -> Self:
+    return self
+
+class C:
+    def outer(self) -> None:
+        def inner(self):
+            reveal_type(self)  # revealed: Unknown
+
+reveal_type(not_a_method)  # revealed: def not_a_method(self) -> Unknown
+```
+
 ## typing_extensions
 
 ```toml
@@ -115,6 +262,20 @@ class LinkedList:
 reveal_type(LinkedList().next())  # revealed: LinkedList
 ```
 
+Attributes can also refer to a generic parameter:
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+class C(Generic[T]):
+    foo: T
+    def method(self) -> None:
+        reveal_type(self)  # revealed: Self@method
+        reveal_type(self.foo)  # revealed: T@C
+```
+
 ## Generic Classes
 
 ```py
@@ -147,6 +308,47 @@ class Shape:
         return self
 ```
 
+## `Self` for classes with a default value for their generic parameter
+
+This is a regression test for <https://github.com/astral-sh/ty/issues/1156>.
+
+```py
+from typing import Self
+
+class Container[T = bytes]:
+    def __init__(self: Self, data: T | None = None) -> None:
+        self.data = data
+
+reveal_type(Container())  # revealed: Container[bytes]
+reveal_type(Container(1))  # revealed: Container[int]
+reveal_type(Container("a"))  # revealed: Container[str]
+reveal_type(Container(b"a"))  # revealed: Container[bytes]
+```
+
+## Implicit self for classes with a default value for their generic parameter
+
+```py
+from typing import Self, TypeVar, Generic
+
+class Container[T = bytes]:
+    def method(self) -> Self:
+        return self
+
+def _(c: Container[str], d: Container):
+    reveal_type(c.method())  # revealed: Container[str]
+    reveal_type(d.method())  # revealed: Container[bytes]
+
+T = TypeVar("T", default=bytes)
+
+class LegacyContainer(Generic[T]):
+    def method(self) -> Self:
+        return self
+
+def _(c: LegacyContainer[str], d: LegacyContainer):
+    reveal_type(c.method())  # revealed: LegacyContainer[str]
+    reveal_type(d.method())  # revealed: LegacyContainer[bytes]
+```
+
 ## Invalid Usage
 
 `Self` cannot be used in the signature of a function or variable.
@@ -164,35 +366,73 @@ b: Self
 
 # TODO: "Self" cannot be used in a function with a `self` or `cls` parameter that has a type annotation other than "Self"
 class Foo:
-    # TODO: rejected Self because self has a different type
+    # TODO: This `self: T` annotation should be rejected because `T` is not `Self`
     def has_existing_self_annotation(self: T) -> Self:
         return self  # error: [invalid-return-type]
 
     def return_concrete_type(self) -> Self:
-        # TODO: tell user to use "Foo" instead of "Self"
+        # TODO: We could emit a hint that suggests annotating with `Foo` instead of `Self`
         # error: [invalid-return-type]
         return Foo()
 
     @staticmethod
-    # TODO: reject because of staticmethod
+    # TODO: The usage of `Self` here should be rejected because this is a static method
     def make() -> Self:
         # error: [invalid-return-type]
         return Foo()
 
-class Bar(Generic[T]):
-    foo: T
-    def bar(self) -> T:
-        return self.foo
+class Bar(Generic[T]): ...
 
 # error: [invalid-type-form]
 class Baz(Bar[Self]): ...
 
 class MyMetaclass(type):
-    # TODO: rejected
+    # TODO: reject the Self usage. because self cannot be used within a metaclass.
     def __new__(cls) -> Self:
         return super().__new__(cls)
 ```
 
+## Explicit annotations override implicit `Self`
+
+If the first parameter is explicitly annotated, that annotation takes precedence over the implicit
+`Self` type.
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from __future__ import annotations
+
+from typing import final
+
+@final
+class Disjoint: ...
+
+class Explicit:
+    # TODO: We could emit a warning if the annotated type of `self` is disjoint from `Explicit`
+    def bad(self: Disjoint) -> None:
+        reveal_type(self)  # revealed: Disjoint
+
+    def forward(self: Explicit) -> None:
+        reveal_type(self)  # revealed: Explicit
+
+# error: [invalid-argument-type] "Argument to bound method `bad` is incorrect: Expected `Disjoint`, found `Explicit`"
+Explicit().bad()
+
+Explicit().forward()
+
+class ExplicitGeneric[T]:
+    def special(self: ExplicitGeneric[int]) -> None:
+        reveal_type(self)  # revealed: ExplicitGeneric[int]
+
+ExplicitGeneric[int]().special()
+
+# TODO: this should be an `invalid-argument-type` error
+ExplicitGeneric[str]().special()
+```
+
 ## Binding a method fixes `Self`
 
 When a method is bound, any instances of `Self` in its signature are "fixed", since we now know the
@@ -222,4 +462,50 @@ reveal_type(D().instance_method)
 reveal_type(D.class_method)
 ```
 
+In nested functions `self` binds to the method. So in the following example the `self` in `C.b` is
+bound at `C.f`.
+
+```py
+from typing import Self
+from ty_extensions import generic_context
+
+class C[T]():
+    def f(self: Self):
+        def b(x: Self):
+            reveal_type(x)  # revealed: Self@f
+        reveal_type(generic_context(b))  # revealed: None
+
+reveal_type(generic_context(C.f))  # revealed: tuple[Self@f]
+```
+
+Even if the `Self` annotation appears first in the nested function, it is the method that binds
+`Self`.
+
+```py
+from typing import Self
+from ty_extensions import generic_context
+
+class C:
+    def f(self: "C"):
+        def b(x: Self):
+            reveal_type(x)  # revealed: Self@f
+        reveal_type(generic_context(b))  # revealed: None
+
+reveal_type(generic_context(C.f))  # revealed: None
+```
+
+## Non-positional first parameters
+
+This makes sure that we don't bind `self` if it's not a positional parameter:
+
+```py
+from ty_extensions import CallableTypeOf
+
+class C:
+    def method(*args, **kwargs) -> None: ...
+
+def _(c: CallableTypeOf[C().method]):
+    reveal_type(c)  # revealed: (...) -> None
+```
+
 [self attribute]: https://typing.python.org/en/latest/spec/generics.html#use-in-attribute-annotations
diff --git a/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md b/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md
index 3b10945df9..8a6f499655 100644
--- a/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md
@@ -28,6 +28,23 @@ def i(callback: Callable[Concatenate[int, P], R_co], *args: P.args, **kwargs: P.
 class Foo:
     def method(self, x: Self):
         reveal_type(x)  # revealed: Self@method
+
+def ex2(msg: str):
+    def wrapper(fn: Callable[P, R_co]) -> Callable[P, R_co]:
+        def wrapped(*args: P.args, **kwargs: P.kwargs) -> R_co:
+            print(msg)
+            return fn(*args, **kwargs)
+        return wrapped
+    return wrapper
+
+def ex3(msg: str):
+    P = ParamSpec("P")
+    def wrapper(fn: Callable[P, R_co]) -> Callable[P, R_co]:
+        def wrapped(*args: P.args, **kwargs: P.kwargs) -> R_co:
+            print(msg)
+            return fn(*args, **kwargs)
+        return wrapped
+    return wrapper
 ```
 
 ## Type expressions
diff --git a/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_type_qualifiers.md b/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_type_qualifiers.md
index 271b6fd014..1c02eac9f0 100644
--- a/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_type_qualifiers.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/unsupported_type_qualifiers.md
@@ -6,14 +6,12 @@ Several type qualifiers are unsupported by ty currently. However, we also don't
 errors if you use one in an annotation:
 
 ```py
-from typing_extensions import Final, Required, NotRequired, ReadOnly, TypedDict
+from typing_extensions import Final, ReadOnly, TypedDict
 
 X: Final = 42
 Y: Final[int] = 42
 
 class Bar(TypedDict):
-    x: Required[int]
-    y: NotRequired[str]
     z: ReadOnly[bytes]
 ```
 
@@ -25,23 +23,16 @@ One thing that is supported is error messages for using type qualifiers in type
 from typing_extensions import Final, ClassVar, Required, NotRequired, ReadOnly
 
 def _(
-    a: (
-        Final  # error: [invalid-type-form] "Type qualifier `typing.Final` is not allowed in type expressions (only in annotation expressions)"
-        | int
-    ),
-    b: (
-        ClassVar  # error: [invalid-type-form] "Type qualifier `typing.ClassVar` is not allowed in type expressions (only in annotation expressions)"
-        | int
-    ),
-    c: Required,  # error: [invalid-type-form] "Type qualifier `typing.Required` is not allowed in type expressions (only in annotation expressions, and only with exactly one argument)"
-    d: NotRequired,  # error: [invalid-type-form] "Type qualifier `typing.NotRequired` is not allowed in type expressions (only in annotation expressions, and only with exactly one argument)"
-    e: ReadOnly,  # error: [invalid-type-form] "Type qualifier `typing.ReadOnly` is not allowed in type expressions (only in annotation expressions, and only with exactly one argument)"
+    # error: [invalid-type-form] "Type qualifier `typing.Final` is not allowed in type expressions (only in annotation expressions)"
+    a: Final | int,
+    # error: [invalid-type-form] "Type qualifier `typing.ClassVar` is not allowed in type expressions (only in annotation expressions)"
+    b: ClassVar | int,
+    # error: [invalid-type-form] "Type qualifier `typing.ReadOnly` is not allowed in type expressions (only in annotation expressions, and only with exactly one argument)"
+    c: ReadOnly | int,
 ) -> None:
     reveal_type(a)  # revealed: Unknown | int
     reveal_type(b)  # revealed: Unknown | int
-    reveal_type(c)  # revealed: Unknown
-    reveal_type(d)  # revealed: Unknown
-    reveal_type(e)  # revealed: Unknown
+    reveal_type(c)  # revealed: Unknown | int
 ```
 
 ## Inheritance
@@ -53,7 +44,5 @@ from typing_extensions import Final, ClassVar, Required, NotRequired, ReadOnly
 
 class A(Final): ...  # error: [invalid-base]
 class B(ClassVar): ...  # error: [invalid-base]
-class C(Required): ...  # error: [invalid-base]
-class D(NotRequired): ...  # error: [invalid-base]
-class E(ReadOnly): ...  # error: [invalid-base]
+class C(ReadOnly): ...  # error: [invalid-base]
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/assignment/annotations.md b/crates/ty_python_semantic/resources/mdtest/assignment/annotations.md
index f28e68c0d9..adf0de358d 100644
--- a/crates/ty_python_semantic/resources/mdtest/assignment/annotations.md
+++ b/crates/ty_python_semantic/resources/mdtest/assignment/annotations.md
@@ -75,10 +75,241 @@ a: tuple[()] = (1, 2)
 # error: [invalid-assignment] "Object of type `tuple[Literal["foo"]]` is not assignable to `tuple[int]`"
 b: tuple[int] = ("foo",)
 
-# error: [invalid-assignment] "Object of type `tuple[list[Unknown], Literal["foo"]]` is not assignable to `tuple[str | int, str]`"
+# error: [invalid-assignment]
 c: tuple[str | int, str] = ([], "foo")
 ```
 
+## Collection literal annotations are understood
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+import typing
+
+a: list[int] = [1, 2, 3]
+reveal_type(a)  # revealed: list[int]
+
+b: list[int | str] = [1, 2, 3]
+reveal_type(b)  # revealed: list[int | str]
+
+c: typing.List[int] = [1, 2, 3]
+reveal_type(c)  # revealed: list[int]
+
+d: list[typing.Any] = []
+reveal_type(d)  # revealed: list[Any]
+
+e: set[int] = {1, 2, 3}
+reveal_type(e)  # revealed: set[int]
+
+f: set[int | str] = {1, 2, 3}
+reveal_type(f)  # revealed: set[int | str]
+
+g: typing.Set[int] = {1, 2, 3}
+reveal_type(g)  # revealed: set[int]
+
+h: list[list[int]] = [[], [42]]
+reveal_type(h)  # revealed: list[list[int]]
+
+i: list[typing.Any] = [1, 2, "3", ([4],)]
+reveal_type(i)  # revealed: list[Any]
+
+j: list[tuple[str | int, ...]] = [(1, 2), ("foo", "bar"), ()]
+reveal_type(j)  # revealed: list[tuple[str | int, ...]]
+
+k: list[tuple[list[int], ...]] = [([],), ([1, 2], [3, 4]), ([5], [6], [7])]
+reveal_type(k)  # revealed: list[tuple[list[int], ...]]
+
+l: tuple[list[int], *tuple[list[typing.Any], ...], list[str]] = ([1, 2, 3], [4, 5, 6], [7, 8, 9], ["10", "11", "12"])
+reveal_type(l)  # revealed: tuple[list[int], list[Any], list[Any], list[str]]
+
+type IntList = list[int]
+
+m: IntList = [1, 2, 3]
+reveal_type(m)  # revealed: list[int]
+
+n: list[typing.Literal[1, 2, 3]] = [1, 2, 3]
+reveal_type(n)  # revealed: list[Literal[1, 2, 3]]
+
+o: list[typing.LiteralString] = ["a", "b", "c"]
+reveal_type(o)  # revealed: list[LiteralString]
+
+p: dict[int, int] = {}
+reveal_type(p)  # revealed: dict[int, int]
+
+q: dict[int | str, int] = {1: 1, 2: 2, 3: 3}
+reveal_type(q)  # revealed: dict[int | str, int]
+
+r: dict[int | str, int | str] = {1: 1, 2: 2, 3: 3}
+reveal_type(r)  # revealed: dict[int | str, int | str]
+
+s: dict[int | str, int | str]
+s = {1: 1, 2: 2, 3: 3}
+reveal_type(s)  # revealed: dict[int | str, int | str]
+(s := {1: 1, 2: 2, 3: 3})
+reveal_type(s)  # revealed: dict[int | str, int | str]
+```
+
+## Optional collection literal annotations are understood
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+import typing
+
+a: list[int] | None = [1, 2, 3]
+reveal_type(a)  # revealed: list[int]
+
+b: list[int | str] | None = [1, 2, 3]
+reveal_type(b)  # revealed: list[int | str]
+
+c: typing.List[int] | None = [1, 2, 3]
+reveal_type(c)  # revealed: list[int]
+
+d: list[typing.Any] | None = []
+reveal_type(d)  # revealed: list[Any]
+
+e: set[int] | None = {1, 2, 3}
+reveal_type(e)  # revealed: set[int]
+
+f: set[int | str] | None = {1, 2, 3}
+reveal_type(f)  # revealed: set[int | str]
+
+g: typing.Set[int] | None = {1, 2, 3}
+reveal_type(g)  # revealed: set[int]
+
+h: list[list[int]] | None = [[], [42]]
+reveal_type(h)  # revealed: list[list[int]]
+
+i: list[typing.Any] | None = [1, 2, "3", ([4],)]
+reveal_type(i)  # revealed: list[Any]
+
+j: list[tuple[str | int, ...]] | None = [(1, 2), ("foo", "bar"), ()]
+reveal_type(j)  # revealed: list[tuple[str | int, ...]]
+
+k: list[tuple[list[int], ...]] | None = [([],), ([1, 2], [3, 4]), ([5], [6], [7])]
+reveal_type(k)  # revealed: list[tuple[list[int], ...]]
+
+l: tuple[list[int], *tuple[list[typing.Any], ...], list[str]] | None = ([1, 2, 3], [4, 5, 6], [7, 8, 9], ["10", "11", "12"])
+reveal_type(l)  # revealed: tuple[list[int], list[Any], list[Any], list[str]]
+
+type IntList = list[int]
+
+m: IntList | None = [1, 2, 3]
+reveal_type(m)  # revealed: list[int]
+
+n: list[typing.Literal[1, 2, 3]] | None = [1, 2, 3]
+reveal_type(n)  # revealed: list[Literal[1, 2, 3]]
+
+o: list[typing.LiteralString] | None = ["a", "b", "c"]
+reveal_type(o)  # revealed: list[LiteralString]
+
+p: dict[int, int] | None = {}
+reveal_type(p)  # revealed: dict[int, int]
+
+q: dict[int | str, int] | None = {1: 1, 2: 2, 3: 3}
+reveal_type(q)  # revealed: dict[int | str, int]
+
+r: dict[int | str, int | str] | None = {1: 1, 2: 2, 3: 3}
+reveal_type(r)  # revealed: dict[int | str, int | str]
+```
+
+## Incorrect collection literal assignments are complained about
+
+```py
+# error: [invalid-assignment] "Object of type `list[Unknown | int]` is not assignable to `list[str]`"
+a: list[str] = [1, 2, 3]
+
+# error: [invalid-assignment] "Object of type `set[Unknown | int | str]` is not assignable to `set[int]`"
+b: set[int] = {1, 2, "3"}
+```
+
+## Literal annnotations are respected
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from enum import Enum
+from typing_extensions import Literal, LiteralString
+
+a: list[Literal[1]] = [1]
+reveal_type(a)  # revealed: list[Literal[1]]
+
+b: list[Literal[True]] = [True]
+reveal_type(b)  # revealed: list[Literal[True]]
+
+c: list[Literal["a"]] = ["a"]
+reveal_type(c)  # revealed: list[Literal["a"]]
+
+d: list[LiteralString] = ["a", "b", "c"]
+reveal_type(d)  # revealed: list[LiteralString]
+
+e: list[list[Literal[1]]] = [[1]]
+reveal_type(e)  # revealed: list[list[Literal[1]]]
+
+class Color(Enum):
+    RED = "red"
+
+f: dict[list[Literal[1]], list[Literal[Color.RED]]] = {[1]: [Color.RED, Color.RED]}
+reveal_type(f)  # revealed: dict[list[Literal[1]], list[Literal[Color.RED]]]
+
+class X[T]:
+    def __init__(self, value: T): ...
+
+g: X[Literal[1]] = X(1)
+reveal_type(g)  # revealed: X[Literal[1]]
+
+h: X[int] = X(1)
+reveal_type(h)  # revealed: X[int]
+
+i: dict[list[X[Literal[1]]], set[Literal[b"a"]]] = {[X(1)]: {b"a"}}
+reveal_type(i)  # revealed: dict[list[X[Literal[1]]], set[Literal[b"a"]]]
+
+j: list[Literal[1, 2, 3]] = [1, 2, 3]
+reveal_type(j)  # revealed: list[Literal[1, 2, 3]]
+
+k: list[Literal[1] | Literal[2] | Literal[3]] = [1, 2, 3]
+reveal_type(k)  # revealed: list[Literal[1, 2, 3]]
+
+type Y[T] = list[T]
+
+l: Y[Y[Literal[1]]] = [[1]]
+reveal_type(l)  # revealed: list[Y[Literal[1]]]
+
+m: list[tuple[Literal[1], Literal[2], Literal[3]]] = [(1, 2, 3)]
+reveal_type(m)  # revealed: list[tuple[Literal[1], Literal[2], Literal[3]]]
+
+n: list[tuple[int, str, int]] = [(1, "2", 3), (4, "5", 6)]
+reveal_type(n)  # revealed: list[tuple[int, str, int]]
+
+o: list[tuple[Literal[1], ...]] = [(1, 1, 1)]
+reveal_type(o)  # revealed: list[tuple[Literal[1], ...]]
+
+p: list[tuple[int, ...]] = [(1, 1, 1)]
+reveal_type(p)  # revealed: list[tuple[int, ...]]
+
+# literal promotion occurs based on assignability, an exact match is not required
+q: list[int | Literal[1]] = [1]
+reveal_type(q)  # revealed: list[int]
+
+r: list[Literal[1, 2, 3, 4]] = [1, 2]
+reveal_type(r)  # revealed: list[Literal[1, 2, 3, 4]]
+
+s: list[Literal[1]]
+s = [1]
+reveal_type(s)  # revealed: list[Literal[1]]
+(s := [1])
+reveal_type(s)  # revealed: list[Literal[1]]
+```
+
 ## PEP-604 annotations are supported
 
 ```py
@@ -156,9 +387,111 @@ x = Foo()
 reveal_type(x)  # revealed: Foo
 ```
 
+## Annotations are deferred by default in Python 3.14 and later
+
+```toml
+[environment]
+python-version = "3.14"
+```
+
+```py
+x: Foo
+
+class Foo: ...
+
+x = Foo()
+reveal_type(x)  # revealed: Foo
+```
+
 ## Annotated assignments in stub files are inferred correctly
 
 ```pyi
 x: int = 1
 reveal_type(x) # revealed: Literal[1]
 ```
+
+## Annotations influence generic call inference
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import Literal
+
+def f[T](x: T) -> list[T]:
+    return [x]
+
+a = f("a")
+reveal_type(a)  # revealed: list[Literal["a"]]
+
+b: list[int | Literal["a"]] = f("a")
+reveal_type(b)  # revealed: list[Literal["a"] | int]
+
+c: list[int | str] = f("a")
+reveal_type(c)  # revealed: list[str | int]
+
+d: list[int | tuple[int, int]] = f((1, 2))
+# TODO: We could avoid reordering the union elements here.
+reveal_type(d)  # revealed: list[tuple[int, int] | int]
+
+e: list[int] = f(True)
+reveal_type(e)  # revealed: list[int]
+
+# error: [invalid-assignment] "Object of type `list[Literal["a"]]` is not assignable to `list[int]`"
+g: list[int] = f("a")
+
+# error: [invalid-assignment] "Object of type `list[Literal["a"]]` is not assignable to `tuple[int]`"
+h: tuple[int] = f("a")
+
+def f2[T: int](x: T) -> T:
+    return x
+
+i: int = f2(True)
+reveal_type(i)  # revealed: Literal[True]
+
+j: int | str = f2(True)
+reveal_type(j)  # revealed: Literal[True]
+```
+
+Types are not widened unnecessarily:
+
+```py
+def id[T](x: T) -> T:
+    return x
+
+def lst[T](x: T) -> list[T]:
+    return [x]
+
+def _(i: int):
+    a: int | None = i
+    b: int | None = id(i)
+    c: int | str | None = id(i)
+    reveal_type(a)  # revealed: int
+    reveal_type(b)  # revealed: int
+    reveal_type(c)  # revealed: int
+
+    a: list[int | None] | None = [i]
+    b: list[int | None] | None = id([i])
+    c: list[int | None] | int | None = id([i])
+    reveal_type(a)  # revealed: list[int | None]
+    # TODO: these should reveal `list[int | None]`
+    # we currently do not use the call expression annotation as type context for argument inference
+    reveal_type(b)  # revealed: list[Unknown | int]
+    reveal_type(c)  # revealed: list[Unknown | int]
+
+    a: list[int | None] | None = [i]
+    b: list[int | None] | None = lst(i)
+    c: list[int | None] | int | None = lst(i)
+    reveal_type(a)  # revealed: list[int | None]
+    reveal_type(b)  # revealed: list[int | None]
+    reveal_type(c)  # revealed: list[int | None]
+
+    a: list | None = []
+    b: list | None = id([])
+    c: list | int | None = id([])
+    reveal_type(a)  # revealed: list[Unknown]
+    reveal_type(b)  # revealed: list[Unknown]
+    reveal_type(c)  # revealed: list[Unknown]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/attributes.md b/crates/ty_python_semantic/resources/mdtest/attributes.md
index 2afe8617ac..82d7f0c57b 100644
--- a/crates/ty_python_semantic/resources/mdtest/attributes.md
+++ b/crates/ty_python_semantic/resources/mdtest/attributes.md
@@ -26,9 +26,7 @@ class C:
 c_instance = C(1)
 
 reveal_type(c_instance.inferred_from_value)  # revealed: Unknown | Literal[1, "a"]
-
-# TODO: Same here. This should be `Unknown | Literal[1, "a"]`
-reveal_type(c_instance.inferred_from_other_attribute)  # revealed: Unknown
+reveal_type(c_instance.inferred_from_other_attribute)  # revealed: Unknown | Literal[1, "a"]
 
 # There is no special handling of attributes that are (directly) assigned to a declared parameter,
 # which means we union with `Unknown` here, since the attribute itself is not declared. This is
@@ -177,8 +175,7 @@ c_instance = C(1)
 
 reveal_type(c_instance.inferred_from_value)  # revealed: Unknown | Literal[1, "a"]
 
-# TODO: Should be `Unknown | Literal[1, "a"]`
-reveal_type(c_instance.inferred_from_other_attribute)  # revealed: Unknown
+reveal_type(c_instance.inferred_from_other_attribute)  # revealed: Unknown | Literal[1, "a"]
 
 reveal_type(c_instance.inferred_from_param)  # revealed: Unknown | int | None
 
@@ -399,9 +396,19 @@ class TupleIterable:
 
 class C:
     def __init__(self) -> None:
+        # TODO: Should not emit this diagnostic
+        # error: [unresolved-attribute]
         [... for self.a in IntIterable()]
+        # TODO: Should not emit this diagnostic
+        # error: [unresolved-attribute]
+        # error: [unresolved-attribute]
         [... for (self.b, self.c) in TupleIterable()]
+        # TODO: Should not emit this diagnostic
+        # error: [unresolved-attribute]
+        # error: [unresolved-attribute]
         [... for self.d in IntIterable() for self.e in IntIterable()]
+        # TODO: Should not emit this diagnostic
+        # error: [unresolved-attribute]
         [[... for self.f in IntIterable()] for _ in IntIterable()]
         [[... for self.g in IntIterable()] for self in [D()]]
 
@@ -571,8 +578,8 @@ class C:
         if (2 + 3) < 4:
             self.x: str = "a"
 
-# error: [unresolved-attribute]
-reveal_type(C().x)  # revealed: Unknown
+# TODO: this would ideally raise an `unresolved-attribute` error
+reveal_type(C().x)  # revealed: str
 ```
 
 ```py
@@ -598,11 +605,14 @@ class C:
         self.c = c
     if False:
         def set_e(self, e: str) -> None:
+            # TODO: Should not emit this diagnostic
+            # error: [unresolved-attribute]
             self.e = e
 
-reveal_type(C(True).a)  # revealed: Unknown | Literal[1]
-# error: [unresolved-attribute]
-reveal_type(C(True).b)  # revealed: Unknown
+# TODO: this would ideally be `Unknown | Literal[1]`
+reveal_type(C(True).a)  # revealed: Unknown | Literal[1, "a"]
+# TODO: this would ideally raise an `unresolved-attribute` error
+reveal_type(C(True).b)  # revealed: Unknown | Literal[2]
 reveal_type(C(True).c)  # revealed: Unknown | Literal[3] | str
 # Ideally, this would just be `Unknown | Literal[5]`, but we currently do not
 # attempt to analyze control flow within methods more closely. All reachable
@@ -684,7 +694,7 @@ class C:
     pure_class_variable2: ClassVar = 1
 
     def method(self):
-        # TODO: this should be an error
+        # error: [invalid-attribute-access] "Cannot assign to ClassVar `pure_class_variable1` from an instance of type `Self@method`"
         self.pure_class_variable1 = "value set through instance"
 
 reveal_type(C.pure_class_variable1)  # revealed: str
@@ -819,22 +829,34 @@ reveal_type(C().c)  # revealed: int
 
 ### Inheritance of class/instance attributes
 
-#### Instance variable defined in a base class
-
 ```py
 class Base:
-    declared_in_body: int | None = 1
+    attribute: int | None = 1
 
-    base_class_attribute_1: str | None
-    base_class_attribute_2: str | None
-    base_class_attribute_3: str | None
+    redeclared_with_same_type: str | None
+    redeclared_with_narrower_type: str | None
+    redeclared_with_wider_type: str | None
+
+    redeclared_in_method_with_same_type: str | None
+    redeclared_in_method_with_narrower_type: str | None
+    redeclared_in_method_with_wider_type: str | None
+
+    overwritten_in_subclass_body: str
+    overwritten_in_subclass_method: str
+
+    undeclared = "base"
 
     def __init__(self) -> None:
-        self.defined_in_init: str | None = "value in base"
+        self.pure_attribute: str | None = "value in base"
+
+        self.pure_overwritten_in_subclass_body: str = "value in base"
+        self.pure_overwritten_in_subclass_method: str = "value in base"
+
+        self.pure_undeclared = "base"
 
 class Intermediate(Base):
     # Redeclaring base class attributes with the *same *type is fine:
-    base_class_attribute_1: str | None = None
+    redeclared_with_same_type: str | None = None
 
     # Redeclaring them with a *narrower type* is unsound, because modifications
     # through a `Base` reference could violate that constraint.
@@ -846,22 +868,88 @@ class Intermediate(Base):
     # enabled by default can still be discussed.
     #
     # TODO: This should be an error
-    base_class_attribute_2: str
+    redeclared_with_narrower_type: str
 
     # Redeclaring attributes with a *wider type* directly violates LSP.
     #
     # In this case, both mypy and pyright report an error.
     #
     # TODO: This should be an error
-    base_class_attribute_3: str | int | None
+    redeclared_with_wider_type: str | int | None
+
+    # TODO: This should be an `invalid-assignment` error
+    overwritten_in_subclass_body = None
+
+    # TODO: This should be an `invalid-assignment` error
+    pure_overwritten_in_subclass_body = None
+
+    undeclared = "intermediate"
+
+    def set_attributes(self) -> None:
+        self.redeclared_in_method_with_same_type: str | None = None
+
+        # TODO: This should be an error (violates Liskov)
+        self.redeclared_in_method_with_narrower_type: str = "foo"
+
+        # TODO: This should be an error (violates Liskov)
+        self.redeclared_in_method_with_wider_type: object = object()
+
+        self.overwritten_in_subclass_method = None  # error: [invalid-assignment]
+
+        self.pure_overwritten_in_subclass_method = None  # error: [invalid-assignment]
+
+        self.pure_undeclared = "intermediate"
 
 class Derived(Intermediate): ...
 
-reveal_type(Derived.declared_in_body)  # revealed: int | None
+reveal_type(Derived.attribute)  # revealed: int | None
+reveal_type(Derived().attribute)  # revealed: int | None
 
-reveal_type(Derived().declared_in_body)  # revealed: int | None
+reveal_type(Derived.redeclared_with_same_type)  # revealed: str | None
+reveal_type(Derived().redeclared_with_same_type)  # revealed: str | None
 
-reveal_type(Derived().defined_in_init)  # revealed: str | None
+# We infer the narrower type here, despite the Liskov violation,
+# for compatibility with other type checkers (and to reflect the clear user intent)
+reveal_type(Derived.redeclared_with_narrower_type)  # revealed: str
+reveal_type(Derived().redeclared_with_narrower_type)  # revealed: str
+
+# We infer the wider type here, despite the Liskov violation,
+# for compatibility with other type checkers (and to reflect the clear user intent)
+reveal_type(Derived.redeclared_with_wider_type)  # revealed: str | int | None
+reveal_type(Derived().redeclared_with_wider_type)  # revealed: str | int | None
+
+# TODO: Both of these should be `str`
+reveal_type(Derived.overwritten_in_subclass_body)  # revealed: Unknown | None
+reveal_type(Derived().overwritten_in_subclass_body)  # revealed: Unknown | None | str
+
+reveal_type(Derived.redeclared_in_method_with_same_type)  # revealed: str | None
+reveal_type(Derived().redeclared_in_method_with_same_type)  # revealed: str | None
+
+# TODO: both of these should be `str`, despite the Liskov violation,
+# for compatibility with other type checkers (and to reflect the clear user intent)
+reveal_type(Derived.redeclared_in_method_with_narrower_type)  # revealed: str | None
+reveal_type(Derived().redeclared_in_method_with_narrower_type)  # revealed: str | None
+
+# TODO: both of these should be `object`, despite the Liskov violation,
+# for compatibility with other type checkers (and to reflect the clear user intent)
+reveal_type(Derived.redeclared_in_method_with_wider_type)  # revealed: str | None
+reveal_type(Derived().redeclared_in_method_with_wider_type)  # revealed: object
+
+reveal_type(Derived.overwritten_in_subclass_method)  # revealed: str
+reveal_type(Derived().overwritten_in_subclass_method)  # revealed: str
+
+reveal_type(Derived().pure_attribute)  # revealed: str | None
+
+# TODO: This should be `str`
+reveal_type(Derived().pure_overwritten_in_subclass_body)  # revealed: Unknown | None | str
+
+reveal_type(Derived().pure_overwritten_in_subclass_method)  # revealed: str
+
+# TODO: Both of these should be `Unknown | Literal["intermediate", "base"]`
+reveal_type(Derived.undeclared)  # revealed: Unknown | Literal["intermediate"]
+reveal_type(Derived().undeclared)  # revealed: Unknown | Literal["intermediate"]
+
+reveal_type(Derived().pure_undeclared)  # revealed: Unknown | Literal["intermediate", "base"]
 ```
 
 ## Accessing attributes on class objects
@@ -913,7 +1001,7 @@ def _(flag: bool):
     reveal_type(C3.attr2)  # revealed: Literal["metaclass value", "class value"]
 ```
 
-If the *metaclass* attribute is only partially defined, we emit a `possibly-unbound-attribute`
+If the *metaclass* attribute is only partially defined, we emit a `possibly-missing-attribute`
 diagnostic:
 
 ```py
@@ -923,12 +1011,12 @@ def _(flag: bool):
             attr1: str = "metaclass value"
 
     class C4(metaclass=Meta4): ...
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(C4.attr1)  # revealed: str
 ```
 
 Finally, if both the metaclass attribute and the class-level attribute are only partially defined,
-we union them and emit a `possibly-unbound-attribute` diagnostic:
+we union them and emit a `possibly-missing-attribute` diagnostic:
 
 ```py
 def _(flag1: bool, flag2: bool):
@@ -940,7 +1028,7 @@ def _(flag1: bool, flag2: bool):
         if flag2:
             attr1 = "class value"
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(C5.attr1)  # revealed: Unknown | Literal["metaclass value", "class value"]
 ```
 
@@ -1179,13 +1267,13 @@ def _(flag1: bool, flag2: bool):
 
     C = C1 if flag1 else C2 if flag2 else C3
 
-    # error: [possibly-unbound-attribute] "Attribute `x` on type `<class 'C1'> | <class 'C2'> | <class 'C3'>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `x` may be missing on object of type `<class 'C1'> | <class 'C2'> | <class 'C3'>`"
     reveal_type(C.x)  # revealed: Unknown | Literal[1, 3]
 
     # error: [invalid-assignment] "Object of type `Literal[100]` is not assignable to attribute `x` on type `<class 'C1'> | <class 'C2'> | <class 'C3'>`"
     C.x = 100
 
-    # error: [possibly-unbound-attribute] "Attribute `x` on type `C1 | C2 | C3` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `x` may be missing on object of type `C1 | C2 | C3`"
     reveal_type(C().x)  # revealed: Unknown | Literal[1, 3]
 
     # error: [invalid-assignment] "Object of type `Literal[100]` is not assignable to attribute `x` on type `C1 | C2 | C3`"
@@ -1211,18 +1299,18 @@ def _(flag: bool, flag1: bool, flag2: bool):
 
     C = C1 if flag1 else C2 if flag2 else C3
 
-    # error: [possibly-unbound-attribute] "Attribute `x` on type `<class 'C1'> | <class 'C2'> | <class 'C3'>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `x` may be missing on object of type `<class 'C1'> | <class 'C2'> | <class 'C3'>`"
     reveal_type(C.x)  # revealed: Unknown | Literal[1, 2, 3]
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     C.x = 100
 
-    # Note: we might want to consider ignoring possibly-unbound diagnostics for instance attributes eventually,
+    # Note: we might want to consider ignoring possibly-missing diagnostics for instance attributes eventually,
     # see the "Possibly unbound/undeclared instance attribute" section below.
-    # error: [possibly-unbound-attribute] "Attribute `x` on type `C1 | C2 | C3` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `x` may be missing on object of type `C1 | C2 | C3`"
     reveal_type(C().x)  # revealed: Unknown | Literal[1, 2, 3]
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     C().x = 100
 ```
 
@@ -1286,16 +1374,16 @@ def _(flag: bool):
         if flag:
             x = 2
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(Bar.x)  # revealed: Unknown | Literal[2, 1]
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     Bar.x = 3
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(Bar().x)  # revealed: Unknown | Literal[2, 1]
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     Bar().x = 3
 ```
 
@@ -1303,7 +1391,7 @@ def _(flag: bool):
 
 We currently treat implicit instance attributes to be bound, even if they are only conditionally
 defined within a method. If the class-level definition or the whole method is only conditionally
-available, we emit a `possibly-unbound-attribute` diagnostic.
+available, we emit a `possibly-missing-attribute` diagnostic.
 
 #### Possibly unbound and undeclared
 
@@ -1352,7 +1440,7 @@ def _(flag: bool):
     class C2: ...
     C = C1 if flag else C2
 
-    # error: [unresolved-attribute] "Type `<class 'C1'> | <class 'C2'>` has no attribute `x`"
+    # error: [unresolved-attribute] "Object of type `<class 'C1'> | <class 'C2'>` has no attribute `x`"
     reveal_type(C.x)  # revealed: Unknown
 
     # TODO: This should ideally be a `unresolved-attribute` error. We need better union
@@ -1483,17 +1571,17 @@ def _(flag: bool):
     class B1: ...
 
     def inner1(a_and_b: Intersection[A1, B1]):
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         reveal_type(a_and_b.x)  # revealed: P
 
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         a_and_b.x = R()
     # Same for class objects
     def inner1_class(a_and_b: Intersection[type[A1], type[B1]]):
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         reveal_type(a_and_b.x)  # revealed: P
 
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         a_and_b.x = R()
 
     class A2:
@@ -1508,7 +1596,7 @@ def _(flag: bool):
 
         # TODO: this should not be an error, we need better intersection
         # handling in `validate_attribute_assignment` for this
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         a_and_b.x = R()
     # Same for class objects
     def inner2_class(a_and_b: Intersection[type[A2], type[B1]]):
@@ -1523,17 +1611,17 @@ def _(flag: bool):
             x: Q = Q()
 
     def inner3(a_and_b: Intersection[A3, B3]):
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         reveal_type(a_and_b.x)  # revealed: P & Q
 
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         a_and_b.x = R()
     # Same for class objects
     def inner3_class(a_and_b: Intersection[type[A3], type[B3]]):
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         reveal_type(a_and_b.x)  # revealed: P & Q
 
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         a_and_b.x = R()
 
     class A4: ...
@@ -1648,7 +1736,7 @@ If an attribute is defined on the class, it takes precedence over the `__getattr
 reveal_type(c.class_attr)  # revealed: int
 ```
 
-If the class attribute is possibly unbound, we union the type of the attribute with the fallback
+If the class attribute is possibly missing, we union the type of the attribute with the fallback
 type of the `__getattr__` method:
 
 ```py
@@ -1690,7 +1778,7 @@ reveal_type(date.day)  # revealed: int
 reveal_type(date.month)  # revealed: int
 reveal_type(date.year)  # revealed: int
 
-# error: [unresolved-attribute] "Type `Date` has no attribute `century`"
+# error: [unresolved-attribute] "Object of type `Date` has no attribute `century`"
 reveal_type(date.century)  # revealed: Unknown
 ```
 
@@ -1758,6 +1846,7 @@ def external_getattribute(name) -> int:
 
 class ThisFails:
     def __init__(self):
+        # error: [invalid-assignment] "Implicit shadowing of function `__getattribute__`"
         self.__getattribute__ = external_getattribute
 
 # error: [unresolved-attribute]
@@ -2056,8 +2145,13 @@ reveal_type(f.__kwdefaults__)  # revealed: dict[str, Any] | None
 Some attributes are special-cased, however:
 
 ```py
+import types
+from ty_extensions import static_assert, TypeOf, is_subtype_of
+
 reveal_type(f.__get__)  # revealed: <method-wrapper `__get__` of `f`>
 reveal_type(f.__call__)  # revealed: <method-wrapper `__call__` of `f`>
+static_assert(is_subtype_of(TypeOf[f.__get__], types.MethodWrapperType))
+static_assert(is_subtype_of(TypeOf[f.__call__], types.MethodWrapperType))
 ```
 
 ### Int-literal attributes
@@ -2103,7 +2197,7 @@ All attribute access on literal `bytes` types is currently delegated to `builtin
 ```py
 # revealed: bound method Literal[b"foo"].join(iterable_of_bytes: Iterable[@Todo(Support for `typing.TypeAlias`)], /) -> bytes
 reveal_type(b"foo".join)
-# revealed: bound method Literal[b"foo"].endswith(suffix: @Todo(Support for `typing.TypeAlias`) | tuple[@Todo(Support for `typing.TypeAlias`), ...], start: SupportsIndex | None = ellipsis, end: SupportsIndex | None = ellipsis, /) -> bool
+# revealed: bound method Literal[b"foo"].endswith(suffix: @Todo(Support for `typing.TypeAlias`) | tuple[@Todo(Support for `typing.TypeAlias`), ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> bool
 reveal_type(b"foo".endswith)
 ```
 
@@ -2277,6 +2371,55 @@ reveal_type(B().x)  # revealed: Unknown | Literal[1]
 reveal_type(A().x)  # revealed: Unknown | Literal[1]
 ```
 
+And cycles between many attributes:
+
+```py
+class ManyCycles:
+    def __init__(self: "ManyCycles"):
+        self.x1 = 0
+        self.x2 = 0
+        self.x3 = 0
+        self.x4 = 0
+        self.x5 = 0
+        self.x6 = 0
+        self.x7 = 1
+
+    def f1(self: "ManyCycles"):
+        self.x1 = self.x2 + self.x3 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x2 = self.x1 + self.x3 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x3 = self.x1 + self.x2 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x4 = self.x1 + self.x2 + self.x3 + self.x5 + self.x6 + self.x7
+        self.x5 = self.x1 + self.x2 + self.x3 + self.x4 + self.x6 + self.x7
+        self.x6 = self.x1 + self.x2 + self.x3 + self.x4 + self.x5 + self.x7
+        self.x7 = self.x1 + self.x2 + self.x3 + self.x4 + self.x5 + self.x6
+
+    def f2(self: "ManyCycles"):
+        self.x1 = self.x2 + self.x3 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x2 = self.x1 + self.x3 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x3 = self.x1 + self.x2 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x4 = self.x1 + self.x2 + self.x3 + self.x5 + self.x6 + self.x7
+        self.x5 = self.x1 + self.x2 + self.x3 + self.x4 + self.x6 + self.x7
+        self.x6 = self.x1 + self.x2 + self.x3 + self.x4 + self.x5 + self.x7
+        self.x7 = self.x1 + self.x2 + self.x3 + self.x4 + self.x5 + self.x6
+
+    def f3(self: "ManyCycles"):
+        self.x1 = self.x2 + self.x3 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x2 = self.x1 + self.x3 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x3 = self.x1 + self.x2 + self.x4 + self.x5 + self.x6 + self.x7
+        self.x4 = self.x1 + self.x2 + self.x3 + self.x5 + self.x6 + self.x7
+        self.x5 = self.x1 + self.x2 + self.x3 + self.x4 + self.x6 + self.x7
+        self.x6 = self.x1 + self.x2 + self.x3 + self.x4 + self.x5 + self.x7
+        self.x7 = self.x1 + self.x2 + self.x3 + self.x4 + self.x5 + self.x6
+
+        reveal_type(self.x1)  # revealed: Unknown | int
+        reveal_type(self.x2)  # revealed: Unknown | int
+        reveal_type(self.x3)  # revealed: Unknown | int
+        reveal_type(self.x4)  # revealed: Unknown | int
+        reveal_type(self.x5)  # revealed: Unknown | int
+        reveal_type(self.x6)  # revealed: Unknown | int
+        reveal_type(self.x7)  # revealed: Unknown | int
+```
+
 This case additionally tests our union/intersection simplification logic:
 
 ```py
@@ -2288,6 +2431,79 @@ class H:
         self.x = other.x or self.x
 ```
 
+An attribute definition can be guarded by a condition involving that attribute. This is a regression
+test for <https://github.com/astral-sh/ty/issues/692>:
+
+```py
+from typing import Literal
+
+def check(x) -> Literal[False]:
+    return False
+
+class Toggle:
+    def __init__(self: "Toggle"):
+        if not self.x:
+            self.x: Literal[True] = True
+        if check(self.y):
+            self.y = True
+
+reveal_type(Toggle().x)  # revealed: Literal[True]
+reveal_type(Toggle().y)  # revealed:  Unknown | Literal[True]
+```
+
+Make sure that the growing union of literals `Literal[0, 1, 2, ...]` collapses to `int` during
+fixpoint iteration. This is a regression test for <https://github.com/astral-sh/ty/issues/660>.
+
+```py
+class Counter:
+    def __init__(self: "Counter"):
+        self.count = 0
+
+    def increment(self: "Counter"):
+        self.count = self.count + 1
+
+reveal_type(Counter().count)  # revealed: Unknown | int
+```
+
+We also handle infinitely nested generics:
+
+```py
+class NestedLists:
+    def __init__(self: "NestedLists"):
+        self.x = 1
+
+    def f(self: "NestedLists"):
+        self.x = [self.x]
+
+reveal_type(NestedLists().x)  # revealed: Unknown | Literal[1] | list[Divergent]
+
+class NestedMixed:
+    def f(self: "NestedMixed"):
+        self.x = [self.x]
+
+    def g(self: "NestedMixed"):
+        self.x = {self.x}
+
+reveal_type(NestedMixed().x)  # revealed: Unknown | list[Divergent] | set[Divergent]
+```
+
+And cases where the types originate from annotations:
+
+```py
+from typing import TypeVar
+
+T = TypeVar("T")
+
+def make_list(value: T) -> list[T]:
+    return [value]
+
+class NestedLists2:
+    def f(self: "NestedLists2"):
+        self.x = make_list(self.x)
+
+reveal_type(NestedLists2().x)  # revealed: Unknown | list[Divergent]
+```
+
 ### Builtin types attributes
 
 This test can probably be removed eventually, but we currently include it because we do not yet
@@ -2375,10 +2591,85 @@ class Answer(enum.Enum):
     YES = 1
 
 reveal_type(Answer.NO)  # revealed: Literal[Answer.NO]
-reveal_type(Answer.NO.value)  # revealed: Any
+reveal_type(Answer.NO.value)  # revealed: Literal[0]
 reveal_type(Answer.__members__)  # revealed: MappingProxyType[str, Unknown]
 ```
 
+## Divergent inferred implicit instance attribute types
+
+```py
+class C:
+    def f(self, other: "C"):
+        self.x = (other.x, 1)
+
+reveal_type(C().x)  # revealed: Unknown | tuple[Divergent, Literal[1]]
+```
+
+This also works if the tuple is not constructed directly:
+
+```py
+from typing import TypeVar, Literal
+
+T = TypeVar("T")
+
+def make_tuple(x: T) -> tuple[T, Literal[1]]:
+    return (x, 1)
+
+class D:
+    def f(self, other: "D"):
+        self.x = make_tuple(other.x)
+
+reveal_type(D().x)  # revealed: Unknown | tuple[Divergent, Literal[1]]
+```
+
+The tuple type may also expand exponentially "in breadth":
+
+```py
+def duplicate(x: T) -> tuple[T, T]:
+    return (x, x)
+
+class E:
+    def f(self: "E"):
+        self.x = duplicate(self.x)
+
+reveal_type(E().x)  # revealed: Unknown | tuple[Divergent, Divergent]
+```
+
+And it also works for homogeneous tuples:
+
+```py
+def make_homogeneous_tuple(x: T) -> tuple[T, ...]:
+    return (x, x)
+
+class E:
+    def f(self, other: "E"):
+        self.x = make_homogeneous_tuple(other.x)
+
+reveal_type(E().x)  # revealed: Unknown | tuple[Divergent, ...]
+```
+
+## Attributes of standard library modules that aren't yet defined
+
+For attributes of stdlib modules that exist in future versions, we can give better diagnostics.
+
+<!-- snapshot-diagnostics -->
+
+```toml
+[environment]
+python-version = "3.10"
+```
+
+`main.py`:
+
+```py
+import datetime
+
+# error: [unresolved-attribute]
+reveal_type(datetime.UTC)  # revealed: Unknown
+# error: [unresolved-attribute]
+reveal_type(datetime.fakenotreal)  # revealed: Unknown
+```
+
 ## References
 
 Some of the tests in the *Class and instance variables* section draw inspiration from
diff --git a/crates/ty_python_semantic/resources/mdtest/bidirectional.md b/crates/ty_python_semantic/resources/mdtest/bidirectional.md
new file mode 100644
index 0000000000..3485304b6b
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/bidirectional.md
@@ -0,0 +1,147 @@
+# Bidirectional type inference
+
+ty partially supports bidirectional type inference. This is a mechanism for inferring the type of an
+expression "from the outside in". Normally, type inference proceeds "from the inside out". That is,
+in order to infer the type of an expression, the types of all sub-expressions must first be
+inferred. There is no reverse dependency. However, when performing complex type inference, such as
+when generics are involved, the type of an outer expression can sometimes be useful in inferring
+inner expressions. Bidirectional type inference is a mechanism that propagates such "expected types"
+to the inference of inner expressions.
+
+## Propagating target type annotation
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+def list1[T](x: T) -> list[T]:
+    return [x]
+
+l1 = list1(1)
+reveal_type(l1)  # revealed: list[Literal[1]]
+l2: list[int] = list1(1)
+reveal_type(l2)  # revealed: list[int]
+
+# `list[Literal[1]]` and `list[int]` are incompatible, since `list[T]` is invariant in `T`.
+# error: [invalid-assignment] "Object of type `list[Literal[1]]` is not assignable to `list[int]`"
+l2 = l1
+
+intermediate = list1(1)
+# TODO: the error will not occur if we can infer the type of `intermediate` to be `list[int]`
+# error: [invalid-assignment] "Object of type `list[Literal[1]]` is not assignable to `list[int]`"
+l3: list[int] = intermediate
+# TODO: it would be nice if this were `list[int]`
+reveal_type(intermediate)  # revealed: list[Literal[1]]
+reveal_type(l3)  # revealed: list[int]
+
+l4: list[int | str] | None = list1(1)
+reveal_type(l4)  # revealed: list[int | str]
+
+def _(l: list[int] | None = None):
+    l1 = l or list()
+    reveal_type(l1)  # revealed: (list[int] & ~AlwaysFalsy) | list[Unknown]
+
+    l2: list[int] = l or list()
+    # it would be better if this were `list[int]`? (https://github.com/astral-sh/ty/issues/136)
+    reveal_type(l2)  # revealed: (list[int] & ~AlwaysFalsy) | list[Unknown]
+
+def f[T](x: T, cond: bool) -> T | list[T]:
+    return x if cond else [x]
+
+# TODO: no error
+# error: [invalid-assignment] "Object of type `Literal[1] | list[Literal[1]]` is not assignable to `int | list[int]`"
+l5: int | list[int] = f(1, True)
+```
+
+`typed_dict.py`:
+
+```py
+from typing import TypedDict
+
+class TD(TypedDict):
+    x: int
+
+d1 = {"x": 1}
+d2: TD = {"x": 1}
+d3: dict[str, int] = {"x": 1}
+
+reveal_type(d1)  # revealed: dict[Unknown | str, Unknown | int]
+reveal_type(d2)  # revealed: TD
+reveal_type(d3)  # revealed: dict[str, int]
+
+def _() -> TD:
+    return {"x": 1}
+
+def _() -> TD:
+    # error: [missing-typed-dict-key] "Missing required key 'x' in TypedDict `TD` constructor"
+    return {}
+```
+
+## Propagating return type annotation
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import overload, Callable
+
+def list1[T](x: T) -> list[T]:
+    return [x]
+
+def get_data() -> dict | None:
+    return {}
+
+def wrap_data() -> list[dict]:
+    if not (res := get_data()):
+        return list1({})
+    reveal_type(list1(res))  # revealed: list[dict[Unknown, Unknown] & ~AlwaysFalsy]
+    # `list[dict[Unknown, Unknown] & ~AlwaysFalsy]` and `list[dict[Unknown, Unknown]]` are incompatible,
+    # but the return type check passes here because the type of `list1(res)` is inferred
+    # by bidirectional type inference using the annotated return type, and the type of `res` is not used.
+    return list1(res)
+
+def wrap_data2() -> list[dict] | None:
+    if not (res := get_data()):
+        return None
+    reveal_type(list1(res))  # revealed: list[dict[Unknown, Unknown] & ~AlwaysFalsy]
+    return list1(res)
+
+def deco[T](func: Callable[[], T]) -> Callable[[], T]:
+    return func
+
+def outer() -> Callable[[], list[dict]]:
+    @deco
+    def inner() -> list[dict]:
+        if not (res := get_data()):
+            return list1({})
+        reveal_type(list1(res))  # revealed: list[dict[Unknown, Unknown] & ~AlwaysFalsy]
+        return list1(res)
+    return inner
+
+@overload
+def f(x: int) -> list[int]: ...
+@overload
+def f(x: str) -> list[str]: ...
+def f(x: int | str) -> list[int] | list[str]:
+    # `list[int] | list[str]` is disjoint from `list[int | str]`.
+    if isinstance(x, int):
+        return list1(x)
+    else:
+        return list1(x)
+
+reveal_type(f(1))  # revealed: list[int]
+reveal_type(f("a"))  # revealed: list[str]
+
+async def g() -> list[int | str]:
+    return list1(1)
+
+def h[T](x: T, cond: bool) -> T | list[T]:
+    return i(x, cond)
+
+def i[T](x: T, cond: bool) -> T | list[T]:
+    return x if cond else [x]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/binary/classes.md b/crates/ty_python_semantic/resources/mdtest/binary/classes.md
index 89dceef0e2..7ae4c23e60 100644
--- a/crates/ty_python_semantic/resources/mdtest/binary/classes.md
+++ b/crates/ty_python_semantic/resources/mdtest/binary/classes.md
@@ -18,6 +18,11 @@ reveal_type(A | B)  # revealed: UnionType
 
 ## Union of two classes (prior to 3.10)
 
+```toml
+[environment]
+python-version = "3.9"
+```
+
 ```py
 class A: ...
 class B: ...
@@ -25,3 +30,27 @@ class B: ...
 # error: "Operator `|` is unsupported between objects of type `<class 'A'>` and `<class 'B'>`"
 reveal_type(A | B)  # revealed: Unknown
 ```
+
+## Other binary operations resulting in `UnionType`
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+class A: ...
+class B: ...
+
+def _(sub_a: type[A], sub_b: type[B]):
+    reveal_type(A | sub_b)  # revealed: UnionType
+    reveal_type(sub_a | B)  # revealed: UnionType
+    reveal_type(sub_a | sub_b)  # revealed: UnionType
+
+class C[T]: ...
+class D[T]: ...
+
+reveal_type(C | D)  # revealed: UnionType
+
+reveal_type(C[int] | D[str])  # revealed: UnionType
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/boundness_declaredness/public.md b/crates/ty_python_semantic/resources/mdtest/boundness_declaredness/public.md
index ab4f3ff0de..8eeb52079e 100644
--- a/crates/ty_python_semantic/resources/mdtest/boundness_declaredness/public.md
+++ b/crates/ty_python_semantic/resources/mdtest/boundness_declaredness/public.md
@@ -26,7 +26,7 @@ In particular, we should raise errors in the "possibly-undeclared-and-unbound" a
 | **Diagnostic**   | declared | possibly-undeclared       | undeclared          |
 | ---------------- | -------- | ------------------------- | ------------------- |
 | bound            |          |                           |                     |
-| possibly-unbound |          | `possibly-unbound-import` | ?                   |
+| possibly-unbound |          | `possibly-missing-import` | ?                   |
 | unbound          |          | ?                         | `unresolved-import` |
 
 ## Declared
@@ -36,34 +36,26 @@ In particular, we should raise errors in the "possibly-undeclared-and-unbound" a
 If a symbol has a declared type (`int`), we use that even if there is a more precise inferred type
 (`Literal[1]`), or a conflicting inferred type (`str` vs. `Literal[2]` below):
 
-`mod.py`:
-
 ```py
 from typing import Any
 
 def any() -> Any: ...
 
-a: int = 1
-b: str = 2  # error: [invalid-assignment]
-c: Any = 3
-d: int = any()
-```
+class Public:
+    a: int = 1
+    b: str = 2  # error: [invalid-assignment]
+    c: Any = 3
+    d: int = any()
 
-```py
-from mod import a, b, c, d
-
-reveal_type(a)  # revealed: int
-reveal_type(b)  # revealed: str
-reveal_type(c)  # revealed: Any
-reveal_type(d)  # revealed: int
+reveal_type(Public.a)  # revealed: int
+reveal_type(Public.b)  # revealed: str
+reveal_type(Public.c)  # revealed: Any
+reveal_type(Public.d)  # revealed: int
 ```
 
 ### Declared and possibly unbound
 
-If a symbol is declared and *possibly* unbound, we trust that other module and use the declared type
-without raising an error.
-
-`mod.py`:
+If a symbol is declared and *possibly* unbound, we trust the declared type without raising an error.
 
 ```py
 from typing import Any
@@ -72,25 +64,22 @@ def any() -> Any: ...
 def flag() -> bool:
     return True
 
-a: int
-b: str
-c: Any
-d: int
+class Public:
+    a: int
+    b: str
+    c: Any
+    d: int
 
-if flag:
-    a = 1
-    b = 2  # error: [invalid-assignment]
-    c = 3
-    d = any()
-```
+    if flag:
+        a = 1
+        b = 2  # error: [invalid-assignment]
+        c = 3
+        d = any()
 
-```py
-from mod import a, b, c, d
-
-reveal_type(a)  # revealed: int
-reveal_type(b)  # revealed: str
-reveal_type(c)  # revealed: Any
-reveal_type(d)  # revealed: int
+reveal_type(Public.a)  # revealed: int
+reveal_type(Public.b)  # revealed: str
+reveal_type(Public.c)  # revealed: Any
+reveal_type(Public.d)  # revealed: int
 ```
 
 ### Declared and unbound
@@ -98,20 +87,15 @@ reveal_type(d)  # revealed: int
 Similarly, if a symbol is declared but unbound, we do not raise an error. We trust that this symbol
 is available somehow and simply use the declared type.
 
-`mod.py`:
-
 ```py
 from typing import Any
 
-a: int
-b: Any
-```
+class Public:
+    a: int
+    b: Any
 
-```py
-from mod import a, b
-
-reveal_type(a)  # revealed: int
-reveal_type(b)  # revealed: Any
+reveal_type(Public.a)  # revealed: int
+reveal_type(Public.b)  # revealed: Any
 ```
 
 ## Possibly undeclared
@@ -121,8 +105,6 @@ reveal_type(b)  # revealed: Any
 If a symbol is possibly undeclared but definitely bound, we use the union of the declared and
 inferred types:
 
-`mod.py`:
-
 ```py
 from typing import Any
 
@@ -130,63 +112,56 @@ def any() -> Any: ...
 def flag() -> bool:
     return True
 
-a = 1
-b = 2
-c = 3
-d = any()
-if flag():
-    a: int
-    b: Any
-    c: str  # error: [invalid-declaration]
-    d: int
-```
+class Public:
+    a = 1
+    b = 2
+    c = 3
+    d = any()
+    if flag():
+        a: int
+        b: Any
+        c: str  # error: [invalid-declaration]
+        d: int
 
-```py
-from mod import a, b, c, d
-
-reveal_type(a)  # revealed: int
-reveal_type(b)  # revealed: Literal[2] | Any
-reveal_type(c)  # revealed: Literal[3] | Unknown
-reveal_type(d)  # revealed: Any | int
+reveal_type(Public.a)  # revealed: int
+reveal_type(Public.b)  # revealed: Literal[2] | Any
+reveal_type(Public.c)  # revealed: Literal[3] | Unknown
+reveal_type(Public.d)  # revealed: Any | int
 
 # External modifications of `a` that violate the declared type are not allowed:
 # error: [invalid-assignment]
-a = None
+Public.a = None
 ```
 
 ### Possibly undeclared and possibly unbound
 
 If a symbol is possibly undeclared and possibly unbound, we also use the union of the declared and
 inferred types. This case is interesting because the "possibly declared" definition might not be the
-same as the "possibly bound" definition (symbol `b`). Note that we raise a `possibly-unbound-import`
+same as the "possibly bound" definition (symbol `b`). Note that we raise a `possibly-missing-import`
 error for both `a` and `b`:
 
-`mod.py`:
-
 ```py
 from typing import Any
 
 def flag() -> bool:
     return True
 
-if flag():
-    a: Any = 1
-    b = 2
-else:
-    b: str
-```
+class Public:
+    if flag():
+        a: Any = 1
+        b = 2
+    else:
+        b: str
 
-```py
-# error: [possibly-unbound-import]
-# error: [possibly-unbound-import]
-from mod import a, b
-
-reveal_type(a)  # revealed: Literal[1] | Any
-reveal_type(b)  # revealed: Literal[2] | str
+# error: [possibly-missing-attribute]
+reveal_type(Public.a)  # revealed: Literal[1] | Any
+# error: [possibly-missing-attribute]
+reveal_type(Public.b)  # revealed: Literal[2] | str
 
 # External modifications of `b` that violate the declared type are not allowed:
+# error: [possibly-missing-attribute]
 # error: [invalid-assignment]
-b = None
+Public.b = None
 ```
 
 ### Possibly undeclared and unbound
@@ -194,26 +169,21 @@ b = None
 If a symbol is possibly undeclared and definitely unbound, we currently do not raise an error. This
 seems inconsistent when compared to the case just above.
 
-`mod.py`:
-
 ```py
 def flag() -> bool:
     return True
 
-if flag():
-    a: int
-```
+class Public:
+    if flag():
+        a: int
 
-```py
 # TODO: this should raise an error. Once we fix this, update the section description and the table
 # on top of this document.
-from mod import a
-
-reveal_type(a)  # revealed: int
+reveal_type(Public.a)  # revealed: int
 
 # External modifications to `a` that violate the declared type are not allowed:
 # error: [invalid-assignment]
-a = None
+Public.a = None
 ```
 
 ## Undeclared
@@ -224,24 +194,19 @@ If a symbol is *undeclared*, we use the union of `Unknown` with the inferred typ
 treat this case differently from the case where a symbol is implicitly declared with `Unknown`,
 possibly due to the usage of an unknown name in the annotation:
 
-`mod.py`:
-
 ```py
-# Undeclared:
-a = 1
+class Public:
+    # Undeclared:
+    a = 1
 
-# Implicitly declared with `Unknown`, due to the usage of an unknown name in the annotation:
-b: SomeUnknownName = 1  # error: [unresolved-reference]
-```
+    # Implicitly declared with `Unknown`, due to the usage of an unknown name in the annotation:
+    b: SomeUnknownName = 1  # error: [unresolved-reference]
 
-```py
-from mod import a, b
-
-reveal_type(a)  # revealed: Unknown | Literal[1]
-reveal_type(b)  # revealed: Unknown
+reveal_type(Public.a)  # revealed: Unknown | Literal[1]
+reveal_type(Public.b)  # revealed: Unknown
 
 # All external modifications of `a` are allowed:
-a = None
+Public.a = None
 ```
 
 ### Undeclared and possibly unbound
@@ -249,48 +214,39 @@ a = None
 If a symbol is undeclared and *possibly* unbound, we currently do not raise an error. This seems
 inconsistent when compared to the "possibly-undeclared-and-possibly-unbound" case.
 
-`mod.py`:
-
 ```py
 def flag() -> bool:
     return True
 
-if flag:
-    a = 1
-    b: SomeUnknownName = 1  # error: [unresolved-reference]
-```
+class Public:
+    if flag:
+        a = 1
+        b: SomeUnknownName = 1  # error: [unresolved-reference]
 
-```py
-# TODO: this should raise an error. Once we fix this, update the section description and the table
+# TODO: these should raise an error. Once we fix this, update the section description and the table
 # on top of this document.
-from mod import a, b
-
-reveal_type(a)  # revealed: Unknown | Literal[1]
-reveal_type(b)  # revealed: Unknown
+reveal_type(Public.a)  # revealed: Unknown | Literal[1]
+reveal_type(Public.b)  # revealed: Unknown
 
 # All external modifications of `a` are allowed:
-a = None
+Public.a = None
 ```
 
 ### Undeclared and unbound
 
 If a symbol is undeclared *and* unbound, we infer `Unknown` and raise an error.
 
-`mod.py`:
-
 ```py
-if False:
-    a: int = 1
-```
+class Public:
+    if False:
+        a: int = 1
 
-```py
-# error: [unresolved-import]
-from mod import a
+# error: [unresolved-attribute]
+reveal_type(Public.a)  # revealed: Unknown
 
-reveal_type(a)  # revealed: Unknown
-
-# Modifications allowed in this case:
-a = None
+# Modification attempts yield an error:
+# error: [unresolved-attribute]
+Public.a = None
 ```
 
 ## In stub files
@@ -332,8 +288,8 @@ if flag():
 ```
 
 ```py
-# error: [possibly-unbound-import]
-# error: [possibly-unbound-import]
+# error: [possibly-missing-import]
+# error: [possibly-missing-import]
 from mod import MyInt, C
 
 reveal_type(MyInt)  # revealed: <class 'int'>
diff --git a/crates/ty_python_semantic/resources/mdtest/call/builtins.md b/crates/ty_python_semantic/resources/mdtest/call/builtins.md
index f32c007c1c..0eac021d1a 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/builtins.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/builtins.md
@@ -57,7 +57,7 @@ type("Foo", Base, {})
 # error: [invalid-argument-type] "Argument to class `type` is incorrect: Expected `tuple[type, ...]`, found `tuple[Literal[1], Literal[2]]`"
 type("Foo", (1, 2), {})
 
-# TODO: this should be an error
+# error: [invalid-argument-type] "Argument to class `type` is incorrect: Expected `dict[str, Any]`, found `dict[Unknown | bytes, Unknown | int]`"
 type("Foo", (Base,), {b"attr": 1})
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/call/callable_instance.md b/crates/ty_python_semantic/resources/mdtest/call/callable_instance.md
index d6e36e061f..52f61bb5ed 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/callable_instance.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/callable_instance.md
@@ -19,7 +19,7 @@ b = Unit()(3.0)  # error: "Object of type `Unit` is not callable"
 reveal_type(b)  # revealed: Unknown
 ```
 
-## Possibly unbound `__call__` method
+## Possibly missing `__call__` method
 
 ```py
 def _(flag: bool):
@@ -29,7 +29,7 @@ def _(flag: bool):
                 return 1
 
     a = PossiblyNotCallable()
-    result = a()  # error: "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+    result = a()  # error: "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
     reveal_type(result)  # revealed: int
 ```
 
@@ -105,7 +105,7 @@ reveal_type(c())  # revealed: int
 
 ## Union over callables
 
-### Possibly unbound `__call__`
+### Possibly missing `__call__`
 
 ```py
 def outer(cond1: bool):
@@ -122,6 +122,6 @@ def outer(cond1: bool):
         else:
             a = Other()
 
-            # error: [call-non-callable] "Object of type `Test` is not callable (possibly unbound `__call__` method)"
+        # error: [call-non-callable] "Object of type `Test` is not callable (possibly missing `__call__` method)"
         a()
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/call/callables_as_descriptors.md b/crates/ty_python_semantic/resources/mdtest/call/callables_as_descriptors.md
new file mode 100644
index 0000000000..eb45a6697e
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/call/callables_as_descriptors.md
@@ -0,0 +1,240 @@
+# Callables as descriptors?
+
+```toml
+[environment]
+python-version = "3.14"
+```
+
+## Introduction
+
+Some common callable objects (all functions, including lambdas) are also bound-method descriptors.
+That is, they have a `__get__` method which returns a bound-method object that binds the receiver
+instance to the first argument. The bound-method object therefore has a different signature, lacking
+the first argument:
+
+```py
+from ty_extensions import CallableTypeOf
+from typing import Callable
+
+class C1:
+    def method(self: C1, x: int) -> str:
+        return str(x)
+
+def _(
+    accessed_on_class: CallableTypeOf[C1.method],
+    accessed_on_instance: CallableTypeOf[C1().method],
+):
+    reveal_type(accessed_on_class)  # revealed: (self: C1, x: int) -> str
+    reveal_type(accessed_on_instance)  # revealed:        (x: int) -> str
+```
+
+Other callable objects (`staticmethod` objects, instances of classes with a `__call__` method but no
+dedicated `__get__` method) are *not* bound-method descriptors. If accessed as class attributes via
+an instance, they are simply themselves:
+
+```py
+class NonDescriptorCallable2:
+    def __call__(self, c2: C2, x: int) -> str:
+        return str(x)
+
+class C2:
+    non_descriptor_callable: NonDescriptorCallable2 = NonDescriptorCallable2()
+
+def _(
+    accessed_on_class: CallableTypeOf[C2.non_descriptor_callable],
+    accessed_on_instance: CallableTypeOf[C2().non_descriptor_callable],
+):
+    reveal_type(accessed_on_class)  # revealed:    (c2: C2, x: int) -> str
+    reveal_type(accessed_on_instance)  # revealed: (c2: C2, x: int) -> str
+```
+
+Both kinds of objects can inhabit the same `Callable` type:
+
+```py
+class NonDescriptorCallable3:
+    def __call__(self, c3: C3, x: int) -> str:
+        return str(x)
+
+class C3:
+    def method(self: C3, x: int) -> str:
+        return str(x)
+    non_descriptor_callable: NonDescriptorCallable3 = NonDescriptorCallable3()
+
+    callable_m: Callable[[C3, int], str] = method
+    callable_n: Callable[[C3, int], str] = non_descriptor_callable
+```
+
+However, when they are accessed on instances of `C3`, they have different signatures:
+
+```py
+def _(
+    method_accessed_on_instance: CallableTypeOf[C3().method],
+    callable_accessed_on_instance: CallableTypeOf[C3().non_descriptor_callable],
+):
+    reveal_type(method_accessed_on_instance)  # revealed:           (x: int) -> str
+    reveal_type(callable_accessed_on_instance)  # revealed: (c3: C3, x: int) -> str
+```
+
+This leaves the question how the `callable_m` and `callable_n` attributes should be treated when
+accessed on instances of `C3`. If we treat `Callable` as being equivalent to a protocol that defines
+a `__call__` method (and no `__get__` method), then they should show no bound-method behavior. This
+is what we currently do:
+
+```py
+reveal_type(C3().callable_m)  # revealed: (C3, int, /) -> str
+reveal_type(C3().callable_n)  # revealed: (C3, int, /) -> str
+```
+
+However, this leads to unsoundness: `C3().callable_m` is actually `C3.method` which *is* a
+bound-method descriptor. We currently allow the following call, which will fail at runtime:
+
+```py
+C3().callable_m(C3(), 1)  # runtime error! ("takes 2 positional arguments but 3 were given")
+```
+
+If we were to treat `Callable`s as bound-method descriptors, then the signatures of `callable_m` and
+`callable_n` when accessed on instances would bind the `self` argument:
+
+- `C3().callable_m`: `(x: int) -> str`
+- `C3().callable_n`: `(x: int) -> str`
+
+This would be equally unsound, because now we would allow a call to `C3().callable_n(1)` which would
+also fail at runtime.
+
+There is no perfect solution here, but we can use some heuristics to improve the situation for
+certain use cases (at the cost of purity and simplicity).
+
+## Use case: Decorating a method with a `Callable`-typed decorator
+
+A commonly used pattern in the ecosystem is to use a `Callable`-typed decorator on a method with the
+intention that it shouldn't influence the method's descriptor behavior. For example, we treat
+`method_decorated` below as a bound method, even though its type is `Callable[[C1, int], str]`:
+
+```py
+from typing import Callable
+
+# TODO: this could use a generic signature, but we don't support
+# `ParamSpec` and solving of typevars inside `Callable` types yet.
+def memoize(f: Callable[[C1, int], str]) -> Callable[[C1, int], str]:
+    raise NotImplementedError
+
+class C1:
+    def method(self, x: int) -> str:
+        return str(x)
+
+    @memoize
+    def method_decorated(self, x: int) -> str:
+        return str(x)
+
+C1().method(1)
+
+C1().method_decorated(1)
+```
+
+This also works with an argumentless `Callable` annotation:
+
+```py
+def memoize2(f: Callable) -> Callable:
+    raise NotImplementedError
+
+class C2:
+    @memoize2
+    def method_decorated(self, x: int) -> str:
+        return str(x)
+
+C2().method_decorated(1)
+```
+
+And with unions of `Callable` types:
+
+```py
+from typing import Callable
+
+def expand(f: Callable[[C3, int], int]) -> Callable[[C3, int], int] | Callable[[C3, int], str]:
+    raise NotImplementedError
+
+class C3:
+    @expand
+    def method_decorated(self, x: int) -> int:
+        return x
+
+reveal_type(C3().method_decorated(1))  # revealed: int | str
+```
+
+Note that we currently only apply this heuristic when calling a function such as `memoize` via the
+decorator syntax. This is inconsistent, because the above *should* be equivalent to the following,
+but here we emit errors:
+
+```py
+def memoize3(f: Callable[[C4, int], str]) -> Callable[[C4, int], str]:
+    raise NotImplementedError
+
+class C4:
+    def method(self, x: int) -> str:
+        return str(x)
+    method_decorated = memoize3(method)
+
+# error: [missing-argument]
+# error: [invalid-argument-type]
+C4().method_decorated(1)
+```
+
+The reason for this is that the heuristic is problematic. We don't *know* that the `Callable` in the
+return type of `memoize` is actually related to the method that we pass in. But when `memoize` is
+applied as a decorator, it is reasonable to assume so.
+
+In general, a function call might however return a `Callable` that is unrelated to the argument
+passed in. And here, it seems more reasonable and safe to treat the `Callable` as a non-descriptor.
+This allows correct programs like the following to pass type checking (that are currently rejected
+by pyright and mypy with a heuristic that apparently applies in a wider range of situations):
+
+```py
+class SquareCalculator:
+    def __init__(self, post_process: Callable[[float], int]):
+        self.post_process = post_process
+
+    def __call__(self, x: float) -> int:
+        return self.post_process(x * x)
+
+def square_then(c: Callable[[float], int]) -> Callable[[float], int]:
+    return SquareCalculator(c)
+
+class Calculator:
+    square_then_round = square_then(round)
+
+reveal_type(Calculator().square_then_round(3.14))  # revealed: Unknown | int
+```
+
+## Use case: Treating dunder methods as bound-method descriptors
+
+pytorch defines a `__pow__` dunder attribute on [`TensorBase`] in a similar way to the following
+example. We generally treat dunder attributes as bound-method descriptors since they all take a
+`self` argument. This allows us to type-check the following code correctly:
+
+```py
+from typing import Callable
+
+def pow_impl(tensor: Tensor, exponent: int) -> Tensor:
+    raise NotImplementedError
+
+class Tensor:
+    __pow__: Callable[[Tensor, int], Tensor] = pow_impl
+
+Tensor() ** 2
+```
+
+The following example is also taken from a real world project. Here, the `__lt__` dunder attribute
+is not declared. The attribute type is therefore inferred as `Unknown | Callable[…]`, but we still
+treat it as a bound-method descriptor:
+
+```py
+def make_comparison_operator(name: str) -> Callable[[Matrix, Matrix], bool]:
+    raise NotImplementedError
+
+class Matrix:
+    __lt__ = make_comparison_operator("lt")
+
+Matrix() < Matrix()
+```
+
+[`tensorbase`]: https://github.com/pytorch/pytorch/blob/f3913ea641d871f04fa2b6588a77f63efeeb9f10/torch/_tensor.py#L1084-L1092
diff --git a/crates/ty_python_semantic/resources/mdtest/call/constructor.md b/crates/ty_python_semantic/resources/mdtest/call/constructor.md
index c8bdd664cd..b6e65fcdf2 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/constructor.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/constructor.md
@@ -158,15 +158,15 @@ def _(flag: bool) -> None:
             def __new__(cls):
                 return object.__new__(cls)
 
-    # error: [possibly-unbound-implicit-call]
+    # error: [possibly-missing-implicit-call]
     reveal_type(Foo())  # revealed: Foo
 
-    # error: [possibly-unbound-implicit-call]
+    # error: [possibly-missing-implicit-call]
     # error: [too-many-positional-arguments]
     reveal_type(Foo(1))  # revealed: Foo
 ```
 
-#### Possibly unbound `__call__` on `__new__` callable
+#### Possibly missing `__call__` on `__new__` callable
 
 ```py
 def _(flag: bool) -> None:
@@ -178,11 +178,11 @@ def _(flag: bool) -> None:
     class Foo:
         __new__ = Callable()
 
-    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly unbound `__call__` method)"
+    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly missing `__call__` method)"
     reveal_type(Foo(1))  # revealed: Foo
     # TODO should be - error: [missing-argument] "No argument provided for required parameter `x` of bound method `__call__`"
     # but we currently infer the signature of `__call__` as unknown, so it accepts any arguments
-    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly unbound `__call__` method)"
+    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly missing `__call__` method)"
     reveal_type(Foo())  # revealed: Foo
 ```
 
@@ -294,11 +294,11 @@ def _(flag: bool) -> None:
     class Foo:
         __init__ = Callable()
 
-    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly unbound `__call__` method)"
+    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly missing `__call__` method)"
     reveal_type(Foo(1))  # revealed: Foo
     # TODO should be - error: [missing-argument] "No argument provided for required parameter `x` of bound method `__call__`"
     # but we currently infer the signature of `__call__` as unknown, so it accepts any arguments
-    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly unbound `__call__` method)"
+    # error: [call-non-callable] "Object of type `Callable` is not callable (possibly missing `__call__` method)"
     reveal_type(Foo())  # revealed: Foo
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/call/dunder.md b/crates/ty_python_semantic/resources/mdtest/call/dunder.md
index 7eadb96dae..721517eac4 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/dunder.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/dunder.md
@@ -114,7 +114,11 @@ def _(flag: bool):
 
     this_fails = ThisFails()
 
-    # error: [possibly-unbound-implicit-call]
+    # TODO: this would be a friendlier diagnostic if we propagated the error up the stack
+    # and transformed it into a `[not-subscriptable]` error with a subdiagnostic explaining
+    # that the cause of the error was a possibly missing `__getitem__` method
+    #
+    # error: [possibly-missing-implicit-call] "Method `__getitem__` of type `ThisFails` may be missing"
     reveal_type(this_fails[0])  # revealed: Unknown | str
 ```
 
@@ -201,7 +205,7 @@ class C:
         return str(key)
 
     def f(self):
-        # TODO: This should emit an `invalid-assignment` diagnostic once we understand the type of `self`
+        # error: [invalid-assignment] "Implicit shadowing of function `__getitem__`"
         self.__getitem__ = None
 
 # This is still fine, and simply calls the `__getitem__` method on the class
@@ -270,6 +274,11 @@ def _(flag: bool):
                 return str(key)
 
     c = C()
-    # error: [possibly-unbound-implicit-call]
+
+    # TODO: this would be a friendlier diagnostic if we propagated the error up the stack
+    # and transformed it into a `[not-subscriptable]` error with a subdiagnostic explaining
+    # that the cause of the error was a possibly missing `__getitem__` method
+    #
+    # error: [possibly-missing-implicit-call] "Method `__getitem__` of type `C` may be missing"
     reveal_type(c[0])  # revealed: str
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/call/function.md b/crates/ty_python_semantic/resources/mdtest/call/function.md
index 6be6a8d9ec..a8526a453b 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/function.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/function.md
@@ -68,6 +68,75 @@ def _(flag: bool):
     reveal_type(foo())  # revealed: int
 ```
 
+## PEP-484 convention for positional-only parameters
+
+PEP 570, introduced in Python 3.8, added dedicated Python syntax for denoting positional-only
+parameters (the `/` in a function signature). However, functions implemented in C were able to have
+positional-only parameters prior to Python 3.8 (there was just no syntax for expressing this at the
+Python level).
+
+Stub files describing functions implemented in C nonetheless needed a way of expressing that certain
+parameters were positional-only. In the absence of dedicated Python syntax, PEP 484 described a
+convention that type checkers were expected to understand:
+
+> Some functions are designed to take their arguments only positionally, and expect their callers
+> never to use the argument’s name to provide that argument by keyword. All arguments with names
+> beginning with `__` are assumed to be positional-only, except if their names also end with `__`.
+
+While this convention is now redundant (following the implementation of PEP 570), many projects
+still continue to use the old convention, so it is supported by ty as well.
+
+```py
+def f(__x: int): ...
+
+f(1)
+# error: [positional-only-parameter-as-kwarg]
+f(__x=1)
+```
+
+But not if they follow a non-positional-only parameter:
+
+```py
+def g(x: int, __y: str): ...
+
+g(x=1, __y="foo")
+```
+
+And also not if they both start and end with `__`:
+
+```py
+def h(__x__: str): ...
+
+h(__x__="foo")
+```
+
+And if *any* parameters use the new PEP-570 convention, the old convention does not apply:
+
+```py
+def i(x: str, /, __y: int): ...
+
+i("foo", __y=42)  # fine
+```
+
+And `self`/`cls` are implicitly positional-only:
+
+```py
+class C:
+    def method(self, __x: int): ...
+    @classmethod
+    def class_method(cls, __x: str): ...
+    # (the name of the first parameter is irrelevant;
+    # a staticmethod works the same as a free function in the global scope)
+    @staticmethod
+    def static_method(self, __x: int): ...
+
+# error: [positional-only-parameter-as-kwarg]
+C().method(__x=1)
+# error: [positional-only-parameter-as-kwarg]
+C.class_method(__x="1")
+C.static_method("x", __x=42)  # fine
+```
+
 ## Splatted arguments
 
 ### Unknown argument length
@@ -90,6 +159,8 @@ def _(args: list[int]) -> None:
     takes_zero(*args)
     takes_one(*args)
     takes_two(*args)
+    takes_two(*b"ab")
+    takes_two(*b"abc")  # error: [too-many-positional-arguments]
     takes_two_positional_only(*args)
     takes_two_different(*args)  # error: [invalid-argument-type]
     takes_two_different_positional_only(*args)  # error: [invalid-argument-type]
@@ -541,56 +612,6 @@ def _(args: str) -> None:
     takes_at_least_two_positional_only(*args)
 ```
 
-### Argument expansion regression
-
-This is a regression that was highlighted by the ecosystem check, which shows that we might need to
-rethink how we perform argument expansion during overload resolution. In particular, we might need
-to retry both `match_parameters` _and_ `check_types` for each expansion. Currently we only retry
-`check_types`.
-
-The issue is that argument expansion might produce a splatted value with a different arity than what
-we originally inferred for the unexpanded value, and that in turn can affect which parameters the
-splatted value is matched with.
-
-The first example correctly produces an error. The `tuple[int, str]` union element has a precise
-arity of two, and so parameter matching chooses the first overload. The second element of the tuple
-does not match the second parameter type, which yielding an `invalid-argument-type` error.
-
-The third example should produce the same error. However, because we have a union, we do not see the
-precise arity of each union element during parameter matching. Instead, we infer an arity of "zero
-or more" for the union as a whole, and use that less precise arity when matching parameters. We
-therefore consider the second overload to still be a potential candidate for the `tuple[int, str]`
-union element. During type checking, we have to force the arity of each union element to match the
-inferred arity of the union as a whole (turning `tuple[int, str]` into `tuple[int | str, ...]`).
-That less precise tuple type-checks successfully against the second overload, making us incorrectly
-think that `tuple[int, str]` is a valid splatted call.
-
-If we update argument expansion to retry parameter matching with the precise arity of each union
-element, we will correctly rule out the second overload for `tuple[int, str]`, just like we do when
-splatting that tuple directly (instead of as part of a union).
-
-```py
-from typing import overload
-
-@overload
-def f(x: int, y: int) -> None: ...
-@overload
-def f(x: int, y: str, z: int) -> None: ...
-def f(*args): ...
-
-# Test all of the above with a number of different splatted argument types
-
-def _(t: tuple[int, str]) -> None:
-    f(*t)  # error: [invalid-argument-type]
-
-def _(t: tuple[int, str, int]) -> None:
-    f(*t)
-
-def _(t: tuple[int, str] | tuple[int, str, int]) -> None:
-    # TODO: error: [invalid-argument-type]
-    f(*t)
-```
-
 ## Wrong argument type
 
 ### Positional argument, positional-or-keyword parameter
@@ -623,6 +644,141 @@ def f(*args: int) -> int:
 reveal_type(f("foo"))  # revealed: int
 ```
 
+### Variadic argument, variadic parameter
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+def f(*args: int) -> int:
+    return 1
+
+def _(args: list[str]) -> None:
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `int`, found `str`"
+    reveal_type(f(*args))  # revealed: int
+```
+
+Considering a few different shapes of tuple for the splatted argument:
+
+```py
+def f1(*args: str): ...
+def _(
+    args1: tuple[str, ...],
+    args2: tuple[str, *tuple[str, ...]],
+    args3: tuple[str, *tuple[str, ...], str],
+    args4: tuple[int, *tuple[str, ...]],
+    args5: tuple[int, *tuple[str, ...], str],
+    args6: tuple[*tuple[str, ...], str],
+    args7: tuple[*tuple[str, ...], int],
+    args8: tuple[int, *tuple[str, ...], int],
+    args9: tuple[str, *tuple[str, ...], int],
+    args10: tuple[str, *tuple[int, ...], str],
+):
+    f1(*args1)
+    f1(*args2)
+    f1(*args3)
+    f1(*args4)  # error: [invalid-argument-type]
+    f1(*args5)  # error: [invalid-argument-type]
+    f1(*args6)
+    f1(*args7)  # error: [invalid-argument-type]
+
+    # The reason for two errors here is because of the two fixed elements in the tuple of `args8`
+    # which are both `int`
+    # error: [invalid-argument-type]
+    # error: [invalid-argument-type]
+    f1(*args8)
+
+    f1(*args9)  # error: [invalid-argument-type]
+    f1(*args10)  # error: [invalid-argument-type]
+```
+
+A union of heterogeneous tuples provided to a variadic parameter:
+
+```py
+# Test inspired by ecosystem code at:
+# - <https://github.com/home-assistant/core/blob/bde4eb50111a72f9717fe73ee5929e50eb06911b/homeassistant/components/lovelace/websocket.py#L50-L59>
+# - <https://github.com/pydata/xarray/blob/3572f4e70f2b12ef9935c1f8c3c1b74045d2a092/xarray/tests/test_groupby.py#L3058-L3059>
+
+def f2(a: str, b: bool): ...
+def f3(coinflip: bool):
+    if coinflip:
+        args = "foo", True
+    else:
+        args = "bar", False
+
+    # revealed: tuple[Literal["foo"], Literal[True]] | tuple[Literal["bar"], Literal[False]]
+    reveal_type(args)
+    f2(*args)  # fine
+
+    if coinflip:
+        other_args = "foo", True
+    else:
+        other_args = "bar", (True,)
+
+    # revealed: tuple[Literal["foo"], Literal[True]] | tuple[Literal["bar"], tuple[Literal[True]]]
+    reveal_type(other_args)
+    # error: [invalid-argument-type] "Argument to function `f2` is incorrect: Expected `bool`, found `Literal[True] | tuple[Literal[True]]`"
+    f2(*other_args)
+
+def f4(a=None, b=None, c=None, d=None, e=None): ...
+
+my_args = ((1, 2), (3, 4), (5, 6))
+
+for tup in my_args:
+    f4(*tup, e=None)  # fine
+
+my_other_args = (
+    (1, 2, 3, 4, 5),
+    (6, 7, 8, 9, 10),
+)
+
+for tup in my_other_args:
+    # error: [parameter-already-assigned] "Multiple values provided for parameter `e` of function `f4`"
+    f4(*tup, e=None)
+```
+
+### Mixed argument and parameter containing variadic
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+def f(x: int, *args: str) -> int:
+    return 1
+
+def _(
+    args1: list[int],
+    args2: tuple[int],
+    args3: tuple[int, int],
+    args4: tuple[int, ...],
+    args5: tuple[int, *tuple[str, ...]],
+    args6: tuple[int, int, *tuple[str, ...]],
+) -> None:
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    reveal_type(f(*args1))  # revealed: int
+
+    # This shouldn't raise an error because the unpacking doesn't match the variadic parameter.
+    reveal_type(f(*args2))  # revealed: int
+
+    # But, this should because the second tuple element is not assignable.
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    reveal_type(f(*args3))  # revealed: int
+
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    reveal_type(f(*args4))  # revealed: int
+
+    # The first element of the tuple matches the required argument;
+    # all subsequent elements match the variadic argument
+    reveal_type(f(*args5))  # revealed: int
+
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    reveal_type(f(*args6))  # revealed: int
+```
+
 ### Keyword argument, positional-or-keyword parameter
 
 ```py
@@ -664,6 +820,30 @@ def f(x: int = 1, y: str = "foo") -> int:
 reveal_type(f(y=2, x="bar"))  # revealed: int
 ```
 
+### Diagnostics for union types where the union is not assignable
+
+<!-- snapshot-diagnostics -->
+
+```py
+from typing import Sized
+
+class Foo: ...
+class Bar: ...
+class Baz: ...
+
+def f(x: Sized): ...
+def g(
+    a: str | Foo,
+    b: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo,
+    c: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo | Bar,
+    d: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo | Bar | Baz,
+):
+    f(a)  # error: [invalid-argument-type]
+    f(b)  # error: [invalid-argument-type]
+    f(c)  # error: [invalid-argument-type]
+    f(d)  # error: [invalid-argument-type]
+```
+
 ## Too many positional arguments
 
 ### One too many
@@ -849,3 +1029,296 @@ is_subtype_of(int, int, int)
 # error: [too-many-positional-arguments]
 is_subtype_of(int, int, int, int)
 ```
+
+## Keywords argument
+
+A double-starred argument (`**kwargs`) can be used to pass an argument that implements the mapping
+protocol. This is matched against any of the *unmatched* standard (positional or keyword),
+keyword-only, and keywords (`**kwargs`) parameters.
+
+### Empty
+
+```py
+def empty() -> None: ...
+def _(kwargs: dict[str, int]) -> None:
+    empty(**kwargs)
+
+empty(**{})
+empty(**dict())
+```
+
+### Single parameter
+
+```py
+from typing_extensions import TypedDict
+
+def f(**kwargs: int) -> None: ...
+
+class Foo(TypedDict):
+    a: int
+    b: int
+
+def _(kwargs: dict[str, int]) -> None:
+    f(**kwargs)
+
+f(**{"foo": 1})
+f(**dict(foo=1))
+f(**Foo(a=1, b=2))
+```
+
+### Positional-only and variadic parameters
+
+```py
+def f1(a: int, b: int, /) -> None: ...
+def f2(*args: int) -> None: ...
+def _(kwargs: dict[str, int]) -> None:
+    # error: [missing-argument] "No arguments provided for required parameters `a`, `b` of function `f1`"
+    f1(**kwargs)
+
+    # This doesn't raise an error because `*args` is an optional parameter and `**kwargs` can be empty.
+    f2(**kwargs)
+```
+
+### Standard parameters
+
+```py
+from typing_extensions import TypedDict
+
+class Foo(TypedDict):
+    a: int
+    b: int
+
+def f(a: int, b: int) -> None: ...
+def _(kwargs: dict[str, int]) -> None:
+    f(**kwargs)
+
+f(**{"a": 1, "b": 2})
+f(**dict(a=1, b=2))
+f(**Foo(a=1, b=2))
+```
+
+### Keyword-only parameters
+
+```py
+from typing_extensions import TypedDict
+
+class Foo(TypedDict):
+    a: int
+    b: int
+
+def f(*, a: int, b: int) -> None: ...
+def _(kwargs: dict[str, int]) -> None:
+    f(**kwargs)
+
+f(**{"a": 1, "b": 2})
+f(**dict(a=1, b=2))
+f(**Foo(a=1, b=2))
+```
+
+### Multiple keywords argument
+
+```py
+def f(**kwargs: int) -> None: ...
+def _(kwargs1: dict[str, int], kwargs2: dict[str, int], kwargs3: dict[str, str], kwargs4: dict[int, list]) -> None:
+    f(**kwargs1, **kwargs2)
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `int`, found `str`"
+    f(**kwargs1, **kwargs3)
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `int`, found `str`"
+    # error: [invalid-argument-type] "Argument expression after ** must be a mapping with `str` key type: Found `int`"
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `int`, found `list[Unknown]`"
+    f(**kwargs3, **kwargs4)
+```
+
+### Keyword-only after keywords
+
+```py
+class B: ...
+
+def f(*, a: int, b: B, **kwargs: int) -> None: ...
+def _(kwargs: dict[str, int]):
+    # Make sure that the `b` argument is not being matched against `kwargs` by passing an integer
+    # instead of the annotated type which should raise an
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `B`, found `Literal[2]`"
+    f(a=1, **kwargs, b=2)
+```
+
+### Mixed parameter kind
+
+```py
+def f1(*, a: int, b: int, **kwargs: int) -> None: ...
+def f2(a: int, *, b: int, **kwargs: int) -> None: ...
+def f3(a: int, /, *args: int, b: int, **kwargs: int) -> None: ...
+def _(kwargs1: dict[str, int], kwargs2: dict[str, str]):
+    f1(**kwargs1)
+    f2(**kwargs1)
+    f3(1, **kwargs1)
+```
+
+### TypedDict
+
+```py
+from typing_extensions import NotRequired, TypedDict
+
+class Foo1(TypedDict):
+    a: int
+    b: str
+
+class Foo2(TypedDict):
+    a: int
+    b: NotRequired[str]
+
+def f(**kwargs: int) -> None: ...
+
+# error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `int`, found `str`"
+f(**Foo1(a=1, b="b"))
+# error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `int`, found `str`"
+f(**Foo2(a=1))
+```
+
+### Keys must be strings
+
+The keys of the mapping passed to a double-starred argument must be strings.
+
+```py
+from collections.abc import Mapping
+
+def f(**kwargs: int) -> None: ...
+
+class DictSubclass(dict[int, int]): ...
+class MappingSubclass(Mapping[int, int]): ...
+
+class MappingProtocol:
+    def keys(self) -> list[int]:
+        return [1]
+
+    def __getitem__(self, key: int) -> int:
+        return 1
+
+def _(kwargs: dict[int, int]) -> None:
+    # error: [invalid-argument-type] "Argument expression after ** must be a mapping with `str` key type: Found `int`"
+    f(**kwargs)
+
+# error: [invalid-argument-type] "Argument expression after ** must be a mapping with `str` key type: Found `int`"
+f(**DictSubclass())
+# error: [invalid-argument-type] "Argument expression after ** must be a mapping with `str` key type: Found `int`"
+f(**MappingSubclass())
+# error: [invalid-argument-type] "Argument expression after ** must be a mapping with `str` key type: Found `int`"
+f(**MappingProtocol())
+```
+
+The key can also be a custom type that inherits from `str`.
+
+```py
+class SubStr(str): ...
+class SubInt(int): ...
+
+def _(kwargs1: dict[SubStr, int], kwargs2: dict[SubInt, int]) -> None:
+    f(**kwargs1)
+    # error: [invalid-argument-type] "Argument expression after ** must be a mapping with `str` key type: Found `SubInt`"
+    f(**kwargs2)
+```
+
+Or, it can be a type that is assignable to `str`.
+
+```py
+from typing import Any
+from ty_extensions import Unknown
+
+def _(kwargs1: dict[Any, int], kwargs2: dict[Unknown, int]) -> None:
+    f(**kwargs1)
+    f(**kwargs2)
+```
+
+### Invalid value type
+
+```py
+from collections.abc import Mapping
+
+def f(**kwargs: str) -> None: ...
+
+class DictSubclass(dict[str, int]): ...
+class MappingSubclass(Mapping[str, int]): ...
+
+class MappingProtocol:
+    def keys(self) -> list[str]:
+        return ["foo"]
+
+    def __getitem__(self, key: str) -> int:
+        return 1
+
+def _(kwargs: dict[str, int]) -> None:
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    f(**kwargs)
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    f(**DictSubclass())
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    f(**MappingSubclass())
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `str`, found `int`"
+    f(**MappingProtocol())
+```
+
+### `Unknown` type
+
+```py
+from ty_extensions import Unknown
+
+def f(**kwargs: int) -> None: ...
+def _(kwargs: Unknown):
+    f(**kwargs)
+```
+
+### Not a mapping
+
+```py
+def f(**kwargs: int) -> None: ...
+
+class A: ...
+
+class InvalidMapping:
+    def keys(self) -> A:
+        return A()
+
+    def __getitem__(self, key: str) -> int:
+        return 1
+
+def _(kwargs: dict[str, int] | int):
+    # error: [invalid-argument-type] "Argument expression after ** must be a mapping type: Found `dict[str, int] | int`"
+    f(**kwargs)
+    # error: [invalid-argument-type] "Argument expression after ** must be a mapping type: Found `InvalidMapping`"
+    f(**InvalidMapping())
+```
+
+### Generic
+
+For a generic keywords parameter, the type variable should be specialized to the value type of the
+mapping.
+
+```py
+from typing import TypeVar
+
+_T = TypeVar("_T")
+
+def f(**kwargs: _T) -> _T:
+    return kwargs["a"]
+
+def _(kwargs: dict[str, int]) -> None:
+    reveal_type(f(**kwargs))  # revealed: int
+```
+
+For a `TypedDict`, the type variable should be specialized to the union of all value types.
+
+```py
+from typing import TypeVar
+from typing_extensions import TypedDict
+
+_T = TypeVar("_T")
+
+class Foo(TypedDict):
+    a: int
+    b: str
+
+def f(**kwargs: _T) -> _T:
+    return kwargs["a"]
+
+reveal_type(f(**Foo(a=1, b="b")))  # revealed: int | str
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/call/getattr_static.md b/crates/ty_python_semantic/resources/mdtest/call/getattr_static.md
index a68bae12d2..a8d87bbfa6 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/getattr_static.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/getattr_static.md
@@ -57,7 +57,7 @@ We can access attributes on objects of all kinds:
 import sys
 
 reveal_type(inspect.getattr_static(sys, "dont_write_bytecode"))  # revealed: bool
-# revealed: def getattr_static(obj: object, attr: str, default: Any | None = ellipsis) -> Any
+# revealed: def getattr_static(obj: object, attr: str, default: Any | None = EllipsisType) -> Any
 reveal_type(inspect.getattr_static(inspect, "getattr_static"))
 
 reveal_type(inspect.getattr_static(1, "real"))  # revealed: property
diff --git a/crates/ty_python_semantic/resources/mdtest/call/methods.md b/crates/ty_python_semantic/resources/mdtest/call/methods.md
index 9bac69ea59..8179e3272d 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/methods.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/methods.md
@@ -69,7 +69,9 @@ reveal_type(bound_method(1))  # revealed: str
 When we call the function object itself, we need to pass the `instance` explicitly:
 
 ```py
-C.f(1)  # error: [missing-argument]
+# error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `C`, found `Literal[1]`"
+# error: [missing-argument]
+C.f(1)
 
 reveal_type(C.f(C(), 1))  # revealed: str
 ```
@@ -309,7 +311,7 @@ reveal_type(C.f(1))  # revealed: str
 The method `f` can not be accessed from an instance of the class:
 
 ```py
-# error: [unresolved-attribute] "Type `C` has no attribute `f`"
+# error: [unresolved-attribute] "Object of type `C` has no attribute `f`"
 C().f
 ```
 
@@ -325,7 +327,7 @@ class D(metaclass=Meta):
 reveal_type(D.f(1))  # revealed: Literal["a"]
 ```
 
-If the class method is possibly unbound, we union the return types:
+If the class method is possibly missing, we union the return types:
 
 ```py
 def flag() -> bool:
@@ -462,6 +464,22 @@ reveal_type(C.f2(1))  # revealed: str
 reveal_type(C().f2(1))  # revealed: str
 ```
 
+### `__init_subclass__`
+
+The [`__init_subclass__`] method is implicitly a classmethod:
+
+```py
+class Base:
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        cls.custom_attribute: int = 0
+
+class Derived(Base):
+    pass
+
+reveal_type(Derived.custom_attribute)  # revealed: int
+```
+
 ## `@staticmethod`
 
 ### Basic
@@ -570,4 +588,131 @@ reveal_type(C.f2(1))  # revealed: str
 reveal_type(C().f2(1))  # revealed: str
 ```
 
+## Builtin functions and methods
+
+Some builtin functions and methods are heavily special-cased by ty. This mdtest checks that various
+properties are understood correctly for these functions and methods.
+
+```py
+import types
+from typing import Callable
+from ty_extensions import static_assert, CallableTypeOf, is_assignable_to, TypeOf
+
+def f(obj: type) -> None: ...
+
+class MyClass:
+    @property
+    def my_property(self) -> int:
+        return 42
+
+    @my_property.setter
+    def my_property(self, value: int | str) -> None: ...
+
+static_assert(is_assignable_to(types.FunctionType, Callable))
+
+# revealed: <wrapper-descriptor `__get__` of `function` objects>
+reveal_type(types.FunctionType.__get__)
+static_assert(is_assignable_to(TypeOf[types.FunctionType.__get__], Callable))
+
+# revealed: def f(obj: type) -> None
+reveal_type(f)
+static_assert(is_assignable_to(TypeOf[f], Callable))
+
+# revealed: <method-wrapper `__get__` of `f`>
+reveal_type(f.__get__)
+static_assert(is_assignable_to(TypeOf[f.__get__], Callable))
+
+# revealed: def __call__(self, *args: Any, **kwargs: Any) -> Any
+reveal_type(types.FunctionType.__call__)
+static_assert(is_assignable_to(TypeOf[types.FunctionType.__call__], Callable))
+
+# revealed: <method-wrapper `__call__` of `f`>
+reveal_type(f.__call__)
+static_assert(is_assignable_to(TypeOf[f.__call__], Callable))
+
+# revealed: <wrapper-descriptor `__get__` of `property` objects>
+reveal_type(property.__get__)
+static_assert(is_assignable_to(TypeOf[property.__get__], Callable))
+
+# revealed: property
+reveal_type(MyClass.my_property)
+static_assert(is_assignable_to(TypeOf[property], Callable))
+static_assert(not is_assignable_to(TypeOf[MyClass.my_property], Callable))
+
+# revealed: <method-wrapper `__get__` of `property` object>
+reveal_type(MyClass.my_property.__get__)
+static_assert(is_assignable_to(TypeOf[MyClass.my_property.__get__], Callable))
+
+# revealed: <wrapper-descriptor `__set__` of `property` objects>
+reveal_type(property.__set__)
+static_assert(is_assignable_to(TypeOf[property.__set__], Callable))
+
+# revealed: <method-wrapper `__set__` of `property` object>
+reveal_type(MyClass.my_property.__set__)
+static_assert(is_assignable_to(TypeOf[MyClass.my_property.__set__], Callable))
+
+# revealed: def startswith(self, prefix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> bool
+reveal_type(str.startswith)
+static_assert(is_assignable_to(TypeOf[str.startswith], Callable))
+
+# revealed: <method-wrapper `startswith` of `str` object>
+reveal_type("foo".startswith)
+static_assert(is_assignable_to(TypeOf["foo".startswith], Callable))
+
+def _(
+    a: CallableTypeOf[types.FunctionType.__get__],
+    b: CallableTypeOf[f],
+    c: CallableTypeOf[f.__get__],
+    d: CallableTypeOf[types.FunctionType.__call__],
+    e: CallableTypeOf[f.__call__],
+    f: CallableTypeOf[property],
+    g: CallableTypeOf[property.__get__],
+    h: CallableTypeOf[MyClass.my_property.__get__],
+    i: CallableTypeOf[property.__set__],
+    j: CallableTypeOf[MyClass.my_property.__set__],
+    k: CallableTypeOf[str.startswith],
+    l: CallableTypeOf["foo".startswith],
+):
+    # revealed: Overload[(self: FunctionType, instance: None, owner: type, /) -> Unknown, (self: FunctionType, instance: object, owner: type | None = None, /) -> Unknown]
+    reveal_type(a)
+
+    # revealed: (obj: type) -> None
+    reveal_type(b)
+
+    # TODO: ideally this would have precise return types rather than `Unknown`
+    # revealed: Overload[(instance: None, owner: type, /) -> Unknown, (instance: object, owner: type | None = None, /) -> Unknown]
+    reveal_type(c)
+
+    # revealed: (self, *args: Any, **kwargs: Any) -> Any
+    reveal_type(d)
+
+    # revealed: (obj: type) -> None
+    reveal_type(e)
+
+    # revealed: (fget: ((Any, /) -> Any) | None = None, fset: ((Any, Any, /) -> None) | None = None, fdel: ((Any, /) -> None) | None = None, doc: str | None = None) -> property
+    reveal_type(f)
+
+    # revealed: Overload[(self: property, instance: None, owner: type, /) -> Unknown, (self: property, instance: object, owner: type | None = None, /) -> Unknown]
+    reveal_type(g)
+
+    # TODO: ideally this would have precise return types rather than `Unknown`
+    # revealed: Overload[(instance: None, owner: type, /) -> Unknown, (instance: object, owner: type | None = None, /) -> Unknown]
+    reveal_type(h)
+
+    # TODO: ideally this would have `-> None` rather than `-> Unknown`
+    # revealed: (self: property, instance: object, value: object, /) -> Unknown
+    reveal_type(i)
+
+    # TODO: ideally this would have a more precise input type and `-> None` rather than `-> Unknown`
+    # revealed: (instance: object, value: object, /) -> Unknown
+    reveal_type(j)
+
+    # revealed: (self, prefix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> bool
+    reveal_type(k)
+
+    # revealed: (prefix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> bool
+    reveal_type(l)
+```
+
 [functions and methods]: https://docs.python.org/3/howto/descriptor.html#functions-and-methods
+[`__init_subclass__`]: https://docs.python.org/3/reference/datamodel.html#object.__init_subclass__
diff --git a/crates/ty_python_semantic/resources/mdtest/call/open.md b/crates/ty_python_semantic/resources/mdtest/call/open.md
new file mode 100644
index 0000000000..2d4552ebd8
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/call/open.md
@@ -0,0 +1,68 @@
+# Calls to `open()`
+
+## `builtins.open`
+
+We do not fully understand typeshed's overloads for `open()` yet, due to missing support for PEP-613
+type aliases. However, we also do not emit false-positive diagnostics on common calls to `open()`:
+
+```py
+import pickle
+
+reveal_type(open(""))  # revealed: TextIOWrapper[_WrappedBuffer]
+reveal_type(open("", "r"))  # revealed: TextIOWrapper[_WrappedBuffer]
+reveal_type(open("", "rb"))  # revealed: @Todo(`builtins.open` return type)
+
+with open("foo.pickle", "rb") as f:
+    x = pickle.load(f)  # fine
+
+def _(mode: str):
+    reveal_type(open("", mode))  # revealed: @Todo(`builtins.open` return type)
+```
+
+## `os.fdopen`
+
+The same is true for `os.fdopen()`:
+
+```py
+import pickle
+import os
+
+reveal_type(os.fdopen(0))  # revealed: TextIOWrapper[_WrappedBuffer]
+reveal_type(os.fdopen(0, "r"))  # revealed: TextIOWrapper[_WrappedBuffer]
+reveal_type(os.fdopen(0, "rb"))  # revealed: @Todo(`os.fdopen` return type)
+
+with os.fdopen(0, "rb") as f:
+    x = pickle.load(f)  # fine
+```
+
+## `Path.open`
+
+And similarly for `Path.open()`:
+
+```py
+from pathlib import Path
+import pickle
+
+reveal_type(Path("").open())  # revealed: @Todo(`Path.open` return type)
+reveal_type(Path("").open("r"))  # revealed: @Todo(`Path.open` return type)
+reveal_type(Path("").open("rb"))  # revealed: @Todo(`Path.open` return type)
+
+with Path("foo.pickle").open("rb") as f:
+    x = pickle.load(f)  # fine
+```
+
+## `NamedTemporaryFile`
+
+And similarly for `tempfile.NamedTemporaryFile()`:
+
+```py
+from tempfile import NamedTemporaryFile
+import pickle
+
+reveal_type(NamedTemporaryFile())  # revealed: _TemporaryFileWrapper[bytes]
+reveal_type(NamedTemporaryFile("r"))  # revealed: _TemporaryFileWrapper[str]
+reveal_type(NamedTemporaryFile("rb"))  # revealed: @Todo(`tempfile.NamedTemporaryFile` return type)
+
+with NamedTemporaryFile("rb") as f:
+    x = pickle.load(f)  # fine
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/call/overloads.md b/crates/ty_python_semantic/resources/mdtest/call/overloads.md
index ca447b6063..726d74a630 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/overloads.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/overloads.md
@@ -99,8 +99,6 @@ If the arity check only matches a single overload, it should be evaluated as a r
 call should be reported directly and not as a `no-matching-overload` error.
 
 ```py
-from typing_extensions import reveal_type
-
 from overloaded import f
 
 reveal_type(f())  # revealed: None
@@ -139,8 +137,7 @@ reveal_type(f(A()))  # revealed: A
 reveal_type(f(*(A(),)))  # revealed: A
 
 reveal_type(f(B()))  # revealed: A
-# TODO: revealed: A
-reveal_type(f(*(B(),)))  # revealed: Unknown
+reveal_type(f(*(B(),)))  # revealed: A
 
 # But, in this case, the arity check filters out the first overload, so we only have one match:
 reveal_type(f(B(), 1))  # revealed: B
@@ -290,16 +287,10 @@ from overloaded import A, f
 
 def _(x: int, y: A | int):
     reveal_type(f(x))  # revealed: int
-    # TODO: revealed: int
-    # TODO: no error
-    # error: [no-matching-overload]
-    reveal_type(f(*(x,)))  # revealed: Unknown
+    reveal_type(f(*(x,)))  # revealed: int
 
     reveal_type(f(y))  # revealed: A | int
-    # TODO: revealed: A | int
-    # TODO: no error
-    # error: [no-matching-overload]
-    reveal_type(f(*(y,)))  # revealed: Unknown
+    reveal_type(f(*(y,)))  # revealed: A | int
 ```
 
 ### Generics (PEP 695)
@@ -328,16 +319,10 @@ from overloaded import B, f
 
 def _(x: int, y: B | int):
     reveal_type(f(x))  # revealed: int
-    # TODO: revealed: int
-    # TODO: no error
-    # error: [no-matching-overload]
-    reveal_type(f(*(x,)))  # revealed: Unknown
+    reveal_type(f(*(x,)))  # revealed: int
 
     reveal_type(f(y))  # revealed: B | int
-    # TODO: revealed: B | int
-    # TODO: no error
-    # error: [no-matching-overload]
-    reveal_type(f(*(y,)))  # revealed: Unknown
+    reveal_type(f(*(y,)))  # revealed: B | int
 ```
 
 ### Expanding `bool`
@@ -563,16 +548,13 @@ from overloaded import MyEnumSubclass, ActualEnum, f
 
 def _(actual_enum: ActualEnum, my_enum_instance: MyEnumSubclass):
     reveal_type(f(actual_enum))  # revealed: Both
-    # TODO: revealed: Both
-    reveal_type(f(*(actual_enum,)))  # revealed: Unknown
+    reveal_type(f(*(actual_enum,)))  # revealed: Both
 
     reveal_type(f(ActualEnum.A))  # revealed: OnlyA
-    # TODO: revealed: OnlyA
-    reveal_type(f(*(ActualEnum.A,)))  # revealed: Unknown
+    reveal_type(f(*(ActualEnum.A,)))  # revealed: OnlyA
 
     reveal_type(f(ActualEnum.B))  # revealed: OnlyB
-    # TODO: revealed: OnlyB
-    reveal_type(f(*(ActualEnum.B,)))  # revealed: Unknown
+    reveal_type(f(*(ActualEnum.B,)))  # revealed: OnlyB
 
     reveal_type(f(my_enum_instance))  # revealed: MyEnumSubclass
     reveal_type(f(*(my_enum_instance,)))  # revealed: MyEnumSubclass
@@ -620,6 +602,457 @@ def _(ab: A | B, ac: A | C, cd: C | D):
     reveal_type(f(*(cd,)))  # revealed: Unknown
 ```
 
+### Optimization: Avoid argument type expansion
+
+Argument type expansion could lead to exponential growth of the number of argument lists that needs
+to be evaluated, so ty deploys some heuristics to prevent this from happening.
+
+Heuristic: If an argument type that cannot be expanded and cannot be assighned to any of the
+remaining overloads before argument type expansion, then even with argument type expansion, it won't
+lead to a successful evaluation of the call.
+
+`overloaded.pyi`:
+
+```pyi
+from typing import overload
+
+class A: ...
+class B: ...
+class C: ...
+
+@overload
+def f() -> None: ...
+@overload
+def f(**kwargs: int) -> C: ...
+@overload
+def f(x: A, /, **kwargs: int) -> A: ...
+@overload
+def f(x: B, /, **kwargs: int) -> B: ...
+
+class Foo:
+    @overload
+    def f(self) -> None: ...
+    @overload
+    def f(self, **kwargs: int) -> C: ...
+    @overload
+    def f(self, x: A, /, **kwargs: int) -> A: ...
+    @overload
+    def f(self, x: B, /, **kwargs: int) -> B: ...
+```
+
+```py
+from overloaded import A, B, C, Foo, f
+from typing_extensions import Any, reveal_type
+
+def _(ab: A | B, a: int | Any):
+    reveal_type(f(a1=a, a2=a, a3=a))  # revealed: C
+    reveal_type(f(A(), a1=a, a2=a, a3=a))  # revealed: A
+    reveal_type(f(B(), a1=a, a2=a, a3=a))  # revealed: B
+
+    # Here, the arity check filters out the first and second overload, type checking fails on the
+    # remaining overloads, so ty moves on to argument type expansion. But, the first argument (`C`)
+    # isn't assignable to any of the remaining overloads (3 and 4), so there's no point in expanding
+    # the other 30 arguments of type `Unknown | Literal[1]` which would result in allocating a
+    # vector containing 2**30 argument lists after expanding all of the arguments.
+    reveal_type(
+        # error: [no-matching-overload]
+        # revealed: Unknown
+        f(
+            C(),
+            a1=a,
+            a2=a,
+            a3=a,
+            a4=a,
+            a5=a,
+            a6=a,
+            a7=a,
+            a8=a,
+            a9=a,
+            a10=a,
+            a11=a,
+            a12=a,
+            a13=a,
+            a14=a,
+            a15=a,
+            a16=a,
+            a17=a,
+            a18=a,
+            a19=a,
+            a20=a,
+            a21=a,
+            a22=a,
+            a23=a,
+            a24=a,
+            a25=a,
+            a26=a,
+            a27=a,
+            a28=a,
+            a29=a,
+            a30=a,
+        )
+    )
+
+    # Here, the heuristics won't come into play because all arguments can be expanded but expanding
+    # the first argument resutls in a successful evaluation of the call, so there's no exponential
+    # growth of the number of argument lists.
+    reveal_type(
+        # revealed: A | B
+        f(
+            ab,
+            a1=a,
+            a2=a,
+            a3=a,
+            a4=a,
+            a5=a,
+            a6=a,
+            a7=a,
+            a8=a,
+            a9=a,
+            a10=a,
+            a11=a,
+            a12=a,
+            a13=a,
+            a14=a,
+            a15=a,
+            a16=a,
+            a17=a,
+            a18=a,
+            a19=a,
+            a20=a,
+            a21=a,
+            a22=a,
+            a23=a,
+            a24=a,
+            a25=a,
+            a26=a,
+            a27=a,
+            a28=a,
+            a29=a,
+            a30=a,
+        )
+    )
+
+def _(foo: Foo, ab: A | B, a: int | Any):
+    reveal_type(foo.f(a1=a, a2=a, a3=a))  # revealed: C
+    reveal_type(foo.f(A(), a1=a, a2=a, a3=a))  # revealed: A
+    reveal_type(foo.f(B(), a1=a, a2=a, a3=a))  # revealed: B
+
+    reveal_type(
+        # error: [no-matching-overload]
+        # revealed: Unknown
+        foo.f(
+            C(),
+            a1=a,
+            a2=a,
+            a3=a,
+            a4=a,
+            a5=a,
+            a6=a,
+            a7=a,
+            a8=a,
+            a9=a,
+            a10=a,
+            a11=a,
+            a12=a,
+            a13=a,
+            a14=a,
+            a15=a,
+            a16=a,
+            a17=a,
+            a18=a,
+            a19=a,
+            a20=a,
+            a21=a,
+            a22=a,
+            a23=a,
+            a24=a,
+            a25=a,
+            a26=a,
+            a27=a,
+            a28=a,
+            a29=a,
+            a30=a,
+        )
+    )
+
+    reveal_type(
+        # revealed: A | B
+        foo.f(
+            ab,
+            a1=a,
+            a2=a,
+            a3=a,
+            a4=a,
+            a5=a,
+            a6=a,
+            a7=a,
+            a8=a,
+            a9=a,
+            a10=a,
+            a11=a,
+            a12=a,
+            a13=a,
+            a14=a,
+            a15=a,
+            a16=a,
+            a17=a,
+            a18=a,
+            a19=a,
+            a20=a,
+            a21=a,
+            a22=a,
+            a23=a,
+            a24=a,
+            a25=a,
+            a26=a,
+            a27=a,
+            a28=a,
+            a29=a,
+            a30=a,
+        )
+    )
+```
+
+### Optimization: Limit expansion size
+
+<!-- snapshot-diagnostics -->
+
+To prevent combinatorial explosion, ty limits the number of argument lists created by expanding a
+single argument.
+
+`overloaded.pyi`:
+
+```pyi
+from typing import overload
+
+class A: ...
+class B: ...
+class C: ...
+
+@overload
+def f() -> None: ...
+@overload
+def f(**kwargs: int) -> C: ...
+@overload
+def f(x: A, /, **kwargs: int) -> A: ...
+@overload
+def f(x: B, /, **kwargs: int) -> B: ...
+```
+
+```py
+from overloaded import A, B, f
+from typing_extensions import reveal_type
+
+def _(a: int | None):
+    reveal_type(
+        # error: [no-matching-overload]
+        # revealed: Unknown
+        f(
+            A(),
+            a1=a,
+            a2=a,
+            a3=a,
+            a4=a,
+            a5=a,
+            a6=a,
+            a7=a,
+            a8=a,
+            a9=a,
+            a10=a,
+            a11=a,
+            a12=a,
+            a13=a,
+            a14=a,
+            a15=a,
+            a16=a,
+            a17=a,
+            a18=a,
+            a19=a,
+            a20=a,
+            a21=a,
+            a22=a,
+            a23=a,
+            a24=a,
+            a25=a,
+            a26=a,
+            a27=a,
+            a28=a,
+            a29=a,
+            a30=a,
+        )
+    )
+```
+
+### Retry from parameter matching
+
+As per the spec, the argument type expansion should retry evaluating the expanded argument list from
+the type checking step. However, that creates an issue when variadic arguments are involved because
+if a variadic argument is a union type, it could be expanded to have different arities. So, ty
+retries it from the start which includes parameter matching as well.
+
+`overloaded.pyi`:
+
+```pyi
+from typing import overload
+
+@overload
+def f(x: int, y: int) -> None: ...
+@overload
+def f(x: int, y: str, z: int) -> None: ...
+```
+
+```py
+from overloaded import f
+
+# Test all of the above with a number of different splatted argument types
+
+def _(t: tuple[int, str]) -> None:
+    # This correctly produces an error because the first element of the union has a precise arity of
+    # 2, which matches the first overload, but the second element of the tuple doesn't match the
+    # second parameter type, yielding an `invalid-argument-type` error.
+    f(*t)  # error: [invalid-argument-type]
+
+def _(t: tuple[int, str, int]) -> None:
+    # This correctly produces no error because the first element of the union has a precise arity of
+    # 3, which matches the second overload.
+    f(*t)
+
+def _(t: tuple[int, str] | tuple[int, str, int]) -> None:
+    # This produces an error because the expansion produces two argument lists: `[*tuple[int, str]]`
+    # and `[*tuple[int, str, int]]`. The first list produces produces a type checking error as
+    # described in the first example, while the second list matches the second overload. And,
+    # because not all of the expanded argument list evaluates successfully, we produce an error.
+    f(*t)  # error: [no-matching-overload]
+```
+
+## Filtering based on variaidic arguments
+
+This is step 4 of the overload call evaluation algorithm which specifies that:
+
+> If the argument list is compatible with two or more overloads, determine whether one or more of
+> the overloads has a variadic parameter (either `*args` or `**kwargs`) that maps to a corresponding
+> argument that supplies an indeterminate number of positional or keyword arguments. If so,
+> eliminate overloads that do not have a variadic parameter.
+
+This is only performed if the previous step resulted in more than one matching overload.
+
+### Simple `*args`
+
+`overloaded.pyi`:
+
+```pyi
+from typing import overload
+
+@overload
+def f(x1: int) -> tuple[int]: ...
+@overload
+def f(x1: int, x2: int) -> tuple[int, int]: ...
+@overload
+def f(*args: int) -> int: ...
+```
+
+```py
+from overloaded import f
+
+def _(x1: int, x2: int, args: list[int]):
+    reveal_type(f(x1))  # revealed: tuple[int]
+    reveal_type(f(x1, x2))  # revealed: tuple[int, int]
+    reveal_type(f(*(x1, x2)))  # revealed: tuple[int, int]
+
+    # Step 4 should filter out all but the last overload.
+    reveal_type(f(*args))  # revealed: int
+```
+
+### Variable `*args`
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+`overloaded.pyi`:
+
+```pyi
+from typing import overload
+
+@overload
+def f(x1: int) -> tuple[int]: ...
+@overload
+def f(x1: int, x2: int) -> tuple[int, int]: ...
+@overload
+def f(x1: int, *args: int) -> tuple[int, ...]: ...
+```
+
+```py
+from overloaded import f
+
+def _(x1: int, x2: int, args1: list[int], args2: tuple[int, *tuple[int, ...]]):
+    reveal_type(f(x1, x2))  # revealed: tuple[int, int]
+    reveal_type(f(*(x1, x2)))  # revealed: tuple[int, int]
+
+    # Step 4 should filter out all but the last overload.
+    reveal_type(f(x1, *args1))  # revealed: tuple[int, ...]
+    reveal_type(f(*args2))  # revealed: tuple[int, ...]
+```
+
+### Simple `**kwargs`
+
+`overloaded.pyi`:
+
+```pyi
+from typing import overload
+
+@overload
+def f(*, x1: int) -> int: ...
+@overload
+def f(*, x1: int, x2: int) -> tuple[int, int]: ...
+@overload
+def f(**kwargs: int) -> int: ...
+```
+
+```py
+from overloaded import f
+
+def _(x1: int, x2: int, kwargs: dict[str, int]):
+    reveal_type(f(x1=x1))  # revealed: int
+    reveal_type(f(x1=x1, x2=x2))  # revealed: tuple[int, int]
+
+    # Step 4 should filter out all but the last overload.
+    reveal_type(f(**{"x1": x1, "x2": x2}))  # revealed: int
+    reveal_type(f(**kwargs))  # revealed: int
+```
+
+### `TypedDict`
+
+The keys in a `TypedDict` are static so there's no variable part to it, so step 4 shouldn't filter
+out any overloads.
+
+`overloaded.pyi`:
+
+```pyi
+from typing import TypedDict, overload
+
+@overload
+def f(*, x: int) -> int: ...
+@overload
+def f(*, x: int, y: int) -> tuple[int, int]: ...
+@overload
+def f(**kwargs: int) -> tuple[int, ...]: ...
+```
+
+```py
+from typing import TypedDict
+from overloaded import f
+
+class Foo(TypedDict):
+    x: int
+    y: int
+
+def _(foo: Foo, kwargs: dict[str, int]):
+    reveal_type(f(**foo))  # revealed: tuple[int, int]
+    reveal_type(f(**kwargs))  # revealed: tuple[int, ...]
+```
+
 ## Filtering based on `Any` / `Unknown`
 
 This is the step 5 of the overload call evaluation algorithm which specifies that:
@@ -658,12 +1091,10 @@ reveal_type(f(*(1,)))  # revealed: str
 
 def _(list_int: list[int], list_any: list[Any]):
     reveal_type(f(list_int))  # revealed: int
-    # TODO: revealed: int
-    reveal_type(f(*(list_int,)))  # revealed: Unknown
+    reveal_type(f(*(list_int,)))  # revealed: int
 
     reveal_type(f(list_any))  # revealed: int
-    # TODO: revealed: int
-    reveal_type(f(*(list_any,)))  # revealed: Unknown
+    reveal_type(f(*(list_any,)))  # revealed: int
 ```
 
 ### Single list argument (ambiguous)
@@ -697,8 +1128,7 @@ def _(list_int: list[int], list_any: list[Any]):
     # All materializations of `list[int]` are assignable to `list[int]`, so it matches the first
     # overload.
     reveal_type(f(list_int))  # revealed: int
-    # TODO: revealed: int
-    reveal_type(f(*(list_int,)))  # revealed: Unknown
+    reveal_type(f(*(list_int,)))  # revealed: int
 
     # All materializations of `list[Any]` are assignable to `list[int]` and `list[Any]`, but the
     # return type of first and second overloads are not equivalent, so the overload matching
@@ -731,25 +1161,21 @@ reveal_type(f("a"))  # revealed: str
 reveal_type(f(*("a",)))  # revealed: str
 
 reveal_type(f((1, "b")))  # revealed: int
-# TODO: revealed: int
-reveal_type(f(*((1, "b"),)))  # revealed: Unknown
+reveal_type(f(*((1, "b"),)))  # revealed: int
 
 reveal_type(f((1, 2)))  # revealed: int
-# TODO: revealed: int
-reveal_type(f(*((1, 2),)))  # revealed: Unknown
+reveal_type(f(*((1, 2),)))  # revealed: int
 
 def _(int_str: tuple[int, str], int_any: tuple[int, Any], any_any: tuple[Any, Any]):
     # All materializations are assignable to first overload, so second and third overloads are
     # eliminated
     reveal_type(f(int_str))  # revealed: int
-    # TODO: revealed: int
-    reveal_type(f(*(int_str,)))  # revealed: Unknown
+    reveal_type(f(*(int_str,)))  # revealed: int
 
     # All materializations are assignable to second overload, so the third overload is eliminated;
     # the return type of first and second overload is equivalent
     reveal_type(f(int_any))  # revealed: int
-    # TODO: revealed: int
-    reveal_type(f(*(int_any,)))  # revealed: Unknown
+    reveal_type(f(*(int_any,)))  # revealed: int
 
     # All materializations of `tuple[Any, Any]` are assignable to the parameters of all the
     # overloads, but the return types aren't equivalent, so the overload matching is ambiguous
@@ -757,6 +1183,45 @@ def _(int_str: tuple[int, str], int_any: tuple[int, Any], any_any: tuple[Any, An
     reveal_type(f(*(any_any,)))  # revealed: Unknown
 ```
 
+### `Unknown` passed into an overloaded function annotated with protocols
+
+`Foo.join()` here has similar annotations to `str.join()` in typeshed:
+
+`module.pyi`:
+
+```pyi
+from typing_extensions import Iterable, overload, LiteralString, Protocol
+from ty_extensions import Unknown, is_assignable_to
+
+class Foo:
+    @overload
+    def join(self, iterable: Iterable[LiteralString], /) -> LiteralString: ...
+    @overload
+    def join(self, iterable: Iterable[str], /) -> str: ...
+```
+
+`main.py`:
+
+```py
+from module import Foo
+from typing_extensions import LiteralString
+
+def f(a: Foo, b: list[str], c: list[LiteralString], e):
+    reveal_type(e)  # revealed: Unknown
+    reveal_type(a.join(b))  # revealed: str
+    reveal_type(a.join(c))  # revealed: LiteralString
+
+    # since both overloads match and they have return types that are not equivalent,
+    # step (5) of the overload evaluation algorithm says we must evaluate the result of the
+    # call as `Unknown`.
+    #
+    # Note: although the spec does not state as such (since intersections in general are not
+    # specified currently), `(str | LiteralString) & Unknown` might also be a reasonable type
+    # here (the union of all overload returns, intersected with `Unknown`) -- here that would
+    # simplify to `str & Unknown`.
+    reveal_type(a.join(e))  # revealed: Unknown
+```
+
 ### Multiple arguments
 
 `overloaded.pyi`:
@@ -784,26 +1249,22 @@ def _(list_int: list[int], list_any: list[Any], int_str: tuple[int, str], int_an
     # All materializations of both argument types are assignable to the first overload, so the
     # second and third overloads are filtered out
     reveal_type(f(list_int, int_str))  # revealed: A
-    # TODO: revealed: A
-    reveal_type(f(*(list_int, int_str)))  # revealed: Unknown
+    reveal_type(f(*(list_int, int_str)))  # revealed: A
 
     # All materialization of first argument is assignable to first overload and for the second
     # argument, they're assignable to the second overload, so the third overload is filtered out
     reveal_type(f(list_int, int_any))  # revealed: A
-    # TODO: revealed: A
-    reveal_type(f(*(list_int, int_any)))  # revealed: Unknown
+    reveal_type(f(*(list_int, int_any)))  # revealed: A
 
     # All materialization of first argument is assignable to second overload and for the second
     # argument, they're assignable to the first overload, so the third overload is filtered out
     reveal_type(f(list_any, int_str))  # revealed: A
-    # TODO: revealed: A
-    reveal_type(f(*(list_any, int_str)))  # revealed: Unknown
+    reveal_type(f(*(list_any, int_str)))  # revealed: A
 
     # All materializations of both arguments are assignable to the second overload, so the third
     # overload is filtered out
     reveal_type(f(list_any, int_any))  # revealed: A
-    # TODO: revealed: A
-    reveal_type(f(*(list_any, int_any)))  # revealed: Unknown
+    reveal_type(f(*(list_any, int_any)))  # revealed: A
 
     # All materializations of first argument is assignable to the second overload and for the second
     # argument, they're assignable to the third overload, so no overloads are filtered out; the
@@ -834,8 +1295,7 @@ from overloaded import f
 
 def _(literal: LiteralString, string: str, any: Any):
     reveal_type(f(literal))  # revealed: LiteralString
-    # TODO: revealed: LiteralString
-    reveal_type(f(*(literal,)))  # revealed: Unknown
+    reveal_type(f(*(literal,)))  # revealed: LiteralString
 
     reveal_type(f(string))  # revealed: str
     reveal_type(f(*(string,)))  # revealed: str
@@ -873,12 +1333,10 @@ from overloaded import f
 
 def _(list_int: list[int], list_str: list[str], list_any: list[Any], any: Any):
     reveal_type(f(list_int))  # revealed: A
-    # TODO: revealed: A
-    reveal_type(f(*(list_int,)))  # revealed: Unknown
+    reveal_type(f(*(list_int,)))  # revealed: A
 
     reveal_type(f(list_str))  # revealed: str
-    # TODO: Should be `str`
-    reveal_type(f(*(list_str,)))  # revealed: Unknown
+    reveal_type(f(*(list_str,)))  # revealed: str
 
     reveal_type(f(list_any))  # revealed: Unknown
     reveal_type(f(*(list_any,)))  # revealed: Unknown
@@ -912,21 +1370,14 @@ def _(integer: int, string: str, any: Any, list_any: list[Any]):
     reveal_type(f(*(integer, string)))  # revealed: int
 
     reveal_type(f(string, integer))  # revealed: int
-    # TODO: revealed: int
-    # TODO: no error
-    # error: [no-matching-overload]
-    reveal_type(f(*(string, integer)))  # revealed: Unknown
+    reveal_type(f(*(string, integer)))  # revealed: int
 
     # This matches the second overload and is _not_ the case of ambiguous overload matching.
     reveal_type(f(string, any))  # revealed: Any
-    # TODO: Any
-    reveal_type(f(*(string, any)))  # revealed: tuple[str, Any]
+    reveal_type(f(*(string, any)))  # revealed: Any
 
     reveal_type(f(string, list_any))  # revealed: list[Any]
-    # TODO: revealed: list[Any]
-    # TODO: no error
-    # error: [no-matching-overload]
-    reveal_type(f(*(string, list_any)))  # revealed: Unknown
+    reveal_type(f(*(string, list_any)))  # revealed: list[Any]
 ```
 
 ### Generic `self`
@@ -1086,12 +1537,10 @@ def _(any: Any):
     reveal_type(f(*(any,), flag=False))  # revealed: str
 
 def _(args: tuple[Any, Literal[True]]):
-    # TODO: revealed: int
-    reveal_type(f(*args))  # revealed: Unknown
+    reveal_type(f(*args))  # revealed: int
 
 def _(args: tuple[Any, Literal[False]]):
-    # TODO: revealed: str
-    reveal_type(f(*args))  # revealed: Unknown
+    reveal_type(f(*args))  # revealed: str
 ```
 
 ### Argument type expansion
@@ -1207,3 +1656,67 @@ def _(arg: tuple[A | B, Any]):
     reveal_type(f(arg))  # revealed: Unknown
     reveal_type(f(*(arg,)))  # revealed: Unknown
 ```
+
+## Bidirectional Type Inference
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+Type inference accounts for parameter type annotations across all overloads.
+
+```py
+from typing import TypedDict, overload
+
+class T(TypedDict):
+    x: int
+
+@overload
+def f(a: list[T], b: int) -> int: ...
+@overload
+def f(a: list[dict[str, int]], b: str) -> str: ...
+def f(a: list[dict[str, int]] | list[T], b: int | str) -> int | str:
+    return 1
+
+def int_or_str() -> int | str:
+    return 1
+
+x = f([{"x": 1}], int_or_str())
+reveal_type(x)  # revealed: int | str
+
+# TODO: error: [no-matching-overload] "No overload of function `f` matches arguments"
+# we currently incorrectly consider `list[dict[str, int]]` a subtype of `list[T]`
+f([{"y": 1}], int_or_str())
+```
+
+Non-matching overloads do not produce diagnostics:
+
+```py
+from typing import TypedDict, overload
+
+class T(TypedDict):
+    x: int
+
+@overload
+def f(a: T, b: int) -> int: ...
+@overload
+def f(a: dict[str, int], b: str) -> str: ...
+def f(a: T | dict[str, int], b: int | str) -> int | str:
+    return 1
+
+x = f({"y": 1}, "a")
+reveal_type(x)  # revealed: str
+```
+
+```py
+from typing import SupportsRound, overload
+
+@overload
+def takes_str_or_float(x: str): ...
+@overload
+def takes_str_or_float(x: float): ...
+def takes_str_or_float(x: float | str): ...
+
+takes_str_or_float(round(1.0))
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/call/replace.md b/crates/ty_python_semantic/resources/mdtest/call/replace.md
index b0112c1129..a5e5390b97 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/replace.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/replace.md
@@ -17,7 +17,8 @@ from datetime import time
 t = time(12, 0, 0)
 t = replace(t, minute=30)
 
-reveal_type(t)  # revealed: time
+# TODO: this should be `time`, once we support specialization of generic protocols
+reveal_type(t)  # revealed: Unknown
 ```
 
 ## The `__replace__` protocol
@@ -47,7 +48,8 @@ b = a.__replace__(x=3, y=4)
 reveal_type(b)  # revealed: Point
 
 b = replace(a, x=3, y=4)
-reveal_type(b)  # revealed: Point
+# TODO: this should be `Point`, once we support specialization of generic protocols
+reveal_type(b)  # revealed: Unknown
 ```
 
 A call to `replace` does not require all keyword arguments:
@@ -57,7 +59,8 @@ c = a.__replace__(y=4)
 reveal_type(c)  # revealed: Point
 
 d = replace(a, y=4)
-reveal_type(d)  # revealed: Point
+# TODO: this should be `Point`, once we support specialization of generic protocols
+reveal_type(d)  # revealed: Unknown
 ```
 
 Invalid calls to `__replace__` or `replace` will raise an error:
diff --git a/crates/ty_python_semantic/resources/mdtest/call/str_startswith.md b/crates/ty_python_semantic/resources/mdtest/call/str_startswith.md
index 643f174763..581c5598d6 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/str_startswith.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/str_startswith.md
@@ -47,4 +47,19 @@ def _(string_instance: str, literalstring: LiteralString):
     reveal_type("a".startswith(literalstring))  # revealed: bool
 ```
 
+Unlike bound methods for some other classes implemented in C, `"foo".startswith` is an instance of
+`types.BuiltinFunctionType` at runtime, rather than `types.MethodWrapperType`:
+
+```py
+import types
+from ty_extensions import TypeOf, static_assert, is_subtype_of
+
+static_assert(is_subtype_of(TypeOf["foo".startswith], types.BuiltinFunctionType))
+
+# `types.BuiltinMethodType` is just an alias for `types.BuiltinFunctionType`
+static_assert(is_subtype_of(TypeOf["foo".startswith], types.BuiltinMethodType))
+static_assert(not is_subtype_of(TypeOf["foo".startswith], types.MethodWrapperType))
+static_assert(not is_subtype_of(TypeOf["foo".startswith], types.WrapperDescriptorType))
+```
+
 [`sys.platform` checks]: https://docs.python.org/3/library/sys.html#sys.platform
diff --git a/crates/ty_python_semantic/resources/mdtest/call/union.md b/crates/ty_python_semantic/resources/mdtest/call/union.md
index b7df404383..c950f7f482 100644
--- a/crates/ty_python_semantic/resources/mdtest/call/union.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/union.md
@@ -251,3 +251,59 @@ from ty_extensions import Intersection, Not
 def _(x: Union[Intersection[Any, Not[int]], Intersection[Any, Not[int]]]):
     reveal_type(x)  # revealed: Any & ~int
 ```
+
+## Bidirectional Type Inference
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+Type inference accounts for parameter type annotations across all signatures in a union.
+
+```py
+from typing import TypedDict, overload
+
+class T(TypedDict):
+    x: int
+
+def _(flag: bool):
+    if flag:
+        def f(x: T) -> int:
+            return 1
+    else:
+        def f(x: dict[str, int]) -> int:
+            return 1
+    x = f({"x": 1})
+    reveal_type(x)  # revealed: int
+
+    # TODO: error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `T`, found `dict[str, int]`"
+    # we currently consider `TypedDict` instances to be subtypes of `dict`
+    f({"y": 1})
+```
+
+Diagnostics unrelated to the type-context are only reported once:
+
+```py
+def f[T](x: T) -> list[T]:
+    return [x]
+
+def a(x: list[bool], y: list[bool]): ...
+def b(x: list[int], y: list[int]): ...
+def c(x: list[int], y: list[int]): ...
+def _(x: int):
+    if x == 0:
+        y = a
+    elif x == 1:
+        y = b
+    else:
+        y = c
+
+    if x == 0:
+        z = True
+
+    y(f(True), [True])
+
+    # error: [possibly-unresolved-reference] "Name `z` used when possibly not defined"
+    y(f(True), [z])
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/class/super.md b/crates/ty_python_semantic/resources/mdtest/class/super.md
index c7b6e0ef80..d08c5777c1 100644
--- a/crates/ty_python_semantic/resources/mdtest/class/super.md
+++ b/crates/ty_python_semantic/resources/mdtest/class/super.md
@@ -14,10 +14,19 @@ common usage.
 
 ### Explicit Super Object
 
+<!-- snapshot-diagnostics -->
+
 `super(pivot_class, owner)` performs attribute lookup along the MRO, starting immediately after the
 specified pivot class.
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
+from __future__ import annotations
+
 class A:
     def a(self): ...
     aa: int = 1
@@ -34,21 +43,15 @@ reveal_type(C.__mro__)  # revealed: tuple[<class 'C'>, <class 'B'>, <class 'A'>,
 
 super(C, C()).a
 super(C, C()).b
-# error: [unresolved-attribute] "Type `<super: <class 'C'>, C>` has no attribute `c`"
-super(C, C()).c
+super(C, C()).c  # error: [unresolved-attribute]
 
 super(B, C()).a
-# error: [unresolved-attribute] "Type `<super: <class 'B'>, C>` has no attribute `b`"
-super(B, C()).b
-# error: [unresolved-attribute] "Type `<super: <class 'B'>, C>` has no attribute `c`"
-super(B, C()).c
+super(B, C()).b  # error: [unresolved-attribute]
+super(B, C()).c  # error: [unresolved-attribute]
 
-# error: [unresolved-attribute] "Type `<super: <class 'A'>, C>` has no attribute `a`"
-super(A, C()).a
-# error: [unresolved-attribute] "Type `<super: <class 'A'>, C>` has no attribute `b`"
-super(A, C()).b
-# error: [unresolved-attribute] "Type `<super: <class 'A'>, C>` has no attribute `c`"
-super(A, C()).c
+super(A, C()).a  # error: [unresolved-attribute]
+super(A, C()).b  # error: [unresolved-attribute]
+super(A, C()).c  # error: [unresolved-attribute]
 
 reveal_type(super(C, C()).a)  # revealed: bound method C.a() -> Unknown
 reveal_type(super(C, C()).b)  # revealed: bound method C.b() -> Unknown
@@ -56,12 +59,100 @@ reveal_type(super(C, C()).aa)  # revealed: int
 reveal_type(super(C, C()).bb)  # revealed: int
 ```
 
+Examples of explicit `super()` with unusual types. We allow almost any type to be passed as the
+second argument to `super()` -- the only exceptions are "pure abstract" types such as `Callable` and
+synthesized `Protocol`s that cannot be upcast to, or interpreted as, a non-`object` nominal type.
+
+```py
+import types
+from typing_extensions import Callable, TypeIs, Literal, TypedDict
+
+def f(): ...
+
+class Foo[T]:
+    def method(self): ...
+    @property
+    def some_property(self): ...
+
+type Alias = int
+
+class SomeTypedDict(TypedDict):
+    x: int
+    y: bytes
+
+# revealed: <super: <class 'object'>, FunctionType>
+reveal_type(super(object, f))
+# revealed: <super: <class 'object'>, WrapperDescriptorType>
+reveal_type(super(object, types.FunctionType.__get__))
+# revealed: <super: <class 'object'>, GenericAlias>
+reveal_type(super(object, Foo[int]))
+# revealed: <super: <class 'object'>, _SpecialForm>
+reveal_type(super(object, Literal))
+# revealed: <super: <class 'object'>, TypeAliasType>
+reveal_type(super(object, Alias))
+# revealed: <super: <class 'object'>, MethodType>
+reveal_type(super(object, Foo().method))
+# revealed: <super: <class 'object'>, property>
+reveal_type(super(object, Foo.some_property))
+
+def g(x: object) -> TypeIs[list[object]]:
+    return isinstance(x, list)
+
+def _(x: object, y: SomeTypedDict, z: Callable[[int, str], bool]):
+    if hasattr(x, "bar"):
+        # revealed: <Protocol with members 'bar'>
+        reveal_type(x)
+        # error: [invalid-super-argument]
+        # revealed: Unknown
+        reveal_type(super(object, x))
+
+    # error: [invalid-super-argument]
+    # revealed: Unknown
+    reveal_type(super(object, z))
+
+    is_list = g(x)
+    # revealed: TypeIs[list[object] @ x]
+    reveal_type(is_list)
+    # revealed: <super: <class 'object'>, bool>
+    reveal_type(super(object, is_list))
+
+    # revealed: <super: <class 'object'>, dict[Literal["x", "y"], int | bytes]>
+    reveal_type(super(object, y))
+
+# The first argument to `super()` must be an actual class object;
+# instances of `GenericAlias` are not accepted at runtime:
+#
+# error: [invalid-super-argument]
+# revealed: Unknown
+reveal_type(super(list[int], []))
+```
+
+`super(pivot_class, owner)` can be called from inside methods, just like single-argument `super()`:
+
+```py
+class Super:
+    def method(self) -> int:
+        return 42
+
+class Sub(Super):
+    def method(self: Sub) -> int:
+        # revealed: <super: <class 'Sub'>, Sub>
+        return reveal_type(super(self.__class__, self)).method()
+```
+
 ### Implicit Super Object
 
+<!-- snapshot-diagnostics -->
+
 The implicit form `super()` is same as `super(__class__, <first argument>)`. The `__class__` refers
 to the class that contains the function where `super()` is used. The first argument refers to the
 current method’s first parameter (typically `self` or `cls`).
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
 from __future__ import annotations
 
@@ -72,13 +163,13 @@ class A:
 
 class B(A):
     def __init__(self, a: int):
-        # TODO: Once `Self` is supported, this should be `<super: <class 'B'>, B>`
-        reveal_type(super())  # revealed: <super: <class 'B'>, Unknown>
+        reveal_type(super())  # revealed: <super: <class 'B'>, B>
+        reveal_type(super(object, super()))  # revealed: <super: <class 'object'>, super>
         super().__init__(a)
 
     @classmethod
     def f(cls):
-        # TODO: Once `Self` is supported, this should be `<super: <class 'B'>, <class 'B'>>`
+        # TODO: Once `cls` is supported, this should be `<super: <class 'B'>, <class 'B'>>`
         reveal_type(super())  # revealed: <super: <class 'B'>, Unknown>
         super().f()
 
@@ -86,6 +177,123 @@ super(B, B(42)).__init__(42)
 super(B, B).f()
 ```
 
+Some examples with unusual annotations for `self` or `cls`:
+
+```py
+import enum
+from typing import Any, Self, Never, Protocol, Callable
+from ty_extensions import Intersection
+
+class BuilderMeta(type):
+    def __new__(
+        cls: type[Any],
+        name: str,
+        bases: tuple[type, ...],
+        dct: dict[str, Any],
+    ) -> BuilderMeta:
+        # revealed: <super: <class 'BuilderMeta'>, Any>
+        s = reveal_type(super())
+        # revealed: Any
+        return reveal_type(s.__new__(cls, name, bases, dct))
+
+class BuilderMeta2(type):
+    def __new__(
+        cls: type[BuilderMeta2],
+        name: str,
+        bases: tuple[type, ...],
+        dct: dict[str, Any],
+    ) -> BuilderMeta2:
+        # revealed: <super: <class 'BuilderMeta2'>, <class 'BuilderMeta2'>>
+        s = reveal_type(super())
+        # TODO: should be `BuilderMeta2` (needs https://github.com/astral-sh/ty/issues/501)
+        # revealed:  Unknown
+        return reveal_type(s.__new__(cls, name, bases, dct))
+
+class Foo[T]:
+    x: T
+
+    def method(self: Any):
+        reveal_type(super())  # revealed: <super: <class 'Foo'>, Any>
+
+        if isinstance(self, Foo):
+            reveal_type(super())  # revealed: <super: <class 'Foo'>, Any>
+
+    def method2(self: Foo[T]):
+        # revealed: <super: <class 'Foo'>, Foo[T@Foo]>
+        reveal_type(super())
+
+    def method3(self: Foo):
+        # revealed: <super: <class 'Foo'>, Foo[Unknown]>
+        reveal_type(super())
+
+    def method4(self: Self):
+        # revealed: <super: <class 'Foo'>, Foo[T@Foo]>
+        reveal_type(super())
+
+    def method5[S: Foo[int]](self: S, other: S) -> S:
+        # revealed: <super: <class 'Foo'>, Foo[int]>
+        reveal_type(super())
+        return self
+
+    def method6[S: (Foo[int], Foo[str])](self: S, other: S) -> S:
+        # revealed: <super: <class 'Foo'>, Foo[int]> | <super: <class 'Foo'>, Foo[str]>
+        reveal_type(super())
+        return self
+
+    def method7[S](self: S, other: S) -> S:
+        # error: [invalid-super-argument]
+        # revealed: Unknown
+        reveal_type(super())
+        return self
+
+    def method8[S: int](self: S, other: S) -> S:
+        # error: [invalid-super-argument]
+        # revealed: Unknown
+        reveal_type(super())
+        return self
+
+    def method9[S: (int, str)](self: S, other: S) -> S:
+        # error: [invalid-super-argument]
+        # revealed: Unknown
+        reveal_type(super())
+        return self
+
+    def method10[S: Callable[..., str]](self: S, other: S) -> S:
+        # error: [invalid-super-argument]
+        # revealed: Unknown
+        reveal_type(super())
+        return self
+
+type Alias = Bar
+
+class Bar:
+    def method(self: Alias):
+        # revealed: <super: <class 'Bar'>, Bar>
+        reveal_type(super())
+
+    def pls_dont_call_me(self: Never):
+        # revealed: <super: <class 'Bar'>, Unknown>
+        reveal_type(super())
+
+    def only_call_me_on_callable_subclasses(self: Intersection[Bar, Callable[..., object]]):
+        # revealed: <super: <class 'Bar'>, Bar>
+        reveal_type(super())
+
+class P(Protocol):
+    def method(self: P):
+        # revealed: <super: <class 'P'>, P>
+        reveal_type(super())
+
+class E(enum.Enum):
+    X = 1
+
+    def method(self: E):
+        match self:
+            case E.X:
+                # revealed: <super: <class 'E'>, E>
+                reveal_type(super())
+```
+
 ### Unbound Super Object
 
 Calling `super(cls)` without a second argument returns an _unbound super object_. This is treated as
@@ -99,7 +307,7 @@ class B(A): ...
 
 reveal_type(super(B))  # revealed: super
 
-# error: [unresolved-attribute] "Type `super` has no attribute `a`"
+# error: [unresolved-attribute] "Object of type `super` has no attribute `a`"
 super(B).a
 ```
 
@@ -149,15 +357,15 @@ from __future__ import annotations
 
 class A:
     def test(self):
-        reveal_type(super())  # revealed: <super: <class 'A'>, Unknown>
+        reveal_type(super())  # revealed: <super: <class 'A'>, A>
 
     class B:
         def test(self):
-            reveal_type(super())  # revealed: <super: <class 'B'>, Unknown>
+            reveal_type(super())  # revealed: <super: <class 'B'>, B>
 
             class C(A.B):
                 def test(self):
-                    reveal_type(super())  # revealed: <super: <class 'C'>, Unknown>
+                    reveal_type(super())  # revealed: <super: <class 'C'>, C>
 
             def inner(t: C):
                 reveal_type(super())  # revealed: <super: <class 'B'>, C>
@@ -167,11 +375,19 @@ class A:
 ## Built-ins and Literals
 
 ```py
+from enum import Enum
+
 reveal_type(super(bool, True))  # revealed: <super: <class 'bool'>, bool>
 reveal_type(super(bool, bool()))  # revealed: <super: <class 'bool'>, bool>
 reveal_type(super(int, bool()))  # revealed: <super: <class 'int'>, bool>
 reveal_type(super(int, 3))  # revealed: <super: <class 'int'>, int>
 reveal_type(super(str, ""))  # revealed: <super: <class 'str'>, str>
+reveal_type(super(bytes, b""))  # revealed: <super: <class 'bytes'>, bytes>
+
+class E(Enum):
+    X = 42
+
+reveal_type(super(E, E.X))  # revealed: <super: <class 'E'>, E>
 ```
 
 ## Descriptor Behavior with Super
@@ -219,7 +435,7 @@ def f(x: C | D):
     s = super(A, x)
     reveal_type(s)  # revealed: <super: <class 'A'>, C> | <super: <class 'A'>, D>
 
-    # error: [possibly-unbound-attribute] "Attribute `b` on type `<super: <class 'A'>, C> | <super: <class 'A'>, D>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `b` may be missing on object of type `<super: <class 'A'>, C> | <super: <class 'A'>, D>`"
     s.b
 
 def f(flag: bool):
@@ -259,7 +475,7 @@ def f(flag: bool):
     reveal_type(s.x)  # revealed: Unknown | Literal[1, 2]
     reveal_type(s.y)  # revealed: int | str
 
-    # error: [possibly-unbound-attribute] "Attribute `a` on type `<super: <class 'B'>, B> | <super: <class 'D'>, D>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `a` may be missing on object of type `<super: <class 'B'>, B> | <super: <class 'D'>, D>`"
     reveal_type(s.a)  # revealed: str
 ```
 
@@ -342,7 +558,7 @@ def f(x: int):
     # error: [invalid-super-argument] "`typing.TypeAliasType` is not a valid class"
     super(IntAlias, 0)
 
-# error: [invalid-super-argument] "`Literal[""]` is not an instance or subclass of `<class 'int'>` in `super(<class 'int'>, Literal[""])` call"
+# error: [invalid-super-argument] "`str` is not an instance or subclass of `<class 'int'>` in `super(<class 'int'>, str)` call"
 # revealed: Unknown
 reveal_type(super(int, str()))
 
@@ -399,10 +615,10 @@ class A:
 class B(A):
     def __init__(self, a: int):
         super().__init__(a)
-        # TODO: Once `Self` is supported, this should raise `unresolved-attribute` error
+        # error: [unresolved-attribute] "Object of type `<super: <class 'B'>, B>` has no attribute `a`"
         super().a
 
-# error: [unresolved-attribute] "Type `<super: <class 'B'>, B>` has no attribute `a`"
+# error: [unresolved-attribute] "Object of type `<super: <class 'B'>, B>` has no attribute `a`"
 super(B, B(42)).a
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/classes.md b/crates/ty_python_semantic/resources/mdtest/classes.md
new file mode 100644
index 0000000000..fde58831c2
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/classes.md
@@ -0,0 +1,25 @@
+# Class definitions
+
+## Deferred resolution of bases
+
+### Only the stringified name is deferred
+
+If a class base contains a stringified name, only that name is deferred. Other names are resolved
+normally.
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+A = int
+
+class G[T]: ...
+class C(A, G["B"]): ...
+
+A = str
+B = bytes
+
+reveal_type(C.__mro__)  # revealed: tuple[<class 'C'>, <class 'int'>, <class 'G[bytes]'>, typing.Generic, <class 'object'>]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/comparison/tuples.md b/crates/ty_python_semantic/resources/mdtest/comparison/tuples.md
index 03169ef851..e9bf3ccf38 100644
--- a/crates/ty_python_semantic/resources/mdtest/comparison/tuples.md
+++ b/crates/ty_python_semantic/resources/mdtest/comparison/tuples.md
@@ -392,3 +392,16 @@ class A:
 # error: [unsupported-bool-conversion]
 (A(),) == (A(),)
 ```
+
+## Recursive NamedTuple
+
+```py
+from __future__ import annotations
+from typing import NamedTuple
+
+class Node(NamedTuple):
+    parent: Node | None
+
+def _(n: Node):
+    reveal_type(n.parent is n)  # revealed: bool
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/cycle.md b/crates/ty_python_semantic/resources/mdtest/cycle.md
index 0bd3b5b2a6..e52641a05c 100644
--- a/crates/ty_python_semantic/resources/mdtest/cycle.md
+++ b/crates/ty_python_semantic/resources/mdtest/cycle.md
@@ -31,3 +31,76 @@ p = Point()
 reveal_type(p.x)  # revealed: Unknown | int
 reveal_type(p.y)  # revealed: Unknown | int
 ```
+
+## Parameter default values
+
+This is a regression test for <https://github.com/astral-sh/ty/issues/1402>. When a parameter has a
+default value that references the callable itself, we currently prevent infinite recursion by simply
+falling back to `Unknown` for the type of the default value, which does not have any practical
+impact except for the displayed type. We could also consider inferring `Divergent` when we encounter
+too many layers of nesting (instead of just one), but that would require a type traversal which
+could have performance implications. So for now, we mainly make sure not to panic or stack overflow
+for these seeminly rare cases.
+
+### Functions
+
+```py
+class C:
+    def f(self: "C"):
+        def inner_a(positional=self.a):
+            return
+        self.a = inner_a
+        # revealed: def inner_a(positional=Unknown | (def inner_a(positional=Unknown) -> Unknown)) -> Unknown
+        reveal_type(inner_a)
+
+        def inner_b(*, kw_only=self.b):
+            return
+        self.b = inner_b
+        # revealed: def inner_b(*, kw_only=Unknown | (def inner_b(*, kw_only=Unknown) -> Unknown)) -> Unknown
+        reveal_type(inner_b)
+
+        def inner_c(positional_only=self.c, /):
+            return
+        self.c = inner_c
+        # revealed: def inner_c(positional_only=Unknown | (def inner_c(positional_only=Unknown, /) -> Unknown), /) -> Unknown
+        reveal_type(inner_c)
+
+        def inner_d(*, kw_only=self.d):
+            return
+        self.d = inner_d
+        # revealed: def inner_d(*, kw_only=Unknown | (def inner_d(*, kw_only=Unknown) -> Unknown)) -> Unknown
+        reveal_type(inner_d)
+```
+
+We do, however, still check assignability of the default value to the parameter type:
+
+```py
+class D:
+    def f(self: "D"):
+        # error: [invalid-parameter-default] "Default value of type `Unknown | (def inner_a(a: int = Unknown | (def inner_a(a: int = Unknown) -> Unknown)) -> Unknown)` is not assignable to annotated parameter type `int`"
+        def inner_a(a: int = self.a): ...
+        self.a = inner_a
+```
+
+### Lambdas
+
+```py
+class C:
+    def f(self: "C"):
+        self.a = lambda positional=self.a: positional
+        self.b = lambda *, kw_only=self.b: kw_only
+        self.c = lambda positional_only=self.c, /: positional_only
+        self.d = lambda *, kw_only=self.d: kw_only
+
+        # revealed: (positional=Unknown | ((positional=Unknown) -> Unknown)) -> Unknown
+        reveal_type(self.a)
+
+        # revealed: (*, kw_only=Unknown | ((*, kw_only=Unknown) -> Unknown)) -> Unknown
+        reveal_type(self.b)
+
+        # revealed: (positional_only=Unknown | ((positional_only=Unknown, /) -> Unknown), /) -> Unknown
+        reveal_type(self.c)
+
+        # revealed: (*, kw_only=Unknown | ((*, kw_only=Unknown) -> Unknown)) -> Unknown
+        reveal_type(self.d)
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclass_transform.md b/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclass_transform.md
index bff8dba19d..ebdf5073cd 100644
--- a/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclass_transform.md
+++ b/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclass_transform.md
@@ -67,7 +67,7 @@ class C:
     name: str
 ```
 
-## Types of decorators
+## Types of dataclass-transformers
 
 The examples from this section are straight from the Python documentation on
 [`typing.dataclass_transform`].
@@ -122,9 +122,6 @@ class CustomerModel(ModelBase):
     id: int
     name: str
 
-# TODO: this is not supported yet
-# error: [unknown-argument]
-# error: [unknown-argument]
 CustomerModel(id=1, name="Test")
 ```
 
@@ -165,7 +162,7 @@ Normal(1) < Normal(2)  # error: [unsupported-operator]
 class NormalOverwritten:
     inner: int
 
-NormalOverwritten(1) < NormalOverwritten(2)
+reveal_type(NormalOverwritten(1) < NormalOverwritten(2))  # revealed: bool
 
 @order_default_false
 class OrderFalse:
@@ -177,13 +174,13 @@ OrderFalse(1) < OrderFalse(2)  # error: [unsupported-operator]
 class OrderFalseOverwritten:
     inner: int
 
-OrderFalseOverwritten(1) < OrderFalseOverwritten(2)
+reveal_type(OrderFalseOverwritten(1) < OrderFalseOverwritten(2))  # revealed: bool
 
 @order_default_true
 class OrderTrue:
     inner: int
 
-OrderTrue(1) < OrderTrue(2)
+reveal_type(OrderTrue(1) < OrderTrue(2))  # revealed: bool
 
 @order_default_true(order=False)
 class OrderTrueOverwritten:
@@ -193,6 +190,32 @@ class OrderTrueOverwritten:
 OrderTrueOverwritten(1) < OrderTrueOverwritten(2)
 ```
 
+This also works for metaclass-based transformers:
+
+```py
+@dataclass_transform(order_default=True)
+class OrderedModelMeta(type): ...
+
+class OrderedModel(metaclass=OrderedModelMeta): ...
+
+class TestWithMeta(OrderedModel):
+    inner: int
+
+reveal_type(TestWithMeta(1) < TestWithMeta(2))  # revealed: bool
+```
+
+And for base-class-based transformers:
+
+```py
+@dataclass_transform(order_default=True)
+class OrderedModelBase: ...
+
+class TestWithBase(OrderedModelBase):
+    inner: int
+
+reveal_type(TestWithBase(1) < TestWithBase(2))  # revealed: bool
+```
+
 ### `kw_only_default`
 
 When provided, sets the default value for the `kw_only` parameter of `field()`.
@@ -202,7 +225,7 @@ from typing import dataclass_transform
 from dataclasses import field
 
 @dataclass_transform(kw_only_default=True)
-def create_model(*, init=True): ...
+def create_model(*, kw_only: bool = True): ...
 @create_model()
 class A:
     name: str
@@ -213,27 +236,428 @@ a = A(name="Harry")
 a = A("Harry")
 ```
 
-TODO: This can be overridden by the call to the decorator function.
+This can be overridden by setting `kw_only=False` when applying the decorator:
 
 ```py
-from typing import dataclass_transform
-
-@dataclass_transform(kw_only_default=True)
-def create_model(*, kw_only: bool = True): ...
 @create_model(kw_only=False)
 class CustomerModel:
     id: int
     name: str
 
-# TODO: Should not emit errors
-# error: [missing-argument]
-# error: [too-many-positional-arguments]
 c = CustomerModel(1, "Harry")
 ```
 
-### `field_specifiers`
+This also works for metaclass-based transformers:
 
-To do
+```py
+@dataclass_transform(kw_only_default=True)
+class ModelMeta(type): ...
+
+class ModelBase(metaclass=ModelMeta): ...
+
+class TestMeta(ModelBase):
+    name: str
+
+reveal_type(TestMeta.__init__)  # revealed: (self: TestMeta, *, name: str) -> None
+```
+
+And for base-class-based transformers:
+
+```py
+@dataclass_transform(kw_only_default=True)
+class ModelBase: ...
+
+class TestBase(ModelBase):
+    name: str
+
+reveal_type(TestBase.__init__)  # revealed: (self: TestBase, *, name: str) -> None
+```
+
+### `frozen_default`
+
+When provided, sets the default value for the `frozen` parameter of `field()`.
+
+```py
+from typing import dataclass_transform
+
+@dataclass_transform(frozen_default=True)
+def create_model(*, frozen: bool = True): ...
+@create_model()
+class ImmutableModel:
+    name: str
+
+i = ImmutableModel(name="test")
+i.name = "new"  # error: [invalid-assignment]
+```
+
+Again, this can be overridden by setting `frozen=False` when applying the decorator:
+
+```py
+@create_model(frozen=False)
+class MutableModel:
+    name: str
+
+m = MutableModel(name="test")
+m.name = "new"  # No error
+```
+
+This also works for metaclass-based transformers:
+
+```py
+@dataclass_transform(frozen_default=True)
+class ModelMeta(type): ...
+
+class ModelBase(metaclass=ModelMeta): ...
+
+class TestMeta(ModelBase):
+    name: str
+
+t = TestMeta(name="test")
+t.name = "new"  # error: [invalid-assignment]
+```
+
+And for base-class-based transformers:
+
+```py
+@dataclass_transform(frozen_default=True)
+class ModelBase: ...
+
+class TestMeta(ModelBase):
+    name: str
+
+t = TestMeta(name="test")
+
+t.name = "new"  # error: [invalid-assignment]
+```
+
+### Combining parameters
+
+Combining several of these parameters also works as expected:
+
+```py
+from typing import dataclass_transform
+
+@dataclass_transform(eq_default=True, order_default=False, kw_only_default=True, frozen_default=True)
+def create_model(*, eq: bool = True, order: bool = False, kw_only: bool = True, frozen: bool = True): ...
+@create_model(eq=False, order=True, kw_only=False, frozen=False)
+class OverridesAllParametersModel:
+    name: str
+    age: int
+
+# Positional arguments are allowed:
+model = OverridesAllParametersModel("test", 25)
+
+# Mutation is allowed:
+model.name = "new"  # No error
+
+# Comparison methods are generated:
+model < model  # No error
+```
+
+### Overwriting of default parameters on the dataclass-like class
+
+#### Using function-based transformers
+
+```py
+from typing import dataclass_transform
+
+@dataclass_transform(frozen_default=True)
+def default_frozen_model(*, frozen: bool = True): ...
+@default_frozen_model()
+class Frozen:
+    name: str
+
+f = Frozen(name="test")
+f.name = "new"  # error: [invalid-assignment]
+
+@default_frozen_model(frozen=False)
+class Mutable:
+    name: str
+
+m = Mutable(name="test")
+m.name = "new"  # No error
+```
+
+#### Using metaclass-based transformers
+
+```py
+from typing import dataclass_transform
+
+@dataclass_transform(frozen_default=True)
+class DefaultFrozenMeta(type):
+    def __new__(
+        cls,
+        name,
+        bases,
+        namespace,
+        *,
+        frozen: bool = True,
+    ): ...
+
+class DefaultFrozenModel(metaclass=DefaultFrozenMeta): ...
+
+class Frozen(DefaultFrozenModel):
+    name: str
+
+f = Frozen(name="test")
+f.name = "new"  # error: [invalid-assignment]
+
+class Mutable(DefaultFrozenModel, frozen=False):
+    name: str
+
+m = Mutable(name="test")
+# TODO: no error here
+m.name = "new"  # error: [invalid-assignment]
+```
+
+#### Using base-class-based transformers
+
+```py
+from typing import dataclass_transform
+
+@dataclass_transform(frozen_default=True)
+class DefaultFrozenModel:
+    def __init_subclass__(
+        cls,
+        *,
+        frozen: bool = True,
+    ): ...
+
+class Frozen(DefaultFrozenModel):
+    name: str
+
+f = Frozen(name="test")
+f.name = "new"  # error: [invalid-assignment]
+
+class Mutable(DefaultFrozenModel, frozen=False):
+    name: str
+
+m = Mutable(name="test")
+# TODO: This should not be an error
+m.name = "new"  # error: [invalid-assignment]
+```
+
+## `field_specifiers`
+
+The `field_specifiers` argument can be used to specify a list of functions that should be treated
+similar to `dataclasses.field` for normal dataclasses.
+
+The [`typing.dataclass_transform`] specification also allows classes (such as `dataclasses.Field`)
+to be listed in `field_specifiers`, but it is currently unclear how this should work, and other type
+checkers do not seem to support this either.
+
+### For function-based transformers
+
+```py
+from typing_extensions import dataclass_transform, Any
+
+def fancy_field(*, init: bool = True, kw_only: bool = False, alias: str | None = None) -> Any: ...
+@dataclass_transform(field_specifiers=(fancy_field,))
+def fancy_model[T](cls: type[T]) -> type[T]:
+    ...
+    return cls
+
+@fancy_model
+class Person:
+    id: int = fancy_field(init=False)
+    internal_name: str = fancy_field(alias="name")
+    age: int | None = fancy_field(kw_only=True)
+
+reveal_type(Person.__init__)  # revealed: (self: Person, name: str, *, age: int | None) -> None
+
+alice = Person("Alice", age=30)
+
+reveal_type(alice.id)  # revealed: int
+reveal_type(alice.internal_name)  # revealed: str
+reveal_type(alice.age)  # revealed: int | None
+```
+
+### For metaclass-based transformers
+
+```py
+from typing_extensions import dataclass_transform, Any
+
+def fancy_field(*, init: bool = True, kw_only: bool = False, alias: str | None = None) -> Any: ...
+@dataclass_transform(field_specifiers=(fancy_field,))
+class FancyMeta(type):
+    def __new__(cls, name, bases, namespace):
+        ...
+        return super().__new__(cls, name, bases, namespace)
+
+class FancyBase(metaclass=FancyMeta): ...
+
+class Person(FancyBase):
+    id: int = fancy_field(init=False)
+    internal_name: str = fancy_field(alias="name")
+    age: int | None = fancy_field(kw_only=True)
+
+reveal_type(Person.__init__)  # revealed: (self: Person, name: str, *, age: int | None) -> None
+
+alice = Person("Alice", age=30)
+
+reveal_type(alice.id)  # revealed: int
+reveal_type(alice.internal_name)  # revealed: str
+reveal_type(alice.age)  # revealed: int | None
+```
+
+### For base-class-based transformers
+
+```py
+from typing_extensions import dataclass_transform, Any
+
+def fancy_field(*, init: bool = True, kw_only: bool = False, alias: str | None = None) -> Any: ...
+@dataclass_transform(field_specifiers=(fancy_field,))
+class FancyBase:
+    def __init_subclass__(cls):
+        ...
+        super().__init_subclass__()
+
+class Person(FancyBase):
+    id: int = fancy_field(init=False)
+    internal_name: str = fancy_field(alias="name")
+    age: int | None = fancy_field(kw_only=True)
+
+reveal_type(Person.__init__)  # revealed: (self: Person, name: str, *, age: int | None) -> None
+
+alice = Person("Alice", age=30)
+
+reveal_type(alice.id)  # revealed: int
+reveal_type(alice.internal_name)  # revealed: str
+reveal_type(alice.age)  # revealed: int | None
+```
+
+### With default arguments
+
+Field specifiers can have default arguments that should be respected:
+
+```py
+from typing_extensions import dataclass_transform, Any
+
+def fancy_field(*, init: bool = False) -> Any: ...
+@dataclass_transform(field_specifiers=(fancy_field,))
+def fancy_model[T](cls: type[T]) -> type[T]:
+    ...
+    return cls
+
+@fancy_model
+class Person:
+    id: int = fancy_field()
+    name: str = fancy_field(init=True)
+
+reveal_type(Person.__init__)  # revealed: (self: Person, name: str) -> None
+
+Person(name="Alice")
+```
+
+### Support for `alias`
+
+The `alias` parameter in field specifiers allows providing an alternative name for the parameter in
+the synthesized `__init__` method.
+
+```py
+from typing_extensions import dataclass_transform, Any
+
+def field_with_alias(*, alias: str | None = None, kw_only: bool = False) -> Any: ...
+@dataclass_transform(field_specifiers=(field_with_alias,))
+def model[T](cls: type[T]) -> type[T]:
+    return cls
+
+@model
+class Person:
+    internal_name: str = field_with_alias(alias="name")
+    internal_age: int = field_with_alias(alias="age", kw_only=True)
+```
+
+The synthesized `__init__` method uses the alias names instead of the actual attribute names:
+
+```py
+reveal_type(Person.__init__)  # revealed: (self: Person, name: str, *, age: int) -> None
+```
+
+We can construct instances using the alias names:
+
+```py
+p = Person(name="Alice", age=30)
+```
+
+Passing the `name` parameter positionally also works:
+
+```py
+p = Person("Alice", age=30)
+```
+
+But the attributes are still accessed by their actual names:
+
+```py
+reveal_type(p.internal_name)  # revealed: str
+reveal_type(p.internal_age)  # revealed: int
+```
+
+Trying to use the actual attribute names in the constructor results in an error:
+
+```py
+# error: [unknown-argument] "Argument `internal_age` does not match any known parameter"
+# error: [missing-argument] "No argument provided for required parameter `age`"
+p = Person(name="Alice", internal_age=30)
+```
+
+### With overloaded field specifiers
+
+```py
+from typing_extensions import dataclass_transform, overload, Any
+
+@overload
+def fancy_field(*, init: bool = True) -> Any: ...
+@overload
+def fancy_field(*, kw_only: bool = False) -> Any: ...
+def fancy_field(*, init: bool = True, kw_only: bool = False) -> Any: ...
+@dataclass_transform(field_specifiers=(fancy_field,))
+def fancy_model[T](cls: type[T]) -> type[T]:
+    ...
+    return cls
+
+@fancy_model
+class Person:
+    id: int = fancy_field(init=False)
+    name: str = fancy_field()
+    age: int | None = fancy_field(kw_only=True)
+
+reveal_type(Person.__init__)  # revealed: (self: Person, name: str, *, age: int | None) -> None
+```
+
+### Nested dataclass-transformers
+
+Make sure that models are only affected by the field specifiers of their own transformer:
+
+```py
+from typing_extensions import dataclass_transform, Any
+from dataclasses import field
+
+def outer_field(*, init: bool = True, kw_only: bool = False) -> Any: ...
+@dataclass_transform(field_specifiers=(outer_field,))
+def outer_model[T](cls: type[T]) -> type[T]:
+    # ...
+    return cls
+
+def inner_field(*, init: bool = True, kw_only: bool = False) -> Any: ...
+@dataclass_transform(field_specifiers=(inner_field,))
+def inner_model[T](cls: type[T]) -> type[T]:
+    # ...
+    return cls
+
+@outer_model
+class Outer:
+    @inner_model
+    class Inner:
+        inner_a: int = inner_field(init=False)
+        inner_b: str = outer_field(init=False)
+
+    outer_a: int = outer_field(init=False)
+    outer_b: str = inner_field(init=False)
+
+reveal_type(Outer.__init__)  # revealed: (self: Outer, outer_b: str = Any) -> None
+reveal_type(Outer.Inner.__init__)  # revealed: (self: Inner, inner_b: str = Any) -> None
+```
 
 ## Overloaded dataclass-like decorators
 
@@ -322,4 +746,32 @@ D1(1.2)  # error: [invalid-argument-type]
 D2(1.2)  # error: [invalid-argument-type]
 ```
 
+### Use cases
+
+#### Home Assistant
+
+Home Assistant uses a pattern like this, where a `@dataclass`-decorated class inherits from a base
+class that is itself a `dataclass`-like construct via a metaclass-based dataclass transformer. Make
+sure that we recognize all fields in a hierarchy like this:
+
+```py
+from dataclasses import dataclass
+from typing import dataclass_transform
+
+@dataclass_transform()
+class ModelMeta(type):
+    pass
+
+class Sensor(metaclass=ModelMeta):
+    key: int
+
+@dataclass(frozen=True, kw_only=True)
+class TemperatureSensor(Sensor):
+    name: str
+
+t = TemperatureSensor(key=1, name="Temperature Sensor")
+reveal_type(t.key)  # revealed: int
+reveal_type(t.name)  # revealed: str
+```
+
 [`typing.dataclass_transform`]: https://docs.python.org/3/library/typing.html#typing.dataclass_transform
diff --git a/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclasses.md b/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclasses.md
index 608b4f348e..34899b10fc 100644
--- a/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclasses.md
+++ b/crates/ty_python_semantic/resources/mdtest/dataclasses/dataclasses.md
@@ -497,6 +497,8 @@ class A:
     a: str = field(kw_only=False)
     b: int = 0
 
+reveal_type(A.__init__)  # revealed: (self: A, a: str, *, b: int = Literal[0]) -> None
+
 A("hi")
 ```
 
@@ -544,9 +546,80 @@ class A:
     y: int
 ```
 
+### `kw_only` - Python 3.13
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+```py
+from dataclasses import dataclass, field
+
+@dataclass
+class Employee:
+    e_id: int = field(kw_only=True, default=0)
+    name: str
+
+Employee("Alice")
+Employee(name="Alice")
+Employee(name="Alice", e_id=1)
+Employee(e_id=1, name="Alice")
+Employee("Alice", e_id=1)
+
+Employee("Alice", 1)  # error: [too-many-positional-arguments]
+```
+
+### `kw_only` - Python 3.14
+
+```toml
+[environment]
+python-version = "3.14"
+```
+
+```py
+from dataclasses import dataclass, field
+
+@dataclass
+class Employee:
+    # Python 3.14 introduces a new `doc` parameter for `dataclasses.field`
+    e_id: int = field(kw_only=True, default=0, doc="Global employee ID")
+    name: str
+
+Employee("Alice")
+Employee(name="Alice")
+Employee(name="Alice", e_id=1)
+Employee(e_id=1, name="Alice")
+Employee("Alice", e_id=1)
+
+Employee("Alice", 1)  # error: [too-many-positional-arguments]
+```
+
 ### `slots`
 
-To do
+If a dataclass is defined with `slots=True`, the `__slots__` attribute is generated as a tuple. It
+is not present otherwise.
+
+```py
+from dataclasses import dataclass
+from typing import Tuple
+
+@dataclass
+class A:
+    x: int
+    y: int
+
+# revealed: Unknown
+# error: [unresolved-attribute]
+reveal_type(A.__slots__)
+
+@dataclass(slots=True)
+class B:
+    x: int
+    y: int
+
+reveal_type(B.__slots__)  # revealed: tuple[Literal["x"], Literal["y"]]
+```
 
 ### `weakref_slot`
 
@@ -939,7 +1012,6 @@ python-version = "3.10"
 
 ```py
 from dataclasses import dataclass, field, KW_ONLY
-from typing_extensions import reveal_type
 
 @dataclass
 class C:
@@ -1134,9 +1206,9 @@ python-version = "3.12"
 from dataclasses import dataclass
 from typing import Callable
 from types import FunctionType
-from ty_extensions import CallableTypeOf, TypeOf, static_assert, is_subtype_of, is_assignable_to
+from ty_extensions import CallableTypeOf, TypeOf, static_assert, is_subtype_of, is_assignable_to, is_equivalent_to
 
-@dataclass
+@dataclass(order=True)
 class C:
     x: int
 
@@ -1163,8 +1235,20 @@ static_assert(not is_assignable_to(EquivalentPureCallableType, DunderInitType))
 static_assert(is_subtype_of(DunderInitType, EquivalentFunctionLikeCallableType))
 static_assert(is_assignable_to(DunderInitType, EquivalentFunctionLikeCallableType))
 
-static_assert(not is_subtype_of(EquivalentFunctionLikeCallableType, DunderInitType))
-static_assert(not is_assignable_to(EquivalentFunctionLikeCallableType, DunderInitType))
+static_assert(is_subtype_of(EquivalentFunctionLikeCallableType, DunderInitType))
+static_assert(is_assignable_to(EquivalentFunctionLikeCallableType, DunderInitType))
+
+static_assert(is_equivalent_to(EquivalentFunctionLikeCallableType, DunderInitType))
 
 static_assert(is_subtype_of(DunderInitType, FunctionType))
 ```
+
+It should be possible to mock out synthesized methods:
+
+```py
+from unittest.mock import Mock
+
+def test_c():
+    c = C(1)
+    c.__lt__ = Mock()
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/dataclasses/fields.md b/crates/ty_python_semantic/resources/mdtest/dataclasses/fields.md
index 592190f942..f091a1c991 100644
--- a/crates/ty_python_semantic/resources/mdtest/dataclasses/fields.md
+++ b/crates/ty_python_semantic/resources/mdtest/dataclasses/fields.md
@@ -37,7 +37,7 @@ class Data:
     content: list[int] = field(default_factory=list)
     timestamp: datetime = field(default_factory=datetime.now, init=False)
 
-# revealed: (self: Data, content: list[int] = list[Unknown]) -> None
+# revealed: (self: Data, content: list[int] = Unknown) -> None
 reveal_type(Data.__init__)
 
 data = Data([1, 2, 3])
@@ -63,6 +63,7 @@ class Person:
     age: int | None = field(default=None, kw_only=True)
     role: str = field(default="user", kw_only=True)
 
+# TODO: this would ideally show a default value of `None` for `age`
 # revealed: (self: Person, name: str, *, age: int | None = None, role: str = Literal["user"]) -> None
 reveal_type(Person.__init__)
 
@@ -82,7 +83,8 @@ def get_default() -> str:
 
 reveal_type(field(default=1))  # revealed: dataclasses.Field[Literal[1]]
 reveal_type(field(default=None))  # revealed: dataclasses.Field[None]
-reveal_type(field(default_factory=get_default))  # revealed: dataclasses.Field[str]
+# TODO: this could ideally be `dataclasses.Field[str]` with a better generics solver
+reveal_type(field(default_factory=get_default))  # revealed: dataclasses.Field[Unknown]
 ```
 
 ## dataclass_transform field_specifiers
@@ -108,7 +110,7 @@ class A:
     name: str = field(init=False)
 
 # field(init=False) should be ignored for dataclass_transform without explicit field_specifiers
-reveal_type(A.__init__)  # revealed: (self: A, name: str = Unknown) -> None
+reveal_type(A.__init__)  # revealed: (self: A, name: str) -> None
 
 @dataclass
 class B:
diff --git a/crates/ty_python_semantic/resources/mdtest/del.md b/crates/ty_python_semantic/resources/mdtest/del.md
index 247ae9e275..52b1c9c4ed 100644
--- a/crates/ty_python_semantic/resources/mdtest/del.md
+++ b/crates/ty_python_semantic/resources/mdtest/del.md
@@ -46,7 +46,7 @@ def delete():
     del d  # error: [unresolved-reference] "Name `d` used when not defined"
 
 delete()
-reveal_type(d)  # revealed: list[Unknown]
+reveal_type(d)  # revealed: list[Unknown | int]
 
 def delete_element():
     # When the `del` target isn't a name, it doesn't force local resolution.
@@ -62,7 +62,7 @@ def delete_global():
 
 delete_global()
 # Again, the variable should have been removed, but we don't check it.
-reveal_type(d)  # revealed: list[Unknown]
+reveal_type(d)  # revealed: list[Unknown | int]
 
 def delete_nonlocal():
     e = 2
@@ -108,7 +108,7 @@ def foo():
     global x
     def bar():
         # allowed, refers to `x` in the global scope
-        reveal_type(x)  # revealed: Unknown | Literal[1]
+        reveal_type(x)  # revealed: Literal[1]
     bar()
     del x  # allowed, deletes `x` in the global scope (though we don't track that)
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/descriptor_protocol.md b/crates/ty_python_semantic/resources/mdtest/descriptor_protocol.md
index 6d413f7100..f4b5854ed7 100644
--- a/crates/ty_python_semantic/resources/mdtest/descriptor_protocol.md
+++ b/crates/ty_python_semantic/resources/mdtest/descriptor_protocol.md
@@ -170,6 +170,7 @@ def f1(flag: bool):
             attr = DataDescriptor()
 
         def f(self):
+            # error: [invalid-assignment] "Invalid assignment to data descriptor attribute `attr` on type `Self@f` with custom `__set__` method"
             self.attr = "normal"
 
     reveal_type(C1().attr)  # revealed: Unknown | Literal["data", "normal"]
@@ -351,7 +352,7 @@ reveal_type(C4.meta_attribute)  # revealed: Literal["value on metaclass"]
 reveal_type(C4.meta_non_data_descriptor)  # revealed: Literal["non-data"]
 ```
 
-When a metaclass data descriptor is possibly unbound, we union the result type of its `__get__`
+When a metaclass data descriptor is possibly missing, we union the result type of its `__get__`
 method with an underlying class level attribute, if present:
 
 ```py
@@ -365,7 +366,7 @@ def _(flag: bool):
         meta_data_descriptor1: Literal["value on class"] = "value on class"
 
     reveal_type(C5.meta_data_descriptor1)  # revealed: Literal["data", "value on class"]
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(C5.meta_data_descriptor2)  # revealed: Literal["data"]
 
     # TODO: We currently emit two diagnostics here, corresponding to the two states of `flag`. The diagnostics are not
@@ -375,11 +376,11 @@ def _(flag: bool):
     # error: [invalid-assignment] "Object of type `None` is not assignable to attribute `meta_data_descriptor1` of type `Literal["value on class"]`"
     C5.meta_data_descriptor1 = None
 
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     C5.meta_data_descriptor2 = 1
 ```
 
-When a class-level attribute is possibly unbound, we union its (descriptor protocol) type with the
+When a class-level attribute is possibly missing, we union its (descriptor protocol) type with the
 metaclass attribute (unless it's a data descriptor, which always takes precedence):
 
 ```py
@@ -401,7 +402,7 @@ def _(flag: bool):
     reveal_type(C6.attribute1)  # revealed: Literal["data"]
     reveal_type(C6.attribute2)  # revealed: Literal["non-data", "value on class"]
     reveal_type(C6.attribute3)  # revealed: Literal["value on metaclass", "value on class"]
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(C6.attribute4)  # revealed: Literal["value on class"]
 ```
 
@@ -431,6 +432,8 @@ def _(flag: bool):
     reveal_type(C7.union_of_class_data_descriptor_and_attribute)  # revealed: Literal["data", 2]
 
     C7.union_of_metaclass_attributes = 2 if flag else 1
+    # TODO: https://github.com/astral-sh/ty/issues/1163
+    # error: [invalid-assignment]
     C7.union_of_metaclass_data_descriptor_and_attribute = 2 if flag else 100
     C7.union_of_class_attributes = 2 if flag else 1
     C7.union_of_class_data_descriptor_and_attribute = 2 if flag else DataDescriptor()
@@ -522,6 +525,22 @@ c.name = None
 c.name = 42
 ```
 
+### Properties with no setters
+
+<!-- snapshot-diagnostics -->
+
+If a property has no setter, we emit a bespoke error message when a user attempts to set that
+attribute, since this is a common error.
+
+```py
+class DontAssignToMe:
+    @property
+    def immutable(self): ...
+
+# error: [invalid-assignment]
+DontAssignToMe().immutable = "the properties, they are a-changing"
+```
+
 ### Built-in `classmethod` descriptor
 
 Similarly to `property`, `classmethod` decorator creates an implicit descriptor that binds the first
@@ -569,13 +588,16 @@ that method calls work as expected. See [this test suite](./call/methods.md) for
 Here, we only demonstrate how `__get__` works on functions:
 
 ```py
+import types
 from inspect import getattr_static
+from ty_extensions import static_assert, is_subtype_of, TypeOf
 
 def f(x: object) -> str:
     return "a"
 
 reveal_type(f)  # revealed: def f(x: object) -> str
 reveal_type(f.__get__)  # revealed: <method-wrapper `__get__` of `f`>
+static_assert(is_subtype_of(TypeOf[f.__get__], types.MethodWrapperType))
 reveal_type(f.__get__(None, type(f)))  # revealed: def f(x: object) -> str
 reveal_type(f.__get__(None, type(f))(1))  # revealed: str
 
@@ -583,6 +605,7 @@ wrapper_descriptor = getattr_static(f, "__get__")
 
 reveal_type(wrapper_descriptor)  # revealed: <wrapper-descriptor `__get__` of `function` objects>
 reveal_type(wrapper_descriptor(f, None, type(f)))  # revealed: def f(x: object) -> str
+static_assert(is_subtype_of(TypeOf[wrapper_descriptor], types.WrapperDescriptorType))
 
 # Attribute access on the method-wrapper `f.__get__` falls back to `MethodWrapperType`:
 reveal_type(f.__get__.__hash__)  # revealed: bound method MethodWrapperType.__hash__() -> int
@@ -736,16 +759,16 @@ def _(flag: bool):
             non_data: NonDataDescriptor = NonDataDescriptor()
             data: DataDescriptor = DataDescriptor()
 
-    # error: [possibly-unbound-attribute] "Attribute `non_data` on type `<class 'PossiblyUnbound'>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `non_data` may be missing on class `PossiblyUnbound`"
     reveal_type(PossiblyUnbound.non_data)  # revealed: int
 
-    # error: [possibly-unbound-attribute] "Attribute `non_data` on type `PossiblyUnbound` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `non_data` may be missing on object of type `PossiblyUnbound`"
     reveal_type(PossiblyUnbound().non_data)  # revealed: int
 
-    # error: [possibly-unbound-attribute] "Attribute `data` on type `<class 'PossiblyUnbound'>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `data` may be missing on class `PossiblyUnbound`"
     reveal_type(PossiblyUnbound.data)  # revealed: int
 
-    # error: [possibly-unbound-attribute] "Attribute `data` on type `PossiblyUnbound` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `data` may be missing on object of type `PossiblyUnbound`"
     reveal_type(PossiblyUnbound().data)  # revealed: int
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/attribute_assignment.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/attribute_assignment.md
index 83db02c2be..61816ff56f 100644
--- a/crates/ty_python_semantic/resources/mdtest/diagnostics/attribute_assignment.md
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/attribute_assignment.md
@@ -69,7 +69,7 @@ instance = C()
 instance.non_existent = 1  # error: [unresolved-attribute]
 ```
 
-## Possibly-unbound attributes
+## Possibly-missing attributes
 
 When trying to set an attribute that is not defined in all branches, we emit errors:
 
@@ -79,10 +79,10 @@ def _(flag: bool) -> None:
         if flag:
             attr: int = 0
 
-    C.attr = 1  # error: [possibly-unbound-attribute]
+    C.attr = 1  # error: [possibly-missing-attribute]
 
     instance = C()
-    instance.attr = 1  # error: [possibly-unbound-attribute]
+    instance.attr = 1  # error: [possibly-missing-attribute]
 ```
 
 ## Data descriptors
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/invalid_await.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/invalid_await.md
index 60d3439366..24f5f98c49 100644
--- a/crates/ty_python_semantic/resources/mdtest/diagnostics/invalid_await.md
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/invalid_await.md
@@ -23,7 +23,7 @@ async def main() -> None:
     await MissingAwait()  # error: [invalid-await]
 ```
 
-## Custom type with possibly unbound `__await__`
+## Custom type with possibly missing `__await__`
 
 This diagnostic also points to the method definition if available.
 
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
new file mode 100644
index 0000000000..02661d5cc0
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
@@ -0,0 +1,139 @@
+# Legacy typevar creation diagnostics
+
+The full tests for these features are in `generics/legacy/variables.md`.
+
+<!-- snapshot-diagnostics -->
+
+## Must have a name
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar()
+```
+
+## Name can't be given more than once
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", name="T")
+```
+
+## Must be directly assigned to a variable
+
+> A `TypeVar()` expression must always directly be assigned to a variable (it should not be used as
+> part of a larger expression).
+
+```py
+from typing import TypeVar
+
+T = TypeVar("T")
+# error: [invalid-legacy-type-variable]
+U: TypeVar = TypeVar("U")
+
+# error: [invalid-legacy-type-variable]
+tuple_with_typevar = ("foo", TypeVar("W"))
+```
+
+## `TypeVar` parameter must match variable name
+
+> The argument to `TypeVar()` must be a string equal to the variable name to which it is assigned.
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("Q")
+```
+
+## No variadic arguments
+
+```py
+from typing import TypeVar
+
+types = (int, str)
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", *types)
+
+# error: [invalid-legacy-type-variable]
+S = TypeVar("S", **{"bound": int})
+```
+
+## Cannot have only one constraint
+
+> `TypeVar` supports constraining parametric types to a fixed set of possible types...There should
+> be at least two constraints, if any; specifying a single constraint is disallowed.
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", int)
+```
+
+## Cannot have both bound and constraint
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", int, str, bound=bytes)
+```
+
+## Cannot be both covariant and contravariant
+
+> To facilitate the declaration of container types where covariant or contravariant type checking is
+> acceptable, type variables accept keyword arguments `covariant=True` or `contravariant=True`. At
+> most one of these may be passed.
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", covariant=True, contravariant=True)
+```
+
+## Boolean parameters must be unambiguous
+
+```py
+from typing_extensions import TypeVar
+
+def cond() -> bool:
+    return True
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", covariant=cond())
+
+# error: [invalid-legacy-type-variable]
+U = TypeVar("U", contravariant=cond())
+
+# error: [invalid-legacy-type-variable]
+V = TypeVar("V", infer_variance=cond())
+```
+
+## Invalid keyword arguments
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", invalid_keyword=True)
+```
+
+## Invalid feature for this Python version
+
+```toml
+[environment]
+python-version = "3.10"
+```
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", default=int)
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/missing_argument.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/missing_argument.md
new file mode 100644
index 0000000000..24a6e552b2
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/missing_argument.md
@@ -0,0 +1,37 @@
+# Missing argument diagnostics
+
+<!-- snapshot-diagnostics -->
+
+If a non-union callable is called with a required parameter missing, we add a subdiagnostic showing
+where the parameter was defined. We don't do this for unions as we currently emit a separate
+diagnostic for each element of the union; having a sub-diagnostic for each element would probably be
+too verbose for it to be worth it.
+
+`module.py`:
+
+```py
+def f(a, b=42): ...
+def g(a, b): ...
+
+class Foo:
+    def method(self, a): ...
+```
+
+`main.py`:
+
+```py
+from module import f, g, Foo
+
+f()  # error: [missing-argument]
+
+def coinflip() -> bool:
+    return True
+
+h = f if coinflip() else g
+
+# error: [missing-argument]
+# error: [missing-argument]
+h(b=56)
+
+Foo().method()  # error: [missing-argument]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/same_names.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/same_names.md
new file mode 100644
index 0000000000..c0578469d6
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/same_names.md
@@ -0,0 +1,306 @@
+# Identical type display names in diagnostics
+
+ty prints the fully qualified name to disambiguate objects with the same name.
+
+## Nested class
+
+`test.py`:
+
+```py
+class A:
+    class B:
+        pass
+
+class C:
+    class B:
+        pass
+
+a: A.B = C.B()  # error: [invalid-assignment] "Object of type `test.C.B` is not assignable to `test.A.B`"
+```
+
+## Nested class in function
+
+`test.py`:
+
+```py
+class B:
+    pass
+
+def f(b: B):
+    class B:
+        pass
+
+    # error: [invalid-assignment] "Object of type `test.<locals of function 'f'>.B` is not assignable to `test.B`"
+    b = B()
+```
+
+## Class from different modules
+
+```py
+import a
+import b
+
+df: a.DataFrame = b.DataFrame()  # error: [invalid-assignment] "Object of type `b.DataFrame` is not assignable to `a.DataFrame`"
+
+def _(dfs: list[b.DataFrame]):
+    # error: [invalid-assignment] "Object of type `list[b.DataFrame]` is not assignable to `list[a.DataFrame]`"
+    dataframes: list[a.DataFrame] = dfs
+```
+
+`a.py`:
+
+```py
+class DataFrame:
+    pass
+```
+
+`b.py`:
+
+```py
+class DataFrame:
+    pass
+```
+
+## Class from different module with the same qualified name
+
+`package/__init__.py`:
+
+```py
+from .foo import MyClass
+
+def make_MyClass() -> MyClass:
+    return MyClass()
+```
+
+`package/foo.pyi`:
+
+```pyi
+class MyClass: ...
+```
+
+`package/foo.py`:
+
+```py
+class MyClass: ...
+
+def get_MyClass() -> MyClass:
+    from . import make_MyClass
+
+    # error: [invalid-return-type] "Return type does not match returned value: expected `package.foo.MyClass @ src/package/foo.py:1`, found `package.foo.MyClass @ src/package/foo.pyi:1`"
+    return make_MyClass()
+```
+
+## Enum from different modules
+
+```py
+import status_a
+import status_b
+
+# error: [invalid-assignment] "Object of type `Literal[status_b.Status.ACTIVE]` is not assignable to `status_a.Status`"
+s: status_a.Status = status_b.Status.ACTIVE
+```
+
+`status_a.py`:
+
+```py
+from enum import Enum
+
+class Status(Enum):
+    ACTIVE = 1
+    INACTIVE = 2
+```
+
+`status_b.py`:
+
+```py
+from enum import Enum
+
+class Status(Enum):
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+```
+
+## Nested enum
+
+`test.py`:
+
+```py
+from enum import Enum
+
+class A:
+    class B(Enum):
+        ACTIVE = "active"
+        INACTIVE = "inactive"
+
+class C:
+    class B(Enum):
+        ACTIVE = "active"
+        INACTIVE = "inactive"
+
+# error: [invalid-assignment] "Object of type `Literal[test.C.B.ACTIVE]` is not assignable to `test.A.B`"
+a: A.B = C.B.ACTIVE
+```
+
+## Class literals
+
+```py
+import cls_a
+import cls_b
+
+# error: [invalid-assignment] "Object of type `<class 'cls_b.Config'>` is not assignable to `type[cls_a.Config]`"
+config_class: type[cls_a.Config] = cls_b.Config
+```
+
+`cls_a.py`:
+
+```py
+class Config:
+    pass
+```
+
+`cls_b.py`:
+
+```py
+class Config:
+    pass
+```
+
+## Generic aliases
+
+```py
+import generic_a
+import generic_b
+
+# TODO should be error: [invalid-assignment] "Object of type `<class 'generic_b.Container[int]'>` is not assignable to `type[generic_a.Container[int]]`"
+container: type[generic_a.Container[int]] = generic_b.Container[int]
+```
+
+`generic_a.py`:
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+class Container(Generic[T]):
+    pass
+```
+
+`generic_b.py`:
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+class Container(Generic[T]):
+    pass
+```
+
+## Protocols
+
+### Differing members
+
+`bad.py`:
+
+```py
+from typing import Protocol, TypeVar
+
+T_co = TypeVar("T_co", covariant=True)
+
+class Iterator(Protocol[T_co]):
+    def __nexxt__(self) -> T_co: ...
+
+def bad() -> Iterator[str]:
+    raise NotImplementedError
+```
+
+`main.py`:
+
+```py
+from typing import Iterator
+
+def f() -> Iterator[str]:
+    import bad
+
+    # error: [invalid-return-type] "Return type does not match returned value: expected `typing.Iterator[str]`, found `bad.Iterator[str]"
+    return bad.bad()
+```
+
+### Same members but with different types
+
+```py
+from typing import Protocol
+import proto_a
+import proto_b
+
+def _(drawable_b: proto_b.Drawable):
+    # error: [invalid-assignment] "Object of type `proto_b.Drawable` is not assignable to `proto_a.Drawable`"
+    drawable: proto_a.Drawable = drawable_b
+```
+
+`proto_a.py`:
+
+```py
+from typing import Protocol
+
+class Drawable(Protocol):
+    def draw(self) -> None: ...
+```
+
+`proto_b.py`:
+
+```py
+from typing import Protocol
+
+class Drawable(Protocol):
+    def draw(self) -> int: ...
+```
+
+## TypedDict
+
+```py
+from typing import TypedDict
+import dict_a
+import dict_b
+
+def _(b_person: dict_b.Person):
+    # TODO should be error: [invalid-assignment] "Object of type `dict_b.Person` is not assignable to `dict_a.Person`"
+    person_var: dict_a.Person = b_person
+```
+
+`dict_a.py`:
+
+```py
+from typing import TypedDict
+
+class Person(TypedDict):
+    name: str
+```
+
+`dict_b.py`:
+
+```py
+from typing import TypedDict
+
+class Person(TypedDict):
+    name: bytes
+```
+
+## Tuple specializations
+
+`module.py`:
+
+```py
+class Model: ...
+```
+
+```py
+class Model: ...
+
+def get_models_tuple() -> tuple[Model]:
+    from module import Model
+
+    # error: [invalid-return-type] "Return type does not match returned value: expected `tuple[mdtest_snippet.Model]`, found `tuple[module.Model]`"
+    return (Model(),)
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md
index 5e77445b07..e3c830a1e8 100644
--- a/crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md
@@ -354,3 +354,25 @@ def f():
     x = 1
     global x  # error: [invalid-syntax] "name `x` is used prior to global declaration"
 ```
+
+## `break` and `continue` outside a loop
+
+<!-- snapshot-diagnostics -->
+
+```py
+break  # error: [invalid-syntax]
+continue  # error: [invalid-syntax]
+
+for x in range(42):
+    break  # fine
+    continue  # fine
+
+    def _():
+        break  # error: [invalid-syntax]
+        continue  # error: [invalid-syntax]
+
+    class Fine:
+        # this is invalid syntax despite it being in an eager-nested scope!
+        break  # error: [invalid-syntax]
+        continue  # error: [invalid-syntax]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/too_many_positionals.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/too_many_positionals.md
new file mode 100644
index 0000000000..07eebd1c8c
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/too_many_positionals.md
@@ -0,0 +1,37 @@
+# too-many-positional-arguments diagnostics
+
+<!-- snapshot-diagnostics -->
+
+If a non-union callable is called with too many positional arguments, we add a subdiagnostic showing
+where the callable was defined. We don't do this for unions as we currently emit a separate
+diagnostic for each element of the union; having a sub-diagnostic for each element would probably be
+too verbose for it to be worth it.
+
+`module.py`:
+
+```py
+def f(a, b=42): ...
+def g(a, b): ...
+
+class Foo:
+    def method(self, a): ...
+```
+
+`main.py`:
+
+```py
+from module import f, g, Foo
+
+f(1, 2, 3)  # error: [too-many-positional-arguments]
+
+def coinflip() -> bool:
+    return True
+
+h = f if coinflip() else g
+
+# error: [too-many-positional-arguments]
+# error: [too-many-positional-arguments]
+h(1, 2, 3)
+
+Foo().method(1, 2)  # error: [too-many-positional-arguments]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/union_call.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/union_call.md
index 4f406c165f..a5e9b9370e 100644
--- a/crates/ty_python_semantic/resources/mdtest/diagnostics/union_call.md
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/union_call.md
@@ -112,11 +112,11 @@ def _(n: int):
     # error: [too-many-positional-arguments]
     # error: [invalid-argument-type] "Argument to function `f2` is incorrect: Expected `str`, found `Literal[3]`"
     # error: [missing-argument]
-    # error: [invalid-argument-type] "Argument to function `f4` is incorrect: Argument type `Literal[3]` does not satisfy upper bound of type variable `T`"
+    # error: [invalid-argument-type] "Argument to function `f4` is incorrect: Argument type `Literal[3]` does not satisfy upper bound `str` of type variable `T`"
     # error: [invalid-argument-type] "Argument to function `f5` is incorrect: Expected `str`, found `Literal[3]`"
     # error: [no-matching-overload] "No overload of function `f6` matches arguments"
     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-    # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+    # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
     x = f(3)
 ```
 
@@ -138,3 +138,27 @@ def _(n: int):
     # error: [unknown-argument]
     y = f("foo", name="bar", unknown="quux")
 ```
+
+### Truncation for long unions and literals
+
+This test demonstrates a call where the expected type is a large mixed union. The diagnostic must
+therefore truncate the long expected union type to avoid overwhelming output.
+
+```py
+from typing import Literal, Union
+
+class A: ...
+class B: ...
+class C: ...
+class D: ...
+class E: ...
+class F: ...
+
+def f1(x: Union[Literal[1, 2, 3, 4, 5, 6, 7, 8], A, B, C, D, E, F]) -> int:
+    return 0
+
+def _(n: int):
+    x = n
+    # error: [invalid-argument-type]
+    f1(x)
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/diagnostics/unknown_argument.md b/crates/ty_python_semantic/resources/mdtest/diagnostics/unknown_argument.md
new file mode 100644
index 0000000000..5e709233ec
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/diagnostics/unknown_argument.md
@@ -0,0 +1,37 @@
+# Unknown argument diagnostics
+
+<!-- snapshot-diagnostics -->
+
+If a non-union callable is called with a parameter that doesn't match any parameter from the
+signature, we add a subdiagnostic showing where the callable was defined. We don't do this for
+unions as we currently emit a separate diagnostic for each element of the union; having a
+sub-diagnostic for each element would probably be too verbose for it to be worth it.
+
+`module.py`:
+
+```py
+def f(a, b, c=42): ...
+def g(a, b): ...
+
+class Foo:
+    def method(self, a, b): ...
+```
+
+`main.py`:
+
+```py
+from module import f, g, Foo
+
+f(a=1, b=2, c=3, d=42)  # error: [unknown-argument]
+
+def coinflip() -> bool:
+    return True
+
+h = f if coinflip() else g
+
+# error: [unknown-argument]
+# error: [unknown-argument]
+h(a=1, b=2, d=42)
+
+Foo().method(a=1, b=2, c=3)  # error: [unknown-argument]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/directives/assert_never.md b/crates/ty_python_semantic/resources/mdtest/directives/assert_never.md
index f9e4ced7d5..89c35aae5b 100644
--- a/crates/ty_python_semantic/resources/mdtest/directives/assert_never.md
+++ b/crates/ty_python_semantic/resources/mdtest/directives/assert_never.md
@@ -33,12 +33,6 @@ def _():
 def _():
     assert_never(None)  # error: [type-assertion-failure]
 
-def _():
-    assert_never([])  # error: [type-assertion-failure]
-
-def _():
-    assert_never({})  # error: [type-assertion-failure]
-
 def _():
     assert_never(())  # error: [type-assertion-failure]
 
diff --git a/crates/ty_python_semantic/resources/mdtest/directives/assert_type.md b/crates/ty_python_semantic/resources/mdtest/directives/assert_type.md
index 07ad5d555b..fd7c4d1649 100644
--- a/crates/ty_python_semantic/resources/mdtest/directives/assert_type.md
+++ b/crates/ty_python_semantic/resources/mdtest/directives/assert_type.md
@@ -10,6 +10,7 @@ from typing_extensions import assert_type
 def _(x: int):
     assert_type(x, int)  # fine
     assert_type(x, str)  # error: [type-assertion-failure]
+    assert_type(assert_type(x, int), int)
 ```
 
 ## Narrowing
diff --git a/crates/ty_python_semantic/resources/mdtest/enums.md b/crates/ty_python_semantic/resources/mdtest/enums.md
index a70a92d430..c526e11124 100644
--- a/crates/ty_python_semantic/resources/mdtest/enums.md
+++ b/crates/ty_python_semantic/resources/mdtest/enums.md
@@ -4,6 +4,7 @@
 
 ```py
 from enum import Enum
+from typing import Literal
 
 class Color(Enum):
     RED = 1
@@ -11,8 +12,8 @@ class Color(Enum):
     BLUE = 3
 
 reveal_type(Color.RED)  # revealed: Literal[Color.RED]
-# TODO: This could be `Literal[1]`
-reveal_type(Color.RED.value)  # revealed: Any
+reveal_type(Color.RED.name)  # revealed: Literal["RED"]
+reveal_type(Color.RED.value)  # revealed: Literal[1]
 
 # TODO: Should be `Color` or `Literal[Color.RED]`
 reveal_type(Color["RED"])  # revealed: Unknown
@@ -155,6 +156,7 @@ python-version = "3.11"
 
 ```py
 from enum import Enum, property as enum_property
+from typing import Any
 from ty_extensions import enum_members
 
 class Answer(Enum):
@@ -169,6 +171,22 @@ class Answer(Enum):
 reveal_type(enum_members(Answer))
 ```
 
+Enum attributes defined using `enum.property` take precedence over generated attributes.
+
+```py
+from enum import Enum, property as enum_property
+
+class Choices(Enum):
+    A = 1
+    B = 2
+
+    @enum_property
+    def value(self) -> Any: ...
+
+# TODO: This should be `Any` - overridden by `@enum_property`
+reveal_type(Choices.A.value)  # revealed: Literal[1]
+```
+
 ### `types.DynamicClassAttribute`
 
 Attributes defined using `types.DynamicClassAttribute` are not considered members:
@@ -247,8 +265,48 @@ reveal_type(enum_members(Color))
 reveal_type(Color.red)
 ```
 
+Multiple aliases to the same member are also supported. This is a regression test for
+<https://github.com/astral-sh/ty/issues/1293>:
+
+```py
+from ty_extensions import enum_members
+
+class ManyAliases(Enum):
+    real_member = "real_member"
+    alias1 = "real_member"
+    alias2 = "real_member"
+    alias3 = "real_member"
+
+    other_member = "other_real_member"
+
+# revealed: tuple[Literal["real_member"], Literal["other_member"]]
+reveal_type(enum_members(ManyAliases))
+
+reveal_type(ManyAliases.real_member)  # revealed: Literal[ManyAliases.real_member]
+reveal_type(ManyAliases.alias1)  # revealed: Literal[ManyAliases.real_member]
+reveal_type(ManyAliases.alias2)  # revealed: Literal[ManyAliases.real_member]
+reveal_type(ManyAliases.alias3)  # revealed: Literal[ManyAliases.real_member]
+
+reveal_type(ManyAliases.real_member.value)  # revealed: Literal["real_member"]
+reveal_type(ManyAliases.real_member.name)  # revealed: Literal["real_member"]
+
+reveal_type(ManyAliases.alias1.value)  # revealed: Literal["real_member"]
+reveal_type(ManyAliases.alias1.name)  # revealed: Literal["real_member"]
+
+reveal_type(ManyAliases.alias2.value)  # revealed: Literal["real_member"]
+reveal_type(ManyAliases.alias2.name)  # revealed: Literal["real_member"]
+
+reveal_type(ManyAliases.alias3.value)  # revealed: Literal["real_member"]
+reveal_type(ManyAliases.alias3.name)  # revealed: Literal["real_member"]
+```
+
 ### Using `auto()`
 
+```toml
+[environment]
+python-version = "3.11"
+```
+
 ```py
 from enum import Enum, auto
 from ty_extensions import enum_members
@@ -259,6 +317,50 @@ class Answer(Enum):
 
 # revealed: tuple[Literal["YES"], Literal["NO"]]
 reveal_type(enum_members(Answer))
+
+reveal_type(Answer.YES.value)  # revealed: Literal[1]
+reveal_type(Answer.NO.value)  # revealed: Literal[2]
+```
+
+Usages of `auto()` can be combined with manual value assignments:
+
+```py
+class Mixed(Enum):
+    MANUAL_1 = -1
+    AUTO_1 = auto()
+    MANUAL_2 = -2
+    AUTO_2 = auto()
+
+reveal_type(Mixed.MANUAL_1.value)  # revealed: Literal[-1]
+reveal_type(Mixed.AUTO_1.value)  # revealed: Literal[1]
+reveal_type(Mixed.MANUAL_2.value)  # revealed: Literal[-2]
+reveal_type(Mixed.AUTO_2.value)  # revealed: Literal[2]
+```
+
+When using `auto()` with `StrEnum`, the value is the lowercase name of the member:
+
+```py
+from enum import StrEnum, auto
+
+class Answer(StrEnum):
+    YES = auto()
+    NO = auto()
+
+reveal_type(Answer.YES.value)  # revealed: Literal["yes"]
+reveal_type(Answer.NO.value)  # revealed: Literal["no"]
+```
+
+Using `auto()` with `IntEnum` also works as expected:
+
+```py
+from enum import IntEnum, auto
+
+class Answer(IntEnum):
+    YES = auto()
+    NO = auto()
+
+reveal_type(Answer.YES.value)  # revealed: Literal[1]
+reveal_type(Answer.NO.value)  # revealed: Literal[2]
 ```
 
 Combining aliases with `auto()`:
@@ -481,6 +583,62 @@ callable = Printer.STDERR
 callable("Another error!")
 ```
 
+## Special attributes on enum members
+
+### `name` and `_name_`
+
+```py
+from enum import Enum
+from typing import Literal
+
+class Color(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+reveal_type(Color.RED._name_)  # revealed: Literal["RED"]
+
+def _(red_or_blue: Literal[Color.RED, Color.BLUE]):
+    reveal_type(red_or_blue.name)  # revealed: Literal["RED", "BLUE"]
+
+def _(any_color: Color):
+    # TODO: Literal["RED", "GREEN", "BLUE"]
+    reveal_type(any_color.name)  # revealed: Any
+```
+
+### `value` and `_value_`
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+from enum import Enum, StrEnum
+from typing import Literal
+
+class Color(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+reveal_type(Color.RED.value)  # revealed: Literal[1]
+reveal_type(Color.RED._value_)  # revealed: Literal[1]
+
+reveal_type(Color.GREEN.value)  # revealed: Literal[2]
+reveal_type(Color.GREEN._value_)  # revealed: Literal[2]
+
+class Answer(StrEnum):
+    YES = "yes"
+    NO = "no"
+
+reveal_type(Answer.YES.value)  # revealed: Literal["yes"]
+reveal_type(Answer.YES._value_)  # revealed: Literal["yes"]
+
+reveal_type(Answer.NO.value)  # revealed: Literal["no"]
+reveal_type(Answer.NO._value_)  # revealed: Literal["no"]
+```
+
 ## Properties of enum types
 
 ### Implicitly final
@@ -609,6 +767,12 @@ reveal_type(EnumWithSubclassOfEnumMetaMetaclass.NO)  # revealed: Literal[EnumWit
 # Attributes like `.value` can *not* be accessed on members of these enums:
 # error: [unresolved-attribute]
 EnumWithSubclassOfEnumMetaMetaclass.NO.value
+# error: [unresolved-attribute]
+EnumWithSubclassOfEnumMetaMetaclass.NO._value_
+# error: [unresolved-attribute]
+EnumWithSubclassOfEnumMetaMetaclass.NO.name
+# error: [unresolved-attribute]
+EnumWithSubclassOfEnumMetaMetaclass.NO._name_
 ```
 
 ### Enums with (subclasses of) `EnumType` as metaclass
diff --git a/crates/ty_python_semantic/resources/mdtest/exception/invalid_syntax.md b/crates/ty_python_semantic/resources/mdtest/exception/invalid_syntax.md
index 19bb7c4377..f9fea8b7cb 100644
--- a/crates/ty_python_semantic/resources/mdtest/exception/invalid_syntax.md
+++ b/crates/ty_python_semantic/resources/mdtest/exception/invalid_syntax.md
@@ -3,8 +3,6 @@
 ## Invalid syntax
 
 ```py
-from typing_extensions import reveal_type
-
 try:
     print
 except as e:  # error: [invalid-syntax]
diff --git a/crates/ty_python_semantic/resources/mdtest/exhaustiveness_checking.md b/crates/ty_python_semantic/resources/mdtest/exhaustiveness_checking.md
index 1854967edd..800ae7c7bb 100644
--- a/crates/ty_python_semantic/resources/mdtest/exhaustiveness_checking.md
+++ b/crates/ty_python_semantic/resources/mdtest/exhaustiveness_checking.md
@@ -74,6 +74,22 @@ def match_non_exhaustive(x: Literal[0, 1, "a"]):
 
             # this diagnostic is correct: the inferred type of `x` is `Literal[1]`
             assert_never(x)  # error: [type-assertion-failure]
+
+# This is based on real-world code:
+# https://github.com/scipy/scipy/blob/99c0ef6af161a4d8157cae5276a20c30b7677c6f/scipy/linalg/tests/test_lapack.py#L147-L171
+def exhaustiveness_using_containment_checks():
+    for norm_str in "Mm1OoIiFfEe":
+        if norm_str in "FfEe":
+            return
+        else:
+            if norm_str in "Mm":
+                return
+            elif norm_str in "1Oo":
+                return
+            elif norm_str in "Ii":
+                return
+
+        assert_never(norm_str)
 ```
 
 ## Checks on enum literals
@@ -265,12 +281,10 @@ def if_else_exhaustive(x: A[D] | B[E] | C[F]):
     elif isinstance(x, C):
         pass
     else:
-        # TODO: both of these are false positives (https://github.com/astral-sh/ty/issues/456)
-        no_diagnostic_here  # error: [unresolved-reference]
-        assert_never(x)  # error: [type-assertion-failure]
+        no_diagnostic_here
+        assert_never(x)
 
-# TODO: false-positive diagnostic (https://github.com/astral-sh/ty/issues/456)
-def if_else_exhaustive_no_assertion(x: A[D] | B[E] | C[F]) -> int:  # error: [invalid-return-type]
+def if_else_exhaustive_no_assertion(x: A[D] | B[E] | C[F]) -> int:
     if isinstance(x, A):
         return 0
     elif isinstance(x, B):
@@ -298,12 +312,10 @@ def match_exhaustive(x: A[D] | B[E] | C[F]):
         case C():
             pass
         case _:
-            # TODO: both of these are false positives (https://github.com/astral-sh/ty/issues/456)
-            no_diagnostic_here  # error: [unresolved-reference]
-            assert_never(x)  # error: [type-assertion-failure]
+            no_diagnostic_here
+            assert_never(x)
 
-# TODO: false-positive diagnostic (https://github.com/astral-sh/ty/issues/456)
-def match_exhaustive_no_assertion(x: A[D] | B[E] | C[F]) -> int:  # error: [invalid-return-type]
+def match_exhaustive_no_assertion(x: A[D] | B[E] | C[F]) -> int:
     match x:
         case A():
             return 0
diff --git a/crates/ty_python_semantic/resources/mdtest/expression/attribute.md b/crates/ty_python_semantic/resources/mdtest/expression/attribute.md
index 43df56264c..60c1bc518a 100644
--- a/crates/ty_python_semantic/resources/mdtest/expression/attribute.md
+++ b/crates/ty_python_semantic/resources/mdtest/expression/attribute.md
@@ -26,9 +26,9 @@ def _(flag: bool):
 
     reveal_type(A.union_declared)  # revealed: int | str
 
-    # error: [possibly-unbound-attribute] "Attribute `possibly_unbound` on type `<class 'A'>` is possibly unbound"
+    # error: [possibly-missing-attribute] "Attribute `possibly_unbound` may be missing on class `A`"
     reveal_type(A.possibly_unbound)  # revealed: str
 
-    # error: [unresolved-attribute] "Type `<class 'A'>` has no attribute `non_existent`"
+    # error: [unresolved-attribute] "Class `A` has no attribute `non_existent`"
     reveal_type(A.non_existent)  # revealed: Unknown
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/expression/len.md b/crates/ty_python_semantic/resources/mdtest/expression/len.md
index 573005d522..dce9c39e1c 100644
--- a/crates/ty_python_semantic/resources/mdtest/expression/len.md
+++ b/crates/ty_python_semantic/resources/mdtest/expression/len.md
@@ -170,10 +170,10 @@ reveal_type(len(ZeroOrOne()))  # revealed: Literal[0, 1]
 reveal_type(len(ZeroOrTrue()))  # revealed: Literal[0, 1]
 reveal_type(len(OneOrFalse()))  # revealed: Literal[1, 0]
 
-# TODO: Emit a diagnostic
+# error: [invalid-argument-type] "Argument to function `len` is incorrect: Expected `Sized`, found `OneOrFoo`"
 reveal_type(len(OneOrFoo()))  # revealed: int
 
-# TODO: Emit a diagnostic
+# error: [invalid-argument-type] "Argument to function `len` is incorrect: Expected `Sized`, found `ZeroOrStr`"
 reveal_type(len(ZeroOrStr()))  # revealed: int
 ```
 
@@ -194,46 +194,6 @@ reveal_type(len(LiteralTrue()))  # revealed: Literal[1]
 reveal_type(len(LiteralFalse()))  # revealed: Literal[0]
 ```
 
-### Enums
-
-```py
-from enum import Enum, auto
-from typing import Literal
-
-class SomeEnum(Enum):
-    AUTO = auto()
-    INT = 2
-    STR = "4"
-    TUPLE = (8, "16")
-    INT_2 = 3_2
-
-class Auto:
-    def __len__(self) -> Literal[SomeEnum.AUTO]:
-        return SomeEnum.AUTO
-
-class Int:
-    def __len__(self) -> Literal[SomeEnum.INT]:
-        return SomeEnum.INT
-
-class Str:
-    def __len__(self) -> Literal[SomeEnum.STR]:
-        return SomeEnum.STR
-
-class Tuple:
-    def __len__(self) -> Literal[SomeEnum.TUPLE]:
-        return SomeEnum.TUPLE
-
-class IntUnion:
-    def __len__(self) -> Literal[SomeEnum.INT, SomeEnum.INT_2]:
-        return SomeEnum.INT
-
-reveal_type(len(Auto()))  # revealed: int
-reveal_type(len(Int()))  # revealed: int
-reveal_type(len(Str()))  # revealed: int
-reveal_type(len(Tuple()))  # revealed: int
-reveal_type(len(IntUnion()))  # revealed: int
-```
-
 ### Negative integers
 
 ```py
@@ -260,11 +220,11 @@ class SecondRequiredArgument:
     def __len__(self, v: int) -> Literal[1]:
         return 1
 
-# TODO: Emit a diagnostic
+# this is fine: the call succeeds at runtime since the second argument is optional
 reveal_type(len(SecondOptionalArgument()))  # revealed: Literal[0]
 
-# TODO: Emit a diagnostic
-reveal_type(len(SecondRequiredArgument()))  # revealed: Literal[1]
+# error: [invalid-argument-type] "Argument to function `len` is incorrect: Expected `Sized`, found `SecondRequiredArgument`"
+reveal_type(len(SecondRequiredArgument()))  # revealed: int
 ```
 
 ### No `__len__`
diff --git a/crates/ty_python_semantic/resources/mdtest/function/return_type.md b/crates/ty_python_semantic/resources/mdtest/function/return_type.md
index fe44fe3b9d..980afbdf46 100644
--- a/crates/ty_python_semantic/resources/mdtest/function/return_type.md
+++ b/crates/ty_python_semantic/resources/mdtest/function/return_type.md
@@ -260,6 +260,11 @@ def f(cond: bool) -> int:
 
 <!-- snapshot-diagnostics -->
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
 # error: [invalid-return-type]
 def f() -> int:
@@ -279,6 +284,18 @@ T = TypeVar("T")
 
 # error: [invalid-return-type]
 def m(x: T) -> T: ...
+
+class A[T]: ...
+
+def f() -> A[int]:
+    class A[T]: ...
+    return A[int]()  # error: [invalid-return-type]
+
+class B: ...
+
+def g() -> B:
+    class B: ...
+    return B()  # error: [invalid-return-type]
 ```
 
 ## Invalid return type in stub file
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md b/crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md
index 234de56a8c..c520b7e883 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md
@@ -71,6 +71,26 @@ reveal_type(generic_context(InheritedGenericPartiallySpecialized))
 reveal_type(generic_context(InheritedGenericFullySpecialized))
 ```
 
+In a nested class, references to typevars in an enclosing class are not allowed, but if they are
+present, they are not included in the class's generic context.
+
+```py
+class OuterClass(Generic[T]):
+    # error: [invalid-generic-class] "Generic class `InnerClass` must not reference type variables bound in an enclosing scope"
+    class InnerClass(list[T]): ...
+    # revealed: None
+    reveal_type(generic_context(InnerClass))
+
+    def method(self):
+        # error: [invalid-generic-class] "Generic class `InnerClassInMethod` must not reference type variables bound in an enclosing scope"
+        class InnerClassInMethod(list[T]): ...
+        # revealed: None
+        reveal_type(generic_context(InnerClassInMethod))
+
+# revealed: tuple[T@OuterClass]
+reveal_type(generic_context(OuterClass))
+```
+
 If you don't specialize a generic base class, we use the default specialization, which maps each
 typevar to its default value or `Any`. Since that base class is fully specialized, it does not make
 the inheriting class generic.
@@ -108,7 +128,7 @@ reveal_type(generic_context(ExplicitInheritedGenericPartiallySpecializedExtraTyp
 The type parameter can be specified explicitly:
 
 ```py
-from typing import Generic, Literal, TypeVar
+from typing_extensions import Generic, Literal, TypeVar
 
 T = TypeVar("T")
 
@@ -195,7 +215,7 @@ reveal_type(WithDefault[str]())  # revealed: WithDefault[str, int]
 We can infer the type parameter from a type context:
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -240,7 +260,7 @@ consistent with each other.
 ### `__new__` only
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -257,7 +277,7 @@ wrong_innards: C[int] = C("five")
 ### `__init__` only
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -273,7 +293,7 @@ wrong_innards: C[int] = C("five")
 ### Identical `__new__` and `__init__` signatures
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -292,7 +312,7 @@ wrong_innards: C[int] = C("five")
 ### Compatible `__new__` and `__init__` signatures
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -325,7 +345,7 @@ If either method comes from a generic base class, we don't currently use its inf
 to specialize the class.
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -344,7 +364,7 @@ reveal_type(D(1))  # revealed: D[int]
 ### Generic class inherits `__init__` from generic base class
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -364,7 +384,7 @@ reveal_type(D(1, "str"))  # revealed: D[int, str]
 This is a specific example of the above, since it was reported specifically by a user.
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -382,7 +402,7 @@ for `tuple`, so we use a different mechanism to make sure it has the right inher
 context. But from the user's point of view, this is another example of the above.)
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -403,7 +423,7 @@ python-version = "3.11"
 ```
 
 ```py
-from typing import TypeVar, Sequence, Never
+from typing_extensions import TypeVar, Sequence, Never
 
 T = TypeVar("T")
 
@@ -421,7 +441,7 @@ def func8(t1: tuple[complex, list[int]], t2: tuple[int, *tuple[str, ...]], t3: t
 ### `__init__` is itself generic
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 S = TypeVar("S")
 T = TypeVar("T")
@@ -440,7 +460,7 @@ wrong_innards: C[int] = C("five", 1)
 ### Some `__init__` overloads only apply to certain specializations
 
 ```py
-from typing import overload, Generic, TypeVar
+from typing_extensions import overload, Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -480,7 +500,7 @@ C[None](12)
 
 ```py
 from dataclasses import dataclass
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -494,7 +514,7 @@ reveal_type(A(x=1))  # revealed: A[int]
 ### Class typevar has another typevar as a default
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U", default=T)
@@ -515,7 +535,7 @@ When a generic subclass fills its superclass's type parameter with one of its ow
 propagate through:
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -549,7 +569,7 @@ scope for the method.
 
 ```py
 from ty_extensions import generic_context
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -562,17 +582,17 @@ class C(Generic[T]):
         return u
 
 reveal_type(generic_context(C))  # revealed: tuple[T@C]
-reveal_type(generic_context(C.method))  # revealed: None
-reveal_type(generic_context(C.generic_method))  # revealed: tuple[U@generic_method]
+reveal_type(generic_context(C.method))  # revealed: tuple[Self@method]
+reveal_type(generic_context(C.generic_method))  # revealed: tuple[Self@generic_method, U@generic_method]
 reveal_type(generic_context(C[int]))  # revealed: None
-reveal_type(generic_context(C[int].method))  # revealed: None
-reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[U@generic_method]
+reveal_type(generic_context(C[int].method))  # revealed: tuple[Self@method]
+reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[Self@generic_method, U@generic_method]
 
 c: C[int] = C[int]()
 reveal_type(c.generic_method(1, "string"))  # revealed: Literal["string"]
 reveal_type(generic_context(c))  # revealed: None
-reveal_type(generic_context(c.method))  # revealed: None
-reveal_type(generic_context(c.generic_method))  # revealed: tuple[U@generic_method]
+reveal_type(generic_context(c.method))  # revealed: tuple[Self@method]
+reveal_type(generic_context(c.generic_method))  # revealed: tuple[Self@generic_method, U@generic_method]
 ```
 
 ## Specializations propagate
@@ -581,7 +601,7 @@ In a specialized generic alias, the specialization is applied to the attributes
 class.
 
 ```py
-from typing import Generic, TypeVar, Protocol
+from typing_extensions import Generic, TypeVar, Protocol
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -639,19 +659,15 @@ reveal_type(d.method3().x)  # revealed: int
 When a method is overloaded, the specialization is applied to all overloads.
 
 ```py
-from typing import overload, Generic, TypeVar
+from typing_extensions import overload, Generic, TypeVar
 
 S = TypeVar("S")
 
 class WithOverloadedMethod(Generic[T]):
     @overload
-    def method(self, x: T) -> T:
-        return x
-
+    def method(self, x: T) -> T: ...
     @overload
-    def method(self, x: S) -> S | T:
-        return x
-
+    def method(self, x: S) -> S | T: ...
     def method(self, x: S | T) -> S | T:
         return x
 
@@ -671,7 +687,7 @@ A class can use itself as the type parameter of one of its superclasses. (This i
 Here, `Sub` is not a generic class, since it fills its superclass's type parameter (with itself).
 
 ```pyi
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -686,7 +702,7 @@ reveal_type(Sub)  # revealed: <class 'Sub'>
 A similar case can work in a non-stub file, if forward references are stringified:
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -701,7 +717,7 @@ reveal_type(Sub)  # revealed: <class 'Sub'>
 In a non-stub file, without stringified forward references, this raises a `NameError`:
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -714,7 +730,7 @@ class Sub(Base[Sub]): ...
 ### Cyclic inheritance as a generic parameter
 
 ```pyi
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -726,7 +742,7 @@ class Derived(list[Derived[T]], Generic[T]): ...
 Inheritance that would result in a cyclic MRO is detected as an error.
 
 ```py
-from typing import Generic, TypeVar
+from typing_extensions import Generic, TypeVar
 
 T = TypeVar("T")
 
@@ -737,5 +753,29 @@ class C(C, Generic[T]): ...
 class D(D[int], Generic[T]): ...
 ```
 
+### Cyclic inheritance in a stub file combined with constrained type variables
+
+This is a regression test for <https://github.com/astral-sh/ty/issues/1390>; we used to panic on
+this:
+
+`stub.pyi`:
+
+```pyi
+from typing import Generic, TypeVar
+
+class A(B): ...
+class G: ...
+
+T = TypeVar("T", G, A)
+
+class C(Generic[T]): ...
+class B(C[A]): ...
+class D(C[G]): ...
+
+def func(x: D): ...
+
+func(G())  # error: [invalid-argument-type]
+```
+
 [crtp]: https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
 [f-bound]: https://en.wikipedia.org/wiki/Bounded_quantification#F-bounded_quantification
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/legacy/functions.md b/crates/ty_python_semantic/resources/mdtest/generics/legacy/functions.md
index 34347ea1aa..9745fdca21 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/legacy/functions.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/legacy/functions.md
@@ -77,7 +77,7 @@ from typing import Protocol, TypeVar
 T = TypeVar("T")
 
 class CanIndex(Protocol[T]):
-    def __getitem__(self, index: int) -> T: ...
+    def __getitem__(self, index: int, /) -> T: ...
 
 class ExplicitlyImplements(CanIndex[T]): ...
 
@@ -181,7 +181,6 @@ reveal_type(takes_homogeneous_tuple((42, 43)))  # revealed: Literal[42, 43]
 
 ```py
 from typing import TypeVar
-from typing_extensions import reveal_type
 
 T = TypeVar("T", bound=int)
 
@@ -200,7 +199,6 @@ reveal_type(f("string"))  # revealed: Unknown
 
 ```py
 from typing import TypeVar
-from typing_extensions import reveal_type
 
 T = TypeVar("T", int, None)
 
@@ -323,6 +321,9 @@ def union_param(x: T | None) -> T:
 reveal_type(union_param("a"))  # revealed: Literal["a"]
 reveal_type(union_param(1))  # revealed: Literal[1]
 reveal_type(union_param(None))  # revealed: Unknown
+
+def _(x: int | None):
+    reveal_type(union_param(x))  # revealed: int
 ```
 
 ```py
@@ -366,6 +367,31 @@ reveal_type(f(g("a")))  # revealed: tuple[Literal["a"] | None, int]
 reveal_type(g(f("a")))  # revealed: tuple[Literal["a"], int] | None
 ```
 
+## Passing generic functions to generic functions
+
+```py
+from typing import Callable, TypeVar
+
+A = TypeVar("A")
+B = TypeVar("B")
+T = TypeVar("T")
+
+def invoke(fn: Callable[[A], B], value: A) -> B:
+    return fn(value)
+
+def identity(x: T) -> T:
+    return x
+
+def head(xs: list[T]) -> T:
+    return xs[0]
+
+# TODO: this should be `Literal[1]`
+reveal_type(invoke(identity, 1))  # revealed: Unknown
+
+# TODO: this should be `Unknown | int`
+reveal_type(invoke(head, [1, 2, 3]))  # revealed: Unknown
+```
+
 ## Opaque decorators don't affect typevar binding
 
 Inside the body of a generic function, we should be able to see that the typevars bound by that
@@ -439,6 +465,7 @@ def f(x: str):
 from typing import TypeVar, overload
 
 T = TypeVar("T")
+S = TypeVar("S")
 
 def outer(t: T) -> None:
     def inner(t: T) -> None: ...
@@ -454,6 +481,13 @@ def overloaded_outer(t: T | None = None) -> None:
 
     if t is not None:
         inner(t)
+
+def outer(t: T) -> None:
+    def inner(inner_t: T, s: S) -> tuple[T, S]:
+        return inner_t, s
+    reveal_type(inner(t, 1))  # revealed: tuple[T@outer, Literal[1]]
+
+    inner("wrong", 1)  # error: [invalid-argument-type]
 ```
 
 ## Unpacking a TypeVar
@@ -497,3 +531,17 @@ age, name = team.employees[0]
 reveal_type(age)  # revealed: Age
 reveal_type(name)  # revealed: Name
 ```
+
+## `~T` is never assignable to `T`
+
+```py
+from typing import TypeVar
+from ty_extensions import Not
+
+T = TypeVar("T")
+
+def f(x: T, y: Not[T]) -> T:
+    x = y  # error: [invalid-assignment]
+    y = x  # error: [invalid-assignment]
+    return x
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/legacy/variables.md b/crates/ty_python_semantic/resources/mdtest/generics/legacy/variables.md
index d34c642bb3..f79cf6f826 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/legacy/variables.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/legacy/variables.md
@@ -6,6 +6,8 @@ for both type variable syntaxes.
 
 Unless otherwise specified, all quotations come from the [Generics] section of the typing spec.
 
+Diagnostics for invalid type variables are snapshotted in `diagnostics/legacy_typevars.md`.
+
 ## Type variables
 
 ### Defining legacy type variables
@@ -24,7 +26,16 @@ reveal_type(T)  # revealed: typing.TypeVar
 reveal_type(T.__name__)  # revealed: Literal["T"]
 ```
 
-### Directly assigned to a variable
+The typevar name can also be provided as a keyword argument:
+
+```py
+from typing import TypeVar
+
+T = TypeVar(name="T")
+reveal_type(T.__name__)  # revealed: Literal["T"]
+```
+
+### Must be directly assigned to a variable
 
 > A `TypeVar()` expression must always directly be assigned to a variable (it should not be used as
 > part of a larger expression).
@@ -33,13 +44,24 @@ reveal_type(T.__name__)  # revealed: Literal["T"]
 from typing import TypeVar
 
 T = TypeVar("T")
-# TODO: no error
 # error: [invalid-legacy-type-variable]
 U: TypeVar = TypeVar("U")
 
-# error: [invalid-legacy-type-variable] "A legacy `typing.TypeVar` must be immediately assigned to a variable"
-# error: [invalid-type-form] "Function calls are not allowed in type expressions"
-TestList = list[TypeVar("W")]
+# error: [invalid-legacy-type-variable]
+tuple_with_typevar = ("foo", TypeVar("W"))
+reveal_type(tuple_with_typevar[1])  # revealed: TypeVar
+```
+
+```py
+from typing_extensions import TypeVar
+
+T = TypeVar("T")
+# error: [invalid-legacy-type-variable]
+U: TypeVar = TypeVar("U")
+
+# error: [invalid-legacy-type-variable]
+tuple_with_typevar = ("foo", TypeVar("W"))
+reveal_type(tuple_with_typevar[1])  # revealed: TypeVar
 ```
 
 ### `TypeVar` parameter must match variable name
@@ -49,7 +71,7 @@ TestList = list[TypeVar("W")]
 ```py
 from typing import TypeVar
 
-# error: [invalid-legacy-type-variable] "The name of a legacy `typing.TypeVar` (`Q`) must match the name of the variable it is assigned to (`T`)"
+# error: [invalid-legacy-type-variable]
 T = TypeVar("Q")
 ```
 
@@ -66,6 +88,22 @@ T = TypeVar("T")
 T = TypeVar("T")
 ```
 
+### No variadic arguments
+
+```py
+from typing import TypeVar
+
+types = (int, str)
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", *types)
+reveal_type(T)  # revealed: TypeVar
+
+# error: [invalid-legacy-type-variable]
+S = TypeVar("S", **{"bound": int})
+reveal_type(S)  # revealed: TypeVar
+```
+
 ### Type variables with a default
 
 Note that the `__default__` property is only available in Python ≥3.13.
@@ -91,6 +129,11 @@ reveal_type(S.__default__)  # revealed: NoDefault
 
 ### Using other typevars as a default
 
+```toml
+[environment]
+python-version = "3.13"
+```
+
 ```py
 from typing import Generic, TypeVar, Union
 
@@ -124,6 +167,15 @@ S = TypeVar("S")
 reveal_type(S.__bound__)  # revealed: None
 ```
 
+The upper bound must be a valid type expression:
+
+```py
+from typing import TypedDict
+
+# error: [invalid-type-form]
+T = TypeVar("T", bound=TypedDict)
+```
+
 ### Type variables with constraints
 
 ```py
@@ -138,6 +190,16 @@ S = TypeVar("S")
 reveal_type(S.__constraints__)  # revealed: tuple[()]
 ```
 
+Constraints are not simplified relative to each other, even if one is a subtype of the other:
+
+```py
+T = TypeVar("T", int, bool)
+reveal_type(T.__constraints__)  # revealed: tuple[int, bool]
+
+S = TypeVar("S", float, str)
+reveal_type(S.__constraints__)  # revealed: tuple[int | float, str]
+```
+
 ### Cannot have only one constraint
 
 > `TypeVar` supports constraining parametric types to a fixed set of possible types...There should
@@ -146,10 +208,19 @@ reveal_type(S.__constraints__)  # revealed: tuple[()]
 ```py
 from typing import TypeVar
 
-# TODO: error: [invalid-type-variable-constraints]
+# error: [invalid-legacy-type-variable]
 T = TypeVar("T", int)
 ```
 
+### Cannot have both bound and constraint
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", int, str, bound=bytes)
+```
+
 ### Cannot be both covariant and contravariant
 
 > To facilitate the declaration of container types where covariant or contravariant type checking is
@@ -163,10 +234,10 @@ from typing import TypeVar
 T = TypeVar("T", covariant=True, contravariant=True)
 ```
 
-### Variance parameters must be unambiguous
+### Boolean parameters must be unambiguous
 
 ```py
-from typing import TypeVar
+from typing_extensions import TypeVar
 
 def cond() -> bool:
     return True
@@ -176,6 +247,73 @@ T = TypeVar("T", covariant=cond())
 
 # error: [invalid-legacy-type-variable]
 U = TypeVar("U", contravariant=cond())
+
+# error: [invalid-legacy-type-variable]
+V = TypeVar("V", infer_variance=cond())
+```
+
+### Invalid keyword arguments
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", invalid_keyword=True)
+```
+
+```pyi
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", invalid_keyword=True)
+
+```
+
+### Constructor signature versioning
+
+#### For `typing.TypeVar`
+
+```toml
+[environment]
+python-version = "3.10"
+```
+
+In a stub file, features from the latest supported Python version can be used on any version.
+There's no need to require use of `typing_extensions.TypeVar` in a stub file, when the type checker
+can understand the typevar definition perfectly well either way, and there can be no runtime error.
+(Perhaps it's arguable whether this special case is worth it, but other type checkers do it, so we
+maintain compatibility.)
+
+```pyi
+from typing import TypeVar
+T = TypeVar("T", default=int)
+```
+
+But this raises an error in a non-stub file:
+
+```py
+from typing import TypeVar
+
+# error: [invalid-legacy-type-variable]
+T = TypeVar("T", default=int)
+```
+
+#### For `typing_extensions.TypeVar`
+
+`typing_extensions.TypeVar` always supports the latest features, on any Python version.
+
+```toml
+[environment]
+python-version = "3.10"
+```
+
+```py
+from typing_extensions import TypeVar
+
+T = TypeVar("T", default=int)
+# TODO: should not error, should reveal `int`
+# error: [unresolved-attribute]
+reveal_type(T.__default__)  # revealed: Unknown
 ```
 
 ## Callability
@@ -231,4 +369,96 @@ def constrained(x: T_constrained):
     reveal_type(type(x))  # revealed: type[int] | type[str]
 ```
 
+## Cycles
+
+### Bounds and constraints
+
+A typevar's bounds and constraints cannot be generic, cyclic or otherwise:
+
+```py
+from typing import Any, TypeVar
+
+S = TypeVar("S")
+
+# TODO: error
+T = TypeVar("T", bound=list[S])
+
+# TODO: error
+U = TypeVar("U", list["T"], str)
+
+# TODO: error
+V = TypeVar("V", list["V"], str)
+```
+
+However, they are lazily evaluated and can cyclically refer to their own type:
+
+```py
+from typing import TypeVar, Generic
+
+T = TypeVar("T", bound=list["G"])
+
+class G(Generic[T]):
+    x: T
+
+reveal_type(G[list[G]]().x)  # revealed: list[G[Unknown]]
+```
+
+### Defaults
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+Defaults can be generic, but can only refer to typevars from the same scope if they were defined
+earlier in that scope:
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+U = TypeVar("U", default=T)
+
+class C(Generic[T, U]):
+    x: T
+    y: U
+
+reveal_type(C[int, str]().x)  # revealed: int
+reveal_type(C[int, str]().y)  # revealed: str
+reveal_type(C[int]().x)  # revealed: int
+reveal_type(C[int]().y)  # revealed: int
+
+# TODO: error
+V = TypeVar("V", default="V")
+
+class D(Generic[V]):
+    x: V
+
+# TODO: we shouldn't leak a typevar like this in type inference
+reveal_type(D().x)  # revealed: V@D
+```
+
+## Regression
+
+### Use of typevar with default inside a function body that binds it
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+```py
+from typing import Generic, TypeVar
+
+_DataT = TypeVar("_DataT", bound=int, default=int)
+
+class Event(Generic[_DataT]):
+    def __init__(self, data: _DataT) -> None:
+        self.data = data
+
+def async_fire_internal(event_data: _DataT):
+    event: Event[_DataT] | None = None
+    event = Event(event_data)
+```
+
 [generics]: https://typing.python.org/en/latest/spec/generics.html
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/pep695/aliases.md b/crates/ty_python_semantic/resources/mdtest/generics/pep695/aliases.md
new file mode 100644
index 0000000000..3191cf5683
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/generics/pep695/aliases.md
@@ -0,0 +1,233 @@
+# Generic type aliases: PEP 695 syntax
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+## Defining a generic alias
+
+At its simplest, to define a type alias using PEP 695 syntax, you add a list of `TypeVar`s,
+`ParamSpec`s or `TypeVarTuple`s after the alias name.
+
+```py
+from ty_extensions import generic_context
+
+type SingleTypevar[T] = ...
+type MultipleTypevars[T, S] = ...
+type SingleParamSpec[**P] = ...
+type TypeVarAndParamSpec[T, **P] = ...
+type SingleTypeVarTuple[*Ts] = ...
+type TypeVarAndTypeVarTuple[T, *Ts] = ...
+
+# revealed: tuple[T@SingleTypevar]
+reveal_type(generic_context(SingleTypevar))
+# revealed: tuple[T@MultipleTypevars, S@MultipleTypevars]
+reveal_type(generic_context(MultipleTypevars))
+
+# TODO: support `ParamSpec`/`TypeVarTuple` properly
+# (these should include the `ParamSpec`s and `TypeVarTuple`s in their generic contexts)
+reveal_type(generic_context(SingleParamSpec))  # revealed: tuple[()]
+reveal_type(generic_context(TypeVarAndParamSpec))  # revealed: tuple[T@TypeVarAndParamSpec]
+reveal_type(generic_context(SingleTypeVarTuple))  # revealed: tuple[()]
+reveal_type(generic_context(TypeVarAndTypeVarTuple))  # revealed: tuple[T@TypeVarAndTypeVarTuple]
+```
+
+You cannot use the same typevar more than once.
+
+```py
+# error: [invalid-syntax] "duplicate type parameter"
+type RepeatedTypevar[T, T] = ...
+```
+
+## Specializing type aliases explicitly
+
+The type parameter can be specified explicitly:
+
+```py
+from typing import Literal
+
+type C[T] = T
+
+def _(a: C[int], b: C[Literal[5]]):
+    reveal_type(a)  # revealed: int
+    reveal_type(b)  # revealed: Literal[5]
+```
+
+The specialization must match the generic types:
+
+```py
+# error: [too-many-positional-arguments] "Too many positional arguments: expected 1, got 2"
+reveal_type(C[int, int])  # revealed: Unknown
+```
+
+And non-generic types cannot be specialized:
+
+```py
+type B = ...
+
+# error: [non-subscriptable] "Cannot subscript non-generic type alias"
+reveal_type(B[int])  # revealed: Unknown
+
+# error: [non-subscriptable] "Cannot subscript non-generic type alias"
+def _(b: B[int]): ...
+```
+
+If the type variable has an upper bound, the specialized type must satisfy that bound:
+
+```py
+type Bounded[T: int] = ...
+type BoundedByUnion[T: int | str] = ...
+
+class IntSubclass(int): ...
+
+reveal_type(Bounded[int])  # revealed: Bounded[int]
+reveal_type(Bounded[IntSubclass])  # revealed: Bounded[IntSubclass]
+
+# TODO: update this diagnostic to talk about type parameters and specializations
+# error: [invalid-argument-type] "Argument is incorrect: Expected `int`, found `str`"
+reveal_type(Bounded[str])  # revealed: Unknown
+
+# TODO: update this diagnostic to talk about type parameters and specializations
+# error: [invalid-argument-type] "Argument is incorrect: Expected `int`, found `int | str`"
+reveal_type(Bounded[int | str])  # revealed: Unknown
+
+reveal_type(BoundedByUnion[int])  # revealed: BoundedByUnion[int]
+reveal_type(BoundedByUnion[IntSubclass])  # revealed: BoundedByUnion[IntSubclass]
+reveal_type(BoundedByUnion[str])  # revealed: BoundedByUnion[str]
+reveal_type(BoundedByUnion[int | str])  # revealed: BoundedByUnion[int | str]
+```
+
+If the type variable is constrained, the specialized type must satisfy those constraints:
+
+```py
+type Constrained[T: (int, str)] = ...
+
+reveal_type(Constrained[int])  # revealed: Constrained[int]
+
+# TODO: error: [invalid-argument-type]
+# TODO: revealed: Constrained[Unknown]
+reveal_type(Constrained[IntSubclass])  # revealed: Constrained[IntSubclass]
+
+reveal_type(Constrained[str])  # revealed: Constrained[str]
+
+# TODO: error: [invalid-argument-type]
+# TODO: revealed: Unknown
+reveal_type(Constrained[int | str])  # revealed: Constrained[int | str]
+
+# TODO: update this diagnostic to talk about type parameters and specializations
+# error: [invalid-argument-type] "Argument is incorrect: Expected `int | str`, found `object`"
+reveal_type(Constrained[object])  # revealed: Unknown
+```
+
+If the type variable has a default, it can be omitted:
+
+```py
+type WithDefault[T, U = int] = ...
+
+reveal_type(WithDefault[str, str])  # revealed: WithDefault[str, str]
+reveal_type(WithDefault[str])  # revealed: WithDefault[str, int]
+```
+
+If the type alias is not specialized explicitly, it is implicitly specialized to `Unknown`:
+
+```py
+type G[T] = list[T]
+
+def _(g: G):
+    reveal_type(g)  # revealed: list[Unknown]
+```
+
+Unless a type default was provided:
+
+```py
+type G[T = int] = list[T]
+
+def _(g: G):
+    reveal_type(g)  # revealed: list[int]
+```
+
+## Aliases are not callable
+
+```py
+type A = int
+type B[T] = T
+
+# error: [call-non-callable] "Object of type `TypeAliasType` is not callable"
+reveal_type(A())  # revealed: Unknown
+
+# error: [call-non-callable] "Object of type `GenericAlias` is not callable"
+reveal_type(B[int]())  # revealed: Unknown
+```
+
+## Recursive Truthiness
+
+Make sure we handle cycles correctly when computing the truthiness of a generic type alias:
+
+```py
+type X[T: X] = T
+
+def _(x: X):
+    assert x
+```
+
+## Recursive generic type aliases
+
+```py
+type RecursiveList[T] = T | list[RecursiveList[T]]
+
+r1: RecursiveList[int] = 1
+r2: RecursiveList[int] = [1, [1, 2, 3]]
+# error: [invalid-assignment] "Object of type `Literal["a"]` is not assignable to `RecursiveList[int]`"
+r3: RecursiveList[int] = "a"
+# error: [invalid-assignment]
+r4: RecursiveList[int] = ["a"]
+# TODO: this should be an error
+r5: RecursiveList[int] = [1, ["a"]]
+
+def _(x: RecursiveList[int]):
+    if isinstance(x, list):
+        # TODO: should be `list[RecursiveList[int]]
+        reveal_type(x[0])  # revealed: int | list[Any]
+    if isinstance(x, list) and isinstance(x[0], list):
+        # TODO: should be `list[RecursiveList[int]]`
+        reveal_type(x[0])  # revealed: list[Any]
+```
+
+Assignment checks respect structural subtyping, i.e. type aliases with the same structure are
+assignable to each other.
+
+```py
+# This is structurally equivalent to RecursiveList[T].
+type RecursiveList2[T] = T | list[T | list[RecursiveList[T]]]
+# This is not structurally equivalent to RecursiveList[T].
+type RecursiveList3[T] = T | list[list[RecursiveList[T]]]
+
+def _(x: RecursiveList[int], y: RecursiveList2[int]):
+    r1: RecursiveList2[int] = x
+    # error: [invalid-assignment]
+    r2: RecursiveList3[int] = x
+
+    r3: RecursiveList[int] = y
+    # error: [invalid-assignment]
+    r4: RecursiveList3[int] = y
+```
+
+It is also possible to handle divergent type aliases that are not actually have instances.
+
+```py
+# The type variable `T` has no meaning here, it's just to make sure it works correctly.
+type DivergentList[T] = list[DivergentList[T]]
+
+d1: DivergentList[int] = []
+# error: [invalid-assignment]
+d2: DivergentList[int] = [1]
+# error: [invalid-assignment]
+d3: DivergentList[int] = ["a"]
+# TODO: this should be an error
+d4: DivergentList[int] = [[1]]
+
+def _(x: DivergentList[int]):
+    d1: DivergentList[int] = [x]
+    d2: DivergentList[int] = x[0]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md b/crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md
index 467b6ed42c..1f52d16d9a 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md
@@ -40,13 +40,6 @@ You cannot use the same typevar more than once.
 class RepeatedTypevar[T, T]: ...
 ```
 
-You can only use typevars (TODO: or param specs or typevar tuples) in the class's generic context.
-
-```py
-# TODO: error
-class GenericOfType[int]: ...
-```
-
 You can also define a generic class by inheriting from some _other_ generic class, and specializing
 it with typevars. With PEP 695 syntax, you must explicitly list all of the typevars that you use in
 your base classes.
@@ -511,17 +504,17 @@ class C[T]:
     def cannot_shadow_class_typevar[T](self, t: T): ...
 
 reveal_type(generic_context(C))  # revealed: tuple[T@C]
-reveal_type(generic_context(C.method))  # revealed: None
-reveal_type(generic_context(C.generic_method))  # revealed: tuple[U@generic_method]
+reveal_type(generic_context(C.method))  # revealed: tuple[Self@method]
+reveal_type(generic_context(C.generic_method))  # revealed: tuple[Self@generic_method, U@generic_method]
 reveal_type(generic_context(C[int]))  # revealed: None
-reveal_type(generic_context(C[int].method))  # revealed: None
-reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[U@generic_method]
+reveal_type(generic_context(C[int].method))  # revealed: tuple[Self@method]
+reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[Self@generic_method, U@generic_method]
 
 c: C[int] = C[int]()
 reveal_type(c.generic_method(1, "string"))  # revealed: Literal["string"]
 reveal_type(generic_context(c))  # revealed: None
-reveal_type(generic_context(c.method))  # revealed: None
-reveal_type(generic_context(c.generic_method))  # revealed: tuple[U@generic_method]
+reveal_type(generic_context(c.method))  # revealed: tuple[Self@method]
+reveal_type(generic_context(c.generic_method))  # revealed: tuple[Self@generic_method, U@generic_method]
 ```
 
 ## Specializations propagate
@@ -560,13 +553,9 @@ from typing import overload
 
 class WithOverloadedMethod[T]:
     @overload
-    def method(self, x: T) -> T:
-        return x
-
+    def method(self, x: T) -> T: ...
     @overload
-    def method[S](self, x: S) -> S | T:
-        return x
-
+    def method[S](self, x: S) -> S | T: ...
     def method[S](self, x: S | T) -> S | T:
         return x
 
@@ -649,6 +638,25 @@ class C[T](C): ...
 class D[T](D[int]): ...
 ```
 
+### Cyclic inheritance in a stub file combined with constrained type variables
+
+This is a regression test for <https://github.com/astral-sh/ty/issues/1390>; we used to panic on
+this:
+
+`stub.pyi`:
+
+```pyi
+class A(B): ...
+class G: ...
+class C[T: (G, A)]: ...
+class B(C[A]): ...
+class D(C[G]): ...
+
+def func(x: D): ...
+
+func(G())  # error: [invalid-argument-type]
+```
+
 ## Tuple as a PEP-695 generic class
 
 Our special handling for `tuple` does not break if `tuple` is defined as a PEP-695 generic class in
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/pep695/functions.md b/crates/ty_python_semantic/resources/mdtest/generics/pep695/functions.md
index 2645221f01..a5e62f6866 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/pep695/functions.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/pep695/functions.md
@@ -72,7 +72,7 @@ from typing import Protocol, TypeVar
 S = TypeVar("S")
 
 class CanIndex(Protocol[S]):
-    def __getitem__(self, index: int) -> S: ...
+    def __getitem__(self, index: int, /) -> S: ...
 
 class ExplicitlyImplements[T](CanIndex[T]): ...
 
@@ -286,6 +286,9 @@ def union_param[T](x: T | None) -> T:
 reveal_type(union_param("a"))  # revealed: Literal["a"]
 reveal_type(union_param(1))  # revealed: Literal[1]
 reveal_type(union_param(None))  # revealed: Unknown
+
+def _(x: int | None):
+    reveal_type(union_param(x))  # revealed: int
 ```
 
 ```py
@@ -323,6 +326,27 @@ reveal_type(f(g("a")))  # revealed: tuple[Literal["a"] | None, int]
 reveal_type(g(f("a")))  # revealed: tuple[Literal["a"], int] | None
 ```
 
+## Passing generic functions to generic functions
+
+```py
+from typing import Callable
+
+def invoke[A, B](fn: Callable[[A], B], value: A) -> B:
+    return fn(value)
+
+def identity[T](x: T) -> T:
+    return x
+
+def head[T](xs: list[T]) -> T:
+    return xs[0]
+
+# TODO: this should be `Literal[1]`
+reveal_type(invoke(identity, 1))  # revealed: Unknown
+
+# TODO: this should be `Unknown | int`
+reveal_type(invoke(head, [1, 2, 3]))  # revealed: Unknown
+```
+
 ## Protocols as TypeVar bounds
 
 Protocol types can be used as TypeVar bounds, just like nominal types.
@@ -420,7 +444,23 @@ def g[T: A](b: B[T]):
     return f(b.x)  # Fine
 ```
 
-## Constrained TypeVar in a union
+## Typevars in a union
+
+```py
+def takes_in_union[T](t: T | None) -> T:
+    raise NotImplementedError
+
+def takes_in_bigger_union[T](t: T | int | None) -> T:
+    raise NotImplementedError
+
+def _(x: str | None) -> None:
+    reveal_type(takes_in_union(x))  # revealed: str
+    reveal_type(takes_in_bigger_union(x))  # revealed: str
+
+def _(x: str | int | None) -> None:
+    reveal_type(takes_in_union(x))  # revealed: str | int
+    reveal_type(takes_in_bigger_union(x))  # revealed: str
+```
 
 This is a regression test for an issue that surfaced in the primer report of an early version of
 <https://github.com/astral-sh/ruff/pull/19811>, where we failed to solve the `TypeVar` here due to
@@ -453,6 +493,13 @@ def overloaded_outer[T](t: T | None = None) -> None:
 
     if t is not None:
         inner(t)
+
+def outer[T](t: T) -> None:
+    def inner[S](inner_t: T, s: S) -> tuple[T, S]:
+        return inner_t, s
+    reveal_type(inner(t, 1))  # revealed: tuple[T@outer, Literal[1]]
+
+    inner("wrong", 1)  # error: [invalid-argument-type]
 ```
 
 ## Unpacking a TypeVar
@@ -494,3 +541,35 @@ age, name = team.employees[0]
 reveal_type(age)  # revealed: Age
 reveal_type(name)  # revealed: Name
 ```
+
+## `self` in PEP 695 generic methods
+
+When a generic method uses a PEP 695 generic context, an implict or explicit annotation of
+`self: Self` is still part of the full generic context:
+
+```py
+from typing import Self
+
+class C:
+    def explicit_self[T](self: Self, x: T) -> tuple[Self, T]:
+        return self, x
+
+    def implicit_self[T](self, x: T) -> tuple[Self, T]:
+        return self, x
+
+def _(x: int):
+    reveal_type(C().explicit_self(x))  # revealed: tuple[C, int]
+
+    reveal_type(C().implicit_self(x))  # revealed: tuple[C, int]
+```
+
+## `~T` is never assignable to `T`
+
+```py
+from ty_extensions import Not
+
+def f[T](x: T, y: Not[T]) -> T:
+    x = y  # error: [invalid-assignment]
+    y = x  # error: [invalid-assignment]
+    return x
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/pep695/variables.md b/crates/ty_python_semantic/resources/mdtest/generics/pep695/variables.md
index ebf69f7e4e..68cce5ad3e 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/pep695/variables.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/pep695/variables.md
@@ -129,7 +129,7 @@ specialization. Thus, the typevar is a subtype of itself and of `object`, but no
 (including other typevars).
 
 ```py
-from ty_extensions import is_assignable_to, is_subtype_of, static_assert
+from ty_extensions import is_assignable_to, is_subtype_of
 
 class Super: ...
 class Base(Super): ...
@@ -137,23 +137,23 @@ class Sub(Base): ...
 class Unrelated: ...
 
 def unbounded_unconstrained[T, U](t: T, u: U) -> None:
-    static_assert(is_assignable_to(T, T))
-    static_assert(is_assignable_to(T, object))
-    static_assert(not is_assignable_to(T, Super))
-    static_assert(is_assignable_to(U, U))
-    static_assert(is_assignable_to(U, object))
-    static_assert(not is_assignable_to(U, Super))
-    static_assert(not is_assignable_to(T, U))
-    static_assert(not is_assignable_to(U, T))
+    reveal_type(is_assignable_to(T, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, object))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(U, U))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(U, object))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(U, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(is_subtype_of(T, T))
-    static_assert(is_subtype_of(T, object))
-    static_assert(not is_subtype_of(T, Super))
-    static_assert(is_subtype_of(U, U))
-    static_assert(is_subtype_of(U, object))
-    static_assert(not is_subtype_of(U, Super))
-    static_assert(not is_subtype_of(T, U))
-    static_assert(not is_subtype_of(U, T))
+    reveal_type(is_subtype_of(T, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(T, object))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(T, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U, U))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(U, object))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(U, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 ```
 
 A bounded typevar is assignable to its bound, and a bounded, fully static typevar is a subtype of
@@ -167,40 +167,40 @@ from typing import Any
 from typing_extensions import final
 
 def bounded[T: Super](t: T) -> None:
-    static_assert(is_assignable_to(T, Super))
-    static_assert(not is_assignable_to(T, Sub))
-    static_assert(not is_assignable_to(Super, T))
-    static_assert(not is_assignable_to(Sub, T))
+    reveal_type(is_assignable_to(T, Super))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Sub, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(is_subtype_of(T, Super))
-    static_assert(not is_subtype_of(T, Sub))
-    static_assert(not is_subtype_of(Super, T))
-    static_assert(not is_subtype_of(Sub, T))
+    reveal_type(is_subtype_of(T, Super))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Sub, T))  # revealed: ty_extensions.ConstraintSet[never]
 
 def bounded_by_gradual[T: Any](t: T) -> None:
-    static_assert(is_assignable_to(T, Any))
-    static_assert(is_assignable_to(Any, T))
-    static_assert(is_assignable_to(T, Super))
-    static_assert(not is_assignable_to(Super, T))
-    static_assert(is_assignable_to(T, Sub))
-    static_assert(not is_assignable_to(Sub, T))
+    reveal_type(is_assignable_to(T, Any))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Any, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Super))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Sub))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Sub, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(not is_subtype_of(T, Any))
-    static_assert(not is_subtype_of(Any, T))
-    static_assert(not is_subtype_of(T, Super))
-    static_assert(not is_subtype_of(Super, T))
-    static_assert(not is_subtype_of(T, Sub))
-    static_assert(not is_subtype_of(Sub, T))
+    reveal_type(is_subtype_of(T, Any))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Any, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Sub, T))  # revealed: ty_extensions.ConstraintSet[never]
 
 @final
 class FinalClass: ...
 
 def bounded_final[T: FinalClass](t: T) -> None:
-    static_assert(is_assignable_to(T, FinalClass))
-    static_assert(not is_assignable_to(FinalClass, T))
+    reveal_type(is_assignable_to(T, FinalClass))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(FinalClass, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(is_subtype_of(T, FinalClass))
-    static_assert(not is_subtype_of(FinalClass, T))
+    reveal_type(is_subtype_of(T, FinalClass))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(FinalClass, T))  # revealed: ty_extensions.ConstraintSet[never]
 ```
 
 Two distinct fully static typevars are not subtypes of each other, even if they have the same
@@ -210,18 +210,18 @@ typevars to `Never` in addition to that final class.
 
 ```py
 def two_bounded[T: Super, U: Super](t: T, u: U) -> None:
-    static_assert(not is_assignable_to(T, U))
-    static_assert(not is_assignable_to(U, T))
+    reveal_type(is_assignable_to(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(not is_subtype_of(T, U))
-    static_assert(not is_subtype_of(U, T))
+    reveal_type(is_subtype_of(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
 def two_final_bounded[T: FinalClass, U: FinalClass](t: T, u: U) -> None:
-    static_assert(not is_assignable_to(T, U))
-    static_assert(not is_assignable_to(U, T))
+    reveal_type(is_assignable_to(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(not is_subtype_of(T, U))
-    static_assert(not is_subtype_of(U, T))
+    reveal_type(is_subtype_of(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 ```
 
 A constrained fully static typevar is assignable to the union of its constraints, but not to any of
@@ -232,64 +232,64 @@ intersection of all of its constraints is a subtype of the typevar.
 from ty_extensions import Intersection
 
 def constrained[T: (Base, Unrelated)](t: T) -> None:
-    static_assert(not is_assignable_to(T, Super))
-    static_assert(not is_assignable_to(T, Base))
-    static_assert(not is_assignable_to(T, Sub))
-    static_assert(not is_assignable_to(T, Unrelated))
-    static_assert(is_assignable_to(T, Super | Unrelated))
-    static_assert(is_assignable_to(T, Base | Unrelated))
-    static_assert(not is_assignable_to(T, Sub | Unrelated))
-    static_assert(not is_assignable_to(Super, T))
-    static_assert(not is_assignable_to(Unrelated, T))
-    static_assert(not is_assignable_to(Super | Unrelated, T))
-    static_assert(is_assignable_to(Intersection[Base, Unrelated], T))
+    reveal_type(is_assignable_to(T, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Base))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Super | Unrelated))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Base | Unrelated))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Sub | Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Super | Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Intersection[Base, Unrelated], T))  # revealed: ty_extensions.ConstraintSet[always]
 
-    static_assert(not is_subtype_of(T, Super))
-    static_assert(not is_subtype_of(T, Base))
-    static_assert(not is_subtype_of(T, Sub))
-    static_assert(not is_subtype_of(T, Unrelated))
-    static_assert(is_subtype_of(T, Super | Unrelated))
-    static_assert(is_subtype_of(T, Base | Unrelated))
-    static_assert(not is_subtype_of(T, Sub | Unrelated))
-    static_assert(not is_subtype_of(Super, T))
-    static_assert(not is_subtype_of(Unrelated, T))
-    static_assert(not is_subtype_of(Super | Unrelated, T))
-    static_assert(is_subtype_of(Intersection[Base, Unrelated], T))
+    reveal_type(is_subtype_of(T, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Base))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Super | Unrelated))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(T, Base | Unrelated))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(T, Sub | Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super | Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Intersection[Base, Unrelated], T))  # revealed: ty_extensions.ConstraintSet[always]
 
 def constrained_by_gradual[T: (Base, Any)](t: T) -> None:
-    static_assert(is_assignable_to(T, Super))
-    static_assert(is_assignable_to(T, Base))
-    static_assert(not is_assignable_to(T, Sub))
-    static_assert(not is_assignable_to(T, Unrelated))
-    static_assert(is_assignable_to(T, Any))
-    static_assert(is_assignable_to(T, Super | Any))
-    static_assert(is_assignable_to(T, Super | Unrelated))
-    static_assert(not is_assignable_to(Super, T))
-    static_assert(is_assignable_to(Base, T))
-    static_assert(not is_assignable_to(Unrelated, T))
-    static_assert(is_assignable_to(Any, T))
-    static_assert(not is_assignable_to(Super | Any, T))
-    static_assert(is_assignable_to(Base | Any, T))
-    static_assert(not is_assignable_to(Super | Unrelated, T))
-    static_assert(is_assignable_to(Intersection[Base, Unrelated], T))
-    static_assert(is_assignable_to(Intersection[Base, Any], T))
+    reveal_type(is_assignable_to(T, Super))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Base))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(T, Any))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Super | Any))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(T, Super | Unrelated))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Base, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Any, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Super | Any, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Base | Any, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Super | Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(Intersection[Base, Unrelated], T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Intersection[Base, Any], T))  # revealed: ty_extensions.ConstraintSet[always]
 
-    static_assert(not is_subtype_of(T, Super))
-    static_assert(not is_subtype_of(T, Base))
-    static_assert(not is_subtype_of(T, Sub))
-    static_assert(not is_subtype_of(T, Unrelated))
-    static_assert(not is_subtype_of(T, Any))
-    static_assert(not is_subtype_of(T, Super | Any))
-    static_assert(not is_subtype_of(T, Super | Unrelated))
-    static_assert(not is_subtype_of(Super, T))
-    static_assert(not is_subtype_of(Base, T))
-    static_assert(not is_subtype_of(Unrelated, T))
-    static_assert(not is_subtype_of(Any, T))
-    static_assert(not is_subtype_of(Super | Any, T))
-    static_assert(not is_subtype_of(Base | Any, T))
-    static_assert(not is_subtype_of(Super | Unrelated, T))
-    static_assert(not is_subtype_of(Intersection[Base, Unrelated], T))
-    static_assert(not is_subtype_of(Intersection[Base, Any], T))
+    reveal_type(is_subtype_of(T, Super))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Base))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Sub))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Any))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Super | Any))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(T, Super | Unrelated))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Base, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Any, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super | Any, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Base | Any, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Super | Unrelated, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Intersection[Base, Unrelated], T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(Intersection[Base, Any], T))  # revealed: ty_extensions.ConstraintSet[never]
 ```
 
 Two distinct fully static typevars are not subtypes of each other, even if they have the same
@@ -299,47 +299,58 @@ the same type.
 
 ```py
 def two_constrained[T: (int, str), U: (int, str)](t: T, u: U) -> None:
-    static_assert(not is_assignable_to(T, U))
-    static_assert(not is_assignable_to(U, T))
+    reveal_type(is_assignable_to(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(not is_subtype_of(T, U))
-    static_assert(not is_subtype_of(U, T))
+    reveal_type(is_subtype_of(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
 @final
 class AnotherFinalClass: ...
 
 def two_final_constrained[T: (FinalClass, AnotherFinalClass), U: (FinalClass, AnotherFinalClass)](t: T, u: U) -> None:
-    static_assert(not is_assignable_to(T, U))
-    static_assert(not is_assignable_to(U, T))
+    reveal_type(is_assignable_to(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_assignable_to(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 
-    static_assert(not is_subtype_of(T, U))
-    static_assert(not is_subtype_of(U, T))
+    reveal_type(is_subtype_of(T, U))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U, T))  # revealed: ty_extensions.ConstraintSet[never]
 ```
 
 A bound or constrained typevar is a subtype of itself in a union:
 
 ```py
 def union[T: Base, U: (Base, Unrelated)](t: T, u: U) -> None:
-    static_assert(is_assignable_to(T, T | None))
-    static_assert(is_assignable_to(U, U | None))
+    reveal_type(is_assignable_to(T, T | None))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(U, U | None))  # revealed: ty_extensions.ConstraintSet[always]
 
-    static_assert(is_subtype_of(T, T | None))
-    static_assert(is_subtype_of(U, U | None))
+    reveal_type(is_subtype_of(T, T | None))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(U, U | None))  # revealed: ty_extensions.ConstraintSet[always]
+```
+
+A bound or constrained typevar in a union with a dynamic type is assignable to the typevar:
+
+```py
+def union_with_dynamic[T: Base, U: (Base, Unrelated)](t: T, u: U) -> None:
+    reveal_type(is_assignable_to(T | Any, T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(U | Any, U))  # revealed: ty_extensions.ConstraintSet[always]
+
+    reveal_type(is_subtype_of(T | Any, T))  # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(is_subtype_of(U | Any, U))  # revealed: ty_extensions.ConstraintSet[never]
 ```
 
 And an intersection of a typevar with another type is always a subtype of the TypeVar:
 
 ```py
-from ty_extensions import Intersection, Not, is_disjoint_from
+from ty_extensions import Intersection, Not, is_disjoint_from, static_assert
 
 class A: ...
 
 def inter[T: Base, U: (Base, Unrelated)](t: T, u: U) -> None:
-    static_assert(is_assignable_to(Intersection[T, Unrelated], T))
-    static_assert(is_subtype_of(Intersection[T, Unrelated], T))
+    reveal_type(is_assignable_to(Intersection[T, Unrelated], T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(Intersection[T, Unrelated], T))  # revealed: ty_extensions.ConstraintSet[always]
 
-    static_assert(is_assignable_to(Intersection[U, A], U))
-    static_assert(is_subtype_of(Intersection[U, A], U))
+    reveal_type(is_assignable_to(Intersection[U, A], U))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(Intersection[U, A], U))  # revealed: ty_extensions.ConstraintSet[always]
 
     static_assert(is_disjoint_from(Not[T], T))
     static_assert(is_disjoint_from(T, Not[T]))
@@ -636,14 +647,14 @@ The intersection of a typevar with any other type is assignable to (and if fully
 of) itself.
 
 ```py
-from ty_extensions import is_assignable_to, is_subtype_of, static_assert, Not
+from ty_extensions import is_assignable_to, is_subtype_of, Not
 
 def intersection_is_assignable[T](t: T) -> None:
-    static_assert(is_assignable_to(Intersection[T, None], T))
-    static_assert(is_assignable_to(Intersection[T, Not[None]], T))
+    reveal_type(is_assignable_to(Intersection[T, None], T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_assignable_to(Intersection[T, Not[None]], T))  # revealed: ty_extensions.ConstraintSet[always]
 
-    static_assert(is_subtype_of(Intersection[T, None], T))
-    static_assert(is_subtype_of(Intersection[T, Not[None]], T))
+    reveal_type(is_subtype_of(Intersection[T, None], T))  # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(is_subtype_of(Intersection[T, Not[None]], T))  # revealed: ty_extensions.ConstraintSet[always]
 ```
 
 ## Narrowing
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/pep695/variance.md b/crates/ty_python_semantic/resources/mdtest/generics/pep695/variance.md
index 58ec406333..7dc9392b21 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/pep695/variance.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/pep695/variance.md
@@ -28,7 +28,7 @@ get from the sequence is a valid `int`.
 
 ```py
 from ty_extensions import is_assignable_to, is_equivalent_to, is_subtype_of, static_assert, Unknown
-from typing import Any
+from typing import Any, Never
 
 class A: ...
 class B(A): ...
@@ -60,6 +60,8 @@ static_assert(not is_subtype_of(C[A], C[Any]))
 static_assert(not is_subtype_of(C[B], C[Any]))
 static_assert(not is_subtype_of(C[Any], C[A]))
 static_assert(not is_subtype_of(C[Any], C[B]))
+static_assert(is_subtype_of(C[Any], C[object]))
+static_assert(is_subtype_of(C[Never], C[Any]))
 
 static_assert(is_subtype_of(D[B], C[A]))
 static_assert(not is_subtype_of(D[A], C[B]))
@@ -104,7 +106,7 @@ that you pass into the consumer is a valid `int`.
 
 ```py
 from ty_extensions import is_assignable_to, is_equivalent_to, is_subtype_of, static_assert, Unknown
-from typing import Any
+from typing import Any, Never
 
 class A: ...
 class B(A): ...
@@ -135,6 +137,8 @@ static_assert(not is_subtype_of(C[A], C[Any]))
 static_assert(not is_subtype_of(C[B], C[Any]))
 static_assert(not is_subtype_of(C[Any], C[A]))
 static_assert(not is_subtype_of(C[Any], C[B]))
+static_assert(is_subtype_of(C[object], C[Any]))
+static_assert(is_subtype_of(C[Any], C[Never]))
 
 static_assert(not is_subtype_of(D[B], C[A]))
 static_assert(is_subtype_of(D[A], C[B]))
@@ -192,7 +196,7 @@ since we can't know in advance which of the allowed methods you'll want to use.
 
 ```py
 from ty_extensions import is_assignable_to, is_equivalent_to, is_subtype_of, static_assert, Unknown
-from typing import Any
+from typing import Any, Never
 
 class A: ...
 class B(A): ...
@@ -225,6 +229,8 @@ static_assert(not is_subtype_of(C[A], C[Any]))
 static_assert(not is_subtype_of(C[B], C[Any]))
 static_assert(not is_subtype_of(C[Any], C[A]))
 static_assert(not is_subtype_of(C[Any], C[B]))
+static_assert(not is_subtype_of(C[object], C[Any]))
+static_assert(not is_subtype_of(C[Any], C[Never]))
 
 static_assert(not is_subtype_of(D[B], C[A]))
 static_assert(not is_subtype_of(D[A], C[B]))
@@ -261,8 +267,8 @@ static_assert(not is_equivalent_to(D[Any], C[Unknown]))
 ## Bivariance
 
 With a bivariant typevar, _all_ specializations of the generic class are assignable to (and in fact,
-gradually equivalent to) each other, and all fully static specializations are subtypes of (and
-equivalent to) each other.
+gradually equivalent to) each other, and all specializations are subtypes of (and equivalent to)
+each other.
 
 This is a bit of pathological case, which really only happens when the class doesn't use the typevar
 at all. (If it did, it would have to be covariant, contravariant, or invariant, depending on _how_
@@ -270,7 +276,7 @@ the typevar was used.)
 
 ```py
 from ty_extensions import is_assignable_to, is_equivalent_to, is_subtype_of, static_assert, Unknown
-from typing import Any
+from typing import Any, Never
 
 class A: ...
 class B(A): ...
@@ -298,18 +304,20 @@ static_assert(is_assignable_to(D[Any], C[B]))
 
 static_assert(is_subtype_of(C[B], C[A]))
 static_assert(is_subtype_of(C[A], C[B]))
-static_assert(not is_subtype_of(C[A], C[Any]))
-static_assert(not is_subtype_of(C[B], C[Any]))
-static_assert(not is_subtype_of(C[Any], C[A]))
-static_assert(not is_subtype_of(C[Any], C[B]))
-static_assert(not is_subtype_of(C[Any], C[Any]))
+static_assert(is_subtype_of(C[A], C[Any]))
+static_assert(is_subtype_of(C[B], C[Any]))
+static_assert(is_subtype_of(C[Any], C[A]))
+static_assert(is_subtype_of(C[Any], C[B]))
+static_assert(is_subtype_of(C[Any], C[Any]))
+static_assert(is_subtype_of(C[object], C[Any]))
+static_assert(is_subtype_of(C[Any], C[Never]))
 
 static_assert(is_subtype_of(D[B], C[A]))
 static_assert(is_subtype_of(D[A], C[B]))
-static_assert(not is_subtype_of(D[A], C[Any]))
-static_assert(not is_subtype_of(D[B], C[Any]))
-static_assert(not is_subtype_of(D[Any], C[A]))
-static_assert(not is_subtype_of(D[Any], C[B]))
+static_assert(is_subtype_of(D[A], C[Any]))
+static_assert(is_subtype_of(D[B], C[Any]))
+static_assert(is_subtype_of(D[Any], C[A]))
+static_assert(is_subtype_of(D[Any], C[B]))
 
 static_assert(is_equivalent_to(C[A], C[A]))
 static_assert(is_equivalent_to(C[B], C[B]))
@@ -752,6 +760,95 @@ b_container = ClassContainer[B](B)
 a_instance: A = use_a_class_container(b_container)  # This should work
 ```
 
+## TypeIs
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+`TypeIs[T]` is invariant in `T`. See the [typing spec][typeis-spec] for a justification.
+
+```py
+from typing import TypeIs
+from ty_extensions import is_assignable_to, is_subtype_of, static_assert
+
+class A:
+    pass
+
+class B(A):
+    pass
+
+class C[T]:
+    def check(x: object) -> TypeIs[T]:
+        # this is a bad check, but we only care about it type-checking
+        return False
+
+static_assert(not is_subtype_of(C[B], C[A]))
+static_assert(not is_subtype_of(C[A], C[B]))
+static_assert(not is_assignable_to(C[B], C[A]))
+static_assert(not is_assignable_to(C[A], C[B]))
+```
+
+## Type aliases
+
+The variance of the type alias matches the variance of the value type (RHS type).
+
+```py
+from ty_extensions import static_assert, is_subtype_of
+from typing import Literal
+
+class Covariant[T]:
+    def get(self) -> T:
+        raise ValueError
+
+type CovariantLiteral1 = Covariant[Literal[1]]
+type CovariantInt = Covariant[int]
+type MyCovariant[T] = Covariant[T]
+
+static_assert(is_subtype_of(CovariantLiteral1, CovariantInt))
+static_assert(is_subtype_of(MyCovariant[Literal[1]], MyCovariant[int]))
+
+class Contravariant[T]:
+    def set(self, value: T):
+        pass
+
+type ContravariantLiteral1 = Contravariant[Literal[1]]
+type ContravariantInt = Contravariant[int]
+type MyContravariant[T] = Contravariant[T]
+
+static_assert(is_subtype_of(ContravariantInt, ContravariantLiteral1))
+static_assert(is_subtype_of(MyContravariant[int], MyContravariant[Literal[1]]))
+
+class Invariant[T]:
+    def get(self) -> T:
+        raise ValueError
+
+    def set(self, value: T):
+        pass
+
+type InvariantLiteral1 = Invariant[Literal[1]]
+type InvariantInt = Invariant[int]
+type MyInvariant[T] = Invariant[T]
+
+static_assert(not is_subtype_of(InvariantInt, InvariantLiteral1))
+static_assert(not is_subtype_of(InvariantLiteral1, InvariantInt))
+static_assert(not is_subtype_of(MyInvariant[Literal[1]], MyInvariant[int]))
+static_assert(not is_subtype_of(MyInvariant[int], MyInvariant[Literal[1]]))
+
+class Bivariant[T]:
+    pass
+
+type BivariantLiteral1 = Bivariant[Literal[1]]
+type BivariantInt = Bivariant[int]
+type MyBivariant[T] = Bivariant[T]
+
+static_assert(is_subtype_of(BivariantInt, BivariantLiteral1))
+static_assert(is_subtype_of(BivariantLiteral1, BivariantInt))
+static_assert(is_subtype_of(MyBivariant[Literal[1]], MyBivariant[int]))
+static_assert(is_subtype_of(MyBivariant[int], MyBivariant[Literal[1]]))
+```
+
 ## Inheriting from generic classes with inferred variance
 
 When inheriting from a generic class with our type variable substituted in, we count its occurrences
@@ -837,3 +934,4 @@ static_assert(is_subtype_of(DerivedContravariant[A], DerivedContravariant[B]))
 
 [linear-time-variance-talk]: https://www.youtube.com/watch?v=7uixlNTOY4s&t=9705s
 [spec]: https://typing.python.org/en/latest/spec/generics.html#variance
+[typeis-spec]: https://typing.python.org/en/latest/spec/narrowing.html#typeis
diff --git a/crates/ty_python_semantic/resources/mdtest/generics/scoping.md b/crates/ty_python_semantic/resources/mdtest/generics/scoping.md
index 02142d006b..308092f4d1 100644
--- a/crates/ty_python_semantic/resources/mdtest/generics/scoping.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/scoping.md
@@ -117,6 +117,7 @@ reveal_type(bound_method.__func__)  # revealed: def f(self, x: int) -> str
 reveal_type(C[int]().f(1))  # revealed: str
 reveal_type(bound_method(1))  # revealed: str
 
+# error: [invalid-argument-type] "Argument to function `f` is incorrect: Argument type `Literal[1]` does not satisfy upper bound `C[T@C]` of type variable `Self`"
 C[int].f(1)  # error: [missing-argument]
 reveal_type(C[int].f(C[int](), 1))  # revealed: str
 
@@ -154,7 +155,7 @@ from ty_extensions import generic_context
 legacy.m("string", None)  # error: [invalid-argument-type]
 reveal_type(legacy.m)  # revealed: bound method Legacy[int].m[S](x: int, y: S@m) -> S@m
 reveal_type(generic_context(Legacy))  # revealed: tuple[T@Legacy]
-reveal_type(generic_context(legacy.m))  # revealed: tuple[S@m]
+reveal_type(generic_context(legacy.m))  # revealed: tuple[Self@m, S@m]
 ```
 
 With PEP 695 syntax, it is clearer that the method uses a separate typevar:
@@ -259,27 +260,31 @@ class C[T]:
 
 ### Generic class within generic function
 
+<!-- snapshot-diagnostics -->
+
 ```py
 from typing import Iterable
 
 def f[T](x: T, y: T) -> None:
     class Ok[S]: ...
-    # TODO: error for reuse of typevar
+    # error: [invalid-generic-class]
     class Bad1[T]: ...
-    # TODO: error for reuse of typevar
+    # error: [invalid-generic-class]
     class Bad2(Iterable[T]): ...
 ```
 
 ### Generic class within generic class
 
+<!-- snapshot-diagnostics -->
+
 ```py
 from typing import Iterable
 
 class C[T]:
     class Ok1[S]: ...
-    # TODO: error for reuse of typevar
+    # error: [invalid-generic-class]
     class Bad1[T]: ...
-    # TODO: error for reuse of typevar
+    # error: [invalid-generic-class]
     class Bad2(Iterable[T]): ...
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/ide_support/all_members.md b/crates/ty_python_semantic/resources/mdtest/ide_support/all_members.md
index c7ec7a5fa6..03ea95b4a2 100644
--- a/crates/ty_python_semantic/resources/mdtest/ide_support/all_members.md
+++ b/crates/ty_python_semantic/resources/mdtest/ide_support/all_members.md
@@ -5,8 +5,6 @@ all members available on a given type. This routine is used for autocomplete sug
 
 ## Basic functionality
 
-<!-- snapshot-diagnostics -->
-
 The `ty_extensions.all_members` and `ty_extensions.has_member` functions expose a Python-level API
 that can be used to query which attributes `ide_support::all_members` understands as being available
 on a given object. For example, all member functions of `str` are available on `"a"`. The Python API
@@ -45,10 +43,10 @@ The full list of all members is relatively long, but `reveal_type` can be used i
 `all_members` to see them all:
 
 ```py
-from typing_extensions import reveal_type
 from ty_extensions import all_members
 
-reveal_type(all_members("a"))  # error: [revealed-type]
+# revealed: tuple[Literal["__add__"], Literal["__annotations__"], Literal["__class__"], Literal["__contains__"], Literal["__delattr__"], Literal["__dict__"], Literal["__dir__"], Literal["__doc__"], Literal["__eq__"], Literal["__format__"], Literal["__ge__"], Literal["__getattribute__"], Literal["__getitem__"], Literal["__getnewargs__"], Literal["__gt__"], Literal["__hash__"], Literal["__init__"], Literal["__init_subclass__"], Literal["__iter__"], Literal["__le__"], Literal["__len__"], Literal["__lt__"], Literal["__mod__"], Literal["__module__"], Literal["__mul__"], Literal["__ne__"], Literal["__new__"], Literal["__reduce__"], Literal["__reduce_ex__"], Literal["__repr__"], Literal["__reversed__"], Literal["__rmul__"], Literal["__setattr__"], Literal["__sizeof__"], Literal["__str__"], Literal["__subclasshook__"], Literal["capitalize"], Literal["casefold"], Literal["center"], Literal["count"], Literal["encode"], Literal["endswith"], Literal["expandtabs"], Literal["find"], Literal["format"], Literal["format_map"], Literal["index"], Literal["isalnum"], Literal["isalpha"], Literal["isascii"], Literal["isdecimal"], Literal["isdigit"], Literal["isidentifier"], Literal["islower"], Literal["isnumeric"], Literal["isprintable"], Literal["isspace"], Literal["istitle"], Literal["isupper"], Literal["join"], Literal["ljust"], Literal["lower"], Literal["lstrip"], Literal["maketrans"], Literal["partition"], Literal["removeprefix"], Literal["removesuffix"], Literal["replace"], Literal["rfind"], Literal["rindex"], Literal["rjust"], Literal["rpartition"], Literal["rsplit"], Literal["rstrip"], Literal["split"], Literal["splitlines"], Literal["startswith"], Literal["strip"], Literal["swapcase"], Literal["title"], Literal["translate"], Literal["upper"], Literal["zfill"]]
+reveal_type(all_members("a"))
 ```
 
 ## Kinds of types
@@ -238,6 +236,58 @@ def _(t_person: type[Person]):
     static_assert(has_member(t_person, "keys"))
 ```
 
+### NamedTuples
+
+```py
+from ty_extensions import has_member, static_assert
+from typing import NamedTuple, Generic, TypeVar
+
+class Person(NamedTuple):
+    id: int
+    name: str
+
+static_assert(has_member(Person, "id"))
+static_assert(has_member(Person, "name"))
+
+static_assert(has_member(Person, "_make"))
+static_assert(has_member(Person, "_asdict"))
+static_assert(has_member(Person, "_replace"))
+
+def _(person: Person):
+    static_assert(has_member(person, "id"))
+    static_assert(has_member(person, "name"))
+
+    static_assert(has_member(person, "_make"))
+    static_assert(has_member(person, "_asdict"))
+    static_assert(has_member(person, "_replace"))
+
+def _(t_person: type[Person]):
+    static_assert(has_member(t_person, "id"))
+    static_assert(has_member(t_person, "name"))
+
+    static_assert(has_member(t_person, "_make"))
+    static_assert(has_member(t_person, "_asdict"))
+    static_assert(has_member(t_person, "_replace"))
+
+T = TypeVar("T")
+
+class Box(NamedTuple, Generic[T]):
+    item: T
+
+static_assert(has_member(Box, "item"))
+
+static_assert(has_member(Box, "_make"))
+static_assert(has_member(Box, "_asdict"))
+static_assert(has_member(Box, "_replace"))
+
+def _(box: Box[int]):
+    static_assert(has_member(box, "item"))
+
+    static_assert(has_member(box, "_make"))
+    static_assert(has_member(box, "_asdict"))
+    static_assert(has_member(box, "_replace"))
+```
+
 ### Unions
 
 For unions, `ide_support::all_members` only returns members that are available on all elements of
diff --git a/crates/ty_python_semantic/resources/mdtest/implicit_type_aliases.md b/crates/ty_python_semantic/resources/mdtest/implicit_type_aliases.md
new file mode 100644
index 0000000000..404d308083
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/implicit_type_aliases.md
@@ -0,0 +1,45 @@
+# Implicit type aliases
+
+Implicit type aliases are the earliest form of type alias, introduced in PEP 484. They have no
+special marker, just an ordinary assignment statement.
+
+## Basic
+
+We support simple type aliases with no extra effort, when the "value type" of the RHS is still a
+valid type for use in a type expression:
+
+```py
+MyInt = int
+
+def f(x: MyInt):
+    reveal_type(x)  # revealed: int
+
+f(1)
+```
+
+## Recursive
+
+### Old union syntax
+
+```py
+from typing import Union
+
+Recursive = list[Union["Recursive", None]]
+
+def _(r: Recursive):
+    reveal_type(r)  # revealed: list[Divergent]
+```
+
+### New union syntax
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+Recursive = list["Recursive" | None]
+
+def _(r: Recursive):
+    reveal_type(r)  # revealed: list[Divergent]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/import/basic.md b/crates/ty_python_semantic/resources/mdtest/import/basic.md
index 45abcf5018..1220ddc770 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/basic.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/basic.md
@@ -192,6 +192,26 @@ from string.templatelib import Template  # error: [unresolved-import]
 from importlib.resources import abc  # error: [unresolved-import]
 ```
 
+## Attempting to import a stdlib submodule when both parts haven't yet been added
+
+`compression` and `compression.zstd` were both added in 3.14 so there is a typeshed `VERSIONS` entry
+for `compression` but not `compression.zstd`. We can't be confident `compression.zstd` exists but we
+do know `compression` does and can still give good diagnostics about it.
+
+<!-- snapshot-diagnostics -->
+
+```toml
+[environment]
+python-version = "3.10"
+```
+
+```py
+import compression.zstd  # error: [unresolved-import]
+from compression import zstd  # error: [unresolved-import]
+import compression.fakebutwhocansay  # error: [unresolved-import]
+from compression import fakebutwhocansay  # error: [unresolved-import]
+```
+
 ## Attempting to import a stdlib module that was previously removed
 
 <!-- snapshot-diagnostics -->
diff --git a/crates/ty_python_semantic/resources/mdtest/import/conditional.md b/crates/ty_python_semantic/resources/mdtest/import/conditional.md
index 703bf6078f..02ca3a5cef 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/conditional.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/conditional.md
@@ -22,11 +22,11 @@ reveal_type(y)
 ```
 
 ```py
-# error: [possibly-unbound-import] "Member `y` of module `maybe_unbound` is possibly unbound"
+# error: [possibly-missing-import] "Member `y` of module `maybe_unbound` may be missing"
 from maybe_unbound import x, y
 
-reveal_type(x)  # revealed: Unknown | Literal[3]
-reveal_type(y)  # revealed: Unknown | Literal[3]
+reveal_type(x)  # revealed: Literal[3]
+reveal_type(y)  # revealed: Literal[3]
 ```
 
 ## Maybe unbound annotated
@@ -53,10 +53,10 @@ reveal_type(y)
 Importing an annotated name prefers the declared type over the inferred type:
 
 ```py
-# error: [possibly-unbound-import] "Member `y` of module `maybe_unbound_annotated` is possibly unbound"
+# error: [possibly-missing-import] "Member `y` of module `maybe_unbound_annotated` may be missing"
 from maybe_unbound_annotated import x, y
 
-reveal_type(x)  # revealed: Unknown | Literal[3]
+reveal_type(x)  # revealed: Literal[3]
 reveal_type(y)  # revealed: int
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/import/conventions.md b/crates/ty_python_semantic/resources/mdtest/import/conventions.md
index c4950b5d1c..48d93515a8 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/conventions.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/conventions.md
@@ -306,7 +306,7 @@ The following scenarios are when a re-export happens conditionally in a stub fil
 ### Global import
 
 ```py
-# error: "Member `Foo` of module `a` is possibly unbound"
+# error: "Member `Foo` of module `a` may be missing"
 from a import Foo
 
 reveal_type(Foo)  # revealed: str
@@ -337,7 +337,7 @@ Here, both the branches of the condition are import statements where one of them
 the other does not.
 
 ```py
-# error: "Member `Foo` of module `a` is possibly unbound"
+# error: "Member `Foo` of module `a` may be missing"
 from a import Foo
 
 reveal_type(Foo)  # revealed: <class 'Foo'>
@@ -365,7 +365,7 @@ class Foo: ...
 ### Re-export in one branch
 
 ```py
-# error: "Member `Foo` of module `a` is possibly unbound"
+# error: "Member `Foo` of module `a` may be missing"
 from a import Foo
 
 reveal_type(Foo)  # revealed: <class 'Foo'>
diff --git a/crates/ty_python_semantic/resources/mdtest/import/dunder_all.md b/crates/ty_python_semantic/resources/mdtest/import/dunder_all.md
index d77973265b..2dc3bf4839 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/dunder_all.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/dunder_all.md
@@ -783,9 +783,8 @@ class A: ...
 ```py
 from subexporter import *
 
-# TODO: Should be `list[str]`
-# TODO: Should we avoid including `Unknown` for this case?
-reveal_type(__all__)  # revealed: Unknown | list[Unknown]
+# TODO: we could potentially infer `list[str] | tuple[str, ...]` here
+reveal_type(__all__)  # revealed: list[Unknown | str]
 
 __all__.append("B")
 
diff --git a/crates/ty_python_semantic/resources/mdtest/import/legacy_namespace.md b/crates/ty_python_semantic/resources/mdtest/import/legacy_namespace.md
new file mode 100644
index 0000000000..1c3b221c90
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/import/legacy_namespace.md
@@ -0,0 +1,221 @@
+# Legacy namespace packages
+
+## `__import__("pkgutil").extend_path`
+
+```toml
+[environment]
+extra-paths = ["/airflow-core/src", "/providers/amazon/src/"]
+```
+
+`/airflow-core/src/airflow/__init__.py`:
+
+```py
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__version__ = "3.2.0"
+```
+
+`/providers/amazon/src/airflow/__init__.py`:
+
+```py
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+```
+
+`/providers/amazon/src/airflow/providers/__init__.py`:
+
+```py
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+```
+
+`/providers/amazon/src/airflow/providers/amazon/__init__.py`:
+
+```py
+__version__ = "9.15.0"
+```
+
+`test.py`:
+
+```py
+from airflow import __version__ as airflow_version
+from airflow.providers.amazon import __version__ as amazon_provider_version
+
+reveal_type(airflow_version)  # revealed: Literal["3.2.0"]
+reveal_type(amazon_provider_version)  # revealed: Literal["9.15.0"]
+```
+
+## `pkgutil.extend_path`
+
+```toml
+[environment]
+extra-paths = ["/airflow-core/src", "/providers/amazon/src/"]
+```
+
+`/airflow-core/src/airflow/__init__.py`:
+
+```py
+import pkgutil
+
+__path__ = pkgutil.extend_path(__path__, __name__)
+__version__ = "3.2.0"
+```
+
+`/providers/amazon/src/airflow/__init__.py`:
+
+```py
+import pkgutil
+
+__path__ = pkgutil.extend_path(__path__, __name__)
+```
+
+`/providers/amazon/src/airflow/providers/__init__.py`:
+
+```py
+import pkgutil
+
+__path__ = pkgutil.extend_path(__path__, __name__)
+```
+
+`/providers/amazon/src/airflow/providers/amazon/__init__.py`:
+
+```py
+__version__ = "9.15.0"
+```
+
+`test.py`:
+
+```py
+from airflow import __version__ as airflow_version
+from airflow.providers.amazon import __version__ as amazon_provider_version
+
+reveal_type(airflow_version)  # revealed: Literal["3.2.0"]
+reveal_type(amazon_provider_version)  # revealed: Literal["9.15.0"]
+```
+
+## `extend_path` with keyword arguments
+
+```toml
+[environment]
+extra-paths = ["/airflow-core/src", "/providers/amazon/src/"]
+```
+
+`/airflow-core/src/airflow/__init__.py`:
+
+```py
+import pkgutil
+
+__path__ = pkgutil.extend_path(name=__name__, path=__path__)
+__version__ = "3.2.0"
+```
+
+`/providers/amazon/src/airflow/__init__.py`:
+
+```py
+import pkgutil
+
+__path__ = pkgutil.extend_path(name=__name__, path=__path__)
+```
+
+`/providers/amazon/src/airflow/providers/__init__.py`:
+
+```py
+import pkgutil
+
+__path__ = pkgutil.extend_path(name=__name__, path=__path__)
+```
+
+`/providers/amazon/src/airflow/providers/amazon/__init__.py`:
+
+```py
+__version__ = "9.15.0"
+```
+
+`test.py`:
+
+```py
+from airflow import __version__ as airflow_version
+from airflow.providers.amazon import __version__ as amazon_provider_version
+
+reveal_type(airflow_version)  # revealed: Literal["3.2.0"]
+reveal_type(amazon_provider_version)  # revealed: Literal["9.15.0"]
+```
+
+## incorrect `__import__` arguments
+
+```toml
+[environment]
+extra-paths = ["/airflow-core/src", "/providers/amazon/src/"]
+```
+
+`/airflow-core/src/airflow/__init__.py`:
+
+```py
+__path__ = __import__("not_pkgutil").extend_path(__path__, __name__)
+__version__ = "3.2.0"
+```
+
+`/providers/amazon/src/airflow/__init__.py`:
+
+```py
+__path__ = __import__("not_pkgutil").extend_path(__path__, __name__)
+```
+
+`/providers/amazon/src/airflow/providers/__init__.py`:
+
+```py
+__path__ = __import__("not_pkgutil").extend_path(__path__, __name__)
+```
+
+`/providers/amazon/src/airflow/providers/amazon/__init__.py`:
+
+```py
+__version__ = "9.15.0"
+```
+
+`test.py`:
+
+```py
+from airflow.providers.amazon import __version__ as amazon_provider_version  # error: [unresolved-import]
+from airflow import __version__ as airflow_version
+
+reveal_type(airflow_version)  # revealed: Literal["3.2.0"]
+```
+
+## incorrect `extend_path` arguments
+
+```toml
+[environment]
+extra-paths = ["/airflow-core/src", "/providers/amazon/src/"]
+```
+
+`/airflow-core/src/airflow/__init__.py`:
+
+```py
+__path__ = __import__("pkgutil").extend_path(__path__, "other_module")
+__version__ = "3.2.0"
+```
+
+`/providers/amazon/src/airflow/__init__.py`:
+
+```py
+__path__ = __import__("pkgutil").extend_path(__path__, "other_module")
+```
+
+`/providers/amazon/src/airflow/providers/__init__.py`:
+
+```py
+__path__ = __import__("pkgutil").extend_path(__path__, "other_module")
+```
+
+`/providers/amazon/src/airflow/providers/amazon/__init__.py`:
+
+```py
+__version__ = "9.15.0"
+```
+
+`test.py`:
+
+```py
+from airflow.providers.amazon import __version__ as amazon_provider_version  # error: [unresolved-import]
+from airflow import __version__ as airflow_version
+
+reveal_type(airflow_version)  # revealed: Literal["3.2.0"]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/import/module_getattr.md b/crates/ty_python_semantic/resources/mdtest/import/module_getattr.md
index 8e947ab655..4c493f4b74 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/module_getattr.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/module_getattr.md
@@ -40,7 +40,7 @@ def __getattr__(name: str) -> int:
 import mixed_module
 
 # Explicit attribute should take precedence
-reveal_type(mixed_module.explicit_attr)  # revealed: Unknown | Literal["explicit"]
+reveal_type(mixed_module.explicit_attr)  # revealed: Literal["explicit"]
 
 # `__getattr__` should handle unknown attributes
 reveal_type(mixed_module.dynamic_attr)  # revealed: str
diff --git a/crates/ty_python_semantic/resources/mdtest/import/namespace.md b/crates/ty_python_semantic/resources/mdtest/import/namespace.md
index 3b5f63e981..8949d26512 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/namespace.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/namespace.md
@@ -103,7 +103,7 @@ x = "namespace"
 ```py
 from foo import x
 
-reveal_type(x)  # revealed: Unknown | Literal["module"]
+reveal_type(x)  # revealed: Literal["module"]
 
 import foo.bar  # error: [unresolved-import]
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/import/partial_stub_packages.md b/crates/ty_python_semantic/resources/mdtest/import/partial_stub_packages.md
index b84faf4c85..a609c998b3 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/partial_stub_packages.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/partial_stub_packages.md
@@ -426,7 +426,8 @@ reveal_type(Fake().fake)  # revealed: Unknown
 
 ## Namespace stub with missing module
 
-Namespace stubs are always partial.
+Namespace stubs are always partial, as specified in:
+<https://peps.python.org/pep-0561/#partial-stub-packages>
 
 This is a regression test for <https://github.com/astral-sh/ty/issues/520>.
 
diff --git a/crates/ty_python_semantic/resources/mdtest/import/relative.md b/crates/ty_python_semantic/resources/mdtest/import/relative.md
index 9c3e303a9d..a80735e460 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/relative.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/relative.md
@@ -36,6 +36,38 @@ from .foo import X
 reveal_type(X)  # revealed: int
 ```
 
+## Simple With Stub and Implementation
+
+This is a regression test for an issue with relative imports in implementation files when a stub is
+also defined.
+
+`package/__init__.py`:
+
+```py
+```
+
+`package/foo.py`:
+
+```py
+X: int = 42
+```
+
+`package/bar.py`:
+
+```py
+from .foo import X
+
+reveal_type(X)  # revealed: int
+```
+
+`package/bar.pyi`:
+
+```pyi
+from .foo import X
+
+reveal_type(X)  # revealed: int
+```
+
 ## Dotted
 
 `package/__init__.py`:
@@ -215,7 +247,7 @@ X: int = 42
 from . import foo
 import package
 
-# error: [unresolved-attribute] "Type `<module 'package'>` has no attribute `foo`"
+# error: [unresolved-attribute] "Module `package` has no member `foo`"
 reveal_type(package.foo.X)  # revealed: Unknown
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/import/star.md b/crates/ty_python_semantic/resources/mdtest/import/star.md
index 3b4a2385b8..adef7f91d3 100644
--- a/crates/ty_python_semantic/resources/mdtest/import/star.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/star.md
@@ -144,8 +144,8 @@ X = (Y := 3) + 4
 ```py
 from exporter import *
 
-reveal_type(X)  # revealed: Unknown | Literal[7]
-reveal_type(Y)  # revealed: Unknown | Literal[3]
+reveal_type(X)  # revealed: Literal[7]
+reveal_type(Y)  # revealed: Literal[3]
 ```
 
 ### Global-scope symbols defined in many other ways
@@ -194,7 +194,7 @@ match get_object():
         ...
     case I(foo=R):
         ...
-    case P | Q:
+    case P | Q:  # error: [invalid-syntax] "alternative patterns bind different names"
         ...
 
 match 56:
@@ -292,7 +292,9 @@ match 42:
         ...
     case [D]:
         ...
-    case E | F:  # error: [invalid-syntax] "name capture `E` makes remaining patterns unreachable"
+    # error: [invalid-syntax] "name capture `E` makes remaining patterns unreachable"
+    # error: [invalid-syntax] "alternative patterns bind different names"
+    case E | F:
         ...
     case object(foo=G):
         ...
@@ -360,7 +362,9 @@ match 42:
         ...
     case [D]:
         ...
-    case E | F:  # error: [invalid-syntax] "name capture `E` makes remaining patterns unreachable"
+    # error: [invalid-syntax] "name capture `E` makes remaining patterns unreachable"
+    # error: [invalid-syntax] "alternative patterns bind different names"
+    case E | F:
         ...
     case object(foo=G):
         ...
@@ -781,9 +785,9 @@ else:
 from exporter import *
 
 # error: [possibly-unresolved-reference]
-reveal_type(A)  # revealed: Unknown | Literal[1]
+reveal_type(A)  # revealed: Literal[1]
 
-reveal_type(B)  # revealed: Unknown | Literal[2, 3]
+reveal_type(B)  # revealed: Literal[2, 3]
 ```
 
 ### Reachability constraints in the importing module
@@ -804,7 +808,7 @@ if coinflip():
     from exporter import *
 
 # error: [possibly-unresolved-reference]
-reveal_type(A)  # revealed: Unknown | Literal[1]
+reveal_type(A)  # revealed: Literal[1]
 ```
 
 ### Reachability constraints in the exporting module *and* the importing module
@@ -1399,7 +1403,7 @@ X: bool = True
 
 ```py
 def f():
-    # TODO: we should emit a syntax error here (tracked by https://github.com/astral-sh/ruff/issues/17412)
+    # error: [invalid-syntax]
     from exporter import *
 
     # error: [unresolved-reference]
diff --git a/crates/ty_python_semantic/resources/mdtest/instance_layout_conflict.md b/crates/ty_python_semantic/resources/mdtest/instance_layout_conflict.md
index 45f5c5d53c..bb8e013083 100644
--- a/crates/ty_python_semantic/resources/mdtest/instance_layout_conflict.md
+++ b/crates/ty_python_semantic/resources/mdtest/instance_layout_conflict.md
@@ -64,6 +64,30 @@ class AB(  # error: [instance-layout-conflict]
 ): ...
 ```
 
+## Synthesized `__slots__` from dataclasses
+
+```py
+from dataclasses import dataclass
+
+@dataclass(slots=True)
+class F: ...
+
+@dataclass(slots=True)
+class G: ...
+
+class H(F, G): ...  # fine because both classes have empty `__slots__`
+
+@dataclass(slots=True)
+class I:
+    x: int
+
+@dataclass(slots=True)
+class J:
+    y: int
+
+class K(I, J): ...  # error: [instance-layout-conflict]
+```
+
 ## Invalid `__slots__` definitions
 
 TODO: Emit diagnostics
@@ -103,7 +127,7 @@ class E(  # error: [instance-layout-conflict]
 ): ...
 ```
 
-## A single "solid base"
+## A single "disjoint base"
 
 ```py
 class A:
@@ -152,14 +176,15 @@ class Baz(Foo, Bar): ...  # fine
 <!-- snapshot-diagnostics -->
 
 Certain classes implemented in C extensions also have an extended instance memory layout, in the
-same way as classes that define non-empty `__slots__`. (CPython internally calls all such classes
-with a unique instance memory layout "solid bases", and we also borrow this term.) There is
-currently no generalized way for ty to detect such a C-extension class, as there is currently no way
-of expressing the fact that a class is a solid base in a stub file. However, ty special-cases
-certain builtin classes in order to detect that attempting to combine them in a single MRO would
-fail:
+same way as classes that define non-empty `__slots__`. CPython internally calls all such classes
+with a unique instance memory layout "solid bases", but [PEP 800](https://peps.python.org/pep-0800/)
+calls these classes "disjoint bases", and this is the term we generally use. The `@disjoint_base`
+decorator introduced by this PEP provides a generalised way for type checkers to identify such
+classes.
 
 ```py
+from typing_extensions import disjoint_base
+
 # fmt: off
 
 class A(  # error: [instance-layout-conflict]
@@ -183,6 +208,17 @@ class E(  # error: [instance-layout-conflict]
 
 class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
 
+@disjoint_base
+class G: ...
+
+@disjoint_base
+class H: ...
+
+class I(  # error: [instance-layout-conflict]
+    G,
+    H
+): ...
+
 # fmt: on
 ```
 
@@ -193,9 +229,9 @@ We avoid emitting an `instance-layout-conflict` diagnostic for this class defini
 class Foo(range, str): ...  # error: [subclass-of-final-class]
 ```
 
-## Multiple "solid bases" where one is a subclass of the other
+## Multiple "disjoint bases" where one is a subclass of the other
 
-A class is permitted to multiple-inherit from multiple solid bases if one is a subclass of the
+A class is permitted to multiple-inherit from multiple disjoint bases if one is a subclass of the
 other:
 
 ```py
diff --git a/crates/ty_python_semantic/resources/mdtest/literal/collections/dictionary.md b/crates/ty_python_semantic/resources/mdtest/literal/collections/dictionary.md
index 37abd2b98b..7e1acf4efb 100644
--- a/crates/ty_python_semantic/resources/mdtest/literal/collections/dictionary.md
+++ b/crates/ty_python_semantic/resources/mdtest/literal/collections/dictionary.md
@@ -5,3 +5,52 @@
 ```py
 reveal_type({})  # revealed: dict[Unknown, Unknown]
 ```
+
+## Basic dict
+
+```py
+reveal_type({1: 1, 2: 1})  # revealed: dict[Unknown | int, Unknown | int]
+```
+
+## Dict of tuples
+
+```py
+reveal_type({1: (1, 2), 2: (3, 4)})  # revealed: dict[Unknown | int, Unknown | tuple[int, int]]
+```
+
+## Unpacked dict
+
+```py
+a = {"a": 1, "b": 2}
+b = {"c": 3, "d": 4}
+
+d = {**a, **b}
+reveal_type(d)  # revealed: dict[Unknown | str, Unknown | int]
+```
+
+## Dict of functions
+
+```py
+def a(_: int) -> int:
+    return 0
+
+def b(_: int) -> int:
+    return 1
+
+x = {1: a, 2: b}
+reveal_type(x)  # revealed: dict[Unknown | int, Unknown | ((_: int) -> int)]
+```
+
+## Mixed dict
+
+```py
+# revealed: dict[Unknown | str, Unknown | int | tuple[int, int] | tuple[int, int, int]]
+reveal_type({"a": 1, "b": (1, 2), "c": (1, 2, 3)})
+```
+
+## Dict comprehensions
+
+```py
+# revealed: dict[@Todo(dict comprehension key type), @Todo(dict comprehension value type)]
+reveal_type({x: y for x, y in enumerate(range(42))})
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/literal/collections/generator_expressions.md b/crates/ty_python_semantic/resources/mdtest/literal/collections/generator_expressions.md
new file mode 100644
index 0000000000..1e266d92a8
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/literal/collections/generator_expressions.md
@@ -0,0 +1,6 @@
+# Generator expressions
+
+```py
+# revealed: GeneratorType[@Todo(generator expression yield type), @Todo(generator expression send type), @Todo(generator expression return type)]
+reveal_type((x for x in range(42)))
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/literal/collections/list.md b/crates/ty_python_semantic/resources/mdtest/literal/collections/list.md
index 53915f27c2..15f385fa88 100644
--- a/crates/ty_python_semantic/resources/mdtest/literal/collections/list.md
+++ b/crates/ty_python_semantic/resources/mdtest/literal/collections/list.md
@@ -5,3 +5,41 @@
 ```py
 reveal_type([])  # revealed: list[Unknown]
 ```
+
+## List of tuples
+
+```py
+reveal_type([(1, 2), (3, 4)])  # revealed: list[Unknown | tuple[int, int]]
+```
+
+## List of functions
+
+```py
+def a(_: int) -> int:
+    return 0
+
+def b(_: int) -> int:
+    return 1
+
+x = [a, b]
+reveal_type(x)  # revealed: list[Unknown | ((_: int) -> int)]
+```
+
+The inferred `Callable` type is function-like, i.e. we can still access attributes like `__name__`:
+
+```py
+reveal_type(x[0].__name__)  # revealed: Unknown | str
+```
+
+## Mixed list
+
+```py
+# revealed: list[Unknown | int | tuple[int, int] | tuple[int, int, int]]
+reveal_type([1, (1, 2), (1, 2, 3)])
+```
+
+## List comprehensions
+
+```py
+reveal_type([x for x in range(42)])  # revealed: list[@Todo(list comprehension element type)]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/literal/collections/set.md b/crates/ty_python_semantic/resources/mdtest/literal/collections/set.md
index 85acd78e3e..6c6855e40e 100644
--- a/crates/ty_python_semantic/resources/mdtest/literal/collections/set.md
+++ b/crates/ty_python_semantic/resources/mdtest/literal/collections/set.md
@@ -3,5 +3,37 @@
 ## Basic set
 
 ```py
-reveal_type({1, 2})  # revealed: set[Unknown]
+reveal_type({1, 2})  # revealed: set[Unknown | int]
+```
+
+## Set of tuples
+
+```py
+reveal_type({(1, 2), (3, 4)})  # revealed: set[Unknown | tuple[int, int]]
+```
+
+## Set of functions
+
+```py
+def a(_: int) -> int:
+    return 0
+
+def b(_: int) -> int:
+    return 1
+
+x = {a, b}
+reveal_type(x)  # revealed: set[Unknown | ((_: int) -> int)]
+```
+
+## Mixed set
+
+```py
+# revealed: set[Unknown | int | tuple[int, int] | tuple[int, int, int]]
+reveal_type({1, (1, 2), (1, 2, 3)})
+```
+
+## Set comprehensions
+
+```py
+reveal_type({x for x in range(42)})  # revealed: set[@Todo(set comprehension element type)]
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/loops/async_for.md b/crates/ty_python_semantic/resources/mdtest/loops/async_for.md
index 25eee5c071..29fba1ce77 100644
--- a/crates/ty_python_semantic/resources/mdtest/loops/async_for.md
+++ b/crates/ty_python_semantic/resources/mdtest/loops/async_for.md
@@ -42,8 +42,6 @@ async def foo():
 ### No `__aiter__` method
 
 ```py
-from typing_extensions import reveal_type
-
 class NotAsyncIterable: ...
 
 async def foo():
@@ -55,8 +53,6 @@ async def foo():
 ### Synchronously iterable, but not asynchronously iterable
 
 ```py
-from typing_extensions import reveal_type
-
 async def foo():
     class Iterator:
         def __next__(self) -> int:
@@ -74,8 +70,6 @@ async def foo():
 ### No `__anext__` method
 
 ```py
-from typing_extensions import reveal_type
-
 class NoAnext: ...
 
 class AsyncIterable:
@@ -88,11 +82,9 @@ async def foo():
         reveal_type(x)  # revealed: Unknown
 ```
 
-### Possibly unbound `__anext__` method
+### Possibly missing `__anext__` method
 
 ```py
-from typing_extensions import reveal_type
-
 async def foo(flag: bool):
     class PossiblyUnboundAnext:
         if flag:
@@ -108,11 +100,9 @@ async def foo(flag: bool):
         reveal_type(x)  # revealed: int
 ```
 
-### Possibly unbound `__aiter__` method
+### Possibly missing `__aiter__` method
 
 ```py
-from typing_extensions import reveal_type
-
 async def foo(flag: bool):
     class AsyncIterable:
         async def __anext__(self) -> int:
@@ -131,8 +121,6 @@ async def foo(flag: bool):
 ### Wrong signature for `__aiter__`
 
 ```py
-from typing_extensions import reveal_type
-
 class AsyncIterator:
     async def __anext__(self) -> int:
         return 42
@@ -150,8 +138,6 @@ async def foo():
 ### Wrong signature for `__anext__`
 
 ```py
-from typing_extensions import reveal_type
-
 class AsyncIterator:
     async def __anext__(self, arg: int) -> int:  # wrong
         return 42
diff --git a/crates/ty_python_semantic/resources/mdtest/loops/for.md b/crates/ty_python_semantic/resources/mdtest/loops/for.md
index fbacb9b6bd..cbec5378fc 100644
--- a/crates/ty_python_semantic/resources/mdtest/loops/for.md
+++ b/crates/ty_python_semantic/resources/mdtest/loops/for.md
@@ -108,8 +108,6 @@ reveal_type(x)
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 def _(flag: bool):
     class NotIterable:
         if flag:
@@ -228,13 +226,63 @@ def _(flag: bool):
         reveal_type(x)  # revealed: Result1A | Result1B | Result2A | Result2B | Result3 | Result4
 ```
 
+## Union type as iterable where `Iterator[]` is used as the return type of `__iter__`
+
+This test differs from the above tests in that `Iterator` (an abstract type) is used as the return
+annotation of the `__iter__` methods, rather than a concrete type being used as the return
+annotation.
+
+```py
+from typing import Iterator, Literal
+
+class IntIterator:
+    def __iter__(self) -> Iterator[int]:
+        return iter(range(42))
+
+class StrIterator:
+    def __iter__(self) -> Iterator[str]:
+        return iter("foo")
+
+def f(x: IntIterator | StrIterator):
+    for a in x:
+        reveal_type(a)  # revealed: int | str
+```
+
+Most real-world iterable types use `Iterator` as the return annotation of their `__iter__` methods:
+
+```py
+def g(
+    a: tuple[int, ...] | tuple[str, ...],
+    b: list[str] | list[int],
+    c: Literal["foo", b"bar"],
+):
+    for x in a:
+        reveal_type(x)  # revealed: int | str
+    for y in b:
+        reveal_type(y)  # revealed: str | int
+```
+
+## Union type as iterable where some elements in the union have precise tuple specs
+
+If all elements in a union can be iterated over, we "union together" their "tuple specs" and are
+able to infer the iterable element precisely when iterating over the union, in the same way that we
+infer a precise type for the iterable element when iterating over a `Literal` string or bytes type:
+
+```py
+from typing import Literal
+
+def f(x: Literal["foo", b"bar"], y: Literal["foo"] | range):
+    for item in x:
+        reveal_type(item)  # revealed: Literal["f", "o", 98, 97, 114]
+    for item in y:
+        reveal_type(item)  # revealed: Literal["f", "o"] | int
+```
+
 ## Union type as iterable where one union element has no `__iter__` method
 
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class TestIter:
     def __next__(self) -> int:
         return 42
@@ -254,8 +302,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class TestIter:
     def __next__(self) -> int:
         return 42
@@ -332,8 +378,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Iterator:
     def __next__(self) -> int:
         return 42
@@ -352,8 +396,6 @@ for x in Iterable():
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Bad:
     def __iter__(self) -> int:
         return 42
@@ -363,7 +405,7 @@ for x in Bad():
     reveal_type(x)  # revealed: Unknown
 ```
 
-## `__iter__` returns an object with a possibly unbound `__next__` method
+## `__iter__` returns an object with a possibly missing `__next__` method
 
 ```py
 def _(flag: bool):
@@ -386,8 +428,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Iterator1:
     def __next__(self, extra_arg) -> int:
         return 42
@@ -412,13 +452,11 @@ for y in Iterable2():
     reveal_type(y)  # revealed: Unknown
 ```
 
-## Possibly unbound `__iter__` and bad `__getitem__` method
+## Possibly missing `__iter__` and bad `__getitem__` method
 
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 def _(flag: bool):
     class Iterator:
         def __next__(self) -> int:
@@ -438,12 +476,12 @@ def _(flag: bool):
         reveal_type(x)  # revealed: int | bytes
 ```
 
-## Possibly unbound `__iter__` and not-callable `__getitem__`
+## Possibly missing `__iter__` and not-callable `__getitem__`
 
 This snippet tests that we infer the element type correctly in the following edge case:
 
 - `__iter__` is a method with the correct parameter spec that returns a valid iterator; BUT
-- `__iter__` is possibly unbound; AND
+- `__iter__` is possibly missing; AND
 - `__getitem__` is set to a non-callable type
 
 It's important that we emit a diagnostic here, but it's also important that we still use the return
@@ -466,13 +504,11 @@ def _(flag: bool):
         reveal_type(x)  # revealed: int
 ```
 
-## Possibly unbound `__iter__` and possibly unbound `__getitem__`
+## Possibly missing `__iter__` and possibly missing `__getitem__`
 
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Iterator:
     def __next__(self) -> int:
         return 42
@@ -496,8 +532,6 @@ def _(flag1: bool, flag2: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Bad:
     __getitem__: None = None
 
@@ -511,8 +545,6 @@ for x in Bad():
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 def _(flag: bool):
     class CustomCallable:
         if flag:
@@ -547,8 +579,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Iterable:
     # invalid because it will implicitly be passed an `int`
     # by the interpreter
@@ -560,7 +590,7 @@ for x in Iterable():
     reveal_type(x)  # revealed: int
 ```
 
-## Possibly unbound `__iter__` but definitely bound `__getitem__`
+## Possibly missing `__iter__` but definitely bound `__getitem__`
 
 Here, we should not emit a diagnostic: if `__iter__` is unbound, we should fallback to
 `__getitem__`:
@@ -588,8 +618,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Iterator:
     def __next__(self) -> int:
         return 42
@@ -625,8 +653,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 def _(flag: bool):
     class Iterator1:
         if flag:
@@ -666,8 +692,6 @@ def _(flag: bool):
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 def _(flag: bool):
     class Iterable1:
         if flag:
@@ -694,13 +718,11 @@ def _(flag: bool):
         reveal_type(y)  # revealed: str | int
 ```
 
-## Possibly unbound `__iter__` and possibly invalid `__getitem__`
+## Possibly missing `__iter__` and possibly invalid `__getitem__`
 
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Iterator:
     def __next__(self) -> bytes:
         return b"foo"
@@ -755,6 +777,18 @@ def f(never: Never):
         reveal_type(x)  # revealed: Unknown
 ```
 
+## Iterating over literals
+
+```py
+from typing import Literal
+
+for char in "abcde":
+    reveal_type(char)  # revealed: Literal["a", "b", "c", "d", "e"]
+
+for char in b"abcde":
+    reveal_type(char)  # revealed: Literal[97, 98, 99, 100, 101]
+```
+
 ## A class literal is iterable if it inherits from `Any`
 
 A class literal can be iterated over if it has `Any` or `Unknown` in its MRO, since the
diff --git a/crates/ty_python_semantic/resources/mdtest/mro.md b/crates/ty_python_semantic/resources/mdtest/mro.md
index 7226e8ffa1..e27bc761dd 100644
--- a/crates/ty_python_semantic/resources/mdtest/mro.md
+++ b/crates/ty_python_semantic/resources/mdtest/mro.md
@@ -165,7 +165,9 @@ from does_not_exist import DoesNotExist  # error: [unresolved-import]
 reveal_type(DoesNotExist)  # revealed: Unknown
 
 if hasattr(DoesNotExist, "__mro__"):
-    reveal_type(DoesNotExist)  # revealed: Unknown & <Protocol with members '__mro__'>
+    # TODO: this should be `Unknown & <Protocol with members '__mro__'>` or similar
+    # (The second part of the intersection is incorrectly simplified to `object` due to https://github.com/astral-sh/ty/issues/986)
+    reveal_type(DoesNotExist)  # revealed: Unknown
 
     class Foo(DoesNotExist): ...  # no error!
     reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
@@ -239,8 +241,6 @@ find a union type in a class's bases, we infer the class's `__mro__` as being
 `[<class>, Unknown, object]`, the same as for MROs that cause errors at runtime.
 
 ```py
-from typing_extensions import reveal_type
-
 def returns_bool() -> bool:
     return True
 
@@ -389,8 +389,6 @@ class BadSub2(Bad2()): ...  # error: [invalid-base]
 <!-- snapshot-diagnostics -->
 
 ```py
-from typing_extensions import reveal_type
-
 class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
 
 reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
diff --git a/crates/ty_python_semantic/resources/mdtest/named_tuple.md b/crates/ty_python_semantic/resources/mdtest/named_tuple.md
index 29b17542a8..f8c8a330f2 100644
--- a/crates/ty_python_semantic/resources/mdtest/named_tuple.md
+++ b/crates/ty_python_semantic/resources/mdtest/named_tuple.md
@@ -78,10 +78,7 @@ reveal_type(Person.id)  # revealed: property
 reveal_type(Person.name)  # revealed: property
 reveal_type(Person.age)  # revealed: property
 
-# TODO... the error is correct, but this is not the friendliest error message
-# for assigning to a read-only property :-)
-#
-# error: [invalid-assignment] "Invalid assignment to data descriptor attribute `id` on type `Person` with custom `__set__` method"
+# error: [invalid-assignment] "Cannot assign to read-only property `id` on object of type `Person`"
 alice.id = 42
 # error: [invalid-assignment]
 bob.age = None
@@ -211,8 +208,7 @@ class SuperUser(User):
     def now_called_robert(self):
         self.name = "Robert"  # fine because overridden with a mutable attribute
 
-        # TODO: this should cause us to emit an error as we're assigning to a read-only property
-        # inherited from the `NamedTuple` superclass (requires https://github.com/astral-sh/ty/issues/159)
+        # error: 9 [invalid-assignment] "Cannot assign to read-only property `nickname` on object of type `Self@now_called_robert`"
         self.nickname = "Bob"
 
 james = SuperUser(0, "James", 42, "Jimmy")
@@ -221,10 +217,7 @@ james = SuperUser(0, "James", 42, "Jimmy")
 # on the subclass
 james.name = "Robert"
 
-# TODO: the error is correct (can't assign to the read-only property inherited from the superclass)
-# but the error message could be friendlier :-)
-#
-# error: [invalid-assignment] "Invalid assignment to data descriptor attribute `nickname` on type `SuperUser` with custom `__set__` method"
+# error: [invalid-assignment] "Cannot assign to read-only property `nickname` on object of type `SuperUser`"
 james.nickname = "Bob"
 ```
 
@@ -278,14 +271,30 @@ reveal_type(Person._make)  # revealed: bound method <class 'Person'>._make(itera
 reveal_type(Person._asdict)  # revealed: def _asdict(self) -> dict[str, Any]
 reveal_type(Person._replace)  # revealed: def _replace(self, **kwargs: Any) -> Self@_replace
 
-# TODO: should be `Person` once we support `Self`
+# TODO: should be `Person` once we support implicit type of `self`
 reveal_type(Person._make(("Alice", 42)))  # revealed: Unknown
 
 person = Person("Alice", 42)
 
 reveal_type(person._asdict())  # revealed: dict[str, Any]
-# TODO: should be `Person` once we support `Self`
-reveal_type(person._replace(name="Bob"))  # revealed: Unknown
+reveal_type(person._replace(name="Bob"))  # revealed: Person
+```
+
+When accessing them on child classes of generic `NamedTuple`s, the return type is specialized
+accordingly:
+
+```py
+from typing import NamedTuple, Generic, TypeVar
+
+T = TypeVar("T")
+
+class Box(NamedTuple, Generic[T]):
+    content: T
+
+class IntBox(Box[int]):
+    pass
+
+reveal_type(IntBox(1)._replace(content=42))  # revealed: IntBox
 ```
 
 ## `collections.namedtuple`
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/assignment.md b/crates/ty_python_semantic/resources/mdtest/narrow/assignment.md
index 65ff04b107..f692c59835 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/assignment.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/assignment.md
@@ -34,7 +34,7 @@ class _:
 [reveal_type(a.z) for _ in range(1)]  # revealed: Literal[0]
 
 def _():
-    reveal_type(a.x)  # revealed: Unknown | int | None
+    reveal_type(a.x)  # revealed: int | None
     reveal_type(a.y)  # revealed: Unknown | None
     reveal_type(a.z)  # revealed: Unknown | None
 
@@ -75,7 +75,7 @@ class _:
 
     if cond():
         a = A()
-    reveal_type(a.x)  # revealed: int | None | Unknown
+    reveal_type(a.x)  # revealed: int | None
     reveal_type(a.y)  # revealed: Unknown | None
     reveal_type(a.z)  # revealed: Unknown | None
 
@@ -135,9 +135,9 @@ a.b = B()
 reveal_type(a.b)  # revealed: B
 reveal_type(a.b.c1)  # revealed: C | None
 reveal_type(a.b.c2)  # revealed: C | None
-# error: [possibly-unbound-attribute]
+# error: [possibly-missing-attribute]
 reveal_type(a.b.c1.d)  # revealed: D | None
-# error: [possibly-unbound-attribute]
+# error: [possibly-missing-attribute]
 reveal_type(a.b.c2.d)  # revealed: D | None
 ```
 
@@ -206,8 +206,7 @@ dd: defaultdict[int, int] = defaultdict(int)
 dd[0] = 0
 cm: ChainMap[int, int] = ChainMap({1: 1}, {0: 0})
 cm[0] = 0
-# TODO: should be ChainMap[int, int]
-reveal_type(cm)  # revealed: ChainMap[Unknown, Unknown]
+reveal_type(cm)  # revealed: ChainMap[Unknown | int, Unknown | int]
 
 reveal_type(l[0])  # revealed: Literal[0]
 reveal_type(d[0])  # revealed: Literal[0]
@@ -295,11 +294,11 @@ class C:
     reveal_type(b.a.x[0])  # revealed: Literal[0]
 
 def _():
-    # error: [possibly-unbound-attribute]
-    reveal_type(b.a.x[0])  # revealed: Unknown | int | None
-    # error: [possibly-unbound-attribute]
-    reveal_type(b.a.x)  # revealed: Unknown | list[int | None]
-    reveal_type(b.a)  # revealed: Unknown | A | None
+    # error: [possibly-missing-attribute]
+    reveal_type(b.a.x[0])  # revealed: int | None
+    # error: [possibly-missing-attribute]
+    reveal_type(b.a.x)  # revealed: list[int | None]
+    reveal_type(b.a)  # revealed: A | None
 ```
 
 ## Invalid assignments are not used for narrowing
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/complex_target.md b/crates/ty_python_semantic/resources/mdtest/narrow/complex_target.md
index 5a61c9e8d2..479238d617 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/complex_target.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/complex_target.md
@@ -167,11 +167,11 @@ if c.x is not None:
 
 if c.x is not None:
     def _():
-        reveal_type(c.x)  # revealed: Unknown | int | None
+        reveal_type(c.x)  # revealed: int | None
 
 def _():
     if c.x is not None:
-        reveal_type(c.x)  # revealed: (Unknown & ~None) | int
+        reveal_type(c.x)  # revealed: int
 ```
 
 ## Subscript narrowing
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/in.md b/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/in.md
index 865eb48788..14e2f6eab4 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/in.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/in.md
@@ -92,3 +92,102 @@ if (x := f()) in (1,):
 else:
     reveal_type(x)  # revealed: Literal[2, 3]
 ```
+
+## Union with `Literal`, `None` and `int`
+
+```py
+from typing import Literal
+
+def test(x: Literal["a", "b", "c"] | None | int = None):
+    if x in ("a", "b"):
+        # int is included because custom __eq__ methods could make
+        # an int equal to "a" or "b", so we can't eliminate it
+        reveal_type(x)  # revealed: Literal["a", "b"] | int
+    else:
+        reveal_type(x)  # revealed: Literal["c"] | None | int
+```
+
+## Direct `not in` conditional
+
+```py
+from typing import Literal
+
+def test(x: Literal["a", "b", "c"] | None | int = None):
+    if x not in ("a", "c"):
+        # int is included because custom __eq__ methods could make
+        # an int equal to "a" or "c", so we can't eliminate it
+        reveal_type(x)  # revealed: Literal["b"] | None | int
+    else:
+        reveal_type(x)  # revealed: Literal["a", "c"] | int
+```
+
+## bool
+
+```py
+def _(x: bool):
+    if x in (True,):
+        reveal_type(x)  # revealed: Literal[True]
+    else:
+        reveal_type(x)  # revealed: Literal[False]
+
+def _(x: bool | str):
+    if x in (False,):
+        # `str` remains due to possible custom __eq__ methods on a subclass
+        reveal_type(x)  # revealed: Literal[False] | str
+    else:
+        reveal_type(x)  # revealed: Literal[True] | str
+```
+
+## LiteralString
+
+```py
+from typing_extensions import LiteralString
+
+def _(x: LiteralString):
+    if x in ("a", "b", "c"):
+        reveal_type(x)  # revealed: Literal["a", "b", "c"]
+    else:
+        reveal_type(x)  # revealed: LiteralString & ~Literal["a"] & ~Literal["b"] & ~Literal["c"]
+
+def _(x: LiteralString | int):
+    if x in ("a", "b", "c"):
+        reveal_type(x)  # revealed: Literal["a", "b", "c"] | int
+    else:
+        reveal_type(x)  # revealed: (LiteralString & ~Literal["a"] & ~Literal["b"] & ~Literal["c"]) | int
+```
+
+## enums
+
+```py
+from enum import Enum
+
+class Color(Enum):
+    RED = "red"
+    GREEN = "green"
+    BLUE = "blue"
+
+def _(x: Color):
+    if x in (Color.RED, Color.GREEN):
+        reveal_type(x)  # revealed: Literal[Color.RED, Color.GREEN]
+    else:
+        reveal_type(x)  # revealed: Literal[Color.BLUE]
+```
+
+## Union with enum and `int`
+
+```py
+from enum import Enum
+
+class Status(Enum):
+    PENDING = 1
+    APPROVED = 2
+    REJECTED = 3
+
+def test(x: Status | int):
+    if x in (Status.PENDING, Status.APPROVED):
+        # int is included because custom __eq__ methods could make
+        # an int equal to Status.PENDING or Status.APPROVED, so we can't eliminate it
+        reveal_type(x)  # revealed: Literal[Status.PENDING, Status.APPROVED] | int
+    else:
+        reveal_type(x)  # revealed: Literal[Status.REJECTED] | int
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/nested.md b/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/nested.md
index 4ab60f5e2c..2cb4585b3b 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/nested.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/conditionals/nested.md
@@ -86,7 +86,7 @@ class B:
     reveal_type(a.x)  # revealed: Literal["a"]
 
 def f():
-    reveal_type(a.x)  # revealed: Unknown | str | None
+    reveal_type(a.x)  # revealed: str | None
 
 [reveal_type(a.x) for _ in range(1)]  # revealed: Literal["a"]
 
@@ -96,7 +96,7 @@ class C:
     reveal_type(a.x)  # revealed: str | None
 
 def g():
-    reveal_type(a.x)  # revealed: Unknown | str | None
+    reveal_type(a.x)  # revealed: str | None
 
 [reveal_type(a.x) for _ in range(1)]  # revealed: str | None
 
@@ -109,7 +109,7 @@ class D:
     reveal_type(a.x)  # revealed: Literal["a"]
 
 def h():
-    reveal_type(a.x)  # revealed: Unknown | str | None
+    reveal_type(a.x)  # revealed: str | None
 
 # TODO: should be `str | None`
 [reveal_type(a.x) for _ in range(1)]  # revealed: Literal["a"]
@@ -161,7 +161,7 @@ class _:
     a.b = B()
 
     class _:
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         reveal_type(a.b.c1.d)  # revealed: D | None
         reveal_type(a.b.c1)  # revealed: C | None
 ```
@@ -190,7 +190,7 @@ def f(x: str | None):
             reveal_type(g)  # revealed: str
 
         if a.x is not None:
-            reveal_type(a.x)  # revealed: (Unknown & ~None) | str
+            reveal_type(a.x)  # revealed: str
 
         if l[0] is not None:
             reveal_type(l[0])  # revealed: str
@@ -206,7 +206,7 @@ def f(x: str | None):
             reveal_type(g)  # revealed: str
 
         if a.x is not None:
-            reveal_type(a.x)  # revealed: (Unknown & ~None) | str
+            reveal_type(a.x)  # revealed: str
 
         if l[0] is not None:
             reveal_type(l[0])  # revealed: str
@@ -248,6 +248,13 @@ def f(x: str | None):
                 reveal_type(x)  # revealed: str | None
     x = None
 
+def f(x: str | None):
+    def _(x: str | None):
+        if x is not None:
+            def closure():
+                reveal_type(x)  # revealed: str
+    x = None
+
 def f(x: str | None):
     class C:
         def _():
@@ -317,8 +324,7 @@ def f(l: list[str | None]):
     def _():
         l: list[str | None] = [None]
         def _():
-            # TODO: should be `str | None`
-            reveal_type(l[0])  # revealed: Unknown
+            reveal_type(l[0])  # revealed: str | None
 
     def _():
         def _():
@@ -376,12 +382,12 @@ def f():
     if a.x is not None:
         def _():
             # Lazy nested scope narrowing is not performed on attributes/subscripts because it's difficult to track their changes.
-            reveal_type(a.x)  # revealed: Unknown | str | None
+            reveal_type(a.x)  # revealed: str | None
 
         class D:
-            reveal_type(a.x)  # revealed: (Unknown & ~None) | str
+            reveal_type(a.x)  # revealed: str
 
-        [reveal_type(a.x) for _ in range(1)]  # revealed: (Unknown & ~None) | str
+        [reveal_type(a.x) for _ in range(1)]  # revealed: str
 
     if l[0] is not None:
         def _():
@@ -467,11 +473,11 @@ def f():
         if a.x is not None:
             def _():
                 if a.x != 1:
-                    reveal_type(a.x)  # revealed: (Unknown & ~Literal[1]) | str | None
+                    reveal_type(a.x)  # revealed: str | None
 
             class D:
                 if a.x != 1:
-                    reveal_type(a.x)  # revealed: (Unknown & ~Literal[1] & ~None) | str
+                    reveal_type(a.x)  # revealed: str
 
         if l[0] is not None:
             def _():
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/hasattr.md b/crates/ty_python_semantic/resources/mdtest/narrow/hasattr.md
index f6839562de..633dd83bd2 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/hasattr.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/hasattr.md
@@ -60,7 +60,7 @@ def _(obj: WithSpam):
 ```
 
 When a class may or may not have a `spam` attribute, `hasattr` narrowing can provide evidence that
-the attribute exists. Here, no `possibly-unbound-attribute` error is emitted in the `if` branch:
+the attribute exists. Here, no `possibly-missing-attribute` error is emitted in the `if` branch:
 
 ```py
 def returns_bool() -> bool:
@@ -71,7 +71,7 @@ class MaybeWithSpam:
         spam: int = 42
 
 def _(obj: MaybeWithSpam):
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     reveal_type(obj.spam)  # revealed: int
 
     if hasattr(obj, "spam"):
@@ -81,6 +81,20 @@ def _(obj: MaybeWithSpam):
         reveal_type(obj)  # revealed: MaybeWithSpam & ~<Protocol with members 'spam'>
 
         # TODO: Ideally, we would emit `[unresolved-attribute]` and reveal `Unknown` here:
-        # error: [possibly-unbound-attribute]
+        # error: [possibly-missing-attribute]
         reveal_type(obj.spam)  # revealed: int
 ```
+
+All attribute available on `object` are still available on these synthesized protocols, but
+attributes that are not present on `object` are not available:
+
+```py
+def f(x: object):
+    if hasattr(x, "__qualname__"):
+        reveal_type(x.__repr__)  # revealed: bound method object.__repr__() -> str
+        reveal_type(x.__str__)  # revealed: bound method object.__str__() -> str
+        reveal_type(x.__dict__)  # revealed: dict[str, Any]
+
+        # error: [unresolved-attribute] "Object of type `<Protocol with members '__qualname__'>` has no attribute `foo`"
+        reveal_type(x.foo)  # revealed: Unknown
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/isinstance.md b/crates/ty_python_semantic/resources/mdtest/narrow/isinstance.md
index 17fde60063..60ec2fa844 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/isinstance.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/isinstance.md
@@ -308,3 +308,90 @@ def i[T: Intersection[type[Bar], type[Baz | Spam]], U: (type[Eggs], type[Ham])](
 
     return (y, z)
 ```
+
+## Narrowing with generics
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+Narrowing to a generic class using `isinstance()` uses the top materialization of the generic. With
+a covariant generic, this is equivalent to using the upper bound of the type parameter (by default,
+`object`):
+
+```py
+from typing import Self
+
+class Covariant[T]:
+    def get(self) -> T:
+        raise NotImplementedError
+
+def _(x: object):
+    if isinstance(x, Covariant):
+        reveal_type(x)  # revealed: Covariant[object]
+        reveal_type(x.get())  # revealed: object
+```
+
+Similarly, contravariant type parameters use their lower bound of `Never`:
+
+```py
+class Contravariant[T]:
+    def push(self, x: T) -> None: ...
+
+def _(x: object):
+    if isinstance(x, Contravariant):
+        reveal_type(x)  # revealed: Contravariant[Never]
+        # error: [invalid-argument-type] "Argument to bound method `push` is incorrect: Expected `Never`, found `Literal[42]`"
+        x.push(42)
+```
+
+Invariant generics are trickiest. The top materialization, conceptually the type that includes all
+instances of the generic class regardless of the type parameter, cannot be represented directly in
+the type system, so we represent it with the internal `Top[]` special form.
+
+```py
+class Invariant[T]:
+    def push(self, x: T) -> None: ...
+    def get(self) -> T:
+        raise NotImplementedError
+
+def _(x: object):
+    if isinstance(x, Invariant):
+        reveal_type(x)  # revealed: Top[Invariant[Unknown]]
+        reveal_type(x.get())  # revealed: object
+        # error: [invalid-argument-type] "Argument to bound method `push` is incorrect: Expected `Never`, found `Literal[42]`"
+        x.push(42)
+```
+
+When more complex types are involved, the `Top[]` type may get simplified away.
+
+```py
+def _(x: list[int] | set[str]):
+    if isinstance(x, list):
+        reveal_type(x)  # revealed: list[int]
+    else:
+        reveal_type(x)  # revealed: set[str]
+```
+
+Though if the types involved are not disjoint bases, we necessarily keep a more complex type.
+
+```py
+def _(x: Invariant[int] | Covariant[str]):
+    if isinstance(x, Invariant):
+        reveal_type(x)  # revealed: Invariant[int] | (Covariant[str] & Top[Invariant[Unknown]])
+    else:
+        reveal_type(x)  # revealed: Covariant[str] & ~Top[Invariant[Unknown]]
+```
+
+The behavior of `issubclass()` is similar.
+
+```py
+def _(x: type[object], y: type[object], z: type[object]):
+    if issubclass(x, Covariant):
+        reveal_type(x)  # revealed: type[Covariant[object]]
+    if issubclass(y, Contravariant):
+        reveal_type(y)  # revealed: type[Contravariant[Never]]
+    if issubclass(z, Invariant):
+        reveal_type(z)  # revealed: type[Top[Invariant[Unknown]]]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/match.md b/crates/ty_python_semantic/resources/mdtest/narrow/match.md
index b6b0ec90e8..55772eab24 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/match.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/match.md
@@ -71,98 +71,140 @@ reveal_type(x)  # revealed: object
 
 ## Value patterns
 
+Value patterns are evaluated by equality, which is overridable. Therefore successfully matching on
+one can only give us information where we know how the subject type implements equality.
+
+Consider the following example.
+
 ```py
-def get_object() -> object:
-    return object()
+from typing import Literal
 
-x = get_object()
+def _(x: Literal["foo"] | int):
+    match x:
+        case "foo":
+            reveal_type(x)  # revealed: Literal["foo"] | int
 
-reveal_type(x)  # revealed: object
+    match x:
+        case "bar":
+            reveal_type(x)  # revealed: int
+```
 
-match x:
-    case "foo":
-        reveal_type(x)  # revealed: Literal["foo"]
-    case 42:
-        reveal_type(x)  # revealed: Literal[42]
-    case 6.0:
-        reveal_type(x)  # revealed: float
-    case 1j:
-        reveal_type(x)  # revealed: complex
-    case b"foo":
-        reveal_type(x)  # revealed: Literal[b"foo"]
+In the first `match`'s `case "foo"` all we know is `x == "foo"`. `x` could be an instance of an
+arbitrary `int` subclass with an arbitrary `__eq__`, so we can't actually narrow to
+`Literal["foo"]`.
 
-reveal_type(x)  # revealed: object
+In the second `match`'s `case "bar"` we know `x == "bar"`. As discussed above, this isn't enough to
+rule out `int`, but we know that `"foo" == "bar"` is false so we can eliminate `Literal["foo"]`.
+
+More examples follow.
+
+```py
+from typing import Literal
+
+class C:
+    pass
+
+def _(x: Literal["foo", "bar", 42, b"foo"] | bool | complex):
+    match x:
+        case "foo":
+            reveal_type(x)  # revealed: Literal["foo"] | int | float | complex
+        case 42:
+            reveal_type(x)  # revealed: int | float | complex
+        case 6.0:
+            reveal_type(x)  # revealed: Literal["bar", b"foo"] | (int & ~Literal[42]) | float | complex
+        case 1j:
+            reveal_type(x)  # revealed: Literal["bar", b"foo"] | (int & ~Literal[42]) | float | complex
+        case b"foo":
+            reveal_type(x)  # revealed: (int & ~Literal[42]) | Literal[b"foo"] | float | complex
+        case _:
+            reveal_type(x)  # revealed: Literal["bar"] | (int & ~Literal[42]) | float | complex
 ```
 
 ## Value patterns with guard
 
 ```py
-def get_object() -> object:
-    return object()
+from typing import Literal
 
-x = get_object()
+class C:
+    pass
 
-reveal_type(x)  # revealed: object
-
-match x:
-    case "foo" if reveal_type(x):  # revealed: Literal["foo"]
-        pass
-    case 42 if reveal_type(x):  # revealed: Literal[42]
-        pass
-    case 6.0 if reveal_type(x):  # revealed: float
-        pass
-    case 1j if reveal_type(x):  # revealed: complex
-        pass
-    case b"foo" if reveal_type(x):  # revealed: Literal[b"foo"]
-        pass
-
-reveal_type(x)  # revealed: object
+def _(x: Literal["foo", b"bar"] | int):
+    match x:
+        case "foo" if reveal_type(x):  # revealed: Literal["foo"] | int
+            pass
+        case b"bar" if reveal_type(x):  # revealed: Literal[b"bar"] | int
+            pass
+        case 42 if reveal_type(x):  # revealed: int
+            pass
 ```
 
 ## Or patterns
 
 ```py
-def get_object() -> object:
-    return object()
+from typing import Literal
+from enum import Enum
 
-x = get_object()
+class Color(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
 
-reveal_type(x)  # revealed: object
+def _(color: Color):
+    match color:
+        case Color.RED | Color.GREEN:
+            reveal_type(color)  # revealed: Literal[Color.RED, Color.GREEN]
+        case Color.BLUE:
+            reveal_type(color)  # revealed: Literal[Color.BLUE]
 
-match x:
-    case "foo" | 42 | None:
-        reveal_type(x)  # revealed: Literal["foo", 42] | None
-    case "foo" | tuple():
-        reveal_type(x)  # revealed: tuple[Unknown, ...]
-    case True | False:
-        reveal_type(x)  # revealed: bool
-    case 3.14 | 2.718 | 1.414:
-        reveal_type(x)  # revealed: float
+    match color:
+        case Color.RED | Color.GREEN | Color.BLUE:
+            reveal_type(color)  # revealed: Color
 
-reveal_type(x)  # revealed: object
+    match color:
+        case Color.RED:
+            reveal_type(color)  # revealed: Literal[Color.RED]
+        case _:
+            reveal_type(color)  # revealed: Literal[Color.GREEN, Color.BLUE]
+
+class A: ...
+class B: ...
+class C: ...
+
+def _(x: A | B | C):
+    match x:
+        case A() | B():
+            reveal_type(x)  # revealed: A | B
+        case C():
+            reveal_type(x)  # revealed: C & ~A & ~B
+        case _:
+            reveal_type(x)  # revealed: Never
+
+    match x:
+        case A() | B() | C():
+            reveal_type(x)  # revealed: A | B | C
+        case _:
+            reveal_type(x)  # revealed: Never
+
+    match x:
+        case A():
+            reveal_type(x)  # revealed: A
+        case _:
+            reveal_type(x)  # revealed: (B & ~A) | (C & ~A)
 ```
 
 ## Or patterns with guard
 
 ```py
-def get_object() -> object:
-    return object()
+from typing import Literal
 
-x = get_object()
-
-reveal_type(x)  # revealed: object
-
-match x:
-    case "foo" | 42 | None if reveal_type(x):  # revealed: Literal["foo", 42] | None
-        pass
-    case "foo" | tuple() if reveal_type(x):  # revealed: Literal["foo"] | tuple[Unknown, ...]
-        pass
-    case True | False if reveal_type(x):  # revealed: bool
-        pass
-    case 3.14 | 2.718 | 1.414 if reveal_type(x):  # revealed: float
-        pass
-
-reveal_type(x)  # revealed: object
+def _(x: Literal["foo", b"bar"] | int):
+    match x:
+        case "foo" | 42 if reveal_type(x):  # revealed: Literal["foo"] | int
+            pass
+        case b"bar" if reveal_type(x):  # revealed: Literal[b"bar"] | int
+            pass
+        case _ if reveal_type(x):  # revealed: Literal["foo", b"bar"] | int
+            pass
 ```
 
 ## Narrowing due to guard
@@ -179,7 +221,7 @@ match x:
     case str() | float() if type(x) is str:
         reveal_type(x)  #  revealed: str
     case "foo" | 42 | None if isinstance(x, int):
-        reveal_type(x)  #  revealed: Literal[42]
+        reveal_type(x)  #  revealed: int
     case False if x:
         reveal_type(x)  #  revealed: Never
     case "foo" if x := "bar":
@@ -201,7 +243,7 @@ reveal_type(x)  # revealed: object
 match x:
     case str() | float() if type(x) is str and reveal_type(x):  # revealed: str
         pass
-    case "foo" | 42 | None if isinstance(x, int) and reveal_type(x):  #  revealed: Literal[42]
+    case "foo" | 42 | None if isinstance(x, int) and reveal_type(x):  #  revealed: int
         pass
     case False if x and reveal_type(x):  #  revealed: Never
         pass
diff --git a/crates/ty_python_semantic/resources/mdtest/narrow/type_guards.md b/crates/ty_python_semantic/resources/mdtest/narrow/type_guards.md
index 5d9bcda7c0..0d94326c89 100644
--- a/crates/ty_python_semantic/resources/mdtest/narrow/type_guards.md
+++ b/crates/ty_python_semantic/resources/mdtest/narrow/type_guards.md
@@ -173,6 +173,11 @@ def _(d: Any):
 
 ## Narrowing
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
 from typing import Any
 from typing_extensions import TypeGuard, TypeIs
@@ -276,7 +281,7 @@ def _(x: Foo | Bar, flag: bool) -> None:
 The `TypeIs` type remains effective across generic boundaries:
 
 ```py
-from typing_extensions import TypeVar, reveal_type
+from typing_extensions import TypeVar
 
 T = TypeVar("T")
 
@@ -295,6 +300,38 @@ def _(a: Foo):
         reveal_type(a)  # revealed: Foo & Bar
 ```
 
+For generics, we transform the argument passed into `TypeIs[]` from `X` to `Top[X]`. This helps
+especially when using various functions from typeshed that are annotated as returning
+`TypeIs[SomeCovariantGeneric[Any]]` to avoid false positives in other type checkers. For ty's
+purposes, it would usually lead to more intuitive results if `object` was used as the specialization
+for a covariant generic inside the `TypeIs` special form, but this is mitigated by our implicit
+transformation from `TypeIs[SomeCovariantGeneric[Any]]` to `TypeIs[Top[SomeCovariantGeneric[Any]]]`
+(which just simplifies to `TypeIs[SomeCovariantGeneric[object]]`).
+
+```py
+class Unrelated: ...
+
+class Covariant[T]:
+    def get(self) -> T:
+        raise NotImplementedError
+
+def is_instance_of_covariant(arg: object) -> TypeIs[Covariant[Any]]:
+    return isinstance(arg, Covariant)
+
+def needs_instance_of_unrelated(arg: Unrelated):
+    pass
+
+def _(x: Unrelated | Covariant[int]):
+    if is_instance_of_covariant(x):
+        raise RuntimeError("oh no")
+
+    reveal_type(x)  # revealed: Unrelated & ~Covariant[object]
+
+    # We would emit a false-positive diagnostic here if we didn't implicitly transform
+    # `TypeIs[Covariant[Any]]` to `TypeIs[Covariant[object]]`
+    needs_instance_of_unrelated(x)
+```
+
 ## `TypeGuard` special cases
 
 ```py
diff --git a/crates/ty_python_semantic/resources/mdtest/overloads.md b/crates/ty_python_semantic/resources/mdtest/overloads.md
index 08bd0c3021..794abac2fc 100644
--- a/crates/ty_python_semantic/resources/mdtest/overloads.md
+++ b/crates/ty_python_semantic/resources/mdtest/overloads.md
@@ -99,7 +99,7 @@ reveal_type(foo(b""))  # revealed: bytes
 ## Methods
 
 ```py
-from typing import overload
+from typing_extensions import Self, overload
 
 class Foo1:
     @overload
@@ -126,6 +126,18 @@ foo2 = Foo2()
 reveal_type(foo2.method)  # revealed: Overload[() -> None, (x: str) -> str]
 reveal_type(foo2.method())  # revealed: None
 reveal_type(foo2.method(""))  # revealed: str
+
+class Foo3:
+    @overload
+    def takes_self_or_int(self: Self, x: Self) -> Self: ...
+    @overload
+    def takes_self_or_int(self: Self, x: int) -> int: ...
+    def takes_self_or_int(self: Self, x: Self | int) -> Self | int:
+        return x
+
+foo3 = Foo3()
+reveal_type(foo3.takes_self_or_int(foo3))  # revealed: Foo3
+reveal_type(foo3.takes_self_or_int(1))  # revealed: int
 ```
 
 ## Constructor
@@ -347,14 +359,14 @@ from typing import overload
 @overload
 def func(x: int) -> int: ...
 @overload
-# error: [invalid-overload] "Overloaded non-stub function `func` must have an implementation"
+# error: [invalid-overload] "Overloads for function `func` must be followed by a non-`@overload`-decorated implementation function"
 def func(x: str) -> str: ...
 
 class Foo:
     @overload
     def method(self, x: int) -> int: ...
     @overload
-    # error: [invalid-overload] "Overloaded non-stub function `method` must have an implementation"
+    # error: [invalid-overload] "Overloads for function `method` must be followed by a non-`@overload`-decorated implementation function"
     def method(self, x: str) -> str: ...
 ```
 
@@ -436,6 +448,55 @@ class PartialFoo(ABC):
     def f(self, x: str) -> str: ...
 ```
 
+### `@overload`-decorated functions with non-stub bodies
+
+<!-- snapshot-diagnostics -->
+
+If an `@overload`-decorated function has a non-trivial body, it likely indicates a misunderstanding
+on the part of the user. We emit a warning-level diagnostic to alert them of this.
+
+`...`, `pass` and docstrings are all fine:
+
+```py
+from typing import overload
+
+@overload
+def x(y: int) -> int: ...
+@overload
+def x(y: str) -> str:
+    """Docstring"""
+
+@overload
+def x(y: bytes) -> bytes:
+    pass
+
+@overload
+def x(y: memoryview) -> memoryview:
+    """More docs"""
+    pass
+    ...
+
+def x(y):
+    return y
+```
+
+Anything else, however, will trigger the lint:
+
+```py
+@overload
+def foo(x: int) -> int:
+    return x  # error: [useless-overload-body]
+
+@overload
+def foo(x: str) -> None:
+    """Docstring"""
+    pass
+    print("oh no, a string")  # error: [useless-overload-body]
+
+def foo(x):
+    return x
+```
+
 ### Inconsistent decorators
 
 #### `@staticmethod`
diff --git a/crates/ty_python_semantic/resources/mdtest/pep613_type_aliases.md b/crates/ty_python_semantic/resources/mdtest/pep613_type_aliases.md
new file mode 100644
index 0000000000..de3851ddab
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/pep613_type_aliases.md
@@ -0,0 +1,17 @@
+# PEP 613 type aliases
+
+We do not support PEP 613 type aliases yet. For now, just make sure that we don't panic:
+
+```py
+from typing import TypeAlias
+
+RecursiveTuple: TypeAlias = tuple[int | "RecursiveTuple", str]
+
+def _(rec: RecursiveTuple):
+    reveal_type(rec)  # revealed: tuple[Divergent, str]
+
+RecursiveHomogeneousTuple: TypeAlias = tuple[int | "RecursiveHomogeneousTuple", ...]
+
+def _(rec: RecursiveHomogeneousTuple):
+    reveal_type(rec)  # revealed: tuple[Divergent, ...]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/pep695_type_aliases.md b/crates/ty_python_semantic/resources/mdtest/pep695_type_aliases.md
index 904f08099a..167fe4025d 100644
--- a/crates/ty_python_semantic/resources/mdtest/pep695_type_aliases.md
+++ b/crates/ty_python_semantic/resources/mdtest/pep695_type_aliases.md
@@ -75,6 +75,32 @@ def f(x: T):
     reveal_type(b)  # revealed: str
 ```
 
+## Scoping
+
+PEP 695 type aliases delay runtime evaluation of their right-hand side, so they are a lazy (not
+eager) nested scope.
+
+```py
+type Alias = Foo | str
+
+def f(x: Alias):
+    reveal_type(x)  # revealed: Foo | str
+
+class Foo:
+    pass
+```
+
+But narrowing of names used in the type alias is still respected:
+
+```py
+def _(flag: bool):
+    t = int if flag else None
+    if t is not None:
+        type Alias = t | str
+        def f(x: Alias):
+            reveal_type(x)  # revealed: int | str
+```
+
 ## Generic type aliases
 
 ```py
@@ -94,6 +120,35 @@ def f(x: IntOrStr, y: str | bytes):
     reveal_type(z)  # revealed: (int & ~AlwaysFalsy) | str | bytes
 ```
 
+## Multiple layers of union aliases
+
+```py
+class A: ...
+class B: ...
+class C: ...
+class D: ...
+
+type W = A | B
+type X = C | D
+type Y = W | X
+
+from ty_extensions import is_equivalent_to, static_assert
+
+static_assert(is_equivalent_to(Y, A | B | C | D))
+```
+
+## In binary ops
+
+```py
+from typing import Literal
+
+type X = tuple[Literal[1], Literal[2]]
+
+def _(x: X, y: tuple[Literal[1], Literal[3]]):
+    reveal_type(x == y)  # revealed: Literal[False]
+    reveal_type(x < y)  # revealed: Literal[True]
+```
+
 ## `TypeAliasType` properties
 
 Two `TypeAliasType`s are distinct and disjoint, even if they refer to the same type
@@ -142,10 +197,10 @@ from typing_extensions import TypeAliasType, TypeVar
 
 T = TypeVar("T")
 
-IntAnd = TypeAliasType("IntAndT", tuple[int, T], type_params=(T,))
+IntAndT = TypeAliasType("IntAndT", tuple[int, T], type_params=(T,))
 
-def f(x: IntAnd[str]) -> None:
-    reveal_type(x)  # revealed: @Todo(Generic PEP-695 type alias)
+def f(x: IntAndT[str]) -> None:
+    reveal_type(x)  # revealed: @Todo(Generic manual PEP-695 type alias)
 ```
 
 ### Error cases
@@ -178,13 +233,37 @@ def f(x: OptNestedInt) -> None:
 ### Invalid self-referential
 
 ```py
-# TODO emit a diagnostic here
+# TODO emit a diagnostic on these two lines
 type IntOr = int | IntOr
+type OrInt = OrInt | int
 
-def f(x: IntOr):
+def f(x: IntOr, y: OrInt):
     reveal_type(x)  # revealed: int
+    reveal_type(y)  # revealed: int
     if not isinstance(x, int):
         reveal_type(x)  # revealed: Never
+    if not isinstance(y, int):
+        reveal_type(y)  # revealed: Never
+```
+
+### With legacy generic
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+type Alias = list["Alias"] | int
+
+class A(Generic[T]):
+    attr: T
+
+class B(A[Alias]):
+    pass
+
+def f(b: B):
+    reveal_type(b)  # revealed: B
+    reveal_type(b.attr)  # revealed: list[Alias] | int
 ```
 
 ### Mutually recursive
@@ -208,3 +287,104 @@ from ty_extensions import Intersection
 def h(x: Intersection[A, B]):
     reveal_type(x)  # revealed: tuple[B] | None
 ```
+
+### Self-recursive callable type
+
+```py
+from typing import Callable
+
+type C = Callable[[], C | None]
+
+def _(x: C):
+    reveal_type(x)  # revealed: () -> C | None
+```
+
+### Subtyping of materializations of cyclic aliases
+
+```py
+from ty_extensions import static_assert, is_subtype_of, Bottom, Top
+
+type JsonValue = None | JsonDict
+type JsonDict = dict[str, JsonValue]
+
+static_assert(is_subtype_of(Top[JsonDict], Top[JsonDict]))
+static_assert(is_subtype_of(Top[JsonDict], Bottom[JsonDict]))
+static_assert(is_subtype_of(Bottom[JsonDict], Bottom[JsonDict]))
+static_assert(is_subtype_of(Bottom[JsonDict], Top[JsonDict]))
+```
+
+### Cyclic defaults
+
+```py
+from typing_extensions import Protocol, TypeVar
+
+T = TypeVar("T", default="C", covariant=True)
+
+class P(Protocol[T]):
+    pass
+
+class C(P[T]):
+    pass
+
+reveal_type(C[int]())  # revealed: C[int]
+reveal_type(C())  # revealed: C[Divergent]
+```
+
+### Union inside generic
+
+#### With old-style union
+
+```py
+from typing import Union
+
+type A = list[Union["A", str]]
+
+def f(x: A):
+    reveal_type(x)  # revealed: list[A | str]
+    for item in x:
+        reveal_type(item)  # revealed: list[Any | str] | str
+```
+
+#### With new-style union
+
+```py
+type A = list["A" | str]
+
+def f(x: A):
+    reveal_type(x)  # revealed: list[A | str]
+    for item in x:
+        reveal_type(item)  # revealed: list[Any | str] | str
+```
+
+#### With Optional
+
+```py
+from typing import Optional, Union
+
+type A = list[Optional[Union["A", str]]]
+
+def f(x: A):
+    reveal_type(x)  # revealed: list[A | str | None]
+    for item in x:
+        reveal_type(item)  # revealed: list[Any | str | None] | str | None
+```
+
+### Tuple comparison
+
+```py
+type X = tuple[X, int]
+
+def _(x: X):
+    reveal_type(x is x)  # revealed: bool
+```
+
+### Recursive invariant
+
+```py
+type X = dict[str, X]
+type Y = X | str | dict[str, Y]
+
+def _(y: Y):
+    if isinstance(y, dict):
+        reveal_type(y)  # revealed: dict[str, X] | dict[str, Y]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/properties.md b/crates/ty_python_semantic/resources/mdtest/properties.md
index aff91ead1b..90634eba39 100644
--- a/crates/ty_python_semantic/resources/mdtest/properties.md
+++ b/crates/ty_python_semantic/resources/mdtest/properties.md
@@ -303,3 +303,18 @@ reveal_type(attr_property.fset(c, "a"))  # revealed: None
 # error: [invalid-argument-type]
 attr_property.fset(c, 1)
 ```
+
+At runtime, `attr_property.__get__` and `attr_property.__set__` are both instances of
+`types.MethodWrapperType`:
+
+```py
+import types
+from ty_extensions import TypeOf, static_assert, is_subtype_of
+
+static_assert(is_subtype_of(TypeOf[attr_property.__get__], types.MethodWrapperType))
+static_assert(is_subtype_of(TypeOf[attr_property.__set__], types.MethodWrapperType))
+static_assert(not is_subtype_of(TypeOf[attr_property.__get__], types.WrapperDescriptorType))
+static_assert(not is_subtype_of(TypeOf[attr_property.__set__], types.WrapperDescriptorType))
+static_assert(not is_subtype_of(TypeOf[attr_property.__get__], types.BuiltinMethodType))
+static_assert(not is_subtype_of(TypeOf[attr_property.__set__], types.BuiltinMethodType))
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/protocols.md b/crates/ty_python_semantic/resources/mdtest/protocols.md
index 5ad6f576d5..2818de99e4 100644
--- a/crates/ty_python_semantic/resources/mdtest/protocols.md
+++ b/crates/ty_python_semantic/resources/mdtest/protocols.md
@@ -95,6 +95,20 @@ class NotAProtocol: ...
 reveal_type(is_protocol(NotAProtocol))  # revealed: Literal[False]
 ```
 
+Note, however, that `is_protocol` returns `False` at runtime for specializations of generic
+protocols. We still consider these to be "protocol classes" internally, regardless:
+
+```py
+class MyGenericProtocol[T](Protocol):
+    x: T
+
+reveal_type(is_protocol(MyGenericProtocol))  # revealed: Literal[True]
+
+# We still consider this a protocol class internally,
+# but the inferred type of the call here reflects the result at runtime:
+reveal_type(is_protocol(MyGenericProtocol[int]))  # revealed: Literal[False]
+```
+
 A type checker should follow the typeshed stubs if a non-class is passed in, and typeshed's stubs
 indicate that the argument passed in must be an instance of `type`.
 
@@ -250,9 +264,21 @@ def f(
 # fmt: on
 ```
 
-Nonetheless, `Protocol` can still be used as the second argument to `issubclass()` at runtime:
+Nonetheless, `Protocol` is an instance of `type` at runtime, and therefore can still be used as the
+second argument to `issubclass()` at runtime:
 
 ```py
+import abc
+import typing
+from ty_extensions import TypeOf
+
+reveal_type(type(Protocol))  # revealed: <class '_ProtocolMeta'>
+# revealed: tuple[<class '_ProtocolMeta'>, <class 'ABCMeta'>, <class 'type'>, <class 'object'>]
+reveal_type(type(Protocol).__mro__)
+static_assert(is_subtype_of(TypeOf[Protocol], type))
+static_assert(is_subtype_of(TypeOf[Protocol], abc.ABCMeta))
+static_assert(is_subtype_of(TypeOf[Protocol], typing._ProtocolMeta))
+
 # Could also be `Literal[True]`, but `bool` is fine:
 reveal_type(issubclass(MyProtocol, Protocol))  # revealed: bool
 ```
@@ -321,7 +347,7 @@ python-version = "3.12"
 ```
 
 ```py
-from typing_extensions import Protocol, reveal_type
+from typing_extensions import Protocol
 
 # error: [call-non-callable]
 reveal_type(Protocol())  # revealed: Unknown
@@ -355,9 +381,7 @@ And as a corollary, `type[MyProtocol]` can also be called:
 
 ```py
 def f(x: type[MyProtocol]):
-    # TODO: add a `reveal_type` call here once it's no longer a `Todo` type
-    # (which doesn't work well with snapshots)
-    x()
+    reveal_type(x())  # revealed: @Todo(type[T] for protocols)
 ```
 
 ## Members of a protocol
@@ -397,24 +421,38 @@ To see the kinds and types of the protocol members, you can use the debugging ai
 
 ```py
 from ty_extensions import reveal_protocol_interface
-from typing import SupportsIndex, SupportsAbs, ClassVar
+from typing import SupportsIndex, SupportsAbs, ClassVar, Iterator
 
-# error: [revealed-type] "Revealed protocol interface: `{"method_member": MethodMember(`(self) -> bytes`), "x": AttributeMember(`int`), "y": PropertyMember { getter: `def y(self) -> str` }, "z": PropertyMember { getter: `def z(self) -> int`, setter: `def z(self, z: int) -> None` }}`"
+# revealed: {"method_member": MethodMember(`(self, /) -> bytes`), "x": AttributeMember(`int`), "y": PropertyMember { getter: `def y(self, /) -> str` }, "z": PropertyMember { getter: `def z(self, /) -> int`, setter: `def z(self, /, z: int) -> None` }}
 reveal_protocol_interface(Foo)
-# error: [revealed-type] "Revealed protocol interface: `{"__index__": MethodMember(`(self) -> int`)}`"
+# revealed: {"__index__": MethodMember(`(self, /) -> int`)}
 reveal_protocol_interface(SupportsIndex)
-# error: [revealed-type] "Revealed protocol interface: `{"__abs__": MethodMember(`(self) -> _T_co@SupportsAbs`)}`"
+# revealed: {"__abs__": MethodMember(`(self, /) -> Unknown`)}
 reveal_protocol_interface(SupportsAbs)
+# revealed: {"__iter__": MethodMember(`(self, /) -> Iterator[Unknown]`), "__next__": MethodMember(`(self, /) -> Unknown`)}
+reveal_protocol_interface(Iterator)
 
 # error: [invalid-argument-type] "Invalid argument to `reveal_protocol_interface`: Only protocol classes can be passed to `reveal_protocol_interface`"
 reveal_protocol_interface(int)
 # error: [invalid-argument-type] "Argument to function `reveal_protocol_interface` is incorrect: Expected `type`, found `Literal["foo"]`"
 reveal_protocol_interface("foo")
+```
 
-# TODO: this should be a `revealed-type` diagnostic rather than `invalid-argument-type`, and it should reveal `{"__abs__": MethodMember(`(self) -> int`)}` for the protocol interface
-#
-# error: [invalid-argument-type] "Invalid argument to `reveal_protocol_interface`: Only protocol classes can be passed to `reveal_protocol_interface`"
+Similar to the way that `typing.is_protocol` returns `False` at runtime for all generic aliases,
+`typing.get_protocol_members` raises an exception at runtime if you pass it a generic alias, so we
+do not implement any special handling for generic aliases passed to the function.
+`ty_extensions.reveal_protocol_interface` can be used on both, however:
+
+```py
+# TODO: these fail at runtime, but we don't emit `[invalid-argument-type]` diagnostics
+# currently due to https://github.com/astral-sh/ty/issues/116
+reveal_type(get_protocol_members(SupportsAbs[int]))  # revealed: frozenset[str]
+reveal_type(get_protocol_members(Iterator[int]))  # revealed: frozenset[str]
+
+# revealed: {"__abs__": MethodMember(`(self, /) -> int`)}
 reveal_protocol_interface(SupportsAbs[int])
+# revealed: {"__iter__": MethodMember(`(self, /) -> Iterator[int]`), "__next__": MethodMember(`(self, /) -> int`)}
+reveal_protocol_interface(Iterator[int])
 
 class BaseProto(Protocol):
     def member(self) -> int: ...
@@ -422,16 +460,16 @@ class BaseProto(Protocol):
 class SubProto(BaseProto, Protocol):
     def member(self) -> bool: ...
 
-# error: [revealed-type] "Revealed protocol interface: `{"member": MethodMember(`(self) -> int`)}`"
+# revealed: {"member": MethodMember(`(self, /) -> int`)}
 reveal_protocol_interface(BaseProto)
 
-# error: [revealed-type] "Revealed protocol interface: `{"member": MethodMember(`(self) -> bool`)}`"
+# revealed: {"member": MethodMember(`(self, /) -> bool`)}
 reveal_protocol_interface(SubProto)
 
 class ProtoWithClassVar(Protocol):
     x: ClassVar[int]
 
-# error: [revealed-type] "Revealed protocol interface: `{"x": AttributeMember(`int`; ClassVar)}`"
+# revealed: {"x": AttributeMember(`int`; ClassVar)}
 reveal_protocol_interface(ProtoWithClassVar)
 
 class ProtocolWithDefault(Protocol):
@@ -440,7 +478,7 @@ class ProtocolWithDefault(Protocol):
 # We used to incorrectly report this as having an `x: Literal[0]` member;
 # declared types should take priority over inferred types for protocol interfaces!
 #
-# error: [revealed-type] "Revealed protocol interface: `{"x": AttributeMember(`int`)}`"
+# revealed: {"x": AttributeMember(`int`)}
 reveal_protocol_interface(ProtocolWithDefault)
 ```
 
@@ -494,7 +532,7 @@ python-version = "3.9"
 
 ```py
 import sys
-from typing_extensions import Protocol, get_protocol_members, reveal_type
+from typing_extensions import Protocol, get_protocol_members
 
 class Foo(Protocol):
     if sys.version_info >= (3, 10):
@@ -567,11 +605,21 @@ class HasXY(Protocol):
 class Foo:
     x: int
 
+class IntSub(int): ...
+
+class HasXIntSub(Protocol):
+    x: IntSub
+
 static_assert(is_subtype_of(Foo, HasX))
 static_assert(is_assignable_to(Foo, HasX))
 static_assert(not is_subtype_of(Foo, HasXY))
 static_assert(not is_assignable_to(Foo, HasXY))
 
+static_assert(not is_subtype_of(HasXIntSub, HasX))
+static_assert(not is_assignable_to(HasXIntSub, HasX))
+static_assert(not is_subtype_of(HasX, HasXIntSub))
+static_assert(not is_assignable_to(HasX, HasXIntSub))
+
 class FooSub(Foo): ...
 
 static_assert(is_subtype_of(FooSub, HasX))
@@ -579,7 +627,7 @@ static_assert(is_assignable_to(FooSub, HasX))
 static_assert(not is_subtype_of(FooSub, HasXY))
 static_assert(not is_assignable_to(FooSub, HasXY))
 
-class FooBool(Foo):
+class FooBool:
     x: bool
 
 static_assert(not is_subtype_of(FooBool, HasX))
@@ -842,8 +890,10 @@ class LotsOfBindings(Protocol):
     match object():
         case l:  # error: [ambiguous-protocol-member]
             ...
+    # error: [ambiguous-protocol-member] "Consider adding an annotation, e.g. `m: int | str = ...`"
+    m = 1 if 1.2 > 3.4 else "a"
 
-# revealed: frozenset[Literal["Nested", "NestedProtocol", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"]]
+# revealed: frozenset[Literal["Nested", "NestedProtocol", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m"]]
 reveal_type(get_protocol_members(LotsOfBindings))
 
 class Foo(Protocol):
@@ -911,11 +961,14 @@ class Foo(Protocol):
 
     def __init__(self) -> None:
         self.x = 42  # fine
+
         self.a = 56  # TODO: should emit diagnostic
         self.b: int = 128  # TODO: should emit diagnostic
 
     def non_init_method(self) -> None:
-        self.y = 64  # fine
+        self.x = 64  # fine
+        self.y = "bar"  # fine
+
         self.c = 72  # TODO: should emit diagnostic
 
 # Note: the list of members does not include `a`, `b` or `c`,
@@ -957,6 +1010,13 @@ from ty_extensions import is_equivalent_to
 static_assert(is_equivalent_to(UniversalSet, object))
 ```
 
+and that therefore `Any` is a subtype of `UniversalSet` (in general, `Any` can *only* ever be a
+subtype of `object` and types that are equivalent to `object`):
+
+```py
+static_assert(is_subtype_of(Any, UniversalSet))
+```
+
 `object` is a subtype of certain other protocols too. Since all fully static types (whether nominal
 or structural) are subtypes of `object`, these protocols are also subtypes of `object`; and this
 means that these protocols are also equivalent to `UniversalSet` and `object`:
@@ -967,6 +1027,10 @@ class SupportsStr(Protocol):
 
 static_assert(is_equivalent_to(SupportsStr, UniversalSet))
 static_assert(is_equivalent_to(SupportsStr, object))
+static_assert(is_subtype_of(SupportsStr, UniversalSet))
+static_assert(is_subtype_of(UniversalSet, SupportsStr))
+static_assert(is_assignable_to(UniversalSet, SupportsStr))
+static_assert(is_assignable_to(SupportsStr, UniversalSet))
 
 class SupportsClass(Protocol):
     @property
@@ -975,6 +1039,11 @@ class SupportsClass(Protocol):
 static_assert(is_equivalent_to(SupportsClass, UniversalSet))
 static_assert(is_equivalent_to(SupportsClass, SupportsStr))
 static_assert(is_equivalent_to(SupportsClass, object))
+
+static_assert(is_subtype_of(SupportsClass, SupportsStr))
+static_assert(is_subtype_of(SupportsStr, SupportsClass))
+static_assert(is_assignable_to(SupportsStr, SupportsClass))
+static_assert(is_assignable_to(SupportsClass, SupportsStr))
 ```
 
 If a protocol contains members that are not defined on `object`, then that protocol will (like all
@@ -996,6 +1065,47 @@ static_assert(not is_assignable_to(HasX, Foo))
 static_assert(not is_subtype_of(HasX, Foo))
 ```
 
+Since `object` defines a `__hash__` method, this means that the standard-library `Hashable` protocol
+is currently understood by ty as being equivalent to `object`, much like `SupportsStr` and
+`UniversalSet` above:
+
+```py
+from typing import Hashable
+
+static_assert(is_equivalent_to(object, Hashable))
+static_assert(is_assignable_to(object, Hashable))
+static_assert(is_subtype_of(object, Hashable))
+```
+
+This means that any type considered assignable to `object` (which is all types) is considered by ty
+to be assignable to `Hashable`. This avoids false positives on code like this:
+
+```py
+from typing import Sequence
+from ty_extensions import is_disjoint_from
+
+def takes_hashable_or_sequence(x: Hashable | list[Hashable]): ...
+
+takes_hashable_or_sequence(["foo"])  # fine
+takes_hashable_or_sequence(None)  # fine
+
+static_assert(not is_disjoint_from(list[str], Hashable | list[Hashable]))
+static_assert(not is_disjoint_from(list[str], Sequence[Hashable]))
+
+static_assert(is_subtype_of(list[Hashable], Sequence[Hashable]))
+static_assert(is_subtype_of(list[str], Sequence[Hashable]))
+```
+
+but means that ty currently does not detect errors on code like this, which is flagged by other type
+checkers:
+
+```py
+def needs_something_hashable(x: Hashable):
+    hash(x)
+
+needs_something_hashable([])
+```
+
 ## Diagnostics for protocols with invalid attribute members
 
 This is a short appendix to the previous section with the `snapshot-diagnostics` directive enabled
@@ -1004,6 +1114,8 @@ it's a large section).
 
 <!-- snapshot-diagnostics -->
 
+`a.py`:
+
 ```py
 from typing import Protocol
 
@@ -1030,8 +1142,38 @@ class A(Protocol):
         pass
 ```
 
+Validation of protocols that had cross-module inheritance used to break, so we test that explicitly
+here too:
+
+`b.py`:
+
+```py
+from typing import Protocol
+
+# Ensure the number of scopes in `b.py` is greater than the number of scopes in `c.py`:
+class SomethingUnrelated: ...
+
+class A(Protocol):
+    x: int
+```
+
+`c.py`:
+
+```py
+from b import A
+from typing import Protocol
+
+class C(A, Protocol):
+    x = 42  # fine, due to declaration in the base class
+```
+
 ## Equivalence of protocols
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 Two protocols are considered equivalent types if they specify the same interface, even if they have
 different names:
 
@@ -1080,6 +1222,46 @@ static_assert(is_equivalent_to(UnionProto1, UnionProto2))
 static_assert(is_equivalent_to(UnionProto1 | A | B, B | UnionProto2 | A))
 ```
 
+Different generic protocols with equivalent specializations can be equivalent, but generic protocols
+with different specializations are not considered equivalent:
+
+```py
+from typing import TypeVar
+
+S = TypeVar("S")
+
+class NonGenericProto1(Protocol):
+    x: int
+    y: str
+
+class NonGenericProto2(Protocol):
+    y: str
+    x: int
+
+class Nominal1: ...
+class Nominal2: ...
+
+class GenericProto[T](Protocol):
+    x: T
+
+class LegacyGenericProto(Protocol[S]):
+    x: S
+
+static_assert(is_equivalent_to(GenericProto[int], LegacyGenericProto[int]))
+static_assert(is_equivalent_to(GenericProto[NonGenericProto1], LegacyGenericProto[NonGenericProto2]))
+
+static_assert(
+    is_equivalent_to(
+        GenericProto[NonGenericProto1 | Nominal1 | Nominal2], LegacyGenericProto[Nominal2 | Nominal1 | NonGenericProto2]
+    )
+)
+
+static_assert(not is_equivalent_to(GenericProto[str], GenericProto[int]))
+static_assert(not is_equivalent_to(GenericProto[str], LegacyGenericProto[int]))
+static_assert(not is_equivalent_to(GenericProto, GenericProto[int]))
+static_assert(not is_equivalent_to(LegacyGenericProto, LegacyGenericProto[int]))
+```
+
 ## Intersections of protocols
 
 An intersection of two protocol types `X` and `Y` is equivalent to a protocol type `Z` that inherits
@@ -1392,10 +1574,32 @@ static_assert(is_subtype_of(XClassVar, HasXProperty))
 static_assert(is_assignable_to(XClassVar, HasXProperty))
 
 class XFinal:
-    x: Final = 42
+    x: Final[int] = 42
 
 static_assert(is_subtype_of(XFinal, HasXProperty))
 static_assert(is_assignable_to(XFinal, HasXProperty))
+
+class XImplicitFinal:
+    x: Final = 42
+
+static_assert(is_subtype_of(XImplicitFinal, HasXProperty))
+static_assert(is_assignable_to(XImplicitFinal, HasXProperty))
+```
+
+But only if it has the correct type:
+
+```py
+class XAttrBad:
+    x: str
+
+class HasStrXProperty(Protocol):
+    @property
+    def x(self) -> str: ...
+
+# TODO: these should pass
+static_assert(not is_assignable_to(XAttrBad, HasXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(HasStrXProperty, HasXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(HasXProperty, HasStrXProperty))  # error: [static-assert-error]
 ```
 
 A read-only property on a protocol, unlike a mutable attribute, is covariant: `XSub` in the below
@@ -1410,6 +1614,13 @@ class XSub:
 
 static_assert(is_subtype_of(XSub, HasXProperty))
 static_assert(is_assignable_to(XSub, HasXProperty))
+
+class XSubProto(Protocol):
+    @property
+    def x(self) -> XSub: ...
+
+static_assert(is_subtype_of(XSubProto, HasXProperty))
+static_assert(is_assignable_to(XSubProto, HasXProperty))
 ```
 
 A read/write property on a protocol, where the getter returns the same type that the setter takes,
@@ -1434,8 +1645,8 @@ class XReadProperty:
         return 42
 
 # TODO: these should pass
-static_assert(not is_subtype_of(XReadProperty, HasXProperty))  # error: [static-assert-error]
-static_assert(not is_assignable_to(XReadProperty, HasXProperty))  # error: [static-assert-error]
+static_assert(not is_subtype_of(XReadProperty, HasMutableXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(XReadProperty, HasMutableXProperty))  # error: [static-assert-error]
 
 class XReadWriteProperty:
     @property
@@ -1445,19 +1656,19 @@ class XReadWriteProperty:
     @x.setter
     def x(self, val: int) -> None: ...
 
-static_assert(is_subtype_of(XReadWriteProperty, HasXProperty))
-static_assert(is_assignable_to(XReadWriteProperty, HasXProperty))
+static_assert(is_subtype_of(XReadWriteProperty, HasMutableXProperty))
+static_assert(is_assignable_to(XReadWriteProperty, HasMutableXProperty))
 
 class XSub:
     x: MyInt
 
-# TODO: should pass
-static_assert(not is_subtype_of(XSub, HasXProperty))  # error: [static-assert-error]
-static_assert(not is_assignable_to(XSub, HasXProperty))  # error: [static-assert-error]
+# TODO: these should pass
+static_assert(not is_subtype_of(XSub, HasMutableXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(XSub, HasMutableXProperty))  # error: [static-assert-error]
 ```
 
 A protocol with a read/write property `x` is exactly equivalent to a protocol with a mutable
-attribute `x`. Both are subtypes of a protocol with a read-only prooperty `x`:
+attribute `x`. Both are subtypes of a protocol with a read-only property `x`:
 
 ```py
 from ty_extensions import is_equivalent_to
@@ -1471,8 +1682,22 @@ static_assert(is_equivalent_to(HasMutableXAttr, HasMutableXProperty))  # error:
 static_assert(is_subtype_of(HasMutableXAttr, HasXProperty))
 static_assert(is_assignable_to(HasMutableXAttr, HasXProperty))
 
+static_assert(is_subtype_of(HasMutableXAttr, HasMutableXProperty))
+static_assert(is_assignable_to(HasMutableXAttr, HasMutableXProperty))
+
 static_assert(is_subtype_of(HasMutableXProperty, HasXProperty))
 static_assert(is_assignable_to(HasMutableXProperty, HasXProperty))
+
+static_assert(is_subtype_of(HasMutableXProperty, HasMutableXAttr))
+static_assert(is_assignable_to(HasMutableXProperty, HasMutableXAttr))
+
+class HasMutableXAttrWrongType(Protocol):
+    x: str
+
+# TODO: these should pass
+static_assert(not is_assignable_to(HasMutableXAttrWrongType, HasXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(HasMutableXAttrWrongType, HasMutableXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(HasMutableXProperty, HasMutableXAttrWrongType))  # error: [static-assert-error]
 ```
 
 A read/write property on a protocol, where the setter accepts a subtype of the type returned by the
@@ -1549,7 +1774,7 @@ class Descriptor:
     def __get__(self, instance, owner) -> MyInt:
         return MyInt(0)
 
-    def __set__(self, value: int) -> None: ...
+    def __set__(self, instance, value: int) -> None: ...
 
 class XCustomDescriptor:
     x: Descriptor = Descriptor()
@@ -1595,6 +1820,16 @@ static_assert(is_assignable_to(HasGetAttrAndSetAttr, HasXProperty))
 # TODO: these should pass
 static_assert(is_subtype_of(HasGetAttrAndSetAttr, XAsymmetricProperty))  # error: [static-assert-error]
 static_assert(is_assignable_to(HasGetAttrAndSetAttr, XAsymmetricProperty))  # error: [static-assert-error]
+
+class HasSetAttrWithUnsuitableInput:
+    def __getattr__(self, attr: str) -> int:
+        return 1
+
+    def __setattr__(self, attr: str, value: str) -> None: ...
+
+# TODO: these should pass
+static_assert(not is_subtype_of(HasSetAttrWithUnsuitableInput, HasMutableXProperty))  # error: [static-assert-error]
+static_assert(not is_assignable_to(HasSetAttrWithUnsuitableInput, HasMutableXProperty))  # error: [static-assert-error]
 ```
 
 ## Subtyping of protocols with method members
@@ -1604,7 +1839,7 @@ class `T` has a method `m` which is assignable to the `Callable` supertype of th
 
 ```py
 from typing import Protocol
-from ty_extensions import is_subtype_of, static_assert
+from ty_extensions import is_subtype_of, is_assignable_to, static_assert
 
 class P(Protocol):
     def m(self, x: int, /) -> None: ...
@@ -1612,14 +1847,43 @@ class P(Protocol):
 class NominalSubtype:
     def m(self, y: int) -> None: ...
 
+class NominalSubtype2:
+    def m(self, *args: object) -> None: ...
+
 class NotSubtype:
     def m(self, x: int) -> int:
         return 42
 
-static_assert(is_subtype_of(NominalSubtype, P))
+class NominalWithClassMethod:
+    @classmethod
+    def m(cls, x: int) -> None: ...
 
-# TODO: should pass
-static_assert(not is_subtype_of(NotSubtype, P))  # error: [static-assert-error]
+class NominalWithStaticMethod:
+    @staticmethod
+    def m(_, x: int) -> None: ...
+
+class DefinitelyNotSubtype:
+    m = None
+
+static_assert(is_subtype_of(NominalSubtype, P))
+static_assert(is_subtype_of(NominalSubtype2, P))
+static_assert(is_subtype_of(NominalSubtype | NominalSubtype2, P))
+static_assert(not is_assignable_to(DefinitelyNotSubtype, P))
+static_assert(not is_assignable_to(NotSubtype, P))
+static_assert(not is_assignable_to(NominalSubtype | NotSubtype, P))
+static_assert(not is_assignable_to(NominalSubtype2 | DefinitelyNotSubtype, P))
+
+# `m` has the correct signature when accessed on instances of `NominalWithClassMethod`,
+# but not when accessed on the class object `NominalWithClassMethod` itself
+#
+# TODO: these should pass
+static_assert(not is_assignable_to(NominalWithClassMethod, P))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NominalSubtype | NominalWithClassMethod, P))  # error: [static-assert-error]
+
+# Conversely, `m` has the correct signature when accessed on the class object
+# `NominalWithStaticMethod`, but not when accessed on instances of `NominalWithStaticMethod`
+static_assert(not is_assignable_to(NominalWithStaticMethod, P))
+static_assert(not is_assignable_to(NominalSubtype | NominalWithStaticMethod, P))
 ```
 
 A callable instance attribute is not sufficient for a type to satisfy a protocol with a method
@@ -1664,9 +1928,28 @@ class Foo:
 static_assert(not is_assignable_to(Foo, Iterable[Any]))
 ```
 
-Because method members must always be available on the class, it is safe to access a method on
-`type[P]`, where `P` is a protocol class, just like it is generally safe to access a method on
-`type[C]` where `C` is a nominal class:
+Because method members are always looked up on the meta-type of an object when testing assignability
+and subtyping, we understand that `IterableClass` here is a subtype of `Iterable[int]` even though
+`IterableClass.__iter__` has the wrong signature:
+
+```py
+from typing import Iterator, Iterable
+from ty_extensions import static_assert, is_subtype_of, TypeOf
+
+class Meta(type):
+    def __iter__(self) -> Iterator[int]:
+        yield from range(42)
+
+class IterableClass(metaclass=Meta):
+    def __iter__(self) -> Iterator[str]:
+        yield from "abc"
+
+static_assert(is_subtype_of(TypeOf[IterableClass], Iterable[int]))
+```
+
+Enforcing that members must always be available on the class also means that it is safe to access a
+method on `type[P]`, where `P` is a protocol class, just like it is generally safe to access a
+method on `type[C]` where `C` is a nominal class:
 
 ```py
 from typing import Protocol
@@ -1675,7 +1958,7 @@ class Foo(Protocol):
     def method(self) -> str: ...
 
 def f(x: Foo):
-    reveal_type(type(x).method)  # revealed: def method(self) -> str
+    reveal_type(type(x).method)  # revealed: def method(self, /) -> str
 
 class Bar:
     def __init__(self):
@@ -1684,11 +1967,283 @@ class Bar:
 f(Bar())  # error: [invalid-argument-type]
 ```
 
-## Equivalence of protocols with method members
+Some protocols use the old convention (specified in PEP-484) for denoting positional-only
+parameters. This is supported by ty:
+
+```py
+class HasPosOnlyDunders:
+    def __invert__(self, /) -> "HasPosOnlyDunders":
+        return self
+
+    def __lt__(self, other, /) -> bool:
+        return True
+
+class SupportsLessThan(Protocol):
+    def __lt__(self, __other) -> bool: ...
+
+class Invertable(Protocol):
+    # `self` and `cls` are always implicitly positional-only for methods defined in `Protocol`
+    # classes, even if no parameters in the method use the PEP-484 convention.
+    def __invert__(self) -> object: ...
+
+static_assert(is_assignable_to(HasPosOnlyDunders, SupportsLessThan))
+static_assert(is_assignable_to(HasPosOnlyDunders, Invertable))
+static_assert(is_assignable_to(str, SupportsLessThan))
+static_assert(is_assignable_to(int, Invertable))
+```
+
+## Subtyping of protocols with generic method members
+
+Protocol method members can be generic. They can have generic contexts scoped to the class:
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing_extensions import TypeVar, Self, Protocol
+from ty_extensions import is_equivalent_to, static_assert, is_assignable_to, is_subtype_of
+
+class NewStyleClassScoped[T](Protocol):
+    def method(self, input: T) -> None: ...
+
+S = TypeVar("S")
+
+class LegacyClassScoped(Protocol[S]):
+    def method(self, input: S) -> None: ...
+
+# TODO: these should pass
+static_assert(is_equivalent_to(NewStyleClassScoped, LegacyClassScoped))  # error: [static-assert-error]
+static_assert(is_equivalent_to(NewStyleClassScoped[int], LegacyClassScoped[int]))  # error: [static-assert-error]
+
+class NominalGeneric[T]:
+    def method(self, input: T) -> None: ...
+
+def _[T](x: T) -> T:
+    # TODO: should pass
+    static_assert(is_equivalent_to(NewStyleClassScoped[T], LegacyClassScoped[T]))  # error: [static-assert-error]
+    static_assert(is_subtype_of(NominalGeneric[T], NewStyleClassScoped[T]))
+    static_assert(is_subtype_of(NominalGeneric[T], LegacyClassScoped[T]))
+    return x
+
+class NominalConcrete:
+    def method(self, input: int) -> None: ...
+
+static_assert(is_assignable_to(NominalConcrete, NewStyleClassScoped))
+static_assert(is_assignable_to(NominalConcrete, LegacyClassScoped))
+static_assert(is_assignable_to(NominalGeneric[int], NewStyleClassScoped))
+static_assert(is_assignable_to(NominalGeneric[int], LegacyClassScoped))
+static_assert(is_assignable_to(NominalGeneric, NewStyleClassScoped[int]))
+static_assert(is_assignable_to(NominalGeneric, LegacyClassScoped[int]))
+
+# `NewStyleClassScoped` is implicitly `NewStyleClassScoped[Unknown]`,
+# and there exist fully static materializations of `NewStyleClassScoped[Unknown]`
+# where `Nominal` would not be a subtype of the given materialization,
+# hence there is no subtyping relation:
+static_assert(not is_subtype_of(NominalConcrete, NewStyleClassScoped))
+static_assert(not is_subtype_of(NominalConcrete, LegacyClassScoped))
+
+# Similarly, `NominalGeneric` is implicitly `NominalGeneric[Unknown`]
+static_assert(not is_subtype_of(NominalGeneric, NewStyleClassScoped[int]))
+static_assert(not is_subtype_of(NominalGeneric, LegacyClassScoped[int]))
+
+static_assert(is_subtype_of(NominalConcrete, NewStyleClassScoped[int]))
+static_assert(is_subtype_of(NominalConcrete, LegacyClassScoped[int]))
+static_assert(is_subtype_of(NominalGeneric[int], NewStyleClassScoped[int]))
+static_assert(is_subtype_of(NominalGeneric[int], LegacyClassScoped[int]))
+
+static_assert(not is_assignable_to(NominalConcrete, NewStyleClassScoped[str]))
+static_assert(not is_assignable_to(NominalConcrete, LegacyClassScoped[str]))
+static_assert(not is_subtype_of(NominalGeneric[int], NewStyleClassScoped[str]))
+static_assert(not is_subtype_of(NominalGeneric[int], LegacyClassScoped[str]))
+```
+
+And they can also have generic contexts scoped to the method:
+
+```py
+class NewStyleFunctionScoped(Protocol):
+    def f[T](self, input: T) -> T: ...
+
+S = TypeVar("S")
+
+class LegacyFunctionScoped(Protocol):
+    def f(self, input: S) -> S: ...
+
+class UsesSelf(Protocol):
+    def g(self: Self) -> Self: ...
+
+class NominalNewStyle:
+    def f[T](self, input: T) -> T:
+        return input
+
+class NominalLegacy:
+    def f(self, input: S) -> S:
+        return input
+
+class NominalWithSelf:
+    def g(self: Self) -> Self:
+        return self
+
+class NominalNotGeneric:
+    def f(self, input: int) -> int:
+        return input
+
+class NominalReturningSelfNotGeneric:
+    def g(self) -> "NominalReturningSelfNotGeneric":
+        return self
+
+# TODO: should pass
+static_assert(is_equivalent_to(LegacyFunctionScoped, NewStyleFunctionScoped))  # error: [static-assert-error]
+
+static_assert(is_assignable_to(NominalNewStyle, NewStyleFunctionScoped))
+static_assert(is_assignable_to(NominalNewStyle, LegacyFunctionScoped))
+# TODO: should pass
+static_assert(is_subtype_of(NominalNewStyle, NewStyleFunctionScoped))  # error: [static-assert-error]
+# TODO: should pass
+static_assert(is_subtype_of(NominalNewStyle, LegacyFunctionScoped))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NominalNewStyle, UsesSelf))
+
+static_assert(is_assignable_to(NominalLegacy, NewStyleFunctionScoped))
+static_assert(is_assignable_to(NominalLegacy, LegacyFunctionScoped))
+# TODO: should pass
+static_assert(is_subtype_of(NominalLegacy, NewStyleFunctionScoped))  # error: [static-assert-error]
+# TODO: should pass
+static_assert(is_subtype_of(NominalLegacy, LegacyFunctionScoped))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NominalLegacy, UsesSelf))
+
+static_assert(not is_assignable_to(NominalWithSelf, NewStyleFunctionScoped))
+static_assert(not is_assignable_to(NominalWithSelf, LegacyFunctionScoped))
+static_assert(is_assignable_to(NominalWithSelf, UsesSelf))
+# TODO: should pass
+static_assert(is_subtype_of(NominalWithSelf, UsesSelf))  # error: [static-assert-error]
+
+# TODO: these should pass
+static_assert(not is_assignable_to(NominalNotGeneric, NewStyleFunctionScoped))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NominalNotGeneric, LegacyFunctionScoped))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NominalNotGeneric, UsesSelf))
+
+static_assert(not is_assignable_to(NominalReturningSelfNotGeneric, NewStyleFunctionScoped))
+static_assert(not is_assignable_to(NominalReturningSelfNotGeneric, LegacyFunctionScoped))
+
+# TODO: should pass
+static_assert(not is_assignable_to(NominalReturningSelfNotGeneric, UsesSelf))  # error: [static-assert-error]
+
+# These test cases are taken from the typing conformance suite:
+class ShapeProtocolImplicitSelf(Protocol):
+    def set_scale(self, scale: float) -> Self: ...
+
+class ShapeProtocolExplicitSelf(Protocol):
+    def set_scale(self: Self, scale: float) -> Self: ...
+
+class BadReturnType:
+    def set_scale(self, scale: float) -> int:
+        return 42
+
+static_assert(not is_assignable_to(BadReturnType, ShapeProtocolImplicitSelf))
+static_assert(not is_assignable_to(BadReturnType, ShapeProtocolExplicitSelf))
+```
+
+## Subtyping of protocols with `@classmethod` or `@staticmethod` members
+
+The typing spec states that protocols may have `@classmethod` or `@staticmethod` method members.
+However, as of 2025/09/24, the spec does not elaborate on how these members should behave with
+regards to subtyping and assignability (nor are there any tests in the typing conformance suite).
+Ty's behaviour is therefore derived from first principles and the
+[mypy test suite](https://github.com/python/mypy/blob/354bea6352ee7a38b05e2f42c874e7d1f7bf557a/test-data/unit/check-protocols.test#L1231-L1263).
+
+A protocol `P` with a `@classmethod` method member `x` can only be satisfied by a nominal type `N`
+if `N.x` is a callable object that evaluates to the same type whether it is accessed on inhabitants
+of `N` or inhabitants of `type[N]`, *and* the signature of `N.x` is equivalent to the signature of
+`P.x` after the descriptor protocol has been invoked on `P.x`:
+
+```py
+from typing import Protocol
+from ty_extensions import static_assert, is_subtype_of, is_assignable_to, is_equivalent_to, is_disjoint_from
+
+class PClassMethod(Protocol):
+    @classmethod
+    def x(cls, val: int) -> str: ...
+
+class PStaticMethod(Protocol):
+    @staticmethod
+    def x(val: int) -> str: ...
+
+class NNotCallable:
+    x = None
+
+class NInstanceMethod:
+    def x(self, val: int) -> str:
+        return "foo"
+
+class NClassMethodGood:
+    @classmethod
+    def x(cls, val: int) -> str:
+        return "foo"
+
+class NClassMethodBad:
+    @classmethod
+    def x(cls, val: str) -> int:
+        return 42
+
+class NStaticMethodGood:
+    @staticmethod
+    def x(val: int) -> str:
+        return "foo"
+
+class NStaticMethodBad:
+    @staticmethod
+    def x(cls, val: int) -> str:
+        return "foo"
+
+# `PClassMethod.x` and `PStaticMethod.x` evaluate to callable types with equivalent signatures
+# whether you access them on the protocol class or instances of the protocol.
+# That means that they are equivalent protocols!
+static_assert(is_equivalent_to(PClassMethod, PStaticMethod))
+
+# TODO: these should all pass
+static_assert(not is_assignable_to(NNotCallable, PClassMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NNotCallable, PStaticMethod))  # error: [static-assert-error]
+static_assert(is_disjoint_from(NNotCallable, PClassMethod))  # error: [static-assert-error]
+static_assert(is_disjoint_from(NNotCallable, PStaticMethod))  # error: [static-assert-error]
+
+# `NInstanceMethod.x` has the correct type when accessed on an instance of
+# `NInstanceMethod`, but not when accessed on the class object itself
+#
+# TODO: these should pass
+static_assert(not is_assignable_to(NInstanceMethod, PClassMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NInstanceMethod, PStaticMethod))  # error: [static-assert-error]
+
+# A nominal type with a `@staticmethod` can satisfy a protocol with a `@classmethod`
+# if the staticmethod duck-types the same as the classmethod member
+# both when accessed on the class and when accessed on an instance of the class
+# The same also applies for a nominal type with a `@classmethod` and a protocol
+# with a `@staticmethod` member
+static_assert(is_assignable_to(NClassMethodGood, PClassMethod))
+static_assert(is_assignable_to(NClassMethodGood, PStaticMethod))
+# TODO: these should all pass:
+static_assert(is_subtype_of(NClassMethodGood, PClassMethod))  # error: [static-assert-error]
+static_assert(is_subtype_of(NClassMethodGood, PStaticMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NClassMethodBad, PClassMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NClassMethodBad, PStaticMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NClassMethodGood | NClassMethodBad, PClassMethod))  # error: [static-assert-error]
+
+static_assert(is_assignable_to(NStaticMethodGood, PClassMethod))
+static_assert(is_assignable_to(NStaticMethodGood, PStaticMethod))
+# TODO: these should all pass:
+static_assert(is_subtype_of(NStaticMethodGood, PClassMethod))  # error: [static-assert-error]
+static_assert(is_subtype_of(NStaticMethodGood, PStaticMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NStaticMethodBad, PClassMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NStaticMethodBad, PStaticMethod))  # error: [static-assert-error]
+static_assert(not is_assignable_to(NStaticMethodGood | NStaticMethodBad, PStaticMethod))  # error: [static-assert-error]
+```
+
+## Equivalence of protocols with method or property members
 
 Two protocols `P1` and `P2`, both with a method member `x`, are considered equivalent if the
 signature of `P1.x` is equivalent to the signature of `P2.x`, even though ty would normally model
-any two function definitions as inhabiting distinct function-literal types.
+any two function definitions as inhabiting distinct function-literal types. The same is also true
+for property members.
 
 ```py
 from typing import Protocol
@@ -1700,7 +2255,26 @@ class P1(Protocol):
 class P2(Protocol):
     def x(self, y: int) -> None: ...
 
+class P3(Protocol):
+    @property
+    def y(self) -> str: ...
+    @property
+    def z(self) -> bytes: ...
+    @z.setter
+    def z(self, value: int) -> None: ...
+
+class P4(Protocol):
+    @property
+    def y(self) -> str: ...
+    @property
+    def z(self) -> bytes: ...
+    @z.setter
+    def z(self, value: int) -> None: ...
+
 static_assert(is_equivalent_to(P1, P2))
+
+# TODO: should pass
+static_assert(is_equivalent_to(P3, P4))  # error: [static-assert-error]
 ```
 
 As with protocols that only have non-method members, this also holds true when they appear in
@@ -1711,6 +2285,128 @@ class A: ...
 class B: ...
 
 static_assert(is_equivalent_to(A | B | P1, P2 | B | A))
+
+# TODO: should pass
+static_assert(is_equivalent_to(A | B | P3, P4 | B | A))  # error: [static-assert-error]
+```
+
+## Subtyping between two protocol types with method members
+
+A protocol `PSub` with a method member can be considered a subtype of a protocol `PSuper` with a
+method member if the signature of the member on `PSub` is a subtype of the signature of the member
+on `PSuper`:
+
+```py
+from typing import Protocol
+from ty_extensions import static_assert, is_subtype_of, is_assignable_to
+
+class Super: ...
+class Sub(Super): ...
+class Unrelated: ...
+
+class MethodPSuper(Protocol):
+    def f(self) -> Super: ...
+
+class MethodPSub(Protocol):
+    def f(self) -> Sub: ...
+
+class MethodPUnrelated(Protocol):
+    def f(self) -> Unrelated: ...
+
+static_assert(is_subtype_of(MethodPSub, MethodPSuper))
+
+static_assert(not is_assignable_to(MethodPUnrelated, MethodPSuper))
+static_assert(not is_assignable_to(MethodPSuper, MethodPUnrelated))
+static_assert(not is_assignable_to(MethodPSuper, MethodPSub))
+```
+
+## Subtyping between protocols with method members and protocols with non-method members
+
+A protocol with a method member can be considered a subtype of a protocol with a read-only
+`@property` member that returns a `Callable` type:
+
+```py
+from typing import Protocol, Callable
+from ty_extensions import static_assert, is_subtype_of, is_assignable_to
+
+class PropertyInt(Protocol):
+    @property
+    def f(self) -> Callable[[], int]: ...
+
+class PropertyBool(Protocol):
+    @property
+    def f(self) -> Callable[[], bool]: ...
+
+class PropertyNotReturningCallable(Protocol):
+    @property
+    def f(self) -> int: ...
+
+class PropertyWithIncorrectSignature(Protocol):
+    @property
+    def f(self) -> Callable[[object], int]: ...
+
+class Method(Protocol):
+    def f(self) -> bool: ...
+
+static_assert(is_subtype_of(Method, PropertyInt))
+static_assert(is_subtype_of(Method, PropertyBool))
+
+# TODO: these should pass
+static_assert(not is_assignable_to(Method, PropertyNotReturningCallable))  # error: [static-assert-error]
+static_assert(not is_assignable_to(Method, PropertyWithIncorrectSignature))  # error: [static-assert-error]
+```
+
+However, a protocol with a method member can never be considered a subtype of a protocol with a
+writable property member of the same name, as method members are covariant and immutable:
+
+```py
+class ReadWriteProperty(Protocol):
+    @property
+    def f(self) -> Callable[[], bool]: ...
+    @f.setter
+    def f(self, val: Callable[[], bool]): ...
+
+# TODO: should pass
+static_assert(not is_assignable_to(Method, ReadWriteProperty))  # error: [static-assert-error]
+```
+
+And for the same reason, they are never assignable to attribute members (which are also mutable):
+
+```py
+class Attribute(Protocol):
+    f: Callable[[], bool]
+
+static_assert(not is_assignable_to(Method, Attribute))
+```
+
+Protocols with attribute members, meanwhile, cannot be assigned to protocols with method members,
+since a method member is guaranteed to exist on the meta-type as well as the instance type, whereas
+this is not true for attribute members. The same principle also applies for protocols with property
+members
+
+```py
+static_assert(not is_assignable_to(PropertyBool, Method))
+static_assert(not is_assignable_to(Attribute, Method))
+```
+
+But an exception to this rule is if an attribute member is marked as `ClassVar`, as this guarantees
+that the member will be available on the meta-type as well as the instance type for inhabitants of
+the protocol:
+
+```py
+from typing import ClassVar
+
+class ClassVarAttribute(Protocol):
+    f: ClassVar[Callable[[], bool]]
+
+static_assert(is_subtype_of(ClassVarAttribute, Method))
+static_assert(is_assignable_to(ClassVarAttribute, Method))
+
+class ClassVarAttributeBad(Protocol):
+    f: ClassVar[Callable[[], str]]
+
+static_assert(not is_subtype_of(ClassVarAttributeBad, Method))
+static_assert(not is_assignable_to(ClassVarAttributeBad, Method))
 ```
 
 ## Narrowing of protocols
@@ -1722,7 +2418,7 @@ By default, a protocol class cannot be used as the second argument to `isinstanc
 type inside these branches (this matches the behavior of other type checkers):
 
 ```py
-from typing_extensions import Protocol, reveal_type
+from typing_extensions import Protocol
 
 class HasX(Protocol):
     x: int
@@ -1779,7 +2475,7 @@ def f(arg1: type, arg2: type):
         reveal_type(arg2)  # revealed: type & ~type[OnlyMethodMembers]
 ```
 
-## Truthiness of protocol instance
+## Truthiness of protocol instances
 
 An instance of a protocol type generally has ambiguous truthiness:
 
@@ -1873,24 +2569,106 @@ class Foo(Protocol):
 static_assert(is_subtype_of(Callable[[int], str], Foo))
 static_assert(is_assignable_to(Callable[[int], str], Foo))
 
-# TODO: these should pass
-static_assert(not is_subtype_of(Callable[[str], str], Foo))  # error: [static-assert-error]
-static_assert(not is_assignable_to(Callable[[str], str], Foo))  # error: [static-assert-error]
-static_assert(not is_subtype_of(Callable[[CallMeMaybe, int], str], Foo))  # error: [static-assert-error]
-static_assert(not is_assignable_to(Callable[[CallMeMaybe, int], str], Foo))  # error: [static-assert-error]
+static_assert(not is_subtype_of(Callable[[str], str], Foo))
+static_assert(not is_assignable_to(Callable[[str], str], Foo))
+static_assert(not is_subtype_of(Callable[[CallMeMaybe, int], str], Foo))
+static_assert(not is_assignable_to(Callable[[CallMeMaybe, int], str], Foo))
 
 def h(obj: Callable[[int], str], obj2: Foo, obj3: Callable[[str], str]):
     obj2 = obj
 
-    # TODO: we should emit [invalid-assignment] here because the signature of `obj3` is not assignable
-    # to the declared type of `obj2`
+    # error: [invalid-assignment] "Object of type `(str, /) -> str` is not assignable to `Foo`"
     obj2 = obj3
 
 def satisfies_foo(x: int) -> str:
     return "foo"
 
-static_assert(is_subtype_of(TypeOf[satisfies_foo], Foo))
 static_assert(is_assignable_to(TypeOf[satisfies_foo], Foo))
+static_assert(is_subtype_of(TypeOf[satisfies_foo], Foo))
+
+def doesnt_satisfy_foo(x: str) -> int:
+    return 42
+
+static_assert(not is_assignable_to(TypeOf[doesnt_satisfy_foo], Foo))
+static_assert(not is_subtype_of(TypeOf[doesnt_satisfy_foo], Foo))
+```
+
+Class-literals and generic aliases can also be subtypes of callback protocols:
+
+```py
+from typing import Sequence, TypeVar
+
+static_assert(is_subtype_of(TypeOf[str], Foo))
+
+T = TypeVar("T")
+
+class SequenceMaker(Protocol[T]):
+    def __call__(self, arg: Sequence[T], /) -> Sequence[T]: ...
+
+static_assert(is_subtype_of(TypeOf[list[int]], SequenceMaker[int]))
+
+# TODO: these should pass
+static_assert(is_subtype_of(TypeOf[tuple[str, ...]], SequenceMaker[str]))  # error: [static-assert-error]
+static_assert(is_subtype_of(TypeOf[tuple[str, ...]], SequenceMaker[int | str]))  # error: [static-assert-error]
+```
+
+## Nominal subtyping of protocols
+
+Protocols can participate in nominal subtyping as well as structural subtyping. The main use case
+for this is that it allows users an "escape hatch" to force a type checker to consider another type
+to be a subtype of a given protocol, even if the other type violates the Liskov Substitution
+Principle in some way.
+
+```py
+from typing import Protocol, final
+from ty_extensions import static_assert, is_subtype_of, is_disjoint_from
+
+class X(Protocol):
+    x: int
+
+class YProto(X, Protocol):
+    x: None = None  # TODO: we should emit an error here due to the Liskov violation
+
+@final
+class YNominal(X):
+    x: None = None  # TODO: we should emit an error here due to the Liskov violation
+
+static_assert(is_subtype_of(YProto, X))
+static_assert(is_subtype_of(YNominal, X))
+static_assert(not is_disjoint_from(YProto, X))
+static_assert(not is_disjoint_from(YNominal, X))
+```
+
+A common use case for this behaviour is that a lot of ecosystem code depends on type checkers
+considering `str` to be a subtype of `Container[str]`. From a structural-subtyping perspective, this
+is not the case, since `str.__contains__` only accepts `str`, while the `Container` interface
+specifies that a type must have a `__contains__` method which accepts `object` in order for that
+type to be considered a subtype of `Container`. Nonetheless, `str` has `Container[str]` in its MRO,
+and other type checkers therefore consider it to be a subtype of `Container[str]` -- as such, so do
+we:
+
+```py
+from typing import Container
+
+static_assert(is_subtype_of(str, Container[str]))
+static_assert(not is_disjoint_from(str, Container[str]))
+```
+
+This behaviour can have some counter-intuitive repercussions. For example, one implication of this
+is that not all subtype of `Iterable` are necessarily considered iterable by ty if a given subtype
+violates the Liskov principle (this also matches the behaviour of other type checkers):
+
+```py
+from typing import Iterable
+
+class Foo(Iterable[int]):
+    __iter__ = None
+
+static_assert(is_subtype_of(Foo, Iterable[int]))
+
+def _(x: Foo):
+    for item in x:  # error: [not-iterable]
+        pass
 ```
 
 ## Protocols are never singleton types, and are never single-valued types
@@ -1949,9 +2727,8 @@ class RecursiveNonFullyStatic(Protocol):
     parent: RecursiveNonFullyStatic
     x: Any
 
-# TODO: these should pass, once we take into account types of members
-static_assert(not is_subtype_of(RecursiveFullyStatic, RecursiveNonFullyStatic))  # error: [static-assert-error]
-static_assert(not is_subtype_of(RecursiveNonFullyStatic, RecursiveFullyStatic))  # error: [static-assert-error]
+static_assert(not is_subtype_of(RecursiveFullyStatic, RecursiveNonFullyStatic))
+static_assert(not is_subtype_of(RecursiveNonFullyStatic, RecursiveFullyStatic))
 
 static_assert(is_assignable_to(RecursiveNonFullyStatic, RecursiveNonFullyStatic))
 static_assert(is_assignable_to(RecursiveFullyStatic, RecursiveNonFullyStatic))
@@ -1968,7 +2745,8 @@ class RecursiveOptionalParent(Protocol):
 
 static_assert(is_assignable_to(RecursiveOptionalParent, RecursiveOptionalParent))
 
-static_assert(is_assignable_to(RecursiveNonFullyStatic, RecursiveOptionalParent))
+# Due to invariance of mutable attribute members, neither is assignable to the other
+static_assert(not is_assignable_to(RecursiveNonFullyStatic, RecursiveOptionalParent))
 static_assert(not is_assignable_to(RecursiveOptionalParent, RecursiveNonFullyStatic))
 
 class Other(Protocol):
@@ -2198,6 +2976,133 @@ def f(value: Iterator):
     cast(Iterator, value)  # error: [redundant-cast]
 ```
 
+### Recursive generic protocols
+
+This snippet caused us to stack overflow on an early version of
+<https://github.com/astral-sh/ruff/pull/19866>:
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import Protocol, TypeVar
+
+class A: ...
+
+class Foo[T](Protocol):
+    def x(self) -> "T | Foo[T]": ...
+
+y: A | Foo[A]
+
+# The same thing, but using the legacy syntax:
+
+S = TypeVar("S")
+
+class Bar(Protocol[S]):
+    def x(self) -> "S | Bar[S]": ...
+
+z: S | Bar[S]
+```
+
+### Recursive legacy generic protocol
+
+```py
+from typing import Generic, TypeVar, Protocol
+
+T = TypeVar("T")
+
+class P(Protocol[T]):
+    attr: "P[T] | T"
+
+class A(Generic[T]):
+    attr: T
+
+class B(A[P[int]]):
+    pass
+
+def f(b: B):
+    reveal_type(b)  # revealed: B
+    reveal_type(b.attr)  # revealed: P[int]
+    reveal_type(b.attr.attr)  # revealed: P[int] | int
+```
+
+### Recursive generic protocols with property members
+
+An early version of <https://github.com/astral-sh/ruff/pull/19936> caused stack overflows on this
+snippet:
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import Protocol
+
+class Foo[T]: ...
+
+class A(Protocol):
+    @property
+    def _(self: "A") -> Foo: ...
+
+class B(Protocol):
+    @property
+    def b(self) -> Foo[A]: ...
+
+class C(Undefined): ...  # error: "Name `Undefined` used when not defined"
+
+class D:
+    b: Foo[C]
+
+class E[T: B](Protocol): ...
+
+x: E[D]
+```
+
+### Recursive supertypes of `object`
+
+A recursive protocol can be a supertype of `object` (though it is hard to create such a protocol
+without violating the Liskov Substitution Principle, since all protocols are also subtypes of
+`object`):
+
+```py
+from typing import Protocol
+from ty_extensions import static_assert, is_subtype_of, is_equivalent_to, is_disjoint_from
+
+class HasRepr(Protocol):
+    # TODO: we should emit a diagnostic here complaining about a Liskov violation
+    # (it incompatibly overrides `__repr__` from `object`, a supertype of `HasRepr`)
+    def __repr__(self) -> object: ...
+
+class HasReprRecursive(Protocol):
+    # TODO: we should emit a diagnostic here complaining about a Liskov violation
+    # (it incompatibly overrides `__repr__` from `object`, a supertype of `HasReprRecursive`)
+    def __repr__(self) -> "HasReprRecursive": ...
+
+class HasReprRecursiveAndFoo(Protocol):
+    # TODO: we should emit a diagnostic here complaining about a Liskov violation
+    # (it incompatibly overrides `__repr__` from `object`, a supertype of `HasReprRecursiveAndFoo`)
+    def __repr__(self) -> "HasReprRecursiveAndFoo": ...
+    foo: int
+
+static_assert(is_subtype_of(object, HasRepr))
+static_assert(is_subtype_of(HasRepr, object))
+static_assert(is_equivalent_to(object, HasRepr))
+static_assert(not is_disjoint_from(HasRepr, object))
+
+static_assert(is_subtype_of(object, HasReprRecursive))
+static_assert(is_subtype_of(HasReprRecursive, object))
+static_assert(is_equivalent_to(object, HasReprRecursive))
+static_assert(not is_disjoint_from(HasReprRecursive, object))
+
+static_assert(not is_subtype_of(object, HasReprRecursiveAndFoo))
+static_assert(is_subtype_of(HasReprRecursiveAndFoo, object))
+static_assert(not is_equivalent_to(object, HasReprRecursiveAndFoo))
+static_assert(not is_disjoint_from(HasReprRecursiveAndFoo, object))
+```
+
 ## Meta-protocols
 
 Where `P` is a protocol type, a class object `N` can be said to inhabit the type `type[P]` if:
@@ -2274,7 +3179,7 @@ class Foo(Protocol):
 from stub import Foo
 from ty_extensions import reveal_protocol_interface
 
-# error: [revealed-type] "Revealed protocol interface: `{"x": AttributeMember(`int`; ClassVar)}`"
+# revealed: {"x": AttributeMember(`int`; ClassVar)}
 reveal_protocol_interface(Foo)
 ```
 
@@ -2286,7 +3191,6 @@ Add tests for:
 - Protocols with instance-method members, including:
     - Protocols with methods that have parameters or the return type unannotated
     - Protocols with methods that have parameters or the return type annotated with `Any`
-- Protocols with `@classmethod` and `@staticmethod`
 - Assignability of non-instance types to protocols with instance-method members (e.g. a
     class-literal type can be a subtype of `Sized` if its metaclass has a `__len__` method)
 - Protocols with methods that have annotated `self` parameters.
@@ -2295,7 +3199,6 @@ Add tests for:
 - `super()` on nominal subtypes (explicit and implicit) of protocol classes
 - [Recursive protocols][recursive_protocols_spec]
 - Generic protocols
-- Non-generic protocols with function-scoped generic methods
 - Protocols with instance attributes annotated with `Callable` (can a nominal type with a method
     satisfy that protocol, and if so in what cases?)
 - Protocols decorated with `@final`
diff --git a/crates/ty_python_semantic/resources/mdtest/public_types.md b/crates/ty_python_semantic/resources/mdtest/public_types.md
index 5c481ddaa2..56b6a803c5 100644
--- a/crates/ty_python_semantic/resources/mdtest/public_types.md
+++ b/crates/ty_python_semantic/resources/mdtest/public_types.md
@@ -83,6 +83,18 @@ def outer(flag: bool) -> None:
 
     x = C()
     inner()
+
+def outer(flag: bool) -> None:
+    if flag:
+        x = A()
+    else:
+        x = B()  # this binding of `x` is invisible to `inner`
+        return
+
+    def inner() -> None:
+        reveal_type(x)  # revealed: A | C
+    x = C()
+    inner()
 ```
 
 If a symbol is only conditionally bound, we do not raise any errors:
@@ -186,6 +198,59 @@ def outer(x: A | None):
         inner()
 ```
 
+"Reassignment" here refers to a thing that happens after the closure is defined that can actually
+change the inferred type of a captured symbol. Something done before the closure definition is more
+of a shadowing, and doesn't actually invalidate narrowing.
+
+```py
+def outer() -> None:
+    x = None
+
+    def inner() -> None:
+        # In this scope, `x` may refer to `x = None` or `x = 1`.
+        reveal_type(x)  # revealed: None | Literal[1]
+    inner()
+
+    x = 1
+
+    inner()
+
+    def inner2() -> None:
+        # In this scope, `x = None` appears as being shadowed by `x = 1`.
+        reveal_type(x)  # revealed: Literal[1]
+    inner2()
+
+def outer() -> None:
+    x = None
+
+    x = 1
+
+    def inner() -> None:
+        reveal_type(x)  # revealed: Literal[1, 2]
+    inner()
+
+    x = 2
+
+def outer(x: A | None):
+    if x is None:
+        x = A()
+
+    reveal_type(x)  # revealed: A
+
+    def inner() -> None:
+        reveal_type(x)  # revealed: A
+    inner()
+
+def outer(x: A | None):
+    x = x or A()
+
+    reveal_type(x)  # revealed: A
+
+    def inner() -> None:
+        reveal_type(x)  # revealed: A
+    inner()
+```
+
 ## At module level
 
 The behavior is the same if the outer scope is the global scope of a module:
@@ -198,7 +263,7 @@ if flag():
     x = 1
 
     def f() -> None:
-        reveal_type(x)  # revealed: Unknown | Literal[1, 2]
+        reveal_type(x)  # revealed: Literal[1, 2]
     # Function only used inside this branch
     f()
 
@@ -265,37 +330,17 @@ def outer() -> None:
     inner()
 ```
 
-This is currently even true if the `inner` function is only defined after the second assignment to
-`x`:
+And, in the current implementation, shadowing of module symbols (i.e., symbols exposed to other
+modules) cannot be recognized from lazy scopes.
 
 ```py
-def outer() -> None:
-    x = None
+class A: ...
+class A: ...
 
-    # [additional code here]
-
-    x = 1
-
-    def inner() -> None:
-        # TODO: this should be `Literal[1]`. Mypy and pyright support this.
-        reveal_type(x)  # revealed: None | Literal[1]
-    inner()
-```
-
-A similar case derived from an ecosystem example, involving declared types:
-
-```py
-class C: ...
-
-def outer(x: C | None):
-    x = x or C()
-
-    reveal_type(x)  # revealed: C
-
-    def inner() -> None:
-        # TODO: this should ideally be `C`
-        reveal_type(x)  # revealed: C | None
-    inner()
+def f(x: A):
+    # TODO: no error
+    # error: [invalid-assignment] "Object of type `mdtest_snippet.A @ src/mdtest_snippet.py:12 | mdtest_snippet.A @ src/mdtest_snippet.py:13` is not assignable to `mdtest_snippet.A @ src/mdtest_snippet.py:13`"
+    x = A()
 ```
 
 ### Assignments to nonlocal variables
diff --git a/crates/ty_python_semantic/resources/mdtest/scopes/annotate_global.md b/crates/ty_python_semantic/resources/mdtest/scopes/annotate_global.md
new file mode 100644
index 0000000000..221b92d777
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/annotate_global.md
@@ -0,0 +1,31 @@
+# `__annotate__` as an implicit global is version-gated (Py3.14+)
+
+## Absent before 3.14
+
+`__annotate__` is never present in the global namespace on Python \<3.14.
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+```py
+# error: [unresolved-reference]
+reveal_type(__annotate__)  # revealed: Unknown
+```
+
+## Present in 3.14+
+
+The `__annotate__` global may be present in Python 3.14, but only if at least one global symbol in
+the module is annotated (e.g. `x: int` or `x: int = 42`). Currently we model `__annotate__` as
+always being possibly unbound on Python 3.14+.
+
+```toml
+[environment]
+python-version = "3.14"
+```
+
+```py
+# error: [possibly-unresolved-reference]
+reveal_type(__annotate__)  # revealed: (format: int, /) -> dict[str, Any]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/scopes/builtin.md b/crates/ty_python_semantic/resources/mdtest/scopes/builtin.md
index ae684a22d9..558bf0f117 100644
--- a/crates/ty_python_semantic/resources/mdtest/scopes/builtin.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/builtin.md
@@ -29,8 +29,8 @@ if flag():
     chr: int = 1
 
 def _():
-    # TODO: Should ideally be `Unknown | Literal[1] | (def abs(x: SupportsAbs[_T], /) -> _T)`
-    reveal_type(abs)  # revealed: Unknown | Literal[1]
+    # TODO: Should ideally be `Literal[1] | (def abs(x: SupportsAbs[_T], /) -> _T)`
+    reveal_type(abs)  # revealed: Literal[1]
     # TODO: Should ideally be `int | (def chr(i: SupportsIndex, /) -> str)`
     reveal_type(chr)  # revealed: int
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/scopes/eager.md b/crates/ty_python_semantic/resources/mdtest/scopes/eager.md
index 286f2eb261..4dafacfb96 100644
--- a/crates/ty_python_semantic/resources/mdtest/scopes/eager.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/eager.md
@@ -12,7 +12,7 @@ Function definitions are evaluated lazily.
 x = 1
 
 def f():
-    reveal_type(x)  # revealed: Unknown | Literal[1, 2]
+    reveal_type(x)  # revealed: Literal[1, 2]
 
 x = 2
 ```
@@ -283,7 +283,7 @@ x = 1
 
 def _():
     class C:
-        # revealed: Unknown | Literal[1]
+        # revealed: Literal[1]
         [reveal_type(x) for _ in [1]]
         x = 2
 ```
@@ -389,7 +389,7 @@ x = int
 class C:
     var: ClassVar[x]
 
-reveal_type(C.var)  # revealed: Unknown | int | str
+reveal_type(C.var)  # revealed: int | str
 
 x = str
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/scopes/global.md b/crates/ty_python_semantic/resources/mdtest/scopes/global.md
index e7156e85de..5924852432 100644
--- a/crates/ty_python_semantic/resources/mdtest/scopes/global.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/global.md
@@ -8,7 +8,7 @@ A name reference to a never-defined symbol in a function is implicitly a global
 x = 1
 
 def f():
-    reveal_type(x)  # revealed: Unknown | Literal[1]
+    reveal_type(x)  # revealed: Literal[1]
 ```
 
 ## Explicit global in function
@@ -18,7 +18,7 @@ x = 1
 
 def f():
     global x
-    reveal_type(x)  # revealed: Unknown | Literal[1]
+    reveal_type(x)  # revealed: Literal[1]
 ```
 
 ## Unassignable type in function
@@ -201,7 +201,7 @@ x = 42
 
 def f():
     global x
-    reveal_type(x)  # revealed: Unknown | Literal[42]
+    reveal_type(x)  # revealed: Literal[42]
     x = "56"
     reveal_type(x)  # revealed: Literal["56"]
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/scopes/moduletype_attrs.md b/crates/ty_python_semantic/resources/mdtest/scopes/moduletype_attrs.md
index ddc5527bf8..b9d92d7fed 100644
--- a/crates/ty_python_semantic/resources/mdtest/scopes/moduletype_attrs.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/moduletype_attrs.md
@@ -16,6 +16,8 @@ reveal_type(__doc__)  # revealed: str | None
 reveal_type(__spec__)  # revealed: ModuleSpec | None
 reveal_type(__path__)  # revealed: MutableSequence[str]
 reveal_type(__builtins__)  # revealed: Any
+# error: [possibly-unresolved-reference] "Name `__warningregistry__` used when possibly not defined"
+reveal_type(__warningregistry__)  # revealed: dict[Any, int]
 
 import sys
 
@@ -71,10 +73,12 @@ __spec__ = 42  # error: [invalid-assignment] "Object of type `Literal[42]` is no
 ```py
 import module
 
-reveal_type(module.__file__)  # revealed: Unknown | None
+reveal_type(module.__file__)  # revealed: None
 reveal_type(module.__path__)  # revealed: list[str]
 reveal_type(module.__doc__)  # revealed: Unknown
-reveal_type(module.__spec__)  # revealed: Unknown | ModuleSpec | None
+reveal_type(module.__spec__)  # revealed: ModuleSpec | None
+# error: [unresolved-attribute]
+reveal_type(module.__warningregistry__)  # revealed: Unknown
 
 def nested_scope():
     global __loader__
@@ -93,7 +97,7 @@ inside the module:
 import typing
 
 reveal_type(typing.__name__)  # revealed: str
-reveal_type(typing.__init__)  # revealed: bound method ModuleType.__init__(name: str, doc: str | None = ellipsis) -> None
+reveal_type(typing.__init__)  # revealed: bound method ModuleType.__init__(name: str, doc: str | None = EllipsisType) -> None
 
 # For a stub module, we don't know that `__file__` is a string (at runtime it may be entirely
 # unset, but we follow typeshed here):
diff --git a/crates/ty_python_semantic/resources/mdtest/scopes/unbound.md b/crates/ty_python_semantic/resources/mdtest/scopes/unbound.md
index 8729012093..bf1f81d5c2 100644
--- a/crates/ty_python_semantic/resources/mdtest/scopes/unbound.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/unbound.md
@@ -16,7 +16,7 @@ class C:
     if flag:
         x = 2
 
-# error: [possibly-unbound-attribute] "Attribute `x` on type `<class 'C'>` is possibly unbound"
+# error: [possibly-missing-attribute] "Attribute `x` may be missing on class `C`"
 reveal_type(C.x)  # revealed: Unknown | Literal[2]
 reveal_type(C.y)  # revealed: Unknown | Literal[1]
 ```
@@ -52,7 +52,7 @@ class C:
     elif coinflip():
         x: str = "abc"
 
-# error: [possibly-unbound-attribute]
+# error: [possibly-missing-attribute]
 reveal_type(C.x)  # revealed: int | str
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/all_members.md_-_List_all_members_-_Basic_functionality_(6b9531a70334bfad).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/all_members.md_-_List_all_members_-_Basic_functionality_(6b9531a70334bfad).snap
deleted file mode 100644
index fb31b51fe8..0000000000
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/all_members.md_-_List_all_members_-_Basic_functionality_(6b9531a70334bfad).snap
+++ /dev/null
@@ -1,43 +0,0 @@
----
-source: crates/ty_test/src/lib.rs
-expression: snapshot
----
----
-mdtest name: all_members.md - List all members - Basic functionality
-mdtest path: crates/ty_python_semantic/resources/mdtest/ide_support/all_members.md
----
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | from ty_extensions import static_assert, has_member
- 2 | 
- 3 | static_assert(has_member("a", "replace"))
- 4 | static_assert(has_member("a", "startswith"))
- 5 | static_assert(has_member("a", "isupper"))
- 6 | static_assert(has_member("a", "__add__"))
- 7 | static_assert(has_member("a", "__gt__"))
- 8 | static_assert(has_member("a", "__doc__"))
- 9 | static_assert(has_member("a", "__repr__"))
-10 | static_assert(not has_member("a", "non_existent"))
-11 | from typing_extensions import reveal_type
-12 | from ty_extensions import all_members
-13 | 
-14 | reveal_type(all_members("a"))  # error: [revealed-type]
-```
-
-# Diagnostics
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:13
-   |
-12 | from ty_extensions import all_members
-13 |
-14 | reveal_type(all_members("a"))  # error: [revealed-type]
-   |             ^^^^^^^^^^^^^^^^ `tuple[Literal["__add__"], Literal["__annotations__"], Literal["__class__"], Literal["__contains__"], Literal["__delattr__"], Literal["__dict__"], Literal["__dir__"], Literal["__doc__"], Literal["__eq__"], Literal["__format__"], Literal["__ge__"], Literal["__getattribute__"], Literal["__getitem__"], Literal["__getnewargs__"], Literal["__gt__"], Literal["__hash__"], Literal["__init__"], Literal["__init_subclass__"], Literal["__iter__"], Literal["__le__"], Literal["__len__"], Literal["__lt__"], Literal["__mod__"], Literal["__module__"], Literal["__mul__"], Literal["__ne__"], Literal["__new__"], Literal["__reduce__"], Literal["__reduce_ex__"], Literal["__repr__"], Literal["__reversed__"], Literal["__rmul__"], Literal["__setattr__"], Literal["__sizeof__"], Literal["__str__"], Literal["__subclasshook__"], Literal["capitalize"], Literal["casefold"], Literal["center"], Literal["count"], Literal["encode"], Literal["endswith"], Literal["expandtabs"], Literal["find"], Literal["format"], Literal["format_map"], Literal["index"], Literal["isalnum"], Literal["isalpha"], Literal["isascii"], Literal["isdecimal"], Literal["isdigit"], Literal["isidentifier"], Literal["islower"], Literal["isnumeric"], Literal["isprintable"], Literal["isspace"], Literal["istitle"], Literal["isupper"], Literal["join"], Literal["ljust"], Literal["lower"], Literal["lstrip"], Literal["maketrans"], Literal["partition"], Literal["removeprefix"], Literal["removesuffix"], Literal["replace"], Literal["rfind"], Literal["rindex"], Literal["rjust"], Literal["rpartition"], Literal["rsplit"], Literal["rstrip"], Literal["split"], Literal["splitlines"], Literal["startswith"], Literal["strip"], Literal["swapcase"], Literal["title"], Literal["translate"], Literal["upper"], Literal["zfill"]]`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/assert_never.md_-_`assert_never`_-_Basic_functionality_-_Diagnostics_(be8f5d8b0718ee54).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/assert_never.md_-_`assert_never`_-_Basic_functionality_-_Diagnostics_(be8f5d8b0718ee54).snap
index 8c2ae5522a..a0576b55e0 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/assert_never.md_-_`assert_never`_-_Basic_functionality_-_Diagnostics_(be8f5d8b0718ee54).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/assert_never.md_-_`assert_never`_-_Basic_functionality_-_Diagnostics_(be8f5d8b0718ee54).snap
@@ -25,22 +25,16 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/directives/assert_never.
 11 |     assert_never(None)  # error: [type-assertion-failure]
 12 | 
 13 | def _():
-14 |     assert_never([])  # error: [type-assertion-failure]
+14 |     assert_never(())  # error: [type-assertion-failure]
 15 | 
-16 | def _():
-17 |     assert_never({})  # error: [type-assertion-failure]
+16 | def _(flag: bool, never: Never):
+17 |     assert_never(1 if flag else never)  # error: [type-assertion-failure]
 18 | 
-19 | def _():
-20 |     assert_never(())  # error: [type-assertion-failure]
+19 | def _(any_: Any):
+20 |     assert_never(any_)  # error: [type-assertion-failure]
 21 | 
-22 | def _(flag: bool, never: Never):
-23 |     assert_never(1 if flag else never)  # error: [type-assertion-failure]
-24 | 
-25 | def _(any_: Any):
-26 |     assert_never(any_)  # error: [type-assertion-failure]
-27 | 
-28 | def _(unknown: Unknown):
-29 |     assert_never(unknown)  # error: [type-assertion-failure]
+22 | def _(unknown: Unknown):
+23 |     assert_never(unknown)  # error: [type-assertion-failure]
 ```
 
 # Diagnostics
@@ -101,46 +95,12 @@ error[type-assertion-failure]: Argument does not have asserted type `Never`
   --> src/mdtest_snippet.py:14:5
    |
 13 | def _():
-14 |     assert_never([])  # error: [type-assertion-failure]
-   |     ^^^^^^^^^^^^^--^
-   |                  |
-   |                  Inferred type of argument is `list[Unknown]`
-15 |
-16 | def _():
-   |
-info: `Never` and `list[Unknown]` are not equivalent types
-info: rule `type-assertion-failure` is enabled by default
-
-```
-
-```
-error[type-assertion-failure]: Argument does not have asserted type `Never`
-  --> src/mdtest_snippet.py:17:5
-   |
-16 | def _():
-17 |     assert_never({})  # error: [type-assertion-failure]
-   |     ^^^^^^^^^^^^^--^
-   |                  |
-   |                  Inferred type of argument is `dict[Unknown, Unknown]`
-18 |
-19 | def _():
-   |
-info: `Never` and `dict[Unknown, Unknown]` are not equivalent types
-info: rule `type-assertion-failure` is enabled by default
-
-```
-
-```
-error[type-assertion-failure]: Argument does not have asserted type `Never`
-  --> src/mdtest_snippet.py:20:5
-   |
-19 | def _():
-20 |     assert_never(())  # error: [type-assertion-failure]
+14 |     assert_never(())  # error: [type-assertion-failure]
    |     ^^^^^^^^^^^^^--^
    |                  |
    |                  Inferred type of argument is `tuple[()]`
-21 |
-22 | def _(flag: bool, never: Never):
+15 |
+16 | def _(flag: bool, never: Never):
    |
 info: `Never` and `tuple[()]` are not equivalent types
 info: rule `type-assertion-failure` is enabled by default
@@ -149,15 +109,15 @@ info: rule `type-assertion-failure` is enabled by default
 
 ```
 error[type-assertion-failure]: Argument does not have asserted type `Never`
-  --> src/mdtest_snippet.py:23:5
+  --> src/mdtest_snippet.py:17:5
    |
-22 | def _(flag: bool, never: Never):
-23 |     assert_never(1 if flag else never)  # error: [type-assertion-failure]
+16 | def _(flag: bool, never: Never):
+17 |     assert_never(1 if flag else never)  # error: [type-assertion-failure]
    |     ^^^^^^^^^^^^^--------------------^
    |                  |
    |                  Inferred type of argument is `Literal[1]`
-24 |
-25 | def _(any_: Any):
+18 |
+19 | def _(any_: Any):
    |
 info: `Never` and `Literal[1]` are not equivalent types
 info: rule `type-assertion-failure` is enabled by default
@@ -166,15 +126,15 @@ info: rule `type-assertion-failure` is enabled by default
 
 ```
 error[type-assertion-failure]: Argument does not have asserted type `Never`
-  --> src/mdtest_snippet.py:26:5
+  --> src/mdtest_snippet.py:20:5
    |
-25 | def _(any_: Any):
-26 |     assert_never(any_)  # error: [type-assertion-failure]
+19 | def _(any_: Any):
+20 |     assert_never(any_)  # error: [type-assertion-failure]
    |     ^^^^^^^^^^^^^----^
    |                  |
    |                  Inferred type of argument is `Any`
-27 |
-28 | def _(unknown: Unknown):
+21 |
+22 | def _(unknown: Unknown):
    |
 info: `Never` and `Any` are not equivalent types
 info: rule `type-assertion-failure` is enabled by default
@@ -183,10 +143,10 @@ info: rule `type-assertion-failure` is enabled by default
 
 ```
 error[type-assertion-failure]: Argument does not have asserted type `Never`
-  --> src/mdtest_snippet.py:29:5
+  --> src/mdtest_snippet.py:23:5
    |
-28 | def _(unknown: Unknown):
-29 |     assert_never(unknown)  # error: [type-assertion-failure]
+22 | def _(unknown: Unknown):
+23 |     assert_never(unknown)  # error: [type-assertion-failure]
    |     ^^^^^^^^^^^^^-------^
    |                  |
    |                  Inferred type of argument is `Unknown`
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/assert_type.md_-_`assert_type`_-_Basic_(c507788da2659ec9).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/assert_type.md_-_`assert_type`_-_Basic_(c507788da2659ec9).snap
index 4b9da52c7b..42b1ad283f 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/assert_type.md_-_`assert_type`_-_Basic_(c507788da2659ec9).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/assert_type.md_-_`assert_type`_-_Basic_(c507788da2659ec9).snap
@@ -17,6 +17,7 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/directives/assert_type.m
 3 | def _(x: int):
 4 |     assert_type(x, int)  # fine
 5 |     assert_type(x, str)  # error: [type-assertion-failure]
+6 |     assert_type(assert_type(x, int), int)
 ```
 
 # Diagnostics
@@ -31,6 +32,7 @@ error[type-assertion-failure]: Argument does not have asserted type `str`
   |     ^^^^^^^^^^^^-^^^^^^
   |                 |
   |                 Inferred type of argument is `int`
+6 |     assert_type(assert_type(x, int), int)
   |
 info: `str` and `int` are not equivalent types
 info: rule `type-assertion-failure` is enabled by default
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__aiter__`_metho…_(4fbd80e21774cc23).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__aiter__`_metho…_(4fbd80e21774cc23).snap
index 0953c5286e..e5613631f4 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__aiter__`_metho…_(4fbd80e21774cc23).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__aiter__`_metho…_(4fbd80e21774cc23).snap
@@ -12,41 +12,27 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
 ## mdtest_snippet.py
 
 ```
-1 | from typing_extensions import reveal_type
+1 | class NotAsyncIterable: ...
 2 | 
-3 | class NotAsyncIterable: ...
-4 | 
-5 | async def foo():
-6 |     # error: [not-iterable] "Object of type `NotAsyncIterable` is not async-iterable"
-7 |     async for x in NotAsyncIterable():
-8 |         reveal_type(x)  # revealed: Unknown
+3 | async def foo():
+4 |     # error: [not-iterable] "Object of type `NotAsyncIterable` is not async-iterable"
+5 |     async for x in NotAsyncIterable():
+6 |         reveal_type(x)  # revealed: Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `NotAsyncIterable` is not async-iterable
- --> src/mdtest_snippet.py:7:20
+ --> src/mdtest_snippet.py:5:20
   |
-5 | async def foo():
-6 |     # error: [not-iterable] "Object of type `NotAsyncIterable` is not async-iterable"
-7 |     async for x in NotAsyncIterable():
+3 | async def foo():
+4 |     # error: [not-iterable] "Object of type `NotAsyncIterable` is not async-iterable"
+5 |     async for x in NotAsyncIterable():
   |                    ^^^^^^^^^^^^^^^^^^
-8 |         reveal_type(x)  # revealed: Unknown
+6 |         reveal_type(x)  # revealed: Unknown
   |
 info: It has no `__aiter__` method
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:8:21
-  |
-6 |     # error: [not-iterable] "Object of type `NotAsyncIterable` is not async-iterable"
-7 |     async for x in NotAsyncIterable():
-8 |         reveal_type(x)  # revealed: Unknown
-  |                     ^ `Unknown`
-  |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__anext__`_metho…_(a0b186714127abee).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__anext__`_metho…_(a0b186714127abee).snap
index 6994519044..3123e9df2e 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__anext__`_metho…_(a0b186714127abee).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_No_`__anext__`_metho…_(a0b186714127abee).snap
@@ -12,45 +12,31 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
+ 1 | class NoAnext: ...
  2 | 
- 3 | class NoAnext: ...
- 4 | 
- 5 | class AsyncIterable:
- 6 |     def __aiter__(self) -> NoAnext:
- 7 |         return NoAnext()
- 8 | 
- 9 | async def foo():
-10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-11 |     async for x in AsyncIterable():
-12 |         reveal_type(x)  # revealed: Unknown
+ 3 | class AsyncIterable:
+ 4 |     def __aiter__(self) -> NoAnext:
+ 5 |         return NoAnext()
+ 6 | 
+ 7 | async def foo():
+ 8 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+ 9 |     async for x in AsyncIterable():
+10 |         reveal_type(x)  # revealed: Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `AsyncIterable` is not async-iterable
-  --> src/mdtest_snippet.py:11:20
+  --> src/mdtest_snippet.py:9:20
    |
- 9 | async def foo():
-10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-11 |     async for x in AsyncIterable():
+ 7 | async def foo():
+ 8 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+ 9 |     async for x in AsyncIterable():
    |                    ^^^^^^^^^^^^^^^
-12 |         reveal_type(x)  # revealed: Unknown
+10 |         reveal_type(x)  # revealed: Unknown
    |
 info: Its `__aiter__` method returns an object of type `NoAnext`, which has no `__anext__` method
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:12:21
-   |
-10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-11 |     async for x in AsyncIterable():
-12 |         reveal_type(x)  # revealed: Unknown
-   |                     ^ `Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_missing_`__…_(33924dbae5117216).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_missing_`__…_(33924dbae5117216).snap
new file mode 100644
index 0000000000..e3197f030d
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_missing_`__…_(33924dbae5117216).snap
@@ -0,0 +1,44 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: async_for.md - Async - Error cases - Possibly missing `__aiter__` method
+mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | async def foo(flag: bool):
+ 2 |     class AsyncIterable:
+ 3 |         async def __anext__(self) -> int:
+ 4 |             return 42
+ 5 | 
+ 6 |     class PossiblyUnboundAiter:
+ 7 |         if flag:
+ 8 |             def __aiter__(self) -> AsyncIterable:
+ 9 |                 return AsyncIterable()
+10 | 
+11 |     # error: "Object of type `PossiblyUnboundAiter` may not be async-iterable"
+12 |     async for x in PossiblyUnboundAiter():
+13 |         reveal_type(x)  # revealed: int
+```
+
+# Diagnostics
+
+```
+error[not-iterable]: Object of type `PossiblyUnboundAiter` may not be async-iterable
+  --> src/mdtest_snippet.py:12:20
+   |
+11 |     # error: "Object of type `PossiblyUnboundAiter` may not be async-iterable"
+12 |     async for x in PossiblyUnboundAiter():
+   |                    ^^^^^^^^^^^^^^^^^^^^^^
+13 |         reveal_type(x)  # revealed: int
+   |
+info: Its `__aiter__` attribute (with type `bound method PossiblyUnboundAiter.__aiter__() -> AsyncIterable`) may not be callable
+info: rule `not-iterable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_missing_`__…_(e2600ca4708d9e54).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_missing_`__…_(e2600ca4708d9e54).snap
new file mode 100644
index 0000000000..c563eca460
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_missing_`__…_(e2600ca4708d9e54).snap
@@ -0,0 +1,44 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: async_for.md - Async - Error cases - Possibly missing `__anext__` method
+mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | async def foo(flag: bool):
+ 2 |     class PossiblyUnboundAnext:
+ 3 |         if flag:
+ 4 |             async def __anext__(self) -> int:
+ 5 |                 return 42
+ 6 | 
+ 7 |     class AsyncIterable:
+ 8 |         def __aiter__(self) -> PossiblyUnboundAnext:
+ 9 |             return PossiblyUnboundAnext()
+10 | 
+11 |     # error: [not-iterable] "Object of type `AsyncIterable` may not be async-iterable"
+12 |     async for x in AsyncIterable():
+13 |         reveal_type(x)  # revealed: int
+```
+
+# Diagnostics
+
+```
+error[not-iterable]: Object of type `AsyncIterable` may not be async-iterable
+  --> src/mdtest_snippet.py:12:20
+   |
+11 |     # error: [not-iterable] "Object of type `AsyncIterable` may not be async-iterable"
+12 |     async for x in AsyncIterable():
+   |                    ^^^^^^^^^^^^^^^
+13 |         reveal_type(x)  # revealed: int
+   |
+info: Its `__aiter__` method returns an object of type `PossiblyUnboundAnext`, which may not have a `__anext__` method
+info: rule `not-iterable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_unbound_`__…_(42b1d61a2b7be1b5).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_unbound_`__…_(42b1d61a2b7be1b5).snap
deleted file mode 100644
index c41a49507e..0000000000
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_unbound_`__…_(42b1d61a2b7be1b5).snap
+++ /dev/null
@@ -1,58 +0,0 @@
----
-source: crates/ty_test/src/lib.rs
-expression: snapshot
----
----
-mdtest name: async_for.md - Async - Error cases - Possibly unbound `__aiter__` method
-mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
----
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | async def foo(flag: bool):
- 4 |     class AsyncIterable:
- 5 |         async def __anext__(self) -> int:
- 6 |             return 42
- 7 | 
- 8 |     class PossiblyUnboundAiter:
- 9 |         if flag:
-10 |             def __aiter__(self) -> AsyncIterable:
-11 |                 return AsyncIterable()
-12 | 
-13 |     # error: "Object of type `PossiblyUnboundAiter` may not be async-iterable"
-14 |     async for x in PossiblyUnboundAiter():
-15 |         reveal_type(x)  # revealed: int
-```
-
-# Diagnostics
-
-```
-error[not-iterable]: Object of type `PossiblyUnboundAiter` may not be async-iterable
-  --> src/mdtest_snippet.py:14:20
-   |
-13 |     # error: "Object of type `PossiblyUnboundAiter` may not be async-iterable"
-14 |     async for x in PossiblyUnboundAiter():
-   |                    ^^^^^^^^^^^^^^^^^^^^^^
-15 |         reveal_type(x)  # revealed: int
-   |
-info: Its `__aiter__` attribute (with type `bound method PossiblyUnboundAiter.__aiter__() -> AsyncIterable`) may not be callable
-info: rule `not-iterable` is enabled by default
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:15:21
-   |
-13 |     # error: "Object of type `PossiblyUnboundAiter` may not be async-iterable"
-14 |     async for x in PossiblyUnboundAiter():
-15 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_unbound_`__…_(74ad2f945cad6ed8).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_unbound_`__…_(74ad2f945cad6ed8).snap
deleted file mode 100644
index 4060670bd9..0000000000
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Possibly_unbound_`__…_(74ad2f945cad6ed8).snap
+++ /dev/null
@@ -1,58 +0,0 @@
----
-source: crates/ty_test/src/lib.rs
-expression: snapshot
----
----
-mdtest name: async_for.md - Async - Error cases - Possibly unbound `__anext__` method
-mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
----
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | async def foo(flag: bool):
- 4 |     class PossiblyUnboundAnext:
- 5 |         if flag:
- 6 |             async def __anext__(self) -> int:
- 7 |                 return 42
- 8 | 
- 9 |     class AsyncIterable:
-10 |         def __aiter__(self) -> PossiblyUnboundAnext:
-11 |             return PossiblyUnboundAnext()
-12 | 
-13 |     # error: [not-iterable] "Object of type `AsyncIterable` may not be async-iterable"
-14 |     async for x in AsyncIterable():
-15 |         reveal_type(x)  # revealed: int
-```
-
-# Diagnostics
-
-```
-error[not-iterable]: Object of type `AsyncIterable` may not be async-iterable
-  --> src/mdtest_snippet.py:14:20
-   |
-13 |     # error: [not-iterable] "Object of type `AsyncIterable` may not be async-iterable"
-14 |     async for x in AsyncIterable():
-   |                    ^^^^^^^^^^^^^^^
-15 |         reveal_type(x)  # revealed: int
-   |
-info: Its `__aiter__` method returns an object of type `PossiblyUnboundAnext`, which may not have a `__anext__` method
-info: rule `not-iterable` is enabled by default
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:15:21
-   |
-13 |     # error: [not-iterable] "Object of type `AsyncIterable` may not be async-iterable"
-14 |     async for x in AsyncIterable():
-15 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Synchronously_iterab…_(80fa705b1c61d982).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Synchronously_iterab…_(80fa705b1c61d982).snap
index 29e0d262df..74d072df7c 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Synchronously_iterab…_(80fa705b1c61d982).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Synchronously_iterab…_(80fa705b1c61d982).snap
@@ -12,46 +12,32 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | async def foo():
- 4 |     class Iterator:
- 5 |         def __next__(self) -> int:
- 6 |             return 42
- 7 | 
- 8 |     class Iterable:
- 9 |         def __iter__(self) -> Iterator:
-10 |             return Iterator()
-11 | 
-12 |     # error: [not-iterable] "Object of type `Iterator` is not async-iterable"
-13 |     async for x in Iterator():
-14 |         reveal_type(x)  # revealed: Unknown
+ 1 | async def foo():
+ 2 |     class Iterator:
+ 3 |         def __next__(self) -> int:
+ 4 |             return 42
+ 5 | 
+ 6 |     class Iterable:
+ 7 |         def __iter__(self) -> Iterator:
+ 8 |             return Iterator()
+ 9 | 
+10 |     # error: [not-iterable] "Object of type `Iterator` is not async-iterable"
+11 |     async for x in Iterator():
+12 |         reveal_type(x)  # revealed: Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterator` is not async-iterable
-  --> src/mdtest_snippet.py:13:20
+  --> src/mdtest_snippet.py:11:20
    |
-12 |     # error: [not-iterable] "Object of type `Iterator` is not async-iterable"
-13 |     async for x in Iterator():
+10 |     # error: [not-iterable] "Object of type `Iterator` is not async-iterable"
+11 |     async for x in Iterator():
    |                    ^^^^^^^^^^
-14 |         reveal_type(x)  # revealed: Unknown
+12 |         reveal_type(x)  # revealed: Unknown
    |
 info: It has no `__aiter__` method
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:21
-   |
-12 |     # error: [not-iterable] "Object of type `Iterator` is not async-iterable"
-13 |     async for x in Iterator():
-14 |         reveal_type(x)  # revealed: Unknown
-   |                     ^ `Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(b614724363eec343).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(b614724363eec343).snap
index 33e475d546..290aed4af8 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(b614724363eec343).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(b614724363eec343).snap
@@ -12,48 +12,34 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class AsyncIterator:
- 4 |     async def __anext__(self, arg: int) -> int:  # wrong
- 5 |         return 42
- 6 | 
- 7 | class AsyncIterable:
- 8 |     def __aiter__(self) -> AsyncIterator:
- 9 |         return AsyncIterator()
-10 | 
-11 | async def foo():
-12 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-13 |     async for x in AsyncIterable():
-14 |         reveal_type(x)  # revealed: int
+ 1 | class AsyncIterator:
+ 2 |     async def __anext__(self, arg: int) -> int:  # wrong
+ 3 |         return 42
+ 4 | 
+ 5 | class AsyncIterable:
+ 6 |     def __aiter__(self) -> AsyncIterator:
+ 7 |         return AsyncIterator()
+ 8 | 
+ 9 | async def foo():
+10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+11 |     async for x in AsyncIterable():
+12 |         reveal_type(x)  # revealed: int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `AsyncIterable` is not async-iterable
-  --> src/mdtest_snippet.py:13:20
+  --> src/mdtest_snippet.py:11:20
    |
-11 | async def foo():
-12 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-13 |     async for x in AsyncIterable():
+ 9 | async def foo():
+10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+11 |     async for x in AsyncIterable():
    |                    ^^^^^^^^^^^^^^^
-14 |         reveal_type(x)  # revealed: int
+12 |         reveal_type(x)  # revealed: int
    |
 info: Its `__aiter__` method returns an object of type `AsyncIterator`, which has an invalid `__anext__` method
 info: Expected signature for `__anext__` is `def __anext__(self): ...`
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:21
-   |
-12 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-13 |     async for x in AsyncIterable():
-14 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(e1f3e9275d0a367).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(e1f3e9275d0a367).snap
index 3373f0d4ae..6dd3a1bfa0 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(e1f3e9275d0a367).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/async_for.md_-_Async_-_Error_cases_-_Wrong_signature_for_…_(e1f3e9275d0a367).snap
@@ -12,48 +12,34 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/async_for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class AsyncIterator:
- 4 |     async def __anext__(self) -> int:
- 5 |         return 42
- 6 | 
- 7 | class AsyncIterable:
- 8 |     def __aiter__(self, arg: int) -> AsyncIterator:  # wrong
- 9 |         return AsyncIterator()
-10 | 
-11 | async def foo():
-12 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-13 |     async for x in AsyncIterable():
-14 |         reveal_type(x)  # revealed: int
+ 1 | class AsyncIterator:
+ 2 |     async def __anext__(self) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | class AsyncIterable:
+ 6 |     def __aiter__(self, arg: int) -> AsyncIterator:  # wrong
+ 7 |         return AsyncIterator()
+ 8 | 
+ 9 | async def foo():
+10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+11 |     async for x in AsyncIterable():
+12 |         reveal_type(x)  # revealed: int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `AsyncIterable` is not async-iterable
-  --> src/mdtest_snippet.py:13:20
+  --> src/mdtest_snippet.py:11:20
    |
-11 | async def foo():
-12 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-13 |     async for x in AsyncIterable():
+ 9 | async def foo():
+10 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+11 |     async for x in AsyncIterable():
    |                    ^^^^^^^^^^^^^^^
-14 |         reveal_type(x)  # revealed: int
+12 |         reveal_type(x)  # revealed: int
    |
 info: Its `__aiter__` method has an invalid signature
 info: Expected signature `def __aiter__(self): ...`
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:21
-   |
-12 |     # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
-13 |     async for x in AsyncIterable():
-14 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/attribute_assignment…_-_Attribute_assignment_-_Possibly-unbound_att…_(e5bdf78c427cb7fc).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/attribute_assignment…_-_Attribute_assignment_-_Possibly-missing_att…_(e603e3da35f55c73).snap
similarity index 52%
rename from crates/ty_python_semantic/resources/mdtest/snapshots/attribute_assignment…_-_Attribute_assignment_-_Possibly-unbound_att…_(e5bdf78c427cb7fc).snap
rename to crates/ty_python_semantic/resources/mdtest/snapshots/attribute_assignment…_-_Attribute_assignment_-_Possibly-missing_att…_(e603e3da35f55c73).snap
index 369a67a256..420b92e5a7 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/attribute_assignment…_-_Attribute_assignment_-_Possibly-unbound_att…_(e5bdf78c427cb7fc).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/attribute_assignment…_-_Attribute_assignment_-_Possibly-missing_att…_(e603e3da35f55c73).snap
@@ -3,7 +3,7 @@ source: crates/ty_test/src/lib.rs
 expression: snapshot
 ---
 ---
-mdtest name: attribute_assignment.md - Attribute assignment - Possibly-unbound attributes
+mdtest name: attribute_assignment.md - Attribute assignment - Possibly-missing attributes
 mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/attribute_assignment.md
 ---
 
@@ -17,37 +17,37 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/attribute_as
 3 |         if flag:
 4 |             attr: int = 0
 5 | 
-6 |     C.attr = 1  # error: [possibly-unbound-attribute]
+6 |     C.attr = 1  # error: [possibly-missing-attribute]
 7 | 
 8 |     instance = C()
-9 |     instance.attr = 1  # error: [possibly-unbound-attribute]
+9 |     instance.attr = 1  # error: [possibly-missing-attribute]
 ```
 
 # Diagnostics
 
 ```
-warning[possibly-unbound-attribute]: Attribute `attr` on type `<class 'C'>` is possibly unbound
+warning[possibly-missing-attribute]: Attribute `attr` may be missing on class `C`
  --> src/mdtest_snippet.py:6:5
   |
 4 |             attr: int = 0
 5 |
-6 |     C.attr = 1  # error: [possibly-unbound-attribute]
+6 |     C.attr = 1  # error: [possibly-missing-attribute]
   |     ^^^^^^
 7 |
 8 |     instance = C()
   |
-info: rule `possibly-unbound-attribute` is enabled by default
+info: rule `possibly-missing-attribute` is enabled by default
 
 ```
 
 ```
-warning[possibly-unbound-attribute]: Attribute `attr` on type `C` is possibly unbound
+warning[possibly-missing-attribute]: Attribute `attr` may be missing on object of type `C`
  --> src/mdtest_snippet.py:9:5
   |
 8 |     instance = C()
-9 |     instance.attr = 1  # error: [possibly-unbound-attribute]
+9 |     instance.attr = 1  # error: [possibly-missing-attribute]
   |     ^^^^^^^^^^^^^
   |
-info: rule `possibly-unbound-attribute` is enabled by default
+info: rule `possibly-missing-attribute` is enabled by default
 
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/attributes.md_-_Attributes_-_Attributes_of_standa…_(49ba2c9016d64653).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/attributes.md_-_Attributes_-_Attributes_of_standa…_(49ba2c9016d64653).snap
new file mode 100644
index 0000000000..a1cd9d301c
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/attributes.md_-_Attributes_-_Attributes_of_standa…_(49ba2c9016d64653).snap
@@ -0,0 +1,51 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: attributes.md - Attributes - Attributes of standard library modules that aren't yet defined
+mdtest path: crates/ty_python_semantic/resources/mdtest/attributes.md
+---
+
+# Python source files
+
+## main.py
+
+```
+1 | import datetime
+2 | 
+3 | # error: [unresolved-attribute]
+4 | reveal_type(datetime.UTC)  # revealed: Unknown
+5 | # error: [unresolved-attribute]
+6 | reveal_type(datetime.fakenotreal)  # revealed: Unknown
+```
+
+# Diagnostics
+
+```
+error[unresolved-attribute]: Module `datetime` has no member `UTC`
+ --> src/main.py:4:13
+  |
+3 | # error: [unresolved-attribute]
+4 | reveal_type(datetime.UTC)  # revealed: Unknown
+  |             ^^^^^^^^^^^^
+5 | # error: [unresolved-attribute]
+6 | reveal_type(datetime.fakenotreal)  # revealed: Unknown
+  |
+info: Python 3.10 was assumed when accessing `UTC` because it was specified on the command line
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[unresolved-attribute]: Module `datetime` has no member `fakenotreal`
+ --> src/main.py:6:13
+  |
+4 | reveal_type(datetime.UTC)  # revealed: Unknown
+5 | # error: [unresolved-attribute]
+6 | reveal_type(datetime.fakenotreal)  # revealed: Unknown
+  |             ^^^^^^^^^^^^^^^^^^^^
+  |
+info: rule `unresolved-attribute` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Attempting_to_import…_(dba22bd97137ee38).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Attempting_to_import…_(dba22bd97137ee38).snap
new file mode 100644
index 0000000000..cc712bb06e
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Attempting_to_import…_(dba22bd97137ee38).snap
@@ -0,0 +1,83 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: basic.md - Structures - Attempting to import a stdlib submodule when both parts haven't yet been added
+mdtest path: crates/ty_python_semantic/resources/mdtest/import/basic.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | import compression.zstd  # error: [unresolved-import]
+2 | from compression import zstd  # error: [unresolved-import]
+3 | import compression.fakebutwhocansay  # error: [unresolved-import]
+4 | from compression import fakebutwhocansay  # error: [unresolved-import]
+```
+
+# Diagnostics
+
+```
+error[unresolved-import]: Cannot resolve imported module `compression.zstd`
+ --> src/mdtest_snippet.py:1:8
+  |
+1 | import compression.zstd  # error: [unresolved-import]
+  |        ^^^^^^^^^^^^^^^^
+2 | from compression import zstd  # error: [unresolved-import]
+3 | import compression.fakebutwhocansay  # error: [unresolved-import]
+  |
+info: The stdlib module `compression` is only available on Python 3.14+
+info: Python 3.10 was assumed when resolving modules because it was specified on the command line
+info: rule `unresolved-import` is enabled by default
+
+```
+
+```
+error[unresolved-import]: Cannot resolve imported module `compression`
+ --> src/mdtest_snippet.py:2:6
+  |
+1 | import compression.zstd  # error: [unresolved-import]
+2 | from compression import zstd  # error: [unresolved-import]
+  |      ^^^^^^^^^^^
+3 | import compression.fakebutwhocansay  # error: [unresolved-import]
+4 | from compression import fakebutwhocansay  # error: [unresolved-import]
+  |
+info: The stdlib module `compression` is only available on Python 3.14+
+info: Python 3.10 was assumed when resolving modules because it was specified on the command line
+info: rule `unresolved-import` is enabled by default
+
+```
+
+```
+error[unresolved-import]: Cannot resolve imported module `compression.fakebutwhocansay`
+ --> src/mdtest_snippet.py:3:8
+  |
+1 | import compression.zstd  # error: [unresolved-import]
+2 | from compression import zstd  # error: [unresolved-import]
+3 | import compression.fakebutwhocansay  # error: [unresolved-import]
+  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 | from compression import fakebutwhocansay  # error: [unresolved-import]
+  |
+info: The stdlib module `compression` is only available on Python 3.14+
+info: Python 3.10 was assumed when resolving modules because it was specified on the command line
+info: rule `unresolved-import` is enabled by default
+
+```
+
+```
+error[unresolved-import]: Cannot resolve imported module `compression`
+ --> src/mdtest_snippet.py:4:6
+  |
+2 | from compression import zstd  # error: [unresolved-import]
+3 | import compression.fakebutwhocansay  # error: [unresolved-import]
+4 | from compression import fakebutwhocansay  # error: [unresolved-import]
+  |      ^^^^^^^^^^^
+  |
+info: The stdlib module `compression` is only available on Python 3.14+
+info: Python 3.10 was assumed when resolving modules because it was specified on the command line
+info: rule `unresolved-import` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Multiple_objects_imp…_(cbfbf5ff94e6e104).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Multiple_objects_imp…_(cbfbf5ff94e6e104).snap
index 13b63a659f..79600310ea 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Multiple_objects_imp…_(cbfbf5ff94e6e104).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Multiple_objects_imp…_(cbfbf5ff94e6e104).snap
@@ -26,6 +26,9 @@ error[unresolved-import]: Cannot resolve imported module `does_not_exist`
 2 | from does_not_exist import foo, bar, baz
   |      ^^^^^^^^^^^^^^
   |
+info: Searched in the following paths during module resolution:
+info:   1. /src (first-party code)
+info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
 info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
 info: rule `unresolved-import` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_module_…_(846453deaca1071c).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_module_…_(846453deaca1071c).snap
index faa9a6155f..af7b769b1f 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_module_…_(846453deaca1071c).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_module_…_(846453deaca1071c).snap
@@ -24,6 +24,9 @@ error[unresolved-import]: Cannot resolve imported module `zqzqzqzqzqzqzq`
 1 | import zqzqzqzqzqzqzq  # error: [unresolved-import] "Cannot resolve imported module `zqzqzqzqzqzqzq`"
   |        ^^^^^^^^^^^^^^
   |
+info: Searched in the following paths during module resolution:
+info:   1. /src (first-party code)
+info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
 info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
 info: rule `unresolved-import` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_submodu…_(4fad4be9778578b7).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_submodu…_(4fad4be9778578b7).snap
index 1bbe221bb7..f6ecd692f3 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_submodu…_(4fad4be9778578b7).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/basic.md_-_Structures_-_Unresolvable_submodu…_(4fad4be9778578b7).snap
@@ -36,6 +36,9 @@ error[unresolved-import]: Cannot resolve imported module `a.foo`
 3 |
 4 | # Topmost component unresolvable:
   |
+info: Searched in the following paths during module resolution:
+info:   1. /src (first-party code)
+info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
 info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
 info: rule `unresolved-import` is enabled by default
 
@@ -49,6 +52,9 @@ error[unresolved-import]: Cannot resolve imported module `b.foo`
 5 | import b.foo  # error: [unresolved-import] "Cannot resolve imported module `b.foo`"
   |        ^^^^^
   |
+info: Searched in the following paths during module resolution:
+info:   1. /src (first-party code)
+info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
 info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
 info: rule `unresolved-import` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/dataclasses.md_-_Dataclasses_-_`dataclasses.KW_ONLY…_(dd1b8f2f71487f16).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/dataclasses.md_-_Dataclasses_-_`dataclasses.KW_ONLY…_(dd1b8f2f71487f16).snap
index 2cd0c99649..02328d725a 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/dataclasses.md_-_Dataclasses_-_`dataclasses.KW_ONLY…_(dd1b8f2f71487f16).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/dataclasses.md_-_Dataclasses_-_`dataclasses.KW_ONLY…_(dd1b8f2f71487f16).snap
@@ -13,86 +13,71 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/dataclasses/dataclasses.
 
 ```
  1 | from dataclasses import dataclass, field, KW_ONLY
- 2 | from typing_extensions import reveal_type
- 3 | 
- 4 | @dataclass
- 5 | class C:
- 6 |     x: int
- 7 |     _: KW_ONLY
- 8 |     y: str
- 9 | 
-10 | reveal_type(C.__init__)  # revealed: (self: C, x: int, *, y: str) -> None
-11 | 
-12 | # error: [missing-argument]
-13 | # error: [too-many-positional-arguments]
-14 | C(3, "")
-15 | 
-16 | C(3, y="")
-17 | @dataclass
-18 | class Fails:  # error: [duplicate-kw-only]
-19 |     a: int
-20 |     b: KW_ONLY
-21 |     c: str
-22 |     d: KW_ONLY
-23 |     e: bytes
-24 | 
-25 | reveal_type(Fails.__init__)  # revealed: (self: Fails, a: int, *, c: str, e: bytes) -> None
-26 | def flag() -> bool:
-27 |     return True
-28 | 
-29 | @dataclass
-30 | class D:  # error: [duplicate-kw-only]
-31 |     x: int
-32 |     _1: KW_ONLY
-33 | 
-34 |     if flag():
-35 |         y: str
-36 |         _2: KW_ONLY
-37 |         z: float
-38 | from dataclasses import dataclass, KW_ONLY
-39 | 
-40 | @dataclass
-41 | class D:
-42 |     x: int
-43 |     _: KW_ONLY
-44 |     y: str
-45 | 
-46 | @dataclass
-47 | class E(D):
-48 |     z: bytes
-49 | 
-50 | # This should work: x=1 (positional), z=b"foo" (positional), y="foo" (keyword-only)
-51 | E(1, b"foo", y="foo")
-52 | 
-53 | reveal_type(E.__init__)  # revealed: (self: E, x: int, z: bytes, *, y: str) -> None
+ 2 | 
+ 3 | @dataclass
+ 4 | class C:
+ 5 |     x: int
+ 6 |     _: KW_ONLY
+ 7 |     y: str
+ 8 | 
+ 9 | reveal_type(C.__init__)  # revealed: (self: C, x: int, *, y: str) -> None
+10 | 
+11 | # error: [missing-argument]
+12 | # error: [too-many-positional-arguments]
+13 | C(3, "")
+14 | 
+15 | C(3, y="")
+16 | @dataclass
+17 | class Fails:  # error: [duplicate-kw-only]
+18 |     a: int
+19 |     b: KW_ONLY
+20 |     c: str
+21 |     d: KW_ONLY
+22 |     e: bytes
+23 | 
+24 | reveal_type(Fails.__init__)  # revealed: (self: Fails, a: int, *, c: str, e: bytes) -> None
+25 | def flag() -> bool:
+26 |     return True
+27 | 
+28 | @dataclass
+29 | class D:  # error: [duplicate-kw-only]
+30 |     x: int
+31 |     _1: KW_ONLY
+32 | 
+33 |     if flag():
+34 |         y: str
+35 |         _2: KW_ONLY
+36 |         z: float
+37 | from dataclasses import dataclass, KW_ONLY
+38 | 
+39 | @dataclass
+40 | class D:
+41 |     x: int
+42 |     _: KW_ONLY
+43 |     y: str
+44 | 
+45 | @dataclass
+46 | class E(D):
+47 |     z: bytes
+48 | 
+49 | # This should work: x=1 (positional), z=b"foo" (positional), y="foo" (keyword-only)
+50 | E(1, b"foo", y="foo")
+51 | 
+52 | reveal_type(E.__init__)  # revealed: (self: E, x: int, z: bytes, *, y: str) -> None
 ```
 
 # Diagnostics
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:10:13
-   |
- 8 |     y: str
- 9 |
-10 | reveal_type(C.__init__)  # revealed: (self: C, x: int, *, y: str) -> None
-   |             ^^^^^^^^^^ `(self: C, x: int, *, y: str) -> None`
-11 |
-12 | # error: [missing-argument]
-   |
-
-```
-
 ```
 error[missing-argument]: No argument provided for required parameter `y`
-  --> src/mdtest_snippet.py:14:1
+  --> src/mdtest_snippet.py:13:1
    |
-12 | # error: [missing-argument]
-13 | # error: [too-many-positional-arguments]
-14 | C(3, "")
+11 | # error: [missing-argument]
+12 | # error: [too-many-positional-arguments]
+13 | C(3, "")
    | ^^^^^^^^
-15 |
-16 | C(3, y="")
+14 |
+15 | C(3, y="")
    |
 info: rule `missing-argument` is enabled by default
 
@@ -100,14 +85,14 @@ info: rule `missing-argument` is enabled by default
 
 ```
 error[too-many-positional-arguments]: Too many positional arguments: expected 1, got 2
-  --> src/mdtest_snippet.py:14:6
+  --> src/mdtest_snippet.py:13:6
    |
-12 | # error: [missing-argument]
-13 | # error: [too-many-positional-arguments]
-14 | C(3, "")
+11 | # error: [missing-argument]
+12 | # error: [too-many-positional-arguments]
+13 | C(3, "")
    |      ^^
-15 |
-16 | C(3, y="")
+14 |
+15 | C(3, y="")
    |
 info: rule `too-many-positional-arguments` is enabled by default
 
@@ -115,57 +100,31 @@ info: rule `too-many-positional-arguments` is enabled by default
 
 ```
 error[duplicate-kw-only]: Dataclass has more than one field annotated with `KW_ONLY`
-  --> src/mdtest_snippet.py:18:7
+  --> src/mdtest_snippet.py:17:7
    |
-16 | C(3, y="")
-17 | @dataclass
-18 | class Fails:  # error: [duplicate-kw-only]
+15 | C(3, y="")
+16 | @dataclass
+17 | class Fails:  # error: [duplicate-kw-only]
    |       ^^^^^
-19 |     a: int
-20 |     b: KW_ONLY
+18 |     a: int
+19 |     b: KW_ONLY
    |
 info: `KW_ONLY` fields: `b`, `d`
 info: rule `duplicate-kw-only` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:25:13
-   |
-23 |     e: bytes
-24 |
-25 | reveal_type(Fails.__init__)  # revealed: (self: Fails, a: int, *, c: str, e: bytes) -> None
-   |             ^^^^^^^^^^^^^^ `(self: Fails, a: int, *, c: str, e: bytes) -> None`
-26 | def flag() -> bool:
-27 |     return True
-   |
-
-```
-
 ```
 error[duplicate-kw-only]: Dataclass has more than one field annotated with `KW_ONLY`
-  --> src/mdtest_snippet.py:30:7
+  --> src/mdtest_snippet.py:29:7
    |
-29 | @dataclass
-30 | class D:  # error: [duplicate-kw-only]
+28 | @dataclass
+29 | class D:  # error: [duplicate-kw-only]
    |       ^
-31 |     x: int
-32 |     _1: KW_ONLY
+30 |     x: int
+31 |     _1: KW_ONLY
    |
 info: `KW_ONLY` fields: `_1`, `_2`
 info: rule `duplicate-kw-only` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:53:13
-   |
-51 | E(1, b"foo", y="foo")
-52 |
-53 | reveal_type(E.__init__)  # revealed: (self: E, x: int, z: bytes, *, y: str) -> None
-   |             ^^^^^^^^^^ `(self: E, x: int, z: bytes, *, y: str) -> None`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/deprecated.md_-_Tests_for_the_`@depr…_-_Syntax_(142fa2948c3c6cf1).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/deprecated.md_-_Tests_for_the_`@depr…_-_Syntax_(142fa2948c3c6cf1).snap
index ac29feddc9..78cbed24b6 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/deprecated.md_-_Tests_for_the_`@depr…_-_Syntax_(142fa2948c3c6cf1).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/deprecated.md_-_Tests_for_the_`@depr…_-_Syntax_(142fa2948c3c6cf1).snap
@@ -90,6 +90,16 @@ error[missing-argument]: No argument provided for required parameter `arg` of bo
   | ^^^^^^^^^^^^^^
 7 | from typing_extensions import deprecated
   |
+info: Parameter declared here
+    --> stdlib/typing_extensions.pyi:1000:28
+     |
+ 998 |         stacklevel: int
+ 999 |         def __init__(self, message: LiteralString, /, *, category: type[Warning] | None = ..., stacklevel: int = 1) -> None: ...
+1000 |         def __call__(self, arg: _T, /) -> _T: ...
+     |                            ^^^^^^^
+1001 |
+1002 |     @final
+     |
 info: rule `missing-argument` is enabled by default
 
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/descriptor_protocol.…_-_Descriptor_protocol_-_Special_descriptors_-_Properties_with_no_s…_(176795bc1727dda7).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/descriptor_protocol.…_-_Descriptor_protocol_-_Special_descriptors_-_Properties_with_no_s…_(176795bc1727dda7).snap
new file mode 100644
index 0000000000..3590d7e0ec
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/descriptor_protocol.…_-_Descriptor_protocol_-_Special_descriptors_-_Properties_with_no_s…_(176795bc1727dda7).snap
@@ -0,0 +1,40 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: descriptor_protocol.md - Descriptor protocol - Special descriptors - Properties with no setters
+mdtest path: crates/ty_python_semantic/resources/mdtest/descriptor_protocol.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | class DontAssignToMe:
+2 |     @property
+3 |     def immutable(self): ...
+4 | 
+5 | # error: [invalid-assignment]
+6 | DontAssignToMe().immutable = "the properties, they are a-changing"
+```
+
+# Diagnostics
+
+```
+error[invalid-assignment]: Cannot assign to read-only property `immutable` on object of type `DontAssignToMe`
+ --> src/mdtest_snippet.py:3:9
+  |
+1 | class DontAssignToMe:
+2 |     @property
+3 |     def immutable(self): ...
+  |         --------- Property `DontAssignToMe.immutable` defined here with no setter
+4 |
+5 | # error: [invalid-assignment]
+6 | DontAssignToMe().immutable = "the properties, they are a-changing"
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^ Attempted assignment to `DontAssignToMe.immutable` here
+  |
+info: rule `invalid-assignment` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_me…_(3ffe352bb3a76715).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_me…_(3ffe352bb3a76715).snap
index a9104c6526..35b07a080c 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_me…_(3ffe352bb3a76715).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_me…_(3ffe352bb3a76715).snap
@@ -12,44 +12,30 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class Iterable:
- 4 |     # invalid because it will implicitly be passed an `int`
- 5 |     # by the interpreter
- 6 |     def __getitem__(self, key: str) -> int:
- 7 |         return 42
- 8 | 
- 9 | # error: [not-iterable]
-10 | for x in Iterable():
-11 |     reveal_type(x)  # revealed: int
+1 | class Iterable:
+2 |     # invalid because it will implicitly be passed an `int`
+3 |     # by the interpreter
+4 |     def __getitem__(self, key: str) -> int:
+5 |         return 42
+6 | 
+7 | # error: [not-iterable]
+8 | for x in Iterable():
+9 |     reveal_type(x)  # revealed: int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable` is not iterable
-  --> src/mdtest_snippet.py:10:10
-   |
- 9 | # error: [not-iterable]
-10 | for x in Iterable():
-   |          ^^^^^^^^^^
-11 |     reveal_type(x)  # revealed: int
-   |
+ --> src/mdtest_snippet.py:8:10
+  |
+7 | # error: [not-iterable]
+8 | for x in Iterable():
+  |          ^^^^^^^^^^
+9 |     reveal_type(x)  # revealed: int
+  |
 info: It has no `__iter__` method and its `__getitem__` method has an incorrect signature for the old-style iteration protocol
 info: `__getitem__` must be at least as permissive as `def __getitem__(self, key: int): ...` to satisfy the old-style iteration protocol
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:11:17
-   |
- 9 | # error: [not-iterable]
-10 | for x in Iterable():
-11 |     reveal_type(x)  # revealed: int
-   |                 ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method…_(36425dbcbd793d2b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method…_(36425dbcbd793d2b).snap
index ad4ffa4b00..356132982d 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method…_(36425dbcbd793d2b).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method…_(36425dbcbd793d2b).snap
@@ -12,40 +12,26 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
-1 | from typing_extensions import reveal_type
-2 | 
-3 | class Bad:
-4 |     __getitem__: None = None
-5 | 
-6 | # error: [not-iterable]
-7 | for x in Bad():
-8 |     reveal_type(x)  # revealed: Unknown
+1 | class Bad:
+2 |     __getitem__: None = None
+3 | 
+4 | # error: [not-iterable]
+5 | for x in Bad():
+6 |     reveal_type(x)  # revealed: Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Bad` is not iterable
- --> src/mdtest_snippet.py:7:10
+ --> src/mdtest_snippet.py:5:10
   |
-6 | # error: [not-iterable]
-7 | for x in Bad():
+4 | # error: [not-iterable]
+5 | for x in Bad():
   |          ^^^^^
-8 |     reveal_type(x)  # revealed: Unknown
+6 |     reveal_type(x)  # revealed: Unknown
   |
 info: It has no `__iter__` method and its `__getitem__` attribute has type `None`, which is not callable
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:8:17
-  |
-6 | # error: [not-iterable]
-7 | for x in Bad():
-8 |     reveal_type(x)  # revealed: Unknown
-  |                 ^ `Unknown`
-  |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callabl…_(49a21e4b7fe6e97b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callabl…_(49a21e4b7fe6e97b).snap
index 1a20384b0d..58ceae4187 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callabl…_(49a21e4b7fe6e97b).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callabl…_(49a21e4b7fe6e97b).snap
@@ -12,48 +12,46 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | def _(flag: bool):
- 4 |     class CustomCallable:
- 5 |         if flag:
- 6 |             def __call__(self, *args, **kwargs) -> int:
- 7 |                 return 42
- 8 |         else:
- 9 |             __call__: None = None
-10 | 
-11 |     class Iterable1:
-12 |         __getitem__: CustomCallable = CustomCallable()
-13 | 
-14 |     class Iterable2:
-15 |         if flag:
-16 |             def __getitem__(self, key: int) -> int:
-17 |                 return 42
-18 |         else:
-19 |             __getitem__: None = None
-20 | 
-21 |     # error: [not-iterable]
-22 |     for x in Iterable1():
-23 |         # TODO... `int` might be ideal here?
-24 |         reveal_type(x)  # revealed: int | Unknown
-25 | 
-26 |     # error: [not-iterable]
-27 |     for y in Iterable2():
-28 |         # TODO... `int` might be ideal here?
-29 |         reveal_type(y)  # revealed: int | Unknown
+ 1 | def _(flag: bool):
+ 2 |     class CustomCallable:
+ 3 |         if flag:
+ 4 |             def __call__(self, *args, **kwargs) -> int:
+ 5 |                 return 42
+ 6 |         else:
+ 7 |             __call__: None = None
+ 8 | 
+ 9 |     class Iterable1:
+10 |         __getitem__: CustomCallable = CustomCallable()
+11 | 
+12 |     class Iterable2:
+13 |         if flag:
+14 |             def __getitem__(self, key: int) -> int:
+15 |                 return 42
+16 |         else:
+17 |             __getitem__: None = None
+18 | 
+19 |     # error: [not-iterable]
+20 |     for x in Iterable1():
+21 |         # TODO... `int` might be ideal here?
+22 |         reveal_type(x)  # revealed: int | Unknown
+23 | 
+24 |     # error: [not-iterable]
+25 |     for y in Iterable2():
+26 |         # TODO... `int` might be ideal here?
+27 |         reveal_type(y)  # revealed: int | Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable1` may not be iterable
-  --> src/mdtest_snippet.py:22:14
+  --> src/mdtest_snippet.py:20:14
    |
-21 |     # error: [not-iterable]
-22 |     for x in Iterable1():
+19 |     # error: [not-iterable]
+20 |     for x in Iterable1():
    |              ^^^^^^^^^^^
-23 |         # TODO... `int` might be ideal here?
-24 |         reveal_type(x)  # revealed: int | Unknown
+21 |         # TODO... `int` might be ideal here?
+22 |         reveal_type(x)  # revealed: int | Unknown
    |
 info: It has no `__iter__` method and its `__getitem__` attribute is invalid
 info: `__getitem__` has type `CustomCallable`, which is not callable
@@ -61,44 +59,18 @@ info: rule `not-iterable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:24:21
-   |
-22 |     for x in Iterable1():
-23 |         # TODO... `int` might be ideal here?
-24 |         reveal_type(x)  # revealed: int | Unknown
-   |                     ^ `int | Unknown`
-25 |
-26 |     # error: [not-iterable]
-   |
-
-```
-
 ```
 error[not-iterable]: Object of type `Iterable2` may not be iterable
-  --> src/mdtest_snippet.py:27:14
+  --> src/mdtest_snippet.py:25:14
    |
-26 |     # error: [not-iterable]
-27 |     for y in Iterable2():
+24 |     # error: [not-iterable]
+25 |     for y in Iterable2():
    |              ^^^^^^^^^^^
-28 |         # TODO... `int` might be ideal here?
-29 |         reveal_type(y)  # revealed: int | Unknown
+26 |         # TODO... `int` might be ideal here?
+27 |         reveal_type(y)  # revealed: int | Unknown
    |
 info: It has no `__iter__` method and its `__getitem__` attribute is invalid
 info: `__getitem__` has type `(bound method Iterable2.__getitem__(key: int) -> int) | None`, which is not callable
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:29:21
-   |
-27 |     for y in Iterable2():
-28 |         # TODO... `int` might be ideal here?
-29 |         reveal_type(y)  # revealed: int | Unknown
-   |                     ^ `int | Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6388761c90a0555c).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6388761c90a0555c).snap
index ca18f1184a..d36ae95142 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6388761c90a0555c).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6388761c90a0555c).snap
@@ -12,48 +12,46 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class Iterator:
- 4 |     def __next__(self) -> int:
- 5 |         return 42
- 6 | 
- 7 | def _(flag: bool):
- 8 |     class Iterable1:
- 9 |         if flag:
-10 |             def __iter__(self) -> Iterator:
-11 |                 return Iterator()
-12 |         else:
-13 |             def __iter__(self, invalid_extra_arg) -> Iterator:
-14 |                 return Iterator()
-15 | 
-16 |     # error: [not-iterable]
-17 |     for x in Iterable1():
-18 |         reveal_type(x)  # revealed: int
-19 | 
-20 |     class Iterable2:
-21 |         if flag:
-22 |             def __iter__(self) -> Iterator:
-23 |                 return Iterator()
-24 |         else:
-25 |             __iter__: None = None
-26 | 
-27 |     # error: [not-iterable]
-28 |     for x in Iterable2():
-29 |         # TODO: `int` would probably be better here:
-30 |         reveal_type(x)  # revealed: int | Unknown
+ 1 | class Iterator:
+ 2 |     def __next__(self) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | def _(flag: bool):
+ 6 |     class Iterable1:
+ 7 |         if flag:
+ 8 |             def __iter__(self) -> Iterator:
+ 9 |                 return Iterator()
+10 |         else:
+11 |             def __iter__(self, invalid_extra_arg) -> Iterator:
+12 |                 return Iterator()
+13 | 
+14 |     # error: [not-iterable]
+15 |     for x in Iterable1():
+16 |         reveal_type(x)  # revealed: int
+17 | 
+18 |     class Iterable2:
+19 |         if flag:
+20 |             def __iter__(self) -> Iterator:
+21 |                 return Iterator()
+22 |         else:
+23 |             __iter__: None = None
+24 | 
+25 |     # error: [not-iterable]
+26 |     for x in Iterable2():
+27 |         # TODO: `int` would probably be better here:
+28 |         reveal_type(x)  # revealed: int | Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable1` may not be iterable
-  --> src/mdtest_snippet.py:17:14
+  --> src/mdtest_snippet.py:15:14
    |
-16 |     # error: [not-iterable]
-17 |     for x in Iterable1():
+14 |     # error: [not-iterable]
+15 |     for x in Iterable1():
    |              ^^^^^^^^^^^
-18 |         reveal_type(x)  # revealed: int
+16 |         reveal_type(x)  # revealed: int
    |
 info: Its `__iter__` method may have an invalid signature
 info: Type of `__iter__` is `(bound method Iterable1.__iter__() -> Iterator) | (bound method Iterable1.__iter__(invalid_extra_arg) -> Iterator)`
@@ -62,43 +60,17 @@ info: rule `not-iterable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:18:21
-   |
-16 |     # error: [not-iterable]
-17 |     for x in Iterable1():
-18 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-19 |
-20 |     class Iterable2:
-   |
-
-```
-
 ```
 error[not-iterable]: Object of type `Iterable2` may not be iterable
-  --> src/mdtest_snippet.py:28:14
+  --> src/mdtest_snippet.py:26:14
    |
-27 |     # error: [not-iterable]
-28 |     for x in Iterable2():
+25 |     # error: [not-iterable]
+26 |     for x in Iterable2():
    |              ^^^^^^^^^^^
-29 |         # TODO: `int` would probably be better here:
-30 |         reveal_type(x)  # revealed: int | Unknown
+27 |         # TODO: `int` would probably be better here:
+28 |         reveal_type(x)  # revealed: int | Unknown
    |
 info: Its `__iter__` attribute (with type `(bound method Iterable2.__iter__() -> Iterator) | None`) may not be callable
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:30:21
-   |
-28 |     for x in Iterable2():
-29 |         # TODO: `int` would probably be better here:
-30 |         reveal_type(x)  # revealed: int | Unknown
-   |                     ^ `int | Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6805a6032e504b63).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6805a6032e504b63).snap
index ba0f58ca09..dfa5173a1e 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6805a6032e504b63).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(6805a6032e504b63).snap
@@ -12,45 +12,43 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | def _(flag: bool):
- 4 |     class Iterable1:
- 5 |         if flag:
- 6 |             def __getitem__(self, item: int) -> str:
- 7 |                 return "foo"
- 8 |         else:
- 9 |             __getitem__: None = None
-10 | 
-11 |     class Iterable2:
-12 |         if flag:
-13 |             def __getitem__(self, item: int) -> str:
-14 |                 return "foo"
-15 |         else:
-16 |             def __getitem__(self, item: str) -> int:
-17 |                 return 42
-18 | 
-19 |     # error: [not-iterable]
-20 |     for x in Iterable1():
-21 |         # TODO: `str` might be better
-22 |         reveal_type(x)  # revealed: str | Unknown
-23 | 
-24 |     # error: [not-iterable]
-25 |     for y in Iterable2():
-26 |         reveal_type(y)  # revealed: str | int
+ 1 | def _(flag: bool):
+ 2 |     class Iterable1:
+ 3 |         if flag:
+ 4 |             def __getitem__(self, item: int) -> str:
+ 5 |                 return "foo"
+ 6 |         else:
+ 7 |             __getitem__: None = None
+ 8 | 
+ 9 |     class Iterable2:
+10 |         if flag:
+11 |             def __getitem__(self, item: int) -> str:
+12 |                 return "foo"
+13 |         else:
+14 |             def __getitem__(self, item: str) -> int:
+15 |                 return 42
+16 | 
+17 |     # error: [not-iterable]
+18 |     for x in Iterable1():
+19 |         # TODO: `str` might be better
+20 |         reveal_type(x)  # revealed: str | Unknown
+21 | 
+22 |     # error: [not-iterable]
+23 |     for y in Iterable2():
+24 |         reveal_type(y)  # revealed: str | int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable1` may not be iterable
-  --> src/mdtest_snippet.py:20:14
+  --> src/mdtest_snippet.py:18:14
    |
-19 |     # error: [not-iterable]
-20 |     for x in Iterable1():
+17 |     # error: [not-iterable]
+18 |     for x in Iterable1():
    |              ^^^^^^^^^^^
-21 |         # TODO: `str` might be better
-22 |         reveal_type(x)  # revealed: str | Unknown
+19 |         # TODO: `str` might be better
+20 |         reveal_type(x)  # revealed: str | Unknown
    |
 info: It has no `__iter__` method and its `__getitem__` attribute is invalid
 info: `__getitem__` has type `(bound method Iterable1.__getitem__(item: int) -> str) | None`, which is not callable
@@ -58,43 +56,17 @@ info: rule `not-iterable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:22:21
-   |
-20 |     for x in Iterable1():
-21 |         # TODO: `str` might be better
-22 |         reveal_type(x)  # revealed: str | Unknown
-   |                     ^ `str | Unknown`
-23 |
-24 |     # error: [not-iterable]
-   |
-
-```
-
 ```
 error[not-iterable]: Object of type `Iterable2` may not be iterable
-  --> src/mdtest_snippet.py:25:14
+  --> src/mdtest_snippet.py:23:14
    |
-24 |     # error: [not-iterable]
-25 |     for y in Iterable2():
+22 |     # error: [not-iterable]
+23 |     for y in Iterable2():
    |              ^^^^^^^^^^^
-26 |         reveal_type(y)  # revealed: str | int
+24 |         reveal_type(y)  # revealed: str | int
    |
 info: It has no `__iter__` method and its `__getitem__` method (with type `(bound method Iterable2.__getitem__(item: int) -> str) | (bound method Iterable2.__getitem__(item: str) -> int)`) may have an incorrect signature for the old-style iteration protocol
 info: `__getitem__` must be at least as permissive as `def __getitem__(self, key: int): ...` to satisfy the old-style iteration protocol
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:26:21
-   |
-24 |     # error: [not-iterable]
-25 |     for y in Iterable2():
-26 |         reveal_type(y)  # revealed: str | int
-   |                     ^ `str | int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(c626bde8651b643a).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(c626bde8651b643a).snap
index ddeda6f7f9..e4fb5e4576 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(c626bde8651b643a).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__…_(c626bde8651b643a).snap
@@ -12,52 +12,50 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | def _(flag: bool):
- 4 |     class Iterator1:
- 5 |         if flag:
- 6 |             def __next__(self) -> int:
- 7 |                 return 42
- 8 |         else:
- 9 |             def __next__(self, invalid_extra_arg) -> str:
-10 |                 return "foo"
-11 | 
-12 |     class Iterator2:
-13 |         if flag:
-14 |             def __next__(self) -> int:
-15 |                 return 42
-16 |         else:
-17 |             __next__: None = None
-18 | 
-19 |     class Iterable1:
-20 |         def __iter__(self) -> Iterator1:
-21 |             return Iterator1()
-22 | 
-23 |     class Iterable2:
-24 |         def __iter__(self) -> Iterator2:
-25 |             return Iterator2()
-26 | 
-27 |     # error: [not-iterable]
-28 |     for x in Iterable1():
-29 |         reveal_type(x)  # revealed: int | str
-30 | 
-31 |     # error: [not-iterable]
-32 |     for y in Iterable2():
-33 |         # TODO: `int` would probably be better here:
-34 |         reveal_type(y)  # revealed: int | Unknown
+ 1 | def _(flag: bool):
+ 2 |     class Iterator1:
+ 3 |         if flag:
+ 4 |             def __next__(self) -> int:
+ 5 |                 return 42
+ 6 |         else:
+ 7 |             def __next__(self, invalid_extra_arg) -> str:
+ 8 |                 return "foo"
+ 9 | 
+10 |     class Iterator2:
+11 |         if flag:
+12 |             def __next__(self) -> int:
+13 |                 return 42
+14 |         else:
+15 |             __next__: None = None
+16 | 
+17 |     class Iterable1:
+18 |         def __iter__(self) -> Iterator1:
+19 |             return Iterator1()
+20 | 
+21 |     class Iterable2:
+22 |         def __iter__(self) -> Iterator2:
+23 |             return Iterator2()
+24 | 
+25 |     # error: [not-iterable]
+26 |     for x in Iterable1():
+27 |         reveal_type(x)  # revealed: int | str
+28 | 
+29 |     # error: [not-iterable]
+30 |     for y in Iterable2():
+31 |         # TODO: `int` would probably be better here:
+32 |         reveal_type(y)  # revealed: int | Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable1` may not be iterable
-  --> src/mdtest_snippet.py:28:14
+  --> src/mdtest_snippet.py:26:14
    |
-27 |     # error: [not-iterable]
-28 |     for x in Iterable1():
+25 |     # error: [not-iterable]
+26 |     for x in Iterable1():
    |              ^^^^^^^^^^^
-29 |         reveal_type(x)  # revealed: int | str
+27 |         reveal_type(x)  # revealed: int | str
    |
 info: Its `__iter__` method returns an object of type `Iterator1`, which may have an invalid `__next__` method
 info: Expected signature for `__next__` is `def __next__(self): ...`
@@ -65,43 +63,17 @@ info: rule `not-iterable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:29:21
-   |
-27 |     # error: [not-iterable]
-28 |     for x in Iterable1():
-29 |         reveal_type(x)  # revealed: int | str
-   |                     ^ `int | str`
-30 |
-31 |     # error: [not-iterable]
-   |
-
-```
-
 ```
 error[not-iterable]: Object of type `Iterable2` may not be iterable
-  --> src/mdtest_snippet.py:32:14
+  --> src/mdtest_snippet.py:30:14
    |
-31 |     # error: [not-iterable]
-32 |     for y in Iterable2():
+29 |     # error: [not-iterable]
+30 |     for y in Iterable2():
    |              ^^^^^^^^^^^
-33 |         # TODO: `int` would probably be better here:
-34 |         reveal_type(y)  # revealed: int | Unknown
+31 |         # TODO: `int` would probably be better here:
+32 |         reveal_type(y)  # revealed: int | Unknown
    |
 info: Its `__iter__` method returns an object of type `Iterator2`, which has a `__next__` attribute that may not be callable
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:34:21
-   |
-32 |     for y in Iterable2():
-33 |         # TODO: `int` would probably be better here:
-34 |         reveal_type(y)  # revealed: int | Unknown
-   |                     ^ `int | Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(77269542b8e81774).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(77269542b8e81774).snap
new file mode 100644
index 0000000000..16b74d788c
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(77269542b8e81774).snap
@@ -0,0 +1,82 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: for.md - For loops - Possibly missing `__iter__` and possibly invalid `__getitem__`
+mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | class Iterator:
+ 2 |     def __next__(self) -> bytes:
+ 3 |         return b"foo"
+ 4 | 
+ 5 | def _(flag: bool, flag2: bool):
+ 6 |     class Iterable1:
+ 7 |         if flag:
+ 8 |             def __getitem__(self, item: int) -> str:
+ 9 |                 return "foo"
+10 |         else:
+11 |             __getitem__: None = None
+12 | 
+13 |         if flag2:
+14 |             def __iter__(self) -> Iterator:
+15 |                 return Iterator()
+16 | 
+17 |     class Iterable2:
+18 |         if flag:
+19 |             def __getitem__(self, item: int) -> str:
+20 |                 return "foo"
+21 |         else:
+22 |             def __getitem__(self, item: str) -> int:
+23 |                 return 42
+24 |         if flag2:
+25 |             def __iter__(self) -> Iterator:
+26 |                 return Iterator()
+27 | 
+28 |     # error: [not-iterable]
+29 |     for x in Iterable1():
+30 |         # TODO: `bytes | str` might be better
+31 |         reveal_type(x)  # revealed: bytes | str | Unknown
+32 | 
+33 |     # error: [not-iterable]
+34 |     for y in Iterable2():
+35 |         reveal_type(y)  # revealed: bytes | str | int
+```
+
+# Diagnostics
+
+```
+error[not-iterable]: Object of type `Iterable1` may not be iterable
+  --> src/mdtest_snippet.py:29:14
+   |
+28 |     # error: [not-iterable]
+29 |     for x in Iterable1():
+   |              ^^^^^^^^^^^
+30 |         # TODO: `bytes | str` might be better
+31 |         reveal_type(x)  # revealed: bytes | str | Unknown
+   |
+info: It may not have an `__iter__` method and its `__getitem__` attribute (with type `(bound method Iterable1.__getitem__(item: int) -> str) | None`) may not be callable
+info: rule `not-iterable` is enabled by default
+
+```
+
+```
+error[not-iterable]: Object of type `Iterable2` may not be iterable
+  --> src/mdtest_snippet.py:34:14
+   |
+33 |     # error: [not-iterable]
+34 |     for y in Iterable2():
+   |              ^^^^^^^^^^^
+35 |         reveal_type(y)  # revealed: bytes | str | int
+   |
+info: It may not have an `__iter__` method and its `__getitem__` method (with type `(bound method Iterable2.__getitem__(item: int) -> str) | (bound method Iterable2.__getitem__(item: str) -> int)`) may have an incorrect signature for the old-style iteration protocol
+info: `__getitem__` must be at least as permissive as `def __getitem__(self, key: int): ...` to satisfy the old-style iteration protocol
+info: rule `not-iterable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(9f781babda99d74b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(9f781babda99d74b).snap
new file mode 100644
index 0000000000..2e0457bc4d
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(9f781babda99d74b).snap
@@ -0,0 +1,49 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: for.md - For loops - Possibly missing `__iter__` and bad `__getitem__` method
+mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | def _(flag: bool):
+ 2 |     class Iterator:
+ 3 |         def __next__(self) -> int:
+ 4 |             return 42
+ 5 | 
+ 6 |     class Iterable:
+ 7 |         if flag:
+ 8 |             def __iter__(self) -> Iterator:
+ 9 |                 return Iterator()
+10 |         # invalid signature because it only accepts a `str`,
+11 |         # but the old-style iteration protocol will pass it an `int`
+12 |         def __getitem__(self, key: str) -> bytes:
+13 |             return bytes()
+14 | 
+15 |     # error: [not-iterable]
+16 |     for x in Iterable():
+17 |         reveal_type(x)  # revealed: int | bytes
+```
+
+# Diagnostics
+
+```
+error[not-iterable]: Object of type `Iterable` may not be iterable
+  --> src/mdtest_snippet.py:16:14
+   |
+15 |     # error: [not-iterable]
+16 |     for x in Iterable():
+   |              ^^^^^^^^^^
+17 |         reveal_type(x)  # revealed: int | bytes
+   |
+info: It may not have an `__iter__` method and its `__getitem__` method has an incorrect signature for the old-style iteration protocol
+info: `__getitem__` must be at least as permissive as `def __getitem__(self, key: int): ...` to satisfy the old-style iteration protocol
+info: rule `not-iterable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(d8a02a0fcbb390a3).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(d8a02a0fcbb390a3).snap
new file mode 100644
index 0000000000..b41da99a08
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_missing_`__…_(d8a02a0fcbb390a3).snap
@@ -0,0 +1,47 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: for.md - For loops - Possibly missing `__iter__` and possibly missing `__getitem__`
+mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | class Iterator:
+ 2 |     def __next__(self) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | def _(flag1: bool, flag2: bool):
+ 6 |     class Iterable:
+ 7 |         if flag1:
+ 8 |             def __iter__(self) -> Iterator:
+ 9 |                 return Iterator()
+10 |         if flag2:
+11 |             def __getitem__(self, key: int) -> bytes:
+12 |                 return bytes()
+13 | 
+14 |     # error: [not-iterable]
+15 |     for x in Iterable():
+16 |         reveal_type(x)  # revealed: int | bytes
+```
+
+# Diagnostics
+
+```
+error[not-iterable]: Object of type `Iterable` may not be iterable
+  --> src/mdtest_snippet.py:15:14
+   |
+14 |     # error: [not-iterable]
+15 |     for x in Iterable():
+   |              ^^^^^^^^^^
+16 |         reveal_type(x)  # revealed: int | bytes
+   |
+info: It may not have an `__iter__` method or a `__getitem__` method
+info: rule `not-iterable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(3b75cc467e6e012).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(3b75cc467e6e012).snap
deleted file mode 100644
index c7ec490902..0000000000
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(3b75cc467e6e012).snap
+++ /dev/null
@@ -1,63 +0,0 @@
----
-source: crates/ty_test/src/lib.rs
-expression: snapshot
----
----
-mdtest name: for.md - For loops - Possibly unbound `__iter__` and bad `__getitem__` method
-mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
----
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | def _(flag: bool):
- 4 |     class Iterator:
- 5 |         def __next__(self) -> int:
- 6 |             return 42
- 7 | 
- 8 |     class Iterable:
- 9 |         if flag:
-10 |             def __iter__(self) -> Iterator:
-11 |                 return Iterator()
-12 |         # invalid signature because it only accepts a `str`,
-13 |         # but the old-style iteration protocol will pass it an `int`
-14 |         def __getitem__(self, key: str) -> bytes:
-15 |             return bytes()
-16 | 
-17 |     # error: [not-iterable]
-18 |     for x in Iterable():
-19 |         reveal_type(x)  # revealed: int | bytes
-```
-
-# Diagnostics
-
-```
-error[not-iterable]: Object of type `Iterable` may not be iterable
-  --> src/mdtest_snippet.py:18:14
-   |
-17 |     # error: [not-iterable]
-18 |     for x in Iterable():
-   |              ^^^^^^^^^^
-19 |         reveal_type(x)  # revealed: int | bytes
-   |
-info: It may not have an `__iter__` method and its `__getitem__` method has an incorrect signature for the old-style iteration protocol
-info: `__getitem__` must be at least as permissive as `def __getitem__(self, key: int): ...` to satisfy the old-style iteration protocol
-info: rule `not-iterable` is enabled by default
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:19:21
-   |
-17 |     # error: [not-iterable]
-18 |     for x in Iterable():
-19 |         reveal_type(x)  # revealed: int | bytes
-   |                     ^ `int | bytes`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(8745233539d31200).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(8745233539d31200).snap
deleted file mode 100644
index 48013f5948..0000000000
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(8745233539d31200).snap
+++ /dev/null
@@ -1,61 +0,0 @@
----
-source: crates/ty_test/src/lib.rs
-expression: snapshot
----
----
-mdtest name: for.md - For loops - Possibly unbound `__iter__` and possibly unbound `__getitem__`
-mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
----
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class Iterator:
- 4 |     def __next__(self) -> int:
- 5 |         return 42
- 6 | 
- 7 | def _(flag1: bool, flag2: bool):
- 8 |     class Iterable:
- 9 |         if flag1:
-10 |             def __iter__(self) -> Iterator:
-11 |                 return Iterator()
-12 |         if flag2:
-13 |             def __getitem__(self, key: int) -> bytes:
-14 |                 return bytes()
-15 | 
-16 |     # error: [not-iterable]
-17 |     for x in Iterable():
-18 |         reveal_type(x)  # revealed: int | bytes
-```
-
-# Diagnostics
-
-```
-error[not-iterable]: Object of type `Iterable` may not be iterable
-  --> src/mdtest_snippet.py:17:14
-   |
-16 |     # error: [not-iterable]
-17 |     for x in Iterable():
-   |              ^^^^^^^^^^
-18 |         reveal_type(x)  # revealed: int | bytes
-   |
-info: It may not have an `__iter__` method or a `__getitem__` method
-info: rule `not-iterable` is enabled by default
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:18:21
-   |
-16 |     # error: [not-iterable]
-17 |     for x in Iterable():
-18 |         reveal_type(x)  # revealed: int | bytes
-   |                     ^ `int | bytes`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(b1ce0da35c06026).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(b1ce0da35c06026).snap
deleted file mode 100644
index 9d09acef59..0000000000
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__…_(b1ce0da35c06026).snap
+++ /dev/null
@@ -1,110 +0,0 @@
----
-source: crates/ty_test/src/lib.rs
-expression: snapshot
----
----
-mdtest name: for.md - For loops - Possibly unbound `__iter__` and possibly invalid `__getitem__`
-mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
----
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class Iterator:
- 4 |     def __next__(self) -> bytes:
- 5 |         return b"foo"
- 6 | 
- 7 | def _(flag: bool, flag2: bool):
- 8 |     class Iterable1:
- 9 |         if flag:
-10 |             def __getitem__(self, item: int) -> str:
-11 |                 return "foo"
-12 |         else:
-13 |             __getitem__: None = None
-14 | 
-15 |         if flag2:
-16 |             def __iter__(self) -> Iterator:
-17 |                 return Iterator()
-18 | 
-19 |     class Iterable2:
-20 |         if flag:
-21 |             def __getitem__(self, item: int) -> str:
-22 |                 return "foo"
-23 |         else:
-24 |             def __getitem__(self, item: str) -> int:
-25 |                 return 42
-26 |         if flag2:
-27 |             def __iter__(self) -> Iterator:
-28 |                 return Iterator()
-29 | 
-30 |     # error: [not-iterable]
-31 |     for x in Iterable1():
-32 |         # TODO: `bytes | str` might be better
-33 |         reveal_type(x)  # revealed: bytes | str | Unknown
-34 | 
-35 |     # error: [not-iterable]
-36 |     for y in Iterable2():
-37 |         reveal_type(y)  # revealed: bytes | str | int
-```
-
-# Diagnostics
-
-```
-error[not-iterable]: Object of type `Iterable1` may not be iterable
-  --> src/mdtest_snippet.py:31:14
-   |
-30 |     # error: [not-iterable]
-31 |     for x in Iterable1():
-   |              ^^^^^^^^^^^
-32 |         # TODO: `bytes | str` might be better
-33 |         reveal_type(x)  # revealed: bytes | str | Unknown
-   |
-info: It may not have an `__iter__` method and its `__getitem__` attribute (with type `(bound method Iterable1.__getitem__(item: int) -> str) | None`) may not be callable
-info: rule `not-iterable` is enabled by default
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:33:21
-   |
-31 |     for x in Iterable1():
-32 |         # TODO: `bytes | str` might be better
-33 |         reveal_type(x)  # revealed: bytes | str | Unknown
-   |                     ^ `bytes | str | Unknown`
-34 |
-35 |     # error: [not-iterable]
-   |
-
-```
-
-```
-error[not-iterable]: Object of type `Iterable2` may not be iterable
-  --> src/mdtest_snippet.py:36:14
-   |
-35 |     # error: [not-iterable]
-36 |     for y in Iterable2():
-   |              ^^^^^^^^^^^
-37 |         reveal_type(y)  # revealed: bytes | str | int
-   |
-info: It may not have an `__iter__` method and its `__getitem__` method (with type `(bound method Iterable2.__getitem__(item: int) -> str) | (bound method Iterable2.__getitem__(item: str) -> int)`) may have an incorrect signature for the old-style iteration protocol
-info: `__getitem__` must be at least as permissive as `def __getitem__(self, key: int): ...` to satisfy the old-style iteration protocol
-info: rule `not-iterable` is enabled by default
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:37:21
-   |
-35 |     # error: [not-iterable]
-36 |     for y in Iterable2():
-37 |         reveal_type(y)  # revealed: bytes | str | int
-   |                     ^ `bytes | str | int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(6177bb6d13a22241).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(6177bb6d13a22241).snap
index e7ab06ed09..0a5173b109 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(6177bb6d13a22241).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(6177bb6d13a22241).snap
@@ -12,52 +12,38 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class TestIter:
- 4 |     def __next__(self) -> int:
- 5 |         return 42
- 6 | 
- 7 | class Test:
- 8 |     def __iter__(self) -> TestIter:
- 9 |         return TestIter()
-10 | 
-11 | class Test2:
-12 |     def __iter__(self) -> int:
-13 |         return 42
-14 | 
-15 | def _(flag: bool):
-16 |     # TODO: Improve error message to state which union variant isn't iterable (https://github.com/astral-sh/ruff/issues/13989)
-17 |     # error: [not-iterable]
-18 |     for x in Test() if flag else Test2():
-19 |         reveal_type(x)  # revealed: int
+ 1 | class TestIter:
+ 2 |     def __next__(self) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | class Test:
+ 6 |     def __iter__(self) -> TestIter:
+ 7 |         return TestIter()
+ 8 | 
+ 9 | class Test2:
+10 |     def __iter__(self) -> int:
+11 |         return 42
+12 | 
+13 | def _(flag: bool):
+14 |     # TODO: Improve error message to state which union variant isn't iterable (https://github.com/astral-sh/ruff/issues/13989)
+15 |     # error: [not-iterable]
+16 |     for x in Test() if flag else Test2():
+17 |         reveal_type(x)  # revealed: int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Test | Test2` may not be iterable
-  --> src/mdtest_snippet.py:18:14
+  --> src/mdtest_snippet.py:16:14
    |
-16 |     # TODO: Improve error message to state which union variant isn't iterable (https://github.com/astral-sh/ruff/issues/13989)
-17 |     # error: [not-iterable]
-18 |     for x in Test() if flag else Test2():
+14 |     # TODO: Improve error message to state which union variant isn't iterable (https://github.com/astral-sh/ruff/issues/13989)
+15 |     # error: [not-iterable]
+16 |     for x in Test() if flag else Test2():
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19 |         reveal_type(x)  # revealed: int
+17 |         reveal_type(x)  # revealed: int
    |
 info: Its `__iter__` method returns an object of type `TestIter | int`, which may not have a `__next__` method
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:19:21
-   |
-17 |     # error: [not-iterable]
-18 |     for x in Test() if flag else Test2():
-19 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(ba36fbef63a14969).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(ba36fbef63a14969).snap
index 8eb966da9d..7a9a395bd4 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(ba36fbef63a14969).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterab…_(ba36fbef63a14969).snap
@@ -12,47 +12,33 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class TestIter:
- 4 |     def __next__(self) -> int:
- 5 |         return 42
- 6 | 
- 7 | class Test:
- 8 |     def __iter__(self) -> TestIter:
- 9 |         return TestIter()
-10 | 
-11 | def _(flag: bool):
-12 |     # error: [not-iterable]
-13 |     for x in Test() if flag else 42:
-14 |         reveal_type(x)  # revealed: int
+ 1 | class TestIter:
+ 2 |     def __next__(self) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | class Test:
+ 6 |     def __iter__(self) -> TestIter:
+ 7 |         return TestIter()
+ 8 | 
+ 9 | def _(flag: bool):
+10 |     # error: [not-iterable]
+11 |     for x in Test() if flag else 42:
+12 |         reveal_type(x)  # revealed: int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Test | Literal[42]` may not be iterable
-  --> src/mdtest_snippet.py:13:14
+  --> src/mdtest_snippet.py:11:14
    |
-11 | def _(flag: bool):
-12 |     # error: [not-iterable]
-13 |     for x in Test() if flag else 42:
+ 9 | def _(flag: bool):
+10 |     # error: [not-iterable]
+11 |     for x in Test() if flag else 42:
    |              ^^^^^^^^^^^^^^^^^^^^^^
-14 |         reveal_type(x)  # revealed: int
+12 |         reveal_type(x)  # revealed: int
    |
 info: It may not have an `__iter__` method and it doesn't have a `__getitem__` method
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:21
-   |
-12 |     # error: [not-iterable]
-13 |     for x in Test() if flag else 42:
-14 |         reveal_type(x)  # revealed: int
-   |                     ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_it…_(a1cdf01ad69ac37c).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_it…_(a1cdf01ad69ac37c).snap
index 3e5d3bf4eb..52f88e823a 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_it…_(a1cdf01ad69ac37c).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_it…_(a1cdf01ad69ac37c).snap
@@ -12,34 +12,32 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | def _(flag: bool):
- 4 |     class NotIterable:
- 5 |         if flag:
- 6 |             __iter__: int = 1
- 7 |         else:
- 8 |             __iter__: None = None
- 9 | 
-10 |     # error: [not-iterable]
-11 |     for x in NotIterable():
-12 |         pass
-13 | 
-14 |     # revealed: Unknown
-15 |     # error: [possibly-unresolved-reference]
-16 |     reveal_type(x)
+ 1 | def _(flag: bool):
+ 2 |     class NotIterable:
+ 3 |         if flag:
+ 4 |             __iter__: int = 1
+ 5 |         else:
+ 6 |             __iter__: None = None
+ 7 | 
+ 8 |     # error: [not-iterable]
+ 9 |     for x in NotIterable():
+10 |         pass
+11 | 
+12 |     # revealed: Unknown
+13 |     # error: [possibly-unresolved-reference]
+14 |     reveal_type(x)
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `NotIterable` is not iterable
-  --> src/mdtest_snippet.py:11:14
+  --> src/mdtest_snippet.py:9:14
    |
-10 |     # error: [not-iterable]
-11 |     for x in NotIterable():
+ 8 |     # error: [not-iterable]
+ 9 |     for x in NotIterable():
    |              ^^^^^^^^^^^^^
-12 |         pass
+10 |         pass
    |
 info: Its `__iter__` attribute has type `int | None`, which is not callable
 info: rule `not-iterable` is enabled by default
@@ -48,25 +46,13 @@ info: rule `not-iterable` is enabled by default
 
 ```
 info[possibly-unresolved-reference]: Name `x` used when possibly not defined
-  --> src/mdtest_snippet.py:16:17
+  --> src/mdtest_snippet.py:14:17
    |
-14 |     # revealed: Unknown
-15 |     # error: [possibly-unresolved-reference]
-16 |     reveal_type(x)
+12 |     # revealed: Unknown
+13 |     # error: [possibly-unresolved-reference]
+14 |     reveal_type(x)
    |                 ^
    |
 info: rule `possibly-unresolved-reference` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:16:17
-   |
-14 |     # revealed: Unknown
-15 |     # error: [possibly-unresolved-reference]
-16 |     reveal_type(x)
-   |                 ^ `Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_…_(92e3fdd69edad63d).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_…_(92e3fdd69edad63d).snap
index 25942db89e..05eea5a6ca 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_…_(92e3fdd69edad63d).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_…_(92e3fdd69edad63d).snap
@@ -12,41 +12,27 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
-1 | from typing_extensions import reveal_type
-2 | 
-3 | class Bad:
-4 |     def __iter__(self) -> int:
-5 |         return 42
-6 | 
-7 | # error: [not-iterable]
-8 | for x in Bad():
-9 |     reveal_type(x)  # revealed: Unknown
+1 | class Bad:
+2 |     def __iter__(self) -> int:
+3 |         return 42
+4 | 
+5 | # error: [not-iterable]
+6 | for x in Bad():
+7 |     reveal_type(x)  # revealed: Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Bad` is not iterable
- --> src/mdtest_snippet.py:8:10
+ --> src/mdtest_snippet.py:6:10
   |
-7 | # error: [not-iterable]
-8 | for x in Bad():
+5 | # error: [not-iterable]
+6 | for x in Bad():
   |          ^^^^^
-9 |     reveal_type(x)  # revealed: Unknown
+7 |     reveal_type(x)  # revealed: Unknown
   |
 info: Its `__iter__` method returns an object of type `int`, which has no `__next__` method
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:9:17
-  |
-7 | # error: [not-iterable]
-8 | for x in Bad():
-9 |     reveal_type(x)  # revealed: Unknown
-  |                 ^ `Unknown`
-  |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_wi…_(1136c0e783d61ba4).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_wi…_(1136c0e783d61ba4).snap
index e37675bbc2..340c169cde 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_wi…_(1136c0e783d61ba4).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_wi…_(1136c0e783d61ba4).snap
@@ -12,46 +12,32 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class Iterator:
- 4 |     def __next__(self) -> int:
- 5 |         return 42
- 6 | 
- 7 | class Iterable:
- 8 |     def __iter__(self, extra_arg) -> Iterator:
- 9 |         return Iterator()
-10 | 
-11 | # error: [not-iterable]
-12 | for x in Iterable():
-13 |     reveal_type(x)  # revealed: int
+ 1 | class Iterator:
+ 2 |     def __next__(self) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | class Iterable:
+ 6 |     def __iter__(self, extra_arg) -> Iterator:
+ 7 |         return Iterator()
+ 8 | 
+ 9 | # error: [not-iterable]
+10 | for x in Iterable():
+11 |     reveal_type(x)  # revealed: int
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable` is not iterable
-  --> src/mdtest_snippet.py:12:10
+  --> src/mdtest_snippet.py:10:10
    |
-11 | # error: [not-iterable]
-12 | for x in Iterable():
+ 9 | # error: [not-iterable]
+10 | for x in Iterable():
    |          ^^^^^^^^^^
-13 |     reveal_type(x)  # revealed: int
+11 |     reveal_type(x)  # revealed: int
    |
 info: Its `__iter__` method has an invalid signature
 info: Expected signature `def __iter__(self): ...`
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:13:17
-   |
-11 | # error: [not-iterable]
-12 | for x in Iterable():
-13 |     reveal_type(x)  # revealed: int
-   |                 ^ `int`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_a…_(707bd02a22c4acc8).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_a…_(707bd02a22c4acc8).snap
index b5c24e5283..e29a88efa8 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_a…_(707bd02a22c4acc8).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_a…_(707bd02a22c4acc8).snap
@@ -12,42 +12,40 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/loops/for.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | class Iterator1:
- 4 |     def __next__(self, extra_arg) -> int:
- 5 |         return 42
- 6 | 
- 7 | class Iterator2:
- 8 |     __next__: None = None
- 9 | 
-10 | class Iterable1:
-11 |     def __iter__(self) -> Iterator1:
-12 |         return Iterator1()
-13 | 
-14 | class Iterable2:
-15 |     def __iter__(self) -> Iterator2:
-16 |         return Iterator2()
-17 | 
-18 | # error: [not-iterable]
-19 | for x in Iterable1():
-20 |     reveal_type(x)  # revealed: int
-21 | 
-22 | # error: [not-iterable]
-23 | for y in Iterable2():
-24 |     reveal_type(y)  # revealed: Unknown
+ 1 | class Iterator1:
+ 2 |     def __next__(self, extra_arg) -> int:
+ 3 |         return 42
+ 4 | 
+ 5 | class Iterator2:
+ 6 |     __next__: None = None
+ 7 | 
+ 8 | class Iterable1:
+ 9 |     def __iter__(self) -> Iterator1:
+10 |         return Iterator1()
+11 | 
+12 | class Iterable2:
+13 |     def __iter__(self) -> Iterator2:
+14 |         return Iterator2()
+15 | 
+16 | # error: [not-iterable]
+17 | for x in Iterable1():
+18 |     reveal_type(x)  # revealed: int
+19 | 
+20 | # error: [not-iterable]
+21 | for y in Iterable2():
+22 |     reveal_type(y)  # revealed: Unknown
 ```
 
 # Diagnostics
 
 ```
 error[not-iterable]: Object of type `Iterable1` is not iterable
-  --> src/mdtest_snippet.py:19:10
+  --> src/mdtest_snippet.py:17:10
    |
-18 | # error: [not-iterable]
-19 | for x in Iterable1():
+16 | # error: [not-iterable]
+17 | for x in Iterable1():
    |          ^^^^^^^^^^^
-20 |     reveal_type(x)  # revealed: int
+18 |     reveal_type(x)  # revealed: int
    |
 info: Its `__iter__` method returns an object of type `Iterator1`, which has an invalid `__next__` method
 info: Expected signature for `__next__` is `def __next__(self): ...`
@@ -55,42 +53,16 @@ info: rule `not-iterable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:20:17
-   |
-18 | # error: [not-iterable]
-19 | for x in Iterable1():
-20 |     reveal_type(x)  # revealed: int
-   |                 ^ `int`
-21 |
-22 | # error: [not-iterable]
-   |
-
-```
-
 ```
 error[not-iterable]: Object of type `Iterable2` is not iterable
-  --> src/mdtest_snippet.py:23:10
+  --> src/mdtest_snippet.py:21:10
    |
-22 | # error: [not-iterable]
-23 | for y in Iterable2():
+20 | # error: [not-iterable]
+21 | for y in Iterable2():
    |          ^^^^^^^^^^^
-24 |     reveal_type(y)  # revealed: Unknown
+22 |     reveal_type(y)  # revealed: Unknown
    |
 info: Its `__iter__` method returns an object of type `Iterator2`, which has a `__next__` attribute that is not callable
 info: rule `not-iterable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:24:17
-   |
-22 | # error: [not-iterable]
-23 | for y in Iterable2():
-24 |     reveal_type(y)  # revealed: Unknown
-   |                 ^ `Unknown`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/function.md_-_Call_expression_-_Wrong_argument_type_-_Diagnostics_for_unio…_(5396a8f9e7f88f71).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/function.md_-_Call_expression_-_Wrong_argument_type_-_Diagnostics_for_unio…_(5396a8f9e7f88f71).snap
new file mode 100644
index 0000000000..83d62e6d23
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/function.md_-_Call_expression_-_Wrong_argument_type_-_Diagnostics_for_unio…_(5396a8f9e7f88f71).snap
@@ -0,0 +1,135 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: function.md - Call expression - Wrong argument type - Diagnostics for union types where the union is not assignable
+mdtest path: crates/ty_python_semantic/resources/mdtest/call/function.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | from typing import Sized
+ 2 | 
+ 3 | class Foo: ...
+ 4 | class Bar: ...
+ 5 | class Baz: ...
+ 6 | 
+ 7 | def f(x: Sized): ...
+ 8 | def g(
+ 9 |     a: str | Foo,
+10 |     b: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo,
+11 |     c: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo | Bar,
+12 |     d: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo | Bar | Baz,
+13 | ):
+14 |     f(a)  # error: [invalid-argument-type]
+15 |     f(b)  # error: [invalid-argument-type]
+16 |     f(c)  # error: [invalid-argument-type]
+17 |     f(d)  # error: [invalid-argument-type]
+```
+
+# Diagnostics
+
+```
+error[invalid-argument-type]: Argument to function `f` is incorrect
+  --> src/mdtest_snippet.py:14:7
+   |
+12 |     d: list[str] | str | dict[str, str] | tuple[str, ...] | bytes | frozenset[str] | set[str] | Foo | Bar | Baz,
+13 | ):
+14 |     f(a)  # error: [invalid-argument-type]
+   |       ^ Expected `Sized`, found `str | Foo`
+15 |     f(b)  # error: [invalid-argument-type]
+16 |     f(c)  # error: [invalid-argument-type]
+   |
+info: Element `Foo` of this union is not assignable to `Sized`
+info: Function defined here
+ --> src/mdtest_snippet.py:7:5
+  |
+5 | class Baz: ...
+6 |
+7 | def f(x: Sized): ...
+  |     ^ -------- Parameter declared here
+8 | def g(
+9 |     a: str | Foo,
+  |
+info: rule `invalid-argument-type` is enabled by default
+
+```
+
+```
+error[invalid-argument-type]: Argument to function `f` is incorrect
+  --> src/mdtest_snippet.py:15:7
+   |
+13 | ):
+14 |     f(a)  # error: [invalid-argument-type]
+15 |     f(b)  # error: [invalid-argument-type]
+   |       ^ Expected `Sized`, found `list[str] | str | dict[str, str] | ... omitted 5 union elements`
+16 |     f(c)  # error: [invalid-argument-type]
+17 |     f(d)  # error: [invalid-argument-type]
+   |
+info: Element `Foo` of this union is not assignable to `Sized`
+info: Function defined here
+ --> src/mdtest_snippet.py:7:5
+  |
+5 | class Baz: ...
+6 |
+7 | def f(x: Sized): ...
+  |     ^ -------- Parameter declared here
+8 | def g(
+9 |     a: str | Foo,
+  |
+info: rule `invalid-argument-type` is enabled by default
+
+```
+
+```
+error[invalid-argument-type]: Argument to function `f` is incorrect
+  --> src/mdtest_snippet.py:16:7
+   |
+14 |     f(a)  # error: [invalid-argument-type]
+15 |     f(b)  # error: [invalid-argument-type]
+16 |     f(c)  # error: [invalid-argument-type]
+   |       ^ Expected `Sized`, found `list[str] | str | dict[str, str] | ... omitted 6 union elements`
+17 |     f(d)  # error: [invalid-argument-type]
+   |
+info: Union elements `Foo` and `Bar` are not assignable to `Sized`
+info: Function defined here
+ --> src/mdtest_snippet.py:7:5
+  |
+5 | class Baz: ...
+6 |
+7 | def f(x: Sized): ...
+  |     ^ -------- Parameter declared here
+8 | def g(
+9 |     a: str | Foo,
+  |
+info: rule `invalid-argument-type` is enabled by default
+
+```
+
+```
+error[invalid-argument-type]: Argument to function `f` is incorrect
+  --> src/mdtest_snippet.py:17:7
+   |
+15 |     f(b)  # error: [invalid-argument-type]
+16 |     f(c)  # error: [invalid-argument-type]
+17 |     f(d)  # error: [invalid-argument-type]
+   |       ^ Expected `Sized`, found `list[str] | str | dict[str, str] | ... omitted 7 union elements`
+   |
+info: Union element `Foo`, and 2 more union elements, are not assignable to `Sized`
+info: Function defined here
+ --> src/mdtest_snippet.py:7:5
+  |
+5 | class Baz: ...
+6 |
+7 | def f(x: Sized): ...
+  |     ^ -------- Parameter declared here
+8 | def g(
+9 |     a: str | Foo,
+  |
+info: rule `invalid-argument-type` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_bound_ty…_(d50204b9d91b7bd1).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_bound_ty…_(d50204b9d91b7bd1).snap
index 3831ad8e67..f84cd7ec25 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_bound_ty…_(d50204b9d91b7bd1).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_bound_ty…_(d50204b9d91b7bd1).snap
@@ -13,78 +13,38 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/generics/legacy/function
 
 ```
  1 | from typing import TypeVar
- 2 | from typing_extensions import reveal_type
- 3 | 
- 4 | T = TypeVar("T", bound=int)
- 5 | 
- 6 | def f(x: T) -> T:
- 7 |     return x
- 8 | 
- 9 | reveal_type(f(1))  # revealed: Literal[1]
-10 | reveal_type(f(True))  # revealed: Literal[True]
-11 | # error: [invalid-argument-type]
-12 | reveal_type(f("string"))  # revealed: Unknown
+ 2 | 
+ 3 | T = TypeVar("T", bound=int)
+ 4 | 
+ 5 | def f(x: T) -> T:
+ 6 |     return x
+ 7 | 
+ 8 | reveal_type(f(1))  # revealed: Literal[1]
+ 9 | reveal_type(f(True))  # revealed: Literal[True]
+10 | # error: [invalid-argument-type]
+11 | reveal_type(f("string"))  # revealed: Unknown
 ```
 
 # Diagnostics
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:9:13
-   |
- 7 |     return x
- 8 |
- 9 | reveal_type(f(1))  # revealed: Literal[1]
-   |             ^^^^ `Literal[1]`
-10 | reveal_type(f(True))  # revealed: Literal[True]
-11 | # error: [invalid-argument-type]
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:10:13
-   |
- 9 | reveal_type(f(1))  # revealed: Literal[1]
-10 | reveal_type(f(True))  # revealed: Literal[True]
-   |             ^^^^^^^ `Literal[True]`
-11 | # error: [invalid-argument-type]
-12 | reveal_type(f("string"))  # revealed: Unknown
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:12:13
-   |
-10 | reveal_type(f(True))  # revealed: Literal[True]
-11 | # error: [invalid-argument-type]
-12 | reveal_type(f("string"))  # revealed: Unknown
-   |             ^^^^^^^^^^^ `Unknown`
-   |
-
-```
-
 ```
 error[invalid-argument-type]: Argument to function `f` is incorrect
-  --> src/mdtest_snippet.py:12:15
+  --> src/mdtest_snippet.py:11:15
    |
-10 | reveal_type(f(True))  # revealed: Literal[True]
-11 | # error: [invalid-argument-type]
-12 | reveal_type(f("string"))  # revealed: Unknown
-   |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy upper bound of type variable `T`
+ 9 | reveal_type(f(True))  # revealed: Literal[True]
+10 | # error: [invalid-argument-type]
+11 | reveal_type(f("string"))  # revealed: Unknown
+   |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy upper bound `int` of type variable `T`
    |
 info: Type variable defined here
- --> src/mdtest_snippet.py:4:1
+ --> src/mdtest_snippet.py:3:1
   |
-2 | from typing_extensions import reveal_type
-3 |
-4 | T = TypeVar("T", bound=int)
+1 | from typing import TypeVar
+2 |
+3 | T = TypeVar("T", bound=int)
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 |
-6 | def f(x: T) -> T:
+4 |
+5 | def f(x: T) -> T:
   |
 info: rule `invalid-argument-type` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_constrai…_(48ab83f977c109b4).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_constrai…_(48ab83f977c109b4).snap
index f0223b5e64..b0594ecca1 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_constrai…_(48ab83f977c109b4).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___L…_-_Inferring_a_constrai…_(48ab83f977c109b4).snap
@@ -13,93 +13,39 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/generics/legacy/function
 
 ```
  1 | from typing import TypeVar
- 2 | from typing_extensions import reveal_type
- 3 | 
- 4 | T = TypeVar("T", int, None)
- 5 | 
- 6 | def f(x: T) -> T:
- 7 |     return x
- 8 | 
- 9 | reveal_type(f(1))  # revealed: int
-10 | reveal_type(f(True))  # revealed: int
-11 | reveal_type(f(None))  # revealed: None
-12 | # error: [invalid-argument-type]
-13 | reveal_type(f("string"))  # revealed: Unknown
+ 2 | 
+ 3 | T = TypeVar("T", int, None)
+ 4 | 
+ 5 | def f(x: T) -> T:
+ 6 |     return x
+ 7 | 
+ 8 | reveal_type(f(1))  # revealed: int
+ 9 | reveal_type(f(True))  # revealed: int
+10 | reveal_type(f(None))  # revealed: None
+11 | # error: [invalid-argument-type]
+12 | reveal_type(f("string"))  # revealed: Unknown
 ```
 
 # Diagnostics
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:9:13
-   |
- 7 |     return x
- 8 |
- 9 | reveal_type(f(1))  # revealed: int
-   |             ^^^^ `int`
-10 | reveal_type(f(True))  # revealed: int
-11 | reveal_type(f(None))  # revealed: None
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:10:13
-   |
- 9 | reveal_type(f(1))  # revealed: int
-10 | reveal_type(f(True))  # revealed: int
-   |             ^^^^^^^ `int`
-11 | reveal_type(f(None))  # revealed: None
-12 | # error: [invalid-argument-type]
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:11:13
-   |
- 9 | reveal_type(f(1))  # revealed: int
-10 | reveal_type(f(True))  # revealed: int
-11 | reveal_type(f(None))  # revealed: None
-   |             ^^^^^^^ `None`
-12 | # error: [invalid-argument-type]
-13 | reveal_type(f("string"))  # revealed: Unknown
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:13:13
-   |
-11 | reveal_type(f(None))  # revealed: None
-12 | # error: [invalid-argument-type]
-13 | reveal_type(f("string"))  # revealed: Unknown
-   |             ^^^^^^^^^^^ `Unknown`
-   |
-
-```
-
 ```
 error[invalid-argument-type]: Argument to function `f` is incorrect
-  --> src/mdtest_snippet.py:13:15
+  --> src/mdtest_snippet.py:12:15
    |
-11 | reveal_type(f(None))  # revealed: None
-12 | # error: [invalid-argument-type]
-13 | reveal_type(f("string"))  # revealed: Unknown
-   |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy constraints of type variable `T`
+10 | reveal_type(f(None))  # revealed: None
+11 | # error: [invalid-argument-type]
+12 | reveal_type(f("string"))  # revealed: Unknown
+   |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy constraints (`int`, `None`) of type variable `T`
    |
 info: Type variable defined here
- --> src/mdtest_snippet.py:4:1
+ --> src/mdtest_snippet.py:3:1
   |
-2 | from typing_extensions import reveal_type
-3 |
-4 | T = TypeVar("T", int, None)
+1 | from typing import TypeVar
+2 |
+3 | T = TypeVar("T", int, None)
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 |
-6 | def f(x: T) -> T:
+4 |
+5 | def f(x: T) -> T:
   |
 info: rule `invalid-argument-type` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_bound_ty…_(5935d14c26afe407).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_bound_ty…_(5935d14c26afe407).snap
index fc5bb331f1..4ee7b9d656 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_bound_ty…_(5935d14c26afe407).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_bound_ty…_(5935d14c26afe407).snap
@@ -25,45 +25,6 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/generics/pep695/function
 
 # Diagnostics
 
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:6:13
-  |
-4 |     return x
-5 |
-6 | reveal_type(f(1))  # revealed: Literal[1]
-  |             ^^^^ `Literal[1]`
-7 | reveal_type(f(True))  # revealed: Literal[True]
-8 | # error: [invalid-argument-type]
-  |
-
-```
-
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:7:13
-  |
-6 | reveal_type(f(1))  # revealed: Literal[1]
-7 | reveal_type(f(True))  # revealed: Literal[True]
-  |             ^^^^^^^ `Literal[True]`
-8 | # error: [invalid-argument-type]
-9 | reveal_type(f("string"))  # revealed: Unknown
-  |
-
-```
-
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:9:13
-  |
-7 | reveal_type(f(True))  # revealed: Literal[True]
-8 | # error: [invalid-argument-type]
-9 | reveal_type(f("string"))  # revealed: Unknown
-  |             ^^^^^^^^^^^ `Unknown`
-  |
-
-```
-
 ```
 error[invalid-argument-type]: Argument to function `f` is incorrect
  --> src/mdtest_snippet.py:9:15
@@ -71,7 +32,7 @@ error[invalid-argument-type]: Argument to function `f` is incorrect
 7 | reveal_type(f(True))  # revealed: Literal[True]
 8 | # error: [invalid-argument-type]
 9 | reveal_type(f("string"))  # revealed: Unknown
-  |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy upper bound of type variable `T`
+  |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy upper bound `int` of type variable `T`
   |
 info: Type variable defined here
  --> src/mdtest_snippet.py:3:7
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_constrai…_(d2c475fccc70a8e2).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_constrai…_(d2c475fccc70a8e2).snap
index 8a961a23fc..36c8170f75 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_constrai…_(d2c475fccc70a8e2).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/functions.md_-_Generic_functions___P…_-_Inferring_a_constrai…_(d2c475fccc70a8e2).snap
@@ -26,59 +26,6 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/generics/pep695/function
 
 # Diagnostics
 
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:6:13
-  |
-4 |     return x
-5 |
-6 | reveal_type(f(1))  # revealed: int
-  |             ^^^^ `int`
-7 | reveal_type(f(True))  # revealed: int
-8 | reveal_type(f(None))  # revealed: None
-  |
-
-```
-
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:7:13
-  |
-6 | reveal_type(f(1))  # revealed: int
-7 | reveal_type(f(True))  # revealed: int
-  |             ^^^^^^^ `int`
-8 | reveal_type(f(None))  # revealed: None
-9 | # error: [invalid-argument-type]
-  |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:8:13
-   |
- 6 | reveal_type(f(1))  # revealed: int
- 7 | reveal_type(f(True))  # revealed: int
- 8 | reveal_type(f(None))  # revealed: None
-   |             ^^^^^^^ `None`
- 9 | # error: [invalid-argument-type]
-10 | reveal_type(f("string"))  # revealed: Unknown
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:10:13
-   |
- 8 | reveal_type(f(None))  # revealed: None
- 9 | # error: [invalid-argument-type]
-10 | reveal_type(f("string"))  # revealed: Unknown
-   |             ^^^^^^^^^^^ `Unknown`
-   |
-
-```
-
 ```
 error[invalid-argument-type]: Argument to function `f` is incorrect
   --> src/mdtest_snippet.py:10:15
@@ -86,7 +33,7 @@ error[invalid-argument-type]: Argument to function `f` is incorrect
  8 | reveal_type(f(None))  # revealed: None
  9 | # error: [invalid-argument-type]
 10 | reveal_type(f("string"))  # revealed: Unknown
-   |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy constraints of type variable `T`
+   |               ^^^^^^^^ Argument type `Literal["string"]` does not satisfy constraints (`int`, `None`) of type variable `T`
    |
 info: Type variable defined here
  --> src/mdtest_snippet.py:3:7
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/instance_layout_conf…_-_Tests_for_ty's_`inst…_-_Built-ins_with_impli…_(f5857d64ce69ca1d).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/instance_layout_conf…_-_Tests_for_ty's_`inst…_-_Built-ins_with_impli…_(f5857d64ce69ca1d).snap
index 8c9a693f17..ddeee94396 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/instance_layout_conf…_-_Tests_for_ty's_`inst…_-_Built-ins_with_impli…_(f5857d64ce69ca1d).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/instance_layout_conf…_-_Tests_for_ty's_`inst…_-_Built-ins_with_impli…_(f5857d64ce69ca1d).snap
@@ -12,59 +12,72 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/instance_layout_conflict
 ## mdtest_snippet.py
 
 ```
- 1 | # fmt: off
+ 1 | from typing_extensions import disjoint_base
  2 | 
- 3 | class A(  # error: [instance-layout-conflict]
- 4 |     int,
- 5 |     str
- 6 | ): ...
- 7 | 
- 8 | class B:
- 9 |     __slots__ = ("b",)
-10 | 
-11 | class C(  # error: [instance-layout-conflict]
-12 |     int,
-13 |     B,
-14 | ): ...
-15 | class D(int): ...
-16 | 
-17 | class E(  # error: [instance-layout-conflict]
-18 |     D,
-19 |     str
-20 | ): ...
-21 | 
-22 | class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
+ 3 | # fmt: off
+ 4 | 
+ 5 | class A(  # error: [instance-layout-conflict]
+ 6 |     int,
+ 7 |     str
+ 8 | ): ...
+ 9 | 
+10 | class B:
+11 |     __slots__ = ("b",)
+12 | 
+13 | class C(  # error: [instance-layout-conflict]
+14 |     int,
+15 |     B,
+16 | ): ...
+17 | class D(int): ...
+18 | 
+19 | class E(  # error: [instance-layout-conflict]
+20 |     D,
+21 |     str
+22 | ): ...
 23 | 
-24 | # fmt: on
-25 | class Foo(range, str): ...  # error: [subclass-of-final-class]
+24 | class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
+25 | 
+26 | @disjoint_base
+27 | class G: ...
+28 | 
+29 | @disjoint_base
+30 | class H: ...
+31 | 
+32 | class I(  # error: [instance-layout-conflict]
+33 |     G,
+34 |     H
+35 | ): ...
+36 | 
+37 | # fmt: on
+38 | class Foo(range, str): ...  # error: [subclass-of-final-class]
 ```
 
 # Diagnostics
 
 ```
 error[instance-layout-conflict]: Class will raise `TypeError` at runtime due to incompatible bases
- --> src/mdtest_snippet.py:3:7
-  |
-1 |   # fmt: off
-2 |
-3 |   class A(  # error: [instance-layout-conflict]
-  |  _______^
-4 | |     int,
-5 | |     str
-6 | | ): ...
-  | |_^ Bases `int` and `str` cannot be combined in multiple inheritance
-7 |
-8 |   class B:
-  |
+  --> src/mdtest_snippet.py:5:7
+   |
+ 3 |   # fmt: off
+ 4 |
+ 5 |   class A(  # error: [instance-layout-conflict]
+   |  _______^
+ 6 | |     int,
+ 7 | |     str
+ 8 | | ): ...
+   | |_^ Bases `int` and `str` cannot be combined in multiple inheritance
+ 9 |
+10 |   class B:
+   |
 info: Two classes cannot coexist in a class's MRO if their instances have incompatible memory layouts
- --> src/mdtest_snippet.py:4:5
+ --> src/mdtest_snippet.py:6:5
   |
-3 | class A(  # error: [instance-layout-conflict]
-4 |     int,
+5 | class A(  # error: [instance-layout-conflict]
+6 |     int,
   |     --- `int` instances have a distinct memory layout because of the way `int` is implemented in a C extension
-5 |     str
+7 |     str
   |     --- `str` instances have a distinct memory layout because of the way `str` is implemented in a C extension
-6 | ): ...
+8 | ): ...
   |
 info: rule `instance-layout-conflict` is enabled by default
 
@@ -72,28 +85,28 @@ info: rule `instance-layout-conflict` is enabled by default
 
 ```
 error[instance-layout-conflict]: Class will raise `TypeError` at runtime due to incompatible bases
-  --> src/mdtest_snippet.py:11:7
+  --> src/mdtest_snippet.py:13:7
    |
- 9 |       __slots__ = ("b",)
-10 |
-11 |   class C(  # error: [instance-layout-conflict]
+11 |       __slots__ = ("b",)
+12 |
+13 |   class C(  # error: [instance-layout-conflict]
    |  _______^
-12 | |     int,
-13 | |     B,
-14 | | ): ...
+14 | |     int,
+15 | |     B,
+16 | | ): ...
    | |_^ Bases `int` and `B` cannot be combined in multiple inheritance
-15 |   class D(int): ...
+17 |   class D(int): ...
    |
 info: Two classes cannot coexist in a class's MRO if their instances have incompatible memory layouts
-  --> src/mdtest_snippet.py:12:5
+  --> src/mdtest_snippet.py:14:5
    |
-11 | class C(  # error: [instance-layout-conflict]
-12 |     int,
+13 | class C(  # error: [instance-layout-conflict]
+14 |     int,
    |     --- `int` instances have a distinct memory layout because of the way `int` is implemented in a C extension
-13 |     B,
+15 |     B,
    |     - `B` instances have a distinct memory layout because `B` defines non-empty `__slots__`
-14 | ): ...
-15 | class D(int): ...
+16 | ): ...
+17 | class D(int): ...
    |
 info: rule `instance-layout-conflict` is enabled by default
 
@@ -101,31 +114,31 @@ info: rule `instance-layout-conflict` is enabled by default
 
 ```
 error[instance-layout-conflict]: Class will raise `TypeError` at runtime due to incompatible bases
-  --> src/mdtest_snippet.py:17:7
+  --> src/mdtest_snippet.py:19:7
    |
-15 |   class D(int): ...
-16 |
-17 |   class E(  # error: [instance-layout-conflict]
+17 |   class D(int): ...
+18 |
+19 |   class E(  # error: [instance-layout-conflict]
    |  _______^
-18 | |     D,
-19 | |     str
-20 | | ): ...
+20 | |     D,
+21 | |     str
+22 | | ): ...
    | |_^ Bases `D` and `str` cannot be combined in multiple inheritance
-21 |
-22 |   class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
+23 |
+24 |   class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
    |
 info: Two classes cannot coexist in a class's MRO if their instances have incompatible memory layouts
-  --> src/mdtest_snippet.py:18:5
+  --> src/mdtest_snippet.py:20:5
    |
-17 | class E(  # error: [instance-layout-conflict]
-18 |     D,
+19 | class E(  # error: [instance-layout-conflict]
+20 |     D,
    |     -
    |     |
    |     `D` instances have a distinct memory layout because `D` inherits from `int`
    |     `int` instances have a distinct memory layout because of the way `int` is implemented in a C extension
-19 |     str
+21 |     str
    |     --- `str` instances have a distinct memory layout because of the way `str` is implemented in a C extension
-20 | ): ...
+22 | ): ...
    |
 info: rule `instance-layout-conflict` is enabled by default
 
@@ -133,28 +146,57 @@ info: rule `instance-layout-conflict` is enabled by default
 
 ```
 error[instance-layout-conflict]: Class will raise `TypeError` at runtime due to incompatible bases
-  --> src/mdtest_snippet.py:22:7
+  --> src/mdtest_snippet.py:24:7
    |
-20 | ): ...
-21 |
-22 | class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
-   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Bases `int`, `str`, `bytes` and `bytearray` cannot be combined in multiple inheritance
+22 | ): ...
 23 |
-24 | # fmt: on
+24 | class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Bases `int`, `str`, `bytes` and `bytearray` cannot be combined in multiple inheritance
+25 |
+26 | @disjoint_base
    |
 info: Two classes cannot coexist in a class's MRO if their instances have incompatible memory layouts
-  --> src/mdtest_snippet.py:22:9
+  --> src/mdtest_snippet.py:24:9
    |
-20 | ): ...
-21 |
-22 | class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
+22 | ): ...
+23 |
+24 | class F(int, str, bytes, bytearray): ...  # error: [instance-layout-conflict]
    |         ---  ---  -----  --------- `bytearray` instances have a distinct memory layout because of the way `bytearray` is implemented in a C extension
    |         |    |    |
    |         |    |    `bytes` instances have a distinct memory layout because of the way `bytes` is implemented in a C extension
    |         |    `str` instances have a distinct memory layout because of the way `str` is implemented in a C extension
    |         `int` instances have a distinct memory layout because of the way `int` is implemented in a C extension
-23 |
-24 | # fmt: on
+25 |
+26 | @disjoint_base
+   |
+info: rule `instance-layout-conflict` is enabled by default
+
+```
+
+```
+error[instance-layout-conflict]: Class will raise `TypeError` at runtime due to incompatible bases
+  --> src/mdtest_snippet.py:32:7
+   |
+30 |   class H: ...
+31 |
+32 |   class I(  # error: [instance-layout-conflict]
+   |  _______^
+33 | |     G,
+34 | |     H
+35 | | ): ...
+   | |_^ Bases `G` and `H` cannot be combined in multiple inheritance
+36 |
+37 |   # fmt: on
+   |
+info: Two classes cannot coexist in a class's MRO if their instances have incompatible memory layouts
+  --> src/mdtest_snippet.py:33:5
+   |
+32 | class I(  # error: [instance-layout-conflict]
+33 |     G,
+   |     - `G` instances have a distinct memory layout because of the way `G` is implemented in a C extension
+34 |     H
+   |     - `H` instances have a distinct memory layout because of the way `H` is implemented in a C extension
+35 | ): ...
    |
 info: rule `instance-layout-conflict` is enabled by default
 
@@ -162,10 +204,10 @@ info: rule `instance-layout-conflict` is enabled by default
 
 ```
 error[subclass-of-final-class]: Class `Foo` cannot inherit from final class `range`
-  --> src/mdtest_snippet.py:25:11
+  --> src/mdtest_snippet.py:38:11
    |
-24 | # fmt: on
-25 | class Foo(range, str): ...  # error: [subclass-of-final-class]
+37 | # fmt: on
+38 | class Foo(range, str): ...  # error: [subclass-of-final-class]
    |           ^^^^^
    |
 info: rule `subclass-of-final-class` is enabled by default
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Calls_to_methods_(4b3b8695d519a02).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Calls_to_methods_(4b3b8695d519a02).snap
index e0483e581d..a02a98d391 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Calls_to_methods_(4b3b8695d519a02).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Calls_to_methods_(4b3b8695d519a02).snap
@@ -30,7 +30,7 @@ error[invalid-argument-type]: Argument to bound method `square` is incorrect
 6 | c.square("hello")  # error: [invalid-argument-type]
   |          ^^^^^^^ Expected `int`, found `Literal["hello"]`
   |
-info: Function defined here
+info: Method defined here
  --> src/mdtest_snippet.py:2:9
   |
 1 | class C:
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Tests_for_a_variety_…_-_Synthetic_arguments_(4c09844bbbf47741).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Tests_for_a_variety_…_-_Synthetic_arguments_(4c09844bbbf47741).snap
index a21d9085a5..5864211fc9 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Tests_for_a_variety_…_-_Synthetic_arguments_(4c09844bbbf47741).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Tests_for_a_variety_…_-_Synthetic_arguments_(4c09844bbbf47741).snap
@@ -30,7 +30,7 @@ error[invalid-argument-type]: Argument to bound method `__call__` is incorrect
 6 | c("wrong")  # error: [invalid-argument-type]
   |   ^^^^^^^ Expected `int`, found `Literal["wrong"]`
   |
-info: Function defined here
+info: Method defined here
  --> src/mdtest_snippet.py:2:9
   |
 1 | class C:
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Basic_(f15db7dc447d0795).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Basic_(f15db7dc447d0795).snap
index c4304a77ee..312f3209c5 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Basic_(f15db7dc447d0795).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Basic_(f15db7dc447d0795).snap
@@ -26,14 +26,13 @@ error[invalid-await]: `Literal[1]` is not awaitable
   2 |     await 1  # error: [invalid-await]
     |           ^
     |
-   ::: stdlib/builtins.pyi:337:7
+   ::: stdlib/builtins.pyi:346:7
     |
-335 | _LiteralInteger = _PositiveInteger | _NegativeInteger | Literal[0]  # noqa: Y026  # TODO: Use TypeAlias once mypy bugs are fixed
-336 |
-337 | class int:
+345 | @disjoint_base
+346 | class int:
     |       --- type defined here
-338 |     """int([x]) -> integer
-339 |     int(x, base=10) -> integer
+347 |     """int([x]) -> integer
+348 |     int(x, base=10) -> integer
     |
 info: `__await__` is missing
 info: rule `invalid-await` is enabled by default
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Custom_type_with_pos…_(e3444b7a7f960d04).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Custom_type_with_pos…_(a028edbafe180ca).snap
similarity index 92%
rename from crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Custom_type_with_pos…_(e3444b7a7f960d04).snap
rename to crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Custom_type_with_pos…_(a028edbafe180ca).snap
index 22233a6acd..ac576c9ad7 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Custom_type_with_pos…_(e3444b7a7f960d04).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_await.md_-_Invalid_await_diagno…_-_Custom_type_with_pos…_(a028edbafe180ca).snap
@@ -3,7 +3,7 @@ source: crates/ty_test/src/lib.rs
 expression: snapshot
 ---
 ---
-mdtest name: invalid_await.md - Invalid await diagnostics - Custom type with possibly unbound `__await__`
+mdtest name: invalid_await.md - Invalid await diagnostics - Custom type with possibly missing `__await__`
 mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/invalid_await.md
 ---
 
@@ -41,7 +41,7 @@ error[invalid-await]: `PossiblyUnbound` is not awaitable
   |             --------------- method defined here
 6 |             yield
   |
-info: `__await__` is possibly unbound
+info: `__await__` may be missing
 info: rule `invalid-await` is enabled by default
 
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Boolean_parameters_m…_(3edf97b20f58fa11).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Boolean_parameters_m…_(3edf97b20f58fa11).snap
new file mode 100644
index 0000000000..ca39b8044b
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Boolean_parameters_m…_(3edf97b20f58fa11).snap
@@ -0,0 +1,70 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Boolean parameters must be unambiguous
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | from typing_extensions import TypeVar
+ 2 | 
+ 3 | def cond() -> bool:
+ 4 |     return True
+ 5 | 
+ 6 | # error: [invalid-legacy-type-variable]
+ 7 | T = TypeVar("T", covariant=cond())
+ 8 | 
+ 9 | # error: [invalid-legacy-type-variable]
+10 | U = TypeVar("U", contravariant=cond())
+11 | 
+12 | # error: [invalid-legacy-type-variable]
+13 | V = TypeVar("V", infer_variance=cond())
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: The `covariant` parameter of `TypeVar` cannot have an ambiguous truthiness
+ --> src/mdtest_snippet.py:7:28
+  |
+6 | # error: [invalid-legacy-type-variable]
+7 | T = TypeVar("T", covariant=cond())
+  |                            ^^^^^^
+8 |
+9 | # error: [invalid-legacy-type-variable]
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
+
+```
+error[invalid-legacy-type-variable]: The `contravariant` parameter of `TypeVar` cannot have an ambiguous truthiness
+  --> src/mdtest_snippet.py:10:32
+   |
+ 9 | # error: [invalid-legacy-type-variable]
+10 | U = TypeVar("U", contravariant=cond())
+   |                                ^^^^^^
+11 |
+12 | # error: [invalid-legacy-type-variable]
+   |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
+
+```
+error[invalid-legacy-type-variable]: The `infer_variance` parameter of `TypeVar` cannot have an ambiguous truthiness
+  --> src/mdtest_snippet.py:13:33
+   |
+12 | # error: [invalid-legacy-type-variable]
+13 | V = TypeVar("V", infer_variance=cond())
+   |                                 ^^^^^^
+   |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_be_both_covar…_(b7b0976739681470).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_be_both_covar…_(b7b0976739681470).snap
new file mode 100644
index 0000000000..4f2e6633ee
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_be_both_covar…_(b7b0976739681470).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Cannot be both covariant and contravariant
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", covariant=True, contravariant=True)
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: A `TypeVar` cannot be both covariant and contravariant
+ --> src/mdtest_snippet.py:4:5
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", covariant=True, contravariant=True)
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_have_both_bou…_(4ca5f13621915554).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_have_both_bou…_(4ca5f13621915554).snap
new file mode 100644
index 0000000000..34ade6dbcf
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_have_both_bou…_(4ca5f13621915554).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Cannot have both bound and constraint
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", int, str, bound=bytes)
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: A `TypeVar` cannot have both a bound and constraints
+ --> src/mdtest_snippet.py:4:5
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", int, str, bound=bytes)
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_have_only_one…_(8b0258f5188209c6).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_have_only_one…_(8b0258f5188209c6).snap
new file mode 100644
index 0000000000..f65fedf52f
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Cannot_have_only_one…_(8b0258f5188209c6).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Cannot have only one constraint
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", int)
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: A `TypeVar` cannot have exactly one constraint
+ --> src/mdtest_snippet.py:4:18
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", int)
+  |                  ^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Invalid_feature_for_…_(72827c64b5c73d05).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Invalid_feature_for_…_(72827c64b5c73d05).snap
new file mode 100644
index 0000000000..f821820e2d
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Invalid_feature_for_…_(72827c64b5c73d05).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Invalid feature for this Python version
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", default=int)
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: The `default` parameter of `typing.TypeVar` was added in Python 3.13
+ --> src/mdtest_snippet.py:4:18
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", default=int)
+  |                  ^^^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Invalid_keyword_argu…_(39164266ada3dc2f).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Invalid_keyword_argu…_(39164266ada3dc2f).snap
new file mode 100644
index 0000000000..1f528a53a9
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Invalid_keyword_argu…_(39164266ada3dc2f).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Invalid keyword arguments
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", invalid_keyword=True)
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: Unknown keyword argument `invalid_keyword` in `TypeVar` creation
+ --> src/mdtest_snippet.py:4:18
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", invalid_keyword=True)
+  |                  ^^^^^^^^^^^^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Must_be_directly_ass…_(c2e3e46852bb268f).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Must_be_directly_ass…_(c2e3e46852bb268f).snap
new file mode 100644
index 0000000000..61f017d813
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Must_be_directly_ass…_(c2e3e46852bb268f).snap
@@ -0,0 +1,52 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Must be directly assigned to a variable
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | T = TypeVar("T")
+4 | # error: [invalid-legacy-type-variable]
+5 | U: TypeVar = TypeVar("U")
+6 | 
+7 | # error: [invalid-legacy-type-variable]
+8 | tuple_with_typevar = ("foo", TypeVar("W"))
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: A `TypeVar` definition must be a simple variable assignment
+ --> src/mdtest_snippet.py:5:14
+  |
+3 | T = TypeVar("T")
+4 | # error: [invalid-legacy-type-variable]
+5 | U: TypeVar = TypeVar("U")
+  |              ^^^^^^^^^^^^
+6 |
+7 | # error: [invalid-legacy-type-variable]
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
+
+```
+error[invalid-legacy-type-variable]: A `TypeVar` definition must be a simple variable assignment
+ --> src/mdtest_snippet.py:8:30
+  |
+7 | # error: [invalid-legacy-type-variable]
+8 | tuple_with_typevar = ("foo", TypeVar("W"))
+  |                              ^^^^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Must_have_a_name_(79a4ce09338e666b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Must_have_a_name_(79a4ce09338e666b).snap
new file mode 100644
index 0000000000..4b4dc20db3
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Must_have_a_name_(79a4ce09338e666b).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Must have a name
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar()
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: The `name` parameter of `TypeVar` is required.
+ --> src/mdtest_snippet.py:4:5
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar()
+  |     ^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Name_can't_be_given_…_(8f6aed0dba79e995).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Name_can't_be_given_…_(8f6aed0dba79e995).snap
new file mode 100644
index 0000000000..6938f2c2a8
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_Name_can't_be_given_…_(8f6aed0dba79e995).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - Name can't be given more than once
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", name="T")
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: The `name` parameter of `TypeVar` can only be provided once.
+ --> src/mdtest_snippet.py:4:18
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("T", name="T")
+  |                  ^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_No_variadic_argument…_(9d57505425233fd8).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_No_variadic_argument…_(9d57505425233fd8).snap
new file mode 100644
index 0000000000..f2c8a4162c
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_No_variadic_argument…_(9d57505425233fd8).snap
@@ -0,0 +1,52 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - No variadic arguments
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | types = (int, str)
+4 | 
+5 | # error: [invalid-legacy-type-variable]
+6 | T = TypeVar("T", *types)
+7 | 
+8 | # error: [invalid-legacy-type-variable]
+9 | S = TypeVar("S", **{"bound": int})
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: Starred arguments are not supported in `TypeVar` creation
+ --> src/mdtest_snippet.py:6:18
+  |
+5 | # error: [invalid-legacy-type-variable]
+6 | T = TypeVar("T", *types)
+  |                  ^^^^^^
+7 |
+8 | # error: [invalid-legacy-type-variable]
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
+
+```
+error[invalid-legacy-type-variable]: Starred arguments are not supported in `TypeVar` creation
+ --> src/mdtest_snippet.py:9:18
+  |
+8 | # error: [invalid-legacy-type-variable]
+9 | S = TypeVar("S", **{"bound": int})
+  |                  ^^^^^^^^^^^^^^^^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_`TypeVar`_parameter_…_(8424f2b8bc4351f9).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_`TypeVar`_parameter_…_(8424f2b8bc4351f9).snap
new file mode 100644
index 0000000000..f464f2861f
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/legacy_typevars.md_-_Legacy_typevar_creat…_-_`TypeVar`_parameter_…_(8424f2b8bc4351f9).snap
@@ -0,0 +1,33 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: legacy_typevars.md - Legacy typevar creation diagnostics - `TypeVar` parameter must match variable name
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/legacy_typevars.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import TypeVar
+2 | 
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("Q")
+```
+
+# Diagnostics
+
+```
+error[invalid-legacy-type-variable]: The name of a `TypeVar` (`Q`) must match the name of the variable it is assigned to (`T`)
+ --> src/mdtest_snippet.py:4:1
+  |
+3 | # error: [invalid-legacy-type-variable]
+4 | T = TypeVar("Q")
+  | ^
+  |
+info: rule `invalid-legacy-type-variable` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/missing_argument.md_-_Missing_argument_dia…_(f0811e84fcea1085).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/missing_argument.md_-_Missing_argument_dia…_(f0811e84fcea1085).snap
new file mode 100644
index 0000000000..5311a64551
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/missing_argument.md_-_Missing_argument_dia…_(f0811e84fcea1085).snap
@@ -0,0 +1,117 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: missing_argument.md - Missing argument diagnostics
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/missing_argument.md
+---
+
+# Python source files
+
+## module.py
+
+```
+1 | def f(a, b=42): ...
+2 | def g(a, b): ...
+3 | 
+4 | class Foo:
+5 |     def method(self, a): ...
+```
+
+## main.py
+
+```
+ 1 | from module import f, g, Foo
+ 2 | 
+ 3 | f()  # error: [missing-argument]
+ 4 | 
+ 5 | def coinflip() -> bool:
+ 6 |     return True
+ 7 | 
+ 8 | h = f if coinflip() else g
+ 9 | 
+10 | # error: [missing-argument]
+11 | # error: [missing-argument]
+12 | h(b=56)
+13 | 
+14 | Foo().method()  # error: [missing-argument]
+```
+
+# Diagnostics
+
+```
+error[missing-argument]: No argument provided for required parameter `a` of function `f`
+ --> src/main.py:3:1
+  |
+1 | from module import f, g, Foo
+2 |
+3 | f()  # error: [missing-argument]
+  | ^^^
+4 |
+5 | def coinflip() -> bool:
+  |
+info: Parameter declared here
+ --> src/module.py:1:7
+  |
+1 | def f(a, b=42): ...
+  |       ^
+2 | def g(a, b): ...
+  |
+info: rule `missing-argument` is enabled by default
+
+```
+
+```
+error[missing-argument]: No argument provided for required parameter `a` of function `f`
+  --> src/main.py:12:1
+   |
+10 | # error: [missing-argument]
+11 | # error: [missing-argument]
+12 | h(b=56)
+   | ^^^^^^^
+13 |
+14 | Foo().method()  # error: [missing-argument]
+   |
+info: Union variant `def f(a, b=Literal[42]) -> Unknown` is incompatible with this call site
+info: Attempted to call union type `(def f(a, b=Literal[42]) -> Unknown) | (def g(a, b) -> Unknown)`
+info: rule `missing-argument` is enabled by default
+
+```
+
+```
+error[missing-argument]: No argument provided for required parameter `a` of function `g`
+  --> src/main.py:12:1
+   |
+10 | # error: [missing-argument]
+11 | # error: [missing-argument]
+12 | h(b=56)
+   | ^^^^^^^
+13 |
+14 | Foo().method()  # error: [missing-argument]
+   |
+info: Union variant `def g(a, b) -> Unknown` is incompatible with this call site
+info: Attempted to call union type `(def f(a, b=Literal[42]) -> Unknown) | (def g(a, b) -> Unknown)`
+info: rule `missing-argument` is enabled by default
+
+```
+
+```
+error[missing-argument]: No argument provided for required parameter `a` of bound method `method`
+  --> src/main.py:14:1
+   |
+12 | h(b=56)
+13 |
+14 | Foo().method()  # error: [missing-argument]
+   | ^^^^^^^^^^^^^^
+   |
+info: Parameter declared here
+ --> src/module.py:5:22
+  |
+4 | class Foo:
+5 |     def method(self, a): ...
+  |                      ^
+  |
+info: rule `missing-argument` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap
index 1b60443d4d..ecdcac656c 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap
@@ -12,67 +12,39 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/mro.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
- 2 | 
- 3 | def returns_bool() -> bool:
- 4 |     return True
- 5 | 
- 6 | class A: ...
- 7 | class B: ...
- 8 | 
- 9 | if returns_bool():
-10 |     x = A
-11 | else:
-12 |     x = B
+ 1 | def returns_bool() -> bool:
+ 2 |     return True
+ 3 | 
+ 4 | class A: ...
+ 5 | class B: ...
+ 6 | 
+ 7 | if returns_bool():
+ 8 |     x = A
+ 9 | else:
+10 |     x = B
+11 | 
+12 | reveal_type(x)  # revealed: <class 'A'> | <class 'B'>
 13 | 
-14 | reveal_type(x)  # revealed: <class 'A'> | <class 'B'>
-15 | 
-16 | # error: 11 [unsupported-base] "Unsupported class base with type `<class 'A'> | <class 'B'>`"
-17 | class Foo(x): ...
-18 | 
-19 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
+14 | # error: 11 [unsupported-base] "Unsupported class base with type `<class 'A'> | <class 'B'>`"
+15 | class Foo(x): ...
+16 | 
+17 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
 ```
 
 # Diagnostics
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:13
-   |
-12 |     x = B
-13 |
-14 | reveal_type(x)  # revealed: <class 'A'> | <class 'B'>
-   |             ^ `<class 'A'> | <class 'B'>`
-15 |
-16 | # error: 11 [unsupported-base] "Unsupported class base with type `<class 'A'> | <class 'B'>`"
-   |
-
-```
-
 ```
 warning[unsupported-base]: Unsupported class base with type `<class 'A'> | <class 'B'>`
-  --> src/mdtest_snippet.py:17:11
+  --> src/mdtest_snippet.py:15:11
    |
-16 | # error: 11 [unsupported-base] "Unsupported class base with type `<class 'A'> | <class 'B'>`"
-17 | class Foo(x): ...
+14 | # error: 11 [unsupported-base] "Unsupported class base with type `<class 'A'> | <class 'B'>`"
+15 | class Foo(x): ...
    |           ^
-18 |
-19 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
+16 |
+17 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
    |
 info: ty cannot resolve a consistent MRO for class `Foo` due to this base
 info: Only class objects or `Any` are supported as class bases
 info: rule `unsupported-base` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:19:13
-   |
-17 | class Foo(x): ...
-18 |
-19 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
-   |             ^^^^^^^^^^^ `tuple[<class 'Foo'>, Unknown, <class 'object'>]`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_wi…_(ea7ebc83ec359b54).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_wi…_(ea7ebc83ec359b54).snap
index fceb6462c8..4f216ab4a8 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_wi…_(ea7ebc83ec359b54).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_wi…_(ea7ebc83ec359b54).snap
@@ -12,167 +12,147 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/mro.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import reveal_type
+ 1 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
  2 | 
- 3 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
+ 3 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
  4 | 
- 5 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
- 6 | 
- 7 | class Spam: ...
- 8 | class Eggs: ...
- 9 | class Bar: ...
-10 | class Baz: ...
+ 5 | class Spam: ...
+ 6 | class Eggs: ...
+ 7 | class Bar: ...
+ 8 | class Baz: ...
+ 9 | 
+10 | # fmt: off
 11 | 
-12 | # fmt: off
-13 | 
-14 | # error: [duplicate-base] "Duplicate base class `Spam`"
-15 | # error: [duplicate-base] "Duplicate base class `Eggs`"
-16 | class Ham(
-17 |     Spam,
-18 |     Eggs,
-19 |     Bar,
-20 |     Baz,
-21 |     Spam,
-22 |     Eggs,
-23 | ): ...
+12 | # error: [duplicate-base] "Duplicate base class `Spam`"
+13 | # error: [duplicate-base] "Duplicate base class `Eggs`"
+14 | class Ham(
+15 |     Spam,
+16 |     Eggs,
+17 |     Bar,
+18 |     Baz,
+19 |     Spam,
+20 |     Eggs,
+21 | ): ...
+22 | 
+23 | # fmt: on
 24 | 
-25 | # fmt: on
+25 | reveal_type(Ham.__mro__)  # revealed: tuple[<class 'Ham'>, Unknown, <class 'object'>]
 26 | 
-27 | reveal_type(Ham.__mro__)  # revealed: tuple[<class 'Ham'>, Unknown, <class 'object'>]
-28 | 
-29 | class Mushrooms: ...
-30 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
+27 | class Mushrooms: ...
+28 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
+29 | 
+30 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
 31 | 
-32 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
+32 | # fmt: off
 33 | 
-34 | # fmt: off
-35 | 
-36 | # error: [duplicate-base] "Duplicate base class `Eggs`"
-37 | class VeryEggyOmelette(
-38 |     Eggs,
-39 |     Ham,
-40 |     Spam,
-41 |     Eggs,
-42 |     Mushrooms,
-43 |     Bar,
+34 | # error: [duplicate-base] "Duplicate base class `Eggs`"
+35 | class VeryEggyOmelette(
+36 |     Eggs,
+37 |     Ham,
+38 |     Spam,
+39 |     Eggs,
+40 |     Mushrooms,
+41 |     Bar,
+42 |     Eggs,
+43 |     Baz,
 44 |     Eggs,
-45 |     Baz,
-46 |     Eggs,
-47 | ): ...
-48 | 
-49 | # fmt: off
-50 | # fmt: off
+45 | ): ...
+46 | 
+47 | # fmt: off
+48 | # fmt: off
+49 | 
+50 | class A: ...
 51 | 
-52 | class A: ...
-53 | 
-54 | class B(  # type: ignore[duplicate-base]
-55 |     A,
-56 |     A,
-57 | ): ...
-58 | 
-59 | class C(
-60 |     A,
-61 |     A
-62 | ):  # type: ignore[duplicate-base]
-63 |     x: int
-64 | 
-65 | # fmt: on
-66 | # fmt: off
-67 | 
-68 | # error: [duplicate-base]
-69 | class D(
-70 |     A,
-71 |     # error: [unused-ignore-comment]
-72 |     A,  # type: ignore[duplicate-base]
-73 | ): ...
-74 | 
-75 | # error: [duplicate-base]
-76 | class E(
-77 |     A,
-78 |     A
-79 | ):
-80 |     # error: [unused-ignore-comment]
-81 |     x: int  # type: ignore[duplicate-base]
-82 | 
-83 | # fmt: on
+52 | class B(  # type: ignore[duplicate-base]
+53 |     A,
+54 |     A,
+55 | ): ...
+56 | 
+57 | class C(
+58 |     A,
+59 |     A
+60 | ):  # type: ignore[duplicate-base]
+61 |     x: int
+62 | 
+63 | # fmt: on
+64 | # fmt: off
+65 | 
+66 | # error: [duplicate-base]
+67 | class D(
+68 |     A,
+69 |     # error: [unused-ignore-comment]
+70 |     A,  # type: ignore[duplicate-base]
+71 | ): ...
+72 | 
+73 | # error: [duplicate-base]
+74 | class E(
+75 |     A,
+76 |     A
+77 | ):
+78 |     # error: [unused-ignore-comment]
+79 |     x: int  # type: ignore[duplicate-base]
+80 | 
+81 | # fmt: on
 ```
 
 # Diagnostics
 
 ```
 error[duplicate-base]: Duplicate base class `str`
- --> src/mdtest_snippet.py:3:7
+ --> src/mdtest_snippet.py:1:7
   |
-1 | from typing_extensions import reveal_type
-2 |
-3 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
+1 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
   |       ^^^^^^^^^^^^^
-4 |
-5 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
+2 |
+3 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
   |
 info: The definition of class `Foo` will raise `TypeError` at runtime
- --> src/mdtest_snippet.py:3:11
+ --> src/mdtest_snippet.py:1:11
   |
-1 | from typing_extensions import reveal_type
-2 |
-3 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
+1 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
   |           ---  ^^^ Class `str` later repeated here
   |           |
   |           Class `str` first included in bases list here
-4 |
-5 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
+2 |
+3 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
   |
 info: rule `duplicate-base` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:5:13
-  |
-3 | class Foo(str, str): ...  # error: [duplicate-base] "Duplicate base class `str`"
-4 |
-5 | reveal_type(Foo.__mro__)  # revealed: tuple[<class 'Foo'>, Unknown, <class 'object'>]
-  |             ^^^^^^^^^^^ `tuple[<class 'Foo'>, Unknown, <class 'object'>]`
-6 |
-7 | class Spam: ...
-  |
-
-```
-
 ```
 error[duplicate-base]: Duplicate base class `Spam`
-  --> src/mdtest_snippet.py:16:7
+  --> src/mdtest_snippet.py:14:7
    |
-14 |   # error: [duplicate-base] "Duplicate base class `Spam`"
-15 |   # error: [duplicate-base] "Duplicate base class `Eggs`"
-16 |   class Ham(
+12 |   # error: [duplicate-base] "Duplicate base class `Spam`"
+13 |   # error: [duplicate-base] "Duplicate base class `Eggs`"
+14 |   class Ham(
    |  _______^
-17 | |     Spam,
-18 | |     Eggs,
-19 | |     Bar,
-20 | |     Baz,
-21 | |     Spam,
-22 | |     Eggs,
-23 | | ): ...
+15 | |     Spam,
+16 | |     Eggs,
+17 | |     Bar,
+18 | |     Baz,
+19 | |     Spam,
+20 | |     Eggs,
+21 | | ): ...
    | |_^
-24 |
-25 |   # fmt: on
+22 |
+23 |   # fmt: on
    |
 info: The definition of class `Ham` will raise `TypeError` at runtime
-  --> src/mdtest_snippet.py:17:5
+  --> src/mdtest_snippet.py:15:5
    |
-15 | # error: [duplicate-base] "Duplicate base class `Eggs`"
-16 | class Ham(
-17 |     Spam,
+13 | # error: [duplicate-base] "Duplicate base class `Eggs`"
+14 | class Ham(
+15 |     Spam,
    |     ---- Class `Spam` first included in bases list here
-18 |     Eggs,
-19 |     Bar,
-20 |     Baz,
-21 |     Spam,
+16 |     Eggs,
+17 |     Bar,
+18 |     Baz,
+19 |     Spam,
    |     ^^^^ Class `Spam` later repeated here
-22 |     Eggs,
-23 | ): ...
+20 |     Eggs,
+21 | ): ...
    |
 info: rule `duplicate-base` is enabled by default
 
@@ -180,134 +160,106 @@ info: rule `duplicate-base` is enabled by default
 
 ```
 error[duplicate-base]: Duplicate base class `Eggs`
-  --> src/mdtest_snippet.py:16:7
+  --> src/mdtest_snippet.py:14:7
    |
-14 |   # error: [duplicate-base] "Duplicate base class `Spam`"
-15 |   # error: [duplicate-base] "Duplicate base class `Eggs`"
-16 |   class Ham(
+12 |   # error: [duplicate-base] "Duplicate base class `Spam`"
+13 |   # error: [duplicate-base] "Duplicate base class `Eggs`"
+14 |   class Ham(
    |  _______^
-17 | |     Spam,
-18 | |     Eggs,
-19 | |     Bar,
-20 | |     Baz,
-21 | |     Spam,
-22 | |     Eggs,
-23 | | ): ...
+15 | |     Spam,
+16 | |     Eggs,
+17 | |     Bar,
+18 | |     Baz,
+19 | |     Spam,
+20 | |     Eggs,
+21 | | ): ...
    | |_^
-24 |
-25 |   # fmt: on
+22 |
+23 |   # fmt: on
    |
 info: The definition of class `Ham` will raise `TypeError` at runtime
-  --> src/mdtest_snippet.py:18:5
+  --> src/mdtest_snippet.py:16:5
    |
-16 | class Ham(
-17 |     Spam,
-18 |     Eggs,
+14 | class Ham(
+15 |     Spam,
+16 |     Eggs,
    |     ---- Class `Eggs` first included in bases list here
-19 |     Bar,
-20 |     Baz,
-21 |     Spam,
-22 |     Eggs,
+17 |     Bar,
+18 |     Baz,
+19 |     Spam,
+20 |     Eggs,
    |     ^^^^ Class `Eggs` later repeated here
-23 | ): ...
+21 | ): ...
    |
 info: rule `duplicate-base` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:27:13
-   |
-25 | # fmt: on
-26 |
-27 | reveal_type(Ham.__mro__)  # revealed: tuple[<class 'Ham'>, Unknown, <class 'object'>]
-   |             ^^^^^^^^^^^ `tuple[<class 'Ham'>, Unknown, <class 'object'>]`
-28 |
-29 | class Mushrooms: ...
-   |
-
-```
-
 ```
 error[duplicate-base]: Duplicate base class `Mushrooms`
-  --> src/mdtest_snippet.py:30:7
+  --> src/mdtest_snippet.py:28:7
    |
-29 | class Mushrooms: ...
-30 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
+27 | class Mushrooms: ...
+28 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-31 |
-32 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
+29 |
+30 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
    |
 info: The definition of class `Omelette` will raise `TypeError` at runtime
-  --> src/mdtest_snippet.py:30:28
+  --> src/mdtest_snippet.py:28:28
    |
-29 | class Mushrooms: ...
-30 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
+27 | class Mushrooms: ...
+28 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
    |                            ---------  ^^^^^^^^^ Class `Mushrooms` later repeated here
    |                            |
    |                            Class `Mushrooms` first included in bases list here
-31 |
-32 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
+29 |
+30 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
    |
 info: rule `duplicate-base` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:32:13
-   |
-30 | class Omelette(Spam, Eggs, Mushrooms, Mushrooms): ...  # error: [duplicate-base]
-31 |
-32 | reveal_type(Omelette.__mro__)  # revealed: tuple[<class 'Omelette'>, Unknown, <class 'object'>]
-   |             ^^^^^^^^^^^^^^^^ `tuple[<class 'Omelette'>, Unknown, <class 'object'>]`
-33 |
-34 | # fmt: off
-   |
-
-```
-
 ```
 error[duplicate-base]: Duplicate base class `Eggs`
-  --> src/mdtest_snippet.py:37:7
+  --> src/mdtest_snippet.py:35:7
    |
-36 |   # error: [duplicate-base] "Duplicate base class `Eggs`"
-37 |   class VeryEggyOmelette(
+34 |   # error: [duplicate-base] "Duplicate base class `Eggs`"
+35 |   class VeryEggyOmelette(
    |  _______^
-38 | |     Eggs,
-39 | |     Ham,
-40 | |     Spam,
-41 | |     Eggs,
-42 | |     Mushrooms,
-43 | |     Bar,
+36 | |     Eggs,
+37 | |     Ham,
+38 | |     Spam,
+39 | |     Eggs,
+40 | |     Mushrooms,
+41 | |     Bar,
+42 | |     Eggs,
+43 | |     Baz,
 44 | |     Eggs,
-45 | |     Baz,
-46 | |     Eggs,
-47 | | ): ...
+45 | | ): ...
    | |_^
-48 |
-49 |   # fmt: off
+46 |
+47 |   # fmt: off
    |
 info: The definition of class `VeryEggyOmelette` will raise `TypeError` at runtime
-  --> src/mdtest_snippet.py:38:5
+  --> src/mdtest_snippet.py:36:5
    |
-36 | # error: [duplicate-base] "Duplicate base class `Eggs`"
-37 | class VeryEggyOmelette(
-38 |     Eggs,
+34 | # error: [duplicate-base] "Duplicate base class `Eggs`"
+35 | class VeryEggyOmelette(
+36 |     Eggs,
    |     ---- Class `Eggs` first included in bases list here
-39 |     Ham,
-40 |     Spam,
-41 |     Eggs,
+37 |     Ham,
+38 |     Spam,
+39 |     Eggs,
    |     ^^^^ Class `Eggs` later repeated here
-42 |     Mushrooms,
-43 |     Bar,
+40 |     Mushrooms,
+41 |     Bar,
+42 |     Eggs,
+   |     ^^^^ Class `Eggs` later repeated here
+43 |     Baz,
 44 |     Eggs,
    |     ^^^^ Class `Eggs` later repeated here
-45 |     Baz,
-46 |     Eggs,
-   |     ^^^^ Class `Eggs` later repeated here
-47 | ): ...
+45 | ): ...
    |
 info: rule `duplicate-base` is enabled by default
 
@@ -315,30 +267,30 @@ info: rule `duplicate-base` is enabled by default
 
 ```
 error[duplicate-base]: Duplicate base class `A`
-  --> src/mdtest_snippet.py:69:7
+  --> src/mdtest_snippet.py:67:7
    |
-68 |   # error: [duplicate-base]
-69 |   class D(
+66 |   # error: [duplicate-base]
+67 |   class D(
    |  _______^
-70 | |     A,
-71 | |     # error: [unused-ignore-comment]
-72 | |     A,  # type: ignore[duplicate-base]
-73 | | ): ...
+68 | |     A,
+69 | |     # error: [unused-ignore-comment]
+70 | |     A,  # type: ignore[duplicate-base]
+71 | | ): ...
    | |_^
-74 |
-75 |   # error: [duplicate-base]
+72 |
+73 |   # error: [duplicate-base]
    |
 info: The definition of class `D` will raise `TypeError` at runtime
-  --> src/mdtest_snippet.py:70:5
+  --> src/mdtest_snippet.py:68:5
    |
-68 | # error: [duplicate-base]
-69 | class D(
-70 |     A,
+66 | # error: [duplicate-base]
+67 | class D(
+68 |     A,
    |     - Class `A` first included in bases list here
-71 |     # error: [unused-ignore-comment]
-72 |     A,  # type: ignore[duplicate-base]
+69 |     # error: [unused-ignore-comment]
+70 |     A,  # type: ignore[duplicate-base]
    |     ^ Class `A` later repeated here
-73 | ): ...
+71 | ): ...
    |
 info: rule `duplicate-base` is enabled by default
 
@@ -346,42 +298,42 @@ info: rule `duplicate-base` is enabled by default
 
 ```
 info[unused-ignore-comment]
-  --> src/mdtest_snippet.py:72:9
+  --> src/mdtest_snippet.py:70:9
    |
-70 |     A,
-71 |     # error: [unused-ignore-comment]
-72 |     A,  # type: ignore[duplicate-base]
+68 |     A,
+69 |     # error: [unused-ignore-comment]
+70 |     A,  # type: ignore[duplicate-base]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unused blanket `type: ignore` directive
-73 | ): ...
+71 | ): ...
    |
 
 ```
 
 ```
 error[duplicate-base]: Duplicate base class `A`
-  --> src/mdtest_snippet.py:76:7
+  --> src/mdtest_snippet.py:74:7
    |
-75 |   # error: [duplicate-base]
-76 |   class E(
+73 |   # error: [duplicate-base]
+74 |   class E(
    |  _______^
-77 | |     A,
-78 | |     A
-79 | | ):
+75 | |     A,
+76 | |     A
+77 | | ):
    | |_^
-80 |       # error: [unused-ignore-comment]
-81 |       x: int  # type: ignore[duplicate-base]
+78 |       # error: [unused-ignore-comment]
+79 |       x: int  # type: ignore[duplicate-base]
    |
 info: The definition of class `E` will raise `TypeError` at runtime
-  --> src/mdtest_snippet.py:77:5
+  --> src/mdtest_snippet.py:75:5
    |
-75 | # error: [duplicate-base]
-76 | class E(
-77 |     A,
+73 | # error: [duplicate-base]
+74 | class E(
+75 |     A,
    |     - Class `A` first included in bases list here
-78 |     A
+76 |     A
    |     ^ Class `A` later repeated here
-79 | ):
-80 |     # error: [unused-ignore-comment]
+77 | ):
+78 |     # error: [unused-ignore-comment]
    |
 info: rule `duplicate-base` is enabled by default
 
@@ -389,14 +341,14 @@ info: rule `duplicate-base` is enabled by default
 
 ```
 info[unused-ignore-comment]
-  --> src/mdtest_snippet.py:81:13
+  --> src/mdtest_snippet.py:79:13
    |
-79 | ):
-80 |     # error: [unused-ignore-comment]
-81 |     x: int  # type: ignore[duplicate-base]
+77 | ):
+78 |     # error: [unused-ignore-comment]
+79 |     x: int  # type: ignore[duplicate-base]
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unused blanket `type: ignore` directive
-82 |
-83 | # fmt: on
+80 |
+81 | # fmt: on
    |
 
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/named_tuple.md_-_`NamedTuple`_-_`typing.NamedTuple`_-_Definition_(bbf79630502e65e9).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/named_tuple.md_-_`NamedTuple`_-_`typing.NamedTuple`_-_Definition_(bbf79630502e65e9).snap
index 666d2bc2c5..d7effd9556 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/named_tuple.md_-_`NamedTuple`_-_`typing.NamedTuple`_-_Definition_(bbf79630502e65e9).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/named_tuple.md_-_`NamedTuple`_-_`typing.NamedTuple`_-_Definition_(bbf79630502e65e9).snap
@@ -47,7 +47,7 @@ error[invalid-named-tuple]: NamedTuple field without default value cannot follow
   |     --------------------- Earlier field `altitude` defined here with a default value
 5 |     # error: [invalid-named-tuple] "NamedTuple field without default value cannot follow field(s) with default value(s): Field `latitud…
 6 |     latitude: float
-  |     ^^^^^^^^ Field `latitude` defined here without a default value
+  |     ^^^^^^^^^^^^^^^ Field `latitude` defined here without a default value
 7 |     # error: [invalid-named-tuple] "NamedTuple field without default value cannot follow field(s) with default value(s): Field `longitu…
 8 |     longitude: float
   |
@@ -66,7 +66,7 @@ error[invalid-named-tuple]: NamedTuple field without default value cannot follow
  6 |     latitude: float
  7 |     # error: [invalid-named-tuple] "NamedTuple field without default value cannot follow field(s) with default value(s): Field `longit…
  8 |     longitude: float
-   |     ^^^^^^^^^ Field `longitude` defined here without a default value
+   |     ^^^^^^^^^^^^^^^^ Field `longitude` defined here without a default value
  9 |
 10 | class StrangeLocation(NamedTuple):
    |
@@ -83,7 +83,7 @@ error[invalid-named-tuple]: NamedTuple field without default value cannot follow
 14 |     altitude: float = 0.0
    |     --------------------- Earlier field `altitude` defined here with a default value
 15 |     latitude: float  # error: [invalid-named-tuple]
-   |     ^^^^^^^^ Field `latitude` defined here without a default value
+   |     ^^^^^^^^^^^^^^^ Field `latitude` defined here without a default value
 16 |     longitude: float  # error: [invalid-named-tuple]
    |
 info: rule `invalid-named-tuple` is enabled by default
@@ -100,7 +100,7 @@ error[invalid-named-tuple]: NamedTuple field without default value cannot follow
    |     --------------------- Earlier field `altitude` defined here with a default value
 15 |     latitude: float  # error: [invalid-named-tuple]
 16 |     longitude: float  # error: [invalid-named-tuple]
-   |     ^^^^^^^^^ Field `longitude` defined here without a default value
+   |     ^^^^^^^^^^^^^^^^ Field `longitude` defined here without a default value
 17 |
 18 | class VeryStrangeLocation(NamedTuple):
    |
@@ -115,7 +115,7 @@ error[invalid-named-tuple]: NamedTuple field without default value cannot follow
 18 | class VeryStrangeLocation(NamedTuple):
 19 |     altitude: float = 0.0
 20 |     latitude: float  # error: [invalid-named-tuple]
-   |     ^^^^^^^^ Field `latitude` defined here without a default value
+   |     ^^^^^^^^^^^^^^^ Field `latitude` defined here without a default value
 21 |     longitude: float  # error: [invalid-named-tuple]
 22 |     altitude: float = 0.0
    |
@@ -131,7 +131,7 @@ error[invalid-named-tuple]: NamedTuple field without default value cannot follow
 19 |     altitude: float = 0.0
 20 |     latitude: float  # error: [invalid-named-tuple]
 21 |     longitude: float  # error: [invalid-named-tuple]
-   |     ^^^^^^^^^ Field `longitude` defined here without a default value
+   |     ^^^^^^^^^^^^^^^^ Field `longitude` defined here without a default value
 22 |     altitude: float = 0.0
    |
 info: Earlier field `altitude` was defined with a default value
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Argument_type_expans…_-_Optimization___Limit_…_(cd61048adbc17331).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Argument_type_expans…_-_Optimization___Limit_…_(cd61048adbc17331).snap
new file mode 100644
index 0000000000..ae7b142691
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Argument_type_expans…_-_Optimization___Limit_…_(cd61048adbc17331).snap
@@ -0,0 +1,138 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: overloads.md - Overloads - Argument type expansion - Optimization: Limit expansion size
+mdtest path: crates/ty_python_semantic/resources/mdtest/call/overloads.md
+---
+
+# Python source files
+
+## overloaded.pyi
+
+```
+ 1 | from typing import overload
+ 2 | 
+ 3 | class A: ...
+ 4 | class B: ...
+ 5 | class C: ...
+ 6 | 
+ 7 | @overload
+ 8 | def f() -> None: ...
+ 9 | @overload
+10 | def f(**kwargs: int) -> C: ...
+11 | @overload
+12 | def f(x: A, /, **kwargs: int) -> A: ...
+13 | @overload
+14 | def f(x: B, /, **kwargs: int) -> B: ...
+```
+
+## mdtest_snippet.py
+
+```
+ 1 | from overloaded import A, B, f
+ 2 | from typing_extensions import reveal_type
+ 3 | 
+ 4 | def _(a: int | None):
+ 5 |     reveal_type(
+ 6 |         # error: [no-matching-overload]
+ 7 |         # revealed: Unknown
+ 8 |         f(
+ 9 |             A(),
+10 |             a1=a,
+11 |             a2=a,
+12 |             a3=a,
+13 |             a4=a,
+14 |             a5=a,
+15 |             a6=a,
+16 |             a7=a,
+17 |             a8=a,
+18 |             a9=a,
+19 |             a10=a,
+20 |             a11=a,
+21 |             a12=a,
+22 |             a13=a,
+23 |             a14=a,
+24 |             a15=a,
+25 |             a16=a,
+26 |             a17=a,
+27 |             a18=a,
+28 |             a19=a,
+29 |             a20=a,
+30 |             a21=a,
+31 |             a22=a,
+32 |             a23=a,
+33 |             a24=a,
+34 |             a25=a,
+35 |             a26=a,
+36 |             a27=a,
+37 |             a28=a,
+38 |             a29=a,
+39 |             a30=a,
+40 |         )
+41 |     )
+```
+
+# Diagnostics
+
+```
+error[no-matching-overload]: No overload of function `f` matches arguments
+  --> src/mdtest_snippet.py:8:9
+   |
+ 6 |           # error: [no-matching-overload]
+ 7 |           # revealed: Unknown
+ 8 | /         f(
+ 9 | |             A(),
+10 | |             a1=a,
+11 | |             a2=a,
+12 | |             a3=a,
+13 | |             a4=a,
+14 | |             a5=a,
+15 | |             a6=a,
+16 | |             a7=a,
+17 | |             a8=a,
+18 | |             a9=a,
+19 | |             a10=a,
+20 | |             a11=a,
+21 | |             a12=a,
+22 | |             a13=a,
+23 | |             a14=a,
+24 | |             a15=a,
+25 | |             a16=a,
+26 | |             a17=a,
+27 | |             a18=a,
+28 | |             a19=a,
+29 | |             a20=a,
+30 | |             a21=a,
+31 | |             a22=a,
+32 | |             a23=a,
+33 | |             a24=a,
+34 | |             a25=a,
+35 | |             a26=a,
+36 | |             a27=a,
+37 | |             a28=a,
+38 | |             a29=a,
+39 | |             a30=a,
+40 | |         )
+   | |_________^
+41 |       )
+   |
+info: Limit of argument type expansion reached at argument 10
+info: First overload defined here
+  --> src/overloaded.pyi:8:5
+   |
+ 7 | @overload
+ 8 | def f() -> None: ...
+   |     ^^^^^^^^^^^
+ 9 | @overload
+10 | def f(**kwargs: int) -> C: ...
+   |
+info: Possible overloads for function `f`:
+info:   () -> None
+info:   (**kwargs: int) -> C
+info:   (x: A, /, **kwargs: int) -> A
+info:   (x: B, /, **kwargs: int) -> B
+info: rule `no-matching-overload` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_Overload_without_an_…_-_Regular_modules_(5c8e81664d1c7470).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_Overload_without_an_…_-_Regular_modules_(5c8e81664d1c7470).snap
index 21e0603051..21cc311cd8 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_Overload_without_an_…_-_Regular_modules_(5c8e81664d1c7470).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_Overload_without_an_…_-_Regular_modules_(5c8e81664d1c7470).snap
@@ -17,43 +17,49 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/overloads.md
  3 | @overload
  4 | def func(x: int) -> int: ...
  5 | @overload
- 6 | # error: [invalid-overload] "Overloaded non-stub function `func` must have an implementation"
+ 6 | # error: [invalid-overload] "Overloads for function `func` must be followed by a non-`@overload`-decorated implementation function"
  7 | def func(x: str) -> str: ...
  8 | 
  9 | class Foo:
 10 |     @overload
 11 |     def method(self, x: int) -> int: ...
 12 |     @overload
-13 |     # error: [invalid-overload] "Overloaded non-stub function `method` must have an implementation"
+13 |     # error: [invalid-overload] "Overloads for function `method` must be followed by a non-`@overload`-decorated implementation function"
 14 |     def method(self, x: str) -> str: ...
 ```
 
 # Diagnostics
 
 ```
-error[invalid-overload]: Overloaded non-stub function `func` must have an implementation
+error[invalid-overload]: Overloads for function `func` must be followed by a non-`@overload`-decorated implementation function
  --> src/mdtest_snippet.py:7:5
   |
 5 | @overload
-6 | # error: [invalid-overload] "Overloaded non-stub function `func` must have an implementation"
+6 | # error: [invalid-overload] "Overloads for function `func` must be followed by a non-`@overload`-decorated implementation function"
 7 | def func(x: str) -> str: ...
   |     ^^^^
 8 |
 9 | class Foo:
   |
+info: Attempting to call `func` will raise `TypeError` at runtime
+info: Overloaded functions without implementations are only permitted in stub files, on protocols, or for abstract methods
+info: See https://docs.python.org/3/library/typing.html#typing.overload for more details
 info: rule `invalid-overload` is enabled by default
 
 ```
 
 ```
-error[invalid-overload]: Overloaded non-stub function `method` must have an implementation
+error[invalid-overload]: Overloads for function `method` must be followed by a non-`@overload`-decorated implementation function
   --> src/mdtest_snippet.py:14:9
    |
 12 |     @overload
-13 |     # error: [invalid-overload] "Overloaded non-stub function `method` must have an implementation"
+13 |     # error: [invalid-overload] "Overloads for function `method` must be followed by a non-`@overload`-decorated implementation functi…
 14 |     def method(self, x: str) -> str: ...
    |         ^^^^^^
    |
+info: Attempting to call `method` will raise `TypeError` at runtime
+info: Overloaded functions without implementations are only permitted in stub files, on protocols, or for abstract methods
+info: See https://docs.python.org/3/library/typing.html#typing.overload for more details
 info: rule `invalid-overload` is enabled by default
 
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_`@overload`-decorate…_(d17a1580f99a6402).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_`@overload`-decorate…_(d17a1580f99a6402).snap
new file mode 100644
index 0000000000..dfc345b66a
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/overloads.md_-_Overloads_-_Invalid_-_`@overload`-decorate…_(d17a1580f99a6402).snap
@@ -0,0 +1,83 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: overloads.md - Overloads - Invalid - `@overload`-decorated functions with non-stub bodies
+mdtest path: crates/ty_python_semantic/resources/mdtest/overloads.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | from typing import overload
+ 2 | 
+ 3 | @overload
+ 4 | def x(y: int) -> int: ...
+ 5 | @overload
+ 6 | def x(y: str) -> str:
+ 7 |     """Docstring"""
+ 8 | 
+ 9 | @overload
+10 | def x(y: bytes) -> bytes:
+11 |     pass
+12 | 
+13 | @overload
+14 | def x(y: memoryview) -> memoryview:
+15 |     """More docs"""
+16 |     pass
+17 |     ...
+18 | 
+19 | def x(y):
+20 |     return y
+21 | @overload
+22 | def foo(x: int) -> int:
+23 |     return x  # error: [useless-overload-body]
+24 | 
+25 | @overload
+26 | def foo(x: str) -> None:
+27 |     """Docstring"""
+28 |     pass
+29 |     print("oh no, a string")  # error: [useless-overload-body]
+30 | 
+31 | def foo(x):
+32 |     return x
+```
+
+# Diagnostics
+
+```
+warning[useless-overload-body]: Useless body for `@overload`-decorated function `foo`
+  --> src/mdtest_snippet.py:23:5
+   |
+21 | @overload
+22 | def foo(x: int) -> int:
+23 |     return x  # error: [useless-overload-body]
+   |     ^^^^^^^^ This statement will never be executed
+24 |
+25 | @overload
+   |
+info: `@overload`-decorated functions are solely for type checkers and must be overwritten at runtime by a non-`@overload`-decorated implementation
+help: Consider replacing this function body with `...` or `pass`
+info: rule `useless-overload-body` is enabled by default
+
+```
+
+```
+warning[useless-overload-body]: Useless body for `@overload`-decorated function `foo`
+  --> src/mdtest_snippet.py:29:5
+   |
+27 |     """Docstring"""
+28 |     pass
+29 |     print("oh no, a string")  # error: [useless-overload-body]
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^ This statement will never be executed
+30 |
+31 | def foo(x):
+   |
+info: `@overload`-decorated functions are solely for type checkers and must be overwritten at runtime by a non-`@overload`-decorated implementation
+help: Consider replacing this function body with `...` or `pass`
+info: rule `useless-overload-body` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Calls_to_protocol_cl…_(288988036f34ddcf).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Calls_to_protocol_cl…_(288988036f34ddcf).snap
index 923dac0803..4e18a85fd6 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Calls_to_protocol_cl…_(288988036f34ddcf).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Calls_to_protocol_cl…_(288988036f34ddcf).snap
@@ -12,7 +12,7 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/protocols.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import Protocol, reveal_type
+ 1 | from typing_extensions import Protocol
  2 | 
  3 | # error: [call-non-callable]
  4 | reveal_type(Protocol())  # revealed: Unknown
@@ -36,9 +36,7 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/protocols.md
 22 | 
 23 | reveal_type(SubclassOfGenericProtocol[int]())  # revealed: SubclassOfGenericProtocol[int]
 24 | def f(x: type[MyProtocol]):
-25 |     # TODO: add a `reveal_type` call here once it's no longer a `Todo` type
-26 |     # (which doesn't work well with snapshots)
-27 |     x()
+25 |     reveal_type(x())  # revealed: @Todo(type[T] for protocols)
 ```
 
 # Diagnostics
@@ -57,19 +55,6 @@ info: rule `call-non-callable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
- --> src/mdtest_snippet.py:4:13
-  |
-3 | # error: [call-non-callable]
-4 | reveal_type(Protocol())  # revealed: Unknown
-  |             ^^^^^^^^^^ `Unknown`
-5 |
-6 | class MyProtocol(Protocol):
-  |
-
-```
-
 ```
 error[call-non-callable]: Cannot instantiate class `MyProtocol`
   --> src/mdtest_snippet.py:10:13
@@ -93,19 +78,6 @@ info: rule `call-non-callable` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:10:13
-   |
- 9 | # error: [call-non-callable] "Cannot instantiate class `MyProtocol`"
-10 | reveal_type(MyProtocol())  # revealed: MyProtocol
-   |             ^^^^^^^^^^^^ `MyProtocol`
-11 |
-12 | class GenericProtocol[T](Protocol):
-   |
-
-```
-
 ```
 error[call-non-callable]: Cannot instantiate class `GenericProtocol`
   --> src/mdtest_snippet.py:16:13
@@ -127,43 +99,3 @@ info: Protocol classes cannot be instantiated
 info: rule `call-non-callable` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:16:13
-   |
-15 | # error: [call-non-callable] "Cannot instantiate class `GenericProtocol`"
-16 | reveal_type(GenericProtocol[int]())  # revealed: GenericProtocol[int]
-   |             ^^^^^^^^^^^^^^^^^^^^^^ `GenericProtocol[int]`
-17 | class SubclassOfMyProtocol(MyProtocol): ...
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:19:13
-   |
-17 | class SubclassOfMyProtocol(MyProtocol): ...
-18 |
-19 | reveal_type(SubclassOfMyProtocol())  # revealed: SubclassOfMyProtocol
-   |             ^^^^^^^^^^^^^^^^^^^^^^ `SubclassOfMyProtocol`
-20 |
-21 | class SubclassOfGenericProtocol[T](GenericProtocol[T]): ...
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:23:13
-   |
-21 | class SubclassOfGenericProtocol[T](GenericProtocol[T]): ...
-22 |
-23 | reveal_type(SubclassOfGenericProtocol[int]())  # revealed: SubclassOfGenericProtocol[int]
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `SubclassOfGenericProtocol[int]`
-24 | def f(x: type[MyProtocol]):
-25 |     # TODO: add a `reveal_type` call here once it's no longer a `Todo` type
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Diagnostics_for_prot…_(585a3e9545d41b64).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Diagnostics_for_prot…_(585a3e9545d41b64).snap
index 425665b486..6609a48adb 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Diagnostics_for_prot…_(585a3e9545d41b64).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Diagnostics_for_prot…_(585a3e9545d41b64).snap
@@ -9,7 +9,7 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/protocols.md
 
 # Python source files
 
-## mdtest_snippet.py
+## a.py
 
 ```
  1 | from typing import Protocol
@@ -37,11 +37,33 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/protocols.md
 23 |         pass
 ```
 
+## b.py
+
+```
+1 | from typing import Protocol
+2 | 
+3 | # Ensure the number of scopes in `b.py` is greater than the number of scopes in `c.py`:
+4 | class SomethingUnrelated: ...
+5 | 
+6 | class A(Protocol):
+7 |     x: int
+```
+
+## c.py
+
+```
+1 | from b import A
+2 | from typing import Protocol
+3 | 
+4 | class C(A, Protocol):
+5 |     x = 42  # fine, due to declaration in the base class
+```
+
 # Diagnostics
 
 ```
 warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the body of a protocol class
-  --> src/mdtest_snippet.py:12:5
+  --> src/a.py:12:5
    |
 11 |     # error: [ambiguous-protocol-member]
 12 |     a = None  # type: int
@@ -50,7 +72,7 @@ warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the
 14 |     b = ...  # type: str
    |
 info: Assigning to an undeclared variable in a protocol class leads to an ambiguous interface
- --> src/mdtest_snippet.py:6:7
+ --> src/a.py:6:7
   |
 4 |     return True
 5 |
@@ -66,7 +88,7 @@ info: rule `ambiguous-protocol-member` is enabled by default
 
 ```
 warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the body of a protocol class
-  --> src/mdtest_snippet.py:14:5
+  --> src/a.py:14:5
    |
 12 |     a = None  # type: int
 13 |     # error: [ambiguous-protocol-member]
@@ -76,7 +98,7 @@ warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the
 16 |     if coinflip():
    |
 info: Assigning to an undeclared variable in a protocol class leads to an ambiguous interface
- --> src/mdtest_snippet.py:6:7
+ --> src/a.py:6:7
   |
 4 |     return True
 5 |
@@ -92,7 +114,7 @@ info: rule `ambiguous-protocol-member` is enabled by default
 
 ```
 warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the body of a protocol class
-  --> src/mdtest_snippet.py:17:9
+  --> src/a.py:17:9
    |
 16 |     if coinflip():
 17 |         c = 1  # error: [ambiguous-protocol-member]
@@ -101,7 +123,7 @@ warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the
 19 |         c = 2
    |
 info: Assigning to an undeclared variable in a protocol class leads to an ambiguous interface
- --> src/mdtest_snippet.py:6:7
+ --> src/a.py:6:7
   |
 4 |     return True
 5 |
@@ -117,7 +139,7 @@ info: rule `ambiguous-protocol-member` is enabled by default
 
 ```
 warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the body of a protocol class
-  --> src/mdtest_snippet.py:22:9
+  --> src/a.py:22:9
    |
 21 |     # error: [ambiguous-protocol-member]
 22 |     for d in range(42):
@@ -125,7 +147,7 @@ warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the
 23 |         pass
    |
 info: Assigning to an undeclared variable in a protocol class leads to an ambiguous interface
- --> src/mdtest_snippet.py:6:7
+ --> src/a.py:6:7
   |
 4 |     return True
 5 |
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Narrowing_of_protoco…_(98257e7c2300373).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Narrowing_of_protoco…_(98257e7c2300373).snap
index 65263835c3..1247edf089 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Narrowing_of_protoco…_(98257e7c2300373).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Narrowing_of_protoco…_(98257e7c2300373).snap
@@ -12,7 +12,7 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/protocols.md
 ## mdtest_snippet.py
 
 ```
- 1 | from typing_extensions import Protocol, reveal_type
+ 1 | from typing_extensions import Protocol
  2 | 
  3 | class HasX(Protocol):
  4 |     x: int
@@ -69,7 +69,7 @@ error[invalid-argument-type]: Class `HasX` cannot be used as the second argument
 info: `HasX` is declared as a protocol class, but it is not declared as runtime-checkable
  --> src/mdtest_snippet.py:3:7
   |
-1 | from typing_extensions import Protocol, reveal_type
+1 | from typing_extensions import Protocol
 2 |
 3 | class HasX(Protocol):
   |       ^^^^^^^^^^^^^^ `HasX` declared here
@@ -81,34 +81,6 @@ info: rule `invalid-argument-type` is enabled by default
 
 ```
 
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:8:21
-   |
- 6 | def f(arg: object, arg2: type):
- 7 |     if isinstance(arg, HasX):  # error: [invalid-argument-type]
- 8 |         reveal_type(arg)  # revealed: HasX
-   |                     ^^^ `HasX`
- 9 |     else:
-10 |         reveal_type(arg)  # revealed: ~HasX
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:10:21
-   |
- 8 |         reveal_type(arg)  # revealed: HasX
- 9 |     else:
-10 |         reveal_type(arg)  # revealed: ~HasX
-   |                     ^^^ `~HasX`
-11 |
-12 |     if issubclass(arg2, HasX):  # error: [invalid-argument-type]
-   |
-
-```
-
 ```
 error[invalid-argument-type]: Class `HasX` cannot be used as the second argument to `issubclass`
   --> src/mdtest_snippet.py:12:8
@@ -123,7 +95,7 @@ error[invalid-argument-type]: Class `HasX` cannot be used as the second argument
 info: `HasX` is declared as a protocol class, but it is not declared as runtime-checkable
  --> src/mdtest_snippet.py:3:7
   |
-1 | from typing_extensions import Protocol, reveal_type
+1 | from typing_extensions import Protocol
 2 |
 3 | class HasX(Protocol):
   |       ^^^^^^^^^^^^^^ `HasX` declared here
@@ -134,110 +106,3 @@ info: See https://docs.python.org/3/library/typing.html#typing.runtime_checkable
 info: rule `invalid-argument-type` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:13:21
-   |
-12 |     if issubclass(arg2, HasX):  # error: [invalid-argument-type]
-13 |         reveal_type(arg2)  # revealed: type[HasX]
-   |                     ^^^^ `type[HasX]`
-14 |     else:
-15 |         reveal_type(arg2)  # revealed: type & ~type[HasX]
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:15:21
-   |
-13 |         reveal_type(arg2)  # revealed: type[HasX]
-14 |     else:
-15 |         reveal_type(arg2)  # revealed: type & ~type[HasX]
-   |                     ^^^^ `type & ~type[HasX]`
-16 | from typing import runtime_checkable
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:24:21
-   |
-22 | def f(arg: object):
-23 |     if isinstance(arg, RuntimeCheckableHasX):  # no error!
-24 |         reveal_type(arg)  # revealed: RuntimeCheckableHasX
-   |                     ^^^ `RuntimeCheckableHasX`
-25 |     else:
-26 |         reveal_type(arg)  # revealed: ~RuntimeCheckableHasX
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:26:21
-   |
-24 |         reveal_type(arg)  # revealed: RuntimeCheckableHasX
-25 |     else:
-26 |         reveal_type(arg)  # revealed: ~RuntimeCheckableHasX
-   |                     ^^^ `~RuntimeCheckableHasX`
-27 | @runtime_checkable
-28 | class OnlyMethodMembers(Protocol):
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:33:21
-   |
-31 | def f(arg1: type, arg2: type):
-32 |     if issubclass(arg1, RuntimeCheckableHasX):  # TODO: should emit an error here (has non-method members)
-33 |         reveal_type(arg1)  # revealed: type[RuntimeCheckableHasX]
-   |                     ^^^^ `type[RuntimeCheckableHasX]`
-34 |     else:
-35 |         reveal_type(arg1)  # revealed: type & ~type[RuntimeCheckableHasX]
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:35:21
-   |
-33 |         reveal_type(arg1)  # revealed: type[RuntimeCheckableHasX]
-34 |     else:
-35 |         reveal_type(arg1)  # revealed: type & ~type[RuntimeCheckableHasX]
-   |                     ^^^^ `type & ~type[RuntimeCheckableHasX]`
-36 |
-37 |     if issubclass(arg2, OnlyMethodMembers):  # no error!
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:38:21
-   |
-37 |     if issubclass(arg2, OnlyMethodMembers):  # no error!
-38 |         reveal_type(arg2)  # revealed: type[OnlyMethodMembers]
-   |                     ^^^^ `type[OnlyMethodMembers]`
-39 |     else:
-40 |         reveal_type(arg2)  # revealed: type & ~type[OnlyMethodMembers]
-   |
-
-```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:40:21
-   |
-38 |         reveal_type(arg2)  # revealed: type[OnlyMethodMembers]
-39 |     else:
-40 |         reveal_type(arg2)  # revealed: type & ~type[OnlyMethodMembers]
-   |                     ^^^^ `type & ~type[OnlyMethodMembers]`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Protocol_members_in_…_(21be5d9bdab1c844).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Protocol_members_in_…_(21be5d9bdab1c844).snap
index d7436cbec7..28599faa0c 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Protocol_members_in_…_(21be5d9bdab1c844).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/protocols.md_-_Protocols_-_Protocol_members_in_…_(21be5d9bdab1c844).snap
@@ -13,7 +13,7 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/protocols.md
 
 ```
  1 | import sys
- 2 | from typing_extensions import Protocol, get_protocol_members, reveal_type
+ 2 | from typing_extensions import Protocol, get_protocol_members
  3 | 
  4 | class Foo(Protocol):
  5 |     if sys.version_info >= (3, 10):
@@ -43,7 +43,7 @@ warning[ambiguous-protocol-member]: Cannot assign to undeclared variable in the
 info: Assigning to an undeclared variable in a protocol class leads to an ambiguous interface
  --> src/mdtest_snippet.py:4:7
   |
-2 | from typing_extensions import Protocol, get_protocol_members, reveal_type
+2 | from typing_extensions import Protocol, get_protocol_members
 3 |
 4 | class Foo(Protocol):
   |       ^^^^^^^^^^^^^ `Foo` declared as a protocol here
@@ -54,15 +54,3 @@ info: No declarations found for `e` in the body of `Foo` or any of its superclas
 info: rule `ambiguous-protocol-member` is enabled by default
 
 ```
-
-```
-info[revealed-type]: Revealed type
-  --> src/mdtest_snippet.py:14:13
-   |
-12 |         def f(self) -> None: ...
-13 |
-14 | reveal_type(get_protocol_members(Foo))  # revealed: frozenset[Literal["d", "e", "f"]]
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ `frozenset[Literal["d", "e", "f"]]`
-   |
-
-```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_(a91e0c67519cd77f).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_(a91e0c67519cd77f).snap
index 9c3379586a..e0f0371720 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_(a91e0c67519cd77f).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_(a91e0c67519cd77f).snap
@@ -30,6 +30,18 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/function/return_type.md
 16 | 
 17 | # error: [invalid-return-type]
 18 | def m(x: T) -> T: ...
+19 | 
+20 | class A[T]: ...
+21 | 
+22 | def f() -> A[int]:
+23 |     class A[T]: ...
+24 |     return A[int]()  # error: [invalid-return-type]
+25 | 
+26 | class B: ...
+27 | 
+28 | def g() -> B:
+29 |     class B: ...
+30 |     return B()  # error: [invalid-return-type]
 ```
 
 # Diagnostics
@@ -91,9 +103,45 @@ error[invalid-return-type]: Function always implicitly returns `None`, which is
 17 | # error: [invalid-return-type]
 18 | def m(x: T) -> T: ...
    |                ^
+19 |
+20 | class A[T]: ...
    |
 info: Consider changing the return annotation to `-> None` or adding a `return` statement
 info: Only functions in stub files, methods on protocol classes, or methods with `@abstractmethod` are permitted to have empty bodies
 info: rule `invalid-return-type` is enabled by default
 
 ```
+
+```
+error[invalid-return-type]: Return type does not match returned value
+  --> src/mdtest_snippet.py:22:12
+   |
+20 | class A[T]: ...
+21 |
+22 | def f() -> A[int]:
+   |            ------ Expected `mdtest_snippet.A[int]` because of return type
+23 |     class A[T]: ...
+24 |     return A[int]()  # error: [invalid-return-type]
+   |            ^^^^^^^^ expected `mdtest_snippet.A[int]`, found `mdtest_snippet.<locals of function 'f'>.A[int]`
+25 |
+26 | class B: ...
+   |
+info: rule `invalid-return-type` is enabled by default
+
+```
+
+```
+error[invalid-return-type]: Return type does not match returned value
+  --> src/mdtest_snippet.py:28:12
+   |
+26 | class B: ...
+27 |
+28 | def g() -> B:
+   |            - Expected `mdtest_snippet.B` because of return type
+29 |     class B: ...
+30 |     return B()  # error: [invalid-return-type]
+   |            ^^^ expected `mdtest_snippet.B`, found `mdtest_snippet.<locals of function 'g'>.B`
+   |
+info: rule `invalid-return-type` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_…_(c3a523878447af6b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_…_(c3a523878447af6b).snap
index 6f834b61e3..3c1f175437 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_…_(c3a523878447af6b).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/return_type.md_-_Function_return_type_-_Invalid_return_type_…_(c3a523878447af6b).snap
@@ -37,7 +37,7 @@ error[invalid-return-type]: Return type does not match returned value
   |            --- Expected `int` because of return type
 2 |     # error: [invalid-return-type]
 3 |     return ...
-  |            ^^^ expected `int`, found `ellipsis`
+  |            ^^^ expected `int`, found `EllipsisType`
 4 |
 5 | # error: [invalid-return-type]
   |
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/scoping.md_-_Scoping_rules_for_ty…_-_Nested_formal_typeva…_-_Generic_class_within…_(3259718bf20b45a2).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/scoping.md_-_Scoping_rules_for_ty…_-_Nested_formal_typeva…_-_Generic_class_within…_(3259718bf20b45a2).snap
new file mode 100644
index 0000000000..5a02751545
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/scoping.md_-_Scoping_rules_for_ty…_-_Nested_formal_typeva…_-_Generic_class_within…_(3259718bf20b45a2).snap
@@ -0,0 +1,63 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: scoping.md - Scoping rules for type variables - Nested formal typevars must be distinct - Generic class within generic function
+mdtest path: crates/ty_python_semantic/resources/mdtest/generics/scoping.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import Iterable
+2 | 
+3 | def f[T](x: T, y: T) -> None:
+4 |     class Ok[S]: ...
+5 |     # error: [invalid-generic-class]
+6 |     class Bad1[T]: ...
+7 |     # error: [invalid-generic-class]
+8 |     class Bad2(Iterable[T]): ...
+```
+
+# Diagnostics
+
+```
+error[invalid-generic-class]: Generic class `Bad1` must not reference type variables bound in an enclosing scope
+ --> src/mdtest_snippet.py:3:5
+  |
+1 | from typing import Iterable
+2 |
+3 | def f[T](x: T, y: T) -> None:
+  |     ------------------------ Type variable `T` is bound in this enclosing scope
+4 |     class Ok[S]: ...
+5 |     # error: [invalid-generic-class]
+6 |     class Bad1[T]: ...
+  |           ^^^^ `T` referenced in class definition here
+7 |     # error: [invalid-generic-class]
+8 |     class Bad2(Iterable[T]): ...
+  |
+info: rule `invalid-generic-class` is enabled by default
+
+```
+
+```
+error[invalid-generic-class]: Generic class `Bad2` must not reference type variables bound in an enclosing scope
+ --> src/mdtest_snippet.py:3:5
+  |
+1 | from typing import Iterable
+2 |
+3 | def f[T](x: T, y: T) -> None:
+  |     ------------------------ Type variable `T` is bound in this enclosing scope
+4 |     class Ok[S]: ...
+5 |     # error: [invalid-generic-class]
+6 |     class Bad1[T]: ...
+7 |     # error: [invalid-generic-class]
+8 |     class Bad2(Iterable[T]): ...
+  |           ^^^^^^^^^^^^^^^^^ `T` referenced in class definition here
+  |
+info: rule `invalid-generic-class` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/scoping.md_-_Scoping_rules_for_ty…_-_Nested_formal_typeva…_-_Generic_class_within…_(711fb86287c4d87b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/scoping.md_-_Scoping_rules_for_ty…_-_Nested_formal_typeva…_-_Generic_class_within…_(711fb86287c4d87b).snap
new file mode 100644
index 0000000000..064c0f5344
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/scoping.md_-_Scoping_rules_for_ty…_-_Nested_formal_typeva…_-_Generic_class_within…_(711fb86287c4d87b).snap
@@ -0,0 +1,63 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: scoping.md - Scoping rules for type variables - Nested formal typevars must be distinct - Generic class within generic class
+mdtest path: crates/ty_python_semantic/resources/mdtest/generics/scoping.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+1 | from typing import Iterable
+2 | 
+3 | class C[T]:
+4 |     class Ok1[S]: ...
+5 |     # error: [invalid-generic-class]
+6 |     class Bad1[T]: ...
+7 |     # error: [invalid-generic-class]
+8 |     class Bad2(Iterable[T]): ...
+```
+
+# Diagnostics
+
+```
+error[invalid-generic-class]: Generic class `Bad1` must not reference type variables bound in an enclosing scope
+ --> src/mdtest_snippet.py:3:7
+  |
+1 | from typing import Iterable
+2 |
+3 | class C[T]:
+  |       - Type variable `T` is bound in this enclosing scope
+4 |     class Ok1[S]: ...
+5 |     # error: [invalid-generic-class]
+6 |     class Bad1[T]: ...
+  |           ^^^^ `T` referenced in class definition here
+7 |     # error: [invalid-generic-class]
+8 |     class Bad2(Iterable[T]): ...
+  |
+info: rule `invalid-generic-class` is enabled by default
+
+```
+
+```
+error[invalid-generic-class]: Generic class `Bad2` must not reference type variables bound in an enclosing scope
+ --> src/mdtest_snippet.py:3:7
+  |
+1 | from typing import Iterable
+2 |
+3 | class C[T]:
+  |       - Type variable `T` is bound in this enclosing scope
+4 |     class Ok1[S]: ...
+5 |     # error: [invalid-generic-class]
+6 |     class Bad1[T]: ...
+7 |     # error: [invalid-generic-class]
+8 |     class Bad2(Iterable[T]): ...
+  |           ^^^^^^^^^^^^^^^^^ `T` referenced in class definition here
+  |
+info: rule `invalid-generic-class` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`async`_comprehensio…_-_Python_3.10_(96aa8ec77d46553d).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`async`_comprehensio…_-_Python_3.10_(96aa8ec77d46553d).snap
index f25e7b1bac..975be8520f 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`async`_comprehensio…_-_Python_3.10_(96aa8ec77d46553d).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`async`_comprehensio…_-_Python_3.10_(96aa8ec77d46553d).snap
@@ -33,13 +33,13 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syn
 # Diagnostics
 
 ```
-error[invalid-syntax]
+error[invalid-syntax]: cannot use an asynchronous comprehension inside of a synchronous comprehension on Python 3.10 (syntax was added in 3.11)
  --> src/mdtest_snippet.py:6:19
   |
 4 | async def f():
 5 |     # error: 19 [invalid-syntax] "cannot use an asynchronous comprehension inside of a synchronous comprehension on Python 3.10 (syntax…
 6 |     return {n: [x async for x in elements(n)] for n in range(3)}
-  |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot use an asynchronous comprehension inside of a synchronous comprehension on Python 3.10 (syntax was added in 3.11)
+  |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^
 7 | async def test():
 8 |     # error: [not-iterable] "Object of type `range` is not async-iterable"
   |
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`break`_and_`continu…_(3143ba0a999d644).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`break`_and_`continu…_(3143ba0a999d644).snap
new file mode 100644
index 0000000000..cd814dd61a
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_`break`_and_`continu…_(3143ba0a999d644).snap
@@ -0,0 +1,107 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: semantic_syntax_errors.md - Semantic syntax error diagnostics - `break` and `continue` outside a loop
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | break  # error: [invalid-syntax]
+ 2 | continue  # error: [invalid-syntax]
+ 3 | 
+ 4 | for x in range(42):
+ 5 |     break  # fine
+ 6 |     continue  # fine
+ 7 | 
+ 8 |     def _():
+ 9 |         break  # error: [invalid-syntax]
+10 |         continue  # error: [invalid-syntax]
+11 | 
+12 |     class Fine:
+13 |         # this is invalid syntax despite it being in an eager-nested scope!
+14 |         break  # error: [invalid-syntax]
+15 |         continue  # error: [invalid-syntax]
+```
+
+# Diagnostics
+
+```
+error[invalid-syntax]: `break` outside loop
+ --> src/mdtest_snippet.py:1:1
+  |
+1 | break  # error: [invalid-syntax]
+  | ^^^^^
+2 | continue  # error: [invalid-syntax]
+  |
+
+```
+
+```
+error[invalid-syntax]: `continue` outside loop
+ --> src/mdtest_snippet.py:2:1
+  |
+1 | break  # error: [invalid-syntax]
+2 | continue  # error: [invalid-syntax]
+  | ^^^^^^^^
+3 |
+4 | for x in range(42):
+  |
+
+```
+
+```
+error[invalid-syntax]: `break` outside loop
+  --> src/mdtest_snippet.py:9:9
+   |
+ 8 |     def _():
+ 9 |         break  # error: [invalid-syntax]
+   |         ^^^^^
+10 |         continue  # error: [invalid-syntax]
+   |
+
+```
+
+```
+error[invalid-syntax]: `continue` outside loop
+  --> src/mdtest_snippet.py:10:9
+   |
+ 8 |     def _():
+ 9 |         break  # error: [invalid-syntax]
+10 |         continue  # error: [invalid-syntax]
+   |         ^^^^^^^^
+11 |
+12 |     class Fine:
+   |
+
+```
+
+```
+error[invalid-syntax]: `break` outside loop
+  --> src/mdtest_snippet.py:14:9
+   |
+12 |     class Fine:
+13 |         # this is invalid syntax despite it being in an eager-nested scope!
+14 |         break  # error: [invalid-syntax]
+   |         ^^^^^
+15 |         continue  # error: [invalid-syntax]
+   |
+
+```
+
+```
+error[invalid-syntax]: `continue` outside loop
+  --> src/mdtest_snippet.py:15:9
+   |
+13 |         # this is invalid syntax despite it being in an eager-nested scope!
+14 |         break  # error: [invalid-syntax]
+15 |         continue  # error: [invalid-syntax]
+   |         ^^^^^^^^
+   |
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/super.md_-_Super_-_Basic_Usage_-_Explicit_Super_Objec…_(b753048091f275c0).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/super.md_-_Super_-_Basic_Usage_-_Explicit_Super_Objec…_(b753048091f275c0).snap
new file mode 100644
index 0000000000..873e98e2dc
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/super.md_-_Super_-_Basic_Usage_-_Explicit_Super_Objec…_(b753048091f275c0).snap
@@ -0,0 +1,249 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: super.md - Super - Basic Usage - Explicit Super Object
+mdtest path: crates/ty_python_semantic/resources/mdtest/class/super.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+  1 | from __future__ import annotations
+  2 | 
+  3 | class A:
+  4 |     def a(self): ...
+  5 |     aa: int = 1
+  6 | 
+  7 | class B(A):
+  8 |     def b(self): ...
+  9 |     bb: int = 2
+ 10 | 
+ 11 | class C(B):
+ 12 |     def c(self): ...
+ 13 |     cc: int = 3
+ 14 | 
+ 15 | reveal_type(C.__mro__)  # revealed: tuple[<class 'C'>, <class 'B'>, <class 'A'>, <class 'object'>]
+ 16 | 
+ 17 | super(C, C()).a
+ 18 | super(C, C()).b
+ 19 | super(C, C()).c  # error: [unresolved-attribute]
+ 20 | 
+ 21 | super(B, C()).a
+ 22 | super(B, C()).b  # error: [unresolved-attribute]
+ 23 | super(B, C()).c  # error: [unresolved-attribute]
+ 24 | 
+ 25 | super(A, C()).a  # error: [unresolved-attribute]
+ 26 | super(A, C()).b  # error: [unresolved-attribute]
+ 27 | super(A, C()).c  # error: [unresolved-attribute]
+ 28 | 
+ 29 | reveal_type(super(C, C()).a)  # revealed: bound method C.a() -> Unknown
+ 30 | reveal_type(super(C, C()).b)  # revealed: bound method C.b() -> Unknown
+ 31 | reveal_type(super(C, C()).aa)  # revealed: int
+ 32 | reveal_type(super(C, C()).bb)  # revealed: int
+ 33 | import types
+ 34 | from typing_extensions import Callable, TypeIs, Literal, TypedDict
+ 35 | 
+ 36 | def f(): ...
+ 37 | 
+ 38 | class Foo[T]:
+ 39 |     def method(self): ...
+ 40 |     @property
+ 41 |     def some_property(self): ...
+ 42 | 
+ 43 | type Alias = int
+ 44 | 
+ 45 | class SomeTypedDict(TypedDict):
+ 46 |     x: int
+ 47 |     y: bytes
+ 48 | 
+ 49 | # revealed: <super: <class 'object'>, FunctionType>
+ 50 | reveal_type(super(object, f))
+ 51 | # revealed: <super: <class 'object'>, WrapperDescriptorType>
+ 52 | reveal_type(super(object, types.FunctionType.__get__))
+ 53 | # revealed: <super: <class 'object'>, GenericAlias>
+ 54 | reveal_type(super(object, Foo[int]))
+ 55 | # revealed: <super: <class 'object'>, _SpecialForm>
+ 56 | reveal_type(super(object, Literal))
+ 57 | # revealed: <super: <class 'object'>, TypeAliasType>
+ 58 | reveal_type(super(object, Alias))
+ 59 | # revealed: <super: <class 'object'>, MethodType>
+ 60 | reveal_type(super(object, Foo().method))
+ 61 | # revealed: <super: <class 'object'>, property>
+ 62 | reveal_type(super(object, Foo.some_property))
+ 63 | 
+ 64 | def g(x: object) -> TypeIs[list[object]]:
+ 65 |     return isinstance(x, list)
+ 66 | 
+ 67 | def _(x: object, y: SomeTypedDict, z: Callable[[int, str], bool]):
+ 68 |     if hasattr(x, "bar"):
+ 69 |         # revealed: <Protocol with members 'bar'>
+ 70 |         reveal_type(x)
+ 71 |         # error: [invalid-super-argument]
+ 72 |         # revealed: Unknown
+ 73 |         reveal_type(super(object, x))
+ 74 | 
+ 75 |     # error: [invalid-super-argument]
+ 76 |     # revealed: Unknown
+ 77 |     reveal_type(super(object, z))
+ 78 | 
+ 79 |     is_list = g(x)
+ 80 |     # revealed: TypeIs[list[object] @ x]
+ 81 |     reveal_type(is_list)
+ 82 |     # revealed: <super: <class 'object'>, bool>
+ 83 |     reveal_type(super(object, is_list))
+ 84 | 
+ 85 |     # revealed: <super: <class 'object'>, dict[Literal["x", "y"], int | bytes]>
+ 86 |     reveal_type(super(object, y))
+ 87 | 
+ 88 | # The first argument to `super()` must be an actual class object;
+ 89 | # instances of `GenericAlias` are not accepted at runtime:
+ 90 | #
+ 91 | # error: [invalid-super-argument]
+ 92 | # revealed: Unknown
+ 93 | reveal_type(super(list[int], []))
+ 94 | class Super:
+ 95 |     def method(self) -> int:
+ 96 |         return 42
+ 97 | 
+ 98 | class Sub(Super):
+ 99 |     def method(self: Sub) -> int:
+100 |         # revealed: <super: <class 'Sub'>, Sub>
+101 |         return reveal_type(super(self.__class__, self)).method()
+```
+
+# Diagnostics
+
+```
+error[unresolved-attribute]: Object of type `<super: <class 'C'>, C>` has no attribute `c`
+  --> src/mdtest_snippet.py:19:1
+   |
+17 | super(C, C()).a
+18 | super(C, C()).b
+19 | super(C, C()).c  # error: [unresolved-attribute]
+   | ^^^^^^^^^^^^^^^
+20 |
+21 | super(B, C()).a
+   |
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[unresolved-attribute]: Object of type `<super: <class 'B'>, C>` has no attribute `b`
+  --> src/mdtest_snippet.py:22:1
+   |
+21 | super(B, C()).a
+22 | super(B, C()).b  # error: [unresolved-attribute]
+   | ^^^^^^^^^^^^^^^
+23 | super(B, C()).c  # error: [unresolved-attribute]
+   |
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[unresolved-attribute]: Object of type `<super: <class 'B'>, C>` has no attribute `c`
+  --> src/mdtest_snippet.py:23:1
+   |
+21 | super(B, C()).a
+22 | super(B, C()).b  # error: [unresolved-attribute]
+23 | super(B, C()).c  # error: [unresolved-attribute]
+   | ^^^^^^^^^^^^^^^
+24 |
+25 | super(A, C()).a  # error: [unresolved-attribute]
+   |
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[unresolved-attribute]: Object of type `<super: <class 'A'>, C>` has no attribute `a`
+  --> src/mdtest_snippet.py:25:1
+   |
+23 | super(B, C()).c  # error: [unresolved-attribute]
+24 |
+25 | super(A, C()).a  # error: [unresolved-attribute]
+   | ^^^^^^^^^^^^^^^
+26 | super(A, C()).b  # error: [unresolved-attribute]
+27 | super(A, C()).c  # error: [unresolved-attribute]
+   |
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[unresolved-attribute]: Object of type `<super: <class 'A'>, C>` has no attribute `b`
+  --> src/mdtest_snippet.py:26:1
+   |
+25 | super(A, C()).a  # error: [unresolved-attribute]
+26 | super(A, C()).b  # error: [unresolved-attribute]
+   | ^^^^^^^^^^^^^^^
+27 | super(A, C()).c  # error: [unresolved-attribute]
+   |
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[unresolved-attribute]: Object of type `<super: <class 'A'>, C>` has no attribute `c`
+  --> src/mdtest_snippet.py:27:1
+   |
+25 | super(A, C()).a  # error: [unresolved-attribute]
+26 | super(A, C()).b  # error: [unresolved-attribute]
+27 | super(A, C()).c  # error: [unresolved-attribute]
+   | ^^^^^^^^^^^^^^^
+28 |
+29 | reveal_type(super(C, C()).a)  # revealed: bound method C.a() -> Unknown
+   |
+info: rule `unresolved-attribute` is enabled by default
+
+```
+
+```
+error[invalid-super-argument]: `<Protocol with members 'bar'>` is an abstract/structural type in `super(<class 'object'>, <Protocol with members 'bar'>)` call
+  --> src/mdtest_snippet.py:73:21
+   |
+71 |         # error: [invalid-super-argument]
+72 |         # revealed: Unknown
+73 |         reveal_type(super(object, x))
+   |                     ^^^^^^^^^^^^^^^^
+74 |
+75 |     # error: [invalid-super-argument]
+   |
+info: rule `invalid-super-argument` is enabled by default
+
+```
+
+```
+error[invalid-super-argument]: `(int, str, /) -> bool` is an abstract/structural type in `super(<class 'object'>, (int, str, /) -> bool)` call
+  --> src/mdtest_snippet.py:77:17
+   |
+75 |     # error: [invalid-super-argument]
+76 |     # revealed: Unknown
+77 |     reveal_type(super(object, z))
+   |                 ^^^^^^^^^^^^^^^^
+78 |
+79 |     is_list = g(x)
+   |
+info: rule `invalid-super-argument` is enabled by default
+
+```
+
+```
+error[invalid-super-argument]: `types.GenericAlias` instance `list[int]` is not a valid class
+  --> src/mdtest_snippet.py:93:13
+   |
+91 | # error: [invalid-super-argument]
+92 | # revealed: Unknown
+93 | reveal_type(super(list[int], []))
+   |             ^^^^^^^^^^^^^^^^^^^^
+94 | class Super:
+95 |     def method(self) -> int:
+   |
+info: rule `invalid-super-argument` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/super.md_-_Super_-_Basic_Usage_-_Implicit_Super_Objec…_(f9e5e48e3a4a4c12).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/super.md_-_Super_-_Basic_Usage_-_Implicit_Super_Objec…_(f9e5e48e3a4a4c12).snap
new file mode 100644
index 0000000000..c9fcea3d5a
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/super.md_-_Super_-_Basic_Usage_-_Implicit_Super_Objec…_(f9e5e48e3a4a4c12).snap
@@ -0,0 +1,214 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: super.md - Super - Basic Usage - Implicit Super Object
+mdtest path: crates/ty_python_semantic/resources/mdtest/class/super.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+  1 | from __future__ import annotations
+  2 | 
+  3 | class A:
+  4 |     def __init__(self, a: int): ...
+  5 |     @classmethod
+  6 |     def f(cls): ...
+  7 | 
+  8 | class B(A):
+  9 |     def __init__(self, a: int):
+ 10 |         reveal_type(super())  # revealed: <super: <class 'B'>, B>
+ 11 |         reveal_type(super(object, super()))  # revealed: <super: <class 'object'>, super>
+ 12 |         super().__init__(a)
+ 13 | 
+ 14 |     @classmethod
+ 15 |     def f(cls):
+ 16 |         # TODO: Once `cls` is supported, this should be `<super: <class 'B'>, <class 'B'>>`
+ 17 |         reveal_type(super())  # revealed: <super: <class 'B'>, Unknown>
+ 18 |         super().f()
+ 19 | 
+ 20 | super(B, B(42)).__init__(42)
+ 21 | super(B, B).f()
+ 22 | import enum
+ 23 | from typing import Any, Self, Never, Protocol, Callable
+ 24 | from ty_extensions import Intersection
+ 25 | 
+ 26 | class BuilderMeta(type):
+ 27 |     def __new__(
+ 28 |         cls: type[Any],
+ 29 |         name: str,
+ 30 |         bases: tuple[type, ...],
+ 31 |         dct: dict[str, Any],
+ 32 |     ) -> BuilderMeta:
+ 33 |         # revealed: <super: <class 'BuilderMeta'>, Any>
+ 34 |         s = reveal_type(super())
+ 35 |         # revealed: Any
+ 36 |         return reveal_type(s.__new__(cls, name, bases, dct))
+ 37 | 
+ 38 | class BuilderMeta2(type):
+ 39 |     def __new__(
+ 40 |         cls: type[BuilderMeta2],
+ 41 |         name: str,
+ 42 |         bases: tuple[type, ...],
+ 43 |         dct: dict[str, Any],
+ 44 |     ) -> BuilderMeta2:
+ 45 |         # revealed: <super: <class 'BuilderMeta2'>, <class 'BuilderMeta2'>>
+ 46 |         s = reveal_type(super())
+ 47 |         # TODO: should be `BuilderMeta2` (needs https://github.com/astral-sh/ty/issues/501)
+ 48 |         # revealed:  Unknown
+ 49 |         return reveal_type(s.__new__(cls, name, bases, dct))
+ 50 | 
+ 51 | class Foo[T]:
+ 52 |     x: T
+ 53 | 
+ 54 |     def method(self: Any):
+ 55 |         reveal_type(super())  # revealed: <super: <class 'Foo'>, Any>
+ 56 | 
+ 57 |         if isinstance(self, Foo):
+ 58 |             reveal_type(super())  # revealed: <super: <class 'Foo'>, Any>
+ 59 | 
+ 60 |     def method2(self: Foo[T]):
+ 61 |         # revealed: <super: <class 'Foo'>, Foo[T@Foo]>
+ 62 |         reveal_type(super())
+ 63 | 
+ 64 |     def method3(self: Foo):
+ 65 |         # revealed: <super: <class 'Foo'>, Foo[Unknown]>
+ 66 |         reveal_type(super())
+ 67 | 
+ 68 |     def method4(self: Self):
+ 69 |         # revealed: <super: <class 'Foo'>, Foo[T@Foo]>
+ 70 |         reveal_type(super())
+ 71 | 
+ 72 |     def method5[S: Foo[int]](self: S, other: S) -> S:
+ 73 |         # revealed: <super: <class 'Foo'>, Foo[int]>
+ 74 |         reveal_type(super())
+ 75 |         return self
+ 76 | 
+ 77 |     def method6[S: (Foo[int], Foo[str])](self: S, other: S) -> S:
+ 78 |         # revealed: <super: <class 'Foo'>, Foo[int]> | <super: <class 'Foo'>, Foo[str]>
+ 79 |         reveal_type(super())
+ 80 |         return self
+ 81 | 
+ 82 |     def method7[S](self: S, other: S) -> S:
+ 83 |         # error: [invalid-super-argument]
+ 84 |         # revealed: Unknown
+ 85 |         reveal_type(super())
+ 86 |         return self
+ 87 | 
+ 88 |     def method8[S: int](self: S, other: S) -> S:
+ 89 |         # error: [invalid-super-argument]
+ 90 |         # revealed: Unknown
+ 91 |         reveal_type(super())
+ 92 |         return self
+ 93 | 
+ 94 |     def method9[S: (int, str)](self: S, other: S) -> S:
+ 95 |         # error: [invalid-super-argument]
+ 96 |         # revealed: Unknown
+ 97 |         reveal_type(super())
+ 98 |         return self
+ 99 | 
+100 |     def method10[S: Callable[..., str]](self: S, other: S) -> S:
+101 |         # error: [invalid-super-argument]
+102 |         # revealed: Unknown
+103 |         reveal_type(super())
+104 |         return self
+105 | 
+106 | type Alias = Bar
+107 | 
+108 | class Bar:
+109 |     def method(self: Alias):
+110 |         # revealed: <super: <class 'Bar'>, Bar>
+111 |         reveal_type(super())
+112 | 
+113 |     def pls_dont_call_me(self: Never):
+114 |         # revealed: <super: <class 'Bar'>, Unknown>
+115 |         reveal_type(super())
+116 | 
+117 |     def only_call_me_on_callable_subclasses(self: Intersection[Bar, Callable[..., object]]):
+118 |         # revealed: <super: <class 'Bar'>, Bar>
+119 |         reveal_type(super())
+120 | 
+121 | class P(Protocol):
+122 |     def method(self: P):
+123 |         # revealed: <super: <class 'P'>, P>
+124 |         reveal_type(super())
+125 | 
+126 | class E(enum.Enum):
+127 |     X = 1
+128 | 
+129 |     def method(self: E):
+130 |         match self:
+131 |             case E.X:
+132 |                 # revealed: <super: <class 'E'>, E>
+133 |                 reveal_type(super())
+```
+
+# Diagnostics
+
+```
+error[invalid-super-argument]: `S@method7` is not an instance or subclass of `<class 'Foo'>` in `super(<class 'Foo'>, S@method7)` call
+  --> src/mdtest_snippet.py:85:21
+   |
+83 |         # error: [invalid-super-argument]
+84 |         # revealed: Unknown
+85 |         reveal_type(super())
+   |                     ^^^^^^^
+86 |         return self
+   |
+info: Type variable `S` has `object` as its implicit upper bound
+info: `object` is not an instance or subclass of `<class 'Foo'>`
+help: Consider adding an upper bound to type variable `S`
+info: rule `invalid-super-argument` is enabled by default
+
+```
+
+```
+error[invalid-super-argument]: `S@method8` is not an instance or subclass of `<class 'Foo'>` in `super(<class 'Foo'>, S@method8)` call
+  --> src/mdtest_snippet.py:91:21
+   |
+89 |         # error: [invalid-super-argument]
+90 |         # revealed: Unknown
+91 |         reveal_type(super())
+   |                     ^^^^^^^
+92 |         return self
+   |
+info: Type variable `S` has upper bound `int`
+info: `int` is not an instance or subclass of `<class 'Foo'>`
+info: rule `invalid-super-argument` is enabled by default
+
+```
+
+```
+error[invalid-super-argument]: `S@method9` is not an instance or subclass of `<class 'Foo'>` in `super(<class 'Foo'>, S@method9)` call
+  --> src/mdtest_snippet.py:97:21
+   |
+95 |         # error: [invalid-super-argument]
+96 |         # revealed: Unknown
+97 |         reveal_type(super())
+   |                     ^^^^^^^
+98 |         return self
+   |
+info: Type variable `S` has constraints `int, str`
+info: `int | str` is not an instance or subclass of `<class 'Foo'>`
+info: rule `invalid-super-argument` is enabled by default
+
+```
+
+```
+error[invalid-super-argument]: `S@method10` is a type variable with an abstract/structural type as its bounds or constraints, in `super(<class 'Foo'>, S@method10)` call
+   --> src/mdtest_snippet.py:103:21
+    |
+101 |         # error: [invalid-super-argument]
+102 |         # revealed: Unknown
+103 |         reveal_type(super())
+    |                     ^^^^^^^
+104 |         return self
+    |
+info: Type variable `S` has upper bound `(...) -> str`
+info: rule `invalid-super-argument` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/too_many_positionals…_-_too-many-positional-…_(eafa522239b42502).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/too_many_positionals…_-_too-many-positional-…_(eafa522239b42502).snap
new file mode 100644
index 0000000000..85d54b772b
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/too_many_positionals…_-_too-many-positional-…_(eafa522239b42502).snap
@@ -0,0 +1,117 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: too_many_positionals.md - too-many-positional-arguments diagnostics
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/too_many_positionals.md
+---
+
+# Python source files
+
+## module.py
+
+```
+1 | def f(a, b=42): ...
+2 | def g(a, b): ...
+3 | 
+4 | class Foo:
+5 |     def method(self, a): ...
+```
+
+## main.py
+
+```
+ 1 | from module import f, g, Foo
+ 2 | 
+ 3 | f(1, 2, 3)  # error: [too-many-positional-arguments]
+ 4 | 
+ 5 | def coinflip() -> bool:
+ 6 |     return True
+ 7 | 
+ 8 | h = f if coinflip() else g
+ 9 | 
+10 | # error: [too-many-positional-arguments]
+11 | # error: [too-many-positional-arguments]
+12 | h(1, 2, 3)
+13 | 
+14 | Foo().method(1, 2)  # error: [too-many-positional-arguments]
+```
+
+# Diagnostics
+
+```
+error[too-many-positional-arguments]: Too many positional arguments to function `f`: expected 2, got 3
+ --> src/main.py:3:9
+  |
+1 | from module import f, g, Foo
+2 |
+3 | f(1, 2, 3)  # error: [too-many-positional-arguments]
+  |         ^
+4 |
+5 | def coinflip() -> bool:
+  |
+info: Function signature here
+ --> src/module.py:1:5
+  |
+1 | def f(a, b=42): ...
+  |     ^^^^^^^^^^
+2 | def g(a, b): ...
+  |
+info: rule `too-many-positional-arguments` is enabled by default
+
+```
+
+```
+error[too-many-positional-arguments]: Too many positional arguments to function `f`: expected 2, got 3
+  --> src/main.py:12:9
+   |
+10 | # error: [too-many-positional-arguments]
+11 | # error: [too-many-positional-arguments]
+12 | h(1, 2, 3)
+   |         ^
+13 |
+14 | Foo().method(1, 2)  # error: [too-many-positional-arguments]
+   |
+info: Union variant `def f(a, b=Literal[42]) -> Unknown` is incompatible with this call site
+info: Attempted to call union type `(def f(a, b=Literal[42]) -> Unknown) | (def g(a, b) -> Unknown)`
+info: rule `too-many-positional-arguments` is enabled by default
+
+```
+
+```
+error[too-many-positional-arguments]: Too many positional arguments to function `g`: expected 2, got 3
+  --> src/main.py:12:9
+   |
+10 | # error: [too-many-positional-arguments]
+11 | # error: [too-many-positional-arguments]
+12 | h(1, 2, 3)
+   |         ^
+13 |
+14 | Foo().method(1, 2)  # error: [too-many-positional-arguments]
+   |
+info: Union variant `def g(a, b) -> Unknown` is incompatible with this call site
+info: Attempted to call union type `(def f(a, b=Literal[42]) -> Unknown) | (def g(a, b) -> Unknown)`
+info: rule `too-many-positional-arguments` is enabled by default
+
+```
+
+```
+error[too-many-positional-arguments]: Too many positional arguments to bound method `method`: expected 2, got 3
+  --> src/main.py:14:17
+   |
+12 | h(1, 2, 3)
+13 |
+14 | Foo().method(1, 2)  # error: [too-many-positional-arguments]
+   |                 ^
+   |
+info: Method signature here
+ --> src/module.py:5:9
+  |
+4 | class Foo:
+5 |     def method(self, a): ...
+  |         ^^^^^^^^^^^^^^^
+  |
+info: rule `too-many-positional-arguments` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/typed_dict.md_-_`TypedDict`_-_Diagnostics_(e5289abf5c570c29).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/typed_dict.md_-_`TypedDict`_-_Diagnostics_(e5289abf5c570c29).snap
index 22a0861fca..b80700fa08 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/typed_dict.md_-_`TypedDict`_-_Diagnostics_(e5289abf5c570c29).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/typed_dict.md_-_`TypedDict`_-_Diagnostics_(e5289abf5c570c29).snap
@@ -37,6 +37,14 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/typed_dict.md
 23 | 
 24 | def write_to_non_literal_string_key(person: Person, str_key: str):
 25 |     person[str_key] = "Alice"  # error: [invalid-key]
+26 | from typing_extensions import ReadOnly
+27 | 
+28 | class Employee(TypedDict):
+29 |     id: ReadOnly[int]
+30 |     name: str
+31 | 
+32 | def write_to_readonly_key(employee: Employee):
+33 |     employee["id"] = 42  # error: [invalid-assignment]
 ```
 
 # Diagnostics
@@ -100,6 +108,16 @@ error[invalid-assignment]: Invalid assignment to key "age" with declared type `i
 20 |
 21 | def write_to_non_existing_key(person: Person):
    |
+info: Item declaration
+ --> src/mdtest_snippet.py:5:5
+  |
+3 | class Person(TypedDict):
+4 |     name: str
+5 |     age: int | None
+  |     --------------- Item declared here
+6 |
+7 | def access_invalid_literal_string_key(person: Person):
+  |
 info: rule `invalid-assignment` is enabled by default
 
 ```
@@ -127,7 +145,30 @@ error[invalid-key]: Cannot access `Person` with a key of type `str`. Only string
 24 | def write_to_non_literal_string_key(person: Person, str_key: str):
 25 |     person[str_key] = "Alice"  # error: [invalid-key]
    |            ^^^^^^^
+26 | from typing_extensions import ReadOnly
    |
 info: rule `invalid-key` is enabled by default
 
 ```
+
+```
+error[invalid-assignment]: Cannot assign to key "id" on TypedDict `Employee`
+  --> src/mdtest_snippet.py:33:5
+   |
+32 | def write_to_readonly_key(employee: Employee):
+33 |     employee["id"] = 42  # error: [invalid-assignment]
+   |     -------- ^^^^ key is marked read-only
+   |     |
+   |     TypedDict `Employee`
+   |
+info: Item declaration
+  --> src/mdtest_snippet.py:29:5
+   |
+28 | class Employee(TypedDict):
+29 |     id: ReadOnly[int]
+   |     ----------------- Read-only item declared here
+30 |     name: str
+   |
+info: rule `invalid-assignment` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Cover_non-keyword_re…_(707b284610419a54).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Cover_non-keyword_re…_(707b284610419a54).snap
index 52a55ed12c..41b82b238e 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Cover_non-keyword_re…_(707b284610419a54).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Cover_non-keyword_re…_(707b284610419a54).snap
@@ -66,11 +66,11 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/union_call.m
 52 |     # error: [too-many-positional-arguments]
 53 |     # error: [invalid-argument-type] "Argument to function `f2` is incorrect: Expected `str`, found `Literal[3]`"
 54 |     # error: [missing-argument]
-55 |     # error: [invalid-argument-type] "Argument to function `f4` is incorrect: Argument type `Literal[3]` does not satisfy upper bound of type variable `T`"
+55 |     # error: [invalid-argument-type] "Argument to function `f4` is incorrect: Argument type `Literal[3]` does not satisfy upper bound `str` of type variable `T`"
 56 |     # error: [invalid-argument-type] "Argument to function `f5` is incorrect: Expected `str`, found `Literal[3]`"
 57 |     # error: [no-matching-overload] "No overload of function `f6` matches arguments"
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
 ```
 
@@ -81,27 +81,27 @@ error[call-non-callable]: Object of type `Literal[5]` is not callable
   --> src/mdtest_snippet.py:60:9
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |         ^^^^
    |
 info: Union variant `Literal[5]` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `call-non-callable` is enabled by default
 
 ```
 
 ```
-error[call-non-callable]: Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)
+error[call-non-callable]: Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)
   --> src/mdtest_snippet.py:60:9
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |         ^^^^
    |
 info: Union variant `PossiblyNotCallable` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `call-non-callable` is enabled by default
 
 ```
@@ -111,12 +111,12 @@ error[missing-argument]: No argument provided for required parameter `b` of func
   --> src/mdtest_snippet.py:60:9
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |         ^^^^
    |
 info: Union variant `def f3(a: int, b: int) -> int` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `missing-argument` is enabled by default
 
 ```
@@ -126,7 +126,7 @@ error[no-matching-overload]: No overload of function `f6` matches arguments
   --> src/mdtest_snippet.py:60:9
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |         ^^^^
    |
@@ -152,7 +152,7 @@ info: Overload implementation defined here
 28 |     return x + y if x and y else None
    |
 info: Union variant `Overload[() -> None, (x: str, y: str) -> str]` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `no-matching-overload` is enabled by default
 
 ```
@@ -162,7 +162,7 @@ error[invalid-argument-type]: Argument to function `f2` is incorrect
   --> src/mdtest_snippet.py:60:11
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |           ^ Expected `str`, found `Literal[3]`
    |
@@ -176,7 +176,7 @@ info: Function defined here
 8 |     return 0
   |
 info: Union variant `def f2(name: str) -> int` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `invalid-argument-type` is enabled by default
 
 ```
@@ -186,9 +186,9 @@ error[invalid-argument-type]: Argument to function `f4` is incorrect
   --> src/mdtest_snippet.py:60:11
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
-   |           ^ Argument type `Literal[3]` does not satisfy upper bound of type variable `T`
+   |           ^ Argument type `Literal[3]` does not satisfy upper bound `str` of type variable `T`
    |
 info: Type variable defined here
   --> src/mdtest_snippet.py:13:8
@@ -200,7 +200,7 @@ info: Type variable defined here
 14 |     return 0
    |
 info: Union variant `def f4[T](x: T@f4) -> int` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `invalid-argument-type` is enabled by default
 
 ```
@@ -210,7 +210,7 @@ error[invalid-argument-type]: Argument to function `f5` is incorrect
   --> src/mdtest_snippet.py:60:11
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |           ^ Expected `str`, found `Literal[3]`
    |
@@ -227,7 +227,7 @@ info: Matching overload defined here
 info: Non-matching overloads for function `f5`:
 info:   () -> None
 info: Union variant `Overload[() -> None, (x: str) -> str]` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `invalid-argument-type` is enabled by default
 
 ```
@@ -237,12 +237,12 @@ error[too-many-positional-arguments]: Too many positional arguments to function
   --> src/mdtest_snippet.py:60:11
    |
 58 |     # error: [call-non-callable] "Object of type `Literal[5]` is not callable"
-59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+59 |     # error: [call-non-callable] "Object of type `PossiblyNotCallable` is not callable (possibly missing `__call__` method)"
 60 |     x = f(3)
    |           ^
    |
 info: Union variant `def f1() -> int` is incompatible with this call site
-info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | (def f4[T](x: T@f4) -> int) | Literal[5] | (Overload[() -> None, (x: str) -> str]) | (Overload[() -> None, (x: str, y: str) -> str]) | PossiblyNotCallable`
+info: Attempted to call union type `(def f1() -> int) | (def f2(name: str) -> int) | (def f3(a: int, b: int) -> int) | ... omitted 5 union elements`
 info: rule `too-many-positional-arguments` is enabled by default
 
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Truncation_for_long_…_(ec94b5e857284ef3).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Truncation_for_long_…_(ec94b5e857284ef3).snap
new file mode 100644
index 0000000000..77582d963c
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/union_call.md_-_Calling_a_union_of_f…_-_Try_to_cover_all_pos…_-_Truncation_for_long_…_(ec94b5e857284ef3).snap
@@ -0,0 +1,56 @@
+---
+source: crates/ty_test/src/lib.rs
+assertion_line: 427
+expression: snapshot
+---
+---
+mdtest name: union_call.md - Calling a union of function types - Try to cover all possible reasons - Truncation for long unions and literals
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/union_call.md
+---
+
+# Python source files
+
+## mdtest_snippet.py
+
+```
+ 1 | from typing import Literal, Union
+ 2 | 
+ 3 | class A: ...
+ 4 | class B: ...
+ 5 | class C: ...
+ 6 | class D: ...
+ 7 | class E: ...
+ 8 | class F: ...
+ 9 | 
+10 | def f1(x: Union[Literal[1, 2, 3, 4, 5, 6, 7, 8], A, B, C, D, E, F]) -> int:
+11 |     return 0
+12 | 
+13 | def _(n: int):
+14 |     x = n
+15 |     # error: [invalid-argument-type]
+16 |     f1(x)
+```
+
+# Diagnostics
+
+```
+error[invalid-argument-type]: Argument to function `f1` is incorrect
+  --> src/mdtest_snippet.py:16:8
+   |
+14 |     x = n
+15 |     # error: [invalid-argument-type]
+16 |     f1(x)
+   |        ^ Expected `Literal[1, 2, 3, 4, 5, ... omitted 3 literals] | A | B | ... omitted 4 union elements`, found `int`
+   |
+info: Function defined here
+  --> src/mdtest_snippet.py:10:5
+   |
+ 8 | class F: ...
+ 9 |
+10 | def f1(x: Union[Literal[1, 2, 3, 4, 5, 6, 7, 8], A, B, C, D, E, F]) -> int:
+   |     ^^ ----------------------------------------------------------- Parameter declared here
+11 |     return 0
+   |
+info: rule `invalid-argument-type` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/unknown_argument.md_-_Unknown_argument_dia…_(f419c2a8e2ce2412).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/unknown_argument.md_-_Unknown_argument_dia…_(f419c2a8e2ce2412).snap
new file mode 100644
index 0000000000..e311271fe8
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/unknown_argument.md_-_Unknown_argument_dia…_(f419c2a8e2ce2412).snap
@@ -0,0 +1,117 @@
+---
+source: crates/ty_test/src/lib.rs
+expression: snapshot
+---
+---
+mdtest name: unknown_argument.md - Unknown argument diagnostics
+mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/unknown_argument.md
+---
+
+# Python source files
+
+## module.py
+
+```
+1 | def f(a, b, c=42): ...
+2 | def g(a, b): ...
+3 | 
+4 | class Foo:
+5 |     def method(self, a, b): ...
+```
+
+## main.py
+
+```
+ 1 | from module import f, g, Foo
+ 2 | 
+ 3 | f(a=1, b=2, c=3, d=42)  # error: [unknown-argument]
+ 4 | 
+ 5 | def coinflip() -> bool:
+ 6 |     return True
+ 7 | 
+ 8 | h = f if coinflip() else g
+ 9 | 
+10 | # error: [unknown-argument]
+11 | # error: [unknown-argument]
+12 | h(a=1, b=2, d=42)
+13 | 
+14 | Foo().method(a=1, b=2, c=3)  # error: [unknown-argument]
+```
+
+# Diagnostics
+
+```
+error[unknown-argument]: Argument `d` does not match any known parameter of function `f`
+ --> src/main.py:3:18
+  |
+1 | from module import f, g, Foo
+2 |
+3 | f(a=1, b=2, c=3, d=42)  # error: [unknown-argument]
+  |                  ^^^^
+4 |
+5 | def coinflip() -> bool:
+  |
+info: Function signature here
+ --> src/module.py:1:5
+  |
+1 | def f(a, b, c=42): ...
+  |     ^^^^^^^^^^^^^
+2 | def g(a, b): ...
+  |
+info: rule `unknown-argument` is enabled by default
+
+```
+
+```
+error[unknown-argument]: Argument `d` does not match any known parameter of function `f`
+  --> src/main.py:12:13
+   |
+10 | # error: [unknown-argument]
+11 | # error: [unknown-argument]
+12 | h(a=1, b=2, d=42)
+   |             ^^^^
+13 |
+14 | Foo().method(a=1, b=2, c=3)  # error: [unknown-argument]
+   |
+info: Union variant `def f(a, b, c=Literal[42]) -> Unknown` is incompatible with this call site
+info: Attempted to call union type `(def f(a, b, c=Literal[42]) -> Unknown) | (def g(a, b) -> Unknown)`
+info: rule `unknown-argument` is enabled by default
+
+```
+
+```
+error[unknown-argument]: Argument `d` does not match any known parameter of function `g`
+  --> src/main.py:12:13
+   |
+10 | # error: [unknown-argument]
+11 | # error: [unknown-argument]
+12 | h(a=1, b=2, d=42)
+   |             ^^^^
+13 |
+14 | Foo().method(a=1, b=2, c=3)  # error: [unknown-argument]
+   |
+info: Union variant `def g(a, b) -> Unknown` is incompatible with this call site
+info: Attempted to call union type `(def f(a, b, c=Literal[42]) -> Unknown) | (def g(a, b) -> Unknown)`
+info: rule `unknown-argument` is enabled by default
+
+```
+
+```
+error[unknown-argument]: Argument `c` does not match any known parameter of bound method `method`
+  --> src/main.py:14:24
+   |
+12 | h(a=1, b=2, d=42)
+13 |
+14 | Foo().method(a=1, b=2, c=3)  # error: [unknown-argument]
+   |                        ^^^
+   |
+info: Method signature here
+ --> src/module.py:5:9
+  |
+4 | class Foo:
+5 |     def method(self, a, b): ...
+  |         ^^^^^^^^^^^^^^^^^^
+  |
+info: rule `unknown-argument` is enabled by default
+
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_An_unresolvable_impo…_(72d090df51ea97b8).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_An_unresolvable_impo…_(72d090df51ea97b8).snap
index 633cb50b16..fbaa1abc00 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_An_unresolvable_impo…_(72d090df51ea97b8).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_An_unresolvable_impo…_(72d090df51ea97b8).snap
@@ -28,6 +28,9 @@ error[unresolved-import]: Cannot resolve imported module `does_not_exist`
 2 |
 3 | x = does_not_exist.foo
   |
+info: Searched in the following paths during module resolution:
+info:   1. /src (first-party code)
+info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
 info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
 info: rule `unresolved-import` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_Using_`from`_with_an…_(9fa713dfa17cc404).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_Using_`from`_with_an…_(9fa713dfa17cc404).snap
index 0d687bf11c..83f03b7929 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_Using_`from`_with_an…_(9fa713dfa17cc404).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/unresolved_import.md_-_Unresolved_import_di…_-_Using_`from`_with_an…_(9fa713dfa17cc404).snap
@@ -28,6 +28,9 @@ error[unresolved-import]: Cannot resolve imported module `does_not_exist`
 2 |
 3 | stat = add(10, 15)
   |
+info: Searched in the following paths during module resolution:
+info:   1. /src (first-party code)
+info:   2. vendored://stdlib (stdlib typeshed stubs vendored by ty)
 info: make sure your Python environment is properly configured: https://docs.astral.sh/ty/modules/#python-environment
 info: rule `unresolved-import` is enabled by default
 
diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/version_related_synt…_-_Version-related_synt…_-_`match`_statement_-_Before_3.10_(2545eaa83b635b8b).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/version_related_synt…_-_Version-related_synt…_-_`match`_statement_-_Before_3.10_(2545eaa83b635b8b).snap
index 2500cc4544..a2cea52ff9 100644
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/version_related_synt…_-_Version-related_synt…_-_`match`_statement_-_Before_3.10_(2545eaa83b635b8b).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/version_related_synt…_-_Version-related_synt…_-_`match`_statement_-_Before_3.10_(2545eaa83b635b8b).snap
@@ -20,11 +20,11 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/version_rela
 # Diagnostics
 
 ```
-error[invalid-syntax]
+error[invalid-syntax]: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
  --> src/mdtest_snippet.py:1:1
   |
 1 | match 2:  # error: 1 [invalid-syntax] "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
-  | ^^^^^ Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+  | ^^^^^
 2 |     case 1:
 3 |         print("it's one")
   |
diff --git a/crates/ty_python_semantic/resources/mdtest/statically_known_branches.md b/crates/ty_python_semantic/resources/mdtest/statically_known_branches.md
index f6d65447cf..4b7e73498c 100644
--- a/crates/ty_python_semantic/resources/mdtest/statically_known_branches.md
+++ b/crates/ty_python_semantic/resources/mdtest/statically_known_branches.md
@@ -1530,7 +1530,7 @@ if flag():
 ```
 
 ```py
-# error: [possibly-unbound-import]
+# error: [possibly-missing-import]
 from module import symbol
 ```
 
@@ -1564,6 +1564,24 @@ if True:
 from module import symbol
 ```
 
+## Non-definitely bound symbols in conditions
+
+When a non-definitely bound symbol is used as a (part of a) condition, we always infer an ambiguous
+truthiness. If we didn't do that, `x` would be considered definitely bound in the following example:
+
+```py
+def _(flag: bool):
+    if flag:
+        ALWAYS_TRUE_IF_BOUND = True
+
+    # error: [possibly-unresolved-reference] "Name `ALWAYS_TRUE_IF_BOUND` used when possibly not defined"
+    if True and ALWAYS_TRUE_IF_BOUND:
+        x = 1
+
+    # error: [possibly-unresolved-reference] "Name `x` used when possibly not defined"
+    x
+```
+
 ## Unreachable code
 
 A closely related feature is the ability to detect unreachable code. For example, we do not emit a
diff --git a/crates/ty_python_semantic/resources/mdtest/stubs/ellipsis.md b/crates/ty_python_semantic/resources/mdtest/stubs/ellipsis.md
index 6b147fca57..a29277516d 100644
--- a/crates/ty_python_semantic/resources/mdtest/stubs/ellipsis.md
+++ b/crates/ty_python_semantic/resources/mdtest/stubs/ellipsis.md
@@ -47,7 +47,7 @@ Iterating over an ellipsis literal as part of a `for` loop in a stub is invalid,
 results in a diagnostic:
 
 ```pyi
-# error: [not-iterable] "Object of type `ellipsis` is not iterable"
+# error: [not-iterable] "Object of type `EllipsisType` is not iterable"
 for a, b in ...:
     reveal_type(a)  # revealed: Unknown
     reveal_type(b)  # revealed: Unknown
@@ -59,13 +59,13 @@ In a non-stub file, there's no special treatment of ellipsis literals. An ellips
 be assigned if `EllipsisType` is actually assignable to the annotated type.
 
 ```py
-# error: 7 [invalid-parameter-default] "Default value of type `ellipsis` is not assignable to annotated parameter type `int`"
+# error: 7 [invalid-parameter-default] "Default value of type `EllipsisType` is not assignable to annotated parameter type `int`"
 def f(x: int = ...) -> None: ...
 
-# error: 1 [invalid-assignment] "Object of type `ellipsis` is not assignable to `int`"
+# error: 1 [invalid-assignment] "Object of type `EllipsisType` is not assignable to `int`"
 a: int = ...
 b = ...
-reveal_type(b)  # revealed: ellipsis
+reveal_type(b)  # revealed: EllipsisType
 ```
 
 ## Use of `Ellipsis` symbol
@@ -73,6 +73,6 @@ reveal_type(b)  # revealed: ellipsis
 There is no special treatment of the builtin name `Ellipsis` in stubs, only of `...` literals.
 
 ```pyi
-# error: 7 [invalid-parameter-default] "Default value of type `ellipsis` is not assignable to annotated parameter type `int`"
+# error: 7 [invalid-parameter-default] "Default value of type `EllipsisType` is not assignable to annotated parameter type `int`"
 def f(x: int = Ellipsis) -> None: ...
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/subscript/class.md b/crates/ty_python_semantic/resources/mdtest/subscript/class.md
index 86de205086..947f7fbbaf 100644
--- a/crates/ty_python_semantic/resources/mdtest/subscript/class.md
+++ b/crates/ty_python_semantic/resources/mdtest/subscript/class.md
@@ -19,6 +19,12 @@ class Identity:
 reveal_type(Identity[0])  # revealed: str
 ```
 
+`__class_getitem__` is implicitly a classmethod, so it can be called like this:
+
+```py
+reveal_type(Identity.__class_getitem__(0))  # revealed: str
+```
+
 ## Class getitem union
 
 ```py
diff --git a/crates/ty_python_semantic/resources/mdtest/subscript/instance.md b/crates/ty_python_semantic/resources/mdtest/subscript/instance.md
index a7399d7152..7d1ad7f183 100644
--- a/crates/ty_python_semantic/resources/mdtest/subscript/instance.md
+++ b/crates/ty_python_semantic/resources/mdtest/subscript/instance.md
@@ -14,7 +14,11 @@ a = NotSubscriptable()[0]  # error: "Cannot subscript object of type `NotSubscri
 class NotSubscriptable:
     __getitem__ = None
 
-# error: "Method `__getitem__` of type `Unknown | None` is possibly not callable on object of type `NotSubscriptable`"
+# TODO: this would be more user-friendly if the `call-non-callable` diagnostic was
+# transformed into a `not-subscriptable` diagnostic with a subdiagnostic explaining
+# that this was because `__getitem__` was possibly not callable
+#
+# error: [call-non-callable] "Method `__getitem__` of type `Unknown | None` may not be callable on object of type `NotSubscriptable`"
 a = NotSubscriptable()[0]
 ```
 
@@ -82,7 +86,7 @@ class NoSetitem:
     __setitem__ = None
 
 a = NoSetitem()
-a[0] = 0  # error: "Method `__setitem__` of type `Unknown | None` is possibly not callable on object of type `NoSetitem`"
+a[0] = 0  # error: "Method `__setitem__` of type `Unknown | None` may not be callable on object of type `NoSetitem`"
 ```
 
 ## Valid `__setitem__` method
diff --git a/crates/ty_python_semantic/resources/mdtest/subscript/lists.md b/crates/ty_python_semantic/resources/mdtest/subscript/lists.md
index 98aeec8135..d4026b1995 100644
--- a/crates/ty_python_semantic/resources/mdtest/subscript/lists.md
+++ b/crates/ty_python_semantic/resources/mdtest/subscript/lists.md
@@ -9,13 +9,11 @@ A list can be indexed into with:
 
 ```py
 x = [1, 2, 3]
-reveal_type(x)  # revealed: list[Unknown]
+reveal_type(x)  # revealed: list[Unknown | int]
 
-# TODO reveal int
-reveal_type(x[0])  # revealed: Unknown
+reveal_type(x[0])  # revealed: Unknown | int
 
-# TODO reveal list[int]
-reveal_type(x[0:1])  # revealed: list[Unknown]
+reveal_type(x[0:1])  # revealed: list[Unknown | int]
 
 # error: [invalid-argument-type]
 reveal_type(x["a"])  # revealed: Unknown
diff --git a/crates/ty_python_semantic/resources/mdtest/suppressions/ty_ignore.md b/crates/ty_python_semantic/resources/mdtest/suppressions/ty_ignore.md
index 9a1930f015..765d4f9e65 100644
--- a/crates/ty_python_semantic/resources/mdtest/suppressions/ty_ignore.md
+++ b/crates/ty_python_semantic/resources/mdtest/suppressions/ty_ignore.md
@@ -88,7 +88,7 @@ def test($):  # ty: ignore
 ```py
 a = 10
 # revealed: Literal[10]
-# error: [unknown-rule] "Unknown rule `revealed-type`"
+# error: [ignore-comment-unknown-rule] "Unknown rule `revealed-type`"
 reveal_type(a)  # ty: ignore[revealed-type]
 ```
 
@@ -127,7 +127,7 @@ a = 10 / 0  # ty: ignore[*-*]
 <!-- blacken-docs:off -->
 
 ```py
-a = 10 / 0  # ty: ignore[division-by-zero]      
+a = 10 / 0  # ty: ignore[division-by-zero]       
             #                               ^^^^^^ trailing whitespace
 ```
 
@@ -178,14 +178,14 @@ a = 4 / 0  # error: [division-by-zero]
 ## Unknown rule
 
 ```py
-# error: [unknown-rule] "Unknown rule `is-equal-14`"
-a = 10 + 4  # ty: ignore[is-equal-14]
+# error: [ignore-comment-unknown-rule] "Unknown rule `division-by-zer`. Did you mean `division-by-zero`?"
+a = 10 + 4  # ty: ignore[division-by-zer]
 ```
 
 ## Code with `lint:` prefix
 
 ```py
-# error:[unknown-rule] "Unknown rule `lint:division-by-zero`. Did you mean `division-by-zero`?"
+# error:[ignore-comment-unknown-rule] "Unknown rule `lint:division-by-zero`. Did you mean `division-by-zero`?"
 # error: [division-by-zero]
 a = 10 / 0  # ty: ignore[lint:division-by-zero]
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/t_strings.md b/crates/ty_python_semantic/resources/mdtest/t_strings.md
new file mode 100644
index 0000000000..97ebeed51a
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/t_strings.md
@@ -0,0 +1,20 @@
+# Template strings
+
+(NB: `black` does not support Python 3.14 at the time of this writing)
+
+<!-- blacken-docs:off -->
+
+```toml
+[environment]
+python-version = "3.14"
+```
+
+Template strings, or t-strings, were added in Python 3.14.
+
+They may be specified as literals and are objects of type `string.templatelib.Template`.
+
+## Empty template string
+
+```py
+reveal_type(t"")  # revealed: Template
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/ty_extensions.md b/crates/ty_python_semantic/resources/mdtest/ty_extensions.md
index db29efb107..37a76f24e2 100644
--- a/crates/ty_python_semantic/resources/mdtest/ty_extensions.md
+++ b/crates/ty_python_semantic/resources/mdtest/ty_extensions.md
@@ -398,7 +398,7 @@ the expression `str`:
 from ty_extensions import TypeOf, is_subtype_of, static_assert
 
 # This is incorrect and therefore fails with ...
-# error: "Static assertion error: argument evaluates to `False`"
+# error: "Static assertion error: argument of type `ty_extensions.ConstraintSet[never]` is statically known to be falsy"
 static_assert(is_subtype_of(str, type[str]))
 
 # Correct, returns True:
@@ -469,6 +469,8 @@ c4: CallableTypeOf[()]
 Using it in annotation to reveal the signature of the callable object:
 
 ```py
+from typing_extensions import Self
+
 class Foo:
     def __init__(self, x: int) -> None:
         pass
@@ -476,19 +478,29 @@ class Foo:
     def __call__(self, x: int) -> str:
         return "foo"
 
+    def returns_self(self, x: int) -> Self:
+        return self
+
+    @classmethod
+    def class_method(cls, x: int) -> Self:
+        return cls(x)
+
 def _(
     c1: CallableTypeOf[f1],
     c2: CallableTypeOf[f2],
     c3: CallableTypeOf[f3],
     c4: CallableTypeOf[Foo],
     c5: CallableTypeOf[Foo(42).__call__],
+    c6: CallableTypeOf[Foo(42).returns_self],
+    c7: CallableTypeOf[Foo.class_method],
+    c8: CallableTypeOf[Foo(42)],
 ) -> None:
     reveal_type(c1)  # revealed: () -> Unknown
     reveal_type(c2)  # revealed: () -> int
     reveal_type(c3)  # revealed: (x: int, y: str) -> None
-
-    # TODO: should be `(x: int) -> Foo`
-    reveal_type(c4)  # revealed: (...) -> Foo
-
+    reveal_type(c4)  # revealed: (x: int) -> Foo
     reveal_type(c5)  #  revealed: (x: int) -> str
+    reveal_type(c6)  # revealed: (x: int) -> Foo
+    reveal_type(c7)  # revealed: (x: int) -> Foo
+    reveal_type(c8)  # revealed: (x: int) -> str
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/type_compendium/tuple.md b/crates/ty_python_semantic/resources/mdtest/type_compendium/tuple.md
index 71f177ed6a..0142bfa4df 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_compendium/tuple.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_compendium/tuple.md
@@ -36,7 +36,11 @@ reveal_type(tuple[int, *tuple[str, ...]]((1,)))  # revealed: tuple[int, *tuple[s
 reveal_type(().__class__())  # revealed: tuple[()]
 reveal_type((1, 2).__class__((1, 2)))  # revealed: tuple[Literal[1], Literal[2]]
 
-def f(x: Iterable[int], y: list[str], z: Never, aa: list[Never]):
+class LiskovUncompliantIterable(Iterable[int]):
+    # TODO we should emit an error here about the Liskov violation
+    __iter__ = None
+
+def f(x: Iterable[int], y: list[str], z: Never, aa: list[Never], bb: LiskovUncompliantIterable):
     reveal_type(tuple(x))  # revealed: tuple[int, ...]
     reveal_type(tuple(y))  # revealed: tuple[str, ...]
     reveal_type(tuple(z))  # revealed: tuple[Unknown, ...]
@@ -44,12 +48,16 @@ def f(x: Iterable[int], y: list[str], z: Never, aa: list[Never]):
     # This is correct as the only inhabitants of `list[Never]` can be empty lists
     reveal_type(tuple(aa))  # revealed: tuple[()]
 
+    # `tuple[int, ...] would probably also be fine here since `LiskovUncompliantIterable`
+    # inherits from `Iterable[int]`. Ultimately all bets are off when the Liskov Principle is
+    # violated, though -- this test is really just to make sure we don't crash in this situation.
+    reveal_type(tuple(bb))  # revealed: tuple[Unknown, ...]
+
 reveal_type(tuple((1, 2)))  # revealed: tuple[Literal[1], Literal[2]]
 
-# TODO: should be `tuple[Literal[1], ...]`
-reveal_type(tuple([1]))  # revealed: tuple[Unknown, ...]
+reveal_type(tuple([1]))  # revealed: tuple[Unknown | int, ...]
 
-# error: [invalid-argument-type] "Argument is incorrect: Expected `tuple[int]`, found `list[Unknown]`"
+# error: [invalid-argument-type]
 reveal_type(tuple[int]([1]))  # revealed: tuple[int]
 
 # error: [invalid-argument-type] "Argument is incorrect: Expected `tuple[int, str]`, found `tuple[Literal[1]]`"
@@ -60,6 +68,10 @@ reveal_type((1,).__class__())  # revealed: tuple[Literal[1]]
 
 # error: [missing-argument] "No argument provided for required parameter `iterable`"
 reveal_type((1, 2).__class__())  # revealed: tuple[Literal[1], Literal[2]]
+
+def g(x: tuple[int, str] | tuple[bytes, bool], y: tuple[int, str] | tuple[bytes, bool, bytes]):
+    reveal_type(tuple(x))  # revealed: tuple[int, str] | tuple[bytes, bool]
+    reveal_type(tuple(y))  # revealed: tuple[int, str] | tuple[bytes, bool, bytes]
 ```
 
 ## Instantiating tuple subclasses
@@ -517,10 +529,6 @@ from typing import Literal
 reveal_type(list((1, 2, 3)))  # revealed: list[int]
 reveal_type(list(((1, 2, 3),)))  # revealed: list[tuple[int, int, int]]
 
-# TODO: we could bidirectionally infer that the user does not want literals to be promoted here,
-# and avoid this diagnostic
-#
-# error: [invalid-assignment] "`list[int]` is not assignable to `list[Literal[1, 2, 3]]`"
 x: list[Literal[1, 2, 3]] = list((1, 2, 3))
 reveal_type(x)  # revealed: list[Literal[1, 2, 3]]
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/type_properties/constraints.md b/crates/ty_python_semantic/resources/mdtest/type_properties/constraints.md
new file mode 100644
index 0000000000..607501a349
--- /dev/null
+++ b/crates/ty_python_semantic/resources/mdtest/type_properties/constraints.md
@@ -0,0 +1,640 @@
+# Constraints
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+For "concrete" types (which contain no type variables), type properties like assignability have
+simple answers: one type is either assignable to another type, or it isn't. (The _rules_ for
+comparing two particular concrete types can be rather complex, but the _answer_ is a simple "yes" or
+"no".)
+
+These properties are more complex when type variables are involved, because there are (usually) many
+different concrete types that a typevar can be specialized to, and the type property might hold for
+some specializations, but not for others. That means that for types that include typevars, "Is this
+type assignable to another?" no longer makes sense as a question. The better question is: "Under
+what constraints is this type assignable to another?".
+
+An individual constraint restricts the specialization of a single typevar. You can then build up
+more complex constraint sets using union, intersection, and negation operations. We use a
+disjunctive normal form (DNF) representation, just like we do for types: a _constraint set_ is the
+union of zero or more _clauses_, each of which is the intersection of zero or more _individual
+constraints_. Note that the constraint set that contains no clauses is never satisfiable
+(`⋃ {} = 0`); and the constraint set that contains a single clause, where that clause contains no
+constraints, is always satisfiable (`⋃ {⋂ {}} = 1`).
+
+## Kinds of constraints
+
+### Range
+
+A _range_ constraint requires the typevar to be within a particular lower and upper bound: the
+typevar can only specialize to a type that is a supertype of the lower bound, and a subtype of the
+upper bound.
+
+```py
+from typing import Any, final, Never, Sequence
+from ty_extensions import range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+
+@final
+class Unrelated: ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Super)]
+    reveal_type(range_constraint(Sub, T, Super))
+```
+
+Every type is a supertype of `Never`, so a lower bound of `Never` is the same as having no lower
+bound.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(T@_ ≤ Base)]
+    reveal_type(range_constraint(Never, T, Base))
+```
+
+Similarly, every type is a subtype of `object`, so an upper bound of `object` is the same as having
+no upper bound.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Base ≤ T@_)]
+    reveal_type(range_constraint(Base, T, object))
+```
+
+And a range constraint with _both_ a lower bound of `Never` and an upper bound of `object` does not
+constrain the typevar at all.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(range_constraint(Never, T, object))
+```
+
+If the lower bound and upper bounds are "inverted" (the upper bound is a subtype of the lower bound)
+or incomparable, then there is no type that can satisfy the constraint.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(range_constraint(Super, T, Sub))
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(range_constraint(Base, T, Unrelated))
+```
+
+The lower and upper bound can be the same type, in which case the typevar can only be specialized to
+that specific type.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(T@_ = Base)]
+    reveal_type(range_constraint(Base, T, Base))
+```
+
+Constraints can only refer to fully static types, so the lower and upper bounds are transformed into
+their bottom and top materializations, respectively.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Base ≤ T@_)]
+    reveal_type(range_constraint(Base, T, Any))
+    # revealed: ty_extensions.ConstraintSet[(Sequence[Base] ≤ T@_ ≤ Sequence[object])]
+    reveal_type(range_constraint(Sequence[Base], T, Sequence[Any]))
+
+    # revealed: ty_extensions.ConstraintSet[(T@_ ≤ Base)]
+    reveal_type(range_constraint(Any, T, Base))
+    # revealed: ty_extensions.ConstraintSet[(Sequence[Never] ≤ T@_ ≤ Sequence[Base])]
+    reveal_type(range_constraint(Sequence[Any], T, Sequence[Base]))
+```
+
+### Negated range
+
+A _negated range_ constraint is the opposite of a range constraint: it requires the typevar to _not_
+be within a particular lower and upper bound. The typevar can only specialize to a type that is a
+strict subtype of the lower bound, a strict supertype of the upper bound, or incomparable to either.
+
+```py
+from typing import Any, final, Never, Sequence
+from ty_extensions import negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+
+@final
+class Unrelated: ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Super)]
+    reveal_type(negated_range_constraint(Sub, T, Super))
+```
+
+Every type is a supertype of `Never`, so a lower bound of `Never` is the same as having no lower
+bound.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(T@_ ≤ Base)]
+    reveal_type(negated_range_constraint(Never, T, Base))
+```
+
+Similarly, every type is a subtype of `object`, so an upper bound of `object` is the same as having
+no upper bound.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(Base ≤ T@_)]
+    reveal_type(negated_range_constraint(Base, T, object))
+```
+
+And a negated range constraint with _both_ a lower bound of `Never` and an upper bound of `object`
+cannot be satisfied at all.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(negated_range_constraint(Never, T, object))
+```
+
+If the lower bound and upper bounds are "inverted" (the upper bound is a subtype of the lower bound)
+or incomparable, then the negated range constraint can always be satisfied.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(negated_range_constraint(Super, T, Sub))
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(negated_range_constraint(Base, T, Unrelated))
+```
+
+The lower and upper bound can be the same type, in which case the typevar can be specialized to any
+type other than that specific type.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(T@_ ≠ Base)]
+    reveal_type(negated_range_constraint(Base, T, Base))
+```
+
+Constraints can only refer to fully static types, so the lower and upper bounds are transformed into
+their bottom and top materializations, respectively.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(Base ≤ T@_)]
+    reveal_type(negated_range_constraint(Base, T, Any))
+    # revealed: ty_extensions.ConstraintSet[¬(Sequence[Base] ≤ T@_ ≤ Sequence[object])]
+    reveal_type(negated_range_constraint(Sequence[Base], T, Sequence[Any]))
+
+    # revealed: ty_extensions.ConstraintSet[¬(T@_ ≤ Base)]
+    reveal_type(negated_range_constraint(Any, T, Base))
+    # revealed: ty_extensions.ConstraintSet[¬(Sequence[Never] ≤ T@_ ≤ Sequence[Base])]
+    reveal_type(negated_range_constraint(Sequence[Any], T, Sequence[Base]))
+```
+
+## Intersection
+
+The intersection of two constraint sets requires that the constraints in both sets hold. In many
+cases, we can simplify the result of an intersection.
+
+### Different typevars
+
+```py
+from ty_extensions import range_constraint, negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+```
+
+We cannot simplify the intersection of constraints that refer to different typevars.
+
+```py
+def _[T, U]() -> None:
+    # revealed: ty_extensions.ConstraintSet[((Sub ≤ T@_ ≤ Base) ∧ (Sub ≤ U@_ ≤ Base))]
+    reveal_type(range_constraint(Sub, T, Base) & range_constraint(Sub, U, Base))
+    # revealed: ty_extensions.ConstraintSet[(¬(Sub ≤ T@_ ≤ Base) ∧ ¬(Sub ≤ U@_ ≤ Base))]
+    reveal_type(negated_range_constraint(Sub, T, Base) & negated_range_constraint(Sub, U, Base))
+```
+
+### Intersection of two ranges
+
+The intersection of two ranges is where the ranges "overlap".
+
+```py
+from typing import final
+from ty_extensions import range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+class SubSub(Sub): ...
+
+@final
+class Unrelated: ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Base)]
+    reveal_type(range_constraint(SubSub, T, Base) & range_constraint(Sub, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Base)]
+    reveal_type(range_constraint(SubSub, T, Super) & range_constraint(Sub, T, Base))
+    # revealed: ty_extensions.ConstraintSet[(T@_ = Base)]
+    reveal_type(range_constraint(Sub, T, Base) & range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Super)]
+    reveal_type(range_constraint(Sub, T, Super) & range_constraint(Sub, T, Super))
+```
+
+If they don't overlap, the intersection is empty.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(range_constraint(SubSub, T, Sub) & range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(range_constraint(SubSub, T, Sub) & range_constraint(Unrelated, T, object))
+```
+
+### Intersection of a range and a negated range
+
+The bounds of the range constraint provide a range of types that should be included; the bounds of
+the negated range constraint provide a "hole" of types that should not be included. We can think of
+the intersection as removing the hole from the range constraint.
+
+```py
+from typing import final, Never
+from ty_extensions import range_constraint, negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+class SubSub(Sub): ...
+
+@final
+class Unrelated: ...
+```
+
+If the negative range completely contains the positive range, then the intersection is empty.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(range_constraint(Sub, T, Base) & negated_range_constraint(SubSub, T, Super))
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(range_constraint(Sub, T, Base) & negated_range_constraint(Sub, T, Base))
+```
+
+If the negative range is disjoint from the positive range, the negative range doesn't remove
+anything; the intersection is the positive range.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Base)]
+    reveal_type(range_constraint(Sub, T, Base) & negated_range_constraint(Never, T, Unrelated))
+    # revealed: ty_extensions.ConstraintSet[(SubSub ≤ T@_ ≤ Sub)]
+    reveal_type(range_constraint(SubSub, T, Sub) & negated_range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(Base ≤ T@_ ≤ Super)]
+    reveal_type(range_constraint(Base, T, Super) & negated_range_constraint(SubSub, T, Sub))
+```
+
+Otherwise we clip the negative constraint to the mininum range that overlaps with the positive
+range.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[((SubSub ≤ T@_ ≤ Base) ∧ ¬(Sub ≤ T@_ ≤ Base))]
+    reveal_type(range_constraint(SubSub, T, Base) & negated_range_constraint(Sub, T, Super))
+    # revealed: ty_extensions.ConstraintSet[((SubSub ≤ T@_ ≤ Super) ∧ ¬(Sub ≤ T@_ ≤ Base))]
+    reveal_type(range_constraint(SubSub, T, Super) & negated_range_constraint(Sub, T, Base))
+```
+
+### Intersection of two negated ranges
+
+When one of the bounds is entirely contained within the other, the intersection simplifies to the
+smaller constraint. For negated ranges, the smaller constraint is the one with the larger "hole".
+
+```py
+from typing import final
+from ty_extensions import negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+class SubSub(Sub): ...
+
+@final
+class Unrelated: ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(SubSub ≤ T@_ ≤ Super)]
+    reveal_type(negated_range_constraint(SubSub, T, Super) & negated_range_constraint(Sub, T, Base))
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Super)]
+    reveal_type(negated_range_constraint(Sub, T, Super) & negated_range_constraint(Sub, T, Super))
+```
+
+Otherwise, the union cannot be simplified.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(¬(Base ≤ T@_ ≤ Super) ∧ ¬(Sub ≤ T@_ ≤ Base))]
+    reveal_type(negated_range_constraint(Sub, T, Base) & negated_range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(¬(Base ≤ T@_ ≤ Super) ∧ ¬(SubSub ≤ T@_ ≤ Sub))]
+    reveal_type(negated_range_constraint(SubSub, T, Sub) & negated_range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(¬(SubSub ≤ T@_ ≤ Sub) ∧ ¬(Unrelated ≤ T@_))]
+    reveal_type(negated_range_constraint(SubSub, T, Sub) & negated_range_constraint(Unrelated, T, object))
+```
+
+In particular, the following does not simplify, even though it seems like it could simplify to
+`¬(SubSub ≤ T@_ ≤ Super)`. The issue is that there are types that are within the bounds of
+`SubSub ≤ T@_ ≤ Super`, but which are not comparable to `Base` or `Sub`, and which therefore should
+be included in the union. An example would be the type that contains all instances of `Super`,
+`Base`, and `SubSub` (but _not_ including instances of `Sub`). (We don't have a way to spell that
+type at the moment, but it is a valid type.) That type is not in `SubSub ≤ T ≤ Base`, since it
+includes `Super`, which is outside the range. It's also not in `Sub ≤ T ≤ Super`, because it does
+not include `Sub`. That means it should be in the union. (Remember that for negated range
+constraints, the lower and upper bounds define the "hole" of types that are _not_ allowed.) Since
+that type _is_ in `SubSub ≤ T ≤ Super`, it is not correct to simplify the union in this way.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(¬(Sub ≤ T@_ ≤ Super) ∧ ¬(SubSub ≤ T@_ ≤ Base))]
+    reveal_type(negated_range_constraint(SubSub, T, Base) & negated_range_constraint(Sub, T, Super))
+```
+
+## Union
+
+The union of two constraint sets requires that the constraints in either set hold. In many cases, we
+can simplify the result of an union.
+
+### Different typevars
+
+```py
+from ty_extensions import range_constraint, negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+```
+
+We cannot simplify the union of constraints that refer to different typevars.
+
+```py
+def _[T, U]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Base) ∨ (Sub ≤ U@_ ≤ Base)]
+    reveal_type(range_constraint(Sub, T, Base) | range_constraint(Sub, U, Base))
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Base) ∨ ¬(Sub ≤ U@_ ≤ Base)]
+    reveal_type(negated_range_constraint(Sub, T, Base) | negated_range_constraint(Sub, U, Base))
+```
+
+### Union of two ranges
+
+When one of the bounds is entirely contained within the other, the union simplifies to the larger
+bounds.
+
+```py
+from typing import final
+from ty_extensions import range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+class SubSub(Sub): ...
+
+@final
+class Unrelated: ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(SubSub ≤ T@_ ≤ Super)]
+    reveal_type(range_constraint(SubSub, T, Super) | range_constraint(Sub, T, Base))
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Super)]
+    reveal_type(range_constraint(Sub, T, Super) | range_constraint(Sub, T, Super))
+```
+
+Otherwise, the union cannot be simplified.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Base ≤ T@_ ≤ Super) ∨ (Sub ≤ T@_ ≤ Base)]
+    reveal_type(range_constraint(Sub, T, Base) | range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(Base ≤ T@_ ≤ Super) ∨ (SubSub ≤ T@_ ≤ Sub)]
+    reveal_type(range_constraint(SubSub, T, Sub) | range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(SubSub ≤ T@_ ≤ Sub) ∨ (Unrelated ≤ T@_)]
+    reveal_type(range_constraint(SubSub, T, Sub) | range_constraint(Unrelated, T, object))
+```
+
+In particular, the following does not simplify, even though it seems like it could simplify to
+`SubSub ≤ T@_ ≤ Super`. The issue is that there are types that are within the bounds of
+`SubSub ≤ T@_ ≤ Super`, but which are not comparable to `Base` or `Sub`, and which therefore should
+not be included in the union. An example would be the type that contains all instances of `Super`,
+`Base`, and `SubSub` (but _not_ including instances of `Sub`). (We don't have a way to spell that
+type at the moment, but it is a valid type.) That type is not in `SubSub ≤ T ≤ Base`, since it
+includes `Super`, which is outside the range. It's also not in `Sub ≤ T ≤ Super`, because it does
+not include `Sub`. That means it should not be in the union. Since that type _is_ in
+`SubSub ≤ T ≤ Super`, it is not correct to simplify the union in this way.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Super) ∨ (SubSub ≤ T@_ ≤ Base)]
+    reveal_type(range_constraint(SubSub, T, Base) | range_constraint(Sub, T, Super))
+```
+
+### Union of a range and a negated range
+
+The bounds of the range constraint provide a range of types that should be included; the bounds of
+the negated range constraint provide a "hole" of types that should not be included. We can think of
+the union as filling part of the hole with the types from the range constraint.
+
+```py
+from typing import final, Never
+from ty_extensions import range_constraint, negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+class SubSub(Sub): ...
+
+@final
+class Unrelated: ...
+```
+
+If the positive range completely contains the negative range, then the union is always satisfied.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(negated_range_constraint(Sub, T, Base) | range_constraint(SubSub, T, Super))
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(negated_range_constraint(Sub, T, Base) | range_constraint(Sub, T, Base))
+```
+
+If the negative range is disjoint from the positive range, the positive range doesn't add anything;
+the union is the negative range.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Base)]
+    reveal_type(negated_range_constraint(Sub, T, Base) | range_constraint(Never, T, Unrelated))
+    # revealed: ty_extensions.ConstraintSet[¬(SubSub ≤ T@_ ≤ Sub)]
+    reveal_type(negated_range_constraint(SubSub, T, Sub) | range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[¬(Base ≤ T@_ ≤ Super)]
+    reveal_type(negated_range_constraint(Base, T, Super) | range_constraint(SubSub, T, Sub))
+```
+
+Otherwise we clip the positive constraint to the mininum range that overlaps with the negative
+range.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Base) ∨ ¬(SubSub ≤ T@_ ≤ Base)]
+    reveal_type(negated_range_constraint(SubSub, T, Base) | range_constraint(Sub, T, Super))
+    # revealed: ty_extensions.ConstraintSet[(Sub ≤ T@_ ≤ Base) ∨ ¬(SubSub ≤ T@_ ≤ Super)]
+    reveal_type(negated_range_constraint(SubSub, T, Super) | range_constraint(Sub, T, Base))
+```
+
+### Union of two negated ranges
+
+The union of two negated ranges has a hole where the ranges "overlap".
+
+```py
+from typing import final
+from ty_extensions import negated_range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+class SubSub(Sub): ...
+
+@final
+class Unrelated: ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Base)]
+    reveal_type(negated_range_constraint(SubSub, T, Base) | negated_range_constraint(Sub, T, Super))
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Base)]
+    reveal_type(negated_range_constraint(SubSub, T, Super) | negated_range_constraint(Sub, T, Base))
+    # revealed: ty_extensions.ConstraintSet[(T@_ ≠ Base)]
+    reveal_type(negated_range_constraint(Sub, T, Base) | negated_range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Super)]
+    reveal_type(negated_range_constraint(Sub, T, Super) | negated_range_constraint(Sub, T, Super))
+```
+
+If the holes don't overlap, the union is always satisfied.
+
+```py
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(negated_range_constraint(SubSub, T, Sub) | negated_range_constraint(Base, T, Super))
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(negated_range_constraint(SubSub, T, Sub) | negated_range_constraint(Unrelated, T, object))
+```
+
+## Negation
+
+### Negation of a range constraint
+
+```py
+from typing import Never
+from ty_extensions import range_constraint
+
+class Super: ...
+class Base(Super): ...
+class Sub(Base): ...
+
+def _[T]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_ ≤ Base)]
+    reveal_type(~range_constraint(Sub, T, Base))
+    # revealed: ty_extensions.ConstraintSet[¬(T@_ ≤ Base)]
+    reveal_type(~range_constraint(Never, T, Base))
+    # revealed: ty_extensions.ConstraintSet[¬(Sub ≤ T@_)]
+    reveal_type(~range_constraint(Sub, T, object))
+    # revealed: ty_extensions.ConstraintSet[never]
+    reveal_type(~range_constraint(Never, T, object))
+```
+
+The union of a range constraint and its negation should always be satisfiable.
+
+```py
+def _[T]() -> None:
+    constraint = range_constraint(Sub, T, Base)
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(constraint | ~constraint)
+```
+
+### Negation of constraints involving two variables
+
+```py
+from typing import final, Never
+from ty_extensions import range_constraint
+
+class Base: ...
+
+@final
+class Unrelated: ...
+
+def _[T, U]() -> None:
+    # revealed: ty_extensions.ConstraintSet[¬(T@_ ≤ Base) ∨ ¬(U@_ ≤ Base)]
+    reveal_type(~(range_constraint(Never, T, Base) & range_constraint(Never, U, Base)))
+```
+
+The union of a constraint and its negation should always be satisfiable.
+
+```py
+def _[T, U]() -> None:
+    c1 = range_constraint(Never, T, Base) & range_constraint(Never, U, Base)
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(c1 | ~c1)
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(~c1 | c1)
+
+    c2 = range_constraint(Unrelated, T, object) & range_constraint(Unrelated, U, object)
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(c2 | ~c2)
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(~c2 | c2)
+
+    union = c1 | c2
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(union | ~union)
+    # revealed: ty_extensions.ConstraintSet[always]
+    reveal_type(~union | union)
+```
+
+## Other simplifications
+
+When displaying a constraint set, we transform the internal BDD representation into a DNF formula
+(i.e., the logical OR of several clauses, each of which is the logical AND of several constraints).
+This section contains several examples that show that we simplify the DNF formula as much as we can
+before displaying it.
+
+```py
+from ty_extensions import range_constraint
+
+def f[T, U]():
+    t1 = range_constraint(str, T, str)
+    t2 = range_constraint(bool, T, bool)
+    u1 = range_constraint(str, U, str)
+    u2 = range_constraint(bool, U, bool)
+
+    # revealed: ty_extensions.ConstraintSet[(T@f = bool) ∨ (T@f = str)]
+    reveal_type(t1 | t2)
+    # revealed: ty_extensions.ConstraintSet[(U@f = bool) ∨ (U@f = str)]
+    reveal_type(u1 | u2)
+    # revealed: ty_extensions.ConstraintSet[((T@f = bool) ∧ (U@f = bool)) ∨ ((T@f = bool) ∧ (U@f = str)) ∨ ((T@f = str) ∧ (U@f = bool)) ∨ ((T@f = str) ∧ (U@f = str))]
+    reveal_type((t1 | t2) & (u1 | u2))
+```
+
+The lower and upper bounds of a constraint are normalized, so that we equate unions and
+intersections whose elements appear in different orders.
+
+```py
+from typing import Never
+
+def f[T]():
+    # revealed: ty_extensions.ConstraintSet[(T@f ≤ int | str)]
+    reveal_type(range_constraint(Never, T, str | int))
+    # revealed: ty_extensions.ConstraintSet[(T@f ≤ int | str)]
+    reveal_type(range_constraint(Never, T, int | str))
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/type_properties/is_assignable_to.md b/crates/ty_python_semantic/resources/mdtest/type_properties/is_assignable_to.md
index 5338b25ce8..a39b6a6f16 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_properties/is_assignable_to.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_properties/is_assignable_to.md
@@ -221,11 +221,11 @@ static_assert(is_assignable_to(type[Unknown], Meta))
 static_assert(is_assignable_to(Meta, type[Any]))
 static_assert(is_assignable_to(Meta, type[Unknown]))
 
-class AnyMeta(metaclass=Any): ...
-
-static_assert(is_assignable_to(type[AnyMeta], type))
-static_assert(is_assignable_to(type[AnyMeta], type[object]))
-static_assert(is_assignable_to(type[AnyMeta], type[Any]))
+def _(x: Any):
+    class AnyMeta(metaclass=x): ...
+    static_assert(is_assignable_to(type[AnyMeta], type))
+    static_assert(is_assignable_to(type[AnyMeta], type[object]))
+    static_assert(is_assignable_to(type[AnyMeta], type[Any]))
 
 from typing import TypeVar, Generic, Any
 
@@ -721,6 +721,75 @@ static_assert(is_assignable_to(Intersection[LiteralString, Not[Literal[""]]], No
 static_assert(is_assignable_to(Intersection[LiteralString, Not[Literal["", "a"]]], Not[AlwaysFalsy]))
 ```
 
+## Intersections with non-fully-static negated elements
+
+A type can be _assignable_ to an intersection containing negated elements only if the _bottom_
+materialization of that type is disjoint from the _bottom_ materialization of all negated elements
+in the intersection. This differs from subtyping, which should do the disjointness check against the
+_top_ materialization of the negated elements.
+
+```py
+from typing_extensions import Any, Never, Sequence
+from ty_extensions import Not, is_assignable_to, static_assert
+
+# The bottom materialization of `tuple[Any]` is `tuple[Never]`,
+# which simplifies to `Never`, so `tuple[int]` and `tuple[()]` are
+# both assignable to `~tuple[Any]`
+static_assert(is_assignable_to(tuple[int], Not[tuple[Any]]))
+static_assert(is_assignable_to(tuple[()], Not[tuple[Any]]))
+
+# But the bottom materialization of `tuple[Any, ...]` is `tuple[Never, ...]`,
+# which simplifies to `tuple[()]`, so `tuple[int]` is still assignable to
+# `~tuple[Any, ...]`, but `tuple[()]` is not
+static_assert(is_assignable_to(tuple[int], Not[tuple[Any, ...]]))
+static_assert(not is_assignable_to(tuple[()], Not[tuple[Any, ...]]))
+
+# Similarly, the bottom materialization of `Sequence[Any]` is `Sequence[Never]`,
+# so `tuple[()]` is not assignable to `~Sequence[Any]`, and nor is `list[Never]`,
+# since both `tuple[()]` and `list[Never]` are subtypes of `Sequence[Never]`.
+# `tuple[int, ...]` is also not assignable to `~Sequence[Any]`, as although it is
+# not a subtype of `Sequence[Never]` it is also not disjoint from `Sequence[Never]`:
+# `tuple[()]` is a subtype of both `Sequence[Never]` and `tuple[int, ...]`, so
+# `tuple[int, ...]` and `Sequence[Never]` cannot be considered disjoint.
+#
+# Other `list` and `tuple` specializations *are* assignable to `~Sequence[Any]`,
+# however, since there are many fully static materializations of `Sequence[Any]`
+# that would be disjoint from a given `list` or `tuple` specialization.
+static_assert(not is_assignable_to(tuple[()], Not[Sequence[Any]]))
+static_assert(not is_assignable_to(list[Never], Not[Sequence[Any]]))
+static_assert(not is_assignable_to(tuple[int, ...], Not[Sequence[Any]]))
+
+# TODO: should pass (`tuple[int]` should be considered disjoint from `Sequence[Never]`)
+static_assert(is_assignable_to(tuple[int], Not[Sequence[Any]]))  # error: [static-assert-error]
+
+# TODO: should pass (`list[int]` should be considered disjoint from `Sequence[Never]`)
+static_assert(is_assignable_to(list[int], Not[Sequence[Any]]))  # error: [static-assert-error]
+
+# If the left-hand side is also not fully static,
+# the left-hand side will be assignable to the right if the bottom materialization
+# of the left-hand side is disjoint from the bottom materialization of all negated
+# elements on the right-hand side
+
+# `tuple[Any, ...]` cannot be assignable to `~tuple[Any, ...]`,
+# because the bottom materialization of `tuple[Any, ...]` is
+# `tuple[()]`, and `tuple[()]` is not disjoint from itself
+static_assert(not is_assignable_to(tuple[Any, ...], Not[tuple[Any, ...]]))
+
+# but `tuple[Any]` is assignable to `~tuple[Any]`,
+# as the bottom materialization of `tuple[Any]` is `Never`,
+# and `Never` *is* disjoint from itself
+static_assert(is_assignable_to(tuple[Any], Not[tuple[Any]]))
+
+# The same principle applies for non-fully-static `list` specializations.
+# TODO: this should pass (`Bottom[list[Any]]` should simplify to `Never`)
+static_assert(is_assignable_to(list[Any], Not[list[Any]]))  # error: [static-assert-error]
+
+# `Bottom[list[Any]]` is `Never`, which is disjoint from `Bottom[Sequence[Any]]`
+# (which is `Sequence[Never]`).
+# TODO: this should pass (`Bottom[list[Any]]` should simplify to `Never`)
+static_assert(is_assignable_to(list[Any], Not[Sequence[Any]]))  # error: [static-assert-error]
+```
+
 ## General properties
 
 See also: our property tests in `property_tests.rs`.
@@ -894,6 +963,40 @@ c: Callable[[Any], str] = f
 c: Callable[[Any], str] = g
 ```
 
+A function with no explicit return type should be assignable to a callable with a return type of
+`Any`.
+
+```py
+def h():
+    return
+
+c: Callable[[], Any] = h
+```
+
+And, similarly for parameters with no annotations:
+
+```py
+def i(a, b, /) -> None:
+    return
+
+c: Callable[[Any, Any], None] = i
+```
+
+Additionally, a function definition that includes both `*args` and `**kwargs` parameters that are
+annotated as `Any` or kept unannotated should be assignable to a callable with `...` as the
+parameter type.
+
+```py
+def variadic_without_annotation(*args, **kwargs):
+    return
+
+def variadic_with_annotation(*args: Any, **kwargs: Any) -> Any:
+    return
+
+c: Callable[..., Any] = variadic_without_annotation
+c: Callable[..., Any] = variadic_with_annotation
+```
+
 ### Method types
 
 ```py
@@ -1078,18 +1181,17 @@ static_assert(not is_assignable_to(EggsLegacy, Callable[..., Any]))  # error: [s
 An instance type is assignable to a compatible callable type if the instance type's class has a
 callable `__call__` attribute.
 
-TODO: for the moment, we don't consider the callable type as a bound-method descriptor, but this may
-change for better compatibility with mypy/pyright.
-
 ```py
+from __future__ import annotations
+
 from typing import Callable
 from ty_extensions import static_assert, is_assignable_to
 
-def call_impl(a: int) -> str:
+def call_impl(a: A, x: int) -> str:
     return ""
 
 class A:
-    __call__: Callable[[int], str] = call_impl
+    __call__: Callable[[A, int], str] = call_impl
 
 static_assert(is_assignable_to(A, Callable[[int], str]))
 static_assert(not is_assignable_to(A, Callable[[int], int]))
diff --git a/crates/ty_python_semantic/resources/mdtest/type_properties/is_disjoint_from.md b/crates/ty_python_semantic/resources/mdtest/type_properties/is_disjoint_from.md
index 6ec192fb8c..d80a2b5b82 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_properties/is_disjoint_from.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_properties/is_disjoint_from.md
@@ -87,7 +87,7 @@ static_assert(is_disjoint_from(memoryview, Foo))
 static_assert(is_disjoint_from(type[memoryview], type[Foo]))
 ```
 
-## "Solid base" builtin types
+## "Disjoint base" builtin types
 
 Most other builtins can be subclassed and can even be used in multiple inheritance. However, builtin
 classes *cannot* generally be used in multiple inheritance with other builtin types. This is because
@@ -95,11 +95,14 @@ the CPython interpreter considers these classes "solid bases": due to the way th
 in C, they have atypical instance memory layouts. No class can ever have more than one "solid base"
 in its MRO.
 
-It's not currently possible for ty to detect in a generalized way whether a class is a "solid base"
-or not, but we special-case some commonly used builtin types:
+[PEP 800](https://peps.python.org/pep-0800/) provides a generalised way for type checkers to know
+whether a class has an atypical instance memory layout via the `@disjoint_base` decorator; we
+generally use the term "disjoint base" for these classes.
 
 ```py
+import asyncio
 from typing import Any
+from typing_extensions import disjoint_base
 from ty_extensions import static_assert, is_disjoint_from
 
 class Foo: ...
@@ -114,12 +117,23 @@ static_assert(is_disjoint_from(list, dict[Any, Any]))
 static_assert(is_disjoint_from(list[Foo], dict[Any, Any]))
 static_assert(is_disjoint_from(list[Any], dict[Any, Any]))
 static_assert(is_disjoint_from(type[list], type[dict]))
+
+static_assert(is_disjoint_from(asyncio.Task, dict))
+
+@disjoint_base
+class A: ...
+
+@disjoint_base
+class B: ...
+
+static_assert(is_disjoint_from(A, B))
 ```
 
-## Other solid bases
+## Other disjoint bases
 
 As well as certain classes that are implemented in C extensions, any class that declares non-empty
-`__slots__` is also considered a "solid base"; these types are also considered to be disjoint by ty:
+`__slots__` is also considered a "disjoint base"; these types are also considered to be disjoint by
+ty:
 
 ```py
 from ty_extensions import static_assert, is_disjoint_from
@@ -141,7 +155,7 @@ static_assert(not is_disjoint_from(B, C))
 static_assert(not is_disjoint_from(type[B], type[C]))
 ```
 
-Two solid bases are not disjoint if one inherits from the other, however:
+Two disjoint bases are not disjoint if one inherits from the other, however:
 
 ```py
 class D(A):
@@ -151,6 +165,37 @@ static_assert(is_disjoint_from(D, B))
 static_assert(not is_disjoint_from(D, A))
 ```
 
+## Dataclasses
+
+```py
+from dataclasses import dataclass
+from ty_extensions import is_disjoint_from, static_assert
+
+@dataclass(slots=True)
+class F: ...
+
+@dataclass(slots=True)
+class G: ...
+
+@dataclass(slots=True)
+class I:
+    x: int
+
+@dataclass(slots=True)
+class J:
+    y: int
+
+# A dataclass with empty `__slots__` is not disjoint from another dataclass with `__slots__`
+static_assert(not is_disjoint_from(F, G))
+static_assert(not is_disjoint_from(F, I))
+static_assert(not is_disjoint_from(G, I))
+static_assert(not is_disjoint_from(F, J))
+static_assert(not is_disjoint_from(G, J))
+
+# But two dataclasses with non-empty `__slots__` are disjoint
+static_assert(is_disjoint_from(I, J))
+```
+
 ## Tuple types
 
 ```py
@@ -571,6 +616,31 @@ class BarNone(Protocol):
 static_assert(is_disjoint_from(type[Foo], BarNone))
 ```
 
+### `NamedTuple`
+
+```py
+from __future__ import annotations
+
+from typing import NamedTuple, final
+from ty_extensions import is_disjoint_from, static_assert
+
+@final
+class Path(NamedTuple):
+    prev: Path | None
+    key: str
+
+@final
+class Path2(NamedTuple):
+    prev: Path2 | None
+    key: str
+
+static_assert(not is_disjoint_from(Path, Path))
+static_assert(not is_disjoint_from(Path, tuple[Path | None, str]))
+static_assert(is_disjoint_from(Path, tuple[Path | None]))
+static_assert(is_disjoint_from(Path, tuple[Path | None, str, int]))
+static_assert(is_disjoint_from(Path, Path2))
+```
+
 ## Callables
 
 No two callable types are disjoint because there exists a non-empty callable type
diff --git a/crates/ty_python_semantic/resources/mdtest/type_properties/is_equivalent_to.md b/crates/ty_python_semantic/resources/mdtest/type_properties/is_equivalent_to.md
index 83579a0e06..41c7f562bb 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_properties/is_equivalent_to.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_properties/is_equivalent_to.md
@@ -133,6 +133,16 @@ class Single(Enum):
     VALUE = 1
 
 static_assert(is_equivalent_to(P | Q | Single, Literal[Single.VALUE] | Q | P))
+
+static_assert(is_equivalent_to(Any, Any | Intersection[Any, str]))
+static_assert(is_equivalent_to(Any, Intersection[str, Any] | Any))
+static_assert(is_equivalent_to(Any, Any | Intersection[Any, Not[None]]))
+static_assert(is_equivalent_to(Any, Intersection[Not[None], Any] | Any))
+
+static_assert(is_equivalent_to(Any, Unknown | Intersection[Unknown, str]))
+static_assert(is_equivalent_to(Any, Intersection[str, Unknown] | Unknown))
+static_assert(is_equivalent_to(Any, Unknown | Intersection[Unknown, Not[None]]))
+static_assert(is_equivalent_to(Any, Intersection[Not[None], Unknown] | Unknown))
 ```
 
 ## Tuples
@@ -454,7 +464,7 @@ gradual types. The cases with fully static types and using different combination
 are covered above.
 
 ```py
-from ty_extensions import Unknown, CallableTypeOf, is_equivalent_to, static_assert
+from ty_extensions import Unknown, CallableTypeOf, TypeOf, is_equivalent_to, static_assert
 from typing import Any, Callable
 
 static_assert(is_equivalent_to(Callable[..., int], Callable[..., int]))
@@ -466,14 +476,17 @@ static_assert(not is_equivalent_to(Callable[[int, str], None], Callable[[int, st
 static_assert(not is_equivalent_to(Callable[..., None], Callable[[], None]))
 ```
 
-A function with no explicit return type should be gradual equivalent to a callable with a return
-type of `Any`.
+A function with no explicit return type should be gradually equivalent to a function-like callable
+with a return type of `Any`.
 
 ```py
 def f1():
     return
 
-static_assert(is_equivalent_to(CallableTypeOf[f1], Callable[[], Any]))
+def f1_equivalent() -> Any:
+    return
+
+static_assert(is_equivalent_to(CallableTypeOf[f1], CallableTypeOf[f1_equivalent]))
 ```
 
 And, similarly for parameters with no annotations.
@@ -482,12 +495,15 @@ And, similarly for parameters with no annotations.
 def f2(a, b, /) -> None:
     return
 
-static_assert(is_equivalent_to(CallableTypeOf[f2], Callable[[Any, Any], None]))
+def f2_equivalent(a: Any, b: Any, /) -> None:
+    return
+
+static_assert(is_equivalent_to(CallableTypeOf[f2], CallableTypeOf[f2_equivalent]))
 ```
 
-Additionally, as per the spec, a function definition that includes both `*args` and `**kwargs`
-parameter that are annotated as `Any` or kept unannotated should be gradual equivalent to a callable
-with `...` as the parameter type.
+A function definition that includes both `*args` and `**kwargs` parameter that are annotated as
+`Any` or kept unannotated should be gradual equivalent to a callable with `...` as the parameter
+type.
 
 ```py
 def variadic_without_annotation(*args, **kwargs):
@@ -496,12 +512,27 @@ def variadic_without_annotation(*args, **kwargs):
 def variadic_with_annotation(*args: Any, **kwargs: Any) -> Any:
     return
 
-static_assert(is_equivalent_to(CallableTypeOf[variadic_without_annotation], Callable[..., Any]))
-static_assert(is_equivalent_to(CallableTypeOf[variadic_with_annotation], Callable[..., Any]))
+def _(
+    signature_variadic_without_annotation: CallableTypeOf[variadic_without_annotation],
+    signature_variadic_with_annotation: CallableTypeOf[variadic_with_annotation],
+) -> None:
+    # revealed: (...) -> Unknown
+    reveal_type(signature_variadic_without_annotation)
+    # revealed: (...) -> Any
+    reveal_type(signature_variadic_with_annotation)
 ```
 
-But, a function with either `*args` or `**kwargs` (and not both) is not gradual equivalent to a
-callable with `...` as the parameter type.
+Note that `variadic_without_annotation` and `variadic_with_annotation` are *not* considered
+gradually equivalent to `Callable[..., Any]`, because the latter is not a function-like callable
+type:
+
+```py
+static_assert(not is_equivalent_to(CallableTypeOf[variadic_without_annotation], Callable[..., Any]))
+static_assert(not is_equivalent_to(CallableTypeOf[variadic_with_annotation], Callable[..., Any]))
+```
+
+A function with either `*args` or `**kwargs` (and not both) is is not equivalent to a callable with
+`...` as the parameter type.
 
 ```py
 def variadic_args(*args):
@@ -510,6 +541,15 @@ def variadic_args(*args):
 def variadic_kwargs(**kwargs):
     return
 
+def _(
+    signature_variadic_args: CallableTypeOf[variadic_args],
+    signature_variadic_kwargs: CallableTypeOf[variadic_kwargs],
+) -> None:
+    # revealed: (*args) -> Unknown
+    reveal_type(signature_variadic_args)
+    # revealed: (**kwargs) -> Unknown
+    reveal_type(signature_variadic_kwargs)
+
 static_assert(not is_equivalent_to(CallableTypeOf[variadic_args], Callable[..., Any]))
 static_assert(not is_equivalent_to(CallableTypeOf[variadic_kwargs], Callable[..., Any]))
 ```
@@ -578,7 +618,7 @@ import importlib
 from module2 import importlib as other_importlib
 from ty_extensions import TypeOf, static_assert, is_equivalent_to
 
-# error: [unresolved-attribute] "Type `<module 'importlib'>` has no attribute `abc`"
+# error: [unresolved-attribute] "Module `importlib` has no member `abc`"
 reveal_type(importlib.abc)  # revealed: Unknown
 
 reveal_type(other_importlib.abc)  # revealed: <module 'importlib.abc'>
diff --git a/crates/ty_python_semantic/resources/mdtest/type_properties/is_subtype_of.md b/crates/ty_python_semantic/resources/mdtest/type_properties/is_subtype_of.md
index b3201da5e2..6034a52529 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_properties/is_subtype_of.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_properties/is_subtype_of.md
@@ -533,6 +533,45 @@ static_assert(not is_subtype_of(int, Not[Literal[3]]))
 static_assert(not is_subtype_of(Literal[1], Intersection[int, Not[Literal[1]]]))
 ```
 
+## Intersections with non-fully-static negated elements
+
+A type can be a _subtype_ of an intersection containing negated elements only if the _top_
+materialization of that type is disjoint from the _top_ materialization of all negated elements in
+the intersection. This differs from assignability, which should do the disjointness check against
+the _bottom_ materialization of the negated elements.
+
+```py
+from typing_extensions import Any, Never, Sequence
+from ty_extensions import Not, is_subtype_of, static_assert
+
+# The top materialization of `tuple[Any]` is `tuple[object]`,
+# which is disjoint from `tuple[()]` but not `tuple[int]`,
+# so `tuple[()]` is a subtype of `~tuple[Any]` but `tuple[int]`
+# is not.
+static_assert(is_subtype_of(tuple[()], Not[tuple[Any]]))
+static_assert(not is_subtype_of(tuple[int], Not[tuple[Any]]))
+static_assert(not is_subtype_of(tuple[Any], Not[tuple[Any]]))
+
+# The top materialization of `tuple[Any, ...]` is `tuple[object, ...]`,
+# so no tuple type can be considered a subtype of `~tuple[Any, ...]`
+static_assert(not is_subtype_of(tuple[()], Not[tuple[Any, ...]]))
+static_assert(not is_subtype_of(tuple[int], Not[tuple[Any, ...]]))
+static_assert(not is_subtype_of(tuple[int, ...], Not[tuple[Any, ...]]))
+static_assert(not is_subtype_of(tuple[object, ...], Not[tuple[Any, ...]]))
+static_assert(not is_subtype_of(tuple[Any, ...], Not[tuple[Any, ...]]))
+
+# Similarly, the top materialization of `Sequence[Any]` is `Sequence[object]`,
+# so no sequence type can be considered a subtype of `~Sequence[Any]`.
+static_assert(not is_subtype_of(tuple[()], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(tuple[int], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(tuple[int, ...], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(tuple[object, ...], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(tuple[Any, ...], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(list[Never], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(list[Any], Not[Sequence[Any]]))
+static_assert(not is_subtype_of(list[int], Not[Sequence[Any]]))
+```
+
 ## Special types
 
 ### `Never`
@@ -830,6 +869,42 @@ static_assert(not is_subtype_of(object, Any))
 static_assert(is_subtype_of(int, Any | int))
 static_assert(is_subtype_of(Intersection[Any, int], int))
 static_assert(not is_subtype_of(tuple[int, int], tuple[int, Any]))
+
+class Covariant[T]:
+    def get(self) -> T:
+        raise NotImplementedError
+
+static_assert(not is_subtype_of(Covariant[Any], Covariant[Any]))
+static_assert(not is_subtype_of(Covariant[Any], Covariant[int]))
+static_assert(not is_subtype_of(Covariant[int], Covariant[Any]))
+static_assert(is_subtype_of(Covariant[Any], Covariant[object]))
+static_assert(not is_subtype_of(Covariant[object], Covariant[Any]))
+
+class Contravariant[T]:
+    def receive(self, input: T): ...
+
+static_assert(not is_subtype_of(Contravariant[Any], Contravariant[Any]))
+static_assert(not is_subtype_of(Contravariant[Any], Contravariant[int]))
+static_assert(not is_subtype_of(Contravariant[int], Contravariant[Any]))
+static_assert(not is_subtype_of(Contravariant[Any], Contravariant[object]))
+static_assert(is_subtype_of(Contravariant[object], Contravariant[Any]))
+
+class Invariant[T]:
+    mutable_attribute: T
+
+static_assert(not is_subtype_of(Invariant[Any], Invariant[Any]))
+static_assert(not is_subtype_of(Invariant[Any], Invariant[int]))
+static_assert(not is_subtype_of(Invariant[int], Invariant[Any]))
+static_assert(not is_subtype_of(Invariant[Any], Invariant[object]))
+static_assert(not is_subtype_of(Invariant[object], Invariant[Any]))
+
+class Bivariant[T]: ...
+
+static_assert(is_subtype_of(Bivariant[Any], Bivariant[Any]))
+static_assert(is_subtype_of(Bivariant[Any], Bivariant[int]))
+static_assert(is_subtype_of(Bivariant[int], Bivariant[Any]))
+static_assert(is_subtype_of(Bivariant[Any], Bivariant[object]))
+static_assert(is_subtype_of(Bivariant[object], Bivariant[Any]))
 ```
 
 The same for `Unknown`:
@@ -1560,18 +1635,17 @@ f(a)
 An instance type can be a subtype of a compatible callable type if the instance type's class has a
 callable `__call__` attribute.
 
-TODO: for the moment, we don't consider the callable type as a bound-method descriptor, but this may
-change for better compatibility with mypy/pyright.
-
 ```py
+from __future__ import annotations
+
 from typing import Callable
 from ty_extensions import static_assert, is_subtype_of
 
-def call_impl(a: int) -> str:
+def call_impl(a: A, x: int) -> str:
     return ""
 
 class A:
-    __call__: Callable[[int], str] = call_impl
+    __call__: Callable[[A, int], str] = call_impl
 
 static_assert(is_subtype_of(A, Callable[[int], str]))
 static_assert(not is_subtype_of(A, Callable[[int], int]))
@@ -1580,10 +1654,19 @@ reveal_type(A()(1))  # revealed: str
 
 ### Class literals
 
+This section also tests assignability of class-literals to callback protocols, since the rules for
+assignability of class-literals to callback protocols are the same as the rules for assignability of
+class-literals to `Callable` types.
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
 #### Classes with metaclasses
 
 ```py
-from typing import Callable, overload
+from typing import Callable, Protocol, overload
 from typing_extensions import Self
 from ty_extensions import TypeOf, static_assert, is_subtype_of
 
@@ -1593,8 +1676,16 @@ class MetaWithReturn(type):
 
 class A(metaclass=MetaWithReturn): ...
 
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
+class ReturnsWithArgument[T1, T2](Protocol):
+    def __call__(self, arg: T1, /) -> T2: ...
+
 static_assert(is_subtype_of(TypeOf[A], Callable[[], A]))
+static_assert(is_subtype_of(TypeOf[A], Returns[A]))
 static_assert(not is_subtype_of(TypeOf[A], Callable[[object], A]))
+static_assert(not is_subtype_of(TypeOf[A], ReturnsWithArgument[object, A]))
 
 class MetaWithDifferentReturn(type):
     def __call__(cls) -> int:
@@ -1603,7 +1694,9 @@ class MetaWithDifferentReturn(type):
 class B(metaclass=MetaWithDifferentReturn): ...
 
 static_assert(is_subtype_of(TypeOf[B], Callable[[], int]))
+static_assert(is_subtype_of(TypeOf[B], Returns[int]))
 static_assert(not is_subtype_of(TypeOf[B], Callable[[], B]))
+static_assert(not is_subtype_of(TypeOf[B], Returns[B]))
 
 class MetaWithOverloadReturn(type):
     @overload
@@ -1617,20 +1710,30 @@ class C(metaclass=MetaWithOverloadReturn): ...
 
 static_assert(is_subtype_of(TypeOf[C], Callable[[int], int]))
 static_assert(is_subtype_of(TypeOf[C], Callable[[], str]))
+static_assert(is_subtype_of(TypeOf[C], ReturnsWithArgument[int, int]))
+static_assert(is_subtype_of(TypeOf[C], Returns[str]))
 ```
 
 #### Classes with `__new__`
 
 ```py
-from typing import Callable, overload
+from typing import Callable, overload, Protocol
 from ty_extensions import TypeOf, static_assert, is_subtype_of
 
 class A:
     def __new__(cls, a: int) -> int:
         return a
 
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
+class ReturnsWithArgument[T1, T2](Protocol):
+    def __call__(self, arg: T1, /) -> T2: ...
+
 static_assert(is_subtype_of(TypeOf[A], Callable[[int], int]))
+static_assert(is_subtype_of(TypeOf[A], ReturnsWithArgument[int, int]))
 static_assert(not is_subtype_of(TypeOf[A], Callable[[], int]))
+static_assert(not is_subtype_of(TypeOf[A], Returns[int]))
 
 class B: ...
 class C(B): ...
@@ -1644,9 +1747,13 @@ class E(D):
         return C()
 
 static_assert(is_subtype_of(TypeOf[E], Callable[[], C]))
+static_assert(is_subtype_of(TypeOf[E], Returns[C]))
 static_assert(is_subtype_of(TypeOf[E], Callable[[], B]))
+static_assert(is_subtype_of(TypeOf[E], Returns[B]))
 static_assert(not is_subtype_of(TypeOf[D], Callable[[], C]))
+static_assert(not is_subtype_of(TypeOf[D], Returns[C]))
 static_assert(is_subtype_of(TypeOf[D], Callable[[], B]))
+static_assert(is_subtype_of(TypeOf[D], Returns[B]))
 
 class F:
     @overload
@@ -1668,7 +1775,7 @@ static_assert(not is_subtype_of(TypeOf[F], Callable[[str], F]))
 If `__call__` and `__new__` are both present, `__call__` takes precedence.
 
 ```py
-from typing import Callable
+from typing import Callable, Protocol
 from ty_extensions import TypeOf, static_assert, is_subtype_of
 
 class MetaWithIntReturn(type):
@@ -1679,21 +1786,34 @@ class F(metaclass=MetaWithIntReturn):
     def __new__(cls) -> str:
         return super().__new__(cls)
 
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
 static_assert(is_subtype_of(TypeOf[F], Callable[[], int]))
+static_assert(is_subtype_of(TypeOf[F], Returns[int]))
 static_assert(not is_subtype_of(TypeOf[F], Callable[[], str]))
+static_assert(not is_subtype_of(TypeOf[F], Returns[str]))
 ```
 
 #### Classes with `__init__`
 
 ```py
-from typing import Callable, overload
+from typing import Callable, overload, Protocol
 from ty_extensions import TypeOf, static_assert, is_subtype_of
 
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
+class ReturnsWithArgument[T1, T2](Protocol):
+    def __call__(self, arg: T1, /) -> T2: ...
+
 class A:
     def __init__(self, a: int) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[A], Callable[[int], A]))
+static_assert(is_subtype_of(TypeOf[A], ReturnsWithArgument[int, A]))
 static_assert(not is_subtype_of(TypeOf[A], Callable[[], A]))
+static_assert(not is_subtype_of(TypeOf[A], Returns[A]))
 
 class B:
     @overload
@@ -1703,27 +1823,31 @@ class B:
     def __init__(self, a: int | None = None) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[B], Callable[[int], B]))
+static_assert(is_subtype_of(TypeOf[B], ReturnsWithArgument[int, B]))
 static_assert(is_subtype_of(TypeOf[B], Callable[[], B]))
-
-class C: ...
-
-# TODO: This assertion should be true once we understand `Self`
-# error: [static-assert-error] "Static assertion error: argument evaluates to `False`"
-static_assert(is_subtype_of(TypeOf[C], Callable[[], C]))
+static_assert(is_subtype_of(TypeOf[B], Returns[B]))
 
 class D[T]:
     def __init__(self, x: T) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[D[int]], Callable[[int], D[int]]))
+static_assert(is_subtype_of(TypeOf[D[int]], ReturnsWithArgument[int, D[int]]))
 static_assert(not is_subtype_of(TypeOf[D[int]], Callable[[str], D[int]]))
+static_assert(not is_subtype_of(TypeOf[D[int]], ReturnsWithArgument[str, D[int]]))
 ```
 
 #### Classes with `__init__` and `__new__`
 
 ```py
-from typing import Callable, overload, Self
+from typing import Callable, overload, Self, Protocol
 from ty_extensions import TypeOf, static_assert, is_subtype_of
 
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
+class ReturnsWithArgument[T1, T2](Protocol):
+    def __call__(self, arg: T1, /) -> T2: ...
+
 class A:
     def __new__(cls, a: int) -> Self:
         return super().__new__(cls)
@@ -1731,7 +1855,9 @@ class A:
     def __init__(self, a: int) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[A], Callable[[int], A]))
+static_assert(is_subtype_of(TypeOf[A], ReturnsWithArgument[int, A]))
 static_assert(not is_subtype_of(TypeOf[A], Callable[[], A]))
+static_assert(not is_subtype_of(TypeOf[A], Returns[A]))
 
 class B:
     def __new__(cls, a: int) -> int:
@@ -1740,7 +1866,9 @@ class B:
     def __init__(self, a: str) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[B], Callable[[int], int]))
+static_assert(is_subtype_of(TypeOf[B], ReturnsWithArgument[int, int]))
 static_assert(not is_subtype_of(TypeOf[B], Callable[[str], B]))
+static_assert(not is_subtype_of(TypeOf[B], ReturnsWithArgument[str, B]))
 
 class C:
     def __new__(cls, *args, **kwargs) -> "C":
@@ -1750,7 +1878,9 @@ class C:
 
 # Not subtype because __new__ signature is not fully static
 static_assert(not is_subtype_of(TypeOf[C], Callable[[int], C]))
+static_assert(not is_subtype_of(TypeOf[C], ReturnsWithArgument[int, C]))
 static_assert(not is_subtype_of(TypeOf[C], Callable[[], C]))
+static_assert(not is_subtype_of(TypeOf[C], Returns[C]))
 
 class D: ...
 
@@ -1765,7 +1895,9 @@ class E:
     def __init__(self, y: str) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[E], Callable[[int], D]))
+static_assert(is_subtype_of(TypeOf[E], ReturnsWithArgument[int, D]))
 static_assert(is_subtype_of(TypeOf[E], Callable[[], int]))
+static_assert(is_subtype_of(TypeOf[E], Returns[int]))
 
 class F[T]:
     def __new__(cls, x: T) -> "F[T]":
@@ -1774,7 +1906,9 @@ class F[T]:
     def __init__(self, x: T) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[F[int]], Callable[[int], F[int]]))
+static_assert(is_subtype_of(TypeOf[F[int]], ReturnsWithArgument[int, F[int]]))
 static_assert(not is_subtype_of(TypeOf[F[int]], Callable[[str], F[int]]))
+static_assert(not is_subtype_of(TypeOf[F[int]], ReturnsWithArgument[str, F[int]]))
 ```
 
 #### Classes with `__call__`, `__new__` and `__init__`
@@ -1782,9 +1916,15 @@ static_assert(not is_subtype_of(TypeOf[F[int]], Callable[[str], F[int]]))
 If `__call__`, `__new__` and `__init__` are all present, `__call__` takes precedence.
 
 ```py
-from typing import Callable
+from typing import Callable, Protocol
 from ty_extensions import TypeOf, static_assert, is_subtype_of
 
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
+class ReturnsWithArgument[T1, T2](Protocol):
+    def __call__(self, arg: T1, /) -> T2: ...
+
 class MetaWithIntReturn(type):
     def __call__(cls) -> int:
         return super().__call__()
@@ -1796,8 +1936,26 @@ class F(metaclass=MetaWithIntReturn):
     def __init__(self, x: int) -> None: ...
 
 static_assert(is_subtype_of(TypeOf[F], Callable[[], int]))
+static_assert(is_subtype_of(TypeOf[F], Returns[int]))
 static_assert(not is_subtype_of(TypeOf[F], Callable[[], str]))
+static_assert(not is_subtype_of(TypeOf[F], Returns[str]))
 static_assert(not is_subtype_of(TypeOf[F], Callable[[int], F]))
+static_assert(not is_subtype_of(TypeOf[F], ReturnsWithArgument[int, F]))
+```
+
+### Classes with no constructor methods
+
+```py
+from typing import Callable, Protocol
+from ty_extensions import TypeOf, static_assert, is_subtype_of
+
+class Returns[T](Protocol):
+    def __call__(self) -> T: ...
+
+class A: ...
+
+static_assert(is_subtype_of(TypeOf[A], Callable[[], A]))
+static_assert(is_subtype_of(TypeOf[A], Returns[A]))
 ```
 
 ### Subclass of
@@ -1864,8 +2022,6 @@ static_assert(is_subtype_of(TypeOf[A.g], Callable[[int], int]))
 static_assert(not is_subtype_of(TypeOf[a.f], Callable[[float], int]))
 static_assert(not is_subtype_of(TypeOf[A.g], Callable[[], int]))
 
-# TODO: This assertion should be true
-# error: [static-assert-error] "Static assertion error: argument evaluates to `False`"
 static_assert(is_subtype_of(TypeOf[A.f], Callable[[A, int], int]))
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/type_properties/materialization.md b/crates/ty_python_semantic/resources/mdtest/type_properties/materialization.md
index e6009f2b5b..01f3402c74 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_properties/materialization.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_properties/materialization.md
@@ -29,22 +29,25 @@ The dynamic type at the top-level is replaced with `object`.
 
 ```py
 from typing import Any, Callable
-from ty_extensions import Unknown, top_materialization
+from ty_extensions import Unknown, Top
 
-reveal_type(top_materialization(Any))  # revealed: object
-reveal_type(top_materialization(Unknown))  # revealed: object
+def _(top_any: Top[Any], top_unknown: Top[Unknown]):
+    reveal_type(top_any)  # revealed: object
+    reveal_type(top_unknown)  # revealed: object
 ```
 
 The contravariant position is replaced with `Never`.
 
 ```py
-reveal_type(top_materialization(Callable[[Any], None]))  # revealed: (Never, /) -> None
+def _(top_callable: Top[Callable[[Any], None]]):
+    reveal_type(top_callable)  # revealed: (Never, /) -> None
 ```
 
 The invariant position is replaced with an unresolved type variable.
 
 ```py
-reveal_type(top_materialization(list[Any]))  # revealed: list[T_all]
+def _(top_list: Top[list[Any]]):
+    reveal_type(top_list)  # revealed: Top[list[Any]]
 ```
 
 ### Bottom materialization
@@ -53,24 +56,26 @@ The dynamic type at the top-level is replaced with `Never`.
 
 ```py
 from typing import Any, Callable
-from ty_extensions import Unknown, bottom_materialization
+from ty_extensions import Unknown, Bottom
 
-reveal_type(bottom_materialization(Any))  # revealed: Never
-reveal_type(bottom_materialization(Unknown))  # revealed: Never
+def _(bottom_any: Bottom[Any], bottom_unknown: Bottom[Unknown]):
+    reveal_type(bottom_any)  # revealed: Never
+    reveal_type(bottom_unknown)  # revealed: Never
 ```
 
 The contravariant position is replaced with `object`.
 
 ```py
-# revealed: (object, object, /) -> None
-reveal_type(bottom_materialization(Callable[[Any, Unknown], None]))
+def _(bottom_callable: Bottom[Callable[[Any, Unknown], None]]):
+    reveal_type(bottom_callable)  # revealed: (object, object, /) -> None
 ```
 
 The invariant position is replaced in the same way as the top materialization, with an unresolved
 type variable.
 
 ```py
-reveal_type(bottom_materialization(list[Any]))  # revealed: list[T_all]
+def _(bottom_list: Bottom[list[Any]]):
+    reveal_type(bottom_list)  # revealed: Bottom[list[Any]]
 ```
 
 ## Fully static types
@@ -79,30 +84,30 @@ The top / bottom (and only) materialization of any fully static type is just its
 
 ```py
 from typing import Any, Literal
-from ty_extensions import TypeOf, bottom_materialization, top_materialization
+from ty_extensions import TypeOf, Bottom, Top, is_equivalent_to, static_assert
 from enum import Enum
 
 class Answer(Enum):
     NO = 0
     YES = 1
 
-reveal_type(top_materialization(int))  # revealed: int
-reveal_type(bottom_materialization(int))  # revealed: int
+static_assert(is_equivalent_to(Top[int], int))
+static_assert(is_equivalent_to(Bottom[int], int))
 
-reveal_type(top_materialization(Literal[1]))  # revealed: Literal[1]
-reveal_type(bottom_materialization(Literal[1]))  # revealed: Literal[1]
+static_assert(is_equivalent_to(Top[Literal[1]], Literal[1]))
+static_assert(is_equivalent_to(Bottom[Literal[1]], Literal[1]))
 
-reveal_type(top_materialization(Literal[True]))  # revealed: Literal[True]
-reveal_type(bottom_materialization(Literal[True]))  # revealed: Literal[True]
+static_assert(is_equivalent_to(Top[Literal[True]], Literal[True]))
+static_assert(is_equivalent_to(Bottom[Literal[True]], Literal[True]))
 
-reveal_type(top_materialization(Literal["abc"]))  # revealed: Literal["abc"]
-reveal_type(bottom_materialization(Literal["abc"]))  # revealed: Literal["abc"]
+static_assert(is_equivalent_to(Top[Literal["abc"]], Literal["abc"]))
+static_assert(is_equivalent_to(Bottom[Literal["abc"]], Literal["abc"]))
 
-reveal_type(top_materialization(Literal[Answer.YES]))  # revealed: Literal[Answer.YES]
-reveal_type(bottom_materialization(Literal[Answer.YES]))  # revealed: Literal[Answer.YES]
+static_assert(is_equivalent_to(Top[Literal[Answer.YES]], Literal[Answer.YES]))
+static_assert(is_equivalent_to(Bottom[Literal[Answer.YES]], Literal[Answer.YES]))
 
-reveal_type(top_materialization(int | str))  # revealed: int | str
-reveal_type(bottom_materialization(int | str))  # revealed: int | str
+static_assert(is_equivalent_to(Top[int | str], int | str))
+static_assert(is_equivalent_to(Bottom[int | str], int | str))
 ```
 
 We currently treat function literals as fully static types, so they remain unchanged even though the
@@ -114,11 +119,17 @@ def function(x: Any) -> None: ...
 class A:
     def method(self, x: Any) -> None: ...
 
-reveal_type(top_materialization(TypeOf[function]))  # revealed: def function(x: Any) -> None
-reveal_type(bottom_materialization(TypeOf[function]))  # revealed: def function(x: Any) -> None
+def _(
+    top_func: Top[TypeOf[function]],
+    bottom_func: Bottom[TypeOf[function]],
+    top_meth: Top[TypeOf[A().method]],
+    bottom_meth: Bottom[TypeOf[A().method]],
+):
+    reveal_type(top_func)  # revealed: def function(x: Never) -> None
+    reveal_type(bottom_func)  # revealed: def function(x: object) -> None
 
-reveal_type(top_materialization(TypeOf[A().method]))  # revealed: bound method A.method(x: Any) -> None
-reveal_type(bottom_materialization(TypeOf[A().method]))  # revealed: bound method A.method(x: Any) -> None
+    reveal_type(top_meth)  # revealed: bound method A.method(x: Never) -> None
+    reveal_type(bottom_meth)  # revealed: bound method A.method(x: object) -> None
 ```
 
 ## Callable
@@ -126,27 +137,30 @@ reveal_type(bottom_materialization(TypeOf[A().method]))  # revealed: bound metho
 For a callable, the parameter types are in a contravariant position, and the return type is in a
 covariant position.
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
 from typing import Any, Callable
-from ty_extensions import TypeOf, Unknown, bottom_materialization, top_materialization
+from ty_extensions import TypeOf, Unknown, Bottom, Top
 
-def _(callable: Callable[[Any, Unknown], Any]) -> None:
-    # revealed: (Never, Never, /) -> object
-    reveal_type(top_materialization(TypeOf[callable]))
+type C1 = Callable[[Any, Unknown], Any]
 
-    # revealed: (object, object, /) -> Never
-    reveal_type(bottom_materialization(TypeOf[callable]))
+def _(top: Top[C1], bottom: Bottom[C1]) -> None:
+    reveal_type(top)  # revealed: (Never, Never, /) -> object
+    reveal_type(bottom)  # revealed: (object, object, /) -> Never
 ```
 
 The parameter types in a callable inherits the contravariant position.
 
 ```py
-def _(callable: Callable[[int, tuple[int | Any]], tuple[Any]]) -> None:
-    # revealed: (int, tuple[int], /) -> tuple[object]
-    reveal_type(top_materialization(TypeOf[callable]))
+type C2 = Callable[[int, tuple[int | Any]], tuple[Any]]
 
-    # revealed: (int, tuple[object], /) -> Never
-    reveal_type(bottom_materialization(TypeOf[callable]))
+def _(top: Top[C2], bottom: Bottom[C2]) -> None:
+    reveal_type(top)  # revealed: (int, tuple[int], /) -> tuple[object]
+    reveal_type(bottom)  # revealed: (int, tuple[object], /) -> Never
 ```
 
 But, if the callable itself is in a contravariant position, then the variance is flipped i.e., if
@@ -154,30 +168,37 @@ the outer variance is covariant, it's flipped to contravariant, and if it's cont
 flipped to covariant, invariant remains invariant.
 
 ```py
-def _(callable: Callable[[Any, Callable[[Unknown], Any]], Callable[[Any, int], Any]]) -> None:
+type C3 = Callable[[Any, Callable[[Unknown], Any]], Callable[[Any, int], Any]]
+
+def _(top: Top[C3], bottom: Bottom[C3]) -> None:
     # revealed: (Never, (object, /) -> Never, /) -> (Never, int, /) -> object
-    reveal_type(top_materialization(TypeOf[callable]))
+    reveal_type(top)
 
     # revealed: (object, (Never, /) -> object, /) -> (object, int, /) -> Never
-    reveal_type(bottom_materialization(TypeOf[callable]))
+    reveal_type(bottom)
 ```
 
 ## Tuple
 
 All positions in a tuple are covariant.
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
-from typing import Any
-from ty_extensions import Unknown, bottom_materialization, top_materialization
+from typing import Any, Never
+from ty_extensions import Unknown, Bottom, Top, is_equivalent_to, static_assert
 
-reveal_type(top_materialization(tuple[Any, int]))  # revealed: tuple[object, int]
-reveal_type(bottom_materialization(tuple[Any, int]))  # revealed: Never
+static_assert(is_equivalent_to(Top[tuple[Any, int]], tuple[object, int]))
+static_assert(is_equivalent_to(Bottom[tuple[Any, int]], Never))
 
-reveal_type(top_materialization(tuple[Unknown, int]))  # revealed: tuple[object, int]
-reveal_type(bottom_materialization(tuple[Unknown, int]))  # revealed: Never
+static_assert(is_equivalent_to(Top[tuple[Unknown, int]], tuple[object, int]))
+static_assert(is_equivalent_to(Bottom[tuple[Unknown, int]], Never))
 
-reveal_type(top_materialization(tuple[Any, int, Unknown]))  # revealed: tuple[object, int, object]
-reveal_type(bottom_materialization(tuple[Any, int, Unknown]))  # revealed: Never
+static_assert(is_equivalent_to(Top[tuple[Any, int, Unknown]], tuple[object, int, object]))
+static_assert(is_equivalent_to(Bottom[tuple[Any, int, Unknown]], Never))
 ```
 
 Except for when the tuple itself is in a contravariant position, then all positions in the tuple
@@ -187,43 +208,59 @@ inherit the contravariant position.
 from typing import Callable
 from ty_extensions import TypeOf
 
-def _(callable: Callable[[tuple[Any, int], tuple[str, Unknown]], None]) -> None:
-    # revealed: (Never, Never, /) -> None
-    reveal_type(top_materialization(TypeOf[callable]))
+type C = Callable[[tuple[Any, int], tuple[str, Unknown]], None]
 
-    # revealed: (tuple[object, int], tuple[str, object], /) -> None
-    reveal_type(bottom_materialization(TypeOf[callable]))
+def _(top: Top[C], bottom: Bottom[C]) -> None:
+    reveal_type(top)  # revealed: (Never, Never, /) -> None
+    reveal_type(bottom)  # revealed: (tuple[object, int], tuple[str, object], /) -> None
 ```
 
 And, similarly for an invariant position.
 
 ```py
-reveal_type(top_materialization(list[tuple[Any, int]]))  # revealed: list[tuple[T_all, int]]
-reveal_type(bottom_materialization(list[tuple[Any, int]]))  # revealed: list[tuple[T_all, int]]
+type LTAnyInt = list[tuple[Any, int]]
+type LTStrUnknown = list[tuple[str, Unknown]]
+type LTAnyIntUnknown = list[tuple[Any, int, Unknown]]
 
-reveal_type(top_materialization(list[tuple[str, Unknown]]))  # revealed: list[tuple[str, T_all]]
-reveal_type(bottom_materialization(list[tuple[str, Unknown]]))  # revealed: list[tuple[str, T_all]]
+def _(
+    top_ai: Top[LTAnyInt],
+    bottom_ai: Bottom[LTAnyInt],
+    top_su: Top[LTStrUnknown],
+    bottom_su: Bottom[LTStrUnknown],
+    top_aiu: Top[LTAnyIntUnknown],
+    bottom_aiu: Bottom[LTAnyIntUnknown],
+):
+    reveal_type(top_ai)  # revealed: Top[list[tuple[Any, int]]]
+    reveal_type(bottom_ai)  # revealed: Bottom[list[tuple[Any, int]]]
 
-reveal_type(top_materialization(list[tuple[Any, int, Unknown]]))  # revealed: list[tuple[T_all, int, T_all]]
-reveal_type(bottom_materialization(list[tuple[Any, int, Unknown]]))  # revealed: list[tuple[T_all, int, T_all]]
+    reveal_type(top_su)  # revealed: Top[list[tuple[str, Unknown]]]
+    reveal_type(bottom_su)  # revealed: Bottom[list[tuple[str, Unknown]]]
+
+    reveal_type(top_aiu)  # revealed: Top[list[tuple[Any, int, Unknown]]]
+    reveal_type(bottom_aiu)  # revealed: Bottom[list[tuple[Any, int, Unknown]]]
 ```
 
 ## Union
 
 All positions in a union are covariant.
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
 from typing import Any
-from ty_extensions import Unknown, bottom_materialization, top_materialization
+from ty_extensions import Unknown, Bottom, Top, static_assert, is_equivalent_to
 
-reveal_type(top_materialization(Any | int))  # revealed: object
-reveal_type(bottom_materialization(Any | int))  # revealed: int
+static_assert(is_equivalent_to(Top[Any | int], object))
+static_assert(is_equivalent_to(Bottom[Any | int], int))
 
-reveal_type(top_materialization(Unknown | int))  # revealed: object
-reveal_type(bottom_materialization(Unknown | int))  # revealed: int
+static_assert(is_equivalent_to(Top[Unknown | int], object))
+static_assert(is_equivalent_to(Bottom[Unknown | int], int))
 
-reveal_type(top_materialization(int | str | Any))  # revealed: object
-reveal_type(bottom_materialization(int | str | Any))  # revealed: int | str
+static_assert(is_equivalent_to(Top[int | str | Any], object))
+static_assert(is_equivalent_to(Bottom[int | str | Any], int | str))
 ```
 
 Except for when the union itself is in a contravariant position, then all positions in the union
@@ -234,24 +271,29 @@ from typing import Callable
 from ty_extensions import TypeOf
 
 def _(callable: Callable[[Any | int, str | Unknown], None]) -> None:
-    # revealed: (int, str, /) -> None
-    reveal_type(top_materialization(TypeOf[callable]))
-
-    # revealed: (object, object, /) -> None
-    reveal_type(bottom_materialization(TypeOf[callable]))
+    static_assert(is_equivalent_to(Top[TypeOf[callable]], Callable[[int, str], None]))
+    static_assert(is_equivalent_to(Bottom[TypeOf[callable]], Callable[[object, object], None]))
 ```
 
 And, similarly for an invariant position.
 
 ```py
-reveal_type(top_materialization(list[Any | int]))  # revealed: list[T_all | int]
-reveal_type(bottom_materialization(list[Any | int]))  # revealed: list[T_all | int]
+def _(
+    top_ai: Top[list[Any | int]],
+    bottom_ai: Bottom[list[Any | int]],
+    top_su: Top[list[str | Unknown]],
+    bottom_su: Bottom[list[str | Unknown]],
+    top_aiu: Top[list[Any | int | Unknown]],
+    bottom_aiu: Bottom[list[Any | int | Unknown]],
+):
+    reveal_type(top_ai)  # revealed: Top[list[Any | int]]
+    reveal_type(bottom_ai)  # revealed: Bottom[list[Any | int]]
 
-reveal_type(top_materialization(list[str | Unknown]))  # revealed: list[str | T_all]
-reveal_type(bottom_materialization(list[str | Unknown]))  # revealed: list[str | T_all]
+    reveal_type(top_su)  # revealed: Top[list[str | Unknown]]
+    reveal_type(bottom_su)  # revealed: Bottom[list[str | Unknown]]
 
-reveal_type(top_materialization(list[Any | int | Unknown]))  # revealed: list[T_all | int]
-reveal_type(bottom_materialization(list[Any | int | Unknown]))  # revealed: list[T_all | int]
+    reveal_type(top_aiu)  # revealed: Top[list[Any | int]]
+    reveal_type(bottom_aiu)  # revealed: Bottom[list[Any | int]]
 ```
 
 ## Intersection
@@ -260,24 +302,28 @@ All positions in an intersection are covariant.
 
 ```py
 from typing import Any
-from ty_extensions import Intersection, Unknown, bottom_materialization, top_materialization
+from typing_extensions import Never
+from ty_extensions import Intersection, Unknown, Bottom, Top, static_assert, is_equivalent_to
 
-reveal_type(top_materialization(Intersection[Any, int]))  # revealed: int
-reveal_type(bottom_materialization(Intersection[Any, int]))  # revealed: Never
+static_assert(is_equivalent_to(Top[Intersection[Any, int]], int))
+static_assert(is_equivalent_to(Bottom[Intersection[Any, int]], Never))
 
 # Here, the top materialization of `Any | int` is `object` and the intersection of it with tuple
-# revealed: tuple[str, object]
-reveal_type(top_materialization(Intersection[Any | int, tuple[str, Unknown]]))
-# revealed: Never
-reveal_type(bottom_materialization(Intersection[Any | int, tuple[str, Unknown]]))
+static_assert(is_equivalent_to(Top[Intersection[Any | int, tuple[str, Unknown]]], tuple[str, object]))
+static_assert(is_equivalent_to(Bottom[Intersection[Any | int, tuple[str, Unknown]]], Never))
 
 class Foo: ...
 
-# revealed: Foo & tuple[str]
-reveal_type(bottom_materialization(Intersection[Any | Foo, tuple[str]]))
+static_assert(is_equivalent_to(Bottom[Intersection[Any | Foo, tuple[str]]], Intersection[Foo, tuple[str]]))
 
-reveal_type(top_materialization(Intersection[list[Any], list[int]]))  # revealed: list[T_all] & list[int]
-reveal_type(bottom_materialization(Intersection[list[Any], list[int]]))  # revealed: list[T_all] & list[int]
+def _(
+    top: Top[Intersection[list[Any], list[int]]],
+    bottom: Bottom[Intersection[list[Any], list[int]]],
+):
+    # Top[list[Any] & list[int]] = Top[list[Any]] & list[int] = list[int]
+    reveal_type(top)  # revealed: list[int]
+    # Bottom[list[Any] & list[int]] = Bottom[list[Any]] & list[int] = Bottom[list[Any]]
+    reveal_type(bottom)  # revealed: Bottom[list[Any]]
 ```
 
 ## Negation (via `Not`)
@@ -286,38 +332,44 @@ All positions in a negation are contravariant.
 
 ```py
 from typing import Any
-from ty_extensions import Not, Unknown, bottom_materialization, top_materialization
+from typing_extensions import Never
+from ty_extensions import Not, Unknown, Bottom, Top, static_assert, is_equivalent_to
 
 # ~Any is still Any, so the top materialization is object
-reveal_type(top_materialization(Not[Any]))  # revealed: object
-reveal_type(bottom_materialization(Not[Any]))  # revealed: Never
+static_assert(is_equivalent_to(Top[Not[Any]], object))
+static_assert(is_equivalent_to(Bottom[Not[Any]], Never))
 
 # tuple[Any, int] is in a contravariant position, so the
 # top materialization is Never and the negation of it
-# revealed: object
-reveal_type(top_materialization(Not[tuple[Any, int]]))
-# revealed: ~tuple[object, int]
-reveal_type(bottom_materialization(Not[tuple[Any, int]]))
+static_assert(is_equivalent_to(Top[Not[tuple[Any, int]]], object))
+static_assert(is_equivalent_to(Bottom[Not[tuple[Any, int]]], Not[tuple[object, int]]))
 ```
 
 ## `type`
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
 from typing import Any
-from ty_extensions import Unknown, bottom_materialization, top_materialization
+from typing_extensions import Never
+from ty_extensions import Unknown, Bottom, Top, static_assert, is_equivalent_to
 
-reveal_type(top_materialization(type[Any]))  # revealed: type
-reveal_type(bottom_materialization(type[Any]))  # revealed: Never
+static_assert(is_equivalent_to(Top[type[Any]], type))
+static_assert(is_equivalent_to(Bottom[type[Any]], Never))
 
-reveal_type(top_materialization(type[Unknown]))  # revealed: type
-reveal_type(bottom_materialization(type[Unknown]))  # revealed: Never
+static_assert(is_equivalent_to(Top[type[Unknown]], type))
+static_assert(is_equivalent_to(Bottom[type[Unknown]], Never))
 
-reveal_type(top_materialization(type[int | Any]))  # revealed: type
-reveal_type(bottom_materialization(type[int | Any]))  # revealed: type[int]
+static_assert(is_equivalent_to(Top[type[int | Any]], type))
+static_assert(is_equivalent_to(Bottom[type[int | Any]], type[int]))
 
 # Here, `T` has an upper bound of `type`
-reveal_type(top_materialization(list[type[Any]]))  # revealed: list[T_all]
-reveal_type(bottom_materialization(list[type[Any]]))  # revealed: list[T_all]
+def _(top: Top[list[type[Any]]], bottom: Bottom[list[type[Any]]]):
+    reveal_type(top)  # revealed: Top[list[type[Any]]]
+    reveal_type(bottom)  # revealed: Bottom[list[type[Any]]]
 ```
 
 ## Type variables
@@ -329,26 +381,19 @@ python-version = "3.12"
 
 ```py
 from typing import Any, Never, TypeVar
-from ty_extensions import (
-    TypeOf,
-    Unknown,
-    bottom_materialization,
-    top_materialization,
-    static_assert,
-    is_subtype_of,
-)
+from ty_extensions import Unknown, Bottom, Top, static_assert, is_subtype_of
 
 def bounded_by_gradual[T: Any](t: T) -> None:
     # Top materialization of `T: Any` is `T: object`
 
     # Bottom materialization of `T: Any` is `T: Never`
-    static_assert(is_subtype_of(TypeOf[bottom_materialization(T)], Never))
+    static_assert(is_subtype_of(Bottom[T], Never))
 
 def constrained_by_gradual[T: (int, Any)](t: T) -> None:
     # Top materialization of `T: (int, Any)` is `T: (int, object)`
 
     # Bottom materialization of `T: (int, Any)` is `T: (int, Never)`
-    static_assert(is_subtype_of(TypeOf[bottom_materialization(T)], int))
+    static_assert(is_subtype_of(Bottom[T], int))
 ```
 
 ## Generics
@@ -361,9 +406,14 @@ variable itself.
 - If the type variable is contravariant, the materialization happens as per the surrounding
     variance, but the variance is flipped
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 ```py
-from typing import Any, Generic, TypeVar
-from ty_extensions import bottom_materialization, top_materialization
+from typing import Any, Generic, TypeVar, Never
+from ty_extensions import Bottom, Top, static_assert, is_equivalent_to
 
 T = TypeVar("T")
 T_co = TypeVar("T_co", covariant=True)
@@ -378,14 +428,15 @@ class GenericCovariant(Generic[T_co]):
 class GenericContravariant(Generic[T_contra]):
     pass
 
-reveal_type(top_materialization(GenericInvariant[Any]))  # revealed: GenericInvariant[T_all]
-reveal_type(bottom_materialization(GenericInvariant[Any]))  # revealed: GenericInvariant[T_all]
+def _(top: Top[GenericInvariant[Any]], bottom: Bottom[GenericInvariant[Any]]):
+    reveal_type(top)  # revealed: Top[GenericInvariant[Any]]
+    reveal_type(bottom)  # revealed: Bottom[GenericInvariant[Any]]
 
-reveal_type(top_materialization(GenericCovariant[Any]))  # revealed: GenericCovariant[object]
-reveal_type(bottom_materialization(GenericCovariant[Any]))  # revealed: GenericCovariant[Never]
+static_assert(is_equivalent_to(Top[GenericCovariant[Any]], GenericCovariant[object]))
+static_assert(is_equivalent_to(Bottom[GenericCovariant[Any]], GenericCovariant[Never]))
 
-reveal_type(top_materialization(GenericContravariant[Any]))  # revealed: GenericContravariant[Never]
-reveal_type(bottom_materialization(GenericContravariant[Any]))  # revealed: GenericContravariant[object]
+static_assert(is_equivalent_to(Top[GenericContravariant[Any]], GenericContravariant[Never]))
+static_assert(is_equivalent_to(Bottom[GenericContravariant[Any]], GenericContravariant[object]))
 ```
 
 Parameters in callable are contravariant, so the variance should be flipped:
@@ -394,24 +445,288 @@ Parameters in callable are contravariant, so the variance should be flipped:
 from typing import Callable
 from ty_extensions import TypeOf
 
-def invariant(callable: Callable[[GenericInvariant[Any]], None]) -> None:
-    # revealed: (GenericInvariant[T_all], /) -> None
-    reveal_type(top_materialization(TypeOf[callable]))
+type InvariantCallable = Callable[[GenericInvariant[Any]], None]
+type CovariantCallable = Callable[[GenericCovariant[Any]], None]
+type ContravariantCallable = Callable[[GenericContravariant[Any]], None]
 
-    # revealed: (GenericInvariant[T_all], /) -> None
-    reveal_type(bottom_materialization(TypeOf[callable]))
+def invariant(top: Top[InvariantCallable], bottom: Bottom[InvariantCallable]) -> None:
+    reveal_type(top)  # revealed: (Bottom[GenericInvariant[Any]], /) -> None
+    reveal_type(bottom)  # revealed: (Top[GenericInvariant[Any]], /) -> None
 
-def covariant(callable: Callable[[GenericCovariant[Any]], None]) -> None:
-    # revealed: (GenericCovariant[Never], /) -> None
-    reveal_type(top_materialization(TypeOf[callable]))
+def covariant(top: Top[CovariantCallable], bottom: Bottom[CovariantCallable]) -> None:
+    reveal_type(top)  # revealed: (GenericCovariant[Never], /) -> None
+    reveal_type(bottom)  # revealed: (GenericCovariant[object], /) -> None
 
-    # revealed: (GenericCovariant[object], /) -> None
-    reveal_type(bottom_materialization(TypeOf[callable]))
-
-def contravariant(callable: Callable[[GenericContravariant[Any]], None]) -> None:
-    # revealed: (GenericContravariant[object], /) -> None
-    reveal_type(top_materialization(TypeOf[callable]))
-
-    # revealed: (GenericContravariant[Never], /) -> None
-    reveal_type(bottom_materialization(TypeOf[callable]))
+def contravariant(top: Top[ContravariantCallable], bottom: Bottom[ContravariantCallable]) -> None:
+    reveal_type(top)  # revealed: (GenericContravariant[object], /) -> None
+    reveal_type(bottom)  # revealed: (GenericContravariant[Never], /) -> None
+```
+
+## Invalid use
+
+`Top[]` and `Bottom[]` are special forms that take a single argument.
+
+It is invalid to use them without a type argument.
+
+```py
+from ty_extensions import Bottom, Top
+
+def _(
+    just_top: Top,  # error: [invalid-type-form]
+    just_bottom: Bottom,  # error: [invalid-type-form]
+): ...
+```
+
+It is also invalid to use multiple arguments:
+
+```py
+def _(
+    top_two: Top[int, str],  # error: [invalid-type-form]
+    bottom_two: Bottom[int, str],  # error: [invalid-type-form]
+): ...
+```
+
+The argument must be a type expression:
+
+```py
+def _(
+    top_1: Top[1],  # error: [invalid-type-form]
+    bottom_1: Bottom[1],  # error: [invalid-type-form]
+): ...
+```
+
+## Nested use
+
+`Top[T]` and `Bottom[T]` are always fully static types. Therefore, they have only one
+materialization (themselves) and applying `Top` or `Bottom` again does nothing.
+
+```py
+from typing import Any
+from ty_extensions import Top, Bottom, static_assert, is_equivalent_to
+
+static_assert(is_equivalent_to(Top[Top[list[Any]]], Top[list[Any]]))
+static_assert(is_equivalent_to(Bottom[Top[list[Any]]], Top[list[Any]]))
+
+static_assert(is_equivalent_to(Bottom[Bottom[list[Any]]], Bottom[list[Any]]))
+static_assert(is_equivalent_to(Top[Bottom[list[Any]]], Bottom[list[Any]]))
+```
+
+## Subtyping
+
+Any `list[T]` is a subtype of `Top[list[Any]]`, but with more restrictive gradual types, not all
+other specializations are subtypes.
+
+```py
+from typing import Any, Literal
+from ty_extensions import is_subtype_of, static_assert, Top, Intersection, Bottom
+
+# None and Top
+static_assert(is_subtype_of(list[int], Top[list[Any]]))
+static_assert(not is_subtype_of(Top[list[Any]], list[int]))
+static_assert(is_subtype_of(list[bool], Top[list[Intersection[int, Any]]]))
+static_assert(is_subtype_of(list[int], Top[list[Intersection[int, Any]]]))
+static_assert(not is_subtype_of(list[int | str], Top[list[Intersection[int, Any]]]))
+static_assert(not is_subtype_of(list[object], Top[list[Intersection[int, Any]]]))
+static_assert(not is_subtype_of(list[str], Top[list[Intersection[int, Any]]]))
+static_assert(not is_subtype_of(list[str | bool], Top[list[Intersection[int, Any]]]))
+
+# Top and Top
+static_assert(is_subtype_of(Top[list[int | Any]], Top[list[Any]]))
+static_assert(not is_subtype_of(Top[list[Any]], Top[list[int | Any]]))
+static_assert(is_subtype_of(Top[list[Intersection[int, Any]]], Top[list[Any]]))
+static_assert(not is_subtype_of(Top[list[Any]], Top[list[Intersection[int, Any]]]))
+static_assert(not is_subtype_of(Top[list[Intersection[int, Any]]], Top[list[int | Any]]))
+static_assert(not is_subtype_of(Top[list[int | Any]], Top[list[Intersection[int, Any]]]))
+static_assert(not is_subtype_of(Top[list[str | Any]], Top[list[int | Any]]))
+static_assert(is_subtype_of(Top[list[str | int | Any]], Top[list[int | Any]]))
+static_assert(not is_subtype_of(Top[list[int | Any]], Top[list[str | int | Any]]))
+
+# Bottom and Top
+static_assert(is_subtype_of(Bottom[list[Any]], Top[list[Any]]))
+static_assert(is_subtype_of(Bottom[list[Any]], Top[list[int | Any]]))
+static_assert(is_subtype_of(Bottom[list[int | Any]], Top[list[Any]]))
+static_assert(is_subtype_of(Bottom[list[int | Any]], Top[list[int | str]]))
+static_assert(is_subtype_of(Bottom[list[Intersection[int, Any]]], Top[list[Intersection[str, Any]]]))
+static_assert(not is_subtype_of(Bottom[list[Intersection[int, bool | Any]]], Bottom[list[Intersection[str, Literal["x"] | Any]]]))
+
+# None and None
+static_assert(not is_subtype_of(list[int], list[Any]))
+static_assert(not is_subtype_of(list[Any], list[int]))
+static_assert(is_subtype_of(list[int], list[int]))
+static_assert(not is_subtype_of(list[int], list[object]))
+static_assert(not is_subtype_of(list[object], list[int]))
+
+# Top and None
+static_assert(not is_subtype_of(Top[list[Any]], list[Any]))
+static_assert(not is_subtype_of(Top[list[Any]], list[int]))
+static_assert(is_subtype_of(Top[list[int]], list[int]))
+
+# Bottom and None
+static_assert(is_subtype_of(Bottom[list[Any]], list[object]))
+static_assert(is_subtype_of(Bottom[list[int | Any]], list[str | int]))
+static_assert(not is_subtype_of(Bottom[list[str | Any]], list[Intersection[int, bool | Any]]))
+
+# None and Bottom
+static_assert(not is_subtype_of(list[int], Bottom[list[Any]]))
+static_assert(not is_subtype_of(list[int], Bottom[list[int | Any]]))
+static_assert(is_subtype_of(list[int], Bottom[list[int]]))
+
+# Top and Bottom
+static_assert(not is_subtype_of(Top[list[Any]], Bottom[list[Any]]))
+static_assert(not is_subtype_of(Top[list[int | Any]], Bottom[list[int | Any]]))
+static_assert(is_subtype_of(Top[list[int]], Bottom[list[int]]))
+
+# Bottom and Bottom
+static_assert(is_subtype_of(Bottom[list[Any]], Bottom[list[int | str | Any]]))
+static_assert(is_subtype_of(Bottom[list[int | Any]], Bottom[list[int | str | Any]]))
+static_assert(is_subtype_of(Bottom[list[bool | Any]], Bottom[list[int | Any]]))
+static_assert(not is_subtype_of(Bottom[list[int | Any]], Bottom[list[bool | Any]]))
+static_assert(not is_subtype_of(Bottom[list[int | Any]], Bottom[list[Any]]))
+```
+
+## Assignability
+
+### General
+
+Assignability is the same as subtyping for top and bottom materializations, because those are fully
+static types, but some gradual types are assignable even if they are not subtypes.
+
+```py
+from typing import Any, Literal
+from ty_extensions import is_assignable_to, static_assert, Top, Intersection, Bottom
+
+# None and Top
+static_assert(is_assignable_to(list[Any], Top[list[Any]]))
+static_assert(is_assignable_to(list[int], Top[list[Any]]))
+static_assert(not is_assignable_to(Top[list[Any]], list[int]))
+static_assert(is_assignable_to(list[bool], Top[list[Intersection[int, Any]]]))
+static_assert(is_assignable_to(list[int], Top[list[Intersection[int, Any]]]))
+static_assert(is_assignable_to(list[Any], Top[list[Intersection[int, Any]]]))
+static_assert(not is_assignable_to(list[int | str], Top[list[Intersection[int, Any]]]))
+static_assert(not is_assignable_to(list[object], Top[list[Intersection[int, Any]]]))
+static_assert(not is_assignable_to(list[str], Top[list[Intersection[int, Any]]]))
+static_assert(not is_assignable_to(list[str | bool], Top[list[Intersection[int, Any]]]))
+
+# Top and Top
+static_assert(is_assignable_to(Top[list[int | Any]], Top[list[Any]]))
+static_assert(not is_assignable_to(Top[list[Any]], Top[list[int | Any]]))
+static_assert(is_assignable_to(Top[list[Intersection[int, Any]]], Top[list[Any]]))
+static_assert(not is_assignable_to(Top[list[Any]], Top[list[Intersection[int, Any]]]))
+static_assert(not is_assignable_to(Top[list[Intersection[int, Any]]], Top[list[int | Any]]))
+static_assert(not is_assignable_to(Top[list[int | Any]], Top[list[Intersection[int, Any]]]))
+static_assert(not is_assignable_to(Top[list[str | Any]], Top[list[int | Any]]))
+static_assert(is_assignable_to(Top[list[str | int | Any]], Top[list[int | Any]]))
+static_assert(not is_assignable_to(Top[list[int | Any]], Top[list[str | int | Any]]))
+
+# Bottom and Top
+static_assert(is_assignable_to(Bottom[list[Any]], Top[list[Any]]))
+static_assert(is_assignable_to(Bottom[list[Any]], Top[list[int | Any]]))
+static_assert(is_assignable_to(Bottom[list[int | Any]], Top[list[Any]]))
+static_assert(is_assignable_to(Bottom[list[Intersection[int, Any]]], Top[list[Intersection[str, Any]]]))
+static_assert(
+    not is_assignable_to(Bottom[list[Intersection[int, bool | Any]]], Bottom[list[Intersection[str, Literal["x"] | Any]]])
+)
+
+# None and None
+static_assert(is_assignable_to(list[int], list[Any]))
+static_assert(is_assignable_to(list[Any], list[int]))
+static_assert(is_assignable_to(list[int], list[int]))
+static_assert(not is_assignable_to(list[int], list[object]))
+static_assert(not is_assignable_to(list[object], list[int]))
+
+# Top and None
+static_assert(is_assignable_to(Top[list[Any]], list[Any]))
+static_assert(not is_assignable_to(Top[list[Any]], list[int]))
+static_assert(is_assignable_to(Top[list[int]], list[int]))
+
+# Bottom and None
+static_assert(is_assignable_to(Bottom[list[Any]], list[object]))
+static_assert(is_assignable_to(Bottom[list[int | Any]], Top[list[str | int]]))
+static_assert(not is_assignable_to(Bottom[list[str | Any]], list[Intersection[int, bool | Any]]))
+
+# None and Bottom
+static_assert(is_assignable_to(list[Any], Bottom[list[Any]]))
+static_assert(not is_assignable_to(list[int], Bottom[list[Any]]))
+static_assert(not is_assignable_to(list[int], Bottom[list[int | Any]]))
+static_assert(is_assignable_to(list[int], Bottom[list[int]]))
+
+# Top and Bottom
+static_assert(not is_assignable_to(Top[list[Any]], Bottom[list[Any]]))
+static_assert(not is_assignable_to(Top[list[int | Any]], Bottom[list[int | Any]]))
+static_assert(is_assignable_to(Top[list[int]], Bottom[list[int]]))
+
+# Bottom and Bottom
+static_assert(is_assignable_to(Bottom[list[Any]], Bottom[list[int | str | Any]]))
+static_assert(is_assignable_to(Bottom[list[int | Any]], Bottom[list[int | str | Any]]))
+static_assert(is_assignable_to(Bottom[list[bool | Any]], Bottom[list[int | Any]]))
+static_assert(not is_assignable_to(Bottom[list[int | Any]], Bottom[list[bool | Any]]))
+static_assert(not is_assignable_to(Bottom[list[int | Any]], Bottom[list[Any]]))
+```
+
+### Subclasses with different variance
+
+We need to take special care when an invariant class inherits from a covariant or contravariant one.
+This comes up frequently in practice because `list` (invariant) inherits from `Sequence` and a
+number of other covariant ABCs, but we'll use a synthetic example.
+
+```py
+from typing import Generic, TypeVar, Any
+from ty_extensions import static_assert, is_assignable_to, is_equivalent_to, Top
+
+class A:
+    pass
+
+class B(A):
+    pass
+
+T_co = TypeVar("T_co", covariant=True)
+T = TypeVar("T")
+
+class CovariantBase(Generic[T_co]):
+    def get(self) -> T_co:
+        raise NotImplementedError
+
+class InvariantChild(CovariantBase[T]):
+    def push(self, obj: T) -> None: ...
+
+static_assert(is_assignable_to(InvariantChild[A], CovariantBase[A]))
+static_assert(is_assignable_to(InvariantChild[B], CovariantBase[A]))
+static_assert(not is_assignable_to(InvariantChild[A], CovariantBase[B]))
+static_assert(not is_assignable_to(InvariantChild[B], InvariantChild[A]))
+static_assert(is_equivalent_to(Top[CovariantBase[Any]], CovariantBase[object]))
+static_assert(is_assignable_to(InvariantChild[Any], CovariantBase[A]))
+
+static_assert(not is_assignable_to(Top[InvariantChild[Any]], CovariantBase[A]))
+```
+
+## Attributes
+
+Attributes on top and bottom materializations are specialized on access.
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from ty_extensions import Top, Bottom
+from typing import Any
+
+class Invariant[T]:
+    def get(self) -> T:
+        raise NotImplementedError
+
+    def push(self, obj: T) -> None: ...
+
+    attr: T
+
+def capybara(top: Top[Invariant[Any]], bottom: Bottom[Invariant[Any]]) -> None:
+    reveal_type(top.get)  # revealed: bound method Top[Invariant[Any]].get() -> object
+    reveal_type(top.push)  # revealed: bound method Top[Invariant[Any]].push(obj: Never) -> None
+
+    reveal_type(bottom.get)  # revealed: bound method Bottom[Invariant[Any]].get() -> Never
+    reveal_type(bottom.push)  # revealed: bound method Bottom[Invariant[Any]].push(obj: object) -> None
+
+    reveal_type(top.attr)  # revealed: object
+    reveal_type(bottom.attr)  # revealed: Never
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/type_qualifiers/classvar.md b/crates/ty_python_semantic/resources/mdtest/type_qualifiers/classvar.md
index 51d76ac524..95aeb24a11 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_qualifiers/classvar.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_qualifiers/classvar.md
@@ -9,6 +9,7 @@ For more details on the semantics of pure class variables, see [this test](../at
 ## Basic
 
 ```py
+import typing
 from typing import ClassVar, Annotated
 
 class C:
@@ -17,12 +18,14 @@ class C:
     c: ClassVar[Annotated[int, "the annotation for c"]] = 1
     d: ClassVar = 1
     e: "ClassVar[int]" = 1
+    f: typing.ClassVar = 1
 
 reveal_type(C.a)  # revealed: int
 reveal_type(C.b)  # revealed: int
 reveal_type(C.c)  # revealed: int
 reveal_type(C.d)  # revealed: Unknown | Literal[1]
 reveal_type(C.e)  # revealed: int
+reveal_type(C.f)  # revealed: Unknown | Literal[1]
 
 c = C()
 
@@ -36,6 +39,8 @@ c.c = 2
 c.d = 2
 # error: [invalid-attribute-access]
 c.e = 2
+# error: [invalid-attribute-access]
+c.f = 3
 ```
 
 ## From stubs
diff --git a/crates/ty_python_semantic/resources/mdtest/type_qualifiers/final.md b/crates/ty_python_semantic/resources/mdtest/type_qualifiers/final.md
index 7c68534e10..ce2879e248 100644
--- a/crates/ty_python_semantic/resources/mdtest/type_qualifiers/final.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_qualifiers/final.md
@@ -88,6 +88,8 @@ class C:
         self.FINAL_C: Final[int] = 1
         self.FINAL_D: Final = 1
         self.FINAL_E: Final
+        # TODO: Should not be an error
+        # error: [invalid-assignment] "Cannot assign to final attribute `FINAL_E` on type `Self@__init__`"
         self.FINAL_E = 1
 
 reveal_type(C.FINAL_A)  # revealed: int
@@ -184,6 +186,7 @@ class C(metaclass=Meta):
         self.INSTANCE_FINAL_A: Final[int] = 1
         self.INSTANCE_FINAL_B: Final = 1
         self.INSTANCE_FINAL_C: Final[int]
+        # error: [invalid-assignment] "Cannot assign to final attribute `INSTANCE_FINAL_C` on type `Self@__init__`"
         self.INSTANCE_FINAL_C = 1
 
 # error: [invalid-assignment] "Cannot assign to final attribute `META_FINAL_A` on type `<class 'C'>`"
@@ -278,6 +281,8 @@ class C:
     def __init__(self):
         self.LEGAL_H: Final[int] = 1
         self.LEGAL_I: Final[int]
+        # TODO: Should not be an error
+        # error: [invalid-assignment]
         self.LEGAL_I = 1
 
 # error: [invalid-type-form] "`Final` is not allowed in function parameter annotations"
@@ -390,6 +395,8 @@ class C:
     DEFINED_IN_INIT: Final[int]
 
     def __init__(self):
+        # TODO: should not be an error
+        # error: [invalid-assignment]
         self.DEFINED_IN_INIT = 1
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/typed_dict.md b/crates/ty_python_semantic/resources/mdtest/typed_dict.md
index cdc8329816..d810a79efe 100644
--- a/crates/ty_python_semantic/resources/mdtest/typed_dict.md
+++ b/crates/ty_python_semantic/resources/mdtest/typed_dict.md
@@ -5,6 +5,11 @@ specific value types for each valid key. Each string key can be either required
 
 ## Basic
 
+```toml
+[environment]
+python-version = "3.12"
+```
+
 Here, we define a `TypedDict` using the class-based syntax:
 
 ```py
@@ -21,12 +26,10 @@ inferred based on the `TypedDict` definition:
 ```py
 alice: Person = {"name": "Alice", "age": 30}
 
-# TODO: this should be `str`
-reveal_type(alice["name"])  # revealed: Unknown
-# TODO: this should be `int | None`
-reveal_type(alice["age"])  # revealed: Unknown
+reveal_type(alice["name"])  # revealed: str
+reveal_type(alice["age"])  # revealed: int | None
 
-# TODO: this should reveal `Unknown`, and it should emit an error
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "non_existing""
 reveal_type(alice["non_existing"])  # revealed: Unknown
 ```
 
@@ -48,26 +51,103 @@ Methods that are available on `dict`s are also available on `TypedDict`s:
 bob.update(age=26)
 ```
 
+`TypedDict` keys do not have to be string literals, as long as they can be statically determined
+(inferred to be of type string `Literal`).
+
+```py
+from typing import Literal, Final
+
+NAME = "name"
+AGE = "age"
+
+def non_literal() -> str:
+    return "name"
+
+def name_or_age() -> Literal["name", "age"]:
+    return "name"
+
+carol: Person = {NAME: "Carol", AGE: 20}
+
+reveal_type(carol[NAME])  # revealed: str
+# error: [invalid-key] "TypedDict `Person` cannot be indexed with a key of type `str`"
+reveal_type(carol[non_literal()])  # revealed: Unknown
+reveal_type(carol[name_or_age()])  # revealed: str | int | None
+
+FINAL_NAME: Final = "name"
+FINAL_AGE: Final = "age"
+
+def _():
+    carol: Person = {FINAL_NAME: "Carol", FINAL_AGE: 20}
+
+CAPITALIZED_NAME = "Name"
+
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "Name" - did you mean "name"?"
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `Person` constructor"
+dave: Person = {CAPITALIZED_NAME: "Dave", "age": 20}
+
+def age() -> Literal["age"] | None:
+    return "age"
+
+eve: Person = {"na" + "me": "Eve", age() or "age": 20}
+```
+
 The construction of a `TypedDict` is checked for type correctness:
 
 ```py
-# TODO: these should be errors (invalid argument type)
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`"
 eve1a: Person = {"name": b"Eve", "age": None}
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`"
 eve1b = Person(name=b"Eve", age=None)
 
-# TODO: these should be errors (missing required key)
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `Person` constructor"
 eve2a: Person = {"age": 22}
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `Person` constructor"
 eve2b = Person(age=22)
 
-# TODO: these should be errors (additional key)
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
 eve3a: Person = {"name": "Eve", "age": 25, "extra": True}
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
 eve3b = Person(name="Eve", age=25, extra=True)
 ```
 
+Also, the value types ​​declared in a `TypedDict` affect generic call inference:
+
+```py
+class Plot(TypedDict):
+    y: list[int]
+    x: list[int] | None
+
+plot1: Plot = {"y": [1, 2, 3], "x": None}
+
+def homogeneous_list[T](*args: T) -> list[T]:
+    return list(args)
+
+reveal_type(homogeneous_list(1, 2, 3))  # revealed: list[Literal[1, 2, 3]]
+plot2: Plot = {"y": homogeneous_list(1, 2, 3), "x": None}
+reveal_type(plot2["y"])  # revealed: list[int]
+
+plot3: Plot = {"y": homogeneous_list(1, 2, 3), "x": homogeneous_list(1, 2, 3)}
+reveal_type(plot3["y"])  # revealed: list[int]
+reveal_type(plot3["x"])  # revealed: list[int] | None
+
+Y = "y"
+X = "x"
+
+plot4: Plot = {Y: [1, 2, 3], X: None}
+plot5: Plot = {Y: homogeneous_list(1, 2, 3), X: None}
+
+class Items(TypedDict):
+    items: list[int | str]
+
+items1: Items = {"items": homogeneous_list(1, 2, 3)}
+ITEMS = "items"
+items2: Items = {ITEMS: homogeneous_list(1, 2, 3)}
+```
+
 Assignments to keys are also validated:
 
 ```py
-# TODO: this should be an error
+# error: [invalid-assignment] "Invalid assignment to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
 alice["name"] = None
 
 # error: [invalid-assignment] "Invalid assignment to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
@@ -77,13 +157,274 @@ bob["name"] = None
 Assignments to non-existing keys are disallowed:
 
 ```py
-# TODO: this should be an error
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
 alice["extra"] = True
 
 # error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
 bob["extra"] = True
 ```
 
+## Nested `TypedDict`
+
+Nested `TypedDict` fields are also supported.
+
+```py
+from typing import TypedDict
+
+class Inner(TypedDict):
+    name: str
+    age: int | None
+
+class Person(TypedDict):
+    inner: Inner
+```
+
+```py
+alice: Person = {"inner": {"name": "Alice", "age": 30}}
+
+reveal_type(alice["inner"]["name"])  # revealed: str
+reveal_type(alice["inner"]["age"])  # revealed: int | None
+
+# error: [invalid-key] "Invalid key access on TypedDict `Inner`: Unknown key "non_existing""
+reveal_type(alice["inner"]["non_existing"])  # revealed: Unknown
+
+# error: [invalid-key] "Invalid key access on TypedDict `Inner`: Unknown key "extra""
+alice: Person = {"inner": {"name": "Alice", "age": 30, "extra": 1}}
+```
+
+## Validation of `TypedDict` construction
+
+```py
+from typing import TypedDict
+
+class Person(TypedDict):
+    name: str
+    age: int | None
+
+class House:
+    owner: Person
+
+house = House()
+
+def accepts_person(p: Person) -> None:
+    pass
+```
+
+The following constructions of `Person` are all valid:
+
+```py
+alice1: Person = {"name": "Alice", "age": 30}
+Person(name="Alice", age=30)
+Person({"name": "Alice", "age": 30})
+
+accepts_person({"name": "Alice", "age": 30})
+house.owner = {"name": "Alice", "age": 30}
+```
+
+All of these are missing the required `age` field:
+
+```py
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `Person` constructor"
+alice2: Person = {"name": "Alice"}
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `Person` constructor"
+Person(name="Alice")
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `Person` constructor"
+Person({"name": "Alice"})
+
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `Person` constructor"
+accepts_person({"name": "Alice"})
+
+# TODO: this should be an error, similar to the above
+house.owner = {"name": "Alice"}
+
+a_person: Person
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `Person` constructor"
+a_person = {"name": "Alice"}
+```
+
+All of these have an invalid type for the `name` field:
+
+```py
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
+alice3: Person = {"name": None, "age": 30}
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
+Person(name=None, age=30)
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
+Person({"name": None, "age": 30})
+
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
+accepts_person({"name": None, "age": 30})
+# TODO: this should be an error, similar to the above
+house.owner = {"name": None, "age": 30}
+
+a_person: Person
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
+a_person = {"name": None, "age": 30}
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Person`: value of type `None`"
+(a_person := {"name": None, "age": 30})
+```
+
+All of these have an extra field that is not defined in the `TypedDict`:
+
+```py
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
+alice4: Person = {"name": "Alice", "age": 30, "extra": True}
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
+Person(name="Alice", age=30, extra=True)
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
+Person({"name": "Alice", "age": 30, "extra": True})
+
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
+accepts_person({"name": "Alice", "age": 30, "extra": True})
+# TODO: this should be an error
+house.owner = {"name": "Alice", "age": 30, "extra": True}
+
+a_person: Person
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
+a_person = {"name": "Alice", "age": 30, "extra": True}
+# error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extra""
+(a_person := {"name": "Alice", "age": 30, "extra": True})
+```
+
+## Type ignore compatibility issues
+
+Users should be able to ignore TypedDict validation errors with `# type: ignore`
+
+```py
+from typing import TypedDict
+
+class Person(TypedDict):
+    name: str
+    age: int
+
+alice_bad: Person = {"name": None}  # type: ignore
+Person(name=None, age=30)  # type: ignore
+Person(name="Alice", age=30, extra=True)  # type: ignore
+```
+
+## Positional dictionary constructor pattern
+
+The positional dictionary constructor pattern (used by libraries like strawberry) should work
+correctly:
+
+```py
+from typing import TypedDict
+
+class User(TypedDict):
+    name: str
+    age: int
+
+# Valid usage - all required fields provided
+user1 = User({"name": "Alice", "age": 30})
+
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `User` constructor"
+user2 = User({"name": "Bob"})
+
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `User`: value of type `None`"
+user3 = User({"name": None, "age": 25})
+
+# error: [invalid-key] "Invalid key access on TypedDict `User`: Unknown key "extra""
+user4 = User({"name": "Charlie", "age": 30, "extra": True})
+```
+
+## Optional fields with `total=False`
+
+By default, all fields in a `TypedDict` are required (`total=True`). You can make all fields
+optional by setting `total=False`:
+
+```py
+from typing import TypedDict
+
+class OptionalPerson(TypedDict, total=False):
+    name: str
+    age: int | None
+
+# All fields are optional with total=False
+charlie = OptionalPerson()
+david = OptionalPerson(name="David")
+emily = OptionalPerson(age=30)
+frank = OptionalPerson(name="Frank", age=25)
+
+# TODO: we could emit an error here, because these fields are not guaranteed to exist
+reveal_type(charlie["name"])  # revealed: str
+reveal_type(david["age"])  # revealed: int | None
+```
+
+Type validation still applies to provided fields:
+
+```py
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `OptionalPerson`"
+invalid = OptionalPerson(name=123)
+```
+
+Extra fields are still not allowed, even with `total=False`:
+
+```py
+# error: [invalid-key] "Invalid key access on TypedDict `OptionalPerson`: Unknown key "extra""
+invalid_extra = OptionalPerson(name="George", extra=True)
+```
+
+## `Required` and `NotRequired`
+
+You can have fine-grained control over keys using `Required` and `NotRequired` qualifiers. These
+qualifiers override the class-level `total` setting, which sets the default (`total=True` means that
+all keys are required by default, `total=False` means that all keys are non-required by default):
+
+```py
+from typing_extensions import TypedDict, Required, NotRequired, Final
+
+# total=False by default, but id is explicitly Required
+class Message(TypedDict, total=False):
+    id: Required[int]  # Always required, even though total=False
+    content: str  # Optional due to total=False
+    timestamp: NotRequired[str]  # Explicitly optional (redundant here)
+
+# total=True by default, but content is explicitly NotRequired
+class User(TypedDict):
+    name: str  # Required due to total=True (default)
+    email: Required[str]  # Explicitly required (redundant here)
+    bio: NotRequired[str]  # Optional despite total=True
+
+ID: Final = "id"
+
+# Valid Message constructions
+msg1 = Message(id=1)  # id required, content optional
+msg2 = Message(id=2, content="Hello")  # both provided
+msg3 = Message(id=3, timestamp="2024-01-01")  # id required, timestamp optional
+msg4: Message = {"id": 4}  # id required, content optional
+msg5: Message = {ID: 5}  # id required, content optional
+
+def msg() -> Message:
+    return {ID: 1}
+
+# Valid User constructions
+user1 = User(name="Alice", email="alice@example.com")  # required fields
+user2 = User(name="Bob", email="bob@example.com", bio="Developer")  # with optional bio
+
+reveal_type(msg1["id"])  # revealed: int
+reveal_type(msg1["content"])  # revealed: str
+reveal_type(user1["name"])  # revealed: str
+reveal_type(user1["bio"])  # revealed: str
+```
+
+Constructor validation respects `Required`/`NotRequired` overrides:
+
+```py
+# error: [missing-typed-dict-key] "Missing required key 'id' in TypedDict `Message` constructor"
+invalid_msg = Message(content="Hello")  # Missing required id
+
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `User` constructor"
+# error: [missing-typed-dict-key] "Missing required key 'email' in TypedDict `User` constructor"
+invalid_user = User(bio="No name provided")  # Missing required name and email
+```
+
+Type validation still applies to all fields when provided:
+
+```py
+# error: [invalid-argument-type] "Invalid argument to key "id" with declared type `int` on TypedDict `Message`"
+invalid_type = Message(id="not-an-int", content="Hello")
+```
+
 ## Structural assignability
 
 Assignability between `TypedDict` types is structural, that is, it is based on the presence of keys
@@ -134,8 +475,7 @@ alice: Person = {"name": "Alice"}
 # TODO: this should be an invalid-assignment error
 dangerous(alice)
 
-# TODO: this should be `str`
-reveal_type(alice["name"])  # revealed: Unknown
+reveal_type(alice["name"])  # revealed: str
 ```
 
 ## Key-based access
@@ -224,23 +564,90 @@ def _(person: Person, unknown_key: Any):
     person[unknown_key] = "Eve"
 ```
 
+## `ReadOnly`
+
+Assignments to keys that are marked `ReadOnly` will produce an error:
+
+```py
+from typing_extensions import TypedDict, ReadOnly, Required
+
+class Person(TypedDict, total=False):
+    id: ReadOnly[Required[int]]
+    name: str
+    age: int | None
+
+alice: Person = {"id": 1, "name": "Alice", "age": 30}
+alice["age"] = 31  # okay
+
+# error: [invalid-assignment] "Cannot assign to key "id" on TypedDict `Person`: key is marked read-only"
+alice["id"] = 2
+```
+
+This also works if all fields on a `TypedDict` are `ReadOnly`, in which case we synthesize a
+`__setitem__` method with a `key` type of `Never`:
+
+```py
+class Config(TypedDict):
+    host: ReadOnly[str]
+    port: ReadOnly[int]
+
+config: Config = {"host": "localhost", "port": 8080}
+
+# error: [invalid-assignment] "Cannot assign to key "host" on TypedDict `Config`: key is marked read-only"
+config["host"] = "127.0.0.1"
+# error: [invalid-assignment] "Cannot assign to key "port" on TypedDict `Config`: key is marked read-only"
+config["port"] = 80
+```
+
 ## Methods on `TypedDict`
 
 ```py
 from typing import TypedDict
+from typing_extensions import NotRequired
 
 class Person(TypedDict):
     name: str
     age: int | None
+    extra: NotRequired[str]
 
 def _(p: Person) -> None:
     reveal_type(p.keys())  # revealed: dict_keys[str, object]
     reveal_type(p.values())  # revealed: dict_values[str, object]
 
-    reveal_type(p.setdefault("name", "Alice"))  # revealed: @Todo(Support for `TypedDict`)
+    # `get()` returns the field type for required keys (no None union)
+    reveal_type(p.get("name"))  # revealed: str
+    reveal_type(p.get("age"))  # revealed: int | None
 
-    reveal_type(p.get("name"))  # revealed: @Todo(Support for `TypedDict`)
-    reveal_type(p.get("name", "Unknown"))  # revealed: @Todo(Support for `TypedDict`)
+    # It doesn't matter if a default is specified:
+    reveal_type(p.get("name", "default"))  # revealed: str
+    reveal_type(p.get("age", 999))  # revealed: int | None
+
+    # `get()` can return `None` for non-required keys
+    reveal_type(p.get("extra"))  # revealed: str | None
+    reveal_type(p.get("extra", "default"))  # revealed: str
+
+    # The type of the default parameter can be anything:
+    reveal_type(p.get("extra", 0))  # revealed: str | Literal[0]
+
+    # We allow access to unknown keys (they could be set for a subtype of Person)
+    reveal_type(p.get("unknown"))  # revealed: Unknown | None
+    reveal_type(p.get("unknown", "default"))  # revealed: Unknown | Literal["default"]
+
+    # `pop()` only works on non-required fields
+    reveal_type(p.pop("extra"))  # revealed: str
+    reveal_type(p.pop("extra", "fallback"))  # revealed: str
+    # error: [invalid-argument-type] "Cannot pop required field 'name' from TypedDict `Person`"
+    reveal_type(p.pop("name"))  # revealed: Unknown
+
+    # Similar to above, the default parameter can be of any type:
+    reveal_type(p.pop("extra", 0))  # revealed: str | Literal[0]
+
+    # `setdefault()` always returns the field type
+    reveal_type(p.setdefault("name", "Alice"))  # revealed: str
+    reveal_type(p.setdefault("extra", "default"))  # revealed: str
+
+    # error: [invalid-key] "Invalid key access on TypedDict `Person`: Unknown key "extraz" - did you mean "extra"?"
+    reveal_type(p.setdefault("extraz", "value"))  # revealed: Unknown
 ```
 
 ## Unlike normal classes
@@ -265,18 +672,18 @@ Also, the "attributes" on the class definition can not be accessed. Neither on t
 on inhabitants of the type defined by the class:
 
 ```py
-# error: [unresolved-attribute] "Type `<class 'Person'>` has no attribute `name`"
+# error: [unresolved-attribute] "Class `Person` has no attribute `name`"
 Person.name
 
 def _(P: type[Person]):
-    # error: [unresolved-attribute] "Type `type[Person]` has no attribute `name`"
+    # error: [unresolved-attribute] "Object of type `type[Person]` has no attribute `name`"
     P.name
 
 def _(p: Person) -> None:
-    # error: [unresolved-attribute] "Type `Person` has no attribute `name`"
+    # error: [unresolved-attribute] "Object of type `Person` has no attribute `name`"
     p.name
 
-    type(p).name  # error: [unresolved-attribute] "Type `<class 'dict[str, object]'>` has no attribute `name`"
+    type(p).name  # error: [unresolved-attribute] "Class `dict[str, object]` has no attribute `name`"
 ```
 
 ## Special properties
@@ -340,8 +747,87 @@ class Employee(Person):
 
 alice: Employee = {"name": "Alice", "employee_id": 1}
 
-# TODO: this should be an error (missing required key)
+# error: [missing-typed-dict-key] "Missing required key 'employee_id' in TypedDict `Employee` constructor"
 eve: Employee = {"name": "Eve"}
+
+def combine(p: Person, e: Employee):
+    reveal_type(p.copy())  # revealed: Person
+    reveal_type(e.copy())  # revealed: Employee
+
+    reveal_type(p | p)  # revealed: Person
+    reveal_type(e | e)  # revealed: Employee
+
+    # TODO: Should be `Person` once we support subtyping for TypedDicts
+    reveal_type(p | e)  # revealed: Person | Employee
+```
+
+When inheriting from a `TypedDict` with a different `total` setting, inherited fields maintain their
+original requirement status, while new fields follow the child class's `total` setting:
+
+```py
+from typing import TypedDict
+
+# Case 1: total=True parent, total=False child
+class PersonBase(TypedDict):
+    id: int  # required (from total=True)
+    name: str  # required (from total=True)
+
+class PersonOptional(PersonBase, total=False):
+    age: int  # optional (from total=False)
+    email: str  # optional (from total=False)
+
+# Inherited fields keep their original requirement status
+person1 = PersonOptional(id=1, name="Alice")  # Valid - id/name still required
+person2 = PersonOptional(id=1, name="Alice", age=25)  # Valid - age optional
+person3 = PersonOptional(id=1, name="Alice", email="alice@test.com")  # Valid
+
+# These should be errors - missing required inherited fields
+# error: [missing-typed-dict-key] "Missing required key 'id' in TypedDict `PersonOptional` constructor"
+person_invalid1 = PersonOptional(name="Bob")
+
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `PersonOptional` constructor"
+person_invalid2 = PersonOptional(id=2)
+
+# Case 2: total=False parent, total=True child
+class PersonBaseOptional(TypedDict, total=False):
+    id: int  # optional (from total=False)
+    name: str  # optional (from total=False)
+
+class PersonRequired(PersonBaseOptional):  # total=True by default
+    age: int  # required (from total=True)
+
+# New fields in child are required, inherited fields stay optional
+person4 = PersonRequired(age=30)  # Valid - only age required, id/name optional
+person5 = PersonRequired(id=1, name="Charlie", age=35)  # Valid - all provided
+
+# This should be an error - missing required new field
+# error: [missing-typed-dict-key] "Missing required key 'age' in TypedDict `PersonRequired` constructor"
+person_invalid3 = PersonRequired(id=3, name="David")
+```
+
+This also works with `Required` and `NotRequired`:
+
+```py
+from typing_extensions import TypedDict, Required, NotRequired
+
+# Case 3: Mixed inheritance with Required/NotRequired
+class PersonMixed(TypedDict, total=False):
+    id: Required[int]  # required despite total=False
+    name: str  # optional due to total=False
+
+class Employee(PersonMixed):  # total=True by default
+    department: str  # required due to total=True
+
+# id stays required (Required override), name stays optional, department is required
+emp1 = Employee(id=1, department="Engineering")  # Valid
+emp2 = Employee(id=2, name="Eve", department="Sales")  # Valid
+
+# Errors for missing required keys
+# error: [missing-typed-dict-key] "Missing required key 'id' in TypedDict `Employee` constructor"
+emp_invalid1 = Employee(department="HR")
+
+# error: [missing-typed-dict-key] "Missing required key 'department' in TypedDict `Employee` constructor"
+emp_invalid2 = Employee(id=3)
 ```
 
 ## Generic `TypedDict`
@@ -362,8 +848,20 @@ class TaggedData(TypedDict, Generic[T]):
 p1: TaggedData[int] = {"data": 42, "tag": "number"}
 p2: TaggedData[str] = {"data": "Hello", "tag": "text"}
 
-# TODO: this should be an error (type mismatch)
+# error: [invalid-argument-type] "Invalid argument to key "data" with declared type `int` on TypedDict `TaggedData`: value of type `Literal["not a number"]`"
 p3: TaggedData[int] = {"data": "not a number", "tag": "number"}
+
+class Items(TypedDict, Generic[T]):
+    items: list[T]
+
+def homogeneous_list(*args: T) -> list[T]:
+    return list(args)
+
+items1: Items[int] = {"items": [1, 2, 3]}
+items2: Items[str] = {"items": ["a", "b", "c"]}
+items3: Items[int] = {"items": homogeneous_list(1, 2, 3)}
+items4: Items[str] = {"items": homogeneous_list("a", "b", "c")}
+items5: Items[int | str] = {"items": homogeneous_list(1, 2, 3)}
 ```
 
 ### PEP-695 generics
@@ -383,8 +881,20 @@ class TaggedData[T](TypedDict):
 p1: TaggedData[int] = {"data": 42, "tag": "number"}
 p2: TaggedData[str] = {"data": "Hello", "tag": "text"}
 
-# TODO: this should be an error (type mismatch)
+# error: [invalid-argument-type] "Invalid argument to key "data" with declared type `int` on TypedDict `TaggedData`: value of type `Literal["not a number"]`"
 p3: TaggedData[int] = {"data": "not a number", "tag": "number"}
+
+class Items[T](TypedDict):
+    items: list[T]
+
+def homogeneous_list[T](*args: T) -> list[T]:
+    return list(args)
+
+items1: Items[int] = {"items": [1, 2, 3]}
+items2: Items[str] = {"items": ["a", "b", "c"]}
+items3: Items[int] = {"items": homogeneous_list(1, 2, 3)}
+items4: Items[str] = {"items": homogeneous_list("a", "b", "c")}
+items5: Items[int | str] = {"items": homogeneous_list(1, 2, 3)}
 ```
 
 ## Recursive `TypedDict`
@@ -405,7 +915,7 @@ grandchild: Node = {"name": "grandchild", "parent": child}
 
 nested: Node = {"name": "n1", "parent": {"name": "n2", "parent": {"name": "n3", "parent": None}}}
 
-# TODO: this should be an error (invalid type for `name` in innermost node)
+# error: [invalid-argument-type] "Invalid argument to key "name" with declared type `str` on TypedDict `Node`: value of type `Literal[3]`"
 nested_invalid: Node = {"name": "n1", "parent": {"name": "n2", "parent": {"name": 3, "parent": None}}}
 ```
 
@@ -441,6 +951,38 @@ from typing import TypedDict
 x: TypedDict = {"name": "Alice"}
 ```
 
+### `dict`-subclass inhabitants
+
+Values that inhabit a `TypedDict` type must be instances of `dict` itself, not a subclass:
+
+```py
+from typing import TypedDict
+
+class MyDict(dict):
+    pass
+
+class Person(TypedDict):
+    name: str
+    age: int | None
+
+# TODO: this should be an error
+x: Person = MyDict({"name": "Alice", "age": 30})
+```
+
+### Cannot be used in `isinstance` tests
+
+```py
+from typing import TypedDict
+
+class Person(TypedDict):
+    name: str
+    age: int | None
+
+def _(obj: object) -> bool:
+    # TODO: this should be an error
+    return isinstance(obj, Person)
+```
+
 ## Diagnostics
 
 <!-- snapshot-diagnostics -->
@@ -475,4 +1017,67 @@ def write_to_non_literal_string_key(person: Person, str_key: str):
     person[str_key] = "Alice"  # error: [invalid-key]
 ```
 
+Assignment to `ReadOnly` keys:
+
+```py
+from typing_extensions import ReadOnly
+
+class Employee(TypedDict):
+    id: ReadOnly[int]
+    name: str
+
+def write_to_readonly_key(employee: Employee):
+    employee["id"] = 42  # error: [invalid-assignment]
+```
+
+## Import aliases
+
+`TypedDict` can be imported with aliases and should work correctly:
+
+```py
+from typing import TypedDict as TD
+from typing_extensions import Required
+
+class UserWithAlias(TD, total=False):
+    name: Required[str]
+    age: int
+
+user_empty = UserWithAlias(name="Alice")  # name is required
+user_partial = UserWithAlias(name="Alice", age=30)
+
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `UserWithAlias` constructor"
+user_invalid = UserWithAlias(age=30)
+
+reveal_type(user_empty["name"])  # revealed: str
+reveal_type(user_partial["age"])  # revealed: int
+```
+
+## Shadowing behavior
+
+When a local class shadows the `TypedDict` import, only the actual `TypedDict` import should be
+treated as a `TypedDict`:
+
+```py
+from typing import TypedDict as TD
+
+class TypedDict:
+    def __init__(self):
+        pass
+
+class NotActualTypedDict(TypedDict, total=True):
+    name: str
+
+class ActualTypedDict(TD, total=True):
+    name: str
+
+not_td = NotActualTypedDict()
+reveal_type(not_td)  # revealed: NotActualTypedDict
+
+# error: [missing-typed-dict-key] "Missing required key 'name' in TypedDict `ActualTypedDict` constructor"
+actual_td = ActualTypedDict()
+actual_td = ActualTypedDict(name="Alice")
+reveal_type(actual_td)  # revealed: ActualTypedDict
+reveal_type(actual_td["name"])  # revealed: str
+```
+
 [`typeddict`]: https://typing.python.org/en/latest/spec/typeddict.html
diff --git a/crates/ty_python_semantic/resources/mdtest/union_types.md b/crates/ty_python_semantic/resources/mdtest/union_types.md
index 52a77028c7..dc4da435f5 100644
--- a/crates/ty_python_semantic/resources/mdtest/union_types.md
+++ b/crates/ty_python_semantic/resources/mdtest/union_types.md
@@ -118,7 +118,8 @@ def _(
 
 ```py
 from enum import Enum
-from typing import Literal
+from typing import Literal, Any
+from ty_extensions import Intersection
 
 class Color(Enum):
     RED = "red"
@@ -139,6 +140,13 @@ def _(
     reveal_type(u4)  # revealed: Literal[Color.RED, Color.GREEN]
     reveal_type(u5)  # revealed: Color
     reveal_type(u6)  # revealed: Color
+
+def _(
+    u1: Intersection[Literal[Color.RED], Any] | Literal[Color.RED],
+    u2: Literal[Color.RED] | Intersection[Literal[Color.RED], Any],
+):
+    reveal_type(u1)  # revealed: Literal[Color.RED]
+    reveal_type(u2)  # revealed: Literal[Color.RED]
 ```
 
 ## Do not erase `Unknown`
@@ -298,3 +306,74 @@ def _(c: BC, d: BD):
     reveal_type(c)  # revealed: Literal[b""]
     reveal_type(d)  # revealed: Literal[b""]
 ```
+
+## Unions of tuples
+
+A union of a fixed-length tuple and a variable-length tuple must be collapsed to the variable-length
+element, never to the fixed-length element (`tuple[()] | tuple[Any, ...]` -> `tuple[Any, ...]`, not
+`tuple[()]`).
+
+```py
+from typing import Any
+
+def f(
+    a: tuple[()] | tuple[int, ...],
+    b: tuple[int, ...] | tuple[()],
+    c: tuple[int] | tuple[str, ...],
+    d: tuple[str, ...] | tuple[int],
+    e: tuple[()] | tuple[Any, ...],
+    f: tuple[Any, ...] | tuple[()],
+    g: tuple[Any, ...] | tuple[Any | str, ...],
+    h: tuple[Any | str, ...] | tuple[Any, ...],
+):
+    reveal_type(a)  # revealed: tuple[int, ...]
+    reveal_type(b)  # revealed: tuple[int, ...]
+    reveal_type(c)  # revealed: tuple[int] | tuple[str, ...]
+    reveal_type(d)  # revealed: tuple[str, ...] | tuple[int]
+    reveal_type(e)  # revealed: tuple[Any, ...]
+    reveal_type(f)  # revealed: tuple[Any, ...]
+    reveal_type(g)  # revealed: tuple[Any | str, ...]
+    reveal_type(h)  # revealed: tuple[Any | str, ...]
+```
+
+## Unions of other generic containers
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import Any
+
+class Bivariant[T]: ...
+
+class Covariant[T]:
+    def get(self) -> T:
+        raise NotImplementedError
+
+class Contravariant[T]:
+    def receive(self, input: T) -> None: ...
+
+class Invariant[T]:
+    mutable_attribute: T
+
+def _(
+    a: Bivariant[Any] | Bivariant[Any | str],
+    b: Bivariant[Any | str] | Bivariant[Any],
+    c: Covariant[Any] | Covariant[Any | str],
+    d: Covariant[Any | str] | Covariant[Any],
+    e: Contravariant[Any | str] | Contravariant[Any],
+    f: Contravariant[Any] | Contravariant[Any | str],
+    g: Invariant[Any] | Invariant[Any | str],
+    h: Invariant[Any | str] | Invariant[Any],
+):
+    reveal_type(a)  # revealed: Bivariant[Any]
+    reveal_type(b)  # revealed: Bivariant[Any | str]
+    reveal_type(c)  # revealed: Covariant[Any | str]
+    reveal_type(d)  # revealed: Covariant[Any | str]
+    reveal_type(e)  # revealed: Contravariant[Any]
+    reveal_type(f)  # revealed: Contravariant[Any]
+    reveal_type(g)  # revealed: Invariant[Any] | Invariant[Any | str]
+    reveal_type(h)  # revealed: Invariant[Any | str] | Invariant[Any]
+```
diff --git a/crates/ty_python_semantic/resources/mdtest/unpacking.md b/crates/ty_python_semantic/resources/mdtest/unpacking.md
index ef8cf63519..20a89625ed 100644
--- a/crates/ty_python_semantic/resources/mdtest/unpacking.md
+++ b/crates/ty_python_semantic/resources/mdtest/unpacking.md
@@ -213,9 +213,8 @@ reveal_type(d)  # revealed: Literal[2]
 
 ```py
 a, b = [1, 2]
-# TODO: should be `int` for both `a` and `b`
-reveal_type(a)  # revealed: Unknown
-reveal_type(b)  # revealed: Unknown
+reveal_type(a)  # revealed: Unknown | int
+reveal_type(b)  # revealed: Unknown | int
 ```
 
 ### Simple unpacking
@@ -523,8 +522,8 @@ def f(x: MixedTupleSubclass):
 
 ```py
 a, b = "ab"
-reveal_type(a)  # revealed: LiteralString
-reveal_type(b)  # revealed: LiteralString
+reveal_type(a)  # revealed: Literal["a"]
+reveal_type(b)  # revealed: Literal["b"]
 ```
 
 ### Uneven unpacking (1)
@@ -570,37 +569,37 @@ reveal_type(d)  # revealed: Unknown
 
 ```py
 (a, *b, c) = "ab"
-reveal_type(a)  # revealed: LiteralString
+reveal_type(a)  # revealed: Literal["a"]
 reveal_type(b)  # revealed: list[Never]
-reveal_type(c)  # revealed: LiteralString
+reveal_type(c)  # revealed: Literal["b"]
 ```
 
 ### Starred expression (3)
 
 ```py
 (a, *b, c) = "abc"
-reveal_type(a)  # revealed: LiteralString
-reveal_type(b)  # revealed: list[LiteralString]
-reveal_type(c)  # revealed: LiteralString
+reveal_type(a)  # revealed: Literal["a"]
+reveal_type(b)  # revealed: list[Literal["b"]]
+reveal_type(c)  # revealed: Literal["c"]
 ```
 
 ### Starred expression (4)
 
 ```py
 (a, *b, c, d) = "abcdef"
-reveal_type(a)  # revealed: LiteralString
-reveal_type(b)  # revealed: list[LiteralString]
-reveal_type(c)  # revealed: LiteralString
-reveal_type(d)  # revealed: LiteralString
+reveal_type(a)  # revealed: Literal["a"]
+reveal_type(b)  # revealed: list[Literal["b", "c", "d"]]
+reveal_type(c)  # revealed: Literal["e"]
+reveal_type(d)  # revealed: Literal["f"]
 ```
 
 ### Starred expression (5)
 
 ```py
 (a, b, *c) = "abcd"
-reveal_type(a)  # revealed: LiteralString
-reveal_type(b)  # revealed: LiteralString
-reveal_type(c)  # revealed: list[LiteralString]
+reveal_type(a)  # revealed: Literal["a"]
+reveal_type(b)  # revealed: Literal["b"]
+reveal_type(c)  # revealed: list[Literal["c", "d"]]
 ```
 
 ### Starred expression (6)
@@ -650,8 +649,114 @@ reveal_type(b)  # revealed: Unknown
 ```py
 (a, b) = "\ud800\udfff"
 
+reveal_type(a)  # revealed: Literal["�"]
+reveal_type(b)  # revealed: Literal["�"]
+```
+
+### Very long literal
+
+```py
+string = "very long stringgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg"
+
+a, *b = string
 reveal_type(a)  # revealed: LiteralString
-reveal_type(b)  # revealed: LiteralString
+reveal_type(b)  # revealed: list[LiteralString]
+```
+
+## Bytes
+
+### Simple unpacking
+
+```py
+a, b = b"ab"
+reveal_type(a)  # revealed: Literal[97]
+reveal_type(b)  # revealed: Literal[98]
+```
+
+### Uneven unpacking (1)
+
+```py
+# error: [invalid-assignment] "Not enough values to unpack: Expected 3"
+a, b, c = b"ab"
+reveal_type(a)  # revealed: Unknown
+reveal_type(b)  # revealed: Unknown
+reveal_type(c)  # revealed: Unknown
+```
+
+### Uneven unpacking (2)
+
+```py
+# error: [invalid-assignment] "Too many values to unpack: Expected 2"
+a, b = b"abc"
+reveal_type(a)  # revealed: Unknown
+reveal_type(b)  # revealed: Unknown
+```
+
+### Starred expression (1)
+
+```py
+# error: [invalid-assignment] "Not enough values to unpack: Expected at least 3"
+(a, *b, c, d) = b"ab"
+reveal_type(a)  # revealed: Unknown
+reveal_type(b)  # revealed: list[Unknown]
+reveal_type(c)  # revealed: Unknown
+reveal_type(d)  # revealed: Unknown
+```
+
+```py
+# error: [invalid-assignment] "Not enough values to unpack: Expected at least 3"
+(a, b, *c, d) = b"a"
+reveal_type(a)  # revealed: Unknown
+reveal_type(b)  # revealed: Unknown
+reveal_type(c)  # revealed: list[Unknown]
+reveal_type(d)  # revealed: Unknown
+```
+
+### Starred expression (2)
+
+```py
+(a, *b, c) = b"ab"
+reveal_type(a)  # revealed: Literal[97]
+reveal_type(b)  # revealed: list[Never]
+reveal_type(c)  # revealed: Literal[98]
+```
+
+### Starred expression (3)
+
+```py
+(a, *b, c) = b"abc"
+reveal_type(a)  # revealed: Literal[97]
+reveal_type(b)  # revealed: list[Literal[98]]
+reveal_type(c)  # revealed: Literal[99]
+```
+
+### Starred expression (4)
+
+```py
+(a, *b, c, d) = b"abcdef"
+reveal_type(a)  # revealed: Literal[97]
+reveal_type(b)  # revealed: list[Literal[98, 99, 100]]
+reveal_type(c)  # revealed: Literal[101]
+reveal_type(d)  # revealed: Literal[102]
+```
+
+### Starred expression (5)
+
+```py
+(a, b, *c) = b"abcd"
+reveal_type(a)  # revealed: Literal[97]
+reveal_type(b)  # revealed: Literal[98]
+reveal_type(c)  # revealed: list[Literal[99, 100]]
+```
+
+### Very long literal
+
+```py
+too_long = b"very long bytes stringggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg"
+
+a, *b = too_long
+reveal_type(a)  # revealed: int
+reveal_type(b)  # revealed: list[int]
 ```
 
 ## Union
@@ -714,7 +819,7 @@ def _(arg: tuple[int, tuple[str, bytes]] | tuple[tuple[int, bytes], Literal["ab"
     a, (b, c) = arg
     reveal_type(a)  # revealed: int | tuple[int, bytes]
     reveal_type(b)  # revealed: str
-    reveal_type(c)  # revealed: bytes | LiteralString
+    reveal_type(c)  # revealed: bytes | Literal["b"]
 ```
 
 ### Starred expression
@@ -785,8 +890,8 @@ from typing import Literal
 
 def _(arg: tuple[int, int] | Literal["ab"]):
     a, b = arg
-    reveal_type(a)  # revealed: int | LiteralString
-    reveal_type(b)  # revealed: int | LiteralString
+    reveal_type(a)  # revealed: int | Literal["a"]
+    reveal_type(b)  # revealed: int | Literal["b"]
 ```
 
 ### Custom iterator (1)
diff --git a/crates/ty_python_semantic/resources/mdtest/unreachable.md b/crates/ty_python_semantic/resources/mdtest/unreachable.md
index 4f05131763..7321ed9b01 100644
--- a/crates/ty_python_semantic/resources/mdtest/unreachable.md
+++ b/crates/ty_python_semantic/resources/mdtest/unreachable.md
@@ -198,7 +198,7 @@ import sys
 
 if sys.platform == "win32":
     # TODO: we should not emit an error here
-    # error: [possibly-unbound-attribute]
+    # error: [possibly-missing-attribute]
     sys.getwindowsversion()
 ```
 
diff --git a/crates/ty_python_semantic/resources/mdtest/with/async.md b/crates/ty_python_semantic/resources/mdtest/with/async.md
index 2d907fa381..6d556d438b 100644
--- a/crates/ty_python_semantic/resources/mdtest/with/async.md
+++ b/crates/ty_python_semantic/resources/mdtest/with/async.md
@@ -113,7 +113,7 @@ async def _(flag: bool):
     class NotAContextManager: ...
     context_expr = Manager1() if flag else NotAContextManager()
 
-    # error: [invalid-context-manager] "Object of type `Manager1 | NotAContextManager` cannot be used with `async with` because the methods `__aenter__` and `__aexit__` are possibly unbound"
+    # error: [invalid-context-manager] "Object of type `Manager1 | NotAContextManager` cannot be used with `async with` because the methods `__aenter__` and `__aexit__` are possibly missing"
     async with context_expr as f:
         reveal_type(f)  # revealed: str
 ```
@@ -129,7 +129,7 @@ async def _(flag: bool):
 
         async def __exit__(self, *args): ...
 
-    # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `async with` because the method `__aenter__` is possibly unbound"
+    # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `async with` because the method `__aenter__` may be missing"
     async with Manager() as f:
         reveal_type(f)  # revealed: CoroutineType[Any, Any, str]
 ```
@@ -254,8 +254,7 @@ async def long_running_task():
 
 async def main():
     async with asyncio.TaskGroup() as tg:
-        # TODO: should be `TaskGroup`
-        reveal_type(tg)  # revealed: Unknown
+        reveal_type(tg)  # revealed: TaskGroup
 
         tg.create_task(long_running_task())
 ```
diff --git a/crates/ty_python_semantic/resources/mdtest/with/sync.md b/crates/ty_python_semantic/resources/mdtest/with/sync.md
index 1dd8d0ea70..15d6aec51e 100644
--- a/crates/ty_python_semantic/resources/mdtest/with/sync.md
+++ b/crates/ty_python_semantic/resources/mdtest/with/sync.md
@@ -113,7 +113,7 @@ def _(flag: bool):
     class NotAContextManager: ...
     context_expr = Manager1() if flag else NotAContextManager()
 
-    # error: [invalid-context-manager] "Object of type `Manager1 | NotAContextManager` cannot be used with `with` because the methods `__enter__` and `__exit__` are possibly unbound"
+    # error: [invalid-context-manager] "Object of type `Manager1 | NotAContextManager` cannot be used with `with` because the methods `__enter__` and `__exit__` are possibly missing"
     with context_expr as f:
         reveal_type(f)  # revealed: str
 ```
@@ -129,7 +129,7 @@ def _(flag: bool):
 
         def __exit__(self, *args): ...
 
-    # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because the method `__enter__` is possibly unbound"
+    # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because the method `__enter__` may be missing"
     with Manager() as f:
         reveal_type(f)  # revealed: str
 ```
diff --git a/crates/ty_python_semantic/resources/primer/bad.txt b/crates/ty_python_semantic/resources/primer/bad.txt
index 5d17114127..45414db491 100644
--- a/crates/ty_python_semantic/resources/primer/bad.txt
+++ b/crates/ty_python_semantic/resources/primer/bad.txt
@@ -1,28 +1,2 @@
-Tanjun  # too many iterations
-altair  # too many iterations (uses packaging)
-antidote  # hangs / slow (single threaded)
-artigraph  # cycle panics (value_type_)
-arviz  # too many iterations on versions of arviz newer than https://github.com/arviz-devs/arviz/commit/3205b82bb4d6097c31f7334d7ac51a6de37002d0
-core  # cycle panics (value_type_)
-cpython  # too many cycle iterations
-graphql-core  # stack overflow
-hydpy  # too many iterations
-ibis  # too many iterations
-jax  # too many iterations
-mypy # too many iterations (self-recursive type alias)
-nox # too many iterations (uses packaging)
-packaging  # too many iterations
-pandas  # slow (9s)
-pandas-stubs  # panics on versions of pandas-stubs newer than https://github.com/pandas-dev/pandas-stubs/commit/bf1221eb7ea0e582c30fe233d1f4f5713fce376b
-              # Panicked at crates/ty_python_semantic/src/types/type_ordering.rs:207:13 when checking `/tmp/mypy_primer/projects/pandas-stubs/tests/test_indexes.py`: `internal error: entered unreachable code: our type representation does not permit nested unions`
-pandera  # too many iterations
-pip  # vendors packaging, see above
-pylint  # cycle panics (self-recursive type alias)
-pyodide  # too many cycle iterations
-scikit-build-core  # too many cycle iterations
-setuptools  # vendors packaging, see above
-spack  # slow, success, but mypy-primer hangs processing the output
-spark  # too many iterations
-steam.py  # hangs (single threaded)
-streamlit  # too many iterations (uses packaging)
-xarray  # too many iterations
+spark  # too many iterations (in `exported_names` query), `should not be able to access instance member `spark` of type variable IndexOpsLike@astype in inferable position`
+steam.py  # too many iterations
diff --git a/crates/ty_python_semantic/resources/primer/good.txt b/crates/ty_python_semantic/resources/primer/good.txt
index c3d283b08b..0271a5a46d 100644
--- a/crates/ty_python_semantic/resources/primer/good.txt
+++ b/crates/ty_python_semantic/resources/primer/good.txt
@@ -3,15 +3,19 @@ DateType
 Expression
 PyGithub
 PyWinCtl
-SinbadCogs
+Tanjun
 aiohttp
 aiohttp-devtools
 aioredis
 aiortc
 alectryon
 alerta
+altair
+antidote
 anyio
 apprise
+artigraph
+arviz
 async-utils
 asynq
 attrs
@@ -27,26 +31,34 @@ cloud-init
 colour
 com2ann
 comtypes
+core
+cpython
 cwltool
 dacite
 dd-trace-py
 dedupe
 discord.py
 django-stubs
+django-test-migrations
 downforeveryone
 dragonchain
 dulwich
+egglog-python
 flake8
 flake8-pyi
 freqtrade
 git-revise
+graphql-core
 httpx-caching
+hydpy
 hydra-zen
+ibis
 ignite
 imagehash
 isort
 itsdangerous
 janus
+jax
 jinja
 koda-validate
 kopf
@@ -59,16 +71,23 @@ mkdocs
 mkosi
 mongo-python-driver
 more-itertools
+mypy
 mypy-protobuf
 mypy_primer
 nionutils
+nox
 openlibrary
 operator
 optuna
 paasta
+packaging
+pandas
+pandas-stubs
+pandera
 paroxython
 parso
 pegen
+pip
 poetry
 porcupine
 ppb-vector
@@ -80,7 +99,9 @@ pycryptodome
 pydantic
 pyinstrument
 pyjwt
+pylint
 pylox
+pyodide
 pyp
 pyppeteer
 pytest
@@ -94,16 +115,20 @@ rich
 rotki
 schema_salad
 schemathesis
+scikit-build-core
 scikit-learn
 scipy
 scrapy
+setuptools
 sockeye
+spack
 speedrun.com_global_scoreboard_webapp
 sphinx
 starlette
 static-frame
 stone
 strawberry
+streamlit
 svcs
 sympy
 tornado
@@ -114,6 +139,7 @@ urllib3
 vision
 websockets
 werkzeug
+xarray
 xarray-dataclasses
 yarl
 zipp
diff --git a/crates/ty_python_semantic/src/ast_node_ref.rs b/crates/ty_python_semantic/src/ast_node_ref.rs
index c5f7f115cc..ed28bc396b 100644
--- a/crates/ty_python_semantic/src/ast_node_ref.rs
+++ b/crates/ty_python_semantic/src/ast_node_ref.rs
@@ -32,21 +32,29 @@ use ruff_text_size::Ranged;
 /// run on every AST change. All other queries only run when the expression's identity changes.
 #[derive(Clone)]
 pub struct AstNodeRef<T> {
-    /// A pointer to the [`ruff_db::parsed::ParsedModule`] that this node was created from.
-    module_ptr: *const (),
+    /// The index of the node in the AST.
+    index: NodeIndex,
 
     /// Debug information.
     #[cfg(debug_assertions)]
     kind: ruff_python_ast::NodeKind,
     #[cfg(debug_assertions)]
     range: ruff_text_size::TextRange,
-
-    /// The index of the node in the AST.
-    index: NodeIndex,
+    // Note that because the module address is not stored in release builds, `AstNodeRef`
+    // cannot implement `Eq`, as indices are only unique within a given instance of the
+    // AST.
+    #[cfg(debug_assertions)]
+    module_addr: usize,
 
     _node: PhantomData<T>,
 }
 
+impl<T> AstNodeRef<T> {
+    pub(crate) fn index(&self) -> NodeIndex {
+        self.index
+    }
+}
+
 impl<T> AstNodeRef<T>
 where
     T: HasNodeIndex + Ranged + PartialEq + Debug,
@@ -63,7 +71,8 @@ where
 
         Self {
             index,
-            module_ptr: module_ref.module().as_ptr(),
+            #[cfg(debug_assertions)]
+            module_addr: module_ref.module().addr(),
             #[cfg(debug_assertions)]
             kind: AnyNodeRef::from(node).kind(),
             #[cfg(debug_assertions)]
@@ -77,10 +86,11 @@ where
     /// This method may panic or produce unspecified results if the provided module is from a
     /// different file or Salsa revision than the module to which the node belongs.
     pub fn node<'ast>(&self, module_ref: &'ast ParsedModuleRef) -> &'ast T {
-        debug_assert_eq!(module_ref.module().as_ptr(), self.module_ptr);
+        #[cfg(debug_assertions)]
+        assert_eq!(module_ref.module().addr(), self.module_addr);
 
-        // Note that the module pointer is guaranteed to be stable within the Salsa
-        // revision, so the file contents cannot have changed by the above assertion.
+        // The user guarantees that the module is from the same file and Salsa
+        // revision, so the file contents cannot have changed.
         module_ref
             .get_by_index(self.index)
             .try_into()
@@ -89,6 +99,20 @@ where
     }
 }
 
+#[expect(unsafe_code)]
+unsafe impl<T> salsa::Update for AstNodeRef<T> {
+    unsafe fn maybe_update(old_pointer: *mut Self, new_value: Self) -> bool {
+        let old_ref = unsafe { &mut (*old_pointer) };
+
+        // The equality of an `AstNodeRef` depends on both the module address and the node index,
+        // but the former is not stored in release builds to save memory. As such, AST nodes
+        // are always considered change when the AST is reparsed, which is acceptable because
+        // any change to the AST is likely to invalidate most node indices anyways.
+        *old_ref = new_value;
+        true
+    }
+}
+
 impl<T> get_size2::GetSize for AstNodeRef<T> {}
 
 #[allow(clippy::missing_fields_in_debug)]
@@ -113,26 +137,3 @@ where
         }
     }
 }
-
-#[expect(unsafe_code)]
-unsafe impl<T> salsa::Update for AstNodeRef<T> {
-    unsafe fn maybe_update(old_pointer: *mut Self, new_value: Self) -> bool {
-        let old_ref = unsafe { &mut (*old_pointer) };
-
-        // Two nodes are guaranteed to be equal as long as they refer to the same node index
-        // within the same module. Note that the module pointer is guaranteed to be stable
-        // within the Salsa revision, so the file contents cannot have changed.
-        if old_ref.module_ptr == new_value.module_ptr && old_ref.index == new_value.index {
-            false
-        } else {
-            *old_ref = new_value;
-            true
-        }
-    }
-}
-
-// SAFETY: The `module_ptr` is only used for pointer equality and never accessed directly.
-#[expect(unsafe_code)]
-unsafe impl<T> Send for AstNodeRef<T> where T: Send {}
-#[expect(unsafe_code)]
-unsafe impl<T> Sync for AstNodeRef<T> where T: Sync {}
diff --git a/crates/ty_python_semantic/src/db.rs b/crates/ty_python_semantic/src/db.rs
index 645929235a..d03b001199 100644
--- a/crates/ty_python_semantic/src/db.rs
+++ b/crates/ty_python_semantic/src/db.rs
@@ -12,6 +12,9 @@ pub trait Db: SourceDb {
     fn rule_selection(&self, file: File) -> &RuleSelection;
 
     fn lint_registry(&self) -> &LintRegistry;
+
+    /// Whether ty is running with logging verbosity INFO or higher (`-v` or more).
+    fn verbose(&self) -> bool;
 }
 
 #[cfg(test)]
@@ -126,6 +129,10 @@ pub(crate) mod tests {
         fn lint_registry(&self) -> &LintRegistry {
             default_lint_registry()
         }
+
+        fn verbose(&self) -> bool {
+            false
+        }
     }
 
     #[salsa::db]
diff --git a/crates/ty_python_semantic/src/util/diagnostics.rs b/crates/ty_python_semantic/src/diagnostic.rs
similarity index 86%
rename from crates/ty_python_semantic/src/util/diagnostics.rs
rename to crates/ty_python_semantic/src/diagnostic.rs
index 82ce6b1c3a..5936d0874d 100644
--- a/crates/ty_python_semantic/src/util/diagnostics.rs
+++ b/crates/ty_python_semantic/src/diagnostic.rs
@@ -1,3 +1,29 @@
+/// Suggest a name from `existing_names` that is similar to `wrong_name`.
+pub(crate) fn did_you_mean<S: AsRef<str>, T: AsRef<str>>(
+    existing_names: impl Iterator<Item = S>,
+    wrong_name: T,
+) -> Option<String> {
+    if wrong_name.as_ref().len() < 3 {
+        return None;
+    }
+
+    existing_names
+        .filter(|ref id| id.as_ref().len() >= 2)
+        .map(|ref id| {
+            (
+                id.as_ref().to_string(),
+                strsim::damerau_levenshtein(
+                    &id.as_ref().to_lowercase(),
+                    &wrong_name.as_ref().to_lowercase(),
+                ),
+            )
+        })
+        .min_by_key(|(_, dist)| *dist)
+        // Heuristic to filter out bad matches
+        .filter(|(_, dist)| *dist <= 3)
+        .map(|(id, _)| id)
+}
+
 use crate::{Db, Program, PythonVersionWithSource};
 use ruff_db::diagnostic::{Annotation, Diagnostic, SubDiagnostic, SubDiagnosticSeverity};
 use std::fmt::Write;
diff --git a/crates/ty_python_semantic/src/dunder_all.rs b/crates/ty_python_semantic/src/dunder_all.rs
index 3827d9762a..7273bc975b 100644
--- a/crates/ty_python_semantic/src/dunder_all.rs
+++ b/crates/ty_python_semantic/src/dunder_all.rs
@@ -7,26 +7,16 @@ use ruff_python_ast::statement_visitor::{StatementVisitor, walk_stmt};
 use ruff_python_ast::{self as ast};
 
 use crate::semantic_index::{SemanticIndex, semantic_index};
-use crate::types::{Truthiness, Type, infer_expression_types};
+use crate::types::{Truthiness, Type, TypeContext, infer_expression_types};
 use crate::{Db, ModuleName, resolve_module};
 
-#[allow(clippy::ref_option)]
-fn dunder_all_names_cycle_recover(
-    _db: &dyn Db,
-    _value: &Option<FxHashSet<Name>>,
-    _count: u32,
-    _file: File,
-) -> salsa::CycleRecoveryAction<Option<FxHashSet<Name>>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn dunder_all_names_cycle_initial(_db: &dyn Db, _file: File) -> Option<FxHashSet<Name>> {
     None
 }
 
 /// Returns a set of names in the `__all__` variable for `file`, [`None`] if it is not defined or
 /// if it contains invalid elements.
-#[salsa::tracked(returns(as_ref), cycle_fn=dunder_all_names_cycle_recover, cycle_initial=dunder_all_names_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(as_ref), cycle_initial=dunder_all_names_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(crate) fn dunder_all_names(db: &dyn Db, file: File) -> Option<FxHashSet<Name>> {
     let _span = tracing::trace_span!("dunder_all_names", file=?file.path(db)).entered();
 
@@ -182,7 +172,8 @@ impl<'db> DunderAllNamesCollector<'db> {
     ///
     /// This function panics if `expr` was not marked as a standalone expression during semantic indexing.
     fn standalone_expression_type(&self, expr: &ast::Expr) -> Type<'db> {
-        infer_expression_types(self.db, self.index.expression(expr)).expression_type(expr)
+        infer_expression_types(self.db, self.index.expression(expr), TypeContext::default())
+            .expression_type(expr)
     }
 
     /// Evaluate the given expression and return its truthiness.
diff --git a/crates/ty_python_semantic/src/lib.rs b/crates/ty_python_semantic/src/lib.rs
index afd61f44ca..ea0b492b7b 100644
--- a/crates/ty_python_semantic/src/lib.rs
+++ b/crates/ty_python_semantic/src/lib.rs
@@ -1,30 +1,36 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods in ty crates"
+)]
 use std::hash::BuildHasherDefault;
 
-use rustc_hash::FxHasher;
-
 use crate::lint::{LintRegistry, LintRegistryBuilder};
-use crate::suppression::{INVALID_IGNORE_COMMENT, UNKNOWN_RULE, UNUSED_IGNORE_COMMENT};
+use crate::suppression::{
+    IGNORE_COMMENT_UNKNOWN_RULE, INVALID_IGNORE_COMMENT, UNUSED_IGNORE_COMMENT,
+};
 pub use db::Db;
-pub use module_name::ModuleName;
+pub use diagnostic::add_inferred_python_version_hint_to_diagnostic;
+pub use module_name::{ModuleName, ModuleNameResolutionError};
 pub use module_resolver::{
-    Module, SearchPath, SearchPathValidationError, SearchPaths, list_modules, resolve_module,
-    resolve_real_module, system_module_search_paths,
+    Module, SearchPath, SearchPathValidationError, SearchPaths, all_modules, list_modules,
+    resolve_module, resolve_real_module, system_module_search_paths,
 };
 pub use program::{
     Program, ProgramSettings, PythonVersionFileSource, PythonVersionSource,
     PythonVersionWithSource, SearchPathSettings,
 };
 pub use python_platform::PythonPlatform;
+use rustc_hash::FxHasher;
 pub use semantic_model::{
-    Completion, CompletionKind, HasDefinition, HasType, NameKind, SemanticModel,
+    Completion, HasDefinition, HasType, MemberDefinition, NameKind, SemanticModel,
 };
 pub use site_packages::{PythonEnvironment, SitePackagesPaths, SysPrefixPathOrigin};
 pub use types::DisplaySettings;
 pub use types::ide_support::{
-    ImportAliasResolution, ResolvedDefinition, definitions_for_attribute,
-    definitions_for_imported_symbol, definitions_for_name, map_stub_definition,
+    ImportAliasResolution, ResolvedDefinition, definitions_for_attribute, definitions_for_bin_op,
+    definitions_for_imported_symbol, definitions_for_name, definitions_for_unary_op,
+    map_stub_definition,
 };
-pub use util::diagnostics::add_inferred_python_version_hint_to_diagnostic;
 
 pub mod ast_node_ref;
 mod db;
@@ -41,11 +47,12 @@ mod rank;
 pub mod semantic_index;
 mod semantic_model;
 pub(crate) mod site_packages;
+mod subscript;
 mod suppression;
 pub mod types;
 mod unpack;
-mod util;
 
+mod diagnostic;
 #[cfg(feature = "testing")]
 pub mod pull_types;
 
@@ -69,6 +76,6 @@ pub fn default_lint_registry() -> &'static LintRegistry {
 pub fn register_lints(registry: &mut LintRegistryBuilder) {
     types::register_lints(registry);
     registry.register_lint(&UNUSED_IGNORE_COMMENT);
-    registry.register_lint(&UNKNOWN_RULE);
+    registry.register_lint(&IGNORE_COMMENT_UNKNOWN_RULE);
     registry.register_lint(&INVALID_IGNORE_COMMENT);
 }
diff --git a/crates/ty_python_semantic/src/lint.rs b/crates/ty_python_semantic/src/lint.rs
index 0800ee5983..0eccfac326 100644
--- a/crates/ty_python_semantic/src/lint.rs
+++ b/crates/ty_python_semantic/src/lint.rs
@@ -1,10 +1,11 @@
+use crate::diagnostic::did_you_mean;
 use core::fmt;
 use itertools::Itertools;
 use ruff_db::diagnostic::{DiagnosticId, LintName, Severity};
 use rustc_hash::FxHashMap;
+use std::error::Error;
 use std::fmt::Formatter;
 use std::hash::Hasher;
-use thiserror::Error;
 
 #[derive(Debug, Clone)]
 pub struct LintMetadata {
@@ -380,7 +381,12 @@ impl LintRegistry {
                     }
                 }
 
-                Err(GetLintError::Unknown(code.to_string()))
+                let suggestion = did_you_mean(self.by_name.keys(), code);
+
+                Err(GetLintError::Unknown {
+                    code: code.to_string(),
+                    suggestion,
+                })
             }
         }
     }
@@ -415,25 +421,45 @@ impl LintRegistry {
     }
 }
 
-#[derive(Error, Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
 pub enum GetLintError {
     /// The name maps to this removed lint.
-    #[error("lint `{0}` has been removed")]
     Removed(LintName),
 
     /// No lint with the given name is known.
-    #[error("unknown lint `{0}`")]
-    Unknown(String),
+    Unknown {
+        code: String,
+        suggestion: Option<String>,
+    },
 
     /// The name uses the full qualified diagnostic id `lint:<rule>` instead of just `rule`.
     /// The String is the name without the `lint:` category prefix.
-    #[error("unknown lint `{prefixed}`. Did you mean `{suggestion}`?")]
     PrefixedWithCategory {
         prefixed: String,
         suggestion: String,
     },
 }
 
+impl Error for GetLintError {}
+
+impl std::fmt::Display for GetLintError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            GetLintError::Removed(code) => write!(f, "Removed rule `{code}`"),
+            GetLintError::Unknown { code, suggestion } => match suggestion {
+                None => write!(f, "Unknown rule `{code}`"),
+                Some(suggestion) => {
+                    write!(f, "Unknown rule `{code}`. Did you mean `{suggestion}`?")
+                }
+            },
+            GetLintError::PrefixedWithCategory {
+                prefixed,
+                suggestion,
+            } => write!(f, "Unknown rule `{prefixed}`. Did you mean `{suggestion}`?"),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum LintEntry {
     /// An existing lint rule. Can be in preview, stable or deprecated.
@@ -463,7 +489,7 @@ impl From<&'static LintMetadata> for LintEntry {
     }
 }
 
-#[derive(Debug, Clone, Default, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Clone, Default, PartialEq, Eq, get_size2::GetSize)]
 pub struct RuleSelection {
     /// Map with the severity for each enabled lint rule.
     ///
@@ -541,6 +567,35 @@ impl RuleSelection {
     }
 }
 
+// The default `LintId` debug implementation prints the entire lint metadata.
+// This is way too verbose.
+impl fmt::Debug for RuleSelection {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let lints = self.lints.iter().sorted_by_key(|(lint, _)| lint.name);
+
+        if f.alternate() {
+            let mut f = f.debug_map();
+
+            for (lint, (severity, source)) in lints {
+                f.entry(
+                    &lint.name().as_str(),
+                    &format_args!("{severity:?} ({source:?})"),
+                );
+            }
+
+            f.finish()
+        } else {
+            let mut f = f.debug_set();
+
+            for (lint, _) in lints {
+                f.entry(&lint.name());
+            }
+
+            f.finish()
+        }
+    }
+}
+
 #[derive(Default, Copy, Clone, Debug, PartialEq, Eq, get_size2::GetSize)]
 pub enum LintSource {
     /// The user didn't enable the rule explicitly, instead it's enabled by default.
diff --git a/crates/ty_python_semantic/src/module_name.rs b/crates/ty_python_semantic/src/module_name.rs
index df7ae09e2a..e1aa4509bd 100644
--- a/crates/ty_python_semantic/src/module_name.rs
+++ b/crates/ty_python_semantic/src/module_name.rs
@@ -273,7 +273,14 @@ impl ModuleName {
         std::iter::successors(Some(self.clone()), Self::parent)
     }
 
-    pub(crate) fn from_import_statement<'db>(
+    /// Extracts a module name from the AST of a `from <module> import ...`
+    /// statement.
+    ///
+    /// `importing_file` must be the [`File`] that contains the import
+    /// statement.
+    ///
+    /// This handles relative import statements.
+    pub fn from_import_statement<'db>(
         db: &'db dyn Db,
         importing_file: File,
         node: &'db ast::StmtImportFrom,
@@ -372,7 +379,7 @@ fn relative_module_name(
 /// Various ways in which resolving a [`ModuleName`]
 /// from an [`ast::StmtImport`] or [`ast::StmtImportFrom`] node might fail
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub(crate) enum ModuleNameResolutionError {
+pub enum ModuleNameResolutionError {
     /// The import statement has invalid syntax
     InvalidSyntax,
 
diff --git a/crates/ty_python_semantic/src/module_resolver/list.rs b/crates/ty_python_semantic/src/module_resolver/list.rs
index 2374a24212..a7957e3c98 100644
--- a/crates/ty_python_semantic/src/module_resolver/list.rs
+++ b/crates/ty_python_semantic/src/module_resolver/list.rs
@@ -12,6 +12,20 @@ use super::resolver::{
     ModuleResolveMode, ResolverContext, is_non_shadowable, resolve_file_module, search_paths,
 };
 
+/// List all available modules, including all sub-modules, sorted in lexicographic order.
+pub fn all_modules(db: &dyn Db) -> Vec<Module<'_>> {
+    let mut modules = list_modules(db);
+    let mut stack = modules.clone();
+    while let Some(module) = stack.pop() {
+        for &submodule in module.all_submodules(db) {
+            modules.push(submodule);
+            stack.push(submodule);
+        }
+    }
+    modules.sort_by_key(|module| module.name(db));
+    modules
+}
+
 /// List all available top-level modules.
 #[salsa::tracked]
 pub fn list_modules(db: &dyn Db) -> Vec<Module<'_>> {
@@ -51,6 +65,7 @@ fn list_modules_in<'db>(
     db: &'db dyn Db,
     search_path: SearchPathIngredient<'db>,
 ) -> Vec<Module<'db>> {
+    tracing::debug!("Listing modules in search path '{}'", search_path.path(db));
     let mut lister = Lister::new(db, search_path.path(db));
     match search_path.path(db).as_path() {
         SystemOrVendoredPathRef::System(system_search_path) => {
@@ -58,10 +73,7 @@ fn list_modules_in<'db>(
             // register an explicit dependency on this directory. When
             // the revision gets bumped, the cache that Salsa creates
             // for this routine will be invalidated.
-            let root = db
-                .files()
-                .root(db, system_search_path)
-                .expect("System search path should have a registered root");
+            let root = db.files().expect_root(db, system_search_path);
             let _ = root.revision(db);
 
             let Ok(it) = db.system().read_directory(system_search_path) else {
@@ -363,6 +375,11 @@ fn is_python_extension(ext: &str) -> bool {
 
 #[cfg(test)]
 mod tests {
+    #![expect(
+        clippy::disallowed_methods,
+        reason = "These are tests, so it's fine to do I/O by-passing System."
+    )]
+
     use camino::{Utf8Component, Utf8Path};
     use ruff_db::Db as _;
     use ruff_db::files::{File, FilePath, FileRootKind};
@@ -950,10 +967,6 @@ mod tests {
         std::os::unix::fs::symlink(foo.as_std_path(), bar.as_std_path())?;
 
         db.files().try_add_root(&db, &src, FileRootKind::Project);
-        db.files()
-            .try_add_root(&db, &site_packages, FileRootKind::LibrarySearchPath);
-        db.files()
-            .try_add_root(&db, &custom_typeshed, FileRootKind::LibrarySearchPath);
 
         Program::from_settings(
             &db,
@@ -1449,6 +1462,55 @@ not_a_directory
         );
     }
 
+    #[test]
+    fn editable_installs_into_first_party_search_path() {
+        let mut db = TestDb::new();
+
+        let src = SystemPath::new("/src");
+        let venv_site_packages = SystemPathBuf::from("/venv-site-packages");
+        let site_packages_pth = venv_site_packages.join("foo.pth");
+        let editable_install_location = src.join("x/y/a.py");
+
+        db.write_files([
+            (&site_packages_pth, "/src/x/y/"),
+            (&editable_install_location, ""),
+        ])
+        .unwrap();
+
+        db.files()
+            .try_add_root(&db, SystemPath::new("/src"), FileRootKind::Project);
+
+        Program::from_settings(
+            &db,
+            ProgramSettings {
+                python_version: PythonVersionWithSource::default(),
+                python_platform: PythonPlatform::default(),
+                search_paths: SearchPathSettings {
+                    site_packages_paths: vec![venv_site_packages],
+                    ..SearchPathSettings::new(vec![src.to_path_buf()])
+                }
+                .to_search_paths(db.system(), db.vendored())
+                .expect("Valid search path settings"),
+            },
+        );
+
+        insta::assert_debug_snapshot!(
+            list_snapshot_filter(&db, |m| m.name(&db).as_str() == "a"),
+            @r#"
+        [
+            Module::File("a", "editable", "/src/x/y/a.py", Module, None),
+        ]
+        "#,
+        );
+
+        let editable_root = db
+            .files()
+            .root(&db, &editable_install_location)
+            .expect("file root for editable install");
+
+        assert_eq!(editable_root.path(&db), src);
+    }
+
     #[test]
     fn multiple_site_packages_with_editables() {
         let mut db = TestDb::new();
@@ -1471,12 +1533,6 @@ not_a_directory
 
         db.files()
             .try_add_root(&db, SystemPath::new("/src"), FileRootKind::Project);
-        db.files()
-            .try_add_root(&db, &venv_site_packages, FileRootKind::LibrarySearchPath);
-        db.files()
-            .try_add_root(&db, &system_site_packages, FileRootKind::LibrarySearchPath);
-        db.files()
-            .try_add_root(&db, SystemPath::new("/x"), FileRootKind::LibrarySearchPath);
 
         Program::from_settings(
             &db,
@@ -1606,8 +1662,6 @@ not_a_directory
 
         db.files()
             .try_add_root(&db, &project_directory, FileRootKind::Project);
-        db.files()
-            .try_add_root(&db, &site_packages, FileRootKind::LibrarySearchPath);
 
         Program::from_settings(
             &db,
@@ -1746,4 +1800,45 @@ not_a_directory
         "#,
         );
     }
+
+    /// This is a regression test for mishandling of file root matching.
+    ///
+    /// In particular, in some cases, `/` is added as a search root. This
+    /// should in turn match everything. But the way we were setting up the
+    /// wildcard for matching was incorrect for this one specific case. That in
+    /// turn meant that the module resolver couldn't find an appropriate file
+    /// root which in turn caused a panic.
+    ///
+    /// See: <https://github.com/astral-sh/ty/issues/1277>
+    #[test]
+    fn root_directory_for_search_path_is_okay() {
+        let project_directory = SystemPathBuf::from("/project");
+        let installed_foo_module = project_directory.join("foo/__init__.py");
+
+        let mut db = TestDb::new();
+        db.write_file(&installed_foo_module, "").unwrap();
+
+        db.files()
+            .try_add_root(&db, SystemPath::new("/"), FileRootKind::Project);
+
+        Program::from_settings(
+            &db,
+            ProgramSettings {
+                python_version: PythonVersionWithSource::default(),
+                python_platform: PythonPlatform::default(),
+                search_paths: SearchPathSettings::new(vec![project_directory])
+                    .to_search_paths(db.system(), db.vendored())
+                    .unwrap(),
+            },
+        );
+
+        insta::assert_debug_snapshot!(
+            list_snapshot_filter(&db, |m| m.name(&db).as_str() == "foo"),
+            @r#"
+        [
+            Module::File("foo", "first-party", "/project/foo/__init__.py", Package, None),
+        ]
+        "#,
+        );
+    }
 }
diff --git a/crates/ty_python_semantic/src/module_resolver/mod.rs b/crates/ty_python_semantic/src/module_resolver/mod.rs
index 901adbf4ef..9beec6b385 100644
--- a/crates/ty_python_semantic/src/module_resolver/mod.rs
+++ b/crates/ty_python_semantic/src/module_resolver/mod.rs
@@ -1,6 +1,6 @@
 use std::iter::FusedIterator;
 
-pub use list::list_modules;
+pub use list::{all_modules, list_modules};
 pub(crate) use module::KnownModule;
 pub use module::Module;
 pub use path::{SearchPath, SearchPathValidationError};
@@ -10,8 +10,7 @@ pub use resolver::{resolve_module, resolve_real_module};
 use ruff_db::system::SystemPath;
 
 use crate::Db;
-use crate::module_resolver::resolver::{ModuleResolveMode, search_paths};
-use resolver::SearchPathIterator;
+pub(crate) use resolver::{ModuleResolveMode, SearchPathIterator, search_paths};
 
 mod list;
 mod module;
diff --git a/crates/ty_python_semantic/src/module_resolver/module.rs b/crates/ty_python_semantic/src/module_resolver/module.rs
index a7d50829b0..1a17ac2d2c 100644
--- a/crates/ty_python_semantic/src/module_resolver/module.rs
+++ b/crates/ty_python_semantic/src/module_resolver/module.rs
@@ -1,9 +1,9 @@
 use std::fmt::Formatter;
 use std::str::FromStr;
 
-use ruff_db::files::File;
-use ruff_python_ast::name::Name;
-use ruff_python_stdlib::identifiers::is_identifier;
+use ruff_db::files::{File, system_path_to_file, vendored_path_to_file};
+use ruff_db::system::SystemPath;
+use ruff_db::vendored::VendoredPath;
 use salsa::Database;
 use salsa::plumbing::AsId;
 
@@ -97,23 +97,10 @@ impl<'db> Module<'db> {
     ///
     /// The names returned correspond to the "base" name of the module.
     /// That is, `{self.name}.{basename}` should give the full module name.
-    pub fn all_submodules(self, db: &'db dyn Db) -> &'db [Name] {
-        self.all_submodules_inner(db).unwrap_or_default()
-    }
-
-    fn all_submodules_inner(self, db: &'db dyn Db) -> Option<&'db [Name]> {
-        // It would be complex and expensive to compute all submodules for
-        // namespace packages, since a namespace package doesn't correspond
-        // to a single file; it can span multiple directories across multiple
-        // search paths. For now, we only compute submodules for traditional
-        // packages that exist in a single directory on a single search path.
-        let Module::File(module) = self else {
-            return None;
-        };
-        if !matches!(module.kind(db), ModuleKind::Package) {
-            return None;
-        }
-        all_submodule_names_for_package(db, module.file(db)).as_deref()
+    pub fn all_submodules(self, db: &'db dyn Db) -> &'db [Module<'db>] {
+        all_submodule_names_for_package(db, self)
+            .as_deref()
+            .unwrap_or_default()
     }
 }
 
@@ -134,7 +121,10 @@ impl std::fmt::Debug for Module<'_> {
 
 #[allow(clippy::ref_option)]
 #[salsa::tracked(returns(ref))]
-fn all_submodule_names_for_package(db: &dyn Db, file: File) -> Option<Vec<Name>> {
+fn all_submodule_names_for_package<'db>(
+    db: &'db dyn Db,
+    module: Module<'db>,
+) -> Option<Vec<Module<'db>>> {
     fn is_submodule(
         is_dir: bool,
         is_file: bool,
@@ -147,7 +137,31 @@ fn all_submodule_names_for_package(db: &dyn Db, file: File) -> Option<Vec<Name>>
                 && !matches!(basename, Some("__init__.py" | "__init__.pyi")))
     }
 
-    let path = SystemOrVendoredPathRef::try_from_file(db, file)?;
+    fn find_package_init_system(db: &dyn Db, dir: &SystemPath) -> Option<File> {
+        system_path_to_file(db, dir.join("__init__.pyi"))
+            .or_else(|_| system_path_to_file(db, dir.join("__init__.py")))
+            .ok()
+    }
+
+    fn find_package_init_vendored(db: &dyn Db, dir: &VendoredPath) -> Option<File> {
+        vendored_path_to_file(db, dir.join("__init__.pyi"))
+            .or_else(|_| vendored_path_to_file(db, dir.join("__init__.py")))
+            .ok()
+    }
+
+    // It would be complex and expensive to compute all submodules for
+    // namespace packages, since a namespace package doesn't correspond
+    // to a single file; it can span multiple directories across multiple
+    // search paths. For now, we only compute submodules for traditional
+    // packages that exist in a single directory on a single search path.
+    let Module::File(module) = module else {
+        return None;
+    };
+    if !matches!(module.kind(db), ModuleKind::Package) {
+        return None;
+    }
+
+    let path = SystemOrVendoredPathRef::try_from_file(db, module.file(db))?;
     debug_assert!(
         matches!(path.file_name(), Some("__init__.py" | "__init__.pyi")),
         "expected package file `{:?}` to be `__init__.py` or `__init__.pyi`",
@@ -161,9 +175,8 @@ fn all_submodule_names_for_package(db: &dyn Db, file: File) -> Option<Vec<Name>>
             // tree. When the revision gets bumped, the cache
             // that Salsa creates does for this routine will be
             // invalidated.
-            if let Some(root) = db.files().root(db, parent_directory) {
-                let _ = root.revision(db);
-            }
+            let root = db.files().expect_root(db, parent_directory);
+            let _ = root.revision(db);
 
             db.system()
                 .read_directory(parent_directory)
@@ -187,7 +200,25 @@ fn all_submodule_names_for_package(db: &dyn Db, file: File) -> Option<Vec<Name>>
                 })
                 .filter_map(|entry| {
                     let stem = entry.path().file_stem()?;
-                    is_identifier(stem).then(|| Name::from(stem))
+                    let mut name = module.name(db).clone();
+                    name.extend(&ModuleName::new(stem)?);
+
+                    let (kind, file) = if entry.file_type().is_directory() {
+                        (
+                            ModuleKind::Package,
+                            find_package_init_system(db, entry.path())?,
+                        )
+                    } else {
+                        let file = system_path_to_file(db, entry.path()).ok()?;
+                        (ModuleKind::Module, file)
+                    };
+                    Some(Module::file_module(
+                        db,
+                        name,
+                        kind,
+                        module.search_path(db).clone(),
+                        file,
+                    ))
                 })
                 .collect()
         }
@@ -207,7 +238,25 @@ fn all_submodule_names_for_package(db: &dyn Db, file: File) -> Option<Vec<Name>>
             })
             .filter_map(|entry| {
                 let stem = entry.path().file_stem()?;
-                is_identifier(stem).then(|| Name::from(stem))
+                let mut name = module.name(db).clone();
+                name.extend(&ModuleName::new(stem)?);
+
+                let (kind, file) = if entry.file_type().is_directory() {
+                    (
+                        ModuleKind::Package,
+                        find_package_init_vendored(db, entry.path())?,
+                    )
+                } else {
+                    let file = vendored_path_to_file(db, entry.path()).ok()?;
+                    (ModuleKind::Module, file)
+                };
+                Some(Module::file_module(
+                    db,
+                    name,
+                    kind,
+                    module.search_path(db).clone(),
+                    file,
+                ))
             })
             .collect(),
     })
@@ -266,10 +315,15 @@ pub enum KnownModule {
     TypingExtensions,
     Typing,
     Sys,
+    Os,
+    Tempfile,
+    Pathlib,
     Abc,
     Dataclasses,
     Collections,
     Inspect,
+    #[strum(serialize = "string.templatelib")]
+    Templatelib,
     #[strum(serialize = "_typeshed._type_checker_internals")]
     TypeCheckerInternals,
     TyExtensions,
@@ -293,6 +347,9 @@ impl KnownModule {
             Self::Typeshed => "_typeshed",
             Self::TypingExtensions => "typing_extensions",
             Self::Sys => "sys",
+            Self::Os => "os",
+            Self::Tempfile => "tempfile",
+            Self::Pathlib => "pathlib",
             Self::Abc => "abc",
             Self::Dataclasses => "dataclasses",
             Self::Collections => "collections",
@@ -305,6 +362,7 @@ impl KnownModule {
             Self::UnittestMock => "unittest.mock",
             #[cfg(test)]
             Self::Uuid => "uuid",
+            Self::Templatelib => "string.templatelib",
         }
     }
 
diff --git a/crates/ty_python_semantic/src/module_resolver/path.rs b/crates/ty_python_semantic/src/module_resolver/path.rs
index 9a697f27f1..cb524cb4ac 100644
--- a/crates/ty_python_semantic/src/module_resolver/path.rs
+++ b/crates/ty_python_semantic/src/module_resolver/path.rs
@@ -700,6 +700,25 @@ impl SearchPath {
             SearchPathInner::StandardLibraryVendored(_) => "std-vendored",
         }
     }
+
+    /// Returns a string suitable for describing what kind of search path this is
+    /// in user-facing diagnostics.
+    #[must_use]
+    pub(crate) fn describe_kind(&self) -> &'static str {
+        match *self.0 {
+            SearchPathInner::Extra(_) => {
+                "extra search path specified on the CLI or in your config file"
+            }
+            SearchPathInner::FirstParty(_) => "first-party code",
+            SearchPathInner::StandardLibraryCustom(_) => {
+                "custom stdlib stubs specified on the CLI or in your config file"
+            }
+            SearchPathInner::StandardLibraryReal(_) => "runtime stdlib source code",
+            SearchPathInner::SitePackages(_) => "site-packages",
+            SearchPathInner::Editable(_) => "editable install",
+            SearchPathInner::StandardLibraryVendored(_) => "stdlib typeshed stubs vendored by ty",
+        }
+    }
 }
 
 impl PartialEq<SystemPath> for SearchPath {
diff --git a/crates/ty_python_semantic/src/module_resolver/resolver.rs b/crates/ty_python_semantic/src/module_resolver/resolver.rs
index 6779a76042..0787859049 100644
--- a/crates/ty_python_semantic/src/module_resolver/resolver.rs
+++ b/crates/ty_python_semantic/src/module_resolver/resolver.rs
@@ -19,7 +19,10 @@ use rustc_hash::{FxBuildHasher, FxHashSet};
 use ruff_db::files::{File, FilePath, FileRootKind};
 use ruff_db::system::{DirectoryEntry, System, SystemPath, SystemPathBuf};
 use ruff_db::vendored::VendoredFileSystem;
-use ruff_python_ast::PythonVersion;
+use ruff_python_ast::{
+    self as ast, PySourceType, PythonVersion,
+    visitor::{Visitor, walk_body},
+};
 
 use crate::db::Db;
 use crate::module_name::ModuleName;
@@ -155,17 +158,27 @@ pub(crate) fn file_to_module(db: &dyn Db, file: File) -> Option<Module<'_>> {
     let module_file = module.file(db)?;
 
     if file.path(db) == module_file.path(db) {
-        Some(module)
-    } else {
-        // This path is for a module with the same name but with a different precedence. For example:
-        // ```
-        // src/foo.py
-        // src/foo/__init__.py
-        // ```
-        // The module name of `src/foo.py` is `foo`, but the module loaded by Python is `src/foo/__init__.py`.
-        // That means we need to ignore `src/foo.py` even though it resolves to the same module name.
-        None
+        return Some(module);
+    } else if file.source_type(db) == PySourceType::Python
+        && module_file.source_type(db) == PySourceType::Stub
+    {
+        // If a .py and .pyi are both defined, the .pyi will be the one returned by `resolve_module().file`,
+        // which would make us erroneously believe the `.py` is *not* also this module (breaking things
+        // like relative imports). So here we try `resolve_real_module().file` to cover both cases.
+        let module = resolve_real_module(db, &module_name)?;
+        let module_file = module.file(db)?;
+        if file.path(db) == module_file.path(db) {
+            return Some(module);
+        }
     }
+    // This path is for a module with the same name but with a different precedence. For example:
+    // ```
+    // src/foo.py
+    // src/foo/__init__.py
+    // ```
+    // The module name of `src/foo.py` is `foo`, but the module loaded by Python is `src/foo/__init__.py`.
+    // That means we need to ignore `src/foo.py` even though it resolves to the same module name.
+    None
 }
 
 pub(crate) fn search_paths(db: &dyn Db, resolve_mode: ModuleResolveMode) -> SearchPathIterator<'_> {
@@ -338,9 +351,15 @@ impl SearchPaths {
         })
     }
 
+    /// Registers the file roots for all non-dynamically discovered search paths that aren't first-party.
     pub(crate) fn try_register_static_roots(&self, db: &dyn Db) {
         let files = db.files();
-        for path in self.static_paths.iter().chain(self.site_packages.iter()) {
+        for path in self
+            .static_paths
+            .iter()
+            .chain(self.site_packages.iter())
+            .chain(&self.stdlib_path)
+        {
             if let Some(system_path) = path.as_system_path() {
                 if !path.is_first_party() {
                     files.try_add_root(db, system_path, FileRootKind::LibrarySearchPath);
@@ -441,9 +460,7 @@ pub(crate) fn dynamic_resolution_paths<'db>(
             continue;
         }
 
-        let site_packages_root = files
-            .root(db, &site_packages_dir)
-            .expect("Site-package root to have been created");
+        let site_packages_root = files.expect_root(db, &site_packages_dir);
 
         // This query needs to be re-executed each time a `.pth` file
         // is added, modified or removed from the `site-packages` directory.
@@ -490,6 +507,23 @@ pub(crate) fn dynamic_resolution_paths<'db>(
                             "Adding editable installation to module resolution path {path}",
                             path = installation
                         );
+
+                        // Register a file root for editable installs that are outside any other root
+                        // (Most importantly, don't register a root for editable installations from the project
+                        // directory as that would change the durability of files within those folders).
+                        // Not having an exact file root for editable installs just means that
+                        // some queries (like `list_modules_in`) will run slightly more frequently
+                        // than they would otherwise.
+                        if let Some(dynamic_path) = search_path.as_system_path() {
+                            if files.root(db, dynamic_path).is_none() {
+                                files.try_add_root(
+                                    db,
+                                    dynamic_path,
+                                    FileRootKind::LibrarySearchPath,
+                                );
+                            }
+                        }
+
                         dynamic_paths.push(search_path);
                     }
 
@@ -656,11 +690,15 @@ struct ModuleNameIngredient<'db> {
 /// Returns `true` if the module name refers to a standard library module which can't be shadowed
 /// by a first-party module.
 ///
-/// This includes "builtin" modules, which can never be shadowed at runtime either, as well as the
-/// `types` module, which tends to be imported early in Python startup, so can't be consistently
-/// shadowed, and is important to type checking.
+/// This includes "builtin" modules, which can never be shadowed at runtime either, as well as
+/// certain other modules that are involved in an import cycle with `builtins` (`types`,
+/// `typing_extensions`, etc.). This latter set of modules cannot be allowed to be shadowed by
+/// first-party or "extra-path" modules, or we risk panics in unexpected places due to being
+/// unable to resolve builtin symbols. This is similar behaviour to other type checkers such
+/// as mypy: <https://github.com/python/mypy/blob/3807423e9d98e678bf16b13ec8b4f909fe181908/mypy/build.py#L104-L117>
 pub(super) fn is_non_shadowable(minor_version: u8, module_name: &str) -> bool {
-    module_name == "types" || ruff_python_stdlib::sys::is_builtin_module(minor_version, module_name)
+    matches!(module_name, "types" | "typing_extensions")
+        || ruff_python_stdlib::sys::is_builtin_module(minor_version, module_name)
 }
 
 /// Given a module name and a list of search paths in which to lookup modules,
@@ -967,7 +1005,12 @@ where
         let is_regular_package = package_path.is_regular_package(resolver_state);
 
         if is_regular_package {
-            in_namespace_package = false;
+            // This is the only place where we need to consider the existence of legacy namespace
+            // packages, as we are explicitly searching for the *parent* package of the module
+            // we actually want. Here, such a package should be treated as a PEP-420 ("modern")
+            // namespace package. In all other contexts it acts like a normal package and needs
+            // no special handling.
+            in_namespace_package = is_legacy_namespace_package(&package_path, resolver_state);
         } else if package_path.is_directory(resolver_state)
             // Pure modules hide namespace packages with the same name
             && resolve_file_module(&package_path, resolver_state).is_none()
@@ -1004,6 +1047,62 @@ where
     })
 }
 
+/// Determines whether a package is a legacy namespace package.
+///
+/// Before PEP 420 introduced implicit namespace packages, the ecosystem developed
+/// its own form of namespace packages. These legacy namespace packages continue to persist
+/// in modern codebases because they work with ancient Pythons and if it ain't broke, don't fix it.
+///
+/// A legacy namespace package is distinguished by having an `__init__.py` that contains an
+/// expression to the effect of:
+///
+/// ```python
+/// __path__ = __import__("pkgutil").extend_path(__path__, __name__)
+/// ```
+///
+/// The resulting package simultaneously has properties of both regular packages and namespace ones:
+///
+/// * Like regular packages, `__init__.py` is defined and can contain items other than submodules
+/// * Like implicit namespace packages, multiple copies of the package may exist with different
+///   submodules, and they will be merged into one namespace at runtime by the interpreter
+///
+/// Now, you may rightly wonder: "What if the `__init__.py` files have different contents?"
+/// The apparent official answer is: "Don't do that!"
+/// And the reality is: "Of course people do that!"
+///
+/// In practice we think it's fine to, just like with regular packages, use the first one
+/// we find on the search paths. To the extent that the different copies "need" to have the same
+/// contents, they all "need" to have the legacy namespace idiom (we do nothing to enforce that,
+/// we will just get confused if you mess it up).
+fn is_legacy_namespace_package(
+    package_path: &ModulePath,
+    resolver_state: &ResolverContext,
+) -> bool {
+    // Just an optimization, the stdlib and typeshed are never legacy namespace packages
+    if package_path.search_path().is_standard_library() {
+        return false;
+    }
+
+    let mut package_path = package_path.clone();
+    package_path.push("__init__");
+    let Some(init) = resolve_file_module(&package_path, resolver_state) else {
+        return false;
+    };
+
+    // This is all syntax-only analysis so it *could* be fooled but it's really unlikely.
+    //
+    // The benefit of being syntax-only is speed and avoiding circular dependencies
+    // between module resolution and semantic analysis.
+    //
+    // The downside is if you write slightly different syntax we will fail to detect the idiom,
+    // but hey, this is better than nothing!
+    let parsed = ruff_db::parsed::parsed_module(resolver_state.db, init);
+    let mut visitor = LegacyNamespacePackageVisitor::default();
+    visitor.visit_body(parsed.load(resolver_state.db).suite());
+
+    visitor.is_legacy_namespace_package
+}
+
 #[derive(Debug)]
 struct ResolvedPackage {
     path: ModulePath,
@@ -1113,8 +1212,130 @@ impl fmt::Display for RelaxedModuleName {
     }
 }
 
+/// Detects if a module contains a statement of the form:
+/// ```python
+/// __path__ = pkgutil.extend_path(__path__, __name__)
+/// ```
+/// or
+/// ```python
+/// __path__ = __import__("pkgutil").extend_path(__path__, __name__)
+/// ```
+#[derive(Default)]
+struct LegacyNamespacePackageVisitor {
+    is_legacy_namespace_package: bool,
+    in_body: bool,
+}
+
+impl Visitor<'_> for LegacyNamespacePackageVisitor {
+    fn visit_body(&mut self, body: &[ruff_python_ast::Stmt]) {
+        if self.is_legacy_namespace_package {
+            return;
+        }
+
+        // Don't traverse into nested bodies.
+        if self.in_body {
+            return;
+        }
+
+        self.in_body = true;
+
+        walk_body(self, body);
+    }
+
+    fn visit_stmt(&mut self, stmt: &ast::Stmt) {
+        if self.is_legacy_namespace_package {
+            return;
+        }
+
+        let ast::Stmt::Assign(ast::StmtAssign { value, targets, .. }) = stmt else {
+            return;
+        };
+
+        let [ast::Expr::Name(maybe_path)] = &**targets else {
+            return;
+        };
+
+        if &*maybe_path.id != "__path__" {
+            return;
+        }
+
+        let ast::Expr::Call(ast::ExprCall {
+            func: extend_func,
+            arguments: extend_arguments,
+            ..
+        }) = &**value
+        else {
+            return;
+        };
+
+        let ast::Expr::Attribute(ast::ExprAttribute {
+            value: maybe_pkg_util,
+            attr: maybe_extend_path,
+            ..
+        }) = &**extend_func
+        else {
+            return;
+        };
+
+        // Match if the left side of the attribute access is either `__import__("pkgutil")` or `pkgutil`
+        match &**maybe_pkg_util {
+            // __import__("pkgutil").extend_path(__path__, __name__)
+            ast::Expr::Call(ruff_python_ast::ExprCall {
+                func: maybe_import,
+                arguments: import_arguments,
+                ..
+            }) => {
+                let ast::Expr::Name(maybe_import) = &**maybe_import else {
+                    return;
+                };
+
+                if maybe_import.id() != "__import__" {
+                    return;
+                }
+
+                let Some(ast::Expr::StringLiteral(name)) =
+                    import_arguments.find_argument_value("name", 0)
+                else {
+                    return;
+                };
+
+                if name.value.to_str() != "pkgutil" {
+                    return;
+                }
+            }
+            // "pkgutil.extend_path(__path__, __name__)"
+            ast::Expr::Name(name) => {
+                if name.id() != "pkgutil" {
+                    return;
+                }
+            }
+            _ => {
+                return;
+            }
+        }
+
+        // Test that this is an `extend_path(__path__, __name__)` call
+        if maybe_extend_path != "extend_path" {
+            return;
+        }
+
+        let Some(ast::Expr::Name(path)) = extend_arguments.find_argument_value("path", 0) else {
+            return;
+        };
+        let Some(ast::Expr::Name(name)) = extend_arguments.find_argument_value("name", 1) else {
+            return;
+        };
+
+        self.is_legacy_namespace_package = path.id() == "__path__" && name.id() == "__name__";
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    #![expect(
+        clippy::disallowed_methods,
+        reason = "These are tests, so it's fine to do I/O by-passing System."
+    )]
     use ruff_db::Db;
     use ruff_db::files::{File, FilePath, system_path_to_file};
     use ruff_db::system::{DbWithTestSystem as _, DbWithWritableSystem as _};
@@ -1572,6 +1793,7 @@ mod tests {
         let TestCase { db, src, .. } = TestCaseBuilder::new().with_src_files(SRC).build();
 
         let foo = resolve_module(&db, &ModuleName::new_static("foo").unwrap()).unwrap();
+        let foo_real = resolve_real_module(&db, &ModuleName::new_static("foo").unwrap()).unwrap();
         let foo_stub = src.join("foo.pyi");
 
         assert_eq!(&src, foo.search_path(&db).unwrap());
@@ -1579,9 +1801,10 @@ mod tests {
 
         assert_eq!(Some(foo), path_to_module(&db, &FilePath::System(foo_stub)));
         assert_eq!(
-            None,
+            Some(foo_real),
             path_to_module(&db, &FilePath::System(src.join("foo.py")))
         );
+        assert!(foo_real != foo);
     }
 
     #[test]
diff --git a/crates/ty_python_semantic/src/module_resolver/typeshed.rs b/crates/ty_python_semantic/src/module_resolver/typeshed.rs
index 5b67ae3c77..17b85397b4 100644
--- a/crates/ty_python_semantic/src/module_resolver/typeshed.rs
+++ b/crates/ty_python_semantic/src/module_resolver/typeshed.rs
@@ -304,6 +304,11 @@ impl fmt::Display for PyVersionRange {
 
 #[cfg(test)]
 mod tests {
+    #![expect(
+        clippy::disallowed_methods,
+        reason = "These are tests, so it's fine to do I/O by-passing System."
+    )]
+
     use std::fmt::Write as _;
     use std::num::{IntErrorKind, NonZeroU16};
     use std::path::Path;
diff --git a/crates/ty_python_semantic/src/node_key.rs b/crates/ty_python_semantic/src/node_key.rs
index 18edfe1a04..a93931294b 100644
--- a/crates/ty_python_semantic/src/node_key.rs
+++ b/crates/ty_python_semantic/src/node_key.rs
@@ -1,5 +1,7 @@
 use ruff_python_ast::{HasNodeIndex, NodeIndex};
 
+use crate::ast_node_ref::AstNodeRef;
+
 /// Compact key for a node for use in a hash map.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, get_size2::GetSize)]
 pub(super) struct NodeKey(NodeIndex);
@@ -11,4 +13,8 @@ impl NodeKey {
     {
         NodeKey(node.node_index().load())
     }
+
+    pub(super) fn from_node_ref<T>(node_ref: &AstNodeRef<T>) -> Self {
+        NodeKey(node_ref.index())
+    }
 }
diff --git a/crates/ty_python_semantic/src/place.rs b/crates/ty_python_semantic/src/place.rs
index 41fc651dc1..99804ae5c8 100644
--- a/crates/ty_python_semantic/src/place.rs
+++ b/crates/ty_python_semantic/src/place.rs
@@ -10,8 +10,9 @@ use crate::semantic_index::{
 };
 use crate::semantic_index::{DeclarationWithConstraint, global_scope, use_def_map};
 use crate::types::{
-    DynamicType, KnownClass, Truthiness, Type, TypeAndQualifiers, TypeQualifiers, UnionBuilder,
-    UnionType, binding_type, declaration_type, todo_type,
+    ApplyTypeMappingVisitor, DynamicType, KnownClass, MaterializationKind, Truthiness, Type,
+    TypeAndQualifiers, TypeQualifiers, UnionBuilder, UnionType, binding_type, declaration_type,
+    todo_type,
 };
 use crate::{Db, FxOrderSet, Program, resolve_module};
 
@@ -20,83 +21,127 @@ pub(crate) use implicit_globals::{
 };
 
 #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, get_size2::GetSize)]
-pub(crate) enum Boundness {
-    Bound,
-    PossiblyUnbound,
+pub(crate) enum Definedness {
+    AlwaysDefined,
+    PossiblyUndefined,
 }
 
-impl Boundness {
+impl Definedness {
     pub(crate) const fn max(self, other: Self) -> Self {
         match (self, other) {
-            (Boundness::Bound, _) | (_, Boundness::Bound) => Boundness::Bound,
-            (Boundness::PossiblyUnbound, Boundness::PossiblyUnbound) => Boundness::PossiblyUnbound,
+            (Definedness::AlwaysDefined, _) | (_, Definedness::AlwaysDefined) => {
+                Definedness::AlwaysDefined
+            }
+            (Definedness::PossiblyUndefined, Definedness::PossiblyUndefined) => {
+                Definedness::PossiblyUndefined
+            }
         }
     }
 }
 
-/// The result of a place lookup, which can either be a (possibly unbound) type
-/// or a completely unbound place.
+#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, get_size2::GetSize)]
+pub(crate) enum TypeOrigin {
+    Declared,
+    Inferred,
+}
+
+impl TypeOrigin {
+    pub(crate) const fn is_declared(self) -> bool {
+        matches!(self, TypeOrigin::Declared)
+    }
+
+    pub(crate) const fn merge(self, other: Self) -> Self {
+        match (self, other) {
+            (TypeOrigin::Declared, TypeOrigin::Declared) => TypeOrigin::Declared,
+            _ => TypeOrigin::Inferred,
+        }
+    }
+}
+
+/// The result of a place lookup, which can either be a (possibly undefined) type
+/// or a completely undefined place.
+///
+/// If a place has both a binding and a declaration, the result of the binding is used.
 ///
 /// Consider this example:
 /// ```py
 /// bound = 1
+/// declared: int
 ///
 /// if flag:
 ///     possibly_unbound = 2
+///     possibly_undeclared: int
+///
+/// if flag:
+///     bound_or_declared = 1
+/// else:
+///     bound_or_declared: int
 /// ```
 ///
 /// If we look up places in this scope, we would get the following results:
 /// ```rs
-/// bound:             Place::Type(Type::IntLiteral(1), Boundness::Bound),
-/// possibly_unbound:  Place::Type(Type::IntLiteral(2), Boundness::PossiblyUnbound),
-/// non_existent:      Place::Unbound,
+/// bound:               Place::Defined(Literal[1], TypeOrigin::Inferred, Definedness::AlwaysDefined),
+/// declared:            Place::Defined(int, TypeOrigin::Declared, Definedness::AlwaysDefined),
+/// possibly_unbound:    Place::Defined(Literal[2], TypeOrigin::Inferred, Definedness::PossiblyUndefined),
+/// possibly_undeclared: Place::Defined(int, TypeOrigin::Declared, Definedness::PossiblyUndefined),
+/// bound_or_declared:   Place::Defined(Literal[1], TypeOrigin::Inferred, Definedness::PossiblyUndefined),
+/// non_existent:        Place::Undefined,
 /// ```
 #[derive(Debug, Clone, PartialEq, Eq, salsa::Update, get_size2::GetSize)]
 pub(crate) enum Place<'db> {
-    Type(Type<'db>, Boundness),
-    Unbound,
+    Defined(Type<'db>, TypeOrigin, Definedness),
+    Undefined,
 }
 
 impl<'db> Place<'db> {
-    /// Constructor that creates a `Place` with boundness [`Boundness::Bound`].
+    /// Constructor that creates a [`Place`] with type origin [`TypeOrigin::Inferred`] and definedness [`Definedness::AlwaysDefined`].
     pub(crate) fn bound(ty: impl Into<Type<'db>>) -> Self {
-        Place::Type(ty.into(), Boundness::Bound)
+        Place::Defined(ty.into(), TypeOrigin::Inferred, Definedness::AlwaysDefined)
+    }
+
+    /// Constructor that creates a [`Place`] with type origin [`TypeOrigin::Declared`] and definedness [`Definedness::AlwaysDefined`].
+    pub(crate) fn declared(ty: impl Into<Type<'db>>) -> Self {
+        Place::Defined(ty.into(), TypeOrigin::Declared, Definedness::AlwaysDefined)
     }
 
     /// Constructor that creates a [`Place`] with a [`crate::types::TodoType`] type
-    /// and boundness [`Boundness::Bound`].
+    /// and definedness [`Definedness::AlwaysDefined`].
     #[allow(unused_variables)] // Only unused in release builds
     pub(crate) fn todo(message: &'static str) -> Self {
-        Place::Type(todo_type!(message), Boundness::Bound)
+        Place::Defined(
+            todo_type!(message),
+            TypeOrigin::Inferred,
+            Definedness::AlwaysDefined,
+        )
     }
 
-    pub(crate) fn is_unbound(&self) -> bool {
-        matches!(self, Place::Unbound)
+    pub(crate) fn is_undefined(&self) -> bool {
+        matches!(self, Place::Undefined)
     }
 
-    /// Returns the type of the place, ignoring possible unboundness.
+    /// Returns the type of the place, ignoring possible undefinedness.
     ///
-    /// If the place is *definitely* unbound, this function will return `None`. Otherwise,
-    /// if there is at least one control-flow path where the place is bound, return the type.
-    pub(crate) fn ignore_possibly_unbound(&self) -> Option<Type<'db>> {
+    /// If the place is *definitely* undefined, this function will return `None`. Otherwise,
+    /// if there is at least one control-flow path where the place is defined, return the type.
+    pub(crate) fn ignore_possibly_undefined(&self) -> Option<Type<'db>> {
         match self {
-            Place::Type(ty, _) => Some(*ty),
-            Place::Unbound => None,
+            Place::Defined(ty, _, _) => Some(*ty),
+            Place::Undefined => None,
         }
     }
 
     #[cfg(test)]
     #[track_caller]
     pub(crate) fn expect_type(self) -> Type<'db> {
-        self.ignore_possibly_unbound()
-            .expect("Expected a (possibly unbound) type, not an unbound place")
+        self.ignore_possibly_undefined()
+            .expect("Expected a (possibly undefined) type, not an undefined place")
     }
 
     #[must_use]
     pub(crate) fn map_type(self, f: impl FnOnce(Type<'db>) -> Type<'db>) -> Place<'db> {
         match self {
-            Place::Type(ty, boundness) => Place::Type(f(ty), boundness),
-            Place::Unbound => Place::Unbound,
+            Place::Defined(ty, origin, definedness) => Place::Defined(f(ty), origin, definedness),
+            Place::Undefined => Place::Undefined,
         }
     }
 
@@ -113,42 +158,47 @@ impl<'db> Place<'db> {
     /// This is used to resolve (potential) descriptor attributes.
     pub(crate) fn try_call_dunder_get(self, db: &'db dyn Db, owner: Type<'db>) -> Place<'db> {
         match self {
-            Place::Type(Type::Union(union), boundness) => union.map_with_boundness(db, |elem| {
-                Place::Type(*elem, boundness).try_call_dunder_get(db, owner)
-            }),
-
-            Place::Type(Type::Intersection(intersection), boundness) => intersection
+            Place::Defined(Type::Union(union), origin, definedness) => union
                 .map_with_boundness(db, |elem| {
-                    Place::Type(*elem, boundness).try_call_dunder_get(db, owner)
+                    Place::Defined(*elem, origin, definedness).try_call_dunder_get(db, owner)
                 }),
 
-            Place::Type(self_ty, boundness) => {
+            Place::Defined(Type::Intersection(intersection), origin, definedness) => intersection
+                .map_with_boundness(db, |elem| {
+                    Place::Defined(*elem, origin, definedness).try_call_dunder_get(db, owner)
+                }),
+
+            Place::Defined(self_ty, origin, definedness) => {
                 if let Some((dunder_get_return_ty, _)) =
                     self_ty.try_call_dunder_get(db, Type::none(db), owner)
                 {
-                    Place::Type(dunder_get_return_ty, boundness)
+                    Place::Defined(dunder_get_return_ty, origin, definedness)
                 } else {
                     self
                 }
             }
 
-            Place::Unbound => Place::Unbound,
+            Place::Undefined => Place::Undefined,
         }
     }
+
+    pub(crate) const fn is_definitely_bound(&self) -> bool {
+        matches!(self, Place::Defined(_, _, Definedness::AlwaysDefined))
+    }
 }
 
 impl<'db> From<LookupResult<'db>> for PlaceAndQualifiers<'db> {
     fn from(value: LookupResult<'db>) -> Self {
         match value {
-            Ok(type_and_qualifiers) => {
-                Place::Type(type_and_qualifiers.inner_type(), Boundness::Bound)
-                    .with_qualifiers(type_and_qualifiers.qualifiers())
-            }
-            Err(LookupError::Unbound(qualifiers)) => Place::Unbound.with_qualifiers(qualifiers),
-            Err(LookupError::PossiblyUnbound(type_and_qualifiers)) => {
-                Place::Type(type_and_qualifiers.inner_type(), Boundness::PossiblyUnbound)
-                    .with_qualifiers(type_and_qualifiers.qualifiers())
-            }
+            Ok(type_and_qualifiers) => Place::bound(type_and_qualifiers.inner_type())
+                .with_qualifiers(type_and_qualifiers.qualifiers()),
+            Err(LookupError::Undefined(qualifiers)) => Place::Undefined.with_qualifiers(qualifiers),
+            Err(LookupError::PossiblyUndefined(type_and_qualifiers)) => Place::Defined(
+                type_and_qualifiers.inner_type(),
+                TypeOrigin::Inferred,
+                Definedness::PossiblyUndefined,
+            )
+            .with_qualifiers(type_and_qualifiers.qualifiers()),
         }
     }
 }
@@ -156,8 +206,8 @@ impl<'db> From<LookupResult<'db>> for PlaceAndQualifiers<'db> {
 /// Possible ways in which a place lookup can (possibly or definitely) fail.
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub(crate) enum LookupError<'db> {
-    Unbound(TypeQualifiers),
-    PossiblyUnbound(TypeAndQualifiers<'db>),
+    Undefined(TypeQualifiers),
+    PossiblyUndefined(TypeAndQualifiers<'db>),
 }
 
 impl<'db> LookupError<'db> {
@@ -169,15 +219,17 @@ impl<'db> LookupError<'db> {
     ) -> LookupResult<'db> {
         let fallback = fallback.into_lookup_result();
         match (&self, &fallback) {
-            (LookupError::Unbound(_), _) => fallback,
-            (LookupError::PossiblyUnbound { .. }, Err(LookupError::Unbound(_))) => Err(self),
-            (LookupError::PossiblyUnbound(ty), Ok(ty2)) => Ok(TypeAndQualifiers::new(
+            (LookupError::Undefined(_), _) => fallback,
+            (LookupError::PossiblyUndefined { .. }, Err(LookupError::Undefined(_))) => Err(self),
+            (LookupError::PossiblyUndefined(ty), Ok(ty2)) => Ok(TypeAndQualifiers::new(
                 UnionType::from_elements(db, [ty.inner_type(), ty2.inner_type()]),
+                ty.origin().merge(ty2.origin()),
                 ty.qualifiers().union(ty2.qualifiers()),
             )),
-            (LookupError::PossiblyUnbound(ty), Err(LookupError::PossiblyUnbound(ty2))) => {
-                Err(LookupError::PossiblyUnbound(TypeAndQualifiers::new(
+            (LookupError::PossiblyUndefined(ty), Err(LookupError::PossiblyUndefined(ty2))) => {
+                Err(LookupError::PossiblyUndefined(TypeAndQualifiers::new(
                     UnionType::from_elements(db, [ty.inner_type(), ty2.inner_type()]),
+                    ty.origin().merge(ty2.origin()),
                     ty.qualifiers().union(ty2.qualifiers()),
                 )))
             }
@@ -227,59 +279,11 @@ pub(crate) fn place<'db>(
     )
 }
 
-/// Infer the public type of a class symbol (its type as seen from outside its scope) in the given
-/// `scope`.
-pub(crate) fn class_symbol<'db>(
-    db: &'db dyn Db,
-    scope: ScopeId<'db>,
-    name: &str,
-) -> PlaceAndQualifiers<'db> {
-    place_table(db, scope)
-        .symbol_id(name)
-        .map(|symbol_id| {
-            let place_and_quals = place_by_id(
-                db,
-                scope,
-                symbol_id.into(),
-                RequiresExplicitReExport::No,
-                ConsideredDefinitions::EndOfScope,
-            );
-
-            if !place_and_quals.place.is_unbound() && !place_and_quals.is_init_var() {
-                // Trust the declared type if we see a class-level declaration
-                return place_and_quals;
-            }
-
-            if let PlaceAndQualifiers {
-                place: Place::Type(ty, _),
-                qualifiers,
-            } = place_and_quals
-            {
-                // Otherwise, we need to check if the symbol has bindings
-                let use_def = use_def_map(db, scope);
-                let bindings = use_def.end_of_scope_symbol_bindings(symbol_id);
-                let inferred = place_from_bindings_impl(db, bindings, RequiresExplicitReExport::No);
-
-                // TODO: we should not need to calculate inferred type second time. This is a temporary
-                // solution until the notion of Boundness and Declaredness is split. See #16036, #16264
-                match inferred {
-                    Place::Unbound => Place::Unbound.with_qualifiers(qualifiers),
-                    Place::Type(_, boundness) => {
-                        Place::Type(ty, boundness).with_qualifiers(qualifiers)
-                    }
-                }
-            } else {
-                Place::Unbound.into()
-            }
-        })
-        .unwrap_or_default()
-}
-
 /// Infers the public type of an explicit module-global symbol as seen from within the same file.
 ///
 /// Note that all global scopes also include various "implicit globals" such as `__name__`,
 /// `__doc__` and `__file__`. This function **does not** consider those symbols; it will return
-/// `Place::Unbound` for them. Use the (currently test-only) `global_symbol` query to also include
+/// `Place::Undefined` for them. Use the (currently test-only) `global_symbol` query to also include
 /// those additional symbols.
 ///
 /// Use [`imported_symbol`] to perform the lookup as seen from outside the file (e.g. via imports).
@@ -356,7 +360,7 @@ pub(crate) fn imported_symbol<'db>(
     )
     .or_fall_back_to(db, || {
         if name == "__getattr__" {
-            Place::Unbound.into()
+            Place::Undefined.into()
         } else if name == "__builtins__" {
             Place::bound(Type::any()).into()
         } else {
@@ -367,7 +371,7 @@ pub(crate) fn imported_symbol<'db>(
 
 /// Lookup the type of `symbol` in the builtins namespace.
 ///
-/// Returns `Place::Unbound` if the `builtins` module isn't available for some reason.
+/// Returns `Place::Undefined` if the `builtins` module isn't available for some reason.
 ///
 /// Note that this function is only intended for use in the context of the builtins *namespace*
 /// and should not be used when a symbol is being explicitly imported from the `builtins` module
@@ -397,7 +401,7 @@ pub(crate) fn builtins_symbol<'db>(db: &'db dyn Db, symbol: &str) -> PlaceAndQua
 
 /// Lookup the type of `symbol` in a given known module.
 ///
-/// Returns `Place::Unbound` if the given known module cannot be resolved for some reason.
+/// Returns `Place::Undefined` if the given known module cannot be resolved for some reason.
 pub(crate) fn known_module_symbol<'db>(
     db: &'db dyn Db,
     known_module: KnownModule,
@@ -413,7 +417,7 @@ pub(crate) fn known_module_symbol<'db>(
 
 /// Lookup the type of `symbol` in the `typing` module namespace.
 ///
-/// Returns `Place::Unbound` if the `typing` module isn't available for some reason.
+/// Returns `Place::Undefined` if the `typing` module isn't available for some reason.
 #[inline]
 #[cfg(test)]
 pub(crate) fn typing_symbol<'db>(db: &'db dyn Db, symbol: &str) -> PlaceAndQualifiers<'db> {
@@ -422,7 +426,7 @@ pub(crate) fn typing_symbol<'db>(db: &'db dyn Db, symbol: &str) -> PlaceAndQuali
 
 /// Lookup the type of `symbol` in the `typing_extensions` module namespace.
 ///
-/// Returns `Place::Unbound` if the `typing_extensions` module isn't available for some reason.
+/// Returns `Place::Undefined` if the `typing_extensions` module isn't available for some reason.
 #[inline]
 pub(crate) fn typing_extensions_symbol<'db>(
     db: &'db dyn Db,
@@ -481,6 +485,9 @@ type DeclaredTypeAndConflictingTypes<'db> = (
 pub(crate) struct PlaceFromDeclarationsResult<'db> {
     place_and_quals: PlaceAndQualifiers<'db>,
     conflicting_types: Option<Box<indexmap::set::Slice<Type<'db>>>>,
+    /// Contains `Some(declaration)` if the declared type originates from exactly one declaration.
+    /// This field is used for backreferences in diagnostics.
+    pub(crate) single_declaration: Option<Definition<'db>>,
 }
 
 impl<'db> PlaceFromDeclarationsResult<'db> {
@@ -491,6 +498,7 @@ impl<'db> PlaceFromDeclarationsResult<'db> {
         PlaceFromDeclarationsResult {
             place_and_quals,
             conflicting_types: Some(conflicting_types),
+            single_declaration: None,
         }
     }
 
@@ -508,21 +516,6 @@ impl<'db> PlaceFromDeclarationsResult<'db> {
     }
 }
 
-impl<'db> From<PlaceAndQualifiers<'db>> for PlaceFromDeclarationsResult<'db> {
-    fn from(place_and_quals: PlaceAndQualifiers<'db>) -> Self {
-        PlaceFromDeclarationsResult {
-            place_and_quals,
-            conflicting_types: None,
-        }
-    }
-}
-
-impl<'db> From<Place<'db>> for PlaceFromDeclarationsResult<'db> {
-    fn from(place: Place<'db>) -> Self {
-        PlaceFromDeclarationsResult::from(PlaceAndQualifiers::from(place))
-    }
-}
-
 /// A type with declaredness information, and a set of type qualifiers.
 ///
 /// This is used to represent the result of looking up the declared type. Consider this
@@ -533,7 +526,7 @@ impl<'db> From<Place<'db>> for PlaceFromDeclarationsResult<'db> {
 ///         variable: ClassVar[int]
 /// ```
 /// If we look up the declared type of `variable` in the scope of class `C`, we will get
-/// the type `int`, a "declaredness" of [`Boundness::PossiblyUnbound`], and the information
+/// the type `int`, a "declaredness" of [`Definedness::PossiblyUndefined`], and the information
 /// that this comes with a [`CLASS_VAR`] type qualifier.
 ///
 /// [`CLASS_VAR`]: crate::types::TypeQualifiers::CLASS_VAR
@@ -546,7 +539,7 @@ pub(crate) struct PlaceAndQualifiers<'db> {
 impl Default for PlaceAndQualifiers<'_> {
     fn default() -> Self {
         PlaceAndQualifiers {
-            place: Place::Unbound,
+            place: Place::Undefined,
             qualifiers: TypeQualifiers::empty(),
         }
     }
@@ -564,6 +557,21 @@ impl<'db> PlaceAndQualifiers<'db> {
         }
     }
 
+    pub(crate) fn unbound() -> Self {
+        PlaceAndQualifiers {
+            place: Place::Undefined,
+            qualifiers: TypeQualifiers::empty(),
+        }
+    }
+
+    pub(crate) fn is_undefined(&self) -> bool {
+        self.place.is_undefined()
+    }
+
+    pub(crate) fn ignore_possibly_undefined(&self) -> Option<Type<'db>> {
+        self.place.ignore_possibly_undefined()
+    }
+
     /// Returns `true` if the place has a `ClassVar` type qualifier.
     pub(crate) fn is_class_var(&self) -> bool {
         self.qualifiers.contains(TypeQualifiers::CLASS_VAR)
@@ -574,13 +582,28 @@ impl<'db> PlaceAndQualifiers<'db> {
         self.qualifiers.contains(TypeQualifiers::INIT_VAR)
     }
 
+    /// Returns `true` if the place has a `Required` type qualifier.
+    pub(crate) fn is_required(&self) -> bool {
+        self.qualifiers.contains(TypeQualifiers::REQUIRED)
+    }
+
+    /// Returns `true` if the place has a `NotRequired` type qualifier.
+    pub(crate) fn is_not_required(&self) -> bool {
+        self.qualifiers.contains(TypeQualifiers::NOT_REQUIRED)
+    }
+
+    /// Returns `true` if the place has a `ReadOnly` type qualifier.
+    pub(crate) fn is_read_only(&self) -> bool {
+        self.qualifiers.contains(TypeQualifiers::READ_ONLY)
+    }
+
     /// Returns `Some(…)` if the place is qualified with `typing.Final` without a specified type.
     pub(crate) fn is_bare_final(&self) -> Option<TypeQualifiers> {
         match self {
             PlaceAndQualifiers { place, qualifiers }
                 if (qualifiers.contains(TypeQualifiers::FINAL)
                     && place
-                        .ignore_possibly_unbound()
+                        .ignore_possibly_undefined()
                         .is_some_and(|ty| ty.is_unknown())) =>
             {
                 Some(*qualifiers)
@@ -600,25 +623,34 @@ impl<'db> PlaceAndQualifiers<'db> {
         }
     }
 
+    pub(crate) fn materialize(
+        self,
+        db: &'db dyn Db,
+        materialization_kind: MaterializationKind,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> PlaceAndQualifiers<'db> {
+        self.map_type(|ty| ty.materialize(db, materialization_kind, visitor))
+    }
+
     /// Transform place and qualifiers into a [`LookupResult`],
-    /// a [`Result`] type in which the `Ok` variant represents a definitely bound place
-    /// and the `Err` variant represents a place that is either definitely or possibly unbound.
+    /// a [`Result`] type in which the `Ok` variant represents a definitely defined place
+    /// and the `Err` variant represents a place that is either definitely or possibly undefined.
     pub(crate) fn into_lookup_result(self) -> LookupResult<'db> {
         match self {
             PlaceAndQualifiers {
-                place: Place::Type(ty, Boundness::Bound),
+                place: Place::Defined(ty, origin, Definedness::AlwaysDefined),
                 qualifiers,
-            } => Ok(TypeAndQualifiers::new(ty, qualifiers)),
+            } => Ok(TypeAndQualifiers::new(ty, origin, qualifiers)),
             PlaceAndQualifiers {
-                place: Place::Type(ty, Boundness::PossiblyUnbound),
+                place: Place::Defined(ty, origin, Definedness::PossiblyUndefined),
                 qualifiers,
-            } => Err(LookupError::PossiblyUnbound(TypeAndQualifiers::new(
-                ty, qualifiers,
+            } => Err(LookupError::PossiblyUndefined(TypeAndQualifiers::new(
+                ty, origin, qualifiers,
             ))),
             PlaceAndQualifiers {
-                place: Place::Unbound,
+                place: Place::Undefined,
                 qualifiers,
-            } => Err(LookupError::Unbound(qualifiers)),
+            } => Err(LookupError::Undefined(qualifiers)),
         }
     }
 
@@ -642,9 +674,9 @@ impl<'db> PlaceAndQualifiers<'db> {
     ///    1. If `self` is definitely unbound, return the result of `fallback_fn()`.
     ///    2. Else, if `fallback` is definitely unbound, return `self`.
     ///    3. Else, if `self` is possibly unbound and `fallback` is definitely bound,
-    ///       return `Place(<union of self-type and fallback-type>, Boundness::Bound)`
+    ///       return `Place(<union of self-type and fallback-type>, Definedness::AlwaysDefined)`
     ///    4. Else, if `self` is possibly unbound and `fallback` is possibly unbound,
-    ///       return `Place(<union of self-type and fallback-type>, Boundness::PossiblyUnbound)`
+    ///       return `Place(<union of self-type and fallback-type>, Definedness::PossiblyUndefined)`
     #[must_use]
     pub(crate) fn or_fall_back_to(
         self,
@@ -663,18 +695,6 @@ impl<'db> From<Place<'db>> for PlaceAndQualifiers<'db> {
     }
 }
 
-fn place_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &PlaceAndQualifiers<'db>,
-    _count: u32,
-    _scope: ScopeId<'db>,
-    _place_id: ScopedPlaceId,
-    _requires_explicit_reexport: RequiresExplicitReExport,
-    _considered_definitions: ConsideredDefinitions,
-) -> salsa::CycleRecoveryAction<PlaceAndQualifiers<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn place_cycle_initial<'db>(
     _db: &'db dyn Db,
     _scope: ScopeId<'db>,
@@ -685,8 +705,8 @@ fn place_cycle_initial<'db>(
     Place::bound(Type::Never).into()
 }
 
-#[salsa::tracked(cycle_fn=place_cycle_recover, cycle_initial=place_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
-fn place_by_id<'db>(
+#[salsa::tracked(cycle_initial=place_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+pub(crate) fn place_by_id<'db>(
     db: &'db dyn Db,
     scope: ScopeId<'db>,
     place_id: ScopedPlaceId,
@@ -723,29 +743,30 @@ fn place_by_id<'db>(
         // Handle bare `ClassVar` annotations by falling back to the union of `Unknown` and the
         // inferred type.
         PlaceAndQualifiers {
-            place: Place::Type(Type::Dynamic(DynamicType::Unknown), declaredness),
+            place: Place::Defined(Type::Dynamic(DynamicType::Unknown), origin, definedness),
             qualifiers,
         } if qualifiers.contains(TypeQualifiers::CLASS_VAR) => {
             let bindings = all_considered_bindings();
             match place_from_bindings_impl(db, bindings, requires_explicit_reexport) {
-                Place::Type(inferred, boundness) => Place::Type(
+                Place::Defined(inferred, origin, boundness) => Place::Defined(
                     UnionType::from_elements(db, [Type::unknown(), inferred]),
+                    origin,
                     boundness,
                 )
                 .with_qualifiers(qualifiers),
-                Place::Unbound => {
-                    Place::Type(Type::unknown(), declaredness).with_qualifiers(qualifiers)
+                Place::Undefined => {
+                    Place::Defined(Type::unknown(), origin, definedness).with_qualifiers(qualifiers)
                 }
             }
         }
         // Place is declared, trust the declared type
         place_and_quals @ PlaceAndQualifiers {
-            place: Place::Type(_, Boundness::Bound),
+            place: Place::Defined(_, _, Definedness::AlwaysDefined),
             qualifiers: _,
         } => place_and_quals,
         // Place is possibly declared
         PlaceAndQualifiers {
-            place: Place::Type(declared_ty, Boundness::PossiblyUnbound),
+            place: Place::Defined(declared_ty, origin, Definedness::PossiblyUndefined),
             qualifiers,
         } => {
             let bindings = all_considered_bindings();
@@ -754,17 +775,18 @@ fn place_by_id<'db>(
 
             let place = match inferred {
                 // Place is possibly undeclared and definitely unbound
-                Place::Unbound => {
-                    // TODO: We probably don't want to report `Bound` here. This requires a bit of
+                Place::Undefined => {
+                    // TODO: We probably don't want to report `AlwaysDefined` here. This requires a bit of
                     // design work though as we might want a different behavior for stubs and for
                     // normal modules.
-                    Place::Type(declared_ty, Boundness::Bound)
+                    Place::Defined(declared_ty, origin, Definedness::AlwaysDefined)
                 }
                 // Place is possibly undeclared and (possibly) bound
-                Place::Type(inferred_ty, boundness) => Place::Type(
+                Place::Defined(inferred_ty, origin, boundness) => Place::Defined(
                     UnionType::from_elements(db, [inferred_ty, declared_ty]),
+                    origin,
                     if boundness_analysis == BoundnessAnalysis::AssumeBound {
-                        Boundness::Bound
+                        Definedness::AlwaysDefined
                     } else {
                         boundness
                     },
@@ -775,7 +797,7 @@ fn place_by_id<'db>(
         }
         // Place is undeclared, return the union of `Unknown` with the inferred type
         PlaceAndQualifiers {
-            place: Place::Unbound,
+            place: Place::Undefined,
             qualifiers: _,
         } => {
             let bindings = all_considered_bindings();
@@ -783,8 +805,8 @@ fn place_by_id<'db>(
             let mut inferred = place_from_bindings_impl(db, bindings, requires_explicit_reexport);
 
             if boundness_analysis == BoundnessAnalysis::AssumeBound {
-                if let Place::Type(ty, Boundness::PossiblyUnbound) = inferred {
-                    inferred = Place::Type(ty, Boundness::Bound);
+                if let Place::Defined(ty, origin, Definedness::PossiblyUndefined) = inferred {
+                    inferred = Place::Defined(ty, origin, Definedness::AlwaysDefined);
                 }
             }
 
@@ -792,7 +814,7 @@ fn place_by_id<'db>(
             // modified externally, but those changes do not take effect. We therefore issue
             // a diagnostic if we see it being modified externally. In type inference, we
             // can assign a "narrow" type to it even if it is not *declared*. This means, we
-            // do not have to call [`widen_type_for_undeclared_public_symbol`].
+            // do not have to union with `Unknown`.
             //
             // `TYPE_CHECKING` is a special variable that should only be assigned `False`
             // at runtime, but is always considered `True` in type checking.
@@ -804,18 +826,37 @@ fn place_by_id<'db>(
                 )
             });
 
-            if scope.file(db).is_stub(db) || scope.scope(db).visibility().is_private() {
-                // We generally trust module-level undeclared places in stubs and do not union
-                // with `Unknown`. If we don't do this, simple aliases like `IOError = OSError` in
-                // stubs would result in `IOError` being a union of `OSError` and `Unknown`, which
-                // leads to all sorts of downstream problems. Similarly, type variables are often
-                // defined as `_T = TypeVar("_T")`, without being declared.
-                // Also, if the scope is private, such as a function scope,
-                // meaning that the place cannot be rewritten from elsewhere, we do not union with `Unknown`.
+            // Module-level globals can be mutated externally. A `MY_CONSTANT = 1` global might
+            // be changed to `"some string"` from code outside of the module that we're looking
+            // at, and so from a gradual-guarantee perspective, it makes sense to infer a type
+            // of `Literal[1] | Unknown` for global symbols. This allows the code that does the
+            // mutation to type check correctly, and for code that uses the global, it accurately
+            // reflects the lack of knowledge about the type.
+            //
+            // However, external modifications (or modifications through `global` statements) that
+            // would require a wider type are relatively rare. From a practical perspective, we can
+            // therefore achieve a better user experience by trusting the inferred type. Users who
+            // need the external mutation to work can always annotate the global with the wider
+            // type. And everyone else benefits from more precise type inference.
+            let is_module_global = scope.node(db).scope_kind().is_module();
 
+            // If the visibility of the scope is private (like for a function scope), we also do
+            // not union with `Unknown`, because the symbol cannot be modified externally.
+            let scope_has_private_visibility = scope.scope(db).visibility().is_private();
+
+            // We generally trust undeclared places in stubs and do not union with `Unknown`.
+            let in_stub_file = scope.file(db).is_stub(db);
+
+            if is_considered_non_modifiable
+                || is_module_global
+                || scope_has_private_visibility
+                || in_stub_file
+            {
                 inferred.into()
             } else {
-                widen_type_for_undeclared_public_symbol(db, inferred, is_considered_non_modifiable)
+                // Widen the inferred type of undeclared public symbols by unioning with `Unknown`
+                inferred
+                    .map_type(|ty| UnionType::from_elements(db, [Type::unknown(), ty]))
                     .into()
             }
         }
@@ -1037,25 +1078,27 @@ fn place_from_bindings_impl<'db>(
         };
 
         let boundness = match boundness_analysis {
-            BoundnessAnalysis::AssumeBound => Boundness::Bound,
+            BoundnessAnalysis::AssumeBound => Definedness::AlwaysDefined,
             BoundnessAnalysis::BasedOnUnboundVisibility => match unbound_visibility() {
                 Some(Truthiness::AlwaysTrue) => {
                     unreachable!(
                         "If we have at least one binding, the implicit `unbound` binding should not be definitely visible"
                     )
                 }
-                Some(Truthiness::AlwaysFalse) | None => Boundness::Bound,
-                Some(Truthiness::Ambiguous) => Boundness::PossiblyUnbound,
+                Some(Truthiness::AlwaysFalse) | None => Definedness::AlwaysDefined,
+                Some(Truthiness::Ambiguous) => Definedness::PossiblyUndefined,
             },
         };
 
         match deleted_reachability {
-            Truthiness::AlwaysFalse => Place::Type(ty, boundness),
-            Truthiness::AlwaysTrue => Place::Unbound,
-            Truthiness::Ambiguous => Place::Type(ty, Boundness::PossiblyUnbound),
+            Truthiness::AlwaysFalse => Place::Defined(ty, TypeOrigin::Inferred, boundness),
+            Truthiness::AlwaysTrue => Place::Undefined,
+            Truthiness::Ambiguous => {
+                Place::Defined(ty, TypeOrigin::Inferred, Definedness::PossiblyUndefined)
+            }
         }
     } else {
-        Place::Unbound
+        Place::Undefined
     }
 }
 
@@ -1156,7 +1199,8 @@ impl<'db> DeclaredTypeBuilder<'db> {
     }
 
     fn build(mut self) -> DeclaredTypeAndConflictingTypes<'db> {
-        let type_and_quals = TypeAndQualifiers::new(self.inner.build(), self.qualifiers);
+        let type_and_quals =
+            TypeAndQualifiers::new(self.inner.build(), TypeOrigin::Declared, self.qualifiers);
         if self.conflicting_types.is_empty() {
             (type_and_quals, None)
         } else {
@@ -1187,6 +1231,8 @@ fn place_from_declarations_impl<'db>(
     let reachability_constraints = declarations.reachability_constraints;
     let boundness_analysis = declarations.boundness_analysis;
     let mut declarations = declarations.peekable();
+    let mut first_declaration = None;
+    let mut exactly_one_declaration = false;
 
     let is_non_exported = |declaration: Definition<'db>| {
         requires_explicit_reexport.is_yes() && !is_reexported(db, declaration)
@@ -1217,6 +1263,13 @@ fn place_from_declarations_impl<'db>(
                 return None;
             }
 
+            if first_declaration.is_none() {
+                first_declaration = Some(declaration);
+                exactly_one_declaration = true;
+            } else {
+                exactly_one_declaration = false;
+            }
+
             let static_reachability =
                 reachability_constraints.evaluate(db, predicates, reachability_constraint);
 
@@ -1247,13 +1300,13 @@ fn place_from_declarations_impl<'db>(
         let boundness = match boundness_analysis {
             BoundnessAnalysis::AssumeBound => {
                 if all_declarations_definitely_reachable {
-                    Boundness::Bound
+                    Definedness::AlwaysDefined
                 } else {
                     // For declarations, it is important to consider the possibility that they might only
                     // be bound in one control flow path, while the other path contains a binding. In order
                     // to even consider the bindings as well in `place_by_id`, we return `PossiblyUnbound`
                     // here.
-                    Boundness::PossiblyUnbound
+                    Definedness::PossiblyUndefined
                 }
             }
             BoundnessAnalysis::BasedOnUnboundVisibility => match undeclared_reachability {
@@ -1262,21 +1315,30 @@ fn place_from_declarations_impl<'db>(
                         "If we have at least one declaration, the implicit `unbound` binding should not be definitely visible"
                     )
                 }
-                Truthiness::AlwaysFalse => Boundness::Bound,
-                Truthiness::Ambiguous => Boundness::PossiblyUnbound,
+                Truthiness::AlwaysFalse => Definedness::AlwaysDefined,
+                Truthiness::Ambiguous => Definedness::PossiblyUndefined,
             },
         };
 
         let place_and_quals =
-            Place::Type(declared.inner_type(), boundness).with_qualifiers(declared.qualifiers());
+            Place::Defined(declared.inner_type(), TypeOrigin::Declared, boundness)
+                .with_qualifiers(declared.qualifiers());
 
         if let Some(conflicting) = conflicting {
             PlaceFromDeclarationsResult::conflict(place_and_quals, conflicting)
         } else {
-            place_and_quals.into()
+            PlaceFromDeclarationsResult {
+                place_and_quals,
+                conflicting_types: None,
+                single_declaration: first_declaration.filter(|_| exactly_one_declaration),
+            }
         }
     } else {
-        Place::Unbound.into()
+        PlaceFromDeclarationsResult {
+            place_and_quals: Place::Undefined.into(),
+            conflicting_types: None,
+            single_declaration: None,
+        }
     }
 }
 
@@ -1304,12 +1366,15 @@ fn is_reexported(db: &dyn Db, definition: Definition<'_>) -> bool {
 
 mod implicit_globals {
     use ruff_python_ast as ast;
+    use ruff_python_ast::name::Name;
 
+    use crate::Program;
     use crate::db::Db;
-    use crate::place::PlaceAndQualifiers;
+    use crate::place::{Definedness, PlaceAndQualifiers, TypeOrigin};
     use crate::semantic_index::symbol::Symbol;
     use crate::semantic_index::{place_table, use_def_map};
-    use crate::types::{KnownClass, Type};
+    use crate::types::{CallableType, KnownClass, Parameter, Parameters, Signature, Type};
+    use ruff_python_ast::PythonVersion;
 
     use super::{Place, place_from_declarations};
 
@@ -1321,16 +1386,16 @@ mod implicit_globals {
             .iter()
             .any(|module_type_member| module_type_member == name)
         {
-            return Place::Unbound.into();
+            return Place::Undefined.into();
         }
         let Type::ClassLiteral(module_type_class) = KnownClass::ModuleType.to_class_literal(db)
         else {
-            return Place::Unbound.into();
+            return Place::Undefined.into();
         };
         let module_type_scope = module_type_class.body_scope(db);
         let place_table = place_table(db, module_type_scope);
         let Some(symbol_id) = place_table.symbol_id(name) else {
-            return Place::Unbound.into();
+            return Place::Undefined.into();
         };
         place_from_declarations(
             db,
@@ -1339,7 +1404,7 @@ mod implicit_globals {
         .ignore_conflicting_declarations()
     }
 
-    /// Looks up the type of an "implicit global symbol". Returns [`Place::Unbound`] if
+    /// Looks up the type of an "implicit global symbol". Returns [`Place::Undefined`] if
     /// `name` is not present as an implicit symbol in module-global namespaces.
     ///
     /// Implicit global symbols are symbols such as `__doc__`, `__name__`, and `__file__`
@@ -1350,35 +1415,67 @@ mod implicit_globals {
     /// up in the global scope **from within the same file**. If the symbol is being looked up
     /// from outside the file (e.g. via imports), use [`super::imported_symbol`] (or fallback logic
     /// like the logic used in that function) instead. The reason is that this function returns
-    /// [`Place::Unbound`] for `__init__` and `__dict__` (which cannot be found in globals if
+    /// [`Place::Undefined`] for `__init__` and `__dict__` (which cannot be found in globals if
     /// the lookup is being done from the same file) -- but these symbols *are* available in the
     /// global scope if they're being imported **from a different file**.
     pub(crate) fn module_type_implicit_global_symbol<'db>(
         db: &'db dyn Db,
         name: &str,
     ) -> PlaceAndQualifiers<'db> {
-        // We special-case `__file__` here because we know that for an internal implicit global
-        // lookup in a Python module, it is always a string, even though typeshed says `str |
-        // None`.
-        if name == "__file__" {
-            Place::bound(KnownClass::Str.to_instance(db)).into()
-        } else if name == "__builtins__" {
-            Place::bound(Type::any()).into()
-        } else if name == "__debug__" {
-            Place::bound(KnownClass::Bool.to_instance(db)).into()
-        }
-        // In general we wouldn't check to see whether a symbol exists on a class before doing the
-        // `.member()` call on the instance type -- we'd just do the `.member`() call on the instance
-        // type, since it has the same end result. The reason to only call `.member()` on `ModuleType`
-        // when absolutely necessary is that this function is used in a very hot path (name resolution
-        // in `infer.rs`). We use less idiomatic (and much more verbose) code here as a micro-optimisation.
-        else if module_type_symbols(db)
-            .iter()
-            .any(|module_type_member| &**module_type_member == name)
-        {
-            KnownClass::ModuleType.to_instance(db).member(db, name)
-        } else {
-            Place::Unbound.into()
+        match name {
+            // We special-case `__file__` here because we know that for an internal implicit global
+            // lookup in a Python module, it is always a string, even though typeshed says `str |
+            // None`.
+            "__file__" => Place::bound(KnownClass::Str.to_instance(db)).into(),
+
+            "__builtins__" => Place::bound(Type::any()).into(),
+
+            "__debug__" => Place::bound(KnownClass::Bool.to_instance(db)).into(),
+
+            // Created lazily by the warnings machinery; may be absent.
+            // Model as possibly-unbound to avoid false negatives.
+            "__warningregistry__" => Place::Defined(
+                KnownClass::Dict
+                    .to_specialized_instance(db, [Type::any(), KnownClass::Int.to_instance(db)]),
+                TypeOrigin::Inferred,
+                Definedness::PossiblyUndefined,
+            )
+            .into(),
+
+            // Marked as possibly-unbound as it is only present in the module namespace
+            // if at least one global symbol is annotated in the module.
+            "__annotate__" if Program::get(db).python_version(db) >= PythonVersion::PY314 => {
+                let signature = Signature::new(
+                    Parameters::new(
+                        [Parameter::positional_only(Some(Name::new_static("format")))
+                            .with_annotated_type(KnownClass::Int.to_instance(db))],
+                    ),
+                    Some(KnownClass::Dict.to_specialized_instance(
+                        db,
+                        [KnownClass::Str.to_instance(db), Type::any()],
+                    )),
+                );
+                Place::Defined(
+                    CallableType::function_like(db, signature),
+                    TypeOrigin::Inferred,
+                    Definedness::PossiblyUndefined,
+                )
+                .into()
+            }
+
+            // In general we wouldn't check to see whether a symbol exists on a class before doing the
+            // `.member()` call on the instance type -- we'd just do the `.member`() call on the instance
+            // type, since it has the same end result. The reason to only call `.member()` on `ModuleType`
+            // when absolutely necessary is that this function is used in a very hot path (name resolution
+            // in `infer.rs`). We use less idiomatic (and much more verbose) code here as a micro-optimisation.
+            _ if module_type_symbols(db)
+                .iter()
+                .any(|module_type_member| &**module_type_member == name) =>
+            {
+                KnownClass::ModuleType.to_instance(db).member(db, name)
+            }
+
+            _ => Place::Undefined.into(),
         }
     }
 
@@ -1399,11 +1496,15 @@ mod implicit_globals {
     /// Conceptually this function could be a `Set` rather than a list,
     /// but the number of symbols declared in this scope is likely to be very small,
     /// so the cost of hashing the names is likely to be more expensive than it's worth.
-    #[salsa::tracked(returns(deref), heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(
+        returns(deref),
+        cycle_initial=module_type_symbols_initial,
+        heap_size=ruff_memory_usage::heap_size
+    )]
     fn module_type_symbols<'db>(db: &'db dyn Db) -> smallvec::SmallVec<[ast::name::Name; 8]> {
         let Some(module_type) = KnownClass::ModuleType
             .to_class_literal(db)
-            .into_class_literal()
+            .as_class_literal()
         else {
             // The most likely way we get here is if a user specified a `--custom-typeshed-dir`
             // without a `types.pyi` stub in the `stdlib/` directory
@@ -1427,6 +1528,10 @@ mod implicit_globals {
             .collect()
     }
 
+    fn module_type_symbols_initial(_db: &dyn Db) -> smallvec::SmallVec<[ast::name::Name; 8]> {
+        smallvec::SmallVec::default()
+    }
+
     #[cfg(test)]
     mod tests {
         use super::*;
@@ -1489,7 +1594,7 @@ pub(crate) enum BoundnessAnalysis {
     /// `unbound` binding. In the example below, when analyzing the visibility of the
     /// `x = <unbound>` binding from the position of the end of the scope, it would be
     /// `Truthiness::Ambiguous`, because it could either be visible or not, depending on the
-    /// `flag()` return value. This would result in a `Boundness::PossiblyUnbound` for `x`.
+    /// `flag()` return value. This would result in a `Definedness::PossiblyUndefined` for `x`.
     ///
     /// ```py
     /// x = <unbound>
@@ -1500,29 +1605,6 @@ pub(crate) enum BoundnessAnalysis {
     BasedOnUnboundVisibility,
 }
 
-/// Computes a possibly-widened type `Unknown | T_inferred` from the inferred type `T_inferred`
-/// of a symbol, unless the type is a known-instance type (e.g. `typing.Any`) or the symbol is
-/// considered non-modifiable (e.g. when the symbol is `@Final`). We need this for public uses
-/// of symbols that have no declared type.
-fn widen_type_for_undeclared_public_symbol<'db>(
-    db: &'db dyn Db,
-    inferred: Place<'db>,
-    is_considered_non_modifiable: bool,
-) -> Place<'db> {
-    // We special-case known-instance types here since symbols like `typing.Any` are typically
-    // not declared in the stubs (e.g. `Any = object()`), but we still want to treat them as
-    // such.
-    let is_known_instance = inferred
-        .ignore_possibly_unbound()
-        .is_some_and(|ty| matches!(ty, Type::SpecialForm(_) | Type::KnownInstance(_)));
-
-    if is_considered_non_modifiable || is_known_instance {
-        inferred
-    } else {
-        inferred.map_type(|ty| UnionType::from_elements(db, [Type::unknown(), ty]))
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1530,21 +1612,30 @@ mod tests {
 
     #[test]
     fn test_symbol_or_fall_back_to() {
-        use Boundness::{Bound, PossiblyUnbound};
+        use Definedness::{AlwaysDefined, PossiblyUndefined};
+        use TypeOrigin::Inferred;
 
         let db = setup_db();
         let ty1 = Type::IntLiteral(1);
         let ty2 = Type::IntLiteral(2);
 
-        let unbound = || Place::Unbound.with_qualifiers(TypeQualifiers::empty());
+        let unbound = || Place::Undefined.with_qualifiers(TypeQualifiers::empty());
 
-        let possibly_unbound_ty1 =
-            || Place::Type(ty1, PossiblyUnbound).with_qualifiers(TypeQualifiers::empty());
-        let possibly_unbound_ty2 =
-            || Place::Type(ty2, PossiblyUnbound).with_qualifiers(TypeQualifiers::empty());
+        let possibly_unbound_ty1 = || {
+            Place::Defined(ty1, Inferred, PossiblyUndefined)
+                .with_qualifiers(TypeQualifiers::empty())
+        };
+        let possibly_unbound_ty2 = || {
+            Place::Defined(ty2, Inferred, PossiblyUndefined)
+                .with_qualifiers(TypeQualifiers::empty())
+        };
 
-        let bound_ty1 = || Place::Type(ty1, Bound).with_qualifiers(TypeQualifiers::empty());
-        let bound_ty2 = || Place::Type(ty2, Bound).with_qualifiers(TypeQualifiers::empty());
+        let bound_ty1 = || {
+            Place::Defined(ty1, Inferred, AlwaysDefined).with_qualifiers(TypeQualifiers::empty())
+        };
+        let bound_ty2 = || {
+            Place::Defined(ty2, Inferred, AlwaysDefined).with_qualifiers(TypeQualifiers::empty())
+        };
 
         // Start from an unbound symbol
         assert_eq!(unbound().or_fall_back_to(&db, unbound), unbound());
@@ -1561,11 +1652,21 @@ mod tests {
         );
         assert_eq!(
             possibly_unbound_ty1().or_fall_back_to(&db, possibly_unbound_ty2),
-            Place::Type(UnionType::from_elements(&db, [ty1, ty2]), PossiblyUnbound).into()
+            Place::Defined(
+                UnionType::from_elements(&db, [ty1, ty2]),
+                Inferred,
+                PossiblyUndefined
+            )
+            .into()
         );
         assert_eq!(
             possibly_unbound_ty1().or_fall_back_to(&db, bound_ty2),
-            Place::Type(UnionType::from_elements(&db, [ty1, ty2]), Bound).into()
+            Place::Defined(
+                UnionType::from_elements(&db, [ty1, ty2]),
+                Inferred,
+                AlwaysDefined
+            )
+            .into()
         );
 
         // Start from a definitely bound symbol
@@ -1581,7 +1682,7 @@ mod tests {
     fn assert_bound_string_symbol<'db>(db: &'db dyn Db, symbol: Place<'db>) {
         assert!(matches!(
             symbol,
-            Place::Type(Type::NominalInstance(_), Boundness::Bound)
+            Place::Defined(Type::NominalInstance(_), _, Definedness::AlwaysDefined)
         ));
         assert_eq!(symbol.expect_type(), KnownClass::Str.to_instance(db));
     }
diff --git a/crates/ty_python_semantic/src/python_platform.rs b/crates/ty_python_semantic/src/python_platform.rs
index 6f0c0fbab4..b21424ee33 100644
--- a/crates/ty_python_semantic/src/python_platform.rs
+++ b/crates/ty_python_semantic/src/python_platform.rs
@@ -58,77 +58,45 @@ impl Default for PythonPlatform {
 mod schema {
     use crate::PythonPlatform;
     use ruff_db::RustDoc;
-    use schemars::_serde_json::Value;
-    use schemars::JsonSchema;
-    use schemars::r#gen::SchemaGenerator;
-    use schemars::schema::{Metadata, Schema, SchemaObject, SubschemaValidation};
+    use schemars::{JsonSchema, Schema, SchemaGenerator};
+    use serde_json::Value;
 
     impl JsonSchema for PythonPlatform {
-        fn schema_name() -> String {
-            "PythonPlatform".to_string()
+        fn schema_name() -> std::borrow::Cow<'static, str> {
+            std::borrow::Cow::Borrowed("PythonPlatform")
         }
 
         fn json_schema(_gen: &mut SchemaGenerator) -> Schema {
-            Schema::Object(SchemaObject {
-                // Hard code some well known values, but allow any other string as well.
-                subschemas: Some(Box::new(SubschemaValidation {
-                    any_of: Some(vec![
-                        Schema::Object(SchemaObject {
-                            instance_type: Some(schemars::schema::InstanceType::String.into()),
-                            ..SchemaObject::default()
-                        }),
-                        // Promote well-known values for better auto-completion.
-                        // Using `const` over `enumValues` as recommended [here](https://github.com/SchemaStore/schemastore/blob/master/CONTRIBUTING.md#documenting-enums).
-                        Schema::Object(SchemaObject {
-                            const_value: Some(Value::String("all".to_string())),
-                            metadata: Some(Box::new(Metadata {
-                                description: Some(
-                                    "Do not make any assumptions about the target platform."
-                                        .to_string(),
-                                ),
-                                ..Metadata::default()
-                            })),
+            fn constant(value: &str, description: &str) -> Value {
+                let mut schema = schemars::json_schema!({ "const": value });
+                schema.ensure_object().insert(
+                    "description".to_string(),
+                    Value::String(description.to_string()),
+                );
+                schema.into()
+            }
 
-                            ..SchemaObject::default()
-                        }),
-                        Schema::Object(SchemaObject {
-                            const_value: Some(Value::String("darwin".to_string())),
-                            metadata: Some(Box::new(Metadata {
-                                description: Some("Darwin".to_string()),
-                                ..Metadata::default()
-                            })),
+            // Hard code some well known values, but allow any other string as well.
+            let mut any_of = vec![schemars::json_schema!({ "type": "string" }).into()];
+            // Promote well-known values for better auto-completion.
+            // Using `const` over `enumValues` as recommended [here](https://github.com/SchemaStore/schemastore/blob/master/CONTRIBUTING.md#documenting-enums).
+            any_of.push(constant(
+                "all",
+                "Do not make any assumptions about the target platform.",
+            ));
+            any_of.push(constant("darwin", "Darwin"));
+            any_of.push(constant("linux", "Linux"));
+            any_of.push(constant("win32", "Windows"));
 
-                            ..SchemaObject::default()
-                        }),
-                        Schema::Object(SchemaObject {
-                            const_value: Some(Value::String("linux".to_string())),
-                            metadata: Some(Box::new(Metadata {
-                                description: Some("Linux".to_string()),
-                                ..Metadata::default()
-                            })),
+            let mut schema = Schema::default();
+            let object = schema.ensure_object();
+            object.insert("anyOf".to_string(), Value::Array(any_of));
+            object.insert(
+                "description".to_string(),
+                Value::String(<PythonPlatform as RustDoc>::rust_doc().to_string()),
+            );
 
-                            ..SchemaObject::default()
-                        }),
-                        Schema::Object(SchemaObject {
-                            const_value: Some(Value::String("win32".to_string())),
-                            metadata: Some(Box::new(Metadata {
-                                description: Some("Windows".to_string()),
-                                ..Metadata::default()
-                            })),
-
-                            ..SchemaObject::default()
-                        }),
-                    ]),
-
-                    ..SubschemaValidation::default()
-                })),
-                metadata: Some(Box::new(Metadata {
-                    description: Some(<PythonPlatform as RustDoc>::rust_doc().to_string()),
-                    ..Metadata::default()
-                })),
-
-                ..SchemaObject::default()
-            })
+            schema
         }
     }
 }
diff --git a/crates/ty_python_semantic/src/semantic_index.rs b/crates/ty_python_semantic/src/semantic_index.rs
index 2c770ee0a6..558243f59c 100644
--- a/crates/ty_python_semantic/src/semantic_index.rs
+++ b/crates/ty_python_semantic/src/semantic_index.rs
@@ -159,7 +159,6 @@ pub(crate) fn attribute_scopes<'db, 's>(
     class_body_scope: ScopeId<'db>,
 ) -> impl Iterator<Item = FileScopeId> + use<'s, 'db> {
     let file = class_body_scope.file(db);
-    let module = parsed_module(db, file).load(db);
     let index = semantic_index(db, file);
     let class_scope_id = class_body_scope.file_scope_id(db);
 
@@ -175,7 +174,7 @@ pub(crate) fn attribute_scopes<'db, 's>(
                 (child_scope_id, scope)
             };
 
-        function_scope.node().as_function(&module)?;
+        function_scope.node().as_function()?;
         Some(function_scope_id)
     })
 }
@@ -332,6 +331,39 @@ impl<'db> SemanticIndex<'db> {
         Some(&self.scopes[self.parent_scope_id(scope_id)?])
     }
 
+    /// Return the [`Definition`] of the class enclosing this method, given the
+    /// method's body scope, or `None` if it is not a method.
+    pub(crate) fn class_definition_of_method(
+        &self,
+        function_body_scope: FileScopeId,
+    ) -> Option<Definition<'db>> {
+        let current_scope = self.scope(function_body_scope);
+        if current_scope.kind() != ScopeKind::Function {
+            return None;
+        }
+        let parent_scope_id = current_scope.parent()?;
+        let parent_scope = self.scope(parent_scope_id);
+
+        let class_scope = match parent_scope.kind() {
+            ScopeKind::Class => parent_scope,
+            ScopeKind::TypeParams => {
+                let class_scope_id = parent_scope.parent()?;
+                let potentially_class_scope = self.scope(class_scope_id);
+
+                match potentially_class_scope.kind() {
+                    ScopeKind::Class => potentially_class_scope,
+                    _ => return None,
+                }
+            }
+            _ => return None,
+        };
+
+        class_scope
+            .node()
+            .as_class()
+            .map(|node_ref| self.expect_single_definition(node_ref))
+    }
+
     fn is_scope_reachable(&self, db: &'db dyn Db, scope_id: FileScopeId) -> bool {
         self.parent_scope_id(scope_id)
             .is_none_or(|parent_scope_id| {
@@ -495,20 +527,19 @@ impl<'db> SemanticIndex<'db> {
                 break;
             }
             if !ancestor_scope.is_eager() {
-                if let PlaceExprRef::Symbol(symbol) = expr {
-                    if let Some(place_id) =
+                if let PlaceExprRef::Symbol(symbol) = expr
+                    && let Some(place_id) =
                         self.place_tables[enclosing_scope].symbol_id(symbol.name())
-                    {
-                        let key = EnclosingSnapshotKey {
-                            enclosing_scope,
-                            enclosing_place: place_id.into(),
-                            nested_scope,
-                            nested_laziness: ScopeLaziness::Lazy,
-                        };
-                        if let Some(id) = self.enclosing_snapshots.get(&key) {
-                            return self.use_def_maps[enclosing_scope]
-                                .enclosing_snapshot(*id, key.nested_laziness);
-                        }
+                {
+                    let key = EnclosingSnapshotKey {
+                        enclosing_scope,
+                        enclosing_place: place_id.into(),
+                        nested_scope,
+                        nested_laziness: ScopeLaziness::Lazy,
+                    };
+                    if let Some(id) = self.enclosing_snapshots.get(&key) {
+                        return self.use_def_maps[enclosing_scope]
+                            .enclosing_snapshot(*id, key.nested_laziness);
                     }
                 }
                 return EnclosingSnapshotResult::NoLongerInEagerContext;
diff --git a/crates/ty_python_semantic/src/semantic_index/builder.rs b/crates/ty_python_semantic/src/semantic_index/builder.rs
index 943715fd11..8107f9c122 100644
--- a/crates/ty_python_semantic/src/semantic_index/builder.rs
+++ b/crates/ty_python_semantic/src/semantic_index/builder.rs
@@ -115,6 +115,7 @@ pub(super) struct SemanticIndexBuilder<'db, 'ast> {
     ///
     /// [generator functions]: https://docs.python.org/3/glossary.html#term-generator
     generator_functions: FxHashSet<FileScopeId>,
+    /// Snapshots of enclosing-scope place states visible from nested scopes.
     enclosing_snapshots: FxHashMap<EnclosingSnapshotKey, ScopedEnclosingSnapshotId>,
     /// Errors collected by the `semantic_checker`.
     semantic_syntax_errors: RefCell<Vec<SemanticSyntaxError>>,
@@ -316,11 +317,12 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
                     nested_scope: popped_scope_id,
                     nested_laziness: ScopeLaziness::Eager,
                 };
-                let eager_snapshot = self.use_def_maps[enclosing_scope_id].snapshot_outer_state(
-                    enclosing_place_id,
-                    enclosing_scope_kind,
-                    enclosing_place,
-                );
+                let eager_snapshot = self.use_def_maps[enclosing_scope_id]
+                    .snapshot_enclosing_state(
+                        enclosing_place_id,
+                        enclosing_scope_kind,
+                        enclosing_place,
+                    );
                 self.enclosing_snapshots.insert(key, eager_snapshot);
             }
 
@@ -390,7 +392,7 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
                     nested_scope: popped_scope_id,
                     nested_laziness: ScopeLaziness::Lazy,
                 };
-                let lazy_snapshot = self.use_def_maps[enclosing_scope_id].snapshot_outer_state(
+                let lazy_snapshot = self.use_def_maps[enclosing_scope_id].snapshot_enclosing_state(
                     enclosed_symbol_id.into(),
                     enclosing_scope_kind,
                     enclosing_place.into(),
@@ -400,29 +402,74 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
         }
     }
 
-    /// Any lazy snapshots of places that have been reassigned are no longer valid, so delete them.
-    fn sweep_lazy_snapshots(&mut self, popped_scope_id: FileScopeId) {
-        // Retain only snapshots that are either eager
-        //     || (enclosing_scope != popped_scope && popped_scope is not a visible ancestor of enclosing_scope)
-        //     || enclosing_place is not a symbol or not reassigned
-        // <=> remove those that are lazy
-        //     && (enclosing_scope == popped_scope || popped_scope is a visible ancestor of enclosing_scope)
-        //     && enclosing_place is a symbol and reassigned
-        self.enclosing_snapshots.retain(|key, _| {
-            let popped_place_table = &self.place_tables[popped_scope_id];
-            key.nested_laziness.is_eager()
-                || (key.enclosing_scope != popped_scope_id
-                    && VisibleAncestorsIter::new(&self.scopes, key.enclosing_scope)
-                        .all(|(ancestor, _)| ancestor != popped_scope_id))
-                || !key.enclosing_place.as_symbol().is_some_and(|symbol_id| {
-                    let name = &self.place_tables[key.enclosing_scope]
-                        .symbol(symbol_id)
-                        .name();
-                    popped_place_table.symbol_id(name).is_some_and(|symbol_id| {
-                        popped_place_table.symbol(symbol_id).is_reassigned()
-                    })
-                })
-        });
+    /// Any lazy snapshots of the place that have been reassigned are obsolete, so update them.
+    /// ```py
+    /// def outer() -> None:
+    ///     x = None
+    ///
+    ///     def inner2() -> None:
+    ///         # `inner` can be referenced before its definition,
+    ///         # but `inner2` must still be called after the definition of `inner` for this call to be valid.
+    ///         inner()
+    ///
+    ///         # In this scope, `x` may refer to `x = None` or `x = 1`.
+    ///         reveal_type(x)  # revealed: None | Literal[1]
+    ///
+    ///     # Reassignment of `x` after the definition of `inner2`.
+    ///     # Update lazy snapshots of `x` for `inner2`.
+    ///     x = 1
+    ///
+    ///     def inner() -> None:
+    ///         # In this scope, `x = None` appears as being shadowed by `x = 1`.
+    ///         reveal_type(x)  # revealed: Literal[1]
+    ///
+    ///     # No reassignment of `x` after the definition of `inner`, so we can safely use a lazy snapshot for `inner` as is.
+    ///     inner()
+    ///     inner2()
+    /// ```
+    fn update_lazy_snapshots(&mut self, symbol: ScopedSymbolId) {
+        let current_scope = self.current_scope();
+        let current_place_table = &self.place_tables[current_scope];
+        let symbol = current_place_table.symbol(symbol);
+        // Optimization: if this is the first binding of the symbol we've seen, there can't be any
+        // lazy snapshots of it to update.
+        if !symbol.is_reassigned() {
+            return;
+        }
+        for (key, snapshot_id) in &self.enclosing_snapshots {
+            if let Some(enclosing_symbol) = key.enclosing_place.as_symbol() {
+                let name = self.place_tables[key.enclosing_scope]
+                    .symbol(enclosing_symbol)
+                    .name();
+                let is_reassignment_of_snapshotted_symbol = || {
+                    for (ancestor, _) in
+                        VisibleAncestorsIter::new(&self.scopes, key.enclosing_scope)
+                    {
+                        if ancestor == current_scope {
+                            return true;
+                        }
+                        let ancestor_table = &self.place_tables[ancestor];
+                        // If there is a symbol binding in an ancestor scope,
+                        // then a reassignment in the current scope is not relevant to the snapshot.
+                        if ancestor_table
+                            .symbol_id(name)
+                            .is_some_and(|id| ancestor_table.symbol(id).is_bound())
+                        {
+                            return false;
+                        }
+                    }
+                    false
+                };
+
+                if key.nested_laziness.is_lazy()
+                    && symbol.name() == name
+                    && is_reassignment_of_snapshotted_symbol()
+                {
+                    self.use_def_maps[key.enclosing_scope]
+                        .update_enclosing_snapshot(*snapshot_id, enclosing_symbol);
+                }
+            }
+        }
     }
 
     fn sweep_nonlocal_lazy_snapshots(&mut self) {
@@ -464,8 +511,6 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
             .pop()
             .expect("Root scope should be present");
 
-        self.sweep_lazy_snapshots(popped_scope_id);
-
         let children_end = self.scopes.next_index();
 
         let popped_scope = &mut self.scopes[popped_scope_id];
@@ -659,6 +704,12 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
             }
         }
 
+        if category.is_binding() {
+            if let Some(id) = place.as_symbol() {
+                self.update_lazy_snapshots(id);
+            }
+        }
+
         let mut try_node_stack_manager = std::mem::take(&mut self.try_node_context_stack_manager);
         try_node_stack_manager.record_definition(self);
         self.try_node_context_stack_manager = try_node_stack_manager;
@@ -1114,10 +1165,6 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
         target: &'ast ast::Expr,
         value: Expression<'db>,
     ) {
-        // We only handle assignments to names and unpackings here, other targets like
-        // attribute and subscript are handled separately as they don't create a new
-        // definition.
-
         let current_assignment = match target {
             ast::Expr::List(_) | ast::Expr::Tuple(_) => {
                 if matches!(unpackable, Unpackable::Comprehension { .. }) {
@@ -1313,7 +1360,6 @@ impl<'ast> Visitor<'ast> for SemanticIndexBuilder<'_, 'ast> {
                 // used to collect all the overloaded definitions of a function. This needs to be
                 // done on the `Identifier` node as opposed to `ExprName` because that's what the
                 // AST uses.
-                self.mark_symbol_used(symbol);
                 let use_id = self.current_ast_ids().record_use(name);
                 self.current_use_def_map_mut().record_use(
                     symbol.into(),
@@ -1322,6 +1368,7 @@ impl<'ast> Visitor<'ast> for SemanticIndexBuilder<'_, 'ast> {
                 );
 
                 self.add_definition(symbol.into(), function_def);
+                self.mark_symbol_used(symbol);
             }
             ast::Stmt::ClassDef(class) => {
                 for decorator in &class.decorator_list {
@@ -1577,10 +1624,22 @@ impl<'ast> Visitor<'ast> for SemanticIndexBuilder<'_, 'ast> {
                 debug_assert_eq!(&self.current_assignments, &[]);
 
                 self.visit_expr(&node.value);
-                let value = self.add_standalone_assigned_expression(&node.value, node);
 
-                for target in &node.targets {
-                    self.add_unpackable_assignment(&Unpackable::Assign(node), target, value);
+                // Optimization for the common case: if there's just one target, and it's not an
+                // unpacking, and the target is a simple name, we don't need the RHS to be a
+                // standalone expression at all.
+                if let [target] = &node.targets[..]
+                    && target.is_name_expr()
+                {
+                    self.push_assignment(CurrentAssignment::Assign { node, unpack: None });
+                    self.visit_expr(target);
+                    self.pop_assignment();
+                } else {
+                    let value = self.add_standalone_assigned_expression(&node.value, node);
+
+                    for target in &node.targets {
+                        self.add_unpackable_assignment(&Unpackable::Assign(node), target, value);
+                    }
                 }
             }
             ast::Stmt::AnnAssign(node) => {
@@ -2221,7 +2280,7 @@ impl<'ast> Visitor<'ast> for SemanticIndexBuilder<'_, 'ast> {
                 // like `sys.exit()`, and not within sub-expression like `3 + sys.exit()` etc.
                 //
                 // We also only add these inside function scopes, since considering module-level
-                // constraints can affect the the type of imported symbols, leading to a lot more
+                // constraints can affect the type of imported symbols, leading to a lot more
                 // work in third-party code.
                 if let ast::Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
                     if !self.source_type.is_stub() && self.in_function_scope() {
@@ -2644,7 +2703,7 @@ impl SemanticSyntaxContext for SemanticIndexBuilder<'_, '_> {
             match scope.kind() {
                 ScopeKind::Class | ScopeKind::Lambda => return false,
                 ScopeKind::Function => {
-                    return scope.node().expect_function(self.module).is_async;
+                    return scope.node().expect_function().node(self.module).is_async;
                 }
                 ScopeKind::Comprehension
                 | ScopeKind::Module
@@ -2726,6 +2785,13 @@ impl SemanticSyntaxContext for SemanticIndexBuilder<'_, '_> {
             self.semantic_syntax_errors.borrow_mut().push(error);
         }
     }
+
+    fn in_loop_context(&self) -> bool {
+        self.current_scope_info().current_loop.is_some()
+    }
+    fn is_bound_parameter(&self, _name: &str) -> bool {
+        false
+    }
 }
 
 #[derive(Copy, Clone, Debug, PartialEq)]
diff --git a/crates/ty_python_semantic/src/semantic_index/definition.rs b/crates/ty_python_semantic/src/semantic_index/definition.rs
index 2e2ff104de..81af22d314 100644
--- a/crates/ty_python_semantic/src/semantic_index/definition.rs
+++ b/crates/ty_python_semantic/src/semantic_index/definition.rs
@@ -22,7 +22,12 @@ use crate::unpack::{Unpack, UnpackPosition};
 /// because a new scope gets inserted before the `Definition` or a new place is inserted
 /// before this `Definition`. However, the ID can be considered stable and it is okay to use
 /// `Definition` in cross-module` salsa queries or as a field on other salsa tracked structs.
+///
+/// # Ordering
+/// Ordering is based on the definition's salsa-assigned id and not on its values.
+/// The id may change between runs, or when the definition was garbage collected and recreated.
 #[salsa::tracked(debug, heap_size=ruff_memory_usage::heap_size)]
+#[derive(Ord, PartialOrd)]
 pub struct Definition<'db> {
     /// The file in which the definition occurs.
     pub file: File,
@@ -38,7 +43,7 @@ pub struct Definition<'db> {
     #[no_eq]
     #[returns(ref)]
     #[tracked]
-    pub(crate) kind: DefinitionKind<'db>,
+    pub kind: DefinitionKind<'db>,
 
     /// This is a dedicated field to avoid accessing `kind` to compute this value.
     pub(crate) is_reexported: bool,
@@ -706,13 +711,6 @@ impl DefinitionKind<'_> {
         matches!(self, DefinitionKind::Assignment(_))
     }
 
-    pub(crate) fn as_typevar(&self) -> Option<&AstNodeRef<ast::TypeParamTypeVar>> {
-        match self {
-            DefinitionKind::TypeVar(type_var) => Some(type_var),
-            _ => None,
-        }
-    }
-
     /// Returns the [`TextRange`] of the definition target.
     ///
     /// A definition target would mainly be the node representing the place being defined i.e.,
@@ -769,13 +767,14 @@ impl DefinitionKind<'_> {
                 target_range.cover(value_range)
             }
             DefinitionKind::AnnotatedAssignment(assign) => {
-                let target_range = assign.target.node(module).range();
+                let mut full_range = assign.target.node(module).range();
+                full_range = full_range.cover(assign.annotation.node(module).range());
+
                 if let Some(ref value) = assign.value {
-                    let value_range = value.node(module).range();
-                    target_range.cover(value_range)
-                } else {
-                    target_range
+                    full_range = full_range.cover(value.node(module).range());
                 }
+
+                full_range
             }
             DefinitionKind::AugmentedAssignment(aug_assign) => aug_assign.node(module).range(),
             DefinitionKind::For(for_stmt) => for_stmt.target.node(module).range(),
@@ -875,7 +874,7 @@ pub struct StarImportDefinitionKind {
 }
 
 impl StarImportDefinitionKind {
-    pub(crate) fn import<'ast>(&self, module: &'ast ParsedModuleRef) -> &'ast ast::StmtImportFrom {
+    pub fn import<'ast>(&self, module: &'ast ParsedModuleRef) -> &'ast ast::StmtImportFrom {
         self.node.node(module)
     }
 
@@ -959,7 +958,7 @@ pub struct ImportDefinitionKind {
 }
 
 impl ImportDefinitionKind {
-    pub(crate) fn import<'ast>(&self, module: &'ast ParsedModuleRef) -> &'ast ast::StmtImport {
+    pub fn import<'ast>(&self, module: &'ast ParsedModuleRef) -> &'ast ast::StmtImport {
         self.node.node(module)
     }
 
@@ -980,7 +979,7 @@ pub struct ImportFromDefinitionKind {
 }
 
 impl ImportFromDefinitionKind {
-    pub(crate) fn import<'ast>(&self, module: &'ast ParsedModuleRef) -> &'ast ast::StmtImportFrom {
+    pub fn import<'ast>(&self, module: &'ast ParsedModuleRef) -> &'ast ast::StmtImportFrom {
         self.node.node(module)
     }
 
@@ -1226,3 +1225,12 @@ impl From<&ast::TypeParamTypeVarTuple> for DefinitionNodeKey {
         Self(NodeKey::from_node(value))
     }
 }
+
+impl<T> From<&AstNodeRef<T>> for DefinitionNodeKey
+where
+    for<'a> &'a T: Into<DefinitionNodeKey>,
+{
+    fn from(value: &AstNodeRef<T>) -> Self {
+        Self(NodeKey::from_node_ref(value))
+    }
+}
diff --git a/crates/ty_python_semantic/src/semantic_index/place.rs b/crates/ty_python_semantic/src/semantic_index/place.rs
index 38e3d92816..04bea97626 100644
--- a/crates/ty_python_semantic/src/semantic_index/place.rs
+++ b/crates/ty_python_semantic/src/semantic_index/place.rs
@@ -181,7 +181,8 @@ impl PlaceTable {
     }
 
     /// Looks up a symbol by its name and returns a reference to it, if it exists.
-    #[cfg(test)]
+    ///
+    /// This should only be used in diagnostics and tests.
     pub(crate) fn symbol_by_name(&self, name: &str) -> Option<&Symbol> {
         self.symbols.symbol_id(name).map(|id| self.symbol(id))
     }
diff --git a/crates/ty_python_semantic/src/semantic_index/re_exports.rs b/crates/ty_python_semantic/src/semantic_index/re_exports.rs
index 9f2139637f..52f26ef4a0 100644
--- a/crates/ty_python_semantic/src/semantic_index/re_exports.rs
+++ b/crates/ty_python_semantic/src/semantic_index/re_exports.rs
@@ -30,20 +30,11 @@ use rustc_hash::FxHashMap;
 
 use crate::{Db, module_name::ModuleName, resolve_module};
 
-fn exports_cycle_recover(
-    _db: &dyn Db,
-    _value: &[Name],
-    _count: u32,
-    _file: File,
-) -> salsa::CycleRecoveryAction<Box<[Name]>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn exports_cycle_initial(_db: &dyn Db, _file: File) -> Box<[Name]> {
     Box::default()
 }
 
-#[salsa::tracked(returns(deref), cycle_fn=exports_cycle_recover, cycle_initial=exports_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(deref), cycle_initial=exports_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(super) fn exported_names(db: &dyn Db, file: File) -> Box<[Name]> {
     let module = parsed_module(db, file).load(db);
     let mut finder = ExportFinder::new(db, file);
diff --git a/crates/ty_python_semantic/src/semantic_index/reachability_constraints.rs b/crates/ty_python_semantic/src/semantic_index/reachability_constraints.rs
index 9042e919be..3d09733324 100644
--- a/crates/ty_python_semantic/src/semantic_index/reachability_constraints.rs
+++ b/crates/ty_python_semantic/src/semantic_index/reachability_constraints.rs
@@ -208,7 +208,8 @@ use crate::semantic_index::predicate::{
     Predicates, ScopedPredicateId,
 };
 use crate::types::{
-    IntersectionBuilder, Truthiness, Type, UnionBuilder, UnionType, infer_expression_type,
+    IntersectionBuilder, Truthiness, Type, TypeContext, UnionBuilder, UnionType,
+    infer_expression_type, static_expression_truthiness,
 };
 
 /// A ternary formula that defines under what conditions a binding is visible. (A ternary formula
@@ -327,10 +328,12 @@ fn singleton_to_type(db: &dyn Db, singleton: ruff_python_ast::Singleton) -> Type
 fn pattern_kind_to_type<'db>(db: &'db dyn Db, kind: &PatternPredicateKind<'db>) -> Type<'db> {
     match kind {
         PatternPredicateKind::Singleton(singleton) => singleton_to_type(db, *singleton),
-        PatternPredicateKind::Value(value) => infer_expression_type(db, *value),
+        PatternPredicateKind::Value(value) => {
+            infer_expression_type(db, *value, TypeContext::default())
+        }
         PatternPredicateKind::Class(class_expr, kind) => {
             if kind.is_irrefutable() {
-                infer_expression_type(db, *class_expr)
+                infer_expression_type(db, *class_expr, TypeContext::default())
                     .to_instance(db)
                     .unwrap_or(Type::Never)
             } else {
@@ -343,7 +346,7 @@ fn pattern_kind_to_type<'db>(db: &'db dyn Db, kind: &PatternPredicateKind<'db>)
         PatternPredicateKind::As(pattern, _) => pattern
             .as_deref()
             .map(|p| pattern_kind_to_type(db, p))
-            .unwrap_or_else(|| Type::object(db)),
+            .unwrap_or_else(Type::object),
         PatternPredicateKind::Unsupported => Type::Never,
     }
 }
@@ -424,9 +427,26 @@ impl ReachabilityConstraintsBuilder {
         }
     }
 
-    /// Returns whether `a` or `b` has a "larger" atom. TDDs are ordered such that interior nodes
-    /// can only have edges to "larger" nodes. Terminals are considered to have a larger atom than
-    /// any internal node, since they are leaf nodes.
+    /// Implements the ordering that determines which level a TDD node appears at.
+    ///
+    /// Each interior node checks the value of a single variable (for us, a `Predicate`).
+    /// TDDs are ordered such that every path from the root of the graph to the leaves must
+    /// check each variable at most once, and must check each variable in the same order.
+    ///
+    /// We can choose any ordering that we want, as long as it's consistent — with the
+    /// caveat that terminal nodes must always be last in the ordering, since they are the
+    /// leaf nodes of the graph.
+    ///
+    /// We currently compare interior nodes by looking at the Salsa IDs of each variable's
+    /// `Predicate`, since this is already available and easy to compare. We also _reverse_
+    /// the comparison of those Salsa IDs. The Salsa IDs are assigned roughly sequentially
+    /// while traversing the source code. Reversing the comparison means `Predicate`s that
+    /// appear later in the source will tend to be placed "higher" (closer to the root) in
+    /// the TDD graph. We have found empirically that this leads to smaller TDD graphs [1],
+    /// since there are often repeated combinations of `Predicate`s from earlier in the
+    /// file.
+    ///
+    /// [1]: https://github.com/astral-sh/ruff/pull/20098
     fn cmp_atoms(
         &self,
         a: ScopedReachabilityConstraintId,
@@ -439,7 +459,12 @@ impl ReachabilityConstraintsBuilder {
         } else if b.is_terminal() {
             Ordering::Less
         } else {
-            self.interiors[a].atom.cmp(&self.interiors[b].atom)
+            // See https://github.com/astral-sh/ruff/pull/20098 for an explanation of why this
+            // ordering is reversed.
+            self.interiors[a]
+                .atom
+                .cmp(&self.interiors[b].atom)
+                .reverse()
         }
     }
 
@@ -695,7 +720,7 @@ impl ReachabilityConstraints {
     ) -> Truthiness {
         match predicate_kind {
             PatternPredicateKind::Value(value) => {
-                let value_ty = infer_expression_type(db, *value);
+                let value_ty = infer_expression_type(db, *value, TypeContext::default());
 
                 if subject_ty.is_single_valued(db) {
                     Truthiness::from(subject_ty.is_equivalent_to(db, value_ty))
@@ -746,7 +771,8 @@ impl ReachabilityConstraints {
                 truthiness
             }
             PatternPredicateKind::Class(class_expr, kind) => {
-                let class_ty = infer_expression_type(db, *class_expr).to_instance(db);
+                let class_ty =
+                    infer_expression_type(db, *class_expr, TypeContext::default()).to_instance(db);
 
                 class_ty.map_or(Truthiness::Ambiguous, |class_ty| {
                     if subject_ty.is_subtype_of(db, class_ty) {
@@ -774,7 +800,7 @@ impl ReachabilityConstraints {
     }
 
     fn analyze_single_pattern_predicate(db: &dyn Db, predicate: PatternPredicate) -> Truthiness {
-        let subject_ty = infer_expression_type(db, predicate.subject(db));
+        let subject_ty = infer_expression_type(db, predicate.subject(db), TypeContext::default());
 
         let narrowed_subject_ty = IntersectionBuilder::new(db)
             .add_positive(subject_ty)
@@ -797,10 +823,11 @@ impl ReachabilityConstraints {
     }
 
     fn analyze_single(db: &dyn Db, predicate: &Predicate) -> Truthiness {
+        let _span = tracing::trace_span!("analyze_single", ?predicate).entered();
+
         match predicate.node {
             PredicateNode::Expression(test_expr) => {
-                let ty = infer_expression_type(db, test_expr);
-                ty.bool(db).negate_if(!predicate.is_positive)
+                static_expression_truthiness(db, test_expr).negate_if(!predicate.is_positive)
             }
             PredicateNode::ReturnsNever(CallableAndCallExpr {
                 callable,
@@ -813,7 +840,7 @@ impl ReachabilityConstraints {
                 // selection algorithm).
                 // Avoiding this on the happy-path is important because these constraints can be
                 // very large in number, since we add them on all statement level function calls.
-                let ty = infer_expression_type(db, callable);
+                let ty = infer_expression_type(db, callable, TypeContext::default());
 
                 // Short-circuit for well known types that are known not to return `Never` when called.
                 // Without the short-circuit, we've seen that threads keep blocking each other
@@ -827,7 +854,7 @@ impl ReachabilityConstraints {
                 }
 
                 let overloads_iterator =
-                    if let Some(Type::Callable(callable)) = ty.into_callable(db) {
+                    if let Some(Type::Callable(callable)) = ty.try_upcast_to_callable(db) {
                         callable.signatures(db).overloads.iter()
                     } else {
                         return Truthiness::AlwaysFalse.negate_if(!predicate.is_positive);
@@ -851,7 +878,7 @@ impl ReachabilityConstraints {
                 } else if all_overloads_return_never {
                     Truthiness::AlwaysTrue
                 } else {
-                    let call_expr_ty = infer_expression_type(db, call_expr);
+                    let call_expr_ty = infer_expression_type(db, call_expr, TypeContext::default());
                     if call_expr_ty.is_equivalent_to(db, Type::Never) {
                         Truthiness::AlwaysTrue
                     } else {
@@ -890,13 +917,17 @@ impl ReachabilityConstraints {
                 )
                 .place
                 {
-                    crate::place::Place::Type(_, crate::place::Boundness::Bound) => {
-                        Truthiness::AlwaysTrue
-                    }
-                    crate::place::Place::Type(_, crate::place::Boundness::PossiblyUnbound) => {
-                        Truthiness::Ambiguous
-                    }
-                    crate::place::Place::Unbound => Truthiness::AlwaysFalse,
+                    crate::place::Place::Defined(
+                        _,
+                        _,
+                        crate::place::Definedness::AlwaysDefined,
+                    ) => Truthiness::AlwaysTrue,
+                    crate::place::Place::Defined(
+                        _,
+                        _,
+                        crate::place::Definedness::PossiblyUndefined,
+                    ) => Truthiness::Ambiguous,
+                    crate::place::Place::Undefined => Truthiness::AlwaysFalse,
                 }
             }
         }
diff --git a/crates/ty_python_semantic/src/semantic_index/scope.rs b/crates/ty_python_semantic/src/semantic_index/scope.rs
index b29e732305..c7c42241a3 100644
--- a/crates/ty_python_semantic/src/semantic_index/scope.rs
+++ b/crates/ty_python_semantic/src/semantic_index/scope.rs
@@ -11,10 +11,12 @@ use crate::{
     semantic_index::{
         SemanticIndex, reachability_constraints::ScopedReachabilityConstraintId, semantic_index,
     },
+    types::{GenericContext, binding_type, infer_definition_types},
 };
 
 /// A cross-module identifier of a scope that can be used as a salsa query parameter.
 #[salsa::tracked(debug, heap_size=ruff_memory_usage::heap_size)]
+#[derive(PartialOrd, Ord)]
 pub struct ScopeId<'db> {
     pub file: File,
 
@@ -25,10 +27,6 @@ pub struct ScopeId<'db> {
 impl get_size2::GetSize for ScopeId<'_> {}
 
 impl<'db> ScopeId<'db> {
-    pub(crate) fn is_function_like(self, db: &'db dyn Db) -> bool {
-        self.node(db).scope_kind().is_function_like()
-    }
-
     pub(crate) fn is_annotation(self, db: &'db dyn Db) -> bool {
         self.node(db).scope_kind().is_annotation()
     }
@@ -195,6 +193,10 @@ impl ScopeLaziness {
     pub(crate) const fn is_eager(self) -> bool {
         matches!(self, ScopeLaziness::Eager)
     }
+
+    pub(crate) const fn is_lazy(self) -> bool {
+        matches!(self, ScopeLaziness::Lazy)
+    }
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -397,49 +399,67 @@ impl NodeWithScopeKind {
         }
     }
 
-    pub(crate) fn expect_class<'ast>(
-        &self,
-        module: &'ast ParsedModuleRef,
-    ) -> &'ast ast::StmtClassDef {
+    pub(crate) fn as_class(&self) -> Option<&AstNodeRef<ast::StmtClassDef>> {
         match self {
-            Self::Class(class) => class.node(module),
-            _ => panic!("expected class"),
-        }
-    }
-
-    pub(crate) fn as_class<'ast>(
-        &self,
-        module: &'ast ParsedModuleRef,
-    ) -> Option<&'ast ast::StmtClassDef> {
-        match self {
-            Self::Class(class) => Some(class.node(module)),
+            Self::Class(class) => Some(class),
             _ => None,
         }
     }
 
-    pub(crate) fn expect_function<'ast>(
-        &self,
-        module: &'ast ParsedModuleRef,
-    ) -> &'ast ast::StmtFunctionDef {
-        self.as_function(module).expect("expected function")
+    pub(crate) fn expect_class(&self) -> &AstNodeRef<ast::StmtClassDef> {
+        self.as_class().expect("expected class")
     }
 
-    pub(crate) fn expect_type_alias<'ast>(
-        &self,
-        module: &'ast ParsedModuleRef,
-    ) -> &'ast ast::StmtTypeAlias {
+    pub(crate) fn as_function(&self) -> Option<&AstNodeRef<ast::StmtFunctionDef>> {
         match self {
-            Self::TypeAlias(type_alias) => type_alias.node(module),
-            _ => panic!("expected type alias"),
+            Self::Function(function) => Some(function),
+            _ => None,
         }
     }
 
-    pub(crate) fn as_function<'ast>(
-        &self,
-        module: &'ast ParsedModuleRef,
-    ) -> Option<&'ast ast::StmtFunctionDef> {
+    pub(crate) fn expect_function(&self) -> &AstNodeRef<ast::StmtFunctionDef> {
+        self.as_function().expect("expected function")
+    }
+
+    pub(crate) fn as_type_alias(&self) -> Option<&AstNodeRef<ast::StmtTypeAlias>> {
         match self {
-            Self::Function(function) => Some(function.node(module)),
+            Self::TypeAlias(type_alias) => Some(type_alias),
+            _ => None,
+        }
+    }
+
+    pub(crate) fn expect_type_alias(&self) -> &AstNodeRef<ast::StmtTypeAlias> {
+        self.as_type_alias().expect("expected type alias")
+    }
+
+    pub(crate) fn generic_context<'db>(
+        &self,
+        db: &'db dyn Db,
+        index: &SemanticIndex<'db>,
+    ) -> Option<GenericContext<'db>> {
+        match self {
+            NodeWithScopeKind::Class(class) => {
+                let definition = index.expect_single_definition(class);
+                binding_type(db, definition)
+                    .as_class_literal()?
+                    .generic_context(db)
+            }
+            NodeWithScopeKind::Function(function) => {
+                let definition = index.expect_single_definition(function);
+                infer_definition_types(db, definition)
+                    .undecorated_type()
+                    .expect("function should have undecorated type")
+                    .as_function_literal()?
+                    .last_definition_signature(db)
+                    .generic_context
+            }
+            NodeWithScopeKind::TypeAlias(type_alias) => {
+                let definition = index.expect_single_definition(type_alias);
+                binding_type(db, definition)
+                    .as_type_alias()?
+                    .as_pep_695_type_alias()?
+                    .generic_context(db)
+            }
             _ => None,
         }
     }
diff --git a/crates/ty_python_semantic/src/semantic_index/use_def.rs b/crates/ty_python_semantic/src/semantic_index/use_def.rs
index 136287a5c1..39f3a1a8ec 100644
--- a/crates/ty_python_semantic/src/semantic_index/use_def.rs
+++ b/crates/ty_python_semantic/src/semantic_index/use_def.rs
@@ -243,10 +243,6 @@
 use ruff_index::{IndexVec, newtype_index};
 use rustc_hash::FxHashMap;
 
-use self::place_state::{
-    Bindings, Declarations, EnclosingSnapshot, LiveBindingsIterator, LiveDeclaration,
-    LiveDeclarationsIterator, PlaceState, ScopedDefinitionId,
-};
 use crate::node_key::NodeKey;
 use crate::place::BoundnessAnalysis;
 use crate::semantic_index::ast_ids::ScopedUseId;
@@ -254,6 +250,7 @@ use crate::semantic_index::definition::{Definition, DefinitionState};
 use crate::semantic_index::member::ScopedMemberId;
 use crate::semantic_index::narrowing_constraints::{
     ConstraintKey, NarrowingConstraints, NarrowingConstraintsBuilder, NarrowingConstraintsIterator,
+    ScopedNarrowingConstraint,
 };
 use crate::semantic_index::place::{PlaceExprRef, ScopedPlaceId};
 use crate::semantic_index::predicate::{
@@ -264,7 +261,10 @@ use crate::semantic_index::reachability_constraints::{
 };
 use crate::semantic_index::scope::{FileScopeId, ScopeKind, ScopeLaziness};
 use crate::semantic_index::symbol::ScopedSymbolId;
-use crate::semantic_index::use_def::place_state::PreviousDefinitions;
+use crate::semantic_index::use_def::place_state::{
+    Bindings, Declarations, EnclosingSnapshot, LiveBindingsIterator, LiveDeclaration,
+    LiveDeclarationsIterator, PlaceState, PreviousDefinitions, ScopedDefinitionId,
+};
 use crate::semantic_index::{EnclosingSnapshotResult, SemanticIndex};
 use crate::types::{IntersectionBuilder, Truthiness, Type, infer_narrowing_constraint};
 
@@ -598,19 +598,7 @@ impl<'db> UseDefMap<'db> {
             .is_always_false()
     }
 
-    pub(crate) fn is_declaration_reachable(
-        &self,
-        db: &dyn crate::Db,
-        declaration: &DeclarationWithConstraint<'db>,
-    ) -> Truthiness {
-        self.reachability_constraints.evaluate(
-            db,
-            &self.predicates,
-            declaration.reachability_constraint,
-        )
-    }
-
-    pub(crate) fn is_binding_reachable(
+    pub(crate) fn binding_reachability(
         &self,
         db: &dyn crate::Db,
         binding: &BindingWithConstraints<'_, 'db>,
@@ -652,8 +640,8 @@ impl<'db> UseDefMap<'db> {
     }
 }
 
-/// Uniquely identifies a snapshot of an enclosing scope place state that can be used to resolve a reference in a
-/// nested scope.
+/// Uniquely identifies a snapshot of an enclosing scope place state that can be used to resolve a
+/// reference in a nested scope.
 ///
 /// An eager scope has its entire body executed immediately at the location where it is defined.
 /// For any free references in the nested scope, we use the bindings that are visible at the point
@@ -672,19 +660,17 @@ pub(crate) struct EnclosingSnapshotKey {
     pub(crate) enclosing_place: ScopedPlaceId,
     /// The nested scope containing the reference
     pub(crate) nested_scope: FileScopeId,
-    /// Laziness of the nested scope
+    /// Laziness of the nested scope (technically redundant, but convenient to have here)
     pub(crate) nested_laziness: ScopeLaziness,
 }
 
-/// A snapshot of enclosing scope place states that can be used to resolve a reference in a nested scope.
-/// Normally, if the current scope is lazily evaluated,
-/// we do not snapshot the place states from the enclosing scope,
-/// and infer the type of the place from its reachable definitions
-/// (and any narrowing constraints introduced in the enclosing scope do not apply to the current scope).
-/// The exception is if the symbol has never been reassigned, in which case it is snapshotted.
+/// Snapshots of enclosing scope place states for resolving a reference in a nested scope.
+/// If the nested scope is eager, the snapshot is simply recorded and used as is.
+/// If it is lazy, every time the outer symbol is reassigned, the snapshot is updated to add the
+/// new binding.
 type EnclosingSnapshots = IndexVec<ScopedEnclosingSnapshotId, EnclosingSnapshot>;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub(crate) struct BindingWithConstraintsIterator<'map, 'db> {
     all_definitions: &'map IndexVec<ScopedDefinitionId, DefinitionState<'db>>,
     pub(crate) predicates: &'map Predicates<'db>,
@@ -1197,7 +1183,7 @@ impl<'db> UseDefMapBuilder<'db> {
         self.node_reachability.insert(node_key, self.reachability);
     }
 
-    pub(super) fn snapshot_outer_state(
+    pub(super) fn snapshot_enclosing_state(
         &mut self,
         enclosing_place: ScopedPlaceId,
         scope: ScopeKind,
@@ -1220,6 +1206,27 @@ impl<'db> UseDefMapBuilder<'db> {
         }
     }
 
+    pub(super) fn update_enclosing_snapshot(
+        &mut self,
+        snapshot_id: ScopedEnclosingSnapshotId,
+        enclosing_symbol: ScopedSymbolId,
+    ) {
+        match self.enclosing_snapshots.get_mut(snapshot_id) {
+            Some(EnclosingSnapshot::Bindings(bindings)) => {
+                let new_symbol_state = &self.symbol_states[enclosing_symbol];
+                bindings.merge(
+                    new_symbol_state.bindings().clone(),
+                    &mut self.narrowing_constraints,
+                    &mut self.reachability_constraints,
+                );
+            }
+            Some(EnclosingSnapshot::Constraint(constraint)) => {
+                *constraint = ScopedNarrowingConstraint::empty();
+            }
+            None => {}
+        }
+    }
+
     /// Take a snapshot of the current visible-places state.
     pub(super) fn snapshot(&self) -> FlowSnapshot {
         FlowSnapshot {
diff --git a/crates/ty_python_semantic/src/semantic_index/use_def/place_state.rs b/crates/ty_python_semantic/src/semantic_index/use_def/place_state.rs
index b3f02f0fa0..4695bda41d 100644
--- a/crates/ty_python_semantic/src/semantic_index/use_def/place_state.rs
+++ b/crates/ty_python_semantic/src/semantic_index/use_def/place_state.rs
@@ -308,7 +308,7 @@ impl Bindings {
         self.live_bindings.iter()
     }
 
-    fn merge(
+    pub(super) fn merge(
         &mut self,
         b: Self,
         narrowing_constraints: &mut NarrowingConstraintsBuilder,
diff --git a/crates/ty_python_semantic/src/semantic_model.rs b/crates/ty_python_semantic/src/semantic_model.rs
index 47eacbb3a5..6a71f7adfb 100644
--- a/crates/ty_python_semantic/src/semantic_model.rs
+++ b/crates/ty_python_semantic/src/semantic_model.rs
@@ -3,6 +3,7 @@ use ruff_db::source::line_index;
 use ruff_python_ast as ast;
 use ruff_python_ast::{Expr, ExprRef, HasNodeIndex, name::Name};
 use ruff_source_file::LineIndex;
+use rustc_hash::FxHashMap;
 
 use crate::Db;
 use crate::module_name::ModuleName;
@@ -11,6 +12,7 @@ use crate::semantic_index::definition::Definition;
 use crate::semantic_index::scope::FileScopeId;
 use crate::semantic_index::semantic_index;
 use crate::types::ide_support::all_declarations_and_bindings;
+use crate::types::ide_support::{Member, all_members};
 use crate::types::{Type, binding_type, infer_scope_types};
 
 pub struct SemanticModel<'db> {
@@ -25,7 +27,7 @@ impl<'db> SemanticModel<'db> {
 
     // TODO we don't actually want to expose the Db directly to lint rules, but we need to find a
     // solution for exposing information from types
-    pub fn db(&self) -> &dyn Db {
+    pub fn db(&self) -> &'db dyn Db {
         self.db
     }
 
@@ -37,6 +39,37 @@ impl<'db> SemanticModel<'db> {
         line_index(self.db, self.file)
     }
 
+    /// Returns a map from symbol name to that symbol's
+    /// type and definition site (if available).
+    ///
+    /// The symbols are the symbols in scope at the given
+    /// AST node.
+    pub fn members_in_scope_at(
+        &self,
+        node: ast::AnyNodeRef<'_>,
+    ) -> FxHashMap<Name, MemberDefinition<'db>> {
+        let index = semantic_index(self.db, self.file);
+        let mut members = FxHashMap::default();
+        let Some(file_scope) = self.scope(node) else {
+            return members;
+        };
+
+        for (file_scope, _) in index.ancestor_scopes(file_scope) {
+            for memberdef in
+                all_declarations_and_bindings(self.db, file_scope.to_scope_id(self.db, self.file))
+            {
+                members.insert(
+                    memberdef.member.name,
+                    MemberDefinition {
+                        ty: memberdef.member.ty,
+                        definition: memberdef.definition,
+                    },
+                );
+            }
+        }
+        members
+    }
+
     pub fn resolve_module(&self, module_name: &ModuleName) -> Option<Module<'_>> {
         resolve_module(self.db, module_name)
     }
@@ -50,7 +83,7 @@ impl<'db> SemanticModel<'db> {
                 let ty = Type::module_literal(self.db, self.file, module);
                 Completion {
                     name: Name::new(module.name(self.db).as_str()),
-                    ty,
+                    ty: Some(ty),
                     builtin,
                 }
             })
@@ -161,8 +194,12 @@ impl<'db> SemanticModel<'db> {
         let builtin = module.is_known(self.db, KnownModule::Builtins);
 
         let mut completions = vec![];
-        for crate::types::Member { name, ty } in crate::types::all_members(self.db, ty) {
-            completions.push(Completion { name, ty, builtin });
+        for Member { name, ty } in all_members(self.db, ty) {
+            completions.push(Completion {
+                name,
+                ty: Some(ty),
+                builtin,
+            });
         }
         completions.extend(self.submodule_completions(&module));
         completions
@@ -173,20 +210,14 @@ impl<'db> SemanticModel<'db> {
         let builtin = module.is_known(self.db, KnownModule::Builtins);
 
         let mut completions = vec![];
-        for submodule_basename in module.all_submodules(self.db) {
-            let Some(basename) = ModuleName::new(submodule_basename.as_str()) else {
+        for submodule in module.all_submodules(self.db) {
+            let ty = Type::module_literal(self.db, self.file, *submodule);
+            let Some(base) = submodule.name(self.db).components().next_back() else {
                 continue;
             };
-            let mut submodule_name = module.name(self.db).clone();
-            submodule_name.extend(&basename);
-
-            let Some(submodule) = resolve_module(self.db, &submodule_name) else {
-                continue;
-            };
-            let ty = Type::module_literal(self.db, self.file, submodule);
             completions.push(Completion {
-                name: submodule_basename.clone(),
-                ty,
+                name: Name::new(base),
+                ty: Some(ty),
                 builtin,
             });
         }
@@ -196,11 +227,11 @@ impl<'db> SemanticModel<'db> {
     /// Returns completions for symbols available in a `object.<CURSOR>` context.
     pub fn attribute_completions(&self, node: &ast::ExprAttribute) -> Vec<Completion<'db>> {
         let ty = node.value.inferred_type(self);
-        crate::types::all_members(self.db, ty)
+        all_members(self.db, ty)
             .into_iter()
             .map(|member| Completion {
                 name: member.name,
-                ty: member.ty,
+                ty: Some(member.ty),
                 builtin: false,
             })
             .collect()
@@ -214,29 +245,16 @@ impl<'db> SemanticModel<'db> {
     pub fn scoped_completions(&self, node: ast::AnyNodeRef<'_>) -> Vec<Completion<'db>> {
         let index = semantic_index(self.db, self.file);
 
-        // TODO: We currently use `try_expression_scope_id` here as a hotfix for [1].
-        // Revert this to use `expression_scope_id` once a proper fix is in place.
-        //
-        // [1] https://github.com/astral-sh/ty/issues/572
-        let Some(file_scope) = (match node {
-            ast::AnyNodeRef::Identifier(identifier) => index.try_expression_scope_id(identifier),
-            node => match node.as_expr_ref() {
-                // If we couldn't identify a specific
-                // expression that we're in, then just
-                // fall back to the global scope.
-                None => Some(FileScopeId::global()),
-                Some(expr) => index.try_expression_scope_id(&expr),
-            },
-        }) else {
+        let Some(file_scope) = self.scope(node) else {
             return vec![];
         };
         let mut completions = vec![];
         for (file_scope, _) in index.ancestor_scopes(file_scope) {
             completions.extend(
                 all_declarations_and_bindings(self.db, file_scope.to_scope_id(self.db, self.file))
-                    .map(|member| Completion {
-                        name: member.name,
-                        ty: member.ty,
+                    .map(|memberdef| Completion {
+                        name: memberdef.member.name,
+                        ty: Some(memberdef.member.ty),
                         builtin: false,
                     }),
             );
@@ -246,6 +264,28 @@ impl<'db> SemanticModel<'db> {
         completions.extend(self.module_completions(&builtins));
         completions
     }
+
+    fn scope(&self, node: ast::AnyNodeRef<'_>) -> Option<FileScopeId> {
+        let index = semantic_index(self.db, self.file);
+
+        match node {
+            ast::AnyNodeRef::Identifier(identifier) => index.try_expression_scope_id(identifier),
+            node => match node.as_expr_ref() {
+                // If we couldn't identify a specific
+                // expression that we're in, then just
+                // fall back to the global scope.
+                None => Some(FileScopeId::global()),
+                Some(expr) => index.try_expression_scope_id(&expr),
+            },
+        }
+    }
+}
+
+/// The type and definition (if available) of a symbol.
+#[derive(Clone, Debug)]
+pub struct MemberDefinition<'db> {
+    pub ty: Type<'db>,
+    pub definition: Option<Definition<'db>>,
 }
 
 /// A classification of symbol names.
@@ -286,8 +326,13 @@ impl NameKind {
 pub struct Completion<'db> {
     /// The label shown to the user for this suggestion.
     pub name: Name,
-    /// The type of this completion.
-    pub ty: Type<'db>,
+    /// The type of this completion, if available.
+    ///
+    /// Generally speaking, this is always available
+    /// *unless* this was a completion corresponding to
+    /// an unimported symbol. In that case, computing the
+    /// type of all such symbols could be quite expensive.
+    pub ty: Option<Type<'db>>,
     /// Whether this suggestion came from builtins or not.
     ///
     /// At time of writing (2025-06-26), this information
@@ -298,95 +343,11 @@ pub struct Completion<'db> {
 }
 
 impl<'db> Completion<'db> {
-    /// Returns the "kind" of this completion.
-    ///
-    /// This is meant to be a very general classification of this completion.
-    /// Typically, this is communicated from the LSP server to a client, and
-    /// the client uses this information to help improve the UX (perhaps by
-    /// assigning an icon of some kind to the completion).
-    pub fn kind(&self, db: &'db dyn Db) -> Option<CompletionKind> {
-        fn imp<'db>(db: &'db dyn Db, ty: Type<'db>) -> Option<CompletionKind> {
-            Some(match ty {
-                Type::FunctionLiteral(_)
-                | Type::DataclassDecorator(_)
-                | Type::WrapperDescriptor(_)
-                | Type::DataclassTransformer(_)
-                | Type::Callable(_) => CompletionKind::Function,
-                Type::BoundMethod(_) | Type::MethodWrapper(_) => CompletionKind::Method,
-                Type::ModuleLiteral(_) => CompletionKind::Module,
-                Type::ClassLiteral(_) | Type::GenericAlias(_) | Type::SubclassOf(_) => {
-                    CompletionKind::Class
-                }
-                // This is a little weird for "struct." I'm mostly interpreting
-                // "struct" here as a more general "object." ---AG
-                Type::NominalInstance(_)
-                | Type::PropertyInstance(_)
-                | Type::BoundSuper(_)
-                | Type::TypedDict(_) => CompletionKind::Struct,
-                Type::IntLiteral(_)
-                | Type::BooleanLiteral(_)
-                | Type::TypeIs(_)
-                | Type::StringLiteral(_)
-                | Type::LiteralString
-                | Type::BytesLiteral(_) => CompletionKind::Value,
-                Type::EnumLiteral(_) => CompletionKind::Enum,
-                Type::ProtocolInstance(_) => CompletionKind::Interface,
-                Type::NonInferableTypeVar(_) | Type::TypeVar(_) => CompletionKind::TypeParameter,
-                Type::Union(union) => union.elements(db).iter().find_map(|&ty| imp(db, ty))?,
-                Type::Intersection(intersection) => {
-                    intersection.iter_positive(db).find_map(|ty| imp(db, ty))?
-                }
-                Type::Dynamic(_)
-                | Type::Never
-                | Type::SpecialForm(_)
-                | Type::KnownInstance(_)
-                | Type::AlwaysTruthy
-                | Type::AlwaysFalsy => return None,
-                Type::TypeAlias(alias) => imp(db, alias.value_type(db))?,
-            })
-        }
-        imp(db, self.ty)
+    pub fn is_type_check_only(&self, db: &'db dyn Db) -> bool {
+        self.ty.is_some_and(|ty| ty.is_type_check_only(db))
     }
 }
 
-/// The "kind" of a completion.
-///
-/// This is taken directly from the LSP completion specification:
-/// <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#completionItemKind>
-///
-/// The idea here is that `Completion::kind` defines the mapping to this from
-/// `Type` (and possibly other information), which might be interesting and
-/// contentious. Then the outer edges map this to the LSP types, which is
-/// expected to be mundane and boring.
-#[derive(Clone, Copy, Debug)]
-pub enum CompletionKind {
-    Text,
-    Method,
-    Function,
-    Constructor,
-    Field,
-    Variable,
-    Class,
-    Interface,
-    Module,
-    Property,
-    Unit,
-    Value,
-    Enum,
-    Keyword,
-    Snippet,
-    Color,
-    File,
-    Reference,
-    Folder,
-    EnumMember,
-    Constant,
-    Struct,
-    Event,
-    Operator,
-    TypeParameter,
-}
-
 pub trait HasType {
     /// Returns the inferred type of `self`.
     ///
@@ -524,6 +485,7 @@ impl_binding_has_ty_def!(ast::StmtClassDef);
 impl_binding_has_ty_def!(ast::Parameter);
 impl_binding_has_ty_def!(ast::ParameterWithDefault);
 impl_binding_has_ty_def!(ast::ExceptHandlerExceptHandler);
+impl_binding_has_ty_def!(ast::TypeParamTypeVar);
 
 impl HasType for ast::Alias {
     fn inferred_type<'db>(&self, model: &SemanticModel<'db>) -> Type<'db> {
diff --git a/crates/ty_python_semantic/src/site_packages.rs b/crates/ty_python_semantic/src/site_packages.rs
index 1e94670365..9062228363 100644
--- a/crates/ty_python_semantic/src/site_packages.rs
+++ b/crates/ty_python_semantic/src/site_packages.rs
@@ -211,7 +211,7 @@ impl PythonEnvironment {
         match VirtualEnvironment::new(path, system) {
             Ok(venv) => Ok(Self::Virtual(venv)),
             // If there's not a `pyvenv.cfg` marker, attempt to inspect as a system environment
-            Err(SitePackagesDiscoveryError::NoPyvenvCfgFile(path, _))
+            Err(SitePackagesDiscoveryError::NoPyvenvCfgFile(path, _, _))
                 if !path.origin.must_be_virtual_env() =>
             {
                 Ok(Self::System(SystemEnvironment::new(path)))
@@ -378,7 +378,13 @@ impl VirtualEnvironment {
 
         let pyvenv_cfg = match system.read_to_string(&pyvenv_cfg_path) {
             Ok(pyvenv_cfg) => pyvenv_cfg,
-            Err(err) => return Err(SitePackagesDiscoveryError::NoPyvenvCfgFile(path, err)),
+            Err(err) => {
+                return Err(SitePackagesDiscoveryError::NoPyvenvCfgFile(
+                    path,
+                    err,
+                    system.dyn_clone(),
+                ));
+            }
         };
 
         let parsed_pyvenv_cfg =
@@ -608,28 +614,44 @@ pub(crate) enum CondaEnvironmentKind {
 impl CondaEnvironmentKind {
     /// Compute the kind of `CONDA_PREFIX` we have.
     ///
-    /// When the base environment is used, `CONDA_DEFAULT_ENV` will be set to a name, i.e., `base` or
-    /// `root` which does not match the prefix, e.g. `/usr/local` instead of
-    /// `/usr/local/conda/envs/<name>`.
+    /// The base environment is typically stored in a location matching the `_CONDA_ROOT` path.
+    ///
+    /// Additionally, when the base environment is active, `CONDA_DEFAULT_ENV` will be set to a
+    /// name, e.g., `base`, which does not match the `CONDA_PREFIX`, e.g., `/usr/local` instead of
+    /// `/usr/local/conda/envs/<name>`. Note that the name `CONDA_DEFAULT_ENV` is misleading, it's
+    /// the active environment name, not a constant base environment name.
     fn from_prefix_path(system: &dyn System, path: &SystemPath) -> Self {
-        // If we cannot read `CONDA_DEFAULT_ENV`, there's no way to know if the base environment
-        let Ok(default_env) = system.env_var(EnvVars::CONDA_DEFAULT_ENV) else {
-            return CondaEnvironmentKind::Child;
-        };
-
-        // These are the expected names for the base environment
-        if default_env != "base" && default_env != "root" {
-            return CondaEnvironmentKind::Child;
+        // If `_CONDA_ROOT` is set and matches `CONDA_PREFIX`, it's the base environment.
+        if let Ok(conda_root) = system.env_var(EnvVars::CONDA_ROOT)
+            && path.as_str() == conda_root
+        {
+            return Self::Base;
         }
 
-        let Some(name) = path.file_name() else {
-            return CondaEnvironmentKind::Child;
+        // Next, we'll use a heuristic based on `CONDA_DEFAULT_ENV`
+        let Ok(current_env) = system.env_var(EnvVars::CONDA_DEFAULT_ENV) else {
+            return Self::Child;
         };
 
-        if name == default_env {
-            CondaEnvironmentKind::Base
+        // If the environment name is "base" or "root", treat it as a base environment
+        //
+        // These are the expected names for the base environment; and is retained for backwards
+        // compatibility, but in a future breaking release we should remove this special-casing.
+        if current_env == "base" || current_env == "root" {
+            return Self::Base;
+        }
+
+        // For other environment names, use the path-based logic
+        let Some(name) = path.file_name() else {
+            return Self::Child;
+        };
+
+        // If the environment is in a directory matching the name of the environment, it's not
+        // usually a base environment.
+        if name == current_env {
+            Self::Child
         } else {
-            CondaEnvironmentKind::Child
+            Self::Base
         }
     }
 }
@@ -833,16 +855,26 @@ impl SystemEnvironment {
 #[derive(Debug)]
 pub enum SitePackagesDiscoveryError {
     /// `site-packages` discovery failed because the provided path couldn't be canonicalized.
-    CanonicalizationError(SystemPathBuf, SysPrefixPathOrigin, io::Error),
+    CanonicalizationError(
+        SystemPathBuf,
+        SysPrefixPathOrigin,
+        io::Error,
+        Box<dyn System>,
+    ),
 
     /// `site-packages` discovery failed because the provided path doesn't appear to point to
     /// a Python executable or a `sys.prefix` directory.
-    PathNotExecutableOrDirectory(SystemPathBuf, SysPrefixPathOrigin, Option<io::Error>),
+    PathNotExecutableOrDirectory(
+        SystemPathBuf,
+        SysPrefixPathOrigin,
+        Option<io::Error>,
+        Box<dyn System>,
+    ),
 
     /// `site-packages` discovery failed because the [`SysPrefixPathOrigin`] indicated that
     /// the provided path should point to the `sys.prefix` of a virtual environment,
     /// but there was no file at `<sys.prefix>/pyvenv.cfg`.
-    NoPyvenvCfgFile(SysPrefixPath, io::Error),
+    NoPyvenvCfgFile(SysPrefixPath, io::Error, Box<dyn System>),
 
     /// `site-packages` discovery failed because the `pyvenv.cfg` file could not be parsed.
     PyvenvCfgParseError(SystemPathBuf, PyvenvCfgParseErrorKind),
@@ -852,11 +884,11 @@ pub enum SitePackagesDiscoveryError {
     /// would be relative to the `sys.prefix` path, and we tried to fallback to iterating
     /// through the `<sys.prefix>/lib` directory looking for a `site-packages` directory,
     /// but we came across some I/O error while trying to do so.
-    CouldNotReadLibDirectory(SysPrefixPath),
+    CouldNotReadLibDirectory(SysPrefixPath, Box<dyn System>),
 
     /// We looked everywhere we could think of for the `site-packages` directory,
     /// but none could be found despite our best endeavours.
-    NoSitePackagesDirFound(SysPrefixPath),
+    NoSitePackagesDirFound(SysPrefixPath, Box<dyn System>),
 }
 
 /// Enumeration of ways in which stdlib discovery can fail.
@@ -864,13 +896,13 @@ pub enum SitePackagesDiscoveryError {
 pub enum StdlibDiscoveryError {
     /// We looked everywhere we could think of for the standard library's directory,
     /// but none could be found despite our best endeavours.
-    NoStdlibFound(SysPrefixPath),
+    NoStdlibFound(SysPrefixPath, Box<dyn System>),
     /// Stdlib discovery failed because we're on a Unix system,
     /// we weren't able to figure out from the `pyvenv.cfg` file exactly where the stdlib
     /// would be relative to the `sys.prefix` path, and we tried to fallback to iterating
     /// through the `<sys.prefix>/lib` directory looking for a stdlib directory,
     /// but we came across some I/O error while trying to do so.
-    CouldNotReadLibDirectory(SysPrefixPath, io::Error),
+    CouldNotReadLibDirectory(SysPrefixPath, io::Error, Box<dyn System>),
     /// We failed to resolve the value of `sys.prefix`.
     NoSysPrefixFound(SystemPathBuf),
 }
@@ -878,14 +910,14 @@ pub enum StdlibDiscoveryError {
 impl std::error::Error for SitePackagesDiscoveryError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
-            Self::CanonicalizationError(_, _, io_err) => Some(io_err),
-            Self::PathNotExecutableOrDirectory(_, _, io_err) => {
+            Self::CanonicalizationError(_, _, io_err, _) => Some(io_err),
+            Self::PathNotExecutableOrDirectory(_, _, io_err, _) => {
                 io_err.as_ref().map(|e| e as &dyn std::error::Error)
             }
-            Self::NoPyvenvCfgFile(_, io_err) => Some(io_err),
+            Self::NoPyvenvCfgFile(_, io_err, _) => Some(io_err),
             Self::PyvenvCfgParseError(_, _)
-            | Self::CouldNotReadLibDirectory(_)
-            | Self::NoSitePackagesDirFound(_) => None,
+            | Self::CouldNotReadLibDirectory(_, _)
+            | Self::NoSitePackagesDirFound(_, _) => None,
         }
     }
 }
@@ -893,10 +925,15 @@ impl std::error::Error for SitePackagesDiscoveryError {
 impl std::fmt::Display for SitePackagesDiscoveryError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::CanonicalizationError(given_path, origin, _) => {
-                display_error(f, origin, given_path, "Failed to canonicalize", None)
-            }
-            Self::PathNotExecutableOrDirectory(path, origin, _) => {
+            Self::CanonicalizationError(given_path, origin, _, system) => display_error(
+                f,
+                origin,
+                given_path,
+                "Failed to canonicalize",
+                None,
+                &**system,
+            ),
+            Self::PathNotExecutableOrDirectory(path, origin, _, system) => {
                 let thing = if origin.must_point_directly_to_sys_prefix() {
                     "directory on disk"
                 } else {
@@ -908,14 +945,16 @@ impl std::fmt::Display for SitePackagesDiscoveryError {
                     path,
                     &format!("Invalid {origin}"),
                     Some(&format!("does not point to a {thing}")),
+                    &**system,
                 )
             }
-            Self::NoPyvenvCfgFile(SysPrefixPath { inner, origin }, _) => display_error(
+            Self::NoPyvenvCfgFile(SysPrefixPath { inner, origin }, _, system) => display_error(
                 f,
                 origin,
                 inner,
                 &format!("Invalid {origin}"),
                 Some("points to a broken venv with no pyvenv.cfg file"),
+                &**system,
             ),
             Self::PyvenvCfgParseError(path, kind) => {
                 write!(
@@ -923,14 +962,17 @@ impl std::fmt::Display for SitePackagesDiscoveryError {
                     "Failed to parse the `pyvenv.cfg` file at `{path}` because {kind}"
                 )
             }
-            Self::CouldNotReadLibDirectory(SysPrefixPath { inner, origin }) => display_error(
-                f,
-                origin,
-                inner,
-                "Failed to iterate over the contents of the `lib`/`lib64` directories of the Python installation",
-                None,
-            ),
-            Self::NoSitePackagesDirFound(SysPrefixPath { inner, origin }) => display_error(
+            Self::CouldNotReadLibDirectory(SysPrefixPath { inner, origin }, system) => {
+                display_error(
+                    f,
+                    origin,
+                    inner,
+                    "Failed to iterate over the contents of the `lib`/`lib64` directories of the Python installation",
+                    None,
+                    &**system,
+                )
+            }
+            Self::NoSitePackagesDirFound(SysPrefixPath { inner, origin }, system) => display_error(
                 f,
                 origin,
                 inner,
@@ -938,6 +980,7 @@ impl std::fmt::Display for SitePackagesDiscoveryError {
                 Some(
                     "Could not find a `site-packages` directory for this Python installation/executable",
                 ),
+                &**system,
             ),
         }
     }
@@ -946,8 +989,8 @@ impl std::fmt::Display for SitePackagesDiscoveryError {
 impl std::error::Error for StdlibDiscoveryError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
-            Self::CouldNotReadLibDirectory(_, io_err) => Some(io_err),
-            Self::NoStdlibFound(_) => None,
+            Self::CouldNotReadLibDirectory(_, io_err, _) => Some(io_err),
+            Self::NoStdlibFound(_, _) => None,
             Self::NoSysPrefixFound(_) => None,
         }
     }
@@ -962,19 +1005,23 @@ impl std::fmt::Display for StdlibDiscoveryError {
                     "Failed to resolve a `sys.prefix` from the `pyvenv.cfg` file at `{path}`"
                 )
             }
-            Self::CouldNotReadLibDirectory(SysPrefixPath { inner, origin }, _) => display_error(
-                f,
-                origin,
-                inner,
-                "Failed to iterate over the contents of the `lib` directory of the Python installation",
-                None,
-            ),
-            Self::NoStdlibFound(SysPrefixPath { inner, origin }) => display_error(
+            Self::CouldNotReadLibDirectory(SysPrefixPath { inner, origin }, _, system) => {
+                display_error(
+                    f,
+                    origin,
+                    inner,
+                    "Failed to iterate over the contents of the `lib` directory of the Python installation",
+                    None,
+                    &**system,
+                )
+            }
+            Self::NoStdlibFound(SysPrefixPath { inner, origin }, system) => display_error(
                 f,
                 origin,
                 inner,
                 &format!("Invalid {origin}"),
                 Some("Could not find a stdlib directory for this Python installation/executable"),
+                &**system,
             ),
         }
     }
@@ -986,6 +1033,7 @@ fn display_error(
     given_path: &SystemPath,
     primary_message: &str,
     secondary_message: Option<&str>,
+    system: &dyn System,
 ) -> std::fmt::Result {
     let fallback: &mut dyn FnMut() -> std::fmt::Result = &mut || {
         f.write_str(primary_message)?;
@@ -1003,7 +1051,7 @@ fn display_error(
         return fallback();
     };
 
-    let Ok(config_file_source) = std::fs::read_to_string((**config_file_path).as_ref()) else {
+    let Ok(config_file_source) = system.read_to_string(config_file_path) else {
         return fallback();
     };
 
@@ -1099,7 +1147,10 @@ fn site_packages_directories_from_sys_prefix(
             .is_directory(&site_packages)
             .then(|| SitePackagesPaths::from([site_packages]))
             .ok_or_else(|| {
-                SitePackagesDiscoveryError::NoSitePackagesDirFound(sys_prefix_path.to_owned())
+                SitePackagesDiscoveryError::NoSitePackagesDirFound(
+                    sys_prefix_path.to_owned(),
+                    system.dyn_clone(),
+                )
             });
     }
 
@@ -1206,10 +1257,12 @@ fn site_packages_directories_from_sys_prefix(
         if found_at_least_one_lib_dir {
             Err(SitePackagesDiscoveryError::NoSitePackagesDirFound(
                 sys_prefix_path.to_owned(),
+                system.dyn_clone(),
             ))
         } else {
             Err(SitePackagesDiscoveryError::CouldNotReadLibDirectory(
                 sys_prefix_path.to_owned(),
+                system.dyn_clone(),
             ))
         }
     } else {
@@ -1238,7 +1291,7 @@ fn real_stdlib_directory_from_sys_prefix(
     if cfg!(target_os = "windows") {
         let stdlib = sys_prefix_path.join("Lib");
         return system.is_directory(&stdlib).then_some(stdlib).ok_or(
-            StdlibDiscoveryError::NoStdlibFound(sys_prefix_path.to_owned()),
+            StdlibDiscoveryError::NoStdlibFound(sys_prefix_path.to_owned(), system.dyn_clone()),
         );
     }
 
@@ -1274,7 +1327,11 @@ fn real_stdlib_directory_from_sys_prefix(
         // must be `lib`, not `lib64`, for the stdlib
         .read_directory(&sys_prefix_path.join(UnixLibDir::Lib))
         .map_err(|io_err| {
-            StdlibDiscoveryError::CouldNotReadLibDirectory(sys_prefix_path.to_owned(), io_err)
+            StdlibDiscoveryError::CouldNotReadLibDirectory(
+                sys_prefix_path.to_owned(),
+                io_err,
+                system.dyn_clone(),
+            )
         })?
     {
         let Ok(entry) = entry_result else {
@@ -1299,6 +1356,7 @@ fn real_stdlib_directory_from_sys_prefix(
     }
     Err(StdlibDiscoveryError::NoStdlibFound(
         sys_prefix_path.to_owned(),
+        system.dyn_clone(),
     ))
 }
 
@@ -1357,6 +1415,7 @@ impl SysPrefixPath {
                     unvalidated_path.to_path_buf(),
                     origin,
                     None,
+                    system.dyn_clone(),
                 ));
             };
             sys_prefix
@@ -1376,12 +1435,14 @@ impl SysPrefixPath {
                         unvalidated_path,
                         origin,
                         Some(io_err),
+                        system.dyn_clone(),
                     )
                 } else {
                     SitePackagesDiscoveryError::CanonicalizationError(
                         unvalidated_path,
                         origin,
                         io_err,
+                        system.dyn_clone(),
                     )
                 };
                 return Err(err);
@@ -1393,6 +1454,7 @@ impl SysPrefixPath {
                 unvalidated_path.to_path_buf(),
                 origin,
                 None,
+                system.dyn_clone(),
             ));
         }
 
diff --git a/crates/ty_python_semantic/src/util/subscript.rs b/crates/ty_python_semantic/src/subscript.rs
similarity index 99%
rename from crates/ty_python_semantic/src/util/subscript.rs
rename to crates/ty_python_semantic/src/subscript.rs
index f519acffdf..b7ea13db10 100644
--- a/crates/ty_python_semantic/src/util/subscript.rs
+++ b/crates/ty_python_semantic/src/subscript.rs
@@ -208,7 +208,7 @@ where
 mod tests {
     use crate::Db;
     use crate::db::tests::setup_db;
-    use crate::util::subscript::{OutOfBoundsError, StepSizeZeroError};
+    use crate::subscript::{OutOfBoundsError, StepSizeZeroError};
 
     use super::{PyIndex, PySlice};
     use itertools::{Itertools, assert_equal};
diff --git a/crates/ty_python_semantic/src/suppression.rs b/crates/ty_python_semantic/src/suppression.rs
index d0f5447cc0..6c9edbec68 100644
--- a/crates/ty_python_semantic/src/suppression.rs
+++ b/crates/ty_python_semantic/src/suppression.rs
@@ -1,7 +1,7 @@
 use crate::lint::{GetLintError, Level, LintMetadata, LintRegistry, LintStatus};
 use crate::types::TypeCheckDiagnostics;
 use crate::{Db, declare_lint, lint::LintId};
-use ruff_db::diagnostic::{Annotation, Diagnostic, DiagnosticId, Span};
+use ruff_db::diagnostic::{Annotation, Diagnostic, DiagnosticId, IntoDiagnosticMessage, Span};
 use ruff_db::{files::File, parsed::parsed_module, source::source_text};
 use ruff_python_parser::TokenKind;
 use ruff_python_trivia::Cursor;
@@ -32,7 +32,7 @@ declare_lint! {
     /// ```
     pub(crate) static UNUSED_IGNORE_COMMENT = {
         summary: "detects unused `type: ignore` comments",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Ignore,
     }
 }
@@ -55,9 +55,9 @@ declare_lint! {
     /// ```py
     /// a = 20 / 0  # ty: ignore[division-by-zero]
     /// ```
-    pub(crate) static UNKNOWN_RULE = {
+    pub(crate) static IGNORE_COMMENT_UNKNOWN_RULE = {
         summary: "detects `ty: ignore` comments that reference unknown rules",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Warn,
     }
 }
@@ -81,7 +81,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_IGNORE_COMMENT = {
         summary: "detects ignore comments that use invalid syntax",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Warn,
     }
 }
@@ -143,38 +143,12 @@ pub(crate) fn check_suppressions(db: &dyn Db, file: File, diagnostics: &mut Type
 
 /// Checks for `ty: ignore` comments that reference unknown rules.
 fn check_unknown_rule(context: &mut CheckSuppressionsContext) {
-    if context.is_lint_disabled(&UNKNOWN_RULE) {
+    if context.is_lint_disabled(&IGNORE_COMMENT_UNKNOWN_RULE) {
         return;
     }
 
     for unknown in &context.suppressions.unknown {
-        match &unknown.reason {
-            GetLintError::Removed(removed) => {
-                context.report_lint(
-                    &UNKNOWN_RULE,
-                    unknown.range,
-                    format_args!("Removed rule `{removed}`"),
-                );
-            }
-            GetLintError::Unknown(rule) => {
-                context.report_lint(
-                    &UNKNOWN_RULE,
-                    unknown.range,
-                    format_args!("Unknown rule `{rule}`"),
-                );
-            }
-
-            GetLintError::PrefixedWithCategory {
-                prefixed,
-                suggestion,
-            } => {
-                context.report_lint(
-                    &UNKNOWN_RULE,
-                    unknown.range,
-                    format_args!("Unknown rule `{prefixed}`. Did you mean `{suggestion}`?"),
-                );
-            }
-        }
+        context.report_lint(&IGNORE_COMMENT_UNKNOWN_RULE, unknown.range, &unknown.reason);
     }
 }
 
@@ -300,7 +274,7 @@ impl<'a> CheckSuppressionsContext<'a> {
         &mut self,
         lint: &'static LintMetadata,
         range: TextRange,
-        message: fmt::Arguments,
+        message: impl IntoDiagnosticMessage,
     ) {
         if let Some(suppression) = self.suppressions.find_suppression(range, LintId::of(lint)) {
             self.diagnostics.mark_used(suppression.id());
@@ -316,7 +290,7 @@ impl<'a> CheckSuppressionsContext<'a> {
         &mut self,
         lint: &'static LintMetadata,
         range: TextRange,
-        message: fmt::Arguments,
+        message: impl IntoDiagnosticMessage,
     ) {
         let Some(severity) = self.db.rule_selection(self.file).severity(LintId::of(lint)) else {
             return;
diff --git a/crates/ty_python_semantic/src/types.rs b/crates/ty_python_semantic/src/types.rs
index 1afe7cd844..6cc7f20739 100644
--- a/crates/ty_python_semantic/src/types.rs
+++ b/crates/ty_python_semantic/src/types.rs
@@ -3,76 +3,86 @@ use itertools::{Either, Itertools};
 use ruff_db::parsed::parsed_module;
 
 use std::borrow::Cow;
+use std::time::Duration;
 
 use bitflags::bitflags;
 use call::{CallDunderError, CallError, CallErrorKind};
 use context::InferContext;
-use diagnostic::{
-    INVALID_CONTEXT_MANAGER, INVALID_SUPER_ARGUMENT, NOT_ITERABLE, POSSIBLY_UNBOUND_IMPLICIT_CALL,
-    UNAVAILABLE_IMPLICIT_SUPER_ARGUMENTS,
-};
+use diagnostic::{INVALID_CONTEXT_MANAGER, NOT_ITERABLE, POSSIBLY_MISSING_IMPLICIT_CALL};
+use ruff_db::Instant;
 use ruff_db::diagnostic::{Annotation, Diagnostic, Span, SubDiagnostic, SubDiagnosticSeverity};
 use ruff_db::files::File;
+use ruff_python_ast as ast;
 use ruff_python_ast::name::Name;
-use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange};
+
 use type_ordering::union_or_intersection_elements_ordering;
 
 pub(crate) use self::builder::{IntersectionBuilder, UnionBuilder};
+pub use self::cyclic::CycleDetector;
 pub(crate) use self::cyclic::{PairVisitor, TypeTransformer};
-pub use self::diagnostic::TypeCheckDiagnostics;
 pub(crate) use self::diagnostic::register_lints;
+pub use self::diagnostic::{TypeCheckDiagnostics, UNDEFINED_REVEAL};
 pub(crate) use self::infer::{
-    infer_deferred_types, infer_definition_types, infer_expression_type, infer_expression_types,
-    infer_scope_types,
+    TypeContext, infer_deferred_types, infer_definition_types, infer_expression_type,
+    infer_expression_types, infer_isolated_expression, infer_scope_types,
+    static_expression_truthiness,
 };
-pub(crate) use self::signatures::{CallableSignature, Signature};
+pub(crate) use self::signatures::{CallableSignature, Parameter, Parameters, Signature};
 pub(crate) use self::subclass_of::{SubclassOfInner, SubclassOfType};
+pub use crate::diagnostic::add_inferred_python_version_hint_to_diagnostic;
 use crate::module_name::ModuleName;
 use crate::module_resolver::{KnownModule, resolve_module};
-use crate::place::{Boundness, Place, PlaceAndQualifiers, imported_symbol};
-use crate::semantic_index::definition::Definition;
+use crate::place::{
+    Definedness, Place, PlaceAndQualifiers, TypeOrigin, imported_symbol, known_module_symbol,
+};
+use crate::semantic_index::definition::{Definition, DefinitionKind};
 use crate::semantic_index::place::ScopedPlaceId;
 use crate::semantic_index::scope::ScopeId;
 use crate::semantic_index::{imported_modules, place_table, semantic_index};
 use crate::suppression::check_suppressions;
+use crate::types::bound_super::BoundSuperType;
 use crate::types::call::{Binding, Bindings, CallArguments, CallableBinding};
-use crate::types::class::{CodeGeneratorKind, Field};
 pub(crate) use crate::types::class_base::ClassBase;
+use crate::types::constraints::{
+    ConstraintSet, IteratorConstraintsExtension, OptionConstraintsExtension,
+};
 use crate::types::context::{LintDiagnosticGuard, LintDiagnosticGuardBuilder};
 use crate::types::diagnostic::{INVALID_AWAIT, INVALID_TYPE_FORM, UNSUPPORTED_BOOL_CONVERSION};
 pub use crate::types::display::DisplaySettings;
+use crate::types::display::TupleSpecialization;
 use crate::types::enums::{enum_metadata, is_single_member_enum};
 use crate::types::function::{
-    DataclassTransformerParams, FunctionDecorators, FunctionSpans, FunctionType, KnownFunction,
+    DataclassTransformerFlags, DataclassTransformerParams, FunctionDecorators, FunctionSpans,
+    FunctionType, KnownFunction,
 };
+pub(crate) use crate::types::generics::GenericContext;
 use crate::types::generics::{
-    GenericContext, PartialSpecialization, Specialization, bind_typevar, walk_generic_context,
-    walk_partial_specialization, walk_specialization,
-};
-pub use crate::types::ide_support::{
-    CallSignatureDetails, Member, all_members, call_signature_details, definition_kind_for_name,
-    definitions_for_attribute, definitions_for_imported_symbol, definitions_for_keyword_argument,
-    definitions_for_name, find_active_signature_from_details, inlay_hint_function_argument_details,
+    InferableTypeVars, PartialSpecialization, Specialization, bind_typevar, typing_self,
+    walk_generic_context,
 };
 use crate::types::infer::infer_unpack_types;
 use crate::types::mro::{Mro, MroError, MroIterator};
 pub(crate) use crate::types::narrow::infer_narrowing_constraint;
-use crate::types::signatures::{Parameter, ParameterForm, Parameters, walk_signature};
-use crate::types::tuple::TupleSpec;
-use crate::types::variance::{TypeVarVariance, VarianceInferable};
+use crate::types::signatures::{ParameterForm, walk_signature};
+use crate::types::tuple::{TupleSpec, TupleSpecBuilder};
+pub(crate) use crate::types::typed_dict::{TypedDictParams, TypedDictType, walk_typed_dict_type};
+pub use crate::types::variance::TypeVarVariance;
+use crate::types::variance::VarianceInferable;
+use crate::types::visitor::{any_over_type, exceeds_max_specialization_depth};
 use crate::unpack::EvaluationMode;
-pub use crate::util::diagnostics::add_inferred_python_version_hint_to_diagnostic;
-use crate::{Db, FxOrderMap, FxOrderSet, Module, Program};
+use crate::{Db, FxOrderSet, Module, Program};
 pub(crate) use class::{ClassLiteral, ClassType, GenericAlias, KnownClass};
 use instance::Protocol;
 pub use instance::{NominalInstanceType, ProtocolInstanceType};
 pub use special_form::SpecialFormType;
 
+mod bound_super;
 mod builder;
 mod call;
 mod class;
 mod class_base;
+mod constraints;
 mod context;
 mod cyclic;
 mod diagnostic;
@@ -80,9 +90,10 @@ mod display;
 mod enums;
 mod function;
 mod generics;
-pub(crate) mod ide_support;
+pub mod ide_support;
 mod infer;
 mod instance;
+mod member;
 mod mro;
 mod narrow;
 mod protocol_class;
@@ -92,6 +103,7 @@ mod string_annotation;
 mod subclass_of;
 mod tuple;
 mod type_ordering;
+mod typed_dict;
 mod unpacker;
 mod variance;
 mod visitor;
@@ -102,9 +114,10 @@ mod property_tests;
 
 pub fn check_types(db: &dyn Db, file: File) -> Vec<Diagnostic> {
     let _span = tracing::trace_span!("check_types", ?file).entered();
-
     tracing::debug!("Checking file '{path}'", path = file.path(db));
 
+    let start = Instant::now();
+
     let index = semantic_index(db, file);
     let mut diagnostics = TypeCheckDiagnostics::default();
 
@@ -125,6 +138,14 @@ pub fn check_types(db: &dyn Db, file: File) -> Vec<Diagnostic> {
 
     check_suppressions(db, file, &mut diagnostics);
 
+    let elapsed = start.elapsed();
+    if elapsed >= Duration::from_millis(100) {
+        tracing::info!(
+            "Checking file `{path}` took more than 100ms ({elapsed:?})",
+            path = file.path(db)
+        );
+    }
+
     diagnostics.into_diagnostics()
 }
 
@@ -176,20 +197,84 @@ fn definition_expression_type<'db>(
 pub(crate) type ApplyTypeMappingVisitor<'db> = TypeTransformer<'db, TypeMapping<'db, 'db>>;
 
 /// A [`PairVisitor`] that is used in `has_relation_to` methods.
-pub(crate) type HasRelationToVisitor<'db> = PairVisitor<'db, TypeRelation>;
+pub(crate) type HasRelationToVisitor<'db> =
+    CycleDetector<TypeRelation, (Type<'db>, Type<'db>, TypeRelation), ConstraintSet<'db>>;
+
+impl Default for HasRelationToVisitor<'_> {
+    fn default() -> Self {
+        HasRelationToVisitor::new(ConstraintSet::from(true))
+    }
+}
 
 /// A [`PairVisitor`] that is used in `is_disjoint_from` methods.
-pub(crate) type IsDisjointVisitor<'db> = PairVisitor<'db, IsDisjoint>;
+pub(crate) type IsDisjointVisitor<'db> = PairVisitor<'db, IsDisjoint, ConstraintSet<'db>>;
+
+#[derive(Debug)]
 pub(crate) struct IsDisjoint;
 
+impl Default for IsDisjointVisitor<'_> {
+    fn default() -> Self {
+        IsDisjointVisitor::new(ConstraintSet::from(false))
+    }
+}
+
 /// A [`PairVisitor`] that is used in `is_equivalent` methods.
-pub(crate) type IsEquivalentVisitor<'db> = PairVisitor<'db, IsEquivalent>;
+pub(crate) type IsEquivalentVisitor<'db> = PairVisitor<'db, IsEquivalent, ConstraintSet<'db>>;
+
+#[derive(Debug)]
 pub(crate) struct IsEquivalent;
 
+impl Default for IsEquivalentVisitor<'_> {
+    fn default() -> Self {
+        IsEquivalentVisitor::new(ConstraintSet::from(true))
+    }
+}
+
+/// A [`CycleDetector`] that is used in `find_legacy_typevars` methods.
+pub(crate) type FindLegacyTypeVarsVisitor<'db> = CycleDetector<FindLegacyTypeVars, Type<'db>, ()>;
+
+#[derive(Debug)]
+pub(crate) struct FindLegacyTypeVars;
+
+/// A [`CycleDetector`] that is used in `try_bool` methods.
+pub(crate) type TryBoolVisitor<'db> =
+    CycleDetector<TryBool, Type<'db>, Result<Truthiness, BoolError<'db>>>;
+pub(crate) struct TryBool;
+
 /// A [`TypeTransformer`] that is used in `normalized` methods.
 pub(crate) type NormalizedVisitor<'db> = TypeTransformer<'db, Normalized>;
+
+#[derive(Debug)]
 pub(crate) struct Normalized;
 
+/// How a generic type has been specialized.
+///
+/// This matters only if there is at least one invariant type parameter.
+/// For example, we represent `Top[list[Any]]` as a `GenericAlias` with
+/// `MaterializationKind` set to Top, which we denote as `Top[list[Any]]`.
+/// A type `Top[list[T]]` includes all fully static list types `list[U]` where `U` is
+/// a supertype of `Bottom[T]` and a subtype of `Top[T]`.
+///
+/// Similarly, there is `Bottom[list[Any]]`.
+/// This type is harder to make sense of in a set-theoretic framework, but
+/// it is a subtype of all materializations of `list[Any]`.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+pub enum MaterializationKind {
+    Top,
+    Bottom,
+}
+
+impl MaterializationKind {
+    /// Flip the materialization type: `Top` becomes `Bottom` and vice versa.
+    #[must_use]
+    pub const fn flip(self) -> Self {
+        match self {
+            Self::Top => Self::Bottom,
+            Self::Bottom => Self::Top,
+        }
+    }
+}
+
 /// The descriptor protocol distinguishes two kinds of descriptors. Non-data descriptors
 /// define a `__get__` method, while data descriptors additionally define a `__set__`
 /// method or a `__delete__` method. This enum is used to categorize attributes into two
@@ -284,17 +369,6 @@ impl Default for MemberLookupPolicy {
     }
 }
 
-fn member_lookup_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &PlaceAndQualifiers<'db>,
-    _count: u32,
-    _self: Type<'db>,
-    _name: Name,
-    _policy: MemberLookupPolicy,
-) -> salsa::CycleRecoveryAction<PlaceAndQualifiers<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn member_lookup_cycle_initial<'db>(
     _db: &'db dyn Db,
     _self: Type<'db>,
@@ -304,17 +378,6 @@ fn member_lookup_cycle_initial<'db>(
     Place::bound(Type::Never).into()
 }
 
-fn class_lookup_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &PlaceAndQualifiers<'db>,
-    _count: u32,
-    _self: Type<'db>,
-    _name: Name,
-    _policy: MemberLookupPolicy,
-) -> salsa::CycleRecoveryAction<PlaceAndQualifiers<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn class_lookup_cycle_initial<'db>(
     _db: &'db dyn Db,
     _self: Type<'db>,
@@ -324,21 +387,6 @@ fn class_lookup_cycle_initial<'db>(
     Place::bound(Type::Never).into()
 }
 
-#[allow(clippy::trivially_copy_pass_by_ref)]
-fn variance_cycle_recover<'db, T>(
-    _db: &'db dyn Db,
-    _value: &TypeVarVariance,
-    count: u32,
-    _self: T,
-    _typevar: BoundTypeVarInstance<'db>,
-) -> salsa::CycleRecoveryAction<TypeVarVariance> {
-    assert!(
-        count <= 2,
-        "Should only be able to cycle at most twice: there are only three levels in the lattice, each cycle should move us one"
-    );
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn variance_cycle_initial<'db, T>(
     _db: &'db dyn Db,
     _self: T,
@@ -452,13 +500,19 @@ fn walk_property_instance_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
 impl get_size2::GetSize for PropertyInstanceType<'_> {}
 
 impl<'db> PropertyInstanceType<'db> {
-    fn apply_type_mapping<'a>(self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
+    fn apply_type_mapping_impl<'a>(
+        self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         let getter = self
             .getter(db)
-            .map(|ty| ty.apply_type_mapping(db, type_mapping));
+            .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor));
         let setter = self
             .setter(db)
-            .map(|ty| ty.apply_type_mapping(db, type_mapping));
+            .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor));
         Self::new(db, getter, setter)
     }
 
@@ -470,97 +524,163 @@ impl<'db> PropertyInstanceType<'db> {
         )
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         if let Some(ty) = self.getter(db) {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
         if let Some(ty) = self.setter(db) {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
-    fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self::new(
-            db,
-            self.getter(db).map(|ty| ty.materialize(db, variance)),
-            self.setter(db).map(|ty| ty.materialize(db, variance)),
-        )
+    fn when_equivalent_to(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.is_equivalent_to_impl(db, other, inferable, &IsEquivalentVisitor::default())
+    }
+
+    fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        let getter_equivalence = if let Some(getter) = self.getter(db) {
+            let Some(other_getter) = other.getter(db) else {
+                return ConstraintSet::from(false);
+            };
+            getter.is_equivalent_to_impl(db, other_getter, inferable, visitor)
+        } else {
+            if other.getter(db).is_some() {
+                return ConstraintSet::from(false);
+            }
+            ConstraintSet::from(true)
+        };
+
+        let setter_equivalence = || {
+            if let Some(setter) = self.setter(db) {
+                let Some(other_setter) = other.setter(db) else {
+                    return ConstraintSet::from(false);
+                };
+                setter.is_equivalent_to_impl(db, other_setter, inferable, visitor)
+            } else {
+                if other.setter(db).is_some() {
+                    return ConstraintSet::from(false);
+                }
+                ConstraintSet::from(true)
+            }
+        };
+
+        getter_equivalence.and(db, setter_equivalence)
     }
 }
 
 bitflags! {
-    /// Used for the return type of `dataclass(…)` calls. Keeps track of the arguments
-    /// that were passed in. For the precise meaning of the fields, see [1].
+    /// Used to store metadata about a dataclass or dataclass-like class.
+    /// For the precise meaning of the fields, see [1].
     ///
     /// [1]: https://docs.python.org/3/library/dataclasses.html
-    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-    pub struct DataclassParams: u16 {
-        const INIT = 0b0000_0000_0001;
-        const REPR = 0b0000_0000_0010;
-        const EQ = 0b0000_0000_0100;
-        const ORDER = 0b0000_0000_1000;
-        const UNSAFE_HASH = 0b0000_0001_0000;
-        const FROZEN = 0b0000_0010_0000;
-        const MATCH_ARGS = 0b0000_0100_0000;
-        const KW_ONLY = 0b0000_1000_0000;
-        const SLOTS = 0b0001_0000_0000;
-        const WEAKREF_SLOT = 0b0010_0000_0000;
-        // This is not an actual argument from `dataclass(...)` but a flag signaling that no
-        // `field_specifiers` was specified for the `dataclass_transform`, see [1].
-        // [1]: https://typing.python.org/en/latest/spec/dataclasses.html#dataclass-transform-parameters
-        const NO_FIELD_SPECIFIERS = 0b0100_0000_0000;
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+    pub struct DataclassFlags: u16 {
+        const INIT = 1 << 0;
+        const REPR = 1 << 1;
+        const EQ = 1 << 2;
+        const ORDER = 1 << 3;
+        const UNSAFE_HASH = 1 << 4;
+        const FROZEN = 1 << 5;
+        const MATCH_ARGS = 1 << 6;
+        const KW_ONLY = 1 << 7;
+        const SLOTS = 1 << 8   ;
+        const WEAKREF_SLOT = 1 << 9;
     }
 }
 
-impl get_size2::GetSize for DataclassParams {}
+impl get_size2::GetSize for DataclassFlags {}
 
-impl Default for DataclassParams {
+impl Default for DataclassFlags {
     fn default() -> Self {
         Self::INIT | Self::REPR | Self::EQ | Self::MATCH_ARGS
     }
 }
 
-impl From<DataclassTransformerParams> for DataclassParams {
-    fn from(params: DataclassTransformerParams) -> Self {
+impl From<DataclassTransformerFlags> for DataclassFlags {
+    fn from(params: DataclassTransformerFlags) -> Self {
         let mut result = Self::default();
 
         result.set(
             Self::EQ,
-            params.contains(DataclassTransformerParams::EQ_DEFAULT),
+            params.contains(DataclassTransformerFlags::EQ_DEFAULT),
         );
         result.set(
             Self::ORDER,
-            params.contains(DataclassTransformerParams::ORDER_DEFAULT),
+            params.contains(DataclassTransformerFlags::ORDER_DEFAULT),
         );
         result.set(
             Self::KW_ONLY,
-            params.contains(DataclassTransformerParams::KW_ONLY_DEFAULT),
+            params.contains(DataclassTransformerFlags::KW_ONLY_DEFAULT),
         );
         result.set(
             Self::FROZEN,
-            params.contains(DataclassTransformerParams::FROZEN_DEFAULT),
-        );
-
-        result.set(
-            Self::NO_FIELD_SPECIFIERS,
-            !params.contains(DataclassTransformerParams::FIELD_SPECIFIERS),
+            params.contains(DataclassTransformerFlags::FROZEN_DEFAULT),
         );
 
         result
     }
 }
 
+/// Metadata for a dataclass. Stored inside a `Type::DataclassDecorator(…)`
+/// instance that we use as the return type of a `dataclasses.dataclass` and
+/// dataclass-transformer decorator calls.
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+#[derive(PartialOrd, Ord)]
+pub struct DataclassParams<'db> {
+    flags: DataclassFlags,
+
+    #[returns(deref)]
+    field_specifiers: Box<[Type<'db>]>,
+}
+
+impl get_size2::GetSize for DataclassParams<'_> {}
+
+impl<'db> DataclassParams<'db> {
+    fn default_params(db: &'db dyn Db) -> Self {
+        Self::from_flags(db, DataclassFlags::default())
+    }
+
+    fn from_flags(db: &'db dyn Db, flags: DataclassFlags) -> Self {
+        let dataclasses_field = known_module_symbol(db, KnownModule::Dataclasses, "field")
+            .place
+            .ignore_possibly_undefined()
+            .unwrap_or_else(Type::unknown);
+
+        Self::new(db, flags, vec![dataclasses_field].into_boxed_slice())
+    }
+
+    fn from_transformer_params(db: &'db dyn Db, params: DataclassTransformerParams<'db>) -> Self {
+        Self::new(
+            db,
+            DataclassFlags::from(params.flags(db)),
+            params.field_specifiers(db),
+        )
+    }
+}
+
 /// Representation of a type: a set of possible values at runtime.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, salsa::Update, get_size2::GetSize)]
 pub enum Type<'db> {
     /// The dynamic type: a statically unknown set of values
-    Dynamic(DynamicType),
+    Dynamic(DynamicType<'db>),
     /// The empty set of values
     Never,
     /// A specific function object
@@ -576,29 +696,28 @@ pub enum Type<'db> {
     /// the `self` parameter, and return a `MethodType & Callable[[int], str]`.
     /// One drawback would be that we could not show the bound instance when that type is displayed.
     BoundMethod(BoundMethodType<'db>),
-    /// Represents a specific instance of `types.MethodWrapperType`.
+    /// Represents a specific instance of a bound method type for a builtin class.
     ///
     /// TODO: consider replacing this with `Callable & types.MethodWrapperType` type?
-    /// Requires `Callable` to be able to represent overloads, e.g. `types.FunctionType.__get__` has
+    /// The `Callable` type would need to be overloaded -- e.g. `types.FunctionType.__get__` has
     /// this behaviour when a method is accessed on a class vs an instance:
     ///
     /// ```txt
     ///  * (None,   type)         ->  Literal[function_on_which_it_was_called]
     ///  * (object, type | None)  ->  BoundMethod[instance, function_on_which_it_was_called]
     /// ```
-    MethodWrapper(MethodWrapperKind<'db>),
+    KnownBoundMethod(KnownBoundMethodType<'db>),
     /// Represents a specific instance of `types.WrapperDescriptorType`.
     ///
     /// TODO: Similar to above, this could eventually be replaced by a generic `Callable`
-    /// type. We currently add this as a separate variant because `FunctionType.__get__`
-    /// is an overloaded method and we do not support `@overload` yet.
+    /// type.
     WrapperDescriptor(WrapperDescriptorKind),
     /// A special callable that is returned by a `dataclass(…)` call. It is usually
     /// used as a decorator. Note that this is only used as a return type for actual
     /// `dataclass` calls, not for the argumentless `@dataclass` decorator.
-    DataclassDecorator(DataclassParams),
+    DataclassDecorator(DataclassParams<'db>),
     /// A special callable that is returned by a `dataclass_transform(…)` call.
-    DataclassTransformer(DataclassTransformerParams),
+    DataclassTransformer(DataclassTransformerParams<'db>),
     /// The type of an arbitrary callable object with a certain specified signature.
     Callable(CallableType<'db>),
     /// A specific module object
@@ -646,15 +765,9 @@ pub enum Type<'db> {
     LiteralString,
     /// A bytes literal
     BytesLiteral(BytesLiteralType<'db>),
-    /// An instance of a typevar in a context where we can infer a specialization for it. (This is
-    /// typically the signature of a generic function, or of a constructor of a generic class.)
-    /// When the generic class or function binding this typevar is specialized, we will replace the
-    /// typevar with its specialization.
+    /// An instance of a typevar. When the generic class or function binding this typevar is
+    /// specialized, we will replace the typevar with its specialization.
     TypeVar(BoundTypeVarInstance<'db>),
-    /// An instance of a typevar where we cannot infer a specialization for it. (This is typically
-    /// the body of the generic function or class that binds the typevar.) In these positions,
-    /// properties like assignability must hold for all possible specializations.
-    NonInferableTypeVar(BoundTypeVarInstance<'db>),
     /// A bound super object like `super()` or `super(A, A())`
     /// This type doesn't handle an unbound super object like `super(A)`; for that we just use
     /// a `Type::NominalInstance` of `builtins.super`.
@@ -677,8 +790,12 @@ impl<'db> Type<'db> {
         Self::Dynamic(DynamicType::Unknown)
     }
 
-    pub(crate) fn object(db: &'db dyn Db) -> Self {
-        KnownClass::Object.to_instance(db)
+    pub(crate) fn divergent(scope: Option<ScopeId<'db>>) -> Self {
+        Self::Dynamic(DynamicType::Divergent(DivergentType { scope }))
+    }
+
+    pub(crate) const fn is_divergent(&self) -> bool {
+        matches!(self, Type::Dynamic(DynamicType::Divergent(_)))
     }
 
     pub const fn is_unknown(&self) -> bool {
@@ -696,25 +813,47 @@ impl<'db> Type<'db> {
 
     fn is_none(&self, db: &'db dyn Db) -> bool {
         self.into_nominal_instance()
-            .is_some_and(|instance| instance.class(db).is_known(db, KnownClass::NoneType))
+            .is_some_and(|instance| instance.has_known_class(db, KnownClass::NoneType))
     }
 
     fn is_bool(&self, db: &'db dyn Db) -> bool {
         self.into_nominal_instance()
-            .is_some_and(|instance| instance.class(db).is_known(db, KnownClass::Bool))
+            .is_some_and(|instance| instance.has_known_class(db, KnownClass::Bool))
+    }
+
+    fn is_enum(&self, db: &'db dyn Db) -> bool {
+        self.into_nominal_instance()
+            .and_then(|instance| crate::types::enums::enum_metadata(db, instance.class_literal(db)))
+            .is_some()
+    }
+
+    /// Return true if this type overrides __eq__ or __ne__ methods
+    fn overrides_equality(&self, db: &'db dyn Db) -> bool {
+        let check_dunder = |dunder_name, allowed_return_value| {
+            // Note that we do explicitly exclude dunder methods on `object`, `int` and `str` here.
+            // The reason for this is that we know that these dunder methods behave in a predictable way.
+            // Only custom dunder methods need to be examined here, as they might break single-valuedness
+            // by always returning `False`, for example.
+            let call_result = self.try_call_dunder_with_policy(
+                db,
+                dunder_name,
+                &mut CallArguments::positional([Type::unknown()]),
+                TypeContext::default(),
+                MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK
+                    | MemberLookupPolicy::MRO_NO_INT_OR_STR_LOOKUP,
+            );
+            let call_result = call_result.as_ref();
+            call_result.is_ok_and(|bindings| {
+                bindings.return_type(db) == Type::BooleanLiteral(allowed_return_value)
+            }) || call_result.is_err_and(|err| matches!(err, CallDunderError::MethodNotAvailable))
+        };
+
+        !(check_dunder("__eq__", true) && check_dunder("__ne__", false))
     }
 
     pub(crate) fn is_notimplemented(&self, db: &'db dyn Db) -> bool {
-        self.into_nominal_instance().is_some_and(|instance| {
-            instance
-                .class(db)
-                .is_known(db, KnownClass::NotImplementedType)
-        })
-    }
-
-    pub(crate) fn is_object(&self, db: &'db dyn Db) -> bool {
         self.into_nominal_instance()
-            .is_some_and(|instance| instance.is_object(db))
+            .is_some_and(|instance| instance.has_known_class(db, KnownClass::NotImplementedType))
     }
 
     pub(crate) const fn is_todo(&self) -> bool {
@@ -729,18 +868,70 @@ impl<'db> Type<'db> {
         matches!(self, Type::Dynamic(_))
     }
 
+    /// Is a value of this type only usable in typing contexts?
+    pub(crate) fn is_type_check_only(&self, db: &'db dyn Db) -> bool {
+        match self {
+            Type::ClassLiteral(class_literal) => class_literal.type_check_only(db),
+            Type::FunctionLiteral(f) => {
+                f.has_known_decorator(db, FunctionDecorators::TYPE_CHECK_ONLY)
+            }
+            _ => false,
+        }
+    }
+
+    // If the type is a specialized instance of the given `KnownClass`, returns the specialization.
+    pub(crate) fn known_specialization(
+        &self,
+        db: &'db dyn Db,
+        known_class: KnownClass,
+    ) -> Option<Specialization<'db>> {
+        let class_literal = known_class.try_to_class_literal(db)?;
+        self.specialization_of(db, Some(class_literal))
+    }
+
+    // If the type is a specialized instance of the given class, returns the specialization.
+    //
+    // If no class is provided, returns the specialization of any class instance.
+    pub(crate) fn specialization_of(
+        self,
+        db: &'db dyn Db,
+        expected_class: Option<ClassLiteral<'_>>,
+    ) -> Option<Specialization<'db>> {
+        let class_type = match self {
+            Type::NominalInstance(instance) => instance,
+            Type::TypeAlias(alias) => alias.value_type(db).into_nominal_instance()?,
+            _ => return None,
+        }
+        .class(db);
+
+        let (class_literal, specialization) = class_type.class_literal(db);
+        if expected_class.is_some_and(|expected_class| expected_class != class_literal) {
+            return None;
+        }
+
+        specialization
+    }
+
     /// Returns the top materialization (or upper bound materialization) of this type, which is the
     /// most general form of the type that is fully static.
     #[must_use]
     pub(crate) fn top_materialization(&self, db: &'db dyn Db) -> Type<'db> {
-        self.materialize(db, TypeVarVariance::Covariant)
+        self.materialize(
+            db,
+            MaterializationKind::Top,
+            &ApplyTypeMappingVisitor::default(),
+        )
     }
 
     /// Returns the bottom materialization (or lower bound materialization) of this type, which is
     /// the most specific form of the type that is fully static.
     #[must_use]
     pub(crate) fn bottom_materialization(&self, db: &'db dyn Db) -> Type<'db> {
-        self.materialize(db, TypeVarVariance::Contravariant)
+        self.materialize(
+            db,
+            MaterializationKind::Bottom,
+            &ApplyTypeMappingVisitor::default(),
+        )
     }
 
     /// If this type is an instance type where the class has a tuple spec, returns the tuple spec.
@@ -772,133 +963,89 @@ impl<'db> Type<'db> {
     /// More concretely, `T'`, the materialization of `T`, is the type `T` with all occurrences of
     /// the dynamic types (`Any`, `Unknown`, `Todo`) replaced as follows:
     ///
-    /// - In covariant position, it's replaced with `object`
+    /// - In covariant position, it's replaced with `object` (TODO: it should be the `TypeVar`'s upper
+    ///   bound, if any)
     /// - In contravariant position, it's replaced with `Never`
-    /// - In invariant position, it's replaced with an unresolved type variable
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Type<'db> {
+    /// - In invariant position, we replace the object with a special form recording that it's the top
+    ///   or bottom materialization.
+    ///
+    /// This is implemented as a type mapping. Some specific objects have `materialize()` or
+    /// `materialize_impl()` methods. The rule of thumb is:
+    ///
+    /// - `materialize()` calls `apply_type_mapping()` (or `apply_type_mapping_impl()`)
+    /// - `materialize_impl()` gets called from `apply_type_mapping()` or from another
+    ///   `materialize_impl()`
+    pub(crate) fn materialize(
+        &self,
+        db: &'db dyn Db,
+        materialization_kind: MaterializationKind,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Type<'db> {
+        self.apply_type_mapping_impl(
+            db,
+            &TypeMapping::Materialize(materialization_kind),
+            TypeContext::default(),
+            visitor,
+        )
+    }
+
+    pub(crate) const fn is_type_var(self) -> bool {
+        matches!(self, Type::TypeVar(_))
+    }
+
+    pub(crate) const fn as_typevar(self) -> Option<BoundTypeVarInstance<'db>> {
         match self {
-            Type::Dynamic(_) => match variance {
-                // TODO: For an invariant position, e.g. `list[Any]`, it should be replaced with an
-                // existential type representing "all lists, containing any type." We currently
-                // represent this by replacing `Any` in invariant position with an unresolved type
-                // variable.
-                TypeVarVariance::Invariant => Type::TypeVar(BoundTypeVarInstance::new(
-                    db,
-                    TypeVarInstance::new(
-                        db,
-                        Name::new_static("T_all"),
-                        None,
-                        None,
-                        Some(variance),
-                        None,
-                        TypeVarKind::Pep695,
-                    ),
-                    BindingContext::Synthetic,
-                )),
-                TypeVarVariance::Covariant => Type::object(db),
-                TypeVarVariance::Contravariant => Type::Never,
-                TypeVarVariance::Bivariant => unreachable!(),
-            },
-
-            Type::Never
-            | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
-            | Type::DataclassDecorator(_)
-            | Type::DataclassTransformer(_)
-            | Type::ModuleLiteral(_)
-            | Type::IntLiteral(_)
-            | Type::BooleanLiteral(_)
-            | Type::StringLiteral(_)
-            | Type::LiteralString
-            | Type::BytesLiteral(_)
-            | Type::EnumLiteral(_)
-            | Type::SpecialForm(_)
-            | Type::KnownInstance(_)
-            | Type::AlwaysFalsy
-            | Type::AlwaysTruthy
-            | Type::ClassLiteral(_)
-            | Type::BoundSuper(_) => *self,
-
-            Type::PropertyInstance(property_instance) => {
-                Type::PropertyInstance(property_instance.materialize(db, variance))
-            }
-
-            Type::FunctionLiteral(_) | Type::BoundMethod(_) => {
-                // TODO: Subtyping between function / methods with a callable accounts for the
-                // signature (parameters and return type), so we might need to do something here
-                *self
-            }
-
-            Type::NominalInstance(instance) => instance.materialize(db, variance),
-            Type::GenericAlias(generic_alias) => {
-                Type::GenericAlias(generic_alias.materialize(db, variance))
-            }
-            Type::Callable(callable_type) => {
-                Type::Callable(callable_type.materialize(db, variance))
-            }
-            Type::SubclassOf(subclass_of_type) => subclass_of_type.materialize(db, variance),
-            Type::ProtocolInstance(protocol_instance_type) => {
-                // TODO: Add tests for this once subtyping/assignability is implemented for
-                // protocols. It _might_ require changing the logic here because:
-                //
-                // > Subtyping for protocol instances involves taking account of the fact that
-                // > read-only property members, and method members, on protocols act covariantly;
-                // > write-only property members act contravariantly; and read/write attribute
-                // > members on protocols act invariantly
-                Type::ProtocolInstance(protocol_instance_type.materialize(db, variance))
-            }
-            Type::Union(union_type) => union_type.map(db, |ty| ty.materialize(db, variance)),
-            Type::Intersection(intersection_type) => IntersectionBuilder::new(db)
-                .positive_elements(
-                    intersection_type
-                        .positive(db)
-                        .iter()
-                        .map(|ty| ty.materialize(db, variance)),
-                )
-                .negative_elements(
-                    intersection_type
-                        .negative(db)
-                        .iter()
-                        .map(|ty| ty.materialize(db, variance.flip())),
-                )
-                .build(),
-            Type::TypeVar(bound_typevar) => Type::TypeVar(bound_typevar.materialize(db, variance)),
-            Type::NonInferableTypeVar(bound_typevar) => {
-                Type::NonInferableTypeVar(bound_typevar.materialize(db, variance))
-            }
-            Type::TypeIs(type_is) => {
-                type_is.with_type(db, type_is.return_type(db).materialize(db, variance))
-            }
-            Type::TypedDict(_) => {
-                // TODO: Materialization of gradual TypedDicts
-                *self
-            }
-            Type::TypeAlias(alias) => alias.value_type(db).materialize(db, variance),
+            Type::TypeVar(bound_typevar) => Some(bound_typevar),
+            _ => None,
         }
     }
 
-    pub(crate) const fn into_class_literal(self) -> Option<ClassLiteral<'db>> {
+    pub(crate) fn has_typevar(self, db: &'db dyn Db) -> bool {
+        any_over_type(db, self, &|ty| matches!(ty, Type::TypeVar(_)), false)
+    }
+
+    pub(crate) const fn as_class_literal(self) -> Option<ClassLiteral<'db>> {
         match self {
             Type::ClassLiteral(class_type) => Some(class_type),
             _ => None,
         }
     }
 
-    pub(crate) const fn into_dynamic(self) -> Option<DynamicType> {
+    pub(crate) const fn as_type_alias(self) -> Option<TypeAliasType<'db>> {
+        match self {
+            Type::KnownInstance(KnownInstanceType::TypeAliasType(type_alias)) => Some(type_alias),
+            _ => None,
+        }
+    }
+
+    pub(crate) const fn as_dynamic(self) -> Option<DynamicType<'db>> {
         match self {
             Type::Dynamic(dynamic_type) => Some(dynamic_type),
             _ => None,
         }
     }
 
-    pub(crate) const fn expect_dynamic(self) -> DynamicType {
-        self.into_dynamic()
-            .expect("Expected a Type::Dynamic variant")
+    pub(crate) const fn as_callable(self) -> Option<CallableType<'db>> {
+        match self {
+            Type::Callable(callable_type) => Some(callable_type),
+            _ => None,
+        }
+    }
+
+    pub(crate) const fn expect_dynamic(self) -> DynamicType<'db> {
+        self.as_dynamic().expect("Expected a Type::Dynamic variant")
+    }
+
+    pub(crate) const fn as_protocol_instance(self) -> Option<ProtocolInstanceType<'db>> {
+        match self {
+            Type::ProtocolInstance(instance) => Some(instance),
+            _ => None,
+        }
     }
 
     #[track_caller]
     pub(crate) fn expect_class_literal(self) -> ClassLiteral<'db> {
-        self.into_class_literal()
+        self.as_class_literal()
             .expect("Expected a Type::ClassLiteral variant")
     }
 
@@ -911,7 +1058,7 @@ impl<'db> Type<'db> {
         matches!(self, Type::ClassLiteral(..))
     }
 
-    pub(crate) fn into_enum_literal(self) -> Option<EnumLiteralType<'db>> {
+    pub(crate) fn as_enum_literal(self) -> Option<EnumLiteralType<'db>> {
         match self {
             Type::EnumLiteral(enum_literal) => Some(enum_literal),
             _ => None,
@@ -921,7 +1068,7 @@ impl<'db> Type<'db> {
     #[cfg(test)]
     #[track_caller]
     pub(crate) fn expect_enum_literal(self) -> EnumLiteralType<'db> {
-        self.into_enum_literal()
+        self.as_enum_literal()
             .expect("Expected a Type::EnumLiteral variant")
     }
 
@@ -929,7 +1076,7 @@ impl<'db> Type<'db> {
         matches!(self, Type::TypedDict(..))
     }
 
-    pub(crate) fn into_typed_dict(self) -> Option<TypedDictType<'db>> {
+    pub(crate) fn as_typed_dict(self) -> Option<TypedDictType<'db>> {
         match self {
             Type::TypedDict(typed_dict) => Some(typed_dict),
             _ => None,
@@ -963,14 +1110,14 @@ impl<'db> Type<'db> {
         ))
     }
 
-    pub(crate) const fn into_module_literal(self) -> Option<ModuleLiteralType<'db>> {
+    pub(crate) const fn as_module_literal(self) -> Option<ModuleLiteralType<'db>> {
         match self {
             Type::ModuleLiteral(module) => Some(module),
             _ => None,
         }
     }
 
-    pub(crate) const fn into_union(self) -> Option<UnionType<'db>> {
+    pub(crate) const fn as_union(self) -> Option<UnionType<'db>> {
         match self {
             Type::Union(union_type) => Some(union_type),
             _ => None,
@@ -980,10 +1127,10 @@ impl<'db> Type<'db> {
     #[cfg(test)]
     #[track_caller]
     pub(crate) fn expect_union(self) -> UnionType<'db> {
-        self.into_union().expect("Expected a Type::Union variant")
+        self.as_union().expect("Expected a Type::Union variant")
     }
 
-    pub(crate) const fn into_function_literal(self) -> Option<FunctionType<'db>> {
+    pub(crate) const fn as_function_literal(self) -> Option<FunctionType<'db>> {
         match self {
             Type::FunctionLiteral(function_type) => Some(function_type),
             _ => None,
@@ -993,7 +1140,7 @@ impl<'db> Type<'db> {
     #[cfg(test)]
     #[track_caller]
     pub(crate) fn expect_function_literal(self) -> FunctionType<'db> {
-        self.into_function_literal()
+        self.as_function_literal()
             .expect("Expected a Type::FunctionLiteral variant")
     }
 
@@ -1001,21 +1148,33 @@ impl<'db> Type<'db> {
         matches!(self, Type::FunctionLiteral(..))
     }
 
-    pub(crate) const fn is_bound_method(&self) -> bool {
-        matches!(self, Type::BoundMethod(..))
-    }
-
     pub(crate) fn is_union_of_single_valued(&self, db: &'db dyn Db) -> bool {
-        self.into_union().is_some_and(|union| {
-            union
-                .elements(db)
-                .iter()
-                .all(|ty| ty.is_single_valued(db) || ty.is_bool(db) || ty.is_literal_string())
+        self.as_union().is_some_and(|union| {
+            union.elements(db).iter().all(|ty| {
+                ty.is_single_valued(db)
+                    || ty.is_bool(db)
+                    || ty.is_literal_string()
+                    || (ty.is_enum(db) && !ty.overrides_equality(db))
+            })
         }) || self.is_bool(db)
             || self.is_literal_string()
+            || (self.is_enum(db) && !self.overrides_equality(db))
     }
 
-    pub(crate) fn into_string_literal(self) -> Option<StringLiteralType<'db>> {
+    pub(crate) fn is_union_with_single_valued(&self, db: &'db dyn Db) -> bool {
+        self.as_union().is_some_and(|union| {
+            union.elements(db).iter().any(|ty| {
+                ty.is_single_valued(db)
+                    || ty.is_bool(db)
+                    || ty.is_literal_string()
+                    || (ty.is_enum(db) && !ty.overrides_equality(db))
+            })
+        }) || self.is_bool(db)
+            || self.is_literal_string()
+            || (self.is_enum(db) && !self.overrides_equality(db))
+    }
+
+    pub(crate) fn as_string_literal(self) -> Option<StringLiteralType<'db>> {
         match self {
             Type::StringLiteral(string_literal) => Some(string_literal),
             _ => None,
@@ -1035,9 +1194,7 @@ impl<'db> Type<'db> {
     }
 
     pub(crate) fn typed_dict(defining_class: impl Into<ClassType<'db>>) -> Self {
-        Self::TypedDict(TypedDictType {
-            defining_class: defining_class.into(),
-        })
+        Self::TypedDict(TypedDictType::new(defining_class.into()))
     }
 
     #[must_use]
@@ -1050,6 +1207,37 @@ impl<'db> Type<'db> {
         if yes { self.negate(db) } else { *self }
     }
 
+    /// If the type is a union, filters union elements based on the provided predicate.
+    ///
+    /// Otherwise, returns the type unchanged.
+    pub(crate) fn filter_union(
+        self,
+        db: &'db dyn Db,
+        f: impl FnMut(&Type<'db>) -> bool,
+    ) -> Type<'db> {
+        if let Type::Union(union) = self {
+            union.filter(db, f)
+        } else {
+            self
+        }
+    }
+
+    /// If the type is a union, removes union elements that are disjoint from `target`.
+    ///
+    /// Otherwise, returns the type unchanged.
+    pub(crate) fn filter_disjoint_elements(
+        self,
+        db: &'db dyn Db,
+        target: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> Type<'db> {
+        self.filter_union(db, |elem| {
+            !elem
+                .when_disjoint_from(db, target, inferable)
+                .is_always_satisfied()
+        })
+    }
+
     /// Returns the fallback instance type that a literal is an instance of, or `None` if the type
     /// is not a literal.
     pub(crate) fn literal_fallback_instance(self, db: &'db dyn Db) -> Option<Type<'db>> {
@@ -1063,11 +1251,48 @@ impl<'db> Type<'db> {
             Type::IntLiteral(_) => Some(KnownClass::Int.to_instance(db)),
             Type::BytesLiteral(_) => Some(KnownClass::Bytes.to_instance(db)),
             Type::ModuleLiteral(_) => Some(KnownClass::ModuleType.to_instance(db)),
+            Type::FunctionLiteral(_) => Some(KnownClass::FunctionType.to_instance(db)),
             Type::EnumLiteral(literal) => Some(literal.enum_class_instance(db)),
             _ => None,
         }
     }
 
+    /// Promote (possibly nested) literals to types that these literals are instances of.
+    ///
+    /// Note that this function tries to promote literals to a more user-friendly form than their
+    /// fallback instance type. For example, `def _() -> int` is promoted to `Callable[[], int]`,
+    /// as opposed to `FunctionType`.
+    ///
+    /// It also avoids literal promotion if a literal type annotation was provided as type context.
+    pub(crate) fn promote_literals(self, db: &'db dyn Db, tcx: TypeContext<'db>) -> Type<'db> {
+        self.apply_type_mapping(db, &TypeMapping::PromoteLiterals, tcx)
+    }
+
+    /// Like [`Type::promote_literals`], but does not recurse into nested types.
+    fn promote_literals_impl(self, db: &'db dyn Db, tcx: TypeContext<'db>) -> Type<'db> {
+        let promoted = match self {
+            Type::StringLiteral(_) => KnownClass::Str.to_instance(db),
+            Type::LiteralString => KnownClass::Str.to_instance(db),
+            Type::BooleanLiteral(_) => KnownClass::Bool.to_instance(db),
+            Type::IntLiteral(_) => KnownClass::Int.to_instance(db),
+            Type::BytesLiteral(_) => KnownClass::Bytes.to_instance(db),
+            Type::ModuleLiteral(_) => KnownClass::ModuleType.to_instance(db),
+            Type::EnumLiteral(literal) => literal.enum_class_instance(db),
+            Type::FunctionLiteral(literal) => Type::Callable(literal.into_callable_type(db)),
+            _ => return self,
+        };
+
+        // Avoid literal promotion if it leads to an unassignable type.
+        if tcx
+            .annotation
+            .is_none_or(|annotation| promoted.is_assignable_to(db, annotation))
+        {
+            return promoted;
+        }
+
+        self
+    }
+
     /// Return a "normalized" version of `self` that ensures that equivalent types have the same Salsa ID.
     ///
     /// A normalized type:
@@ -1080,15 +1305,13 @@ impl<'db> Type<'db> {
     /// - Converts class-based protocols into synthesized protocols
     #[must_use]
     pub(crate) fn normalized(self, db: &'db dyn Db) -> Self {
-        self.normalized_impl(db, &TypeTransformer::default())
+        self.normalized_impl(db, &NormalizedVisitor::default())
     }
 
     #[must_use]
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
         match self {
-            Type::Union(union) => {
-                visitor.visit(self, || Type::Union(union.normalized_impl(db, visitor)))
-            }
+            Type::Union(union) => visitor.visit(self, || union.normalized_impl(db, visitor)),
             Type::Intersection(intersection) => visitor.visit(self, || {
                 Type::Intersection(intersection.normalized_impl(db, visitor))
             }),
@@ -1107,8 +1330,8 @@ impl<'db> Type<'db> {
             Type::PropertyInstance(property) => visitor.visit(self, || {
                 Type::PropertyInstance(property.normalized_impl(db, visitor))
             }),
-            Type::MethodWrapper(method_kind) => visitor.visit(self, || {
-                Type::MethodWrapper(method_kind.normalized_impl(db, visitor))
+            Type::KnownBoundMethod(method_kind) => visitor.visit(self, || {
+                Type::KnownBoundMethod(method_kind.normalized_impl(db, visitor))
             }),
             Type::BoundMethod(method) => visitor.visit(self, || {
                 Type::BoundMethod(method.normalized_impl(db, visitor))
@@ -1125,9 +1348,6 @@ impl<'db> Type<'db> {
             Type::TypeVar(bound_typevar) => visitor.visit(self, || {
                 Type::TypeVar(bound_typevar.normalized_impl(db, visitor))
             }),
-            Type::NonInferableTypeVar(bound_typevar) => visitor.visit(self, || {
-                Type::NonInferableTypeVar(bound_typevar.normalized_impl(db, visitor))
-            }),
             Type::KnownInstance(known_instance) => visitor.visit(self, || {
                 Type::KnownInstance(known_instance.normalized_impl(db, visitor))
             }),
@@ -1178,7 +1398,7 @@ impl<'db> Type<'db> {
             | Type::FunctionLiteral(..)
             | Type::BoundMethod(_)
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             | Type::ModuleLiteral(..)
@@ -1204,7 +1424,6 @@ impl<'db> Type<'db> {
             | Type::Union(_)
             | Type::Intersection(_)
             | Type::Callable(_)
-            | Type::NonInferableTypeVar(_)
             | Type::TypeVar(_)
             | Type::BoundSuper(_)
             | Type::TypeIs(_)
@@ -1213,11 +1432,11 @@ impl<'db> Type<'db> {
         }
     }
 
-    pub(crate) fn into_callable(self, db: &'db dyn Db) -> Option<Type<'db>> {
+    pub(crate) fn try_upcast_to_callable(self, db: &'db dyn Db) -> Option<Type<'db>> {
         match self {
             Type::Callable(_) => Some(self),
 
-            Type::Dynamic(_) => Some(CallableType::single(db, Signature::dynamic(self))),
+            Type::Dynamic(_) => Some(CallableType::function_like(db, Signature::dynamic(self))),
 
             Type::FunctionLiteral(function_literal) => {
                 Some(Type::Callable(function_literal.into_callable_type(db)))
@@ -1235,8 +1454,8 @@ impl<'db> Type<'db> {
                     )
                     .place;
 
-                if let Place::Type(ty, Boundness::Bound) = call_symbol {
-                    ty.into_callable(db)
+                if let Place::Defined(ty, _, Definedness::AlwaysDefined) = call_symbol {
+                    ty.try_upcast_to_callable(db)
                 } else {
                     None
                 }
@@ -1256,13 +1475,25 @@ impl<'db> Type<'db> {
                 )),
             },
 
-            Type::Union(union) => union.try_map(db, |element| element.into_callable(db)),
+            Type::Union(union) => union.try_map(db, |element| element.try_upcast_to_callable(db)),
 
-            Type::EnumLiteral(enum_literal) => {
-                enum_literal.enum_class_instance(db).into_callable(db)
-            }
+            Type::EnumLiteral(enum_literal) => enum_literal
+                .enum_class_instance(db)
+                .try_upcast_to_callable(db),
 
-            Type::TypeAlias(alias) => alias.value_type(db).into_callable(db),
+            Type::TypeAlias(alias) => alias.value_type(db).try_upcast_to_callable(db),
+
+            Type::KnownBoundMethod(method) => Some(Type::Callable(CallableType::new(
+                db,
+                CallableSignature::from_overloads(method.signatures(db)),
+                false,
+            ))),
+
+            Type::WrapperDescriptor(wrapper_descriptor) => Some(Type::Callable(CallableType::new(
+                db,
+                CallableSignature::from_overloads(wrapper_descriptor.signatures(db)),
+                false,
+            ))),
 
             Type::Never
             | Type::DataclassTransformer(_)
@@ -1277,108 +1508,141 @@ impl<'db> Type<'db> {
             | Type::TypedDict(_) => None,
 
             // TODO
-            Type::MethodWrapper(_)
-            | Type::WrapperDescriptor(_)
-            | Type::DataclassDecorator(_)
+            Type::DataclassDecorator(_)
             | Type::ModuleLiteral(_)
             | Type::SpecialForm(_)
             | Type::KnownInstance(_)
             | Type::PropertyInstance(_)
             | Type::Intersection(_)
-            | Type::NonInferableTypeVar(_)
             | Type::TypeVar(_)
             | Type::BoundSuper(_) => None,
         }
     }
-    /// Return true if this type is a [subtype of] type `target`.
+
+    /// Return true if this type is a subtype of type `target`.
     ///
-    /// For fully static types, this means that the set of objects represented by `self` is a
-    /// subset of the objects represented by `target`.
-    ///
-    /// For gradual types, it means that the union of all possible sets of values represented by
-    /// `self` (the "top materialization" of `self`) is a subtype of the intersection of all
-    /// possible sets of values represented by `target` (the "bottom materialization" of
-    /// `target`). In other words, for all possible pairs of materializations `self'` and
-    /// `target'`, `self'` is always a subtype of `target'`.
-    ///
-    /// Note that this latter expansion of the subtyping relation to non-fully-static types is not
-    /// described in the typing spec, but the primary use of the subtyping relation is for
-    /// simplifying unions and intersections, and this expansion to gradual types is sound and
-    /// allows us to better simplify many unions and intersections. This definition does mean the
-    /// subtyping relation is not reflexive for non-fully-static types (e.g. `Any` is not a subtype
-    /// of `Any`).
-    ///
-    /// [subtype of]: https://typing.python.org/en/latest/spec/concepts.html#subtype-supertype-and-type-equivalence
-    ///
-    /// There would be an even more general definition of subtyping for gradual types, allowing a
-    /// type `S` to be a subtype of a type `T` if the top materialization of `S` (`S+`) is a
-    /// subtype of `T+`, and the bottom materialization of `S` (`S-`) is a subtype of `T-`. This
-    /// definition is attractive in that it would restore reflexivity of subtyping for all types,
-    /// and would mean that gradual equivalence of `S` and `T` could be defined simply as `S <: T
-    /// && T <: S`. It would also be sound, in that simplifying unions or intersections according
-    /// to this definition of subtyping would still result in an equivalent type.
-    ///
-    /// Unfortunately using this definition would break transitivity of subtyping when both nominal
-    /// and structural types are involved, because Liskov enforcement for nominal types is based on
-    /// assignability, so we can have class `A` with method `def meth(self) -> Any` and a subclass
-    /// `B(A)` with method `def meth(self) -> int`. In this case, `A` would be a subtype of a
-    /// protocol `P` with method `def meth(self) -> Any`, but `B` would not be a subtype of `P`,
-    /// and yet `B` is (by nominal subtyping) a subtype of `A`, so we would have `B <: A` and `A <:
-    /// P`, but not `B <: P`. Losing transitivity of subtyping is not tenable (it makes union and
-    /// intersection simplification dependent on the order in which elements are added), so we do
-    /// not use this more general definition of subtyping.
+    /// See [`TypeRelation::Subtyping`] for more details.
     pub(crate) fn is_subtype_of(self, db: &'db dyn Db, target: Type<'db>) -> bool {
-        self.has_relation_to(db, target, TypeRelation::Subtyping)
+        self.when_subtype_of(db, target, InferableTypeVars::None)
+            .is_always_satisfied()
     }
 
-    /// Return true if this type is [assignable to] type `target`.
+    fn when_subtype_of(
+        self,
+        db: &'db dyn Db,
+        target: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.has_relation_to(db, target, inferable, TypeRelation::Subtyping)
+    }
+
+    /// Return true if this type is assignable to type `target`.
     ///
-    /// [assignable to]: https://typing.python.org/en/latest/spec/concepts.html#the-assignable-to-or-consistent-subtyping-relation
+    /// See [`TypeRelation::Assignability`] for more details.
     pub(crate) fn is_assignable_to(self, db: &'db dyn Db, target: Type<'db>) -> bool {
-        self.has_relation_to(db, target, TypeRelation::Assignability)
+        self.when_assignable_to(db, target, InferableTypeVars::None)
+            .is_always_satisfied()
     }
 
-    fn has_relation_to(self, db: &'db dyn Db, target: Type<'db>, relation: TypeRelation) -> bool {
-        self.has_relation_to_impl(db, target, relation, &PairVisitor::new(true))
+    fn when_assignable_to(
+        self,
+        db: &'db dyn Db,
+        target: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.has_relation_to(db, target, inferable, TypeRelation::Assignability)
+    }
+
+    /// Return `true` if it would be redundant to add `self` to a union that already contains `other`.
+    ///
+    /// See [`TypeRelation::Redundancy`] for more details.
+    #[salsa::tracked(cycle_initial=is_redundant_with_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    pub(crate) fn is_redundant_with(self, db: &'db dyn Db, other: Type<'db>) -> bool {
+        self.has_relation_to(db, other, InferableTypeVars::None, TypeRelation::Redundancy)
+            .is_always_satisfied()
+    }
+
+    fn has_relation_to(
+        self,
+        db: &'db dyn Db,
+        target: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+        relation: TypeRelation,
+    ) -> ConstraintSet<'db> {
+        self.has_relation_to_impl(
+            db,
+            target,
+            inferable,
+            relation,
+            &HasRelationToVisitor::default(),
+            &IsDisjointVisitor::default(),
+        )
     }
 
     fn has_relation_to_impl(
         self,
         db: &'db dyn Db,
         target: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         // Subtyping implies assignability, so if subtyping is reflexive and the two types are
         // equal, it is both a subtype and assignable. Assignability is always reflexive.
         //
         // Note that we could do a full equivalence check here, but that would be both expensive
         // and unnecessary. This early return is only an optimisation.
-        if (relation.is_assignability() || self.subtyping_is_always_reflexive()) && self == target {
-            return true;
+        if (!relation.is_subtyping() || self.subtyping_is_always_reflexive()) && self == target {
+            return ConstraintSet::from(true);
         }
 
         match (self, target) {
             // Everything is a subtype of `object`.
-            (_, Type::NominalInstance(instance)) if instance.is_object(db) => true,
+            (_, Type::NominalInstance(instance)) if instance.is_object() => {
+                ConstraintSet::from(true)
+            }
+            (_, Type::ProtocolInstance(target)) if target.is_equivalent_to_object(db) => {
+                ConstraintSet::from(true)
+            }
 
             // `Never` is the bottom type, the empty set.
             // It is a subtype of all other types.
-            (Type::Never, _) => true,
+            (Type::Never, _) => ConstraintSet::from(true),
 
-            // Dynamic is only a subtype of `object` and only a supertype of `Never`; both were
-            // handled above. It's always assignable, though.
-            (Type::Dynamic(_), _) | (_, Type::Dynamic(_)) => relation.is_assignability(),
+            // In some specific situations, `Any`/`Unknown`/`@Todo` can be simplified out of unions and intersections,
+            // but this is not true for divergent types (and moving this case any lower down appears to cause
+            // "too many cycle iterations" panics).
+            (Type::Dynamic(DynamicType::Divergent(_)), _)
+            | (_, Type::Dynamic(DynamicType::Divergent(_))) => {
+                ConstraintSet::from(relation.is_assignability())
+            }
 
-            (Type::TypeAlias(self_alias), _) => visitor.visit((self, target), || {
-                self_alias
-                    .value_type(db)
-                    .has_relation_to_impl(db, target, relation, visitor)
-            }),
+            (Type::TypeAlias(self_alias), _) => {
+                relation_visitor.visit((self, target, relation), || {
+                    self_alias.value_type(db).has_relation_to_impl(
+                        db,
+                        target,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
+            }
 
-            (_, Type::TypeAlias(target_alias)) => visitor.visit((self, target), || {
-                self.has_relation_to_impl(db, target_alias.value_type(db), relation, visitor)
-            }),
+            (_, Type::TypeAlias(target_alias)) => {
+                relation_visitor.visit((self, target, relation), || {
+                    self.has_relation_to_impl(
+                        db,
+                        target_alias.value_type(db),
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
+            }
 
             // Pretend that instances of `dataclasses.Field` are assignable to their default type.
             // This allows field definitions like `name: str = field(default="")` in dataclasses
@@ -1386,13 +1650,45 @@ impl<'db> Type<'db> {
             (Type::KnownInstance(KnownInstanceType::Field(field)), right)
                 if relation.is_assignability() =>
             {
-                field.default_type(db).has_relation_to(db, right, relation)
+                field.default_type(db).when_none_or(|default_type| {
+                    default_type.has_relation_to_impl(
+                        db,
+                        right,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
             }
 
-            (Type::TypedDict(_), _) | (_, Type::TypedDict(_)) => {
-                // TODO: Implement assignability and subtyping for TypedDict
-                relation.is_assignability()
-            }
+            // Dynamic is only a subtype of `object` and only a supertype of `Never`; both were
+            // handled above. It's always assignable, though.
+            //
+            // Union simplification sits in between subtyping and assignability. `Any <: T` only
+            // holds true if `T` is also a dynamic type or a union that contains a dynamic type.
+            // Similarly, `T <: Any` only holds true if `T` is a dynamic type or an intersection
+            // that contains a dynamic type.
+            (Type::Dynamic(_), _) => ConstraintSet::from(match relation {
+                TypeRelation::Subtyping => false,
+                TypeRelation::Assignability => true,
+                TypeRelation::Redundancy => match target {
+                    Type::Dynamic(_) => true,
+                    Type::Union(union) => union.elements(db).iter().any(Type::is_dynamic),
+                    _ => false,
+                },
+            }),
+            (_, Type::Dynamic(_)) => ConstraintSet::from(match relation {
+                TypeRelation::Subtyping => false,
+                TypeRelation::Assignability => true,
+                TypeRelation::Redundancy => match self {
+                    Type::Dynamic(_) => true,
+                    Type::Intersection(intersection) => {
+                        intersection.positive(db).iter().any(Type::is_dynamic)
+                    }
+                    _ => false,
+                },
+            }),
 
             // In general, a TypeVar `T` is not a subtype of a type `S` unless one of the two conditions is satisfied:
             // 1. `T` is a bound TypeVar and `T`'s upper bound is a subtype of `S`.
@@ -1402,20 +1698,23 @@ impl<'db> Type<'db> {
             // However, there is one exception to this general rule: for any given typevar `T`,
             // `T` will always be a subtype of any union containing `T`.
             // A similar rule applies in reverse to intersection types.
-            (Type::NonInferableTypeVar(_), Type::Union(union))
-                if union.elements(db).contains(&self) =>
+            (Type::TypeVar(bound_typevar), Type::Union(union))
+                if !bound_typevar.is_inferable(db, inferable)
+                    && union.elements(db).contains(&self) =>
             {
-                true
+                ConstraintSet::from(true)
             }
-            (Type::Intersection(intersection), Type::NonInferableTypeVar(_))
-                if intersection.positive(db).contains(&target) =>
+            (Type::Intersection(intersection), Type::TypeVar(bound_typevar))
+                if !bound_typevar.is_inferable(db, inferable)
+                    && intersection.positive(db).contains(&target) =>
             {
-                true
+                ConstraintSet::from(true)
             }
-            (Type::Intersection(intersection), Type::NonInferableTypeVar(_))
-                if intersection.negative(db).contains(&target) =>
+            (Type::Intersection(intersection), Type::TypeVar(bound_typevar))
+                if !bound_typevar.is_inferable(db, inferable)
+                    && intersection.negative(db).contains(&target) =>
             {
-                false
+                ConstraintSet::from(false)
             }
 
             // Two identical typevars must always solve to the same type, so they are always
@@ -1423,25 +1722,41 @@ impl<'db> Type<'db> {
             //
             // Note that this is not handled by the early return at the beginning of this method,
             // since subtyping between a TypeVar and an arbitrary other type cannot be guaranteed to be reflexive.
-            (
-                Type::NonInferableTypeVar(lhs_bound_typevar),
-                Type::NonInferableTypeVar(rhs_bound_typevar),
-            ) if lhs_bound_typevar == rhs_bound_typevar => true,
+            (Type::TypeVar(lhs_bound_typevar), Type::TypeVar(rhs_bound_typevar))
+                if !lhs_bound_typevar.is_inferable(db, inferable)
+                    && lhs_bound_typevar.identity(db) == rhs_bound_typevar.identity(db) =>
+            {
+                ConstraintSet::from(true)
+            }
 
             // A fully static typevar is a subtype of its upper bound, and to something similar to
             // the union of its constraints. An unbound, unconstrained, fully static typevar has an
             // implicit upper bound of `object` (which is handled above).
-            (Type::NonInferableTypeVar(bound_typevar), _)
-                if bound_typevar.typevar(db).bound_or_constraints(db).is_some() =>
+            (Type::TypeVar(bound_typevar), _)
+                if !bound_typevar.is_inferable(db, inferable)
+                    && bound_typevar.typevar(db).bound_or_constraints(db).is_some() =>
             {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
                     None => unreachable!(),
-                    Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
-                        bound.has_relation_to_impl(db, target, relation, visitor)
-                    }
+                    Some(TypeVarBoundOrConstraints::UpperBound(bound)) => bound
+                        .has_relation_to_impl(
+                            db,
+                            target,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        ),
                     Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
-                        constraints.elements(db).iter().all(|constraint| {
-                            constraint.has_relation_to_impl(db, target, relation, visitor)
+                        constraints.elements(db).iter().when_all(db, |constraint| {
+                            constraint.has_relation_to_impl(
+                                db,
+                                target,
+                                inferable,
+                                relation,
+                                relation_visitor,
+                                disjointness_visitor,
+                            )
                         })
                     }
                 }
@@ -1450,70 +1765,202 @@ impl<'db> Type<'db> {
             // If the typevar is constrained, there must be multiple constraints, and the typevar
             // might be specialized to any one of them. However, the constraints do not have to be
             // disjoint, which means an lhs type might be a subtype of all of the constraints.
-            (_, Type::NonInferableTypeVar(bound_typevar))
-                if bound_typevar
+            (_, Type::TypeVar(bound_typevar))
+                if !bound_typevar.is_inferable(db, inferable)
+                    && !bound_typevar
+                        .typevar(db)
+                        .constraints(db)
+                        .when_some_and(|constraints| {
+                            constraints.iter().when_all(db, |constraint| {
+                                self.has_relation_to_impl(
+                                    db,
+                                    *constraint,
+                                    inferable,
+                                    relation,
+                                    relation_visitor,
+                                    disjointness_visitor,
+                                )
+                            })
+                        })
+                        .is_never_satisfied() =>
+            {
+                // TODO: The repetition here isn't great, but we really need the fallthrough logic,
+                // where this arm only engages if it returns true (or in the world of constraints,
+                // not false). Once we're using real constraint sets instead of bool, we should be
+                // able to simplify the typevar logic.
+                bound_typevar
                     .typevar(db)
                     .constraints(db)
-                    .is_some_and(|constraints| {
-                        constraints.iter().all(|constraint| {
-                            self.has_relation_to_impl(db, *constraint, relation, visitor)
+                    .when_some_and(|constraints| {
+                        constraints.iter().when_all(db, |constraint| {
+                            self.has_relation_to_impl(
+                                db,
+                                *constraint,
+                                inferable,
+                                relation,
+                                relation_visitor,
+                                disjointness_visitor,
+                            )
                         })
-                    }) =>
+                    })
+            }
+
+            (Type::TypeVar(bound_typevar), _)
+                if bound_typevar.is_inferable(db, inferable) && relation.is_assignability() =>
             {
-                true
+                // The implicit lower bound of a typevar is `Never`, which means
+                // that it is always assignable to any other type.
+
+                // TODO: record the unification constraints
+
+                ConstraintSet::from(true)
             }
 
             // `Never` is the bottom type, the empty set.
-            // Other than one unlikely edge case (TypeVars bound to `Never`),
-            // no other type is a subtype of or assignable to `Never`.
-            (_, Type::Never) => false,
+            (_, Type::Never) => ConstraintSet::from(false),
 
-            (Type::Union(union), _) => union
-                .elements(db)
-                .iter()
-                .all(|&elem_ty| elem_ty.has_relation_to_impl(db, target, relation, visitor)),
+            (Type::Union(union), _) => union.elements(db).iter().when_all(db, |&elem_ty| {
+                elem_ty.has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }),
 
-            (_, Type::Union(union)) => union
-                .elements(db)
-                .iter()
-                .any(|&elem_ty| self.has_relation_to_impl(db, elem_ty, relation, visitor)),
+            (_, Type::Union(union)) => union.elements(db).iter().when_any(db, |&elem_ty| {
+                self.has_relation_to_impl(
+                    db,
+                    elem_ty,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }),
 
             // If both sides are intersections we need to handle the right side first
             // (A & B & C) is a subtype of (A & B) because the left is a subtype of both A and B,
             // but none of A, B, or C is a subtype of (A & B).
-            (_, Type::Intersection(intersection)) => {
-                intersection
-                    .positive(db)
-                    .iter()
-                    .all(|&pos_ty| self.has_relation_to_impl(db, pos_ty, relation, visitor))
-                    && intersection
-                        .negative(db)
-                        .iter()
-                        .all(|&neg_ty| self.is_disjoint_from(db, neg_ty))
-            }
-
-            (Type::Intersection(intersection), _) => intersection
+            (_, Type::Intersection(intersection)) => intersection
                 .positive(db)
                 .iter()
-                .any(|&elem_ty| elem_ty.has_relation_to_impl(db, target, relation, visitor)),
+                .when_all(db, |&pos_ty| {
+                    self.has_relation_to_impl(
+                        db,
+                        pos_ty,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
+                .and(db, || {
+                    // For subtyping, we would want to check whether the *top materialization* of `self`
+                    // is disjoint from the *top materialization* of `neg_ty`. As an optimization, however,
+                    // we can avoid this explicit transformation here, since our `Type::is_disjoint_from`
+                    // implementation already only returns true for `T.is_disjoint_from(U)` if the *top
+                    // materialization* of `T` is disjoint from the *top materialization* of `U`.
+                    //
+                    // Note that the implementation of redundancy here may be too strict from a
+                    // theoretical perspective: under redundancy, `T <: ~U` if `Bottom[T]` is disjoint
+                    // from `Top[U]` and `Bottom[U]` is disjoint from `Top[T]`. It's possible that this
+                    // could be improved. For now, however, we err on the side of strictness for our
+                    // redundancy implementation: a fully complete implementation of redundancy may lead
+                    // to non-transitivity (highly undesirable); and pragmatically, a full implementation
+                    // of redundancy may not generally lead to simpler types in many situations.
+                    let self_ty = match relation {
+                        TypeRelation::Subtyping | TypeRelation::Redundancy => self,
+                        TypeRelation::Assignability => self.bottom_materialization(db),
+                    };
+                    intersection.negative(db).iter().when_all(db, |&neg_ty| {
+                        let neg_ty = match relation {
+                            TypeRelation::Subtyping | TypeRelation::Redundancy => neg_ty,
+                            TypeRelation::Assignability => neg_ty.bottom_materialization(db),
+                        };
+                        self_ty.is_disjoint_from_impl(
+                            db,
+                            neg_ty,
+                            inferable,
+                            disjointness_visitor,
+                            relation_visitor,
+                        )
+                    })
+                }),
+
+            (Type::Intersection(intersection), _) => {
+                intersection.positive(db).iter().when_any(db, |&elem_ty| {
+                    elem_ty.has_relation_to_impl(
+                        db,
+                        target,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
+            }
 
             // Other than the special cases checked above, no other types are a subtype of a
             // typevar, since there's no guarantee what type the typevar will be specialized to.
             // (If the typevar is bounded, it might be specialized to a smaller type than the
             // bound. This is true even if the bound is a final class, since the typevar can still
             // be specialized to `Never`.)
-            (_, Type::NonInferableTypeVar(_)) => false,
+            (_, Type::TypeVar(bound_typevar)) if !bound_typevar.is_inferable(db, inferable) => {
+                ConstraintSet::from(false)
+            }
+
+            (_, Type::TypeVar(typevar))
+                if typevar.is_inferable(db, inferable)
+                    && relation.is_assignability()
+                    && typevar.typevar(db).upper_bound(db).is_none_or(|bound| {
+                        !self
+                            .has_relation_to_impl(
+                                db,
+                                bound,
+                                inferable,
+                                relation,
+                                relation_visitor,
+                                disjointness_visitor,
+                            )
+                            .is_never_satisfied()
+                    }) =>
+            {
+                // TODO: record the unification constraints
+
+                typevar.typevar(db).upper_bound(db).when_none_or(|bound| {
+                    self.has_relation_to_impl(
+                        db,
+                        bound,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
+            }
 
             // TODO: Infer specializations here
-            (Type::TypeVar(_), _) | (_, Type::TypeVar(_)) => false,
+            (Type::TypeVar(bound_typevar), _) | (_, Type::TypeVar(bound_typevar))
+                if bound_typevar.is_inferable(db, inferable) =>
+            {
+                ConstraintSet::from(false)
+            }
+
+            (Type::TypedDict(_), _) | (_, Type::TypedDict(_)) => {
+                // TODO: Implement assignability and subtyping for TypedDict
+                ConstraintSet::from(relation.is_assignability())
+            }
 
             // Note that the definition of `Type::AlwaysFalsy` depends on the return value of `__bool__`.
             // If `__bool__` always returns True or False, it can be treated as a subtype of `AlwaysTruthy` or `AlwaysFalsy`, respectively.
-            (left, Type::AlwaysFalsy) => left.bool(db).is_always_false(),
-            (left, Type::AlwaysTruthy) => left.bool(db).is_always_true(),
+            (left, Type::AlwaysFalsy) => ConstraintSet::from(left.bool(db).is_always_false()),
+            (left, Type::AlwaysTruthy) => ConstraintSet::from(left.bool(db).is_always_true()),
             // Currently, the only supertype of `AlwaysFalsy` and `AlwaysTruthy` is the universal set (object instance).
             (Type::AlwaysFalsy | Type::AlwaysTruthy, _) => {
-                target.is_equivalent_to(db, Type::object(db))
+                target.when_equivalent_to(db, Type::object(), inferable)
             }
 
             // These clauses handle type variants that include function literals. A function
@@ -1522,13 +1969,33 @@ impl<'db> Type<'db> {
             // applied to the signature. Different specializations of the same function literal are
             // only subtypes of each other if they result in the same signature.
             (Type::FunctionLiteral(self_function), Type::FunctionLiteral(target_function)) => {
-                self_function.has_relation_to(db, target_function, relation)
+                self_function.has_relation_to_impl(
+                    db,
+                    target_function,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
             }
-            (Type::BoundMethod(self_method), Type::BoundMethod(target_method)) => {
-                self_method.has_relation_to(db, target_method, relation)
-            }
-            (Type::MethodWrapper(self_method), Type::MethodWrapper(target_method)) => {
-                self_method.has_relation_to(db, target_method, relation)
+            (Type::BoundMethod(self_method), Type::BoundMethod(target_method)) => self_method
+                .has_relation_to_impl(
+                    db,
+                    target_method,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
+            (Type::KnownBoundMethod(self_method), Type::KnownBoundMethod(target_method)) => {
+                self_method.has_relation_to_impl(
+                    db,
+                    target_method,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
             }
 
             // No literal type is a subtype of any other literal type, unless they are the same
@@ -1550,36 +2017,63 @@ impl<'db> Type<'db> {
                 | Type::FunctionLiteral(_)
                 | Type::ModuleLiteral(_)
                 | Type::EnumLiteral(_),
-            ) => false,
+            ) => ConstraintSet::from(false),
 
-            (Type::Callable(self_callable), Type::Callable(other_callable)) => {
-                self_callable.has_relation_to(db, other_callable, relation)
-            }
+            (Type::Callable(self_callable), Type::Callable(other_callable)) => relation_visitor
+                .visit((self, target, relation), || {
+                    self_callable.has_relation_to_impl(
+                        db,
+                        other_callable,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                }),
 
-            (_, Type::Callable(_)) => self.into_callable(db).is_some_and(|callable| {
-                callable.has_relation_to_impl(db, target, relation, visitor)
+            (_, Type::Callable(_)) => relation_visitor.visit((self, target, relation), || {
+                self.try_upcast_to_callable(db).when_some_and(|callable| {
+                    callable.has_relation_to_impl(
+                        db,
+                        target,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
             }),
 
-            (Type::ProtocolInstance(left), Type::ProtocolInstance(right)) => {
-                left.has_relation_to(db, right, relation)
-            }
-            // A protocol instance can never be a subtype of a nominal type, with the *sole* exception of `object`.
-            (Type::ProtocolInstance(_), _) => false,
             (_, Type::ProtocolInstance(protocol)) => {
-                self.satisfies_protocol(db, protocol, relation)
+                relation_visitor.visit((self, target, relation), || {
+                    self.satisfies_protocol(
+                        db,
+                        protocol,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
             }
 
+            // A protocol instance can never be a subtype of a nominal type, with the *sole* exception of `object`.
+            (Type::ProtocolInstance(_), _) => ConstraintSet::from(false),
+
             // All `StringLiteral` types are a subtype of `LiteralString`.
-            (Type::StringLiteral(_), Type::LiteralString) => true,
+            (Type::StringLiteral(_), Type::LiteralString) => ConstraintSet::from(true),
 
             // An instance is a subtype of an enum literal, if it is an instance of the enum class
             // and the enum has only one member.
             (Type::NominalInstance(_), Type::EnumLiteral(target_enum_literal)) => {
                 if target_enum_literal.enum_class_instance(db) != self {
-                    return false;
+                    return ConstraintSet::from(false);
                 }
 
-                is_single_member_enum(db, target_enum_literal.enum_class(db))
+                ConstraintSet::from(is_single_member_enum(
+                    db,
+                    target_enum_literal.enum_class(db),
+                ))
             }
 
             // Except for the special `LiteralString` case above,
@@ -1592,70 +2086,116 @@ impl<'db> Type<'db> {
                 | Type::IntLiteral(_)
                 | Type::BytesLiteral(_)
                 | Type::ModuleLiteral(_)
-                | Type::EnumLiteral(_),
+                | Type::EnumLiteral(_)
+                | Type::FunctionLiteral(_),
                 _,
-            ) => (self.literal_fallback_instance(db)).is_some_and(|instance| {
-                instance.has_relation_to_impl(db, target, relation, visitor)
+            ) => (self.literal_fallback_instance(db)).when_some_and(|instance| {
+                instance.has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
             }),
 
-            // A `FunctionLiteral` type is a single-valued type like the other literals handled above,
-            // so it also, for now, just delegates to its instance fallback.
-            (Type::FunctionLiteral(_), _) => KnownClass::FunctionType
-                .to_instance(db)
-                .has_relation_to(db, target, relation),
-
             // The same reasoning applies for these special callable types:
-            (Type::BoundMethod(_), _) => KnownClass::MethodType
-                .to_instance(db)
-                .has_relation_to_impl(db, target, relation, visitor),
-            (Type::MethodWrapper(_), _) => KnownClass::WrapperDescriptorType
-                .to_instance(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+            (Type::BoundMethod(_), _) => {
+                KnownClass::MethodType.to_instance(db).has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }
+            (Type::KnownBoundMethod(method), _) => {
+                method.class().to_instance(db).has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }
             (Type::WrapperDescriptor(_), _) => KnownClass::WrapperDescriptorType
                 .to_instance(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+                .has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
 
             (Type::DataclassDecorator(_) | Type::DataclassTransformer(_), _) => {
                 // TODO: Implement subtyping using an equivalent `Callable` type.
-                false
+                ConstraintSet::from(false)
             }
 
             // `TypeIs` is invariant.
-            (Type::TypeIs(left), Type::TypeIs(right)) => {
-                left.return_type(db).has_relation_to_impl(
+            (Type::TypeIs(left), Type::TypeIs(right)) => left
+                .return_type(db)
+                .has_relation_to_impl(
                     db,
                     right.return_type(db),
+                    inferable,
                     relation,
-                    visitor,
-                ) && right.return_type(db).has_relation_to_impl(
-                    db,
-                    left.return_type(db),
-                    relation,
-                    visitor,
+                    relation_visitor,
+                    disjointness_visitor,
                 )
-            }
+                .and(db, || {
+                    right.return_type(db).has_relation_to_impl(
+                        db,
+                        left.return_type(db),
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                }),
 
             // `TypeIs[T]` is a subtype of `bool`.
-            (Type::TypeIs(_), _) => KnownClass::Bool
-                .to_instance(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+            (Type::TypeIs(_), _) => KnownClass::Bool.to_instance(db).has_relation_to_impl(
+                db,
+                target,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
 
             // Function-like callables are subtypes of `FunctionType`
-            (Type::Callable(callable), _)
-                if callable.is_function_like(db)
-                    && KnownClass::FunctionType
-                        .to_instance(db)
-                        .has_relation_to_impl(db, target, relation, visitor) =>
-            {
-                true
+            (Type::Callable(callable), _) if callable.is_function_like(db) => {
+                KnownClass::FunctionType
+                    .to_instance(db)
+                    .has_relation_to_impl(
+                        db,
+                        target,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
             }
 
-            (Type::Callable(_), _) => false,
+            (Type::Callable(_), _) => ConstraintSet::from(false),
 
-            (Type::BoundSuper(_), Type::BoundSuper(_)) => self.is_equivalent_to(db, target),
-            (Type::BoundSuper(_), _) => KnownClass::Super
-                .to_instance(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+            (Type::BoundSuper(_), Type::BoundSuper(_)) => {
+                self.when_equivalent_to(db, target, inferable)
+            }
+            (Type::BoundSuper(_), _) => KnownClass::Super.to_instance(db).has_relation_to_impl(
+                db,
+                target,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
 
             // `Literal[<class 'C'>]` is a subtype of `type[B]` if `C` is a subclass of `B`,
             // since `type[B]` describes all possible runtime subclasses of the class object `B`.
@@ -1666,11 +2206,13 @@ impl<'db> Type<'db> {
                     ClassType::NonGeneric(class).has_relation_to_impl(
                         db,
                         subclass_of_class,
+                        inferable,
                         relation,
-                        visitor,
+                        relation_visitor,
+                        disjointness_visitor,
                     )
                 })
-                .unwrap_or(relation.is_assignability()),
+                .unwrap_or_else(|| ConstraintSet::from(relation.is_assignability())),
             (Type::GenericAlias(alias), Type::SubclassOf(target_subclass_ty)) => target_subclass_ty
                 .subclass_of()
                 .into_class()
@@ -1678,46 +2220,88 @@ impl<'db> Type<'db> {
                     ClassType::Generic(alias).has_relation_to_impl(
                         db,
                         subclass_of_class,
+                        inferable,
                         relation,
-                        visitor,
+                        relation_visitor,
+                        disjointness_visitor,
                     )
                 })
-                .unwrap_or(relation.is_assignability()),
+                .unwrap_or_else(|| ConstraintSet::from(relation.is_assignability())),
 
             // This branch asks: given two types `type[T]` and `type[S]`, is `type[T]` a subtype of `type[S]`?
             (Type::SubclassOf(self_subclass_ty), Type::SubclassOf(target_subclass_ty)) => {
-                self_subclass_ty.has_relation_to_impl(db, target_subclass_ty, relation, visitor)
+                self_subclass_ty.has_relation_to_impl(
+                    db,
+                    target_subclass_ty,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
             }
 
             // `Literal[str]` is a subtype of `type` because the `str` class object is an instance of its metaclass `type`.
             // `Literal[abc.ABC]` is a subtype of `abc.ABCMeta` because the `abc.ABC` class object
             // is an instance of its metaclass `abc.ABCMeta`.
-            (Type::ClassLiteral(class), _) => class
-                .metaclass_instance_type(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+            (Type::ClassLiteral(class), _) => {
+                class.metaclass_instance_type(db).has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }
             (Type::GenericAlias(alias), _) => ClassType::from(alias)
                 .metaclass_instance_type(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+                .has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
 
             // `type[Any]` is a subtype of `type[object]`, and is assignable to any `type[...]`
             (Type::SubclassOf(subclass_of_ty), other) if subclass_of_ty.is_dynamic() => {
                 KnownClass::Type
                     .to_instance(db)
-                    .has_relation_to_impl(db, other, relation, visitor)
-                    || (relation.is_assignability()
-                        && other.has_relation_to_impl(
-                            db,
-                            KnownClass::Type.to_instance(db),
-                            relation,
-                            visitor,
-                        ))
+                    .has_relation_to_impl(
+                        db,
+                        other,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                    .or(db, || {
+                        ConstraintSet::from(relation.is_assignability()).and(db, || {
+                            other.has_relation_to_impl(
+                                db,
+                                KnownClass::Type.to_instance(db),
+                                inferable,
+                                relation,
+                                relation_visitor,
+                                disjointness_visitor,
+                            )
+                        })
+                    })
             }
 
             // Any `type[...]` type is assignable to `type[Any]`
             (other, Type::SubclassOf(subclass_of_ty))
                 if subclass_of_ty.is_dynamic() && relation.is_assignability() =>
             {
-                other.has_relation_to_impl(db, KnownClass::Type.to_instance(db), relation, visitor)
+                other.has_relation_to_impl(
+                    db,
+                    KnownClass::Type.to_instance(db),
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
             }
 
             // `type[str]` (== `SubclassOf("str")` in ty) describes all possible runtime subclasses
@@ -1732,40 +2316,78 @@ impl<'db> Type<'db> {
                 .into_class()
                 .map(|class| class.metaclass_instance_type(db))
                 .unwrap_or_else(|| KnownClass::Type.to_instance(db))
-                .has_relation_to_impl(db, target, relation, visitor),
+                .has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
 
             // For example: `Type::SpecialForm(SpecialFormType::Type)` is a subtype of `Type::NominalInstance(_SpecialForm)`,
             // because `Type::SpecialForm(SpecialFormType::Type)` is a set with exactly one runtime value in it
             // (the symbol `typing.Type`), and that symbol is known to be an instance of `typing._SpecialForm` at runtime.
-            (Type::SpecialForm(left), right) => left
-                .instance_fallback(db)
-                .has_relation_to_impl(db, right, relation, visitor),
+            (Type::SpecialForm(left), right) => left.instance_fallback(db).has_relation_to_impl(
+                db,
+                right,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
 
-            (Type::KnownInstance(left), right) => left
-                .instance_fallback(db)
-                .has_relation_to_impl(db, right, relation, visitor),
+            (Type::KnownInstance(left), right) => left.instance_fallback(db).has_relation_to_impl(
+                db,
+                right,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
 
             // `bool` is a subtype of `int`, because `bool` subclasses `int`,
             // which means that all instances of `bool` are also instances of `int`
             (Type::NominalInstance(self_instance), Type::NominalInstance(target_instance)) => {
-                visitor.visit((self, target), || {
-                    self_instance.has_relation_to_impl(db, target_instance, relation, visitor)
+                relation_visitor.visit((self, target, relation), || {
+                    self_instance.has_relation_to_impl(
+                        db,
+                        target_instance,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
                 })
             }
 
-            (Type::PropertyInstance(_), _) => KnownClass::Property
-                .to_instance(db)
-                .has_relation_to_impl(db, target, relation, visitor),
+            (Type::PropertyInstance(_), _) => {
+                KnownClass::Property.to_instance(db).has_relation_to_impl(
+                    db,
+                    target,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }
             (_, Type::PropertyInstance(_)) => self.has_relation_to_impl(
                 db,
                 KnownClass::Property.to_instance(db),
+                inferable,
                 relation,
-                visitor,
+                relation_visitor,
+                disjointness_visitor,
             ),
 
             // Other than the special cases enumerated above, `Instance` types and typevars are
             // never subtypes of any other variants
-            (Type::NominalInstance(_) | Type::NonInferableTypeVar(_), _) => false,
+            (Type::TypeVar(bound_typevar), _) => {
+                // All inferable cases should have been handled above
+                assert!(!bound_typevar.is_inferable(db, inferable));
+                ConstraintSet::from(false)
+            }
+            (Type::NominalInstance(_), _) => ConstraintSet::from(false),
         }
     }
 
@@ -1782,210 +2404,342 @@ impl<'db> Type<'db> {
     ///
     /// [equivalent to]: https://typing.python.org/en/latest/spec/glossary.html#term-equivalent
     pub(crate) fn is_equivalent_to(self, db: &'db dyn Db, other: Type<'db>) -> bool {
-        self.is_equivalent_to_impl(db, other, &PairVisitor::new(true))
+        self.when_equivalent_to(db, other, InferableTypeVars::None)
+            .is_always_satisfied()
+    }
+
+    fn when_equivalent_to(
+        self,
+        db: &'db dyn Db,
+        other: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.is_equivalent_to_impl(db, other, inferable, &IsEquivalentVisitor::default())
     }
 
     pub(crate) fn is_equivalent_to_impl(
         self,
         db: &'db dyn Db,
         other: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
         visitor: &IsEquivalentVisitor<'db>,
-    ) -> bool {
+    ) -> ConstraintSet<'db> {
         if self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
 
         match (self, other) {
-            (Type::Dynamic(_), Type::Dynamic(_)) => true,
+            // The `Divergent` type is a special type that is not equivalent to other kinds of dynamic types,
+            // which prevents `Divergent` from being eliminated during union reduction.
+            (Type::Dynamic(_), Type::Dynamic(DynamicType::Divergent(_)))
+            | (Type::Dynamic(DynamicType::Divergent(_)), Type::Dynamic(_)) => {
+                ConstraintSet::from(false)
+            }
+            (Type::Dynamic(_), Type::Dynamic(_)) => ConstraintSet::from(true),
 
             (Type::SubclassOf(first), Type::SubclassOf(second)) => {
                 match (first.subclass_of(), second.subclass_of()) {
-                    (first, second) if first == second => true,
-                    (SubclassOfInner::Dynamic(_), SubclassOfInner::Dynamic(_)) => true,
-                    _ => false,
+                    (first, second) if first == second => ConstraintSet::from(true),
+                    (SubclassOfInner::Dynamic(_), SubclassOfInner::Dynamic(_)) => {
+                        ConstraintSet::from(true)
+                    }
+                    _ => ConstraintSet::from(false),
                 }
             }
 
             (Type::TypeAlias(self_alias), _) => {
-                let self_alias_ty = self_alias.value_type(db);
+                let self_alias_ty = self_alias.value_type(db).normalized(db);
                 visitor.visit((self_alias_ty, other), || {
-                    self_alias_ty.is_equivalent_to_impl(db, other, visitor)
+                    self_alias_ty.is_equivalent_to_impl(db, other, inferable, visitor)
                 })
             }
 
             (_, Type::TypeAlias(other_alias)) => {
-                let other_alias_ty = other_alias.value_type(db);
+                let other_alias_ty = other_alias.value_type(db).normalized(db);
                 visitor.visit((self, other_alias_ty), || {
-                    self.is_equivalent_to_impl(db, other_alias_ty, visitor)
+                    self.is_equivalent_to_impl(db, other_alias_ty, inferable, visitor)
                 })
             }
 
             (Type::NominalInstance(first), Type::NominalInstance(second)) => {
-                first.is_equivalent_to(db, second)
+                first.is_equivalent_to_impl(db, second, inferable, visitor)
             }
 
-            (Type::Union(first), Type::Union(second)) => first.is_equivalent_to(db, second),
+            (Type::Union(first), Type::Union(second)) => {
+                first.is_equivalent_to_impl(db, second, inferable, visitor)
+            }
 
             (Type::Intersection(first), Type::Intersection(second)) => {
-                first.is_equivalent_to(db, second)
+                first.is_equivalent_to_impl(db, second, inferable, visitor)
             }
 
             (Type::FunctionLiteral(self_function), Type::FunctionLiteral(target_function)) => {
-                self_function.is_equivalent_to(db, target_function)
+                self_function.is_equivalent_to_impl(db, target_function, inferable, visitor)
             }
             (Type::BoundMethod(self_method), Type::BoundMethod(target_method)) => {
-                self_method.is_equivalent_to(db, target_method)
+                self_method.is_equivalent_to_impl(db, target_method, inferable, visitor)
             }
-            (Type::MethodWrapper(self_method), Type::MethodWrapper(target_method)) => {
-                self_method.is_equivalent_to(db, target_method)
+            (Type::KnownBoundMethod(self_method), Type::KnownBoundMethod(target_method)) => {
+                self_method.is_equivalent_to_impl(db, target_method, inferable, visitor)
+            }
+            (Type::Callable(first), Type::Callable(second)) => {
+                first.is_equivalent_to_impl(db, second, inferable, visitor)
             }
-            (Type::Callable(first), Type::Callable(second)) => first.is_equivalent_to(db, second),
 
             (Type::ProtocolInstance(first), Type::ProtocolInstance(second)) => {
-                first.is_equivalent_to(db, second)
+                first.is_equivalent_to_impl(db, second, inferable, visitor)
             }
             (Type::ProtocolInstance(protocol), nominal @ Type::NominalInstance(n))
             | (nominal @ Type::NominalInstance(n), Type::ProtocolInstance(protocol)) => {
-                n.is_object(db) && protocol.normalized(db) == nominal
+                ConstraintSet::from(n.is_object() && protocol.normalized(db) == nominal)
             }
             // An instance of an enum class is equivalent to an enum literal of that class,
             // if that enum has only has one member.
             (Type::NominalInstance(instance), Type::EnumLiteral(literal))
             | (Type::EnumLiteral(literal), Type::NominalInstance(instance)) => {
                 if literal.enum_class_instance(db) != Type::NominalInstance(instance) {
-                    return false;
+                    return ConstraintSet::from(false);
                 }
-
-                let class_literal = instance.class(db).class_literal(db).0;
-                is_single_member_enum(db, class_literal)
+                ConstraintSet::from(is_single_member_enum(db, instance.class_literal(db)))
             }
-            _ => false,
+
+            (Type::PropertyInstance(left), Type::PropertyInstance(right)) => {
+                left.is_equivalent_to_impl(db, right, inferable, visitor)
+            }
+
+            _ => ConstraintSet::from(false),
         }
     }
 
-    /// Return true if this type and `other` have no common elements.
+    /// Return true if `self & other` should simplify to `Never`:
+    /// if the intersection of the two types could never be inhabited by any
+    /// possible runtime value.
     ///
-    /// Note: This function aims to have no false positives, but might return
-    /// wrong `false` answers in some cases.
+    /// Our implementation of disjointness for non-fully-static types only
+    /// returns true if the *top materialization* of `self` has no overlap with
+    /// the *top materialization* of `other`.
+    ///
+    /// For example, `list[int]` is disjoint from `list[str]`: the two types have
+    /// no overlap. But `list[Any]` is not disjoint from `list[str]`: there exists
+    /// a fully static materialization of `list[Any]` (`list[str]`) that is a
+    /// subtype of `list[str]`
+    ///
+    /// This function aims to have no false positives, but might return wrong
+    /// `false` answers in some cases.
     pub(crate) fn is_disjoint_from(self, db: &'db dyn Db, other: Type<'db>) -> bool {
-        self.is_disjoint_from_impl(db, other, &PairVisitor::new(false))
+        self.when_disjoint_from(db, other, InferableTypeVars::None)
+            .is_always_satisfied()
+    }
+
+    fn when_disjoint_from(
+        self,
+        db: &'db dyn Db,
+        other: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.is_disjoint_from_impl(
+            db,
+            other,
+            inferable,
+            &IsDisjointVisitor::default(),
+            &HasRelationToVisitor::default(),
+        )
     }
 
     pub(crate) fn is_disjoint_from_impl(
         self,
         db: &'db dyn Db,
         other: Type<'db>,
-        visitor: &IsDisjointVisitor<'db>,
-    ) -> bool {
+        inferable: InferableTypeVars<'_, 'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+        relation_visitor: &HasRelationToVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         fn any_protocol_members_absent_or_disjoint<'db>(
             db: &'db dyn Db,
             protocol: ProtocolInstanceType<'db>,
             other: Type<'db>,
-            visitor: &IsDisjointVisitor<'db>,
-        ) -> bool {
-            protocol.interface(db).members(db).any(|member| {
+            inferable: InferableTypeVars<'_, 'db>,
+            disjointness_visitor: &IsDisjointVisitor<'db>,
+            relation_visitor: &HasRelationToVisitor<'db>,
+        ) -> ConstraintSet<'db> {
+            protocol.interface(db).members(db).when_any(db, |member| {
                 other
                     .member(db, member.name())
                     .place
-                    .ignore_possibly_unbound()
-                    .is_none_or(|attribute_type| {
-                        member.has_disjoint_type_from(db, attribute_type, visitor)
+                    .ignore_possibly_undefined()
+                    .when_none_or(|attribute_type| {
+                        member.has_disjoint_type_from(
+                            db,
+                            attribute_type,
+                            inferable,
+                            disjointness_visitor,
+                            relation_visitor,
+                        )
                     })
             })
         }
 
         match (self, other) {
-            (Type::Never, _) | (_, Type::Never) => true,
+            (Type::Never, _) | (_, Type::Never) => ConstraintSet::from(true),
 
-            (Type::Dynamic(_), _) | (_, Type::Dynamic(_)) => false,
-
-            (Type::TypedDict(_), _) | (_, Type::TypedDict(_)) => {
-                // TODO: Implement disjointness for TypedDict
-                false
-            }
+            (Type::Dynamic(_), _) | (_, Type::Dynamic(_)) => ConstraintSet::from(false),
 
             (Type::TypeAlias(alias), _) => {
                 let self_alias_ty = alias.value_type(db);
-                visitor.visit((self_alias_ty, other), || {
-                    self_alias_ty.is_disjoint_from_impl(db, other, visitor)
+                disjointness_visitor.visit((self, other), || {
+                    self_alias_ty.is_disjoint_from_impl(
+                        db,
+                        other,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
                 })
             }
 
             (_, Type::TypeAlias(alias)) => {
                 let other_alias_ty = alias.value_type(db);
-                visitor.visit((self, other_alias_ty), || {
-                    self.is_disjoint_from_impl(db, other_alias_ty, visitor)
+                disjointness_visitor.visit((self, other), || {
+                    self.is_disjoint_from_impl(
+                        db,
+                        other_alias_ty,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
                 })
             }
 
+            (Type::TypedDict(_), _) | (_, Type::TypedDict(_)) => {
+                // TODO: Implement disjointness for TypedDict
+                ConstraintSet::from(false)
+            }
+
             // A typevar is never disjoint from itself, since all occurrences of the typevar must
             // be specialized to the same type. (This is an important difference between typevars
             // and `Any`!) Different typevars might be disjoint, depending on their bounds and
             // constraints, which are handled below.
-            (Type::NonInferableTypeVar(self_bound_typevar), Type::NonInferableTypeVar(other_bound_typevar))
-                if self_bound_typevar == other_bound_typevar =>
+            (Type::TypeVar(self_bound_typevar), Type::TypeVar(other_bound_typevar))
+                if !self_bound_typevar.is_inferable(db, inferable)
+                    && self_bound_typevar.identity(db) == other_bound_typevar.identity(db) =>
             {
-                false
+                ConstraintSet::from(false)
             }
 
-            (tvar @ Type::NonInferableTypeVar(_), Type::Intersection(intersection))
-            | (Type::Intersection(intersection), tvar @ Type::NonInferableTypeVar(_))
-                if intersection.negative(db).contains(&tvar) =>
+            (tvar @ Type::TypeVar(bound_typevar), Type::Intersection(intersection))
+            | (Type::Intersection(intersection), tvar @ Type::TypeVar(bound_typevar))
+                if !bound_typevar.is_inferable(db, inferable)
+                    && intersection.negative(db).contains(&tvar) =>
             {
-                true
+                ConstraintSet::from(true)
             }
 
             // An unbounded typevar is never disjoint from any other type, since it might be
             // specialized to any type. A bounded typevar is not disjoint from its bound, and is
             // only disjoint from other types if its bound is. A constrained typevar is disjoint
             // from a type if all of its constraints are.
-            (Type::NonInferableTypeVar(bound_typevar), other) | (other, Type::NonInferableTypeVar(bound_typevar)) => {
+            (Type::TypeVar(bound_typevar), other) | (other, Type::TypeVar(bound_typevar))
+                if !bound_typevar.is_inferable(db, inferable) =>
+            {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
-                    None => false,
-                    Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
-                        bound.is_disjoint_from_impl(db, other, visitor)
+                    None => ConstraintSet::from(false),
+                    Some(TypeVarBoundOrConstraints::UpperBound(bound)) => bound
+                        .is_disjoint_from_impl(
+                            db,
+                            other,
+                            inferable,
+                            disjointness_visitor,
+                            relation_visitor,
+                        ),
+                    Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
+                        constraints.elements(db).iter().when_all(db, |constraint| {
+                            constraint.is_disjoint_from_impl(
+                                db,
+                                other,
+                                inferable,
+                                disjointness_visitor,
+                                relation_visitor,
+                            )
+                        })
                     }
-                    Some(TypeVarBoundOrConstraints::Constraints(constraints)) => constraints
-                        .elements(db)
-                        .iter()
-                        .all(|constraint| constraint.is_disjoint_from_impl(db, other, visitor)),
                 }
             }
 
             // TODO: Infer specializations here
-            (Type::TypeVar(_), _)
-            | (_, Type::TypeVar(_)) => false,
+            (Type::TypeVar(_), _) | (_, Type::TypeVar(_)) => ConstraintSet::from(false),
 
-            (Type::Union(union), other) | (other, Type::Union(union)) => union
-                .elements(db)
-                .iter()
-                .all(|e| e.is_disjoint_from_impl(db, other, visitor)),
+            (Type::Union(union), other) | (other, Type::Union(union)) => {
+                union.elements(db).iter().when_all(db, |e| {
+                    e.is_disjoint_from_impl(
+                        db,
+                        other,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
+                })
+            }
 
             // If we have two intersections, we test the positive elements of each one against the other intersection
             // Negative elements need a positive element on the other side in order to be disjoint.
             // This is similar to what would happen if we tried to build a new intersection that combines the two
             (Type::Intersection(self_intersection), Type::Intersection(other_intersection)) => {
-                self_intersection
-                    .positive(db)
-                    .iter()
-                    .any(|p| p.is_disjoint_from_impl(db, other, visitor))
-                    || other_intersection
+                disjointness_visitor.visit((self, other), || {
+                    self_intersection
                         .positive(db)
                         .iter()
-                        .any(|p: &Type<'_>| p.is_disjoint_from_impl(db, self, visitor))
+                        .when_any(db, |p| {
+                            p.is_disjoint_from_impl(
+                                db,
+                                other,
+                                inferable,
+                                disjointness_visitor,
+                                relation_visitor,
+                            )
+                        })
+                        .or(db, || {
+                            other_intersection.positive(db).iter().when_any(db, |p| {
+                                p.is_disjoint_from_impl(
+                                    db,
+                                    self,
+                                    inferable,
+                                    disjointness_visitor,
+                                    relation_visitor,
+                                )
+                            })
+                        })
+                })
             }
 
-            (Type::Intersection(intersection), other)
-            | (other, Type::Intersection(intersection)) => {
-                intersection
-                    .positive(db)
-                    .iter()
-                    .any(|p| p.is_disjoint_from_impl(db, other, visitor))
-                    // A & B & Not[C] is disjoint from C
-                    || intersection
-                        .negative(db)
+            (Type::Intersection(intersection), non_intersection)
+            | (non_intersection, Type::Intersection(intersection)) => {
+                disjointness_visitor.visit((self, other), || {
+                    intersection
+                        .positive(db)
                         .iter()
-                        .any(|&neg_ty| other.is_subtype_of(db, neg_ty))
+                        .when_any(db, |p| {
+                            p.is_disjoint_from_impl(
+                                db,
+                                non_intersection,
+                                inferable,
+                                disjointness_visitor,
+                                relation_visitor,
+                            )
+                        })
+                        // A & B & Not[C] is disjoint from C
+                        .or(db, || {
+                            intersection.negative(db).iter().when_any(db, |&neg_ty| {
+                                non_intersection.has_relation_to_impl(
+                                    db,
+                                    neg_ty,
+                                    inferable,
+                                    TypeRelation::Subtyping,
+                                    relation_visitor,
+                                    disjointness_visitor,
+                                )
+                            })
+                        })
+                })
             }
 
             // any single-valued type is disjoint from another single-valued type
@@ -1998,7 +2752,7 @@ impl<'db> Type<'db> {
                 | Type::EnumLiteral(..)
                 | Type::FunctionLiteral(..)
                 | Type::BoundMethod(..)
-                | Type::MethodWrapper(..)
+                | Type::KnownBoundMethod(..)
                 | Type::WrapperDescriptor(..)
                 | Type::ModuleLiteral(..)
                 | Type::ClassLiteral(..)
@@ -2012,14 +2766,14 @@ impl<'db> Type<'db> {
                 | Type::EnumLiteral(..)
                 | Type::FunctionLiteral(..)
                 | Type::BoundMethod(..)
-                | Type::MethodWrapper(..)
+                | Type::KnownBoundMethod(..)
                 | Type::WrapperDescriptor(..)
                 | Type::ModuleLiteral(..)
                 | Type::ClassLiteral(..)
                 | Type::GenericAlias(..)
                 | Type::SpecialForm(..)
                 | Type::KnownInstance(..)),
-            ) => left != right,
+            ) => ConstraintSet::from(left != right),
 
             (
                 Type::SubclassOf(_),
@@ -2031,7 +2785,7 @@ impl<'db> Type<'db> {
                 | Type::EnumLiteral(..)
                 | Type::FunctionLiteral(..)
                 | Type::BoundMethod(..)
-                | Type::MethodWrapper(..)
+                | Type::KnownBoundMethod(..)
                 | Type::WrapperDescriptor(..)
                 | Type::ModuleLiteral(..),
             )
@@ -2044,36 +2798,54 @@ impl<'db> Type<'db> {
                 | Type::EnumLiteral(..)
                 | Type::FunctionLiteral(..)
                 | Type::BoundMethod(..)
-                | Type::MethodWrapper(..)
+                | Type::KnownBoundMethod(..)
                 | Type::WrapperDescriptor(..)
                 | Type::ModuleLiteral(..),
                 Type::SubclassOf(_),
-            ) => true,
+            ) => ConstraintSet::from(true),
 
             (Type::AlwaysTruthy, ty) | (ty, Type::AlwaysTruthy) => {
                 // `Truthiness::Ambiguous` may include `AlwaysTrue` as a subset, so it's not guaranteed to be disjoint.
                 // Thus, they are only disjoint if `ty.bool() == AlwaysFalse`.
-                ty.bool(db).is_always_false()
+                ConstraintSet::from(ty.bool(db).is_always_false())
             }
             (Type::AlwaysFalsy, ty) | (ty, Type::AlwaysFalsy) => {
                 // Similarly, they are only disjoint if `ty.bool() == AlwaysTrue`.
-                ty.bool(db).is_always_true()
+                ConstraintSet::from(ty.bool(db).is_always_true())
             }
 
-            (Type::ProtocolInstance(left), Type::ProtocolInstance(right)) => {
-                left.is_disjoint_from_impl(db, right, visitor)
-            }
-
-            (Type::ProtocolInstance(protocol), Type::SpecialForm(special_form))
-            | (Type::SpecialForm(special_form), Type::ProtocolInstance(protocol)) => visitor.visit((self, other), || {
-                any_protocol_members_absent_or_disjoint(db, protocol, special_form.instance_fallback(db), visitor)
+            (Type::ProtocolInstance(left), Type::ProtocolInstance(right)) => disjointness_visitor
+                .visit((self, other), || {
+                    left.is_disjoint_from_impl(db, right, inferable, disjointness_visitor)
                 }),
 
+            (Type::ProtocolInstance(protocol), Type::SpecialForm(special_form))
+            | (Type::SpecialForm(special_form), Type::ProtocolInstance(protocol)) => {
+                disjointness_visitor.visit((self, other), || {
+                    any_protocol_members_absent_or_disjoint(
+                        db,
+                        protocol,
+                        special_form.instance_fallback(db),
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
+                })
+            }
 
             (Type::ProtocolInstance(protocol), Type::KnownInstance(known_instance))
-            | (Type::KnownInstance(known_instance), Type::ProtocolInstance(protocol)) => visitor.visit((self, other), || {
-                any_protocol_members_absent_or_disjoint(db, protocol, known_instance.instance_fallback(db), visitor)
-            }),
+            | (Type::KnownInstance(known_instance), Type::ProtocolInstance(protocol)) => {
+                disjointness_visitor.visit((self, other), || {
+                    any_protocol_members_absent_or_disjoint(
+                        db,
+                        protocol,
+                        known_instance.instance_fallback(db),
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
+                })
+            }
 
             // The absence of a protocol member on one of these types guarantees
             // that the type will be disjoint from the protocol,
@@ -2112,8 +2884,7 @@ impl<'db> Type<'db> {
                 | Type::ModuleLiteral(..)
                 | Type::GenericAlias(..)
                 | Type::IntLiteral(..)
-                | Type::EnumLiteral(..)
-            ),
+                | Type::EnumLiteral(..)),
                 Type::ProtocolInstance(protocol),
             )
             | (
@@ -2128,150 +2899,237 @@ impl<'db> Type<'db> {
                 | Type::GenericAlias(..)
                 | Type::IntLiteral(..)
                 | Type::EnumLiteral(..)),
-            )  => visitor.visit((self, other), || any_protocol_members_absent_or_disjoint(db, protocol, ty, visitor)),
+            ) => disjointness_visitor.visit((self, other), || {
+                any_protocol_members_absent_or_disjoint(
+                    db,
+                    protocol,
+                    ty,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
+            }),
 
             // This is the same as the branch above --
             // once guard patterns are stabilised, it could be unified with that branch
             // (<https://github.com/rust-lang/rust/issues/129967>)
             (Type::ProtocolInstance(protocol), nominal @ Type::NominalInstance(n))
             | (nominal @ Type::NominalInstance(n), Type::ProtocolInstance(protocol))
-                if n.class(db).is_final(db) => visitor.visit((self, other), ||
+                if n.class(db).is_final(db) =>
             {
-                any_protocol_members_absent_or_disjoint(db, protocol, nominal, visitor)
-            }),
-
-            (Type::ProtocolInstance(protocol), other)
-            | (other, Type::ProtocolInstance(protocol)) => visitor.visit((self, other), || {
-                protocol.interface(db).members(db).any(|member| {
-                    matches!(
-                        other.member(db, member.name()).place,
-                        Place::Type(attribute_type, _) if member.has_disjoint_type_from(db, attribute_type, visitor)
+                disjointness_visitor.visit((self, other), || {
+                    any_protocol_members_absent_or_disjoint(
+                        db,
+                        protocol,
+                        nominal,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
                     )
                 })
-            }),
+            }
+
+            (Type::ProtocolInstance(protocol), other)
+            | (other, Type::ProtocolInstance(protocol)) => {
+                disjointness_visitor.visit((self, other), || {
+                    protocol.interface(db).members(db).when_any(db, |member| {
+                        match other.member(db, member.name()).place {
+                            Place::Defined(attribute_type, _, _) => member.has_disjoint_type_from(
+                                db,
+                                attribute_type,
+                                inferable,
+                                disjointness_visitor,
+                                relation_visitor,
+                            ),
+                            Place::Undefined => ConstraintSet::from(false),
+                        }
+                    })
+                })
+            }
 
             (Type::SubclassOf(subclass_of_ty), Type::ClassLiteral(class_b))
             | (Type::ClassLiteral(class_b), Type::SubclassOf(subclass_of_ty)) => {
                 match subclass_of_ty.subclass_of() {
-                    SubclassOfInner::Dynamic(_) => false,
-                    SubclassOfInner::Class(class_a) => !class_b.is_subclass_of(db, None, class_a),
+                    SubclassOfInner::Dynamic(_) => ConstraintSet::from(false),
+                    SubclassOfInner::Class(class_a) => {
+                        class_b.when_subclass_of(db, None, class_a).negate(db)
+                    }
                 }
             }
 
             (Type::SubclassOf(subclass_of_ty), Type::GenericAlias(alias_b))
             | (Type::GenericAlias(alias_b), Type::SubclassOf(subclass_of_ty)) => {
                 match subclass_of_ty.subclass_of() {
-                    SubclassOfInner::Dynamic(_) => false,
-                    SubclassOfInner::Class(class_a) => {
-                        !ClassType::from(alias_b).is_subclass_of(db, class_a)
-                    }
+                    SubclassOfInner::Dynamic(_) => ConstraintSet::from(false),
+                    SubclassOfInner::Class(class_a) => ClassType::from(alias_b)
+                        .when_subclass_of(db, class_a, inferable)
+                        .negate(db),
                 }
             }
 
-            (Type::SubclassOf(left), Type::SubclassOf(right)) => left.is_disjoint_from_impl(db, right),
+            (Type::SubclassOf(left), Type::SubclassOf(right)) => {
+                left.is_disjoint_from_impl(db, right, inferable, disjointness_visitor)
+            }
 
             // for `type[Any]`/`type[Unknown]`/`type[Todo]`, we know the type cannot be any larger than `type`,
             // so although the type is dynamic we can still determine disjointedness in some situations
             (Type::SubclassOf(subclass_of_ty), other)
             | (other, Type::SubclassOf(subclass_of_ty)) => match subclass_of_ty.subclass_of() {
                 SubclassOfInner::Dynamic(_) => {
-                    KnownClass::Type.to_instance(db).is_disjoint_from_impl(db, other, visitor)
+                    KnownClass::Type.to_instance(db).is_disjoint_from_impl(
+                        db,
+                        other,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
+                }
+                SubclassOfInner::Class(class) => {
+                    class.metaclass_instance_type(db).is_disjoint_from_impl(
+                        db,
+                        other,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
                 }
-                SubclassOfInner::Class(class) => class
-                    .metaclass_instance_type(db)
-                    .is_disjoint_from_impl(db, other, visitor),
             },
 
             (Type::SpecialForm(special_form), Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::SpecialForm(special_form)) => {
-                !special_form.is_instance_of(db, instance.class(db))
+                ConstraintSet::from(!special_form.is_instance_of(db, instance.class(db)))
             }
 
             (Type::KnownInstance(known_instance), Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::KnownInstance(known_instance)) => {
-                !known_instance.is_instance_of(db, instance.class(db))
+                ConstraintSet::from(!known_instance.is_instance_of(db, instance.class(db)))
             }
 
             (Type::BooleanLiteral(..) | Type::TypeIs(_), Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::BooleanLiteral(..) | Type::TypeIs(_)) => {
                 // A `Type::BooleanLiteral()` must be an instance of exactly `bool`
                 // (it cannot be an instance of a `bool` subclass)
-                !KnownClass::Bool.is_subclass_of(db, instance.class(db))
+                KnownClass::Bool
+                    .when_subclass_of(db, instance.class(db))
+                    .negate(db)
             }
 
             (Type::BooleanLiteral(..) | Type::TypeIs(_), _)
-            | (_, Type::BooleanLiteral(..) | Type::TypeIs(_)) => true,
+            | (_, Type::BooleanLiteral(..) | Type::TypeIs(_)) => ConstraintSet::from(true),
 
             (Type::IntLiteral(..), Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::IntLiteral(..)) => {
                 // A `Type::IntLiteral()` must be an instance of exactly `int`
                 // (it cannot be an instance of an `int` subclass)
-                !KnownClass::Int.is_subclass_of(db, instance.class(db))
+                KnownClass::Int
+                    .when_subclass_of(db, instance.class(db))
+                    .negate(db)
             }
 
-            (Type::IntLiteral(..), _) | (_, Type::IntLiteral(..)) => true,
+            (Type::IntLiteral(..), _) | (_, Type::IntLiteral(..)) => ConstraintSet::from(true),
 
             (Type::StringLiteral(..), Type::LiteralString)
-            | (Type::LiteralString, Type::StringLiteral(..)) => false,
+            | (Type::LiteralString, Type::StringLiteral(..)) => ConstraintSet::from(false),
 
             (Type::StringLiteral(..) | Type::LiteralString, Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::StringLiteral(..) | Type::LiteralString) => {
                 // A `Type::StringLiteral()` or a `Type::LiteralString` must be an instance of exactly `str`
                 // (it cannot be an instance of a `str` subclass)
-                !KnownClass::Str.is_subclass_of(db, instance.class(db))
+                KnownClass::Str
+                    .when_subclass_of(db, instance.class(db))
+                    .negate(db)
             }
 
-            (Type::LiteralString, Type::LiteralString) => false,
-            (Type::LiteralString, _) | (_, Type::LiteralString) => true,
+            (Type::LiteralString, Type::LiteralString) => ConstraintSet::from(false),
+            (Type::LiteralString, _) | (_, Type::LiteralString) => ConstraintSet::from(true),
 
             (Type::BytesLiteral(..), Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::BytesLiteral(..)) => {
                 // A `Type::BytesLiteral()` must be an instance of exactly `bytes`
                 // (it cannot be an instance of a `bytes` subclass)
-                !KnownClass::Bytes.is_subclass_of(db, instance.class(db))
+                KnownClass::Bytes
+                    .when_subclass_of(db, instance.class(db))
+                    .negate(db)
             }
 
-            (Type::EnumLiteral(enum_literal), instance@Type::NominalInstance(_))
-            | (instance@Type::NominalInstance(_), Type::EnumLiteral(enum_literal)) => {
-                !enum_literal.enum_class_instance(db).is_subtype_of(db, instance)
+            (Type::EnumLiteral(enum_literal), instance @ Type::NominalInstance(_))
+            | (instance @ Type::NominalInstance(_), Type::EnumLiteral(enum_literal)) => {
+                enum_literal
+                    .enum_class_instance(db)
+                    .has_relation_to_impl(
+                        db,
+                        instance,
+                        inferable,
+                        TypeRelation::Subtyping,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                    .negate(db)
             }
-            (Type::EnumLiteral(..), _) | (_, Type::EnumLiteral(..)) => true,
+            (Type::EnumLiteral(..), _) | (_, Type::EnumLiteral(..)) => ConstraintSet::from(true),
 
             // A class-literal type `X` is always disjoint from an instance type `Y`,
             // unless the type expressing "all instances of `Z`" is a subtype of of `Y`,
             // where `Z` is `X`'s metaclass.
             (Type::ClassLiteral(class), instance @ Type::NominalInstance(_))
-            | (instance @ Type::NominalInstance(_), Type::ClassLiteral(class)) => !class
+            | (instance @ Type::NominalInstance(_), Type::ClassLiteral(class)) => class
                 .metaclass_instance_type(db)
-                .is_subtype_of(db, instance),
+                .when_subtype_of(db, instance, inferable)
+                .negate(db),
             (Type::GenericAlias(alias), instance @ Type::NominalInstance(_))
             | (instance @ Type::NominalInstance(_), Type::GenericAlias(alias)) => {
-                !ClassType::from(alias)
+                ClassType::from(alias)
                     .metaclass_instance_type(db)
-                    .is_subtype_of(db, instance)
+                    .has_relation_to_impl(
+                        db,
+                        instance,
+                        inferable,
+                        TypeRelation::Subtyping,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                    .negate(db)
             }
 
             (Type::FunctionLiteral(..), Type::NominalInstance(instance))
             | (Type::NominalInstance(instance), Type::FunctionLiteral(..)) => {
                 // A `Type::FunctionLiteral()` must be an instance of exactly `types.FunctionType`
                 // (it cannot be an instance of a `types.FunctionType` subclass)
-                !KnownClass::FunctionType.is_subclass_of(db, instance.class(db))
+                KnownClass::FunctionType
+                    .when_subclass_of(db, instance.class(db))
+                    .negate(db)
             }
 
             (Type::BoundMethod(_), other) | (other, Type::BoundMethod(_)) => KnownClass::MethodType
                 .to_instance(db)
-                .is_disjoint_from_impl(db, other, visitor),
+                .is_disjoint_from_impl(
+                    db,
+                    other,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                ),
 
-            (Type::MethodWrapper(_), other) | (other, Type::MethodWrapper(_)) => {
-                KnownClass::MethodWrapperType
-                    .to_instance(db)
-                    .is_disjoint_from_impl(db, other, visitor)
+            (Type::KnownBoundMethod(method), other) | (other, Type::KnownBoundMethod(method)) => {
+                method.class().to_instance(db).is_disjoint_from_impl(
+                    db,
+                    other,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
             }
 
             (Type::WrapperDescriptor(_), other) | (other, Type::WrapperDescriptor(_)) => {
                 KnownClass::WrapperDescriptorType
                     .to_instance(db)
-                    .is_disjoint_from_impl(db, other, visitor)
+                    .is_disjoint_from_impl(
+                        db,
+                        other,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
             }
 
             (Type::Callable(_) | Type::FunctionLiteral(_), Type::Callable(_))
@@ -2279,7 +3137,7 @@ impl<'db> Type<'db> {
                 // No two callable types are ever disjoint because
                 // `(*args: object, **kwargs: object) -> Never` is a subtype of all fully static
                 // callable types.
-                false
+                ConstraintSet::from(false)
             }
 
             (Type::Callable(_), Type::StringLiteral(_) | Type::BytesLiteral(_))
@@ -2287,7 +3145,7 @@ impl<'db> Type<'db> {
                 // A callable type is disjoint from other literal types. For example,
                 // `Type::StringLiteral` must be an instance of exactly `str`, not a subclass
                 // of `str`, and `str` is not callable. The same applies to other literal types.
-                true
+                ConstraintSet::from(true)
             }
 
             (Type::Callable(_), Type::SpecialForm(special_form))
@@ -2296,7 +3154,7 @@ impl<'db> Type<'db> {
                 // that are callable (like TypedDict and collection constructors).
                 // Most special forms are type constructors/annotations (like `typing.Literal`,
                 // `typing.Union`, etc.) that are subscripted, not called.
-                !special_form.is_callable()
+                ConstraintSet::from(!special_form.is_callable())
             }
 
             (
@@ -2313,9 +3171,18 @@ impl<'db> Type<'db> {
                     MemberLookupPolicy::NO_INSTANCE_FALLBACK,
                 )
                 .place
-                .ignore_possibly_unbound()
-                .is_none_or(|dunder_call| {
-                    !dunder_call.is_assignable_to(db, CallableType::unknown(db))
+                .ignore_possibly_undefined()
+                .when_none_or(|dunder_call| {
+                    dunder_call
+                        .has_relation_to_impl(
+                            db,
+                            CallableType::unknown(db),
+                            inferable,
+                            TypeRelation::Assignability,
+                            relation_visitor,
+                            disjointness_visitor,
+                        )
+                        .negate(db)
                 }),
 
             (
@@ -2327,29 +3194,54 @@ impl<'db> Type<'db> {
                 Type::Callable(_) | Type::DataclassDecorator(_) | Type::DataclassTransformer(_),
             ) => {
                 // TODO: Implement disjointness for general callable type with other types
-                false
+                ConstraintSet::from(false)
             }
 
             (Type::ModuleLiteral(..), other @ Type::NominalInstance(..))
             | (other @ Type::NominalInstance(..), Type::ModuleLiteral(..)) => {
                 // Modules *can* actually be instances of `ModuleType` subclasses
-                other.is_disjoint_from_impl(db, KnownClass::ModuleType.to_instance(db), visitor)
+                other.is_disjoint_from_impl(
+                    db,
+                    KnownClass::ModuleType.to_instance(db),
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
             }
 
-            (Type::NominalInstance(left), Type::NominalInstance(right)) => {
-                left.is_disjoint_from_impl(db, right, visitor)
-            }
+            (Type::NominalInstance(left), Type::NominalInstance(right)) => disjointness_visitor
+                .visit((self, other), || {
+                    left.is_disjoint_from_impl(
+                        db,
+                        right,
+                        inferable,
+                        disjointness_visitor,
+                        relation_visitor,
+                    )
+                }),
 
             (Type::PropertyInstance(_), other) | (other, Type::PropertyInstance(_)) => {
-                KnownClass::Property
-                    .to_instance(db)
-                    .is_disjoint_from_impl(db, other, visitor)
+                KnownClass::Property.to_instance(db).is_disjoint_from_impl(
+                    db,
+                    other,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
             }
 
-            (Type::BoundSuper(_), Type::BoundSuper(_)) => !self.is_equivalent_to(db, other),
-            (Type::BoundSuper(_), other) | (other, Type::BoundSuper(_)) => KnownClass::Super
-                .to_instance(db)
-                .is_disjoint_from_impl(db, other, visitor),
+            (Type::BoundSuper(_), Type::BoundSuper(_)) => {
+                self.when_equivalent_to(db, other, inferable).negate(db)
+            }
+            (Type::BoundSuper(_), other) | (other, Type::BoundSuper(_)) => {
+                KnownClass::Super.to_instance(db).is_disjoint_from_impl(
+                    db,
+                    other,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
+            }
         }
     }
 
@@ -2396,7 +3288,7 @@ impl<'db> Type<'db> {
             // the bound is a final singleton class, since it can still be specialized to `Never`.
             // A constrained typevar is a singleton if all of its constraints are singletons. (Note
             // that you cannot specialize a constrained typevar to a subtype of a constraint.)
-            Type::NonInferableTypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
                     None => false,
                     Some(TypeVarBoundOrConstraints::UpperBound(_)) => false,
@@ -2407,8 +3299,6 @@ impl<'db> Type<'db> {
                 }
             }
 
-            Type::TypeVar(_) => false,
-
             // We eagerly transform `SubclassOf` to `ClassLiteral` for final types, so `SubclassOf` is never a singleton.
             Type::SubclassOf(..) => false,
             Type::BoundSuper(..) => false,
@@ -2446,7 +3336,7 @@ impl<'db> Type<'db> {
                 // ```
                 false
             }
-            Type::MethodWrapper(_) => {
+            Type::KnownBoundMethod(_) => {
                 // Just a special case of `BoundMethod` really
                 // (this variant represents `f.__get__`, where `f` is any function)
                 false
@@ -2483,7 +3373,7 @@ impl<'db> Type<'db> {
             Type::FunctionLiteral(..)
             | Type::BoundMethod(_)
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::ModuleLiteral(..)
             | Type::ClassLiteral(..)
             | Type::GenericAlias(..)
@@ -2494,28 +3384,7 @@ impl<'db> Type<'db> {
             | Type::SpecialForm(..)
             | Type::KnownInstance(..) => true,
 
-            Type::EnumLiteral(_) => {
-                let check_dunder = |dunder_name, allowed_return_value| {
-                    // Note that we do explicitly exclude dunder methods on `object`, `int` and `str` here.
-                    // The reason for this is that we know that these dunder methods behave in a predictable way.
-                    // Only custom dunder methods need to be examined here, as they might break single-valuedness
-                    // by always returning `False`, for example.
-                    let call_result = self.try_call_dunder_with_policy(
-                        db,
-                        dunder_name,
-                        &mut CallArguments::positional([Type::unknown()]),
-                        MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK
-                            | MemberLookupPolicy::MRO_NO_INT_OR_STR_LOOKUP,
-                    );
-                    let call_result = call_result.as_ref();
-                    call_result.is_ok_and(|bindings| {
-                        bindings.return_type(db) == Type::BooleanLiteral(allowed_return_value)
-                    }) || call_result
-                        .is_err_and(|err| matches!(err, CallDunderError::MethodNotAvailable))
-                };
-
-                check_dunder("__eq__", true) && check_dunder("__ne__", false)
-            }
+            Type::EnumLiteral(_) => !self.overrides_equality(db),
 
             Type::ProtocolInstance(..) => {
                 // See comment in the `Type::ProtocolInstance` branch for `Type::is_singleton`.
@@ -2528,7 +3397,7 @@ impl<'db> Type<'db> {
             // `Never`. A constrained typevar is single-valued if all of its constraints are
             // single-valued. (Note that you cannot specialize a constrained typevar to a subtype
             // of a constraint.)
-            Type::NonInferableTypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
                     None => false,
                     Some(TypeVarBoundOrConstraints::UpperBound(_)) => false,
@@ -2539,8 +3408,6 @@ impl<'db> Type<'db> {
                 }
             }
 
-            Type::TypeVar(_) => false,
-
             Type::SubclassOf(..) => {
                 // TODO: Same comment as above for `is_singleton`
                 false
@@ -2622,7 +3489,7 @@ impl<'db> Type<'db> {
                     ),
                     (Some(KnownClass::FunctionType), "__set__" | "__delete__") => {
                         // Hard code this knowledge, as we look up `__set__` and `__delete__` on `FunctionType` often.
-                        Some(Place::Unbound.into())
+                        Some(Place::Undefined.into())
                     }
                     (Some(KnownClass::Property), "__get__") => Some(
                         Place::bound(Type::WrapperDescriptor(
@@ -2646,7 +3513,17 @@ impl<'db> Type<'db> {
             }
 
             Type::GenericAlias(alias) => {
-                Some(ClassType::from(*alias).class_member(db, name, policy))
+                let attr = Some(ClassType::from(*alias).class_member(db, name, policy));
+                match alias.specialization(db).materialization_kind(db) {
+                    None => attr,
+                    Some(materialization_kind) => attr.map(|attr| {
+                        attr.materialize(
+                            db,
+                            materialization_kind,
+                            &ApplyTypeMappingVisitor::default(),
+                        )
+                    }),
+                }
             }
 
             Type::SubclassOf(subclass_of_ty) => {
@@ -2663,11 +3540,9 @@ impl<'db> Type<'db> {
             // i.e. Type::NominalInstance(type). So looking up a name in the MRO of
             // `Type::NominalInstance(type)` is equivalent to looking up the name in the
             // MRO of the class `object`.
-            Type::NominalInstance(instance)
-                if instance.class(db).is_known(db, KnownClass::Type) =>
-            {
+            Type::NominalInstance(instance) if instance.has_known_class(db, KnownClass::Type) => {
                 if policy.mro_no_object_fallback() {
-                    Some(Place::Unbound.into())
+                    Some(Place::Undefined.into())
                 } else {
                     KnownClass::Object
                         .to_class_literal(db)
@@ -2683,7 +3558,7 @@ impl<'db> Type<'db> {
             | Type::Callable(_)
             | Type::BoundMethod(_)
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             | Type::ModuleLiteral(_)
@@ -2697,7 +3572,6 @@ impl<'db> Type<'db> {
             | Type::LiteralString
             | Type::BytesLiteral(_)
             | Type::EnumLiteral(_)
-            | Type::NonInferableTypeVar(_)
             | Type::TypeVar(_)
             | Type::NominalInstance(_)
             | Type::ProtocolInstance(_)
@@ -2728,7 +3602,7 @@ impl<'db> Type<'db> {
         self.class_member_with_policy(db, name, MemberLookupPolicy::default())
     }
 
-    #[salsa::tracked(cycle_fn=class_lookup_cycle_recover, cycle_initial=class_lookup_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(cycle_initial=class_lookup_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     fn class_member_with_policy(
         self,
         db: &'db dyn Db,
@@ -2795,9 +3669,9 @@ impl<'db> Type<'db> {
             Type::BoundMethod(_) => KnownClass::MethodType
                 .to_instance(db)
                 .instance_member(db, name),
-            Type::MethodWrapper(_) => KnownClass::MethodWrapperType
-                .to_instance(db)
-                .instance_member(db, name),
+            Type::KnownBoundMethod(method) => {
+                method.class().to_instance(db).instance_member(db, name)
+            }
             Type::WrapperDescriptor(_) => KnownClass::WrapperDescriptorType
                 .to_instance(db)
                 .instance_member(db, name),
@@ -2805,12 +3679,12 @@ impl<'db> Type<'db> {
                 .to_instance(db)
                 .instance_member(db, name),
             Type::Callable(_) | Type::DataclassTransformer(_) => {
-                Type::object(db).instance_member(db, name)
+                Type::object().instance_member(db, name)
             }
 
-            Type::NonInferableTypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
-                    None => Type::object(db).instance_member(db, name),
+                    None => Type::object().instance_member(db, name),
                     Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
                         bound.instance_member(db, name)
                     }
@@ -2821,16 +3695,6 @@ impl<'db> Type<'db> {
                 }
             }
 
-            Type::TypeVar(_) => {
-                debug_assert!(
-                    false,
-                    "should not be able to access instance member `{name}` \
-                    of type variable {} in inferable position",
-                    self.display(db)
-                );
-                Place::Unbound.into()
-            }
-
             Type::IntLiteral(_) => KnownClass::Int.to_instance(db).instance_member(db, name),
             Type::BooleanLiteral(_) | Type::TypeIs(_) => {
                 KnownClass::Bool.to_instance(db).instance_member(db, name)
@@ -2843,12 +3707,12 @@ impl<'db> Type<'db> {
                 .enum_class_instance(db)
                 .instance_member(db, name),
 
-            Type::AlwaysTruthy | Type::AlwaysFalsy => Type::object(db).instance_member(db, name),
+            Type::AlwaysTruthy | Type::AlwaysFalsy => Type::object().instance_member(db, name),
             Type::ModuleLiteral(_) => KnownClass::ModuleType
                 .to_instance(db)
                 .instance_member(db, name),
 
-            Type::SpecialForm(_) | Type::KnownInstance(_) => Place::Unbound.into(),
+            Type::SpecialForm(_) | Type::KnownInstance(_) => Place::Undefined.into(),
 
             Type::PropertyInstance(_) => KnownClass::Property
                 .to_instance(db)
@@ -2866,10 +3730,10 @@ impl<'db> Type<'db> {
             // required, as `instance_member` is only called for instance-like types through `member`,
             // but we might want to add this in the future.
             Type::ClassLiteral(_) | Type::GenericAlias(_) | Type::SubclassOf(_) => {
-                Place::Unbound.into()
+                Place::Undefined.into()
             }
 
-            Type::TypedDict(_) => Place::Unbound.into(),
+            Type::TypedDict(_) => Place::Undefined.into(),
 
             Type::TypeAlias(alias) => alias.value_type(db).instance_member(db, name),
         }
@@ -2882,9 +3746,9 @@ impl<'db> Type<'db> {
     fn static_member(&self, db: &'db dyn Db, name: &str) -> Place<'db> {
         if let Type::ModuleLiteral(module) = self {
             module.static_member(db, name).place
-        } else if let place @ Place::Type(_, _) = self.class_member(db, name.into()).place {
+        } else if let place @ Place::Defined(_, _, _) = self.class_member(db, name.into()).place {
             place
-        } else if let Some(place @ Place::Type(_, _)) =
+        } else if let Some(place @ Place::Defined(_, _, _)) =
             self.find_name_in_mro(db, name).map(|inner| inner.place)
         {
             place
@@ -2916,7 +3780,7 @@ impl<'db> Type<'db> {
         );
         match self {
             Type::Callable(callable) if callable.is_function_like(db) => {
-                // For "function-like" callables, model the the behavior of `FunctionType.__get__`.
+                // For "function-like" callables, model the behavior of `FunctionType.__get__`.
                 //
                 // It is a shortcut to model this in `try_call_dunder_get`. If we want to be really precise,
                 // we should instead return a new method-wrapper type variant for the synthesized `__get__`
@@ -2927,7 +3791,7 @@ impl<'db> Type<'db> {
                     Some((self, AttributeKind::NormalOrNonDataDescriptor))
                 } else {
                     Some((
-                        callable.bind_self(db),
+                        Type::Callable(callable.bind_self(db)),
                         AttributeKind::NormalOrNonDataDescriptor,
                     ))
                 };
@@ -2937,11 +3801,11 @@ impl<'db> Type<'db> {
 
         let descr_get = self.class_member(db, "__get__".into()).place;
 
-        if let Place::Type(descr_get, descr_get_boundness) = descr_get {
+        if let Place::Defined(descr_get, _, descr_get_boundness) = descr_get {
             let return_ty = descr_get
                 .try_call(db, &CallArguments::positional([self, instance, owner]))
                 .map(|bindings| {
-                    if descr_get_boundness == Boundness::Bound {
+                    if descr_get_boundness == Definedness::AlwaysDefined {
                         bindings.return_type(db)
                     } else {
                         UnionType::from_elements(db, [bindings.return_type(db), self])
@@ -2980,19 +3844,20 @@ impl<'db> Type<'db> {
             //
             // The same is true for `Never`.
             PlaceAndQualifiers {
-                place: Place::Type(Type::Dynamic(_) | Type::Never, _),
+                place: Place::Defined(Type::Dynamic(_) | Type::Never, _, _),
                 qualifiers: _,
             } => (attribute, AttributeKind::DataDescriptor),
 
             PlaceAndQualifiers {
-                place: Place::Type(Type::Union(union), boundness),
+                place: Place::Defined(Type::Union(union), origin, boundness),
                 qualifiers,
             } => (
                 union
                     .map_with_boundness(db, |elem| {
-                        Place::Type(
+                        Place::Defined(
                             elem.try_call_dunder_get(db, instance, owner)
                                 .map_or(*elem, |(ty, _)| ty),
+                            origin,
                             boundness,
                         )
                     })
@@ -3009,14 +3874,15 @@ impl<'db> Type<'db> {
             ),
 
             PlaceAndQualifiers {
-                place: Place::Type(Type::Intersection(intersection), boundness),
+                place: Place::Defined(Type::Intersection(intersection), origin, boundness),
                 qualifiers,
             } => (
                 intersection
                     .map_with_boundness(db, |elem| {
-                        Place::Type(
+                        Place::Defined(
                             elem.try_call_dunder_get(db, instance, owner)
                                 .map_or(*elem, |(ty, _)| ty),
+                            origin,
                             boundness,
                         )
                     })
@@ -3026,13 +3892,16 @@ impl<'db> Type<'db> {
             ),
 
             PlaceAndQualifiers {
-                place: Place::Type(attribute_ty, boundness),
+                place: Place::Defined(attribute_ty, origin, boundness),
                 qualifiers: _,
             } => {
                 if let Some((return_ty, attribute_kind)) =
                     attribute_ty.try_call_dunder_get(db, instance, owner)
                 {
-                    (Place::Type(return_ty, boundness).into(), attribute_kind)
+                    (
+                        Place::Defined(return_ty, origin, boundness).into(),
+                        attribute_kind,
+                    )
                 } else {
                     (attribute, AttributeKind::NormalOrNonDataDescriptor)
                 }
@@ -3071,11 +3940,11 @@ impl<'db> Type<'db> {
                 .iter_positive(db)
                 .any(|ty| ty.is_data_descriptor_impl(db, any_of_union)),
             _ => {
-                !self.class_member(db, "__set__".into()).place.is_unbound()
+                !self.class_member(db, "__set__".into()).place.is_undefined()
                     || !self
                         .class_member(db, "__delete__".into())
                         .place
-                        .is_unbound()
+                        .is_undefined()
             }
         }
     }
@@ -3123,25 +3992,28 @@ impl<'db> Type<'db> {
         match (meta_attr, meta_attr_kind, fallback) {
             // The fallback type is unbound, so we can just return `meta_attr` unconditionally,
             // no matter if it's data descriptor, a non-data descriptor, or a normal attribute.
-            (meta_attr @ Place::Type(_, _), _, Place::Unbound) => {
+            (meta_attr @ Place::Defined(_, _, _), _, Place::Undefined) => {
                 meta_attr.with_qualifiers(meta_attr_qualifiers)
             }
 
             // `meta_attr` is the return type of a data descriptor and definitely bound, so we
             // return it.
-            (meta_attr @ Place::Type(_, Boundness::Bound), AttributeKind::DataDescriptor, _) => {
-                meta_attr.with_qualifiers(meta_attr_qualifiers)
-            }
+            (
+                meta_attr @ Place::Defined(_, _, Definedness::AlwaysDefined),
+                AttributeKind::DataDescriptor,
+                _,
+            ) => meta_attr.with_qualifiers(meta_attr_qualifiers),
 
             // `meta_attr` is the return type of a data descriptor, but the attribute on the
             // meta-type is possibly-unbound. This means that we "fall through" to the next
             // stage of the descriptor protocol and union with the fallback type.
             (
-                Place::Type(meta_attr_ty, Boundness::PossiblyUnbound),
+                Place::Defined(meta_attr_ty, meta_origin, Definedness::PossiblyUndefined),
                 AttributeKind::DataDescriptor,
-                Place::Type(fallback_ty, fallback_boundness),
-            ) => Place::Type(
+                Place::Defined(fallback_ty, fallback_origin, fallback_boundness),
+            ) => Place::Defined(
                 UnionType::from_elements(db, [meta_attr_ty, fallback_ty]),
+                meta_origin.merge(fallback_origin),
                 fallback_boundness,
             )
             .with_qualifiers(meta_attr_qualifiers.union(fallback_qualifiers)),
@@ -3155,9 +4027,9 @@ impl<'db> Type<'db> {
             // would require us to statically infer if an instance attribute is always set, which
             // is something we currently don't attempt to do.
             (
-                Place::Type(_, _),
+                Place::Defined(_, _, _),
                 AttributeKind::NormalOrNonDataDescriptor,
-                fallback @ Place::Type(_, Boundness::Bound),
+                fallback @ Place::Defined(_, _, Definedness::AlwaysDefined),
             ) if policy == InstanceFallbackShadowsNonDataDescriptor::Yes => {
                 fallback.with_qualifiers(fallback_qualifiers)
             }
@@ -3166,17 +4038,18 @@ impl<'db> Type<'db> {
             // unbound or the policy argument is `No`. In both cases, the `fallback` type does
             // not completely shadow the non-data descriptor, so we build a union of the two.
             (
-                Place::Type(meta_attr_ty, meta_attr_boundness),
+                Place::Defined(meta_attr_ty, meta_origin, meta_attr_boundness),
                 AttributeKind::NormalOrNonDataDescriptor,
-                Place::Type(fallback_ty, fallback_boundness),
-            ) => Place::Type(
+                Place::Defined(fallback_ty, fallback_origin, fallback_boundness),
+            ) => Place::Defined(
                 UnionType::from_elements(db, [meta_attr_ty, fallback_ty]),
+                meta_origin.merge(fallback_origin),
                 meta_attr_boundness.max(fallback_boundness),
             )
             .with_qualifiers(meta_attr_qualifiers.union(fallback_qualifiers)),
 
             // If the attribute is not found on the meta-type, we simply return the fallback.
-            (Place::Unbound, _, fallback) => fallback.with_qualifiers(fallback_qualifiers),
+            (Place::Undefined, _, fallback) => fallback.with_qualifiers(fallback_qualifiers),
         }
     }
 
@@ -3194,7 +4067,7 @@ impl<'db> Type<'db> {
 
     /// Similar to [`Type::member`], but allows the caller to specify what policy should be used
     /// when looking up attributes. See [`MemberLookupPolicy`] for more information.
-    #[salsa::tracked(cycle_fn=member_lookup_cycle_recover, cycle_initial=member_lookup_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(cycle_initial=member_lookup_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     fn member_lookup_with_policy(
         self,
         db: &'db dyn Db,
@@ -3209,42 +4082,42 @@ impl<'db> Type<'db> {
         let name_str = name.as_str();
 
         match self {
-            Type::Union(union) => union
-                .map_with_boundness(db, |elem| {
-                    elem.member_lookup_with_policy(db, name_str.into(), policy)
-                        .place
-                })
-                .into(),
+            Type::Union(union) => union.map_with_boundness_and_qualifiers(db, |elem| {
+                elem.member_lookup_with_policy(db, name_str.into(), policy)
+            }),
 
             Type::Intersection(intersection) => intersection
-                .map_with_boundness(db, |elem| {
+                .map_with_boundness_and_qualifiers(db, |elem| {
                     elem.member_lookup_with_policy(db, name_str.into(), policy)
-                        .place
-                })
-                .into(),
+                }),
 
             Type::Dynamic(..) | Type::Never => Place::bound(self).into(),
 
             Type::FunctionLiteral(function) if name == "__get__" => Place::bound(
-                Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(function)),
+                Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(function)),
             )
             .into(),
             Type::FunctionLiteral(function) if name == "__call__" => Place::bound(
-                Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderCall(function)),
+                Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderCall(function)),
             )
             .into(),
             Type::PropertyInstance(property) if name == "__get__" => Place::bound(
-                Type::MethodWrapper(MethodWrapperKind::PropertyDunderGet(property)),
+                Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderGet(property)),
             )
             .into(),
             Type::PropertyInstance(property) if name == "__set__" => Place::bound(
-                Type::MethodWrapper(MethodWrapperKind::PropertyDunderSet(property)),
+                Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderSet(property)),
             )
             .into(),
             Type::StringLiteral(literal) if name == "startswith" => Place::bound(
-                Type::MethodWrapper(MethodWrapperKind::StrStartswith(literal)),
+                Type::KnownBoundMethod(KnownBoundMethodType::StrStartswith(literal)),
             )
             .into(),
+            Type::NominalInstance(instance)
+                if instance.has_known_class(db, KnownClass::Path) && name == "open" =>
+            {
+                Place::bound(Type::KnownBoundMethod(KnownBoundMethodType::PathOpen)).into()
+            }
 
             Type::ClassLiteral(class)
                 if name == "__get__" && class.is_known(db, KnownClass::FunctionType) =>
@@ -3285,7 +4158,8 @@ impl<'db> Type<'db> {
                         })
                 }
             },
-            Type::MethodWrapper(_) => KnownClass::MethodWrapperType
+            Type::KnownBoundMethod(method) => method
+                .class()
                 .to_instance(db)
                 .member_lookup_with_policy(db, name, policy),
             Type::WrapperDescriptor(_) => KnownClass::WrapperDescriptorType
@@ -3304,12 +4178,12 @@ impl<'db> Type<'db> {
                 .member_lookup_with_policy(db, name, policy),
 
             Type::Callable(_) | Type::DataclassTransformer(_) => {
-                Type::object(db).member_lookup_with_policy(db, name, policy)
+                Type::object().member_lookup_with_policy(db, name, policy)
             }
 
             Type::NominalInstance(instance)
                 if matches!(name.as_str(), "major" | "minor")
-                    && instance.class(db).is_known(db, KnownClass::VersionInfo) =>
+                    && instance.has_known_class(db, KnownClass::VersionInfo) =>
             {
                 let python_version = Program::get(db).python_version(db);
                 let segment = if name == "major" {
@@ -3337,10 +4211,27 @@ impl<'db> Type<'db> {
 
             Type::ModuleLiteral(module) => module.static_member(db, name_str),
 
+            // If a protocol does not include a member and the policy disables falling back to
+            // `object`, we return `Place::Undefined` here. This short-circuits attribute lookup
+            // before we find the "fallback to attribute access on `object`" logic later on
+            // (otherwise we would infer that all synthesized protocols have `__getattribute__`
+            // methods, and therefore that all synthesized protocols have all possible attributes.)
+            //
+            // Note that we could do this for *all* protocols, but it's only *necessary* for synthesized
+            // ones, and the standard logic is *probably* more performant for class-based protocols?
+            Type::ProtocolInstance(ProtocolInstanceType {
+                inner: Protocol::Synthesized(protocol),
+                ..
+            }) if policy.mro_no_object_fallback()
+                && !protocol.interface().includes_member(db, name_str) =>
+            {
+                Place::Undefined.into()
+            }
+
             _ if policy.no_instance_fallback() => self.invoke_descriptor_protocol(
                 db,
                 name_str,
-                Place::Unbound.into(),
+                Place::Undefined.into(),
                 InstanceFallbackShadowsNonDataDescriptor::No,
                 policy,
             ),
@@ -3349,6 +4240,29 @@ impl<'db> Type<'db> {
                 .value_type(db)
                 .member_lookup_with_policy(db, name, policy),
 
+            Type::EnumLiteral(enum_literal)
+                if matches!(name_str, "name" | "_name_")
+                    && Type::ClassLiteral(enum_literal.enum_class(db))
+                        .is_subtype_of(db, KnownClass::Enum.to_subclass_of(db)) =>
+            {
+                Place::bound(Type::StringLiteral(StringLiteralType::new(
+                    db,
+                    enum_literal.name(db).as_str(),
+                )))
+                .into()
+            }
+
+            Type::EnumLiteral(enum_literal)
+                if matches!(name_str, "value" | "_value_")
+                    && Type::ClassLiteral(enum_literal.enum_class(db))
+                        .is_subtype_of(db, KnownClass::Enum.to_subclass_of(db)) =>
+            {
+                enum_metadata(db, enum_literal.enum_class(db))
+                    .and_then(|metadata| metadata.members.get(enum_literal.name(db)))
+                    .map_or_else(|| Place::Undefined, Place::bound)
+                    .into()
+            }
+
             Type::NominalInstance(..)
             | Type::ProtocolInstance(..)
             | Type::BooleanLiteral(..)
@@ -3357,7 +4271,6 @@ impl<'db> Type<'db> {
             | Type::BytesLiteral(..)
             | Type::EnumLiteral(..)
             | Type::LiteralString
-            | Type::NonInferableTypeVar(..)
             | Type::TypeVar(..)
             | Type::SpecialForm(..)
             | Type::KnownInstance(..)
@@ -3387,27 +4300,28 @@ impl<'db> Type<'db> {
                     // resolve the attribute.
                     if matches!(
                         self.into_nominal_instance()
-                            .and_then(|instance| instance.class(db).known(db)),
+                            .and_then(|instance| instance.known_class(db)),
                         Some(KnownClass::ModuleType | KnownClass::GenericAlias)
                     ) {
-                        return Place::Unbound.into();
+                        return Place::Undefined.into();
                     }
 
                     self.try_call_dunder(
                         db,
                         "__getattr__",
                         CallArguments::positional([Type::string_literal(db, &name)]),
+                        TypeContext::default(),
                     )
                     .map(|outcome| Place::bound(outcome.return_type(db)))
                     // TODO: Handle call errors here.
-                    .unwrap_or(Place::Unbound)
+                    .unwrap_or(Place::Undefined)
                     .into()
                 };
 
                 let custom_getattribute_result = || {
                     // Avoid cycles when looking up `__getattribute__`
                     if "__getattribute__" == name.as_str() {
-                        return Place::Unbound.into();
+                        return Place::Undefined.into();
                     }
 
                     // Typeshed has a `__getattribute__` method defined on `builtins.object` so we
@@ -3416,33 +4330,34 @@ impl<'db> Type<'db> {
                         db,
                         "__getattribute__",
                         &mut CallArguments::positional([Type::string_literal(db, &name)]),
+                        TypeContext::default(),
                         MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK,
                     )
                     .map(|outcome| Place::bound(outcome.return_type(db)))
                     // TODO: Handle call errors here.
-                    .unwrap_or(Place::Unbound)
+                    .unwrap_or(Place::Undefined)
                     .into()
                 };
 
                 if result.is_class_var() && self.is_typed_dict() {
                     // `ClassVar`s on `TypedDictFallback` can not be accessed on inhabitants of `SomeTypedDict`.
                     // They can only be accessed on `SomeTypedDict` directly.
-                    return Place::Unbound.into();
+                    return Place::Undefined.into();
                 }
 
                 match result {
                     member @ PlaceAndQualifiers {
-                        place: Place::Type(_, Boundness::Bound),
+                        place: Place::Defined(_, _, Definedness::AlwaysDefined),
                         qualifiers: _,
                     } => member,
                     member @ PlaceAndQualifiers {
-                        place: Place::Type(_, Boundness::PossiblyUnbound),
+                        place: Place::Defined(_, _, Definedness::PossiblyUndefined),
                         qualifiers: _,
                     } => member
                         .or_fall_back_to(db, custom_getattribute_result)
                         .or_fall_back_to(db, custom_getattr_result),
                     PlaceAndQualifiers {
-                        place: Place::Unbound,
+                        place: Place::Undefined,
                         qualifiers: _,
                     } => custom_getattribute_result().or_fall_back_to(db, custom_getattr_result),
                 }
@@ -3467,14 +4382,11 @@ impl<'db> Type<'db> {
                 } {
                     if let Some(metadata) = enum_metadata(db, enum_class) {
                         if let Some(resolved_name) = metadata.resolve_member(&name) {
-                            return Place::Type(
-                                Type::EnumLiteral(EnumLiteralType::new(
-                                    db,
-                                    enum_class,
-                                    resolved_name,
-                                )),
-                                Boundness::Bound,
-                            )
+                            return Place::bound(Type::EnumLiteral(EnumLiteralType::new(
+                                db,
+                                enum_class,
+                                resolved_name,
+                            )))
                             .into();
                         }
                     }
@@ -3518,7 +4430,7 @@ impl<'db> Type<'db> {
     /// is truthy or falsy in a context where Python doesn't make an implicit `bool` call.
     /// Use [`try_bool`](Self::try_bool) for type checking or implicit `bool` calls.
     pub(crate) fn bool(&self, db: &'db dyn Db) -> Truthiness {
-        self.try_bool_impl(db, true)
+        self.try_bool_impl(db, true, &TryBoolVisitor::new(Ok(Truthiness::Ambiguous)))
             .unwrap_or_else(|err| err.fallback_truthiness())
     }
 
@@ -3529,7 +4441,7 @@ impl<'db> Type<'db> {
     ///
     /// Returns an error if the type doesn't implement `__bool__` correctly.
     pub(crate) fn try_bool(&self, db: &'db dyn Db) -> Result<Truthiness, BoolError<'db>> {
-        self.try_bool_impl(db, false)
+        self.try_bool_impl(db, false, &TryBoolVisitor::new(Ok(Truthiness::Ambiguous)))
     }
 
     /// Resolves the boolean value of a type.
@@ -3548,6 +4460,7 @@ impl<'db> Type<'db> {
         &self,
         db: &'db dyn Db,
         allow_short_circuit: bool,
+        visitor: &TryBoolVisitor<'db>,
     ) -> Result<Truthiness, BoolError<'db>> {
         let type_to_truthiness = |ty| {
             if let Type::BooleanLiteral(bool_val) = ty {
@@ -3562,7 +4475,12 @@ impl<'db> Type<'db> {
             // runtime there is a fallback to `__len__`, since `__bool__` takes precedence
             // and a subclass could add a `__bool__` method.
 
-            match self.try_call_dunder(db, "__bool__", CallArguments::none()) {
+            match self.try_call_dunder(
+                db,
+                "__bool__",
+                CallArguments::none(),
+                TypeContext::default(),
+            ) {
                 Ok(outcome) => {
                     let return_type = outcome.return_type(db);
                     if !return_type.is_assignable_to(db, KnownClass::Bool.to_instance(db)) {
@@ -3587,7 +4505,7 @@ impl<'db> Type<'db> {
                         });
                     }
 
-                    // Don't trust possibly unbound `__bool__` method.
+                    // Don't trust possibly missing `__bool__` method.
                     Ok(Truthiness::Ambiguous)
                 }
 
@@ -3617,14 +4535,15 @@ impl<'db> Type<'db> {
             let mut has_errors = false;
 
             for element in union.elements(db) {
-                let element_truthiness = match element.try_bool_impl(db, allow_short_circuit) {
-                    Ok(truthiness) => truthiness,
-                    Err(err) => {
-                        has_errors = true;
-                        all_not_callable &= matches!(err, BoolError::NotCallable { .. });
-                        err.fallback_truthiness()
-                    }
-                };
+                let element_truthiness =
+                    match element.try_bool_impl(db, allow_short_circuit, visitor) {
+                        Ok(truthiness) => truthiness,
+                        Err(err) => {
+                            has_errors = true;
+                            all_not_callable &= matches!(err, BoolError::NotCallable { .. });
+                            err.fallback_truthiness()
+                        }
+                    };
 
                 truthiness.get_or_insert(element_truthiness);
 
@@ -3664,10 +4583,15 @@ impl<'db> Type<'db> {
                 Truthiness::Ambiguous
             }
 
+            Type::KnownInstance(KnownInstanceType::ConstraintSet(tracked_set)) => {
+                let constraints = tracked_set.constraints(db);
+                Truthiness::from(constraints.is_always_satisfied())
+            }
+
             Type::FunctionLiteral(_)
             | Type::BoundMethod(_)
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             | Type::ModuleLiteral(_)
@@ -3679,36 +4603,36 @@ impl<'db> Type<'db> {
 
             Type::AlwaysFalsy => Truthiness::AlwaysFalse,
 
-            Type::ClassLiteral(class) => class
-                .metaclass_instance_type(db)
-                .try_bool_impl(db, allow_short_circuit)?,
+            Type::ClassLiteral(class) => {
+                class
+                    .metaclass_instance_type(db)
+                    .try_bool_impl(db, allow_short_circuit, visitor)?
+            }
             Type::GenericAlias(alias) => ClassType::from(*alias)
                 .metaclass_instance_type(db)
-                .try_bool_impl(db, allow_short_circuit)?,
+                .try_bool_impl(db, allow_short_circuit, visitor)?,
 
             Type::SubclassOf(subclass_of_ty) => match subclass_of_ty.subclass_of() {
                 SubclassOfInner::Dynamic(_) => Truthiness::Ambiguous,
                 SubclassOfInner::Class(class) => {
-                    Type::from(class).try_bool_impl(db, allow_short_circuit)?
+                    Type::from(class).try_bool_impl(db, allow_short_circuit, visitor)?
                 }
             },
 
-            Type::NonInferableTypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
                     None => Truthiness::Ambiguous,
                     Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
-                        bound.try_bool_impl(db, allow_short_circuit)?
+                        bound.try_bool_impl(db, allow_short_circuit, visitor)?
                     }
                     Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
                         try_union(constraints)?
                     }
                 }
             }
-            Type::TypeVar(_) => Truthiness::Ambiguous,
 
             Type::NominalInstance(instance) => instance
-                .class(db)
-                .known(db)
+                .known_class(db)
                 .and_then(KnownClass::bool)
                 .map(Ok)
                 .unwrap_or_else(try_dunder_bool)?,
@@ -3732,9 +4656,11 @@ impl<'db> Type<'db> {
             Type::BooleanLiteral(bool) => Truthiness::from(*bool),
             Type::StringLiteral(str) => Truthiness::from(!str.value(db).is_empty()),
             Type::BytesLiteral(bytes) => Truthiness::from(!bytes.value(db).is_empty()),
-            Type::TypeAlias(alias) => alias
-                .value_type(db)
-                .try_bool_impl(db, allow_short_circuit)?,
+            Type::TypeAlias(alias) => visitor.visit(*self, || {
+                alias
+                    .value_type(db)
+                    .try_bool_impl(db, allow_short_circuit, visitor)
+            })?,
         };
 
         Ok(truthiness)
@@ -3768,7 +4694,12 @@ impl<'db> Type<'db> {
             return usize_len.try_into().ok().map(Type::IntLiteral);
         }
 
-        let return_ty = match self.try_call_dunder(db, "__len__", CallArguments::none()) {
+        let return_ty = match self.try_call_dunder(
+            db,
+            "__len__",
+            CallArguments::none(),
+            TypeContext::default(),
+        ) {
             Ok(bindings) => bindings.return_type(db),
             Err(CallDunderError::PossiblyUnbound(bindings)) => bindings.return_type(db),
 
@@ -3797,7 +4728,7 @@ impl<'db> Type<'db> {
                     .into()
             }
 
-            Type::NonInferableTypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
                     None => CallableBinding::not_callable(self).into(),
                     Some(TypeVarBoundOrConstraints::UpperBound(bound)) => bound.bindings(db),
@@ -3810,15 +4741,6 @@ impl<'db> Type<'db> {
                 }
             }
 
-            Type::TypeVar(_) => {
-                debug_assert!(
-                    false,
-                    "should not be able to call type variable {} in inferable position",
-                    self.display(db)
-                );
-                CallableBinding::not_callable(self).into()
-            }
-
             Type::BoundMethod(bound_method) => {
                 let signature = bound_method.function(db).signature(db);
                 CallableBinding::from_overloads(self, signature.overloads.iter().cloned())
@@ -3826,172 +4748,14 @@ impl<'db> Type<'db> {
                     .into()
             }
 
-            Type::MethodWrapper(
-                MethodWrapperKind::FunctionTypeDunderGet(_)
-                | MethodWrapperKind::PropertyDunderGet(_),
-            ) => {
-                // Here, we dynamically model the overloaded function signature of `types.FunctionType.__get__`.
-                // This is required because we need to return more precise types than what the signature in
-                // typeshed provides:
-                //
-                // ```py
-                // class FunctionType:
-                //     # ...
-                //     @overload
-                //     def __get__(self, instance: None, owner: type, /) -> FunctionType: ...
-                //     @overload
-                //     def __get__(self, instance: object, owner: type | None = None, /) -> MethodType: ...
-                // ```
-                //
-                // For `builtins.property.__get__`, we use the same signature. The return types are not
-                // specified yet, they will be dynamically added in `Bindings::evaluate_known_cases`.
-
-                CallableBinding::from_overloads(
-                    self,
-                    [
-                        Signature::new(
-                            Parameters::new([
-                                Parameter::positional_only(Some(Name::new_static("instance")))
-                                    .with_annotated_type(Type::none(db)),
-                                Parameter::positional_only(Some(Name::new_static("owner")))
-                                    .with_annotated_type(KnownClass::Type.to_instance(db)),
-                            ]),
-                            None,
-                        ),
-                        Signature::new(
-                            Parameters::new([
-                                Parameter::positional_only(Some(Name::new_static("instance")))
-                                    .with_annotated_type(Type::object(db)),
-                                Parameter::positional_only(Some(Name::new_static("owner")))
-                                    .with_annotated_type(UnionType::from_elements(
-                                        db,
-                                        [KnownClass::Type.to_instance(db), Type::none(db)],
-                                    ))
-                                    .with_default_type(Type::none(db)),
-                            ]),
-                            None,
-                        ),
-                    ],
-                )
-                .into()
+            Type::KnownBoundMethod(method) => {
+                CallableBinding::from_overloads(self, method.signatures(db)).into()
             }
 
-            Type::WrapperDescriptor(
-                kind @ (WrapperDescriptorKind::FunctionTypeDunderGet
-                | WrapperDescriptorKind::PropertyDunderGet),
-            ) => {
-                // Here, we also model `types.FunctionType.__get__` (or builtins.property.__get__),
-                // but now we consider a call to this as a function, i.e. we also expect the `self`
-                // argument to be passed in.
-
-                // TODO: Consider merging this signature with the one in the previous match clause,
-                // since the previous one is just this signature with the `self` parameters
-                // removed.
-                let descriptor = match kind {
-                    WrapperDescriptorKind::FunctionTypeDunderGet => {
-                        KnownClass::FunctionType.to_instance(db)
-                    }
-                    WrapperDescriptorKind::PropertyDunderGet => {
-                        KnownClass::Property.to_instance(db)
-                    }
-                    WrapperDescriptorKind::PropertyDunderSet => {
-                        unreachable!("Not part of outer match pattern")
-                    }
-                };
-                CallableBinding::from_overloads(
-                    self,
-                    [
-                        Signature::new(
-                            Parameters::new([
-                                Parameter::positional_only(Some(Name::new_static("self")))
-                                    .with_annotated_type(descriptor),
-                                Parameter::positional_only(Some(Name::new_static("instance")))
-                                    .with_annotated_type(Type::none(db)),
-                                Parameter::positional_only(Some(Name::new_static("owner")))
-                                    .with_annotated_type(KnownClass::Type.to_instance(db)),
-                            ]),
-                            None,
-                        ),
-                        Signature::new(
-                            Parameters::new([
-                                Parameter::positional_only(Some(Name::new_static("self")))
-                                    .with_annotated_type(descriptor),
-                                Parameter::positional_only(Some(Name::new_static("instance")))
-                                    .with_annotated_type(Type::object(db)),
-                                Parameter::positional_only(Some(Name::new_static("owner")))
-                                    .with_annotated_type(UnionType::from_elements(
-                                        db,
-                                        [KnownClass::Type.to_instance(db), Type::none(db)],
-                                    ))
-                                    .with_default_type(Type::none(db)),
-                            ]),
-                            None,
-                        ),
-                    ],
-                )
-                .into()
+            Type::WrapperDescriptor(wrapper_descriptor) => {
+                CallableBinding::from_overloads(self, wrapper_descriptor.signatures(db)).into()
             }
 
-            Type::MethodWrapper(MethodWrapperKind::PropertyDunderSet(_)) => Binding::single(
-                self,
-                Signature::new(
-                    Parameters::new([
-                        Parameter::positional_only(Some(Name::new_static("instance")))
-                            .with_annotated_type(Type::object(db)),
-                        Parameter::positional_only(Some(Name::new_static("value")))
-                            .with_annotated_type(Type::object(db)),
-                    ]),
-                    None,
-                ),
-            )
-            .into(),
-
-            Type::WrapperDescriptor(WrapperDescriptorKind::PropertyDunderSet) => Binding::single(
-                self,
-                Signature::new(
-                    Parameters::new([
-                        Parameter::positional_only(Some(Name::new_static("self")))
-                            .with_annotated_type(KnownClass::Property.to_instance(db)),
-                        Parameter::positional_only(Some(Name::new_static("instance")))
-                            .with_annotated_type(Type::object(db)),
-                        Parameter::positional_only(Some(Name::new_static("value")))
-                            .with_annotated_type(Type::object(db)),
-                    ]),
-                    None,
-                ),
-            )
-            .into(),
-
-            Type::MethodWrapper(MethodWrapperKind::StrStartswith(_)) => Binding::single(
-                self,
-                Signature::new(
-                    Parameters::new([
-                        Parameter::positional_only(Some(Name::new_static("prefix")))
-                            .with_annotated_type(UnionType::from_elements(
-                                db,
-                                [
-                                    KnownClass::Str.to_instance(db),
-                                    Type::homogeneous_tuple(db, KnownClass::Str.to_instance(db)),
-                                ],
-                            )),
-                        Parameter::positional_only(Some(Name::new_static("start")))
-                            .with_annotated_type(UnionType::from_elements(
-                                db,
-                                [KnownClass::SupportsIndex.to_instance(db), Type::none(db)],
-                            ))
-                            .with_default_type(Type::none(db)),
-                        Parameter::positional_only(Some(Name::new_static("end")))
-                            .with_annotated_type(UnionType::from_elements(
-                                db,
-                                [KnownClass::SupportsIndex.to_instance(db), Type::none(db)],
-                            ))
-                            .with_default_type(Type::none(db)),
-                    ]),
-                    Some(KnownClass::Bool.to_instance(db)),
-                ),
-            )
-            .into(),
-
             // TODO: We should probably also check the original return type of the function
             // that was decorated with `@dataclass_transform`, to see if it is consistent with
             // with what we configure here.
@@ -3999,7 +4763,7 @@ impl<'db> Type<'db> {
                 self,
                 Signature::new(
                     Parameters::new([Parameter::positional_only(Some(Name::new_static("func")))
-                        .with_annotated_type(Type::object(db))]),
+                        .with_annotated_type(Type::object())]),
                     None,
                 ),
             )
@@ -4008,8 +4772,8 @@ impl<'db> Type<'db> {
             Type::FunctionLiteral(function_type) => match function_type.known(db) {
                 Some(
                     KnownFunction::IsEquivalentTo
-                    | KnownFunction::IsSubtypeOf
                     | KnownFunction::IsAssignableTo
+                    | KnownFunction::IsSubtypeOf
                     | KnownFunction::IsDisjointFrom,
                 ) => Binding::single(
                     self,
@@ -4022,11 +4786,32 @@ impl<'db> Type<'db> {
                                 .type_form()
                                 .with_annotated_type(Type::any()),
                         ]),
-                        Some(KnownClass::Bool.to_instance(db)),
+                        Some(KnownClass::ConstraintSet.to_instance(db)),
                     ),
                 )
                 .into(),
 
+                Some(KnownFunction::RangeConstraint | KnownFunction::NegatedRangeConstraint) => {
+                    Binding::single(
+                        self,
+                        Signature::new(
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("lower_bound")))
+                                    .type_form()
+                                    .with_annotated_type(Type::any()),
+                                Parameter::positional_only(Some(Name::new_static("typevar")))
+                                    .type_form()
+                                    .with_annotated_type(Type::any()),
+                                Parameter::positional_only(Some(Name::new_static("upper_bound")))
+                                    .type_form()
+                                    .with_annotated_type(Type::any()),
+                            ]),
+                            Some(KnownClass::ConstraintSet.to_instance(db)),
+                        ),
+                    )
+                    .into()
+                }
+
                 Some(KnownFunction::IsSingleton | KnownFunction::IsSingleValued) => {
                     Binding::single(
                         self,
@@ -4042,36 +4827,27 @@ impl<'db> Type<'db> {
                     .into()
                 }
 
-                Some(KnownFunction::TopMaterialization | KnownFunction::BottomMaterialization) => {
+                Some(KnownFunction::AssertType) => {
+                    let val_ty =
+                        BoundTypeVarInstance::synthetic(db, "T", TypeVarVariance::Invariant);
+
                     Binding::single(
                         self,
-                        Signature::new(
-                            Parameters::new([Parameter::positional_only(Some(Name::new_static(
-                                "type",
-                            )))
-                            .type_form()
-                            .with_annotated_type(Type::any())]),
-                            Some(Type::any()),
+                        Signature::new_generic(
+                            Some(GenericContext::from_typevar_instances(db, [val_ty])),
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("value")))
+                                    .with_annotated_type(Type::TypeVar(val_ty)),
+                                Parameter::positional_only(Some(Name::new_static("type")))
+                                    .type_form()
+                                    .with_annotated_type(Type::any()),
+                            ]),
+                            Some(Type::TypeVar(val_ty)),
                         ),
                     )
                     .into()
                 }
 
-                Some(KnownFunction::AssertType) => Binding::single(
-                    self,
-                    Signature::new(
-                        Parameters::new([
-                            Parameter::positional_only(Some(Name::new_static("value")))
-                                .with_annotated_type(Type::any()),
-                            Parameter::positional_only(Some(Name::new_static("type")))
-                                .type_form()
-                                .with_annotated_type(Type::any()),
-                        ]),
-                        Some(Type::none(db)),
-                    ),
-                )
-                .into(),
-
                 Some(KnownFunction::AssertNever) => {
                     Binding::single(
                         self,
@@ -4228,7 +5004,7 @@ impl<'db> Type<'db> {
                                 Parameters::new([Parameter::positional_or_keyword(
                                     Name::new_static("object"),
                                 )
-                                .with_annotated_type(Type::object(db))
+                                .with_annotated_type(Type::object())
                                 .with_default_type(Type::string_literal(db, ""))]),
                                 Some(KnownClass::Str.to_instance(db)),
                             ),
@@ -4311,7 +5087,7 @@ impl<'db> Type<'db> {
                     // ```
                     Binding::single(
                         self,
-                        Signature::new(Parameters::empty(), Some(Type::object(db))),
+                        Signature::new(Parameters::empty(), Some(Type::object())),
                     )
                     .into()
                 }
@@ -4358,56 +5134,6 @@ impl<'db> Type<'db> {
                     .into()
                 }
 
-                Some(KnownClass::TypeVar) => {
-                    // ```py
-                    // class TypeVar:
-                    //     def __new__(
-                    //         cls,
-                    //         name: str,
-                    //         *constraints: Any,
-                    //         bound: Any | None = None,
-                    //         contravariant: bool = False,
-                    //         covariant: bool = False,
-                    //         infer_variance: bool = False,
-                    //         default: Any = ...,
-                    //     ) -> Self: ...
-                    // ```
-                    Binding::single(
-                        self,
-                        Signature::new(
-                            Parameters::new([
-                                Parameter::positional_or_keyword(Name::new_static("name"))
-                                    .with_annotated_type(Type::LiteralString),
-                                Parameter::variadic(Name::new_static("constraints"))
-                                    .type_form()
-                                    .with_annotated_type(Type::any()),
-                                Parameter::keyword_only(Name::new_static("bound"))
-                                    .type_form()
-                                    .with_annotated_type(UnionType::from_elements(
-                                        db,
-                                        [Type::any(), Type::none(db)],
-                                    ))
-                                    .with_default_type(Type::none(db)),
-                                Parameter::keyword_only(Name::new_static("default"))
-                                    .type_form()
-                                    .with_annotated_type(Type::any())
-                                    .with_default_type(KnownClass::NoneType.to_instance(db)),
-                                Parameter::keyword_only(Name::new_static("contravariant"))
-                                    .with_annotated_type(KnownClass::Bool.to_instance(db))
-                                    .with_default_type(Type::BooleanLiteral(false)),
-                                Parameter::keyword_only(Name::new_static("covariant"))
-                                    .with_annotated_type(KnownClass::Bool.to_instance(db))
-                                    .with_default_type(Type::BooleanLiteral(false)),
-                                Parameter::keyword_only(Name::new_static("infer_variance"))
-                                    .with_annotated_type(KnownClass::Bool.to_instance(db))
-                                    .with_default_type(Type::BooleanLiteral(false)),
-                            ]),
-                            Some(KnownClass::TypeVar.to_instance(db)),
-                        ),
-                    )
-                    .into()
-                }
-
                 Some(KnownClass::Deprecated) => {
                     // ```py
                     // class deprecated:
@@ -4552,7 +5278,7 @@ impl<'db> Type<'db> {
                 }
 
                 Some(KnownClass::Tuple) => {
-                    let object = Type::object(db);
+                    let object = Type::object();
 
                     // ```py
                     // class tuple:
@@ -4656,15 +5382,15 @@ impl<'db> Type<'db> {
                     )
                     .place
                 {
-                    Place::Type(dunder_callable, boundness) => {
+                    Place::Defined(dunder_callable, _, boundness) => {
                         let mut bindings = dunder_callable.bindings(db);
                         bindings.replace_callable_type(dunder_callable, self);
-                        if boundness == Boundness::PossiblyUnbound {
+                        if boundness == Definedness::PossiblyUndefined {
                             bindings.set_dunder_call_is_possibly_unbound();
                         }
                         bindings
                     }
-                    Place::Unbound => CallableBinding::not_callable(self).into(),
+                    Place::Undefined => CallableBinding::not_callable(self).into(),
                 }
             }
 
@@ -4687,10 +5413,8 @@ impl<'db> Type<'db> {
                 Binding::single(self, Signature::todo("Type::Intersection.call()")).into()
             }
 
-            // TODO: these are actually callable
-            Type::MethodWrapper(_) | Type::DataclassDecorator(_) => {
-                CallableBinding::not_callable(self).into()
-            }
+            // TODO: this is actually callable
+            Type::DataclassDecorator(_) => CallableBinding::not_callable(self).into(),
 
             // TODO: some `SpecialForm`s are callable (e.g. TypedDicts)
             Type::SpecialForm(_) => CallableBinding::not_callable(self).into(),
@@ -4730,8 +5454,8 @@ impl<'db> Type<'db> {
         argument_types: &CallArguments<'_, 'db>,
     ) -> Result<Bindings<'db>, CallError<'db>> {
         self.bindings(db)
-            .match_parameters(argument_types)
-            .check_types(db, argument_types)
+            .match_parameters(db, argument_types)
+            .check_types(db, argument_types, &TypeContext::default(), &[])
     }
 
     /// Look up a dunder method on the meta-type of `self` and call it.
@@ -4743,11 +5467,13 @@ impl<'db> Type<'db> {
         db: &'db dyn Db,
         name: &str,
         mut argument_types: CallArguments<'_, 'db>,
+        tcx: TypeContext<'db>,
     ) -> Result<Bindings<'db>, CallDunderError<'db>> {
         self.try_call_dunder_with_policy(
             db,
             name,
             &mut argument_types,
+            tcx,
             MemberLookupPolicy::default(),
         )
     }
@@ -4764,6 +5490,7 @@ impl<'db> Type<'db> {
         db: &'db dyn Db,
         name: &str,
         argument_types: &mut CallArguments<'_, 'db>,
+        tcx: TypeContext<'db>,
         policy: MemberLookupPolicy,
     ) -> Result<Bindings<'db>, CallDunderError<'db>> {
         // Implicit calls to dunder methods never access instance members, so we pass
@@ -4776,17 +5503,17 @@ impl<'db> Type<'db> {
             )
             .place
         {
-            Place::Type(dunder_callable, boundness) => {
+            Place::Defined(dunder_callable, _, boundness) => {
                 let bindings = dunder_callable
                     .bindings(db)
-                    .match_parameters(argument_types)
-                    .check_types(db, argument_types)?;
-                if boundness == Boundness::PossiblyUnbound {
+                    .match_parameters(db, argument_types)
+                    .check_types(db, argument_types, &tcx, &[])?;
+                if boundness == Definedness::PossiblyUndefined {
                     return Err(CallDunderError::PossiblyUnbound(Box::new(bindings)));
                 }
                 Ok(bindings)
             }
-            Place::Unbound => Err(CallDunderError::MethodNotAvailable),
+            Place::Undefined => Err(CallDunderError::MethodNotAvailable),
         }
     }
 
@@ -4816,17 +5543,135 @@ impl<'db> Type<'db> {
         db: &'db dyn Db,
         mode: EvaluationMode,
     ) -> Result<Cow<'db, TupleSpec<'db>>, IterationError<'db>> {
+        fn non_async_special_case<'db>(
+            db: &'db dyn Db,
+            ty: Type<'db>,
+        ) -> Option<Cow<'db, TupleSpec<'db>>> {
+            // We will not infer precise heterogeneous tuple specs for literals with lengths above this threshold.
+            // The threshold here is somewhat arbitrary and conservative; it could be increased if needed.
+            // However, it's probably very rare to need heterogeneous unpacking inference for long string literals
+            // or bytes literals, and creating long heterogeneous tuple specs has a performance cost.
+            const MAX_TUPLE_LENGTH: usize = 128;
+
+            match ty {
+                Type::NominalInstance(nominal) => nominal.tuple_spec(db),
+                Type::GenericAlias(alias) if alias.origin(db).is_tuple(db) => {
+                    Some(Cow::Owned(TupleSpec::homogeneous(todo_type!(
+                        "*tuple[] annotations"
+                    ))))
+                }
+                Type::StringLiteral(string_literal_ty) => {
+                    let string_literal = string_literal_ty.value(db);
+                    let spec = if string_literal.len() < MAX_TUPLE_LENGTH {
+                        TupleSpec::heterogeneous(
+                            string_literal
+                                .chars()
+                                .map(|c| Type::string_literal(db, &c.to_string())),
+                        )
+                    } else {
+                        TupleSpec::homogeneous(Type::LiteralString)
+                    };
+                    Some(Cow::Owned(spec))
+                }
+                Type::BytesLiteral(bytes) => {
+                    let bytes_literal = bytes.value(db);
+                    let spec = if bytes_literal.len() < MAX_TUPLE_LENGTH {
+                        TupleSpec::heterogeneous(
+                            bytes_literal
+                                .iter()
+                                .map(|b| Type::IntLiteral(i64::from(*b))),
+                        )
+                    } else {
+                        TupleSpec::homogeneous(KnownClass::Int.to_instance(db))
+                    };
+                    Some(Cow::Owned(spec))
+                }
+                Type::Never => {
+                    // The dunder logic below would have us return `tuple[Never, ...]`, which eagerly
+                    // simplifies to `tuple[()]`. That will will cause us to emit false positives if we
+                    // index into the tuple. Using `tuple[Unknown, ...]` avoids these false positives.
+                    // TODO: Consider removing this special case, and instead hide the indexing
+                    // diagnostic in unreachable code.
+                    Some(Cow::Owned(TupleSpec::homogeneous(Type::unknown())))
+                }
+                Type::TypeAlias(alias) => {
+                    non_async_special_case(db, alias.value_type(db))
+                }
+                Type::TypeVar(tvar) => match tvar.typevar(db).bound_or_constraints(db)? {
+                    TypeVarBoundOrConstraints::UpperBound(bound) => {
+                        non_async_special_case(db, bound)
+                    }
+                    TypeVarBoundOrConstraints::Constraints(union) => non_async_special_case(db, Type::Union(union)),
+                },
+                Type::Union(union) => {
+                    let elements = union.elements(db);
+                    if elements.len() < MAX_TUPLE_LENGTH {
+                        let mut elements_iter = elements.iter();
+                        let first_element_spec = elements_iter.next()?.try_iterate_with_mode(db, EvaluationMode::Sync).ok()?;
+                        let mut builder = TupleSpecBuilder::from(&*first_element_spec);
+                        for element in elements_iter {
+                            builder = builder.union(db, &*element.try_iterate_with_mode(db, EvaluationMode::Sync).ok()?);
+                        }
+                        Some(Cow::Owned(builder.build()))
+                    } else {
+                        None
+                    }
+                }
+                // N.B. These special cases aren't strictly necessary, they're just obvious optimizations
+                Type::LiteralString | Type::Dynamic(_) => Some(Cow::Owned(TupleSpec::homogeneous(ty))),
+
+                Type::FunctionLiteral(_)
+                | Type::GenericAlias(_)
+                | Type::BoundMethod(_)
+                | Type::KnownBoundMethod(_)
+                | Type::WrapperDescriptor(_)
+                | Type::DataclassDecorator(_)
+                | Type::DataclassTransformer(_)
+                | Type::Callable(_)
+                | Type::ModuleLiteral(_)
+                // We could infer a precise tuple spec for enum classes with members,
+                // but it's not clear whether that's worth the added complexity:
+                // you'd have to check that `EnumMeta.__iter__` is not overridden for it to be sound
+                // (enums can have `EnumMeta` subclasses as their metaclasses).
+                | Type::ClassLiteral(_)
+                | Type::SubclassOf(_)
+                | Type::ProtocolInstance(_)
+                | Type::SpecialForm(_)
+                | Type::KnownInstance(_)
+                | Type::PropertyInstance(_)
+                | Type::Intersection(_)
+                | Type::AlwaysTruthy
+                | Type::AlwaysFalsy
+                | Type::IntLiteral(_)
+                | Type::BooleanLiteral(_)
+                | Type::EnumLiteral(_)
+                | Type::BoundSuper(_)
+                | Type::TypeIs(_)
+                | Type::TypedDict(_) => None
+            }
+        }
+
         if mode.is_async() {
             let try_call_dunder_anext_on_iterator = |iterator: Type<'db>| -> Result<
                 Result<Type<'db>, AwaitError<'db>>,
                 CallDunderError<'db>,
             > {
                 iterator
-                    .try_call_dunder(db, "__anext__", CallArguments::none())
+                    .try_call_dunder(
+                        db,
+                        "__anext__",
+                        CallArguments::none(),
+                        TypeContext::default(),
+                    )
                     .map(|dunder_anext_outcome| dunder_anext_outcome.return_type(db).try_await(db))
             };
 
-            return match self.try_call_dunder(db, "__aiter__", CallArguments::none()) {
+            return match self.try_call_dunder(
+                db,
+                "__aiter__",
+                CallArguments::none(),
+                TypeContext::default(),
+            ) {
                 Ok(dunder_aiter_bindings) => {
                     let iterator = dunder_aiter_bindings.return_type(db);
                     match try_call_dunder_anext_on_iterator(iterator) {
@@ -4871,78 +5716,8 @@ impl<'db> Type<'db> {
             };
         }
 
-        match self {
-            Type::NominalInstance(nominal) => {
-                if let Some(spec) = nominal.tuple_spec(db) {
-                    return Ok(spec);
-                }
-            }
-            Type::GenericAlias(alias) if alias.origin(db).is_tuple(db) => {
-                return Ok(Cow::Owned(TupleSpec::homogeneous(todo_type!(
-                    "*tuple[] annotations"
-                ))));
-            }
-            Type::StringLiteral(string_literal_ty) => {
-                // We could go further and deconstruct to an array of `StringLiteral`
-                // with each individual character, instead of just an array of
-                // `LiteralString`, but there would be a cost and it's not clear that
-                // it's worth it.
-                return Ok(Cow::Owned(TupleSpec::heterogeneous(std::iter::repeat_n(
-                    Type::LiteralString,
-                    string_literal_ty.python_len(db),
-                ))));
-            }
-            Type::Never => {
-                // The dunder logic below would have us return `tuple[Never, ...]`, which eagerly
-                // simplifies to `tuple[()]`. That will will cause us to emit false positives if we
-                // index into the tuple. Using `tuple[Unknown, ...]` avoids these false positives.
-                // TODO: Consider removing this special case, and instead hide the indexing
-                // diagnostic in unreachable code.
-                return Ok(Cow::Owned(TupleSpec::homogeneous(Type::unknown())));
-            }
-            Type::TypeAlias(alias) => {
-                return alias.value_type(db).try_iterate_with_mode(db, mode);
-            }
-            Type::NonInferableTypeVar(tvar) => match tvar.typevar(db).bound_or_constraints(db) {
-                Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
-                    return bound.try_iterate_with_mode(db, mode);
-                }
-                // TODO: could we create a "union of tuple specs"...?
-                // (Same question applies to the `Type::Union()` branch lower down)
-                Some(TypeVarBoundOrConstraints::Constraints(_)) | None => {}
-            },
-            Type::TypeVar(_) => unreachable!(
-                "should not be able to iterate over type variable {} in inferable position",
-                self.display(db)
-            ),
-            Type::Dynamic(_)
-            | Type::FunctionLiteral(_)
-            | Type::GenericAlias(_)
-            | Type::BoundMethod(_)
-            | Type::MethodWrapper(_)
-            | Type::WrapperDescriptor(_)
-            | Type::DataclassDecorator(_)
-            | Type::DataclassTransformer(_)
-            | Type::Callable(_)
-            | Type::ModuleLiteral(_)
-            | Type::ClassLiteral(_)
-            | Type::SubclassOf(_)
-            | Type::ProtocolInstance(_)
-            | Type::SpecialForm(_)
-            | Type::KnownInstance(_)
-            | Type::PropertyInstance(_)
-            | Type::Union(_)
-            | Type::Intersection(_)
-            | Type::AlwaysTruthy
-            | Type::AlwaysFalsy
-            | Type::IntLiteral(_)
-            | Type::BooleanLiteral(_)
-            | Type::EnumLiteral(_)
-            | Type::LiteralString
-            | Type::BytesLiteral(_)
-            | Type::BoundSuper(_)
-            | Type::TypeIs(_)
-            | Type::TypedDict(_) => {}
+        if let Some(special_case) = non_async_special_case(db, self) {
+            return Ok(special_case);
         }
 
         let try_call_dunder_getitem = || {
@@ -4950,18 +5725,29 @@ impl<'db> Type<'db> {
                 db,
                 "__getitem__",
                 CallArguments::positional([KnownClass::Int.to_instance(db)]),
+                TypeContext::default(),
             )
             .map(|dunder_getitem_outcome| dunder_getitem_outcome.return_type(db))
         };
 
         let try_call_dunder_next_on_iterator = |iterator: Type<'db>| {
             iterator
-                .try_call_dunder(db, "__next__", CallArguments::none())
+                .try_call_dunder(
+                    db,
+                    "__next__",
+                    CallArguments::none(),
+                    TypeContext::default(),
+                )
                 .map(|dunder_next_outcome| dunder_next_outcome.return_type(db))
         };
 
         let dunder_iter_result = self
-            .try_call_dunder(db, "__iter__", CallArguments::none())
+            .try_call_dunder(
+                db,
+                "__iter__",
+                CallArguments::none(),
+                TypeContext::default(),
+            )
             .map(|dunder_iter_outcome| dunder_iter_outcome.return_type(db));
 
         match dunder_iter_result {
@@ -5069,11 +5855,17 @@ impl<'db> Type<'db> {
             EvaluationMode::Sync => ("__enter__", "__exit__"),
         };
 
-        let enter = self.try_call_dunder(db, enter_method, CallArguments::none());
+        let enter = self.try_call_dunder(
+            db,
+            enter_method,
+            CallArguments::none(),
+            TypeContext::default(),
+        );
         let exit = self.try_call_dunder(
             db,
             exit_method,
             CallArguments::positional([Type::none(db), Type::none(db), Type::none(db)]),
+            TypeContext::default(),
         );
 
         // TODO: Make use of Protocols when we support it (the manager be assignable to `contextlib.AbstractContextManager`).
@@ -5110,7 +5902,12 @@ impl<'db> Type<'db> {
 
     /// Resolve the type of an `await …` expression where `self` is the type of the awaitable.
     fn try_await(self, db: &'db dyn Db) -> Result<Type<'db>, AwaitError<'db>> {
-        let await_result = self.try_call_dunder(db, "__await__", CallArguments::none());
+        let await_result = self.try_call_dunder(
+            db,
+            "__await__",
+            CallArguments::none(),
+            TypeContext::default(),
+        );
         match await_result {
             Ok(bindings) => {
                 let return_type = bindings.return_type(db);
@@ -5178,6 +5975,7 @@ impl<'db> Type<'db> {
         self,
         db: &'db dyn Db,
         argument_types: CallArguments<'_, 'db>,
+        tcx: TypeContext<'db>,
     ) -> Result<Type<'db>, ConstructorCallError<'db>> {
         debug_assert!(matches!(
             self,
@@ -5197,12 +5995,10 @@ impl<'db> Type<'db> {
                 Some(generic_context) => (
                     Some(class),
                     Some(generic_context),
-                    Type::from(class.apply_specialization(db, |_| {
-                        // It is important that identity_specialization specializes the class with
-                        // _inferable_ typevars, so that our specialization inference logic will
-                        // try to find a specialization for them.
-                        generic_context.identity_specialization(db)
-                    })),
+                    // It is important that identity_specialization specializes the class with
+                    // _inferable_ typevars, so that our specialization inference logic will
+                    // try to find a specialization for them.
+                    Type::from(class.identity_specialization(db)),
                 ),
                 _ => (None, None, self),
             },
@@ -5236,16 +6032,16 @@ impl<'db> Type<'db> {
         let new_method = self_type.lookup_dunder_new(db, ());
         let new_call_outcome = new_method.and_then(|new_method| {
             match new_method.place.try_call_dunder_get(db, self_type) {
-                Place::Type(new_method, boundness) => {
+                Place::Defined(new_method, _, boundness) => {
                     let result =
                         new_method.try_call(db, argument_types.with_self(Some(self_type)).as_ref());
-                    if boundness == Boundness::PossiblyUnbound {
+                    if boundness == Definedness::PossiblyUndefined {
                         Some(Err(DunderNewCallError::PossiblyUnbound(result.err())))
                     } else {
                         Some(result.map_err(DunderNewCallError::CallError))
                     }
                 }
-                Place::Unbound => None,
+                Place::Undefined => None,
             }
         });
 
@@ -5265,9 +6061,9 @@ impl<'db> Type<'db> {
                         | MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK,
                 )
                 .place
-                .is_unbound()
+                .is_undefined()
         {
-            Some(init_ty.try_call_dunder(db, "__init__", argument_types))
+            Some(init_ty.try_call_dunder(db, "__init__", argument_types, tcx))
         } else {
             None
         };
@@ -5297,28 +6093,19 @@ impl<'db> Type<'db> {
                     }
                 }
 
-                let new_specialization = new_call_outcome
-                    .and_then(Result::ok)
-                    .as_ref()
-                    .and_then(Bindings::single_element)
-                    .into_iter()
-                    .flat_map(CallableBinding::matching_overloads)
-                    .next()
-                    .and_then(|(_, binding)| binding.inherited_specialization())
-                    .filter(|specialization| {
-                        Some(specialization.generic_context(db)) == generic_context
-                    });
-                let init_specialization = init_call_outcome
-                    .and_then(Result::ok)
-                    .as_ref()
-                    .and_then(Bindings::single_element)
-                    .into_iter()
-                    .flat_map(CallableBinding::matching_overloads)
-                    .next()
-                    .and_then(|(_, binding)| binding.inherited_specialization())
-                    .filter(|specialization| {
-                        Some(specialization.generic_context(db)) == generic_context
-                    });
+                let specialize_constructor = |outcome: Option<Bindings<'db>>| {
+                    let (_, binding) = outcome
+                        .as_ref()?
+                        .single_element()?
+                        .matching_overloads()
+                        .next()?;
+                    binding.specialization()?.restrict(db, generic_context?)
+                };
+
+                let new_specialization =
+                    specialize_constructor(new_call_outcome.and_then(Result::ok));
+                let init_specialization =
+                    specialize_constructor(init_call_outcome.and_then(Result::ok));
                 let specialization =
                     combine_specializations(db, new_specialization, init_specialization);
                 let specialized = specialization
@@ -5364,9 +6151,6 @@ impl<'db> Type<'db> {
             // If there is no bound or constraints on a typevar `T`, `T: object` implicitly, which
             // has no instance type. Otherwise, synthesize a typevar with bound or constraints
             // mapped through `to_instance`.
-            Type::NonInferableTypeVar(bound_typevar) => {
-                Some(Type::NonInferableTypeVar(bound_typevar.to_instance(db)?))
-            }
             Type::TypeVar(bound_typevar) => Some(Type::TypeVar(bound_typevar.to_instance(db)?)),
             Type::TypeAlias(alias) => alias.value_type(db).to_instance(db),
             Type::Intersection(_) => Some(todo_type!("Type::Intersection.to_instance")),
@@ -5375,7 +6159,7 @@ impl<'db> Type<'db> {
             | Type::EnumLiteral(_)
             | Type::FunctionLiteral(_)
             | Type::Callable(..)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::BoundMethod(_)
             | Type::WrapperDescriptor(_)
             | Type::DataclassDecorator(_)
@@ -5417,7 +6201,6 @@ impl<'db> Type<'db> {
             // https://typing.python.org/en/latest/spec/special-types.html#special-cases-for-float-and-complex
             Type::ClassLiteral(class) => {
                 let ty = match class.known(db) {
-                    Some(KnownClass::Any) => Type::any(),
                     Some(KnownClass::Complex) => UnionType::from_elements(
                         db,
                         [
@@ -5451,12 +6234,11 @@ impl<'db> Type<'db> {
             | Type::LiteralString
             | Type::ModuleLiteral(_)
             | Type::StringLiteral(_)
-            | Type::NonInferableTypeVar(_)
             | Type::TypeVar(_)
             | Type::Callable(_)
             | Type::BoundMethod(_)
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             | Type::Never
@@ -5475,17 +6257,15 @@ impl<'db> Type<'db> {
             Type::KnownInstance(known_instance) => match known_instance {
                 KnownInstanceType::TypeAliasType(alias) => Ok(Type::TypeAlias(*alias)),
                 KnownInstanceType::TypeVar(typevar) => {
-                    let module = parsed_module(db, scope_id.file(db)).load(db);
                     let index = semantic_index(db, scope_id.file(db));
                     Ok(bind_typevar(
                         db,
-                        &module,
                         index,
                         scope_id.file_scope_id(db),
                         typevar_binding_context,
                         *typevar,
                     )
-                    .map(Type::NonInferableTypeVar)
+                    .map(Type::TypeVar)
                     .unwrap_or(*self))
                 }
                 KnownInstanceType::Deprecated(_) => Err(InvalidTypeExpressionError {
@@ -5496,6 +6276,10 @@ impl<'db> Type<'db> {
                     invalid_expressions: smallvec::smallvec![InvalidTypeExpression::Field],
                     fallback_type: Type::unknown(),
                 }),
+                KnownInstanceType::ConstraintSet(__call__) => Err(InvalidTypeExpressionError {
+                    invalid_expressions: smallvec::smallvec![InvalidTypeExpression::ConstraintSet],
+                    fallback_type: Type::unknown(),
+                }),
                 KnownInstanceType::SubscriptedProtocol(_) => Err(InvalidTypeExpressionError {
                     invalid_expressions: smallvec::smallvec_inline![
                         InvalidTypeExpression::Protocol
@@ -5511,6 +6295,7 @@ impl<'db> Type<'db> {
             Type::SpecialForm(special_form) => match special_form {
                 SpecialFormType::Never | SpecialFormType::NoReturn => Ok(Type::Never),
                 SpecialFormType::LiteralString => Ok(Type::LiteralString),
+                SpecialFormType::Any => Ok(Type::any()),
                 SpecialFormType::Unknown => Ok(Type::unknown()),
                 SpecialFormType::AlwaysTruthy => Ok(Type::AlwaysTruthy),
                 SpecialFormType::AlwaysFalsy => Ok(Type::AlwaysFalsy),
@@ -5541,15 +6326,14 @@ impl<'db> Type<'db> {
                 // See conversation in https://github.com/astral-sh/ruff/pull/19915.
                 SpecialFormType::NamedTuple => Ok(IntersectionBuilder::new(db)
                     .positive_elements([
-                        Type::homogeneous_tuple(db, Type::object(db)),
+                        Type::homogeneous_tuple(db, Type::object()),
                         KnownClass::NamedTupleLike.to_instance(db),
                     ])
                     .build()),
 
                 SpecialFormType::TypingSelf => {
-                    let module = parsed_module(db, scope_id.file(db)).load(db);
                     let index = semantic_index(db, scope_id.file(db));
-                    let Some(class) = nearest_enclosing_class(db, index, scope_id, &module) else {
+                    let Some(class) = nearest_enclosing_class(db, index, scope_id) else {
                         return Err(InvalidTypeExpressionError {
                             fallback_type: Type::unknown(),
                             invalid_expressions: smallvec::smallvec_inline![
@@ -5557,32 +6341,8 @@ impl<'db> Type<'db> {
                             ],
                         });
                     };
-                    let instance = Type::ClassLiteral(class).to_instance(db).expect(
-                        "nearest_enclosing_class must return type that can be instantiated",
-                    );
-                    let class_definition = class.definition(db);
-                    let typevar = TypeVarInstance::new(
-                        db,
-                        ast::name::Name::new_static("Self"),
-                        Some(class_definition),
-                        Some(TypeVarBoundOrConstraints::UpperBound(instance).into()),
-                        // According to the [spec], we can consider `Self`
-                        // equivalent to an invariant type variable
-                        // [spec]: https://typing.python.org/en/latest/spec/generics.html#self
-                        Some(TypeVarVariance::Invariant),
-                        None,
-                        TypeVarKind::TypingSelf,
-                    );
-                    Ok(bind_typevar(
-                        db,
-                        &module,
-                        index,
-                        scope_id.file_scope_id(db),
-                        typevar_binding_context,
-                        typevar,
-                    )
-                    .map(Type::NonInferableTypeVar)
-                    .unwrap_or(*self))
+
+                    Ok(typing_self(db, scope_id, typevar_binding_context, class).unwrap_or(*self))
                 }
                 SpecialFormType::TypeAlias => Ok(Type::Dynamic(DynamicType::TodoTypeAlias)),
                 SpecialFormType::TypedDict => Err(InvalidTypeExpressionError {
@@ -5614,6 +6374,8 @@ impl<'db> Type<'db> {
 
                 SpecialFormType::Optional
                 | SpecialFormType::Not
+                | SpecialFormType::Top
+                | SpecialFormType::Bottom
                 | SpecialFormType::TypeOf
                 | SpecialFormType::TypeIs
                 | SpecialFormType::TypeGuard
@@ -5680,7 +6442,7 @@ impl<'db> Type<'db> {
 
             Type::Dynamic(_) => Ok(*self),
 
-            Type::NominalInstance(instance) => match instance.class(db).known(db) {
+            Type::NominalInstance(instance) => match instance.known_class(db) {
                 Some(KnownClass::TypeVar) => Ok(todo_type!(
                     "Support for `typing.TypeVar` instances in type expressions"
                 )),
@@ -5718,7 +6480,7 @@ impl<'db> Type<'db> {
     }
 
     /// The type `NoneType` / `None`
-    pub(crate) fn none(db: &'db dyn Db) -> Type<'db> {
+    pub fn none(db: &'db dyn Db) -> Type<'db> {
         KnownClass::NoneType.to_instance(db)
     }
 
@@ -5742,7 +6504,7 @@ impl<'db> Type<'db> {
             Type::EnumLiteral(enum_literal) => Type::ClassLiteral(enum_literal.enum_class(db)),
             Type::FunctionLiteral(_) => KnownClass::FunctionType.to_class_literal(db),
             Type::BoundMethod(_) => KnownClass::MethodType.to_class_literal(db),
-            Type::MethodWrapper(_) => KnownClass::MethodWrapperType.to_class_literal(db),
+            Type::KnownBoundMethod(method) => method.class().to_class_literal(db),
             Type::WrapperDescriptor(_) => KnownClass::WrapperDescriptorType.to_class_literal(db),
             Type::DataclassDecorator(_) => KnownClass::FunctionType.to_class_literal(db),
             Type::Callable(callable) if callable.is_function_like(db) => {
@@ -5750,7 +6512,7 @@ impl<'db> Type<'db> {
             }
             Type::Callable(_) | Type::DataclassTransformer(_) => KnownClass::Type.to_instance(db),
             Type::ModuleLiteral(_) => KnownClass::ModuleType.to_class_literal(db),
-            Type::NonInferableTypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 match bound_typevar.typevar(db).bound_or_constraints(db) {
                     None => KnownClass::Type.to_instance(db),
                     Some(TypeVarBoundOrConstraints::UpperBound(bound)) => bound.to_meta_type(db),
@@ -5761,7 +6523,6 @@ impl<'db> Type<'db> {
                     }
                 }
             }
-            Type::TypeVar(_) => KnownClass::Type.to_instance(db),
 
             Type::ClassLiteral(class) => class.metaclass(db),
             Type::GenericAlias(alias) => ClassType::from(alias).metaclass(db),
@@ -5785,7 +6546,9 @@ impl<'db> Type<'db> {
             Type::AlwaysTruthy | Type::AlwaysFalsy => KnownClass::Type.to_instance(db),
             Type::BoundSuper(_) => KnownClass::Super.to_class_literal(db),
             Type::ProtocolInstance(protocol) => protocol.to_meta_type(db),
-            Type::TypedDict(typed_dict) => SubclassOfType::from(db, typed_dict.defining_class),
+            // `TypedDict` instances are instances of `dict` at runtime, but its important that we
+            // understand a more specific meta type in order to correctly handle `__getitem__`.
+            Type::TypedDict(typed_dict) => SubclassOfType::from(db, typed_dict.defining_class()),
             Type::TypeAlias(alias) => alias.value_type(db).to_meta_type(db),
         }
     }
@@ -5799,7 +6562,7 @@ impl<'db> Type<'db> {
     pub(crate) fn dunder_class(self, db: &'db dyn Db) -> Type<'db> {
         if self.is_typed_dict() {
             return KnownClass::Dict
-                .to_specialized_class_type(db, [KnownClass::Str.to_instance(db), Type::object(db)])
+                .to_specialized_class_type(db, [KnownClass::Str.to_instance(db), Type::object()])
                 .map(Type::from)
                 // Guard against user-customized typesheds with a broken `dict` class
                 .unwrap_or_else(Type::unknown);
@@ -5827,33 +6590,47 @@ impl<'db> Type<'db> {
     /// Note that this does not specialize generic classes, functions, or type aliases! That is a
     /// different operation that is performed explicitly (via a subscript operation), or implicitly
     /// via a call to the generic object.
-    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size, cycle_initial=apply_specialization_cycle_initial)]
     pub(crate) fn apply_specialization(
         self,
         db: &'db dyn Db,
         specialization: Specialization<'db>,
     ) -> Type<'db> {
-        self.apply_type_mapping(db, &TypeMapping::Specialization(specialization))
+        let new_specialization = self.apply_type_mapping(
+            db,
+            &TypeMapping::Specialization(specialization),
+            TypeContext::default(),
+        );
+        match specialization.materialization_kind(db) {
+            None => new_specialization,
+            Some(materialization_kind) => new_specialization.materialize(
+                db,
+                materialization_kind,
+                &ApplyTypeMappingVisitor::default(),
+            ),
+        }
     }
 
     fn apply_type_mapping<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
     ) -> Type<'db> {
-        self.apply_type_mapping_impl(db, type_mapping, &TypeTransformer::default())
+        self.apply_type_mapping_impl(db, type_mapping, tcx, &ApplyTypeMappingVisitor::default())
     }
 
     fn apply_type_mapping_impl<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Type<'db> {
         match self {
             Type::TypeVar(bound_typevar) => match type_mapping {
                 TypeMapping::Specialization(specialization) => {
-                    specialization.get(db, bound_typevar).unwrap_or(self)
+                     specialization.get(db, bound_typevar).unwrap_or(self).fallback_to_divergent(db)
                 }
                 TypeMapping::PartialSpecialization(partial) => {
                     partial.get(db, bound_typevar).unwrap_or(self)
@@ -5865,28 +6642,25 @@ impl<'db> Type<'db> {
                         self
                     }
                 }
-                TypeMapping::PromoteLiterals | TypeMapping::BindLegacyTypevars(_) |
-                TypeMapping::MarkTypeVarsInferable(_) => self,
-            }
-
-            Type::NonInferableTypeVar(bound_typevar) => match type_mapping {
-                TypeMapping::Specialization(specialization) => {
-                    specialization.get(db, bound_typevar).unwrap_or(self)
-                }
-                TypeMapping::PartialSpecialization(partial) => {
-                    partial.get(db, bound_typevar).unwrap_or(self)
-                }
-                TypeMapping::MarkTypeVarsInferable(binding_context) => {
-                    if bound_typevar.binding_context(db) == *binding_context {
-                        Type::TypeVar(bound_typevar)
+                TypeMapping::ReplaceSelf { new_upper_bound } => {
+                    if bound_typevar.typevar(db).is_self(db) {
+                        Type::TypeVar(
+                            BoundTypeVarInstance::synthetic_self(
+                                db,
+                                *new_upper_bound,
+                                bound_typevar.binding_context(db)
+                            )
+                        )
                     } else {
                         self
                     }
                 }
-                TypeMapping::PromoteLiterals |
-                TypeMapping::BindLegacyTypevars(_) |
-                TypeMapping::BindSelf(_)
-                    => self,
+                TypeMapping::PromoteLiterals
+                    | TypeMapping::ReplaceParameterDefaults
+                    | TypeMapping::BindLegacyTypevars(_) => self,
+                TypeMapping::Materialize(materialization_kind)  => {
+                Type::TypeVar(bound_typevar.materialize_impl(db, *materialization_kind, visitor))
+            }
             }
 
             Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) => match type_mapping {
@@ -5897,90 +6671,112 @@ impl<'db> Type<'db> {
                 TypeMapping::PartialSpecialization(_) |
                 TypeMapping::PromoteLiterals |
                 TypeMapping::BindSelf(_) |
-                TypeMapping::MarkTypeVarsInferable(_) => self,
+                TypeMapping::ReplaceSelf { .. } |
+                TypeMapping::Materialize(_) |
+                TypeMapping::ReplaceParameterDefaults => self,
             }
 
             Type::FunctionLiteral(function) => {
-                Type::FunctionLiteral(function.with_type_mapping(db, type_mapping))
+                let function = Type::FunctionLiteral(function.apply_type_mapping_impl(db, type_mapping, tcx, visitor));
+
+                match type_mapping {
+                    TypeMapping::PromoteLiterals => function.promote_literals_impl(db, tcx),
+                    _ => function
+                }
             }
 
             Type::BoundMethod(method) => Type::BoundMethod(BoundMethodType::new(
                 db,
-                method.function(db).with_type_mapping(db, type_mapping),
-                method.self_instance(db).apply_type_mapping(db, type_mapping),
+                method.function(db).apply_type_mapping_impl(db, type_mapping, tcx, visitor),
+                method.self_instance(db).apply_type_mapping_impl(db, type_mapping, tcx, visitor),
             )),
 
-            Type::NominalInstance(instance) =>
-                instance.apply_type_mapping_impl(db, type_mapping, visitor),
+            Type::NominalInstance(instance) => {
+                instance.apply_type_mapping_impl(db, type_mapping, tcx, visitor)
+            },
 
             Type::ProtocolInstance(instance) => {
-                Type::ProtocolInstance(instance.apply_type_mapping_impl(db, type_mapping, visitor))
+                // TODO: Add tests for materialization once subtyping/assignability is implemented for
+                // protocols. It _might_ require changing the logic here because:
+                //
+                // > Subtyping for protocol instances involves taking account of the fact that
+                // > read-only property members, and method members, on protocols act covariantly;
+                // > write-only property members act contravariantly; and read/write attribute
+                // > members on protocols act invariantly
+                Type::ProtocolInstance(instance.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
 
-            Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(function)) => {
-                Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(
-                    function.with_type_mapping(db, type_mapping),
+            Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(function)) => {
+                Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(
+                    function.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
                 ))
             }
 
-            Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderCall(function)) => {
-                Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderCall(
-                    function.with_type_mapping(db, type_mapping),
+            Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderCall(function)) => {
+                Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderCall(
+                    function.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
                 ))
             }
 
-            Type::MethodWrapper(MethodWrapperKind::PropertyDunderGet(property)) => {
-                Type::MethodWrapper(MethodWrapperKind::PropertyDunderGet(
-                    property.apply_type_mapping(db, type_mapping),
+            Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderGet(property)) => {
+                Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderGet(
+                    property.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
                 ))
             }
 
-            Type::MethodWrapper(MethodWrapperKind::PropertyDunderSet(property)) => {
-                Type::MethodWrapper(MethodWrapperKind::PropertyDunderSet(
-                    property.apply_type_mapping(db, type_mapping),
+            Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderSet(property)) => {
+                Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderSet(
+                    property.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
                 ))
             }
 
             Type::Callable(callable) => {
-                Type::Callable(callable.apply_type_mapping(db, type_mapping))
+                Type::Callable(callable.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
 
             Type::GenericAlias(generic) => {
-                Type::GenericAlias(generic.apply_type_mapping_impl(db, type_mapping, visitor))
+                Type::GenericAlias(generic.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
 
             Type::TypedDict(typed_dict) => {
-                Type::TypedDict(typed_dict.apply_type_mapping_impl(db, type_mapping, visitor))
+                Type::TypedDict(typed_dict.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
 
-            Type::SubclassOf(subclass_of) => Type::SubclassOf(
-                subclass_of.apply_type_mapping_impl(db, type_mapping, visitor),
-            ),
+            Type::SubclassOf(subclass_of) => subclass_of.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
 
             Type::PropertyInstance(property) => {
-                Type::PropertyInstance(property.apply_type_mapping(db, type_mapping))
+                Type::PropertyInstance(property.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
 
             Type::Union(union) => union.map(db, |element| {
-                element.apply_type_mapping_impl(db, type_mapping, visitor)
+                element.apply_type_mapping_impl(db, type_mapping, tcx, visitor)
             }),
             Type::Intersection(intersection) => {
                 let mut builder = IntersectionBuilder::new(db);
                 for positive in intersection.positive(db) {
                     builder =
-                        builder.add_positive(positive.apply_type_mapping_impl(db, type_mapping, visitor));
+                        builder.add_positive(positive.apply_type_mapping_impl(db, type_mapping, tcx, visitor));
                 }
+                let flipped_mapping = match type_mapping {
+                    TypeMapping::Materialize(materialization_kind) => &TypeMapping::Materialize(materialization_kind.flip()),
+                    _ => type_mapping,
+                };
                 for negative in intersection.negative(db) {
                     builder =
-                        builder.add_negative(negative.apply_type_mapping_impl(db, type_mapping, visitor));
+                        builder.add_negative(negative.apply_type_mapping_impl(db, flipped_mapping, tcx, visitor));
                 }
                 builder.build()
             }
 
-            Type::TypeIs(type_is) => type_is.with_type(db, type_is.return_type(db).apply_type_mapping(db, type_mapping)),
+            // TODO(jelle): Materialize should be handled differently, since TypeIs is invariant
+            Type::TypeIs(type_is) => type_is.with_type(db, type_is.return_type(db).apply_type_mapping(db, type_mapping, tcx)),
 
             Type::TypeAlias(alias) => {
-                visitor.visit(self, || alias.value_type(db).apply_type_mapping_impl(db, type_mapping, visitor))
+                // Do not call `value_type` here. `value_type` does the specialization internally, so `apply_type_mapping` is performed without `visitor` inheritance.
+                // In the case of recursive type aliases, this leads to infinite recursion.
+                // Instead, call `raw_value_type` and perform the specialization after the `visitor` cache has been created.
+                let value_type = visitor.visit(self, || alias.raw_value_type(db).apply_type_mapping_impl(db, type_mapping, tcx, visitor));
+                alias.apply_function_specialization(db, value_type).apply_type_mapping_impl(db, type_mapping, tcx, visitor)
             }
 
             Type::ModuleLiteral(_)
@@ -5994,17 +6790,31 @@ impl<'db> Type<'db> {
                 TypeMapping::PartialSpecialization(_) |
                 TypeMapping::BindLegacyTypevars(_) |
                 TypeMapping::BindSelf(_) |
-                TypeMapping::MarkTypeVarsInferable(_) => self,
-                TypeMapping::PromoteLiterals => self.literal_fallback_instance(db)
-                    .expect("literal type should have fallback instance type"),
+                TypeMapping::ReplaceSelf { .. } |
+                TypeMapping::Materialize(_) |
+                TypeMapping::ReplaceParameterDefaults => self,
+                TypeMapping::PromoteLiterals => self.promote_literals_impl(db, tcx)
             }
 
-            Type::Dynamic(_)
-            | Type::Never
+            Type::Dynamic(_) => match type_mapping {
+                TypeMapping::Specialization(_) |
+                TypeMapping::PartialSpecialization(_) |
+                TypeMapping::BindLegacyTypevars(_) |
+                TypeMapping::BindSelf(_) |
+                TypeMapping::ReplaceSelf { .. } |
+                TypeMapping::PromoteLiterals |
+                TypeMapping::ReplaceParameterDefaults => self,
+                TypeMapping::Materialize(materialization_kind) => match materialization_kind {
+                    MaterializationKind::Top => Type::object(),
+                    MaterializationKind::Bottom => Type::Never,
+                }
+            }
+
+            Type::Never
             | Type::AlwaysTruthy
             | Type::AlwaysFalsy
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(MethodWrapperKind::StrStartswith(_))
+            | Type::KnownBoundMethod(KnownBoundMethodType::StrStartswith(_) | KnownBoundMethodType::PathOpen)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             // A non-generic class never needs to be specialized. A generic class is specialized
@@ -6025,9 +6835,24 @@ impl<'db> Type<'db> {
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+    ) {
+        self.find_legacy_typevars_impl(
+            db,
+            binding_context,
+            typevars,
+            &FindLegacyTypeVarsVisitor::default(),
+        );
+    }
+
+    pub(crate) fn find_legacy_typevars_impl(
+        self,
+        db: &'db dyn Db,
+        binding_context: Option<Definition<'db>>,
+        typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self {
-            Type::NonInferableTypeVar(bound_typevar) | Type::TypeVar(bound_typevar) => {
+            Type::TypeVar(bound_typevar) => {
                 if matches!(
                     bound_typevar.typevar(db).kind(db),
                     TypeVarKind::Legacy | TypeVarKind::TypingSelf
@@ -6039,80 +6864,94 @@ impl<'db> Type<'db> {
             }
 
             Type::FunctionLiteral(function) => {
-                function.find_legacy_typevars(db, binding_context, typevars);
+                function.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::BoundMethod(method) => {
-                method
-                    .self_instance(db)
-                    .find_legacy_typevars(db, binding_context, typevars);
-                method
-                    .function(db)
-                    .find_legacy_typevars(db, binding_context, typevars);
+                method.self_instance(db).find_legacy_typevars_impl(
+                    db,
+                    binding_context,
+                    typevars,
+                    visitor,
+                );
+                method.function(db).find_legacy_typevars_impl(
+                    db,
+                    binding_context,
+                    typevars,
+                    visitor,
+                );
             }
 
-            Type::MethodWrapper(
-                MethodWrapperKind::FunctionTypeDunderGet(function)
-                | MethodWrapperKind::FunctionTypeDunderCall(function),
+            Type::KnownBoundMethod(
+                KnownBoundMethodType::FunctionTypeDunderGet(function)
+                | KnownBoundMethodType::FunctionTypeDunderCall(function),
             ) => {
-                function.find_legacy_typevars(db, binding_context, typevars);
+                function.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
-            Type::MethodWrapper(
-                MethodWrapperKind::PropertyDunderGet(property)
-                | MethodWrapperKind::PropertyDunderSet(property),
+            Type::KnownBoundMethod(
+                KnownBoundMethodType::PropertyDunderGet(property)
+                | KnownBoundMethodType::PropertyDunderSet(property),
             ) => {
-                property.find_legacy_typevars(db, binding_context, typevars);
+                property.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::Callable(callable) => {
-                callable.find_legacy_typevars(db, binding_context, typevars);
+                callable.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::PropertyInstance(property) => {
-                property.find_legacy_typevars(db, binding_context, typevars);
+                property.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::Union(union) => {
                 for element in union.elements(db) {
-                    element.find_legacy_typevars(db, binding_context, typevars);
+                    element.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
                 }
             }
             Type::Intersection(intersection) => {
                 for positive in intersection.positive(db) {
-                    positive.find_legacy_typevars(db, binding_context, typevars);
+                    positive.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
                 }
                 for negative in intersection.negative(db) {
-                    negative.find_legacy_typevars(db, binding_context, typevars);
+                    negative.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
                 }
             }
 
             Type::GenericAlias(alias) => {
-                alias.find_legacy_typevars(db, binding_context, typevars);
+                alias.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::NominalInstance(instance) => {
-                instance.find_legacy_typevars(db, binding_context, typevars);
+                instance.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::ProtocolInstance(instance) => {
-                instance.find_legacy_typevars(db, binding_context, typevars);
+                instance.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::SubclassOf(subclass_of) => {
-                subclass_of.find_legacy_typevars(db, binding_context, typevars);
+                subclass_of.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
 
             Type::TypeIs(type_is) => {
-                type_is
-                    .return_type(db)
-                    .find_legacy_typevars(db, binding_context, typevars);
+                type_is.return_type(db).find_legacy_typevars_impl(
+                    db,
+                    binding_context,
+                    typevars,
+                    visitor,
+                );
             }
 
             Type::TypeAlias(alias) => {
-                alias
-                    .value_type(db)
-                    .find_legacy_typevars(db, binding_context, typevars);
+                visitor.visit(self, || {
+                    alias.value_type(db).find_legacy_typevars_impl(
+                        db,
+                        binding_context,
+                        typevars,
+                        visitor,
+                    );
+                });
             }
 
             Type::Dynamic(_)
@@ -6120,7 +6959,9 @@ impl<'db> Type<'db> {
             | Type::AlwaysTruthy
             | Type::AlwaysFalsy
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(MethodWrapperKind::StrStartswith(_))
+            | Type::KnownBoundMethod(
+                KnownBoundMethodType::StrStartswith(_) | KnownBoundMethodType::PathOpen,
+            )
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             | Type::ModuleLiteral(_)
@@ -6138,6 +6979,15 @@ impl<'db> Type<'db> {
         }
     }
 
+    /// Replace default types in parameters of callables with `Unknown`.
+    pub(crate) fn replace_parameter_defaults(self, db: &'db dyn Db) -> Type<'db> {
+        self.apply_type_mapping(
+            db,
+            &TypeMapping::ReplaceParameterDefaults,
+            TypeContext::default(),
+        )
+    }
+
     /// Return the string representation of this type when converted to string as it would be
     /// provided by the `__str__` method.
     ///
@@ -6236,14 +7086,13 @@ impl<'db> Type<'db> {
             | Self::BytesLiteral(_)
             // TODO: For enum literals, it would be even better to jump to the definition of the specific member
             | Self::EnumLiteral(_)
-            | Self::MethodWrapper(_)
+            | Self::KnownBoundMethod(_)
             | Self::WrapperDescriptor(_)
             | Self::DataclassDecorator(_)
             | Self::DataclassTransformer(_)
             | Self::PropertyInstance(_)
             | Self::BoundSuper(_) => self.to_meta_type(db).definition(db),
 
-            Self::NonInferableTypeVar(bound_typevar) |
             Self::TypeVar(bound_typevar) => Some(TypeDefinition::TypeVar(bound_typevar.typevar(db).definition(db)?)),
 
             Self::ProtocolInstance(protocol) => match protocol.inner {
@@ -6252,7 +7101,7 @@ impl<'db> Type<'db> {
             },
 
             Type::TypedDict(typed_dict) => {
-                Some(TypeDefinition::Class(typed_dict.defining_class.definition(db)))
+                Some(TypeDefinition::Class(typed_dict.defining_class().definition(db)))
             }
 
             Self::Union(_) | Self::Intersection(_) => None,
@@ -6343,6 +7192,20 @@ impl<'db> Type<'db> {
             _ => None,
         }
     }
+
+    pub(super) fn has_divergent_type(self, db: &'db dyn Db, div: Type<'db>) -> bool {
+        any_over_type(db, self, &|ty| ty == div, false)
+    }
+
+    /// If the specialization depth of `self` exceeds the maximum limit allowed,
+    /// return `Divergent`. Otherwise, return `self`.
+    pub(super) fn fallback_to_divergent(self, db: &'db dyn Db) -> Type<'db> {
+        if exceeds_max_specialization_depth(db, self) {
+            Type::divergent(None)
+        } else {
+            self
+        }
+    }
 }
 
 impl<'db> From<&Type<'db>> for Type<'db> {
@@ -6380,20 +7243,27 @@ impl<'db> VarianceInferable<'db> for Type<'db> {
             }
             Type::GenericAlias(generic_alias) => generic_alias.variance_of(db, typevar),
             Type::Callable(callable_type) => callable_type.signatures(db).variance_of(db, typevar),
-            Type::TypeVar(other_typevar) | Type::NonInferableTypeVar(other_typevar)
-                if other_typevar == typevar =>
-            {
+            // A type variable is always covariant in itself.
+            Type::TypeVar(other_typevar) if other_typevar == typevar => {
                 // type variables are covariant in themselves
                 TypeVarVariance::Covariant
             }
             Type::ProtocolInstance(protocol_instance_type) => {
                 protocol_instance_type.variance_of(db, typevar)
             }
+            // unions are covariant in their disjuncts
             Type::Union(union_type) => union_type
                 .elements(db)
                 .iter()
                 .map(|ty| ty.variance_of(db, typevar))
                 .collect(),
+
+            // Products are covariant in their conjuncts. For negative
+            // conjuncts, they're contravariant. To see this, suppose we have
+            // `B` a subtype of `A`. A value of type `~B` could be some non-`B`
+            // `A`, and so is not assignable to `~A`. On the other hand, a value
+            // of type `~A` excludes all `A`s, and thus all `B`s, and so _is_
+            // assignable to `~B`.
             Type::Intersection(intersection_type) => intersection_type
                 .positive(db)
                 .iter()
@@ -6410,10 +7280,12 @@ impl<'db> VarianceInferable<'db> for Type<'db> {
                 .map(|ty| ty.variance_of(db, typevar))
                 .collect(),
             Type::SubclassOf(subclass_of_type) => subclass_of_type.variance_of(db, typevar),
+            Type::TypeIs(type_is_type) => type_is_type.variance_of(db, typevar),
+            Type::KnownInstance(known_instance) => known_instance.variance_of(db, typevar),
             Type::Dynamic(_)
             | Type::Never
             | Type::WrapperDescriptor(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
             | Type::ModuleLiteral(_)
@@ -6424,13 +7296,10 @@ impl<'db> VarianceInferable<'db> for Type<'db> {
             | Type::LiteralString
             | Type::BytesLiteral(_)
             | Type::SpecialForm(_)
-            | Type::KnownInstance(_)
             | Type::AlwaysFalsy
             | Type::AlwaysTruthy
             | Type::BoundSuper(_)
             | Type::TypeVar(_)
-            | Type::NonInferableTypeVar(_)
-            | Type::TypeIs(_)
             | Type::TypedDict(_)
             | Type::TypeAlias(_) => TypeVarVariance::Bivariant,
         };
@@ -6444,6 +7313,23 @@ impl<'db> VarianceInferable<'db> for Type<'db> {
     }
 }
 
+#[allow(clippy::trivially_copy_pass_by_ref)]
+fn is_redundant_with_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _subtype: Type<'db>,
+    _supertype: Type<'db>,
+) -> bool {
+    true
+}
+
+fn apply_specialization_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _self: Type<'db>,
+    _specialization: Specialization<'db>,
+) -> Type<'db> {
+    Type::Never
+}
+
 /// A mapping that can be applied to a type, producing another type. This is applied inductively to
 /// the components of complex types.
 ///
@@ -6456,81 +7342,75 @@ pub enum TypeMapping<'a, 'db> {
     Specialization(Specialization<'db>),
     /// Applies a partial specialization to the type
     PartialSpecialization(PartialSpecialization<'a, 'db>),
-    /// Promotes any literal types to their corresponding instance types (e.g. `Literal["string"]`
-    /// to `str`)
+    /// Replaces any literal types with their corresponding promoted type form (e.g. `Literal["string"]`
+    /// to `str`, or `def _() -> int` to `Callable[[], int]`).
     PromoteLiterals,
     /// Binds a legacy typevar with the generic context (class, function, type alias) that it is
     /// being used in.
     BindLegacyTypevars(BindingContext<'db>),
     /// Binds any `typing.Self` typevar with a particular `self` class.
     BindSelf(Type<'db>),
-    /// Marks the typevars that are bound by a generic class or function as inferable.
-    MarkTypeVarsInferable(BindingContext<'db>),
-}
-
-fn walk_type_mapping<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
-    db: &'db dyn Db,
-    mapping: &TypeMapping<'_, 'db>,
-    visitor: &V,
-) {
-    match mapping {
-        TypeMapping::Specialization(specialization) => {
-            walk_specialization(db, *specialization, visitor);
-        }
-        TypeMapping::PartialSpecialization(specialization) => {
-            walk_partial_specialization(db, specialization, visitor);
-        }
-        TypeMapping::BindSelf(self_type) => {
-            visitor.visit_type(db, *self_type);
-        }
-        TypeMapping::PromoteLiterals
-        | TypeMapping::BindLegacyTypevars(_)
-        | TypeMapping::MarkTypeVarsInferable(_) => {}
-    }
+    /// Replaces occurrences of `typing.Self` with a new `Self` type variable with the given upper bound.
+    ReplaceSelf { new_upper_bound: Type<'db> },
+    /// Create the top or bottom materialization of a type.
+    Materialize(MaterializationKind),
+    /// Replace default types in parameters of callables with `Unknown`. This is used to avoid infinite
+    /// recursion when the type of the default value of a parameter depends on the callable itself.
+    ReplaceParameterDefaults,
 }
 
 impl<'db> TypeMapping<'_, 'db> {
-    fn to_owned(&self) -> TypeMapping<'db, 'db> {
+    /// Update the generic context of a [`Signature`] according to the current type mapping
+    pub(crate) fn update_signature_generic_context(
+        &self,
+        db: &'db dyn Db,
+        context: GenericContext<'db>,
+    ) -> GenericContext<'db> {
         match self {
-            TypeMapping::Specialization(specialization) => {
-                TypeMapping::Specialization(*specialization)
-            }
-            TypeMapping::PartialSpecialization(partial) => {
-                TypeMapping::PartialSpecialization(partial.to_owned())
-            }
-            TypeMapping::PromoteLiterals => TypeMapping::PromoteLiterals,
-            TypeMapping::BindLegacyTypevars(binding_context) => {
-                TypeMapping::BindLegacyTypevars(*binding_context)
-            }
-            TypeMapping::BindSelf(self_type) => TypeMapping::BindSelf(*self_type),
-            TypeMapping::MarkTypeVarsInferable(binding_context) => {
-                TypeMapping::MarkTypeVarsInferable(*binding_context)
-            }
-        }
-    }
-
-    fn normalized_impl(&self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        match self {
-            TypeMapping::Specialization(specialization) => {
-                TypeMapping::Specialization(specialization.normalized_impl(db, visitor))
-            }
-            TypeMapping::PartialSpecialization(partial) => {
-                TypeMapping::PartialSpecialization(partial.normalized_impl(db, visitor))
-            }
-            TypeMapping::PromoteLiterals => TypeMapping::PromoteLiterals,
-            TypeMapping::BindLegacyTypevars(binding_context) => {
-                TypeMapping::BindLegacyTypevars(*binding_context)
-            }
-            TypeMapping::BindSelf(self_type) => {
-                TypeMapping::BindSelf(self_type.normalized_impl(db, visitor))
-            }
-            TypeMapping::MarkTypeVarsInferable(binding_context) => {
-                TypeMapping::MarkTypeVarsInferable(*binding_context)
-            }
+            TypeMapping::Specialization(_)
+            | TypeMapping::PartialSpecialization(_)
+            | TypeMapping::PromoteLiterals
+            | TypeMapping::BindLegacyTypevars(_)
+            | TypeMapping::Materialize(_)
+            | TypeMapping::ReplaceParameterDefaults => context,
+            TypeMapping::BindSelf(_) => GenericContext::from_typevar_instances(
+                db,
+                context
+                    .variables(db)
+                    .filter(|var| !var.typevar(db).is_self(db)),
+            ),
+            TypeMapping::ReplaceSelf { new_upper_bound } => GenericContext::from_typevar_instances(
+                db,
+                context.variables(db).map(|typevar| {
+                    if typevar.typevar(db).is_self(db) {
+                        BoundTypeVarInstance::synthetic_self(
+                            db,
+                            *new_upper_bound,
+                            typevar.binding_context(db),
+                        )
+                    } else {
+                        typevar
+                    }
+                }),
+            ),
         }
     }
 }
 
+/// A Salsa-tracked constraint set. This is only needed to have something appropriately small to
+/// put in a [`KnownInstance::ConstraintSet`]. We don't actually manipulate these as part of using
+/// constraint sets to check things like assignability; they're only used as a debugging aid in
+/// mdtests. That means there's no need for this to be interned; being tracked is sufficient.
+#[salsa::tracked(debug, heap_size=ruff_memory_usage::heap_size)]
+#[derive(PartialOrd, Ord)]
+pub struct TrackedConstraintSet<'db> {
+    #[returns(ref)]
+    constraints: ConstraintSet<'db>,
+}
+
+// The Salsa heap is tracked separately.
+impl get_size2::GetSize for TrackedConstraintSet<'_> {}
+
 /// Singleton types that are heavily special-cased by ty. Despite its name,
 /// quite a different type to [`NominalInstanceType`].
 ///
@@ -6573,6 +7453,10 @@ pub enum KnownInstanceType<'db> {
 
     /// A single instance of `dataclasses.Field`
     Field(FieldInstance<'db>),
+
+    /// A constraint set, which is exposed in mdtests as an instance of
+    /// `ty_extensions.ConstraintSet`.
+    ConstraintSet(TrackedConstraintSet<'db>),
 }
 
 fn walk_known_instance_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
@@ -6591,11 +7475,24 @@ fn walk_known_instance_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
         KnownInstanceType::TypeAliasType(type_alias) => {
             visitor.visit_type_alias_type(db, type_alias);
         }
-        KnownInstanceType::Deprecated(_) => {
+        KnownInstanceType::Deprecated(_) | KnownInstanceType::ConstraintSet(_) => {
             // Nothing to visit
         }
         KnownInstanceType::Field(field) => {
-            visitor.visit_type(db, field.default_type(db));
+            if let Some(default_ty) = field.default_type(db) {
+                visitor.visit_type(db, default_ty);
+            }
+        }
+    }
+}
+
+impl<'db> VarianceInferable<'db> for KnownInstanceType<'db> {
+    fn variance_of(self, db: &'db dyn Db, typevar: BoundTypeVarInstance<'db>) -> TypeVarVariance {
+        match self {
+            KnownInstanceType::TypeAliasType(type_alias) => {
+                type_alias.raw_value_type(db).variance_of(db, typevar)
+            }
+            _ => TypeVarVariance::Bivariant,
         }
     }
 }
@@ -6618,21 +7515,29 @@ impl<'db> KnownInstanceType<'db> {
                 Self::Deprecated(deprecated)
             }
             Self::Field(field) => Self::Field(field.normalized_impl(db, visitor)),
+            Self::ConstraintSet(set) => {
+                // Nothing to normalize
+                Self::ConstraintSet(set)
+            }
         }
     }
 
-    const fn class(self) -> KnownClass {
+    fn class(self, db: &'db dyn Db) -> KnownClass {
         match self {
             Self::SubscriptedProtocol(_) | Self::SubscriptedGeneric(_) => KnownClass::SpecialForm,
             Self::TypeVar(_) => KnownClass::TypeVar,
+            Self::TypeAliasType(TypeAliasType::PEP695(alias)) if alias.is_specialized(db) => {
+                KnownClass::GenericAlias
+            }
             Self::TypeAliasType(_) => KnownClass::TypeAliasType,
             Self::Deprecated(_) => KnownClass::Deprecated,
             Self::Field(_) => KnownClass::Field,
+            Self::ConstraintSet(_) => KnownClass::ConstraintSet,
         }
     }
 
     fn to_meta_type(self, db: &'db dyn Db) -> Type<'db> {
-        self.class().to_class_literal(db)
+        self.class(db).to_class_literal(db)
     }
 
     /// Return the instance type which this type is a subtype of.
@@ -6641,12 +7546,12 @@ impl<'db> KnownInstanceType<'db> {
     /// `typing.TypeAliasType`, so `KnownInstanceType::TypeAliasType(_).instance_fallback(db)`
     /// returns `Type::NominalInstance(NominalInstanceType { class: <typing.TypeAliasType> })`.
     fn instance_fallback(self, db: &dyn Db) -> Type<'_> {
-        self.class().to_instance(db)
+        self.class(db).to_instance(db)
     }
 
     /// Return `true` if this symbol is an instance of `class`.
     fn is_instance_of(self, db: &dyn Db, class: ClassType) -> bool {
-        self.class().is_subclass_of(db, class)
+        self.class(db).is_subclass_of(db, class)
     }
 
     /// Return the repr of the symbol at runtime
@@ -6667,16 +7572,45 @@ impl<'db> KnownInstanceType<'db> {
                         f.write_str("typing.Generic")?;
                         generic_context.display(self.db).fmt(f)
                     }
-                    KnownInstanceType::TypeAliasType(_) => f.write_str("typing.TypeAliasType"),
+                    KnownInstanceType::TypeAliasType(alias) => {
+                        if let Some(specialization) = alias.specialization(self.db) {
+                            f.write_str(alias.name(self.db))?;
+                            specialization
+                                .display_short(
+                                    self.db,
+                                    TupleSpecialization::No,
+                                    DisplaySettings::default(),
+                                )
+                                .fmt(f)
+                        } else {
+                            f.write_str("typing.TypeAliasType")
+                        }
+                    }
                     // This is a legacy `TypeVar` _outside_ of any generic class or function, so we render
                     // it as an instance of `typing.TypeVar`. Inside of a generic class or function, we'll
                     // have a `Type::TypeVar(_)`, which is rendered as the typevar's name.
                     KnownInstanceType::TypeVar(_) => f.write_str("typing.TypeVar"),
                     KnownInstanceType::Deprecated(_) => f.write_str("warnings.deprecated"),
                     KnownInstanceType::Field(field) => {
-                        f.write_str("dataclasses.Field[")?;
-                        field.default_type(self.db).display(self.db).fmt(f)?;
-                        f.write_str("]")
+                        f.write_str("dataclasses.Field")?;
+                        if let Some(default_ty) = field.default_type(self.db) {
+                            write!(f, "[{}]", default_ty.display(self.db))?;
+                        }
+                        Ok(())
+                    }
+                    KnownInstanceType::ConstraintSet(tracked_set) => {
+                        let constraints = tracked_set.constraints(self.db);
+                        if constraints.is_always_satisfied() {
+                            f.write_str("ty_extensions.ConstraintSet[always]")
+                        } else if constraints.is_never_satisfied() {
+                            f.write_str("ty_extensions.ConstraintSet[never]")
+                        } else {
+                            write!(
+                                f,
+                                "ty_extensions.ConstraintSet[{}]",
+                                constraints.display(self.db)
+                            )
+                        }
                     }
                 }
             }
@@ -6689,8 +7623,19 @@ impl<'db> KnownInstanceType<'db> {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, get_size2::GetSize)]
-pub enum DynamicType {
+/// A type that is determined to be divergent during recursive type inference.
+/// This type must never be eliminated by dynamic type reduction
+/// (e.g. `Divergent` is assignable to `@Todo`, but `@Todo | Divergent` must not be reducted to `@Todo`).
+/// Otherwise, type inference cannot converge properly.
+/// For detailed properties of this type, see the unit test at the end of the file.
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, salsa::Update, get_size2::GetSize)]
+pub struct DivergentType<'db> {
+    /// The scope where this divergence was detected.
+    scope: Option<ScopeId<'db>>,
+}
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, salsa::Update, get_size2::GetSize)]
+pub enum DynamicType<'db> {
     /// An explicitly annotated `typing.Any`
     Any,
     /// An unannotated value, or a dynamic type resulting from an error
@@ -6713,16 +7658,21 @@ pub enum DynamicType {
     TodoTypeAlias,
     /// A special Todo-variant for `Unpack[Ts]`, so that we can treat it specially in `Generic[Unpack[Ts]]`
     TodoUnpack,
+    /// A type that is determined to be divergent during type inference for a recursive function.
+    Divergent(DivergentType<'db>),
 }
 
-impl DynamicType {
-    #[expect(clippy::unused_self)]
+impl DynamicType<'_> {
     fn normalized(self) -> Self {
-        Self::Any
+        if matches!(self, Self::Divergent(_)) {
+            self
+        } else {
+            Self::Any
+        }
     }
 }
 
-impl std::fmt::Display for DynamicType {
+impl std::fmt::Display for DynamicType<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             DynamicType::Any => f.write_str("Any"),
@@ -6751,6 +7701,7 @@ impl std::fmt::Display for DynamicType {
                     f.write_str("@Todo")
                 }
             }
+            DynamicType::Divergent(_) => f.write_str("Divergent"),
         }
     }
 }
@@ -6765,6 +7716,16 @@ bitflags! {
         const FINAL     = 1 << 1;
         /// `dataclasses.InitVar`
         const INIT_VAR  = 1 << 2;
+        /// `typing_extensions.Required`
+        const REQUIRED = 1 << 3;
+        /// `typing_extensions.NotRequired`
+        const NOT_REQUIRED = 1 << 4;
+        /// `typing_extensions.ReadOnly`
+        const READ_ONLY = 1 << 5;
+        /// A non-standard type qualifier that marks implicit instance attributes, i.e.
+        /// instance attributes that are only implicitly defined via `self.x = …` in
+        /// the body of a class method.
+        const IMPLICIT_INSTANCE_ATTRIBUTE = 1 << 6;
     }
 }
 
@@ -6780,6 +7741,8 @@ impl TypeQualifiers {
             Self::CLASS_VAR => "ClassVar",
             Self::FINAL => "Final",
             Self::INIT_VAR => "InitVar",
+            Self::REQUIRED => "Required",
+            Self::NOT_REQUIRED => "NotRequired",
             _ => {
                 unreachable!("Only a single bit should be set when calling `TypeQualifiers::name`")
             }
@@ -6797,18 +7760,23 @@ impl TypeQualifiers {
 #[derive(Clone, Debug, Copy, Eq, PartialEq, salsa::Update, get_size2::GetSize)]
 pub(crate) struct TypeAndQualifiers<'db> {
     inner: Type<'db>,
+    origin: TypeOrigin,
     qualifiers: TypeQualifiers,
 }
 
 impl<'db> TypeAndQualifiers<'db> {
-    pub(crate) fn new(inner: Type<'db>, qualifiers: TypeQualifiers) -> Self {
-        Self { inner, qualifiers }
+    pub(crate) fn new(inner: Type<'db>, origin: TypeOrigin, qualifiers: TypeQualifiers) -> Self {
+        Self {
+            inner,
+            origin,
+            qualifiers,
+        }
     }
 
-    /// Constructor that creates a [`TypeAndQualifiers`] instance with type `Unknown` and no qualifiers.
-    pub(crate) fn unknown() -> Self {
+    pub(crate) fn declared(inner: Type<'db>) -> Self {
         Self {
-            inner: Type::unknown(),
+            inner,
+            origin: TypeOrigin::Declared,
             qualifiers: TypeQualifiers::empty(),
         }
     }
@@ -6818,6 +7786,10 @@ impl<'db> TypeAndQualifiers<'db> {
         self.inner
     }
 
+    pub(crate) fn origin(&self) -> TypeOrigin {
+        self.origin
+    }
+
     /// Insert/add an additional type qualifier.
     pub(crate) fn add_qualifier(&mut self, qualifier: TypeQualifiers) {
         self.qualifiers |= qualifier;
@@ -6829,15 +7801,6 @@ impl<'db> TypeAndQualifiers<'db> {
     }
 }
 
-impl<'db> From<Type<'db>> for TypeAndQualifiers<'db> {
-    fn from(inner: Type<'db>) -> Self {
-        Self {
-            inner,
-            qualifiers: TypeQualifiers::empty(),
-        }
-    }
-}
-
 /// Error struct providing information on type(s) that were deemed to be invalid
 /// in a type expression context, and the type we should therefore fallback to
 /// for the problematic type expression.
@@ -6888,6 +7851,8 @@ enum InvalidTypeExpression<'db> {
     Deprecated,
     /// Same for `dataclasses.Field`
     Field,
+    /// Same for `ty_extensions.ConstraintSet`
+    ConstraintSet,
     /// Same for `typing.TypedDict`
     TypedDict,
     /// Type qualifiers are always invalid in *type expressions*,
@@ -6937,6 +7902,9 @@ impl<'db> InvalidTypeExpression<'db> {
                     InvalidTypeExpression::Field => {
                         f.write_str("`dataclasses.Field` is not allowed in type expressions")
                     }
+                    InvalidTypeExpression::ConstraintSet => {
+                        f.write_str("`ty_extensions.ConstraintSet` is not allowed in type expressions")
+                    }
                     InvalidTypeExpression::TypedDict => {
                         f.write_str(
                             "The special form `typing.TypedDict` is not allowed in type expressions. \
@@ -6978,7 +7946,7 @@ impl<'db> InvalidTypeExpression<'db> {
         let Some(module_member_with_same_name) = ty
             .member(db, module_name_final_part)
             .place
-            .ignore_possibly_unbound()
+            .ignore_possibly_undefined()
         else {
             return;
         };
@@ -7015,13 +7983,16 @@ impl get_size2::GetSize for DeprecatedInstance<'_> {}
 pub struct FieldInstance<'db> {
     /// The type of the default value for this field. This is derived from the `default` or
     /// `default_factory` arguments to `dataclasses.field()`.
-    pub default_type: Type<'db>,
+    pub default_type: Option<Type<'db>>,
 
     /// Whether this field is part of the `__init__` signature, or not.
     pub init: bool,
 
     /// Whether or not this field can only be passed as a keyword argument to `__init__`.
     pub kw_only: Option<bool>,
+
+    /// This name is used to provide an alternative parameter name in the synthesized `__init__` method.
+    pub alias: Option<Box<str>>,
 }
 
 // The Salsa heap is tracked separately.
@@ -7031,9 +8002,11 @@ impl<'db> FieldInstance<'db> {
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
         FieldInstance::new(
             db,
-            self.default_type(db).normalized_impl(db, visitor),
+            self.default_type(db)
+                .map(|ty| ty.normalized_impl(db, visitor)),
             self.init(db),
             self.kw_only(db),
+            self.alias(db),
         )
     }
 }
@@ -7050,7 +8023,38 @@ pub enum TypeVarKind {
     TypingSelf,
 }
 
-/// A type variable that has not been bound to a generic context yet.
+impl TypeVarKind {
+    const fn is_self(self) -> bool {
+        matches!(self, Self::TypingSelf)
+    }
+}
+
+/// The identity of a type variable.
+///
+/// This represents the core identity of a typevar, independent of its bounds or constraints. Two
+/// typevars have the same identity if they represent the same logical typevar, even if their
+/// bounds have been materialized differently.
+///
+/// # Ordering
+/// Ordering is based on the identity's salsa-assigned id and not on its values.
+/// The id may change between runs, or when the identity was garbage collected and recreated.
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+#[derive(PartialOrd, Ord)]
+pub struct TypeVarIdentity<'db> {
+    /// The name of this TypeVar (e.g. `T`)
+    #[returns(ref)]
+    pub(crate) name: ast::name::Name,
+
+    /// The type var's definition (None if synthesized)
+    pub(crate) definition: Option<Definition<'db>>,
+
+    /// The kind of typevar (PEP 695, Legacy, or TypingSelf)
+    pub(crate) kind: TypeVarKind,
+}
+
+impl get_size2::GetSize for TypeVarIdentity<'_> {}
+
+/// A specific instance of a type variable that has not been bound to a generic context yet.
 ///
 /// This is usually not the type that you want; if you are working with a typevar, in a generic
 /// context, which might be specialized to a concrete type, you want [`BoundTypeVarInstance`]. This
@@ -7089,12 +8093,8 @@ pub enum TypeVarKind {
 #[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
 #[derive(PartialOrd, Ord)]
 pub struct TypeVarInstance<'db> {
-    /// The name of this TypeVar (e.g. `T`)
-    #[returns(ref)]
-    name: ast::name::Name,
-
-    /// The type var's definition (None if synthesized)
-    pub definition: Option<Definition<'db>>,
+    /// The identity of this typevar
+    pub(crate) identity: TypeVarIdentity<'db>,
 
     /// The upper bound or constraint on the type of this TypeVar, if any. Don't use this field
     /// directly; use the `bound_or_constraints` (or `upper_bound` and `constraints`) methods
@@ -7107,8 +8107,6 @@ pub struct TypeVarInstance<'db> {
     /// The default type for this TypeVar, if any. Don't use this field directly, use the
     /// `default_type` method instead (to evaluate any lazy default).
     _default: Option<TypeVarDefaultEvaluation<'db>>,
-
-    pub kind: TypeVarKind,
 }
 
 // The Salsa heap is tracked separately.
@@ -7119,10 +8117,27 @@ fn walk_type_var_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
     typevar: TypeVarInstance<'db>,
     visitor: &V,
 ) {
-    if let Some(bounds) = typevar.bound_or_constraints(db) {
-        walk_type_var_bounds(db, bounds, visitor);
+    if let Some(bound_or_constraints) = if visitor.should_visit_lazy_type_attributes() {
+        typevar.bound_or_constraints(db)
+    } else {
+        match typevar._bound_or_constraints(db) {
+            _ if visitor.should_visit_lazy_type_attributes() => typevar.bound_or_constraints(db),
+            Some(TypeVarBoundOrConstraintsEvaluation::Eager(bound_or_constraints)) => {
+                Some(bound_or_constraints)
+            }
+            _ => None,
+        }
+    } {
+        walk_type_var_bounds(db, bound_or_constraints, visitor);
     }
-    if let Some(default_type) = typevar.default_type(db) {
+    if let Some(default_type) = if visitor.should_visit_lazy_type_attributes() {
+        typevar.default_type(db)
+    } else {
+        match typevar._default(db) {
+            Some(TypeVarDefaultEvaluation::Eager(default_type)) => Some(default_type),
+            _ => None,
+        }
+    } {
         visitor.visit_type(db, default_type);
     }
 }
@@ -7137,6 +8152,18 @@ impl<'db> TypeVarInstance<'db> {
         BoundTypeVarInstance::new(db, self, BindingContext::Definition(binding_context))
     }
 
+    pub(crate) fn name(self, db: &'db dyn Db) -> &'db ast::name::Name {
+        self.identity(db).name(db)
+    }
+
+    pub(crate) fn definition(self, db: &'db dyn Db) -> Option<Definition<'db>> {
+        self.identity(db).definition(db)
+    }
+
+    pub(crate) fn kind(self, db: &'db dyn Db) -> TypeVarKind {
+        self.identity(db).kind(db)
+    }
+
     pub(crate) fn is_self(self, db: &'db dyn Db) -> bool {
         matches!(self.kind(db), TypeVarKind::TypingSelf)
     }
@@ -7180,8 +8207,7 @@ impl<'db> TypeVarInstance<'db> {
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
         Self::new(
             db,
-            self.name(db),
-            self.definition(db),
+            self.identity(db),
             self._bound_or_constraints(db)
                 .and_then(|bound_or_constraints| match bound_or_constraints {
                     TypeVarBoundOrConstraintsEvaluation::Eager(bound_or_constraints) => {
@@ -7201,35 +8227,49 @@ impl<'db> TypeVarInstance<'db> {
                     .lazy_default(db)
                     .map(|ty| ty.normalized_impl(db, visitor).into()),
             }),
-            self.kind(db),
         )
     }
 
-    fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
+    fn materialize_impl(
+        self,
+        db: &'db dyn Db,
+        materialization_kind: MaterializationKind,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         Self::new(
             db,
-            self.name(db),
-            self.definition(db),
+            self.identity(db),
             self._bound_or_constraints(db)
                 .and_then(|bound_or_constraints| match bound_or_constraints {
-                    TypeVarBoundOrConstraintsEvaluation::Eager(bound_or_constraints) => {
-                        Some(bound_or_constraints.materialize(db, variance).into())
+                    TypeVarBoundOrConstraintsEvaluation::Eager(bound_or_constraints) => Some(
+                        bound_or_constraints
+                            .materialize_impl(db, materialization_kind, visitor)
+                            .into(),
+                    ),
+                    TypeVarBoundOrConstraintsEvaluation::LazyUpperBound => {
+                        self.lazy_bound(db).map(|bound| {
+                            bound
+                                .materialize_impl(db, materialization_kind, visitor)
+                                .into()
+                        })
+                    }
+                    TypeVarBoundOrConstraintsEvaluation::LazyConstraints => {
+                        self.lazy_constraints(db).map(|constraints| {
+                            constraints
+                                .materialize_impl(db, materialization_kind, visitor)
+                                .into()
+                        })
                     }
-                    TypeVarBoundOrConstraintsEvaluation::LazyUpperBound => self
-                        .lazy_bound(db)
-                        .map(|bound| bound.materialize(db, variance).into()),
-                    TypeVarBoundOrConstraintsEvaluation::LazyConstraints => self
-                        .lazy_constraints(db)
-                        .map(|constraints| constraints.materialize(db, variance).into()),
                 }),
             self.explicit_variance(db),
             self._default(db).and_then(|default| match default {
-                TypeVarDefaultEvaluation::Eager(ty) => Some(ty.materialize(db, variance).into()),
+                TypeVarDefaultEvaluation::Eager(ty) => {
+                    Some(ty.materialize(db, materialization_kind, visitor).into())
+                }
                 TypeVarDefaultEvaluation::Lazy => self
                     .lazy_default(db)
-                    .map(|ty| ty.materialize(db, variance).into()),
+                    .map(|ty| ty.materialize(db, materialization_kind, visitor).into()),
             }),
-            self.kind(db),
         )
     }
 
@@ -7239,54 +8279,144 @@ impl<'db> TypeVarInstance<'db> {
                 TypeVarBoundOrConstraints::UpperBound(upper_bound.to_instance(db)?)
             }
             TypeVarBoundOrConstraints::Constraints(constraints) => {
-                TypeVarBoundOrConstraints::Constraints(constraints.to_instance(db)?.into_union()?)
+                TypeVarBoundOrConstraints::Constraints(constraints.to_instance(db)?.as_union()?)
             }
         };
-        Some(Self::new(
+        let identity = TypeVarIdentity::new(
             db,
             Name::new(format!("{}'instance", self.name(db))),
-            None,
+            None, // definition
+            self.kind(db),
+        );
+        Some(Self::new(
+            db,
+            identity,
             Some(bound_or_constraints.into()),
             self.explicit_variance(db),
-            None,
-            self.kind(db),
+            None, // _default
         ))
     }
 
-    #[salsa::tracked]
+    #[salsa::tracked(
+        cycle_initial=lazy_bound_or_constraints_cycle_initial,
+        heap_size=ruff_memory_usage::heap_size
+    )]
     fn lazy_bound(self, db: &'db dyn Db) -> Option<TypeVarBoundOrConstraints<'db>> {
         let definition = self.definition(db)?;
         let module = parsed_module(db, definition.file(db)).load(db);
-        let typevar_node = definition.kind(db).as_typevar()?.node(&module);
-        let ty = definition_expression_type(db, definition, typevar_node.bound.as_ref()?);
+        let ty = match definition.kind(db) {
+            // PEP 695 typevar
+            DefinitionKind::TypeVar(typevar) => {
+                let typevar_node = typevar.node(&module);
+                definition_expression_type(db, definition, typevar_node.bound.as_ref()?)
+            }
+            // legacy typevar
+            DefinitionKind::Assignment(assignment) => {
+                let call_expr = assignment.value(&module).as_call_expr()?;
+                let expr = &call_expr.arguments.find_keyword("bound")?.value;
+                definition_expression_type(db, definition, expr)
+            }
+            _ => return None,
+        };
         Some(TypeVarBoundOrConstraints::UpperBound(ty))
     }
 
-    #[salsa::tracked]
+    #[salsa::tracked(
+        cycle_initial=lazy_bound_or_constraints_cycle_initial,
+        heap_size=ruff_memory_usage::heap_size
+    )]
     fn lazy_constraints(self, db: &'db dyn Db) -> Option<TypeVarBoundOrConstraints<'db>> {
         let definition = self.definition(db)?;
         let module = parsed_module(db, definition.file(db)).load(db);
-        let typevar_node = definition.kind(db).as_typevar()?.node(&module);
-        let ty = definition_expression_type(db, definition, typevar_node.bound.as_ref()?)
-            .into_union()?;
+        let ty = match definition.kind(db) {
+            // PEP 695 typevar
+            DefinitionKind::TypeVar(typevar) => {
+                let typevar_node = typevar.node(&module);
+                definition_expression_type(db, definition, typevar_node.bound.as_ref()?)
+                    .as_union()?
+            }
+            // legacy typevar
+            DefinitionKind::Assignment(assignment) => {
+                let call_expr = assignment.value(&module).as_call_expr()?;
+                // We don't use `UnionType::from_elements` or `UnionBuilder` here,
+                // because we don't want to simplify the list of constraints as we would with
+                // an actual union type.
+                // TODO: We probably shouldn't use `UnionType` to store these at all? TypeVar
+                // constraints are not a union.
+                UnionType::new(
+                    db,
+                    call_expr
+                        .arguments
+                        .args
+                        .iter()
+                        .skip(1)
+                        .map(|arg| definition_expression_type(db, definition, arg))
+                        .collect::<Box<_>>(),
+                )
+            }
+            _ => return None,
+        };
         Some(TypeVarBoundOrConstraints::Constraints(ty))
     }
 
-    #[salsa::tracked]
+    #[salsa::tracked(cycle_initial=lazy_default_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     fn lazy_default(self, db: &'db dyn Db) -> Option<Type<'db>> {
         let definition = self.definition(db)?;
         let module = parsed_module(db, definition.file(db)).load(db);
-        let typevar_node = definition.kind(db).as_typevar()?.node(&module);
-        Some(definition_expression_type(
-            db,
-            definition,
-            typevar_node.default.as_ref()?,
-        ))
+        match definition.kind(db) {
+            // PEP 695 typevar
+            DefinitionKind::TypeVar(typevar) => {
+                let typevar_node = typevar.node(&module);
+                Some(definition_expression_type(
+                    db,
+                    definition,
+                    typevar_node.default.as_ref()?,
+                ))
+            }
+            // legacy typevar
+            DefinitionKind::Assignment(assignment) => {
+                let call_expr = assignment.value(&module).as_call_expr()?;
+                let expr = &call_expr.arguments.find_keyword("default")?.value;
+                Some(definition_expression_type(db, definition, expr))
+            }
+            _ => None,
+        }
+    }
+
+    pub fn bind_pep695(self, db: &'db dyn Db) -> Option<BoundTypeVarInstance<'db>> {
+        if self.identity(db).kind(db) != TypeVarKind::Pep695 {
+            return None;
+        }
+        let typevar_definition = self.definition(db)?;
+        let index = semantic_index(db, typevar_definition.file(db));
+        let (_, child) = index
+            .child_scopes(typevar_definition.file_scope(db))
+            .next()?;
+        child
+            .node()
+            .generic_context(db, index)?
+            .binds_typevar(db, self)
     }
 }
 
+fn lazy_bound_or_constraints_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _self: TypeVarInstance<'db>,
+) -> Option<TypeVarBoundOrConstraints<'db>> {
+    None
+}
+
+fn lazy_default_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _self: TypeVarInstance<'db>,
+) -> Option<Type<'db>> {
+    None
+}
+
 /// Where a type variable is bound and usable.
-#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, salsa::Update, get_size2::GetSize)]
+#[derive(
+    Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, salsa::Update, get_size2::GetSize,
+)]
 pub enum BindingContext<'db> {
     /// The definition of the generic class, function, or type alias that binds this typevar.
     Definition(Definition<'db>),
@@ -7295,13 +8425,37 @@ pub enum BindingContext<'db> {
     Synthetic,
 }
 
+impl<'db> From<Definition<'db>> for BindingContext<'db> {
+    fn from(definition: Definition<'db>) -> Self {
+        BindingContext::Definition(definition)
+    }
+}
+
 impl<'db> BindingContext<'db> {
-    fn name(self, db: &'db dyn Db) -> Option<String> {
+    pub(crate) fn definition(self) -> Option<Definition<'db>> {
         match self {
-            BindingContext::Definition(definition) => definition.name(db),
+            BindingContext::Definition(definition) => Some(definition),
             BindingContext::Synthetic => None,
         }
     }
+
+    fn name(self, db: &'db dyn Db) -> Option<String> {
+        self.definition().and_then(|definition| definition.name(db))
+    }
+}
+
+/// The identity of a bound type variable.
+///
+/// This identifies a specific binding of a typevar to a context (e.g., `T@ClassC` vs `T@FunctionF`),
+/// independent of the typevar's bounds or constraints. Two bound typevars have the same identity
+/// if they represent the same logical typevar bound in the same context, even if their bounds
+/// have been materialized differently.
+#[derive(
+    Debug, Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd, get_size2::GetSize, salsa::Update,
+)]
+pub struct BoundTypeVarIdentity<'db> {
+    pub(crate) identity: TypeVarIdentity<'db>,
+    pub(crate) binding_context: BindingContext<'db>,
 }
 
 /// A type variable that has been bound to a generic context, and which can be specialized to a
@@ -7317,6 +8471,62 @@ pub struct BoundTypeVarInstance<'db> {
 impl get_size2::GetSize for BoundTypeVarInstance<'_> {}
 
 impl<'db> BoundTypeVarInstance<'db> {
+    /// Get the identity of this bound typevar.
+    ///
+    /// This is used for comparing whether two bound typevars represent the same logical typevar,
+    /// regardless of e.g. differences in their bounds or constraints due to materialization.
+    pub(crate) fn identity(self, db: &'db dyn Db) -> BoundTypeVarIdentity<'db> {
+        BoundTypeVarIdentity {
+            identity: self.typevar(db).identity(db),
+            binding_context: self.binding_context(db),
+        }
+    }
+
+    /// Create a new PEP 695 type variable that can be used in signatures
+    /// of synthetic generic functions.
+    pub(crate) fn synthetic(
+        db: &'db dyn Db,
+        name: &'static str,
+        variance: TypeVarVariance,
+    ) -> Self {
+        let identity = TypeVarIdentity::new(
+            db,
+            Name::new_static(name),
+            None, // definition
+            TypeVarKind::Pep695,
+        );
+        let typevar = TypeVarInstance::new(
+            db,
+            identity,
+            None, // _bound_or_constraints
+            Some(variance),
+            None, // _default
+        );
+        Self::new(db, typevar, BindingContext::Synthetic)
+    }
+
+    /// Create a new synthetic `Self` type variable with the given upper bound.
+    pub(crate) fn synthetic_self(
+        db: &'db dyn Db,
+        upper_bound: Type<'db>,
+        binding_context: BindingContext<'db>,
+    ) -> Self {
+        let identity = TypeVarIdentity::new(
+            db,
+            Name::new_static("Self"),
+            None, // definition
+            TypeVarKind::TypingSelf,
+        );
+        let typevar = TypeVarInstance::new(
+            db,
+            identity,
+            Some(TypeVarBoundOrConstraints::UpperBound(upper_bound).into()),
+            Some(TypeVarVariance::Invariant),
+            None, // _default
+        );
+        Self::new(db, typevar, binding_context)
+    }
+
     pub(crate) fn variance_with_polarity(
         self,
         db: &'db dyn Db,
@@ -7338,7 +8548,7 @@ impl<'db> BoundTypeVarInstance<'db> {
         }
     }
 
-    pub(crate) fn variance(self, db: &'db dyn Db) -> TypeVarVariance {
+    pub fn variance(self, db: &'db dyn Db) -> TypeVarVariance {
         self.variance_with_polarity(db, TypeVarVariance::Covariant)
     }
 }
@@ -7376,9 +8586,13 @@ impl<'db> BoundTypeVarInstance<'db> {
     /// (resulting in `T@C`).
     pub(crate) fn default_type(self, db: &'db dyn Db) -> Option<Type<'db>> {
         let binding_context = self.binding_context(db);
-        self.typevar(db)
-            .default_type(db)
-            .map(|ty| ty.apply_type_mapping(db, &TypeMapping::BindLegacyTypevars(binding_context)))
+        self.typevar(db).default_type(db).map(|ty| {
+            ty.apply_type_mapping(
+                db,
+                &TypeMapping::BindLegacyTypevars(binding_context),
+                TypeContext::default(),
+            )
+        })
     }
 
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
@@ -7389,10 +8603,16 @@ impl<'db> BoundTypeVarInstance<'db> {
         )
     }
 
-    fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
+    fn materialize_impl(
+        self,
+        db: &'db dyn Db,
+        materialization_kind: MaterializationKind,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         Self::new(
             db,
-            self.typevar(db).materialize(db, variance),
+            self.typevar(db)
+                .materialize_impl(db, materialization_kind, visitor),
             self.binding_context(db),
         )
     }
@@ -7464,23 +8684,38 @@ impl<'db> TypeVarBoundOrConstraints<'db> {
                 TypeVarBoundOrConstraints::UpperBound(bound.normalized_impl(db, visitor))
             }
             TypeVarBoundOrConstraints::Constraints(constraints) => {
-                TypeVarBoundOrConstraints::Constraints(constraints.normalized_impl(db, visitor))
+                // Constraints are a non-normalized union by design (it's not really a union at
+                // all, we are just using a union to store the types). Normalize the types but not
+                // the containing union.
+                TypeVarBoundOrConstraints::Constraints(UnionType::new(
+                    db,
+                    constraints
+                        .elements(db)
+                        .iter()
+                        .map(|ty| ty.normalized_impl(db, visitor))
+                        .collect::<Box<_>>(),
+                ))
             }
         }
     }
 
-    fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
+    fn materialize_impl(
+        self,
+        db: &'db dyn Db,
+        materialization_kind: MaterializationKind,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         match self {
-            TypeVarBoundOrConstraints::UpperBound(bound) => {
-                TypeVarBoundOrConstraints::UpperBound(bound.materialize(db, variance))
-            }
+            TypeVarBoundOrConstraints::UpperBound(bound) => TypeVarBoundOrConstraints::UpperBound(
+                bound.materialize(db, materialization_kind, visitor),
+            ),
             TypeVarBoundOrConstraints::Constraints(constraints) => {
                 TypeVarBoundOrConstraints::Constraints(UnionType::new(
                     db,
                     constraints
                         .elements(db)
                         .iter()
-                        .map(|ty| ty.materialize(db, variance))
+                        .map(|ty| ty.materialize(db, materialization_kind, visitor))
                         .collect::<Vec<_>>()
                         .into_boxed_slice(),
                 ))
@@ -7545,7 +8780,7 @@ impl<'db> AwaitError<'db> {
                 }
             }
             Self::Call(CallDunderError::PossiblyUnbound(bindings)) => {
-                diag.info("`__await__` is possibly unbound");
+                diag.info("`__await__` may be missing");
                 if let Some(definition_spans) = bindings.callable_type().function_spans(db) {
                     diag.annotate(
                         Annotation::secondary(definition_spans.signature)
@@ -7652,7 +8887,7 @@ impl<'db> ContextManagerError<'db> {
             match call_dunder_error {
                 CallDunderError::MethodNotAvailable => format!("it does not implement `{name}`"),
                 CallDunderError::PossiblyUnbound(_) => {
-                    format!("the method `{name}` is possibly unbound")
+                    format!("the method `{name}` may be missing")
                 }
                 // TODO: Use more specific error messages for the different error cases.
                 //  E.g. hint toward the union variant that doesn't correctly implement enter,
@@ -7669,7 +8904,7 @@ impl<'db> ContextManagerError<'db> {
                                          name_b: &str| {
             match (error_a, error_b) {
                 (CallDunderError::PossiblyUnbound(_), CallDunderError::PossiblyUnbound(_)) => {
-                    format!("the methods `{name_a}` and `{name_b}` are possibly unbound")
+                    format!("the methods `{name_a}` and `{name_b}` are possibly missing")
                 }
                 (CallDunderError::MethodNotAvailable, CallDunderError::MethodNotAvailable) => {
                     format!("it does not implement `{name_a}` and `{name_b}`")
@@ -7720,12 +8955,17 @@ impl<'db> ContextManagerError<'db> {
             EvaluationMode::Async => ("sync", "__enter__", "__exit__", "with"),
         };
 
-        let alt_enter =
-            context_expression_type.try_call_dunder(db, alt_enter_method, CallArguments::none());
+        let alt_enter = context_expression_type.try_call_dunder(
+            db,
+            alt_enter_method,
+            CallArguments::none(),
+            TypeContext::default(),
+        );
         let alt_exit = context_expression_type.try_call_dunder(
             db,
             alt_exit_method,
             CallArguments::positional([Type::unknown(), Type::unknown(), Type::unknown()]),
+            TypeContext::default(),
         );
 
         if (alt_enter.is_ok() || matches!(alt_enter, Err(CallDunderError::CallError(..))))
@@ -7821,6 +9061,7 @@ impl<'db> IterationError<'db> {
                         db,
                         "__anext__",
                         CallArguments::none(),
+                        TypeContext::default(),
                     ))
                     .and_then(|ty| ty.try_await(db).ok())
                 } else {
@@ -7828,6 +9069,7 @@ impl<'db> IterationError<'db> {
                         db,
                         "__next__",
                         CallArguments::none(),
+                        TypeContext::default(),
                     ))
                 }
             }
@@ -8218,7 +9460,7 @@ pub(super) enum BoolError<'db> {
 
     /// Any other reason why the type can't be converted to a bool.
     /// E.g. because calling `__bool__` returns in a union type and not all variants support `__bool__` or
-    /// because `__bool__` points to a type that has a possibly unbound `__call__` method.
+    /// because `__bool__` points to a type that has a possibly missing `__call__` method.
     Other { not_boolable_type: Type<'db> },
 }
 
@@ -8391,7 +9633,7 @@ impl<'db> ConstructorCallError<'db> {
         let report_init_error = |call_dunder_error: &CallDunderError<'db>| match call_dunder_error {
             CallDunderError::MethodNotAvailable => {
                 if let Some(builder) =
-                    context.report_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL, context_expression_node)
+                    context.report_lint(&POSSIBLY_MISSING_IMPLICIT_CALL, context_expression_node)
                 {
                     // If we are using vendored typeshed, it should be impossible to have missing
                     // or unbound `__init__` method on a class, as all classes have `object` in MRO.
@@ -8405,10 +9647,10 @@ impl<'db> ConstructorCallError<'db> {
             }
             CallDunderError::PossiblyUnbound(bindings) => {
                 if let Some(builder) =
-                    context.report_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL, context_expression_node)
+                    context.report_lint(&POSSIBLY_MISSING_IMPLICIT_CALL, context_expression_node)
                 {
                     builder.into_diagnostic(format_args!(
-                        "Method `__init__` on type `{}` is possibly unbound.",
+                        "Method `__init__` on type `{}` may be missing.",
                         context_expression_type.display(context.db()),
                     ));
                 }
@@ -8423,10 +9665,10 @@ impl<'db> ConstructorCallError<'db> {
         let report_new_error = |error: &DunderNewCallError<'db>| match error {
             DunderNewCallError::PossiblyUnbound(call_error) => {
                 if let Some(builder) =
-                    context.report_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL, context_expression_node)
+                    context.report_lint(&POSSIBLY_MISSING_IMPLICIT_CALL, context_expression_node)
                 {
                     builder.into_diagnostic(format_args!(
-                        "Method `__new__` on type `{}` is possibly unbound.",
+                        "Method `__new__` on type `{}` may be missing.",
                         context_expression_type.display(context.db()),
                     ));
                 }
@@ -8455,19 +9697,141 @@ impl<'db> ConstructorCallError<'db> {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+/// A non-exhaustive enumeration of relations that can exist between types.
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub(crate) enum TypeRelation {
+    /// The "subtyping" relation.
+    ///
+    /// A [fully static] type `B` is a subtype of a fully static type `A` if and only if
+    /// the set of possible runtime values represented by `B` is a subset of the set
+    /// of possible runtime values represented by `A`.
+    ///
+    /// For a pair of types `C` and `D` that may or may not be fully static,
+    /// `D` can be said to be a subtype of `C` if every possible fully static
+    /// [materialization] of `D` is a subtype of every possible fully static
+    /// materialization of `C`. Another way of saying this is that `D` will be a
+    /// subtype of `C` if and only if the union of all possible sets of values
+    /// represented by `D` (the "top materialization" of `D`) is a subtype of the
+    /// intersection of all possible sets of values represented by `C` (the "bottom
+    /// materialization" of `C`). More concisely: `D <: C` iff `Top[D] <: Bottom[C]`.
+    ///
+    /// For example, `list[Any]` can be said to be a subtype of `Sequence[object]`,
+    /// because every possible fully static materialization of `list[Any]` (`list[int]`,
+    /// `list[str]`, `list[bytes | bool]`, `list[SupportsIndex]`, etc.) would be
+    /// considered a subtype of `Sequence[object]`.
+    ///
+    /// Note that this latter expansion of the subtyping relation to non-fully-static
+    /// types is not described in the typing spec, but this expansion to gradual types is
+    /// sound and consistent with the principles laid out in the spec. This definition
+    /// does mean the subtyping relation is not reflexive for non-fully-static types
+    /// (e.g. `Any` is not a subtype of `Any`).
+    ///
+    /// [fully static]: https://typing.python.org/en/latest/spec/glossary.html#term-fully-static-type
+    /// [materialization]: https://typing.python.org/en/latest/spec/glossary.html#term-materialize
     Subtyping,
+
+    /// The "assignability" relation.
+    ///
+    /// The assignability relation between two types `A` and `B` dictates whether a
+    /// type checker should emit an error when a value of type `B` is assigned to a
+    /// variable declared as having type `A`.
+    ///
+    /// For a pair of [fully static] types `A` and `B`, the assignability relation
+    /// between `A` and `B` is the same as the subtyping relation.
+    ///
+    /// Between a pair of `C` and `D` where either `C` or `D` is not fully static, the
+    /// assignability relation may be more permissive than the subtyping relation. `D`
+    /// can be said to be assignable to `C` if *some* possible fully static [materialization]
+    /// of `D` is a subtype of *some* possible fully static materialization of `C`.
+    /// Another way of saying this is that `D` will be assignable to `C` if and only if the
+    /// intersection of all possible sets of values represented by `D` (the "bottom
+    /// materialization" of `D`) is a subtype of the union of all possible sets of values
+    /// represented by `C` (the "top materialization" of `C`).
+    /// More concisely: `D <: C` iff `Bottom[D] <: Top[C]`.
+    ///
+    /// For example, `Any` is not a subtype of `int`, because there are possible
+    /// materializations of `Any` (e.g., `str`) that are not subtypes of `int`.
+    /// `Any` is *assignable* to `int`, however, as there are *some* possible materializations
+    /// of `Any` (such as `int` itself!) that *are* subtypes of `int`. `Any` cannot even
+    /// be considered a subtype of itself, as two separate uses of `Any` in the same scope
+    /// might materialize to different types between which there would exist no subtyping
+    /// relation; nor is `Any` a subtype of `int | Any`, for the same reason. Nonetheless,
+    /// `Any` is assignable to both `Any` and `int | Any`.
+    ///
+    /// While `Any` can materialize to anything, the presence of `Any` in a type does not
+    /// necessarily make it assignable to everything. For example, `list[Any]` is not
+    /// assignable to `int`, because there are no possible fully static types we could
+    /// substitute for `Any` in this type that would make it a subtype of `int`. For the
+    /// same reason, a union such as `str | Any` is not assignable to `int`.
+    ///
+    /// [fully static]: https://typing.python.org/en/latest/spec/glossary.html#term-fully-static-type
+    /// [materialization]: https://typing.python.org/en/latest/spec/glossary.html#term-materialize
     Assignability,
+
+    /// The "redundancy" relation.
+    ///
+    /// The redundancy relation dictates whether the union `A | B` can be safely simplified
+    /// to the type `A` without downstream consequences on ty's inference of types elsewhere.
+    ///
+    /// For a pair of [fully static] types `A` and `B`, the redundancy relation between `A`
+    /// and `B` is the same as the subtyping relation.
+    ///
+    /// Between a pair of `C` and `D` where either `C` or `D` is not fully static, the
+    /// redundancy relation sits in between the subtyping relation and the assignability relation.
+    /// `D` can be said to be redundant in a union with `C` if the top materialization of the type
+    /// `C | D` is equivalent to the top materialization of `C`, *and* the bottom materialization
+    /// of `C | D` is equivalent to the bottom materialization of `C`.
+    /// More concisely: `D <: C` iff `Top[C | D] == Top[C]` AND `Bottom[C | D] == Bottom[C]`.
+    ///
+    /// Practically speaking, in most respects the redundancy relation is the same as the subtyping
+    /// relation. It is redundant to add `bool` to a union that includes `int`, because `bool` is a
+    /// subtype of `int`, so inference of attribute access or binary expressions on the union
+    /// `int | bool` would always produce a type that represents the same set of possible sets of
+    /// runtime values as if ty had inferred the attribute access or binary expression on `int`
+    /// alone.
+    ///
+    /// Where the redundancy relation differs from the subtyping relation is that there are a
+    /// number of simplifications that can be made when simplifying unions that are not
+    /// strictly permitted by the subtyping relation. For example, it is safe to avoid adding
+    /// `Any` to a union that already includes `Any`, because `Any` already represents an
+    /// unknown set of possible sets of runtime values that can materialize to any type in a
+    /// gradual, permissive way. Inferring attribute access or binary expressions over
+    /// `Any | Any` could never conceivably yield a type that represents a different set of
+    /// possible sets of runtime values to inferring the same expression over `Any` alone;
+    /// although `Any` is not a subtype of `Any`, top materialization of both `Any` and
+    /// `Any | Any` is `object`, and the bottom materialization of both types is `Never`.
+    ///
+    /// The same principle also applies to intersections that include `Any` being added to
+    /// unions that include `Any`: for any type `A`, although naively distributing
+    /// type-inference operations over `(Any & A) | Any` could produce types that have
+    /// different displays to `Any`, `(Any & A) | Any` nonetheless has the same top
+    /// materialization as `Any` and the same bottom materialization as `Any`, and thus it is
+    /// redundant to add `Any & A` to a union that already includes `Any`.
+    ///
+    /// Union simplification cannot use the assignability relation, meanwhile, as it is
+    /// trivial to produce examples of cases where adding a type `B` to a union that includes
+    /// `A` would impact downstream type inference, even where `B` is assignable to `A`. For
+    /// example, `int` is assignable to `Any`, but attribute access over the union `int | Any`
+    /// will yield very different results to attribute access over `Any` alone. The top
+    /// materialization of `Any` and `int | Any` may be the same type (`object`), but the
+    /// two differ in their bottom materializations (`Never` and `int`, respectively).
+    ///
+    /// [fully static]: https://typing.python.org/en/latest/spec/glossary.html#term-fully-static-type
+    /// [materializations]: https://typing.python.org/en/latest/spec/glossary.html#term-materialize
+    Redundancy,
 }
 
 impl TypeRelation {
     pub(crate) const fn is_assignability(self) -> bool {
         matches!(self, TypeRelation::Assignability)
     }
+
+    pub(crate) const fn is_subtyping(self) -> bool {
+        matches!(self, TypeRelation::Subtyping)
+    }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, get_size2::GetSize)]
 pub enum Truthiness {
     /// For an object `x`, `bool(x)` will always return `True`
     AlwaysTrue,
@@ -8506,14 +9870,6 @@ impl Truthiness {
         if condition { self.negate() } else { self }
     }
 
-    pub(crate) fn and(self, other: Self) -> Self {
-        match (self, other) {
-            (Truthiness::AlwaysTrue, Truthiness::AlwaysTrue) => Truthiness::AlwaysTrue,
-            (Truthiness::AlwaysFalse, _) | (_, Truthiness::AlwaysFalse) => Truthiness::AlwaysFalse,
-            _ => Truthiness::Ambiguous,
-        }
-    }
-
     pub(crate) fn or(self, other: Self) -> Self {
         match (self, other) {
             (Truthiness::AlwaysFalse, Truthiness::AlwaysFalse) => Truthiness::AlwaysFalse,
@@ -8572,6 +9928,13 @@ fn walk_bound_method_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
     visitor.visit_type(db, method.self_instance(db));
 }
 
+fn into_callable_type_cycle_initial<'db>(
+    db: &'db dyn Db,
+    _self: BoundMethodType<'db>,
+) -> CallableType<'db> {
+    CallableType::bottom(db)
+}
+
 #[salsa::tracked]
 impl<'db> BoundMethodType<'db> {
     /// Returns the type that replaces any `typing.Self` annotations in the bound method signature.
@@ -8579,16 +9942,21 @@ impl<'db> BoundMethodType<'db> {
     /// a `@classmethod`, then it should be an instance of that bound-instance type.
     pub(crate) fn typing_self_type(self, db: &'db dyn Db) -> Type<'db> {
         let mut self_instance = self.self_instance(db);
-        if self
-            .function(db)
-            .has_known_decorator(db, FunctionDecorators::CLASSMETHOD)
-        {
+        if self.function(db).is_classmethod(db) {
             self_instance = self_instance.to_instance(db).unwrap_or_else(Type::unknown);
         }
         self_instance
     }
 
-    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    pub(crate) fn map_self_type(
+        self,
+        db: &'db dyn Db,
+        f: impl FnOnce(Type<'db>) -> Type<'db>,
+    ) -> Self {
+        Self::new(db, self.function(db), f(self.self_instance(db)))
+    }
+
+    #[salsa::tracked(cycle_initial=into_callable_type_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(crate) fn into_callable_type(self, db: &'db dyn Db) -> CallableType<'db> {
         let function = self.function(db);
         let self_instance = self.typing_self_type(db);
@@ -8602,7 +9970,7 @@ impl<'db> BoundMethodType<'db> {
                     .iter()
                     .map(|signature| signature.bind_self(db, Some(self_instance))),
             ),
-            false,
+            true,
         )
     }
 
@@ -8614,23 +9982,57 @@ impl<'db> BoundMethodType<'db> {
         )
     }
 
-    fn has_relation_to(self, db: &'db dyn Db, other: Self, relation: TypeRelation) -> bool {
+    fn has_relation_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        relation: TypeRelation,
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         // A bound method is a typically a subtype of itself. However, we must explicitly verify
         // the subtyping of the underlying function signatures (since they might be specialized
         // differently), and of the bound self parameter (taking care that parameters, including a
         // bound self parameter, are contravariant.)
         self.function(db)
-            .has_relation_to(db, other.function(db), relation)
-            && other
-                .self_instance(db)
-                .has_relation_to(db, self.self_instance(db), relation)
+            .has_relation_to_impl(
+                db,
+                other.function(db),
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            )
+            .and(db, || {
+                other.self_instance(db).has_relation_to_impl(
+                    db,
+                    self.self_instance(db),
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            })
     }
 
-    fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
-        self.function(db).is_equivalent_to(db, other.function(db))
-            && other
-                .self_instance(db)
-                .is_equivalent_to(db, self.self_instance(db))
+    fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        self.function(db)
+            .is_equivalent_to_impl(db, other.function(db), inferable, visitor)
+            .and(db, || {
+                other.self_instance(db).is_equivalent_to_impl(
+                    db,
+                    self.self_instance(db),
+                    inferable,
+                    visitor,
+                )
+            })
     }
 }
 
@@ -8695,29 +10097,16 @@ impl<'db> CallableType<'db> {
         Self::single(db, Signature::unknown())
     }
 
-    pub(crate) fn bind_self(self, db: &'db dyn Db) -> Type<'db> {
-        Type::Callable(CallableType::new(
-            db,
-            self.signatures(db).bind_self(db, None),
-            false,
-        ))
-    }
-
-    fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        CallableType::new(
-            db,
-            self.signatures(db).materialize(db, variance),
-            self.is_function_like(db),
-        )
+    pub(crate) fn bind_self(self, db: &'db dyn Db) -> CallableType<'db> {
+        CallableType::new(db, self.signatures(db).bind_self(db, None), false)
     }
 
     /// Create a callable type which represents a fully-static "bottom" callable.
     ///
     /// Specifically, this represents a callable type with a single signature:
     /// `(*args: object, **kwargs: object) -> Never`.
-    #[cfg(test)]
-    pub(crate) fn bottom(db: &'db dyn Db) -> Type<'db> {
-        Self::single(db, Signature::bottom(db))
+    pub(crate) fn bottom(db: &'db dyn Db) -> CallableType<'db> {
+        Self::new(db, CallableSignature::bottom(), false)
     }
 
     /// Return a "normalized" version of this `Callable` type.
@@ -8731,55 +10120,86 @@ impl<'db> CallableType<'db> {
         )
     }
 
-    fn apply_type_mapping<'a>(self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
+    fn apply_type_mapping_impl<'a>(
+        self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         CallableType::new(
             db,
-            self.signatures(db).apply_type_mapping(db, type_mapping),
+            self.signatures(db)
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor),
             self.is_function_like(db),
         )
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         self.signatures(db)
-            .find_legacy_typevars(db, binding_context, typevars);
+            .find_legacy_typevars_impl(db, binding_context, typevars, visitor);
     }
 
     /// Check whether this callable type has the given relation to another callable type.
     ///
     /// See [`Type::is_subtype_of`] and [`Type::is_assignable_to`] for more details.
-    fn has_relation_to(self, db: &'db dyn Db, other: Self, relation: TypeRelation) -> bool {
+    fn has_relation_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        relation: TypeRelation,
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if other.is_function_like(db) && !self.is_function_like(db) {
-            return false;
+            return ConstraintSet::from(false);
         }
-        self.signatures(db)
-            .has_relation_to(db, other.signatures(db), relation)
+        self.signatures(db).has_relation_to_impl(
+            db,
+            other.signatures(db),
+            inferable,
+            relation,
+            relation_visitor,
+            disjointness_visitor,
+        )
     }
 
     /// Check whether this callable type is equivalent to another callable type.
     ///
     /// See [`Type::is_equivalent_to`] for more details.
-    fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
+    fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
 
-        self.is_function_like(db) == other.is_function_like(db)
-            && self
-                .signatures(db)
-                .is_equivalent_to(db, other.signatures(db))
+        ConstraintSet::from(self.is_function_like(db) == other.is_function_like(db)).and(db, || {
+            self.signatures(db)
+                .is_equivalent_to_impl(db, other.signatures(db), inferable, visitor)
+        })
     }
 }
 
-/// Represents a specific instance of `types.MethodWrapperType`
+/// Represents a specific instance of a bound method type for a builtin class.
+///
+/// Unlike bound methods of user-defined classes, these are not generally instances
+/// of `types.BoundMethodType` at runtime.
 #[derive(
     Debug, Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, salsa::Update, get_size2::GetSize,
 )]
-pub enum MethodWrapperKind<'db> {
+pub enum KnownBoundMethodType<'db> {
     /// Method wrapper for `some_function.__get__`
     FunctionTypeDunderGet(FunctionType<'db>),
     /// Method wrapper for `some_function.__call__`
@@ -8794,114 +10214,282 @@ pub enum MethodWrapperKind<'db> {
     /// this allows us to understand statically known branches for common tests such as
     /// `if sys.platform.startswith("freebsd")`.
     StrStartswith(StringLiteralType<'db>),
+    /// Method wrapper for `Path.open`,
+    PathOpen,
 }
 
 pub(super) fn walk_method_wrapper_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
     db: &'db dyn Db,
-    method_wrapper: MethodWrapperKind<'db>,
+    method_wrapper: KnownBoundMethodType<'db>,
     visitor: &V,
 ) {
     match method_wrapper {
-        MethodWrapperKind::FunctionTypeDunderGet(function) => {
+        KnownBoundMethodType::FunctionTypeDunderGet(function) => {
             visitor.visit_function_type(db, function);
         }
-        MethodWrapperKind::FunctionTypeDunderCall(function) => {
+        KnownBoundMethodType::FunctionTypeDunderCall(function) => {
             visitor.visit_function_type(db, function);
         }
-        MethodWrapperKind::PropertyDunderGet(property) => {
+        KnownBoundMethodType::PropertyDunderGet(property) => {
             visitor.visit_property_instance_type(db, property);
         }
-        MethodWrapperKind::PropertyDunderSet(property) => {
+        KnownBoundMethodType::PropertyDunderSet(property) => {
             visitor.visit_property_instance_type(db, property);
         }
-        MethodWrapperKind::StrStartswith(string_literal) => {
+        KnownBoundMethodType::StrStartswith(string_literal) => {
             visitor.visit_type(db, Type::StringLiteral(string_literal));
         }
+        KnownBoundMethodType::PathOpen => {}
     }
 }
 
-impl<'db> MethodWrapperKind<'db> {
-    fn has_relation_to(self, db: &'db dyn Db, other: Self, relation: TypeRelation) -> bool {
+impl<'db> KnownBoundMethodType<'db> {
+    fn has_relation_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        relation: TypeRelation,
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self, other) {
             (
-                MethodWrapperKind::FunctionTypeDunderGet(self_function),
-                MethodWrapperKind::FunctionTypeDunderGet(other_function),
-            ) => self_function.has_relation_to(db, other_function, relation),
+                KnownBoundMethodType::FunctionTypeDunderGet(self_function),
+                KnownBoundMethodType::FunctionTypeDunderGet(other_function),
+            ) => self_function.has_relation_to_impl(
+                db,
+                other_function,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
 
             (
-                MethodWrapperKind::FunctionTypeDunderCall(self_function),
-                MethodWrapperKind::FunctionTypeDunderCall(other_function),
-            ) => self_function.has_relation_to(db, other_function, relation),
+                KnownBoundMethodType::FunctionTypeDunderCall(self_function),
+                KnownBoundMethodType::FunctionTypeDunderCall(other_function),
+            ) => self_function.has_relation_to_impl(
+                db,
+                other_function,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
 
-            (MethodWrapperKind::PropertyDunderGet(_), MethodWrapperKind::PropertyDunderGet(_))
-            | (MethodWrapperKind::PropertyDunderSet(_), MethodWrapperKind::PropertyDunderSet(_))
-            | (MethodWrapperKind::StrStartswith(_), MethodWrapperKind::StrStartswith(_)) => {
-                self == other
+            (
+                KnownBoundMethodType::PropertyDunderGet(self_property),
+                KnownBoundMethodType::PropertyDunderGet(other_property),
+            )
+            | (
+                KnownBoundMethodType::PropertyDunderSet(self_property),
+                KnownBoundMethodType::PropertyDunderSet(other_property),
+            ) => self_property.when_equivalent_to(db, other_property, inferable),
+
+            (KnownBoundMethodType::StrStartswith(_), KnownBoundMethodType::StrStartswith(_)) => {
+                ConstraintSet::from(self == other)
+            }
+
+            (KnownBoundMethodType::PathOpen, KnownBoundMethodType::PathOpen) => {
+                ConstraintSet::from(true)
             }
 
             (
-                MethodWrapperKind::FunctionTypeDunderGet(_)
-                | MethodWrapperKind::FunctionTypeDunderCall(_)
-                | MethodWrapperKind::PropertyDunderGet(_)
-                | MethodWrapperKind::PropertyDunderSet(_)
-                | MethodWrapperKind::StrStartswith(_),
-                MethodWrapperKind::FunctionTypeDunderGet(_)
-                | MethodWrapperKind::FunctionTypeDunderCall(_)
-                | MethodWrapperKind::PropertyDunderGet(_)
-                | MethodWrapperKind::PropertyDunderSet(_)
-                | MethodWrapperKind::StrStartswith(_),
-            ) => false,
+                KnownBoundMethodType::FunctionTypeDunderGet(_)
+                | KnownBoundMethodType::FunctionTypeDunderCall(_)
+                | KnownBoundMethodType::PropertyDunderGet(_)
+                | KnownBoundMethodType::PropertyDunderSet(_)
+                | KnownBoundMethodType::StrStartswith(_)
+                | KnownBoundMethodType::PathOpen,
+                KnownBoundMethodType::FunctionTypeDunderGet(_)
+                | KnownBoundMethodType::FunctionTypeDunderCall(_)
+                | KnownBoundMethodType::PropertyDunderGet(_)
+                | KnownBoundMethodType::PropertyDunderSet(_)
+                | KnownBoundMethodType::StrStartswith(_)
+                | KnownBoundMethodType::PathOpen,
+            ) => ConstraintSet::from(false),
         }
     }
 
-    fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
+    fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self, other) {
             (
-                MethodWrapperKind::FunctionTypeDunderGet(self_function),
-                MethodWrapperKind::FunctionTypeDunderGet(other_function),
-            ) => self_function.is_equivalent_to(db, other_function),
+                KnownBoundMethodType::FunctionTypeDunderGet(self_function),
+                KnownBoundMethodType::FunctionTypeDunderGet(other_function),
+            ) => self_function.is_equivalent_to_impl(db, other_function, inferable, visitor),
 
             (
-                MethodWrapperKind::FunctionTypeDunderCall(self_function),
-                MethodWrapperKind::FunctionTypeDunderCall(other_function),
-            ) => self_function.is_equivalent_to(db, other_function),
+                KnownBoundMethodType::FunctionTypeDunderCall(self_function),
+                KnownBoundMethodType::FunctionTypeDunderCall(other_function),
+            ) => self_function.is_equivalent_to_impl(db, other_function, inferable, visitor),
 
-            (MethodWrapperKind::PropertyDunderGet(_), MethodWrapperKind::PropertyDunderGet(_))
-            | (MethodWrapperKind::PropertyDunderSet(_), MethodWrapperKind::PropertyDunderSet(_))
-            | (MethodWrapperKind::StrStartswith(_), MethodWrapperKind::StrStartswith(_)) => {
-                self == other
+            (
+                KnownBoundMethodType::PropertyDunderGet(self_property),
+                KnownBoundMethodType::PropertyDunderGet(other_property),
+            )
+            | (
+                KnownBoundMethodType::PropertyDunderSet(self_property),
+                KnownBoundMethodType::PropertyDunderSet(other_property),
+            ) => self_property.is_equivalent_to_impl(db, other_property, inferable, visitor),
+
+            (KnownBoundMethodType::StrStartswith(_), KnownBoundMethodType::StrStartswith(_)) => {
+                ConstraintSet::from(self == other)
+            }
+
+            (KnownBoundMethodType::PathOpen, KnownBoundMethodType::PathOpen) => {
+                ConstraintSet::from(true)
             }
 
             (
-                MethodWrapperKind::FunctionTypeDunderGet(_)
-                | MethodWrapperKind::FunctionTypeDunderCall(_)
-                | MethodWrapperKind::PropertyDunderGet(_)
-                | MethodWrapperKind::PropertyDunderSet(_)
-                | MethodWrapperKind::StrStartswith(_),
-                MethodWrapperKind::FunctionTypeDunderGet(_)
-                | MethodWrapperKind::FunctionTypeDunderCall(_)
-                | MethodWrapperKind::PropertyDunderGet(_)
-                | MethodWrapperKind::PropertyDunderSet(_)
-                | MethodWrapperKind::StrStartswith(_),
-            ) => false,
+                KnownBoundMethodType::FunctionTypeDunderGet(_)
+                | KnownBoundMethodType::FunctionTypeDunderCall(_)
+                | KnownBoundMethodType::PropertyDunderGet(_)
+                | KnownBoundMethodType::PropertyDunderSet(_)
+                | KnownBoundMethodType::StrStartswith(_)
+                | KnownBoundMethodType::PathOpen,
+                KnownBoundMethodType::FunctionTypeDunderGet(_)
+                | KnownBoundMethodType::FunctionTypeDunderCall(_)
+                | KnownBoundMethodType::PropertyDunderGet(_)
+                | KnownBoundMethodType::PropertyDunderSet(_)
+                | KnownBoundMethodType::StrStartswith(_)
+                | KnownBoundMethodType::PathOpen,
+            ) => ConstraintSet::from(false),
         }
     }
 
     fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
         match self {
-            MethodWrapperKind::FunctionTypeDunderGet(function) => {
-                MethodWrapperKind::FunctionTypeDunderGet(function.normalized_impl(db, visitor))
+            KnownBoundMethodType::FunctionTypeDunderGet(function) => {
+                KnownBoundMethodType::FunctionTypeDunderGet(function.normalized_impl(db, visitor))
             }
-            MethodWrapperKind::FunctionTypeDunderCall(function) => {
-                MethodWrapperKind::FunctionTypeDunderCall(function.normalized_impl(db, visitor))
+            KnownBoundMethodType::FunctionTypeDunderCall(function) => {
+                KnownBoundMethodType::FunctionTypeDunderCall(function.normalized_impl(db, visitor))
             }
-            MethodWrapperKind::PropertyDunderGet(property) => {
-                MethodWrapperKind::PropertyDunderGet(property.normalized_impl(db, visitor))
+            KnownBoundMethodType::PropertyDunderGet(property) => {
+                KnownBoundMethodType::PropertyDunderGet(property.normalized_impl(db, visitor))
             }
-            MethodWrapperKind::PropertyDunderSet(property) => {
-                MethodWrapperKind::PropertyDunderSet(property.normalized_impl(db, visitor))
+            KnownBoundMethodType::PropertyDunderSet(property) => {
+                KnownBoundMethodType::PropertyDunderSet(property.normalized_impl(db, visitor))
+            }
+            KnownBoundMethodType::StrStartswith(_) | KnownBoundMethodType::PathOpen => self,
+        }
+    }
+
+    /// Return the [`KnownClass`] that inhabitants of this type are instances of at runtime
+    fn class(self) -> KnownClass {
+        match self {
+            KnownBoundMethodType::FunctionTypeDunderGet(_)
+            | KnownBoundMethodType::FunctionTypeDunderCall(_)
+            | KnownBoundMethodType::PropertyDunderGet(_)
+            | KnownBoundMethodType::PropertyDunderSet(_) => KnownClass::MethodWrapperType,
+            KnownBoundMethodType::StrStartswith(_) => KnownClass::BuiltinFunctionType,
+            KnownBoundMethodType::PathOpen => KnownClass::MethodType,
+        }
+    }
+
+    /// Return the signatures of this bound method type.
+    ///
+    /// If the bound method type is overloaded, it may have multiple signatures.
+    fn signatures(self, db: &'db dyn Db) -> impl Iterator<Item = Signature<'db>> {
+        match self {
+            // Here, we dynamically model the overloaded function signature of `types.FunctionType.__get__`.
+            // This is required because we need to return more precise types than what the signature in
+            // typeshed provides:
+            //
+            // ```py
+            // class FunctionType:
+            //     # ...
+            //     @overload
+            //     def __get__(self, instance: None, owner: type, /) -> FunctionType: ...
+            //     @overload
+            //     def __get__(self, instance: object, owner: type | None = None, /) -> MethodType: ...
+            // ```
+            //
+            // For `builtins.property.__get__`, we use the same signature. The return types are not
+            // specified yet, they will be dynamically added in `Bindings::evaluate_known_cases`.
+            //
+            // TODO: Consider merging these synthesized signatures with the ones in
+            // [`WrapperDescriptorKind::signatures`], since this one is just that signature
+            // with the `self` parameters removed.
+            KnownBoundMethodType::FunctionTypeDunderGet(_)
+            | KnownBoundMethodType::PropertyDunderGet(_) => Either::Left(Either::Left(
+                [
+                    Signature::new(
+                        Parameters::new([
+                            Parameter::positional_only(Some(Name::new_static("instance")))
+                                .with_annotated_type(Type::none(db)),
+                            Parameter::positional_only(Some(Name::new_static("owner")))
+                                .with_annotated_type(KnownClass::Type.to_instance(db)),
+                        ]),
+                        None,
+                    ),
+                    Signature::new(
+                        Parameters::new([
+                            Parameter::positional_only(Some(Name::new_static("instance")))
+                                .with_annotated_type(Type::object()),
+                            Parameter::positional_only(Some(Name::new_static("owner")))
+                                .with_annotated_type(UnionType::from_elements(
+                                    db,
+                                    [KnownClass::Type.to_instance(db), Type::none(db)],
+                                ))
+                                .with_default_type(Type::none(db)),
+                        ]),
+                        None,
+                    ),
+                ]
+                .into_iter(),
+            )),
+            KnownBoundMethodType::FunctionTypeDunderCall(function) => Either::Left(Either::Right(
+                function.signature(db).overloads.iter().cloned(),
+            )),
+            KnownBoundMethodType::PropertyDunderSet(_) => {
+                Either::Right(std::iter::once(Signature::new(
+                    Parameters::new([
+                        Parameter::positional_only(Some(Name::new_static("instance")))
+                            .with_annotated_type(Type::object()),
+                        Parameter::positional_only(Some(Name::new_static("value")))
+                            .with_annotated_type(Type::object()),
+                    ]),
+                    None,
+                )))
+            }
+            KnownBoundMethodType::StrStartswith(_) => {
+                Either::Right(std::iter::once(Signature::new(
+                    Parameters::new([
+                        Parameter::positional_only(Some(Name::new_static("prefix")))
+                            .with_annotated_type(UnionType::from_elements(
+                                db,
+                                [
+                                    KnownClass::Str.to_instance(db),
+                                    Type::homogeneous_tuple(db, KnownClass::Str.to_instance(db)),
+                                ],
+                            )),
+                        Parameter::positional_only(Some(Name::new_static("start")))
+                            .with_annotated_type(UnionType::from_elements(
+                                db,
+                                [KnownClass::SupportsIndex.to_instance(db), Type::none(db)],
+                            ))
+                            .with_default_type(Type::none(db)),
+                        Parameter::positional_only(Some(Name::new_static("end")))
+                            .with_annotated_type(UnionType::from_elements(
+                                db,
+                                [KnownClass::SupportsIndex.to_instance(db), Type::none(db)],
+                            ))
+                            .with_default_type(Type::none(db)),
+                    ]),
+                    Some(KnownClass::Bool.to_instance(db)),
+                )))
+            }
+            KnownBoundMethodType::PathOpen => {
+                Either::Right(std::iter::once(Signature::todo("`Path.open` return type")))
             }
-            MethodWrapperKind::StrStartswith(_) => self,
         }
     }
 }
@@ -8919,6 +10507,75 @@ pub enum WrapperDescriptorKind {
     PropertyDunderSet,
 }
 
+impl WrapperDescriptorKind {
+    fn signatures(self, db: &dyn Db) -> impl Iterator<Item = Signature<'_>> {
+        /// Similar to what we do in [`KnownBoundMethod::signatures`],
+        /// here we also model `types.FunctionType.__get__` (or builtins.property.__get__),
+        /// but now we consider a call to this as a function, i.e. we also expect the `self`
+        /// argument to be passed in.
+        ///
+        /// TODO: Consider merging these synthesized signatures with the ones in
+        /// [`KnownBoundMethod::signatures`], since that one is just this signature
+        /// with the `self` parameters removed.
+        fn dunder_get_signatures(db: &dyn Db, class: KnownClass) -> [Signature<'_>; 2] {
+            let type_instance = KnownClass::Type.to_instance(db);
+            let none = Type::none(db);
+            let descriptor = class.to_instance(db);
+            [
+                Signature::new(
+                    Parameters::new([
+                        Parameter::positional_only(Some(Name::new_static("self")))
+                            .with_annotated_type(descriptor),
+                        Parameter::positional_only(Some(Name::new_static("instance")))
+                            .with_annotated_type(none),
+                        Parameter::positional_only(Some(Name::new_static("owner")))
+                            .with_annotated_type(type_instance),
+                    ]),
+                    None,
+                ),
+                Signature::new(
+                    Parameters::new([
+                        Parameter::positional_only(Some(Name::new_static("self")))
+                            .with_annotated_type(descriptor),
+                        Parameter::positional_only(Some(Name::new_static("instance")))
+                            .with_annotated_type(Type::object()),
+                        Parameter::positional_only(Some(Name::new_static("owner")))
+                            .with_annotated_type(UnionType::from_elements(
+                                db,
+                                [type_instance, none],
+                            ))
+                            .with_default_type(none),
+                    ]),
+                    None,
+                ),
+            ]
+        }
+
+        match self {
+            WrapperDescriptorKind::FunctionTypeDunderGet => {
+                Either::Left(dunder_get_signatures(db, KnownClass::FunctionType).into_iter())
+            }
+            WrapperDescriptorKind::PropertyDunderGet => {
+                Either::Left(dunder_get_signatures(db, KnownClass::Property).into_iter())
+            }
+            WrapperDescriptorKind::PropertyDunderSet => {
+                let object = Type::object();
+                Either::Right(std::iter::once(Signature::new(
+                    Parameters::new([
+                        Parameter::positional_only(Some(Name::new_static("self")))
+                            .with_annotated_type(KnownClass::Property.to_instance(db)),
+                        Parameter::positional_only(Some(Name::new_static("instance")))
+                            .with_annotated_type(object),
+                        Parameter::positional_only(Some(Name::new_static("value")))
+                            .with_annotated_type(object),
+                    ]),
+                    None,
+                )))
+            }
+        }
+    }
+}
+
 /// # Ordering
 /// Ordering is based on the module literal's salsa-assigned id and not on its values.
 /// The id may change between runs, or when the module literal was garbage collected and recreated.
@@ -8975,18 +10632,18 @@ impl<'db> ModuleLiteralType<'db> {
         // if it exists. First, we need to look up the `__getattr__` function in the module's scope.
         if let Some(file) = self.module(db).file(db) {
             let getattr_symbol = imported_symbol(db, file, "__getattr__", None);
-            if let Place::Type(getattr_type, boundness) = getattr_symbol.place {
+            if let Place::Defined(getattr_type, origin, boundness) = getattr_symbol.place {
                 // If we found a __getattr__ function, try to call it with the name argument
                 if let Ok(outcome) = getattr_type.try_call(
                     db,
                     &CallArguments::positional([Type::string_literal(db, name)]),
                 ) {
-                    return Place::Type(outcome.return_type(db), boundness).into();
+                    return Place::Defined(outcome.return_type(db), origin, boundness).into();
                 }
             }
         }
 
-        Place::Unbound.into()
+        Place::Undefined.into()
     }
 
     fn static_member(self, db: &'db dyn Db, name: &str) -> PlaceAndQualifiers<'db> {
@@ -9021,7 +10678,7 @@ impl<'db> ModuleLiteralType<'db> {
             .unwrap_or_default();
 
         // If the normal lookup failed, try to call the module's `__getattr__` function
-        if place_and_qualifiers.place.is_unbound() {
+        if place_and_qualifiers.place.is_undefined() {
             return self.try_module_getattr(db, name);
         }
 
@@ -9039,6 +10696,8 @@ pub struct PEP695TypeAliasType<'db> {
     pub name: ast::name::Name,
 
     rhs_scope: ScopeId<'db>,
+
+    specialization: Option<Specialization<'db>>,
 }
 
 // The Salsa heap is tracked separately.
@@ -9056,19 +10715,82 @@ fn walk_pep_695_type_alias<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
 impl<'db> PEP695TypeAliasType<'db> {
     pub(crate) fn definition(self, db: &'db dyn Db) -> Definition<'db> {
         let scope = self.rhs_scope(db);
-        let module = parsed_module(db, scope.file(db)).load(db);
-        let type_alias_stmt_node = scope.node(db).expect_type_alias(&module);
-
+        let type_alias_stmt_node = scope.node(db).expect_type_alias();
         semantic_index(db, scope.file(db)).expect_single_definition(type_alias_stmt_node)
     }
 
-    #[salsa::tracked(cycle_fn=value_type_cycle_recover, cycle_initial=value_type_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    /// The RHS type of a PEP-695 style type alias with specialization applied.
     pub(crate) fn value_type(self, db: &'db dyn Db) -> Type<'db> {
+        self.apply_function_specialization(db, self.raw_value_type(db))
+    }
+
+    /// The RHS type of a PEP-695 style type alias with *no* specialization applied.
+    #[salsa::tracked(cycle_initial=value_type_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    pub(crate) fn raw_value_type(self, db: &'db dyn Db) -> Type<'db> {
         let scope = self.rhs_scope(db);
         let module = parsed_module(db, scope.file(db)).load(db);
-        let type_alias_stmt_node = scope.node(db).expect_type_alias(&module);
+        let type_alias_stmt_node = scope.node(db).expect_type_alias();
         let definition = self.definition(db);
-        definition_expression_type(db, definition, &type_alias_stmt_node.value)
+
+        definition_expression_type(db, definition, &type_alias_stmt_node.node(&module).value)
+    }
+
+    fn apply_function_specialization(self, db: &'db dyn Db, ty: Type<'db>) -> Type<'db> {
+        if let Some(generic_context) = self.generic_context(db) {
+            let specialization = self
+                .specialization(db)
+                .unwrap_or_else(|| generic_context.default_specialization(db, None));
+            ty.apply_specialization(db, specialization)
+        } else {
+            ty
+        }
+    }
+
+    pub(crate) fn apply_specialization(
+        self,
+        db: &'db dyn Db,
+        f: impl FnOnce(GenericContext<'db>) -> Specialization<'db>,
+    ) -> PEP695TypeAliasType<'db> {
+        match self.generic_context(db) {
+            None => self,
+
+            Some(generic_context) => {
+                // Note that at runtime, a specialized type alias is an instance of `typing.GenericAlias`.
+                // However, the `GenericAlias` type in ty is heavily special cased to refer to specialized
+                // class literals, so we instead represent specialized type aliases as instances of
+                // `typing.TypeAliasType` internally, and pass the specialization through to the value type,
+                // except when resolving to an instance of the type alias, or its display representation.
+                let specialization = f(generic_context);
+                PEP695TypeAliasType::new(
+                    db,
+                    self.name(db),
+                    self.rhs_scope(db),
+                    Some(specialization),
+                )
+            }
+        }
+    }
+
+    pub(crate) fn is_specialized(self, db: &'db dyn Db) -> bool {
+        self.specialization(db).is_some()
+    }
+
+    #[salsa::tracked(cycle_initial=generic_context_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    pub(crate) fn generic_context(self, db: &'db dyn Db) -> Option<GenericContext<'db>> {
+        let scope = self.rhs_scope(db);
+        let file = scope.file(db);
+        let parsed = parsed_module(db, file).load(db);
+        let type_alias_stmt_node = scope.node(db).expect_type_alias();
+
+        type_alias_stmt_node
+            .node(&parsed)
+            .type_params
+            .as_ref()
+            .map(|type_params| {
+                let index = semantic_index(db, scope.file(db));
+                let definition = index.expect_single_definition(type_alias_stmt_node);
+                GenericContext::from_type_params(db, index, definition, type_params)
+            })
     }
 
     fn normalized_impl(self, _db: &'db dyn Db, _visitor: &NormalizedVisitor<'db>) -> Self {
@@ -9076,25 +10798,25 @@ impl<'db> PEP695TypeAliasType<'db> {
     }
 }
 
-fn value_type_cycle_recover<'db>(
+fn generic_context_cycle_initial<'db>(
     _db: &'db dyn Db,
-    _value: &Type<'db>,
-    _count: u32,
     _self: PEP695TypeAliasType<'db>,
-) -> salsa::CycleRecoveryAction<Type<'db>> {
-    salsa::CycleRecoveryAction::Iterate
+) -> Option<GenericContext<'db>> {
+    None
 }
 
 fn value_type_cycle_initial<'db>(_db: &'db dyn Db, _self: PEP695TypeAliasType<'db>) -> Type<'db> {
     Type::Never
 }
 
+/// A PEP 695 `types.TypeAliasType` created by manually calling the constructor.
+///
 /// # Ordering
 /// Ordering is based on the type alias's salsa-assigned id and not on its values.
 /// The id may change between runs, or when the alias was garbage collected and recreated.
 #[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
 #[derive(PartialOrd, Ord)]
-pub struct BareTypeAliasType<'db> {
+pub struct ManualPEP695TypeAliasType<'db> {
     #[returns(ref)]
     pub name: ast::name::Name,
     pub definition: Option<Definition<'db>>,
@@ -9102,17 +10824,17 @@ pub struct BareTypeAliasType<'db> {
 }
 
 // The Salsa heap is tracked separately.
-impl get_size2::GetSize for BareTypeAliasType<'_> {}
+impl get_size2::GetSize for ManualPEP695TypeAliasType<'_> {}
 
-fn walk_bare_type_alias<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
+fn walk_manual_pep_695_type_alias<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
     db: &'db dyn Db,
-    type_alias: BareTypeAliasType<'db>,
+    type_alias: ManualPEP695TypeAliasType<'db>,
     visitor: &V,
 ) {
     visitor.visit_type(db, type_alias.value(db));
 }
 
-impl<'db> BareTypeAliasType<'db> {
+impl<'db> ManualPEP695TypeAliasType<'db> {
     fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
         Self::new(
             db,
@@ -9130,7 +10852,7 @@ pub enum TypeAliasType<'db> {
     /// A type alias defined using the PEP 695 `type` statement.
     PEP695(PEP695TypeAliasType<'db>),
     /// A type alias defined by manually instantiating the PEP 695 `types.TypeAliasType`.
-    Bare(BareTypeAliasType<'db>),
+    ManualPEP695(ManualPEP695TypeAliasType<'db>),
 }
 
 fn walk_type_alias_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
@@ -9138,12 +10860,15 @@ fn walk_type_alias_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
     type_alias: TypeAliasType<'db>,
     visitor: &V,
 ) {
+    if !visitor.should_visit_lazy_type_attributes() {
+        return;
+    }
     match type_alias {
         TypeAliasType::PEP695(type_alias) => {
             walk_pep_695_type_alias(db, type_alias, visitor);
         }
-        TypeAliasType::Bare(type_alias) => {
-            walk_bare_type_alias(db, type_alias, visitor);
+        TypeAliasType::ManualPEP695(type_alias) => {
+            walk_manual_pep_695_type_alias(db, type_alias, visitor);
         }
     }
 }
@@ -9154,8 +10879,8 @@ impl<'db> TypeAliasType<'db> {
             TypeAliasType::PEP695(type_alias) => {
                 TypeAliasType::PEP695(type_alias.normalized_impl(db, visitor))
             }
-            TypeAliasType::Bare(type_alias) => {
-                TypeAliasType::Bare(type_alias.normalized_impl(db, visitor))
+            TypeAliasType::ManualPEP695(type_alias) => {
+                TypeAliasType::ManualPEP695(type_alias.normalized_impl(db, visitor))
             }
         }
     }
@@ -9163,21 +10888,70 @@ impl<'db> TypeAliasType<'db> {
     pub(crate) fn name(self, db: &'db dyn Db) -> &'db str {
         match self {
             TypeAliasType::PEP695(type_alias) => type_alias.name(db),
-            TypeAliasType::Bare(type_alias) => type_alias.name(db),
+            TypeAliasType::ManualPEP695(type_alias) => type_alias.name(db),
         }
     }
 
     pub(crate) fn definition(self, db: &'db dyn Db) -> Option<Definition<'db>> {
         match self {
             TypeAliasType::PEP695(type_alias) => Some(type_alias.definition(db)),
-            TypeAliasType::Bare(type_alias) => type_alias.definition(db),
+            TypeAliasType::ManualPEP695(type_alias) => type_alias.definition(db),
         }
     }
 
-    pub(crate) fn value_type(self, db: &'db dyn Db) -> Type<'db> {
+    pub fn value_type(self, db: &'db dyn Db) -> Type<'db> {
         match self {
             TypeAliasType::PEP695(type_alias) => type_alias.value_type(db),
-            TypeAliasType::Bare(type_alias) => type_alias.value(db),
+            TypeAliasType::ManualPEP695(type_alias) => type_alias.value(db),
+        }
+    }
+
+    pub(crate) fn raw_value_type(self, db: &'db dyn Db) -> Type<'db> {
+        match self {
+            TypeAliasType::PEP695(type_alias) => type_alias.raw_value_type(db),
+            TypeAliasType::ManualPEP695(type_alias) => type_alias.value(db),
+        }
+    }
+
+    pub(crate) fn as_pep_695_type_alias(self) -> Option<PEP695TypeAliasType<'db>> {
+        match self {
+            TypeAliasType::PEP695(type_alias) => Some(type_alias),
+            TypeAliasType::ManualPEP695(_) => None,
+        }
+    }
+
+    pub(crate) fn generic_context(self, db: &'db dyn Db) -> Option<GenericContext<'db>> {
+        // TODO: Add support for generic non-PEP695 type aliases.
+        match self {
+            TypeAliasType::PEP695(type_alias) => type_alias.generic_context(db),
+            TypeAliasType::ManualPEP695(_) => None,
+        }
+    }
+
+    pub(crate) fn specialization(self, db: &'db dyn Db) -> Option<Specialization<'db>> {
+        match self {
+            TypeAliasType::PEP695(type_alias) => type_alias.specialization(db),
+            TypeAliasType::ManualPEP695(_) => None,
+        }
+    }
+
+    fn apply_function_specialization(self, db: &'db dyn Db, ty: Type<'db>) -> Type<'db> {
+        match self {
+            TypeAliasType::PEP695(type_alias) => type_alias.apply_function_specialization(db, ty),
+            TypeAliasType::ManualPEP695(_) => ty,
+        }
+    }
+
+    pub(crate) fn apply_specialization(
+        self,
+        db: &'db dyn Db,
+        f: impl FnOnce(GenericContext<'db>) -> Specialization<'db>,
+    ) -> Self {
+        match self {
+            TypeAliasType::PEP695(type_alias) => {
+                TypeAliasType::PEP695(type_alias.apply_specialization(db, f))
+            }
+            TypeAliasType::ManualPEP695(_) => self,
         }
     }
 }
@@ -9225,6 +10999,21 @@ impl<'db> UnionType<'db> {
             .build()
     }
 
+    /// Create a union from a list of elements without unpacking type aliases.
+    pub(crate) fn from_elements_leave_aliases<I, T>(db: &'db dyn Db, elements: I) -> Type<'db>
+    where
+        I: IntoIterator<Item = T>,
+        T: Into<Type<'db>>,
+    {
+        elements
+            .into_iter()
+            .fold(
+                UnionBuilder::new(db).unpack_aliases(false),
+                |builder, element| builder.add(element.into()),
+            )
+            .build()
+    }
+
     /// A fallible version of [`UnionType::from_elements`].
     ///
     /// If all items in `elements` are `Some()`, the result of unioning all elements is returned.
@@ -9274,9 +11063,9 @@ impl<'db> UnionType<'db> {
     pub(crate) fn filter(
         self,
         db: &'db dyn Db,
-        filter_fn: impl FnMut(&&Type<'db>) -> bool,
+        mut f: impl FnMut(&Type<'db>) -> bool,
     ) -> Type<'db> {
-        Self::from_elements(db, self.elements(db).iter().filter(filter_fn))
+        Self::from_elements(db, self.elements(db).iter().filter(|ty| f(ty)))
     }
 
     pub(crate) fn map_with_boundness(
@@ -9288,14 +11077,16 @@ impl<'db> UnionType<'db> {
 
         let mut all_unbound = true;
         let mut possibly_unbound = false;
+        let mut origin = TypeOrigin::Declared;
         for ty in self.elements(db) {
             let ty_member = transform_fn(ty);
             match ty_member {
-                Place::Unbound => {
+                Place::Undefined => {
                     possibly_unbound = true;
                 }
-                Place::Type(ty_member, member_boundness) => {
-                    if member_boundness == Boundness::PossiblyUnbound {
+                Place::Defined(ty_member, member_origin, member_boundness) => {
+                    origin = origin.merge(member_origin);
+                    if member_boundness == Definedness::PossiblyUndefined {
                         possibly_unbound = true;
                     }
 
@@ -9306,14 +11097,15 @@ impl<'db> UnionType<'db> {
         }
 
         if all_unbound {
-            Place::Unbound
+            Place::Undefined
         } else {
-            Place::Type(
+            Place::Defined(
                 builder.build(),
+                origin,
                 if possibly_unbound {
-                    Boundness::PossiblyUnbound
+                    Definedness::PossiblyUndefined
                 } else {
-                    Boundness::Bound
+                    Definedness::AlwaysDefined
                 },
             )
         }
@@ -9329,6 +11121,7 @@ impl<'db> UnionType<'db> {
 
         let mut all_unbound = true;
         let mut possibly_unbound = false;
+        let mut origin = TypeOrigin::Declared;
         for ty in self.elements(db) {
             let PlaceAndQualifiers {
                 place: ty_member,
@@ -9336,11 +11129,12 @@ impl<'db> UnionType<'db> {
             } = transform_fn(ty);
             qualifiers |= new_qualifiers;
             match ty_member {
-                Place::Unbound => {
+                Place::Undefined => {
                     possibly_unbound = true;
                 }
-                Place::Type(ty_member, member_boundness) => {
-                    if member_boundness == Boundness::PossiblyUnbound {
+                Place::Defined(ty_member, member_origin, member_boundness) => {
+                    origin = origin.merge(member_origin);
+                    if member_boundness == Definedness::PossiblyUndefined {
                         possibly_unbound = true;
                     }
 
@@ -9351,14 +11145,15 @@ impl<'db> UnionType<'db> {
         }
         PlaceAndQualifiers {
             place: if all_unbound {
-                Place::Unbound
+                Place::Undefined
             } else {
-                Place::Type(
+                Place::Defined(
                     builder.build(),
+                    origin,
                     if possibly_unbound {
-                        Boundness::PossiblyUnbound
+                        Definedness::PossiblyUndefined
                     } else {
-                        Boundness::Bound
+                        Definedness::AlwaysDefined
                     },
                 )
             },
@@ -9370,40 +11165,52 @@ impl<'db> UnionType<'db> {
     ///
     /// See [`Type::normalized`] for more details.
     #[must_use]
-    pub(crate) fn normalized(self, db: &'db dyn Db) -> Self {
-        self.normalized_impl(db, &TypeTransformer::default())
+    pub(crate) fn normalized(self, db: &'db dyn Db) -> Type<'db> {
+        self.normalized_impl(db, &NormalizedVisitor::default())
     }
 
-    pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        let mut new_elements: Vec<Type<'db>> = self
-            .elements(db)
+    pub(crate) fn normalized_impl(
+        self,
+        db: &'db dyn Db,
+        visitor: &NormalizedVisitor<'db>,
+    ) -> Type<'db> {
+        self.elements(db)
             .iter()
-            .map(|element| element.normalized_impl(db, visitor))
-            .collect();
-        new_elements.sort_unstable_by(|l, r| union_or_intersection_elements_ordering(db, l, r));
-        UnionType::new(db, new_elements.into_boxed_slice())
+            .map(|ty| ty.normalized_impl(db, visitor))
+            .fold(
+                UnionBuilder::new(db)
+                    .order_elements(true)
+                    .unpack_aliases(true),
+                UnionBuilder::add,
+            )
+            .build()
     }
 
-    /// Return `true` if `self` represents the exact same sets of possible runtime objects as `other`
-    pub(crate) fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
+    pub(crate) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        _inferable: InferableTypeVars<'_, 'db>,
+        _visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
 
         let self_elements = self.elements(db);
         let other_elements = other.elements(db);
 
         if self_elements.len() != other_elements.len() {
-            return false;
+            return ConstraintSet::from(false);
         }
 
         let sorted_self = self.normalized(db);
 
-        if sorted_self == other {
-            return true;
+        if sorted_self == Type::Union(other) {
+            return ConstraintSet::from(true);
         }
 
-        sorted_self == other.normalized(db)
+        ConstraintSet::from(sorted_self == other.normalized(db))
     }
 }
 
@@ -9439,13 +11246,23 @@ pub(super) fn walk_intersection_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>
 }
 
 impl<'db> IntersectionType<'db> {
+    pub(crate) fn from_elements<I, T>(db: &'db dyn Db, elements: I) -> Type<'db>
+    where
+        I: IntoIterator<Item = T>,
+        T: Into<Type<'db>>,
+    {
+        IntersectionBuilder::new(db)
+            .positive_elements(elements)
+            .build()
+    }
+
     /// Return a new `IntersectionType` instance with the positive and negative types sorted
     /// according to a canonical ordering, and other normalizations applied to each element as applicable.
     ///
     /// See [`Type::normalized`] for more details.
     #[must_use]
     pub(crate) fn normalized(self, db: &'db dyn Db) -> Self {
-        self.normalized_impl(db, &TypeTransformer::default())
+        self.normalized_impl(db, &NormalizedVisitor::default())
     }
 
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
@@ -9471,44 +11288,67 @@ impl<'db> IntersectionType<'db> {
     }
 
     /// Return `true` if `self` represents exactly the same set of possible runtime objects as `other`
-    pub(crate) fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
+    pub(crate) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        _inferable: InferableTypeVars<'_, 'db>,
+        _visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
 
         let self_positive = self.positive(db);
         let other_positive = other.positive(db);
 
         if self_positive.len() != other_positive.len() {
-            return false;
+            return ConstraintSet::from(false);
         }
 
         let self_negative = self.negative(db);
         let other_negative = other.negative(db);
 
         if self_negative.len() != other_negative.len() {
-            return false;
+            return ConstraintSet::from(false);
         }
 
         let sorted_self = self.normalized(db);
 
         if sorted_self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
 
-        sorted_self == other.normalized(db)
+        ConstraintSet::from(sorted_self == other.normalized(db))
     }
 
     /// Returns an iterator over the positive elements of the intersection. If
     /// there are no positive elements, returns a single `object` type.
     fn positive_elements_or_object(self, db: &'db dyn Db) -> impl Iterator<Item = Type<'db>> {
         if self.positive(db).is_empty() {
-            Either::Left(std::iter::once(Type::object(db)))
+            Either::Left(std::iter::once(Type::object()))
         } else {
             Either::Right(self.positive(db).iter().copied())
         }
     }
 
+    /// Map a type transformation over all positive elements of the intersection. Leave the
+    /// negative elements unchanged.
+    pub(crate) fn map_positive(
+        self,
+        db: &'db dyn Db,
+        mut transform_fn: impl FnMut(&Type<'db>) -> Type<'db>,
+    ) -> Type<'db> {
+        let mut builder = IntersectionBuilder::new(db);
+        for ty in self.positive(db) {
+            builder = builder.add_positive(transform_fn(ty));
+        }
+        for ty in self.negative(db) {
+            builder = builder.add_negative(*ty);
+        }
+        builder.build()
+    }
+
     pub(crate) fn map_with_boundness(
         self,
         db: &'db dyn Db,
@@ -9518,13 +11358,15 @@ impl<'db> IntersectionType<'db> {
 
         let mut all_unbound = true;
         let mut any_definitely_bound = false;
+        let mut origin = TypeOrigin::Declared;
         for ty in self.positive_elements_or_object(db) {
             let ty_member = transform_fn(&ty);
             match ty_member {
-                Place::Unbound => {}
-                Place::Type(ty_member, member_boundness) => {
+                Place::Undefined => {}
+                Place::Defined(ty_member, member_origin, member_boundness) => {
+                    origin = origin.merge(member_origin);
                     all_unbound = false;
-                    if member_boundness == Boundness::Bound {
+                    if member_boundness == Definedness::AlwaysDefined {
                         any_definitely_bound = true;
                     }
 
@@ -9534,14 +11376,15 @@ impl<'db> IntersectionType<'db> {
         }
 
         if all_unbound {
-            Place::Unbound
+            Place::Undefined
         } else {
-            Place::Type(
+            Place::Defined(
                 builder.build(),
+                origin,
                 if any_definitely_bound {
-                    Boundness::Bound
+                    Definedness::AlwaysDefined
                 } else {
-                    Boundness::PossiblyUnbound
+                    Definedness::PossiblyUndefined
                 },
             )
         }
@@ -9555,8 +11398,9 @@ impl<'db> IntersectionType<'db> {
         let mut builder = IntersectionBuilder::new(db);
         let mut qualifiers = TypeQualifiers::empty();
 
-        let mut any_unbound = false;
-        let mut any_possibly_unbound = false;
+        let mut all_unbound = true;
+        let mut any_definitely_bound = false;
+        let mut origin = TypeOrigin::Declared;
         for ty in self.positive_elements_or_object(db) {
             let PlaceAndQualifiers {
                 place: member,
@@ -9564,12 +11408,12 @@ impl<'db> IntersectionType<'db> {
             } = transform_fn(&ty);
             qualifiers |= new_qualifiers;
             match member {
-                Place::Unbound => {
-                    any_unbound = true;
-                }
-                Place::Type(ty_member, member_boundness) => {
-                    if member_boundness == Boundness::PossiblyUnbound {
-                        any_possibly_unbound = true;
+                Place::Undefined => {}
+                Place::Defined(ty_member, member_origin, member_boundness) => {
+                    origin = origin.merge(member_origin);
+                    all_unbound = false;
+                    if member_boundness == Definedness::AlwaysDefined {
+                        any_definitely_bound = true;
                     }
 
                     builder = builder.add_positive(ty_member);
@@ -9578,15 +11422,16 @@ impl<'db> IntersectionType<'db> {
         }
 
         PlaceAndQualifiers {
-            place: if any_unbound {
-                Place::Unbound
+            place: if all_unbound {
+                Place::Undefined
             } else {
-                Place::Type(
+                Place::Defined(
                     builder.build(),
-                    if any_possibly_unbound {
-                        Boundness::PossiblyUnbound
+                    origin,
+                    if any_definitely_bound {
+                        Definedness::AlwaysDefined
                     } else {
-                        Boundness::Bound
+                        Definedness::PossiblyUndefined
                     },
                 )
             },
@@ -9626,14 +11471,6 @@ impl<'db> StringLiteralType<'db> {
     pub(crate) fn python_len(self, db: &'db dyn Db) -> usize {
         self.value(db).chars().count()
     }
-
-    /// Return an iterator over each character in the string literal.
-    /// as would be returned by Python's `iter()`.
-    pub(crate) fn iter_each_char(self, db: &'db dyn Db) -> impl Iterator<Item = Self> {
-        self.value(db)
-            .chars()
-            .map(|c| StringLiteralType::new(db, c.to_string().into_boxed_str()))
-    }
 }
 
 /// # Ordering
@@ -9683,387 +11520,6 @@ impl<'db> EnumLiteralType<'db> {
     }
 }
 
-/// Type that represents the set of all inhabitants (`dict` instances) that conform to
-/// a given `TypedDict` schema.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, salsa::Update, Hash, get_size2::GetSize)]
-pub struct TypedDictType<'db> {
-    /// A reference to the class (inheriting from `typing.TypedDict`) that specifies the
-    /// schema of this `TypedDict`.
-    defining_class: ClassType<'db>,
-}
-
-impl<'db> TypedDictType<'db> {
-    pub(crate) fn items(self, db: &'db dyn Db) -> FxOrderMap<Name, Field<'db>> {
-        let (class_literal, specialization) = self.defining_class.class_literal(db);
-        class_literal.fields(db, specialization, CodeGeneratorKind::TypedDict)
-    }
-
-    pub(crate) fn apply_type_mapping_impl<'a>(
-        self,
-        db: &'db dyn Db,
-        type_mapping: &TypeMapping<'a, 'db>,
-        visitor: &ApplyTypeMappingVisitor<'db>,
-    ) -> Self {
-        Self {
-            defining_class: self
-                .defining_class
-                .apply_type_mapping_impl(db, type_mapping, visitor),
-        }
-    }
-}
-
-fn walk_typed_dict_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
-    db: &'db dyn Db,
-    typed_dict: TypedDictType<'db>,
-    visitor: &V,
-) {
-    visitor.visit_type(db, typed_dict.defining_class.into());
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) enum BoundSuperError<'db> {
-    InvalidPivotClassType {
-        pivot_class: Type<'db>,
-    },
-    FailingConditionCheck {
-        pivot_class: Type<'db>,
-        owner: Type<'db>,
-    },
-    UnavailableImplicitArguments,
-}
-
-impl BoundSuperError<'_> {
-    pub(super) fn report_diagnostic(&self, context: &InferContext, node: AnyNodeRef) {
-        match self {
-            BoundSuperError::InvalidPivotClassType { pivot_class } => {
-                if let Some(builder) = context.report_lint(&INVALID_SUPER_ARGUMENT, node) {
-                    builder.into_diagnostic(format_args!(
-                        "`{pivot_class}` is not a valid class",
-                        pivot_class = pivot_class.display(context.db()),
-                    ));
-                }
-            }
-            BoundSuperError::FailingConditionCheck { pivot_class, owner } => {
-                if let Some(builder) = context.report_lint(&INVALID_SUPER_ARGUMENT, node) {
-                    builder.into_diagnostic(format_args!(
-                        "`{owner}` is not an instance or subclass of \
-                         `{pivot_class}` in `super({pivot_class}, {owner})` call",
-                        pivot_class = pivot_class.display(context.db()),
-                        owner = owner.display(context.db()),
-                    ));
-                }
-            }
-            BoundSuperError::UnavailableImplicitArguments => {
-                if let Some(builder) =
-                    context.report_lint(&UNAVAILABLE_IMPLICIT_SUPER_ARGUMENTS, node)
-                {
-                    builder.into_diagnostic(format_args!(
-                        "Cannot determine implicit arguments for 'super()' in this context",
-                    ));
-                }
-            }
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, get_size2::GetSize)]
-pub enum SuperOwnerKind<'db> {
-    Dynamic(DynamicType),
-    Class(ClassType<'db>),
-    Instance(NominalInstanceType<'db>),
-}
-
-impl<'db> SuperOwnerKind<'db> {
-    fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        match self {
-            SuperOwnerKind::Dynamic(dynamic) => SuperOwnerKind::Dynamic(dynamic.normalized()),
-            SuperOwnerKind::Class(class) => {
-                SuperOwnerKind::Class(class.normalized_impl(db, visitor))
-            }
-            SuperOwnerKind::Instance(instance) => instance
-                .normalized_impl(db, visitor)
-                .into_nominal_instance()
-                .map(Self::Instance)
-                .unwrap_or(Self::Dynamic(DynamicType::Any)),
-        }
-    }
-
-    fn iter_mro(self, db: &'db dyn Db) -> impl Iterator<Item = ClassBase<'db>> {
-        match self {
-            SuperOwnerKind::Dynamic(dynamic) => {
-                Either::Left(ClassBase::Dynamic(dynamic).mro(db, None))
-            }
-            SuperOwnerKind::Class(class) => Either::Right(class.iter_mro(db)),
-            SuperOwnerKind::Instance(instance) => Either::Right(instance.class(db).iter_mro(db)),
-        }
-    }
-
-    fn into_type(self) -> Type<'db> {
-        match self {
-            SuperOwnerKind::Dynamic(dynamic) => Type::Dynamic(dynamic),
-            SuperOwnerKind::Class(class) => class.into(),
-            SuperOwnerKind::Instance(instance) => instance.into(),
-        }
-    }
-
-    fn into_class(self, db: &'db dyn Db) -> Option<ClassType<'db>> {
-        match self {
-            SuperOwnerKind::Dynamic(_) => None,
-            SuperOwnerKind::Class(class) => Some(class),
-            SuperOwnerKind::Instance(instance) => Some(instance.class(db)),
-        }
-    }
-
-    fn try_from_type(db: &'db dyn Db, ty: Type<'db>) -> Option<Self> {
-        match ty {
-            Type::Dynamic(dynamic) => Some(SuperOwnerKind::Dynamic(dynamic)),
-            Type::ClassLiteral(class_literal) => Some(SuperOwnerKind::Class(
-                class_literal.apply_optional_specialization(db, None),
-            )),
-            Type::NominalInstance(instance) => Some(SuperOwnerKind::Instance(instance)),
-            Type::BooleanLiteral(_) => {
-                SuperOwnerKind::try_from_type(db, KnownClass::Bool.to_instance(db))
-            }
-            Type::IntLiteral(_) => {
-                SuperOwnerKind::try_from_type(db, KnownClass::Int.to_instance(db))
-            }
-            Type::StringLiteral(_) => {
-                SuperOwnerKind::try_from_type(db, KnownClass::Str.to_instance(db))
-            }
-            Type::LiteralString => {
-                SuperOwnerKind::try_from_type(db, KnownClass::Str.to_instance(db))
-            }
-            Type::BytesLiteral(_) => {
-                SuperOwnerKind::try_from_type(db, KnownClass::Bytes.to_instance(db))
-            }
-            Type::SpecialForm(special_form) => {
-                SuperOwnerKind::try_from_type(db, special_form.instance_fallback(db))
-            }
-            _ => None,
-        }
-    }
-}
-
-impl<'db> From<SuperOwnerKind<'db>> for Type<'db> {
-    fn from(owner: SuperOwnerKind<'db>) -> Self {
-        match owner {
-            SuperOwnerKind::Dynamic(dynamic) => Type::Dynamic(dynamic),
-            SuperOwnerKind::Class(class) => class.into(),
-            SuperOwnerKind::Instance(instance) => instance.into(),
-        }
-    }
-}
-
-/// Represent a bound super object like `super(PivotClass, owner)`
-#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
-pub struct BoundSuperType<'db> {
-    pub pivot_class: ClassBase<'db>,
-    pub owner: SuperOwnerKind<'db>,
-}
-
-// The Salsa heap is tracked separately.
-impl get_size2::GetSize for BoundSuperType<'_> {}
-
-fn walk_bound_super_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
-    db: &'db dyn Db,
-    bound_super: BoundSuperType<'db>,
-    visitor: &V,
-) {
-    visitor.visit_type(db, bound_super.pivot_class(db).into());
-    visitor.visit_type(db, bound_super.owner(db).into_type());
-}
-
-impl<'db> BoundSuperType<'db> {
-    /// Attempts to build a `Type::BoundSuper` based on the given `pivot_class` and `owner`.
-    ///
-    /// This mimics the behavior of Python's built-in `super(pivot, owner)` at runtime.
-    /// - `super(pivot, owner_class)` is valid only if `issubclass(owner_class, pivot)`
-    /// - `super(pivot, owner_instance)` is valid only if `isinstance(owner_instance, pivot)`
-    ///
-    /// However, the checking is skipped when any of the arguments is a dynamic type.
-    fn build(
-        db: &'db dyn Db,
-        pivot_class_type: Type<'db>,
-        owner_type: Type<'db>,
-    ) -> Result<Type<'db>, BoundSuperError<'db>> {
-        if let Type::Union(union) = owner_type {
-            return Ok(UnionType::from_elements(
-                db,
-                union
-                    .elements(db)
-                    .iter()
-                    .map(|ty| BoundSuperType::build(db, pivot_class_type, *ty))
-                    .collect::<Result<Vec<_>, _>>()?,
-            ));
-        }
-
-        // We don't use `Classbase::try_from_type` here because:
-        // - There are objects that may validly be present in a class's bases list
-        //   but are not valid as pivot classes, e.g. `typing.ChainMap`
-        // - There are objects that are not valid in a class's bases list
-        //   but are valid as pivot classes, e.g. unsubscripted `typing.Generic`
-        let pivot_class = match pivot_class_type {
-            Type::ClassLiteral(class) => ClassBase::Class(ClassType::NonGeneric(class)),
-            Type::GenericAlias(class) => ClassBase::Class(ClassType::Generic(class)),
-            Type::SubclassOf(subclass_of) if subclass_of.subclass_of().is_dynamic() => {
-                ClassBase::Dynamic(
-                    subclass_of
-                        .subclass_of()
-                        .into_dynamic()
-                        .expect("Checked in branch arm"),
-                )
-            }
-            Type::SpecialForm(SpecialFormType::Protocol) => ClassBase::Protocol,
-            Type::SpecialForm(SpecialFormType::Generic) => ClassBase::Generic,
-            Type::SpecialForm(SpecialFormType::TypedDict) => ClassBase::TypedDict,
-            Type::Dynamic(dynamic) => ClassBase::Dynamic(dynamic),
-            _ => {
-                return Err(BoundSuperError::InvalidPivotClassType {
-                    pivot_class: pivot_class_type,
-                });
-            }
-        };
-
-        let owner = SuperOwnerKind::try_from_type(db, owner_type)
-            .and_then(|owner| {
-                let Some(pivot_class) = pivot_class.into_class() else {
-                    return Some(owner);
-                };
-                let Some(owner_class) = owner.into_class(db) else {
-                    return Some(owner);
-                };
-                if owner_class.is_subclass_of(db, pivot_class) {
-                    Some(owner)
-                } else {
-                    None
-                }
-            })
-            .ok_or(BoundSuperError::FailingConditionCheck {
-                pivot_class: pivot_class_type,
-                owner: owner_type,
-            })?;
-
-        Ok(Type::BoundSuper(BoundSuperType::new(
-            db,
-            pivot_class,
-            owner,
-        )))
-    }
-
-    /// Skips elements in the MRO up to and including the pivot class.
-    ///
-    /// If the pivot class is a dynamic type, its MRO can't be determined,
-    /// so we fall back to using the MRO of `DynamicType::Unknown`.
-    fn skip_until_after_pivot(
-        self,
-        db: &'db dyn Db,
-        mro_iter: impl Iterator<Item = ClassBase<'db>>,
-    ) -> impl Iterator<Item = ClassBase<'db>> {
-        let Some(pivot_class) = self.pivot_class(db).into_class() else {
-            return Either::Left(ClassBase::Dynamic(DynamicType::Unknown).mro(db, None));
-        };
-
-        let mut pivot_found = false;
-
-        Either::Right(mro_iter.skip_while(move |superclass| {
-            if pivot_found {
-                false
-            } else if Some(pivot_class) == superclass.into_class() {
-                pivot_found = true;
-                true
-            } else {
-                true
-            }
-        }))
-    }
-
-    /// Tries to call `__get__` on the attribute.
-    /// The arguments passed to `__get__` depend on whether the owner is an instance or a class.
-    /// See the `CPython` implementation for reference:
-    /// <https://github.com/python/cpython/blob/3b3720f1a26ab34377542b48eb6a6565f78ff892/Objects/typeobject.c#L11690-L11693>
-    fn try_call_dunder_get_on_attribute(
-        self,
-        db: &'db dyn Db,
-        attribute: PlaceAndQualifiers<'db>,
-    ) -> Option<PlaceAndQualifiers<'db>> {
-        let owner = self.owner(db);
-
-        match owner {
-            // If the owner is a dynamic type, we can't tell whether it's a class or an instance.
-            // Also, invoking a descriptor on a dynamic attribute is meaningless, so we don't handle this.
-            SuperOwnerKind::Dynamic(_) => None,
-            SuperOwnerKind::Class(_) => Some(
-                Type::try_call_dunder_get_on_attribute(
-                    db,
-                    attribute,
-                    Type::none(db),
-                    owner.into_type(),
-                )
-                .0,
-            ),
-            SuperOwnerKind::Instance(_) => Some(
-                Type::try_call_dunder_get_on_attribute(
-                    db,
-                    attribute,
-                    owner.into_type(),
-                    owner.into_type().to_meta_type(db),
-                )
-                .0,
-            ),
-        }
-    }
-
-    /// Similar to `Type::find_name_in_mro_with_policy`, but performs lookup starting *after* the
-    /// pivot class in the MRO, based on the `owner` type instead of the `super` type.
-    fn find_name_in_mro_after_pivot(
-        self,
-        db: &'db dyn Db,
-        name: &str,
-        policy: MemberLookupPolicy,
-    ) -> PlaceAndQualifiers<'db> {
-        let owner = self.owner(db);
-        let class = match owner {
-            SuperOwnerKind::Dynamic(_) => {
-                return owner
-                    .into_type()
-                    .find_name_in_mro_with_policy(db, name, policy)
-                    .expect("Calling `find_name_in_mro` on dynamic type should return `Some`");
-            }
-            SuperOwnerKind::Class(class) => class,
-            SuperOwnerKind::Instance(instance) => instance.class(db),
-        };
-
-        let (class_literal, _) = class.class_literal(db);
-        // TODO properly support super() with generic types
-        // * requires a fix for https://github.com/astral-sh/ruff/issues/17432
-        // * also requires understanding how we should handle cases like this:
-        //  ```python
-        //  b_int: B[int]
-        //  b_unknown: B
-        //
-        //  super(B, b_int)
-        //  super(B[int], b_unknown)
-        //  ```
-        match class_literal.generic_context(db) {
-            Some(_) => Place::bound(todo_type!("super in generic class")).into(),
-            None => class_literal.class_member_from_mro(
-                db,
-                name,
-                policy,
-                self.skip_until_after_pivot(db, owner.iter_mro(db)),
-            ),
-        }
-    }
-
-    pub(super) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        Self::new(
-            db,
-            self.pivot_class(db).normalized_impl(db, visitor),
-            self.owner(db).normalized_impl(db, visitor),
-        )
-    }
-}
-
 #[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
 pub struct TypeIsType<'db> {
     return_type: Type<'db>,
@@ -10124,6 +11580,34 @@ impl<'db> TypeIsType<'db> {
     }
 }
 
+impl<'db> VarianceInferable<'db> for TypeIsType<'db> {
+    // See the [typing spec] on why `TypeIs` is invariant in its type.
+    // [typing spec]: https://typing.python.org/en/latest/spec/narrowing.html#typeis
+    fn variance_of(self, db: &'db dyn Db, typevar: BoundTypeVarInstance<'db>) -> TypeVarVariance {
+        self.return_type(db)
+            .with_polarity(TypeVarVariance::Invariant)
+            .variance_of(db, typevar)
+    }
+}
+
+/// Walk the MRO of this class and return the last class just before the specified known base.
+/// This can be used to determine upper bounds for `Self` type variables on methods that are
+/// being added to the given class.
+pub(super) fn determine_upper_bound<'db>(
+    db: &'db dyn Db,
+    class_literal: ClassLiteral<'db>,
+    specialization: Option<Specialization<'db>>,
+    is_known_base: impl Fn(ClassBase<'db>) -> bool,
+) -> Type<'db> {
+    let upper_bound = class_literal
+        .iter_mro(db, specialization)
+        .take_while(|base| !is_known_base(*base))
+        .filter_map(ClassBase::into_class)
+        .last()
+        .unwrap_or_else(|| class_literal.unknown_specialization(db));
+    Type::instance(db, upper_bound)
+}
+
 // Make sure that the `Type` enum does not grow unexpectedly.
 #[cfg(not(debug_assertions))]
 #[cfg(target_pointer_width = "64")]
@@ -10133,11 +11617,10 @@ static_assertions::assert_eq_size!(Type, [u8; 16]);
 pub(crate) mod tests {
     use super::*;
     use crate::db::tests::{TestDbBuilder, setup_db};
-    use crate::place::{global_symbol, typing_extensions_symbol, typing_symbol};
+    use crate::place::{typing_extensions_symbol, typing_symbol};
+    use crate::semantic_index::FileScopeId;
     use ruff_db::files::system_path_to_file;
-    use ruff_db::parsed::parsed_module;
     use ruff_db::system::DbWithWritableSystem as _;
-    use ruff_db::testing::assert_function_query_was_not_run;
     use ruff_python_ast::PythonVersion;
     use test_case::test_case;
 
@@ -10176,65 +11659,6 @@ pub(crate) mod tests {
         );
     }
 
-    /// Inferring the result of a call-expression shouldn't need to re-run after
-    /// a trivial change to the function's file (e.g. by adding a docstring to the function).
-    #[test]
-    fn call_type_doesnt_rerun_when_only_callee_changed() -> anyhow::Result<()> {
-        let mut db = setup_db();
-
-        db.write_dedented(
-            "src/foo.py",
-            r#"
-            def foo() -> int:
-                return 5
-        "#,
-        )?;
-        db.write_dedented(
-            "src/bar.py",
-            r#"
-            from foo import foo
-
-            a = foo()
-            "#,
-        )?;
-
-        let bar = system_path_to_file(&db, "src/bar.py")?;
-        let a = global_symbol(&db, bar, "a").place;
-
-        assert_eq!(
-            a.expect_type(),
-            UnionType::from_elements(&db, [Type::unknown(), KnownClass::Int.to_instance(&db)])
-        );
-
-        // Add a docstring to foo to trigger a re-run.
-        // The bar-call site of foo should not be re-run because of that
-        db.write_dedented(
-            "src/foo.py",
-            r#"
-            def foo() -> int:
-                "Computes a value"
-                return 5
-            "#,
-        )?;
-        db.clear_salsa_events();
-
-        let a = global_symbol(&db, bar, "a").place;
-
-        assert_eq!(
-            a.expect_type(),
-            UnionType::from_elements(&db, [Type::unknown(), KnownClass::Int.to_instance(&db)])
-        );
-        let events = db.take_salsa_events();
-
-        let module = parsed_module(&db, bar).load(&db);
-        let call = &*module.syntax().body[1].as_assign_stmt().unwrap().value;
-        let foo_call = semantic_index(&db, bar).expression(call);
-
-        assert_function_query_was_not_run(&db, infer_expression_types, foo_call, &events);
-
-        Ok(())
-    }
-
     /// All other tests also make sure that `Type::Todo` works as expected. This particular
     /// test makes sure that we handle `Todo` types correctly, even if they originate from
     /// different sources.
@@ -10279,4 +11703,151 @@ pub(crate) mod tests {
                 .is_todo()
         );
     }
+
+    #[test]
+    fn divergent_type() {
+        let mut db = setup_db();
+
+        db.write_dedented("src/foo.py", "").unwrap();
+        let file = system_path_to_file(&db, "src/foo.py").unwrap();
+        let file_scope_id = FileScopeId::global();
+        let scope = file_scope_id.to_scope_id(&db, file);
+
+        let div = Type::Dynamic(DynamicType::Divergent(DivergentType { scope: Some(scope) }));
+
+        // The `Divergent` type must not be eliminated in union with other dynamic types,
+        // as this would prevent detection of divergent type inference using `Divergent`.
+        let union = UnionType::from_elements(&db, [Type::unknown(), div]);
+        assert_eq!(union.display(&db).to_string(), "Unknown | Divergent");
+
+        let union = UnionType::from_elements(&db, [div, Type::unknown()]);
+        assert_eq!(union.display(&db).to_string(), "Divergent | Unknown");
+
+        let union = UnionType::from_elements(&db, [div, Type::unknown(), todo_type!("1")]);
+        assert_eq!(union.display(&db).to_string(), "Divergent | Unknown");
+
+        assert!(div.is_equivalent_to(&db, div));
+        assert!(!div.is_equivalent_to(&db, Type::unknown()));
+        assert!(!Type::unknown().is_equivalent_to(&db, div));
+
+        // The `object` type has a good convergence property, that is, its union with all other types is `object`.
+        // (e.g. `object | tuple[Divergent] == object`, `object | tuple[object] == object`)
+        // So we can safely eliminate `Divergent`.
+        let union = UnionType::from_elements(&db, [div, KnownClass::Object.to_instance(&db)]);
+        assert_eq!(union.display(&db).to_string(), "object");
+
+        let union = UnionType::from_elements(&db, [KnownClass::Object.to_instance(&db), div]);
+        assert_eq!(union.display(&db).to_string(), "object");
+
+        // The same can be said about intersections for the `Never` type.
+        let intersection = IntersectionBuilder::new(&db)
+            .add_positive(Type::Never)
+            .add_positive(div)
+            .build();
+        assert_eq!(intersection.display(&db).to_string(), "Never");
+
+        let intersection = IntersectionBuilder::new(&db)
+            .add_positive(div)
+            .add_positive(Type::Never)
+            .build();
+        assert_eq!(intersection.display(&db).to_string(), "Never");
+    }
+
+    #[test]
+    fn type_alias_variance() {
+        use crate::db::tests::TestDb;
+        use crate::place::global_symbol;
+
+        fn get_type_alias<'db>(db: &'db TestDb, name: &str) -> PEP695TypeAliasType<'db> {
+            let module = ruff_db::files::system_path_to_file(db, "/src/a.py").unwrap();
+            let ty = global_symbol(db, module, name).place.expect_type();
+            let Type::KnownInstance(KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(
+                type_alias,
+            ))) = ty
+            else {
+                panic!("Expected `{name}` to be a type alias");
+            };
+            type_alias
+        }
+        fn get_bound_typevar<'db>(
+            db: &'db TestDb,
+            type_alias: PEP695TypeAliasType<'db>,
+        ) -> BoundTypeVarInstance<'db> {
+            let generic_context = type_alias.generic_context(db).unwrap();
+            generic_context.variables(db).next().unwrap()
+        }
+
+        let mut db = setup_db();
+        db.write_dedented(
+            "/src/a.py",
+            r#"
+class Covariant[T]:
+    def get(self) -> T:
+        raise ValueError
+
+class Contravariant[T]:
+    def set(self, value: T):
+        pass
+
+class Invariant[T]:
+    def get(self) -> T:
+        raise ValueError
+    def set(self, value: T):
+        pass
+
+class Bivariant[T]:
+    pass
+
+type CovariantAlias[T] = Covariant[T]
+type ContravariantAlias[T] = Contravariant[T]
+type InvariantAlias[T] = Invariant[T]
+type BivariantAlias[T] = Bivariant[T]
+
+type RecursiveAlias[T] = None | list[RecursiveAlias[T]]
+type RecursiveAlias2[T] = None | list[T] | list[RecursiveAlias2[T]]
+"#,
+        )
+        .unwrap();
+        let covariant = get_type_alias(&db, "CovariantAlias");
+        assert_eq!(
+            KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(covariant))
+                .variance_of(&db, get_bound_typevar(&db, covariant)),
+            TypeVarVariance::Covariant
+        );
+
+        let contravariant = get_type_alias(&db, "ContravariantAlias");
+        assert_eq!(
+            KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(contravariant))
+                .variance_of(&db, get_bound_typevar(&db, contravariant)),
+            TypeVarVariance::Contravariant
+        );
+
+        let invariant = get_type_alias(&db, "InvariantAlias");
+        assert_eq!(
+            KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(invariant))
+                .variance_of(&db, get_bound_typevar(&db, invariant)),
+            TypeVarVariance::Invariant
+        );
+
+        let bivariant = get_type_alias(&db, "BivariantAlias");
+        assert_eq!(
+            KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(bivariant))
+                .variance_of(&db, get_bound_typevar(&db, bivariant)),
+            TypeVarVariance::Bivariant
+        );
+
+        let recursive = get_type_alias(&db, "RecursiveAlias");
+        assert_eq!(
+            KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(recursive))
+                .variance_of(&db, get_bound_typevar(&db, recursive)),
+            TypeVarVariance::Bivariant
+        );
+
+        let recursive2 = get_type_alias(&db, "RecursiveAlias2");
+        assert_eq!(
+            KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(recursive2))
+                .variance_of(&db, get_bound_typevar(&db, recursive2)),
+            TypeVarVariance::Invariant
+        );
+    }
 }
diff --git a/crates/ty_python_semantic/src/types/bound_super.rs b/crates/ty_python_semantic/src/types/bound_super.rs
new file mode 100644
index 0000000000..72782a4eac
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/bound_super.rs
@@ -0,0 +1,582 @@
+//! Logic for inferring `super()`, `super(x)` and `super(x, y)` calls.
+
+use itertools::{Either, Itertools};
+use ruff_db::diagnostic::Diagnostic;
+use ruff_python_ast::AnyNodeRef;
+
+use crate::{
+    Db, DisplaySettings,
+    place::{Place, PlaceAndQualifiers},
+    types::{
+        ClassBase, ClassType, DynamicType, IntersectionBuilder, KnownClass, MemberLookupPolicy,
+        NominalInstanceType, NormalizedVisitor, SpecialFormType, SubclassOfInner, Type,
+        TypeVarBoundOrConstraints, TypeVarInstance, UnionBuilder,
+        context::InferContext,
+        diagnostic::{INVALID_SUPER_ARGUMENT, UNAVAILABLE_IMPLICIT_SUPER_ARGUMENTS},
+        todo_type, visitor,
+    },
+};
+
+/// Enumeration of ways in which a `super()` call can cause us to emit a diagnostic.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) enum BoundSuperError<'db> {
+    /// The second argument to `super()` (which may have been implicitly provided by
+    /// the Python interpreter) has an abstract or structural type.
+    /// It's impossible to determine whether a `Callable` type or a synthesized protocol
+    /// type is an instance or subclass of the pivot class, so these are rejected.
+    AbstractOwnerType {
+        owner_type: Type<'db>,
+        pivot_class: Type<'db>,
+        /// If `owner_type` is a type variable, this contains the type variable instance
+        typevar_context: Option<TypeVarInstance<'db>>,
+    },
+    /// The first argument to `super()` (which may have been implicitly provided by
+    /// the Python interpreter) is not a valid class type.
+    InvalidPivotClassType { pivot_class: Type<'db> },
+    /// The second argument to `super()` was not a subclass or instance of the first argument.
+    /// (Note that both arguments may have been implicitly provided by the Python interpreter.)
+    FailingConditionCheck {
+        pivot_class: Type<'db>,
+        owner: Type<'db>,
+        /// If `owner_type` is a type variable, this contains the type variable instance
+        typevar_context: Option<TypeVarInstance<'db>>,
+    },
+    /// It was a single-argument `super()` call, but we were unable to determine
+    /// the implicit arguments provided by the Python interpreter.
+    UnavailableImplicitArguments,
+}
+
+impl<'db> BoundSuperError<'db> {
+    pub(super) fn report_diagnostic(&self, context: &'db InferContext<'db, '_>, node: AnyNodeRef) {
+        match self {
+            BoundSuperError::AbstractOwnerType {
+                owner_type,
+                pivot_class,
+                typevar_context,
+            } => {
+                if let Some(builder) = context.report_lint(&INVALID_SUPER_ARGUMENT, node) {
+                    if let Some(typevar_context) = typevar_context {
+                        let mut diagnostic = builder.into_diagnostic(format_args!(
+                            "`{owner}` is a type variable with an abstract/structural type as \
+                            its bounds or constraints, in `super({pivot_class}, {owner})` call",
+                            pivot_class = pivot_class.display(context.db()),
+                            owner = owner_type.display(context.db()),
+                        ));
+                        Self::describe_typevar(context.db(), &mut diagnostic, *typevar_context);
+                    } else {
+                        builder.into_diagnostic(format_args!(
+                            "`{owner}` is an abstract/structural type in \
+                            `super({pivot_class}, {owner})` call",
+                            pivot_class = pivot_class.display(context.db()),
+                            owner = owner_type.display(context.db()),
+                        ));
+                    }
+                }
+            }
+            BoundSuperError::InvalidPivotClassType { pivot_class } => {
+                if let Some(builder) = context.report_lint(&INVALID_SUPER_ARGUMENT, node) {
+                    match pivot_class {
+                        Type::GenericAlias(alias) => builder.into_diagnostic(format_args!(
+                            "`types.GenericAlias` instance `{}` is not a valid class",
+                            alias.display_with(context.db(), DisplaySettings::default()),
+                        )),
+                        _ => builder.into_diagnostic(format_args!(
+                            "`{pivot_class}` is not a valid class",
+                            pivot_class = pivot_class.display(context.db()),
+                        )),
+                    };
+                }
+            }
+            BoundSuperError::FailingConditionCheck {
+                pivot_class,
+                owner,
+                typevar_context,
+            } => {
+                if let Some(builder) = context.report_lint(&INVALID_SUPER_ARGUMENT, node) {
+                    let mut diagnostic = builder.into_diagnostic(format_args!(
+                        "`{owner}` is not an instance or subclass of \
+                        `{pivot_class}` in `super({pivot_class}, {owner})` call",
+                        pivot_class = pivot_class.display(context.db()),
+                        owner = owner.display(context.db()),
+                    ));
+                    if let Some(typevar_context) = typevar_context {
+                        let bound_or_constraints_union =
+                            Self::describe_typevar(context.db(), &mut diagnostic, *typevar_context);
+                        diagnostic.info(format_args!(
+                            "`{bounds_or_constraints}` is not an instance or subclass of `{pivot_class}`",
+                            bounds_or_constraints =
+                                bound_or_constraints_union.display(context.db()),
+                            pivot_class = pivot_class.display(context.db()),
+                        ));
+                        if typevar_context.bound_or_constraints(context.db()).is_none()
+                            && !typevar_context.kind(context.db()).is_self()
+                        {
+                            diagnostic.help(format_args!(
+                                "Consider adding an upper bound to type variable `{}`",
+                                typevar_context.name(context.db())
+                            ));
+                        }
+                    }
+                }
+            }
+            BoundSuperError::UnavailableImplicitArguments => {
+                if let Some(builder) =
+                    context.report_lint(&UNAVAILABLE_IMPLICIT_SUPER_ARGUMENTS, node)
+                {
+                    builder.into_diagnostic(format_args!(
+                        "Cannot determine implicit arguments for 'super()' in this context",
+                    ));
+                }
+            }
+        }
+    }
+
+    /// Add an `info`-level diagnostic describing the bounds or constraints,
+    /// and return the type variable's upper bound or the union of its constraints.
+    fn describe_typevar(
+        db: &'db dyn Db,
+        diagnostic: &mut Diagnostic,
+        type_var: TypeVarInstance<'db>,
+    ) -> Type<'db> {
+        match type_var.bound_or_constraints(db) {
+            Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
+                diagnostic.info(format_args!(
+                    "Type variable `{}` has upper bound `{}`",
+                    type_var.name(db),
+                    bound.display(db)
+                ));
+                bound
+            }
+            Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
+                diagnostic.info(format_args!(
+                    "Type variable `{}` has constraints `{}`",
+                    type_var.name(db),
+                    constraints
+                        .elements(db)
+                        .iter()
+                        .map(|c| c.display(db))
+                        .join(", ")
+                ));
+                Type::Union(constraints)
+            }
+            None => {
+                diagnostic.info(format_args!(
+                    "Type variable `{}` has `object` as its implicit upper bound",
+                    type_var.name(db)
+                ));
+                Type::object()
+            }
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, get_size2::GetSize)]
+pub enum SuperOwnerKind<'db> {
+    Dynamic(DynamicType<'db>),
+    Class(ClassType<'db>),
+    Instance(NominalInstanceType<'db>),
+}
+
+impl<'db> SuperOwnerKind<'db> {
+    fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
+        match self {
+            SuperOwnerKind::Dynamic(dynamic) => SuperOwnerKind::Dynamic(dynamic.normalized()),
+            SuperOwnerKind::Class(class) => {
+                SuperOwnerKind::Class(class.normalized_impl(db, visitor))
+            }
+            SuperOwnerKind::Instance(instance) => instance
+                .normalized_impl(db, visitor)
+                .into_nominal_instance()
+                .map(Self::Instance)
+                .unwrap_or(Self::Dynamic(DynamicType::Any)),
+        }
+    }
+
+    fn iter_mro(self, db: &'db dyn Db) -> impl Iterator<Item = ClassBase<'db>> {
+        match self {
+            SuperOwnerKind::Dynamic(dynamic) => {
+                Either::Left(ClassBase::Dynamic(dynamic).mro(db, None))
+            }
+            SuperOwnerKind::Class(class) => Either::Right(class.iter_mro(db)),
+            SuperOwnerKind::Instance(instance) => Either::Right(instance.class(db).iter_mro(db)),
+        }
+    }
+
+    fn into_class(self, db: &'db dyn Db) -> Option<ClassType<'db>> {
+        match self {
+            SuperOwnerKind::Dynamic(_) => None,
+            SuperOwnerKind::Class(class) => Some(class),
+            SuperOwnerKind::Instance(instance) => Some(instance.class(db)),
+        }
+    }
+}
+
+impl<'db> From<SuperOwnerKind<'db>> for Type<'db> {
+    fn from(owner: SuperOwnerKind<'db>) -> Self {
+        match owner {
+            SuperOwnerKind::Dynamic(dynamic) => Type::Dynamic(dynamic),
+            SuperOwnerKind::Class(class) => class.into(),
+            SuperOwnerKind::Instance(instance) => instance.into(),
+        }
+    }
+}
+
+/// Represent a bound super object like `super(PivotClass, owner)`
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+pub struct BoundSuperType<'db> {
+    pub pivot_class: ClassBase<'db>,
+    pub owner: SuperOwnerKind<'db>,
+}
+
+// The Salsa heap is tracked separately.
+impl get_size2::GetSize for BoundSuperType<'_> {}
+
+pub(super) fn walk_bound_super_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
+    db: &'db dyn Db,
+    bound_super: BoundSuperType<'db>,
+    visitor: &V,
+) {
+    visitor.visit_type(db, Type::from(bound_super.pivot_class(db)));
+    visitor.visit_type(db, Type::from(bound_super.owner(db)));
+}
+
+impl<'db> BoundSuperType<'db> {
+    /// Attempts to build a `Type::BoundSuper` based on the given `pivot_class` and `owner`.
+    ///
+    /// This mimics the behavior of Python's built-in `super(pivot, owner)` at runtime.
+    /// - `super(pivot, owner_class)` is valid only if `issubclass(owner_class, pivot)`
+    /// - `super(pivot, owner_instance)` is valid only if `isinstance(owner_instance, pivot)`
+    ///
+    /// However, the checking is skipped when any of the arguments is a dynamic type.
+    pub(super) fn build(
+        db: &'db dyn Db,
+        pivot_class_type: Type<'db>,
+        owner_type: Type<'db>,
+    ) -> Result<Type<'db>, BoundSuperError<'db>> {
+        let delegate_to =
+            |type_to_delegate_to| BoundSuperType::build(db, pivot_class_type, type_to_delegate_to);
+
+        let delegate_with_error_mapped =
+            |type_to_delegate_to, error_context: Option<TypeVarInstance<'db>>| {
+                delegate_to(type_to_delegate_to).map_err(|err| match err {
+                    BoundSuperError::AbstractOwnerType {
+                        owner_type: _,
+                        pivot_class: _,
+                        typevar_context: _,
+                    } => BoundSuperError::AbstractOwnerType {
+                        owner_type,
+                        pivot_class: pivot_class_type,
+                        typevar_context: error_context,
+                    },
+                    BoundSuperError::FailingConditionCheck {
+                        pivot_class,
+                        owner: _,
+                        typevar_context: _,
+                    } => BoundSuperError::FailingConditionCheck {
+                        pivot_class,
+                        owner: owner_type,
+                        typevar_context: error_context,
+                    },
+                    BoundSuperError::InvalidPivotClassType { pivot_class } => {
+                        BoundSuperError::InvalidPivotClassType { pivot_class }
+                    }
+                    BoundSuperError::UnavailableImplicitArguments => {
+                        BoundSuperError::UnavailableImplicitArguments
+                    }
+                })
+            };
+
+        let owner = match owner_type {
+            Type::Never => SuperOwnerKind::Dynamic(DynamicType::Unknown),
+            Type::Dynamic(dynamic) => SuperOwnerKind::Dynamic(dynamic),
+            Type::ClassLiteral(class) => SuperOwnerKind::Class(ClassType::NonGeneric(class)),
+            Type::SubclassOf(subclass_of_type) => match subclass_of_type.subclass_of() {
+                SubclassOfInner::Class(class) => SuperOwnerKind::Class(class),
+                SubclassOfInner::Dynamic(dynamic) => SuperOwnerKind::Dynamic(dynamic),
+            },
+            Type::NominalInstance(instance) => SuperOwnerKind::Instance(instance),
+
+            Type::ProtocolInstance(protocol) => {
+                if let Some(nominal_instance) = protocol.as_nominal_type() {
+                    SuperOwnerKind::Instance(nominal_instance)
+                } else {
+                    return Err(BoundSuperError::AbstractOwnerType {
+                        owner_type,
+                        pivot_class: pivot_class_type,
+                        typevar_context: None,
+                    });
+                }
+            }
+
+            Type::Union(union) => {
+                return Ok(union
+                    .elements(db)
+                    .iter()
+                    .try_fold(UnionBuilder::new(db), |builder, element| {
+                        delegate_to(*element).map(|ty| builder.add(ty))
+                    })?
+                    .build());
+            }
+            Type::Intersection(intersection) => {
+                let mut builder = IntersectionBuilder::new(db);
+                let mut one_good_element_found = false;
+                for positive in intersection.positive(db) {
+                    if let Ok(good_element) = delegate_to(*positive) {
+                        one_good_element_found = true;
+                        builder = builder.add_positive(good_element);
+                    }
+                }
+                if !one_good_element_found {
+                    return Err(BoundSuperError::AbstractOwnerType {
+                        owner_type,
+                        pivot_class: pivot_class_type,
+                        typevar_context: None,
+                    });
+                }
+                for negative in intersection.negative(db) {
+                    if let Ok(good_element) = delegate_to(*negative) {
+                        builder = builder.add_negative(good_element);
+                    }
+                }
+                return Ok(builder.build());
+            }
+            Type::TypeAlias(alias) => {
+                return delegate_with_error_mapped(alias.value_type(db), None);
+            }
+            Type::TypeVar(type_var) => {
+                let type_var = type_var.typevar(db);
+                return match type_var.bound_or_constraints(db) {
+                    Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
+                        delegate_with_error_mapped(bound, Some(type_var))
+                    }
+                    Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
+                        delegate_with_error_mapped(Type::Union(constraints), Some(type_var))
+                    }
+                    None => delegate_with_error_mapped(Type::object(), Some(type_var)),
+                };
+            }
+            Type::BooleanLiteral(_) | Type::TypeIs(_) => {
+                return delegate_to(KnownClass::Bool.to_instance(db));
+            }
+            Type::IntLiteral(_) => return delegate_to(KnownClass::Int.to_instance(db)),
+            Type::StringLiteral(_) | Type::LiteralString => {
+                return delegate_to(KnownClass::Str.to_instance(db));
+            }
+            Type::BytesLiteral(_) => {
+                return delegate_to(KnownClass::Bytes.to_instance(db));
+            }
+            Type::SpecialForm(special_form) => {
+                return delegate_to(special_form.instance_fallback(db));
+            }
+            Type::KnownInstance(instance) => {
+                return delegate_to(instance.instance_fallback(db));
+            }
+            Type::FunctionLiteral(_) | Type::DataclassDecorator(_) => {
+                return delegate_to(KnownClass::FunctionType.to_instance(db));
+            }
+            Type::WrapperDescriptor(_) => {
+                return delegate_to(KnownClass::WrapperDescriptorType.to_instance(db));
+            }
+            Type::KnownBoundMethod(method) => {
+                return delegate_to(method.class().to_instance(db));
+            }
+            Type::BoundMethod(_) => return delegate_to(KnownClass::MethodType.to_instance(db)),
+            Type::ModuleLiteral(_) => {
+                return delegate_to(KnownClass::ModuleType.to_instance(db));
+            }
+            Type::GenericAlias(_) => return delegate_to(KnownClass::GenericAlias.to_instance(db)),
+            Type::PropertyInstance(_) => return delegate_to(KnownClass::Property.to_instance(db)),
+            Type::EnumLiteral(enum_literal_type) => {
+                return delegate_to(enum_literal_type.enum_class_instance(db));
+            }
+            Type::BoundSuper(_) => return delegate_to(KnownClass::Super.to_instance(db)),
+            Type::TypedDict(td) => {
+                // In general it isn't sound to upcast a `TypedDict` to a `dict`,
+                // but here it seems like it's probably sound?
+                let mut key_builder = UnionBuilder::new(db);
+                let mut value_builder = UnionBuilder::new(db);
+                for (name, field) in td.items(db) {
+                    key_builder = key_builder.add(Type::string_literal(db, &name));
+                    value_builder = value_builder.add(field.declared_ty);
+                }
+                return delegate_to(
+                    KnownClass::Dict
+                        .to_specialized_instance(db, [key_builder.build(), value_builder.build()]),
+                );
+            }
+            Type::Callable(callable) if callable.is_function_like(db) => {
+                return delegate_to(KnownClass::FunctionType.to_instance(db));
+            }
+            Type::AlwaysFalsy
+            | Type::AlwaysTruthy
+            | Type::Callable(_)
+            | Type::DataclassTransformer(_) => {
+                return Err(BoundSuperError::AbstractOwnerType {
+                    owner_type,
+                    pivot_class: pivot_class_type,
+                    typevar_context: None,
+                });
+            }
+        };
+
+        // We don't use `Classbase::try_from_type` here because:
+        // - There are objects that may validly be present in a class's bases list
+        //   but are not valid as pivot classes, e.g. `typing.ChainMap`
+        // - There are objects that are not valid in a class's bases list
+        //   but are valid as pivot classes, e.g. unsubscripted `typing.Generic`
+        let pivot_class = match pivot_class_type {
+            Type::ClassLiteral(class) => ClassBase::Class(ClassType::NonGeneric(class)),
+            Type::SubclassOf(subclass_of) => match subclass_of.subclass_of() {
+                SubclassOfInner::Class(class) => ClassBase::Class(class),
+                SubclassOfInner::Dynamic(dynamic) => ClassBase::Dynamic(dynamic),
+            },
+            Type::SpecialForm(SpecialFormType::Protocol) => ClassBase::Protocol,
+            Type::SpecialForm(SpecialFormType::Generic) => ClassBase::Generic,
+            Type::SpecialForm(SpecialFormType::TypedDict) => ClassBase::TypedDict,
+            Type::Dynamic(dynamic) => ClassBase::Dynamic(dynamic),
+            _ => {
+                return Err(BoundSuperError::InvalidPivotClassType {
+                    pivot_class: pivot_class_type,
+                });
+            }
+        };
+
+        if let Some(pivot_class) = pivot_class.into_class()
+            && let Some(owner_class) = owner.into_class(db)
+        {
+            let pivot_class = pivot_class.class_literal(db).0;
+            if !owner_class.iter_mro(db).any(|superclass| match superclass {
+                ClassBase::Dynamic(_) => true,
+                ClassBase::Generic | ClassBase::Protocol | ClassBase::TypedDict => false,
+                ClassBase::Class(superclass) => superclass.class_literal(db).0 == pivot_class,
+            }) {
+                return Err(BoundSuperError::FailingConditionCheck {
+                    pivot_class: pivot_class_type,
+                    owner: owner_type,
+                    typevar_context: None,
+                });
+            }
+        }
+
+        Ok(Type::BoundSuper(BoundSuperType::new(
+            db,
+            pivot_class,
+            owner,
+        )))
+    }
+
+    /// Skips elements in the MRO up to and including the pivot class.
+    ///
+    /// If the pivot class is a dynamic type, its MRO can't be determined,
+    /// so we fall back to using the MRO of `DynamicType::Unknown`.
+    fn skip_until_after_pivot(
+        self,
+        db: &'db dyn Db,
+        mro_iter: impl Iterator<Item = ClassBase<'db>>,
+    ) -> impl Iterator<Item = ClassBase<'db>> {
+        let Some(pivot_class) = self.pivot_class(db).into_class() else {
+            return Either::Left(ClassBase::Dynamic(DynamicType::Unknown).mro(db, None));
+        };
+
+        let mut pivot_found = false;
+
+        Either::Right(mro_iter.skip_while(move |superclass| {
+            if pivot_found {
+                false
+            } else if Some(pivot_class) == superclass.into_class() {
+                pivot_found = true;
+                true
+            } else {
+                true
+            }
+        }))
+    }
+
+    /// Tries to call `__get__` on the attribute.
+    /// The arguments passed to `__get__` depend on whether the owner is an instance or a class.
+    /// See the `CPython` implementation for reference:
+    /// <https://github.com/python/cpython/blob/3b3720f1a26ab34377542b48eb6a6565f78ff892/Objects/typeobject.c#L11690-L11693>
+    pub(super) fn try_call_dunder_get_on_attribute(
+        self,
+        db: &'db dyn Db,
+        attribute: PlaceAndQualifiers<'db>,
+    ) -> Option<PlaceAndQualifiers<'db>> {
+        let owner = self.owner(db);
+
+        match owner {
+            // If the owner is a dynamic type, we can't tell whether it's a class or an instance.
+            // Also, invoking a descriptor on a dynamic attribute is meaningless, so we don't handle this.
+            SuperOwnerKind::Dynamic(_) => None,
+            SuperOwnerKind::Class(_) => Some(
+                Type::try_call_dunder_get_on_attribute(
+                    db,
+                    attribute,
+                    Type::none(db),
+                    Type::from(owner),
+                )
+                .0,
+            ),
+            SuperOwnerKind::Instance(_) => {
+                let owner = Type::from(owner);
+                Some(
+                    Type::try_call_dunder_get_on_attribute(
+                        db,
+                        attribute,
+                        owner,
+                        owner.to_meta_type(db),
+                    )
+                    .0,
+                )
+            }
+        }
+    }
+
+    /// Similar to `Type::find_name_in_mro_with_policy`, but performs lookup starting *after* the
+    /// pivot class in the MRO, based on the `owner` type instead of the `super` type.
+    pub(super) fn find_name_in_mro_after_pivot(
+        self,
+        db: &'db dyn Db,
+        name: &str,
+        policy: MemberLookupPolicy,
+    ) -> PlaceAndQualifiers<'db> {
+        let owner = self.owner(db);
+        let class = match owner {
+            SuperOwnerKind::Dynamic(dynamic) => {
+                return Type::Dynamic(dynamic)
+                    .find_name_in_mro_with_policy(db, name, policy)
+                    .expect("Calling `find_name_in_mro` on dynamic type should return `Some`");
+            }
+            SuperOwnerKind::Class(class) => class,
+            SuperOwnerKind::Instance(instance) => instance.class(db),
+        };
+
+        let (class_literal, _) = class.class_literal(db);
+        // TODO properly support super() with generic types
+        // * requires a fix for https://github.com/astral-sh/ruff/issues/17432
+        // * also requires understanding how we should handle cases like this:
+        //  ```python
+        //  b_int: B[int]
+        //  b_unknown: B
+        //
+        //  super(B, b_int)
+        //  super(B[int], b_unknown)
+        //  ```
+        match class_literal.generic_context(db) {
+            Some(_) => Place::bound(todo_type!("super in generic class")).into(),
+            None => class_literal.class_member_from_mro(
+                db,
+                name,
+                policy,
+                self.skip_until_after_pivot(db, owner.iter_mro(db)),
+            ),
+        }
+    }
+
+    pub(super) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
+        Self::new(
+            db,
+            self.pivot_class(db).normalized_impl(db, visitor),
+            self.owner(db).normalized_impl(db, visitor),
+        )
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/builder.rs b/crates/ty_python_semantic/src/types/builder.rs
index 0f6ba1782d..de413c00a9 100644
--- a/crates/ty_python_semantic/src/types/builder.rs
+++ b/crates/ty_python_semantic/src/types/builder.rs
@@ -38,6 +38,7 @@
 //! unnecessary `is_subtype_of` checks.
 
 use crate::types::enums::{enum_member_literals, enum_metadata};
+use crate::types::type_ordering::union_or_intersection_elements_ordering;
 use crate::types::{
     BytesLiteralType, IntersectionType, KnownClass, StringLiteralType, Type,
     TypeVarBoundOrConstraints, UnionType,
@@ -202,11 +203,16 @@ enum ReduceResult<'db> {
 
 // TODO increase this once we extend `UnionElement` throughout all union/intersection
 // representations, so that we can make large unions of literals fast in all operations.
-const MAX_UNION_LITERALS: usize = 200;
+//
+// For now (until we solve https://github.com/astral-sh/ty/issues/957), keep this number
+// below 200, which is the salsa fixpoint iteration limit.
+const MAX_UNION_LITERALS: usize = 190;
 
 pub(crate) struct UnionBuilder<'db> {
     elements: Vec<UnionElement<'db>>,
     db: &'db dyn Db,
+    unpack_aliases: bool,
+    order_elements: bool,
 }
 
 impl<'db> UnionBuilder<'db> {
@@ -214,9 +220,21 @@ impl<'db> UnionBuilder<'db> {
         Self {
             db,
             elements: vec![],
+            unpack_aliases: true,
+            order_elements: false,
         }
     }
 
+    pub(crate) fn unpack_aliases(mut self, val: bool) -> Self {
+        self.unpack_aliases = val;
+        self
+    }
+
+    pub(crate) fn order_elements(mut self, val: bool) -> Self {
+        self.order_elements = val;
+        self
+    }
+
     pub(crate) fn is_empty(&self) -> bool {
         self.elements.is_empty()
     }
@@ -224,8 +242,7 @@ impl<'db> UnionBuilder<'db> {
     /// Collapse the union to a single type: `object`.
     fn collapse_to_object(&mut self) {
         self.elements.clear();
-        self.elements
-            .push(UnionElement::Type(Type::object(self.db)));
+        self.elements.push(UnionElement::Type(Type::object()));
     }
 
     /// Adds a type to this union.
@@ -236,17 +253,29 @@ impl<'db> UnionBuilder<'db> {
 
     /// Adds a type to this union.
     pub(crate) fn add_in_place(&mut self, ty: Type<'db>) {
+        self.add_in_place_impl(ty, &mut vec![]);
+    }
+
+    pub(crate) fn add_in_place_impl(&mut self, ty: Type<'db>, seen_aliases: &mut Vec<Type<'db>>) {
         match ty {
             Type::Union(union) => {
                 let new_elements = union.elements(self.db);
                 self.elements.reserve(new_elements.len());
                 for element in new_elements {
-                    self.add_in_place(*element);
+                    self.add_in_place_impl(*element, seen_aliases);
                 }
             }
             // Adding `Never` to a union is a no-op.
             Type::Never => {}
-            Type::TypeAlias(alias) => self.add_in_place(alias.value_type(self.db)),
+            Type::TypeAlias(alias) if self.unpack_aliases => {
+                if seen_aliases.contains(&ty) {
+                    // Union contains itself recursively via a type alias. This is an error, just
+                    // leave out the recursive alias. TODO surface this error.
+                } else {
+                    seen_aliases.push(ty);
+                    self.add_in_place_impl(alias.value_type(self.db), seen_aliases);
+                }
+            }
             // If adding a string literal, look for an existing `UnionElement::StringLiterals` to
             // add it to, or an existing element that is a super-type of string literals, which
             // means we shouldn't add it. Otherwise, add a new `UnionElement::StringLiterals`
@@ -260,7 +289,7 @@ impl<'db> UnionBuilder<'db> {
                         UnionElement::StringLiterals(literals) => {
                             if literals.len() >= MAX_UNION_LITERALS {
                                 let replace_with = KnownClass::Str.to_instance(self.db);
-                                self.add_in_place(replace_with);
+                                self.add_in_place_impl(replace_with, seen_aliases);
                                 return;
                             }
                             found = Some(literals);
@@ -305,7 +334,7 @@ impl<'db> UnionBuilder<'db> {
                         UnionElement::BytesLiterals(literals) => {
                             if literals.len() >= MAX_UNION_LITERALS {
                                 let replace_with = KnownClass::Bytes.to_instance(self.db);
-                                self.add_in_place(replace_with);
+                                self.add_in_place_impl(replace_with, seen_aliases);
                                 return;
                             }
                             found = Some(literals);
@@ -350,7 +379,7 @@ impl<'db> UnionBuilder<'db> {
                         UnionElement::IntLiterals(literals) => {
                             if literals.len() >= MAX_UNION_LITERALS {
                                 let replace_with = KnownClass::Int.to_instance(self.db);
-                                self.add_in_place(replace_with);
+                                self.add_in_place_impl(replace_with, seen_aliases);
                                 return;
                             }
                             found = Some(literals);
@@ -392,96 +421,115 @@ impl<'db> UnionBuilder<'db> {
                     .elements
                     .iter()
                     .filter_map(UnionElement::to_type_element)
-                    .filter_map(Type::into_enum_literal)
+                    .filter_map(Type::as_enum_literal)
                     .map(|literal| literal.name(self.db).clone())
                     .chain(std::iter::once(enum_member_to_add.name(self.db).clone()))
                     .collect::<FxOrderSet<_>>();
 
                 let all_members_are_in_union = metadata
                     .members
-                    .difference(&enum_members_in_union)
-                    .next()
-                    .is_none();
+                    .keys()
+                    .all(|name| enum_members_in_union.contains(name));
 
                 if all_members_are_in_union {
-                    self.add_in_place(enum_member_to_add.enum_class_instance(self.db));
+                    self.add_in_place_impl(
+                        enum_member_to_add.enum_class_instance(self.db),
+                        seen_aliases,
+                    );
                 } else if !self
                     .elements
                     .iter()
                     .filter_map(UnionElement::to_type_element)
                     .any(|ty| Type::EnumLiteral(enum_member_to_add).is_subtype_of(self.db, ty))
                 {
-                    self.elements
-                        .push(UnionElement::Type(Type::EnumLiteral(enum_member_to_add)));
+                    self.push_type(Type::EnumLiteral(enum_member_to_add), seen_aliases);
                 }
             }
             // Adding `object` to a union results in `object`.
-            ty if ty.is_object(self.db) => {
+            ty if ty.is_object() => {
                 self.collapse_to_object();
             }
             _ => {
-                let bool_pair = if let Type::BooleanLiteral(b) = ty {
-                    Some(Type::BooleanLiteral(!b))
-                } else {
-                    None
-                };
+                self.push_type(ty, seen_aliases);
+            }
+        }
+    }
 
-                let mut to_remove = SmallVec::<[usize; 2]>::new();
-                let ty_negated = ty.negate(self.db);
+    fn push_type(&mut self, ty: Type<'db>, seen_aliases: &mut Vec<Type<'db>>) {
+        let bool_pair = if let Type::BooleanLiteral(b) = ty {
+            Some(Type::BooleanLiteral(!b))
+        } else {
+            None
+        };
 
-                for (index, element) in self.elements.iter_mut().enumerate() {
-                    let element_type = match element.try_reduce(self.db, ty) {
-                        ReduceResult::KeepIf(keep) => {
-                            if !keep {
-                                to_remove.push(index);
-                            }
-                            continue;
-                        }
-                        ReduceResult::Type(ty) => ty,
-                        ReduceResult::CollapseToObject => {
-                            self.collapse_to_object();
-                            return;
-                        }
-                        ReduceResult::Ignore => {
-                            return;
-                        }
-                    };
-                    if Some(element_type) == bool_pair {
-                        self.add_in_place(KnownClass::Bool.to_instance(self.db));
-                        return;
-                    }
+        // If an alias gets here, it means we aren't unpacking aliases, and we also
+        // shouldn't try to simplify aliases out of the union, because that will require
+        // unpacking them.
+        let should_simplify_full = !matches!(ty, Type::TypeAlias(_));
 
-                    if ty.is_equivalent_to(self.db, element_type)
-                        || ty.is_subtype_of(self.db, element_type)
-                    {
-                        return;
-                    } else if element_type.is_subtype_of(self.db, ty) {
+        let mut to_remove = SmallVec::<[usize; 2]>::new();
+        let ty_negated = if should_simplify_full {
+            ty.negate(self.db)
+        } else {
+            Type::Never // won't be used
+        };
+
+        for (index, element) in self.elements.iter_mut().enumerate() {
+            let element_type = match element.try_reduce(self.db, ty) {
+                ReduceResult::KeepIf(keep) => {
+                    if !keep {
                         to_remove.push(index);
-                    } else if ty_negated.is_subtype_of(self.db, element_type) {
-                        // We add `ty` to the union. We just checked that `~ty` is a subtype of an
-                        // existing `element`. This also means that `~ty | ty` is a subtype of
-                        // `element | ty`, because both elements in the first union are subtypes of
-                        // the corresponding elements in the second union. But `~ty | ty` is just
-                        // `object`. Since `object` is a subtype of `element | ty`, we can only
-                        // conclude that `element | ty` must be `object` (object has no other
-                        // supertypes). This means we can simplify the whole union to just
-                        // `object`, since all other potential elements would also be subtypes of
-                        // `object`.
-                        self.collapse_to_object();
-                        return;
                     }
+                    continue;
                 }
-                if let Some((&first, rest)) = to_remove.split_first() {
-                    self.elements[first] = UnionElement::Type(ty);
-                    // We iterate in descending order to keep remaining indices valid after `swap_remove`.
-                    for &index in rest.iter().rev() {
-                        self.elements.swap_remove(index);
-                    }
-                } else {
-                    self.elements.push(UnionElement::Type(ty));
+                ReduceResult::Type(ty) => ty,
+                ReduceResult::CollapseToObject => {
+                    self.collapse_to_object();
+                    return;
+                }
+                ReduceResult::Ignore => {
+                    return;
+                }
+            };
+
+            if ty == element_type {
+                return;
+            }
+
+            if Some(element_type) == bool_pair {
+                self.add_in_place_impl(KnownClass::Bool.to_instance(self.db), seen_aliases);
+                return;
+            }
+
+            if should_simplify_full && !matches!(element_type, Type::TypeAlias(_)) {
+                if ty.is_redundant_with(self.db, element_type) {
+                    return;
+                } else if element_type.is_redundant_with(self.db, ty) {
+                    to_remove.push(index);
+                } else if ty_negated.is_subtype_of(self.db, element_type) {
+                    // We add `ty` to the union. We just checked that `~ty` is a subtype of an
+                    // existing `element`. This also means that `~ty | ty` is a subtype of
+                    // `element | ty`, because both elements in the first union are subtypes of
+                    // the corresponding elements in the second union. But `~ty | ty` is just
+                    // `object`. Since `object` is a subtype of `element | ty`, we can only
+                    // conclude that `element | ty` must be `object` (object has no other
+                    // supertypes). This means we can simplify the whole union to just
+                    // `object`, since all other potential elements would also be subtypes of
+                    // `object`.
+                    self.collapse_to_object();
+                    return;
                 }
             }
         }
+        if let Some((&first, rest)) = to_remove.split_first() {
+            self.elements[first] = UnionElement::Type(ty);
+            // We iterate in descending order to keep remaining indices valid after `swap_remove`.
+            for &index in rest.iter().rev() {
+                self.elements.swap_remove(index);
+            }
+        } else {
+            self.elements.push(UnionElement::Type(ty));
+        }
     }
 
     pub(crate) fn build(self) -> Type<'db> {
@@ -504,6 +552,9 @@ impl<'db> UnionBuilder<'db> {
                 UnionElement::Type(ty) => types.push(ty),
             }
         }
+        if self.order_elements {
+            types.sort_unstable_by(|l, r| union_or_intersection_elements_ordering(self.db, l, r));
+        }
         match types.len() {
             0 => None,
             1 => Some(types[0]),
@@ -541,11 +592,27 @@ impl<'db> IntersectionBuilder<'db> {
         }
     }
 
-    pub(crate) fn add_positive(mut self, ty: Type<'db>) -> Self {
+    pub(crate) fn add_positive(self, ty: Type<'db>) -> Self {
+        self.add_positive_impl(ty, &mut vec![])
+    }
+
+    pub(crate) fn add_positive_impl(
+        mut self,
+        ty: Type<'db>,
+        seen_aliases: &mut Vec<Type<'db>>,
+    ) -> Self {
         match ty {
             Type::TypeAlias(alias) => {
+                if seen_aliases.contains(&ty) {
+                    // Recursive alias, add it without expanding to avoid infinite recursion.
+                    for inner in &mut self.intersections {
+                        inner.positive.insert(ty);
+                    }
+                    return self;
+                }
+                seen_aliases.push(ty);
                 let value_type = alias.value_type(self.db);
-                self.add_positive(value_type)
+                self.add_positive_impl(value_type, seen_aliases)
             }
             Type::Union(union) => {
                 // Distribute ourself over this union: for each union element, clone ourself and
@@ -559,7 +626,7 @@ impl<'db> IntersectionBuilder<'db> {
                 union
                     .elements(self.db)
                     .iter()
-                    .map(|elem| self.clone().add_positive(*elem))
+                    .map(|elem| self.clone().add_positive_impl(*elem, seen_aliases))
                     .fold(IntersectionBuilder::empty(self.db), |mut builder, sub| {
                         builder.intersections.extend(sub.intersections);
                         builder
@@ -569,22 +636,21 @@ impl<'db> IntersectionBuilder<'db> {
             Type::Intersection(other) => {
                 let db = self.db;
                 for pos in other.positive(db) {
-                    self = self.add_positive(*pos);
+                    self = self.add_positive_impl(*pos, seen_aliases);
                 }
                 for neg in other.negative(db) {
-                    self = self.add_negative(*neg);
+                    self = self.add_negative_impl(*neg, seen_aliases);
                 }
                 self
             }
             Type::NominalInstance(instance)
-                if enum_metadata(self.db, instance.class(self.db).class_literal(self.db).0)
-                    .is_some() =>
+                if enum_metadata(self.db, instance.class_literal(self.db)).is_some() =>
             {
                 let mut contains_enum_literal_as_negative_element = false;
                 for intersection in &self.intersections {
                     if intersection.negative.iter().any(|negative| {
                         negative
-                            .into_enum_literal()
+                            .as_enum_literal()
                             .is_some_and(|lit| lit.enum_class_instance(self.db) == ty)
                     }) {
                         contains_enum_literal_as_negative_element = true;
@@ -600,12 +666,15 @@ impl<'db> IntersectionBuilder<'db> {
                     // `UnionBuilder` because we would simplify the union to just the enum instance
                     // and end up in this branch again.
                     let db = self.db;
-                    self.add_positive(Type::Union(UnionType::new(
-                        db,
-                        enum_member_literals(db, instance.class(db).class_literal(db).0, None)
-                            .expect("Calling `enum_member_literals` on an enum class")
-                            .collect::<Box<[_]>>(),
-                    )))
+                    self.add_positive_impl(
+                        Type::Union(UnionType::new(
+                            db,
+                            enum_member_literals(db, instance.class_literal(db), None)
+                                .expect("Calling `enum_member_literals` on an enum class")
+                                .collect::<Box<[_]>>(),
+                        )),
+                        seen_aliases,
+                    )
                 } else {
                     for inner in &mut self.intersections {
                         inner.add_positive(self.db, ty);
@@ -624,7 +693,15 @@ impl<'db> IntersectionBuilder<'db> {
         }
     }
 
-    pub(crate) fn add_negative(mut self, ty: Type<'db>) -> Self {
+    pub(crate) fn add_negative(self, ty: Type<'db>) -> Self {
+        self.add_negative_impl(ty, &mut vec![])
+    }
+
+    pub(crate) fn add_negative_impl(
+        mut self,
+        ty: Type<'db>,
+        seen_aliases: &mut Vec<Type<'db>>,
+    ) -> Self {
         let contains_enum = |enum_instance| {
             self.intersections
                 .iter()
@@ -635,12 +712,20 @@ impl<'db> IntersectionBuilder<'db> {
         // See comments above in `add_positive`; this is just the negated version.
         match ty {
             Type::TypeAlias(alias) => {
+                if seen_aliases.contains(&ty) {
+                    // Recursive alias, add it without expanding to avoid infinite recursion.
+                    for inner in &mut self.intersections {
+                        inner.negative.insert(ty);
+                    }
+                    return self;
+                }
+                seen_aliases.push(ty);
                 let value_type = alias.value_type(self.db);
-                self.add_negative(value_type)
+                self.add_negative_impl(value_type, seen_aliases)
             }
             Type::Union(union) => {
                 for elem in union.elements(self.db) {
-                    self = self.add_negative(*elem);
+                    self = self.add_negative_impl(*elem, seen_aliases);
                 }
                 self
             }
@@ -656,13 +741,19 @@ impl<'db> IntersectionBuilder<'db> {
                     .positive(self.db)
                     .iter()
                     // we negate all the positive constraints while distributing
-                    .map(|elem| self.clone().add_negative(*elem));
+                    .map(|elem| {
+                        self.clone()
+                            .add_negative_impl(*elem, &mut seen_aliases.clone())
+                    });
 
                 let negative_side = intersection
                     .negative(self.db)
                     .iter()
                     // all negative constraints end up becoming positive constraints
-                    .map(|elem| self.clone().add_positive(*elem));
+                    .map(|elem| {
+                        self.clone()
+                            .add_positive_impl(*elem, &mut seen_aliases.clone())
+                    });
 
                 positive_side.chain(negative_side).fold(
                     IntersectionBuilder::empty(self.db),
@@ -676,15 +767,18 @@ impl<'db> IntersectionBuilder<'db> {
                 if contains_enum(enum_literal.enum_class_instance(self.db)) =>
             {
                 let db = self.db;
-                self.add_positive(UnionType::from_elements(
-                    db,
-                    enum_member_literals(
+                self.add_positive_impl(
+                    UnionType::from_elements(
                         db,
-                        enum_literal.enum_class(db),
-                        Some(enum_literal.name(db)),
-                    )
-                    .expect("Calling `enum_member_literals` on an enum class"),
-                ))
+                        enum_member_literals(
+                            db,
+                            enum_literal.enum_class(db),
+                            Some(enum_literal.name(db)),
+                        )
+                        .expect("Calling `enum_member_literals` on an enum class"),
+                    ),
+                    seen_aliases,
+                )
             }
             _ => {
                 for inner in &mut self.intersections {
@@ -706,17 +800,6 @@ impl<'db> IntersectionBuilder<'db> {
         self
     }
 
-    pub(crate) fn negative_elements<I, T>(mut self, elements: I) -> Self
-    where
-        I: IntoIterator<Item = T>,
-        T: Into<Type<'db>>,
-    {
-        for element in elements {
-            self = self.add_negative(element.into());
-        }
-        self
-    }
-
     pub(crate) fn build(mut self) -> Type<'db> {
         // Avoid allocating the UnionBuilder unnecessarily if we have just one intersection:
         if self.intersections.len() == 1 {
@@ -772,7 +855,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
             _ => {
                 let known_instance = new_positive
                     .into_nominal_instance()
-                    .and_then(|instance| instance.class(db).known(db));
+                    .and_then(|instance| instance.known_class(db));
 
                 if known_instance == Some(KnownClass::Object) {
                     // `object & T` -> `T`; it is always redundant to add `object` to an intersection
@@ -792,7 +875,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
                             new_positive = Type::BooleanLiteral(false);
                         }
                         Type::NominalInstance(instance)
-                            if instance.class(db).is_known(db, KnownClass::Bool) =>
+                            if instance.has_known_class(db, KnownClass::Bool) =>
                         {
                             match new_positive {
                                 // `bool & AlwaysTruthy` -> `Literal[True]`
@@ -838,13 +921,11 @@ impl<'db> InnerIntersectionBuilder<'db> {
                 let mut to_remove = SmallVec::<[usize; 1]>::new();
                 for (index, existing_positive) in self.positive.iter().enumerate() {
                     // S & T = S    if S <: T
-                    if existing_positive.is_subtype_of(db, new_positive)
-                        || existing_positive.is_equivalent_to(db, new_positive)
-                    {
+                    if existing_positive.is_redundant_with(db, new_positive) {
                         return;
                     }
                     // same rule, reverse order
-                    if new_positive.is_subtype_of(db, *existing_positive) {
+                    if new_positive.is_redundant_with(db, *existing_positive) {
                         to_remove.push(index);
                     }
                     // A & B = Never    if A and B are disjoint
@@ -886,7 +967,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
             self.positive
                 .iter()
                 .filter_map(|ty| ty.into_nominal_instance())
-                .filter_map(|instance| instance.class(db).known(db))
+                .filter_map(|instance| instance.known_class(db))
                 .any(KnownClass::is_bool)
         };
 
@@ -902,7 +983,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
             Type::Never => {
                 // Adding ~Never to an intersection is a no-op.
             }
-            Type::NominalInstance(instance) if instance.is_object(db) => {
+            Type::NominalInstance(instance) if instance.is_object() => {
                 // Adding ~object to an intersection results in Never.
                 *self = Self::default();
                 self.positive.insert(Type::Never);
@@ -935,9 +1016,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
                 let mut to_remove = SmallVec::<[usize; 1]>::new();
                 for (index, existing_negative) in self.negative.iter().enumerate() {
                     // ~S & ~T = ~T    if S <: T
-                    if existing_negative.is_subtype_of(db, new_negative)
-                        || existing_negative.is_equivalent_to(db, new_negative)
-                    {
+                    if existing_negative.is_redundant_with(db, new_negative) {
                         to_remove.push(index);
                     }
                     // same rule, reverse order
@@ -983,8 +1062,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
         let mut positive_to_remove = SmallVec::<[usize; 1]>::new();
 
         for (typevar_index, ty) in self.positive.iter().enumerate() {
-            let (Type::NonInferableTypeVar(bound_typevar) | Type::TypeVar(bound_typevar)) = ty
-            else {
+            let Type::TypeVar(bound_typevar) = ty else {
                 continue;
             };
             let Some(TypeVarBoundOrConstraints::Constraints(constraints)) =
@@ -998,7 +1076,11 @@ impl<'db> InnerIntersectionBuilder<'db> {
             // don't need to worry about finding any particular constraint more than once.
             let constraints = constraints.elements(db);
             let mut positive_constraint_count = 0;
-            for positive in &self.positive {
+            for (i, positive) in self.positive.iter().enumerate() {
+                if i == typevar_index {
+                    continue;
+                }
+
                 // This linear search should be fine as long as we don't encounter typevars with
                 // thousands of constraints.
                 positive_constraint_count += constraints
@@ -1064,7 +1146,7 @@ impl<'db> InnerIntersectionBuilder<'db> {
     fn build(mut self, db: &'db dyn Db) -> Type<'db> {
         self.simplify_constrained_typevars(db);
         match (self.positive.len(), self.negative.len()) {
-            (0, 0) => Type::object(db),
+            (0, 0) => Type::object(),
             (1, 0) => self.positive[0],
             _ => {
                 self.positive.shrink_to_fit();
@@ -1120,7 +1202,7 @@ mod tests {
         let db = setup_db();
 
         let intersection = IntersectionBuilder::new(&db).build();
-        assert_eq!(intersection, Type::object(&db));
+        assert_eq!(intersection, Type::object());
     }
 
     #[test_case(Type::BooleanLiteral(true))]
@@ -1134,7 +1216,7 @@ mod tests {
         // We add t_object in various orders (in first or second position) in
         // the tests below to ensure that the boolean simplification eliminates
         // everything from the intersection, not just `bool`.
-        let t_object = Type::object(&db);
+        let t_object = Type::object();
         let t_bool = KnownClass::Bool.to_instance(&db);
 
         let ty = IntersectionBuilder::new(&db)
@@ -1172,7 +1254,7 @@ mod tests {
 
         let safe_uuid_class = known_module_symbol(&db, KnownModule::Uuid, "SafeUUID")
             .place
-            .ignore_possibly_unbound()
+            .ignore_possibly_undefined()
             .unwrap();
 
         let literals = enum_member_literals(&db, safe_uuid_class.expect_class_literal(), None)
diff --git a/crates/ty_python_semantic/src/types/call.rs b/crates/ty_python_semantic/src/types/call.rs
index be85b3922a..e2fb7dac96 100644
--- a/crates/ty_python_semantic/src/types/call.rs
+++ b/crates/ty_python_semantic/src/types/call.rs
@@ -1,12 +1,87 @@
 use super::context::InferContext;
-use super::{Signature, Type};
+use super::{Signature, Type, TypeContext};
 use crate::Db;
+use crate::types::PropertyInstanceType;
+use crate::types::call::bind::BindingError;
+use ruff_python_ast as ast;
 
 mod arguments;
 pub(crate) mod bind;
 pub(super) use arguments::{Argument, CallArguments};
 pub(super) use bind::{Binding, Bindings, CallableBinding, MatchedArgument};
 
+impl<'db> Type<'db> {
+    pub(crate) fn try_call_bin_op(
+        db: &'db dyn Db,
+        left_ty: Type<'db>,
+        op: ast::Operator,
+        right_ty: Type<'db>,
+    ) -> Result<Bindings<'db>, CallBinOpError> {
+        // We either want to call lhs.__op__ or rhs.__rop__. The full decision tree from
+        // the Python spec [1] is:
+        //
+        //   - If rhs is a (proper) subclass of lhs, and it provides a different
+        //     implementation of __rop__, use that.
+        //   - Otherwise, if lhs implements __op__, use that.
+        //   - Otherwise, if lhs and rhs are different types, and rhs implements __rop__,
+        //     use that.
+        //
+        // [1] https://docs.python.org/3/reference/datamodel.html#object.__radd__
+
+        // Technically we don't have to check left_ty != right_ty here, since if the types
+        // are the same, they will trivially have the same implementation of the reflected
+        // dunder, and so we'll fail the inner check. But the type equality check will be
+        // faster for the common case, and allow us to skip the (two) class member lookups.
+        let left_class = left_ty.to_meta_type(db);
+        let right_class = right_ty.to_meta_type(db);
+        if left_ty != right_ty && right_ty.is_subtype_of(db, left_ty) {
+            let reflected_dunder = op.reflected_dunder();
+            let rhs_reflected = right_class.member(db, reflected_dunder).place;
+            // TODO: if `rhs_reflected` is possibly unbound, we should union the two possible
+            // Bindings together
+            if !rhs_reflected.is_undefined()
+                && rhs_reflected != left_class.member(db, reflected_dunder).place
+            {
+                return Ok(right_ty
+                    .try_call_dunder(
+                        db,
+                        reflected_dunder,
+                        CallArguments::positional([left_ty]),
+                        TypeContext::default(),
+                    )
+                    .or_else(|_| {
+                        left_ty.try_call_dunder(
+                            db,
+                            op.dunder(),
+                            CallArguments::positional([right_ty]),
+                            TypeContext::default(),
+                        )
+                    })?);
+            }
+        }
+
+        let call_on_left_instance = left_ty.try_call_dunder(
+            db,
+            op.dunder(),
+            CallArguments::positional([right_ty]),
+            TypeContext::default(),
+        );
+
+        call_on_left_instance.or_else(|_| {
+            if left_ty == right_ty {
+                Err(CallBinOpError::NotSupported)
+            } else {
+                Ok(right_ty.try_call_dunder(
+                    db,
+                    op.reflected_dunder(),
+                    CallArguments::positional([left_ty]),
+                    TypeContext::default(),
+                )?)
+            }
+        })
+    }
+}
+
 /// Wraps a [`Bindings`] for an unsuccessful call with information about why the call was
 /// unsuccessful.
 ///
@@ -14,6 +89,26 @@ pub(super) use bind::{Binding, Bindings, CallableBinding, MatchedArgument};
 #[derive(Debug)]
 pub(crate) struct CallError<'db>(pub(crate) CallErrorKind, pub(crate) Box<Bindings<'db>>);
 
+impl<'db> CallError<'db> {
+    /// Returns `Some(property)` if the call error was caused by an attempt to set a property
+    /// that has no setter, and `None` otherwise.
+    pub(crate) fn as_attempt_to_set_property_with_no_setter(
+        &self,
+    ) -> Option<PropertyInstanceType<'db>> {
+        if self.0 != CallErrorKind::BindingError {
+            return None;
+        }
+        self.1
+            .iter()
+            .flatten()
+            .flat_map(bind::Binding::errors)
+            .find_map(|error| match error {
+                BindingError::PropertyHasNoSetter(property) => Some(*property),
+                _ => None,
+            })
+    }
+}
+
 /// The reason why calling a type failed.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) enum CallErrorKind {
@@ -67,3 +162,24 @@ impl<'db> From<CallError<'db>> for CallDunderError<'db> {
         Self::CallError(kind, bindings)
     }
 }
+
+#[derive(Debug)]
+pub(crate) enum CallBinOpError {
+    /// The dunder attribute exists but it can't be called with the given arguments.
+    ///
+    /// This includes non-callable dunder attributes that are possibly unbound.
+    CallError,
+
+    NotSupported,
+}
+
+impl From<CallDunderError<'_>> for CallBinOpError {
+    fn from(value: CallDunderError<'_>) -> Self {
+        match value {
+            CallDunderError::CallError(_, _) => Self::CallError,
+            CallDunderError::MethodNotAvailable | CallDunderError::PossiblyUnbound(_) => {
+                CallBinOpError::NotSupported
+            }
+        }
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/call/arguments.rs b/crates/ty_python_semantic/src/types/call/arguments.rs
index b200f3fc8a..fc8bf871e5 100644
--- a/crates/ty_python_semantic/src/types/call/arguments.rs
+++ b/crates/ty_python_semantic/src/types/call/arguments.rs
@@ -5,8 +5,8 @@ use ruff_python_ast as ast;
 
 use crate::Db;
 use crate::types::KnownClass;
-use crate::types::enums::enum_member_literals;
-use crate::types::tuple::{Tuple, TupleLength, TupleType};
+use crate::types::enums::{enum_member_literals, enum_metadata};
+use crate::types::tuple::{Tuple, TupleType};
 
 use super::Type;
 
@@ -17,7 +17,7 @@ pub(crate) enum Argument<'a> {
     /// A positional argument.
     Positional,
     /// A starred positional argument (e.g. `*args`) containing the specified number of elements.
-    Variadic(TupleLength),
+    Variadic,
     /// A keyword argument (e.g. `a=1`).
     Keyword(&'a str),
     /// The double-starred keywords argument (e.g. `**kwargs`).
@@ -41,29 +41,25 @@ impl<'a, 'db> CallArguments<'a, 'db> {
     /// type of each splatted argument, so that we can determine its length. All other arguments
     /// will remain uninitialized as `Unknown`.
     pub(crate) fn from_arguments(
-        db: &'db dyn Db,
         arguments: &'a ast::Arguments,
-        mut infer_argument_type: impl FnMut(&ast::Expr, &ast::Expr) -> Type<'db>,
+        mut infer_argument_type: impl FnMut(Option<&ast::Expr>, &ast::Expr) -> Type<'db>,
     ) -> Self {
         arguments
             .arguments_source_order()
             .map(|arg_or_keyword| match arg_or_keyword {
                 ast::ArgOrKeyword::Arg(arg) => match arg {
                     ast::Expr::Starred(ast::ExprStarred { value, .. }) => {
-                        let ty = infer_argument_type(arg, value);
-                        let length = ty
-                            .try_iterate(db)
-                            .map(|tuple| tuple.len())
-                            .unwrap_or(TupleLength::unknown());
-                        (Argument::Variadic(length), Some(ty))
+                        let ty = infer_argument_type(Some(arg), value);
+                        (Argument::Variadic, Some(ty))
                     }
                     _ => (Argument::Positional, None),
                 },
-                ast::ArgOrKeyword::Keyword(ast::Keyword { arg, .. }) => {
+                ast::ArgOrKeyword::Keyword(ast::Keyword { arg, value, .. }) => {
                     if let Some(arg) = arg {
                         (Argument::Keyword(&arg.id), None)
                     } else {
-                        (Argument::Keywords, None)
+                        let ty = infer_argument_type(None, value);
+                        (Argument::Keywords, Some(ty))
                     }
                 }
             })
@@ -127,31 +123,39 @@ impl<'a, 'db> CallArguments<'a, 'db> {
     /// contains the same arguments, but with one or more of the argument types expanded.
     ///
     /// [argument type expansion]: https://typing.python.org/en/latest/spec/overload.html#argument-type-expansion
-    pub(crate) fn expand(
-        &self,
-        db: &'db dyn Db,
-    ) -> impl Iterator<Item = Vec<CallArguments<'a, 'db>>> + '_ {
+    pub(super) fn expand(&self, db: &'db dyn Db) -> impl Iterator<Item = Expansion<'a, 'db>> + '_ {
+        /// Maximum number of argument lists that can be generated in a single expansion step.
+        static MAX_EXPANSIONS: usize = 512;
+
         /// Represents the state of the expansion process.
+        enum State<'a, 'b, 'db> {
+            LimitReached(usize),
+            Expanding(ExpandingState<'a, 'b, 'db>),
+        }
+
+        /// Represents the expanding state with either the initial types or the expanded types.
         ///
         /// This is useful to avoid cloning the initial types vector if none of the types can be
         /// expanded.
-        enum State<'a, 'b, 'db> {
+        enum ExpandingState<'a, 'b, 'db> {
             Initial(&'b Vec<Option<Type<'db>>>),
             Expanded(Vec<CallArguments<'a, 'db>>),
         }
 
-        impl<'db> State<'_, '_, 'db> {
+        impl<'db> ExpandingState<'_, '_, 'db> {
             fn len(&self) -> usize {
                 match self {
-                    State::Initial(_) => 1,
-                    State::Expanded(expanded) => expanded.len(),
+                    ExpandingState::Initial(_) => 1,
+                    ExpandingState::Expanded(expanded) => expanded.len(),
                 }
             }
 
             fn iter(&self) -> impl Iterator<Item = &[Option<Type<'db>>]> + '_ {
                 match self {
-                    State::Initial(types) => Either::Left(std::iter::once(types.as_slice())),
-                    State::Expanded(expanded) => {
+                    ExpandingState::Initial(types) => {
+                        Either::Left(std::iter::once(types.as_slice()))
+                    }
+                    ExpandingState::Expanded(expanded) => {
                         Either::Right(expanded.iter().map(CallArguments::types))
                     }
                 }
@@ -160,44 +164,82 @@ impl<'a, 'db> CallArguments<'a, 'db> {
 
         let mut index = 0;
 
-        std::iter::successors(Some(State::Initial(&self.types)), move |previous| {
-            // Find the next type that can be expanded.
-            let expanded_types = loop {
-                let arg_type = self.types.get(index)?;
-                if let Some(arg_type) = arg_type {
-                    if let Some(expanded_types) = expand_type(db, *arg_type) {
-                        break expanded_types;
+        std::iter::successors(
+            Some(State::Expanding(ExpandingState::Initial(&self.types))),
+            move |previous| {
+                let state = match previous {
+                    State::LimitReached(index) => return Some(State::LimitReached(*index)),
+                    State::Expanding(expanding_state) => expanding_state,
+                };
+
+                // Find the next type that can be expanded.
+                let expanded_types = loop {
+                    let arg_type = self.types.get(index)?;
+                    if let Some(arg_type) = arg_type {
+                        if let Some(expanded_types) = expand_type(db, *arg_type) {
+                            break expanded_types;
+                        }
+                    }
+                    index += 1;
+                };
+
+                let expansion_size = expanded_types.len() * state.len();
+                if expansion_size > MAX_EXPANSIONS {
+                    tracing::debug!(
+                        "Skipping argument type expansion as it would exceed the \
+                    maximum number of expansions ({MAX_EXPANSIONS})"
+                    );
+                    return Some(State::LimitReached(index));
+                }
+
+                let mut expanded_arguments = Vec::with_capacity(expansion_size);
+
+                for pre_expanded_types in state.iter() {
+                    for subtype in &expanded_types {
+                        let mut new_expanded_types = pre_expanded_types.to_vec();
+                        new_expanded_types[index] = Some(*subtype);
+                        expanded_arguments.push(CallArguments::new(
+                            self.arguments.clone(),
+                            new_expanded_types,
+                        ));
                     }
                 }
+
+                // Increment the index to move to the next argument type for the next iteration.
                 index += 1;
-            };
 
-            let mut expanded_arguments = Vec::with_capacity(expanded_types.len() * previous.len());
-
-            for pre_expanded_types in previous.iter() {
-                for subtype in &expanded_types {
-                    let mut new_expanded_types = pre_expanded_types.to_vec();
-                    new_expanded_types[index] = Some(*subtype);
-                    expanded_arguments.push(CallArguments::new(
-                        self.arguments.clone(),
-                        new_expanded_types,
-                    ));
-                }
-            }
-
-            // Increment the index to move to the next argument type for the next iteration.
-            index += 1;
-
-            Some(State::Expanded(expanded_arguments))
-        })
+                Some(State::Expanding(ExpandingState::Expanded(
+                    expanded_arguments,
+                )))
+            },
+        )
         .skip(1) // Skip the initial state, which has no expanded types.
         .map(|state| match state {
-            State::Initial(_) => unreachable!("initial state should be skipped"),
-            State::Expanded(expanded) => expanded,
+            State::LimitReached(index) => Expansion::LimitReached(index),
+            State::Expanding(ExpandingState::Initial(_)) => {
+                unreachable!("initial state should be skipped")
+            }
+            State::Expanding(ExpandingState::Expanded(expanded)) => Expansion::Expanded(expanded),
         })
     }
 }
 
+/// Represents a single element of the expansion process for argument types for [`expand`].
+///
+/// [`expand`]: CallArguments::expand
+pub(super) enum Expansion<'a, 'db> {
+    /// Indicates that the expansion process has reached the maximum number of argument lists
+    /// that can be generated in a single step.
+    ///
+    /// The contained `usize` is the index of the argument type which would have been expanded
+    /// next, if not for the limit.
+    LimitReached(usize),
+
+    /// Contains the expanded argument lists, where each list contains the same arguments, but with
+    /// one or more of the argument types expanded.
+    Expanded(Vec<CallArguments<'a, 'db>>),
+}
+
 impl<'a, 'db> FromIterator<(Argument<'a>, Option<Type<'db>>)> for CallArguments<'a, 'db> {
     fn from_iter<T>(iter: T) -> Self
     where
@@ -208,10 +250,32 @@ impl<'a, 'db> FromIterator<(Argument<'a>, Option<Type<'db>>)> for CallArguments<
     }
 }
 
+/// Returns `true` if the type can be expanded into its subtypes.
+///
+/// In other words, it returns `true` if [`expand_type`] returns [`Some`] for the given type.
+pub(crate) fn is_expandable_type<'db>(db: &'db dyn Db, ty: Type<'db>) -> bool {
+    match ty {
+        Type::NominalInstance(instance) => {
+            let class = instance.class(db);
+            class.is_known(db, KnownClass::Bool)
+                || instance.tuple_spec(db).is_some_and(|spec| match &*spec {
+                    Tuple::Fixed(fixed_length_tuple) => fixed_length_tuple
+                        .all_elements()
+                        .any(|element| is_expandable_type(db, *element)),
+                    Tuple::Variable(_) => false,
+                })
+                || enum_metadata(db, class.class_literal(db).0).is_some()
+        }
+        Type::Union(_) => true,
+        _ => false,
+    }
+}
+
 /// Expands a type into its possible subtypes, if applicable.
 ///
 /// Returns [`None`] if the type cannot be expanded.
 fn expand_type<'db>(db: &'db dyn Db, ty: Type<'db>) -> Option<Vec<Type<'db>>> {
+    // NOTE: Update `is_expandable_type` if this logic changes accordingly.
     match ty {
         Type::NominalInstance(instance) => {
             let class = instance.class(db);
diff --git a/crates/ty_python_semantic/src/types/call/bind.rs b/crates/ty_python_semantic/src/types/call/bind.rs
index d904e4c9ab..ef1d8574cb 100644
--- a/crates/ty_python_semantic/src/types/call/bind.rs
+++ b/crates/ty_python_semantic/src/types/call/bind.rs
@@ -3,38 +3,43 @@
 //! [signatures][crate::types::signatures], we have to handle the fact that the callable might be a
 //! union of types, each of which might contain multiple overloads.
 
-use std::borrow::Cow;
 use std::collections::HashSet;
 use std::fmt;
 
-use itertools::Itertools;
+use itertools::{Either, Itertools};
 use ruff_db::parsed::parsed_module;
+use ruff_python_ast::name::Name;
 use smallvec::{SmallVec, smallvec, smallvec_inline};
 
 use super::{Argument, CallArguments, CallError, CallErrorKind, InferContext, Signature, Type};
 use crate::Program;
 use crate::db::Db;
 use crate::dunder_all::dunder_all_names;
-use crate::place::{Boundness, Place};
+use crate::place::{Definedness, Place};
+use crate::types::call::arguments::{Expansion, is_expandable_type};
 use crate::types::diagnostic::{
     CALL_NON_CALLABLE, CONFLICTING_ARGUMENT_FORMS, INVALID_ARGUMENT_TYPE, MISSING_ARGUMENT,
-    NO_MATCHING_OVERLOAD, PARAMETER_ALREADY_ASSIGNED, TOO_MANY_POSITIONAL_ARGUMENTS,
-    UNKNOWN_ARGUMENT,
+    NO_MATCHING_OVERLOAD, PARAMETER_ALREADY_ASSIGNED, POSITIONAL_ONLY_PARAMETER_AS_KWARG,
+    TOO_MANY_POSITIONAL_ARGUMENTS, UNKNOWN_ARGUMENT,
 };
 use crate::types::enums::is_enum_class;
 use crate::types::function::{
-    DataclassTransformerParams, FunctionDecorators, FunctionType, KnownFunction, OverloadLiteral,
+    DataclassTransformerFlags, DataclassTransformerParams, FunctionDecorators, FunctionType,
+    KnownFunction, OverloadLiteral,
 };
-use crate::types::generics::{Specialization, SpecializationBuilder, SpecializationError};
-use crate::types::signatures::{Parameter, ParameterForm, Parameters};
-use crate::types::tuple::{Tuple, TupleLength, TupleType};
+use crate::types::generics::{
+    InferableTypeVars, Specialization, SpecializationBuilder, SpecializationError,
+};
+use crate::types::signatures::{Parameter, ParameterForm, ParameterKind, Parameters};
+use crate::types::tuple::{TupleLength, TupleType};
 use crate::types::{
-    BoundMethodType, ClassLiteral, DataclassParams, FieldInstance, KnownClass, KnownInstanceType,
-    MethodWrapperKind, PropertyInstanceType, SpecialFormType, TypeMapping, UnionType,
-    WrapperDescriptorKind, enums, ide_support, todo_type,
+    BoundMethodType, ClassLiteral, DataclassFlags, DataclassParams, FieldInstance,
+    KnownBoundMethodType, KnownClass, KnownInstanceType, MemberLookupPolicy, PropertyInstanceType,
+    SpecialFormType, TrackedConstraintSet, TypeAliasType, TypeContext, UnionBuilder, UnionType,
+    WrapperDescriptorKind, enums, ide_support, infer_isolated_expression, todo_type,
 };
 use ruff_db::diagnostic::{Annotation, Diagnostic, SubDiagnostic, SubDiagnosticSeverity};
-use ruff_python_ast::{self as ast, PythonVersion};
+use ruff_python_ast::{self as ast, ArgOrKeyword, PythonVersion};
 
 /// Binding information for a possible union of callables. At a call site, the arguments must be
 /// compatible with _all_ of the types in the union for the call to be valid.
@@ -50,9 +55,7 @@ pub(crate) struct Bindings<'db> {
     elements: SmallVec<[CallableBinding<'db>; 1]>,
 
     /// Whether each argument will be used as a value and/or a type form in this call.
-    pub(crate) argument_forms: Box<[Option<ParameterForm>]>,
-
-    conflicting_forms: Box<[bool]>,
+    argument_forms: ArgumentForms,
 }
 
 impl<'db> Bindings<'db> {
@@ -70,8 +73,7 @@ impl<'db> Bindings<'db> {
         Self {
             callable_type,
             elements,
-            argument_forms: Box::from([]),
-            conflicting_forms: Box::from([]),
+            argument_forms: ArgumentForms::new(0),
         }
     }
 
@@ -90,6 +92,14 @@ impl<'db> Bindings<'db> {
         }
     }
 
+    pub(crate) fn argument_forms(&self) -> &[Option<ParameterForm>] {
+        &self.argument_forms.values
+    }
+
+    pub(crate) fn iter(&self) -> std::slice::Iter<'_, CallableBinding<'db>> {
+        self.elements.iter()
+    }
+
     /// Match the arguments of a call site against the parameters of a collection of possibly
     /// unioned, possibly overloaded signatures.
     ///
@@ -99,14 +109,17 @@ impl<'db> Bindings<'db> {
     ///
     /// Once you have argument types available, you can call [`check_types`][Self::check_types] to
     /// verify that each argument type is assignable to the corresponding parameter type.
-    pub(crate) fn match_parameters(mut self, arguments: &CallArguments<'_, 'db>) -> Self {
-        let mut argument_forms = vec![None; arguments.len()];
-        let mut conflicting_forms = vec![false; arguments.len()];
+    pub(crate) fn match_parameters(
+        mut self,
+        db: &'db dyn Db,
+        arguments: &CallArguments<'_, 'db>,
+    ) -> Self {
+        let mut argument_forms = ArgumentForms::new(arguments.len());
         for binding in &mut self.elements {
-            binding.match_parameters(arguments, &mut argument_forms, &mut conflicting_forms);
+            binding.match_parameters(db, arguments, &mut argument_forms);
         }
-        self.argument_forms = argument_forms.into();
-        self.conflicting_forms = conflicting_forms.into();
+        argument_forms.shrink_to_fit();
+        self.argument_forms = argument_forms;
         self
     }
 
@@ -116,6 +129,9 @@ impl<'db> Bindings<'db> {
     /// You must provide an `argument_types` that was created from the same `arguments` that you
     /// provided to [`match_parameters`][Self::match_parameters].
     ///
+    /// The type context of the call expression is also used to infer the specialization of generic
+    /// calls.
+    ///
     /// We update the bindings to include the return type of the call, the bound types for all
     /// parameters, and any errors resulting from binding the call, all for each union element and
     /// overload (if any).
@@ -123,12 +139,21 @@ impl<'db> Bindings<'db> {
         mut self,
         db: &'db dyn Db,
         argument_types: &CallArguments<'_, 'db>,
+        call_expression_tcx: &TypeContext<'db>,
+        dataclass_field_specifiers: &[Type<'db>],
     ) -> Result<Self, CallError<'db>> {
         for element in &mut self.elements {
-            element.check_types(db, argument_types);
+            if let Some(mut updated_argument_forms) =
+                element.check_types(db, argument_types, call_expression_tcx)
+            {
+                // If this element returned a new set of argument forms (indicating successful
+                // argument type expansion), update the `Bindings` with these forms.
+                updated_argument_forms.shrink_to_fit();
+                self.argument_forms = updated_argument_forms;
+            }
         }
 
-        self.evaluate_known_cases(db);
+        self.evaluate_known_cases(db, dataclass_field_specifiers);
 
         // In order of precedence:
         //
@@ -148,7 +173,7 @@ impl<'db> Bindings<'db> {
         let mut all_ok = true;
         let mut any_binding_error = false;
         let mut all_not_callable = true;
-        if self.conflicting_forms.contains(&true) {
+        if self.argument_forms.conflicting.contains(&true) {
             all_ok = false;
             any_binding_error = true;
             all_not_callable = false;
@@ -221,7 +246,7 @@ impl<'db> Bindings<'db> {
             return;
         }
 
-        for (index, conflicting_form) in self.conflicting_forms.iter().enumerate() {
+        for (index, conflicting_form) in self.argument_forms.conflicting.iter().enumerate() {
             if *conflicting_form {
                 let node = BindingError::get_node(node, Some(index));
                 if let Some(builder) = context.report_lint(&CONFLICTING_ARGUMENT_FORMS, node) {
@@ -250,7 +275,7 @@ impl<'db> Bindings<'db> {
 
     /// Evaluates the return type of certain known callables, where we have special-case logic to
     /// determine the return type in a way that isn't directly expressible in the type system.
-    fn evaluate_known_cases(&mut self, db: &'db dyn Db) {
+    fn evaluate_known_cases(&mut self, db: &'db dyn Db, dataclass_field_specifiers: &[Type<'db>]) {
         let to_bool = |ty: &Option<Type<'_>>, default: bool| -> bool {
             if let Some(Type::BooleanLiteral(value)) = ty {
                 *value
@@ -265,8 +290,10 @@ impl<'db> Bindings<'db> {
             let binding_type = binding.callable_type;
             for (overload_index, overload) in binding.matching_overloads_mut() {
                 match binding_type {
-                    Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(function)) => {
-                        if function.has_known_decorator(db, FunctionDecorators::CLASSMETHOD) {
+                    Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(
+                        function,
+                    )) => {
+                        if function.is_classmethod(db) {
                             match overload.parameter_types() {
                                 [_, Some(owner)] => {
                                     overload.set_return_type(Type::BoundMethod(
@@ -284,8 +311,7 @@ impl<'db> Bindings<'db> {
                                 }
                                 _ => {}
                             }
-                        } else if function.has_known_decorator(db, FunctionDecorators::STATICMETHOD)
-                        {
+                        } else if function.is_staticmethod(db) {
                             overload.set_return_type(Type::FunctionLiteral(function));
                         } else if let [Some(first), _] = overload.parameter_types() {
                             if first.is_none(db) {
@@ -302,7 +328,7 @@ impl<'db> Bindings<'db> {
                         if let [Some(function_ty @ Type::FunctionLiteral(function)), ..] =
                             overload.parameter_types()
                         {
-                            if function.has_known_decorator(db, FunctionDecorators::CLASSMETHOD) {
+                            if function.is_classmethod(db) {
                                 match overload.parameter_types() {
                                     [_, _, Some(owner)] => {
                                         overload.set_return_type(Type::BoundMethod(
@@ -360,7 +386,7 @@ impl<'db> Bindings<'db> {
                                 ..,
                             ] if property.getter(db).is_some_and(|getter| {
                                 getter
-                                    .into_function_literal()
+                                    .as_function_literal()
                                     .is_some_and(|f| f.name(db) == "__name__")
                             }) =>
                             {
@@ -374,7 +400,7 @@ impl<'db> Bindings<'db> {
                             ] => {
                                 match property
                                     .getter(db)
-                                    .and_then(Type::into_function_literal)
+                                    .and_then(Type::as_function_literal)
                                     .map(|f| f.name(db).as_str())
                                 {
                                     Some("__name__") => {
@@ -420,9 +446,9 @@ impl<'db> Bindings<'db> {
                                         overload.set_return_type(Type::unknown());
                                     }
                                 } else {
-                                    overload.errors.push(BindingError::InternalCallError(
-                                        "property has no getter",
-                                    ));
+                                    overload
+                                        .errors
+                                        .push(BindingError::PropertyHasNoSetter(*property));
                                     overload.set_return_type(Type::Never);
                                 }
                             }
@@ -430,7 +456,7 @@ impl<'db> Bindings<'db> {
                         }
                     }
 
-                    Type::MethodWrapper(MethodWrapperKind::PropertyDunderGet(property)) => {
+                    Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderGet(property)) => {
                         match overload.parameter_types() {
                             [Some(instance), ..] if instance.is_none(db) => {
                                 overload.set_return_type(Type::PropertyInstance(property));
@@ -476,14 +502,14 @@ impl<'db> Bindings<'db> {
                                     ));
                                 }
                             } else {
-                                overload.errors.push(BindingError::InternalCallError(
-                                    "property has no setter",
-                                ));
+                                overload
+                                    .errors
+                                    .push(BindingError::PropertyHasNoSetter(*property));
                             }
                         }
                     }
 
-                    Type::MethodWrapper(MethodWrapperKind::PropertyDunderSet(property)) => {
+                    Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderSet(property)) => {
                         if let [Some(instance), Some(value), ..] = overload.parameter_types() {
                             if let Some(setter) = property.setter(db) {
                                 if let Err(_call_error) = setter
@@ -494,14 +520,14 @@ impl<'db> Bindings<'db> {
                                     ));
                                 }
                             } else {
-                                overload.errors.push(BindingError::InternalCallError(
-                                    "property has no setter",
-                                ));
+                                overload
+                                    .errors
+                                    .push(BindingError::PropertyHasNoSetter(property));
                             }
                         }
                     }
 
-                    Type::MethodWrapper(MethodWrapperKind::StrStartswith(literal)) => {
+                    Type::KnownBoundMethod(KnownBoundMethodType::StrStartswith(literal)) => {
                         if let [Some(Type::StringLiteral(prefix)), None, None] =
                             overload.parameter_types()
                         {
@@ -576,35 +602,118 @@ impl<'db> Bindings<'db> {
                         }
                     }
 
+                    function @ Type::FunctionLiteral(function_type)
+                        if dataclass_field_specifiers.contains(&function)
+                            || function_type.is_known(db, KnownFunction::Field) =>
+                    {
+                        let has_default_value = overload
+                            .parameter_type_by_name("default", false)
+                            .is_ok_and(|ty| ty.is_some())
+                            || overload
+                                .parameter_type_by_name("default_factory", false)
+                                .is_ok_and(|ty| ty.is_some())
+                            || overload
+                                .parameter_type_by_name("factory", false)
+                                .is_ok_and(|ty| ty.is_some());
+
+                        let init = overload
+                            .parameter_type_by_name("init", true)
+                            .unwrap_or(None);
+                        let kw_only = overload
+                            .parameter_type_by_name("kw_only", true)
+                            .unwrap_or(None);
+                        let alias = overload
+                            .parameter_type_by_name("alias", true)
+                            .unwrap_or(None);
+
+                        // `dataclasses.field` and field-specifier functions of commonly used
+                        // libraries like `pydantic`, `attrs`, and `SQLAlchemy` all return
+                        // the default type for the field (or `Any`) instead of an actual `Field`
+                        // instance, even if this is not what happens at runtime (see also below).
+                        // We still make use of this fact and pretend that all field specifiers
+                        // return the type of the default value:
+                        let default_ty = if has_default_value {
+                            Some(overload.return_ty)
+                        } else {
+                            None
+                        };
+
+                        let init = init
+                            .map(|init| !init.bool(db).is_always_false())
+                            .unwrap_or(true);
+
+                        let kw_only = if Program::get(db).python_version(db) >= PythonVersion::PY310
+                        {
+                            match kw_only {
+                                // We are more conservative here when turning the type for `kw_only`
+                                // into a bool, because a field specifier in a stub might use
+                                // `kw_only: bool = ...` and the truthiness of `...` is always true.
+                                // This is different from `init` above because may need to fall back
+                                // to `kw_only_default`, whereas `init_default` does not exist.
+                                Some(Type::BooleanLiteral(yes)) => Some(yes),
+                                _ => None,
+                            }
+                        } else {
+                            None
+                        };
+
+                        let alias = alias
+                            .and_then(Type::as_string_literal)
+                            .map(|literal| Box::from(literal.value(db)));
+
+                        // `typeshed` pretends that `dataclasses.field()` returns the type of the
+                        // default value directly. At runtime, however, this function returns an
+                        // instance of `dataclasses.Field`. We also model it this way and return
+                        // a known-instance type with information about the field. The drawback
+                        // of this approach is that we need to pretend that instances of `Field`
+                        // are assignable to `T` if the default type of the field is assignable
+                        // to `T`. Otherwise, we would error on `name: str = field(default="")`.
+                        overload.set_return_type(Type::KnownInstance(KnownInstanceType::Field(
+                            FieldInstance::new(db, default_ty, init, kw_only, alias),
+                        )));
+                    }
+
                     Type::FunctionLiteral(function_type) => match function_type.known(db) {
                         Some(KnownFunction::IsEquivalentTo) => {
                             if let [Some(ty_a), Some(ty_b)] = overload.parameter_types() {
-                                overload.set_return_type(Type::BooleanLiteral(
-                                    ty_a.is_equivalent_to(db, *ty_b),
+                                let constraints =
+                                    ty_a.when_equivalent_to(db, *ty_b, InferableTypeVars::None);
+                                let tracked = TrackedConstraintSet::new(db, constraints);
+                                overload.set_return_type(Type::KnownInstance(
+                                    KnownInstanceType::ConstraintSet(tracked),
                                 ));
                             }
                         }
 
                         Some(KnownFunction::IsSubtypeOf) => {
                             if let [Some(ty_a), Some(ty_b)] = overload.parameter_types() {
-                                overload.set_return_type(Type::BooleanLiteral(
-                                    ty_a.is_subtype_of(db, *ty_b),
+                                let constraints =
+                                    ty_a.when_subtype_of(db, *ty_b, InferableTypeVars::None);
+                                let tracked = TrackedConstraintSet::new(db, constraints);
+                                overload.set_return_type(Type::KnownInstance(
+                                    KnownInstanceType::ConstraintSet(tracked),
                                 ));
                             }
                         }
 
                         Some(KnownFunction::IsAssignableTo) => {
                             if let [Some(ty_a), Some(ty_b)] = overload.parameter_types() {
-                                overload.set_return_type(Type::BooleanLiteral(
-                                    ty_a.is_assignable_to(db, *ty_b),
+                                let constraints =
+                                    ty_a.when_assignable_to(db, *ty_b, InferableTypeVars::None);
+                                let tracked = TrackedConstraintSet::new(db, constraints);
+                                overload.set_return_type(Type::KnownInstance(
+                                    KnownInstanceType::ConstraintSet(tracked),
                                 ));
                             }
                         }
 
                         Some(KnownFunction::IsDisjointFrom) => {
                             if let [Some(ty_a), Some(ty_b)] = overload.parameter_types() {
-                                overload.set_return_type(Type::BooleanLiteral(
-                                    ty_a.is_disjoint_from(db, *ty_b),
+                                let constraints =
+                                    ty_a.when_disjoint_from(db, *ty_b, InferableTypeVars::None);
+                                let tracked = TrackedConstraintSet::new(db, constraints);
+                                overload.set_return_type(Type::KnownInstance(
+                                    KnownInstanceType::ConstraintSet(tracked),
                                 ));
                             }
                         }
@@ -657,6 +766,13 @@ impl<'db> Bindings<'db> {
                                         function_generic_context(bound_method.function(db))
                                     }
 
+                                    Type::KnownInstance(KnownInstanceType::TypeAliasType(
+                                        TypeAliasType::PEP695(alias),
+                                    )) => alias
+                                        .generic_context(db)
+                                        .map(|generic_context| generic_context.as_tuple(db))
+                                        .unwrap_or_else(|| Type::none(db)),
+
                                     _ => Type::none(db),
                                 });
                             }
@@ -699,7 +815,7 @@ impl<'db> Bindings<'db> {
                                                 db,
                                                 metadata
                                                     .members
-                                                    .iter()
+                                                    .keys()
                                                     .map(|member| Type::string_literal(db, member)),
                                             )
                                         } else {
@@ -725,18 +841,6 @@ impl<'db> Bindings<'db> {
                             }
                         }
 
-                        Some(KnownFunction::TopMaterialization) => {
-                            if let [Some(ty)] = overload.parameter_types() {
-                                overload.set_return_type(ty.top_materialization(db));
-                            }
-                        }
-
-                        Some(KnownFunction::BottomMaterialization) => {
-                            if let [Some(ty)] = overload.parameter_types() {
-                                overload.set_return_type(ty.bottom_materialization(db));
-                            }
-                        }
-
                         Some(KnownFunction::Len) => {
                             if let [Some(first_arg)] = overload.parameter_types() {
                                 if let Some(len_ty) = first_arg.len(db) {
@@ -759,14 +863,21 @@ impl<'db> Bindings<'db> {
 
                         Some(KnownFunction::IsProtocol) => {
                             if let [Some(ty)] = overload.parameter_types() {
+                                // We evaluate this to `Literal[True]` only if the runtime function `typing.is_protocol`
+                                // would return `True` for the given type. Internally we consider `SupportsAbs[int]` to
+                                // be a "(specialised) protocol class", but `typing.is_protocol(SupportsAbs[int])` returns
+                                // `False` at runtime, so we do not set the return type to `Literal[True]` in this case.
                                 overload.set_return_type(Type::BooleanLiteral(
-                                    ty.into_class_literal()
+                                    ty.as_class_literal()
                                         .is_some_and(|class| class.is_protocol(db)),
                                 ));
                             }
                         }
 
                         Some(KnownFunction::GetProtocolMembers) => {
+                            // Similarly to `is_protocol`, we only evaluate to this a frozenset of literal strings if a
+                            // class-literal is passed in, not if a generic alias is passed in, to emulate the behaviour
+                            // of `typing.get_protocol_members` at runtime.
                             if let [Some(Type::ClassLiteral(class))] = overload.parameter_types() {
                                 if let Some(protocol_class) = class.into_protocol_class(db) {
                                     let member_names = protocol_class
@@ -789,7 +900,7 @@ impl<'db> Bindings<'db> {
                                 continue;
                             };
 
-                            let Some(attr_name) = attr_name.into_string_literal() else {
+                            let Some(attr_name) = attr_name.as_string_literal() else {
                                 continue;
                             };
 
@@ -805,7 +916,7 @@ impl<'db> Bindings<'db> {
                             // TODO: we could emit a diagnostic here (if default is not set)
                             overload.set_return_type(
                                 match instance_ty.static_member(db, attr_name.value(db)) {
-                                    Place::Type(ty, Boundness::Bound) => {
+                                    Place::Defined(ty, _, Definedness::AlwaysDefined) => {
                                         if ty.is_dynamic() {
                                             // Here, we attempt to model the fact that an attribute lookup on
                                             // a dynamic type could fail
@@ -815,10 +926,10 @@ impl<'db> Bindings<'db> {
                                             ty
                                         }
                                     }
-                                    Place::Type(ty, Boundness::PossiblyUnbound) => {
+                                    Place::Defined(ty, _, Definedness::PossiblyUndefined) => {
                                         union_with_default(ty)
                                     }
-                                    Place::Unbound => default,
+                                    Place::Undefined => default,
                                 },
                             );
                         }
@@ -837,43 +948,45 @@ impl<'db> Bindings<'db> {
                                 weakref_slot,
                             ] = overload.parameter_types()
                             {
-                                let mut params = DataclassParams::empty();
+                                let mut flags = DataclassFlags::empty();
 
                                 if to_bool(init, true) {
-                                    params |= DataclassParams::INIT;
+                                    flags |= DataclassFlags::INIT;
                                 }
                                 if to_bool(repr, true) {
-                                    params |= DataclassParams::REPR;
+                                    flags |= DataclassFlags::REPR;
                                 }
                                 if to_bool(eq, true) {
-                                    params |= DataclassParams::EQ;
+                                    flags |= DataclassFlags::EQ;
                                 }
                                 if to_bool(order, false) {
-                                    params |= DataclassParams::ORDER;
+                                    flags |= DataclassFlags::ORDER;
                                 }
                                 if to_bool(unsafe_hash, false) {
-                                    params |= DataclassParams::UNSAFE_HASH;
+                                    flags |= DataclassFlags::UNSAFE_HASH;
                                 }
                                 if to_bool(frozen, false) {
-                                    params |= DataclassParams::FROZEN;
+                                    flags |= DataclassFlags::FROZEN;
                                 }
                                 if to_bool(match_args, true) {
-                                    params |= DataclassParams::MATCH_ARGS;
+                                    flags |= DataclassFlags::MATCH_ARGS;
                                 }
                                 if to_bool(kw_only, false) {
                                     if Program::get(db).python_version(db) >= PythonVersion::PY310 {
-                                        params |= DataclassParams::KW_ONLY;
+                                        flags |= DataclassFlags::KW_ONLY;
                                     } else {
                                         // TODO: emit diagnostic
                                     }
                                 }
                                 if to_bool(slots, false) {
-                                    params |= DataclassParams::SLOTS;
+                                    flags |= DataclassFlags::SLOTS;
                                 }
                                 if to_bool(weakref_slot, false) {
-                                    params |= DataclassParams::WEAKREF_SLOT;
+                                    flags |= DataclassFlags::WEAKREF_SLOT;
                                 }
 
+                                let params = DataclassParams::from_flags(db, flags);
+
                                 overload.set_return_type(Type::DataclassDecorator(params));
                             }
 
@@ -881,13 +994,14 @@ impl<'db> Bindings<'db> {
                             if let [Some(Type::ClassLiteral(class_literal))] =
                                 overload.parameter_types()
                             {
-                                let params = DataclassParams::default();
+                                let params = DataclassParams::default_params(db);
                                 overload.set_return_type(Type::from(ClassLiteral::new(
                                     db,
                                     class_literal.name(db),
                                     class_literal.body_scope(db),
                                     class_literal.known(db),
                                     class_literal.deprecated(db),
+                                    class_literal.type_check_only(db),
                                     Some(params),
                                     class_literal.dataclass_transformer_params(db),
                                 )));
@@ -904,75 +1018,39 @@ impl<'db> Bindings<'db> {
                                 _kwargs,
                             ] = overload.parameter_types()
                             {
-                                let mut params = DataclassTransformerParams::empty();
+                                let mut flags = DataclassTransformerFlags::empty();
 
                                 if to_bool(eq_default, true) {
-                                    params |= DataclassTransformerParams::EQ_DEFAULT;
+                                    flags |= DataclassTransformerFlags::EQ_DEFAULT;
                                 }
                                 if to_bool(order_default, false) {
-                                    params |= DataclassTransformerParams::ORDER_DEFAULT;
+                                    flags |= DataclassTransformerFlags::ORDER_DEFAULT;
                                 }
                                 if to_bool(kw_only_default, false) {
-                                    params |= DataclassTransformerParams::KW_ONLY_DEFAULT;
+                                    flags |= DataclassTransformerFlags::KW_ONLY_DEFAULT;
                                 }
                                 if to_bool(frozen_default, false) {
-                                    params |= DataclassTransformerParams::FROZEN_DEFAULT;
+                                    flags |= DataclassTransformerFlags::FROZEN_DEFAULT;
                                 }
 
-                                if let Some(field_specifiers_type) = field_specifiers {
-                                    // For now, we'll do a simple check: if field_specifiers is not
-                                    // None/empty, we assume it might contain dataclasses.field
-                                    // TODO: Implement proper parsing to check for
-                                    //   dataclasses.field/Field specifically
-                                    if !field_specifiers_type.is_none(db) {
-                                        params |= DataclassTransformerParams::FIELD_SPECIFIERS;
-                                    }
-                                }
+                                let field_specifiers: Box<[Type<'db>]> = field_specifiers
+                                    .map(|tuple_type| {
+                                        tuple_type
+                                            .exact_tuple_instance_spec(db)
+                                            .iter()
+                                            .flat_map(|tuple_spec| tuple_spec.fixed_elements())
+                                            .copied()
+                                            .collect()
+                                    })
+                                    .unwrap_or_default();
+
+                                let params =
+                                    DataclassTransformerParams::new(db, flags, field_specifiers);
 
                                 overload.set_return_type(Type::DataclassTransformer(params));
                             }
                         }
 
-                        Some(KnownFunction::Field) => {
-                            // TODO this will break on Python 3.14 -- we should match by parameter name instead
-                            if let [default, default_factory, init, .., kw_only] =
-                                overload.parameter_types()
-                            {
-                                let default_ty = match (default, default_factory) {
-                                    (Some(default_ty), _) => *default_ty,
-                                    (_, Some(default_factory_ty)) => default_factory_ty
-                                        .try_call(db, &CallArguments::none())
-                                        .map_or(Type::unknown(), |binding| binding.return_type(db)),
-                                    _ => Type::unknown(),
-                                };
-
-                                let init = init
-                                    .map(|init| !init.bool(db).is_always_false())
-                                    .unwrap_or(true);
-
-                                let kw_only = if Program::get(db).python_version(db)
-                                    >= PythonVersion::PY310
-                                {
-                                    kw_only.map(|kw_only| !kw_only.bool(db).is_always_false())
-                                } else {
-                                    None
-                                };
-
-                                // `typeshed` pretends that `dataclasses.field()` returns the type of the
-                                // default value directly. At runtime, however, this function returns an
-                                // instance of `dataclasses.Field`. We also model it this way and return
-                                // a known-instance type with information about the field. The drawback
-                                // of this approach is that we need to pretend that instances of `Field`
-                                // are assignable to `T` if the default type of the field is assignable
-                                // to `T`. Otherwise, we would error on `name: str = field(default="")`.
-                                overload.set_return_type(Type::KnownInstance(
-                                    KnownInstanceType::Field(FieldInstance::new(
-                                        db, default_ty, init, kw_only,
-                                    )),
-                                ));
-                            }
-                        }
-
                         _ => {
                             // Ideally, either the implementation, or exactly one of the overloads
                             // of the function can have the dataclass_transform decorator applied.
@@ -989,24 +1067,41 @@ impl<'db> Bindings<'db> {
                                             // the argument type and overwrite the corresponding flag in `dataclass_params` after
                                             // constructing them from the `dataclass_transformer`-parameter defaults.
 
-                                            let mut dataclass_params =
-                                                DataclassParams::from(params);
+                                            let dataclass_params =
+                                                DataclassParams::from_transformer_params(
+                                                    db, params,
+                                                );
+                                            let mut flags = dataclass_params.flags(db);
 
-                                            if let Some(Some(Type::BooleanLiteral(order))) =
-                                                overload
-                                                    .signature
-                                                    .parameters()
-                                                    .keyword_by_name("order")
-                                                    .map(|(idx, _)| idx)
-                                                    .and_then(|idx| {
-                                                        overload.parameter_types().get(idx)
-                                                    })
+                                            if let Ok(Some(Type::BooleanLiteral(order))) =
+                                                overload.parameter_type_by_name("order", false)
                                             {
-                                                dataclass_params
-                                                    .set(DataclassParams::ORDER, *order);
+                                                flags.set(DataclassFlags::ORDER, order);
                                             }
 
-                                            Type::DataclassDecorator(dataclass_params)
+                                            if let Ok(Some(Type::BooleanLiteral(eq))) =
+                                                overload.parameter_type_by_name("eq", false)
+                                            {
+                                                flags.set(DataclassFlags::EQ, eq);
+                                            }
+
+                                            if let Ok(Some(Type::BooleanLiteral(kw_only))) =
+                                                overload.parameter_type_by_name("kw_only", false)
+                                            {
+                                                flags.set(DataclassFlags::KW_ONLY, kw_only);
+                                            }
+
+                                            if let Ok(Some(Type::BooleanLiteral(frozen))) =
+                                                overload.parameter_type_by_name("frozen", false)
+                                            {
+                                                flags.set(DataclassFlags::FROZEN, frozen);
+                                            }
+
+                                            Type::DataclassDecorator(DataclassParams::new(
+                                                db,
+                                                flags,
+                                                dataclass_params.field_specifiers(db),
+                                            ))
                                         },
                                     )
                                 })
@@ -1051,18 +1146,20 @@ impl<'db> Bindings<'db> {
                             // `tuple(range(42))` => `tuple[int, ...]`
                             // BUT `tuple((1, 2))` => `tuple[Literal[1], Literal[2]]` rather than `tuple[Literal[1, 2], ...]`
                             if let [Some(argument)] = overload.parameter_types() {
-                                let Ok(tuple_spec) = argument.try_iterate(db) else {
-                                    tracing::debug!(
-                                        "type" = %argument.display(db),
-                                        "try_iterate() should not fail on a type \
-                                            assignable to `Iterable`",
-                                    );
-                                    continue;
+                                // We deliberately use `.iterate()` here (falling back to `Unknown` if it isn't iterable)
+                                // rather than `.try_iterate().expect()`. Even though we know at this point that the input
+                                // type is assignable to `Iterable`, that doesn't mean that the input type is *actually*
+                                // iterable (it could be a Liskov-uncompliant subtype of the `Iterable` class that sets
+                                // `__iter__ = None`, for example). That would be badly written Python code, but we still
+                                // need to be able to handle it without crashing.
+                                let return_type = if let Type::Union(union) = argument {
+                                    union.map(db, |element| {
+                                        Type::tuple(TupleType::new(db, &element.iterate(db)))
+                                    })
+                                } else {
+                                    Type::tuple(TupleType::new(db, &argument.iterate(db)))
                                 };
-                                overload.set_return_type(Type::tuple(TupleType::new(
-                                    db,
-                                    tuple_spec.as_ref(),
-                                )));
+                                overload.set_return_type(return_type);
                             }
                         }
 
@@ -1086,7 +1183,16 @@ impl<'a, 'db> IntoIterator for &'a Bindings<'db> {
     type IntoIter = std::slice::Iter<'a, CallableBinding<'db>>;
 
     fn into_iter(self) -> Self::IntoIter {
-        self.elements.iter()
+        self.iter()
+    }
+}
+
+impl<'db> IntoIterator for Bindings<'db> {
+    type Item = CallableBinding<'db>;
+    type IntoIter = smallvec::IntoIter<[CallableBinding<'db>; 1]>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.elements.into_iter()
     }
 }
 
@@ -1104,8 +1210,7 @@ impl<'db> From<CallableBinding<'db>> for Bindings<'db> {
         Bindings {
             callable_type: from.callable_type,
             elements: smallvec_inline![from],
-            argument_forms: Box::from([]),
-            conflicting_forms: Box::from([]),
+            argument_forms: ArgumentForms::new(0),
         }
     }
 }
@@ -1126,8 +1231,7 @@ impl<'db> From<Binding<'db>> for Bindings<'db> {
         Bindings {
             callable_type,
             elements: smallvec_inline![callable_binding],
-            argument_forms: Box::from([]),
-            conflicting_forms: Box::from([]),
+            argument_forms: ArgumentForms::new(0),
         }
     }
 }
@@ -1246,20 +1350,25 @@ impl<'db> CallableBinding<'db> {
 
     fn match_parameters(
         &mut self,
+        db: &'db dyn Db,
         arguments: &CallArguments<'_, 'db>,
-        argument_forms: &mut [Option<ParameterForm>],
-        conflicting_forms: &mut [bool],
+        argument_forms: &mut ArgumentForms,
     ) {
         // If this callable is a bound method, prepend the self instance onto the arguments list
         // before checking.
         let arguments = arguments.with_self(self.bound_type);
 
         for overload in &mut self.overloads {
-            overload.match_parameters(arguments.as_ref(), argument_forms, conflicting_forms);
+            overload.match_parameters(db, arguments.as_ref(), argument_forms);
         }
     }
 
-    fn check_types(&mut self, db: &'db dyn Db, argument_types: &CallArguments<'_, 'db>) {
+    fn check_types(
+        &mut self,
+        db: &'db dyn Db,
+        argument_types: &CallArguments<'_, 'db>,
+        call_expression_tcx: &TypeContext<'db>,
+    ) -> Option<ArgumentForms> {
         // If this callable is a bound method, prepend the self instance onto the arguments list
         // before checking.
         let argument_types = argument_types.with_self(self.bound_type);
@@ -1271,16 +1380,16 @@ impl<'db> CallableBinding<'db> {
                 // still perform type checking for non-overloaded function to provide better user
                 // experience.
                 if let [overload] = self.overloads.as_mut_slice() {
-                    overload.check_types(db, argument_types.as_ref());
+                    overload.check_types(db, argument_types.as_ref(), call_expression_tcx);
                 }
-                return;
+                return None;
             }
             MatchingOverloadIndex::Single(index) => {
                 // If only one candidate overload remains, it is the winning match. Evaluate it as
                 // a regular (non-overloaded) call.
                 self.matching_overload_index = Some(index);
-                self.overloads[index].check_types(db, argument_types.as_ref());
-                return;
+                self.overloads[index].check_types(db, argument_types.as_ref(), call_expression_tcx);
+                return None;
             }
             MatchingOverloadIndex::Multiple(indexes) => {
                 // If two or more candidate overloads remain, proceed to step 2.
@@ -1288,16 +1397,10 @@ impl<'db> CallableBinding<'db> {
             }
         };
 
-        let snapshotter = CallableBindingSnapshotter::new(matching_overload_indexes);
-
-        // State of the bindings _before_ evaluating (type checking) the matching overloads using
-        // the non-expanded argument types.
-        let pre_evaluation_snapshot = snapshotter.take(self);
-
         // Step 2: Evaluate each remaining overload as a regular (non-overloaded) call to determine
         // whether it is compatible with the supplied argument list.
         for (_, overload) in self.matching_overloads_mut() {
-            overload.check_types(db, argument_types.as_ref());
+            overload.check_types(db, argument_types.as_ref(), call_expression_tcx);
         }
 
         match self.matching_overload_index() {
@@ -1306,17 +1409,37 @@ impl<'db> CallableBinding<'db> {
             }
             MatchingOverloadIndex::Single(_) => {
                 // If only one overload evaluates without error, it is the winning match.
-                return;
+                return None;
             }
             MatchingOverloadIndex::Multiple(indexes) => {
                 // If two or more candidate overloads remain, proceed to step 4.
-                // TODO: Step 4
+                self.filter_overloads_containing_variadic(&indexes);
 
-                // Step 5
-                self.filter_overloads_using_any_or_unknown(db, argument_types.as_ref(), &indexes);
+                match self.matching_overload_index() {
+                    MatchingOverloadIndex::None => {
+                        // This shouldn't be possible because step 4 can only filter out overloads
+                        // when there _is_ a matching variadic argument.
+                        tracing::debug!("All overloads have been filtered out in step 4");
+                        return None;
+                    }
+                    MatchingOverloadIndex::Single(index) => {
+                        // If only one candidate overload remains, it is the winning match.
+                        // Evaluate it as a regular (non-overloaded) call.
+                        self.matching_overload_index = Some(index);
+                        return None;
+                    }
+                    MatchingOverloadIndex::Multiple(indexes) => {
+                        // If two or more candidate overloads remain, proceed to step 5.
+                        self.filter_overloads_using_any_or_unknown(
+                            db,
+                            argument_types.as_ref(),
+                            &indexes,
+                        );
+                    }
+                }
 
-                // We're returning here because this shouldn't lead to argument type expansion.
-                return;
+                // This shouldn't lead to argument type expansion.
+                return None;
             }
         }
 
@@ -1324,32 +1447,100 @@ impl<'db> CallableBinding<'db> {
         // https://typing.python.org/en/latest/spec/overload.html#argument-type-expansion
         let mut expansions = argument_types.expand(db).peekable();
 
-        if expansions.peek().is_none() {
-            // Return early if there are no argument types to expand.
-            return;
+        // Return early if there are no argument types to expand.
+        expansions.peek()?;
+
+        // At this point, there's at least one argument that can be expanded.
+        //
+        // This heuristic tries to detect if there's any need to perform argument type expansion or
+        // not by checking whether there are any non-expandable argument type that cannot be
+        // assigned to any of the overloads.
+        for (argument_index, (argument, argument_type)) in argument_types.iter().enumerate() {
+            // TODO: Remove `Keywords` once `**kwargs` support is added
+            if matches!(argument, Argument::Synthetic | Argument::Keywords) {
+                continue;
+            }
+            let Some(argument_type) = argument_type else {
+                continue;
+            };
+            if is_expandable_type(db, argument_type) {
+                continue;
+            }
+            let mut is_argument_assignable_to_any_overload = false;
+            'overload: for overload in &self.overloads {
+                for parameter_index in &overload.argument_matches[argument_index].parameters {
+                    let parameter_type = overload.signature.parameters()[*parameter_index]
+                        .annotated_type()
+                        .unwrap_or(Type::unknown());
+                    if argument_type
+                        .when_assignable_to(db, parameter_type, overload.inferable_typevars)
+                        .is_always_satisfied()
+                    {
+                        is_argument_assignable_to_any_overload = true;
+                        break 'overload;
+                    }
+                }
+            }
+            if !is_argument_assignable_to_any_overload {
+                tracing::debug!(
+                    "Argument at {argument_index} (`{}`) is not assignable to any of the \
+                    remaining overloads, skipping argument type expansion",
+                    argument_type.display(db)
+                );
+                return None;
+            }
         }
 
+        let snapshotter = CallableBindingSnapshotter::new(matching_overload_indexes);
+
         // State of the bindings _after_ evaluating (type checking) the matching overloads using
         // the non-expanded argument types.
         let post_evaluation_snapshot = snapshotter.take(self);
 
-        // Restore the bindings state to the one prior to the type checking step in preparation
-        // for evaluating the expanded argument lists.
-        snapshotter.restore(self, pre_evaluation_snapshot);
+        for expansion in expansions {
+            let expanded_argument_lists = match expansion {
+                Expansion::LimitReached(index) => {
+                    snapshotter.restore(self, post_evaluation_snapshot);
+                    self.overload_call_return_type = Some(
+                        OverloadCallReturnType::ArgumentTypeExpansionLimitReached(index),
+                    );
+                    return None;
+                }
+                Expansion::Expanded(argument_lists) => argument_lists,
+            };
 
-        for expanded_argument_lists in expansions {
             // This is the merged state of the bindings after evaluating all of the expanded
             // argument lists. This will be the final state to restore the bindings to if all of
             // the expanded argument lists evaluated successfully.
             let mut merged_evaluation_state: Option<CallableBindingSnapshot<'db>> = None;
 
+            // Merged argument forms after evaluating all the argument lists in this expansion.
+            let mut merged_argument_forms = ArgumentForms::default();
+
+            // The return types of each of the expanded argument lists that evaluated successfully.
             let mut return_types = Vec::new();
 
-            for expanded_argument_types in &expanded_argument_lists {
-                let pre_evaluation_snapshot = snapshotter.take(self);
+            for expanded_arguments in &expanded_argument_lists {
+                let mut argument_forms = ArgumentForms::new(expanded_arguments.len());
+
+                // The spec mentions that each expanded argument list should be re-evaluated from
+                // step 2 but we need to re-evaluate from step 1 because our step 1 does more than
+                // what the spec mentions. Step 1 of the spec means only "eliminate impossible
+                // overloads due to arity mismatch" while our step 1 (`match_parameters`) also
+                // includes "match arguments to the parameters". This is important because it
+                // allows us to correctly handle cases involving a variadic argument that could
+                // expand into different number of arguments with each expansion. Refer to
+                // https://github.com/astral-sh/ty/issues/735 for more details.
+                for overload in &mut self.overloads {
+                    // Clear the state of all overloads before re-evaluating from step 1
+                    overload.reset();
+                    overload.match_parameters(db, expanded_arguments, &mut argument_forms);
+                }
+
+                merged_argument_forms.merge(&argument_forms);
 
                 for (_, overload) in self.matching_overloads_mut() {
-                    overload.check_types(db, expanded_argument_types);
+                    overload.check_types(db, expanded_arguments, call_expression_tcx);
                 }
 
                 let return_type = match self.matching_overload_index() {
@@ -1358,15 +1549,28 @@ impl<'db> CallableBinding<'db> {
                         Some(self.overloads[index].return_type())
                     }
                     MatchingOverloadIndex::Multiple(matching_overload_indexes) => {
-                        // TODO: Step 4
+                        self.filter_overloads_containing_variadic(&matching_overload_indexes);
 
-                        self.filter_overloads_using_any_or_unknown(
-                            db,
-                            expanded_argument_types,
-                            &matching_overload_indexes,
-                        );
-
-                        Some(self.return_type())
+                        match self.matching_overload_index() {
+                            MatchingOverloadIndex::None => {
+                                tracing::debug!(
+                                    "All overloads have been filtered out in step 4 during argument type expansion"
+                                );
+                                None
+                            }
+                            MatchingOverloadIndex::Single(index) => {
+                                self.matching_overload_index = Some(index);
+                                Some(self.return_type())
+                            }
+                            MatchingOverloadIndex::Multiple(indexes) => {
+                                self.filter_overloads_using_any_or_unknown(
+                                    db,
+                                    expanded_arguments,
+                                    &indexes,
+                                );
+                                Some(self.return_type())
+                            }
+                        }
                     }
                 };
 
@@ -1383,9 +1587,6 @@ impl<'db> CallableBinding<'db> {
                     merged_evaluation_state = Some(snapshotter.take(self));
                 }
 
-                // Restore the bindings state before evaluating the next argument list.
-                snapshotter.restore(self, pre_evaluation_snapshot);
-
                 if let Some(return_type) = return_type {
                     return_types.push(return_type);
                 } else {
@@ -1413,7 +1614,7 @@ impl<'db> CallableBinding<'db> {
                         UnionType::from_elements(db, return_types),
                     ));
 
-                return;
+                return Some(merged_argument_forms);
             }
         }
 
@@ -1422,6 +1623,34 @@ impl<'db> CallableBinding<'db> {
         // argument types. This is necessary because we restore the state to the pre-evaluation
         // snapshot when processing the expanded argument lists.
         snapshotter.restore(self, post_evaluation_snapshot);
+
+        None
+    }
+
+    /// Filter overloads based on variadic argument to variadic parameter match.
+    ///
+    /// This is the step 4 of the [overload call evaluation algorithm][1].
+    ///
+    /// [1]: https://typing.python.org/en/latest/spec/overload.html#overload-call-evaluation
+    fn filter_overloads_containing_variadic(&mut self, matching_overload_indexes: &[usize]) {
+        let variadic_matching_overloads = matching_overload_indexes
+            .iter()
+            .filter(|&&overload_index| {
+                self.overloads[overload_index].variadic_argument_matched_to_variadic_parameter
+            })
+            .collect::<HashSet<_>>();
+
+        if variadic_matching_overloads.is_empty()
+            || variadic_matching_overloads.len() == matching_overload_indexes.len()
+        {
+            return;
+        }
+
+        for overload_index in matching_overload_indexes {
+            if !variadic_matching_overloads.contains(overload_index) {
+                self.overloads[*overload_index].mark_as_unmatched_overload();
+            }
+        }
     }
 
     /// Filter overloads based on [`Any`] or [`Unknown`] argument types.
@@ -1442,6 +1671,14 @@ impl<'db> CallableBinding<'db> {
         arguments: &CallArguments<'_, 'db>,
         matching_overload_indexes: &[usize],
     ) {
+        // The maximum number of parameters across all the overloads that are being considered
+        // for filtering.
+        let max_parameter_count = matching_overload_indexes
+            .iter()
+            .map(|&index| self.overloads[index].signature.parameters().len())
+            .max()
+            .unwrap_or(0);
+
         // These are the parameter indexes that matches the arguments that participate in the
         // filtering process.
         //
@@ -1449,41 +1686,74 @@ impl<'db> CallableBinding<'db> {
         // gradual equivalent to the parameter types at the same index for other overloads.
         let mut participating_parameter_indexes = HashSet::new();
 
-        // These only contain the top materialized argument types for the corresponding
-        // participating parameter indexes.
-        let mut top_materialized_argument_types = vec![];
+        // The parameter types at each index for the first overload containing a parameter at
+        // that index.
+        let mut first_parameter_types: Vec<Option<Type<'db>>> = vec![None; max_parameter_count];
 
-        for (argument_index, argument_type) in arguments.iter_types().enumerate() {
-            let mut first_parameter_type: Option<Type<'db>> = None;
-            let mut participating_parameter_index = None;
-
-            'overload: for overload_index in matching_overload_indexes {
+        for argument_index in 0..arguments.len() {
+            for overload_index in matching_overload_indexes {
                 let overload = &self.overloads[*overload_index];
-                for parameter_index in &overload.argument_matches[argument_index].parameters {
+                for &parameter_index in &overload.argument_matches[argument_index].parameters {
                     // TODO: For an unannotated `self` / `cls` parameter, the type should be
                     // `typing.Self` / `type[typing.Self]`
-                    let current_parameter_type = overload.signature.parameters()[*parameter_index]
+                    let current_parameter_type = overload.signature.parameters()[parameter_index]
                         .annotated_type()
                         .unwrap_or(Type::unknown());
+                    let first_parameter_type = &mut first_parameter_types[parameter_index];
                     if let Some(first_parameter_type) = first_parameter_type {
-                        if !first_parameter_type.is_equivalent_to(db, current_parameter_type) {
-                            participating_parameter_index = Some(*parameter_index);
-                            break 'overload;
+                        if !first_parameter_type
+                            .when_equivalent_to(
+                                db,
+                                current_parameter_type,
+                                overload.inferable_typevars,
+                            )
+                            .is_always_satisfied()
+                        {
+                            participating_parameter_indexes.insert(parameter_index);
                         }
                     } else {
-                        first_parameter_type = Some(current_parameter_type);
+                        *first_parameter_type = Some(current_parameter_type);
                     }
                 }
             }
+        }
 
-            if let Some(parameter_index) = participating_parameter_index {
-                participating_parameter_indexes.insert(parameter_index);
-                top_materialized_argument_types.push(argument_type.top_materialization(db));
+        let mut union_argument_type_builders = std::iter::repeat_with(|| UnionBuilder::new(db))
+            .take(max_parameter_count)
+            .collect::<Vec<_>>();
+
+        for (argument_index, argument_type) in arguments.iter_types().enumerate() {
+            for overload_index in matching_overload_indexes {
+                let overload = &self.overloads[*overload_index];
+                for (parameter_index, variadic_argument_type) in
+                    overload.argument_matches[argument_index].iter()
+                {
+                    if !participating_parameter_indexes.contains(&parameter_index) {
+                        continue;
+                    }
+                    union_argument_type_builders[parameter_index].add_in_place(
+                        variadic_argument_type
+                            .unwrap_or(argument_type)
+                            .top_materialization(db),
+                    );
+                }
             }
         }
 
-        let top_materialized_argument_type =
-            Type::heterogeneous_tuple(db, top_materialized_argument_types);
+        // These only contain the top materialized argument types for the corresponding
+        // participating parameter indexes.
+        let top_materialized_argument_type = Type::heterogeneous_tuple(
+            db,
+            union_argument_type_builders
+                .into_iter()
+                .filter_map(|builder| {
+                    if builder.is_empty() {
+                        None
+                    } else {
+                        Some(builder.build())
+                    }
+                }),
+        );
 
         // A flag to indicate whether we've found the overload that makes the remaining overloads
         // unmatched for the given argument types.
@@ -1494,15 +1764,22 @@ impl<'db> CallableBinding<'db> {
                 self.overloads[*current_index].mark_as_unmatched_overload();
                 continue;
             }
-            let mut parameter_types = Vec::with_capacity(arguments.len());
+
+            let mut union_parameter_types = std::iter::repeat_with(|| UnionBuilder::new(db))
+                .take(max_parameter_count)
+                .collect::<Vec<_>>();
+
+            // The number of parameters that have been skipped because they don't participate in
+            // the filtering process. This is used to make sure the types are added to the
+            // corresponding parameter index in `union_parameter_types`.
+            let mut skipped_parameters = 0;
+
             for argument_index in 0..arguments.len() {
-                // The parameter types at the current argument index.
-                let mut current_parameter_types = vec![];
                 for overload_index in &matching_overload_indexes[..=upto] {
                     let overload = &self.overloads[*overload_index];
                     for parameter_index in &overload.argument_matches[argument_index].parameters {
                         if !participating_parameter_indexes.contains(parameter_index) {
-                            // This parameter doesn't participate in the filtering process.
+                            skipped_parameters += 1;
                             continue;
                         }
                         // TODO: For an unannotated `self` / `cls` parameter, the type should be
@@ -1514,21 +1791,24 @@ impl<'db> CallableBinding<'db> {
                             parameter_type =
                                 parameter_type.apply_specialization(db, specialization);
                         }
-                        if let Some(inherited_specialization) = overload.inherited_specialization {
-                            parameter_type =
-                                parameter_type.apply_specialization(db, inherited_specialization);
-                        }
-                        current_parameter_types.push(parameter_type);
+                        union_parameter_types[parameter_index.saturating_sub(skipped_parameters)]
+                            .add_in_place(parameter_type);
                     }
                 }
-                if current_parameter_types.is_empty() {
-                    continue;
-                }
-                parameter_types.push(UnionType::from_elements(db, current_parameter_types));
             }
-            if top_materialized_argument_type
-                .is_assignable_to(db, Type::heterogeneous_tuple(db, parameter_types))
-            {
+
+            let parameter_types = Type::heterogeneous_tuple(
+                db,
+                union_parameter_types.into_iter().filter_map(|builder| {
+                    if builder.is_empty() {
+                        None
+                    } else {
+                        Some(builder.build())
+                    }
+                }),
+            );
+
+            if top_materialized_argument_type.is_assignable_to(db, parameter_types) {
                 filter_remaining_overloads = true;
             }
         }
@@ -1545,7 +1825,12 @@ impl<'db> CallableBinding<'db> {
                 matching_overloads.all(|(_, overload)| {
                     overload
                         .return_type()
-                        .is_equivalent_to(db, first_overload_return_type)
+                        .when_equivalent_to(
+                            db,
+                            first_overload_return_type,
+                            overload.inferable_typevars,
+                        )
+                        .is_always_satisfied()
                 })
             } else {
                 // No matching overload
@@ -1586,7 +1871,7 @@ impl<'db> CallableBinding<'db> {
     }
 
     /// Returns the index of the matching overload in the form of [`MatchingOverloadIndex`].
-    fn matching_overload_index(&self) -> MatchingOverloadIndex {
+    pub(crate) fn matching_overload_index(&self) -> MatchingOverloadIndex {
         let mut matching_overloads = self.matching_overloads();
         match matching_overloads.next() {
             None => MatchingOverloadIndex::None,
@@ -1604,8 +1889,15 @@ impl<'db> CallableBinding<'db> {
         }
     }
 
+    /// Returns all overloads for this call binding, including overloads that did not match.
+    pub(crate) fn overloads(&self) -> &[Binding<'db>] {
+        self.overloads.as_slice()
+    }
+
     /// Returns an iterator over all the overloads that matched for this call binding.
-    pub(crate) fn matching_overloads(&self) -> impl Iterator<Item = (usize, &Binding<'db>)> {
+    pub(crate) fn matching_overloads(
+        &self,
+    ) -> impl Iterator<Item = (usize, &Binding<'db>)> + Clone {
         self.overloads
             .iter()
             .enumerate()
@@ -1636,7 +1928,8 @@ impl<'db> CallableBinding<'db> {
         if let Some(overload_call_return_type) = self.overload_call_return_type {
             return match overload_call_return_type {
                 OverloadCallReturnType::ArgumentTypeExpansion(return_type) => return_type,
-                OverloadCallReturnType::Ambiguous => Type::unknown(),
+                OverloadCallReturnType::ArgumentTypeExpansionLimitReached(_)
+                | OverloadCallReturnType::Ambiguous => Type::unknown(),
             };
         }
         if let Some((_, first_overload)) = self.matching_overloads().next() {
@@ -1670,7 +1963,7 @@ impl<'db> CallableBinding<'db> {
         if self.dunder_call_is_possibly_unbound {
             if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, node) {
                 let mut diag = builder.into_diagnostic(format_args!(
-                    "Object of type `{}` is not callable (possibly unbound `__call__` method)",
+                    "Object of type `{}` is not callable (possibly missing `__call__` method)",
                     self.callable_type.display(context.db()),
                 ));
                 if let Some(union_diag) = union_diag {
@@ -1706,9 +1999,9 @@ impl<'db> CallableBinding<'db> {
                         FunctionKind::BoundMethod,
                         bound_method.function(context.db()),
                     )),
-                    Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(function)) => {
-                        Some((FunctionKind::MethodWrapper, function))
-                    }
+                    Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(
+                        function,
+                    )) => Some((FunctionKind::MethodWrapper, function)),
                     _ => None,
                 };
 
@@ -1747,6 +2040,23 @@ impl<'db> CallableBinding<'db> {
                         String::new()
                     }
                 ));
+
+                if let Some(index) =
+                    self.overload_call_return_type
+                        .and_then(
+                            |overload_call_return_type| match overload_call_return_type {
+                                OverloadCallReturnType::ArgumentTypeExpansionLimitReached(
+                                    index,
+                                ) => Some(index),
+                                _ => None,
+                            },
+                        )
+                {
+                    diag.info(format_args!(
+                        "Limit of argument type expansion reached at argument {index}"
+                    ));
+                }
+
                 if let Some((kind, function)) = function_type_and_kind {
                     let (overloads, implementation) =
                         function.overloads_and_implementation(context.db());
@@ -1771,7 +2081,7 @@ impl<'db> CallableBinding<'db> {
                     for overload in overloads.iter().take(MAXIMUM_OVERLOADS) {
                         diag.info(format_args!(
                             "  {}",
-                            overload.signature(context.db(), None).display(context.db())
+                            overload.signature(context.db()).display(context.db())
                         ));
                     }
                     if overloads.len() > MAXIMUM_OVERLOADS {
@@ -1810,14 +2120,24 @@ impl<'a, 'db> IntoIterator for &'a CallableBinding<'db> {
     }
 }
 
+impl<'db> IntoIterator for CallableBinding<'db> {
+    type Item = Binding<'db>;
+    type IntoIter = smallvec::IntoIter<[Binding<'db>; 1]>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.overloads.into_iter()
+    }
+}
+
 #[derive(Debug, Copy, Clone)]
 enum OverloadCallReturnType<'db> {
     ArgumentTypeExpansion(Type<'db>),
+    ArgumentTypeExpansionLimitReached(usize),
     Ambiguous,
 }
 
 #[derive(Debug)]
-enum MatchingOverloadIndex {
+pub(crate) enum MatchingOverloadIndex {
     /// No matching overloads found.
     None,
 
@@ -1828,37 +2148,92 @@ enum MatchingOverloadIndex {
     Multiple(Vec<usize>),
 }
 
+#[derive(Default, Debug)]
+struct ArgumentForms {
+    values: Vec<Option<ParameterForm>>,
+    conflicting: Vec<bool>,
+}
+
+impl ArgumentForms {
+    /// Create a new argument forms initialized to the given length and the default values.
+    fn new(len: usize) -> Self {
+        Self {
+            values: vec![None; len],
+            conflicting: vec![false; len],
+        }
+    }
+
+    fn merge(&mut self, other: &ArgumentForms) {
+        if self.values.len() < other.values.len() {
+            self.values.resize(other.values.len(), None);
+            self.conflicting.resize(other.conflicting.len(), false);
+        }
+
+        for (index, (other_form, other_conflict)) in other
+            .values
+            .iter()
+            .zip(other.conflicting.iter())
+            .enumerate()
+        {
+            if let Some(self_form) = &mut self.values[index] {
+                if let Some(other_form) = other_form {
+                    if *self_form != *other_form {
+                        // Different parameter forms, mark as conflicting
+                        self.conflicting[index] = true;
+                        *self_form = *other_form; // Use the new form
+                    }
+                }
+            } else {
+                self.values[index] = *other_form;
+            }
+
+            // Update the conflicting form (true takes precedence)
+            self.conflicting[index] |= *other_conflict;
+        }
+    }
+
+    fn shrink_to_fit(&mut self) {
+        self.values.shrink_to_fit();
+        self.conflicting.shrink_to_fit();
+    }
+}
+
+#[derive(Default, Clone, Copy)]
+struct ParameterInfo {
+    matched: bool,
+    suppress_missing_error: bool,
+}
+
 struct ArgumentMatcher<'a, 'db> {
     parameters: &'a Parameters<'db>,
-    argument_forms: &'a mut [Option<ParameterForm>],
-    conflicting_forms: &'a mut [bool],
+    argument_forms: &'a mut ArgumentForms,
     errors: &'a mut Vec<BindingError<'db>>,
 
-    argument_matches: Vec<MatchedArgument>,
-    parameter_matched: Vec<bool>,
+    argument_matches: Vec<MatchedArgument<'db>>,
+    parameter_info: Vec<ParameterInfo>,
     next_positional: usize,
     first_excess_positional: Option<usize>,
     num_synthetic_args: usize,
+    variadic_argument_matched_to_variadic_parameter: bool,
 }
 
 impl<'a, 'db> ArgumentMatcher<'a, 'db> {
     fn new(
         arguments: &CallArguments,
         parameters: &'a Parameters<'db>,
-        argument_forms: &'a mut [Option<ParameterForm>],
-        conflicting_forms: &'a mut [bool],
+        argument_forms: &'a mut ArgumentForms,
         errors: &'a mut Vec<BindingError<'db>>,
     ) -> Self {
         Self {
             parameters,
             argument_forms,
-            conflicting_forms,
             errors,
             argument_matches: vec![MatchedArgument::default(); arguments.len()],
-            parameter_matched: vec![false; parameters.len()],
+            parameter_info: vec![ParameterInfo::default(); parameters.len()],
             next_positional: 0,
             first_excess_positional: None,
             num_synthetic_args: 0,
+            variadic_argument_matched_to_variadic_parameter: false,
         }
     }
 
@@ -1874,24 +2249,29 @@ impl<'a, 'db> ArgumentMatcher<'a, 'db> {
         }
     }
 
+    #[expect(clippy::too_many_arguments)]
     fn assign_argument(
         &mut self,
         argument_index: usize,
         argument: Argument<'a>,
+        argument_type: Option<Type<'db>>,
         parameter_index: usize,
         parameter: &Parameter<'db>,
         positional: bool,
+        variable_argument_length: bool,
     ) {
         if !matches!(argument, Argument::Synthetic) {
-            if let Some(existing) = self.argument_forms[argument_index - self.num_synthetic_args]
-                .replace(parameter.form)
+            let adjusted_argument_index = argument_index - self.num_synthetic_args;
+            if let Some(existing) =
+                self.argument_forms.values[adjusted_argument_index].replace(parameter.form)
             {
                 if existing != parameter.form {
-                    self.conflicting_forms[argument_index - self.num_synthetic_args] = true;
+                    self.argument_forms.conflicting[argument_index - self.num_synthetic_args] =
+                        true;
                 }
             }
         }
-        if self.parameter_matched[parameter_index] {
+        if self.parameter_info[parameter_index].matched {
             if !parameter.is_variadic() && !parameter.is_keyword_variadic() {
                 self.errors.push(BindingError::ParameterAlreadyAssigned {
                     argument_index: self.get_argument_index(argument_index),
@@ -1899,16 +2279,28 @@ impl<'a, 'db> ArgumentMatcher<'a, 'db> {
                 });
             }
         }
+        if variable_argument_length
+            && matches!(
+                (argument, parameter.kind()),
+                (Argument::Variadic, ParameterKind::Variadic { .. })
+                    | (Argument::Keywords, ParameterKind::KeywordVariadic { .. })
+            )
+        {
+            self.variadic_argument_matched_to_variadic_parameter = true;
+        }
         let matched_argument = &mut self.argument_matches[argument_index];
         matched_argument.parameters.push(parameter_index);
+        matched_argument.types.push(argument_type);
         matched_argument.matched = true;
-        self.parameter_matched[parameter_index] = true;
+        self.parameter_info[parameter_index].matched = true;
     }
 
     fn match_positional(
         &mut self,
         argument_index: usize,
         argument: Argument<'a>,
+        argument_type: Option<Type<'db>>,
+        variable_argument_length: bool,
     ) -> Result<(), ()> {
         if matches!(argument, Argument::Synthetic) {
             self.num_synthetic_args += 1;
@@ -1927,9 +2319,11 @@ impl<'a, 'db> ArgumentMatcher<'a, 'db> {
         self.assign_argument(
             argument_index,
             argument,
+            argument_type,
             parameter_index,
             parameter,
             !parameter.is_variadic(),
+            variable_argument_length,
         );
         Ok(())
     }
@@ -1938,6 +2332,7 @@ impl<'a, 'db> ArgumentMatcher<'a, 'db> {
         &mut self,
         argument_index: usize,
         argument: Argument<'a>,
+        argument_type: Option<Type<'db>>,
         name: &str,
     ) -> Result<(), ()> {
         let Some((parameter_index, parameter)) = self
@@ -1945,44 +2340,171 @@ impl<'a, 'db> ArgumentMatcher<'a, 'db> {
             .keyword_by_name(name)
             .or_else(|| self.parameters.keyword_variadic())
         else {
-            self.errors.push(BindingError::UnknownArgument {
-                argument_name: ast::name::Name::new(name),
-                argument_index: self.get_argument_index(argument_index),
-            });
+            if let Some((parameter_index, parameter)) =
+                self.parameters.positional_only_by_name(name)
+            {
+                self.errors
+                    .push(BindingError::PositionalOnlyParameterAsKwarg {
+                        argument_index: self.get_argument_index(argument_index),
+                        parameter: ParameterContext::new(parameter, parameter_index, true),
+                    });
+                self.parameter_info[parameter_index].suppress_missing_error = true;
+            } else {
+                self.errors.push(BindingError::UnknownArgument {
+                    argument_name: ast::name::Name::new(name),
+                    argument_index: self.get_argument_index(argument_index),
+                });
+            }
             return Err(());
         };
-        self.assign_argument(argument_index, argument, parameter_index, parameter, false);
+        self.assign_argument(
+            argument_index,
+            argument,
+            argument_type,
+            parameter_index,
+            parameter,
+            false,
+            false,
+        );
         Ok(())
     }
 
+    /// Match a variadic argument to the remaining positional, standard or variadic parameters.
     fn match_variadic(
         &mut self,
+        db: &'db dyn Db,
         argument_index: usize,
         argument: Argument<'a>,
-        length: TupleLength,
+        argument_type: Option<Type<'db>>,
     ) -> Result<(), ()> {
+        // TODO: `Type::iterate` internally handles unions, but in a lossy way.
+        // It might be superior here to manually map over the union and call `try_iterate`
+        // on each element, similar to the way that `unpacker.rs` does in the `unpack_inner` method.
+        // It might be a bit of a refactor, though.
+        // See <https://github.com/astral-sh/ruff/pull/20377#issuecomment-3401380305>
+        // for more details. --Alex
+        let tuple = argument_type.map(|ty| ty.iterate(db));
+        let (mut argument_types, length, variable_element) = match tuple.as_ref() {
+            Some(tuple) => (
+                Either::Left(tuple.all_elements().copied()),
+                tuple.len(),
+                tuple.variable_element().copied(),
+            ),
+            None => (
+                Either::Right(std::iter::empty()),
+                TupleLength::unknown(),
+                None,
+            ),
+        };
+
+        let is_variable = length.is_variable();
+
         // We must be able to match up the fixed-length portion of the argument with positional
         // parameters, so we pass on any errors that occur.
         for _ in 0..length.minimum() {
-            self.match_positional(argument_index, argument)?;
+            self.match_positional(
+                argument_index,
+                argument,
+                argument_types.next().or(variable_element),
+                is_variable,
+            )?;
         }
 
         // If the tuple is variable-length, we assume that it will soak up all remaining positional
         // parameters.
-        if length.is_variable() {
+        if is_variable {
             while self
                 .parameters
                 .get_positional(self.next_positional)
                 .is_some()
             {
-                self.match_positional(argument_index, argument)?;
+                self.match_positional(
+                    argument_index,
+                    argument,
+                    argument_types.next().or(variable_element),
+                    is_variable,
+                )?;
+            }
+        }
+
+        // Finally, if there is a variadic parameter we can match any of the remaining unpacked
+        // argument types to it, but only if there is at least one remaining argument type. This is
+        // because a variadic parameter is optional, so if this was done unconditionally, ty could
+        // raise a false positive as "too many arguments".
+        if self.parameters.variadic().is_some() {
+            if let Some(argument_type) = argument_types.next().or(variable_element) {
+                self.match_positional(argument_index, argument, Some(argument_type), is_variable)?;
+                for argument_type in argument_types {
+                    self.match_positional(
+                        argument_index,
+                        argument,
+                        Some(argument_type),
+                        is_variable,
+                    )?;
+                }
             }
         }
 
         Ok(())
     }
 
-    fn finish(self) -> Box<[MatchedArgument]> {
+    fn match_keyword_variadic(
+        &mut self,
+        db: &'db dyn Db,
+        argument_index: usize,
+        argument_type: Option<Type<'db>>,
+    ) {
+        if let Some(Type::TypedDict(typed_dict)) = argument_type {
+            // Special case TypedDict because we know which keys are present.
+            for (name, field) in typed_dict.items(db) {
+                let _ = self.match_keyword(
+                    argument_index,
+                    Argument::Keywords,
+                    Some(field.declared_ty),
+                    name.as_str(),
+                );
+            }
+        } else {
+            let value_type = match argument_type.map(|ty| {
+                ty.member_lookup_with_policy(
+                    db,
+                    Name::new_static("__getitem__"),
+                    MemberLookupPolicy::NO_INSTANCE_FALLBACK,
+                )
+                .place
+            }) {
+                Some(Place::Defined(keys_method, _, Definedness::AlwaysDefined)) => keys_method
+                    .try_call(db, &CallArguments::positional([Type::unknown()]))
+                    .ok()
+                    .map_or_else(Type::unknown, |bindings| bindings.return_type(db)),
+                _ => Type::unknown(),
+            };
+
+            for (parameter_index, parameter) in self.parameters.iter().enumerate() {
+                if self.parameter_info[parameter_index].matched && !parameter.is_keyword_variadic()
+                {
+                    continue;
+                }
+                if matches!(
+                    parameter.kind(),
+                    ParameterKind::PositionalOnly { .. } | ParameterKind::Variadic { .. }
+                ) {
+                    continue;
+                }
+                self.assign_argument(
+                    argument_index,
+                    Argument::Keywords,
+                    Some(value_type),
+                    parameter_index,
+                    parameter,
+                    false,
+                    true,
+                );
+            }
+        }
+    }
+
+    fn finish(self) -> Box<[MatchedArgument<'db>]> {
         if let Some(first_excess_argument_index) = self.first_excess_positional {
             self.errors.push(BindingError::TooManyPositionalArguments {
                 first_excess_argument_index: self.get_argument_index(first_excess_argument_index),
@@ -1992,8 +2514,18 @@ impl<'a, 'db> ArgumentMatcher<'a, 'db> {
         }
 
         let mut missing = vec![];
-        for (index, matched) in self.parameter_matched.iter().copied().enumerate() {
+        for (
+            index,
+            ParameterInfo {
+                matched,
+                suppress_missing_error,
+            },
+        ) in self.parameter_info.iter().copied().enumerate()
+        {
             if !matched {
+                if suppress_missing_error {
+                    continue;
+                }
                 let param = &self.parameters[index];
                 if param.is_variadic()
                     || param.is_keyword_variadic()
@@ -2019,21 +2551,26 @@ struct ArgumentTypeChecker<'a, 'db> {
     db: &'db dyn Db,
     signature: &'a Signature<'db>,
     arguments: &'a CallArguments<'a, 'db>,
-    argument_matches: &'a [MatchedArgument],
+    argument_matches: &'a [MatchedArgument<'db>],
     parameter_tys: &'a mut [Option<Type<'db>>],
+    call_expression_tcx: &'a TypeContext<'db>,
+    return_ty: Type<'db>,
     errors: &'a mut Vec<BindingError<'db>>,
 
+    inferable_typevars: InferableTypeVars<'db, 'db>,
     specialization: Option<Specialization<'db>>,
-    inherited_specialization: Option<Specialization<'db>>,
 }
 
 impl<'a, 'db> ArgumentTypeChecker<'a, 'db> {
+    #[expect(clippy::too_many_arguments)]
     fn new(
         db: &'db dyn Db,
         signature: &'a Signature<'db>,
         arguments: &'a CallArguments<'a, 'db>,
-        argument_matches: &'a [MatchedArgument],
+        argument_matches: &'a [MatchedArgument<'db>],
         parameter_tys: &'a mut [Option<Type<'db>>],
+        call_expression_tcx: &'a TypeContext<'db>,
+        return_ty: Type<'db>,
         errors: &'a mut Vec<BindingError<'db>>,
     ) -> Self {
         Self {
@@ -2042,9 +2579,11 @@ impl<'a, 'db> ArgumentTypeChecker<'a, 'db> {
             arguments,
             argument_matches,
             parameter_tys,
+            call_expression_tcx,
+            return_ty,
             errors,
+            inferable_typevars: InferableTypeVars::None,
             specialization: None,
-            inherited_specialization: None,
         }
     }
 
@@ -2076,23 +2615,29 @@ impl<'a, 'db> ArgumentTypeChecker<'a, 'db> {
     }
 
     fn infer_specialization(&mut self) {
-        if self.signature.generic_context.is_none()
-            && self.signature.inherited_generic_context.is_none()
-        {
+        let Some(generic_context) = self.signature.generic_context else {
             return;
-        }
+        };
+
+        self.inferable_typevars = generic_context.inferable_typevars(self.db);
+        let mut builder = SpecializationBuilder::new(self.db, self.inferable_typevars);
 
         let parameters = self.signature.parameters();
-        let mut builder = SpecializationBuilder::new(self.db);
         for (argument_index, adjusted_argument_index, _, argument_type) in
             self.enumerate_argument_types()
         {
-            for parameter_index in &self.argument_matches[argument_index].parameters {
-                let parameter = &parameters[*parameter_index];
+            for (parameter_index, variadic_argument_type) in
+                self.argument_matches[argument_index].iter()
+            {
+                let parameter = &parameters[parameter_index];
                 let Some(expected_type) = parameter.annotated_type() else {
                     continue;
                 };
-                if let Err(error) = builder.infer(expected_type, argument_type) {
+
+                if let Err(error) = builder.infer(
+                    expected_type,
+                    variadic_argument_type.unwrap_or(argument_type),
+                ) {
                     self.errors.push(BindingError::SpecializationError {
                         error,
                         argument_index: adjusted_argument_index,
@@ -2100,15 +2645,42 @@ impl<'a, 'db> ArgumentTypeChecker<'a, 'db> {
                 }
             }
         }
-        self.specialization = self.signature.generic_context.map(|gc| builder.build(gc));
-        self.inherited_specialization = self.signature.inherited_generic_context.map(|gc| {
-            // The inherited generic context is used when inferring the specialization of a generic
-            // class from a constructor call. In this case (only), we promote any typevars that are
-            // inferred as a literal to the corresponding instance type.
-            builder
-                .build(gc)
-                .apply_type_mapping(self.db, &TypeMapping::PromoteLiterals)
-        });
+
+        // Build the specialization first without inferring the type context.
+        let isolated_specialization = builder.build(generic_context, *self.call_expression_tcx);
+        let isolated_return_ty = self
+            .return_ty
+            .apply_specialization(self.db, isolated_specialization);
+
+        let mut try_infer_tcx = || {
+            let return_ty = self.signature.return_ty?;
+            let call_expression_tcx = self.call_expression_tcx.annotation?;
+
+            // A type variable is not a useful type-context for expression inference, and applying it
+            // to the return type can lead to confusing unions in nested generic calls.
+            if call_expression_tcx.is_type_var() {
+                return None;
+            }
+
+            // If the return type is already assignable to the annotated type, we can ignore the
+            // type context and prefer the narrower inferred type.
+            if isolated_return_ty.is_assignable_to(self.db, call_expression_tcx) {
+                return None;
+            }
+
+            // TODO: Ideally we would infer the annotated type _before_ the arguments if this call is part of an
+            // annotated assignment, to closer match the order of any unions written in the type annotation.
+            builder.infer(return_ty, call_expression_tcx).ok()?;
+
+            // Otherwise, build the specialization again after inferring the type context.
+            let specialization = builder.build(generic_context, *self.call_expression_tcx);
+            let return_ty = return_ty.apply_specialization(self.db, specialization);
+
+            Some((Some(specialization), return_ty))
+        };
+
+        (self.specialization, self.return_ty) =
+            try_infer_tcx().unwrap_or((Some(isolated_specialization), isolated_return_ty));
     }
 
     fn check_argument_type(
@@ -2125,12 +2697,16 @@ impl<'a, 'db> ArgumentTypeChecker<'a, 'db> {
                 argument_type = argument_type.apply_specialization(self.db, specialization);
                 expected_ty = expected_ty.apply_specialization(self.db, specialization);
             }
-            if let Some(inherited_specialization) = self.inherited_specialization {
-                argument_type =
-                    argument_type.apply_specialization(self.db, inherited_specialization);
-                expected_ty = expected_ty.apply_specialization(self.db, inherited_specialization);
-            }
-            if !argument_type.is_assignable_to(self.db, expected_ty) {
+            // This is one of the few places where we want to check if there's _any_ specialization
+            // where assignability holds; normally we want to check that assignability holds for
+            // _all_ specializations.
+            // TODO: Soon we will go further, and build the actual specializations from the
+            // constraint set that we get from this assignability check, instead of inferring and
+            // building them in an earlier separate step.
+            if argument_type
+                .when_assignable_to(self.db, expected_ty, self.inferable_typevars)
+                .is_never_satisfied()
+            {
                 let positional = matches!(argument, Argument::Positional | Argument::Synthetic)
                     && !parameter.is_variadic();
                 self.errors.push(BindingError::InvalidArgumentType {
@@ -2156,78 +2732,164 @@ impl<'a, 'db> ArgumentTypeChecker<'a, 'db> {
         for (argument_index, adjusted_argument_index, argument, argument_type) in
             self.enumerate_argument_types()
         {
-            // If the argument isn't splatted, just check its type directly.
-            let Argument::Variadic(_) = argument else {
-                for parameter_index in &self.argument_matches[argument_index].parameters {
-                    self.check_argument_type(
-                        adjusted_argument_index,
-                        argument,
-                        argument_type,
-                        *parameter_index,
-                    );
+            match argument {
+                Argument::Variadic => self.check_variadic_argument_type(
+                    argument_index,
+                    adjusted_argument_index,
+                    argument,
+                ),
+                Argument::Keywords => self.check_keyword_variadic_argument_type(
+                    argument_index,
+                    adjusted_argument_index,
+                    argument,
+                    argument_type,
+                ),
+                _ => {
+                    // If the argument isn't splatted, just check its type directly.
+                    for parameter_index in &self.argument_matches[argument_index].parameters {
+                        self.check_argument_type(
+                            adjusted_argument_index,
+                            argument,
+                            argument_type,
+                            *parameter_index,
+                        );
+                    }
                 }
-                continue;
-            };
+            }
+        }
+    }
 
-            // If the argument is splatted, convert its type into a tuple describing the splatted
-            // elements. For tuples, we don't have to do anything! For other types, we treat it as
-            // an iterator, and create a homogeneous tuple of its output type, since we don't know
-            // how many elements the iterator will produce.
-            let argument_types = argument_type.iterate(self.db);
+    fn check_variadic_argument_type(
+        &mut self,
+        argument_index: usize,
+        adjusted_argument_index: Option<usize>,
+        argument: Argument<'a>,
+    ) {
+        for (parameter_index, variadic_argument_type) in
+            self.argument_matches[argument_index].iter()
+        {
+            self.check_argument_type(
+                adjusted_argument_index,
+                argument,
+                variadic_argument_type.unwrap_or_else(Type::unknown),
+                parameter_index,
+            );
+        }
+    }
 
-            // TODO: When we perform argument expansion during overload resolution, we might need
-            // to retry both `match_parameters` _and_ `check_types` for each expansion. Currently
-            // we only retry `check_types`. The issue is that argument expansion might produce a
-            // splatted value with a different arity than what we originally inferred for the
-            // unexpanded value, and that in turn can affect which parameters the splatted value is
-            // matched with. As a workaround, make sure that the splatted tuple contains an
-            // arbitrary number of `Unknown`s at the end, so that if the expanded value has a
-            // smaller arity than the unexpanded value, we still have enough values to assign to
-            // the already matched parameters.
-            let argument_types = match argument_types.as_ref() {
-                Tuple::Fixed(_) => {
-                    Cow::Owned(argument_types.concat(self.db, &Tuple::homogeneous(Type::unknown())))
-                }
-                Tuple::Variable(_) => argument_types,
-            };
-
-            // Resize the tuple of argument types to line up with the number of parameters this
-            // argument was matched against. If parameter matching succeeded, then we can (TODO:
-            // should be able to, see above) guarantee that all of the required elements of the
-            // splatted tuple will have been matched with a parameter. But if parameter matching
-            // failed, there might be more required elements. That means we can't use
-            // TupleLength::Fixed below, because we would otherwise get a "too many values" error
-            // when parameter matching failed.
-            let desired_size =
-                TupleLength::Variable(self.argument_matches[argument_index].parameters.len(), 0);
-            let argument_types = argument_types
-                .resize(self.db, desired_size)
-                .expect("argument type should be consistent with its arity");
-
-            // Check the types by zipping through the splatted argument types and their matched
-            // parameters.
-            for (argument_type, parameter_index) in (argument_types.all_elements())
+    fn check_keyword_variadic_argument_type(
+        &mut self,
+        argument_index: usize,
+        adjusted_argument_index: Option<usize>,
+        argument: Argument<'a>,
+        argument_type: Type<'db>,
+    ) {
+        if let Type::TypedDict(typed_dict) = argument_type {
+            for (argument_type, parameter_index) in typed_dict
+                .items(self.db)
+                .iter()
+                .map(|(_, field)| field.declared_ty)
                 .zip(&self.argument_matches[argument_index].parameters)
             {
                 self.check_argument_type(
                     adjusted_argument_index,
                     argument,
-                    *argument_type,
+                    argument_type,
+                    *parameter_index,
+                );
+            }
+        } else {
+            // TODO: Instead of calling the `keys` and `__getitem__` methods, we should instead
+            // get the constraints which satisfies the `SupportsKeysAndGetItem` protocol i.e., the
+            // key and value type.
+            let key_type = match argument_type
+                .member_lookup_with_policy(
+                    self.db,
+                    Name::new_static("keys"),
+                    MemberLookupPolicy::NO_INSTANCE_FALLBACK,
+                )
+                .place
+            {
+                Place::Defined(keys_method, _, Definedness::AlwaysDefined) => keys_method
+                    .try_call(self.db, &CallArguments::none())
+                    .ok()
+                    .and_then(|bindings| {
+                        Some(
+                            bindings
+                                .return_type(self.db)
+                                .try_iterate(self.db)
+                                .ok()?
+                                .homogeneous_element_type(self.db),
+                        )
+                    }),
+                _ => None,
+            };
+
+            let Some(key_type) = key_type else {
+                self.errors.push(BindingError::KeywordsNotAMapping {
+                    argument_index: adjusted_argument_index,
+                    provided_ty: argument_type,
+                });
+                return;
+            };
+
+            if !key_type
+                .when_assignable_to(
+                    self.db,
+                    KnownClass::Str.to_instance(self.db),
+                    self.inferable_typevars,
+                )
+                .is_always_satisfied()
+            {
+                self.errors.push(BindingError::InvalidKeyType {
+                    argument_index: adjusted_argument_index,
+                    provided_ty: key_type,
+                });
+            }
+
+            let value_type = match argument_type
+                .member_lookup_with_policy(
+                    self.db,
+                    Name::new_static("__getitem__"),
+                    MemberLookupPolicy::NO_INSTANCE_FALLBACK,
+                )
+                .place
+            {
+                Place::Defined(keys_method, _, Definedness::AlwaysDefined) => keys_method
+                    .try_call(self.db, &CallArguments::positional([Type::unknown()]))
+                    .ok()
+                    .map_or_else(Type::unknown, |bindings| bindings.return_type(self.db)),
+                _ => Type::unknown(),
+            };
+
+            for (argument_type, parameter_index) in
+                std::iter::repeat(value_type).zip(&self.argument_matches[argument_index].parameters)
+            {
+                self.check_argument_type(
+                    adjusted_argument_index,
+                    Argument::Keywords,
+                    argument_type,
                     *parameter_index,
                 );
             }
         }
     }
 
-    fn finish(self) -> (Option<Specialization<'db>>, Option<Specialization<'db>>) {
-        (self.specialization, self.inherited_specialization)
+    fn finish(
+        self,
+    ) -> (
+        InferableTypeVars<'db, 'db>,
+        Option<Specialization<'db>>,
+        Type<'db>,
+    ) {
+        (self.inferable_typevars, self.specialization, self.return_ty)
     }
 }
 
 /// Information about which parameter(s) an argument was matched against. This is tracked
 /// separately for each overload.
 #[derive(Clone, Debug, Default)]
-pub struct MatchedArgument {
+pub struct MatchedArgument<'db> {
     /// The index of the parameter(s) that an argument was matched against. A splatted argument
     /// might be matched against multiple parameters.
     pub parameters: SmallVec<[usize; 1]>,
@@ -2236,8 +2898,39 @@ pub struct MatchedArgument {
     /// elements must have been successfully matched. (That means that this can be `false` while
     /// the `parameters` field is non-empty.)
     pub matched: bool,
+
+    /// The types of a variadic argument when it's unpacked.
+    ///
+    /// The length of this vector is always the same as the `parameters` vector i.e., these are the
+    /// types assigned to each matched parameter. This isn't necessarily the same as the number of
+    /// types in the argument type which might not be a fixed-length iterable.
+    ///
+    /// Another thing to note is that the way this is populated means that for any other argument
+    /// kind (synthetic, positional, keyword, keyword-variadic), this will be a single-element
+    /// vector containing `None`, since we don't know the type of the argument when this is
+    /// constructed. So, this field is populated only for variadic arguments.
+    ///
+    /// For example, given a `*args` whose type is `tuple[A, B, C]` and the following parameters:
+    /// - `(x, *args)`: the `types` field will only have two elements (`B`, `C`) since `A` has been
+    ///   matched with `x`.
+    /// - `(*args)`: the `types` field will have all the three elements (`A`, `B`, `C`)
+    types: SmallVec<[Option<Type<'db>>; 1]>,
 }
 
+impl<'db> MatchedArgument<'db> {
+    /// Returns an iterator over the parameter indices and the corresponding argument type.
+    pub fn iter(&self) -> impl Iterator<Item = (usize, Option<Type<'db>>)> + '_ {
+        self.parameters
+            .iter()
+            .copied()
+            .zip(self.types.iter().copied())
+    }
+}
+
+/// Indicates that a parameter of the given name was not found.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct UnknownParameterNameError;
+
 /// Binding information for one of the overloads of a callable.
 #[derive(Debug)]
 pub(crate) struct Binding<'db> {
@@ -2254,16 +2947,19 @@ pub(crate) struct Binding<'db> {
     /// Return type of the call.
     return_ty: Type<'db>,
 
+    /// The inferable typevars in this signature.
+    inferable_typevars: InferableTypeVars<'db, 'db>,
+
     /// The specialization that was inferred from the argument types, if the callable is generic.
     specialization: Option<Specialization<'db>>,
 
-    /// The specialization that was inferred for a class method's containing generic class, if it
-    /// is being used to infer a specialization for the class.
-    inherited_specialization: Option<Specialization<'db>>,
-
     /// Information about which parameter(s) each argument was matched with, in argument source
     /// order.
-    argument_matches: Box<[MatchedArgument]>,
+    argument_matches: Box<[MatchedArgument<'db>]>,
+
+    /// Whether an argument that supplies an indeterminate number of positional or keyword
+    /// arguments is mapped to a variadic parameter (`*args` or `**kwargs`).
+    variadic_argument_matched_to_variadic_parameter: bool,
 
     /// Bound types for parameters, in parameter source order, or `None` if no argument was matched
     /// to that parameter.
@@ -2280,9 +2976,10 @@ impl<'db> Binding<'db> {
             callable_type: signature_type,
             signature_type,
             return_ty: Type::unknown(),
+            inferable_typevars: InferableTypeVars::None,
             specialization: None,
-            inherited_specialization: None,
             argument_matches: Box::from([]),
+            variadic_argument_matched_to_variadic_parameter: false,
             parameter_tys: Box::from([]),
             errors: vec![],
         }
@@ -2294,66 +2991,65 @@ impl<'db> Binding<'db> {
         }
     }
 
-    pub(crate) fn match_parameters(
+    fn match_parameters(
         &mut self,
+        db: &'db dyn Db,
         arguments: &CallArguments<'_, 'db>,
-        argument_forms: &mut [Option<ParameterForm>],
-        conflicting_forms: &mut [bool],
+        argument_forms: &mut ArgumentForms,
     ) {
         let parameters = self.signature.parameters();
-        let mut matcher = ArgumentMatcher::new(
-            arguments,
-            parameters,
-            argument_forms,
-            conflicting_forms,
-            &mut self.errors,
-        );
-        for (argument_index, (argument, _)) in arguments.iter().enumerate() {
+        let mut matcher =
+            ArgumentMatcher::new(arguments, parameters, argument_forms, &mut self.errors);
+        let mut keywords_arguments = vec![];
+        for (argument_index, (argument, argument_type)) in arguments.iter().enumerate() {
             match argument {
                 Argument::Positional | Argument::Synthetic => {
-                    let _ = matcher.match_positional(argument_index, argument);
+                    let _ = matcher.match_positional(argument_index, argument, None, false);
                 }
                 Argument::Keyword(name) => {
-                    let _ = matcher.match_keyword(argument_index, argument, name);
+                    let _ = matcher.match_keyword(argument_index, argument, None, name);
                 }
-                Argument::Variadic(length) => {
-                    let _ = matcher.match_variadic(argument_index, argument, length);
+                Argument::Variadic => {
+                    let _ = matcher.match_variadic(db, argument_index, argument, argument_type);
                 }
                 Argument::Keywords => {
-                    // TODO
-                    continue;
+                    keywords_arguments.push((argument_index, argument_type));
                 }
             }
         }
+        for (keywords_index, keywords_type) in keywords_arguments {
+            matcher.match_keyword_variadic(db, keywords_index, keywords_type);
+        }
         self.return_ty = self.signature.return_ty.unwrap_or(Type::unknown());
         self.parameter_tys = vec![None; parameters.len()].into_boxed_slice();
+        self.variadic_argument_matched_to_variadic_parameter =
+            matcher.variadic_argument_matched_to_variadic_parameter;
         self.argument_matches = matcher.finish();
     }
 
-    fn check_types(&mut self, db: &'db dyn Db, arguments: &CallArguments<'_, 'db>) {
+    fn check_types(
+        &mut self,
+        db: &'db dyn Db,
+        arguments: &CallArguments<'_, 'db>,
+        call_expression_tcx: &TypeContext<'db>,
+    ) {
         let mut checker = ArgumentTypeChecker::new(
             db,
             &self.signature,
             arguments,
             &self.argument_matches,
             &mut self.parameter_tys,
+            call_expression_tcx,
+            self.return_ty,
             &mut self.errors,
         );
 
         // If this overload is generic, first see if we can infer a specialization of the function
         // from the arguments that were passed in.
         checker.infer_specialization();
-
         checker.check_argument_types();
-        (self.specialization, self.inherited_specialization) = checker.finish();
-        if let Some(specialization) = self.specialization {
-            self.return_ty = self.return_ty.apply_specialization(db, specialization);
-        }
-        if let Some(inherited_specialization) = self.inherited_specialization {
-            self.return_ty = self
-                .return_ty
-                .apply_specialization(db, inherited_specialization);
-        }
+
+        (self.inferable_typevars, self.specialization, self.return_ty) = checker.finish();
     }
 
     pub(crate) fn set_return_type(&mut self, return_ty: Type<'db>) {
@@ -2364,8 +3060,8 @@ impl<'db> Binding<'db> {
         self.return_ty
     }
 
-    pub(crate) fn inherited_specialization(&self) -> Option<Specialization<'db>> {
-        self.inherited_specialization
+    pub(crate) fn specialization(&self) -> Option<Specialization<'db>> {
+        self.specialization
     }
 
     /// Returns the bound types for each parameter, in parameter source order, or `None` if no
@@ -2374,6 +3070,33 @@ impl<'db> Binding<'db> {
         &self.parameter_tys
     }
 
+    /// Returns the bound type for the specified parameter, or `None` if no argument was matched to
+    /// that parameter.
+    ///
+    /// Returns an error if the parameter name is not found.
+    pub(crate) fn parameter_type_by_name(
+        &self,
+        parameter_name: &str,
+        fallback_to_default: bool,
+    ) -> Result<Option<Type<'db>>, UnknownParameterNameError> {
+        let parameters = self.signature.parameters();
+
+        let index = parameters
+            .keyword_by_name(parameter_name)
+            .map(|(i, _)| i)
+            .ok_or(UnknownParameterNameError)?;
+
+        let parameter_ty = self.parameter_tys[index];
+
+        if parameter_ty.is_some() {
+            Ok(parameter_ty)
+        } else if fallback_to_default {
+            Ok(parameters[index].default_type())
+        } else {
+            Ok(None)
+        }
+    }
+
     pub(crate) fn arguments_for_parameter<'a>(
         &'a self,
         argument_types: &'a CallArguments<'a, 'db>,
@@ -2426,8 +3149,8 @@ impl<'db> Binding<'db> {
     fn snapshot(&self) -> BindingSnapshot<'db> {
         BindingSnapshot {
             return_ty: self.return_ty,
+            inferable_typevars: self.inferable_typevars,
             specialization: self.specialization,
-            inherited_specialization: self.inherited_specialization,
             argument_matches: self.argument_matches.clone(),
             parameter_tys: self.parameter_tys.clone(),
             errors: self.errors.clone(),
@@ -2437,16 +3160,16 @@ impl<'db> Binding<'db> {
     fn restore(&mut self, snapshot: BindingSnapshot<'db>) {
         let BindingSnapshot {
             return_ty,
+            inferable_typevars,
             specialization,
-            inherited_specialization,
             argument_matches,
             parameter_tys,
             errors,
         } = snapshot;
 
         self.return_ty = return_ty;
+        self.inferable_typevars = inferable_typevars;
         self.specialization = specialization;
-        self.inherited_specialization = inherited_specialization;
         self.argument_matches = argument_matches;
         self.parameter_tys = parameter_tys;
         self.errors = errors;
@@ -2454,17 +3177,31 @@ impl<'db> Binding<'db> {
 
     /// Returns a vector where each index corresponds to an argument position,
     /// and the value is the parameter index that argument maps to (if any).
-    pub(crate) fn argument_matches(&self) -> &[MatchedArgument] {
+    pub(crate) fn argument_matches(&self) -> &[MatchedArgument<'db>] {
         &self.argument_matches
     }
+
+    pub(crate) fn errors(&self) -> &[BindingError<'db>] {
+        &self.errors
+    }
+
+    /// Resets the state of this binding to its initial state.
+    fn reset(&mut self) {
+        self.return_ty = Type::unknown();
+        self.inferable_typevars = InferableTypeVars::None;
+        self.specialization = None;
+        self.argument_matches = Box::from([]);
+        self.parameter_tys = Box::from([]);
+        self.errors.clear();
+    }
 }
 
 #[derive(Clone, Debug)]
 struct BindingSnapshot<'db> {
     return_ty: Type<'db>,
+    inferable_typevars: InferableTypeVars<'db, 'db>,
     specialization: Option<Specialization<'db>>,
-    inherited_specialization: Option<Specialization<'db>>,
-    argument_matches: Box<[MatchedArgument]>,
+    argument_matches: Box<[MatchedArgument<'db>]>,
     parameter_tys: Box<[Option<Type<'db>>]>,
     errors: Vec<BindingError<'db>>,
 }
@@ -2502,8 +3239,8 @@ impl<'db> CallableBindingSnapshot<'db> {
 
                 // ... and update the snapshot with the current state of the binding.
                 snapshot.return_ty = binding.return_ty;
+                snapshot.inferable_typevars = binding.inferable_typevars;
                 snapshot.specialization = binding.specialization;
-                snapshot.inherited_specialization = binding.inherited_specialization;
                 snapshot
                     .argument_matches
                     .clone_from(&binding.argument_matches);
@@ -2586,13 +3323,13 @@ impl<'db> CallableDescription<'db> {
                 kind: "bound method",
                 name: bound_method.function(db).name(db),
             }),
-            Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(function)) => {
+            Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(function)) => {
                 Some(CallableDescription {
                     kind: "method wrapper `__get__` of function",
                     name: function.name(db),
                 })
             }
-            Type::MethodWrapper(MethodWrapperKind::PropertyDunderGet(_)) => {
+            Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderGet(_)) => {
                 Some(CallableDescription {
                     kind: "method wrapper",
                     name: "`__get__` of property",
@@ -2674,13 +3411,29 @@ pub(crate) enum BindingError<'db> {
         expected_ty: Type<'db>,
         provided_ty: Type<'db>,
     },
+    /// The type of the keyword-variadic argument's key is not `str`.
+    InvalidKeyType {
+        argument_index: Option<usize>,
+        provided_ty: Type<'db>,
+    },
+    KeywordsNotAMapping {
+        argument_index: Option<usize>,
+        provided_ty: Type<'db>,
+    },
     /// One or more required parameters (that is, with no default) is not supplied by any argument.
-    MissingArguments { parameters: ParameterContexts },
+    MissingArguments {
+        parameters: ParameterContexts,
+    },
     /// A call argument can't be matched to any parameter.
     UnknownArgument {
         argument_name: ast::name::Name,
         argument_index: Option<usize>,
     },
+    /// A positional-only parameter is passed as keyword argument.
+    PositionalOnlyParameterAsKwarg {
+        argument_index: Option<usize>,
+        parameter: ParameterContext,
+    },
     /// More positional arguments are provided in the call than can be handled by the signature.
     TooManyPositionalArguments {
         first_excess_argument_index: Option<usize>,
@@ -2697,6 +3450,7 @@ pub(crate) enum BindingError<'db> {
         error: SpecializationError<'db>,
         argument_index: Option<usize>,
     },
+    PropertyHasNoSetter(PropertyInstanceType<'db>),
     /// The call itself might be well constructed, but an error occurred while evaluating the call.
     /// We use this variant to report errors in `property.__get__` and `property.__set__`, which
     /// can occur when the call to the underlying getter/setter fails.
@@ -2716,6 +3470,12 @@ impl<'db> BindingError<'db> {
         union_diag: Option<&UnionDiagnostic<'_, '_>>,
         matching_overload: Option<&MatchingOverloadLiteral<'_>>,
     ) {
+        let callable_kind = match callable_ty {
+            Type::FunctionLiteral(_) => "Function",
+            Type::BoundMethod(_) => "Method",
+            _ => "Callable",
+        };
+
         match self {
             Self::InvalidArgumentType {
                 parameter,
@@ -2728,6 +3488,23 @@ impl<'db> BindingError<'db> {
                     return;
                 };
 
+                // Re-infer the argument type of call expressions, ignoring the type context for more
+                // precise error messages.
+                let provided_ty = match Self::get_argument_node(node, *argument_index) {
+                    None => *provided_ty,
+
+                    // Ignore starred arguments, as those are difficult to re-infer.
+                    Some(
+                        ast::ArgOrKeyword::Arg(ast::Expr::Starred(_))
+                        | ast::ArgOrKeyword::Keyword(ast::Keyword { arg: None, .. }),
+                    ) => *provided_ty,
+
+                    Some(
+                        ast::ArgOrKeyword::Arg(value)
+                        | ast::ArgOrKeyword::Keyword(ast::Keyword { value, .. }),
+                    ) => infer_isolated_expression(context.db(), context.scope(), value),
+                };
+
                 let provided_ty_display = provided_ty.display(context.db());
                 let expected_ty_display = expected_ty.display(context.db());
 
@@ -2743,6 +3520,36 @@ impl<'db> BindingError<'db> {
                     "Expected `{expected_ty_display}`, found `{provided_ty_display}`"
                 ));
 
+                if let Type::Union(union) = provided_ty {
+                    let union_elements = union.elements(context.db());
+                    let invalid_elements: Vec<Type<'db>> = union
+                        .elements(context.db())
+                        .iter()
+                        .filter(|element| !element.is_assignable_to(context.db(), *expected_ty))
+                        .copied()
+                        .collect();
+                    let first_invalid_element = invalid_elements[0].display(context.db());
+                    if invalid_elements.len() < union_elements.len() {
+                        match &invalid_elements[1..] {
+                            [] => diag.info(format_args!(
+                                "Element `{first_invalid_element}` of this union \
+                                is not assignable to `{expected_ty_display}`",
+                            )),
+                            [single] => diag.info(format_args!(
+                                "Union elements `{first_invalid_element}` and `{}` \
+                                are not assignable to `{expected_ty_display}`",
+                                single.display(context.db()),
+                            )),
+                            rest => diag.info(format_args!(
+                                "Union element `{first_invalid_element}`, \
+                                and {} more union elements, \
+                                are not assignable to `{expected_ty_display}`",
+                                rest.len(),
+                            )),
+                        }
+                    }
+                }
+
                 if let Some(matching_overload) = matching_overload {
                     if let Some((name_span, parameter_span)) =
                         matching_overload.get(context.db()).and_then(|overload| {
@@ -2775,7 +3582,7 @@ impl<'db> BindingError<'db> {
                             }
                             diag.info(format_args!(
                                 "  {}",
-                                overload.signature(context.db(), None).display(context.db())
+                                overload.signature(context.db()).display(context.db())
                             ));
                         }
                         if overloads.len() > MAXIMUM_OVERLOADS {
@@ -2788,8 +3595,10 @@ impl<'db> BindingError<'db> {
                 } else if let Some((name_span, parameter_span)) =
                     callable_ty.parameter_span(context.db(), Some(parameter.index))
                 {
-                    let mut sub =
-                        SubDiagnostic::new(SubDiagnosticSeverity::Info, "Function defined here");
+                    let mut sub = SubDiagnostic::new(
+                        SubDiagnosticSeverity::Info,
+                        format_args!("{callable_kind} defined here"),
+                    );
                     sub.annotate(Annotation::primary(name_span));
                     sub.annotate(
                         Annotation::secondary(parameter_span).message("Parameter declared here"),
@@ -2802,6 +3611,45 @@ impl<'db> BindingError<'db> {
                 }
             }
 
+            Self::InvalidKeyType {
+                argument_index,
+                provided_ty,
+            } => {
+                let range = Self::get_node(node, *argument_index);
+                let Some(builder) = context.report_lint(&INVALID_ARGUMENT_TYPE, range) else {
+                    return;
+                };
+
+                let provided_ty_display = provided_ty.display(context.db());
+                let mut diag = builder.into_diagnostic(
+                    "Argument expression after ** must be a mapping with `str` key type",
+                );
+                diag.set_primary_message(format_args!("Found `{provided_ty_display}`"));
+
+                if let Some(union_diag) = union_diag {
+                    union_diag.add_union_context(context.db(), &mut diag);
+                }
+            }
+
+            Self::KeywordsNotAMapping {
+                argument_index,
+                provided_ty,
+            } => {
+                let range = Self::get_node(node, *argument_index);
+                let Some(builder) = context.report_lint(&INVALID_ARGUMENT_TYPE, range) else {
+                    return;
+                };
+
+                let provided_ty_display = provided_ty.display(context.db());
+                let mut diag =
+                    builder.into_diagnostic("Argument expression after ** must be a mapping type");
+                diag.set_primary_message(format_args!("Found `{provided_ty_display}`"));
+
+                if let Some(union_diag) = union_diag {
+                    union_diag.add_union_context(context.db(), &mut diag);
+                }
+            }
+
             Self::TooManyPositionalArguments {
                 first_excess_argument_index,
                 expected_positional_count,
@@ -2820,6 +3668,13 @@ impl<'db> BindingError<'db> {
                     ));
                     if let Some(union_diag) = union_diag {
                         union_diag.add_union_context(context.db(), &mut diag);
+                    } else if let Some(spans) = callable_ty.function_spans(context.db()) {
+                        let mut sub = SubDiagnostic::new(
+                            SubDiagnosticSeverity::Info,
+                            format_args!("{callable_kind} signature here"),
+                        );
+                        sub.annotate(Annotation::primary(spans.signature));
+                        diag.sub(sub);
                     }
                 }
             }
@@ -2837,6 +3692,19 @@ impl<'db> BindingError<'db> {
                     ));
                     if let Some(union_diag) = union_diag {
                         union_diag.add_union_context(context.db(), &mut diag);
+                    } else {
+                        let span = callable_ty.parameter_span(
+                            context.db(),
+                            (parameters.0.len() == 1).then(|| parameters.0[0].index),
+                        );
+                        if let Some((_, parameter_span)) = span {
+                            let mut sub = SubDiagnostic::new(
+                                SubDiagnosticSeverity::Info,
+                                format_args!("Parameter{s} declared here"),
+                            );
+                            sub.annotate(Annotation::primary(parameter_span));
+                            diag.sub(sub);
+                        }
                     }
                 }
             }
@@ -2857,6 +3725,42 @@ impl<'db> BindingError<'db> {
                     ));
                     if let Some(union_diag) = union_diag {
                         union_diag.add_union_context(context.db(), &mut diag);
+                    } else if let Some(spans) = callable_ty.function_spans(context.db()) {
+                        let mut sub = SubDiagnostic::new(
+                            SubDiagnosticSeverity::Info,
+                            format_args!("{callable_kind} signature here"),
+                        );
+                        sub.annotate(Annotation::primary(spans.signature));
+                        diag.sub(sub);
+                    }
+                }
+            }
+
+            Self::PositionalOnlyParameterAsKwarg {
+                argument_index,
+                parameter,
+            } => {
+                let node = Self::get_node(node, *argument_index);
+                if let Some(builder) =
+                    context.report_lint(&POSITIONAL_ONLY_PARAMETER_AS_KWARG, node)
+                {
+                    let mut diag = builder.into_diagnostic(format_args!(
+                        "Positional-only parameter {parameter} passed as keyword argument{}",
+                        if let Some(CallableDescription { kind, name }) = callable_description {
+                            format!(" of {kind} `{name}`")
+                        } else {
+                            String::new()
+                        }
+                    ));
+                    if let Some(union_diag) = union_diag {
+                        union_diag.add_union_context(context.db(), &mut diag);
+                    } else if let Some(spans) = callable_ty.function_spans(context.db()) {
+                        let mut sub = SubDiagnostic::new(
+                            SubDiagnosticSeverity::Info,
+                            format_args!("{callable_kind} signature here"),
+                        );
+                        sub.annotate(Annotation::primary(spans.signature));
+                        diag.sub(sub);
                     }
                 }
             }
@@ -2902,14 +3806,20 @@ impl<'db> BindingError<'db> {
                         String::new()
                     }
                 ));
-                diag.set_primary_message(format_args!(
-                    "Argument type `{argument_ty_display}` does not satisfy {} of type variable `{}`",
-                    match error {
-                        SpecializationError::MismatchedBound {..} => "upper bound",
-                        SpecializationError::MismatchedConstraint {..} => "constraints",
-                    },
-                    typevar.name(context.db()),
-                ));
+
+                let typevar_name = typevar.name(context.db());
+                match error {
+                    SpecializationError::MismatchedBound { .. } => {
+                        diag.set_primary_message(format_args!("Argument type `{argument_ty_display}` does not satisfy upper bound `{}` of type variable `{typevar_name}`",
+                        typevar.upper_bound(context.db()).expect("type variable should have an upper bound if this error occurs").display(context.db())
+                    ));
+                    }
+                    SpecializationError::MismatchedConstraint { .. } => {
+                        diag.set_primary_message(format_args!("Argument type `{argument_ty_display}` does not satisfy constraints ({}) of type variable `{typevar_name}`",
+                        typevar.constraints(context.db()).expect("type variable should have constraints if this error occurs").iter().map(|ty| format!("`{}`", ty.display(context.db()))).join(", ")
+                    ));
+                    }
+                }
 
                 if let Some(typevar_definition) = typevar.definition(context.db()) {
                     let module = parsed_module(context.db(), typevar_definition.file(context.db()))
@@ -2928,6 +3838,17 @@ impl<'db> BindingError<'db> {
                 }
             }
 
+            Self::PropertyHasNoSetter(_) => {
+                BindingError::InternalCallError("property has no setter").report_diagnostic(
+                    context,
+                    node,
+                    callable_ty,
+                    callable_description,
+                    union_diag,
+                    matching_overload,
+                );
+            }
+
             Self::InternalCallError(reason) => {
                 let node = Self::get_node(node, None);
                 if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, node) {
@@ -2949,22 +3870,29 @@ impl<'db> BindingError<'db> {
         }
     }
 
-    fn get_node(node: ast::AnyNodeRef, argument_index: Option<usize>) -> ast::AnyNodeRef {
+    fn get_node(node: ast::AnyNodeRef<'_>, argument_index: Option<usize>) -> ast::AnyNodeRef<'_> {
         // If we have a Call node and an argument index, report the diagnostic on the correct
         // argument node; otherwise, report it on the entire provided node.
+        match Self::get_argument_node(node, argument_index) {
+            Some(ast::ArgOrKeyword::Arg(expr)) => expr.into(),
+            Some(ast::ArgOrKeyword::Keyword(expr)) => expr.into(),
+            None => node,
+        }
+    }
+
+    fn get_argument_node(
+        node: ast::AnyNodeRef<'_>,
+        argument_index: Option<usize>,
+    ) -> Option<ArgOrKeyword<'_>> {
         match (node, argument_index) {
-            (ast::AnyNodeRef::ExprCall(call_node), Some(argument_index)) => {
-                match call_node
+            (ast::AnyNodeRef::ExprCall(call_node), Some(argument_index)) => Some(
+                call_node
                     .arguments
                     .arguments_source_order()
                     .nth(argument_index)
-                    .expect("argument index should not be out of range")
-                {
-                    ast::ArgOrKeyword::Arg(expr) => expr.into(),
-                    ast::ArgOrKeyword::Keyword(keyword) => keyword.into(),
-                }
-            }
-            _ => node,
+                    .expect("argument index should not be out of range"),
+            ),
+            _ => None,
         }
     }
 }
diff --git a/crates/ty_python_semantic/src/types/class.rs b/crates/ty_python_semantic/src/types/class.rs
index 49ef66960a..ae577549e2 100644
--- a/crates/ty_python_semantic/src/types/class.rs
+++ b/crates/ty_python_semantic/src/types/class.rs
@@ -1,44 +1,51 @@
+use std::cell::RefCell;
 use std::sync::{LazyLock, Mutex};
 
 use super::TypeVarVariance;
 use super::{
     BoundTypeVarInstance, IntersectionBuilder, MemberLookupPolicy, Mro, MroError, MroIterator,
-    SpecialFormType, SubclassOfType, Truthiness, Type, TypeQualifiers,
-    class_base::ClassBase,
-    function::{FunctionDecorators, FunctionType},
-    infer_expression_type, infer_unpack_types,
+    SpecialFormType, SubclassOfType, Truthiness, Type, TypeQualifiers, class_base::ClassBase,
+    function::FunctionType, infer_expression_type, infer_unpack_types,
 };
 use crate::FxOrderMap;
 use crate::module_resolver::KnownModule;
+use crate::place::TypeOrigin;
 use crate::semantic_index::definition::{Definition, DefinitionState};
-use crate::semantic_index::place::ScopedPlaceId;
-use crate::semantic_index::scope::NodeWithScopeKind;
+use crate::semantic_index::scope::{NodeWithScopeKind, Scope};
 use crate::semantic_index::symbol::Symbol;
 use crate::semantic_index::{
-    BindingWithConstraints, DeclarationWithConstraint, SemanticIndex, attribute_declarations,
-    attribute_scopes,
+    DeclarationWithConstraint, SemanticIndex, attribute_declarations, attribute_scopes,
 };
+use crate::types::bound_super::BoundSuperError;
+use crate::types::constraints::{ConstraintSet, IteratorConstraintsExtension};
 use crate::types::context::InferContext;
-use crate::types::diagnostic::{INVALID_LEGACY_TYPE_VARIABLE, INVALID_TYPE_ALIAS_TYPE};
+use crate::types::diagnostic::INVALID_TYPE_ALIAS_TYPE;
 use crate::types::enums::enum_metadata;
 use crate::types::function::{DataclassTransformerParams, KnownFunction};
-use crate::types::generics::{GenericContext, Specialization, walk_specialization};
+use crate::types::generics::{
+    GenericContext, InferableTypeVars, Specialization, walk_generic_context, walk_specialization,
+};
 use crate::types::infer::nearest_enclosing_class;
+use crate::types::member::{Member, class_member};
 use crate::types::signatures::{CallableSignature, Parameter, Parameters, Signature};
 use crate::types::tuple::{TupleSpec, TupleType};
+use crate::types::typed_dict::typed_dict_params_from_class_def;
+use crate::types::visitor::{NonAtomicType, TypeKind, TypeVisitor, walk_non_atomic_type};
 use crate::types::{
-    ApplyTypeMappingVisitor, BareTypeAliasType, Binding, BoundSuperError, BoundSuperType,
-    CallableType, DataclassParams, DeprecatedInstance, HasRelationToVisitor, KnownInstanceType,
-    NormalizedVisitor, PropertyInstanceType, StringLiteralType, TypeAliasType, TypeMapping,
-    TypeRelation, TypeVarBoundOrConstraints, TypeVarInstance, TypeVarKind, VarianceInferable,
-    declaration_type, infer_definition_types, todo_type,
+    ApplyTypeMappingVisitor, Binding, BoundSuperType, CallableType, DataclassFlags,
+    DataclassParams, DeprecatedInstance, FindLegacyTypeVarsVisitor, HasRelationToVisitor,
+    IsDisjointVisitor, IsEquivalentVisitor, KnownInstanceType, ManualPEP695TypeAliasType,
+    MaterializationKind, NormalizedVisitor, PropertyInstanceType, StringLiteralType, TypeAliasType,
+    TypeContext, TypeMapping, TypeRelation, TypedDictParams, UnionBuilder, VarianceInferable,
+    declaration_type, determine_upper_bound, exceeds_max_specialization_depth,
+    infer_definition_types,
 };
 use crate::{
-    Db, FxIndexMap, FxOrderSet, Program,
+    Db, FxIndexMap, FxIndexSet, FxOrderSet, Program,
     module_resolver::file_to_module,
     place::{
-        Boundness, LookupError, LookupResult, Place, PlaceAndQualifiers, class_symbol,
-        known_module_symbol, place_from_bindings, place_from_declarations,
+        Definedness, LookupError, LookupResult, Place, PlaceAndQualifiers, known_module_symbol,
+        place_from_bindings, place_from_declarations,
     },
     semantic_index::{
         attribute_assignments,
@@ -48,8 +55,8 @@ use crate::{
         semantic_index, use_def_map,
     },
     types::{
-        CallArguments, CallError, CallErrorKind, MetaclassCandidate, UnionBuilder, UnionType,
-        cyclic::PairVisitor, definition_expression_type,
+        CallArguments, CallError, CallErrorKind, MetaclassCandidate, UnionType,
+        definition_expression_type,
     },
 };
 use indexmap::IndexSet;
@@ -62,15 +69,6 @@ use ruff_python_ast::{self as ast, PythonVersion};
 use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::FxHashSet;
 
-fn explicit_bases_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &[Type<'db>],
-    _count: u32,
-    _self: ClassLiteral<'db>,
-) -> salsa::CycleRecoveryAction<Box<[Type<'db>]>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn explicit_bases_cycle_initial<'db>(
     _db: &'db dyn Db,
     _self: ClassLiteral<'db>,
@@ -78,16 +76,6 @@ fn explicit_bases_cycle_initial<'db>(
     Box::default()
 }
 
-#[expect(clippy::ref_option, clippy::trivially_copy_pass_by_ref)]
-fn inheritance_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Option<InheritanceCycle>,
-    _count: u32,
-    _self: ClassLiteral<'db>,
-) -> salsa::CycleRecoveryAction<Option<InheritanceCycle>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn inheritance_cycle_initial<'db>(
     _db: &'db dyn Db,
     _self: ClassLiteral<'db>,
@@ -95,34 +83,13 @@ fn inheritance_cycle_initial<'db>(
     None
 }
 
-fn implicit_attribute_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &PlaceAndQualifiers<'db>,
-    _count: u32,
-    _class_body_scope: ScopeId<'db>,
-    _name: String,
-    _target_method_decorator: MethodDecorator,
-) -> salsa::CycleRecoveryAction<PlaceAndQualifiers<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn implicit_attribute_initial<'db>(
     _db: &'db dyn Db,
     _class_body_scope: ScopeId<'db>,
     _name: String,
     _target_method_decorator: MethodDecorator,
-) -> PlaceAndQualifiers<'db> {
-    Place::Unbound.into()
-}
-
-fn try_mro_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Result<Mro<'db>, MroError<'db>>,
-    _count: u32,
-    _self: ClassLiteral<'db>,
-    _specialization: Option<Specialization<'db>>,
-) -> salsa::CycleRecoveryAction<Result<Mro<'db>, MroError<'db>>> {
-    salsa::CycleRecoveryAction::Iterate
+) -> Member<'db> {
+    Member::unbound()
 }
 
 fn try_mro_cycle_initial<'db>(
@@ -136,37 +103,16 @@ fn try_mro_cycle_initial<'db>(
     ))
 }
 
-#[allow(clippy::trivially_copy_pass_by_ref)]
-fn is_typed_dict_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &bool,
-    _count: u32,
-    _self: ClassLiteral<'db>,
-) -> salsa::CycleRecoveryAction<bool> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 #[allow(clippy::unnecessary_wraps)]
 fn is_typed_dict_cycle_initial<'db>(_db: &'db dyn Db, _self: ClassLiteral<'db>) -> bool {
     false
 }
 
-fn try_metaclass_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Result<(Type<'db>, Option<DataclassTransformerParams>), MetaclassError<'db>>,
-    _count: u32,
-    _self: ClassLiteral<'db>,
-) -> salsa::CycleRecoveryAction<
-    Result<(Type<'db>, Option<DataclassTransformerParams>), MetaclassError<'db>>,
-> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 #[allow(clippy::unnecessary_wraps)]
 fn try_metaclass_cycle_initial<'db>(
     _db: &'db dyn Db,
     _self_: ClassLiteral<'db>,
-) -> Result<(Type<'db>, Option<DataclassTransformerParams>), MetaclassError<'db>> {
+) -> Result<(Type<'db>, Option<DataclassTransformerParams<'db>>), MetaclassError<'db>> {
     Err(MetaclassError {
         kind: MetaclassErrorKind::Cycle,
     })
@@ -174,32 +120,41 @@ fn try_metaclass_cycle_initial<'db>(
 
 /// A category of classes with code generation capabilities (with synthesized methods).
 #[derive(Clone, Copy, Debug, PartialEq, salsa::Update, get_size2::GetSize)]
-pub(crate) enum CodeGeneratorKind {
+pub(crate) enum CodeGeneratorKind<'db> {
     /// Classes decorated with `@dataclass` or similar dataclass-like decorators
-    DataclassLike,
+    DataclassLike(Option<DataclassTransformerParams<'db>>),
     /// Classes inheriting from `typing.NamedTuple`
     NamedTuple,
     /// Classes inheriting from `typing.TypedDict`
     TypedDict,
 }
 
-impl CodeGeneratorKind {
-    pub(crate) fn from_class(db: &dyn Db, class: ClassLiteral<'_>) -> Option<Self> {
-        #[salsa::tracked(
-            cycle_fn=code_generator_of_class_recover,
-            cycle_initial=code_generator_of_class_initial,
+impl<'db> CodeGeneratorKind<'db> {
+    pub(crate) fn from_class(
+        db: &'db dyn Db,
+        class: ClassLiteral<'db>,
+        specialization: Option<Specialization<'db>>,
+    ) -> Option<Self> {
+        #[salsa::tracked(cycle_initial=code_generator_of_class_initial,
             heap_size=ruff_memory_usage::heap_size
         )]
         fn code_generator_of_class<'db>(
             db: &'db dyn Db,
             class: ClassLiteral<'db>,
-        ) -> Option<CodeGeneratorKind> {
-            if class.dataclass_params(db).is_some()
-                || class
-                    .try_metaclass(db)
-                    .is_ok_and(|(_, transformer_params)| transformer_params.is_some())
+            specialization: Option<Specialization<'db>>,
+        ) -> Option<CodeGeneratorKind<'db>> {
+            if class.dataclass_params(db).is_some() {
+                Some(CodeGeneratorKind::DataclassLike(None))
+            } else if let Ok((_, Some(transformer_params))) = class.try_metaclass(db) {
+                Some(CodeGeneratorKind::DataclassLike(Some(transformer_params)))
+            } else if let Some(transformer_params) =
+                class.iter_mro(db, specialization).skip(1).find_map(|base| {
+                    base.into_class().and_then(|class| {
+                        class.class_literal(db).0.dataclass_transformer_params(db)
+                    })
+                })
             {
-                Some(CodeGeneratorKind::DataclassLike)
+                Some(CodeGeneratorKind::DataclassLike(Some(transformer_params)))
             } else if class
                 .explicit_bases(db)
                 .contains(&Type::SpecialForm(SpecialFormType::NamedTuple))
@@ -212,28 +167,39 @@ impl CodeGeneratorKind {
             }
         }
 
-        fn code_generator_of_class_initial(
-            _db: &dyn Db,
-            _class: ClassLiteral<'_>,
-        ) -> Option<CodeGeneratorKind> {
+        fn code_generator_of_class_initial<'db>(
+            _db: &'db dyn Db,
+            _class: ClassLiteral<'db>,
+            _specialization: Option<Specialization<'db>>,
+        ) -> Option<CodeGeneratorKind<'db>> {
             None
         }
 
-        #[expect(clippy::ref_option, clippy::trivially_copy_pass_by_ref)]
-        fn code_generator_of_class_recover(
-            _db: &dyn Db,
-            _value: &Option<CodeGeneratorKind>,
-            _count: u32,
-            _class: ClassLiteral<'_>,
-        ) -> salsa::CycleRecoveryAction<Option<CodeGeneratorKind>> {
-            salsa::CycleRecoveryAction::Iterate
-        }
-
-        code_generator_of_class(db, class)
+        code_generator_of_class(db, class, specialization)
     }
 
-    pub(super) fn matches(self, db: &dyn Db, class: ClassLiteral<'_>) -> bool {
-        CodeGeneratorKind::from_class(db, class) == Some(self)
+    pub(super) fn matches(
+        self,
+        db: &'db dyn Db,
+        class: ClassLiteral<'db>,
+        specialization: Option<Specialization<'db>>,
+    ) -> bool {
+        matches!(
+            (
+                CodeGeneratorKind::from_class(db, class, specialization),
+                self
+            ),
+            (Some(Self::DataclassLike(_)), Self::DataclassLike(_))
+                | (Some(Self::NamedTuple), Self::NamedTuple)
+                | (Some(Self::TypedDict), Self::TypedDict)
+        )
+    }
+
+    pub(super) fn dataclass_transformer_params(self) -> Option<DataclassTransformerParams<'db>> {
+        match self {
+            Self::DataclassLike(params) => params,
+            Self::NamedTuple | Self::TypedDict => None,
+        }
     }
 }
 
@@ -269,14 +235,6 @@ impl<'db> GenericAlias<'db> {
         )
     }
 
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self::new(
-            db,
-            self.origin(db),
-            self.specialization(db).materialize(db, variance),
-        )
-    }
-
     pub(crate) fn definition(self, db: &'db dyn Db) -> Definition<'db> {
         self.origin(db).definition(db)
     }
@@ -285,24 +243,32 @@ impl<'db> GenericAlias<'db> {
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
+        let tcx = tcx
+            .annotation
+            .and_then(|ty| ty.specialization_of(db, Some(self.origin(db))))
+            .map(|specialization| specialization.types(db))
+            .unwrap_or(&[]);
+
         Self::new(
             db,
             self.origin(db),
             self.specialization(db)
-                .apply_type_mapping_impl(db, type_mapping, visitor),
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor),
         )
     }
 
-    pub(super) fn find_legacy_typevars(
+    pub(super) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         self.specialization(db)
-            .find_legacy_typevars(db, binding_context, typevars);
+            .find_legacy_typevars_impl(db, binding_context, typevars, visitor);
     }
 
     pub(super) fn is_typed_dict(self, db: &'db dyn Db) -> bool {
@@ -331,7 +297,6 @@ impl<'db> VarianceInferable<'db> for GenericAlias<'db> {
                 specialization
                     .generic_context(db)
                     .variables(db)
-                    .iter()
                     .zip(specialization.types(db))
                     .map(|(generic_typevar, ty)| {
                         if let Some(explicit_variance) =
@@ -353,7 +318,7 @@ impl<'db> VarianceInferable<'db> for GenericAlias<'db> {
                             let typevar_variance_in_substituted_type = ty.variance_of(db, typevar);
                             origin
                                 .with_polarity(typevar_variance_in_substituted_type)
-                                .variance_of(db, *generic_typevar)
+                                .variance_of(db, generic_typevar)
                         }
                     }),
             )
@@ -383,8 +348,8 @@ pub enum ClassType<'db> {
 
 #[salsa::tracked]
 impl<'db> ClassType<'db> {
-    pub(super) const fn is_not_generic(self) -> bool {
-        matches!(self, Self::NonGeneric(_))
+    pub(super) const fn is_generic(self) -> bool {
+        matches!(self, Self::Generic(_))
     }
 
     pub(super) const fn into_generic_alias(self) -> Option<GenericAlias<'db>> {
@@ -401,13 +366,6 @@ impl<'db> ClassType<'db> {
         }
     }
 
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        match self {
-            Self::NonGeneric(_) => self,
-            Self::Generic(generic) => Self::Generic(generic.materialize(db, variance)),
-        }
-    }
-
     pub(super) fn has_pep_695_type_params(self, db: &'db dyn Db) -> bool {
         match self {
             Self::NonGeneric(class) => class.has_pep_695_type_params(db),
@@ -462,9 +420,9 @@ impl<'db> ClassType<'db> {
         class_literal.definition(db)
     }
 
-    /// Return `Some` if this class is known to be a [`SolidBase`], or `None` if it is not.
-    pub(super) fn as_solid_base(self, db: &'db dyn Db) -> Option<SolidBase<'db>> {
-        self.class_literal(db).0.as_solid_base(db)
+    /// Return `Some` if this class is known to be a [`DisjointBase`], or `None` if it is not.
+    pub(super) fn as_disjoint_base(self, db: &'db dyn Db) -> Option<DisjointBase<'db>> {
+        self.class_literal(db).0.as_disjoint_base(db)
     }
 
     /// Return `true` if this class represents `known_class`
@@ -481,25 +439,29 @@ impl<'db> ClassType<'db> {
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
         match self {
             Self::NonGeneric(_) => self,
             Self::Generic(generic) => {
-                Self::Generic(generic.apply_type_mapping_impl(db, type_mapping, visitor))
+                Self::Generic(generic.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
         }
     }
 
-    pub(super) fn find_legacy_typevars(
+    pub(super) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self {
             Self::NonGeneric(_) => {}
-            Self::Generic(generic) => generic.find_legacy_typevars(db, binding_context, typevars),
+            Self::Generic(generic) => {
+                generic.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
+            }
         }
     }
 
@@ -536,64 +498,104 @@ impl<'db> ClassType<'db> {
 
     /// Return `true` if `other` is present in this class's MRO.
     pub(super) fn is_subclass_of(self, db: &'db dyn Db, other: ClassType<'db>) -> bool {
-        self.has_relation_to_impl(db, other, TypeRelation::Subtyping, &PairVisitor::new(true))
+        self.when_subclass_of(db, other, InferableTypeVars::None)
+            .is_always_satisfied()
+    }
+
+    pub(super) fn when_subclass_of(
+        self,
+        db: &'db dyn Db,
+        other: ClassType<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.has_relation_to_impl(
+            db,
+            other,
+            inferable,
+            TypeRelation::Subtyping,
+            &HasRelationToVisitor::default(),
+            &IsDisjointVisitor::default(),
+        )
     }
 
     pub(super) fn has_relation_to_impl(
         self,
         db: &'db dyn Db,
         other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
-        self.iter_mro(db).any(|base| {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        self.iter_mro(db).when_any(db, |base| {
             match base {
                 ClassBase::Dynamic(_) => match relation {
-                    TypeRelation::Subtyping => other.is_object(db),
-                    TypeRelation::Assignability => !other.is_final(db),
+                    TypeRelation::Subtyping | TypeRelation::Redundancy => {
+                        ConstraintSet::from(other.is_object(db))
+                    }
+                    TypeRelation::Assignability => ConstraintSet::from(!other.is_final(db)),
                 },
 
                 // Protocol and Generic are not represented by a ClassType.
-                ClassBase::Protocol | ClassBase::Generic => false,
+                ClassBase::Protocol | ClassBase::Generic => ConstraintSet::from(false),
 
                 ClassBase::Class(base) => match (base, other) {
-                    (ClassType::NonGeneric(base), ClassType::NonGeneric(other)) => base == other,
+                    (ClassType::NonGeneric(base), ClassType::NonGeneric(other)) => {
+                        ConstraintSet::from(base == other)
+                    }
                     (ClassType::Generic(base), ClassType::Generic(other)) => {
-                        base.origin(db) == other.origin(db)
-                            && base.specialization(db).has_relation_to_impl(
+                        ConstraintSet::from(base.origin(db) == other.origin(db)).and(db, || {
+                            base.specialization(db).has_relation_to_impl(
                                 db,
                                 other.specialization(db),
+                                inferable,
                                 relation,
-                                visitor,
+                                relation_visitor,
+                                disjointness_visitor,
                             )
+                        })
                     }
                     (ClassType::Generic(_), ClassType::NonGeneric(_))
-                    | (ClassType::NonGeneric(_), ClassType::Generic(_)) => false,
+                    | (ClassType::NonGeneric(_), ClassType::Generic(_)) => {
+                        ConstraintSet::from(false)
+                    }
                 },
 
                 ClassBase::TypedDict => {
                     // TODO: Implement subclassing and assignability for TypedDicts.
-                    true
+                    ConstraintSet::from(true)
                 }
             }
         })
     }
 
-    pub(super) fn is_equivalent_to(self, db: &'db dyn Db, other: ClassType<'db>) -> bool {
+    pub(super) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: ClassType<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
 
         match (self, other) {
             // A non-generic class is never equivalent to a generic class.
             // Two non-generic classes are only equivalent if they are equal (handled above).
-            (ClassType::NonGeneric(_), _) | (_, ClassType::NonGeneric(_)) => false,
+            (ClassType::NonGeneric(_), _) | (_, ClassType::NonGeneric(_)) => {
+                ConstraintSet::from(false)
+            }
 
             (ClassType::Generic(this), ClassType::Generic(other)) => {
-                this.origin(db) == other.origin(db)
-                    && this
-                        .specialization(db)
-                        .is_equivalent_to(db, other.specialization(db))
+                ConstraintSet::from(this.origin(db) == other.origin(db)).and(db, || {
+                    this.specialization(db).is_equivalent_to_impl(
+                        db,
+                        other.specialization(db),
+                        inferable,
+                        visitor,
+                    )
+                })
             }
         }
     }
@@ -606,13 +608,13 @@ impl<'db> ClassType<'db> {
             .apply_optional_specialization(db, specialization)
     }
 
-    /// Return the [`SolidBase`] that appears first in the MRO of this class.
+    /// Return the [`DisjointBase`] that appears first in the MRO of this class.
     ///
-    /// Returns `None` if this class does not have any solid bases in its MRO.
-    pub(super) fn nearest_solid_base(self, db: &'db dyn Db) -> Option<SolidBase<'db>> {
+    /// Returns `None` if this class does not have any disjoint bases in its MRO.
+    pub(super) fn nearest_disjoint_base(self, db: &'db dyn Db) -> Option<DisjointBase<'db>> {
         self.iter_mro(db)
             .filter_map(ClassBase::into_class)
-            .find_map(|base| base.as_solid_base(db))
+            .find_map(|base| base.as_disjoint_base(db))
     }
 
     /// Return `true` if this class could coexist in an MRO with `other`.
@@ -633,12 +635,17 @@ impl<'db> ClassType<'db> {
             return other.is_subclass_of(db, self);
         }
 
-        // Two solid bases can only coexist in an MRO if one is a subclass of the other.
-        if self.nearest_solid_base(db).is_some_and(|solid_base_1| {
-            other.nearest_solid_base(db).is_some_and(|solid_base_2| {
-                !solid_base_1.could_coexist_in_mro_with(db, &solid_base_2)
+        // Two disjoint bases can only coexist in an MRO if one is a subclass of the other.
+        if self
+            .nearest_disjoint_base(db)
+            .is_some_and(|disjoint_base_1| {
+                other
+                    .nearest_disjoint_base(db)
+                    .is_some_and(|disjoint_base_2| {
+                        !disjoint_base_1.could_coexist_in_mro_with(db, &disjoint_base_2)
+                    })
             })
-        }) {
+        {
             return false;
         }
 
@@ -700,7 +707,7 @@ impl<'db> ClassType<'db> {
     /// class that the lookup is being performed on, and not the class containing the (possibly
     /// inherited) member.
     ///
-    /// Returns [`Place::Unbound`] if `name` cannot be found in this class's scope
+    /// Returns [`Place::Undefined`] if `name` cannot be found in this class's scope
     /// directly. Use [`ClassType::class_member`] if you require a method that will
     /// traverse through the MRO until it finds the member.
     pub(super) fn own_class_member(
@@ -708,7 +715,7 @@ impl<'db> ClassType<'db> {
         db: &'db dyn Db,
         inherited_generic_context: Option<GenericContext<'db>>,
         name: &str,
-    ) -> PlaceAndQualifiers<'db> {
+    ) -> Member<'db> {
         fn synthesize_getitem_overload_signature<'db>(
             index_annotation: Type<'db>,
             return_annotation: Type<'db>,
@@ -725,7 +732,17 @@ impl<'db> ClassType<'db> {
         let fallback_member_lookup = || {
             class_literal
                 .own_class_member(db, inherited_generic_context, specialization, name)
-                .map_type(|ty| ty.apply_optional_specialization(db, specialization))
+                .map_type(|ty| {
+                    let ty = ty.apply_optional_specialization(db, specialization);
+                    match specialization.map(|spec| spec.materialization_kind(db)) {
+                        Some(Some(materialization_kind)) => ty.materialize(
+                            db,
+                            materialization_kind,
+                            &ApplyTypeMappingVisitor::default(),
+                        ),
+                        _ => ty,
+                    }
+                })
         };
 
         let synthesize_simple_tuple_method = |return_type| {
@@ -736,7 +753,7 @@ impl<'db> ClassType<'db> {
             let synthesized_dunder_method =
                 CallableType::function_like(db, Signature::new(parameters, Some(return_type)));
 
-            Place::bound(synthesized_dunder_method).into()
+            Member::definitely_declared(synthesized_dunder_method)
         };
 
         match name {
@@ -910,7 +927,7 @@ impl<'db> ClassType<'db> {
                             CallableSignature::from_overloads(overload_signatures);
                         let getitem_type =
                             Type::Callable(CallableType::new(db, getitem_signature, true));
-                        Place::bound(getitem_type).into()
+                        Member::definitely_declared(getitem_type)
                     })
                     .unwrap_or_else(fallback_member_lookup)
             }
@@ -979,11 +996,10 @@ impl<'db> ClassType<'db> {
 
                 let synthesized_dunder = CallableType::function_like(
                     db,
-                    Signature::new(parameters, None)
-                        .with_inherited_generic_context(inherited_generic_context),
+                    Signature::new_generic(inherited_generic_context, parameters, None),
                 );
 
-                Place::bound(synthesized_dunder).into()
+                Member::definitely_declared(synthesized_dunder)
             }
 
             _ => fallback_member_lookup(),
@@ -997,7 +1013,7 @@ impl<'db> ClassType<'db> {
         let (class_literal, specialization) = self.class_literal(db);
 
         if class_literal.is_typed_dict(db) {
-            return Place::Unbound.into();
+            return Place::Undefined.into();
         }
 
         class_literal
@@ -1007,7 +1023,7 @@ impl<'db> ClassType<'db> {
 
     /// A helper function for `instance_member` that looks up the `name` attribute only on
     /// this class, not on its superclasses.
-    fn own_instance_member(self, db: &'db dyn Db, name: &str) -> PlaceAndQualifiers<'db> {
+    fn own_instance_member(self, db: &'db dyn Db, name: &str) -> Member<'db> {
         let (class_literal, specialization) = self.class_literal(db);
         class_literal
             .own_instance_member(db, name)
@@ -1016,7 +1032,7 @@ impl<'db> ClassType<'db> {
 
     /// Return a callable type (or union of callable types) that represents the callable
     /// constructor signature of this class.
-    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(cycle_initial=into_callable_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(super) fn into_callable(self, db: &'db dyn Db) -> Type<'db> {
         let self_ty = Type::from(self);
         let metaclass_dunder_call_function_symbol = self_ty
@@ -1028,7 +1044,7 @@ impl<'db> ClassType<'db> {
             )
             .place;
 
-        if let Place::Type(Type::BoundMethod(metaclass_dunder_call_function), _) =
+        if let Place::Defined(Type::BoundMethod(metaclass_dunder_call_function), _, _) =
             metaclass_dunder_call_function_symbol
         {
             // TODO: this intentionally diverges from step 1 in
@@ -1047,7 +1063,7 @@ impl<'db> ClassType<'db> {
             .place;
 
         let dunder_new_signature = dunder_new_function_symbol
-            .ignore_possibly_unbound()
+            .ignore_possibly_undefined()
             .and_then(|ty| match ty {
                 Type::FunctionLiteral(function) => Some(function.signature(db)),
                 Type::Callable(callable) => Some(callable.signatures(db)),
@@ -1098,7 +1114,7 @@ impl<'db> ClassType<'db> {
         // same parameters as the `__init__` method after it is bound, and with the return type of
         // the concrete type of `Self`.
         let synthesized_dunder_init_callable =
-            if let Place::Type(ty, _) = dunder_init_function_symbol {
+            if let Place::Defined(ty, _, _) = dunder_init_function_symbol {
                 let signature = match ty {
                     Type::FunctionLiteral(dunder_init_function) => {
                         Some(dunder_init_function.signature(db))
@@ -1150,10 +1166,12 @@ impl<'db> ClassType<'db> {
                     )
                     .place;
 
-                if let Place::Type(Type::FunctionLiteral(new_function), _) = new_function_symbol {
+                if let Place::Defined(Type::FunctionLiteral(new_function), _, _) =
+                    new_function_symbol
+                {
                     Type::Callable(
                         new_function
-                            .into_bound_method_type(db, self_ty)
+                            .into_bound_method_type(db, correct_return_type)
                             .into_callable_type(db),
                     )
                 } else {
@@ -1166,6 +1184,18 @@ impl<'db> ClassType<'db> {
             }
         }
     }
+
+    pub(super) fn is_protocol(self, db: &'db dyn Db) -> bool {
+        self.class_literal(db).0.is_protocol(db)
+    }
+
+    pub(super) fn header_span(self, db: &'db dyn Db) -> Span {
+        self.class_literal(db).0.header_span(db)
+    }
+}
+
+fn into_callable_cycle_initial<'db>(_db: &'db dyn Db, _self: ClassType<'db>) -> Type<'db> {
+    Type::Never
 }
 
 impl<'db> From<GenericAlias<'db>> for ClassType<'db> {
@@ -1202,11 +1232,8 @@ pub(super) enum MethodDecorator {
 }
 
 impl MethodDecorator {
-    fn try_from_fn_type(db: &dyn Db, fn_type: FunctionType) -> Result<Self, ()> {
-        match (
-            fn_type.has_known_decorator(db, FunctionDecorators::CLASSMETHOD),
-            fn_type.has_known_decorator(db, FunctionDecorators::STATICMETHOD),
-        ) {
+    pub(crate) fn try_from_fn_type(db: &dyn Db, fn_type: FunctionType) -> Result<Self, ()> {
+        match (fn_type.is_classmethod(db), fn_type.is_staticmethod(db)) {
             (true, true) => Err(()), // A method can't be static and class method at the same time.
             (true, false) => Ok(Self::ClassMethod),
             (false, true) => Ok(Self::StaticMethod),
@@ -1215,24 +1242,65 @@ impl MethodDecorator {
     }
 }
 
+/// Kind-specific metadata for different types of fields
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) enum FieldKind<'db> {
+    /// `NamedTuple` field metadata
+    NamedTuple { default_ty: Option<Type<'db>> },
+    /// dataclass field metadata
+    Dataclass {
+        /// The type of the default value for this field
+        default_ty: Option<Type<'db>>,
+        /// Whether or not this field is "init-only". If this is true, it only appears in the
+        /// `__init__` signature, but is not accessible as a real field
+        init_only: bool,
+        /// Whether or not this field should appear in the signature of `__init__`.
+        init: bool,
+        /// Whether or not this field can only be passed as a keyword argument to `__init__`.
+        kw_only: Option<bool>,
+        /// The name for this field in the `__init__` signature, if specified.
+        alias: Option<Box<str>>,
+    },
+    /// `TypedDict` field metadata
+    TypedDict {
+        /// Whether this field is required
+        is_required: bool,
+        /// Whether this field is marked read-only
+        is_read_only: bool,
+    },
+}
+
 /// Metadata regarding a dataclass field/attribute or a `TypedDict` "item" / key-value pair.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct Field<'db> {
     /// The declared type of the field
     pub(crate) declared_ty: Type<'db>,
+    /// Kind-specific metadata for this field
+    pub(crate) kind: FieldKind<'db>,
+    /// The original declaration of this field, if there is exactly one.
+    /// This field is used for backreferences in diagnostics.
+    pub(crate) single_declaration: Option<Definition<'db>>,
+}
 
-    /// The type of the default value for this field
-    pub(crate) default_ty: Option<Type<'db>>,
+impl Field<'_> {
+    pub(crate) const fn is_required(&self) -> bool {
+        match &self.kind {
+            FieldKind::NamedTuple { default_ty } => default_ty.is_none(),
+            // A dataclass field is NOT required if `default` (or `default_factory`) is set
+            // or if `init` has been set to `False`.
+            FieldKind::Dataclass {
+                init, default_ty, ..
+            } => default_ty.is_none() && *init,
+            FieldKind::TypedDict { is_required, .. } => *is_required,
+        }
+    }
 
-    /// Whether or not this field is "init-only". If this is true, it only appears in the
-    /// `__init__` signature, but is not accessible as a real field
-    pub(crate) init_only: bool,
-
-    /// Whether or not this field should appear in the signature of `__init__`.
-    pub(crate) init: bool,
-
-    /// Whether or not this field can only be passed as a keyword argument to `__init__`.
-    pub(crate) kw_only: Option<bool>,
+    pub(crate) const fn is_read_only(&self) -> bool {
+        match &self.kind {
+            FieldKind::TypedDict { is_read_only, .. } => *is_read_only,
+            _ => false,
+        }
+    }
 }
 
 impl<'db> Field<'db> {
@@ -1241,7 +1309,7 @@ impl<'db> Field<'db> {
     pub(crate) fn is_kw_only_sentinel(&self, db: &'db dyn Db) -> bool {
         self.declared_ty
             .into_nominal_instance()
-            .is_some_and(|instance| instance.class(db).is_known(db, KnownClass::KwOnly))
+            .is_some_and(|instance| instance.has_known_class(db, KnownClass::KwOnly))
     }
 }
 
@@ -1268,25 +1336,16 @@ pub struct ClassLiteral<'db> {
     /// If this class is deprecated, this holds the deprecation message.
     pub(crate) deprecated: Option<DeprecatedInstance<'db>>,
 
-    pub(crate) dataclass_params: Option<DataclassParams>,
-    pub(crate) dataclass_transformer_params: Option<DataclassTransformerParams>,
+    pub(crate) type_check_only: bool,
+
+    pub(crate) dataclass_params: Option<DataclassParams<'db>>,
+    pub(crate) dataclass_transformer_params: Option<DataclassTransformerParams<'db>>,
 }
 
 // The Salsa heap is tracked separately.
 impl get_size2::GetSize for ClassLiteral<'_> {}
 
-#[expect(clippy::ref_option)]
-#[allow(clippy::trivially_copy_pass_by_ref)]
-fn pep695_generic_context_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Option<GenericContext<'db>>,
-    _count: u32,
-    _self: ClassLiteral<'db>,
-) -> salsa::CycleRecoveryAction<Option<GenericContext<'db>>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
-fn pep695_generic_context_cycle_initial<'db>(
+fn generic_context_cycle_initial<'db>(
     _db: &'db dyn Db,
     _self: ClassLiteral<'db>,
 ) -> Option<GenericContext<'db>> {
@@ -1326,12 +1385,14 @@ impl<'db> ClassLiteral<'db> {
         self.pep695_generic_context(db).is_some()
     }
 
-    #[salsa::tracked(cycle_fn=pep695_generic_context_cycle_recover, cycle_initial=pep695_generic_context_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(cycle_initial=generic_context_cycle_initial,
+        heap_size=ruff_memory_usage::heap_size,
+    )]
     pub(crate) fn pep695_generic_context(self, db: &'db dyn Db) -> Option<GenericContext<'db>> {
         let scope = self.body_scope(db);
         let file = scope.file(db);
         let parsed = parsed_module(db, file).load(db);
-        let class_def_node = scope.node(db).expect_class(&parsed);
+        let class_def_node = scope.node(db).expect_class().node(&parsed);
         class_def_node.type_params.as_ref().map(|type_params| {
             let index = semantic_index(db, scope.file(db));
             let definition = index.expect_single_definition(class_def_node);
@@ -1349,12 +1410,16 @@ impl<'db> ClassLiteral<'db> {
         })
     }
 
+    #[salsa::tracked(cycle_initial=generic_context_cycle_initial,
+        heap_size=ruff_memory_usage::heap_size,
+    )]
     pub(crate) fn inherited_legacy_generic_context(
         self,
         db: &'db dyn Db,
     ) -> Option<GenericContext<'db>> {
         GenericContext::from_base_classes(
             db,
+            self.definition(db),
             self.explicit_bases(db)
                 .iter()
                 .copied()
@@ -1362,7 +1427,68 @@ impl<'db> ClassLiteral<'db> {
         )
     }
 
-    fn file(self, db: &dyn Db) -> File {
+    /// Returns all of the typevars that are referenced in this class's definition. This includes
+    /// any typevars bound in its generic context, as well as any typevars mentioned in its base
+    /// class list. (This is used to ensure that classes do not bind or reference typevars from
+    /// enclosing generic contexts.)
+    pub(crate) fn typevars_referenced_in_definition(
+        self,
+        db: &'db dyn Db,
+    ) -> FxIndexSet<BoundTypeVarInstance<'db>> {
+        #[derive(Default)]
+        struct CollectTypeVars<'db> {
+            typevars: RefCell<FxIndexSet<BoundTypeVarInstance<'db>>>,
+            seen_types: RefCell<FxIndexSet<NonAtomicType<'db>>>,
+        }
+
+        impl<'db> TypeVisitor<'db> for CollectTypeVars<'db> {
+            fn should_visit_lazy_type_attributes(&self) -> bool {
+                false
+            }
+
+            fn visit_bound_type_var_type(
+                &self,
+                _db: &'db dyn Db,
+                bound_typevar: BoundTypeVarInstance<'db>,
+            ) {
+                self.typevars.borrow_mut().insert(bound_typevar);
+            }
+
+            fn visit_type(&self, db: &'db dyn Db, ty: Type<'db>) {
+                match TypeKind::from(ty) {
+                    TypeKind::Atomic => {}
+                    TypeKind::NonAtomic(non_atomic_type) => {
+                        if !self.seen_types.borrow_mut().insert(non_atomic_type) {
+                            // If we have already seen this type, we can skip it.
+                            return;
+                        }
+                        walk_non_atomic_type(db, non_atomic_type, self);
+                    }
+                }
+            }
+        }
+
+        let visitor = CollectTypeVars::default();
+        if let Some(generic_context) = self.generic_context(db) {
+            walk_generic_context(db, generic_context, &visitor);
+        }
+        for base in self.explicit_bases(db) {
+            visitor.visit_type(db, *base);
+        }
+        visitor.typevars.into_inner()
+    }
+
+    /// Returns the generic context that should be inherited by any constructor methods of this
+    /// class.
+    ///
+    /// When inferring a specialization of the class's generic context from a constructor call, we
+    /// promote any typevars that are inferred as a literal to the corresponding instance type.
+    fn inherited_generic_context(self, db: &'db dyn Db) -> Option<GenericContext<'db>> {
+        self.generic_context(db)
+            .map(|generic_context| generic_context.promote_literals(db))
+    }
+
+    pub(super) fn file(self, db: &dyn Db) -> File {
         self.body_scope(db).file(db)
     }
 
@@ -1373,14 +1499,13 @@ impl<'db> ClassLiteral<'db> {
     /// query depends on the AST of another file (bad!).
     fn node<'ast>(self, db: &'db dyn Db, module: &'ast ParsedModuleRef) -> &'ast ast::StmtClassDef {
         let scope = self.body_scope(db);
-        scope.node(db).expect_class(module)
+        scope.node(db).expect_class().node(module)
     }
 
     pub(crate) fn definition(self, db: &'db dyn Db) -> Definition<'db> {
         let body_scope = self.body_scope(db);
-        let module = parsed_module(db, body_scope.file(db)).load(db);
         let index = semantic_index(db, body_scope.file(db));
-        index.expect_single_definition(body_scope.node(db).expect_class(&module))
+        index.expect_single_definition(body_scope.node(db).expect_class())
     }
 
     pub(crate) fn apply_specialization(
@@ -1391,7 +1516,18 @@ impl<'db> ClassLiteral<'db> {
         match self.generic_context(db) {
             None => ClassType::NonGeneric(self),
             Some(generic_context) => {
-                let specialization = f(generic_context);
+                let mut specialization = f(generic_context);
+
+                for (idx, ty) in specialization.types(db).iter().enumerate() {
+                    if exceeds_max_specialization_depth(db, *ty) {
+                        specialization = specialization.with_replaced_type(
+                            db,
+                            idx,
+                            Type::divergent(Some(self.body_scope(db))),
+                        );
+                    }
+                }
+
                 ClassType::Generic(GenericAlias::new(db, self, specialization))
             }
         }
@@ -1408,6 +1544,18 @@ impl<'db> ClassLiteral<'db> {
         })
     }
 
+    pub(crate) fn top_materialization(self, db: &'db dyn Db) -> ClassType<'db> {
+        self.apply_specialization(db, |generic_context| {
+            generic_context
+                .default_specialization(db, self.known(db))
+                .materialize_impl(
+                    db,
+                    MaterializationKind::Top,
+                    &ApplyTypeMappingVisitor::default(),
+                )
+        })
+    }
+
     /// Returns the default specialization of this class. For non-generic classes, the class is
     /// returned unchanged. For a non-specialized generic class, we return a generic alias that
     /// applies the default specialization to the class's typevars.
@@ -1426,6 +1574,13 @@ impl<'db> ClassLiteral<'db> {
         })
     }
 
+    /// Returns a specialization of this class where each typevar is mapped to itself.
+    pub(crate) fn identity_specialization(self, db: &'db dyn Db) -> ClassType<'db> {
+        self.apply_specialization(db, |generic_context| {
+            generic_context.identity_specialization(db)
+        })
+    }
+
     /// Return an iterator over the inferred types of this class's *explicit* bases.
     ///
     /// Note that any class (except for `object`) that has no explicit
@@ -1439,7 +1594,7 @@ impl<'db> ClassLiteral<'db> {
     ///
     /// Were this not a salsa query, then the calling query
     /// would depend on the class's AST and rerun for every change in that file.
-    #[salsa::tracked(returns(deref), cycle_fn=explicit_bases_cycle_recover, cycle_initial=explicit_bases_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(returns(deref), cycle_initial=explicit_bases_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(super) fn explicit_bases(self, db: &'db dyn Db) -> Box<[Type<'db>]> {
         tracing::trace!("ClassLiteral::explicit_bases_query: {}", self.name(db));
 
@@ -1465,14 +1620,15 @@ impl<'db> ClassLiteral<'db> {
         }
     }
 
-    /// Return `Some()` if this class is known to be a [`SolidBase`], or `None` if it is not.
-    pub(super) fn as_solid_base(self, db: &'db dyn Db) -> Option<SolidBase<'db>> {
-        if let Some(known_class) = self.known(db) {
-            known_class
-                .is_solid_base()
-                .then_some(SolidBase::hard_coded(self))
+    /// Return `Some()` if this class is known to be a [`DisjointBase`], or `None` if it is not.
+    pub(super) fn as_disjoint_base(self, db: &'db dyn Db) -> Option<DisjointBase<'db>> {
+        if self
+            .known_function_decorators(db)
+            .contains(&KnownFunction::DisjointBase)
+        {
+            Some(DisjointBase::due_to_decorator(self))
         } else if SlotsKind::from(db, self) == SlotsKind::NotEmpty {
-            Some(SolidBase::due_to_dunder_slots(self))
+            Some(DisjointBase::due_to_dunder_slots(self))
         } else {
             None
         }
@@ -1520,7 +1676,7 @@ impl<'db> ClassLiteral<'db> {
     /// Determine if this is an abstract class.
     pub(super) fn is_abstract(self, db: &'db dyn Db) -> bool {
         self.metaclass(db)
-            .into_class_literal()
+            .as_class_literal()
             .is_some_and(|metaclass| metaclass.is_known(db, KnownClass::ABCMeta))
     }
 
@@ -1554,7 +1710,7 @@ impl<'db> ClassLiteral<'db> {
     ) -> impl Iterator<Item = KnownFunction> + 'db {
         self.decorators(db)
             .iter()
-            .filter_map(|deco| deco.into_function_literal())
+            .filter_map(|deco| deco.as_function_literal())
             .filter_map(|decorator| decorator.known(db))
     }
 
@@ -1574,7 +1730,7 @@ impl<'db> ClassLiteral<'db> {
     /// attribute on a class at runtime.
     ///
     /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
-    #[salsa::tracked(returns(as_ref), cycle_fn=try_mro_cycle_recover, cycle_initial=try_mro_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(returns(as_ref), cycle_initial=try_mro_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(super) fn try_mro(
         self,
         db: &'db dyn Db,
@@ -1613,11 +1769,18 @@ impl<'db> ClassLiteral<'db> {
             .contains(&ClassBase::Class(other))
     }
 
+    pub(super) fn when_subclass_of(
+        self,
+        db: &'db dyn Db,
+        specialization: Option<Specialization<'db>>,
+        other: ClassType<'db>,
+    ) -> ConstraintSet<'db> {
+        ConstraintSet::from(self.is_subclass_of(db, specialization, other))
+    }
+
     /// Return `true` if this class constitutes a typed dict specification (inherits from
     /// `typing.TypedDict`, either directly or indirectly).
-    #[salsa::tracked(
-        cycle_fn=is_typed_dict_cycle_recover,
-        cycle_initial=is_typed_dict_cycle_initial,
+    #[salsa::tracked(cycle_initial=is_typed_dict_cycle_initial,
         heap_size=ruff_memory_usage::heap_size
     )]
     pub(super) fn is_typed_dict(self, db: &'db dyn Db) -> bool {
@@ -1629,6 +1792,17 @@ impl<'db> ClassLiteral<'db> {
             .any(|base| matches!(base, ClassBase::TypedDict))
     }
 
+    /// Compute `TypedDict` parameters dynamically based on MRO detection and AST parsing.
+    fn typed_dict_params(self, db: &'db dyn Db) -> Option<TypedDictParams> {
+        if !self.is_typed_dict(db) {
+            return None;
+        }
+
+        let module = parsed_module(db, self.file(db)).load(db);
+        let class_stmt = self.node(db, &module);
+        Some(typed_dict_params_from_class_def(class_stmt))
+    }
+
     /// Return the explicit `metaclass` of this class, if one is defined.
     ///
     /// ## Note
@@ -1667,15 +1841,13 @@ impl<'db> ClassLiteral<'db> {
     }
 
     /// Return the metaclass of this class, or an error if the metaclass cannot be inferred.
-    #[salsa::tracked(
-        cycle_fn=try_metaclass_cycle_recover,
-        cycle_initial=try_metaclass_cycle_initial,
+    #[salsa::tracked(cycle_initial=try_metaclass_cycle_initial,
         heap_size=ruff_memory_usage::heap_size,
     )]
     pub(super) fn try_metaclass(
         self,
         db: &'db dyn Db,
-    ) -> Result<(Type<'db>, Option<DataclassTransformerParams>), MetaclassError<'db>> {
+    ) -> Result<(Type<'db>, Option<DataclassTransformerParams<'db>>), MetaclassError<'db>> {
         tracing::trace!("ClassLiteral::try_metaclass: {}", self.name(db));
 
         // Identify the class's own metaclass (or take the first base class's metaclass).
@@ -1790,7 +1962,29 @@ impl<'db> ClassLiteral<'db> {
         name: &str,
         policy: MemberLookupPolicy,
     ) -> PlaceAndQualifiers<'db> {
-        self.class_member_inner(db, None, name, policy)
+        fn into_function_like_callable<'d>(db: &'d dyn Db, ty: Type<'d>) -> Type<'d> {
+            match ty {
+                Type::Callable(callable_ty) => {
+                    Type::Callable(CallableType::new(db, callable_ty.signatures(db), true))
+                }
+                Type::Union(union) => {
+                    union.map(db, |element| into_function_like_callable(db, *element))
+                }
+                Type::Intersection(intersection) => intersection
+                    .map_positive(db, |element| into_function_like_callable(db, *element)),
+                _ => ty,
+            }
+        }
+
+        let mut member = self.class_member_inner(db, None, name, policy);
+
+        // We generally treat dunder attributes with `Callable` types as function-like callables.
+        // See `callables_as_descriptors.md` for more details.
+        if name.starts_with("__") && name.ends_with("__") {
+            member = member.map_type(|ty| into_function_like_callable(db, ty));
+        }
+
+        member
     }
 
     fn class_member_inner(
@@ -1824,7 +2018,7 @@ impl<'db> ClassLiteral<'db> {
         let mut dynamic_type_to_intersect_with: Option<Type<'db>> = None;
 
         let mut lookup_result: LookupResult<'db> =
-            Err(LookupError::Unbound(TypeQualifiers::empty()));
+            Err(LookupError::Undefined(TypeQualifiers::empty()));
 
         for superclass in mro_iter {
             match superclass {
@@ -1860,7 +2054,9 @@ impl<'db> ClassLiteral<'db> {
                     lookup_result = lookup_result.or_else(|lookup_error| {
                         lookup_error.or_fall_back_to(
                             db,
-                            class.own_class_member(db, self.generic_context(db), name),
+                            class
+                                .own_class_member(db, self.inherited_generic_context(db), name)
+                                .inner,
                         )
                     });
                 }
@@ -1868,7 +2064,21 @@ impl<'db> ClassLiteral<'db> {
                     return KnownClass::TypedDictFallback
                         .to_class_literal(db)
                         .find_name_in_mro_with_policy(db, name, policy)
-                        .expect("Will return Some() when called on class literal");
+                        .expect("Will return Some() when called on class literal")
+                        .map_type(|ty| {
+                            ty.apply_type_mapping(
+                                db,
+                                &TypeMapping::ReplaceSelf {
+                                    new_upper_bound: determine_upper_bound(
+                                        db,
+                                        self,
+                                        None,
+                                        ClassBase::is_typed_dict,
+                                    ),
+                                },
+                                TypeContext::default(),
+                            )
+                        });
                 }
             }
             if lookup_result.is_ok() {
@@ -1884,7 +2094,7 @@ impl<'db> ClassLiteral<'db> {
 
             (
                 PlaceAndQualifiers {
-                    place: Place::Type(ty, _),
+                    place: Place::Defined(ty, _, _),
                     qualifiers,
                 },
                 Some(dynamic_type),
@@ -1898,7 +2108,7 @@ impl<'db> ClassLiteral<'db> {
 
             (
                 PlaceAndQualifiers {
-                    place: Place::Unbound,
+                    place: Place::Undefined,
                     qualifiers,
                 },
                 Some(dynamic_type),
@@ -1909,7 +2119,7 @@ impl<'db> ClassLiteral<'db> {
     /// Returns the inferred type of the class member named `name`. Only bound members
     /// or those marked as `ClassVars` are considered.
     ///
-    /// Returns [`Place::Unbound`] if `name` cannot be found in this class's scope
+    /// Returns [`Place::Undefined`] if `name` cannot be found in this class's scope
     /// directly. Use [`ClassLiteral::class_member`] if you require a method that will
     /// traverse through the MRO until it finds the member.
     pub(super) fn own_class_member(
@@ -1918,33 +2128,38 @@ impl<'db> ClassLiteral<'db> {
         inherited_generic_context: Option<GenericContext<'db>>,
         specialization: Option<Specialization<'db>>,
         name: &str,
-    ) -> PlaceAndQualifiers<'db> {
+    ) -> Member<'db> {
         if name == "__dataclass_fields__" && self.dataclass_params(db).is_some() {
             // Make this class look like a subclass of the `DataClassInstance` protocol
-            return Place::bound(KnownClass::Dict.to_specialized_instance(
-                db,
-                [
-                    KnownClass::Str.to_instance(db),
-                    KnownClass::Field.to_specialized_instance(db, [Type::any()]),
-                ],
-            ))
-            .with_qualifiers(TypeQualifiers::CLASS_VAR);
+            return Member {
+                inner: Place::declared(KnownClass::Dict.to_specialized_instance(
+                    db,
+                    [
+                        KnownClass::Str.to_instance(db),
+                        KnownClass::Field.to_specialized_instance(db, [Type::any()]),
+                    ],
+                ))
+                .with_qualifiers(TypeQualifiers::CLASS_VAR),
+            };
         }
 
-        if CodeGeneratorKind::NamedTuple.matches(db, self) {
-            if let Some(field) = self.own_fields(db, specialization).get(name) {
+        if CodeGeneratorKind::NamedTuple.matches(db, self, specialization) {
+            if let Some(field) = self
+                .own_fields(db, specialization, CodeGeneratorKind::NamedTuple)
+                .get(name)
+            {
                 let property_getter_signature = Signature::new(
                     Parameters::new([Parameter::positional_only(Some(Name::new_static("self")))]),
                     Some(field.declared_ty),
                 );
                 let property_getter = CallableType::single(db, property_getter_signature);
                 let property = PropertyInstanceType::new(db, Some(property_getter), None);
-                return Place::bound(Type::PropertyInstance(property)).into();
+                return Member::definitely_declared(Type::PropertyInstance(property));
             }
         }
 
         let body_scope = self.body_scope(db);
-        let symbol = class_symbol(db, body_scope, name).map_type(|ty| {
+        let member = class_member(db, body_scope, name).map_type(|ty| {
             // The `__new__` and `__init__` members of a non-specialized generic class are handled
             // specially: they inherit the generic context of their class. That lets us treat them
             // as generic functions when constructing the class, and infer the specialization of
@@ -1969,15 +2184,15 @@ impl<'db> ClassLiteral<'db> {
             }
         });
 
-        if symbol.place.is_unbound() {
+        if member.is_undefined() {
             if let Some(synthesized_member) = self.own_synthesized_member(db, specialization, name)
             {
-                return Place::bound(synthesized_member).into();
+                return Member::definitely_declared(synthesized_member);
             }
             // The symbol was not found in the class scope. It might still be implicitly defined in `@classmethod`s.
             return Self::implicit_attribute(db, body_scope, name, MethodDecorator::ClassMethod);
         }
-        symbol
+        member
     }
 
     /// Returns the type of a synthesized dataclass member like `__init__` or `__lt__`, or
@@ -1989,26 +2204,42 @@ impl<'db> ClassLiteral<'db> {
         name: &str,
     ) -> Option<Type<'db>> {
         let dataclass_params = self.dataclass_params(db);
-        let has_dataclass_param =
-            |param| dataclass_params.is_some_and(|params| params.contains(param));
 
-        let field_policy = CodeGeneratorKind::from_class(db, self)?;
+        let field_policy = CodeGeneratorKind::from_class(db, self, specialization)?;
+
+        let transformer_params =
+            if let CodeGeneratorKind::DataclassLike(Some(transformer_params)) = field_policy {
+                Some(DataclassParams::from_transformer_params(
+                    db,
+                    transformer_params,
+                ))
+            } else {
+                None
+            };
+
+        let has_dataclass_param = |param| {
+            dataclass_params.is_some_and(|params| params.flags(db).contains(param))
+                || transformer_params.is_some_and(|params| params.flags(db).contains(param))
+        };
 
         let instance_ty =
             Type::instance(db, self.apply_optional_specialization(db, specialization));
 
         let signature_from_fields = |mut parameters: Vec<_>, return_ty: Option<Type<'db>>| {
-            for (
-                field_name,
-                field @ Field {
-                    declared_ty: mut field_ty,
-                    mut default_ty,
-                    init_only: _,
-                    init,
-                    kw_only,
-                },
-            ) in self.fields(db, specialization, field_policy)
-            {
+            for (field_name, field) in self.fields(db, specialization, field_policy) {
+                let (init, mut default_ty, kw_only, alias) = match &field.kind {
+                    FieldKind::NamedTuple { default_ty } => (true, *default_ty, None, None),
+                    FieldKind::Dataclass {
+                        init,
+                        default_ty,
+                        kw_only,
+                        alias,
+                        ..
+                    } => (*init, *default_ty, *kw_only, alias.as_ref()),
+                    FieldKind::TypedDict { .. } => continue,
+                };
+                let mut field_ty = field.declared_ty;
+
                 if name == "__init__" && !init {
                     // Skip fields with `init=False`
                     continue;
@@ -2022,7 +2253,8 @@ impl<'db> ClassLiteral<'db> {
                 }
 
                 let dunder_set = field_ty.class_member(db, "__set__".into());
-                if let Place::Type(dunder_set, Boundness::Bound) = dunder_set.place {
+                if let Place::Defined(dunder_set, _, Definedness::AlwaysDefined) = dunder_set.place
+                {
                     // The descriptor handling below is guarded by this not-dynamic check, because
                     // dynamic types like `Any` are valid (data) descriptors: since they have all
                     // possible attributes, they also have a (callable) `__set__` method. The
@@ -2067,12 +2299,15 @@ impl<'db> ClassLiteral<'db> {
                 }
 
                 let is_kw_only = name == "__replace__"
-                    || kw_only.unwrap_or(has_dataclass_param(DataclassParams::KW_ONLY));
+                    || kw_only.unwrap_or(has_dataclass_param(DataclassFlags::KW_ONLY));
+
+                // Use the alias name if provided, otherwise use the field name
+                let parameter_name = alias.map(Name::new).unwrap_or(field_name);
 
                 let mut parameter = if is_kw_only {
-                    Parameter::keyword_only(field_name)
+                    Parameter::keyword_only(parameter_name)
                 } else {
-                    Parameter::positional_or_keyword(field_name)
+                    Parameter::positional_or_keyword(parameter_name)
                 }
                 .with_annotated_type(field_ty);
 
@@ -2092,19 +2327,20 @@ impl<'db> ClassLiteral<'db> {
             // so that the keyword-only parameters appear after positional parameters.
             parameters.sort_by_key(Parameter::is_keyword_only);
 
-            let mut signature = Signature::new(Parameters::new(parameters), return_ty);
-            signature.inherited_generic_context = self.generic_context(db);
+            let signature = match name {
+                "__new__" | "__init__" => Signature::new_generic(
+                    self.inherited_generic_context(db),
+                    Parameters::new(parameters),
+                    return_ty,
+                ),
+                _ => Signature::new(Parameters::new(parameters), return_ty),
+            };
             Some(CallableType::function_like(db, signature))
         };
 
         match (field_policy, name) {
-            (CodeGeneratorKind::DataclassLike, "__init__") => {
-                let has_synthesized_dunder_init = has_dataclass_param(DataclassParams::INIT)
-                    || self
-                        .try_metaclass(db)
-                        .is_ok_and(|(_, transformer_params)| transformer_params.is_some());
-
-                if !has_synthesized_dunder_init {
+            (CodeGeneratorKind::DataclassLike(_), "__init__") => {
+                if !has_dataclass_param(DataclassFlags::INIT) {
                     return None;
                 }
 
@@ -2118,8 +2354,8 @@ impl<'db> ClassLiteral<'db> {
                     .with_annotated_type(KnownClass::Type.to_instance(db));
                 signature_from_fields(vec![cls_parameter], Some(Type::none(db)))
             }
-            (CodeGeneratorKind::DataclassLike, "__lt__" | "__le__" | "__gt__" | "__ge__") => {
-                if !has_dataclass_param(DataclassParams::ORDER) {
+            (CodeGeneratorKind::DataclassLike(_), "__lt__" | "__le__" | "__gt__" | "__ge__") => {
+                if !has_dataclass_param(DataclassFlags::ORDER) {
                     return None;
                 }
 
@@ -2140,12 +2376,28 @@ impl<'db> ClassLiteral<'db> {
             (CodeGeneratorKind::NamedTuple, name) if name != "__init__" => {
                 KnownClass::NamedTupleFallback
                     .to_class_literal(db)
-                    .into_class_literal()?
-                    .own_class_member(db, self.generic_context(db), None, name)
-                    .place
-                    .ignore_possibly_unbound()
+                    .as_class_literal()?
+                    .own_class_member(db, self.inherited_generic_context(db), None, name)
+                    .ignore_possibly_undefined()
+                    .map(|ty| {
+                        ty.apply_type_mapping(
+                            db,
+                            &TypeMapping::ReplaceSelf {
+                                new_upper_bound: determine_upper_bound(
+                                    db,
+                                    self,
+                                    specialization,
+                                    |base| {
+                                        base.into_class()
+                                            .is_some_and(|c| c.is_known(db, KnownClass::Tuple))
+                                    },
+                                ),
+                            },
+                            TypeContext::default(),
+                        )
+                    })
             }
-            (CodeGeneratorKind::DataclassLike, "__replace__")
+            (CodeGeneratorKind::DataclassLike(_), "__replace__")
                 if Program::get(db).python_version(db) >= PythonVersion::PY313 =>
             {
                 let self_parameter = Parameter::positional_or_keyword(Name::new_static("self"))
@@ -2153,8 +2405,8 @@ impl<'db> ClassLiteral<'db> {
 
                 signature_from_fields(vec![self_parameter], Some(instance_ty))
             }
-            (CodeGeneratorKind::DataclassLike, "__setattr__") => {
-                if has_dataclass_param(DataclassParams::FROZEN) {
+            (CodeGeneratorKind::DataclassLike(_), "__setattr__") => {
+                if has_dataclass_param(DataclassFlags::FROZEN) {
                     let signature = Signature::new(
                         Parameters::new([
                             Parameter::positional_or_keyword(Name::new_static("self"))
@@ -2169,11 +2421,46 @@ impl<'db> ClassLiteral<'db> {
                 }
                 None
             }
+            (CodeGeneratorKind::DataclassLike(_), "__slots__") => {
+                has_dataclass_param(DataclassFlags::SLOTS).then(|| {
+                    let fields = self.fields(db, specialization, field_policy);
+                    let slots = fields.keys().map(|name| Type::string_literal(db, name));
+                    Type::heterogeneous_tuple(db, slots)
+                })
+            }
             (CodeGeneratorKind::TypedDict, "__setitem__") => {
                 let fields = self.fields(db, specialization, field_policy);
 
-                // Add (key type, value type) overloads for all TypedDict items ("fields"):
-                let overloads = fields.iter().map(|(name, field)| {
+                // Add (key type, value type) overloads for all TypedDict items ("fields") that are not read-only:
+
+                let mut writeable_fields = fields
+                    .iter()
+                    .filter(|(_, field)| !field.is_read_only())
+                    .peekable();
+
+                if writeable_fields.peek().is_none() {
+                    // If there are no writeable fields, synthesize a `__setitem__` that takes
+                    // a `key` of type `Never` to signal that no keys are accepted. This leads
+                    // to slightly more user-friendly error messages compared to returning an
+                    // empty overload set.
+                    return Some(Type::Callable(CallableType::new(
+                        db,
+                        CallableSignature::single(Signature::new(
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(Type::Never),
+                                Parameter::positional_only(Some(Name::new_static("value")))
+                                    .with_annotated_type(Type::any()),
+                            ]),
+                            Some(Type::none(db)),
+                        )),
+                        true,
+                    )));
+                }
+
+                let overloads = writeable_fields.map(|(name, field)| {
                     let key_type = Type::StringLiteral(StringLiteralType::new(db, name.as_str()));
 
                     Signature::new(
@@ -2220,49 +2507,179 @@ impl<'db> ClassLiteral<'db> {
                 )))
             }
             (CodeGeneratorKind::TypedDict, "get") => {
-                // TODO: synthesize a set of overloads with precise types
-                let signature = Signature::new(
-                    Parameters::new([
-                        Parameter::positional_only(Some(Name::new_static("self")))
-                            .with_annotated_type(instance_ty),
-                        Parameter::positional_only(Some(Name::new_static("key"))),
-                        Parameter::positional_only(Some(Name::new_static("default")))
-                            .with_default_type(Type::unknown()),
-                    ]),
-                    Some(todo_type!("Support for `TypedDict`")),
-                );
+                let overloads = self
+                    .fields(db, specialization, field_policy)
+                    .into_iter()
+                    .flat_map(|(name, field)| {
+                        let key_type =
+                            Type::StringLiteral(StringLiteralType::new(db, name.as_str()));
 
-                Some(CallableType::function_like(db, signature))
+                        // For a required key, `.get()` always returns the value type. For a non-required key,
+                        // `.get()` returns the union of the value type and the type of the default argument
+                        // (which defaults to `None`).
+
+                        // TODO: For now, we use two overloads here. They can be merged into a single function
+                        // once the generics solver takes default arguments into account.
+
+                        let get_sig = Signature::new(
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(key_type),
+                            ]),
+                            Some(if field.is_required() {
+                                field.declared_ty
+                            } else {
+                                UnionType::from_elements(db, [field.declared_ty, Type::none(db)])
+                            }),
+                        );
+
+                        let t_default =
+                            BoundTypeVarInstance::synthetic(db, "T", TypeVarVariance::Covariant);
+
+                        let get_with_default_sig = Signature::new_generic(
+                            Some(GenericContext::from_typevar_instances(db, [t_default])),
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(key_type),
+                                Parameter::positional_only(Some(Name::new_static("default")))
+                                    .with_annotated_type(Type::TypeVar(t_default)),
+                            ]),
+                            Some(if field.is_required() {
+                                field.declared_ty
+                            } else {
+                                UnionType::from_elements(
+                                    db,
+                                    [field.declared_ty, Type::TypeVar(t_default)],
+                                )
+                            }),
+                        );
+
+                        [get_sig, get_with_default_sig]
+                    })
+                    // Fallback overloads for unknown keys
+                    .chain(std::iter::once({
+                        Signature::new(
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(KnownClass::Str.to_instance(db)),
+                            ]),
+                            Some(UnionType::from_elements(
+                                db,
+                                [Type::unknown(), Type::none(db)],
+                            )),
+                        )
+                    }))
+                    .chain(std::iter::once({
+                        let t_default =
+                            BoundTypeVarInstance::synthetic(db, "T", TypeVarVariance::Covariant);
+
+                        Signature::new_generic(
+                            Some(GenericContext::from_typevar_instances(db, [t_default])),
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(KnownClass::Str.to_instance(db)),
+                                Parameter::positional_only(Some(Name::new_static("default")))
+                                    .with_annotated_type(Type::TypeVar(t_default)),
+                            ]),
+                            Some(UnionType::from_elements(
+                                db,
+                                [Type::unknown(), Type::TypeVar(t_default)],
+                            )),
+                        )
+                    }));
+
+                Some(Type::Callable(CallableType::new(
+                    db,
+                    CallableSignature::from_overloads(overloads),
+                    true,
+                )))
             }
             (CodeGeneratorKind::TypedDict, "pop") => {
-                // TODO: synthesize a set of overloads with precise types.
-                // Required keys should be forbidden to be popped.
-                let signature = Signature::new(
-                    Parameters::new([
-                        Parameter::positional_only(Some(Name::new_static("self")))
-                            .with_annotated_type(instance_ty),
-                        Parameter::positional_only(Some(Name::new_static("key"))),
-                        Parameter::positional_only(Some(Name::new_static("default")))
-                            .with_default_type(Type::unknown()),
-                    ]),
-                    Some(todo_type!("Support for `TypedDict`")),
-                );
+                let fields = self.fields(db, specialization, field_policy);
+                let overloads = fields
+                    .iter()
+                    .filter(|(_, field)| {
+                        // Only synthesize `pop` for fields that are not required.
+                        !field.is_required()
+                    })
+                    .flat_map(|(name, field)| {
+                        let key_type =
+                            Type::StringLiteral(StringLiteralType::new(db, name.as_str()));
 
-                Some(CallableType::function_like(db, signature))
+                        // TODO: Similar to above: consider merging these two overloads into one
+
+                        // `.pop()` without default
+                        let pop_sig = Signature::new(
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(key_type),
+                            ]),
+                            Some(field.declared_ty),
+                        );
+
+                        // `.pop()` with a default value
+                        let t_default =
+                            BoundTypeVarInstance::synthetic(db, "T", TypeVarVariance::Covariant);
+
+                        let pop_with_default_sig = Signature::new_generic(
+                            Some(GenericContext::from_typevar_instances(db, [t_default])),
+                            Parameters::new([
+                                Parameter::positional_only(Some(Name::new_static("self")))
+                                    .with_annotated_type(instance_ty),
+                                Parameter::positional_only(Some(Name::new_static("key")))
+                                    .with_annotated_type(key_type),
+                                Parameter::positional_only(Some(Name::new_static("default")))
+                                    .with_annotated_type(Type::TypeVar(t_default)),
+                            ]),
+                            Some(UnionType::from_elements(
+                                db,
+                                [field.declared_ty, Type::TypeVar(t_default)],
+                            )),
+                        );
+
+                        [pop_sig, pop_with_default_sig]
+                    });
+
+                Some(Type::Callable(CallableType::new(
+                    db,
+                    CallableSignature::from_overloads(overloads),
+                    true,
+                )))
             }
             (CodeGeneratorKind::TypedDict, "setdefault") => {
-                // TODO: synthesize a set of overloads with precise types
-                let signature = Signature::new(
-                    Parameters::new([
-                        Parameter::positional_only(Some(Name::new_static("self")))
-                            .with_annotated_type(instance_ty),
-                        Parameter::positional_only(Some(Name::new_static("key"))),
-                        Parameter::positional_only(Some(Name::new_static("default"))),
-                    ]),
-                    Some(todo_type!("Support for `TypedDict`")),
-                );
+                let fields = self.fields(db, specialization, field_policy);
+                let overloads = fields.iter().map(|(name, field)| {
+                    let key_type = Type::StringLiteral(StringLiteralType::new(db, name.as_str()));
 
-                Some(CallableType::function_like(db, signature))
+                    // `setdefault` always returns the field type
+                    Signature::new(
+                        Parameters::new([
+                            Parameter::positional_only(Some(Name::new_static("self")))
+                                .with_annotated_type(instance_ty),
+                            Parameter::positional_only(Some(Name::new_static("key")))
+                                .with_annotated_type(key_type),
+                            Parameter::positional_only(Some(Name::new_static("default")))
+                                .with_annotated_type(field.declared_ty),
+                        ]),
+                        Some(field.declared_ty),
+                    )
+                });
+
+                Some(Type::Callable(CallableType::new(
+                    db,
+                    CallableSignature::from_overloads(overloads),
+                    true,
+                )))
             }
             (CodeGeneratorKind::TypedDict, "update") => {
                 // TODO: synthesize a set of overloads with precise types
@@ -2301,6 +2718,20 @@ impl<'db> ClassLiteral<'db> {
                 .to_class_literal(db)
                 .find_name_in_mro_with_policy(db, name, policy)
                 .expect("`find_name_in_mro_with_policy` will return `Some()` when called on class literal")
+                .map_type(|ty|
+                    ty.apply_type_mapping(
+                        db,
+                        &TypeMapping::ReplaceSelf {
+                            new_upper_bound: determine_upper_bound(
+                                db,
+                                self,
+                                specialization,
+                                ClassBase::is_typed_dict
+                            )
+                        },
+                                TypeContext::default(),
+                    )
+                )
         }
     }
 
@@ -2316,7 +2747,7 @@ impl<'db> ClassLiteral<'db> {
         if field_policy == CodeGeneratorKind::NamedTuple {
             // NamedTuples do not allow multiple inheritance, so it is sufficient to enumerate the
             // fields of this class only.
-            return self.own_fields(db, specialization);
+            return self.own_fields(db, specialization, field_policy);
         }
 
         let matching_classes_in_mro: Vec<_> = self
@@ -2324,7 +2755,7 @@ impl<'db> ClassLiteral<'db> {
             .filter_map(|superclass| {
                 if let Some(class) = superclass.into_class() {
                     let (class_literal, specialization) = class.class_literal(db);
-                    if field_policy.matches(db, class_literal) {
+                    if field_policy.matches(db, class_literal, specialization) {
                         Some((class_literal, specialization))
                     } else {
                         None
@@ -2339,7 +2770,7 @@ impl<'db> ClassLiteral<'db> {
         matching_classes_in_mro
             .into_iter()
             .rev()
-            .flat_map(|(class, specialization)| class.own_fields(db, specialization))
+            .flat_map(|(class, specialization)| class.own_fields(db, specialization, field_policy))
             // We collect into a FxOrderMap here to deduplicate attributes
             .collect()
     }
@@ -2359,6 +2790,7 @@ impl<'db> ClassLiteral<'db> {
         self,
         db: &'db dyn Db,
         specialization: Option<Specialization<'db>>,
+        field_policy: CodeGeneratorKind,
     ) -> FxOrderMap<Name, Field<'db>> {
         let mut attributes = FxOrderMap::default();
 
@@ -2366,7 +2798,10 @@ impl<'db> ClassLiteral<'db> {
         let table = place_table(db, class_body_scope);
 
         let use_def = use_def_map(db, class_body_scope);
+
+        let typed_dict_params = self.typed_dict_params(db);
         let mut kw_only_sentinel_field_seen = false;
+
         for (symbol_id, declarations) in use_def.all_end_of_scope_symbol_declarations() {
             // Here, we exclude all declarations that are not annotated assignments. We need this because
             // things like function definitions and nested classes would otherwise be considered dataclass
@@ -2391,25 +2826,28 @@ impl<'db> ClassLiteral<'db> {
 
             let symbol = table.symbol(symbol_id);
 
-            let attr = place_from_declarations(db, declarations).ignore_conflicting_declarations();
+            let result = place_from_declarations(db, declarations.clone());
+            let single_declaration = result.single_declaration;
+            let attr = result.ignore_conflicting_declarations();
             if attr.is_class_var() {
                 continue;
             }
 
-            if let Some(attr_ty) = attr.place.ignore_possibly_unbound() {
+            if let Some(attr_ty) = attr.place.ignore_possibly_undefined() {
                 let bindings = use_def.end_of_scope_symbol_bindings(symbol_id);
-                let mut default_ty = place_from_bindings(db, bindings).ignore_possibly_unbound();
+                let mut default_ty = place_from_bindings(db, bindings).ignore_possibly_undefined();
 
                 default_ty =
                     default_ty.map(|ty| ty.apply_optional_specialization(db, specialization));
 
                 let mut init = true;
                 let mut kw_only = None;
+                let mut alias = None;
                 if let Some(Type::KnownInstance(KnownInstanceType::Field(field))) = default_ty {
-                    default_ty = Some(field.default_type(db));
+                    default_ty = field.default_type(db);
                     if self
                         .dataclass_params(db)
-                        .map(|params| params.contains(DataclassParams::NO_FIELD_SPECIFIERS))
+                        .map(|params| params.field_specifiers(db).is_empty())
                         .unwrap_or(false)
                     {
                         // This happens when constructing a `dataclass` with a `dataclass_transform`
@@ -2418,15 +2856,44 @@ impl<'db> ClassLiteral<'db> {
                     } else {
                         init = field.init(db);
                         kw_only = field.kw_only(db);
+                        alias = field.alias(db);
                     }
                 }
 
+                let kind = match field_policy {
+                    CodeGeneratorKind::NamedTuple => FieldKind::NamedTuple { default_ty },
+                    CodeGeneratorKind::DataclassLike(_) => FieldKind::Dataclass {
+                        default_ty,
+                        init_only: attr.is_init_var(),
+                        init,
+                        kw_only,
+                        alias,
+                    },
+                    CodeGeneratorKind::TypedDict => {
+                        let is_required = if attr.is_required() {
+                            // Explicit Required[T] annotation - always required
+                            true
+                        } else if attr.is_not_required() {
+                            // Explicit NotRequired[T] annotation - never required
+                            false
+                        } else {
+                            // No explicit qualifier - use class default (`total` parameter)
+                            typed_dict_params
+                                .expect("TypedDictParams should be available for CodeGeneratorKind::TypedDict")
+                                .contains(TypedDictParams::TOTAL)
+                        };
+
+                        FieldKind::TypedDict {
+                            is_required,
+                            is_read_only: attr.is_read_only(),
+                        }
+                    }
+                };
+
                 let mut field = Field {
                     declared_ty: attr_ty.apply_optional_specialization(db, specialization),
-                    default_ty,
-                    init_only: attr.is_init_var(),
-                    init,
-                    kw_only,
+                    kind,
+                    single_declaration,
                 };
 
                 // Check if this is a KW_ONLY sentinel and mark subsequent fields as keyword-only
@@ -2435,8 +2902,14 @@ impl<'db> ClassLiteral<'db> {
                 }
 
                 // If no explicit kw_only setting and we've seen KW_ONLY sentinel, mark as keyword-only
-                if field.kw_only.is_none() && kw_only_sentinel_field_seen {
-                    field.kw_only = Some(true);
+                if kw_only_sentinel_field_seen {
+                    if let FieldKind::Dataclass {
+                        kw_only: ref mut kw @ None,
+                        ..
+                    } = field.kind
+                    {
+                        *kw = Some(true);
+                    }
                 }
 
                 attributes.insert(symbol.name().clone(), field);
@@ -2456,11 +2929,12 @@ impl<'db> ClassLiteral<'db> {
         name: &str,
     ) -> PlaceAndQualifiers<'db> {
         if self.is_typed_dict(db) {
-            return Place::Unbound.into();
+            return Place::Undefined.into();
         }
 
         let mut union = UnionBuilder::new(db);
         let mut union_qualifiers = TypeQualifiers::empty();
+        let mut is_definitely_bound = false;
 
         for superclass in self.iter_mro(db, specialization) {
             match superclass {
@@ -2474,43 +2948,60 @@ impl<'db> ClassLiteral<'db> {
                 }
                 ClassBase::Class(class) => {
                     if let member @ PlaceAndQualifiers {
-                        place: Place::Type(ty, boundness),
+                        place: Place::Defined(ty, origin, boundness),
                         qualifiers,
-                    } = class.own_instance_member(db, name)
+                    } = class.own_instance_member(db, name).inner
                     {
-                        // TODO: We could raise a diagnostic here if there are conflicting type qualifiers
-                        union_qualifiers |= qualifiers;
-
-                        if boundness == Boundness::Bound {
-                            if union.is_empty() {
-                                // Short-circuit, no need to allocate inside the union builder
+                        if boundness == Definedness::AlwaysDefined {
+                            if origin.is_declared() {
+                                // We found a definitely-declared attribute. Discard possibly collected
+                                // inferred types from subclasses and return the declared type.
                                 return member;
                             }
 
-                            return Place::bound(union.add(ty).build())
-                                .with_qualifiers(union_qualifiers);
+                            is_definitely_bound = true;
                         }
 
-                        // If we see a possibly-unbound symbol, we need to keep looking
-                        // higher up in the MRO.
+                        // If the attribute is not definitely declared on this class, keep looking higher
+                        // up in the MRO, and build a union of all inferred types (and possibly-declared
+                        // types):
                         union = union.add(ty);
+
+                        // TODO: We could raise a diagnostic here if there are conflicting type qualifiers
+                        union_qualifiers |= qualifiers;
                     }
                 }
                 ClassBase::TypedDict => {
                     return KnownClass::TypedDictFallback
                         .to_instance(db)
-                        .instance_member(db, name);
+                        .instance_member(db, name)
+                        .map_type(|ty| {
+                            ty.apply_type_mapping(
+                                db,
+                                &TypeMapping::ReplaceSelf {
+                                    new_upper_bound: Type::instance(
+                                        db,
+                                        self.unknown_specialization(db),
+                                    ),
+                                },
+                                TypeContext::default(),
+                            )
+                        });
                 }
             }
         }
 
         if union.is_empty() {
-            Place::Unbound.with_qualifiers(TypeQualifiers::empty())
+            Place::Undefined.with_qualifiers(TypeQualifiers::empty())
         } else {
-            // If we have reached this point, we know that we have only seen possibly-unbound places.
-            // This means that the final result is still possibly-unbound.
+            let boundness = if is_definitely_bound {
+                Definedness::AlwaysDefined
+            } else {
+                Definedness::PossiblyUndefined
+            };
 
-            Place::Type(union.build(), Boundness::PossiblyUnbound).with_qualifiers(union_qualifiers)
+            Place::Defined(union.build(), TypeOrigin::Inferred, boundness)
+                .with_qualifiers(union_qualifiers)
         }
     }
 
@@ -2523,7 +3014,7 @@ impl<'db> ClassLiteral<'db> {
         class_body_scope: ScopeId<'db>,
         name: &str,
         target_method_decorator: MethodDecorator,
-    ) -> PlaceAndQualifiers<'db> {
+    ) -> Member<'db> {
         Self::implicit_attribute_inner(
             db,
             class_body_scope,
@@ -2532,9 +3023,7 @@ impl<'db> ClassLiteral<'db> {
         )
     }
 
-    #[salsa::tracked(
-        cycle_fn=implicit_attribute_recover,
-        cycle_initial=implicit_attribute_initial,
+    #[salsa::tracked(cycle_initial=implicit_attribute_initial,
         heap_size=ruff_memory_usage::heap_size,
     )]
     fn implicit_attribute_inner(
@@ -2542,13 +3031,13 @@ impl<'db> ClassLiteral<'db> {
         class_body_scope: ScopeId<'db>,
         name: String,
         target_method_decorator: MethodDecorator,
-    ) -> PlaceAndQualifiers<'db> {
+    ) -> Member<'db> {
         // If we do not see any declarations of an attribute, neither in the class body nor in
         // any method, we build a union of `Unknown` with the inferred types of all bindings of
         // that attribute. We include `Unknown` in that union to account for the fact that the
         // attribute might be externally modified.
         let mut union_of_inferred_types = UnionBuilder::new(db);
-        let mut qualifiers = TypeQualifiers::empty();
+        let mut qualifiers = TypeQualifiers::IMPLICIT_INSTANCE_ATTRIBUTE;
 
         let mut is_attribute_bound = false;
 
@@ -2558,11 +3047,14 @@ impl<'db> ClassLiteral<'db> {
         let class_map = use_def_map(db, class_body_scope);
         let class_table = place_table(db, class_body_scope);
 
-        let is_valid_scope = |method_scope: ScopeId<'db>| {
-            if let Some(method_def) = method_scope.node(db).as_function(&module) {
-                let method_name = method_def.name.as_str();
-                if let Place::Type(Type::FunctionLiteral(method_type), _) =
-                    class_symbol(db, class_body_scope, method_name).place
+        let is_valid_scope = |method_scope: &Scope| {
+            if let Some(method_def) = method_scope.node().as_function() {
+                let method_name = method_def.node(&module).name.as_str();
+                if let Some(Type::FunctionLiteral(method_type)) =
+                    class_member(db, class_body_scope, method_name)
+                        .inner
+                        .place
+                        .ignore_possibly_undefined()
                 {
                     let method_decorator = MethodDecorator::try_from_fn_type(db, method_type);
                     if method_decorator != Ok(target_method_decorator) {
@@ -2577,7 +3069,7 @@ impl<'db> ClassLiteral<'db> {
         for (attribute_declarations, method_scope_id) in
             attribute_declarations(db, class_body_scope, &name)
         {
-            let method_scope = method_scope_id.to_scope_id(db, file);
+            let method_scope = index.scope(method_scope_id);
             if !is_valid_scope(method_scope) {
                 continue;
             }
@@ -2598,16 +3090,10 @@ impl<'db> ClassLiteral<'db> {
                 //     self.name: <annotation>
                 //     self.name: <annotation> = …
 
-                if use_def_map(db, method_scope)
-                    .is_declaration_reachable(db, &attribute_declaration)
-                    .is_always_false()
-                {
-                    continue;
-                }
-
                 let annotation = declaration_type(db, declaration);
-                let annotation =
-                    Place::bound(annotation.inner).with_qualifiers(annotation.qualifiers);
+                let annotation = Place::declared(annotation.inner).with_qualifiers(
+                    annotation.qualifiers | TypeQualifiers::IMPLICIT_INSTANCE_ATTRIBUTE,
+                );
 
                 if let Some(all_qualifiers) = annotation.is_bare_final() {
                     if let Some(value) = assignment.value(&module) {
@@ -2615,8 +3101,14 @@ impl<'db> ClassLiteral<'db> {
                         // `self.SOME_CONSTANT: Final = 1`, infer the type from the value
                         // on the right-hand side.
 
-                        let inferred_ty = infer_expression_type(db, index.expression(value));
-                        return Place::bound(inferred_ty).with_qualifiers(all_qualifiers);
+                        let inferred_ty = infer_expression_type(
+                            db,
+                            index.expression(value),
+                            TypeContext::default(),
+                        );
+                        return Member {
+                            inner: Place::bound(inferred_ty).with_qualifiers(all_qualifiers),
+                        };
                     }
 
                     // If there is no right-hand side, just record that we saw a `Final` qualifier
@@ -2624,7 +3116,7 @@ impl<'db> ClassLiteral<'db> {
                     continue;
                 }
 
-                return annotation;
+                return Member { inner: annotation };
             }
         }
 
@@ -2635,75 +3127,41 @@ impl<'db> ClassLiteral<'db> {
         for (attribute_assignments, method_scope_id) in
             attribute_assignments(db, class_body_scope, &name)
         {
-            let method_scope = method_scope_id.to_scope_id(db, file);
+            let method_scope = index.scope(method_scope_id);
             if !is_valid_scope(method_scope) {
                 continue;
             }
 
-            let method_map = use_def_map(db, method_scope);
-
             // The attribute assignment inherits the reachability of the method which contains it
-            let is_method_reachable =
-                if let Some(method_def) = method_scope.node(db).as_function(&module) {
-                    let method = index.expect_single_definition(method_def);
-                    let method_place = class_table.symbol_id(&method_def.name).unwrap();
-                    class_map
-                        .all_reachable_symbol_bindings(method_place)
-                        .find_map(|bind| {
-                            (bind.binding.is_defined_and(|def| def == method))
-                                .then(|| class_map.is_binding_reachable(db, &bind))
-                        })
-                        .unwrap_or(Truthiness::AlwaysFalse)
-                } else {
-                    Truthiness::AlwaysFalse
-                };
+            let is_method_reachable = if let Some(method_def) = method_scope.node().as_function() {
+                let method = index.expect_single_definition(method_def);
+                let method_place = class_table
+                    .symbol_id(&method_def.node(&module).name)
+                    .unwrap();
+                class_map
+                    .all_reachable_symbol_bindings(method_place)
+                    .find_map(|bind| {
+                        (bind.binding.is_defined_and(|def| def == method))
+                            .then(|| class_map.binding_reachability(db, &bind))
+                    })
+                    .unwrap_or(Truthiness::AlwaysFalse)
+            } else {
+                Truthiness::AlwaysFalse
+            };
             if is_method_reachable.is_always_false() {
                 continue;
             }
 
-            // Storage for the implicit `DefinitionState::Undefined` binding. If present, it
-            // will be the first binding in the `attribute_assignments` iterator.
-            let mut unbound_binding = None;
-
             for attribute_assignment in attribute_assignments {
                 if let DefinitionState::Undefined = attribute_assignment.binding {
-                    // Store the implicit unbound binding here so that we can delay the
-                    // computation of `unbound_reachability` to the point when we actually
-                    // need it. This is an optimization for the common case where the
-                    // `unbound` binding is the only binding of the `name` attribute,
-                    // i.e. if there is no `self.name = …` assignment in this method.
-                    unbound_binding = Some(attribute_assignment);
                     continue;
                 }
 
                 let DefinitionState::Defined(binding) = attribute_assignment.binding else {
                     continue;
                 };
-                match method_map
-                    .is_binding_reachable(db, &attribute_assignment)
-                    .and(is_method_reachable)
-                {
-                    Truthiness::AlwaysTrue | Truthiness::Ambiguous => {
-                        is_attribute_bound = true;
-                    }
-                    Truthiness::AlwaysFalse => {
-                        continue;
-                    }
-                }
 
-                // There is at least one attribute assignment that may be reachable, so if `unbound_reachability` is
-                // always false then this attribute is considered bound.
-                // TODO: this is incomplete logic since the attributes bound after termination are considered reachable.
-                let unbound_reachability = unbound_binding
-                    .as_ref()
-                    .map(|binding| method_map.is_binding_reachable(db, binding))
-                    .unwrap_or(Truthiness::AlwaysFalse);
-
-                if unbound_reachability
-                    .negate()
-                    .and(is_method_reachable)
-                    .is_always_true()
-                {
+                if !is_method_reachable.is_always_false() {
                     is_attribute_bound = true;
                 }
 
@@ -2736,6 +3194,7 @@ impl<'db> ClassLiteral<'db> {
                                 let inferred_ty = infer_expression_type(
                                     db,
                                     index.expression(assign.value(&module)),
+                                    TypeContext::default(),
                                 );
 
                                 union_of_inferred_types = union_of_inferred_types.add(inferred_ty);
@@ -2763,6 +3222,7 @@ impl<'db> ClassLiteral<'db> {
                                 let iterable_ty = infer_expression_type(
                                     db,
                                     index.expression(for_stmt.iterable(&module)),
+                                    TypeContext::default(),
                                 );
                                 // TODO: Potential diagnostics resulting from the iterable are currently not reported.
                                 let inferred_ty =
@@ -2793,6 +3253,7 @@ impl<'db> ClassLiteral<'db> {
                                 let context_ty = infer_expression_type(
                                     db,
                                     index.expression(with_item.context_expr(&module)),
+                                    TypeContext::default(),
                                 );
                                 let inferred_ty = if with_item.is_async() {
                                     context_ty.aenter(db)
@@ -2826,6 +3287,7 @@ impl<'db> ClassLiteral<'db> {
                                 let iterable_ty = infer_expression_type(
                                     db,
                                     index.expression(comprehension.iterable(&module)),
+                                    TypeContext::default(),
                                 );
                                 // TODO: Potential diagnostics resulting from the iterable are currently not reported.
                                 let inferred_ty =
@@ -2846,20 +3308,18 @@ impl<'db> ClassLiteral<'db> {
             }
         }
 
-        if is_attribute_bound {
-            Place::bound(union_of_inferred_types.build()).with_qualifiers(qualifiers)
-        } else {
-            Place::Unbound.with_qualifiers(qualifiers)
+        Member {
+            inner: if is_attribute_bound {
+                Place::bound(union_of_inferred_types.build()).with_qualifiers(qualifiers)
+            } else {
+                Place::Undefined.with_qualifiers(qualifiers)
+            },
         }
     }
 
     /// A helper function for `instance_member` that looks up the `name` attribute only on
     /// this class, not on its superclasses.
-    pub(crate) fn own_instance_member(
-        self,
-        db: &'db dyn Db,
-        name: &str,
-    ) -> PlaceAndQualifiers<'db> {
+    fn own_instance_member(self, db: &'db dyn Db, name: &str) -> Member<'db> {
         // TODO: There are many things that are not yet implemented here:
         // - `typing.Final`
         // - Proper diagnostics
@@ -2876,23 +3336,22 @@ impl<'db> ClassLiteral<'db> {
 
             match declared_and_qualifiers {
                 PlaceAndQualifiers {
-                    place: mut declared @ Place::Type(declared_ty, declaredness),
+                    place: mut declared @ Place::Defined(declared_ty, _, declaredness),
                     qualifiers,
                 } => {
                     // For the purpose of finding instance attributes, ignore `ClassVar`
                     // declarations:
                     if qualifiers.contains(TypeQualifiers::CLASS_VAR) {
-                        declared = Place::Unbound;
+                        declared = Place::Undefined;
                     }
 
                     if qualifiers.contains(TypeQualifiers::INIT_VAR) {
                         // We ignore `InitVar` declarations on the class body, unless that attribute is overwritten
                         // by an implicit assignment in a method
                         if Self::implicit_attribute(db, body_scope, name, MethodDecorator::None)
-                            .place
-                            .is_unbound()
+                            .is_undefined()
                         {
-                            return Place::Unbound.into();
+                            return Member::unbound();
                         }
                     }
 
@@ -2900,27 +3359,31 @@ impl<'db> ClassLiteral<'db> {
 
                     let bindings = use_def.end_of_scope_symbol_bindings(symbol_id);
                     let inferred = place_from_bindings(db, bindings);
-                    let has_binding = !inferred.is_unbound();
+                    let has_binding = !inferred.is_undefined();
 
                     if has_binding {
                         // The attribute is declared and bound in the class body.
 
                         if let Some(implicit_ty) =
                             Self::implicit_attribute(db, body_scope, name, MethodDecorator::None)
-                                .place
-                                .ignore_possibly_unbound()
+                                .ignore_possibly_undefined()
                         {
-                            if declaredness == Boundness::Bound {
+                            if declaredness == Definedness::AlwaysDefined {
                                 // If a symbol is definitely declared, and we see
                                 // attribute assignments in methods of the class,
                                 // we trust the declared type.
-                                declared.with_qualifiers(qualifiers)
+                                Member {
+                                    inner: declared.with_qualifiers(qualifiers),
+                                }
                             } else {
-                                Place::Type(
-                                    UnionType::from_elements(db, [declared_ty, implicit_ty]),
-                                    declaredness,
-                                )
-                                .with_qualifiers(qualifiers)
+                                Member {
+                                    inner: Place::Defined(
+                                        UnionType::from_elements(db, [declared_ty, implicit_ty]),
+                                        TypeOrigin::Declared,
+                                        declaredness,
+                                    )
+                                    .with_qualifiers(qualifiers),
+                                }
                             }
                         } else {
                             // The symbol is declared and bound in the class body,
@@ -2929,7 +3392,7 @@ impl<'db> ClassLiteral<'db> {
                             // has a class-level default value, but it would not be
                             // found in a `__dict__` lookup.
 
-                            Place::Unbound.into()
+                            Member::unbound()
                         }
                     } else {
                         // The attribute is declared but not bound in the class body.
@@ -2938,8 +3401,10 @@ impl<'db> ClassLiteral<'db> {
                         // it is possibly-undeclared. In the latter case, we also
                         // union with the inferred type from attribute assignments.
 
-                        if declaredness == Boundness::Bound {
-                            declared.with_qualifiers(qualifiers)
+                        if declaredness == Definedness::AlwaysDefined {
+                            Member {
+                                inner: declared.with_qualifiers(qualifiers),
+                            }
                         } else {
                             if let Some(implicit_ty) = Self::implicit_attribute(
                                 db,
@@ -2947,23 +3412,29 @@ impl<'db> ClassLiteral<'db> {
                                 name,
                                 MethodDecorator::None,
                             )
+                            .inner
                             .place
-                            .ignore_possibly_unbound()
+                            .ignore_possibly_undefined()
                             {
-                                Place::Type(
-                                    UnionType::from_elements(db, [declared_ty, implicit_ty]),
-                                    declaredness,
-                                )
-                                .with_qualifiers(qualifiers)
+                                Member {
+                                    inner: Place::Defined(
+                                        UnionType::from_elements(db, [declared_ty, implicit_ty]),
+                                        TypeOrigin::Declared,
+                                        declaredness,
+                                    )
+                                    .with_qualifiers(qualifiers),
+                                }
                             } else {
-                                declared.with_qualifiers(qualifiers)
+                                Member {
+                                    inner: declared.with_qualifiers(qualifiers),
+                                }
                             }
                         }
                     }
                 }
 
                 PlaceAndQualifiers {
-                    place: Place::Unbound,
+                    place: Place::Undefined,
                     qualifiers: _,
                 } => {
                     // The attribute is not *declared* in the class body. It could still be declared/bound
@@ -2988,7 +3459,7 @@ impl<'db> ClassLiteral<'db> {
     ///
     /// A class definition like this will fail at runtime,
     /// but we must be resilient to it or we could panic.
-    #[salsa::tracked(cycle_fn=inheritance_cycle_recover, cycle_initial=inheritance_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(cycle_initial=inheritance_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(super) fn inheritance_cycle(self, db: &'db dyn Db) -> Option<InheritanceCycle> {
         /// Return `true` if the class is cyclically defined.
         ///
@@ -3053,7 +3524,7 @@ impl<'db> ClassLiteral<'db> {
     pub(super) fn header_range(self, db: &'db dyn Db) -> TextRange {
         let class_scope = self.body_scope(db);
         let module = parsed_module(db, class_scope.file(db)).load(db);
-        let class_node = class_scope.node(db).expect_class(&module);
+        let class_node = class_scope.node(db).expect_class().node(&module);
         let class_name = &class_node.name;
         TextRange::new(
             class_name.start(),
@@ -3064,54 +3535,6 @@ impl<'db> ClassLiteral<'db> {
                 .unwrap_or_else(|| class_name.end()),
         )
     }
-
-    pub(super) fn declarations_of_name(
-        self,
-        db: &'db dyn Db,
-        name: &str,
-        index: &'db SemanticIndex<'db>,
-    ) -> Option<impl Iterator<Item = DeclarationWithConstraint<'db>>> {
-        let class_body_scope = self.body_scope(db).file_scope_id(db);
-        let symbol_id = index.place_table(class_body_scope).symbol_id(name)?;
-        let use_def = index.use_def_map(class_body_scope);
-        Some(use_def.end_of_scope_declarations(ScopedPlaceId::Symbol(symbol_id)))
-    }
-
-    pub(super) fn first_declaration_of_name(
-        self,
-        db: &'db dyn Db,
-        name: &str,
-        index: &'db SemanticIndex<'db>,
-    ) -> Option<DeclarationWithConstraint<'db>> {
-        self.declarations_of_name(db, name, index)
-            .into_iter()
-            .flatten()
-            .next()
-    }
-
-    pub(super) fn bindings_of_name(
-        self,
-        db: &'db dyn Db,
-        name: &str,
-        index: &'db SemanticIndex<'db>,
-    ) -> Option<impl Iterator<Item = BindingWithConstraints<'db, 'db>>> {
-        let class_body_scope = self.body_scope(db).file_scope_id(db);
-        let symbol_id = index.place_table(class_body_scope).symbol_id(name)?;
-        let use_def = index.use_def_map(class_body_scope);
-        Some(use_def.end_of_scope_bindings(ScopedPlaceId::Symbol(symbol_id)))
-    }
-
-    pub(super) fn first_binding_of_name(
-        self,
-        db: &'db dyn Db,
-        name: &str,
-        index: &'db SemanticIndex<'db>,
-    ) -> Option<BindingWithConstraints<'db, 'db>> {
-        self.bindings_of_name(db, name, index)
-            .into_iter()
-            .flatten()
-            .next()
-    }
 }
 
 impl<'db> From<ClassLiteral<'db>> for Type<'db> {
@@ -3128,7 +3551,7 @@ impl<'db> From<ClassLiteral<'db>> for ClassType<'db> {
 
 #[salsa::tracked]
 impl<'db> VarianceInferable<'db> for ClassLiteral<'db> {
-    #[salsa::tracked(cycle_fn=crate::types::variance_cycle_recover, cycle_initial=crate::types::variance_cycle_initial)]
+    #[salsa::tracked(cycle_initial=crate::types::variance_cycle_initial)]
     fn variance_of(self, db: &'db dyn Db, typevar: BoundTypeVarInstance<'db>) -> TypeVarVariance {
         let typevar_in_generic_context = self
             .generic_context(db)
@@ -3148,7 +3571,7 @@ impl<'db> VarianceInferable<'db> for ClassLiteral<'db> {
             .map(|class| class.variance_of(db, typevar));
 
         let default_attribute_variance = {
-            let is_namedtuple = CodeGeneratorKind::NamedTuple.matches(db, self);
+            let is_namedtuple = CodeGeneratorKind::NamedTuple.matches(db, self, None);
             // Python 3.13 introduced a synthesized `__replace__` method on dataclasses which uses
             // their field types in contravariant position, thus meaning a frozen dataclass must
             // still be invariant in its field types. Other synthesized methods on dataclasses are
@@ -3158,7 +3581,7 @@ impl<'db> VarianceInferable<'db> for ClassLiteral<'db> {
             let is_frozen_dataclass = Program::get(db).python_version(db) <= PythonVersion::PY312
                 && self
                     .dataclass_params(db)
-                    .is_some_and(|params| params.contains(DataclassParams::FROZEN));
+                    .is_some_and(|params| params.flags(db).contains(DataclassFlags::FROZEN));
             if is_namedtuple || is_frozen_dataclass {
                 TypeVarVariance::Covariant
             } else {
@@ -3209,13 +3632,13 @@ impl<'db> VarianceInferable<'db> for ClassLiteral<'db> {
 
         let attribute_variances = attribute_names
             .map(|name| {
-                let place_and_quals = self.own_instance_member(db, &name);
+                let place_and_quals = self.own_instance_member(db, &name).inner;
                 (name, place_and_quals)
             })
             .chain(attribute_places_and_qualifiers)
             .dedup()
             .filter_map(|(name, place_and_qual)| {
-                place_and_qual.place.ignore_possibly_unbound().map(|ty| {
+                place_and_qual.ignore_possibly_undefined().map(|ty| {
                     let variance = if place_and_qual
                         .qualifiers
                         // `CLASS_VAR || FINAL` is really `all()`, but
@@ -3264,39 +3687,47 @@ impl InheritanceCycle {
 
 /// CPython internally considers a class a "solid base" if it has an atypical instance memory layout,
 /// with additional memory "slots" for each instance, besides the default object metadata and an
-/// attribute dictionary. A "solid base" can be a class defined in a C extension which defines C-level
-/// instance slots, or a Python class that defines non-empty `__slots__`.
+/// attribute dictionary. Per [PEP 800], however, we use the term "disjoint base" for this concept.
 ///
-/// Two solid bases can only coexist in a class's MRO if one is a subclass of the other. Knowing if
-/// a class is "solid base" or not is therefore valuable for inferring whether two instance types or
+/// A "disjoint base" can be a class defined in a C extension which defines C-level instance slots,
+/// or a Python class that defines non-empty `__slots__`. C-level instance slots are not generally
+/// visible to Python code, but PEP 800 specifies that any class decorated with
+/// `@typing_extensions.disjoint_base` should be treated by type checkers as a disjoint base; it is
+/// assumed that classes with C-level instance slots will be decorated as such when they appear in
+/// stub files.
+///
+/// Two disjoint bases can only coexist in a class's MRO if one is a subclass of the other. Knowing if
+/// a class is "disjoint base" or not is therefore valuable for inferring whether two instance types or
 /// two subclass-of types are disjoint from each other. It also allows us to detect possible
 /// `TypeError`s resulting from class definitions.
+///
+/// [PEP 800]: https://peps.python.org/pep-0800/
 #[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
-pub(super) struct SolidBase<'db> {
+pub(super) struct DisjointBase<'db> {
     pub(super) class: ClassLiteral<'db>,
-    pub(super) kind: SolidBaseKind,
+    pub(super) kind: DisjointBaseKind,
 }
 
-impl<'db> SolidBase<'db> {
-    /// Creates a [`SolidBase`] instance where we know the class is a solid base
-    /// because it is special-cased by ty.
-    fn hard_coded(class: ClassLiteral<'db>) -> Self {
+impl<'db> DisjointBase<'db> {
+    /// Creates a [`DisjointBase`] instance where we know the class is a disjoint base
+    /// because it has the `@disjoint_base` decorator on its definition
+    fn due_to_decorator(class: ClassLiteral<'db>) -> Self {
         Self {
             class,
-            kind: SolidBaseKind::HardCoded,
+            kind: DisjointBaseKind::DisjointBaseDecorator,
         }
     }
 
-    /// Creates a [`SolidBase`] instance where we know the class is a solid base
+    /// Creates a [`DisjointBase`] instance where we know the class is a disjoint base
     /// because of its `__slots__` definition.
     fn due_to_dunder_slots(class: ClassLiteral<'db>) -> Self {
         Self {
             class,
-            kind: SolidBaseKind::DefinesSlots,
+            kind: DisjointBaseKind::DefinesSlots,
         }
     }
 
-    /// Two solid bases can only coexist in a class's MRO if one is a subclass of the other
+    /// Two disjoint bases can only coexist in a class's MRO if one is a subclass of the other
     fn could_coexist_in_mro_with(&self, db: &'db dyn Db, other: &Self) -> bool {
         self == other
             || self
@@ -3309,10 +3740,11 @@ impl<'db> SolidBase<'db> {
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub(super) enum SolidBaseKind {
-    /// We know the class is a solid base because of some hardcoded knowledge in ty.
-    HardCoded,
-    /// We know the class is a solid base because it has a non-empty `__slots__` definition.
+pub(super) enum DisjointBaseKind {
+    /// We know the class is a disjoint base because it's either hardcoded in ty
+    /// or has the `@disjoint_base` decorator.
+    DisjointBaseDecorator,
+    /// We know the class is a disjoint base because it has a non-empty `__slots__` definition.
     DefinesSlots,
 }
 
@@ -3358,6 +3790,7 @@ pub enum KnownClass {
     Auto,
     Member,
     Nonmember,
+    StrEnum,
     // abc
     ABCMeta,
     // Types
@@ -3371,10 +3804,14 @@ pub enum KnownClass {
     GeneratorType,
     AsyncGeneratorType,
     CoroutineType,
+    NotImplementedType,
+    BuiltinFunctionType,
+    // Exposed as `types.EllipsisType` on Python >=3.10;
+    // backported as `builtins.ellipsis` by typeshed on Python <=3.9
+    EllipsisType,
     // Typeshed
     NoneType, // Part of `types` for Python >= 3.10
     // Typing
-    Any,
     Awaitable,
     Generator,
     Deprecated,
@@ -3384,6 +3821,7 @@ pub enum KnownClass {
     ParamSpec,
     ParamSpecArgs,
     ParamSpecKwargs,
+    ProtocolMeta,
     TypeVarTuple,
     TypeAliasType,
     NoDefaultType,
@@ -3391,6 +3829,8 @@ pub enum KnownClass {
     SupportsIndex,
     Iterable,
     Iterator,
+    // typing_extensions
+    ExtensionsTypeVar, // must be distinct from typing.TypeVar, backports new features
     // Collections
     ChainMap,
     Counter,
@@ -3399,10 +3839,6 @@ pub enum KnownClass {
     OrderedDict,
     // sys
     VersionInfo,
-    // Exposed as `types.EllipsisType` on Python >=3.10;
-    // backported as `builtins.ellipsis` by typeshed on Python <=3.9
-    EllipsisType,
-    NotImplementedType,
     // dataclasses
     Field,
     KwOnly,
@@ -3411,6 +3847,12 @@ pub enum KnownClass {
     NamedTupleFallback,
     NamedTupleLike,
     TypedDictFallback,
+    // string.templatelib
+    Template,
+    // pathlib
+    Path,
+    // ty_extensions
+    ConstraintSet,
 }
 
 impl KnownClass {
@@ -3443,6 +3885,7 @@ impl KnownClass {
             | Self::VersionInfo
             | Self::TypeAliasType
             | Self::TypeVar
+            | Self::ExtensionsTypeVar
             | Self::ParamSpec
             | Self::ParamSpecArgs
             | Self::ParamSpecKwargs
@@ -3453,12 +3896,14 @@ impl KnownClass {
             | Self::GeneratorType
             | Self::AsyncGeneratorType
             | Self::MethodWrapperType
-            | Self::CoroutineType => Some(Truthiness::AlwaysTrue),
+            | Self::CoroutineType
+            | Self::BuiltinFunctionType
+            | Self::Template
+            | Self::Path => Some(Truthiness::AlwaysTrue),
 
             Self::NoneType => Some(Truthiness::AlwaysFalse),
 
-            Self::Any
-            | Self::BaseException
+            Self::BaseException
             | Self::Exception
             | Self::ExceptionGroup
             | Self::Object
@@ -3492,6 +3937,7 @@ impl KnownClass {
             | Self::Auto
             | Self::Member
             | Self::Nonmember
+            | Self::StrEnum
             | Self::ABCMeta
             | Self::Iterable
             | Self::Iterator
@@ -3509,101 +3955,14 @@ impl KnownClass {
             | Self::InitVar
             | Self::NamedTupleFallback
             | Self::NamedTupleLike
+            | Self::ConstraintSet
+            | Self::ProtocolMeta
             | Self::TypedDictFallback => Some(Truthiness::Ambiguous),
 
             Self::Tuple => None,
         }
     }
 
-    /// Return `true` if this class is a [`SolidBase`]
-    const fn is_solid_base(self) -> bool {
-        match self {
-            Self::Object => false,
-
-            // Most non-`@final` builtins (other than `object`) are solid bases.
-            Self::Set
-            | Self::FrozenSet
-            | Self::BaseException
-            | Self::Bytearray
-            | Self::Int
-            | Self::Float
-            | Self::Complex
-            | Self::Str
-            | Self::List
-            | Self::Tuple
-            | Self::Dict
-            | Self::Slice
-            | Self::Property
-            | Self::Staticmethod
-            | Self::Classmethod
-            | Self::Deprecated
-            | Self::Type
-            | Self::ModuleType
-            | Self::Super
-            | Self::GenericAlias
-            | Self::Deque
-            | Self::Bytes => true,
-
-            // It doesn't really make sense to ask the question for `@final` types,
-            // since these are "more than solid bases". But we'll anyway infer a `@final`
-            // class as being disjoint from a class that doesn't appear in its MRO,
-            // and we'll anyway complain if we see a class definition that includes a
-            // `@final` class in its bases. We therefore return `false` here to avoid
-            // unnecessary duplicate diagnostics elsewhere.
-            Self::TypeVarTuple
-            | Self::TypeAliasType
-            | Self::UnionType
-            | Self::NoDefaultType
-            | Self::MethodType
-            | Self::MethodWrapperType
-            | Self::FunctionType
-            | Self::GeneratorType
-            | Self::AsyncGeneratorType
-            | Self::StdlibAlias
-            | Self::SpecialForm
-            | Self::TypeVar
-            | Self::ParamSpec
-            | Self::ParamSpecArgs
-            | Self::ParamSpecKwargs
-            | Self::WrapperDescriptorType
-            | Self::EllipsisType
-            | Self::NotImplementedType
-            | Self::KwOnly
-            | Self::InitVar
-            | Self::VersionInfo
-            | Self::Bool
-            | Self::NoneType
-            | Self::CoroutineType => false,
-
-            // Anything with a *runtime* MRO (N.B. sometimes different from the MRO that typeshed gives!)
-            // with length >2, or anything that is implemented in pure Python, is not a solid base.
-            Self::ABCMeta
-            | Self::Any
-            | Self::Awaitable
-            | Self::Generator
-            | Self::Enum
-            | Self::EnumType
-            | Self::Auto
-            | Self::Member
-            | Self::Nonmember
-            | Self::ChainMap
-            | Self::Exception
-            | Self::ExceptionGroup
-            | Self::Field
-            | Self::SupportsIndex
-            | Self::NamedTupleFallback
-            | Self::NamedTupleLike
-            | Self::TypedDictFallback
-            | Self::Counter
-            | Self::DefaultDict
-            | Self::OrderedDict
-            | Self::NewType
-            | Self::Iterable
-            | Self::Iterator
-            | Self::BaseExceptionGroup => false,
-        }
-    }
-
     /// Return `true` if this class is a subclass of `enum.Enum` *and* has enum members, i.e.
     /// if it is an "actual" enum, not `enum.Enum` itself or a similar custom enum class.
     pub(crate) const fn is_enum_subclass_with_members(self) -> bool {
@@ -3639,6 +3998,7 @@ impl KnownClass {
             | KnownClass::Auto
             | KnownClass::Member
             | KnownClass::Nonmember
+            | KnownClass::StrEnum
             | KnownClass::ABCMeta
             | KnownClass::GenericAlias
             | KnownClass::ModuleType
@@ -3651,10 +4011,10 @@ impl KnownClass {
             | KnownClass::AsyncGeneratorType
             | KnownClass::CoroutineType
             | KnownClass::NoneType
-            | KnownClass::Any
             | KnownClass::StdlibAlias
             | KnownClass::SpecialForm
             | KnownClass::TypeVar
+            | KnownClass::ExtensionsTypeVar
             | KnownClass::ParamSpec
             | KnownClass::ParamSpecArgs
             | KnownClass::ParamSpecKwargs
@@ -3678,7 +4038,12 @@ impl KnownClass {
             | KnownClass::InitVar
             | KnownClass::NamedTupleFallback
             | KnownClass::NamedTupleLike
-            | KnownClass::TypedDictFallback => false,
+            | KnownClass::ConstraintSet
+            | KnownClass::TypedDictFallback
+            | KnownClass::BuiltinFunctionType
+            | KnownClass::ProtocolMeta
+            | KnownClass::Template
+            | KnownClass::Path => false,
         }
     }
 
@@ -3716,6 +4081,7 @@ impl KnownClass {
             | KnownClass::Auto
             | KnownClass::Member
             | KnownClass::Nonmember
+            | KnownClass::StrEnum
             | KnownClass::ABCMeta
             | KnownClass::GenericAlias
             | KnownClass::ModuleType
@@ -3728,10 +4094,10 @@ impl KnownClass {
             | KnownClass::AsyncGeneratorType
             | KnownClass::CoroutineType
             | KnownClass::NoneType
-            | KnownClass::Any
             | KnownClass::StdlibAlias
             | KnownClass::SpecialForm
             | KnownClass::TypeVar
+            | KnownClass::ExtensionsTypeVar
             | KnownClass::ParamSpec
             | KnownClass::ParamSpecArgs
             | KnownClass::ParamSpecKwargs
@@ -3755,7 +4121,12 @@ impl KnownClass {
             | KnownClass::InitVar
             | KnownClass::NamedTupleFallback
             | KnownClass::NamedTupleLike
-            | KnownClass::TypedDictFallback => false,
+            | KnownClass::ConstraintSet
+            | KnownClass::TypedDictFallback
+            | KnownClass::BuiltinFunctionType
+            | KnownClass::ProtocolMeta
+            | KnownClass::Template
+            | KnownClass::Path => false,
         }
     }
 
@@ -3793,6 +4164,7 @@ impl KnownClass {
             | KnownClass::Auto
             | KnownClass::Member
             | KnownClass::Nonmember
+            | KnownClass::StrEnum
             | KnownClass::ABCMeta
             | KnownClass::GenericAlias
             | KnownClass::ModuleType
@@ -3805,10 +4177,10 @@ impl KnownClass {
             | KnownClass::AsyncGeneratorType
             | KnownClass::CoroutineType
             | KnownClass::NoneType
-            | KnownClass::Any
             | KnownClass::StdlibAlias
             | KnownClass::SpecialForm
             | KnownClass::TypeVar
+            | KnownClass::ExtensionsTypeVar
             | KnownClass::ParamSpec
             | KnownClass::ParamSpecArgs
             | KnownClass::ParamSpecKwargs
@@ -3831,7 +4203,12 @@ impl KnownClass {
             | KnownClass::InitVar
             | KnownClass::TypedDictFallback
             | KnownClass::NamedTupleLike
-            | KnownClass::NamedTupleFallback => false,
+            | KnownClass::NamedTupleFallback
+            | KnownClass::ConstraintSet
+            | KnownClass::BuiltinFunctionType
+            | KnownClass::ProtocolMeta
+            | KnownClass::Template
+            | KnownClass::Path => false,
         }
     }
 
@@ -3856,8 +4233,7 @@ impl KnownClass {
             | Self::NamedTupleLike
             | Self::Generator => true,
 
-            Self::Any
-            | Self::Bool
+            Self::Bool
             | Self::Object
             | Self::Bytes
             | Self::Bytearray
@@ -3892,6 +4268,7 @@ impl KnownClass {
             | Self::NoneType
             | Self::SpecialForm
             | Self::TypeVar
+            | Self::ExtensionsTypeVar
             | Self::ParamSpec
             | Self::ParamSpecArgs
             | Self::ParamSpecKwargs
@@ -3909,6 +4286,7 @@ impl KnownClass {
             | Self::Auto
             | Self::Member
             | Self::Nonmember
+            | Self::StrEnum
             | Self::ABCMeta
             | Self::Super
             | Self::StdlibAlias
@@ -3920,13 +4298,103 @@ impl KnownClass {
             | Self::KwOnly
             | Self::InitVar
             | Self::NamedTupleFallback
-            | Self::TypedDictFallback => false,
+            | Self::ConstraintSet
+            | Self::TypedDictFallback
+            | Self::BuiltinFunctionType
+            | Self::ProtocolMeta
+            | Self::Template
+            | KnownClass::Path => false,
+        }
+    }
+
+    /// Return `true` if this class is a typeshed fallback class which is used to provide attributes and
+    /// methods for another type (e.g. `NamedTupleFallback` for actual `NamedTuple`s). These fallback
+    /// classes need special treatment in some places. For example, implicit usages of `Self` should not
+    /// be eagerly replaced with the fallback class itself. Instead, `Self` should eventually be treated
+    /// as referring to the destination type (e.g. the actual `NamedTuple`).
+    pub(crate) const fn is_fallback_class(self) -> bool {
+        match self {
+            KnownClass::Bool
+            | KnownClass::Object
+            | KnownClass::Bytes
+            | KnownClass::Bytearray
+            | KnownClass::Type
+            | KnownClass::Int
+            | KnownClass::Float
+            | KnownClass::Complex
+            | KnownClass::Str
+            | KnownClass::List
+            | KnownClass::Tuple
+            | KnownClass::Set
+            | KnownClass::FrozenSet
+            | KnownClass::Dict
+            | KnownClass::Slice
+            | KnownClass::Property
+            | KnownClass::BaseException
+            | KnownClass::Exception
+            | KnownClass::BaseExceptionGroup
+            | KnownClass::ExceptionGroup
+            | KnownClass::Staticmethod
+            | KnownClass::Classmethod
+            | KnownClass::Super
+            | KnownClass::Enum
+            | KnownClass::EnumType
+            | KnownClass::Auto
+            | KnownClass::Member
+            | KnownClass::Nonmember
+            | KnownClass::StrEnum
+            | KnownClass::ABCMeta
+            | KnownClass::GenericAlias
+            | KnownClass::ModuleType
+            | KnownClass::FunctionType
+            | KnownClass::MethodType
+            | KnownClass::MethodWrapperType
+            | KnownClass::WrapperDescriptorType
+            | KnownClass::UnionType
+            | KnownClass::GeneratorType
+            | KnownClass::AsyncGeneratorType
+            | KnownClass::CoroutineType
+            | KnownClass::NotImplementedType
+            | KnownClass::BuiltinFunctionType
+            | KnownClass::EllipsisType
+            | KnownClass::NoneType
+            | KnownClass::Awaitable
+            | KnownClass::Generator
+            | KnownClass::Deprecated
+            | KnownClass::StdlibAlias
+            | KnownClass::SpecialForm
+            | KnownClass::TypeVar
+            | KnownClass::ExtensionsTypeVar
+            | KnownClass::ParamSpec
+            | KnownClass::ParamSpecArgs
+            | KnownClass::ParamSpecKwargs
+            | KnownClass::ProtocolMeta
+            | KnownClass::TypeVarTuple
+            | KnownClass::TypeAliasType
+            | KnownClass::NoDefaultType
+            | KnownClass::NewType
+            | KnownClass::SupportsIndex
+            | KnownClass::Iterable
+            | KnownClass::Iterator
+            | KnownClass::ChainMap
+            | KnownClass::Counter
+            | KnownClass::DefaultDict
+            | KnownClass::Deque
+            | KnownClass::OrderedDict
+            | KnownClass::VersionInfo
+            | KnownClass::Field
+            | KnownClass::KwOnly
+            | KnownClass::NamedTupleLike
+            | KnownClass::Template
+            | KnownClass::Path
+            | KnownClass::ConstraintSet
+            | KnownClass::InitVar => false,
+            KnownClass::NamedTupleFallback | KnownClass::TypedDictFallback => true,
         }
     }
 
     pub(crate) fn name(self, db: &dyn Db) -> &'static str {
         match self {
-            Self::Any => "Any",
             Self::Bool => "bool",
             Self::Object => "object",
             Self::Bytes => "bytes",
@@ -3959,12 +4427,14 @@ impl KnownClass {
             Self::UnionType => "UnionType",
             Self::MethodWrapperType => "MethodWrapperType",
             Self::WrapperDescriptorType => "WrapperDescriptorType",
+            Self::BuiltinFunctionType => "BuiltinFunctionType",
             Self::GeneratorType => "GeneratorType",
             Self::AsyncGeneratorType => "AsyncGeneratorType",
             Self::CoroutineType => "CoroutineType",
             Self::NoneType => "NoneType",
             Self::SpecialForm => "_SpecialForm",
             Self::TypeVar => "TypeVar",
+            Self::ExtensionsTypeVar => "TypeVar",
             Self::ParamSpec => "ParamSpec",
             Self::ParamSpecArgs => "ParamSpecArgs",
             Self::ParamSpecKwargs => "ParamSpecKwargs",
@@ -3989,6 +4459,7 @@ impl KnownClass {
             Self::Auto => "auto",
             Self::Member => "member",
             Self::Nonmember => "nonmember",
+            Self::StrEnum => "StrEnum",
             Self::ABCMeta => "ABCMeta",
             Self::Super => "super",
             Self::Iterable => "Iterable",
@@ -4016,7 +4487,11 @@ impl KnownClass {
             Self::InitVar => "InitVar",
             Self::NamedTupleFallback => "NamedTupleFallback",
             Self::NamedTupleLike => "NamedTupleLike",
+            Self::ConstraintSet => "ConstraintSet",
             Self::TypedDictFallback => "TypedDictFallback",
+            Self::Template => "Template",
+            Self::Path => "Path",
+            Self::ProtocolMeta => "_ProtocolMeta",
         }
     }
 
@@ -4044,17 +4519,37 @@ impl KnownClass {
         KnownClassDisplay { db, class: self }
     }
 
-    /// Lookup a [`KnownClass`] in typeshed and return a [`Type`]
-    /// representing all possible instances of the class.
+    /// Lookup a [`KnownClass`] in typeshed and return a [`Type`] representing all possible instances of
+    /// the class. If this class is generic, this will use the default specialization.
     ///
     /// If the class cannot be found in typeshed, a debug-level log message will be emitted stating this.
+    #[track_caller]
     pub(crate) fn to_instance(self, db: &dyn Db) -> Type<'_> {
+        debug_assert_ne!(
+            self,
+            KnownClass::Tuple,
+            "Use `Type::heterogeneous_tuple` or `Type::homogeneous_tuple` to create `tuple` instances"
+        );
         self.to_class_literal(db)
             .to_class_type(db)
             .map(|class| Type::instance(db, class))
             .unwrap_or_else(Type::unknown)
     }
 
+    /// Similar to [`KnownClass::to_instance`], but returns the Unknown-specialization where each type
+    /// parameter is specialized to `Unknown`.
+    #[track_caller]
+    pub(crate) fn to_instance_unknown(self, db: &dyn Db) -> Type<'_> {
+        debug_assert_ne!(
+            self,
+            KnownClass::Tuple,
+            "Use `Type::heterogeneous_tuple` or `Type::homogeneous_tuple` to create `tuple` instances"
+        );
+        self.try_to_class_literal(db)
+            .map(|literal| Type::instance(db, literal.unknown_specialization(db)))
+            .unwrap_or_else(Type::unknown)
+    }
+
     /// Lookup a generic [`KnownClass`] in typeshed and return a [`Type`]
     /// representing a specialization of that class.
     ///
@@ -4093,11 +4588,17 @@ impl KnownClass {
     ///
     /// If the class cannot be found in typeshed, or if you provide a specialization with the wrong
     /// number of types, a debug-level log message will be emitted stating this.
+    #[track_caller]
     pub(crate) fn to_specialized_instance<'db>(
         self,
         db: &'db dyn Db,
         specialization: impl IntoIterator<Item = Type<'db>>,
     ) -> Type<'db> {
+        debug_assert_ne!(
+            self,
+            KnownClass::Tuple,
+            "Use `Type::heterogeneous_tuple` or `Type::homogeneous_tuple` to create `tuple` instances"
+        );
         self.to_specialized_class_type(db, specialization)
             .and_then(|class_type| Type::from(class_type).to_instance(db))
             .unwrap_or_else(Type::unknown)
@@ -4113,14 +4614,18 @@ impl KnownClass {
     ) -> Result<ClassLiteral<'_>, KnownClassLookupError<'_>> {
         let symbol = known_module_symbol(db, self.canonical_module(db), self.name(db)).place;
         match symbol {
-            Place::Type(Type::ClassLiteral(class_literal), Boundness::Bound) => Ok(class_literal),
-            Place::Type(Type::ClassLiteral(class_literal), Boundness::PossiblyUnbound) => {
-                Err(KnownClassLookupError::ClassPossiblyUnbound { class_literal })
+            Place::Defined(Type::ClassLiteral(class_literal), _, Definedness::AlwaysDefined) => {
+                Ok(class_literal)
             }
-            Place::Type(found_type, _) => {
+            Place::Defined(
+                Type::ClassLiteral(class_literal),
+                _,
+                Definedness::PossiblyUndefined,
+            ) => Err(KnownClassLookupError::ClassPossiblyUnbound { class_literal }),
+            Place::Defined(found_type, _, _) => {
                 Err(KnownClassLookupError::SymbolNotAClass { found_type })
             }
-            Place::Unbound => Err(KnownClassLookupError::ClassNotFound),
+            Place::Undefined => Err(KnownClassLookupError::ClassNotFound),
         }
     }
 
@@ -4186,6 +4691,14 @@ impl KnownClass {
             .is_ok_and(|class| class.is_subclass_of(db, None, other))
     }
 
+    pub(super) fn when_subclass_of<'db>(
+        self,
+        db: &'db dyn Db,
+        other: ClassType<'db>,
+    ) -> ConstraintSet<'db> {
+        ConstraintSet::from(self.is_subclass_of(db, other))
+    }
+
     /// Return the module in which we should look up the definition for this class
     fn canonical_module(self, db: &dyn Db) -> KnownModule {
         match self {
@@ -4214,9 +4727,12 @@ impl KnownClass {
             | Self::Property => KnownModule::Builtins,
             Self::VersionInfo => KnownModule::Sys,
             Self::ABCMeta => KnownModule::Abc,
-            Self::Enum | Self::EnumType | Self::Auto | Self::Member | Self::Nonmember => {
-                KnownModule::Enum
-            }
+            Self::Enum
+            | Self::EnumType
+            | Self::Auto
+            | Self::Member
+            | Self::Nonmember
+            | Self::StrEnum => KnownModule::Enum,
             Self::GenericAlias
             | Self::ModuleType
             | Self::FunctionType
@@ -4226,18 +4742,20 @@ impl KnownClass {
             | Self::CoroutineType
             | Self::MethodWrapperType
             | Self::UnionType
+            | Self::BuiltinFunctionType
             | Self::WrapperDescriptorType => KnownModule::Types,
             Self::NoneType => KnownModule::Typeshed,
-            Self::Any
-            | Self::Awaitable
+            Self::Awaitable
             | Self::Generator
             | Self::SpecialForm
             | Self::TypeVar
             | Self::StdlibAlias
             | Self::Iterable
             | Self::Iterator
+            | Self::ProtocolMeta
             | Self::SupportsIndex => KnownModule::Typing,
             Self::TypeAliasType
+            | Self::ExtensionsTypeVar
             | Self::TypeVarTuple
             | Self::ParamSpec
             | Self::ParamSpecArgs
@@ -4273,7 +4791,9 @@ impl KnownClass {
             | Self::OrderedDict => KnownModule::Collections,
             Self::Field | Self::KwOnly | Self::InitVar => KnownModule::Dataclasses,
             Self::NamedTupleFallback | Self::TypedDictFallback => KnownModule::TypeCheckerInternals,
-            Self::NamedTupleLike => KnownModule::TyExtensions,
+            Self::NamedTupleLike | Self::ConstraintSet => KnownModule::TyExtensions,
+            Self::Template => KnownModule::Templatelib,
+            Self::Path => KnownModule::Pathlib,
         }
     }
 
@@ -4290,8 +4810,7 @@ impl KnownClass {
             | Self::UnionType
             | Self::NotImplementedType => Some(true),
 
-            Self::Any
-            | Self::Bool
+            Self::Bool
             | Self::Object
             | Self::Bytes
             | Self::Bytearray
@@ -4333,6 +4852,7 @@ impl KnownClass {
             | Self::SupportsIndex
             | Self::StdlibAlias
             | Self::TypeVar
+            | Self::ExtensionsTypeVar
             | Self::ParamSpec
             | Self::ParamSpecArgs
             | Self::ParamSpecKwargs
@@ -4342,6 +4862,7 @@ impl KnownClass {
             | Self::Auto
             | Self::Member
             | Self::Nonmember
+            | Self::StrEnum
             | Self::ABCMeta
             | Self::Super
             | Self::NewType
@@ -4352,7 +4873,12 @@ impl KnownClass {
             | Self::Iterator
             | Self::NamedTupleFallback
             | Self::NamedTupleLike
-            | Self::TypedDictFallback => Some(false),
+            | Self::ConstraintSet
+            | Self::TypedDictFallback
+            | Self::BuiltinFunctionType
+            | Self::ProtocolMeta
+            | Self::Template
+            | Self::Path => Some(false),
 
             Self::Tuple => None,
         }
@@ -4370,8 +4896,7 @@ impl KnownClass {
             | Self::TypeAliasType
             | Self::NotImplementedType => true,
 
-            Self::Any
-            | Self::Bool
+            Self::Bool
             | Self::Object
             | Self::Bytes
             | Self::Bytearray
@@ -4414,6 +4939,7 @@ impl KnownClass {
             | Self::Generator
             | Self::Deprecated
             | Self::TypeVar
+            | Self::ExtensionsTypeVar
             | Self::ParamSpec
             | Self::ParamSpecArgs
             | Self::ParamSpecKwargs
@@ -4423,6 +4949,7 @@ impl KnownClass {
             | Self::Auto
             | Self::Member
             | Self::Nonmember
+            | Self::StrEnum
             | Self::ABCMeta
             | Self::Super
             | Self::UnionType
@@ -4434,7 +4961,12 @@ impl KnownClass {
             | Self::Iterator
             | Self::NamedTupleFallback
             | Self::NamedTupleLike
-            | Self::TypedDictFallback => false,
+            | Self::ConstraintSet
+            | Self::TypedDictFallback
+            | Self::BuiltinFunctionType
+            | Self::ProtocolMeta
+            | Self::Template
+            | Self::Path => false,
         }
     }
 
@@ -4445,99 +4977,108 @@ impl KnownClass {
     ) -> Option<Self> {
         // We assert that this match is exhaustive over the right-hand side in the unit test
         // `known_class_roundtrip_from_str()`
-        let candidate = match class_name {
-            "Any" => Self::Any,
-            "bool" => Self::Bool,
-            "object" => Self::Object,
-            "bytes" => Self::Bytes,
-            "bytearray" => Self::Bytearray,
-            "tuple" => Self::Tuple,
-            "type" => Self::Type,
-            "int" => Self::Int,
-            "float" => Self::Float,
-            "complex" => Self::Complex,
-            "str" => Self::Str,
-            "set" => Self::Set,
-            "frozenset" => Self::FrozenSet,
-            "dict" => Self::Dict,
-            "list" => Self::List,
-            "slice" => Self::Slice,
-            "property" => Self::Property,
-            "BaseException" => Self::BaseException,
-            "BaseExceptionGroup" => Self::BaseExceptionGroup,
-            "Exception" => Self::Exception,
-            "ExceptionGroup" => Self::ExceptionGroup,
-            "staticmethod" => Self::Staticmethod,
-            "classmethod" => Self::Classmethod,
-            "Awaitable" => Self::Awaitable,
-            "Generator" => Self::Generator,
-            "deprecated" => Self::Deprecated,
-            "GenericAlias" => Self::GenericAlias,
-            "NoneType" => Self::NoneType,
-            "ModuleType" => Self::ModuleType,
-            "GeneratorType" => Self::GeneratorType,
-            "AsyncGeneratorType" => Self::AsyncGeneratorType,
-            "CoroutineType" => Self::CoroutineType,
-            "FunctionType" => Self::FunctionType,
-            "MethodType" => Self::MethodType,
-            "UnionType" => Self::UnionType,
-            "MethodWrapperType" => Self::MethodWrapperType,
-            "WrapperDescriptorType" => Self::WrapperDescriptorType,
-            "NewType" => Self::NewType,
-            "TypeAliasType" => Self::TypeAliasType,
-            "TypeVar" => Self::TypeVar,
-            "Iterable" => Self::Iterable,
-            "Iterator" => Self::Iterator,
-            "ParamSpec" => Self::ParamSpec,
-            "ParamSpecArgs" => Self::ParamSpecArgs,
-            "ParamSpecKwargs" => Self::ParamSpecKwargs,
-            "TypeVarTuple" => Self::TypeVarTuple,
-            "ChainMap" => Self::ChainMap,
-            "Counter" => Self::Counter,
-            "defaultdict" => Self::DefaultDict,
-            "deque" => Self::Deque,
-            "OrderedDict" => Self::OrderedDict,
-            "_Alias" => Self::StdlibAlias,
-            "_SpecialForm" => Self::SpecialForm,
-            "_NoDefaultType" => Self::NoDefaultType,
-            "SupportsIndex" => Self::SupportsIndex,
-            "Enum" => Self::Enum,
-            "EnumMeta" => Self::EnumType,
+        let candidates: &[Self] = match class_name {
+            "bool" => &[Self::Bool],
+            "object" => &[Self::Object],
+            "bytes" => &[Self::Bytes],
+            "bytearray" => &[Self::Bytearray],
+            "tuple" => &[Self::Tuple],
+            "type" => &[Self::Type],
+            "int" => &[Self::Int],
+            "float" => &[Self::Float],
+            "complex" => &[Self::Complex],
+            "str" => &[Self::Str],
+            "set" => &[Self::Set],
+            "frozenset" => &[Self::FrozenSet],
+            "dict" => &[Self::Dict],
+            "list" => &[Self::List],
+            "slice" => &[Self::Slice],
+            "property" => &[Self::Property],
+            "BaseException" => &[Self::BaseException],
+            "BaseExceptionGroup" => &[Self::BaseExceptionGroup],
+            "Exception" => &[Self::Exception],
+            "ExceptionGroup" => &[Self::ExceptionGroup],
+            "staticmethod" => &[Self::Staticmethod],
+            "classmethod" => &[Self::Classmethod],
+            "Awaitable" => &[Self::Awaitable],
+            "Generator" => &[Self::Generator],
+            "deprecated" => &[Self::Deprecated],
+            "GenericAlias" => &[Self::GenericAlias],
+            "NoneType" => &[Self::NoneType],
+            "ModuleType" => &[Self::ModuleType],
+            "GeneratorType" => &[Self::GeneratorType],
+            "AsyncGeneratorType" => &[Self::AsyncGeneratorType],
+            "CoroutineType" => &[Self::CoroutineType],
+            "FunctionType" => &[Self::FunctionType],
+            "MethodType" => &[Self::MethodType],
+            "UnionType" => &[Self::UnionType],
+            "MethodWrapperType" => &[Self::MethodWrapperType],
+            "WrapperDescriptorType" => &[Self::WrapperDescriptorType],
+            "BuiltinFunctionType" => &[Self::BuiltinFunctionType],
+            "NewType" => &[Self::NewType],
+            "TypeAliasType" => &[Self::TypeAliasType],
+            "TypeVar" => &[Self::TypeVar, Self::ExtensionsTypeVar],
+            "Iterable" => &[Self::Iterable],
+            "Iterator" => &[Self::Iterator],
+            "ParamSpec" => &[Self::ParamSpec],
+            "ParamSpecArgs" => &[Self::ParamSpecArgs],
+            "ParamSpecKwargs" => &[Self::ParamSpecKwargs],
+            "TypeVarTuple" => &[Self::TypeVarTuple],
+            "ChainMap" => &[Self::ChainMap],
+            "Counter" => &[Self::Counter],
+            "defaultdict" => &[Self::DefaultDict],
+            "deque" => &[Self::Deque],
+            "OrderedDict" => &[Self::OrderedDict],
+            "_Alias" => &[Self::StdlibAlias],
+            "_SpecialForm" => &[Self::SpecialForm],
+            "_NoDefaultType" => &[Self::NoDefaultType],
+            "SupportsIndex" => &[Self::SupportsIndex],
+            "Enum" => &[Self::Enum],
+            "EnumMeta" => &[Self::EnumType],
             "EnumType" if Program::get(db).python_version(db) >= PythonVersion::PY311 => {
-                Self::EnumType
+                &[Self::EnumType]
             }
-            "auto" => Self::Auto,
-            "member" => Self::Member,
-            "nonmember" => Self::Nonmember,
-            "ABCMeta" => Self::ABCMeta,
-            "super" => Self::Super,
-            "_version_info" => Self::VersionInfo,
+            "StrEnum" if Program::get(db).python_version(db) >= PythonVersion::PY311 => {
+                &[Self::StrEnum]
+            }
+            "auto" => &[Self::Auto],
+            "member" => &[Self::Member],
+            "nonmember" => &[Self::Nonmember],
+            "ABCMeta" => &[Self::ABCMeta],
+            "super" => &[Self::Super],
+            "_version_info" => &[Self::VersionInfo],
             "ellipsis" if Program::get(db).python_version(db) <= PythonVersion::PY39 => {
-                Self::EllipsisType
+                &[Self::EllipsisType]
             }
             "EllipsisType" if Program::get(db).python_version(db) >= PythonVersion::PY310 => {
-                Self::EllipsisType
+                &[Self::EllipsisType]
             }
-            "_NotImplementedType" => Self::NotImplementedType,
-            "Field" => Self::Field,
-            "KW_ONLY" => Self::KwOnly,
-            "InitVar" => Self::InitVar,
-            "NamedTupleFallback" => Self::NamedTupleFallback,
-            "NamedTupleLike" => Self::NamedTupleLike,
-            "TypedDictFallback" => Self::TypedDictFallback,
+            "_NotImplementedType" => &[Self::NotImplementedType],
+            "Field" => &[Self::Field],
+            "KW_ONLY" => &[Self::KwOnly],
+            "InitVar" => &[Self::InitVar],
+            "NamedTupleFallback" => &[Self::NamedTupleFallback],
+            "NamedTupleLike" => &[Self::NamedTupleLike],
+            "ConstraintSet" => &[Self::ConstraintSet],
+            "TypedDictFallback" => &[Self::TypedDictFallback],
+            "Template" => &[Self::Template],
+            "Path" => &[Self::Path],
+            "_ProtocolMeta" => &[Self::ProtocolMeta],
             _ => return None,
         };
 
-        candidate
-            .check_module(db, file_to_module(db, file)?.known(db)?)
-            .then_some(candidate)
+        let module = file_to_module(db, file)?.known(db)?;
+
+        candidates
+            .iter()
+            .copied()
+            .find(|&candidate| candidate.check_module(db, module))
     }
 
     /// Return `true` if the module of `self` matches `module`
     fn check_module(self, db: &dyn Db, module: KnownModule) -> bool {
         match self {
-            Self::Any
-            | Self::Bool
+            Self::Bool
             | Self::Object
             | Self::Bytes
             | Self::Bytearray
@@ -4577,6 +5118,7 @@ impl KnownClass {
             | Self::Auto
             | Self::Member
             | Self::Nonmember
+            | Self::StrEnum
             | Self::ABCMeta
             | Self::Super
             | Self::NotImplementedType
@@ -4585,17 +5127,22 @@ impl KnownClass {
             | Self::AsyncGeneratorType
             | Self::CoroutineType
             | Self::WrapperDescriptorType
+            | Self::BuiltinFunctionType
             | Self::Field
             | Self::KwOnly
             | Self::InitVar
             | Self::NamedTupleFallback
             | Self::TypedDictFallback
+            | Self::TypeVar
+            | Self::ExtensionsTypeVar
             | Self::NamedTupleLike
+            | Self::ConstraintSet
             | Self::Awaitable
-            | Self::Generator => module == self.canonical_module(db),
+            | Self::Generator
+            | Self::Template
+            | Self::Path => module == self.canonical_module(db),
             Self::NoneType => matches!(module, KnownModule::Typeshed | KnownModule::Types),
             Self::SpecialForm
-            | Self::TypeVar
             | Self::TypeAliasType
             | Self::NoDefaultType
             | Self::SupportsIndex
@@ -4605,9 +5152,9 @@ impl KnownClass {
             | Self::TypeVarTuple
             | Self::Iterable
             | Self::Iterator
+            | Self::ProtocolMeta
             | Self::NewType => matches!(module, KnownModule::Typing | KnownModule::TypingExtensions),
             Self::Deprecated => matches!(module, KnownModule::Warnings | KnownModule::TypingExtensions),
-
         }
     }
 
@@ -4618,7 +5165,6 @@ impl KnownClass {
         context: &InferContext<'db, '_>,
         index: &SemanticIndex<'db>,
         overload: &mut Binding<'db>,
-        call_arguments: &CallArguments<'_, 'db>,
         call_expression: &ast::ExprCall,
     ) {
         let db = context.db();
@@ -4633,8 +5179,7 @@ impl KnownClass {
                 //   2. The first parameter of the current function (typically `self` or `cls`)
                 match overload.parameter_types() {
                     [] => {
-                        let Some(enclosing_class) =
-                            nearest_enclosing_class(db, index, scope, module)
+                        let Some(enclosing_class) = nearest_enclosing_class(db, index, scope)
                         else {
                             BoundSuperError::UnavailableImplicitArguments
                                 .report_diagnostic(context, call_expression.into());
@@ -4692,6 +5237,7 @@ impl KnownClass {
                     _ => {}
                 }
             }
+
             KnownClass::Deprecated => {
                 // Parsing something of the form:
                 //
@@ -4715,154 +5261,7 @@ impl KnownClass {
                 };
 
                 overload.set_return_type(Type::KnownInstance(KnownInstanceType::Deprecated(
-                    DeprecatedInstance::new(db, message.into_string_literal()),
-                )));
-            }
-            KnownClass::TypeVar => {
-                let assigned_to = index
-                    .try_expression(ast::ExprRef::from(call_expression))
-                    .and_then(|expr| expr.assigned_to(db));
-
-                let Some(target) = assigned_to.as_ref().and_then(|assigned_to| {
-                    match assigned_to.node(module).targets.as_slice() {
-                        [ast::Expr::Name(target)] => Some(target),
-                        _ => None,
-                    }
-                }) else {
-                    if let Some(builder) =
-                        context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
-                    {
-                        builder.into_diagnostic(
-                            "A legacy `typing.TypeVar` must be immediately assigned to a variable",
-                        );
-                    }
-                    return;
-                };
-
-                let [
-                    Some(name_param),
-                    constraints,
-                    bound,
-                    default,
-                    contravariant,
-                    covariant,
-                    _infer_variance,
-                ] = overload.parameter_types()
-                else {
-                    return;
-                };
-
-                let covariant = covariant
-                    .map(|ty| ty.bool(db))
-                    .unwrap_or(Truthiness::AlwaysFalse);
-
-                let contravariant = contravariant
-                    .map(|ty| ty.bool(db))
-                    .unwrap_or(Truthiness::AlwaysFalse);
-
-                let variance = match (contravariant, covariant) {
-                    (Truthiness::Ambiguous, _) => {
-                        if let Some(builder) =
-                            context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
-                        {
-                            builder.into_diagnostic(
-                                "The `contravariant` parameter of a legacy `typing.TypeVar` \
-                                cannot have an ambiguous value",
-                            );
-                        }
-                        return;
-                    }
-                    (_, Truthiness::Ambiguous) => {
-                        if let Some(builder) =
-                            context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
-                        {
-                            builder.into_diagnostic(
-                                "The `covariant` parameter of a legacy `typing.TypeVar` \
-                                cannot have an ambiguous value",
-                            );
-                        }
-                        return;
-                    }
-                    (Truthiness::AlwaysTrue, Truthiness::AlwaysTrue) => {
-                        if let Some(builder) =
-                            context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
-                        {
-                            builder.into_diagnostic(
-                                "A legacy `typing.TypeVar` cannot be both \
-                                covariant and contravariant",
-                            );
-                        }
-                        return;
-                    }
-                    (Truthiness::AlwaysTrue, Truthiness::AlwaysFalse) => {
-                        TypeVarVariance::Contravariant
-                    }
-                    (Truthiness::AlwaysFalse, Truthiness::AlwaysTrue) => TypeVarVariance::Covariant,
-                    (Truthiness::AlwaysFalse, Truthiness::AlwaysFalse) => {
-                        TypeVarVariance::Invariant
-                    }
-                };
-
-                let name_param = name_param.into_string_literal().map(|name| name.value(db));
-
-                if name_param.is_none_or(|name_param| name_param != target.id) {
-                    if let Some(builder) =
-                        context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "The name of a legacy `typing.TypeVar`{} must match \
-                            the name of the variable it is assigned to (`{}`)",
-                            if let Some(name_param) = name_param {
-                                format!(" (`{name_param}`)")
-                            } else {
-                                String::new()
-                            },
-                            target.id,
-                        ));
-                    }
-                    return;
-                }
-
-                let bound_or_constraint = match (bound, constraints) {
-                    (Some(bound), None) => {
-                        Some(TypeVarBoundOrConstraints::UpperBound(*bound).into())
-                    }
-
-                    (None, Some(_constraints)) => {
-                        // We don't use UnionType::from_elements or UnionBuilder here,
-                        // because we don't want to simplify the list of constraints like
-                        // we do with the elements of an actual union type.
-                        // TODO: Consider using a new `OneOfType` connective here instead,
-                        // since that more accurately represents the actual semantics of
-                        // typevar constraints.
-                        let elements = UnionType::new(
-                            db,
-                            overload
-                                .arguments_for_parameter(call_arguments, 1)
-                                .map(|(_, ty)| ty)
-                                .collect::<Box<_>>(),
-                        );
-                        Some(TypeVarBoundOrConstraints::Constraints(elements).into())
-                    }
-
-                    // TODO: Emit a diagnostic that TypeVar cannot be both bounded and
-                    // constrained
-                    (Some(_), Some(_)) => return,
-
-                    (None, None) => None,
-                };
-
-                let containing_assignment = index.expect_single_definition(target);
-                overload.set_return_type(Type::KnownInstance(KnownInstanceType::TypeVar(
-                    TypeVarInstance::new(
-                        db,
-                        &target.id,
-                        Some(containing_assignment),
-                        bound_or_constraint,
-                        Some(variance),
-                        default.map(Into::into),
-                        TypeVarKind::Legacy,
-                    ),
+                    DeprecatedInstance::new(db, message.as_string_literal()),
                 )));
             }
 
@@ -4882,7 +5281,7 @@ impl KnownClass {
                     return;
                 };
 
-                let Some(name) = name.into_string_literal() else {
+                let Some(name) = name.as_string_literal() else {
                     if let Some(builder) =
                         context.report_lint(&INVALID_TYPE_ALIAS_TYPE, call_expression)
                     {
@@ -4893,7 +5292,7 @@ impl KnownClass {
                     return;
                 };
                 overload.set_return_type(Type::KnownInstance(KnownInstanceType::TypeAliasType(
-                    TypeAliasType::Bare(BareTypeAliasType::new(
+                    TypeAliasType::ManualPEP695(ManualPEP695TypeAliasType::new(
                         db,
                         ast::name::Name::new(name.value(db)),
                         containing_assignment,
@@ -5017,14 +5416,15 @@ enum SlotsKind {
 
 impl SlotsKind {
     fn from(db: &dyn Db, base: ClassLiteral) -> Self {
-        let Place::Type(slots_ty, bound) = base
-            .own_class_member(db, base.generic_context(db), None, "__slots__")
+        let Place::Defined(slots_ty, _, bound) = base
+            .own_class_member(db, base.inherited_generic_context(db), None, "__slots__")
+            .inner
             .place
         else {
             return Self::NotSpecified;
         };
 
-        if matches!(bound, Boundness::PossiblyUnbound) {
+        if matches!(bound, Definedness::PossiblyUndefined) {
             return Self::Dynamic;
         }
 
@@ -5058,7 +5458,13 @@ mod tests {
 
     #[test]
     fn known_class_roundtrip_from_str() {
-        let db = setup_db();
+        let mut db = setup_db();
+        Program::get(&db)
+            .set_python_version_with_source(&mut db)
+            .to(PythonVersionWithSource {
+                version: PythonVersion::latest_preview(),
+                source: PythonVersionSource::default(),
+            });
         for class in KnownClass::iter() {
             let class_name = class.name(&db);
             let class_module = resolve_module(&db, &class.canonical_module(&db).name()).unwrap();
@@ -5087,11 +5493,19 @@ mod tests {
             });
 
         for class in KnownClass::iter() {
-            assert_ne!(
-                class.to_instance(&db),
-                Type::unknown(),
-                "Unexpectedly fell back to `Unknown` for `{class:?}`"
-            );
+            // Check the class can be looked up successfully
+            class.try_to_class_literal_without_logging(&db).unwrap();
+
+            // We can't call `KnownClass::Tuple.to_instance()`;
+            // there are assertions to ensure that we always call `Type::homogeneous_tuple()`
+            // or `Type::heterogeneous_tuple()` instead.`
+            if class != KnownClass::Tuple {
+                assert_ne!(
+                    class.to_instance(&db),
+                    Type::unknown(),
+                    "Unexpectedly fell back to `Unknown` for `{class:?}`"
+                );
+            }
         }
     }
 
@@ -5106,13 +5520,16 @@ mod tests {
         let mut classes: Vec<(KnownClass, PythonVersion)> = KnownClass::iter()
             .map(|class| {
                 let version_added = match class {
+                    KnownClass::Template => PythonVersion::PY314,
                     KnownClass::UnionType => PythonVersion::PY310,
                     KnownClass::BaseExceptionGroup | KnownClass::ExceptionGroup => {
                         PythonVersion::PY311
                     }
                     KnownClass::GenericAlias => PythonVersion::PY39,
                     KnownClass::KwOnly => PythonVersion::PY310,
-                    KnownClass::Member | KnownClass::Nonmember => PythonVersion::PY311,
+                    KnownClass::Member | KnownClass::Nonmember | KnownClass::StrEnum => {
+                        PythonVersion::PY311
+                    }
                     _ => PythonVersion::PY37,
                 };
                 (class, version_added)
@@ -5135,11 +5552,19 @@ mod tests {
                 current_version = version_added;
             }
 
-            assert_ne!(
-                class.to_instance(&db),
-                Type::unknown(),
-                "Unexpectedly fell back to `Unknown` for `{class:?}` on Python {version_added}"
-            );
+            // Check the class can be looked up successfully
+            class.try_to_class_literal_without_logging(&db).unwrap();
+
+            // We can't call `KnownClass::Tuple.to_instance()`;
+            // there are assertions to ensure that we always call `Type::homogeneous_tuple()`
+            // or `Type::heterogeneous_tuple()` instead.`
+            if class != KnownClass::Tuple {
+                assert_ne!(
+                    class.to_instance(&db),
+                    Type::unknown(),
+                    "Unexpectedly fell back to `Unknown` for `{class:?}` on Python {version_added}"
+                );
+            }
         }
     }
 }
diff --git a/crates/ty_python_semantic/src/types/class_base.rs b/crates/ty_python_semantic/src/types/class_base.rs
index e8a5fd1e41..d22dbd5542 100644
--- a/crates/ty_python_semantic/src/types/class_base.rs
+++ b/crates/ty_python_semantic/src/types/class_base.rs
@@ -1,10 +1,11 @@
 use crate::Db;
+use crate::types::class::CodeGeneratorKind;
 use crate::types::generics::Specialization;
 use crate::types::tuple::TupleType;
 use crate::types::{
     ApplyTypeMappingVisitor, ClassLiteral, ClassType, DynamicType, KnownClass, KnownInstanceType,
-    MroError, MroIterator, NormalizedVisitor, SpecialFormType, Type, TypeMapping, TypeTransformer,
-    todo_type,
+    MaterializationKind, MroError, MroIterator, NormalizedVisitor, SpecialFormType, Type,
+    TypeContext, TypeMapping, todo_type,
 };
 
 /// Enumeration of the possible kinds of types we allow in class bases.
@@ -17,7 +18,7 @@ use crate::types::{
 /// automatically construct the default specialization for that class.
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, salsa::Update, get_size2::GetSize)]
 pub enum ClassBase<'db> {
-    Dynamic(DynamicType),
+    Dynamic(DynamicType<'db>),
     Class(ClassType<'db>),
     /// Although `Protocol` is not a class in typeshed's stubs, it is at runtime,
     /// and can appear in the MRO of a class.
@@ -53,6 +54,7 @@ impl<'db> ClassBase<'db> {
                 | DynamicType::TodoTypeAlias
                 | DynamicType::TodoUnpack,
             ) => "@Todo",
+            ClassBase::Dynamic(DynamicType::Divergent(_)) => "Divergent",
             ClassBase::Protocol => "Protocol",
             ClassBase::Generic => "Generic",
             ClassBase::TypedDict => "TypedDict",
@@ -67,6 +69,10 @@ impl<'db> ClassBase<'db> {
             .map_or(Self::unknown(), Self::Class)
     }
 
+    pub(super) const fn is_typed_dict(self) -> bool {
+        matches!(self, ClassBase::TypedDict)
+    }
+
     /// Attempt to resolve `ty` into a `ClassBase`.
     ///
     /// Return `None` if `ty` is not an acceptable type for a class base.
@@ -77,16 +83,10 @@ impl<'db> ClassBase<'db> {
     ) -> Option<Self> {
         match ty {
             Type::Dynamic(dynamic) => Some(Self::Dynamic(dynamic)),
-            Type::ClassLiteral(literal) => {
-                if literal.is_known(db, KnownClass::Any) {
-                    Some(Self::Dynamic(DynamicType::Any))
-                } else {
-                    Some(Self::Class(literal.default_specialization(db)))
-                }
-            }
+            Type::ClassLiteral(literal) => Some(Self::Class(literal.default_specialization(db))),
             Type::GenericAlias(generic) => Some(Self::Class(ClassType::Generic(generic))),
             Type::NominalInstance(instance)
-                if instance.class(db).is_known(db, KnownClass::GenericAlias) =>
+                if instance.has_known_class(db, KnownClass::GenericAlias) =>
             {
                 Self::try_from_type(db, todo_type!("GenericAlias instance"), subclass)
             }
@@ -145,7 +145,7 @@ impl<'db> ClassBase<'db> {
             | Type::FunctionLiteral(_)
             | Type::Callable(..)
             | Type::BoundMethod(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::WrapperDescriptor(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
@@ -155,7 +155,6 @@ impl<'db> ClassBase<'db> {
             | Type::StringLiteral(_)
             | Type::LiteralString
             | Type::ModuleLiteral(_)
-            | Type::NonInferableTypeVar(_)
             | Type::TypeVar(_)
             | Type::BoundSuper(_)
             | Type::ProtocolInstance(_)
@@ -170,7 +169,8 @@ impl<'db> ClassBase<'db> {
                 KnownInstanceType::TypeAliasType(_)
                 | KnownInstanceType::TypeVar(_)
                 | KnownInstanceType::Deprecated(_)
-                | KnownInstanceType::Field(_) => None,
+                | KnownInstanceType::Field(_)
+                | KnownInstanceType::ConstraintSet(_) => None,
             },
 
             Type::SpecialForm(special_form) => match special_form {
@@ -193,19 +193,22 @@ impl<'db> ClassBase<'db> {
                 | SpecialFormType::ReadOnly
                 | SpecialFormType::Optional
                 | SpecialFormType::Not
+                | SpecialFormType::Top
+                | SpecialFormType::Bottom
                 | SpecialFormType::Intersection
                 | SpecialFormType::TypeOf
                 | SpecialFormType::CallableTypeOf
                 | SpecialFormType::AlwaysTruthy
                 | SpecialFormType::AlwaysFalsy => None,
 
+                SpecialFormType::Any => Some(Self::Dynamic(DynamicType::Any)),
                 SpecialFormType::Unknown => Some(Self::unknown()),
 
                 SpecialFormType::Protocol => Some(Self::Protocol),
                 SpecialFormType::Generic => Some(Self::Generic),
 
                 SpecialFormType::NamedTuple => {
-                    let fields = subclass.own_fields(db, None);
+                    let fields = subclass.own_fields(db, None, CodeGeneratorKind::NamedTuple);
                     Self::try_from_type(
                         db,
                         TupleType::heterogeneous(
@@ -273,11 +276,12 @@ impl<'db> ClassBase<'db> {
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
         match self {
             Self::Class(class) => {
-                Self::Class(class.apply_type_mapping_impl(db, type_mapping, visitor))
+                Self::Class(class.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
             Self::Dynamic(_) | Self::Generic | Self::Protocol | Self::TypedDict => self,
         }
@@ -289,16 +293,30 @@ impl<'db> ClassBase<'db> {
         specialization: Option<Specialization<'db>>,
     ) -> Self {
         if let Some(specialization) = specialization {
-            self.apply_type_mapping_impl(
+            let new_self = self.apply_type_mapping_impl(
                 db,
                 &TypeMapping::Specialization(specialization),
-                &TypeTransformer::default(),
-            )
+                TypeContext::default(),
+                &ApplyTypeMappingVisitor::default(),
+            );
+            match specialization.materialization_kind(db) {
+                None => new_self,
+                Some(materialization_kind) => new_self.materialize(db, materialization_kind),
+            }
         } else {
             self
         }
     }
 
+    fn materialize(self, db: &'db dyn Db, kind: MaterializationKind) -> Self {
+        self.apply_type_mapping_impl(
+            db,
+            &TypeMapping::Materialize(kind),
+            TypeContext::default(),
+            &ApplyTypeMappingVisitor::default(),
+        )
+    }
+
     pub(super) fn has_cyclic_mro(self, db: &'db dyn Db) -> bool {
         match self {
             ClassBase::Class(class) => {
diff --git a/crates/ty_python_semantic/src/types/constraints.rs b/crates/ty_python_semantic/src/types/constraints.rs
new file mode 100644
index 0000000000..832aa71ab2
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/constraints.rs
@@ -0,0 +1,1583 @@
+//! Constraints under which type properties hold
+//!
+//! For "concrete" types (which contain no type variables), type properties like assignability have
+//! simple answers: one type is either assignable to another type, or it isn't. (The _rules_ for
+//! comparing two particular concrete types can be rather complex, but the _answer_ is a simple
+//! "yes" or "no".)
+//!
+//! These properties are more complex when type variables are involved, because there are (usually)
+//! many different concrete types that a typevar can be specialized to, and the type property might
+//! hold for some specializations, but not for others. That means that for types that include
+//! typevars, "Is this type assignable to another?" no longer makes sense as a question. The better
+//! question is: "Under what constraints is this type assignable to another?".
+//!
+//! This module provides the machinery for representing the "under what constraints" part of that
+//! question.
+//!
+//! An individual constraint restricts the specialization of a single typevar to be within a
+//! particular lower and upper bound. (A type is within a lower and upper bound if it is a
+//! supertype of the lower bound and a subtype of the upper bound.) You can then build up more
+//! complex constraint sets using union, intersection, and negation operations. We use a [binary
+//! decision diagram][bdd] (BDD) to represent a constraint set.
+//!
+//! Note that all lower and upper bounds in a constraint must be fully static. We take the bottom
+//! and top materializations of the types to remove any gradual forms if needed.
+//!
+//! Lower and upper bounds must also be normalized. This lets us identify, for instance,
+//! two constraints with equivalent but differently ordered unions as their bounds.
+//!
+//! NOTE: This module is currently in a transitional state. We've added the BDD [`ConstraintSet`]
+//! representation, and updated all of our property checks to build up a constraint set and then
+//! check whether it is ever or always satisfiable, as appropriate. We are not yet inferring
+//! specializations from those constraints.
+//!
+//! ### Examples
+//!
+//! For instance, in the following Python code:
+//!
+//! ```py
+//! class A: ...
+//! class B(A): ...
+//!
+//! def _[T: B](t: T) -> None: ...
+//! def _[U: (int, str)](u: U) -> None: ...
+//! ```
+//!
+//! The typevar `T` has an upper bound of `B`, which would translate into the constraint `Never ≤ T
+//! ≤ B`. (Every type is a supertype of `Never`, so having `Never` as a lower bound means that
+//! there is effectively no lower bound. Similarly, an upper bound of `object` means that there is
+//! effectively no upper bound.) The `T ≤ B` part expresses that the type can specialize to any
+//! type that is a subtype of B.
+//!
+//! The typevar `U` is constrained to be either `int` or `str`, which would translate into the
+//! constraint `(int ≤ T ≤ int) ∪ (str ≤ T ≤ str)`. When the lower and upper bounds are the same,
+//! the constraint says that the typevar must specialize to that _exact_ type, not to a subtype or
+//! supertype of it.
+//!
+//! [bdd]: https://en.wikipedia.org/wiki/Binary_decision_diagram
+
+use std::cmp::Ordering;
+use std::fmt::Display;
+
+use itertools::Itertools;
+use rustc_hash::FxHashSet;
+use salsa::plumbing::AsId;
+
+use crate::Db;
+use crate::types::{BoundTypeVarIdentity, IntersectionType, Type, UnionType};
+
+/// An extension trait for building constraint sets from [`Option`] values.
+pub(crate) trait OptionConstraintsExtension<T> {
+    /// Returns a constraint set that is always satisfiable if the option is `None`; otherwise
+    /// applies a function to determine under what constraints the value inside of it holds.
+    fn when_none_or<'db>(self, f: impl FnOnce(T) -> ConstraintSet<'db>) -> ConstraintSet<'db>;
+
+    /// Returns a constraint set that is never satisfiable if the option is `None`; otherwise
+    /// applies a function to determine under what constraints the value inside of it holds.
+    fn when_some_and<'db>(self, f: impl FnOnce(T) -> ConstraintSet<'db>) -> ConstraintSet<'db>;
+}
+
+impl<T> OptionConstraintsExtension<T> for Option<T> {
+    fn when_none_or<'db>(self, f: impl FnOnce(T) -> ConstraintSet<'db>) -> ConstraintSet<'db> {
+        match self {
+            Some(value) => f(value),
+            None => ConstraintSet::always(),
+        }
+    }
+
+    fn when_some_and<'db>(self, f: impl FnOnce(T) -> ConstraintSet<'db>) -> ConstraintSet<'db> {
+        match self {
+            Some(value) => f(value),
+            None => ConstraintSet::never(),
+        }
+    }
+}
+
+/// An extension trait for building constraint sets from an [`Iterator`].
+pub(crate) trait IteratorConstraintsExtension<T> {
+    /// Returns the constraints under which any element of the iterator holds.
+    ///
+    /// This method short-circuits; if we encounter any element that
+    /// [`is_always_satisfied`][ConstraintSet::is_always_satisfied] true, then the overall result
+    /// must be as well, and we stop consuming elements from the iterator.
+    fn when_any<'db>(
+        self,
+        db: &'db dyn Db,
+        f: impl FnMut(T) -> ConstraintSet<'db>,
+    ) -> ConstraintSet<'db>;
+
+    /// Returns the constraints under which every element of the iterator holds.
+    ///
+    /// This method short-circuits; if we encounter any element that
+    /// [`is_never_satisfied`][ConstraintSet::is_never_satisfied] true, then the overall result
+    /// must be as well, and we stop consuming elements from the iterator.
+    fn when_all<'db>(
+        self,
+        db: &'db dyn Db,
+        f: impl FnMut(T) -> ConstraintSet<'db>,
+    ) -> ConstraintSet<'db>;
+}
+
+impl<I, T> IteratorConstraintsExtension<T> for I
+where
+    I: Iterator<Item = T>,
+{
+    fn when_any<'db>(
+        self,
+        db: &'db dyn Db,
+        mut f: impl FnMut(T) -> ConstraintSet<'db>,
+    ) -> ConstraintSet<'db> {
+        let mut result = ConstraintSet::never();
+        for child in self {
+            if result.union(db, f(child)).is_always_satisfied() {
+                return result;
+            }
+        }
+        result
+    }
+
+    fn when_all<'db>(
+        self,
+        db: &'db dyn Db,
+        mut f: impl FnMut(T) -> ConstraintSet<'db>,
+    ) -> ConstraintSet<'db> {
+        let mut result = ConstraintSet::always();
+        for child in self {
+            if result.intersect(db, f(child)).is_never_satisfied() {
+                return result;
+            }
+        }
+        result
+    }
+}
+
+/// A set of constraints under which a type property holds.
+///
+/// This is called a "set of constraint sets", and denoted _𝒮_, in [[POPL2015][]].
+///
+/// [POPL2015]: https://doi.org/10.1145/2676726.2676991
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, get_size2::GetSize, salsa::Update)]
+pub struct ConstraintSet<'db> {
+    /// The BDD representing this constraint set
+    node: Node<'db>,
+}
+
+impl<'db> ConstraintSet<'db> {
+    fn never() -> Self {
+        Self {
+            node: Node::AlwaysFalse,
+        }
+    }
+
+    fn always() -> Self {
+        Self {
+            node: Node::AlwaysTrue,
+        }
+    }
+
+    /// Returns whether this constraint set never holds
+    pub(crate) fn is_never_satisfied(self) -> bool {
+        self.node.is_never_satisfied()
+    }
+
+    /// Returns whether this constraint set always holds
+    pub(crate) fn is_always_satisfied(self) -> bool {
+        self.node.is_always_satisfied()
+    }
+
+    /// Updates this constraint set to hold the union of itself and another constraint set.
+    pub(crate) fn union(&mut self, db: &'db dyn Db, other: Self) -> Self {
+        self.node = self.node.or(db, other.node);
+        *self
+    }
+
+    /// Updates this constraint set to hold the intersection of itself and another constraint set.
+    pub(crate) fn intersect(&mut self, db: &'db dyn Db, other: Self) -> Self {
+        self.node = self.node.and(db, other.node);
+        *self
+    }
+
+    /// Returns the negation of this constraint set.
+    pub(crate) fn negate(self, db: &'db dyn Db) -> Self {
+        Self {
+            node: self.node.negate(db),
+        }
+    }
+
+    /// Returns the intersection of this constraint set and another. The other constraint set is
+    /// provided as a thunk, to implement short-circuiting: the thunk is not forced if the
+    /// constraint set is already saturated.
+    pub(crate) fn and(mut self, db: &'db dyn Db, other: impl FnOnce() -> Self) -> Self {
+        if !self.is_never_satisfied() {
+            self.intersect(db, other());
+        }
+        self
+    }
+
+    /// Returns the union of this constraint set and another. The other constraint set is provided
+    /// as a thunk, to implement short-circuiting: the thunk is not forced if the constraint set is
+    /// already saturated.
+    pub(crate) fn or(mut self, db: &'db dyn Db, other: impl FnOnce() -> Self) -> Self {
+        if !self.is_always_satisfied() {
+            self.union(db, other());
+        }
+        self
+    }
+
+    pub(crate) fn range(
+        db: &'db dyn Db,
+        lower: Type<'db>,
+        typevar: BoundTypeVarIdentity<'db>,
+        upper: Type<'db>,
+    ) -> Self {
+        let lower = lower.bottom_materialization(db);
+        let upper = upper.top_materialization(db);
+        Self {
+            node: ConstrainedTypeVar::new_node(db, lower, typevar, upper),
+        }
+    }
+
+    pub(crate) fn negated_range(
+        db: &'db dyn Db,
+        lower: Type<'db>,
+        typevar: BoundTypeVarIdentity<'db>,
+        upper: Type<'db>,
+    ) -> Self {
+        Self::range(db, lower, typevar, upper).negate(db)
+    }
+
+    pub(crate) fn display(self, db: &'db dyn Db) -> impl Display {
+        self.node.display(db)
+    }
+}
+
+impl From<bool> for ConstraintSet<'_> {
+    fn from(b: bool) -> Self {
+        if b { Self::always() } else { Self::never() }
+    }
+}
+
+/// An individual constraint in a constraint set. This restricts a single typevar to be within a
+/// lower and upper bound.
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+pub(crate) struct ConstrainedTypeVar<'db> {
+    typevar: BoundTypeVarIdentity<'db>,
+    lower: Type<'db>,
+    upper: Type<'db>,
+}
+
+// The Salsa heap is tracked separately.
+impl get_size2::GetSize for ConstrainedTypeVar<'_> {}
+
+#[salsa::tracked]
+impl<'db> ConstrainedTypeVar<'db> {
+    /// Returns a new range constraint.
+    ///
+    /// Panics if `lower` and `upper` are not both fully static.
+    fn new_node(
+        db: &'db dyn Db,
+        lower: Type<'db>,
+        typevar: BoundTypeVarIdentity<'db>,
+        upper: Type<'db>,
+    ) -> Node<'db> {
+        debug_assert_eq!(lower, lower.bottom_materialization(db));
+        debug_assert_eq!(upper, upper.top_materialization(db));
+
+        // If `lower ≰ upper`, then the constraint cannot be satisfied, since there is no type that
+        // is both greater than `lower`, and less than `upper`.
+        if !lower.is_subtype_of(db, upper) {
+            return Node::AlwaysFalse;
+        }
+
+        // If the requested constraint is `Never ≤ T ≤ object`, then the typevar can be specialized
+        // to _any_ type, and the constraint does nothing.
+        if lower.is_never() && upper.is_object() {
+            return Node::AlwaysTrue;
+        }
+
+        let lower = lower.normalized(db);
+        let upper = upper.normalized(db);
+        Node::new_constraint(db, ConstrainedTypeVar::new(db, typevar, lower, upper))
+    }
+
+    fn when_true(self) -> ConstraintAssignment<'db> {
+        ConstraintAssignment::Positive(self)
+    }
+
+    fn when_false(self) -> ConstraintAssignment<'db> {
+        ConstraintAssignment::Negative(self)
+    }
+
+    fn contains(self, db: &'db dyn Db, other: Self) -> bool {
+        if self.typevar(db) != other.typevar(db) {
+            return false;
+        }
+        self.lower(db).is_subtype_of(db, other.lower(db))
+            && other.upper(db).is_subtype_of(db, self.upper(db))
+    }
+
+    /// Defines the ordering of the variables in a constraint set BDD.
+    ///
+    /// If we only care about _correctness_, we can choose any ordering that we want, as long as
+    /// it's consistent. However, different orderings can have very different _performance_
+    /// characteristics. Many BDD libraries attempt to reorder variables on the fly while building
+    /// and working with BDDs. We don't do that, but we have tried to make some simple choices that
+    /// have clear wins.
+    ///
+    /// In particular, we compare the _typevars_ of each constraint first, so that all constraints
+    /// for a single typevar are guaranteed to be adjacent in the BDD structure. There are several
+    /// simplifications that we perform that operate on constraints with the same typevar, and this
+    /// ensures that we can find all candidate simplifications more easily.
+    fn ordering(self, db: &'db dyn Db) -> impl Ord {
+        (self.typevar(db), self.as_id())
+    }
+
+    /// Returns whether this constraint implies another — i.e., whether every type that
+    /// satisfies this constraint also satisfies `other`.
+    ///
+    /// This is used (among other places) to simplify how we display constraint sets, by removing
+    /// redundant constraints from a clause.
+    fn implies(self, db: &'db dyn Db, other: Self) -> bool {
+        other.contains(db, self)
+    }
+
+    /// Returns the intersection of two range constraints, or `None` if the intersection is empty.
+    fn intersect(self, db: &'db dyn Db, other: Self) -> Option<Self> {
+        // (s₁ ≤ α ≤ t₁) ∧ (s₂ ≤ α ≤ t₂) = (s₁ ∪ s₂) ≤ α ≤ (t₁ ∩ t₂))
+        let lower = UnionType::from_elements(db, [self.lower(db), other.lower(db)]).normalized(db);
+        let upper =
+            IntersectionType::from_elements(db, [self.upper(db), other.upper(db)]).normalized(db);
+
+        // If `lower ≰ upper`, then the intersection is empty, since there is no type that is both
+        // greater than `lower`, and less than `upper`.
+        if !lower.is_subtype_of(db, upper) {
+            return None;
+        }
+
+        Some(Self::new(db, self.typevar(db), lower, upper))
+    }
+
+    fn display(self, db: &'db dyn Db) -> impl Display {
+        self.display_inner(db, false)
+    }
+
+    fn display_negated(self, db: &'db dyn Db) -> impl Display {
+        self.display_inner(db, true)
+    }
+
+    fn display_inner(self, db: &'db dyn Db, negated: bool) -> impl Display {
+        struct DisplayConstrainedTypeVar<'db> {
+            constraint: ConstrainedTypeVar<'db>,
+            negated: bool,
+            db: &'db dyn Db,
+        }
+
+        impl Display for DisplayConstrainedTypeVar<'_> {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                let lower = self.constraint.lower(self.db);
+                let upper = self.constraint.upper(self.db);
+                if lower.is_equivalent_to(self.db, upper) {
+                    return write!(
+                        f,
+                        "({} {} {})",
+                        self.constraint.typevar(self.db).display(self.db),
+                        if self.negated { "≠" } else { "=" },
+                        lower.display(self.db)
+                    );
+                }
+
+                if self.negated {
+                    f.write_str("¬")?;
+                }
+                f.write_str("(")?;
+                if !lower.is_never() {
+                    write!(f, "{} ≤ ", lower.display(self.db))?;
+                }
+                self.constraint.typevar(self.db).display(self.db).fmt(f)?;
+                if !upper.is_object() {
+                    write!(f, " ≤ {}", upper.display(self.db))?;
+                }
+                f.write_str(")")
+            }
+        }
+
+        DisplayConstrainedTypeVar {
+            constraint: self,
+            negated,
+            db,
+        }
+    }
+}
+
+/// A BDD node.
+///
+/// The "variables" of a constraint set BDD are individual constraints, represented by an interned
+/// [`ConstrainedTypeVar`].
+///
+/// Terminal nodes (`false` and `true`) have their own dedicated enum variants. The
+/// [`Interior`][InteriorNode] variant represents interior nodes.
+///
+/// BDD nodes are _reduced_, which means that there are no duplicate nodes (which we handle via
+/// Salsa interning), and that there are no redundant nodes, with `if_true` and `if_false` edges
+/// that point at the same node.
+///
+/// BDD nodes are also _ordered_, meaning that every path from the root of a BDD to a terminal node
+/// visits variables in the same order. [`ConstrainedTypeVar::ordering`] defines the variable
+/// ordering that we use for constraint set BDDs.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, get_size2::GetSize, salsa::Update)]
+enum Node<'db> {
+    AlwaysFalse,
+    AlwaysTrue,
+    Interior(InteriorNode<'db>),
+}
+
+impl<'db> Node<'db> {
+    /// Creates a new BDD node, ensuring that it is fully reduced.
+    fn new(
+        db: &'db dyn Db,
+        constraint: ConstrainedTypeVar<'db>,
+        if_true: Node<'db>,
+        if_false: Node<'db>,
+    ) -> Self {
+        debug_assert!((if_true.root_constraint(db)).is_none_or(|root_constraint| {
+            root_constraint.ordering(db) > constraint.ordering(db)
+        }));
+        debug_assert!(
+            (if_false.root_constraint(db)).is_none_or(|root_constraint| {
+                root_constraint.ordering(db) > constraint.ordering(db)
+            })
+        );
+        if if_true == if_false {
+            return if_true;
+        }
+        Self::Interior(InteriorNode::new(db, constraint, if_true, if_false))
+    }
+
+    /// Creates a new BDD node for an individual constraint. (The BDD will evaluate to `true` when
+    /// the constraint holds, and to `false` when it does not.)
+    fn new_constraint(db: &'db dyn Db, constraint: ConstrainedTypeVar<'db>) -> Self {
+        Self::Interior(InteriorNode::new(
+            db,
+            constraint,
+            Node::AlwaysTrue,
+            Node::AlwaysFalse,
+        ))
+    }
+
+    /// Creates a new BDD node for a positive or negative individual constraint. (For a positive
+    /// constraint, this returns the same BDD node as [`new_constraint`][Self::new_constraint]. For
+    /// a negative constraint, it returns the negation of that BDD node.)
+    fn new_satisfied_constraint(db: &'db dyn Db, constraint: ConstraintAssignment<'db>) -> Self {
+        match constraint {
+            ConstraintAssignment::Positive(constraint) => Self::Interior(InteriorNode::new(
+                db,
+                constraint,
+                Node::AlwaysTrue,
+                Node::AlwaysFalse,
+            )),
+            ConstraintAssignment::Negative(constraint) => Self::Interior(InteriorNode::new(
+                db,
+                constraint,
+                Node::AlwaysFalse,
+                Node::AlwaysTrue,
+            )),
+        }
+    }
+
+    /// Returns the BDD variable of the root node of this BDD, or `None` if this BDD is a terminal
+    /// node.
+    fn root_constraint(self, db: &'db dyn Db) -> Option<ConstrainedTypeVar<'db>> {
+        match self {
+            Node::Interior(interior) => Some(interior.constraint(db)),
+            _ => None,
+        }
+    }
+
+    /// Returns whether this BDD represent the constant function `true`.
+    fn is_always_satisfied(self) -> bool {
+        matches!(self, Node::AlwaysTrue)
+    }
+
+    /// Returns whether this BDD represent the constant function `false`.
+    fn is_never_satisfied(self) -> bool {
+        matches!(self, Node::AlwaysFalse)
+    }
+
+    /// Returns the negation of this BDD.
+    fn negate(self, db: &'db dyn Db) -> Self {
+        match self {
+            Node::AlwaysTrue => Node::AlwaysFalse,
+            Node::AlwaysFalse => Node::AlwaysTrue,
+            Node::Interior(interior) => interior.negate(db),
+        }
+    }
+
+    /// Returns the `or` or union of two BDDs.
+    fn or(self, db: &'db dyn Db, other: Self) -> Self {
+        match (self, other) {
+            (Node::AlwaysTrue, _) | (_, Node::AlwaysTrue) => Node::AlwaysTrue,
+            (Node::AlwaysFalse, other) | (other, Node::AlwaysFalse) => other,
+            (Node::Interior(a), Node::Interior(b)) => {
+                // OR is commutative, which lets us halve the cache requirements
+                let (a, b) = if b.0 < a.0 { (b, a) } else { (a, b) };
+                a.or(db, b)
+            }
+        }
+    }
+
+    /// Returns the `and` or intersection of two BDDs.
+    fn and(self, db: &'db dyn Db, other: Self) -> Self {
+        match (self, other) {
+            (Node::AlwaysFalse, _) | (_, Node::AlwaysFalse) => Node::AlwaysFalse,
+            (Node::AlwaysTrue, other) | (other, Node::AlwaysTrue) => other,
+            (Node::Interior(a), Node::Interior(b)) => {
+                // AND is commutative, which lets us halve the cache requirements
+                let (a, b) = if b.0 < a.0 { (b, a) } else { (a, b) };
+                a.and(db, b)
+            }
+        }
+    }
+
+    /// Returns a new BDD that evaluates to `true` when both input BDDs evaluate to the same
+    /// result.
+    fn iff(self, db: &'db dyn Db, other: Self) -> Self {
+        match (self, other) {
+            (Node::AlwaysFalse, Node::AlwaysFalse) | (Node::AlwaysTrue, Node::AlwaysTrue) => {
+                Node::AlwaysTrue
+            }
+            (Node::AlwaysTrue, Node::AlwaysFalse) | (Node::AlwaysFalse, Node::AlwaysTrue) => {
+                Node::AlwaysFalse
+            }
+            (Node::AlwaysTrue | Node::AlwaysFalse, Node::Interior(interior)) => Node::new(
+                db,
+                interior.constraint(db),
+                self.iff(db, interior.if_true(db)),
+                self.iff(db, interior.if_false(db)),
+            ),
+            (Node::Interior(interior), Node::AlwaysTrue | Node::AlwaysFalse) => Node::new(
+                db,
+                interior.constraint(db),
+                interior.if_true(db).iff(db, other),
+                interior.if_false(db).iff(db, other),
+            ),
+            (Node::Interior(a), Node::Interior(b)) => {
+                // IFF is commutative, which lets us halve the cache requirements
+                let (a, b) = if b.0 < a.0 { (b, a) } else { (a, b) };
+                a.iff(db, b)
+            }
+        }
+    }
+
+    /// Returns the `if-then-else` of three BDDs: when `self` evaluates to `true`, it returns what
+    /// `then_node` evaluates to; otherwise it returns what `else_node` evaluates to.
+    fn ite(self, db: &'db dyn Db, then_node: Self, else_node: Self) -> Self {
+        self.and(db, then_node)
+            .or(db, self.negate(db).and(db, else_node))
+    }
+
+    /// Returns a new BDD that returns the same results as `self`, but with some inputs fixed to
+    /// particular values. (Those variables will not be checked when evaluating the result, and
+    /// will not be present in the result.)
+    ///
+    /// Also returns whether _all_ of the restricted variables appeared in the BDD.
+    fn restrict(
+        self,
+        db: &'db dyn Db,
+        assignment: impl IntoIterator<Item = ConstraintAssignment<'db>>,
+    ) -> (Self, bool) {
+        assignment
+            .into_iter()
+            .fold((self, true), |(restricted, found), assignment| {
+                let (restricted, found_this) = restricted.restrict_one(db, assignment);
+                (restricted, found && found_this)
+            })
+    }
+
+    /// Returns a new BDD that returns the same results as `self`, but with one input fixed to a
+    /// particular value. (That variable will be not be checked when evaluating the result, and
+    /// will not be present in the result.)
+    ///
+    /// Also returns whether the restricted variable appeared in the BDD.
+    fn restrict_one(self, db: &'db dyn Db, assignment: ConstraintAssignment<'db>) -> (Self, bool) {
+        match self {
+            Node::AlwaysTrue => (Node::AlwaysTrue, false),
+            Node::AlwaysFalse => (Node::AlwaysFalse, false),
+            Node::Interior(interior) => interior.restrict_one(db, assignment),
+        }
+    }
+
+    /// Returns a new BDD with any occurrence of `left ∧ right` replaced with `replacement`.
+    fn substitute_intersection(
+        self,
+        db: &'db dyn Db,
+        left: ConstraintAssignment<'db>,
+        right: ConstraintAssignment<'db>,
+        replacement: Node<'db>,
+    ) -> Self {
+        // We perform a Shannon expansion to find out what the input BDD evaluates to when:
+        //   - left and right are both true
+        //   - left is false
+        //   - left is true and right is false
+        // This covers the entire truth table of `left ∧ right`.
+        let (when_left_and_right, both_found) = self.restrict(db, [left, right]);
+        if !both_found {
+            // If left and right are not both present in the input BDD, we should not even attempt
+            // the substitution, since the Shannon expansion might introduce the missing variables!
+            // That confuses us below when we try to detect whether the substitution is consistent
+            // with the input.
+            return self;
+        }
+        let (when_not_left, _) = self.restrict(db, [left.negated()]);
+        let (when_left_but_not_right, _) = self.restrict(db, [left, right.negated()]);
+
+        // The result should test `replacement`, and when it's true, it should produce the same
+        // output that input would when `left ∧ right` is true. When replacement is false, it
+        // should fall back on testing left and right individually to make sure we produce the
+        // correct outputs in the `¬(left ∧ right)` case. So the result is
+        //
+        //   if replacement
+        //     when_left_and_right
+        //   else if not left
+        //     when_not_left
+        //   else if not right
+        //     when_left_but_not_right
+        //   else
+        //     false
+        //
+        //  (Note that the `else` branch shouldn't be reachable, but we have to provide something!)
+        let left_node = Node::new_satisfied_constraint(db, left);
+        let right_node = Node::new_satisfied_constraint(db, right);
+        let right_result = right_node.ite(db, Node::AlwaysFalse, when_left_but_not_right);
+        let left_result = left_node.ite(db, right_result, when_not_left);
+        let result = replacement.ite(db, when_left_and_right, left_result);
+
+        // Lastly, verify that the result is consistent with the input. (It must produce the same
+        // results when `left ∧ right`.) If it doesn't, the substitution isn't valid, and we should
+        // return the original BDD unmodified.
+        let validity = replacement.iff(db, left_node.and(db, right_node));
+        let constrained_original = self.and(db, validity);
+        let constrained_replacement = result.and(db, validity);
+        if constrained_original == constrained_replacement {
+            result
+        } else {
+            self
+        }
+    }
+
+    /// Returns a new BDD with any occurrence of `left ∨ right` replaced with `replacement`.
+    fn substitute_union(
+        self,
+        db: &'db dyn Db,
+        left: ConstraintAssignment<'db>,
+        right: ConstraintAssignment<'db>,
+        replacement: Node<'db>,
+    ) -> Self {
+        // We perform a Shannon expansion to find out what the input BDD evaluates to when:
+        //   - left and right are both true
+        //   - left is true and right is false
+        //   - left is false and right is true
+        //   - left and right are both false
+        // This covers the entire truth table of `left ∨ right`.
+        let (when_l1_r1, both_found) = self.restrict(db, [left, right]);
+        if !both_found {
+            // If left and right are not both present in the input BDD, we should not even attempt
+            // the substitution, since the Shannon expansion might introduce the missing variables!
+            // That confuses us below when we try to detect whether the substitution is consistent
+            // with the input.
+            return self;
+        }
+        let (when_l0_r0, _) = self.restrict(db, [left.negated(), right.negated()]);
+        let (when_l1_r0, _) = self.restrict(db, [left, right.negated()]);
+        let (when_l0_r1, _) = self.restrict(db, [left.negated(), right]);
+
+        // The result should test `replacement`, and when it's true, it should produce the same
+        // output that input would when `left ∨ right` is true. For OR, this is the union of what
+        // the input produces for the three cases that comprise `left ∨ right`. When `replacement`
+        // is false, the result should produce the same output that input would when
+        // `¬(left ∨ right)`, i.e. when `left ∧ right`. So the result is
+        //
+        //   if replacement
+        //     or(when_l1_r1, when_l1_r0, when_r0_l1)
+        //   else
+        //     when_l0_r0
+        let result = replacement.ite(
+            db,
+            when_l1_r0.or(db, when_l0_r1.or(db, when_l1_r1)),
+            when_l0_r0,
+        );
+
+        // Lastly, verify that the result is consistent with the input. (It must produce the same
+        // results when `left ∨ right`.) If it doesn't, the substitution isn't valid, and we should
+        // return the original BDD unmodified.
+        let left_node = Node::new_satisfied_constraint(db, left);
+        let right_node = Node::new_satisfied_constraint(db, right);
+        let validity = replacement.iff(db, left_node.or(db, right_node));
+        let constrained_original = self.and(db, validity);
+        let constrained_replacement = result.and(db, validity);
+        if constrained_original == constrained_replacement {
+            result
+        } else {
+            self
+        }
+    }
+
+    /// Invokes a closure for each constraint variable that appears anywhere in a BDD. (Any given
+    /// constraint can appear multiple times in different paths from the root; we do not
+    /// deduplicate those constraints, and will instead invoke the callback each time we encounter
+    /// the constraint.)
+    fn for_each_constraint(self, db: &'db dyn Db, f: &mut dyn FnMut(ConstrainedTypeVar<'db>)) {
+        let Node::Interior(interior) = self else {
+            return;
+        };
+        f(interior.constraint(db));
+        interior.if_true(db).for_each_constraint(db, f);
+        interior.if_false(db).for_each_constraint(db, f);
+    }
+
+    /// Simplifies a BDD, replacing constraints with simpler or smaller constraints where possible.
+    fn simplify(self, db: &'db dyn Db) -> Self {
+        match self {
+            Node::AlwaysTrue | Node::AlwaysFalse => self,
+            Node::Interior(interior) => interior.simplify(db),
+        }
+    }
+
+    /// Returns clauses describing all of the variable assignments that cause this BDD to evaluate
+    /// to `true`. (This translates the boolean function that this BDD represents into DNF form.)
+    fn satisfied_clauses(self, db: &'db dyn Db) -> SatisfiedClauses<'db> {
+        struct Searcher<'db> {
+            clauses: SatisfiedClauses<'db>,
+            current_clause: SatisfiedClause<'db>,
+        }
+
+        impl<'db> Searcher<'db> {
+            fn visit_node(&mut self, db: &'db dyn Db, node: Node<'db>) {
+                match node {
+                    Node::AlwaysFalse => {}
+                    Node::AlwaysTrue => self.clauses.push(self.current_clause.clone()),
+                    Node::Interior(interior) => {
+                        let interior_constraint = interior.constraint(db);
+                        self.current_clause.push(interior_constraint.when_true());
+                        self.visit_node(db, interior.if_true(db));
+                        self.current_clause.pop();
+                        self.current_clause.push(interior_constraint.when_false());
+                        self.visit_node(db, interior.if_false(db));
+                        self.current_clause.pop();
+                    }
+                }
+            }
+        }
+
+        let mut searcher = Searcher {
+            clauses: SatisfiedClauses::default(),
+            current_clause: SatisfiedClause::default(),
+        };
+        searcher.visit_node(db, self);
+        searcher.clauses
+    }
+
+    fn display(self, db: &'db dyn Db) -> impl Display {
+        // To render a BDD in DNF form, you perform a depth-first search of the BDD tree, looking
+        // for any path that leads to the AlwaysTrue terminal. Each such path represents one of the
+        // intersection clauses in the DNF form. The path traverses zero or more interior nodes,
+        // and takes either the true or false edge from each one. That gives you the positive or
+        // negative individual constraints in the path's clause.
+        struct DisplayNode<'db> {
+            node: Node<'db>,
+            db: &'db dyn Db,
+        }
+
+        impl Display for DisplayNode<'_> {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                match self.node {
+                    Node::AlwaysTrue => f.write_str("always"),
+                    Node::AlwaysFalse => f.write_str("never"),
+                    Node::Interior(_) => {
+                        let mut clauses = self.node.satisfied_clauses(self.db);
+                        clauses.simplify(self.db);
+                        clauses.display(self.db).fmt(f)
+                    }
+                }
+            }
+        }
+
+        DisplayNode {
+            node: self.simplify(db),
+            db,
+        }
+    }
+
+    /// Displays the full graph structure of this BDD. `prefix` will be output before each line
+    /// other than the first. Produces output like the following:
+    ///
+    /// ```text
+    /// (T@_ = str)
+    /// ┡━₁ (U@_ = str)
+    /// │   ┡━₁ always
+    /// │   └─₀ (U@_ = bool)
+    /// │       ┡━₁ always
+    /// │       └─₀ never
+    /// └─₀ (T@_ = bool)
+    ///     ┡━₁ (U@_ = str)
+    ///     │   ┡━₁ always
+    ///     │   └─₀ (U@_ = bool)
+    ///     │       ┡━₁ always
+    ///     │       └─₀ never
+    ///     └─₀ never
+    /// ```
+    #[cfg_attr(not(test), expect(dead_code))] // Keep this around for debugging purposes
+    fn display_graph(self, db: &'db dyn Db, prefix: &dyn Display) -> impl Display {
+        struct DisplayNode<'a, 'db> {
+            db: &'db dyn Db,
+            node: Node<'db>,
+            prefix: &'a dyn Display,
+        }
+
+        impl<'a, 'db> DisplayNode<'a, 'db> {
+            fn new(db: &'db dyn Db, node: Node<'db>, prefix: &'a dyn Display) -> Self {
+                Self { db, node, prefix }
+            }
+        }
+
+        impl Display for DisplayNode<'_, '_> {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                match self.node {
+                    Node::AlwaysTrue => write!(f, "always"),
+                    Node::AlwaysFalse => write!(f, "never"),
+                    Node::Interior(interior) => {
+                        interior.constraint(self.db).display(self.db).fmt(f)?;
+                        // Calling display_graph recursively here causes rustc to claim that the
+                        // expect(unused) up above is unfulfilled!
+                        write!(
+                            f,
+                            "\n{}┡━₁ {}",
+                            self.prefix,
+                            DisplayNode::new(
+                                self.db,
+                                interior.if_true(self.db),
+                                &format_args!("{}│   ", self.prefix)
+                            ),
+                        )?;
+                        write!(
+                            f,
+                            "\n{}└─₀ {}",
+                            self.prefix,
+                            DisplayNode::new(
+                                self.db,
+                                interior.if_false(self.db),
+                                &format_args!("{}    ", self.prefix)
+                            ),
+                        )?;
+                        Ok(())
+                    }
+                }
+            }
+        }
+
+        DisplayNode::new(db, self, prefix)
+    }
+}
+
+/// An interior node of a BDD
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+struct InteriorNode<'db> {
+    constraint: ConstrainedTypeVar<'db>,
+    if_true: Node<'db>,
+    if_false: Node<'db>,
+}
+
+// The Salsa heap is tracked separately.
+impl get_size2::GetSize for InteriorNode<'_> {}
+
+#[salsa::tracked]
+impl<'db> InteriorNode<'db> {
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    fn negate(self, db: &'db dyn Db) -> Node<'db> {
+        Node::new(
+            db,
+            self.constraint(db),
+            self.if_true(db).negate(db),
+            self.if_false(db).negate(db),
+        )
+    }
+
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    fn or(self, db: &'db dyn Db, other: Self) -> Node<'db> {
+        let self_constraint = self.constraint(db);
+        let other_constraint = other.constraint(db);
+        match (self_constraint.ordering(db)).cmp(&other_constraint.ordering(db)) {
+            Ordering::Equal => Node::new(
+                db,
+                self_constraint,
+                self.if_true(db).or(db, other.if_true(db)),
+                self.if_false(db).or(db, other.if_false(db)),
+            ),
+            Ordering::Less => Node::new(
+                db,
+                self_constraint,
+                self.if_true(db).or(db, Node::Interior(other)),
+                self.if_false(db).or(db, Node::Interior(other)),
+            ),
+            Ordering::Greater => Node::new(
+                db,
+                other_constraint,
+                Node::Interior(self).or(db, other.if_true(db)),
+                Node::Interior(self).or(db, other.if_false(db)),
+            ),
+        }
+    }
+
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    fn and(self, db: &'db dyn Db, other: Self) -> Node<'db> {
+        let self_constraint = self.constraint(db);
+        let other_constraint = other.constraint(db);
+        match (self_constraint.ordering(db)).cmp(&other_constraint.ordering(db)) {
+            Ordering::Equal => Node::new(
+                db,
+                self_constraint,
+                self.if_true(db).and(db, other.if_true(db)),
+                self.if_false(db).and(db, other.if_false(db)),
+            ),
+            Ordering::Less => Node::new(
+                db,
+                self_constraint,
+                self.if_true(db).and(db, Node::Interior(other)),
+                self.if_false(db).and(db, Node::Interior(other)),
+            ),
+            Ordering::Greater => Node::new(
+                db,
+                other_constraint,
+                Node::Interior(self).and(db, other.if_true(db)),
+                Node::Interior(self).and(db, other.if_false(db)),
+            ),
+        }
+    }
+
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    fn iff(self, db: &'db dyn Db, other: Self) -> Node<'db> {
+        let self_constraint = self.constraint(db);
+        let other_constraint = other.constraint(db);
+        match (self_constraint.ordering(db)).cmp(&other_constraint.ordering(db)) {
+            Ordering::Equal => Node::new(
+                db,
+                self_constraint,
+                self.if_true(db).iff(db, other.if_true(db)),
+                self.if_false(db).iff(db, other.if_false(db)),
+            ),
+            Ordering::Less => Node::new(
+                db,
+                self_constraint,
+                self.if_true(db).iff(db, Node::Interior(other)),
+                self.if_false(db).iff(db, Node::Interior(other)),
+            ),
+            Ordering::Greater => Node::new(
+                db,
+                other_constraint,
+                Node::Interior(self).iff(db, other.if_true(db)),
+                Node::Interior(self).iff(db, other.if_false(db)),
+            ),
+        }
+    }
+
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    fn restrict_one(
+        self,
+        db: &'db dyn Db,
+        assignment: ConstraintAssignment<'db>,
+    ) -> (Node<'db>, bool) {
+        // If this node's variable is larger than the assignment's variable, then we have reached a
+        // point in the BDD where the assignment can no longer affect the result,
+        // and we can return early.
+        let self_constraint = self.constraint(db);
+        if assignment.constraint().ordering(db) < self_constraint.ordering(db) {
+            return (Node::Interior(self), false);
+        }
+
+        // Otherwise, check if this node's variable is in the assignment. If so, substitute the
+        // variable by replacing this node with its if_false/if_true edge, accordingly.
+        if assignment == self_constraint.when_true() {
+            (self.if_true(db), true)
+        } else if assignment == self_constraint.when_false() {
+            (self.if_false(db), true)
+        } else {
+            let (if_true, found_in_true) = self.if_true(db).restrict_one(db, assignment);
+            let (if_false, found_in_false) = self.if_false(db).restrict_one(db, assignment);
+            (
+                Node::new(db, self_constraint, if_true, if_false),
+                found_in_true || found_in_false,
+            )
+        }
+    }
+
+    #[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+    fn simplify(self, db: &'db dyn Db) -> Node<'db> {
+        // To simplify a non-terminal BDD, we find all pairs of constraints that are mentioned in
+        // the BDD. If any of those pairs can be simplified to some other BDD, we perform a
+        // substitution to replace the pair with the simplification.
+        //
+        // Some of the simplifications create _new_ constraints that weren't originally present in
+        // the BDD. If we encounter one of those cases, we need to check if we can simplify things
+        // further relative to that new constraint.
+        //
+        // To handle this, we keep track of the individual constraints that we have already
+        // discovered (`seen_constraints`), and a queue of constraint pairs that we still need to
+        // check (`to_visit`).
+
+        // Seed the seen set with all of the constraints that are present in the input BDD, and the
+        // visit queue with all pairs of those constraints. (We use "combinations" because we don't
+        // need to compare a constraint against itself, and because ordering doesn't matter.)
+        let mut seen_constraints = FxHashSet::default();
+        Node::Interior(self).for_each_constraint(db, &mut |constraint| {
+            seen_constraints.insert(constraint);
+        });
+        let mut to_visit: Vec<(_, _)> = (seen_constraints.iter().copied())
+            .tuple_combinations()
+            .collect();
+
+        // Repeatedly pop constraint pairs off of the visit queue, checking whether each pair can
+        // be simplified.
+        let mut simplified = Node::Interior(self);
+        while let Some((left_constraint, right_constraint)) = to_visit.pop() {
+            // If the constraints refer to different typevars, they trivially cannot be compared.
+            // TODO: We might need to consider when one constraint's upper or lower bound refers to
+            // the other constraint's typevar.
+            let typevar = left_constraint.typevar(db);
+            if typevar != right_constraint.typevar(db) {
+                continue;
+            }
+
+            // Containment: The range of one constraint might completely contain the range of the
+            // other. If so, there are several potential simplifications.
+            let larger_smaller = if left_constraint.contains(db, right_constraint) {
+                Some((left_constraint, right_constraint))
+            } else if right_constraint.contains(db, left_constraint) {
+                Some((right_constraint, left_constraint))
+            } else {
+                None
+            };
+            if let Some((larger_constraint, smaller_constraint)) = larger_smaller {
+                // larger ∨ smaller = larger
+                simplified = simplified.substitute_union(
+                    db,
+                    larger_constraint.when_true(),
+                    smaller_constraint.when_true(),
+                    Node::new_satisfied_constraint(db, larger_constraint.when_true()),
+                );
+
+                // ¬larger ∧ ¬smaller = ¬larger
+                simplified = simplified.substitute_intersection(
+                    db,
+                    larger_constraint.when_false(),
+                    smaller_constraint.when_false(),
+                    Node::new_satisfied_constraint(db, larger_constraint.when_false()),
+                );
+
+                // smaller ∧ ¬larger = false
+                // (¬larger removes everything that's present in smaller)
+                simplified = simplified.substitute_intersection(
+                    db,
+                    larger_constraint.when_false(),
+                    smaller_constraint.when_true(),
+                    Node::AlwaysFalse,
+                );
+
+                // larger ∨ ¬smaller = true
+                // (larger fills in everything that's missing in ¬smaller)
+                simplified = simplified.substitute_union(
+                    db,
+                    larger_constraint.when_true(),
+                    smaller_constraint.when_false(),
+                    Node::AlwaysTrue,
+                );
+            }
+
+            // There are some simplifications we can make when the intersection of the two
+            // constraints is empty, and others that we can make when the intersection is
+            // non-empty.
+            match left_constraint.intersect(db, right_constraint) {
+                Some(intersection_constraint) => {
+                    // If the intersection is non-empty, we need to create a new constraint to
+                    // represent that intersection. We also need to add the new constraint to our
+                    // seen set and (if we haven't already seen it) to the to-visit queue.
+                    if seen_constraints.insert(intersection_constraint) {
+                        to_visit.extend(
+                            (seen_constraints.iter().copied())
+                                .filter(|seen| *seen != intersection_constraint)
+                                .map(|seen| (seen, intersection_constraint)),
+                        );
+                    }
+                    let positive_intersection_node =
+                        Node::new_satisfied_constraint(db, intersection_constraint.when_true());
+                    let negative_intersection_node =
+                        Node::new_satisfied_constraint(db, intersection_constraint.when_false());
+
+                    // left ∧ right = intersection
+                    simplified = simplified.substitute_intersection(
+                        db,
+                        left_constraint.when_true(),
+                        right_constraint.when_true(),
+                        positive_intersection_node,
+                    );
+
+                    // ¬left ∨ ¬right = ¬intersection
+                    simplified = simplified.substitute_union(
+                        db,
+                        left_constraint.when_false(),
+                        right_constraint.when_false(),
+                        negative_intersection_node,
+                    );
+
+                    // left ∧ ¬right = left ∧ ¬intersection
+                    // (clip the negative constraint to the smallest range that actually removes
+                    // something from positive constraint)
+                    simplified = simplified.substitute_intersection(
+                        db,
+                        left_constraint.when_true(),
+                        right_constraint.when_false(),
+                        Node::new_satisfied_constraint(db, left_constraint.when_true())
+                            .and(db, negative_intersection_node),
+                    );
+
+                    // ¬left ∧ right = ¬intersection ∧ right
+                    // (save as above but reversed)
+                    simplified = simplified.substitute_intersection(
+                        db,
+                        left_constraint.when_false(),
+                        right_constraint.when_true(),
+                        Node::new_satisfied_constraint(db, right_constraint.when_true())
+                            .and(db, negative_intersection_node),
+                    );
+
+                    // left ∨ ¬right = intersection ∨ ¬right
+                    // (clip the positive constraint to the smallest range that actually adds
+                    // something to the negative constraint)
+                    simplified = simplified.substitute_union(
+                        db,
+                        left_constraint.when_true(),
+                        right_constraint.when_false(),
+                        Node::new_satisfied_constraint(db, right_constraint.when_false())
+                            .or(db, positive_intersection_node),
+                    );
+
+                    // ¬left ∨ right = ¬left ∨ intersection
+                    // (save as above but reversed)
+                    simplified = simplified.substitute_union(
+                        db,
+                        left_constraint.when_false(),
+                        right_constraint.when_true(),
+                        Node::new_satisfied_constraint(db, left_constraint.when_false())
+                            .or(db, positive_intersection_node),
+                    );
+                }
+
+                None => {
+                    // All of the below hold because we just proved that the intersection of left
+                    // and right is empty.
+
+                    // left ∧ right = false
+                    simplified = simplified.substitute_intersection(
+                        db,
+                        left_constraint.when_true(),
+                        right_constraint.when_true(),
+                        Node::AlwaysFalse,
+                    );
+
+                    // ¬left ∨ ¬right = true
+                    simplified = simplified.substitute_union(
+                        db,
+                        left_constraint.when_false(),
+                        right_constraint.when_false(),
+                        Node::AlwaysTrue,
+                    );
+
+                    // left ∧ ¬right = left
+                    // (there is nothing in the hole of ¬right that overlaps with left)
+                    simplified = simplified.substitute_intersection(
+                        db,
+                        left_constraint.when_true(),
+                        right_constraint.when_false(),
+                        Node::new_constraint(db, left_constraint),
+                    );
+
+                    // ¬left ∧ right = right
+                    // (save as above but reversed)
+                    simplified = simplified.substitute_intersection(
+                        db,
+                        left_constraint.when_false(),
+                        right_constraint.when_true(),
+                        Node::new_constraint(db, right_constraint),
+                    );
+                }
+            }
+        }
+
+        simplified
+    }
+}
+
+/// An assignment of one BDD variable to either `true` or `false`. (When evaluating a BDD, we
+/// must provide an assignment for each variable present in the BDD.)
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+enum ConstraintAssignment<'db> {
+    Positive(ConstrainedTypeVar<'db>),
+    Negative(ConstrainedTypeVar<'db>),
+}
+
+impl<'db> ConstraintAssignment<'db> {
+    fn constraint(self) -> ConstrainedTypeVar<'db> {
+        match self {
+            ConstraintAssignment::Positive(constraint) => constraint,
+            ConstraintAssignment::Negative(constraint) => constraint,
+        }
+    }
+
+    fn negated(self) -> Self {
+        match self {
+            ConstraintAssignment::Positive(constraint) => {
+                ConstraintAssignment::Negative(constraint)
+            }
+            ConstraintAssignment::Negative(constraint) => {
+                ConstraintAssignment::Positive(constraint)
+            }
+        }
+    }
+
+    fn negate(&mut self) {
+        *self = self.negated();
+    }
+
+    /// Returns whether this constraint implies another — i.e., whether every type that
+    /// satisfies this constraint also satisfies `other`.
+    ///
+    /// This is used (among other places) to simplify how we display constraint sets, by removing
+    /// redundant constraints from a clause.
+    fn implies(self, db: &'db dyn Db, other: Self) -> bool {
+        match (self, other) {
+            // For two positive constraints, one range has to fully contain the other; the smaller
+            // constraint implies the larger.
+            //
+            //     ....|----other-----|....
+            //     ......|---self---|......
+            (
+                ConstraintAssignment::Positive(self_constraint),
+                ConstraintAssignment::Positive(other_constraint),
+            ) => self_constraint.implies(db, other_constraint),
+
+            // For two negative constraints, one range has to fully contain the other; the ranges
+            // represent "holes", though, so the constraint with the larger range implies the one
+            // with the smaller.
+            //
+            //     |-----|...other...|-----|
+            //     |---|.....self......|---|
+            (
+                ConstraintAssignment::Negative(self_constraint),
+                ConstraintAssignment::Negative(other_constraint),
+            ) => other_constraint.implies(db, self_constraint),
+
+            // For a positive and negative constraint, the ranges have to be disjoint, and the
+            // positive range implies the negative range.
+            //
+            //     |---------------|...self...|---|
+            //     ..|---other---|................|
+            (
+                ConstraintAssignment::Positive(self_constraint),
+                ConstraintAssignment::Negative(other_constraint),
+            ) => self_constraint.intersect(db, other_constraint).is_none(),
+
+            // It's theoretically possible for a negative constraint to imply a positive constraint
+            // if the positive constraint is always satisfied (`Never ≤ T ≤ object`). But we never
+            // create constraints of that form, so with our representation, a negative constraint
+            // can never imply a positive constraint.
+            //
+            //     |------other-------|
+            //     |---|...self...|---|
+            (ConstraintAssignment::Negative(_), ConstraintAssignment::Positive(_)) => false,
+        }
+    }
+
+    // Keep this for future debugging needs, even though it's not currently used when rendering
+    // constraint sets.
+    #[expect(dead_code)]
+    fn display(self, db: &'db dyn Db) -> impl Display {
+        struct DisplayConstraintAssignment<'db> {
+            constraint: ConstraintAssignment<'db>,
+            db: &'db dyn Db,
+        }
+
+        impl Display for DisplayConstraintAssignment<'_> {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                match self.constraint {
+                    ConstraintAssignment::Positive(constraint) => {
+                        constraint.display(self.db).fmt(f)
+                    }
+                    ConstraintAssignment::Negative(constraint) => {
+                        constraint.display_negated(self.db).fmt(f)
+                    }
+                }
+            }
+        }
+
+        DisplayConstraintAssignment {
+            constraint: self,
+            db,
+        }
+    }
+}
+
+/// A single clause in the DNF representation of a BDD
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+struct SatisfiedClause<'db> {
+    constraints: Vec<ConstraintAssignment<'db>>,
+}
+
+impl<'db> SatisfiedClause<'db> {
+    fn push(&mut self, constraint: ConstraintAssignment<'db>) {
+        self.constraints.push(constraint);
+    }
+
+    fn pop(&mut self) {
+        self.constraints
+            .pop()
+            .expect("clause vector should not be empty");
+    }
+
+    /// Invokes a closure with the last constraint in this clause negated. Returns the clause back
+    /// to its original state after invoking the closure.
+    fn with_negated_last_constraint(&mut self, f: impl for<'a> FnOnce(&'a Self)) {
+        if self.constraints.is_empty() {
+            return;
+        }
+        let last_index = self.constraints.len() - 1;
+        self.constraints[last_index].negate();
+        f(self);
+        self.constraints[last_index].negate();
+    }
+
+    /// Removes another clause from this clause, if it appears as a prefix of this clause. Returns
+    /// whether the prefix was removed.
+    fn remove_prefix(&mut self, prefix: &SatisfiedClause<'db>) -> bool {
+        if self.constraints.starts_with(&prefix.constraints) {
+            self.constraints.drain(0..prefix.constraints.len());
+            return true;
+        }
+        false
+    }
+
+    /// Simplifies this clause by removing constraints that are implied by other constraints in the
+    /// clause. (Clauses are the intersection of constraints, so if two clauses are redundant, we
+    /// want to remove the larger one and keep the smaller one.)
+    ///
+    /// Returns a boolean that indicates whether any simplifications were made.
+    fn simplify(&mut self, db: &'db dyn Db) -> bool {
+        let mut changes_made = false;
+        let mut i = 0;
+        // Loop through each constraint, comparing it with any constraints that appear later in the
+        // list.
+        'outer: while i < self.constraints.len() {
+            let mut j = i + 1;
+            while j < self.constraints.len() {
+                if self.constraints[j].implies(db, self.constraints[i]) {
+                    // If constraint `i` is removed, then we don't need to compare it with any
+                    // later constraints in the list. Note that we continue the outer loop, instead
+                    // of breaking from the inner loop, so that we don't bump index `i` below.
+                    // (We'll have swapped another element into place at that index, and want to
+                    // make sure that we process it.)
+                    self.constraints.swap_remove(i);
+                    changes_made = true;
+                    continue 'outer;
+                } else if self.constraints[i].implies(db, self.constraints[j]) {
+                    // If constraint `j` is removed, then we can continue the inner loop. We will
+                    // swap a new element into place at index `j`, and will continue comparing the
+                    // constraint at index `i` with later constraints.
+                    self.constraints.swap_remove(j);
+                    changes_made = true;
+                } else {
+                    j += 1;
+                }
+            }
+            i += 1;
+        }
+        changes_made
+    }
+
+    fn display(&self, db: &'db dyn Db) -> String {
+        // This is a bit heavy-handed, but we need to output the constraints in a consistent order
+        // even though Salsa IDs are assigned non-deterministically. This Display output is only
+        // used in test cases, so we don't need to over-optimize it.
+
+        let mut constraints: Vec<_> = self
+            .constraints
+            .iter()
+            .map(|constraint| match constraint {
+                ConstraintAssignment::Positive(constraint) => constraint.display(db).to_string(),
+                ConstraintAssignment::Negative(constraint) => {
+                    constraint.display_negated(db).to_string()
+                }
+            })
+            .collect();
+        constraints.sort();
+
+        let mut result = String::new();
+        if constraints.len() > 1 {
+            result.push('(');
+        }
+        for (i, constraint) in constraints.iter().enumerate() {
+            if i > 0 {
+                result.push_str(" ∧ ");
+            }
+            result.push_str(constraint);
+        }
+        if constraints.len() > 1 {
+            result.push(')');
+        }
+        result
+    }
+}
+
+/// A list of the clauses that satisfy a BDD. This is a DNF representation of the boolean function
+/// that the BDD represents.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+struct SatisfiedClauses<'db> {
+    clauses: Vec<SatisfiedClause<'db>>,
+}
+
+impl<'db> SatisfiedClauses<'db> {
+    fn push(&mut self, clause: SatisfiedClause<'db>) {
+        self.clauses.push(clause);
+    }
+
+    /// Simplifies the DNF representation, removing redundancies that do not change the underlying
+    /// function. (This is used when displaying a BDD, to make sure that the representation that we
+    /// show is as simple as possible while still producing the same results.)
+    fn simplify(&mut self, db: &'db dyn Db) {
+        // First simplify each clause individually, by removing constraints that are implied by
+        // other constraints in the clause.
+        for clause in &mut self.clauses {
+            clause.simplify(db);
+        }
+
+        while self.simplify_one_round() {
+            // Keep going
+        }
+    }
+
+    fn simplify_one_round(&mut self) -> bool {
+        let mut changes_made = false;
+
+        // First remove any duplicate clauses. (The clause list will start out with no duplicates
+        // in the first round of simplification, because of the guarantees provided by the BDD
+        // structure. But earlier rounds of simplification might have made some clauses redundant.)
+        // Note that we have to loop through the vector element indexes manually, since we might
+        // remove elements in each iteration.
+        let mut i = 0;
+        while i < self.clauses.len() {
+            let mut j = i + 1;
+            while j < self.clauses.len() {
+                if self.clauses[i] == self.clauses[j] {
+                    self.clauses.swap_remove(j);
+                    changes_made = true;
+                } else {
+                    j += 1;
+                }
+            }
+            i += 1;
+        }
+        if changes_made {
+            return true;
+        }
+
+        // Then look for "prefix simplifications". That is, looks for patterns
+        //
+        //   (A ∧ B) ∨ (A ∧ ¬B ∧ ...)
+        //
+        // and replaces them with
+        //
+        //   (A ∧ B) ∨ (...)
+        for i in 0..self.clauses.len() {
+            let (clause, rest) = self.clauses[..=i]
+                .split_last_mut()
+                .expect("index should be in range");
+            clause.with_negated_last_constraint(|clause| {
+                for existing in rest {
+                    changes_made |= existing.remove_prefix(clause);
+                }
+            });
+
+            let (clause, rest) = self.clauses[i..]
+                .split_first_mut()
+                .expect("index should be in range");
+            clause.with_negated_last_constraint(|clause| {
+                for existing in rest {
+                    changes_made |= existing.remove_prefix(clause);
+                }
+            });
+
+            if changes_made {
+                return true;
+            }
+        }
+
+        false
+    }
+
+    fn display(&self, db: &'db dyn Db) -> String {
+        // This is a bit heavy-handed, but we need to output the clauses in a consistent order
+        // even though Salsa IDs are assigned non-deterministically. This Display output is only
+        // used in test cases, so we don't need to over-optimize it.
+
+        if self.clauses.is_empty() {
+            return String::from("always");
+        }
+        let mut clauses: Vec<_> = self
+            .clauses
+            .iter()
+            .map(|clause| clause.display(db))
+            .collect();
+        clauses.sort();
+        clauses.join(" ∨ ")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use indoc::indoc;
+    use pretty_assertions::assert_eq;
+
+    use crate::db::tests::setup_db;
+    use crate::types::{BoundTypeVarInstance, KnownClass, TypeVarVariance};
+
+    #[test]
+    fn test_display_graph_output() {
+        let expected = indoc! {r#"
+            (T = str)
+            ┡━₁ (U = str)
+            │   ┡━₁ always
+            │   └─₀ (U = bool)
+            │       ┡━₁ always
+            │       └─₀ never
+            └─₀ (T = bool)
+                ┡━₁ (U = str)
+                │   ┡━₁ always
+                │   └─₀ (U = bool)
+                │       ┡━₁ always
+                │       └─₀ never
+                └─₀ never
+        "#}
+        .trim_end();
+
+        let db = setup_db();
+        let t = BoundTypeVarInstance::synthetic(&db, "T", TypeVarVariance::Invariant);
+        let u = BoundTypeVarInstance::synthetic(&db, "U", TypeVarVariance::Invariant);
+        let bool_type = KnownClass::Bool.to_instance(&db);
+        let str_type = KnownClass::Str.to_instance(&db);
+        let t_str = ConstraintSet::range(&db, str_type, t.identity(&db), str_type);
+        let t_bool = ConstraintSet::range(&db, bool_type, t.identity(&db), bool_type);
+        let u_str = ConstraintSet::range(&db, str_type, u.identity(&db), str_type);
+        let u_bool = ConstraintSet::range(&db, bool_type, u.identity(&db), bool_type);
+        let constraints = (t_str.or(&db, || t_bool)).and(&db, || u_str.or(&db, || u_bool));
+        let actual = constraints.node.display_graph(&db, &"").to_string();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/context.rs b/crates/ty_python_semantic/src/types/context.rs
index 2230603d82..2221ced32d 100644
--- a/crates/ty_python_semantic/src/types/context.rs
+++ b/crates/ty_python_semantic/src/types/context.rs
@@ -32,7 +32,7 @@ use crate::{
 /// ## Consuming
 /// It's important that the context is explicitly consumed before dropping by calling
 /// [`InferContext::finish`] and the returned diagnostics must be stored
-/// on the current [`TypeInferenceBuilder`](super::infer::TypeInferenceBuilder) result.
+/// on the current inference result.
 pub(crate) struct InferContext<'db, 'ast> {
     db: &'db dyn Db,
     scope: ScopeId<'db>,
@@ -40,6 +40,7 @@ pub(crate) struct InferContext<'db, 'ast> {
     module: &'ast ParsedModuleRef,
     diagnostics: std::cell::RefCell<TypeCheckDiagnostics>,
     no_type_check: InNoTypeCheck,
+    multi_inference: bool,
     bomb: DebugDropBomb,
 }
 
@@ -50,6 +51,7 @@ impl<'db, 'ast> InferContext<'db, 'ast> {
             scope,
             module,
             file: scope.file(db),
+            multi_inference: false,
             diagnostics: std::cell::RefCell::new(TypeCheckDiagnostics::default()),
             no_type_check: InNoTypeCheck::default(),
             bomb: DebugDropBomb::new(
@@ -98,6 +100,10 @@ impl<'db, 'ast> InferContext<'db, 'ast> {
         self.diagnostics.get_mut().extend(other);
     }
 
+    pub(super) fn is_lint_enabled(&self, lint: &'static LintMetadata) -> bool {
+        LintDiagnosticGuardBuilder::severity_and_source(self, lint).is_some()
+    }
+
     /// Optionally return a builder for a lint diagnostic guard.
     ///
     /// If the current context believes a diagnostic should be reported for
@@ -156,6 +162,18 @@ impl<'db, 'ast> InferContext<'db, 'ast> {
         DiagnosticGuardBuilder::new(self, id, severity)
     }
 
+    /// Returns `true` if the current expression is being inferred for a second
+    /// (or subsequent) time, with a potentially different bidirectional type
+    /// context.
+    pub(super) fn is_in_multi_inference(&self) -> bool {
+        self.multi_inference
+    }
+
+    /// Set the multi-inference state, returning the previous value.
+    pub(super) fn set_multi_inference(&mut self, multi_inference: bool) -> bool {
+        std::mem::replace(&mut self.multi_inference, multi_inference)
+    }
+
     pub(super) fn set_in_no_type_check(&mut self, no_type_check: InNoTypeCheck) {
         self.no_type_check = no_type_check;
     }
@@ -172,9 +190,9 @@ impl<'db, 'ast> InferContext<'db, 'ast> {
                 // Inspect all ancestor function scopes by walking bottom up and infer the function's type.
                 let mut function_scope_tys = index
                     .ancestor_scopes(scope_id)
-                    .filter_map(|(_, scope)| scope.node().as_function(self.module()))
+                    .filter_map(|(_, scope)| scope.node().as_function())
                     .map(|node| binding_type(self.db, index.expect_single_definition(node)))
-                    .filter_map(Type::into_function_literal);
+                    .filter_map(Type::as_function_literal);
 
                 // Iterate over all functions and test if any is decorated with `@no_type_check`.
                 function_scope_tys.any(|function_ty| {
@@ -382,11 +400,10 @@ pub(super) struct LintDiagnosticGuardBuilder<'db, 'ctx> {
 }
 
 impl<'db, 'ctx> LintDiagnosticGuardBuilder<'db, 'ctx> {
-    fn new(
+    fn severity_and_source(
         ctx: &'ctx InferContext<'db, 'ctx>,
         lint: &'static LintMetadata,
-        range: TextRange,
-    ) -> Option<LintDiagnosticGuardBuilder<'db, 'ctx>> {
+    ) -> Option<(Severity, LintSource)> {
         // The comment below was copied from the original
         // implementation of diagnostic reporting. The code
         // has been refactored, but this still kind of looked
@@ -410,14 +427,30 @@ impl<'db, 'ctx> LintDiagnosticGuardBuilder<'db, 'ctx> {
         if ctx.is_in_no_type_check() {
             return None;
         }
-        let id = DiagnosticId::Lint(lint.name());
+        // If this lint is being reported as part of multi-inference of a given expression,
+        // silence it to avoid duplicated diagnostics.
+        if ctx.is_in_multi_inference() {
+            return None;
+        }
+
+        Some((severity, source))
+    }
+
+    fn new(
+        ctx: &'ctx InferContext<'db, 'ctx>,
+        lint: &'static LintMetadata,
+        range: TextRange,
+    ) -> Option<LintDiagnosticGuardBuilder<'db, 'ctx>> {
+        let (severity, source) = Self::severity_and_source(ctx, lint)?;
 
         let suppressions = suppressions(ctx.db(), ctx.file());
+        let lint_id = LintId::of(lint);
         if let Some(suppression) = suppressions.find_suppression(range, lint_id) {
             ctx.diagnostics.borrow_mut().mark_used(suppression.id());
             return None;
         }
 
+        let id = DiagnosticId::Lint(lint.name());
         let primary_span = Span::from(ctx.file()).with_range(range);
         Some(LintDiagnosticGuardBuilder {
             ctx,
@@ -575,6 +608,11 @@ impl<'db, 'ctx> DiagnosticGuardBuilder<'db, 'ctx> {
         if !ctx.db.should_check_file(ctx.file) {
             return None;
         }
+        // If this lint is being reported as part of multi-inference of a given expression,
+        // silence it to avoid duplicated diagnostics.
+        if ctx.is_in_multi_inference() {
+            return None;
+        }
         Some(DiagnosticGuardBuilder { ctx, id, severity })
     }
 
diff --git a/crates/ty_python_semantic/src/types/cyclic.rs b/crates/ty_python_semantic/src/types/cyclic.rs
index 27a201143b..e46d30f40f 100644
--- a/crates/ty_python_semantic/src/types/cyclic.rs
+++ b/crates/ty_python_semantic/src/types/cyclic.rs
@@ -41,10 +41,10 @@ impl<Tag> Default for TypeTransformer<'_, Tag> {
     }
 }
 
-pub(crate) type PairVisitor<'db, Tag> = CycleDetector<Tag, (Type<'db>, Type<'db>), bool>;
+pub(crate) type PairVisitor<'db, Tag, C> = CycleDetector<Tag, (Type<'db>, Type<'db>), C>;
 
 #[derive(Debug)]
-pub(crate) struct CycleDetector<Tag, T, R> {
+pub struct CycleDetector<Tag, T, R> {
     /// If the type we're visiting is present in `seen`, it indicates that we've hit a cycle (due
     /// to a recursive type); we need to immediately short circuit the whole operation and return
     /// the fallback value. That's why we pop items off the end of `seen` after we've visited them.
@@ -63,8 +63,8 @@ pub(crate) struct CycleDetector<Tag, T, R> {
     _tag: PhantomData<Tag>,
 }
 
-impl<Tag, T: Hash + Eq + Copy, R: Copy> CycleDetector<Tag, T, R> {
-    pub(crate) fn new(fallback: R) -> Self {
+impl<Tag, T: Hash + Eq + Clone, R: Clone> CycleDetector<Tag, T, R> {
+    pub fn new(fallback: R) -> Self {
         CycleDetector {
             seen: RefCell::new(FxIndexSet::default()),
             cache: RefCell::new(FxHashMap::default()),
@@ -73,20 +73,26 @@ impl<Tag, T: Hash + Eq + Copy, R: Copy> CycleDetector<Tag, T, R> {
         }
     }
 
-    pub(crate) fn visit(&self, item: T, func: impl FnOnce() -> R) -> R {
+    pub fn visit(&self, item: T, func: impl FnOnce() -> R) -> R {
         if let Some(val) = self.cache.borrow().get(&item) {
-            return *val;
+            return val.clone();
         }
 
         // We hit a cycle
-        if !self.seen.borrow_mut().insert(item) {
-            return self.fallback;
+        if !self.seen.borrow_mut().insert(item.clone()) {
+            return self.fallback.clone();
         }
 
         let ret = func();
         self.seen.borrow_mut().pop();
-        self.cache.borrow_mut().insert(item, ret);
+        self.cache.borrow_mut().insert(item, ret.clone());
 
         ret
     }
 }
+
+impl<Tag, T: Hash + Eq + Clone, R: Default + Clone> Default for CycleDetector<Tag, T, R> {
+    fn default() -> Self {
+        CycleDetector::new(R::default())
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/diagnostic.rs b/crates/ty_python_semantic/src/types/diagnostic.rs
index 4930dd4f9e..7db83b9b88 100644
--- a/crates/ty_python_semantic/src/types/diagnostic.rs
+++ b/crates/ty_python_semantic/src/types/diagnostic.rs
@@ -5,12 +5,15 @@ use super::{
     CallArguments, CallDunderError, ClassBase, ClassLiteral, KnownClass,
     add_inferred_python_version_hint_to_diagnostic,
 };
+use crate::diagnostic::did_you_mean;
+use crate::diagnostic::format_enumeration;
 use crate::lint::{Level, LintRegistryBuilder, LintStatus};
-use crate::semantic_index::SemanticIndex;
-use crate::semantic_index::definition::Definition;
+use crate::semantic_index::definition::{Definition, DefinitionKind};
 use crate::semantic_index::place::{PlaceTable, ScopedPlaceId};
+use crate::semantic_index::{global_scope, place_table};
 use crate::suppression::FileSuppressionId;
-use crate::types::class::{Field, SolidBase, SolidBaseKind};
+use crate::types::call::CallError;
+use crate::types::class::{DisjointBase, DisjointBaseKind, Field};
 use crate::types::function::KnownFunction;
 use crate::types::string_annotation::{
     BYTE_STRING_TYPE_ANNOTATION, ESCAPE_CHARACTER_IN_FORWARD_ANNOTATION, FSTRING_TYPE_ANNOTATION,
@@ -18,15 +21,17 @@ use crate::types::string_annotation::{
     RAW_STRING_TYPE_ANNOTATION,
 };
 use crate::types::{
-    DynamicType, LintDiagnosticGuard, Protocol, ProtocolInstanceType, SubclassOfInner, binding_type,
+    BoundTypeVarInstance, ClassType, DynamicType, LintDiagnosticGuard, Protocol,
+    ProtocolInstanceType, SpecialFormType, SubclassOfInner, Type, TypeContext, binding_type,
+    infer_isolated_expression, protocol_class::ProtocolClass,
+};
+use crate::{
+    Db, DisplaySettings, FxIndexMap, FxOrderMap, Module, ModuleName, Program, declare_lint,
 };
-use crate::types::{SpecialFormType, Type, protocol_class::ProtocolClassLiteral};
-use crate::util::diagnostics::format_enumeration;
-use crate::{Db, FxIndexMap, FxOrderMap, Module, ModuleName, Program, declare_lint};
 use itertools::Itertools;
-use ruff_db::diagnostic::{Annotation, Diagnostic, SubDiagnostic, SubDiagnosticSeverity};
+use ruff_db::diagnostic::{Annotation, Diagnostic, Span, SubDiagnostic, SubDiagnosticSeverity};
 use ruff_python_ast::name::Name;
-use ruff_python_ast::{self as ast, AnyNodeRef};
+use ruff_python_ast::{self as ast, AnyNodeRef, Identifier};
 use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::FxHashSet;
 use std::fmt::Formatter;
@@ -35,7 +40,7 @@ use std::fmt::Formatter;
 pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
     registry.register_lint(&AMBIGUOUS_PROTOCOL_MEMBER);
     registry.register_lint(&CALL_NON_CALLABLE);
-    registry.register_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL);
+    registry.register_lint(&POSSIBLY_MISSING_IMPLICIT_CALL);
     registry.register_lint(&CONFLICTING_ARGUMENT_FORMS);
     registry.register_lint(&CONFLICTING_DECLARATIONS);
     registry.register_lint(&CONFLICTING_METACLASS);
@@ -61,6 +66,7 @@ pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
     registry.register_lint(&INVALID_TYPE_ALIAS_TYPE);
     registry.register_lint(&INVALID_METACLASS);
     registry.register_lint(&INVALID_OVERLOAD);
+    registry.register_lint(&USELESS_OVERLOAD_BODY);
     registry.register_lint(&INVALID_PARAMETER_DEFAULT);
     registry.register_lint(&INVALID_PROTOCOL);
     registry.register_lint(&INVALID_NAMED_TUPLE);
@@ -77,8 +83,8 @@ pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
     registry.register_lint(&NOT_ITERABLE);
     registry.register_lint(&UNSUPPORTED_BOOL_CONVERSION);
     registry.register_lint(&PARAMETER_ALREADY_ASSIGNED);
-    registry.register_lint(&POSSIBLY_UNBOUND_ATTRIBUTE);
-    registry.register_lint(&POSSIBLY_UNBOUND_IMPORT);
+    registry.register_lint(&POSSIBLY_MISSING_ATTRIBUTE);
+    registry.register_lint(&POSSIBLY_MISSING_IMPORT);
     registry.register_lint(&POSSIBLY_UNRESOLVED_REFERENCE);
     registry.register_lint(&SUBCLASS_OF_FINAL_CLASS);
     registry.register_lint(&TYPE_ASSERTION_FAILURE);
@@ -86,6 +92,7 @@ pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
     registry.register_lint(&UNAVAILABLE_IMPLICIT_SUPER_ARGUMENTS);
     registry.register_lint(&UNDEFINED_REVEAL);
     registry.register_lint(&UNKNOWN_ARGUMENT);
+    registry.register_lint(&POSITIONAL_ONLY_PARAMETER_AS_KWARG);
     registry.register_lint(&UNRESOLVED_ATTRIBUTE);
     registry.register_lint(&UNRESOLVED_IMPORT);
     registry.register_lint(&UNRESOLVED_REFERENCE);
@@ -96,6 +103,7 @@ pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
     registry.register_lint(&INVALID_ATTRIBUTE_ACCESS);
     registry.register_lint(&REDUNDANT_CAST);
     registry.register_lint(&UNRESOLVED_GLOBAL);
+    registry.register_lint(&MISSING_TYPED_DICT_KEY);
 
     // String annotations
     registry.register_lint(&BYTE_STRING_TYPE_ANNOTATION);
@@ -119,19 +127,19 @@ declare_lint! {
     /// ```
     pub(crate) static CALL_NON_CALLABLE = {
         summary: "detects calls to non-callable objects",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
 
 declare_lint! {
     /// ## What it does
-    /// Checks for implicit calls to possibly unbound methods.
+    /// Checks for implicit calls to possibly missing methods.
     ///
     /// ## Why is this bad?
     /// Expressions such as `x[y]` and `x * y` call methods
     /// under the hood (`__getitem__` and `__mul__` respectively).
-    /// Calling an unbound method will raise an `AttributeError` at runtime.
+    /// Calling a missing method will raise an `AttributeError` at runtime.
     ///
     /// ## Examples
     /// ```python
@@ -143,9 +151,9 @@ declare_lint! {
     ///
     /// A()[0]  # TypeError: 'A' object is not subscriptable
     /// ```
-    pub(crate) static POSSIBLY_UNBOUND_IMPLICIT_CALL = {
-        summary: "detects implicit calls to possibly unbound methods",
-        status: LintStatus::preview("1.0.0"),
+    pub(crate) static POSSIBLY_MISSING_IMPLICIT_CALL = {
+        summary: "detects implicit calls to possibly missing methods",
+        status: LintStatus::stable("0.0.1-alpha.22"),
         default_level: Level::Warn,
     }
 }
@@ -171,7 +179,7 @@ declare_lint! {
     /// ```
     pub(crate) static CONFLICTING_ARGUMENT_FORMS = {
         summary: "detects when an argument is used as both a value and a type form in a call",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -196,7 +204,7 @@ declare_lint! {
     /// ```
     pub(crate) static CONFLICTING_DECLARATIONS = {
         summary: "detects conflicting declarations",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -222,7 +230,7 @@ declare_lint! {
     /// ```
     pub(crate) static CONFLICTING_METACLASS = {
         summary: "detects conflicting metaclasses",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -248,7 +256,7 @@ declare_lint! {
     /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
     pub(crate) static CYCLIC_CLASS_DEFINITION = {
         summary: "detects cyclic class definitions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -266,7 +274,7 @@ declare_lint! {
     /// ```
     pub(crate) static DIVISION_BY_ZERO = {
         summary: "detects division by zero",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::preview("0.0.1-alpha.1"),
         default_level: Level::Ignore,
     }
 }
@@ -287,7 +295,7 @@ declare_lint! {
     /// ```
     pub(crate) static DEPRECATED = {
         summary: "detects uses of deprecated items",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.16"),
         default_level: Level::Warn,
     }
 }
@@ -308,7 +316,7 @@ declare_lint! {
     /// ```
     pub(crate) static DUPLICATE_BASE = {
         summary: "detects class definitions with duplicate bases",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -340,7 +348,7 @@ declare_lint! {
     /// ```
     pub(crate) static DUPLICATE_KW_ONLY = {
         summary: "detects dataclass definitions with more than one usage of `KW_ONLY`",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.12"),
         default_level: Level::Error,
     }
 }
@@ -404,7 +412,7 @@ declare_lint! {
     ///
     /// ## Known problems
     /// Classes that have "dynamic" definitions of `__slots__` (definitions do not consist
-    /// of string literals, or tuples of string literals) are not currently considered solid
+    /// of string literals, or tuples of string literals) are not currently considered disjoint
     /// bases by ty.
     ///
     /// Additionally, this check is not exhaustive: many C extensions (including several in
@@ -422,7 +430,7 @@ declare_lint! {
     /// [Method Resolution Order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
     pub(crate) static INSTANCE_LAYOUT_CONFLICT = {
         summary: "detects class definitions that raise `TypeError` due to instance layout conflict",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.12"),
         default_level: Level::Error,
     }
 }
@@ -450,11 +458,12 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_PROTOCOL = {
         summary: "detects invalid protocol class definitions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
 
+// Added in #17750.
 declare_lint! {
     /// ## What it does
     /// Checks for protocol classes with members that will lead to ambiguous interfaces.
@@ -485,7 +494,7 @@ declare_lint! {
     /// ```
     pub(crate) static AMBIGUOUS_PROTOCOL_MEMBER = {
         summary: "detects protocol classes with ambiguous interfaces",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.20"),
         default_level: Level::Warn,
     }
 }
@@ -511,7 +520,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_NAMED_TUPLE = {
         summary: "detects invalid `NamedTuple` class definitions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.19"),
         default_level: Level::Error,
     }
 }
@@ -535,7 +544,7 @@ declare_lint! {
     /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
     pub(crate) static INCONSISTENT_MRO = {
         summary: "detects class definitions with an inconsistent MRO",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -555,11 +564,12 @@ declare_lint! {
     /// ```
     pub(crate) static INDEX_OUT_OF_BOUNDS = {
         summary: "detects index out of bounds errors",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
 
+// Added in #19763.
 declare_lint! {
     /// ## What it does
     /// Checks for subscript accesses with invalid keys.
@@ -580,7 +590,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_KEY = {
         summary: "detects invalid subscript accesses",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.17"),
         default_level: Level::Error,
     }
 }
@@ -601,7 +611,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_ARGUMENT_TYPE = {
         summary: "detects call arguments whose type is not assignable to the corresponding typed parameter",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -620,7 +630,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_RETURN_TYPE = {
         summary: "detects returned values that can't be assigned to the function's annotated return type",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -642,7 +652,7 @@ declare_lint! {
     /// [assignable to]: https://typing.python.org/en/latest/spec/glossary.html#term-assignable
     pub(crate) static INVALID_ASSIGNMENT = {
         summary: "detects invalid assignments",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -672,7 +682,7 @@ declare_lint! {
     /// [Awaitable]: https://docs.python.org/3/library/collections.abc.html#collections.abc.Awaitable
     pub(crate) static INVALID_AWAIT = {
         summary: "detects awaiting on types that don't support it",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.19"),
         default_level: Level::Error,
     }
 }
@@ -690,7 +700,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_BASE = {
         summary: "detects class bases that will cause the class definition to raise an exception at runtime",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -723,7 +733,7 @@ declare_lint! {
     /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
     pub(crate) static UNSUPPORTED_BASE = {
         summary: "detects class bases that are unsupported as ty could not feasibly calculate the class's MRO",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.7"),
         default_level: Level::Warn,
     }
 }
@@ -744,7 +754,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_CONTEXT_MANAGER = {
         summary: "detects expressions used in with statements that don't implement the context manager protocol",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -767,7 +777,7 @@ declare_lint! {
     /// [assignable to]: https://typing.python.org/en/latest/spec/glossary.html#term-assignable
     pub(crate) static INVALID_DECLARATION = {
         summary: "detects invalid declarations",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -803,7 +813,7 @@ declare_lint! {
     ///  This rule corresponds to Ruff's [`except-with-non-exception-classes` (`B030`)](https://docs.astral.sh/ruff/rules/except-with-non-exception-classes)
     pub(crate) static INVALID_EXCEPTION_CAUGHT = {
         summary: "detects exception handlers that catch classes that do not inherit from `BaseException`",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -829,7 +839,7 @@ declare_lint! {
     /// - [Typing spec: Generics](https://typing.python.org/en/latest/spec/generics.html#introduction)
     pub(crate) static INVALID_GENERIC_CLASS = {
         summary: "detects invalid generic classes",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -857,7 +867,7 @@ declare_lint! {
     /// - [Typing spec: Generics](https://typing.python.org/en/latest/spec/generics.html#introduction)
     pub(crate) static INVALID_LEGACY_TYPE_VARIABLE = {
         summary: "detects invalid legacy type variables",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -878,7 +888,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_TYPE_ALIAS_TYPE = {
         summary: "detects invalid TypeAliasType definitions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.6"),
         default_level: Level::Error,
     }
 }
@@ -905,7 +915,7 @@ declare_lint! {
     /// - [Python documentation: Metaclasses](https://docs.python.org/3/reference/datamodel.html#metaclasses)
     pub(crate) static INVALID_METACLASS = {
         summary: "detects invalid `metaclass=` arguments",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -948,11 +958,67 @@ declare_lint! {
     /// - [Python documentation: `@overload`](https://docs.python.org/3/library/typing.html#typing.overload)
     pub(crate) static INVALID_OVERLOAD = {
         summary: "detects invalid `@overload` usages",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
 
+declare_lint! {
+    /// ## What it does
+    /// Checks for various `@overload`-decorated functions that have non-stub bodies.
+    ///
+    /// ## Why is this bad?
+    /// Functions decorated with `@overload` are ignored at runtime; they are overridden
+    /// by the implementation function that follows the series of overloads. While it is
+    /// not illegal to provide a body for an `@overload`-decorated function, it may indicate
+    /// a misunderstanding of how the `@overload` decorator works.
+    ///
+    /// ## Example
+    ///
+    /// ```py
+    /// from typing import overload
+    ///
+    /// @overload
+    /// def foo(x: int) -> int:
+    ///     return x + 1  # will never be executed
+    ///
+    /// @overload
+    /// def foo(x: str) -> str:
+    ///     return "Oh no, got a string"  # will never be executed
+    ///
+    /// def foo(x: int | str) -> int | str:
+    ///     raise Exception("unexpected type encountered")
+    /// ```
+    ///
+    /// Use instead:
+    ///
+    /// ```py
+    /// from typing import assert_never, overload
+    ///
+    /// @overload
+    /// def foo(x: int) -> int: ...
+    ///
+    /// @overload
+    /// def foo(x: str) -> str: ...
+    ///
+    /// def foo(x: int | str) -> int | str:
+    ///     if isinstance(x, int):
+    ///         return x + 1
+    ///     elif isinstance(x, str):
+    ///         return "Oh no, got a string"
+    ///     else:
+    ///         assert_never(x)
+    /// ```
+    ///
+    /// ## References
+    /// - [Python documentation: `@overload`](https://docs.python.org/3/library/typing.html#typing.overload)
+    pub(crate) static USELESS_OVERLOAD_BODY = {
+        summary: "detects `@overload`-decorated functions with non-stub bodies",
+        status: LintStatus::stable("0.0.1-alpha.22"),
+        default_level: Level::Warn,
+    }
+}
+
 declare_lint! {
     /// ## What it does
     /// Checks for default values that can't be
@@ -968,7 +1034,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_PARAMETER_DEFAULT = {
         summary: "detects default values that can't be assigned to the parameter's annotated type",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1011,7 +1077,7 @@ declare_lint! {
     /// - [Python documentation: Built-in Exceptions](https://docs.python.org/3/library/exceptions.html#built-in-exceptions)
     pub(crate) static INVALID_RAISE = {
         summary: "detects `raise` statements that raise invalid exceptions or use invalid causes",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1050,7 +1116,7 @@ declare_lint! {
     /// - [Python documentation: super()](https://docs.python.org/3/library/functions.html#super)
     pub(crate) static INVALID_SUPER_ARGUMENT = {
         summary: "detects invalid arguments for `super()`",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1074,7 +1140,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_TYPE_CHECKING_CONSTANT = {
         summary: "detects invalid `TYPE_CHECKING` constant assignments",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1098,7 +1164,7 @@ declare_lint! {
     /// [type expressions]: https://typing.python.org/en/latest/spec/annotations.html#type-and-annotation-expressions
     pub(crate) static INVALID_TYPE_FORM = {
         summary: "detects invalid type forms",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1126,7 +1192,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_TYPE_GUARD_DEFINITION = {
         summary: "detects malformed type guard functions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.11"),
         default_level: Level::Error,
     }
 }
@@ -1154,7 +1220,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_TYPE_GUARD_CALL = {
         summary: "detects type guard function calls that has no narrowing effect",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.11"),
         default_level: Level::Error,
     }
 }
@@ -1183,7 +1249,7 @@ declare_lint! {
     /// [type variables]: https://docs.python.org/3/library/typing.html#typing.TypeVar
     pub(crate) static INVALID_TYPE_VARIABLE_CONSTRAINTS = {
         summary: "detects invalid type variable constraints",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1202,7 +1268,7 @@ declare_lint! {
     /// ```
     pub(crate) static MISSING_ARGUMENT = {
         summary: "detects missing required arguments in a call",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1225,7 +1291,7 @@ declare_lint! {
     /// ```
     pub(crate) static NO_MATCHING_OVERLOAD = {
         summary: "detects calls that do not match any overload",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1243,7 +1309,7 @@ declare_lint! {
     /// ```
     pub(crate) static NON_SUBSCRIPTABLE = {
         summary: "detects subscripting objects that do not support subscripting",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1263,7 +1329,7 @@ declare_lint! {
     /// ```
     pub(crate) static NOT_ITERABLE = {
         summary: "detects iteration over an object that is not iterable",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1294,7 +1360,7 @@ declare_lint! {
     /// ```
     pub(crate) static UNSUPPORTED_BOOL_CONVERSION = {
         summary: "detects boolean conversion where the object incorrectly implements `__bool__`",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1315,17 +1381,17 @@ declare_lint! {
     /// ```
     pub(crate) static PARAMETER_ALREADY_ASSIGNED = {
         summary: "detects multiple arguments for the same parameter",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
 
 declare_lint! {
     /// ## What it does
-    /// Checks for possibly unbound attributes.
+    /// Checks for possibly missing attributes.
     ///
     /// ## Why is this bad?
-    /// Attempting to access an unbound attribute will raise an `AttributeError` at runtime.
+    /// Attempting to access a missing attribute will raise an `AttributeError` at runtime.
     ///
     /// ## Examples
     /// ```python
@@ -1335,19 +1401,19 @@ declare_lint! {
     ///
     /// A.c  # AttributeError: type object 'A' has no attribute 'c'
     /// ```
-    pub(crate) static POSSIBLY_UNBOUND_ATTRIBUTE = {
-        summary: "detects references to possibly unbound attributes",
-        status: LintStatus::preview("1.0.0"),
+    pub(crate) static POSSIBLY_MISSING_ATTRIBUTE = {
+        summary: "detects references to possibly missing attributes",
+        status: LintStatus::stable("0.0.1-alpha.22"),
         default_level: Level::Warn,
     }
 }
 
 declare_lint! {
     /// ## What it does
-    /// Checks for imports of symbols that may be unbound.
+    /// Checks for imports of symbols that may be missing.
     ///
     /// ## Why is this bad?
-    /// Importing an unbound module or name will raise a `ModuleNotFoundError`
+    /// Importing a missing module or name will raise a `ModuleNotFoundError`
     /// or `ImportError` at runtime.
     ///
     /// ## Examples
@@ -1361,9 +1427,9 @@ declare_lint! {
     /// # main.py
     /// from module import a  # ImportError: cannot import name 'a' from 'module'
     /// ```
-    pub(crate) static POSSIBLY_UNBOUND_IMPORT = {
-        summary: "detects possibly unbound imports",
-        status: LintStatus::preview("1.0.0"),
+    pub(crate) static POSSIBLY_MISSING_IMPORT = {
+        summary: "detects possibly missing imports",
+        status: LintStatus::stable("0.0.1-alpha.22"),
         default_level: Level::Warn,
     }
 }
@@ -1385,7 +1451,7 @@ declare_lint! {
     /// ```
     pub(crate) static POSSIBLY_UNRESOLVED_REFERENCE = {
         summary: "detects references to possibly undefined names",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Ignore,
     }
 }
@@ -1408,7 +1474,7 @@ declare_lint! {
     /// ```
     pub(crate) static SUBCLASS_OF_FINAL_CLASS = {
         summary: "detects subclasses of final classes",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1430,7 +1496,7 @@ declare_lint! {
     /// ```
     pub(crate) static TYPE_ASSERTION_FAILURE = {
         summary: "detects failed type assertions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1451,7 +1517,7 @@ declare_lint! {
     /// ```
     pub(crate) static TOO_MANY_POSITIONAL_ARGUMENTS = {
         summary: "detects calls passing too many positional arguments",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1490,7 +1556,7 @@ declare_lint! {
     /// - [Python documentation: super()](https://docs.python.org/3/library/functions.html#super)
     pub(crate) static UNAVAILABLE_IMPLICIT_SUPER_ARGUMENTS = {
         summary: "detects invalid `super()` calls where implicit arguments are unavailable.",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1506,9 +1572,9 @@ declare_lint! {
     /// ```python
     /// reveal_type(1)  # NameError: name 'reveal_type' is not defined
     /// ```
-    pub(crate) static UNDEFINED_REVEAL = {
+    pub static UNDEFINED_REVEAL = {
         summary: "detects usages of `reveal_type` without importing it",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Warn,
     }
 }
@@ -1529,7 +1595,28 @@ declare_lint! {
     /// ```
     pub(crate) static UNKNOWN_ARGUMENT = {
         summary: "detects unknown keyword arguments in calls",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
+        default_level: Level::Error,
+    }
+}
+
+declare_lint! {
+    /// ## What it does
+    /// Checks for keyword arguments in calls that match positional-only parameters of the callable.
+    ///
+    /// ## Why is this bad?
+    /// Providing a positional-only parameter as a keyword argument will raise `TypeError` at runtime.
+    ///
+    /// ## Example
+    ///
+    /// ```python
+    /// def f(x: int, /) -> int: ...
+    ///
+    /// f(x=1)  # Error raised here
+    /// ```
+    pub(crate) static POSITIONAL_ONLY_PARAMETER_AS_KWARG = {
+        summary: "detects positional-only parameters passed as keyword arguments",
+        status: LintStatus::stable("0.0.1-alpha.22"),
         default_level: Level::Error,
     }
 }
@@ -1551,7 +1638,7 @@ declare_lint! {
     /// ```
     pub(crate) static UNRESOLVED_ATTRIBUTE = {
         summary: "detects references to unresolved attributes",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1570,7 +1657,7 @@ declare_lint! {
     /// ```
     pub(crate) static UNRESOLVED_IMPORT = {
         summary: "detects unresolved imports",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1589,7 +1676,7 @@ declare_lint! {
     /// ```
     pub(crate) static UNRESOLVED_REFERENCE = {
         summary: "detects references to names that are not defined",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1611,7 +1698,7 @@ declare_lint! {
     /// ```
     pub(crate) static UNSUPPORTED_OPERATOR = {
         summary: "detects binary, unary, or comparison expressions where the operands don't support the operator",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1630,7 +1717,7 @@ declare_lint! {
     /// ```
     pub(crate) static ZERO_STEPSIZE_IN_SLICE = {
         summary: "detects a slice step size of zero",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1654,7 +1741,7 @@ declare_lint! {
     /// ```
     pub(crate) static STATIC_ASSERT_ERROR = {
         summary: "Failed static assertion",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1682,7 +1769,7 @@ declare_lint! {
     /// ```
     pub(crate) static INVALID_ATTRIBUTE_ACCESS = {
         summary: "Invalid attribute access",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -1703,7 +1790,7 @@ declare_lint! {
     /// ```
     pub(crate) static REDUNDANT_CAST = {
         summary: "detects redundant `cast` calls",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Warn,
     }
 }
@@ -1729,6 +1816,7 @@ declare_lint! {
     /// ```
     ///
     /// Use instead:
+    ///
     /// ```python
     /// x: int
     ///
@@ -1741,6 +1829,7 @@ declare_lint! {
     /// ```
     ///
     /// Or:
+    ///
     /// ```python
     /// x: int | None = None
     ///
@@ -1753,11 +1842,38 @@ declare_lint! {
     /// ```
     pub(crate) static UNRESOLVED_GLOBAL = {
         summary: "detects `global` statements with no definition in the global scope",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.15"),
         default_level: Level::Warn,
     }
 }
 
+declare_lint! {
+    /// ## What it does
+    /// Detects missing required keys in `TypedDict` constructor calls.
+    ///
+    /// ## Why is this bad?
+    /// `TypedDict` requires all non-optional keys to be provided during construction.
+    /// Missing items can lead to a `KeyError` at runtime.
+    ///
+    /// ## Example
+    /// ```python
+    /// from typing import TypedDict
+    ///
+    /// class Person(TypedDict):
+    ///     name: str
+    ///     age: int
+    ///
+    /// alice: Person = {"name": "Alice"}  # missing required key 'age'
+    ///
+    /// alice["age"]  # KeyError
+    /// ```
+    pub(crate) static MISSING_TYPED_DICT_KEY = {
+        summary: "detects missing required keys in `TypedDict` constructors",
+        status: LintStatus::stable("0.0.1-alpha.20"),
+        default_level: Level::Error,
+    }
+}
+
 /// A collection of type check diagnostics.
 #[derive(Default, Eq, PartialEq, get_size2::GetSize)]
 pub struct TypeCheckDiagnostics {
@@ -1909,20 +2025,32 @@ fn report_invalid_assignment_with_message(
     }
 }
 
-pub(super) fn report_invalid_assignment(
-    context: &InferContext,
+pub(super) fn report_invalid_assignment<'db>(
+    context: &InferContext<'db, '_>,
     node: AnyNodeRef,
+    definition: Definition<'db>,
     target_ty: Type,
-    source_ty: Type,
+    mut source_ty: Type<'db>,
 ) {
+    let settings =
+        DisplaySettings::from_possibly_ambiguous_type_pair(context.db(), target_ty, source_ty);
+
+    if let DefinitionKind::AnnotatedAssignment(annotated_assignment) = definition.kind(context.db())
+        && let Some(value) = annotated_assignment.value(context.module())
+    {
+        // Re-infer the RHS of the annotated assignment, ignoring the type context for more precise
+        // error messages.
+        source_ty = infer_isolated_expression(context.db(), definition.scope(context.db()), value);
+    }
+
     report_invalid_assignment_with_message(
         context,
         node,
         target_ty,
         format_args!(
             "Object of type `{}` is not assignable to `{}`",
-            source_ty.display(context.db()),
-            target_ty.display(context.db()),
+            source_ty.display_with(context.db(), settings.clone()),
+            target_ty.display_with(context.db(), settings)
         ),
     );
 }
@@ -1946,6 +2074,45 @@ pub(super) fn report_invalid_attribute_assignment(
     );
 }
 
+pub(super) fn report_bad_dunder_set_call<'db>(
+    context: &InferContext<'db, '_>,
+    dunder_set_failure: &CallError<'db>,
+    attribute: &str,
+    object_type: Type<'db>,
+    target: &ast::ExprAttribute,
+) {
+    let Some(builder) = context.report_lint(&INVALID_ASSIGNMENT, target) else {
+        return;
+    };
+    let db = context.db();
+    if let Some(property) = dunder_set_failure.as_attempt_to_set_property_with_no_setter() {
+        let object_type = object_type.display(db);
+        let mut diagnostic = builder.into_diagnostic(format_args!(
+            "Cannot assign to read-only property `{attribute}` on object of type `{object_type}`",
+        ));
+        if let Some(file_range) = property
+            .getter(db)
+            .and_then(|getter| getter.definition(db))
+            .and_then(|definition| definition.focus_range(db))
+        {
+            diagnostic.annotate(Annotation::secondary(Span::from(file_range)).message(
+                format_args!("Property `{object_type}.{attribute}` defined here with no setter"),
+            ));
+            diagnostic.set_primary_message(format_args!(
+                "Attempted assignment to `{object_type}.{attribute}` here"
+            ));
+        }
+    } else {
+        // TODO: Here, it would be nice to emit an additional diagnostic
+        // that explains why the call failed
+        builder.into_diagnostic(format_args!(
+            "Invalid assignment to data descriptor attribute \
+            `{attribute}` on type `{}` with custom `__set__` method",
+            object_type.display(db)
+        ));
+    }
+}
+
 pub(super) fn report_invalid_return_type(
     context: &InferContext,
     object_range: impl Ranged,
@@ -1957,18 +2124,20 @@ pub(super) fn report_invalid_return_type(
         return;
     };
 
+    let settings =
+        DisplaySettings::from_possibly_ambiguous_type_pair(context.db(), expected_ty, actual_ty);
     let return_type_span = context.span(return_type_range);
 
     let mut diag = builder.into_diagnostic("Return type does not match returned value");
     diag.set_primary_message(format_args!(
         "expected `{expected_ty}`, found `{actual_ty}`",
-        expected_ty = expected_ty.display(context.db()),
-        actual_ty = actual_ty.display(context.db()),
+        expected_ty = expected_ty.display_with(context.db(), settings.clone()),
+        actual_ty = actual_ty.display_with(context.db(), settings.clone()),
     ));
     diag.annotate(
         Annotation::secondary(return_type_span).message(format_args!(
             "Expected `{expected_ty}` because of return type",
-            expected_ty = expected_ty.display(context.db()),
+            expected_ty = expected_ty.display_with(context.db(), settings),
         )),
     );
 }
@@ -2013,7 +2182,7 @@ pub(super) fn report_implicit_return_type(
     range: impl Ranged,
     expected_ty: Type,
     has_empty_body: bool,
-    enclosing_class_of_method: Option<ClassLiteral>,
+    enclosing_class_of_method: Option<ClassType>,
     no_return: bool,
 ) {
     let Some(builder) = context.report_lint(&INVALID_RETURN_TYPE, range) else {
@@ -2047,7 +2216,7 @@ pub(super) fn report_implicit_return_type(
     let Some(class) = enclosing_class_of_method else {
         return;
     };
-    if class.iter_mro(db, None).contains(&ClassBase::Protocol) {
+    if class.iter_mro(db).contains(&ClassBase::Protocol) {
         diagnostic.info(format_args!(
             "Class `{}` has `typing.Protocol` in its MRO, but it is not a protocol class",
             class.name(db)
@@ -2091,19 +2260,34 @@ pub(super) fn report_possibly_unresolved_reference(
     builder.into_diagnostic(format_args!("Name `{id}` used when possibly not defined"));
 }
 
-pub(super) fn report_possibly_unbound_attribute(
+pub(super) fn report_possibly_missing_attribute(
     context: &InferContext,
     target: &ast::ExprAttribute,
     attribute: &str,
     object_ty: Type,
 ) {
-    let Some(builder) = context.report_lint(&POSSIBLY_UNBOUND_ATTRIBUTE, target) else {
+    let Some(builder) = context.report_lint(&POSSIBLY_MISSING_ATTRIBUTE, target) else {
         return;
     };
-    builder.into_diagnostic(format_args!(
-        "Attribute `{attribute}` on type `{}` is possibly unbound",
-        object_ty.display(context.db()),
-    ));
+    let db = context.db();
+    match object_ty {
+        Type::ModuleLiteral(module) => builder.into_diagnostic(format_args!(
+            "Member `{attribute}` may be missing on module `{}`",
+            module.module(db).name(db),
+        )),
+        Type::ClassLiteral(class) => builder.into_diagnostic(format_args!(
+            "Attribute `{attribute}` may be missing on class `{}`",
+            class.name(db),
+        )),
+        Type::GenericAlias(alias) => builder.into_diagnostic(format_args!(
+            "Attribute `{attribute}` may be missing on class `{}`",
+            alias.display(db),
+        )),
+        _ => builder.into_diagnostic(format_args!(
+            "Attribute `{attribute}` may be missing on object of type `{}`",
+            object_ty.display(db),
+        )),
+    };
 }
 
 pub(super) fn report_invalid_exception_caught(context: &InferContext, node: &ast::Expr, ty: Type) {
@@ -2142,9 +2326,9 @@ pub(crate) fn report_instance_layout_conflict(
     context: &InferContext,
     class: ClassLiteral,
     node: &ast::StmtClassDef,
-    solid_bases: &IncompatibleBases,
+    disjoint_bases: &IncompatibleBases,
 ) {
-    debug_assert!(solid_bases.len() > 1);
+    debug_assert!(disjoint_bases.len() > 1);
 
     let db = context.db();
 
@@ -2158,7 +2342,7 @@ pub(crate) fn report_instance_layout_conflict(
 
     diagnostic.set_primary_message(format_args!(
         "Bases {} cannot be combined in multiple inheritance",
-        solid_bases.describe_problematic_class_bases(db)
+        disjoint_bases.describe_problematic_class_bases(db)
     ));
 
     let mut subdiagnostic = SubDiagnostic::new(
@@ -2167,23 +2351,23 @@ pub(crate) fn report_instance_layout_conflict(
         have incompatible memory layouts",
     );
 
-    for (solid_base, solid_base_info) in solid_bases {
+    for (disjoint_base, disjoint_base_info) in disjoint_bases {
         let IncompatibleBaseInfo {
             node_index,
             originating_base,
-        } = solid_base_info;
+        } = disjoint_base_info;
 
         let span = context.span(&node.bases()[*node_index]);
         let mut annotation = Annotation::secondary(span.clone());
-        if solid_base.class == *originating_base {
-            match solid_base.kind {
-                SolidBaseKind::DefinesSlots => {
+        if disjoint_base.class == *originating_base {
+            match disjoint_base.kind {
+                DisjointBaseKind::DefinesSlots => {
                     annotation = annotation.message(format_args!(
                         "`{base}` instances have a distinct memory layout because `{base}` defines non-empty `__slots__`",
                         base = originating_base.name(db)
                     ));
                 }
-                SolidBaseKind::HardCoded => {
+                DisjointBaseKind::DisjointBaseDecorator => {
                     annotation = annotation.message(format_args!(
                         "`{base}` instances have a distinct memory layout because of the way `{base}` \
                         is implemented in a C extension",
@@ -2195,26 +2379,28 @@ pub(crate) fn report_instance_layout_conflict(
         } else {
             annotation = annotation.message(format_args!(
                 "`{base}` instances have a distinct memory layout \
-                because `{base}` inherits from `{solid_base}`",
+                because `{base}` inherits from `{disjoint_base}`",
                 base = originating_base.name(db),
-                solid_base = solid_base.class.name(db)
+                disjoint_base = disjoint_base.class.name(db)
             ));
             subdiagnostic.annotate(annotation);
 
             let mut additional_annotation = Annotation::secondary(span);
 
-            additional_annotation = match solid_base.kind {
-                SolidBaseKind::DefinesSlots => additional_annotation.message(format_args!(
-                    "`{solid_base}` instances have a distinct memory layout because `{solid_base}` \
+            additional_annotation = match disjoint_base.kind {
+                DisjointBaseKind::DefinesSlots => additional_annotation.message(format_args!(
+                    "`{disjoint_base}` instances have a distinct memory layout because `{disjoint_base}` \
                         defines non-empty `__slots__`",
-                    solid_base = solid_base.class.name(db),
+                    disjoint_base = disjoint_base.class.name(db),
                 )),
 
-                SolidBaseKind::HardCoded => additional_annotation.message(format_args!(
-                    "`{solid_base}` instances have a distinct memory layout \
-                        because of the way `{solid_base}` is implemented in a C extension",
-                    solid_base = solid_base.class.name(db),
-                )),
+                DisjointBaseKind::DisjointBaseDecorator => {
+                    additional_annotation.message(format_args!(
+                        "`{disjoint_base}` instances have a distinct memory layout \
+                        because of the way `{disjoint_base}` is implemented in a C extension",
+                        disjoint_base = disjoint_base.class.name(db),
+                    ))
+                }
             };
 
             subdiagnostic.annotate(additional_annotation);
@@ -2224,20 +2410,20 @@ pub(crate) fn report_instance_layout_conflict(
     diagnostic.sub(subdiagnostic);
 }
 
-/// Information regarding the conflicting solid bases a class is inferred to have in its MRO.
+/// Information regarding the conflicting disjoint bases a class is inferred to have in its MRO.
 ///
-/// For each solid base, we record information about which element in the class's bases list
-/// caused the solid base to be included in the class's MRO.
+/// For each disjoint base, we record information about which element in the class's bases list
+/// caused the disjoint base to be included in the class's MRO.
 ///
-/// The inner data is an `IndexMap` to ensure that diagnostics regarding conflicting solid bases
+/// The inner data is an `IndexMap` to ensure that diagnostics regarding conflicting disjoint bases
 /// are reported in a stable order.
 #[derive(Debug, Default)]
-pub(super) struct IncompatibleBases<'db>(FxIndexMap<SolidBase<'db>, IncompatibleBaseInfo<'db>>);
+pub(super) struct IncompatibleBases<'db>(FxIndexMap<DisjointBase<'db>, IncompatibleBaseInfo<'db>>);
 
 impl<'db> IncompatibleBases<'db> {
     pub(super) fn insert(
         &mut self,
-        base: SolidBase<'db>,
+        base: DisjointBase<'db>,
         node_index: usize,
         class: ClassLiteral<'db>,
     ) {
@@ -2259,19 +2445,19 @@ impl<'db> IncompatibleBases<'db> {
         self.0.len()
     }
 
-    /// Two solid bases are allowed to coexist in an MRO if one is a subclass of the other.
+    /// Two disjoint bases are allowed to coexist in an MRO if one is a subclass of the other.
     /// This method therefore removes any entry in `self` that is a subclass of one or more
     /// other entries also contained in `self`.
     pub(super) fn remove_redundant_entries(&mut self, db: &'db dyn Db) {
         self.0 = self
             .0
             .iter()
-            .filter(|(solid_base, _)| {
+            .filter(|(disjoint_base, _)| {
                 self.0
                     .keys()
-                    .filter(|other_base| other_base != solid_base)
+                    .filter(|other_base| other_base != disjoint_base)
                     .all(|other_base| {
-                        !solid_base.class.is_subclass_of(
+                        !disjoint_base.class.is_subclass_of(
                             db,
                             None,
                             other_base.class.default_specialization(db),
@@ -2284,25 +2470,25 @@ impl<'db> IncompatibleBases<'db> {
 }
 
 impl<'a, 'db> IntoIterator for &'a IncompatibleBases<'db> {
-    type Item = (&'a SolidBase<'db>, &'a IncompatibleBaseInfo<'db>);
-    type IntoIter = indexmap::map::Iter<'a, SolidBase<'db>, IncompatibleBaseInfo<'db>>;
+    type Item = (&'a DisjointBase<'db>, &'a IncompatibleBaseInfo<'db>);
+    type IntoIter = indexmap::map::Iter<'a, DisjointBase<'db>, IncompatibleBaseInfo<'db>>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.0.iter()
     }
 }
 
-/// Information about which class base the "solid base" stems from
+/// Information about which class base the "disjoint base" stems from
 #[derive(Debug, Copy, Clone)]
 pub(super) struct IncompatibleBaseInfo<'db> {
     /// The index of the problematic base in the [`ast::StmtClassDef`]'s bases list.
     node_index: usize,
 
     /// The base class in the [`ast::StmtClassDef`]'s bases list that caused
-    /// the solid base to be included in the class's MRO.
+    /// the disjoint base to be included in the class's MRO.
     ///
-    /// This won't necessarily be the same class as the `SolidBase`'s class,
-    /// as the `SolidBase` may have found its way into the class's MRO by dint of it being a
+    /// This won't necessarily be the same class as the `DisjointBase`'s class,
+    /// as the `DisjointBase` may have found its way into the class's MRO by dint of it being a
     /// superclass of one of the classes in the class definition's bases list.
     originating_base: ClassLiteral<'db>,
 }
@@ -2437,7 +2623,7 @@ pub(crate) fn add_type_expression_reference_link<'db, 'ctx>(
 pub(crate) fn report_runtime_check_against_non_runtime_checkable_protocol(
     context: &InferContext,
     call: &ast::ExprCall,
-    protocol: ProtocolClassLiteral,
+    protocol: ProtocolClass,
     function: KnownFunction,
 ) {
     let Some(builder) = context.report_lint(&INVALID_ARGUMENT_TYPE, call) else {
@@ -2474,7 +2660,7 @@ pub(crate) fn report_runtime_check_against_non_runtime_checkable_protocol(
 pub(crate) fn report_attempted_protocol_instantiation(
     context: &InferContext,
     call: &ast::ExprCall,
-    protocol: ProtocolClassLiteral,
+    protocol: ProtocolClass,
 ) {
     let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, call) else {
         return;
@@ -2499,7 +2685,7 @@ pub(crate) fn report_attempted_protocol_instantiation(
 pub(crate) fn report_undeclared_protocol_member(
     context: &InferContext,
     definition: Definition,
-    protocol_class: ProtocolClassLiteral,
+    protocol_class: ProtocolClass,
     class_symbol_table: &PlaceTable,
 ) {
     /// We want to avoid suggesting an annotation for e.g. `x = None`,
@@ -2517,6 +2703,12 @@ pub(crate) fn report_undeclared_protocol_member(
                 SubclassOfInner::Dynamic(_) => return false,
             },
             Type::NominalInstance(instance) => instance.class(db),
+            Type::Union(union) => {
+                return union
+                    .elements(db)
+                    .iter()
+                    .all(|elem| should_give_hint(db, *elem));
+            }
             _ => return false,
         };
 
@@ -2548,9 +2740,7 @@ pub(crate) fn report_undeclared_protocol_member(
     if definition.kind(db).is_unannotated_assignment() {
         let binding_type = binding_type(db, definition);
 
-        let suggestion = binding_type
-            .literal_fallback_instance(db)
-            .unwrap_or(binding_type);
+        let suggestion = binding_type.promote_literals(db, TypeContext::default());
 
         if should_give_hint(db, suggestion) {
             diagnostic.set_primary_message(format_args!(
@@ -2657,6 +2847,7 @@ pub(crate) fn report_invalid_or_unsupported_base(
         db,
         "__mro_entries__",
         CallArguments::positional([tuple_of_types]),
+        TypeContext::default(),
     ) {
         Ok(ret) => {
             if ret.return_type(db).is_assignable_to(db, tuple_of_types) {
@@ -2685,7 +2876,7 @@ pub(crate) fn report_invalid_or_unsupported_base(
                 CallDunderError::PossiblyUnbound(_) => {
                     explain_mro_entries(&mut diagnostic);
                     diagnostic.info(format_args!(
-                        "Type `{}` has an `__mro_entries__` attribute, but it is possibly unbound",
+                        "Type `{}` may have an `__mro_entries__` attribute, but it may be missing",
                         base_type.display(db)
                     ));
                 }
@@ -2761,18 +2952,18 @@ fn report_invalid_base<'ctx, 'db>(
 
 pub(crate) fn report_invalid_key_on_typed_dict<'db>(
     context: &InferContext<'db, '_>,
-    value_node: AnyNodeRef,
-    slice_node: AnyNodeRef,
-    value_ty: Type<'db>,
-    slice_ty: Type<'db>,
+    typed_dict_node: AnyNodeRef,
+    key_node: AnyNodeRef,
+    typed_dict_ty: Type<'db>,
+    key_ty: Type<'db>,
     items: &FxOrderMap<Name, Field<'db>>,
 ) {
     let db = context.db();
-    if let Some(builder) = context.report_lint(&INVALID_KEY, slice_node) {
-        match slice_ty {
+    if let Some(builder) = context.report_lint(&INVALID_KEY, key_node) {
+        match key_ty {
             Type::StringLiteral(key) => {
                 let key = key.value(db);
-                let typed_dict_name = value_ty.display(db);
+                let typed_dict_name = typed_dict_ty.display(db);
 
                 let mut diagnostic = builder.into_diagnostic(format_args!(
                     "Invalid key access on TypedDict `{typed_dict_name}`",
@@ -2780,7 +2971,7 @@ pub(crate) fn report_invalid_key_on_typed_dict<'db>(
 
                 diagnostic.annotate(
                     context
-                        .secondary(value_node)
+                        .secondary(typed_dict_node)
                         .message(format_args!("TypedDict `{typed_dict_name}`")),
                 );
 
@@ -2799,8 +2990,8 @@ pub(crate) fn report_invalid_key_on_typed_dict<'db>(
             }
             _ => builder.into_diagnostic(format_args!(
                 "TypedDict `{}` cannot be indexed with a key of type `{}`",
-                value_ty.display(db),
-                slice_ty.display(db),
+                typed_dict_ty.display(db),
+                key_ty.display(db),
             )),
         };
     }
@@ -2809,16 +3000,13 @@ pub(crate) fn report_invalid_key_on_typed_dict<'db>(
 pub(super) fn report_namedtuple_field_without_default_after_field_with_default<'db>(
     context: &InferContext<'db, '_>,
     class: ClassLiteral<'db>,
-    index: &'db SemanticIndex<'db>,
-    field_name: &str,
-    field_with_default: &str,
+    (field, field_def): &(Name, Option<Definition<'db>>),
+    (field_with_default, field_with_default_def): &(Name, Option<Definition<'db>>),
 ) {
     let db = context.db();
     let module = context.module();
 
-    let diagnostic_range = class
-        .first_declaration_of_name(db, field_name, index)
-        .and_then(|definition| definition.declaration.definition())
+    let diagnostic_range = field_def
         .map(|definition| definition.kind(db).full_range(module))
         .unwrap_or_else(|| class.header_range(db));
 
@@ -2830,13 +3018,11 @@ pub(super) fn report_namedtuple_field_without_default_after_field_with_default<'
     ));
 
     diagnostic.set_primary_message(format_args!(
-        "Field `{field_name}` defined here without a default value"
+        "Field `{field}` defined here without a default value",
     ));
 
-    let Some(field_with_default_range) = class
-        .first_binding_of_name(db, field_with_default, index)
-        .and_then(|definition| definition.binding.definition())
-        .map(|definition| definition.kind(db).full_range(module))
+    let Some(field_with_default_range) =
+        field_with_default_def.map(|definition| definition.kind(db).full_range(module))
     else {
         return;
     };
@@ -2855,11 +3041,74 @@ pub(super) fn report_namedtuple_field_without_default_after_field_with_default<'
         );
     } else {
         diagnostic.info(format_args!(
-            "Earlier field `{field_with_default}` was defined with a default value"
+            "Earlier field `{field_with_default}` was defined with a default value",
         ));
     }
 }
 
+pub(crate) fn report_missing_typed_dict_key<'db>(
+    context: &InferContext<'db, '_>,
+    constructor_node: AnyNodeRef,
+    typed_dict_ty: Type<'db>,
+    missing_field: &str,
+) {
+    let db = context.db();
+    if let Some(builder) = context.report_lint(&MISSING_TYPED_DICT_KEY, constructor_node) {
+        let typed_dict_name = typed_dict_ty.display(db);
+        builder.into_diagnostic(format_args!(
+            "Missing required key '{missing_field}' in TypedDict `{typed_dict_name}` constructor",
+        ));
+    }
+}
+
+pub(crate) fn report_cannot_pop_required_field_on_typed_dict<'db>(
+    context: &InferContext<'db, '_>,
+    key_node: AnyNodeRef,
+    typed_dict_ty: Type<'db>,
+    field_name: &str,
+) {
+    let db = context.db();
+    if let Some(builder) = context.report_lint(&INVALID_ARGUMENT_TYPE, key_node) {
+        let typed_dict_name = typed_dict_ty.display(db);
+        builder.into_diagnostic(format_args!(
+            "Cannot pop required field '{field_name}' from TypedDict `{typed_dict_name}`",
+        ));
+    }
+}
+
+pub(crate) fn report_rebound_typevar<'db>(
+    context: &InferContext<'db, '_>,
+    typevar_name: &ast::name::Name,
+    class: ClassLiteral<'db>,
+    class_node: &ast::StmtClassDef,
+    other_typevar: BoundTypeVarInstance<'db>,
+) {
+    let db = context.db();
+    let Some(builder) = context.report_lint(&INVALID_GENERIC_CLASS, class.header_range(db)) else {
+        return;
+    };
+    let mut diagnostic = builder.into_diagnostic(format_args!(
+        "Generic class `{}` must not reference type variables bound in an enclosing scope",
+        class_node.name,
+    ));
+    diagnostic.set_primary_message(format_args!(
+        "`{typevar_name}` referenced in class definition here"
+    ));
+    let Some(other_definition) = other_typevar.binding_context(db).definition() else {
+        return;
+    };
+    let span = match binding_type(db, other_definition) {
+        Type::ClassLiteral(class) => Some(class.header_span(db)),
+        Type::FunctionLiteral(function) => function.spans(db).map(|spans| spans.signature),
+        _ => return,
+    };
+    if let Some(span) = span {
+        diagnostic.annotate(Annotation::secondary(span).message(format_args!(
+            "Type variable `{typevar_name}` is bound in this enclosing scope",
+        )));
+    }
+}
+
 /// This function receives an unresolved `from foo import bar` import,
 /// where `foo` can be resolved to a module but that module does not
 /// have a `bar` member or submodule.
@@ -2908,28 +3157,52 @@ pub(super) fn hint_if_stdlib_submodule_exists_on_other_versions(
     add_inferred_python_version_hint_to_diagnostic(db, &mut diagnostic, "resolving modules");
 }
 
-/// Suggest a name from `existing_names` that is similar to `wrong_name`.
-fn did_you_mean<S: AsRef<str>, T: AsRef<str>>(
-    existing_names: impl Iterator<Item = S>,
-    wrong_name: T,
-) -> Option<String> {
-    if wrong_name.as_ref().len() < 3 {
-        return None;
+/// This function receives an unresolved `foo.bar` attribute access,
+/// where `foo` can be resolved to have a type but that type does not
+/// have a `bar` attribute.
+///
+/// If the type of `foo` has a definition that originates in the
+/// standard library and `foo.bar` *does* exist as an attribute on *other*
+/// Python versions, we add a hint to the diagnostic that the user may have
+/// misconfigured their Python version.
+pub(super) fn hint_if_stdlib_attribute_exists_on_other_versions(
+    db: &dyn Db,
+    mut diagnostic: LintDiagnosticGuard,
+    value_type: &Type,
+    attr: &Identifier,
+) {
+    // Currently we limit this analysis to attributes of stdlib modules,
+    // as this covers the most important cases while not being too noisy
+    // about basic typos or special types like `super(C, self)`
+    let Type::ModuleLiteral(module_ty) = value_type else {
+        return;
+    };
+    let module = module_ty.module(db);
+    let Some(file) = module.file(db) else {
+        return;
+    };
+    let Some(search_path) = module.search_path(db) else {
+        return;
+    };
+    if !search_path.is_standard_library() {
+        return;
     }
 
-    existing_names
-        .filter(|ref id| id.as_ref().len() >= 2)
-        .map(|ref id| {
-            (
-                id.as_ref().to_string(),
-                strsim::damerau_levenshtein(
-                    &id.as_ref().to_lowercase(),
-                    &wrong_name.as_ref().to_lowercase(),
-                ),
-            )
-        })
-        .min_by_key(|(_, dist)| *dist)
-        // Heuristic to filter out bad matches
-        .filter(|(_, dist)| *dist <= 3)
-        .map(|(id, _)| id)
+    // We populate place_table entries for stdlib items across all known versions and platforms,
+    // so if this lookup succeeds then we know that this lookup *could* succeed with possible
+    // configuration changes.
+    let symbol_table = place_table(db, global_scope(db, file));
+    if symbol_table.symbol_by_name(attr).is_none() {
+        return;
+    }
+
+    // For now, we just mention the current version they're on, and hope that's enough of a nudge.
+    // TODO: determine what version they need to be on
+    // TODO: also mention the platform we're assuming
+    // TODO: determine what platform they need to be on
+    add_inferred_python_version_hint_to_diagnostic(
+        db,
+        &mut diagnostic,
+        &format!("accessing `{}`", attr.id),
+    );
 }
diff --git a/crates/ty_python_semantic/src/types/display.rs b/crates/ty_python_semantic/src/types/display.rs
index dd8412f4cf..560943aba1 100644
--- a/crates/ty_python_semantic/src/types/display.rs
+++ b/crates/ty_python_semantic/src/types/display.rs
@@ -1,61 +1,235 @@
 //! Display implementations for types.
 
+use std::borrow::Cow;
+use std::cell::RefCell;
+use std::collections::hash_map::Entry;
 use std::fmt::{self, Display, Formatter, Write};
+use std::rc::Rc;
 
 use ruff_db::display::FormatterJoinExtension;
+use ruff_db::files::FilePath;
+use ruff_db::source::line_index;
 use ruff_python_ast::str::{Quote, TripleQuotes};
 use ruff_python_literal::escape::AsciiEscape;
 use ruff_text_size::{TextRange, TextSize};
+use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::Db;
+use crate::module_resolver::file_to_module;
+use crate::semantic_index::{scope::ScopeKind, semantic_index};
 use crate::types::class::{ClassLiteral, ClassType, GenericAlias};
 use crate::types::function::{FunctionType, OverloadLiteral};
 use crate::types::generics::{GenericContext, Specialization};
 use crate::types::signatures::{CallableSignature, Parameter, Parameters, Signature};
 use crate::types::tuple::TupleSpec;
+use crate::types::visitor::TypeVisitor;
 use crate::types::{
-    CallableType, IntersectionType, KnownClass, MethodWrapperKind, Protocol, StringLiteralType,
-    SubclassOfInner, Type, UnionType, WrapperDescriptorKind,
+    BoundTypeVarIdentity, CallableType, IntersectionType, KnownBoundMethodType, KnownClass,
+    MaterializationKind, Protocol, ProtocolInstanceType, StringLiteralType, SubclassOfInner, Type,
+    UnionType, WrapperDescriptorKind, visitor,
 };
+use ruff_db::parsed::parsed_module;
 
 /// Settings for displaying types and signatures
-#[derive(Debug, Copy, Clone, Default)]
-pub struct DisplaySettings {
+#[derive(Debug, Clone, Default)]
+pub struct DisplaySettings<'db> {
     /// Whether rendering can be multiline
     pub multiline: bool,
+    /// Class names that should be displayed fully qualified
+    /// (e.g., `module.ClassName` instead of just `ClassName`)
+    pub qualified: Rc<FxHashMap<&'db str, QualificationLevel>>,
+    /// Whether long unions and literals are displayed in full
+    pub preserve_full_unions: bool,
 }
 
-impl DisplaySettings {
+impl<'db> DisplaySettings<'db> {
     #[must_use]
-    pub fn multiline(self) -> Self {
-        Self { multiline: true }
+    pub fn multiline(&self) -> Self {
+        Self {
+            multiline: true,
+            ..self.clone()
+        }
     }
 
     #[must_use]
-    pub fn singleline(self) -> Self {
-        Self { multiline: false }
+    pub fn singleline(&self) -> Self {
+        Self {
+            multiline: false,
+            ..self.clone()
+        }
+    }
+
+    #[must_use]
+    pub fn truncate_long_unions(self) -> Self {
+        Self {
+            preserve_full_unions: false,
+            ..self
+        }
+    }
+
+    #[must_use]
+    pub fn preserve_long_unions(self) -> Self {
+        Self {
+            preserve_full_unions: true,
+            ..self
+        }
+    }
+
+    #[must_use]
+    pub fn from_possibly_ambiguous_type_pair(
+        db: &'db dyn Db,
+        type_1: Type<'db>,
+        type_2: Type<'db>,
+    ) -> Self {
+        let collector = AmbiguousClassCollector::default();
+        collector.visit_type(db, type_1);
+        collector.visit_type(db, type_2);
+
+        Self {
+            qualified: Rc::new(
+                collector
+                    .class_names
+                    .borrow()
+                    .iter()
+                    .filter_map(|(name, ambiguity)| {
+                        Some((*name, QualificationLevel::from_ambiguity_state(ambiguity)?))
+                    })
+                    .collect(),
+            ),
+            ..Self::default()
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum QualificationLevel {
+    ModuleName,
+    FileAndLineNumber,
+}
+
+impl QualificationLevel {
+    const fn from_ambiguity_state(state: &AmbiguityState) -> Option<Self> {
+        match state {
+            AmbiguityState::Unambiguous(_) => None,
+            AmbiguityState::RequiresFullyQualifiedName { .. } => Some(Self::ModuleName),
+            AmbiguityState::RequiresFileAndLineNumber => Some(Self::FileAndLineNumber),
+        }
+    }
+}
+
+#[derive(Debug, Default)]
+struct AmbiguousClassCollector<'db> {
+    visited_types: RefCell<FxHashSet<Type<'db>>>,
+    class_names: RefCell<FxHashMap<&'db str, AmbiguityState<'db>>>,
+}
+
+impl<'db> AmbiguousClassCollector<'db> {
+    fn record_class(&self, db: &'db dyn Db, class: ClassLiteral<'db>) {
+        match self.class_names.borrow_mut().entry(class.name(db)) {
+            Entry::Vacant(entry) => {
+                entry.insert(AmbiguityState::Unambiguous(class));
+            }
+            Entry::Occupied(mut entry) => {
+                let value = entry.get_mut();
+                match value {
+                    AmbiguityState::Unambiguous(existing) => {
+                        if *existing != class {
+                            let qualified_name_components = class.qualified_name_components(db);
+                            if existing.qualified_name_components(db) == qualified_name_components {
+                                *value = AmbiguityState::RequiresFileAndLineNumber;
+                            } else {
+                                *value = AmbiguityState::RequiresFullyQualifiedName {
+                                    class,
+                                    qualified_name_components,
+                                };
+                            }
+                        }
+                    }
+                    AmbiguityState::RequiresFullyQualifiedName {
+                        class: existing,
+                        qualified_name_components,
+                    } => {
+                        if *existing != class {
+                            let new_components = class.qualified_name_components(db);
+                            if *qualified_name_components == new_components {
+                                *value = AmbiguityState::RequiresFileAndLineNumber;
+                            }
+                        }
+                    }
+                    AmbiguityState::RequiresFileAndLineNumber => {}
+                }
+            }
+        }
+    }
+}
+
+/// Whether or not a class can be unambiguously identified by its *unqualified* name
+/// given the other types that are present in the same context.
+#[derive(Debug, Clone, PartialEq, Eq)]
+enum AmbiguityState<'db> {
+    /// The class can be displayed unambiguously using its unqualified name
+    Unambiguous(ClassLiteral<'db>),
+    /// The class must be displayed using its fully qualified name to avoid ambiguity.
+    RequiresFullyQualifiedName {
+        class: ClassLiteral<'db>,
+        qualified_name_components: Vec<String>,
+    },
+    /// Even the class's fully qualified name is not sufficient;
+    /// we must also include the file and line number.
+    RequiresFileAndLineNumber,
+}
+
+impl<'db> super::visitor::TypeVisitor<'db> for AmbiguousClassCollector<'db> {
+    fn should_visit_lazy_type_attributes(&self) -> bool {
+        false
+    }
+
+    fn visit_type(&self, db: &'db dyn Db, ty: Type<'db>) {
+        match ty {
+            Type::ClassLiteral(class) => self.record_class(db, class),
+            Type::EnumLiteral(literal) => self.record_class(db, literal.enum_class(db)),
+            Type::GenericAlias(alias) => self.record_class(db, alias.origin(db)),
+            // Visit the class (as if it were a nominal-instance type)
+            // rather than the protocol members, if it is a class-based protocol.
+            // (For the purposes of displaying the type, we'll use the class name.)
+            Type::ProtocolInstance(ProtocolInstanceType {
+                inner: Protocol::FromClass(class),
+                ..
+            }) => return self.visit_type(db, Type::from(class)),
+            _ => {}
+        }
+
+        if let visitor::TypeKind::NonAtomic(t) = visitor::TypeKind::from(ty) {
+            if !self.visited_types.borrow_mut().insert(ty) {
+                // If we have already seen this type, we can skip it.
+                return;
+            }
+            visitor::walk_non_atomic_type(db, t, self);
+        }
     }
 }
 
 impl<'db> Type<'db> {
-    pub fn display(&self, db: &'db dyn Db) -> DisplayType<'_> {
+    pub fn display(self, db: &'db dyn Db) -> DisplayType<'db> {
         DisplayType {
             ty: self,
             settings: DisplaySettings::default(),
             db,
         }
     }
-    pub fn display_with(&self, db: &'db dyn Db, settings: DisplaySettings) -> DisplayType<'_> {
+
+    pub fn display_with(self, db: &'db dyn Db, settings: DisplaySettings<'db>) -> DisplayType<'db> {
         DisplayType {
             ty: self,
             db,
             settings,
         }
     }
+
     fn representation(
         self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayRepresentation<'db> {
         DisplayRepresentation {
             db,
@@ -65,20 +239,16 @@ impl<'db> Type<'db> {
     }
 }
 
-#[derive(Copy, Clone)]
 pub struct DisplayType<'db> {
-    ty: &'db Type<'db>,
+    ty: Type<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayType<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let representation = self.ty.representation(self.db, self.settings);
+        let representation = self.ty.representation(self.db, self.settings.clone());
         match self.ty {
-            Type::ClassLiteral(literal) if literal.is_known(self.db, KnownClass::Any) => {
-                write!(f, "typing.Any")
-            }
             Type::IntLiteral(_)
             | Type::BooleanLiteral(_)
             | Type::StringLiteral(_)
@@ -97,13 +267,105 @@ impl fmt::Debug for DisplayType<'_> {
     }
 }
 
+impl<'db> ClassLiteral<'db> {
+    fn display_with(self, db: &'db dyn Db, settings: DisplaySettings<'db>) -> ClassDisplay<'db> {
+        ClassDisplay {
+            db,
+            class: self,
+            settings,
+        }
+    }
+
+    /// Returns the components of the qualified name of this class, excluding this class itself.
+    ///
+    /// For example, calling this method on a class `C` in the module `a.b` would return
+    /// `["a", "b"]`. Calling this method on a class `D` inside the namespace of a method
+    /// `m` inside the namespace of a class `C` in the module `a.b` would return
+    /// `["a", "b", "C", "<locals of function 'm'>"]`.
+    fn qualified_name_components(self, db: &'db dyn Db) -> Vec<String> {
+        let body_scope = self.body_scope(db);
+        let file = body_scope.file(db);
+        let module_ast = parsed_module(db, file).load(db);
+        let index = semantic_index(db, file);
+        let file_scope_id = body_scope.file_scope_id(db);
+
+        let mut name_parts = vec![];
+
+        // Skips itself
+        for (_, ancestor_scope) in index.ancestor_scopes(file_scope_id).skip(1) {
+            let node = ancestor_scope.node();
+
+            match ancestor_scope.kind() {
+                ScopeKind::Class => {
+                    if let Some(class_def) = node.as_class() {
+                        name_parts.push(class_def.node(&module_ast).name.as_str().to_string());
+                    }
+                }
+                ScopeKind::Function => {
+                    if let Some(function_def) = node.as_function() {
+                        name_parts.push(format!(
+                            "<locals of function '{}'>",
+                            function_def.node(&module_ast).name.as_str()
+                        ));
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        if let Some(module) = file_to_module(db, file) {
+            let module_name = module.name(db);
+            name_parts.push(module_name.as_str().to_string());
+        }
+
+        name_parts.reverse();
+        name_parts
+    }
+}
+
+struct ClassDisplay<'db> {
+    db: &'db dyn Db,
+    class: ClassLiteral<'db>,
+    settings: DisplaySettings<'db>,
+}
+
+impl Display for ClassDisplay<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let qualification_level = self.settings.qualified.get(&**self.class.name(self.db));
+        if qualification_level.is_some() {
+            for parent in self.class.qualified_name_components(self.db) {
+                f.write_str(&parent)?;
+                f.write_char('.')?;
+            }
+        }
+        f.write_str(self.class.name(self.db))?;
+        if qualification_level == Some(&QualificationLevel::FileAndLineNumber) {
+            let file = self.class.file(self.db);
+            let path = file.path(self.db);
+            let path = match path {
+                FilePath::System(path) => Cow::Owned(FilePath::System(
+                    path.strip_prefix(self.db.system().current_directory())
+                        .unwrap_or(path)
+                        .to_path_buf(),
+                )),
+                FilePath::Vendored(_) | FilePath::SystemVirtual(_) => Cow::Borrowed(path),
+            };
+            let line_index = line_index(self.db, file);
+            let class_offset = self.class.header_range(self.db).start();
+            let line_number = line_index.line_index(class_offset);
+            write!(f, " @ {path}:{line_number}")?;
+        }
+        Ok(())
+    }
+}
+
 /// Writes the string representation of a type, which is the value displayed either as
 /// `Literal[<repr>]` or `Literal[<repr1>, <repr2>]` for literal types or as `<repr>` for
 /// non literals
 struct DisplayRepresentation<'db> {
     ty: Type<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayRepresentation<'_> {
@@ -121,18 +383,20 @@ impl Display for DisplayRepresentation<'_> {
                         .specialization(self.db)
                         .tuple(self.db)
                         .expect("Specialization::tuple() should always return `Some()` for `KnownClass::Tuple`")
-                        .display_with(self.db, self.settings)
+                        .display_with(self.db, self.settings.clone())
                         .fmt(f),
-                    (ClassType::NonGeneric(class), _) => f.write_str(class.name(self.db)),
-                    (ClassType::Generic(alias), _) => alias.display_with(self.db, self.settings).fmt(f),
+                    (ClassType::NonGeneric(class), _) => {
+                        class.display_with(self.db, self.settings.clone()).fmt(f)
+                    },
+                    (ClassType::Generic(alias), _) => alias.display_with(self.db, self.settings.clone()).fmt(f),
                 }
             }
             Type::ProtocolInstance(protocol) => match protocol.inner {
                 Protocol::FromClass(ClassType::NonGeneric(class)) => {
-                    f.write_str(class.name(self.db))
+                    class.display_with(self.db, self.settings.clone()).fmt(f)
                 }
                 Protocol::FromClass(ClassType::Generic(alias)) => {
-                    alias.display_with(self.db, self.settings).fmt(f)
+                    alias.display_with(self.db, self.settings.clone()).fmt(f)
                 }
                 Protocol::Synthesized(synthetic) => {
                     f.write_str("<Protocol with members ")?;
@@ -153,9 +417,11 @@ impl Display for DisplayRepresentation<'_> {
             Type::ModuleLiteral(module) => {
                 write!(f, "<module '{}'>", module.module(self.db).name(self.db))
             }
-            Type::ClassLiteral(class) => {
-                write!(f, "<class '{}'>", class.name(self.db))
-            }
+            Type::ClassLiteral(class) => write!(
+                f,
+                "<class '{}'>",
+                class.display_with(self.db, self.settings.clone())
+            ),
             Type::GenericAlias(generic) => write!(
                 f,
                 "<class '{}'>",
@@ -163,7 +429,11 @@ impl Display for DisplayRepresentation<'_> {
             ),
             Type::SubclassOf(subclass_of_ty) => match subclass_of_ty.subclass_of() {
                 SubclassOfInner::Class(ClassType::NonGeneric(class)) => {
-                    write!(f, "type[{}]", class.name(self.db))
+                    write!(
+                        f,
+                        "type[{}]",
+                        class.display_with(self.db, self.settings.clone())
+                    )
                 }
                 SubclassOfInner::Class(ClassType::Generic(alias)) => {
                     write!(
@@ -176,8 +446,12 @@ impl Display for DisplayRepresentation<'_> {
             },
             Type::SpecialForm(special_form) => special_form.fmt(f),
             Type::KnownInstance(known_instance) => known_instance.repr(self.db).fmt(f),
-            Type::FunctionLiteral(function) => function.display_with(self.db, self.settings).fmt(f),
-            Type::Callable(callable) => callable.display_with(self.db, self.settings).fmt(f),
+            Type::FunctionLiteral(function) => {
+                function.display_with(self.db, self.settings.clone()).fmt(f)
+            }
+            Type::Callable(callable) => {
+                callable.display_with(self.db, self.settings.clone()).fmt(f)
+            }
             Type::BoundMethod(bound_method) => {
                 let function = bound_method.function(self.db);
                 let self_ty = bound_method.self_instance(self.db);
@@ -188,7 +462,7 @@ impl Display for DisplayRepresentation<'_> {
                         let type_parameters = DisplayOptionalGenericContext {
                             generic_context: signature.generic_context.as_ref(),
                             db: self.db,
-                            settings: self.settings,
+                            settings: self.settings.clone(),
                         };
 
                         write!(
@@ -199,7 +473,7 @@ impl Display for DisplayRepresentation<'_> {
                             type_parameters = type_parameters,
                             signature = signature
                                 .bind_self(self.db, Some(typing_self_ty))
-                                .display_with(self.db, self.settings)
+                                .display_with(self.db, self.settings.clone())
                         )
                     }
                     signatures => {
@@ -213,7 +487,7 @@ impl Display for DisplayRepresentation<'_> {
                             join.entry(
                                 &signature
                                     .bind_self(self.db, Some(typing_self_ty))
-                                    .display_with(self.db, self.settings),
+                                    .display_with(self.db, self.settings.clone()),
                             );
                         }
                         if !self.settings.multiline {
@@ -223,28 +497,31 @@ impl Display for DisplayRepresentation<'_> {
                     }
                 }
             }
-            Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderGet(function)) => {
+            Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderGet(function)) => {
                 write!(
                     f,
                     "<method-wrapper `__get__` of `{function}`>",
                     function = function.name(self.db),
                 )
             }
-            Type::MethodWrapper(MethodWrapperKind::FunctionTypeDunderCall(function)) => {
+            Type::KnownBoundMethod(KnownBoundMethodType::FunctionTypeDunderCall(function)) => {
                 write!(
                     f,
                     "<method-wrapper `__call__` of `{function}`>",
                     function = function.name(self.db),
                 )
             }
-            Type::MethodWrapper(MethodWrapperKind::PropertyDunderGet(_)) => {
-                write!(f, "<method-wrapper `__get__` of `property` object>",)
+            Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderGet(_)) => {
+                f.write_str("<method-wrapper `__get__` of `property` object>")
             }
-            Type::MethodWrapper(MethodWrapperKind::PropertyDunderSet(_)) => {
-                write!(f, "<method-wrapper `__set__` of `property` object>",)
+            Type::KnownBoundMethod(KnownBoundMethodType::PropertyDunderSet(_)) => {
+                f.write_str("<method-wrapper `__set__` of `property` object>")
             }
-            Type::MethodWrapper(MethodWrapperKind::StrStartswith(_)) => {
-                write!(f, "<method-wrapper `startswith` of `str` object>",)
+            Type::KnownBoundMethod(KnownBoundMethodType::StrStartswith(_)) => {
+                f.write_str("<method-wrapper `startswith` of `str` object>")
+            }
+            Type::KnownBoundMethod(KnownBoundMethodType::PathOpen) => {
+                f.write_str("bound method `Path.open`")
             }
             Type::WrapperDescriptor(kind) => {
                 let (method, object) = match kind {
@@ -260,35 +537,30 @@ impl Display for DisplayRepresentation<'_> {
             Type::DataclassTransformer(_) => {
                 f.write_str("<decorator produced by typing.dataclass_transform>")
             }
-            Type::Union(union) => union.display_with(self.db, self.settings).fmt(f),
-            Type::Intersection(intersection) => {
-                intersection.display_with(self.db, self.settings).fmt(f)
-            }
+            Type::Union(union) => union.display_with(self.db, self.settings.clone()).fmt(f),
+            Type::Intersection(intersection) => intersection
+                .display_with(self.db, self.settings.clone())
+                .fmt(f),
             Type::IntLiteral(n) => n.fmt(f),
             Type::BooleanLiteral(boolean) => f.write_str(if boolean { "True" } else { "False" }),
-            Type::StringLiteral(string) => string.display_with(self.db, self.settings).fmt(f),
+            Type::StringLiteral(string) => {
+                string.display_with(self.db, self.settings.clone()).fmt(f)
+            }
             Type::LiteralString => f.write_str("LiteralString"),
             Type::BytesLiteral(bytes) => {
                 let escape = AsciiEscape::with_preferred_quote(bytes.value(self.db), Quote::Double);
 
                 escape.bytes_repr(TripleQuotes::No).write(f)
             }
-            Type::EnumLiteral(enum_literal) => {
-                write!(
-                    f,
-                    "{enum_class}.{name}",
-                    enum_class = enum_literal.enum_class(self.db).name(self.db),
-                    name = enum_literal.name(self.db),
-                )
-            }
-            Type::NonInferableTypeVar(bound_typevar) | Type::TypeVar(bound_typevar) => {
-                f.write_str(bound_typevar.typevar(self.db).name(self.db))?;
-                if let Some(binding_context) = bound_typevar.binding_context(self.db).name(self.db)
-                {
-                    write!(f, "@{binding_context}")?;
-                }
-                Ok(())
-            }
+            Type::EnumLiteral(enum_literal) => write!(
+                f,
+                "{enum_class}.{literal_name}",
+                enum_class = enum_literal
+                    .enum_class(self.db)
+                    .display_with(self.db, self.settings.clone()),
+                literal_name = enum_literal.name(self.db)
+            ),
+            Type::TypeVar(bound_typevar) => bound_typevar.identity(self.db).display(self.db).fmt(f),
             Type::AlwaysTruthy => f.write_str("AlwaysTruthy"),
             Type::AlwaysFalsy => f.write_str("AlwaysFalsy"),
             Type::BoundSuper(bound_super) => {
@@ -297,9 +569,7 @@ impl Display for DisplayRepresentation<'_> {
                     "<super: {pivot}, {owner}>",
                     pivot = Type::from(bound_super.pivot_class(self.db))
                         .display_with(self.db, self.settings.singleline()),
-                    owner = bound_super
-                        .owner(self.db)
-                        .into_type()
+                    owner = Type::from(bound_super.owner(self.db))
                         .display_with(self.db, self.settings.singleline())
                 )
             }
@@ -315,17 +585,54 @@ impl Display for DisplayRepresentation<'_> {
                 }
                 f.write_str("]")
             }
-            Type::TypedDict(typed_dict) => f.write_str(typed_dict.defining_class.name(self.db)),
-            Type::TypeAlias(alias) => f.write_str(alias.name(self.db)),
+            Type::TypedDict(typed_dict) => typed_dict
+                .defining_class()
+                .class_literal(self.db)
+                .0
+                .display_with(self.db, self.settings.clone())
+                .fmt(f),
+            Type::TypeAlias(alias) => {
+                f.write_str(alias.name(self.db))?;
+                match alias.specialization(self.db) {
+                    None => Ok(()),
+                    Some(specialization) => specialization
+                        .display_short(self.db, TupleSpecialization::No, self.settings.clone())
+                        .fmt(f),
+                }
+            }
         }
     }
 }
 
+impl<'db> BoundTypeVarIdentity<'db> {
+    pub(crate) fn display(self, db: &'db dyn Db) -> impl Display {
+        DisplayBoundTypeVarIdentity {
+            bound_typevar_identity: self,
+            db,
+        }
+    }
+}
+
+struct DisplayBoundTypeVarIdentity<'db> {
+    bound_typevar_identity: BoundTypeVarIdentity<'db>,
+    db: &'db dyn Db,
+}
+
+impl Display for DisplayBoundTypeVarIdentity<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.write_str(self.bound_typevar_identity.identity.name(self.db))?;
+        if let Some(binding_context) = self.bound_typevar_identity.binding_context.name(self.db) {
+            write!(f, "@{binding_context}")?;
+        }
+        Ok(())
+    }
+}
+
 impl<'db> TupleSpec<'db> {
     pub(crate) fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayTuple<'db> {
         DisplayTuple {
             tuple: self,
@@ -338,7 +645,7 @@ impl<'db> TupleSpec<'db> {
 pub(crate) struct DisplayTuple<'db> {
     tuple: &'db TupleSpec<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayTuple<'_> {
@@ -412,7 +719,7 @@ impl<'db> OverloadLiteral<'db> {
     pub(crate) fn display_with(
         self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayOverloadLiteral<'db> {
         DisplayOverloadLiteral {
             literal: self,
@@ -425,16 +732,16 @@ impl<'db> OverloadLiteral<'db> {
 pub(crate) struct DisplayOverloadLiteral<'db> {
     literal: OverloadLiteral<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayOverloadLiteral<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let signature = self.literal.signature(self.db, None);
+        let signature = self.literal.signature(self.db);
         let type_parameters = DisplayOptionalGenericContext {
             generic_context: signature.generic_context.as_ref(),
             db: self.db,
-            settings: self.settings,
+            settings: self.settings.clone(),
         };
 
         write!(
@@ -442,7 +749,7 @@ impl Display for DisplayOverloadLiteral<'_> {
             "def {name}{type_parameters}{signature}",
             name = self.literal.name(self.db),
             type_parameters = type_parameters,
-            signature = signature.display_with(self.db, self.settings)
+            signature = signature.display_with(self.db, self.settings.clone())
         )
     }
 }
@@ -451,7 +758,7 @@ impl<'db> FunctionType<'db> {
     pub(crate) fn display_with(
         self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayFunctionType<'db> {
         DisplayFunctionType {
             ty: self,
@@ -464,7 +771,7 @@ impl<'db> FunctionType<'db> {
 pub(crate) struct DisplayFunctionType<'db> {
     ty: FunctionType<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayFunctionType<'_> {
@@ -476,7 +783,7 @@ impl Display for DisplayFunctionType<'_> {
                 let type_parameters = DisplayOptionalGenericContext {
                     generic_context: signature.generic_context.as_ref(),
                     db: self.db,
-                    settings: self.settings,
+                    settings: self.settings.clone(),
                 };
 
                 write!(
@@ -484,7 +791,7 @@ impl Display for DisplayFunctionType<'_> {
                     "def {name}{type_parameters}{signature}",
                     name = self.ty.name(self.db),
                     type_parameters = type_parameters,
-                    signature = signature.display_with(self.db, self.settings)
+                    signature = signature.display_with(self.db, self.settings.clone())
                 )
             }
             signatures => {
@@ -495,7 +802,7 @@ impl Display for DisplayFunctionType<'_> {
                 let separator = if self.settings.multiline { "\n" } else { ", " };
                 let mut join = f.join(separator);
                 for signature in signatures {
-                    join.entry(&signature.display_with(self.db, self.settings));
+                    join.entry(&signature.display_with(self.db, self.settings.clone()));
                 }
                 if !self.settings.multiline {
                     f.write_str("]")?;
@@ -507,10 +814,14 @@ impl Display for DisplayFunctionType<'_> {
 }
 
 impl<'db> GenericAlias<'db> {
+    pub(crate) fn display(&'db self, db: &'db dyn Db) -> DisplayGenericAlias<'db> {
+        self.display_with(db, DisplaySettings::default())
+    }
+
     pub(crate) fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayGenericAlias<'db> {
         DisplayGenericAlias {
             origin: self.origin(db),
@@ -525,22 +836,34 @@ pub(crate) struct DisplayGenericAlias<'db> {
     origin: ClassLiteral<'db>,
     specialization: Specialization<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayGenericAlias<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         if let Some(tuple) = self.specialization.tuple(self.db) {
-            tuple.display_with(self.db, self.settings).fmt(f)
+            tuple.display_with(self.db, self.settings.clone()).fmt(f)
         } else {
+            let prefix = match self.specialization.materialization_kind(self.db) {
+                None => "",
+                Some(MaterializationKind::Top) => "Top[",
+                Some(MaterializationKind::Bottom) => "Bottom[",
+            };
+            let suffix = match self.specialization.materialization_kind(self.db) {
+                None => "",
+                Some(_) => "]",
+            };
             write!(
                 f,
-                "{origin}{specialization}",
-                origin = self.origin.name(self.db),
+                "{prefix}{origin}{specialization}{suffix}",
+                prefix = prefix,
+                origin = self.origin.display_with(self.db, self.settings.clone()),
                 specialization = self.specialization.display_short(
                     self.db,
-                    TupleSpecialization::from_class(self.db, self.origin)
+                    TupleSpecialization::from_class(self.db, self.origin),
+                    self.settings.clone()
                 ),
+                suffix = suffix,
             )
         }
     }
@@ -553,7 +876,7 @@ impl<'db> GenericContext<'db> {
     pub fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayGenericContext<'db> {
         DisplayGenericContext {
             generic_context: self,
@@ -566,7 +889,7 @@ impl<'db> GenericContext<'db> {
 struct DisplayOptionalGenericContext<'db> {
     generic_context: Option<&'db GenericContext<'db>>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayOptionalGenericContext<'_> {
@@ -575,7 +898,7 @@ impl Display for DisplayOptionalGenericContext<'_> {
             DisplayGenericContext {
                 generic_context,
                 db: self.db,
-                settings: self.settings,
+                settings: self.settings.clone(),
             }
             .fmt(f)
         } else {
@@ -588,7 +911,7 @@ pub struct DisplayGenericContext<'db> {
     generic_context: &'db GenericContext<'db>,
     db: &'db dyn Db,
     #[expect(dead_code)]
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayGenericContext<'_> {
@@ -596,7 +919,6 @@ impl Display for DisplayGenericContext<'_> {
         let variables = self.generic_context.variables(self.db);
 
         let non_implicit_variables: Vec<_> = variables
-            .iter()
             .filter(|bound_typevar| !bound_typevar.typevar(self.db).is_self(self.db))
             .collect();
 
@@ -616,17 +938,22 @@ impl Display for DisplayGenericContext<'_> {
 }
 
 impl<'db> Specialization<'db> {
+    pub fn display(&'db self, db: &'db dyn Db) -> DisplaySpecialization<'db> {
+        self.display_short(db, TupleSpecialization::No, DisplaySettings::default())
+    }
+
     /// Renders the specialization as it would appear in a subscript expression, e.g. `[int, str]`.
     pub fn display_short(
         &'db self,
         db: &'db dyn Db,
         tuple_specialization: TupleSpecialization,
+        settings: DisplaySettings<'db>,
     ) -> DisplaySpecialization<'db> {
         DisplaySpecialization {
             types: self.types(db),
             db,
             tuple_specialization,
-            settings: DisplaySettings::default(),
+            settings,
         }
     }
 }
@@ -635,7 +962,7 @@ pub struct DisplaySpecialization<'db> {
     types: &'db [Type<'db>],
     db: &'db dyn Db,
     tuple_specialization: TupleSpecialization,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplaySpecialization<'_> {
@@ -645,7 +972,7 @@ impl Display for DisplaySpecialization<'_> {
             if idx > 0 {
                 f.write_str(", ")?;
             }
-            ty.display_with(self.db, self.settings).fmt(f)?;
+            ty.display_with(self.db, self.settings.clone()).fmt(f)?;
         }
         if self.tuple_specialization.is_yes() {
             f.write_str(", ...")?;
@@ -682,7 +1009,7 @@ impl<'db> CallableType<'db> {
     pub(crate) fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayCallableType<'db> {
         DisplayCallableType {
             signatures: self.signatures(db),
@@ -695,13 +1022,15 @@ impl<'db> CallableType<'db> {
 pub(crate) struct DisplayCallableType<'db> {
     signatures: &'db CallableSignature<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayCallableType<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self.signatures.overloads.as_slice() {
-            [signature] => signature.display_with(self.db, self.settings).fmt(f),
+            [signature] => signature
+                .display_with(self.db, self.settings.clone())
+                .fmt(f),
             signatures => {
                 // TODO: How to display overloads?
                 if !self.settings.multiline {
@@ -710,7 +1039,7 @@ impl Display for DisplayCallableType<'_> {
                 let separator = if self.settings.multiline { "\n" } else { ", " };
                 let mut join = f.join(separator);
                 for signature in signatures {
-                    join.entry(&signature.display_with(self.db, self.settings));
+                    join.entry(&signature.display_with(self.db, self.settings.clone()));
                 }
                 join.finish()?;
                 if !self.settings.multiline {
@@ -730,7 +1059,7 @@ impl<'db> Signature<'db> {
     pub(crate) fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplaySignature<'db> {
         DisplaySignature {
             parameters: self.parameters(),
@@ -745,7 +1074,7 @@ pub(crate) struct DisplaySignature<'db> {
     parameters: &'db Parameters<'db>,
     return_ty: Option<Type<'db>>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl DisplaySignature<'_> {
@@ -949,7 +1278,7 @@ impl<'db> Parameter<'db> {
     fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayParameter<'db> {
         DisplayParameter {
             param: self,
@@ -962,7 +1291,7 @@ impl<'db> Parameter<'db> {
 struct DisplayParameter<'db> {
     param: &'db Parameter<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayParameter<'_> {
@@ -970,34 +1299,82 @@ impl Display for DisplayParameter<'_> {
         if let Some(name) = self.param.display_name() {
             f.write_str(&name)?;
             if let Some(annotated_type) = self.param.annotated_type() {
-                write!(
-                    f,
-                    ": {}",
-                    annotated_type.display_with(self.db, self.settings)
-                )?;
+                if self.param.should_annotation_be_displayed() {
+                    write!(
+                        f,
+                        ": {}",
+                        annotated_type.display_with(self.db, self.settings.clone())
+                    )?;
+                }
             }
             // Default value can only be specified if `name` is given.
             if let Some(default_ty) = self.param.default_type() {
                 if self.param.annotated_type().is_some() {
-                    write!(f, " = {}", default_ty.display_with(self.db, self.settings))?;
+                    write!(
+                        f,
+                        " = {}",
+                        default_ty.display_with(self.db, self.settings.clone())
+                    )?;
                 } else {
-                    write!(f, "={}", default_ty.display_with(self.db, self.settings))?;
+                    write!(
+                        f,
+                        "={}",
+                        default_ty.display_with(self.db, self.settings.clone())
+                    )?;
                 }
             }
         } else if let Some(ty) = self.param.annotated_type() {
             // This case is specifically for the `Callable` signature where name and default value
             // cannot be provided.
-            ty.display_with(self.db, self.settings).fmt(f)?;
+            ty.display_with(self.db, self.settings.clone()).fmt(f)?;
         }
         Ok(())
     }
 }
 
+#[derive(Debug, Copy, Clone)]
+struct TruncationPolicy {
+    max: usize,
+    max_when_elided: usize,
+}
+
+impl TruncationPolicy {
+    fn display_limit(self, total: usize, preserve_full: bool) -> usize {
+        if preserve_full {
+            return total;
+        }
+        let limit = if total > self.max {
+            self.max_when_elided
+        } else {
+            self.max
+        };
+        limit.min(total)
+    }
+}
+
+#[derive(Debug)]
+struct DisplayOmitted {
+    count: usize,
+    singular: &'static str,
+    plural: &'static str,
+}
+
+impl Display for DisplayOmitted {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let noun = if self.count == 1 {
+            self.singular
+        } else {
+            self.plural
+        };
+        write!(f, "... omitted {} {}", self.count, noun)
+    }
+}
+
 impl<'db> UnionType<'db> {
     fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayUnionType<'db> {
         DisplayUnionType {
             db,
@@ -1010,9 +1387,14 @@ impl<'db> UnionType<'db> {
 struct DisplayUnionType<'db> {
     ty: &'db UnionType<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
+const UNION_POLICY: TruncationPolicy = TruncationPolicy {
+    max: 5,
+    max_when_elided: 3,
+};
+
 impl Display for DisplayUnionType<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         fn is_condensable(ty: Type<'_>) -> bool {
@@ -1034,12 +1416,27 @@ impl Display for DisplayUnionType<'_> {
             .filter(|element| is_condensable(*element))
             .collect::<Vec<_>>();
 
+        let total_entries =
+            usize::from(!condensed_types.is_empty()) + elements.len() - condensed_types.len();
+
+        assert_ne!(total_entries, 0);
+
         let mut join = f.join(" | ");
 
+        let display_limit =
+            UNION_POLICY.display_limit(total_entries, self.settings.preserve_full_unions);
+
         let mut condensed_types = Some(condensed_types);
+        let mut displayed_entries = 0usize;
+
         for element in elements {
+            if displayed_entries >= display_limit {
+                break;
+            }
+
             if is_condensable(*element) {
                 if let Some(condensed_types) = condensed_types.take() {
+                    displayed_entries += 1;
                     join.entry(&DisplayLiteralGroup {
                         literals: condensed_types,
                         db: self.db,
@@ -1047,6 +1444,7 @@ impl Display for DisplayUnionType<'_> {
                     });
                 }
             } else {
+                displayed_entries += 1;
                 join.entry(&DisplayMaybeParenthesizedType {
                     ty: *element,
                     db: self.db,
@@ -1055,6 +1453,17 @@ impl Display for DisplayUnionType<'_> {
             }
         }
 
+        if !self.settings.preserve_full_unions {
+            let omitted_entries = total_entries.saturating_sub(displayed_entries);
+            if omitted_entries > 0 {
+                join.entry(&DisplayOmitted {
+                    count: omitted_entries,
+                    singular: "union element",
+                    plural: "union elements",
+                });
+            }
+        }
+
         join.finish()?;
 
         Ok(())
@@ -1066,23 +1475,45 @@ impl fmt::Debug for DisplayUnionType<'_> {
         Display::fmt(self, f)
     }
 }
-
 struct DisplayLiteralGroup<'db> {
     literals: Vec<Type<'db>>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
+const LITERAL_POLICY: TruncationPolicy = TruncationPolicy {
+    max: 7,
+    max_when_elided: 5,
+};
+
 impl Display for DisplayLiteralGroup<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         f.write_str("Literal[")?;
-        f.join(", ")
-            .entries(
-                self.literals
-                    .iter()
-                    .map(|ty| ty.representation(self.db, self.settings.singleline())),
-            )
-            .finish()?;
+
+        let total_entries = self.literals.len();
+
+        let display_limit =
+            LITERAL_POLICY.display_limit(total_entries, self.settings.preserve_full_unions);
+
+        let mut join = f.join(", ");
+
+        for lit in self.literals.iter().take(display_limit) {
+            let rep = lit.representation(self.db, self.settings.singleline());
+            join.entry(&rep);
+        }
+
+        if !self.settings.preserve_full_unions {
+            let omitted_entries = total_entries.saturating_sub(display_limit);
+            if omitted_entries > 0 {
+                join.entry(&DisplayOmitted {
+                    count: omitted_entries,
+                    singular: "literal",
+                    plural: "literals",
+                });
+            }
+        }
+
+        join.finish()?;
         f.write_str("]")
     }
 }
@@ -1091,7 +1522,7 @@ impl<'db> IntersectionType<'db> {
     fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayIntersectionType<'db> {
         DisplayIntersectionType {
             db,
@@ -1104,7 +1535,7 @@ impl<'db> IntersectionType<'db> {
 struct DisplayIntersectionType<'db> {
     ty: &'db IntersectionType<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayIntersectionType<'_> {
@@ -1144,7 +1575,7 @@ struct DisplayMaybeNegatedType<'db> {
     ty: Type<'db>,
     db: &'db dyn Db,
     negated: bool,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayMaybeNegatedType<'_> {
@@ -1155,7 +1586,7 @@ impl Display for DisplayMaybeNegatedType<'_> {
         DisplayMaybeParenthesizedType {
             ty: self.ty,
             db: self.db,
-            settings: self.settings,
+            settings: self.settings.clone(),
         }
         .fmt(f)
     }
@@ -1164,37 +1595,45 @@ impl Display for DisplayMaybeNegatedType<'_> {
 struct DisplayMaybeParenthesizedType<'db> {
     ty: Type<'db>,
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayMaybeParenthesizedType<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let write_parentheses =
-            |f: &mut Formatter<'_>| write!(f, "({})", self.ty.display_with(self.db, self.settings));
+        let write_parentheses = |f: &mut Formatter<'_>| {
+            write!(
+                f,
+                "({})",
+                self.ty.display_with(self.db, self.settings.clone())
+            )
+        };
         match self.ty {
             Type::Callable(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::FunctionLiteral(_)
             | Type::BoundMethod(_)
             | Type::Union(_) => write_parentheses(f),
             Type::Intersection(intersection) if !intersection.has_one_element(self.db) => {
                 write_parentheses(f)
             }
-            _ => self.ty.display_with(self.db, self.settings).fmt(f),
+            _ => self.ty.display_with(self.db, self.settings.clone()).fmt(f),
         }
     }
 }
 
 pub(crate) trait TypeArrayDisplay<'db> {
-    fn display_with(&self, db: &'db dyn Db, settings: DisplaySettings)
-    -> DisplayTypeArray<'_, 'db>;
+    fn display_with(
+        &self,
+        db: &'db dyn Db,
+        settings: DisplaySettings<'db>,
+    ) -> DisplayTypeArray<'_, 'db>;
 }
 
 impl<'db> TypeArrayDisplay<'db> for Box<[Type<'db>]> {
     fn display_with(
         &self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayTypeArray<'_, 'db> {
         DisplayTypeArray {
             types: self,
@@ -1208,7 +1647,7 @@ impl<'db> TypeArrayDisplay<'db> for Vec<Type<'db>> {
     fn display_with(
         &self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayTypeArray<'_, 'db> {
         DisplayTypeArray {
             types: self,
@@ -1222,7 +1661,7 @@ impl<'db> TypeArrayDisplay<'db> for [Type<'db>] {
     fn display_with(
         &self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayTypeArray<'_, 'db> {
         DisplayTypeArray {
             types: self,
@@ -1235,7 +1674,7 @@ impl<'db> TypeArrayDisplay<'db> for [Type<'db>] {
 pub(crate) struct DisplayTypeArray<'b, 'db> {
     types: &'b [Type<'db>],
     db: &'db dyn Db,
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayTypeArray<'_, '_> {
@@ -1254,20 +1693,19 @@ impl<'db> StringLiteralType<'db> {
     fn display_with(
         &'db self,
         db: &'db dyn Db,
-        settings: DisplaySettings,
+        settings: DisplaySettings<'db>,
     ) -> DisplayStringLiteralType<'db> {
-        display_quoted_string(self.value(db), settings)
+        DisplayStringLiteralType {
+            string: self.value(db),
+            settings,
+        }
     }
 }
 
-fn display_quoted_string(string: &str, settings: DisplaySettings) -> DisplayStringLiteralType<'_> {
-    DisplayStringLiteralType { string, settings }
-}
-
 struct DisplayStringLiteralType<'db> {
     string: &'db str,
     #[expect(dead_code)]
-    settings: DisplaySettings,
+    settings: DisplaySettings<'db>,
 }
 
 impl Display for DisplayStringLiteralType<'_> {
@@ -1326,7 +1764,7 @@ mod tests {
 
         let iterator_synthesized = typing_extensions_symbol(&db, "Iterator")
             .place
-            .ignore_possibly_unbound()
+            .ignore_possibly_undefined()
             .unwrap()
             .to_instance(&db)
             .unwrap()
@@ -1468,7 +1906,7 @@ mod tests {
                         .with_annotated_type(KnownClass::Int.to_instance(&db))
                         .with_default_type(Type::IntLiteral(4)),
                     Parameter::variadic(Name::new_static("args"))
-                        .with_annotated_type(Type::object(&db)),
+                        .with_annotated_type(Type::object()),
                     Parameter::keyword_only(Name::new_static("g"))
                         .with_default_type(Type::IntLiteral(5)),
                     Parameter::keyword_only(Name::new_static("h"))
@@ -1624,7 +2062,7 @@ mod tests {
                         .with_annotated_type(KnownClass::Int.to_instance(&db))
                         .with_default_type(Type::IntLiteral(4)),
                     Parameter::variadic(Name::new_static("args"))
-                        .with_annotated_type(Type::object(&db)),
+                        .with_annotated_type(Type::object()),
                     Parameter::keyword_only(Name::new_static("g"))
                         .with_default_type(Type::IntLiteral(5)),
                     Parameter::keyword_only(Name::new_static("h"))
diff --git a/crates/ty_python_semantic/src/types/enums.rs b/crates/ty_python_semantic/src/types/enums.rs
index fb6f5b0c33..daffbaebbb 100644
--- a/crates/ty_python_semantic/src/types/enums.rs
+++ b/crates/ty_python_semantic/src/types/enums.rs
@@ -2,33 +2,33 @@ use ruff_python_ast::name::Name;
 use rustc_hash::FxHashMap;
 
 use crate::{
-    Db, FxOrderSet,
+    Db, FxIndexMap,
     place::{Place, PlaceAndQualifiers, place_from_bindings, place_from_declarations},
     semantic_index::{place_table, use_def_map},
     types::{
-        ClassLiteral, DynamicType, EnumLiteralType, KnownClass, MemberLookupPolicy, Type,
-        TypeQualifiers,
+        ClassLiteral, DynamicType, EnumLiteralType, KnownClass, MemberLookupPolicy,
+        StringLiteralType, Type, TypeQualifiers,
     },
 };
 
-#[derive(Debug, PartialEq, Eq)]
-pub(crate) struct EnumMetadata {
-    pub(crate) members: FxOrderSet<Name>,
+#[derive(Debug, PartialEq, Eq, salsa::Update)]
+pub(crate) struct EnumMetadata<'db> {
+    pub(crate) members: FxIndexMap<Name, Type<'db>>,
     pub(crate) aliases: FxHashMap<Name, Name>,
 }
 
-impl get_size2::GetSize for EnumMetadata {}
+impl get_size2::GetSize for EnumMetadata<'_> {}
 
-impl EnumMetadata {
+impl EnumMetadata<'_> {
     fn empty() -> Self {
         EnumMetadata {
-            members: FxOrderSet::default(),
+            members: FxIndexMap::default(),
             aliases: FxHashMap::default(),
         }
     }
 
     pub(crate) fn resolve_member<'a>(&'a self, name: &'a Name) -> Option<&'a Name> {
-        if self.members.contains(name) {
+        if self.members.contains_key(name) {
             Some(name)
         } else {
             self.aliases.get(name)
@@ -36,28 +36,21 @@ impl EnumMetadata {
     }
 }
 
-#[allow(clippy::ref_option)]
-fn enum_metadata_cycle_recover(
-    _db: &dyn Db,
-    _value: &Option<EnumMetadata>,
-    _count: u32,
-    _class: ClassLiteral<'_>,
-) -> salsa::CycleRecoveryAction<Option<EnumMetadata>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 #[allow(clippy::unnecessary_wraps)]
-fn enum_metadata_cycle_initial(_db: &dyn Db, _class: ClassLiteral<'_>) -> Option<EnumMetadata> {
+fn enum_metadata_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _class: ClassLiteral<'db>,
+) -> Option<EnumMetadata<'db>> {
     Some(EnumMetadata::empty())
 }
 
 /// List all members of an enum.
 #[allow(clippy::ref_option, clippy::unnecessary_wraps)]
-#[salsa::tracked(returns(as_ref), cycle_fn=enum_metadata_cycle_recover, cycle_initial=enum_metadata_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(as_ref), cycle_initial=enum_metadata_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(crate) fn enum_metadata<'db>(
     db: &'db dyn Db,
     class: ClassLiteral<'db>,
-) -> Option<EnumMetadata> {
+) -> Option<EnumMetadata<'db>> {
     // This is a fast path to avoid traversing the MRO of known classes
     if class
         .known(db)
@@ -74,12 +67,14 @@ pub(crate) fn enum_metadata<'db>(
         return None;
     }
 
+    let is_str_enum =
+        Type::ClassLiteral(class).is_subtype_of(db, KnownClass::StrEnum.to_subclass_of(db));
+
     let scope_id = class.body_scope(db);
     let use_def_map = use_def_map(db, scope_id);
     let table = place_table(db, scope_id);
 
     let mut enum_values: FxHashMap<Type<'db>, Name> = FxHashMap::default();
-    // TODO: handle `StrEnum` which uses lowercase names as values when using `auto()`.
     let mut auto_counter = 0;
 
     let ignored_names: Option<Vec<&str>> = if let Some(ignore) = table.symbol_id("_ignore_") {
@@ -87,7 +82,7 @@ pub(crate) fn enum_metadata<'db>(
         let ignore_place = place_from_bindings(db, ignore_bindings);
 
         match ignore_place {
-            Place::Type(Type::StringLiteral(ignored_names), _) => {
+            Place::Defined(Type::StringLiteral(ignored_names), _, _) => {
                 Some(ignored_names.value(db).split_ascii_whitespace().collect())
             }
             // TODO: support the list-variant of `_ignore_`.
@@ -121,16 +116,16 @@ pub(crate) fn enum_metadata<'db>(
             let inferred = place_from_bindings(db, bindings);
 
             let value_ty = match inferred {
-                Place::Unbound => {
+                Place::Undefined => {
                     return None;
                 }
-                Place::Type(ty, _) => {
+                Place::Defined(ty, _, _) => {
                     let special_case = match ty {
                         Type::Callable(_) | Type::FunctionLiteral(_) => {
                             // Some types are specifically disallowed for enum members.
                             return None;
                         }
-                        Type::NominalInstance(instance) => match instance.class(db).known(db) {
+                        Type::NominalInstance(instance) => match instance.known_class(db) {
                             // enum.nonmember
                             Some(KnownClass::Nonmember) => return None,
 
@@ -138,14 +133,21 @@ pub(crate) fn enum_metadata<'db>(
                             Some(KnownClass::Member) => Some(
                                 ty.member(db, "value")
                                     .place
-                                    .ignore_possibly_unbound()
+                                    .ignore_possibly_undefined()
                                     .unwrap_or(Type::unknown()),
                             ),
 
                             // enum.auto
                             Some(KnownClass::Auto) => {
                                 auto_counter += 1;
-                                Some(Type::IntLiteral(auto_counter))
+                                Some(if is_str_enum {
+                                    Type::StringLiteral(StringLiteralType::new(
+                                        db,
+                                        name.to_lowercase().as_str(),
+                                    ))
+                                } else {
+                                    Type::IntLiteral(auto_counter)
+                                })
                             }
 
                             _ => None,
@@ -166,9 +168,9 @@ pub(crate) fn enum_metadata<'db>(
                             .place;
 
                         match dunder_get {
-                            Place::Unbound | Place::Type(Type::Dynamic(_), _) => ty,
+                            Place::Undefined | Place::Defined(Type::Dynamic(_), _, _) => ty,
 
-                            Place::Type(_, _) => {
+                            Place::Defined(_, _, _) => {
                                 // Descriptors are not considered members.
                                 return None;
                             }
@@ -182,12 +184,19 @@ pub(crate) fn enum_metadata<'db>(
             // we don't know if it's a duplicate or not.
             if matches!(
                 value_ty,
-                Type::IntLiteral(_) | Type::StringLiteral(_) | Type::BytesLiteral(_)
+                Type::BooleanLiteral(_)
+                    | Type::IntLiteral(_)
+                    | Type::StringLiteral(_)
+                    | Type::BytesLiteral(_)
             ) {
-                if let Some(previous) = enum_values.insert(value_ty, name.clone()) {
-                    aliases.insert(name.clone(), previous);
+                if let Some(canonical) = enum_values.get(&value_ty) {
+                    // This is a duplicate value, create an alias to the canonical (first) member
+                    aliases.insert(name.clone(), canonical.clone());
                     return None;
                 }
+
+                // This is the first occurrence of this value, track it as the canonical member
+                enum_values.insert(value_ty, name.clone());
             }
 
             let declarations = use_def_map.end_of_scope_symbol_declarations(symbol_id);
@@ -196,19 +205,19 @@ pub(crate) fn enum_metadata<'db>(
 
             match declared {
                 PlaceAndQualifiers {
-                    place: Place::Type(Type::Dynamic(DynamicType::Unknown), _),
+                    place: Place::Defined(Type::Dynamic(DynamicType::Unknown), _, _),
                     qualifiers,
                 } if qualifiers.contains(TypeQualifiers::FINAL) => {}
                 PlaceAndQualifiers {
-                    place: Place::Unbound,
+                    place: Place::Undefined,
                     ..
                 } => {
                     // Undeclared attributes are considered members
                 }
                 PlaceAndQualifiers {
-                    place: Place::Type(Type::NominalInstance(instance), _),
+                    place: Place::Defined(Type::NominalInstance(instance), _, _),
                     ..
-                } if instance.class(db).is_known(db, KnownClass::Member) => {
+                } if instance.has_known_class(db, KnownClass::Member) => {
                     // If the attribute is specifically declared with `enum.member`, it is considered a member
                 }
                 _ => {
@@ -217,9 +226,9 @@ pub(crate) fn enum_metadata<'db>(
                 }
             }
 
-            Some(name.clone())
+            Some((name.clone(), value_ty))
         })
-        .collect::<FxOrderSet<_>>();
+        .collect::<FxIndexMap<_, _>>();
 
     if members.is_empty() {
         // Enum subclasses without members are not considered enums.
@@ -237,7 +246,7 @@ pub(crate) fn enum_member_literals<'a, 'db: 'a>(
     enum_metadata(db, class).map(|metadata| {
         metadata
             .members
-            .iter()
+            .keys()
             .filter(move |name| Some(*name) != exclude_member)
             .map(move |name| Type::EnumLiteral(EnumLiteralType::new(db, class, name.clone())))
     })
diff --git a/crates/ty_python_semantic/src/types/function.rs b/crates/ty_python_semantic/src/types/function.rs
index 9a9c10ef75..2b096c0990 100644
--- a/crates/ty_python_semantic/src/types/function.rs
+++ b/crates/ty_python_semantic/src/types/function.rs
@@ -55,30 +55,35 @@ use bitflags::bitflags;
 use ruff_db::diagnostic::{Annotation, DiagnosticId, Severity, Span};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::{ParsedModuleRef, parsed_module};
-use ruff_python_ast as ast;
+use ruff_python_ast::{self as ast, ParameterWithDefault};
 use ruff_text_size::Ranged;
 
 use crate::module_resolver::{KnownModule, file_to_module};
-use crate::place::{Boundness, Place, place_from_bindings};
+use crate::place::{Definedness, Place, place_from_bindings};
 use crate::semantic_index::ast_ids::HasScopedUseId;
 use crate::semantic_index::definition::Definition;
 use crate::semantic_index::scope::ScopeId;
-use crate::semantic_index::semantic_index;
+use crate::semantic_index::{FileScopeId, SemanticIndex, semantic_index};
 use crate::types::call::{Binding, CallArguments};
+use crate::types::constraints::ConstraintSet;
 use crate::types::context::InferContext;
 use crate::types::diagnostic::{
-    REDUNDANT_CAST, STATIC_ASSERT_ERROR, TYPE_ASSERTION_FAILURE,
+    INVALID_ARGUMENT_TYPE, REDUNDANT_CAST, STATIC_ASSERT_ERROR, TYPE_ASSERTION_FAILURE,
     report_bad_argument_to_get_protocol_members, report_bad_argument_to_protocol_interface,
     report_runtime_check_against_non_runtime_checkable_protocol,
 };
-use crate::types::generics::{GenericContext, walk_generic_context};
+use crate::types::display::DisplaySettings;
+use crate::types::generics::{GenericContext, InferableTypeVars};
+use crate::types::ide_support::all_members;
 use crate::types::narrow::ClassInfoConstraintFunction;
 use crate::types::signatures::{CallableSignature, Signature};
 use crate::types::visitor::any_over_type;
 use crate::types::{
-    BoundMethodType, BoundTypeVarInstance, CallableType, ClassBase, ClassLiteral, ClassType,
-    DeprecatedInstance, DynamicType, KnownClass, NormalizedVisitor, Truthiness, Type, TypeMapping,
-    TypeRelation, TypeTransformer, UnionBuilder, all_members, walk_type_mapping,
+    ApplyTypeMappingVisitor, BoundMethodType, BoundTypeVarInstance, CallableType, ClassBase,
+    ClassLiteral, ClassType, DeprecatedInstance, DynamicType, FindLegacyTypeVarsVisitor,
+    HasRelationToVisitor, IsDisjointVisitor, IsEquivalentVisitor, KnownClass, KnownInstanceType,
+    NormalizedVisitor, SpecialFormType, TrackedConstraintSet, Truthiness, Type, TypeContext,
+    TypeMapping, TypeRelation, UnionBuilder, binding_type, todo_type, walk_signature,
 };
 use crate::{Db, FxOrderSet, ModuleName, resolve_module};
 
@@ -116,6 +121,8 @@ bitflags! {
         const STATICMETHOD = 1 << 5;
         /// `@typing.override`
         const OVERRIDE = 1 << 6;
+        /// `@typing.type_check_only`
+        const TYPE_CHECK_ONLY = 1 << 7;
     }
 }
 
@@ -130,6 +137,7 @@ impl FunctionDecorators {
                 Some(KnownFunction::AbstractMethod) => FunctionDecorators::ABSTRACT_METHOD,
                 Some(KnownFunction::Final) => FunctionDecorators::FINAL,
                 Some(KnownFunction::Override) => FunctionDecorators::OVERRIDE,
+                Some(KnownFunction::TypeCheckOnly) => FunctionDecorators::TYPE_CHECK_ONLY,
                 _ => FunctionDecorators::empty(),
             },
             Type::ClassLiteral(class) => match class.known(db) {
@@ -140,17 +148,6 @@ impl FunctionDecorators {
             _ => FunctionDecorators::empty(),
         }
     }
-
-    pub(super) fn from_decorator_types<'db>(
-        db: &'db dyn Db,
-        types: impl IntoIterator<Item = Type<'db>>,
-    ) -> Self {
-        types
-            .into_iter()
-            .fold(FunctionDecorators::empty(), |acc, ty| {
-                acc | FunctionDecorators::from_decorator_type(db, ty)
-            })
-    }
 }
 
 bitflags! {
@@ -158,24 +155,36 @@ bitflags! {
     /// arguments that were passed in. For the precise meaning of the fields, see [1].
     ///
     /// [1]: https://docs.python.org/3/library/typing.html#typing.dataclass_transform
-    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Update)]
-    pub struct DataclassTransformerParams: u8 {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, salsa::Update)]
+    pub struct DataclassTransformerFlags: u8 {
         const EQ_DEFAULT = 1 << 0;
         const ORDER_DEFAULT = 1 << 1;
         const KW_ONLY_DEFAULT = 1 << 2;
         const FROZEN_DEFAULT = 1 << 3;
-        const FIELD_SPECIFIERS= 1 << 4;
     }
 }
 
-impl get_size2::GetSize for DataclassTransformerParams {}
+impl get_size2::GetSize for DataclassTransformerFlags {}
 
-impl Default for DataclassTransformerParams {
+impl Default for DataclassTransformerFlags {
     fn default() -> Self {
         Self::EQ_DEFAULT
     }
 }
 
+/// Metadata for a dataclass-transformer. Stored inside a `Type::DataclassTransformer(…)`
+/// instance that we use as the return type for `dataclass_transform(…)` calls.
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+#[derive(PartialOrd, Ord)]
+pub struct DataclassTransformerParams<'db> {
+    pub flags: DataclassTransformerFlags,
+
+    #[returns(deref)]
+    pub field_specifiers: Box<[Type<'db>]>,
+}
+
+impl get_size2::GetSize for DataclassTransformerParams<'_> {}
+
 /// Representation of a function definition in the AST: either a non-generic function, or a generic
 /// function that has not been specialized.
 ///
@@ -207,7 +216,7 @@ pub struct OverloadLiteral<'db> {
 
     /// The arguments to `dataclass_transformer`, if this function was annotated
     /// with `@dataclass_transformer(...)`.
-    pub(crate) dataclass_transformer_params: Option<DataclassTransformerParams>,
+    pub(crate) dataclass_transformer_params: Option<DataclassTransformerParams<'db>>,
 }
 
 // The Salsa heap is tracked separately.
@@ -218,7 +227,7 @@ impl<'db> OverloadLiteral<'db> {
     fn with_dataclass_transformer_params(
         self,
         db: &'db dyn Db,
-        params: DataclassTransformerParams,
+        params: DataclassTransformerParams<'db>,
     ) -> Self {
         Self::new(
             db,
@@ -245,6 +254,22 @@ impl<'db> OverloadLiteral<'db> {
         self.has_known_decorator(db, FunctionDecorators::OVERLOAD)
     }
 
+    /// Returns true if this overload is decorated with `@staticmethod`, or if it is implicitly a
+    /// staticmethod.
+    pub(crate) fn is_staticmethod(self, db: &dyn Db) -> bool {
+        self.has_known_decorator(db, FunctionDecorators::STATICMETHOD) || self.name(db) == "__new__"
+    }
+
+    /// Returns true if this overload is decorated with `@classmethod`, or if it is implicitly a
+    /// classmethod.
+    pub(crate) fn is_classmethod(self, db: &dyn Db) -> bool {
+        self.has_known_decorator(db, FunctionDecorators::CLASSMETHOD)
+            || matches!(
+                self.name(db).as_str(),
+                "__init_subclass__" | "__class_getitem__"
+            )
+    }
+
     fn node<'ast>(
         self,
         db: &dyn Db,
@@ -258,7 +283,7 @@ impl<'db> OverloadLiteral<'db> {
             the function is defined."
         );
 
-        self.body_scope(db).node(db).expect_function(module)
+        self.body_scope(db).node(db).expect_function().node(module)
     }
 
     /// Returns the [`FileRange`] of the function's name.
@@ -267,7 +292,8 @@ impl<'db> OverloadLiteral<'db> {
             self.file(db),
             self.body_scope(db)
                 .node(db)
-                .expect_function(module)
+                .expect_function()
+                .node(module)
                 .name
                 .range,
         )
@@ -283,9 +309,8 @@ impl<'db> OverloadLiteral<'db> {
     /// over-invalidation.
     fn definition(self, db: &'db dyn Db) -> Definition<'db> {
         let body_scope = self.body_scope(db);
-        let module = parsed_module(db, self.file(db)).load(db);
         let index = semantic_index(db, body_scope.file(db));
-        index.expect_single_definition(body_scope.node(db).expect_function(&module))
+        index.expect_single_definition(body_scope.node(db).expect_function())
     }
 
     /// Returns the overload immediately before this one in the AST. Returns `None` if there is no
@@ -299,11 +324,12 @@ impl<'db> OverloadLiteral<'db> {
         let use_id = self
             .body_scope(db)
             .node(db)
-            .expect_function(&module)
+            .expect_function()
+            .node(&module)
             .name
             .scoped_use_id(db, scope);
 
-        let Place::Type(Type::FunctionLiteral(previous_type), Boundness::Bound) =
+        let Place::Defined(Type::FunctionLiteral(previous_type), _, Definedness::AlwaysDefined) =
             place_from_bindings(db, use_def.bindings_at_use(use_id))
         else {
             return None;
@@ -329,30 +355,113 @@ impl<'db> OverloadLiteral<'db> {
     /// calling query is not in the same file as this function is defined in, then this will create
     /// a cross-module dependency directly on the full AST which will lead to cache
     /// over-invalidation.
-    pub(crate) fn signature(
-        self,
-        db: &'db dyn Db,
-        inherited_generic_context: Option<GenericContext<'db>>,
-    ) -> Signature<'db> {
+    pub(crate) fn signature(self, db: &'db dyn Db) -> Signature<'db> {
+        let mut signature = self.raw_signature(db);
+
         let scope = self.body_scope(db);
         let module = parsed_module(db, self.file(db)).load(db);
-        let function_stmt_node = scope.node(db).expect_function(&module);
+        let function_node = scope.node(db).expect_function().node(&module);
+        let index = semantic_index(db, scope.file(db));
+        let file_scope_id = scope.file_scope_id(db);
+        let is_generator = file_scope_id.is_generator_function(index);
+
+        if function_node.is_async && !is_generator {
+            signature = signature.wrap_coroutine_return_type(db);
+        }
+
+        signature
+    }
+
+    /// Typed internally-visible "raw" signature for this function.
+    /// That is, the return types of async functions are not wrapped in `CoroutineType[...]`.
+    ///
+    /// ## Warning
+    ///
+    /// This uses the semantic index to find the definition of the function. This means that if the
+    /// calling query is not in the same file as this function is defined in, then this will create
+    /// a cross-module dependency directly on the full AST which will lead to cache
+    /// over-invalidation.
+    fn raw_signature(self, db: &'db dyn Db) -> Signature<'db> {
+        /// `self` or `cls` can be implicitly positional-only if:
+        /// - It is a method AND
+        /// - No parameters in the method use PEP-570 syntax AND
+        /// - It is not a `@staticmethod` AND
+        /// - `self`/`cls` is not explicitly positional-only using the PEP-484 convention AND
+        /// - Either the next parameter after `self`/`cls` uses the PEP-484 convention,
+        ///   or the enclosing class is a `Protocol` class
+        fn has_implicitly_positional_only_first_param<'db>(
+            db: &'db dyn Db,
+            literal: OverloadLiteral<'db>,
+            node: &ast::StmtFunctionDef,
+            scope: FileScopeId,
+            index: &SemanticIndex,
+        ) -> bool {
+            let parameters = &node.parameters;
+
+            if !parameters.posonlyargs.is_empty() {
+                return false;
+            }
+
+            let Some(first_param) = parameters.args.first() else {
+                return false;
+            };
+
+            if first_param.uses_pep_484_positional_only_convention() {
+                return false;
+            }
+
+            if literal.is_staticmethod(db) {
+                return false;
+            }
+
+            let Some(class_definition) = index.class_definition_of_method(scope) else {
+                return false;
+            };
+
+            // `self` and `cls` are always positional-only if the next parameter uses the
+            // PEP-484 convention.
+            if parameters
+                .args
+                .get(1)
+                .is_some_and(ParameterWithDefault::uses_pep_484_positional_only_convention)
+            {
+                return true;
+            }
+
+            // If there isn't any parameter other than `self`/`cls`,
+            // or there is but it isn't using the PEP-484 convention,
+            // then `self`/`cls` are only implicitly positional-only if
+            // it is a protocol class.
+            let class_type = binding_type(db, class_definition);
+            class_type
+                .to_class_type(db)
+                .is_some_and(|class| class.is_protocol(db))
+        }
+
+        let scope = self.body_scope(db);
+        let module = parsed_module(db, self.file(db)).load(db);
+        let function_stmt_node = scope.node(db).expect_function().node(&module);
         let definition = self.definition(db);
-        let generic_context = function_stmt_node.type_params.as_ref().map(|type_params| {
-            let index = semantic_index(db, scope.file(db));
+        let index = semantic_index(db, scope.file(db));
+        let pep695_ctx = function_stmt_node.type_params.as_ref().map(|type_params| {
             GenericContext::from_type_params(db, index, definition, type_params)
         });
+        let file_scope_id = scope.file_scope_id(db);
 
-        let index = semantic_index(db, scope.file(db));
-        let is_generator = scope.file_scope_id(db).is_generator_function(index);
+        let has_implicitly_positional_first_parameter = has_implicitly_positional_only_first_param(
+            db,
+            self,
+            function_stmt_node,
+            file_scope_id,
+            index,
+        );
 
         Signature::from_function(
             db,
-            generic_context,
-            inherited_generic_context,
+            pep695_ctx,
             definition,
             function_stmt_node,
-            is_generator,
+            has_implicitly_positional_first_parameter,
         )
     }
 
@@ -365,7 +474,7 @@ impl<'db> OverloadLiteral<'db> {
         let span = Span::from(function_scope.file(db));
         let node = function_scope.node(db);
         let module = parsed_module(db, self.file(db)).load(db);
-        let func_def = node.as_function(&module)?;
+        let func_def = node.as_function()?.node(&module);
         let range = parameter_index
             .and_then(|parameter_index| {
                 func_def
@@ -385,7 +494,7 @@ impl<'db> OverloadLiteral<'db> {
         let span = Span::from(function_scope.file(db));
         let node = function_scope.node(db);
         let module = parsed_module(db, self.file(db)).load(db);
-        let func_def = node.as_function(&module)?;
+        let func_def = node.as_function()?.node(&module);
         let return_type_range = func_def.returns.as_ref().map(|returns| returns.range());
         let mut signature = func_def.name.range.cover(func_def.parameters.range);
         if let Some(return_type_range) = return_type_range {
@@ -412,58 +521,13 @@ impl<'db> OverloadLiteral<'db> {
 #[derive(PartialOrd, Ord)]
 pub struct FunctionLiteral<'db> {
     pub(crate) last_definition: OverloadLiteral<'db>,
-
-    /// The inherited generic context, if this function is a constructor method (`__new__` or
-    /// `__init__`) being used to infer the specialization of its generic class. If any of the
-    /// method's overloads are themselves generic, this is in addition to those per-overload
-    /// generic contexts (which are created lazily in [`OverloadLiteral::signature`]).
-    ///
-    /// If the function is not a constructor method, this field will always be `None`.
-    ///
-    /// If the function is a constructor method, we will end up creating two `FunctionLiteral`
-    /// instances for it. The first is created in [`TypeInferenceBuilder`][infer] when we encounter
-    /// the function definition during type inference. At this point, we don't yet know if the
-    /// function is a constructor method, so we create a `FunctionLiteral` with `None` for this
-    /// field.
-    ///
-    /// If at some point we encounter a call expression, which invokes the containing class's
-    /// constructor, as will create a _new_ `FunctionLiteral` instance for the function, with this
-    /// field [updated][] to contain the containing class's generic context.
-    ///
-    /// [infer]: crate::types::infer::TypeInferenceBuilder::infer_function_definition
-    /// [updated]: crate::types::class::ClassLiteral::own_class_member
-    inherited_generic_context: Option<GenericContext<'db>>,
 }
 
 // The Salsa heap is tracked separately.
 impl get_size2::GetSize for FunctionLiteral<'_> {}
 
-fn walk_function_literal<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
-    db: &'db dyn Db,
-    function: FunctionLiteral<'db>,
-    visitor: &V,
-) {
-    if let Some(context) = function.inherited_generic_context(db) {
-        walk_generic_context(db, context, visitor);
-    }
-}
-
 #[salsa::tracked]
 impl<'db> FunctionLiteral<'db> {
-    fn with_inherited_generic_context(
-        self,
-        db: &'db dyn Db,
-        inherited_generic_context: GenericContext<'db>,
-    ) -> Self {
-        // A function cannot inherit more than one generic context from its containing class.
-        debug_assert!(self.inherited_generic_context(db).is_none());
-        Self::new(
-            db,
-            self.last_definition(db),
-            Some(inherited_generic_context),
-        )
-    }
-
     fn name(self, db: &'db dyn Db) -> &'db ast::name::Name {
         // All of the overloads of a function literal should have the same name.
         self.last_definition(db).name(db)
@@ -551,33 +615,17 @@ impl<'db> FunctionLiteral<'db> {
     /// calling query is not in the same file as this function is defined in, then this will create
     /// a cross-module dependency directly on the full AST which will lead to cache
     /// over-invalidation.
-    fn signature<'a>(
-        self,
-        db: &'db dyn Db,
-        type_mappings: &'a [TypeMapping<'a, 'db>],
-    ) -> CallableSignature<'db>
-    where
-        'db: 'a,
-    {
+    fn signature(self, db: &'db dyn Db) -> CallableSignature<'db> {
         // We only include an implementation (i.e. a definition not decorated with `@overload`) if
         // it's the only definition.
-        let inherited_generic_context = self.inherited_generic_context(db);
         let (overloads, implementation) = self.overloads_and_implementation(db);
-        if let Some(implementation) = implementation {
-            if overloads.is_empty() {
-                return CallableSignature::single(type_mappings.iter().fold(
-                    implementation.signature(db, inherited_generic_context),
-                    |ty, mapping| ty.apply_type_mapping(db, mapping),
-                ));
-            }
+        if let Some(implementation) = implementation
+            && overloads.is_empty()
+        {
+            return CallableSignature::single(implementation.signature(db));
         }
 
-        CallableSignature::from_overloads(overloads.iter().map(|overload| {
-            type_mappings.iter().fold(
-                overload.signature(db, inherited_generic_context),
-                |ty, mapping| ty.apply_type_mapping(db, mapping),
-            )
-        }))
+        CallableSignature::from_overloads(overloads.iter().map(|overload| overload.signature(db)))
     }
 
     /// Typed externally-visible signature of the last overload or implementation of this function.
@@ -588,27 +636,20 @@ impl<'db> FunctionLiteral<'db> {
     /// calling query is not in the same file as this function is defined in, then this will create
     /// a cross-module dependency directly on the full AST which will lead to cache
     /// over-invalidation.
-    fn last_definition_signature<'a>(
-        self,
-        db: &'db dyn Db,
-        type_mappings: &'a [TypeMapping<'a, 'db>],
-    ) -> Signature<'db>
-    where
-        'db: 'a,
-    {
-        let inherited_generic_context = self.inherited_generic_context(db);
-        type_mappings.iter().fold(
-            self.last_definition(db)
-                .signature(db, inherited_generic_context),
-            |ty, mapping| ty.apply_type_mapping(db, mapping),
-        )
+    fn last_definition_signature(self, db: &'db dyn Db) -> Signature<'db> {
+        self.last_definition(db).signature(db)
     }
 
-    fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        let context = self
-            .inherited_generic_context(db)
-            .map(|ctx| ctx.normalized_impl(db, visitor));
-        Self::new(db, self.last_definition(db), context)
+    /// Typed externally-visible "raw" signature of the last overload or implementation of this function.
+    ///
+    /// ## Warning
+    ///
+    /// This uses the semantic index to find the definition of the function. This means that if the
+    /// calling query is not in the same file as this function is defined in, then this will create
+    /// a cross-module dependency directly on the full AST which will lead to cache
+    /// over-invalidation.
+    fn last_definition_raw_signature(self, db: &'db dyn Db) -> Signature<'db> {
+        self.last_definition(db).raw_signature(db)
     }
 }
 
@@ -619,11 +660,19 @@ impl<'db> FunctionLiteral<'db> {
 pub struct FunctionType<'db> {
     pub(crate) literal: FunctionLiteral<'db>,
 
-    /// Type mappings that should be applied to the function's parameter and return types. This
-    /// might include specializations of enclosing generic contexts (e.g. for non-generic methods
-    /// of a specialized generic class).
-    #[returns(deref)]
-    type_mappings: Box<[TypeMapping<'db, 'db>]>,
+    /// Contains a potentially modified signature for this function literal, in case certain operations
+    /// (like type mappings) have been applied to it.
+    ///
+    /// See also: [`FunctionLiteral::updated_signature`].
+    #[returns(as_ref)]
+    updated_signature: Option<CallableSignature<'db>>,
+
+    /// Contains a potentially modified signature for the last overload or the implementation of this
+    /// function literal, in case certain operations (like type mappings) have been applied to it.
+    ///
+    /// See also: [`FunctionLiteral::last_definition_signature`].
+    #[returns(as_ref)]
+    updated_last_definition_signature: Option<Signature<'db>>,
 }
 
 // The Salsa heap is tracked separately.
@@ -634,9 +683,13 @@ pub(super) fn walk_function_type<'db, V: super::visitor::TypeVisitor<'db> + ?Siz
     function: FunctionType<'db>,
     visitor: &V,
 ) {
-    walk_function_literal(db, function.literal(db), visitor);
-    for mapping in function.type_mappings(db) {
-        walk_type_mapping(db, mapping, visitor);
+    if let Some(callable_signature) = function.updated_signature(db) {
+        for signature in &callable_signature.overloads {
+            walk_signature(db, signature, visitor);
+        }
+    }
+    if let Some(signature) = function.updated_last_definition_signature(db) {
+        walk_signature(db, signature, visitor);
     }
 }
 
@@ -647,30 +700,46 @@ impl<'db> FunctionType<'db> {
         db: &'db dyn Db,
         inherited_generic_context: GenericContext<'db>,
     ) -> Self {
-        let literal = self
-            .literal(db)
+        let updated_signature = self
+            .signature(db)
             .with_inherited_generic_context(db, inherited_generic_context);
-        Self::new(db, literal, self.type_mappings(db))
+        let updated_last_definition_signature = self
+            .last_definition_signature(db)
+            .clone()
+            .with_inherited_generic_context(db, inherited_generic_context);
+        Self::new(
+            db,
+            self.literal(db),
+            Some(updated_signature),
+            Some(updated_last_definition_signature),
+        )
     }
 
-    pub(crate) fn with_type_mapping<'a>(
+    pub(crate) fn apply_type_mapping_impl<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
-        let type_mappings: Box<[_]> = self
-            .type_mappings(db)
-            .iter()
-            .cloned()
-            .chain(std::iter::once(type_mapping.to_owned()))
-            .collect();
-        Self::new(db, self.literal(db), type_mappings)
+        let updated_signature =
+            self.signature(db)
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor);
+        let updated_last_definition_signature = self
+            .last_definition_signature(db)
+            .apply_type_mapping_impl(db, type_mapping, tcx, visitor);
+        Self::new(
+            db,
+            self.literal(db),
+            Some(updated_signature),
+            Some(updated_last_definition_signature),
+        )
     }
 
     pub(crate) fn with_dataclass_transformer_params(
         self,
         db: &'db dyn Db,
-        params: DataclassTransformerParams,
+        params: DataclassTransformerParams<'db>,
     ) -> Self {
         // A decorator only applies to the specific overload that it is attached to, not to all
         // previous overloads.
@@ -678,9 +747,8 @@ impl<'db> FunctionType<'db> {
         let last_definition = literal
             .last_definition(db)
             .with_dataclass_transformer_params(db, params);
-        let literal =
-            FunctionLiteral::new(db, last_definition, literal.inherited_generic_context(db));
-        Self::new(db, literal, self.type_mappings(db))
+        let literal = FunctionLiteral::new(db, last_definition);
+        Self::new(db, literal, None, None)
     }
 
     /// Returns the [`File`] in which this function is defined.
@@ -719,6 +787,20 @@ impl<'db> FunctionType<'db> {
         self.literal(db).has_known_decorator(db, decorator)
     }
 
+    /// Returns true if this method is decorated with `@classmethod`, or if it is implicitly a
+    /// classmethod.
+    pub(crate) fn is_classmethod(self, db: &'db dyn Db) -> bool {
+        self.iter_overloads_and_implementation(db)
+            .any(|overload| overload.is_classmethod(db))
+    }
+
+    /// Returns true if this method is decorated with `@staticmethod`, or if it is implicitly a
+    /// static method.
+    pub(crate) fn is_staticmethod(self, db: &'db dyn Db) -> bool {
+        self.iter_overloads_and_implementation(db)
+            .any(|overload| overload.is_staticmethod(db))
+    }
+
     /// If the implementation of this function is deprecated, returns the `@warnings.deprecated`.
     ///
     /// Checking if an overload is deprecated requires deeper call analysis.
@@ -819,9 +901,11 @@ impl<'db> FunctionType<'db> {
     ///
     /// Were this not a salsa query, then the calling query
     /// would depend on the function's AST and rerun for every change in that file.
-    #[salsa::tracked(returns(ref), cycle_fn=signature_cycle_recover, cycle_initial=signature_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(returns(ref), cycle_initial=signature_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(crate) fn signature(self, db: &'db dyn Db) -> CallableSignature<'db> {
-        self.literal(db).signature(db, self.type_mappings(db))
+        self.updated_signature(db)
+            .cloned()
+            .unwrap_or_else(|| self.literal(db).signature(db))
     }
 
     /// Typed externally-visible signature of the last overload or implementation of this function.
@@ -834,19 +918,27 @@ impl<'db> FunctionType<'db> {
     /// Were this not a salsa query, then the calling query
     /// would depend on the function's AST and rerun for every change in that file.
     #[salsa::tracked(
-        returns(ref),
-        cycle_fn=last_definition_signature_cycle_recover,
-        cycle_initial=last_definition_signature_cycle_initial,
+        returns(ref), cycle_initial=last_definition_signature_cycle_initial,
         heap_size=ruff_memory_usage::heap_size,
     )]
     pub(crate) fn last_definition_signature(self, db: &'db dyn Db) -> Signature<'db> {
-        self.literal(db)
-            .last_definition_signature(db, self.type_mappings(db))
+        self.updated_last_definition_signature(db)
+            .cloned()
+            .unwrap_or_else(|| self.literal(db).last_definition_signature(db))
+    }
+
+    /// Typed externally-visible "raw" signature of the last overload or implementation of this function.
+    #[salsa::tracked(
+        returns(ref), cycle_initial=last_definition_signature_cycle_initial,
+        heap_size=ruff_memory_usage::heap_size,
+    )]
+    pub(crate) fn last_definition_raw_signature(self, db: &'db dyn Db) -> Signature<'db> {
+        self.literal(db).last_definition_raw_signature(db)
     }
 
     /// Convert the `FunctionType` into a [`CallableType`].
     pub(crate) fn into_callable_type(self, db: &'db dyn Db) -> CallableType<'db> {
-        CallableType::new(db, self.signature(db), false)
+        CallableType::new(db, self.signature(db), true)
     }
 
     /// Convert the `FunctionType` into a [`BoundMethodType`].
@@ -858,78 +950,90 @@ impl<'db> FunctionType<'db> {
         BoundMethodType::new(db, self, self_instance)
     }
 
-    pub(crate) fn has_relation_to(
+    pub(crate) fn has_relation_to_impl(
         self,
         db: &'db dyn Db,
         other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-    ) -> bool {
-        match relation {
-            TypeRelation::Subtyping => self.is_subtype_of(db, other),
-            TypeRelation::Assignability => self.is_assignable_to(db, other),
-        }
-    }
-
-    pub(crate) fn is_subtype_of(self, db: &'db dyn Db, other: Self) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         // A function type is the subtype of itself, and not of any other function type. However,
         // our representation of a function type includes any specialization that should be applied
         // to the signature. Different specializations of the same function type are only subtypes
         // of each other if they result in subtype signatures.
+        if matches!(relation, TypeRelation::Subtyping | TypeRelation::Redundancy)
+            && self.normalized(db) == other.normalized(db)
+        {
+            return ConstraintSet::from(true);
+        }
+
+        if self.literal(db) != other.literal(db) {
+            return ConstraintSet::from(false);
+        }
+
+        let self_signature = self.signature(db);
+        let other_signature = other.signature(db);
+        self_signature.has_relation_to_impl(
+            db,
+            other_signature,
+            inferable,
+            relation,
+            relation_visitor,
+            disjointness_visitor,
+        )
+    }
+
+    pub(crate) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if self.normalized(db) == other.normalized(db) {
-            return true;
+            return ConstraintSet::from(true);
         }
         if self.literal(db) != other.literal(db) {
-            return false;
+            return ConstraintSet::from(false);
         }
         let self_signature = self.signature(db);
         let other_signature = other.signature(db);
-        self_signature.is_subtype_of(db, other_signature)
+        self_signature.is_equivalent_to_impl(db, other_signature, inferable, visitor)
     }
 
-    pub(crate) fn is_assignable_to(self, db: &'db dyn Db, other: Self) -> bool {
-        // A function type is assignable to itself, and not to any other function type. However,
-        // our representation of a function type includes any specialization that should be applied
-        // to the signature. Different specializations of the same function type are only
-        // assignable to each other if they result in assignable signatures.
-        self.literal(db) == other.literal(db)
-            && self.signature(db).is_assignable_to(db, other.signature(db))
-    }
-
-    pub(crate) fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
-        if self.normalized(db) == other.normalized(db) {
-            return true;
-        }
-        if self.literal(db) != other.literal(db) {
-            return false;
-        }
-        let self_signature = self.signature(db);
-        let other_signature = other.signature(db);
-        self_signature.is_equivalent_to(db, other_signature)
-    }
-
-    pub(crate) fn find_legacy_typevars(
+    pub(crate) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         let signatures = self.signature(db);
         for signature in &signatures.overloads {
-            signature.find_legacy_typevars(db, binding_context, typevars);
+            signature.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
     pub(crate) fn normalized(self, db: &'db dyn Db) -> Self {
-        self.normalized_impl(db, &TypeTransformer::default())
+        self.normalized_impl(db, &NormalizedVisitor::default())
     }
 
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        let mappings: Box<_> = self
-            .type_mappings(db)
-            .iter()
-            .map(|mapping| mapping.normalized_impl(db, visitor))
-            .collect();
-        Self::new(db, self.literal(db).normalized_impl(db, visitor), mappings)
+        let literal = self.literal(db);
+        let updated_signature = self
+            .updated_signature(db)
+            .map(|signature| signature.normalized_impl(db, visitor));
+        let updated_last_definition_signature = self
+            .updated_last_definition_signature(db)
+            .map(|signature| signature.normalized_impl(db, visitor));
+        Self::new(
+            db,
+            literal,
+            updated_signature,
+            updated_last_definition_signature,
+        )
     }
 }
 
@@ -943,8 +1047,8 @@ fn is_instance_truthiness<'db>(
     class: ClassLiteral<'db>,
 ) -> Truthiness {
     let is_instance = |ty: &Type<'_>| {
-        if let Type::NominalInstance(instance) = ty {
-            if instance
+        if let Type::NominalInstance(instance) = ty
+            && instance
                 .class(db)
                 .iter_mro(db)
                 .filter_map(ClassBase::into_class)
@@ -952,9 +1056,8 @@ fn is_instance_truthiness<'db>(
                     ClassType::Generic(c) => c.origin(db) == class,
                     ClassType::NonGeneric(c) => c == class,
                 })
-            {
-                return true;
-            }
+        {
+            return true;
         }
         false
     };
@@ -988,22 +1091,19 @@ fn is_instance_truthiness<'db>(
         | Type::StringLiteral(..)
         | Type::LiteralString
         | Type::ModuleLiteral(..)
-        | Type::EnumLiteral(..) => always_true_if(
+        | Type::EnumLiteral(..)
+        | Type::FunctionLiteral(..) => always_true_if(
             ty.literal_fallback_instance(db)
                 .as_ref()
                 .is_some_and(is_instance),
         ),
 
-        Type::FunctionLiteral(..) => {
-            always_true_if(is_instance(&KnownClass::FunctionType.to_instance(db)))
-        }
-
         Type::ClassLiteral(..) => always_true_if(is_instance(&KnownClass::Type.to_instance(db))),
 
         Type::TypeAlias(alias) => is_instance_truthiness(db, alias.value_type(db), class),
 
         Type::BoundMethod(..)
-        | Type::MethodWrapper(..)
+        | Type::KnownBoundMethod(..)
         | Type::WrapperDescriptor(..)
         | Type::DataclassDecorator(..)
         | Type::DataclassTransformer(..)
@@ -1015,7 +1115,6 @@ fn is_instance_truthiness<'db>(
         | Type::PropertyInstance(..)
         | Type::AlwaysTruthy
         | Type::AlwaysFalsy
-        | Type::NonInferableTypeVar(..)
         | Type::TypeVar(..)
         | Type::BoundSuper(..)
         | Type::TypeIs(..)
@@ -1030,36 +1129,82 @@ fn is_instance_truthiness<'db>(
     }
 }
 
-fn signature_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &CallableSignature<'db>,
-    _count: u32,
-    _function: FunctionType<'db>,
-) -> salsa::CycleRecoveryAction<CallableSignature<'db>> {
-    salsa::CycleRecoveryAction::Iterate
+/// Return true, if the type passed as `mode` would require us to pick a non-trivial overload of
+/// `builtins.open` / `os.fdopen` / `Path.open`.
+fn is_mode_with_nontrivial_return_type<'db>(db: &'db dyn Db, mode: Type<'db>) -> bool {
+    // Return true for any mode that doesn't match typeshed's
+    // `OpenTextMode` type alias (<https://github.com/python/typeshed/blob/6937a9b193bfc2f0696452d58aad96d7627aa29a/stdlib/_typeshed/__init__.pyi#L220>).
+    mode.as_string_literal().is_none_or(|mode| {
+        !matches!(
+            mode.value(db),
+            "r+" | "+r"
+                | "rt+"
+                | "r+t"
+                | "+rt"
+                | "tr+"
+                | "t+r"
+                | "+tr"
+                | "w+"
+                | "+w"
+                | "wt+"
+                | "w+t"
+                | "+wt"
+                | "tw+"
+                | "t+w"
+                | "+tw"
+                | "a+"
+                | "+a"
+                | "at+"
+                | "a+t"
+                | "+at"
+                | "ta+"
+                | "t+a"
+                | "+ta"
+                | "x+"
+                | "+x"
+                | "xt+"
+                | "x+t"
+                | "+xt"
+                | "tx+"
+                | "t+x"
+                | "+tx"
+                | "w"
+                | "wt"
+                | "tw"
+                | "a"
+                | "at"
+                | "ta"
+                | "x"
+                | "xt"
+                | "tx"
+                | "r"
+                | "rt"
+                | "tr"
+                | "U"
+                | "rU"
+                | "Ur"
+                | "rtU"
+                | "rUt"
+                | "Urt"
+                | "trU"
+                | "tUr"
+                | "Utr"
+        )
+    })
 }
 
 fn signature_cycle_initial<'db>(
-    db: &'db dyn Db,
+    _db: &'db dyn Db,
     _function: FunctionType<'db>,
 ) -> CallableSignature<'db> {
-    CallableSignature::single(Signature::bottom(db))
-}
-
-fn last_definition_signature_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Signature<'db>,
-    _count: u32,
-    _function: FunctionType<'db>,
-) -> salsa::CycleRecoveryAction<Signature<'db>> {
-    salsa::CycleRecoveryAction::Iterate
+    CallableSignature::single(Signature::bottom())
 }
 
 fn last_definition_signature_cycle_initial<'db>(
-    db: &'db dyn Db,
+    _db: &'db dyn Db,
     _function: FunctionType<'db>,
 ) -> Signature<'db> {
-    Signature::bottom(db)
+    Signature::bottom()
 }
 
 /// Non-exhaustive enumeration of known functions (e.g. `builtins.reveal_type`, ...) that might
@@ -1098,12 +1243,24 @@ pub enum KnownFunction {
     DunderImport,
     /// `importlib.import_module`, which returns the submodule.
     ImportModule,
+    /// `builtins.open`
+    Open,
+
+    /// `os.fdopen`
+    Fdopen,
+
+    /// `tempfile.NamedTemporaryFile`
+    #[strum(serialize = "NamedTemporaryFile")]
+    NamedTemporaryFile,
 
     /// `typing(_extensions).final`
     Final,
-
+    /// `typing(_extensions).disjoint_base`
+    DisjointBase,
     /// [`typing(_extensions).no_type_check`](https://typing.python.org/en/latest/spec/directives.html#no-type-check)
     NoTypeCheck,
+    /// `typing(_extensions).type_check_only`
+    TypeCheckOnly,
 
     /// `typing(_extensions).assert_type`
     AssertType,
@@ -1160,12 +1317,12 @@ pub enum KnownFunction {
     AllMembers,
     /// `ty_extensions.has_member`
     HasMember,
-    /// `ty_extensions.top_materialization`
-    TopMaterialization,
-    /// `ty_extensions.bottom_materialization`
-    BottomMaterialization,
     /// `ty_extensions.reveal_protocol_interface`
     RevealProtocolInterface,
+    /// `ty_extensions.range_constraint`
+    RangeConstraint,
+    /// `ty_extensions.negated_range_constraint`
+    NegatedRangeConstraint,
 }
 
 impl KnownFunction {
@@ -1188,7 +1345,7 @@ impl KnownFunction {
             .then_some(candidate)
     }
 
-    /// Return `true` if `self` is defined in `module` at runtime.
+    /// Return `true` if `self` is defined in `module`
     const fn check_module(self, module: KnownModule) -> bool {
         match self {
             Self::IsInstance
@@ -1196,6 +1353,7 @@ impl KnownFunction {
             | Self::HasAttr
             | Self::Len
             | Self::Repr
+            | Self::Open
             | Self::DunderImport => module.is_builtins(),
             Self::AssertType
             | Self::AssertNever
@@ -1208,12 +1366,19 @@ impl KnownFunction {
             | Self::GetProtocolMembers
             | Self::RuntimeCheckable
             | Self::DataclassTransform
+            | Self::DisjointBase
             | Self::NoTypeCheck => {
                 matches!(module, KnownModule::Typing | KnownModule::TypingExtensions)
             }
             Self::AbstractMethod => {
                 matches!(module, KnownModule::Abc)
             }
+            Self::Fdopen => {
+                matches!(module, KnownModule::Os)
+            }
+            Self::NamedTemporaryFile => {
+                matches!(module, KnownModule::Tempfile)
+            }
             Self::Dataclass | Self::Field => {
                 matches!(module, KnownModule::Dataclasses)
             }
@@ -1224,16 +1389,18 @@ impl KnownFunction {
             | Self::IsSingleValued
             | Self::IsSingleton
             | Self::IsSubtypeOf
-            | Self::TopMaterialization
-            | Self::BottomMaterialization
             | Self::GenericContext
             | Self::DunderAllNames
             | Self::EnumMembers
             | Self::StaticAssert
             | Self::HasMember
             | Self::RevealProtocolInterface
+            | Self::RangeConstraint
+            | Self::NegatedRangeConstraint
             | Self::AllMembers => module.is_ty_extensions(),
             Self::ImportModule => module.is_importlib(),
+
+            Self::TypeCheckOnly => matches!(module, KnownModule::Typing),
         }
     }
 
@@ -1261,10 +1428,11 @@ impl KnownFunction {
                 {
                     let mut diag = builder.into_diagnostic("Revealed type");
                     let span = context.span(&call_expression.arguments.args[0]);
-                    diag.annotate(
-                        Annotation::primary(span)
-                            .message(format_args!("`{}`", revealed_type.display(db))),
-                    );
+                    diag.annotate(Annotation::primary(span).message(format_args!(
+                        "`{}`",
+                        revealed_type
+                            .display_with(db, DisplaySettings::default().preserve_long_unions())
+                    )));
                 }
             }
 
@@ -1364,7 +1532,7 @@ impl KnownFunction {
                         return;
                     }
                     let mut diagnostic = if let Some(message) = message
-                        .and_then(Type::into_string_literal)
+                        .and_then(Type::as_string_literal)
                         .map(|s| s.value(db))
                     {
                         builder.into_diagnostic(format_args!("Static assertion error: {message}"))
@@ -1402,8 +1570,8 @@ impl KnownFunction {
                 let contains_unknown_or_todo =
                     |ty| matches!(ty, Type::Dynamic(dynamic) if dynamic != DynamicType::Any);
                 if source_type.is_equivalent_to(db, *casted_type)
-                    && !any_over_type(db, *source_type, &contains_unknown_or_todo)
-                    && !any_over_type(db, *casted_type, &contains_unknown_or_todo)
+                    && !any_over_type(db, *source_type, &contains_unknown_or_todo, true)
+                    && !any_over_type(db, *casted_type, &contains_unknown_or_todo, true)
                 {
                     if let Some(builder) = context.report_lint(&REDUNDANT_CAST, call_expression) {
                         builder.into_diagnostic(format_args!(
@@ -1429,7 +1597,7 @@ impl KnownFunction {
                     return;
                 };
                 let Some(protocol_class) = param_type
-                    .into_class_literal()
+                    .to_class_type(db)
                     .and_then(|class| class.into_protocol_class(db))
                 else {
                     report_bad_argument_to_protocol_interface(
@@ -1452,25 +1620,48 @@ impl KnownFunction {
             }
 
             KnownFunction::IsInstance | KnownFunction::IsSubclass => {
-                let [Some(first_arg), Some(Type::ClassLiteral(class))] = parameter_types else {
+                let [Some(first_arg), Some(second_argument)] = parameter_types else {
                     return;
                 };
 
-                if let Some(protocol_class) = class.into_protocol_class(db) {
-                    if !protocol_class.is_runtime_checkable(db) {
-                        report_runtime_check_against_non_runtime_checkable_protocol(
-                            context,
-                            call_expression,
-                            protocol_class,
-                            self,
-                        );
-                    }
-                }
+                match second_argument {
+                    Type::ClassLiteral(class) => {
+                        if let Some(protocol_class) = class.into_protocol_class(db)
+                            && !protocol_class.is_runtime_checkable(db)
+                        {
+                            report_runtime_check_against_non_runtime_checkable_protocol(
+                                context,
+                                call_expression,
+                                protocol_class,
+                                self,
+                            );
+                        }
 
-                if self == KnownFunction::IsInstance {
-                    overload.set_return_type(
-                        is_instance_truthiness(db, *first_arg, *class).into_type(db),
-                    );
+                        if self == KnownFunction::IsInstance {
+                            overload.set_return_type(
+                                is_instance_truthiness(db, *first_arg, *class).into_type(db),
+                            );
+                        }
+                    }
+                    // The special-casing here is necessary because we recognise the symbol `typing.Any` as an
+                    // instance of `type` at runtime. Even once we understand typeshed's annotation for
+                    // `isinstance()`, we'd continue to accept calls such as `isinstance(x, typing.Any)` without
+                    // emitting a diagnostic if we didn't have this branch.
+                    Type::SpecialForm(SpecialFormType::Any)
+                        if self == KnownFunction::IsInstance =>
+                    {
+                        let Some(builder) =
+                            context.report_lint(&INVALID_ARGUMENT_TYPE, call_expression)
+                        else {
+                            return;
+                        };
+                        let mut diagnostic = builder.into_diagnostic(format_args!(
+                            "`typing.Any` cannot be used with `isinstance()`"
+                        ));
+                        diagnostic
+                            .set_primary_message("This call will raise `TypeError` at runtime");
+                    }
+                    _ => {}
                 }
             }
 
@@ -1504,6 +1695,64 @@ impl KnownFunction {
                 overload.set_return_type(Type::module_literal(db, file, module));
             }
 
+            KnownFunction::RangeConstraint => {
+                let [Some(lower), Some(Type::TypeVar(typevar)), Some(upper)] = parameter_types
+                else {
+                    return;
+                };
+
+                let constraints = ConstraintSet::range(db, *lower, typevar.identity(db), *upper);
+                let tracked = TrackedConstraintSet::new(db, constraints);
+                overload.set_return_type(Type::KnownInstance(KnownInstanceType::ConstraintSet(
+                    tracked,
+                )));
+            }
+
+            KnownFunction::NegatedRangeConstraint => {
+                let [Some(lower), Some(Type::TypeVar(typevar)), Some(upper)] = parameter_types
+                else {
+                    return;
+                };
+
+                let constraints =
+                    ConstraintSet::negated_range(db, *lower, typevar.identity(db), *upper);
+                let tracked = TrackedConstraintSet::new(db, constraints);
+                overload.set_return_type(Type::KnownInstance(KnownInstanceType::ConstraintSet(
+                    tracked,
+                )));
+            }
+
+            KnownFunction::Open => {
+                // TODO: Temporary special-casing for `builtins.open` to avoid an excessive number of
+                // false positives in lieu of proper support for PEP-613 type aliases.
+                if let [_, Some(mode), ..] = parameter_types
+                    && is_mode_with_nontrivial_return_type(db, *mode)
+                {
+                    overload.set_return_type(todo_type!("`builtins.open` return type"));
+                }
+            }
+
+            KnownFunction::Fdopen => {
+                // TODO: Temporary special-casing for `os.fdopen` to avoid an excessive number of
+                // false positives in lieu of proper support for PEP-613 type aliases.
+                if let [_, Some(mode), ..] = parameter_types
+                    && is_mode_with_nontrivial_return_type(db, *mode)
+                {
+                    overload.set_return_type(todo_type!("`os.fdopen` return type"));
+                }
+            }
+
+            KnownFunction::NamedTemporaryFile => {
+                // TODO: Temporary special-casing for `tempfile.NamedTemporaryFile` to avoid an excessive number of
+                // false positives in lieu of proper support for PEP-613 type aliases.
+                if let [Some(mode), ..] = parameter_types
+                    && is_mode_with_nontrivial_return_type(db, *mode)
+                {
+                    overload
+                        .set_return_type(todo_type!("`tempfile.NamedTemporaryFile` return type"));
+                }
+            }
+
             _ => {}
         }
     }
@@ -1530,10 +1779,15 @@ pub(crate) mod tests {
                 | KnownFunction::IsInstance
                 | KnownFunction::HasAttr
                 | KnownFunction::IsSubclass
+                | KnownFunction::Open
                 | KnownFunction::DunderImport => KnownModule::Builtins,
 
                 KnownFunction::AbstractMethod => KnownModule::Abc,
 
+                KnownFunction::Fdopen => KnownModule::Os,
+
+                KnownFunction::NamedTemporaryFile => KnownModule::Tempfile,
+
                 KnownFunction::Dataclass | KnownFunction::Field => KnownModule::Dataclasses,
 
                 KnownFunction::GetattrStatic => KnownModule::Inspect,
@@ -1549,8 +1803,11 @@ pub(crate) mod tests {
                 | KnownFunction::GetProtocolMembers
                 | KnownFunction::RuntimeCheckable
                 | KnownFunction::DataclassTransform
+                | KnownFunction::DisjointBase
                 | KnownFunction::NoTypeCheck => KnownModule::TypingExtensions,
 
+                KnownFunction::TypeCheckOnly => KnownModule::Typing,
+
                 KnownFunction::IsSingleton
                 | KnownFunction::IsSubtypeOf
                 | KnownFunction::GenericContext
@@ -1561,10 +1818,10 @@ pub(crate) mod tests {
                 | KnownFunction::IsSingleValued
                 | KnownFunction::IsAssignableTo
                 | KnownFunction::IsEquivalentTo
-                | KnownFunction::TopMaterialization
-                | KnownFunction::BottomMaterialization
                 | KnownFunction::HasMember
                 | KnownFunction::RevealProtocolInterface
+                | KnownFunction::RangeConstraint
+                | KnownFunction::NegatedRangeConstraint
                 | KnownFunction::AllMembers => KnownModule::TyExtensions,
 
                 KnownFunction::ImportModule => KnownModule::ImportLib,
diff --git a/crates/ty_python_semantic/src/types/generics.rs b/crates/ty_python_semantic/src/types/generics.rs
index 049b953949..e8c6305d06 100644
--- a/crates/ty_python_semantic/src/types/generics.rs
+++ b/crates/ty_python_semantic/src/types/generics.rs
@@ -1,54 +1,39 @@
-use std::borrow::Cow;
+use std::cell::RefCell;
+use std::fmt::Display;
 
-use ruff_db::parsed::ParsedModuleRef;
+use itertools::Itertools;
 use ruff_python_ast as ast;
-use rustc_hash::FxHashMap;
+use rustc_hash::{FxHashMap, FxHashSet};
 
-use crate::semantic_index::SemanticIndex;
 use crate::semantic_index::definition::Definition;
-use crate::semantic_index::scope::{FileScopeId, NodeWithScopeKind};
+use crate::semantic_index::scope::{FileScopeId, NodeWithScopeKind, ScopeId};
+use crate::semantic_index::{SemanticIndex, semantic_index};
 use crate::types::class::ClassType;
 use crate::types::class_base::ClassBase;
-use crate::types::infer::infer_definition_types;
+use crate::types::constraints::ConstraintSet;
 use crate::types::instance::{Protocol, ProtocolInstanceType};
 use crate::types::signatures::{Parameter, Parameters, Signature};
 use crate::types::tuple::{TupleSpec, TupleType, walk_tuple_type};
+use crate::types::visitor::{NonAtomicType, TypeKind, TypeVisitor, walk_non_atomic_type};
 use crate::types::{
-    ApplyTypeMappingVisitor, BoundTypeVarInstance, HasRelationToVisitor, KnownClass,
-    KnownInstanceType, NormalizedVisitor, Type, TypeMapping, TypeRelation, TypeTransformer,
-    TypeVarBoundOrConstraints, TypeVarInstance, TypeVarVariance, UnionType, binding_type,
-    declaration_type,
+    ApplyTypeMappingVisitor, BoundTypeVarIdentity, BoundTypeVarInstance, ClassLiteral,
+    FindLegacyTypeVarsVisitor, HasRelationToVisitor, IsDisjointVisitor, IsEquivalentVisitor,
+    KnownClass, KnownInstanceType, MaterializationKind, NormalizedVisitor, Type, TypeContext,
+    TypeMapping, TypeRelation, TypeVarBoundOrConstraints, TypeVarIdentity, TypeVarInstance,
+    TypeVarKind, TypeVarVariance, UnionType, declaration_type, walk_bound_type_var_type,
 };
-use crate::{Db, FxOrderSet};
+use crate::{Db, FxIndexSet, FxOrderMap, FxOrderSet};
 
 /// Returns an iterator of any generic context introduced by the given scope or any enclosing
 /// scope.
-fn enclosing_generic_contexts<'db>(
+pub(crate) fn enclosing_generic_contexts<'db>(
     db: &'db dyn Db,
-    module: &ParsedModuleRef,
     index: &SemanticIndex<'db>,
     scope: FileScopeId,
 ) -> impl Iterator<Item = GenericContext<'db>> {
     index
         .ancestor_scopes(scope)
-        .filter_map(|(_, ancestor_scope)| match ancestor_scope.node() {
-            NodeWithScopeKind::Class(class) => {
-                let definition = index.expect_single_definition(class.node(module));
-                binding_type(db, definition)
-                    .into_class_literal()?
-                    .generic_context(db)
-            }
-            NodeWithScopeKind::Function(function) => {
-                let definition = index.expect_single_definition(function.node(module));
-                infer_definition_types(db, definition)
-                    .undecorated_type()
-                    .expect("function should have undecorated type")
-                    .into_function_literal()?
-                    .last_definition_signature(db)
-                    .generic_context
-            }
-            _ => None,
-        })
+        .filter_map(|(_, ancestor_scope)| ancestor_scope.node().generic_context(db, index))
 }
 
 /// Binds an unbound typevar.
@@ -67,13 +52,23 @@ fn enclosing_generic_contexts<'db>(
 /// bind the typevar with that new binding context.
 pub(crate) fn bind_typevar<'db>(
     db: &'db dyn Db,
-    module: &ParsedModuleRef,
     index: &SemanticIndex<'db>,
     containing_scope: FileScopeId,
     typevar_binding_context: Option<Definition<'db>>,
     typevar: TypeVarInstance<'db>,
 ) -> Option<BoundTypeVarInstance<'db>> {
-    enclosing_generic_contexts(db, module, index, containing_scope)
+    // typing.Self is treated like a legacy typevar, but doesn't follow the same scoping rules. It is always bound to the outermost method in the containing class.
+    if matches!(typevar.kind(db), TypeVarKind::TypingSelf) {
+        for ((_, inner), (_, outer)) in index.ancestor_scopes(containing_scope).tuple_windows() {
+            if outer.kind().is_class() {
+                if let NodeWithScopeKind::Function(function) = inner.node() {
+                    let definition = index.expect_single_definition(function);
+                    return Some(typevar.with_binding_context(db, definition));
+                }
+            }
+        }
+    }
+    enclosing_generic_contexts(db, index, containing_scope)
         .find_map(|enclosing_context| enclosing_context.binds_typevar(db, typevar))
         .or_else(|| {
             typevar_binding_context.map(|typevar_binding_context| {
@@ -82,19 +77,139 @@ pub(crate) fn bind_typevar<'db>(
         })
 }
 
+/// Create a `typing.Self` type variable for a given class.
+pub(crate) fn typing_self<'db>(
+    db: &'db dyn Db,
+    function_scope_id: ScopeId,
+    typevar_binding_context: Option<Definition<'db>>,
+    class: ClassLiteral<'db>,
+) -> Option<Type<'db>> {
+    let index = semantic_index(db, function_scope_id.file(db));
+
+    let identity = TypeVarIdentity::new(
+        db,
+        ast::name::Name::new_static("Self"),
+        Some(class.definition(db)),
+        TypeVarKind::TypingSelf,
+    );
+    let bounds = TypeVarBoundOrConstraints::UpperBound(Type::instance(
+        db,
+        class.identity_specialization(db),
+    ));
+    let typevar = TypeVarInstance::new(
+        db,
+        identity,
+        Some(bounds.into()),
+        // According to the [spec], we can consider `Self`
+        // equivalent to an invariant type variable
+        // [spec]: https://typing.python.org/en/latest/spec/generics.html#self
+        Some(TypeVarVariance::Invariant),
+        None,
+    );
+
+    bind_typevar(
+        db,
+        index,
+        function_scope_id.file_scope_id(db),
+        typevar_binding_context,
+        typevar,
+    )
+    .map(Type::TypeVar)
+}
+
+#[derive(Clone, Copy, Debug)]
+pub(crate) enum InferableTypeVars<'a, 'db> {
+    None,
+    One(&'a FxHashSet<BoundTypeVarIdentity<'db>>),
+    Two(
+        &'a InferableTypeVars<'a, 'db>,
+        &'a InferableTypeVars<'a, 'db>,
+    ),
+}
+
+impl<'db> BoundTypeVarInstance<'db> {
+    pub(crate) fn is_inferable(
+        self,
+        db: &'db dyn Db,
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> bool {
+        match inferable {
+            InferableTypeVars::None => false,
+            InferableTypeVars::One(typevars) => typevars.contains(&self.identity(db)),
+            InferableTypeVars::Two(left, right) => {
+                self.is_inferable(db, *left) || self.is_inferable(db, *right)
+            }
+        }
+    }
+}
+
+impl<'a, 'db> InferableTypeVars<'a, 'db> {
+    pub(crate) fn merge(&'a self, other: Option<&'a InferableTypeVars<'a, 'db>>) -> Self {
+        match other {
+            Some(other) => InferableTypeVars::Two(self, other),
+            None => *self,
+        }
+    }
+
+    // Keep this around for debugging purposes
+    #[expect(dead_code)]
+    pub(crate) fn display(&self, db: &'db dyn Db) -> impl Display {
+        fn find_typevars<'db>(
+            result: &mut FxHashSet<BoundTypeVarIdentity<'db>>,
+            inferable: &InferableTypeVars<'_, 'db>,
+        ) {
+            match inferable {
+                InferableTypeVars::None => {}
+                InferableTypeVars::One(typevars) => result.extend(typevars.iter().copied()),
+                InferableTypeVars::Two(left, right) => {
+                    find_typevars(result, left);
+                    find_typevars(result, right);
+                }
+            }
+        }
+
+        let mut typevars = FxHashSet::default();
+        find_typevars(&mut typevars, self);
+        format!(
+            "[{}]",
+            typevars
+                .into_iter()
+                .map(|identity| identity.display(db))
+                .format(", ")
+        )
+    }
+}
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, get_size2::GetSize)]
+pub struct GenericContextTypeVar<'db> {
+    bound_typevar: BoundTypeVarInstance<'db>,
+    should_promote_literals: bool,
+}
+
+impl<'db> GenericContextTypeVar<'db> {
+    fn new(bound_typevar: BoundTypeVarInstance<'db>) -> Self {
+        Self {
+            bound_typevar,
+            should_promote_literals: false,
+        }
+    }
+
+    fn promote_literals(mut self) -> Self {
+        self.should_promote_literals = true;
+        self
+    }
+}
+
 /// A list of formal type variables for a generic function, class, or type alias.
 ///
-/// TODO: Handle nested generic contexts better, with actual parent links to the lexically
-/// containing context.
-///
 /// # Ordering
 /// Ordering is based on the context's salsa-assigned id and not on its values.
 /// The id may change between runs, or when the context was garbage collected and recreated.
-#[salsa::interned(debug, heap_size=GenericContext::heap_size)]
+#[salsa::interned(debug, constructor=new_internal, heap_size=GenericContext::heap_size)]
 #[derive(PartialOrd, Ord)]
 pub struct GenericContext<'db> {
     #[returns(ref)]
-    pub(crate) variables: FxOrderSet<BoundTypeVarInstance<'db>>,
+    variables_inner: FxOrderMap<BoundTypeVarIdentity<'db>, GenericContextTypeVar<'db>>,
 }
 
 pub(super) fn walk_generic_context<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
@@ -103,7 +218,7 @@ pub(super) fn walk_generic_context<'db, V: super::visitor::TypeVisitor<'db> + ?S
     visitor: &V,
 ) {
     for bound_typevar in context.variables(db) {
-        visitor.visit_bound_type_var_type(db, *bound_typevar);
+        visitor.visit_bound_type_var_type(db, bound_typevar);
     }
 }
 
@@ -111,6 +226,19 @@ pub(super) fn walk_generic_context<'db, V: super::visitor::TypeVisitor<'db> + ?S
 impl get_size2::GetSize for GenericContext<'_> {}
 
 impl<'db> GenericContext<'db> {
+    fn from_variables(
+        db: &'db dyn Db,
+        variables: impl IntoIterator<Item = GenericContextTypeVar<'db>>,
+    ) -> Self {
+        Self::new_internal(
+            db,
+            variables
+                .into_iter()
+                .map(|variable| (variable.bound_typevar.identity(db), variable))
+                .collect::<FxOrderMap<_, _>>(),
+        )
+    }
+
     /// Creates a generic context from a list of PEP-695 type parameters.
     pub(crate) fn from_type_params(
         db: &'db dyn Db,
@@ -118,13 +246,110 @@ impl<'db> GenericContext<'db> {
         binding_context: Definition<'db>,
         type_params_node: &ast::TypeParams,
     ) -> Self {
-        let variables: FxOrderSet<_> = type_params_node
-            .iter()
-            .filter_map(|type_param| {
-                Self::variable_from_type_param(db, index, binding_context, type_param)
-            })
-            .collect();
-        Self::new(db, variables)
+        let variables = type_params_node.iter().filter_map(|type_param| {
+            Self::variable_from_type_param(db, index, binding_context, type_param)
+        });
+
+        Self::from_typevar_instances(db, variables)
+    }
+
+    /// Creates a generic context from a list of `BoundTypeVarInstance`s.
+    pub(crate) fn from_typevar_instances(
+        db: &'db dyn Db,
+        type_params: impl IntoIterator<Item = BoundTypeVarInstance<'db>>,
+    ) -> Self {
+        Self::from_variables(db, type_params.into_iter().map(GenericContextTypeVar::new))
+    }
+
+    /// Returns a copy of this generic context where we will promote literal types in any inferred
+    /// specializations.
+    pub(crate) fn promote_literals(self, db: &'db dyn Db) -> Self {
+        Self::from_variables(
+            db,
+            self.variables_inner(db)
+                .values()
+                .map(|variable| variable.promote_literals()),
+        )
+    }
+
+    /// Merge this generic context with another, returning a new generic context that
+    /// contains type variables from both contexts.
+    pub(crate) fn merge(self, db: &'db dyn Db, other: Self) -> Self {
+        Self::from_variables(
+            db,
+            self.variables_inner(db)
+                .values()
+                .chain(other.variables_inner(db).values())
+                .copied(),
+        )
+    }
+
+    pub(crate) fn inferable_typevars(self, db: &'db dyn Db) -> InferableTypeVars<'db, 'db> {
+        #[derive(Default)]
+        struct CollectTypeVars<'db> {
+            typevars: RefCell<FxHashSet<BoundTypeVarIdentity<'db>>>,
+            seen_types: RefCell<FxIndexSet<NonAtomicType<'db>>>,
+        }
+
+        impl<'db> TypeVisitor<'db> for CollectTypeVars<'db> {
+            fn should_visit_lazy_type_attributes(&self) -> bool {
+                true
+            }
+
+            fn visit_bound_type_var_type(
+                &self,
+                db: &'db dyn Db,
+                bound_typevar: BoundTypeVarInstance<'db>,
+            ) {
+                self.typevars
+                    .borrow_mut()
+                    .insert(bound_typevar.identity(db));
+                walk_bound_type_var_type(db, bound_typevar, self);
+            }
+
+            fn visit_type(&self, db: &'db dyn Db, ty: Type<'db>) {
+                match TypeKind::from(ty) {
+                    TypeKind::Atomic => {}
+                    TypeKind::NonAtomic(non_atomic_type) => {
+                        if !self.seen_types.borrow_mut().insert(non_atomic_type) {
+                            // If we have already seen this type, we can skip it.
+                            return;
+                        }
+                        walk_non_atomic_type(db, non_atomic_type, self);
+                    }
+                }
+            }
+        }
+
+        #[salsa::tracked(
+            returns(ref),
+            cycle_initial=inferable_typevars_cycle_initial,
+            heap_size=ruff_memory_usage::heap_size,
+        )]
+        fn inferable_typevars_inner<'db>(
+            db: &'db dyn Db,
+            generic_context: GenericContext<'db>,
+        ) -> FxHashSet<BoundTypeVarIdentity<'db>> {
+            let visitor = CollectTypeVars::default();
+            for bound_typevar in generic_context.variables(db) {
+                visitor.visit_bound_type_var_type(db, bound_typevar);
+            }
+            visitor.typevars.into_inner()
+        }
+
+        // This ensures that salsa caches the FxHashSet, not the InferableTypeVars that wraps it.
+        // (That way InferableTypeVars can contain references, and doesn't need to impl
+        // salsa::Update.)
+        InferableTypeVars::One(inferable_typevars_inner(db, self))
+    }
+
+    pub(crate) fn variables(
+        self,
+        db: &'db dyn Db,
+    ) -> impl ExactSizeIterator<Item = BoundTypeVarInstance<'db>> + Clone {
+        self.variables_inner(db)
+            .values()
+            .map(|variable| variable.bound_typevar)
     }
 
     fn variable_from_type_param(
@@ -174,34 +399,56 @@ impl<'db> GenericContext<'db> {
         if variables.is_empty() {
             return None;
         }
-        Some(Self::new(db, variables))
+        Some(Self::from_typevar_instances(db, variables))
+    }
+
+    pub(crate) fn merge_pep695_and_legacy(
+        db: &'db dyn Db,
+        pep695_generic_context: Option<Self>,
+        legacy_generic_context: Option<Self>,
+    ) -> Option<Self> {
+        match (legacy_generic_context, pep695_generic_context) {
+            (Some(legacy_ctx), Some(ctx)) => {
+                if legacy_ctx
+                    .variables(db)
+                    .exactly_one()
+                    .is_ok_and(|bound_typevar| bound_typevar.typevar(db).is_self(db))
+                {
+                    Some(legacy_ctx.merge(db, ctx))
+                } else {
+                    // TODO: Raise a diagnostic — mixing PEP 695 and legacy typevars is not allowed
+                    Some(ctx)
+                }
+            }
+            (left, right) => left.or(right),
+        }
     }
 
     /// Creates a generic context from the legacy `TypeVar`s that appear in class's base class
     /// list.
     pub(crate) fn from_base_classes(
         db: &'db dyn Db,
+        definition: Definition<'db>,
         bases: impl Iterator<Item = Type<'db>>,
     ) -> Option<Self> {
         let mut variables = FxOrderSet::default();
         for base in bases {
-            base.find_legacy_typevars(db, None, &mut variables);
+            base.find_legacy_typevars(db, Some(definition), &mut variables);
         }
         if variables.is_empty() {
             return None;
         }
-        Some(Self::new(db, variables))
+        Some(Self::from_typevar_instances(db, variables))
     }
 
     pub(crate) fn len(self, db: &'db dyn Db) -> usize {
-        self.variables(db).len()
+        self.variables_inner(db).len()
     }
 
     pub(crate) fn signature(self, db: &'db dyn Db) -> Signature<'db> {
         let parameters = Parameters::new(
             self.variables(db)
-                .iter()
-                .map(|typevar| Self::parameter_from_typevar(db, *typevar)),
+                .map(|typevar| Self::parameter_from_typevar(db, typevar)),
         );
         Signature::new(parameters, None)
     }
@@ -236,13 +483,13 @@ impl<'db> GenericContext<'db> {
         db: &'db dyn Db,
         known_class: Option<KnownClass>,
     ) -> Specialization<'db> {
-        let partial =
-            self.specialize_partial(db, std::iter::repeat_n(None, self.variables(db).len()));
+        let partial = self.specialize_partial(db, std::iter::repeat_n(None, self.len(db)));
         if known_class == Some(KnownClass::Tuple) {
             Specialization::new(
                 db,
                 self,
                 partial.types(db),
+                None,
                 Some(TupleType::homogeneous(db, Type::unknown())),
             )
         } else {
@@ -251,35 +498,34 @@ impl<'db> GenericContext<'db> {
     }
 
     /// Returns a specialization of this generic context where each typevar is mapped to itself.
-    /// (And in particular, to an _inferable_ version of itself, since this will be used in our
-    /// class constructor invocation machinery to infer a specialization for the class from the
-    /// arguments passed to its constructor.)
     pub(crate) fn identity_specialization(self, db: &'db dyn Db) -> Specialization<'db> {
-        let types = self
-            .variables(db)
-            .iter()
-            .map(|typevar| Type::TypeVar(*typevar))
-            .collect();
+        let types = self.variables(db).map(Type::TypeVar).collect();
         self.specialize(db, types)
     }
 
     pub(crate) fn unknown_specialization(self, db: &'db dyn Db) -> Specialization<'db> {
-        let types = vec![Type::unknown(); self.variables(db).len()];
+        let types = vec![Type::unknown(); self.len(db)];
         self.specialize(db, types.into())
     }
 
     /// Returns a tuple type of the typevars introduced by this generic context.
     pub(crate) fn as_tuple(self, db: &'db dyn Db) -> Type<'db> {
-        Type::heterogeneous_tuple(
-            db,
-            self.variables(db)
-                .iter()
-                .map(|typevar| Type::TypeVar(*typevar)),
-        )
+        Type::heterogeneous_tuple(db, self.variables(db).map(Type::TypeVar))
     }
 
     pub(crate) fn is_subset_of(self, db: &'db dyn Db, other: GenericContext<'db>) -> bool {
-        self.variables(db).is_subset(other.variables(db))
+        let other_variables = other.variables_inner(db);
+        self.variables(db)
+            .all(|bound_typevar| other_variables.contains_key(&bound_typevar.identity(db)))
+    }
+
+    pub(crate) fn binds_named_typevar(
+        self,
+        db: &'db dyn Db,
+        name: &'db ast::name::Name,
+    ) -> Option<BoundTypeVarInstance<'db>> {
+        self.variables(db)
+            .find(|self_bound_typevar| self_bound_typevar.typevar(db).name(db) == name)
     }
 
     pub(crate) fn binds_typevar(
@@ -287,10 +533,9 @@ impl<'db> GenericContext<'db> {
         db: &'db dyn Db,
         typevar: TypeVarInstance<'db>,
     ) -> Option<BoundTypeVarInstance<'db>> {
-        self.variables(db)
-            .iter()
-            .find(|self_bound_typevar| self_bound_typevar.typevar(db) == typevar)
-            .copied()
+        self.variables(db).find(|self_bound_typevar| {
+            self_bound_typevar.typevar(db).identity(db) == typevar.identity(db)
+        })
     }
 
     /// Creates a specialization of this generic context. Panics if the length of `types` does not
@@ -302,8 +547,8 @@ impl<'db> GenericContext<'db> {
         db: &'db dyn Db,
         types: Box<[Type<'db>]>,
     ) -> Specialization<'db> {
-        assert!(self.variables(db).len() == types.len());
-        Specialization::new(db, self, types, None)
+        assert!(self.len(db) == types.len());
+        Specialization::new(db, self, types, None, None)
     }
 
     /// Creates a specialization of this generic context for the `tuple` class.
@@ -313,7 +558,7 @@ impl<'db> GenericContext<'db> {
         element_type: Type<'db>,
         tuple: TupleType<'db>,
     ) -> Specialization<'db> {
-        Specialization::new(db, self, Box::from([element_type]), Some(tuple))
+        Specialization::new(db, self, Box::from([element_type]), None, Some(tuple))
     }
 
     /// Creates a specialization of this generic context. Panics if the length of `types` does not
@@ -326,7 +571,7 @@ impl<'db> GenericContext<'db> {
     {
         let types = types.into_iter();
         let variables = self.variables(db);
-        assert!(variables.len() == types.len());
+        assert!(self.len(db) == types.len());
 
         // Typevars can have other typevars as their default values, e.g.
         //
@@ -352,30 +597,41 @@ impl<'db> GenericContext<'db> {
             // requirement for legacy contexts.)
             let partial = PartialSpecialization {
                 generic_context: self,
-                types: Cow::Borrowed(&expanded[0..idx]),
+                types: &expanded[0..idx],
             };
-            let default =
-                default.apply_type_mapping(db, &TypeMapping::PartialSpecialization(partial));
+            let default = default.apply_type_mapping(
+                db,
+                &TypeMapping::PartialSpecialization(partial),
+                TypeContext::default(),
+            );
             expanded[idx] = default;
         }
 
-        Specialization::new(db, self, expanded.into_boxed_slice(), None)
+        Specialization::new(db, self, expanded.into_boxed_slice(), None, None)
     }
 
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
-        let variables: FxOrderSet<_> = self
+        let variables = self
             .variables(db)
-            .iter()
-            .map(|bound_typevar| bound_typevar.normalized_impl(db, visitor))
-            .collect();
-        Self::new(db, variables)
+            .map(|bound_typevar| bound_typevar.normalized_impl(db, visitor));
+
+        Self::from_typevar_instances(db, variables)
     }
 
-    fn heap_size((variables,): &(FxOrderSet<BoundTypeVarInstance<'db>>,)) -> usize {
-        ruff_memory_usage::order_set_heap_size(variables)
+    fn heap_size(
+        (variables,): &(FxOrderMap<BoundTypeVarIdentity<'db>, GenericContextTypeVar<'db>>,),
+    ) -> usize {
+        ruff_memory_usage::order_map_heap_size(variables)
     }
 }
 
+fn inferable_typevars_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _self: GenericContext<'db>,
+) -> FxHashSet<BoundTypeVarIdentity<'db>> {
+    FxHashSet::default()
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub(super) enum LegacyGenericBase {
     Generic,
@@ -406,6 +662,14 @@ pub struct Specialization<'db> {
     pub(crate) generic_context: GenericContext<'db>,
     #[returns(deref)]
     pub(crate) types: Box<[Type<'db>]>,
+    /// The materialization kind of the specialization. For example, given an invariant
+    /// generic type `A`, `Top[A[Any]]` is a supertype of all materializations of `A[Any]`,
+    /// and is represented here with `Some(MaterializationKind::Top)`. Similarly,
+    /// `Bottom[A[Any]]` is a subtype of all materializations of `A[Any]`, and is represented
+    /// with `Some(MaterializationKind::Bottom)`.
+    /// The `materialization_kind` field may be non-`None` only if the specialization contains
+    /// dynamic types in invariant positions.
+    pub(crate) materialization_kind: Option<MaterializationKind>,
 
     /// For specializations of `tuple`, we also store more detailed information about the tuple's
     /// elements, above what the class's (single) typevar can represent.
@@ -429,7 +693,215 @@ pub(super) fn walk_specialization<'db, V: super::visitor::TypeVisitor<'db> + ?Si
     }
 }
 
+#[expect(clippy::too_many_arguments)]
+fn is_subtype_in_invariant_position<'db>(
+    db: &'db dyn Db,
+    derived_type: &Type<'db>,
+    derived_materialization: MaterializationKind,
+    base_type: &Type<'db>,
+    base_materialization: MaterializationKind,
+    inferable: InferableTypeVars<'_, 'db>,
+    relation_visitor: &HasRelationToVisitor<'db>,
+    disjointness_visitor: &IsDisjointVisitor<'db>,
+) -> ConstraintSet<'db> {
+    let derived_top = derived_type.top_materialization(db);
+    let derived_bottom = derived_type.bottom_materialization(db);
+    let base_top = base_type.top_materialization(db);
+    let base_bottom = base_type.bottom_materialization(db);
+
+    let is_subtype_of = |derived: Type<'db>, base: Type<'db>| {
+        // TODO:
+        // This should be removed and properly handled in the respective
+        // `(Type::TypeVar(_), _) | (_, Type::TypeVar(_))` branch of
+        // `Type::has_relation_to_impl`. Right now, we can not generally
+        // return `ConstraintSet::from(true)` from that branch, as that
+        // leads to union simplification, which means that we lose track
+        // of type variables without recording the constraints under which
+        // the relation holds.
+        if matches!(base, Type::TypeVar(_)) || matches!(derived, Type::TypeVar(_)) {
+            return ConstraintSet::from(true);
+        }
+
+        derived.has_relation_to_impl(
+            db,
+            base,
+            inferable,
+            TypeRelation::Subtyping,
+            relation_visitor,
+            disjointness_visitor,
+        )
+    };
+    match (derived_materialization, base_materialization) {
+        // `Derived` is a subtype of `Base` if the range of materializations covered by `Derived`
+        // is a subset of the range covered by `Base`.
+        (MaterializationKind::Top, MaterializationKind::Top) => {
+            is_subtype_of(base_bottom, derived_bottom)
+                .and(db, || is_subtype_of(derived_top, base_top))
+        }
+        // One bottom is a subtype of another if it covers a strictly larger set of materializations.
+        (MaterializationKind::Bottom, MaterializationKind::Bottom) => {
+            is_subtype_of(derived_bottom, base_bottom)
+                .and(db, || is_subtype_of(base_top, derived_top))
+        }
+        // The bottom materialization of `Derived` is a subtype of the top materialization
+        // of `Base` if there is some type that is both within the
+        // range of types covered by derived and within the range covered by base, because if such a type
+        // exists, it's a subtype of `Top[base]` and a supertype of `Bottom[derived]`.
+        (MaterializationKind::Bottom, MaterializationKind::Top) => {
+            (is_subtype_of(base_bottom, derived_bottom)
+                .and(db, || is_subtype_of(derived_bottom, base_top)))
+            .or(db, || {
+                is_subtype_of(base_bottom, derived_top)
+                    .and(db, || is_subtype_of(derived_top, base_top))
+            })
+            .or(db, || {
+                is_subtype_of(base_top, derived_top)
+                    .and(db, || is_subtype_of(derived_bottom, base_top))
+            })
+        }
+        // A top materialization is a subtype of a bottom materialization only if both original
+        // un-materialized types are the same fully static type.
+        (MaterializationKind::Top, MaterializationKind::Bottom) => {
+            is_subtype_of(derived_top, base_bottom)
+                .and(db, || is_subtype_of(base_top, derived_bottom))
+        }
+    }
+}
+
+/// Whether two types encountered in an invariant position
+/// have a relation (subtyping or assignability), taking into account
+/// that the two types may come from a top or bottom materialization.
+#[expect(clippy::too_many_arguments)]
+fn has_relation_in_invariant_position<'db>(
+    db: &'db dyn Db,
+    derived_type: &Type<'db>,
+    derived_materialization: Option<MaterializationKind>,
+    base_type: &Type<'db>,
+    base_materialization: Option<MaterializationKind>,
+    inferable: InferableTypeVars<'_, 'db>,
+    relation: TypeRelation,
+    relation_visitor: &HasRelationToVisitor<'db>,
+    disjointness_visitor: &IsDisjointVisitor<'db>,
+) -> ConstraintSet<'db> {
+    match (derived_materialization, base_materialization, relation) {
+        // Top and bottom materializations are fully static types, so subtyping
+        // is the same as assignability.
+        (Some(derived_mat), Some(base_mat), _) => is_subtype_in_invariant_position(
+            db,
+            derived_type,
+            derived_mat,
+            base_type,
+            base_mat,
+            inferable,
+            relation_visitor,
+            disjointness_visitor,
+        ),
+        // Subtyping between invariant type parameters without a top/bottom materialization necessitates
+        // checking the subtyping relation both ways: `A` must be a subtype of `B` *and* `B` must be a
+        // subtype of `A`. The same applies to assignability.
+        //
+        // For subtyping between fully static types, this is the same as equivalence. However, we cannot
+        // use `is_equivalent_to` (or `when_equivalent_to`) here, because we (correctly) understand
+        // `list[Any]` as being equivalent to `list[Any]`, but we don't want `list[Any]` to be
+        // considered a subtype of `list[Any]`. For assignability, we would have the opposite issue if
+        // we simply checked for equivalence here: `Foo[Any]` should be considered assignable to
+        // `Foo[list[Any]]` even if `Foo` is invariant, and even though `Any` is not equivalent to
+        // `list[Any]`, because `Any` is assignable to `list[Any]` and `list[Any]` is assignable to
+        // `Any`.
+        (None, None, relation) => derived_type
+            .has_relation_to_impl(
+                db,
+                *base_type,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            )
+            .and(db, || {
+                base_type.has_relation_to_impl(
+                    db,
+                    *derived_type,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }),
+        // For gradual types, A <: B (subtyping) is defined as Top[A] <: Bottom[B]
+        (None, Some(base_mat), TypeRelation::Subtyping | TypeRelation::Redundancy) => {
+            is_subtype_in_invariant_position(
+                db,
+                derived_type,
+                MaterializationKind::Top,
+                base_type,
+                base_mat,
+                inferable,
+                relation_visitor,
+                disjointness_visitor,
+            )
+        }
+        (Some(derived_mat), None, TypeRelation::Subtyping | TypeRelation::Redundancy) => {
+            is_subtype_in_invariant_position(
+                db,
+                derived_type,
+                derived_mat,
+                base_type,
+                MaterializationKind::Bottom,
+                inferable,
+                relation_visitor,
+                disjointness_visitor,
+            )
+        }
+        // And A <~ B (assignability) is Bottom[A] <: Top[B]
+        (None, Some(base_mat), TypeRelation::Assignability) => is_subtype_in_invariant_position(
+            db,
+            derived_type,
+            MaterializationKind::Bottom,
+            base_type,
+            base_mat,
+            inferable,
+            relation_visitor,
+            disjointness_visitor,
+        ),
+        (Some(derived_mat), None, TypeRelation::Assignability) => is_subtype_in_invariant_position(
+            db,
+            derived_type,
+            derived_mat,
+            base_type,
+            MaterializationKind::Top,
+            inferable,
+            relation_visitor,
+            disjointness_visitor,
+        ),
+    }
+}
+
 impl<'db> Specialization<'db> {
+    /// Restricts this specialization to only include the typevars in a generic context. If the
+    /// specialization does not include all of those typevars, returns `None`.
+    pub(crate) fn restrict(
+        self,
+        db: &'db dyn Db,
+        generic_context: GenericContext<'db>,
+    ) -> Option<Self> {
+        let self_variables = self.generic_context(db).variables_inner(db);
+        let self_types = self.types(db);
+        let restricted_variables = generic_context.variables(db);
+        let restricted_types: Option<Box<[_]>> = restricted_variables
+            .map(|variable| {
+                let index = self_variables.get_index_of(&variable.identity(db))?;
+                self_types.get(index).copied()
+            })
+            .collect();
+        Some(Self::new(
+            db,
+            generic_context,
+            restricted_types?,
+            self.materialization_kind(db),
+            None,
+        ))
+    }
+
     /// Returns the tuple spec for a specialization of the `tuple` class.
     pub(crate) fn tuple(self, db: &'db dyn Db) -> Option<&'db TupleSpec<'db>> {
         self.tuple_inner(db).map(|tuple_type| tuple_type.tuple(db))
@@ -444,8 +916,8 @@ impl<'db> Specialization<'db> {
     ) -> Option<Type<'db>> {
         let index = self
             .generic_context(db)
-            .variables(db)
-            .get_index_of(&bound_typevar)?;
+            .variables_inner(db)
+            .get_index_of(&bound_typevar.identity(db))?;
         self.types(db).get(index).copied()
     }
 
@@ -463,7 +935,15 @@ impl<'db> Specialization<'db> {
     /// That lets us produce the generic alias `A[int]`, which is the corresponding entry in the
     /// MRO of `B[int]`.
     pub(crate) fn apply_specialization(self, db: &'db dyn Db, other: Specialization<'db>) -> Self {
-        self.apply_type_mapping(db, &TypeMapping::Specialization(other))
+        let new_specialization = self.apply_type_mapping(db, &TypeMapping::Specialization(other));
+        match other.materialization_kind(db) {
+            None => new_specialization,
+            Some(materialization_kind) => new_specialization.materialize_impl(
+                db,
+                materialization_kind,
+                &ApplyTypeMappingVisitor::default(),
+            ),
+        }
     }
 
     pub(crate) fn apply_type_mapping<'a>(
@@ -471,24 +951,41 @@ impl<'db> Specialization<'db> {
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
     ) -> Self {
-        self.apply_type_mapping_impl(db, type_mapping, &TypeTransformer::default())
+        self.apply_type_mapping_impl(db, type_mapping, &[], &ApplyTypeMappingVisitor::default())
     }
 
     pub(crate) fn apply_type_mapping_impl<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: &[Type<'db>],
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
+        if let TypeMapping::Materialize(materialization_kind) = type_mapping {
+            return self.materialize_impl(db, *materialization_kind, visitor);
+        }
+
         let types: Box<[_]> = self
             .types(db)
             .iter()
-            .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, visitor))
+            .enumerate()
+            .map(|(i, ty)| {
+                let tcx = TypeContext::new(tcx.get(i).copied());
+                ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor)
+            })
             .collect();
-        let tuple_inner = self
-            .tuple_inner(db)
-            .and_then(|tuple| tuple.apply_type_mapping_impl(db, type_mapping, visitor));
-        Specialization::new(db, self.generic_context(db), types, tuple_inner)
+
+        let tuple_inner = self.tuple_inner(db).and_then(|tuple| {
+            tuple.apply_type_mapping_impl(db, type_mapping, TypeContext::default(), visitor)
+        });
+
+        Specialization::new(
+            db,
+            self.generic_context(db),
+            types,
+            self.materialization_kind(db),
+            tuple_inner,
+        )
     }
 
     /// Applies an optional specialization to this specialization.
@@ -526,7 +1023,8 @@ impl<'db> Specialization<'db> {
             })
             .collect();
         // TODO: Combine the tuple specs too
-        Specialization::new(db, self.generic_context(db), types, None)
+        // TODO(jelle): specialization type?
+        Specialization::new(db, self.generic_context(db), types, None, None)
     }
 
     pub(crate) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
@@ -539,55 +1037,112 @@ impl<'db> Specialization<'db> {
             .tuple_inner(db)
             .and_then(|tuple| tuple.normalized_impl(db, visitor));
         let context = self.generic_context(db).normalized_impl(db, visitor);
-        Self::new(db, context, types, tuple_inner)
+        Self::new(
+            db,
+            context,
+            types,
+            self.materialization_kind(db),
+            tuple_inner,
+        )
     }
 
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
+    pub(super) fn materialize_impl(
+        self,
+        db: &'db dyn Db,
+        materialization_kind: MaterializationKind,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
+        // The top and bottom materializations are fully static types already, so materializing them
+        // further does nothing.
+        if self.materialization_kind(db).is_some() {
+            return self;
+        }
+        let mut has_dynamic_invariant_typevar = false;
         let types: Box<[_]> = self
             .generic_context(db)
             .variables(db)
-            .into_iter()
             .zip(self.types(db))
             .map(|(bound_typevar, vartype)| {
-                let variance = bound_typevar.variance_with_polarity(db, variance);
-                vartype.materialize(db, variance)
+                match bound_typevar.variance(db) {
+                    TypeVarVariance::Bivariant => {
+                        // With bivariance, all specializations are subtypes of each other,
+                        // so any materialization is acceptable.
+                        vartype.materialize(db, MaterializationKind::Top, visitor)
+                    }
+                    TypeVarVariance::Covariant => {
+                        vartype.materialize(db, materialization_kind, visitor)
+                    }
+                    TypeVarVariance::Contravariant => {
+                        vartype.materialize(db, materialization_kind.flip(), visitor)
+                    }
+                    TypeVarVariance::Invariant => {
+                        let top_materialization =
+                            vartype.materialize(db, MaterializationKind::Top, visitor);
+                        if !vartype.is_equivalent_to(db, top_materialization) {
+                            has_dynamic_invariant_typevar = true;
+                        }
+                        *vartype
+                    }
+                }
             })
             .collect();
         let tuple_inner = self.tuple_inner(db).and_then(|tuple| {
             // Tuples are immutable, so tuple element types are always in covariant position.
-            tuple.materialize(db, variance)
+            tuple.apply_type_mapping_impl(
+                db,
+                &TypeMapping::Materialize(materialization_kind),
+                TypeContext::default(),
+                visitor,
+            )
         });
-        Specialization::new(db, self.generic_context(db), types, tuple_inner)
+        let new_materialization_kind = if has_dynamic_invariant_typevar {
+            Some(materialization_kind)
+        } else {
+            None
+        };
+        Specialization::new(
+            db,
+            self.generic_context(db),
+            types,
+            new_materialization_kind,
+            tuple_inner,
+        )
     }
 
     pub(crate) fn has_relation_to_impl(
         self,
         db: &'db dyn Db,
         other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         let generic_context = self.generic_context(db);
         if generic_context != other.generic_context(db) {
-            return false;
+            return ConstraintSet::from(false);
         }
 
         if let (Some(self_tuple), Some(other_tuple)) = (self.tuple_inner(db), other.tuple_inner(db))
         {
-            return self_tuple.has_relation_to_impl(db, other_tuple, relation, visitor);
+            return self_tuple.has_relation_to_impl(
+                db,
+                other_tuple,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            );
         }
 
-        for ((bound_typevar, self_type), other_type) in (generic_context.variables(db).into_iter())
+        let self_materialization_kind = self.materialization_kind(db);
+        let other_materialization_kind = other.materialization_kind(db);
+
+        let mut result = ConstraintSet::from(true);
+        for ((bound_typevar, self_type), other_type) in (generic_context.variables(db))
             .zip(self.types(db))
             .zip(other.types(db))
         {
-            if self_type.is_dynamic() || other_type.is_dynamic() {
-                match relation {
-                    TypeRelation::Assignability => continue,
-                    TypeRelation::Subtyping => return false,
-                }
-            }
-
             // Subtyping/assignability of each type in the specialization depends on the variance
             // of the corresponding typevar:
             //   - covariant: verify that self_type <: other_type
@@ -595,36 +1150,60 @@ impl<'db> Specialization<'db> {
             //   - invariant: verify that self_type <: other_type AND other_type <: self_type
             //   - bivariant: skip, can't make subtyping/assignability false
             let compatible = match bound_typevar.variance(db) {
-                TypeVarVariance::Invariant => match relation {
-                    TypeRelation::Subtyping => self_type.is_equivalent_to(db, *other_type),
-                    TypeRelation::Assignability => {
-                        self_type.is_assignable_to(db, *other_type)
-                            && other_type.is_assignable_to(db, *self_type)
-                    }
-                },
-                TypeVarVariance::Covariant => {
-                    self_type.has_relation_to_impl(db, *other_type, relation, visitor)
-                }
-                TypeVarVariance::Contravariant => {
-                    other_type.has_relation_to_impl(db, *self_type, relation, visitor)
-                }
-                TypeVarVariance::Bivariant => true,
+                TypeVarVariance::Invariant => has_relation_in_invariant_position(
+                    db,
+                    self_type,
+                    self_materialization_kind,
+                    other_type,
+                    other_materialization_kind,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
+                TypeVarVariance::Covariant => self_type.has_relation_to_impl(
+                    db,
+                    *other_type,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
+                TypeVarVariance::Contravariant => other_type.has_relation_to_impl(
+                    db,
+                    *self_type,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
+                TypeVarVariance::Bivariant => ConstraintSet::from(true),
             };
-            if !compatible {
-                return false;
+            if result.intersect(db, compatible).is_never_satisfied() {
+                return result;
             }
         }
 
-        true
+        result
     }
 
-    pub(crate) fn is_equivalent_to(self, db: &'db dyn Db, other: Specialization<'db>) -> bool {
+    pub(crate) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Specialization<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        if self.materialization_kind(db) != other.materialization_kind(db) {
+            return ConstraintSet::from(false);
+        }
         let generic_context = self.generic_context(db);
         if generic_context != other.generic_context(db) {
-            return false;
+            return ConstraintSet::from(false);
         }
 
-        for ((bound_typevar, self_type), other_type) in (generic_context.variables(db).into_iter())
+        let mut result = ConstraintSet::from(true);
+        for ((bound_typevar, self_type), other_type) in (generic_context.variables(db))
             .zip(self.types(db))
             .zip(other.types(db))
         {
@@ -637,39 +1216,63 @@ impl<'db> Specialization<'db> {
             let compatible = match bound_typevar.variance(db) {
                 TypeVarVariance::Invariant
                 | TypeVarVariance::Covariant
-                | TypeVarVariance::Contravariant => self_type.is_equivalent_to(db, *other_type),
-                TypeVarVariance::Bivariant => true,
+                | TypeVarVariance::Contravariant => {
+                    self_type.is_equivalent_to_impl(db, *other_type, inferable, visitor)
+                }
+                TypeVarVariance::Bivariant => ConstraintSet::from(true),
             };
-            if !compatible {
-                return false;
+            if result.intersect(db, compatible).is_never_satisfied() {
+                return result;
             }
         }
 
         match (self.tuple_inner(db), other.tuple_inner(db)) {
-            (Some(_), None) | (None, Some(_)) => return false,
+            (Some(_), None) | (None, Some(_)) => return ConstraintSet::from(false),
             (None, None) => {}
             (Some(self_tuple), Some(other_tuple)) => {
-                if !self_tuple.is_equivalent_to(db, other_tuple) {
-                    return false;
+                let compatible =
+                    self_tuple.is_equivalent_to_impl(db, other_tuple, inferable, visitor);
+                if result.intersect(db, compatible).is_never_satisfied() {
+                    return result;
                 }
             }
         }
 
-        true
+        result
     }
 
-    pub(crate) fn find_legacy_typevars(
+    pub(crate) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         for ty in self.types(db) {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
         // A tuple's specialization will include all of its element types, so we don't need to also
         // look in `self.tuple`.
     }
+
+    /// Returns a copy of this specialization with the type at a given index replaced.
+    pub(crate) fn with_replaced_type(
+        self,
+        db: &'db dyn Db,
+        index: usize,
+        new_type: Type<'db>,
+    ) -> Self {
+        let mut new_types: Box<[_]> = self.types(db).to_vec().into_boxed_slice();
+        new_types[index] = new_type;
+
+        Self::new(
+            db,
+            self.generic_context(db),
+            new_types,
+            self.materialization_kind(db),
+            self.tuple_inner(db),
+        )
+    }
 }
 
 /// A mapping between type variables and types.
@@ -679,18 +1282,7 @@ impl<'db> Specialization<'db> {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, get_size2::GetSize)]
 pub struct PartialSpecialization<'a, 'db> {
     generic_context: GenericContext<'db>,
-    types: Cow<'a, [Type<'db>]>,
-}
-
-pub(super) fn walk_partial_specialization<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
-    db: &'db dyn Db,
-    specialization: &PartialSpecialization<'_, 'db>,
-    visitor: &V,
-) {
-    walk_generic_context(db, specialization.generic_context, visitor);
-    for ty in &*specialization.types {
-        visitor.visit_type(db, *ty);
-    }
+    types: &'a [Type<'db>],
 }
 
 impl<'db> PartialSpecialization<'_, 'db> {
@@ -703,64 +1295,62 @@ impl<'db> PartialSpecialization<'_, 'db> {
     ) -> Option<Type<'db>> {
         let index = self
             .generic_context
-            .variables(db)
-            .get_index_of(&bound_typevar)?;
+            .variables_inner(db)
+            .get_index_of(&bound_typevar.identity(db))?;
         self.types.get(index).copied()
     }
-
-    pub(crate) fn to_owned(&self) -> PartialSpecialization<'db, 'db> {
-        PartialSpecialization {
-            generic_context: self.generic_context,
-            types: Cow::from(self.types.clone().into_owned()),
-        }
-    }
-
-    pub(crate) fn normalized_impl(
-        &self,
-        db: &'db dyn Db,
-        visitor: &NormalizedVisitor<'db>,
-    ) -> PartialSpecialization<'db, 'db> {
-        let generic_context = self.generic_context.normalized_impl(db, visitor);
-        let types: Cow<_> = self
-            .types
-            .iter()
-            .map(|ty| ty.normalized_impl(db, visitor))
-            .collect();
-
-        PartialSpecialization {
-            generic_context,
-            types,
-        }
-    }
 }
 
 /// Performs type inference between parameter annotations and argument types, producing a
 /// specialization of a generic function.
 pub(crate) struct SpecializationBuilder<'db> {
     db: &'db dyn Db,
-    types: FxHashMap<BoundTypeVarInstance<'db>, Type<'db>>,
+    inferable: InferableTypeVars<'db, 'db>,
+    types: FxHashMap<BoundTypeVarIdentity<'db>, Type<'db>>,
 }
 
 impl<'db> SpecializationBuilder<'db> {
-    pub(crate) fn new(db: &'db dyn Db) -> Self {
+    pub(crate) fn new(db: &'db dyn Db, inferable: InferableTypeVars<'db, 'db>) -> Self {
         Self {
             db,
+            inferable,
             types: FxHashMap::default(),
         }
     }
 
-    pub(crate) fn build(&mut self, generic_context: GenericContext<'db>) -> Specialization<'db> {
-        let types = generic_context
-            .variables(self.db)
-            .iter()
-            .map(|variable| self.types.get(variable).copied());
+    pub(crate) fn build(
+        &mut self,
+        generic_context: GenericContext<'db>,
+        tcx: TypeContext<'db>,
+    ) -> Specialization<'db> {
+        let tcx_specialization = tcx
+            .annotation
+            .and_then(|annotation| annotation.specialization_of(self.db, None));
+
+        let types =
+            (generic_context.variables_inner(self.db).iter()).map(|(identity, variable)| {
+                let mut ty = self.types.get(identity).copied();
+
+                // When inferring a specialization for a generic class typevar from a constructor call,
+                // promote any typevars that are inferred as a literal to the corresponding instance type.
+                if variable.should_promote_literals {
+                    let tcx = tcx_specialization.and_then(|specialization| {
+                        specialization.get(self.db, variable.bound_typevar)
+                    });
+
+                    ty = ty.map(|ty| ty.promote_literals(self.db, TypeContext::new(tcx)));
+                }
+
+                ty
+            });
+
         // TODO Infer the tuple spec for a tuple type
         generic_context.specialize_partial(self.db, types)
     }
 
     fn add_type_mapping(&mut self, bound_typevar: BoundTypeVarInstance<'db>, ty: Type<'db>) {
         self.types
-            .entry(bound_typevar)
+            .entry(bound_typevar.identity(self.db))
             .and_modify(|existing| {
                 *existing = UnionType::from_elements(self.db, [*existing, ty]);
             })
@@ -794,31 +1384,73 @@ impl<'db> SpecializationBuilder<'db> {
         // without specializing `T` to `None`.
         if !matches!(formal, Type::ProtocolInstance(_))
             && !actual.is_never()
-            && actual.is_subtype_of(self.db, formal)
+            && actual
+                .when_subtype_of(self.db, formal, self.inferable)
+                .is_always_satisfied()
         {
             return Ok(());
         }
 
+        // Remove the union elements that are not related to `formal`.
+        //
+        // For example, if `formal` is `list[T]` and `actual` is `list[int] | None`, we want to specialize `T`
+        // to `int`.
+        let actual = actual.filter_disjoint_elements(self.db, formal, self.inferable);
+
         match (formal, actual) {
-            (Type::Union(formal), _) => {
-                // TODO: We haven't implemented a full unification solver yet. If typevars appear
-                // in multiple union elements, we ideally want to express that _only one_ of them
-                // needs to match, and that we should infer the smallest type mapping that allows
-                // that.
+            // TODO: We haven't implemented a full unification solver yet. If typevars appear in
+            // multiple union elements, we ideally want to express that _only one_ of them needs to
+            // match, and that we should infer the smallest type mapping that allows that.
+            //
+            // For now, we punt on fully handling multiple typevar elements. Instead, we handle two
+            // common cases specially:
+            (Type::Union(formal_union), Type::Union(actual_union)) => {
+                // First, if both formal and actual are unions, and precisely one formal union
+                // element _is_ a typevar (not _contains_ a typevar), then we remove any actual
+                // union elements that are a subtype of the formal (as a whole), and map the formal
+                // typevar to any remaining actual union elements.
                 //
-                // For now, we punt on handling multiple typevar elements. Instead, if _precisely
-                // one_ union element _is_ a typevar (not _contains_ a typevar), then we go ahead
-                // and add a mapping between that typevar and the actual type. (Note that we've
-                // already handled above the case where the actual is assignable to a _non-typevar_
-                // union element.)
-                let mut bound_typevars =
-                    formal.elements(self.db).iter().filter_map(|ty| match ty {
-                        Type::TypeVar(bound_typevar) => Some(*bound_typevar),
-                        _ => None,
-                    });
-                let bound_typevar = bound_typevars.next();
-                let additional_bound_typevars = bound_typevars.next();
-                if let (Some(bound_typevar), None) = (bound_typevar, additional_bound_typevars) {
+                // In particular, this handles cases like
+                //
+                // ```py
+                // def f[T](t: T | None) -> T: ...
+                // def g[T](t: T | int | None) -> T | int: ...
+                //
+                // def _(x: str | None):
+                //     reveal_type(f(x))  # revealed: str
+                //
+                // def _(y: str | int | None):
+                //     reveal_type(g(x))  # revealed: str | int
+                // ```
+                // We do not handle cases where the `formal` types contain other types that contain type variables
+                // to prevent incorrect specialization: e.g. `T = int | list[int]` for `formal: T | list[T], actual: int | list[int]`
+                // (the correct specialization is `T = int`).
+                let types_have_typevars = formal_union
+                    .elements(self.db)
+                    .iter()
+                    .filter(|ty| ty.has_typevar(self.db));
+                let Ok(Type::TypeVar(formal_bound_typevar)) = types_have_typevars.exactly_one()
+                else {
+                    return Ok(());
+                };
+                if (actual_union.elements(self.db).iter()).any(|ty| ty.is_type_var()) {
+                    return Ok(());
+                }
+                let remaining_actual =
+                    actual_union.filter(self.db, |ty| !ty.is_subtype_of(self.db, formal));
+                if remaining_actual.is_never() {
+                    return Ok(());
+                }
+                self.add_type_mapping(*formal_bound_typevar, remaining_actual);
+            }
+            (Type::Union(formal), _) => {
+                // Second, if the formal is a union, and precisely one union element _is_ a typevar (not
+                // _contains_ a typevar), then we add a mapping between that typevar and the actual
+                // type. (Note that we've already handled above the case where the actual is
+                // assignable to any _non-typevar_ union element.)
+                let bound_typevars =
+                    (formal.elements(self.db).iter()).filter_map(|ty| ty.as_typevar());
+                if let Ok(bound_typevar) = bound_typevars.exactly_one() {
                     self.add_type_mapping(bound_typevar, actual);
                 }
             }
@@ -833,10 +1465,15 @@ impl<'db> SpecializationBuilder<'db> {
                 }
             }
 
-            (Type::TypeVar(bound_typevar), ty) | (ty, Type::TypeVar(bound_typevar)) => {
+            (Type::TypeVar(bound_typevar), ty) | (ty, Type::TypeVar(bound_typevar))
+                if bound_typevar.is_inferable(self.db, self.inferable) =>
+            {
                 match bound_typevar.typevar(self.db).bound_or_constraints(self.db) {
                     Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
-                        if !ty.is_assignable_to(self.db, bound) {
+                        if !ty
+                            .when_assignable_to(self.db, bound, self.inferable)
+                            .is_always_satisfied()
+                        {
                             return Err(SpecializationError::MismatchedBound {
                                 bound_typevar,
                                 argument: ty,
@@ -846,7 +1483,10 @@ impl<'db> SpecializationBuilder<'db> {
                     }
                     Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
                         for constraint in constraints.elements(self.db) {
-                            if ty.is_assignable_to(self.db, *constraint) {
+                            if ty
+                                .when_assignable_to(self.db, *constraint, self.inferable)
+                                .is_always_satisfied()
+                            {
                                 self.add_type_mapping(bound_typevar, *constraint);
                                 return Ok(());
                             }
diff --git a/crates/ty_python_semantic/src/types/ide_support.rs b/crates/ty_python_semantic/src/types/ide_support.rs
index f96401bd2f..331d89a412 100644
--- a/crates/ty_python_semantic/src/types/ide_support.rs
+++ b/crates/ty_python_semantic/src/types/ide_support.rs
@@ -12,7 +12,10 @@ use crate::semantic_index::{
 };
 use crate::types::call::{CallArguments, MatchedArgument};
 use crate::types::signatures::Signature;
-use crate::types::{ClassBase, ClassLiteral, DynamicType, KnownClass, KnownInstanceType, Type};
+use crate::types::{
+    ClassBase, ClassLiteral, DynamicType, KnownClass, KnownInstanceType, Type, TypeContext,
+    TypeVarBoundOrConstraints, class::CodeGeneratorKind,
+};
 use crate::{Db, HasType, NameKind, SemanticModel};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
@@ -27,35 +30,55 @@ use resolve_definition::{find_symbol_in_scope, resolve_definition};
 pub(crate) fn all_declarations_and_bindings<'db>(
     db: &'db dyn Db,
     scope_id: ScopeId<'db>,
-) -> impl Iterator<Item = Member<'db>> + 'db {
+) -> impl Iterator<Item = MemberWithDefinition<'db>> + 'db {
     let use_def_map = use_def_map(db, scope_id);
     let table = place_table(db, scope_id);
 
     use_def_map
         .all_end_of_scope_symbol_declarations()
         .filter_map(move |(symbol_id, declarations)| {
-            place_from_declarations(db, declarations)
+            let place_result = place_from_declarations(db, declarations);
+            let definition = place_result.single_declaration;
+            place_result
                 .ignore_conflicting_declarations()
                 .place
-                .ignore_possibly_unbound()
+                .ignore_possibly_undefined()
                 .map(|ty| {
                     let symbol = table.symbol(symbol_id);
-                    Member {
+                    let member = Member {
                         name: symbol.name().clone(),
                         ty,
-                    }
+                    };
+                    MemberWithDefinition { member, definition }
                 })
         })
         .chain(use_def_map.all_end_of_scope_symbol_bindings().filter_map(
             move |(symbol_id, bindings)| {
+                // It's not clear to AG how to using a bindings
+                // iterator here to get the correct definition for
+                // this binding. Below, we look through all bindings
+                // with a definition and only take one if there is
+                // exactly one. I don't think this can be wrong, but
+                // it's probably omitting definitions in some cases.
+                let mut definition = None;
+                for binding in bindings.clone() {
+                    if let Some(def) = binding.binding.definition() {
+                        if definition.is_some() {
+                            definition = None;
+                            break;
+                        }
+                        definition = Some(def);
+                    }
+                }
                 place_from_bindings(db, bindings)
-                    .ignore_possibly_unbound()
+                    .ignore_possibly_undefined()
                     .map(|ty| {
                         let symbol = table.symbol(symbol_id);
-                        Member {
+                        let member = Member {
                             name: symbol.name().clone(),
                             ty,
-                        }
+                        };
+                        MemberWithDefinition { member, definition }
                     })
             },
         ))
@@ -95,8 +118,13 @@ impl<'db> AllMembers<'db> {
             ),
 
             Type::NominalInstance(instance) => {
-                let (class_literal, _specialization) = instance.class(db).class_literal(db);
+                let class_literal = instance.class_literal(db);
                 self.extend_with_instance_members(db, ty, class_literal);
+
+                // If this is a NamedTuple instance, include members from NamedTupleFallback
+                if CodeGeneratorKind::NamedTuple.matches(db, class_literal, None) {
+                    self.extend_with_type(db, KnownClass::NamedTupleFallback.to_class_literal(db));
+                }
             }
 
             Type::ClassLiteral(class_literal) if class_literal.is_typed_dict(db) => {
@@ -114,6 +142,10 @@ impl<'db> AllMembers<'db> {
             Type::ClassLiteral(class_literal) => {
                 self.extend_with_class_members(db, ty, class_literal);
 
+                if CodeGeneratorKind::NamedTuple.matches(db, class_literal, None) {
+                    self.extend_with_type(db, KnownClass::NamedTupleFallback.to_class_literal(db));
+                }
+
                 if let Type::ClassLiteral(meta_class_literal) = ty.to_meta_type(db) {
                     self.extend_with_class_members(db, ty, meta_class_literal);
                 }
@@ -121,12 +153,23 @@ impl<'db> AllMembers<'db> {
 
             Type::GenericAlias(generic_alias) => {
                 let class_literal = generic_alias.origin(db);
+                if CodeGeneratorKind::NamedTuple.matches(db, class_literal, None) {
+                    self.extend_with_type(db, KnownClass::NamedTupleFallback.to_class_literal(db));
+                }
                 self.extend_with_class_members(db, ty, class_literal);
             }
 
             Type::SubclassOf(subclass_of_type) => {
-                if let Some(class_literal) = subclass_of_type.subclass_of().into_class() {
-                    self.extend_with_class_members(db, ty, class_literal.class_literal(db).0);
+                if let Some(class_type) = subclass_of_type.subclass_of().into_class() {
+                    let class_literal = class_type.class_literal(db).0;
+                    self.extend_with_class_members(db, ty, class_literal);
+
+                    if CodeGeneratorKind::NamedTuple.matches(db, class_literal, None) {
+                        self.extend_with_type(
+                            db,
+                            KnownClass::NamedTupleFallback.to_class_literal(db),
+                        );
+                    }
                 }
             }
 
@@ -134,6 +177,29 @@ impl<'db> AllMembers<'db> {
 
             Type::TypeAlias(alias) => self.extend_with_type(db, alias.value_type(db)),
 
+            Type::TypeVar(bound_typevar) => {
+                match bound_typevar.typevar(db).bound_or_constraints(db) {
+                    None => {
+                        self.extend_with_type(db, Type::object());
+                    }
+                    Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
+                        self.extend_with_type(db, bound);
+                    }
+                    Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
+                        self.members.extend(
+                            constraints
+                                .elements(db)
+                                .iter()
+                                .map(|ty| AllMembers::of(db, *ty).members)
+                                .reduce(|acc, members| {
+                                    acc.intersection(&members).cloned().collect()
+                                })
+                                .unwrap_or_default(),
+                        );
+                    }
+                }
+            }
+
             Type::IntLiteral(_)
             | Type::BooleanLiteral(_)
             | Type::StringLiteral(_)
@@ -143,7 +209,7 @@ impl<'db> AllMembers<'db> {
             | Type::PropertyInstance(_)
             | Type::FunctionLiteral(_)
             | Type::BoundMethod(_)
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::WrapperDescriptor(_)
             | Type::DataclassDecorator(_)
             | Type::DataclassTransformer(_)
@@ -151,8 +217,6 @@ impl<'db> AllMembers<'db> {
             | Type::ProtocolInstance(_)
             | Type::SpecialForm(_)
             | Type::KnownInstance(_)
-            | Type::NonInferableTypeVar(_)
-            | Type::TypeVar(_)
             | Type::BoundSuper(_)
             | Type::TypeIs(_) => match ty.to_meta_type(db) {
                 Type::ClassLiteral(class_literal) => {
@@ -196,7 +260,8 @@ impl<'db> AllMembers<'db> {
 
                 for (symbol_id, _) in use_def_map.all_end_of_scope_symbol_declarations() {
                     let symbol_name = place_table.symbol(symbol_id).name();
-                    let Place::Type(ty, _) = imported_symbol(db, file, symbol_name, None).place
+                    let Place::Defined(ty, _, _) =
+                        imported_symbol(db, file, symbol_name, None).place
                     else {
                         continue;
                     };
@@ -211,7 +276,7 @@ impl<'db> AllMembers<'db> {
                         match ty {
                             Type::NominalInstance(instance)
                                 if matches!(
-                                    instance.class(db).known(db),
+                                    instance.known_class(db),
                                     Some(
                                         KnownClass::TypeVar
                                             | KnownClass::TypeVarTuple
@@ -282,12 +347,15 @@ impl<'db> AllMembers<'db> {
             .map(|class| class.class_literal(db).0)
         {
             let parent_scope = parent.body_scope(db);
-            for Member { name, .. } in all_declarations_and_bindings(db, parent_scope) {
-                let result = ty.member(db, name.as_str());
-                let Some(ty) = result.place.ignore_possibly_unbound() else {
+            for memberdef in all_declarations_and_bindings(db, parent_scope) {
+                let result = ty.member(db, memberdef.member.name.as_str());
+                let Some(ty) = result.place.ignore_possibly_undefined() else {
                     continue;
                 };
-                self.members.insert(Member { name, ty });
+                self.members.insert(Member {
+                    name: memberdef.member.name,
+                    ty,
+                });
             }
         }
     }
@@ -312,7 +380,7 @@ impl<'db> AllMembers<'db> {
                         continue;
                     };
                     let result = ty.member(db, name);
-                    let Some(ty) = result.place.ignore_possibly_unbound() else {
+                    let Some(ty) = result.place.ignore_possibly_undefined() else {
                         continue;
                     };
                     self.members.insert(Member {
@@ -327,17 +395,27 @@ impl<'db> AllMembers<'db> {
             // class member. This gets us the right type for each
             // member, e.g., `SomeClass.__delattr__` is not a bound
             // method, but `instance_of_SomeClass.__delattr__` is.
-            for Member { name, .. } in all_declarations_and_bindings(db, class_body_scope) {
-                let result = ty.member(db, name.as_str());
-                let Some(ty) = result.place.ignore_possibly_unbound() else {
+            for memberdef in all_declarations_and_bindings(db, class_body_scope) {
+                let result = ty.member(db, memberdef.member.name.as_str());
+                let Some(ty) = result.place.ignore_possibly_undefined() else {
                     continue;
                 };
-                self.members.insert(Member { name, ty });
+                self.members.insert(Member {
+                    name: memberdef.member.name,
+                    ty,
+                });
             }
         }
     }
 }
 
+/// A member of a type with an optional definition.
+#[derive(Clone, Debug)]
+pub struct MemberWithDefinition<'db> {
+    pub member: Member<'db>,
+    pub definition: Option<Definition<'db>>,
+}
+
 /// A member of a type.
 ///
 /// This represents a single item in (ideally) the list returned by
@@ -721,7 +799,7 @@ pub fn definitions_for_keyword_argument<'db>(
 
     let mut resolved_definitions = Vec::new();
 
-    if let Some(Type::Callable(callable_type)) = func_type.into_callable(db) {
+    if let Some(Type::Callable(callable_type)) = func_type.try_upcast_to_callable(db) {
         let signatures = callable_type.signatures(db);
 
         // For each signature, find the parameter with the matching name
@@ -801,7 +879,7 @@ pub struct CallSignatureDetails<'db> {
 
     /// Mapping from argument indices to parameter indices. This helps
     /// determine which parameter corresponds to which argument position.
-    pub argument_to_parameter_mapping: Vec<MatchedArgument>,
+    pub argument_to_parameter_mapping: Vec<MatchedArgument<'db>>,
 }
 
 /// Extract signature details from a function call expression.
@@ -816,30 +894,33 @@ pub fn call_signature_details<'db>(
     let func_type = call_expr.func.inferred_type(model);
 
     // Use into_callable to handle all the complex type conversions
-    if let Some(callable_type) = func_type.into_callable(db) {
+    if let Some(callable_type) = func_type.try_upcast_to_callable(db) {
         let call_arguments =
-            CallArguments::from_arguments(db, &call_expr.arguments, |_, splatted_value| {
+            CallArguments::from_arguments(&call_expr.arguments, |_, splatted_value| {
                 splatted_value.inferred_type(model)
             });
-        let bindings = callable_type.bindings(db).match_parameters(&call_arguments);
+        let bindings = callable_type
+            .bindings(db)
+            .match_parameters(db, &call_arguments);
 
         // Extract signature details from all callable bindings
         bindings
             .into_iter()
             .flat_map(std::iter::IntoIterator::into_iter)
             .map(|binding| {
-                let signature = &binding.signature;
+                let argument_to_parameter_mapping = binding.argument_matches().to_vec();
+                let signature = binding.signature;
                 let display_details = signature.display(db).to_string_parts();
-                let parameter_label_offsets = display_details.parameter_ranges.clone();
-                let parameter_names = display_details.parameter_names.clone();
+                let parameter_label_offsets = display_details.parameter_ranges;
+                let parameter_names = display_details.parameter_names;
 
                 CallSignatureDetails {
-                    signature: signature.clone(),
+                    definition: signature.definition(),
+                    signature,
                     label: display_details.label,
                     parameter_label_offsets,
                     parameter_names,
-                    definition: signature.definition(),
-                    argument_to_parameter_mapping: binding.argument_matches().to_vec(),
+                    argument_to_parameter_mapping,
                 }
             })
             .collect()
@@ -849,6 +930,91 @@ pub fn call_signature_details<'db>(
     }
 }
 
+/// Returns the definitions of the binary operation along with its callable type.
+pub fn definitions_for_bin_op<'db>(
+    db: &'db dyn Db,
+    model: &SemanticModel<'db>,
+    binary_op: &ast::ExprBinOp,
+) -> Option<(Vec<ResolvedDefinition<'db>>, Type<'db>)> {
+    let left_ty = binary_op.left.inferred_type(model);
+    let right_ty = binary_op.right.inferred_type(model);
+
+    let Ok(bindings) = Type::try_call_bin_op(db, left_ty, binary_op.op, right_ty) else {
+        return None;
+    };
+
+    let callable_type = promote_literals_for_self(db, bindings.callable_type());
+
+    let definitions: Vec<_> = bindings
+        .into_iter()
+        .flat_map(std::iter::IntoIterator::into_iter)
+        .filter_map(|binding| {
+            Some(ResolvedDefinition::Definition(
+                binding.signature.definition?,
+            ))
+        })
+        .collect();
+
+    Some((definitions, callable_type))
+}
+
+/// Returns the definitions for an unary operator along with their callable types.
+pub fn definitions_for_unary_op<'db>(
+    db: &'db dyn Db,
+    model: &SemanticModel<'db>,
+    unary_op: &ast::ExprUnaryOp,
+) -> Option<(Vec<ResolvedDefinition<'db>>, Type<'db>)> {
+    let operand_ty = unary_op.operand.inferred_type(model);
+
+    let unary_dunder_method = match unary_op.op {
+        ast::UnaryOp::Invert => "__invert__",
+        ast::UnaryOp::UAdd => "__pos__",
+        ast::UnaryOp::USub => "__neg__",
+        ast::UnaryOp::Not => "__bool__",
+    };
+
+    let Ok(bindings) = operand_ty.try_call_dunder(
+        db,
+        unary_dunder_method,
+        CallArguments::none(),
+        TypeContext::default(),
+    ) else {
+        return None;
+    };
+
+    let callable_type = promote_literals_for_self(db, bindings.callable_type());
+
+    let definitions = bindings
+        .into_iter()
+        .flat_map(std::iter::IntoIterator::into_iter)
+        .filter_map(|binding| {
+            Some(ResolvedDefinition::Definition(
+                binding.signature.definition?,
+            ))
+        })
+        .collect();
+
+    Some((definitions, callable_type))
+}
+
+/// Promotes literal types in `self` positions to their fallback instance types.
+///
+/// This is so that we show e.g. `int.__add__` instead of `Literal[4].__add__`.
+fn promote_literals_for_self<'db>(db: &'db dyn Db, ty: Type<'db>) -> Type<'db> {
+    match ty {
+        Type::BoundMethod(method) => Type::BoundMethod(method.map_self_type(db, |self_ty| {
+            self_ty.literal_fallback_instance(db).unwrap_or(self_ty)
+        })),
+        Type::Union(elements) => elements.map(db, |ty| match ty {
+            Type::BoundMethod(method) => Type::BoundMethod(method.map_self_type(db, |self_ty| {
+                self_ty.literal_fallback_instance(db).unwrap_or(self_ty)
+            })),
+            _ => *ty,
+        }),
+        ty => ty,
+    }
+}
+
 /// Find the active signature index from `CallSignatureDetails`.
 /// The active signature is the first signature where all arguments present in the call
 /// have valid mappings to parameters (i.e., none of the mappings are None).
@@ -972,8 +1138,10 @@ mod resolve_definition {
     }
 
     use indexmap::IndexSet;
-    use ruff_db::files::{File, FileRange};
+    use ruff_db::files::{File, FileRange, vendored_path_to_file};
     use ruff_db::parsed::{ParsedModuleRef, parsed_module};
+    use ruff_db::system::SystemPath;
+    use ruff_db::vendored::VendoredPathBuf;
     use ruff_python_ast as ast;
     use rustc_hash::FxHashSet;
     use tracing::trace;
@@ -1231,17 +1399,42 @@ mod resolve_definition {
     pub fn map_stub_definition<'db>(
         db: &'db dyn Db,
         def: &ResolvedDefinition<'db>,
+        cached_vendored_typeshed: Option<&SystemPath>,
     ) -> Option<Vec<ResolvedDefinition<'db>>> {
-        trace!("Stub mapping definition...");
         // If the file isn't a stub, this is presumably the real definition
         let stub_file = def.file(db);
+        trace!("Stub mapping definition in: {}", stub_file.path(db));
         if !stub_file.is_stub(db) {
             trace!("File isn't a stub, no stub mapping to do");
             return None;
         }
 
+        // We write vendored typeshed stubs to disk in the cache, and consequently "forget"
+        // that they're typeshed when an IDE hands those paths back to us later. For most
+        // purposes this seemingly doesn't matter at all, and avoids issues with someone
+        // editing the cache by hand in their IDE and us getting confused about the contents
+        // of the file (hello and welcome to anyone who has found Bigger Issues this causes).
+        //
+        // The major exception is in exactly stub-mapping, where we need to "remember" that
+        // we're in typeshed to successfully stub-map to the Real Stdlib. So here we attempt
+        // to do just that. The resulting file must not be used for anything other than
+        // this module lookup, as the `ResolvedDefinition` we're handling isn't for that file.
+        let mut stub_file_for_module_lookup = stub_file;
+        if let Some(vendored_typeshed) = cached_vendored_typeshed
+            && let Some(stub_path) = stub_file.path(db).as_system_path()
+            && let Ok(rel_path) = stub_path.strip_prefix(vendored_typeshed)
+            && let Ok(typeshed_file) =
+                vendored_path_to_file(db, VendoredPathBuf::from(rel_path.as_str()))
+        {
+            trace!(
+                "Stub is cached vendored typeshed: {}",
+                typeshed_file.path(db)
+            );
+            stub_file_for_module_lookup = typeshed_file;
+        }
+
         // It's definitely a stub, so now rerun module resolution but with stubs disabled.
-        let stub_module = file_to_module(db, stub_file)?;
+        let stub_module = file_to_module(db, stub_file_for_module_lookup)?;
         trace!("Found stub module: {}", stub_module.name(db));
         let real_module = resolve_real_module(db, stub_module.name(db))?;
         trace!("Found real module: {}", real_module.name(db));
diff --git a/crates/ty_python_semantic/src/types/infer.rs b/crates/ty_python_semantic/src/types/infer.rs
index 07f82a7329..d244597e16 100644
--- a/crates/ty_python_semantic/src/types/infer.rs
+++ b/crates/ty_python_semantic/src/types/infer.rs
@@ -36,106 +36,38 @@
 //! of iterations, so if we fail to converge, Salsa will eventually panic. (This should of course
 //! be considered a bug.)
 
-use itertools::{Either, Itertools};
-use ruff_db::diagnostic::{Annotation, DiagnosticId, Severity};
-use ruff_db::files::File;
 use ruff_db::parsed::{ParsedModuleRef, parsed_module};
-use ruff_python_ast::visitor::{Visitor, walk_expr};
-use ruff_python_ast::{self as ast, AnyNodeRef, ExprContext, PythonVersion};
-use ruff_python_stdlib::builtins::version_builtin_was_added;
-use ruff_text_size::{Ranged, TextRange};
-use rustc_hash::{FxHashMap, FxHashSet};
+use ruff_python_ast as ast;
+use ruff_text_size::Ranged;
+use rustc_hash::FxHashMap;
 use salsa;
 use salsa::plumbing::AsId;
 
-use super::context::{InNoTypeCheck, InferContext};
-use super::diagnostic::{
-    INVALID_METACLASS, INVALID_OVERLOAD, INVALID_PROTOCOL, SUBCLASS_OF_FINAL_CLASS,
-    hint_if_stdlib_submodule_exists_on_other_versions, report_attempted_protocol_instantiation,
-    report_duplicate_bases, report_index_out_of_bounds, report_invalid_exception_caught,
-    report_invalid_exception_cause, report_invalid_exception_raised,
-    report_invalid_or_unsupported_base, report_invalid_type_checking_constant,
-    report_non_subscriptable, report_possibly_unresolved_reference, report_slice_step_size_zero,
-};
-use super::generics::LegacyGenericBase;
-use super::string_annotation::{
-    BYTE_STRING_TYPE_ANNOTATION, FSTRING_TYPE_ANNOTATION, parse_string_annotation,
-};
-use super::subclass_of::SubclassOfInner;
-use super::{ClassBase, add_inferred_python_version_hint_to_diagnostic};
-use crate::module_name::{ModuleName, ModuleNameResolutionError};
-use crate::module_resolver::{KnownModule, file_to_module, resolve_module};
-use crate::node_key::NodeKey;
-use crate::place::{
-    Boundness, ConsideredDefinitions, LookupError, Place, PlaceAndQualifiers,
-    builtins_module_scope, builtins_symbol, explicit_global_symbol, global_symbol,
-    module_type_implicit_global_declaration, module_type_implicit_global_symbol, place,
-    place_from_bindings, place_from_declarations, typing_extensions_symbol,
-};
+use crate::Db;
 use crate::semantic_index::ast_ids::node_key::ExpressionNodeKey;
-use crate::semantic_index::ast_ids::{HasScopedUseId, ScopedUseId};
-use crate::semantic_index::definition::{
-    AnnotatedAssignmentDefinitionKind, AssignmentDefinitionKind, ComprehensionDefinitionKind,
-    Definition, DefinitionKind, DefinitionNodeKey, DefinitionState, ExceptHandlerDefinitionKind,
-    ForStmtDefinitionKind, TargetKind, WithItemDefinitionKind,
-};
-use crate::semantic_index::expression::{Expression, ExpressionKind};
-use crate::semantic_index::narrowing_constraints::ConstraintKey;
-use crate::semantic_index::place::{PlaceExpr, PlaceExprRef};
-use crate::semantic_index::scope::{
-    FileScopeId, NodeWithScopeKind, NodeWithScopeRef, ScopeId, ScopeKind,
-};
-use crate::semantic_index::symbol::ScopedSymbolId;
-use crate::semantic_index::{
-    ApplicableConstraints, EnclosingSnapshotResult, SemanticIndex, place_table, semantic_index,
-};
-use crate::types::call::{Binding, Bindings, CallArguments, CallError, CallErrorKind};
-use crate::types::class::{CodeGeneratorKind, MetaclassErrorKind};
-use crate::types::diagnostic::{
-    self, CALL_NON_CALLABLE, CONFLICTING_DECLARATIONS, CONFLICTING_METACLASS,
-    CYCLIC_CLASS_DEFINITION, DIVISION_BY_ZERO, DUPLICATE_KW_ONLY, INCONSISTENT_MRO,
-    INVALID_ARGUMENT_TYPE, INVALID_ASSIGNMENT, INVALID_ATTRIBUTE_ACCESS, INVALID_BASE,
-    INVALID_DECLARATION, INVALID_GENERIC_CLASS, INVALID_KEY, INVALID_NAMED_TUPLE,
-    INVALID_PARAMETER_DEFAULT, INVALID_TYPE_FORM, INVALID_TYPE_GUARD_CALL,
-    INVALID_TYPE_VARIABLE_CONSTRAINTS, IncompatibleBases, POSSIBLY_UNBOUND_IMPLICIT_CALL,
-    POSSIBLY_UNBOUND_IMPORT, TypeCheckDiagnostics, UNDEFINED_REVEAL, UNRESOLVED_ATTRIBUTE,
-    UNRESOLVED_GLOBAL, UNRESOLVED_IMPORT, UNRESOLVED_REFERENCE, UNSUPPORTED_OPERATOR,
-    report_implicit_return_type, report_instance_layout_conflict,
-    report_invalid_argument_number_to_special_form, report_invalid_arguments_to_annotated,
-    report_invalid_arguments_to_callable, report_invalid_assignment,
-    report_invalid_attribute_assignment, report_invalid_generator_function_return_type,
-    report_invalid_key_on_typed_dict, report_invalid_return_type,
-    report_namedtuple_field_without_default_after_field_with_default,
-    report_possibly_unbound_attribute,
-};
-use crate::types::enums::is_enum_class;
-use crate::types::function::{
-    FunctionDecorators, FunctionLiteral, FunctionType, KnownFunction, OverloadLiteral,
-};
-use crate::types::generics::{GenericContext, bind_typevar};
-use crate::types::instance::SliceLiteral;
-use crate::types::mro::MroErrorKind;
-use crate::types::signatures::{CallableSignature, Signature};
-use crate::types::tuple::{Tuple, TupleSpec, TupleSpecBuilder, TupleType};
+use crate::semantic_index::definition::Definition;
+use crate::semantic_index::expression::Expression;
+use crate::semantic_index::scope::ScopeId;
+use crate::semantic_index::{SemanticIndex, semantic_index};
+use crate::types::diagnostic::TypeCheckDiagnostics;
+use crate::types::function::FunctionType;
+use crate::types::generics::Specialization;
 use crate::types::unpacker::{UnpackResult, Unpacker};
-use crate::types::{
-    CallDunderError, CallableType, ClassLiteral, ClassType, DataclassParams, DynamicType,
-    IntersectionBuilder, IntersectionType, KnownClass, KnownInstanceType, LintDiagnosticGuard,
-    MemberLookupPolicy, MetaclassCandidate, PEP695TypeAliasType, Parameter, ParameterForm,
-    Parameters, SpecialFormType, SubclassOfType, Truthiness, Type, TypeAliasType,
-    TypeAndQualifiers, TypeIsType, TypeQualifiers, TypeVarBoundOrConstraintsEvaluation,
-    TypeVarDefaultEvaluation, TypeVarInstance, TypeVarKind, UnionBuilder, UnionType, binding_type,
-    todo_type,
-};
-use crate::unpack::{EvaluationMode, Unpack, UnpackPosition};
-use crate::util::diagnostics::format_enumeration;
-use crate::util::subscript::{PyIndex, PySlice};
-use crate::{Db, FxOrderSet, Program};
+use crate::types::{ClassLiteral, KnownClass, Truthiness, Type, TypeAndQualifiers};
+use crate::unpack::Unpack;
+use builder::TypeInferenceBuilder;
+
+mod builder;
+#[cfg(test)]
+mod tests;
+
+/// How many fixpoint iterations to allow before falling back to Divergent type.
+const ITERATIONS_BEFORE_FALLBACK: u32 = 10;
 
 /// Infer all types for a [`ScopeId`], including all definitions and expressions in that scope.
 /// Use when checking a scope, or needing to provide a type for an arbitrary expression in the
 /// scope.
-#[salsa::tracked(returns(ref), cycle_fn=scope_cycle_recover, cycle_initial=scope_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(ref), cycle_initial=scope_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(crate) fn infer_scope_types<'db>(db: &'db dyn Db, scope: ScopeId<'db>) -> ScopeInference<'db> {
     let file = scope.file(db);
     let _span = tracing::trace_span!("infer_scope_types", scope=?scope.as_id(), ?file).entered();
@@ -149,17 +81,8 @@ pub(crate) fn infer_scope_types<'db>(db: &'db dyn Db, scope: ScopeId<'db>) -> Sc
     TypeInferenceBuilder::new(db, InferenceRegion::Scope(scope), index, &module).finish_scope()
 }
 
-fn scope_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &ScopeInference<'db>,
-    _count: u32,
-    _scope: ScopeId<'db>,
-) -> salsa::CycleRecoveryAction<ScopeInference<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn scope_cycle_initial<'db>(_db: &'db dyn Db, scope: ScopeId<'db>) -> ScopeInference<'db> {
-    ScopeInference::cycle_fallback(scope)
+    ScopeInference::cycle_initial(scope)
 }
 
 /// Infer all types for a [`Definition`] (including sub-expressions).
@@ -185,26 +108,34 @@ pub(crate) fn infer_definition_types<'db>(
 }
 
 fn definition_cycle_recover<'db>(
-    _db: &'db dyn Db,
+    db: &'db dyn Db,
+    _id: salsa::Id,
+    _last_provisional_value: &DefinitionInference<'db>,
     _value: &DefinitionInference<'db>,
-    _count: u32,
-    _definition: Definition<'db>,
+    count: u32,
+    definition: Definition<'db>,
 ) -> salsa::CycleRecoveryAction<DefinitionInference<'db>> {
-    salsa::CycleRecoveryAction::Iterate
+    if count == ITERATIONS_BEFORE_FALLBACK {
+        salsa::CycleRecoveryAction::Fallback(DefinitionInference::cycle_fallback(
+            definition.scope(db),
+        ))
+    } else {
+        salsa::CycleRecoveryAction::Iterate
+    }
 }
 
 fn definition_cycle_initial<'db>(
     db: &'db dyn Db,
     definition: Definition<'db>,
 ) -> DefinitionInference<'db> {
-    DefinitionInference::cycle_fallback(definition.scope(db))
+    DefinitionInference::cycle_initial(definition.scope(db))
 }
 
 /// Infer types for all deferred type expressions in a [`Definition`].
 ///
 /// Deferred expressions are type expressions (annotations, base classes, aliases...) in a stub
 /// file, or in a file with `from __future__ import annotations`, or stringified annotations.
-#[salsa::tracked(returns(ref), cycle_fn=deferred_cycle_recover, cycle_initial=deferred_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(ref), cycle_initial=deferred_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(crate) fn infer_deferred_types<'db>(
     db: &'db dyn Db,
     definition: Definition<'db>,
@@ -225,31 +156,32 @@ pub(crate) fn infer_deferred_types<'db>(
         .finish_definition()
 }
 
-fn deferred_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &DefinitionInference<'db>,
-    _count: u32,
-    _definition: Definition<'db>,
-) -> salsa::CycleRecoveryAction<DefinitionInference<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn deferred_cycle_initial<'db>(
     db: &'db dyn Db,
     definition: Definition<'db>,
 ) -> DefinitionInference<'db> {
-    DefinitionInference::cycle_fallback(definition.scope(db))
+    DefinitionInference::cycle_initial(definition.scope(db))
 }
 
 /// Infer all types for an [`Expression`] (including sub-expressions).
 /// Use rarely; only for cases where we'd otherwise risk double-inferring an expression: RHS of an
 /// assignment, which might be unpacking/multi-target and thus part of multiple definitions, or a
 /// type narrowing guard expression (e.g. if statement test node).
-#[salsa::tracked(returns(ref), cycle_fn=expression_cycle_recover, cycle_initial=expression_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(crate) fn infer_expression_types<'db>(
     db: &'db dyn Db,
     expression: Expression<'db>,
+    tcx: TypeContext<'db>,
+) -> &'db ExpressionInference<'db> {
+    infer_expression_types_impl(db, InferExpression::new(db, expression, tcx))
+}
+
+#[salsa::tracked(returns(ref), cycle_fn=expression_cycle_recover, cycle_initial=expression_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+fn infer_expression_types_impl<'db>(
+    db: &'db dyn Db,
+    input: InferExpression<'db>,
 ) -> ExpressionInference<'db> {
+    let (expression, tcx) = (input.expression(db), input.tcx(db));
+
     let file = expression.file(db);
     let module = parsed_module(db, file).load(db);
     let _span = tracing::trace_span!(
@@ -262,24 +194,55 @@ pub(crate) fn infer_expression_types<'db>(
 
     let index = semantic_index(db, file);
 
-    TypeInferenceBuilder::new(db, InferenceRegion::Expression(expression), index, &module)
-        .finish_expression()
+    TypeInferenceBuilder::new(
+        db,
+        InferenceRegion::Expression(expression, tcx),
+        index,
+        &module,
+    )
+    .finish_expression()
+}
+
+/// Infer the type of an expression in isolation.
+///
+/// The type returned by this function may be different than the type of the expression
+/// if it was inferred within its region, as it does not account for surrounding type context.
+/// This can be useful to re-infer the type of an expression for diagnostics.
+pub(crate) fn infer_isolated_expression<'db>(
+    db: &'db dyn Db,
+    scope: ScopeId<'db>,
+    expr: &ast::Expr,
+) -> Type<'db> {
+    let file = scope.file(db);
+    let module = parsed_module(db, file).load(db);
+    let index = semantic_index(db, file);
+
+    TypeInferenceBuilder::new(db, InferenceRegion::Scope(scope), index, &module)
+        .infer_isolated_expression(expr)
 }
 
 fn expression_cycle_recover<'db>(
-    _db: &'db dyn Db,
+    db: &'db dyn Db,
+    _id: salsa::Id,
+    _last_provisional_value: &ExpressionInference<'db>,
     _value: &ExpressionInference<'db>,
-    _count: u32,
-    _expression: Expression<'db>,
+    count: u32,
+    input: InferExpression<'db>,
 ) -> salsa::CycleRecoveryAction<ExpressionInference<'db>> {
-    salsa::CycleRecoveryAction::Iterate
+    if count == ITERATIONS_BEFORE_FALLBACK {
+        salsa::CycleRecoveryAction::Fallback(ExpressionInference::cycle_fallback(
+            input.expression(db).scope(db),
+        ))
+    } else {
+        salsa::CycleRecoveryAction::Iterate
+    }
 }
 
 fn expression_cycle_initial<'db>(
     db: &'db dyn Db,
-    expression: Expression<'db>,
+    input: InferExpression<'db>,
 ) -> ExpressionInference<'db> {
-    ExpressionInference::cycle_fallback(expression.scope(db))
+    ExpressionInference::cycle_initial(input.expression(db).scope(db))
 }
 
 /// Infers the type of an `expression` that is guaranteed to be in the same file as the calling query.
@@ -290,9 +253,10 @@ fn expression_cycle_initial<'db>(
 pub(super) fn infer_same_file_expression_type<'db>(
     db: &'db dyn Db,
     expression: Expression<'db>,
+    tcx: TypeContext<'db>,
     parsed: &ParsedModuleRef,
 ) -> Type<'db> {
-    let inference = infer_expression_types(db, expression);
+    let inference = infer_expression_types(db, expression, tcx);
     inference.expression_type(expression.node_ref(db, parsed))
 }
 
@@ -303,41 +267,150 @@ pub(super) fn infer_same_file_expression_type<'db>(
 ///
 /// Use [`infer_same_file_expression_type`] if it is guaranteed that  `expression` is in the same
 /// to avoid unnecessary salsa ingredients. This is normally the case inside the `TypeInferenceBuilder`.
-#[salsa::tracked(cycle_fn=single_expression_cycle_recover, cycle_initial=single_expression_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(crate) fn infer_expression_type<'db>(
     db: &'db dyn Db,
     expression: Expression<'db>,
+    tcx: TypeContext<'db>,
 ) -> Type<'db> {
-    let file = expression.file(db);
+    infer_expression_type_impl(db, InferExpression::new(db, expression, tcx))
+}
+
+#[salsa::tracked(cycle_initial=single_expression_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+fn infer_expression_type_impl<'db>(db: &'db dyn Db, input: InferExpression<'db>) -> Type<'db> {
+    let file = input.expression(db).file(db);
     let module = parsed_module(db, file).load(db);
 
     // It's okay to call the "same file" version here because we're inside a salsa query.
-    infer_same_file_expression_type(db, expression, &module)
-}
-
-fn single_expression_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Type<'db>,
-    _count: u32,
-    _expression: Expression<'db>,
-) -> salsa::CycleRecoveryAction<Type<'db>> {
-    salsa::CycleRecoveryAction::Iterate
+    let inference = infer_expression_types_impl(db, input);
+    inference.expression_type(input.expression(db).node_ref(db, &module))
 }
 
 fn single_expression_cycle_initial<'db>(
     _db: &'db dyn Db,
-    _expression: Expression<'db>,
+    _input: InferExpression<'db>,
 ) -> Type<'db> {
     Type::Never
 }
 
+/// An `Expression` with an optional `TypeContext`.
+///
+/// This is a Salsa supertype used as the input to `infer_expression_types` to avoid
+/// interning an `ExpressionWithContext` unnecessarily when no type context is provided.
+#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq, salsa::Supertype, salsa::Update)]
+enum InferExpression<'db> {
+    Bare(Expression<'db>),
+    WithContext(ExpressionWithContext<'db>),
+}
+
+impl<'db> InferExpression<'db> {
+    fn new(
+        db: &'db dyn Db,
+        expression: Expression<'db>,
+        tcx: TypeContext<'db>,
+    ) -> InferExpression<'db> {
+        if tcx.annotation.is_some() {
+            InferExpression::WithContext(ExpressionWithContext::new(db, expression, tcx))
+        } else {
+            // Drop the empty `TypeContext` to avoid the interning cost.
+            InferExpression::Bare(expression)
+        }
+    }
+
+    fn expression(self, db: &'db dyn Db) -> Expression<'db> {
+        match self {
+            InferExpression::Bare(expression) => expression,
+            InferExpression::WithContext(expression_with_context) => {
+                expression_with_context.expression(db)
+            }
+        }
+    }
+
+    fn tcx(self, db: &'db dyn Db) -> TypeContext<'db> {
+        match self {
+            InferExpression::Bare(_) => TypeContext::default(),
+            InferExpression::WithContext(expression_with_context) => {
+                expression_with_context.tcx(db)
+            }
+        }
+    }
+}
+
+/// An `Expression` with a `TypeContext`.
+#[salsa::interned(debug, heap_size=ruff_memory_usage::heap_size)]
+struct ExpressionWithContext<'db> {
+    expression: Expression<'db>,
+    tcx: TypeContext<'db>,
+}
+
+/// The type context for a given expression, namely the type annotation
+/// in an annotated assignment.
+///
+/// Knowing the outer type context when inferring an expression can enable
+/// more precise inference results, aka "bidirectional type inference".
+#[derive(Default, Copy, Clone, Debug, PartialEq, Eq, Hash, get_size2::GetSize)]
+pub(crate) struct TypeContext<'db> {
+    pub(crate) annotation: Option<Type<'db>>,
+}
+
+impl<'db> TypeContext<'db> {
+    pub(crate) fn new(annotation: Option<Type<'db>>) -> Self {
+        Self { annotation }
+    }
+
+    // If the type annotation is a specialized instance of the given `KnownClass`, returns the
+    // specialization.
+    fn known_specialization(
+        &self,
+        db: &'db dyn Db,
+        known_class: KnownClass,
+    ) -> Option<Specialization<'db>> {
+        self.annotation
+            .and_then(|ty| ty.known_specialization(db, known_class))
+    }
+
+    pub(crate) fn map(self, f: impl FnOnce(Type<'db>) -> Type<'db>) -> Self {
+        Self {
+            annotation: self.annotation.map(f),
+        }
+    }
+}
+
+/// Returns the statically-known truthiness of a given expression.
+///
+/// Returns [`Truthiness::Ambiguous`] in case any non-definitely bound places
+/// were encountered while inferring the type of the expression.
+#[salsa::tracked(cycle_initial=static_expression_truthiness_cycle_initial, heap_size=get_size2::GetSize::get_heap_size)]
+pub(crate) fn static_expression_truthiness<'db>(
+    db: &'db dyn Db,
+    expression: Expression<'db>,
+) -> Truthiness {
+    let inference = infer_expression_types_impl(db, InferExpression::Bare(expression));
+
+    if !inference.all_places_definitely_bound() {
+        return Truthiness::Ambiguous;
+    }
+
+    let file = expression.file(db);
+    let module = parsed_module(db, file).load(db);
+    let node = expression.node_ref(db, &module);
+
+    inference.expression_type(node).bool(db)
+}
+
+fn static_expression_truthiness_cycle_initial<'db>(
+    _db: &'db dyn Db,
+    _expression: Expression<'db>,
+) -> Truthiness {
+    Truthiness::Ambiguous
+}
+
 /// Infer the types for an [`Unpack`] operation.
 ///
 /// This infers the expression type and performs structural match against the target expression
 /// involved in an unpacking operation. It returns a result-like object that can be used to get the
 /// type of the variables involved in this unpacking along with any violations that are detected
 /// during this unpacking.
-#[salsa::tracked(returns(ref), cycle_fn=unpack_cycle_recover, cycle_initial=unpack_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(ref), cycle_initial=unpack_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 pub(super) fn infer_unpack_types<'db>(db: &'db dyn Db, unpack: Unpack<'db>) -> UnpackResult<'db> {
     let file = unpack.file(db);
     let module = parsed_module(db, file).load(db);
@@ -349,17 +422,8 @@ pub(super) fn infer_unpack_types<'db>(db: &'db dyn Db, unpack: Unpack<'db>) -> U
     unpacker.finish()
 }
 
-fn unpack_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &UnpackResult<'db>,
-    _count: u32,
-    _unpack: Unpack<'db>,
-) -> salsa::CycleRecoveryAction<UnpackResult<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn unpack_cycle_initial<'db>(_db: &'db dyn Db, _unpack: Unpack<'db>) -> UnpackResult<'db> {
-    UnpackResult::cycle_fallback(Type::Never)
+    UnpackResult::cycle_initial(Type::Never)
 }
 
 /// Returns the type of the nearest enclosing class for the given scope.
@@ -375,17 +439,40 @@ pub(crate) fn nearest_enclosing_class<'db>(
     db: &'db dyn Db,
     semantic: &SemanticIndex<'db>,
     scope: ScopeId,
-    parsed: &ParsedModuleRef,
 ) -> Option<ClassLiteral<'db>> {
     semantic
         .ancestor_scopes(scope.file_scope_id(db))
         .find_map(|(_, ancestor_scope)| {
-            let class = ancestor_scope.node().as_class(parsed)?;
+            let class = ancestor_scope.node().as_class()?;
             let definition = semantic.expect_single_definition(class);
             infer_definition_types(db, definition)
                 .declaration_type(definition)
                 .inner_type()
-                .into_class_literal()
+                .as_class_literal()
+        })
+}
+
+/// Returns the type of the nearest enclosing function for the given scope.
+///
+/// This function walks up the ancestor scopes starting from the given scope,
+/// and finds the closest (non-lambda) function definition.
+///
+/// Returns `None` if no enclosing function is found.
+pub(crate) fn nearest_enclosing_function<'db>(
+    db: &'db dyn Db,
+    semantic: &SemanticIndex<'db>,
+    scope: ScopeId,
+) -> Option<FunctionType<'db>> {
+    semantic
+        .ancestor_scopes(scope.file_scope_id(db))
+        .find_map(|(_, ancestor_scope)| {
+            let func = ancestor_scope.node().as_function()?;
+            let definition = semantic.expect_single_definition(func);
+            let inference = infer_definition_types(db, definition);
+            inference
+                .undecorated_type()
+                .unwrap_or_else(|| inference.declaration_type(definition).inner_type())
+                .as_function_literal()
         })
 }
 
@@ -393,7 +480,7 @@ pub(crate) fn nearest_enclosing_class<'db>(
 #[derive(Copy, Clone, Debug)]
 pub(crate) enum InferenceRegion<'db> {
     /// infer types for a standalone [`Expression`]
-    Expression(Expression<'db>),
+    Expression(Expression<'db>, TypeContext<'db>),
     /// infer types for a [`Definition`]
     Definition(Definition<'db>),
     /// infer deferred types for a [`Definition`]
@@ -405,7 +492,7 @@ pub(crate) enum InferenceRegion<'db> {
 impl<'db> InferenceRegion<'db> {
     fn scope(self, db: &'db dyn Db) -> ScopeId<'db> {
         match self {
-            InferenceRegion::Expression(expression) => expression.scope(db),
+            InferenceRegion::Expression(expression, _) => expression.scope(db),
             InferenceRegion::Definition(definition) | InferenceRegion::Deferred(definition) => {
                 definition.scope(db)
             }
@@ -414,10 +501,33 @@ impl<'db> InferenceRegion<'db> {
     }
 }
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-struct TypeAndRange<'db> {
-    ty: Type<'db>,
-    range: TextRange,
+#[derive(Debug, Clone, Copy, Eq, PartialEq, get_size2::GetSize, salsa::Update)]
+enum CycleRecovery<'db> {
+    /// An initial-value for fixpoint iteration; all types are `Type::Never`.
+    Initial,
+    /// A divergence-fallback value for fixpoint iteration; all types are `Divergent`.
+    Divergent(ScopeId<'db>),
+}
+
+impl<'db> CycleRecovery<'db> {
+    fn merge(self, other: Option<CycleRecovery<'db>>) -> Self {
+        if let Some(other) = other {
+            match (self, other) {
+                // It's important here that we keep the scope of `self` if merging two `Divergent`.
+                (Self::Divergent(scope), _) | (_, Self::Divergent(scope)) => Self::Divergent(scope),
+                _ => Self::Initial,
+            }
+        } else {
+            self
+        }
+    }
+
+    fn fallback_type(self) -> Type<'db> {
+        match self {
+            Self::Initial => Type::Never,
+            Self::Divergent(scope) => Type::divergent(Some(scope)),
+        }
+    }
 }
 
 /// The inferred types for a scope region.
@@ -427,27 +537,25 @@ pub(crate) struct ScopeInference<'db> {
     expressions: FxHashMap<ExpressionNodeKey, Type<'db>>,
 
     /// The extra data that is only present for few inference regions.
-    extra: Option<Box<ScopeInferenceExtra>>,
+    extra: Option<Box<ScopeInferenceExtra<'db>>>,
 }
 
 #[derive(Debug, Eq, PartialEq, get_size2::GetSize, salsa::Update, Default)]
-struct ScopeInferenceExtra {
-    /// The fallback type for missing expressions/bindings/declarations.
-    ///
-    /// This is used only when constructing a cycle-recovery `TypeInference`.
-    cycle_fallback: bool,
+struct ScopeInferenceExtra<'db> {
+    /// Is this a cycle-recovery inference result, and if so, what kind?
+    cycle_recovery: Option<CycleRecovery<'db>>,
 
     /// The diagnostics for this region.
     diagnostics: TypeCheckDiagnostics,
 }
 
 impl<'db> ScopeInference<'db> {
-    fn cycle_fallback(scope: ScopeId<'db>) -> Self {
+    fn cycle_initial(scope: ScopeId<'db>) -> Self {
         let _ = scope;
 
         Self {
             extra: Some(Box::new(ScopeInferenceExtra {
-                cycle_fallback: true,
+                cycle_recovery: Some(CycleRecovery::Initial),
                 ..ScopeInferenceExtra::default()
             })),
             expressions: FxHashMap::default(),
@@ -473,14 +581,10 @@ impl<'db> ScopeInference<'db> {
             .or_else(|| self.fallback_type())
     }
 
-    fn is_cycle_callback(&self) -> bool {
+    fn fallback_type(&self) -> Option<Type<'db>> {
         self.extra
             .as_ref()
-            .is_some_and(|extra| extra.cycle_fallback)
-    }
-
-    fn fallback_type(&self) -> Option<Type<'db>> {
-        self.is_cycle_callback().then_some(Type::Never)
+            .and_then(|extra| extra.cycle_recovery.map(CycleRecovery::fallback_type))
     }
 }
 
@@ -513,12 +617,10 @@ pub(crate) struct DefinitionInference<'db> {
 
 #[derive(Debug, Eq, PartialEq, get_size2::GetSize, salsa::Update, Default)]
 struct DefinitionInferenceExtra<'db> {
-    /// The fallback type for missing expressions/bindings/declarations.
-    ///
-    /// This is used only when constructing a cycle-recovery `TypeInference`.
-    cycle_fallback: bool,
+    /// Is this a cycle-recovery inference result, and if so, what kind?
+    cycle_recovery: Option<CycleRecovery<'db>>,
 
-    /// The definitions that are deferred.
+    /// The definitions that have some deferred parts.
     deferred: Box<[Definition<'db>]>,
 
     /// The diagnostics for this region.
@@ -529,6 +631,22 @@ struct DefinitionInferenceExtra<'db> {
 }
 
 impl<'db> DefinitionInference<'db> {
+    fn cycle_initial(scope: ScopeId<'db>) -> Self {
+        let _ = scope;
+
+        Self {
+            expressions: FxHashMap::default(),
+            bindings: Box::default(),
+            declarations: Box::default(),
+            #[cfg(debug_assertions)]
+            scope,
+            extra: Some(Box::new(DefinitionInferenceExtra {
+                cycle_recovery: Some(CycleRecovery::Initial),
+                ..DefinitionInferenceExtra::default()
+            })),
+        }
+    }
+
     fn cycle_fallback(scope: ScopeId<'db>) -> Self {
         let _ = scope;
 
@@ -539,7 +657,7 @@ impl<'db> DefinitionInference<'db> {
             #[cfg(debug_assertions)]
             scope,
             extra: Some(Box::new(DefinitionInferenceExtra {
-                cycle_fallback: true,
+                cycle_recovery: Some(CycleRecovery::Divergent(scope)),
                 ..DefinitionInferenceExtra::default()
             })),
         }
@@ -591,7 +709,7 @@ impl<'db> DefinitionInference<'db> {
                     None
                 }
             })
-            .or_else(|| self.fallback_type().map(Into::into))
+            .or_else(|| self.fallback_type().map(TypeAndQualifiers::declared))
             .expect(
                 "definition should belong to this TypeInference region and \
                 TypeInferenceBuilder should have inferred a type for it",
@@ -608,14 +726,10 @@ impl<'db> DefinitionInference<'db> {
         self.declarations.iter().map(|(_, qualifiers)| *qualifiers)
     }
 
-    fn is_cycle_callback(&self) -> bool {
+    fn fallback_type(&self) -> Option<Type<'db>> {
         self.extra
             .as_ref()
-            .is_some_and(|extra| extra.cycle_fallback)
-    }
-
-    fn fallback_type(&self) -> Option<Type<'db>> {
-        self.is_cycle_callback().then_some(Type::Never)
+            .and_then(|extra| extra.cycle_recovery.map(CycleRecovery::fallback_type))
     }
 
     pub(crate) fn undecorated_type(&self) -> Option<Type<'db>> {
@@ -647,18 +761,35 @@ struct ExpressionInferenceExtra<'db> {
     /// The diagnostics for this region.
     diagnostics: TypeCheckDiagnostics,
 
-    /// `true` if this region is part of a cycle-recovery `TypeInference`.
-    ///
-    /// Falls back to `Type::Never` if an expression is missing.
-    cycle_fallback: bool,
+    /// Is this a cycle recovery inference result, and if so, what kind?
+    cycle_recovery: Option<CycleRecovery<'db>>,
+
+    /// `true` if all places in this expression are definitely bound
+    all_definitely_bound: bool,
 }
 
 impl<'db> ExpressionInference<'db> {
+    fn cycle_initial(scope: ScopeId<'db>) -> Self {
+        let _ = scope;
+        Self {
+            extra: Some(Box::new(ExpressionInferenceExtra {
+                cycle_recovery: Some(CycleRecovery::Initial),
+                all_definitely_bound: true,
+                ..ExpressionInferenceExtra::default()
+            })),
+            expressions: FxHashMap::default(),
+
+            #[cfg(debug_assertions)]
+            scope,
+        }
+    }
+
     fn cycle_fallback(scope: ScopeId<'db>) -> Self {
         let _ = scope;
         Self {
             extra: Some(Box::new(ExpressionInferenceExtra {
-                cycle_fallback: true,
+                cycle_recovery: Some(CycleRecovery::Divergent(scope)),
+                all_definitely_bound: true,
                 ..ExpressionInferenceExtra::default()
             })),
             expressions: FxHashMap::default(),
@@ -683,11385 +814,17 @@ impl<'db> ExpressionInference<'db> {
             .unwrap_or_else(Type::unknown)
     }
 
-    fn is_cycle_callback(&self) -> bool {
+    fn fallback_type(&self) -> Option<Type<'db>> {
         self.extra
             .as_ref()
-            .is_some_and(|extra| extra.cycle_fallback)
+            .and_then(|extra| extra.cycle_recovery.map(CycleRecovery::fallback_type))
     }
 
-    fn fallback_type(&self) -> Option<Type<'db>> {
-        self.is_cycle_callback().then_some(Type::Never)
-    }
-}
-
-/// Whether the intersection type is on the left or right side of the comparison.
-#[derive(Debug, Clone, Copy)]
-enum IntersectionOn {
-    Left,
-    Right,
-}
-
-/// A helper to track if we already know that declared and inferred types are the same.
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum DeclaredAndInferredType<'db> {
-    /// We know that both the declared and inferred types are the same.
-    AreTheSame(TypeAndQualifiers<'db>),
-    /// Declared and inferred types might be different, we need to check assignability.
-    MightBeDifferent {
-        declared_ty: TypeAndQualifiers<'db>,
-        inferred_ty: Type<'db>,
-    },
-}
-
-impl<'db> DeclaredAndInferredType<'db> {
-    fn are_the_same_type(ty: Type<'db>) -> Self {
-        Self::AreTheSame(ty.into())
-    }
-}
-
-/// Builder to infer all types in a region.
-///
-/// A builder is used by creating it with [`new()`](TypeInferenceBuilder::new), and then calling
-/// [`finish_expression()`](TypeInferenceBuilder::finish_expression), [`finish_definition()`](TypeInferenceBuilder::finish_definition), or [`finish_scope()`](TypeInferenceBuilder::finish_scope) on it, which returns
-/// type inference result..
-///
-/// There are a few different kinds of methods in the type inference builder, and the naming
-/// distinctions are a bit subtle.
-///
-/// The `finish` methods call [`infer_region`](TypeInferenceBuilder::infer_region), which delegates
-/// to one of [`infer_region_scope`](TypeInferenceBuilder::infer_region_scope),
-/// [`infer_region_definition`](TypeInferenceBuilder::infer_region_definition), or
-/// [`infer_region_expression`](TypeInferenceBuilder::infer_region_expression), depending which
-/// kind of [`InferenceRegion`] we are inferring types for.
-///
-/// Scope inference starts with the scope body, walking all statements and expressions and
-/// recording the types of each expression in the inference result. Most of the methods
-/// here (with names like `infer_*_statement` or `infer_*_expression` or some other node kind) take
-/// a single AST node and are called as part of this AST visit.
-///
-/// When the visit encounters a node which creates a [`Definition`], we look up the definition in
-/// the semantic index and call the [`infer_definition_types()`] query on it, which creates another
-/// [`TypeInferenceBuilder`] just for that definition, and we merge the returned inference result
-/// into the one we are currently building for the entire scope. Using the query in this way
-/// ensures that if we first infer types for some scattered definitions in a scope, and later for
-/// the entire scope, we don't re-infer any types, we reuse the cached inference for those
-/// definitions and their sub-expressions.
-///
-/// Functions with a name like `infer_*_definition` take both a node and a [`Definition`], and are
-/// called by [`infer_region_definition`](TypeInferenceBuilder::infer_region_definition).
-///
-/// So for example we have both
-/// [`infer_function_definition_statement`](TypeInferenceBuilder::infer_function_definition_statement),
-/// which takes just the function AST node, and
-/// [`infer_function_definition`](TypeInferenceBuilder::infer_function_definition), which takes
-/// both the node and the [`Definition`] id. The former is called as part of walking the AST, and
-/// it just looks up the [`Definition`] for that function in the semantic index and calls
-/// [`infer_definition_types()`] on it, which will create a new [`TypeInferenceBuilder`] with
-/// [`InferenceRegion::Definition`], and in that builder
-/// [`infer_region_definition`](TypeInferenceBuilder::infer_region_definition) will call
-/// [`infer_function_definition`](TypeInferenceBuilder::infer_function_definition) to actually
-/// infer a type for the definition.
-///
-/// Similarly, when we encounter a standalone-inferable expression (right-hand side of an
-/// assignment, type narrowing guard), we use the [`infer_expression_types()`] query to ensure we
-/// don't infer its types more than once.
-pub(super) struct TypeInferenceBuilder<'db, 'ast> {
-    context: InferContext<'db, 'ast>,
-    index: &'db SemanticIndex<'db>,
-    region: InferenceRegion<'db>,
-
-    /// The types of every expression in this region.
-    expressions: FxHashMap<ExpressionNodeKey, Type<'db>>,
-
-    /// The scope this region is part of.
-    scope: ScopeId<'db>,
-
-    // bindings, declarations, and deferred can only exist in definition, or scope contexts.
-    /// The types of every binding in this region.
-    ///
-    /// The list should only contain one entry per binding at most.
-    bindings: VecMap<Definition<'db>, Type<'db>>,
-
-    /// The types and type qualifiers of every declaration in this region.
-    ///
-    /// The list should only contain one entry per declaration at most.
-    declarations: VecMap<Definition<'db>, TypeAndQualifiers<'db>>,
-
-    /// The definitions that are deferred.
-    ///
-    /// The list should only contain one entry per deferred.
-    deferred: VecSet<Definition<'db>>,
-
-    /// The returned types and their corresponding ranges of the region, if it is a function body.
-    return_types_and_ranges: Vec<TypeAndRange<'db>>,
-
-    /// A set of functions that have been defined **and** called in this region.
-    ///
-    /// This is a set because the same function could be called multiple times in the same region.
-    /// This is mainly used in [`check_overloaded_functions`] to check an overloaded function that
-    /// is shadowed by a function with the same name in this scope but has been called before. For
-    /// example:
-    ///
-    /// ```py
-    /// from typing import overload
-    ///
-    /// @overload
-    /// def foo() -> None: ...
-    /// @overload
-    /// def foo(x: int) -> int: ...
-    /// def foo(x: int | None) -> int | None: return x
-    ///
-    /// foo()  # An overloaded function that was defined in this scope have been called
-    ///
-    /// def foo(x: int) -> int:
-    ///     return x
-    /// ```
-    ///
-    /// [`check_overloaded_functions`]: TypeInferenceBuilder::check_overloaded_functions
-    called_functions: FxHashSet<FunctionType<'db>>,
-
-    /// Whether we are in a context that binds unbound typevars.
-    typevar_binding_context: Option<Definition<'db>>,
-
-    /// The deferred state of inferring types of certain expressions within the region.
-    ///
-    /// This is different from [`InferenceRegion::Deferred`] which works on the entire definition
-    /// while this is relevant for specific expressions within the region itself and is updated
-    /// during the inference process.
-    ///
-    /// For example, when inferring the types of an annotated assignment, the type of an annotation
-    /// expression could be deferred if the file has `from __future__ import annotations` import or
-    /// is a stub file but we're still in a non-deferred region.
-    deferred_state: DeferredExpressionState,
-
-    /// For function definitions, the undecorated type of the function.
-    undecorated_type: Option<Type<'db>>,
-
-    /// The fallback type for missing expressions/bindings/declarations.
-    ///
-    /// This is used only when constructing a cycle-recovery `TypeInference`.
-    cycle_fallback: bool,
-}
-
-impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
-    /// How big a string do we build before bailing?
-    ///
-    /// This is a fairly arbitrary number. It should be *far* more than enough
-    /// for most use cases, but we can reevaluate it later if useful.
-    const MAX_STRING_LITERAL_SIZE: usize = 4096;
-
-    /// Creates a new builder for inferring types in a region.
-    pub(super) fn new(
-        db: &'db dyn Db,
-        region: InferenceRegion<'db>,
-        index: &'db SemanticIndex<'db>,
-        module: &'ast ParsedModuleRef,
-    ) -> Self {
-        let scope = region.scope(db);
-
-        Self {
-            context: InferContext::new(db, scope, module),
-            index,
-            region,
-            return_types_and_ranges: vec![],
-            called_functions: FxHashSet::default(),
-            deferred_state: DeferredExpressionState::None,
-            scope,
-            expressions: FxHashMap::default(),
-            bindings: VecMap::default(),
-            declarations: VecMap::default(),
-            typevar_binding_context: None,
-            deferred: VecSet::default(),
-            undecorated_type: None,
-            cycle_fallback: false,
-        }
-    }
-
-    fn extend_definition(&mut self, inference: &DefinitionInference<'db>) {
-        #[cfg(debug_assertions)]
-        assert_eq!(self.scope, inference.scope);
-
-        self.expressions.extend(inference.expressions.iter());
-        self.declarations.extend(inference.declarations());
-
-        if !matches!(self.region, InferenceRegion::Scope(..)) {
-            self.bindings.extend(inference.bindings());
-        }
-
-        if let Some(extra) = &inference.extra {
-            self.cycle_fallback |= extra.cycle_fallback;
-            self.context.extend(&extra.diagnostics);
-            self.deferred.extend(extra.deferred.iter().copied());
-        }
-    }
-
-    fn extend_expression(&mut self, inference: &ExpressionInference<'db>) {
-        #[cfg(debug_assertions)]
-        assert_eq!(self.scope, inference.scope);
-
-        self.extend_expression_unchecked(inference);
-    }
-
-    fn extend_expression_unchecked(&mut self, inference: &ExpressionInference<'db>) {
-        self.expressions.extend(inference.expressions.iter());
-
-        if let Some(extra) = &inference.extra {
-            self.context.extend(&extra.diagnostics);
-            self.cycle_fallback |= extra.cycle_fallback;
-
-            if !matches!(self.region, InferenceRegion::Scope(..)) {
-                self.bindings.extend(extra.bindings.iter().copied());
-            }
-        }
-    }
-
-    fn file(&self) -> File {
-        self.context.file()
-    }
-
-    fn module(&self) -> &'ast ParsedModuleRef {
-        self.context.module()
-    }
-
-    fn db(&self) -> &'db dyn Db {
-        self.context.db()
-    }
-
-    fn scope(&self) -> ScopeId<'db> {
-        self.scope
-    }
-
-    /// Are we currently inferring types in file with deferred types?
-    /// This is true for stub files and files with `__future__.annotations`
-    fn defer_annotations(&self) -> bool {
-        self.index.has_future_annotations() || self.in_stub()
-    }
-
-    /// Are we currently inferring deferred types?
-    fn is_deferred(&self) -> bool {
-        matches!(self.region, InferenceRegion::Deferred(_)) || self.deferred_state.is_deferred()
-    }
-
-    /// Return the node key of the given AST node, or the key of the outermost enclosing string
-    /// literal, if the node originates from inside a stringified annotation.
-    fn enclosing_node_key(&self, node: AnyNodeRef<'_>) -> NodeKey {
-        match self.deferred_state {
-            DeferredExpressionState::InStringAnnotation(enclosing_node_key) => enclosing_node_key,
-            _ => NodeKey::from_node(node),
-        }
-    }
-
-    /// Check if a given AST node is reachable.
-    ///
-    /// Note that this only works if reachability is explicitly tracked for this specific
-    /// type of node (see `node_reachability` in the use-def map).
-    fn is_reachable<'a, N>(&self, node: N) -> bool
-    where
-        N: Into<AnyNodeRef<'a>>,
-    {
-        let file_scope_id = self.scope().file_scope_id(self.db());
-        self.index.is_node_reachable(
-            self.db(),
-            file_scope_id,
-            self.enclosing_node_key(node.into()),
-        )
-    }
-
-    fn in_stub(&self) -> bool {
-        self.context.in_stub()
-    }
-
-    /// Get the already-inferred type of an expression node, or Unknown.
-    fn expression_type(&self, expr: &ast::Expr) -> Type<'db> {
-        self.try_expression_type(expr).unwrap_or_else(Type::unknown)
-    }
-
-    fn try_expression_type(&self, expr: &ast::Expr) -> Option<Type<'db>> {
-        self.expressions
-            .get(&expr.into())
-            .copied()
-            .or(self.cycle_fallback.then_some(Type::Never))
-    }
-
-    /// Get the type of an expression from any scope in the same file.
-    ///
-    /// If the expression is in the current scope, and we are inferring the entire scope, just look
-    /// up the expression in our own results, otherwise call [`infer_scope_types()`] for the scope
-    /// of the expression.
-    ///
-    /// ## Panics
-    ///
-    /// If the expression is in the current scope but we haven't yet inferred a type for it.
-    ///
-    /// Can cause query cycles if the expression is from a different scope and type inference is
-    /// already in progress for that scope (further up the stack).
-    fn file_expression_type(&self, expression: &ast::Expr) -> Type<'db> {
-        let file_scope = self.index.expression_scope_id(expression);
-        let expr_scope = file_scope.to_scope_id(self.db(), self.file());
-        match self.region {
-            InferenceRegion::Scope(scope) if scope == expr_scope => {
-                self.expression_type(expression)
-            }
-            _ => infer_scope_types(self.db(), expr_scope).expression_type(expression),
-        }
-    }
-
-    /// Infers types in the given [`InferenceRegion`].
-    fn infer_region(&mut self) {
-        match self.region {
-            InferenceRegion::Scope(scope) => self.infer_region_scope(scope),
-            InferenceRegion::Definition(definition) => self.infer_region_definition(definition),
-            InferenceRegion::Deferred(definition) => self.infer_region_deferred(definition),
-            InferenceRegion::Expression(expression) => self.infer_region_expression(expression),
-        }
-    }
-
-    fn infer_region_scope(&mut self, scope: ScopeId<'db>) {
-        let node = scope.node(self.db());
-        match node {
-            NodeWithScopeKind::Module => {
-                self.infer_module(self.module().syntax());
-            }
-            NodeWithScopeKind::Function(function) => {
-                self.infer_function_body(function.node(self.module()));
-            }
-            NodeWithScopeKind::Lambda(lambda) => self.infer_lambda_body(lambda.node(self.module())),
-            NodeWithScopeKind::Class(class) => self.infer_class_body(class.node(self.module())),
-            NodeWithScopeKind::ClassTypeParameters(class) => {
-                self.infer_class_type_params(class.node(self.module()));
-            }
-            NodeWithScopeKind::FunctionTypeParameters(function) => {
-                self.infer_function_type_params(function.node(self.module()));
-            }
-            NodeWithScopeKind::TypeAliasTypeParameters(type_alias) => {
-                self.infer_type_alias_type_params(type_alias.node(self.module()));
-            }
-            NodeWithScopeKind::TypeAlias(type_alias) => {
-                self.infer_type_alias(type_alias.node(self.module()));
-            }
-            NodeWithScopeKind::ListComprehension(comprehension) => {
-                self.infer_list_comprehension_expression_scope(comprehension.node(self.module()));
-            }
-            NodeWithScopeKind::SetComprehension(comprehension) => {
-                self.infer_set_comprehension_expression_scope(comprehension.node(self.module()));
-            }
-            NodeWithScopeKind::DictComprehension(comprehension) => {
-                self.infer_dict_comprehension_expression_scope(comprehension.node(self.module()));
-            }
-            NodeWithScopeKind::GeneratorExpression(generator) => {
-                self.infer_generator_expression_scope(generator.node(self.module()));
-            }
-        }
-
-        // Infer the deferred types for the definitions here to consider the end-of-scope
-        // semantics.
-        for definition in std::mem::take(&mut self.deferred) {
-            self.extend_definition(infer_deferred_types(self.db(), definition));
-        }
-
-        assert!(
-            self.deferred.is_empty(),
-            "Inferring deferred types should not add more deferred definitions"
-        );
-
-        // TODO: Only call this function when diagnostics are enabled.
-        self.check_class_definitions();
-        self.check_overloaded_functions(node);
-    }
-
-    /// Iterate over all class definitions to check that the definition will not cause an exception
-    /// to be raised at runtime. This needs to be done after most other types in the scope have been
-    /// inferred, due to the fact that base classes can be deferred. If it looks like a class
-    /// definition is invalid in some way, issue a diagnostic.
-    ///
-    /// Among the things we check for in this method are whether Python will be able to determine a
-    /// consistent "[method resolution order]" and [metaclass] for each class.
-    ///
-    /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
-    /// [metaclass]: https://docs.python.org/3/reference/datamodel.html#metaclasses
-    fn check_class_definitions(&mut self) {
-        let class_definitions = self.declarations.iter().filter_map(|(definition, ty)| {
-            // Filter out class literals that result from imports
-            if let DefinitionKind::Class(class) = definition.kind(self.db()) {
-                ty.inner_type()
-                    .into_class_literal()
-                    .map(|class_literal| (class_literal, class.node(self.module())))
-            } else {
-                None
-            }
-        });
-
-        // Iterate through all class definitions in this scope.
-        for (class, class_node) in class_definitions {
-            // (1) Check that the class does not have a cyclic definition
-            if let Some(inheritance_cycle) = class.inheritance_cycle(self.db()) {
-                if inheritance_cycle.is_participant() {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&CYCLIC_CLASS_DEFINITION, class_node)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Cyclic definition of `{}` (class cannot inherit from itself)",
-                            class.name(self.db())
-                        ));
-                    }
-                }
-                // If a class is cyclically defined, that's a sufficient error to report; the
-                // following checks (which are all inheritance-based) aren't even relevant.
-                continue;
-            }
-
-            let is_named_tuple = CodeGeneratorKind::NamedTuple.matches(self.db(), class);
-
-            // (2) If it's a `NamedTuple` class, check that no field without a default value
-            // appears after a field with a default value.
-            if is_named_tuple {
-                let mut field_with_default_encountered = None;
-
-                for (field_name, field) in class.own_fields(self.db(), None) {
-                    if field.default_ty.is_some() {
-                        field_with_default_encountered = Some(field_name);
-                    } else if let Some(field_with_default) = field_with_default_encountered.as_ref()
-                    {
-                        report_namedtuple_field_without_default_after_field_with_default(
-                            &self.context,
-                            class,
-                            self.index,
-                            &field_name,
-                            field_with_default,
-                        );
-                    }
-                }
-            }
-
-            let is_protocol = class.is_protocol(self.db());
-
-            let mut solid_bases = IncompatibleBases::default();
-
-            // (3) Iterate through the class's explicit bases to check for various possible errors:
-            //     - Check for inheritance from plain `Generic`,
-            //     - Check for inheritance from a `@final` classes
-            //     - If the class is a protocol class: check for inheritance from a non-protocol class
-            //     - If the class is a NamedTuple class: check for multiple inheritance that isn't `Generic[]`
-            for (i, base_class) in class.explicit_bases(self.db()).iter().enumerate() {
-                if is_named_tuple
-                    && !matches!(
-                        base_class,
-                        Type::SpecialForm(SpecialFormType::NamedTuple)
-                            | Type::KnownInstance(KnownInstanceType::SubscriptedGeneric(_))
-                    )
-                {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&INVALID_NAMED_TUPLE, &class_node.bases()[i])
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "NamedTuple class `{}` cannot use multiple inheritance except with `Generic[]`",
-                            class.name(self.db()),
-                        ));
-                    }
-                }
-
-                let base_class = match base_class {
-                    Type::SpecialForm(SpecialFormType::Generic) => {
-                        if let Some(builder) = self
-                            .context
-                            .report_lint(&INVALID_BASE, &class_node.bases()[i])
-                        {
-                            // Unsubscripted `Generic` can appear in the MRO of many classes,
-                            // but it is never valid as an explicit base class in user code.
-                            builder.into_diagnostic("Cannot inherit from plain `Generic`");
-                        }
-                        continue;
-                    }
-                    // Note that unlike several of the other errors caught in this function,
-                    // this does not lead to the class creation failing at runtime,
-                    // but it is semantically invalid.
-                    Type::KnownInstance(KnownInstanceType::SubscriptedProtocol(_)) => {
-                        if class_node.type_params.is_none() {
-                            continue;
-                        }
-                        let Some(builder) = self
-                            .context
-                            .report_lint(&INVALID_GENERIC_CLASS, &class_node.bases()[i])
-                        else {
-                            continue;
-                        };
-                        builder.into_diagnostic(
-                            "Cannot both inherit from subscripted `Protocol` \
-                            and use PEP 695 type variables",
-                        );
-                        continue;
-                    }
-                    Type::ClassLiteral(class) => ClassType::NonGeneric(*class),
-                    Type::GenericAlias(class) => ClassType::Generic(*class),
-                    _ => continue,
-                };
-
-                if let Some(solid_base) = base_class.nearest_solid_base(self.db()) {
-                    solid_bases.insert(solid_base, i, base_class.class_literal(self.db()).0);
-                }
-
-                if is_protocol
-                    && !(base_class.class_literal(self.db()).0.is_protocol(self.db())
-                        || base_class.is_known(self.db(), KnownClass::Object))
-                {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&INVALID_PROTOCOL, &class_node.bases()[i])
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Protocol class `{}` cannot inherit from non-protocol class `{}`",
-                            class.name(self.db()),
-                            base_class.name(self.db()),
-                        ));
-                    }
-                }
-
-                if base_class.is_final(self.db()) {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&SUBCLASS_OF_FINAL_CLASS, &class_node.bases()[i])
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Class `{}` cannot inherit from final class `{}`",
-                            class.name(self.db()),
-                            base_class.name(self.db()),
-                        ));
-                    }
-                }
-            }
-
-            // (4) Check that the class's MRO is resolvable
-            match class.try_mro(self.db(), None) {
-                Err(mro_error) => match mro_error.reason() {
-                    MroErrorKind::DuplicateBases(duplicates) => {
-                        let base_nodes = class_node.bases();
-                        for duplicate in duplicates {
-                            report_duplicate_bases(&self.context, class, duplicate, base_nodes);
-                        }
-                    }
-                    MroErrorKind::InvalidBases(bases) => {
-                        let base_nodes = class_node.bases();
-                        for (index, base_ty) in bases {
-                            report_invalid_or_unsupported_base(
-                                &self.context,
-                                &base_nodes[*index],
-                                *base_ty,
-                                class,
-                            );
-                        }
-                    }
-                    MroErrorKind::UnresolvableMro { bases_list } => {
-                        if let Some(builder) =
-                            self.context.report_lint(&INCONSISTENT_MRO, class_node)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Cannot create a consistent method resolution order (MRO) \
-                                    for class `{}` with bases list `[{}]`",
-                                class.name(self.db()),
-                                bases_list
-                                    .iter()
-                                    .map(|base| base.display(self.db()))
-                                    .join(", ")
-                            ));
-                        }
-                    }
-                    MroErrorKind::Pep695ClassWithGenericInheritance => {
-                        if let Some(builder) =
-                            self.context.report_lint(&INVALID_GENERIC_CLASS, class_node)
-                        {
-                            builder.into_diagnostic(
-                                "Cannot both inherit from `typing.Generic` \
-                                and use PEP 695 type variables",
-                            );
-                        }
-                    }
-                    MroErrorKind::InheritanceCycle => {
-                        if let Some(builder) = self
-                            .context
-                            .report_lint(&CYCLIC_CLASS_DEFINITION, class_node)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Cyclic definition of `{}` (class cannot inherit from itself)",
-                                class.name(self.db())
-                            ));
-                        }
-                    }
-                },
-                Ok(_) => {
-                    solid_bases.remove_redundant_entries(self.db());
-
-                    if solid_bases.len() > 1 {
-                        report_instance_layout_conflict(
-                            &self.context,
-                            class,
-                            class_node,
-                            &solid_bases,
-                        );
-                    }
-                }
-            }
-
-            // (5) Check that the class's metaclass can be determined without error.
-            if let Err(metaclass_error) = class.try_metaclass(self.db()) {
-                match metaclass_error.reason() {
-                    MetaclassErrorKind::Cycle => {
-                        if let Some(builder) = self
-                            .context
-                            .report_lint(&CYCLIC_CLASS_DEFINITION, class_node)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Cyclic definition of `{}`",
-                                class.name(self.db())
-                            ));
-                        }
-                    }
-                    MetaclassErrorKind::NotCallable(ty) => {
-                        if let Some(builder) =
-                            self.context.report_lint(&INVALID_METACLASS, class_node)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Metaclass type `{}` is not callable",
-                                ty.display(self.db())
-                            ));
-                        }
-                    }
-                    MetaclassErrorKind::PartlyNotCallable(ty) => {
-                        if let Some(builder) =
-                            self.context.report_lint(&INVALID_METACLASS, class_node)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Metaclass type `{}` is partly not callable",
-                                ty.display(self.db())
-                            ));
-                        }
-                    }
-                    MetaclassErrorKind::Conflict {
-                        candidate1:
-                            MetaclassCandidate {
-                                metaclass: metaclass1,
-                                explicit_metaclass_of: class1,
-                            },
-                        candidate2:
-                            MetaclassCandidate {
-                                metaclass: metaclass2,
-                                explicit_metaclass_of: class2,
-                            },
-                        candidate1_is_base_class,
-                    } => {
-                        if let Some(builder) =
-                            self.context.report_lint(&CONFLICTING_METACLASS, class_node)
-                        {
-                            if *candidate1_is_base_class {
-                                builder.into_diagnostic(format_args!(
-                                    "The metaclass of a derived class (`{class}`) \
-                                     must be a subclass of the metaclasses of all its bases, \
-                                     but `{metaclass1}` (metaclass of base class `{base1}`) \
-                                     and `{metaclass2}` (metaclass of base class `{base2}`) \
-                                     have no subclass relationship",
-                                    class = class.name(self.db()),
-                                    metaclass1 = metaclass1.name(self.db()),
-                                    base1 = class1.name(self.db()),
-                                    metaclass2 = metaclass2.name(self.db()),
-                                    base2 = class2.name(self.db()),
-                                ));
-                            } else {
-                                builder.into_diagnostic(format_args!(
-                                    "The metaclass of a derived class (`{class}`) \
-                                     must be a subclass of the metaclasses of all its bases, \
-                                     but `{metaclass_of_class}` (metaclass of `{class}`) \
-                                     and `{metaclass_of_base}` (metaclass of base class `{base}`) \
-                                     have no subclass relationship",
-                                    class = class.name(self.db()),
-                                    metaclass_of_class = metaclass1.name(self.db()),
-                                    metaclass_of_base = metaclass2.name(self.db()),
-                                    base = class2.name(self.db()),
-                                ));
-                            }
-                        }
-                    }
-                }
-            }
-
-            if let (Some(legacy), Some(inherited)) = (
-                class.legacy_generic_context(self.db()),
-                class.inherited_legacy_generic_context(self.db()),
-            ) {
-                if !inherited.is_subset_of(self.db(), legacy) {
-                    if let Some(builder) =
-                        self.context.report_lint(&INVALID_GENERIC_CLASS, class_node)
-                    {
-                        builder.into_diagnostic(
-                            "`Generic` base class must include all type \
-                            variables used in other base classes",
-                        );
-                    }
-                }
-            }
-
-            // (6) Check that a dataclass does not have more than one `KW_ONLY`.
-            if let Some(field_policy @ CodeGeneratorKind::DataclassLike) =
-                CodeGeneratorKind::from_class(self.db(), class)
-            {
-                let specialization = None;
-
-                let kw_only_sentinel_fields: Vec<_> = class
-                    .fields(self.db(), specialization, field_policy)
-                    .into_iter()
-                    .filter_map(|(name, field)| {
-                        field.is_kw_only_sentinel(self.db()).then_some(name)
-                    })
-                    .collect();
-
-                if kw_only_sentinel_fields.len() > 1 {
-                    // TODO: The fields should be displayed in a subdiagnostic.
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&DUPLICATE_KW_ONLY, &class_node.name)
-                    {
-                        let mut diagnostic = builder.into_diagnostic(format_args!(
-                            "Dataclass has more than one field annotated with `KW_ONLY`"
-                        ));
-
-                        diagnostic.info(format_args!(
-                            "`KW_ONLY` fields: {}",
-                            kw_only_sentinel_fields
-                                .iter()
-                                .map(|name| format!("`{name}`"))
-                                .join(", ")
-                        ));
-                    }
-                }
-            }
-
-            if let Some(protocol) = class.into_protocol_class(self.db()) {
-                protocol.validate_members(&self.context, self.index);
-            }
-        }
-    }
-
-    /// Check the overloaded functions in this scope.
-    ///
-    /// This only checks the overloaded functions that are:
-    /// 1. Visible publicly at the end of this scope
-    /// 2. Or, defined and called in this scope
-    ///
-    /// For (1), this has the consequence of not checking an overloaded function that is being
-    /// shadowed by another function with the same name in this scope.
-    fn check_overloaded_functions(&mut self, scope: &NodeWithScopeKind) {
-        // Collect all the unique overloaded function places in this scope. This requires a set
-        // because an overloaded function uses the same place for each of the overloads and the
-        // implementation.
-        let overloaded_function_places: FxHashSet<_> = self
-            .declarations
-            .iter()
-            .filter_map(|(definition, ty)| {
-                // Filter out function literals that result from anything other than a function
-                // definition e.g., imports which would create a cross-module AST dependency.
-                if !matches!(definition.kind(self.db()), DefinitionKind::Function(_)) {
-                    return None;
-                }
-                let function = ty.inner_type().into_function_literal()?;
-                if function.has_known_decorator(self.db(), FunctionDecorators::OVERLOAD) {
-                    Some(definition.place(self.db()))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let use_def = self
-            .index
-            .use_def_map(self.scope().file_scope_id(self.db()));
-
-        let mut public_functions = FxHashSet::default();
-
-        for place in overloaded_function_places {
-            if let Place::Type(Type::FunctionLiteral(function), Boundness::Bound) =
-                place_from_bindings(
-                    self.db(),
-                    use_def.end_of_scope_symbol_bindings(place.as_symbol().unwrap()),
-                )
-            {
-                if function.file(self.db()) != self.file() {
-                    // If the function is not in this file, we don't need to check it.
-                    // https://github.com/astral-sh/ruff/pull/17609#issuecomment-2839445740
-                    continue;
-                }
-
-                // Extend the functions that we need to check with the publicly visible overloaded
-                // function. This is always going to be either the implementation or the last
-                // overload if the implementation doesn't exists.
-                public_functions.insert(function);
-            }
-        }
-
-        for function in self.called_functions.union(&public_functions) {
-            let (overloads, implementation) = function.overloads_and_implementation(self.db());
-            if overloads.is_empty() {
-                continue;
-            }
-
-            // Check that the overloaded function has at least two overloads
-            if let [single_overload] = overloads.as_ref() {
-                let function_node = function.node(self.db(), self.file(), self.module());
-                if let Some(builder) = self
-                    .context
-                    .report_lint(&INVALID_OVERLOAD, &function_node.name)
-                {
-                    let mut diagnostic = builder.into_diagnostic(format_args!(
-                        "Overloaded function `{}` requires at least two overloads",
-                        &function_node.name
-                    ));
-                    diagnostic.annotate(
-                        self.context
-                            .secondary(single_overload.focus_range(self.db(), self.module()))
-                            .message(format_args!("Only one overload defined here")),
-                    );
-                }
-            }
-
-            // Check that the overloaded function has an implementation. Overload definitions
-            // within stub files, protocols, and on abstract methods within abstract base classes
-            // are exempt from this check.
-            if implementation.is_none() && !self.in_stub() {
-                let mut implementation_required = true;
-
-                if let NodeWithScopeKind::Class(class_node_ref) = scope {
-                    let class = binding_type(
-                        self.db(),
-                        self.index
-                            .expect_single_definition(class_node_ref.node(self.module())),
-                    )
-                    .expect_class_literal();
-
-                    if class.is_protocol(self.db())
-                        || (class.is_abstract(self.db())
-                            && overloads.iter().all(|overload| {
-                                overload.has_known_decorator(
-                                    self.db(),
-                                    FunctionDecorators::ABSTRACT_METHOD,
-                                )
-                            }))
-                    {
-                        implementation_required = false;
-                    }
-                }
-
-                if implementation_required {
-                    let function_node = function.node(self.db(), self.file(), self.module());
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&INVALID_OVERLOAD, &function_node.name)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Overloaded non-stub function `{}` must have an implementation",
-                            &function_node.name
-                        ));
-                    }
-                }
-            }
-
-            for (decorator, name) in [
-                (FunctionDecorators::CLASSMETHOD, "classmethod"),
-                (FunctionDecorators::STATICMETHOD, "staticmethod"),
-            ] {
-                let mut decorator_present = false;
-                let mut decorator_missing = vec![];
-
-                for function in overloads.iter().chain(implementation.as_ref()) {
-                    if function.has_known_decorator(self.db(), decorator) {
-                        decorator_present = true;
-                    } else {
-                        decorator_missing.push(function);
-                    }
-                }
-
-                if !decorator_present {
-                    // Both overloads and implementation does not have the decorator
-                    continue;
-                }
-                if decorator_missing.is_empty() {
-                    // All overloads and implementation have the decorator
-                    continue;
-                }
-
-                let function_node = function.node(self.db(), self.file(), self.module());
-                if let Some(builder) = self
-                    .context
-                    .report_lint(&INVALID_OVERLOAD, &function_node.name)
-                {
-                    let mut diagnostic = builder.into_diagnostic(format_args!(
-                        "Overloaded function `{}` does not use the `@{name}` decorator \
-                         consistently",
-                        &function_node.name
-                    ));
-                    for function in decorator_missing {
-                        diagnostic.annotate(
-                            self.context
-                                .secondary(function.focus_range(self.db(), self.module()))
-                                .message(format_args!("Missing here")),
-                        );
-                    }
-                }
-            }
-
-            for (decorator, name) in [
-                (FunctionDecorators::FINAL, "final"),
-                (FunctionDecorators::OVERRIDE, "override"),
-            ] {
-                if let Some(implementation) = implementation {
-                    for overload in overloads.as_ref() {
-                        if !overload.has_known_decorator(self.db(), decorator) {
-                            continue;
-                        }
-                        let function_node = function.node(self.db(), self.file(), self.module());
-                        let Some(builder) = self
-                            .context
-                            .report_lint(&INVALID_OVERLOAD, &function_node.name)
-                        else {
-                            continue;
-                        };
-                        let mut diagnostic = builder.into_diagnostic(format_args!(
-                            "`@{name}` decorator should be applied only to the \
-                                overload implementation"
-                        ));
-                        diagnostic.annotate(
-                            self.context
-                                .secondary(implementation.focus_range(self.db(), self.module()))
-                                .message(format_args!("Implementation defined here")),
-                        );
-                    }
-                } else {
-                    let mut overloads = overloads.iter();
-                    let Some(first_overload) = overloads.next() else {
-                        continue;
-                    };
-                    for overload in overloads {
-                        if !overload.has_known_decorator(self.db(), decorator) {
-                            continue;
-                        }
-                        let function_node = function.node(self.db(), self.file(), self.module());
-                        let Some(builder) = self
-                            .context
-                            .report_lint(&INVALID_OVERLOAD, &function_node.name)
-                        else {
-                            continue;
-                        };
-                        let mut diagnostic = builder.into_diagnostic(format_args!(
-                            "`@{name}` decorator should be applied only to the \
-                                first overload"
-                        ));
-                        diagnostic.annotate(
-                            self.context
-                                .secondary(first_overload.focus_range(self.db(), self.module()))
-                                .message(format_args!("First overload defined here")),
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    fn infer_region_definition(&mut self, definition: Definition<'db>) {
-        match definition.kind(self.db()) {
-            DefinitionKind::Function(function) => {
-                self.infer_function_definition(function.node(self.module()), definition);
-            }
-            DefinitionKind::Class(class) => {
-                self.infer_class_definition(class.node(self.module()), definition);
-            }
-            DefinitionKind::TypeAlias(type_alias) => {
-                self.infer_type_alias_definition(type_alias.node(self.module()), definition);
-            }
-            DefinitionKind::Import(import) => {
-                self.infer_import_definition(
-                    import.import(self.module()),
-                    import.alias(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::ImportFrom(import_from) => {
-                self.infer_import_from_definition(
-                    import_from.import(self.module()),
-                    import_from.alias(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::StarImport(import) => {
-                self.infer_import_from_definition(
-                    import.import(self.module()),
-                    import.alias(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::Assignment(assignment) => {
-                self.infer_assignment_definition(assignment, definition);
-            }
-            DefinitionKind::AnnotatedAssignment(annotated_assignment) => {
-                self.infer_annotated_assignment_definition(annotated_assignment, definition);
-            }
-            DefinitionKind::AugmentedAssignment(augmented_assignment) => {
-                self.infer_augment_assignment_definition(
-                    augmented_assignment.node(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::For(for_statement_definition) => {
-                self.infer_for_statement_definition(for_statement_definition, definition);
-            }
-            DefinitionKind::NamedExpression(named_expression) => {
-                self.infer_named_expression_definition(
-                    named_expression.node(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::Comprehension(comprehension) => {
-                self.infer_comprehension_definition(comprehension, definition);
-            }
-            DefinitionKind::VariadicPositionalParameter(parameter) => {
-                self.infer_variadic_positional_parameter_definition(
-                    parameter.node(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::VariadicKeywordParameter(parameter) => {
-                self.infer_variadic_keyword_parameter_definition(
-                    parameter.node(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::Parameter(parameter_with_default) => {
-                self.infer_parameter_definition(
-                    parameter_with_default.node(self.module()),
-                    definition,
-                );
-            }
-            DefinitionKind::WithItem(with_item_definition) => {
-                self.infer_with_item_definition(with_item_definition, definition);
-            }
-            DefinitionKind::MatchPattern(match_pattern) => {
-                self.infer_match_pattern_definition(
-                    match_pattern.pattern(self.module()),
-                    match_pattern.index(),
-                    definition,
-                );
-            }
-            DefinitionKind::ExceptHandler(except_handler_definition) => {
-                self.infer_except_handler_definition(except_handler_definition, definition);
-            }
-            DefinitionKind::TypeVar(node) => {
-                self.infer_typevar_definition(node.node(self.module()), definition);
-            }
-            DefinitionKind::ParamSpec(node) => {
-                self.infer_paramspec_definition(node.node(self.module()), definition);
-            }
-            DefinitionKind::TypeVarTuple(node) => {
-                self.infer_typevartuple_definition(node.node(self.module()), definition);
-            }
-        }
-    }
-
-    fn infer_region_deferred(&mut self, definition: Definition<'db>) {
-        // N.B. We don't defer the types for an annotated assignment here because it is done in
-        // the same definition query. It utilizes the deferred expression state instead.
-        //
-        // This is because for partially stringified annotations like `a: tuple[int, "ForwardRef"]`,
-        // we need to defer the types of non-stringified expressions like `tuple` and `int` in the
-        // definition query while the stringified expression `"ForwardRef"` would need to deferred
-        // to use end-of-scope semantics. This would require custom and possibly a complex
-        // implementation to allow this "split" to happen.
-
-        match definition.kind(self.db()) {
-            DefinitionKind::Function(function) => {
-                self.infer_function_deferred(definition, function.node(self.module()));
-            }
-            DefinitionKind::Class(class) => {
-                self.infer_class_deferred(definition, class.node(self.module()));
-            }
-            DefinitionKind::TypeVar(typevar) => {
-                self.infer_typevar_deferred(typevar.node(self.module()));
-            }
-            _ => {}
-        }
-    }
-
-    fn infer_region_expression(&mut self, expression: Expression<'db>) {
-        match expression.kind(self.db()) {
-            ExpressionKind::Normal => {
-                self.infer_expression_impl(expression.node_ref(self.db(), self.module()));
-            }
-            ExpressionKind::TypeExpression => {
-                self.infer_type_expression(expression.node_ref(self.db(), self.module()));
-            }
-        }
-    }
-
-    /// Raise a diagnostic if the given type cannot be divided by zero.
-    ///
-    /// Expects the resolved type of the left side of the binary expression.
-    fn check_division_by_zero(
-        &mut self,
-        node: AnyNodeRef<'_>,
-        op: ast::Operator,
-        left: Type<'db>,
-    ) -> bool {
-        match left {
-            Type::BooleanLiteral(_) | Type::IntLiteral(_) => {}
-            Type::NominalInstance(instance)
-                if matches!(
-                    instance.class(self.db()).known(self.db()),
-                    Some(KnownClass::Float | KnownClass::Int | KnownClass::Bool)
-                ) => {}
-            _ => return false,
-        }
-
-        let (op, by_zero) = match op {
-            ast::Operator::Div => ("divide", "by zero"),
-            ast::Operator::FloorDiv => ("floor divide", "by zero"),
-            ast::Operator::Mod => ("reduce", "modulo zero"),
-            _ => return false,
-        };
-
-        if let Some(builder) = self.context.report_lint(&DIVISION_BY_ZERO, node) {
-            builder.into_diagnostic(format_args!(
-                "Cannot {op} object of type `{}` {by_zero}",
-                left.display(self.db())
-            ));
-        }
-
-        true
-    }
-
-    fn add_binding(&mut self, node: AnyNodeRef, binding: Definition<'db>, ty: Type<'db>) {
-        /// Arbitrary `__getitem__`/`__setitem__` methods on a class do not
-        /// necessarily guarantee that the passed-in value for `__setitem__` is stored and
-        /// can be retrieved unmodified via `__getitem__`. Therefore, we currently only
-        /// perform assignment-based narrowing on a few built-in classes (`list`, `dict`,
-        /// `bytesarray`, `TypedDict` and `collections` types) where we are confident that
-        /// this kind of narrowing can be performed soundly. This is the same approach as
-        /// pyright. TODO: Other standard library classes may also be considered safe. Also,
-        /// subclasses of these safe classes that do not override `__getitem__/__setitem__`
-        /// may be considered safe.
-        fn is_safe_mutable_class<'db>(db: &'db dyn Db, ty: Type<'db>) -> bool {
-            const SAFE_MUTABLE_CLASSES: &[KnownClass] = &[
-                KnownClass::List,
-                KnownClass::Dict,
-                KnownClass::Bytearray,
-                KnownClass::DefaultDict,
-                KnownClass::ChainMap,
-                KnownClass::Counter,
-                KnownClass::Deque,
-                KnownClass::OrderedDict,
-            ];
-
-            SAFE_MUTABLE_CLASSES
-                .iter()
-                .map(|class| class.to_instance(db))
-                .any(|safe_mutable_class| {
-                    ty.is_equivalent_to(db, safe_mutable_class)
-                        || ty
-                            .generic_origin(db)
-                            .zip(safe_mutable_class.generic_origin(db))
-                            .is_some_and(|(l, r)| l == r)
-                })
-        }
-
-        debug_assert!(
-            binding
-                .kind(self.db())
-                .category(self.context.in_stub(), self.module())
-                .is_binding()
-        );
-
-        let db = self.db();
-        let file_scope_id = binding.file_scope(db);
-        let place_table = self.index.place_table(file_scope_id);
-        let use_def = self.index.use_def_map(file_scope_id);
-        let mut bound_ty = ty;
-
-        let global_use_def_map = self.index.use_def_map(FileScopeId::global());
-        let place_id = binding.place(self.db());
-        let place = place_table.place(place_id);
-
-        let (declarations, is_local) = if let Some(symbol) = place.as_symbol() {
-            let symbol_id = place_id.expect_symbol();
-            let skip_non_global_scopes = self.skip_non_global_scopes(file_scope_id, symbol_id);
-
-            if skip_non_global_scopes {
-                match self
-                    .index
-                    .place_table(FileScopeId::global())
-                    .symbol_id(symbol.name())
-                {
-                    Some(id) => (
-                        global_use_def_map.end_of_scope_symbol_declarations(id),
-                        false,
-                    ),
-                    // This variable shows up in `global` declarations but doesn't have an explicit
-                    // binding in the global scope.
-                    None => (use_def.declarations_at_binding(binding), true),
-                }
-            } else if self
-                .index
-                .symbol_is_nonlocal_in_scope(symbol_id, file_scope_id)
-            {
-                // If we run out of ancestor scopes without finding a definition, we'll fall back to
-                // the local scope. This will also be a syntax error in `infer_nonlocal_statement` (no
-                // binding for `nonlocal` found), but ignore that here.
-                let mut declarations = use_def.declarations_at_binding(binding);
-                let mut is_local = true;
-                // Walk up parent scopes looking for the enclosing scope that has definition of this
-                // name. `ancestor_scopes` includes the current scope, so skip that one.
-                for (enclosing_scope_file_id, enclosing_scope) in
-                    self.index.ancestor_scopes(file_scope_id).skip(1)
-                {
-                    // Ignore class scopes and the global scope.
-                    if !enclosing_scope.kind().is_function_like() {
-                        continue;
-                    }
-                    let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
-                    let Some(enclosing_symbol_id) = enclosing_place_table.symbol_id(symbol.name())
-                    else {
-                        // This ancestor scope doesn't have a binding. Keep going.
-                        continue;
-                    };
-
-                    let enclosing_symbol = enclosing_place_table.symbol(enclosing_symbol_id);
-                    if enclosing_symbol.is_nonlocal() {
-                        // The variable is `nonlocal` in this ancestor scope. Keep going.
-                        continue;
-                    }
-                    if enclosing_symbol.is_global() {
-                        // The variable is `global` in this ancestor scope. This breaks the `nonlocal`
-                        // chain, and it's a syntax error in `infer_nonlocal_statement`. Ignore that
-                        // here and just bail out of this loop.
-                        break;
-                    }
-                    // We found the closest definition. Note that (as in `infer_place_load`) this does
-                    // *not* need to be a binding. It could be just a declaration, e.g. `x: int`.
-                    declarations = self
-                        .index
-                        .use_def_map(enclosing_scope_file_id)
-                        .end_of_scope_symbol_declarations(enclosing_symbol_id);
-                    is_local = false;
-                    break;
-                }
-                (declarations, is_local)
-            } else {
-                (use_def.declarations_at_binding(binding), true)
-            }
-        } else {
-            (use_def.declarations_at_binding(binding), true)
-        };
-
-        let (mut place_and_quals, conflicting) = place_from_declarations(self.db(), declarations)
-            .into_place_and_conflicting_declarations();
-
-        if let Some(conflicting) = conflicting {
-            // TODO point out the conflicting declarations in the diagnostic?
-            let place = place_table.place(binding.place(db));
-            if let Some(builder) = self.context.report_lint(&CONFLICTING_DECLARATIONS, node) {
-                builder.into_diagnostic(format_args!(
-                    "Conflicting declared types for `{place}`: {}",
-                    format_enumeration(conflicting.iter().map(|ty| ty.display(db)))
-                ));
-            }
-        }
-
-        // Fall back to implicit module globals for (possibly) unbound names
-        if !matches!(place_and_quals.place, Place::Type(_, Boundness::Bound)) {
-            if let PlaceExprRef::Symbol(symbol) = place {
-                let symbol_id = place_id.expect_symbol();
-
-                if self.skip_non_global_scopes(file_scope_id, symbol_id)
-                    || self.scope.file_scope_id(self.db()).is_global()
-                {
-                    place_and_quals = place_and_quals.or_fall_back_to(self.db(), || {
-                        module_type_implicit_global_declaration(self.db(), symbol.name())
-                    });
-                }
-            }
-        }
-
-        let PlaceAndQualifiers {
-            place: resolved_place,
-            qualifiers,
-        } = place_and_quals;
-
-        let unwrap_declared_ty = || {
-            resolved_place
-                .ignore_possibly_unbound()
-                .unwrap_or(Type::unknown())
-        };
-
-        // If the place is unbound and its an attribute or subscript place, fall back to normal
-        // attribute/subscript inference on the root type.
-        let declared_ty = if resolved_place.is_unbound() && !place_table.place(place_id).is_symbol()
-        {
-            if let AnyNodeRef::ExprAttribute(ast::ExprAttribute { value, attr, .. }) = node {
-                let value_type = self.infer_maybe_standalone_expression(value);
-                if let Place::Type(ty, Boundness::Bound) = value_type.member(db, attr).place {
-                    // TODO: also consider qualifiers on the attribute
-                    ty
-                } else {
-                    unwrap_declared_ty()
-                }
-            } else if let AnyNodeRef::ExprSubscript(
-                subscript @ ast::ExprSubscript {
-                    value, slice, ctx, ..
-                },
-            ) = node
-            {
-                let value_ty = self.infer_expression(value);
-                let slice_ty = self.infer_expression(slice);
-                self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx)
-            } else {
-                unwrap_declared_ty()
-            }
-        } else {
-            unwrap_declared_ty()
-        };
-
-        if qualifiers.contains(TypeQualifiers::FINAL) {
-            let mut previous_bindings = use_def.bindings_at_definition(binding);
-
-            // An assignment to a local `Final`-qualified symbol is only an error if there are prior bindings
-
-            let previous_definition = previous_bindings
-                .next()
-                .and_then(|r| r.binding.definition());
-
-            if !is_local || previous_definition.is_some() {
-                let place = place_table.place(binding.place(db));
-                if let Some(builder) = self.context.report_lint(
-                    &INVALID_ASSIGNMENT,
-                    binding.full_range(self.db(), self.module()),
-                ) {
-                    let mut diagnostic = builder.into_diagnostic(format_args!(
-                        "Reassignment of `Final` symbol `{place}` is not allowed"
-                    ));
-
-                    diagnostic.set_primary_message("Reassignment of `Final` symbol");
-
-                    if let Some(previous_definition) = previous_definition {
-                        // It is not very helpful to show the previous definition if it results from
-                        // an import. Ideally, we would show the original definition in the external
-                        // module, but that information is currently not threaded through attribute
-                        // lookup.
-                        if !previous_definition.kind(db).is_import() {
-                            if let DefinitionKind::AnnotatedAssignment(assignment) =
-                                previous_definition.kind(db)
-                            {
-                                let range = assignment.annotation(self.module()).range();
-                                diagnostic.annotate(
-                                    self.context
-                                        .secondary(range)
-                                        .message("Symbol declared as `Final` here"),
-                                );
-                            } else {
-                                let range =
-                                    previous_definition.full_range(self.db(), self.module());
-                                diagnostic.annotate(
-                                    self.context
-                                        .secondary(range)
-                                        .message("Symbol declared as `Final` here"),
-                                );
-                            }
-                            diagnostic.set_primary_message("Symbol later reassigned here");
-                        }
-                    }
-                }
-            }
-        }
-
-        if !bound_ty.is_assignable_to(db, declared_ty) {
-            report_invalid_assignment(&self.context, node, declared_ty, bound_ty);
-            // allow declarations to override inference in case of invalid assignment
-            bound_ty = declared_ty;
-        }
-        // In the following cases, the bound type may not be the same as the RHS value type.
-        if let AnyNodeRef::ExprAttribute(ast::ExprAttribute { value, attr, .. }) = node {
-            let value_ty = self
-                .try_expression_type(value)
-                .unwrap_or_else(|| self.infer_maybe_standalone_expression(value));
-            // If the member is a data descriptor, the RHS value may differ from the value actually assigned.
-            if value_ty
-                .class_member(db, attr.id.clone())
-                .place
-                .ignore_possibly_unbound()
-                .is_some_and(|ty| ty.may_be_data_descriptor(db))
-            {
-                bound_ty = declared_ty;
-            }
-        } else if let AnyNodeRef::ExprSubscript(ast::ExprSubscript { value, .. }) = node {
-            let value_ty = self
-                .try_expression_type(value)
-                .unwrap_or_else(|| self.infer_expression(value));
-
-            if !value_ty.is_typed_dict() && !is_safe_mutable_class(db, value_ty) {
-                bound_ty = declared_ty;
-            }
-        }
-
-        self.bindings.insert(binding, bound_ty);
-    }
-
-    /// Returns `true` if `symbol_id` should be looked up in the global scope, skipping intervening
-    /// local scopes.
-    fn skip_non_global_scopes(
-        &self,
-        file_scope_id: FileScopeId,
-        symbol_id: ScopedSymbolId,
-    ) -> bool {
-        !file_scope_id.is_global()
-            && self
-                .index
-                .symbol_is_global_in_scope(symbol_id, file_scope_id)
-    }
-
-    fn add_declaration(
-        &mut self,
-        node: AnyNodeRef,
-        declaration: Definition<'db>,
-        ty: TypeAndQualifiers<'db>,
-    ) {
-        debug_assert!(
-            declaration
-                .kind(self.db())
-                .category(self.context.in_stub(), self.module())
-                .is_declaration()
-        );
-        let use_def = self.index.use_def_map(declaration.file_scope(self.db()));
-        let prior_bindings = use_def.bindings_at_definition(declaration);
-        // unbound_ty is Never because for this check we don't care about unbound
-        let inferred_ty = place_from_bindings(self.db(), prior_bindings)
-            .with_qualifiers(TypeQualifiers::empty())
-            .or_fall_back_to(self.db(), || {
-                // Fallback to bindings declared on `types.ModuleType` if it's a global symbol
-                let scope = self.scope().file_scope_id(self.db());
-                let place = self
-                    .index
-                    .place_table(scope)
-                    .place(declaration.place(self.db()));
-                if let PlaceExprRef::Symbol(symbol) = &place {
-                    if scope.is_global() {
-                        module_type_implicit_global_symbol(self.db(), symbol.name())
-                    } else {
-                        Place::Unbound.into()
-                    }
-                } else {
-                    Place::Unbound.into()
-                }
-            })
-            .place
-            .ignore_possibly_unbound()
-            .unwrap_or(Type::Never);
-        let ty = if inferred_ty.is_assignable_to(self.db(), ty.inner_type()) {
-            ty
-        } else {
-            if let Some(builder) = self.context.report_lint(&INVALID_DECLARATION, node) {
-                builder.into_diagnostic(format_args!(
-                    "Cannot declare type `{}` for inferred type `{}`",
-                    ty.inner_type().display(self.db()),
-                    inferred_ty.display(self.db())
-                ));
-            }
-            TypeAndQualifiers::unknown()
-        };
-        self.declarations.insert(declaration, ty);
-    }
-
-    fn add_declaration_with_binding(
-        &mut self,
-        node: AnyNodeRef,
-        definition: Definition<'db>,
-        declared_and_inferred_ty: &DeclaredAndInferredType<'db>,
-    ) {
-        debug_assert!(
-            definition
-                .kind(self.db())
-                .category(self.context.in_stub(), self.module())
-                .is_binding()
-        );
-        debug_assert!(
-            definition
-                .kind(self.db())
-                .category(self.context.in_stub(), self.module())
-                .is_declaration()
-        );
-
-        let (declared_ty, inferred_ty) = match *declared_and_inferred_ty {
-            DeclaredAndInferredType::AreTheSame(type_and_qualifiers) => {
-                (type_and_qualifiers, type_and_qualifiers.inner_type())
-            }
-            DeclaredAndInferredType::MightBeDifferent {
-                declared_ty,
-                inferred_ty,
-            } => {
-                let file_scope_id = self.scope().file_scope_id(self.db());
-                if file_scope_id.is_global() {
-                    let place_table = self.index.place_table(file_scope_id);
-                    let place = place_table.place(definition.place(self.db()));
-                    if let Some(module_type_implicit_declaration) = place
-                        .as_symbol()
-                        .map(|symbol| module_type_implicit_global_symbol(self.db(), symbol.name()))
-                        .and_then(|place| place.place.ignore_possibly_unbound())
-                    {
-                        let declared_type = declared_ty.inner_type();
-                        if !declared_type
-                            .is_assignable_to(self.db(), module_type_implicit_declaration)
-                        {
-                            if let Some(builder) =
-                                self.context.report_lint(&INVALID_DECLARATION, node)
-                            {
-                                let mut diagnostic = builder.into_diagnostic(format_args!(
-                                    "Cannot shadow implicit global attribute `{place}` with declaration of type `{}`",
-                                    declared_type.display(self.db())
-                                ));
-                                diagnostic.info(format_args!("The global symbol `{}` must always have a type assignable to `{}`",
-                                    place,
-                                    module_type_implicit_declaration.display(self.db())
-                                ));
-                            }
-                        }
-                    }
-                }
-                if inferred_ty.is_assignable_to(self.db(), declared_ty.inner_type()) {
-                    (declared_ty, inferred_ty)
-                } else {
-                    report_invalid_assignment(
-                        &self.context,
-                        node,
-                        declared_ty.inner_type(),
-                        inferred_ty,
-                    );
-                    // if the assignment is invalid, fall back to assuming the annotation is correct
-                    (declared_ty, declared_ty.inner_type())
-                }
-            }
-        };
-        self.declarations.insert(definition, declared_ty);
-        self.bindings.insert(definition, inferred_ty);
-    }
-
-    fn add_unknown_declaration_with_binding(
-        &mut self,
-        node: AnyNodeRef,
-        definition: Definition<'db>,
-    ) {
-        self.add_declaration_with_binding(
-            node,
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(Type::unknown()),
-        );
-    }
-
-    fn record_return_type(&mut self, ty: Type<'db>, range: TextRange) {
-        self.return_types_and_ranges
-            .push(TypeAndRange { ty, range });
-    }
-
-    fn infer_module(&mut self, module: &ast::ModModule) {
-        self.infer_body(&module.body);
-    }
-
-    fn infer_class_type_params(&mut self, class: &ast::StmtClassDef) {
-        let type_params = class
-            .type_params
-            .as_deref()
-            .expect("class type params scope without type params");
-
-        let binding_context = self.index.expect_single_definition(class);
-        let previous_typevar_binding_context =
-            self.typevar_binding_context.replace(binding_context);
-
-        self.infer_type_parameters(type_params);
-
-        if let Some(arguments) = class.arguments.as_deref() {
-            let in_stub = self.in_stub();
-            let previous_deferred_state =
-                std::mem::replace(&mut self.deferred_state, in_stub.into());
-            let mut call_arguments =
-                CallArguments::from_arguments(self.db(), arguments, |argument, splatted_value| {
-                    let ty = self.infer_expression(splatted_value);
-                    self.store_expression_type(argument, ty);
-                    ty
-                });
-            let argument_forms = vec![Some(ParameterForm::Value); call_arguments.len()];
-            self.infer_argument_types(arguments, &mut call_arguments, &argument_forms);
-            self.deferred_state = previous_deferred_state;
-        }
-
-        self.typevar_binding_context = previous_typevar_binding_context;
-    }
-
-    fn infer_class_body(&mut self, class: &ast::StmtClassDef) {
-        self.infer_body(&class.body);
-    }
-
-    fn infer_function_type_params(&mut self, function: &ast::StmtFunctionDef) {
-        let type_params = function
-            .type_params
-            .as_deref()
-            .expect("function type params scope without type params");
-
-        let binding_context = self.index.expect_single_definition(function);
-        let previous_typevar_binding_context =
-            self.typevar_binding_context.replace(binding_context);
-        self.infer_return_type_annotation(
-            function.returns.as_deref(),
-            self.defer_annotations().into(),
-        );
-        self.infer_type_parameters(type_params);
-        self.infer_parameters(&function.parameters);
-        self.typevar_binding_context = previous_typevar_binding_context;
-    }
-
-    fn infer_type_alias_type_params(&mut self, type_alias: &ast::StmtTypeAlias) {
-        let type_params = type_alias
-            .type_params
+    /// Returns true if all places in this expression are definitely bound.
+    pub(crate) fn all_places_definitely_bound(&self) -> bool {
+        self.extra
             .as_ref()
-            .expect("type alias type params scope without type params");
-
-        let binding_context = self.index.expect_single_definition(type_alias);
-        let previous_typevar_binding_context =
-            self.typevar_binding_context.replace(binding_context);
-        self.infer_type_parameters(type_params);
-        self.typevar_binding_context = previous_typevar_binding_context;
-    }
-
-    fn infer_type_alias(&mut self, type_alias: &ast::StmtTypeAlias) {
-        self.infer_annotation_expression(&type_alias.value, DeferredExpressionState::Deferred);
-    }
-
-    /// If the current scope is a method inside an enclosing class,
-    /// return `Some(class)` where `class` represents the enclosing class.
-    ///
-    /// If the current scope is not a method inside an enclosing class,
-    /// return `None`.
-    ///
-    /// Note that this method will only return `Some` if the immediate parent scope
-    /// is a class scope OR the immediate parent scope is an annotation scope
-    /// and the grandparent scope is a class scope. This means it has different
-    /// behaviour to the [`nearest_enclosing_class`] function.
-    fn class_context_of_current_method(&self) -> Option<ClassLiteral<'db>> {
-        let current_scope_id = self.scope().file_scope_id(self.db());
-        let current_scope = self.index.scope(current_scope_id);
-        if current_scope.kind() != ScopeKind::Function {
-            return None;
-        }
-        let parent_scope_id = current_scope.parent()?;
-        let parent_scope = self.index.scope(parent_scope_id);
-
-        let class_scope = match parent_scope.kind() {
-            ScopeKind::Class => parent_scope,
-            ScopeKind::TypeParams => {
-                let class_scope_id = parent_scope.parent()?;
-                let potentially_class_scope = self.index.scope(class_scope_id);
-
-                match potentially_class_scope.kind() {
-                    ScopeKind::Class => potentially_class_scope,
-                    _ => return None,
-                }
-            }
-            _ => return None,
-        };
-
-        let class_stmt = class_scope.node().as_class(self.module())?;
-        let class_definition = self.index.expect_single_definition(class_stmt);
-        binding_type(self.db(), class_definition).into_class_literal()
-    }
-
-    /// If the current scope is a (non-lambda) function, return that function's AST node.
-    ///
-    /// If the current scope is not a function (or it is a lambda function), return `None`.
-    fn current_function_definition(&self) -> Option<&ast::StmtFunctionDef> {
-        let current_scope_id = self.scope().file_scope_id(self.db());
-        let current_scope = self.index.scope(current_scope_id);
-        if !current_scope.kind().is_non_lambda_function() {
-            return None;
-        }
-        current_scope.node().as_function(self.module())
-    }
-
-    fn function_decorator_types<'a>(
-        &'a self,
-        function: &'a ast::StmtFunctionDef,
-    ) -> impl Iterator<Item = Type<'db>> + 'a {
-        let definition = self.index.expect_single_definition(function);
-
-        let definition_types = infer_definition_types(self.db(), definition);
-
-        function
-            .decorator_list
-            .iter()
-            .map(move |decorator| definition_types.expression_type(&decorator.expression))
-    }
-
-    /// Returns `true` if the current scope is the function body scope of a function overload (that
-    /// is, the stub declaration decorated with `@overload`, not the implementation), or an
-    /// abstract method (decorated with `@abstractmethod`.)
-    fn in_function_overload_or_abstractmethod(&self) -> bool {
-        let Some(function) = self.current_function_definition() else {
-            return false;
-        };
-
-        self.function_decorator_types(function)
-            .any(|decorator_type| {
-                match decorator_type {
-                    Type::FunctionLiteral(function) => matches!(
-                        function.known(self.db()),
-                        Some(KnownFunction::Overload | KnownFunction::AbstractMethod)
-                    ),
-                    Type::Never => {
-                        // In unreachable code, we infer `Never` for decorators like `typing.overload`.
-                        // Return `true` here to avoid false positive `invalid-return-type` lints for
-                        // `@overload`ed functions without a body in unreachable code.
-                        true
-                    }
-                    _ => false,
-                }
-            })
-    }
-
-    fn infer_function_body(&mut self, function: &ast::StmtFunctionDef) {
-        // Parameters are odd: they are Definitions in the function body scope, but have no
-        // constituent nodes that are part of the function body. In order to get diagnostics
-        // merged/emitted for them, we need to explicitly infer their definitions here.
-        for parameter in &function.parameters {
-            self.infer_definition(parameter);
-        }
-        self.infer_body(&function.body);
-
-        if let Some(returns) = function.returns.as_deref() {
-            fn is_stub_suite(suite: &[ast::Stmt]) -> bool {
-                match suite {
-                    [
-                        ast::Stmt::Expr(ast::StmtExpr { value: first, .. }),
-                        ast::Stmt::Expr(ast::StmtExpr { value: second, .. }),
-                        ..,
-                    ] => first.is_string_literal_expr() && second.is_ellipsis_literal_expr(),
-                    [
-                        ast::Stmt::Expr(ast::StmtExpr { value, .. }),
-                        ast::Stmt::Pass(_),
-                        ..,
-                    ] => value.is_string_literal_expr(),
-                    [ast::Stmt::Expr(ast::StmtExpr { value, .. }), ..] => {
-                        value.is_ellipsis_literal_expr() || value.is_string_literal_expr()
-                    }
-                    [ast::Stmt::Pass(_)] => true,
-                    _ => false,
-                }
-            }
-
-            let has_empty_body =
-                self.return_types_and_ranges.is_empty() && is_stub_suite(&function.body);
-
-            let mut enclosing_class_context = None;
-
-            if has_empty_body {
-                if self.in_stub() {
-                    return;
-                }
-                if self.in_function_overload_or_abstractmethod() {
-                    return;
-                }
-                if self.scope().scope(self.db()).in_type_checking_block() {
-                    return;
-                }
-                if let Some(class) = self.class_context_of_current_method() {
-                    enclosing_class_context = Some(class);
-                    if class.is_protocol(self.db()) {
-                        return;
-                    }
-                }
-            }
-
-            let declared_ty = self.file_expression_type(returns);
-            let expected_ty = match declared_ty {
-                Type::TypeIs(_) => KnownClass::Bool.to_instance(self.db()),
-                ty => ty,
-            };
-
-            let scope_id = self.index.node_scope(NodeWithScopeRef::Function(function));
-            if scope_id.is_generator_function(self.index) {
-                // TODO: `AsyncGeneratorType` and `GeneratorType` are both generic classes.
-                //
-                // If type arguments are supplied to `(Async)Iterable`, `(Async)Iterator`,
-                // `(Async)Generator` or `(Async)GeneratorType` in the return annotation,
-                // we should iterate over the `yield` expressions and `return` statements in the function
-                // to check that they are consistent with the type arguments provided.
-                let inferred_return = if function.is_async {
-                    KnownClass::AsyncGeneratorType
-                } else {
-                    KnownClass::GeneratorType
-                };
-
-                if !inferred_return
-                    .to_instance(self.db())
-                    .is_assignable_to(self.db(), expected_ty)
-                {
-                    report_invalid_generator_function_return_type(
-                        &self.context,
-                        returns.range(),
-                        inferred_return,
-                        declared_ty,
-                    );
-                }
-                return;
-            }
-
-            for invalid in self
-                .return_types_and_ranges
-                .iter()
-                .copied()
-                .filter_map(|ty_range| match ty_range.ty {
-                    // We skip `is_assignable_to` checks for `NotImplemented`,
-                    // so we remove it beforehand.
-                    Type::Union(union) => Some(TypeAndRange {
-                        ty: union.filter(self.db(), |ty| !ty.is_notimplemented(self.db())),
-                        range: ty_range.range,
-                    }),
-                    ty if ty.is_notimplemented(self.db()) => None,
-                    _ => Some(ty_range),
-                })
-                .filter(|ty_range| !ty_range.ty.is_assignable_to(self.db(), expected_ty))
-            {
-                report_invalid_return_type(
-                    &self.context,
-                    invalid.range,
-                    returns.range(),
-                    declared_ty,
-                    invalid.ty,
-                );
-            }
-            if self
-                .index
-                .use_def_map(scope_id)
-                .can_implicitly_return_none(self.db())
-                && !Type::none(self.db()).is_assignable_to(self.db(), expected_ty)
-            {
-                let no_return = self.return_types_and_ranges.is_empty();
-                report_implicit_return_type(
-                    &self.context,
-                    returns.range(),
-                    declared_ty,
-                    has_empty_body,
-                    enclosing_class_context,
-                    no_return,
-                );
-            }
-        }
-    }
-
-    fn infer_body(&mut self, suite: &[ast::Stmt]) {
-        for statement in suite {
-            self.infer_statement(statement);
-        }
-    }
-
-    fn infer_statement(&mut self, statement: &ast::Stmt) {
-        match statement {
-            ast::Stmt::FunctionDef(function) => self.infer_function_definition_statement(function),
-            ast::Stmt::ClassDef(class) => self.infer_class_definition_statement(class),
-            ast::Stmt::Expr(ast::StmtExpr {
-                range: _,
-                node_index: _,
-                value,
-            }) => {
-                // If this is a call expression, we would have added a `ReturnsNever` constraint,
-                // meaning this will be a standalone expression.
-                self.infer_maybe_standalone_expression(value);
-            }
-            ast::Stmt::If(if_statement) => self.infer_if_statement(if_statement),
-            ast::Stmt::Try(try_statement) => self.infer_try_statement(try_statement),
-            ast::Stmt::With(with_statement) => self.infer_with_statement(with_statement),
-            ast::Stmt::Match(match_statement) => self.infer_match_statement(match_statement),
-            ast::Stmt::Assign(assign) => self.infer_assignment_statement(assign),
-            ast::Stmt::AnnAssign(assign) => self.infer_annotated_assignment_statement(assign),
-            ast::Stmt::AugAssign(aug_assign) => {
-                self.infer_augmented_assignment_statement(aug_assign);
-            }
-            ast::Stmt::TypeAlias(type_statement) => self.infer_type_alias_statement(type_statement),
-            ast::Stmt::For(for_statement) => self.infer_for_statement(for_statement),
-            ast::Stmt::While(while_statement) => self.infer_while_statement(while_statement),
-            ast::Stmt::Import(import) => self.infer_import_statement(import),
-            ast::Stmt::ImportFrom(import) => self.infer_import_from_statement(import),
-            ast::Stmt::Assert(assert_statement) => self.infer_assert_statement(assert_statement),
-            ast::Stmt::Raise(raise) => self.infer_raise_statement(raise),
-            ast::Stmt::Return(ret) => self.infer_return_statement(ret),
-            ast::Stmt::Delete(delete) => self.infer_delete_statement(delete),
-            ast::Stmt::Nonlocal(nonlocal) => self.infer_nonlocal_statement(nonlocal),
-            ast::Stmt::Global(global) => self.infer_global_statement(global),
-            ast::Stmt::Break(_)
-            | ast::Stmt::Continue(_)
-            | ast::Stmt::Pass(_)
-            | ast::Stmt::IpyEscapeCommand(_) => {
-                // No-op
-            }
-        }
-    }
-
-    fn infer_definition(&mut self, node: impl Into<DefinitionNodeKey> + std::fmt::Debug + Copy) {
-        let definition = self.index.expect_single_definition(node);
-        let result = infer_definition_types(self.db(), definition);
-        self.extend_definition(result);
-    }
-
-    fn infer_function_definition_statement(&mut self, function: &ast::StmtFunctionDef) {
-        self.infer_definition(function);
-    }
-
-    fn infer_function_definition(
-        &mut self,
-        function: &ast::StmtFunctionDef,
-        definition: Definition<'db>,
-    ) {
-        let ast::StmtFunctionDef {
-            range: _,
-            node_index: _,
-            is_async: _,
-            name,
-            type_params,
-            parameters,
-            returns,
-            body: _,
-            decorator_list,
-        } = function;
-
-        let mut decorator_types_and_nodes = Vec::with_capacity(decorator_list.len());
-        let mut function_decorators = FunctionDecorators::empty();
-        let mut deprecated = None;
-        let mut dataclass_transformer_params = None;
-
-        for decorator in decorator_list {
-            let decorator_type = self.infer_decorator(decorator);
-            let decorator_function_decorator =
-                FunctionDecorators::from_decorator_type(self.db(), decorator_type);
-            function_decorators |= decorator_function_decorator;
-
-            match decorator_type {
-                Type::FunctionLiteral(function) => {
-                    if let Some(KnownFunction::NoTypeCheck) = function.known(self.db()) {
-                        // If the function is decorated with the `no_type_check` decorator,
-                        // we need to suppress any errors that come after the decorators.
-                        self.context.set_in_no_type_check(InNoTypeCheck::Yes);
-                        continue;
-                    }
-                }
-                Type::KnownInstance(KnownInstanceType::Deprecated(deprecated_inst)) => {
-                    deprecated = Some(deprecated_inst);
-                }
-                Type::DataclassTransformer(params) => {
-                    dataclass_transformer_params = Some(params);
-                }
-                _ => {}
-            }
-            if !decorator_function_decorator.is_empty() {
-                continue;
-            }
-
-            decorator_types_and_nodes.push((decorator_type, decorator));
-        }
-
-        for default in parameters
-            .iter_non_variadic_params()
-            .filter_map(|param| param.default.as_deref())
-        {
-            self.infer_expression(default);
-        }
-
-        // If there are type params, parameters and returns are evaluated in that scope, that is, in
-        // `infer_function_type_params`, rather than here.
-        if type_params.is_none() {
-            if self.defer_annotations() {
-                self.deferred.insert(definition);
-            } else {
-                let previous_typevar_binding_context =
-                    self.typevar_binding_context.replace(definition);
-                self.infer_return_type_annotation(
-                    returns.as_deref(),
-                    DeferredExpressionState::None,
-                );
-                self.infer_parameters(parameters);
-                self.typevar_binding_context = previous_typevar_binding_context;
-            }
-        }
-
-        let known_function =
-            KnownFunction::try_from_definition_and_name(self.db(), definition, name);
-
-        let body_scope = self
-            .index
-            .node_scope(NodeWithScopeRef::Function(function))
-            .to_scope_id(self.db(), self.file());
-
-        let overload_literal = OverloadLiteral::new(
-            self.db(),
-            &name.id,
-            known_function,
-            body_scope,
-            function_decorators,
-            deprecated,
-            dataclass_transformer_params,
-        );
-
-        let inherited_generic_context = None;
-        let function_literal =
-            FunctionLiteral::new(self.db(), overload_literal, inherited_generic_context);
-
-        let type_mappings = Box::default();
-        let mut inferred_ty = Type::FunctionLiteral(FunctionType::new(
-            self.db(),
-            function_literal,
-            type_mappings,
-        ));
-        self.undecorated_type = Some(inferred_ty);
-
-        for (decorator_ty, decorator_node) in decorator_types_and_nodes.iter().rev() {
-            inferred_ty = match decorator_ty
-                .try_call(self.db(), &CallArguments::positional([inferred_ty]))
-                .map(|bindings| bindings.return_type(self.db()))
-            {
-                Ok(return_ty) => return_ty,
-                Err(CallError(_, bindings)) => {
-                    bindings.report_diagnostics(&self.context, (*decorator_node).into());
-                    bindings.return_type(self.db())
-                }
-            };
-        }
-
-        self.add_declaration_with_binding(
-            function.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(inferred_ty),
-        );
-    }
-
-    fn infer_return_type_annotation(
-        &mut self,
-        returns: Option<&ast::Expr>,
-        deferred_expression_state: DeferredExpressionState,
-    ) {
-        if let Some(returns) = returns {
-            let annotated = self.infer_annotation_expression(returns, deferred_expression_state);
-
-            if !annotated.qualifiers.is_empty() {
-                for qualifier in [
-                    TypeQualifiers::FINAL,
-                    TypeQualifiers::CLASS_VAR,
-                    TypeQualifiers::INIT_VAR,
-                ] {
-                    if annotated.qualifiers.contains(qualifier) {
-                        if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, returns)
-                        {
-                            builder.into_diagnostic(format!(
-                                "`{name}` is not allowed in function return type annotations",
-                                name = qualifier.name()
-                            ));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn infer_parameters(&mut self, parameters: &ast::Parameters) {
-        let ast::Parameters {
-            range: _,
-            node_index: _,
-            posonlyargs: _,
-            args: _,
-            vararg,
-            kwonlyargs: _,
-            kwarg,
-        } = parameters;
-
-        for param_with_default in parameters.iter_non_variadic_params() {
-            self.infer_parameter_with_default(param_with_default);
-        }
-        if let Some(vararg) = vararg {
-            self.infer_parameter(vararg);
-        }
-        if let Some(kwarg) = kwarg {
-            self.infer_parameter(kwarg);
-        }
-    }
-
-    fn infer_parameter_with_default(&mut self, parameter_with_default: &ast::ParameterWithDefault) {
-        let ast::ParameterWithDefault {
-            range: _,
-            node_index: _,
-            parameter,
-            default: _,
-        } = parameter_with_default;
-
-        let annotated = self.infer_optional_annotation_expression(
-            parameter.annotation.as_deref(),
-            self.defer_annotations().into(),
-        );
-
-        if let Some(qualifiers) = annotated.map(|annotated| annotated.qualifiers) {
-            if !qualifiers.is_empty() {
-                for qualifier in [
-                    TypeQualifiers::FINAL,
-                    TypeQualifiers::CLASS_VAR,
-                    TypeQualifiers::INIT_VAR,
-                ] {
-                    if qualifiers.contains(qualifier) {
-                        if let Some(builder) =
-                            self.context.report_lint(&INVALID_TYPE_FORM, parameter)
-                        {
-                            builder.into_diagnostic(format!(
-                                "`{name}` is not allowed in function parameter annotations",
-                                name = qualifier.name()
-                            ));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn infer_parameter(&mut self, parameter: &ast::Parameter) {
-        let ast::Parameter {
-            range: _,
-            node_index: _,
-            name: _,
-            annotation,
-        } = parameter;
-
-        self.infer_optional_annotation_expression(
-            annotation.as_deref(),
-            self.defer_annotations().into(),
-        );
-    }
-
-    /// Set initial declared type (if annotated) and inferred type for a function-parameter symbol,
-    /// in the function body scope.
-    ///
-    /// The declared type is the annotated type, if any, or `Unknown`.
-    ///
-    /// The inferred type is the annotated type, unioned with the type of the default value, if
-    /// any. If both types are fully static, this union is a no-op (it should simplify to just the
-    /// annotated type.) But in a case like `f(x=None)` with no annotated type, we want to infer
-    /// the type `Unknown | None` for `x`, not just `Unknown`, so that we can error on usage of `x`
-    /// that would not be valid for `None`.
-    ///
-    /// If the default-value type is not assignable to the declared (annotated) type, we ignore the
-    /// default-value type and just infer the annotated type; this is the same way we handle
-    /// assignments, and allows an explicit annotation to override a bad inference.
-    ///
-    /// Parameter definitions are odd in that they define a symbol in the function-body scope, so
-    /// the Definition belongs to the function body scope, but the expressions (annotation and
-    /// default value) both belong to outer scopes. (The default value always belongs to the outer
-    /// scope in which the function is defined, the annotation belongs either to the outer scope,
-    /// or maybe to an intervening type-params scope, if it's a generic function.) So we don't use
-    /// `self.infer_expression` or store any expression types here, we just use `expression_ty` to
-    /// get the types of the expressions from their respective scopes.
-    ///
-    /// It is safe (non-cycle-causing) to use `expression_ty` here, because an outer scope can't
-    /// depend on a definition from an inner scope, so we shouldn't be in-process of inferring the
-    /// outer scope here.
-    fn infer_parameter_definition(
-        &mut self,
-        parameter_with_default: &ast::ParameterWithDefault,
-        definition: Definition<'db>,
-    ) {
-        let ast::ParameterWithDefault {
-            parameter,
-            default,
-            range: _,
-            node_index: _,
-        } = parameter_with_default;
-        let default_ty = default
-            .as_ref()
-            .map(|default| self.file_expression_type(default));
-        if let Some(annotation) = parameter.annotation.as_ref() {
-            let declared_ty = self.file_expression_type(annotation);
-            let declared_and_inferred_ty = if let Some(default_ty) = default_ty {
-                if default_ty.is_assignable_to(self.db(), declared_ty) {
-                    DeclaredAndInferredType::MightBeDifferent {
-                        declared_ty: declared_ty.into(),
-                        inferred_ty: UnionType::from_elements(self.db(), [declared_ty, default_ty]),
-                    }
-                } else if (self.in_stub()
-                    || self.in_function_overload_or_abstractmethod()
-                    || self
-                        .class_context_of_current_method()
-                        .is_some_and(|class| class.is_protocol(self.db())))
-                    && default
-                        .as_ref()
-                        .is_some_and(|d| d.is_ellipsis_literal_expr())
-                {
-                    DeclaredAndInferredType::are_the_same_type(declared_ty)
-                } else {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&INVALID_PARAMETER_DEFAULT, parameter_with_default)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Default value of type `{}` is not assignable \
-                             to annotated parameter type `{}`",
-                            default_ty.display(self.db()),
-                            declared_ty.display(self.db())
-                        ));
-                    }
-                    DeclaredAndInferredType::are_the_same_type(declared_ty)
-                }
-            } else {
-                DeclaredAndInferredType::are_the_same_type(declared_ty)
-            };
-            self.add_declaration_with_binding(
-                parameter.into(),
-                definition,
-                &declared_and_inferred_ty,
-            );
-        } else {
-            let ty = if let Some(default_ty) = default_ty {
-                UnionType::from_elements(self.db(), [Type::unknown(), default_ty])
-            } else {
-                Type::unknown()
-            };
-            self.add_binding(parameter.into(), definition, ty);
-        }
-    }
-
-    /// Set initial declared/inferred types for a `*args` variadic positional parameter.
-    ///
-    /// The annotated type is implicitly wrapped in a homogeneous tuple.
-    ///
-    /// See [`infer_parameter_definition`] doc comment for some relevant observations about scopes.
-    ///
-    /// [`infer_parameter_definition`]: Self::infer_parameter_definition
-    fn infer_variadic_positional_parameter_definition(
-        &mut self,
-        parameter: &ast::Parameter,
-        definition: Definition<'db>,
-    ) {
-        if let Some(annotation) = parameter.annotation() {
-            let ty = if annotation.is_starred_expr() {
-                todo_type!("PEP 646")
-            } else {
-                let annotated_type = self.file_expression_type(annotation);
-                Type::homogeneous_tuple(self.db(), annotated_type)
-            };
-
-            self.add_declaration_with_binding(
-                parameter.into(),
-                definition,
-                &DeclaredAndInferredType::are_the_same_type(ty),
-            );
-        } else {
-            self.add_binding(
-                parameter.into(),
-                definition,
-                Type::homogeneous_tuple(self.db(), Type::unknown()),
-            );
-        }
-    }
-
-    /// Set initial declared/inferred types for a `*args` variadic positional parameter.
-    ///
-    /// The annotated type is implicitly wrapped in a string-keyed dictionary.
-    ///
-    /// See [`infer_parameter_definition`] doc comment for some relevant observations about scopes.
-    ///
-    /// [`infer_parameter_definition`]: Self::infer_parameter_definition
-    fn infer_variadic_keyword_parameter_definition(
-        &mut self,
-        parameter: &ast::Parameter,
-        definition: Definition<'db>,
-    ) {
-        if let Some(annotation) = parameter.annotation() {
-            let annotated_ty = self.file_expression_type(annotation);
-            let ty = KnownClass::Dict.to_specialized_instance(
-                self.db(),
-                [KnownClass::Str.to_instance(self.db()), annotated_ty],
-            );
-            self.add_declaration_with_binding(
-                parameter.into(),
-                definition,
-                &DeclaredAndInferredType::are_the_same_type(ty),
-            );
-        } else {
-            self.add_binding(
-                parameter.into(),
-                definition,
-                KnownClass::Dict.to_specialized_instance(
-                    self.db(),
-                    [KnownClass::Str.to_instance(self.db()), Type::unknown()],
-                ),
-            );
-        }
-    }
-
-    fn infer_class_definition_statement(&mut self, class: &ast::StmtClassDef) {
-        self.infer_definition(class);
-    }
-
-    fn infer_class_definition(
-        &mut self,
-        class_node: &ast::StmtClassDef,
-        definition: Definition<'db>,
-    ) {
-        let ast::StmtClassDef {
-            range: _,
-            node_index: _,
-            name,
-            type_params,
-            decorator_list,
-            arguments: _,
-            body: _,
-        } = class_node;
-
-        let mut deprecated = None;
-        let mut dataclass_params = None;
-        let mut dataclass_transformer_params = None;
-        for decorator in decorator_list {
-            let decorator_ty = self.infer_decorator(decorator);
-            if decorator_ty
-                .into_function_literal()
-                .is_some_and(|function| function.is_known(self.db(), KnownFunction::Dataclass))
-            {
-                dataclass_params = Some(DataclassParams::default());
-                continue;
-            }
-
-            if let Type::DataclassDecorator(params) = decorator_ty {
-                dataclass_params = Some(params);
-                continue;
-            }
-
-            if let Type::KnownInstance(KnownInstanceType::Deprecated(deprecated_inst)) =
-                decorator_ty
-            {
-                deprecated = Some(deprecated_inst);
-                continue;
-            }
-
-            if let Type::FunctionLiteral(f) = decorator_ty {
-                // We do not yet detect or flag `@dataclass_transform` applied to more than one
-                // overload, or an overload and the implementation both. Nevertheless, this is not
-                // allowed. We do not try to treat the offenders intelligently -- just use the
-                // params of the last seen usage of `@dataclass_transform`
-                let params = f
-                    .iter_overloads_and_implementation(self.db())
-                    .find_map(|overload| overload.dataclass_transformer_params(self.db()));
-                if let Some(params) = params {
-                    dataclass_params = Some(params.into());
-                    continue;
-                }
-            }
-
-            if let Type::DataclassTransformer(params) = decorator_ty {
-                dataclass_transformer_params = Some(params);
-                continue;
-            }
-        }
-
-        let body_scope = self
-            .index
-            .node_scope(NodeWithScopeRef::Class(class_node))
-            .to_scope_id(self.db(), self.file());
-
-        let maybe_known_class = KnownClass::try_from_file_and_name(self.db(), self.file(), name);
-
-        let ty = if maybe_known_class.is_none()
-            && &name.id == "NamedTuple"
-            && matches!(
-                file_to_module(self.db(), self.file()).and_then(|module| module.known(self.db())),
-                Some(KnownModule::Typing | KnownModule::TypingExtensions)
-            ) {
-            Type::SpecialForm(SpecialFormType::NamedTuple)
-        } else {
-            Type::from(ClassLiteral::new(
-                self.db(),
-                name.id.clone(),
-                body_scope,
-                maybe_known_class,
-                deprecated,
-                dataclass_params,
-                dataclass_transformer_params,
-            ))
-        };
-
-        self.add_declaration_with_binding(
-            class_node.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(ty),
-        );
-
-        // if there are type parameters, then the keywords and bases are within that scope
-        // and we don't need to run inference here
-        if type_params.is_none() {
-            for keyword in class_node.keywords() {
-                self.infer_expression(&keyword.value);
-            }
-
-            // Inference of bases deferred in stubs
-            // TODO: Only defer the references that are actually string literals, instead of
-            // deferring the entire class definition if a string literal occurs anywhere in the
-            // base class list.
-            if self.in_stub() || class_node.bases().iter().any(contains_string_literal) {
-                self.deferred.insert(definition);
-            } else {
-                let previous_typevar_binding_context =
-                    self.typevar_binding_context.replace(definition);
-                for base in class_node.bases() {
-                    self.infer_expression(base);
-                }
-                self.typevar_binding_context = previous_typevar_binding_context;
-            }
-        }
-    }
-
-    fn infer_function_deferred(
-        &mut self,
-        definition: Definition<'db>,
-        function: &ast::StmtFunctionDef,
-    ) {
-        let previous_typevar_binding_context = self.typevar_binding_context.replace(definition);
-        self.infer_return_type_annotation(
-            function.returns.as_deref(),
-            DeferredExpressionState::Deferred,
-        );
-        self.infer_parameters(function.parameters.as_ref());
-        self.typevar_binding_context = previous_typevar_binding_context;
-    }
-
-    fn infer_class_deferred(&mut self, definition: Definition<'db>, class: &ast::StmtClassDef) {
-        let previous_typevar_binding_context = self.typevar_binding_context.replace(definition);
-        for base in class.bases() {
-            self.infer_expression(base);
-        }
-        self.typevar_binding_context = previous_typevar_binding_context;
-    }
-
-    fn infer_type_alias_definition(
-        &mut self,
-        type_alias: &ast::StmtTypeAlias,
-        definition: Definition<'db>,
-    ) {
-        self.infer_expression(&type_alias.name);
-
-        let rhs_scope = self
-            .index
-            .node_scope(NodeWithScopeRef::TypeAlias(type_alias))
-            .to_scope_id(self.db(), self.file());
-
-        let type_alias_ty = Type::KnownInstance(KnownInstanceType::TypeAliasType(
-            TypeAliasType::PEP695(PEP695TypeAliasType::new(
-                self.db(),
-                &type_alias.name.as_name_expr().unwrap().id,
-                rhs_scope,
-            )),
-        ));
-
-        self.add_declaration_with_binding(
-            type_alias.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(type_alias_ty),
-        );
-    }
-
-    fn infer_if_statement(&mut self, if_statement: &ast::StmtIf) {
-        let ast::StmtIf {
-            range: _,
-            node_index: _,
-            test,
-            body,
-            elif_else_clauses,
-        } = if_statement;
-
-        let test_ty = self.infer_standalone_expression(test);
-
-        if let Err(err) = test_ty.try_bool(self.db()) {
-            err.report_diagnostic(&self.context, &**test);
-        }
-
-        self.infer_body(body);
-
-        for clause in elif_else_clauses {
-            let ast::ElifElseClause {
-                range: _,
-                node_index: _,
-                test,
-                body,
-            } = clause;
-
-            if let Some(test) = &test {
-                let test_ty = self.infer_standalone_expression(test);
-
-                if let Err(err) = test_ty.try_bool(self.db()) {
-                    err.report_diagnostic(&self.context, test);
-                }
-            }
-
-            self.infer_body(body);
-        }
-    }
-
-    fn infer_try_statement(&mut self, try_statement: &ast::StmtTry) {
-        let ast::StmtTry {
-            range: _,
-            node_index: _,
-            body,
-            handlers,
-            orelse,
-            finalbody,
-            is_star: _,
-        } = try_statement;
-
-        self.infer_body(body);
-
-        for handler in handlers {
-            let ast::ExceptHandler::ExceptHandler(handler) = handler;
-            let ast::ExceptHandlerExceptHandler {
-                type_: handled_exceptions,
-                name: symbol_name,
-                body,
-                range: _,
-                node_index: _,
-            } = handler;
-
-            // If `symbol_name` is `Some()` and `handled_exceptions` is `None`,
-            // it's invalid syntax (something like `except as e:`).
-            // However, it's obvious that the user *wanted* `e` to be bound here,
-            // so we'll have created a definition in the semantic-index stage anyway.
-            if symbol_name.is_some() {
-                self.infer_definition(handler);
-            } else {
-                self.infer_exception(handled_exceptions.as_deref(), try_statement.is_star);
-            }
-
-            self.infer_body(body);
-        }
-
-        self.infer_body(orelse);
-        self.infer_body(finalbody);
-    }
-
-    fn infer_with_statement(&mut self, with_statement: &ast::StmtWith) {
-        let ast::StmtWith {
-            range: _,
-            node_index: _,
-            is_async,
-            items,
-            body,
-        } = with_statement;
-        for item in items {
-            let target = item.optional_vars.as_deref();
-            if let Some(target) = target {
-                self.infer_target(target, &item.context_expr, |builder, context_expr| {
-                    // TODO: `infer_with_statement_definition` reports a diagnostic if `ctx_manager_ty` isn't a context manager
-                    //  but only if the target is a name. We should report a diagnostic here if the target isn't a name:
-                    //  `with not_context_manager as a.x: ...
-                    builder
-                        .infer_standalone_expression(context_expr)
-                        .enter(builder.db())
-                });
-            } else {
-                // Call into the context expression inference to validate that it evaluates
-                // to a valid context manager.
-                let context_expression_ty = self.infer_expression(&item.context_expr);
-                self.infer_context_expression(&item.context_expr, context_expression_ty, *is_async);
-                self.infer_optional_expression(target);
-            }
-        }
-
-        self.infer_body(body);
-    }
-
-    fn infer_with_item_definition(
-        &mut self,
-        with_item: &WithItemDefinitionKind<'db>,
-        definition: Definition<'db>,
-    ) {
-        let context_expr = with_item.context_expr(self.module());
-        let target = with_item.target(self.module());
-
-        let target_ty = match with_item.target_kind() {
-            TargetKind::Sequence(unpack_position, unpack) => {
-                let unpacked = infer_unpack_types(self.db(), unpack);
-                if unpack_position == UnpackPosition::First {
-                    self.context.extend(unpacked.diagnostics());
-                }
-                unpacked.expression_type(target)
-            }
-            TargetKind::Single => {
-                let context_expr_ty = self.infer_standalone_expression(context_expr);
-                self.infer_context_expression(context_expr, context_expr_ty, with_item.is_async())
-            }
-        };
-
-        self.store_expression_type(target, target_ty);
-        self.add_binding(target.into(), definition, target_ty);
-    }
-
-    /// Infers the type of a context expression (`with expr`) and returns the target's type
-    ///
-    /// Returns [`Type::unknown`] if the context expression doesn't implement the context manager protocol.
-    ///
-    /// ## Terminology
-    /// See [PEP343](https://peps.python.org/pep-0343/#standard-terminology).
-    fn infer_context_expression(
-        &mut self,
-        context_expression: &ast::Expr,
-        context_expression_type: Type<'db>,
-        is_async: bool,
-    ) -> Type<'db> {
-        let eval_mode = if is_async {
-            EvaluationMode::Async
-        } else {
-            EvaluationMode::Sync
-        };
-
-        context_expression_type
-            .try_enter_with_mode(self.db(), eval_mode)
-            .unwrap_or_else(|err| {
-                err.report_diagnostic(
-                    &self.context,
-                    context_expression_type,
-                    context_expression.into(),
-                );
-                err.fallback_enter_type(self.db())
-            })
-    }
-
-    fn infer_exception(&mut self, node: Option<&ast::Expr>, is_star: bool) -> Type<'db> {
-        // If there is no handled exception, it's invalid syntax;
-        // a diagnostic will have already been emitted
-        let node_ty = node.map_or(Type::unknown(), |ty| self.infer_expression(ty));
-        let type_base_exception = KnownClass::BaseException.to_subclass_of(self.db());
-
-        // If it's an `except*` handler, this won't actually be the type of the bound symbol;
-        // it will actually be the type of the generic parameters to `BaseExceptionGroup` or `ExceptionGroup`.
-        let symbol_ty = if let Some(tuple_spec) = node_ty.tuple_instance_spec(self.db()) {
-            let mut builder = UnionBuilder::new(self.db());
-            for element in tuple_spec.all_elements().copied() {
-                builder = builder.add(
-                    if element.is_assignable_to(self.db(), type_base_exception) {
-                        element.to_instance(self.db()).expect(
-                            "`Type::to_instance()` should always return `Some()` \
-                                if called on a type assignable to `type[BaseException]`",
-                        )
-                    } else {
-                        if let Some(node) = node {
-                            report_invalid_exception_caught(&self.context, node, element);
-                        }
-                        Type::unknown()
-                    },
-                );
-            }
-            builder.build()
-        } else if node_ty.is_assignable_to(self.db(), type_base_exception) {
-            node_ty.to_instance(self.db()).expect(
-                "`Type::to_instance()` should always return `Some()` \
-                    if called on a type assignable to `type[BaseException]`",
-            )
-        } else if node_ty.is_assignable_to(
-            self.db(),
-            Type::homogeneous_tuple(self.db(), type_base_exception),
-        ) {
-            node_ty
-                .tuple_instance_spec(self.db())
-                .and_then(|spec| {
-                    let specialization = spec
-                        .homogeneous_element_type(self.db())
-                        .to_instance(self.db());
-
-                    debug_assert!(specialization.is_some_and(|specialization_type| {
-                        specialization_type.is_assignable_to(
-                            self.db(),
-                            KnownClass::BaseException.to_instance(self.db()),
-                        )
-                    }));
-
-                    specialization
-                })
-                .unwrap_or_else(|| KnownClass::BaseException.to_instance(self.db()))
-        } else if node_ty.is_assignable_to(
-            self.db(),
-            UnionType::from_elements(
-                self.db(),
-                [
-                    type_base_exception,
-                    Type::homogeneous_tuple(self.db(), type_base_exception),
-                ],
-            ),
-        ) {
-            KnownClass::BaseException.to_instance(self.db())
-        } else {
-            if let Some(node) = node {
-                report_invalid_exception_caught(&self.context, node, node_ty);
-            }
-            Type::unknown()
-        };
-
-        if is_star {
-            let class = if symbol_ty
-                .is_subtype_of(self.db(), KnownClass::Exception.to_instance(self.db()))
-            {
-                KnownClass::ExceptionGroup
-            } else {
-                KnownClass::BaseExceptionGroup
-            };
-            class.to_specialized_instance(self.db(), [symbol_ty])
-        } else {
-            symbol_ty
-        }
-    }
-
-    fn infer_except_handler_definition(
-        &mut self,
-        except_handler_definition: &ExceptHandlerDefinitionKind,
-        definition: Definition<'db>,
-    ) {
-        let symbol_ty = self.infer_exception(
-            except_handler_definition.handled_exceptions(self.module()),
-            except_handler_definition.is_star(),
-        );
-
-        self.add_binding(
-            except_handler_definition.node(self.module()).into(),
-            definition,
-            symbol_ty,
-        );
-    }
-
-    fn infer_typevar_definition(
-        &mut self,
-        node: &ast::TypeParamTypeVar,
-        definition: Definition<'db>,
-    ) {
-        let ast::TypeParamTypeVar {
-            range: _,
-            node_index: _,
-            name,
-            bound,
-            default,
-        } = node;
-
-        let bound_or_constraint = match bound.as_deref() {
-            Some(expr @ ast::Expr::Tuple(ast::ExprTuple { elts, .. })) => {
-                if elts.len() < 2 {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&INVALID_TYPE_VARIABLE_CONSTRAINTS, expr)
-                    {
-                        builder.into_diagnostic("TypeVar must have at least two constrained types");
-                    }
-                    None
-                } else {
-                    Some(TypeVarBoundOrConstraintsEvaluation::LazyConstraints)
-                }
-            }
-            Some(_) => Some(TypeVarBoundOrConstraintsEvaluation::LazyUpperBound),
-            None => None,
-        };
-        if bound_or_constraint.is_some() || default.is_some() {
-            self.deferred.insert(definition);
-        }
-        let ty = Type::KnownInstance(KnownInstanceType::TypeVar(TypeVarInstance::new(
-            self.db(),
-            &name.id,
-            Some(definition),
-            bound_or_constraint,
-            None,
-            default.as_deref().map(|_| TypeVarDefaultEvaluation::Lazy),
-            TypeVarKind::Pep695,
-        )));
-        self.add_declaration_with_binding(
-            node.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(ty),
-        );
-    }
-
-    fn infer_typevar_deferred(&mut self, node: &ast::TypeParamTypeVar) {
-        let ast::TypeParamTypeVar {
-            range: _,
-            node_index: _,
-            name: _,
-            bound,
-            default,
-        } = node;
-        match bound.as_deref() {
-            Some(expr @ ast::Expr::Tuple(ast::ExprTuple { elts, .. })) => {
-                // We don't use UnionType::from_elements or UnionBuilder here, because we don't
-                // want to simplify the list of constraints like we do with the elements of an
-                // actual union type.
-                // TODO: Consider using a new `OneOfType` connective here instead, since that
-                // more accurately represents the actual semantics of typevar constraints.
-                let ty = Type::Union(UnionType::new(
-                    self.db(),
-                    elts.iter()
-                        .map(|expr| self.infer_type_expression(expr))
-                        .collect::<Box<[_]>>(),
-                ));
-                self.store_expression_type(expr, ty);
-            }
-            Some(expr) => {
-                self.infer_type_expression(expr);
-            }
-            None => {}
-        }
-        self.infer_optional_type_expression(default.as_deref());
-    }
-
-    fn infer_paramspec_definition(
-        &mut self,
-        node: &ast::TypeParamParamSpec,
-        definition: Definition<'db>,
-    ) {
-        let ast::TypeParamParamSpec {
-            range: _,
-            node_index: _,
-            name: _,
-            default,
-        } = node;
-        self.infer_optional_expression(default.as_deref());
-        let pep_695_todo = Type::Dynamic(DynamicType::TodoPEP695ParamSpec);
-        self.add_declaration_with_binding(
-            node.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(pep_695_todo),
-        );
-    }
-
-    fn infer_typevartuple_definition(
-        &mut self,
-        node: &ast::TypeParamTypeVarTuple,
-        definition: Definition<'db>,
-    ) {
-        let ast::TypeParamTypeVarTuple {
-            range: _,
-            node_index: _,
-            name: _,
-            default,
-        } = node;
-        self.infer_optional_expression(default.as_deref());
-        let pep_695_todo = todo_type!("PEP-695 TypeVarTuple definition types");
-        self.add_declaration_with_binding(
-            node.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(pep_695_todo),
-        );
-    }
-
-    fn infer_match_statement(&mut self, match_statement: &ast::StmtMatch) {
-        let ast::StmtMatch {
-            range: _,
-            node_index: _,
-            subject,
-            cases,
-        } = match_statement;
-
-        self.infer_standalone_expression(subject);
-
-        for case in cases {
-            let ast::MatchCase {
-                range: _,
-                node_index: _,
-                body,
-                pattern,
-                guard,
-            } = case;
-            self.infer_match_pattern(pattern);
-
-            if let Some(guard) = guard.as_deref() {
-                let guard_ty = self.infer_standalone_expression(guard);
-
-                if let Err(err) = guard_ty.try_bool(self.db()) {
-                    err.report_diagnostic(&self.context, guard);
-                }
-            }
-
-            self.infer_body(body);
-        }
-    }
-
-    fn infer_match_pattern_definition(
-        &mut self,
-        pattern: &ast::Pattern,
-        _index: u32,
-        definition: Definition<'db>,
-    ) {
-        // TODO(dhruvmanila): The correct way to infer types here is to perform structural matching
-        // against the subject expression type (which we can query via `infer_expression_types`)
-        // and extract the type at the `index` position if the pattern matches. This will be
-        // similar to the logic in `self.infer_assignment_definition`.
-        self.add_binding(
-            pattern.into(),
-            definition,
-            todo_type!("`match` pattern definition types"),
-        );
-    }
-
-    fn infer_match_pattern(&mut self, pattern: &ast::Pattern) {
-        // We need to create a standalone expression for each arm of a match statement, since they
-        // can introduce constraints on the match subject. (Or more accurately, for the match arm's
-        // pattern, since its the pattern that introduces any constraints, not the body.) Ideally,
-        // that standalone expression would wrap the match arm's pattern as a whole. But a
-        // standalone expression can currently only wrap an ast::Expr, which patterns are not. So,
-        // we need to choose an Expr that can “stand in” for the pattern, which we can wrap in a
-        // standalone expression.
-        //
-        // That said, when inferring the type of a standalone expression, we don't have access to
-        // its parent or sibling nodes.  That means, for instance, that in a class pattern, where
-        // we are currently using the class name as the standalone expression, we do not have
-        // access to the class pattern's arguments in the standalone expression inference scope.
-        // At the moment, we aren't trying to do anything with those arguments when creating a
-        // narrowing constraint for the pattern.  But in the future, if we do, we will have to
-        // either wrap those arguments in their own standalone expressions, or update Expression to
-        // be able to wrap other AST node types besides just ast::Expr.
-        //
-        // This function is only called for the top-level pattern of a match arm, and is
-        // responsible for inferring the standalone expression for each supported pattern type. It
-        // then hands off to `infer_nested_match_pattern` for any subexpressions and subpatterns,
-        // where we do NOT have any additional standalone expressions to infer through.
-        //
-        // TODO(dhruvmanila): Add a Salsa query for inferring pattern types and matching against
-        // the subject expression: https://github.com/astral-sh/ruff/pull/13147#discussion_r1739424510
-        match pattern {
-            ast::Pattern::MatchValue(match_value) => {
-                self.infer_standalone_expression(&match_value.value);
-            }
-            ast::Pattern::MatchClass(match_class) => {
-                let ast::PatternMatchClass {
-                    range: _,
-                    node_index: _,
-                    cls,
-                    arguments,
-                } = match_class;
-                for pattern in &arguments.patterns {
-                    self.infer_nested_match_pattern(pattern);
-                }
-                for keyword in &arguments.keywords {
-                    self.infer_nested_match_pattern(&keyword.pattern);
-                }
-                self.infer_standalone_expression(cls);
-            }
-            ast::Pattern::MatchOr(match_or) => {
-                for pattern in &match_or.patterns {
-                    self.infer_match_pattern(pattern);
-                }
-            }
-            _ => {
-                self.infer_nested_match_pattern(pattern);
-            }
-        }
-    }
-
-    fn infer_nested_match_pattern(&mut self, pattern: &ast::Pattern) {
-        match pattern {
-            ast::Pattern::MatchValue(match_value) => {
-                self.infer_maybe_standalone_expression(&match_value.value);
-            }
-            ast::Pattern::MatchSequence(match_sequence) => {
-                for pattern in &match_sequence.patterns {
-                    self.infer_nested_match_pattern(pattern);
-                }
-            }
-            ast::Pattern::MatchMapping(match_mapping) => {
-                let ast::PatternMatchMapping {
-                    range: _,
-                    node_index: _,
-                    keys,
-                    patterns,
-                    rest: _,
-                } = match_mapping;
-                for key in keys {
-                    self.infer_expression(key);
-                }
-                for pattern in patterns {
-                    self.infer_nested_match_pattern(pattern);
-                }
-            }
-            ast::Pattern::MatchClass(match_class) => {
-                let ast::PatternMatchClass {
-                    range: _,
-                    node_index: _,
-                    cls,
-                    arguments,
-                } = match_class;
-                for pattern in &arguments.patterns {
-                    self.infer_nested_match_pattern(pattern);
-                }
-                for keyword in &arguments.keywords {
-                    self.infer_nested_match_pattern(&keyword.pattern);
-                }
-                self.infer_maybe_standalone_expression(cls);
-            }
-            ast::Pattern::MatchAs(match_as) => {
-                if let Some(pattern) = &match_as.pattern {
-                    self.infer_nested_match_pattern(pattern);
-                }
-            }
-            ast::Pattern::MatchOr(match_or) => {
-                for pattern in &match_or.patterns {
-                    self.infer_nested_match_pattern(pattern);
-                }
-            }
-            ast::Pattern::MatchStar(_) | ast::Pattern::MatchSingleton(_) => {}
-        }
-    }
-
-    fn infer_assignment_statement(&mut self, assignment: &ast::StmtAssign) {
-        let ast::StmtAssign {
-            range: _,
-            node_index: _,
-            targets,
-            value,
-        } = assignment;
-
-        for target in targets {
-            self.infer_target(target, value, |builder, value_expr| {
-                builder.infer_standalone_expression(value_expr)
-            });
-        }
-    }
-
-    /// Infer the (definition) types involved in a `target` expression.
-    ///
-    /// This is used for assignment statements, for statements, etc. with a single or multiple
-    /// targets (unpacking). If `target` is an attribute expression, we check that the assignment
-    /// is valid. For 'target's that are definitions, this check happens elsewhere.
-    ///
-    /// The `infer_value_expr` function is used to infer the type of the `value` expression which
-    /// are not `Name` expressions. The returned type is the one that is eventually assigned to the
-    /// `target`.
-    fn infer_target<F>(&mut self, target: &ast::Expr, value: &ast::Expr, infer_value_expr: F)
-    where
-        F: Fn(&mut TypeInferenceBuilder<'db, '_>, &ast::Expr) -> Type<'db>,
-    {
-        let assigned_ty = match target {
-            ast::Expr::Name(_) => None,
-            _ => Some(infer_value_expr(self, value)),
-        };
-        self.infer_target_impl(target, value, assigned_ty);
-    }
-
-    /// Make sure that the subscript assignment `obj[slice] = value` is valid.
-    fn validate_subscript_assignment(
-        &mut self,
-        target: &ast::ExprSubscript,
-        rhs: &ast::Expr,
-        assigned_ty: Type<'db>,
-    ) -> bool {
-        let ast::ExprSubscript {
-            range: _,
-            node_index: _,
-            value,
-            slice,
-            ctx: _,
-        } = target;
-
-        let value_ty = self.infer_expression(value);
-        let slice_ty = self.infer_expression(slice);
-
-        let db = self.db();
-        let context = &self.context;
-
-        match value_ty.try_call_dunder(
-            db,
-            "__setitem__",
-            CallArguments::positional([slice_ty, assigned_ty]),
-        ) {
-            Ok(_) => true,
-            Err(err) => match err {
-                CallDunderError::PossiblyUnbound { .. } => {
-                    if let Some(builder) =
-                        context.report_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL, &**value)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Method `__setitem__` of type `{}` is possibly unbound",
-                            value_ty.display(db),
-                        ));
-                    }
-                    false
-                }
-                CallDunderError::CallError(call_error_kind, bindings) => {
-                    match call_error_kind {
-                        CallErrorKind::NotCallable => {
-                            if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, &**value)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Method `__setitem__` of type `{}` is not callable \
-                                    on object of type `{}`",
-                                    bindings.callable_type().display(db),
-                                    value_ty.display(db),
-                                ));
-                            }
-                        }
-                        CallErrorKind::BindingError => {
-                            let assigned_d = assigned_ty.display(db);
-                            let value_d = value_ty.display(db);
-
-                            if let Some(typed_dict) = value_ty.into_typed_dict() {
-                                if let Some(key) = slice_ty.into_string_literal() {
-                                    let key = key.value(self.db());
-                                    let items = typed_dict.items(self.db());
-                                    if let Some((_, item)) =
-                                        items.iter().find(|(name, _)| *name == key)
-                                    {
-                                        if let Some(builder) =
-                                            context.report_lint(&INVALID_ASSIGNMENT, rhs)
-                                        {
-                                            let mut diagnostic = builder.into_diagnostic(format_args!(
-                                                "Invalid assignment to key \"{key}\" with declared type `{}` on TypedDict `{value_d}`",
-                                                item.declared_ty.display(db),
-                                            ));
-
-                                            diagnostic.set_primary_message(format_args!(
-                                                "value of type `{assigned_d}`"
-                                            ));
-
-                                            diagnostic.annotate(
-                                                self.context
-                                                    .secondary(value.as_ref())
-                                                    .message(format_args!("TypedDict `{value_d}`")),
-                                            );
-
-                                            diagnostic.annotate(
-                                                self.context.secondary(slice.as_ref()).message(
-                                                    format_args!(
-                                                        "key has declared type `{}`",
-                                                        item.declared_ty.display(db),
-                                                    ),
-                                                ),
-                                            );
-                                        }
-                                    } else {
-                                        report_invalid_key_on_typed_dict(
-                                            &self.context,
-                                            value.as_ref().into(),
-                                            slice.as_ref().into(),
-                                            value_ty,
-                                            slice_ty,
-                                            &items,
-                                        );
-                                    }
-                                } else {
-                                    // Check if the key has a valid type. We only allow string literals, a union of string literals,
-                                    // or a dynamic type like `Any`. We can do this by checking assignability to `LiteralString`,
-                                    // but we need to exclude `LiteralString` itself. This check would technically allow weird key
-                                    // types like `LiteralString & Any` to pass, but it does not need to be perfect. We would just
-                                    // fail to provide the "Only string literals are allowed" hint in that case.
-                                    if slice_ty.is_assignable_to(db, Type::LiteralString)
-                                        && !slice_ty.is_equivalent_to(db, Type::LiteralString)
-                                    {
-                                        if let Some(builder) =
-                                            context.report_lint(&INVALID_ASSIGNMENT, &**slice)
-                                        {
-                                            builder.into_diagnostic(format_args!(
-                                                "Cannot assign value of type `{assigned_d}` to key of type `{}` on TypedDict `{value_d}`",
-                                                slice_ty.display(db)
-                                            ));
-                                        }
-                                    } else {
-                                        if let Some(builder) =
-                                            context.report_lint(&INVALID_KEY, &**slice)
-                                        {
-                                            builder.into_diagnostic(format_args!(
-                                                "Cannot access `{value_d}` with a key of type `{}`. Only string literals are allowed as keys on TypedDicts.",
-                                                slice_ty.display(db)
-                                            ));
-                                        }
-                                    }
-                                }
-                            } else {
-                                if let Some(builder) =
-                                    context.report_lint(&INVALID_ASSIGNMENT, &**value)
-                                {
-                                    builder.into_diagnostic(format_args!(
-                                        "Method `__setitem__` of type `{}` cannot be called with \
-                                        a key of type `{}` and a value of type `{assigned_d}` on object of type `{value_d}`",
-                                        bindings.callable_type().display(db),
-                                        slice_ty.display(db),
-                                    ));
-                                }
-                            }
-                        }
-                        CallErrorKind::PossiblyNotCallable => {
-                            if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, &**value)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Method `__setitem__` of type `{}` is possibly not \
-                                    callable on object of type `{}`",
-                                    bindings.callable_type().display(db),
-                                    value_ty.display(db),
-                                ));
-                            }
-                        }
-                    }
-                    false
-                }
-                CallDunderError::MethodNotAvailable => {
-                    if let Some(builder) = context.report_lint(&INVALID_ASSIGNMENT, &**value) {
-                        builder.into_diagnostic(format_args!(
-                            "Cannot assign to object of type `{}` with no `__setitem__` method",
-                            value_ty.display(db),
-                        ));
-                    }
-
-                    false
-                }
-            },
-        }
-    }
-
-    /// Make sure that the attribute assignment `obj.attribute = value` is valid.
-    ///
-    /// `target` is the node for the left-hand side, `object_ty` is the type of `obj`, `attribute` is
-    /// the name of the attribute being assigned, and `value_ty` is the type of the right-hand side of
-    /// the assignment. If the assignment is invalid, emit diagnostics.
-    fn validate_attribute_assignment(
-        &mut self,
-        target: &ast::ExprAttribute,
-        object_ty: Type<'db>,
-        attribute: &str,
-        value_ty: Type<'db>,
-        emit_diagnostics: bool,
-    ) -> bool {
-        let db = self.db();
-
-        let ensure_assignable_to = |attr_ty| -> bool {
-            let assignable = value_ty.is_assignable_to(db, attr_ty);
-            if !assignable && emit_diagnostics {
-                report_invalid_attribute_assignment(
-                    &self.context,
-                    target.into(),
-                    attr_ty,
-                    value_ty,
-                    attribute,
-                );
-            }
-            assignable
-        };
-
-        // Return true (and emit a diagnostic) if this is an invalid assignment to a `Final` attribute.
-        let invalid_assignment_to_final = |qualifiers: TypeQualifiers| -> bool {
-            if qualifiers.contains(TypeQualifiers::FINAL) {
-                if emit_diagnostics {
-                    if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target) {
-                        builder.into_diagnostic(format_args!(
-                            "Cannot assign to final attribute `{attribute}` \
-                                         on type `{}`",
-                            object_ty.display(db)
-                        ));
-                    }
-                }
-                true
-            } else {
-                false
-            }
-        };
-
-        match object_ty {
-            Type::Union(union) => {
-                if union.elements(self.db()).iter().all(|elem| {
-                    self.validate_attribute_assignment(target, *elem, attribute, value_ty, false)
-                }) {
-                    true
-                } else {
-                    // TODO: This is not a very helpful error message, as it does not include the underlying reason
-                    // why the assignment is invalid. This would be a good use case for sub-diagnostics.
-                    if emit_diagnostics {
-                        if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Object of type `{}` is not assignable \
-                                 to attribute `{attribute}` on type `{}`",
-                                value_ty.display(self.db()),
-                                object_ty.display(self.db()),
-                            ));
-                        }
-                    }
-
-                    false
-                }
-            }
-
-            Type::Intersection(intersection) => {
-                // TODO: Handle negative intersection elements
-                if intersection.positive(db).iter().any(|elem| {
-                    self.validate_attribute_assignment(target, *elem, attribute, value_ty, false)
-                }) {
-                    true
-                } else {
-                    if emit_diagnostics {
-                        if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target)
-                        {
-                            // TODO: same here, see above
-                            builder.into_diagnostic(format_args!(
-                                "Object of type `{}` is not assignable \
-                                 to attribute `{attribute}` on type `{}`",
-                                value_ty.display(self.db()),
-                                object_ty.display(self.db()),
-                            ));
-                        }
-                    }
-                    false
-                }
-            }
-
-            Type::TypeAlias(alias) => self.validate_attribute_assignment(
-                target,
-                alias.value_type(self.db()),
-                attribute,
-                value_ty,
-                emit_diagnostics,
-            ),
-
-            // Super instances do not allow attribute assignment
-            Type::NominalInstance(instance)
-                if instance.class(db).is_known(db, KnownClass::Super) =>
-            {
-                if emit_diagnostics {
-                    if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target) {
-                        builder.into_diagnostic(format_args!(
-                            "Cannot assign to attribute `{attribute}` on type `{}`",
-                            object_ty.display(self.db()),
-                        ));
-                    }
-                }
-                false
-            }
-            Type::BoundSuper(_) => {
-                if emit_diagnostics {
-                    if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target) {
-                        builder.into_diagnostic(format_args!(
-                            "Cannot assign to attribute `{attribute}` on type `{}`",
-                            object_ty.display(self.db()),
-                        ));
-                    }
-                }
-                false
-            }
-
-            Type::Dynamic(..) | Type::Never => true,
-
-            Type::NominalInstance(..)
-            | Type::ProtocolInstance(_)
-            | Type::BooleanLiteral(..)
-            | Type::IntLiteral(..)
-            | Type::StringLiteral(..)
-            | Type::BytesLiteral(..)
-            | Type::EnumLiteral(..)
-            | Type::LiteralString
-            | Type::SpecialForm(..)
-            | Type::KnownInstance(..)
-            | Type::PropertyInstance(..)
-            | Type::FunctionLiteral(..)
-            | Type::Callable(..)
-            | Type::BoundMethod(_)
-            | Type::MethodWrapper(_)
-            | Type::WrapperDescriptor(_)
-            | Type::DataclassDecorator(_)
-            | Type::DataclassTransformer(_)
-            | Type::NonInferableTypeVar(..)
-            | Type::TypeVar(..)
-            | Type::AlwaysTruthy
-            | Type::AlwaysFalsy
-            | Type::TypeIs(_)
-            | Type::TypedDict(_) => {
-                // First, try to call the `__setattr__` dunder method. If this is present/defined, overrides
-                // assigning the attributed by the normal mechanism.
-                let setattr_dunder_call_result = object_ty.try_call_dunder_with_policy(
-                    db,
-                    "__setattr__",
-                    &mut CallArguments::positional([Type::string_literal(db, attribute), value_ty]),
-                    MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK,
-                );
-
-                let check_setattr_return_type = |result: Bindings<'db>| -> bool {
-                    match result.return_type(db) {
-                        Type::Never => {
-                            if emit_diagnostics {
-                                if let Some(builder) =
-                                    self.context.report_lint(&INVALID_ASSIGNMENT, target)
-                                {
-                                    let is_setattr_synthesized = match object_ty
-                                        .class_member_with_policy(
-                                            db,
-                                            "__setattr__".into(),
-                                            MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK,
-                                        ) {
-                                        PlaceAndQualifiers {
-                                            place: Place::Type(attr_ty, _),
-                                            qualifiers: _,
-                                        } => attr_ty.is_callable_type(),
-                                        _ => false,
-                                    };
-
-                                    let member_exists =
-                                        !object_ty.member(db, attribute).place.is_unbound();
-
-                                    let msg = if !member_exists {
-                                        format!(
-                                            "Can not assign to unresolved attribute `{attribute}` on type `{}`",
-                                            object_ty.display(db)
-                                        )
-                                    } else if is_setattr_synthesized {
-                                        format!(
-                                            "Property `{attribute}` defined in `{}` is read-only",
-                                            object_ty.display(db)
-                                        )
-                                    } else {
-                                        format!(
-                                            "Cannot assign to attribute `{attribute}` on type `{}` \
-                                                 whose `__setattr__` method returns `Never`/`NoReturn`",
-                                            object_ty.display(db)
-                                        )
-                                    };
-
-                                    builder.into_diagnostic(msg);
-                                }
-                            }
-                            false
-                        }
-                        _ => true,
-                    }
-                };
-
-                match setattr_dunder_call_result {
-                    Ok(result) => check_setattr_return_type(result),
-                    Err(CallDunderError::PossiblyUnbound(result)) => {
-                        check_setattr_return_type(*result)
-                    }
-                    Err(CallDunderError::CallError(..)) => {
-                        if emit_diagnostics {
-                            if let Some(builder) =
-                                self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Can not assign object of type `{}` to attribute \
-                                     `{attribute}` on type `{}` with \
-                                     custom `__setattr__` method.",
-                                    value_ty.display(db),
-                                    object_ty.display(db)
-                                ));
-                            }
-                        }
-                        false
-                    }
-                    Err(CallDunderError::MethodNotAvailable) => {
-                        match object_ty.class_member(db, attribute.into()) {
-                            meta_attr @ PlaceAndQualifiers { .. } if meta_attr.is_class_var() => {
-                                if emit_diagnostics {
-                                    if let Some(builder) =
-                                        self.context.report_lint(&INVALID_ATTRIBUTE_ACCESS, target)
-                                    {
-                                        builder.into_diagnostic(format_args!(
-                                            "Cannot assign to ClassVar `{attribute}` \
-                                     from an instance of type `{ty}`",
-                                            ty = object_ty.display(self.db()),
-                                        ));
-                                    }
-                                }
-                                false
-                            }
-                            PlaceAndQualifiers {
-                                place: Place::Type(meta_attr_ty, meta_attr_boundness),
-                                qualifiers,
-                            } => {
-                                if invalid_assignment_to_final(qualifiers) {
-                                    return false;
-                                }
-
-                                let assignable_to_meta_attr =
-                                    if let Place::Type(meta_dunder_set, _) =
-                                        meta_attr_ty.class_member(db, "__set__".into()).place
-                                    {
-                                        let successful_call = meta_dunder_set
-                                            .try_call(
-                                                db,
-                                                &CallArguments::positional([
-                                                    meta_attr_ty,
-                                                    object_ty,
-                                                    value_ty,
-                                                ]),
-                                            )
-                                            .is_ok();
-
-                                        if !successful_call && emit_diagnostics {
-                                            if let Some(builder) = self
-                                                .context
-                                                .report_lint(&INVALID_ASSIGNMENT, target)
-                                            {
-                                                // TODO: Here, it would be nice to emit an additional diagnostic that explains why the call failed
-                                                builder.into_diagnostic(format_args!(
-                                            "Invalid assignment to data descriptor attribute \
-                                         `{attribute}` on type `{}` with custom `__set__` method",
-                                            object_ty.display(db)
-                                        ));
-                                            }
-                                        }
-
-                                        successful_call
-                                    } else {
-                                        ensure_assignable_to(meta_attr_ty)
-                                    };
-
-                                let assignable_to_instance_attribute = if meta_attr_boundness
-                                    == Boundness::PossiblyUnbound
-                                {
-                                    let (assignable, boundness) = if let PlaceAndQualifiers {
-                                        place:
-                                            Place::Type(instance_attr_ty, instance_attr_boundness),
-                                        qualifiers,
-                                    } =
-                                        object_ty.instance_member(db, attribute)
-                                    {
-                                        if invalid_assignment_to_final(qualifiers) {
-                                            return false;
-                                        }
-
-                                        (
-                                            ensure_assignable_to(instance_attr_ty),
-                                            instance_attr_boundness,
-                                        )
-                                    } else {
-                                        (true, Boundness::PossiblyUnbound)
-                                    };
-
-                                    if boundness == Boundness::PossiblyUnbound {
-                                        report_possibly_unbound_attribute(
-                                            &self.context,
-                                            target,
-                                            attribute,
-                                            object_ty,
-                                        );
-                                    }
-
-                                    assignable
-                                } else {
-                                    true
-                                };
-
-                                assignable_to_meta_attr && assignable_to_instance_attribute
-                            }
-
-                            PlaceAndQualifiers {
-                                place: Place::Unbound,
-                                ..
-                            } => {
-                                if let PlaceAndQualifiers {
-                                    place: Place::Type(instance_attr_ty, instance_attr_boundness),
-                                    qualifiers,
-                                } = object_ty.instance_member(db, attribute)
-                                {
-                                    if invalid_assignment_to_final(qualifiers) {
-                                        return false;
-                                    }
-
-                                    if instance_attr_boundness == Boundness::PossiblyUnbound {
-                                        report_possibly_unbound_attribute(
-                                            &self.context,
-                                            target,
-                                            attribute,
-                                            object_ty,
-                                        );
-                                    }
-
-                                    ensure_assignable_to(instance_attr_ty)
-                                } else {
-                                    if emit_diagnostics {
-                                        if let Some(builder) =
-                                            self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
-                                        {
-                                            builder.into_diagnostic(format_args!(
-                                                "Unresolved attribute `{}` on type `{}`.",
-                                                attribute,
-                                                object_ty.display(db)
-                                            ));
-                                        }
-                                    }
-
-                                    false
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            Type::ClassLiteral(..) | Type::GenericAlias(..) | Type::SubclassOf(..) => {
-                match object_ty.class_member(db, attribute.into()) {
-                    PlaceAndQualifiers {
-                        place: Place::Type(meta_attr_ty, meta_attr_boundness),
-                        qualifiers,
-                    } => {
-                        if invalid_assignment_to_final(qualifiers) {
-                            return false;
-                        }
-
-                        let assignable_to_meta_attr = if let Place::Type(meta_dunder_set, _) =
-                            meta_attr_ty.class_member(db, "__set__".into()).place
-                        {
-                            let successful_call = meta_dunder_set
-                                .try_call(
-                                    db,
-                                    &CallArguments::positional([meta_attr_ty, object_ty, value_ty]),
-                                )
-                                .is_ok();
-
-                            if !successful_call && emit_diagnostics {
-                                if let Some(builder) =
-                                    self.context.report_lint(&INVALID_ASSIGNMENT, target)
-                                {
-                                    // TODO: Here, it would be nice to emit an additional diagnostic that explains why the call failed
-                                    builder.into_diagnostic(format_args!(
-                                        "Invalid assignment to data descriptor attribute \
-                                         `{attribute}` on type `{}` with custom `__set__` method",
-                                        object_ty.display(db)
-                                    ));
-                                }
-                            }
-
-                            successful_call
-                        } else {
-                            ensure_assignable_to(meta_attr_ty)
-                        };
-
-                        let assignable_to_class_attr = if meta_attr_boundness
-                            == Boundness::PossiblyUnbound
-                        {
-                            let (assignable, boundness) =
-                                if let Place::Type(class_attr_ty, class_attr_boundness) = object_ty
-                                    .find_name_in_mro(db, attribute)
-                                    .expect("called on Type::ClassLiteral or Type::SubclassOf")
-                                    .place
-                                {
-                                    (ensure_assignable_to(class_attr_ty), class_attr_boundness)
-                                } else {
-                                    (true, Boundness::PossiblyUnbound)
-                                };
-
-                            if boundness == Boundness::PossiblyUnbound {
-                                report_possibly_unbound_attribute(
-                                    &self.context,
-                                    target,
-                                    attribute,
-                                    object_ty,
-                                );
-                            }
-
-                            assignable
-                        } else {
-                            true
-                        };
-
-                        assignable_to_meta_attr && assignable_to_class_attr
-                    }
-                    PlaceAndQualifiers {
-                        place: Place::Unbound,
-                        ..
-                    } => {
-                        if let PlaceAndQualifiers {
-                            place: Place::Type(class_attr_ty, class_attr_boundness),
-                            qualifiers,
-                        } = object_ty
-                            .find_name_in_mro(db, attribute)
-                            .expect("called on Type::ClassLiteral or Type::SubclassOf")
-                        {
-                            if invalid_assignment_to_final(qualifiers) {
-                                return false;
-                            }
-
-                            if class_attr_boundness == Boundness::PossiblyUnbound {
-                                report_possibly_unbound_attribute(
-                                    &self.context,
-                                    target,
-                                    attribute,
-                                    object_ty,
-                                );
-                            }
-
-                            ensure_assignable_to(class_attr_ty)
-                        } else {
-                            let attribute_is_bound_on_instance =
-                                object_ty.to_instance(self.db()).is_some_and(|instance| {
-                                    !instance
-                                        .instance_member(self.db(), attribute)
-                                        .place
-                                        .is_unbound()
-                                });
-
-                            // Attribute is declared or bound on instance. Forbid access from the class object
-                            if emit_diagnostics {
-                                if attribute_is_bound_on_instance {
-                                    if let Some(builder) =
-                                        self.context.report_lint(&INVALID_ATTRIBUTE_ACCESS, target)
-                                    {
-                                        builder.into_diagnostic(format_args!(
-                                            "Cannot assign to instance attribute \
-                                             `{attribute}` from the class object `{ty}`",
-                                            ty = object_ty.display(self.db()),
-                                        ));
-                                    }
-                                } else {
-                                    if let Some(builder) =
-                                        self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
-                                    {
-                                        builder.into_diagnostic(format_args!(
-                                            "Unresolved attribute `{}` on type `{}`.",
-                                            attribute,
-                                            object_ty.display(db)
-                                        ));
-                                    }
-                                }
-                            }
-
-                            false
-                        }
-                    }
-                }
-            }
-
-            Type::ModuleLiteral(module) => {
-                if let Place::Type(attr_ty, _) = module.static_member(db, attribute).place {
-                    let assignable = value_ty.is_assignable_to(db, attr_ty);
-                    if assignable {
-                        true
-                    } else {
-                        if emit_diagnostics {
-                            report_invalid_attribute_assignment(
-                                &self.context,
-                                target.into(),
-                                attr_ty,
-                                value_ty,
-                                attribute,
-                            );
-                        }
-                        false
-                    }
-                } else {
-                    if emit_diagnostics {
-                        if let Some(builder) =
-                            self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Unresolved attribute `{}` on type `{}`.",
-                                attribute,
-                                object_ty.display(db)
-                            ));
-                        }
-                    }
-
-                    false
-                }
-            }
-        }
-    }
-
-    fn infer_target_impl(
-        &mut self,
-        target: &ast::Expr,
-        value: &ast::Expr,
-        assigned_ty: Option<Type<'db>>,
-    ) {
-        match target {
-            ast::Expr::Name(name) => self.infer_definition(name),
-            ast::Expr::List(ast::ExprList { elts, .. })
-            | ast::Expr::Tuple(ast::ExprTuple { elts, .. }) => {
-                if let Some(tuple_spec) =
-                    assigned_ty.and_then(|ty| ty.tuple_instance_spec(self.db()))
-                {
-                    let mut assigned_tys = tuple_spec.all_elements();
-                    for element in elts {
-                        self.infer_target_impl(element, value, assigned_tys.next().copied());
-                    }
-                } else {
-                    for element in elts {
-                        self.infer_target_impl(element, value, None);
-                    }
-                }
-            }
-            ast::Expr::Attribute(
-                attr_expr @ ast::ExprAttribute {
-                    value: object,
-                    ctx: ExprContext::Store,
-                    attr,
-                    ..
-                },
-            ) => {
-                self.store_expression_type(target, assigned_ty.unwrap_or(Type::unknown()));
-
-                let object_ty = self.infer_expression(object);
-
-                if let Some(assigned_ty) = assigned_ty {
-                    self.validate_attribute_assignment(
-                        attr_expr,
-                        object_ty,
-                        attr.id(),
-                        assigned_ty,
-                        true,
-                    );
-                }
-            }
-            ast::Expr::Subscript(subscript_expr) => {
-                self.store_expression_type(target, assigned_ty.unwrap_or(Type::unknown()));
-
-                if let Some(assigned_ty) = assigned_ty {
-                    self.validate_subscript_assignment(subscript_expr, value, assigned_ty);
-                }
-            }
-            _ => {
-                // TODO: Remove this once we handle all possible assignment targets.
-                self.infer_expression(target);
-            }
-        }
-    }
-
-    fn infer_assignment_definition(
-        &mut self,
-        assignment: &AssignmentDefinitionKind<'db>,
-        definition: Definition<'db>,
-    ) {
-        let value = assignment.value(self.module());
-        let target = assignment.target(self.module());
-
-        let mut target_ty = match assignment.target_kind() {
-            TargetKind::Sequence(unpack_position, unpack) => {
-                let unpacked = infer_unpack_types(self.db(), unpack);
-                // Only copy the diagnostics if this is the first assignment to avoid duplicating the
-                // unpack assignments.
-                if unpack_position == UnpackPosition::First {
-                    self.context.extend(unpacked.diagnostics());
-                }
-
-                unpacked.expression_type(target)
-            }
-            TargetKind::Single => {
-                let value_ty = self.infer_standalone_expression(value);
-
-                // `TYPE_CHECKING` is a special variable that should only be assigned `False`
-                // at runtime, but is always considered `True` in type checking.
-                // See mdtest/known_constants.md#user-defined-type_checking for details.
-                if target.as_name_expr().map(|name| name.id.as_str()) == Some("TYPE_CHECKING") {
-                    if !matches!(
-                        value.as_boolean_literal_expr(),
-                        Some(ast::ExprBooleanLiteral { value: false, .. })
-                    ) {
-                        report_invalid_type_checking_constant(&self.context, target.into());
-                    }
-                    Type::BooleanLiteral(true)
-                } else if self.in_stub() && value.is_ellipsis_literal_expr() {
-                    Type::unknown()
-                } else {
-                    value_ty
-                }
-            }
-        };
-
-        if let Some(special_form) = target.as_name_expr().and_then(|name| {
-            SpecialFormType::try_from_file_and_name(self.db(), self.file(), &name.id)
-        }) {
-            target_ty = Type::SpecialForm(special_form);
-        }
-
-        self.store_expression_type(target, target_ty);
-        self.add_binding(target.into(), definition, target_ty);
-    }
-
-    fn infer_annotated_assignment_statement(&mut self, assignment: &ast::StmtAnnAssign) {
-        if assignment.target.is_name_expr() {
-            self.infer_definition(assignment);
-        } else {
-            // Non-name assignment targets are inferred as ordinary expressions, not definitions.
-            let ast::StmtAnnAssign {
-                range: _,
-                node_index: _,
-                annotation,
-                value,
-                target,
-                simple: _,
-            } = assignment;
-            let annotated =
-                self.infer_annotation_expression(annotation, DeferredExpressionState::None);
-
-            if !annotated.qualifiers.is_empty() {
-                for qualifier in [TypeQualifiers::CLASS_VAR, TypeQualifiers::INIT_VAR] {
-                    if annotated.qualifiers.contains(qualifier) {
-                        if let Some(builder) = self
-                            .context
-                            .report_lint(&INVALID_TYPE_FORM, annotation.as_ref())
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "`{name}` annotations are not allowed for non-name targets",
-                                name = qualifier.name()
-                            ));
-                        }
-                    }
-                }
-            }
-
-            if let Some(value) = value {
-                self.infer_maybe_standalone_expression(value);
-            }
-
-            // If we have an annotated assignment like `self.attr: int = 1`, we still need to
-            // do type inference on the `self.attr` target to get types for all sub-expressions.
-            self.infer_expression(target);
-
-            // But here we explicitly overwrite the type for the overall `self.attr` node with
-            // the annotated type. We do no use `store_expression_type` here, because it checks
-            // that no type has been stored for the expression before.
-            self.expressions
-                .insert((&**target).into(), annotated.inner_type());
-        }
-    }
-
-    /// Infer the types in an annotated assignment definition.
-    fn infer_annotated_assignment_definition(
-        &mut self,
-        assignment: &'db AnnotatedAssignmentDefinitionKind,
-        definition: Definition<'db>,
-    ) {
-        let annotation = assignment.annotation(self.module());
-        let target = assignment.target(self.module());
-        let value = assignment.value(self.module());
-
-        let mut declared = self.infer_annotation_expression(
-            annotation,
-            DeferredExpressionState::from(self.defer_annotations()),
-        );
-
-        if !declared.qualifiers.is_empty() {
-            let current_scope_id = self.scope().file_scope_id(self.db());
-            let current_scope = self.index.scope(current_scope_id);
-            if current_scope.kind() != ScopeKind::Class {
-                for qualifier in [TypeQualifiers::CLASS_VAR, TypeQualifiers::INIT_VAR] {
-                    if declared.qualifiers.contains(qualifier) {
-                        if let Some(builder) =
-                            self.context.report_lint(&INVALID_TYPE_FORM, annotation)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "`{name}` annotations are only allowed in class-body scopes",
-                                name = qualifier.name()
-                            ));
-                        }
-                    }
-                }
-            }
-        }
-
-        if target
-            .as_name_expr()
-            .is_some_and(|name| &name.id == "TYPE_CHECKING")
-        {
-            if !KnownClass::Bool
-                .to_instance(self.db())
-                .is_assignable_to(self.db(), declared.inner_type())
-            {
-                // annotation not assignable from `bool` is an error
-                report_invalid_type_checking_constant(&self.context, target.into());
-            } else if self.in_stub()
-                && value
-                    .as_ref()
-                    .is_none_or(|value| value.is_ellipsis_literal_expr())
-            {
-                // stub file assigning nothing or `...` is fine
-            } else if !matches!(
-                value
-                    .as_ref()
-                    .and_then(|value| value.as_boolean_literal_expr()),
-                Some(ast::ExprBooleanLiteral { value: false, .. })
-            ) {
-                // otherwise, assigning something other than `False` is an error
-                report_invalid_type_checking_constant(&self.context, target.into());
-            }
-            declared.inner = Type::BooleanLiteral(true);
-        }
-
-        // Handle various singletons.
-        if let Type::NominalInstance(instance) = declared.inner_type() {
-            if instance
-                .class(self.db())
-                .is_known(self.db(), KnownClass::SpecialForm)
-            {
-                if let Some(name_expr) = target.as_name_expr() {
-                    if let Some(special_form) = SpecialFormType::try_from_file_and_name(
-                        self.db(),
-                        self.file(),
-                        &name_expr.id,
-                    ) {
-                        declared.inner = Type::SpecialForm(special_form);
-                    }
-                }
-            }
-        }
-
-        // If the target of an assignment is not one of the place expressions we support,
-        // then they are not definitions, so we can only be here if the target is in a form supported as a place expression.
-        // In this case, we can simply store types in `target` below, instead of calling `infer_expression` (which would return `Never`).
-        debug_assert!(PlaceExpr::try_from_expr(target).is_some());
-
-        if let Some(value) = value {
-            let inferred_ty = self.infer_maybe_standalone_expression(value);
-            let inferred_ty = if target
-                .as_name_expr()
-                .is_some_and(|name| &name.id == "TYPE_CHECKING")
-            {
-                Type::BooleanLiteral(true)
-            } else if self.in_stub() && value.is_ellipsis_literal_expr() {
-                declared.inner_type()
-            } else {
-                inferred_ty
-            };
-            self.add_declaration_with_binding(
-                target.into(),
-                definition,
-                &DeclaredAndInferredType::MightBeDifferent {
-                    declared_ty: declared,
-                    inferred_ty,
-                },
-            );
-
-            self.store_expression_type(target, inferred_ty);
-        } else {
-            if self.in_stub() {
-                self.add_declaration_with_binding(
-                    target.into(),
-                    definition,
-                    &DeclaredAndInferredType::AreTheSame(declared),
-                );
-            } else {
-                self.add_declaration(target.into(), definition, declared);
-            }
-
-            self.store_expression_type(target, declared.inner_type());
-        }
-    }
-
-    fn infer_augmented_assignment_statement(&mut self, assignment: &ast::StmtAugAssign) {
-        if assignment.target.is_name_expr() {
-            self.infer_definition(assignment);
-        } else {
-            // Non-name assignment targets are inferred as ordinary expressions, not definitions.
-            self.infer_augment_assignment(assignment);
-        }
-    }
-
-    fn infer_augmented_op(
-        &mut self,
-        assignment: &ast::StmtAugAssign,
-        target_type: Type<'db>,
-        value_type: Type<'db>,
-    ) -> Type<'db> {
-        // If the target defines, e.g., `__iadd__`, infer the augmented assignment as a call to that
-        // dunder.
-        let op = assignment.op;
-        let db = self.db();
-
-        let report_unsupported_augmented_op = |ctx: &mut InferContext| {
-            let Some(builder) = ctx.report_lint(&UNSUPPORTED_OPERATOR, assignment) else {
-                return;
-            };
-            builder.into_diagnostic(format_args!(
-                "Operator `{op}=` is unsupported between objects of type `{}` and `{}`",
-                target_type.display(db),
-                value_type.display(db)
-            ));
-        };
-
-        // Fall back to non-augmented binary operator inference.
-        let mut binary_return_ty = || {
-            self.infer_binary_expression_type(assignment.into(), false, target_type, value_type, op)
-                .unwrap_or_else(|| {
-                    report_unsupported_augmented_op(&mut self.context);
-                    Type::unknown()
-                })
-        };
-
-        match target_type {
-            Type::Union(union) => union.map(db, |&elem_type| {
-                self.infer_augmented_op(assignment, elem_type, value_type)
-            }),
-            _ => {
-                let call = target_type.try_call_dunder(
-                    db,
-                    op.in_place_dunder(),
-                    CallArguments::positional([value_type]),
-                );
-
-                match call {
-                    Ok(outcome) => outcome.return_type(db),
-                    Err(CallDunderError::MethodNotAvailable) => binary_return_ty(),
-                    Err(CallDunderError::PossiblyUnbound(outcome)) => {
-                        UnionType::from_elements(db, [outcome.return_type(db), binary_return_ty()])
-                    }
-                    Err(CallDunderError::CallError(_, bindings)) => {
-                        report_unsupported_augmented_op(&mut self.context);
-                        bindings.return_type(db)
-                    }
-                }
-            }
-        }
-    }
-
-    fn infer_augment_assignment_definition(
-        &mut self,
-        assignment: &ast::StmtAugAssign,
-        definition: Definition<'db>,
-    ) {
-        let target_ty = self.infer_augment_assignment(assignment);
-        self.add_binding(assignment.into(), definition, target_ty);
-    }
-
-    fn infer_augment_assignment(&mut self, assignment: &ast::StmtAugAssign) -> Type<'db> {
-        let ast::StmtAugAssign {
-            range: _,
-            node_index: _,
-            target,
-            op: _,
-            value,
-        } = assignment;
-
-        // Resolve the target type, assuming a load context.
-        let target_type = match &**target {
-            ast::Expr::Name(name) => {
-                let previous_value = self.infer_name_load(name);
-                self.store_expression_type(target, previous_value);
-                previous_value
-            }
-            ast::Expr::Attribute(attr) => {
-                let previous_value = self.infer_attribute_load(attr);
-                self.store_expression_type(target, previous_value);
-                previous_value
-            }
-            ast::Expr::Subscript(subscript) => {
-                let previous_value = self.infer_subscript_load(subscript);
-                self.store_expression_type(target, previous_value);
-                previous_value
-            }
-            _ => self.infer_expression(target),
-        };
-        let value_type = self.infer_expression(value);
-
-        self.infer_augmented_op(assignment, target_type, value_type)
-    }
-
-    fn infer_type_alias_statement(&mut self, node: &ast::StmtTypeAlias) {
-        self.infer_definition(node);
-    }
-
-    fn infer_for_statement(&mut self, for_statement: &ast::StmtFor) {
-        let ast::StmtFor {
-            range: _,
-            node_index: _,
-            target,
-            iter,
-            body,
-            orelse,
-            is_async: _,
-        } = for_statement;
-
-        self.infer_target(target, iter, |builder, iter_expr| {
-            // TODO: `infer_for_statement_definition` reports a diagnostic if `iter_ty` isn't iterable
-            //  but only if the target is a name. We should report a diagnostic here if the target isn't a name:
-            //  `for a.x in not_iterable: ...
-            builder
-                .infer_standalone_expression(iter_expr)
-                .iterate(builder.db())
-                .homogeneous_element_type(builder.db())
-        });
-
-        self.infer_body(body);
-        self.infer_body(orelse);
-    }
-
-    fn infer_for_statement_definition(
-        &mut self,
-        for_stmt: &ForStmtDefinitionKind<'db>,
-        definition: Definition<'db>,
-    ) {
-        let iterable = for_stmt.iterable(self.module());
-        let target = for_stmt.target(self.module());
-
-        let loop_var_value_type = match for_stmt.target_kind() {
-            TargetKind::Sequence(unpack_position, unpack) => {
-                let unpacked = infer_unpack_types(self.db(), unpack);
-                if unpack_position == UnpackPosition::First {
-                    self.context.extend(unpacked.diagnostics());
-                }
-
-                unpacked.expression_type(target)
-            }
-            TargetKind::Single => {
-                let iterable_type = self.infer_standalone_expression(iterable);
-
-                iterable_type
-                    .try_iterate_with_mode(
-                        self.db(),
-                        EvaluationMode::from_is_async(for_stmt.is_async()),
-                    )
-                    .map(|tuple| tuple.homogeneous_element_type(self.db()))
-                    .unwrap_or_else(|err| {
-                        err.report_diagnostic(&self.context, iterable_type, iterable.into());
-                        err.fallback_element_type(self.db())
-                    })
-            }
-        };
-
-        self.store_expression_type(target, loop_var_value_type);
-        self.add_binding(target.into(), definition, loop_var_value_type);
-    }
-
-    fn infer_while_statement(&mut self, while_statement: &ast::StmtWhile) {
-        let ast::StmtWhile {
-            range: _,
-            node_index: _,
-            test,
-            body,
-            orelse,
-        } = while_statement;
-
-        let test_ty = self.infer_standalone_expression(test);
-
-        if let Err(err) = test_ty.try_bool(self.db()) {
-            err.report_diagnostic(&self.context, &**test);
-        }
-
-        self.infer_body(body);
-        self.infer_body(orelse);
-    }
-
-    fn infer_import_statement(&mut self, import: &ast::StmtImport) {
-        let ast::StmtImport {
-            range: _,
-            node_index: _,
-            names,
-        } = import;
-
-        for alias in names {
-            self.infer_definition(alias);
-        }
-    }
-
-    fn report_unresolved_import(
-        &self,
-        import_node: AnyNodeRef<'_>,
-        range: TextRange,
-        level: u32,
-        module: Option<&str>,
-    ) {
-        let is_import_reachable = self.is_reachable(import_node);
-
-        if !is_import_reachable {
-            return;
-        }
-
-        let Some(builder) = self.context.report_lint(&UNRESOLVED_IMPORT, range) else {
-            return;
-        };
-        let mut diagnostic = builder.into_diagnostic(format_args!(
-            "Cannot resolve imported module `{}{}`",
-            ".".repeat(level as usize),
-            module.unwrap_or_default()
-        ));
-        if level == 0 {
-            if let Some(module_name) = module.and_then(ModuleName::new) {
-                let program = Program::get(self.db());
-                let typeshed_versions = program.search_paths(self.db()).typeshed_versions();
-
-                if let Some(version_range) = typeshed_versions.exact(&module_name) {
-                    // We know it is a stdlib module on *some* Python versions...
-                    let python_version = program.python_version(self.db());
-                    if !version_range.contains(python_version) {
-                        // ...But not on *this* Python version.
-                        diagnostic.info(format_args!(
-                            "The stdlib module `{module_name}` is only available on Python {version_range}",
-                            version_range = version_range.diagnostic_display(),
-                        ));
-                        add_inferred_python_version_hint_to_diagnostic(
-                            self.db(),
-                            &mut diagnostic,
-                            "resolving modules",
-                        );
-                        return;
-                    }
-                }
-            }
-
-            diagnostic.info(
-                "make sure your Python environment is properly configured: \
-                https://docs.astral.sh/ty/modules/#python-environment",
-            );
-        }
-    }
-
-    fn infer_import_definition(
-        &mut self,
-        node: &ast::StmtImport,
-        alias: &ast::Alias,
-        definition: Definition<'db>,
-    ) {
-        let ast::Alias {
-            range: _,
-            node_index: _,
-            name,
-            asname,
-        } = alias;
-
-        // The name of the module being imported
-        let Some(full_module_name) = ModuleName::new(name) else {
-            tracing::debug!("Failed to resolve import due to invalid syntax");
-            self.add_unknown_declaration_with_binding(alias.into(), definition);
-            return;
-        };
-
-        // Resolve the module being imported.
-        let Some(full_module_ty) = self.module_type_from_name(&full_module_name) else {
-            self.report_unresolved_import(node.into(), alias.range(), 0, Some(name));
-            self.add_unknown_declaration_with_binding(alias.into(), definition);
-            return;
-        };
-
-        let binding_ty = if asname.is_some() {
-            // If we are renaming the imported module via an `as` clause, then we bind the resolved
-            // module's type to that name, even if that module is nested.
-            full_module_ty
-        } else if full_module_name.contains('.') {
-            // If there's no `as` clause and the imported module is nested, we're not going to bind
-            // the resolved module itself into the current scope; we're going to bind the top-most
-            // parent package of that module.
-            let topmost_parent_name =
-                ModuleName::new(full_module_name.components().next().unwrap()).unwrap();
-            let Some(topmost_parent_ty) = self.module_type_from_name(&topmost_parent_name) else {
-                self.add_unknown_declaration_with_binding(alias.into(), definition);
-                return;
-            };
-            topmost_parent_ty
-        } else {
-            // If there's no `as` clause and the imported module isn't nested, then the imported
-            // module _is_ what we bind into the current scope.
-            full_module_ty
-        };
-
-        self.add_declaration_with_binding(
-            alias.into(),
-            definition,
-            &DeclaredAndInferredType::are_the_same_type(binding_ty),
-        );
-    }
-
-    fn infer_import_from_statement(&mut self, import: &ast::StmtImportFrom) {
-        let ast::StmtImportFrom {
-            range: _,
-            node_index: _,
-            module: _,
-            names,
-            level: _,
-        } = import;
-
-        self.check_import_from_module_is_resolvable(import);
-
-        for alias in names {
-            for definition in self.index.definitions(alias) {
-                let inferred = infer_definition_types(self.db(), *definition);
-                // Check non-star imports for deprecations
-                if definition.kind(self.db()).as_star_import().is_none() {
-                    for ty in inferred.declaration_types() {
-                        self.check_deprecated(alias, ty.inner);
-                    }
-                }
-                self.extend_definition(inferred);
-            }
-        }
-    }
-
-    fn infer_assert_statement(&mut self, assert: &ast::StmtAssert) {
-        let ast::StmtAssert {
-            range: _,
-            node_index: _,
-            test,
-            msg,
-        } = assert;
-
-        let test_ty = self.infer_standalone_expression(test);
-
-        if let Err(err) = test_ty.try_bool(self.db()) {
-            err.report_diagnostic(&self.context, &**test);
-        }
-
-        self.infer_optional_expression(msg.as_deref());
-    }
-
-    fn infer_raise_statement(&mut self, raise: &ast::StmtRaise) {
-        let ast::StmtRaise {
-            range: _,
-            node_index: _,
-            exc,
-            cause,
-        } = raise;
-
-        let base_exception_type = KnownClass::BaseException.to_subclass_of(self.db());
-        let base_exception_instance = KnownClass::BaseException.to_instance(self.db());
-
-        let can_be_raised =
-            UnionType::from_elements(self.db(), [base_exception_type, base_exception_instance]);
-        let can_be_exception_cause =
-            UnionType::from_elements(self.db(), [can_be_raised, Type::none(self.db())]);
-
-        if let Some(raised) = exc {
-            let raised_type = self.infer_expression(raised);
-
-            if !raised_type.is_assignable_to(self.db(), can_be_raised) {
-                report_invalid_exception_raised(&self.context, raised, raised_type);
-            }
-        }
-
-        if let Some(cause) = cause {
-            let cause_type = self.infer_expression(cause);
-
-            if !cause_type.is_assignable_to(self.db(), can_be_exception_cause) {
-                report_invalid_exception_cause(&self.context, cause, cause_type);
-            }
-        }
-    }
-
-    /// Resolve the [`ModuleName`], and the type of the module, being referred to by an
-    /// [`ast::StmtImportFrom`] node. Emit a diagnostic if the module cannot be resolved.
-    fn check_import_from_module_is_resolvable(&mut self, import_from: &ast::StmtImportFrom) {
-        let ast::StmtImportFrom { module, level, .. } = import_from;
-
-        // For diagnostics, we want to highlight the unresolvable
-        // module and not the entire `from ... import ...` statement.
-        let module_ref = module
-            .as_ref()
-            .map(AnyNodeRef::from)
-            .unwrap_or_else(|| AnyNodeRef::from(import_from));
-        let module = module.as_deref();
-
-        tracing::trace!(
-            "Resolving import statement from module `{}` into file `{}`",
-            format_import_from_module(*level, module),
-            self.file().path(self.db()),
-        );
-        let module_name = ModuleName::from_import_statement(self.db(), self.file(), import_from);
-
-        let module_name = match module_name {
-            Ok(module_name) => module_name,
-            Err(ModuleNameResolutionError::InvalidSyntax) => {
-                tracing::debug!("Failed to resolve import due to invalid syntax");
-                // Invalid syntax diagnostics are emitted elsewhere.
-                return;
-            }
-            Err(ModuleNameResolutionError::TooManyDots) => {
-                tracing::debug!(
-                    "Relative module resolution `{}` failed: too many leading dots",
-                    format_import_from_module(*level, module),
-                );
-                self.report_unresolved_import(
-                    import_from.into(),
-                    module_ref.range(),
-                    *level,
-                    module,
-                );
-                return;
-            }
-            Err(ModuleNameResolutionError::UnknownCurrentModule) => {
-                tracing::debug!(
-                    "Relative module resolution `{}` failed; could not resolve file `{}` to a module",
-                    format_import_from_module(*level, module),
-                    self.file().path(self.db())
-                );
-                self.report_unresolved_import(
-                    import_from.into(),
-                    module_ref.range(),
-                    *level,
-                    module,
-                );
-                return;
-            }
-        };
-
-        if resolve_module(self.db(), &module_name).is_none() {
-            self.report_unresolved_import(import_from.into(), module_ref.range(), *level, module);
-        }
-    }
-
-    fn infer_import_from_definition(
-        &mut self,
-        import_from: &ast::StmtImportFrom,
-        alias: &ast::Alias,
-        definition: Definition<'db>,
-    ) {
-        let Ok(module_name) =
-            ModuleName::from_import_statement(self.db(), self.file(), import_from)
-        else {
-            self.add_unknown_declaration_with_binding(alias.into(), definition);
-            return;
-        };
-
-        let Some(module) = resolve_module(self.db(), &module_name) else {
-            self.add_unknown_declaration_with_binding(alias.into(), definition);
-            return;
-        };
-
-        let module_ty = Type::module_literal(self.db(), self.file(), module);
-
-        let name = if let Some(star_import) = definition.kind(self.db()).as_star_import() {
-            self.index
-                .place_table(self.scope().file_scope_id(self.db()))
-                .symbol(star_import.symbol_id())
-                .name()
-        } else {
-            &alias.name.id
-        };
-
-        // Avoid looking up attributes on a module if a module imports from itself
-        // (e.g. `from parent import submodule` inside the `parent` module).
-        let import_is_self_referential = module_ty
-            .into_module_literal()
-            .is_some_and(|module| Some(self.file()) == module.module(self.db()).file(self.db()));
-
-        // First try loading the requested attribute from the module.
-        if !import_is_self_referential {
-            if let PlaceAndQualifiers {
-                place: Place::Type(ty, boundness),
-                qualifiers,
-            } = module_ty.member(self.db(), name)
-            {
-                if &alias.name != "*" && boundness == Boundness::PossiblyUnbound {
-                    // TODO: Consider loading _both_ the attribute and any submodule and unioning them
-                    // together if the attribute exists but is possibly-unbound.
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&POSSIBLY_UNBOUND_IMPORT, AnyNodeRef::Alias(alias))
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Member `{name}` of module `{module_name}` is possibly unbound",
-                        ));
-                    }
-                }
-                self.add_declaration_with_binding(
-                    alias.into(),
-                    definition,
-                    &DeclaredAndInferredType::MightBeDifferent {
-                        declared_ty: TypeAndQualifiers {
-                            inner: ty,
-                            qualifiers,
-                        },
-                        inferred_ty: ty,
-                    },
-                );
-                return;
-            }
-        }
-
-        // Evaluate whether `X.Y` would constitute a valid submodule name,
-        // given a `from X import Y` statement. If it is valid, this will be `Some()`;
-        // else, it will be `None`.
-        let full_submodule_name = ModuleName::new(name).map(|final_part| {
-            let mut ret = module_name.clone();
-            ret.extend(&final_part);
-            ret
-        });
-
-        // If the module doesn't bind the symbol, check if it's a submodule.  This won't get
-        // handled by the `Type::member` call because it relies on the semantic index's
-        // `imported_modules` set.  The semantic index does not include information about
-        // `from...import` statements because there are two things it cannot determine while only
-        // inspecting the content of the current file:
-        //
-        //   - whether the imported symbol is an attribute or submodule
-        //   - whether the containing file is in a module or a package (needed to correctly resolve
-        //     relative imports)
-        //
-        // The first would be solvable by making it a _potentially_ imported modules set.  The
-        // second is not.
-        //
-        // Regardless, for now, we sidestep all of that by repeating the submodule-or-attribute
-        // check here when inferring types for a `from...import` statement.
-        if let Some(submodule_type) = full_submodule_name
-            .as_ref()
-            .and_then(|submodule_name| self.module_type_from_name(submodule_name))
-        {
-            self.add_declaration_with_binding(
-                alias.into(),
-                definition,
-                &DeclaredAndInferredType::are_the_same_type(submodule_type),
-            );
-            return;
-        }
-
-        self.add_unknown_declaration_with_binding(alias.into(), definition);
-
-        if &alias.name == "*" {
-            return;
-        }
-
-        if !self.is_reachable(import_from) {
-            return;
-        }
-
-        let Some(builder) = self
-            .context
-            .report_lint(&UNRESOLVED_IMPORT, AnyNodeRef::Alias(alias))
-        else {
-            return;
-        };
-
-        let diagnostic = builder.into_diagnostic(format_args!(
-            "Module `{module_name}` has no member `{name}`"
-        ));
-
-        if let Some(full_submodule_name) = full_submodule_name {
-            hint_if_stdlib_submodule_exists_on_other_versions(
-                self.db(),
-                diagnostic,
-                &full_submodule_name,
-                module,
-            );
-        }
-    }
-
-    fn infer_return_statement(&mut self, ret: &ast::StmtReturn) {
-        if let Some(ty) = self.infer_optional_expression(ret.value.as_deref()) {
-            let range = ret
-                .value
-                .as_ref()
-                .map_or(ret.range(), |value| value.range());
-            self.record_return_type(ty, range);
-        } else {
-            self.record_return_type(Type::none(self.db()), ret.range());
-        }
-    }
-
-    fn infer_delete_statement(&mut self, delete: &ast::StmtDelete) {
-        let ast::StmtDelete {
-            range: _,
-            node_index: _,
-            targets,
-        } = delete;
-        for target in targets {
-            self.infer_expression(target);
-        }
-    }
-
-    fn infer_global_statement(&mut self, global: &ast::StmtGlobal) {
-        // CPython allows examples like this, where a global variable is never explicitly defined
-        // in the global scope:
-        //
-        // ```py
-        // def f():
-        //     global x
-        //     x = 1
-        // def g():
-        //     print(x)
-        // ```
-        //
-        // However, allowing this pattern would make it hard for us to guarantee
-        // accurate analysis about the types and boundness of global-scope symbols,
-        // so we require the variable to be explicitly defined (either bound or declared)
-        // in the global scope.
-        let ast::StmtGlobal {
-            node_index: _,
-            range: _,
-            names,
-        } = global;
-        let global_place_table = self.index.place_table(FileScopeId::global());
-        for name in names {
-            if let Some(symbol_id) = global_place_table.symbol_id(name) {
-                let symbol = global_place_table.symbol(symbol_id);
-                if symbol.is_bound() || symbol.is_declared() {
-                    // This name is explicitly defined in the global scope (not just in function
-                    // bodies that mark it `global`).
-                    continue;
-                }
-            }
-            if !module_type_implicit_global_symbol(self.db(), name)
-                .place
-                .is_unbound()
-            {
-                // This name is an implicit global like `__file__` (but not a built-in like `int`).
-                continue;
-            }
-            // This variable isn't explicitly defined in the global scope, nor is it an
-            // implicit global from `types.ModuleType`, so we consider this `global` statement invalid.
-            let Some(builder) = self.context.report_lint(&UNRESOLVED_GLOBAL, name) else {
-                return;
-            };
-            let mut diag =
-                builder.into_diagnostic(format_args!("Invalid global declaration of `{name}`"));
-            diag.set_primary_message(format_args!(
-                "`{name}` has no declarations or bindings in the global scope"
-            ));
-            diag.info("This limits ty's ability to make accurate inferences about the boundness and types of global-scope symbols");
-            diag.info(format_args!(
-                "Consider adding a declaration to the global scope, e.g. `{name}: int`"
-            ));
-        }
-    }
-
-    fn infer_nonlocal_statement(&mut self, nonlocal: &ast::StmtNonlocal) {
-        let ast::StmtNonlocal {
-            node_index: _,
-            range,
-            names,
-        } = nonlocal;
-        let db = self.db();
-        let scope = self.scope();
-        let file_scope_id = scope.file_scope_id(db);
-        let current_file = self.file();
-        'names: for name in names {
-            // Walk up parent scopes looking for a possible enclosing scope that may have a
-            // definition of this name visible to us. Note that we skip the scope containing the
-            // use that we are resolving, since we already looked for the place there up above.
-            for (enclosing_scope_file_id, _) in self.index.ancestor_scopes(file_scope_id).skip(1) {
-                // Class scopes are not visible to nested scopes, and `nonlocal` cannot refer to
-                // globals, so check only function-like scopes.
-                let enclosing_scope_id = enclosing_scope_file_id.to_scope_id(db, current_file);
-                if !enclosing_scope_id.is_function_like(db) {
-                    continue;
-                }
-                let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
-                let Some(enclosing_symbol_id) = enclosing_place_table.symbol_id(name) else {
-                    // This scope doesn't define this name. Keep going.
-                    continue;
-                };
-                let enclosing_symbol = enclosing_place_table.symbol(enclosing_symbol_id);
-                // We've found a definition for this name in an enclosing function-like scope.
-                // Either this definition is the valid place this name refers to, or else we'll
-                // emit a syntax error. Either way, we won't walk any more enclosing scopes. Note
-                // that there are differences here compared to `infer_place_load`: A regular load
-                // (e.g. `print(x)`) is allowed to refer to a global variable (e.g. `x = 1` in the
-                // global scope), and similarly it's allowed to refer to a local variable in an
-                // enclosing function that's declared `global` (e.g. `global x`). However, the
-                // `nonlocal` keyword can't refer to global variables (that's a `SyntaxError`), and
-                // it also can't refer to local variables in enclosing functions that are declared
-                // `global` (also a `SyntaxError`).
-                if enclosing_symbol.is_global() {
-                    // A "chain" of `nonlocal` statements is "broken" by a `global` statement. Stop
-                    // looping and report that this `nonlocal` statement is invalid.
-                    break;
-                }
-                if !enclosing_symbol.is_bound()
-                    && !enclosing_symbol.is_declared()
-                    && !enclosing_symbol.is_nonlocal()
-                {
-                    debug_assert!(enclosing_symbol.is_used());
-                    // The name is only referenced here, not defined. Keep going.
-                    continue;
-                }
-                // We found a definition. We've checked that the name isn't `global` in this scope,
-                // but it's ok if it's `nonlocal`. If a "chain" of `nonlocal` statements fails to
-                // lead to a valid binding, the outermost one will be an error; we don't need to
-                // walk the whole chain for each one.
-                continue 'names;
-            }
-            // There's no matching binding in an enclosing scope. This `nonlocal` statement is
-            // invalid.
-            if let Some(builder) = self
-                .context
-                .report_diagnostic(DiagnosticId::InvalidSyntax, Severity::Error)
-            {
-                builder
-                    .into_diagnostic(format_args!("no binding for nonlocal `{name}` found"))
-                    .annotate(Annotation::primary(self.context.span(*range)));
-            }
-        }
-    }
-
-    fn module_type_from_name(&self, module_name: &ModuleName) -> Option<Type<'db>> {
-        resolve_module(self.db(), module_name)
-            .map(|module| Type::module_literal(self.db(), self.file(), module))
-    }
-
-    fn infer_decorator(&mut self, decorator: &ast::Decorator) -> Type<'db> {
-        let ast::Decorator {
-            range: _,
-            node_index: _,
-            expression,
-        } = decorator;
-
-        self.infer_expression(expression)
-    }
-
-    fn infer_argument_types<'a>(
-        &mut self,
-        ast_arguments: &ast::Arguments,
-        arguments: &mut CallArguments<'a, 'db>,
-        argument_forms: &[Option<ParameterForm>],
-    ) {
-        debug_assert!(
-            ast_arguments.len() == arguments.len() && arguments.len() == argument_forms.len()
-        );
-        let iter = (arguments.iter_mut())
-            .zip(argument_forms.iter().copied())
-            .zip(ast_arguments.arguments_source_order());
-        for (((_, argument_type), form), arg_or_keyword) in iter {
-            let argument = match arg_or_keyword {
-                // We already inferred the type of splatted arguments.
-                ast::ArgOrKeyword::Arg(ast::Expr::Starred(_)) => continue,
-                ast::ArgOrKeyword::Arg(arg) => arg,
-                ast::ArgOrKeyword::Keyword(ast::Keyword { value, .. }) => value,
-            };
-            let ty = self.infer_argument_type(argument, form);
-            *argument_type = Some(ty);
-        }
-    }
-
-    fn infer_argument_type(
-        &mut self,
-        ast_argument: &ast::Expr,
-        form: Option<ParameterForm>,
-    ) -> Type<'db> {
-        match form {
-            None | Some(ParameterForm::Value) => self.infer_expression(ast_argument),
-            Some(ParameterForm::Type) => self.infer_type_expression(ast_argument),
-        }
-    }
-
-    fn infer_optional_expression(&mut self, expression: Option<&ast::Expr>) -> Option<Type<'db>> {
-        expression.map(|expr| self.infer_expression(expr))
-    }
-
-    #[track_caller]
-    fn infer_expression(&mut self, expression: &ast::Expr) -> Type<'db> {
-        debug_assert!(
-            !self.index.is_standalone_expression(expression),
-            "Calling `self.infer_expression` on a standalone-expression is not allowed because it can lead to double-inference. Use `self.infer_standalone_expression` instead."
-        );
-
-        self.infer_expression_impl(expression)
-    }
-
-    fn infer_maybe_standalone_expression(&mut self, expression: &ast::Expr) -> Type<'db> {
-        if let Some(standalone_expression) = self.index.try_expression(expression) {
-            self.infer_standalone_expression_impl(expression, standalone_expression)
-        } else {
-            self.infer_expression(expression)
-        }
-    }
-
-    #[track_caller]
-    fn infer_standalone_expression(&mut self, expression: &ast::Expr) -> Type<'db> {
-        let standalone_expression = self.index.expression(expression);
-        self.infer_standalone_expression_impl(expression, standalone_expression)
-    }
-
-    fn infer_standalone_expression_impl(
-        &mut self,
-        expression: &ast::Expr,
-        standalone_expression: Expression<'db>,
-    ) -> Type<'db> {
-        let types = infer_expression_types(self.db(), standalone_expression);
-        self.extend_expression(types);
-
-        // Instead of calling `self.expression_type(expr)` after extending here, we get
-        // the result from `types` directly because we might be in cycle recovery where
-        // `types.cycle_fallback_type` is `Some(fallback_ty)`, which we can retrieve by
-        // using `expression_type` on `types`:
-        types.expression_type(expression)
-    }
-
-    fn infer_expression_impl(&mut self, expression: &ast::Expr) -> Type<'db> {
-        let ty = match expression {
-            ast::Expr::NoneLiteral(ast::ExprNoneLiteral {
-                range: _,
-                node_index: _,
-            }) => Type::none(self.db()),
-            ast::Expr::NumberLiteral(literal) => self.infer_number_literal_expression(literal),
-            ast::Expr::BooleanLiteral(literal) => self.infer_boolean_literal_expression(literal),
-            ast::Expr::StringLiteral(literal) => self.infer_string_literal_expression(literal),
-            ast::Expr::BytesLiteral(bytes_literal) => {
-                self.infer_bytes_literal_expression(bytes_literal)
-            }
-            ast::Expr::FString(fstring) => self.infer_fstring_expression(fstring),
-            ast::Expr::TString(tstring) => self.infer_tstring_expression(tstring),
-            ast::Expr::EllipsisLiteral(literal) => self.infer_ellipsis_literal_expression(literal),
-            ast::Expr::Tuple(tuple) => self.infer_tuple_expression(tuple),
-            ast::Expr::List(list) => self.infer_list_expression(list),
-            ast::Expr::Set(set) => self.infer_set_expression(set),
-            ast::Expr::Dict(dict) => self.infer_dict_expression(dict),
-            ast::Expr::Generator(generator) => self.infer_generator_expression(generator),
-            ast::Expr::ListComp(listcomp) => self.infer_list_comprehension_expression(listcomp),
-            ast::Expr::DictComp(dictcomp) => self.infer_dict_comprehension_expression(dictcomp),
-            ast::Expr::SetComp(setcomp) => self.infer_set_comprehension_expression(setcomp),
-            ast::Expr::Name(name) => self.infer_name_expression(name),
-            ast::Expr::Attribute(attribute) => self.infer_attribute_expression(attribute),
-            ast::Expr::UnaryOp(unary_op) => self.infer_unary_expression(unary_op),
-            ast::Expr::BinOp(binary) => self.infer_binary_expression(binary),
-            ast::Expr::BoolOp(bool_op) => self.infer_boolean_expression(bool_op),
-            ast::Expr::Compare(compare) => self.infer_compare_expression(compare),
-            ast::Expr::Subscript(subscript) => self.infer_subscript_expression(subscript),
-            ast::Expr::Slice(slice) => self.infer_slice_expression(slice),
-            ast::Expr::Named(named) => self.infer_named_expression(named),
-            ast::Expr::If(if_expression) => self.infer_if_expression(if_expression),
-            ast::Expr::Lambda(lambda_expression) => self.infer_lambda_expression(lambda_expression),
-            ast::Expr::Call(call_expression) => self.infer_call_expression(call_expression),
-            ast::Expr::Starred(starred) => self.infer_starred_expression(starred),
-            ast::Expr::Yield(yield_expression) => self.infer_yield_expression(yield_expression),
-            ast::Expr::YieldFrom(yield_from) => self.infer_yield_from_expression(yield_from),
-            ast::Expr::Await(await_expression) => self.infer_await_expression(await_expression),
-            ast::Expr::IpyEscapeCommand(_) => {
-                todo_type!("Ipy escape command support")
-            }
-        };
-
-        self.store_expression_type(expression, ty);
-
-        ty
-    }
-
-    fn store_expression_type(&mut self, expression: &ast::Expr, ty: Type<'db>) {
-        if self.deferred_state.in_string_annotation() {
-            // Avoid storing the type of expressions that are part of a string annotation because
-            // the expression ids don't exists in the semantic index. Instead, we'll store the type
-            // on the string expression itself that represents the annotation.
-            return;
-        }
-        let previous = self.expressions.insert(expression.into(), ty);
-        assert_eq!(previous, None);
-    }
-
-    fn infer_number_literal_expression(&mut self, literal: &ast::ExprNumberLiteral) -> Type<'db> {
-        let ast::ExprNumberLiteral {
-            range: _,
-            node_index: _,
-            value,
-        } = literal;
-        let db = self.db();
-
-        match value {
-            ast::Number::Int(n) => n
-                .as_i64()
-                .map(Type::IntLiteral)
-                .unwrap_or_else(|| KnownClass::Int.to_instance(db)),
-            ast::Number::Float(_) => KnownClass::Float.to_instance(db),
-            ast::Number::Complex { .. } => KnownClass::Complex.to_instance(db),
-        }
-    }
-
-    #[expect(clippy::unused_self)]
-    fn infer_boolean_literal_expression(&mut self, literal: &ast::ExprBooleanLiteral) -> Type<'db> {
-        let ast::ExprBooleanLiteral {
-            range: _,
-            node_index: _,
-            value,
-        } = literal;
-
-        Type::BooleanLiteral(*value)
-    }
-
-    fn infer_string_literal_expression(&mut self, literal: &ast::ExprStringLiteral) -> Type<'db> {
-        if literal.value.len() <= Self::MAX_STRING_LITERAL_SIZE {
-            Type::string_literal(self.db(), literal.value.to_str())
-        } else {
-            Type::LiteralString
-        }
-    }
-
-    fn infer_bytes_literal_expression(&mut self, literal: &ast::ExprBytesLiteral) -> Type<'db> {
-        // TODO: ignoring r/R prefixes for now, should normalize bytes values
-        let bytes: Vec<u8> = literal.value.bytes().collect();
-        Type::bytes_literal(self.db(), &bytes)
-    }
-
-    fn infer_fstring_expression(&mut self, fstring: &ast::ExprFString) -> Type<'db> {
-        let ast::ExprFString {
-            range: _,
-            node_index: _,
-            value,
-        } = fstring;
-
-        let mut collector = StringPartsCollector::new();
-        for part in value {
-            // Make sure we iter through every parts to infer all sub-expressions. The `collector`
-            // struct ensures we don't allocate unnecessary strings.
-            match part {
-                ast::FStringPart::Literal(literal) => {
-                    collector.push_str(&literal.value);
-                }
-                ast::FStringPart::FString(fstring) => {
-                    for element in &fstring.elements {
-                        match element {
-                            ast::InterpolatedStringElement::Interpolation(expression) => {
-                                let ast::InterpolatedElement {
-                                    range: _,
-                                    node_index: _,
-                                    expression,
-                                    debug_text: _,
-                                    conversion,
-                                    format_spec,
-                                } = expression;
-                                let ty = self.infer_expression(expression);
-
-                                if let Some(format_spec) = format_spec {
-                                    for element in format_spec.elements.interpolations() {
-                                        self.infer_expression(&element.expression);
-                                    }
-                                }
-
-                                // TODO: handle format specifiers by calling a method
-                                // (`Type::format`?) that handles the `__format__` method.
-                                // Conversion flags should be handled before calling `__format__`.
-                                // https://docs.python.org/3/library/string.html#format-string-syntax
-                                if !conversion.is_none() || format_spec.is_some() {
-                                    collector.add_expression();
-                                } else {
-                                    if let Type::StringLiteral(literal) = ty.str(self.db()) {
-                                        collector.push_str(literal.value(self.db()));
-                                    } else {
-                                        collector.add_expression();
-                                    }
-                                }
-                            }
-                            ast::InterpolatedStringElement::Literal(literal) => {
-                                collector.push_str(&literal.value);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        collector.string_type(self.db())
-    }
-
-    fn infer_tstring_expression(&mut self, tstring: &ast::ExprTString) -> Type<'db> {
-        let ast::ExprTString { value, .. } = tstring;
-        for tstring in value {
-            for element in &tstring.elements {
-                match element {
-                    ast::InterpolatedStringElement::Interpolation(
-                        tstring_interpolation_element,
-                    ) => {
-                        let ast::InterpolatedElement {
-                            expression,
-                            format_spec,
-                            ..
-                        } = tstring_interpolation_element;
-                        self.infer_expression(expression);
-                        if let Some(format_spec) = format_spec {
-                            for element in format_spec.elements.interpolations() {
-                                self.infer_expression(&element.expression);
-                            }
-                        }
-                    }
-                    ast::InterpolatedStringElement::Literal(_) => {}
-                }
-            }
-        }
-        todo_type!("Template")
-    }
-
-    fn infer_ellipsis_literal_expression(
-        &mut self,
-        _literal: &ast::ExprEllipsisLiteral,
-    ) -> Type<'db> {
-        KnownClass::EllipsisType.to_instance(self.db())
-    }
-
-    fn infer_tuple_expression(&mut self, tuple: &ast::ExprTuple) -> Type<'db> {
-        let ast::ExprTuple {
-            range: _,
-            node_index: _,
-            elts,
-            ctx: _,
-            parenthesized: _,
-        } = tuple;
-
-        // Collecting all elements is necessary to infer all sub-expressions even if some
-        // element types are `Never` (which leads `from_elements` to return early without
-        // consuming the whole iterator).
-        let element_types: Vec<_> = elts.iter().map(|elt| self.infer_expression(elt)).collect();
-
-        Type::heterogeneous_tuple(self.db(), element_types)
-    }
-
-    fn infer_list_expression(&mut self, list: &ast::ExprList) -> Type<'db> {
-        let ast::ExprList {
-            range: _,
-            node_index: _,
-            elts,
-            ctx: _,
-        } = list;
-
-        for elt in elts {
-            self.infer_expression(elt);
-        }
-
-        // TODO generic
-        KnownClass::List.to_instance(self.db())
-    }
-
-    fn infer_set_expression(&mut self, set: &ast::ExprSet) -> Type<'db> {
-        let ast::ExprSet {
-            range: _,
-            node_index: _,
-            elts,
-        } = set;
-
-        for elt in elts {
-            self.infer_expression(elt);
-        }
-
-        // TODO generic
-        KnownClass::Set.to_instance(self.db())
-    }
-
-    fn infer_dict_expression(&mut self, dict: &ast::ExprDict) -> Type<'db> {
-        let ast::ExprDict {
-            range: _,
-            node_index: _,
-            items,
-        } = dict;
-
-        for item in items {
-            self.infer_optional_expression(item.key.as_ref());
-            self.infer_expression(&item.value);
-        }
-
-        // TODO generic
-        KnownClass::Dict.to_instance(self.db())
-    }
-
-    /// Infer the type of the `iter` expression of the first comprehension.
-    fn infer_first_comprehension_iter(&mut self, comprehensions: &[ast::Comprehension]) {
-        let mut comprehensions_iter = comprehensions.iter();
-        let Some(first_comprehension) = comprehensions_iter.next() else {
-            unreachable!("Comprehension must contain at least one generator");
-        };
-        self.infer_standalone_expression(&first_comprehension.iter);
-    }
-
-    fn infer_generator_expression(&mut self, generator: &ast::ExprGenerator) -> Type<'db> {
-        let ast::ExprGenerator {
-            range: _,
-            node_index: _,
-            elt: _,
-            generators,
-            parenthesized: _,
-        } = generator;
-
-        self.infer_first_comprehension_iter(generators);
-
-        todo_type!("generator type")
-    }
-
-    fn infer_list_comprehension_expression(&mut self, listcomp: &ast::ExprListComp) -> Type<'db> {
-        let ast::ExprListComp {
-            range: _,
-            node_index: _,
-            elt: _,
-            generators,
-        } = listcomp;
-
-        self.infer_first_comprehension_iter(generators);
-
-        todo_type!("list comprehension type")
-    }
-
-    fn infer_dict_comprehension_expression(&mut self, dictcomp: &ast::ExprDictComp) -> Type<'db> {
-        let ast::ExprDictComp {
-            range: _,
-            node_index: _,
-            key: _,
-            value: _,
-            generators,
-        } = dictcomp;
-
-        self.infer_first_comprehension_iter(generators);
-
-        todo_type!("dict comprehension type")
-    }
-
-    fn infer_set_comprehension_expression(&mut self, setcomp: &ast::ExprSetComp) -> Type<'db> {
-        let ast::ExprSetComp {
-            range: _,
-            node_index: _,
-            elt: _,
-            generators,
-        } = setcomp;
-
-        self.infer_first_comprehension_iter(generators);
-
-        todo_type!("set comprehension type")
-    }
-
-    fn infer_generator_expression_scope(&mut self, generator: &ast::ExprGenerator) {
-        let ast::ExprGenerator {
-            range: _,
-            node_index: _,
-            elt,
-            generators,
-            parenthesized: _,
-        } = generator;
-
-        self.infer_expression(elt);
-        self.infer_comprehensions(generators);
-    }
-
-    fn infer_list_comprehension_expression_scope(&mut self, listcomp: &ast::ExprListComp) {
-        let ast::ExprListComp {
-            range: _,
-            node_index: _,
-            elt,
-            generators,
-        } = listcomp;
-
-        self.infer_expression(elt);
-        self.infer_comprehensions(generators);
-    }
-
-    fn infer_dict_comprehension_expression_scope(&mut self, dictcomp: &ast::ExprDictComp) {
-        let ast::ExprDictComp {
-            range: _,
-            node_index: _,
-            key,
-            value,
-            generators,
-        } = dictcomp;
-
-        self.infer_expression(key);
-        self.infer_expression(value);
-        self.infer_comprehensions(generators);
-    }
-
-    fn infer_set_comprehension_expression_scope(&mut self, setcomp: &ast::ExprSetComp) {
-        let ast::ExprSetComp {
-            range: _,
-            node_index: _,
-            elt,
-            generators,
-        } = setcomp;
-
-        self.infer_expression(elt);
-        self.infer_comprehensions(generators);
-    }
-
-    fn infer_comprehensions(&mut self, comprehensions: &[ast::Comprehension]) {
-        let mut comprehensions_iter = comprehensions.iter();
-        let Some(first_comprehension) = comprehensions_iter.next() else {
-            unreachable!("Comprehension must contain at least one generator");
-        };
-        self.infer_comprehension(first_comprehension, true);
-        for comprehension in comprehensions_iter {
-            self.infer_comprehension(comprehension, false);
-        }
-    }
-
-    fn infer_comprehension(&mut self, comprehension: &ast::Comprehension, is_first: bool) {
-        let ast::Comprehension {
-            range: _,
-            node_index: _,
-            target,
-            iter,
-            ifs,
-            is_async: _,
-        } = comprehension;
-
-        self.infer_target(target, iter, |builder, iter_expr| {
-            // TODO: `infer_comprehension_definition` reports a diagnostic if `iter_ty` isn't iterable
-            //  but only if the target is a name. We should report a diagnostic here if the target isn't a name:
-            //  `[... for a.x in not_iterable]
-            if is_first {
-                infer_same_file_expression_type(
-                    builder.db(),
-                    builder.index.expression(iter_expr),
-                    builder.module(),
-                )
-            } else {
-                builder.infer_standalone_expression(iter_expr)
-            }
-            .iterate(builder.db())
-            .homogeneous_element_type(builder.db())
-        });
-        for expr in ifs {
-            self.infer_standalone_expression(expr);
-        }
-    }
-
-    fn infer_comprehension_definition(
-        &mut self,
-        comprehension: &ComprehensionDefinitionKind<'db>,
-        definition: Definition<'db>,
-    ) {
-        let iterable = comprehension.iterable(self.module());
-        let target = comprehension.target(self.module());
-
-        let mut infer_iterable_type = || {
-            let expression = self.index.expression(iterable);
-            let result = infer_expression_types(self.db(), expression);
-
-            // Two things are different if it's the first comprehension:
-            // (1) We must lookup the `ScopedExpressionId` of the iterable expression in the outer scope,
-            //     because that's the scope we visit it in in the semantic index builder
-            // (2) We must *not* call `self.extend()` on the result of the type inference,
-            //     because `ScopedExpressionId`s are only meaningful within their own scope, so
-            //     we'd add types for random wrong expressions in the current scope
-            if comprehension.is_first() && target.is_name_expr() {
-                result.expression_type(iterable)
-            } else {
-                self.extend_expression_unchecked(result);
-                result.expression_type(iterable)
-            }
-        };
-
-        let target_type = match comprehension.target_kind() {
-            TargetKind::Sequence(unpack_position, unpack) => {
-                let unpacked = infer_unpack_types(self.db(), unpack);
-                if unpack_position == UnpackPosition::First {
-                    self.context.extend(unpacked.diagnostics());
-                }
-
-                unpacked.expression_type(target)
-            }
-            TargetKind::Single => {
-                let iterable_type = infer_iterable_type();
-
-                iterable_type
-                    .try_iterate_with_mode(
-                        self.db(),
-                        EvaluationMode::from_is_async(comprehension.is_async()),
-                    )
-                    .map(|tuple| tuple.homogeneous_element_type(self.db()))
-                    .unwrap_or_else(|err| {
-                        err.report_diagnostic(&self.context, iterable_type, iterable.into());
-                        err.fallback_element_type(self.db())
-                    })
-            }
-        };
-
-        self.expressions.insert(target.into(), target_type);
-        self.add_binding(target.into(), definition, target_type);
-    }
-
-    fn infer_named_expression(&mut self, named: &ast::ExprNamed) -> Type<'db> {
-        // See https://peps.python.org/pep-0572/#differences-between-assignment-expressions-and-assignment-statements
-        if named.target.is_name_expr() {
-            let definition = self.index.expect_single_definition(named);
-            let result = infer_definition_types(self.db(), definition);
-            self.extend_definition(result);
-            result.binding_type(definition)
-        } else {
-            // For syntactically invalid targets, we still need to run type inference:
-            self.infer_expression(&named.target);
-            self.infer_expression(&named.value);
-            Type::unknown()
-        }
-    }
-
-    fn infer_named_expression_definition(
-        &mut self,
-        named: &ast::ExprNamed,
-        definition: Definition<'db>,
-    ) -> Type<'db> {
-        let ast::ExprNamed {
-            range: _,
-            node_index: _,
-            target,
-            value,
-        } = named;
-
-        let value_ty = self.infer_expression(value);
-        self.infer_expression(target);
-
-        self.add_binding(named.into(), definition, value_ty);
-
-        value_ty
-    }
-
-    fn infer_if_expression(&mut self, if_expression: &ast::ExprIf) -> Type<'db> {
-        let ast::ExprIf {
-            range: _,
-            node_index: _,
-            test,
-            body,
-            orelse,
-        } = if_expression;
-
-        let test_ty = self.infer_standalone_expression(test);
-        let body_ty = self.infer_expression(body);
-        let orelse_ty = self.infer_expression(orelse);
-
-        match test_ty.try_bool(self.db()).unwrap_or_else(|err| {
-            err.report_diagnostic(&self.context, &**test);
-            err.fallback_truthiness()
-        }) {
-            Truthiness::AlwaysTrue => body_ty,
-            Truthiness::AlwaysFalse => orelse_ty,
-            Truthiness::Ambiguous => UnionType::from_elements(self.db(), [body_ty, orelse_ty]),
-        }
-    }
-
-    fn infer_lambda_body(&mut self, lambda_expression: &ast::ExprLambda) {
-        self.infer_expression(&lambda_expression.body);
-    }
-
-    fn infer_lambda_expression(&mut self, lambda_expression: &ast::ExprLambda) -> Type<'db> {
-        let ast::ExprLambda {
-            range: _,
-            node_index: _,
-            parameters,
-            body: _,
-        } = lambda_expression;
-
-        let parameters = if let Some(parameters) = parameters {
-            let positional_only = parameters
-                .posonlyargs
-                .iter()
-                .map(|param| {
-                    let mut parameter = Parameter::positional_only(Some(param.name().id.clone()));
-                    if let Some(default) = param.default() {
-                        parameter = parameter.with_default_type(self.infer_expression(default));
-                    }
-                    parameter
-                })
-                .collect::<Vec<_>>();
-            let positional_or_keyword = parameters
-                .args
-                .iter()
-                .map(|param| {
-                    let mut parameter = Parameter::positional_or_keyword(param.name().id.clone());
-                    if let Some(default) = param.default() {
-                        parameter = parameter.with_default_type(self.infer_expression(default));
-                    }
-                    parameter
-                })
-                .collect::<Vec<_>>();
-            let variadic = parameters
-                .vararg
-                .as_ref()
-                .map(|param| Parameter::variadic(param.name().id.clone()));
-            let keyword_only = parameters
-                .kwonlyargs
-                .iter()
-                .map(|param| {
-                    let mut parameter = Parameter::keyword_only(param.name().id.clone());
-                    if let Some(default) = param.default() {
-                        parameter = parameter.with_default_type(self.infer_expression(default));
-                    }
-                    parameter
-                })
-                .collect::<Vec<_>>();
-            let keyword_variadic = parameters
-                .kwarg
-                .as_ref()
-                .map(|param| Parameter::keyword_variadic(param.name().id.clone()));
-
-            Parameters::new(
-                positional_only
-                    .into_iter()
-                    .chain(positional_or_keyword)
-                    .chain(variadic)
-                    .chain(keyword_only)
-                    .chain(keyword_variadic),
-            )
-        } else {
-            Parameters::empty()
-        };
-
-        // TODO: Useful inference of a lambda's return type will require a different approach,
-        // which does the inference of the body expression based on arguments at each call site,
-        // rather than eagerly computing a return type without knowing the argument types.
-        CallableType::function_like(self.db(), Signature::new(parameters, Some(Type::unknown())))
-    }
-
-    fn infer_call_expression(&mut self, call_expression: &ast::ExprCall) -> Type<'db> {
-        let ast::ExprCall {
-            range: _,
-            node_index: _,
-            func,
-            arguments,
-        } = call_expression;
-
-        // We don't call `Type::try_call`, because we want to perform type inference on the
-        // arguments after matching them to parameters, but before checking that the argument types
-        // are assignable to any parameter annotations.
-        let mut call_arguments =
-            CallArguments::from_arguments(self.db(), arguments, |argument, splatted_value| {
-                let ty = self.infer_expression(splatted_value);
-                self.store_expression_type(argument, ty);
-                ty
-            });
-
-        let callable_type = self.infer_maybe_standalone_expression(func);
-
-        if let Type::FunctionLiteral(function) = callable_type {
-            // Make sure that the `function.definition` is only called when the function is defined
-            // in the same file as the one we're currently inferring the types for. This is because
-            // the `definition` method accesses the semantic index, which could create a
-            // cross-module AST dependency.
-            if function.file(self.db()) == self.file()
-                && function.definition(self.db()).scope(self.db()) == self.scope()
-            {
-                self.called_functions.insert(function);
-            }
-        }
-
-        let class = match callable_type {
-            Type::ClassLiteral(class) => Some(ClassType::NonGeneric(class)),
-            Type::GenericAlias(generic) => Some(ClassType::Generic(generic)),
-            Type::SubclassOf(subclass) => subclass.subclass_of().into_class(),
-            _ => None,
-        };
-
-        if let Some(class) = class {
-            // It might look odd here that we emit an error for class-literals and generic aliases but not
-            // `type[]` types. But it's deliberate! The typing spec explicitly mandates that `type[]` types
-            // can be called even though class-literals cannot. This is because even though a protocol class
-            // `SomeProtocol` is always an abstract class, `type[SomeProtocol]` can be a concrete subclass of
-            // that protocol -- and indeed, according to the spec, type checkers must disallow abstract
-            // subclasses of the protocol to be passed to parameters that accept `type[SomeProtocol]`.
-            // <https://typing.python.org/en/latest/spec/protocol.html#type-and-class-objects-vs-protocols>.
-            if !callable_type.is_subclass_of() {
-                if let Some(protocol) = class
-                    .class_literal(self.db())
-                    .0
-                    .into_protocol_class(self.db())
-                {
-                    report_attempted_protocol_instantiation(
-                        &self.context,
-                        call_expression,
-                        protocol,
-                    );
-                }
-            }
-
-            // For class literals we model the entire class instantiation logic, so it is handled
-            // in a separate function. For some known classes we have manual signatures defined and use
-            // the `try_call` path below.
-            // TODO: it should be possible to move these special cases into the `try_call_constructor`
-            // path instead, or even remove some entirely once we support overloads fully.
-            let has_special_cased_constructor = matches!(
-                class.known(self.db()),
-                Some(
-                    KnownClass::Bool
-                        | KnownClass::Str
-                        | KnownClass::Type
-                        | KnownClass::Object
-                        | KnownClass::Property
-                        | KnownClass::Super
-                        | KnownClass::TypeVar
-                        | KnownClass::TypeAliasType
-                        | KnownClass::Deprecated
-                )
-            ) || (
-                // Constructor calls to `tuple` and subclasses of `tuple` are handled in `Type::Bindings`,
-                // but constructor calls to `tuple[int]`, `tuple[int, ...]`, `tuple[int, *tuple[str, ...]]` (etc.)
-                // are handled by the default constructor-call logic (we synthesize a `__new__` method for them
-                // in `ClassType::own_class_member()`).
-                class.is_known(self.db(), KnownClass::Tuple) && class.is_not_generic()
-            );
-
-            // temporary special-casing for all subclasses of `enum.Enum`
-            // until we support the functional syntax for creating enum classes
-            if !has_special_cased_constructor
-                && KnownClass::Enum
-                    .to_class_literal(self.db())
-                    .to_class_type(self.db())
-                    .is_none_or(|enum_class| !class.is_subclass_of(self.db(), enum_class))
-            {
-                let argument_forms = vec![Some(ParameterForm::Value); call_arguments.len()];
-                self.infer_argument_types(arguments, &mut call_arguments, &argument_forms);
-
-                return callable_type
-                    .try_call_constructor(self.db(), call_arguments)
-                    .unwrap_or_else(|err| {
-                        err.report_diagnostic(&self.context, callable_type, call_expression.into());
-                        err.return_type()
-                    });
-            }
-        }
-
-        let bindings = callable_type
-            .bindings(self.db())
-            .match_parameters(&call_arguments);
-        self.infer_argument_types(arguments, &mut call_arguments, &bindings.argument_forms);
-
-        let mut bindings = match bindings.check_types(self.db(), &call_arguments) {
-            Ok(bindings) => bindings,
-            Err(CallError(_, bindings)) => {
-                bindings.report_diagnostics(&self.context, call_expression.into());
-                return bindings.return_type(self.db());
-            }
-        };
-
-        for binding in &mut bindings {
-            let binding_type = binding.callable_type;
-            for (_, overload) in binding.matching_overloads_mut() {
-                match binding_type {
-                    Type::FunctionLiteral(function_literal) => {
-                        if let Some(known_function) = function_literal.known(self.db()) {
-                            known_function.check_call(
-                                &self.context,
-                                overload,
-                                &call_arguments,
-                                call_expression,
-                                self.file(),
-                            );
-                        }
-                    }
-                    Type::ClassLiteral(class) => {
-                        if let Some(known_class) = class.known(self.db()) {
-                            known_class.check_call(
-                                &self.context,
-                                self.index,
-                                overload,
-                                &call_arguments,
-                                call_expression,
-                            );
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-
-        let db = self.db();
-        let scope = self.scope();
-        let return_ty = bindings.return_type(db);
-
-        let find_narrowed_place = || match arguments.args.first() {
-            None => {
-                // This branch looks extraneous, especially in the face of `missing-arguments`.
-                // However, that lint won't be able to catch this:
-                //
-                // ```python
-                // def f(v: object = object()) -> TypeIs[int]: ...
-                //
-                // if f(): ...
-                // ```
-                //
-                // TODO: Will this report things that is actually fine?
-                if let Some(builder) = self
-                    .context
-                    .report_lint(&INVALID_TYPE_GUARD_CALL, arguments)
-                {
-                    builder.into_diagnostic("Type guard call does not have a target");
-                }
-                None
-            }
-            Some(expr) => match PlaceExpr::try_from_expr(expr) {
-                Some(place_expr) => place_table(db, scope).place_id(&place_expr),
-                None => None,
-            },
-        };
-
-        match return_ty {
-            // TODO: TypeGuard
-            Type::TypeIs(type_is) => match find_narrowed_place() {
-                Some(place) => type_is.bind(db, scope, place),
-                None => return_ty,
-            },
-            _ => return_ty,
-        }
-    }
-
-    fn infer_starred_expression(&mut self, starred: &ast::ExprStarred) -> Type<'db> {
-        let ast::ExprStarred {
-            range: _,
-            node_index: _,
-            value,
-            ctx: _,
-        } = starred;
-
-        let iterable_type = self.infer_expression(value);
-        iterable_type
-            .try_iterate(self.db())
-            .map(|tuple| tuple.homogeneous_element_type(self.db()))
-            .unwrap_or_else(|err| {
-                err.report_diagnostic(&self.context, iterable_type, value.as_ref().into());
-                err.fallback_element_type(self.db())
-            });
-
-        // TODO
-        todo_type!("starred expression")
-    }
-
-    fn infer_yield_expression(&mut self, yield_expression: &ast::ExprYield) -> Type<'db> {
-        let ast::ExprYield {
-            range: _,
-            node_index: _,
-            value,
-        } = yield_expression;
-        self.infer_optional_expression(value.as_deref());
-        todo_type!("yield expressions")
-    }
-
-    fn infer_yield_from_expression(&mut self, yield_from: &ast::ExprYieldFrom) -> Type<'db> {
-        let ast::ExprYieldFrom {
-            range: _,
-            node_index: _,
-            value,
-        } = yield_from;
-
-        let iterable_type = self.infer_expression(value);
-        iterable_type
-            .try_iterate(self.db())
-            .map(|tuple| tuple.homogeneous_element_type(self.db()))
-            .unwrap_or_else(|err| {
-                err.report_diagnostic(&self.context, iterable_type, value.as_ref().into());
-                err.fallback_element_type(self.db())
-            });
-
-        iterable_type
-            .generator_return_type(self.db())
-            .unwrap_or_else(Type::unknown)
-    }
-
-    fn infer_await_expression(&mut self, await_expression: &ast::ExprAwait) -> Type<'db> {
-        let ast::ExprAwait {
-            range: _,
-            node_index: _,
-            value,
-        } = await_expression;
-        let expr_type = self.infer_expression(value);
-        expr_type.try_await(self.db()).unwrap_or_else(|err| {
-            err.report_diagnostic(&self.context, expr_type, value.as_ref().into());
-            Type::unknown()
-        })
-    }
-
-    // Perform narrowing with applicable constraints between the current scope and the enclosing scope.
-    fn narrow_place_with_applicable_constraints(
-        &self,
-        expr: PlaceExprRef,
-        mut ty: Type<'db>,
-        constraint_keys: &[(FileScopeId, ConstraintKey)],
-    ) -> Type<'db> {
-        let db = self.db();
-        for (enclosing_scope_file_id, constraint_key) in constraint_keys {
-            let use_def = self.index.use_def_map(*enclosing_scope_file_id);
-            let place_table = self.index.place_table(*enclosing_scope_file_id);
-            let place = place_table.place_id(expr).unwrap();
-
-            match use_def.applicable_constraints(
-                *constraint_key,
-                *enclosing_scope_file_id,
-                expr,
-                self.index,
-            ) {
-                ApplicableConstraints::UnboundBinding(constraint) => {
-                    ty = constraint.narrow(db, ty, place);
-                }
-                // Performs narrowing based on constrained bindings.
-                // This handling must be performed even if narrowing is attempted and failed using `infer_place_load`.
-                // The result of `infer_place_load` can be applied as is only when its boundness is `Bound`.
-                // For example, this handling is required in the following case:
-                // ```python
-                // class C:
-                //     x: int | None = None
-                // c = C()
-                // # c.x: int | None = <unbound>
-                // if c.x is None:
-                //     c.x = 1
-                // # else: c.x: int = <unbound>
-                // # `c.x` is not definitely bound here
-                // reveal_type(c.x)  # revealed: int
-                // ```
-                ApplicableConstraints::ConstrainedBindings(bindings) => {
-                    let reachability_constraints = bindings.reachability_constraints;
-                    let predicates = bindings.predicates;
-                    let mut union = UnionBuilder::new(db);
-                    for binding in bindings {
-                        let static_reachability = reachability_constraints.evaluate(
-                            db,
-                            predicates,
-                            binding.reachability_constraint,
-                        );
-                        if static_reachability.is_always_false() {
-                            continue;
-                        }
-                        match binding.binding {
-                            DefinitionState::Defined(definition) => {
-                                let binding_ty = binding_type(db, definition);
-                                union = union.add(
-                                    binding.narrowing_constraint.narrow(db, binding_ty, place),
-                                );
-                            }
-                            DefinitionState::Undefined | DefinitionState::Deleted => {
-                                union =
-                                    union.add(binding.narrowing_constraint.narrow(db, ty, place));
-                            }
-                        }
-                    }
-                    // If there are no visible bindings, the union becomes `Never`.
-                    // Since an unbound binding is recorded even for an undefined place,
-                    // this can only happen if the code is unreachable
-                    // and therefore it is correct to set the result to `Never`.
-                    let union = union.build();
-                    if union.is_assignable_to(db, ty) {
-                        ty = union;
-                    }
-                }
-            }
-        }
-        ty
-    }
-
-    /// Check if the given ty is `@deprecated` or not
-    fn check_deprecated<T: Ranged>(&self, ranged: T, ty: Type) {
-        // First handle classes
-        if let Type::ClassLiteral(class_literal) = ty {
-            let Some(deprecated) = class_literal.deprecated(self.db()) else {
-                return;
-            };
-
-            let Some(builder) = self
-                .context
-                .report_lint(&crate::types::diagnostic::DEPRECATED, ranged)
-            else {
-                return;
-            };
-
-            let class_name = class_literal.name(self.db());
-            let mut diag =
-                builder.into_diagnostic(format_args!(r#"The class `{class_name}` is deprecated"#));
-            if let Some(message) = deprecated.message(self.db()) {
-                diag.set_primary_message(message.value(self.db()));
-            }
-            diag.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
-            return;
-        }
-
-        // Next handle functions
-        let function = match ty {
-            Type::FunctionLiteral(function) => function,
-            Type::BoundMethod(bound) => bound.function(self.db()),
-            _ => return,
-        };
-
-        // Currently we only check the final implementation for deprecation, as
-        // that check can be done on any reference to the function. Analysis of
-        // deprecated overloads needs to be done in places where we resolve the
-        // actual overloads being used.
-        let Some(deprecated) = function.implementation_deprecated(self.db()) else {
-            return;
-        };
-
-        let Some(builder) = self
-            .context
-            .report_lint(&crate::types::diagnostic::DEPRECATED, ranged)
-        else {
-            return;
-        };
-
-        let func_name = function.name(self.db());
-        let mut diag =
-            builder.into_diagnostic(format_args!(r#"The function `{func_name}` is deprecated"#));
-        if let Some(message) = deprecated.message(self.db()) {
-            diag.set_primary_message(message.value(self.db()));
-        }
-        diag.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
-    }
-
-    fn infer_name_load(&mut self, name_node: &ast::ExprName) -> Type<'db> {
-        let ast::ExprName {
-            range: _,
-            node_index: _,
-            id: symbol_name,
-            ctx: _,
-        } = name_node;
-        let expr = PlaceExpr::from_expr_name(name_node);
-        let db = self.db();
-
-        let (resolved, constraint_keys) =
-            self.infer_place_load(PlaceExprRef::from(&expr), ast::ExprRef::Name(name_node));
-
-        resolved
-            // Not found in the module's explicitly declared global symbols?
-            // Check the "implicit globals" such as `__doc__`, `__file__`, `__name__`, etc.
-            // These are looked up as attributes on `types.ModuleType`.
-            .or_fall_back_to(db, || {
-                module_type_implicit_global_symbol(db, symbol_name).map_type(|ty| {
-                    self.narrow_place_with_applicable_constraints(
-                        PlaceExprRef::from(&expr),
-                        ty,
-                        &constraint_keys,
-                    )
-                })
-            })
-            // Not found in globals? Fallback to builtins
-            // (without infinite recursion if we're already in builtins.)
-            .or_fall_back_to(db, || {
-                if Some(self.scope()) == builtins_module_scope(db) {
-                    Place::Unbound.into()
-                } else {
-                    builtins_symbol(db, symbol_name)
-                }
-            })
-            // Still not found? It might be `reveal_type`...
-            .or_fall_back_to(db, || {
-                if symbol_name == "reveal_type" {
-                    if let Some(builder) = self.context.report_lint(&UNDEFINED_REVEAL, name_node) {
-                        let mut diag =
-                            builder.into_diagnostic("`reveal_type` used without importing it");
-                        diag.info(
-                            "This is allowed for debugging convenience but will fail at runtime",
-                        );
-                    }
-                    typing_extensions_symbol(db, symbol_name)
-                } else {
-                    Place::Unbound.into()
-                }
-            })
-            .unwrap_with_diagnostic(|lookup_error| match lookup_error {
-                LookupError::Unbound(qualifiers) => {
-                    self.report_unresolved_reference(name_node);
-                    TypeAndQualifiers::new(Type::unknown(), qualifiers)
-                }
-                LookupError::PossiblyUnbound(type_when_bound) => {
-                    if self.is_reachable(name_node) {
-                        report_possibly_unresolved_reference(&self.context, name_node);
-                    }
-                    type_when_bound
-                }
-            })
-            .inner_type()
-    }
-
-    fn infer_local_place_load(
-        &self,
-        expr: PlaceExprRef,
-        expr_ref: ast::ExprRef,
-    ) -> (Place<'db>, Option<ScopedUseId>) {
-        let db = self.db();
-        let scope = self.scope();
-        let file_scope_id = scope.file_scope_id(db);
-        let place_table = self.index.place_table(file_scope_id);
-        let use_def = self.index.use_def_map(file_scope_id);
-
-        // If we're inferring types of deferred expressions, look them up from end-of-scope.
-        if self.is_deferred() {
-            let place = if let Some(place_id) = place_table.place_id(expr) {
-                place_from_bindings(db, use_def.all_reachable_bindings(place_id))
-            } else {
-                assert!(
-                    self.deferred_state.in_string_annotation(),
-                    "Expected the place table to create a place for every valid PlaceExpr node"
-                );
-                Place::Unbound
-            };
-            (place, None)
-        } else {
-            if expr_ref
-                .as_name_expr()
-                .is_some_and(|name| name.is_invalid())
-            {
-                return (Place::Unbound, None);
-            }
-
-            let use_id = expr_ref.scoped_use_id(db, scope);
-            let place = place_from_bindings(db, use_def.bindings_at_use(use_id));
-
-            (place, Some(use_id))
-        }
-    }
-
-    /// Infer the type of a place expression from definitions, assuming a load context.
-    /// This method also returns the [`ConstraintKey`]s for each scope associated with `expr`,
-    /// which is used to narrow by condition rather than by assignment.
-    fn infer_place_load(
-        &self,
-        place_expr: PlaceExprRef,
-        expr_ref: ast::ExprRef,
-    ) -> (PlaceAndQualifiers<'db>, Vec<(FileScopeId, ConstraintKey)>) {
-        let db = self.db();
-        let scope = self.scope();
-        let file_scope_id = scope.file_scope_id(db);
-        let place_table = self.index.place_table(file_scope_id);
-
-        let mut constraint_keys = vec![];
-        let (local_scope_place, use_id) = self.infer_local_place_load(place_expr, expr_ref);
-        if let Some(use_id) = use_id {
-            constraint_keys.push((file_scope_id, ConstraintKey::UseId(use_id)));
-        }
-
-        let place = PlaceAndQualifiers::from(local_scope_place).or_fall_back_to(db, || {
-            let current_file = self.file();
-            let mut symbol_resolves_locally = false;
-            if let Some(symbol) = place_expr.as_symbol() {
-                if let Some(symbol_id) = place_table.symbol_id(symbol.name()) {
-                    // Footgun: `place_expr` and `symbol` were probably constructed with all-zero
-                    // flags. We need to read the place table to get correct flags.
-                    symbol_resolves_locally = place_table.symbol(symbol_id).is_local();
-                    // If we try to access a variable in a class before it has been defined, the
-                    // lookup will fall back to global. See the comment on `Symbol::is_local`.
-                    let fallback_to_global =
-                        scope.node(db).scope_kind().is_class() && symbol_resolves_locally;
-                    if self.skip_non_global_scopes(file_scope_id, symbol_id) || fallback_to_global {
-                        return global_symbol(self.db(), self.file(), symbol.name()).map_type(
-                            |ty| {
-                                self.narrow_place_with_applicable_constraints(
-                                    place_expr,
-                                    ty,
-                                    &constraint_keys,
-                                )
-                            },
-                        );
-                    }
-                }
-            }
-
-            // Symbols that are bound or declared in the local scope, and not marked `nonlocal` or
-            // `global`, never refer to an enclosing scope. (If you reference such a symbol before
-            // it's bound, you get an `UnboundLocalError`.) Short-circuit instead of walking
-            // enclosing scopes in this case. The one exception to this rule is the global fallback
-            // in class bodies, which we already handled above.
-            if symbol_resolves_locally {
-                return Place::Unbound.into();
-            }
-
-            for parent_id in place_table.parents(place_expr) {
-                let parent_expr = place_table.place(parent_id);
-                let mut expr_ref = expr_ref;
-                for _ in 0..(place_expr.num_member_segments() - parent_expr.num_member_segments()) {
-                    match expr_ref {
-                        ast::ExprRef::Attribute(attribute) => {
-                            expr_ref = ast::ExprRef::from(&attribute.value);
-                        }
-                        ast::ExprRef::Subscript(subscript) => {
-                            expr_ref = ast::ExprRef::from(&subscript.value);
-                        }
-                        _ => unreachable!(),
-                    }
-                }
-                let (parent_place, _use_id) = self.infer_local_place_load(parent_expr, expr_ref);
-                if let Place::Type(_, _) = parent_place {
-                    return Place::Unbound.into();
-                }
-            }
-
-            // Walk up parent scopes looking for a possible enclosing scope that may have a
-            // definition of this name visible to us (would be `LOAD_DEREF` at runtime.)
-            // Note that we skip the scope containing the use that we are resolving, since we
-            // already looked for the place there up above.
-            let mut nonlocal_union_builder = UnionBuilder::new(db);
-            let mut found_some_definition = false;
-            for (enclosing_scope_file_id, _) in self.index.ancestor_scopes(file_scope_id).skip(1) {
-                // Class scopes are not visible to nested scopes, and we need to handle global
-                // scope differently (because an unbound name there falls back to builtins), so
-                // check only function-like scopes.
-                // There is one exception to this rule: annotation scopes can see
-                // names defined in an immediately-enclosing class scope.
-                let enclosing_scope_id = enclosing_scope_file_id.to_scope_id(db, current_file);
-
-                let is_immediately_enclosing_scope = scope.is_annotation(db)
-                    && scope
-                        .scope(db)
-                        .parent()
-                        .is_some_and(|parent| parent == enclosing_scope_file_id);
-
-                let has_root_place_been_reassigned = || {
-                    let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
-                    enclosing_place_table
-                        .parents(place_expr)
-                        .any(|enclosing_root_place_id| {
-                            enclosing_place_table
-                                .place(enclosing_root_place_id)
-                                .is_bound()
-                        })
-                };
-
-                // If the reference is in a nested eager scope, we need to look for the place at
-                // the point where the previous enclosing scope was defined, instead of at the end
-                // of the scope. (Note that the semantic index builder takes care of only
-                // registering eager bindings for nested scopes that are actually eager, and for
-                // enclosing scopes that actually contain bindings that we should use when
-                // resolving the reference.)
-                if !self.is_deferred() {
-                    match self.index.enclosing_snapshot(
-                        enclosing_scope_file_id,
-                        place_expr,
-                        file_scope_id,
-                    ) {
-                        EnclosingSnapshotResult::FoundConstraint(constraint) => {
-                            constraint_keys.push((
-                                enclosing_scope_file_id,
-                                ConstraintKey::NarrowingConstraint(constraint),
-                            ));
-                        }
-                        EnclosingSnapshotResult::FoundBindings(bindings) => {
-                            if place_expr.is_symbol()
-                                && !enclosing_scope_id.is_function_like(db)
-                                && !is_immediately_enclosing_scope
-                            {
-                                continue;
-                            }
-                            let place = place_from_bindings(db, bindings).map_type(|ty| {
-                                self.narrow_place_with_applicable_constraints(
-                                    place_expr,
-                                    ty,
-                                    &constraint_keys,
-                                )
-                            });
-                            constraint_keys.push((
-                                enclosing_scope_file_id,
-                                ConstraintKey::NestedScope(file_scope_id),
-                            ));
-                            return place.into();
-                        }
-                        // There are no visible bindings / constraint here.
-                        // Don't fall back to non-eager place resolution.
-                        EnclosingSnapshotResult::NotFound => {
-                            if has_root_place_been_reassigned() {
-                                return Place::Unbound.into();
-                            }
-                            continue;
-                        }
-                        EnclosingSnapshotResult::NoLongerInEagerContext => {
-                            if has_root_place_been_reassigned() {
-                                return Place::Unbound.into();
-                            }
-                        }
-                    }
-                }
-
-                if !enclosing_scope_id.is_function_like(db) && !is_immediately_enclosing_scope {
-                    continue;
-                }
-
-                let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
-                let Some(enclosing_place_id) = enclosing_place_table.place_id(place_expr) else {
-                    continue;
-                };
-
-                let enclosing_place = enclosing_place_table.place(enclosing_place_id);
-
-                // Reads of "free" variables terminate at any enclosing scope that marks the
-                // variable `global`, whether or not that scope actually binds the variable. If we
-                // see a `global` declaration, stop walking scopes and proceed to the global
-                // handling below. (If we're walking from a prior/inner scope where this variable
-                // is `nonlocal`, then this is a semantic syntax error, but we don't enforce that
-                // here. See `infer_nonlocal_statement`.)
-                if enclosing_place
-                    .as_symbol()
-                    .is_some_and(super::super::semantic_index::symbol::Symbol::is_global)
-                {
-                    break;
-                }
-
-                // If the name is declared or bound in this scope, figure out its type. This might
-                // resolve the name and end the walk. But if the name is declared `nonlocal` in
-                // this scope, we'll keep walking enclosing scopes and union this type with the
-                // other types we find. (It's a semantic syntax error to declare a type for a
-                // `nonlocal` variable, but we don't enforce that here. See the
-                // `ast::Stmt::AnnAssign` handling in `SemanticIndexBuilder::visit_stmt`.)
-                if enclosing_place.is_bound() || enclosing_place.is_declared() {
-                    let local_place_and_qualifiers = place(
-                        db,
-                        enclosing_scope_id,
-                        place_expr,
-                        ConsideredDefinitions::AllReachable,
-                    )
-                    .map_type(|ty| {
-                        self.narrow_place_with_applicable_constraints(
-                            place_expr,
-                            ty,
-                            &constraint_keys,
-                        )
-                    });
-                    // We could have Place::Unbound here, despite the checks above, for example if
-                    // this scope contains a `del` statement but no binding or declaration.
-                    if let Place::Type(type_, boundness) = local_place_and_qualifiers.place {
-                        nonlocal_union_builder.add_in_place(type_);
-                        // `ConsideredDefinitions::AllReachable` never returns PossiblyUnbound
-                        debug_assert_eq!(boundness, Boundness::Bound);
-                        found_some_definition = true;
-                    }
-
-                    if !enclosing_place
-                        .as_symbol()
-                        .is_some_and(super::super::semantic_index::symbol::Symbol::is_nonlocal)
-                    {
-                        // We've reached a function-like scope that marks this name bound or
-                        // declared but doesn't mark it `nonlocal`. The name is therefore resolved,
-                        // and we won't consider any scopes outside of this one.
-                        return if found_some_definition {
-                            Place::Type(nonlocal_union_builder.build(), Boundness::Bound).into()
-                        } else {
-                            Place::Unbound.into()
-                        };
-                    }
-                }
-            }
-
-            PlaceAndQualifiers::from(Place::Unbound)
-                // No nonlocal binding? Check the module's explicit globals.
-                // Avoid infinite recursion if `self.scope` already is the module's global scope.
-                .or_fall_back_to(db, || {
-                    if file_scope_id.is_global() {
-                        return Place::Unbound.into();
-                    }
-
-                    if !self.is_deferred() {
-                        match self.index.enclosing_snapshot(
-                            FileScopeId::global(),
-                            place_expr,
-                            file_scope_id,
-                        ) {
-                            EnclosingSnapshotResult::FoundConstraint(constraint) => {
-                                constraint_keys.push((
-                                    FileScopeId::global(),
-                                    ConstraintKey::NarrowingConstraint(constraint),
-                                ));
-                            }
-                            EnclosingSnapshotResult::FoundBindings(bindings) => {
-                                let place = place_from_bindings(db, bindings).map_type(|ty| {
-                                    self.narrow_place_with_applicable_constraints(
-                                        place_expr,
-                                        ty,
-                                        &constraint_keys,
-                                    )
-                                });
-                                constraint_keys.push((
-                                    FileScopeId::global(),
-                                    ConstraintKey::NestedScope(file_scope_id),
-                                ));
-                                return place.into();
-                            }
-                            // There are no visible bindings / constraint here.
-                            EnclosingSnapshotResult::NotFound => {
-                                return Place::Unbound.into();
-                            }
-                            EnclosingSnapshotResult::NoLongerInEagerContext => {}
-                        }
-                    }
-
-                    let Some(symbol) = place_expr.as_symbol() else {
-                        return Place::Unbound.into();
-                    };
-
-                    explicit_global_symbol(db, self.file(), symbol.name()).map_type(|ty| {
-                        self.narrow_place_with_applicable_constraints(
-                            place_expr,
-                            ty,
-                            &constraint_keys,
-                        )
-                    })
-                })
-        });
-
-        if let Some(ty) = place.place.ignore_possibly_unbound() {
-            self.check_deprecated(expr_ref, ty);
-        }
-
-        (place, constraint_keys)
-    }
-
-    pub(super) fn report_unresolved_reference(&self, expr_name_node: &ast::ExprName) {
-        if !self.is_reachable(expr_name_node) {
-            return;
-        }
-
-        let Some(builder) = self
-            .context
-            .report_lint(&UNRESOLVED_REFERENCE, expr_name_node)
-        else {
-            return;
-        };
-
-        let ast::ExprName { id, .. } = expr_name_node;
-        let mut diagnostic =
-            builder.into_diagnostic(format_args!("Name `{id}` used when not defined"));
-
-        // ===
-        // Subdiagnostic (1): check to see if it was added as a builtin in a later version of Python.
-        // ===
-        if let Some(version_added_to_builtins) = version_builtin_was_added(id) {
-            diagnostic.info(format_args!(
-                "`{id}` was added as a builtin in Python 3.{version_added_to_builtins}"
-            ));
-            add_inferred_python_version_hint_to_diagnostic(
-                self.db(),
-                &mut diagnostic,
-                "resolving types",
-            );
-        }
-
-        // ===
-        // Subdiagnostic (2):
-        // - If it's an instance method, check to see if it's available as an attribute on `self`;
-        // - If it's a classmethod, check to see if it's available as an attribute on `cls`
-        // ===
-        let Some(current_function) = self.current_function_definition() else {
-            return;
-        };
-
-        let function_parameters = &*current_function.parameters;
-
-        // `self`/`cls` can't be a keyword-only parameter.
-        if function_parameters.posonlyargs.is_empty() && function_parameters.args.is_empty() {
-            return;
-        }
-
-        let Some(first_parameter) = function_parameters.iter_non_variadic_params().next() else {
-            return;
-        };
-
-        let Some(class) = self.class_context_of_current_method() else {
-            return;
-        };
-
-        let first_parameter_name = first_parameter.name();
-
-        let function_decorators = FunctionDecorators::from_decorator_types(
-            self.db(),
-            self.function_decorator_types(current_function),
-        );
-
-        let attribute_exists = if function_decorators.contains(FunctionDecorators::CLASSMETHOD) {
-            if function_decorators.contains(FunctionDecorators::STATICMETHOD) {
-                return;
-            }
-            !Type::instance(self.db(), class.default_specialization(self.db()))
-                .class_member(self.db(), id.clone())
-                .place
-                .is_unbound()
-        } else if !function_decorators.contains(FunctionDecorators::STATICMETHOD) {
-            !Type::instance(self.db(), class.default_specialization(self.db()))
-                .member(self.db(), id)
-                .place
-                .is_unbound()
-        } else {
-            false
-        };
-
-        if attribute_exists {
-            diagnostic.info(format_args!(
-                "An attribute `{id}` is available: consider using `{first_parameter_name}.{id}`"
-            ));
-        }
-    }
-
-    fn infer_name_expression(&mut self, name: &ast::ExprName) -> Type<'db> {
-        match name.ctx {
-            ExprContext::Load => self.infer_name_load(name),
-            ExprContext::Store => Type::Never,
-            ExprContext::Del => {
-                self.infer_name_load(name);
-                Type::Never
-            }
-            ExprContext::Invalid => Type::unknown(),
-        }
-    }
-
-    fn narrow_expr_with_applicable_constraints<'r>(
-        &self,
-        target: impl Into<ast::ExprRef<'r>>,
-        target_ty: Type<'db>,
-        constraint_keys: &[(FileScopeId, ConstraintKey)],
-    ) -> Type<'db> {
-        let target = target.into();
-
-        if let Some(place_expr) = PlaceExpr::try_from_expr(target) {
-            self.narrow_place_with_applicable_constraints(
-                PlaceExprRef::from(&place_expr),
-                target_ty,
-                constraint_keys,
-            )
-        } else {
-            target_ty
-        }
-    }
-
-    /// Infer the type of a [`ast::ExprAttribute`] expression, assuming a load context.
-    fn infer_attribute_load(&mut self, attribute: &ast::ExprAttribute) -> Type<'db> {
-        let ast::ExprAttribute {
-            value,
-            attr,
-            range: _,
-            node_index: _,
-            ctx: _,
-        } = attribute;
-
-        let value_type = self.infer_maybe_standalone_expression(value);
-        let db = self.db();
-        let mut constraint_keys = vec![];
-
-        let mut assigned_type = None;
-        if let Some(place_expr) = PlaceExpr::try_from_expr(attribute) {
-            let (resolved, keys) = self.infer_place_load(
-                PlaceExprRef::from(&place_expr),
-                ast::ExprRef::Attribute(attribute),
-            );
-            constraint_keys.extend(keys);
-            if let Place::Type(ty, Boundness::Bound) = resolved.place {
-                assigned_type = Some(ty);
-            }
-        }
-
-        let resolved_type = value_type
-            .member(db, &attr.id)
-            .map_type(|ty| self.narrow_expr_with_applicable_constraints(attribute, ty, &constraint_keys))
-            .unwrap_with_diagnostic(|lookup_error| match lookup_error {
-                LookupError::Unbound(_) => {
-                    let report_unresolved_attribute = self.is_reachable(attribute);
-
-                    if report_unresolved_attribute {
-                        let bound_on_instance = match value_type {
-                            Type::ClassLiteral(class) => {
-                                !class.instance_member(db, None, attr).place.is_unbound()
-                            }
-                            Type::SubclassOf(subclass_of @ SubclassOfType { .. }) => {
-                                match subclass_of.subclass_of() {
-                                    SubclassOfInner::Class(class) => {
-                                        !class.instance_member(db, attr).place.is_unbound()
-                                    }
-                                    SubclassOfInner::Dynamic(_) => unreachable!(
-                                        "Attribute lookup on a dynamic `SubclassOf` type should always return a bound symbol"
-                                    ),
-                                }
-                            }
-                            _ => false,
-                        };
-
-                        if let Some(builder) = self
-                            .context
-                            .report_lint(&UNRESOLVED_ATTRIBUTE, attribute)
-                        {
-                        if bound_on_instance {
-                            builder.into_diagnostic(
-                                format_args!(
-                                    "Attribute `{}` can only be accessed on instances, \
-                                     not on the class object `{}` itself.",
-                                    attr.id,
-                                    value_type.display(db)
-                                ),
-                            );
-                        } else {
-                            builder.into_diagnostic(
-                                format_args!(
-                                    "Type `{}` has no attribute `{}`",
-                                    value_type.display(db),
-                                    attr.id
-                                ),
-                            );
-                        }
-                        }
-                    }
-
-                    Type::unknown().into()
-                }
-                LookupError::PossiblyUnbound(type_when_bound) => {
-                    report_possibly_unbound_attribute(
-                        &self.context,
-                        attribute,
-                        &attr.id,
-                        value_type,
-                    );
-
-                    type_when_bound
-                }
-            })
-            .inner_type();
-
-        self.check_deprecated(attr, resolved_type);
-
-        // Even if we can obtain the attribute type based on the assignments, we still perform default type inference
-        // (to report errors).
-        assigned_type.unwrap_or(resolved_type)
-    }
-
-    fn infer_attribute_expression(&mut self, attribute: &ast::ExprAttribute) -> Type<'db> {
-        let ast::ExprAttribute {
-            value,
-            attr: _,
-            range: _,
-            node_index: _,
-            ctx,
-        } = attribute;
-
-        match ctx {
-            ExprContext::Load => self.infer_attribute_load(attribute),
-            ExprContext::Store => {
-                self.infer_expression(value);
-                Type::Never
-            }
-            ExprContext::Del => {
-                self.infer_attribute_load(attribute);
-                Type::Never
-            }
-            ExprContext::Invalid => {
-                self.infer_expression(value);
-                Type::unknown()
-            }
-        }
-    }
-
-    fn infer_unary_expression(&mut self, unary: &ast::ExprUnaryOp) -> Type<'db> {
-        let ast::ExprUnaryOp {
-            range: _,
-            node_index: _,
-            op,
-            operand,
-        } = unary;
-
-        let operand_type = self.infer_expression(operand);
-
-        self.infer_unary_expression_type(*op, operand_type, unary)
-    }
-
-    fn infer_unary_expression_type(
-        &mut self,
-        op: ast::UnaryOp,
-        operand_type: Type<'db>,
-        unary: &ast::ExprUnaryOp,
-    ) -> Type<'db> {
-        match (op, operand_type) {
-            (_, Type::Dynamic(_)) => operand_type,
-            (_, Type::Never) => Type::Never,
-
-            (_, Type::TypeAlias(alias)) => {
-                self.infer_unary_expression_type(op, alias.value_type(self.db()), unary)
-            }
-
-            (ast::UnaryOp::UAdd, Type::IntLiteral(value)) => Type::IntLiteral(value),
-            (ast::UnaryOp::USub, Type::IntLiteral(value)) => Type::IntLiteral(-value),
-            (ast::UnaryOp::Invert, Type::IntLiteral(value)) => Type::IntLiteral(!value),
-
-            (ast::UnaryOp::UAdd, Type::BooleanLiteral(bool)) => Type::IntLiteral(i64::from(bool)),
-            (ast::UnaryOp::USub, Type::BooleanLiteral(bool)) => Type::IntLiteral(-i64::from(bool)),
-            (ast::UnaryOp::Invert, Type::BooleanLiteral(bool)) => {
-                Type::IntLiteral(!i64::from(bool))
-            }
-
-            (ast::UnaryOp::Not, ty) => ty
-                .try_bool(self.db())
-                .unwrap_or_else(|err| {
-                    err.report_diagnostic(&self.context, unary);
-                    err.fallback_truthiness()
-                })
-                .negate()
-                .into_type(self.db()),
-            (
-                op @ (ast::UnaryOp::UAdd | ast::UnaryOp::USub | ast::UnaryOp::Invert),
-                Type::FunctionLiteral(_)
-                | Type::Callable(..)
-                | Type::WrapperDescriptor(_)
-                | Type::MethodWrapper(_)
-                | Type::DataclassDecorator(_)
-                | Type::DataclassTransformer(_)
-                | Type::BoundMethod(_)
-                | Type::ModuleLiteral(_)
-                | Type::ClassLiteral(_)
-                | Type::GenericAlias(_)
-                | Type::SubclassOf(_)
-                | Type::NominalInstance(_)
-                | Type::ProtocolInstance(_)
-                | Type::SpecialForm(_)
-                | Type::KnownInstance(_)
-                | Type::PropertyInstance(_)
-                | Type::Union(_)
-                | Type::Intersection(_)
-                | Type::AlwaysTruthy
-                | Type::AlwaysFalsy
-                | Type::StringLiteral(_)
-                | Type::LiteralString
-                | Type::BytesLiteral(_)
-                | Type::EnumLiteral(_)
-                | Type::BoundSuper(_)
-                | Type::NonInferableTypeVar(_)
-                | Type::TypeVar(_)
-                | Type::TypeIs(_)
-                | Type::TypedDict(_),
-            ) => {
-                let unary_dunder_method = match op {
-                    ast::UnaryOp::Invert => "__invert__",
-                    ast::UnaryOp::UAdd => "__pos__",
-                    ast::UnaryOp::USub => "__neg__",
-                    ast::UnaryOp::Not => {
-                        unreachable!("Not operator is handled in its own case");
-                    }
-                };
-
-                match operand_type.try_call_dunder(
-                    self.db(),
-                    unary_dunder_method,
-                    CallArguments::none(),
-                ) {
-                    Ok(outcome) => outcome.return_type(self.db()),
-                    Err(e) => {
-                        if let Some(builder) =
-                            self.context.report_lint(&UNSUPPORTED_OPERATOR, unary)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Unary operator `{op}` is unsupported for type `{}`",
-                                operand_type.display(self.db()),
-                            ));
-                        }
-                        e.fallback_return_type(self.db())
-                    }
-                }
-            }
-        }
-    }
-
-    fn infer_binary_expression(&mut self, binary: &ast::ExprBinOp) -> Type<'db> {
-        let ast::ExprBinOp {
-            left,
-            op,
-            right,
-            range: _,
-            node_index: _,
-        } = binary;
-
-        let left_ty = self.infer_expression(left);
-        let right_ty = self.infer_expression(right);
-
-        self.infer_binary_expression_type(binary.into(), false, left_ty, right_ty, *op)
-            .unwrap_or_else(|| {
-                let db = self.db();
-
-                if let Some(builder) = self.context.report_lint(&UNSUPPORTED_OPERATOR, binary) {
-                    let mut diag = builder.into_diagnostic(format_args!(
-                        "Operator `{op}` is unsupported between objects of type `{}` and `{}`",
-                        left_ty.display(db),
-                        right_ty.display(db)
-                    ));
-
-                    if op == &ast::Operator::BitOr
-                        && (left_ty.is_subtype_of(db, KnownClass::Type.to_instance(db))
-                            || right_ty.is_subtype_of(db, KnownClass::Type.to_instance(db)))
-                        && Program::get(db).python_version(db) < PythonVersion::PY310
-                    {
-                        diag.info(
-                            "Note that `X | Y` PEP 604 union syntax is only available in Python 3.10 and later",
-                        );
-                        add_inferred_python_version_hint_to_diagnostic(db, &mut diag, "resolving types");
-                    }
-                }
-                Type::unknown()
-            })
-    }
-
-    fn infer_binary_expression_type(
-        &mut self,
-        node: AnyNodeRef<'_>,
-        mut emitted_division_by_zero_diagnostic: bool,
-        left_ty: Type<'db>,
-        right_ty: Type<'db>,
-        op: ast::Operator,
-    ) -> Option<Type<'db>> {
-        // Check for division by zero; this doesn't change the inferred type for the expression, but
-        // may emit a diagnostic
-        if !emitted_division_by_zero_diagnostic
-            && matches!(
-                (op, right_ty),
-                (
-                    ast::Operator::Div | ast::Operator::FloorDiv | ast::Operator::Mod,
-                    Type::IntLiteral(0) | Type::BooleanLiteral(false)
-                )
-            )
-        {
-            emitted_division_by_zero_diagnostic = self.check_division_by_zero(node, op, left_ty);
-        }
-
-        match (left_ty, right_ty, op) {
-            (Type::Union(lhs_union), rhs, _) => lhs_union.try_map(self.db(), |lhs_element| {
-                self.infer_binary_expression_type(
-                    node,
-                    emitted_division_by_zero_diagnostic,
-                    *lhs_element,
-                    rhs,
-                    op,
-                )
-            }),
-            (lhs, Type::Union(rhs_union), _) => rhs_union.try_map(self.db(), |rhs_element| {
-                self.infer_binary_expression_type(
-                    node,
-                    emitted_division_by_zero_diagnostic,
-                    lhs,
-                    *rhs_element,
-                    op,
-                )
-            }),
-
-            (Type::TypeAlias(alias), rhs, _) => self.infer_binary_expression_type(
-                node,
-                emitted_division_by_zero_diagnostic,
-                alias.value_type(self.db()),
-                rhs,
-                op,
-            ),
-
-            (lhs, Type::TypeAlias(alias), _) => self.infer_binary_expression_type(
-                node,
-                emitted_division_by_zero_diagnostic,
-                lhs,
-                alias.value_type(self.db()),
-                op,
-            ),
-
-            // Non-todo Anys take precedence over Todos (as if we fix this `Todo` in the future,
-            // the result would then become Any or Unknown, respectively).
-            (any @ Type::Dynamic(DynamicType::Any), _, _)
-            | (_, any @ Type::Dynamic(DynamicType::Any), _) => Some(any),
-
-            (unknown @ Type::Dynamic(DynamicType::Unknown), _, _)
-            | (_, unknown @ Type::Dynamic(DynamicType::Unknown), _) => Some(unknown),
-
-            (
-                todo @ Type::Dynamic(
-                    DynamicType::Todo(_)
-                    | DynamicType::TodoPEP695ParamSpec
-                    | DynamicType::TodoUnpack
-                    | DynamicType::TodoTypeAlias,
-                ),
-                _,
-                _,
-            )
-            | (
-                _,
-                todo @ Type::Dynamic(
-                    DynamicType::Todo(_)
-                    | DynamicType::TodoPEP695ParamSpec
-                    | DynamicType::TodoUnpack
-                    | DynamicType::TodoTypeAlias,
-                ),
-                _,
-            ) => Some(todo),
-
-            (Type::Never, _, _) | (_, Type::Never, _) => Some(Type::Never),
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Add) => Some(
-                n.checked_add(m)
-                    .map(Type::IntLiteral)
-                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db())),
-            ),
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Sub) => Some(
-                n.checked_sub(m)
-                    .map(Type::IntLiteral)
-                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db())),
-            ),
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mult) => Some(
-                n.checked_mul(m)
-                    .map(Type::IntLiteral)
-                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db())),
-            ),
-
-            (Type::IntLiteral(_), Type::IntLiteral(_), ast::Operator::Div) => {
-                Some(KnownClass::Float.to_instance(self.db()))
-            }
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::FloorDiv) => Some({
-                let mut q = n.checked_div(m);
-                let r = n.checked_rem(m);
-                // Division works differently in Python than in Rust. If the result is negative and
-                // there is a remainder, the division rounds down (instead of towards zero):
-                if n.is_negative() != m.is_negative() && r.unwrap_or(0) != 0 {
-                    q = q.map(|q| q - 1);
-                }
-                q.map(Type::IntLiteral)
-                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db()))
-            }),
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mod) => Some({
-                let mut r = n.checked_rem(m);
-                // Division works differently in Python than in Rust. If the result is negative and
-                // there is a remainder, the division rounds down (instead of towards zero). Adjust
-                // the remainder to compensate so that q * m + r == n:
-                if n.is_negative() != m.is_negative() && r.unwrap_or(0) != 0 {
-                    r = r.map(|x| x + m);
-                }
-                r.map(Type::IntLiteral)
-                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db()))
-            }),
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Pow) => Some({
-                if m < 0 {
-                    KnownClass::Float.to_instance(self.db())
-                } else {
-                    u32::try_from(m)
-                        .ok()
-                        .and_then(|m| n.checked_pow(m))
-                        .map(Type::IntLiteral)
-                        .unwrap_or_else(|| KnownClass::Int.to_instance(self.db()))
-                }
-            }),
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::BitOr) => {
-                Some(Type::IntLiteral(n | m))
-            }
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::BitAnd) => {
-                Some(Type::IntLiteral(n & m))
-            }
-
-            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::BitXor) => {
-                Some(Type::IntLiteral(n ^ m))
-            }
-
-            (Type::BytesLiteral(lhs), Type::BytesLiteral(rhs), ast::Operator::Add) => {
-                let bytes = [lhs.value(self.db()), rhs.value(self.db())].concat();
-                Some(Type::bytes_literal(self.db(), &bytes))
-            }
-
-            (Type::StringLiteral(lhs), Type::StringLiteral(rhs), ast::Operator::Add) => {
-                let lhs_value = lhs.value(self.db()).to_string();
-                let rhs_value = rhs.value(self.db());
-                let ty = if lhs_value.len() + rhs_value.len() <= Self::MAX_STRING_LITERAL_SIZE {
-                    Type::string_literal(self.db(), &(lhs_value + rhs_value))
-                } else {
-                    Type::LiteralString
-                };
-                Some(ty)
-            }
-
-            (
-                Type::StringLiteral(_) | Type::LiteralString,
-                Type::StringLiteral(_) | Type::LiteralString,
-                ast::Operator::Add,
-            ) => Some(Type::LiteralString),
-
-            (Type::StringLiteral(s), Type::IntLiteral(n), ast::Operator::Mult)
-            | (Type::IntLiteral(n), Type::StringLiteral(s), ast::Operator::Mult) => {
-                let ty = if n < 1 {
-                    Type::string_literal(self.db(), "")
-                } else if let Ok(n) = usize::try_from(n) {
-                    if n.checked_mul(s.value(self.db()).len())
-                        .is_some_and(|new_length| new_length <= Self::MAX_STRING_LITERAL_SIZE)
-                    {
-                        let new_literal = s.value(self.db()).repeat(n);
-                        Type::string_literal(self.db(), &new_literal)
-                    } else {
-                        Type::LiteralString
-                    }
-                } else {
-                    Type::LiteralString
-                };
-                Some(ty)
-            }
-
-            (Type::LiteralString, Type::IntLiteral(n), ast::Operator::Mult)
-            | (Type::IntLiteral(n), Type::LiteralString, ast::Operator::Mult) => {
-                let ty = if n < 1 {
-                    Type::string_literal(self.db(), "")
-                } else {
-                    Type::LiteralString
-                };
-                Some(ty)
-            }
-
-            (Type::BooleanLiteral(b1), Type::BooleanLiteral(b2), ast::Operator::BitOr) => {
-                Some(Type::BooleanLiteral(b1 | b2))
-            }
-
-            (Type::BooleanLiteral(b1), Type::BooleanLiteral(b2), ast::Operator::BitAnd) => {
-                Some(Type::BooleanLiteral(b1 & b2))
-            }
-
-            (Type::BooleanLiteral(b1), Type::BooleanLiteral(b2), ast::Operator::BitXor) => {
-                Some(Type::BooleanLiteral(b1 ^ b2))
-            }
-
-            (Type::BooleanLiteral(b1), Type::BooleanLiteral(_) | Type::IntLiteral(_), op) => self
-                .infer_binary_expression_type(
-                    node,
-                    emitted_division_by_zero_diagnostic,
-                    Type::IntLiteral(i64::from(b1)),
-                    right_ty,
-                    op,
-                ),
-            (Type::IntLiteral(_), Type::BooleanLiteral(b2), op) => self
-                .infer_binary_expression_type(
-                    node,
-                    emitted_division_by_zero_diagnostic,
-                    left_ty,
-                    Type::IntLiteral(i64::from(b2)),
-                    op,
-                ),
-
-            // We've handled all of the special cases that we support for literals, so we need to
-            // fall back on looking for dunder methods on one of the operand types.
-            (
-                Type::FunctionLiteral(_)
-                | Type::BooleanLiteral(_)
-                | Type::Callable(..)
-                | Type::BoundMethod(_)
-                | Type::WrapperDescriptor(_)
-                | Type::MethodWrapper(_)
-                | Type::DataclassDecorator(_)
-                | Type::DataclassTransformer(_)
-                | Type::ModuleLiteral(_)
-                | Type::ClassLiteral(_)
-                | Type::GenericAlias(_)
-                | Type::SubclassOf(_)
-                | Type::NominalInstance(_)
-                | Type::ProtocolInstance(_)
-                | Type::SpecialForm(_)
-                | Type::KnownInstance(_)
-                | Type::PropertyInstance(_)
-                | Type::Intersection(_)
-                | Type::AlwaysTruthy
-                | Type::AlwaysFalsy
-                | Type::IntLiteral(_)
-                | Type::StringLiteral(_)
-                | Type::LiteralString
-                | Type::BytesLiteral(_)
-                | Type::EnumLiteral(_)
-                | Type::BoundSuper(_)
-                | Type::NonInferableTypeVar(_)
-                | Type::TypeVar(_)
-                | Type::TypeIs(_)
-                | Type::TypedDict(_),
-                Type::FunctionLiteral(_)
-                | Type::BooleanLiteral(_)
-                | Type::Callable(..)
-                | Type::BoundMethod(_)
-                | Type::WrapperDescriptor(_)
-                | Type::MethodWrapper(_)
-                | Type::DataclassDecorator(_)
-                | Type::DataclassTransformer(_)
-                | Type::ModuleLiteral(_)
-                | Type::ClassLiteral(_)
-                | Type::GenericAlias(_)
-                | Type::SubclassOf(_)
-                | Type::NominalInstance(_)
-                | Type::ProtocolInstance(_)
-                | Type::SpecialForm(_)
-                | Type::KnownInstance(_)
-                | Type::PropertyInstance(_)
-                | Type::Intersection(_)
-                | Type::AlwaysTruthy
-                | Type::AlwaysFalsy
-                | Type::IntLiteral(_)
-                | Type::StringLiteral(_)
-                | Type::LiteralString
-                | Type::BytesLiteral(_)
-                | Type::EnumLiteral(_)
-                | Type::BoundSuper(_)
-                | Type::NonInferableTypeVar(_)
-                | Type::TypeVar(_)
-                | Type::TypeIs(_)
-                | Type::TypedDict(_),
-                op,
-            ) => {
-                // We either want to call lhs.__op__ or rhs.__rop__. The full decision tree from
-                // the Python spec [1] is:
-                //
-                //   - If rhs is a (proper) subclass of lhs, and it provides a different
-                //     implementation of __rop__, use that.
-                //   - Otherwise, if lhs implements __op__, use that.
-                //   - Otherwise, if lhs and rhs are different types, and rhs implements __rop__,
-                //     use that.
-                //
-                // [1] https://docs.python.org/3/reference/datamodel.html#object.__radd__
-
-                // Technically we don't have to check left_ty != right_ty here, since if the types
-                // are the same, they will trivially have the same implementation of the reflected
-                // dunder, and so we'll fail the inner check. But the type equality check will be
-                // faster for the common case, and allow us to skip the (two) class member lookups.
-                let left_class = left_ty.to_meta_type(self.db());
-                let right_class = right_ty.to_meta_type(self.db());
-                if left_ty != right_ty && right_ty.is_subtype_of(self.db(), left_ty) {
-                    let reflected_dunder = op.reflected_dunder();
-                    let rhs_reflected = right_class.member(self.db(), reflected_dunder).place;
-                    // TODO: if `rhs_reflected` is possibly unbound, we should union the two possible
-                    // Bindings together
-                    if !rhs_reflected.is_unbound()
-                        && rhs_reflected != left_class.member(self.db(), reflected_dunder).place
-                    {
-                        return right_ty
-                            .try_call_dunder(
-                                self.db(),
-                                reflected_dunder,
-                                CallArguments::positional([left_ty]),
-                            )
-                            .map(|outcome| outcome.return_type(self.db()))
-                            .or_else(|_| {
-                                left_ty
-                                    .try_call_dunder(
-                                        self.db(),
-                                        op.dunder(),
-                                        CallArguments::positional([right_ty]),
-                                    )
-                                    .map(|outcome| outcome.return_type(self.db()))
-                            })
-                            .ok();
-                    }
-                }
-
-                let call_on_left_instance = left_ty
-                    .try_call_dunder(
-                        self.db(),
-                        op.dunder(),
-                        CallArguments::positional([right_ty]),
-                    )
-                    .map(|outcome| outcome.return_type(self.db()))
-                    .ok();
-
-                call_on_left_instance.or_else(|| {
-                    if left_ty == right_ty {
-                        None
-                    } else {
-                        right_ty
-                            .try_call_dunder(
-                                self.db(),
-                                op.reflected_dunder(),
-                                CallArguments::positional([left_ty]),
-                            )
-                            .map(|outcome| outcome.return_type(self.db()))
-                            .ok()
-                    }
-                })
-            }
-        }
-    }
-
-    fn infer_boolean_expression(&mut self, bool_op: &ast::ExprBoolOp) -> Type<'db> {
-        let ast::ExprBoolOp {
-            range: _,
-            node_index: _,
-            op,
-            values,
-        } = bool_op;
-        self.infer_chained_boolean_types(
-            *op,
-            values.iter().enumerate(),
-            |builder, (index, value)| {
-                let ty = if index == values.len() - 1 {
-                    builder.infer_expression(value)
-                } else {
-                    builder.infer_standalone_expression(value)
-                };
-
-                (ty, value.range())
-            },
-        )
-    }
-
-    /// Computes the output of a chain of (one) boolean operation, consuming as input an iterator
-    /// of operations and calling the `infer_ty` for each to infer their types.
-    /// The iterator is consumed even if the boolean evaluation can be short-circuited,
-    /// in order to ensure the invariant that all expressions are evaluated when inferring types.
-    fn infer_chained_boolean_types<Iterator, Item, F>(
-        &mut self,
-        op: ast::BoolOp,
-        operations: Iterator,
-        infer_ty: F,
-    ) -> Type<'db>
-    where
-        Iterator: IntoIterator<Item = Item>,
-        F: Fn(&mut Self, Item) -> (Type<'db>, TextRange),
-    {
-        let mut done = false;
-        let db = self.db();
-
-        let elements = operations
-            .into_iter()
-            .with_position()
-            .map(|(position, item)| {
-                let (ty, range) = infer_ty(self, item);
-
-                let is_last = matches!(
-                    position,
-                    itertools::Position::Last | itertools::Position::Only
-                );
-
-                if is_last {
-                    if done { Type::Never } else { ty }
-                } else {
-                    let truthiness = ty.try_bool(self.db()).unwrap_or_else(|err| {
-                        err.report_diagnostic(&self.context, range);
-                        err.fallback_truthiness()
-                    });
-
-                    if done {
-                        return Type::Never;
-                    }
-
-                    match (truthiness, op) {
-                        (Truthiness::AlwaysTrue, ast::BoolOp::And) => Type::Never,
-                        (Truthiness::AlwaysFalse, ast::BoolOp::Or) => Type::Never,
-
-                        (Truthiness::AlwaysFalse, ast::BoolOp::And)
-                        | (Truthiness::AlwaysTrue, ast::BoolOp::Or) => {
-                            done = true;
-                            ty
-                        }
-
-                        (Truthiness::Ambiguous, _) => IntersectionBuilder::new(db)
-                            .add_positive(ty)
-                            .add_negative(match op {
-                                ast::BoolOp::And => Type::AlwaysTruthy,
-                                ast::BoolOp::Or => Type::AlwaysFalsy,
-                            })
-                            .build(),
-                    }
-                }
-            });
-
-        UnionType::from_elements(db, elements)
-    }
-
-    fn infer_compare_expression(&mut self, compare: &ast::ExprCompare) -> Type<'db> {
-        let ast::ExprCompare {
-            range: _,
-            node_index: _,
-            left,
-            ops,
-            comparators,
-        } = compare;
-
-        self.infer_expression(left);
-
-        // https://docs.python.org/3/reference/expressions.html#comparisons
-        // > Formally, if `a, b, c, …, y, z` are expressions and `op1, op2, …, opN` are comparison
-        // > operators, then `a op1 b op2 c ... y opN z` is equivalent to `a op1 b and b op2 c and
-        // ... > y opN z`, except that each expression is evaluated at most once.
-        //
-        // As some operators (==, !=, <, <=, >, >=) *can* return an arbitrary type, the logic below
-        // is shared with the one in `infer_binary_type_comparison`.
-        self.infer_chained_boolean_types(
-            ast::BoolOp::And,
-            std::iter::once(&**left)
-                .chain(comparators)
-                .tuple_windows::<(_, _)>()
-                .zip(ops),
-            |builder, ((left, right), op)| {
-                let left_ty = builder.expression_type(left);
-                let right_ty = builder.infer_expression(right);
-
-                let range = TextRange::new(left.start(), right.end());
-
-                let ty = builder
-                    .infer_binary_type_comparison(left_ty, *op, right_ty, range)
-                    .unwrap_or_else(|error| {
-                        if let Some(diagnostic_builder) =
-                            builder.context.report_lint(&UNSUPPORTED_OPERATOR, range)
-                        {
-                            // Handle unsupported operators (diagnostic, `bool`/`Unknown` outcome)
-                            diagnostic_builder.into_diagnostic(format_args!(
-                                "Operator `{}` is not supported for types `{}` and `{}`{}",
-                                error.op,
-                                error.left_ty.display(builder.db()),
-                                error.right_ty.display(builder.db()),
-                                if (left_ty, right_ty) == (error.left_ty, error.right_ty) {
-                                    String::new()
-                                } else {
-                                    format!(
-                                        ", in comparing `{}` with `{}`",
-                                        left_ty.display(builder.db()),
-                                        right_ty.display(builder.db())
-                                    )
-                                }
-                            ));
-                        }
-
-                        match op {
-                            // `in, not in, is, is not` always return bool instances
-                            ast::CmpOp::In
-                            | ast::CmpOp::NotIn
-                            | ast::CmpOp::Is
-                            | ast::CmpOp::IsNot => KnownClass::Bool.to_instance(builder.db()),
-                            // Other operators can return arbitrary types
-                            _ => Type::unknown(),
-                        }
-                    });
-
-                (ty, range)
-            },
-        )
-    }
-
-    fn infer_binary_intersection_type_comparison(
-        &mut self,
-        intersection: IntersectionType<'db>,
-        op: ast::CmpOp,
-        other: Type<'db>,
-        intersection_on: IntersectionOn,
-        range: TextRange,
-    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
-        enum State<'db> {
-            // We have not seen any positive elements (yet)
-            NoPositiveElements,
-            // The operator was unsupported on all elements that we have seen so far.
-            // Contains the first error we encountered.
-            UnsupportedOnAllElements(CompareUnsupportedError<'db>),
-            // The operator was supported on at least one positive element.
-            Supported,
-        }
-
-        // If a comparison yields a definitive true/false answer on a (positive) part
-        // of an intersection type, it will also yield a definitive answer on the full
-        // intersection type, which is even more specific.
-        for pos in intersection.positive(self.db()) {
-            let result = match intersection_on {
-                IntersectionOn::Left => self.infer_binary_type_comparison(*pos, op, other, range),
-                IntersectionOn::Right => self.infer_binary_type_comparison(other, op, *pos, range),
-            };
-
-            if let Ok(Type::BooleanLiteral(_)) = result {
-                return result;
-            }
-        }
-
-        // For negative contributions to the intersection type, there are only a few
-        // special cases that allow us to narrow down the result type of the comparison.
-        for neg in intersection.negative(self.db()) {
-            let result = match intersection_on {
-                IntersectionOn::Left => self
-                    .infer_binary_type_comparison(*neg, op, other, range)
-                    .ok(),
-                IntersectionOn::Right => self
-                    .infer_binary_type_comparison(other, op, *neg, range)
-                    .ok(),
-            };
-
-            match (op, result) {
-                (ast::CmpOp::Is, Some(Type::BooleanLiteral(true))) => {
-                    return Ok(Type::BooleanLiteral(false));
-                }
-                (ast::CmpOp::IsNot, Some(Type::BooleanLiteral(false))) => {
-                    return Ok(Type::BooleanLiteral(true));
-                }
-                _ => {}
-            }
-        }
-
-        // If none of the simplifications above apply, we still need to return *some*
-        // result type for the comparison 'T_inter `op` T_other' (or reversed), where
-        //
-        //    T_inter = P1 & P2 & ... & Pn & ~N1 & ~N2 & ... & ~Nm
-        //
-        // is the intersection type. If f(T) is the function that computes the result
-        // type of a `op`-comparison with `T_other`, we are interested in f(T_inter).
-        // Since we can't compute it exactly, we return the following approximation:
-        //
-        //   f(T_inter) = f(P1) & f(P2) & ... & f(Pn)
-        //
-        // The reason for this is the following: In general, for any function 'f', the
-        // set f(A) & f(B) is *larger than or equal to* the set f(A & B). This means
-        // that we will return a type that is possibly wider than it could be, but
-        // never wrong.
-        //
-        // However, we do have to leave out the negative contributions. If we were to
-        // add a contribution like ~f(N1), we would potentially infer result types
-        // that are too narrow.
-        //
-        // As an example for this, consider the intersection type `int & ~Literal[1]`.
-        // If 'f' would be the `==`-comparison with 2, we obviously can't tell if that
-        // answer would be true or false, so we need to return `bool`. And indeed, we
-        // we have (glossing over notational details):
-        //
-        //   f(int & ~1)
-        //       = f({..., -1, 0, 2, 3, ...})
-        //       = {..., False, False, True, False, ...}
-        //       = bool
-        //
-        // On the other hand, if we were to compute
-        //
-        //   f(int) & ~f(1)
-        //       = bool & ~False
-        //       = True
-        //
-        // we would get a result type `Literal[True]` which is too narrow.
-        //
-        let mut builder = IntersectionBuilder::new(self.db());
-
-        builder = builder.add_positive(KnownClass::Bool.to_instance(self.db()));
-
-        let mut state = State::NoPositiveElements;
-
-        for pos in intersection.positive(self.db()) {
-            let result = match intersection_on {
-                IntersectionOn::Left => self.infer_binary_type_comparison(*pos, op, other, range),
-                IntersectionOn::Right => self.infer_binary_type_comparison(other, op, *pos, range),
-            };
-
-            match result {
-                Ok(ty) => {
-                    state = State::Supported;
-                    builder = builder.add_positive(ty);
-                }
-                Err(error) => {
-                    match state {
-                        State::NoPositiveElements => {
-                            // This is the first positive element, but the operation is not supported.
-                            // Store the error and continue.
-                            state = State::UnsupportedOnAllElements(error);
-                        }
-                        State::UnsupportedOnAllElements(_) => {
-                            // We already have an error stored, and continue to see elements on which
-                            // the operator is not supported. Continue with the same state (only keep
-                            // the first error).
-                        }
-                        State::Supported => {
-                            // We previously saw a positive element that supported the operator,
-                            // so the overall operation is still supported.
-                        }
-                    }
-                }
-            }
-        }
-
-        match state {
-            State::Supported => Ok(builder.build()),
-            State::NoPositiveElements => {
-                // We didn't see any positive elements, check if the operation is supported on `object`:
-                match intersection_on {
-                    IntersectionOn::Left => {
-                        self.infer_binary_type_comparison(Type::object(self.db()), op, other, range)
-                    }
-                    IntersectionOn::Right => {
-                        self.infer_binary_type_comparison(other, op, Type::object(self.db()), range)
-                    }
-                }
-            }
-            State::UnsupportedOnAllElements(error) => Err(error),
-        }
-    }
-
-    /// Infers the type of a binary comparison (e.g. 'left == right'). See
-    /// `infer_compare_expression` for the higher level logic dealing with multi-comparison
-    /// expressions.
-    ///
-    /// If the operation is not supported, return None (we need upstream context to emit a
-    /// diagnostic).
-    fn infer_binary_type_comparison(
-        &mut self,
-        left: Type<'db>,
-        op: ast::CmpOp,
-        right: Type<'db>,
-        range: TextRange,
-    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
-        // Note: identity (is, is not) for equal builtin types is unreliable and not part of the
-        // language spec.
-        // - `[ast::CompOp::Is]`: return `false` if unequal, `bool` if equal
-        // - `[ast::CompOp::IsNot]`: return `true` if unequal, `bool` if equal
-        let db = self.db();
-        let try_dunder = |inference: &mut TypeInferenceBuilder<'db, '_>,
-                          policy: MemberLookupPolicy| {
-            let rich_comparison = |op| inference.infer_rich_comparison(left, right, op, policy);
-            let membership_test_comparison = |op, range: TextRange| {
-                inference.infer_membership_test_comparison(left, right, op, range)
-            };
-
-            match op {
-                ast::CmpOp::Eq => rich_comparison(RichCompareOperator::Eq),
-                ast::CmpOp::NotEq => rich_comparison(RichCompareOperator::Ne),
-                ast::CmpOp::Lt => rich_comparison(RichCompareOperator::Lt),
-                ast::CmpOp::LtE => rich_comparison(RichCompareOperator::Le),
-                ast::CmpOp::Gt => rich_comparison(RichCompareOperator::Gt),
-                ast::CmpOp::GtE => rich_comparison(RichCompareOperator::Ge),
-                ast::CmpOp::In => {
-                    membership_test_comparison(MembershipTestCompareOperator::In, range)
-                }
-                ast::CmpOp::NotIn => {
-                    membership_test_comparison(MembershipTestCompareOperator::NotIn, range)
-                }
-                ast::CmpOp::Is => {
-                    if left.is_disjoint_from(db, right) {
-                        Ok(Type::BooleanLiteral(false))
-                    } else if left.is_singleton(db) && left.is_equivalent_to(db, right) {
-                        Ok(Type::BooleanLiteral(true))
-                    } else {
-                        Ok(KnownClass::Bool.to_instance(db))
-                    }
-                }
-                ast::CmpOp::IsNot => {
-                    if left.is_disjoint_from(db, right) {
-                        Ok(Type::BooleanLiteral(true))
-                    } else if left.is_singleton(db) && left.is_equivalent_to(db, right) {
-                        Ok(Type::BooleanLiteral(false))
-                    } else {
-                        Ok(KnownClass::Bool.to_instance(db))
-                    }
-                }
-            }
-        };
-
-        let comparison_result = match (left, right) {
-            (Type::Union(union), other) => {
-                let mut builder = UnionBuilder::new(self.db());
-                for element in union.elements(self.db()) {
-                    builder =
-                        builder.add(self.infer_binary_type_comparison(*element, op, other, range)?);
-                }
-                Some(Ok(builder.build()))
-            }
-            (other, Type::Union(union)) => {
-                let mut builder = UnionBuilder::new(self.db());
-                for element in union.elements(self.db()) {
-                    builder =
-                        builder.add(self.infer_binary_type_comparison(other, op, *element, range)?);
-                }
-                Some(Ok(builder.build()))
-            }
-
-            (Type::Intersection(intersection), right) => {
-                Some(self.infer_binary_intersection_type_comparison(
-                    intersection,
-                    op,
-                    right,
-                    IntersectionOn::Left,
-                    range,
-                ))
-            }
-            (left, Type::Intersection(intersection)) => {
-                Some(self.infer_binary_intersection_type_comparison(
-                    intersection,
-                    op,
-                    left,
-                    IntersectionOn::Right,
-                    range,
-                ))
-            }
-
-            (Type::IntLiteral(n), Type::IntLiteral(m)) => Some(match op {
-                ast::CmpOp::Eq => Ok(Type::BooleanLiteral(n == m)),
-                ast::CmpOp::NotEq => Ok(Type::BooleanLiteral(n != m)),
-                ast::CmpOp::Lt => Ok(Type::BooleanLiteral(n < m)),
-                ast::CmpOp::LtE => Ok(Type::BooleanLiteral(n <= m)),
-                ast::CmpOp::Gt => Ok(Type::BooleanLiteral(n > m)),
-                ast::CmpOp::GtE => Ok(Type::BooleanLiteral(n >= m)),
-                // We cannot say that two equal int Literals will return True from an `is` or `is not` comparison.
-                // Even if they are the same value, they may not be the same object.
-                ast::CmpOp::Is => {
-                    if n == m {
-                        Ok(KnownClass::Bool.to_instance(self.db()))
-                    } else {
-                        Ok(Type::BooleanLiteral(false))
-                    }
-                }
-                ast::CmpOp::IsNot => {
-                    if n == m {
-                        Ok(KnownClass::Bool.to_instance(self.db()))
-                    } else {
-                        Ok(Type::BooleanLiteral(true))
-                    }
-                }
-                // Undefined for (int, int)
-                ast::CmpOp::In | ast::CmpOp::NotIn => Err(CompareUnsupportedError {
-                    op,
-                    left_ty: left,
-                    right_ty: right,
-                }),
-            }),
-            (Type::IntLiteral(_), Type::NominalInstance(_)) => {
-                Some(self.infer_binary_type_comparison(
-                    KnownClass::Int.to_instance(self.db()),
-                    op,
-                    right,
-                    range,
-                ))
-            }
-            (Type::NominalInstance(_), Type::IntLiteral(_)) => {
-                Some(self.infer_binary_type_comparison(
-                    left,
-                    op,
-                    KnownClass::Int.to_instance(self.db()),
-                    range,
-                ))
-            }
-
-            // Booleans are coded as integers (False = 0, True = 1)
-            (Type::IntLiteral(n), Type::BooleanLiteral(b)) => {
-                Some(self.infer_binary_type_comparison(
-                    Type::IntLiteral(n),
-                    op,
-                    Type::IntLiteral(i64::from(b)),
-                    range,
-                ))
-            }
-            (Type::BooleanLiteral(b), Type::IntLiteral(m)) => {
-                Some(self.infer_binary_type_comparison(
-                    Type::IntLiteral(i64::from(b)),
-                    op,
-                    Type::IntLiteral(m),
-                    range,
-                ))
-            }
-            (Type::BooleanLiteral(a), Type::BooleanLiteral(b)) => {
-                Some(self.infer_binary_type_comparison(
-                    Type::IntLiteral(i64::from(a)),
-                    op,
-                    Type::IntLiteral(i64::from(b)),
-                    range,
-                ))
-            }
-
-            (Type::StringLiteral(salsa_s1), Type::StringLiteral(salsa_s2)) => {
-                let s1 = salsa_s1.value(self.db());
-                let s2 = salsa_s2.value(self.db());
-                let result = match op {
-                    ast::CmpOp::Eq => Ok(Type::BooleanLiteral(s1 == s2)),
-                    ast::CmpOp::NotEq => Ok(Type::BooleanLiteral(s1 != s2)),
-                    ast::CmpOp::Lt => Ok(Type::BooleanLiteral(s1 < s2)),
-                    ast::CmpOp::LtE => Ok(Type::BooleanLiteral(s1 <= s2)),
-                    ast::CmpOp::Gt => Ok(Type::BooleanLiteral(s1 > s2)),
-                    ast::CmpOp::GtE => Ok(Type::BooleanLiteral(s1 >= s2)),
-                    ast::CmpOp::In => Ok(Type::BooleanLiteral(s2.contains(s1))),
-                    ast::CmpOp::NotIn => Ok(Type::BooleanLiteral(!s2.contains(s1))),
-                    ast::CmpOp::Is => {
-                        if s1 == s2 {
-                            Ok(KnownClass::Bool.to_instance(self.db()))
-                        } else {
-                            Ok(Type::BooleanLiteral(false))
-                        }
-                    }
-                    ast::CmpOp::IsNot => {
-                        if s1 == s2 {
-                            Ok(KnownClass::Bool.to_instance(self.db()))
-                        } else {
-                            Ok(Type::BooleanLiteral(true))
-                        }
-                    }
-                };
-                Some(result)
-            }
-            (Type::StringLiteral(_), _) => Some(self.infer_binary_type_comparison(
-                KnownClass::Str.to_instance(self.db()),
-                op,
-                right,
-                range,
-            )),
-            (_, Type::StringLiteral(_)) => Some(self.infer_binary_type_comparison(
-                left,
-                op,
-                KnownClass::Str.to_instance(self.db()),
-                range,
-            )),
-
-            (Type::LiteralString, _) => Some(self.infer_binary_type_comparison(
-                KnownClass::Str.to_instance(self.db()),
-                op,
-                right,
-                range,
-            )),
-            (_, Type::LiteralString) => Some(self.infer_binary_type_comparison(
-                left,
-                op,
-                KnownClass::Str.to_instance(self.db()),
-                range,
-            )),
-
-            (Type::BytesLiteral(salsa_b1), Type::BytesLiteral(salsa_b2)) => {
-                let b1 = salsa_b1.value(self.db());
-                let b2 = salsa_b2.value(self.db());
-                let result = match op {
-                    ast::CmpOp::Eq => Ok(Type::BooleanLiteral(b1 == b2)),
-                    ast::CmpOp::NotEq => Ok(Type::BooleanLiteral(b1 != b2)),
-                    ast::CmpOp::Lt => Ok(Type::BooleanLiteral(b1 < b2)),
-                    ast::CmpOp::LtE => Ok(Type::BooleanLiteral(b1 <= b2)),
-                    ast::CmpOp::Gt => Ok(Type::BooleanLiteral(b1 > b2)),
-                    ast::CmpOp::GtE => Ok(Type::BooleanLiteral(b1 >= b2)),
-                    ast::CmpOp::In => {
-                        Ok(Type::BooleanLiteral(memchr::memmem::find(b2, b1).is_some()))
-                    }
-                    ast::CmpOp::NotIn => {
-                        Ok(Type::BooleanLiteral(memchr::memmem::find(b2, b1).is_none()))
-                    }
-                    ast::CmpOp::Is => {
-                        if b1 == b2 {
-                            Ok(KnownClass::Bool.to_instance(self.db()))
-                        } else {
-                            Ok(Type::BooleanLiteral(false))
-                        }
-                    }
-                    ast::CmpOp::IsNot => {
-                        if b1 == b2 {
-                            Ok(KnownClass::Bool.to_instance(self.db()))
-                        } else {
-                            Ok(Type::BooleanLiteral(true))
-                        }
-                    }
-                };
-                Some(result)
-            }
-            (Type::BytesLiteral(_), _) => Some(self.infer_binary_type_comparison(
-                KnownClass::Bytes.to_instance(self.db()),
-                op,
-                right,
-                range,
-            )),
-            (_, Type::BytesLiteral(_)) => Some(self.infer_binary_type_comparison(
-                left,
-                op,
-                KnownClass::Bytes.to_instance(self.db()),
-                range,
-            )),
-
-            (Type::EnumLiteral(literal_1), Type::EnumLiteral(literal_2))
-                if op == ast::CmpOp::Eq =>
-            {
-                Some(Ok(match try_dunder(self, MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK) {
-                    Ok(ty) => ty,
-                    Err(_) => Type::BooleanLiteral(literal_1 == literal_2),
-                }))
-            }
-            (Type::EnumLiteral(literal_1), Type::EnumLiteral(literal_2))
-                if op == ast::CmpOp::NotEq =>
-            {
-                Some(Ok(match try_dunder(self, MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK) {
-                    Ok(ty) => ty,
-                    Err(_) => Type::BooleanLiteral(literal_1 != literal_2),
-                }))
-            }
-
-            (
-                Type::NominalInstance(nominal1),
-                Type::NominalInstance(nominal2),
-            ) => nominal1.tuple_spec(self.db())
-                .and_then(|lhs_tuple| Some((lhs_tuple, nominal2.tuple_spec(self.db())?)))
-                .map(|(lhs_tuple, rhs_tuple)| {
-                    let mut tuple_rich_comparison =
-                        |op| self.infer_tuple_rich_comparison(&lhs_tuple, op, &rhs_tuple, range);
-
-                    match op {
-                        ast::CmpOp::Eq => tuple_rich_comparison(RichCompareOperator::Eq),
-                        ast::CmpOp::NotEq => tuple_rich_comparison(RichCompareOperator::Ne),
-                        ast::CmpOp::Lt => tuple_rich_comparison(RichCompareOperator::Lt),
-                        ast::CmpOp::LtE => tuple_rich_comparison(RichCompareOperator::Le),
-                        ast::CmpOp::Gt => tuple_rich_comparison(RichCompareOperator::Gt),
-                        ast::CmpOp::GtE => tuple_rich_comparison(RichCompareOperator::Ge),
-                        ast::CmpOp::In | ast::CmpOp::NotIn => {
-                            let mut any_eq = false;
-                            let mut any_ambiguous = false;
-
-                            for ty in rhs_tuple.all_elements().copied() {
-                                let eq_result = self.infer_binary_type_comparison(
-                                left,
-                                ast::CmpOp::Eq,
-                                ty,
-                                range,
-                            ).expect("infer_binary_type_comparison should never return None for `CmpOp::Eq`");
-
-                                match eq_result {
-                                    todo @ Type::Dynamic(DynamicType::Todo(_)) => return Ok(todo),
-                                    // It's okay to ignore errors here because Python doesn't call `__bool__`
-                                    // for different union variants. Instead, this is just for us to
-                                    // evaluate a possibly truthy value to `false` or `true`.
-                                    ty => match ty.bool(self.db()) {
-                                        Truthiness::AlwaysTrue => any_eq = true,
-                                        Truthiness::AlwaysFalse => (),
-                                        Truthiness::Ambiguous => any_ambiguous = true,
-                                    },
-                                }
-                            }
-
-                            if any_eq {
-                                Ok(Type::BooleanLiteral(op.is_in()))
-                            } else if !any_ambiguous {
-                                Ok(Type::BooleanLiteral(op.is_not_in()))
-                            } else {
-                                Ok(KnownClass::Bool.to_instance(self.db()))
-                            }
-                        }
-                        ast::CmpOp::Is | ast::CmpOp::IsNot => {
-                            // - `[ast::CmpOp::Is]`: returns `false` if the elements are definitely unequal, otherwise `bool`
-                            // - `[ast::CmpOp::IsNot]`: returns `true` if the elements are definitely unequal, otherwise `bool`
-                            let eq_result = tuple_rich_comparison(RichCompareOperator::Eq).expect(
-                            "infer_binary_type_comparison should never return None for `CmpOp::Eq`",
-                        );
-
-                            Ok(match eq_result {
-                                todo @ Type::Dynamic(DynamicType::Todo(_)) => todo,
-                                // It's okay to ignore errors here because Python doesn't call `__bool__`
-                                // for `is` and `is not` comparisons. This is an implementation detail
-                                // for how we determine the truthiness of a type.
-                                ty => match ty.bool(self.db()) {
-                                    Truthiness::AlwaysFalse => Type::BooleanLiteral(op.is_is_not()),
-                                    _ => KnownClass::Bool.to_instance(self.db()),
-                                },
-                            })
-                        }
-                    }
-                }
-            ),
-
-            _ => None,
-        };
-
-        if let Some(result) = comparison_result {
-            return result;
-        }
-
-        // Final generalized fallback: lookup the rich comparison `__dunder__` methods
-        try_dunder(self, MemberLookupPolicy::default())
-    }
-
-    /// Rich comparison in Python are the operators `==`, `!=`, `<`, `<=`, `>`, and `>=`. Their
-    /// behaviour can be edited for classes by implementing corresponding dunder methods.
-    /// This function performs rich comparison between two types and returns the resulting type.
-    /// see `<https://docs.python.org/3/reference/datamodel.html#object.__lt__>`
-    fn infer_rich_comparison(
-        &self,
-        left: Type<'db>,
-        right: Type<'db>,
-        op: RichCompareOperator,
-        policy: MemberLookupPolicy,
-    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
-        let db = self.db();
-        // The following resource has details about the rich comparison algorithm:
-        // https://snarky.ca/unravelling-rich-comparison-operators/
-        let call_dunder = |op: RichCompareOperator, left: Type<'db>, right: Type<'db>| {
-            left.try_call_dunder_with_policy(
-                db,
-                op.dunder(),
-                &mut CallArguments::positional([right]),
-                policy,
-            )
-            .map(|outcome| outcome.return_type(db))
-            .ok()
-        };
-
-        // The reflected dunder has priority if the right-hand side is a strict subclass of the left-hand side.
-        if left != right && right.is_subtype_of(db, left) {
-            call_dunder(op.reflect(), right, left).or_else(|| call_dunder(op, left, right))
-        } else {
-            call_dunder(op, left, right).or_else(|| call_dunder(op.reflect(), right, left))
-        }
-        .or_else(|| {
-            // When no appropriate method returns any value other than NotImplemented,
-            // the `==` and `!=` operators will fall back to `is` and `is not`, respectively.
-            // refer to `<https://docs.python.org/3/reference/datamodel.html#object.__eq__>`
-            if matches!(op, RichCompareOperator::Eq | RichCompareOperator::Ne)
-                // This branch implements specific behavior of the `__eq__` and `__ne__` methods
-                // on `object`, so it does not apply if we skip looking up attributes on `object`.
-                && !policy.mro_no_object_fallback()
-            {
-                Some(KnownClass::Bool.to_instance(db))
-            } else {
-                None
-            }
-        })
-        .ok_or_else(|| CompareUnsupportedError {
-            op: op.into(),
-            left_ty: left,
-            right_ty: right,
-        })
-    }
-
-    /// Performs a membership test (`in` and `not in`) between two instances and returns the resulting type, or `None` if the test is unsupported.
-    /// The behavior can be customized in Python by implementing `__contains__`, `__iter__`, or `__getitem__` methods.
-    /// See `<https://docs.python.org/3/reference/datamodel.html#object.__contains__>`
-    /// and `<https://docs.python.org/3/reference/expressions.html#membership-test-details>`
-    fn infer_membership_test_comparison(
-        &self,
-        left: Type<'db>,
-        right: Type<'db>,
-        op: MembershipTestCompareOperator,
-        range: TextRange,
-    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
-        let db = self.db();
-
-        let contains_dunder = right.class_member(db, "__contains__".into()).place;
-        let compare_result_opt = match contains_dunder {
-            Place::Type(contains_dunder, Boundness::Bound) => {
-                // If `__contains__` is available, it is used directly for the membership test.
-                contains_dunder
-                    .try_call(db, &CallArguments::positional([right, left]))
-                    .map(|bindings| bindings.return_type(db))
-                    .ok()
-            }
-            _ => {
-                // iteration-based membership test
-                right
-                    .try_iterate(db)
-                    .map(|_| KnownClass::Bool.to_instance(db))
-                    .ok()
-            }
-        };
-
-        compare_result_opt
-            .map(|ty| {
-                if matches!(ty, Type::Dynamic(DynamicType::Todo(_))) {
-                    return ty;
-                }
-
-                let truthiness = ty.try_bool(db).unwrap_or_else(|err| {
-                    err.report_diagnostic(&self.context, range);
-                    err.fallback_truthiness()
-                });
-
-                match op {
-                    MembershipTestCompareOperator::In => truthiness.into_type(db),
-                    MembershipTestCompareOperator::NotIn => truthiness.negate().into_type(db),
-                }
-            })
-            .ok_or_else(|| CompareUnsupportedError {
-                op: op.into(),
-                left_ty: left,
-                right_ty: right,
-            })
-    }
-
-    /// Simulates rich comparison between tuples and returns the inferred result.
-    /// This performs a lexicographic comparison, returning a union of all possible return types that could result from the comparison.
-    ///
-    /// basically it's based on cpython's `tuple_richcompare`
-    /// see `<https://github.com/python/cpython/blob/9d6366b60d01305fc5e45100e0cd13e358aa397d/Objects/tupleobject.c#L637>`
-    fn infer_tuple_rich_comparison(
-        &mut self,
-        left: &TupleSpec<'db>,
-        op: RichCompareOperator,
-        right: &TupleSpec<'db>,
-        range: TextRange,
-    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
-        // If either tuple is variable length, we can make no assumptions about the relative
-        // lengths of the tuples, and therefore neither about how they compare lexicographically.
-        // TODO: Consider comparing the prefixes of the tuples, since that could give a comparison
-        // result regardless of how long the variable-length tuple is.
-        let (TupleSpec::Fixed(left), TupleSpec::Fixed(right)) = (left, right) else {
-            return Ok(Type::unknown());
-        };
-
-        let left_iter = left.elements().copied();
-        let right_iter = right.elements().copied();
-
-        let mut builder = UnionBuilder::new(self.db());
-
-        for (l_ty, r_ty) in left_iter.zip(right_iter) {
-            let pairwise_eq_result = self
-                .infer_binary_type_comparison(l_ty, ast::CmpOp::Eq, r_ty, range)
-                .expect("infer_binary_type_comparison should never return None for `CmpOp::Eq`");
-
-            match pairwise_eq_result
-                .try_bool(self.db())
-                .unwrap_or_else(|err| {
-                    // TODO: We should, whenever possible, pass the range of the left and right elements
-                    //   instead of the range of the whole tuple.
-                    err.report_diagnostic(&self.context, range);
-                    err.fallback_truthiness()
-                }) {
-                // - AlwaysTrue : Continue to the next pair for lexicographic comparison
-                Truthiness::AlwaysTrue => continue,
-                // - AlwaysFalse:
-                // Lexicographic comparisons will always terminate with this pair.
-                // Complete the comparison and return the result.
-                // - Ambiguous:
-                // Lexicographic comparisons might continue to the next pair (if eq_result is true),
-                // or terminate here (if eq_result is false).
-                // To account for cases where the comparison terminates here, add the pairwise comparison result to the union builder.
-                eq_truthiness @ (Truthiness::AlwaysFalse | Truthiness::Ambiguous) => {
-                    let pairwise_compare_result = match op {
-                        RichCompareOperator::Lt
-                        | RichCompareOperator::Le
-                        | RichCompareOperator::Gt
-                        | RichCompareOperator::Ge => {
-                            self.infer_binary_type_comparison(l_ty, op.into(), r_ty, range)?
-                        }
-                        // For `==` and `!=`, we already figure out the result from `pairwise_eq_result`
-                        // NOTE: The CPython implementation does not account for non-boolean return types
-                        // or cases where `!=` is not the negation of `==`, we also do not consider these cases.
-                        RichCompareOperator::Eq => Type::BooleanLiteral(false),
-                        RichCompareOperator::Ne => Type::BooleanLiteral(true),
-                    };
-
-                    builder = builder.add(pairwise_compare_result);
-
-                    if eq_truthiness.is_ambiguous() {
-                        continue;
-                    }
-
-                    return Ok(builder.build());
-                }
-            }
-        }
-
-        // if no more items to compare, we just compare sizes
-        let (left_len, right_len) = (left.len(), right.len());
-
-        builder = builder.add(Type::BooleanLiteral(match op {
-            RichCompareOperator::Eq => left_len == right_len,
-            RichCompareOperator::Ne => left_len != right_len,
-            RichCompareOperator::Lt => left_len < right_len,
-            RichCompareOperator::Le => left_len <= right_len,
-            RichCompareOperator::Gt => left_len > right_len,
-            RichCompareOperator::Ge => left_len >= right_len,
-        }));
-
-        Ok(builder.build())
-    }
-
-    fn infer_subscript_expression(&mut self, subscript: &ast::ExprSubscript) -> Type<'db> {
-        let ast::ExprSubscript {
-            value,
-            slice,
-            range: _,
-            node_index: _,
-            ctx,
-        } = subscript;
-
-        match ctx {
-            ExprContext::Load => self.infer_subscript_load(subscript),
-            ExprContext::Store => {
-                let value_ty = self.infer_expression(value);
-                let slice_ty = self.infer_expression(slice);
-                self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
-                Type::Never
-            }
-            ExprContext::Del => {
-                self.infer_subscript_load(subscript);
-                Type::Never
-            }
-            ExprContext::Invalid => {
-                let value_ty = self.infer_expression(value);
-                let slice_ty = self.infer_expression(slice);
-                self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
-                Type::unknown()
-            }
-        }
-    }
-
-    fn infer_subscript_load(&mut self, subscript: &ast::ExprSubscript) -> Type<'db> {
-        let ast::ExprSubscript {
-            range: _,
-            node_index: _,
-            value,
-            slice,
-            ctx,
-        } = subscript;
-        let value_ty = self.infer_expression(value);
-        let mut constraint_keys = vec![];
-
-        // If `value` is a valid reference, we attempt type narrowing by assignment.
-        if !value_ty.is_unknown() {
-            if let Some(expr) = PlaceExpr::try_from_expr(subscript) {
-                let (place, keys) = self.infer_place_load(
-                    PlaceExprRef::from(&expr),
-                    ast::ExprRef::Subscript(subscript),
-                );
-                constraint_keys.extend(keys);
-                if let Place::Type(ty, Boundness::Bound) = place.place {
-                    // Even if we can obtain the subscript type based on the assignments, we still perform default type inference
-                    // (to store the expression type and to report errors).
-                    let slice_ty = self.infer_expression(slice);
-                    self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
-                    return ty;
-                }
-            }
-        }
-
-        let tuple_generic_alias = |db: &'db dyn Db, tuple: Option<TupleType<'db>>| {
-            let tuple = tuple.unwrap_or_else(|| TupleType::homogeneous(db, Type::unknown()));
-            Type::from(tuple.to_class_type(db))
-        };
-
-        // HACK ALERT: If we are subscripting a generic class, short-circuit the rest of the
-        // subscript inference logic and treat this as an explicit specialization.
-        // TODO: Move this logic into a custom callable, and update `find_name_in_mro` to return
-        // this callable as the `__class_getitem__` method on `type`. That probably requires
-        // updating all of the subscript logic below to use custom callables for all of the _other_
-        // special cases, too.
-        if let Type::ClassLiteral(class) = value_ty {
-            if class.is_tuple(self.db()) {
-                return tuple_generic_alias(self.db(), self.infer_tuple_type_expression(slice));
-            }
-            if let Some(generic_context) = class.generic_context(self.db()) {
-                return self.infer_explicit_class_specialization(
-                    subscript,
-                    value_ty,
-                    class,
-                    generic_context,
-                );
-            }
-        }
-        if let Type::SpecialForm(SpecialFormType::Tuple) = value_ty {
-            return tuple_generic_alias(self.db(), self.infer_tuple_type_expression(slice));
-        }
-
-        let slice_ty = self.infer_expression(slice);
-        let result_ty = self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
-        self.narrow_expr_with_applicable_constraints(subscript, result_ty, &constraint_keys)
-    }
-
-    fn infer_explicit_class_specialization(
-        &mut self,
-        subscript: &ast::ExprSubscript,
-        value_ty: Type<'db>,
-        generic_class: ClassLiteral<'db>,
-        generic_context: GenericContext<'db>,
-    ) -> Type<'db> {
-        let slice_node = subscript.slice.as_ref();
-        let call_argument_types = match slice_node {
-            ast::Expr::Tuple(tuple) => {
-                let arguments = CallArguments::positional(
-                    tuple.elts.iter().map(|elt| self.infer_type_expression(elt)),
-                );
-                self.store_expression_type(
-                    slice_node,
-                    Type::heterogeneous_tuple(self.db(), arguments.iter_types()),
-                );
-                arguments
-            }
-            _ => CallArguments::positional([self.infer_type_expression(slice_node)]),
-        };
-        let binding = Binding::single(value_ty, generic_context.signature(self.db()));
-        let bindings = match Bindings::from(binding)
-            .match_parameters(&call_argument_types)
-            .check_types(self.db(), &call_argument_types)
-        {
-            Ok(bindings) => bindings,
-            Err(CallError(_, bindings)) => {
-                bindings.report_diagnostics(&self.context, subscript.into());
-                return Type::unknown();
-            }
-        };
-        let callable = bindings
-            .into_iter()
-            .next()
-            .expect("valid bindings should have one callable");
-        let (_, overload) = callable
-            .matching_overloads()
-            .next()
-            .expect("valid bindings should have matching overload");
-        Type::from(generic_class.apply_specialization(self.db(), |_| {
-            generic_context
-                .specialize_partial(self.db(), overload.parameter_types().iter().copied())
-        }))
-    }
-
-    fn infer_subscript_expression_types(
-        &self,
-        subscript: &ast::ExprSubscript,
-        value_ty: Type<'db>,
-        slice_ty: Type<'db>,
-        expr_context: ExprContext,
-    ) -> Type<'db> {
-        let db = self.db();
-        let context = &self.context;
-
-        let value_node = subscript.value.as_ref();
-
-        let inferred = match (value_ty, slice_ty) {
-            (Type::Union(union), _) => Some(union.map(db, |element| {
-                self.infer_subscript_expression_types(subscript, *element, slice_ty, expr_context)
-            })),
-
-            // TODO: we can map over the intersection and fold the results back into an intersection,
-            // but we need to make sure we avoid emitting a diagnostic if one positive element has a `__getitem__`
-            // method but another does not. This means `infer_subscript_expression_types`
-            // needs to return a `Result` rather than eagerly emitting diagnostics.
-            (Type::Intersection(_), _) => {
-                Some(todo_type!("Subscript expressions on intersections"))
-            }
-
-            // Ex) Given `("a", "b", "c", "d")[1]`, return `"b"`
-            (Type::NominalInstance(nominal), Type::IntLiteral(i64_int)) => nominal
-                .tuple_spec(db)
-                .and_then(|tuple| Some((tuple, i32::try_from(i64_int).ok()?)))
-                .map(|(tuple, i32_int)| {
-                    tuple.py_index(db, i32_int).unwrap_or_else(|_| {
-                        report_index_out_of_bounds(
-                            context,
-                            "tuple",
-                            value_node.into(),
-                            value_ty,
-                            tuple.len().display_minimum(),
-                            i64_int,
-                        );
-                        Type::unknown()
-                    })
-                }),
-
-            // Ex) Given `("a", 1, Null)[0:2]`, return `("a", 1)`
-            (
-                Type::NominalInstance(maybe_tuple_nominal),
-                Type::NominalInstance(maybe_slice_nominal),
-            ) => maybe_tuple_nominal
-                .tuple_spec(db)
-                .as_deref()
-                .and_then(|tuple_spec| Some((tuple_spec, maybe_slice_nominal.slice_literal(db)?)))
-                .map(|(tuple, SliceLiteral { start, stop, step })| match tuple {
-                    TupleSpec::Fixed(tuple) => {
-                        if let Ok(new_elements) = tuple.py_slice(db, start, stop, step) {
-                            Type::heterogeneous_tuple(db, new_elements)
-                        } else {
-                            report_slice_step_size_zero(context, value_node.into());
-                            Type::unknown()
-                        }
-                    }
-                    TupleSpec::Variable(_) => {
-                        todo_type!("slice into variable-length tuple")
-                    }
-                }),
-
-            // Ex) Given `"value"[1]`, return `"a"`
-            (Type::StringLiteral(literal_ty), Type::IntLiteral(i64_int)) => {
-                i32::try_from(i64_int).ok().map(|i32_int| {
-                    let literal_value = literal_ty.value(db);
-                    (&mut literal_value.chars())
-                        .py_index(db, i32_int)
-                        .map(|ch| Type::string_literal(db, &ch.to_string()))
-                        .unwrap_or_else(|_| {
-                            report_index_out_of_bounds(
-                                context,
-                                "string",
-                                value_node.into(),
-                                value_ty,
-                                literal_value.chars().count(),
-                                i64_int,
-                            );
-                            Type::unknown()
-                        })
-                })
-            }
-
-            // Ex) Given `"value"[1:3]`, return `"al"`
-            (Type::StringLiteral(literal_ty), Type::NominalInstance(nominal)) => nominal
-                .slice_literal(db)
-                .map(|SliceLiteral { start, stop, step }| {
-                    let literal_value = literal_ty.value(db);
-                    let chars: Vec<_> = literal_value.chars().collect();
-
-                    if let Ok(new_chars) = chars.py_slice(db, start, stop, step) {
-                        let literal: String = new_chars.collect();
-                        Type::string_literal(db, &literal)
-                    } else {
-                        report_slice_step_size_zero(context, value_node.into());
-                        Type::unknown()
-                    }
-                }),
-
-            // Ex) Given `b"value"[1]`, return `97` (i.e., `ord(b"a")`)
-            (Type::BytesLiteral(literal_ty), Type::IntLiteral(i64_int)) => {
-                i32::try_from(i64_int).ok().map(|i32_int| {
-                    let literal_value = literal_ty.value(db);
-                    literal_value
-                        .py_index(db, i32_int)
-                        .map(|byte| Type::IntLiteral((*byte).into()))
-                        .unwrap_or_else(|_| {
-                            report_index_out_of_bounds(
-                                context,
-                                "bytes literal",
-                                value_node.into(),
-                                value_ty,
-                                literal_value.len(),
-                                i64_int,
-                            );
-                            Type::unknown()
-                        })
-                })
-            }
-
-            // Ex) Given `b"value"[1:3]`, return `b"al"`
-            (Type::BytesLiteral(literal_ty), Type::NominalInstance(nominal)) => nominal
-                .slice_literal(db)
-                .map(|SliceLiteral { start, stop, step }| {
-                    let literal_value = literal_ty.value(db);
-
-                    if let Ok(new_bytes) = literal_value.py_slice(db, start, stop, step) {
-                        let new_bytes: Vec<u8> = new_bytes.collect();
-                        Type::bytes_literal(db, &new_bytes)
-                    } else {
-                        report_slice_step_size_zero(context, value_node.into());
-                        Type::unknown()
-                    }
-                }),
-
-            // Ex) Given `"value"[True]`, return `"a"`
-            (Type::StringLiteral(_) | Type::BytesLiteral(_), Type::BooleanLiteral(bool)) => {
-                Some(self.infer_subscript_expression_types(
-                    subscript,
-                    value_ty,
-                    Type::IntLiteral(i64::from(bool)),
-                    expr_context,
-                ))
-            }
-
-            (Type::NominalInstance(nominal), Type::BooleanLiteral(bool))
-                if nominal.tuple_spec(db).is_some() =>
-            {
-                Some(self.infer_subscript_expression_types(
-                    subscript,
-                    value_ty,
-                    Type::IntLiteral(i64::from(bool)),
-                    expr_context,
-                ))
-            }
-
-            (Type::SpecialForm(SpecialFormType::Protocol), typevars) => Some(
-                self.legacy_generic_class_context(
-                    value_node,
-                    typevars,
-                    LegacyGenericBase::Protocol,
-                )
-                .map(|context| Type::KnownInstance(KnownInstanceType::SubscriptedProtocol(context)))
-                .unwrap_or_else(GenericContextError::into_type),
-            ),
-
-            (Type::KnownInstance(KnownInstanceType::SubscriptedProtocol(_)), _) => {
-                // TODO: emit a diagnostic
-                Some(todo_type!("doubly-specialized typing.Protocol"))
-            }
-
-            (Type::SpecialForm(SpecialFormType::Generic), typevars) => Some(
-                self.legacy_generic_class_context(value_node, typevars, LegacyGenericBase::Generic)
-                    .map(|context| {
-                        Type::KnownInstance(KnownInstanceType::SubscriptedGeneric(context))
-                    })
-                    .unwrap_or_else(GenericContextError::into_type),
-            ),
-
-            (Type::KnownInstance(KnownInstanceType::SubscriptedGeneric(_)), _) => {
-                // TODO: emit a diagnostic
-                Some(todo_type!("doubly-specialized typing.Generic"))
-            }
-
-            (Type::SpecialForm(SpecialFormType::Unpack), _) => {
-                Some(Type::Dynamic(DynamicType::TodoUnpack))
-            }
-
-            (Type::SpecialForm(special_form), _) if special_form.class().is_special_form() => {
-                Some(todo_type!("Inference of subscript on special form"))
-            }
-
-            (Type::KnownInstance(known_instance), _)
-                if known_instance.class().is_special_form() =>
-            {
-                Some(todo_type!("Inference of subscript on special form"))
-            }
-
-            _ => None,
-        };
-
-        if let Some(inferred) = inferred {
-            return inferred;
-        }
-
-        // If the class defines `__getitem__`, return its return type.
-        //
-        // See: https://docs.python.org/3/reference/datamodel.html#class-getitem-versus-getitem
-        match value_ty.try_call_dunder(db, "__getitem__", CallArguments::positional([slice_ty])) {
-            Ok(outcome) => {
-                return outcome.return_type(db);
-            }
-            Err(err @ CallDunderError::PossiblyUnbound { .. }) => {
-                if let Some(builder) =
-                    context.report_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL, value_node)
-                {
-                    builder.into_diagnostic(format_args!(
-                        "Method `__getitem__` of type `{}` is possibly unbound",
-                        value_ty.display(db),
-                    ));
-                }
-
-                return err.fallback_return_type(db);
-            }
-            Err(CallDunderError::CallError(call_error_kind, bindings)) => {
-                match call_error_kind {
-                    CallErrorKind::NotCallable => {
-                        if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, value_node) {
-                            builder.into_diagnostic(format_args!(
-                                "Method `__getitem__` of type `{}` \
-                                is not callable on object of type `{}`",
-                                bindings.callable_type().display(db),
-                                value_ty.display(db),
-                            ));
-                        }
-                    }
-                    CallErrorKind::BindingError => {
-                        if let Some(typed_dict) = value_ty.into_typed_dict() {
-                            let slice_node = subscript.slice.as_ref();
-
-                            report_invalid_key_on_typed_dict(
-                                context,
-                                value_node.into(),
-                                slice_node.into(),
-                                value_ty,
-                                slice_ty,
-                                &typed_dict.items(db),
-                            );
-                        } else {
-                            if let Some(builder) =
-                                context.report_lint(&INVALID_ARGUMENT_TYPE, value_node)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Method `__getitem__` of type `{}` cannot be called with key of \
-                                    type `{}` on object of type `{}`",
-                                    bindings.callable_type().display(db),
-                                    slice_ty.display(db),
-                                    value_ty.display(db),
-                                ));
-                            }
-                        }
-                    }
-                    CallErrorKind::PossiblyNotCallable => {
-                        if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, value_node) {
-                            builder.into_diagnostic(format_args!(
-                                "Method `__getitem__` of type `{}` is possibly not callable on object of type `{}`",
-                                bindings.callable_type().display(db),
-                                value_ty.display(db),
-                            ));
-                        }
-                    }
-                }
-
-                return bindings.return_type(db);
-            }
-            Err(CallDunderError::MethodNotAvailable) => {
-                // try `__class_getitem__`
-            }
-        }
-
-        // Otherwise, if the value is itself a class and defines `__class_getitem__`,
-        // return its return type.
-        //
-        // TODO: lots of classes are only subscriptable at runtime on Python 3.9+,
-        // *but* we should also allow them to be subscripted in stubs
-        // (and in annotations if `from __future__ import annotations` is enabled),
-        // even if the target version is Python 3.8 or lower,
-        // despite the fact that there will be no corresponding `__class_getitem__`
-        // method in these `sys.version_info` branches.
-        if value_ty.is_subtype_of(db, KnownClass::Type.to_instance(db)) {
-            let dunder_class_getitem_method = value_ty.member(db, "__class_getitem__").place;
-
-            match dunder_class_getitem_method {
-                Place::Unbound => {}
-                Place::Type(ty, boundness) => {
-                    if boundness == Boundness::PossiblyUnbound {
-                        if let Some(builder) =
-                            context.report_lint(&POSSIBLY_UNBOUND_IMPLICIT_CALL, value_node)
-                        {
-                            builder.into_diagnostic(format_args!(
-                                "Method `__class_getitem__` of type `{}` \
-                                    is possibly unbound",
-                                value_ty.display(db),
-                            ));
-                        }
-                    }
-
-                    match ty.try_call(db, &CallArguments::positional([value_ty, slice_ty])) {
-                        Ok(bindings) => return bindings.return_type(db),
-                        Err(CallError(_, bindings)) => {
-                            if let Some(builder) =
-                                context.report_lint(&CALL_NON_CALLABLE, value_node)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Method `__class_getitem__` of type `{}` \
-                                        is not callable on object of type `{}`",
-                                    bindings.callable_type().display(db),
-                                    value_ty.display(db),
-                                ));
-                            }
-                            return bindings.return_type(db);
-                        }
-                    }
-                }
-            }
-
-            if let Type::ClassLiteral(class) = value_ty {
-                if class.is_known(db, KnownClass::Type) {
-                    return KnownClass::GenericAlias.to_instance(db);
-                }
-
-                if class.generic_context(db).is_some() {
-                    // TODO: specialize the generic class using these explicit type
-                    // variable assignments. This branch is only encountered when an
-                    // explicit class specialization appears inside of some other subscript
-                    // expression, e.g. `tuple[list[int], ...]`. We have already inferred
-                    // the type of the outer subscript slice as a value expression, which
-                    // means we can't re-infer the inner specialization here as a type
-                    // expression.
-                    return value_ty;
-                }
-            }
-
-            // TODO: properly handle old-style generics; get rid of this temporary hack
-            if !value_ty
-                .into_class_literal()
-                .is_some_and(|class| class.iter_mro(db, None).contains(&ClassBase::Generic))
-            {
-                report_non_subscriptable(context, value_node.into(), value_ty, "__class_getitem__");
-            }
-        } else {
-            if expr_context != ExprContext::Store {
-                report_non_subscriptable(context, value_node.into(), value_ty, "__getitem__");
-            }
-        }
-
-        Type::unknown()
-    }
-
-    fn legacy_generic_class_context(
-        &self,
-        value_node: &ast::Expr,
-        typevars: Type<'db>,
-        origin: LegacyGenericBase,
-    ) -> Result<GenericContext<'db>, GenericContextError> {
-        let typevars_class_tuple_spec = typevars.exact_tuple_instance_spec(self.db());
-
-        let typevars = if let Some(tuple_spec) = typevars_class_tuple_spec.as_deref() {
-            match tuple_spec {
-                Tuple::Fixed(typevars) => typevars.elements_slice(),
-                // TODO: emit a diagnostic
-                Tuple::Variable(_) => return Err(GenericContextError::VariadicTupleArguments),
-            }
-        } else {
-            std::slice::from_ref(&typevars)
-        };
-
-        let typevars: Result<FxOrderSet<_>, GenericContextError> = typevars
-            .iter()
-            .map(|typevar| match typevar {
-                Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) => bind_typevar(
-                    self.db(),
-                    self.module(),
-                    self.index,
-                    self.scope().file_scope_id(self.db()),
-                    self.typevar_binding_context,
-                    *typevar,
-                )
-                .ok_or(GenericContextError::InvalidArgument),
-                Type::Dynamic(DynamicType::TodoUnpack) => Err(GenericContextError::NotYetSupported),
-                Type::NominalInstance(nominal)
-                    if matches!(
-                        nominal.class(self.db()).known(self.db()),
-                        Some(KnownClass::TypeVarTuple | KnownClass::ParamSpec)
-                    ) =>
-                {
-                    Err(GenericContextError::NotYetSupported)
-                }
-                _ => {
-                    if let Some(builder) =
-                        self.context.report_lint(&INVALID_ARGUMENT_TYPE, value_node)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "`{}` is not a valid argument to `{origin}`",
-                            typevar.display(self.db()),
-                        ));
-                    }
-                    Err(GenericContextError::InvalidArgument)
-                }
-            })
-            .collect();
-        typevars.map(|typevars| GenericContext::new(self.db(), typevars))
-    }
-
-    fn infer_slice_expression(&mut self, slice: &ast::ExprSlice) -> Type<'db> {
-        enum SliceArg<'db> {
-            Arg(Type<'db>),
-            Unsupported,
-        }
-
-        let ast::ExprSlice {
-            range: _,
-            node_index: _,
-            lower,
-            upper,
-            step,
-        } = slice;
-
-        let ty_lower = self.infer_optional_expression(lower.as_deref());
-        let ty_upper = self.infer_optional_expression(upper.as_deref());
-        let ty_step = self.infer_optional_expression(step.as_deref());
-
-        let type_to_slice_argument = |ty: Option<Type<'db>>| match ty {
-            Some(ty @ (Type::IntLiteral(_) | Type::BooleanLiteral(_))) => SliceArg::Arg(ty),
-            Some(ty @ Type::NominalInstance(instance))
-                if instance
-                    .class(self.db())
-                    .is_known(self.db(), KnownClass::NoneType) =>
-            {
-                SliceArg::Arg(ty)
-            }
-            None => SliceArg::Arg(Type::none(self.db())),
-            _ => SliceArg::Unsupported,
-        };
-
-        match (
-            type_to_slice_argument(ty_lower),
-            type_to_slice_argument(ty_upper),
-            type_to_slice_argument(ty_step),
-        ) {
-            (SliceArg::Arg(lower), SliceArg::Arg(upper), SliceArg::Arg(step)) => {
-                KnownClass::Slice.to_specialized_instance(self.db(), [lower, upper, step])
-            }
-            _ => KnownClass::Slice.to_instance(self.db()),
-        }
-    }
-
-    fn infer_type_parameters(&mut self, type_parameters: &ast::TypeParams) {
-        let ast::TypeParams {
-            range: _,
-            node_index: _,
-            type_params,
-        } = type_parameters;
-        for type_param in type_params {
-            match type_param {
-                ast::TypeParam::TypeVar(node) => self.infer_definition(node),
-                ast::TypeParam::ParamSpec(node) => self.infer_definition(node),
-                ast::TypeParam::TypeVarTuple(node) => self.infer_definition(node),
-            }
-        }
-    }
-
-    pub(super) fn finish_expression(mut self) -> ExpressionInference<'db> {
-        self.infer_region();
-
-        let Self {
-            context,
-            mut expressions,
-            scope,
-            bindings,
-            declarations,
-            deferred,
-            cycle_fallback,
-
-            // Ignored; only relevant to definition regions
-            undecorated_type: _,
-
-            // builder only state
-            typevar_binding_context: _,
-            deferred_state: _,
-            called_functions: _,
-            index: _,
-            region: _,
-            return_types_and_ranges: _,
-        } = self;
-
-        let diagnostics = context.finish();
-        let _ = scope;
-
-        assert!(
-            declarations.is_empty(),
-            "Expression region can't have declarations"
-        );
-        assert!(
-            deferred.is_empty(),
-            "Expression region can't have deferred types"
-        );
-
-        let extra =
-            (cycle_fallback || !bindings.is_empty() || !diagnostics.is_empty()).then(|| {
-                if bindings.len() > 20 {
-                    tracing::debug!(
-                        "Inferred expression region `{:?}` contains {} bindings. Lookups by linear scan might be slow.",
-                        self.region,
-                        bindings.len()
-                    );
-                }
-
-                Box::new(ExpressionInferenceExtra {
-                    bindings: bindings.into_boxed_slice(),
-                    diagnostics,
-                    cycle_fallback,
-                })
-            });
-
-        expressions.shrink_to_fit();
-
-        ExpressionInference {
-            expressions,
-            extra,
-            #[cfg(debug_assertions)]
-            scope,
-        }
-    }
-
-    pub(super) fn finish_definition(mut self) -> DefinitionInference<'db> {
-        self.infer_region();
-
-        let Self {
-            context,
-            mut expressions,
-            scope,
-            bindings,
-            declarations,
-            deferred,
-            cycle_fallback,
-            undecorated_type,
-
-            // builder only state
-            typevar_binding_context: _,
-            deferred_state: _,
-            called_functions: _,
-            index: _,
-            region: _,
-            return_types_and_ranges: _,
-        } = self;
-
-        let _ = scope;
-        let diagnostics = context.finish();
-
-        let extra = (!diagnostics.is_empty()
-            || cycle_fallback
-            || undecorated_type.is_some()
-            || !deferred.is_empty())
-        .then(|| {
-            Box::new(DefinitionInferenceExtra {
-                cycle_fallback,
-                deferred: deferred.into_boxed_slice(),
-                diagnostics,
-                undecorated_type,
-            })
-        });
-
-        if bindings.len() > 20 {
-            tracing::debug!(
-                "Inferred definition region `{:?}` contains {} bindings. Lookups by linear scan might be slow.",
-                self.region,
-                bindings.len(),
-            );
-        }
-
-        if declarations.len() > 20 {
-            tracing::debug!(
-                "Inferred declaration region `{:?}` contains {} declarations. Lookups by linear scan might be slow.",
-                self.region,
-                declarations.len(),
-            );
-        }
-
-        expressions.shrink_to_fit();
-
-        DefinitionInference {
-            expressions,
-            #[cfg(debug_assertions)]
-            scope,
-            bindings: bindings.into_boxed_slice(),
-            declarations: declarations.into_boxed_slice(),
-            extra,
-        }
-    }
-
-    pub(super) fn finish_scope(mut self) -> ScopeInference<'db> {
-        self.infer_region();
-
-        let Self {
-            context,
-            mut expressions,
-            scope,
-            cycle_fallback,
-
-            // Ignored, because scope types are never extended into other scopes.
-            deferred: _,
-            bindings: _,
-            declarations: _,
-
-            // Ignored; only relevant to definition regions
-            undecorated_type: _,
-
-            // Builder only state
-            typevar_binding_context: _,
-            deferred_state: _,
-            called_functions: _,
-            index: _,
-            region: _,
-            return_types_and_ranges: _,
-        } = self;
-
-        let _ = scope;
-        let diagnostics = context.finish();
-
-        let extra = (!diagnostics.is_empty() || cycle_fallback).then(|| {
-            Box::new(ScopeInferenceExtra {
-                cycle_fallback,
-                diagnostics,
-            })
-        });
-
-        expressions.shrink_to_fit();
-
-        ScopeInference { expressions, extra }
-    }
-}
-
-/// Annotation expressions.
-impl<'db> TypeInferenceBuilder<'db, '_> {
-    /// Infer the type of an annotation expression with the given [`DeferredExpressionState`].
-    fn infer_annotation_expression(
-        &mut self,
-        annotation: &ast::Expr,
-        deferred_state: DeferredExpressionState,
-    ) -> TypeAndQualifiers<'db> {
-        let previous_deferred_state = std::mem::replace(&mut self.deferred_state, deferred_state);
-        let annotation_ty = self.infer_annotation_expression_impl(annotation);
-        self.deferred_state = previous_deferred_state;
-        annotation_ty
-    }
-
-    /// Similar to [`infer_annotation_expression`], but accepts an optional annotation expression
-    /// and returns [`None`] if the annotation is [`None`].
-    ///
-    /// [`infer_annotation_expression`]: TypeInferenceBuilder::infer_annotation_expression
-    fn infer_optional_annotation_expression(
-        &mut self,
-        annotation: Option<&ast::Expr>,
-        deferred_state: DeferredExpressionState,
-    ) -> Option<TypeAndQualifiers<'db>> {
-        annotation.map(|expr| self.infer_annotation_expression(expr, deferred_state))
-    }
-
-    /// Implementation of [`infer_annotation_expression`].
-    ///
-    /// [`infer_annotation_expression`]: TypeInferenceBuilder::infer_annotation_expression
-    fn infer_annotation_expression_impl(
-        &mut self,
-        annotation: &ast::Expr,
-    ) -> TypeAndQualifiers<'db> {
-        // https://typing.python.org/en/latest/spec/annotations.html#grammar-token-expression-grammar-annotation_expression
-        let annotation_ty = match annotation {
-            // String annotations: https://typing.python.org/en/latest/spec/annotations.html#string-annotations
-            ast::Expr::StringLiteral(string) => self.infer_string_annotation_expression(string),
-
-            // Annotation expressions also get special handling for `*args` and `**kwargs`.
-            ast::Expr::Starred(starred) => self.infer_starred_expression(starred).into(),
-
-            ast::Expr::BytesLiteral(bytes) => {
-                if let Some(builder) = self
-                    .context
-                    .report_lint(&BYTE_STRING_TYPE_ANNOTATION, bytes)
-                {
-                    builder.into_diagnostic("Type expressions cannot use bytes literal");
-                }
-                TypeAndQualifiers::unknown()
-            }
-
-            ast::Expr::FString(fstring) => {
-                if let Some(builder) = self.context.report_lint(&FSTRING_TYPE_ANNOTATION, fstring) {
-                    builder.into_diagnostic("Type expressions cannot use f-strings");
-                }
-                self.infer_fstring_expression(fstring);
-                TypeAndQualifiers::unknown()
-            }
-
-            ast::Expr::Name(name) => match name.ctx {
-                ast::ExprContext::Load => {
-                    let name_expr_ty = self.infer_name_expression(name);
-                    match name_expr_ty {
-                        Type::SpecialForm(SpecialFormType::ClassVar) => {
-                            TypeAndQualifiers::new(Type::unknown(), TypeQualifiers::CLASS_VAR)
-                        }
-                        Type::SpecialForm(SpecialFormType::Final) => {
-                            TypeAndQualifiers::new(Type::unknown(), TypeQualifiers::FINAL)
-                        }
-                        Type::ClassLiteral(class)
-                            if class.is_known(self.db(), KnownClass::InitVar) =>
-                        {
-                            if let Some(builder) =
-                                self.context.report_lint(&INVALID_TYPE_FORM, annotation)
-                            {
-                                builder.into_diagnostic(
-                                    "`InitVar` may not be used without a type argument",
-                                );
-                            }
-                            TypeAndQualifiers::new(Type::unknown(), TypeQualifiers::INIT_VAR)
-                        }
-                        _ => name_expr_ty
-                            .in_type_expression(
-                                self.db(),
-                                self.scope(),
-                                self.typevar_binding_context,
-                            )
-                            .unwrap_or_else(|error| {
-                                error.into_fallback_type(
-                                    &self.context,
-                                    annotation,
-                                    self.is_reachable(annotation),
-                                )
-                            })
-                            .into(),
-                    }
-                }
-                ast::ExprContext::Invalid => TypeAndQualifiers::unknown(),
-                ast::ExprContext::Store | ast::ExprContext::Del => {
-                    todo_type!("Name expression annotation in Store/Del context").into()
-                }
-            },
-
-            ast::Expr::Subscript(subscript @ ast::ExprSubscript { value, slice, .. }) => {
-                let value_ty = self.infer_expression(value);
-
-                let slice = &**slice;
-
-                match value_ty {
-                    Type::SpecialForm(SpecialFormType::Annotated) => {
-                        // This branch is similar to the corresponding branch in `infer_parameterized_special_form_type_expression`, but
-                        // `Annotated[…]` can appear both in annotation expressions and in type expressions, and needs to be handled slightly
-                        // differently in each case (calling either `infer_type_expression_*` or `infer_annotation_expression_*`).
-                        if let ast::Expr::Tuple(ast::ExprTuple {
-                            elts: arguments, ..
-                        }) = slice
-                        {
-                            if arguments.len() < 2 {
-                                report_invalid_arguments_to_annotated(&self.context, subscript);
-                            }
-
-                            if let [inner_annotation, metadata @ ..] = &arguments[..] {
-                                for element in metadata {
-                                    self.infer_expression(element);
-                                }
-
-                                let inner_annotation_ty =
-                                    self.infer_annotation_expression_impl(inner_annotation);
-
-                                self.store_expression_type(slice, inner_annotation_ty.inner_type());
-                                inner_annotation_ty
-                            } else {
-                                for argument in arguments {
-                                    self.infer_expression(argument);
-                                }
-                                self.store_expression_type(slice, Type::unknown());
-                                TypeAndQualifiers::unknown()
-                            }
-                        } else {
-                            report_invalid_arguments_to_annotated(&self.context, subscript);
-                            self.infer_annotation_expression_impl(slice)
-                        }
-                    }
-                    Type::SpecialForm(
-                        type_qualifier @ (SpecialFormType::ClassVar | SpecialFormType::Final),
-                    ) => {
-                        let arguments = if let ast::Expr::Tuple(tuple) = slice {
-                            &*tuple.elts
-                        } else {
-                            std::slice::from_ref(slice)
-                        };
-                        let num_arguments = arguments.len();
-                        let type_and_qualifiers = if num_arguments == 1 {
-                            let mut type_and_qualifiers =
-                                self.infer_annotation_expression_impl(slice);
-
-                            match type_qualifier {
-                                SpecialFormType::ClassVar => {
-                                    type_and_qualifiers.add_qualifier(TypeQualifiers::CLASS_VAR);
-                                }
-                                SpecialFormType::Final => {
-                                    type_and_qualifiers.add_qualifier(TypeQualifiers::FINAL);
-                                }
-                                _ => unreachable!(),
-                            }
-                            type_and_qualifiers
-                        } else {
-                            for element in arguments {
-                                self.infer_annotation_expression_impl(element);
-                            }
-                            if let Some(builder) =
-                                self.context.report_lint(&INVALID_TYPE_FORM, subscript)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Type qualifier `{type_qualifier}` expected exactly 1 argument, \
-                                    got {num_arguments}",
-                                ));
-                            }
-                            Type::unknown().into()
-                        };
-                        if slice.is_tuple_expr() {
-                            self.store_expression_type(slice, type_and_qualifiers.inner_type());
-                        }
-                        type_and_qualifiers
-                    }
-                    Type::ClassLiteral(class) if class.is_known(self.db(), KnownClass::InitVar) => {
-                        let arguments = if let ast::Expr::Tuple(tuple) = slice {
-                            &*tuple.elts
-                        } else {
-                            std::slice::from_ref(slice)
-                        };
-                        let num_arguments = arguments.len();
-                        let type_and_qualifiers = if num_arguments == 1 {
-                            let mut type_and_qualifiers =
-                                self.infer_annotation_expression_impl(slice);
-                            type_and_qualifiers.add_qualifier(TypeQualifiers::INIT_VAR);
-                            type_and_qualifiers
-                        } else {
-                            for element in arguments {
-                                self.infer_annotation_expression_impl(element);
-                            }
-                            if let Some(builder) =
-                                self.context.report_lint(&INVALID_TYPE_FORM, subscript)
-                            {
-                                builder.into_diagnostic(format_args!(
-                                    "Type qualifier `InitVar` expected exactly 1 argument, \
-                                    got {num_arguments}",
-                                ));
-                            }
-                            Type::unknown().into()
-                        };
-                        if slice.is_tuple_expr() {
-                            self.store_expression_type(slice, type_and_qualifiers.inner_type());
-                        }
-                        type_and_qualifiers
-                    }
-                    _ => self
-                        .infer_subscript_type_expression_no_store(subscript, slice, value_ty)
-                        .into(),
-                }
-            }
-
-            // All other annotation expressions are (possibly) valid type expressions, so handle
-            // them there instead.
-            type_expr => self.infer_type_expression_no_store(type_expr).into(),
-        };
-
-        self.store_expression_type(annotation, annotation_ty.inner_type());
-
-        annotation_ty
-    }
-
-    /// Infer the type of a string annotation expression.
-    fn infer_string_annotation_expression(
-        &mut self,
-        string: &ast::ExprStringLiteral,
-    ) -> TypeAndQualifiers<'db> {
-        match parse_string_annotation(&self.context, string) {
-            Some(parsed) => {
-                // String annotations are always evaluated in the deferred context.
-                self.infer_annotation_expression(
-                    parsed.expr(),
-                    DeferredExpressionState::InStringAnnotation(
-                        self.enclosing_node_key(string.into()),
-                    ),
-                )
-            }
-            None => TypeAndQualifiers::unknown(),
-        }
-    }
-}
-
-/// Type expressions
-impl<'db> TypeInferenceBuilder<'db, '_> {
-    /// Infer the type of a type expression.
-    fn infer_type_expression(&mut self, expression: &ast::Expr) -> Type<'db> {
-        let ty = self.infer_type_expression_no_store(expression);
-        self.store_expression_type(expression, ty);
-        ty
-    }
-
-    /// Similar to [`infer_type_expression`], but accepts a [`DeferredExpressionState`].
-    ///
-    /// [`infer_type_expression`]: TypeInferenceBuilder::infer_type_expression
-    fn infer_type_expression_with_state(
-        &mut self,
-        expression: &ast::Expr,
-        deferred_state: DeferredExpressionState,
-    ) -> Type<'db> {
-        let previous_deferred_state = std::mem::replace(&mut self.deferred_state, deferred_state);
-        let annotation_ty = self.infer_type_expression(expression);
-        self.deferred_state = previous_deferred_state;
-        annotation_ty
-    }
-
-    /// Similar to [`infer_type_expression`], but accepts an optional expression.
-    ///
-    /// [`infer_type_expression`]: TypeInferenceBuilder::infer_type_expression_with_state
-    fn infer_optional_type_expression(
-        &mut self,
-        expression: Option<&ast::Expr>,
-    ) -> Option<Type<'db>> {
-        expression.map(|expr| self.infer_type_expression(expr))
-    }
-
-    fn report_invalid_type_expression(
-        &self,
-        expression: &ast::Expr,
-        message: std::fmt::Arguments,
-    ) -> Option<LintDiagnosticGuard<'_, '_>> {
-        self.context
-            .report_lint(&INVALID_TYPE_FORM, expression)
-            .map(|builder| {
-                diagnostic::add_type_expression_reference_link(builder.into_diagnostic(message))
-            })
-    }
-
-    /// Infer the type of a type expression without storing the result.
-    fn infer_type_expression_no_store(&mut self, expression: &ast::Expr) -> Type<'db> {
-        // https://typing.python.org/en/latest/spec/annotations.html#grammar-token-expression-grammar-type_expression
-        match expression {
-            ast::Expr::Name(name) => match name.ctx {
-                ast::ExprContext::Load => self
-                    .infer_name_expression(name)
-                    .in_type_expression(self.db(), self.scope(), self.typevar_binding_context)
-                    .unwrap_or_else(|error| {
-                        error.into_fallback_type(
-                            &self.context,
-                            expression,
-                            self.is_reachable(expression),
-                        )
-                    }),
-                ast::ExprContext::Invalid => Type::unknown(),
-                ast::ExprContext::Store | ast::ExprContext::Del => {
-                    todo_type!("Name expression annotation in Store/Del context")
-                }
-            },
-
-            ast::Expr::Attribute(attribute_expression) => match attribute_expression.ctx {
-                ast::ExprContext::Load => self
-                    .infer_attribute_expression(attribute_expression)
-                    .in_type_expression(self.db(), self.scope(), self.typevar_binding_context)
-                    .unwrap_or_else(|error| {
-                        error.into_fallback_type(
-                            &self.context,
-                            expression,
-                            self.is_reachable(expression),
-                        )
-                    }),
-                ast::ExprContext::Invalid => Type::unknown(),
-                ast::ExprContext::Store | ast::ExprContext::Del => {
-                    todo_type!("Attribute expression annotation in Store/Del context")
-                }
-            },
-
-            ast::Expr::NoneLiteral(_literal) => Type::none(self.db()),
-
-            // https://typing.python.org/en/latest/spec/annotations.html#string-annotations
-            ast::Expr::StringLiteral(string) => self.infer_string_type_expression(string),
-
-            ast::Expr::Subscript(subscript) => {
-                let ast::ExprSubscript {
-                    value,
-                    slice,
-                    ctx: _,
-                    range: _,
-                    node_index: _,
-                } = subscript;
-
-                let value_ty = self.infer_expression(value);
-
-                self.infer_subscript_type_expression_no_store(subscript, slice, value_ty)
-            }
-
-            ast::Expr::BinOp(binary) => {
-                match binary.op {
-                    // PEP-604 unions are okay, e.g., `int | str`
-                    ast::Operator::BitOr => {
-                        let left_ty = self.infer_type_expression(&binary.left);
-                        let right_ty = self.infer_type_expression(&binary.right);
-                        UnionType::from_elements(self.db(), [left_ty, right_ty])
-                    }
-                    // anything else is an invalid annotation:
-                    op => {
-                        self.infer_binary_expression(binary);
-                        if let Some(mut diag) = self.report_invalid_type_expression(
-                            expression,
-                            format_args!(
-                                "Invalid binary operator `{}` in type annotation",
-                                op.as_str()
-                            ),
-                        ) {
-                            diag.info("Did you mean to use `|`?");
-                        }
-                        Type::unknown()
-                    }
-                }
-            }
-
-            // Avoid inferring the types of invalid type expressions that have been parsed from a
-            // string annotation, as they are not present in the semantic index.
-            _ if self.deferred_state.in_string_annotation() => Type::unknown(),
-
-            // =====================================================================================
-            // Forms which are invalid in the context of annotation expressions: we infer their
-            // nested expressions as normal expressions, but the type of the top-level expression is
-            // always `Type::unknown` in these cases.
-            // =====================================================================================
-
-            // TODO: add a subdiagnostic linking to type-expression grammar
-            // and stating that it is only valid in `typing.Literal[]` or `typing.Annotated[]`
-            ast::Expr::BytesLiteral(_) => {
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!(
-                        "Bytes literals are not allowed in this context in a type expression"
-                    ),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::NumberLiteral(ast::ExprNumberLiteral {
-                value: ast::Number::Int(_),
-                ..
-            }) => {
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!(
-                        "Int literals are not allowed in this context in a type expression"
-                    ),
-                );
-
-                Type::unknown()
-            }
-
-            ast::Expr::NumberLiteral(ast::ExprNumberLiteral {
-                value: ast::Number::Float(_),
-                ..
-            }) => {
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Float literals are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::NumberLiteral(ast::ExprNumberLiteral {
-                value: ast::Number::Complex { .. },
-                ..
-            }) => {
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Complex literals are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::BooleanLiteral(_) => {
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!(
-                        "Boolean literals are not allowed in this context in a type expression"
-                    ),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::List(list) => {
-                let db = self.db();
-
-                let inner_types: Vec<Type<'db>> = list
-                    .iter()
-                    .map(|element| self.infer_type_expression(element))
-                    .collect();
-
-                if let Some(mut diagnostic) = self.report_invalid_type_expression(
-                    expression,
-                    format_args!(
-                        "List literals are not allowed in this context in a type expression"
-                    ),
-                ) {
-                    if !inner_types.iter().any(|ty| {
-                        matches!(
-                            ty,
-                            Type::Dynamic(DynamicType::Todo(_) | DynamicType::Unknown)
-                        )
-                    }) {
-                        let hinted_type = if list.len() == 1 {
-                            KnownClass::List.to_specialized_instance(db, inner_types)
-                        } else {
-                            Type::heterogeneous_tuple(db, inner_types)
-                        };
-
-                        diagnostic.set_primary_message(format_args!(
-                            "Did you mean `{}`?",
-                            hinted_type.display(self.db()),
-                        ));
-                    }
-                }
-                Type::unknown()
-            }
-
-            ast::Expr::Tuple(tuple) => {
-                let inner_types: Vec<Type<'db>> = tuple
-                    .elts
-                    .iter()
-                    .map(|expr| self.infer_type_expression(expr))
-                    .collect();
-
-                if tuple.parenthesized {
-                    if let Some(mut diagnostic) = self.report_invalid_type_expression(
-                        expression,
-                        format_args!(
-                            "Tuple literals are not allowed in this context in a type expression"
-                        ),
-                    ) {
-                        if !inner_types.iter().any(|ty| {
-                            matches!(
-                                ty,
-                                Type::Dynamic(DynamicType::Todo(_) | DynamicType::Unknown)
-                            )
-                        }) {
-                            let hinted_type = Type::heterogeneous_tuple(self.db(), inner_types);
-                            diagnostic.set_primary_message(format_args!(
-                                "Did you mean `{}`?",
-                                hinted_type.display(self.db()),
-                            ));
-                        }
-                    }
-                }
-                Type::unknown()
-            }
-
-            ast::Expr::BoolOp(bool_op) => {
-                self.infer_boolean_expression(bool_op);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Boolean operations are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Named(named) => {
-                self.infer_named_expression(named);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Named expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::UnaryOp(unary) => {
-                self.infer_unary_expression(unary);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Unary operations are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Lambda(lambda_expression) => {
-                self.infer_lambda_expression(lambda_expression);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("`lambda` expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::If(if_expression) => {
-                self.infer_if_expression(if_expression);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("`if` expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Dict(dict) => {
-                self.infer_dict_expression(dict);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Dict literals are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Set(set) => {
-                self.infer_set_expression(set);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Set literals are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::DictComp(dictcomp) => {
-                self.infer_dict_comprehension_expression(dictcomp);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Dict comprehensions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::ListComp(listcomp) => {
-                self.infer_list_comprehension_expression(listcomp);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("List comprehensions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::SetComp(setcomp) => {
-                self.infer_set_comprehension_expression(setcomp);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Set comprehensions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Generator(generator) => {
-                self.infer_generator_expression(generator);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Generator expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Await(await_expression) => {
-                self.infer_await_expression(await_expression);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("`await` expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Yield(yield_expression) => {
-                self.infer_yield_expression(yield_expression);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("`yield` expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::YieldFrom(yield_from) => {
-                self.infer_yield_from_expression(yield_from);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("`yield from` expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Compare(compare) => {
-                self.infer_compare_expression(compare);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Comparison expressions are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Call(call_expr) => {
-                self.infer_call_expression(call_expr);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Function calls are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::FString(fstring) => {
-                self.infer_fstring_expression(fstring);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("F-strings are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::TString(tstring) => {
-                self.infer_tstring_expression(tstring);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("T-strings are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            ast::Expr::Slice(slice) => {
-                self.infer_slice_expression(slice);
-                self.report_invalid_type_expression(
-                    expression,
-                    format_args!("Slices are not allowed in type expressions"),
-                );
-                Type::unknown()
-            }
-
-            // =================================================================================
-            // Branches where we probably should emit diagnostics in some context, but don't yet
-            // =================================================================================
-            ast::Expr::IpyEscapeCommand(_) => todo!("Implement Ipy escape command support"),
-
-            ast::Expr::EllipsisLiteral(_) => {
-                todo_type!("ellipsis literal in type expression")
-            }
-
-            ast::Expr::Starred(starred) => self.infer_starred_type_expression(starred),
-        }
-    }
-
-    fn infer_starred_type_expression(&mut self, starred: &ast::ExprStarred) -> Type<'db> {
-        let ast::ExprStarred {
-            range: _,
-            node_index: _,
-            value,
-            ctx: _,
-        } = starred;
-
-        let starred_type = self.infer_type_expression(value);
-        if starred_type.exact_tuple_instance_spec(self.db()).is_some() {
-            starred_type
-        } else {
-            todo_type!("PEP 646")
-        }
-    }
-
-    fn infer_subscript_type_expression_no_store(
-        &mut self,
-        subscript: &ast::ExprSubscript,
-        slice: &ast::Expr,
-        value_ty: Type<'db>,
-    ) -> Type<'db> {
-        match value_ty {
-            Type::ClassLiteral(class_literal) => match class_literal.known(self.db()) {
-                Some(KnownClass::Tuple) => Type::tuple(self.infer_tuple_type_expression(slice)),
-                Some(KnownClass::Type) => self.infer_subclass_of_type_expression(slice),
-                _ => self.infer_subscript_type_expression(subscript, value_ty),
-            },
-            _ => self.infer_subscript_type_expression(subscript, value_ty),
-        }
-    }
-
-    /// Infer the type of a string type expression.
-    fn infer_string_type_expression(&mut self, string: &ast::ExprStringLiteral) -> Type<'db> {
-        match parse_string_annotation(&self.context, string) {
-            Some(parsed) => {
-                // String annotations are always evaluated in the deferred context.
-                self.infer_type_expression_with_state(
-                    parsed.expr(),
-                    DeferredExpressionState::InStringAnnotation(
-                        self.enclosing_node_key(string.into()),
-                    ),
-                )
-            }
-            None => Type::unknown(),
-        }
-    }
-
-    /// Given the slice of a `tuple[]` annotation, return the type that the annotation represents
-    fn infer_tuple_type_expression(&mut self, tuple_slice: &ast::Expr) -> Option<TupleType<'db>> {
-        /// In most cases, if a subelement of the tuple is inferred as `Todo`,
-        /// we should only infer `Todo` for that specific subelement.
-        /// Certain specific AST nodes can however change the meaning of the entire tuple,
-        /// however: for example, `tuple[int, ...]` or `tuple[int, *tuple[str, ...]]` are a
-        /// homogeneous tuple and a partly homogeneous tuple (respectively) due to the `...`
-        /// and the starred expression (respectively), Neither is supported by us right now,
-        /// so we should infer `Todo` for the *entire* tuple if we encounter one of those elements.
-        fn element_could_alter_type_of_whole_tuple(
-            element: &ast::Expr,
-            element_ty: Type,
-            builder: &mut TypeInferenceBuilder,
-        ) -> bool {
-            if !element_ty.is_todo() {
-                return false;
-            }
-
-            match element {
-                ast::Expr::Starred(_) => {
-                    element_ty.exact_tuple_instance_spec(builder.db()).is_none()
-                }
-                ast::Expr::Subscript(ast::ExprSubscript { value, .. }) => {
-                    let value_ty = if builder.deferred_state.in_string_annotation() {
-                        // Using `.expression_type` does not work in string annotations, because
-                        // we do not store types for sub-expressions. Re-infer the type here.
-                        builder.infer_expression(value)
-                    } else {
-                        builder.expression_type(value)
-                    };
-
-                    value_ty == Type::SpecialForm(SpecialFormType::Unpack)
-                }
-                _ => false,
-            }
-        }
-
-        // TODO: PEP 646
-        match tuple_slice {
-            ast::Expr::Tuple(elements) => {
-                if let [element, ellipsis @ ast::Expr::EllipsisLiteral(_)] = &*elements.elts {
-                    self.infer_expression(ellipsis);
-                    let result =
-                        TupleType::homogeneous(self.db(), self.infer_type_expression(element));
-                    self.store_expression_type(tuple_slice, Type::tuple(Some(result)));
-                    return Some(result);
-                }
-
-                let mut element_types = TupleSpecBuilder::with_capacity(elements.len());
-
-                // Whether to infer `Todo` for the whole tuple
-                // (see docstring for `element_could_alter_type_of_whole_tuple`)
-                let mut return_todo = false;
-
-                for element in elements {
-                    let element_ty = self.infer_type_expression(element);
-                    return_todo |=
-                        element_could_alter_type_of_whole_tuple(element, element_ty, self);
-
-                    if let ast::Expr::Starred(_) = element {
-                        if let Some(inner_tuple) = element_ty.exact_tuple_instance_spec(self.db()) {
-                            element_types = element_types.concat(self.db(), &inner_tuple);
-                        } else {
-                            // TODO: emit a diagnostic
-                        }
-                    } else {
-                        element_types.push(element_ty);
-                    }
-                }
-
-                let ty = if return_todo {
-                    Some(TupleType::homogeneous(self.db(), todo_type!("PEP 646")))
-                } else {
-                    TupleType::new(self.db(), &element_types.build())
-                };
-
-                // Here, we store the type for the inner `int, str` tuple-expression,
-                // while the type for the outer `tuple[int, str]` slice-expression is
-                // stored in the surrounding `infer_type_expression` call:
-                self.store_expression_type(tuple_slice, Type::tuple(ty));
-
-                ty
-            }
-            single_element => {
-                let single_element_ty = self.infer_type_expression(single_element);
-                if element_could_alter_type_of_whole_tuple(single_element, single_element_ty, self)
-                {
-                    Some(TupleType::homogeneous(self.db(), todo_type!("PEP 646")))
-                } else {
-                    TupleType::heterogeneous(self.db(), std::iter::once(single_element_ty))
-                }
-            }
-        }
-    }
-
-    /// Given the slice of a `type[]` annotation, return the type that the annotation represents
-    fn infer_subclass_of_type_expression(&mut self, slice: &ast::Expr) -> Type<'db> {
-        match slice {
-            ast::Expr::Name(_) | ast::Expr::Attribute(_) => {
-                let name_ty = self.infer_expression(slice);
-                match name_ty {
-                    Type::ClassLiteral(class_literal) => {
-                        if class_literal.is_known(self.db(), KnownClass::Any) {
-                            SubclassOfType::subclass_of_any()
-                        } else if class_literal.is_protocol(self.db()) {
-                            SubclassOfType::from(
-                                self.db(),
-                                todo_type!("type[T] for protocols").expect_dynamic(),
-                            )
-                        } else {
-                            SubclassOfType::from(
-                                self.db(),
-                                class_literal.default_specialization(self.db()),
-                            )
-                        }
-                    }
-                    Type::SpecialForm(SpecialFormType::Unknown) => {
-                        SubclassOfType::subclass_of_unknown()
-                    }
-                    _ => todo_type!("unsupported type[X] special form"),
-                }
-            }
-            ast::Expr::BinOp(binary) if binary.op == ast::Operator::BitOr => {
-                let union_ty = UnionType::from_elements(
-                    self.db(),
-                    [
-                        self.infer_subclass_of_type_expression(&binary.left),
-                        self.infer_subclass_of_type_expression(&binary.right),
-                    ],
-                );
-                self.store_expression_type(slice, union_ty);
-
-                union_ty
-            }
-            ast::Expr::Tuple(_) => {
-                self.infer_type_expression(slice);
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, slice) {
-                    builder.into_diagnostic("type[...] must have exactly one type argument");
-                }
-                Type::unknown()
-            }
-            ast::Expr::Subscript(ast::ExprSubscript {
-                value,
-                slice: parameters,
-                ..
-            }) => {
-                let parameters_ty = match self.infer_expression(value) {
-                    Type::SpecialForm(SpecialFormType::Union) => match &**parameters {
-                        ast::Expr::Tuple(tuple) => {
-                            let ty = UnionType::from_elements(
-                                self.db(),
-                                tuple
-                                    .iter()
-                                    .map(|element| self.infer_subclass_of_type_expression(element)),
-                            );
-                            self.store_expression_type(parameters, ty);
-                            ty
-                        }
-                        _ => self.infer_subclass_of_type_expression(parameters),
-                    },
-                    _ => {
-                        self.infer_type_expression(parameters);
-                        todo_type!("unsupported nested subscript in type[X]")
-                    }
-                };
-                self.store_expression_type(slice, parameters_ty);
-                parameters_ty
-            }
-            // TODO: subscripts, etc.
-            _ => {
-                self.infer_type_expression(slice);
-                todo_type!("unsupported type[X] special form")
-            }
-        }
-    }
-
-    fn infer_subscript_type_expression(
-        &mut self,
-        subscript: &ast::ExprSubscript,
-        value_ty: Type<'db>,
-    ) -> Type<'db> {
-        let ast::ExprSubscript {
-            range: _,
-            node_index: _,
-            value: _,
-            slice,
-            ctx: _,
-        } = subscript;
-
-        match value_ty {
-            Type::Never => {
-                // This case can be entered when we use a type annotation like `Literal[1]`
-                // in unreachable code, since we infer `Never` for `Literal`.  We call
-                // `infer_expression` (instead of `infer_type_expression`) here to avoid
-                // false-positive `invalid-type-form` diagnostics (`1` is not a valid type
-                // expression).
-                self.infer_expression(&subscript.slice);
-                Type::unknown()
-            }
-            Type::ClassLiteral(literal) if literal.is_known(self.db(), KnownClass::Any) => {
-                self.infer_expression(slice);
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                    builder.into_diagnostic("Type `typing.Any` expected no type parameter");
-                }
-                Type::unknown()
-            }
-            Type::SpecialForm(special_form) => {
-                self.infer_parameterized_special_form_type_expression(subscript, special_form)
-            }
-            Type::KnownInstance(known_instance) => match known_instance {
-                KnownInstanceType::SubscriptedProtocol(_) => {
-                    self.infer_type_expression(&subscript.slice);
-                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                        builder.into_diagnostic(format_args!(
-                            "`typing.Protocol` is not allowed in type expressions",
-                        ));
-                    }
-                    Type::unknown()
-                }
-                KnownInstanceType::SubscriptedGeneric(_) => {
-                    self.infer_type_expression(&subscript.slice);
-                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                        builder.into_diagnostic(format_args!(
-                            "`typing.Generic` is not allowed in type expressions",
-                        ));
-                    }
-                    Type::unknown()
-                }
-                KnownInstanceType::Deprecated(_) => {
-                    self.infer_type_expression(&subscript.slice);
-                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                        builder.into_diagnostic(format_args!(
-                            "`warnings.deprecated` is not allowed in type expressions",
-                        ));
-                    }
-                    Type::unknown()
-                }
-                KnownInstanceType::Field(_) => {
-                    self.infer_type_expression(&subscript.slice);
-                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                        builder.into_diagnostic(format_args!(
-                            "`dataclasses.Field` is not allowed in type expressions",
-                        ));
-                    }
-                    Type::unknown()
-                }
-                KnownInstanceType::TypeVar(_) => {
-                    self.infer_type_expression(&subscript.slice);
-                    todo_type!("TypeVar annotations")
-                }
-                KnownInstanceType::TypeAliasType(_) => {
-                    self.infer_type_expression(&subscript.slice);
-                    todo_type!("Generic PEP-695 type alias")
-                }
-            },
-            Type::Dynamic(DynamicType::Todo(_)) => {
-                self.infer_type_expression(slice);
-                value_ty
-            }
-            Type::ClassLiteral(class) => {
-                match class.generic_context(self.db()) {
-                    Some(generic_context) => {
-                        let specialized_class = self.infer_explicit_class_specialization(
-                            subscript,
-                            value_ty,
-                            class,
-                            generic_context,
-                        );
-                        specialized_class
-                            .in_type_expression(
-                                self.db(),
-                                self.scope(),
-                                self.typevar_binding_context,
-                            )
-                            .unwrap_or(Type::unknown())
-                    }
-                    None => {
-                        // TODO: Once we know that e.g. `list` is generic, emit a diagnostic if you try to
-                        // specialize a non-generic class.
-                        self.infer_type_expression(slice);
-                        todo_type!("specialized non-generic class")
-                    }
-                }
-            }
-            _ => {
-                // TODO: Emit a diagnostic once we've implemented all valid subscript type
-                // expressions.
-                self.infer_type_expression(slice);
-                todo_type!("unknown type subscript")
-            }
-        }
-    }
-
-    fn infer_parameterized_legacy_typing_alias(
-        &mut self,
-        subscript_node: &ast::ExprSubscript,
-        expected_arg_count: usize,
-        alias: SpecialFormType,
-        class: KnownClass,
-    ) -> Type<'db> {
-        let arguments = &*subscript_node.slice;
-        let args = if let ast::Expr::Tuple(t) = arguments {
-            &*t.elts
-        } else {
-            std::slice::from_ref(arguments)
-        };
-        if args.len() != expected_arg_count {
-            if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript_node) {
-                let noun = if expected_arg_count == 1 {
-                    "argument"
-                } else {
-                    "arguments"
-                };
-                builder.into_diagnostic(format_args!(
-                    "Legacy alias `{alias}` expected exactly {expected_arg_count} {noun}, \
-                    got {}",
-                    args.len()
-                ));
-            }
-        }
-        let ty = class.to_specialized_instance(
-            self.db(),
-            args.iter().map(|node| self.infer_type_expression(node)),
-        );
-        if arguments.is_tuple_expr() {
-            self.store_expression_type(arguments, ty);
-        }
-        ty
-    }
-
-    fn infer_parameterized_special_form_type_expression(
-        &mut self,
-        subscript: &ast::ExprSubscript,
-        special_form: SpecialFormType,
-    ) -> Type<'db> {
-        let db = self.db();
-        let arguments_slice = &*subscript.slice;
-        match special_form {
-            SpecialFormType::Annotated => {
-                let ast::Expr::Tuple(ast::ExprTuple {
-                    elts: arguments, ..
-                }) = arguments_slice
-                else {
-                    report_invalid_arguments_to_annotated(&self.context, subscript);
-
-                    // `Annotated[]` with less than two arguments is an error at runtime.
-                    // However, we still treat `Annotated[T]` as `T` here for the purpose of
-                    // giving better diagnostics later on.
-                    // Pyright also does this. Mypy doesn't; it falls back to `Any` instead.
-                    return self.infer_type_expression(arguments_slice);
-                };
-
-                if arguments.len() < 2 {
-                    report_invalid_arguments_to_annotated(&self.context, subscript);
-                }
-
-                let [type_expr, metadata @ ..] = &arguments[..] else {
-                    for argument in arguments {
-                        self.infer_expression(argument);
-                    }
-                    self.store_expression_type(arguments_slice, Type::unknown());
-                    return Type::unknown();
-                };
-
-                for element in metadata {
-                    self.infer_expression(element);
-                }
-
-                let ty = self.infer_type_expression(type_expr);
-                self.store_expression_type(arguments_slice, ty);
-                ty
-            }
-            SpecialFormType::Literal => match self.infer_literal_parameter_type(arguments_slice) {
-                Ok(ty) => ty,
-                Err(nodes) => {
-                    for node in nodes {
-                        let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, node)
-                        else {
-                            continue;
-                        };
-                        builder.into_diagnostic(
-                            "Type arguments for `Literal` must be `None`, \
-                            a literal value (int, bool, str, or bytes), or an enum member",
-                        );
-                    }
-                    Type::unknown()
-                }
-            },
-            SpecialFormType::Optional => {
-                let param_type = self.infer_type_expression(arguments_slice);
-                UnionType::from_elements(db, [param_type, Type::none(db)])
-            }
-            SpecialFormType::Union => match arguments_slice {
-                ast::Expr::Tuple(t) => {
-                    let union_ty = UnionType::from_elements(
-                        db,
-                        t.iter().map(|elt| self.infer_type_expression(elt)),
-                    );
-                    self.store_expression_type(arguments_slice, union_ty);
-                    union_ty
-                }
-                _ => self.infer_type_expression(arguments_slice),
-            },
-            SpecialFormType::Callable => {
-                let mut arguments = match arguments_slice {
-                    ast::Expr::Tuple(tuple) => Either::Left(tuple.iter()),
-                    _ => {
-                        self.infer_callable_parameter_types(arguments_slice);
-                        Either::Right(std::iter::empty::<&ast::Expr>())
-                    }
-                };
-
-                let first_argument = arguments.next();
-
-                let parameters =
-                    first_argument.and_then(|arg| self.infer_callable_parameter_types(arg));
-
-                let return_type = arguments.next().map(|arg| self.infer_type_expression(arg));
-
-                let correct_argument_number = if let Some(third_argument) = arguments.next() {
-                    self.infer_type_expression(third_argument);
-                    for argument in arguments {
-                        self.infer_type_expression(argument);
-                    }
-                    false
-                } else {
-                    return_type.is_some()
-                };
-
-                if !correct_argument_number {
-                    report_invalid_arguments_to_callable(&self.context, subscript);
-                }
-
-                let callable_type = if let (Some(parameters), Some(return_type), true) =
-                    (parameters, return_type, correct_argument_number)
-                {
-                    CallableType::single(db, Signature::new(parameters, Some(return_type)))
-                } else {
-                    CallableType::unknown(db)
-                };
-
-                // `Signature` / `Parameters` are not a `Type` variant, so we're storing
-                // the outer callable type on these expressions instead.
-                self.store_expression_type(arguments_slice, callable_type);
-                if let Some(first_argument) = first_argument {
-                    self.store_expression_type(first_argument, callable_type);
-                }
-
-                callable_type
-            }
-
-            // `ty_extensions` special forms
-            SpecialFormType::Not => {
-                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
-                    &*tuple.elts
-                } else {
-                    std::slice::from_ref(arguments_slice)
-                };
-                let num_arguments = arguments.len();
-                let negated_type = if num_arguments == 1 {
-                    self.infer_type_expression(&arguments[0]).negate(db)
-                } else {
-                    for argument in arguments {
-                        self.infer_type_expression(argument);
-                    }
-                    report_invalid_argument_number_to_special_form(
-                        &self.context,
-                        subscript,
-                        special_form,
-                        num_arguments,
-                        1,
-                    );
-                    Type::unknown()
-                };
-                if arguments_slice.is_tuple_expr() {
-                    self.store_expression_type(arguments_slice, negated_type);
-                }
-                negated_type
-            }
-            SpecialFormType::Intersection => {
-                let elements = match arguments_slice {
-                    ast::Expr::Tuple(tuple) => Either::Left(tuple.iter()),
-                    element => Either::Right(std::iter::once(element)),
-                };
-
-                let ty = elements
-                    .fold(IntersectionBuilder::new(db), |builder, element| {
-                        builder.add_positive(self.infer_type_expression(element))
-                    })
-                    .build();
-
-                if matches!(arguments_slice, ast::Expr::Tuple(_)) {
-                    self.store_expression_type(arguments_slice, ty);
-                }
-                ty
-            }
-            SpecialFormType::TypeOf => {
-                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
-                    &*tuple.elts
-                } else {
-                    std::slice::from_ref(arguments_slice)
-                };
-                let num_arguments = arguments.len();
-                let type_of_type = if num_arguments == 1 {
-                    // N.B. This uses `infer_expression` rather than `infer_type_expression`
-                    self.infer_expression(&arguments[0])
-                } else {
-                    for argument in arguments {
-                        self.infer_type_expression(argument);
-                    }
-                    report_invalid_argument_number_to_special_form(
-                        &self.context,
-                        subscript,
-                        special_form,
-                        num_arguments,
-                        1,
-                    );
-                    Type::unknown()
-                };
-                if arguments_slice.is_tuple_expr() {
-                    self.store_expression_type(arguments_slice, type_of_type);
-                }
-                type_of_type
-            }
-
-            SpecialFormType::CallableTypeOf => {
-                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
-                    &*tuple.elts
-                } else {
-                    std::slice::from_ref(arguments_slice)
-                };
-                let num_arguments = arguments.len();
-
-                if num_arguments != 1 {
-                    for argument in arguments {
-                        self.infer_expression(argument);
-                    }
-                    report_invalid_argument_number_to_special_form(
-                        &self.context,
-                        subscript,
-                        special_form,
-                        num_arguments,
-                        1,
-                    );
-                    if arguments_slice.is_tuple_expr() {
-                        self.store_expression_type(arguments_slice, Type::unknown());
-                    }
-                    return Type::unknown();
-                }
-
-                let argument_type = self.infer_expression(&arguments[0]);
-                let bindings = argument_type.bindings(db);
-
-                // SAFETY: This is enforced by the constructor methods on `Bindings` even in
-                // the case of a non-callable union.
-                let callable_binding = bindings
-                    .into_iter()
-                    .next()
-                    .expect("`Bindings` should have at least one `CallableBinding`");
-
-                let mut signature_iter = callable_binding.into_iter().map(|binding| {
-                    if argument_type.is_bound_method() {
-                        binding.signature.bind_self(self.db(), Some(argument_type))
-                    } else {
-                        binding.signature.clone()
-                    }
-                });
-
-                let Some(signature) = signature_iter.next() else {
-                    if let Some(builder) = self
-                        .context
-                        .report_lint(&INVALID_TYPE_FORM, arguments_slice)
-                    {
-                        builder.into_diagnostic(format_args!(
-                            "Expected the first argument to `{special_form}` \
-                                 to be a callable object, \
-                                 but got an object of type `{actual_type}`",
-                            actual_type = argument_type.display(db)
-                        ));
-                    }
-                    if arguments_slice.is_tuple_expr() {
-                        self.store_expression_type(arguments_slice, Type::unknown());
-                    }
-                    return Type::unknown();
-                };
-
-                let signature = CallableSignature::from_overloads(
-                    std::iter::once(signature).chain(signature_iter),
-                );
-                let callable_type_of = Type::Callable(CallableType::new(db, signature, false));
-                if arguments_slice.is_tuple_expr() {
-                    self.store_expression_type(arguments_slice, callable_type_of);
-                }
-                callable_type_of
-            }
-
-            SpecialFormType::ChainMap => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                2,
-                SpecialFormType::ChainMap,
-                KnownClass::ChainMap,
-            ),
-            SpecialFormType::OrderedDict => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                2,
-                SpecialFormType::OrderedDict,
-                KnownClass::OrderedDict,
-            ),
-            SpecialFormType::Dict => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                2,
-                SpecialFormType::Dict,
-                KnownClass::Dict,
-            ),
-            SpecialFormType::List => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                1,
-                SpecialFormType::List,
-                KnownClass::List,
-            ),
-            SpecialFormType::DefaultDict => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                2,
-                SpecialFormType::DefaultDict,
-                KnownClass::DefaultDict,
-            ),
-            SpecialFormType::Counter => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                1,
-                SpecialFormType::Counter,
-                KnownClass::Counter,
-            ),
-            SpecialFormType::Set => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                1,
-                SpecialFormType::Set,
-                KnownClass::Set,
-            ),
-            SpecialFormType::FrozenSet => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                1,
-                SpecialFormType::FrozenSet,
-                KnownClass::FrozenSet,
-            ),
-            SpecialFormType::Deque => self.infer_parameterized_legacy_typing_alias(
-                subscript,
-                1,
-                SpecialFormType::Deque,
-                KnownClass::Deque,
-            ),
-
-            SpecialFormType::ReadOnly => {
-                self.infer_type_expression(arguments_slice);
-                todo_type!("`ReadOnly[]` type qualifier")
-            }
-            SpecialFormType::NotRequired => {
-                self.infer_type_expression(arguments_slice);
-                todo_type!("`NotRequired[]` type qualifier")
-            }
-            SpecialFormType::ClassVar | SpecialFormType::Final => {
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                    let diag = builder.into_diagnostic(format_args!(
-                        "Type qualifier `{special_form}` is not allowed in type expressions \
-                         (only in annotation expressions)",
-                    ));
-                    diagnostic::add_type_expression_reference_link(diag);
-                }
-                self.infer_type_expression(arguments_slice)
-            }
-            SpecialFormType::Required => {
-                self.infer_type_expression(arguments_slice);
-                todo_type!("`Required[]` type qualifier")
-            }
-            SpecialFormType::TypeIs => match arguments_slice {
-                ast::Expr::Tuple(_) => {
-                    self.infer_type_expression(arguments_slice);
-
-                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                        let diag = builder.into_diagnostic(format_args!(
-                            "Special form `{}` expected exactly one type parameter",
-                            special_form.repr()
-                        ));
-                        diagnostic::add_type_expression_reference_link(diag);
-                    }
-
-                    Type::unknown()
-                }
-                _ => TypeIsType::unbound(self.db(), self.infer_type_expression(arguments_slice)),
-            },
-            SpecialFormType::TypeGuard => {
-                self.infer_type_expression(arguments_slice);
-                todo_type!("`TypeGuard[]` special form")
-            }
-            SpecialFormType::Concatenate => {
-                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
-                    &*tuple.elts
-                } else {
-                    std::slice::from_ref(arguments_slice)
-                };
-                for argument in arguments {
-                    self.infer_type_expression(argument);
-                }
-                let num_arguments = arguments.len();
-                let inferred_type = if num_arguments < 2 {
-                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                        builder.into_diagnostic(format_args!(
-                            "Special form `{special_form}` expected at least 2 parameters but got {num_arguments}",
-                        ));
-                    }
-                    Type::unknown()
-                } else {
-                    todo_type!("`Concatenate[]` special form")
-                };
-                if arguments_slice.is_tuple_expr() {
-                    self.store_expression_type(arguments_slice, inferred_type);
-                }
-                inferred_type
-            }
-            SpecialFormType::Unpack => {
-                self.infer_type_expression(arguments_slice);
-                todo_type!("`Unpack[]` special form")
-            }
-            SpecialFormType::NoReturn
-            | SpecialFormType::Never
-            | SpecialFormType::AlwaysTruthy
-            | SpecialFormType::AlwaysFalsy => {
-                self.infer_type_expression(arguments_slice);
-
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                    builder.into_diagnostic(format_args!(
-                        "Type `{special_form}` expected no type parameter",
-                    ));
-                }
-                Type::unknown()
-            }
-            SpecialFormType::TypingSelf
-            | SpecialFormType::TypeAlias
-            | SpecialFormType::TypedDict
-            | SpecialFormType::Unknown
-            | SpecialFormType::NamedTuple => {
-                self.infer_type_expression(arguments_slice);
-
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                    builder.into_diagnostic(format_args!(
-                        "Special form `{special_form}` expected no type parameter",
-                    ));
-                }
-                Type::unknown()
-            }
-            SpecialFormType::LiteralString => {
-                self.infer_type_expression(arguments_slice);
-
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                    let mut diag = builder.into_diagnostic(format_args!(
-                        "Type `{special_form}` expected no type parameter",
-                    ));
-                    diag.info("Did you mean to use `Literal[...]` instead?");
-                }
-                Type::unknown()
-            }
-            SpecialFormType::Type => self.infer_subclass_of_type_expression(arguments_slice),
-            SpecialFormType::Tuple => {
-                Type::tuple(self.infer_tuple_type_expression(arguments_slice))
-            }
-            SpecialFormType::Generic | SpecialFormType::Protocol => {
-                self.infer_expression(arguments_slice);
-                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
-                    builder.into_diagnostic(format_args!(
-                        "`{special_form}` is not allowed in type expressions",
-                    ));
-                }
-                Type::unknown()
-            }
-        }
-    }
-
-    fn infer_literal_parameter_type<'param>(
-        &mut self,
-        parameters: &'param ast::Expr,
-    ) -> Result<Type<'db>, Vec<&'param ast::Expr>> {
-        Ok(match parameters {
-            // TODO handle type aliases
-            ast::Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
-                let value_ty = self.infer_expression(value);
-                if matches!(value_ty, Type::SpecialForm(SpecialFormType::Literal)) {
-                    let ty = self.infer_literal_parameter_type(slice)?;
-
-                    // This branch deals with annotations such as `Literal[Literal[1]]`.
-                    // Here, we store the type for the inner `Literal[1]` expression:
-                    self.store_expression_type(parameters, ty);
-                    ty
-                } else {
-                    self.infer_expression(slice);
-                    self.store_expression_type(parameters, Type::unknown());
-
-                    return Err(vec![parameters]);
-                }
-            }
-            ast::Expr::Tuple(tuple) if !tuple.parenthesized => {
-                let mut errors = vec![];
-                let mut builder = UnionBuilder::new(self.db());
-                for elt in tuple {
-                    match self.infer_literal_parameter_type(elt) {
-                        Ok(ty) => {
-                            builder = builder.add(ty);
-                        }
-                        Err(nodes) => {
-                            errors.extend(nodes);
-                        }
-                    }
-                }
-                if errors.is_empty() {
-                    let union_type = builder.build();
-
-                    // This branch deals with annotations such as `Literal[1, 2]`. Here, we
-                    // store the type for the inner `1, 2` tuple-expression:
-                    self.store_expression_type(parameters, union_type);
-
-                    union_type
-                } else {
-                    self.store_expression_type(parameters, Type::unknown());
-
-                    return Err(errors);
-                }
-            }
-
-            literal @ (ast::Expr::StringLiteral(_)
-            | ast::Expr::BytesLiteral(_)
-            | ast::Expr::BooleanLiteral(_)
-            | ast::Expr::NoneLiteral(_)) => self.infer_expression(literal),
-            literal @ ast::Expr::NumberLiteral(number) if number.value.is_int() => {
-                self.infer_expression(literal)
-            }
-            // For enum values
-            ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
-                let value_ty = self.infer_expression(value);
-
-                if is_enum_class(self.db(), value_ty) {
-                    let ty = value_ty
-                        .member(self.db(), &attr.id)
-                        .place
-                        .ignore_possibly_unbound()
-                        .unwrap_or(Type::unknown());
-                    self.store_expression_type(parameters, ty);
-                    ty
-                } else {
-                    self.store_expression_type(parameters, Type::unknown());
-                    if value_ty.is_todo() {
-                        value_ty
-                    } else {
-                        return Err(vec![parameters]);
-                    }
-                }
-            }
-            // for negative and positive numbers
-            ast::Expr::UnaryOp(u)
-                if matches!(u.op, ast::UnaryOp::USub | ast::UnaryOp::UAdd)
-                    && u.operand.is_number_literal_expr() =>
-            {
-                let ty = self.infer_unary_expression(u);
-                self.store_expression_type(parameters, ty);
-                ty
-            }
-            _ => {
-                self.infer_expression(parameters);
-                return Err(vec![parameters]);
-            }
-        })
-    }
-
-    /// Infer the first argument to a `typing.Callable` type expression and returns the
-    /// corresponding [`Parameters`].
-    ///
-    /// It returns `None` if the argument is invalid i.e., not a list of types, parameter
-    /// specification, `typing.Concatenate`, or `...`.
-    fn infer_callable_parameter_types(
-        &mut self,
-        parameters: &ast::Expr,
-    ) -> Option<Parameters<'db>> {
-        match parameters {
-            ast::Expr::EllipsisLiteral(ast::ExprEllipsisLiteral { .. }) => {
-                return Some(Parameters::gradual_form());
-            }
-            ast::Expr::List(ast::ExprList { elts: params, .. }) => {
-                let mut parameter_types = Vec::with_capacity(params.len());
-
-                // Whether to infer `Todo` for the parameters
-                let mut return_todo = false;
-
-                for param in params {
-                    let param_type = self.infer_type_expression(param);
-                    // This is similar to what we currently do for inferring tuple type expression.
-                    // We currently infer `Todo` for the parameters to avoid invalid diagnostics
-                    // when trying to check for assignability or any other relation. For example,
-                    // `*tuple[int, str]`, `Unpack[]`, etc. are not yet supported.
-                    return_todo |= param_type.is_todo()
-                        && matches!(param, ast::Expr::Starred(_) | ast::Expr::Subscript(_));
-                    parameter_types.push(param_type);
-                }
-
-                return Some(if return_todo {
-                    // TODO: `Unpack`
-                    Parameters::todo()
-                } else {
-                    Parameters::new(parameter_types.iter().map(|param_type| {
-                        Parameter::positional_only(None).with_annotated_type(*param_type)
-                    }))
-                });
-            }
-            ast::Expr::Subscript(subscript) => {
-                let value_ty = self.infer_expression(&subscript.value);
-                self.infer_subscript_type_expression(subscript, value_ty);
-                // TODO: Support `Concatenate[...]`
-                return Some(Parameters::todo());
-            }
-            ast::Expr::Name(name) => {
-                if name.is_invalid() {
-                    // This is a special case to avoid raising the error suggesting what the first
-                    // argument should be. This only happens when there's already a syntax error like
-                    // `Callable[]`.
-                    return None;
-                }
-                match self.infer_name_load(name) {
-                    Type::Dynamic(DynamicType::TodoPEP695ParamSpec) => {
-                        return Some(Parameters::todo());
-                    }
-                    Type::NominalInstance(nominal)
-                        if nominal
-                            .class(self.db())
-                            .is_known(self.db(), KnownClass::ParamSpec) =>
-                    {
-                        return Some(Parameters::todo());
-                    }
-                    _ => {}
-                }
-            }
-            _ => {}
-        }
-        if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, parameters) {
-            let diag = builder.into_diagnostic(format_args!(
-                "The first argument to `Callable` must be either a list of types, \
-                ParamSpec, Concatenate, or `...`",
-            ));
-            diagnostic::add_type_expression_reference_link(diag);
-        }
-        None
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum GenericContextError {
-    /// It's invalid to subscript `Generic` or `Protocol` with this type
-    InvalidArgument,
-    /// It's invalid to subscript `Generic` or `Protocol` with a variadic tuple type.
-    /// We should emit a diagnostic for this, but we don't yet.
-    VariadicTupleArguments,
-    /// It's valid to subscribe `Generic` or `Protocol` with this type,
-    /// but the type is not yet supported.
-    NotYetSupported,
-}
-
-impl GenericContextError {
-    const fn into_type<'db>(self) -> Type<'db> {
-        match self {
-            GenericContextError::InvalidArgument | GenericContextError::VariadicTupleArguments => {
-                Type::unknown()
-            }
-            GenericContextError::NotYetSupported => todo_type!("ParamSpecs and TypeVarTuples"),
-        }
-    }
-}
-
-/// The deferred state of a specific expression in an inference region.
-#[derive(Default, Debug, Clone, Copy)]
-enum DeferredExpressionState {
-    /// The expression is not deferred.
-    #[default]
-    None,
-
-    /// The expression is deferred.
-    ///
-    /// In the following example,
-    /// ```py
-    /// from __future__ import annotation
-    ///
-    /// a: tuple[int, "ForwardRef"] = ...
-    /// ```
-    ///
-    /// The expression `tuple` and `int` are deferred but `ForwardRef` (after parsing) is both
-    /// deferred and in a string annotation context.
-    Deferred,
-
-    /// The expression is in a string annotation context.
-    ///
-    /// This is required to differentiate between a deferred annotation and a string annotation.
-    /// The former can occur when there's a `from __future__ import annotations` statement or we're
-    /// in a stub file.
-    ///
-    /// In the following example,
-    /// ```py
-    /// a: "List[int]" = ...
-    /// b: tuple[int, "ForwardRef"] = ...
-    /// ```
-    ///
-    /// The annotation of `a` is completely inside a string while for `b`, it's only partially
-    /// stringified.
-    ///
-    /// This variant wraps a [`NodeKey`] that allows us to retrieve the original
-    /// [`ast::ExprStringLiteral`] node which created the string annotation.
-    InStringAnnotation(NodeKey),
-}
-
-impl DeferredExpressionState {
-    const fn is_deferred(self) -> bool {
-        matches!(
-            self,
-            DeferredExpressionState::Deferred | DeferredExpressionState::InStringAnnotation(_)
-        )
-    }
-
-    const fn in_string_annotation(self) -> bool {
-        matches!(self, DeferredExpressionState::InStringAnnotation(_))
-    }
-}
-
-impl From<bool> for DeferredExpressionState {
-    fn from(value: bool) -> Self {
-        if value {
-            DeferredExpressionState::Deferred
-        } else {
-            DeferredExpressionState::None
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum RichCompareOperator {
-    Eq,
-    Ne,
-    Gt,
-    Ge,
-    Lt,
-    Le,
-}
-
-impl From<RichCompareOperator> for ast::CmpOp {
-    fn from(value: RichCompareOperator) -> Self {
-        match value {
-            RichCompareOperator::Eq => ast::CmpOp::Eq,
-            RichCompareOperator::Ne => ast::CmpOp::NotEq,
-            RichCompareOperator::Lt => ast::CmpOp::Lt,
-            RichCompareOperator::Le => ast::CmpOp::LtE,
-            RichCompareOperator::Gt => ast::CmpOp::Gt,
-            RichCompareOperator::Ge => ast::CmpOp::GtE,
-        }
-    }
-}
-
-impl RichCompareOperator {
-    #[must_use]
-    const fn dunder(self) -> &'static str {
-        match self {
-            RichCompareOperator::Eq => "__eq__",
-            RichCompareOperator::Ne => "__ne__",
-            RichCompareOperator::Lt => "__lt__",
-            RichCompareOperator::Le => "__le__",
-            RichCompareOperator::Gt => "__gt__",
-            RichCompareOperator::Ge => "__ge__",
-        }
-    }
-
-    #[must_use]
-    const fn reflect(self) -> Self {
-        match self {
-            RichCompareOperator::Eq => RichCompareOperator::Eq,
-            RichCompareOperator::Ne => RichCompareOperator::Ne,
-            RichCompareOperator::Lt => RichCompareOperator::Gt,
-            RichCompareOperator::Le => RichCompareOperator::Ge,
-            RichCompareOperator::Gt => RichCompareOperator::Lt,
-            RichCompareOperator::Ge => RichCompareOperator::Le,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum MembershipTestCompareOperator {
-    In,
-    NotIn,
-}
-
-impl From<MembershipTestCompareOperator> for ast::CmpOp {
-    fn from(value: MembershipTestCompareOperator) -> Self {
-        match value {
-            MembershipTestCompareOperator::In => ast::CmpOp::In,
-            MembershipTestCompareOperator::NotIn => ast::CmpOp::NotIn,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-struct CompareUnsupportedError<'db> {
-    op: ast::CmpOp,
-    left_ty: Type<'db>,
-    right_ty: Type<'db>,
-}
-
-fn format_import_from_module(level: u32, module: Option<&str>) -> String {
-    format!(
-        "{}{}",
-        ".".repeat(level as usize),
-        module.unwrap_or_default()
-    )
-}
-
-/// Struct collecting string parts when inferring a formatted string. Infers a string literal if the
-/// concatenated string is small enough, otherwise infers a literal string.
-///
-/// If the formatted string contains an expression (with a representation unknown at compile time),
-/// infers an instance of `builtins.str`.
-#[derive(Debug)]
-struct StringPartsCollector {
-    concatenated: Option<String>,
-    expression: bool,
-}
-
-impl StringPartsCollector {
-    fn new() -> Self {
-        Self {
-            concatenated: Some(String::new()),
-            expression: false,
-        }
-    }
-
-    fn push_str(&mut self, literal: &str) {
-        if let Some(mut concatenated) = self.concatenated.take() {
-            if concatenated.len().saturating_add(literal.len())
-                <= TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE
-            {
-                concatenated.push_str(literal);
-                self.concatenated = Some(concatenated);
-            } else {
-                self.concatenated = None;
-            }
-        }
-    }
-
-    fn add_expression(&mut self) {
-        self.concatenated = None;
-        self.expression = true;
-    }
-
-    fn string_type(self, db: &dyn Db) -> Type<'_> {
-        if self.expression {
-            KnownClass::Str.to_instance(db)
-        } else if let Some(concatenated) = self.concatenated {
-            Type::string_literal(db, &concatenated)
-        } else {
-            Type::LiteralString
-        }
-    }
-}
-
-fn contains_string_literal(expr: &ast::Expr) -> bool {
-    struct ContainsStringLiteral(bool);
-
-    impl<'a> Visitor<'a> for ContainsStringLiteral {
-        fn visit_expr(&mut self, expr: &'a ast::Expr) {
-            self.0 |= matches!(expr, ast::Expr::StringLiteral(_));
-            walk_expr(self, expr);
-        }
-    }
-
-    let mut visitor = ContainsStringLiteral(false);
-    visitor.visit_expr(expr);
-    visitor.0
-}
-
-/// Map based on a `Vec`. It doesn't enforce
-/// uniqueness on insertion. Instead, it relies on the caller
-/// that elements are unique. For example, the way we visit definitions
-/// in the `TypeInference` builder already implicitly guarantees that each definition
-/// is only visited once.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-struct VecMap<K, V>(Vec<(K, V)>);
-
-impl<K, V> VecMap<K, V>
-where
-    K: Eq,
-    K: std::fmt::Debug,
-    V: std::fmt::Debug,
-{
-    #[inline]
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    #[inline]
-    fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    fn iter(&self) -> impl ExactSizeIterator<Item = (&K, &V)> {
-        self.0.iter().map(|(k, v)| (k, v))
-    }
-
-    fn insert(&mut self, key: K, value: V) {
-        debug_assert!(
-            !self.0.iter().any(|(existing, _)| existing == &key),
-            "An existing entry already exists for key {key:?}",
-        );
-
-        self.0.push((key, value));
-    }
-
-    fn into_boxed_slice(self) -> Box<[(K, V)]> {
-        self.0.into_boxed_slice()
-    }
-}
-
-impl<K, V> Extend<(K, V)> for VecMap<K, V>
-where
-    K: Eq,
-    K: std::fmt::Debug,
-    V: std::fmt::Debug,
-{
-    #[inline]
-    fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) {
-        if cfg!(debug_assertions) {
-            for (key, value) in iter {
-                self.insert(key, value);
-            }
-        } else {
-            self.0.extend(iter);
-        }
-    }
-}
-
-impl<K, V> Default for VecMap<K, V> {
-    fn default() -> Self {
-        Self(Vec::default())
-    }
-}
-
-/// Set based on a `Vec`. It doesn't enforce
-/// uniqueness on insertion. Instead, it relies on the caller
-/// that elements are uniuqe. For example, the way we visit definitions
-/// in the `TypeInference` builder make already implicitly guarantees that each definition
-/// is only visited once.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-struct VecSet<V>(Vec<V>);
-
-impl<V> VecSet<V> {
-    #[inline]
-    fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    fn into_boxed_slice(self) -> Box<[V]> {
-        self.0.into_boxed_slice()
-    }
-}
-
-impl<V> VecSet<V>
-where
-    V: Eq,
-    V: std::fmt::Debug,
-{
-    fn insert(&mut self, value: V) {
-        debug_assert!(
-            !self.0.iter().any(|existing| existing == &value),
-            "An existing entry already exists for {value:?}",
-        );
-
-        self.0.push(value);
-    }
-}
-
-impl<V> Extend<V> for VecSet<V>
-where
-    V: Eq,
-    V: std::fmt::Debug,
-{
-    #[inline]
-    fn extend<T: IntoIterator<Item = V>>(&mut self, iter: T) {
-        if cfg!(debug_assertions) {
-            for value in iter {
-                self.insert(value);
-            }
-        } else {
-            self.0.extend(iter);
-        }
-    }
-}
-
-impl<V> Default for VecSet<V> {
-    fn default() -> Self {
-        Self(Vec::default())
-    }
-}
-
-impl<V> IntoIterator for VecSet<V> {
-    type Item = V;
-    type IntoIter = std::vec::IntoIter<V>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::db::tests::{TestDb, setup_db};
-    use crate::place::{global_symbol, symbol};
-    use crate::semantic_index::definition::Definition;
-    use crate::semantic_index::scope::FileScopeId;
-    use crate::semantic_index::{global_scope, place_table, semantic_index, use_def_map};
-    use crate::types::check_types;
-    use ruff_db::diagnostic::Diagnostic;
-    use ruff_db::files::{File, system_path_to_file};
-    use ruff_db::system::DbWithWritableSystem as _;
-    use ruff_db::testing::{assert_function_query_was_not_run, assert_function_query_was_run};
-
-    use super::*;
-
-    #[track_caller]
-    fn get_symbol<'db>(
-        db: &'db TestDb,
-        file_name: &str,
-        scopes: &[&str],
-        symbol_name: &str,
-    ) -> Place<'db> {
-        let file = system_path_to_file(db, file_name).expect("file to exist");
-        let module = parsed_module(db, file).load(db);
-        let index = semantic_index(db, file);
-        let mut file_scope_id = FileScopeId::global();
-        let mut scope = file_scope_id.to_scope_id(db, file);
-        for expected_scope_name in scopes {
-            file_scope_id = index
-                .child_scopes(file_scope_id)
-                .next()
-                .unwrap_or_else(|| panic!("scope of {expected_scope_name}"))
-                .0;
-            scope = file_scope_id.to_scope_id(db, file);
-            assert_eq!(scope.name(db, &module), *expected_scope_name);
-        }
-
-        symbol(db, scope, symbol_name, ConsideredDefinitions::EndOfScope).place
-    }
-
-    #[track_caller]
-    fn assert_diagnostic_messages(diagnostics: &[Diagnostic], expected: &[&str]) {
-        let messages: Vec<&str> = diagnostics
-            .iter()
-            .map(Diagnostic::primary_message)
-            .collect();
-        assert_eq!(&messages, expected);
-    }
-
-    #[track_caller]
-    fn assert_file_diagnostics(db: &TestDb, filename: &str, expected: &[&str]) {
-        let file = system_path_to_file(db, filename).unwrap();
-        let diagnostics = check_types(db, file);
-
-        assert_diagnostic_messages(&diagnostics, expected);
-    }
-
-    #[test]
-    fn not_literal_string() -> anyhow::Result<()> {
-        let mut db = setup_db();
-        let content = format!(
-            r#"
-            from typing_extensions import Literal, assert_type
-
-            assert_type(not "{y}", bool)
-            assert_type(not 10*"{y}", bool)
-            assert_type(not "{y}"*10, bool)
-            assert_type(not 0*"{y}", Literal[True])
-            assert_type(not (-100)*"{y}", Literal[True])
-            "#,
-            y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
-        );
-        db.write_dedented("src/a.py", &content)?;
-
-        assert_file_diagnostics(&db, "src/a.py", &[]);
-
-        Ok(())
-    }
-
-    #[test]
-    fn multiplied_string() -> anyhow::Result<()> {
-        let mut db = setup_db();
-        let content = format!(
-            r#"
-            from typing_extensions import Literal, LiteralString, assert_type
-
-            assert_type(2 * "hello", Literal["hellohello"])
-            assert_type("goodbye" * 3, Literal["goodbyegoodbyegoodbye"])
-            assert_type("a" * {y}, Literal["{a_repeated}"])
-            assert_type({z} * "b", LiteralString)
-            assert_type(0 * "hello", Literal[""])
-            assert_type(-3 * "hello", Literal[""])
-            "#,
-            y = TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE,
-            z = TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1,
-            a_repeated = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE),
-        );
-        db.write_dedented("src/a.py", &content)?;
-
-        assert_file_diagnostics(&db, "src/a.py", &[]);
-
-        Ok(())
-    }
-
-    #[test]
-    fn multiplied_literal_string() -> anyhow::Result<()> {
-        let mut db = setup_db();
-        let content = format!(
-            r#"
-            from typing_extensions import Literal, LiteralString, assert_type
-
-            assert_type("{y}", LiteralString)
-            assert_type(10*"{y}", LiteralString)
-            assert_type("{y}"*10, LiteralString)
-            assert_type(0*"{y}", Literal[""])
-            assert_type((-100)*"{y}", Literal[""])
-            "#,
-            y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
-        );
-        db.write_dedented("src/a.py", &content)?;
-
-        assert_file_diagnostics(&db, "src/a.py", &[]);
-
-        Ok(())
-    }
-
-    #[test]
-    fn truncated_string_literals_become_literal_string() -> anyhow::Result<()> {
-        let mut db = setup_db();
-        let content = format!(
-            r#"
-            from typing_extensions import LiteralString, assert_type
-
-            assert_type("{y}", LiteralString)
-            assert_type("a" + "{z}", LiteralString)
-            "#,
-            y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
-            z = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE),
-        );
-        db.write_dedented("src/a.py", &content)?;
-
-        assert_file_diagnostics(&db, "src/a.py", &[]);
-
-        Ok(())
-    }
-
-    #[test]
-    fn adding_string_literals_and_literal_string() -> anyhow::Result<()> {
-        let mut db = setup_db();
-        let content = format!(
-            r#"
-            from typing_extensions import LiteralString, assert_type
-
-            assert_type("{y}", LiteralString)
-            assert_type("{y}" + "a", LiteralString)
-            assert_type("a" + "{y}", LiteralString)
-            assert_type("{y}" + "{y}", LiteralString)
-            "#,
-            y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
-        );
-        db.write_dedented("src/a.py", &content)?;
-
-        assert_file_diagnostics(&db, "src/a.py", &[]);
-
-        Ok(())
-    }
-
-    #[test]
-    fn pep695_type_params() {
-        let mut db = setup_db();
-
-        db.write_dedented(
-            "src/a.py",
-            "
-            def f[T, U: A, V: (A, B), W = A, X: A = A1, Y: (int,)]():
-                pass
-
-            class A: ...
-            class B: ...
-            class A1(A): ...
-            ",
-        )
-        .unwrap();
-
-        let check_typevar = |var: &'static str,
-                             display: &'static str,
-                             upper_bound: Option<&'static str>,
-                             constraints: Option<&[&'static str]>,
-                             default: Option<&'static str>| {
-            let var_ty = get_symbol(&db, "src/a.py", &["f"], var).expect_type();
-            assert_eq!(var_ty.display(&db).to_string(), display);
-
-            let expected_name_ty = format!(r#"Literal["{var}"]"#);
-            let name_ty = var_ty.member(&db, "__name__").place.expect_type();
-            assert_eq!(name_ty.display(&db).to_string(), expected_name_ty);
-
-            let Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) = var_ty else {
-                panic!("expected TypeVar");
-            };
-
-            assert_eq!(
-                typevar
-                    .upper_bound(&db)
-                    .map(|ty| ty.display(&db).to_string()),
-                upper_bound.map(std::borrow::ToOwned::to_owned)
-            );
-            assert_eq!(
-                typevar.constraints(&db).map(|tys| tys
-                    .iter()
-                    .map(|ty| ty.display(&db).to_string())
-                    .collect::<Vec<_>>()),
-                constraints.map(|strings| strings
-                    .iter()
-                    .map(std::string::ToString::to_string)
-                    .collect::<Vec<_>>())
-            );
-            assert_eq!(
-                typevar
-                    .default_type(&db)
-                    .map(|ty| ty.display(&db).to_string()),
-                default.map(std::borrow::ToOwned::to_owned)
-            );
-        };
-
-        check_typevar("T", "typing.TypeVar", None, None, None);
-        check_typevar("U", "typing.TypeVar", Some("A"), None, None);
-        check_typevar("V", "typing.TypeVar", None, Some(&["A", "B"]), None);
-        check_typevar("W", "typing.TypeVar", None, None, Some("A"));
-        check_typevar("X", "typing.TypeVar", Some("A"), None, Some("A1"));
-
-        // a typevar with less than two constraints is treated as unconstrained
-        check_typevar("Y", "typing.TypeVar", None, None, None);
-    }
-
-    /// Test that a symbol known to be unbound in a scope does not still trigger cycle-causing
-    /// reachability-constraint checks in that scope.
-    #[test]
-    fn unbound_symbol_no_reachability_constraint_check() {
-        let mut db = setup_db();
-
-        // If the bug we are testing for is not fixed, what happens is that when inferring the
-        // `flag: bool = True` definitions, we look up `bool` as a deferred name (thus from end of
-        // scope), and because of the early return its "unbound" binding has a reachability
-        // constraint of `~flag`, which we evaluate, meaning we have to evaluate the definition of
-        // `flag` -- and we are in a cycle. With the fix, we short-circuit evaluating reachability
-        // constraints on "unbound" if a symbol is otherwise not bound.
-        db.write_dedented(
-            "src/a.py",
-            "
-            from __future__ import annotations
-
-            def f():
-                flag: bool = True
-                if flag:
-                    return True
-            ",
-        )
-        .unwrap();
-
-        db.clear_salsa_events();
-        assert_file_diagnostics(&db, "src/a.py", &[]);
-        let events = db.take_salsa_events();
-        let cycles = salsa::attach(&db, || {
-            events
-                .iter()
-                .filter_map(|event| {
-                    if let salsa::EventKind::WillIterateCycle { database_key, .. } = event.kind {
-                        Some(format!("{database_key:?}"))
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>()
-        });
-        let expected: Vec<String> = vec![];
-        assert_eq!(cycles, expected);
-    }
-
-    // Incremental inference tests
-    #[track_caller]
-    fn first_public_binding<'db>(db: &'db TestDb, file: File, name: &str) -> Definition<'db> {
-        let scope = global_scope(db, file);
-        use_def_map(db, scope)
-            .end_of_scope_symbol_bindings(place_table(db, scope).symbol_id(name).unwrap())
-            .find_map(|b| b.binding.definition())
-            .expect("no binding found")
-    }
-
-    #[test]
-    fn dependency_public_symbol_type_change() -> anyhow::Result<()> {
-        let mut db = setup_db();
-
-        db.write_files([
-            ("/src/a.py", "from foo import x"),
-            ("/src/foo.py", "x: int = 10\ndef foo(): ..."),
-        ])?;
-
-        let a = system_path_to_file(&db, "/src/a.py").unwrap();
-        let x_ty = global_symbol(&db, a, "x").place.expect_type();
-
-        assert_eq!(x_ty.display(&db).to_string(), "int");
-
-        // Change `x` to a different value
-        db.write_file("/src/foo.py", "x: bool = True\ndef foo(): ...")?;
-
-        let a = system_path_to_file(&db, "/src/a.py").unwrap();
-
-        let x_ty_2 = global_symbol(&db, a, "x").place.expect_type();
-
-        assert_eq!(x_ty_2.display(&db).to_string(), "bool");
-
-        Ok(())
-    }
-
-    #[test]
-    fn dependency_internal_symbol_change() -> anyhow::Result<()> {
-        let mut db = setup_db();
-
-        db.write_files([
-            ("/src/a.py", "from foo import x"),
-            ("/src/foo.py", "x: int = 10\ndef foo(): y = 1"),
-        ])?;
-
-        let a = system_path_to_file(&db, "/src/a.py").unwrap();
-        let x_ty = global_symbol(&db, a, "x").place.expect_type();
-
-        assert_eq!(x_ty.display(&db).to_string(), "int");
-
-        db.write_file("/src/foo.py", "x: int = 10\ndef foo(): pass")?;
-
-        let a = system_path_to_file(&db, "/src/a.py").unwrap();
-
-        db.clear_salsa_events();
-
-        let x_ty_2 = global_symbol(&db, a, "x").place.expect_type();
-
-        assert_eq!(x_ty_2.display(&db).to_string(), "int");
-
-        let events = db.take_salsa_events();
-
-        assert_function_query_was_not_run(
-            &db,
-            infer_definition_types,
-            first_public_binding(&db, a, "x"),
-            &events,
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn dependency_unrelated_symbol() -> anyhow::Result<()> {
-        let mut db = setup_db();
-
-        db.write_files([
-            ("/src/a.py", "from foo import x"),
-            ("/src/foo.py", "x: int = 10\ny: bool = True"),
-        ])?;
-
-        let a = system_path_to_file(&db, "/src/a.py").unwrap();
-        let x_ty = global_symbol(&db, a, "x").place.expect_type();
-
-        assert_eq!(x_ty.display(&db).to_string(), "int");
-
-        db.write_file("/src/foo.py", "x: int = 10\ny: bool = False")?;
-
-        let a = system_path_to_file(&db, "/src/a.py").unwrap();
-
-        db.clear_salsa_events();
-
-        let x_ty_2 = global_symbol(&db, a, "x").place.expect_type();
-
-        assert_eq!(x_ty_2.display(&db).to_string(), "int");
-
-        let events = db.take_salsa_events();
-
-        assert_function_query_was_not_run(
-            &db,
-            infer_definition_types,
-            first_public_binding(&db, a, "x"),
-            &events,
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn dependency_implicit_instance_attribute() -> anyhow::Result<()> {
-        fn x_rhs_expression(db: &TestDb) -> Expression<'_> {
-            let file_main = system_path_to_file(db, "/src/main.py").unwrap();
-            let ast = parsed_module(db, file_main).load(db);
-            // Get the second statement in `main.py` (x = …) and extract the expression
-            // node on the right-hand side:
-            let x_rhs_node = &ast.syntax().body[1].as_assign_stmt().unwrap().value;
-
-            let index = semantic_index(db, file_main);
-            index.expression(x_rhs_node.as_ref())
-        }
-
-        let mut db = setup_db();
-
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                def f(self):
-                    self.attr: int | None = None
-            "#,
-        )?;
-        db.write_dedented(
-            "/src/main.py",
-            r#"
-            from mod import C
-            x = C().attr
-            "#,
-        )?;
-
-        let file_main = system_path_to_file(&db, "/src/main.py").unwrap();
-        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-        assert_eq!(attr_ty.display(&db).to_string(), "Unknown | int | None");
-
-        // Change the type of `attr` to `str | None`; this should trigger the type of `x` to be re-inferred
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                def f(self):
-                    self.attr: str | None = None
-            "#,
-        )?;
-
-        let events = {
-            db.clear_salsa_events();
-            let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-            assert_eq!(attr_ty.display(&db).to_string(), "Unknown | str | None");
-            db.take_salsa_events()
-        };
-        assert_function_query_was_run(&db, infer_expression_types, x_rhs_expression(&db), &events);
-
-        // Add a comment; this should not trigger the type of `x` to be re-inferred
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                def f(self):
-                    # a comment!
-                    self.attr: str | None = None
-            "#,
-        )?;
-
-        let events = {
-            db.clear_salsa_events();
-            let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-            assert_eq!(attr_ty.display(&db).to_string(), "Unknown | str | None");
-            db.take_salsa_events()
-        };
-
-        assert_function_query_was_not_run(
-            &db,
-            infer_expression_types,
-            x_rhs_expression(&db),
-            &events,
-        );
-
-        Ok(())
-    }
-
-    /// This test verifies that changing a class's declaration in a non-meaningful way (e.g. by adding a comment)
-    /// doesn't trigger type inference for expressions that depend on the class's members.
-    #[test]
-    fn dependency_own_instance_member() -> anyhow::Result<()> {
-        fn x_rhs_expression(db: &TestDb) -> Expression<'_> {
-            let file_main = system_path_to_file(db, "/src/main.py").unwrap();
-            let ast = parsed_module(db, file_main).load(db);
-            // Get the second statement in `main.py` (x = …) and extract the expression
-            // node on the right-hand side:
-            let x_rhs_node = &ast.syntax().body[1].as_assign_stmt().unwrap().value;
-
-            let index = semantic_index(db, file_main);
-            index.expression(x_rhs_node.as_ref())
-        }
-
-        let mut db = setup_db();
-
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                if random.choice([True, False]):
-                    attr: int = 42
-                else:
-                    attr: None = None
-            "#,
-        )?;
-        db.write_dedented(
-            "/src/main.py",
-            r#"
-            from mod import C
-            x = C().attr
-            "#,
-        )?;
-
-        let file_main = system_path_to_file(&db, "/src/main.py").unwrap();
-        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-        assert_eq!(attr_ty.display(&db).to_string(), "Unknown | int | None");
-
-        // Change the type of `attr` to `str | None`; this should trigger the type of `x` to be re-inferred
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                if random.choice([True, False]):
-                    attr: str = "42"
-                else:
-                    attr: None = None
-            "#,
-        )?;
-
-        let events = {
-            db.clear_salsa_events();
-            let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-            assert_eq!(attr_ty.display(&db).to_string(), "Unknown | str | None");
-            db.take_salsa_events()
-        };
-        assert_function_query_was_run(&db, infer_expression_types, x_rhs_expression(&db), &events);
-
-        // Add a comment; this should not trigger the type of `x` to be re-inferred
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                # comment
-                if random.choice([True, False]):
-                    attr: str = "42"
-                else:
-                    attr: None = None
-            "#,
-        )?;
-
-        let events = {
-            db.clear_salsa_events();
-            let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-            assert_eq!(attr_ty.display(&db).to_string(), "Unknown | str | None");
-            db.take_salsa_events()
-        };
-
-        assert_function_query_was_not_run(
-            &db,
-            infer_expression_types,
-            x_rhs_expression(&db),
-            &events,
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn dependency_implicit_class_member() -> anyhow::Result<()> {
-        fn x_rhs_expression(db: &TestDb) -> Expression<'_> {
-            let file_main = system_path_to_file(db, "/src/main.py").unwrap();
-            let ast = parsed_module(db, file_main).load(db);
-            // Get the third statement in `main.py` (x = …) and extract the expression
-            // node on the right-hand side:
-            let x_rhs_node = &ast.syntax().body[2].as_assign_stmt().unwrap().value;
-
-            let index = semantic_index(db, file_main);
-            index.expression(x_rhs_node.as_ref())
-        }
-
-        let mut db = setup_db();
-
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                def __init__(self):
-                    self.instance_attr: str = "24"
-
-                @classmethod
-                def method(cls):
-                    cls.class_attr: int = 42
-            "#,
-        )?;
-        db.write_dedented(
-            "/src/main.py",
-            r#"
-            from mod import C
-            C.method()
-            x = C().class_attr
-            "#,
-        )?;
-
-        let file_main = system_path_to_file(&db, "/src/main.py").unwrap();
-        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-        assert_eq!(attr_ty.display(&db).to_string(), "Unknown | int");
-
-        // Change the type of `class_attr` to `str`; this should trigger the type of `x` to be re-inferred
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                def __init__(self):
-                    self.instance_attr: str = "24"
-
-                @classmethod
-                def method(cls):
-                    cls.class_attr: str = "42"
-            "#,
-        )?;
-
-        let events = {
-            db.clear_salsa_events();
-            let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-            assert_eq!(attr_ty.display(&db).to_string(), "Unknown | str");
-            db.take_salsa_events()
-        };
-        assert_function_query_was_run(&db, infer_expression_types, x_rhs_expression(&db), &events);
-
-        // Add a comment; this should not trigger the type of `x` to be re-inferred
-        db.write_dedented(
-            "/src/mod.py",
-            r#"
-            class C:
-                def __init__(self):
-                    self.instance_attr: str = "24"
-
-                @classmethod
-                def method(cls):
-                    # comment
-                    cls.class_attr: str = "42"
-            "#,
-        )?;
-
-        let events = {
-            db.clear_salsa_events();
-            let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
-            assert_eq!(attr_ty.display(&db).to_string(), "Unknown | str");
-            db.take_salsa_events()
-        };
-
-        assert_function_query_was_not_run(
-            &db,
-            infer_expression_types,
-            x_rhs_expression(&db),
-            &events,
-        );
-
-        Ok(())
+            .map(|e| e.all_definitely_bound)
+            .unwrap_or(true)
     }
 }
diff --git a/crates/ty_python_semantic/src/types/infer/builder.rs b/crates/ty_python_semantic/src/types/infer/builder.rs
new file mode 100644
index 0000000000..9eae531590
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/infer/builder.rs
@@ -0,0 +1,10473 @@
+use std::{iter, mem};
+
+use itertools::{Either, Itertools};
+use ruff_db::diagnostic::{Annotation, DiagnosticId, Severity};
+use ruff_db::files::File;
+use ruff_db::parsed::ParsedModuleRef;
+use ruff_python_ast::visitor::{Visitor, walk_expr};
+use ruff_python_ast::{self as ast, AnyNodeRef, ExprContext, PythonVersion};
+use ruff_python_stdlib::builtins::version_builtin_was_added;
+use ruff_text_size::{Ranged, TextRange};
+use rustc_hash::{FxHashMap, FxHashSet};
+use smallvec::SmallVec;
+
+use super::{
+    CycleRecovery, DefinitionInference, DefinitionInferenceExtra, ExpressionInference,
+    ExpressionInferenceExtra, InferenceRegion, ScopeInference, ScopeInferenceExtra,
+    infer_deferred_types, infer_definition_types, infer_expression_types,
+    infer_same_file_expression_type, infer_scope_types, infer_unpack_types,
+};
+use crate::diagnostic::format_enumeration;
+use crate::module_name::{ModuleName, ModuleNameResolutionError};
+use crate::module_resolver::{
+    KnownModule, ModuleResolveMode, file_to_module, resolve_module, search_paths,
+};
+use crate::node_key::NodeKey;
+use crate::place::{
+    ConsideredDefinitions, Definedness, LookupError, Place, PlaceAndQualifiers, TypeOrigin,
+    builtins_module_scope, builtins_symbol, explicit_global_symbol, global_symbol,
+    module_type_implicit_global_declaration, module_type_implicit_global_symbol, place,
+    place_from_bindings, place_from_declarations, typing_extensions_symbol,
+};
+use crate::semantic_index::ast_ids::node_key::ExpressionNodeKey;
+use crate::semantic_index::ast_ids::{HasScopedUseId, ScopedUseId};
+use crate::semantic_index::definition::{
+    AnnotatedAssignmentDefinitionKind, AssignmentDefinitionKind, ComprehensionDefinitionKind,
+    Definition, DefinitionKind, DefinitionNodeKey, DefinitionState, ExceptHandlerDefinitionKind,
+    ForStmtDefinitionKind, TargetKind, WithItemDefinitionKind,
+};
+use crate::semantic_index::expression::{Expression, ExpressionKind};
+use crate::semantic_index::narrowing_constraints::ConstraintKey;
+use crate::semantic_index::place::{PlaceExpr, PlaceExprRef};
+use crate::semantic_index::scope::{
+    FileScopeId, NodeWithScopeKind, NodeWithScopeRef, ScopeId, ScopeKind,
+};
+use crate::semantic_index::symbol::{ScopedSymbolId, Symbol};
+use crate::semantic_index::{
+    ApplicableConstraints, EnclosingSnapshotResult, SemanticIndex, place_table,
+};
+use crate::subscript::{PyIndex, PySlice};
+use crate::types::call::bind::MatchingOverloadIndex;
+use crate::types::call::{Binding, Bindings, CallArguments, CallError, CallErrorKind};
+use crate::types::class::{CodeGeneratorKind, FieldKind, MetaclassErrorKind, MethodDecorator};
+use crate::types::context::{InNoTypeCheck, InferContext};
+use crate::types::cyclic::CycleDetector;
+use crate::types::diagnostic::{
+    CALL_NON_CALLABLE, CONFLICTING_DECLARATIONS, CONFLICTING_METACLASS, CYCLIC_CLASS_DEFINITION,
+    DIVISION_BY_ZERO, DUPLICATE_KW_ONLY, INCONSISTENT_MRO, INVALID_ARGUMENT_TYPE,
+    INVALID_ASSIGNMENT, INVALID_ATTRIBUTE_ACCESS, INVALID_BASE, INVALID_DECLARATION,
+    INVALID_GENERIC_CLASS, INVALID_KEY, INVALID_LEGACY_TYPE_VARIABLE, INVALID_METACLASS,
+    INVALID_NAMED_TUPLE, INVALID_OVERLOAD, INVALID_PARAMETER_DEFAULT, INVALID_PROTOCOL,
+    INVALID_TYPE_FORM, INVALID_TYPE_GUARD_CALL, INVALID_TYPE_VARIABLE_CONSTRAINTS,
+    IncompatibleBases, NON_SUBSCRIPTABLE, POSSIBLY_MISSING_IMPLICIT_CALL, POSSIBLY_MISSING_IMPORT,
+    SUBCLASS_OF_FINAL_CLASS, UNDEFINED_REVEAL, UNRESOLVED_ATTRIBUTE, UNRESOLVED_GLOBAL,
+    UNRESOLVED_IMPORT, UNRESOLVED_REFERENCE, UNSUPPORTED_OPERATOR, USELESS_OVERLOAD_BODY,
+    hint_if_stdlib_attribute_exists_on_other_versions,
+    hint_if_stdlib_submodule_exists_on_other_versions, report_attempted_protocol_instantiation,
+    report_bad_dunder_set_call, report_cannot_pop_required_field_on_typed_dict,
+    report_duplicate_bases, report_implicit_return_type, report_index_out_of_bounds,
+    report_instance_layout_conflict, report_invalid_assignment,
+    report_invalid_attribute_assignment, report_invalid_exception_caught,
+    report_invalid_exception_cause, report_invalid_exception_raised,
+    report_invalid_generator_function_return_type, report_invalid_key_on_typed_dict,
+    report_invalid_or_unsupported_base, report_invalid_return_type,
+    report_invalid_type_checking_constant,
+    report_namedtuple_field_without_default_after_field_with_default, report_non_subscriptable,
+    report_possibly_missing_attribute, report_possibly_unresolved_reference,
+    report_rebound_typevar, report_slice_step_size_zero,
+};
+use crate::types::function::{
+    FunctionDecorators, FunctionLiteral, FunctionType, KnownFunction, OverloadLiteral,
+};
+use crate::types::generics::{
+    GenericContext, InferableTypeVars, LegacyGenericBase, SpecializationBuilder, bind_typevar,
+    enclosing_generic_contexts, typing_self,
+};
+use crate::types::infer::nearest_enclosing_function;
+use crate::types::instance::SliceLiteral;
+use crate::types::mro::MroErrorKind;
+use crate::types::signatures::Signature;
+use crate::types::subclass_of::SubclassOfInner;
+use crate::types::tuple::{Tuple, TupleLength, TupleSpec, TupleType};
+use crate::types::typed_dict::{
+    TypedDictAssignmentKind, validate_typed_dict_constructor, validate_typed_dict_dict_literal,
+    validate_typed_dict_key_assignment,
+};
+use crate::types::visitor::any_over_type;
+use crate::types::{
+    CallDunderError, CallableBinding, CallableType, ClassLiteral, ClassType, DataclassParams,
+    DynamicType, IntersectionBuilder, IntersectionType, KnownClass, KnownInstanceType,
+    MemberLookupPolicy, MetaclassCandidate, PEP695TypeAliasType, Parameter, ParameterForm,
+    Parameters, SpecialFormType, SubclassOfType, TrackedConstraintSet, Truthiness, Type,
+    TypeAliasType, TypeAndQualifiers, TypeContext, TypeQualifiers,
+    TypeVarBoundOrConstraintsEvaluation, TypeVarDefaultEvaluation, TypeVarIdentity,
+    TypeVarInstance, TypeVarKind, TypeVarVariance, TypedDictType, UnionBuilder, UnionType,
+    binding_type, todo_type,
+};
+use crate::types::{ClassBase, add_inferred_python_version_hint_to_diagnostic};
+use crate::unpack::{EvaluationMode, UnpackPosition};
+use crate::{Db, FxIndexSet, FxOrderSet, Program};
+
+mod annotation_expression;
+mod type_expression;
+
+/// Whether the intersection type is on the left or right side of the comparison.
+#[derive(Debug, Clone, Copy)]
+enum IntersectionOn {
+    Left,
+    Right,
+}
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+struct TypeAndRange<'db> {
+    ty: Type<'db>,
+    range: TextRange,
+}
+
+/// A helper to track if we already know that declared and inferred types are the same.
+#[derive(Debug, Clone, PartialEq, Eq)]
+enum DeclaredAndInferredType<'db> {
+    /// We know that both the declared and inferred types are the same.
+    AreTheSame(TypeAndQualifiers<'db>),
+    /// Declared and inferred types might be different, we need to check assignability.
+    MightBeDifferent {
+        declared_ty: TypeAndQualifiers<'db>,
+        inferred_ty: Type<'db>,
+    },
+}
+
+impl<'db> DeclaredAndInferredType<'db> {
+    fn are_the_same_type(ty: Type<'db>) -> Self {
+        Self::AreTheSame(TypeAndQualifiers::new(
+            ty,
+            TypeOrigin::Inferred,
+            TypeQualifiers::empty(),
+        ))
+    }
+}
+
+/// A [`CycleDetector`] that is used in `infer_binary_type_comparison`.
+type BinaryComparisonVisitor<'db> = CycleDetector<
+    ast::CmpOp,
+    (Type<'db>, ast::CmpOp, Type<'db>),
+    Result<Type<'db>, CompareUnsupportedError<'db>>,
+>;
+
+/// We currently store one dataclass field-specifiers inline, because that covers standard
+/// dataclasses. attrs uses 2 specifiers, pydantic and strawberry use 3 specifiers. SQLAlchemy
+/// uses 7 field specifiers. We could probably store more inline if this turns out to be a
+/// performance problem. For now, we optimize for memory usage.
+const NUM_FIELD_SPECIFIERS_INLINE: usize = 1;
+
+/// Builder to infer all types in a region.
+///
+/// A builder is used by creating it with [`new()`](TypeInferenceBuilder::new), and then calling
+/// [`finish_expression()`](TypeInferenceBuilder::finish_expression), [`finish_definition()`](TypeInferenceBuilder::finish_definition), or [`finish_scope()`](TypeInferenceBuilder::finish_scope) on it, which returns
+/// type inference result..
+///
+/// There are a few different kinds of methods in the type inference builder, and the naming
+/// distinctions are a bit subtle.
+///
+/// The `finish` methods call [`infer_region`](TypeInferenceBuilder::infer_region), which delegates
+/// to one of [`infer_region_scope`](TypeInferenceBuilder::infer_region_scope),
+/// [`infer_region_definition`](TypeInferenceBuilder::infer_region_definition), or
+/// [`infer_region_expression`](TypeInferenceBuilder::infer_region_expression), depending which
+/// kind of [`InferenceRegion`] we are inferring types for.
+///
+/// Scope inference starts with the scope body, walking all statements and expressions and
+/// recording the types of each expression in the inference result. Most of the methods
+/// here (with names like `infer_*_statement` or `infer_*_expression` or some other node kind) take
+/// a single AST node and are called as part of this AST visit.
+///
+/// When the visit encounters a node which creates a [`Definition`], we look up the definition in
+/// the semantic index and call the [`infer_definition_types()`] query on it, which creates another
+/// [`TypeInferenceBuilder`] just for that definition, and we merge the returned inference result
+/// into the one we are currently building for the entire scope. Using the query in this way
+/// ensures that if we first infer types for some scattered definitions in a scope, and later for
+/// the entire scope, we don't re-infer any types, we reuse the cached inference for those
+/// definitions and their sub-expressions.
+///
+/// Functions with a name like `infer_*_definition` take both a node and a [`Definition`], and are
+/// called by [`infer_region_definition`](TypeInferenceBuilder::infer_region_definition).
+///
+/// So for example we have both
+/// [`infer_function_definition_statement`](TypeInferenceBuilder::infer_function_definition_statement),
+/// which takes just the function AST node, and
+/// [`infer_function_definition`](TypeInferenceBuilder::infer_function_definition), which takes
+/// both the node and the [`Definition`] id. The former is called as part of walking the AST, and
+/// it just looks up the [`Definition`] for that function in the semantic index and calls
+/// [`infer_definition_types()`] on it, which will create a new [`TypeInferenceBuilder`] with
+/// [`InferenceRegion::Definition`], and in that builder
+/// [`infer_region_definition`](TypeInferenceBuilder::infer_region_definition) will call
+/// [`infer_function_definition`](TypeInferenceBuilder::infer_function_definition) to actually
+/// infer a type for the definition.
+///
+/// Similarly, when we encounter a standalone-inferable expression (right-hand side of an
+/// assignment, type narrowing guard), we use the [`infer_expression_types()`] query to ensure we
+/// don't infer its types more than once.
+pub(super) struct TypeInferenceBuilder<'db, 'ast> {
+    context: InferContext<'db, 'ast>,
+    index: &'db SemanticIndex<'db>,
+    region: InferenceRegion<'db>,
+
+    /// The types of every expression in this region.
+    expressions: FxHashMap<ExpressionNodeKey, Type<'db>>,
+
+    /// The scope this region is part of.
+    scope: ScopeId<'db>,
+
+    // bindings, declarations, and deferred can only exist in definition, or scope contexts.
+    /// The types of every binding in this region.
+    ///
+    /// The list should only contain one entry per binding at most.
+    bindings: VecMap<Definition<'db>, Type<'db>>,
+
+    /// The types and type qualifiers of every declaration in this region.
+    ///
+    /// The list should only contain one entry per declaration at most.
+    declarations: VecMap<Definition<'db>, TypeAndQualifiers<'db>>,
+
+    /// The definitions with deferred sub-parts.
+    ///
+    /// The list should only contain one entry per definition.
+    deferred: VecSet<Definition<'db>>,
+
+    /// The returned types and their corresponding ranges of the region, if it is a function body.
+    return_types_and_ranges: Vec<TypeAndRange<'db>>,
+
+    /// A set of functions that have been defined **and** called in this region.
+    ///
+    /// This is a set because the same function could be called multiple times in the same region.
+    /// This is mainly used in [`check_overloaded_functions`] to check an overloaded function that
+    /// is shadowed by a function with the same name in this scope but has been called before. For
+    /// example:
+    ///
+    /// ```py
+    /// from typing import overload
+    ///
+    /// @overload
+    /// def foo() -> None: ...
+    /// @overload
+    /// def foo(x: int) -> int: ...
+    /// def foo(x: int | None) -> int | None: return x
+    ///
+    /// foo()  # An overloaded function that was defined in this scope have been called
+    ///
+    /// def foo(x: int) -> int:
+    ///     return x
+    /// ```
+    ///
+    /// To keep the calculation deterministic, we use an `FxIndexSet` whose order is determined by the sequence of insertion calls.
+    ///
+    /// [`check_overloaded_functions`]: TypeInferenceBuilder::check_overloaded_functions
+    called_functions: FxIndexSet<FunctionType<'db>>,
+
+    /// Whether we are in a context that binds unbound typevars.
+    typevar_binding_context: Option<Definition<'db>>,
+
+    /// The deferred state of inferring types of certain expressions within the region.
+    ///
+    /// This is different from [`InferenceRegion::Deferred`] which works on the entire definition
+    /// while this is relevant for specific expressions within the region itself and is updated
+    /// during the inference process.
+    ///
+    /// For example, when inferring the types of an annotated assignment, the type of an annotation
+    /// expression could be deferred if the file has `from __future__ import annotations` import or
+    /// is a stub file but we're still in a non-deferred region.
+    deferred_state: DeferredExpressionState,
+
+    multi_inference_state: MultiInferenceState,
+
+    /// For function definitions, the undecorated type of the function.
+    undecorated_type: Option<Type<'db>>,
+
+    /// Did we merge in a sub-region with a cycle-recovery fallback, and if so, what kind?
+    cycle_recovery: Option<CycleRecovery<'db>>,
+
+    /// `true` if all places in this expression are definitely bound
+    all_definitely_bound: bool,
+
+    /// A list of `dataclass_transform` field specifiers that are "active" (when inferring
+    /// the right hand side of an annotated assignment in a class that is a dataclass).
+    dataclass_field_specifiers: SmallVec<[Type<'db>; NUM_FIELD_SPECIFIERS_INLINE]>,
+}
+
+impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
+    /// How big a string do we build before bailing?
+    ///
+    /// This is a fairly arbitrary number. It should be *far* more than enough
+    /// for most use cases, but we can reevaluate it later if useful.
+    pub(super) const MAX_STRING_LITERAL_SIZE: usize = 4096;
+
+    /// Creates a new builder for inferring types in a region.
+    pub(super) fn new(
+        db: &'db dyn Db,
+        region: InferenceRegion<'db>,
+        index: &'db SemanticIndex<'db>,
+        module: &'ast ParsedModuleRef,
+    ) -> Self {
+        let scope = region.scope(db);
+
+        Self {
+            context: InferContext::new(db, scope, module),
+            index,
+            region,
+            scope,
+            return_types_and_ranges: vec![],
+            called_functions: FxIndexSet::default(),
+            deferred_state: DeferredExpressionState::None,
+            multi_inference_state: MultiInferenceState::Panic,
+            expressions: FxHashMap::default(),
+            bindings: VecMap::default(),
+            declarations: VecMap::default(),
+            typevar_binding_context: None,
+            deferred: VecSet::default(),
+            undecorated_type: None,
+            cycle_recovery: None,
+            all_definitely_bound: true,
+            dataclass_field_specifiers: SmallVec::new(),
+        }
+    }
+
+    fn extend_cycle_recovery(&mut self, other_recovery: Option<CycleRecovery<'db>>) {
+        match &mut self.cycle_recovery {
+            Some(recovery) => *recovery = recovery.merge(other_recovery),
+            recovery @ None => *recovery = other_recovery,
+        }
+    }
+
+    fn fallback_type(&self) -> Option<Type<'db>> {
+        self.cycle_recovery.map(CycleRecovery::fallback_type)
+    }
+
+    fn extend_definition(&mut self, inference: &DefinitionInference<'db>) {
+        #[cfg(debug_assertions)]
+        assert_eq!(self.scope, inference.scope);
+
+        self.expressions.extend(inference.expressions.iter());
+        self.declarations.extend(inference.declarations());
+
+        if !matches!(self.region, InferenceRegion::Scope(..)) {
+            self.bindings.extend(inference.bindings());
+        }
+
+        if let Some(extra) = &inference.extra {
+            self.extend_cycle_recovery(extra.cycle_recovery);
+            self.context.extend(&extra.diagnostics);
+            self.deferred.extend(extra.deferred.iter().copied());
+        }
+    }
+
+    fn extend_expression(&mut self, inference: &ExpressionInference<'db>) {
+        #[cfg(debug_assertions)]
+        assert_eq!(self.scope, inference.scope);
+
+        self.extend_expression_unchecked(inference);
+    }
+
+    fn extend_expression_unchecked(&mut self, inference: &ExpressionInference<'db>) {
+        self.expressions.extend(inference.expressions.iter());
+
+        if let Some(extra) = &inference.extra {
+            self.context.extend(&extra.diagnostics);
+            self.extend_cycle_recovery(extra.cycle_recovery);
+
+            if !matches!(self.region, InferenceRegion::Scope(..)) {
+                self.bindings.extend(extra.bindings.iter().copied());
+            }
+        }
+    }
+
+    fn file(&self) -> File {
+        self.context.file()
+    }
+
+    fn module(&self) -> &'ast ParsedModuleRef {
+        self.context.module()
+    }
+
+    fn db(&self) -> &'db dyn Db {
+        self.context.db()
+    }
+
+    fn scope(&self) -> ScopeId<'db> {
+        self.scope
+    }
+
+    /// Are we currently inferring types in file with deferred types?
+    /// This is true for stub files, for files with `__future__.annotations`, and
+    /// by default for all source files in Python 3.14 and later.
+    fn defer_annotations(&self) -> bool {
+        self.index.has_future_annotations()
+            || self.in_stub()
+            || Program::get(self.db()).python_version(self.db()) >= PythonVersion::PY314
+    }
+
+    /// Are we currently in a context where name resolution should be deferred
+    /// (`__future__.annotations`, stub file, or stringified annotation)?
+    fn is_deferred(&self) -> bool {
+        self.deferred_state.is_deferred()
+    }
+
+    /// Return the node key of the given AST node, or the key of the outermost enclosing string
+    /// literal, if the node originates from inside a stringified annotation.
+    fn enclosing_node_key(&self, node: AnyNodeRef<'_>) -> NodeKey {
+        match self.deferred_state {
+            DeferredExpressionState::InStringAnnotation(enclosing_node_key) => enclosing_node_key,
+            _ => NodeKey::from_node(node),
+        }
+    }
+
+    /// Check if a given AST node is reachable.
+    ///
+    /// Note that this only works if reachability is explicitly tracked for this specific
+    /// type of node (see `node_reachability` in the use-def map).
+    fn is_reachable<'a, N>(&self, node: N) -> bool
+    where
+        N: Into<AnyNodeRef<'a>>,
+    {
+        let file_scope_id = self.scope().file_scope_id(self.db());
+        self.index.is_node_reachable(
+            self.db(),
+            file_scope_id,
+            self.enclosing_node_key(node.into()),
+        )
+    }
+
+    fn in_stub(&self) -> bool {
+        self.context.in_stub()
+    }
+
+    /// Get the already-inferred type of an expression node, or Unknown.
+    fn expression_type(&self, expr: &ast::Expr) -> Type<'db> {
+        self.try_expression_type(expr).unwrap_or_else(Type::unknown)
+    }
+
+    fn try_expression_type(&self, expr: &ast::Expr) -> Option<Type<'db>> {
+        self.expressions
+            .get(&expr.into())
+            .copied()
+            .or(self.fallback_type())
+    }
+
+    /// Get the type of an expression from any scope in the same file.
+    ///
+    /// If the expression is in the current scope, and we are inferring the entire scope, just look
+    /// up the expression in our own results, otherwise call [`infer_scope_types()`] for the scope
+    /// of the expression.
+    ///
+    /// ## Panics
+    ///
+    /// If the expression is in the current scope but we haven't yet inferred a type for it.
+    ///
+    /// Can cause query cycles if the expression is from a different scope and type inference is
+    /// already in progress for that scope (further up the stack).
+    fn file_expression_type(&self, expression: &ast::Expr) -> Type<'db> {
+        let file_scope = self.index.expression_scope_id(expression);
+        let expr_scope = file_scope.to_scope_id(self.db(), self.file());
+        match self.region {
+            InferenceRegion::Scope(scope) if scope == expr_scope => {
+                self.expression_type(expression)
+            }
+            _ => infer_scope_types(self.db(), expr_scope).expression_type(expression),
+        }
+    }
+
+    /// Infers types in the given [`InferenceRegion`].
+    fn infer_region(&mut self) {
+        match self.region {
+            InferenceRegion::Scope(scope) => self.infer_region_scope(scope),
+            InferenceRegion::Definition(definition) => self.infer_region_definition(definition),
+            InferenceRegion::Deferred(definition) => self.infer_region_deferred(definition),
+            InferenceRegion::Expression(expression, tcx) => {
+                self.infer_region_expression(expression, tcx);
+            }
+        }
+    }
+
+    fn infer_region_scope(&mut self, scope: ScopeId<'db>) {
+        let node = scope.node(self.db());
+        match node {
+            NodeWithScopeKind::Module => {
+                self.infer_module(self.module().syntax());
+            }
+            NodeWithScopeKind::Function(function) => {
+                self.infer_function_body(function.node(self.module()));
+            }
+            NodeWithScopeKind::Lambda(lambda) => self.infer_lambda_body(lambda.node(self.module())),
+            NodeWithScopeKind::Class(class) => self.infer_class_body(class.node(self.module())),
+            NodeWithScopeKind::ClassTypeParameters(class) => {
+                self.infer_class_type_params(class.node(self.module()));
+            }
+            NodeWithScopeKind::FunctionTypeParameters(function) => {
+                self.infer_function_type_params(function.node(self.module()));
+            }
+            NodeWithScopeKind::TypeAliasTypeParameters(type_alias) => {
+                self.infer_type_alias_type_params(type_alias.node(self.module()));
+            }
+            NodeWithScopeKind::TypeAlias(type_alias) => {
+                self.infer_type_alias(type_alias.node(self.module()));
+            }
+            NodeWithScopeKind::ListComprehension(comprehension) => {
+                self.infer_list_comprehension_expression_scope(comprehension.node(self.module()));
+            }
+            NodeWithScopeKind::SetComprehension(comprehension) => {
+                self.infer_set_comprehension_expression_scope(comprehension.node(self.module()));
+            }
+            NodeWithScopeKind::DictComprehension(comprehension) => {
+                self.infer_dict_comprehension_expression_scope(comprehension.node(self.module()));
+            }
+            NodeWithScopeKind::GeneratorExpression(generator) => {
+                self.infer_generator_expression_scope(generator.node(self.module()));
+            }
+        }
+
+        // Infer deferred types for all definitions.
+        for definition in std::mem::take(&mut self.deferred) {
+            self.extend_definition(infer_deferred_types(self.db(), definition));
+        }
+
+        assert!(
+            self.deferred.is_empty(),
+            "Inferring deferred types should not add more deferred definitions"
+        );
+
+        // TODO: Only call this function when diagnostics are enabled.
+        self.check_class_definitions();
+        self.check_overloaded_functions(node);
+    }
+
+    /// Iterate over all class definitions to check that the definition will not cause an exception
+    /// to be raised at runtime. This needs to be done after most other types in the scope have been
+    /// inferred, due to the fact that base classes can be deferred. If it looks like a class
+    /// definition is invalid in some way, issue a diagnostic.
+    ///
+    /// Among the things we check for in this method are whether Python will be able to determine a
+    /// consistent "[method resolution order]" and [metaclass] for each class.
+    ///
+    /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
+    /// [metaclass]: https://docs.python.org/3/reference/datamodel.html#metaclasses
+    fn check_class_definitions(&mut self) {
+        let class_definitions = self.declarations.iter().filter_map(|(definition, ty)| {
+            // Filter out class literals that result from imports
+            if let DefinitionKind::Class(class) = definition.kind(self.db()) {
+                ty.inner_type()
+                    .as_class_literal()
+                    .map(|class_literal| (class_literal, class.node(self.module())))
+            } else {
+                None
+            }
+        });
+
+        // Iterate through all class definitions in this scope.
+        for (class, class_node) in class_definitions {
+            // (1) Check that the class does not have a cyclic definition
+            if let Some(inheritance_cycle) = class.inheritance_cycle(self.db()) {
+                if inheritance_cycle.is_participant() {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&CYCLIC_CLASS_DEFINITION, class_node)
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Cyclic definition of `{}` (class cannot inherit from itself)",
+                            class.name(self.db())
+                        ));
+                    }
+                }
+                // If a class is cyclically defined, that's a sufficient error to report; the
+                // following checks (which are all inheritance-based) aren't even relevant.
+                continue;
+            }
+
+            let is_named_tuple = CodeGeneratorKind::NamedTuple.matches(self.db(), class, None);
+
+            // (2) If it's a `NamedTuple` class, check that no field without a default value
+            // appears after a field with a default value.
+            if is_named_tuple {
+                let mut field_with_default_encountered = None;
+
+                for (field_name, field) in
+                    class.own_fields(self.db(), None, CodeGeneratorKind::NamedTuple)
+                {
+                    if matches!(
+                        field.kind,
+                        FieldKind::NamedTuple {
+                            default_ty: Some(_)
+                        }
+                    ) {
+                        field_with_default_encountered =
+                            Some((field_name, field.single_declaration));
+                    } else if let Some(field_with_default) = field_with_default_encountered.as_ref()
+                    {
+                        report_namedtuple_field_without_default_after_field_with_default(
+                            &self.context,
+                            class,
+                            &(field_name, field.single_declaration),
+                            field_with_default,
+                        );
+                    }
+                }
+            }
+
+            let is_protocol = class.is_protocol(self.db());
+
+            let mut disjoint_bases = IncompatibleBases::default();
+
+            // (3) Iterate through the class's explicit bases to check for various possible errors:
+            //     - Check for inheritance from plain `Generic`,
+            //     - Check for inheritance from a `@final` classes
+            //     - If the class is a protocol class: check for inheritance from a non-protocol class
+            //     - If the class is a NamedTuple class: check for multiple inheritance that isn't `Generic[]`
+            for (i, base_class) in class.explicit_bases(self.db()).iter().enumerate() {
+                if is_named_tuple
+                    && !matches!(
+                        base_class,
+                        Type::SpecialForm(SpecialFormType::NamedTuple)
+                            | Type::KnownInstance(KnownInstanceType::SubscriptedGeneric(_))
+                    )
+                {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_NAMED_TUPLE, &class_node.bases()[i])
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "NamedTuple class `{}` cannot use multiple inheritance except with `Generic[]`",
+                            class.name(self.db()),
+                        ));
+                    }
+                }
+
+                let base_class = match base_class {
+                    Type::SpecialForm(SpecialFormType::Generic) => {
+                        if let Some(builder) = self
+                            .context
+                            .report_lint(&INVALID_BASE, &class_node.bases()[i])
+                        {
+                            // Unsubscripted `Generic` can appear in the MRO of many classes,
+                            // but it is never valid as an explicit base class in user code.
+                            builder.into_diagnostic("Cannot inherit from plain `Generic`");
+                        }
+                        continue;
+                    }
+                    // Note that unlike several of the other errors caught in this function,
+                    // this does not lead to the class creation failing at runtime,
+                    // but it is semantically invalid.
+                    Type::KnownInstance(KnownInstanceType::SubscriptedProtocol(_)) => {
+                        if class_node.type_params.is_none() {
+                            continue;
+                        }
+                        let Some(builder) = self
+                            .context
+                            .report_lint(&INVALID_GENERIC_CLASS, &class_node.bases()[i])
+                        else {
+                            continue;
+                        };
+                        builder.into_diagnostic(
+                            "Cannot both inherit from subscripted `Protocol` \
+                            and use PEP 695 type variables",
+                        );
+                        continue;
+                    }
+                    Type::ClassLiteral(class) => ClassType::NonGeneric(*class),
+                    Type::GenericAlias(class) => ClassType::Generic(*class),
+                    _ => continue,
+                };
+
+                if let Some(disjoint_base) = base_class.nearest_disjoint_base(self.db()) {
+                    disjoint_bases.insert(disjoint_base, i, base_class.class_literal(self.db()).0);
+                }
+
+                if is_protocol
+                    && !(base_class.is_protocol(self.db()) || base_class.is_object(self.db()))
+                {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_PROTOCOL, &class_node.bases()[i])
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Protocol class `{}` cannot inherit from non-protocol class `{}`",
+                            class.name(self.db()),
+                            base_class.name(self.db()),
+                        ));
+                    }
+                }
+
+                if base_class.is_final(self.db()) {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&SUBCLASS_OF_FINAL_CLASS, &class_node.bases()[i])
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Class `{}` cannot inherit from final class `{}`",
+                            class.name(self.db()),
+                            base_class.name(self.db()),
+                        ));
+                    }
+                }
+            }
+
+            // (4) Check that the class's MRO is resolvable
+            match class.try_mro(self.db(), None) {
+                Err(mro_error) => match mro_error.reason() {
+                    MroErrorKind::DuplicateBases(duplicates) => {
+                        let base_nodes = class_node.bases();
+                        for duplicate in duplicates {
+                            report_duplicate_bases(&self.context, class, duplicate, base_nodes);
+                        }
+                    }
+                    MroErrorKind::InvalidBases(bases) => {
+                        let base_nodes = class_node.bases();
+                        for (index, base_ty) in bases {
+                            report_invalid_or_unsupported_base(
+                                &self.context,
+                                &base_nodes[*index],
+                                *base_ty,
+                                class,
+                            );
+                        }
+                    }
+                    MroErrorKind::UnresolvableMro { bases_list } => {
+                        if let Some(builder) =
+                            self.context.report_lint(&INCONSISTENT_MRO, class_node)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Cannot create a consistent method resolution order (MRO) \
+                                    for class `{}` with bases list `[{}]`",
+                                class.name(self.db()),
+                                bases_list
+                                    .iter()
+                                    .map(|base| base.display(self.db()))
+                                    .join(", ")
+                            ));
+                        }
+                    }
+                    MroErrorKind::Pep695ClassWithGenericInheritance => {
+                        if let Some(builder) =
+                            self.context.report_lint(&INVALID_GENERIC_CLASS, class_node)
+                        {
+                            builder.into_diagnostic(
+                                "Cannot both inherit from `typing.Generic` \
+                                and use PEP 695 type variables",
+                            );
+                        }
+                    }
+                    MroErrorKind::InheritanceCycle => {
+                        if let Some(builder) = self
+                            .context
+                            .report_lint(&CYCLIC_CLASS_DEFINITION, class_node)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Cyclic definition of `{}` (class cannot inherit from itself)",
+                                class.name(self.db())
+                            ));
+                        }
+                    }
+                },
+                Ok(_) => {
+                    disjoint_bases.remove_redundant_entries(self.db());
+
+                    if disjoint_bases.len() > 1 {
+                        report_instance_layout_conflict(
+                            &self.context,
+                            class,
+                            class_node,
+                            &disjoint_bases,
+                        );
+                    }
+                }
+            }
+
+            // (5) Check that the class's metaclass can be determined without error.
+            if let Err(metaclass_error) = class.try_metaclass(self.db()) {
+                match metaclass_error.reason() {
+                    MetaclassErrorKind::Cycle => {
+                        if let Some(builder) = self
+                            .context
+                            .report_lint(&CYCLIC_CLASS_DEFINITION, class_node)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Cyclic definition of `{}`",
+                                class.name(self.db())
+                            ));
+                        }
+                    }
+                    MetaclassErrorKind::NotCallable(ty) => {
+                        if let Some(builder) =
+                            self.context.report_lint(&INVALID_METACLASS, class_node)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Metaclass type `{}` is not callable",
+                                ty.display(self.db())
+                            ));
+                        }
+                    }
+                    MetaclassErrorKind::PartlyNotCallable(ty) => {
+                        if let Some(builder) =
+                            self.context.report_lint(&INVALID_METACLASS, class_node)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Metaclass type `{}` is partly not callable",
+                                ty.display(self.db())
+                            ));
+                        }
+                    }
+                    MetaclassErrorKind::Conflict {
+                        candidate1:
+                            MetaclassCandidate {
+                                metaclass: metaclass1,
+                                explicit_metaclass_of: class1,
+                            },
+                        candidate2:
+                            MetaclassCandidate {
+                                metaclass: metaclass2,
+                                explicit_metaclass_of: class2,
+                            },
+                        candidate1_is_base_class,
+                    } => {
+                        if let Some(builder) =
+                            self.context.report_lint(&CONFLICTING_METACLASS, class_node)
+                        {
+                            if *candidate1_is_base_class {
+                                builder.into_diagnostic(format_args!(
+                                    "The metaclass of a derived class (`{class}`) \
+                                     must be a subclass of the metaclasses of all its bases, \
+                                     but `{metaclass1}` (metaclass of base class `{base1}`) \
+                                     and `{metaclass2}` (metaclass of base class `{base2}`) \
+                                     have no subclass relationship",
+                                    class = class.name(self.db()),
+                                    metaclass1 = metaclass1.name(self.db()),
+                                    base1 = class1.name(self.db()),
+                                    metaclass2 = metaclass2.name(self.db()),
+                                    base2 = class2.name(self.db()),
+                                ));
+                            } else {
+                                builder.into_diagnostic(format_args!(
+                                    "The metaclass of a derived class (`{class}`) \
+                                     must be a subclass of the metaclasses of all its bases, \
+                                     but `{metaclass_of_class}` (metaclass of `{class}`) \
+                                     and `{metaclass_of_base}` (metaclass of base class `{base}`) \
+                                     have no subclass relationship",
+                                    class = class.name(self.db()),
+                                    metaclass_of_class = metaclass1.name(self.db()),
+                                    metaclass_of_base = metaclass2.name(self.db()),
+                                    base = class2.name(self.db()),
+                                ));
+                            }
+                        }
+                    }
+                }
+            }
+
+            // (6) If the class is generic, verify that its generic context does not violate any of
+            // the typevar scoping rules.
+            if let (Some(legacy), Some(inherited)) = (
+                class.legacy_generic_context(self.db()),
+                class.inherited_legacy_generic_context(self.db()),
+            ) {
+                if !inherited.is_subset_of(self.db(), legacy) {
+                    if let Some(builder) =
+                        self.context.report_lint(&INVALID_GENERIC_CLASS, class_node)
+                    {
+                        builder.into_diagnostic(
+                            "`Generic` base class must include all type \
+                            variables used in other base classes",
+                        );
+                    }
+                }
+            }
+
+            let scope = class.body_scope(self.db()).scope(self.db());
+            if self.context.is_lint_enabled(&INVALID_GENERIC_CLASS)
+                && let Some(parent) = scope.parent()
+            {
+                for self_typevar in class.typevars_referenced_in_definition(self.db()) {
+                    let self_typevar_name = self_typevar.typevar(self.db()).name(self.db());
+                    for enclosing in enclosing_generic_contexts(self.db(), self.index, parent) {
+                        if let Some(other_typevar) =
+                            enclosing.binds_named_typevar(self.db(), self_typevar_name)
+                        {
+                            report_rebound_typevar(
+                                &self.context,
+                                self_typevar_name,
+                                class,
+                                class_node,
+                                other_typevar,
+                            );
+                        }
+                    }
+                }
+            }
+
+            // (7) Check that a dataclass does not have more than one `KW_ONLY`.
+            if let Some(field_policy @ CodeGeneratorKind::DataclassLike(_)) =
+                CodeGeneratorKind::from_class(self.db(), class, None)
+            {
+                let specialization = None;
+
+                let kw_only_sentinel_fields: Vec<_> = class
+                    .fields(self.db(), specialization, field_policy)
+                    .into_iter()
+                    .filter_map(|(name, field)| {
+                        field.is_kw_only_sentinel(self.db()).then_some(name)
+                    })
+                    .collect();
+
+                if kw_only_sentinel_fields.len() > 1 {
+                    // TODO: The fields should be displayed in a subdiagnostic.
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&DUPLICATE_KW_ONLY, &class_node.name)
+                    {
+                        let mut diagnostic = builder.into_diagnostic(format_args!(
+                            "Dataclass has more than one field annotated with `KW_ONLY`"
+                        ));
+
+                        diagnostic.info(format_args!(
+                            "`KW_ONLY` fields: {}",
+                            kw_only_sentinel_fields
+                                .iter()
+                                .map(|name| format!("`{name}`"))
+                                .join(", ")
+                        ));
+                    }
+                }
+            }
+
+            if let Some(protocol) = class.into_protocol_class(self.db()) {
+                protocol.validate_members(&self.context);
+            }
+        }
+    }
+
+    /// Check the overloaded functions in this scope.
+    ///
+    /// This only checks the overloaded functions that are:
+    /// 1. Visible publicly at the end of this scope
+    /// 2. Or, defined and called in this scope
+    ///
+    /// For (1), this has the consequence of not checking an overloaded function that is being
+    /// shadowed by another function with the same name in this scope.
+    fn check_overloaded_functions(&mut self, scope: &NodeWithScopeKind) {
+        // Collect all the unique overloaded function places in this scope. This requires a set
+        // because an overloaded function uses the same place for each of the overloads and the
+        // implementation.
+        let overloaded_function_places: FxIndexSet<_> = self
+            .declarations
+            .iter()
+            .filter_map(|(definition, ty)| {
+                // Filter out function literals that result from anything other than a function
+                // definition e.g., imports which would create a cross-module AST dependency.
+                if !matches!(definition.kind(self.db()), DefinitionKind::Function(_)) {
+                    return None;
+                }
+                let function = ty.inner_type().as_function_literal()?;
+                if function.has_known_decorator(self.db(), FunctionDecorators::OVERLOAD) {
+                    Some(definition.place(self.db()))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        let use_def = self
+            .index
+            .use_def_map(self.scope().file_scope_id(self.db()));
+
+        let mut public_functions = FxIndexSet::default();
+
+        for place in overloaded_function_places {
+            if let Place::Defined(Type::FunctionLiteral(function), _, Definedness::AlwaysDefined) =
+                place_from_bindings(
+                    self.db(),
+                    use_def.end_of_scope_symbol_bindings(place.as_symbol().unwrap()),
+                )
+            {
+                if function.file(self.db()) != self.file() {
+                    // If the function is not in this file, we don't need to check it.
+                    // https://github.com/astral-sh/ruff/pull/17609#issuecomment-2839445740
+                    continue;
+                }
+
+                // Extend the functions that we need to check with the publicly visible overloaded
+                // function. This is always going to be either the implementation or the last
+                // overload if the implementation doesn't exists.
+                public_functions.insert(function);
+            }
+        }
+
+        for function in self.called_functions.union(&public_functions) {
+            let (overloads, implementation) = function.overloads_and_implementation(self.db());
+            if overloads.is_empty() {
+                continue;
+            }
+
+            // Check that the overloaded function has at least two overloads
+            if let [single_overload] = overloads.as_ref() {
+                let function_node = function.node(self.db(), self.file(), self.module());
+                if let Some(builder) = self
+                    .context
+                    .report_lint(&INVALID_OVERLOAD, &function_node.name)
+                {
+                    let mut diagnostic = builder.into_diagnostic(format_args!(
+                        "Overloaded function `{}` requires at least two overloads",
+                        &function_node.name
+                    ));
+                    diagnostic.annotate(
+                        self.context
+                            .secondary(single_overload.focus_range(self.db(), self.module()))
+                            .message(format_args!("Only one overload defined here")),
+                    );
+                }
+            }
+
+            // Check that the overloaded function has an implementation. Overload definitions
+            // within stub files, protocols, and on abstract methods within abstract base classes
+            // are exempt from this check.
+            if implementation.is_none() && !self.in_stub() {
+                let mut implementation_required = true;
+
+                if let NodeWithScopeKind::Class(class_node_ref) = scope {
+                    let class = binding_type(
+                        self.db(),
+                        self.index
+                            .expect_single_definition(class_node_ref.node(self.module())),
+                    )
+                    .expect_class_literal();
+
+                    if class.is_protocol(self.db())
+                        || (class.is_abstract(self.db())
+                            && overloads.iter().all(|overload| {
+                                overload.has_known_decorator(
+                                    self.db(),
+                                    FunctionDecorators::ABSTRACT_METHOD,
+                                )
+                            }))
+                    {
+                        implementation_required = false;
+                    }
+                }
+
+                if implementation_required {
+                    let function_node = function.node(self.db(), self.file(), self.module());
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_OVERLOAD, &function_node.name)
+                    {
+                        let mut diagnostic = builder.into_diagnostic(format_args!(
+                            "Overloads for function `{}` must be followed by a non-`@overload`-decorated implementation function",
+                            &function_node.name
+                        ));
+                        diagnostic.info(format_args!(
+                            "Attempting to call `{}` will raise `TypeError` at runtime",
+                            &function_node.name
+                        ));
+                        diagnostic.info(
+                            "Overloaded functions without implementations are only permitted \
+                            in stub files, on protocols, or for abstract methods",
+                        );
+                        diagnostic.info(
+                            "See https://docs.python.org/3/library/typing.html#typing.overload \
+                            for more details",
+                        );
+                    }
+                }
+            }
+
+            for (decorator, name) in [
+                (FunctionDecorators::CLASSMETHOD, "classmethod"),
+                (FunctionDecorators::STATICMETHOD, "staticmethod"),
+            ] {
+                let mut decorator_present = false;
+                let mut decorator_missing = vec![];
+
+                for function in overloads.iter().chain(implementation.as_ref()) {
+                    if function.has_known_decorator(self.db(), decorator) {
+                        decorator_present = true;
+                    } else {
+                        decorator_missing.push(function);
+                    }
+                }
+
+                if !decorator_present {
+                    // Both overloads and implementation does not have the decorator
+                    continue;
+                }
+                if decorator_missing.is_empty() {
+                    // All overloads and implementation have the decorator
+                    continue;
+                }
+
+                let function_node = function.node(self.db(), self.file(), self.module());
+                if let Some(builder) = self
+                    .context
+                    .report_lint(&INVALID_OVERLOAD, &function_node.name)
+                {
+                    let mut diagnostic = builder.into_diagnostic(format_args!(
+                        "Overloaded function `{}` does not use the `@{name}` decorator \
+                         consistently",
+                        &function_node.name
+                    ));
+                    for function in decorator_missing {
+                        diagnostic.annotate(
+                            self.context
+                                .secondary(function.focus_range(self.db(), self.module()))
+                                .message(format_args!("Missing here")),
+                        );
+                    }
+                }
+            }
+
+            for (decorator, name) in [
+                (FunctionDecorators::FINAL, "final"),
+                (FunctionDecorators::OVERRIDE, "override"),
+            ] {
+                if let Some(implementation) = implementation {
+                    for overload in overloads.as_ref() {
+                        if !overload.has_known_decorator(self.db(), decorator) {
+                            continue;
+                        }
+                        let function_node = function.node(self.db(), self.file(), self.module());
+                        let Some(builder) = self
+                            .context
+                            .report_lint(&INVALID_OVERLOAD, &function_node.name)
+                        else {
+                            continue;
+                        };
+                        let mut diagnostic = builder.into_diagnostic(format_args!(
+                            "`@{name}` decorator should be applied only to the \
+                                overload implementation"
+                        ));
+                        diagnostic.annotate(
+                            self.context
+                                .secondary(implementation.focus_range(self.db(), self.module()))
+                                .message(format_args!("Implementation defined here")),
+                        );
+                    }
+                } else {
+                    let mut overloads = overloads.iter();
+                    let Some(first_overload) = overloads.next() else {
+                        continue;
+                    };
+                    for overload in overloads {
+                        if !overload.has_known_decorator(self.db(), decorator) {
+                            continue;
+                        }
+                        let function_node = function.node(self.db(), self.file(), self.module());
+                        let Some(builder) = self
+                            .context
+                            .report_lint(&INVALID_OVERLOAD, &function_node.name)
+                        else {
+                            continue;
+                        };
+                        let mut diagnostic = builder.into_diagnostic(format_args!(
+                            "`@{name}` decorator should be applied only to the \
+                                first overload"
+                        ));
+                        diagnostic.annotate(
+                            self.context
+                                .secondary(first_overload.focus_range(self.db(), self.module()))
+                                .message(format_args!("First overload defined here")),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    fn infer_region_definition(&mut self, definition: Definition<'db>) {
+        match definition.kind(self.db()) {
+            DefinitionKind::Function(function) => {
+                self.infer_function_definition(function.node(self.module()), definition);
+            }
+            DefinitionKind::Class(class) => {
+                self.infer_class_definition(class.node(self.module()), definition);
+            }
+            DefinitionKind::TypeAlias(type_alias) => {
+                self.infer_type_alias_definition(type_alias.node(self.module()), definition);
+            }
+            DefinitionKind::Import(import) => {
+                self.infer_import_definition(
+                    import.import(self.module()),
+                    import.alias(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::ImportFrom(import_from) => {
+                self.infer_import_from_definition(
+                    import_from.import(self.module()),
+                    import_from.alias(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::StarImport(import) => {
+                self.infer_import_from_definition(
+                    import.import(self.module()),
+                    import.alias(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::Assignment(assignment) => {
+                self.infer_assignment_definition(assignment, definition);
+            }
+            DefinitionKind::AnnotatedAssignment(annotated_assignment) => {
+                self.infer_annotated_assignment_definition(annotated_assignment, definition);
+            }
+            DefinitionKind::AugmentedAssignment(augmented_assignment) => {
+                self.infer_augment_assignment_definition(
+                    augmented_assignment.node(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::For(for_statement_definition) => {
+                self.infer_for_statement_definition(for_statement_definition, definition);
+            }
+            DefinitionKind::NamedExpression(named_expression) => {
+                self.infer_named_expression_definition(
+                    named_expression.node(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::Comprehension(comprehension) => {
+                self.infer_comprehension_definition(comprehension, definition);
+            }
+            DefinitionKind::VariadicPositionalParameter(parameter) => {
+                self.infer_variadic_positional_parameter_definition(
+                    parameter.node(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::VariadicKeywordParameter(parameter) => {
+                self.infer_variadic_keyword_parameter_definition(
+                    parameter.node(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::Parameter(parameter_with_default) => {
+                self.infer_parameter_definition(
+                    parameter_with_default.node(self.module()),
+                    definition,
+                );
+            }
+            DefinitionKind::WithItem(with_item_definition) => {
+                self.infer_with_item_definition(with_item_definition, definition);
+            }
+            DefinitionKind::MatchPattern(match_pattern) => {
+                self.infer_match_pattern_definition(
+                    match_pattern.pattern(self.module()),
+                    match_pattern.index(),
+                    definition,
+                );
+            }
+            DefinitionKind::ExceptHandler(except_handler_definition) => {
+                self.infer_except_handler_definition(except_handler_definition, definition);
+            }
+            DefinitionKind::TypeVar(node) => {
+                self.infer_typevar_definition(node.node(self.module()), definition);
+            }
+            DefinitionKind::ParamSpec(node) => {
+                self.infer_paramspec_definition(node.node(self.module()), definition);
+            }
+            DefinitionKind::TypeVarTuple(node) => {
+                self.infer_typevartuple_definition(node.node(self.module()), definition);
+            }
+        }
+    }
+
+    fn infer_region_deferred(&mut self, definition: Definition<'db>) {
+        // N.B. We don't defer the types for an annotated assignment here because it is done in
+        // the same definition query. It utilizes the deferred expression state instead.
+        //
+        // This is because for partially stringified annotations like `a: tuple[int, "ForwardRef"]`,
+        // we need to defer the types of non-stringified expressions like `tuple` and `int` in the
+        // definition query while the stringified expression `"ForwardRef"` would need to deferred
+        // to use end-of-scope semantics. This would require custom and possibly a complex
+        // implementation to allow this "split" to happen.
+
+        match definition.kind(self.db()) {
+            DefinitionKind::Function(function) => {
+                self.infer_function_deferred(definition, function.node(self.module()));
+            }
+            DefinitionKind::Class(class) => {
+                self.infer_class_deferred(definition, class.node(self.module()));
+            }
+            DefinitionKind::TypeVar(typevar) => {
+                self.infer_typevar_deferred(typevar.node(self.module()));
+            }
+            DefinitionKind::Assignment(assignment) => {
+                self.infer_assignment_deferred(assignment.value(self.module()));
+            }
+            _ => {}
+        }
+    }
+
+    fn infer_region_expression(&mut self, expression: Expression<'db>, tcx: TypeContext<'db>) {
+        match expression.kind(self.db()) {
+            ExpressionKind::Normal => {
+                self.infer_expression_impl(expression.node_ref(self.db(), self.module()), tcx);
+            }
+            ExpressionKind::TypeExpression => {
+                self.infer_type_expression(expression.node_ref(self.db(), self.module()));
+            }
+        }
+    }
+
+    /// Raise a diagnostic if the given type cannot be divided by zero.
+    ///
+    /// Expects the resolved type of the left side of the binary expression.
+    fn check_division_by_zero(
+        &mut self,
+        node: AnyNodeRef<'_>,
+        op: ast::Operator,
+        left: Type<'db>,
+    ) -> bool {
+        match left {
+            Type::BooleanLiteral(_) | Type::IntLiteral(_) => {}
+            Type::NominalInstance(instance)
+                if matches!(
+                    instance.known_class(self.db()),
+                    Some(KnownClass::Float | KnownClass::Int | KnownClass::Bool)
+                ) => {}
+            _ => return false,
+        }
+
+        let (op, by_zero) = match op {
+            ast::Operator::Div => ("divide", "by zero"),
+            ast::Operator::FloorDiv => ("floor divide", "by zero"),
+            ast::Operator::Mod => ("reduce", "modulo zero"),
+            _ => return false,
+        };
+
+        if let Some(builder) = self.context.report_lint(&DIVISION_BY_ZERO, node) {
+            builder.into_diagnostic(format_args!(
+                "Cannot {op} object of type `{}` {by_zero}",
+                left.display(self.db())
+            ));
+        }
+
+        true
+    }
+
+    /// Add a binding for the given definition.
+    ///
+    /// Returns the result of the `infer_value_ty` closure, which is called with the declared type
+    /// as type context.
+    fn add_binding(
+        &mut self,
+        node: AnyNodeRef,
+        binding: Definition<'db>,
+        infer_value_ty: impl FnOnce(&mut Self, TypeContext<'db>) -> Type<'db>,
+    ) -> Type<'db> {
+        /// Arbitrary `__getitem__`/`__setitem__` methods on a class do not
+        /// necessarily guarantee that the passed-in value for `__setitem__` is stored and
+        /// can be retrieved unmodified via `__getitem__`. Therefore, we currently only
+        /// perform assignment-based narrowing on a few built-in classes (`list`, `dict`,
+        /// `bytesarray`, `TypedDict` and `collections` types) where we are confident that
+        /// this kind of narrowing can be performed soundly. This is the same approach as
+        /// pyright. TODO: Other standard library classes may also be considered safe. Also,
+        /// subclasses of these safe classes that do not override `__getitem__/__setitem__`
+        /// may be considered safe.
+        fn is_safe_mutable_class<'db>(db: &'db dyn Db, ty: Type<'db>) -> bool {
+            const SAFE_MUTABLE_CLASSES: &[KnownClass] = &[
+                KnownClass::List,
+                KnownClass::Dict,
+                KnownClass::Bytearray,
+                KnownClass::DefaultDict,
+                KnownClass::ChainMap,
+                KnownClass::Counter,
+                KnownClass::Deque,
+                KnownClass::OrderedDict,
+            ];
+
+            SAFE_MUTABLE_CLASSES
+                .iter()
+                .map(|class| class.to_instance(db))
+                .any(|safe_mutable_class| {
+                    ty.is_equivalent_to(db, safe_mutable_class)
+                        || ty
+                            .generic_origin(db)
+                            .zip(safe_mutable_class.generic_origin(db))
+                            .is_some_and(|(l, r)| l == r)
+                })
+        }
+
+        debug_assert!(
+            binding
+                .kind(self.db())
+                .category(self.context.in_stub(), self.module())
+                .is_binding()
+        );
+
+        let db = self.db();
+        let file_scope_id = binding.file_scope(db);
+        let place_table = self.index.place_table(file_scope_id);
+        let use_def = self.index.use_def_map(file_scope_id);
+
+        let global_use_def_map = self.index.use_def_map(FileScopeId::global());
+        let place_id = binding.place(self.db());
+        let place = place_table.place(place_id);
+
+        let (declarations, is_local) = if let Some(symbol) = place.as_symbol() {
+            let symbol_id = place_id.expect_symbol();
+            let skip_non_global_scopes = self.skip_non_global_scopes(file_scope_id, symbol_id);
+
+            if skip_non_global_scopes {
+                match self
+                    .index
+                    .place_table(FileScopeId::global())
+                    .symbol_id(symbol.name())
+                {
+                    Some(id) => (
+                        global_use_def_map.end_of_scope_symbol_declarations(id),
+                        false,
+                    ),
+                    // This variable shows up in `global` declarations but doesn't have an explicit
+                    // binding in the global scope.
+                    None => (use_def.declarations_at_binding(binding), true),
+                }
+            } else if self
+                .index
+                .symbol_is_nonlocal_in_scope(symbol_id, file_scope_id)
+            {
+                // If we run out of ancestor scopes without finding a definition, we'll fall back to
+                // the local scope. This will also be a syntax error in `infer_nonlocal_statement` (no
+                // binding for `nonlocal` found), but ignore that here.
+                let mut declarations = use_def.declarations_at_binding(binding);
+                let mut is_local = true;
+                // Walk up parent scopes looking for the enclosing scope that has definition of this
+                // name. `ancestor_scopes` includes the current scope, so skip that one.
+                for (enclosing_scope_file_id, enclosing_scope) in
+                    self.index.ancestor_scopes(file_scope_id).skip(1)
+                {
+                    // Ignore class scopes and the global scope.
+                    if !enclosing_scope.kind().is_function_like() {
+                        continue;
+                    }
+                    let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
+                    let Some(enclosing_symbol_id) = enclosing_place_table.symbol_id(symbol.name())
+                    else {
+                        // This ancestor scope doesn't have a binding. Keep going.
+                        continue;
+                    };
+
+                    let enclosing_symbol = enclosing_place_table.symbol(enclosing_symbol_id);
+                    if enclosing_symbol.is_nonlocal() {
+                        // The variable is `nonlocal` in this ancestor scope. Keep going.
+                        continue;
+                    }
+                    if enclosing_symbol.is_global() {
+                        // The variable is `global` in this ancestor scope. This breaks the `nonlocal`
+                        // chain, and it's a syntax error in `infer_nonlocal_statement`. Ignore that
+                        // here and just bail out of this loop.
+                        break;
+                    }
+                    // We found the closest definition. Note that (as in `infer_place_load`) this does
+                    // *not* need to be a binding. It could be just a declaration, e.g. `x: int`.
+                    declarations = self
+                        .index
+                        .use_def_map(enclosing_scope_file_id)
+                        .end_of_scope_symbol_declarations(enclosing_symbol_id);
+                    is_local = false;
+                    break;
+                }
+                (declarations, is_local)
+            } else {
+                (use_def.declarations_at_binding(binding), true)
+            }
+        } else {
+            (use_def.declarations_at_binding(binding), true)
+        };
+
+        let (mut place_and_quals, conflicting) = place_from_declarations(self.db(), declarations)
+            .into_place_and_conflicting_declarations();
+
+        if let Some(conflicting) = conflicting {
+            // TODO point out the conflicting declarations in the diagnostic?
+            let place = place_table.place(binding.place(db));
+            if let Some(builder) = self.context.report_lint(&CONFLICTING_DECLARATIONS, node) {
+                builder.into_diagnostic(format_args!(
+                    "Conflicting declared types for `{place}`: {}",
+                    format_enumeration(conflicting.iter().map(|ty| ty.display(db)))
+                ));
+            }
+        }
+
+        // Fall back to implicit module globals for (possibly) unbound names
+        if !place_and_quals.place.is_definitely_bound() {
+            if let PlaceExprRef::Symbol(symbol) = place {
+                let symbol_id = place_id.expect_symbol();
+
+                if self.skip_non_global_scopes(file_scope_id, symbol_id)
+                    || self.scope.file_scope_id(self.db()).is_global()
+                {
+                    place_and_quals = place_and_quals.or_fall_back_to(self.db(), || {
+                        module_type_implicit_global_declaration(self.db(), symbol.name())
+                    });
+                }
+            }
+        }
+
+        let PlaceAndQualifiers {
+            place: resolved_place,
+            qualifiers,
+        } = place_and_quals;
+
+        // If the place is unbound and its an attribute or subscript place, fall back to normal
+        // attribute/subscript inference on the root type.
+        let declared_ty =
+            if resolved_place.is_undefined() && !place_table.place(place_id).is_symbol() {
+                if let AnyNodeRef::ExprAttribute(ast::ExprAttribute { value, attr, .. }) = node {
+                    let value_type =
+                        self.infer_maybe_standalone_expression(value, TypeContext::default());
+                    if let Place::Defined(ty, _, Definedness::AlwaysDefined) =
+                        value_type.member(db, attr).place
+                    {
+                        // TODO: also consider qualifiers on the attribute
+                        Some(ty)
+                    } else {
+                        None
+                    }
+                } else if let AnyNodeRef::ExprSubscript(
+                    subscript @ ast::ExprSubscript {
+                        value, slice, ctx, ..
+                    },
+                ) = node
+                {
+                    let value_ty = self.infer_expression(value, TypeContext::default());
+                    let slice_ty = self.infer_expression(slice, TypeContext::default());
+                    Some(self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx))
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+            .or_else(|| resolved_place.ignore_possibly_undefined());
+
+        let inferred_ty = infer_value_ty(self, TypeContext::new(declared_ty));
+
+        let declared_ty = declared_ty.unwrap_or(Type::unknown());
+        let mut bound_ty = inferred_ty;
+
+        if qualifiers.contains(TypeQualifiers::FINAL) {
+            let mut previous_bindings = use_def.bindings_at_definition(binding);
+
+            // An assignment to a local `Final`-qualified symbol is only an error if there are prior bindings
+
+            let previous_definition = previous_bindings
+                .next()
+                .and_then(|r| r.binding.definition());
+
+            if !is_local || previous_definition.is_some() {
+                let place = place_table.place(binding.place(db));
+                if let Some(builder) = self.context.report_lint(
+                    &INVALID_ASSIGNMENT,
+                    binding.full_range(self.db(), self.module()),
+                ) {
+                    let mut diagnostic = builder.into_diagnostic(format_args!(
+                        "Reassignment of `Final` symbol `{place}` is not allowed"
+                    ));
+
+                    diagnostic.set_primary_message("Reassignment of `Final` symbol");
+
+                    if let Some(previous_definition) = previous_definition {
+                        // It is not very helpful to show the previous definition if it results from
+                        // an import. Ideally, we would show the original definition in the external
+                        // module, but that information is currently not threaded through attribute
+                        // lookup.
+                        if !previous_definition.kind(db).is_import() {
+                            if let DefinitionKind::AnnotatedAssignment(assignment) =
+                                previous_definition.kind(db)
+                            {
+                                let range = assignment.annotation(self.module()).range();
+                                diagnostic.annotate(
+                                    self.context
+                                        .secondary(range)
+                                        .message("Symbol declared as `Final` here"),
+                                );
+                            } else {
+                                let range =
+                                    previous_definition.full_range(self.db(), self.module());
+                                diagnostic.annotate(
+                                    self.context
+                                        .secondary(range)
+                                        .message("Symbol declared as `Final` here"),
+                                );
+                            }
+                            diagnostic.set_primary_message("Symbol later reassigned here");
+                        }
+                    }
+                }
+            }
+        }
+
+        if !bound_ty.is_assignable_to(db, declared_ty) {
+            report_invalid_assignment(&self.context, node, binding, declared_ty, bound_ty);
+
+            // Allow declarations to override inference in case of invalid assignment.
+            bound_ty = declared_ty;
+        }
+        // In the following cases, the bound type may not be the same as the RHS value type.
+        if let AnyNodeRef::ExprAttribute(ast::ExprAttribute { value, attr, .. }) = node {
+            let value_ty = self.try_expression_type(value).unwrap_or_else(|| {
+                self.infer_maybe_standalone_expression(value, TypeContext::default())
+            });
+            // If the member is a data descriptor, the RHS value may differ from the value actually assigned.
+            if value_ty
+                .class_member(db, attr.id.clone())
+                .place
+                .ignore_possibly_undefined()
+                .is_some_and(|ty| ty.may_be_data_descriptor(db))
+            {
+                bound_ty = declared_ty;
+            }
+        } else if let AnyNodeRef::ExprSubscript(ast::ExprSubscript { value, .. }) = node {
+            let value_ty = self
+                .try_expression_type(value)
+                .unwrap_or_else(|| self.infer_expression(value, TypeContext::default()));
+
+            if !value_ty.is_typed_dict() && !is_safe_mutable_class(db, value_ty) {
+                bound_ty = declared_ty;
+            }
+        }
+
+        self.bindings.insert(binding, bound_ty);
+
+        inferred_ty
+    }
+
+    /// Returns `true` if `symbol_id` should be looked up in the global scope, skipping intervening
+    /// local scopes.
+    fn skip_non_global_scopes(
+        &self,
+        file_scope_id: FileScopeId,
+        symbol_id: ScopedSymbolId,
+    ) -> bool {
+        !file_scope_id.is_global()
+            && self
+                .index
+                .symbol_is_global_in_scope(symbol_id, file_scope_id)
+    }
+
+    fn add_declaration(
+        &mut self,
+        node: AnyNodeRef,
+        declaration: Definition<'db>,
+        ty: TypeAndQualifiers<'db>,
+    ) {
+        debug_assert!(
+            declaration
+                .kind(self.db())
+                .category(self.context.in_stub(), self.module())
+                .is_declaration()
+        );
+        let use_def = self.index.use_def_map(declaration.file_scope(self.db()));
+        let prior_bindings = use_def.bindings_at_definition(declaration);
+        // unbound_ty is Never because for this check we don't care about unbound
+        let inferred_ty = place_from_bindings(self.db(), prior_bindings)
+            .with_qualifiers(TypeQualifiers::empty())
+            .or_fall_back_to(self.db(), || {
+                // Fallback to bindings declared on `types.ModuleType` if it's a global symbol
+                let scope = self.scope().file_scope_id(self.db());
+                let place = self
+                    .index
+                    .place_table(scope)
+                    .place(declaration.place(self.db()));
+                if let PlaceExprRef::Symbol(symbol) = &place {
+                    if scope.is_global() {
+                        module_type_implicit_global_symbol(self.db(), symbol.name())
+                    } else {
+                        Place::Undefined.into()
+                    }
+                } else {
+                    Place::Undefined.into()
+                }
+            })
+            .place
+            .ignore_possibly_undefined()
+            .unwrap_or(Type::Never);
+        let ty = if inferred_ty.is_assignable_to(self.db(), ty.inner_type()) {
+            ty
+        } else {
+            if let Some(builder) = self.context.report_lint(&INVALID_DECLARATION, node) {
+                builder.into_diagnostic(format_args!(
+                    "Cannot declare type `{}` for inferred type `{}`",
+                    ty.inner_type().display(self.db()),
+                    inferred_ty.display(self.db())
+                ));
+            }
+            TypeAndQualifiers::declared(Type::unknown())
+        };
+        self.declarations.insert(declaration, ty);
+    }
+
+    fn add_declaration_with_binding(
+        &mut self,
+        node: AnyNodeRef,
+        definition: Definition<'db>,
+        declared_and_inferred_ty: &DeclaredAndInferredType<'db>,
+    ) {
+        debug_assert!(
+            definition
+                .kind(self.db())
+                .category(self.context.in_stub(), self.module())
+                .is_binding()
+        );
+        debug_assert!(
+            definition
+                .kind(self.db())
+                .category(self.context.in_stub(), self.module())
+                .is_declaration()
+        );
+
+        let (declared_ty, inferred_ty) = match *declared_and_inferred_ty {
+            DeclaredAndInferredType::AreTheSame(type_and_qualifiers) => {
+                (type_and_qualifiers, type_and_qualifiers.inner_type())
+            }
+            DeclaredAndInferredType::MightBeDifferent {
+                declared_ty,
+                inferred_ty,
+            } => {
+                let file_scope_id = self.scope().file_scope_id(self.db());
+                if file_scope_id.is_global() {
+                    let place_table = self.index.place_table(file_scope_id);
+                    let place = place_table.place(definition.place(self.db()));
+                    if let Some(module_type_implicit_declaration) = place
+                        .as_symbol()
+                        .map(|symbol| module_type_implicit_global_symbol(self.db(), symbol.name()))
+                        .and_then(|place| place.place.ignore_possibly_undefined())
+                    {
+                        let declared_type = declared_ty.inner_type();
+                        if !declared_type
+                            .is_assignable_to(self.db(), module_type_implicit_declaration)
+                        {
+                            if let Some(builder) =
+                                self.context.report_lint(&INVALID_DECLARATION, node)
+                            {
+                                let mut diagnostic = builder.into_diagnostic(format_args!(
+                                    "Cannot shadow implicit global attribute `{place}` with declaration of type `{}`",
+                                    declared_type.display(self.db())
+                                ));
+                                diagnostic.info(format_args!("The global symbol `{}` must always have a type assignable to `{}`",
+                                    place,
+                                    module_type_implicit_declaration.display(self.db())
+                                ));
+                            }
+                        }
+                    }
+                }
+                if inferred_ty.is_assignable_to(self.db(), declared_ty.inner_type()) {
+                    (declared_ty, inferred_ty)
+                } else {
+                    report_invalid_assignment(
+                        &self.context,
+                        node,
+                        definition,
+                        declared_ty.inner_type(),
+                        inferred_ty,
+                    );
+
+                    // if the assignment is invalid, fall back to assuming the annotation is correct
+                    (declared_ty, declared_ty.inner_type())
+                }
+            }
+        };
+        self.declarations.insert(definition, declared_ty);
+        self.bindings.insert(definition, inferred_ty);
+    }
+
+    fn add_unknown_declaration_with_binding(
+        &mut self,
+        node: AnyNodeRef,
+        definition: Definition<'db>,
+    ) {
+        self.add_declaration_with_binding(
+            node,
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(Type::unknown()),
+        );
+    }
+
+    fn record_return_type(&mut self, ty: Type<'db>, range: TextRange) {
+        self.return_types_and_ranges
+            .push(TypeAndRange { ty, range });
+    }
+
+    fn infer_module(&mut self, module: &ast::ModModule) {
+        self.infer_body(&module.body);
+    }
+
+    fn infer_class_type_params(&mut self, class: &ast::StmtClassDef) {
+        let type_params = class
+            .type_params
+            .as_deref()
+            .expect("class type params scope without type params");
+
+        let binding_context = self.index.expect_single_definition(class);
+        let previous_typevar_binding_context =
+            self.typevar_binding_context.replace(binding_context);
+
+        self.infer_type_parameters(type_params);
+
+        if let Some(arguments) = class.arguments.as_deref() {
+            let in_stub = self.in_stub();
+            let previous_deferred_state =
+                std::mem::replace(&mut self.deferred_state, in_stub.into());
+            let mut call_arguments =
+                CallArguments::from_arguments(arguments, |argument, splatted_value| {
+                    let ty = self.infer_expression(splatted_value, TypeContext::default());
+                    if let Some(argument) = argument {
+                        self.store_expression_type(argument, ty);
+                    }
+                    ty
+                });
+            let argument_forms = vec![Some(ParameterForm::Value); call_arguments.len()];
+            self.infer_argument_types(arguments, &mut call_arguments, &argument_forms);
+            self.deferred_state = previous_deferred_state;
+        }
+
+        self.typevar_binding_context = previous_typevar_binding_context;
+    }
+
+    fn infer_class_body(&mut self, class: &ast::StmtClassDef) {
+        self.infer_body(&class.body);
+    }
+
+    fn infer_function_type_params(&mut self, function: &ast::StmtFunctionDef) {
+        let type_params = function
+            .type_params
+            .as_deref()
+            .expect("function type params scope without type params");
+
+        let binding_context = self.index.expect_single_definition(function);
+        let previous_typevar_binding_context =
+            self.typevar_binding_context.replace(binding_context);
+        self.infer_return_type_annotation(
+            function.returns.as_deref(),
+            self.defer_annotations().into(),
+        );
+        self.infer_type_parameters(type_params);
+        self.infer_parameters(&function.parameters);
+        self.typevar_binding_context = previous_typevar_binding_context;
+    }
+
+    fn infer_type_alias_type_params(&mut self, type_alias: &ast::StmtTypeAlias) {
+        let type_params = type_alias
+            .type_params
+            .as_ref()
+            .expect("type alias type params scope without type params");
+
+        let binding_context = self.index.expect_single_definition(type_alias);
+        let previous_typevar_binding_context =
+            self.typevar_binding_context.replace(binding_context);
+        self.infer_type_parameters(type_params);
+        self.typevar_binding_context = previous_typevar_binding_context;
+    }
+
+    fn infer_type_alias(&mut self, type_alias: &ast::StmtTypeAlias) {
+        self.infer_annotation_expression(&type_alias.value, DeferredExpressionState::None);
+    }
+
+    /// If the current scope is a method inside an enclosing class,
+    /// return `Some(class)` where `class` represents the enclosing class.
+    ///
+    /// If the current scope is not a method inside an enclosing class,
+    /// return `None`.
+    ///
+    /// Note that this method will only return `Some` if the immediate parent scope
+    /// is a class scope OR the immediate parent scope is an annotation scope
+    /// and the grandparent scope is a class scope. This means it has different
+    /// behaviour to the [`super::nearest_enclosing_class`] function.
+    fn class_context_of_current_method(&self) -> Option<ClassType<'db>> {
+        let current_scope_id = self.scope().file_scope_id(self.db());
+        let class_definition = self.index.class_definition_of_method(current_scope_id)?;
+        binding_type(self.db(), class_definition).to_class_type(self.db())
+    }
+
+    /// If the current scope is a (non-lambda) function, return that function's AST node.
+    ///
+    /// If the current scope is not a function (or it is a lambda function), return `None`.
+    fn current_function_definition(&self) -> Option<&ast::StmtFunctionDef> {
+        let current_scope_id = self.scope().file_scope_id(self.db());
+        let current_scope = self.index.scope(current_scope_id);
+        if !current_scope.kind().is_non_lambda_function() {
+            return None;
+        }
+        current_scope
+            .node()
+            .as_function()
+            .map(|node_ref| node_ref.node(self.module()))
+    }
+
+    fn function_decorator_types<'a>(
+        &'a self,
+        function: &'a ast::StmtFunctionDef,
+    ) -> impl Iterator<Item = Type<'db>> + 'a {
+        let definition = self.index.expect_single_definition(function);
+
+        let definition_types = infer_definition_types(self.db(), definition);
+
+        function
+            .decorator_list
+            .iter()
+            .map(move |decorator| definition_types.expression_type(&decorator.expression))
+    }
+
+    /// Returns `true` if the current scope is the function body scope of a function overload (that
+    /// is, the stub declaration decorated with `@overload`, not the implementation), or an
+    /// abstract method (decorated with `@abstractmethod`.)
+    fn in_function_overload_or_abstractmethod(&self) -> bool {
+        let Some(function) = self.current_function_definition() else {
+            return false;
+        };
+
+        self.function_decorator_types(function)
+            .any(|decorator_type| {
+                match decorator_type {
+                    Type::FunctionLiteral(function) => matches!(
+                        function.known(self.db()),
+                        Some(KnownFunction::Overload | KnownFunction::AbstractMethod)
+                    ),
+                    Type::Never => {
+                        // In unreachable code, we infer `Never` for decorators like `typing.overload`.
+                        // Return `true` here to avoid false positive `invalid-return-type` lints for
+                        // `@overload`ed functions without a body in unreachable code.
+                        true
+                    }
+                    _ => false,
+                }
+            })
+    }
+
+    fn infer_function_body(&mut self, function: &ast::StmtFunctionDef) {
+        // Parameters are odd: they are Definitions in the function body scope, but have no
+        // constituent nodes that are part of the function body. In order to get diagnostics
+        // merged/emitted for them, we need to explicitly infer their definitions here.
+        for parameter in &function.parameters {
+            self.infer_definition(parameter);
+        }
+        self.infer_body(&function.body);
+
+        if let Some(returns) = function.returns.as_deref() {
+            fn is_stub_suite(suite: &[ast::Stmt]) -> bool {
+                match suite {
+                    [
+                        ast::Stmt::Expr(ast::StmtExpr { value: first, .. }),
+                        ast::Stmt::Expr(ast::StmtExpr { value: second, .. }),
+                        ..,
+                    ] => first.is_string_literal_expr() && second.is_ellipsis_literal_expr(),
+                    [
+                        ast::Stmt::Expr(ast::StmtExpr { value, .. }),
+                        ast::Stmt::Pass(_),
+                        ..,
+                    ] => value.is_string_literal_expr(),
+                    [ast::Stmt::Expr(ast::StmtExpr { value, .. }), ..] => {
+                        value.is_ellipsis_literal_expr() || value.is_string_literal_expr()
+                    }
+                    [ast::Stmt::Pass(_)] => true,
+                    _ => false,
+                }
+            }
+
+            let has_empty_body =
+                self.return_types_and_ranges.is_empty() && is_stub_suite(&function.body);
+
+            let mut enclosing_class_context = None;
+
+            if has_empty_body {
+                if self.in_stub() {
+                    return;
+                }
+                if self.in_function_overload_or_abstractmethod() {
+                    return;
+                }
+                if self.scope().scope(self.db()).in_type_checking_block() {
+                    return;
+                }
+                if let Some(class) = self.class_context_of_current_method() {
+                    enclosing_class_context = Some(class);
+                    if class.is_protocol(self.db()) {
+                        return;
+                    }
+                }
+            }
+
+            let declared_ty = self.file_expression_type(returns);
+            let expected_ty = match declared_ty {
+                Type::TypeIs(_) => KnownClass::Bool.to_instance(self.db()),
+                ty => ty,
+            };
+
+            let scope_id = self.index.node_scope(NodeWithScopeRef::Function(function));
+            if scope_id.is_generator_function(self.index) {
+                // TODO: `AsyncGeneratorType` and `GeneratorType` are both generic classes.
+                //
+                // If type arguments are supplied to `(Async)Iterable`, `(Async)Iterator`,
+                // `(Async)Generator` or `(Async)GeneratorType` in the return annotation,
+                // we should iterate over the `yield` expressions and `return` statements
+                // in the function to check that they are consistent with the type arguments
+                // provided. Once we do this, the `.to_instance_unknown` call below should
+                // be replaced with `.to_specialized_instance`.
+                let inferred_return = if function.is_async {
+                    KnownClass::AsyncGeneratorType
+                } else {
+                    KnownClass::GeneratorType
+                };
+
+                if !inferred_return
+                    .to_instance_unknown(self.db())
+                    .is_assignable_to(self.db(), expected_ty)
+                {
+                    report_invalid_generator_function_return_type(
+                        &self.context,
+                        returns.range(),
+                        inferred_return,
+                        declared_ty,
+                    );
+                }
+                return;
+            }
+
+            for invalid in self
+                .return_types_and_ranges
+                .iter()
+                .copied()
+                .filter_map(|ty_range| match ty_range.ty {
+                    // We skip `is_assignable_to` checks for `NotImplemented`,
+                    // so we remove it beforehand.
+                    Type::Union(union) => Some(TypeAndRange {
+                        ty: union.filter(self.db(), |ty| !ty.is_notimplemented(self.db())),
+                        range: ty_range.range,
+                    }),
+                    ty if ty.is_notimplemented(self.db()) => None,
+                    _ => Some(ty_range),
+                })
+                .filter(|ty_range| !ty_range.ty.is_assignable_to(self.db(), expected_ty))
+            {
+                report_invalid_return_type(
+                    &self.context,
+                    invalid.range,
+                    returns.range(),
+                    declared_ty,
+                    invalid.ty,
+                );
+            }
+            if self
+                .index
+                .use_def_map(scope_id)
+                .can_implicitly_return_none(self.db())
+                && !Type::none(self.db()).is_assignable_to(self.db(), expected_ty)
+            {
+                let no_return = self.return_types_and_ranges.is_empty();
+                report_implicit_return_type(
+                    &self.context,
+                    returns.range(),
+                    declared_ty,
+                    has_empty_body,
+                    enclosing_class_context,
+                    no_return,
+                );
+            }
+        }
+    }
+
+    fn infer_body(&mut self, suite: &[ast::Stmt]) {
+        for statement in suite {
+            self.infer_statement(statement);
+        }
+    }
+
+    fn infer_statement(&mut self, statement: &ast::Stmt) {
+        match statement {
+            ast::Stmt::FunctionDef(function) => self.infer_function_definition_statement(function),
+            ast::Stmt::ClassDef(class) => self.infer_class_definition_statement(class),
+            ast::Stmt::Expr(ast::StmtExpr {
+                range: _,
+                node_index: _,
+                value,
+            }) => {
+                // If this is a call expression, we would have added a `ReturnsNever` constraint,
+                // meaning this will be a standalone expression.
+                self.infer_maybe_standalone_expression(value, TypeContext::default());
+            }
+            ast::Stmt::If(if_statement) => self.infer_if_statement(if_statement),
+            ast::Stmt::Try(try_statement) => self.infer_try_statement(try_statement),
+            ast::Stmt::With(with_statement) => self.infer_with_statement(with_statement),
+            ast::Stmt::Match(match_statement) => self.infer_match_statement(match_statement),
+            ast::Stmt::Assign(assign) => self.infer_assignment_statement(assign),
+            ast::Stmt::AnnAssign(assign) => self.infer_annotated_assignment_statement(assign),
+            ast::Stmt::AugAssign(aug_assign) => {
+                self.infer_augmented_assignment_statement(aug_assign);
+            }
+            ast::Stmt::TypeAlias(type_statement) => self.infer_type_alias_statement(type_statement),
+            ast::Stmt::For(for_statement) => self.infer_for_statement(for_statement),
+            ast::Stmt::While(while_statement) => self.infer_while_statement(while_statement),
+            ast::Stmt::Import(import) => self.infer_import_statement(import),
+            ast::Stmt::ImportFrom(import) => self.infer_import_from_statement(import),
+            ast::Stmt::Assert(assert_statement) => self.infer_assert_statement(assert_statement),
+            ast::Stmt::Raise(raise) => self.infer_raise_statement(raise),
+            ast::Stmt::Return(ret) => self.infer_return_statement(ret),
+            ast::Stmt::Delete(delete) => self.infer_delete_statement(delete),
+            ast::Stmt::Nonlocal(nonlocal) => self.infer_nonlocal_statement(nonlocal),
+            ast::Stmt::Global(global) => self.infer_global_statement(global),
+            ast::Stmt::Break(_)
+            | ast::Stmt::Continue(_)
+            | ast::Stmt::Pass(_)
+            | ast::Stmt::IpyEscapeCommand(_) => {
+                // No-op
+            }
+        }
+    }
+
+    fn infer_definition(&mut self, node: impl Into<DefinitionNodeKey> + std::fmt::Debug + Copy) {
+        let definition = self.index.expect_single_definition(node);
+        let result = infer_definition_types(self.db(), definition);
+        self.extend_definition(result);
+    }
+
+    fn infer_function_definition_statement(&mut self, function: &ast::StmtFunctionDef) {
+        self.infer_definition(function);
+    }
+
+    fn infer_function_definition(
+        &mut self,
+        function: &ast::StmtFunctionDef,
+        definition: Definition<'db>,
+    ) {
+        let ast::StmtFunctionDef {
+            range: _,
+            node_index: _,
+            is_async: _,
+            name,
+            type_params,
+            parameters,
+            returns,
+            body: _,
+            decorator_list,
+        } = function;
+
+        let mut decorator_types_and_nodes = Vec::with_capacity(decorator_list.len());
+        let mut function_decorators = FunctionDecorators::empty();
+        let mut deprecated = None;
+        let mut dataclass_transformer_params = None;
+
+        for decorator in decorator_list {
+            let decorator_type = self.infer_decorator(decorator);
+            let decorator_function_decorator =
+                FunctionDecorators::from_decorator_type(self.db(), decorator_type);
+            function_decorators |= decorator_function_decorator;
+
+            match decorator_type {
+                Type::FunctionLiteral(function) => {
+                    if let Some(KnownFunction::NoTypeCheck) = function.known(self.db()) {
+                        // If the function is decorated with the `no_type_check` decorator,
+                        // we need to suppress any errors that come after the decorators.
+                        self.context.set_in_no_type_check(InNoTypeCheck::Yes);
+                        continue;
+                    }
+                }
+                Type::KnownInstance(KnownInstanceType::Deprecated(deprecated_inst)) => {
+                    deprecated = Some(deprecated_inst);
+                }
+                Type::DataclassTransformer(params) => {
+                    dataclass_transformer_params = Some(params);
+                }
+                _ => {}
+            }
+            if !decorator_function_decorator.is_empty() {
+                continue;
+            }
+
+            decorator_types_and_nodes.push((decorator_type, decorator));
+        }
+
+        for default in parameters
+            .iter_non_variadic_params()
+            .filter_map(|param| param.default.as_deref())
+        {
+            self.infer_expression(default, TypeContext::default());
+        }
+
+        // If there are type params, parameters and returns are evaluated in that scope, that is, in
+        // `infer_function_type_params`, rather than here.
+        if type_params.is_none() {
+            if self.defer_annotations() {
+                self.deferred.insert(definition);
+            } else {
+                let previous_typevar_binding_context =
+                    self.typevar_binding_context.replace(definition);
+                self.infer_return_type_annotation(
+                    returns.as_deref(),
+                    DeferredExpressionState::None,
+                );
+                self.infer_parameters(parameters);
+                self.typevar_binding_context = previous_typevar_binding_context;
+            }
+        }
+
+        let known_function =
+            KnownFunction::try_from_definition_and_name(self.db(), definition, name);
+
+        // `type_check_only` is itself not available at runtime
+        if known_function == Some(KnownFunction::TypeCheckOnly) {
+            function_decorators |= FunctionDecorators::TYPE_CHECK_ONLY;
+        }
+
+        let body_scope = self
+            .index
+            .node_scope(NodeWithScopeRef::Function(function))
+            .to_scope_id(self.db(), self.file());
+
+        let overload_literal = OverloadLiteral::new(
+            self.db(),
+            &name.id,
+            known_function,
+            body_scope,
+            function_decorators,
+            deprecated,
+            dataclass_transformer_params,
+        );
+        let function_literal = FunctionLiteral::new(self.db(), overload_literal);
+
+        let mut inferred_ty =
+            Type::FunctionLiteral(FunctionType::new(self.db(), function_literal, None, None));
+        self.undecorated_type = Some(inferred_ty);
+
+        for (decorator_ty, decorator_node) in decorator_types_and_nodes.iter().rev() {
+            inferred_ty = match decorator_ty
+                .try_call(self.db(), &CallArguments::positional([inferred_ty]))
+                .map(|bindings| bindings.return_type(self.db()))
+            {
+                Ok(return_ty) => {
+                    fn into_function_like_callable<'d>(
+                        db: &'d dyn Db,
+                        ty: Type<'d>,
+                    ) -> Option<Type<'d>> {
+                        match ty {
+                            Type::Callable(callable) => Some(Type::Callable(CallableType::new(
+                                db,
+                                callable.signatures(db),
+                                true,
+                            ))),
+                            Type::Union(union) => union
+                                .try_map(db, |element| into_function_like_callable(db, *element)),
+                            // Intersections are currently not handled here because that would require
+                            // the decorator to be explicitly annotated as returning an intersection.
+                            _ => None,
+                        }
+                    }
+
+                    let is_input_function_like = inferred_ty
+                        .try_upcast_to_callable(self.db())
+                        .and_then(Type::as_callable)
+                        .is_some_and(|callable| callable.is_function_like(self.db()));
+
+                    if is_input_function_like
+                        && let Some(return_ty_function_like) =
+                            into_function_like_callable(self.db(), return_ty)
+                    {
+                        // When a method on a class is decorated with a function that returns a `Callable`, assume that
+                        // the returned callable is also function-like. See "Decorating a method with a `Callable`-typed
+                        // decorator" in `callables_as_descriptors.md` for the extended explanation.
+                        return_ty_function_like
+                    } else {
+                        return_ty
+                    }
+                }
+                Err(CallError(_, bindings)) => {
+                    bindings.report_diagnostics(&self.context, (*decorator_node).into());
+                    bindings.return_type(self.db())
+                }
+            };
+        }
+
+        self.add_declaration_with_binding(
+            function.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(inferred_ty),
+        );
+
+        if function_decorators.contains(FunctionDecorators::OVERLOAD) {
+            for stmt in &function.body {
+                match stmt {
+                    ast::Stmt::Pass(_) => continue,
+                    ast::Stmt::Expr(ast::StmtExpr { value, .. }) => {
+                        if matches!(
+                            &**value,
+                            ast::Expr::StringLiteral(_) | ast::Expr::EllipsisLiteral(_)
+                        ) {
+                            continue;
+                        }
+                    }
+                    _ => {}
+                }
+                let Some(builder) = self.context.report_lint(&USELESS_OVERLOAD_BODY, stmt) else {
+                    continue;
+                };
+                let mut diagnostic = builder.into_diagnostic(format_args!(
+                    "Useless body for `@overload`-decorated function `{}`",
+                    &function.name
+                ));
+                diagnostic.set_primary_message("This statement will never be executed");
+                diagnostic.info(
+                    "`@overload`-decorated functions are solely for type checkers \
+                    and must be overwritten at runtime by a non-`@overload`-decorated implementation",
+                );
+                diagnostic.help("Consider replacing this function body with `...` or `pass`");
+                break;
+            }
+        }
+    }
+
+    fn infer_return_type_annotation(
+        &mut self,
+        returns: Option<&ast::Expr>,
+        deferred_expression_state: DeferredExpressionState,
+    ) {
+        if let Some(returns) = returns {
+            let annotated = self.infer_annotation_expression(returns, deferred_expression_state);
+
+            if !annotated.qualifiers.is_empty() {
+                for qualifier in [
+                    TypeQualifiers::FINAL,
+                    TypeQualifiers::CLASS_VAR,
+                    TypeQualifiers::INIT_VAR,
+                ] {
+                    if annotated.qualifiers.contains(qualifier) {
+                        if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, returns)
+                        {
+                            builder.into_diagnostic(format!(
+                                "`{name}` is not allowed in function return type annotations",
+                                name = qualifier.name()
+                            ));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn infer_parameters(&mut self, parameters: &ast::Parameters) {
+        let ast::Parameters {
+            range: _,
+            node_index: _,
+            posonlyargs: _,
+            args: _,
+            vararg,
+            kwonlyargs: _,
+            kwarg,
+        } = parameters;
+
+        for param_with_default in parameters.iter_non_variadic_params() {
+            self.infer_parameter_with_default(param_with_default);
+        }
+        if let Some(vararg) = vararg {
+            self.infer_parameter(vararg);
+        }
+        if let Some(kwarg) = kwarg {
+            self.infer_parameter(kwarg);
+        }
+    }
+
+    fn infer_parameter_with_default(&mut self, parameter_with_default: &ast::ParameterWithDefault) {
+        let ast::ParameterWithDefault {
+            range: _,
+            node_index: _,
+            parameter,
+            default: _,
+        } = parameter_with_default;
+
+        let annotated = self.infer_optional_annotation_expression(
+            parameter.annotation.as_deref(),
+            self.defer_annotations().into(),
+        );
+
+        if let Some(qualifiers) = annotated.map(|annotated| annotated.qualifiers) {
+            if !qualifiers.is_empty() {
+                for qualifier in [
+                    TypeQualifiers::FINAL,
+                    TypeQualifiers::CLASS_VAR,
+                    TypeQualifiers::INIT_VAR,
+                ] {
+                    if qualifiers.contains(qualifier) {
+                        if let Some(builder) =
+                            self.context.report_lint(&INVALID_TYPE_FORM, parameter)
+                        {
+                            builder.into_diagnostic(format!(
+                                "`{name}` is not allowed in function parameter annotations",
+                                name = qualifier.name()
+                            ));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn infer_parameter(&mut self, parameter: &ast::Parameter) {
+        let ast::Parameter {
+            range: _,
+            node_index: _,
+            name: _,
+            annotation,
+        } = parameter;
+
+        self.infer_optional_annotation_expression(
+            annotation.as_deref(),
+            self.defer_annotations().into(),
+        );
+    }
+
+    /// Set initial declared type (if annotated) and inferred type for a function-parameter symbol,
+    /// in the function body scope.
+    ///
+    /// The declared type is the annotated type, if any, or `Unknown`.
+    ///
+    /// The inferred type is the annotated type, unioned with the type of the default value, if
+    /// any. If both types are fully static, this union is a no-op (it should simplify to just the
+    /// annotated type.) But in a case like `f(x=None)` with no annotated type, we want to infer
+    /// the type `Unknown | None` for `x`, not just `Unknown`, so that we can error on usage of `x`
+    /// that would not be valid for `None`.
+    ///
+    /// If the default-value type is not assignable to the declared (annotated) type, we ignore the
+    /// default-value type and just infer the annotated type; this is the same way we handle
+    /// assignments, and allows an explicit annotation to override a bad inference.
+    ///
+    /// Parameter definitions are odd in that they define a symbol in the function-body scope, so
+    /// the Definition belongs to the function body scope, but the expressions (annotation and
+    /// default value) both belong to outer scopes. (The default value always belongs to the outer
+    /// scope in which the function is defined, the annotation belongs either to the outer scope,
+    /// or maybe to an intervening type-params scope, if it's a generic function.) So we don't use
+    /// `self.infer_expression` or store any expression types here, we just use `expression_ty` to
+    /// get the types of the expressions from their respective scopes.
+    ///
+    /// It is safe (non-cycle-causing) to use `expression_ty` here, because an outer scope can't
+    /// depend on a definition from an inner scope, so we shouldn't be in-process of inferring the
+    /// outer scope here.
+    fn infer_parameter_definition(
+        &mut self,
+        parameter_with_default: &ast::ParameterWithDefault,
+        definition: Definition<'db>,
+    ) {
+        let ast::ParameterWithDefault {
+            parameter,
+            default,
+            range: _,
+            node_index: _,
+        } = parameter_with_default;
+        let default_ty = default
+            .as_ref()
+            .map(|default| self.file_expression_type(default));
+        if let Some(annotation) = parameter.annotation.as_ref() {
+            let declared_ty = self.file_expression_type(annotation);
+            let declared_and_inferred_ty = if let Some(default_ty) = default_ty {
+                if default_ty.is_assignable_to(self.db(), declared_ty) {
+                    DeclaredAndInferredType::MightBeDifferent {
+                        declared_ty: TypeAndQualifiers::declared(declared_ty),
+                        inferred_ty: UnionType::from_elements(self.db(), [declared_ty, default_ty]),
+                    }
+                } else if (self.in_stub()
+                    || self.in_function_overload_or_abstractmethod()
+                    || self
+                        .class_context_of_current_method()
+                        .is_some_and(|class| class.is_protocol(self.db())))
+                    && default
+                        .as_ref()
+                        .is_some_and(|d| d.is_ellipsis_literal_expr())
+                {
+                    DeclaredAndInferredType::are_the_same_type(declared_ty)
+                } else {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_PARAMETER_DEFAULT, parameter_with_default)
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Default value of type `{}` is not assignable \
+                             to annotated parameter type `{}`",
+                            default_ty.display(self.db()),
+                            declared_ty.display(self.db())
+                        ));
+                    }
+                    DeclaredAndInferredType::are_the_same_type(declared_ty)
+                }
+            } else {
+                DeclaredAndInferredType::are_the_same_type(declared_ty)
+            };
+            self.add_declaration_with_binding(
+                parameter.into(),
+                definition,
+                &declared_and_inferred_ty,
+            );
+        } else {
+            let ty = if let Some(default_ty) = default_ty {
+                UnionType::from_elements(self.db(), [Type::unknown(), default_ty])
+            } else if let Some(ty) = self.special_first_method_parameter_type(parameter) {
+                ty
+            } else {
+                Type::unknown()
+            };
+
+            self.add_binding(parameter.into(), definition, |_, _| ty);
+        }
+    }
+
+    /// Set initial declared/inferred types for a `*args` variadic positional parameter.
+    ///
+    /// The annotated type is implicitly wrapped in a homogeneous tuple.
+    ///
+    /// See [`infer_parameter_definition`] doc comment for some relevant observations about scopes.
+    ///
+    /// [`infer_parameter_definition`]: Self::infer_parameter_definition
+    fn infer_variadic_positional_parameter_definition(
+        &mut self,
+        parameter: &ast::Parameter,
+        definition: Definition<'db>,
+    ) {
+        if let Some(annotation) = parameter.annotation() {
+            let ty = if annotation.is_starred_expr() {
+                todo_type!("PEP 646")
+            } else {
+                let annotated_type = self.file_expression_type(annotation);
+                Type::homogeneous_tuple(self.db(), annotated_type)
+            };
+
+            self.add_declaration_with_binding(
+                parameter.into(),
+                definition,
+                &DeclaredAndInferredType::are_the_same_type(ty),
+            );
+        } else {
+            self.add_binding(parameter.into(), definition, |builder, _| {
+                Type::homogeneous_tuple(builder.db(), Type::unknown())
+            });
+        }
+    }
+
+    /// Special case for unannotated `cls` and `self` arguments to class methods and instance methods.
+    fn special_first_method_parameter_type(
+        &mut self,
+        parameter: &ast::Parameter,
+    ) -> Option<Type<'db>> {
+        let db = self.db();
+        let file = self.file();
+
+        let function_scope_id = self.scope();
+        let function_scope = function_scope_id.scope(db);
+        let function = function_scope.node().as_function()?;
+
+        let parent_file_scope_id = function_scope.parent()?;
+        let mut parent_scope_id = parent_file_scope_id.to_scope_id(db, file);
+
+        // Skip type parameter scopes, if the method itself is generic.
+        if parent_scope_id.is_annotation(db) {
+            let parent_scope = parent_scope_id.scope(db);
+            parent_scope_id = parent_scope.parent()?.to_scope_id(db, file);
+        }
+
+        // Return early if this is not a method inside a class.
+        let class = parent_scope_id.scope(db).node().as_class()?;
+
+        let method_definition = self.index.expect_single_definition(function);
+        let DefinitionKind::Function(function_definition) = method_definition.kind(db) else {
+            return None;
+        };
+
+        if function_definition
+            .node(self.module())
+            .parameters
+            .index(parameter.name())
+            .is_none_or(|index| index != 0)
+        {
+            return None;
+        }
+
+        let method = infer_definition_types(db, method_definition)
+            .declaration_type(method_definition)
+            .inner_type()
+            .as_function_literal()?;
+
+        if method.is_classmethod(db) {
+            // TODO: set the type for `cls` argument
+            return None;
+        } else if method.is_staticmethod(db) {
+            return None;
+        }
+
+        let class_definition = self.index.expect_single_definition(class);
+        let class_literal = infer_definition_types(db, class_definition)
+            .declaration_type(class_definition)
+            .inner_type()
+            .as_class_literal()?;
+
+        typing_self(db, self.scope(), Some(method_definition), class_literal)
+    }
+
+    /// Set initial declared/inferred types for a `*args` variadic positional parameter.
+    ///
+    /// The annotated type is implicitly wrapped in a string-keyed dictionary.
+    ///
+    /// See [`infer_parameter_definition`] doc comment for some relevant observations about scopes.
+    ///
+    /// [`infer_parameter_definition`]: Self::infer_parameter_definition
+    fn infer_variadic_keyword_parameter_definition(
+        &mut self,
+        parameter: &ast::Parameter,
+        definition: Definition<'db>,
+    ) {
+        if let Some(annotation) = parameter.annotation() {
+            let annotated_ty = self.file_expression_type(annotation);
+            let ty = KnownClass::Dict.to_specialized_instance(
+                self.db(),
+                [KnownClass::Str.to_instance(self.db()), annotated_ty],
+            );
+            self.add_declaration_with_binding(
+                parameter.into(),
+                definition,
+                &DeclaredAndInferredType::are_the_same_type(ty),
+            );
+        } else {
+            self.add_binding(parameter.into(), definition, |builder, _| {
+                KnownClass::Dict.to_specialized_instance(
+                    builder.db(),
+                    [KnownClass::Str.to_instance(builder.db()), Type::unknown()],
+                )
+            });
+        }
+    }
+
+    fn infer_class_definition_statement(&mut self, class: &ast::StmtClassDef) {
+        self.infer_definition(class);
+    }
+
+    fn infer_class_definition(
+        &mut self,
+        class_node: &ast::StmtClassDef,
+        definition: Definition<'db>,
+    ) {
+        let ast::StmtClassDef {
+            range: _,
+            node_index: _,
+            name,
+            type_params,
+            decorator_list,
+            arguments: _,
+            body: _,
+        } = class_node;
+
+        let mut deprecated = None;
+        let mut type_check_only = false;
+        let mut dataclass_params = None;
+        let mut dataclass_transformer_params = None;
+        for decorator in decorator_list {
+            let decorator_ty = self.infer_decorator(decorator);
+            if decorator_ty
+                .as_function_literal()
+                .is_some_and(|function| function.is_known(self.db(), KnownFunction::Dataclass))
+            {
+                dataclass_params = Some(DataclassParams::default_params(self.db()));
+                continue;
+            }
+
+            if let Type::DataclassDecorator(params) = decorator_ty {
+                dataclass_params = Some(params);
+                continue;
+            }
+
+            if let Type::KnownInstance(KnownInstanceType::Deprecated(deprecated_inst)) =
+                decorator_ty
+            {
+                deprecated = Some(deprecated_inst);
+                continue;
+            }
+
+            if decorator_ty
+                .as_function_literal()
+                .is_some_and(|function| function.is_known(self.db(), KnownFunction::TypeCheckOnly))
+            {
+                type_check_only = true;
+                continue;
+            }
+
+            if let Type::FunctionLiteral(f) = decorator_ty {
+                // We do not yet detect or flag `@dataclass_transform` applied to more than one
+                // overload, or an overload and the implementation both. Nevertheless, this is not
+                // allowed. We do not try to treat the offenders intelligently -- just use the
+                // params of the last seen usage of `@dataclass_transform`
+                let transformer_params = f
+                    .iter_overloads_and_implementation(self.db())
+                    .find_map(|overload| overload.dataclass_transformer_params(self.db()));
+                if let Some(transformer_params) = transformer_params {
+                    dataclass_params = Some(DataclassParams::from_transformer_params(
+                        self.db(),
+                        transformer_params,
+                    ));
+                    continue;
+                }
+            }
+
+            if let Type::DataclassTransformer(params) = decorator_ty {
+                dataclass_transformer_params = Some(params);
+                continue;
+            }
+        }
+
+        let body_scope = self
+            .index
+            .node_scope(NodeWithScopeRef::Class(class_node))
+            .to_scope_id(self.db(), self.file());
+
+        let maybe_known_class = KnownClass::try_from_file_and_name(self.db(), self.file(), name);
+
+        let in_typing_module = || {
+            matches!(
+                file_to_module(self.db(), self.file()).and_then(|module| module.known(self.db())),
+                Some(KnownModule::Typing | KnownModule::TypingExtensions)
+            )
+        };
+
+        let ty = match (maybe_known_class, &*name.id) {
+            (None, "NamedTuple") if in_typing_module() => {
+                Type::SpecialForm(SpecialFormType::NamedTuple)
+            }
+            (None, "Any") if in_typing_module() => Type::SpecialForm(SpecialFormType::Any),
+            _ => Type::from(ClassLiteral::new(
+                self.db(),
+                name.id.clone(),
+                body_scope,
+                maybe_known_class,
+                deprecated,
+                type_check_only,
+                dataclass_params,
+                dataclass_transformer_params,
+            )),
+        };
+
+        self.add_declaration_with_binding(
+            class_node.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(ty),
+        );
+
+        // if there are type parameters, then the keywords and bases are within that scope
+        // and we don't need to run inference here
+        if type_params.is_none() {
+            for keyword in class_node.keywords() {
+                self.infer_expression(&keyword.value, TypeContext::default());
+            }
+
+            // Inference of bases deferred in stubs, or if any are string literals.
+            if self.in_stub() || class_node.bases().iter().any(contains_string_literal) {
+                self.deferred.insert(definition);
+            } else {
+                let previous_typevar_binding_context =
+                    self.typevar_binding_context.replace(definition);
+                for base in class_node.bases() {
+                    self.infer_expression(base, TypeContext::default());
+                }
+                self.typevar_binding_context = previous_typevar_binding_context;
+            }
+        }
+    }
+
+    fn infer_function_deferred(
+        &mut self,
+        definition: Definition<'db>,
+        function: &ast::StmtFunctionDef,
+    ) {
+        let previous_typevar_binding_context = self.typevar_binding_context.replace(definition);
+        self.infer_return_type_annotation(
+            function.returns.as_deref(),
+            DeferredExpressionState::Deferred,
+        );
+        self.infer_parameters(function.parameters.as_ref());
+        self.typevar_binding_context = previous_typevar_binding_context;
+    }
+
+    fn infer_class_deferred(&mut self, definition: Definition<'db>, class: &ast::StmtClassDef) {
+        let previous_typevar_binding_context = self.typevar_binding_context.replace(definition);
+        for base in class.bases() {
+            if self.in_stub() {
+                self.infer_expression_with_state(
+                    base,
+                    TypeContext::default(),
+                    DeferredExpressionState::Deferred,
+                );
+            } else {
+                self.infer_expression(base, TypeContext::default());
+            }
+        }
+        self.typevar_binding_context = previous_typevar_binding_context;
+    }
+
+    fn infer_type_alias_definition(
+        &mut self,
+        type_alias: &ast::StmtTypeAlias,
+        definition: Definition<'db>,
+    ) {
+        self.infer_expression(&type_alias.name, TypeContext::default());
+
+        let rhs_scope = self
+            .index
+            .node_scope(NodeWithScopeRef::TypeAlias(type_alias))
+            .to_scope_id(self.db(), self.file());
+
+        let type_alias_ty = Type::KnownInstance(KnownInstanceType::TypeAliasType(
+            TypeAliasType::PEP695(PEP695TypeAliasType::new(
+                self.db(),
+                &type_alias.name.as_name_expr().unwrap().id,
+                rhs_scope,
+                None,
+            )),
+        ));
+
+        self.add_declaration_with_binding(
+            type_alias.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(type_alias_ty),
+        );
+    }
+
+    fn infer_if_statement(&mut self, if_statement: &ast::StmtIf) {
+        let ast::StmtIf {
+            range: _,
+            node_index: _,
+            test,
+            body,
+            elif_else_clauses,
+        } = if_statement;
+
+        let test_ty = self.infer_standalone_expression(test, TypeContext::default());
+
+        if let Err(err) = test_ty.try_bool(self.db()) {
+            err.report_diagnostic(&self.context, &**test);
+        }
+
+        self.infer_body(body);
+
+        for clause in elif_else_clauses {
+            let ast::ElifElseClause {
+                range: _,
+                node_index: _,
+                test,
+                body,
+            } = clause;
+
+            if let Some(test) = &test {
+                let test_ty = self.infer_standalone_expression(test, TypeContext::default());
+
+                if let Err(err) = test_ty.try_bool(self.db()) {
+                    err.report_diagnostic(&self.context, test);
+                }
+            }
+
+            self.infer_body(body);
+        }
+    }
+
+    fn infer_try_statement(&mut self, try_statement: &ast::StmtTry) {
+        let ast::StmtTry {
+            range: _,
+            node_index: _,
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            is_star: _,
+        } = try_statement;
+
+        self.infer_body(body);
+
+        for handler in handlers {
+            let ast::ExceptHandler::ExceptHandler(handler) = handler;
+            let ast::ExceptHandlerExceptHandler {
+                type_: handled_exceptions,
+                name: symbol_name,
+                body,
+                range: _,
+                node_index: _,
+            } = handler;
+
+            // If `symbol_name` is `Some()` and `handled_exceptions` is `None`,
+            // it's invalid syntax (something like `except as e:`).
+            // However, it's obvious that the user *wanted* `e` to be bound here,
+            // so we'll have created a definition in the semantic-index stage anyway.
+            if symbol_name.is_some() {
+                self.infer_definition(handler);
+            } else {
+                self.infer_exception(handled_exceptions.as_deref(), try_statement.is_star);
+            }
+
+            self.infer_body(body);
+        }
+
+        self.infer_body(orelse);
+        self.infer_body(finalbody);
+    }
+
+    fn infer_with_statement(&mut self, with_statement: &ast::StmtWith) {
+        let ast::StmtWith {
+            range: _,
+            node_index: _,
+            is_async,
+            items,
+            body,
+        } = with_statement;
+        for item in items {
+            let target = item.optional_vars.as_deref();
+            if let Some(target) = target {
+                self.infer_target(target, &item.context_expr, |builder| {
+                    // TODO: `infer_with_statement_definition` reports a diagnostic if `ctx_manager_ty` isn't a context manager
+                    //  but only if the target is a name. We should report a diagnostic here if the target isn't a name:
+                    //  `with not_context_manager as a.x: ...
+                    builder
+                        .infer_standalone_expression(&item.context_expr, TypeContext::default())
+                        .enter(builder.db())
+                });
+            } else {
+                // Call into the context expression inference to validate that it evaluates
+                // to a valid context manager.
+                let context_expression_ty =
+                    self.infer_expression(&item.context_expr, TypeContext::default());
+                self.infer_context_expression(&item.context_expr, context_expression_ty, *is_async);
+                self.infer_optional_expression(target, TypeContext::default());
+            }
+        }
+
+        self.infer_body(body);
+    }
+
+    fn infer_with_item_definition(
+        &mut self,
+        with_item: &WithItemDefinitionKind<'db>,
+        definition: Definition<'db>,
+    ) {
+        let context_expr = with_item.context_expr(self.module());
+        let target = with_item.target(self.module());
+
+        let target_ty = match with_item.target_kind() {
+            TargetKind::Sequence(unpack_position, unpack) => {
+                let unpacked = infer_unpack_types(self.db(), unpack);
+                if unpack_position == UnpackPosition::First {
+                    self.context.extend(unpacked.diagnostics());
+                }
+                unpacked.expression_type(target)
+            }
+            TargetKind::Single => {
+                let context_expr_ty =
+                    self.infer_standalone_expression(context_expr, TypeContext::default());
+                self.infer_context_expression(context_expr, context_expr_ty, with_item.is_async())
+            }
+        };
+
+        self.store_expression_type(target, target_ty);
+        self.add_binding(target.into(), definition, |_, _| target_ty);
+    }
+
+    /// Infers the type of a context expression (`with expr`) and returns the target's type
+    ///
+    /// Returns [`Type::unknown`] if the context expression doesn't implement the context manager protocol.
+    ///
+    /// ## Terminology
+    /// See [PEP343](https://peps.python.org/pep-0343/#standard-terminology).
+    fn infer_context_expression(
+        &mut self,
+        context_expression: &ast::Expr,
+        context_expression_type: Type<'db>,
+        is_async: bool,
+    ) -> Type<'db> {
+        let eval_mode = if is_async {
+            EvaluationMode::Async
+        } else {
+            EvaluationMode::Sync
+        };
+
+        context_expression_type
+            .try_enter_with_mode(self.db(), eval_mode)
+            .unwrap_or_else(|err| {
+                err.report_diagnostic(
+                    &self.context,
+                    context_expression_type,
+                    context_expression.into(),
+                );
+                err.fallback_enter_type(self.db())
+            })
+    }
+
+    fn infer_exception(&mut self, node: Option<&ast::Expr>, is_star: bool) -> Type<'db> {
+        // If there is no handled exception, it's invalid syntax;
+        // a diagnostic will have already been emitted
+        let node_ty = node.map_or(Type::unknown(), |ty| {
+            self.infer_expression(ty, TypeContext::default())
+        });
+        let type_base_exception = KnownClass::BaseException.to_subclass_of(self.db());
+
+        // If it's an `except*` handler, this won't actually be the type of the bound symbol;
+        // it will actually be the type of the generic parameters to `BaseExceptionGroup` or `ExceptionGroup`.
+        let symbol_ty = if let Some(tuple_spec) = node_ty.tuple_instance_spec(self.db()) {
+            let mut builder = UnionBuilder::new(self.db());
+            for element in tuple_spec.all_elements().copied() {
+                builder = builder.add(
+                    if element.is_assignable_to(self.db(), type_base_exception) {
+                        element.to_instance(self.db()).expect(
+                            "`Type::to_instance()` should always return `Some()` \
+                                if called on a type assignable to `type[BaseException]`",
+                        )
+                    } else {
+                        if let Some(node) = node {
+                            report_invalid_exception_caught(&self.context, node, element);
+                        }
+                        Type::unknown()
+                    },
+                );
+            }
+            builder.build()
+        } else if node_ty.is_assignable_to(self.db(), type_base_exception) {
+            node_ty.to_instance(self.db()).expect(
+                "`Type::to_instance()` should always return `Some()` \
+                    if called on a type assignable to `type[BaseException]`",
+            )
+        } else if node_ty.is_assignable_to(
+            self.db(),
+            Type::homogeneous_tuple(self.db(), type_base_exception),
+        ) {
+            node_ty
+                .tuple_instance_spec(self.db())
+                .and_then(|spec| {
+                    let specialization = spec
+                        .homogeneous_element_type(self.db())
+                        .to_instance(self.db());
+
+                    debug_assert!(specialization.is_some_and(|specialization_type| {
+                        specialization_type.is_assignable_to(
+                            self.db(),
+                            KnownClass::BaseException.to_instance(self.db()),
+                        )
+                    }));
+
+                    specialization
+                })
+                .unwrap_or_else(|| KnownClass::BaseException.to_instance(self.db()))
+        } else if node_ty.is_assignable_to(
+            self.db(),
+            UnionType::from_elements(
+                self.db(),
+                [
+                    type_base_exception,
+                    Type::homogeneous_tuple(self.db(), type_base_exception),
+                ],
+            ),
+        ) {
+            KnownClass::BaseException.to_instance(self.db())
+        } else {
+            if let Some(node) = node {
+                report_invalid_exception_caught(&self.context, node, node_ty);
+            }
+            Type::unknown()
+        };
+
+        if is_star {
+            let class = if symbol_ty
+                .is_subtype_of(self.db(), KnownClass::Exception.to_instance(self.db()))
+            {
+                KnownClass::ExceptionGroup
+            } else {
+                KnownClass::BaseExceptionGroup
+            };
+            class.to_specialized_instance(self.db(), [symbol_ty])
+        } else {
+            symbol_ty
+        }
+    }
+
+    fn infer_except_handler_definition(
+        &mut self,
+        except_handler_definition: &ExceptHandlerDefinitionKind,
+        definition: Definition<'db>,
+    ) {
+        let symbol_ty = self.infer_exception(
+            except_handler_definition.handled_exceptions(self.module()),
+            except_handler_definition.is_star(),
+        );
+
+        self.add_binding(
+            except_handler_definition.node(self.module()).into(),
+            definition,
+            |_, _| symbol_ty,
+        );
+    }
+
+    fn infer_typevar_definition(
+        &mut self,
+        node: &ast::TypeParamTypeVar,
+        definition: Definition<'db>,
+    ) {
+        let ast::TypeParamTypeVar {
+            range: _,
+            node_index: _,
+            name,
+            bound,
+            default,
+        } = node;
+
+        let bound_or_constraint = match bound.as_deref() {
+            Some(expr @ ast::Expr::Tuple(ast::ExprTuple { elts, .. })) => {
+                if elts.len() < 2 {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_TYPE_VARIABLE_CONSTRAINTS, expr)
+                    {
+                        builder.into_diagnostic("TypeVar must have at least two constrained types");
+                    }
+                    None
+                } else {
+                    Some(TypeVarBoundOrConstraintsEvaluation::LazyConstraints)
+                }
+            }
+            Some(_) => Some(TypeVarBoundOrConstraintsEvaluation::LazyUpperBound),
+            None => None,
+        };
+        if bound_or_constraint.is_some() || default.is_some() {
+            self.deferred.insert(definition);
+        }
+        let identity =
+            TypeVarIdentity::new(self.db(), &name.id, Some(definition), TypeVarKind::Pep695);
+        let ty = Type::KnownInstance(KnownInstanceType::TypeVar(TypeVarInstance::new(
+            self.db(),
+            identity,
+            bound_or_constraint,
+            None, // explicit_variance
+            default.as_deref().map(|_| TypeVarDefaultEvaluation::Lazy),
+        )));
+        self.add_declaration_with_binding(
+            node.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(ty),
+        );
+    }
+
+    fn infer_typevar_deferred(&mut self, node: &ast::TypeParamTypeVar) {
+        let ast::TypeParamTypeVar {
+            range: _,
+            node_index: _,
+            name: _,
+            bound,
+            default,
+        } = node;
+        let previous_deferred_state =
+            std::mem::replace(&mut self.deferred_state, DeferredExpressionState::Deferred);
+        match bound.as_deref() {
+            Some(expr @ ast::Expr::Tuple(ast::ExprTuple { elts, .. })) => {
+                // We don't use UnionType::from_elements or UnionBuilder here, because we don't
+                // want to simplify the list of constraints like we do with the elements of an
+                // actual union type.
+                // TODO: Consider using a new `OneOfType` connective here instead, since that
+                // more accurately represents the actual semantics of typevar constraints.
+                let ty = Type::Union(UnionType::new(
+                    self.db(),
+                    elts.iter()
+                        .map(|expr| self.infer_type_expression(expr))
+                        .collect::<Box<[_]>>(),
+                ));
+                self.store_expression_type(expr, ty);
+            }
+            Some(expr) => {
+                self.infer_type_expression(expr);
+            }
+            None => {}
+        }
+        self.infer_optional_type_expression(default.as_deref());
+        self.deferred_state = previous_deferred_state;
+    }
+
+    fn infer_paramspec_definition(
+        &mut self,
+        node: &ast::TypeParamParamSpec,
+        definition: Definition<'db>,
+    ) {
+        let ast::TypeParamParamSpec {
+            range: _,
+            node_index: _,
+            name: _,
+            default,
+        } = node;
+        self.infer_optional_expression(default.as_deref(), TypeContext::default());
+        let pep_695_todo = Type::Dynamic(DynamicType::TodoPEP695ParamSpec);
+        self.add_declaration_with_binding(
+            node.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(pep_695_todo),
+        );
+    }
+
+    fn infer_typevartuple_definition(
+        &mut self,
+        node: &ast::TypeParamTypeVarTuple,
+        definition: Definition<'db>,
+    ) {
+        let ast::TypeParamTypeVarTuple {
+            range: _,
+            node_index: _,
+            name: _,
+            default,
+        } = node;
+        self.infer_optional_expression(default.as_deref(), TypeContext::default());
+        let pep_695_todo = todo_type!("PEP-695 TypeVarTuple definition types");
+        self.add_declaration_with_binding(
+            node.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(pep_695_todo),
+        );
+    }
+
+    fn infer_match_statement(&mut self, match_statement: &ast::StmtMatch) {
+        let ast::StmtMatch {
+            range: _,
+            node_index: _,
+            subject,
+            cases,
+        } = match_statement;
+
+        self.infer_standalone_expression(subject, TypeContext::default());
+
+        for case in cases {
+            let ast::MatchCase {
+                range: _,
+                node_index: _,
+                body,
+                pattern,
+                guard,
+            } = case;
+            self.infer_match_pattern(pattern);
+
+            if let Some(guard) = guard.as_deref() {
+                let guard_ty = self.infer_standalone_expression(guard, TypeContext::default());
+
+                if let Err(err) = guard_ty.try_bool(self.db()) {
+                    err.report_diagnostic(&self.context, guard);
+                }
+            }
+
+            self.infer_body(body);
+        }
+    }
+
+    fn infer_match_pattern_definition(
+        &mut self,
+        pattern: &ast::Pattern,
+        _index: u32,
+        definition: Definition<'db>,
+    ) {
+        // TODO(dhruvmanila): The correct way to infer types here is to perform structural matching
+        // against the subject expression type (which we can query via `infer_expression_types`)
+        // and extract the type at the `index` position if the pattern matches. This will be
+        // similar to the logic in `self.infer_assignment_definition`.
+        self.add_binding(pattern.into(), definition, |_, _| {
+            todo_type!("`match` pattern definition types")
+        });
+    }
+
+    fn infer_match_pattern(&mut self, pattern: &ast::Pattern) {
+        // We need to create a standalone expression for each arm of a match statement, since they
+        // can introduce constraints on the match subject. (Or more accurately, for the match arm's
+        // pattern, since its the pattern that introduces any constraints, not the body.) Ideally,
+        // that standalone expression would wrap the match arm's pattern as a whole. But a
+        // standalone expression can currently only wrap an ast::Expr, which patterns are not. So,
+        // we need to choose an Expr that can “stand in” for the pattern, which we can wrap in a
+        // standalone expression.
+        //
+        // That said, when inferring the type of a standalone expression, we don't have access to
+        // its parent or sibling nodes.  That means, for instance, that in a class pattern, where
+        // we are currently using the class name as the standalone expression, we do not have
+        // access to the class pattern's arguments in the standalone expression inference scope.
+        // At the moment, we aren't trying to do anything with those arguments when creating a
+        // narrowing constraint for the pattern.  But in the future, if we do, we will have to
+        // either wrap those arguments in their own standalone expressions, or update Expression to
+        // be able to wrap other AST node types besides just ast::Expr.
+        //
+        // This function is only called for the top-level pattern of a match arm, and is
+        // responsible for inferring the standalone expression for each supported pattern type. It
+        // then hands off to `infer_nested_match_pattern` for any subexpressions and subpatterns,
+        // where we do NOT have any additional standalone expressions to infer through.
+        //
+        // TODO(dhruvmanila): Add a Salsa query for inferring pattern types and matching against
+        // the subject expression: https://github.com/astral-sh/ruff/pull/13147#discussion_r1739424510
+        match pattern {
+            ast::Pattern::MatchValue(match_value) => {
+                self.infer_standalone_expression(&match_value.value, TypeContext::default());
+            }
+            ast::Pattern::MatchClass(match_class) => {
+                let ast::PatternMatchClass {
+                    range: _,
+                    node_index: _,
+                    cls,
+                    arguments,
+                } = match_class;
+                for pattern in &arguments.patterns {
+                    self.infer_nested_match_pattern(pattern);
+                }
+                for keyword in &arguments.keywords {
+                    self.infer_nested_match_pattern(&keyword.pattern);
+                }
+                self.infer_standalone_expression(cls, TypeContext::default());
+            }
+            ast::Pattern::MatchOr(match_or) => {
+                for pattern in &match_or.patterns {
+                    self.infer_match_pattern(pattern);
+                }
+            }
+            _ => {
+                self.infer_nested_match_pattern(pattern);
+            }
+        }
+    }
+
+    fn infer_nested_match_pattern(&mut self, pattern: &ast::Pattern) {
+        match pattern {
+            ast::Pattern::MatchValue(match_value) => {
+                self.infer_maybe_standalone_expression(&match_value.value, TypeContext::default());
+            }
+            ast::Pattern::MatchSequence(match_sequence) => {
+                for pattern in &match_sequence.patterns {
+                    self.infer_nested_match_pattern(pattern);
+                }
+            }
+            ast::Pattern::MatchMapping(match_mapping) => {
+                let ast::PatternMatchMapping {
+                    range: _,
+                    node_index: _,
+                    keys,
+                    patterns,
+                    rest: _,
+                } = match_mapping;
+                for key in keys {
+                    self.infer_expression(key, TypeContext::default());
+                }
+                for pattern in patterns {
+                    self.infer_nested_match_pattern(pattern);
+                }
+            }
+            ast::Pattern::MatchClass(match_class) => {
+                let ast::PatternMatchClass {
+                    range: _,
+                    node_index: _,
+                    cls,
+                    arguments,
+                } = match_class;
+                for pattern in &arguments.patterns {
+                    self.infer_nested_match_pattern(pattern);
+                }
+                for keyword in &arguments.keywords {
+                    self.infer_nested_match_pattern(&keyword.pattern);
+                }
+                self.infer_maybe_standalone_expression(cls, TypeContext::default());
+            }
+            ast::Pattern::MatchAs(match_as) => {
+                if let Some(pattern) = &match_as.pattern {
+                    self.infer_nested_match_pattern(pattern);
+                }
+            }
+            ast::Pattern::MatchOr(match_or) => {
+                for pattern in &match_or.patterns {
+                    self.infer_nested_match_pattern(pattern);
+                }
+            }
+            ast::Pattern::MatchStar(_) | ast::Pattern::MatchSingleton(_) => {}
+        }
+    }
+
+    fn infer_assignment_statement(&mut self, assignment: &ast::StmtAssign) {
+        let ast::StmtAssign {
+            range: _,
+            node_index: _,
+            targets,
+            value,
+        } = assignment;
+
+        for target in targets {
+            self.infer_target(target, value, |builder| {
+                builder.infer_standalone_expression(value, TypeContext::default())
+            });
+        }
+    }
+
+    /// Infer the (definition) types involved in a `target` expression.
+    ///
+    /// This is used for assignment statements, for statements, etc. with a single or multiple
+    /// targets (unpacking). If `target` is an attribute expression, we check that the assignment
+    /// is valid. For 'target's that are definitions, this check happens elsewhere.
+    ///
+    /// The `infer_value_expr` function is used to infer the type of the `value` expression which
+    /// are not `Name` expressions. The returned type is the one that is eventually assigned to the
+    /// `target`.
+    fn infer_target<F>(&mut self, target: &ast::Expr, value: &ast::Expr, infer_value_expr: F)
+    where
+        F: Fn(&mut Self) -> Type<'db>,
+    {
+        let assigned_ty = match target {
+            ast::Expr::Name(_) => None,
+            _ => Some(infer_value_expr(self)),
+        };
+        self.infer_target_impl(target, value, assigned_ty);
+    }
+
+    /// Make sure that the subscript assignment `obj[slice] = value` is valid.
+    fn validate_subscript_assignment(
+        &mut self,
+        target: &ast::ExprSubscript,
+        rhs: &ast::Expr,
+        assigned_ty: Type<'db>,
+    ) -> bool {
+        let ast::ExprSubscript {
+            range: _,
+            node_index: _,
+            value,
+            slice,
+            ctx: _,
+        } = target;
+
+        let value_ty = self.infer_expression(value, TypeContext::default());
+        let slice_ty = self.infer_expression(slice, TypeContext::default());
+
+        let db = self.db();
+        let context = &self.context;
+
+        match value_ty.try_call_dunder(
+            db,
+            "__setitem__",
+            CallArguments::positional([slice_ty, assigned_ty]),
+            TypeContext::default(),
+        ) {
+            Ok(_) => true,
+            Err(err) => match err {
+                CallDunderError::PossiblyUnbound { .. } => {
+                    if let Some(builder) =
+                        context.report_lint(&POSSIBLY_MISSING_IMPLICIT_CALL, &**value)
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Method `__setitem__` of type `{}` may be missing",
+                            value_ty.display(db),
+                        ));
+                    }
+                    false
+                }
+                CallDunderError::CallError(call_error_kind, bindings) => {
+                    match call_error_kind {
+                        CallErrorKind::NotCallable => {
+                            if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, &**value)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Method `__setitem__` of type `{}` is not callable \
+                                    on object of type `{}`",
+                                    bindings.callable_type().display(db),
+                                    value_ty.display(db),
+                                ));
+                            }
+                        }
+                        CallErrorKind::BindingError => {
+                            let assigned_d = assigned_ty.display(db);
+                            let value_d = value_ty.display(db);
+
+                            if let Some(typed_dict) = value_ty.as_typed_dict() {
+                                if let Some(key) = slice_ty.as_string_literal() {
+                                    let key = key.value(self.db());
+                                    validate_typed_dict_key_assignment(
+                                        &self.context,
+                                        typed_dict,
+                                        key,
+                                        assigned_ty,
+                                        value.as_ref(),
+                                        slice.as_ref(),
+                                        rhs,
+                                        TypedDictAssignmentKind::Subscript,
+                                    );
+                                } else {
+                                    // Check if the key has a valid type. We only allow string literals, a union of string literals,
+                                    // or a dynamic type like `Any`. We can do this by checking assignability to `LiteralString`,
+                                    // but we need to exclude `LiteralString` itself. This check would technically allow weird key
+                                    // types like `LiteralString & Any` to pass, but it does not need to be perfect. We would just
+                                    // fail to provide the "Only string literals are allowed" hint in that case.
+                                    if slice_ty.is_assignable_to(db, Type::LiteralString)
+                                        && !slice_ty.is_equivalent_to(db, Type::LiteralString)
+                                    {
+                                        if let Some(builder) =
+                                            context.report_lint(&INVALID_ASSIGNMENT, &**slice)
+                                        {
+                                            builder.into_diagnostic(format_args!(
+                                                "Cannot assign value of type `{assigned_d}` to key of type `{}` on TypedDict `{value_d}`",
+                                                slice_ty.display(db)
+                                            ));
+                                        }
+                                    } else {
+                                        if let Some(builder) =
+                                            context.report_lint(&INVALID_KEY, &**slice)
+                                        {
+                                            builder.into_diagnostic(format_args!(
+                                                "Cannot access `{value_d}` with a key of type `{}`. Only string literals are allowed as keys on TypedDicts.",
+                                                slice_ty.display(db)
+                                            ));
+                                        }
+                                    }
+                                }
+                            } else {
+                                if let Some(builder) =
+                                    context.report_lint(&INVALID_ASSIGNMENT, &**value)
+                                {
+                                    builder.into_diagnostic(format_args!(
+                                        "Method `__setitem__` of type `{}` cannot be called with \
+                                        a key of type `{}` and a value of type `{assigned_d}` on object of type `{value_d}`",
+                                        bindings.callable_type().display(db),
+                                        slice_ty.display(db),
+                                    ));
+                                }
+                            }
+                        }
+                        CallErrorKind::PossiblyNotCallable => {
+                            if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, &**value)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Method `__setitem__` of type `{}` may not be \
+                                    callable on object of type `{}`",
+                                    bindings.callable_type().display(db),
+                                    value_ty.display(db),
+                                ));
+                            }
+                        }
+                    }
+                    false
+                }
+                CallDunderError::MethodNotAvailable => {
+                    if let Some(builder) = context.report_lint(&INVALID_ASSIGNMENT, &**value) {
+                        builder.into_diagnostic(format_args!(
+                            "Cannot assign to object of type `{}` with no `__setitem__` method",
+                            value_ty.display(db),
+                        ));
+                    }
+
+                    false
+                }
+            },
+        }
+    }
+
+    /// Make sure that the attribute assignment `obj.attribute = value` is valid.
+    ///
+    /// `target` is the node for the left-hand side, `object_ty` is the type of `obj`, `attribute` is
+    /// the name of the attribute being assigned, and `value_ty` is the type of the right-hand side of
+    /// the assignment. If the assignment is invalid, emit diagnostics.
+    fn validate_attribute_assignment(
+        &mut self,
+        target: &ast::ExprAttribute,
+        object_ty: Type<'db>,
+        attribute: &str,
+        value_ty: Type<'db>,
+        emit_diagnostics: bool,
+    ) -> bool {
+        let db = self.db();
+
+        let ensure_assignable_to = |attr_ty| -> bool {
+            let assignable = value_ty.is_assignable_to(db, attr_ty);
+            if !assignable && emit_diagnostics {
+                report_invalid_attribute_assignment(
+                    &self.context,
+                    target.into(),
+                    attr_ty,
+                    value_ty,
+                    attribute,
+                );
+            }
+            assignable
+        };
+
+        // Return true (and emit a diagnostic) if this is an invalid assignment to a `Final` attribute.
+        let invalid_assignment_to_final = |qualifiers: TypeQualifiers| -> bool {
+            if qualifiers.contains(TypeQualifiers::FINAL) {
+                if emit_diagnostics {
+                    if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target) {
+                        builder.into_diagnostic(format_args!(
+                            "Cannot assign to final attribute `{attribute}` \
+                                         on type `{}`",
+                            object_ty.display(db)
+                        ));
+                    }
+                }
+                true
+            } else {
+                false
+            }
+        };
+
+        match object_ty {
+            Type::Union(union) => {
+                if union.elements(self.db()).iter().all(|elem| {
+                    self.validate_attribute_assignment(target, *elem, attribute, value_ty, false)
+                }) {
+                    true
+                } else {
+                    // TODO: This is not a very helpful error message, as it does not include the underlying reason
+                    // why the assignment is invalid. This would be a good use case for sub-diagnostics.
+                    if emit_diagnostics {
+                        if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Object of type `{}` is not assignable \
+                                 to attribute `{attribute}` on type `{}`",
+                                value_ty.display(self.db()),
+                                object_ty.display(self.db()),
+                            ));
+                        }
+                    }
+
+                    false
+                }
+            }
+
+            Type::Intersection(intersection) => {
+                // TODO: Handle negative intersection elements
+                if intersection.positive(db).iter().any(|elem| {
+                    self.validate_attribute_assignment(target, *elem, attribute, value_ty, false)
+                }) {
+                    true
+                } else {
+                    if emit_diagnostics {
+                        if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target)
+                        {
+                            // TODO: same here, see above
+                            builder.into_diagnostic(format_args!(
+                                "Object of type `{}` is not assignable \
+                                 to attribute `{attribute}` on type `{}`",
+                                value_ty.display(self.db()),
+                                object_ty.display(self.db()),
+                            ));
+                        }
+                    }
+                    false
+                }
+            }
+
+            Type::TypeAlias(alias) => self.validate_attribute_assignment(
+                target,
+                alias.value_type(self.db()),
+                attribute,
+                value_ty,
+                emit_diagnostics,
+            ),
+
+            // Super instances do not allow attribute assignment
+            Type::NominalInstance(instance) if instance.has_known_class(db, KnownClass::Super) => {
+                if emit_diagnostics {
+                    if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target) {
+                        builder.into_diagnostic(format_args!(
+                            "Cannot assign to attribute `{attribute}` on type `{}`",
+                            object_ty.display(self.db()),
+                        ));
+                    }
+                }
+                false
+            }
+            Type::BoundSuper(_) => {
+                if emit_diagnostics {
+                    if let Some(builder) = self.context.report_lint(&INVALID_ASSIGNMENT, target) {
+                        builder.into_diagnostic(format_args!(
+                            "Cannot assign to attribute `{attribute}` on type `{}`",
+                            object_ty.display(self.db()),
+                        ));
+                    }
+                }
+                false
+            }
+
+            Type::Dynamic(..) | Type::Never => true,
+
+            Type::NominalInstance(..)
+            | Type::ProtocolInstance(_)
+            | Type::BooleanLiteral(..)
+            | Type::IntLiteral(..)
+            | Type::StringLiteral(..)
+            | Type::BytesLiteral(..)
+            | Type::EnumLiteral(..)
+            | Type::LiteralString
+            | Type::SpecialForm(..)
+            | Type::KnownInstance(..)
+            | Type::PropertyInstance(..)
+            | Type::FunctionLiteral(..)
+            | Type::Callable(..)
+            | Type::BoundMethod(_)
+            | Type::KnownBoundMethod(_)
+            | Type::WrapperDescriptor(_)
+            | Type::DataclassDecorator(_)
+            | Type::DataclassTransformer(_)
+            | Type::TypeVar(..)
+            | Type::AlwaysTruthy
+            | Type::AlwaysFalsy
+            | Type::TypeIs(_)
+            | Type::TypedDict(_) => {
+                // First, try to call the `__setattr__` dunder method. If this is present/defined, overrides
+                // assigning the attributed by the normal mechanism.
+                let setattr_dunder_call_result = object_ty.try_call_dunder_with_policy(
+                    db,
+                    "__setattr__",
+                    &mut CallArguments::positional([Type::string_literal(db, attribute), value_ty]),
+                    TypeContext::default(),
+                    MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK,
+                );
+
+                let check_setattr_return_type = |result: Bindings<'db>| -> bool {
+                    match result.return_type(db) {
+                        Type::Never => {
+                            if emit_diagnostics {
+                                if let Some(builder) =
+                                    self.context.report_lint(&INVALID_ASSIGNMENT, target)
+                                {
+                                    let is_setattr_synthesized = match object_ty
+                                        .class_member_with_policy(
+                                            db,
+                                            "__setattr__".into(),
+                                            MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK,
+                                        ) {
+                                        PlaceAndQualifiers {
+                                            place: Place::Defined(attr_ty, _, _),
+                                            qualifiers: _,
+                                        } => attr_ty.is_callable_type(),
+                                        _ => false,
+                                    };
+
+                                    let member_exists =
+                                        !object_ty.member(db, attribute).place.is_undefined();
+
+                                    let msg = if !member_exists {
+                                        format!(
+                                            "Can not assign to unresolved attribute `{attribute}` on type `{}`",
+                                            object_ty.display(db)
+                                        )
+                                    } else if is_setattr_synthesized {
+                                        format!(
+                                            "Property `{attribute}` defined in `{}` is read-only",
+                                            object_ty.display(db)
+                                        )
+                                    } else {
+                                        format!(
+                                            "Cannot assign to attribute `{attribute}` on type `{}` \
+                                                 whose `__setattr__` method returns `Never`/`NoReturn`",
+                                            object_ty.display(db)
+                                        )
+                                    };
+
+                                    builder.into_diagnostic(msg);
+                                }
+                            }
+                            false
+                        }
+                        _ => true,
+                    }
+                };
+
+                match setattr_dunder_call_result {
+                    Ok(result) => check_setattr_return_type(result),
+                    Err(CallDunderError::PossiblyUnbound(result)) => {
+                        check_setattr_return_type(*result)
+                    }
+                    Err(CallDunderError::CallError(..)) => {
+                        if emit_diagnostics {
+                            if let Some(builder) =
+                                self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Can not assign object of type `{}` to attribute \
+                                     `{attribute}` on type `{}` with \
+                                     custom `__setattr__` method.",
+                                    value_ty.display(db),
+                                    object_ty.display(db)
+                                ));
+                            }
+                        }
+                        false
+                    }
+                    Err(CallDunderError::MethodNotAvailable) => {
+                        match object_ty.class_member(db, attribute.into()) {
+                            meta_attr @ PlaceAndQualifiers { .. } if meta_attr.is_class_var() => {
+                                if emit_diagnostics {
+                                    if let Some(builder) =
+                                        self.context.report_lint(&INVALID_ATTRIBUTE_ACCESS, target)
+                                    {
+                                        builder.into_diagnostic(format_args!(
+                                            "Cannot assign to ClassVar `{attribute}` \
+                                     from an instance of type `{ty}`",
+                                            ty = object_ty.display(self.db()),
+                                        ));
+                                    }
+                                }
+                                false
+                            }
+                            PlaceAndQualifiers {
+                                place: Place::Defined(meta_attr_ty, _, meta_attr_boundness),
+                                qualifiers,
+                            } => {
+                                if invalid_assignment_to_final(qualifiers) {
+                                    return false;
+                                }
+
+                                let assignable_to_meta_attr =
+                                    if let Place::Defined(meta_dunder_set, _, _) =
+                                        meta_attr_ty.class_member(db, "__set__".into()).place
+                                    {
+                                        let dunder_set_result = meta_dunder_set.try_call(
+                                            db,
+                                            &CallArguments::positional([
+                                                meta_attr_ty,
+                                                object_ty,
+                                                value_ty,
+                                            ]),
+                                        );
+
+                                        if emit_diagnostics {
+                                            if let Err(dunder_set_failure) =
+                                                dunder_set_result.as_ref()
+                                            {
+                                                report_bad_dunder_set_call(
+                                                    &self.context,
+                                                    dunder_set_failure,
+                                                    attribute,
+                                                    object_ty,
+                                                    target,
+                                                );
+                                            }
+                                        }
+
+                                        dunder_set_result.is_ok()
+                                    } else {
+                                        ensure_assignable_to(meta_attr_ty)
+                                    };
+
+                                let assignable_to_instance_attribute = if meta_attr_boundness
+                                    == Definedness::PossiblyUndefined
+                                {
+                                    let (assignable, boundness) = if let PlaceAndQualifiers {
+                                        place:
+                                            Place::Defined(instance_attr_ty, _, instance_attr_boundness),
+                                        qualifiers,
+                                    } =
+                                        object_ty.instance_member(db, attribute)
+                                    {
+                                        if invalid_assignment_to_final(qualifiers) {
+                                            return false;
+                                        }
+
+                                        (
+                                            ensure_assignable_to(instance_attr_ty),
+                                            instance_attr_boundness,
+                                        )
+                                    } else {
+                                        (true, Definedness::PossiblyUndefined)
+                                    };
+
+                                    if boundness == Definedness::PossiblyUndefined {
+                                        report_possibly_missing_attribute(
+                                            &self.context,
+                                            target,
+                                            attribute,
+                                            object_ty,
+                                        );
+                                    }
+
+                                    assignable
+                                } else {
+                                    true
+                                };
+
+                                assignable_to_meta_attr && assignable_to_instance_attribute
+                            }
+
+                            PlaceAndQualifiers {
+                                place: Place::Undefined,
+                                ..
+                            } => {
+                                if let PlaceAndQualifiers {
+                                    place:
+                                        Place::Defined(instance_attr_ty, _, instance_attr_boundness),
+                                    qualifiers,
+                                } = object_ty.instance_member(db, attribute)
+                                {
+                                    if invalid_assignment_to_final(qualifiers) {
+                                        return false;
+                                    }
+
+                                    if instance_attr_boundness == Definedness::PossiblyUndefined {
+                                        report_possibly_missing_attribute(
+                                            &self.context,
+                                            target,
+                                            attribute,
+                                            object_ty,
+                                        );
+                                    }
+
+                                    ensure_assignable_to(instance_attr_ty)
+                                } else {
+                                    if emit_diagnostics {
+                                        if let Some(builder) =
+                                            self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
+                                        {
+                                            builder.into_diagnostic(format_args!(
+                                                "Unresolved attribute `{}` on type `{}`.",
+                                                attribute,
+                                                object_ty.display(db)
+                                            ));
+                                        }
+                                    }
+
+                                    false
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            Type::ClassLiteral(..) | Type::GenericAlias(..) | Type::SubclassOf(..) => {
+                match object_ty.class_member(db, attribute.into()) {
+                    PlaceAndQualifiers {
+                        place: Place::Defined(meta_attr_ty, _, meta_attr_boundness),
+                        qualifiers,
+                    } => {
+                        if invalid_assignment_to_final(qualifiers) {
+                            return false;
+                        }
+
+                        let assignable_to_meta_attr = if let Place::Defined(meta_dunder_set, _, _) =
+                            meta_attr_ty.class_member(db, "__set__".into()).place
+                        {
+                            let dunder_set_result = meta_dunder_set.try_call(
+                                db,
+                                &CallArguments::positional([meta_attr_ty, object_ty, value_ty]),
+                            );
+
+                            if emit_diagnostics {
+                                if let Err(dunder_set_failure) = dunder_set_result.as_ref() {
+                                    report_bad_dunder_set_call(
+                                        &self.context,
+                                        dunder_set_failure,
+                                        attribute,
+                                        object_ty,
+                                        target,
+                                    );
+                                }
+                            }
+
+                            dunder_set_result.is_ok()
+                        } else {
+                            ensure_assignable_to(meta_attr_ty)
+                        };
+
+                        let assignable_to_class_attr = if meta_attr_boundness
+                            == Definedness::PossiblyUndefined
+                        {
+                            let (assignable, boundness) =
+                                if let Place::Defined(class_attr_ty, _, class_attr_boundness) =
+                                    object_ty
+                                        .find_name_in_mro(db, attribute)
+                                        .expect("called on Type::ClassLiteral or Type::SubclassOf")
+                                        .place
+                                {
+                                    (ensure_assignable_to(class_attr_ty), class_attr_boundness)
+                                } else {
+                                    (true, Definedness::PossiblyUndefined)
+                                };
+
+                            if boundness == Definedness::PossiblyUndefined {
+                                report_possibly_missing_attribute(
+                                    &self.context,
+                                    target,
+                                    attribute,
+                                    object_ty,
+                                );
+                            }
+
+                            assignable
+                        } else {
+                            true
+                        };
+
+                        assignable_to_meta_attr && assignable_to_class_attr
+                    }
+                    PlaceAndQualifiers {
+                        place: Place::Undefined,
+                        ..
+                    } => {
+                        if let PlaceAndQualifiers {
+                            place: Place::Defined(class_attr_ty, _, class_attr_boundness),
+                            qualifiers,
+                        } = object_ty
+                            .find_name_in_mro(db, attribute)
+                            .expect("called on Type::ClassLiteral or Type::SubclassOf")
+                        {
+                            if invalid_assignment_to_final(qualifiers) {
+                                return false;
+                            }
+
+                            if class_attr_boundness == Definedness::PossiblyUndefined {
+                                report_possibly_missing_attribute(
+                                    &self.context,
+                                    target,
+                                    attribute,
+                                    object_ty,
+                                );
+                            }
+
+                            ensure_assignable_to(class_attr_ty)
+                        } else {
+                            let attribute_is_bound_on_instance =
+                                object_ty.to_instance(self.db()).is_some_and(|instance| {
+                                    !instance
+                                        .instance_member(self.db(), attribute)
+                                        .place
+                                        .is_undefined()
+                                });
+
+                            // Attribute is declared or bound on instance. Forbid access from the class object
+                            if emit_diagnostics {
+                                if attribute_is_bound_on_instance {
+                                    if let Some(builder) =
+                                        self.context.report_lint(&INVALID_ATTRIBUTE_ACCESS, target)
+                                    {
+                                        builder.into_diagnostic(format_args!(
+                                            "Cannot assign to instance attribute \
+                                             `{attribute}` from the class object `{ty}`",
+                                            ty = object_ty.display(self.db()),
+                                        ));
+                                    }
+                                } else {
+                                    if let Some(builder) =
+                                        self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
+                                    {
+                                        builder.into_diagnostic(format_args!(
+                                            "Unresolved attribute `{}` on type `{}`.",
+                                            attribute,
+                                            object_ty.display(db)
+                                        ));
+                                    }
+                                }
+                            }
+
+                            false
+                        }
+                    }
+                }
+            }
+
+            Type::ModuleLiteral(module) => {
+                if let Place::Defined(attr_ty, _, _) = module.static_member(db, attribute).place {
+                    let assignable = value_ty.is_assignable_to(db, attr_ty);
+                    if assignable {
+                        true
+                    } else {
+                        if emit_diagnostics {
+                            report_invalid_attribute_assignment(
+                                &self.context,
+                                target.into(),
+                                attr_ty,
+                                value_ty,
+                                attribute,
+                            );
+                        }
+                        false
+                    }
+                } else {
+                    if emit_diagnostics {
+                        if let Some(builder) =
+                            self.context.report_lint(&UNRESOLVED_ATTRIBUTE, target)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Unresolved attribute `{}` on type `{}`.",
+                                attribute,
+                                object_ty.display(db)
+                            ));
+                        }
+                    }
+
+                    false
+                }
+            }
+        }
+    }
+
+    fn infer_target_impl(
+        &mut self,
+        target: &ast::Expr,
+        value: &ast::Expr,
+        assigned_ty: Option<Type<'db>>,
+    ) {
+        match target {
+            ast::Expr::Name(name) => self.infer_definition(name),
+            ast::Expr::List(ast::ExprList { elts, .. })
+            | ast::Expr::Tuple(ast::ExprTuple { elts, .. }) => {
+                if let Some(tuple_spec) =
+                    assigned_ty.and_then(|ty| ty.tuple_instance_spec(self.db()))
+                {
+                    let mut assigned_tys = tuple_spec.all_elements();
+                    for element in elts {
+                        self.infer_target_impl(element, value, assigned_tys.next().copied());
+                    }
+                } else {
+                    for element in elts {
+                        self.infer_target_impl(element, value, None);
+                    }
+                }
+            }
+            ast::Expr::Attribute(
+                attr_expr @ ast::ExprAttribute {
+                    value: object,
+                    ctx: ExprContext::Store,
+                    attr,
+                    ..
+                },
+            ) => {
+                self.store_expression_type(target, assigned_ty.unwrap_or(Type::unknown()));
+
+                let object_ty = self.infer_expression(object, TypeContext::default());
+
+                if let Some(assigned_ty) = assigned_ty {
+                    self.validate_attribute_assignment(
+                        attr_expr,
+                        object_ty,
+                        attr.id(),
+                        assigned_ty,
+                        true,
+                    );
+                }
+            }
+            ast::Expr::Subscript(subscript_expr) => {
+                self.store_expression_type(target, assigned_ty.unwrap_or(Type::unknown()));
+
+                if let Some(assigned_ty) = assigned_ty {
+                    self.validate_subscript_assignment(subscript_expr, value, assigned_ty);
+                }
+            }
+            _ => {
+                // TODO: Remove this once we handle all possible assignment targets.
+                self.infer_expression(target, TypeContext::default());
+            }
+        }
+    }
+
+    fn infer_assignment_definition(
+        &mut self,
+        assignment: &AssignmentDefinitionKind<'db>,
+        definition: Definition<'db>,
+    ) {
+        let target = assignment.target(self.module());
+
+        self.add_binding(target.into(), definition, |builder, tcx| {
+            let target_ty = builder.infer_assignment_definition_impl(assignment, definition, tcx);
+            builder.store_expression_type(target, target_ty);
+            target_ty
+        });
+    }
+
+    fn infer_assignment_definition_impl(
+        &mut self,
+        assignment: &AssignmentDefinitionKind<'db>,
+        definition: Definition<'db>,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        let value = assignment.value(self.module());
+        let target = assignment.target(self.module());
+
+        let mut target_ty = match assignment.target_kind() {
+            TargetKind::Sequence(unpack_position, unpack) => {
+                let unpacked = infer_unpack_types(self.db(), unpack);
+                // Only copy the diagnostics if this is the first assignment to avoid duplicating the
+                // unpack assignments.
+                if unpack_position == UnpackPosition::First {
+                    self.context.extend(unpacked.diagnostics());
+                }
+
+                unpacked.expression_type(target)
+            }
+            TargetKind::Single => {
+                let value_ty = if let Some(standalone_expression) = self.index.try_expression(value)
+                {
+                    self.infer_standalone_expression_impl(value, standalone_expression, tcx)
+                } else if let ast::Expr::Call(call_expr) = value {
+                    // If the RHS is not a standalone expression, this is a simple assignment
+                    // (single target, no unpackings). That means it's a valid syntactic form
+                    // for a legacy TypeVar creation; check for that.
+                    let callable_type = self.infer_maybe_standalone_expression(
+                        call_expr.func.as_ref(),
+                        TypeContext::default(),
+                    );
+
+                    let typevar_class = callable_type
+                        .as_class_literal()
+                        .and_then(|cls| cls.known(self.db()))
+                        .filter(|cls| {
+                            matches!(cls, KnownClass::TypeVar | KnownClass::ExtensionsTypeVar)
+                        });
+
+                    let ty = if let Some(typevar_class) = typevar_class {
+                        self.infer_legacy_typevar(target, call_expr, definition, typevar_class)
+                    } else {
+                        self.infer_call_expression_impl(call_expr, callable_type, tcx)
+                    };
+
+                    self.store_expression_type(value, ty);
+                    ty
+                } else {
+                    self.infer_expression(value, tcx)
+                };
+
+                // `TYPE_CHECKING` is a special variable that should only be assigned `False`
+                // at runtime, but is always considered `True` in type checking.
+                // See mdtest/known_constants.md#user-defined-type_checking for details.
+                if target.as_name_expr().map(|name| name.id.as_str()) == Some("TYPE_CHECKING") {
+                    if !matches!(
+                        value.as_boolean_literal_expr(),
+                        Some(ast::ExprBooleanLiteral { value: false, .. })
+                    ) {
+                        report_invalid_type_checking_constant(&self.context, target.into());
+                    }
+                    Type::BooleanLiteral(true)
+                } else if self.in_stub() && value.is_ellipsis_literal_expr() {
+                    Type::unknown()
+                } else {
+                    value_ty
+                }
+            }
+        };
+
+        if let Some(special_form) = target.as_name_expr().and_then(|name| {
+            SpecialFormType::try_from_file_and_name(self.db(), self.file(), &name.id)
+        }) {
+            target_ty = Type::SpecialForm(special_form);
+        }
+
+        target_ty
+    }
+
+    fn infer_legacy_typevar(
+        &mut self,
+        target: &ast::Expr,
+        call_expr: &ast::ExprCall,
+        definition: Definition<'db>,
+        known_class: KnownClass,
+    ) -> Type<'db> {
+        fn error<'db>(
+            context: &InferContext<'db, '_>,
+            message: impl std::fmt::Display,
+            node: impl Ranged,
+        ) -> Type<'db> {
+            if let Some(builder) = context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, node) {
+                builder.into_diagnostic(message);
+            }
+            // If the call doesn't create a valid typevar, we'll emit diagnostics and fall back to
+            // just creating a regular instance of `typing.TypeVar`.
+            KnownClass::TypeVar.to_instance(context.db())
+        }
+
+        let db = self.db();
+        let arguments = &call_expr.arguments;
+        let is_typing_extensions = known_class == KnownClass::ExtensionsTypeVar;
+        let assume_all_features = self.in_stub() || is_typing_extensions;
+        let python_version = Program::get(db).python_version(db);
+        let have_features_from =
+            |version: PythonVersion| assume_all_features || python_version >= version;
+
+        let mut has_bound = false;
+        let mut default = None;
+        let mut covariant = false;
+        let mut contravariant = false;
+        let mut name_param_ty = None;
+
+        if let Some(starred) = arguments.args.iter().find(|arg| arg.is_starred_expr()) {
+            return error(
+                &self.context,
+                "Starred arguments are not supported in `TypeVar` creation",
+                starred,
+            );
+        }
+
+        for kwarg in &arguments.keywords {
+            let Some(identifier) = kwarg.arg.as_ref() else {
+                return error(
+                    &self.context,
+                    "Starred arguments are not supported in `TypeVar` creation",
+                    kwarg,
+                );
+            };
+            match identifier.id().as_str() {
+                "name" => {
+                    // Duplicate keyword argument is a syntax error, so we don't have to check if
+                    // `name_param_ty.is_some()` here.
+                    if !arguments.args.is_empty() {
+                        return error(
+                            &self.context,
+                            "The `name` parameter of `TypeVar` can only be provided once.",
+                            kwarg,
+                        );
+                    }
+                    name_param_ty =
+                        Some(self.infer_expression(&kwarg.value, TypeContext::default()));
+                }
+                "bound" => has_bound = true,
+                "covariant" => {
+                    match self
+                        .infer_expression(&kwarg.value, TypeContext::default())
+                        .bool(db)
+                    {
+                        Truthiness::AlwaysTrue => covariant = true,
+                        Truthiness::AlwaysFalse => {}
+                        Truthiness::Ambiguous => {
+                            return error(
+                                &self.context,
+                                "The `covariant` parameter of `TypeVar` \
+                                cannot have an ambiguous truthiness",
+                                &kwarg.value,
+                            );
+                        }
+                    }
+                }
+                "contravariant" => {
+                    match self
+                        .infer_expression(&kwarg.value, TypeContext::default())
+                        .bool(db)
+                    {
+                        Truthiness::AlwaysTrue => contravariant = true,
+                        Truthiness::AlwaysFalse => {}
+                        Truthiness::Ambiguous => {
+                            return error(
+                                &self.context,
+                                "The `contravariant` parameter of `TypeVar` \
+                                cannot have an ambiguous truthiness",
+                                &kwarg.value,
+                            );
+                        }
+                    }
+                }
+                "default" => {
+                    if !have_features_from(PythonVersion::PY313) {
+                        // We don't return here; this error is informational since this will error
+                        // at runtime, but the user's intent is plain, we may as well respect it.
+                        error(
+                            &self.context,
+                            "The `default` parameter of `typing.TypeVar` was added in Python 3.13",
+                            kwarg,
+                        );
+                    }
+
+                    default = Some(TypeVarDefaultEvaluation::Lazy);
+                }
+                "infer_variance" => {
+                    if !have_features_from(PythonVersion::PY312) {
+                        // We don't return here; this error is informational since this will error
+                        // at runtime, but the user's intent is plain, we may as well respect it.
+                        error(
+                            &self.context,
+                            "The `infer_variance` parameter of `typing.TypeVar` was added in Python 3.12",
+                            kwarg,
+                        );
+                    }
+                    // TODO support `infer_variance` in legacy TypeVars
+                    if self
+                        .infer_expression(&kwarg.value, TypeContext::default())
+                        .bool(db)
+                        .is_ambiguous()
+                    {
+                        return error(
+                            &self.context,
+                            "The `infer_variance` parameter of `TypeVar` \
+                            cannot have an ambiguous truthiness",
+                            &kwarg.value,
+                        );
+                    }
+                }
+                name => {
+                    // We don't return here; this error is informational since this will error
+                    // at runtime, but it will likely cause fewer cascading errors if we just
+                    // ignore the unknown keyword and still understand as much of the typevar as we
+                    // can.
+                    error(
+                        &self.context,
+                        format_args!("Unknown keyword argument `{name}` in `TypeVar` creation",),
+                        kwarg,
+                    );
+                    self.infer_expression(&kwarg.value, TypeContext::default());
+                }
+            }
+        }
+
+        let variance = match (covariant, contravariant) {
+            (true, true) => {
+                return error(
+                    &self.context,
+                    "A `TypeVar` cannot be both covariant and contravariant",
+                    call_expr,
+                );
+            }
+            (true, false) => TypeVarVariance::Covariant,
+            (false, true) => TypeVarVariance::Contravariant,
+            (false, false) => TypeVarVariance::Invariant,
+        };
+
+        let Some(name_param_ty) = name_param_ty.or_else(|| {
+            arguments
+                .find_positional(0)
+                .map(|arg| self.infer_expression(arg, TypeContext::default()))
+        }) else {
+            return error(
+                &self.context,
+                "The `name` parameter of `TypeVar` is required.",
+                call_expr,
+            );
+        };
+
+        let Some(name_param) = name_param_ty.as_string_literal().map(|name| name.value(db)) else {
+            return error(
+                &self.context,
+                "The first argument to `TypeVar` must be a string literal.",
+                call_expr,
+            );
+        };
+
+        let ast::Expr::Name(ast::ExprName {
+            id: target_name, ..
+        }) = target
+        else {
+            return error(
+                &self.context,
+                "A `TypeVar` definition must be a simple variable assignment",
+                target,
+            );
+        };
+
+        if name_param != target_name {
+            return error(
+                &self.context,
+                format_args!(
+                    "The name of a `TypeVar` (`{name_param}`) must match \
+                    the name of the variable it is assigned to (`{target_name}`)"
+                ),
+                target,
+            );
+        }
+
+        // Inference of bounds, constraints, and defaults must be deferred, to avoid cycles. So we
+        // only check presence/absence/number here.
+
+        let num_constraints = arguments.args.len().saturating_sub(1);
+
+        let bound_or_constraints = match (has_bound, num_constraints) {
+            (false, 0) => None,
+            (true, 0) => Some(TypeVarBoundOrConstraintsEvaluation::LazyUpperBound),
+            (true, _) => {
+                return error(
+                    &self.context,
+                    "A `TypeVar` cannot have both a bound and constraints",
+                    call_expr,
+                );
+            }
+            (_, 1) => {
+                return error(
+                    &self.context,
+                    "A `TypeVar` cannot have exactly one constraint",
+                    &arguments.args[1],
+                );
+            }
+            (false, _) => Some(TypeVarBoundOrConstraintsEvaluation::LazyConstraints),
+        };
+
+        if bound_or_constraints.is_some() || default.is_some() {
+            self.deferred.insert(definition);
+        }
+
+        let identity = TypeVarIdentity::new(db, target_name, Some(definition), TypeVarKind::Legacy);
+        Type::KnownInstance(KnownInstanceType::TypeVar(TypeVarInstance::new(
+            db,
+            identity,
+            bound_or_constraints,
+            Some(variance),
+            default,
+        )))
+    }
+
+    fn infer_assignment_deferred(&mut self, value: &ast::Expr) {
+        // Infer deferred bounds/constraints/defaults of a legacy TypeVar.
+        let ast::Expr::Call(ast::ExprCall { arguments, .. }) = value else {
+            return;
+        };
+        for arg in arguments.args.iter().skip(1) {
+            self.infer_type_expression(arg);
+        }
+        if let Some(bound) = arguments.find_keyword("bound") {
+            self.infer_type_expression(&bound.value);
+        }
+        if let Some(default) = arguments.find_keyword("default") {
+            self.infer_type_expression(&default.value);
+        }
+    }
+
+    fn infer_annotated_assignment_statement(&mut self, assignment: &ast::StmtAnnAssign) {
+        if assignment.target.is_name_expr() {
+            self.infer_definition(assignment);
+        } else {
+            // Non-name assignment targets are inferred as ordinary expressions, not definitions.
+            let ast::StmtAnnAssign {
+                range: _,
+                node_index: _,
+                annotation,
+                value,
+                target,
+                simple: _,
+            } = assignment;
+            let annotated =
+                self.infer_annotation_expression(annotation, DeferredExpressionState::None);
+
+            if !annotated.qualifiers.is_empty() {
+                for qualifier in [TypeQualifiers::CLASS_VAR, TypeQualifiers::INIT_VAR] {
+                    if annotated.qualifiers.contains(qualifier) {
+                        if let Some(builder) = self
+                            .context
+                            .report_lint(&INVALID_TYPE_FORM, annotation.as_ref())
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "`{name}` annotations are not allowed for non-name targets",
+                                name = qualifier.name()
+                            ));
+                        }
+                    }
+                }
+            }
+
+            if let Some(value) = value {
+                self.infer_maybe_standalone_expression(
+                    value,
+                    TypeContext::new(Some(annotated.inner_type())),
+                );
+            }
+
+            // If we have an annotated assignment like `self.attr: int = 1`, we still need to
+            // do type inference on the `self.attr` target to get types for all sub-expressions.
+            self.infer_expression(target, TypeContext::default());
+
+            // But here we explicitly overwrite the type for the overall `self.attr` node with
+            // the annotated type. We do no use `store_expression_type` here, because it checks
+            // that no type has been stored for the expression before.
+            self.expressions
+                .insert((&**target).into(), annotated.inner_type());
+        }
+    }
+
+    /// Infer the types in an annotated assignment definition.
+    fn infer_annotated_assignment_definition(
+        &mut self,
+        assignment: &'db AnnotatedAssignmentDefinitionKind,
+        definition: Definition<'db>,
+    ) {
+        let annotation = assignment.annotation(self.module());
+        let target = assignment.target(self.module());
+        let value = assignment.value(self.module());
+
+        let mut declared = self.infer_annotation_expression(
+            annotation,
+            DeferredExpressionState::from(self.defer_annotations()),
+        );
+
+        if !declared.qualifiers.is_empty() {
+            let current_scope_id = self.scope().file_scope_id(self.db());
+            let current_scope = self.index.scope(current_scope_id);
+            if current_scope.kind() != ScopeKind::Class {
+                for qualifier in [TypeQualifiers::CLASS_VAR, TypeQualifiers::INIT_VAR] {
+                    if declared.qualifiers.contains(qualifier) {
+                        if let Some(builder) =
+                            self.context.report_lint(&INVALID_TYPE_FORM, annotation)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "`{name}` annotations are only allowed in class-body scopes",
+                                name = qualifier.name()
+                            ));
+                        }
+                    }
+                }
+            }
+        }
+
+        if target
+            .as_name_expr()
+            .is_some_and(|name| &name.id == "TYPE_CHECKING")
+        {
+            if !KnownClass::Bool
+                .to_instance(self.db())
+                .is_assignable_to(self.db(), declared.inner_type())
+            {
+                // annotation not assignable from `bool` is an error
+                report_invalid_type_checking_constant(&self.context, target.into());
+            } else if self.in_stub()
+                && value
+                    .as_ref()
+                    .is_none_or(|value| value.is_ellipsis_literal_expr())
+            {
+                // stub file assigning nothing or `...` is fine
+            } else if !matches!(
+                value
+                    .as_ref()
+                    .and_then(|value| value.as_boolean_literal_expr()),
+                Some(ast::ExprBooleanLiteral { value: false, .. })
+            ) {
+                // otherwise, assigning something other than `False` is an error
+                report_invalid_type_checking_constant(&self.context, target.into());
+            }
+            declared.inner = Type::BooleanLiteral(true);
+        }
+
+        // Handle various singletons.
+        if let Some(name_expr) = target.as_name_expr() {
+            if let Some(special_form) =
+                SpecialFormType::try_from_file_and_name(self.db(), self.file(), &name_expr.id)
+            {
+                declared.inner = Type::SpecialForm(special_form);
+            }
+        }
+
+        // If the target of an assignment is not one of the place expressions we support,
+        // then they are not definitions, so we can only be here if the target is in a form supported as a place expression.
+        // In this case, we can simply store types in `target` below, instead of calling `infer_expression` (which would return `Never`).
+        debug_assert!(PlaceExpr::try_from_expr(target).is_some());
+
+        if let Some(value) = value {
+            fn field_specifiers<'db>(
+                db: &'db dyn Db,
+                index: &'db SemanticIndex<'db>,
+                scope: ScopeId<'db>,
+            ) -> Option<SmallVec<[Type<'db>; NUM_FIELD_SPECIFIERS_INLINE]>> {
+                let enclosing_scope = index.scope(scope.file_scope_id(db));
+                let class_node = enclosing_scope.node().as_class()?;
+                let class_definition = index.expect_single_definition(class_node);
+                let class_literal = infer_definition_types(db, class_definition)
+                    .declaration_type(class_definition)
+                    .inner_type()
+                    .as_class_literal()?;
+
+                class_literal
+                    .dataclass_params(db)
+                    .map(|params| SmallVec::from(params.field_specifiers(db)))
+                    .or_else(|| {
+                        Some(SmallVec::from(
+                            CodeGeneratorKind::from_class(db, class_literal, None)?
+                                .dataclass_transformer_params()?
+                                .field_specifiers(db),
+                        ))
+                    })
+            }
+
+            if let Some(specifiers) = field_specifiers(self.db(), self.index, self.scope()) {
+                self.dataclass_field_specifiers = specifiers;
+            }
+
+            let inferred_ty = self.infer_maybe_standalone_expression(
+                value,
+                TypeContext::new(Some(declared.inner_type())),
+            );
+
+            self.dataclass_field_specifiers.clear();
+
+            let inferred_ty = if target
+                .as_name_expr()
+                .is_some_and(|name| &name.id == "TYPE_CHECKING")
+            {
+                Type::BooleanLiteral(true)
+            } else if self.in_stub() && value.is_ellipsis_literal_expr() {
+                declared.inner_type()
+            } else {
+                inferred_ty
+            };
+
+            self.add_declaration_with_binding(
+                target.into(),
+                definition,
+                &DeclaredAndInferredType::MightBeDifferent {
+                    declared_ty: declared,
+                    inferred_ty,
+                },
+            );
+
+            self.store_expression_type(target, inferred_ty);
+        } else {
+            if self.in_stub() {
+                self.add_declaration_with_binding(
+                    target.into(),
+                    definition,
+                    &DeclaredAndInferredType::AreTheSame(declared),
+                );
+            } else {
+                self.add_declaration(target.into(), definition, declared);
+            }
+
+            self.store_expression_type(target, declared.inner_type());
+        }
+    }
+
+    fn infer_augmented_assignment_statement(&mut self, assignment: &ast::StmtAugAssign) {
+        if assignment.target.is_name_expr() {
+            self.infer_definition(assignment);
+        } else {
+            // Non-name assignment targets are inferred as ordinary expressions, not definitions.
+            self.infer_augment_assignment(assignment);
+        }
+    }
+
+    fn infer_augmented_op(
+        &mut self,
+        assignment: &ast::StmtAugAssign,
+        target_type: Type<'db>,
+        value_type: Type<'db>,
+    ) -> Type<'db> {
+        // If the target defines, e.g., `__iadd__`, infer the augmented assignment as a call to that
+        // dunder.
+        let op = assignment.op;
+        let db = self.db();
+
+        let report_unsupported_augmented_op = |ctx: &mut InferContext| {
+            let Some(builder) = ctx.report_lint(&UNSUPPORTED_OPERATOR, assignment) else {
+                return;
+            };
+            builder.into_diagnostic(format_args!(
+                "Operator `{op}=` is unsupported between objects of type `{}` and `{}`",
+                target_type.display(db),
+                value_type.display(db)
+            ));
+        };
+
+        // Fall back to non-augmented binary operator inference.
+        let mut binary_return_ty = || {
+            self.infer_binary_expression_type(assignment.into(), false, target_type, value_type, op)
+                .unwrap_or_else(|| {
+                    report_unsupported_augmented_op(&mut self.context);
+                    Type::unknown()
+                })
+        };
+
+        match target_type {
+            Type::Union(union) => union.map(db, |&elem_type| {
+                self.infer_augmented_op(assignment, elem_type, value_type)
+            }),
+            _ => {
+                let call = target_type.try_call_dunder(
+                    db,
+                    op.in_place_dunder(),
+                    CallArguments::positional([value_type]),
+                    TypeContext::default(),
+                );
+
+                match call {
+                    Ok(outcome) => outcome.return_type(db),
+                    Err(CallDunderError::MethodNotAvailable) => binary_return_ty(),
+                    Err(CallDunderError::PossiblyUnbound(outcome)) => {
+                        UnionType::from_elements(db, [outcome.return_type(db), binary_return_ty()])
+                    }
+                    Err(CallDunderError::CallError(_, bindings)) => {
+                        report_unsupported_augmented_op(&mut self.context);
+                        bindings.return_type(db)
+                    }
+                }
+            }
+        }
+    }
+
+    fn infer_augment_assignment_definition(
+        &mut self,
+        assignment: &ast::StmtAugAssign,
+        definition: Definition<'db>,
+    ) {
+        let target_ty = self.infer_augment_assignment(assignment);
+        self.add_binding(assignment.into(), definition, |_, _| target_ty);
+    }
+
+    fn infer_augment_assignment(&mut self, assignment: &ast::StmtAugAssign) -> Type<'db> {
+        let ast::StmtAugAssign {
+            range: _,
+            node_index: _,
+            target,
+            op: _,
+            value,
+        } = assignment;
+
+        // Resolve the target type, assuming a load context.
+        let target_type = match &**target {
+            ast::Expr::Name(name) => {
+                let previous_value = self.infer_name_load(name);
+                self.store_expression_type(target, previous_value);
+                previous_value
+            }
+            ast::Expr::Attribute(attr) => {
+                let previous_value = self.infer_attribute_load(attr);
+                self.store_expression_type(target, previous_value);
+                previous_value
+            }
+            ast::Expr::Subscript(subscript) => {
+                let previous_value = self.infer_subscript_load(subscript);
+                self.store_expression_type(target, previous_value);
+                previous_value
+            }
+            _ => self.infer_expression(target, TypeContext::default()),
+        };
+        let value_type = self.infer_expression(value, TypeContext::default());
+
+        self.infer_augmented_op(assignment, target_type, value_type)
+    }
+
+    fn infer_type_alias_statement(&mut self, node: &ast::StmtTypeAlias) {
+        self.infer_definition(node);
+    }
+
+    fn infer_for_statement(&mut self, for_statement: &ast::StmtFor) {
+        let ast::StmtFor {
+            range: _,
+            node_index: _,
+            target,
+            iter,
+            body,
+            orelse,
+            is_async: _,
+        } = for_statement;
+
+        self.infer_target(target, iter, |builder| {
+            // TODO: `infer_for_statement_definition` reports a diagnostic if `iter_ty` isn't iterable
+            //  but only if the target is a name. We should report a diagnostic here if the target isn't a name:
+            //  `for a.x in not_iterable: ...
+            builder
+                .infer_standalone_expression(iter, TypeContext::default())
+                .iterate(builder.db())
+                .homogeneous_element_type(builder.db())
+        });
+
+        self.infer_body(body);
+        self.infer_body(orelse);
+    }
+
+    fn infer_for_statement_definition(
+        &mut self,
+        for_stmt: &ForStmtDefinitionKind<'db>,
+        definition: Definition<'db>,
+    ) {
+        let iterable = for_stmt.iterable(self.module());
+        let target = for_stmt.target(self.module());
+
+        let loop_var_value_type = match for_stmt.target_kind() {
+            TargetKind::Sequence(unpack_position, unpack) => {
+                let unpacked = infer_unpack_types(self.db(), unpack);
+                if unpack_position == UnpackPosition::First {
+                    self.context.extend(unpacked.diagnostics());
+                }
+
+                unpacked.expression_type(target)
+            }
+            TargetKind::Single => {
+                let iterable_type =
+                    self.infer_standalone_expression(iterable, TypeContext::default());
+
+                iterable_type
+                    .try_iterate_with_mode(
+                        self.db(),
+                        EvaluationMode::from_is_async(for_stmt.is_async()),
+                    )
+                    .map(|tuple| tuple.homogeneous_element_type(self.db()))
+                    .unwrap_or_else(|err| {
+                        err.report_diagnostic(&self.context, iterable_type, iterable.into());
+                        err.fallback_element_type(self.db())
+                    })
+            }
+        };
+
+        self.store_expression_type(target, loop_var_value_type);
+        self.add_binding(target.into(), definition, |_, _| loop_var_value_type);
+    }
+
+    fn infer_while_statement(&mut self, while_statement: &ast::StmtWhile) {
+        let ast::StmtWhile {
+            range: _,
+            node_index: _,
+            test,
+            body,
+            orelse,
+        } = while_statement;
+
+        let test_ty = self.infer_standalone_expression(test, TypeContext::default());
+
+        if let Err(err) = test_ty.try_bool(self.db()) {
+            err.report_diagnostic(&self.context, &**test);
+        }
+
+        self.infer_body(body);
+        self.infer_body(orelse);
+    }
+
+    fn infer_import_statement(&mut self, import: &ast::StmtImport) {
+        let ast::StmtImport {
+            range: _,
+            node_index: _,
+            names,
+        } = import;
+
+        for alias in names {
+            self.infer_definition(alias);
+        }
+    }
+
+    fn report_unresolved_import(
+        &self,
+        import_node: AnyNodeRef<'_>,
+        range: TextRange,
+        level: u32,
+        module: Option<&str>,
+    ) {
+        let is_import_reachable = self.is_reachable(import_node);
+
+        if !is_import_reachable {
+            return;
+        }
+
+        let Some(builder) = self.context.report_lint(&UNRESOLVED_IMPORT, range) else {
+            return;
+        };
+        let mut diagnostic = builder.into_diagnostic(format_args!(
+            "Cannot resolve imported module `{}{}`",
+            ".".repeat(level as usize),
+            module.unwrap_or_default()
+        ));
+        if level == 0 {
+            if let Some(module_name) = module.and_then(ModuleName::new) {
+                let program = Program::get(self.db());
+                let typeshed_versions = program.search_paths(self.db()).typeshed_versions();
+
+                // Loop over ancestors in case we have info on the parent module but not submodule
+                for module_name in module_name.ancestors() {
+                    if let Some(version_range) = typeshed_versions.exact(&module_name) {
+                        // We know it is a stdlib module on *some* Python versions...
+                        let python_version = program.python_version(self.db());
+                        if !version_range.contains(python_version) {
+                            // ...But not on *this* Python version.
+                            diagnostic.info(format_args!(
+                                "The stdlib module `{module_name}` is only available on Python {version_range}",
+                                version_range = version_range.diagnostic_display(),
+                            ));
+                            add_inferred_python_version_hint_to_diagnostic(
+                                self.db(),
+                                &mut diagnostic,
+                                "resolving modules",
+                            );
+                            return;
+                        }
+                        // We found the most precise answer we could, stop searching
+                        break;
+                    }
+                }
+            }
+
+            // Add search paths information to the diagnostic
+            // Use the same search paths function that is used in actual module resolution
+            let verbose = self.db().verbose();
+            let search_paths = search_paths(self.db(), ModuleResolveMode::StubsAllowed);
+
+            diagnostic.info(format_args!(
+                "Searched in the following paths during module resolution:"
+            ));
+
+            let mut search_paths = search_paths.enumerate();
+
+            while let Some((index, path)) = search_paths.next() {
+                if index > 4 && !verbose {
+                    let more = search_paths.count() + 1;
+                    diagnostic.info(format_args!(
+                        "  ... and {more} more paths. Run with `-v` to see all paths."
+                    ));
+                    break;
+                }
+                diagnostic.info(format_args!(
+                    "  {}. {} ({})",
+                    index + 1,
+                    path,
+                    path.describe_kind()
+                ));
+            }
+
+            diagnostic.info(
+                "make sure your Python environment is properly configured: \
+                https://docs.astral.sh/ty/modules/#python-environment",
+            );
+        }
+    }
+
+    fn infer_import_definition(
+        &mut self,
+        node: &ast::StmtImport,
+        alias: &ast::Alias,
+        definition: Definition<'db>,
+    ) {
+        let ast::Alias {
+            range: _,
+            node_index: _,
+            name,
+            asname,
+        } = alias;
+
+        // The name of the module being imported
+        let Some(full_module_name) = ModuleName::new(name) else {
+            tracing::debug!("Failed to resolve import due to invalid syntax");
+            self.add_unknown_declaration_with_binding(alias.into(), definition);
+            return;
+        };
+
+        // Resolve the module being imported.
+        let Some(full_module_ty) = self.module_type_from_name(&full_module_name) else {
+            self.report_unresolved_import(node.into(), alias.range(), 0, Some(name));
+            self.add_unknown_declaration_with_binding(alias.into(), definition);
+            return;
+        };
+
+        let binding_ty = if asname.is_some() {
+            // If we are renaming the imported module via an `as` clause, then we bind the resolved
+            // module's type to that name, even if that module is nested.
+            full_module_ty
+        } else if full_module_name.contains('.') {
+            // If there's no `as` clause and the imported module is nested, we're not going to bind
+            // the resolved module itself into the current scope; we're going to bind the top-most
+            // parent package of that module.
+            let topmost_parent_name =
+                ModuleName::new(full_module_name.components().next().unwrap()).unwrap();
+            let Some(topmost_parent_ty) = self.module_type_from_name(&topmost_parent_name) else {
+                self.add_unknown_declaration_with_binding(alias.into(), definition);
+                return;
+            };
+            topmost_parent_ty
+        } else {
+            // If there's no `as` clause and the imported module isn't nested, then the imported
+            // module _is_ what we bind into the current scope.
+            full_module_ty
+        };
+
+        self.add_declaration_with_binding(
+            alias.into(),
+            definition,
+            &DeclaredAndInferredType::are_the_same_type(binding_ty),
+        );
+    }
+
+    fn infer_import_from_statement(&mut self, import: &ast::StmtImportFrom) {
+        let ast::StmtImportFrom {
+            range: _,
+            node_index: _,
+            module: _,
+            names,
+            level: _,
+        } = import;
+
+        self.check_import_from_module_is_resolvable(import);
+
+        for alias in names {
+            for definition in self.index.definitions(alias) {
+                let inferred = infer_definition_types(self.db(), *definition);
+                // Check non-star imports for deprecations
+                if definition.kind(self.db()).as_star_import().is_none() {
+                    for ty in inferred.declaration_types() {
+                        self.check_deprecated(alias, ty.inner);
+                    }
+                }
+                self.extend_definition(inferred);
+            }
+        }
+    }
+
+    fn infer_assert_statement(&mut self, assert: &ast::StmtAssert) {
+        let ast::StmtAssert {
+            range: _,
+            node_index: _,
+            test,
+            msg,
+        } = assert;
+
+        let test_ty = self.infer_standalone_expression(test, TypeContext::default());
+
+        if let Err(err) = test_ty.try_bool(self.db()) {
+            err.report_diagnostic(&self.context, &**test);
+        }
+
+        self.infer_optional_expression(msg.as_deref(), TypeContext::default());
+    }
+
+    fn infer_raise_statement(&mut self, raise: &ast::StmtRaise) {
+        let ast::StmtRaise {
+            range: _,
+            node_index: _,
+            exc,
+            cause,
+        } = raise;
+
+        let base_exception_type = KnownClass::BaseException.to_subclass_of(self.db());
+        let base_exception_instance = KnownClass::BaseException.to_instance(self.db());
+
+        let can_be_raised =
+            UnionType::from_elements(self.db(), [base_exception_type, base_exception_instance]);
+        let can_be_exception_cause =
+            UnionType::from_elements(self.db(), [can_be_raised, Type::none(self.db())]);
+
+        if let Some(raised) = exc {
+            let raised_type = self.infer_expression(raised, TypeContext::default());
+
+            if !raised_type.is_assignable_to(self.db(), can_be_raised) {
+                report_invalid_exception_raised(&self.context, raised, raised_type);
+            }
+        }
+
+        if let Some(cause) = cause {
+            let cause_type = self.infer_expression(cause, TypeContext::default());
+
+            if !cause_type.is_assignable_to(self.db(), can_be_exception_cause) {
+                report_invalid_exception_cause(&self.context, cause, cause_type);
+            }
+        }
+    }
+
+    /// Resolve the [`ModuleName`], and the type of the module, being referred to by an
+    /// [`ast::StmtImportFrom`] node. Emit a diagnostic if the module cannot be resolved.
+    fn check_import_from_module_is_resolvable(&mut self, import_from: &ast::StmtImportFrom) {
+        let ast::StmtImportFrom { module, level, .. } = import_from;
+
+        // For diagnostics, we want to highlight the unresolvable
+        // module and not the entire `from ... import ...` statement.
+        let module_ref = module
+            .as_ref()
+            .map(AnyNodeRef::from)
+            .unwrap_or_else(|| AnyNodeRef::from(import_from));
+        let module = module.as_deref();
+
+        tracing::trace!(
+            "Resolving import statement from module `{}` into file `{}`",
+            format_import_from_module(*level, module),
+            self.file().path(self.db()),
+        );
+        let module_name = ModuleName::from_import_statement(self.db(), self.file(), import_from);
+
+        let module_name = match module_name {
+            Ok(module_name) => module_name,
+            Err(ModuleNameResolutionError::InvalidSyntax) => {
+                tracing::debug!("Failed to resolve import due to invalid syntax");
+                // Invalid syntax diagnostics are emitted elsewhere.
+                return;
+            }
+            Err(ModuleNameResolutionError::TooManyDots) => {
+                tracing::debug!(
+                    "Relative module resolution `{}` failed: too many leading dots",
+                    format_import_from_module(*level, module),
+                );
+                self.report_unresolved_import(
+                    import_from.into(),
+                    module_ref.range(),
+                    *level,
+                    module,
+                );
+                return;
+            }
+            Err(ModuleNameResolutionError::UnknownCurrentModule) => {
+                tracing::debug!(
+                    "Relative module resolution `{}` failed; could not resolve file `{}` to a module",
+                    format_import_from_module(*level, module),
+                    self.file().path(self.db())
+                );
+                self.report_unresolved_import(
+                    import_from.into(),
+                    module_ref.range(),
+                    *level,
+                    module,
+                );
+                return;
+            }
+        };
+
+        if resolve_module(self.db(), &module_name).is_none() {
+            self.report_unresolved_import(import_from.into(), module_ref.range(), *level, module);
+        }
+    }
+
+    fn infer_import_from_definition(
+        &mut self,
+        import_from: &ast::StmtImportFrom,
+        alias: &ast::Alias,
+        definition: Definition<'db>,
+    ) {
+        let Ok(module_name) =
+            ModuleName::from_import_statement(self.db(), self.file(), import_from)
+        else {
+            self.add_unknown_declaration_with_binding(alias.into(), definition);
+            return;
+        };
+
+        let Some(module) = resolve_module(self.db(), &module_name) else {
+            self.add_unknown_declaration_with_binding(alias.into(), definition);
+            return;
+        };
+
+        let module_ty = Type::module_literal(self.db(), self.file(), module);
+
+        let name = if let Some(star_import) = definition.kind(self.db()).as_star_import() {
+            self.index
+                .place_table(self.scope().file_scope_id(self.db()))
+                .symbol(star_import.symbol_id())
+                .name()
+        } else {
+            &alias.name.id
+        };
+
+        // Avoid looking up attributes on a module if a module imports from itself
+        // (e.g. `from parent import submodule` inside the `parent` module).
+        let import_is_self_referential = module_ty
+            .as_module_literal()
+            .is_some_and(|module| Some(self.file()) == module.module(self.db()).file(self.db()));
+
+        // First try loading the requested attribute from the module.
+        if !import_is_self_referential {
+            if let PlaceAndQualifiers {
+                place: Place::Defined(ty, _, boundness),
+                qualifiers,
+            } = module_ty.member(self.db(), name)
+            {
+                if &alias.name != "*" && boundness == Definedness::PossiblyUndefined {
+                    // TODO: Consider loading _both_ the attribute and any submodule and unioning them
+                    // together if the attribute exists but is possibly-unbound.
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&POSSIBLY_MISSING_IMPORT, AnyNodeRef::Alias(alias))
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Member `{name}` of module `{module_name}` may be missing",
+                        ));
+                    }
+                }
+                self.add_declaration_with_binding(
+                    alias.into(),
+                    definition,
+                    &DeclaredAndInferredType::MightBeDifferent {
+                        declared_ty: TypeAndQualifiers {
+                            inner: ty,
+                            origin: TypeOrigin::Declared,
+                            qualifiers,
+                        },
+                        inferred_ty: ty,
+                    },
+                );
+                return;
+            }
+        }
+
+        // Evaluate whether `X.Y` would constitute a valid submodule name,
+        // given a `from X import Y` statement. If it is valid, this will be `Some()`;
+        // else, it will be `None`.
+        let full_submodule_name = ModuleName::new(name).map(|final_part| {
+            let mut ret = module_name.clone();
+            ret.extend(&final_part);
+            ret
+        });
+
+        // If the module doesn't bind the symbol, check if it's a submodule.  This won't get
+        // handled by the `Type::member` call because it relies on the semantic index's
+        // `imported_modules` set.  The semantic index does not include information about
+        // `from...import` statements because there are two things it cannot determine while only
+        // inspecting the content of the current file:
+        //
+        //   - whether the imported symbol is an attribute or submodule
+        //   - whether the containing file is in a module or a package (needed to correctly resolve
+        //     relative imports)
+        //
+        // The first would be solvable by making it a _potentially_ imported modules set.  The
+        // second is not.
+        //
+        // Regardless, for now, we sidestep all of that by repeating the submodule-or-attribute
+        // check here when inferring types for a `from...import` statement.
+        if let Some(submodule_type) = full_submodule_name
+            .as_ref()
+            .and_then(|submodule_name| self.module_type_from_name(submodule_name))
+        {
+            self.add_declaration_with_binding(
+                alias.into(),
+                definition,
+                &DeclaredAndInferredType::are_the_same_type(submodule_type),
+            );
+            return;
+        }
+
+        self.add_unknown_declaration_with_binding(alias.into(), definition);
+
+        if &alias.name == "*" {
+            return;
+        }
+
+        if !self.is_reachable(import_from) {
+            return;
+        }
+
+        let Some(builder) = self
+            .context
+            .report_lint(&UNRESOLVED_IMPORT, AnyNodeRef::Alias(alias))
+        else {
+            return;
+        };
+
+        let diagnostic = builder.into_diagnostic(format_args!(
+            "Module `{module_name}` has no member `{name}`"
+        ));
+
+        if let Some(full_submodule_name) = full_submodule_name {
+            hint_if_stdlib_submodule_exists_on_other_versions(
+                self.db(),
+                diagnostic,
+                &full_submodule_name,
+                module,
+            );
+        }
+    }
+
+    fn infer_return_statement(&mut self, ret: &ast::StmtReturn) {
+        let tcx = if ret.value.is_some() {
+            nearest_enclosing_function(self.db(), self.index, self.scope())
+                .map(|func| {
+                    // When inferring expressions within a function body,
+                    // the expected type passed should be the "raw" type,
+                    // i.e. type variables in the return type are non-inferable,
+                    // and the return types of async functions are not wrapped in `CoroutineType[...]`.
+                    TypeContext::new(func.last_definition_raw_signature(self.db()).return_ty)
+                })
+                .unwrap_or_default()
+        } else {
+            TypeContext::default()
+        };
+        if let Some(ty) = self.infer_optional_expression(ret.value.as_deref(), tcx) {
+            let range = ret
+                .value
+                .as_ref()
+                .map_or(ret.range(), |value| value.range());
+            self.record_return_type(ty, range);
+        } else {
+            self.record_return_type(Type::none(self.db()), ret.range());
+        }
+    }
+
+    fn infer_delete_statement(&mut self, delete: &ast::StmtDelete) {
+        let ast::StmtDelete {
+            range: _,
+            node_index: _,
+            targets,
+        } = delete;
+        for target in targets {
+            self.infer_expression(target, TypeContext::default());
+        }
+    }
+
+    fn infer_global_statement(&mut self, global: &ast::StmtGlobal) {
+        // CPython allows examples like this, where a global variable is never explicitly defined
+        // in the global scope:
+        //
+        // ```py
+        // def f():
+        //     global x
+        //     x = 1
+        // def g():
+        //     print(x)
+        // ```
+        //
+        // However, allowing this pattern would make it hard for us to guarantee
+        // accurate analysis about the types and boundness of global-scope symbols,
+        // so we require the variable to be explicitly defined (either bound or declared)
+        // in the global scope.
+        let ast::StmtGlobal {
+            node_index: _,
+            range: _,
+            names,
+        } = global;
+        let global_place_table = self.index.place_table(FileScopeId::global());
+        for name in names {
+            if let Some(symbol_id) = global_place_table.symbol_id(name) {
+                let symbol = global_place_table.symbol(symbol_id);
+                if symbol.is_bound() || symbol.is_declared() {
+                    // This name is explicitly defined in the global scope (not just in function
+                    // bodies that mark it `global`).
+                    continue;
+                }
+            }
+            if !module_type_implicit_global_symbol(self.db(), name)
+                .place
+                .is_undefined()
+            {
+                // This name is an implicit global like `__file__` (but not a built-in like `int`).
+                continue;
+            }
+            // This variable isn't explicitly defined in the global scope, nor is it an
+            // implicit global from `types.ModuleType`, so we consider this `global` statement invalid.
+            let Some(builder) = self.context.report_lint(&UNRESOLVED_GLOBAL, name) else {
+                return;
+            };
+            let mut diag =
+                builder.into_diagnostic(format_args!("Invalid global declaration of `{name}`"));
+            diag.set_primary_message(format_args!(
+                "`{name}` has no declarations or bindings in the global scope"
+            ));
+            diag.info("This limits ty's ability to make accurate inferences about the boundness and types of global-scope symbols");
+            diag.info(format_args!(
+                "Consider adding a declaration to the global scope, e.g. `{name}: int`"
+            ));
+        }
+    }
+
+    fn infer_nonlocal_statement(&mut self, nonlocal: &ast::StmtNonlocal) {
+        let ast::StmtNonlocal {
+            node_index: _,
+            range,
+            names,
+        } = nonlocal;
+        let db = self.db();
+        let scope = self.scope();
+        let file_scope_id = scope.file_scope_id(db);
+
+        'names: for name in names {
+            // Walk up parent scopes looking for a possible enclosing scope that may have a
+            // definition of this name visible to us. Note that we skip the scope containing the
+            // use that we are resolving, since we already looked for the place there up above.
+            for (enclosing_scope_file_id, _) in self.index.ancestor_scopes(file_scope_id).skip(1) {
+                // Class scopes are not visible to nested scopes, and `nonlocal` cannot refer to
+                // globals, so check only function-like scopes.
+                let enclosing_scope = self.index.scope(enclosing_scope_file_id);
+                if !enclosing_scope.kind().is_function_like() {
+                    continue;
+                }
+                let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
+                let Some(enclosing_symbol_id) = enclosing_place_table.symbol_id(name) else {
+                    // This scope doesn't define this name. Keep going.
+                    continue;
+                };
+                let enclosing_symbol = enclosing_place_table.symbol(enclosing_symbol_id);
+                // We've found a definition for this name in an enclosing function-like scope.
+                // Either this definition is the valid place this name refers to, or else we'll
+                // emit a syntax error. Either way, we won't walk any more enclosing scopes. Note
+                // that there are differences here compared to `infer_place_load`: A regular load
+                // (e.g. `print(x)`) is allowed to refer to a global variable (e.g. `x = 1` in the
+                // global scope), and similarly it's allowed to refer to a local variable in an
+                // enclosing function that's declared `global` (e.g. `global x`). However, the
+                // `nonlocal` keyword can't refer to global variables (that's a `SyntaxError`), and
+                // it also can't refer to local variables in enclosing functions that are declared
+                // `global` (also a `SyntaxError`).
+                if enclosing_symbol.is_global() {
+                    // A "chain" of `nonlocal` statements is "broken" by a `global` statement. Stop
+                    // looping and report that this `nonlocal` statement is invalid.
+                    break;
+                }
+                if !enclosing_symbol.is_bound()
+                    && !enclosing_symbol.is_declared()
+                    && !enclosing_symbol.is_nonlocal()
+                {
+                    debug_assert!(enclosing_symbol.is_used());
+                    // The name is only referenced here, not defined. Keep going.
+                    continue;
+                }
+                // We found a definition. We've checked that the name isn't `global` in this scope,
+                // but it's ok if it's `nonlocal`. If a "chain" of `nonlocal` statements fails to
+                // lead to a valid binding, the outermost one will be an error; we don't need to
+                // walk the whole chain for each one.
+                continue 'names;
+            }
+            // There's no matching binding in an enclosing scope. This `nonlocal` statement is
+            // invalid.
+            if let Some(builder) = self
+                .context
+                .report_diagnostic(DiagnosticId::InvalidSyntax, Severity::Error)
+            {
+                builder
+                    .into_diagnostic(format_args!("no binding for nonlocal `{name}` found"))
+                    .annotate(Annotation::primary(self.context.span(*range)));
+            }
+        }
+    }
+
+    fn module_type_from_name(&self, module_name: &ModuleName) -> Option<Type<'db>> {
+        resolve_module(self.db(), module_name)
+            .map(|module| Type::module_literal(self.db(), self.file(), module))
+    }
+
+    fn infer_decorator(&mut self, decorator: &ast::Decorator) -> Type<'db> {
+        let ast::Decorator {
+            range: _,
+            node_index: _,
+            expression,
+        } = decorator;
+
+        self.infer_expression(expression, TypeContext::default())
+    }
+
+    /// Infer the argument types for a single binding.
+    fn infer_argument_types<'a>(
+        &mut self,
+        ast_arguments: &ast::Arguments,
+        arguments: &mut CallArguments<'a, 'db>,
+        argument_forms: &[Option<ParameterForm>],
+    ) {
+        debug_assert!(
+            ast_arguments.len() == arguments.len() && arguments.len() == argument_forms.len()
+        );
+
+        let iter = itertools::izip!(
+            arguments.iter_mut(),
+            argument_forms.iter().copied(),
+            ast_arguments.arguments_source_order()
+        );
+
+        for ((_, argument_type), argument_form, ast_argument) in iter {
+            let argument = match ast_argument {
+                // Splatted arguments are inferred before parameter matching to
+                // determine their length.
+                ast::ArgOrKeyword::Arg(ast::Expr::Starred(_))
+                | ast::ArgOrKeyword::Keyword(ast::Keyword { arg: None, .. }) => continue,
+
+                ast::ArgOrKeyword::Arg(arg) => arg,
+                ast::ArgOrKeyword::Keyword(ast::Keyword { value, .. }) => value,
+            };
+
+            let ty = self.infer_argument_type(argument, argument_form, TypeContext::default());
+            *argument_type = Some(ty);
+        }
+    }
+
+    /// Infer the argument types for multiple potential bindings and overloads.
+    fn infer_all_argument_types<'a>(
+        &mut self,
+        ast_arguments: &ast::Arguments,
+        arguments: &mut CallArguments<'a, 'db>,
+        bindings: &Bindings<'db>,
+    ) {
+        debug_assert!(
+            ast_arguments.len() == arguments.len()
+                && arguments.len() == bindings.argument_forms().len()
+        );
+
+        let iter = itertools::izip!(
+            0..,
+            arguments.iter_mut(),
+            bindings.argument_forms().iter().copied(),
+            ast_arguments.arguments_source_order()
+        );
+
+        let overloads_with_binding = bindings
+            .into_iter()
+            .filter_map(|binding| {
+                match binding.matching_overload_index() {
+                    MatchingOverloadIndex::Single(_) | MatchingOverloadIndex::Multiple(_) => {
+                        let overloads = binding
+                            .matching_overloads()
+                            .map(move |(_, overload)| (overload, binding));
+
+                        Some(Either::Right(overloads))
+                    }
+
+                    // If there is a single overload that does not match, we still infer the argument
+                    // types for better diagnostics.
+                    MatchingOverloadIndex::None => match binding.overloads() {
+                        [overload] => Some(Either::Left(std::iter::once((overload, binding)))),
+                        _ => None,
+                    },
+                }
+            })
+            .flatten();
+
+        for (argument_index, (_, argument_type), argument_form, ast_argument) in iter {
+            let ast_argument = match ast_argument {
+                // Splatted arguments are inferred before parameter matching to
+                // determine their length.
+                //
+                // TODO: Re-infer splatted arguments with their type context.
+                ast::ArgOrKeyword::Arg(ast::Expr::Starred(_))
+                | ast::ArgOrKeyword::Keyword(ast::Keyword { arg: None, .. }) => continue,
+
+                ast::ArgOrKeyword::Arg(arg) => arg,
+                ast::ArgOrKeyword::Keyword(ast::Keyword { value, .. }) => value,
+            };
+
+            // Type-form arguments are inferred without type context, so we can infer the argument type directly.
+            if let Some(ParameterForm::Type) = argument_form {
+                *argument_type = Some(self.infer_type_expression(ast_argument));
+                continue;
+            }
+
+            // Retrieve the parameter type for the current argument in a given overload and its binding.
+            let db = self.db();
+            let parameter_type = |overload: &Binding<'db>, binding: &CallableBinding<'db>| {
+                let argument_index = if binding.bound_type.is_some() {
+                    argument_index + 1
+                } else {
+                    argument_index
+                };
+
+                let argument_matches = &overload.argument_matches()[argument_index];
+                let [parameter_index] = argument_matches.parameters.as_slice() else {
+                    return None;
+                };
+
+                let parameter_type =
+                    overload.signature.parameters()[*parameter_index].annotated_type()?;
+
+                // TODO: For now, skip any parameter annotations that mention any typevars. There
+                // are two issues:
+                //
+                // First, if we include those typevars in the type context that we use to infer the
+                // corresponding argument type, the typevars might end up appearing in the inferred
+                // argument type as well. As part of analyzing this call, we're going to (try to)
+                // infer a specialization of those typevars, and would need to substitute those
+                // typevars in the inferred argument type. We can't do that easily at the moment,
+                // since specialization inference occurs _after_ we've inferred argument types, and
+                // we can't _update_ an expression's inferred type after the fact.
+                //
+                // Second, certain kinds of arguments themselves have typevars that we need to
+                // infer specializations for. (For instance, passing the result of _another_  call
+                // to the argument of _this_ call, where both are calls to generic functions.) In
+                // that case, we want to "tie together" the typevars of the two calls so that we
+                // can infer their specializations at the same time — or at least, for the
+                // specialization of one to influence the specialization of the other. It's not yet
+                // clear how we're going to do that. (We might have to start inferring constraint
+                // sets for each expression, instead of simple types?)
+                //
+                // Regardless, for now, the expedient "solution" is to not perform bidi type
+                // checking for these kinds of parameters.
+                if parameter_type.has_typevar(db) {
+                    return None;
+                }
+
+                Some(parameter_type)
+            };
+
+            // If there is only a single binding and overload, we can infer the argument directly with
+            // the unique parameter type annotation.
+            if let Ok((overload, binding)) = overloads_with_binding.clone().exactly_one() {
+                self.infer_expression_impl(
+                    ast_argument,
+                    TypeContext::new(parameter_type(overload, binding)),
+                );
+            } else {
+                // Otherwise, each type is a valid independent inference of the given argument, and we may
+                // require different permutations of argument types to correctly perform argument expansion
+                // during overload evaluation, so we take the intersection of all the types we inferred for
+                // each argument.
+                //
+                // Note that this applies to all nested expressions within each argument.
+                let old_multi_inference_state = mem::replace(
+                    &mut self.multi_inference_state,
+                    MultiInferenceState::Intersect,
+                );
+
+                // We perform inference once without any type context, emitting any diagnostics that are unrelated
+                // to bidirectional type inference.
+                self.infer_expression_impl(ast_argument, TypeContext::default());
+
+                // We then silence any diagnostics emitted during multi-inference, as the type context is only
+                // used as a hint to infer a more assignable argument type, and should not lead to diagnostics
+                // for non-matching overloads.
+                let was_in_multi_inference = self.context.set_multi_inference(true);
+
+                // Infer the type of each argument once with each distinct parameter type as type context.
+                let parameter_types = overloads_with_binding
+                    .clone()
+                    .filter_map(|(overload, binding)| parameter_type(overload, binding))
+                    .collect::<FxHashSet<_>>();
+
+                for parameter_type in parameter_types {
+                    self.infer_expression_impl(
+                        ast_argument,
+                        TypeContext::new(Some(parameter_type)),
+                    );
+                }
+
+                // Restore the multi-inference state.
+                self.multi_inference_state = old_multi_inference_state;
+                self.context.set_multi_inference(was_in_multi_inference);
+            }
+
+            *argument_type = self.try_expression_type(ast_argument);
+        }
+    }
+
+    fn infer_argument_type(
+        &mut self,
+        ast_argument: &ast::Expr,
+        form: Option<ParameterForm>,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        match form {
+            None | Some(ParameterForm::Value) => self.infer_expression(ast_argument, tcx),
+            Some(ParameterForm::Type) => self.infer_type_expression(ast_argument),
+        }
+    }
+
+    fn infer_optional_expression(
+        &mut self,
+        expression: Option<&ast::Expr>,
+        tcx: TypeContext<'db>,
+    ) -> Option<Type<'db>> {
+        expression.map(|expr| self.infer_expression(expr, tcx))
+    }
+
+    fn get_or_infer_expression(
+        &mut self,
+        expression: &ast::Expr,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        self.try_expression_type(expression)
+            .unwrap_or_else(|| self.infer_expression(expression, tcx))
+    }
+
+    #[track_caller]
+    fn infer_expression(&mut self, expression: &ast::Expr, tcx: TypeContext<'db>) -> Type<'db> {
+        debug_assert!(
+            !self.index.is_standalone_expression(expression),
+            "Calling `self.infer_expression` on a standalone-expression is not allowed because it can lead to double-inference. Use `self.infer_standalone_expression` instead."
+        );
+
+        self.infer_expression_impl(expression, tcx)
+    }
+
+    fn infer_expression_with_state(
+        &mut self,
+        expression: &ast::Expr,
+        tcx: TypeContext<'db>,
+        state: DeferredExpressionState,
+    ) -> Type<'db> {
+        let previous_deferred_state = std::mem::replace(&mut self.deferred_state, state);
+        let ty = self.infer_expression(expression, tcx);
+        self.deferred_state = previous_deferred_state;
+        ty
+    }
+
+    fn infer_maybe_standalone_expression(
+        &mut self,
+        expression: &ast::Expr,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        if let Some(standalone_expression) = self.index.try_expression(expression) {
+            self.infer_standalone_expression_impl(expression, standalone_expression, tcx)
+        } else {
+            self.infer_expression(expression, tcx)
+        }
+    }
+
+    #[track_caller]
+    fn infer_standalone_expression(
+        &mut self,
+        expression: &ast::Expr,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        let standalone_expression = self.index.expression(expression);
+        self.infer_standalone_expression_impl(expression, standalone_expression, tcx)
+    }
+
+    fn infer_standalone_expression_impl(
+        &mut self,
+        expression: &ast::Expr,
+        standalone_expression: Expression<'db>,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        let types = infer_expression_types(self.db(), standalone_expression, tcx);
+        self.extend_expression(types);
+
+        // Instead of calling `self.expression_type(expr)` after extending here, we get
+        // the result from `types` directly because we might be in cycle recovery where
+        // `types.cycle_fallback_type` is `Some(fallback_ty)`, which we can retrieve by
+        // using `expression_type` on `types`:
+        types.expression_type(expression)
+    }
+
+    /// Infer the type of an expression.
+    fn infer_expression_impl(
+        &mut self,
+        expression: &ast::Expr,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        let ty = match expression {
+            ast::Expr::NoneLiteral(ast::ExprNoneLiteral {
+                range: _,
+                node_index: _,
+            }) => Type::none(self.db()),
+            ast::Expr::NumberLiteral(literal) => self.infer_number_literal_expression(literal),
+            ast::Expr::BooleanLiteral(literal) => self.infer_boolean_literal_expression(literal),
+            ast::Expr::StringLiteral(literal) => self.infer_string_literal_expression(literal),
+            ast::Expr::BytesLiteral(bytes_literal) => {
+                self.infer_bytes_literal_expression(bytes_literal)
+            }
+            ast::Expr::FString(fstring) => self.infer_fstring_expression(fstring),
+            ast::Expr::TString(tstring) => self.infer_tstring_expression(tstring),
+            ast::Expr::EllipsisLiteral(literal) => self.infer_ellipsis_literal_expression(literal),
+            ast::Expr::Tuple(tuple) => self.infer_tuple_expression(tuple, tcx),
+            ast::Expr::List(list) => self.infer_list_expression(list, tcx),
+            ast::Expr::Set(set) => self.infer_set_expression(set, tcx),
+            ast::Expr::Dict(dict) => self.infer_dict_expression(dict, tcx),
+            ast::Expr::Generator(generator) => self.infer_generator_expression(generator),
+            ast::Expr::ListComp(listcomp) => self.infer_list_comprehension_expression(listcomp),
+            ast::Expr::DictComp(dictcomp) => self.infer_dict_comprehension_expression(dictcomp),
+            ast::Expr::SetComp(setcomp) => self.infer_set_comprehension_expression(setcomp),
+            ast::Expr::Name(name) => self.infer_name_expression(name),
+            ast::Expr::Attribute(attribute) => self.infer_attribute_expression(attribute),
+            ast::Expr::UnaryOp(unary_op) => self.infer_unary_expression(unary_op),
+            ast::Expr::BinOp(binary) => self.infer_binary_expression(binary),
+            ast::Expr::BoolOp(bool_op) => self.infer_boolean_expression(bool_op),
+            ast::Expr::Compare(compare) => self.infer_compare_expression(compare),
+            ast::Expr::Subscript(subscript) => self.infer_subscript_expression(subscript),
+            ast::Expr::Slice(slice) => self.infer_slice_expression(slice),
+            ast::Expr::If(if_expression) => self.infer_if_expression(if_expression),
+            ast::Expr::Lambda(lambda_expression) => self.infer_lambda_expression(lambda_expression),
+            ast::Expr::Call(call_expression) => self.infer_call_expression(call_expression, tcx),
+            ast::Expr::Starred(starred) => self.infer_starred_expression(starred),
+            ast::Expr::Yield(yield_expression) => self.infer_yield_expression(yield_expression),
+            ast::Expr::YieldFrom(yield_from) => self.infer_yield_from_expression(yield_from),
+            ast::Expr::Await(await_expression) => self.infer_await_expression(await_expression),
+            ast::Expr::Named(named) => {
+                // Definitions must be unique, so we bypass multi-inference for named expressions.
+                if !self.multi_inference_state.is_panic()
+                    && let Some(ty) = self.expressions.get(&expression.into())
+                {
+                    return *ty;
+                }
+
+                self.infer_named_expression(named)
+            }
+            ast::Expr::IpyEscapeCommand(_) => {
+                todo_type!("Ipy escape command support")
+            }
+        };
+
+        self.store_expression_type(expression, ty);
+
+        ty
+    }
+
+    fn store_expression_type(&mut self, expression: &ast::Expr, ty: Type<'db>) {
+        if self.deferred_state.in_string_annotation() {
+            // Avoid storing the type of expressions that are part of a string annotation because
+            // the expression ids don't exists in the semantic index. Instead, we'll store the type
+            // on the string expression itself that represents the annotation.
+            return;
+        }
+
+        let db = self.db();
+
+        match self.multi_inference_state {
+            MultiInferenceState::Panic => {
+                let previous = self.expressions.insert(expression.into(), ty);
+                assert_eq!(previous, None);
+            }
+
+            MultiInferenceState::Intersect => {
+                self.expressions
+                    .entry(expression.into())
+                    .and_modify(|current| {
+                        *current = IntersectionType::from_elements(db, [*current, ty]);
+                    })
+                    .or_insert(ty);
+            }
+        }
+    }
+
+    fn infer_number_literal_expression(&mut self, literal: &ast::ExprNumberLiteral) -> Type<'db> {
+        let ast::ExprNumberLiteral {
+            range: _,
+            node_index: _,
+            value,
+        } = literal;
+        let db = self.db();
+
+        match value {
+            ast::Number::Int(n) => n
+                .as_i64()
+                .map(Type::IntLiteral)
+                .unwrap_or_else(|| KnownClass::Int.to_instance(db)),
+            ast::Number::Float(_) => KnownClass::Float.to_instance(db),
+            ast::Number::Complex { .. } => KnownClass::Complex.to_instance(db),
+        }
+    }
+
+    #[expect(clippy::unused_self)]
+    fn infer_boolean_literal_expression(&mut self, literal: &ast::ExprBooleanLiteral) -> Type<'db> {
+        let ast::ExprBooleanLiteral {
+            range: _,
+            node_index: _,
+            value,
+        } = literal;
+
+        Type::BooleanLiteral(*value)
+    }
+
+    fn infer_string_literal_expression(&mut self, literal: &ast::ExprStringLiteral) -> Type<'db> {
+        if literal.value.len() <= Self::MAX_STRING_LITERAL_SIZE {
+            Type::string_literal(self.db(), literal.value.to_str())
+        } else {
+            Type::LiteralString
+        }
+    }
+
+    fn infer_bytes_literal_expression(&mut self, literal: &ast::ExprBytesLiteral) -> Type<'db> {
+        // TODO: ignoring r/R prefixes for now, should normalize bytes values
+        let bytes: Vec<u8> = literal.value.bytes().collect();
+        Type::bytes_literal(self.db(), &bytes)
+    }
+
+    fn infer_fstring_expression(&mut self, fstring: &ast::ExprFString) -> Type<'db> {
+        let ast::ExprFString {
+            range: _,
+            node_index: _,
+            value,
+        } = fstring;
+
+        let mut collector = StringPartsCollector::new();
+        for part in value {
+            // Make sure we iter through every parts to infer all sub-expressions. The `collector`
+            // struct ensures we don't allocate unnecessary strings.
+            match part {
+                ast::FStringPart::Literal(literal) => {
+                    collector.push_str(&literal.value);
+                }
+                ast::FStringPart::FString(fstring) => {
+                    for element in &fstring.elements {
+                        match element {
+                            ast::InterpolatedStringElement::Interpolation(expression) => {
+                                let ast::InterpolatedElement {
+                                    range: _,
+                                    node_index: _,
+                                    expression,
+                                    debug_text: _,
+                                    conversion,
+                                    format_spec,
+                                } = expression;
+                                let ty = self.infer_expression(expression, TypeContext::default());
+
+                                if let Some(format_spec) = format_spec {
+                                    for element in format_spec.elements.interpolations() {
+                                        self.infer_expression(
+                                            &element.expression,
+                                            TypeContext::default(),
+                                        );
+                                    }
+                                }
+
+                                // TODO: handle format specifiers by calling a method
+                                // (`Type::format`?) that handles the `__format__` method.
+                                // Conversion flags should be handled before calling `__format__`.
+                                // https://docs.python.org/3/library/string.html#format-string-syntax
+                                if !conversion.is_none() || format_spec.is_some() {
+                                    collector.add_expression();
+                                } else {
+                                    if let Type::StringLiteral(literal) = ty.str(self.db()) {
+                                        collector.push_str(literal.value(self.db()));
+                                    } else {
+                                        collector.add_expression();
+                                    }
+                                }
+                            }
+                            ast::InterpolatedStringElement::Literal(literal) => {
+                                collector.push_str(&literal.value);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        collector.string_type(self.db())
+    }
+
+    fn infer_tstring_expression(&mut self, tstring: &ast::ExprTString) -> Type<'db> {
+        let ast::ExprTString { value, .. } = tstring;
+        for tstring in value {
+            for element in &tstring.elements {
+                match element {
+                    ast::InterpolatedStringElement::Interpolation(
+                        tstring_interpolation_element,
+                    ) => {
+                        let ast::InterpolatedElement {
+                            expression,
+                            format_spec,
+                            ..
+                        } = tstring_interpolation_element;
+                        self.infer_expression(expression, TypeContext::default());
+                        if let Some(format_spec) = format_spec {
+                            for element in format_spec.elements.interpolations() {
+                                self.infer_expression(&element.expression, TypeContext::default());
+                            }
+                        }
+                    }
+                    ast::InterpolatedStringElement::Literal(_) => {}
+                }
+            }
+        }
+        KnownClass::Template.to_instance(self.db())
+    }
+
+    fn infer_ellipsis_literal_expression(
+        &mut self,
+        _literal: &ast::ExprEllipsisLiteral,
+    ) -> Type<'db> {
+        KnownClass::EllipsisType.to_instance(self.db())
+    }
+
+    fn infer_tuple_expression(
+        &mut self,
+        tuple: &ast::ExprTuple,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        let ast::ExprTuple {
+            range: _,
+            node_index: _,
+            elts,
+            ctx: _,
+            parenthesized: _,
+        } = tuple;
+
+        // Remove any union elements of that are unrelated to the tuple type.
+        let tcx = tcx.map(|annotation| {
+            let inferable = KnownClass::Tuple
+                .try_to_class_literal(self.db())
+                .and_then(|class| class.generic_context(self.db()))
+                .map(|generic_context| generic_context.inferable_typevars(self.db()))
+                .unwrap_or(InferableTypeVars::None);
+            annotation.filter_disjoint_elements(
+                self.db(),
+                Type::homogeneous_tuple(self.db(), Type::unknown()),
+                inferable,
+            )
+        });
+
+        let annotated_tuple = tcx
+            .known_specialization(self.db(), KnownClass::Tuple)
+            .and_then(|specialization| {
+                specialization
+                    .tuple(self.db())
+                    .expect("the specialization of `KnownClass::Tuple` must have a tuple spec")
+                    .resize(self.db(), TupleLength::Fixed(elts.len()))
+                    .ok()
+            });
+
+        let mut annotated_elt_tys = annotated_tuple.as_ref().map(Tuple::all_elements);
+
+        let db = self.db();
+        let element_types = elts.iter().map(|element| {
+            let annotated_elt_ty = annotated_elt_tys.as_mut().and_then(Iterator::next).copied();
+            self.infer_expression(element, TypeContext::new(annotated_elt_ty))
+        });
+
+        Type::heterogeneous_tuple(db, element_types)
+    }
+
+    fn infer_list_expression(&mut self, list: &ast::ExprList, tcx: TypeContext<'db>) -> Type<'db> {
+        let ast::ExprList {
+            range: _,
+            node_index: _,
+            elts,
+            ctx: _,
+        } = list;
+
+        let elts = elts.iter().map(|elt| [Some(elt)]);
+        self.infer_collection_literal(elts, tcx, KnownClass::List)
+            .unwrap_or_else(|| {
+                KnownClass::List.to_specialized_instance(self.db(), [Type::unknown()])
+            })
+    }
+
+    fn infer_set_expression(&mut self, set: &ast::ExprSet, tcx: TypeContext<'db>) -> Type<'db> {
+        let ast::ExprSet {
+            range: _,
+            node_index: _,
+            elts,
+        } = set;
+
+        let elts = elts.iter().map(|elt| [Some(elt)]);
+        self.infer_collection_literal(elts, tcx, KnownClass::Set)
+            .unwrap_or_else(|| {
+                KnownClass::Set.to_specialized_instance(self.db(), [Type::unknown()])
+            })
+    }
+
+    fn infer_dict_expression(&mut self, dict: &ast::ExprDict, tcx: TypeContext<'db>) -> Type<'db> {
+        let ast::ExprDict {
+            range: _,
+            node_index: _,
+            items,
+        } = dict;
+
+        // Validate `TypedDict` dictionary literal assignments.
+        if let Some(tcx) = tcx.annotation
+            && let Some(typed_dict) = tcx
+                .filter_union(self.db(), Type::is_typed_dict)
+                .as_typed_dict()
+            && let Some(ty) = self.infer_typed_dict_expression(dict, typed_dict)
+        {
+            return ty;
+        }
+
+        // Avoid false positives for the functional `TypedDict` form, which is currently
+        // unsupported.
+        if let Some(Type::Dynamic(DynamicType::Todo(_))) = tcx.annotation {
+            return KnownClass::Dict
+                .to_specialized_instance(self.db(), [Type::unknown(), Type::unknown()]);
+        }
+
+        let items = items
+            .iter()
+            .map(|item| [item.key.as_ref(), Some(&item.value)]);
+
+        self.infer_collection_literal(items, tcx, KnownClass::Dict)
+            .unwrap_or_else(|| {
+                KnownClass::Dict
+                    .to_specialized_instance(self.db(), [Type::unknown(), Type::unknown()])
+            })
+    }
+
+    fn infer_typed_dict_expression(
+        &mut self,
+        dict: &ast::ExprDict,
+        typed_dict: TypedDictType<'db>,
+    ) -> Option<Type<'db>> {
+        let ast::ExprDict {
+            range: _,
+            node_index: _,
+            items,
+        } = dict;
+
+        let typed_dict_items = typed_dict.items(self.db());
+
+        for item in items {
+            let key_ty = self.infer_optional_expression(item.key.as_ref(), TypeContext::default());
+
+            if let Some(Type::StringLiteral(key)) = key_ty
+                && let Some(field) = typed_dict_items.get(key.value(self.db()))
+            {
+                self.infer_expression(&item.value, TypeContext::new(Some(field.declared_ty)));
+            } else {
+                self.infer_expression(&item.value, TypeContext::default());
+            }
+        }
+
+        validate_typed_dict_dict_literal(&self.context, typed_dict, dict, dict.into(), |expr| {
+            self.expression_type(expr)
+        })
+        .ok()
+        .map(|_| Type::TypedDict(typed_dict))
+    }
+
+    // Infer the type of a collection literal expression.
+    fn infer_collection_literal<'expr, const N: usize>(
+        &mut self,
+        elts: impl Iterator<Item = [Option<&'expr ast::Expr>; N]>,
+        tcx: TypeContext<'db>,
+        collection_class: KnownClass,
+    ) -> Option<Type<'db>> {
+        // Extract the type variable `T` from `list[T]` in typeshed.
+        let elt_tys = |collection_class: KnownClass| {
+            let class_literal = collection_class.try_to_class_literal(self.db())?;
+            let generic_context = class_literal.generic_context(self.db())?;
+            Some((
+                class_literal,
+                generic_context,
+                generic_context.variables(self.db()),
+            ))
+        };
+
+        let Some((class_literal, generic_context, elt_tys)) = elt_tys(collection_class) else {
+            // Infer the element types without type context, and fallback to unknown for
+            // custom typesheds.
+            for elt in elts.flatten().flatten() {
+                self.get_or_infer_expression(elt, TypeContext::default());
+            }
+
+            return None;
+        };
+
+        let inferable = generic_context.inferable_typevars(self.db());
+
+        // Remove any union elements of that are unrelated to the collection type.
+        //
+        // For example, we only want the `list[int]` from `annotation: list[int] | None` if
+        // `collection_ty` is `list`.
+        let tcx = tcx.map(|annotation| {
+            let collection_ty = collection_class.to_instance(self.db());
+            annotation.filter_disjoint_elements(self.db(), collection_ty, inferable)
+        });
+
+        // Extract the annotated type of `T`, if provided.
+        let annotated_elt_tys = tcx
+            .known_specialization(self.db(), collection_class)
+            .map(|specialization| specialization.types(self.db()));
+
+        // Create a set of constraints to infer a precise type for `T`.
+        let mut builder = SpecializationBuilder::new(self.db(), inferable);
+
+        match annotated_elt_tys {
+            // The annotated type acts as a constraint for `T`.
+            //
+            // Note that we infer the annotated type _before_ the elements, to more closely match the
+            // order of any unions as written in the type annotation.
+            Some(annotated_elt_tys) => {
+                for (elt_ty, annotated_elt_ty) in iter::zip(elt_tys.clone(), annotated_elt_tys) {
+                    builder
+                        .infer(Type::TypeVar(elt_ty), *annotated_elt_ty)
+                        .ok()?;
+                }
+            }
+
+            // If a valid type annotation was not provided, avoid restricting the type of the collection
+            // by unioning the inferred type with `Unknown`.
+            None => {
+                for elt_ty in elt_tys.clone() {
+                    builder.infer(Type::TypeVar(elt_ty), Type::unknown()).ok()?;
+                }
+            }
+        }
+
+        let elt_tcxs = match annotated_elt_tys {
+            None => Either::Left(iter::repeat(TypeContext::default())),
+            Some(tys) => Either::Right(tys.iter().map(|ty| TypeContext::new(Some(*ty)))),
+        };
+
+        for elts in elts {
+            // An unpacking expression for a dictionary.
+            if let &[None, Some(value)] = elts.as_slice() {
+                let inferred_value_ty = self.get_or_infer_expression(value, TypeContext::default());
+
+                // Merge the inferred type of the nested dictionary.
+                if let Some(specialization) =
+                    inferred_value_ty.known_specialization(self.db(), KnownClass::Dict)
+                {
+                    for (elt_ty, inferred_elt_ty) in
+                        iter::zip(elt_tys.clone(), specialization.types(self.db()))
+                    {
+                        builder
+                            .infer(Type::TypeVar(elt_ty), *inferred_elt_ty)
+                            .ok()?;
+                    }
+                }
+
+                continue;
+            }
+
+            // The inferred type of each element acts as an additional constraint on `T`.
+            for (elt, elt_ty, elt_tcx) in itertools::izip!(elts, elt_tys.clone(), elt_tcxs.clone())
+            {
+                let Some(elt) = elt else { continue };
+
+                let inferred_elt_ty = self.get_or_infer_expression(elt, elt_tcx);
+
+                // Simplify the inference based on the declared type of the element.
+                if let Some(elt_tcx) = elt_tcx.annotation {
+                    if inferred_elt_ty.is_assignable_to(self.db(), elt_tcx) {
+                        continue;
+                    }
+                }
+
+                // Convert any element literals to their promoted type form to avoid excessively large
+                // unions for large nested list literals, which the constraint solver struggles with.
+                let inferred_elt_ty = inferred_elt_ty.promote_literals(self.db(), elt_tcx);
+
+                builder.infer(Type::TypeVar(elt_ty), inferred_elt_ty).ok()?;
+            }
+        }
+
+        let class_type = class_literal.apply_specialization(self.db(), |_| {
+            builder.build(generic_context, TypeContext::default())
+        });
+
+        Type::from(class_type).to_instance(self.db())
+    }
+
+    /// Infer the type of the `iter` expression of the first comprehension.
+    fn infer_first_comprehension_iter(&mut self, comprehensions: &[ast::Comprehension]) {
+        let mut comprehensions_iter = comprehensions.iter();
+        let Some(first_comprehension) = comprehensions_iter.next() else {
+            unreachable!("Comprehension must contain at least one generator");
+        };
+        self.infer_standalone_expression(&first_comprehension.iter, TypeContext::default());
+    }
+
+    fn infer_generator_expression(&mut self, generator: &ast::ExprGenerator) -> Type<'db> {
+        let ast::ExprGenerator {
+            range: _,
+            node_index: _,
+            elt: _,
+            generators,
+            parenthesized: _,
+        } = generator;
+
+        self.infer_first_comprehension_iter(generators);
+
+        KnownClass::GeneratorType.to_specialized_instance(
+            self.db(),
+            [
+                todo_type!("generator expression yield type"),
+                todo_type!("generator expression send type"),
+                todo_type!("generator expression return type"),
+            ],
+        )
+    }
+
+    fn infer_list_comprehension_expression(&mut self, listcomp: &ast::ExprListComp) -> Type<'db> {
+        let ast::ExprListComp {
+            range: _,
+            node_index: _,
+            elt: _,
+            generators,
+        } = listcomp;
+
+        self.infer_first_comprehension_iter(generators);
+
+        KnownClass::List
+            .to_specialized_instance(self.db(), [todo_type!("list comprehension element type")])
+    }
+
+    fn infer_dict_comprehension_expression(&mut self, dictcomp: &ast::ExprDictComp) -> Type<'db> {
+        let ast::ExprDictComp {
+            range: _,
+            node_index: _,
+            key: _,
+            value: _,
+            generators,
+        } = dictcomp;
+
+        self.infer_first_comprehension_iter(generators);
+
+        KnownClass::Dict.to_specialized_instance(
+            self.db(),
+            [
+                todo_type!("dict comprehension key type"),
+                todo_type!("dict comprehension value type"),
+            ],
+        )
+    }
+
+    fn infer_set_comprehension_expression(&mut self, setcomp: &ast::ExprSetComp) -> Type<'db> {
+        let ast::ExprSetComp {
+            range: _,
+            node_index: _,
+            elt: _,
+            generators,
+        } = setcomp;
+
+        self.infer_first_comprehension_iter(generators);
+
+        KnownClass::Set
+            .to_specialized_instance(self.db(), [todo_type!("set comprehension element type")])
+    }
+
+    fn infer_generator_expression_scope(&mut self, generator: &ast::ExprGenerator) {
+        let ast::ExprGenerator {
+            range: _,
+            node_index: _,
+            elt,
+            generators,
+            parenthesized: _,
+        } = generator;
+
+        self.infer_expression(elt, TypeContext::default());
+        self.infer_comprehensions(generators);
+    }
+
+    fn infer_list_comprehension_expression_scope(&mut self, listcomp: &ast::ExprListComp) {
+        let ast::ExprListComp {
+            range: _,
+            node_index: _,
+            elt,
+            generators,
+        } = listcomp;
+
+        self.infer_expression(elt, TypeContext::default());
+        self.infer_comprehensions(generators);
+    }
+
+    fn infer_dict_comprehension_expression_scope(&mut self, dictcomp: &ast::ExprDictComp) {
+        let ast::ExprDictComp {
+            range: _,
+            node_index: _,
+            key,
+            value,
+            generators,
+        } = dictcomp;
+
+        self.infer_expression(key, TypeContext::default());
+        self.infer_expression(value, TypeContext::default());
+        self.infer_comprehensions(generators);
+    }
+
+    fn infer_set_comprehension_expression_scope(&mut self, setcomp: &ast::ExprSetComp) {
+        let ast::ExprSetComp {
+            range: _,
+            node_index: _,
+            elt,
+            generators,
+        } = setcomp;
+
+        self.infer_expression(elt, TypeContext::default());
+        self.infer_comprehensions(generators);
+    }
+
+    fn infer_comprehensions(&mut self, comprehensions: &[ast::Comprehension]) {
+        let mut comprehensions_iter = comprehensions.iter();
+        let Some(first_comprehension) = comprehensions_iter.next() else {
+            unreachable!("Comprehension must contain at least one generator");
+        };
+        self.infer_comprehension(first_comprehension, true);
+        for comprehension in comprehensions_iter {
+            self.infer_comprehension(comprehension, false);
+        }
+    }
+
+    fn infer_comprehension(&mut self, comprehension: &ast::Comprehension, is_first: bool) {
+        let ast::Comprehension {
+            range: _,
+            node_index: _,
+            target,
+            iter,
+            ifs,
+            is_async: _,
+        } = comprehension;
+
+        self.infer_target(target, iter, |builder| {
+            // TODO: `infer_comprehension_definition` reports a diagnostic if `iter_ty` isn't iterable
+            //  but only if the target is a name. We should report a diagnostic here if the target isn't a name:
+            //  `[... for a.x in not_iterable]
+            if is_first {
+                infer_same_file_expression_type(
+                    builder.db(),
+                    builder.index.expression(iter),
+                    TypeContext::default(),
+                    builder.module(),
+                )
+            } else {
+                builder.infer_standalone_expression(iter, TypeContext::default())
+            }
+            .iterate(builder.db())
+            .homogeneous_element_type(builder.db())
+        });
+
+        for expr in ifs {
+            self.infer_standalone_expression(expr, TypeContext::default());
+        }
+    }
+
+    fn infer_comprehension_definition(
+        &mut self,
+        comprehension: &ComprehensionDefinitionKind<'db>,
+        definition: Definition<'db>,
+    ) {
+        let iterable = comprehension.iterable(self.module());
+        let target = comprehension.target(self.module());
+
+        let mut infer_iterable_type = || {
+            let expression = self.index.expression(iterable);
+            let result = infer_expression_types(self.db(), expression, TypeContext::default());
+
+            // Two things are different if it's the first comprehension:
+            // (1) We must lookup the `ScopedExpressionId` of the iterable expression in the outer scope,
+            //     because that's the scope we visit it in in the semantic index builder
+            // (2) We must *not* call `self.extend()` on the result of the type inference,
+            //     because `ScopedExpressionId`s are only meaningful within their own scope, so
+            //     we'd add types for random wrong expressions in the current scope
+            if comprehension.is_first() && target.is_name_expr() {
+                result.expression_type(iterable)
+            } else {
+                self.extend_expression_unchecked(result);
+                result.expression_type(iterable)
+            }
+        };
+
+        let target_type = match comprehension.target_kind() {
+            TargetKind::Sequence(unpack_position, unpack) => {
+                let unpacked = infer_unpack_types(self.db(), unpack);
+                if unpack_position == UnpackPosition::First {
+                    self.context.extend(unpacked.diagnostics());
+                }
+
+                unpacked.expression_type(target)
+            }
+            TargetKind::Single => {
+                let iterable_type = infer_iterable_type();
+
+                iterable_type
+                    .try_iterate_with_mode(
+                        self.db(),
+                        EvaluationMode::from_is_async(comprehension.is_async()),
+                    )
+                    .map(|tuple| tuple.homogeneous_element_type(self.db()))
+                    .unwrap_or_else(|err| {
+                        err.report_diagnostic(&self.context, iterable_type, iterable.into());
+                        err.fallback_element_type(self.db())
+                    })
+            }
+        };
+
+        self.expressions.insert(target.into(), target_type);
+        self.add_binding(target.into(), definition, |_, _| target_type);
+    }
+
+    fn infer_named_expression(&mut self, named: &ast::ExprNamed) -> Type<'db> {
+        // See https://peps.python.org/pep-0572/#differences-between-assignment-expressions-and-assignment-statements
+        if named.target.is_name_expr() {
+            let definition = self.index.expect_single_definition(named);
+            let result = infer_definition_types(self.db(), definition);
+            self.extend_definition(result);
+            result.binding_type(definition)
+        } else {
+            // For syntactically invalid targets, we still need to run type inference:
+            self.infer_expression(&named.target, TypeContext::default());
+            self.infer_expression(&named.value, TypeContext::default());
+            Type::unknown()
+        }
+    }
+
+    fn infer_named_expression_definition(
+        &mut self,
+        named: &ast::ExprNamed,
+        definition: Definition<'db>,
+    ) -> Type<'db> {
+        let ast::ExprNamed {
+            range: _,
+            node_index: _,
+            target,
+            value,
+        } = named;
+
+        self.infer_expression(target, TypeContext::default());
+
+        self.add_binding(named.into(), definition, |builder, tcx| {
+            builder.infer_expression(value, tcx)
+        })
+    }
+
+    fn infer_if_expression(&mut self, if_expression: &ast::ExprIf) -> Type<'db> {
+        let ast::ExprIf {
+            range: _,
+            node_index: _,
+            test,
+            body,
+            orelse,
+        } = if_expression;
+
+        let test_ty = self.infer_standalone_expression(test, TypeContext::default());
+        let body_ty = self.infer_expression(body, TypeContext::default());
+        let orelse_ty = self.infer_expression(orelse, TypeContext::default());
+
+        match test_ty.try_bool(self.db()).unwrap_or_else(|err| {
+            err.report_diagnostic(&self.context, &**test);
+            err.fallback_truthiness()
+        }) {
+            Truthiness::AlwaysTrue => body_ty,
+            Truthiness::AlwaysFalse => orelse_ty,
+            Truthiness::Ambiguous => UnionType::from_elements(self.db(), [body_ty, orelse_ty]),
+        }
+    }
+
+    fn infer_lambda_body(&mut self, lambda_expression: &ast::ExprLambda) {
+        self.infer_expression(&lambda_expression.body, TypeContext::default());
+    }
+
+    fn infer_lambda_expression(&mut self, lambda_expression: &ast::ExprLambda) -> Type<'db> {
+        let ast::ExprLambda {
+            range: _,
+            node_index: _,
+            parameters,
+            body: _,
+        } = lambda_expression;
+
+        let parameters = if let Some(parameters) = parameters {
+            let positional_only = parameters
+                .posonlyargs
+                .iter()
+                .map(|param| {
+                    let mut parameter = Parameter::positional_only(Some(param.name().id.clone()));
+                    if let Some(default) = param.default() {
+                        parameter = parameter.with_default_type(
+                            self.infer_expression(default, TypeContext::default())
+                                .replace_parameter_defaults(self.db()),
+                        );
+                    }
+                    parameter
+                })
+                .collect::<Vec<_>>();
+            let positional_or_keyword = parameters
+                .args
+                .iter()
+                .map(|param| {
+                    let mut parameter = Parameter::positional_or_keyword(param.name().id.clone());
+                    if let Some(default) = param.default() {
+                        parameter = parameter.with_default_type(
+                            self.infer_expression(default, TypeContext::default())
+                                .replace_parameter_defaults(self.db()),
+                        );
+                    }
+                    parameter
+                })
+                .collect::<Vec<_>>();
+            let variadic = parameters
+                .vararg
+                .as_ref()
+                .map(|param| Parameter::variadic(param.name().id.clone()));
+            let keyword_only = parameters
+                .kwonlyargs
+                .iter()
+                .map(|param| {
+                    let mut parameter = Parameter::keyword_only(param.name().id.clone());
+                    if let Some(default) = param.default() {
+                        parameter = parameter.with_default_type(
+                            self.infer_expression(default, TypeContext::default())
+                                .replace_parameter_defaults(self.db()),
+                        );
+                    }
+                    parameter
+                })
+                .collect::<Vec<_>>();
+            let keyword_variadic = parameters
+                .kwarg
+                .as_ref()
+                .map(|param| Parameter::keyword_variadic(param.name().id.clone()));
+
+            Parameters::new(
+                positional_only
+                    .into_iter()
+                    .chain(positional_or_keyword)
+                    .chain(variadic)
+                    .chain(keyword_only)
+                    .chain(keyword_variadic),
+            )
+        } else {
+            Parameters::empty()
+        };
+
+        // TODO: Useful inference of a lambda's return type will require a different approach,
+        // which does the inference of the body expression based on arguments at each call site,
+        // rather than eagerly computing a return type without knowing the argument types.
+        CallableType::function_like(self.db(), Signature::new(parameters, Some(Type::unknown())))
+    }
+
+    fn infer_call_expression(
+        &mut self,
+        call_expression: &ast::ExprCall,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        // TODO: Use the type context for more precise inference.
+        let callable_type =
+            self.infer_maybe_standalone_expression(&call_expression.func, TypeContext::default());
+
+        self.infer_call_expression_impl(call_expression, callable_type, tcx)
+    }
+
+    fn infer_call_expression_impl(
+        &mut self,
+        call_expression: &ast::ExprCall,
+        callable_type: Type<'db>,
+        tcx: TypeContext<'db>,
+    ) -> Type<'db> {
+        let ast::ExprCall {
+            range: _,
+            node_index: _,
+            func,
+            arguments,
+        } = call_expression;
+
+        // We don't call `Type::try_call`, because we want to perform type inference on the
+        // arguments after matching them to parameters, but before checking that the argument types
+        // are assignable to any parameter annotations.
+        let mut call_arguments =
+            CallArguments::from_arguments(arguments, |argument, splatted_value| {
+                let ty = self.infer_expression(splatted_value, TypeContext::default());
+                if let Some(argument) = argument {
+                    self.store_expression_type(argument, ty);
+                }
+                ty
+            });
+
+        // Special handling for `TypedDict` method calls
+        if let ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() {
+            let value_type = self.expression_type(value);
+            if let Type::TypedDict(typed_dict_ty) = value_type {
+                if matches!(attr.id.as_str(), "pop" | "setdefault") && !arguments.args.is_empty() {
+                    // Validate the key argument for `TypedDict` methods
+                    if let Some(first_arg) = arguments.args.first() {
+                        if let ast::Expr::StringLiteral(ast::ExprStringLiteral {
+                            value: key_literal,
+                            ..
+                        }) = first_arg
+                        {
+                            let key = key_literal.to_str();
+                            let items = typed_dict_ty.items(self.db());
+
+                            // Check if key exists
+                            if let Some((_, field)) = items
+                                .iter()
+                                .find(|(field_name, _)| field_name.as_str() == key)
+                            {
+                                // Key exists - check if it's a `pop()` on a required field
+                                if attr.id.as_str() == "pop" && field.is_required() {
+                                    report_cannot_pop_required_field_on_typed_dict(
+                                        &self.context,
+                                        first_arg.into(),
+                                        Type::TypedDict(typed_dict_ty),
+                                        key,
+                                    );
+                                    return Type::unknown();
+                                }
+                            } else {
+                                // Key not found, report error with suggestion and return early
+                                let key_ty = Type::StringLiteral(
+                                    crate::types::StringLiteralType::new(self.db(), key),
+                                );
+                                report_invalid_key_on_typed_dict(
+                                    &self.context,
+                                    first_arg.into(),
+                                    first_arg.into(),
+                                    Type::TypedDict(typed_dict_ty),
+                                    key_ty,
+                                    &items,
+                                );
+                                // Return `Unknown` to prevent the overload system from generating its own error
+                                return Type::unknown();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if let Type::FunctionLiteral(function) = callable_type {
+            // Make sure that the `function.definition` is only called when the function is defined
+            // in the same file as the one we're currently inferring the types for. This is because
+            // the `definition` method accesses the semantic index, which could create a
+            // cross-module AST dependency.
+            if function.file(self.db()) == self.file()
+                && function.definition(self.db()).scope(self.db()) == self.scope()
+            {
+                self.called_functions.insert(function);
+            }
+        }
+
+        let class = match callable_type {
+            Type::ClassLiteral(class) => Some(ClassType::NonGeneric(class)),
+            Type::GenericAlias(generic) => Some(ClassType::Generic(generic)),
+            Type::SubclassOf(subclass) => subclass.subclass_of().into_class(),
+            _ => None,
+        };
+
+        if let Some(class) = class {
+            // It might look odd here that we emit an error for class-literals and generic aliases but not
+            // `type[]` types. But it's deliberate! The typing spec explicitly mandates that `type[]` types
+            // can be called even though class-literals cannot. This is because even though a protocol class
+            // `SomeProtocol` is always an abstract class, `type[SomeProtocol]` can be a concrete subclass of
+            // that protocol -- and indeed, according to the spec, type checkers must disallow abstract
+            // subclasses of the protocol to be passed to parameters that accept `type[SomeProtocol]`.
+            // <https://typing.python.org/en/latest/spec/protocol.html#type-and-class-objects-vs-protocols>.
+            if !callable_type.is_subclass_of() {
+                if let Some(protocol) = class.into_protocol_class(self.db()) {
+                    report_attempted_protocol_instantiation(
+                        &self.context,
+                        call_expression,
+                        protocol,
+                    );
+                }
+            }
+
+            // For class literals we model the entire class instantiation logic, so it is handled
+            // in a separate function. For some known classes we have manual signatures defined and use
+            // the `try_call` path below.
+            // TODO: it should be possible to move these special cases into the `try_call_constructor`
+            // path instead, or even remove some entirely once we support overloads fully.
+            let has_special_cased_constructor = matches!(
+                class.known(self.db()),
+                Some(
+                    KnownClass::Bool
+                        | KnownClass::Str
+                        | KnownClass::Type
+                        | KnownClass::Object
+                        | KnownClass::Property
+                        | KnownClass::Super
+                        | KnownClass::TypeAliasType
+                        | KnownClass::Deprecated
+                )
+            ) || (
+                // Constructor calls to `tuple` and subclasses of `tuple` are handled in `Type::Bindings`,
+                // but constructor calls to `tuple[int]`, `tuple[int, ...]`, `tuple[int, *tuple[str, ...]]` (etc.)
+                // are handled by the default constructor-call logic (we synthesize a `__new__` method for them
+                // in `ClassType::own_class_member()`).
+                class.is_known(self.db(), KnownClass::Tuple) && !class.is_generic()
+            );
+
+            // temporary special-casing for all subclasses of `enum.Enum`
+            // until we support the functional syntax for creating enum classes
+            if !has_special_cased_constructor
+                && KnownClass::Enum
+                    .to_class_literal(self.db())
+                    .to_class_type(self.db())
+                    .is_none_or(|enum_class| !class.is_subclass_of(self.db(), enum_class))
+            {
+                let argument_forms = vec![Some(ParameterForm::Value); call_arguments.len()];
+                self.infer_argument_types(arguments, &mut call_arguments, &argument_forms);
+
+                if matches!(
+                    class.known(self.db()),
+                    Some(KnownClass::TypeVar | KnownClass::ExtensionsTypeVar)
+                ) {
+                    // Inference of correctly-placed `TypeVar` definitions is done in
+                    // `TypeInferenceBuilder::infer_legacy_typevar`, and doesn't use the full
+                    // call-binding machinery. If we reach here, it means that someone is trying to
+                    // instantiate a `typing.TypeVar` in an invalid context.
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
+                    {
+                        builder.into_diagnostic(
+                            "A `TypeVar` definition must be a simple variable assignment",
+                        );
+                    }
+                }
+
+                return callable_type
+                    .try_call_constructor(self.db(), call_arguments, tcx)
+                    .unwrap_or_else(|err| {
+                        err.report_diagnostic(&self.context, callable_type, call_expression.into());
+                        err.return_type()
+                    });
+            }
+        }
+
+        let bindings = callable_type
+            .bindings(self.db())
+            .match_parameters(self.db(), &call_arguments);
+        self.infer_all_argument_types(arguments, &mut call_arguments, &bindings);
+
+        // Validate `TypedDict` constructor calls after argument type inference
+        if let Some(class_literal) = callable_type.as_class_literal() {
+            if class_literal.is_typed_dict(self.db()) {
+                let typed_dict_type = Type::typed_dict(ClassType::NonGeneric(class_literal));
+                if let Some(typed_dict) = typed_dict_type.as_typed_dict() {
+                    validate_typed_dict_constructor(
+                        &self.context,
+                        typed_dict,
+                        arguments,
+                        func.as_ref().into(),
+                        |expr| self.expression_type(expr),
+                    );
+                }
+            }
+        }
+
+        let mut bindings = match bindings.check_types(
+            self.db(),
+            &call_arguments,
+            &tcx,
+            &self.dataclass_field_specifiers[..],
+        ) {
+            Ok(bindings) => bindings,
+            Err(CallError(_, bindings)) => {
+                bindings.report_diagnostics(&self.context, call_expression.into());
+                return bindings.return_type(self.db());
+            }
+        };
+
+        for binding in &mut bindings {
+            let binding_type = binding.callable_type;
+            for (_, overload) in binding.matching_overloads_mut() {
+                match binding_type {
+                    Type::FunctionLiteral(function_literal) => {
+                        if let Some(known_function) = function_literal.known(self.db()) {
+                            known_function.check_call(
+                                &self.context,
+                                overload,
+                                &call_arguments,
+                                call_expression,
+                                self.file(),
+                            );
+                        }
+                    }
+                    Type::ClassLiteral(class) => {
+                        if let Some(known_class) = class.known(self.db()) {
+                            known_class.check_call(
+                                &self.context,
+                                self.index,
+                                overload,
+                                call_expression,
+                            );
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        let db = self.db();
+        let scope = self.scope();
+        let return_ty = bindings.return_type(db);
+
+        let find_narrowed_place = || match arguments.args.first() {
+            None => {
+                // This branch looks extraneous, especially in the face of `missing-arguments`.
+                // However, that lint won't be able to catch this:
+                //
+                // ```python
+                // def f(v: object = object()) -> TypeIs[int]: ...
+                //
+                // if f(): ...
+                // ```
+                //
+                // TODO: Will this report things that is actually fine?
+                if let Some(builder) = self
+                    .context
+                    .report_lint(&INVALID_TYPE_GUARD_CALL, arguments)
+                {
+                    builder.into_diagnostic("Type guard call does not have a target");
+                }
+                None
+            }
+            Some(expr) => match PlaceExpr::try_from_expr(expr) {
+                Some(place_expr) => place_table(db, scope).place_id(&place_expr),
+                None => None,
+            },
+        };
+
+        match return_ty {
+            // TODO: TypeGuard
+            Type::TypeIs(type_is) => match find_narrowed_place() {
+                Some(place) => type_is.bind(db, scope, place),
+                None => return_ty,
+            },
+            _ => return_ty,
+        }
+    }
+
+    fn infer_starred_expression(&mut self, starred: &ast::ExprStarred) -> Type<'db> {
+        let ast::ExprStarred {
+            range: _,
+            node_index: _,
+            value,
+            ctx: _,
+        } = starred;
+
+        let iterable_type = self.infer_expression(value, TypeContext::default());
+        iterable_type
+            .try_iterate(self.db())
+            .map(|tuple| tuple.homogeneous_element_type(self.db()))
+            .unwrap_or_else(|err| {
+                err.report_diagnostic(&self.context, iterable_type, value.as_ref().into());
+                err.fallback_element_type(self.db())
+            });
+
+        // TODO
+        todo_type!("starred expression")
+    }
+
+    fn infer_yield_expression(&mut self, yield_expression: &ast::ExprYield) -> Type<'db> {
+        let ast::ExprYield {
+            range: _,
+            node_index: _,
+            value,
+        } = yield_expression;
+        self.infer_optional_expression(value.as_deref(), TypeContext::default());
+        todo_type!("yield expressions")
+    }
+
+    fn infer_yield_from_expression(&mut self, yield_from: &ast::ExprYieldFrom) -> Type<'db> {
+        let ast::ExprYieldFrom {
+            range: _,
+            node_index: _,
+            value,
+        } = yield_from;
+
+        let iterable_type = self.infer_expression(value, TypeContext::default());
+        iterable_type
+            .try_iterate(self.db())
+            .map(|tuple| tuple.homogeneous_element_type(self.db()))
+            .unwrap_or_else(|err| {
+                err.report_diagnostic(&self.context, iterable_type, value.as_ref().into());
+                err.fallback_element_type(self.db())
+            });
+
+        iterable_type
+            .generator_return_type(self.db())
+            .unwrap_or_else(Type::unknown)
+    }
+
+    fn infer_await_expression(&mut self, await_expression: &ast::ExprAwait) -> Type<'db> {
+        let ast::ExprAwait {
+            range: _,
+            node_index: _,
+            value,
+        } = await_expression;
+        let expr_type = self.infer_expression(value, TypeContext::default());
+        expr_type.try_await(self.db()).unwrap_or_else(|err| {
+            err.report_diagnostic(&self.context, expr_type, value.as_ref().into());
+            Type::unknown()
+        })
+    }
+
+    // Perform narrowing with applicable constraints between the current scope and the enclosing scope.
+    fn narrow_place_with_applicable_constraints(
+        &self,
+        expr: PlaceExprRef,
+        mut ty: Type<'db>,
+        constraint_keys: &[(FileScopeId, ConstraintKey)],
+    ) -> Type<'db> {
+        let db = self.db();
+        for (enclosing_scope_file_id, constraint_key) in constraint_keys {
+            let use_def = self.index.use_def_map(*enclosing_scope_file_id);
+            let place_table = self.index.place_table(*enclosing_scope_file_id);
+            let place = place_table.place_id(expr).unwrap();
+
+            match use_def.applicable_constraints(
+                *constraint_key,
+                *enclosing_scope_file_id,
+                expr,
+                self.index,
+            ) {
+                ApplicableConstraints::UnboundBinding(constraint) => {
+                    ty = constraint.narrow(db, ty, place);
+                }
+                // Performs narrowing based on constrained bindings.
+                // This handling must be performed even if narrowing is attempted and failed using `infer_place_load`.
+                // The result of `infer_place_load` can be applied as is only when its boundness is `Bound`.
+                // For example, this handling is required in the following case:
+                // ```python
+                // class C:
+                //     x: int | None = None
+                // c = C()
+                // # c.x: int | None = <unbound>
+                // if c.x is None:
+                //     c.x = 1
+                // # else: c.x: int = <unbound>
+                // # `c.x` is not definitely bound here
+                // reveal_type(c.x)  # revealed: int
+                // ```
+                ApplicableConstraints::ConstrainedBindings(bindings) => {
+                    let reachability_constraints = bindings.reachability_constraints;
+                    let predicates = bindings.predicates;
+                    let mut union = UnionBuilder::new(db);
+                    for binding in bindings {
+                        let static_reachability = reachability_constraints.evaluate(
+                            db,
+                            predicates,
+                            binding.reachability_constraint,
+                        );
+                        if static_reachability.is_always_false() {
+                            continue;
+                        }
+                        match binding.binding {
+                            DefinitionState::Defined(definition) => {
+                                let binding_ty = binding_type(db, definition);
+                                union = union.add(
+                                    binding.narrowing_constraint.narrow(db, binding_ty, place),
+                                );
+                            }
+                            DefinitionState::Undefined | DefinitionState::Deleted => {
+                                union =
+                                    union.add(binding.narrowing_constraint.narrow(db, ty, place));
+                            }
+                        }
+                    }
+                    // If there are no visible bindings, the union becomes `Never`.
+                    // Since an unbound binding is recorded even for an undefined place,
+                    // this can only happen if the code is unreachable
+                    // and therefore it is correct to set the result to `Never`.
+                    let union = union.build();
+                    if union.is_assignable_to(db, ty) {
+                        ty = union;
+                    }
+                }
+            }
+        }
+        ty
+    }
+
+    /// Check if the given ty is `@deprecated` or not
+    fn check_deprecated<T: Ranged>(&self, ranged: T, ty: Type) {
+        // First handle classes
+        if let Type::ClassLiteral(class_literal) = ty {
+            let Some(deprecated) = class_literal.deprecated(self.db()) else {
+                return;
+            };
+
+            let Some(builder) = self
+                .context
+                .report_lint(&crate::types::diagnostic::DEPRECATED, ranged)
+            else {
+                return;
+            };
+
+            let class_name = class_literal.name(self.db());
+            let mut diag =
+                builder.into_diagnostic(format_args!(r#"The class `{class_name}` is deprecated"#));
+            if let Some(message) = deprecated.message(self.db()) {
+                diag.set_primary_message(message.value(self.db()));
+            }
+            diag.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
+            return;
+        }
+
+        // Next handle functions
+        let function = match ty {
+            Type::FunctionLiteral(function) => function,
+            Type::BoundMethod(bound) => bound.function(self.db()),
+            _ => return,
+        };
+
+        // Currently we only check the final implementation for deprecation, as
+        // that check can be done on any reference to the function. Analysis of
+        // deprecated overloads needs to be done in places where we resolve the
+        // actual overloads being used.
+        let Some(deprecated) = function.implementation_deprecated(self.db()) else {
+            return;
+        };
+
+        let Some(builder) = self
+            .context
+            .report_lint(&crate::types::diagnostic::DEPRECATED, ranged)
+        else {
+            return;
+        };
+
+        let func_name = function.name(self.db());
+        let mut diag =
+            builder.into_diagnostic(format_args!(r#"The function `{func_name}` is deprecated"#));
+        if let Some(message) = deprecated.message(self.db()) {
+            diag.set_primary_message(message.value(self.db()));
+        }
+        diag.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
+    }
+
+    fn infer_name_load(&mut self, name_node: &ast::ExprName) -> Type<'db> {
+        let ast::ExprName {
+            range: _,
+            node_index: _,
+            id: symbol_name,
+            ctx: _,
+        } = name_node;
+        let expr = PlaceExpr::from_expr_name(name_node);
+        let db = self.db();
+
+        let (resolved, constraint_keys) =
+            self.infer_place_load(PlaceExprRef::from(&expr), ast::ExprRef::Name(name_node));
+
+        let resolved_after_fallback = resolved
+            // Not found in the module's explicitly declared global symbols?
+            // Check the "implicit globals" such as `__doc__`, `__file__`, `__name__`, etc.
+            // These are looked up as attributes on `types.ModuleType`.
+            .or_fall_back_to(db, || {
+                module_type_implicit_global_symbol(db, symbol_name).map_type(|ty| {
+                    self.narrow_place_with_applicable_constraints(
+                        PlaceExprRef::from(&expr),
+                        ty,
+                        &constraint_keys,
+                    )
+                })
+            })
+            // Not found in globals? Fallback to builtins
+            // (without infinite recursion if we're already in builtins.)
+            .or_fall_back_to(db, || {
+                if Some(self.scope()) == builtins_module_scope(db) {
+                    Place::Undefined.into()
+                } else {
+                    builtins_symbol(db, symbol_name)
+                }
+            })
+            // Still not found? It might be `reveal_type`...
+            .or_fall_back_to(db, || {
+                if symbol_name == "reveal_type" {
+                    if let Some(builder) = self.context.report_lint(&UNDEFINED_REVEAL, name_node) {
+                        let mut diag =
+                            builder.into_diagnostic("`reveal_type` used without importing it");
+                        diag.info(
+                            "This is allowed for debugging convenience but will fail at runtime",
+                        );
+                    }
+                    typing_extensions_symbol(db, symbol_name)
+                } else {
+                    Place::Undefined.into()
+                }
+            });
+
+        if !resolved_after_fallback.place.is_definitely_bound() {
+            self.all_definitely_bound = false;
+        }
+
+        let ty =
+            resolved_after_fallback.unwrap_with_diagnostic(|lookup_error| match lookup_error {
+                LookupError::Undefined(qualifiers) => {
+                    self.report_unresolved_reference(name_node);
+                    TypeAndQualifiers::new(Type::unknown(), TypeOrigin::Inferred, qualifiers)
+                }
+                LookupError::PossiblyUndefined(type_when_bound) => {
+                    if self.is_reachable(name_node) {
+                        report_possibly_unresolved_reference(&self.context, name_node);
+                    }
+                    type_when_bound
+                }
+            });
+
+        ty.inner_type()
+    }
+
+    fn infer_local_place_load(
+        &self,
+        expr: PlaceExprRef,
+        expr_ref: ast::ExprRef,
+    ) -> (Place<'db>, Option<ScopedUseId>) {
+        let db = self.db();
+        let scope = self.scope();
+        let file_scope_id = scope.file_scope_id(db);
+        let place_table = self.index.place_table(file_scope_id);
+        let use_def = self.index.use_def_map(file_scope_id);
+
+        // If we're inferring types of deferred expressions, look them up from end-of-scope.
+        if self.is_deferred() {
+            let place = if let Some(place_id) = place_table.place_id(expr) {
+                place_from_bindings(db, use_def.all_reachable_bindings(place_id))
+            } else {
+                assert!(
+                    self.deferred_state.in_string_annotation(),
+                    "Expected the place table to create a place for every valid PlaceExpr node"
+                );
+                Place::Undefined
+            };
+            (place, None)
+        } else {
+            if expr_ref
+                .as_name_expr()
+                .is_some_and(|name| name.is_invalid())
+            {
+                return (Place::Undefined, None);
+            }
+
+            let use_id = expr_ref.scoped_use_id(db, scope);
+            let place = place_from_bindings(db, use_def.bindings_at_use(use_id));
+
+            (place, Some(use_id))
+        }
+    }
+
+    /// Infer the type of a place expression from definitions, assuming a load context.
+    /// This method also returns the [`ConstraintKey`]s for each scope associated with `expr`,
+    /// which is used to narrow by condition rather than by assignment.
+    fn infer_place_load(
+        &self,
+        place_expr: PlaceExprRef,
+        expr_ref: ast::ExprRef,
+    ) -> (PlaceAndQualifiers<'db>, Vec<(FileScopeId, ConstraintKey)>) {
+        let db = self.db();
+        let scope = self.scope();
+        let file_scope_id = scope.file_scope_id(db);
+        let place_table = self.index.place_table(file_scope_id);
+
+        let mut constraint_keys = vec![];
+        let (local_scope_place, use_id) = self.infer_local_place_load(place_expr, expr_ref);
+        if let Some(use_id) = use_id {
+            constraint_keys.push((file_scope_id, ConstraintKey::UseId(use_id)));
+        }
+
+        let place = PlaceAndQualifiers::from(local_scope_place).or_fall_back_to(db, || {
+            let mut symbol_resolves_locally = false;
+            if let Some(symbol) = place_expr.as_symbol() {
+                if let Some(symbol_id) = place_table.symbol_id(symbol.name()) {
+                    // Footgun: `place_expr` and `symbol` were probably constructed with all-zero
+                    // flags. We need to read the place table to get correct flags.
+                    symbol_resolves_locally = place_table.symbol(symbol_id).is_local();
+                    // If we try to access a variable in a class before it has been defined, the
+                    // lookup will fall back to global. See the comment on `Symbol::is_local`.
+                    let fallback_to_global =
+                        scope.node(db).scope_kind().is_class() && symbol_resolves_locally;
+                    if self.skip_non_global_scopes(file_scope_id, symbol_id) || fallback_to_global {
+                        return global_symbol(self.db(), self.file(), symbol.name()).map_type(
+                            |ty| {
+                                self.narrow_place_with_applicable_constraints(
+                                    place_expr,
+                                    ty,
+                                    &constraint_keys,
+                                )
+                            },
+                        );
+                    }
+                }
+            }
+
+            // Symbols that are bound or declared in the local scope, and not marked `nonlocal` or
+            // `global`, never refer to an enclosing scope. (If you reference such a symbol before
+            // it's bound, you get an `UnboundLocalError`.) Short-circuit instead of walking
+            // enclosing scopes in this case. The one exception to this rule is the global fallback
+            // in class bodies, which we already handled above.
+            if symbol_resolves_locally {
+                return Place::Undefined.into();
+            }
+
+            for parent_id in place_table.parents(place_expr) {
+                let parent_expr = place_table.place(parent_id);
+                let mut expr_ref = expr_ref;
+                for _ in 0..(place_expr.num_member_segments() - parent_expr.num_member_segments()) {
+                    match expr_ref {
+                        ast::ExprRef::Attribute(attribute) => {
+                            expr_ref = ast::ExprRef::from(&attribute.value);
+                        }
+                        ast::ExprRef::Subscript(subscript) => {
+                            expr_ref = ast::ExprRef::from(&subscript.value);
+                        }
+                        _ => unreachable!(),
+                    }
+                }
+                let (parent_place, _use_id) = self.infer_local_place_load(parent_expr, expr_ref);
+                if let Place::Defined(_, _, _) = parent_place {
+                    return Place::Undefined.into();
+                }
+            }
+
+            // Walk up parent scopes looking for a possible enclosing scope that may have a
+            // definition of this name visible to us (would be `LOAD_DEREF` at runtime.)
+            // Note that we skip the scope containing the use that we are resolving, since we
+            // already looked for the place there up above.
+            let mut nonlocal_union_builder = UnionBuilder::new(db);
+            let mut found_some_definition = false;
+            for (enclosing_scope_file_id, _) in self.index.ancestor_scopes(file_scope_id).skip(1) {
+                // Class scopes are not visible to nested scopes, and we need to handle global
+                // scope differently (because an unbound name there falls back to builtins), so
+                // check only function-like scopes.
+                // There is one exception to this rule: annotation scopes can see
+                // names defined in an immediately-enclosing class scope.
+                let enclosing_scope = self.index.scope(enclosing_scope_file_id);
+
+                let is_immediately_enclosing_scope = scope.is_annotation(db)
+                    && scope
+                        .scope(db)
+                        .parent()
+                        .is_some_and(|parent| parent == enclosing_scope_file_id);
+
+                let has_root_place_been_reassigned = || {
+                    let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
+                    enclosing_place_table
+                        .parents(place_expr)
+                        .any(|enclosing_root_place_id| {
+                            enclosing_place_table
+                                .place(enclosing_root_place_id)
+                                .is_bound()
+                        })
+                };
+
+                // If the reference is in a nested eager scope, we need to look for the place at
+                // the point where the previous enclosing scope was defined, instead of at the end
+                // of the scope. (Note that the semantic index builder takes care of only
+                // registering eager bindings for nested scopes that are actually eager, and for
+                // enclosing scopes that actually contain bindings that we should use when
+                // resolving the reference.)
+                if !self.is_deferred() {
+                    match self.index.enclosing_snapshot(
+                        enclosing_scope_file_id,
+                        place_expr,
+                        file_scope_id,
+                    ) {
+                        EnclosingSnapshotResult::FoundConstraint(constraint) => {
+                            constraint_keys.push((
+                                enclosing_scope_file_id,
+                                ConstraintKey::NarrowingConstraint(constraint),
+                            ));
+                        }
+                        EnclosingSnapshotResult::FoundBindings(bindings) => {
+                            let place = place_from_bindings(db, bindings).map_type(|ty| {
+                                self.narrow_place_with_applicable_constraints(
+                                    place_expr,
+                                    ty,
+                                    &constraint_keys,
+                                )
+                            });
+                            constraint_keys.push((
+                                enclosing_scope_file_id,
+                                ConstraintKey::NestedScope(file_scope_id),
+                            ));
+                            return place.into();
+                        }
+                        // There are no visible bindings / constraint here.
+                        // Don't fall back to non-eager place resolution.
+                        EnclosingSnapshotResult::NotFound => {
+                            if has_root_place_been_reassigned() {
+                                return Place::Undefined.into();
+                            }
+                            continue;
+                        }
+                        EnclosingSnapshotResult::NoLongerInEagerContext => {
+                            if has_root_place_been_reassigned() {
+                                return Place::Undefined.into();
+                            }
+                        }
+                    }
+                }
+
+                if !enclosing_scope.kind().is_function_like() && !is_immediately_enclosing_scope {
+                    continue;
+                }
+
+                let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
+                let Some(enclosing_place_id) = enclosing_place_table.place_id(place_expr) else {
+                    continue;
+                };
+
+                let enclosing_place = enclosing_place_table.place(enclosing_place_id);
+
+                // Reads of "free" variables terminate at any enclosing scope that marks the
+                // variable `global`, whether or not that scope actually binds the variable. If we
+                // see a `global` declaration, stop walking scopes and proceed to the global
+                // handling below. (If we're walking from a prior/inner scope where this variable
+                // is `nonlocal`, then this is a semantic syntax error, but we don't enforce that
+                // here. See `infer_nonlocal_statement`.)
+                if enclosing_place.as_symbol().is_some_and(Symbol::is_global) {
+                    break;
+                }
+
+                let enclosing_scope_id = enclosing_scope_file_id.to_scope_id(db, self.file());
+
+                // If the name is declared or bound in this scope, figure out its type. This might
+                // resolve the name and end the walk. But if the name is declared `nonlocal` in
+                // this scope, we'll keep walking enclosing scopes and union this type with the
+                // other types we find. (It's a semantic syntax error to declare a type for a
+                // `nonlocal` variable, but we don't enforce that here. See the
+                // `ast::Stmt::AnnAssign` handling in `SemanticIndexBuilder::visit_stmt`.)
+                if enclosing_place.is_bound() || enclosing_place.is_declared() {
+                    let local_place_and_qualifiers = place(
+                        db,
+                        enclosing_scope_id,
+                        place_expr,
+                        ConsideredDefinitions::AllReachable,
+                    )
+                    .map_type(|ty| {
+                        self.narrow_place_with_applicable_constraints(
+                            place_expr,
+                            ty,
+                            &constraint_keys,
+                        )
+                    });
+                    // We could have `Place::Undefined` here, despite the checks above, for example if
+                    // this scope contains a `del` statement but no binding or declaration.
+                    if let Place::Defined(type_, _, boundness) = local_place_and_qualifiers.place {
+                        nonlocal_union_builder.add_in_place(type_);
+                        // `ConsideredDefinitions::AllReachable` never returns PossiblyUnbound
+                        debug_assert_eq!(boundness, Definedness::AlwaysDefined);
+                        found_some_definition = true;
+                    }
+
+                    if !enclosing_place.as_symbol().is_some_and(Symbol::is_nonlocal) {
+                        // We've reached a function-like scope that marks this name bound or
+                        // declared but doesn't mark it `nonlocal`. The name is therefore resolved,
+                        // and we won't consider any scopes outside of this one.
+                        return if found_some_definition {
+                            Place::bound(nonlocal_union_builder.build()).into()
+                        } else {
+                            Place::Undefined.into()
+                        };
+                    }
+                }
+            }
+
+            PlaceAndQualifiers::from(Place::Undefined)
+                // No nonlocal binding? Check the module's explicit globals.
+                // Avoid infinite recursion if `self.scope` already is the module's global scope.
+                .or_fall_back_to(db, || {
+                    if file_scope_id.is_global() {
+                        return Place::Undefined.into();
+                    }
+
+                    if !self.is_deferred() {
+                        match self.index.enclosing_snapshot(
+                            FileScopeId::global(),
+                            place_expr,
+                            file_scope_id,
+                        ) {
+                            EnclosingSnapshotResult::FoundConstraint(constraint) => {
+                                constraint_keys.push((
+                                    FileScopeId::global(),
+                                    ConstraintKey::NarrowingConstraint(constraint),
+                                ));
+                            }
+                            EnclosingSnapshotResult::FoundBindings(bindings) => {
+                                let place = place_from_bindings(db, bindings).map_type(|ty| {
+                                    self.narrow_place_with_applicable_constraints(
+                                        place_expr,
+                                        ty,
+                                        &constraint_keys,
+                                    )
+                                });
+                                constraint_keys.push((
+                                    FileScopeId::global(),
+                                    ConstraintKey::NestedScope(file_scope_id),
+                                ));
+                                return place.into();
+                            }
+                            // There are no visible bindings / constraint here.
+                            EnclosingSnapshotResult::NotFound => {
+                                return Place::Undefined.into();
+                            }
+                            EnclosingSnapshotResult::NoLongerInEagerContext => {}
+                        }
+                    }
+
+                    let Some(symbol) = place_expr.as_symbol() else {
+                        return Place::Undefined.into();
+                    };
+
+                    explicit_global_symbol(db, self.file(), symbol.name()).map_type(|ty| {
+                        self.narrow_place_with_applicable_constraints(
+                            place_expr,
+                            ty,
+                            &constraint_keys,
+                        )
+                    })
+                })
+        });
+
+        if let Some(ty) = place.place.ignore_possibly_undefined() {
+            self.check_deprecated(expr_ref, ty);
+        }
+
+        (place, constraint_keys)
+    }
+
+    pub(super) fn report_unresolved_reference(&self, expr_name_node: &ast::ExprName) {
+        if !self.is_reachable(expr_name_node) {
+            return;
+        }
+
+        let Some(builder) = self
+            .context
+            .report_lint(&UNRESOLVED_REFERENCE, expr_name_node)
+        else {
+            return;
+        };
+
+        let ast::ExprName { id, .. } = expr_name_node;
+        let mut diagnostic =
+            builder.into_diagnostic(format_args!("Name `{id}` used when not defined"));
+
+        // ===
+        // Subdiagnostic (1): check to see if it was added as a builtin in a later version of Python.
+        // ===
+        if let Some(version_added_to_builtins) = version_builtin_was_added(id) {
+            diagnostic.info(format_args!(
+                "`{id}` was added as a builtin in Python 3.{version_added_to_builtins}"
+            ));
+            add_inferred_python_version_hint_to_diagnostic(
+                self.db(),
+                &mut diagnostic,
+                "resolving types",
+            );
+        }
+
+        // ===
+        // Subdiagnostic (2):
+        // - If it's an instance method, check to see if it's available as an attribute on `self`;
+        // - If it's a classmethod, check to see if it's available as an attribute on `cls`
+        // ===
+        let Some(current_function) = self.current_function_definition() else {
+            return;
+        };
+
+        let function_parameters = &*current_function.parameters;
+
+        // `self`/`cls` can't be a keyword-only parameter.
+        if function_parameters.posonlyargs.is_empty() && function_parameters.args.is_empty() {
+            return;
+        }
+
+        let Some(first_parameter) = function_parameters.iter_non_variadic_params().next() else {
+            return;
+        };
+
+        let Some(class) = self.class_context_of_current_method() else {
+            return;
+        };
+
+        let first_parameter_name = first_parameter.name();
+
+        let function_definition = self.index.expect_single_definition(current_function);
+        let Type::FunctionLiteral(function_type) = binding_type(self.db(), function_definition)
+        else {
+            return;
+        };
+
+        let attribute_exists = match MethodDecorator::try_from_fn_type(self.db(), function_type) {
+            Ok(MethodDecorator::ClassMethod) => !Type::instance(self.db(), class)
+                .class_member(self.db(), id.clone())
+                .place
+                .is_undefined(),
+            Ok(MethodDecorator::None) => !Type::instance(self.db(), class)
+                .member(self.db(), id)
+                .place
+                .is_undefined(),
+            Ok(MethodDecorator::StaticMethod) | Err(()) => false,
+        };
+
+        if attribute_exists {
+            diagnostic.info(format_args!(
+                "An attribute `{id}` is available: consider using `{first_parameter_name}.{id}`"
+            ));
+        }
+    }
+
+    fn infer_name_expression(&mut self, name: &ast::ExprName) -> Type<'db> {
+        match name.ctx {
+            ExprContext::Load => self.infer_name_load(name),
+            ExprContext::Store => Type::Never,
+            ExprContext::Del => {
+                self.infer_name_load(name);
+                Type::Never
+            }
+            ExprContext::Invalid => Type::unknown(),
+        }
+    }
+
+    fn narrow_expr_with_applicable_constraints<'r>(
+        &mut self,
+        target: impl Into<ast::ExprRef<'r>>,
+        target_ty: Type<'db>,
+        constraint_keys: &[(FileScopeId, ConstraintKey)],
+    ) -> Type<'db> {
+        let target = target.into();
+
+        if let Some(place_expr) = PlaceExpr::try_from_expr(target) {
+            self.narrow_place_with_applicable_constraints(
+                PlaceExprRef::from(&place_expr),
+                target_ty,
+                constraint_keys,
+            )
+        } else {
+            target_ty
+        }
+    }
+
+    /// Infer the type of a [`ast::ExprAttribute`] expression, assuming a load context.
+    fn infer_attribute_load(&mut self, attribute: &ast::ExprAttribute) -> Type<'db> {
+        let ast::ExprAttribute { value, attr, .. } = attribute;
+
+        let value_type = self.infer_maybe_standalone_expression(value, TypeContext::default());
+        let db = self.db();
+        let mut constraint_keys = vec![];
+
+        let mut assigned_type = None;
+        if let Some(place_expr) = PlaceExpr::try_from_expr(attribute) {
+            let (resolved, keys) = self.infer_place_load(
+                PlaceExprRef::from(&place_expr),
+                ast::ExprRef::Attribute(attribute),
+            );
+            constraint_keys.extend(keys);
+            if let Place::Defined(ty, _, Definedness::AlwaysDefined) = resolved.place {
+                assigned_type = Some(ty);
+            }
+        }
+        let fallback_place = value_type.member(db, &attr.id);
+        // Exclude non-definitely-bound places for purposes of reachability
+        // analysis. We currently do not perform boundness analysis for implicit
+        // instance attributes, so we exclude them here as well.
+        if !fallback_place.place.is_definitely_bound()
+            || fallback_place
+                .qualifiers
+                .contains(TypeQualifiers::IMPLICIT_INSTANCE_ATTRIBUTE)
+        {
+            self.all_definitely_bound = false;
+        }
+
+        let resolved_type =
+            fallback_place.map_type(|ty| {
+            self.narrow_expr_with_applicable_constraints(attribute, ty, &constraint_keys)
+        }).unwrap_with_diagnostic(|lookup_error| match lookup_error {
+                LookupError::Undefined(_) => {
+                    let report_unresolved_attribute = self.is_reachable(attribute);
+
+                    if report_unresolved_attribute {
+                        let bound_on_instance = match value_type {
+                            Type::ClassLiteral(class) => {
+                                !class.instance_member(db, None, attr).is_undefined()
+                            }
+                            Type::SubclassOf(subclass_of @ SubclassOfType { .. }) => {
+                                match subclass_of.subclass_of() {
+                                    SubclassOfInner::Class(class) => {
+                                        !class.instance_member(db, attr).is_undefined()
+                                    }
+                                    SubclassOfInner::Dynamic(_) => unreachable!(
+                                        "Attribute lookup on a dynamic `SubclassOf` type should always return a bound symbol"
+                                    ),
+                                }
+                            }
+                            _ => false,
+                        };
+
+                        if let Some(builder) = self
+                            .context
+                            .report_lint(&UNRESOLVED_ATTRIBUTE, attribute)
+                        {
+                            if bound_on_instance {
+                                builder.into_diagnostic(
+                                    format_args!(
+                                        "Attribute `{}` can only be accessed on instances, \
+                                        not on the class object `{}` itself.",
+                                        attr.id,
+                                        value_type.display(db)
+                                    ),
+                                );
+                            } else {
+                                let diagnostic = match value_type {
+                                    Type::ModuleLiteral(module) => builder.into_diagnostic(format_args!(
+                                        "Module `{}` has no member `{}`",
+                                        module.module(db).name(db),
+                                        &attr.id
+                                    )),
+                                    Type::ClassLiteral(class) => builder.into_diagnostic(format_args!(
+                                        "Class `{}` has no attribute `{}`",
+                                        class.name(db),
+                                        &attr.id
+                                    )),
+                                    Type::GenericAlias(alias) => builder.into_diagnostic(format_args!(
+                                        "Class `{}` has no attribute `{}`",
+                                        alias.display(db),
+                                        &attr.id
+                                    )),
+                                    Type::FunctionLiteral(function) => builder.into_diagnostic(format_args!(
+                                        "Function `{}` has no attribute `{}`",
+                                        function.name(db),
+                                        &attr.id
+                                    )),
+                                    _ => builder.into_diagnostic(format_args!(
+                                        "Object of type `{}` has no attribute `{}`",
+                                        value_type.display(db),
+                                        &attr.id
+                                    )),
+                                };
+                                hint_if_stdlib_attribute_exists_on_other_versions(db, diagnostic, &value_type, attr);
+                            }
+                        }
+                    }
+
+                    TypeAndQualifiers::new(Type::unknown(), TypeOrigin::Inferred, TypeQualifiers::empty())
+                }
+                LookupError::PossiblyUndefined(type_when_bound) => {
+                    report_possibly_missing_attribute(
+                        &self.context,
+                        attribute,
+                        &attr.id,
+                        value_type,
+                    );
+
+                    type_when_bound
+                }
+            })
+            .inner_type();
+
+        self.check_deprecated(attr, resolved_type);
+
+        // Even if we can obtain the attribute type based on the assignments, we still perform default type inference
+        // (to report errors).
+        assigned_type.unwrap_or(resolved_type)
+    }
+
+    fn infer_attribute_expression(&mut self, attribute: &ast::ExprAttribute) -> Type<'db> {
+        let ast::ExprAttribute {
+            value,
+            attr: _,
+            range: _,
+            node_index: _,
+            ctx,
+        } = attribute;
+
+        match ctx {
+            ExprContext::Load => self.infer_attribute_load(attribute),
+            ExprContext::Store => {
+                self.infer_expression(value, TypeContext::default());
+                Type::Never
+            }
+            ExprContext::Del => {
+                self.infer_attribute_load(attribute);
+                Type::Never
+            }
+            ExprContext::Invalid => {
+                self.infer_expression(value, TypeContext::default());
+                Type::unknown()
+            }
+        }
+    }
+
+    fn infer_unary_expression(&mut self, unary: &ast::ExprUnaryOp) -> Type<'db> {
+        let ast::ExprUnaryOp {
+            range: _,
+            node_index: _,
+            op,
+            operand,
+        } = unary;
+
+        let operand_type = self.infer_expression(operand, TypeContext::default());
+
+        self.infer_unary_expression_type(*op, operand_type, unary)
+    }
+
+    fn infer_unary_expression_type(
+        &mut self,
+        op: ast::UnaryOp,
+        operand_type: Type<'db>,
+        unary: &ast::ExprUnaryOp,
+    ) -> Type<'db> {
+        match (op, operand_type) {
+            (_, Type::Dynamic(_)) => operand_type,
+            (_, Type::Never) => Type::Never,
+
+            (_, Type::TypeAlias(alias)) => {
+                self.infer_unary_expression_type(op, alias.value_type(self.db()), unary)
+            }
+
+            (ast::UnaryOp::UAdd, Type::IntLiteral(value)) => Type::IntLiteral(value),
+            (ast::UnaryOp::USub, Type::IntLiteral(value)) => Type::IntLiteral(-value),
+            (ast::UnaryOp::Invert, Type::IntLiteral(value)) => Type::IntLiteral(!value),
+
+            (ast::UnaryOp::UAdd, Type::BooleanLiteral(bool)) => Type::IntLiteral(i64::from(bool)),
+            (ast::UnaryOp::USub, Type::BooleanLiteral(bool)) => Type::IntLiteral(-i64::from(bool)),
+            (ast::UnaryOp::Invert, Type::BooleanLiteral(bool)) => {
+                Type::IntLiteral(!i64::from(bool))
+            }
+
+            (
+                ast::UnaryOp::Invert,
+                Type::KnownInstance(KnownInstanceType::ConstraintSet(constraints)),
+            ) => {
+                let constraints = constraints.constraints(self.db());
+                let result = constraints.negate(self.db());
+                Type::KnownInstance(KnownInstanceType::ConstraintSet(TrackedConstraintSet::new(
+                    self.db(),
+                    result,
+                )))
+            }
+
+            (ast::UnaryOp::Not, ty) => ty
+                .try_bool(self.db())
+                .unwrap_or_else(|err| {
+                    err.report_diagnostic(&self.context, unary);
+                    err.fallback_truthiness()
+                })
+                .negate()
+                .into_type(self.db()),
+            (
+                op @ (ast::UnaryOp::UAdd | ast::UnaryOp::USub | ast::UnaryOp::Invert),
+                Type::FunctionLiteral(_)
+                | Type::Callable(..)
+                | Type::WrapperDescriptor(_)
+                | Type::KnownBoundMethod(_)
+                | Type::DataclassDecorator(_)
+                | Type::DataclassTransformer(_)
+                | Type::BoundMethod(_)
+                | Type::ModuleLiteral(_)
+                | Type::ClassLiteral(_)
+                | Type::GenericAlias(_)
+                | Type::SubclassOf(_)
+                | Type::NominalInstance(_)
+                | Type::ProtocolInstance(_)
+                | Type::SpecialForm(_)
+                | Type::KnownInstance(_)
+                | Type::PropertyInstance(_)
+                | Type::Union(_)
+                | Type::Intersection(_)
+                | Type::AlwaysTruthy
+                | Type::AlwaysFalsy
+                | Type::StringLiteral(_)
+                | Type::LiteralString
+                | Type::BytesLiteral(_)
+                | Type::EnumLiteral(_)
+                | Type::BoundSuper(_)
+                | Type::TypeVar(_)
+                | Type::TypeIs(_)
+                | Type::TypedDict(_),
+            ) => {
+                let unary_dunder_method = match op {
+                    ast::UnaryOp::Invert => "__invert__",
+                    ast::UnaryOp::UAdd => "__pos__",
+                    ast::UnaryOp::USub => "__neg__",
+                    ast::UnaryOp::Not => {
+                        unreachable!("Not operator is handled in its own case");
+                    }
+                };
+
+                match operand_type.try_call_dunder(
+                    self.db(),
+                    unary_dunder_method,
+                    CallArguments::none(),
+                    TypeContext::default(),
+                ) {
+                    Ok(outcome) => outcome.return_type(self.db()),
+                    Err(e) => {
+                        if let Some(builder) =
+                            self.context.report_lint(&UNSUPPORTED_OPERATOR, unary)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Unary operator `{op}` is unsupported for type `{}`",
+                                operand_type.display(self.db()),
+                            ));
+                        }
+                        e.fallback_return_type(self.db())
+                    }
+                }
+            }
+        }
+    }
+
+    fn infer_binary_expression(&mut self, binary: &ast::ExprBinOp) -> Type<'db> {
+        let ast::ExprBinOp {
+            left,
+            op,
+            right,
+            range: _,
+            node_index: _,
+        } = binary;
+
+        let left_ty = self.infer_expression(left, TypeContext::default());
+        let right_ty = self.infer_expression(right, TypeContext::default());
+
+        self.infer_binary_expression_type(binary.into(), false, left_ty, right_ty, *op)
+            .unwrap_or_else(|| {
+                let db = self.db();
+
+                if let Some(builder) = self.context.report_lint(&UNSUPPORTED_OPERATOR, binary) {
+                    let mut diag = builder.into_diagnostic(format_args!(
+                        "Operator `{op}` is unsupported between objects of type `{}` and `{}`",
+                        left_ty.display(db),
+                        right_ty.display(db)
+                    ));
+
+                    if op == &ast::Operator::BitOr
+                        && (left_ty.is_subtype_of(db, KnownClass::Type.to_instance(db))
+                            || right_ty.is_subtype_of(db, KnownClass::Type.to_instance(db)))
+                        && Program::get(db).python_version(db) < PythonVersion::PY310
+                    {
+                        diag.info(
+                            "Note that `X | Y` PEP 604 union syntax is only available in Python 3.10 and later",
+                        );
+                        add_inferred_python_version_hint_to_diagnostic(db, &mut diag, "resolving types");
+                    }
+                }
+                Type::unknown()
+            })
+    }
+
+    fn infer_binary_expression_type(
+        &mut self,
+        node: AnyNodeRef<'_>,
+        mut emitted_division_by_zero_diagnostic: bool,
+        left_ty: Type<'db>,
+        right_ty: Type<'db>,
+        op: ast::Operator,
+    ) -> Option<Type<'db>> {
+        // Check for division by zero; this doesn't change the inferred type for the expression, but
+        // may emit a diagnostic
+        if !emitted_division_by_zero_diagnostic
+            && matches!(
+                (op, right_ty),
+                (
+                    ast::Operator::Div | ast::Operator::FloorDiv | ast::Operator::Mod,
+                    Type::IntLiteral(0) | Type::BooleanLiteral(false)
+                )
+            )
+        {
+            emitted_division_by_zero_diagnostic = self.check_division_by_zero(node, op, left_ty);
+        }
+
+        match (left_ty, right_ty, op) {
+            (Type::Union(lhs_union), rhs, _) => lhs_union.try_map(self.db(), |lhs_element| {
+                self.infer_binary_expression_type(
+                    node,
+                    emitted_division_by_zero_diagnostic,
+                    *lhs_element,
+                    rhs,
+                    op,
+                )
+            }),
+            (lhs, Type::Union(rhs_union), _) => rhs_union.try_map(self.db(), |rhs_element| {
+                self.infer_binary_expression_type(
+                    node,
+                    emitted_division_by_zero_diagnostic,
+                    lhs,
+                    *rhs_element,
+                    op,
+                )
+            }),
+
+            (Type::TypeAlias(alias), rhs, _) => self.infer_binary_expression_type(
+                node,
+                emitted_division_by_zero_diagnostic,
+                alias.value_type(self.db()),
+                rhs,
+                op,
+            ),
+
+            (lhs, Type::TypeAlias(alias), _) => self.infer_binary_expression_type(
+                node,
+                emitted_division_by_zero_diagnostic,
+                lhs,
+                alias.value_type(self.db()),
+                op,
+            ),
+
+            // Non-todo Anys take precedence over Todos (as if we fix this `Todo` in the future,
+            // the result would then become Any or Unknown, respectively).
+            (div @ Type::Dynamic(DynamicType::Divergent(_)), _, _)
+            | (_, div @ Type::Dynamic(DynamicType::Divergent(_)), _) => Some(div),
+
+            (any @ Type::Dynamic(DynamicType::Any), _, _)
+            | (_, any @ Type::Dynamic(DynamicType::Any), _) => Some(any),
+
+            (unknown @ Type::Dynamic(DynamicType::Unknown), _, _)
+            | (_, unknown @ Type::Dynamic(DynamicType::Unknown), _) => Some(unknown),
+
+            (
+                todo @ Type::Dynamic(
+                    DynamicType::Todo(_)
+                    | DynamicType::TodoPEP695ParamSpec
+                    | DynamicType::TodoUnpack
+                    | DynamicType::TodoTypeAlias,
+                ),
+                _,
+                _,
+            )
+            | (
+                _,
+                todo @ Type::Dynamic(
+                    DynamicType::Todo(_)
+                    | DynamicType::TodoPEP695ParamSpec
+                    | DynamicType::TodoUnpack
+                    | DynamicType::TodoTypeAlias,
+                ),
+                _,
+            ) => Some(todo),
+
+            (Type::Never, _, _) | (_, Type::Never, _) => Some(Type::Never),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Add) => Some(
+                n.checked_add(m)
+                    .map(Type::IntLiteral)
+                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db())),
+            ),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Sub) => Some(
+                n.checked_sub(m)
+                    .map(Type::IntLiteral)
+                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db())),
+            ),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mult) => Some(
+                n.checked_mul(m)
+                    .map(Type::IntLiteral)
+                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db())),
+            ),
+
+            (Type::IntLiteral(_), Type::IntLiteral(_), ast::Operator::Div) => {
+                Some(KnownClass::Float.to_instance(self.db()))
+            }
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::FloorDiv) => Some({
+                let mut q = n.checked_div(m);
+                let r = n.checked_rem(m);
+                // Division works differently in Python than in Rust. If the result is negative and
+                // there is a remainder, the division rounds down (instead of towards zero):
+                if n.is_negative() != m.is_negative() && r.unwrap_or(0) != 0 {
+                    q = q.map(|q| q - 1);
+                }
+                q.map(Type::IntLiteral)
+                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db()))
+            }),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mod) => Some({
+                let mut r = n.checked_rem(m);
+                // Division works differently in Python than in Rust. If the result is negative and
+                // there is a remainder, the division rounds down (instead of towards zero). Adjust
+                // the remainder to compensate so that q * m + r == n:
+                if n.is_negative() != m.is_negative() && r.unwrap_or(0) != 0 {
+                    r = r.map(|x| x + m);
+                }
+                r.map(Type::IntLiteral)
+                    .unwrap_or_else(|| KnownClass::Int.to_instance(self.db()))
+            }),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Pow) => Some({
+                if m < 0 {
+                    KnownClass::Float.to_instance(self.db())
+                } else {
+                    u32::try_from(m)
+                        .ok()
+                        .and_then(|m| n.checked_pow(m))
+                        .map(Type::IntLiteral)
+                        .unwrap_or_else(|| KnownClass::Int.to_instance(self.db()))
+                }
+            }),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::BitOr) => {
+                Some(Type::IntLiteral(n | m))
+            }
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::BitAnd) => {
+                Some(Type::IntLiteral(n & m))
+            }
+
+            (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::BitXor) => {
+                Some(Type::IntLiteral(n ^ m))
+            }
+
+            (Type::BytesLiteral(lhs), Type::BytesLiteral(rhs), ast::Operator::Add) => {
+                let bytes = [lhs.value(self.db()), rhs.value(self.db())].concat();
+                Some(Type::bytes_literal(self.db(), &bytes))
+            }
+
+            (Type::StringLiteral(lhs), Type::StringLiteral(rhs), ast::Operator::Add) => {
+                let lhs_value = lhs.value(self.db()).to_string();
+                let rhs_value = rhs.value(self.db());
+                let ty = if lhs_value.len() + rhs_value.len() <= Self::MAX_STRING_LITERAL_SIZE {
+                    Type::string_literal(self.db(), &(lhs_value + rhs_value))
+                } else {
+                    Type::LiteralString
+                };
+                Some(ty)
+            }
+
+            (
+                Type::StringLiteral(_) | Type::LiteralString,
+                Type::StringLiteral(_) | Type::LiteralString,
+                ast::Operator::Add,
+            ) => Some(Type::LiteralString),
+
+            (Type::StringLiteral(s), Type::IntLiteral(n), ast::Operator::Mult)
+            | (Type::IntLiteral(n), Type::StringLiteral(s), ast::Operator::Mult) => {
+                let ty = if n < 1 {
+                    Type::string_literal(self.db(), "")
+                } else if let Ok(n) = usize::try_from(n) {
+                    if n.checked_mul(s.value(self.db()).len())
+                        .is_some_and(|new_length| new_length <= Self::MAX_STRING_LITERAL_SIZE)
+                    {
+                        let new_literal = s.value(self.db()).repeat(n);
+                        Type::string_literal(self.db(), &new_literal)
+                    } else {
+                        Type::LiteralString
+                    }
+                } else {
+                    Type::LiteralString
+                };
+                Some(ty)
+            }
+
+            (Type::LiteralString, Type::IntLiteral(n), ast::Operator::Mult)
+            | (Type::IntLiteral(n), Type::LiteralString, ast::Operator::Mult) => {
+                let ty = if n < 1 {
+                    Type::string_literal(self.db(), "")
+                } else {
+                    Type::LiteralString
+                };
+                Some(ty)
+            }
+
+            (Type::BooleanLiteral(b1), Type::BooleanLiteral(b2), ast::Operator::BitOr) => {
+                Some(Type::BooleanLiteral(b1 | b2))
+            }
+
+            (Type::BooleanLiteral(b1), Type::BooleanLiteral(b2), ast::Operator::BitAnd) => {
+                Some(Type::BooleanLiteral(b1 & b2))
+            }
+
+            (Type::BooleanLiteral(b1), Type::BooleanLiteral(b2), ast::Operator::BitXor) => {
+                Some(Type::BooleanLiteral(b1 ^ b2))
+            }
+
+            (Type::BooleanLiteral(b1), Type::BooleanLiteral(_) | Type::IntLiteral(_), op) => self
+                .infer_binary_expression_type(
+                    node,
+                    emitted_division_by_zero_diagnostic,
+                    Type::IntLiteral(i64::from(b1)),
+                    right_ty,
+                    op,
+                ),
+            (Type::IntLiteral(_), Type::BooleanLiteral(b2), op) => self
+                .infer_binary_expression_type(
+                    node,
+                    emitted_division_by_zero_diagnostic,
+                    left_ty,
+                    Type::IntLiteral(i64::from(b2)),
+                    op,
+                ),
+
+            (
+                Type::KnownInstance(KnownInstanceType::ConstraintSet(left)),
+                Type::KnownInstance(KnownInstanceType::ConstraintSet(right)),
+                ast::Operator::BitAnd,
+            ) => {
+                let left = left.constraints(self.db());
+                let right = right.constraints(self.db());
+                let result = left.and(self.db(), || *right);
+                Some(Type::KnownInstance(KnownInstanceType::ConstraintSet(
+                    TrackedConstraintSet::new(self.db(), result),
+                )))
+            }
+
+            (
+                Type::KnownInstance(KnownInstanceType::ConstraintSet(left)),
+                Type::KnownInstance(KnownInstanceType::ConstraintSet(right)),
+                ast::Operator::BitOr,
+            ) => {
+                let left = left.constraints(self.db());
+                let right = right.constraints(self.db());
+                let result = left.or(self.db(), || *right);
+                Some(Type::KnownInstance(KnownInstanceType::ConstraintSet(
+                    TrackedConstraintSet::new(self.db(), result),
+                )))
+            }
+
+            // Special-case `X | Y` with `X` and `Y` instances of `type` to produce a `types.UnionType` instance, in order to
+            // overwrite the typeshed return type for `type.__or__`, which would result in `types.UnionType | X`. We currently
+            // do this to avoid false positives when a legacy type alias like `IntOrStr = int | str` is later used in a type
+            // expression, because `types.UnionType` will result in a `@Todo` type, while `types.UnionType | <class 'int'>` does
+            // not.
+            //
+            // TODO: Remove this special case once we add support for legacy type aliases.
+            (
+                Type::ClassLiteral(..) | Type::SubclassOf(..) | Type::GenericAlias(..),
+                Type::ClassLiteral(..) | Type::SubclassOf(..) | Type::GenericAlias(..),
+                ast::Operator::BitOr,
+            ) if Program::get(self.db()).python_version(self.db()) >= PythonVersion::PY310 => {
+                Some(KnownClass::UnionType.to_instance(self.db()))
+            }
+
+            // We've handled all of the special cases that we support for literals, so we need to
+            // fall back on looking for dunder methods on one of the operand types.
+            (
+                Type::FunctionLiteral(_)
+                | Type::BooleanLiteral(_)
+                | Type::Callable(..)
+                | Type::BoundMethod(_)
+                | Type::WrapperDescriptor(_)
+                | Type::KnownBoundMethod(_)
+                | Type::DataclassDecorator(_)
+                | Type::DataclassTransformer(_)
+                | Type::ModuleLiteral(_)
+                | Type::ClassLiteral(_)
+                | Type::GenericAlias(_)
+                | Type::SubclassOf(_)
+                | Type::NominalInstance(_)
+                | Type::ProtocolInstance(_)
+                | Type::SpecialForm(_)
+                | Type::KnownInstance(_)
+                | Type::PropertyInstance(_)
+                | Type::Intersection(_)
+                | Type::AlwaysTruthy
+                | Type::AlwaysFalsy
+                | Type::IntLiteral(_)
+                | Type::StringLiteral(_)
+                | Type::LiteralString
+                | Type::BytesLiteral(_)
+                | Type::EnumLiteral(_)
+                | Type::BoundSuper(_)
+                | Type::TypeVar(_)
+                | Type::TypeIs(_)
+                | Type::TypedDict(_),
+                Type::FunctionLiteral(_)
+                | Type::BooleanLiteral(_)
+                | Type::Callable(..)
+                | Type::BoundMethod(_)
+                | Type::WrapperDescriptor(_)
+                | Type::KnownBoundMethod(_)
+                | Type::DataclassDecorator(_)
+                | Type::DataclassTransformer(_)
+                | Type::ModuleLiteral(_)
+                | Type::ClassLiteral(_)
+                | Type::GenericAlias(_)
+                | Type::SubclassOf(_)
+                | Type::NominalInstance(_)
+                | Type::ProtocolInstance(_)
+                | Type::SpecialForm(_)
+                | Type::KnownInstance(_)
+                | Type::PropertyInstance(_)
+                | Type::Intersection(_)
+                | Type::AlwaysTruthy
+                | Type::AlwaysFalsy
+                | Type::IntLiteral(_)
+                | Type::StringLiteral(_)
+                | Type::LiteralString
+                | Type::BytesLiteral(_)
+                | Type::EnumLiteral(_)
+                | Type::BoundSuper(_)
+                | Type::TypeVar(_)
+                | Type::TypeIs(_)
+                | Type::TypedDict(_),
+                op,
+            ) => Type::try_call_bin_op(self.db(), left_ty, op, right_ty)
+                .map(|outcome| outcome.return_type(self.db()))
+                .ok(),
+        }
+    }
+
+    fn infer_boolean_expression(&mut self, bool_op: &ast::ExprBoolOp) -> Type<'db> {
+        let ast::ExprBoolOp {
+            range: _,
+            node_index: _,
+            op,
+            values,
+        } = bool_op;
+        self.infer_chained_boolean_types(
+            *op,
+            values.iter().enumerate(),
+            |builder, (index, value)| {
+                let ty = if index == values.len() - 1 {
+                    builder.infer_expression(value, TypeContext::default())
+                } else {
+                    builder.infer_standalone_expression(value, TypeContext::default())
+                };
+
+                (ty, value.range())
+            },
+        )
+    }
+
+    /// Computes the output of a chain of (one) boolean operation, consuming as input an iterator
+    /// of operations and calling the `infer_ty` for each to infer their types.
+    /// The iterator is consumed even if the boolean evaluation can be short-circuited,
+    /// in order to ensure the invariant that all expressions are evaluated when inferring types.
+    fn infer_chained_boolean_types<Iterator, Item, F>(
+        &mut self,
+        op: ast::BoolOp,
+        operations: Iterator,
+        infer_ty: F,
+    ) -> Type<'db>
+    where
+        Iterator: IntoIterator<Item = Item>,
+        F: Fn(&mut Self, Item) -> (Type<'db>, TextRange),
+    {
+        let mut done = false;
+        let db = self.db();
+
+        let elements = operations
+            .into_iter()
+            .with_position()
+            .map(|(position, item)| {
+                let (ty, range) = infer_ty(self, item);
+
+                let is_last = matches!(
+                    position,
+                    itertools::Position::Last | itertools::Position::Only
+                );
+
+                if is_last {
+                    if done { Type::Never } else { ty }
+                } else {
+                    let truthiness = ty.try_bool(self.db()).unwrap_or_else(|err| {
+                        err.report_diagnostic(&self.context, range);
+                        err.fallback_truthiness()
+                    });
+
+                    if done {
+                        return Type::Never;
+                    }
+
+                    match (truthiness, op) {
+                        (Truthiness::AlwaysTrue, ast::BoolOp::And) => Type::Never,
+                        (Truthiness::AlwaysFalse, ast::BoolOp::Or) => Type::Never,
+
+                        (Truthiness::AlwaysFalse, ast::BoolOp::And)
+                        | (Truthiness::AlwaysTrue, ast::BoolOp::Or) => {
+                            done = true;
+                            ty
+                        }
+
+                        (Truthiness::Ambiguous, _) => IntersectionBuilder::new(db)
+                            .add_positive(ty)
+                            .add_negative(match op {
+                                ast::BoolOp::And => Type::AlwaysTruthy,
+                                ast::BoolOp::Or => Type::AlwaysFalsy,
+                            })
+                            .build(),
+                    }
+                }
+            });
+
+        UnionType::from_elements(db, elements)
+    }
+
+    fn infer_compare_expression(&mut self, compare: &ast::ExprCompare) -> Type<'db> {
+        let ast::ExprCompare {
+            range: _,
+            node_index: _,
+            left,
+            ops,
+            comparators,
+        } = compare;
+
+        self.infer_expression(left, TypeContext::default());
+
+        // https://docs.python.org/3/reference/expressions.html#comparisons
+        // > Formally, if `a, b, c, …, y, z` are expressions and `op1, op2, …, opN` are comparison
+        // > operators, then `a op1 b op2 c ... y opN z` is equivalent to `a op1 b and b op2 c and
+        // ... > y opN z`, except that each expression is evaluated at most once.
+        //
+        // As some operators (==, !=, <, <=, >, >=) *can* return an arbitrary type, the logic below
+        // is shared with the one in `infer_binary_type_comparison`.
+        self.infer_chained_boolean_types(
+            ast::BoolOp::And,
+            std::iter::once(&**left)
+                .chain(comparators)
+                .tuple_windows::<(_, _)>()
+                .zip(ops),
+            |builder, ((left, right), op)| {
+                let left_ty = builder.expression_type(left);
+                let right_ty = builder.infer_expression(right, TypeContext::default());
+
+                let range = TextRange::new(left.start(), right.end());
+
+                let ty = builder
+                    .infer_binary_type_comparison(
+                        left_ty,
+                        *op,
+                        right_ty,
+                        range,
+                        &BinaryComparisonVisitor::new(Ok(Type::BooleanLiteral(true))),
+                    )
+                    .unwrap_or_else(|error| {
+                        if let Some(diagnostic_builder) =
+                            builder.context.report_lint(&UNSUPPORTED_OPERATOR, range)
+                        {
+                            // Handle unsupported operators (diagnostic, `bool`/`Unknown` outcome)
+                            diagnostic_builder.into_diagnostic(format_args!(
+                                "Operator `{}` is not supported for types `{}` and `{}`{}",
+                                error.op,
+                                error.left_ty.display(builder.db()),
+                                error.right_ty.display(builder.db()),
+                                if (left_ty, right_ty) == (error.left_ty, error.right_ty) {
+                                    String::new()
+                                } else {
+                                    format!(
+                                        ", in comparing `{}` with `{}`",
+                                        left_ty.display(builder.db()),
+                                        right_ty.display(builder.db())
+                                    )
+                                }
+                            ));
+                        }
+
+                        match op {
+                            // `in, not in, is, is not` always return bool instances
+                            ast::CmpOp::In
+                            | ast::CmpOp::NotIn
+                            | ast::CmpOp::Is
+                            | ast::CmpOp::IsNot => KnownClass::Bool.to_instance(builder.db()),
+                            // Other operators can return arbitrary types
+                            _ => Type::unknown(),
+                        }
+                    });
+
+                (ty, range)
+            },
+        )
+    }
+
+    fn infer_binary_intersection_type_comparison(
+        &mut self,
+        intersection: IntersectionType<'db>,
+        op: ast::CmpOp,
+        other: Type<'db>,
+        intersection_on: IntersectionOn,
+        range: TextRange,
+        visitor: &BinaryComparisonVisitor<'db>,
+    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
+        enum State<'db> {
+            // We have not seen any positive elements (yet)
+            NoPositiveElements,
+            // The operator was unsupported on all elements that we have seen so far.
+            // Contains the first error we encountered.
+            UnsupportedOnAllElements(CompareUnsupportedError<'db>),
+            // The operator was supported on at least one positive element.
+            Supported,
+        }
+
+        // If a comparison yields a definitive true/false answer on a (positive) part
+        // of an intersection type, it will also yield a definitive answer on the full
+        // intersection type, which is even more specific.
+        for pos in intersection.positive(self.db()) {
+            let result = match intersection_on {
+                IntersectionOn::Left => {
+                    self.infer_binary_type_comparison(*pos, op, other, range, visitor)
+                }
+                IntersectionOn::Right => {
+                    self.infer_binary_type_comparison(other, op, *pos, range, visitor)
+                }
+            };
+
+            if let Ok(Type::BooleanLiteral(_)) = result {
+                return result;
+            }
+        }
+
+        // For negative contributions to the intersection type, there are only a few
+        // special cases that allow us to narrow down the result type of the comparison.
+        for neg in intersection.negative(self.db()) {
+            let result = match intersection_on {
+                IntersectionOn::Left => self
+                    .infer_binary_type_comparison(*neg, op, other, range, visitor)
+                    .ok(),
+                IntersectionOn::Right => self
+                    .infer_binary_type_comparison(other, op, *neg, range, visitor)
+                    .ok(),
+            };
+
+            match (op, result) {
+                (ast::CmpOp::Is, Some(Type::BooleanLiteral(true))) => {
+                    return Ok(Type::BooleanLiteral(false));
+                }
+                (ast::CmpOp::IsNot, Some(Type::BooleanLiteral(false))) => {
+                    return Ok(Type::BooleanLiteral(true));
+                }
+                _ => {}
+            }
+        }
+
+        // If none of the simplifications above apply, we still need to return *some*
+        // result type for the comparison 'T_inter `op` T_other' (or reversed), where
+        //
+        //    T_inter = P1 & P2 & ... & Pn & ~N1 & ~N2 & ... & ~Nm
+        //
+        // is the intersection type. If f(T) is the function that computes the result
+        // type of a `op`-comparison with `T_other`, we are interested in f(T_inter).
+        // Since we can't compute it exactly, we return the following approximation:
+        //
+        //   f(T_inter) = f(P1) & f(P2) & ... & f(Pn)
+        //
+        // The reason for this is the following: In general, for any function 'f', the
+        // set f(A) & f(B) is *larger than or equal to* the set f(A & B). This means
+        // that we will return a type that is possibly wider than it could be, but
+        // never wrong.
+        //
+        // However, we do have to leave out the negative contributions. If we were to
+        // add a contribution like ~f(N1), we would potentially infer result types
+        // that are too narrow.
+        //
+        // As an example for this, consider the intersection type `int & ~Literal[1]`.
+        // If 'f' would be the `==`-comparison with 2, we obviously can't tell if that
+        // answer would be true or false, so we need to return `bool`. And indeed, we
+        // we have (glossing over notational details):
+        //
+        //   f(int & ~1)
+        //       = f({..., -1, 0, 2, 3, ...})
+        //       = {..., False, False, True, False, ...}
+        //       = bool
+        //
+        // On the other hand, if we were to compute
+        //
+        //   f(int) & ~f(1)
+        //       = bool & ~False
+        //       = True
+        //
+        // we would get a result type `Literal[True]` which is too narrow.
+        //
+        let mut builder = IntersectionBuilder::new(self.db());
+
+        builder = builder.add_positive(KnownClass::Bool.to_instance(self.db()));
+
+        let mut state = State::NoPositiveElements;
+
+        for pos in intersection.positive(self.db()) {
+            let result = match intersection_on {
+                IntersectionOn::Left => {
+                    self.infer_binary_type_comparison(*pos, op, other, range, visitor)
+                }
+                IntersectionOn::Right => {
+                    self.infer_binary_type_comparison(other, op, *pos, range, visitor)
+                }
+            };
+
+            match result {
+                Ok(ty) => {
+                    state = State::Supported;
+                    builder = builder.add_positive(ty);
+                }
+                Err(error) => {
+                    match state {
+                        State::NoPositiveElements => {
+                            // This is the first positive element, but the operation is not supported.
+                            // Store the error and continue.
+                            state = State::UnsupportedOnAllElements(error);
+                        }
+                        State::UnsupportedOnAllElements(_) => {
+                            // We already have an error stored, and continue to see elements on which
+                            // the operator is not supported. Continue with the same state (only keep
+                            // the first error).
+                        }
+                        State::Supported => {
+                            // We previously saw a positive element that supported the operator,
+                            // so the overall operation is still supported.
+                        }
+                    }
+                }
+            }
+        }
+
+        match state {
+            State::Supported => Ok(builder.build()),
+            State::NoPositiveElements => {
+                // We didn't see any positive elements, check if the operation is supported on `object`:
+                match intersection_on {
+                    IntersectionOn::Left => {
+                        self.infer_binary_type_comparison(Type::object(), op, other, range, visitor)
+                    }
+                    IntersectionOn::Right => {
+                        self.infer_binary_type_comparison(other, op, Type::object(), range, visitor)
+                    }
+                }
+            }
+            State::UnsupportedOnAllElements(error) => Err(error),
+        }
+    }
+
+    /// Infers the type of a binary comparison (e.g. 'left == right'). See
+    /// `infer_compare_expression` for the higher level logic dealing with multi-comparison
+    /// expressions.
+    ///
+    /// If the operation is not supported, return None (we need upstream context to emit a
+    /// diagnostic).
+    fn infer_binary_type_comparison(
+        &mut self,
+        left: Type<'db>,
+        op: ast::CmpOp,
+        right: Type<'db>,
+        range: TextRange,
+        visitor: &BinaryComparisonVisitor<'db>,
+    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
+        // Note: identity (is, is not) for equal builtin types is unreliable and not part of the
+        // language spec.
+        // - `[ast::CompOp::Is]`: return `false` if unequal, `bool` if equal
+        // - `[ast::CompOp::IsNot]`: return `true` if unequal, `bool` if equal
+        let db = self.db();
+        let try_dunder = |inference: &mut Self, policy: MemberLookupPolicy| {
+            let rich_comparison = |op| inference.infer_rich_comparison(left, right, op, policy);
+            let membership_test_comparison = |op, range: TextRange| {
+                inference.infer_membership_test_comparison(left, right, op, range)
+            };
+
+            match op {
+                ast::CmpOp::Eq => rich_comparison(RichCompareOperator::Eq),
+                ast::CmpOp::NotEq => rich_comparison(RichCompareOperator::Ne),
+                ast::CmpOp::Lt => rich_comparison(RichCompareOperator::Lt),
+                ast::CmpOp::LtE => rich_comparison(RichCompareOperator::Le),
+                ast::CmpOp::Gt => rich_comparison(RichCompareOperator::Gt),
+                ast::CmpOp::GtE => rich_comparison(RichCompareOperator::Ge),
+                ast::CmpOp::In => {
+                    membership_test_comparison(MembershipTestCompareOperator::In, range)
+                }
+                ast::CmpOp::NotIn => {
+                    membership_test_comparison(MembershipTestCompareOperator::NotIn, range)
+                }
+                ast::CmpOp::Is => {
+                    if left.is_disjoint_from(db, right) {
+                        Ok(Type::BooleanLiteral(false))
+                    } else if left.is_singleton(db) && left.is_equivalent_to(db, right) {
+                        Ok(Type::BooleanLiteral(true))
+                    } else {
+                        Ok(KnownClass::Bool.to_instance(db))
+                    }
+                }
+                ast::CmpOp::IsNot => {
+                    if left.is_disjoint_from(db, right) {
+                        Ok(Type::BooleanLiteral(true))
+                    } else if left.is_singleton(db) && left.is_equivalent_to(db, right) {
+                        Ok(Type::BooleanLiteral(false))
+                    } else {
+                        Ok(KnownClass::Bool.to_instance(db))
+                    }
+                }
+            }
+        };
+
+        let comparison_result = match (left, right) {
+            (Type::Union(union), other) => {
+                let mut builder = UnionBuilder::new(self.db());
+                for element in union.elements(self.db()) {
+                    builder =
+                        builder.add(self.infer_binary_type_comparison(*element, op, other, range, visitor)?);
+                }
+                Some(Ok(builder.build()))
+            }
+            (other, Type::Union(union)) => {
+                let mut builder = UnionBuilder::new(self.db());
+                for element in union.elements(self.db()) {
+                    builder =
+                        builder.add(self.infer_binary_type_comparison(other, op, *element, range, visitor)?);
+                }
+                Some(Ok(builder.build()))
+            }
+
+            (Type::Intersection(intersection), right) => {
+                Some(self.infer_binary_intersection_type_comparison(
+                    intersection,
+                    op,
+                    right,
+                    IntersectionOn::Left,
+                    range,
+                    visitor,
+                ))
+            }
+            (left, Type::Intersection(intersection)) => {
+                Some(self.infer_binary_intersection_type_comparison(
+                    intersection,
+                    op,
+                    left,
+                    IntersectionOn::Right,
+                    range,
+                    visitor,
+                ))
+            }
+
+            (Type::TypeAlias(alias), right) => Some(
+                visitor.visit((left, op, right), || { self.infer_binary_type_comparison(
+                    alias.value_type(self.db()),
+                    op,
+                    right,
+                    range,
+                    visitor,
+                )
+            })),
+
+            (left, Type::TypeAlias(alias)) => Some(
+                visitor.visit((left, op, right), || { self.infer_binary_type_comparison(
+                    left,
+                    op,
+                    alias.value_type(self.db()),
+                    range,
+                    visitor,
+                )
+            })),
+
+            (Type::IntLiteral(n), Type::IntLiteral(m)) => Some(match op {
+                ast::CmpOp::Eq => Ok(Type::BooleanLiteral(n == m)),
+                ast::CmpOp::NotEq => Ok(Type::BooleanLiteral(n != m)),
+                ast::CmpOp::Lt => Ok(Type::BooleanLiteral(n < m)),
+                ast::CmpOp::LtE => Ok(Type::BooleanLiteral(n <= m)),
+                ast::CmpOp::Gt => Ok(Type::BooleanLiteral(n > m)),
+                ast::CmpOp::GtE => Ok(Type::BooleanLiteral(n >= m)),
+                // We cannot say that two equal int Literals will return True from an `is` or `is not` comparison.
+                // Even if they are the same value, they may not be the same object.
+                ast::CmpOp::Is => {
+                    if n == m {
+                        Ok(KnownClass::Bool.to_instance(self.db()))
+                    } else {
+                        Ok(Type::BooleanLiteral(false))
+                    }
+                }
+                ast::CmpOp::IsNot => {
+                    if n == m {
+                        Ok(KnownClass::Bool.to_instance(self.db()))
+                    } else {
+                        Ok(Type::BooleanLiteral(true))
+                    }
+                }
+                // Undefined for (int, int)
+                ast::CmpOp::In | ast::CmpOp::NotIn => Err(CompareUnsupportedError {
+                    op,
+                    left_ty: left,
+                    right_ty: right,
+                }),
+            }),
+            (Type::IntLiteral(_), Type::NominalInstance(_)) => {
+                Some(self.infer_binary_type_comparison(
+                    KnownClass::Int.to_instance(self.db()),
+                    op,
+                    right,
+                    range,
+                    visitor,
+                ))
+            }
+            (Type::NominalInstance(_), Type::IntLiteral(_)) => {
+                Some(self.infer_binary_type_comparison(
+                    left,
+                    op,
+                    KnownClass::Int.to_instance(self.db()),
+                    range,
+                    visitor,
+                ))
+            }
+
+            // Booleans are coded as integers (False = 0, True = 1)
+            (Type::IntLiteral(n), Type::BooleanLiteral(b)) => {
+                Some(self.infer_binary_type_comparison(
+                    Type::IntLiteral(n),
+                    op,
+                    Type::IntLiteral(i64::from(b)),
+                    range,
+                    visitor,
+                ))
+            }
+            (Type::BooleanLiteral(b), Type::IntLiteral(m)) => {
+                Some(self.infer_binary_type_comparison(
+                    Type::IntLiteral(i64::from(b)),
+                    op,
+                    Type::IntLiteral(m),
+                    range,
+                    visitor,
+                ))
+            }
+            (Type::BooleanLiteral(a), Type::BooleanLiteral(b)) => {
+                Some(self.infer_binary_type_comparison(
+                    Type::IntLiteral(i64::from(a)),
+                    op,
+                    Type::IntLiteral(i64::from(b)),
+                    range,
+                    visitor,
+                ))
+            }
+
+            (Type::StringLiteral(salsa_s1), Type::StringLiteral(salsa_s2)) => {
+                let s1 = salsa_s1.value(self.db());
+                let s2 = salsa_s2.value(self.db());
+                let result = match op {
+                    ast::CmpOp::Eq => Ok(Type::BooleanLiteral(s1 == s2)),
+                    ast::CmpOp::NotEq => Ok(Type::BooleanLiteral(s1 != s2)),
+                    ast::CmpOp::Lt => Ok(Type::BooleanLiteral(s1 < s2)),
+                    ast::CmpOp::LtE => Ok(Type::BooleanLiteral(s1 <= s2)),
+                    ast::CmpOp::Gt => Ok(Type::BooleanLiteral(s1 > s2)),
+                    ast::CmpOp::GtE => Ok(Type::BooleanLiteral(s1 >= s2)),
+                    ast::CmpOp::In => Ok(Type::BooleanLiteral(s2.contains(s1))),
+                    ast::CmpOp::NotIn => Ok(Type::BooleanLiteral(!s2.contains(s1))),
+                    ast::CmpOp::Is => {
+                        if s1 == s2 {
+                            Ok(KnownClass::Bool.to_instance(self.db()))
+                        } else {
+                            Ok(Type::BooleanLiteral(false))
+                        }
+                    }
+                    ast::CmpOp::IsNot => {
+                        if s1 == s2 {
+                            Ok(KnownClass::Bool.to_instance(self.db()))
+                        } else {
+                            Ok(Type::BooleanLiteral(true))
+                        }
+                    }
+                };
+                Some(result)
+            }
+            (Type::StringLiteral(_), _) => Some(self.infer_binary_type_comparison(
+                KnownClass::Str.to_instance(self.db()),
+                op,
+                right,
+                range,
+                visitor,
+            )),
+            (_, Type::StringLiteral(_)) => Some(self.infer_binary_type_comparison(
+                left,
+                op,
+                KnownClass::Str.to_instance(self.db()),
+                range,
+                visitor,
+            )),
+
+            (Type::LiteralString, _) => Some(self.infer_binary_type_comparison(
+                KnownClass::Str.to_instance(self.db()),
+                op,
+                right,
+                range,
+                visitor,
+            )),
+            (_, Type::LiteralString) => Some(self.infer_binary_type_comparison(
+                left,
+                op,
+                KnownClass::Str.to_instance(self.db()),
+                range,
+                visitor,
+            )),
+
+            (Type::BytesLiteral(salsa_b1), Type::BytesLiteral(salsa_b2)) => {
+                let b1 = salsa_b1.value(self.db());
+                let b2 = salsa_b2.value(self.db());
+                let result = match op {
+                    ast::CmpOp::Eq => Ok(Type::BooleanLiteral(b1 == b2)),
+                    ast::CmpOp::NotEq => Ok(Type::BooleanLiteral(b1 != b2)),
+                    ast::CmpOp::Lt => Ok(Type::BooleanLiteral(b1 < b2)),
+                    ast::CmpOp::LtE => Ok(Type::BooleanLiteral(b1 <= b2)),
+                    ast::CmpOp::Gt => Ok(Type::BooleanLiteral(b1 > b2)),
+                    ast::CmpOp::GtE => Ok(Type::BooleanLiteral(b1 >= b2)),
+                    ast::CmpOp::In => {
+                        Ok(Type::BooleanLiteral(memchr::memmem::find(b2, b1).is_some()))
+                    }
+                    ast::CmpOp::NotIn => {
+                        Ok(Type::BooleanLiteral(memchr::memmem::find(b2, b1).is_none()))
+                    }
+                    ast::CmpOp::Is => {
+                        if b1 == b2 {
+                            Ok(KnownClass::Bool.to_instance(self.db()))
+                        } else {
+                            Ok(Type::BooleanLiteral(false))
+                        }
+                    }
+                    ast::CmpOp::IsNot => {
+                        if b1 == b2 {
+                            Ok(KnownClass::Bool.to_instance(self.db()))
+                        } else {
+                            Ok(Type::BooleanLiteral(true))
+                        }
+                    }
+                };
+                Some(result)
+            }
+            (Type::BytesLiteral(_), _) => Some(self.infer_binary_type_comparison(
+                KnownClass::Bytes.to_instance(self.db()),
+                op,
+                right,
+                range,
+                visitor,
+            )),
+            (_, Type::BytesLiteral(_)) => Some(self.infer_binary_type_comparison(
+                left,
+                op,
+                KnownClass::Bytes.to_instance(self.db()),
+                range,
+                visitor,
+            )),
+
+            (Type::EnumLiteral(literal_1), Type::EnumLiteral(literal_2))
+                if op == ast::CmpOp::Eq =>
+            {
+                Some(Ok(match try_dunder(self, MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK) {
+                    Ok(ty) => ty,
+                    Err(_) => Type::BooleanLiteral(literal_1 == literal_2),
+                }))
+            }
+            (Type::EnumLiteral(literal_1), Type::EnumLiteral(literal_2))
+                if op == ast::CmpOp::NotEq =>
+            {
+                Some(Ok(match try_dunder(self, MemberLookupPolicy::MRO_NO_OBJECT_FALLBACK) {
+                    Ok(ty) => ty,
+                    Err(_) => Type::BooleanLiteral(literal_1 != literal_2),
+                }))
+            }
+
+            (
+                Type::NominalInstance(nominal1),
+                Type::NominalInstance(nominal2),
+            ) => nominal1.tuple_spec(self.db())
+                .and_then(|lhs_tuple| Some((lhs_tuple, nominal2.tuple_spec(self.db())?)))
+                .map(|(lhs_tuple, rhs_tuple)| {
+                    let mut tuple_rich_comparison =
+                        |rich_op| visitor.visit((left, op, right), || {
+                            self.infer_tuple_rich_comparison(&lhs_tuple, rich_op, &rhs_tuple, range, visitor)
+                        });
+
+                    match op {
+                        ast::CmpOp::Eq => tuple_rich_comparison(RichCompareOperator::Eq),
+                        ast::CmpOp::NotEq => tuple_rich_comparison(RichCompareOperator::Ne),
+                        ast::CmpOp::Lt => tuple_rich_comparison(RichCompareOperator::Lt),
+                        ast::CmpOp::LtE => tuple_rich_comparison(RichCompareOperator::Le),
+                        ast::CmpOp::Gt => tuple_rich_comparison(RichCompareOperator::Gt),
+                        ast::CmpOp::GtE => tuple_rich_comparison(RichCompareOperator::Ge),
+                        ast::CmpOp::In | ast::CmpOp::NotIn => {
+                            let mut any_eq = false;
+                            let mut any_ambiguous = false;
+
+                            for ty in rhs_tuple.all_elements().copied() {
+                                let eq_result = self.infer_binary_type_comparison(
+                                left,
+                                ast::CmpOp::Eq,
+                                ty,
+                                range,
+                                visitor
+                            ).expect("infer_binary_type_comparison should never return None for `CmpOp::Eq`");
+
+                                match eq_result {
+                                    todo @ Type::Dynamic(DynamicType::Todo(_)) => return Ok(todo),
+                                    // It's okay to ignore errors here because Python doesn't call `__bool__`
+                                    // for different union variants. Instead, this is just for us to
+                                    // evaluate a possibly truthy value to `false` or `true`.
+                                    ty => match ty.bool(self.db()) {
+                                        Truthiness::AlwaysTrue => any_eq = true,
+                                        Truthiness::AlwaysFalse => (),
+                                        Truthiness::Ambiguous => any_ambiguous = true,
+                                    },
+                                }
+                            }
+
+                            if any_eq {
+                                Ok(Type::BooleanLiteral(op.is_in()))
+                            } else if !any_ambiguous {
+                                Ok(Type::BooleanLiteral(op.is_not_in()))
+                            } else {
+                                Ok(KnownClass::Bool.to_instance(self.db()))
+                            }
+                        }
+                        ast::CmpOp::Is | ast::CmpOp::IsNot => {
+                            // - `[ast::CmpOp::Is]`: returns `false` if the elements are definitely unequal, otherwise `bool`
+                            // - `[ast::CmpOp::IsNot]`: returns `true` if the elements are definitely unequal, otherwise `bool`
+                            let eq_result = tuple_rich_comparison(RichCompareOperator::Eq).expect(
+                            "infer_binary_type_comparison should never return None for `CmpOp::Eq`",
+                        );
+
+                            Ok(match eq_result {
+                                todo @ Type::Dynamic(DynamicType::Todo(_)) => todo,
+                                // It's okay to ignore errors here because Python doesn't call `__bool__`
+                                // for `is` and `is not` comparisons. This is an implementation detail
+                                // for how we determine the truthiness of a type.
+                                ty => match ty.bool(self.db()) {
+                                    Truthiness::AlwaysFalse => Type::BooleanLiteral(op.is_is_not()),
+                                    _ => KnownClass::Bool.to_instance(self.db()),
+                                },
+                            })
+                        }
+                    }
+                }
+            ),
+
+            _ => None,
+        };
+
+        if let Some(result) = comparison_result {
+            return result;
+        }
+
+        // Final generalized fallback: lookup the rich comparison `__dunder__` methods
+        try_dunder(self, MemberLookupPolicy::default())
+    }
+
+    /// Rich comparison in Python are the operators `==`, `!=`, `<`, `<=`, `>`, and `>=`. Their
+    /// behaviour can be edited for classes by implementing corresponding dunder methods.
+    /// This function performs rich comparison between two types and returns the resulting type.
+    /// see `<https://docs.python.org/3/reference/datamodel.html#object.__lt__>`
+    fn infer_rich_comparison(
+        &self,
+        left: Type<'db>,
+        right: Type<'db>,
+        op: RichCompareOperator,
+        policy: MemberLookupPolicy,
+    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
+        let db = self.db();
+        // The following resource has details about the rich comparison algorithm:
+        // https://snarky.ca/unravelling-rich-comparison-operators/
+        let call_dunder = |op: RichCompareOperator, left: Type<'db>, right: Type<'db>| {
+            left.try_call_dunder_with_policy(
+                db,
+                op.dunder(),
+                &mut CallArguments::positional([right]),
+                TypeContext::default(),
+                policy,
+            )
+            .map(|outcome| outcome.return_type(db))
+            .ok()
+        };
+
+        // The reflected dunder has priority if the right-hand side is a strict subclass of the left-hand side.
+        if left != right && right.is_subtype_of(db, left) {
+            call_dunder(op.reflect(), right, left).or_else(|| call_dunder(op, left, right))
+        } else {
+            call_dunder(op, left, right).or_else(|| call_dunder(op.reflect(), right, left))
+        }
+        .or_else(|| {
+            // When no appropriate method returns any value other than NotImplemented,
+            // the `==` and `!=` operators will fall back to `is` and `is not`, respectively.
+            // refer to `<https://docs.python.org/3/reference/datamodel.html#object.__eq__>`
+            if matches!(op, RichCompareOperator::Eq | RichCompareOperator::Ne)
+                // This branch implements specific behavior of the `__eq__` and `__ne__` methods
+                // on `object`, so it does not apply if we skip looking up attributes on `object`.
+                && !policy.mro_no_object_fallback()
+            {
+                Some(KnownClass::Bool.to_instance(db))
+            } else {
+                None
+            }
+        })
+        .ok_or_else(|| CompareUnsupportedError {
+            op: op.into(),
+            left_ty: left,
+            right_ty: right,
+        })
+    }
+
+    /// Performs a membership test (`in` and `not in`) between two instances and returns the resulting type, or `None` if the test is unsupported.
+    /// The behavior can be customized in Python by implementing `__contains__`, `__iter__`, or `__getitem__` methods.
+    /// See `<https://docs.python.org/3/reference/datamodel.html#object.__contains__>`
+    /// and `<https://docs.python.org/3/reference/expressions.html#membership-test-details>`
+    fn infer_membership_test_comparison(
+        &self,
+        left: Type<'db>,
+        right: Type<'db>,
+        op: MembershipTestCompareOperator,
+        range: TextRange,
+    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
+        let db = self.db();
+
+        let contains_dunder = right.class_member(db, "__contains__".into()).place;
+        let compare_result_opt = match contains_dunder {
+            Place::Defined(contains_dunder, _, Definedness::AlwaysDefined) => {
+                // If `__contains__` is available, it is used directly for the membership test.
+                contains_dunder
+                    .try_call(db, &CallArguments::positional([right, left]))
+                    .map(|bindings| bindings.return_type(db))
+                    .ok()
+            }
+            _ => {
+                // iteration-based membership test
+                right
+                    .try_iterate(db)
+                    .map(|_| KnownClass::Bool.to_instance(db))
+                    .ok()
+            }
+        };
+
+        compare_result_opt
+            .map(|ty| {
+                if matches!(ty, Type::Dynamic(DynamicType::Todo(_))) {
+                    return ty;
+                }
+
+                let truthiness = ty.try_bool(db).unwrap_or_else(|err| {
+                    err.report_diagnostic(&self.context, range);
+                    err.fallback_truthiness()
+                });
+
+                match op {
+                    MembershipTestCompareOperator::In => truthiness.into_type(db),
+                    MembershipTestCompareOperator::NotIn => truthiness.negate().into_type(db),
+                }
+            })
+            .ok_or_else(|| CompareUnsupportedError {
+                op: op.into(),
+                left_ty: left,
+                right_ty: right,
+            })
+    }
+
+    /// Simulates rich comparison between tuples and returns the inferred result.
+    /// This performs a lexicographic comparison, returning a union of all possible return types that could result from the comparison.
+    ///
+    /// basically it's based on cpython's `tuple_richcompare`
+    /// see `<https://github.com/python/cpython/blob/9d6366b60d01305fc5e45100e0cd13e358aa397d/Objects/tupleobject.c#L637>`
+    fn infer_tuple_rich_comparison(
+        &mut self,
+        left: &TupleSpec<'db>,
+        op: RichCompareOperator,
+        right: &TupleSpec<'db>,
+        range: TextRange,
+        visitor: &BinaryComparisonVisitor<'db>,
+    ) -> Result<Type<'db>, CompareUnsupportedError<'db>> {
+        // If either tuple is variable length, we can make no assumptions about the relative
+        // lengths of the tuples, and therefore neither about how they compare lexicographically.
+        // TODO: Consider comparing the prefixes of the tuples, since that could give a comparison
+        // result regardless of how long the variable-length tuple is.
+        let (TupleSpec::Fixed(left), TupleSpec::Fixed(right)) = (left, right) else {
+            return Ok(Type::unknown());
+        };
+
+        let left_iter = left.elements().copied();
+        let right_iter = right.elements().copied();
+
+        let mut builder = UnionBuilder::new(self.db());
+
+        for (l_ty, r_ty) in left_iter.zip(right_iter) {
+            let pairwise_eq_result = self
+                .infer_binary_type_comparison(l_ty, ast::CmpOp::Eq, r_ty, range, visitor)
+                .expect("infer_binary_type_comparison should never return None for `CmpOp::Eq`");
+
+            match pairwise_eq_result
+                .try_bool(self.db())
+                .unwrap_or_else(|err| {
+                    // TODO: We should, whenever possible, pass the range of the left and right elements
+                    //   instead of the range of the whole tuple.
+                    err.report_diagnostic(&self.context, range);
+                    err.fallback_truthiness()
+                }) {
+                // - AlwaysTrue : Continue to the next pair for lexicographic comparison
+                Truthiness::AlwaysTrue => continue,
+                // - AlwaysFalse:
+                // Lexicographic comparisons will always terminate with this pair.
+                // Complete the comparison and return the result.
+                // - Ambiguous:
+                // Lexicographic comparisons might continue to the next pair (if eq_result is true),
+                // or terminate here (if eq_result is false).
+                // To account for cases where the comparison terminates here, add the pairwise comparison result to the union builder.
+                eq_truthiness @ (Truthiness::AlwaysFalse | Truthiness::Ambiguous) => {
+                    let pairwise_compare_result = match op {
+                        RichCompareOperator::Lt
+                        | RichCompareOperator::Le
+                        | RichCompareOperator::Gt
+                        | RichCompareOperator::Ge => self.infer_binary_type_comparison(
+                            l_ty,
+                            op.into(),
+                            r_ty,
+                            range,
+                            visitor,
+                        )?,
+                        // For `==` and `!=`, we already figure out the result from `pairwise_eq_result`
+                        // NOTE: The CPython implementation does not account for non-boolean return types
+                        // or cases where `!=` is not the negation of `==`, we also do not consider these cases.
+                        RichCompareOperator::Eq => Type::BooleanLiteral(false),
+                        RichCompareOperator::Ne => Type::BooleanLiteral(true),
+                    };
+
+                    builder = builder.add(pairwise_compare_result);
+
+                    if eq_truthiness.is_ambiguous() {
+                        continue;
+                    }
+
+                    return Ok(builder.build());
+                }
+            }
+        }
+
+        // if no more items to compare, we just compare sizes
+        let (left_len, right_len) = (left.len(), right.len());
+
+        builder = builder.add(Type::BooleanLiteral(match op {
+            RichCompareOperator::Eq => left_len == right_len,
+            RichCompareOperator::Ne => left_len != right_len,
+            RichCompareOperator::Lt => left_len < right_len,
+            RichCompareOperator::Le => left_len <= right_len,
+            RichCompareOperator::Gt => left_len > right_len,
+            RichCompareOperator::Ge => left_len >= right_len,
+        }));
+
+        Ok(builder.build())
+    }
+
+    fn infer_subscript_expression(&mut self, subscript: &ast::ExprSubscript) -> Type<'db> {
+        let ast::ExprSubscript {
+            value,
+            slice,
+            range: _,
+            node_index: _,
+            ctx,
+        } = subscript;
+
+        match ctx {
+            ExprContext::Load => self.infer_subscript_load(subscript),
+            ExprContext::Store => {
+                let value_ty = self.infer_expression(value, TypeContext::default());
+                let slice_ty = self.infer_expression(slice, TypeContext::default());
+                self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
+                Type::Never
+            }
+            ExprContext::Del => {
+                self.infer_subscript_load(subscript);
+                Type::Never
+            }
+            ExprContext::Invalid => {
+                let value_ty = self.infer_expression(value, TypeContext::default());
+                let slice_ty = self.infer_expression(slice, TypeContext::default());
+                self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
+                Type::unknown()
+            }
+        }
+    }
+
+    fn infer_subscript_load(&mut self, subscript: &ast::ExprSubscript) -> Type<'db> {
+        let ast::ExprSubscript {
+            range: _,
+            node_index: _,
+            value,
+            slice,
+            ctx,
+        } = subscript;
+        let value_ty = self.infer_expression(value, TypeContext::default());
+        let mut constraint_keys = vec![];
+
+        // If `value` is a valid reference, we attempt type narrowing by assignment.
+        if !value_ty.is_unknown() {
+            if let Some(expr) = PlaceExpr::try_from_expr(subscript) {
+                let (place, keys) = self.infer_place_load(
+                    PlaceExprRef::from(&expr),
+                    ast::ExprRef::Subscript(subscript),
+                );
+                constraint_keys.extend(keys);
+                if let Place::Defined(ty, _, Definedness::AlwaysDefined) = place.place {
+                    // Even if we can obtain the subscript type based on the assignments, we still perform default type inference
+                    // (to store the expression type and to report errors).
+                    let slice_ty = self.infer_expression(slice, TypeContext::default());
+                    self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
+                    return ty;
+                }
+            }
+        }
+
+        let tuple_generic_alias = |db: &'db dyn Db, tuple: Option<TupleType<'db>>| {
+            let tuple = tuple.unwrap_or_else(|| TupleType::homogeneous(db, Type::unknown()));
+            Type::from(tuple.to_class_type(db))
+        };
+
+        // HACK ALERT: If we are subscripting a generic class, short-circuit the rest of the
+        // subscript inference logic and treat this as an explicit specialization.
+        // TODO: Move this logic into a custom callable, and update `find_name_in_mro` to return
+        // this callable as the `__class_getitem__` method on `type`. That probably requires
+        // updating all of the subscript logic below to use custom callables for all of the _other_
+        // special cases, too.
+        if let Type::ClassLiteral(class) = value_ty {
+            if class.is_tuple(self.db()) {
+                return tuple_generic_alias(self.db(), self.infer_tuple_type_expression(slice));
+            }
+            if let Some(generic_context) = class.generic_context(self.db()) {
+                return self.infer_explicit_class_specialization(
+                    subscript,
+                    value_ty,
+                    class,
+                    generic_context,
+                );
+            }
+        }
+        if let Type::SpecialForm(SpecialFormType::Tuple) = value_ty {
+            return tuple_generic_alias(self.db(), self.infer_tuple_type_expression(slice));
+        }
+        if let Type::KnownInstance(KnownInstanceType::TypeAliasType(type_alias)) = value_ty {
+            if let Some(generic_context) = type_alias.generic_context(self.db()) {
+                return self.infer_explicit_type_alias_specialization(
+                    subscript,
+                    value_ty,
+                    type_alias,
+                    generic_context,
+                );
+            }
+        }
+
+        let slice_ty = self.infer_expression(slice, TypeContext::default());
+        let result_ty = self.infer_subscript_expression_types(subscript, value_ty, slice_ty, *ctx);
+        self.narrow_expr_with_applicable_constraints(subscript, result_ty, &constraint_keys)
+    }
+
+    fn infer_explicit_class_specialization(
+        &mut self,
+        subscript: &ast::ExprSubscript,
+        value_ty: Type<'db>,
+        generic_class: ClassLiteral<'db>,
+        generic_context: GenericContext<'db>,
+    ) -> Type<'db> {
+        let db = self.db();
+        let specialize = |types: &[Option<Type<'db>>]| {
+            Type::from(generic_class.apply_specialization(db, |_| {
+                generic_context.specialize_partial(db, types.iter().copied())
+            }))
+        };
+
+        self.infer_explicit_callable_specialization(
+            subscript,
+            value_ty,
+            generic_context,
+            specialize,
+        )
+    }
+
+    fn infer_explicit_type_alias_specialization(
+        &mut self,
+        subscript: &ast::ExprSubscript,
+        value_ty: Type<'db>,
+        generic_type_alias: TypeAliasType<'db>,
+        generic_context: GenericContext<'db>,
+    ) -> Type<'db> {
+        let db = self.db();
+        let specialize = |types: &[Option<Type<'db>>]| {
+            let type_alias = generic_type_alias.apply_specialization(db, |_| {
+                generic_context.specialize_partial(db, types.iter().copied())
+            });
+
+            Type::KnownInstance(KnownInstanceType::TypeAliasType(type_alias))
+        };
+
+        self.infer_explicit_callable_specialization(
+            subscript,
+            value_ty,
+            generic_context,
+            specialize,
+        )
+    }
+
+    fn infer_explicit_callable_specialization(
+        &mut self,
+        subscript: &ast::ExprSubscript,
+        value_ty: Type<'db>,
+        generic_context: GenericContext<'db>,
+        specialize: impl FnOnce(&[Option<Type<'db>>]) -> Type<'db>,
+    ) -> Type<'db> {
+        let slice_node = subscript.slice.as_ref();
+        let call_argument_types = match slice_node {
+            ast::Expr::Tuple(tuple) => {
+                let arguments = CallArguments::positional(
+                    tuple.elts.iter().map(|elt| self.infer_type_expression(elt)),
+                );
+                self.store_expression_type(
+                    slice_node,
+                    Type::heterogeneous_tuple(self.db(), arguments.iter_types()),
+                );
+                arguments
+            }
+            _ => CallArguments::positional([self.infer_type_expression(slice_node)]),
+        };
+        let binding = Binding::single(value_ty, generic_context.signature(self.db()));
+        let bindings = match Bindings::from(binding)
+            .match_parameters(self.db(), &call_argument_types)
+            .check_types(
+                self.db(),
+                &call_argument_types,
+                &TypeContext::default(),
+                &self.dataclass_field_specifiers[..],
+            ) {
+            Ok(bindings) => bindings,
+            Err(CallError(_, bindings)) => {
+                bindings.report_diagnostics(&self.context, subscript.into());
+                return Type::unknown();
+            }
+        };
+        let callable = bindings
+            .into_iter()
+            .next()
+            .expect("valid bindings should have one callable");
+        let (_, overload) = callable
+            .matching_overloads()
+            .next()
+            .expect("valid bindings should have matching overload");
+
+        specialize(overload.parameter_types())
+    }
+
+    fn infer_subscript_expression_types(
+        &self,
+        subscript: &ast::ExprSubscript,
+        value_ty: Type<'db>,
+        slice_ty: Type<'db>,
+        expr_context: ExprContext,
+    ) -> Type<'db> {
+        let db = self.db();
+        let context = &self.context;
+
+        let value_node = subscript.value.as_ref();
+
+        let inferred = match (value_ty, slice_ty) {
+            (Type::Union(union), _) => Some(union.map(db, |element| {
+                self.infer_subscript_expression_types(subscript, *element, slice_ty, expr_context)
+            })),
+
+            // TODO: we can map over the intersection and fold the results back into an intersection,
+            // but we need to make sure we avoid emitting a diagnostic if one positive element has a `__getitem__`
+            // method but another does not. This means `infer_subscript_expression_types`
+            // needs to return a `Result` rather than eagerly emitting diagnostics.
+            (Type::Intersection(_), _) => {
+                Some(todo_type!("Subscript expressions on intersections"))
+            }
+
+            // Ex) Given `("a", "b", "c", "d")[1]`, return `"b"`
+            (Type::NominalInstance(nominal), Type::IntLiteral(i64_int)) => nominal
+                .tuple_spec(db)
+                .and_then(|tuple| Some((tuple, i32::try_from(i64_int).ok()?)))
+                .map(|(tuple, i32_int)| {
+                    tuple.py_index(db, i32_int).unwrap_or_else(|_| {
+                        report_index_out_of_bounds(
+                            context,
+                            "tuple",
+                            value_node.into(),
+                            value_ty,
+                            tuple.len().display_minimum(),
+                            i64_int,
+                        );
+                        Type::unknown()
+                    })
+                }),
+
+            // Ex) Given `("a", 1, Null)[0:2]`, return `("a", 1)`
+            (
+                Type::NominalInstance(maybe_tuple_nominal),
+                Type::NominalInstance(maybe_slice_nominal),
+            ) => maybe_tuple_nominal
+                .tuple_spec(db)
+                .as_deref()
+                .and_then(|tuple_spec| Some((tuple_spec, maybe_slice_nominal.slice_literal(db)?)))
+                .map(|(tuple, SliceLiteral { start, stop, step })| match tuple {
+                    TupleSpec::Fixed(tuple) => {
+                        if let Ok(new_elements) = tuple.py_slice(db, start, stop, step) {
+                            Type::heterogeneous_tuple(db, new_elements)
+                        } else {
+                            report_slice_step_size_zero(context, value_node.into());
+                            Type::unknown()
+                        }
+                    }
+                    TupleSpec::Variable(_) => {
+                        todo_type!("slice into variable-length tuple")
+                    }
+                }),
+
+            // Ex) Given `"value"[1]`, return `"a"`
+            (Type::StringLiteral(literal_ty), Type::IntLiteral(i64_int)) => {
+                i32::try_from(i64_int).ok().map(|i32_int| {
+                    let literal_value = literal_ty.value(db);
+                    (&mut literal_value.chars())
+                        .py_index(db, i32_int)
+                        .map(|ch| Type::string_literal(db, &ch.to_string()))
+                        .unwrap_or_else(|_| {
+                            report_index_out_of_bounds(
+                                context,
+                                "string",
+                                value_node.into(),
+                                value_ty,
+                                literal_value.chars().count(),
+                                i64_int,
+                            );
+                            Type::unknown()
+                        })
+                })
+            }
+
+            // Ex) Given `"value"[1:3]`, return `"al"`
+            (Type::StringLiteral(literal_ty), Type::NominalInstance(nominal)) => nominal
+                .slice_literal(db)
+                .map(|SliceLiteral { start, stop, step }| {
+                    let literal_value = literal_ty.value(db);
+                    let chars: Vec<_> = literal_value.chars().collect();
+
+                    if let Ok(new_chars) = chars.py_slice(db, start, stop, step) {
+                        let literal: String = new_chars.collect();
+                        Type::string_literal(db, &literal)
+                    } else {
+                        report_slice_step_size_zero(context, value_node.into());
+                        Type::unknown()
+                    }
+                }),
+
+            // Ex) Given `b"value"[1]`, return `97` (i.e., `ord(b"a")`)
+            (Type::BytesLiteral(literal_ty), Type::IntLiteral(i64_int)) => {
+                i32::try_from(i64_int).ok().map(|i32_int| {
+                    let literal_value = literal_ty.value(db);
+                    literal_value
+                        .py_index(db, i32_int)
+                        .map(|byte| Type::IntLiteral((*byte).into()))
+                        .unwrap_or_else(|_| {
+                            report_index_out_of_bounds(
+                                context,
+                                "bytes literal",
+                                value_node.into(),
+                                value_ty,
+                                literal_value.len(),
+                                i64_int,
+                            );
+                            Type::unknown()
+                        })
+                })
+            }
+
+            // Ex) Given `b"value"[1:3]`, return `b"al"`
+            (Type::BytesLiteral(literal_ty), Type::NominalInstance(nominal)) => nominal
+                .slice_literal(db)
+                .map(|SliceLiteral { start, stop, step }| {
+                    let literal_value = literal_ty.value(db);
+
+                    if let Ok(new_bytes) = literal_value.py_slice(db, start, stop, step) {
+                        let new_bytes: Vec<u8> = new_bytes.collect();
+                        Type::bytes_literal(db, &new_bytes)
+                    } else {
+                        report_slice_step_size_zero(context, value_node.into());
+                        Type::unknown()
+                    }
+                }),
+
+            // Ex) Given `"value"[True]`, return `"a"`
+            (Type::StringLiteral(_) | Type::BytesLiteral(_), Type::BooleanLiteral(bool)) => {
+                Some(self.infer_subscript_expression_types(
+                    subscript,
+                    value_ty,
+                    Type::IntLiteral(i64::from(bool)),
+                    expr_context,
+                ))
+            }
+
+            (Type::NominalInstance(nominal), Type::BooleanLiteral(bool))
+                if nominal.tuple_spec(db).is_some() =>
+            {
+                Some(self.infer_subscript_expression_types(
+                    subscript,
+                    value_ty,
+                    Type::IntLiteral(i64::from(bool)),
+                    expr_context,
+                ))
+            }
+
+            (Type::SpecialForm(SpecialFormType::Protocol), typevars) => Some(
+                self.legacy_generic_class_context(
+                    value_node,
+                    typevars,
+                    LegacyGenericBase::Protocol,
+                )
+                .map(|context| Type::KnownInstance(KnownInstanceType::SubscriptedProtocol(context)))
+                .unwrap_or_else(GenericContextError::into_type),
+            ),
+
+            (Type::KnownInstance(KnownInstanceType::SubscriptedProtocol(_)), _) => {
+                // TODO: emit a diagnostic
+                Some(todo_type!("doubly-specialized typing.Protocol"))
+            }
+
+            (
+                Type::KnownInstance(KnownInstanceType::TypeAliasType(TypeAliasType::PEP695(alias))),
+                _,
+            ) if alias.generic_context(db).is_none() => {
+                if let Some(builder) = self.context.report_lint(&NON_SUBSCRIPTABLE, subscript) {
+                    builder
+                        .into_diagnostic(format_args!("Cannot subscript non-generic type alias"));
+                }
+
+                Some(Type::unknown())
+            }
+
+            (Type::SpecialForm(SpecialFormType::Generic), typevars) => Some(
+                self.legacy_generic_class_context(value_node, typevars, LegacyGenericBase::Generic)
+                    .map(|context| {
+                        Type::KnownInstance(KnownInstanceType::SubscriptedGeneric(context))
+                    })
+                    .unwrap_or_else(GenericContextError::into_type),
+            ),
+
+            (Type::KnownInstance(KnownInstanceType::SubscriptedGeneric(_)), _) => {
+                // TODO: emit a diagnostic
+                Some(todo_type!("doubly-specialized typing.Generic"))
+            }
+
+            (Type::SpecialForm(SpecialFormType::Unpack), _) => {
+                Some(Type::Dynamic(DynamicType::TodoUnpack))
+            }
+
+            (Type::SpecialForm(special_form), _) if special_form.class().is_special_form() => {
+                Some(todo_type!("Inference of subscript on special form"))
+            }
+
+            (Type::KnownInstance(known_instance), _)
+                if known_instance.class(db).is_special_form() =>
+            {
+                Some(todo_type!("Inference of subscript on special form"))
+            }
+
+            _ => None,
+        };
+
+        if let Some(inferred) = inferred {
+            return inferred;
+        }
+
+        // If the class defines `__getitem__`, return its return type.
+        //
+        // See: https://docs.python.org/3/reference/datamodel.html#class-getitem-versus-getitem
+        match value_ty.try_call_dunder(
+            db,
+            "__getitem__",
+            CallArguments::positional([slice_ty]),
+            TypeContext::default(),
+        ) {
+            Ok(outcome) => {
+                return outcome.return_type(db);
+            }
+            Err(err @ CallDunderError::PossiblyUnbound { .. }) => {
+                if let Some(builder) =
+                    context.report_lint(&POSSIBLY_MISSING_IMPLICIT_CALL, value_node)
+                {
+                    builder.into_diagnostic(format_args!(
+                        "Method `__getitem__` of type `{}` may be missing",
+                        value_ty.display(db),
+                    ));
+                }
+
+                return err.fallback_return_type(db);
+            }
+            Err(CallDunderError::CallError(call_error_kind, bindings)) => {
+                match call_error_kind {
+                    CallErrorKind::NotCallable => {
+                        if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, value_node) {
+                            builder.into_diagnostic(format_args!(
+                                "Method `__getitem__` of type `{}` \
+                                is not callable on object of type `{}`",
+                                bindings.callable_type().display(db),
+                                value_ty.display(db),
+                            ));
+                        }
+                    }
+                    CallErrorKind::BindingError => {
+                        if let Some(typed_dict) = value_ty.as_typed_dict() {
+                            let slice_node = subscript.slice.as_ref();
+
+                            report_invalid_key_on_typed_dict(
+                                context,
+                                value_node.into(),
+                                slice_node.into(),
+                                value_ty,
+                                slice_ty,
+                                &typed_dict.items(db),
+                            );
+                        } else {
+                            if let Some(builder) =
+                                context.report_lint(&INVALID_ARGUMENT_TYPE, value_node)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Method `__getitem__` of type `{}` cannot be called with key of \
+                                    type `{}` on object of type `{}`",
+                                    bindings.callable_type().display(db),
+                                    slice_ty.display(db),
+                                    value_ty.display(db),
+                                ));
+                            }
+                        }
+                    }
+                    CallErrorKind::PossiblyNotCallable => {
+                        if let Some(builder) = context.report_lint(&CALL_NON_CALLABLE, value_node) {
+                            builder.into_diagnostic(format_args!(
+                                "Method `__getitem__` of type `{}` may not be callable on object of type `{}`",
+                                bindings.callable_type().display(db),
+                                value_ty.display(db),
+                            ));
+                        }
+                    }
+                }
+
+                return bindings.return_type(db);
+            }
+            Err(CallDunderError::MethodNotAvailable) => {
+                // try `__class_getitem__`
+            }
+        }
+
+        // Otherwise, if the value is itself a class and defines `__class_getitem__`,
+        // return its return type.
+        //
+        // TODO: lots of classes are only subscriptable at runtime on Python 3.9+,
+        // *but* we should also allow them to be subscripted in stubs
+        // (and in annotations if `from __future__ import annotations` is enabled),
+        // even if the target version is Python 3.8 or lower,
+        // despite the fact that there will be no corresponding `__class_getitem__`
+        // method in these `sys.version_info` branches.
+        if value_ty.is_subtype_of(db, KnownClass::Type.to_instance(db)) {
+            let dunder_class_getitem_method = value_ty.member(db, "__class_getitem__").place;
+
+            match dunder_class_getitem_method {
+                Place::Undefined => {}
+                Place::Defined(ty, _, boundness) => {
+                    if boundness == Definedness::PossiblyUndefined {
+                        if let Some(builder) =
+                            context.report_lint(&POSSIBLY_MISSING_IMPLICIT_CALL, value_node)
+                        {
+                            builder.into_diagnostic(format_args!(
+                                "Method `__class_getitem__` of type `{}` may be missing",
+                                value_ty.display(db),
+                            ));
+                        }
+                    }
+
+                    match ty.try_call(db, &CallArguments::positional([slice_ty])) {
+                        Ok(bindings) => return bindings.return_type(db),
+                        Err(CallError(_, bindings)) => {
+                            if let Some(builder) =
+                                context.report_lint(&CALL_NON_CALLABLE, value_node)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Method `__class_getitem__` of type `{}` \
+                                        is not callable on object of type `{}`",
+                                    bindings.callable_type().display(db),
+                                    value_ty.display(db),
+                                ));
+                            }
+                            return bindings.return_type(db);
+                        }
+                    }
+                }
+            }
+
+            if let Type::ClassLiteral(class) = value_ty {
+                if class.is_known(db, KnownClass::Type) {
+                    return KnownClass::GenericAlias.to_instance(db);
+                }
+
+                if class.generic_context(db).is_some() {
+                    // TODO: specialize the generic class using these explicit type
+                    // variable assignments. This branch is only encountered when an
+                    // explicit class specialization appears inside of some other subscript
+                    // expression, e.g. `tuple[list[int], ...]`. We have already inferred
+                    // the type of the outer subscript slice as a value expression, which
+                    // means we can't re-infer the inner specialization here as a type
+                    // expression.
+                    return value_ty;
+                }
+            }
+
+            // TODO: properly handle old-style generics; get rid of this temporary hack
+            if !value_ty
+                .as_class_literal()
+                .is_some_and(|class| class.iter_mro(db, None).contains(&ClassBase::Generic))
+            {
+                report_non_subscriptable(context, value_node.into(), value_ty, "__class_getitem__");
+            }
+        } else {
+            if expr_context != ExprContext::Store {
+                report_non_subscriptable(context, value_node.into(), value_ty, "__getitem__");
+            }
+        }
+
+        Type::unknown()
+    }
+
+    fn legacy_generic_class_context(
+        &self,
+        value_node: &ast::Expr,
+        typevars: Type<'db>,
+        origin: LegacyGenericBase,
+    ) -> Result<GenericContext<'db>, GenericContextError> {
+        let typevars_class_tuple_spec = typevars.exact_tuple_instance_spec(self.db());
+
+        let typevars = if let Some(tuple_spec) = typevars_class_tuple_spec.as_deref() {
+            match tuple_spec {
+                Tuple::Fixed(typevars) => typevars.elements_slice(),
+                // TODO: emit a diagnostic
+                Tuple::Variable(_) => return Err(GenericContextError::VariadicTupleArguments),
+            }
+        } else {
+            std::slice::from_ref(&typevars)
+        };
+
+        let typevars: Result<FxOrderSet<_>, GenericContextError> = typevars
+            .iter()
+            .map(|typevar| {
+                if let Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) = typevar {
+                    bind_typevar(
+                        self.db(),
+                        self.index,
+                        self.scope().file_scope_id(self.db()),
+                        self.typevar_binding_context,
+                        *typevar,
+                    )
+                    .ok_or(GenericContextError::InvalidArgument)
+                } else if any_over_type(
+                    self.db(),
+                    *typevar,
+                    &|ty| match ty {
+                        Type::Dynamic(DynamicType::TodoUnpack) => true,
+                        Type::NominalInstance(nominal) => matches!(
+                            nominal.known_class(self.db()),
+                            Some(KnownClass::TypeVarTuple | KnownClass::ParamSpec)
+                        ),
+                        _ => false,
+                    },
+                    true,
+                ) {
+                    Err(GenericContextError::NotYetSupported)
+                } else {
+                    if let Some(builder) =
+                        self.context.report_lint(&INVALID_ARGUMENT_TYPE, value_node)
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "`{}` is not a valid argument to `{origin}`",
+                            typevar.display(self.db()),
+                        ));
+                    }
+                    Err(GenericContextError::InvalidArgument)
+                }
+            })
+            .collect();
+        typevars.map(|typevars| GenericContext::from_typevar_instances(self.db(), typevars))
+    }
+
+    fn infer_slice_expression(&mut self, slice: &ast::ExprSlice) -> Type<'db> {
+        enum SliceArg<'db> {
+            Arg(Type<'db>),
+            Unsupported,
+        }
+
+        let ast::ExprSlice {
+            range: _,
+            node_index: _,
+            lower,
+            upper,
+            step,
+        } = slice;
+
+        let ty_lower = self.infer_optional_expression(lower.as_deref(), TypeContext::default());
+        let ty_upper = self.infer_optional_expression(upper.as_deref(), TypeContext::default());
+        let ty_step = self.infer_optional_expression(step.as_deref(), TypeContext::default());
+
+        let type_to_slice_argument = |ty: Option<Type<'db>>| match ty {
+            Some(ty @ (Type::IntLiteral(_) | Type::BooleanLiteral(_))) => SliceArg::Arg(ty),
+            Some(ty @ Type::NominalInstance(instance))
+                if instance.has_known_class(self.db(), KnownClass::NoneType) =>
+            {
+                SliceArg::Arg(ty)
+            }
+            None => SliceArg::Arg(Type::none(self.db())),
+            _ => SliceArg::Unsupported,
+        };
+
+        match (
+            type_to_slice_argument(ty_lower),
+            type_to_slice_argument(ty_upper),
+            type_to_slice_argument(ty_step),
+        ) {
+            (SliceArg::Arg(lower), SliceArg::Arg(upper), SliceArg::Arg(step)) => {
+                KnownClass::Slice.to_specialized_instance(self.db(), [lower, upper, step])
+            }
+            _ => KnownClass::Slice.to_instance(self.db()),
+        }
+    }
+
+    fn infer_type_parameters(&mut self, type_parameters: &ast::TypeParams) {
+        let ast::TypeParams {
+            range: _,
+            node_index: _,
+            type_params,
+        } = type_parameters;
+        for type_param in type_params {
+            match type_param {
+                ast::TypeParam::TypeVar(node) => self.infer_definition(node),
+                ast::TypeParam::ParamSpec(node) => self.infer_definition(node),
+                ast::TypeParam::TypeVarTuple(node) => self.infer_definition(node),
+            }
+        }
+    }
+
+    /// Infer the type of the given expression in isolation, ignoring the surrounding region.
+    pub(super) fn infer_isolated_expression(mut self, expr: &ast::Expr) -> Type<'db> {
+        let expr_ty = self.infer_expression_impl(expr, TypeContext::default());
+        let _ = self.context.finish();
+        expr_ty
+    }
+
+    pub(super) fn finish_expression(mut self) -> ExpressionInference<'db> {
+        self.infer_region();
+
+        let Self {
+            context,
+            mut expressions,
+            scope,
+            bindings,
+            declarations,
+            deferred,
+            cycle_recovery,
+            all_definitely_bound,
+            dataclass_field_specifiers: _,
+
+            // Ignored; only relevant to definition regions
+            undecorated_type: _,
+
+            // builder only state
+            typevar_binding_context: _,
+            deferred_state: _,
+            multi_inference_state: _,
+            called_functions: _,
+            index: _,
+            region: _,
+            return_types_and_ranges: _,
+        } = self;
+
+        let diagnostics = context.finish();
+        let _ = scope;
+
+        assert!(
+            declarations.is_empty(),
+            "Expression region can't have declarations"
+        );
+        assert!(
+            deferred.is_empty(),
+            "Expression region can't have deferred definitions"
+        );
+
+        let extra =
+            (cycle_recovery.is_some() || !bindings.is_empty() || !diagnostics.is_empty() || !all_definitely_bound).then(|| {
+                if bindings.len() > 20 {
+                    tracing::debug!(
+                        "Inferred expression region `{:?}` contains {} bindings. Lookups by linear scan might be slow.",
+                        self.region,
+                        bindings.len()
+                    );
+                }
+
+                Box::new(ExpressionInferenceExtra {
+                    bindings: bindings.into_boxed_slice(),
+                    diagnostics,
+                    cycle_recovery,
+                    all_definitely_bound,
+                })
+            });
+
+        expressions.shrink_to_fit();
+
+        ExpressionInference {
+            expressions,
+            extra,
+            #[cfg(debug_assertions)]
+            scope,
+        }
+    }
+
+    pub(super) fn finish_definition(mut self) -> DefinitionInference<'db> {
+        self.infer_region();
+
+        let Self {
+            context,
+            mut expressions,
+            scope,
+            bindings,
+            declarations,
+            deferred,
+            cycle_recovery,
+            undecorated_type,
+            // builder only state
+            dataclass_field_specifiers: _,
+            all_definitely_bound: _,
+            typevar_binding_context: _,
+            deferred_state: _,
+            multi_inference_state: _,
+            called_functions: _,
+            index: _,
+            region: _,
+            return_types_and_ranges: _,
+        } = self;
+
+        let _ = scope;
+        let diagnostics = context.finish();
+
+        let extra = (!diagnostics.is_empty()
+            || cycle_recovery.is_some()
+            || undecorated_type.is_some()
+            || !deferred.is_empty())
+        .then(|| {
+            Box::new(DefinitionInferenceExtra {
+                cycle_recovery,
+                deferred: deferred.into_boxed_slice(),
+                diagnostics,
+                undecorated_type,
+            })
+        });
+
+        if bindings.len() > 20 {
+            tracing::debug!(
+                "Inferred definition region `{:?}` contains {} bindings. Lookups by linear scan might be slow.",
+                self.region,
+                bindings.len(),
+            );
+        }
+
+        if declarations.len() > 20 {
+            tracing::debug!(
+                "Inferred declaration region `{:?}` contains {} declarations. Lookups by linear scan might be slow.",
+                self.region,
+                declarations.len(),
+            );
+        }
+
+        expressions.shrink_to_fit();
+
+        DefinitionInference {
+            expressions,
+            #[cfg(debug_assertions)]
+            scope,
+            bindings: bindings.into_boxed_slice(),
+            declarations: declarations.into_boxed_slice(),
+            extra,
+        }
+    }
+
+    pub(super) fn finish_scope(mut self) -> ScopeInference<'db> {
+        self.infer_region();
+
+        let Self {
+            context,
+            mut expressions,
+            scope,
+            cycle_recovery,
+
+            // Ignored, because scope types are never extended into other scopes.
+            deferred: _,
+            bindings: _,
+            declarations: _,
+
+            // Ignored; only relevant to definition regions
+            undecorated_type: _,
+
+            // Builder only state
+            dataclass_field_specifiers: _,
+            all_definitely_bound: _,
+            typevar_binding_context: _,
+            deferred_state: _,
+            multi_inference_state: _,
+            called_functions: _,
+            index: _,
+            region: _,
+            return_types_and_ranges: _,
+        } = self;
+
+        let _ = scope;
+        let diagnostics = context.finish();
+
+        let extra = (!diagnostics.is_empty() || cycle_recovery.is_some()).then(|| {
+            Box::new(ScopeInferenceExtra {
+                cycle_recovery,
+                diagnostics,
+            })
+        });
+
+        expressions.shrink_to_fit();
+
+        ScopeInference { expressions, extra }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum GenericContextError {
+    /// It's invalid to subscript `Generic` or `Protocol` with this type
+    InvalidArgument,
+    /// It's invalid to subscript `Generic` or `Protocol` with a variadic tuple type.
+    /// We should emit a diagnostic for this, but we don't yet.
+    VariadicTupleArguments,
+    /// It's valid to subscribe `Generic` or `Protocol` with this type,
+    /// but the type is not yet supported.
+    NotYetSupported,
+}
+
+impl GenericContextError {
+    const fn into_type<'db>(self) -> Type<'db> {
+        match self {
+            GenericContextError::InvalidArgument | GenericContextError::VariadicTupleArguments => {
+                Type::unknown()
+            }
+            GenericContextError::NotYetSupported => todo_type!("ParamSpecs and TypeVarTuples"),
+        }
+    }
+}
+
+/// Dictates the behavior when an expression is inferred multiple times.
+#[derive(Default, Debug, Clone, Copy)]
+enum MultiInferenceState {
+    /// Panic if the expression has already been inferred.
+    #[default]
+    Panic,
+
+    /// Store the intersection of all types inferred for the expression.
+    Intersect,
+}
+
+impl MultiInferenceState {
+    fn is_panic(self) -> bool {
+        match self {
+            MultiInferenceState::Panic => true,
+            MultiInferenceState::Intersect => false,
+        }
+    }
+}
+
+/// The deferred state of a specific expression in an inference region.
+#[derive(Default, Debug, Clone, Copy)]
+enum DeferredExpressionState {
+    /// The expression is not deferred.
+    #[default]
+    None,
+
+    /// The expression is deferred.
+    ///
+    /// In the following example,
+    /// ```py
+    /// from __future__ import annotation
+    ///
+    /// a: tuple[int, "ForwardRef"] = ...
+    /// ```
+    ///
+    /// The expression `tuple` and `int` are deferred but `ForwardRef` (after parsing) is both
+    /// deferred and in a string annotation context.
+    Deferred,
+
+    /// The expression is in a string annotation context.
+    ///
+    /// This is required to differentiate between a deferred annotation and a string annotation.
+    /// The former can occur when there's a `from __future__ import annotations` statement or we're
+    /// in a stub file.
+    ///
+    /// In the following example,
+    /// ```py
+    /// a: "List[int]" = ...
+    /// b: tuple[int, "ForwardRef"] = ...
+    /// ```
+    ///
+    /// The annotation of `a` is completely inside a string while for `b`, it's only partially
+    /// stringified.
+    ///
+    /// This variant wraps a [`NodeKey`] that allows us to retrieve the original
+    /// [`ast::ExprStringLiteral`] node which created the string annotation.
+    InStringAnnotation(NodeKey),
+}
+
+impl DeferredExpressionState {
+    const fn is_deferred(self) -> bool {
+        matches!(
+            self,
+            DeferredExpressionState::Deferred | DeferredExpressionState::InStringAnnotation(_)
+        )
+    }
+
+    const fn in_string_annotation(self) -> bool {
+        matches!(self, DeferredExpressionState::InStringAnnotation(_))
+    }
+}
+
+impl From<bool> for DeferredExpressionState {
+    fn from(value: bool) -> Self {
+        if value {
+            DeferredExpressionState::Deferred
+        } else {
+            DeferredExpressionState::None
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum RichCompareOperator {
+    Eq,
+    Ne,
+    Gt,
+    Ge,
+    Lt,
+    Le,
+}
+
+impl From<RichCompareOperator> for ast::CmpOp {
+    fn from(value: RichCompareOperator) -> Self {
+        match value {
+            RichCompareOperator::Eq => ast::CmpOp::Eq,
+            RichCompareOperator::Ne => ast::CmpOp::NotEq,
+            RichCompareOperator::Lt => ast::CmpOp::Lt,
+            RichCompareOperator::Le => ast::CmpOp::LtE,
+            RichCompareOperator::Gt => ast::CmpOp::Gt,
+            RichCompareOperator::Ge => ast::CmpOp::GtE,
+        }
+    }
+}
+
+impl RichCompareOperator {
+    #[must_use]
+    const fn dunder(self) -> &'static str {
+        match self {
+            RichCompareOperator::Eq => "__eq__",
+            RichCompareOperator::Ne => "__ne__",
+            RichCompareOperator::Lt => "__lt__",
+            RichCompareOperator::Le => "__le__",
+            RichCompareOperator::Gt => "__gt__",
+            RichCompareOperator::Ge => "__ge__",
+        }
+    }
+
+    #[must_use]
+    const fn reflect(self) -> Self {
+        match self {
+            RichCompareOperator::Eq => RichCompareOperator::Eq,
+            RichCompareOperator::Ne => RichCompareOperator::Ne,
+            RichCompareOperator::Lt => RichCompareOperator::Gt,
+            RichCompareOperator::Le => RichCompareOperator::Ge,
+            RichCompareOperator::Gt => RichCompareOperator::Lt,
+            RichCompareOperator::Ge => RichCompareOperator::Le,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum MembershipTestCompareOperator {
+    In,
+    NotIn,
+}
+
+impl From<MembershipTestCompareOperator> for ast::CmpOp {
+    fn from(value: MembershipTestCompareOperator) -> Self {
+        match value {
+            MembershipTestCompareOperator::In => ast::CmpOp::In,
+            MembershipTestCompareOperator::NotIn => ast::CmpOp::NotIn,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+struct CompareUnsupportedError<'db> {
+    op: ast::CmpOp,
+    left_ty: Type<'db>,
+    right_ty: Type<'db>,
+}
+
+fn format_import_from_module(level: u32, module: Option<&str>) -> String {
+    format!(
+        "{}{}",
+        ".".repeat(level as usize),
+        module.unwrap_or_default()
+    )
+}
+
+/// Struct collecting string parts when inferring a formatted string. Infers a string literal if the
+/// concatenated string is small enough, otherwise infers a literal string.
+///
+/// If the formatted string contains an expression (with a representation unknown at compile time),
+/// infers an instance of `builtins.str`.
+#[derive(Debug)]
+struct StringPartsCollector {
+    concatenated: Option<String>,
+    expression: bool,
+}
+
+impl StringPartsCollector {
+    fn new() -> Self {
+        Self {
+            concatenated: Some(String::new()),
+            expression: false,
+        }
+    }
+
+    fn push_str(&mut self, literal: &str) {
+        if let Some(mut concatenated) = self.concatenated.take() {
+            if concatenated.len().saturating_add(literal.len())
+                <= TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE
+            {
+                concatenated.push_str(literal);
+                self.concatenated = Some(concatenated);
+            } else {
+                self.concatenated = None;
+            }
+        }
+    }
+
+    fn add_expression(&mut self) {
+        self.concatenated = None;
+        self.expression = true;
+    }
+
+    fn string_type(self, db: &dyn Db) -> Type<'_> {
+        if self.expression {
+            KnownClass::Str.to_instance(db)
+        } else if let Some(concatenated) = self.concatenated {
+            Type::string_literal(db, &concatenated)
+        } else {
+            Type::LiteralString
+        }
+    }
+}
+
+fn contains_string_literal(expr: &ast::Expr) -> bool {
+    struct ContainsStringLiteral(bool);
+
+    impl<'a> Visitor<'a> for ContainsStringLiteral {
+        fn visit_expr(&mut self, expr: &'a ast::Expr) {
+            self.0 |= matches!(expr, ast::Expr::StringLiteral(_));
+            walk_expr(self, expr);
+        }
+    }
+
+    let mut visitor = ContainsStringLiteral(false);
+    visitor.visit_expr(expr);
+    visitor.0
+}
+
+/// Map based on a `Vec`. It doesn't enforce
+/// uniqueness on insertion. Instead, it relies on the caller
+/// that elements are unique. For example, the way we visit definitions
+/// in the `TypeInference` builder already implicitly guarantees that each definition
+/// is only visited once.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+struct VecMap<K, V>(Vec<(K, V)>);
+
+impl<K, V> VecMap<K, V>
+where
+    K: Eq,
+    K: std::fmt::Debug,
+    V: std::fmt::Debug,
+{
+    #[inline]
+    fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    #[inline]
+    fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    fn iter(&self) -> impl ExactSizeIterator<Item = (&K, &V)> {
+        self.0.iter().map(|(k, v)| (k, v))
+    }
+
+    fn insert(&mut self, key: K, value: V) {
+        debug_assert!(
+            !self.0.iter().any(|(existing, _)| existing == &key),
+            "An existing entry already exists for key {key:?}",
+        );
+
+        self.0.push((key, value));
+    }
+
+    fn into_boxed_slice(self) -> Box<[(K, V)]> {
+        self.0.into_boxed_slice()
+    }
+}
+
+impl<K, V> Extend<(K, V)> for VecMap<K, V>
+where
+    K: Eq,
+    K: std::fmt::Debug,
+    V: std::fmt::Debug,
+{
+    #[inline]
+    fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) {
+        if cfg!(debug_assertions) {
+            for (key, value) in iter {
+                self.insert(key, value);
+            }
+        } else {
+            self.0.extend(iter);
+        }
+    }
+}
+
+impl<K, V> Default for VecMap<K, V> {
+    fn default() -> Self {
+        Self(Vec::default())
+    }
+}
+
+/// Set based on a `Vec`. It doesn't enforce
+/// uniqueness on insertion. Instead, it relies on the caller
+/// that elements are unique. For example, the way we visit definitions
+/// in the `TypeInference` builder make already implicitly guarantees that each definition
+/// is only visited once.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+struct VecSet<V>(Vec<V>);
+
+impl<V> VecSet<V> {
+    #[inline]
+    fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    fn into_boxed_slice(self) -> Box<[V]> {
+        self.0.into_boxed_slice()
+    }
+}
+
+impl<V> VecSet<V>
+where
+    V: Eq,
+    V: std::fmt::Debug,
+{
+    fn insert(&mut self, value: V) {
+        debug_assert!(
+            !self.0.iter().any(|existing| existing == &value),
+            "An existing entry already exists for {value:?}",
+        );
+
+        self.0.push(value);
+    }
+}
+
+impl<V> Extend<V> for VecSet<V>
+where
+    V: Eq,
+    V: std::fmt::Debug,
+{
+    #[inline]
+    fn extend<T: IntoIterator<Item = V>>(&mut self, iter: T) {
+        if cfg!(debug_assertions) {
+            for value in iter {
+                self.insert(value);
+            }
+        } else {
+            self.0.extend(iter);
+        }
+    }
+}
+
+impl<V> Default for VecSet<V> {
+    fn default() -> Self {
+        Self(Vec::default())
+    }
+}
+
+impl<V> IntoIterator for VecSet<V> {
+    type Item = V;
+    type IntoIter = std::vec::IntoIter<V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/infer/builder/annotation_expression.rs b/crates/ty_python_semantic/src/types/infer/builder/annotation_expression.rs
new file mode 100644
index 0000000000..1e954d461e
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/infer/builder/annotation_expression.rs
@@ -0,0 +1,319 @@
+use ruff_python_ast as ast;
+
+use super::{DeferredExpressionState, TypeInferenceBuilder};
+use crate::place::TypeOrigin;
+use crate::types::diagnostic::{INVALID_TYPE_FORM, report_invalid_arguments_to_annotated};
+use crate::types::string_annotation::{
+    BYTE_STRING_TYPE_ANNOTATION, FSTRING_TYPE_ANNOTATION, parse_string_annotation,
+};
+use crate::types::{
+    KnownClass, SpecialFormType, Type, TypeAndQualifiers, TypeContext, TypeQualifiers, todo_type,
+};
+
+/// Annotation expressions.
+impl<'db> TypeInferenceBuilder<'db, '_> {
+    /// Infer the type of an annotation expression with the given [`DeferredExpressionState`].
+    pub(super) fn infer_annotation_expression(
+        &mut self,
+        annotation: &ast::Expr,
+        deferred_state: DeferredExpressionState,
+    ) -> TypeAndQualifiers<'db> {
+        let previous_deferred_state = std::mem::replace(&mut self.deferred_state, deferred_state);
+        let annotation_ty = self.infer_annotation_expression_impl(annotation);
+        self.deferred_state = previous_deferred_state;
+        annotation_ty
+    }
+
+    /// Similar to [`infer_annotation_expression`], but accepts an optional annotation expression
+    /// and returns [`None`] if the annotation is [`None`].
+    ///
+    /// [`infer_annotation_expression`]: TypeInferenceBuilder::infer_annotation_expression
+    pub(super) fn infer_optional_annotation_expression(
+        &mut self,
+        annotation: Option<&ast::Expr>,
+        deferred_state: DeferredExpressionState,
+    ) -> Option<TypeAndQualifiers<'db>> {
+        annotation.map(|expr| self.infer_annotation_expression(expr, deferred_state))
+    }
+
+    /// Implementation of [`infer_annotation_expression`].
+    ///
+    /// [`infer_annotation_expression`]: TypeInferenceBuilder::infer_annotation_expression
+    fn infer_annotation_expression_impl(
+        &mut self,
+        annotation: &ast::Expr,
+    ) -> TypeAndQualifiers<'db> {
+        fn infer_name_or_attribute<'db>(
+            ty: Type<'db>,
+            annotation: &ast::Expr,
+            builder: &TypeInferenceBuilder<'db, '_>,
+        ) -> TypeAndQualifiers<'db> {
+            match ty {
+                Type::SpecialForm(SpecialFormType::ClassVar) => TypeAndQualifiers::new(
+                    Type::unknown(),
+                    TypeOrigin::Declared,
+                    TypeQualifiers::CLASS_VAR,
+                ),
+                Type::SpecialForm(SpecialFormType::Final) => TypeAndQualifiers::new(
+                    Type::unknown(),
+                    TypeOrigin::Declared,
+                    TypeQualifiers::FINAL,
+                ),
+                Type::SpecialForm(SpecialFormType::Required) => TypeAndQualifiers::new(
+                    Type::unknown(),
+                    TypeOrigin::Declared,
+                    TypeQualifiers::REQUIRED,
+                ),
+                Type::SpecialForm(SpecialFormType::NotRequired) => TypeAndQualifiers::new(
+                    Type::unknown(),
+                    TypeOrigin::Declared,
+                    TypeQualifiers::NOT_REQUIRED,
+                ),
+                Type::SpecialForm(SpecialFormType::ReadOnly) => TypeAndQualifiers::new(
+                    Type::unknown(),
+                    TypeOrigin::Declared,
+                    TypeQualifiers::READ_ONLY,
+                ),
+                Type::ClassLiteral(class) if class.is_known(builder.db(), KnownClass::InitVar) => {
+                    if let Some(builder) =
+                        builder.context.report_lint(&INVALID_TYPE_FORM, annotation)
+                    {
+                        builder
+                            .into_diagnostic("`InitVar` may not be used without a type argument");
+                    }
+                    TypeAndQualifiers::new(
+                        Type::unknown(),
+                        TypeOrigin::Declared,
+                        TypeQualifiers::INIT_VAR,
+                    )
+                }
+                _ => TypeAndQualifiers::declared(
+                    ty.in_type_expression(
+                        builder.db(),
+                        builder.scope(),
+                        builder.typevar_binding_context,
+                    )
+                    .unwrap_or_else(|error| {
+                        error.into_fallback_type(
+                            &builder.context,
+                            annotation,
+                            builder.is_reachable(annotation),
+                        )
+                    }),
+                ),
+            }
+        }
+
+        // https://typing.python.org/en/latest/spec/annotations.html#grammar-token-expression-grammar-annotation_expression
+        let annotation_ty = match annotation {
+            // String annotations: https://typing.python.org/en/latest/spec/annotations.html#string-annotations
+            ast::Expr::StringLiteral(string) => self.infer_string_annotation_expression(string),
+
+            // Annotation expressions also get special handling for `*args` and `**kwargs`.
+            ast::Expr::Starred(starred) => {
+                TypeAndQualifiers::declared(self.infer_starred_expression(starred))
+            }
+
+            ast::Expr::BytesLiteral(bytes) => {
+                if let Some(builder) = self
+                    .context
+                    .report_lint(&BYTE_STRING_TYPE_ANNOTATION, bytes)
+                {
+                    builder.into_diagnostic("Type expressions cannot use bytes literal");
+                }
+                TypeAndQualifiers::declared(Type::unknown())
+            }
+
+            ast::Expr::FString(fstring) => {
+                if let Some(builder) = self.context.report_lint(&FSTRING_TYPE_ANNOTATION, fstring) {
+                    builder.into_diagnostic("Type expressions cannot use f-strings");
+                }
+                self.infer_fstring_expression(fstring);
+                TypeAndQualifiers::declared(Type::unknown())
+            }
+
+            ast::Expr::Attribute(attribute) => match attribute.ctx {
+                ast::ExprContext::Load => infer_name_or_attribute(
+                    self.infer_attribute_expression(attribute),
+                    annotation,
+                    self,
+                ),
+                ast::ExprContext::Invalid => TypeAndQualifiers::declared(Type::unknown()),
+                ast::ExprContext::Store | ast::ExprContext::Del => TypeAndQualifiers::declared(
+                    todo_type!("Attribute expression annotation in Store/Del context"),
+                ),
+            },
+
+            ast::Expr::Name(name) => match name.ctx {
+                ast::ExprContext::Load => {
+                    infer_name_or_attribute(self.infer_name_expression(name), annotation, self)
+                }
+                ast::ExprContext::Invalid => TypeAndQualifiers::declared(Type::unknown()),
+                ast::ExprContext::Store | ast::ExprContext::Del => TypeAndQualifiers::declared(
+                    todo_type!("Name expression annotation in Store/Del context"),
+                ),
+            },
+
+            ast::Expr::Subscript(subscript @ ast::ExprSubscript { value, slice, .. }) => {
+                let value_ty = self.infer_expression(value, TypeContext::default());
+
+                let slice = &**slice;
+
+                match value_ty {
+                    Type::SpecialForm(SpecialFormType::Annotated) => {
+                        // This branch is similar to the corresponding branch in `infer_parameterized_special_form_type_expression`, but
+                        // `Annotated[…]` can appear both in annotation expressions and in type expressions, and needs to be handled slightly
+                        // differently in each case (calling either `infer_type_expression_*` or `infer_annotation_expression_*`).
+                        if let ast::Expr::Tuple(ast::ExprTuple {
+                            elts: arguments, ..
+                        }) = slice
+                        {
+                            if arguments.len() < 2 {
+                                report_invalid_arguments_to_annotated(&self.context, subscript);
+                            }
+
+                            if let [inner_annotation, metadata @ ..] = &arguments[..] {
+                                for element in metadata {
+                                    self.infer_expression(element, TypeContext::default());
+                                }
+
+                                let inner_annotation_ty =
+                                    self.infer_annotation_expression_impl(inner_annotation);
+
+                                self.store_expression_type(slice, inner_annotation_ty.inner_type());
+                                inner_annotation_ty
+                            } else {
+                                for argument in arguments {
+                                    self.infer_expression(argument, TypeContext::default());
+                                }
+                                self.store_expression_type(slice, Type::unknown());
+                                TypeAndQualifiers::declared(Type::unknown())
+                            }
+                        } else {
+                            report_invalid_arguments_to_annotated(&self.context, subscript);
+                            self.infer_annotation_expression_impl(slice)
+                        }
+                    }
+                    Type::SpecialForm(
+                        type_qualifier @ (SpecialFormType::ClassVar
+                        | SpecialFormType::Final
+                        | SpecialFormType::Required
+                        | SpecialFormType::NotRequired
+                        | SpecialFormType::ReadOnly),
+                    ) => {
+                        let arguments = if let ast::Expr::Tuple(tuple) = slice {
+                            &*tuple.elts
+                        } else {
+                            std::slice::from_ref(slice)
+                        };
+                        let num_arguments = arguments.len();
+                        let type_and_qualifiers = if num_arguments == 1 {
+                            let mut type_and_qualifiers =
+                                self.infer_annotation_expression_impl(slice);
+
+                            match type_qualifier {
+                                SpecialFormType::ClassVar => {
+                                    type_and_qualifiers.add_qualifier(TypeQualifiers::CLASS_VAR);
+                                }
+                                SpecialFormType::Final => {
+                                    type_and_qualifiers.add_qualifier(TypeQualifiers::FINAL);
+                                }
+                                SpecialFormType::Required => {
+                                    type_and_qualifiers.add_qualifier(TypeQualifiers::REQUIRED);
+                                }
+                                SpecialFormType::NotRequired => {
+                                    type_and_qualifiers.add_qualifier(TypeQualifiers::NOT_REQUIRED);
+                                }
+                                SpecialFormType::ReadOnly => {
+                                    type_and_qualifiers.add_qualifier(TypeQualifiers::READ_ONLY);
+                                }
+                                _ => unreachable!(),
+                            }
+                            type_and_qualifiers
+                        } else {
+                            for element in arguments {
+                                self.infer_annotation_expression_impl(element);
+                            }
+                            if let Some(builder) =
+                                self.context.report_lint(&INVALID_TYPE_FORM, subscript)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Type qualifier `{type_qualifier}` expected exactly 1 argument, \
+                                    got {num_arguments}",
+                                ));
+                            }
+                            TypeAndQualifiers::declared(Type::unknown())
+                        };
+                        if slice.is_tuple_expr() {
+                            self.store_expression_type(slice, type_and_qualifiers.inner_type());
+                        }
+                        type_and_qualifiers
+                    }
+                    Type::ClassLiteral(class) if class.is_known(self.db(), KnownClass::InitVar) => {
+                        let arguments = if let ast::Expr::Tuple(tuple) = slice {
+                            &*tuple.elts
+                        } else {
+                            std::slice::from_ref(slice)
+                        };
+                        let num_arguments = arguments.len();
+                        let type_and_qualifiers = if num_arguments == 1 {
+                            let mut type_and_qualifiers =
+                                self.infer_annotation_expression_impl(slice);
+                            type_and_qualifiers.add_qualifier(TypeQualifiers::INIT_VAR);
+                            type_and_qualifiers
+                        } else {
+                            for element in arguments {
+                                self.infer_annotation_expression_impl(element);
+                            }
+                            if let Some(builder) =
+                                self.context.report_lint(&INVALID_TYPE_FORM, subscript)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Type qualifier `InitVar` expected exactly 1 argument, \
+                                    got {num_arguments}",
+                                ));
+                            }
+                            TypeAndQualifiers::declared(Type::unknown())
+                        };
+                        if slice.is_tuple_expr() {
+                            self.store_expression_type(slice, type_and_qualifiers.inner_type());
+                        }
+                        type_and_qualifiers
+                    }
+                    _ => TypeAndQualifiers::declared(
+                        self.infer_subscript_type_expression_no_store(subscript, slice, value_ty),
+                    ),
+                }
+            }
+
+            // All other annotation expressions are (possibly) valid type expressions, so handle
+            // them there instead.
+            type_expr => {
+                TypeAndQualifiers::declared(self.infer_type_expression_no_store(type_expr))
+            }
+        };
+
+        self.store_expression_type(annotation, annotation_ty.inner_type());
+
+        annotation_ty
+    }
+
+    /// Infer the type of a string annotation expression.
+    fn infer_string_annotation_expression(
+        &mut self,
+        string: &ast::ExprStringLiteral,
+    ) -> TypeAndQualifiers<'db> {
+        match parse_string_annotation(&self.context, string) {
+            Some(parsed) => {
+                // String annotations are always evaluated in the deferred context.
+                self.infer_annotation_expression(
+                    parsed.expr(),
+                    DeferredExpressionState::InStringAnnotation(
+                        self.enclosing_node_key(string.into()),
+                    ),
+                )
+            }
+            None => TypeAndQualifiers::declared(Type::unknown()),
+        }
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs b/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs
new file mode 100644
index 0000000000..3c7bdb5464
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs
@@ -0,0 +1,1539 @@
+use itertools::Either;
+use ruff_python_ast as ast;
+
+use super::{DeferredExpressionState, TypeInferenceBuilder};
+use crate::types::diagnostic::{
+    self, INVALID_TYPE_FORM, NON_SUBSCRIPTABLE, report_invalid_argument_number_to_special_form,
+    report_invalid_arguments_to_annotated, report_invalid_arguments_to_callable,
+};
+use crate::types::enums::is_enum_class;
+use crate::types::signatures::Signature;
+use crate::types::string_annotation::parse_string_annotation;
+use crate::types::tuple::{TupleSpecBuilder, TupleType};
+use crate::types::visitor::any_over_type;
+use crate::types::{
+    CallableType, DynamicType, IntersectionBuilder, KnownClass, KnownInstanceType,
+    LintDiagnosticGuard, Parameter, Parameters, SpecialFormType, SubclassOfType, Type,
+    TypeAliasType, TypeContext, TypeIsType, UnionBuilder, UnionType, todo_type,
+};
+
+/// Type expressions
+impl<'db> TypeInferenceBuilder<'db, '_> {
+    /// Infer the type of a type expression.
+    pub(super) fn infer_type_expression(&mut self, expression: &ast::Expr) -> Type<'db> {
+        let mut ty = self.infer_type_expression_no_store(expression);
+        let divergent = Type::divergent(Some(self.scope()));
+        if ty.has_divergent_type(self.db(), divergent) {
+            ty = divergent;
+        }
+        self.store_expression_type(expression, ty);
+        ty
+    }
+
+    /// Similar to [`infer_type_expression`], but accepts a [`DeferredExpressionState`].
+    ///
+    /// [`infer_type_expression`]: TypeInferenceBuilder::infer_type_expression
+    fn infer_type_expression_with_state(
+        &mut self,
+        expression: &ast::Expr,
+        deferred_state: DeferredExpressionState,
+    ) -> Type<'db> {
+        let previous_deferred_state = std::mem::replace(&mut self.deferred_state, deferred_state);
+        let annotation_ty = self.infer_type_expression(expression);
+        self.deferred_state = previous_deferred_state;
+        annotation_ty
+    }
+
+    /// Similar to [`infer_type_expression`], but accepts an optional expression.
+    ///
+    /// [`infer_type_expression`]: TypeInferenceBuilder::infer_type_expression_with_state
+    pub(super) fn infer_optional_type_expression(
+        &mut self,
+        expression: Option<&ast::Expr>,
+    ) -> Option<Type<'db>> {
+        expression.map(|expr| self.infer_type_expression(expr))
+    }
+
+    fn report_invalid_type_expression(
+        &self,
+        expression: &ast::Expr,
+        message: std::fmt::Arguments,
+    ) -> Option<LintDiagnosticGuard<'_, '_>> {
+        self.context
+            .report_lint(&INVALID_TYPE_FORM, expression)
+            .map(|builder| {
+                diagnostic::add_type_expression_reference_link(builder.into_diagnostic(message))
+            })
+    }
+
+    /// Infer the type of a type expression without storing the result.
+    pub(super) fn infer_type_expression_no_store(&mut self, expression: &ast::Expr) -> Type<'db> {
+        // https://typing.python.org/en/latest/spec/annotations.html#grammar-token-expression-grammar-type_expression
+        match expression {
+            ast::Expr::Name(name) => match name.ctx {
+                ast::ExprContext::Load => self
+                    .infer_name_expression(name)
+                    .in_type_expression(self.db(), self.scope(), self.typevar_binding_context)
+                    .unwrap_or_else(|error| {
+                        error.into_fallback_type(
+                            &self.context,
+                            expression,
+                            self.is_reachable(expression),
+                        )
+                    }),
+                ast::ExprContext::Invalid => Type::unknown(),
+                ast::ExprContext::Store | ast::ExprContext::Del => {
+                    todo_type!("Name expression annotation in Store/Del context")
+                }
+            },
+
+            ast::Expr::Attribute(attribute_expression) => match attribute_expression.ctx {
+                ast::ExprContext::Load => self
+                    .infer_attribute_expression(attribute_expression)
+                    .in_type_expression(self.db(), self.scope(), self.typevar_binding_context)
+                    .unwrap_or_else(|error| {
+                        error.into_fallback_type(
+                            &self.context,
+                            expression,
+                            self.is_reachable(expression),
+                        )
+                    }),
+                ast::ExprContext::Invalid => Type::unknown(),
+                ast::ExprContext::Store | ast::ExprContext::Del => {
+                    todo_type!("Attribute expression annotation in Store/Del context")
+                }
+            },
+
+            ast::Expr::NoneLiteral(_literal) => Type::none(self.db()),
+
+            // https://typing.python.org/en/latest/spec/annotations.html#string-annotations
+            ast::Expr::StringLiteral(string) => self.infer_string_type_expression(string),
+
+            ast::Expr::Subscript(subscript) => {
+                let ast::ExprSubscript {
+                    value,
+                    slice,
+                    ctx: _,
+                    range: _,
+                    node_index: _,
+                } = subscript;
+
+                let value_ty = self.infer_expression(value, TypeContext::default());
+
+                self.infer_subscript_type_expression_no_store(subscript, slice, value_ty)
+            }
+
+            ast::Expr::BinOp(binary) => {
+                match binary.op {
+                    // PEP-604 unions are okay, e.g., `int | str`
+                    ast::Operator::BitOr => {
+                        let left_ty = self.infer_type_expression(&binary.left);
+                        let right_ty = self.infer_type_expression(&binary.right);
+                        UnionType::from_elements_leave_aliases(self.db(), [left_ty, right_ty])
+                    }
+                    // anything else is an invalid annotation:
+                    op => {
+                        self.infer_binary_expression(binary);
+                        if let Some(mut diag) = self.report_invalid_type_expression(
+                            expression,
+                            format_args!(
+                                "Invalid binary operator `{}` in type annotation",
+                                op.as_str()
+                            ),
+                        ) {
+                            diag.info("Did you mean to use `|`?");
+                        }
+                        Type::unknown()
+                    }
+                }
+            }
+
+            // Avoid inferring the types of invalid type expressions that have been parsed from a
+            // string annotation, as they are not present in the semantic index.
+            _ if self.deferred_state.in_string_annotation() => Type::unknown(),
+
+            // =====================================================================================
+            // Forms which are invalid in the context of annotation expressions: we infer their
+            // nested expressions as normal expressions, but the type of the top-level expression is
+            // always `Type::unknown` in these cases.
+            // =====================================================================================
+
+            // TODO: add a subdiagnostic linking to type-expression grammar
+            // and stating that it is only valid in `typing.Literal[]` or `typing.Annotated[]`
+            ast::Expr::BytesLiteral(_) => {
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!(
+                        "Bytes literals are not allowed in this context in a type expression"
+                    ),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::NumberLiteral(ast::ExprNumberLiteral {
+                value: ast::Number::Int(_),
+                ..
+            }) => {
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!(
+                        "Int literals are not allowed in this context in a type expression"
+                    ),
+                );
+
+                Type::unknown()
+            }
+
+            ast::Expr::NumberLiteral(ast::ExprNumberLiteral {
+                value: ast::Number::Float(_),
+                ..
+            }) => {
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Float literals are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::NumberLiteral(ast::ExprNumberLiteral {
+                value: ast::Number::Complex { .. },
+                ..
+            }) => {
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Complex literals are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::BooleanLiteral(_) => {
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!(
+                        "Boolean literals are not allowed in this context in a type expression"
+                    ),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::List(list) => {
+                let db = self.db();
+
+                let inner_types: Vec<Type<'db>> = list
+                    .iter()
+                    .map(|element| self.infer_type_expression(element))
+                    .collect();
+
+                if let Some(mut diagnostic) = self.report_invalid_type_expression(
+                    expression,
+                    format_args!(
+                        "List literals are not allowed in this context in a type expression"
+                    ),
+                ) {
+                    if !inner_types.iter().any(|ty| {
+                        matches!(
+                            ty,
+                            Type::Dynamic(DynamicType::Todo(_) | DynamicType::Unknown)
+                        )
+                    }) {
+                        let hinted_type = if list.len() == 1 {
+                            KnownClass::List.to_specialized_instance(db, inner_types)
+                        } else {
+                            Type::heterogeneous_tuple(db, inner_types)
+                        };
+
+                        diagnostic.set_primary_message(format_args!(
+                            "Did you mean `{}`?",
+                            hinted_type.display(self.db()),
+                        ));
+                    }
+                }
+                Type::unknown()
+            }
+
+            ast::Expr::Tuple(tuple) => {
+                let inner_types: Vec<Type<'db>> = tuple
+                    .elts
+                    .iter()
+                    .map(|expr| self.infer_type_expression(expr))
+                    .collect();
+
+                if tuple.parenthesized {
+                    if let Some(mut diagnostic) = self.report_invalid_type_expression(
+                        expression,
+                        format_args!(
+                            "Tuple literals are not allowed in this context in a type expression"
+                        ),
+                    ) {
+                        if !inner_types.iter().any(|ty| {
+                            matches!(
+                                ty,
+                                Type::Dynamic(DynamicType::Todo(_) | DynamicType::Unknown)
+                            )
+                        }) {
+                            let hinted_type = Type::heterogeneous_tuple(self.db(), inner_types);
+                            diagnostic.set_primary_message(format_args!(
+                                "Did you mean `{}`?",
+                                hinted_type.display(self.db()),
+                            ));
+                        }
+                    }
+                }
+                Type::unknown()
+            }
+
+            ast::Expr::BoolOp(bool_op) => {
+                self.infer_boolean_expression(bool_op);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Boolean operations are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Named(named) => {
+                self.infer_named_expression(named);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Named expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::UnaryOp(unary) => {
+                self.infer_unary_expression(unary);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Unary operations are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Lambda(lambda_expression) => {
+                self.infer_lambda_expression(lambda_expression);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("`lambda` expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::If(if_expression) => {
+                self.infer_if_expression(if_expression);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("`if` expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Dict(dict) => {
+                self.infer_dict_expression(dict, TypeContext::default());
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Dict literals are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Set(set) => {
+                self.infer_set_expression(set, TypeContext::default());
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Set literals are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::DictComp(dictcomp) => {
+                self.infer_dict_comprehension_expression(dictcomp);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Dict comprehensions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::ListComp(listcomp) => {
+                self.infer_list_comprehension_expression(listcomp);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("List comprehensions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::SetComp(setcomp) => {
+                self.infer_set_comprehension_expression(setcomp);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Set comprehensions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Generator(generator) => {
+                self.infer_generator_expression(generator);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Generator expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Await(await_expression) => {
+                self.infer_await_expression(await_expression);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("`await` expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Yield(yield_expression) => {
+                self.infer_yield_expression(yield_expression);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("`yield` expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::YieldFrom(yield_from) => {
+                self.infer_yield_from_expression(yield_from);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("`yield from` expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Compare(compare) => {
+                self.infer_compare_expression(compare);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Comparison expressions are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Call(call_expr) => {
+                self.infer_call_expression(call_expr, TypeContext::default());
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Function calls are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::FString(fstring) => {
+                self.infer_fstring_expression(fstring);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("F-strings are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::TString(tstring) => {
+                self.infer_tstring_expression(tstring);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("T-strings are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            ast::Expr::Slice(slice) => {
+                self.infer_slice_expression(slice);
+                self.report_invalid_type_expression(
+                    expression,
+                    format_args!("Slices are not allowed in type expressions"),
+                );
+                Type::unknown()
+            }
+
+            // =================================================================================
+            // Branches where we probably should emit diagnostics in some context, but don't yet
+            // =================================================================================
+            // TODO: When this case is implemented and the `todo!` usage
+            // is removed, consider adding `todo = "warn"` to the Clippy
+            // lint configuration in `Cargo.toml`. At time of writing,
+            // 2025-08-22, this was the only usage of `todo!` in ruff/ty.
+            // ---AG
+            ast::Expr::IpyEscapeCommand(_) => todo!("Implement Ipy escape command support"),
+
+            ast::Expr::EllipsisLiteral(_) => {
+                todo_type!("ellipsis literal in type expression")
+            }
+
+            ast::Expr::Starred(starred) => self.infer_starred_type_expression(starred),
+        }
+    }
+
+    fn infer_starred_type_expression(&mut self, starred: &ast::ExprStarred) -> Type<'db> {
+        let ast::ExprStarred {
+            range: _,
+            node_index: _,
+            value,
+            ctx: _,
+        } = starred;
+
+        let starred_type = self.infer_type_expression(value);
+        if starred_type.exact_tuple_instance_spec(self.db()).is_some() {
+            starred_type
+        } else {
+            todo_type!("PEP 646")
+        }
+    }
+
+    pub(super) fn infer_subscript_type_expression_no_store(
+        &mut self,
+        subscript: &ast::ExprSubscript,
+        slice: &ast::Expr,
+        value_ty: Type<'db>,
+    ) -> Type<'db> {
+        match value_ty {
+            Type::ClassLiteral(class_literal) => match class_literal.known(self.db()) {
+                Some(KnownClass::Tuple) => Type::tuple(self.infer_tuple_type_expression(slice)),
+                Some(KnownClass::Type) => self.infer_subclass_of_type_expression(slice),
+                _ => self.infer_subscript_type_expression(subscript, value_ty),
+            },
+            _ => self.infer_subscript_type_expression(subscript, value_ty),
+        }
+    }
+
+    /// Infer the type of a string type expression.
+    fn infer_string_type_expression(&mut self, string: &ast::ExprStringLiteral) -> Type<'db> {
+        match parse_string_annotation(&self.context, string) {
+            Some(parsed) => {
+                // String annotations are always evaluated in the deferred context.
+                self.infer_type_expression_with_state(
+                    parsed.expr(),
+                    DeferredExpressionState::InStringAnnotation(
+                        self.enclosing_node_key(string.into()),
+                    ),
+                )
+            }
+            None => Type::unknown(),
+        }
+    }
+
+    /// Given the slice of a `tuple[]` annotation, return the type that the annotation represents
+    pub(super) fn infer_tuple_type_expression(
+        &mut self,
+        tuple_slice: &ast::Expr,
+    ) -> Option<TupleType<'db>> {
+        /// In most cases, if a subelement of the tuple is inferred as `Todo`,
+        /// we should only infer `Todo` for that specific subelement.
+        /// Certain specific AST nodes can however change the meaning of the entire tuple,
+        /// however: for example, `tuple[int, ...]` or `tuple[int, *tuple[str, ...]]` are a
+        /// homogeneous tuple and a partly homogeneous tuple (respectively) due to the `...`
+        /// and the starred expression (respectively), Neither is supported by us right now,
+        /// so we should infer `Todo` for the *entire* tuple if we encounter one of those elements.
+        fn element_could_alter_type_of_whole_tuple(
+            element: &ast::Expr,
+            element_ty: Type,
+            builder: &mut TypeInferenceBuilder,
+        ) -> bool {
+            if !element_ty.is_todo() {
+                return false;
+            }
+
+            match element {
+                ast::Expr::Starred(_) => {
+                    element_ty.exact_tuple_instance_spec(builder.db()).is_none()
+                }
+                ast::Expr::Subscript(ast::ExprSubscript { value, .. }) => {
+                    let value_ty = if builder.deferred_state.in_string_annotation() {
+                        // Using `.expression_type` does not work in string annotations, because
+                        // we do not store types for sub-expressions. Re-infer the type here.
+                        builder.infer_expression(value, TypeContext::default())
+                    } else {
+                        builder.expression_type(value)
+                    };
+
+                    value_ty == Type::SpecialForm(SpecialFormType::Unpack)
+                }
+                _ => false,
+            }
+        }
+
+        // TODO: PEP 646
+        match tuple_slice {
+            ast::Expr::Tuple(elements) => {
+                if let [element, ellipsis @ ast::Expr::EllipsisLiteral(_)] = &*elements.elts {
+                    self.infer_expression(ellipsis, TypeContext::default());
+                    let result =
+                        TupleType::homogeneous(self.db(), self.infer_type_expression(element));
+                    self.store_expression_type(tuple_slice, Type::tuple(Some(result)));
+                    return Some(result);
+                }
+
+                let mut element_types = TupleSpecBuilder::with_capacity(elements.len());
+
+                // Whether to infer `Todo` for the whole tuple
+                // (see docstring for `element_could_alter_type_of_whole_tuple`)
+                let mut return_todo = false;
+
+                for element in elements {
+                    let element_ty = self.infer_type_expression(element);
+                    return_todo |=
+                        element_could_alter_type_of_whole_tuple(element, element_ty, self);
+
+                    if let ast::Expr::Starred(_) = element {
+                        if let Some(inner_tuple) = element_ty.exact_tuple_instance_spec(self.db()) {
+                            element_types = element_types.concat(self.db(), &inner_tuple);
+                        } else {
+                            // TODO: emit a diagnostic
+                        }
+                    } else {
+                        element_types.push(element_ty.fallback_to_divergent(self.db()));
+                    }
+                }
+
+                let ty = if return_todo {
+                    Some(TupleType::homogeneous(self.db(), todo_type!("PEP 646")))
+                } else {
+                    TupleType::new(self.db(), &element_types.build())
+                };
+
+                // Here, we store the type for the inner `int, str` tuple-expression,
+                // while the type for the outer `tuple[int, str]` slice-expression is
+                // stored in the surrounding `infer_type_expression` call:
+                self.store_expression_type(tuple_slice, Type::tuple(ty));
+
+                ty
+            }
+            single_element => {
+                let single_element_ty = self.infer_type_expression(single_element);
+                if element_could_alter_type_of_whole_tuple(single_element, single_element_ty, self)
+                {
+                    Some(TupleType::homogeneous(self.db(), todo_type!("PEP 646")))
+                } else {
+                    TupleType::heterogeneous(self.db(), std::iter::once(single_element_ty))
+                }
+            }
+        }
+    }
+
+    /// Given the slice of a `type[]` annotation, return the type that the annotation represents
+    fn infer_subclass_of_type_expression(&mut self, slice: &ast::Expr) -> Type<'db> {
+        match slice {
+            ast::Expr::Name(_) | ast::Expr::Attribute(_) => {
+                let name_ty = self.infer_expression(slice, TypeContext::default());
+                match name_ty {
+                    Type::ClassLiteral(class_literal) => {
+                        if class_literal.is_protocol(self.db()) {
+                            SubclassOfType::from(
+                                self.db(),
+                                todo_type!("type[T] for protocols").expect_dynamic(),
+                            )
+                        } else {
+                            SubclassOfType::from(
+                                self.db(),
+                                class_literal.default_specialization(self.db()),
+                            )
+                        }
+                    }
+                    Type::SpecialForm(SpecialFormType::Any) => SubclassOfType::subclass_of_any(),
+                    Type::SpecialForm(SpecialFormType::Unknown) => {
+                        SubclassOfType::subclass_of_unknown()
+                    }
+                    _ => todo_type!("unsupported type[X] special form"),
+                }
+            }
+            ast::Expr::BinOp(binary) if binary.op == ast::Operator::BitOr => {
+                let union_ty = UnionType::from_elements_leave_aliases(
+                    self.db(),
+                    [
+                        self.infer_subclass_of_type_expression(&binary.left),
+                        self.infer_subclass_of_type_expression(&binary.right),
+                    ],
+                );
+                self.store_expression_type(slice, union_ty);
+
+                union_ty
+            }
+            ast::Expr::Tuple(_) => {
+                self.infer_type_expression(slice);
+                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, slice) {
+                    builder.into_diagnostic("type[...] must have exactly one type argument");
+                }
+                Type::unknown()
+            }
+            ast::Expr::Subscript(ast::ExprSubscript {
+                value,
+                slice: parameters,
+                ..
+            }) => {
+                let parameters_ty = match self.infer_expression(value, TypeContext::default()) {
+                    Type::SpecialForm(SpecialFormType::Union) => match &**parameters {
+                        ast::Expr::Tuple(tuple) => {
+                            let ty = UnionType::from_elements_leave_aliases(
+                                self.db(),
+                                tuple
+                                    .iter()
+                                    .map(|element| self.infer_subclass_of_type_expression(element)),
+                            );
+                            self.store_expression_type(parameters, ty);
+                            ty
+                        }
+                        _ => self.infer_subclass_of_type_expression(parameters),
+                    },
+                    _ => {
+                        self.infer_type_expression(parameters);
+                        todo_type!("unsupported nested subscript in type[X]")
+                    }
+                };
+                self.store_expression_type(slice, parameters_ty);
+                parameters_ty
+            }
+            // TODO: subscripts, etc.
+            _ => {
+                self.infer_type_expression(slice);
+                todo_type!("unsupported type[X] special form")
+            }
+        }
+    }
+
+    fn infer_subscript_type_expression(
+        &mut self,
+        subscript: &ast::ExprSubscript,
+        value_ty: Type<'db>,
+    ) -> Type<'db> {
+        let ast::ExprSubscript {
+            range: _,
+            node_index: _,
+            value: _,
+            slice,
+            ctx: _,
+        } = subscript;
+
+        match value_ty {
+            Type::Never => {
+                // This case can be entered when we use a type annotation like `Literal[1]`
+                // in unreachable code, since we infer `Never` for `Literal`.  We call
+                // `infer_expression` (instead of `infer_type_expression`) here to avoid
+                // false-positive `invalid-type-form` diagnostics (`1` is not a valid type
+                // expression).
+                self.infer_expression(slice, TypeContext::default());
+                Type::unknown()
+            }
+            Type::SpecialForm(special_form) => {
+                self.infer_parameterized_special_form_type_expression(subscript, special_form)
+            }
+            Type::KnownInstance(known_instance) => match known_instance {
+                KnownInstanceType::SubscriptedProtocol(_) => {
+                    self.infer_type_expression(slice);
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        builder.into_diagnostic(format_args!(
+                            "`typing.Protocol` is not allowed in type expressions",
+                        ));
+                    }
+                    Type::unknown()
+                }
+                KnownInstanceType::SubscriptedGeneric(_) => {
+                    self.infer_type_expression(slice);
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        builder.into_diagnostic(format_args!(
+                            "`typing.Generic` is not allowed in type expressions",
+                        ));
+                    }
+                    Type::unknown()
+                }
+                KnownInstanceType::Deprecated(_) => {
+                    self.infer_type_expression(slice);
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        builder.into_diagnostic(format_args!(
+                            "`warnings.deprecated` is not allowed in type expressions",
+                        ));
+                    }
+                    Type::unknown()
+                }
+                KnownInstanceType::Field(_) => {
+                    self.infer_type_expression(slice);
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        builder.into_diagnostic(format_args!(
+                            "`dataclasses.Field` is not allowed in type expressions",
+                        ));
+                    }
+                    Type::unknown()
+                }
+                KnownInstanceType::ConstraintSet(_) => {
+                    self.infer_type_expression(slice);
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        builder.into_diagnostic(format_args!(
+                            "`ty_extensions.ConstraintSet` is not allowed in type expressions",
+                        ));
+                    }
+                    Type::unknown()
+                }
+                KnownInstanceType::TypeVar(_) => {
+                    self.infer_type_expression(slice);
+                    todo_type!("TypeVar annotations")
+                }
+                KnownInstanceType::TypeAliasType(type_alias @ TypeAliasType::PEP695(_)) => {
+                    match type_alias.generic_context(self.db()) {
+                        Some(generic_context) => {
+                            let specialized_type_alias = self
+                                .infer_explicit_type_alias_specialization(
+                                    subscript,
+                                    value_ty,
+                                    type_alias,
+                                    generic_context,
+                                );
+
+                            specialized_type_alias
+                                .in_type_expression(
+                                    self.db(),
+                                    self.scope(),
+                                    self.typevar_binding_context,
+                                )
+                                .unwrap_or(Type::unknown())
+                        }
+                        None => {
+                            self.infer_type_expression(slice);
+
+                            if let Some(builder) =
+                                self.context.report_lint(&NON_SUBSCRIPTABLE, subscript)
+                            {
+                                builder.into_diagnostic(format_args!(
+                                    "Cannot subscript non-generic type alias"
+                                ));
+                            }
+
+                            Type::unknown()
+                        }
+                    }
+                }
+                KnownInstanceType::TypeAliasType(TypeAliasType::ManualPEP695(_)) => {
+                    self.infer_type_expression(slice);
+                    todo_type!("Generic manual PEP-695 type alias")
+                }
+            },
+            Type::Dynamic(DynamicType::Todo(_)) => {
+                self.infer_type_expression(slice);
+                value_ty
+            }
+            Type::ClassLiteral(class) => {
+                match class.generic_context(self.db()) {
+                    Some(generic_context) => {
+                        let specialized_class = self.infer_explicit_class_specialization(
+                            subscript,
+                            value_ty,
+                            class,
+                            generic_context,
+                        );
+
+                        specialized_class
+                            .in_type_expression(
+                                self.db(),
+                                self.scope(),
+                                self.typevar_binding_context,
+                            )
+                            .unwrap_or(Type::unknown())
+                    }
+                    None => {
+                        // TODO: emit a diagnostic if you try to specialize a non-generic class.
+                        self.infer_type_expression(slice);
+                        todo_type!("specialized non-generic class")
+                    }
+                }
+            }
+            _ => {
+                // TODO: Emit a diagnostic once we've implemented all valid subscript type
+                // expressions.
+                self.infer_type_expression(slice);
+                todo_type!("unknown type subscript")
+            }
+        }
+    }
+
+    fn infer_parameterized_legacy_typing_alias(
+        &mut self,
+        subscript_node: &ast::ExprSubscript,
+        expected_arg_count: usize,
+        alias: SpecialFormType,
+        class: KnownClass,
+    ) -> Type<'db> {
+        let arguments = &*subscript_node.slice;
+        let args = if let ast::Expr::Tuple(t) = arguments {
+            &*t.elts
+        } else {
+            std::slice::from_ref(arguments)
+        };
+        if args.len() != expected_arg_count {
+            if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript_node) {
+                let noun = if expected_arg_count == 1 {
+                    "argument"
+                } else {
+                    "arguments"
+                };
+                builder.into_diagnostic(format_args!(
+                    "Legacy alias `{alias}` expected exactly {expected_arg_count} {noun}, \
+                    got {}",
+                    args.len()
+                ));
+            }
+        }
+        let ty = class.to_specialized_instance(
+            self.db(),
+            args.iter().map(|node| self.infer_type_expression(node)),
+        );
+        if arguments.is_tuple_expr() {
+            self.store_expression_type(arguments, ty);
+        }
+        ty
+    }
+
+    fn infer_parameterized_special_form_type_expression(
+        &mut self,
+        subscript: &ast::ExprSubscript,
+        special_form: SpecialFormType,
+    ) -> Type<'db> {
+        let db = self.db();
+        let arguments_slice = &*subscript.slice;
+        match special_form {
+            SpecialFormType::Annotated => {
+                let ast::Expr::Tuple(ast::ExprTuple {
+                    elts: arguments, ..
+                }) = arguments_slice
+                else {
+                    report_invalid_arguments_to_annotated(&self.context, subscript);
+
+                    // `Annotated[]` with less than two arguments is an error at runtime.
+                    // However, we still treat `Annotated[T]` as `T` here for the purpose of
+                    // giving better diagnostics later on.
+                    // Pyright also does this. Mypy doesn't; it falls back to `Any` instead.
+                    return self.infer_type_expression(arguments_slice);
+                };
+
+                if arguments.len() < 2 {
+                    report_invalid_arguments_to_annotated(&self.context, subscript);
+                }
+
+                let [type_expr, metadata @ ..] = &arguments[..] else {
+                    for argument in arguments {
+                        self.infer_expression(argument, TypeContext::default());
+                    }
+                    self.store_expression_type(arguments_slice, Type::unknown());
+                    return Type::unknown();
+                };
+
+                for element in metadata {
+                    self.infer_expression(element, TypeContext::default());
+                }
+
+                let ty = self.infer_type_expression(type_expr);
+                self.store_expression_type(arguments_slice, ty);
+                ty
+            }
+            SpecialFormType::Literal => match self.infer_literal_parameter_type(arguments_slice) {
+                Ok(ty) => ty,
+                Err(nodes) => {
+                    for node in nodes {
+                        let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, node)
+                        else {
+                            continue;
+                        };
+                        builder.into_diagnostic(
+                            "Type arguments for `Literal` must be `None`, \
+                            a literal value (int, bool, str, or bytes), or an enum member",
+                        );
+                    }
+                    Type::unknown()
+                }
+            },
+            SpecialFormType::Optional => {
+                let param_type = self.infer_type_expression(arguments_slice);
+                UnionType::from_elements_leave_aliases(db, [param_type, Type::none(db)])
+            }
+            SpecialFormType::Union => match arguments_slice {
+                ast::Expr::Tuple(t) => {
+                    let union_ty = UnionType::from_elements_leave_aliases(
+                        db,
+                        t.iter().map(|elt| self.infer_type_expression(elt)),
+                    );
+                    self.store_expression_type(arguments_slice, union_ty);
+                    union_ty
+                }
+                _ => self.infer_type_expression(arguments_slice),
+            },
+            SpecialFormType::Callable => {
+                let mut arguments = match arguments_slice {
+                    ast::Expr::Tuple(tuple) => Either::Left(tuple.iter()),
+                    _ => {
+                        self.infer_callable_parameter_types(arguments_slice);
+                        Either::Right(std::iter::empty::<&ast::Expr>())
+                    }
+                };
+
+                let first_argument = arguments.next();
+
+                let parameters =
+                    first_argument.and_then(|arg| self.infer_callable_parameter_types(arg));
+
+                let return_type = arguments.next().map(|arg| self.infer_type_expression(arg));
+
+                let correct_argument_number = if let Some(third_argument) = arguments.next() {
+                    self.infer_type_expression(third_argument);
+                    for argument in arguments {
+                        self.infer_type_expression(argument);
+                    }
+                    false
+                } else {
+                    return_type.is_some()
+                };
+
+                if !correct_argument_number {
+                    report_invalid_arguments_to_callable(&self.context, subscript);
+                }
+
+                let callable_type = if let (Some(parameters), Some(return_type), true) =
+                    (parameters, return_type, correct_argument_number)
+                {
+                    CallableType::single(db, Signature::new(parameters, Some(return_type)))
+                } else {
+                    CallableType::unknown(db)
+                };
+
+                // `Signature` / `Parameters` are not a `Type` variant, so we're storing
+                // the outer callable type on these expressions instead.
+                self.store_expression_type(arguments_slice, callable_type);
+                if let Some(first_argument) = first_argument {
+                    self.store_expression_type(first_argument, callable_type);
+                }
+
+                callable_type
+            }
+
+            // `ty_extensions` special forms
+            SpecialFormType::Not => {
+                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
+                    &*tuple.elts
+                } else {
+                    std::slice::from_ref(arguments_slice)
+                };
+                let num_arguments = arguments.len();
+                let negated_type = if num_arguments == 1 {
+                    self.infer_type_expression(&arguments[0]).negate(db)
+                } else {
+                    for argument in arguments {
+                        self.infer_type_expression(argument);
+                    }
+                    report_invalid_argument_number_to_special_form(
+                        &self.context,
+                        subscript,
+                        special_form,
+                        num_arguments,
+                        1,
+                    );
+                    Type::unknown()
+                };
+                if arguments_slice.is_tuple_expr() {
+                    self.store_expression_type(arguments_slice, negated_type);
+                }
+                negated_type
+            }
+            SpecialFormType::Intersection => {
+                let elements = match arguments_slice {
+                    ast::Expr::Tuple(tuple) => Either::Left(tuple.iter()),
+                    element => Either::Right(std::iter::once(element)),
+                };
+
+                let ty = elements
+                    .fold(IntersectionBuilder::new(db), |builder, element| {
+                        builder.add_positive(self.infer_type_expression(element))
+                    })
+                    .build();
+
+                if matches!(arguments_slice, ast::Expr::Tuple(_)) {
+                    self.store_expression_type(arguments_slice, ty);
+                }
+                ty
+            }
+            SpecialFormType::Top => {
+                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
+                    &*tuple.elts
+                } else {
+                    std::slice::from_ref(arguments_slice)
+                };
+                let num_arguments = arguments.len();
+                let arg = if num_arguments == 1 {
+                    self.infer_type_expression(&arguments[0])
+                } else {
+                    for argument in arguments {
+                        self.infer_type_expression(argument);
+                    }
+                    report_invalid_argument_number_to_special_form(
+                        &self.context,
+                        subscript,
+                        special_form,
+                        num_arguments,
+                        1,
+                    );
+                    Type::unknown()
+                };
+                arg.top_materialization(db)
+            }
+            SpecialFormType::Bottom => {
+                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
+                    &*tuple.elts
+                } else {
+                    std::slice::from_ref(arguments_slice)
+                };
+                let num_arguments = arguments.len();
+                let arg = if num_arguments == 1 {
+                    self.infer_type_expression(&arguments[0])
+                } else {
+                    for argument in arguments {
+                        self.infer_type_expression(argument);
+                    }
+                    report_invalid_argument_number_to_special_form(
+                        &self.context,
+                        subscript,
+                        special_form,
+                        num_arguments,
+                        1,
+                    );
+                    Type::unknown()
+                };
+                arg.bottom_materialization(db)
+            }
+            SpecialFormType::TypeOf => {
+                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
+                    &*tuple.elts
+                } else {
+                    std::slice::from_ref(arguments_slice)
+                };
+                let num_arguments = arguments.len();
+                let type_of_type = if num_arguments == 1 {
+                    // N.B. This uses `infer_expression` rather than `infer_type_expression`
+                    self.infer_expression(&arguments[0], TypeContext::default())
+                } else {
+                    for argument in arguments {
+                        self.infer_type_expression(argument);
+                    }
+                    report_invalid_argument_number_to_special_form(
+                        &self.context,
+                        subscript,
+                        special_form,
+                        num_arguments,
+                        1,
+                    );
+                    Type::unknown()
+                };
+                if arguments_slice.is_tuple_expr() {
+                    self.store_expression_type(arguments_slice, type_of_type);
+                }
+                type_of_type
+            }
+
+            SpecialFormType::CallableTypeOf => {
+                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
+                    &*tuple.elts
+                } else {
+                    std::slice::from_ref(arguments_slice)
+                };
+                let num_arguments = arguments.len();
+
+                if num_arguments != 1 {
+                    for argument in arguments {
+                        self.infer_expression(argument, TypeContext::default());
+                    }
+                    report_invalid_argument_number_to_special_form(
+                        &self.context,
+                        subscript,
+                        special_form,
+                        num_arguments,
+                        1,
+                    );
+                    if arguments_slice.is_tuple_expr() {
+                        self.store_expression_type(arguments_slice, Type::unknown());
+                    }
+                    return Type::unknown();
+                }
+
+                let argument_type = self.infer_expression(&arguments[0], TypeContext::default());
+
+                let Some(callable_type) = argument_type.try_upcast_to_callable(db) else {
+                    if let Some(builder) = self
+                        .context
+                        .report_lint(&INVALID_TYPE_FORM, arguments_slice)
+                    {
+                        builder.into_diagnostic(format_args!(
+                            "Expected the first argument to `{special_form}` \
+                                 to be a callable object, \
+                                 but got an object of type `{actual_type}`",
+                            actual_type = argument_type.display(db)
+                        ));
+                    }
+                    if arguments_slice.is_tuple_expr() {
+                        self.store_expression_type(arguments_slice, Type::unknown());
+                    }
+                    return Type::unknown();
+                };
+
+                if arguments_slice.is_tuple_expr() {
+                    self.store_expression_type(arguments_slice, callable_type);
+                }
+                callable_type
+            }
+
+            SpecialFormType::ChainMap => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                2,
+                SpecialFormType::ChainMap,
+                KnownClass::ChainMap,
+            ),
+            SpecialFormType::OrderedDict => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                2,
+                SpecialFormType::OrderedDict,
+                KnownClass::OrderedDict,
+            ),
+            SpecialFormType::Dict => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                2,
+                SpecialFormType::Dict,
+                KnownClass::Dict,
+            ),
+            SpecialFormType::List => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                1,
+                SpecialFormType::List,
+                KnownClass::List,
+            ),
+            SpecialFormType::DefaultDict => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                2,
+                SpecialFormType::DefaultDict,
+                KnownClass::DefaultDict,
+            ),
+            SpecialFormType::Counter => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                1,
+                SpecialFormType::Counter,
+                KnownClass::Counter,
+            ),
+            SpecialFormType::Set => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                1,
+                SpecialFormType::Set,
+                KnownClass::Set,
+            ),
+            SpecialFormType::FrozenSet => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                1,
+                SpecialFormType::FrozenSet,
+                KnownClass::FrozenSet,
+            ),
+            SpecialFormType::Deque => self.infer_parameterized_legacy_typing_alias(
+                subscript,
+                1,
+                SpecialFormType::Deque,
+                KnownClass::Deque,
+            ),
+
+            SpecialFormType::ClassVar
+            | SpecialFormType::Final
+            | SpecialFormType::Required
+            | SpecialFormType::NotRequired
+            | SpecialFormType::ReadOnly => {
+                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                    let diag = builder.into_diagnostic(format_args!(
+                        "Type qualifier `{special_form}` is not allowed in type expressions \
+                         (only in annotation expressions)",
+                    ));
+                    diagnostic::add_type_expression_reference_link(diag);
+                }
+                self.infer_type_expression(arguments_slice)
+            }
+            SpecialFormType::TypeIs => match arguments_slice {
+                ast::Expr::Tuple(_) => {
+                    self.infer_type_expression(arguments_slice);
+
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        let diag = builder.into_diagnostic(format_args!(
+                            "Special form `{}` expected exactly one type parameter",
+                            special_form.repr()
+                        ));
+                        diagnostic::add_type_expression_reference_link(diag);
+                    }
+
+                    Type::unknown()
+                }
+                _ => TypeIsType::unbound(
+                    self.db(),
+                    // N.B. Using the top materialization here is a pragmatic decision
+                    // that makes us produce more intuitive results given how
+                    // `TypeIs` is used in the real world (in particular, in typeshed).
+                    // However, there's some debate about whether this is really
+                    // fully correct. See <https://github.com/astral-sh/ruff/pull/20591>
+                    // for more discussion.
+                    self.infer_type_expression(arguments_slice)
+                        .top_materialization(self.db()),
+                ),
+            },
+            SpecialFormType::TypeGuard => {
+                self.infer_type_expression(arguments_slice);
+                todo_type!("`TypeGuard[]` special form")
+            }
+            SpecialFormType::Concatenate => {
+                let arguments = if let ast::Expr::Tuple(tuple) = arguments_slice {
+                    &*tuple.elts
+                } else {
+                    std::slice::from_ref(arguments_slice)
+                };
+                for argument in arguments {
+                    self.infer_type_expression(argument);
+                }
+                let num_arguments = arguments.len();
+                let inferred_type = if num_arguments < 2 {
+                    if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                        builder.into_diagnostic(format_args!(
+                            "Special form `{special_form}` expected at least 2 parameters but got {num_arguments}",
+                        ));
+                    }
+                    Type::unknown()
+                } else {
+                    todo_type!("`Concatenate[]` special form")
+                };
+                if arguments_slice.is_tuple_expr() {
+                    self.store_expression_type(arguments_slice, inferred_type);
+                }
+                inferred_type
+            }
+            SpecialFormType::Unpack => {
+                self.infer_type_expression(arguments_slice);
+                todo_type!("`Unpack[]` special form")
+            }
+            SpecialFormType::NoReturn
+            | SpecialFormType::Never
+            | SpecialFormType::AlwaysTruthy
+            | SpecialFormType::AlwaysFalsy => {
+                self.infer_type_expression(arguments_slice);
+
+                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                    builder.into_diagnostic(format_args!(
+                        "Type `{special_form}` expected no type parameter",
+                    ));
+                }
+                Type::unknown()
+            }
+            SpecialFormType::TypingSelf
+            | SpecialFormType::TypeAlias
+            | SpecialFormType::TypedDict
+            | SpecialFormType::Unknown
+            | SpecialFormType::Any
+            | SpecialFormType::NamedTuple => {
+                self.infer_type_expression(arguments_slice);
+
+                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                    builder.into_diagnostic(format_args!(
+                        "Special form `{special_form}` expected no type parameter",
+                    ));
+                }
+                Type::unknown()
+            }
+            SpecialFormType::LiteralString => {
+                self.infer_type_expression(arguments_slice);
+
+                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                    let mut diag = builder.into_diagnostic(format_args!(
+                        "Type `{special_form}` expected no type parameter",
+                    ));
+                    diag.info("Did you mean to use `Literal[...]` instead?");
+                }
+                Type::unknown()
+            }
+            SpecialFormType::Type => self.infer_subclass_of_type_expression(arguments_slice),
+            SpecialFormType::Tuple => {
+                Type::tuple(self.infer_tuple_type_expression(arguments_slice))
+            }
+            SpecialFormType::Generic | SpecialFormType::Protocol => {
+                self.infer_expression(arguments_slice, TypeContext::default());
+                if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, subscript) {
+                    builder.into_diagnostic(format_args!(
+                        "`{special_form}` is not allowed in type expressions",
+                    ));
+                }
+                Type::unknown()
+            }
+        }
+    }
+
+    fn infer_literal_parameter_type<'param>(
+        &mut self,
+        parameters: &'param ast::Expr,
+    ) -> Result<Type<'db>, Vec<&'param ast::Expr>> {
+        Ok(match parameters {
+            // TODO handle type aliases
+            ast::Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
+                let value_ty = self.infer_expression(value, TypeContext::default());
+                if matches!(value_ty, Type::SpecialForm(SpecialFormType::Literal)) {
+                    let ty = self.infer_literal_parameter_type(slice)?;
+
+                    // This branch deals with annotations such as `Literal[Literal[1]]`.
+                    // Here, we store the type for the inner `Literal[1]` expression:
+                    self.store_expression_type(parameters, ty);
+                    ty
+                } else {
+                    self.infer_expression(slice, TypeContext::default());
+                    self.store_expression_type(parameters, Type::unknown());
+
+                    return Err(vec![parameters]);
+                }
+            }
+            ast::Expr::Tuple(tuple) if !tuple.parenthesized => {
+                let mut errors = vec![];
+                let mut builder = UnionBuilder::new(self.db());
+                for elt in tuple {
+                    match self.infer_literal_parameter_type(elt) {
+                        Ok(ty) => {
+                            builder = builder.add(ty);
+                        }
+                        Err(nodes) => {
+                            errors.extend(nodes);
+                        }
+                    }
+                }
+                if errors.is_empty() {
+                    let union_type = builder.build();
+
+                    // This branch deals with annotations such as `Literal[1, 2]`. Here, we
+                    // store the type for the inner `1, 2` tuple-expression:
+                    self.store_expression_type(parameters, union_type);
+
+                    union_type
+                } else {
+                    self.store_expression_type(parameters, Type::unknown());
+
+                    return Err(errors);
+                }
+            }
+
+            literal @ (ast::Expr::StringLiteral(_)
+            | ast::Expr::BytesLiteral(_)
+            | ast::Expr::BooleanLiteral(_)
+            | ast::Expr::NoneLiteral(_)) => self.infer_expression(literal, TypeContext::default()),
+            literal @ ast::Expr::NumberLiteral(number) if number.value.is_int() => {
+                self.infer_expression(literal, TypeContext::default())
+            }
+            // For enum values
+            ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
+                let value_ty = self.infer_expression(value, TypeContext::default());
+
+                if is_enum_class(self.db(), value_ty) {
+                    let ty = value_ty
+                        .member(self.db(), &attr.id)
+                        .place
+                        .ignore_possibly_undefined()
+                        .unwrap_or(Type::unknown());
+                    self.store_expression_type(parameters, ty);
+                    ty
+                } else {
+                    self.store_expression_type(parameters, Type::unknown());
+                    if value_ty.is_todo() {
+                        value_ty
+                    } else {
+                        return Err(vec![parameters]);
+                    }
+                }
+            }
+            // for negative and positive numbers
+            ast::Expr::UnaryOp(u)
+                if matches!(u.op, ast::UnaryOp::USub | ast::UnaryOp::UAdd)
+                    && u.operand.is_number_literal_expr() =>
+            {
+                let ty = self.infer_unary_expression(u);
+                self.store_expression_type(parameters, ty);
+                ty
+            }
+            _ => {
+                self.infer_expression(parameters, TypeContext::default());
+                return Err(vec![parameters]);
+            }
+        })
+    }
+
+    /// Infer the first argument to a `typing.Callable` type expression and returns the
+    /// corresponding [`Parameters`].
+    ///
+    /// It returns `None` if the argument is invalid i.e., not a list of types, parameter
+    /// specification, `typing.Concatenate`, or `...`.
+    fn infer_callable_parameter_types(
+        &mut self,
+        parameters: &ast::Expr,
+    ) -> Option<Parameters<'db>> {
+        match parameters {
+            ast::Expr::EllipsisLiteral(ast::ExprEllipsisLiteral { .. }) => {
+                return Some(Parameters::gradual_form());
+            }
+            ast::Expr::List(ast::ExprList { elts: params, .. }) => {
+                let mut parameter_types = Vec::with_capacity(params.len());
+
+                // Whether to infer `Todo` for the parameters
+                let mut return_todo = false;
+
+                for param in params {
+                    let param_type = self.infer_type_expression(param);
+                    // This is similar to what we currently do for inferring tuple type expression.
+                    // We currently infer `Todo` for the parameters to avoid invalid diagnostics
+                    // when trying to check for assignability or any other relation. For example,
+                    // `*tuple[int, str]`, `Unpack[]`, etc. are not yet supported.
+                    return_todo |= param_type.is_todo()
+                        && matches!(param, ast::Expr::Starred(_) | ast::Expr::Subscript(_));
+                    parameter_types.push(param_type);
+                }
+
+                return Some(if return_todo {
+                    // TODO: `Unpack`
+                    Parameters::todo()
+                } else {
+                    Parameters::new(parameter_types.iter().map(|param_type| {
+                        Parameter::positional_only(None).with_annotated_type(*param_type)
+                    }))
+                });
+            }
+            ast::Expr::Subscript(subscript) => {
+                let value_ty = self.infer_expression(&subscript.value, TypeContext::default());
+                self.infer_subscript_type_expression(subscript, value_ty);
+                // TODO: Support `Concatenate[...]`
+                return Some(Parameters::todo());
+            }
+            ast::Expr::Name(name) => {
+                if name.is_invalid() {
+                    // This is a special case to avoid raising the error suggesting what the first
+                    // argument should be. This only happens when there's already a syntax error like
+                    // `Callable[]`.
+                    return None;
+                }
+                if any_over_type(
+                    self.db(),
+                    self.infer_name_load(name),
+                    &|ty| match ty {
+                        Type::Dynamic(DynamicType::TodoPEP695ParamSpec) => true,
+                        Type::NominalInstance(nominal) => {
+                            nominal.has_known_class(self.db(), KnownClass::ParamSpec)
+                        }
+                        _ => false,
+                    },
+                    true,
+                ) {
+                    return Some(Parameters::todo());
+                }
+            }
+            _ => {}
+        }
+        if let Some(builder) = self.context.report_lint(&INVALID_TYPE_FORM, parameters) {
+            let diag = builder.into_diagnostic(format_args!(
+                "The first argument to `Callable` must be either a list of types, \
+                ParamSpec, Concatenate, or `...`",
+            ));
+            diagnostic::add_type_expression_reference_link(diag);
+        }
+        None
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/infer/tests.rs b/crates/ty_python_semantic/src/types/infer/tests.rs
new file mode 100644
index 0000000000..9f6ae996be
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/infer/tests.rs
@@ -0,0 +1,745 @@
+use super::builder::TypeInferenceBuilder;
+use crate::db::tests::{TestDb, setup_db};
+use crate::place::symbol;
+use crate::place::{ConsideredDefinitions, Place, global_symbol};
+use crate::semantic_index::definition::Definition;
+use crate::semantic_index::scope::FileScopeId;
+use crate::semantic_index::{global_scope, place_table, semantic_index, use_def_map};
+use crate::types::{KnownClass, KnownInstanceType, check_types};
+use ruff_db::diagnostic::Diagnostic;
+use ruff_db::files::{File, system_path_to_file};
+use ruff_db::system::DbWithWritableSystem as _;
+use ruff_db::testing::{assert_function_query_was_not_run, assert_function_query_was_run};
+
+use super::*;
+
+#[track_caller]
+fn get_symbol<'db>(
+    db: &'db TestDb,
+    file_name: &str,
+    scopes: &[&str],
+    symbol_name: &str,
+) -> Place<'db> {
+    let file = system_path_to_file(db, file_name).expect("file to exist");
+    let module = parsed_module(db, file).load(db);
+    let index = semantic_index(db, file);
+    let mut file_scope_id = FileScopeId::global();
+    let mut scope = file_scope_id.to_scope_id(db, file);
+    for expected_scope_name in scopes {
+        file_scope_id = index
+            .child_scopes(file_scope_id)
+            .next()
+            .unwrap_or_else(|| panic!("scope of {expected_scope_name}"))
+            .0;
+        scope = file_scope_id.to_scope_id(db, file);
+        assert_eq!(scope.name(db, &module), *expected_scope_name);
+    }
+
+    symbol(db, scope, symbol_name, ConsideredDefinitions::EndOfScope).place
+}
+
+#[track_caller]
+fn assert_diagnostic_messages(diagnostics: &[Diagnostic], expected: &[&str]) {
+    let messages: Vec<&str> = diagnostics
+        .iter()
+        .map(Diagnostic::primary_message)
+        .collect();
+    assert_eq!(&messages, expected);
+}
+
+#[track_caller]
+fn assert_file_diagnostics(db: &TestDb, filename: &str, expected: &[&str]) {
+    let file = system_path_to_file(db, filename).unwrap();
+    let diagnostics = check_types(db, file);
+
+    assert_diagnostic_messages(&diagnostics, expected);
+}
+
+#[test]
+fn not_literal_string() -> anyhow::Result<()> {
+    let mut db = setup_db();
+    let content = format!(
+        r#"
+            from typing_extensions import Literal, assert_type
+
+            assert_type(not "{y}", bool)
+            assert_type(not 10*"{y}", bool)
+            assert_type(not "{y}"*10, bool)
+            assert_type(not 0*"{y}", Literal[True])
+            assert_type(not (-100)*"{y}", Literal[True])
+            "#,
+        y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
+    );
+    db.write_dedented("src/a.py", &content)?;
+
+    assert_file_diagnostics(&db, "src/a.py", &[]);
+
+    Ok(())
+}
+
+#[test]
+fn multiplied_string() -> anyhow::Result<()> {
+    let mut db = setup_db();
+    let content = format!(
+        r#"
+            from typing_extensions import Literal, LiteralString, assert_type
+
+            assert_type(2 * "hello", Literal["hellohello"])
+            assert_type("goodbye" * 3, Literal["goodbyegoodbyegoodbye"])
+            assert_type("a" * {y}, Literal["{a_repeated}"])
+            assert_type({z} * "b", LiteralString)
+            assert_type(0 * "hello", Literal[""])
+            assert_type(-3 * "hello", Literal[""])
+            "#,
+        y = TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE,
+        z = TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1,
+        a_repeated = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE),
+    );
+    db.write_dedented("src/a.py", &content)?;
+
+    assert_file_diagnostics(&db, "src/a.py", &[]);
+
+    Ok(())
+}
+
+#[test]
+fn multiplied_literal_string() -> anyhow::Result<()> {
+    let mut db = setup_db();
+    let content = format!(
+        r#"
+            from typing_extensions import Literal, LiteralString, assert_type
+
+            assert_type("{y}", LiteralString)
+            assert_type(10*"{y}", LiteralString)
+            assert_type("{y}"*10, LiteralString)
+            assert_type(0*"{y}", Literal[""])
+            assert_type((-100)*"{y}", Literal[""])
+            "#,
+        y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
+    );
+    db.write_dedented("src/a.py", &content)?;
+
+    assert_file_diagnostics(&db, "src/a.py", &[]);
+
+    Ok(())
+}
+
+#[test]
+fn truncated_string_literals_become_literal_string() -> anyhow::Result<()> {
+    let mut db = setup_db();
+    let content = format!(
+        r#"
+            from typing_extensions import LiteralString, assert_type
+
+            assert_type("{y}", LiteralString)
+            assert_type("a" + "{z}", LiteralString)
+            "#,
+        y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
+        z = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE),
+    );
+    db.write_dedented("src/a.py", &content)?;
+
+    assert_file_diagnostics(&db, "src/a.py", &[]);
+
+    Ok(())
+}
+
+#[test]
+fn adding_string_literals_and_literal_string() -> anyhow::Result<()> {
+    let mut db = setup_db();
+    let content = format!(
+        r#"
+            from typing_extensions import LiteralString, assert_type
+
+            assert_type("{y}", LiteralString)
+            assert_type("{y}" + "a", LiteralString)
+            assert_type("a" + "{y}", LiteralString)
+            assert_type("{y}" + "{y}", LiteralString)
+            "#,
+        y = "a".repeat(TypeInferenceBuilder::MAX_STRING_LITERAL_SIZE + 1),
+    );
+    db.write_dedented("src/a.py", &content)?;
+
+    assert_file_diagnostics(&db, "src/a.py", &[]);
+
+    Ok(())
+}
+
+#[test]
+fn pep695_type_params() {
+    let mut db = setup_db();
+
+    db.write_dedented(
+        "src/a.py",
+        "
+            def f[T, U: A, V: (A, B), W = A, X: A = A1, Y: (int,)]():
+                pass
+
+            class A: ...
+            class B: ...
+            class A1(A): ...
+            ",
+    )
+    .unwrap();
+
+    let check_typevar = |var: &'static str,
+                         display: &'static str,
+                         upper_bound: Option<&'static str>,
+                         constraints: Option<&[&'static str]>,
+                         default: Option<&'static str>| {
+        let var_ty = get_symbol(&db, "src/a.py", &["f"], var).expect_type();
+        assert_eq!(var_ty.display(&db).to_string(), display);
+
+        let expected_name_ty = format!(r#"Literal["{var}"]"#);
+        let name_ty = var_ty.member(&db, "__name__").place.expect_type();
+        assert_eq!(name_ty.display(&db).to_string(), expected_name_ty);
+
+        let Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) = var_ty else {
+            panic!("expected TypeVar");
+        };
+
+        assert_eq!(
+            typevar
+                .upper_bound(&db)
+                .map(|ty| ty.display(&db).to_string()),
+            upper_bound.map(std::borrow::ToOwned::to_owned)
+        );
+        assert_eq!(
+            typevar.constraints(&db).map(|tys| tys
+                .iter()
+                .map(|ty| ty.display(&db).to_string())
+                .collect::<Vec<_>>()),
+            constraints.map(|strings| strings
+                .iter()
+                .map(std::string::ToString::to_string)
+                .collect::<Vec<_>>())
+        );
+        assert_eq!(
+            typevar
+                .default_type(&db)
+                .map(|ty| ty.display(&db).to_string()),
+            default.map(std::borrow::ToOwned::to_owned)
+        );
+    };
+
+    check_typevar("T", "typing.TypeVar", None, None, None);
+    check_typevar("U", "typing.TypeVar", Some("A"), None, None);
+    check_typevar("V", "typing.TypeVar", None, Some(&["A", "B"]), None);
+    check_typevar("W", "typing.TypeVar", None, None, Some("A"));
+    check_typevar("X", "typing.TypeVar", Some("A"), None, Some("A1"));
+
+    // a typevar with less than two constraints is treated as unconstrained
+    check_typevar("Y", "typing.TypeVar", None, None, None);
+}
+
+/// Test that a symbol known to be unbound in a scope does not still trigger cycle-causing
+/// reachability-constraint checks in that scope.
+#[test]
+fn unbound_symbol_no_reachability_constraint_check() {
+    let mut db = setup_db();
+
+    // First, type-check a random other file so that we cache a result for the `module_type_symbols`
+    // query (which often encounters cycles due to `types.pyi` importing `typing_extensions` and
+    // `typing_extensions.pyi` importing `types`). Clear the events afterwards so that unrelated
+    // cycles from that query don't interfere with our test.
+    db.write_dedented("src/wherever.py", "print(x)").unwrap();
+    assert_file_diagnostics(&db, "src/wherever.py", &["Name `x` used when not defined"]);
+    db.clear_salsa_events();
+
+    // If the bug we are testing for is not fixed, what happens is that when inferring the
+    // `flag: bool = True` definitions, we look up `bool` as a deferred name (thus from end of
+    // scope), and because of the early return its "unbound" binding has a reachability
+    // constraint of `~flag`, which we evaluate, meaning we have to evaluate the definition of
+    // `flag` -- and we are in a cycle. With the fix, we short-circuit evaluating reachability
+    // constraints on "unbound" if a symbol is otherwise not bound.
+    db.write_dedented(
+        "src/a.py",
+        "
+            from __future__ import annotations
+
+            def f():
+                flag: bool = True
+                if flag:
+                    return True
+            ",
+    )
+    .unwrap();
+
+    db.clear_salsa_events();
+    assert_file_diagnostics(&db, "src/a.py", &[]);
+    let events = db.take_salsa_events();
+    let cycles = salsa::attach(&db, || {
+        events
+            .iter()
+            .filter_map(|event| {
+                if let salsa::EventKind::WillIterateCycle { database_key, .. } = event.kind {
+                    Some(format!("{database_key:?}"))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>()
+    });
+    let expected: Vec<String> = vec![];
+    assert_eq!(cycles, expected);
+}
+
+// Incremental inference tests
+#[track_caller]
+fn first_public_binding<'db>(db: &'db TestDb, file: File, name: &str) -> Definition<'db> {
+    let scope = global_scope(db, file);
+    use_def_map(db, scope)
+        .end_of_scope_symbol_bindings(place_table(db, scope).symbol_id(name).unwrap())
+        .find_map(|b| b.binding.definition())
+        .expect("no binding found")
+}
+
+#[test]
+fn dependency_public_symbol_type_change() -> anyhow::Result<()> {
+    let mut db = setup_db();
+
+    db.write_files([
+        ("/src/a.py", "from foo import x"),
+        ("/src/foo.py", "x: int = 10\ndef foo(): ..."),
+    ])?;
+
+    let a = system_path_to_file(&db, "/src/a.py").unwrap();
+    let x_ty = global_symbol(&db, a, "x").place.expect_type();
+
+    assert_eq!(x_ty.display(&db).to_string(), "int");
+
+    // Change `x` to a different value
+    db.write_file("/src/foo.py", "x: bool = True\ndef foo(): ...")?;
+
+    let a = system_path_to_file(&db, "/src/a.py").unwrap();
+
+    let x_ty_2 = global_symbol(&db, a, "x").place.expect_type();
+
+    assert_eq!(x_ty_2.display(&db).to_string(), "bool");
+
+    Ok(())
+}
+
+#[test]
+fn dependency_internal_symbol_change() -> anyhow::Result<()> {
+    let mut db = setup_db();
+
+    db.write_files([
+        ("/src/a.py", "from foo import x"),
+        ("/src/foo.py", "x: int = 10\ndef foo(): y = 1"),
+    ])?;
+
+    let a = system_path_to_file(&db, "/src/a.py").unwrap();
+    let x_ty = global_symbol(&db, a, "x").place.expect_type();
+
+    assert_eq!(x_ty.display(&db).to_string(), "int");
+
+    db.write_file("/src/foo.py", "x: int = 10\ndef foo(): pass")?;
+
+    let a = system_path_to_file(&db, "/src/a.py").unwrap();
+
+    db.clear_salsa_events();
+
+    let x_ty_2 = global_symbol(&db, a, "x").place.expect_type();
+
+    assert_eq!(x_ty_2.display(&db).to_string(), "int");
+
+    let events = db.take_salsa_events();
+
+    assert_function_query_was_not_run(
+        &db,
+        infer_definition_types,
+        first_public_binding(&db, a, "x"),
+        &events,
+    );
+
+    Ok(())
+}
+
+#[test]
+fn dependency_unrelated_symbol() -> anyhow::Result<()> {
+    let mut db = setup_db();
+
+    db.write_files([
+        ("/src/a.py", "from foo import x"),
+        ("/src/foo.py", "x: int = 10\ny: bool = True"),
+    ])?;
+
+    let a = system_path_to_file(&db, "/src/a.py").unwrap();
+    let x_ty = global_symbol(&db, a, "x").place.expect_type();
+
+    assert_eq!(x_ty.display(&db).to_string(), "int");
+
+    db.write_file("/src/foo.py", "x: int = 10\ny: bool = False")?;
+
+    let a = system_path_to_file(&db, "/src/a.py").unwrap();
+
+    db.clear_salsa_events();
+
+    let x_ty_2 = global_symbol(&db, a, "x").place.expect_type();
+
+    assert_eq!(x_ty_2.display(&db).to_string(), "int");
+
+    let events = db.take_salsa_events();
+
+    assert_function_query_was_not_run(
+        &db,
+        infer_definition_types,
+        first_public_binding(&db, a, "x"),
+        &events,
+    );
+    Ok(())
+}
+
+#[test]
+fn dependency_implicit_instance_attribute() -> anyhow::Result<()> {
+    fn x_rhs_expression(db: &TestDb) -> Expression<'_> {
+        let file_main = system_path_to_file(db, "/src/main.py").unwrap();
+        let ast = parsed_module(db, file_main).load(db);
+        // Get the second statement in `main.py` (x = …) and extract the expression
+        // node on the right-hand side:
+        let x_rhs_node = &ast.syntax().body[1].as_assign_stmt().unwrap().value;
+
+        let index = semantic_index(db, file_main);
+        index.expression(x_rhs_node.as_ref())
+    }
+
+    let mut db = setup_db();
+
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            def f(self):
+                self.attr: int | None = None
+        "#,
+    )?;
+    db.write_dedented(
+        "/src/main.py",
+        r#"
+        from mod import C
+        # multiple targets ensures RHS is a standalone expression, relied on by this test
+        x = y = C().attr
+        "#,
+    )?;
+
+    let file_main = system_path_to_file(&db, "/src/main.py").unwrap();
+    let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+    assert_eq!(attr_ty.display(&db).to_string(), "int | None");
+
+    // Change the type of `attr` to `str | None`; this should trigger the type of `x` to be re-inferred
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            def f(self):
+                self.attr: str | None = None
+        "#,
+    )?;
+
+    let events = {
+        db.clear_salsa_events();
+        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+        assert_eq!(attr_ty.display(&db).to_string(), "str | None");
+        db.take_salsa_events()
+    };
+    assert_function_query_was_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(x_rhs_expression(&db)),
+        &events,
+    );
+
+    // Add a comment; this should not trigger the type of `x` to be re-inferred
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            def f(self):
+                # a comment!
+                self.attr: str | None = None
+        "#,
+    )?;
+
+    let events = {
+        db.clear_salsa_events();
+        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+        assert_eq!(attr_ty.display(&db).to_string(), "str | None");
+        db.take_salsa_events()
+    };
+
+    assert_function_query_was_not_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(x_rhs_expression(&db)),
+        &events,
+    );
+
+    Ok(())
+}
+
+/// This test verifies that changing a class's declaration in a non-meaningful way (e.g. by adding a comment)
+/// doesn't trigger type inference for expressions that depend on the class's members.
+#[test]
+fn dependency_own_instance_member() -> anyhow::Result<()> {
+    fn x_rhs_expression(db: &TestDb) -> Expression<'_> {
+        let file_main = system_path_to_file(db, "/src/main.py").unwrap();
+        let ast = parsed_module(db, file_main).load(db);
+        // Get the second statement in `main.py` (x = …) and extract the expression
+        // node on the right-hand side:
+        let x_rhs_node = &ast.syntax().body[1].as_assign_stmt().unwrap().value;
+
+        let index = semantic_index(db, file_main);
+        index.expression(x_rhs_node.as_ref())
+    }
+
+    let mut db = setup_db();
+
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            if random.choice([True, False]):
+                attr: int = 42
+            else:
+                attr: None = None
+        "#,
+    )?;
+    db.write_dedented(
+        "/src/main.py",
+        r#"
+        from mod import C
+        # multiple targets ensures RHS is a standalone expression, relied on by this test
+        x = y = C().attr
+        "#,
+    )?;
+
+    let file_main = system_path_to_file(&db, "/src/main.py").unwrap();
+    let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+    assert_eq!(attr_ty.display(&db).to_string(), "int | None");
+
+    // Change the type of `attr` to `str | None`; this should trigger the type of `x` to be re-inferred
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            if random.choice([True, False]):
+                attr: str = "42"
+            else:
+                attr: None = None
+        "#,
+    )?;
+
+    let events = {
+        db.clear_salsa_events();
+        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+        assert_eq!(attr_ty.display(&db).to_string(), "str | None");
+        db.take_salsa_events()
+    };
+    assert_function_query_was_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(x_rhs_expression(&db)),
+        &events,
+    );
+
+    // Add a comment; this should not trigger the type of `x` to be re-inferred
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            # comment
+            if random.choice([True, False]):
+                attr: str = "42"
+            else:
+                attr: None = None
+        "#,
+    )?;
+
+    let events = {
+        db.clear_salsa_events();
+        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+        assert_eq!(attr_ty.display(&db).to_string(), "str | None");
+        db.take_salsa_events()
+    };
+
+    assert_function_query_was_not_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(x_rhs_expression(&db)),
+        &events,
+    );
+
+    Ok(())
+}
+
+#[test]
+fn dependency_implicit_class_member() -> anyhow::Result<()> {
+    fn x_rhs_expression(db: &TestDb) -> Expression<'_> {
+        let file_main = system_path_to_file(db, "/src/main.py").unwrap();
+        let ast = parsed_module(db, file_main).load(db);
+        // Get the third statement in `main.py` (x = …) and extract the expression
+        // node on the right-hand side:
+        let x_rhs_node = &ast.syntax().body[2].as_assign_stmt().unwrap().value;
+
+        let index = semantic_index(db, file_main);
+        index.expression(x_rhs_node.as_ref())
+    }
+
+    let mut db = setup_db();
+
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            def __init__(self):
+                self.instance_attr: str = "24"
+
+            @classmethod
+            def method(cls):
+                cls.class_attr: int = 42
+        "#,
+    )?;
+    db.write_dedented(
+        "/src/main.py",
+        r#"
+        from mod import C
+        C.method()
+        # multiple targets ensures RHS is a standalone expression, relied on by this test
+        x = y = C().class_attr
+        "#,
+    )?;
+
+    let file_main = system_path_to_file(&db, "/src/main.py").unwrap();
+    let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+    assert_eq!(attr_ty.display(&db).to_string(), "int");
+
+    // Change the type of `class_attr` to `str`; this should trigger the type of `x` to be re-inferred
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            def __init__(self):
+                self.instance_attr: str = "24"
+
+            @classmethod
+            def method(cls):
+                cls.class_attr: str = "42"
+        "#,
+    )?;
+
+    let events = {
+        db.clear_salsa_events();
+        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+        assert_eq!(attr_ty.display(&db).to_string(), "str");
+        db.take_salsa_events()
+    };
+    assert_function_query_was_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(x_rhs_expression(&db)),
+        &events,
+    );
+
+    // Add a comment; this should not trigger the type of `x` to be re-inferred
+    db.write_dedented(
+        "/src/mod.py",
+        r#"
+        class C:
+            def __init__(self):
+                self.instance_attr: str = "24"
+
+            @classmethod
+            def method(cls):
+                # comment
+                cls.class_attr: str = "42"
+        "#,
+    )?;
+
+    let events = {
+        db.clear_salsa_events();
+        let attr_ty = global_symbol(&db, file_main, "x").place.expect_type();
+        assert_eq!(attr_ty.display(&db).to_string(), "str");
+        db.take_salsa_events()
+    };
+
+    assert_function_query_was_not_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(x_rhs_expression(&db)),
+        &events,
+    );
+
+    Ok(())
+}
+
+/// Inferring the result of a call-expression shouldn't need to re-run after
+/// a trivial change to the function's file (e.g. by adding a docstring to the function).
+#[test]
+fn call_type_doesnt_rerun_when_only_callee_changed() -> anyhow::Result<()> {
+    let mut db = setup_db();
+
+    db.write_dedented(
+        "src/foo.py",
+        r#"
+        def foo() -> int:
+            return 5
+    "#,
+    )?;
+    db.write_dedented(
+        "src/bar.py",
+        r#"
+        from foo import foo
+
+        # multiple targets ensures RHS is a standalone expression, relied on by this test
+        a = b = foo()
+        "#,
+    )?;
+
+    let bar = system_path_to_file(&db, "src/bar.py")?;
+    let a = global_symbol(&db, bar, "a").place;
+
+    assert_eq!(a.expect_type(), KnownClass::Int.to_instance(&db));
+    let events = db.take_salsa_events();
+
+    let module = parsed_module(&db, bar).load(&db);
+    let call = &*module.syntax().body[1].as_assign_stmt().unwrap().value;
+    let foo_call = semantic_index(&db, bar).expression(call);
+
+    assert_function_query_was_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(foo_call),
+        &events,
+    );
+
+    // Add a docstring to foo to trigger a re-run.
+    // The bar-call site of foo should not be re-run because of that
+    db.write_dedented(
+        "src/foo.py",
+        r#"
+        def foo() -> int:
+            "Computes a value"
+            return 5
+        "#,
+    )?;
+    db.clear_salsa_events();
+
+    let a = global_symbol(&db, bar, "a").place;
+
+    assert_eq!(a.expect_type(), KnownClass::Int.to_instance(&db));
+    let events = db.take_salsa_events();
+
+    let module = parsed_module(&db, bar).load(&db);
+    let call = &*module.syntax().body[1].as_assign_stmt().unwrap().value;
+    let foo_call = semantic_index(&db, bar).expression(call);
+
+    assert_function_query_was_not_run(
+        &db,
+        infer_expression_types_impl,
+        InferExpression::Bare(foo_call),
+        &events,
+    );
+
+    Ok(())
+}
diff --git a/crates/ty_python_semantic/src/types/instance.rs b/crates/ty_python_semantic/src/types/instance.rs
index eb6978af22..c8aa42d726 100644
--- a/crates/ty_python_semantic/src/types/instance.rs
+++ b/crates/ty_python_semantic/src/types/instance.rs
@@ -7,23 +7,35 @@ use super::protocol_class::ProtocolInterface;
 use super::{BoundTypeVarInstance, ClassType, KnownClass, SubclassOfType, Type, TypeVarVariance};
 use crate::place::PlaceAndQualifiers;
 use crate::semantic_index::definition::Definition;
+use crate::types::constraints::{ConstraintSet, IteratorConstraintsExtension};
 use crate::types::enums::is_single_member_enum;
+use crate::types::generics::{InferableTypeVars, walk_specialization};
 use crate::types::protocol_class::walk_protocol_interface;
 use crate::types::tuple::{TupleSpec, TupleType};
 use crate::types::{
-    ApplyTypeMappingVisitor, ClassBase, DynamicType, HasRelationToVisitor, IsDisjointVisitor,
-    NormalizedVisitor, TypeMapping, TypeRelation, TypeTransformer, VarianceInferable,
+    ApplyTypeMappingVisitor, ClassBase, ClassLiteral, FindLegacyTypeVarsVisitor,
+    HasRelationToVisitor, IsDisjointVisitor, IsEquivalentVisitor, NormalizedVisitor, TypeContext,
+    TypeMapping, TypeRelation, VarianceInferable,
 };
 use crate::{Db, FxOrderSet};
 
 pub(super) use synthesized_protocol::SynthesizedProtocolType;
 
 impl<'db> Type<'db> {
+    pub(crate) const fn object() -> Self {
+        Type::NominalInstance(NominalInstanceType(NominalInstanceInner::Object))
+    }
+
+    pub(crate) const fn is_object(&self) -> bool {
+        matches!(
+            self,
+            Type::NominalInstance(NominalInstanceType(NominalInstanceInner::Object))
+        )
+    }
+
     pub(crate) fn instance(db: &'db dyn Db, class: ClassType<'db>) -> Self {
         let (class_literal, specialization) = class.class_literal(db);
-
         match class_literal.known(db) {
-            Some(KnownClass::Any) => Type::Dynamic(DynamicType::Any),
             Some(KnownClass::Tuple) => Type::tuple(TupleType::new(
                 db,
                 specialization
@@ -31,11 +43,14 @@ impl<'db> Type<'db> {
                     .unwrap_or_else(|| Cow::Owned(TupleSpec::homogeneous(Type::unknown())))
                     .as_ref(),
             )),
+            Some(KnownClass::Object) => Type::object(),
             _ if class_literal.is_protocol(db) => {
                 Self::ProtocolInstance(ProtocolInstanceType::from_class(class))
             }
             _ if class_literal.is_typed_dict(db) => Type::typed_dict(class),
-            _ => Type::non_tuple_instance(class),
+            // We don't call non_tuple_instance here because we've already checked that the class
+            // is not `object`
+            _ => Type::NominalInstance(NominalInstanceType(NominalInstanceInner::NonTuple(class))),
         }
     }
 
@@ -57,7 +72,10 @@ impl<'db> Type<'db> {
     {
         Type::tuple(TupleType::heterogeneous(
             db,
-            elements.into_iter().map(Into::into),
+            elements
+                .into_iter()
+                .map(Into::into)
+                .map(|element| element.fallback_to_divergent(db)),
         ))
     }
 
@@ -70,12 +88,6 @@ impl<'db> Type<'db> {
         Type::NominalInstance(NominalInstanceType(NominalInstanceInner::ExactTuple(tuple)))
     }
 
-    /// **Private** helper function to create a `Type::NominalInstance` from a class that
-    /// is known not to be `Any`, a protocol class, or a typed dict class.
-    fn non_tuple_instance(class: ClassType<'db>) -> Self {
-        Type::NominalInstance(NominalInstanceType(NominalInstanceInner::NonTuple(class)))
-    }
-
     pub(crate) const fn into_nominal_instance(self) -> Option<NominalInstanceType<'db>> {
         match self {
             Type::NominalInstance(instance_type) => Some(instance_type),
@@ -92,7 +104,7 @@ impl<'db> Type<'db> {
             SynthesizedProtocolType::new(
                 db,
                 ProtocolInterface::with_property_members(db, members),
-                &TypeTransformer::default(),
+                &NormalizedVisitor::default(),
             ),
         ))
     }
@@ -102,13 +114,67 @@ impl<'db> Type<'db> {
         self,
         db: &'db dyn Db,
         protocol: ProtocolInstanceType<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-    ) -> bool {
-        protocol
-            .inner
-            .interface(db)
-            .members(db)
-            .all(|member| member.is_satisfied_by(db, self, relation))
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        let structurally_satisfied = if let Type::ProtocolInstance(self_protocol) = self {
+            self_protocol.interface(db).has_relation_to_impl(
+                db,
+                protocol.interface(db),
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            )
+        } else {
+            protocol
+                .inner
+                .interface(db)
+                .members(db)
+                .when_all(db, |member| {
+                    member.is_satisfied_by(
+                        db,
+                        self,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
+        };
+
+        // Even if `self` does not satisfy the protocol from a structural perspective,
+        // we may still need to consider it as satisfying the protocol if `protocol` is
+        // a class-based protocol and `self` has the protocol class in its MRO.
+        //
+        // This matches the behaviour of other type checkers, and is required for us to
+        // recognise `str` as a subtype of `Container[str]`.
+        structurally_satisfied.or(db, || {
+            let Some(nominal_instance) = protocol.as_nominal_type() else {
+                return ConstraintSet::from(false);
+            };
+
+            // if `self` and `other` are *both* protocols, we also need to treat `self` as if it
+            // were a nominal type, or we won't consider a protocol `P` that explicitly inherits
+            // from a protocol `Q` to be a subtype of `Q` to be a subtype of `Q` if it overrides
+            // `Q`'s members in a Liskov-incompatible way.
+            let type_to_test = self
+                .as_protocol_instance()
+                .and_then(ProtocolInstanceType::as_nominal_type)
+                .map(Type::NominalInstance)
+                .unwrap_or(self);
+
+            type_to_test.has_relation_to_impl(
+                db,
+                Type::NominalInstance(nominal_instance),
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            )
+        })
     }
 }
 
@@ -133,9 +199,42 @@ impl<'db> NominalInstanceType<'db> {
         match self.0 {
             NominalInstanceInner::ExactTuple(tuple) => tuple.to_class_type(db),
             NominalInstanceInner::NonTuple(class) => class,
+            NominalInstanceInner::Object => KnownClass::Object
+                .try_to_class_literal(db)
+                .expect("Typeshed should always have a `object` class in `builtins.pyi`")
+                .default_specialization(db),
         }
     }
 
+    pub(super) fn class_literal(&self, db: &'db dyn Db) -> ClassLiteral<'db> {
+        let class = match self.0 {
+            NominalInstanceInner::ExactTuple(tuple) => tuple.to_class_type(db),
+            NominalInstanceInner::NonTuple(class) => class,
+            NominalInstanceInner::Object => {
+                return KnownClass::Object
+                    .try_to_class_literal(db)
+                    .expect("Typeshed should always have a `object` class in `builtins.pyi`");
+            }
+        };
+        let (class_literal, _) = class.class_literal(db);
+        class_literal
+    }
+
+    /// Returns the [`KnownClass`] that this is a nominal instance of, or `None` if it is not an
+    /// instance of a known class.
+    pub(super) fn known_class(&self, db: &'db dyn Db) -> Option<KnownClass> {
+        match self.0 {
+            NominalInstanceInner::ExactTuple(_) => Some(KnownClass::Tuple),
+            NominalInstanceInner::NonTuple(class) => class.known(db),
+            NominalInstanceInner::Object => Some(KnownClass::Object),
+        }
+    }
+
+    /// Returns whether this is a nominal instance of a particular [`KnownClass`].
+    pub(super) fn has_known_class(&self, db: &'db dyn Db, known_class: KnownClass) -> bool {
+        self.known_class(db) == Some(known_class)
+    }
+
     /// If this is an instance type where the class has a tuple spec, returns the tuple spec.
     ///
     /// I.e., for the type `tuple[int, str]`, this will return the tuple spec `[int, str]`.
@@ -175,15 +274,13 @@ impl<'db> NominalInstanceType<'db> {
                         _ => None,
                     })
             }
+            NominalInstanceInner::Object => None,
         }
     }
 
     /// Return `true` if this type represents instances of the class `builtins.object`.
-    pub(super) fn is_object(self, db: &'db dyn Db) -> bool {
-        match self.0 {
-            NominalInstanceInner::ExactTuple(_) => false,
-            NominalInstanceInner::NonTuple(class) => class.is_object(db),
-        }
+    pub(super) const fn is_object(self) -> bool {
+        matches!(self.0, NominalInstanceInner::Object)
     }
 
     /// If this type is an *exact* tuple type (*not* a subclass of `tuple`), returns the
@@ -199,7 +296,7 @@ impl<'db> NominalInstanceType<'db> {
     pub(super) fn own_tuple_spec(&self, db: &'db dyn Db) -> Option<Cow<'db, TupleSpec<'db>>> {
         match self.0 {
             NominalInstanceInner::ExactTuple(tuple) => Some(Cow::Borrowed(tuple.tuple(db))),
-            NominalInstanceInner::NonTuple(_) => None,
+            NominalInstanceInner::NonTuple(_) | NominalInstanceInner::Object => None,
         }
     }
 
@@ -210,7 +307,7 @@ impl<'db> NominalInstanceType<'db> {
     /// integers or `None`.
     pub(crate) fn slice_literal(self, db: &'db dyn Db) -> Option<SliceLiteral> {
         let class = match self.0 {
-            NominalInstanceInner::ExactTuple(_) => return None,
+            NominalInstanceInner::ExactTuple(_) | NominalInstanceInner::Object => return None,
             NominalInstanceInner::NonTuple(class) => class,
         };
         let (class, Some(specialization)) = class.class_literal(db) else {
@@ -227,7 +324,7 @@ impl<'db> NominalInstanceType<'db> {
             Type::IntLiteral(n) => i32::try_from(*n).map(Some).ok(),
             Type::BooleanLiteral(b) => Some(Some(i32::from(*b))),
             Type::NominalInstance(instance)
-                if instance.class(db).is_known(db, KnownClass::NoneType) =>
+                if instance.has_known_class(db, KnownClass::NoneType) =>
             {
                 Some(None)
             }
@@ -249,18 +346,10 @@ impl<'db> NominalInstanceType<'db> {
             NominalInstanceInner::ExactTuple(tuple) => {
                 Type::tuple(tuple.normalized_impl(db, visitor))
             }
-            NominalInstanceInner::NonTuple(class) => {
-                Type::non_tuple_instance(class.normalized_impl(db, visitor))
-            }
-        }
-    }
-
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Type<'db> {
-        match self.0 {
-            NominalInstanceInner::ExactTuple(tuple) => Type::tuple(tuple.materialize(db, variance)),
-            NominalInstanceInner::NonTuple(class) => {
-                Type::non_tuple_instance(class.materialize(db, variance))
-            }
+            NominalInstanceInner::NonTuple(class) => Type::NominalInstance(NominalInstanceType(
+                NominalInstanceInner::NonTuple(class.normalized_impl(db, visitor)),
+            )),
+            NominalInstanceInner::Object => Type::object(),
         }
     }
 
@@ -268,30 +357,54 @@ impl<'db> NominalInstanceType<'db> {
         self,
         db: &'db dyn Db,
         other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self.0, other.0) {
+            (_, NominalInstanceInner::Object) => ConstraintSet::from(true),
             (
                 NominalInstanceInner::ExactTuple(tuple1),
                 NominalInstanceInner::ExactTuple(tuple2),
-            ) => tuple1.has_relation_to_impl(db, tuple2, relation, visitor),
-            _ => self
-                .class(db)
-                .has_relation_to_impl(db, other.class(db), relation, visitor),
+            ) => tuple1.has_relation_to_impl(
+                db,
+                tuple2,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
+            _ => self.class(db).has_relation_to_impl(
+                db,
+                other.class(db),
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
         }
     }
 
-    pub(super) fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
+    pub(super) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self.0, other.0) {
             (
                 NominalInstanceInner::ExactTuple(tuple1),
                 NominalInstanceInner::ExactTuple(tuple2),
-            ) => tuple1.is_equivalent_to(db, tuple2),
-            (NominalInstanceInner::NonTuple(class1), NominalInstanceInner::NonTuple(class2)) => {
-                class1.is_equivalent_to(db, class2)
+            ) => tuple1.is_equivalent_to_impl(db, tuple2, inferable, visitor),
+            (NominalInstanceInner::Object, NominalInstanceInner::Object) => {
+                ConstraintSet::from(true)
             }
-            _ => false,
+            (NominalInstanceInner::NonTuple(class1), NominalInstanceInner::NonTuple(class2)) => {
+                class1.is_equivalent_to_impl(db, class2, inferable, visitor)
+            }
+            _ => ConstraintSet::from(false),
         }
     }
 
@@ -299,18 +412,31 @@ impl<'db> NominalInstanceType<'db> {
         self,
         db: &'db dyn Db,
         other: Self,
-        visitor: &IsDisjointVisitor<'db>,
-    ) -> bool {
+        inferable: InferableTypeVars<'_, 'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+        relation_visitor: &HasRelationToVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        if self.is_object() || other.is_object() {
+            return ConstraintSet::from(false);
+        }
+        let mut result = ConstraintSet::from(false);
         if let Some(self_spec) = self.tuple_spec(db) {
             if let Some(other_spec) = other.tuple_spec(db) {
-                if self_spec.is_disjoint_from_impl(db, &other_spec, visitor) {
-                    return true;
+                let compatible = self_spec.is_disjoint_from_impl(
+                    db,
+                    &other_spec,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                );
+                if result.union(db, compatible).is_always_satisfied() {
+                    return result;
                 }
             }
         }
-        !self
-            .class(db)
-            .could_coexist_in_mro_with(db, other.class(db))
+        result.or(db, || {
+            ConstraintSet::from(!(self.class(db)).could_coexist_in_mro_with(db, other.class(db)))
+        })
     }
 
     pub(super) fn is_singleton(self, db: &'db dyn Db) -> bool {
@@ -320,7 +446,7 @@ impl<'db> NominalInstanceType<'db> {
             // should not be relied on for type narrowing, so we do not treat it as one.
             // See:
             // https://docs.python.org/3/reference/expressions.html#parenthesized-forms
-            NominalInstanceInner::ExactTuple(_) => false,
+            NominalInstanceInner::ExactTuple(_) | NominalInstanceInner::Object => false,
             NominalInstanceInner::NonTuple(class) => class
                 .known(db)
                 .map(KnownClass::is_singleton)
@@ -331,6 +457,7 @@ impl<'db> NominalInstanceType<'db> {
     pub(super) fn is_single_valued(self, db: &'db dyn Db) -> bool {
         match self.0 {
             NominalInstanceInner::ExactTuple(tuple) => tuple.is_single_valued(db),
+            NominalInstanceInner::Object => false,
             NominalInstanceInner::NonTuple(class) => class
                 .known(db)
                 .and_then(KnownClass::is_single_valued)
@@ -347,31 +474,37 @@ impl<'db> NominalInstanceType<'db> {
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Type<'db> {
         match self.0 {
             NominalInstanceInner::ExactTuple(tuple) => {
-                Type::tuple(tuple.apply_type_mapping_impl(db, type_mapping, visitor))
+                Type::tuple(tuple.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
             NominalInstanceInner::NonTuple(class) => {
-                Type::non_tuple_instance(class.apply_type_mapping_impl(db, type_mapping, visitor))
+                Type::NominalInstance(NominalInstanceType(NominalInstanceInner::NonTuple(
+                    class.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
+                )))
             }
+            NominalInstanceInner::Object => Type::object(),
         }
     }
 
-    pub(super) fn find_legacy_typevars(
+    pub(super) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self.0 {
             NominalInstanceInner::ExactTuple(tuple) => {
-                tuple.find_legacy_typevars(db, binding_context, typevars);
+                tuple.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
             NominalInstanceInner::NonTuple(class) => {
-                class.find_legacy_typevars(db, binding_context, typevars);
+                class.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
+            NominalInstanceInner::Object => {}
         }
     }
 }
@@ -387,6 +520,12 @@ impl<'db> From<NominalInstanceType<'db>> for Type<'db> {
 /// instances where it would be unnecessary (this is somewhat expensive!).
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, salsa::Update, get_size2::GetSize)]
 enum NominalInstanceInner<'db> {
+    /// An instance of `object`.
+    ///
+    /// We model it with a dedicated enum variant since its use as "the type of all values" is so
+    /// prevalent and foundational, and it's useful to be able to instantiate this without having
+    /// to load the definition of `object` from the typeshed.
+    Object,
     /// A tuple type, e.g. `tuple[int, str]`.
     ///
     /// Note that the type `tuple[int, str]` includes subtypes of `tuple[int, str]`,
@@ -431,7 +570,20 @@ pub(super) fn walk_protocol_instance_type<'db, V: super::visitor::TypeVisitor<'d
     protocol: ProtocolInstanceType<'db>,
     visitor: &V,
 ) {
-    walk_protocol_interface(db, protocol.inner.interface(db), visitor);
+    if visitor.should_visit_lazy_type_attributes() {
+        walk_protocol_interface(db, protocol.inner.interface(db), visitor);
+    } else {
+        match protocol.inner {
+            Protocol::FromClass(class) => {
+                if let Some(specialization) = class.class_literal(db).1 {
+                    walk_specialization(db, specialization, visitor);
+                }
+            }
+            Protocol::Synthesized(synthesized) => {
+                walk_protocol_interface(db, synthesized.interface(), visitor);
+            }
+        }
+    }
 }
 
 impl<'db> ProtocolInstanceType<'db> {
@@ -453,6 +605,20 @@ impl<'db> ProtocolInstanceType<'db> {
         }
     }
 
+    /// If this is a class-based protocol, convert the protocol-instance into a nominal instance.
+    ///
+    /// If this is a synthesized protocol that does not correspond to a class definition
+    /// in source code, return `None`. These are "pure" abstract types, that cannot be
+    /// treated in a nominal way.
+    pub(super) fn as_nominal_type(self) -> Option<NominalInstanceType<'db>> {
+        match self.inner {
+            Protocol::FromClass(class) => {
+                Some(NominalInstanceType(NominalInstanceInner::NonTuple(class)))
+            }
+            Protocol::Synthesized(_) => None,
+        }
+    }
+
     /// Return the meta-type of this protocol-instance type.
     pub(super) fn to_meta_type(self, db: &'db dyn Db) -> Type<'db> {
         match self.inner {
@@ -475,11 +641,39 @@ impl<'db> ProtocolInstanceType<'db> {
         }
     }
 
+    /// Return `true` if this protocol is a supertype of `object`.
+    ///
+    /// This indicates that the protocol represents the same set of possible runtime objects
+    /// as `object` (since `object` is the universal set of *all* possible runtime objects!).
+    /// Such a protocol is therefore an equivalent type to `object`, which would in fact be
+    /// normalised to `object`.
+    pub(super) fn is_equivalent_to_object(self, db: &'db dyn Db) -> bool {
+        #[salsa::tracked(cycle_initial=initial, heap_size=ruff_memory_usage::heap_size)]
+        fn inner<'db>(db: &'db dyn Db, protocol: ProtocolInstanceType<'db>, _: ()) -> bool {
+            Type::object()
+                .satisfies_protocol(
+                    db,
+                    protocol,
+                    InferableTypeVars::None,
+                    TypeRelation::Subtyping,
+                    &HasRelationToVisitor::default(),
+                    &IsDisjointVisitor::default(),
+                )
+                .is_always_satisfied()
+        }
+
+        fn initial<'db>(_db: &'db dyn Db, _value: ProtocolInstanceType<'db>, _: ()) -> bool {
+            true
+        }
+
+        inner(db, self, ())
+    }
+
     /// Return a "normalized" version of this `Protocol` type.
     ///
     /// See [`Type::normalized`] for more details.
     pub(super) fn normalized(self, db: &'db dyn Db) -> Type<'db> {
-        self.normalized_impl(db, &TypeTransformer::default())
+        self.normalized_impl(db, &NormalizedVisitor::default())
     }
 
     /// Return a "normalized" version of this `Protocol` type.
@@ -490,9 +684,8 @@ impl<'db> ProtocolInstanceType<'db> {
         db: &'db dyn Db,
         visitor: &NormalizedVisitor<'db>,
     ) -> Type<'db> {
-        let object = Type::object(db);
-        if object.satisfies_protocol(db, self, TypeRelation::Subtyping) {
-            return object;
+        if self.is_equivalent_to_object(db) {
+            return Type::object();
         }
         match self.inner {
             Protocol::FromClass(_) => Type::ProtocolInstance(Self::synthesized(
@@ -502,33 +695,24 @@ impl<'db> ProtocolInstanceType<'db> {
         }
     }
 
-    /// Return `true` if this protocol type has the given type relation to the protocol `other`.
-    ///
-    /// TODO: consider the types of the members as well as their existence
-    pub(super) fn has_relation_to(
-        self,
-        db: &'db dyn Db,
-        other: Self,
-        _relation: TypeRelation,
-    ) -> bool {
-        other
-            .inner
-            .interface(db)
-            .is_sub_interface_of(db, self.inner.interface(db))
-    }
-
     /// Return `true` if this protocol type is equivalent to the protocol `other`.
     ///
     /// TODO: consider the types of the members as well as their existence
-    pub(super) fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
+    pub(super) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        _inferable: InferableTypeVars<'_, 'db>,
+        _visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         if self == other {
-            return true;
+            return ConstraintSet::from(true);
         }
         let self_normalized = self.normalized(db);
         if self_normalized == Type::ProtocolInstance(other) {
-            return true;
+            return ConstraintSet::from(true);
         }
-        self_normalized == other.normalized(db)
+        ConstraintSet::from(self_normalized == other.normalized(db))
     }
 
     /// Return `true` if this protocol type is disjoint from the protocol `other`.
@@ -540,9 +724,10 @@ impl<'db> ProtocolInstanceType<'db> {
         self,
         _db: &'db dyn Db,
         _other: Self,
+        _inferable: InferableTypeVars<'_, 'db>,
         _visitor: &IsDisjointVisitor<'db>,
-    ) -> bool {
-        false
+    ) -> ConstraintSet<'db> {
+        ConstraintSet::from(false)
     }
 
     pub(crate) fn instance_member(self, db: &'db dyn Db, name: &str) -> PlaceAndQualifiers<'db> {
@@ -552,44 +737,36 @@ impl<'db> ProtocolInstanceType<'db> {
         }
     }
 
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        match self.inner {
-            // TODO: This should also materialize via `class.materialize(db, variance)`
-            Protocol::FromClass(class) => Self::from_class(class),
-            Protocol::Synthesized(synthesized) => {
-                Self::synthesized(synthesized.materialize(db, variance))
-            }
-        }
-    }
-
     pub(super) fn apply_type_mapping_impl<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
         match self.inner {
             Protocol::FromClass(class) => {
-                Self::from_class(class.apply_type_mapping_impl(db, type_mapping, visitor))
-            }
-            Protocol::Synthesized(synthesized) => {
-                Self::synthesized(synthesized.apply_type_mapping_impl(db, type_mapping, visitor))
+                Self::from_class(class.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
+            Protocol::Synthesized(synthesized) => Self::synthesized(
+                synthesized.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
+            ),
         }
     }
 
-    pub(super) fn find_legacy_typevars(
+    pub(super) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self.inner {
             Protocol::FromClass(class) => {
-                class.find_legacy_typevars(db, binding_context, typevars);
+                class.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
             Protocol::Synthesized(synthesized) => {
-                synthesized.find_legacy_typevars(db, binding_context, typevars);
+                synthesized.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
         }
     }
@@ -620,10 +797,8 @@ impl<'db> Protocol<'db> {
     fn interface(self, db: &'db dyn Db) -> ProtocolInterface<'db> {
         match self {
             Self::FromClass(class) => class
-                .class_literal(db)
-                .0
                 .into_protocol_class(db)
-                .expect("Protocol class literal should be a protocol class")
+                .expect("Class wrapped by `Protocol` should be a protocol class")
                 .interface(db),
             Self::Synthesized(synthesized) => synthesized.interface(),
         }
@@ -645,8 +820,8 @@ mod synthesized_protocol {
     use crate::semantic_index::definition::Definition;
     use crate::types::protocol_class::ProtocolInterface;
     use crate::types::{
-        ApplyTypeMappingVisitor, BoundTypeVarInstance, NormalizedVisitor, TypeMapping,
-        TypeVarVariance, VarianceInferable,
+        ApplyTypeMappingVisitor, BoundTypeVarInstance, FindLegacyTypeVarsVisitor,
+        NormalizedVisitor, TypeContext, TypeMapping, TypeVarVariance, VarianceInferable,
     };
     use crate::{Db, FxOrderSet};
 
@@ -673,26 +848,25 @@ mod synthesized_protocol {
             Self(interface.normalized_impl(db, visitor))
         }
 
-        pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-            Self(self.0.materialize(db, variance))
-        }
-
         pub(super) fn apply_type_mapping_impl<'a>(
             self,
             db: &'db dyn Db,
             type_mapping: &TypeMapping<'a, 'db>,
+            tcx: TypeContext<'db>,
             _visitor: &ApplyTypeMappingVisitor<'db>,
         ) -> Self {
-            Self(self.0.specialized_and_normalized(db, type_mapping))
+            Self(self.0.specialized_and_normalized(db, type_mapping, tcx))
         }
 
-        pub(super) fn find_legacy_typevars(
+        pub(super) fn find_legacy_typevars_impl(
             self,
             db: &'db dyn Db,
             binding_context: Option<Definition<'db>>,
             typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+            visitor: &FindLegacyTypeVarsVisitor<'db>,
         ) {
-            self.0.find_legacy_typevars(db, binding_context, typevars);
+            self.0
+                .find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
 
         pub(in crate::types) fn interface(self) -> ProtocolInterface<'db> {
diff --git a/crates/ty_python_semantic/src/types/member.rs b/crates/ty_python_semantic/src/types/member.rs
new file mode 100644
index 0000000000..4090533221
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/member.rs
@@ -0,0 +1,95 @@
+use crate::Db;
+use crate::place::{
+    ConsideredDefinitions, Place, PlaceAndQualifiers, RequiresExplicitReExport, place_by_id,
+    place_from_bindings,
+};
+use crate::semantic_index::{place_table, scope::ScopeId, use_def_map};
+use crate::types::Type;
+
+/// The return type of certain member-lookup operations. Contains information
+/// about the type, type qualifiers, boundness/declaredness.
+#[derive(Debug, Clone, PartialEq, Eq, salsa::Update, get_size2::GetSize, Default)]
+pub(super) struct Member<'db> {
+    /// Type, qualifiers, and boundness information of this member
+    pub(super) inner: PlaceAndQualifiers<'db>,
+}
+
+impl<'db> Member<'db> {
+    pub(super) fn unbound() -> Self {
+        Self {
+            inner: PlaceAndQualifiers::unbound(),
+        }
+    }
+
+    pub(super) fn definitely_declared(ty: Type<'db>) -> Self {
+        Self {
+            inner: Place::declared(ty).into(),
+        }
+    }
+
+    /// Returns `true` if the inner place is undefined (i.e. there is no such member).
+    pub(super) fn is_undefined(&self) -> bool {
+        self.inner.place.is_undefined()
+    }
+
+    /// Returns the inner type, unless it is definitely undefined.
+    pub(super) fn ignore_possibly_undefined(&self) -> Option<Type<'db>> {
+        self.inner.place.ignore_possibly_undefined()
+    }
+
+    /// Map a type transformation function over the type of this member.
+    #[must_use]
+    pub(super) fn map_type(self, f: impl FnOnce(Type<'db>) -> Type<'db>) -> Self {
+        Self {
+            inner: self.inner.map_type(f),
+        }
+    }
+}
+
+/// Infer the public type of a class member/symbol (its type as seen from outside its scope) in the given
+/// `scope`.
+pub(super) fn class_member<'db>(db: &'db dyn Db, scope: ScopeId<'db>, name: &str) -> Member<'db> {
+    place_table(db, scope)
+        .symbol_id(name)
+        .map(|symbol_id| {
+            let place_and_quals = place_by_id(
+                db,
+                scope,
+                symbol_id.into(),
+                RequiresExplicitReExport::No,
+                ConsideredDefinitions::EndOfScope,
+            );
+
+            if !place_and_quals.is_undefined() && !place_and_quals.is_init_var() {
+                // Trust the declared type if we see a class-level declaration
+                return Member {
+                    inner: place_and_quals,
+                };
+            }
+
+            if let PlaceAndQualifiers {
+                place: Place::Defined(ty, _, _),
+                qualifiers,
+            } = place_and_quals
+            {
+                // Otherwise, we need to check if the symbol has bindings
+                let use_def = use_def_map(db, scope);
+                let bindings = use_def.end_of_scope_symbol_bindings(symbol_id);
+                let inferred = place_from_bindings(db, bindings);
+
+                // TODO: we should not need to calculate inferred type second time. This is a temporary
+                // solution until the notion of Boundness and Declaredness is split. See #16036, #16264
+                Member {
+                    inner: match inferred {
+                        Place::Undefined => Place::Undefined.with_qualifiers(qualifiers),
+                        Place::Defined(_, origin, boundness) => {
+                            Place::Defined(ty, origin, boundness).with_qualifiers(qualifiers)
+                        }
+                    },
+                }
+            } else {
+                Member::unbound()
+            }
+        })
+        .unwrap_or_default()
+}
diff --git a/crates/ty_python_semantic/src/types/mro.rs b/crates/ty_python_semantic/src/types/mro.rs
index 0e47227010..dffd166fe0 100644
--- a/crates/ty_python_semantic/src/types/mro.rs
+++ b/crates/ty_python_semantic/src/types/mro.rs
@@ -45,7 +45,7 @@ impl<'db> Mro<'db> {
     /// the default specialization of the class's type variables.)
     ///
     /// (We emit a diagnostic warning about the runtime `TypeError` in
-    /// [`super::infer::TypeInferenceBuilder::infer_region_scope`].)
+    /// [`super::infer::infer_scope_types`].)
     pub(super) fn of_class(
         db: &'db dyn Db,
         class_literal: ClassLiteral<'db>,
diff --git a/crates/ty_python_semantic/src/types/narrow.rs b/crates/ty_python_semantic/src/types/narrow.rs
index d1df76dee6..b797eb4764 100644
--- a/crates/ty_python_semantic/src/types/narrow.rs
+++ b/crates/ty_python_semantic/src/types/narrow.rs
@@ -12,7 +12,7 @@ use crate::types::function::KnownFunction;
 use crate::types::infer::infer_same_file_expression_type;
 use crate::types::{
     ClassLiteral, ClassType, IntersectionBuilder, KnownClass, SubclassOfInner, SubclassOfType,
-    Truthiness, Type, TypeVarBoundOrConstraints, UnionBuilder, infer_expression_types,
+    Truthiness, Type, TypeContext, TypeVarBoundOrConstraints, UnionBuilder, infer_expression_types,
 };
 
 use ruff_db::parsed::{ParsedModuleRef, parsed_module};
@@ -83,7 +83,6 @@ fn all_narrowing_constraints_for_pattern<'db>(
 
 #[salsa::tracked(
     returns(as_ref),
-    cycle_fn=constraints_for_expression_cycle_recover,
     cycle_initial=constraints_for_expression_cycle_initial,
     heap_size=ruff_memory_usage::heap_size,
 )]
@@ -98,7 +97,6 @@ fn all_narrowing_constraints_for_expression<'db>(
 
 #[salsa::tracked(
     returns(as_ref),
-    cycle_fn=negative_constraints_for_expression_cycle_recover,
     cycle_initial=negative_constraints_for_expression_cycle_initial,
     heap_size=ruff_memory_usage::heap_size,
 )]
@@ -120,16 +118,6 @@ fn all_negative_narrowing_constraints_for_pattern<'db>(
     NarrowingConstraintsBuilder::new(db, &module, PredicateNode::Pattern(pattern), false).finish()
 }
 
-#[expect(clippy::ref_option)]
-fn constraints_for_expression_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Option<NarrowingConstraints<'db>>,
-    _count: u32,
-    _expression: Expression<'db>,
-) -> salsa::CycleRecoveryAction<Option<NarrowingConstraints<'db>>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn constraints_for_expression_cycle_initial<'db>(
     _db: &'db dyn Db,
     _expression: Expression<'db>,
@@ -137,16 +125,6 @@ fn constraints_for_expression_cycle_initial<'db>(
     None
 }
 
-#[expect(clippy::ref_option)]
-fn negative_constraints_for_expression_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &Option<NarrowingConstraints<'db>>,
-    _count: u32,
-    _expression: Expression<'db>,
-) -> salsa::CycleRecoveryAction<Option<NarrowingConstraints<'db>>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn negative_constraints_for_expression_cycle_initial<'db>(
     _db: &'db dyn Db,
     _expression: Expression<'db>,
@@ -174,24 +152,16 @@ impl ClassInfoConstraintFunction {
     fn generate_constraint<'db>(self, db: &'db dyn Db, classinfo: Type<'db>) -> Option<Type<'db>> {
         let constraint_fn = |class: ClassLiteral<'db>| match self {
             ClassInfoConstraintFunction::IsInstance => {
-                Type::instance(db, class.default_specialization(db))
+                Type::instance(db, class.top_materialization(db))
             }
             ClassInfoConstraintFunction::IsSubclass => {
-                SubclassOfType::from(db, class.default_specialization(db))
+                SubclassOfType::from(db, class.top_materialization(db))
             }
         };
 
         match classinfo {
             Type::TypeAlias(alias) => self.generate_constraint(db, alias.value_type(db)),
-            Type::ClassLiteral(class_literal) => {
-                // At runtime (on Python 3.11+), this will return `True` for classes that actually
-                // do inherit `typing.Any` and `False` otherwise. We could accurately model that?
-                if class_literal.is_known(db, KnownClass::Any) {
-                    None
-                } else {
-                    Some(constraint_fn(class_literal))
-                }
-            }
+            Type::ClassLiteral(class_literal) => Some(constraint_fn(class_literal)),
             Type::SubclassOf(subclass_of_ty) => match subclass_of_ty.subclass_of() {
                 SubclassOfInner::Class(ClassType::NonGeneric(class)) => Some(constraint_fn(class)),
                 // It's not valid to use a generic alias as the second argument to `isinstance()` or `issubclass()`,
@@ -215,15 +185,16 @@ impl ClassInfoConstraintFunction {
             Type::Union(union) => {
                 union.try_map(db, |element| self.generate_constraint(db, *element))
             }
-            Type::NonInferableTypeVar(bound_typevar) => match bound_typevar
-                .typevar(db)
-                .bound_or_constraints(db)?
-            {
-                TypeVarBoundOrConstraints::UpperBound(bound) => self.generate_constraint(db, bound),
-                TypeVarBoundOrConstraints::Constraints(constraints) => {
-                    self.generate_constraint(db, Type::Union(constraints))
+            Type::TypeVar(bound_typevar) => {
+                match bound_typevar.typevar(db).bound_or_constraints(db)? {
+                    TypeVarBoundOrConstraints::UpperBound(bound) => {
+                        self.generate_constraint(db, bound)
+                    }
+                    TypeVarBoundOrConstraints::Constraints(constraints) => {
+                        self.generate_constraint(db, Type::Union(constraints))
+                    }
                 }
-            },
+            }
 
             // It's not valid to use a generic alias as the second argument to `isinstance()` or `issubclass()`,
             // e.g. `isinstance(x, list[int])` fails at runtime.
@@ -248,7 +219,7 @@ impl ClassInfoConstraintFunction {
             | Type::Callable(_)
             | Type::DataclassDecorator(_)
             | Type::Never
-            | Type::MethodWrapper(_)
+            | Type::KnownBoundMethod(_)
             | Type::ModuleLiteral(_)
             | Type::FunctionLiteral(_)
             | Type::ProtocolInstance(_)
@@ -259,7 +230,6 @@ impl ClassInfoConstraintFunction {
             | Type::IntLiteral(_)
             | Type::KnownInstance(_)
             | Type::TypeIs(_)
-            | Type::TypeVar(_)
             | Type::WrapperDescriptor(_)
             | Type::DataclassTransformer(_)
             | Type::TypedDict(_) => None,
@@ -271,19 +241,19 @@ type NarrowingConstraints<'db> = FxHashMap<ScopedPlaceId, Type<'db>>;
 
 fn merge_constraints_and<'db>(
     into: &mut NarrowingConstraints<'db>,
-    from: NarrowingConstraints<'db>,
+    from: &NarrowingConstraints<'db>,
     db: &'db dyn Db,
 ) {
     for (key, value) in from {
-        match into.entry(key) {
+        match into.entry(*key) {
             Entry::Occupied(mut entry) => {
                 *entry.get_mut() = IntersectionBuilder::new(db)
                     .add_positive(*entry.get())
-                    .add_positive(value)
+                    .add_positive(*value)
                     .build();
             }
             Entry::Vacant(entry) => {
-                entry.insert(value);
+                entry.insert(*value);
             }
         }
     }
@@ -300,23 +270,17 @@ fn merge_constraints_or<'db>(
                 *entry.get_mut() = UnionBuilder::new(db).add(*entry.get()).add(*value).build();
             }
             Entry::Vacant(entry) => {
-                entry.insert(Type::object(db));
+                entry.insert(Type::object());
             }
         }
     }
     for (key, value) in into.iter_mut() {
         if !from.contains_key(key) {
-            *value = Type::object(db);
+            *value = Type::object();
         }
     }
 }
 
-fn negate_if<'db>(constraints: &mut NarrowingConstraints<'db>, db: &'db dyn Db, yes: bool) {
-    for (_place, ty) in constraints.iter_mut() {
-        *ty = ty.negate_if(db, yes);
-    }
-}
-
 fn place_expr(expr: &ast::Expr) -> Option<PlaceExpr> {
     match expr {
         ast::Expr::Named(named) => PlaceExpr::try_from_expr(named.target.as_ref()),
@@ -407,12 +371,14 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
     ) -> Option<NarrowingConstraints<'db>> {
         match pattern_predicate_kind {
             PatternPredicateKind::Singleton(singleton) => {
-                self.evaluate_match_pattern_singleton(subject, *singleton)
+                self.evaluate_match_pattern_singleton(subject, *singleton, is_positive)
             }
             PatternPredicateKind::Class(cls, kind) => {
                 self.evaluate_match_pattern_class(subject, *cls, *kind, is_positive)
             }
-            PatternPredicateKind::Value(expr) => self.evaluate_match_pattern_value(subject, *expr),
+            PatternPredicateKind::Value(expr) => {
+                self.evaluate_match_pattern_value(subject, *expr, is_positive)
+            }
             PatternPredicateKind::Or(predicates) => {
                 self.evaluate_match_pattern_or(subject, predicates, is_positive)
             }
@@ -428,12 +394,11 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         pattern: PatternPredicate<'db>,
         is_positive: bool,
     ) -> Option<NarrowingConstraints<'db>> {
-        let subject = pattern.subject(self.db);
-        self.evaluate_pattern_predicate_kind(pattern.kind(self.db), subject, is_positive)
-            .map(|mut constraints| {
-                negate_if(&mut constraints, self.db, !is_positive);
-                constraints
-            })
+        self.evaluate_pattern_predicate_kind(
+            pattern.kind(self.db),
+            pattern.subject(self.db),
+            is_positive,
+        )
     }
 
     fn places(&self) -> &'db PlaceTable {
@@ -562,7 +527,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
                     }
                     // Treat `bool` as `Literal[True, False]`.
                     Type::NominalInstance(instance)
-                        if instance.class(db).is_known(db, KnownClass::Bool) =>
+                        if instance.has_known_class(db, KnownClass::Bool) =>
                     {
                         UnionType::from_elements(
                             db,
@@ -573,11 +538,11 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
                     }
                     // Treat enums as a union of their members.
                     Type::NominalInstance(instance)
-                        if enum_metadata(db, instance.class(db).class_literal(db).0).is_some() =>
+                        if enum_metadata(db, instance.class_literal(db)).is_some() =>
                     {
                         UnionType::from_elements(
                             db,
-                            enum_member_literals(db, instance.class(db).class_literal(db).0, None)
+                            enum_member_literals(db, instance.class_literal(db), None)
                                 .expect("Calling `enum_member_literals` on an enum class")
                                 .map(|ty| filter_to_cannot_be_equal(db, ty, rhs_ty)),
                         )
@@ -604,7 +569,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
     fn evaluate_expr_ne(&mut self, lhs_ty: Type<'db>, rhs_ty: Type<'db>) -> Option<Type<'db>> {
         match (lhs_ty, rhs_ty) {
             (Type::NominalInstance(instance), Type::IntLiteral(i))
-                if instance.class(self.db).is_known(self.db, KnownClass::Bool) =>
+                if instance.has_known_class(self.db, KnownClass::Bool) =>
             {
                 if i == 0 {
                     Some(Type::BooleanLiteral(false).negate(self.db))
@@ -623,24 +588,90 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         }
     }
 
+    // TODO `expr_in` and `expr_not_in` should perhaps be unified with `expr_eq` and `expr_ne`,
+    // since `eq` and `ne` are equivalent to `in` and `not in` with only one element in the RHS.
     fn evaluate_expr_in(&mut self, lhs_ty: Type<'db>, rhs_ty: Type<'db>) -> Option<Type<'db>> {
         if lhs_ty.is_single_valued(self.db) || lhs_ty.is_union_of_single_valued(self.db) {
-            if let Type::StringLiteral(string_literal) = rhs_ty {
-                Some(UnionType::from_elements(
-                    self.db,
-                    string_literal
-                        .iter_each_char(self.db)
-                        .map(Type::StringLiteral),
-                ))
-            } else if let Some(tuple_spec) = rhs_ty.tuple_instance_spec(self.db) {
-                // N.B. Strictly speaking this is unsound, since a tuple subclass might override `__contains__`
-                // but we'd still apply the narrowing here. This seems unlikely, however, and narrowing is
-                // generally unsound in numerous ways anyway (attribute narrowing, subscript, narrowing,
-                // narrowing of globals, etc.). So this doesn't seem worth worrying about too much.
-                Some(UnionType::from_elements(self.db, tuple_spec.all_elements()))
-            } else {
-                None
+            rhs_ty
+                .try_iterate(self.db)
+                .ok()
+                .map(|iterable| iterable.homogeneous_element_type(self.db))
+        } else if lhs_ty.is_union_with_single_valued(self.db) {
+            let rhs_values = rhs_ty
+                .try_iterate(self.db)
+                .ok()?
+                .homogeneous_element_type(self.db);
+
+            let mut builder = UnionBuilder::new(self.db);
+
+            // Add the narrowed values from the RHS first, to keep literals before broader types.
+            builder = builder.add(rhs_values);
+
+            if let Some(lhs_union) = lhs_ty.as_union() {
+                for element in lhs_union.elements(self.db) {
+                    // Keep only the non-single-valued portion of the original type.
+                    if !element.is_single_valued(self.db)
+                        && !element.is_literal_string()
+                        && !element.is_bool(self.db)
+                        && (!element.is_enum(self.db) || element.overrides_equality(self.db))
+                    {
+                        builder = builder.add(*element);
+                    }
+                }
             }
+            Some(builder.build())
+        } else {
+            None
+        }
+    }
+
+    fn evaluate_expr_not_in(&mut self, lhs_ty: Type<'db>, rhs_ty: Type<'db>) -> Option<Type<'db>> {
+        let rhs_values = rhs_ty
+            .try_iterate(self.db)
+            .ok()?
+            .homogeneous_element_type(self.db);
+
+        if lhs_ty.is_single_valued(self.db) || lhs_ty.is_union_of_single_valued(self.db) {
+            // Exclude the RHS values from the entire (single-valued) LHS domain.
+            let complement = IntersectionBuilder::new(self.db)
+                .add_positive(lhs_ty)
+                .add_negative(rhs_values)
+                .build();
+            Some(complement)
+        } else if lhs_ty.is_union_with_single_valued(self.db) {
+            // Split LHS into single-valued portion and the rest. Exclude RHS values from the
+            // single-valued portion, keep the rest intact.
+            let mut single_builder = UnionBuilder::new(self.db);
+            let mut rest_builder = UnionBuilder::new(self.db);
+
+            if let Some(lhs_union) = lhs_ty.as_union() {
+                for element in lhs_union.elements(self.db) {
+                    if element.is_single_valued(self.db)
+                        || element.is_literal_string()
+                        || element.is_bool(self.db)
+                        || (element.is_enum(self.db) && !element.overrides_equality(self.db))
+                    {
+                        single_builder = single_builder.add(*element);
+                    } else {
+                        rest_builder = rest_builder.add(*element);
+                    }
+                }
+            }
+
+            let single_union = single_builder.build();
+            let rest_union = rest_builder.build();
+
+            let narrowed_single = IntersectionBuilder::new(self.db)
+                .add_positive(single_union)
+                .add_negative(rhs_values)
+                .build();
+
+            // Keep order: first literal complement, then broader arms.
+            let result = UnionBuilder::new(self.db)
+                .add(narrowed_single)
+                .add(rest_union)
+                .build();
+            Some(result)
         } else {
             None
         }
@@ -651,7 +682,10 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         lhs_ty: Type<'db>,
         rhs_ty: Type<'db>,
         op: ast::CmpOp,
+        is_positive: bool,
     ) -> Option<Type<'db>> {
+        let op = if is_positive { op } else { op.negate() };
+
         match op {
             ast::CmpOp::IsNot => {
                 if rhs_ty.is_singleton(self.db) {
@@ -668,9 +702,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
             ast::CmpOp::Eq => self.evaluate_expr_eq(lhs_ty, rhs_ty),
             ast::CmpOp::NotEq => self.evaluate_expr_ne(lhs_ty, rhs_ty),
             ast::CmpOp::In => self.evaluate_expr_in(lhs_ty, rhs_ty),
-            ast::CmpOp::NotIn => self
-                .evaluate_expr_in(lhs_ty, rhs_ty)
-                .map(|ty| ty.negate(self.db)),
+            ast::CmpOp::NotIn => self.evaluate_expr_not_in(lhs_ty, rhs_ty),
             _ => None,
         }
     }
@@ -717,7 +749,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
             return None;
         }
 
-        let inference = infer_expression_types(self.db, expression);
+        let inference = infer_expression_types(self.db, expression, TypeContext::default());
 
         let comparator_tuples = std::iter::once(&**left)
             .chain(comparators)
@@ -736,13 +768,12 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
                 | ast::Expr::Attribute(_)
                 | ast::Expr::Subscript(_)
                 | ast::Expr::Named(_) => {
-                    if let Some(left) = place_expr(left) {
-                        let op = if is_positive { *op } else { op.negate() };
-
-                        if let Some(ty) = self.evaluate_expr_compare_op(lhs_ty, rhs_ty, op) {
-                            let place = self.expect_place(&left);
-                            constraints.insert(place, ty);
-                        }
+                    if let Some(left) = place_expr(left)
+                        && let Some(ty) =
+                            self.evaluate_expr_compare_op(lhs_ty, rhs_ty, *op, is_positive)
+                    {
+                        let place = self.expect_place(&left);
+                        constraints.insert(place, ty);
                     }
                 }
                 ast::Expr::Call(ast::ExprCall {
@@ -784,7 +815,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
                     let callable_type = inference.expression_type(&**callable);
 
                     if callable_type
-                        .into_class_literal()
+                        .as_class_literal()
                         .is_some_and(|c| c.is_known(self.db, KnownClass::Type))
                     {
                         let place = self.expect_place(&target);
@@ -807,7 +838,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         expression: Expression<'db>,
         is_positive: bool,
     ) -> Option<NarrowingConstraints<'db>> {
-        let inference = infer_expression_types(self.db, expression);
+        let inference = infer_expression_types(self.db, expression, TypeContext::default());
 
         let callable_ty = inference.expression_type(&*expr_call.func);
 
@@ -847,7 +878,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
                 if function == KnownFunction::HasAttr {
                     let attr = inference
                         .expression_type(second_arg)
-                        .into_string_literal()?
+                        .as_string_literal()?
                         .value(self.db);
 
                     if !is_identifier(attr) {
@@ -856,10 +887,8 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
 
                     // Since `hasattr` only checks if an attribute is readable,
                     // the type of the protocol member should be a read-only property that returns `object`.
-                    let constraint = Type::protocol_with_readonly_members(
-                        self.db,
-                        [(attr, Type::object(self.db))],
-                    );
+                    let constraint =
+                        Type::protocol_with_readonly_members(self.db, [(attr, Type::object())]);
 
                     return Some(NarrowingConstraints::from_iter([(
                         place,
@@ -900,6 +929,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         &mut self,
         subject: Expression<'db>,
         singleton: ast::Singleton,
+        is_positive: bool,
     ) -> Option<NarrowingConstraints<'db>> {
         let subject = place_expr(subject.node_ref(self.db, self.module))?;
         let place = self.expect_place(&subject);
@@ -909,6 +939,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
             ast::Singleton::True => Type::BooleanLiteral(true),
             ast::Singleton::False => Type::BooleanLiteral(false),
         };
+        let ty = ty.negate_if(self.db, !is_positive);
         Some(NarrowingConstraints::from_iter([(place, ty)]))
     }
 
@@ -929,8 +960,10 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         let subject = place_expr(subject.node_ref(self.db, self.module))?;
         let place = self.expect_place(&subject);
 
-        let ty = infer_same_file_expression_type(self.db, cls, self.module).to_instance(self.db)?;
+        let ty = infer_same_file_expression_type(self.db, cls, TypeContext::default(), self.module)
+            .to_instance(self.db)?;
 
+        let ty = ty.negate_if(self.db, !is_positive);
         Some(NarrowingConstraints::from_iter([(place, ty)]))
     }
 
@@ -938,12 +971,20 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         &mut self,
         subject: Expression<'db>,
         value: Expression<'db>,
+        is_positive: bool,
     ) -> Option<NarrowingConstraints<'db>> {
-        let subject = place_expr(subject.node_ref(self.db, self.module))?;
-        let place = self.expect_place(&subject);
+        let place = {
+            let subject = place_expr(subject.node_ref(self.db, self.module))?;
+            self.expect_place(&subject)
+        };
+        let subject_ty =
+            infer_same_file_expression_type(self.db, subject, TypeContext::default(), self.module);
 
-        let ty = infer_same_file_expression_type(self.db, value, self.module);
-        Some(NarrowingConstraints::from_iter([(place, ty)]))
+        let value_ty =
+            infer_same_file_expression_type(self.db, value, TypeContext::default(), self.module);
+
+        self.evaluate_expr_compare_op(subject_ty, value_ty, ast::CmpOp::Eq, is_positive)
+            .map(|ty| NarrowingConstraints::from_iter([(place, ty)]))
     }
 
     fn evaluate_match_pattern_or(
@@ -954,13 +995,20 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
     ) -> Option<NarrowingConstraints<'db>> {
         let db = self.db;
 
+        // DeMorgan's law---if the overall `or` is negated, we need to `and` the negated sub-constraints.
+        let merge_constraints = if is_positive {
+            merge_constraints_or
+        } else {
+            merge_constraints_and
+        };
+
         predicates
             .iter()
             .filter_map(|predicate| {
                 self.evaluate_pattern_predicate_kind(predicate, subject, is_positive)
             })
             .reduce(|mut constraints, constraints_| {
-                merge_constraints_or(&mut constraints, &constraints_, db);
+                merge_constraints(&mut constraints, &constraints_, db);
                 constraints
             })
     }
@@ -971,7 +1019,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
         expression: Expression<'db>,
         is_positive: bool,
     ) -> Option<NarrowingConstraints<'db>> {
-        let inference = infer_expression_types(self.db, expression);
+        let inference = infer_expression_types(self.db, expression, TypeContext::default());
         let mut sub_constraints = expr_bool_op
             .values
             .iter()
@@ -992,7 +1040,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
                 let mut aggregation: Option<NarrowingConstraints> = None;
                 for sub_constraint in sub_constraints.into_iter().flatten() {
                     if let Some(ref mut some_aggregation) = aggregation {
-                        merge_constraints_and(some_aggregation, sub_constraint, self.db);
+                        merge_constraints_and(some_aggregation, &sub_constraint, self.db);
                     } else {
                         aggregation = Some(sub_constraint);
                     }
diff --git a/crates/ty_python_semantic/src/types/property_tests.rs b/crates/ty_python_semantic/src/types/property_tests.rs
index 77747bcaed..2c3988bab4 100644
--- a/crates/ty_python_semantic/src/types/property_tests.rs
+++ b/crates/ty_python_semantic/src/types/property_tests.rs
@@ -38,7 +38,6 @@ use type_generation::{intersection, union};
 ///
 /// where `t1`, `t2`, ..., `tn` are identifiers that represent arbitrary types, and `<property>`
 /// is an expression using these identifiers.
-///
 macro_rules! type_property_test {
     ($test_name:ident, $db:ident, forall types $($types:ident),+ . $property:expr) => {
         #[quickcheck_macros::quickcheck]
@@ -46,20 +45,34 @@ macro_rules! type_property_test {
         fn $test_name($($types: crate::types::property_tests::type_generation::Ty),+) -> bool {
             let $db = &crate::types::property_tests::setup::get_cached_db();
             $(let $types = $types.into_type($db);)+
+            let result = $property;
 
-            $property
+            if !result {
+                println!("\nFailing types were:");
+                $(println!("{}", $types.display($db));)+
+            }
+
+            result
         }
     };
+
     ($test_name:ident, $db:ident, forall fully_static_types $($types:ident),+ . $property:expr) => {
         #[quickcheck_macros::quickcheck]
         #[ignore]
         fn $test_name($($types: crate::types::property_tests::type_generation::FullyStaticTy),+) -> bool {
             let $db = &crate::types::property_tests::setup::get_cached_db();
             $(let $types = $types.into_type($db);)+
+            let result = $property;
 
-            $property
+            if !result {
+                println!("\nFailing types were:");
+                $(println!("{}", $types.display($db));)+
+            }
+
+            result
         }
     };
+
     // A property test with a logical implication.
     ($name:ident, $db:ident, forall $typekind:ident $($types:ident),+ . $premise:expr => $conclusion:expr) => {
         type_property_test!($name, $db, forall $typekind $($types),+ . !($premise) || ($conclusion));
@@ -68,7 +81,7 @@ macro_rules! type_property_test {
 
 mod stable {
     use super::union;
-    use crate::types::{CallableType, Type};
+    use crate::types::{CallableType, KnownClass, Type};
 
     // Reflexivity: `T` is equivalent to itself.
     type_property_test!(
@@ -133,13 +146,13 @@ mod stable {
     // All types should be assignable to `object`
     type_property_test!(
         all_types_assignable_to_object, db,
-        forall types t. t.is_assignable_to(db, Type::object(db))
+        forall types t. t.is_assignable_to(db, Type::object())
     );
 
     // And all types should be subtypes of `object`
     type_property_test!(
         all_types_subtype_of_object, db,
-        forall types t. t.is_subtype_of(db, Type::object(db))
+        forall types t. t.is_subtype_of(db, Type::object())
     );
 
     // Never should be assignable to every type
@@ -158,7 +171,7 @@ mod stable {
     type_property_test!(
         bottom_callable_is_subtype_of_all_callable, db,
         forall types t. t.is_callable_type()
-            => CallableType::bottom(db).is_subtype_of(db, t)
+            => Type::Callable(CallableType::bottom(db)).is_subtype_of(db, t)
     );
 
     // `T` can be assigned to itself.
@@ -182,7 +195,7 @@ mod stable {
     // Only `object` is a supertype of `Any`.
     type_property_test!(
         only_object_is_supertype_of_any, db,
-        forall types t. !t.is_equivalent_to(db, Type::object(db)) => !Type::any().is_subtype_of(db, t)
+        forall types t. !t.is_equivalent_to(db, Type::object()) => !Type::any().is_subtype_of(db, t)
     );
 
     // Equivalence is commutative.
@@ -205,6 +218,25 @@ mod stable {
         all_fully_static_type_pairs_are_subtype_of_their_union, db,
         forall fully_static_types s, t. s.is_subtype_of(db, union(db, [s, t])) && t.is_subtype_of(db, union(db, [s, t]))
     );
+
+    // Any type assignable to `Iterable[object]` should be considered iterable.
+    //
+    // Note that the inverse is not true, due to the fact that we recognize the old-style
+    // iteration protocol as well as the new-style iteration protocol: not all objects that
+    // we consider iterable are assignable to `Iterable[object]`.
+    //
+    // Note also that (like other property tests in this module),
+    // this invariant will only hold true for Liskov-compliant types assignable to `Iterable`.
+    // Since protocols can participate in nominal assignability/subtyping as well as
+    // structural assignability/subtyping, it is possible to construct types that a type
+    // checker must consider to be subtypes of `Iterable` even though they are not in fact
+    // iterable (as long as the user `type: ignore`s any type-checker errors stemming from
+    // the Liskov violation). All you need to do is to create a class that subclasses
+    // `Iterable` but assigns `__iter__ = None` in the class body (or similar).
+    type_property_test!(
+        all_type_assignable_to_iterable_are_iterable, db,
+        forall types t. t.is_assignable_to(db, KnownClass::Iterable.to_specialized_instance(db, [Type::object()])) => t.try_iterate(db).is_ok()
+    );
 }
 
 /// This module contains property tests that currently lead to many false positives.
@@ -217,8 +249,6 @@ mod stable {
 mod flaky {
     use itertools::Itertools;
 
-    use crate::types::{KnownClass, Type};
-
     use super::{intersection, union};
 
     // Negating `T` twice is equivalent to `T`.
@@ -313,16 +343,4 @@ mod flaky {
         bottom_materialization_of_type_is_assigneble_to_type, db,
         forall types t. t.bottom_materialization(db).is_assignable_to(db, t)
     );
-
-    // Any type assignable to `Iterable[object]` should be considered iterable.
-    //
-    // Note that the inverse is not true, due to the fact that we recognize the old-style
-    // iteration protocol as well as the new-style iteration protocol: not all objects that
-    // we consider iterable are assignable to `Iterable[object]`.
-    //
-    // Currently flaky due to <https://github.com/astral-sh/ty/issues/889>
-    type_property_test!(
-        all_type_assignable_to_iterable_are_iterable, db,
-        forall types t. t.is_assignable_to(db, KnownClass::Iterable.to_specialized_instance(db, [Type::object(db)])) => t.try_iterate(db).is_ok()
-    );
 }
diff --git a/crates/ty_python_semantic/src/types/property_tests/type_generation.rs b/crates/ty_python_semantic/src/types/property_tests/type_generation.rs
index 0a296088ff..52136e4046 100644
--- a/crates/ty_python_semantic/src/types/property_tests/type_generation.rs
+++ b/crates/ty_python_semantic/src/types/property_tests/type_generation.rs
@@ -7,9 +7,9 @@ use crate::types::{
     Parameters, Signature, SpecialFormType, SubclassOfType, Type, UnionType,
 };
 use crate::{Db, module_resolver::KnownModule};
-use hashbrown::HashSet;
 use quickcheck::{Arbitrary, Gen};
 use ruff_python_ast::name::Name;
+use rustc_hash::FxHashSet;
 
 /// A test representation of a type that can be transformed unambiguously into a real Type,
 /// given a db.
@@ -153,7 +153,7 @@ impl Ty {
                     .place
                     .expect_type();
                 debug_assert!(
-                    matches!(ty, Type::NominalInstance(instance) if is_single_member_enum(db, instance.class(db).class_literal(db).0))
+                    matches!(ty, Type::NominalInstance(instance) if is_single_member_enum(db, instance.class_literal(db)))
                 );
                 ty
             }
@@ -377,7 +377,7 @@ fn arbitrary_type(g: &mut Gen, size: u32, fully_static: bool) -> Ty {
 
 fn arbitrary_parameter_list(g: &mut Gen, size: u32, fully_static: bool) -> Vec<Param> {
     let mut params: Vec<Param> = vec![];
-    let mut used_names = HashSet::new();
+    let mut used_names = FxHashSet::default();
 
     // First, choose the number of parameters to generate.
     for _ in 0..*g.choose(&[0, 1, 2, 3, 4, 5]).unwrap() {
diff --git a/crates/ty_python_semantic/src/types/protocol_class.rs b/crates/ty_python_semantic/src/types/protocol_class.rs
index d910bdc1ce..46a1142d4c 100644
--- a/crates/ty_python_semantic/src/types/protocol_class.rs
+++ b/crates/ty_python_semantic/src/types/protocol_class.rs
@@ -6,35 +6,46 @@ use itertools::Itertools;
 use ruff_python_ast::name::Name;
 use rustc_hash::FxHashMap;
 
-use super::TypeVarVariance;
-use crate::semantic_index::place::ScopedPlaceId;
-use crate::semantic_index::{SemanticIndex, place_table};
-use crate::types::context::InferContext;
-use crate::types::diagnostic::report_undeclared_protocol_member;
+use crate::types::TypeContext;
 use crate::{
     Db, FxOrderSet,
-    place::{Boundness, Place, PlaceAndQualifiers, place_from_bindings, place_from_declarations},
-    semantic_index::{definition::Definition, use_def_map},
+    place::{Definedness, Place, PlaceAndQualifiers, place_from_bindings, place_from_declarations},
+    semantic_index::{definition::Definition, place::ScopedPlaceId, place_table, use_def_map},
     types::{
-        BoundTypeVarInstance, CallableType, ClassBase, ClassLiteral, IsDisjointVisitor,
-        KnownFunction, NormalizedVisitor, PropertyInstanceType, Signature, Type, TypeMapping,
-        TypeQualifiers, TypeRelation, TypeTransformer, VarianceInferable,
+        ApplyTypeMappingVisitor, BoundTypeVarInstance, CallableType, ClassBase, ClassLiteral,
+        ClassType, FindLegacyTypeVarsVisitor, HasRelationToVisitor,
+        InstanceFallbackShadowsNonDataDescriptor, IsDisjointVisitor, KnownFunction,
+        MemberLookupPolicy, NormalizedVisitor, PropertyInstanceType, Signature, Type, TypeMapping,
+        TypeQualifiers, TypeRelation, TypeVarVariance, VarianceInferable,
+        constraints::{ConstraintSet, IteratorConstraintsExtension, OptionConstraintsExtension},
+        context::InferContext,
+        diagnostic::report_undeclared_protocol_member,
+        generics::InferableTypeVars,
         signatures::{Parameter, Parameters},
+        todo_type,
     },
 };
 
 impl<'db> ClassLiteral<'db> {
     /// Returns `Some` if this is a protocol class, `None` otherwise.
-    pub(super) fn into_protocol_class(self, db: &'db dyn Db) -> Option<ProtocolClassLiteral<'db>> {
-        self.is_protocol(db).then_some(ProtocolClassLiteral(self))
+    pub(super) fn into_protocol_class(self, db: &'db dyn Db) -> Option<ProtocolClass<'db>> {
+        self.is_protocol(db)
+            .then_some(ProtocolClass(ClassType::NonGeneric(self)))
+    }
+}
+
+impl<'db> ClassType<'db> {
+    /// Returns `Some` if this is a protocol class, `None` otherwise.
+    pub(super) fn into_protocol_class(self, db: &'db dyn Db) -> Option<ProtocolClass<'db>> {
+        self.is_protocol(db).then_some(ProtocolClass(self))
     }
 }
 
 /// Representation of a single `Protocol` class definition.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub(super) struct ProtocolClassLiteral<'db>(ClassLiteral<'db>);
+pub(super) struct ProtocolClass<'db>(ClassType<'db>);
 
-impl<'db> ProtocolClassLiteral<'db> {
+impl<'db> ProtocolClass<'db> {
     /// Returns the protocol members of this class.
     ///
     /// A protocol's members define the interface declared by the protocol.
@@ -55,20 +66,23 @@ impl<'db> ProtocolClassLiteral<'db> {
     }
 
     pub(super) fn is_runtime_checkable(self, db: &'db dyn Db) -> bool {
-        self.known_function_decorators(db)
+        self.class_literal(db)
+            .0
+            .known_function_decorators(db)
             .contains(&KnownFunction::RuntimeCheckable)
     }
 
     /// Iterate through the body of the protocol class. Check that all definitions
     /// in the protocol class body are either explicitly declared directly in the
     /// class body, or are declared in a superclass of the protocol class.
-    pub(super) fn validate_members(self, context: &InferContext, index: &SemanticIndex<'db>) {
+    pub(super) fn validate_members(self, context: &InferContext) {
         let db = context.db();
         let interface = self.interface(db);
-        let class_place_table = index.place_table(self.body_scope(db).file_scope_id(db));
+        let body_scope = self.class_literal(db).0.body_scope(db);
+        let class_place_table = place_table(db, body_scope);
 
         for (symbol_id, mut bindings_iterator) in
-            use_def_map(db, self.body_scope(db)).all_end_of_scope_symbol_bindings()
+            use_def_map(db, body_scope).all_end_of_scope_symbol_bindings()
         {
             let symbol_name = class_place_table.symbol(symbol_id).name();
 
@@ -76,27 +90,26 @@ impl<'db> ProtocolClassLiteral<'db> {
                 continue;
             }
 
-            let has_declaration = self
-                .iter_mro(db, None)
-                .filter_map(ClassBase::into_class)
-                .any(|superclass| {
-                    let superclass_scope = superclass.class_literal(db).0.body_scope(db);
-                    let Some(scoped_symbol_id) =
-                        place_table(db, superclass_scope).symbol_id(symbol_name)
-                    else {
-                        return false;
-                    };
-                    !place_from_declarations(
-                        db,
-                        index
-                            .use_def_map(superclass_scope.file_scope_id(db))
-                            .end_of_scope_declarations(ScopedPlaceId::Symbol(scoped_symbol_id)),
-                    )
-                    .into_place_and_conflicting_declarations()
-                    .0
-                    .place
-                    .is_unbound()
-                });
+            let has_declaration =
+                self.iter_mro(db)
+                    .filter_map(ClassBase::into_class)
+                    .any(|superclass| {
+                        let superclass_scope = superclass.class_literal(db).0.body_scope(db);
+                        let Some(scoped_symbol_id) =
+                            place_table(db, superclass_scope).symbol_id(symbol_name)
+                        else {
+                            return false;
+                        };
+                        !place_from_declarations(
+                            db,
+                            use_def_map(db, superclass_scope)
+                                .end_of_scope_declarations(ScopedPlaceId::Symbol(scoped_symbol_id)),
+                        )
+                        .into_place_and_conflicting_declarations()
+                        .0
+                        .place
+                        .is_undefined()
+                    });
 
             if has_declaration {
                 continue;
@@ -113,8 +126,8 @@ impl<'db> ProtocolClassLiteral<'db> {
     }
 }
 
-impl<'db> Deref for ProtocolClassLiteral<'db> {
-    type Target = ClassLiteral<'db>;
+impl<'db> Deref for ProtocolClass<'db> {
+    type Target = ClassType<'db>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -213,16 +226,107 @@ impl<'db> ProtocolInterface<'db> {
                 place: Place::bound(member.ty()),
                 qualifiers: member.qualifiers(),
             })
-            .unwrap_or_else(|| Type::object(db).instance_member(db, name))
+            .unwrap_or_else(|| Type::object().member(db, name))
     }
 
-    /// Return `true` if if all members on `self` are also members of `other`.
-    ///
-    /// TODO: this method should consider the types of the members as well as their names.
-    pub(super) fn is_sub_interface_of(self, db: &'db dyn Db, other: Self) -> bool {
-        self.inner(db)
-            .keys()
-            .all(|member_name| other.inner(db).contains_key(member_name))
+    pub(super) fn has_relation_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        relation: TypeRelation,
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        other.members(db).when_all(db, |other_member| {
+            self.member_by_name(db, other_member.name)
+                .when_some_and(|our_member| match (our_member.kind, other_member.kind) {
+                    // Method members are always immutable;
+                    // they can never be subtypes of/assignable to mutable attribute members.
+                    (ProtocolMemberKind::Method(_), ProtocolMemberKind::Other(_)) => {
+                        ConstraintSet::from(false)
+                    }
+
+                    // A property member can only be a subtype of an attribute member
+                    // if the property is readable *and* writable.
+                    //
+                    // TODO: this should also consider the types of the members on both sides.
+                    (ProtocolMemberKind::Property(property), ProtocolMemberKind::Other(_)) => {
+                        ConstraintSet::from(
+                            property.getter(db).is_some() && property.setter(db).is_some(),
+                        )
+                    }
+
+                    // A `@property` member can never be a subtype of a method member, as it is not necessarily
+                    // accessible on the meta-type, whereas a method member must be.
+                    (ProtocolMemberKind::Property(_), ProtocolMemberKind::Method(_)) => {
+                        ConstraintSet::from(false)
+                    }
+
+                    // But an attribute member *can* be a subtype of a method member,
+                    // providing it is marked `ClassVar`
+                    (
+                        ProtocolMemberKind::Other(our_type),
+                        ProtocolMemberKind::Method(other_type),
+                    ) => ConstraintSet::from(
+                        our_member.qualifiers.contains(TypeQualifiers::CLASS_VAR),
+                    )
+                    .and(db, || {
+                        our_type.has_relation_to_impl(
+                            db,
+                            Type::Callable(other_type.bind_self(db)),
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        )
+                    }),
+
+                    (
+                        ProtocolMemberKind::Method(our_method),
+                        ProtocolMemberKind::Method(other_method),
+                    ) => our_method.bind_self(db).has_relation_to_impl(
+                        db,
+                        other_method.bind_self(db),
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    ),
+
+                    (
+                        ProtocolMemberKind::Other(our_type),
+                        ProtocolMemberKind::Other(other_type),
+                    ) => our_type
+                        .has_relation_to_impl(
+                            db,
+                            other_type,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        )
+                        .and(db, || {
+                            other_type.has_relation_to_impl(
+                                db,
+                                our_type,
+                                inferable,
+                                relation,
+                                relation_visitor,
+                                disjointness_visitor,
+                            )
+                        }),
+
+                    // TODO: finish assignability/subtyping between two `@property` members,
+                    // and between a `@property` member and a member of a different kind.
+                    (
+                        ProtocolMemberKind::Property(_)
+                        | ProtocolMemberKind::Method(_)
+                        | ProtocolMemberKind::Other(_),
+                        ProtocolMemberKind::Property(_),
+                    ) => ConstraintSet::from(true),
+                })
+        })
     }
 
     pub(super) fn normalized_impl(self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
@@ -235,20 +339,11 @@ impl<'db> ProtocolInterface<'db> {
         )
     }
 
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self::new(
-            db,
-            self.inner(db)
-                .iter()
-                .map(|(name, data)| (name.clone(), data.materialize(db, variance)))
-                .collect::<BTreeMap<_, _>>(),
-        )
-    }
-
     pub(super) fn specialized_and_normalized<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
     ) -> Self {
         Self::new(
             db,
@@ -257,21 +352,28 @@ impl<'db> ProtocolInterface<'db> {
                 .map(|(name, data)| {
                     (
                         name.clone(),
-                        data.apply_type_mapping(db, type_mapping).normalized(db),
+                        data.apply_type_mapping_impl(
+                            db,
+                            type_mapping,
+                            tcx,
+                            &ApplyTypeMappingVisitor::default(),
+                        )
+                        .normalized(db),
                     )
                 })
                 .collect::<BTreeMap<_, _>>(),
         )
     }
 
-    pub(super) fn find_legacy_typevars(
+    pub(super) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         for data in self.inner(db).values() {
-            data.find_legacy_typevars(db, binding_context, typevars);
+            data.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
@@ -318,7 +420,7 @@ pub(super) struct ProtocolMemberData<'db> {
 
 impl<'db> ProtocolMemberData<'db> {
     fn normalized(&self, db: &'db dyn Db) -> Self {
-        self.normalized_impl(db, &TypeTransformer::default())
+        self.normalized_impl(db, &NormalizedVisitor::default())
     }
 
     fn normalized_impl(&self, db: &'db dyn Db, visitor: &NormalizedVisitor<'db>) -> Self {
@@ -328,28 +430,30 @@ impl<'db> ProtocolMemberData<'db> {
         }
     }
 
-    fn apply_type_mapping<'a>(&self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
+    fn apply_type_mapping_impl<'a>(
+        &self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         Self {
-            kind: self.kind.apply_type_mapping(db, type_mapping),
+            kind: self
+                .kind
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor),
             qualifiers: self.qualifiers,
         }
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         self.kind
-            .find_legacy_typevars(db, binding_context, typevars);
-    }
-
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self {
-            kind: self.kind.materialize(db, variance),
-            qualifiers: self.qualifiers,
-        }
+            .find_legacy_typevars_impl(db, binding_context, typevars, visitor);
     }
 
     fn display(&self, db: &'db dyn Db) -> impl std::fmt::Display {
@@ -417,52 +521,48 @@ impl<'db> ProtocolMemberKind<'db> {
         }
     }
 
-    fn apply_type_mapping<'a>(&self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
+    fn apply_type_mapping_impl<'a>(
+        &self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         match self {
-            ProtocolMemberKind::Method(callable) => {
-                ProtocolMemberKind::Method(callable.apply_type_mapping(db, type_mapping))
-            }
-            ProtocolMemberKind::Property(property) => {
-                ProtocolMemberKind::Property(property.apply_type_mapping(db, type_mapping))
-            }
-            ProtocolMemberKind::Other(ty) => {
-                ProtocolMemberKind::Other(ty.apply_type_mapping(db, type_mapping))
-            }
+            ProtocolMemberKind::Method(callable) => ProtocolMemberKind::Method(
+                callable.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
+            ),
+            ProtocolMemberKind::Property(property) => ProtocolMemberKind::Property(
+                property.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
+            ),
+            ProtocolMemberKind::Other(ty) => ProtocolMemberKind::Other(ty.apply_type_mapping_impl(
+                db,
+                type_mapping,
+                tcx,
+                visitor,
+            )),
         }
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self {
             ProtocolMemberKind::Method(callable) => {
-                callable.find_legacy_typevars(db, binding_context, typevars);
+                callable.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
             ProtocolMemberKind::Property(property) => {
-                property.find_legacy_typevars(db, binding_context, typevars);
+                property.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
             ProtocolMemberKind::Other(ty) => {
                 ty.find_legacy_typevars(db, binding_context, typevars);
             }
         }
     }
-
-    fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        match self {
-            ProtocolMemberKind::Method(callable) => {
-                ProtocolMemberKind::Method(callable.materialize(db, variance))
-            }
-            ProtocolMemberKind::Property(property) => {
-                ProtocolMemberKind::Property(property.materialize(db, variance))
-            }
-            ProtocolMemberKind::Other(ty) => {
-                ProtocolMemberKind::Other(ty.materialize(db, variance))
-            }
-        }
-    }
 }
 
 /// A single member of a protocol interface.
@@ -508,12 +608,22 @@ impl<'a, 'db> ProtocolMember<'a, 'db> {
         &self,
         db: &'db dyn Db,
         other: Type<'db>,
-        visitor: &IsDisjointVisitor<'db>,
-    ) -> bool {
+        inferable: InferableTypeVars<'_, 'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+        relation_visitor: &HasRelationToVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match &self.kind {
             // TODO: implement disjointness for property/method members as well as attribute members
-            ProtocolMemberKind::Property(_) | ProtocolMemberKind::Method(_) => false,
-            ProtocolMemberKind::Other(ty) => ty.is_disjoint_from_impl(db, other, visitor),
+            ProtocolMemberKind::Property(_) | ProtocolMemberKind::Method(_) => {
+                ConstraintSet::from(false)
+            }
+            ProtocolMemberKind::Other(ty) => ty.is_disjoint_from_impl(
+                db,
+                other,
+                inferable,
+                disjointness_visitor,
+                relation_visitor,
+            ),
         }
     }
 
@@ -523,27 +633,82 @@ impl<'a, 'db> ProtocolMember<'a, 'db> {
         &self,
         db: &'db dyn Db,
         other: Type<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match &self.kind {
-            // TODO: consider the types of the attribute on `other` for method members
-            ProtocolMemberKind::Method(_) => matches!(
-                other.to_meta_type(db).member(db, self.name).place,
-                Place::Type(_, Boundness::Bound)
-            ),
+            ProtocolMemberKind::Method(method) => {
+                // `__call__` members must be special cased for several reasons:
+                //
+                // 1. Looking up `__call__` on the meta-type of a `Callable` type returns `Place::Undefined` currently
+                // 2. Looking up `__call__` on the meta-type of a function-literal type currently returns a type that
+                //    has an extremely vague signature (`(*args, **kwargs) -> Any`), which is not useful for protocol
+                //    checking.
+                // 3. Looking up `__call__` on the meta-type of a class-literal, generic-alias or subclass-of type is
+                //    unfortunately not sufficient to obtain the `Callable` supertypes of these types, due to the
+                //    complex interaction between `__new__`, `__init__` and metaclass `__call__`.
+                let attribute_type = if self.name == "__call__" {
+                    let Some(attribute_type) = other.try_upcast_to_callable(db) else {
+                        return ConstraintSet::from(false);
+                    };
+                    attribute_type
+                } else {
+                    let Place::Defined(attribute_type, _, Definedness::AlwaysDefined) = other
+                        .invoke_descriptor_protocol(
+                            db,
+                            self.name,
+                            Place::Undefined.into(),
+                            InstanceFallbackShadowsNonDataDescriptor::No,
+                            MemberLookupPolicy::default(),
+                        )
+                        .place
+                    else {
+                        return ConstraintSet::from(false);
+                    };
+                    attribute_type
+                };
+
+                attribute_type.has_relation_to_impl(
+                    db,
+                    Type::Callable(method.bind_self(db)),
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
+            }
             // TODO: consider the types of the attribute on `other` for property members
-            ProtocolMemberKind::Property(_) => matches!(
+            ProtocolMemberKind::Property(_) => ConstraintSet::from(matches!(
                 other.member(db, self.name).place,
-                Place::Type(_, Boundness::Bound)
-            ),
+                Place::Defined(_, _, Definedness::AlwaysDefined)
+            )),
             ProtocolMemberKind::Other(member_type) => {
-                let Place::Type(attribute_type, Boundness::Bound) =
+                let Place::Defined(attribute_type, _, Definedness::AlwaysDefined) =
                     other.member(db, self.name).place
                 else {
-                    return false;
+                    return ConstraintSet::from(false);
                 };
-                member_type.has_relation_to(db, attribute_type, relation)
-                    && attribute_type.has_relation_to(db, *member_type, relation)
+                member_type
+                    .has_relation_to_impl(
+                        db,
+                        attribute_type,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                    .and(db, || {
+                        attribute_type.has_relation_to_impl(
+                            db,
+                            *member_type,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        )
+                    })
             }
         }
     }
@@ -601,19 +766,22 @@ impl BoundOnClass {
 }
 
 /// Inner Salsa query for [`ProtocolClassLiteral::interface`].
-#[salsa::tracked(cycle_fn=proto_interface_cycle_recover, cycle_initial=proto_interface_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(cycle_initial=proto_interface_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
 fn cached_protocol_interface<'db>(
     db: &'db dyn Db,
-    class: ClassLiteral<'db>,
+    class: ClassType<'db>,
 ) -> ProtocolInterface<'db> {
     let mut members = BTreeMap::default();
 
-    for parent_protocol in class
-        .iter_mro(db, None)
+    for (parent_protocol, specialization) in class
+        .iter_mro(db)
         .filter_map(ClassBase::into_class)
-        .filter_map(|class| class.class_literal(db).0.into_protocol_class(db))
+        .filter_map(|class| {
+            let (class, specialization) = class.class_literal(db);
+            Some((class.into_protocol_class(db)?, specialization))
+        })
     {
-        let parent_scope = parent_protocol.body_scope(db);
+        let parent_scope = parent_protocol.class_literal(db).0.body_scope(db);
         let use_def_map = use_def_map(db, parent_scope);
         let place_table = place_table(db, parent_scope);
         let mut direct_members = FxHashMap::default();
@@ -627,7 +795,7 @@ fn cached_protocol_interface<'db>(
         // type narrowing that uses `isinstance()` or `issubclass()` with
         // runtime-checkable protocols.
         for (symbol_id, bindings) in use_def_map.all_end_of_scope_symbol_bindings() {
-            let Some(ty) = place_from_bindings(db, bindings).ignore_possibly_unbound() else {
+            let Some(ty) = place_from_bindings(db, bindings).ignore_possibly_undefined() else {
                 continue;
             };
             direct_members.insert(
@@ -638,7 +806,7 @@ fn cached_protocol_interface<'db>(
 
         for (symbol_id, declarations) in use_def_map.all_end_of_scope_symbol_declarations() {
             let place = place_from_declarations(db, declarations).ignore_conflicting_declarations();
-            if let Some(new_type) = place.place.ignore_possibly_unbound() {
+            if let Some(new_type) = place.place.ignore_possibly_undefined() {
                 direct_members
                     .entry(symbol_id)
                     .and_modify(|(ty, quals, _)| {
@@ -658,6 +826,8 @@ fn cached_protocol_interface<'db>(
                 continue;
             }
 
+            let ty = ty.apply_optional_specialization(db, specialization);
+
             let member = match ty {
                 Type::PropertyInstance(property) => ProtocolMemberKind::Property(property),
                 Type::Callable(callable)
@@ -665,6 +835,13 @@ fn cached_protocol_interface<'db>(
                 {
                     ProtocolMemberKind::Method(callable)
                 }
+                Type::FunctionLiteral(function)
+                    if function.is_staticmethod(db) || function.is_classmethod(db) =>
+                {
+                    ProtocolMemberKind::Other(todo_type!(
+                        "classmethod and staticmethod protocol members"
+                    ))
+                }
                 Type::FunctionLiteral(function) if bound_on_class.is_yes() => {
                     ProtocolMemberKind::Method(function.into_callable_type(db))
                 }
@@ -684,19 +861,12 @@ fn cached_protocol_interface<'db>(
     ProtocolInterface::new(db, members)
 }
 
+// If we use `expect(clippy::trivially_copy_pass_by_ref)` here,
+// the lint expectation is unfulfilled on WASM
 #[allow(clippy::trivially_copy_pass_by_ref)]
-fn proto_interface_cycle_recover<'db>(
-    _db: &dyn Db,
-    _value: &ProtocolInterface<'db>,
-    _count: u32,
-    _class: ClassLiteral<'db>,
-) -> salsa::CycleRecoveryAction<ProtocolInterface<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn proto_interface_cycle_initial<'db>(
     db: &'db dyn Db,
-    _class: ClassLiteral<'db>,
+    _class: ClassType<'db>,
 ) -> ProtocolInterface<'db> {
     ProtocolInterface::empty(db)
 }
diff --git a/crates/ty_python_semantic/src/types/signatures.rs b/crates/ty_python_semantic/src/types/signatures.rs
index 4c80c37571..26c3aca6a1 100644
--- a/crates/ty_python_semantic/src/types/signatures.rs
+++ b/crates/ty_python_semantic/src/types/signatures.rs
@@ -12,19 +12,71 @@
 
 use std::{collections::HashMap, slice::Iter};
 
-use itertools::EitherOrBoth;
+use itertools::{EitherOrBoth, Itertools};
+use ruff_python_ast::ParameterWithDefault;
 use smallvec::{SmallVec, smallvec_inline};
 
-use super::{DynamicType, Type, TypeVarVariance, definition_expression_type};
+use super::{
+    DynamicType, Type, TypeVarVariance, definition_expression_type, infer_definition_types,
+    semantic_index,
+};
 use crate::semantic_index::definition::Definition;
-use crate::types::generics::{GenericContext, walk_generic_context};
+use crate::types::constraints::{ConstraintSet, IteratorConstraintsExtension};
+use crate::types::function::FunctionType;
+use crate::types::generics::{
+    GenericContext, InferableTypeVars, typing_self, walk_generic_context,
+};
+use crate::types::infer::nearest_enclosing_class;
 use crate::types::{
-    BindingContext, BoundTypeVarInstance, KnownClass, NormalizedVisitor, TypeMapping, TypeRelation,
-    VarianceInferable, todo_type,
+    ApplyTypeMappingVisitor, BoundTypeVarInstance, ClassLiteral, FindLegacyTypeVarsVisitor,
+    HasRelationToVisitor, IsDisjointVisitor, IsEquivalentVisitor, KnownClass, MaterializationKind,
+    NormalizedVisitor, TypeContext, TypeMapping, TypeRelation, VarianceInferable, todo_type,
 };
 use crate::{Db, FxOrderSet};
 use ruff_python_ast::{self as ast, name::Name};
 
+#[derive(Clone, Copy, Debug)]
+struct MethodInformation<'db> {
+    method: FunctionType<'db>,
+    class_literal: ClassLiteral<'db>,
+    class_is_generic: bool,
+}
+
+fn infer_method_information<'db>(
+    db: &'db dyn Db,
+    definition: Definition<'db>,
+) -> Option<MethodInformation<'db>> {
+    let class_scope_id = definition.scope(db);
+    let file = class_scope_id.file(db);
+    let index = semantic_index(db, file);
+
+    let class_scope = index.scope(class_scope_id.file_scope_id(db));
+    let class_node = class_scope.node().as_class()?;
+
+    let method = infer_definition_types(db, definition)
+        .declaration_type(definition)
+        .inner_type()
+        .as_function_literal()?;
+
+    let class_def = index.expect_single_definition(class_node);
+    let (class_literal, class_is_generic) = match infer_definition_types(db, class_def)
+        .declaration_type(class_def)
+        .inner_type()
+    {
+        Type::ClassLiteral(class_literal) => {
+            (class_literal, class_literal.generic_context(db).is_some())
+        }
+        Type::GenericAlias(alias) => (alias.origin(db), true),
+        _ => return None,
+    };
+
+    Some(MethodInformation {
+        method,
+        class_literal,
+        class_is_generic,
+    })
+}
+
 /// The signature of a single callable. If the callable is overloaded, there is a separate
 /// [`Signature`] for each overload.
 #[derive(Clone, Debug, PartialEq, Eq, Hash, salsa::Update, get_size2::GetSize)]
@@ -41,6 +93,10 @@ impl<'db> CallableSignature<'db> {
         }
     }
 
+    pub(crate) fn bottom() -> Self {
+        Self::single(Signature::bottom())
+    }
+
     /// Creates a new `CallableSignature` from an iterator of [`Signature`]s. Returns a
     /// non-callable signature if the iterator is empty.
     pub(crate) fn from_overloads<I>(overloads: I) -> Self
@@ -56,12 +112,16 @@ impl<'db> CallableSignature<'db> {
         self.overloads.iter()
     }
 
-    pub(super) fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self::from_overloads(
-            self.overloads
-                .iter()
-                .map(|signature| signature.materialize(db, variance)),
-        )
+    pub(crate) fn with_inherited_generic_context(
+        &self,
+        db: &'db dyn Db,
+        inherited_generic_context: GenericContext<'db>,
+    ) -> Self {
+        Self::from_overloads(self.overloads.iter().map(|signature| {
+            signature
+                .clone()
+                .with_inherited_generic_context(db, inherited_generic_context)
+        }))
     }
 
     pub(crate) fn normalized_impl(
@@ -76,26 +136,29 @@ impl<'db> CallableSignature<'db> {
         )
     }
 
-    pub(crate) fn apply_type_mapping<'a>(
+    pub(crate) fn apply_type_mapping_impl<'a>(
         &self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
         Self::from_overloads(
             self.overloads
                 .iter()
-                .map(|signature| signature.apply_type_mapping(db, type_mapping)),
+                .map(|signature| signature.apply_type_mapping_impl(db, type_mapping, tcx, visitor)),
         )
     }
 
-    pub(crate) fn find_legacy_typevars(
+    pub(crate) fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         for signature in &self.overloads {
-            signature.find_legacy_typevars(db, binding_context, typevars);
+            signature.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
@@ -112,83 +175,102 @@ impl<'db> CallableSignature<'db> {
         }
     }
 
-    pub(crate) fn has_relation_to(
+    fn is_subtype_of_impl(
         &self,
         db: &'db dyn Db,
         other: &Self,
-        relation: TypeRelation,
-    ) -> bool {
-        match relation {
-            TypeRelation::Subtyping => self.is_subtype_of(db, other),
-            TypeRelation::Assignability => self.is_assignable_to(db, other),
-        }
-    }
-
-    /// Check whether this callable type is a subtype of another callable type.
-    ///
-    /// See [`Type::is_subtype_of`] for more details.
-    pub(crate) fn is_subtype_of(&self, db: &'db dyn Db, other: &Self) -> bool {
-        Self::has_relation_to_impl(
+        inferable: InferableTypeVars<'_, 'db>,
+    ) -> ConstraintSet<'db> {
+        self.has_relation_to_impl(
             db,
-            &self.overloads,
-            &other.overloads,
+            other,
+            inferable,
             TypeRelation::Subtyping,
+            &HasRelationToVisitor::default(),
+            &IsDisjointVisitor::default(),
         )
     }
 
-    /// Check whether this callable type is assignable to another callable type.
-    ///
-    /// See [`Type::is_assignable_to`] for more details.
-    pub(crate) fn is_assignable_to(&self, db: &'db dyn Db, other: &Self) -> bool {
-        Self::has_relation_to_impl(
+    pub(crate) fn has_relation_to_impl(
+        &self,
+        db: &'db dyn Db,
+        other: &Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        relation: TypeRelation,
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        Self::has_relation_to_inner(
             db,
             &self.overloads,
             &other.overloads,
-            TypeRelation::Assignability,
+            inferable,
+            relation,
+            relation_visitor,
+            disjointness_visitor,
         )
     }
 
     /// Implementation of subtyping and assignability between two, possible overloaded, callable
     /// types.
-    fn has_relation_to_impl(
+    fn has_relation_to_inner(
         db: &'db dyn Db,
         self_signatures: &[Signature<'db>],
         other_signatures: &[Signature<'db>],
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self_signatures, other_signatures) {
             ([self_signature], [other_signature]) => {
                 // Base case: both callable types contain a single signature.
-                self_signature.has_relation_to(db, other_signature, relation)
+                self_signature.has_relation_to_impl(
+                    db,
+                    other_signature,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                )
             }
 
             // `self` is possibly overloaded while `other` is definitely not overloaded.
-            (_, [_]) => self_signatures.iter().any(|self_signature| {
-                Self::has_relation_to_impl(
+            (_, [_]) => self_signatures.iter().when_any(db, |self_signature| {
+                Self::has_relation_to_inner(
                     db,
                     std::slice::from_ref(self_signature),
                     other_signatures,
+                    inferable,
                     relation,
+                    relation_visitor,
+                    disjointness_visitor,
                 )
             }),
 
             // `self` is definitely not overloaded while `other` is possibly overloaded.
-            ([_], _) => other_signatures.iter().all(|other_signature| {
-                Self::has_relation_to_impl(
+            ([_], _) => other_signatures.iter().when_all(db, |other_signature| {
+                Self::has_relation_to_inner(
                     db,
                     self_signatures,
                     std::slice::from_ref(other_signature),
+                    inferable,
                     relation,
+                    relation_visitor,
+                    disjointness_visitor,
                 )
             }),
 
             // `self` is definitely overloaded while `other` is possibly overloaded.
-            (_, _) => other_signatures.iter().all(|other_signature| {
-                Self::has_relation_to_impl(
+            (_, _) => other_signatures.iter().when_all(db, |other_signature| {
+                Self::has_relation_to_inner(
                     db,
                     self_signatures,
                     std::slice::from_ref(other_signature),
+                    inferable,
                     relation,
+                    relation_visitor,
+                    disjointness_visitor,
                 )
             }),
         }
@@ -197,18 +279,25 @@ impl<'db> CallableSignature<'db> {
     /// Check whether this callable type is equivalent to another callable type.
     ///
     /// See [`Type::is_equivalent_to`] for more details.
-    pub(crate) fn is_equivalent_to(&self, db: &'db dyn Db, other: &Self) -> bool {
+    pub(crate) fn is_equivalent_to_impl(
+        &self,
+        db: &'db dyn Db,
+        other: &Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self.overloads.as_slice(), other.overloads.as_slice()) {
             ([self_signature], [other_signature]) => {
                 // Common case: both callable types contain a single signature, use the custom
                 // equivalence check instead of delegating it to the subtype check.
-                self_signature.is_equivalent_to(db, other_signature)
+                self_signature.is_equivalent_to_impl(db, other_signature, inferable, visitor)
             }
             (_, _) => {
                 if self == other {
-                    return true;
+                    return ConstraintSet::from(true);
                 }
-                self.is_subtype_of(db, other) && other.is_subtype_of(db, self)
+                self.is_subtype_of_impl(db, other, inferable)
+                    .and(db, || other.is_subtype_of_impl(db, self, inferable))
             }
         }
     }
@@ -234,16 +323,11 @@ impl<'db> VarianceInferable<'db> for &CallableSignature<'db> {
 }
 
 /// The signature of one of the overloads of a callable.
-#[derive(Clone, Debug, salsa::Update, get_size2::GetSize)]
+#[derive(Clone, Debug, salsa::Update, get_size2::GetSize, PartialEq, Eq, Hash)]
 pub struct Signature<'db> {
     /// The generic context for this overload, if it is generic.
     pub(crate) generic_context: Option<GenericContext<'db>>,
 
-    /// The inherited generic context, if this function is a class method being used to infer the
-    /// specialization of its generic class. If the method is itself generic, this is in addition
-    /// to its own generic context.
-    pub(crate) inherited_generic_context: Option<GenericContext<'db>>,
-
     /// The original definition associated with this function, if available.
     /// This is useful for locating and extracting docstring information for the signature.
     pub(crate) definition: Option<Definition<'db>>,
@@ -270,9 +354,6 @@ pub(super) fn walk_signature<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
     if let Some(generic_context) = &signature.generic_context {
         walk_generic_context(db, *generic_context, visitor);
     }
-    if let Some(inherited_generic_context) = &signature.inherited_generic_context {
-        walk_generic_context(db, *inherited_generic_context, visitor);
-    }
     // By default we usually don't visit the type of the default value,
     // as it isn't relevant to most things
     for parameter in &signature.parameters {
@@ -289,7 +370,6 @@ impl<'db> Signature<'db> {
     pub(crate) fn new(parameters: Parameters<'db>, return_ty: Option<Type<'db>>) -> Self {
         Self {
             generic_context: None,
-            inherited_generic_context: None,
             definition: None,
             parameters,
             return_ty,
@@ -303,7 +383,6 @@ impl<'db> Signature<'db> {
     ) -> Self {
         Self {
             generic_context,
-            inherited_generic_context: None,
             definition: None,
             parameters,
             return_ty,
@@ -314,7 +393,6 @@ impl<'db> Signature<'db> {
     pub(crate) fn dynamic(signature_type: Type<'db>) -> Self {
         Signature {
             generic_context: None,
-            inherited_generic_context: None,
             definition: None,
             parameters: Parameters::gradual_form(),
             return_ty: Some(signature_type),
@@ -327,7 +405,6 @@ impl<'db> Signature<'db> {
         let signature_type = todo_type!(reason);
         Signature {
             generic_context: None,
-            inherited_generic_context: None,
             definition: None,
             parameters: Parameters::todo(),
             return_ty: Some(signature_type),
@@ -337,74 +414,69 @@ impl<'db> Signature<'db> {
     /// Return a typed signature from a function definition.
     pub(super) fn from_function(
         db: &'db dyn Db,
-        generic_context: Option<GenericContext<'db>>,
-        inherited_generic_context: Option<GenericContext<'db>>,
+        pep695_generic_context: Option<GenericContext<'db>>,
         definition: Definition<'db>,
         function_node: &ast::StmtFunctionDef,
-        is_generator: bool,
+        has_implicitly_positional_first_parameter: bool,
     ) -> Self {
-        let parameters =
-            Parameters::from_parameters(db, definition, function_node.parameters.as_ref());
-        let return_ty = function_node.returns.as_ref().map(|returns| {
-            let plain_return_ty = definition_expression_type(db, definition, returns.as_ref())
-                .apply_type_mapping(
-                    db,
-                    &TypeMapping::MarkTypeVarsInferable(BindingContext::Definition(definition)),
-                );
-            if function_node.is_async && !is_generator {
-                KnownClass::CoroutineType
-                    .to_specialized_instance(db, [Type::any(), Type::any(), plain_return_ty])
-            } else {
-                plain_return_ty
-            }
-        });
+        let parameters = Parameters::from_parameters(
+            db,
+            definition,
+            function_node.parameters.as_ref(),
+            has_implicitly_positional_first_parameter,
+        );
+        let return_ty = function_node
+            .returns
+            .as_ref()
+            .map(|returns| definition_expression_type(db, definition, returns.as_ref()));
         let legacy_generic_context =
             GenericContext::from_function_params(db, definition, &parameters, return_ty);
-
-        if generic_context.is_some() && legacy_generic_context.is_some() {
-            // TODO: Raise a diagnostic!
-        }
+        let full_generic_context = GenericContext::merge_pep695_and_legacy(
+            db,
+            pep695_generic_context,
+            legacy_generic_context,
+        );
 
         Self {
-            generic_context: generic_context.or(legacy_generic_context),
-            inherited_generic_context,
+            generic_context: full_generic_context,
             definition: Some(definition),
             parameters,
             return_ty,
         }
     }
 
+    pub(super) fn wrap_coroutine_return_type(self, db: &'db dyn Db) -> Self {
+        let return_ty = self.return_ty.map(|return_ty| {
+            KnownClass::CoroutineType
+                .to_specialized_instance(db, [Type::any(), Type::any(), return_ty])
+        });
+        Self { return_ty, ..self }
+    }
+
     /// Returns the signature which accepts any parameters and returns an `Unknown` type.
     pub(crate) fn unknown() -> Self {
         Self::new(Parameters::unknown(), Some(Type::unknown()))
     }
 
     /// Return the "bottom" signature, subtype of all other fully-static signatures.
-    pub(crate) fn bottom(db: &'db dyn Db) -> Self {
-        Self::new(Parameters::object(db), Some(Type::Never))
+    pub(crate) fn bottom() -> Self {
+        Self::new(Parameters::object(), Some(Type::Never))
     }
 
     pub(crate) fn with_inherited_generic_context(
         mut self,
-        inherited_generic_context: Option<GenericContext<'db>>,
+        db: &'db dyn Db,
+        inherited_generic_context: GenericContext<'db>,
     ) -> Self {
-        self.inherited_generic_context = inherited_generic_context;
-        self
-    }
-
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self {
-            generic_context: self.generic_context,
-            inherited_generic_context: self.inherited_generic_context,
-            definition: self.definition,
-            // Parameters are at contravariant position, so the variance is flipped.
-            parameters: self.parameters.materialize(db, variance.flip()),
-            return_ty: Some(
-                self.return_ty
-                    .unwrap_or(Type::unknown())
-                    .materialize(db, variance),
-            ),
+        match self.generic_context.as_mut() {
+            Some(generic_context) => {
+                *generic_context = generic_context.merge(db, inherited_generic_context);
+            }
+            None => {
+                self.generic_context = Some(inherited_generic_context);
+            }
         }
+        self
     }
 
     pub(crate) fn normalized_impl(
@@ -416,9 +488,6 @@ impl<'db> Signature<'db> {
             generic_context: self
                 .generic_context
                 .map(|ctx| ctx.normalized_impl(db, visitor)),
-            inherited_generic_context: self
-                .inherited_generic_context
-                .map(|ctx| ctx.normalized_impl(db, visitor)),
             // Discard the definition when normalizing, so that two equivalent signatures
             // with different `Definition`s share the same Salsa ID when normalized
             definition: None,
@@ -433,38 +502,50 @@ impl<'db> Signature<'db> {
         }
     }
 
-    pub(crate) fn apply_type_mapping<'a>(
+    pub(crate) fn apply_type_mapping_impl<'a>(
         &self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
+        let flipped_mapping = match type_mapping {
+            TypeMapping::Materialize(materialization_kind) => {
+                &TypeMapping::Materialize(materialization_kind.flip())
+            }
+            _ => type_mapping,
+        };
         Self {
-            generic_context: self.generic_context,
-            inherited_generic_context: self.inherited_generic_context,
+            generic_context: self
+                .generic_context
+                .map(|context| type_mapping.update_signature_generic_context(db, context)),
             definition: self.definition,
-            parameters: self.parameters.apply_type_mapping(db, type_mapping),
+            parameters: self
+                .parameters
+                .apply_type_mapping_impl(db, flipped_mapping, tcx, visitor),
             return_ty: self
                 .return_ty
-                .map(|ty| ty.apply_type_mapping(db, type_mapping)),
+                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor)),
         }
     }
 
-    pub(crate) fn find_legacy_typevars(
+    pub(crate) fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         for param in &self.parameters {
             if let Some(ty) = param.annotated_type() {
-                ty.find_legacy_typevars(db, binding_context, typevars);
+                ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
             if let Some(ty) = param.default_type() {
-                ty.find_legacy_typevars(db, binding_context, typevars);
+                ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
         }
         if let Some(ty) = self.return_ty {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
@@ -479,16 +560,33 @@ impl<'db> Signature<'db> {
     }
 
     pub(crate) fn bind_self(&self, db: &'db dyn Db, self_type: Option<Type<'db>>) -> Self {
-        let mut parameters = Parameters::new(self.parameters().iter().skip(1).cloned());
+        let mut parameters = self.parameters.iter().cloned().peekable();
+
+        // TODO: Theoretically, for a signature like `f(*args: *tuple[MyClass, int, *tuple[str, ...]])` with
+        // a variadic first parameter, we should also "skip the first parameter" by modifying the tuple type.
+        if parameters.peek().is_some_and(Parameter::is_positional) {
+            parameters.next();
+        }
+
+        let mut parameters = Parameters::new(parameters);
         let mut return_ty = self.return_ty;
         if let Some(self_type) = self_type {
-            parameters = parameters.apply_type_mapping(db, &TypeMapping::BindSelf(self_type));
-            return_ty =
-                return_ty.map(|ty| ty.apply_type_mapping(db, &TypeMapping::BindSelf(self_type)));
+            parameters = parameters.apply_type_mapping_impl(
+                db,
+                &TypeMapping::BindSelf(self_type),
+                TypeContext::default(),
+                &ApplyTypeMappingVisitor::default(),
+            );
+            return_ty = return_ty.map(|ty| {
+                ty.apply_type_mapping(
+                    db,
+                    &TypeMapping::BindSelf(self_type),
+                    TypeContext::default(),
+                )
+            });
         }
         Self {
             generic_context: self.generic_context,
-            inherited_generic_context: self.inherited_generic_context,
             definition: self.definition,
             parameters,
             return_ty,
@@ -498,23 +596,44 @@ impl<'db> Signature<'db> {
     /// Return `true` if `self` has exactly the same set of possible static materializations as
     /// `other` (if `self` represents the same set of possible sets of possible runtime objects as
     /// `other`).
-    pub(crate) fn is_equivalent_to(&self, db: &'db dyn Db, other: &Signature<'db>) -> bool {
-        let check_types = |self_type: Option<Type<'db>>, other_type: Option<Type<'db>>| {
-            self_type
-                .unwrap_or(Type::unknown())
-                .is_equivalent_to(db, other_type.unwrap_or(Type::unknown()))
+    pub(crate) fn is_equivalent_to_impl(
+        &self,
+        db: &'db dyn Db,
+        other: &Signature<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        // The typevars in self and other should also be considered inferable when checking whether
+        // two signatures are equivalent.
+        let self_inferable =
+            (self.generic_context).map(|generic_context| generic_context.inferable_typevars(db));
+        let other_inferable =
+            (other.generic_context).map(|generic_context| generic_context.inferable_typevars(db));
+        let inferable = inferable.merge(self_inferable.as_ref());
+        let inferable = inferable.merge(other_inferable.as_ref());
+
+        let mut result = ConstraintSet::from(true);
+        let mut check_types = |self_type: Option<Type<'db>>, other_type: Option<Type<'db>>| {
+            let self_type = self_type.unwrap_or(Type::unknown());
+            let other_type = other_type.unwrap_or(Type::unknown());
+            !result
+                .intersect(
+                    db,
+                    self_type.is_equivalent_to_impl(db, other_type, inferable, visitor),
+                )
+                .is_never_satisfied()
         };
 
         if self.parameters.is_gradual() != other.parameters.is_gradual() {
-            return false;
+            return ConstraintSet::from(false);
         }
 
         if self.parameters.len() != other.parameters.len() {
-            return false;
+            return ConstraintSet::from(false);
         }
 
         if !check_types(self.return_ty, other.return_ty) {
-            return false;
+            return result;
         }
 
         for (self_parameter, other_parameter) in self.parameters.iter().zip(&other.parameters) {
@@ -558,27 +677,30 @@ impl<'db> Signature<'db> {
 
                 (ParameterKind::KeywordVariadic { .. }, ParameterKind::KeywordVariadic { .. }) => {}
 
-                _ => return false,
+                _ => return ConstraintSet::from(false),
             }
 
             if !check_types(
                 self_parameter.annotated_type(),
                 other_parameter.annotated_type(),
             ) {
-                return false;
+                return result;
             }
         }
 
-        true
+        result
     }
 
     /// Implementation of subtyping and assignability for signature.
-    fn has_relation_to(
+    fn has_relation_to_impl(
         &self,
         db: &'db dyn Db,
         other: &Signature<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         /// A helper struct to zip two slices of parameters together that provides control over the
         /// two iterators individually. It also keeps track of the current parameter in each
         /// iterator.
@@ -640,17 +762,37 @@ impl<'db> Signature<'db> {
             }
         }
 
-        let check_types = |type1: Option<Type<'db>>, type2: Option<Type<'db>>| {
-            type1.unwrap_or(Type::unknown()).has_relation_to(
-                db,
-                type2.unwrap_or(Type::unknown()),
-                relation,
-            )
+        // The typevars in self and other should also be considered inferable when checking whether
+        // two signatures are equivalent.
+        let self_inferable =
+            (self.generic_context).map(|generic_context| generic_context.inferable_typevars(db));
+        let other_inferable =
+            (other.generic_context).map(|generic_context| generic_context.inferable_typevars(db));
+        let inferable = inferable.merge(self_inferable.as_ref());
+        let inferable = inferable.merge(other_inferable.as_ref());
+
+        let mut result = ConstraintSet::from(true);
+        let mut check_types = |type1: Option<Type<'db>>, type2: Option<Type<'db>>| {
+            let type1 = type1.unwrap_or(Type::unknown());
+            let type2 = type2.unwrap_or(Type::unknown());
+            !result
+                .intersect(
+                    db,
+                    type1.has_relation_to_impl(
+                        db,
+                        type2,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    ),
+                )
+                .is_never_satisfied()
         };
 
         // Return types are covariant.
         if !check_types(self.return_ty, other.return_ty) {
-            return false;
+            return result;
         }
 
         // A gradual parameter list is a supertype of the "bottom" parameter list (*args: object,
@@ -659,19 +801,19 @@ impl<'db> Signature<'db> {
             && self
                 .parameters
                 .variadic()
-                .is_some_and(|(_, param)| param.annotated_type().is_some_and(|ty| ty.is_object(db)))
+                .is_some_and(|(_, param)| param.annotated_type().is_some_and(|ty| ty.is_object()))
             && self
                 .parameters
                 .keyword_variadic()
-                .is_some_and(|(_, param)| param.annotated_type().is_some_and(|ty| ty.is_object(db)))
+                .is_some_and(|(_, param)| param.annotated_type().is_some_and(|ty| ty.is_object()))
         {
-            return true;
+            return ConstraintSet::from(true);
         }
 
         // If either of the parameter lists is gradual (`...`), then it is assignable to and from
         // any other parameter list, but not a subtype or supertype of any other parameter list.
         if self.parameters.is_gradual() || other.parameters.is_gradual() {
-            return relation.is_assignability();
+            return ConstraintSet::from(relation.is_assignability());
         }
 
         let mut parameters = ParametersZip {
@@ -689,7 +831,7 @@ impl<'db> Signature<'db> {
             let Some(next_parameter) = parameters.next() else {
                 // All parameters have been checked or both the parameter lists were empty. In
                 // either case, `self` is a subtype of `other`.
-                return true;
+                return result;
             };
 
             match next_parameter {
@@ -709,7 +851,7 @@ impl<'db> Signature<'db> {
                         // `other`, then the non-variadic parameters in `self` must have a default
                         // value.
                         if default_type.is_none() {
-                            return false;
+                            return ConstraintSet::from(false);
                         }
                     }
                     ParameterKind::Variadic { .. } | ParameterKind::KeywordVariadic { .. } => {
@@ -721,7 +863,7 @@ impl<'db> Signature<'db> {
                 EitherOrBoth::Right(_) => {
                     // If there are more parameters in `other` than in `self`, then `self` is not a
                     // subtype of `other`.
-                    return false;
+                    return ConstraintSet::from(false);
                 }
 
                 EitherOrBoth::Both(self_parameter, other_parameter) => {
@@ -741,13 +883,13 @@ impl<'db> Signature<'db> {
                             },
                         ) => {
                             if self_default.is_none() && other_default.is_some() {
-                                return false;
+                                return ConstraintSet::from(false);
                             }
                             if !check_types(
                                 other_parameter.annotated_type(),
                                 self_parameter.annotated_type(),
                             ) {
-                                return false;
+                                return result;
                             }
                         }
 
@@ -762,17 +904,17 @@ impl<'db> Signature<'db> {
                             },
                         ) => {
                             if self_name != other_name {
-                                return false;
+                                return ConstraintSet::from(false);
                             }
                             // The following checks are the same as positional-only parameters.
                             if self_default.is_none() && other_default.is_some() {
-                                return false;
+                                return ConstraintSet::from(false);
                             }
                             if !check_types(
                                 other_parameter.annotated_type(),
                                 self_parameter.annotated_type(),
                             ) {
-                                return false;
+                                return result;
                             }
                         }
 
@@ -785,7 +927,7 @@ impl<'db> Signature<'db> {
                                 other_parameter.annotated_type(),
                                 self_parameter.annotated_type(),
                             ) {
-                                return false;
+                                return result;
                             }
 
                             if matches!(
@@ -825,7 +967,7 @@ impl<'db> Signature<'db> {
                                     other_parameter.annotated_type(),
                                     self_parameter.annotated_type(),
                                 ) {
-                                    return false;
+                                    return result;
                                 }
                                 parameters.next_other();
                             }
@@ -836,7 +978,7 @@ impl<'db> Signature<'db> {
                                 other_parameter.annotated_type(),
                                 self_parameter.annotated_type(),
                             ) {
-                                return false;
+                                return result;
                             }
                         }
 
@@ -851,7 +993,7 @@ impl<'db> Signature<'db> {
                             break;
                         }
 
-                        _ => return false,
+                        _ => return ConstraintSet::from(false),
                     }
                 }
             }
@@ -885,7 +1027,7 @@ impl<'db> Signature<'db> {
                     // previous loop. They cannot be matched against any parameter in `other` which
                     // only contains keyword-only and keyword-variadic parameters so the subtype
                     // relation is invalid.
-                    return false;
+                    return ConstraintSet::from(false);
                 }
                 ParameterKind::Variadic { .. } => {}
             }
@@ -912,13 +1054,13 @@ impl<'db> Signature<'db> {
                                 ..
                             } => {
                                 if self_default.is_none() && other_default.is_some() {
-                                    return false;
+                                    return ConstraintSet::from(false);
                                 }
                                 if !check_types(
                                     other_parameter.annotated_type(),
                                     self_parameter.annotated_type(),
                                 ) {
-                                    return false;
+                                    return result;
                                 }
                             }
                             _ => unreachable!(
@@ -930,25 +1072,25 @@ impl<'db> Signature<'db> {
                             other_parameter.annotated_type(),
                             self_keyword_variadic_type,
                         ) {
-                            return false;
+                            return result;
                         }
                     } else {
-                        return false;
+                        return ConstraintSet::from(false);
                     }
                 }
                 ParameterKind::KeywordVariadic { .. } => {
                     let Some(self_keyword_variadic_type) = self_keyword_variadic else {
                         // For a `self <: other` relationship, if `other` has a keyword variadic
                         // parameter, `self` must also have a keyword variadic parameter.
-                        return false;
+                        return ConstraintSet::from(false);
                     };
                     if !check_types(other_parameter.annotated_type(), self_keyword_variadic_type) {
-                        return false;
+                        return result;
                     }
                 }
                 _ => {
                     // This can only occur in case of a syntax error.
-                    return false;
+                    return ConstraintSet::from(false);
                 }
             }
         }
@@ -957,11 +1099,11 @@ impl<'db> Signature<'db> {
         // optional otherwise the subtype relation is invalid.
         for (_, self_parameter) in self_keywords {
             if self_parameter.default_type().is_none() {
-                return false;
+                return ConstraintSet::from(false);
             }
         }
 
-        true
+        result
     }
 
     /// Create a new signature with the given definition.
@@ -970,28 +1112,6 @@ impl<'db> Signature<'db> {
     }
 }
 
-// Manual implementations of PartialEq, Eq, and Hash that exclude the definition field
-// since the definition is not relevant for type equality/equivalence
-impl PartialEq for Signature<'_> {
-    fn eq(&self, other: &Self) -> bool {
-        self.generic_context == other.generic_context
-            && self.inherited_generic_context == other.inherited_generic_context
-            && self.parameters == other.parameters
-            && self.return_ty == other.return_ty
-    }
-}
-
-impl Eq for Signature<'_> {}
-
-impl std::hash::Hash for Signature<'_> {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.generic_context.hash(state);
-        self.inherited_generic_context.hash(state);
-        self.parameters.hash(state);
-        self.return_ty.hash(state);
-    }
-}
-
 impl<'db> VarianceInferable<'db> for &Signature<'db> {
     fn variance_of(self, db: &'db dyn Db, typevar: BoundTypeVarInstance<'db>) -> TypeVarVariance {
         tracing::debug!(
@@ -1062,17 +1182,6 @@ impl<'db> Parameters<'db> {
         }
     }
 
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        if self.is_gradual {
-            Parameters::object(db)
-        } else {
-            Parameters::new(
-                self.iter()
-                    .map(|parameter| parameter.materialize(db, variance)),
-            )
-        }
-    }
-
     pub(crate) fn as_slice(&self) -> &[Parameter<'db>] {
         self.value.as_slice()
     }
@@ -1130,12 +1239,12 @@ impl<'db> Parameters<'db> {
     }
 
     /// Return parameters that represents `(*args: object, **kwargs: object)`.
-    pub(crate) fn object(db: &'db dyn Db) -> Self {
+    pub(crate) fn object() -> Self {
         Self {
             value: vec![
-                Parameter::variadic(Name::new_static("args")).with_annotated_type(Type::object(db)),
+                Parameter::variadic(Name::new_static("args")).with_annotated_type(Type::object()),
                 Parameter::keyword_variadic(Name::new_static("kwargs"))
-                    .with_annotated_type(Type::object(db)),
+                    .with_annotated_type(Type::object()),
             ],
             is_gradual: false,
         }
@@ -1145,6 +1254,7 @@ impl<'db> Parameters<'db> {
         db: &'db dyn Db,
         definition: Definition<'db>,
         parameters: &ast::Parameters,
+        has_implicitly_positional_first_parameter: bool,
     ) -> Self {
         let ast::Parameters {
             posonlyargs,
@@ -1155,33 +1265,128 @@ impl<'db> Parameters<'db> {
             range: _,
             node_index: _,
         } = parameters;
+
         let default_type = |param: &ast::ParameterWithDefault| {
-            param
-                .default()
-                .map(|default| definition_expression_type(db, definition, default))
+            param.default().map(|default| {
+                definition_expression_type(db, definition, default).replace_parameter_defaults(db)
+            })
         };
-        let positional_only = posonlyargs.iter().map(|arg| {
-            Parameter::from_node_and_kind(
-                db,
-                definition,
-                &arg.parameter,
-                ParameterKind::PositionalOnly {
-                    name: Some(arg.parameter.name.id.clone()),
-                    default_type: default_type(arg),
-                },
-            )
-        });
-        let positional_or_keyword = args.iter().map(|arg| {
-            Parameter::from_node_and_kind(
-                db,
-                definition,
-                &arg.parameter,
-                ParameterKind::PositionalOrKeyword {
-                    name: arg.parameter.name.id.clone(),
-                    default_type: default_type(arg),
-                },
-            )
+
+        let method_info = infer_method_information(db, definition);
+        let is_static_or_classmethod = method_info
+            .is_some_and(|f| f.method.is_staticmethod(db) || f.method.is_classmethod(db));
+
+        let inferred_annotation = |arg: &ParameterWithDefault| {
+            if let Some(MethodInformation {
+                method,
+                class_literal,
+                class_is_generic,
+            }) = method_info
+                && !is_static_or_classmethod
+                && arg.parameter.annotation().is_none()
+                && parameters.index(arg.name().id()) == Some(0)
+            {
+                let method_has_self_in_generic_context =
+                    method.signature(db).overloads.iter().any(|s| {
+                        s.generic_context.is_some_and(|context| {
+                            context.variables(db).any(|v| v.typevar(db).is_self(db))
+                        })
+                    });
+
+                if method_has_self_in_generic_context
+                    || class_is_generic
+                    || class_literal
+                        .known(db)
+                        .is_some_and(KnownClass::is_fallback_class)
+                {
+                    let scope_id = definition.scope(db);
+                    let typevar_binding_context = Some(definition);
+                    let index = semantic_index(db, scope_id.file(db));
+                    let class = nearest_enclosing_class(db, index, scope_id).unwrap();
+
+                    Some(
+                        typing_self(db, scope_id, typevar_binding_context, class)
+                            .expect("We should always find the surrounding class for an implicit self: Self annotation"),
+                    )
+                } else {
+                    // For methods of non-generic classes that are not otherwise generic (e.g. return `Self` or
+                    // have additional type parameters), the implicit `Self` type of the `self` parameter would
+                    // be the only type variable, so we can just use the class directly.
+                    Some(class_literal.to_non_generic_instance(db))
+                }
+            } else {
+                None
+            }
+        };
+
+        let pos_only_param = |param: &ast::ParameterWithDefault| {
+            if let Some(inferred_annotation_type) = inferred_annotation(param) {
+                Parameter {
+                    annotated_type: Some(inferred_annotation_type),
+                    inferred_annotation: true,
+                    kind: ParameterKind::PositionalOnly {
+                        name: Some(param.parameter.name.id.clone()),
+                        default_type: default_type(param),
+                    },
+                    form: ParameterForm::Value,
+                }
+            } else {
+                Parameter::from_node_and_kind(
+                    db,
+                    definition,
+                    &param.parameter,
+                    ParameterKind::PositionalOnly {
+                        name: Some(param.parameter.name.id.clone()),
+                        default_type: default_type(param),
+                    },
+                )
+            }
+        };
+
+        let mut positional_only: Vec<Parameter> = posonlyargs.iter().map(pos_only_param).collect();
+
+        let mut pos_or_keyword_iter = args.iter();
+
+        // If there are no PEP-570 positional-only parameters, check for the legacy PEP-484 convention
+        // for denoting positional-only parameters (parameters that start with `__` and do not end with `__`)
+        if positional_only.is_empty() {
+            let pos_or_keyword_iter = pos_or_keyword_iter.by_ref();
+
+            if has_implicitly_positional_first_parameter {
+                positional_only.extend(pos_or_keyword_iter.next().map(pos_only_param));
+            }
+
+            positional_only.extend(
+                pos_or_keyword_iter
+                    .peeking_take_while(|param| param.uses_pep_484_positional_only_convention())
+                    .map(pos_only_param),
+            );
+        }
+
+        let positional_or_keyword = pos_or_keyword_iter.map(|arg| {
+            if let Some(inferred_annotation_type) = inferred_annotation(arg) {
+                Parameter {
+                    annotated_type: Some(inferred_annotation_type),
+                    inferred_annotation: true,
+                    kind: ParameterKind::PositionalOrKeyword {
+                        name: arg.parameter.name.id.clone(),
+                        default_type: default_type(arg),
+                    },
+                    form: ParameterForm::Value,
+                }
+            } else {
+                Parameter::from_node_and_kind(
+                    db,
+                    definition,
+                    &arg.parameter,
+                    ParameterKind::PositionalOrKeyword {
+                        name: arg.parameter.name.id.clone(),
+                        default_type: default_type(arg),
+                    },
+                )
+            }
         });
+
         let variadic = vararg.as_ref().map(|arg| {
             Parameter::from_node_and_kind(
                 db,
@@ -1192,6 +1397,7 @@ impl<'db> Parameters<'db> {
                 },
             )
         });
+
         let keyword_only = kwonlyargs.iter().map(|arg| {
             Parameter::from_node_and_kind(
                 db,
@@ -1203,6 +1409,7 @@ impl<'db> Parameters<'db> {
                 },
             )
         });
+
         let keywords = kwarg.as_ref().map(|arg| {
             Parameter::from_node_and_kind(
                 db,
@@ -1213,8 +1420,10 @@ impl<'db> Parameters<'db> {
                 },
             )
         });
+
         Self::new(
             positional_only
+                .into_iter()
                 .chain(positional_or_keyword)
                 .chain(variadic)
                 .chain(keyword_only)
@@ -1222,14 +1431,34 @@ impl<'db> Parameters<'db> {
         )
     }
 
-    fn apply_type_mapping<'a>(&self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
-        Self {
-            value: self
-                .value
-                .iter()
-                .map(|param| param.apply_type_mapping(db, type_mapping))
-                .collect(),
-            is_gradual: self.is_gradual,
+    fn apply_type_mapping_impl<'a>(
+        &self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
+        match type_mapping {
+            // Note that we've already flipped the materialization in Signature.apply_type_mapping_impl(),
+            // so the "top" materialization here is the bottom materialization of the whole Signature.
+            // It might make sense to flip the materialization here instead.
+            TypeMapping::Materialize(MaterializationKind::Top) if self.is_gradual => {
+                Parameters::object()
+            }
+            // TODO: This is wrong, the empty Parameters is not a subtype of all materializations.
+            // The bottom materialization is not currently representable and implementing it
+            // properly requires extending the Parameters struct.
+            TypeMapping::Materialize(MaterializationKind::Bottom) if self.is_gradual => {
+                Parameters::empty()
+            }
+            _ => Self {
+                value: self
+                    .value
+                    .iter()
+                    .map(|param| param.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
+                    .collect(),
+                is_gradual: self.is_gradual,
+            },
         }
     }
 
@@ -1263,6 +1492,17 @@ impl<'db> Parameters<'db> {
             .and_then(|parameter| parameter.is_positional().then_some(parameter))
     }
 
+    /// Return a positional-only parameter (with index) with the given name.
+    pub(crate) fn positional_only_by_name(&self, name: &str) -> Option<(usize, &Parameter<'db>)> {
+        self.iter().enumerate().find(|(_, parameter)| {
+            parameter.is_positional_only()
+                && parameter
+                    .name()
+                    .map(|p_name| p_name == name)
+                    .unwrap_or(false)
+        })
+    }
+
     /// Return the variadic parameter (`*args`), if any, and its index, or `None`.
     pub(crate) fn variadic(&self) -> Option<(usize, &Parameter<'db>)> {
         self.iter()
@@ -1318,6 +1558,10 @@ pub(crate) struct Parameter<'db> {
     /// Annotated type of the parameter.
     annotated_type: Option<Type<'db>>,
 
+    /// Does the type of this parameter come from an explicit annotation, or was it inferred from
+    /// the context, like `Self` for the `self` parameter of instance methods.
+    inferred_annotation: bool,
+
     kind: ParameterKind<'db>,
     pub(crate) form: ParameterForm,
 }
@@ -1326,6 +1570,7 @@ impl<'db> Parameter<'db> {
     pub(crate) fn positional_only(name: Option<Name>) -> Self {
         Self {
             annotated_type: None,
+            inferred_annotation: false,
             kind: ParameterKind::PositionalOnly {
                 name,
                 default_type: None,
@@ -1337,6 +1582,7 @@ impl<'db> Parameter<'db> {
     pub(crate) fn positional_or_keyword(name: Name) -> Self {
         Self {
             annotated_type: None,
+            inferred_annotation: false,
             kind: ParameterKind::PositionalOrKeyword {
                 name,
                 default_type: None,
@@ -1348,6 +1594,7 @@ impl<'db> Parameter<'db> {
     pub(crate) fn variadic(name: Name) -> Self {
         Self {
             annotated_type: None,
+            inferred_annotation: false,
             kind: ParameterKind::Variadic { name },
             form: ParameterForm::Value,
         }
@@ -1356,6 +1603,7 @@ impl<'db> Parameter<'db> {
     pub(crate) fn keyword_only(name: Name) -> Self {
         Self {
             annotated_type: None,
+            inferred_annotation: false,
             kind: ParameterKind::KeywordOnly {
                 name,
                 default_type: None,
@@ -1367,6 +1615,7 @@ impl<'db> Parameter<'db> {
     pub(crate) fn keyword_variadic(name: Name) -> Self {
         Self {
             annotated_type: None,
+            inferred_annotation: false,
             kind: ParameterKind::KeywordVariadic { name },
             form: ParameterForm::Value,
         }
@@ -1394,24 +1643,21 @@ impl<'db> Parameter<'db> {
         self
     }
 
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self {
-            annotated_type: Some(
-                self.annotated_type
-                    .unwrap_or(Type::unknown())
-                    .materialize(db, variance),
-            ),
-            kind: self.kind.clone(),
-            form: self.form,
-        }
-    }
-
-    fn apply_type_mapping<'a>(&self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
+    fn apply_type_mapping_impl<'a>(
+        &self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
         Self {
             annotated_type: self
                 .annotated_type
-                .map(|ty| ty.apply_type_mapping(db, type_mapping)),
-            kind: self.kind.apply_type_mapping(db, type_mapping),
+                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor)),
+            kind: self
+                .kind
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor),
+            inferred_annotation: self.inferred_annotation,
             form: self.form,
         }
     }
@@ -1427,6 +1673,7 @@ impl<'db> Parameter<'db> {
     ) -> Self {
         let Parameter {
             annotated_type,
+            inferred_annotation,
             kind,
             form,
         } = self;
@@ -1470,6 +1717,7 @@ impl<'db> Parameter<'db> {
 
         Self {
             annotated_type: Some(annotated_type),
+            inferred_annotation: *inferred_annotation,
             kind,
             form: *form,
         }
@@ -1482,14 +1730,12 @@ impl<'db> Parameter<'db> {
         kind: ParameterKind<'db>,
     ) -> Self {
         Self {
-            annotated_type: parameter.annotation().map(|annotation| {
-                definition_expression_type(db, definition, annotation).apply_type_mapping(
-                    db,
-                    &TypeMapping::MarkTypeVarsInferable(BindingContext::Definition(definition)),
-                )
-            }),
+            annotated_type: parameter
+                .annotation()
+                .map(|annotation| definition_expression_type(db, definition, annotation)),
             kind,
             form: ParameterForm::Value,
+            inferred_annotation: false,
         }
     }
 
@@ -1544,6 +1790,11 @@ impl<'db> Parameter<'db> {
         &self.kind
     }
 
+    /// Whether or not the type of this parameter should be displayed.
+    pub(crate) fn should_annotation_be_displayed(&self) -> bool {
+        !self.inferred_annotation
+    }
+
     /// Name of the parameter (if it has one).
     pub(crate) fn name(&self) -> Option<&ast::name::Name> {
         match &self.kind {
@@ -1615,24 +1866,34 @@ pub(crate) enum ParameterKind<'db> {
 }
 
 impl<'db> ParameterKind<'db> {
-    fn apply_type_mapping<'a>(&self, db: &'db dyn Db, type_mapping: &TypeMapping<'a, 'db>) -> Self {
+    fn apply_type_mapping_impl<'a>(
+        &self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
+        let apply_to_default_type = |default_type: &Option<Type<'db>>| {
+            if type_mapping == &TypeMapping::ReplaceParameterDefaults && default_type.is_some() {
+                Some(Type::unknown())
+            } else {
+                default_type
+                    .as_ref()
+                    .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
+            }
+        };
+
         match self {
             Self::PositionalOnly { default_type, name } => Self::PositionalOnly {
-                default_type: default_type
-                    .as_ref()
-                    .map(|ty| ty.apply_type_mapping(db, type_mapping)),
+                default_type: apply_to_default_type(default_type),
                 name: name.clone(),
             },
             Self::PositionalOrKeyword { default_type, name } => Self::PositionalOrKeyword {
-                default_type: default_type
-                    .as_ref()
-                    .map(|ty| ty.apply_type_mapping(db, type_mapping)),
+                default_type: apply_to_default_type(default_type),
                 name: name.clone(),
             },
             Self::KeywordOnly { default_type, name } => Self::KeywordOnly {
-                default_type: default_type
-                    .as_ref()
-                    .map(|ty| ty.apply_type_mapping(db, type_mapping)),
+                default_type: apply_to_default_type(default_type),
                 name: name.clone(),
             },
             Self::Variadic { .. } | Self::KeywordVariadic { .. } => self.clone(),
@@ -1677,7 +1938,7 @@ mod tests {
             .literal(&db)
             .last_definition(&db);
 
-        let sig = func.signature(&db, None);
+        let sig = func.signature(&db);
 
         assert!(sig.return_ty.is_none());
         assert_params(&sig, &[]);
@@ -1702,7 +1963,7 @@ mod tests {
             .literal(&db)
             .last_definition(&db);
 
-        let sig = func.signature(&db, None);
+        let sig = func.signature(&db);
 
         assert_eq!(sig.return_ty.unwrap().display(&db).to_string(), "bytes");
         assert_params(
@@ -1721,8 +1982,7 @@ mod tests {
                 Parameter::positional_or_keyword(Name::new_static("f"))
                     .with_annotated_type(Type::IntLiteral(4))
                     .with_default_type(Type::IntLiteral(4)),
-                Parameter::variadic(Name::new_static("args"))
-                    .with_annotated_type(Type::object(&db)),
+                Parameter::variadic(Name::new_static("args")).with_annotated_type(Type::object()),
                 Parameter::keyword_only(Name::new_static("g"))
                     .with_default_type(Type::IntLiteral(5)),
                 Parameter::keyword_only(Name::new_static("h"))
@@ -1755,7 +2015,7 @@ mod tests {
             .literal(&db)
             .last_definition(&db);
 
-        let sig = func.signature(&db, None);
+        let sig = func.signature(&db);
 
         let [
             Parameter {
@@ -1793,7 +2053,7 @@ mod tests {
             .literal(&db)
             .last_definition(&db);
 
-        let sig = func.signature(&db, None);
+        let sig = func.signature(&db);
 
         let [
             Parameter {
@@ -1831,7 +2091,7 @@ mod tests {
             .literal(&db)
             .last_definition(&db);
 
-        let sig = func.signature(&db, None);
+        let sig = func.signature(&db);
 
         let [
             Parameter {
@@ -1875,7 +2135,7 @@ mod tests {
             .literal(&db)
             .last_definition(&db);
 
-        let sig = func.signature(&db, None);
+        let sig = func.signature(&db);
 
         let [
             Parameter {
@@ -1912,7 +2172,7 @@ mod tests {
         let func = get_function_f(&db, "/src/a.py");
 
         let overload = func.literal(&db).last_definition(&db);
-        let expected_sig = overload.signature(&db, None);
+        let expected_sig = overload.signature(&db);
 
         // With no decorators, internal and external signature are the same
         assert_eq!(
diff --git a/crates/ty_python_semantic/src/types/special_form.rs b/crates/ty_python_semantic/src/types/special_form.rs
index f0dd81b150..721def0dee 100644
--- a/crates/ty_python_semantic/src/types/special_form.rs
+++ b/crates/ty_python_semantic/src/types/special_form.rs
@@ -27,6 +27,7 @@ use std::str::FromStr;
     get_size2::GetSize,
 )]
 pub enum SpecialFormType {
+    Any,
     /// The symbol `typing.Annotated` (which can also be found as `typing_extensions.Annotated`)
     Annotated,
     /// The symbol `typing.Literal` (which can also be found as `typing_extensions.Literal`)
@@ -77,6 +78,10 @@ pub enum SpecialFormType {
     TypeOf,
     /// The symbol `ty_extensions.CallableTypeOf`
     CallableTypeOf,
+    /// The symbol `ty_extensions.Top`
+    Top,
+    /// The symbol `ty_extensions.Bottom`
+    Bottom,
     /// The symbol `typing.Callable`
     /// (which can also be found as `typing_extensions.Callable` or as `collections.abc.Callable`)
     Callable,
@@ -151,12 +156,19 @@ impl SpecialFormType {
             | Self::TypeIs
             | Self::TypeOf
             | Self::Not
+            | Self::Top
+            | Self::Bottom
             | Self::Intersection
             | Self::CallableTypeOf
-            | Self::Protocol  // actually `_ProtocolMeta` at runtime but this is what typeshed says
-            | Self::Generic  // actually `type` at runtime but this is what typeshed says
             | Self::ReadOnly => KnownClass::SpecialForm,
 
+            // Typeshed says it's an instance of `_SpecialForm`,
+            // but then we wouldn't recognise things like `issubclass(`X, Protocol)`
+            // as being valid.
+            Self::Protocol => KnownClass::ProtocolMeta,
+
+            Self::Generic | Self::Any => KnownClass::Type,
+
             Self::List
             | Self::Dict
             | Self::DefaultDict
@@ -238,6 +250,7 @@ impl SpecialFormType {
             | Self::TypingSelf
             | Self::Protocol
             | Self::NamedTuple
+            | Self::Any
             | Self::ReadOnly => {
                 matches!(module, KnownModule::Typing | KnownModule::TypingExtensions)
             }
@@ -246,6 +259,8 @@ impl SpecialFormType {
             | Self::AlwaysTruthy
             | Self::AlwaysFalsy
             | Self::Not
+            | Self::Top
+            | Self::Bottom
             | Self::Intersection
             | Self::TypeOf
             | Self::CallableTypeOf => module.is_ty_extensions(),
@@ -290,6 +305,8 @@ impl SpecialFormType {
             | Self::AlwaysTruthy
             | Self::AlwaysFalsy
             | Self::Not
+            | Self::Top
+            | Self::Bottom
             | Self::Intersection
             | Self::TypeOf
             | Self::CallableTypeOf
@@ -306,6 +323,7 @@ impl SpecialFormType {
             | Self::TypeIs
             | Self::ReadOnly
             | Self::Protocol
+            | Self::Any
             | Self::Generic => false,
         }
     }
@@ -313,6 +331,7 @@ impl SpecialFormType {
     /// Return the repr of the symbol at runtime
     pub(super) const fn repr(self) -> &'static str {
         match self {
+            SpecialFormType::Any => "typing.Any",
             SpecialFormType::Annotated => "typing.Annotated",
             SpecialFormType::Literal => "typing.Literal",
             SpecialFormType::LiteralString => "typing.LiteralString",
@@ -351,6 +370,8 @@ impl SpecialFormType {
             SpecialFormType::Intersection => "ty_extensions.Intersection",
             SpecialFormType::TypeOf => "ty_extensions.TypeOf",
             SpecialFormType::CallableTypeOf => "ty_extensions.CallableTypeOf",
+            SpecialFormType::Top => "ty_extensions.Top",
+            SpecialFormType::Bottom => "ty_extensions.Bottom",
             SpecialFormType::Protocol => "typing.Protocol",
             SpecialFormType::Generic => "typing.Generic",
             SpecialFormType::NamedTuple => "typing.NamedTuple",
diff --git a/crates/ty_python_semantic/src/types/string_annotation.rs b/crates/ty_python_semantic/src/types/string_annotation.rs
index 69f312f36a..7ea673f3aa 100644
--- a/crates/ty_python_semantic/src/types/string_annotation.rs
+++ b/crates/ty_python_semantic/src/types/string_annotation.rs
@@ -28,7 +28,7 @@ declare_lint! {
     /// ```
     pub(crate) static FSTRING_TYPE_ANNOTATION = {
         summary: "detects F-strings in type annotation positions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -53,7 +53,7 @@ declare_lint! {
         /// ```
     pub(crate) static BYTE_STRING_TYPE_ANNOTATION = {
         summary: "detects byte strings in type annotation positions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -78,7 +78,7 @@ declare_lint! {
         /// ```
     pub(crate) static RAW_STRING_TYPE_ANNOTATION = {
         summary: "detects raw strings in type annotation positions",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -103,7 +103,7 @@ declare_lint! {
         /// ```
     pub(crate) static IMPLICIT_CONCATENATED_STRING_TYPE_ANNOTATION = {
         summary: "detects implicit concatenated strings in type annotations",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -112,7 +112,7 @@ declare_lint! {
     /// TODO #14889
     pub(crate) static INVALID_SYNTAX_IN_FORWARD_ANNOTATION = {
         summary: "detects invalid syntax in forward annotations",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
@@ -121,7 +121,7 @@ declare_lint! {
     /// TODO #14889
     pub(crate) static ESCAPE_CHARACTER_IN_FORWARD_ANNOTATION = {
         summary: "detects forward type annotations with escape characters",
-        status: LintStatus::preview("1.0.0"),
+        status: LintStatus::stable("0.0.1-alpha.1"),
         default_level: Level::Error,
     }
 }
diff --git a/crates/ty_python_semantic/src/types/subclass_of.rs b/crates/ty_python_semantic/src/types/subclass_of.rs
index eeb3294363..db55132c1e 100644
--- a/crates/ty_python_semantic/src/types/subclass_of.rs
+++ b/crates/ty_python_semantic/src/types/subclass_of.rs
@@ -1,16 +1,17 @@
-use ruff_python_ast::name::Name;
-
 use crate::place::PlaceAndQualifiers;
 use crate::semantic_index::definition::Definition;
+use crate::types::constraints::ConstraintSet;
+use crate::types::generics::InferableTypeVars;
 use crate::types::variance::VarianceInferable;
 use crate::types::{
-    ApplyTypeMappingVisitor, BindingContext, BoundTypeVarInstance, ClassType, DynamicType,
-    HasRelationToVisitor, KnownClass, MemberLookupPolicy, NormalizedVisitor, Type, TypeMapping,
-    TypeRelation, TypeVarInstance,
+    ApplyTypeMappingVisitor, BoundTypeVarInstance, ClassType, DynamicType,
+    FindLegacyTypeVarsVisitor, HasRelationToVisitor, IsDisjointVisitor, KnownClass,
+    MaterializationKind, MemberLookupPolicy, NormalizedVisitor, SpecialFormType, Type, TypeContext,
+    TypeMapping, TypeRelation,
 };
 use crate::{Db, FxOrderSet};
 
-use super::{TypeVarBoundOrConstraints, TypeVarKind, TypeVarVariance};
+use super::TypeVarVariance;
 
 /// A type that represents `type[C]`, i.e. the class object `C` and class objects that are subclasses of `C`.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Update, get_size2::GetSize)]
@@ -46,14 +47,10 @@ impl<'db> SubclassOfType<'db> {
             SubclassOfInner::Class(class) => {
                 if class.is_final(db) {
                     Type::from(class)
+                } else if class.is_object(db) {
+                    KnownClass::Type.to_instance(db)
                 } else {
-                    match class.known(db) {
-                        Some(KnownClass::Object) => KnownClass::Type.to_instance(db),
-                        Some(KnownClass::Any) => Type::SubclassOf(Self {
-                            subclass_of: SubclassOfInner::Dynamic(DynamicType::Any),
-                        }),
-                        _ => Type::SubclassOf(Self { subclass_of }),
-                    }
+                    Type::SubclassOf(Self { subclass_of })
                 }
             }
         }
@@ -84,66 +81,42 @@ impl<'db> SubclassOfType<'db> {
         subclass_of.is_dynamic()
     }
 
-    pub(super) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Type<'db> {
-        match self.subclass_of {
-            SubclassOfInner::Dynamic(_) => match variance {
-                TypeVarVariance::Covariant => KnownClass::Type.to_instance(db),
-                TypeVarVariance::Contravariant => Type::Never,
-                TypeVarVariance::Invariant => {
-                    // We need to materialize this to `type[T]` but that isn't representable so
-                    // we instead use a type variable with an upper bound of `type`.
-                    Type::NonInferableTypeVar(BoundTypeVarInstance::new(
-                        db,
-                        TypeVarInstance::new(
-                            db,
-                            Name::new_static("T_all"),
-                            None,
-                            Some(
-                                TypeVarBoundOrConstraints::UpperBound(
-                                    KnownClass::Type.to_instance(db),
-                                )
-                                .into(),
-                            ),
-                            Some(variance),
-                            None,
-                            TypeVarKind::Pep695,
-                        ),
-                        BindingContext::Synthetic,
-                    ))
-                }
-                TypeVarVariance::Bivariant => unreachable!(),
-            },
-            SubclassOfInner::Class(_) => Type::SubclassOf(self),
-        }
-    }
-
     pub(super) fn apply_type_mapping_impl<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
-    ) -> Self {
+    ) -> Type<'db> {
         match self.subclass_of {
-            SubclassOfInner::Class(class) => Self {
+            SubclassOfInner::Class(class) => Type::SubclassOf(Self {
                 subclass_of: SubclassOfInner::Class(class.apply_type_mapping_impl(
                     db,
                     type_mapping,
+                    tcx,
                     visitor,
                 )),
+            }),
+            SubclassOfInner::Dynamic(_) => match type_mapping {
+                TypeMapping::Materialize(materialization_kind) => match materialization_kind {
+                    MaterializationKind::Top => KnownClass::Type.to_instance(db),
+                    MaterializationKind::Bottom => Type::Never,
+                },
+                _ => Type::SubclassOf(self),
             },
-            SubclassOfInner::Dynamic(_) => self,
         }
     }
 
-    pub(super) fn find_legacy_typevars(
+    pub(super) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self.subclass_of {
             SubclassOfInner::Class(class) => {
-                class.find_legacy_typevars(db, binding_context, typevars);
+                class.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
             }
             SubclassOfInner::Dynamic(_) => {}
         }
@@ -163,35 +136,53 @@ impl<'db> SubclassOfType<'db> {
         self,
         db: &'db dyn Db,
         other: SubclassOfType<'db>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self.subclass_of, other.subclass_of) {
             (SubclassOfInner::Dynamic(_), SubclassOfInner::Dynamic(_)) => {
-                relation.is_assignability()
+                ConstraintSet::from(!relation.is_subtyping())
             }
             (SubclassOfInner::Dynamic(_), SubclassOfInner::Class(other_class)) => {
-                other_class.is_object(db) || relation.is_assignability()
+                ConstraintSet::from(other_class.is_object(db) || relation.is_assignability())
+            }
+            (SubclassOfInner::Class(_), SubclassOfInner::Dynamic(_)) => {
+                ConstraintSet::from(relation.is_assignability())
             }
-            (SubclassOfInner::Class(_), SubclassOfInner::Dynamic(_)) => relation.is_assignability(),
 
             // For example, `type[bool]` describes all possible runtime subclasses of the class `bool`,
             // and `type[int]` describes all possible runtime subclasses of the class `int`.
             // The first set is a subset of the second set, because `bool` is itself a subclass of `int`.
-            (SubclassOfInner::Class(self_class), SubclassOfInner::Class(other_class)) => {
-                self_class.has_relation_to_impl(db, other_class, relation, visitor)
-            }
+            (SubclassOfInner::Class(self_class), SubclassOfInner::Class(other_class)) => self_class
+                .has_relation_to_impl(
+                    db,
+                    other_class,
+                    inferable,
+                    relation,
+                    relation_visitor,
+                    disjointness_visitor,
+                ),
         }
     }
 
     /// Return` true` if `self` is a disjoint type from `other`.
     ///
     /// See [`Type::is_disjoint_from`] for more details.
-    pub(crate) fn is_disjoint_from_impl(self, db: &'db dyn Db, other: Self) -> bool {
+    pub(crate) fn is_disjoint_from_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        _inferable: InferableTypeVars<'_, 'db>,
+        _visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self.subclass_of, other.subclass_of) {
-            (SubclassOfInner::Dynamic(_), _) | (_, SubclassOfInner::Dynamic(_)) => false,
+            (SubclassOfInner::Dynamic(_), _) | (_, SubclassOfInner::Dynamic(_)) => {
+                ConstraintSet::from(false)
+            }
             (SubclassOfInner::Class(self_class), SubclassOfInner::Class(other_class)) => {
-                !self_class.could_coexist_in_mro_with(db, other_class)
+                ConstraintSet::from(!self_class.could_coexist_in_mro_with(db, other_class))
             }
         }
     }
@@ -242,7 +233,7 @@ impl<'db> VarianceInferable<'db> for SubclassOfType<'db> {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Update, get_size2::GetSize)]
 pub(crate) enum SubclassOfInner<'db> {
     Class(ClassType<'db>),
-    Dynamic(DynamicType),
+    Dynamic(DynamicType<'db>),
 }
 
 impl<'db> SubclassOfInner<'db> {
@@ -261,7 +252,7 @@ impl<'db> SubclassOfInner<'db> {
         }
     }
 
-    pub(crate) const fn into_dynamic(self) -> Option<DynamicType> {
+    pub(crate) const fn into_dynamic(self) -> Option<DynamicType<'db>> {
         match self {
             Self::Class(_) => None,
             Self::Dynamic(dynamic) => Some(dynamic),
@@ -278,12 +269,9 @@ impl<'db> SubclassOfInner<'db> {
     pub(crate) fn try_from_type(db: &'db dyn Db, ty: Type<'db>) -> Option<Self> {
         match ty {
             Type::Dynamic(dynamic) => Some(Self::Dynamic(dynamic)),
-            Type::ClassLiteral(literal) => Some(if literal.is_known(db, KnownClass::Any) {
-                Self::Dynamic(DynamicType::Any)
-            } else {
-                Self::Class(literal.default_specialization(db))
-            }),
+            Type::ClassLiteral(literal) => Some(Self::Class(literal.default_specialization(db))),
             Type::GenericAlias(generic) => Some(Self::Class(ClassType::Generic(generic))),
+            Type::SpecialForm(SpecialFormType::Any) => Some(Self::Dynamic(DynamicType::Any)),
             _ => None,
         }
     }
@@ -295,8 +283,8 @@ impl<'db> From<ClassType<'db>> for SubclassOfInner<'db> {
     }
 }
 
-impl From<DynamicType> for SubclassOfInner<'_> {
-    fn from(value: DynamicType) -> Self {
+impl<'db> From<DynamicType<'db>> for SubclassOfInner<'db> {
+    fn from(value: DynamicType<'db>) -> Self {
         SubclassOfInner::Dynamic(value)
     }
 }
diff --git a/crates/ty_python_semantic/src/types/tuple.rs b/crates/ty_python_semantic/src/types/tuple.rs
index 6058b4e49a..fb08672de1 100644
--- a/crates/ty_python_semantic/src/types/tuple.rs
+++ b/crates/ty_python_semantic/src/types/tuple.rs
@@ -22,13 +22,16 @@ use std::hash::Hash;
 use itertools::{Either, EitherOrBoth, Itertools};
 
 use crate::semantic_index::definition::Definition;
-use crate::types::Truthiness;
+use crate::subscript::{Nth, OutOfBoundsError, PyIndex, PySlice, StepSizeZeroError};
 use crate::types::class::{ClassType, KnownClass};
+use crate::types::constraints::{ConstraintSet, IteratorConstraintsExtension};
+use crate::types::generics::InferableTypeVars;
 use crate::types::{
-    ApplyTypeMappingVisitor, BoundTypeVarInstance, HasRelationToVisitor, IsDisjointVisitor,
-    NormalizedVisitor, Type, TypeMapping, TypeRelation, TypeVarVariance, UnionBuilder, UnionType,
+    ApplyTypeMappingVisitor, BoundTypeVarInstance, FindLegacyTypeVarsVisitor, HasRelationToVisitor,
+    IsDisjointVisitor, IsEquivalentVisitor, NormalizedVisitor, Type, TypeMapping, TypeRelation,
+    UnionBuilder, UnionType,
 };
-use crate::util::subscript::{Nth, OutOfBoundsError, PyIndex, PySlice, StepSizeZeroError};
+use crate::types::{Truthiness, TypeContext};
 use crate::{Db, FxOrderSet, Program};
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
@@ -42,7 +45,7 @@ impl TupleLength {
         TupleLength::Variable(0, 0)
     }
 
-    pub(crate) fn is_variable(self) -> bool {
+    pub(crate) const fn is_variable(self) -> bool {
         matches!(self, TupleLength::Variable(_, _))
     }
 
@@ -198,7 +201,7 @@ impl<'db> TupleType<'db> {
     // N.B. If this method is not Salsa-tracked, we take 10 minutes to check
     // `static-frame` as part of a mypy_primer run! This is because it's called
     // from `NominalInstanceType::class()`, which is a very hot method.
-    #[salsa::tracked(cycle_fn=to_class_type_cycle_recover, cycle_initial=to_class_type_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
+    #[salsa::tracked(cycle_initial=to_class_type_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(crate) fn to_class_type(self, db: &'db dyn Db) -> ClassType<'db> {
         let tuple_class = KnownClass::Tuple
             .try_to_class_literal(db)
@@ -226,47 +229,60 @@ impl<'db> TupleType<'db> {
         TupleType::new(db, &self.tuple(db).normalized_impl(db, visitor))
     }
 
-    pub(crate) fn materialize(self, db: &'db dyn Db, variance: TypeVarVariance) -> Option<Self> {
-        TupleType::new(db, &self.tuple(db).materialize(db, variance))
-    }
-
     pub(crate) fn apply_type_mapping_impl<'a>(
         self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Option<Self> {
         TupleType::new(
             db,
             &self
                 .tuple(db)
-                .apply_type_mapping_impl(db, type_mapping, visitor),
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor),
         )
     }
 
-    pub(crate) fn find_legacy_typevars(
+    pub(crate) fn find_legacy_typevars_impl(
         self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         self.tuple(db)
-            .find_legacy_typevars(db, binding_context, typevars);
+            .find_legacy_typevars_impl(db, binding_context, typevars, visitor);
     }
 
     pub(crate) fn has_relation_to_impl(
         self,
         db: &'db dyn Db,
         other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
-        self.tuple(db)
-            .has_relation_to_impl(db, other.tuple(db), relation, visitor)
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        self.tuple(db).has_relation_to_impl(
+            db,
+            other.tuple(db),
+            inferable,
+            relation,
+            relation_visitor,
+            disjointness_visitor,
+        )
     }
 
-    pub(crate) fn is_equivalent_to(self, db: &'db dyn Db, other: Self) -> bool {
-        self.tuple(db).is_equivalent_to(db, other.tuple(db))
+    pub(crate) fn is_equivalent_to_impl(
+        self,
+        db: &'db dyn Db,
+        other: Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        self.tuple(db)
+            .is_equivalent_to_impl(db, other.tuple(db), inferable, visitor)
     }
 
     pub(crate) fn is_single_valued(self, db: &'db dyn Db) -> bool {
@@ -274,15 +290,6 @@ impl<'db> TupleType<'db> {
     }
 }
 
-fn to_class_type_cycle_recover<'db>(
-    _db: &'db dyn Db,
-    _value: &ClassType<'db>,
-    _count: u32,
-    _self: TupleType<'db>,
-) -> salsa::CycleRecoveryAction<ClassType<'db>> {
-    salsa::CycleRecoveryAction::Iterate
-}
-
 fn to_class_type_cycle_initial<'db>(db: &'db dyn Db, self_: TupleType<'db>) -> ClassType<'db> {
     let tuple_class = KnownClass::Tuple
         .try_to_class_literal(db)
@@ -381,31 +388,48 @@ impl<'db> FixedLengthTuple<Type<'db>> {
         Self::from_elements(self.0.iter().map(|ty| ty.normalized_impl(db, visitor)))
     }
 
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        Self::from_elements(self.0.iter().map(|ty| ty.materialize(db, variance)))
-    }
-
     fn apply_type_mapping_impl<'a>(
         &self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
+        let tcx_tuple = tcx
+            .annotation
+            .and_then(|annotation| annotation.known_specialization(db, KnownClass::Tuple))
+            .and_then(|specialization| {
+                specialization
+                    .tuple(db)
+                    .expect("the specialization of `KnownClass::Tuple` must have a tuple spec")
+                    .resize(db, TupleLength::Fixed(self.0.len()))
+                    .ok()
+            });
+
+        let tcx_elements = match tcx_tuple.as_ref() {
+            None => Either::Right(std::iter::repeat(TypeContext::default())),
+            Some(tuple) => {
+                Either::Left(tuple.all_elements().map(|tcx| TypeContext::new(Some(*tcx))))
+            }
+        };
+
         Self::from_elements(
             self.0
                 .iter()
-                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, visitor)),
+                .zip(tcx_elements)
+                .map(|(ty, tcx)| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor)),
         )
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         for ty in &self.0 {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
@@ -413,52 +437,103 @@ impl<'db> FixedLengthTuple<Type<'db>> {
         &self,
         db: &'db dyn Db,
         other: &Tuple<Type<'db>>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match other {
             Tuple::Fixed(other) => {
-                self.0.len() == other.0.len()
-                    && (self.0.iter()).zip(&other.0).all(|(self_ty, other_ty)| {
-                        self_ty.has_relation_to_impl(db, *other_ty, relation, visitor)
+                ConstraintSet::from(self.0.len() == other.0.len()).and(db, || {
+                    (self.0.iter().zip(&other.0)).when_all(db, |(self_ty, other_ty)| {
+                        self_ty.has_relation_to_impl(
+                            db,
+                            *other_ty,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        )
                     })
+                })
             }
 
             Tuple::Variable(other) => {
                 // This tuple must have enough elements to match up with the other tuple's prefix
                 // and suffix, and each of those elements must pairwise satisfy the relation.
+                let mut result = ConstraintSet::from(true);
                 let mut self_iter = self.0.iter();
                 for other_ty in &other.prefix {
                     let Some(self_ty) = self_iter.next() else {
-                        return false;
+                        return ConstraintSet::from(false);
                     };
-                    if !self_ty.has_relation_to_impl(db, *other_ty, relation, visitor) {
-                        return false;
+                    let element_constraints = self_ty.has_relation_to_impl(
+                        db,
+                        *other_ty,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    );
+                    if result
+                        .intersect(db, element_constraints)
+                        .is_never_satisfied()
+                    {
+                        return result;
                     }
                 }
                 for other_ty in other.suffix.iter().rev() {
                     let Some(self_ty) = self_iter.next_back() else {
-                        return false;
+                        return ConstraintSet::from(false);
                     };
-                    if !self_ty.has_relation_to_impl(db, *other_ty, relation, visitor) {
-                        return false;
+                    let element_constraints = self_ty.has_relation_to_impl(
+                        db,
+                        *other_ty,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    );
+                    if result
+                        .intersect(db, element_constraints)
+                        .is_never_satisfied()
+                    {
+                        return result;
                     }
                 }
 
                 // In addition, any remaining elements in this tuple must satisfy the
                 // variable-length portion of the other tuple.
-                self_iter.all(|self_ty| {
-                    self_ty.has_relation_to_impl(db, other.variable, relation, visitor)
+                result.and(db, || {
+                    self_iter.when_all(db, |self_ty| {
+                        self_ty.has_relation_to_impl(
+                            db,
+                            other.variable,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        )
+                    })
                 })
             }
         }
     }
 
-    fn is_equivalent_to(&self, db: &'db dyn Db, other: &Self) -> bool {
-        self.0.len() == other.0.len()
-            && (self.0.iter())
+    fn is_equivalent_to_impl(
+        &self,
+        db: &'db dyn Db,
+        other: &Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        ConstraintSet::from(self.0.len() == other.0.len()).and(db, || {
+            (self.0.iter())
                 .zip(&other.0)
-                .all(|(self_ty, other_ty)| self_ty.is_equivalent_to(db, *other_ty))
+                .when_all(db, |(self_ty, other_ty)| {
+                    self_ty.is_equivalent_to_impl(db, *other_ty, inferable, visitor)
+                })
+        })
     }
 
     fn is_single_valued(&self, db: &'db dyn Db) -> bool {
@@ -521,11 +596,15 @@ impl<T> VariableLengthTuple<T> {
         })
     }
 
-    fn prefix_elements(&self) -> impl DoubleEndedIterator<Item = &T> + ExactSizeIterator + '_ {
+    pub(crate) fn prefix_elements(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = &T> + ExactSizeIterator + '_ {
         self.prefix.iter()
     }
 
-    fn suffix_elements(&self) -> impl DoubleEndedIterator<Item = &T> + ExactSizeIterator + '_ {
+    pub(crate) fn suffix_elements(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = &T> + ExactSizeIterator + '_ {
         self.suffix.iter()
     }
 
@@ -675,45 +754,39 @@ impl<'db> VariableLengthTuple<Type<'db>> {
         })
     }
 
-    fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> TupleSpec<'db> {
-        Self::mixed(
-            self.prefix.iter().map(|ty| ty.materialize(db, variance)),
-            self.variable.materialize(db, variance),
-            self.suffix.iter().map(|ty| ty.materialize(db, variance)),
-        )
-    }
-
     fn apply_type_mapping_impl<'a>(
         &self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> TupleSpec<'db> {
         Self::mixed(
             self.prefix
                 .iter()
-                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, visitor)),
+                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor)),
             self.variable
-                .apply_type_mapping_impl(db, type_mapping, visitor),
+                .apply_type_mapping_impl(db, type_mapping, tcx, visitor),
             self.suffix
                 .iter()
-                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, visitor)),
+                .map(|ty| ty.apply_type_mapping_impl(db, type_mapping, tcx, visitor)),
         )
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         for ty in &self.prefix {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
         self.variable
-            .find_legacy_typevars(db, binding_context, typevars);
+            .find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         for ty in &self.suffix {
-            ty.find_legacy_typevars(db, binding_context, typevars);
+            ty.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
         }
     }
 
@@ -721,9 +794,11 @@ impl<'db> VariableLengthTuple<Type<'db>> {
         &self,
         db: &'db dyn Db,
         other: &Tuple<Type<'db>>,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match other {
             Tuple::Fixed(other) => {
                 // The `...` length specifier of a variable-length tuple type is interpreted
@@ -736,34 +811,56 @@ impl<'db> VariableLengthTuple<Type<'db>> {
                 // (or any other dynamic type), then the `...` is the _gradual choice_ of all
                 // possible lengths. This means that `tuple[Any, ...]` can match any tuple of any
                 // length.
-                if relation == TypeRelation::Subtyping || !matches!(self.variable, Type::Dynamic(_))
-                {
-                    return false;
+                if !relation.is_assignability() || !self.variable.is_dynamic() {
+                    return ConstraintSet::from(false);
                 }
 
                 // In addition, the other tuple must have enough elements to match up with this
                 // tuple's prefix and suffix, and each of those elements must pairwise satisfy the
                 // relation.
+                let mut result = ConstraintSet::from(true);
                 let mut other_iter = other.elements().copied();
                 for self_ty in self.prenormalized_prefix_elements(db, None) {
                     let Some(other_ty) = other_iter.next() else {
-                        return false;
+                        return ConstraintSet::from(false);
                     };
-                    if !self_ty.has_relation_to_impl(db, other_ty, relation, visitor) {
-                        return false;
+                    let element_constraints = self_ty.has_relation_to_impl(
+                        db,
+                        other_ty,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    );
+                    if result
+                        .intersect(db, element_constraints)
+                        .is_never_satisfied()
+                    {
+                        return result;
                     }
                 }
                 let suffix: Vec<_> = self.prenormalized_suffix_elements(db, None).collect();
                 for self_ty in suffix.iter().rev() {
                     let Some(other_ty) = other_iter.next_back() else {
-                        return false;
+                        return ConstraintSet::from(false);
                     };
-                    if !self_ty.has_relation_to_impl(db, other_ty, relation, visitor) {
-                        return false;
+                    let element_constraints = self_ty.has_relation_to_impl(
+                        db,
+                        other_ty,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    );
+                    if result
+                        .intersect(db, element_constraints)
+                        .is_never_satisfied()
+                    {
+                        return result;
                     }
                 }
 
-                true
+                result
             }
 
             Tuple::Variable(other) => {
@@ -781,26 +878,38 @@ impl<'db> VariableLengthTuple<Type<'db>> {
                 // The overlapping parts of the prefixes and suffixes must satisfy the relation.
                 // Any remaining parts must satisfy the relation with the other tuple's
                 // variable-length part.
-                if !self
-                    .prenormalized_prefix_elements(db, self_prenormalize_variable)
+                let mut result = ConstraintSet::from(true);
+                let pairwise = (self.prenormalized_prefix_elements(db, self_prenormalize_variable))
                     .zip_longest(
                         other.prenormalized_prefix_elements(db, other_prenormalize_variable),
-                    )
-                    .all(|pair| match pair {
-                        EitherOrBoth::Both(self_ty, other_ty) => {
-                            self_ty.has_relation_to_impl(db, other_ty, relation, visitor)
-                        }
-                        EitherOrBoth::Left(self_ty) => {
-                            self_ty.has_relation_to_impl(db, other.variable, relation, visitor)
-                        }
+                    );
+                for pair in pairwise {
+                    let pair_constraints = match pair {
+                        EitherOrBoth::Both(self_ty, other_ty) => self_ty.has_relation_to_impl(
+                            db,
+                            other_ty,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        ),
+                        EitherOrBoth::Left(self_ty) => self_ty.has_relation_to_impl(
+                            db,
+                            other.variable,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        ),
                         EitherOrBoth::Right(_) => {
                             // The rhs has a required element that the lhs is not guaranteed to
                             // provide.
-                            false
+                            return ConstraintSet::from(false);
                         }
-                    })
-                {
-                    return false;
+                    };
+                    if result.intersect(db, pair_constraints).is_never_satisfied() {
+                        return result;
+                    }
                 }
 
                 let self_suffix: Vec<_> = self
@@ -809,46 +918,84 @@ impl<'db> VariableLengthTuple<Type<'db>> {
                 let other_suffix: Vec<_> = other
                     .prenormalized_suffix_elements(db, other_prenormalize_variable)
                     .collect();
-                if !(self_suffix.iter().rev())
-                    .zip_longest(other_suffix.iter().rev())
-                    .all(|pair| match pair {
-                        EitherOrBoth::Both(self_ty, other_ty) => {
-                            self_ty.has_relation_to_impl(db, *other_ty, relation, visitor)
-                        }
-                        EitherOrBoth::Left(self_ty) => {
-                            self_ty.has_relation_to_impl(db, other.variable, relation, visitor)
-                        }
+                let pairwise = (self_suffix.iter().rev()).zip_longest(other_suffix.iter().rev());
+                for pair in pairwise {
+                    let pair_constraints = match pair {
+                        EitherOrBoth::Both(self_ty, other_ty) => self_ty.has_relation_to_impl(
+                            db,
+                            *other_ty,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        ),
+                        EitherOrBoth::Left(self_ty) => self_ty.has_relation_to_impl(
+                            db,
+                            other.variable,
+                            inferable,
+                            relation,
+                            relation_visitor,
+                            disjointness_visitor,
+                        ),
                         EitherOrBoth::Right(_) => {
                             // The rhs has a required element that the lhs is not guaranteed to
                             // provide.
-                            false
+                            return ConstraintSet::from(false);
                         }
-                    })
-                {
-                    return false;
+                    };
+                    if result.intersect(db, pair_constraints).is_never_satisfied() {
+                        return result;
+                    }
                 }
 
                 // And lastly, the variable-length portions must satisfy the relation.
-                self.variable
-                    .has_relation_to_impl(db, other.variable, relation, visitor)
+                result.and(db, || {
+                    self.variable.has_relation_to_impl(
+                        db,
+                        other.variable,
+                        inferable,
+                        relation,
+                        relation_visitor,
+                        disjointness_visitor,
+                    )
+                })
             }
         }
     }
 
-    fn is_equivalent_to(&self, db: &'db dyn Db, other: &Self) -> bool {
-        self.variable.is_equivalent_to(db, other.variable)
-            && (self.prenormalized_prefix_elements(db, None))
-                .zip_longest(other.prenormalized_prefix_elements(db, None))
-                .all(|pair| match pair {
-                    EitherOrBoth::Both(self_ty, other_ty) => self_ty.is_equivalent_to(db, other_ty),
-                    EitherOrBoth::Left(_) | EitherOrBoth::Right(_) => false,
-                })
-            && (self.prenormalized_suffix_elements(db, None))
-                .zip_longest(other.prenormalized_suffix_elements(db, None))
-                .all(|pair| match pair {
-                    EitherOrBoth::Both(self_ty, other_ty) => self_ty.is_equivalent_to(db, other_ty),
-                    EitherOrBoth::Left(_) | EitherOrBoth::Right(_) => false,
-                })
+    fn is_equivalent_to_impl(
+        &self,
+        db: &'db dyn Db,
+        other: &Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
+        self.variable
+            .is_equivalent_to_impl(db, other.variable, inferable, visitor)
+            .and(db, || {
+                (self.prenormalized_prefix_elements(db, None))
+                    .zip_longest(other.prenormalized_prefix_elements(db, None))
+                    .when_all(db, |pair| match pair {
+                        EitherOrBoth::Both(self_ty, other_ty) => {
+                            self_ty.is_equivalent_to_impl(db, other_ty, inferable, visitor)
+                        }
+                        EitherOrBoth::Left(_) | EitherOrBoth::Right(_) => {
+                            ConstraintSet::from(false)
+                        }
+                    })
+            })
+            .and(db, || {
+                (self.prenormalized_suffix_elements(db, None))
+                    .zip_longest(other.prenormalized_suffix_elements(db, None))
+                    .when_all(db, |pair| match pair {
+                        EitherOrBoth::Both(self_ty, other_ty) => {
+                            self_ty.is_equivalent_to_impl(db, other_ty, inferable, visitor)
+                        }
+                        EitherOrBoth::Left(_) | EitherOrBoth::Right(_) => {
+                            ConstraintSet::from(false)
+                        }
+                    })
+            })
     }
 }
 
@@ -915,6 +1062,14 @@ impl<T> Tuple<T> {
         FixedLengthTuple::from_elements(elements).into()
     }
 
+    /// Returns the variable-length element of this tuple, if it has one.
+    pub(crate) fn variable_element(&self) -> Option<&T> {
+        match self {
+            Tuple::Fixed(_) => None,
+            Tuple::Variable(tuple) => Some(&tuple.variable),
+        }
+    }
+
     /// Returns an iterator of all of the fixed-length element types of this tuple.
     pub(crate) fn fixed_elements(&self) -> impl Iterator<Item = &T> + '_ {
         match self {
@@ -964,11 +1119,6 @@ impl<'db> Tuple<Type<'db>> {
         UnionType::from_elements(db, self.all_elements())
     }
 
-    /// Concatenates another tuple to the end of this tuple, returning a new tuple.
-    pub(crate) fn concat(&self, db: &'db dyn Db, other: &Self) -> Self {
-        TupleSpecBuilder::from(self).concat(db, other).build()
-    }
-
     /// Resizes this tuple to a different length, if possible. If this tuple cannot satisfy the
     /// desired minimum or maximum length, we return an error. If we return an `Ok` result, the
     /// [`len`][Self::len] of the resulting tuple is guaranteed to be equal to `new_length`.
@@ -994,36 +1144,35 @@ impl<'db> Tuple<Type<'db>> {
         }
     }
 
-    pub(crate) fn materialize(&self, db: &'db dyn Db, variance: TypeVarVariance) -> Self {
-        match self {
-            Tuple::Fixed(tuple) => Tuple::Fixed(tuple.materialize(db, variance)),
-            Tuple::Variable(tuple) => tuple.materialize(db, variance),
-        }
-    }
-
     pub(crate) fn apply_type_mapping_impl<'a>(
         &self,
         db: &'db dyn Db,
         type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
         visitor: &ApplyTypeMappingVisitor<'db>,
     ) -> Self {
         match self {
             Tuple::Fixed(tuple) => {
-                Tuple::Fixed(tuple.apply_type_mapping_impl(db, type_mapping, visitor))
+                Tuple::Fixed(tuple.apply_type_mapping_impl(db, type_mapping, tcx, visitor))
             }
-            Tuple::Variable(tuple) => tuple.apply_type_mapping_impl(db, type_mapping, visitor),
+            Tuple::Variable(tuple) => tuple.apply_type_mapping_impl(db, type_mapping, tcx, visitor),
         }
     }
 
-    fn find_legacy_typevars(
+    fn find_legacy_typevars_impl(
         &self,
         db: &'db dyn Db,
         binding_context: Option<Definition<'db>>,
         typevars: &mut FxOrderSet<BoundTypeVarInstance<'db>>,
+        visitor: &FindLegacyTypeVarsVisitor<'db>,
     ) {
         match self {
-            Tuple::Fixed(tuple) => tuple.find_legacy_typevars(db, binding_context, typevars),
-            Tuple::Variable(tuple) => tuple.find_legacy_typevars(db, binding_context, typevars),
+            Tuple::Fixed(tuple) => {
+                tuple.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
+            }
+            Tuple::Variable(tuple) => {
+                tuple.find_legacy_typevars_impl(db, binding_context, typevars, visitor);
+            }
         }
     }
 
@@ -1031,28 +1180,48 @@ impl<'db> Tuple<Type<'db>> {
         &self,
         db: &'db dyn Db,
         other: &Self,
+        inferable: InferableTypeVars<'_, 'db>,
         relation: TypeRelation,
-        visitor: &HasRelationToVisitor<'db>,
-    ) -> bool {
+        relation_visitor: &HasRelationToVisitor<'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match self {
-            Tuple::Fixed(self_tuple) => {
-                self_tuple.has_relation_to_impl(db, other, relation, visitor)
-            }
-            Tuple::Variable(self_tuple) => {
-                self_tuple.has_relation_to_impl(db, other, relation, visitor)
-            }
+            Tuple::Fixed(self_tuple) => self_tuple.has_relation_to_impl(
+                db,
+                other,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
+            Tuple::Variable(self_tuple) => self_tuple.has_relation_to_impl(
+                db,
+                other,
+                inferable,
+                relation,
+                relation_visitor,
+                disjointness_visitor,
+            ),
         }
     }
 
-    fn is_equivalent_to(&self, db: &'db dyn Db, other: &Self) -> bool {
+    fn is_equivalent_to_impl(
+        &self,
+        db: &'db dyn Db,
+        other: &Self,
+        inferable: InferableTypeVars<'_, 'db>,
+        visitor: &IsEquivalentVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         match (self, other) {
             (Tuple::Fixed(self_tuple), Tuple::Fixed(other_tuple)) => {
-                self_tuple.is_equivalent_to(db, other_tuple)
+                self_tuple.is_equivalent_to_impl(db, other_tuple, inferable, visitor)
             }
             (Tuple::Variable(self_tuple), Tuple::Variable(other_tuple)) => {
-                self_tuple.is_equivalent_to(db, other_tuple)
+                self_tuple.is_equivalent_to_impl(db, other_tuple, inferable, visitor)
+            }
+            (Tuple::Fixed(_), Tuple::Variable(_)) | (Tuple::Variable(_), Tuple::Fixed(_)) => {
+                ConstraintSet::from(false)
             }
-            (Tuple::Fixed(_), Tuple::Variable(_)) | (Tuple::Variable(_), Tuple::Fixed(_)) => false,
         }
     }
 
@@ -1060,16 +1229,18 @@ impl<'db> Tuple<Type<'db>> {
         &self,
         db: &'db dyn Db,
         other: &Self,
-        visitor: &IsDisjointVisitor<'db>,
-    ) -> bool {
+        inferable: InferableTypeVars<'_, 'db>,
+        disjointness_visitor: &IsDisjointVisitor<'db>,
+        relation_visitor: &HasRelationToVisitor<'db>,
+    ) -> ConstraintSet<'db> {
         // Two tuples with an incompatible number of required elements must always be disjoint.
         let (self_min, self_max) = self.len().size_hint();
         let (other_min, other_max) = other.len().size_hint();
         if self_max.is_some_and(|max| max < other_min) {
-            return true;
+            return ConstraintSet::from(true);
         }
         if other_max.is_some_and(|max| max < self_min) {
-            return true;
+            return ConstraintSet::from(true);
         }
 
         // If any of the required elements are pairwise disjoint, the tuples are disjoint as well.
@@ -1078,62 +1249,76 @@ impl<'db> Tuple<Type<'db>> {
             db: &'db dyn Db,
             a: impl IntoIterator<Item = &'s Type<'db>>,
             b: impl IntoIterator<Item = &'s Type<'db>>,
-            visitor: &IsDisjointVisitor<'db>,
-        ) -> bool
+            inferable: InferableTypeVars<'_, 'db>,
+            disjointness_visitor: &IsDisjointVisitor<'db>,
+            relation_visitor: &HasRelationToVisitor<'db>,
+        ) -> ConstraintSet<'db>
         where
             'db: 's,
         {
-            a.into_iter().zip(b).any(|(self_element, other_element)| {
-                self_element.is_disjoint_from_impl(db, *other_element, visitor)
+            (a.into_iter().zip(b)).when_any(db, |(self_element, other_element)| {
+                self_element.is_disjoint_from_impl(
+                    db,
+                    *other_element,
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
             })
         }
 
         match (self, other) {
-            (Tuple::Fixed(self_tuple), Tuple::Fixed(other_tuple)) => {
-                if any_disjoint(db, self_tuple.elements(), other_tuple.elements(), visitor) {
-                    return true;
-                }
-            }
+            (Tuple::Fixed(self_tuple), Tuple::Fixed(other_tuple)) => any_disjoint(
+                db,
+                self_tuple.elements(),
+                other_tuple.elements(),
+                inferable,
+                disjointness_visitor,
+                relation_visitor,
+            ),
 
-            (Tuple::Variable(self_tuple), Tuple::Variable(other_tuple)) => {
-                if any_disjoint(
-                    db,
-                    self_tuple.prefix_elements(),
-                    other_tuple.prefix_elements(),
-                    visitor,
-                ) {
-                    return true;
-                }
-                if any_disjoint(
+            // Note that we don't compare the variable-length portions; two pure homogeneous tuples
+            // `tuple[A, ...]` and `tuple[B, ...]` can never be disjoint even if A and B are
+            // disjoint, because `tuple[()]` would be assignable to both.
+            (Tuple::Variable(self_tuple), Tuple::Variable(other_tuple)) => any_disjoint(
+                db,
+                self_tuple.prefix_elements(),
+                other_tuple.prefix_elements(),
+                inferable,
+                disjointness_visitor,
+                relation_visitor,
+            )
+            .or(db, || {
+                any_disjoint(
                     db,
                     self_tuple.suffix_elements().rev(),
                     other_tuple.suffix_elements().rev(),
-                    visitor,
-                ) {
-                    return true;
-                }
-            }
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
+            }),
 
             (Tuple::Fixed(fixed), Tuple::Variable(variable))
-            | (Tuple::Variable(variable), Tuple::Fixed(fixed)) => {
-                if any_disjoint(db, fixed.elements(), variable.prefix_elements(), visitor) {
-                    return true;
-                }
-                if any_disjoint(
+            | (Tuple::Variable(variable), Tuple::Fixed(fixed)) => any_disjoint(
+                db,
+                fixed.elements(),
+                variable.prefix_elements(),
+                inferable,
+                disjointness_visitor,
+                relation_visitor,
+            )
+            .or(db, || {
+                any_disjoint(
                     db,
                     fixed.elements().rev(),
                     variable.suffix_elements().rev(),
-                    visitor,
-                ) {
-                    return true;
-                }
-            }
+                    inferable,
+                    disjointness_visitor,
+                    relation_visitor,
+                )
+            }),
         }
-
-        // Two pure homogeneous tuples `tuple[A, ...]` and `tuple[B, ...]` can never be
-        // disjoint even if A and B are disjoint, because `tuple[()]` would be assignable to
-        // both.
-        false
     }
 
     pub(crate) fn is_single_valued(&self, db: &'db dyn Db) -> bool {
@@ -1389,6 +1574,59 @@ impl<'db> TupleSpecBuilder<'db> {
         }
     }
 
+    fn all_elements(&self) -> impl Iterator<Item = &Type<'db>> {
+        match self {
+            TupleSpecBuilder::Fixed(elements) => Either::Left(elements.iter()),
+            TupleSpecBuilder::Variable {
+                prefix,
+                variable,
+                suffix,
+            } => Either::Right(prefix.iter().chain(std::iter::once(variable)).chain(suffix)),
+        }
+    }
+
+    /// Return a new tuple-spec builder that reflects the union of this tuple and another tuple.
+    ///
+    /// For example, if `self` is a tuple-spec builder for `tuple[Literal[42], str]` and `other` is a
+    /// tuple-spec for `tuple[Literal[56], str]`, the result will be a tuple-spec builder for
+    /// `tuple[Literal[42, 56], str]`.
+    ///
+    /// To keep things simple, we currently only attempt to preserve the "fixed-length-ness" of
+    /// a tuple spec if both `self` and `other` have the exact same length. For example,
+    /// if `self` is a tuple-spec builder for `tuple[int, str]` and `other` is a tuple-spec for
+    /// `tuple[int, str, bytes]`, the result will be a tuple-spec builder for
+    /// `tuple[int | str | bytes, ...]`. We could consider improving this in the future if real-world
+    /// use cases arise.
+    pub(crate) fn union(mut self, db: &'db dyn Db, other: &TupleSpec<'db>) -> Self {
+        match (&mut self, other) {
+            (TupleSpecBuilder::Fixed(our_elements), TupleSpec::Fixed(new_elements))
+                if our_elements.len() == new_elements.len() =>
+            {
+                for (existing, new) in our_elements.iter_mut().zip(new_elements.elements()) {
+                    *existing = UnionType::from_elements(db, [*existing, *new]);
+                }
+                self
+            }
+
+            // We *could* have a branch here where both `self` and `other` are mixed tuples
+            // with same-length prefixes and same-length suffixes. We *could* zip the two
+            // `prefix` vecs together, unioning each pair of elements to create a new `prefix`
+            // vec, and do the same for the `suffix` vecs. This would preserve the tuple specs
+            // of the union elements more closely. But it's hard to think of a test where this
+            // would actually lead to more precise inference, so it's probably not worth the
+            // complexity.
+            _ => {
+                let unioned =
+                    UnionType::from_elements(db, self.all_elements().chain(other.all_elements()));
+                TupleSpecBuilder::Variable {
+                    prefix: vec![],
+                    variable: unioned,
+                    suffix: vec![],
+                }
+            }
+        }
+    }
+
     pub(super) fn build(self) -> TupleSpec<'db> {
         match self {
             TupleSpecBuilder::Fixed(elements) => {
diff --git a/crates/ty_python_semantic/src/types/type_ordering.rs b/crates/ty_python_semantic/src/types/type_ordering.rs
index 21612c3614..7b52a45e8d 100644
--- a/crates/ty_python_semantic/src/types/type_ordering.rs
+++ b/crates/ty_python_semantic/src/types/type_ordering.rs
@@ -1,10 +1,9 @@
 use std::cmp::Ordering;
 
-use crate::db::Db;
+use crate::{db::Db, types::bound_super::SuperOwnerKind};
 
 use super::{
-    DynamicType, SuperOwnerKind, TodoType, Type, TypeIsType, class_base::ClassBase,
-    subclass_of::SubclassOfInner,
+    DynamicType, TodoType, Type, TypeIsType, class_base::ClassBase, subclass_of::SubclassOfInner,
 };
 
 /// Return an [`Ordering`] that describes the canonical order in which two types should appear
@@ -76,23 +75,19 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
         (Type::BoundMethod(_), _) => Ordering::Less,
         (_, Type::BoundMethod(_)) => Ordering::Greater,
 
-        (Type::MethodWrapper(left), Type::MethodWrapper(right)) => left.cmp(right),
-        (Type::MethodWrapper(_), _) => Ordering::Less,
-        (_, Type::MethodWrapper(_)) => Ordering::Greater,
+        (Type::KnownBoundMethod(left), Type::KnownBoundMethod(right)) => left.cmp(right),
+        (Type::KnownBoundMethod(_), _) => Ordering::Less,
+        (_, Type::KnownBoundMethod(_)) => Ordering::Greater,
 
         (Type::WrapperDescriptor(left), Type::WrapperDescriptor(right)) => left.cmp(right),
         (Type::WrapperDescriptor(_), _) => Ordering::Less,
         (_, Type::WrapperDescriptor(_)) => Ordering::Greater,
 
-        (Type::DataclassDecorator(left), Type::DataclassDecorator(right)) => {
-            left.bits().cmp(&right.bits())
-        }
+        (Type::DataclassDecorator(left), Type::DataclassDecorator(right)) => left.cmp(right),
         (Type::DataclassDecorator(_), _) => Ordering::Less,
         (_, Type::DataclassDecorator(_)) => Ordering::Greater,
 
-        (Type::DataclassTransformer(left), Type::DataclassTransformer(right)) => {
-            left.bits().cmp(&right.bits())
-        }
+        (Type::DataclassTransformer(left), Type::DataclassTransformer(right)) => left.cmp(right),
         (Type::DataclassTransformer(_), _) => Ordering::Less,
         (_, Type::DataclassTransformer(_)) => Ordering::Greater,
 
@@ -142,10 +137,6 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
         (Type::ProtocolInstance(_), _) => Ordering::Less,
         (_, Type::ProtocolInstance(_)) => Ordering::Greater,
 
-        (Type::NonInferableTypeVar(left), Type::NonInferableTypeVar(right)) => left.cmp(right),
-        (Type::NonInferableTypeVar(_), _) => Ordering::Less,
-        (_, Type::NonInferableTypeVar(_)) => Ordering::Greater,
-
         (Type::TypeVar(left), Type::TypeVar(right)) => left.cmp(right),
         (Type::TypeVar(_), _) => Ordering::Less,
         (_, Type::TypeVar(_)) => Ordering::Greater,
@@ -212,6 +203,12 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
         (Type::TypeAlias(_), _) => Ordering::Less,
         (_, Type::TypeAlias(_)) => Ordering::Greater,
 
+        (Type::TypedDict(left), Type::TypedDict(right)) => {
+            left.defining_class().cmp(&right.defining_class())
+        }
+        (Type::TypedDict(_), _) => Ordering::Less,
+        (_, Type::TypedDict(_)) => Ordering::Greater,
+
         (Type::Union(_), _) | (_, Type::Union(_)) => {
             unreachable!("our type representation does not permit nested unions");
         }
@@ -243,12 +240,6 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
 
             unreachable!("Two equal, normalized intersections should share the same Salsa ID")
         }
-
-        (Type::TypedDict(left), Type::TypedDict(right)) => {
-            left.defining_class.cmp(&right.defining_class)
-        }
-        (Type::TypedDict(_), _) => Ordering::Less,
-        (_, Type::TypedDict(_)) => Ordering::Greater,
     }
 }
 
@@ -275,6 +266,12 @@ fn dynamic_elements_ordering(left: DynamicType, right: DynamicType) -> Ordering
 
         (DynamicType::TodoTypeAlias, _) => Ordering::Less,
         (_, DynamicType::TodoTypeAlias) => Ordering::Greater,
+
+        (DynamicType::Divergent(left), DynamicType::Divergent(right)) => {
+            left.scope.cmp(&right.scope)
+        }
+        (DynamicType::Divergent(_), _) => Ordering::Less,
+        (_, DynamicType::Divergent(_)) => Ordering::Greater,
     }
 }
 
diff --git a/crates/ty_python_semantic/src/types/typed_dict.rs b/crates/ty_python_semantic/src/types/typed_dict.rs
new file mode 100644
index 0000000000..e29b836d8a
--- /dev/null
+++ b/crates/ty_python_semantic/src/types/typed_dict.rs
@@ -0,0 +1,434 @@
+use bitflags::bitflags;
+use ruff_db::diagnostic::{Annotation, Diagnostic, Span, SubDiagnostic, SubDiagnosticSeverity};
+use ruff_db::parsed::parsed_module;
+use ruff_python_ast::Arguments;
+use ruff_python_ast::{self as ast, AnyNodeRef, StmtClassDef, name::Name};
+use ruff_text_size::Ranged;
+
+use super::class::{ClassType, CodeGeneratorKind, Field};
+use super::context::InferContext;
+use super::diagnostic::{
+    INVALID_ARGUMENT_TYPE, INVALID_ASSIGNMENT, report_invalid_key_on_typed_dict,
+    report_missing_typed_dict_key,
+};
+use super::{ApplyTypeMappingVisitor, Type, TypeMapping, visitor};
+use crate::types::TypeContext;
+use crate::{Db, FxOrderMap};
+
+use ordermap::OrderSet;
+
+bitflags! {
+    /// Used for `TypedDict` class parameters.
+    /// Keeps track of the keyword arguments that were passed-in during class definition.
+    /// (see https://typing.python.org/en/latest/spec/typeddict.html)
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+    pub struct TypedDictParams: u8 {
+        /// Whether keys are required by default (`total=True`)
+        const TOTAL = 1 << 0;
+    }
+}
+
+impl get_size2::GetSize for TypedDictParams {}
+
+impl Default for TypedDictParams {
+    fn default() -> Self {
+        Self::TOTAL
+    }
+}
+
+/// Type that represents the set of all inhabitants (`dict` instances) that conform to
+/// a given `TypedDict` schema.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, salsa::Update, Hash, get_size2::GetSize)]
+pub struct TypedDictType<'db> {
+    /// A reference to the class (inheriting from `typing.TypedDict`) that specifies the
+    /// schema of this `TypedDict`.
+    defining_class: ClassType<'db>,
+}
+
+impl<'db> TypedDictType<'db> {
+    pub(crate) fn new(defining_class: ClassType<'db>) -> Self {
+        Self { defining_class }
+    }
+
+    pub(crate) fn defining_class(self) -> ClassType<'db> {
+        self.defining_class
+    }
+
+    pub(crate) fn items(self, db: &'db dyn Db) -> FxOrderMap<Name, Field<'db>> {
+        let (class_literal, specialization) = self.defining_class.class_literal(db);
+        class_literal.fields(db, specialization, CodeGeneratorKind::TypedDict)
+    }
+
+    pub(crate) fn apply_type_mapping_impl<'a>(
+        self,
+        db: &'db dyn Db,
+        type_mapping: &TypeMapping<'a, 'db>,
+        tcx: TypeContext<'db>,
+        visitor: &ApplyTypeMappingVisitor<'db>,
+    ) -> Self {
+        // TODO: Materialization of gradual TypedDicts needs more logic
+        Self {
+            defining_class: self.defining_class.apply_type_mapping_impl(
+                db,
+                type_mapping,
+                tcx,
+                visitor,
+            ),
+        }
+    }
+}
+
+pub(crate) fn walk_typed_dict_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(
+    db: &'db dyn Db,
+    typed_dict: TypedDictType<'db>,
+    visitor: &V,
+) {
+    visitor.visit_type(db, typed_dict.defining_class.into());
+}
+
+pub(super) fn typed_dict_params_from_class_def(class_stmt: &StmtClassDef) -> TypedDictParams {
+    let mut typed_dict_params = TypedDictParams::default();
+
+    // Check for `total` keyword argument in the class definition
+    // Note that it is fine to only check for Boolean literals here
+    // (https://typing.python.org/en/latest/spec/typeddict.html#totality)
+    if let Some(arguments) = &class_stmt.arguments {
+        for keyword in &arguments.keywords {
+            if keyword.arg.as_deref() == Some("total")
+                && matches!(
+                    &keyword.value,
+                    ast::Expr::BooleanLiteral(ast::ExprBooleanLiteral { value: false, .. })
+                )
+            {
+                typed_dict_params.remove(TypedDictParams::TOTAL);
+            }
+        }
+    }
+
+    typed_dict_params
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(super) enum TypedDictAssignmentKind {
+    /// For subscript assignments like `d["key"] = value`
+    Subscript,
+    /// For constructor arguments like `MyTypedDict(key=value)`
+    Constructor,
+}
+
+impl TypedDictAssignmentKind {
+    fn diagnostic_name(self) -> &'static str {
+        match self {
+            Self::Subscript => "assignment",
+            Self::Constructor => "argument",
+        }
+    }
+
+    fn diagnostic_type(self) -> &'static crate::lint::LintMetadata {
+        match self {
+            Self::Subscript => &INVALID_ASSIGNMENT,
+            Self::Constructor => &INVALID_ARGUMENT_TYPE,
+        }
+    }
+
+    const fn is_subscript(self) -> bool {
+        matches!(self, Self::Subscript)
+    }
+}
+
+/// Validates assignment of a value to a specific key on a `TypedDict`.
+///
+/// Returns true if the assignment is valid, or false otherwise.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn validate_typed_dict_key_assignment<'db, 'ast>(
+    context: &InferContext<'db, 'ast>,
+    typed_dict: TypedDictType<'db>,
+    key: &str,
+    value_ty: Type<'db>,
+    typed_dict_node: impl Into<AnyNodeRef<'ast>>,
+    key_node: impl Into<AnyNodeRef<'ast>>,
+    value_node: impl Into<AnyNodeRef<'ast>>,
+    assignment_kind: TypedDictAssignmentKind,
+) -> bool {
+    let db = context.db();
+    let items = typed_dict.items(db);
+
+    // Check if key exists in `TypedDict`
+    let Some((_, item)) = items.iter().find(|(name, _)| *name == key) else {
+        report_invalid_key_on_typed_dict(
+            context,
+            typed_dict_node.into(),
+            key_node.into(),
+            Type::TypedDict(typed_dict),
+            Type::string_literal(db, key),
+            &items,
+        );
+
+        return false;
+    };
+
+    let add_item_definition_subdiagnostic = |diagnostic: &mut Diagnostic, message| {
+        if let Some(declaration) = item.single_declaration {
+            let file = declaration.file(db);
+            let module = parsed_module(db, file).load(db);
+
+            let mut sub = SubDiagnostic::new(SubDiagnosticSeverity::Info, "Item declaration");
+            sub.annotate(
+                Annotation::secondary(
+                    Span::from(file).with_range(declaration.full_range(db, &module).range()),
+                )
+                .message(message),
+            );
+            diagnostic.sub(sub);
+        }
+    };
+
+    if assignment_kind.is_subscript() && item.is_read_only() {
+        if let Some(builder) =
+            context.report_lint(assignment_kind.diagnostic_type(), key_node.into())
+        {
+            let typed_dict_ty = Type::TypedDict(typed_dict);
+            let typed_dict_d = typed_dict_ty.display(db);
+
+            let mut diagnostic = builder.into_diagnostic(format_args!(
+                "Cannot assign to key \"{key}\" on TypedDict `{typed_dict_d}`",
+            ));
+
+            diagnostic.set_primary_message(format_args!("key is marked read-only"));
+
+            diagnostic.annotate(
+                context
+                    .secondary(typed_dict_node.into())
+                    .message(format_args!("TypedDict `{typed_dict_d}`")),
+            );
+
+            add_item_definition_subdiagnostic(&mut diagnostic, "Read-only item declared here");
+        }
+
+        return false;
+    }
+
+    // Key exists, check if value type is assignable to declared type
+    if value_ty.is_assignable_to(db, item.declared_ty) {
+        return true;
+    }
+
+    // Invalid assignment - emit diagnostic
+    if let Some(builder) = context.report_lint(assignment_kind.diagnostic_type(), value_node.into())
+    {
+        let typed_dict_ty = Type::TypedDict(typed_dict);
+        let typed_dict_d = typed_dict_ty.display(db);
+        let value_d = value_ty.display(db);
+        let item_type_d = item.declared_ty.display(db);
+
+        let mut diagnostic = builder.into_diagnostic(format_args!(
+            "Invalid {} to key \"{key}\" with declared type `{item_type_d}` on TypedDict `{typed_dict_d}`",
+            assignment_kind.diagnostic_name(),
+        ));
+
+        diagnostic.set_primary_message(format_args!("value of type `{value_d}`"));
+
+        diagnostic.annotate(
+            context
+                .secondary(typed_dict_node.into())
+                .message(format_args!("TypedDict `{typed_dict_d}`")),
+        );
+
+        diagnostic.annotate(
+            context
+                .secondary(key_node.into())
+                .message(format_args!("key has declared type `{item_type_d}`")),
+        );
+
+        add_item_definition_subdiagnostic(&mut diagnostic, "Item declared here");
+    }
+
+    false
+}
+
+/// Validates that all required keys are provided in a `TypedDict` construction.
+///
+/// Reports errors for any keys that are required but not provided.
+///
+/// Returns true if the assignment is valid, or false otherwise.
+pub(super) fn validate_typed_dict_required_keys<'db, 'ast>(
+    context: &InferContext<'db, 'ast>,
+    typed_dict: TypedDictType<'db>,
+    provided_keys: &OrderSet<&str>,
+    error_node: AnyNodeRef<'ast>,
+) -> bool {
+    let db = context.db();
+    let items = typed_dict.items(db);
+
+    let required_keys: OrderSet<&str> = items
+        .iter()
+        .filter_map(|(key_name, field)| field.is_required().then_some(key_name.as_str()))
+        .collect();
+
+    let missing_keys = required_keys.difference(provided_keys);
+
+    let mut has_missing_key = false;
+    for missing_key in missing_keys {
+        has_missing_key = true;
+
+        report_missing_typed_dict_key(
+            context,
+            error_node,
+            Type::TypedDict(typed_dict),
+            missing_key,
+        );
+    }
+
+    !has_missing_key
+}
+
+pub(super) fn validate_typed_dict_constructor<'db, 'ast>(
+    context: &InferContext<'db, 'ast>,
+    typed_dict: TypedDictType<'db>,
+    arguments: &'ast Arguments,
+    error_node: AnyNodeRef<'ast>,
+    expression_type_fn: impl Fn(&ast::Expr) -> Type<'db>,
+) {
+    let has_positional_dict = arguments.args.len() == 1 && arguments.args[0].is_dict_expr();
+
+    let provided_keys = if has_positional_dict {
+        validate_from_dict_literal(
+            context,
+            typed_dict,
+            arguments,
+            error_node,
+            &expression_type_fn,
+        )
+    } else {
+        validate_from_keywords(
+            context,
+            typed_dict,
+            arguments,
+            error_node,
+            &expression_type_fn,
+        )
+    };
+
+    validate_typed_dict_required_keys(context, typed_dict, &provided_keys, error_node);
+}
+
+/// Validates a `TypedDict` constructor call with a single positional dictionary argument
+/// e.g. `Person({"name": "Alice", "age": 30})`
+fn validate_from_dict_literal<'db, 'ast>(
+    context: &InferContext<'db, 'ast>,
+    typed_dict: TypedDictType<'db>,
+    arguments: &'ast Arguments,
+    error_node: AnyNodeRef<'ast>,
+    expression_type_fn: &impl Fn(&ast::Expr) -> Type<'db>,
+) -> OrderSet<&'ast str> {
+    let mut provided_keys = OrderSet::new();
+
+    if let ast::Expr::Dict(dict_expr) = &arguments.args[0] {
+        // Validate dict entries
+        for dict_item in &dict_expr.items {
+            if let Some(ref key_expr) = dict_item.key
+                && let ast::Expr::StringLiteral(ast::ExprStringLiteral {
+                    value: key_value, ..
+                }) = key_expr
+            {
+                let key_str = key_value.to_str();
+                provided_keys.insert(key_str);
+
+                // Get the already-inferred argument type
+                let value_type = expression_type_fn(&dict_item.value);
+                validate_typed_dict_key_assignment(
+                    context,
+                    typed_dict,
+                    key_str,
+                    value_type,
+                    error_node,
+                    key_expr,
+                    &dict_item.value,
+                    TypedDictAssignmentKind::Constructor,
+                );
+            }
+        }
+    }
+
+    provided_keys
+}
+
+/// Validates a `TypedDict` constructor call with keywords
+/// e.g. `Person(name="Alice", age=30)`
+fn validate_from_keywords<'db, 'ast>(
+    context: &InferContext<'db, 'ast>,
+    typed_dict: TypedDictType<'db>,
+    arguments: &'ast Arguments,
+    error_node: AnyNodeRef<'ast>,
+    expression_type_fn: &impl Fn(&ast::Expr) -> Type<'db>,
+) -> OrderSet<&'ast str> {
+    let provided_keys: OrderSet<&str> = arguments
+        .keywords
+        .iter()
+        .filter_map(|kw| kw.arg.as_ref().map(|arg| arg.id.as_str()))
+        .collect();
+
+    // Validate that each key is assigned a type that is compatible with the keys's value type
+    for keyword in &arguments.keywords {
+        if let Some(arg_name) = &keyword.arg {
+            // Get the already-inferred argument type
+            let arg_type = expression_type_fn(&keyword.value);
+            validate_typed_dict_key_assignment(
+                context,
+                typed_dict,
+                arg_name.as_str(),
+                arg_type,
+                error_node,
+                keyword,
+                &keyword.value,
+                TypedDictAssignmentKind::Constructor,
+            );
+        }
+    }
+
+    provided_keys
+}
+
+/// Validates a `TypedDict` dictionary literal assignment,
+/// e.g. `person: Person = {"name": "Alice", "age": 30}`
+pub(super) fn validate_typed_dict_dict_literal<'db>(
+    context: &InferContext<'db, '_>,
+    typed_dict: TypedDictType<'db>,
+    dict_expr: &ast::ExprDict,
+    error_node: AnyNodeRef,
+    expression_type_fn: impl Fn(&ast::Expr) -> Type<'db>,
+) -> Result<OrderSet<&'db str>, OrderSet<&'db str>> {
+    let mut valid = true;
+    let mut provided_keys = OrderSet::new();
+
+    // Validate each key-value pair in the dictionary literal
+    for item in &dict_expr.items {
+        if let Some(key_expr) = &item.key
+            && let Type::StringLiteral(key_str) = expression_type_fn(key_expr)
+        {
+            let key_str = key_str.value(context.db());
+            provided_keys.insert(key_str);
+
+            let value_type = expression_type_fn(&item.value);
+
+            valid &= validate_typed_dict_key_assignment(
+                context,
+                typed_dict,
+                key_str,
+                value_type,
+                error_node,
+                key_expr,
+                &item.value,
+                TypedDictAssignmentKind::Constructor,
+            );
+        }
+    }
+
+    valid &= validate_typed_dict_required_keys(context, typed_dict, &provided_keys, error_node);
+
+    if valid {
+        Ok(provided_keys)
+    } else {
+        Err(provided_keys)
+    }
+}
diff --git a/crates/ty_python_semantic/src/types/unpacker.rs b/crates/ty_python_semantic/src/types/unpacker.rs
index 65bec0ef4f..9af330d8e0 100644
--- a/crates/ty_python_semantic/src/types/unpacker.rs
+++ b/crates/ty_python_semantic/src/types/unpacker.rs
@@ -9,7 +9,7 @@ use crate::Db;
 use crate::semantic_index::ast_ids::node_key::ExpressionNodeKey;
 use crate::semantic_index::scope::ScopeId;
 use crate::types::tuple::{ResizeTupleError, Tuple, TupleLength, TupleSpec, TupleUnpacker};
-use crate::types::{Type, TypeCheckDiagnostics, infer_expression_types};
+use crate::types::{Type, TypeCheckDiagnostics, TypeContext, infer_expression_types};
 use crate::unpack::{UnpackKind, UnpackValue};
 
 use super::context::InferContext;
@@ -48,8 +48,9 @@ impl<'db, 'ast> Unpacker<'db, 'ast> {
             "Unpacking target must be a list or tuple expression"
         );
 
-        let value_type = infer_expression_types(self.db(), value.expression())
-            .expression_type(value.expression().node_ref(self.db(), self.module()));
+        let value_type =
+            infer_expression_types(self.db(), value.expression(), TypeContext::default())
+                .expression_type(value.expression().node_ref(self.db(), self.module()));
 
         let value_type = match value.kind() {
             UnpackKind::Assign => {
@@ -117,6 +118,11 @@ impl<'db, 'ast> Unpacker<'db, 'ast> {
                 };
                 let mut unpacker = TupleUnpacker::new(self.db(), target_len);
 
+                // N.B. `Type::try_iterate` internally handles unions, but in a lossy way.
+                // For our purposes here, we get better error messages and more precise inference
+                // if we manually map over the union and call `try_iterate` on each union element.
+                // See <https://github.com/astral-sh/ruff/pull/20377#issuecomment-3401380305>
+                // for more discussion.
                 let unpack_types = match value_ty {
                     Type::Union(union_ty) => union_ty.elements(self.db()),
                     _ => std::slice::from_ref(&value_ty),
@@ -224,7 +230,7 @@ impl<'db> UnpackResult<'db> {
         &self.diagnostics
     }
 
-    pub(crate) fn cycle_fallback(cycle_fallback_type: Type<'db>) -> Self {
+    pub(crate) fn cycle_initial(cycle_fallback_type: Type<'db>) -> Self {
         Self {
             targets: FxHashMap::default(),
             diagnostics: TypeCheckDiagnostics::default(),
diff --git a/crates/ty_python_semantic/src/types/variance.rs b/crates/ty_python_semantic/src/types/variance.rs
index 63d250db56..fb9c87d062 100644
--- a/crates/ty_python_semantic/src/types/variance.rs
+++ b/crates/ty_python_semantic/src/types/variance.rs
@@ -108,9 +108,30 @@ impl std::iter::FromIterator<Self> for TypeVarVariance {
 }
 
 pub(crate) trait VarianceInferable<'db>: Sized {
+    /// The variance of `typevar` in `self`
+    ///
+    /// Generally, one will implement this by traversing any types within `self`
+    /// in which `typevar` could occur, and calling `variance_of` recursively on
+    /// them.
+    ///
+    /// Sometimes the recursive calls will be in positions where you need to
+    /// specify a non-covariant polarity. See `with_polarity` for more details.
     fn variance_of(self, db: &'db dyn Db, typevar: BoundTypeVarInstance<'db>) -> TypeVarVariance;
 
-    fn with_polarity(self, polarity: TypeVarVariance) -> WithPolarity<Self> {
+    /// Creates a `VarianceInferable` that applies `polarity` (see
+    /// `TypeVarVariance::compose`) to the result of variance inference on the
+    /// underlying value.
+    ///
+    /// In some cases, we need to apply a polarity to the recursive call.
+    /// You can do this with `ty.with_polarity(polarity).variance_of(typevar)`.
+    /// Generally, this will be whenever the type occurs in argument-position,
+    /// in which case you will want `TypeVarVariance::Contravariant`, or
+    /// `TypeVarVariance::Invariant` if the value(s) being annotated is known to
+    /// be mutable, such as `T` in `list[T]`. See the [typing spec][typing-spec]
+    /// for more details.
+    ///
+    /// [typing-spec]: https://typing.python.org/en/latest/spec/generics.html#variance
+    fn with_polarity(self, polarity: TypeVarVariance) -> impl VarianceInferable<'db> {
         WithPolarity {
             variance_inferable: self,
             polarity,
diff --git a/crates/ty_python_semantic/src/types/visitor.rs b/crates/ty_python_semantic/src/types/visitor.rs
index 4b58f20bf5..d58bf046f1 100644
--- a/crates/ty_python_semantic/src/types/visitor.rs
+++ b/crates/ty_python_semantic/src/types/visitor.rs
@@ -1,21 +1,27 @@
+use rustc_hash::FxHashMap;
+
 use crate::{
     Db, FxIndexSet,
     types::{
         BoundMethodType, BoundSuperType, BoundTypeVarInstance, CallableType, GenericAlias,
-        IntersectionType, KnownInstanceType, MethodWrapperKind, NominalInstanceType,
+        IntersectionType, KnownBoundMethodType, KnownInstanceType, NominalInstanceType,
         PropertyInstanceType, ProtocolInstanceType, SubclassOfType, Type, TypeAliasType,
         TypeIsType, TypeVarInstance, TypedDictType, UnionType,
+        bound_super::walk_bound_super_type,
         class::walk_generic_alias,
         function::{FunctionType, walk_function_type},
         instance::{walk_nominal_instance_type, walk_protocol_instance_type},
         subclass_of::walk_subclass_of_type,
-        walk_bound_method_type, walk_bound_super_type, walk_bound_type_var_type,
-        walk_callable_type, walk_intersection_type, walk_known_instance_type,
-        walk_method_wrapper_type, walk_property_instance_type, walk_type_alias_type,
-        walk_type_var_type, walk_typed_dict_type, walk_typeis_type, walk_union,
+        walk_bound_method_type, walk_bound_type_var_type, walk_callable_type,
+        walk_intersection_type, walk_known_instance_type, walk_method_wrapper_type,
+        walk_property_instance_type, walk_type_alias_type, walk_type_var_type,
+        walk_typed_dict_type, walk_typeis_type, walk_union,
     },
 };
-use std::cell::{Cell, RefCell};
+use std::{
+    cell::{Cell, RefCell},
+    collections::hash_map::Entry,
+};
 
 /// A visitor trait that recurses into nested types.
 ///
@@ -23,6 +29,9 @@ use std::cell::{Cell, RefCell};
 /// but it makes it easy for implementors of the trait to do so.
 /// See [`any_over_type`] for an example of how to do this.
 pub(crate) trait TypeVisitor<'db> {
+    /// Should the visitor trigger inference of and visit lazily-inferred type attributes?
+    fn should_visit_lazy_type_attributes(&self) -> bool;
+
     fn visit_type(&self, db: &'db dyn Db, ty: Type<'db>);
 
     fn visit_union_type(&self, db: &'db dyn Db, union: UnionType<'db>) {
@@ -81,7 +90,11 @@ pub(crate) trait TypeVisitor<'db> {
         walk_protocol_instance_type(db, protocol, self);
     }
 
-    fn visit_method_wrapper_type(&self, db: &'db dyn Db, method_wrapper: MethodWrapperKind<'db>) {
+    fn visit_method_wrapper_type(
+        &self,
+        db: &'db dyn Db,
+        method_wrapper: KnownBoundMethodType<'db>,
+    ) {
         walk_method_wrapper_type(db, method_wrapper, self);
     }
 
@@ -100,13 +113,13 @@ pub(crate) trait TypeVisitor<'db> {
 
 /// Enumeration of types that may contain other types, such as unions, intersections, and generics.
 #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
-enum NonAtomicType<'db> {
+pub(super) enum NonAtomicType<'db> {
     Union(UnionType<'db>),
     Intersection(IntersectionType<'db>),
     FunctionLiteral(FunctionType<'db>),
     BoundMethod(BoundMethodType<'db>),
     BoundSuper(BoundSuperType<'db>),
-    MethodWrapper(MethodWrapperKind<'db>),
+    MethodWrapper(KnownBoundMethodType<'db>),
     Callable(CallableType<'db>),
     GenericAlias(GenericAlias<'db>),
     KnownInstance(KnownInstanceType<'db>),
@@ -114,14 +127,13 @@ enum NonAtomicType<'db> {
     NominalInstance(NominalInstanceType<'db>),
     PropertyInstance(PropertyInstanceType<'db>),
     TypeIs(TypeIsType<'db>),
-    NonInferableTypeVar(BoundTypeVarInstance<'db>),
     TypeVar(BoundTypeVarInstance<'db>),
     ProtocolInstance(ProtocolInstanceType<'db>),
     TypedDict(TypedDictType<'db>),
     TypeAlias(TypeAliasType<'db>),
 }
 
-enum TypeKind<'db> {
+pub(super) enum TypeKind<'db> {
     Atomic,
     NonAtomic(NonAtomicType<'db>),
 }
@@ -158,7 +170,7 @@ impl<'db> From<Type<'db>> for TypeKind<'db> {
             Type::BoundSuper(bound_super) => {
                 TypeKind::NonAtomic(NonAtomicType::BoundSuper(bound_super))
             }
-            Type::MethodWrapper(method_wrapper) => {
+            Type::KnownBoundMethod(method_wrapper) => {
                 TypeKind::NonAtomic(NonAtomicType::MethodWrapper(method_wrapper))
             }
             Type::Callable(callable) => TypeKind::NonAtomic(NonAtomicType::Callable(callable)),
@@ -178,9 +190,6 @@ impl<'db> From<Type<'db>> for TypeKind<'db> {
             Type::PropertyInstance(property) => {
                 TypeKind::NonAtomic(NonAtomicType::PropertyInstance(property))
             }
-            Type::NonInferableTypeVar(bound_typevar) => {
-                TypeKind::NonAtomic(NonAtomicType::NonInferableTypeVar(bound_typevar))
-            }
             Type::TypeVar(bound_typevar) => {
                 TypeKind::NonAtomic(NonAtomicType::TypeVar(bound_typevar))
             }
@@ -193,7 +202,7 @@ impl<'db> From<Type<'db>> for TypeKind<'db> {
     }
 }
 
-fn walk_non_atomic_type<'db, V: TypeVisitor<'db> + ?Sized>(
+pub(super) fn walk_non_atomic_type<'db, V: TypeVisitor<'db> + ?Sized>(
     db: &'db dyn Db,
     non_atomic_type: NonAtomicType<'db>,
     visitor: &V,
@@ -220,9 +229,6 @@ fn walk_non_atomic_type<'db, V: TypeVisitor<'db> + ?Sized>(
             visitor.visit_property_instance_type(db, property);
         }
         NonAtomicType::TypeIs(type_is) => visitor.visit_typeis_type(db, type_is),
-        NonAtomicType::NonInferableTypeVar(bound_typevar) => {
-            visitor.visit_bound_type_var_type(db, bound_typevar);
-        }
         NonAtomicType::TypeVar(bound_typevar) => {
             visitor.visit_bound_type_var_type(db, bound_typevar);
         }
@@ -240,18 +246,28 @@ fn walk_non_atomic_type<'db, V: TypeVisitor<'db> + ?Sized>(
 ///
 /// The function guards against infinite recursion
 /// by keeping track of the non-atomic types it has already seen.
+///
+/// The `should_visit_lazy_type_attributes` parameter controls whether deferred type attributes
+/// (value of a type alias, attributes of a class-based protocol, bounds/constraints of a typevar)
+/// are visited or not.
 pub(super) fn any_over_type<'db>(
     db: &'db dyn Db,
     ty: Type<'db>,
     query: &dyn Fn(Type<'db>) -> bool,
+    should_visit_lazy_type_attributes: bool,
 ) -> bool {
     struct AnyOverTypeVisitor<'db, 'a> {
         query: &'a dyn Fn(Type<'db>) -> bool,
         seen_types: RefCell<FxIndexSet<NonAtomicType<'db>>>,
         found_matching_type: Cell<bool>,
+        should_visit_lazy_type_attributes: bool,
     }
 
     impl<'db> TypeVisitor<'db> for AnyOverTypeVisitor<'db, '_> {
+        fn should_visit_lazy_type_attributes(&self) -> bool {
+            self.should_visit_lazy_type_attributes
+        }
+
         fn visit_type(&self, db: &'db dyn Db, ty: Type<'db>) {
             let already_found = self.found_matching_type.get();
             if already_found {
@@ -279,7 +295,153 @@ pub(super) fn any_over_type<'db>(
         query,
         seen_types: RefCell::new(FxIndexSet::default()),
         found_matching_type: Cell::new(false),
+        should_visit_lazy_type_attributes,
     };
     visitor.visit_type(db, ty);
     visitor.found_matching_type.get()
 }
+
+/// Returns the maximum number of layers of generic specializations for a given type.
+///
+/// For example, `int` has a depth of `0`, `list[int]` has a depth of `1`, and `list[set[int]]`
+/// has a depth of `2`. A set-theoretic type like `list[int] | list[list[int]]` has a maximum
+/// depth of `2`.
+fn specialization_depth(db: &dyn Db, ty: Type<'_>) -> usize {
+    #[derive(Debug, Default)]
+    struct SpecializationDepthVisitor<'db> {
+        seen_types: RefCell<FxHashMap<NonAtomicType<'db>, Option<usize>>>,
+        max_depth: Cell<usize>,
+    }
+
+    impl<'db> TypeVisitor<'db> for SpecializationDepthVisitor<'db> {
+        fn should_visit_lazy_type_attributes(&self) -> bool {
+            false
+        }
+
+        fn visit_type(&self, db: &'db dyn Db, ty: Type<'db>) {
+            match TypeKind::from(ty) {
+                TypeKind::Atomic => {
+                    if ty.is_divergent() {
+                        self.max_depth.set(usize::MAX);
+                    }
+                }
+                TypeKind::NonAtomic(non_atomic_type) => {
+                    match self.seen_types.borrow_mut().entry(non_atomic_type) {
+                        Entry::Occupied(cached_depth) => {
+                            self.max_depth
+                                .update(|current| current.max(cached_depth.get().unwrap_or(0)));
+                            return;
+                        }
+                        Entry::Vacant(entry) => {
+                            entry.insert(None);
+                        }
+                    }
+
+                    let self_depth: usize =
+                        matches!(non_atomic_type, NonAtomicType::GenericAlias(_)).into();
+
+                    let previous_max_depth = self.max_depth.replace(0);
+                    walk_non_atomic_type(db, non_atomic_type, self);
+
+                    self.max_depth.update(|max_child_depth| {
+                        previous_max_depth.max(max_child_depth.saturating_add(self_depth))
+                    });
+
+                    self.seen_types
+                        .borrow_mut()
+                        .insert(non_atomic_type, Some(self.max_depth.get()));
+                }
+            }
+        }
+    }
+
+    let visitor = SpecializationDepthVisitor::default();
+    visitor.visit_type(db, ty);
+    visitor.max_depth.get()
+}
+
+pub(super) fn exceeds_max_specialization_depth(db: &dyn Db, ty: Type<'_>) -> bool {
+    // To prevent infinite recursion during type inference for infinite types, we fall back to
+    // `C[Divergent]` once a certain amount of levels of specialization have occurred. For
+    // example:
+    //
+    // ```py
+    // x = 1
+    // while random_bool():
+    //     x = [x]
+    //
+    // reveal_type(x)  # Unknown | Literal[1] | list[Divergent]
+    // ```
+    const MAX_SPECIALIZATION_DEPTH: usize = 10;
+
+    specialization_depth(db, ty) > MAX_SPECIALIZATION_DEPTH
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{db::tests::setup_db, types::KnownClass};
+
+    #[test]
+    fn test_generics_layering_depth() {
+        let db = setup_db();
+
+        let int = || KnownClass::Int.to_instance(&db);
+        let list = |element| KnownClass::List.to_specialized_instance(&db, [element]);
+        let dict = |key, value| KnownClass::Dict.to_specialized_instance(&db, [key, value]);
+        let set = |element| KnownClass::Set.to_specialized_instance(&db, [element]);
+        let str = || KnownClass::Str.to_instance(&db);
+        let bytes = || KnownClass::Bytes.to_instance(&db);
+
+        let list_of_int = list(int());
+        assert_eq!(specialization_depth(&db, list_of_int), 1);
+
+        let list_of_list_of_int = list(list_of_int);
+        assert_eq!(specialization_depth(&db, list_of_list_of_int), 2);
+
+        let list_of_list_of_list_of_int = list(list_of_list_of_int);
+        assert_eq!(specialization_depth(&db, list_of_list_of_list_of_int), 3);
+
+        assert_eq!(specialization_depth(&db, set(dict(str(), list_of_int))), 3);
+
+        assert_eq!(
+            specialization_depth(
+                &db,
+                UnionType::from_elements(&db, [list_of_list_of_list_of_int, list_of_list_of_int])
+            ),
+            3
+        );
+
+        assert_eq!(
+            specialization_depth(
+                &db,
+                UnionType::from_elements(&db, [list_of_list_of_int, list_of_list_of_list_of_int])
+            ),
+            3
+        );
+
+        assert_eq!(
+            specialization_depth(
+                &db,
+                Type::heterogeneous_tuple(&db, [Type::heterogeneous_tuple(&db, [int()])])
+            ),
+            2
+        );
+
+        assert_eq!(
+            specialization_depth(&db, Type::heterogeneous_tuple(&db, [list_of_int, str()])),
+            2
+        );
+
+        assert_eq!(
+            specialization_depth(
+                &db,
+                list(UnionType::from_elements(
+                    &db,
+                    [list(int()), list(str()), list(bytes())]
+                ))
+            ),
+            2
+        );
+    }
+}
diff --git a/crates/ty_python_semantic/src/util/mod.rs b/crates/ty_python_semantic/src/util/mod.rs
deleted file mode 100644
index 54555cd617..0000000000
--- a/crates/ty_python_semantic/src/util/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod diagnostics;
-pub(crate) mod subscript;
diff --git a/crates/ty_python_semantic/tests/corpus.rs b/crates/ty_python_semantic/tests/corpus.rs
index 83ad7ae1ff..db2b1f3342 100644
--- a/crates/ty_python_semantic/tests/corpus.rs
+++ b/crates/ty_python_semantic/tests/corpus.rs
@@ -255,6 +255,10 @@ impl ty_python_semantic::Db for CorpusDb {
     fn lint_registry(&self) -> &LintRegistry {
         default_lint_registry()
     }
+
+    fn verbose(&self) -> bool {
+        false
+    }
 }
 
 #[salsa::db]
diff --git a/crates/ty_server/Cargo.toml b/crates/ty_server/Cargo.toml
index 3e7da397f6..4abb4b627b 100644
--- a/crates/ty_server/Cargo.toml
+++ b/crates/ty_server/Cargo.toml
@@ -22,7 +22,6 @@ ty_combine = { workspace = true }
 ty_ide = { workspace = true }
 ty_project = { workspace = true }
 ty_python_semantic = { workspace = true }
-ty_vendored = { workspace = true }
 
 anyhow = { workspace = true }
 bitflags = { workspace = true }
diff --git a/crates/ty_server/src/capabilities.rs b/crates/ty_server/src/capabilities.rs
index f0b77a9533..fed7ac811e 100644
--- a/crates/ty_server/src/capabilities.rs
+++ b/crates/ty_server/src/capabilities.rs
@@ -10,6 +10,8 @@ use lsp_types::{
 
 use crate::PositionEncoding;
 use crate::session::GlobalSettings;
+use lsp_types as types;
+use std::str::FromStr;
 
 bitflags::bitflags! {
     /// Represents the resolved client capabilities for the language server.
@@ -37,6 +39,36 @@ bitflags::bitflags! {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) enum SupportedCommand {
+    Debug,
+}
+
+impl SupportedCommand {
+    /// Returns the identifier of the command.
+    const fn identifier(self) -> &'static str {
+        match self {
+            SupportedCommand::Debug => "ty.printDebugInformation",
+        }
+    }
+
+    /// Returns all the commands that the server currently supports.
+    const fn all() -> [SupportedCommand; 1] {
+        [SupportedCommand::Debug]
+    }
+}
+
+impl FromStr for SupportedCommand {
+    type Err = anyhow::Error;
+
+    fn from_str(name: &str) -> anyhow::Result<Self, Self::Err> {
+        Ok(match name {
+            "ty.printDebugInformation" => Self::Debug,
+            _ => return Err(anyhow::anyhow!("Invalid command `{name}`")),
+        })
+    }
+}
+
 impl ResolvedClientCapabilities {
     /// Returns `true` if the client supports workspace diagnostic refresh.
     pub(crate) const fn supports_workspace_diagnostic_refresh(self) -> bool {
@@ -319,6 +351,15 @@ pub(crate) fn server_capabilities(
 
     ServerCapabilities {
         position_encoding: Some(position_encoding.into()),
+        execute_command_provider: Some(types::ExecuteCommandOptions {
+            commands: SupportedCommand::all()
+                .map(|command| command.identifier().to_string())
+                .to_vec(),
+            work_done_progress_options: WorkDoneProgressOptions {
+                work_done_progress: Some(false),
+            },
+        }),
+
         diagnostic_provider,
         text_document_sync: Some(TextDocumentSyncCapability::Options(
             TextDocumentSyncOptions {
diff --git a/crates/ty_server/src/server/api.rs b/crates/ty_server/src/server/api.rs
index af963853df..6fd1cde43a 100644
--- a/crates/ty_server/src/server/api.rs
+++ b/crates/ty_server/src/server/api.rs
@@ -32,6 +32,7 @@ pub(super) fn request(req: server::Request) -> Task {
     let id = req.id.clone();
 
     match req.method.as_str() {
+        requests::ExecuteCommand::METHOD => sync_request_task::<requests::ExecuteCommand>(req),
         requests::DocumentDiagnosticRequestHandler::METHOD => background_document_request_task::<
             requests::DocumentDiagnosticRequestHandler,
         >(
diff --git a/crates/ty_server/src/server/api/diagnostics.rs b/crates/ty_server/src/server/api/diagnostics.rs
index 3d5c16ca01..d43b176a9b 100644
--- a/crates/ty_server/src/server/api/diagnostics.rs
+++ b/crates/ty_server/src/server/api/diagnostics.rs
@@ -120,7 +120,11 @@ impl LspDiagnostics {
 /// This is done by notifying the client with an empty list of diagnostics for the document.
 /// For notebook cells, this clears diagnostics for the specific cell.
 /// For other document types, this clears diagnostics for the main document.
-pub(super) fn clear_diagnostics(key: &DocumentKey, client: &Client) {
+pub(super) fn clear_diagnostics(session: &Session, key: &DocumentKey, client: &Client) {
+    if session.client_capabilities().supports_pull_diagnostics() {
+        return;
+    }
+
     let Some(uri) = key.to_url() else {
         // If we can't convert to URL, we can't clear diagnostics
         return;
diff --git a/crates/ty_server/src/server/api/notifications/did_close.rs b/crates/ty_server/src/server/api/notifications/did_close.rs
index 7425b8504e..60097df67b 100644
--- a/crates/ty_server/src/server/api/notifications/did_close.rs
+++ b/crates/ty_server/src/server/api/notifications/did_close.rs
@@ -65,7 +65,7 @@ impl SyncNotificationHandler for DidCloseTextDocumentHandler {
                         .diagnostic_mode()
                         .is_open_files_only()
                 {
-                    clear_diagnostics(&key, client);
+                    clear_diagnostics(session, &key, client);
                 }
             }
             AnySystemPath::SystemVirtual(virtual_path) => {
@@ -78,7 +78,7 @@ impl SyncNotificationHandler for DidCloseTextDocumentHandler {
 
                 // Always clear diagnostics for virtual files, as they don't really exist on disk
                 // which means closing them is like deleting the file.
-                clear_diagnostics(&key, client);
+                clear_diagnostics(session, &key, client);
             }
         }
 
diff --git a/crates/ty_server/src/server/api/requests.rs b/crates/ty_server/src/server/api/requests.rs
index 0be690a38e..3d76a55c00 100644
--- a/crates/ty_server/src/server/api/requests.rs
+++ b/crates/ty_server/src/server/api/requests.rs
@@ -2,6 +2,7 @@ mod completion;
 mod diagnostic;
 mod doc_highlights;
 mod document_symbols;
+mod execute_command;
 mod goto_declaration;
 mod goto_definition;
 mod goto_references;
@@ -22,6 +23,7 @@ pub(super) use completion::CompletionRequestHandler;
 pub(super) use diagnostic::DocumentDiagnosticRequestHandler;
 pub(super) use doc_highlights::DocumentHighlightRequestHandler;
 pub(super) use document_symbols::DocumentSymbolRequestHandler;
+pub(super) use execute_command::ExecuteCommand;
 pub(super) use goto_declaration::GotoDeclarationRequestHandler;
 pub(super) use goto_definition::GotoDefinitionRequestHandler;
 pub(super) use goto_references::ReferencesRequestHandler;
diff --git a/crates/ty_server/src/server/api/requests/completion.rs b/crates/ty_server/src/server/api/requests/completion.rs
index ee59532f9c..35e1c3fd25 100644
--- a/crates/ty_server/src/server/api/requests/completion.rs
+++ b/crates/ty_server/src/server/api/requests/completion.rs
@@ -3,14 +3,16 @@ use std::time::Instant;
 
 use lsp_types::request::Completion;
 use lsp_types::{
-    CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, Documentation, Url,
+    CompletionItem, CompletionItemKind, CompletionItemLabelDetails, CompletionList,
+    CompletionParams, CompletionResponse, Documentation, TextEdit, Url,
 };
 use ruff_db::source::{line_index, source_text};
-use ty_ide::completion;
+use ruff_source_file::OneIndexed;
+use ruff_text_size::Ranged;
+use ty_ide::{CompletionKind, CompletionSettings, completion};
 use ty_project::ProjectDatabase;
-use ty_python_semantic::CompletionKind;
 
-use crate::document::PositionExt;
+use crate::document::{PositionExt, ToRangeExt};
 use crate::server::api::traits::{
     BackgroundDocumentRequestHandler, RequestHandler, RetriableRequestHandler,
 };
@@ -54,21 +56,42 @@ impl BackgroundDocumentRequestHandler for CompletionRequestHandler {
             &line_index,
             snapshot.encoding(),
         );
-        let completions = completion(db, file, offset);
+        let settings = CompletionSettings {
+            auto_import: snapshot.global_settings().is_auto_import_enabled(),
+        };
+        let completions = completion(db, &settings, file, offset);
         if completions.is_empty() {
             return Ok(None);
         }
 
-        let max_index_len = completions.len().saturating_sub(1).to_string().len();
+        // Safety: we just checked that completions is not empty.
+        let max_index_len = OneIndexed::new(completions.len()).unwrap().digits().get();
         let items: Vec<CompletionItem> = completions
             .into_iter()
             .enumerate()
             .map(|(i, comp)| {
                 let kind = comp.kind(db).map(ty_kind_to_lsp_kind);
+                let type_display = comp.ty.map(|ty| ty.display(db).to_string());
+                let import_edit = comp.import.as_ref().map(|edit| {
+                    let range =
+                        edit.range()
+                            .to_lsp_range(&source, &line_index, snapshot.encoding());
+                    TextEdit {
+                        range,
+                        new_text: edit.content().map(ToString::to_string).unwrap_or_default(),
+                    }
+                });
                 CompletionItem {
-                    label: comp.inner.name.into(),
+                    label: comp.name.into(),
                     kind,
                     sort_text: Some(format!("{i:-max_index_len$}")),
+                    detail: type_display.clone(),
+                    label_details: Some(CompletionItemLabelDetails {
+                        detail: comp.module_name.map(|name| format!(" (import {name})")),
+                        description: type_display,
+                    }),
+                    insert_text: comp.insert.map(String::from),
+                    additional_text_edits: import_edit.map(|edit| vec![edit]),
                     documentation: comp
                         .documentation
                         .map(|docstring| Documentation::String(docstring.render_plaintext())),
@@ -77,7 +100,10 @@ impl BackgroundDocumentRequestHandler for CompletionRequestHandler {
             })
             .collect();
         let len = items.len();
-        let response = CompletionResponse::Array(items);
+        let response = CompletionResponse::List(CompletionList {
+            is_incomplete: true,
+            items,
+        });
         tracing::debug!(
             "Completions request returned {len} suggestions in {elapsed:?}",
             elapsed = Instant::now().duration_since(start)
diff --git a/crates/ty_server/src/server/api/requests/document_symbols.rs b/crates/ty_server/src/server/api/requests/document_symbols.rs
index eb19c5826c..46c4c3eb2e 100644
--- a/crates/ty_server/src/server/api/requests/document_symbols.rs
+++ b/crates/ty_server/src/server/api/requests/document_symbols.rs
@@ -4,7 +4,7 @@ use lsp_types::request::DocumentSymbolRequest;
 use lsp_types::{DocumentSymbol, DocumentSymbolParams, SymbolInformation, Url};
 use ruff_db::source::{line_index, source_text};
 use ruff_source_file::LineIndex;
-use ty_ide::{SymbolInfo, SymbolsOptions, document_symbols_with_options};
+use ty_ide::{HierarchicalSymbols, SymbolId, SymbolInfo, document_symbols};
 use ty_project::ProjectDatabase;
 
 use crate::document::{PositionEncoding, ToRangeExt};
@@ -51,24 +51,19 @@ impl BackgroundDocumentRequestHandler for DocumentSymbolRequestHandler {
             .resolved_client_capabilities()
             .supports_hierarchical_document_symbols();
 
-        let options = SymbolsOptions {
-            hierarchical: supports_hierarchical,
-            global_only: false,
-            query_string: None,
-        };
-
-        let symbols = document_symbols_with_options(db, file, &options);
-
+        let symbols = document_symbols(db, file);
         if symbols.is_empty() {
             return Ok(None);
         }
 
         if supports_hierarchical {
-            // Return hierarchical symbols
+            let symbols = symbols.to_hierarchical();
             let lsp_symbols: Vec<DocumentSymbol> = symbols
-                .into_iter()
-                .map(|symbol| {
+                .iter()
+                .map(|(id, symbol)| {
                     convert_to_lsp_document_symbol(
+                        &symbols,
+                        id,
                         symbol,
                         &source,
                         &line_index,
@@ -81,8 +76,8 @@ impl BackgroundDocumentRequestHandler for DocumentSymbolRequestHandler {
         } else {
             // Return flattened symbols as SymbolInformation
             let lsp_symbols: Vec<SymbolInformation> = symbols
-                .into_iter()
-                .map(|symbol| {
+                .iter()
+                .map(|(_, symbol)| {
                     convert_to_lsp_symbol_information(
                         symbol,
                         &params.text_document.uri,
@@ -101,7 +96,9 @@ impl BackgroundDocumentRequestHandler for DocumentSymbolRequestHandler {
 impl RetriableRequestHandler for DocumentSymbolRequestHandler {}
 
 fn convert_to_lsp_document_symbol(
-    symbol: SymbolInfo,
+    symbols: &HierarchicalSymbols,
+    id: SymbolId,
+    symbol: SymbolInfo<'_>,
     source: &str,
     line_index: &LineIndex,
     encoding: PositionEncoding,
@@ -109,7 +106,7 @@ fn convert_to_lsp_document_symbol(
     let symbol_kind = convert_symbol_kind(symbol.kind);
 
     DocumentSymbol {
-        name: symbol.name,
+        name: symbol.name.into_owned(),
         detail: None,
         kind: symbol_kind,
         tags: None,
@@ -118,10 +115,13 @@ fn convert_to_lsp_document_symbol(
         range: symbol.full_range.to_lsp_range(source, line_index, encoding),
         selection_range: symbol.name_range.to_lsp_range(source, line_index, encoding),
         children: Some(
-            symbol
-                .children
-                .into_iter()
-                .map(|child| convert_to_lsp_document_symbol(child, source, line_index, encoding))
+            symbols
+                .children(id)
+                .map(|(child_id, child)| {
+                    convert_to_lsp_document_symbol(
+                        symbols, child_id, child, source, line_index, encoding,
+                    )
+                })
                 .collect(),
         ),
     }
diff --git a/crates/ty_server/src/server/api/requests/execute_command.rs b/crates/ty_server/src/server/api/requests/execute_command.rs
new file mode 100644
index 0000000000..8a2fc52fd1
--- /dev/null
+++ b/crates/ty_server/src/server/api/requests/execute_command.rs
@@ -0,0 +1,76 @@
+use crate::capabilities::SupportedCommand;
+use crate::server;
+use crate::server::api::LSPResult;
+use crate::server::api::RequestHandler;
+use crate::server::api::traits::SyncRequestHandler;
+use crate::session::Session;
+use crate::session::client::Client;
+use lsp_server::ErrorCode;
+use lsp_types::{self as types, request as req};
+use std::fmt::Write;
+use std::str::FromStr;
+use ty_project::Db;
+
+pub(crate) struct ExecuteCommand;
+
+impl RequestHandler for ExecuteCommand {
+    type RequestType = req::ExecuteCommand;
+}
+
+impl SyncRequestHandler for ExecuteCommand {
+    fn run(
+        session: &mut Session,
+        _client: &Client,
+        params: types::ExecuteCommandParams,
+    ) -> server::Result<Option<serde_json::Value>> {
+        let command = SupportedCommand::from_str(&params.command)
+            .with_failure_code(ErrorCode::InvalidParams)?;
+
+        match command {
+            SupportedCommand::Debug => Ok(Some(serde_json::Value::String(
+                debug_information(session).with_failure_code(ErrorCode::InternalError)?,
+            ))),
+        }
+    }
+}
+
+/// Returns a string with detailed memory usage.
+fn debug_information(session: &Session) -> crate::Result<String> {
+    let mut buffer = String::new();
+
+    writeln!(
+        buffer,
+        "Client capabilities: {:#?}",
+        session.client_capabilities()
+    )?;
+    writeln!(
+        buffer,
+        "Position encoding: {:#?}",
+        session.position_encoding()
+    )?;
+    writeln!(buffer, "Global settings: {:#?}", session.global_settings())?;
+    writeln!(
+        buffer,
+        "Open text documents: {}",
+        session.text_document_keys().count()
+    )?;
+    writeln!(buffer)?;
+
+    for (root, workspace) in session.workspaces() {
+        writeln!(buffer, "Workspace {root} ({})", workspace.url())?;
+        writeln!(buffer, "Settings: {:#?}", workspace.settings())?;
+        writeln!(buffer)?;
+    }
+
+    for db in session.project_dbs() {
+        writeln!(buffer, "Project at {}", db.project().root(db))?;
+        writeln!(buffer, "Settings: {:#?}", db.project().settings(db))?;
+        writeln!(buffer)?;
+        writeln!(
+            buffer,
+            "Memory report:\n{}",
+            db.salsa_memory_dump().display_full()
+        )?;
+    }
+    Ok(buffer)
+}
diff --git a/crates/ty_server/src/server/api/requests/inlay_hints.rs b/crates/ty_server/src/server/api/requests/inlay_hints.rs
index 3c5e44d264..ec8464fc6b 100644
--- a/crates/ty_server/src/server/api/requests/inlay_hints.rs
+++ b/crates/ty_server/src/server/api/requests/inlay_hints.rs
@@ -9,7 +9,7 @@ use crate::session::client::Client;
 use lsp_types::request::InlayHintRequest;
 use lsp_types::{InlayHintParams, Url};
 use ruff_db::source::{line_index, source_text};
-use ty_ide::inlay_hints;
+use ty_ide::{InlayHintKind, InlayHintLabel, inlay_hints};
 use ty_project::ProjectDatabase;
 
 pub(crate) struct InlayHintRequestHandler;
@@ -55,8 +55,8 @@ impl BackgroundDocumentRequestHandler for InlayHintRequestHandler {
                 position: hint
                     .position
                     .to_position(&source, &index, snapshot.encoding()),
-                label: lsp_types::InlayHintLabel::String(hint.display(db).to_string()),
-                kind: Some(lsp_types::InlayHintKind::TYPE),
+                label: inlay_hint_label(&hint.label),
+                kind: Some(inlay_hint_kind(&hint.kind)),
                 tooltip: None,
                 padding_left: None,
                 padding_right: None,
@@ -70,3 +70,23 @@ impl BackgroundDocumentRequestHandler for InlayHintRequestHandler {
 }
 
 impl RetriableRequestHandler for InlayHintRequestHandler {}
+
+fn inlay_hint_kind(inlay_hint_kind: &InlayHintKind) -> lsp_types::InlayHintKind {
+    match inlay_hint_kind {
+        InlayHintKind::Type => lsp_types::InlayHintKind::TYPE,
+        InlayHintKind::CallArgumentName => lsp_types::InlayHintKind::PARAMETER,
+    }
+}
+
+fn inlay_hint_label(inlay_hint_label: &InlayHintLabel) -> lsp_types::InlayHintLabel {
+    let mut label_parts = Vec::new();
+    for part in inlay_hint_label.parts() {
+        label_parts.push(lsp_types::InlayHintLabelPart {
+            value: part.text().into(),
+            location: None,
+            tooltip: None,
+            command: None,
+        });
+    }
+    lsp_types::InlayHintLabel::LabelParts(label_parts)
+}
diff --git a/crates/ty_server/src/server/api/requests/shutdown.rs b/crates/ty_server/src/server/api/requests/shutdown.rs
index 221ff82e09..77c9e78f98 100644
--- a/crates/ty_server/src/server/api/requests/shutdown.rs
+++ b/crates/ty_server/src/server/api/requests/shutdown.rs
@@ -3,6 +3,7 @@ use crate::server::api::traits::{RequestHandler, SyncRequestHandler};
 use crate::session::client::Client;
 
 use lsp_types::{WorkspaceDiagnosticReport, WorkspaceDiagnosticReportResult};
+use salsa::Database;
 
 pub(crate) struct ShutdownHandler;
 
@@ -28,6 +29,12 @@ impl SyncRequestHandler for ShutdownHandler {
 
         session.set_shutdown_requested(true);
 
+        // Trigger cancellation for every db to cancel any compute intensive background tasks
+        // (e.g. workspace diagnostics or workspace symbols).
+        for db in session.projects_mut() {
+            db.trigger_cancellation();
+        }
+
         Ok(())
     }
 }
diff --git a/crates/ty_server/src/server/api/requests/workspace_diagnostic.rs b/crates/ty_server/src/server/api/requests/workspace_diagnostic.rs
index 0b2ef62126..8618771bfd 100644
--- a/crates/ty_server/src/server/api/requests/workspace_diagnostic.rs
+++ b/crates/ty_server/src/server/api/requests/workspace_diagnostic.rs
@@ -250,7 +250,7 @@ impl ProgressReporter for WorkspaceDiagnosticsProgressReporter<'_> {
     fn report_checked_file(&self, db: &dyn Db, file: File, diagnostics: &[Diagnostic]) {
         let checked = self.checked_files.fetch_add(1, Ordering::Relaxed) + 1;
 
-        if checked % 100 == 0 || checked == self.total_files {
+        if checked.is_multiple_of(100) || checked == self.total_files {
             // Report progress every 100 files or when all files are checked
             self.report_progress();
         }
diff --git a/crates/ty_server/src/server/api/requests/workspace_symbols.rs b/crates/ty_server/src/server/api/requests/workspace_symbols.rs
index e6b170a264..a964954546 100644
--- a/crates/ty_server/src/server/api/requests/workspace_symbols.rs
+++ b/crates/ty_server/src/server/api/requests/workspace_symbols.rs
@@ -29,7 +29,13 @@ impl BackgroundRequestHandler for WorkspaceSymbolRequestHandler {
         // Iterate through all projects in the session
         for db in snapshot.projects() {
             // Get workspace symbols matching the query
+            let start = std::time::Instant::now();
             let workspace_symbol_infos = workspace_symbols(db, query);
+            tracing::debug!(
+                "Found {len} workspace symbols in {elapsed:?}",
+                len = workspace_symbol_infos.len(),
+                elapsed = std::time::Instant::now().duration_since(start)
+            );
 
             // Convert to LSP SymbolInformation
             for workspace_symbol_info in workspace_symbol_infos {
diff --git a/crates/ty_server/src/server/api/symbols.rs b/crates/ty_server/src/server/api/symbols.rs
index 39a701e2fa..396f236e8d 100644
--- a/crates/ty_server/src/server/api/symbols.rs
+++ b/crates/ty_server/src/server/api/symbols.rs
@@ -27,7 +27,7 @@ pub(crate) fn convert_symbol_kind(kind: ty_ide::SymbolKind) -> SymbolKind {
 
 /// Convert a `ty_ide` `SymbolInfo` to LSP `SymbolInformation`
 pub(crate) fn convert_to_lsp_symbol_information(
-    symbol: SymbolInfo,
+    symbol: SymbolInfo<'_>,
     uri: &Url,
     source: &str,
     line_index: &LineIndex,
@@ -36,7 +36,7 @@ pub(crate) fn convert_to_lsp_symbol_information(
     let symbol_kind = convert_symbol_kind(symbol.kind);
 
     SymbolInformation {
-        name: symbol.name,
+        name: symbol.name.into_owned(),
         kind: symbol_kind,
         tags: None,
         #[allow(deprecated)]
diff --git a/crates/ty_server/src/session.rs b/crates/ty_server/src/session.rs
index 7c13121d1c..24ad0ef55e 100644
--- a/crates/ty_server/src/session.rs
+++ b/crates/ty_server/src/session.rs
@@ -427,7 +427,7 @@ impl Session {
     /// Returns a mutable iterator over all project databases that have been initialized to this point.
     ///
     /// This iterator will only yield the default project database if it has been used.
-    fn projects_mut(&mut self) -> impl Iterator<Item = &'_ mut ProjectDatabase> + '_ {
+    pub(crate) fn projects_mut(&mut self) -> impl Iterator<Item = &'_ mut ProjectDatabase> + '_ {
         self.project_states_mut().map(|project| &mut project.db)
     }
 
@@ -790,7 +790,6 @@ impl Session {
         // But while this seemed to work for the project root, it
         // simply wouldn't result in any file notifications for changes
         // to files outside of the project root.
-        #[allow(clippy::if_not_else)] // no! it reads better this way ---AG
         let watchers = if !self.client_capabilities().supports_relative_file_watcher() {
             tracing::warn!(
                 "Your LSP client doesn't support file watching outside of project: \
@@ -826,6 +825,7 @@ impl Session {
             .map_err(DocumentQueryError::InvalidUrl);
         DocumentSnapshot {
             resolved_client_capabilities: self.resolved_client_capabilities,
+            global_settings: self.global_settings.clone(),
             workspace_settings: key
                 .as_ref()
                 .ok()
@@ -1000,6 +1000,7 @@ impl Drop for MutIndexGuard<'_> {
 #[derive(Debug)]
 pub(crate) struct DocumentSnapshot {
     resolved_client_capabilities: ResolvedClientCapabilities,
+    global_settings: Arc<GlobalSettings>,
     workspace_settings: Arc<WorkspaceSettings>,
     position_encoding: PositionEncoding,
     document_query_result: Result<DocumentQuery, DocumentQueryError>,
@@ -1016,6 +1017,11 @@ impl DocumentSnapshot {
         self.position_encoding
     }
 
+    /// Returns the client settings for all workspaces.
+    pub(crate) fn global_settings(&self) -> &GlobalSettings {
+        &self.global_settings
+    }
+
     /// Returns the client settings for the workspace that this document belongs to.
     pub(crate) fn workspace_settings(&self) -> &WorkspaceSettings {
         &self.workspace_settings
diff --git a/crates/ty_server/src/session/index.rs b/crates/ty_server/src/session/index.rs
index 624a075198..89d310f2ab 100644
--- a/crates/ty_server/src/session/index.rs
+++ b/crates/ty_server/src/session/index.rs
@@ -178,7 +178,7 @@ impl Index {
         let path = key.path();
 
         let Some(_) = self.documents.remove(path) else {
-            anyhow::bail!("tried to close document that didn't exist at {}", key)
+            anyhow::bail!("tried to close document that didn't exist at {key}")
         };
         Ok(())
     }
@@ -189,7 +189,7 @@ impl Index {
     ) -> crate::Result<&mut DocumentController> {
         let path = key.path();
         let Some(controller) = self.documents.get_mut(path) else {
-            anyhow::bail!("Document controller not available at `{}`", key);
+            anyhow::bail!("Document controller not available at `{key}`");
         };
         Ok(controller)
     }
diff --git a/crates/ty_server/src/session/options.rs b/crates/ty_server/src/session/options.rs
index bf5f048f9f..c646c767de 100644
--- a/crates/ty_server/src/session/options.rs
+++ b/crates/ty_server/src/session/options.rs
@@ -122,6 +122,12 @@ impl ClientOptions {
         self
     }
 
+    #[must_use]
+    pub fn with_experimental_auto_import(mut self, enabled: bool) -> Self {
+        self.global.experimental.get_or_insert_default().auto_import = Some(enabled);
+        self
+    }
+
     #[must_use]
     pub fn with_unknown(mut self, unknown: HashMap<String, Value>) -> Self {
         self.unknown = unknown;
@@ -148,7 +154,8 @@ impl GlobalOptions {
         let experimental = self
             .experimental
             .map(|experimental| ExperimentalSettings {
-                rename: experimental.rename.unwrap_or(true),
+                rename: experimental.rename.unwrap_or(false),
+                auto_import: experimental.auto_import.unwrap_or(false),
             })
             .unwrap_or_default();
 
@@ -293,6 +300,12 @@ impl Combine for DiagnosticMode {
 pub(crate) struct Experimental {
     /// Whether to enable the experimental symbol rename feature.
     pub(crate) rename: Option<bool>,
+    /// Whether to enable the experimental "auto-import" feature.
+    ///
+    /// At time of writing (2025-08-29), this feature is still
+    /// under active development. It may not work right or may be
+    /// incomplete.
+    pub(crate) auto_import: Option<bool>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, Default)]
diff --git a/crates/ty_server/src/session/settings.rs b/crates/ty_server/src/session/settings.rs
index 9f54c7069d..7b3e95f3ed 100644
--- a/crates/ty_server/src/session/settings.rs
+++ b/crates/ty_server/src/session/settings.rs
@@ -14,6 +14,10 @@ impl GlobalSettings {
     pub(crate) fn is_rename_enabled(&self) -> bool {
         self.experimental.rename
     }
+
+    pub(crate) fn is_auto_import_enabled(&self) -> bool {
+        self.experimental.auto_import
+    }
 }
 
 impl GlobalSettings {
@@ -25,6 +29,7 @@ impl GlobalSettings {
 #[derive(Clone, Default, Debug, PartialEq)]
 pub(crate) struct ExperimentalSettings {
     pub(super) rename: bool,
+    pub(super) auto_import: bool,
 }
 
 /// Resolved client settings for a specific workspace.
diff --git a/crates/ty_server/src/system.rs b/crates/ty_server/src/system.rs
index 7f5ad0cdfc..323e4a6846 100644
--- a/crates/ty_server/src/system.rs
+++ b/crates/ty_server/src/system.rs
@@ -13,6 +13,7 @@ use ruff_db::system::{
     SystemPath, SystemPathBuf, SystemVirtualPath, SystemVirtualPathBuf, WritableSystem,
 };
 use ruff_notebook::{Notebook, NotebookError};
+use ty_ide::cached_vendored_path;
 use ty_python_semantic::Db;
 
 use crate::DocumentQuery;
@@ -25,20 +26,7 @@ pub(crate) fn file_to_url(db: &dyn Db, file: File) -> Option<Url> {
         FilePath::System(system) => Url::from_file_path(system.as_std_path()).ok(),
         FilePath::SystemVirtual(path) => Url::parse(path.as_str()).ok(),
         FilePath::Vendored(path) => {
-            let writable = db.system().as_writable()?;
-
-            let system_path = SystemPathBuf::from(format!(
-                "vendored/typeshed/{}/{}",
-                // The vendored files are uniquely identified by the source commit.
-                ty_vendored::SOURCE_COMMIT,
-                path.as_str()
-            ));
-
-            // Extract the vendored file onto the system.
-            let system_path = writable
-                .get_or_cache(&system_path, &|| db.vendored().read_to_string(path))
-                .ok()
-                .flatten()?;
+            let system_path = cached_vendored_path(db, path)?;
 
             Url::from_file_path(system_path.as_std_path()).ok()
         }
@@ -298,6 +286,10 @@ impl System for LSPSystem {
     fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
         self.native_system.env_var(name)
     }
+
+    fn dyn_clone(&self) -> Box<dyn System> {
+        Box::new(self.clone())
+    }
 }
 
 fn not_a_text_document(path: impl Display) -> std::io::Error {
diff --git a/crates/ty_server/tests/e2e/commands.rs b/crates/ty_server/tests/e2e/commands.rs
new file mode 100644
index 0000000000..4b4686fe86
--- /dev/null
+++ b/crates/ty_server/tests/e2e/commands.rs
@@ -0,0 +1,55 @@
+use anyhow::Result;
+use lsp_types::{ExecuteCommandParams, WorkDoneProgressParams, request::ExecuteCommand};
+use ruff_db::system::SystemPath;
+
+use crate::{TestServer, TestServerBuilder};
+
+// Sends an executeCommand request to the TestServer
+fn execute_command(
+    server: &mut TestServer,
+    command: String,
+    arguments: Vec<serde_json::Value>,
+) -> anyhow::Result<Option<serde_json::Value>> {
+    let params = ExecuteCommandParams {
+        command,
+        arguments,
+        work_done_progress_params: WorkDoneProgressParams::default(),
+    };
+    let id = server.send_request::<ExecuteCommand>(params);
+    server.await_response::<ExecuteCommand>(&id)
+}
+
+#[test]
+fn debug_command() -> Result<()> {
+    let workspace_root = SystemPath::new("src");
+    let foo = SystemPath::new("src/foo.py");
+    let foo_content = "\
+def foo() -> str:
+return 42
+";
+
+    let mut server = TestServerBuilder::new()?
+        .with_workspace(workspace_root, None)?
+        .with_file(foo, foo_content)?
+        .enable_pull_diagnostics(false)
+        .build()?
+        .wait_until_workspaces_are_initialized()?;
+
+    let response = execute_command(&mut server, "ty.printDebugInformation".to_string(), vec![])?;
+    let response = response.expect("expect server response");
+
+    let response = response
+        .as_str()
+        .expect("debug command to return a string response");
+
+    insta::with_settings!({
+        filters =>vec![
+            (r"\b[0-9]+.[0-9]+MB\b","[X.XXMB]"),
+            (r"Workspace .+\)","Workspace XXX"),
+            (r"Project at .+","Project at XXX"),
+    ]}, {
+        insta::assert_snapshot!(response);
+    });
+
+    Ok(())
+}
diff --git a/crates/ty_server/tests/e2e/inlay_hints.rs b/crates/ty_server/tests/e2e/inlay_hints.rs
index 9516bc9d96..3dbbbee994 100644
--- a/crates/ty_server/tests/e2e/inlay_hints.rs
+++ b/crates/ty_server/tests/e2e/inlay_hints.rs
@@ -42,7 +42,14 @@ foo(1)
           "line": 0,
           "character": 1
         },
-        "label": ": Literal[1]",
+        "label": [
+          {
+            "value": ": "
+          },
+          {
+            "value": "Literal[1]"
+          }
+        ],
         "kind": 1
       },
       {
@@ -50,8 +57,15 @@ foo(1)
           "line": 5,
           "character": 4
         },
-        "label": "a=",
-        "kind": 1
+        "label": [
+          {
+            "value": "a"
+          },
+          {
+            "value": "="
+          }
+        ],
+        "kind": 2
       }
     ]
     "#);
diff --git a/crates/ty_server/tests/e2e/main.rs b/crates/ty_server/tests/e2e/main.rs
index 5963755f72..14054f4b48 100644
--- a/crates/ty_server/tests/e2e/main.rs
+++ b/crates/ty_server/tests/e2e/main.rs
@@ -27,6 +27,7 @@
 //! [`await_request`]: TestServer::await_request
 //! [`await_notification`]: TestServer::await_notification
 
+mod commands;
 mod initialize;
 mod inlay_hints;
 mod publish_diagnostics;
diff --git a/crates/ty_server/tests/e2e/snapshots/e2e__commands__debug_command.snap b/crates/ty_server/tests/e2e/snapshots/e2e__commands__debug_command.snap
new file mode 100644
index 0000000000..ba3b75028c
--- /dev/null
+++ b/crates/ty_server/tests/e2e/snapshots/e2e__commands__debug_command.snap
@@ -0,0 +1,240 @@
+---
+source: crates/ty_server/tests/e2e/commands.rs
+expression: response
+---
+Client capabilities: ResolvedClientCapabilities(
+    WORKSPACE_CONFIGURATION,
+)
+Position encoding: UTF16
+Global settings: GlobalSettings {
+    diagnostic_mode: OpenFilesOnly,
+    experimental: ExperimentalSettings {
+        rename: false,
+        auto_import: false,
+    },
+}
+Open text documents: 0
+
+Workspace XXX
+Settings: WorkspaceSettings {
+    disable_language_services: false,
+    inlay_hints: InlayHintSettings {
+        variable_types: true,
+        call_argument_names: true,
+    },
+    overrides: None,
+}
+
+Project at XXX
+Settings: Settings {
+    rules: {
+        "ambiguous-protocol-member": Warning (Default),
+        "byte-string-type-annotation": Error (Default),
+        "call-non-callable": Error (Default),
+        "conflicting-argument-forms": Error (Default),
+        "conflicting-declarations": Error (Default),
+        "conflicting-metaclass": Error (Default),
+        "cyclic-class-definition": Error (Default),
+        "deprecated": Warning (Default),
+        "duplicate-base": Error (Default),
+        "duplicate-kw-only": Error (Default),
+        "escape-character-in-forward-annotation": Error (Default),
+        "fstring-type-annotation": Error (Default),
+        "ignore-comment-unknown-rule": Warning (Default),
+        "implicit-concatenated-string-type-annotation": Error (Default),
+        "inconsistent-mro": Error (Default),
+        "index-out-of-bounds": Error (Default),
+        "instance-layout-conflict": Error (Default),
+        "invalid-argument-type": Error (Default),
+        "invalid-assignment": Error (Default),
+        "invalid-attribute-access": Error (Default),
+        "invalid-await": Error (Default),
+        "invalid-base": Error (Default),
+        "invalid-context-manager": Error (Default),
+        "invalid-declaration": Error (Default),
+        "invalid-exception-caught": Error (Default),
+        "invalid-generic-class": Error (Default),
+        "invalid-ignore-comment": Warning (Default),
+        "invalid-key": Error (Default),
+        "invalid-legacy-type-variable": Error (Default),
+        "invalid-metaclass": Error (Default),
+        "invalid-named-tuple": Error (Default),
+        "invalid-overload": Error (Default),
+        "invalid-parameter-default": Error (Default),
+        "invalid-protocol": Error (Default),
+        "invalid-raise": Error (Default),
+        "invalid-return-type": Error (Default),
+        "invalid-super-argument": Error (Default),
+        "invalid-syntax-in-forward-annotation": Error (Default),
+        "invalid-type-alias-type": Error (Default),
+        "invalid-type-checking-constant": Error (Default),
+        "invalid-type-form": Error (Default),
+        "invalid-type-guard-call": Error (Default),
+        "invalid-type-guard-definition": Error (Default),
+        "invalid-type-variable-constraints": Error (Default),
+        "missing-argument": Error (Default),
+        "missing-typed-dict-key": Error (Default),
+        "no-matching-overload": Error (Default),
+        "non-subscriptable": Error (Default),
+        "not-iterable": Error (Default),
+        "parameter-already-assigned": Error (Default),
+        "positional-only-parameter-as-kwarg": Error (Default),
+        "possibly-missing-attribute": Warning (Default),
+        "possibly-missing-implicit-call": Warning (Default),
+        "possibly-missing-import": Warning (Default),
+        "raw-string-type-annotation": Error (Default),
+        "redundant-cast": Warning (Default),
+        "static-assert-error": Error (Default),
+        "subclass-of-final-class": Error (Default),
+        "too-many-positional-arguments": Error (Default),
+        "type-assertion-failure": Error (Default),
+        "unavailable-implicit-super-arguments": Error (Default),
+        "undefined-reveal": Warning (Default),
+        "unknown-argument": Error (Default),
+        "unresolved-attribute": Error (Default),
+        "unresolved-global": Warning (Default),
+        "unresolved-import": Error (Default),
+        "unresolved-reference": Error (Default),
+        "unsupported-base": Warning (Default),
+        "unsupported-bool-conversion": Error (Default),
+        "unsupported-operator": Error (Default),
+        "useless-overload-body": Warning (Default),
+        "zero-stepsize-in-slice": Error (Default),
+    },
+    terminal: TerminalSettings {
+        output_format: Full,
+        error_on_warning: false,
+    },
+    src: SrcSettings {
+        respect_ignore_files: true,
+        files: IncludeExcludeFilter {
+            include: IncludeFilter(
+                [
+                    "**",
+                ],
+                ..
+            ),
+            exclude: ExcludeFilter {
+                ignore: Gitignore(
+                    [
+                        IgnoreGlob {
+                            original: "**/.bzr/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.direnv/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.eggs/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.git/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.git-rewrite/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.hg/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.mypy_cache/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.nox/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.pants.d/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.pytype/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.ruff_cache/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.svn/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.tox/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/.venv/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/__pypackages__/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/_build/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/buck-out/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/dist/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/node_modules/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                        IgnoreGlob {
+                            original: "**/venv/",
+                            is_allow: false,
+                            is_only_dir: true,
+                        },
+                    ],
+                    ..
+                ),
+            },
+        },
+    },
+    overrides: [],
+}
+
+Memory report:
+=======SALSA STRUCTS=======
+`Program`                                          metadata=[X.XXMB]   fields=[X.XXMB]   count=1
+`Project`                                          metadata=[X.XXMB]   fields=[X.XXMB]   count=1
+`FileRoot`                                         metadata=[X.XXMB]   fields=[X.XXMB]   count=1
+=======SALSA QUERIES=======
+=======SALSA SUMMARY=======
+TOTAL MEMORY USAGE: [X.XXMB]
+    struct metadata = [X.XXMB]
+    struct fields = [X.XXMB]
+    memo metadata = [X.XXMB]
+    memo fields = [X.XXMB]
diff --git a/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization.snap b/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization.snap
index 0c00d640c8..075d9dd805 100644
--- a/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization.snap
+++ b/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ty_server/tests/e2e/initialize.rs
+assertion_line: 17
 expression: initialization_result
 ---
 {
@@ -32,6 +33,12 @@ expression: initialization_result
     "documentSymbolProvider": true,
     "workspaceSymbolProvider": true,
     "declarationProvider": true,
+    "executeCommandProvider": {
+      "commands": [
+        "ty.printDebugInformation"
+      ],
+      "workDoneProgress": false
+    },
     "semanticTokensProvider": {
       "legend": {
         "tokenTypes": [
diff --git a/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization_with_workspace.snap b/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization_with_workspace.snap
index 0c00d640c8..3ea91f66be 100644
--- a/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization_with_workspace.snap
+++ b/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization_with_workspace.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ty_server/tests/e2e/initialize.rs
+assertion_line: 32
 expression: initialization_result
 ---
 {
@@ -32,6 +33,12 @@ expression: initialization_result
     "documentSymbolProvider": true,
     "workspaceSymbolProvider": true,
     "declarationProvider": true,
+    "executeCommandProvider": {
+      "commands": [
+        "ty.printDebugInformation"
+      ],
+      "workDoneProgress": false
+    },
     "semanticTokensProvider": {
       "legend": {
         "tokenTypes": [
diff --git a/crates/ty_static/src/env_vars.rs b/crates/ty_static/src/env_vars.rs
index ebad90e8e5..b15edffd7e 100644
--- a/crates/ty_static/src/env_vars.rs
+++ b/crates/ty_static/src/env_vars.rs
@@ -42,13 +42,22 @@ impl EnvVars {
     /// Used to detect an activated virtual environment.
     pub const VIRTUAL_ENV: &'static str = "VIRTUAL_ENV";
 
-    /// Used to determine if an active Conda environment is the base environment or not.
+    /// Adds additional directories to ty's search paths.
+    /// The format is the same as the shell’s PATH:
+    /// one or more directory pathnames separated by os appropriate pathsep
+    /// (e.g. colons on Unix or semicolons on Windows).
+    pub const PYTHONPATH: &'static str = "PYTHONPATH";
+
+    /// Used to determine the name of the active Conda environment.
     pub const CONDA_DEFAULT_ENV: &'static str = "CONDA_DEFAULT_ENV";
 
-    /// Used to detect an activated Conda environment location.
+    /// Used to detect the path of an active Conda environment.
     /// If both `VIRTUAL_ENV` and `CONDA_PREFIX` are present, `VIRTUAL_ENV` will be preferred.
     pub const CONDA_PREFIX: &'static str = "CONDA_PREFIX";
 
+    /// Used to determine the root install path of Conda.
+    pub const CONDA_ROOT: &'static str = "_CONDA_ROOT";
+
     /// Filter which tests to run in mdtest.
     ///
     /// Only tests whose names contain this filter string will be executed.
diff --git a/crates/ty_static/src/lib.rs b/crates/ty_static/src/lib.rs
index 153591db70..65a46b6247 100644
--- a/crates/ty_static/src/lib.rs
+++ b/crates/ty_static/src/lib.rs
@@ -1,3 +1,7 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods in ty crates"
+)]
 pub use env_vars::*;
 
 mod env_vars;
diff --git a/crates/ty_test/Cargo.toml b/crates/ty_test/Cargo.toml
index 97bd4bea2c..670c46cc91 100644
--- a/crates/ty_test/Cargo.toml
+++ b/crates/ty_test/Cargo.toml
@@ -28,6 +28,7 @@ camino = { workspace = true }
 colored = { workspace = true }
 insta = { workspace = true, features = ["filters"] }
 memchr = { workspace = true }
+path-slash ={ workspace = true }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 rustc-stable-hash = { workspace = true }
diff --git a/crates/ty_test/src/config.rs b/crates/ty_test/src/config.rs
index bc32678449..6fe3a17fd0 100644
--- a/crates/ty_test/src/config.rs
+++ b/crates/ty_test/src/config.rs
@@ -63,7 +63,7 @@ pub(crate) struct Environment {
     ///
     /// By default, the Python version is inferred as the lower bound of the project's
     /// `requires-python` field from the `pyproject.toml`, if available. Otherwise, the latest
-    /// stable version supported by ty is used, which is currently 3.13.
+    /// stable version supported by ty is used (see `ty check --help` output).
     ///
     /// ty will not infer the Python version from the Python environment at this time.
     pub(crate) python_version: Option<PythonVersion>,
diff --git a/crates/ty_test/src/db.rs b/crates/ty_test/src/db.rs
index 1a47745e1d..cb05fa0bd8 100644
--- a/crates/ty_test/src/db.rs
+++ b/crates/ty_test/src/db.rs
@@ -88,6 +88,10 @@ impl SemanticDb for Db {
     fn lint_registry(&self) -> &LintRegistry {
         default_lint_registry()
     }
+
+    fn verbose(&self) -> bool {
+        false
+    }
 }
 
 #[salsa::db]
@@ -268,6 +272,10 @@ impl System for MdtestSystem {
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
         self
     }
+
+    fn dyn_clone(&self) -> Box<dyn System> {
+        Box::new(self.clone())
+    }
 }
 
 impl WritableSystem for MdtestSystem {
diff --git a/crates/ty_test/src/lib.rs b/crates/ty_test/src/lib.rs
index e5938eddc1..f66eaaf26a 100644
--- a/crates/ty_test/src/lib.rs
+++ b/crates/ty_test/src/lib.rs
@@ -6,7 +6,7 @@ use colored::Colorize;
 use config::SystemKind;
 use parser as test_parser;
 use ruff_db::Db as _;
-use ruff_db::diagnostic::{Diagnostic, DisplayDiagnosticConfig};
+use ruff_db::diagnostic::{Diagnostic, DiagnosticId, DisplayDiagnosticConfig};
 use ruff_db::files::{File, FileRootKind, system_path_to_file};
 use ruff_db::panic::catch_unwind;
 use ruff_db::parsed::parsed_module;
@@ -16,7 +16,7 @@ use ruff_source_file::{LineIndex, OneIndexed};
 use std::backtrace::BacktraceStatus;
 use std::fmt::Write;
 use ty_python_semantic::pull_types::pull_types;
-use ty_python_semantic::types::check_types;
+use ty_python_semantic::types::{UNDEFINED_REVEAL, check_types};
 use ty_python_semantic::{
     Module, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
     PythonVersionWithSource, SearchPath, SearchPathSettings, SysPrefixPathOrigin, list_modules,
@@ -78,7 +78,7 @@ pub fn run(
             println!("\n{}\n", test.name().bold().underline());
         }
 
-        if let Err(failures) = run_test(&mut db, relative_fixture_path, snapshot_path, &test) {
+        if let Err(failures) = failures {
             let md_index = LineIndex::from_source_text(&source);
 
             for test_failures in failures {
@@ -105,7 +105,7 @@ pub fn run(
                 }
             }
         }
-        if let Err(inconsistencies) = run_module_resolution_consistency_test(&db) {
+        if let Err(inconsistencies) = inconsistencies {
             any_failures = true;
             for inconsistency in inconsistencies {
                 match output_format {
@@ -241,7 +241,9 @@ fn run_test(
 
             db.write_file(&full_path, &embedded.code).unwrap();
 
-            if !(full_path.starts_with(&src_path) && matches!(embedded.lang, "py" | "pyi")) {
+            if !(full_path.starts_with(&src_path)
+                && matches!(embedded.lang, "py" | "python" | "pyi"))
+            {
                 // These files need to be written to the file system (above), but we don't run any checks on them.
                 return None;
             }
@@ -321,26 +323,6 @@ fn run_test(
     let mut failures: Failures = test_files
         .iter()
         .filter_map(|test_file| {
-            let pull_types_result = attempt_test(
-                db,
-                pull_types,
-                test_file,
-                "\"pull types\"",
-                Some(
-                    "Note: either fix the panic or add the `<!-- pull-types:skip -->` \
-                    directive to this test",
-                ),
-            );
-            match pull_types_result {
-                Ok(()) => {}
-                Err(failures) => {
-                    any_pull_types_failures = true;
-                    if !test.should_skip_pulling_types() {
-                        return Some(failures);
-                    }
-                }
-            }
-
             let parsed = parsed_module(db, test_file.file).load(db);
 
             let mut diagnostics: Vec<Diagnostic> = parsed
@@ -375,8 +357,34 @@ fn run_test(
                     by_line: line_failures,
                 }),
             };
+
+            // Filter out `revealed-type` and `undefined-reveal` diagnostics from snapshots,
+            // since they make snapshots very noisy!
             if test.should_snapshot_diagnostics() {
-                snapshot_diagnostics.extend(diagnostics);
+                snapshot_diagnostics.extend(diagnostics.into_iter().filter(|diagnostic| {
+                    diagnostic.id() != DiagnosticId::RevealedType
+                        && !diagnostic.id().is_lint_named(&UNDEFINED_REVEAL.name())
+                }));
+            }
+
+            let pull_types_result = attempt_test(
+                db,
+                pull_types,
+                test_file,
+                "\"pull types\"",
+                Some(
+                    "Note: either fix the panic or add the `<!-- pull-types:skip -->` \
+                    directive to this test",
+                ),
+            );
+            match pull_types_result {
+                Ok(()) => {}
+                Err(failures) => {
+                    any_pull_types_failures = true;
+                    if !test.should_skip_pulling_types() {
+                        return Some(failures);
+                    }
+                }
             }
 
             failure
diff --git a/crates/ty_test/src/matcher.rs b/crates/ty_test/src/matcher.rs
index 3d574242bd..8c1baeff52 100644
--- a/crates/ty_test/src/matcher.rs
+++ b/crates/ty_test/src/matcher.rs
@@ -1,15 +1,21 @@
 //! Match [`Diagnostic`]s against assertions and produce test failure
 //! messages for any mismatches.
-use crate::assertion::{InlineFileAssertions, ParsedAssertion, UnparsedAssertion};
-use crate::db::Db;
-use crate::diagnostic::SortedDiagnostics;
+
+use std::borrow::Cow;
+use std::cmp::Ordering;
+use std::ops::Range;
+use std::sync::LazyLock;
+
 use colored::Colorize;
+use path_slash::PathExt;
 use ruff_db::diagnostic::{Diagnostic, DiagnosticId};
 use ruff_db::files::File;
 use ruff_db::source::{SourceText, line_index, source_text};
 use ruff_source_file::{LineIndex, OneIndexed};
-use std::cmp::Ordering;
-use std::ops::Range;
+
+use crate::assertion::{InlineFileAssertions, ParsedAssertion, UnparsedAssertion};
+use crate::db::Db;
+use crate::diagnostic::SortedDiagnostics;
 
 #[derive(Debug, Default)]
 pub(super) struct FailuresByLine {
@@ -194,12 +200,40 @@ impl UnmatchedWithColumn for &Diagnostic {
 
 /// Discard `@Todo`-type metadata from expected types, which is not available
 /// when running in release mode.
-#[cfg(not(debug_assertions))]
-fn discard_todo_metadata(ty: &str) -> std::borrow::Cow<'_, str> {
-    static TODO_METADATA_REGEX: std::sync::LazyLock<regex::Regex> =
-        std::sync::LazyLock::new(|| regex::Regex::new(r"@Todo\([^)]*\)").unwrap());
+fn discard_todo_metadata(ty: &str) -> Cow<'_, str> {
+    #[cfg(not(debug_assertions))]
+    {
+        static TODO_METADATA_REGEX: LazyLock<regex::Regex> =
+            LazyLock::new(|| regex::Regex::new(r"@Todo\([^)]*\)").unwrap());
 
-    TODO_METADATA_REGEX.replace_all(ty, "@Todo")
+        TODO_METADATA_REGEX.replace_all(ty, "@Todo")
+    }
+
+    #[cfg(debug_assertions)]
+    Cow::Borrowed(ty)
+}
+
+/// Normalize paths in diagnostics to Unix paths before comparing them against
+/// the expected type. Doing otherwise means that it's hard to write cross-platform
+/// tests, since in some edge cases the display of a type can include a path to the
+/// file in which the type was defined (e.g. `foo.bar.A @ src/foo/bar.py:10` on Unix,
+/// but `foo.bar.A @ src\foo\bar.py:10` on Windows).
+fn normalize_paths(ty: &str) -> Cow<'_, str> {
+    static PATH_IN_CLASS_DISPLAY_REGEX: LazyLock<regex::Regex> =
+        LazyLock::new(|| regex::Regex::new(r"( @ )(.+)(\.pyi?:\d)").unwrap());
+
+    fn normalize_path_captures(path_captures: &regex::Captures) -> String {
+        let normalized_path = std::path::Path::new(&path_captures[2])
+            .to_slash()
+            .expect("Python module paths should be valid UTF-8");
+
+        format!(
+            "{}{}{}",
+            &path_captures[1], normalized_path, &path_captures[3]
+        )
+    }
+
+    PATH_IN_CLASS_DISPLAY_REGEX.replace_all(ty, normalize_path_captures)
 }
 
 struct Matcher {
@@ -285,7 +319,7 @@ impl Matcher {
                         .column
                         .is_none_or(|col| col == self.column(diagnostic));
                     let message_matches = error.message_contains.is_none_or(|needle| {
-                        diagnostic.concise_message().to_string().contains(needle)
+                        normalize_paths(&diagnostic.concise_message().to_string()).contains(needle)
                     });
                     lint_name_matches && column_matches && message_matches
                 });
@@ -297,21 +331,53 @@ impl Matcher {
                 }
             }
             ParsedAssertion::Revealed(expected_type) => {
-                #[cfg(not(debug_assertions))]
-                let expected_type = discard_todo_metadata(&expected_type);
+                let expected_type = discard_todo_metadata(expected_type);
+                let expected_reveal_type_message = format!("`{expected_type}`");
+
+                let diagnostic_matches_reveal = |diagnostic: &Diagnostic| {
+                    if diagnostic.id() != DiagnosticId::RevealedType {
+                        return false;
+                    }
+                    let primary_message = diagnostic.primary_message();
+                    let Some(primary_annotation) =
+                        (diagnostic.primary_annotation()).and_then(|a| a.get_message())
+                    else {
+                        return false;
+                    };
+
+                    // reveal_type
+                    if primary_message == "Revealed type"
+                        && primary_annotation == expected_reveal_type_message
+                    {
+                        return true;
+                    }
+
+                    // reveal_protocol_interface
+                    if primary_message == "Revealed protocol interface"
+                        && primary_annotation == expected_reveal_type_message
+                    {
+                        return true;
+                    }
+
+                    // reveal_when_assignable_to
+                    if primary_message == "Assignability holds"
+                        && primary_annotation == expected_type
+                    {
+                        return true;
+                    }
+
+                    // reveal_when_subtype_of
+                    if primary_message == "Subtyping holds" && primary_annotation == expected_type {
+                        return true;
+                    }
+
+                    false
+                };
 
                 let mut matched_revealed_type = None;
                 let mut matched_undefined_reveal = None;
-                let expected_reveal_type_message = format!("`{expected_type}`");
                 for (index, diagnostic) in unmatched.iter().enumerate() {
-                    if matched_revealed_type.is_none()
-                        && diagnostic.id() == DiagnosticId::RevealedType
-                        && diagnostic
-                            .primary_annotation()
-                            .and_then(|a| a.get_message())
-                            .unwrap_or_default()
-                            == expected_reveal_type_message
-                    {
+                    if matched_revealed_type.is_none() && diagnostic_matches_reveal(diagnostic) {
                         matched_revealed_type = Some(index);
                     } else if matched_undefined_reveal.is_none()
                         && diagnostic.id().is_lint_named("undefined-reveal")
diff --git a/crates/ty_test/src/parser.rs b/crates/ty_test/src/parser.rs
index 68e9ab5198..12ad3b8039 100644
--- a/crates/ty_test/src/parser.rs
+++ b/crates/ty_test/src/parser.rs
@@ -512,9 +512,8 @@ impl<'s> Parser<'s> {
                             self.process_mdtest_directive(MdtestDirective::PullTypesSkip)?;
                         } else if !HTML_COMMENT_ALLOWLIST.contains(&html_comment) {
                             bail!(
-                                "Unknown HTML comment `{}` -- possibly a typo? \
-                                (Add to `HTML_COMMENT_ALLOWLIST` if this is a false positive)",
-                                html_comment
+                                "Unknown HTML comment `{html_comment}` -- possibly a typo? \
+                                (Add to `HTML_COMMENT_ALLOWLIST` if this is a false positive)"
                             );
                         }
                         self.cursor.skip_bytes(position + HTML_COMMENT_END.len());
@@ -721,8 +720,7 @@ impl<'s> Parser<'s> {
                 }
                 _ => {
                     bail!(
-                        "Cannot auto-generate file name for code block with language `{}` in test `{test_name}`",
-                        lang
+                        "Cannot auto-generate file name for code block with language `{lang}` in test `{test_name}`"
                     );
                 }
             },
diff --git a/crates/ty_vendored/src/lib.rs b/crates/ty_vendored/src/lib.rs
index e6fd7e0a0b..fa054443ff 100644
--- a/crates/ty_vendored/src/lib.rs
+++ b/crates/ty_vendored/src/lib.rs
@@ -1,3 +1,7 @@
+#![warn(
+    clippy::disallowed_methods,
+    reason = "Prefer System trait methods over std methods in ty crates"
+)]
 use ruff_db::vendored::VendoredFileSystem;
 use std::sync::LazyLock;
 
diff --git a/crates/ty_vendored/ty_extensions/ty_extensions.pyi b/crates/ty_vendored/ty_extensions/ty_extensions.pyi
index 6968bcb75a..262ded8867 100644
--- a/crates/ty_vendored/ty_extensions/ty_extensions.pyi
+++ b/crates/ty_vendored/ty_extensions/ty_extensions.pyi
@@ -1,3 +1,4 @@
+# ruff: noqa: PYI021
 import sys
 from collections.abc import Iterable
 from enum import Enum
@@ -24,6 +25,12 @@ Not: _SpecialForm
 Intersection: _SpecialForm
 TypeOf: _SpecialForm
 CallableTypeOf: _SpecialForm
+# Top[T] evaluates to the top materialization of T, a type that is a supertype
+# of every materialization of T.
+Top: _SpecialForm
+# Bottom[T] evaluates to the bottom materialization of T, a type that is a subtype
+# of every materialization of T.
+Bottom: _SpecialForm
 
 # ty treats annotations of `float` to mean `float | int`, and annotations of `complex`
 # to mean `complex | float | int`. This is to support a typing-system special case [1].
@@ -34,20 +41,58 @@ CallableTypeOf: _SpecialForm
 type JustFloat = TypeOf[1.0]
 type JustComplex = TypeOf[1.0j]
 
+# Constraints
+class ConstraintSet:
+    def __bool__(self) -> bool: ...
+    def __and__(self, other: ConstraintSet) -> ConstraintSet: ...
+    def __or__(self, other: ConstraintSet) -> ConstraintSet: ...
+    def __invert__(self) -> ConstraintSet: ...
+
+def range_constraint(
+    lower_bound: Any, typevar: Any, upper_bound: Any
+) -> ConstraintSet: ...
+def negated_range_constraint(
+    lower_bound: Any, typevar: Any, upper_bound: Any
+) -> ConstraintSet: ...
+
 # Predicates on types
 #
 # Ideally, these would be annotated using `TypeForm`, but that has not been
 # standardized yet (https://peps.python.org/pep-0747).
-def is_equivalent_to(type_a: Any, type_b: Any) -> bool: ...
-def is_subtype_of(type_derived: Any, type_base: Any) -> bool: ...
-def is_assignable_to(type_target: Any, type_source: Any) -> bool: ...
-def is_disjoint_from(type_a: Any, type_b: Any) -> bool: ...
-def is_singleton(type: Any) -> bool: ...
-def is_single_valued(type: Any) -> bool: ...
+def is_equivalent_to(type_a: Any, type_b: Any) -> ConstraintSet:
+    """Returns a constraint that is satisfied when `type_a` and `type_b` are
+    `equivalent`_ types.
+
+    .. _equivalent: https://typing.python.org/en/latest/spec/glossary.html#term-equivalent
+    """
+
+def is_subtype_of(ty: Any, of: Any) -> ConstraintSet:
+    """Returns a constraint that is satisfied when `ty` is a `subtype`_ of `of`.
+
+    .. _subtype: https://typing.python.org/en/latest/spec/concepts.html#subtype-supertype-and-type-equivalence
+    """
+
+def is_assignable_to(ty: Any, to: Any) -> ConstraintSet:
+    """Returns a constraint that is satisfied when `ty` is `assignable`_ to `to`.
+
+    .. _assignable: https://typing.python.org/en/latest/spec/concepts.html#the-assignable-to-or-consistent-subtyping-relation
+    """
+
+def is_disjoint_from(type_a: Any, type_b: Any) -> ConstraintSet:
+    """Returns a constraint that is satisfied when `type_a` and `type_b` are disjoint types.
+
+    Two types are disjoint if they have no inhabitants in common.
+    """
+
+def is_singleton(ty: Any) -> bool:
+    """Returns `True` if `ty` is a singleton type with exactly one inhabitant."""
+
+def is_single_valued(ty: Any) -> bool:
+    """Returns `True` if `ty` is non-empty and all inhabitants compare equal to each other."""
 
 # Returns the generic context of a type as a tuple of typevars, or `None` if the
 # type is not generic.
-def generic_context(type: Any) -> Any: ...
+def generic_context(ty: Any) -> Any: ...
 
 # Returns the `__all__` names of a module as a tuple of sorted strings, or `None` if
 # either the module does not have `__all__` or it has invalid elements.
@@ -56,12 +101,6 @@ def dunder_all_names(module: Any) -> Any: ...
 # List all members of an enum.
 def enum_members[E: type[Enum]](enum: E) -> tuple[str, ...]: ...
 
-# Returns the type that's an upper bound of materializing the given (gradual) type.
-def top_materialization(type: Any) -> Any: ...
-
-# Returns the type that's a lower bound of materializing the given (gradual) type.
-def bottom_materialization(type: Any) -> Any: ...
-
 # Returns a tuple of all members of the given object, similar to `dir(obj)` and
 # `inspect.getmembers(obj)`, with at least the following differences:
 #
@@ -87,8 +126,8 @@ class NamedTupleLike(Protocol):
     _field_defaults: ClassVar[dict[str, Any]]
     _fields: ClassVar[tuple[str, ...]]
     @classmethod
-    def _make(self: Self, iterable: Iterable[Any]) -> Self: ...
+    def _make(cls: type[Self], iterable: Iterable[Any]) -> Self: ...
     def _asdict(self, /) -> dict[str, Any]: ...
-    def _replace(self: Self, /, **kwargs) -> Self: ...
+    def _replace(self, /, **kwargs) -> Self: ...
     if sys.version_info >= (3, 13):
-        def __replace__(self: Self, **kwargs) -> Self: ...
+        def __replace__(self, **kwargs) -> Self: ...
diff --git a/crates/ty_vendored/vendor/typeshed/source_commit.txt b/crates/ty_vendored/vendor/typeshed/source_commit.txt
index b09efe98fe..54a8607d25 100644
--- a/crates/ty_vendored/vendor/typeshed/source_commit.txt
+++ b/crates/ty_vendored/vendor/typeshed/source_commit.txt
@@ -1 +1 @@
-893b9a760deb3be64d13c748318e95a752230961
+d6f4a0f7102b1400a21742cf9b7ea93614e2b6ec
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_ast.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_ast.pyi
index 00c6b357f7..d8d5a18299 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_ast.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_ast.pyi
@@ -108,7 +108,7 @@ from ast import (
     unaryop as unaryop,
     withitem as withitem,
 )
-from typing import Literal
+from typing import Final
 
 if sys.version_info >= (3, 12):
     from ast import (
@@ -137,9 +137,9 @@ if sys.version_info >= (3, 10):
         pattern as pattern,
     )
 
-PyCF_ALLOW_TOP_LEVEL_AWAIT: Literal[8192]
-PyCF_ONLY_AST: Literal[1024]
-PyCF_TYPE_COMMENTS: Literal[4096]
+PyCF_ALLOW_TOP_LEVEL_AWAIT: Final = 8192
+PyCF_ONLY_AST: Final = 1024
+PyCF_TYPE_COMMENTS: Final = 4096
 
 if sys.version_info >= (3, 13):
-    PyCF_OPTIMIZED_AST: Literal[33792]
+    PyCF_OPTIMIZED_AST: Final = 33792
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_asyncio.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_asyncio.pyi
index efb8ef77ff..5b11b3445a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_asyncio.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_asyncio.pyi
@@ -6,12 +6,13 @@ from collections.abc import Awaitable, Callable, Coroutine, Generator
 from contextvars import Context
 from types import FrameType, GenericAlias
 from typing import Any, Literal, TextIO, TypeVar
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 _T = TypeVar("_T")
 _T_co = TypeVar("_T_co", covariant=True)
 _TaskYieldType: TypeAlias = Future[object] | None
 
+@disjoint_base
 class Future(Awaitable[_T]):
     """This class is *almost* compatible with concurrent.futures.Future.
 
@@ -36,7 +37,7 @@ class Future(Awaitable[_T]):
     @_log_traceback.setter
     def _log_traceback(self, val: Literal[False]) -> None: ...
     _asyncio_future_blocking: bool  # is a part of duck-typing contract for `Future`
-    def __init__(self, *, loop: AbstractEventLoop | None = ...) -> None: ...
+    def __init__(self, *, loop: AbstractEventLoop | None = None) -> None: ...
     def __del__(self) -> None:
         """Called when the instance is about to be destroyed."""
 
@@ -128,6 +129,7 @@ else:
 # While this is true in general, here it's sort-of okay to have a covariant subclass,
 # since the only reason why `asyncio.Future` is invariant is the `set_result()` method,
 # and `asyncio.Task.set_result()` always raises.
+@disjoint_base
 class Task(Future[_T_co]):  # type: ignore[type-var]  # pyright: ignore[reportInvalidTypeArguments]
     """A coroutine wrapped in a Future."""
 
@@ -137,7 +139,7 @@ class Task(Future[_T_co]):  # type: ignore[type-var]  # pyright: ignore[reportIn
             coro: _TaskCompatibleCoro[_T_co],
             *,
             loop: AbstractEventLoop | None = None,
-            name: str | None = ...,
+            name: str | None = None,
             context: Context | None = None,
             eager_start: bool = False,
         ) -> None: ...
@@ -147,12 +149,12 @@ class Task(Future[_T_co]):  # type: ignore[type-var]  # pyright: ignore[reportIn
             coro: _TaskCompatibleCoro[_T_co],
             *,
             loop: AbstractEventLoop | None = None,
-            name: str | None = ...,
+            name: str | None = None,
             context: Context | None = None,
         ) -> None: ...
     else:
         def __init__(
-            self, coro: _TaskCompatibleCoro[_T_co], *, loop: AbstractEventLoop | None = None, name: str | None = ...
+            self, coro: _TaskCompatibleCoro[_T_co], *, loop: AbstractEventLoop | None = None, name: str | None = None
         ) -> None: ...
 
     if sys.version_info >= (3, 12):
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_blake2.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_blake2.pyi
index efaacea60a..b806cd201c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_blake2.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_blake2.pyi
@@ -1,17 +1,18 @@
 """_blake2b provides BLAKE2b for hashlib"""
 
+import sys
 from _typeshed import ReadableBuffer
-from typing import ClassVar, final
+from typing import ClassVar, Final, final
 from typing_extensions import Self
 
-BLAKE2B_MAX_DIGEST_SIZE: int = 64
-BLAKE2B_MAX_KEY_SIZE: int = 64
-BLAKE2B_PERSON_SIZE: int = 16
-BLAKE2B_SALT_SIZE: int = 16
-BLAKE2S_MAX_DIGEST_SIZE: int = 32
-BLAKE2S_MAX_KEY_SIZE: int = 32
-BLAKE2S_PERSON_SIZE: int = 8
-BLAKE2S_SALT_SIZE: int = 8
+BLAKE2B_MAX_DIGEST_SIZE: Final = 64
+BLAKE2B_MAX_KEY_SIZE: Final = 64
+BLAKE2B_PERSON_SIZE: Final = 16
+BLAKE2B_SALT_SIZE: Final = 16
+BLAKE2S_MAX_DIGEST_SIZE: Final = 32
+BLAKE2S_MAX_KEY_SIZE: Final = 32
+BLAKE2S_PERSON_SIZE: Final = 8
+BLAKE2S_SALT_SIZE: Final = 8
 
 @final
 class blake2b:
@@ -24,24 +25,45 @@ class blake2b:
     block_size: int
     digest_size: int
     name: str
-    def __new__(
-        cls,
-        data: ReadableBuffer = b"",
-        /,
-        *,
-        digest_size: int = 64,
-        key: ReadableBuffer = b"",
-        salt: ReadableBuffer = b"",
-        person: ReadableBuffer = b"",
-        fanout: int = 1,
-        depth: int = 1,
-        leaf_size: int = 0,
-        node_offset: int = 0,
-        node_depth: int = 0,
-        inner_size: int = 0,
-        last_node: bool = False,
-        usedforsecurity: bool = True,
-    ) -> Self: ...
+    if sys.version_info >= (3, 13):
+        def __new__(
+            cls,
+            data: ReadableBuffer = b"",
+            *,
+            digest_size: int = 64,
+            key: ReadableBuffer = b"",
+            salt: ReadableBuffer = b"",
+            person: ReadableBuffer = b"",
+            fanout: int = 1,
+            depth: int = 1,
+            leaf_size: int = 0,
+            node_offset: int = 0,
+            node_depth: int = 0,
+            inner_size: int = 0,
+            last_node: bool = False,
+            usedforsecurity: bool = True,
+            string: ReadableBuffer | None = None,
+        ) -> Self: ...
+    else:
+        def __new__(
+            cls,
+            data: ReadableBuffer = b"",
+            /,
+            *,
+            digest_size: int = 64,
+            key: ReadableBuffer = b"",
+            salt: ReadableBuffer = b"",
+            person: ReadableBuffer = b"",
+            fanout: int = 1,
+            depth: int = 1,
+            leaf_size: int = 0,
+            node_offset: int = 0,
+            node_depth: int = 0,
+            inner_size: int = 0,
+            last_node: bool = False,
+            usedforsecurity: bool = True,
+        ) -> Self: ...
+
     def copy(self) -> Self:
         """Return a copy of the hash object."""
 
@@ -65,24 +87,45 @@ class blake2s:
     block_size: int
     digest_size: int
     name: str
-    def __new__(
-        cls,
-        data: ReadableBuffer = b"",
-        /,
-        *,
-        digest_size: int = 32,
-        key: ReadableBuffer = b"",
-        salt: ReadableBuffer = b"",
-        person: ReadableBuffer = b"",
-        fanout: int = 1,
-        depth: int = 1,
-        leaf_size: int = 0,
-        node_offset: int = 0,
-        node_depth: int = 0,
-        inner_size: int = 0,
-        last_node: bool = False,
-        usedforsecurity: bool = True,
-    ) -> Self: ...
+    if sys.version_info >= (3, 13):
+        def __new__(
+            cls,
+            data: ReadableBuffer = b"",
+            *,
+            digest_size: int = 32,
+            key: ReadableBuffer = b"",
+            salt: ReadableBuffer = b"",
+            person: ReadableBuffer = b"",
+            fanout: int = 1,
+            depth: int = 1,
+            leaf_size: int = 0,
+            node_offset: int = 0,
+            node_depth: int = 0,
+            inner_size: int = 0,
+            last_node: bool = False,
+            usedforsecurity: bool = True,
+            string: ReadableBuffer | None = None,
+        ) -> Self: ...
+    else:
+        def __new__(
+            cls,
+            data: ReadableBuffer = b"",
+            /,
+            *,
+            digest_size: int = 32,
+            key: ReadableBuffer = b"",
+            salt: ReadableBuffer = b"",
+            person: ReadableBuffer = b"",
+            fanout: int = 1,
+            depth: int = 1,
+            leaf_size: int = 0,
+            node_offset: int = 0,
+            node_depth: int = 0,
+            inner_size: int = 0,
+            last_node: bool = False,
+            usedforsecurity: bool = True,
+        ) -> Self: ...
+
     def copy(self) -> Self:
         """Return a copy of the hash object."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_collections_abc.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_collections_abc.pyi
index 23199e713c..0016acdc55 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_collections_abc.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_collections_abc.pyi
@@ -6,12 +6,13 @@ Unit tests are in test_collections.
 import sys
 from abc import abstractmethod
 from types import MappingProxyType
-from typing import (  # noqa: Y022,Y038,UP035
+from typing import (  # noqa: Y022,Y038,UP035,Y057
     AbstractSet as Set,
     AsyncGenerator as AsyncGenerator,
     AsyncIterable as AsyncIterable,
     AsyncIterator as AsyncIterator,
     Awaitable as Awaitable,
+    ByteString as ByteString,
     Callable as Callable,
     ClassVar,
     Collection as Collection,
@@ -64,12 +65,8 @@ __all__ = [
     "ValuesView",
     "Sequence",
     "MutableSequence",
+    "ByteString",
 ]
-if sys.version_info < (3, 14):
-    from typing import ByteString as ByteString  # noqa: Y057,UP035
-
-    __all__ += ["ByteString"]
-
 if sys.version_info >= (3, 12):
     __all__ += ["Buffer"]
 
@@ -116,5 +113,6 @@ class dict_items(ItemsView[_KT_co, _VT_co]):  # undocumented
 if sys.version_info >= (3, 12):
     @runtime_checkable
     class Buffer(Protocol):
+        __slots__ = ()
         @abstractmethod
         def __buffer__(self, flags: int, /) -> memoryview: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_compat_pickle.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_compat_pickle.pyi
index 50fb22442c..32c0b542d9 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_compat_pickle.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_compat_pickle.pyi
@@ -1,8 +1,10 @@
-IMPORT_MAPPING: dict[str, str]
-NAME_MAPPING: dict[tuple[str, str], tuple[str, str]]
-PYTHON2_EXCEPTIONS: tuple[str, ...]
-MULTIPROCESSING_EXCEPTIONS: tuple[str, ...]
-REVERSE_IMPORT_MAPPING: dict[str, str]
-REVERSE_NAME_MAPPING: dict[tuple[str, str], tuple[str, str]]
-PYTHON3_OSERROR_EXCEPTIONS: tuple[str, ...]
-PYTHON3_IMPORTERROR_EXCEPTIONS: tuple[str, ...]
+from typing import Final
+
+IMPORT_MAPPING: Final[dict[str, str]]
+NAME_MAPPING: Final[dict[tuple[str, str], tuple[str, str]]]
+PYTHON2_EXCEPTIONS: Final[tuple[str, ...]]
+MULTIPROCESSING_EXCEPTIONS: Final[tuple[str, ...]]
+REVERSE_IMPORT_MAPPING: Final[dict[str, str]]
+REVERSE_NAME_MAPPING: Final[dict[tuple[str, str], tuple[str, str]]]
+PYTHON3_OSERROR_EXCEPTIONS: Final[tuple[str, ...]]
+PYTHON3_IMPORTERROR_EXCEPTIONS: Final[tuple[str, ...]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_csv.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_csv.pyi
index 67e1927f8e..e3adaf6fb0 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_csv.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_csv.pyi
@@ -5,7 +5,7 @@ import sys
 from _typeshed import SupportsWrite
 from collections.abc import Iterable
 from typing import Any, Final, Literal, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 __version__: Final[str]
 
@@ -26,6 +26,7 @@ class Error(Exception): ...
 
 _DialectLike: TypeAlias = str | Dialect | csv.Dialect | type[Dialect | csv.Dialect]
 
+@disjoint_base
 class Dialect:
     """CSV dialect
 
@@ -42,7 +43,7 @@ class Dialect:
     strict: bool
     def __new__(
         cls,
-        dialect: _DialectLike | None = ...,
+        dialect: _DialectLike | None = None,
         delimiter: str = ",",
         doublequote: bool = True,
         escapechar: str | None = None,
@@ -55,6 +56,7 @@ class Dialect:
 
 if sys.version_info >= (3, 10):
     # This class calls itself _csv.reader.
+    @disjoint_base
     class Reader:
         """CSV reader
 
@@ -72,6 +74,7 @@ if sys.version_info >= (3, 10):
             """Implement next(self)."""
 
     # This class calls itself _csv.writer.
+    @disjoint_base
     class Writer:
         """CSV writer
 
@@ -133,7 +136,7 @@ else:
         def writerows(self, rows: Iterable[Iterable[Any]]) -> None: ...
 
 def writer(
-    csvfile: SupportsWrite[str],
+    fileobj: SupportsWrite[str],
     /,
     dialect: _DialectLike = "excel",
     *,
@@ -161,7 +164,7 @@ def writer(
     """
 
 def reader(
-    csvfile: Iterable[str],
+    iterable: Iterable[str],
     /,
     dialect: _DialectLike = "excel",
     *,
@@ -191,7 +194,8 @@ def reader(
 
 def register_dialect(
     name: str,
-    dialect: type[Dialect | csv.Dialect] = ...,
+    /,
+    dialect: type[Dialect | csv.Dialect] | str = "excel",
     *,
     delimiter: str = ",",
     quotechar: str | None = '"',
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_ctypes.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_ctypes.pyi
index ba3f209bef..2d7c2dc307 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_ctypes.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_ctypes.pyi
@@ -7,24 +7,24 @@ from abc import abstractmethod
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
 from ctypes import CDLL, ArgumentError as ArgumentError, c_void_p
 from types import GenericAlias
-from typing import Any, ClassVar, Generic, TypeVar, final, overload, type_check_only
+from typing import Any, ClassVar, Final, Generic, TypeVar, final, overload, type_check_only
 from typing_extensions import Self, TypeAlias
 
 _T = TypeVar("_T")
 _CT = TypeVar("_CT", bound=_CData)
 
-FUNCFLAG_CDECL: int
-FUNCFLAG_PYTHONAPI: int
-FUNCFLAG_USE_ERRNO: int
-FUNCFLAG_USE_LASTERROR: int
-RTLD_GLOBAL: int
-RTLD_LOCAL: int
+FUNCFLAG_CDECL: Final = 0x1
+FUNCFLAG_PYTHONAPI: Final = 0x4
+FUNCFLAG_USE_ERRNO: Final = 0x8
+FUNCFLAG_USE_LASTERROR: Final = 0x10
+RTLD_GLOBAL: Final[int]
+RTLD_LOCAL: Final[int]
 
 if sys.version_info >= (3, 11):
-    CTYPES_MAX_ARGCOUNT: int
+    CTYPES_MAX_ARGCOUNT: Final[int]
 
 if sys.version_info >= (3, 12):
-    SIZEOF_TIME_T: int
+    SIZEOF_TIME_T: Final[int]
 
 if sys.platform == "win32":
     # Description, Source, HelpFile, HelpContext, scode
@@ -41,8 +41,8 @@ if sys.platform == "win32":
 
     def CopyComPointer(src: _PointerLike, dst: _PointerLike | _CArgObject) -> int:
         """CopyComPointer(src, dst) -> HRESULT value"""
-    FUNCFLAG_HRESULT: int
-    FUNCFLAG_STDCALL: int
+    FUNCFLAG_HRESULT: Final = 0x2
+    FUNCFLAG_STDCALL: Final = 0x0
 
     def FormatError(code: int = ...) -> str:
         """FormatError([integer]) -> string
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_curses.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_curses.pyi
index f7421fad65..b53a33e16e 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_curses.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_curses.pyi
@@ -1,7 +1,7 @@
 import sys
 from _typeshed import ReadOnlyBuffer, SupportsRead, SupportsWrite
 from curses import _ncurses_version
-from typing import Any, final, overload
+from typing import Any, Final, final, overload
 from typing_extensions import TypeAlias
 
 # NOTE: This module is ordinarily only available on Unix, but the windows-curses
@@ -11,270 +11,270 @@ from typing_extensions import TypeAlias
 _ChType: TypeAlias = str | bytes | int
 
 # ACS codes are only initialized after initscr is called
-ACS_BBSS: int
-ACS_BLOCK: int
-ACS_BOARD: int
-ACS_BSBS: int
-ACS_BSSB: int
-ACS_BSSS: int
-ACS_BTEE: int
-ACS_BULLET: int
-ACS_CKBOARD: int
-ACS_DARROW: int
-ACS_DEGREE: int
-ACS_DIAMOND: int
-ACS_GEQUAL: int
-ACS_HLINE: int
-ACS_LANTERN: int
-ACS_LARROW: int
-ACS_LEQUAL: int
-ACS_LLCORNER: int
-ACS_LRCORNER: int
-ACS_LTEE: int
-ACS_NEQUAL: int
-ACS_PI: int
-ACS_PLMINUS: int
-ACS_PLUS: int
-ACS_RARROW: int
-ACS_RTEE: int
-ACS_S1: int
-ACS_S3: int
-ACS_S7: int
-ACS_S9: int
-ACS_SBBS: int
-ACS_SBSB: int
-ACS_SBSS: int
-ACS_SSBB: int
-ACS_SSBS: int
-ACS_SSSB: int
-ACS_SSSS: int
-ACS_STERLING: int
-ACS_TTEE: int
-ACS_UARROW: int
-ACS_ULCORNER: int
-ACS_URCORNER: int
-ACS_VLINE: int
-ALL_MOUSE_EVENTS: int
-A_ALTCHARSET: int
-A_ATTRIBUTES: int
-A_BLINK: int
-A_BOLD: int
-A_CHARTEXT: int
-A_COLOR: int
-A_DIM: int
-A_HORIZONTAL: int
-A_INVIS: int
-A_ITALIC: int
-A_LEFT: int
-A_LOW: int
-A_NORMAL: int
-A_PROTECT: int
-A_REVERSE: int
-A_RIGHT: int
-A_STANDOUT: int
-A_TOP: int
-A_UNDERLINE: int
-A_VERTICAL: int
-BUTTON1_CLICKED: int
-BUTTON1_DOUBLE_CLICKED: int
-BUTTON1_PRESSED: int
-BUTTON1_RELEASED: int
-BUTTON1_TRIPLE_CLICKED: int
-BUTTON2_CLICKED: int
-BUTTON2_DOUBLE_CLICKED: int
-BUTTON2_PRESSED: int
-BUTTON2_RELEASED: int
-BUTTON2_TRIPLE_CLICKED: int
-BUTTON3_CLICKED: int
-BUTTON3_DOUBLE_CLICKED: int
-BUTTON3_PRESSED: int
-BUTTON3_RELEASED: int
-BUTTON3_TRIPLE_CLICKED: int
-BUTTON4_CLICKED: int
-BUTTON4_DOUBLE_CLICKED: int
-BUTTON4_PRESSED: int
-BUTTON4_RELEASED: int
-BUTTON4_TRIPLE_CLICKED: int
+ACS_BBSS: Final[int]
+ACS_BLOCK: Final[int]
+ACS_BOARD: Final[int]
+ACS_BSBS: Final[int]
+ACS_BSSB: Final[int]
+ACS_BSSS: Final[int]
+ACS_BTEE: Final[int]
+ACS_BULLET: Final[int]
+ACS_CKBOARD: Final[int]
+ACS_DARROW: Final[int]
+ACS_DEGREE: Final[int]
+ACS_DIAMOND: Final[int]
+ACS_GEQUAL: Final[int]
+ACS_HLINE: Final[int]
+ACS_LANTERN: Final[int]
+ACS_LARROW: Final[int]
+ACS_LEQUAL: Final[int]
+ACS_LLCORNER: Final[int]
+ACS_LRCORNER: Final[int]
+ACS_LTEE: Final[int]
+ACS_NEQUAL: Final[int]
+ACS_PI: Final[int]
+ACS_PLMINUS: Final[int]
+ACS_PLUS: Final[int]
+ACS_RARROW: Final[int]
+ACS_RTEE: Final[int]
+ACS_S1: Final[int]
+ACS_S3: Final[int]
+ACS_S7: Final[int]
+ACS_S9: Final[int]
+ACS_SBBS: Final[int]
+ACS_SBSB: Final[int]
+ACS_SBSS: Final[int]
+ACS_SSBB: Final[int]
+ACS_SSBS: Final[int]
+ACS_SSSB: Final[int]
+ACS_SSSS: Final[int]
+ACS_STERLING: Final[int]
+ACS_TTEE: Final[int]
+ACS_UARROW: Final[int]
+ACS_ULCORNER: Final[int]
+ACS_URCORNER: Final[int]
+ACS_VLINE: Final[int]
+ALL_MOUSE_EVENTS: Final[int]
+A_ALTCHARSET: Final[int]
+A_ATTRIBUTES: Final[int]
+A_BLINK: Final[int]
+A_BOLD: Final[int]
+A_CHARTEXT: Final[int]
+A_COLOR: Final[int]
+A_DIM: Final[int]
+A_HORIZONTAL: Final[int]
+A_INVIS: Final[int]
+A_ITALIC: Final[int]
+A_LEFT: Final[int]
+A_LOW: Final[int]
+A_NORMAL: Final[int]
+A_PROTECT: Final[int]
+A_REVERSE: Final[int]
+A_RIGHT: Final[int]
+A_STANDOUT: Final[int]
+A_TOP: Final[int]
+A_UNDERLINE: Final[int]
+A_VERTICAL: Final[int]
+BUTTON1_CLICKED: Final[int]
+BUTTON1_DOUBLE_CLICKED: Final[int]
+BUTTON1_PRESSED: Final[int]
+BUTTON1_RELEASED: Final[int]
+BUTTON1_TRIPLE_CLICKED: Final[int]
+BUTTON2_CLICKED: Final[int]
+BUTTON2_DOUBLE_CLICKED: Final[int]
+BUTTON2_PRESSED: Final[int]
+BUTTON2_RELEASED: Final[int]
+BUTTON2_TRIPLE_CLICKED: Final[int]
+BUTTON3_CLICKED: Final[int]
+BUTTON3_DOUBLE_CLICKED: Final[int]
+BUTTON3_PRESSED: Final[int]
+BUTTON3_RELEASED: Final[int]
+BUTTON3_TRIPLE_CLICKED: Final[int]
+BUTTON4_CLICKED: Final[int]
+BUTTON4_DOUBLE_CLICKED: Final[int]
+BUTTON4_PRESSED: Final[int]
+BUTTON4_RELEASED: Final[int]
+BUTTON4_TRIPLE_CLICKED: Final[int]
 # Darwin ncurses doesn't provide BUTTON5_* constants prior to 3.12.10 and 3.13.3
 if sys.version_info >= (3, 10):
     if sys.version_info >= (3, 12) or sys.platform != "darwin":
-        BUTTON5_PRESSED: int
-        BUTTON5_RELEASED: int
-        BUTTON5_CLICKED: int
-        BUTTON5_DOUBLE_CLICKED: int
-        BUTTON5_TRIPLE_CLICKED: int
-BUTTON_ALT: int
-BUTTON_CTRL: int
-BUTTON_SHIFT: int
-COLOR_BLACK: int
-COLOR_BLUE: int
-COLOR_CYAN: int
-COLOR_GREEN: int
-COLOR_MAGENTA: int
-COLOR_RED: int
-COLOR_WHITE: int
-COLOR_YELLOW: int
-ERR: int
-KEY_A1: int
-KEY_A3: int
-KEY_B2: int
-KEY_BACKSPACE: int
-KEY_BEG: int
-KEY_BREAK: int
-KEY_BTAB: int
-KEY_C1: int
-KEY_C3: int
-KEY_CANCEL: int
-KEY_CATAB: int
-KEY_CLEAR: int
-KEY_CLOSE: int
-KEY_COMMAND: int
-KEY_COPY: int
-KEY_CREATE: int
-KEY_CTAB: int
-KEY_DC: int
-KEY_DL: int
-KEY_DOWN: int
-KEY_EIC: int
-KEY_END: int
-KEY_ENTER: int
-KEY_EOL: int
-KEY_EOS: int
-KEY_EXIT: int
-KEY_F0: int
-KEY_F1: int
-KEY_F10: int
-KEY_F11: int
-KEY_F12: int
-KEY_F13: int
-KEY_F14: int
-KEY_F15: int
-KEY_F16: int
-KEY_F17: int
-KEY_F18: int
-KEY_F19: int
-KEY_F2: int
-KEY_F20: int
-KEY_F21: int
-KEY_F22: int
-KEY_F23: int
-KEY_F24: int
-KEY_F25: int
-KEY_F26: int
-KEY_F27: int
-KEY_F28: int
-KEY_F29: int
-KEY_F3: int
-KEY_F30: int
-KEY_F31: int
-KEY_F32: int
-KEY_F33: int
-KEY_F34: int
-KEY_F35: int
-KEY_F36: int
-KEY_F37: int
-KEY_F38: int
-KEY_F39: int
-KEY_F4: int
-KEY_F40: int
-KEY_F41: int
-KEY_F42: int
-KEY_F43: int
-KEY_F44: int
-KEY_F45: int
-KEY_F46: int
-KEY_F47: int
-KEY_F48: int
-KEY_F49: int
-KEY_F5: int
-KEY_F50: int
-KEY_F51: int
-KEY_F52: int
-KEY_F53: int
-KEY_F54: int
-KEY_F55: int
-KEY_F56: int
-KEY_F57: int
-KEY_F58: int
-KEY_F59: int
-KEY_F6: int
-KEY_F60: int
-KEY_F61: int
-KEY_F62: int
-KEY_F63: int
-KEY_F7: int
-KEY_F8: int
-KEY_F9: int
-KEY_FIND: int
-KEY_HELP: int
-KEY_HOME: int
-KEY_IC: int
-KEY_IL: int
-KEY_LEFT: int
-KEY_LL: int
-KEY_MARK: int
-KEY_MAX: int
-KEY_MESSAGE: int
-KEY_MIN: int
-KEY_MOUSE: int
-KEY_MOVE: int
-KEY_NEXT: int
-KEY_NPAGE: int
-KEY_OPEN: int
-KEY_OPTIONS: int
-KEY_PPAGE: int
-KEY_PREVIOUS: int
-KEY_PRINT: int
-KEY_REDO: int
-KEY_REFERENCE: int
-KEY_REFRESH: int
-KEY_REPLACE: int
-KEY_RESET: int
-KEY_RESIZE: int
-KEY_RESTART: int
-KEY_RESUME: int
-KEY_RIGHT: int
-KEY_SAVE: int
-KEY_SBEG: int
-KEY_SCANCEL: int
-KEY_SCOMMAND: int
-KEY_SCOPY: int
-KEY_SCREATE: int
-KEY_SDC: int
-KEY_SDL: int
-KEY_SELECT: int
-KEY_SEND: int
-KEY_SEOL: int
-KEY_SEXIT: int
-KEY_SF: int
-KEY_SFIND: int
-KEY_SHELP: int
-KEY_SHOME: int
-KEY_SIC: int
-KEY_SLEFT: int
-KEY_SMESSAGE: int
-KEY_SMOVE: int
-KEY_SNEXT: int
-KEY_SOPTIONS: int
-KEY_SPREVIOUS: int
-KEY_SPRINT: int
-KEY_SR: int
-KEY_SREDO: int
-KEY_SREPLACE: int
-KEY_SRESET: int
-KEY_SRIGHT: int
-KEY_SRSUME: int
-KEY_SSAVE: int
-KEY_SSUSPEND: int
-KEY_STAB: int
-KEY_SUNDO: int
-KEY_SUSPEND: int
-KEY_UNDO: int
-KEY_UP: int
-OK: int
-REPORT_MOUSE_POSITION: int
+        BUTTON5_PRESSED: Final[int]
+        BUTTON5_RELEASED: Final[int]
+        BUTTON5_CLICKED: Final[int]
+        BUTTON5_DOUBLE_CLICKED: Final[int]
+        BUTTON5_TRIPLE_CLICKED: Final[int]
+BUTTON_ALT: Final[int]
+BUTTON_CTRL: Final[int]
+BUTTON_SHIFT: Final[int]
+COLOR_BLACK: Final[int]
+COLOR_BLUE: Final[int]
+COLOR_CYAN: Final[int]
+COLOR_GREEN: Final[int]
+COLOR_MAGENTA: Final[int]
+COLOR_RED: Final[int]
+COLOR_WHITE: Final[int]
+COLOR_YELLOW: Final[int]
+ERR: Final[int]
+KEY_A1: Final[int]
+KEY_A3: Final[int]
+KEY_B2: Final[int]
+KEY_BACKSPACE: Final[int]
+KEY_BEG: Final[int]
+KEY_BREAK: Final[int]
+KEY_BTAB: Final[int]
+KEY_C1: Final[int]
+KEY_C3: Final[int]
+KEY_CANCEL: Final[int]
+KEY_CATAB: Final[int]
+KEY_CLEAR: Final[int]
+KEY_CLOSE: Final[int]
+KEY_COMMAND: Final[int]
+KEY_COPY: Final[int]
+KEY_CREATE: Final[int]
+KEY_CTAB: Final[int]
+KEY_DC: Final[int]
+KEY_DL: Final[int]
+KEY_DOWN: Final[int]
+KEY_EIC: Final[int]
+KEY_END: Final[int]
+KEY_ENTER: Final[int]
+KEY_EOL: Final[int]
+KEY_EOS: Final[int]
+KEY_EXIT: Final[int]
+KEY_F0: Final[int]
+KEY_F1: Final[int]
+KEY_F10: Final[int]
+KEY_F11: Final[int]
+KEY_F12: Final[int]
+KEY_F13: Final[int]
+KEY_F14: Final[int]
+KEY_F15: Final[int]
+KEY_F16: Final[int]
+KEY_F17: Final[int]
+KEY_F18: Final[int]
+KEY_F19: Final[int]
+KEY_F2: Final[int]
+KEY_F20: Final[int]
+KEY_F21: Final[int]
+KEY_F22: Final[int]
+KEY_F23: Final[int]
+KEY_F24: Final[int]
+KEY_F25: Final[int]
+KEY_F26: Final[int]
+KEY_F27: Final[int]
+KEY_F28: Final[int]
+KEY_F29: Final[int]
+KEY_F3: Final[int]
+KEY_F30: Final[int]
+KEY_F31: Final[int]
+KEY_F32: Final[int]
+KEY_F33: Final[int]
+KEY_F34: Final[int]
+KEY_F35: Final[int]
+KEY_F36: Final[int]
+KEY_F37: Final[int]
+KEY_F38: Final[int]
+KEY_F39: Final[int]
+KEY_F4: Final[int]
+KEY_F40: Final[int]
+KEY_F41: Final[int]
+KEY_F42: Final[int]
+KEY_F43: Final[int]
+KEY_F44: Final[int]
+KEY_F45: Final[int]
+KEY_F46: Final[int]
+KEY_F47: Final[int]
+KEY_F48: Final[int]
+KEY_F49: Final[int]
+KEY_F5: Final[int]
+KEY_F50: Final[int]
+KEY_F51: Final[int]
+KEY_F52: Final[int]
+KEY_F53: Final[int]
+KEY_F54: Final[int]
+KEY_F55: Final[int]
+KEY_F56: Final[int]
+KEY_F57: Final[int]
+KEY_F58: Final[int]
+KEY_F59: Final[int]
+KEY_F6: Final[int]
+KEY_F60: Final[int]
+KEY_F61: Final[int]
+KEY_F62: Final[int]
+KEY_F63: Final[int]
+KEY_F7: Final[int]
+KEY_F8: Final[int]
+KEY_F9: Final[int]
+KEY_FIND: Final[int]
+KEY_HELP: Final[int]
+KEY_HOME: Final[int]
+KEY_IC: Final[int]
+KEY_IL: Final[int]
+KEY_LEFT: Final[int]
+KEY_LL: Final[int]
+KEY_MARK: Final[int]
+KEY_MAX: Final[int]
+KEY_MESSAGE: Final[int]
+KEY_MIN: Final[int]
+KEY_MOUSE: Final[int]
+KEY_MOVE: Final[int]
+KEY_NEXT: Final[int]
+KEY_NPAGE: Final[int]
+KEY_OPEN: Final[int]
+KEY_OPTIONS: Final[int]
+KEY_PPAGE: Final[int]
+KEY_PREVIOUS: Final[int]
+KEY_PRINT: Final[int]
+KEY_REDO: Final[int]
+KEY_REFERENCE: Final[int]
+KEY_REFRESH: Final[int]
+KEY_REPLACE: Final[int]
+KEY_RESET: Final[int]
+KEY_RESIZE: Final[int]
+KEY_RESTART: Final[int]
+KEY_RESUME: Final[int]
+KEY_RIGHT: Final[int]
+KEY_SAVE: Final[int]
+KEY_SBEG: Final[int]
+KEY_SCANCEL: Final[int]
+KEY_SCOMMAND: Final[int]
+KEY_SCOPY: Final[int]
+KEY_SCREATE: Final[int]
+KEY_SDC: Final[int]
+KEY_SDL: Final[int]
+KEY_SELECT: Final[int]
+KEY_SEND: Final[int]
+KEY_SEOL: Final[int]
+KEY_SEXIT: Final[int]
+KEY_SF: Final[int]
+KEY_SFIND: Final[int]
+KEY_SHELP: Final[int]
+KEY_SHOME: Final[int]
+KEY_SIC: Final[int]
+KEY_SLEFT: Final[int]
+KEY_SMESSAGE: Final[int]
+KEY_SMOVE: Final[int]
+KEY_SNEXT: Final[int]
+KEY_SOPTIONS: Final[int]
+KEY_SPREVIOUS: Final[int]
+KEY_SPRINT: Final[int]
+KEY_SR: Final[int]
+KEY_SREDO: Final[int]
+KEY_SREPLACE: Final[int]
+KEY_SRESET: Final[int]
+KEY_SRIGHT: Final[int]
+KEY_SRSUME: Final[int]
+KEY_SSAVE: Final[int]
+KEY_SSUSPEND: Final[int]
+KEY_STAB: Final[int]
+KEY_SUNDO: Final[int]
+KEY_SUSPEND: Final[int]
+KEY_UNDO: Final[int]
+KEY_UP: Final[int]
+OK: Final[int]
+REPORT_MOUSE_POSITION: Final[int]
 _C_API: Any
-version: bytes
+version: Final[bytes]
 
 def baudrate() -> int:
     """Return the output speed of the terminal in bits per second."""
@@ -573,7 +573,7 @@ def newpad(nlines: int, ncols: int, /) -> window:
       Width.
     """
 
-def newwin(nlines: int, ncols: int, begin_y: int = ..., begin_x: int = ..., /) -> window:
+def newwin(nlines: int, ncols: int, begin_y: int = 0, begin_x: int = 0, /) -> window:
     """newwin(nlines, ncols, [begin_y=0, begin_x=0])
     Return a new window.
 
@@ -947,7 +947,7 @@ class window:  # undocumented
     def attrset(self, attr: int, /) -> None:
         """Set the "background" set of attributes."""
 
-    def bkgd(self, ch: _ChType, attr: int = ..., /) -> None:
+    def bkgd(self, ch: _ChType, attr: int = 0, /) -> None:
         """Set the background property of the window.
 
         ch
@@ -956,7 +956,7 @@ class window:  # undocumented
           Background attributes.
         """
 
-    def bkgdset(self, ch: _ChType, attr: int = ..., /) -> None:
+    def bkgdset(self, ch: _ChType, attr: int = 0, /) -> None:
         """Set the window's background.
 
         ch
@@ -1016,7 +1016,7 @@ class window:  # undocumented
         """
 
     @overload
-    def box(self, vertch: _ChType = ..., horch: _ChType = ...) -> None: ...
+    def box(self, vertch: _ChType = 0, horch: _ChType = 0) -> None: ...
     @overload
     def chgat(self, attr: int) -> None:
         """chgat([y, x,] [n=-1,] attr)
@@ -1085,7 +1085,7 @@ class window:  # undocumented
 
     @overload
     def derwin(self, nlines: int, ncols: int, begin_y: int, begin_x: int) -> window: ...
-    def echochar(self, ch: _ChType, attr: int = ..., /) -> None:
+    def echochar(self, ch: _ChType, attr: int = 0, /) -> None:
         """Add character ch with attribute attr, and refresh.
 
         ch
@@ -1289,7 +1289,7 @@ class window:  # undocumented
     @overload
     def insstr(self, y: int, x: int, str: str, attr: int = ...) -> None: ...
     @overload
-    def instr(self, n: int = ...) -> bytes:
+    def instr(self, n: int = 2047) -> bytes:
         """instr([y, x,] n=2047)
         Return a string of characters, extracted from the window.
 
@@ -1307,7 +1307,7 @@ class window:  # undocumented
         """
 
     @overload
-    def instr(self, y: int, x: int, n: int = ...) -> bytes: ...
+    def instr(self, y: int, x: int, n: int = 2047) -> bytes: ...
     def is_linetouched(self, line: int, /) -> bool:
         """Return True if the specified line was modified, otherwise return False.
 
@@ -1415,7 +1415,7 @@ class window:  # undocumented
     @overload
     def refresh(self, pminrow: int, pmincol: int, sminrow: int, smincol: int, smaxrow: int, smaxcol: int) -> None: ...
     def resize(self, nlines: int, ncols: int) -> None: ...
-    def scroll(self, lines: int = ...) -> None:
+    def scroll(self, lines: int = 1) -> None:
         """scroll([lines=1])
         Scroll the screen or scrolling region.
 
@@ -1483,7 +1483,7 @@ class window:  # undocumented
     def syncok(self, flag: bool) -> None: ...
     def syncup(self) -> None: ...
     def timeout(self, delay: int) -> None: ...
-    def touchline(self, start: int, count: int, changed: bool = ...) -> None:
+    def touchline(self, start: int, count: int, changed: bool = True) -> None:
         """touchline(start, count, [changed=True])
         Pretend count lines have been changed, starting with line start.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_curses_panel.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_curses_panel.pyi
index 708dda3191..39c877ed58 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_curses_panel.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_curses_panel.pyi
@@ -1,8 +1,8 @@
 from _curses import window
-from typing import final
+from typing import Final, final
 
-__version__: str
-version: str
+__version__: Final[str]
+version: Final[str]
 
 class error(Exception): ...
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_dbm.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_dbm.pyi
index 070398f794..7d6157c503 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_dbm.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_dbm.pyi
@@ -1,7 +1,7 @@
 import sys
 from _typeshed import ReadOnlyBuffer, StrOrBytesPath
 from types import TracebackType
-from typing import TypeVar, final, overload, type_check_only
+from typing import Final, TypeVar, final, overload, type_check_only
 from typing_extensions import Self, TypeAlias
 
 if sys.platform != "win32":
@@ -10,7 +10,7 @@ if sys.platform != "win32":
     _ValueType: TypeAlias = str | ReadOnlyBuffer
 
     class error(OSError): ...
-    library: str
+    library: Final[str]
 
     # Actual typename dbm, not exposed by the implementation
     @final
@@ -33,7 +33,7 @@ if sys.platform != "win32":
         @overload
         def get(self, k: _KeyType, default: _T, /) -> bytes | _T: ...
         def keys(self) -> list[bytes]: ...
-        def setdefault(self, k: _KeyType, default: _ValueType = ..., /) -> bytes: ...
+        def setdefault(self, k: _KeyType, default: _ValueType = b"", /) -> bytes: ...
         # This isn't true, but the class can't be instantiated. See #13024
         __new__: None  # type: ignore[assignment]
         __init__: None  # type: ignore[assignment]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_decimal.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_decimal.pyi
index 549d808659..bda849f698 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_decimal.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_decimal.pyi
@@ -56,14 +56,14 @@ if sys.version_info >= (3, 11):
     def localcontext(
         ctx: Context | None = None,
         *,
-        prec: int | None = ...,
-        rounding: str | None = ...,
-        Emin: int | None = ...,
-        Emax: int | None = ...,
-        capitals: int | None = ...,
-        clamp: int | None = ...,
-        traps: dict[_TrapType, bool] | None = ...,
-        flags: dict[_TrapType, bool] | None = ...,
+        prec: int | None = None,
+        rounding: str | None = None,
+        Emin: int | None = None,
+        Emax: int | None = None,
+        capitals: int | None = None,
+        clamp: int | None = None,
+        traps: dict[_TrapType, bool] | None = None,
+        flags: dict[_TrapType, bool] | None = None,
     ) -> _ContextManager:
         """Return a context manager that will set the default context to a copy of ctx
         on entry to the with-statement and restore the previous default context when
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib.pyi
index 84326d57da..7ca4f5b477 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib.pyi
@@ -22,7 +22,7 @@ def __import__(
     name: str,
     globals: Mapping[str, object] | None = None,
     locals: Mapping[str, object] | None = None,
-    fromlist: Sequence[str] = (),
+    fromlist: Sequence[str] | None = (),
     level: int = 0,
 ) -> ModuleType:
     """Import a module.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib_external.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib_external.pyi
index 8986a981e9..455af65389 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib_external.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_frozen_importlib_external.pyi
@@ -18,7 +18,7 @@ from _typeshed.importlib import LoaderProtocol
 from collections.abc import Callable, Iterable, Iterator, Mapping, MutableSequence, Sequence
 from importlib.machinery import ModuleSpec
 from importlib.metadata import DistributionFinder, PathDistribution
-from typing import Any, Literal
+from typing import Any, Final, Literal
 from typing_extensions import Self, deprecated
 
 if sys.version_info >= (3, 10):
@@ -33,7 +33,7 @@ else:
     path_sep: Literal["/"]
     path_sep_tuple: tuple[Literal["/"]]
 
-MAGIC_NUMBER: bytes
+MAGIC_NUMBER: Final[bytes]
 
 def cache_from_source(path: StrPath, debug_override: bool | None = None, *, optimization: Any | None = None) -> str:
     """Given the path to a .py file, return the path to its .pyc file.
@@ -89,7 +89,7 @@ def spec_from_file_location(
     """
 
 @deprecated(
-    "Deprecated as of Python 3.6: Use site configuration instead. "
+    "Deprecated since Python 3.6. Use site configuration instead. "
     "Future versions of Python may not enable this finder by default."
 )
 class WindowsRegistryFinder(importlib.abc.MetaPathFinder):
@@ -167,11 +167,11 @@ class PathFinder(importlib.abc.MetaPathFinder):
 
             """
 
-SOURCE_SUFFIXES: list[str]
-DEBUG_BYTECODE_SUFFIXES: list[str]
-OPTIMIZED_BYTECODE_SUFFIXES: list[str]
-BYTECODE_SUFFIXES: list[str]
-EXTENSION_SUFFIXES: list[str]
+SOURCE_SUFFIXES: Final[list[str]]
+DEBUG_BYTECODE_SUFFIXES: Final = [".pyc"]
+OPTIMIZED_BYTECODE_SUFFIXES: Final = [".pyc"]
+BYTECODE_SUFFIXES: Final = [".pyc"]
+EXTENSION_SUFFIXES: Final[list[str]]
 
 class FileFinder(importlib.abc.PathEntryFinder):
     """File-based finder.
@@ -251,7 +251,7 @@ class SourceLoader(_LoaderBasics):
         """
 
     def source_to_code(
-        self, data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: ReadableBuffer | StrPath
+        self, data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: bytes | StrPath
     ) -> types.CodeType:
         """Return the code object compiled from source.
 
@@ -281,10 +281,10 @@ class FileLoader:
     def get_data(self, path: str) -> bytes:
         """Return the data from path as raw bytes."""
 
-    def get_filename(self, name: str | None = None) -> str:
+    def get_filename(self, fullname: str | None = None) -> str:
         """Return the path to the source file as found by the finder."""
 
-    def load_module(self, name: str | None = None) -> types.ModuleType:
+    def load_module(self, fullname: str | None = None) -> types.ModuleType:
         """Load a module from a file.
 
         This method is deprecated.  Use exec_module() instead.
@@ -311,7 +311,7 @@ class SourceFileLoader(importlib.abc.FileLoader, FileLoader, importlib.abc.Sourc
     def source_to_code(  # type: ignore[override]  # incompatible with InspectLoader.source_to_code
         self,
         data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive,
-        path: ReadableBuffer | StrPath,
+        path: bytes | StrPath,
         *,
         _optimize: int = -1,
     ) -> types.CodeType:
@@ -335,7 +335,7 @@ class ExtensionFileLoader(FileLoader, _LoaderBasics, importlib.abc.ExecutionLoad
     """
 
     def __init__(self, name: str, path: str) -> None: ...
-    def get_filename(self, name: str | None = None) -> str:
+    def get_filename(self, fullname: str | None = None) -> str:
         """Return the path to the source file as found by the finder."""
 
     def get_source(self, fullname: str) -> None:
@@ -365,7 +365,7 @@ if sys.version_info >= (3, 11):
             """Use default semantics for module creation."""
 
         def exec_module(self, module: types.ModuleType) -> None: ...
-        @deprecated("load_module() is deprecated; use exec_module() instead")
+        @deprecated("Deprecated since Python 3.10; will be removed in Python 3.15. Use `exec_module()` instead.")
         def load_module(self, fullname: str) -> types.ModuleType:
             """Load a namespace module.
 
@@ -400,14 +400,15 @@ else:
             """Use default semantics for module creation."""
 
         def exec_module(self, module: types.ModuleType) -> None: ...
-        @deprecated("load_module() is deprecated; use exec_module() instead")
-        def load_module(self, fullname: str) -> types.ModuleType:
-            """Load a namespace module.
-
-            This method is deprecated.  Use exec_module() instead.
-
-            """
         if sys.version_info >= (3, 10):
+            @deprecated("Deprecated since Python 3.10; will be removed in Python 3.15. Use `exec_module()` instead.")
+            def load_module(self, fullname: str) -> types.ModuleType:
+                """Load a namespace module.
+
+                This method is deprecated.  Use exec_module() instead.
+
+                """
+
             @staticmethod
             @deprecated(
                 "Deprecated since Python 3.4; removed in Python 3.12. "
@@ -422,6 +423,13 @@ else:
 
             def get_resource_reader(self, module: types.ModuleType) -> importlib.readers.NamespaceReader: ...
         else:
+            def load_module(self, fullname: str) -> types.ModuleType:
+                """Load a namespace module.
+
+                This method is deprecated.  Use exec_module() instead.
+
+                """
+
             @classmethod
             @deprecated(
                 "Deprecated since Python 3.4; removed in Python 3.12. "
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_hashlib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_hashlib.pyi
index a7153d44cf..1dda9af2cb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_hashlib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_hashlib.pyi
@@ -5,7 +5,7 @@ from _typeshed import ReadableBuffer
 from collections.abc import Callable
 from types import ModuleType
 from typing import AnyStr, Protocol, final, overload, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 _DigestMod: TypeAlias = str | Callable[[], _HashObject] | ModuleType | None
 
@@ -24,6 +24,7 @@ class _HashObject(Protocol):
     def hexdigest(self) -> str: ...
     def update(self, obj: ReadableBuffer, /) -> None: ...
 
+@disjoint_base
 class HASH:
     """A hash is an object used to calculate a checksum of a string of information.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_interpreters.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_interpreters.pyi
index be2e5f184c..958ae497f1 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_interpreters.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_interpreters.pyi
@@ -4,8 +4,8 @@ The 'interpreters' module provides a more convenient interface.
 
 import types
 from collections.abc import Callable
-from typing import Any, Final, Literal, SupportsIndex, TypeVar
-from typing_extensions import TypeAlias
+from typing import Any, Final, Literal, SupportsIndex, TypeVar, overload
+from typing_extensions import TypeAlias, disjoint_base
 
 _R = TypeVar("_R")
 
@@ -20,6 +20,7 @@ class InterpreterNotFoundError(InterpreterError):
 
 class NotShareableError(ValueError): ...
 
+@disjoint_base
 class CrossInterpreterBufferView:
     def __buffer__(self, flags: int, /) -> memoryview:
         """Return a buffer object that exposes the underlying memory of the object."""
@@ -60,19 +61,19 @@ def destroy(id: SupportsIndex, *, restrict: bool = False) -> None:
     So does an unrecognized ID.
     """
 
-def list_all(*, require_ready: bool) -> list[tuple[int, int]]:
+def list_all(*, require_ready: bool = False) -> list[tuple[int, _Whence]]:
     """list_all() -> [(ID, whence)]
 
     Return a list containing the ID of every existing interpreter.
     """
 
-def get_current() -> tuple[int, int]:
+def get_current() -> tuple[int, _Whence]:
     """get_current() -> (ID, whence)
 
     Return the ID of current interpreter.
     """
 
-def get_main() -> tuple[int, int]:
+def get_main() -> tuple[int, _Whence]:
     """get_main() -> (ID, whence)
 
     Return the ID of main interpreter.
@@ -97,11 +98,7 @@ def whence(id: SupportsIndex) -> _Whence:
     """
 
 def exec(
-    id: SupportsIndex,
-    code: str | types.CodeType | Callable[[], object],
-    shared: _SharedDict | None = None,
-    *,
-    restrict: bool = False,
+    id: SupportsIndex, code: str | types.CodeType | Callable[[], object], shared: _SharedDict = {}, *, restrict: bool = False
 ) -> None | types.SimpleNamespace:
     """exec(id, code, shared=None, *, restrict=False)
 
@@ -123,9 +120,10 @@ def exec(
 def call(
     id: SupportsIndex,
     callable: Callable[..., _R],
-    args: tuple[Any, ...] | None = None,
-    kwargs: dict[str, Any] | None = None,
+    args: tuple[Any, ...] = (),
+    kwargs: dict[str, Any] = {},
     *,
+    preserve_exc: bool = False,
     restrict: bool = False,
 ) -> tuple[_R, types.SimpleNamespace]:
     """call(id, callable, args=None, kwargs=None, *, restrict=False)
@@ -135,11 +133,7 @@ def call(
     """
 
 def run_string(
-    id: SupportsIndex,
-    script: str | types.CodeType | Callable[[], object],
-    shared: _SharedDict | None = None,
-    *,
-    restrict: bool = False,
+    id: SupportsIndex, script: str | types.CodeType | Callable[[], object], shared: _SharedDict = {}, *, restrict: bool = False
 ) -> None:
     """run_string(id, script, shared=None, *, restrict=False)
 
@@ -149,7 +143,7 @@ def run_string(
     """
 
 def run_func(
-    id: SupportsIndex, func: types.CodeType | Callable[[], object], shared: _SharedDict | None = None, *, restrict: bool = False
+    id: SupportsIndex, func: types.CodeType | Callable[[], object], shared: _SharedDict = {}, *, restrict: bool = False
 ) -> None:
     """run_func(id, func, shared=None, *, restrict=False)
 
@@ -175,7 +169,8 @@ def is_shareable(obj: object) -> bool:
     False otherwise.
     """
 
-def capture_exception(exc: BaseException | None = None) -> types.SimpleNamespace:
+@overload
+def capture_exception(exc: BaseException) -> types.SimpleNamespace:
     """capture_exception(exc=None) -> types.SimpleNamespace
 
     Return a snapshot of an exception.  If "exc" is None
@@ -184,6 +179,9 @@ def capture_exception(exc: BaseException | None = None) -> types.SimpleNamespace
     The returned snapshot is the same as what _interpreters.exec() returns.
     """
 
+@overload
+def capture_exception(exc: None = None) -> types.SimpleNamespace | None: ...
+
 _Whence: TypeAlias = Literal[0, 1, 2, 3, 4, 5]
 WHENCE_UNKNOWN: Final = 0
 WHENCE_RUNTIME: Final = 1
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_io.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_io.pyi
index ef07b92aaf..e63f1d4856 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_io.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_io.pyi
@@ -41,11 +41,14 @@ from io import BufferedIOBase, RawIOBase, TextIOBase, UnsupportedOperation as Un
 from os import _Opener
 from types import TracebackType
 from typing import IO, Any, BinaryIO, Final, Generic, Literal, Protocol, TextIO, TypeVar, overload, type_check_only
-from typing_extensions import Self
+from typing_extensions import Self, disjoint_base
 
 _T = TypeVar("_T")
 
-DEFAULT_BUFFER_SIZE: Final = 8192
+if sys.version_info >= (3, 14):
+    DEFAULT_BUFFER_SIZE: Final = 131072
+else:
+    DEFAULT_BUFFER_SIZE: Final = 8192
 
 open = builtins.open
 
@@ -58,150 +61,296 @@ def open_code(path: str) -> IO[bytes]:
 
 BlockingIOError = builtins.BlockingIOError
 
-class _IOBase:
-    """The abstract base class for all I/O classes.
+if sys.version_info >= (3, 12):
+    @disjoint_base
+    class _IOBase:
+        """The abstract base class for all I/O classes.
 
-    This class provides dummy implementations for many methods that
-    derived classes can override selectively; the default implementations
-    represent a file that cannot be read, written or seeked.
+        This class provides dummy implementations for many methods that
+        derived classes can override selectively; the default implementations
+        represent a file that cannot be read, written or seeked.
 
-    Even though IOBase does not declare read, readinto, or write because
-    their signatures will vary, implementations and clients should
-    consider those methods part of the interface. Also, implementations
-    may raise UnsupportedOperation when operations they do not support are
-    called.
+        Even though IOBase does not declare read, readinto, or write because
+        their signatures will vary, implementations and clients should
+        consider those methods part of the interface. Also, implementations
+        may raise UnsupportedOperation when operations they do not support are
+        called.
 
-    The basic type used for binary data read from or written to a file is
-    bytes. Other bytes-like objects are accepted as method arguments too.
-    In some cases (such as readinto), a writable object is required. Text
-    I/O classes work with str data.
+        The basic type used for binary data read from or written to a file is
+        bytes. Other bytes-like objects are accepted as method arguments too.
+        In some cases (such as readinto), a writable object is required. Text
+        I/O classes work with str data.
 
-    Note that calling any method (except additional calls to close(),
-    which are ignored) on a closed stream should raise a ValueError.
+        Note that calling any method (except additional calls to close(),
+        which are ignored) on a closed stream should raise a ValueError.
 
-    IOBase (and its subclasses) support the iterator protocol, meaning
-    that an IOBase object can be iterated over yielding the lines in a
-    stream.
+        IOBase (and its subclasses) support the iterator protocol, meaning
+        that an IOBase object can be iterated over yielding the lines in a
+        stream.
 
-    IOBase also supports the :keyword:`with` statement. In this example,
-    fp is closed after the suite of the with statement is complete:
+        IOBase also supports the :keyword:`with` statement. In this example,
+        fp is closed after the suite of the with statement is complete:
 
-    with open('spam.txt', 'r') as fp:
-        fp.write('Spam and eggs!')
-    """
-
-    def __iter__(self) -> Iterator[bytes]:
-        """Implement iter(self)."""
-
-    def __next__(self) -> bytes:
-        """Implement next(self)."""
-
-    def __enter__(self) -> Self: ...
-    def __exit__(
-        self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
-    ) -> None: ...
-    def close(self) -> None:
-        """Flush and close the IO object.
-
-        This method has no effect if the file is already closed.
+        with open('spam.txt', 'r') as fp:
+            fp.write('Spam and eggs!')
         """
 
-    def fileno(self) -> int:
-        """Return underlying file descriptor if one exists.
+        def __iter__(self) -> Iterator[bytes]:
+            """Implement iter(self)."""
 
-        Raise OSError if the IO object does not use a file descriptor.
+        def __next__(self) -> bytes:
+            """Implement next(self)."""
+
+        def __enter__(self) -> Self: ...
+        def __exit__(
+            self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
+        ) -> None: ...
+        def close(self) -> None:
+            """Flush and close the IO object.
+
+            This method has no effect if the file is already closed.
+            """
+
+        def fileno(self) -> int:
+            """Return underlying file descriptor if one exists.
+
+            Raise OSError if the IO object does not use a file descriptor.
+            """
+
+        def flush(self) -> None:
+            """Flush write buffers, if applicable.
+
+            This is not implemented for read-only and non-blocking streams.
+            """
+
+        def isatty(self) -> bool:
+            """Return whether this is an 'interactive' stream.
+
+            Return False if it can't be determined.
+            """
+
+        def readable(self) -> bool:
+            """Return whether object was opened for reading.
+
+            If False, read() will raise OSError.
+            """
+        read: Callable[..., Any]
+        def readlines(self, hint: int = -1, /) -> list[bytes]:
+            """Return a list of lines from the stream.
+
+            hint can be specified to control the number of lines read: no more
+            lines will be read if the total size (in bytes/characters) of all
+            lines so far exceeds hint.
+            """
+
+        def seek(self, offset: int, whence: int = 0, /) -> int:
+            """Change the stream position to the given byte offset.
+
+              offset
+                The stream position, relative to 'whence'.
+              whence
+                The relative position to seek from.
+
+            The offset is interpreted relative to the position indicated by whence.
+            Values for whence are:
+
+            * os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive
+            * os.SEEK_CUR or 1 -- current stream position; offset may be negative
+            * os.SEEK_END or 2 -- end of stream; offset is usually negative
+
+            Return the new absolute position.
+            """
+
+        def seekable(self) -> bool:
+            """Return whether object supports random access.
+
+            If False, seek(), tell() and truncate() will raise OSError.
+            This method may need to do a test seek().
+            """
+
+        def tell(self) -> int:
+            """Return current stream position."""
+
+        def truncate(self, size: int | None = None, /) -> int:
+            """Truncate file to size bytes.
+
+            File pointer is left unchanged. Size defaults to the current IO position
+            as reported by tell(). Return the new size.
+            """
+
+        def writable(self) -> bool:
+            """Return whether object was opened for writing.
+
+            If False, write() will raise OSError.
+            """
+        write: Callable[..., Any]
+        def writelines(self, lines: Iterable[ReadableBuffer], /) -> None:
+            """Write a list of lines to stream.
+
+            Line separators are not added, so it is usual for each of the
+            lines provided to have a line separator at the end.
+            """
+
+        def readline(self, size: int | None = -1, /) -> bytes:
+            """Read and return a line from the stream.
+
+            If size is specified, at most size bytes will be read.
+
+            The line terminator is always b'\\n' for binary files; for text
+            files, the newlines argument to open can be used to select the line
+            terminator(s) recognized.
+            """
+
+        def __del__(self) -> None:
+            """Called when the instance is about to be destroyed."""
+
+        @property
+        def closed(self) -> bool: ...
+        def _checkClosed(self) -> None: ...  # undocumented
+
+else:
+    class _IOBase:
+        """The abstract base class for all I/O classes.
+
+        This class provides dummy implementations for many methods that
+        derived classes can override selectively; the default implementations
+        represent a file that cannot be read, written or seeked.
+
+        Even though IOBase does not declare read, readinto, or write because
+        their signatures will vary, implementations and clients should
+        consider those methods part of the interface. Also, implementations
+        may raise UnsupportedOperation when operations they do not support are
+        called.
+
+        The basic type used for binary data read from or written to a file is
+        bytes. Other bytes-like objects are accepted as method arguments too.
+        In some cases (such as readinto), a writable object is required. Text
+        I/O classes work with str data.
+
+        Note that calling any method (except additional calls to close(),
+        which are ignored) on a closed stream should raise a ValueError.
+
+        IOBase (and its subclasses) support the iterator protocol, meaning
+        that an IOBase object can be iterated over yielding the lines in a
+        stream.
+
+        IOBase also supports the :keyword:`with` statement. In this example,
+        fp is closed after the suite of the with statement is complete:
+
+        with open('spam.txt', 'r') as fp:
+            fp.write('Spam and eggs!')
         """
 
-    def flush(self) -> None:
-        """Flush write buffers, if applicable.
+        def __iter__(self) -> Iterator[bytes]:
+            """Implement iter(self)."""
 
-        This is not implemented for read-only and non-blocking streams.
-        """
+        def __next__(self) -> bytes:
+            """Implement next(self)."""
 
-    def isatty(self) -> bool:
-        """Return whether this is an 'interactive' stream.
+        def __enter__(self) -> Self: ...
+        def __exit__(
+            self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
+        ) -> None: ...
+        def close(self) -> None:
+            """Flush and close the IO object.
 
-        Return False if it can't be determined.
-        """
+            This method has no effect if the file is already closed.
+            """
 
-    def readable(self) -> bool:
-        """Return whether object was opened for reading.
+        def fileno(self) -> int:
+            """Returns underlying file descriptor if one exists.
 
-        If False, read() will raise OSError.
-        """
-    read: Callable[..., Any]
-    def readlines(self, hint: int = -1, /) -> list[bytes]:
-        """Return a list of lines from the stream.
+            OSError is raised if the IO object does not use a file descriptor.
+            """
 
-        hint can be specified to control the number of lines read: no more
-        lines will be read if the total size (in bytes/characters) of all
-        lines so far exceeds hint.
-        """
+        def flush(self) -> None:
+            """Flush write buffers, if applicable.
 
-    def seek(self, offset: int, whence: int = 0, /) -> int:
-        """Change the stream position to the given byte offset.
+            This is not implemented for read-only and non-blocking streams.
+            """
 
-          offset
-            The stream position, relative to 'whence'.
-          whence
-            The relative position to seek from.
+        def isatty(self) -> bool:
+            """Return whether this is an 'interactive' stream.
 
-        The offset is interpreted relative to the position indicated by whence.
-        Values for whence are:
+            Return False if it can't be determined.
+            """
 
-        * os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive
-        * os.SEEK_CUR or 1 -- current stream position; offset may be negative
-        * os.SEEK_END or 2 -- end of stream; offset is usually negative
+        def readable(self) -> bool:
+            """Return whether object was opened for reading.
 
-        Return the new absolute position.
-        """
+            If False, read() will raise OSError.
+            """
+        read: Callable[..., Any]
+        def readlines(self, hint: int = -1, /) -> list[bytes]:
+            """Return a list of lines from the stream.
 
-    def seekable(self) -> bool:
-        """Return whether object supports random access.
+            hint can be specified to control the number of lines read: no more
+            lines will be read if the total size (in bytes/characters) of all
+            lines so far exceeds hint.
+            """
 
-        If False, seek(), tell() and truncate() will raise OSError.
-        This method may need to do a test seek().
-        """
+        def seek(self, offset: int, whence: int = 0, /) -> int:
+            """Change the stream position to the given byte offset.
 
-    def tell(self) -> int:
-        """Return current stream position."""
+              offset
+                The stream position, relative to 'whence'.
+              whence
+                The relative position to seek from.
 
-    def truncate(self, size: int | None = None, /) -> int:
-        """Truncate file to size bytes.
+            The offset is interpreted relative to the position indicated by whence.
+            Values for whence are:
 
-        File pointer is left unchanged. Size defaults to the current IO position
-        as reported by tell(). Return the new size.
-        """
+            * os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive
+            * os.SEEK_CUR or 1 -- current stream position; offset may be negative
+            * os.SEEK_END or 2 -- end of stream; offset is usually negative
 
-    def writable(self) -> bool:
-        """Return whether object was opened for writing.
+            Return the new absolute position.
+            """
 
-        If False, write() will raise OSError.
-        """
-    write: Callable[..., Any]
-    def writelines(self, lines: Iterable[ReadableBuffer], /) -> None:
-        """Write a list of lines to stream.
+        def seekable(self) -> bool:
+            """Return whether object supports random access.
 
-        Line separators are not added, so it is usual for each of the
-        lines provided to have a line separator at the end.
-        """
+            If False, seek(), tell() and truncate() will raise OSError.
+            This method may need to do a test seek().
+            """
 
-    def readline(self, size: int | None = -1, /) -> bytes:
-        """Read and return a line from the stream.
+        def tell(self) -> int:
+            """Return current stream position."""
 
-        If size is specified, at most size bytes will be read.
+        def truncate(self, size: int | None = None, /) -> int:
+            """Truncate file to size bytes.
 
-        The line terminator is always b'\\n' for binary files; for text
-        files, the newlines argument to open can be used to select the line
-        terminator(s) recognized.
-        """
+            File pointer is left unchanged.  Size defaults to the current IO
+            position as reported by tell().  Returns the new size.
+            """
 
-    def __del__(self) -> None:
-        """Called when the instance is about to be destroyed."""
+        def writable(self) -> bool:
+            """Return whether object was opened for writing.
 
-    @property
-    def closed(self) -> bool: ...
-    def _checkClosed(self) -> None: ...  # undocumented
+            If False, write() will raise OSError.
+            """
+        write: Callable[..., Any]
+        def writelines(self, lines: Iterable[ReadableBuffer], /) -> None:
+            """Write a list of lines to stream.
+
+            Line separators are not added, so it is usual for each of the
+            lines provided to have a line separator at the end.
+            """
+
+        def readline(self, size: int | None = -1, /) -> bytes:
+            """Read and return a line from the stream.
+
+            If size is specified, at most size bytes will be read.
+
+            The line terminator is always b'\\n' for binary files; for text
+            files, the newlines argument to open can be used to select the line
+            terminator(s) recognized.
+            """
+
+        def __del__(self) -> None: ...
+        @property
+        def closed(self) -> bool: ...
+        def _checkClosed(self) -> None: ...  # undocumented
 
 class _RawIOBase(_IOBase):
     """Base class for raw binary I/O."""
@@ -275,6 +424,7 @@ class _BufferedIOBase(_IOBase):
         A short result does not imply that EOF is imminent.
         """
 
+@disjoint_base
 class FileIO(RawIOBase, _RawIOBase, BinaryIO):  # type: ignore[misc]  # incompatible definitions of writelines in the base classes
     """Open a file.
 
@@ -328,6 +478,7 @@ class FileIO(RawIOBase, _RawIOBase, BinaryIO):  # type: ignore[misc]  # incompat
         bytes object at EOF.
         """
 
+@disjoint_base
 class BytesIO(BufferedIOBase, _BufferedIOBase, BinaryIO):  # type: ignore[misc]  # incompatible definitions of methods in the base classes
     """Buffered I/O implementation using an in-memory bytes buffer."""
 
@@ -395,15 +546,21 @@ class _BufferedReaderStream(Protocol):
 
 _BufferedReaderStreamT = TypeVar("_BufferedReaderStreamT", bound=_BufferedReaderStream, default=_BufferedReaderStream)
 
+@disjoint_base
 class BufferedReader(BufferedIOBase, _BufferedIOBase, BinaryIO, Generic[_BufferedReaderStreamT]):  # type: ignore[misc]  # incompatible definitions of methods in the base classes
     """Create a new buffered reader using the given readable raw IO object."""
 
     raw: _BufferedReaderStreamT
-    def __init__(self, raw: _BufferedReaderStreamT, buffer_size: int = 8192) -> None: ...
+    if sys.version_info >= (3, 14):
+        def __init__(self, raw: _BufferedReaderStreamT, buffer_size: int = 131072) -> None: ...
+    else:
+        def __init__(self, raw: _BufferedReaderStreamT, buffer_size: int = 8192) -> None: ...
+
     def peek(self, size: int = 0, /) -> bytes: ...
     def seek(self, target: int, whence: int = 0, /) -> int: ...
     def truncate(self, pos: int | None = None, /) -> int: ...
 
+@disjoint_base
 class BufferedWriter(BufferedIOBase, _BufferedIOBase, BinaryIO):  # type: ignore[misc]  # incompatible definitions of writelines in the base classes
     """A buffer for a writeable sequential RawIO object.
 
@@ -413,11 +570,16 @@ class BufferedWriter(BufferedIOBase, _BufferedIOBase, BinaryIO):  # type: ignore
     """
 
     raw: RawIOBase
-    def __init__(self, raw: RawIOBase, buffer_size: int = 8192) -> None: ...
+    if sys.version_info >= (3, 14):
+        def __init__(self, raw: RawIOBase, buffer_size: int = 131072) -> None: ...
+    else:
+        def __init__(self, raw: RawIOBase, buffer_size: int = 8192) -> None: ...
+
     def write(self, buffer: ReadableBuffer, /) -> int: ...
     def seek(self, target: int, whence: int = 0, /) -> int: ...
     def truncate(self, pos: int | None = None, /) -> int: ...
 
+@disjoint_base
 class BufferedRandom(BufferedIOBase, _BufferedIOBase, BinaryIO):  # type: ignore[misc]  # incompatible definitions of methods in the base classes
     """A buffered interface to random access streams.
 
@@ -429,11 +591,16 @@ class BufferedRandom(BufferedIOBase, _BufferedIOBase, BinaryIO):  # type: ignore
     mode: str
     name: Any
     raw: RawIOBase
-    def __init__(self, raw: RawIOBase, buffer_size: int = 8192) -> None: ...
+    if sys.version_info >= (3, 14):
+        def __init__(self, raw: RawIOBase, buffer_size: int = 131072) -> None: ...
+    else:
+        def __init__(self, raw: RawIOBase, buffer_size: int = 8192) -> None: ...
+
     def seek(self, target: int, whence: int = 0, /) -> int: ...  # stubtest needs this
     def peek(self, size: int = 0, /) -> bytes: ...
     def truncate(self, pos: int | None = None, /) -> int: ...
 
+@disjoint_base
 class BufferedRWPair(BufferedIOBase, _BufferedIOBase, Generic[_BufferedReaderStreamT]):
     """A buffered reader and writer object together.
 
@@ -446,7 +613,11 @@ class BufferedRWPair(BufferedIOBase, _BufferedIOBase, Generic[_BufferedReaderStr
     DEFAULT_BUFFER_SIZE.
     """
 
-    def __init__(self, reader: _BufferedReaderStreamT, writer: RawIOBase, buffer_size: int = 8192, /) -> None: ...
+    if sys.version_info >= (3, 14):
+        def __init__(self, reader: _BufferedReaderStreamT, writer: RawIOBase, buffer_size: int = 131072, /) -> None: ...
+    else:
+        def __init__(self, reader: _BufferedReaderStreamT, writer: RawIOBase, buffer_size: int = 8192, /) -> None: ...
+
     def peek(self, size: int = 0, /) -> bytes: ...
 
 class _TextIOBase(_IOBase):
@@ -533,6 +704,7 @@ class _WrappedBuffer(Protocol):
 
 _BufferT_co = TypeVar("_BufferT_co", bound=_WrappedBuffer, default=_WrappedBuffer, covariant=True)
 
+@disjoint_base
 class TextIOWrapper(TextIOBase, _TextIOBase, TextIO, Generic[_BufferT_co]):  # type: ignore[misc]  # incompatible definitions of write in the base classes
     """Character and line based layer over a BufferedIOBase object, buffer.
 
@@ -622,6 +794,7 @@ class TextIOWrapper(TextIOBase, _TextIOBase, TextIO, Generic[_BufferT_co]):  # t
 
     def truncate(self, pos: int | None = None, /) -> int: ...
 
+@disjoint_base
 class StringIO(TextIOBase, _TextIOBase, TextIO):  # type: ignore[misc]  # incompatible definitions of write in the base classes
     """Text I/O implementation using an in-memory buffer.
 
@@ -657,6 +830,7 @@ class StringIO(TextIOBase, _TextIOBase, TextIO):  # type: ignore[misc]  # incomp
         Returns the new absolute position.
         """
 
+@disjoint_base
 class IncrementalNewlineDecoder:
     """Codec used when reading a file in universal newlines mode.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_lsprof.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_lsprof.pyi
index 87281edf2f..ed6d52517b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_lsprof.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_lsprof.pyi
@@ -5,7 +5,9 @@ from _typeshed import structseq
 from collections.abc import Callable
 from types import CodeType
 from typing import Any, Final, final
+from typing_extensions import disjoint_base
 
+@disjoint_base
 class Profiler:
     """Build a profiler object using the specified timer function.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_lzma.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_lzma.pyi
index b3b9746cbd..dc41fd420f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_lzma.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_lzma.pyi
@@ -16,7 +16,7 @@ CHECK_CRC64: Final = 4
 CHECK_SHA256: Final = 10
 CHECK_ID_MAX: Final = 15
 CHECK_UNKNOWN: Final = 16
-FILTER_LZMA1: int  # v big number
+FILTER_LZMA1: Final[int]  # v big number
 FILTER_LZMA2: Final = 33
 FILTER_DELTA: Final = 3
 FILTER_X86: Final = 4
@@ -33,7 +33,7 @@ MF_BT4: Final = 20
 MODE_FAST: Final = 1
 MODE_NORMAL: Final = 2
 PRESET_DEFAULT: Final = 6
-PRESET_EXTREME: int  # v big number
+PRESET_EXTREME: Final[int]  # v big number
 
 @final
 class LZMADecompressor:
@@ -58,9 +58,9 @@ class LZMADecompressor:
     """
 
     if sys.version_info >= (3, 12):
-        def __new__(cls, format: int | None = ..., memlimit: int | None = ..., filters: _FilterChain | None = ...) -> Self: ...
+        def __new__(cls, format: int = 0, memlimit: int | None = None, filters: _FilterChain | None = None) -> Self: ...
     else:
-        def __init__(self, format: int | None = ..., memlimit: int | None = ..., filters: _FilterChain | None = ...) -> None: ...
+        def __init__(self, format: int = 0, memlimit: int | None = None, filters: _FilterChain | None = None) -> None: ...
 
     def decompress(self, data: ReadableBuffer, max_length: int = -1) -> bytes:
         """Decompress *data*, returning uncompressed data as bytes.
@@ -127,11 +127,11 @@ class LZMACompressor:
 
     if sys.version_info >= (3, 12):
         def __new__(
-            cls, format: int | None = ..., check: int = ..., preset: int | None = ..., filters: _FilterChain | None = ...
+            cls, format: int = 1, check: int = -1, preset: int | None = None, filters: _FilterChain | None = None
         ) -> Self: ...
     else:
         def __init__(
-            self, format: int | None = ..., check: int = ..., preset: int | None = ..., filters: _FilterChain | None = ...
+            self, format: int = 1, check: int = -1, preset: int | None = None, filters: _FilterChain | None = None
         ) -> None: ...
 
     def compress(self, data: ReadableBuffer, /) -> bytes:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_msi.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_msi.pyi
index b828147122..353942a529 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_msi.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_msi.pyi
@@ -1,7 +1,7 @@
 """Documentation"""
 
 import sys
-from typing import type_check_only
+from typing import Final, type_check_only
 
 if sys.platform == "win32":
     class MSIError(Exception): ...
@@ -81,42 +81,42 @@ if sys.platform == "win32":
         count
           the number of fields of the record
         """
-    MSICOLINFO_NAMES: int
-    MSICOLINFO_TYPES: int
-    MSIDBOPEN_CREATE: int
-    MSIDBOPEN_CREATEDIRECT: int
-    MSIDBOPEN_DIRECT: int
-    MSIDBOPEN_PATCHFILE: int
-    MSIDBOPEN_READONLY: int
-    MSIDBOPEN_TRANSACT: int
-    MSIMODIFY_ASSIGN: int
-    MSIMODIFY_DELETE: int
-    MSIMODIFY_INSERT: int
-    MSIMODIFY_INSERT_TEMPORARY: int
-    MSIMODIFY_MERGE: int
-    MSIMODIFY_REFRESH: int
-    MSIMODIFY_REPLACE: int
-    MSIMODIFY_SEEK: int
-    MSIMODIFY_UPDATE: int
-    MSIMODIFY_VALIDATE: int
-    MSIMODIFY_VALIDATE_DELETE: int
-    MSIMODIFY_VALIDATE_FIELD: int
-    MSIMODIFY_VALIDATE_NEW: int
+    MSICOLINFO_NAMES: Final[int]
+    MSICOLINFO_TYPES: Final[int]
+    MSIDBOPEN_CREATE: Final[int]
+    MSIDBOPEN_CREATEDIRECT: Final[int]
+    MSIDBOPEN_DIRECT: Final[int]
+    MSIDBOPEN_PATCHFILE: Final[int]
+    MSIDBOPEN_READONLY: Final[int]
+    MSIDBOPEN_TRANSACT: Final[int]
+    MSIMODIFY_ASSIGN: Final[int]
+    MSIMODIFY_DELETE: Final[int]
+    MSIMODIFY_INSERT: Final[int]
+    MSIMODIFY_INSERT_TEMPORARY: Final[int]
+    MSIMODIFY_MERGE: Final[int]
+    MSIMODIFY_REFRESH: Final[int]
+    MSIMODIFY_REPLACE: Final[int]
+    MSIMODIFY_SEEK: Final[int]
+    MSIMODIFY_UPDATE: Final[int]
+    MSIMODIFY_VALIDATE: Final[int]
+    MSIMODIFY_VALIDATE_DELETE: Final[int]
+    MSIMODIFY_VALIDATE_FIELD: Final[int]
+    MSIMODIFY_VALIDATE_NEW: Final[int]
 
-    PID_APPNAME: int
-    PID_AUTHOR: int
-    PID_CHARCOUNT: int
-    PID_CODEPAGE: int
-    PID_COMMENTS: int
-    PID_CREATE_DTM: int
-    PID_KEYWORDS: int
-    PID_LASTAUTHOR: int
-    PID_LASTPRINTED: int
-    PID_LASTSAVE_DTM: int
-    PID_PAGECOUNT: int
-    PID_REVNUMBER: int
-    PID_SECURITY: int
-    PID_SUBJECT: int
-    PID_TEMPLATE: int
-    PID_TITLE: int
-    PID_WORDCOUNT: int
+    PID_APPNAME: Final[int]
+    PID_AUTHOR: Final[int]
+    PID_CHARCOUNT: Final[int]
+    PID_CODEPAGE: Final[int]
+    PID_COMMENTS: Final[int]
+    PID_CREATE_DTM: Final[int]
+    PID_KEYWORDS: Final[int]
+    PID_LASTAUTHOR: Final[int]
+    PID_LASTPRINTED: Final[int]
+    PID_LASTSAVE_DTM: Final[int]
+    PID_PAGECOUNT: Final[int]
+    PID_REVNUMBER: Final[int]
+    PID_SECURITY: Final[int]
+    PID_SUBJECT: Final[int]
+    PID_TEMPLATE: Final[int]
+    PID_TITLE: Final[int]
+    PID_WORDCOUNT: Final[int]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_multibytecodec.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_multibytecodec.pyi
index 7e408f2aa3..abe58cb64f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_multibytecodec.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_multibytecodec.pyi
@@ -2,6 +2,7 @@ from _typeshed import ReadableBuffer
 from codecs import _ReadableStream, _WritableStream
 from collections.abc import Iterable
 from typing import final, type_check_only
+from typing_extensions import disjoint_base
 
 # This class is not exposed. It calls itself _multibytecodec.MultibyteCodec.
 @final
@@ -10,6 +11,7 @@ class _MultibyteCodec:
     def decode(self, input: ReadableBuffer, errors: str | None = None) -> str: ...
     def encode(self, input: str, errors: str | None = None) -> bytes: ...
 
+@disjoint_base
 class MultibyteIncrementalDecoder:
     errors: str
     def __init__(self, errors: str = "strict") -> None: ...
@@ -18,6 +20,7 @@ class MultibyteIncrementalDecoder:
     def reset(self) -> None: ...
     def setstate(self, state: tuple[bytes, int], /) -> None: ...
 
+@disjoint_base
 class MultibyteIncrementalEncoder:
     errors: str
     def __init__(self, errors: str = "strict") -> None: ...
@@ -26,6 +29,7 @@ class MultibyteIncrementalEncoder:
     def reset(self) -> None: ...
     def setstate(self, state: int, /) -> None: ...
 
+@disjoint_base
 class MultibyteStreamReader:
     errors: str
     stream: _ReadableStream
@@ -35,6 +39,7 @@ class MultibyteStreamReader:
     def readlines(self, sizehintobj: int | None = None, /) -> list[str]: ...
     def reset(self) -> None: ...
 
+@disjoint_base
 class MultibyteStreamWriter:
     errors: str
     stream: _WritableStream
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_pickle.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_pickle.pyi
index de25ab866c..9867a477a7 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_pickle.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_pickle.pyi
@@ -4,7 +4,7 @@ from _typeshed import ReadableBuffer, SupportsWrite
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from pickle import PickleBuffer as PickleBuffer
 from typing import Any, Protocol, type_check_only
-from typing_extensions import TypeAlias
+from typing_extensions import TypeAlias, disjoint_base
 
 @type_check_only
 class _ReadableFileobj(Protocol):
@@ -145,6 +145,7 @@ class PicklerMemoProxy:
     def clear(self, /) -> None: ...
     def copy(self, /) -> dict[int, tuple[int, Any]]: ...
 
+@disjoint_base
 class Pickler:
     """This takes a binary file for writing a pickle data stream.
 
@@ -212,6 +213,7 @@ class UnpicklerMemoProxy:
     def clear(self, /) -> None: ...
     def copy(self, /) -> dict[int, tuple[int, Any]]: ...
 
+@disjoint_base
 class Unpickler:
     """This takes a binary file for reading a pickle data stream.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_queue.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_queue.pyi
index 7c2d4c7400..2e78fd1d78 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_queue.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_queue.pyi
@@ -4,12 +4,14 @@ This module is an implementation detail, please do not use it directly.
 
 from types import GenericAlias
 from typing import Any, Generic, TypeVar
+from typing_extensions import disjoint_base
 
 _T = TypeVar("_T")
 
 class Empty(Exception):
     """Exception raised by Queue.get(block=0)/get_nowait()."""
 
+@disjoint_base
 class SimpleQueue(Generic[_T]):
     """Simple, unbounded, reentrant FIFO queue."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_random.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_random.pyi
index 3baf234edd..243de87f5a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_random.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_random.pyi
@@ -1,14 +1,20 @@
 """Module implements the Mersenne Twister random number generator."""
 
-from typing_extensions import TypeAlias
+import sys
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 # Actually Tuple[(int,) * 625]
 _State: TypeAlias = tuple[int, ...]
 
+@disjoint_base
 class Random:
     """Random() -> create a random number generator with its own internal state."""
 
-    def __init__(self, seed: object = ...) -> None: ...
+    if sys.version_info >= (3, 10):
+        def __init__(self, seed: object = ..., /) -> None: ...
+    else:
+        def __new__(self, seed: object = ..., /) -> Self: ...
+
     def seed(self, n: object = None, /) -> None:
         """seed([n]) -> None.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_socket.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_socket.pyi
index f5abc17748..fd99c122d0 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_socket.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_socket.pyi
@@ -8,7 +8,7 @@ from _typeshed import ReadableBuffer, WriteableBuffer
 from collections.abc import Iterable
 from socket import error as error, gaierror as gaierror, herror as herror, timeout as timeout
 from typing import Any, Final, SupportsIndex, overload
-from typing_extensions import CapsuleType, TypeAlias
+from typing_extensions import CapsuleType, TypeAlias, disjoint_base
 
 _CMSG: TypeAlias = tuple[int, int, bytes]
 _CMSGArg: TypeAlias = tuple[int, int, ReadableBuffer]
@@ -736,6 +736,7 @@ if sys.platform != "win32" and sys.platform != "darwin":
 
 # ===== Classes =====
 
+@disjoint_base
 class socket:
     """socket(family=AF_INET, type=SOCK_STREAM, proto=0) -> socket object
     socket(family=-1, type=-1, proto=-1, fileno=None) -> socket object
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_ssl.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_ssl.pyi
index d700e8f8c5..ca8fe20333 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_ssl.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_ssl.pyi
@@ -17,7 +17,7 @@ from ssl import (
     SSLZeroReturnError as SSLZeroReturnError,
 )
 from typing import Any, ClassVar, Final, Literal, TypedDict, final, overload, type_check_only
-from typing_extensions import NotRequired, Self, TypeAlias, deprecated
+from typing_extensions import NotRequired, Self, TypeAlias, deprecated, disjoint_base
 
 _PasswordType: TypeAlias = Callable[[], str | bytes | bytearray] | str | bytes | bytearray
 _PCTRTT: TypeAlias = tuple[tuple[str, str], ...]
@@ -117,6 +117,7 @@ def txt2obj(txt: str, name: bool = False) -> tuple[int, str, str, str]:
 def nid2obj(nid: int, /) -> tuple[int, str, str, str]:
     """Lookup NID, short name, long name and OID of an ASN1_OBJECT by NID."""
 
+@disjoint_base
 class _SSLContext:
     check_hostname: bool
     keylog_filename: str | None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_struct.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_struct.pyi
index 5bc790ef45..801e999a08 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_struct.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_struct.pyi
@@ -31,6 +31,7 @@ The variable struct.error is an exception raised on errors.
 from _typeshed import ReadableBuffer, WriteableBuffer
 from collections.abc import Iterator
 from typing import Any
+from typing_extensions import disjoint_base
 
 def pack(fmt: str | bytes, /, *v: Any) -> bytes:
     """pack(format, v1, v2, ...) -> bytes
@@ -76,6 +77,7 @@ def iter_unpack(format: str | bytes, buffer: ReadableBuffer, /) -> Iterator[tupl
 def calcsize(format: str | bytes, /) -> int:
     """Return size in bytes of the struct described by the format string."""
 
+@disjoint_base
 class Struct:
     """Struct(fmt) --> compiled struct object"""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_thread.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_thread.pyi
index 9fafbaaf2e..8b63cc7ca8 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_thread.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_thread.pyi
@@ -9,7 +9,7 @@ from collections.abc import Callable
 from threading import Thread
 from types import TracebackType
 from typing import Any, Final, NoReturn, final, overload
-from typing_extensions import TypeVarTuple, Unpack
+from typing_extensions import TypeVarTuple, Unpack, disjoint_base
 
 _Ts = TypeVarTuple("_Ts")
 
@@ -315,7 +315,7 @@ def stack_size(size: int = 0, /) -> int:
     the suggested approach in the absence of more specific information).
     """
 
-TIMEOUT_MAX: float
+TIMEOUT_MAX: Final[float]
 
 def get_native_id() -> int:  # only available on some platforms
     """Return a non-negative integer identifying the thread as reported
@@ -361,6 +361,7 @@ if sys.version_info >= (3, 14):
     def set_name(name: str) -> None:
         """Set the name of the current thread."""
 
+@disjoint_base
 class _local:
     """Thread-local data"""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_threading_local.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_threading_local.pyi
index 34f70e80bd..fcf88de1bb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_threading_local.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_threading_local.pyi
@@ -17,6 +17,7 @@ _LocalDict: TypeAlias = dict[Any, Any]
 class _localimpl:
     """A class managing thread-local dicts"""
 
+    __slots__ = ("key", "dicts", "localargs", "locallock", "__weakref__")
     key: str
     dicts: dict[int, tuple[ReferenceType[Any], _LocalDict]]
     # Keep localargs in sync with the *args, **kwargs annotation on local.__new__
@@ -31,6 +32,7 @@ class _localimpl:
         """Create a new dict for the current thread, and return it."""
 
 class local:
+    __slots__ = ("_local__impl", "__dict__")
     def __new__(cls, /, *args: Any, **kw: Any) -> Self: ...
     def __getattribute__(self, name: str) -> Any: ...
     def __setattr__(self, name: str, value: Any) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_tkinter.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_tkinter.pyi
index c0683e900c..37ccdc051e 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_tkinter.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_tkinter.pyi
@@ -57,34 +57,34 @@ _TkinterTraceFunc: TypeAlias = Callable[[tuple[str, ...]], object]
 @final
 class TkappType:
     # Please keep in sync with tkinter.Tk
-    def adderrorinfo(self, msg, /): ...
+    def adderrorinfo(self, msg: str, /): ...
     def call(self, command: Any, /, *args: Any) -> Any: ...
-    def createcommand(self, name, func, /): ...
+    def createcommand(self, name: str, func, /): ...
     if sys.platform != "win32":
-        def createfilehandler(self, file, mask, func, /): ...
-        def deletefilehandler(self, file, /): ...
+        def createfilehandler(self, file, mask: int, func, /): ...
+        def deletefilehandler(self, file, /) -> None: ...
 
-    def createtimerhandler(self, milliseconds, func, /): ...
-    def deletecommand(self, name, /): ...
+    def createtimerhandler(self, milliseconds: int, func, /): ...
+    def deletecommand(self, name: str, /): ...
     def dooneevent(self, flags: int = 0, /): ...
     def eval(self, script: str, /) -> str: ...
-    def evalfile(self, fileName, /): ...
-    def exprboolean(self, s, /): ...
-    def exprdouble(self, s, /): ...
-    def exprlong(self, s, /): ...
-    def exprstring(self, s, /): ...
-    def getboolean(self, arg, /): ...
-    def getdouble(self, arg, /): ...
-    def getint(self, arg, /): ...
+    def evalfile(self, fileName: str, /): ...
+    def exprboolean(self, s: str, /): ...
+    def exprdouble(self, s: str, /): ...
+    def exprlong(self, s: str, /): ...
+    def exprstring(self, s: str, /): ...
+    def getboolean(self, arg, /) -> bool: ...
+    def getdouble(self, arg, /) -> float: ...
+    def getint(self, arg, /) -> int: ...
     def getvar(self, *args, **kwargs): ...
     def globalgetvar(self, *args, **kwargs): ...
     def globalsetvar(self, *args, **kwargs): ...
     def globalunsetvar(self, *args, **kwargs): ...
     def interpaddr(self) -> int: ...
     def loadtk(self) -> None: ...
-    def mainloop(self, threshold: int = 0, /): ...
-    def quit(self): ...
-    def record(self, script, /): ...
+    def mainloop(self, threshold: int = 0, /) -> None: ...
+    def quit(self) -> None: ...
+    def record(self, script: str, /): ...
     def setvar(self, *ags, **kwargs): ...
     if sys.version_info < (3, 11):
         @deprecated("Deprecated since Python 3.9; removed in Python 3.11. Use `splitlist()` instead.")
@@ -93,7 +93,7 @@ class TkappType:
     def splitlist(self, arg, /): ...
     def unsetvar(self, *args, **kwargs): ...
     def wantobjects(self, *args, **kwargs): ...
-    def willdispatch(self): ...
+    def willdispatch(self) -> None: ...
     if sys.version_info >= (3, 12):
         def gettrace(self, /) -> _TkinterTraceFunc | None:
             """Get the tracing function."""
@@ -164,10 +164,10 @@ else:
           if not None, then pass -use to wish
         """
 
-def getbusywaitinterval():
+def getbusywaitinterval() -> int:
     """Return the current busy-wait interval between successive calls to Tcl_DoOneEvent in a threaded Python interpreter."""
 
-def setbusywaitinterval(new_val, /):
+def setbusywaitinterval(new_val: int, /) -> None:
     """Set the busy-wait interval in milliseconds between successive calls to Tcl_DoOneEvent in a threaded Python interpreter.
 
     It should be set to a divisor of the maximum time between frames in an animation.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_typeshed/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_typeshed/__init__.pyi
index 98a369dfc5..b786923880 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_typeshed/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_typeshed/__init__.pyi
@@ -3,7 +3,7 @@
 # See the README.md file in this directory for more information.
 
 import sys
-from collections.abc import Awaitable, Callable, Iterable, Sequence, Set as AbstractSet, Sized
+from collections.abc import Awaitable, Callable, Iterable, Iterator, Sequence, Set as AbstractSet, Sized
 from dataclasses import Field
 from os import PathLike
 from types import FrameType, TracebackType
@@ -54,7 +54,8 @@ Unused: TypeAlias = object  # stable
 
 # Marker for return types that include None, but where forcing the user to
 # check for None can be detrimental. Sometimes called "the Any trick". See
-# CONTRIBUTING.md for more information.
+# https://typing.python.org/en/latest/guides/writing_stubs.html#the-any-trick
+# for more information.
 MaybeNone: TypeAlias = Any  # stable
 
 # Used to mark arguments that default to a sentinel value. This prevents
@@ -141,6 +142,9 @@ class SupportsIter(Protocol[_T_co]):
 class SupportsAiter(Protocol[_T_co]):
     def __aiter__(self) -> _T_co: ...
 
+class SupportsLen(Protocol):
+    def __len__(self) -> int: ...
+
 class SupportsLenAndGetItem(Protocol[_T_co]):
     def __len__(self) -> int: ...
     def __getitem__(self, k: int, /) -> _T_co: ...
@@ -275,6 +279,16 @@ class SupportsWrite(Protocol[_T_contra]):
 class SupportsFlush(Protocol):
     def flush(self) -> object: ...
 
+# Suitable for dictionary view objects
+class Viewable(Protocol[_T_co]):
+    def __len__(self) -> int: ...
+    def __iter__(self) -> Iterator[_T_co]: ...
+
+class SupportsGetItemViewable(Protocol[_KT, _VT_co]):
+    def __len__(self) -> int: ...
+    def __iter__(self) -> Iterator[_KT]: ...
+    def __getitem__(self, key: _KT, /) -> _VT_co: ...
+
 # Unfortunately PEP 688 does not allow us to distinguish read-only
 # from writable buffers. We use these aliases for readability for now.
 # Perhaps a future extension of the buffer protocol will allow us to
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_warnings.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_warnings.pyi
index 10bb176ca9..10ab883367 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_warnings.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_warnings.pyi
@@ -60,9 +60,9 @@ def warn_explicit(
     filename: str,
     lineno: int,
     module: str | None = ...,
-    registry: dict[str | tuple[str, type[Warning], int], int] | None = ...,
-    module_globals: dict[str, Any] | None = ...,
-    source: Any | None = ...,
+    registry: dict[str | tuple[str, type[Warning], int], int] | None = None,
+    module_globals: dict[str, Any] | None = None,
+    source: Any | None = None,
 ) -> None:
     """Issue a warning, or maybe ignore it or raise an exception."""
 
@@ -72,8 +72,8 @@ def warn_explicit(
     category: Any,
     filename: str,
     lineno: int,
-    module: str | None = ...,
-    registry: dict[str | tuple[str, type[Warning], int], int] | None = ...,
-    module_globals: dict[str, Any] | None = ...,
-    source: Any | None = ...,
+    module: str | None = None,
+    registry: dict[str | tuple[str, type[Warning], int], int] | None = None,
+    module_globals: dict[str, Any] | None = None,
+    source: Any | None = None,
 ) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_winapi.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_winapi.pyi
index 14140f58a7..0880f7404b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_winapi.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_winapi.pyi
@@ -128,21 +128,21 @@ if sys.platform == "win32":
     WAIT_TIMEOUT: Final = 258
 
     if sys.version_info >= (3, 10):
-        LOCALE_NAME_INVARIANT: str
-        LOCALE_NAME_MAX_LENGTH: int
-        LOCALE_NAME_SYSTEM_DEFAULT: str
-        LOCALE_NAME_USER_DEFAULT: str | None
+        LOCALE_NAME_INVARIANT: Final[str]
+        LOCALE_NAME_MAX_LENGTH: Final[int]
+        LOCALE_NAME_SYSTEM_DEFAULT: Final[str]
+        LOCALE_NAME_USER_DEFAULT: Final[str | None]
 
-        LCMAP_FULLWIDTH: int
-        LCMAP_HALFWIDTH: int
-        LCMAP_HIRAGANA: int
-        LCMAP_KATAKANA: int
-        LCMAP_LINGUISTIC_CASING: int
-        LCMAP_LOWERCASE: int
-        LCMAP_SIMPLIFIED_CHINESE: int
-        LCMAP_TITLECASE: int
-        LCMAP_TRADITIONAL_CHINESE: int
-        LCMAP_UPPERCASE: int
+        LCMAP_FULLWIDTH: Final[int]
+        LCMAP_HALFWIDTH: Final[int]
+        LCMAP_HIRAGANA: Final[int]
+        LCMAP_KATAKANA: Final[int]
+        LCMAP_LINGUISTIC_CASING: Final[int]
+        LCMAP_LOWERCASE: Final[int]
+        LCMAP_SIMPLIFIED_CHINESE: Final[int]
+        LCMAP_TITLECASE: Final[int]
+        LCMAP_TRADITIONAL_CHINESE: Final[int]
+        LCMAP_UPPERCASE: Final[int]
 
     if sys.version_info >= (3, 12):
         COPYFILE2_CALLBACK_CHUNK_STARTED: Final = 1
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/_zstd.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/_zstd.pyi
index 2bfc6b6337..3d4413ed11 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/_zstd.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/_zstd.pyi
@@ -60,9 +60,9 @@ class ZstdCompressor:
     CONTINUE: Final = 0
     FLUSH_BLOCK: Final = 1
     FLUSH_FRAME: Final = 2
-    def __init__(
-        self, level: int | None = None, options: Mapping[int, int] | None = None, zstd_dict: ZstdDict | None = None
-    ) -> None: ...
+    def __new__(
+        cls, level: int | None = None, options: Mapping[int, int] | None = None, zstd_dict: ZstdDict | None = None
+    ) -> Self: ...
     def compress(
         self, /, data: ReadableBuffer, mode: _ZstdCompressorContinue | _ZstdCompressorFlushBlock | _ZstdCompressorFlushFrame = 0
     ) -> bytes:
@@ -126,7 +126,7 @@ class ZstdDecompressor:
     function instead.
     """
 
-    def __init__(self, zstd_dict: ZstdDict | None = None, options: Mapping[int, int] | None = None) -> None: ...
+    def __new__(cls, zstd_dict: ZstdDict | None = None, options: Mapping[int, int] | None = None) -> Self: ...
     def decompress(self, /, data: ReadableBuffer, max_length: int = -1) -> bytes:
         """Decompress *data*, returning uncompressed bytes if possible, or b'' otherwise.
 
@@ -188,7 +188,7 @@ class ZstdDict:
     by multiple ZstdCompressor or ZstdDecompressor objects.
     """
 
-    def __init__(self, dict_content: bytes, /, *, is_raw: bool = False) -> None: ...
+    def __new__(cls, dict_content: bytes, /, *, is_raw: bool = False) -> Self: ...
     def __len__(self, /) -> int:
         """Return len(self)."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/abc.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/abc.pyi
index 3a03460bb0..04202fae94 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/abc.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/abc.pyi
@@ -70,7 +70,7 @@ def abstractmethod(funcobj: _FuncT) -> _FuncT:
                 ...
     """
 
-@deprecated("Use 'classmethod' with 'abstractmethod' instead")
+@deprecated("Deprecated since Python 3.3. Use `@classmethod` stacked on top of `@abstractmethod` instead.")
 class abstractclassmethod(classmethod[_T, _P, _R_co]):
     """A decorator indicating abstract classmethods.
 
@@ -87,7 +87,7 @@ class abstractclassmethod(classmethod[_T, _P, _R_co]):
     __isabstractmethod__: Literal[True]
     def __init__(self, callable: Callable[Concatenate[type[_T], _P], _R_co]) -> None: ...
 
-@deprecated("Use 'staticmethod' with 'abstractmethod' instead")
+@deprecated("Deprecated since Python 3.3. Use `@staticmethod` stacked on top of `@abstractmethod` instead.")
 class abstractstaticmethod(staticmethod[_P, _R_co]):
     """A decorator indicating abstract staticmethods.
 
@@ -104,7 +104,7 @@ class abstractstaticmethod(staticmethod[_P, _R_co]):
     __isabstractmethod__: Literal[True]
     def __init__(self, callable: Callable[_P, _R_co]) -> None: ...
 
-@deprecated("Use 'property' with 'abstractmethod' instead")
+@deprecated("Deprecated since Python 3.3. Use `@property` stacked on top of `@abstractmethod` instead.")
 class abstractproperty(property):
     """A decorator indicating abstract properties.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/annotationlib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/annotationlib.pyi
index 31ab9be8af..685bd2ea86 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/annotationlib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/annotationlib.pyi
@@ -42,6 +42,20 @@ if sys.version_info >= (3, 14):
 
         """
 
+        __slots__ = (
+            "__forward_is_argument__",
+            "__forward_is_class__",
+            "__forward_module__",
+            "__weakref__",
+            "__arg__",
+            "__globals__",
+            "__extra_names__",
+            "__code__",
+            "__ast_node__",
+            "__cell__",
+            "__owner__",
+            "__stringifier_dict__",
+        )
         __forward_is_argument__: bool
         __forward_is_class__: bool
         __forward_module__: str | None
@@ -83,7 +97,7 @@ if sys.version_info >= (3, 14):
             owner: object = None,
             format: Format = Format.VALUE,  # noqa: Y011
         ) -> AnnotationForm: ...
-        @deprecated("Use ForwardRef.evaluate() or typing.evaluate_forward_ref() instead.")
+        @deprecated("Use `ForwardRef.evaluate()` or `typing.evaluate_forward_ref()` instead.")
         def _evaluate(
             self,
             globalns: dict[str, Any] | None,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/argparse.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/argparse.pyi
index 6d73c8ffcd..52ab6bbf01 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/argparse.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/argparse.pyi
@@ -260,7 +260,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
             exit_on_error: bool = True,
             *,
             suggest_on_error: bool = False,
-            color: bool = False,
+            color: bool = True,
         ) -> None: ...
     else:
         def __init__(
@@ -669,7 +669,7 @@ class Namespace(_AttributeHolder):
     __hash__: ClassVar[None]  # type: ignore[assignment]
 
 if sys.version_info >= (3, 14):
-    @deprecated("Deprecated in Python 3.14; Simply open files after parsing arguments")
+    @deprecated("Deprecated since Python 3.14. Open files after parsing arguments instead.")
     class FileType:
         """Deprecated factory for creating file object types
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/array.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/array.pyi
index 947cc6a1cc..a7b41229c9 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/array.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/array.pyi
@@ -9,7 +9,7 @@ from _typeshed import ReadableBuffer, SupportsRead, SupportsWrite
 from collections.abc import Iterable, MutableSequence
 from types import GenericAlias
 from typing import Any, ClassVar, Literal, SupportsIndex, TypeVar, overload
-from typing_extensions import Self, TypeAlias, deprecated
+from typing_extensions import Self, TypeAlias, deprecated, disjoint_base
 
 _IntTypeCode: TypeAlias = Literal["b", "B", "h", "H", "i", "I", "l", "L", "q", "Q"]
 _FloatTypeCode: TypeAlias = Literal["f", "d"]
@@ -23,6 +23,7 @@ _T = TypeVar("_T", int, float, str)
 
 typecodes: str
 
+@disjoint_base
 class array(MutableSequence[_T]):
     """array(typecode [, initializer]) -> array
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ast.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ast.pyi
index 0f66829027..d9ca52c7d6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ast.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ast.pyi
@@ -34,7 +34,7 @@ from _ast import (
 from _typeshed import ReadableBuffer, Unused
 from collections.abc import Iterable, Iterator, Sequence
 from typing import Any, ClassVar, Generic, Literal, TypedDict, TypeVar as _TypeVar, overload, type_check_only
-from typing_extensions import Self, Unpack, deprecated
+from typing_extensions import Self, Unpack, deprecated, disjoint_base
 
 if sys.version_info >= (3, 13):
     from _ast import PyCF_OPTIMIZED_AST as PyCF_OPTIMIZED_AST
@@ -53,17 +53,25 @@ class _Attributes(TypedDict, Generic[_EndPositionT], total=False):
 # The various AST classes are implemented in C, and imported from _ast at runtime,
 # but they consider themselves to live in the ast module,
 # so we'll define the stubs in this file.
-class AST:
-    if sys.version_info >= (3, 10):
+if sys.version_info >= (3, 12):
+    @disjoint_base
+    class AST:
         __match_args__ = ()
-    _attributes: ClassVar[tuple[str, ...]]
-    _fields: ClassVar[tuple[str, ...]]
-    if sys.version_info >= (3, 13):
-        _field_types: ClassVar[dict[str, Any]]
+        _attributes: ClassVar[tuple[str, ...]]
+        _fields: ClassVar[tuple[str, ...]]
+        if sys.version_info >= (3, 13):
+            _field_types: ClassVar[dict[str, Any]]
 
-    if sys.version_info >= (3, 14):
-        def __replace__(self) -> Self:
-            """Return a copy of the AST node with new values for the specified fields."""
+        if sys.version_info >= (3, 14):
+            def __replace__(self) -> Self:
+                """Return a copy of the AST node with new values for the specified fields."""
+
+else:
+    class AST:
+        if sys.version_info >= (3, 10):
+            __match_args__ = ()
+        _attributes: ClassVar[tuple[str, ...]]
+        _fields: ClassVar[tuple[str, ...]]
 
 class mod(AST):
     """mod = Module(stmt* body, type_ignore* type_ignores)
@@ -1332,20 +1340,20 @@ class Constant(expr):
     if sys.version_info < (3, 14):
         # Aliases for value, for backwards compatibility
         @property
-        @deprecated("Will be removed in Python 3.14. Use `value` instead.")
+        @deprecated("Removed in Python 3.14. Use `value` instead.")
         def n(self) -> _ConstantValue:
             """Deprecated. Use value instead."""
 
         @n.setter
-        @deprecated("Will be removed in Python 3.14. Use `value` instead.")
+        @deprecated("Removed in Python 3.14. Use `value` instead.")
         def n(self, value: _ConstantValue) -> None: ...
         @property
-        @deprecated("Will be removed in Python 3.14. Use `value` instead.")
+        @deprecated("Removed in Python 3.14. Use `value` instead.")
         def s(self) -> _ConstantValue:
             """Deprecated. Use value instead."""
 
         @s.setter
-        @deprecated("Will be removed in Python 3.14. Use `value` instead.")
+        @deprecated("Removed in Python 3.14. Use `value` instead.")
         def s(self, value: _ConstantValue) -> None: ...
 
     def __init__(self, value: _ConstantValue, kind: str | None = None, **kwargs: Unpack[_Attributes]) -> None: ...
@@ -1467,7 +1475,7 @@ class Slice(expr):
         ) -> Self:
             """Return a copy of the AST node with new values for the specified fields."""
 
-@deprecated("Deprecated since Python 3.9. Use ast.Tuple instead.")
+@deprecated("Deprecated since Python 3.9. Use `ast.Tuple` instead.")
 class ExtSlice(slice):
     """Deprecated AST node class. Use ast.Tuple instead."""
 
@@ -2134,31 +2142,31 @@ else:
         def __init__(cls, *args: Unused) -> None: ...
 
 if sys.version_info < (3, 14):
-    @deprecated("Replaced by ast.Constant; removed in Python 3.14")
+    @deprecated("Removed in Python 3.14. Use `ast.Constant` instead.")
     class Num(Constant, metaclass=_ABC):
         """Deprecated AST node class. Use ast.Constant instead"""
 
         def __new__(cls, n: complex, **kwargs: Unpack[_Attributes]) -> Constant: ...  # type: ignore[misc]  # pyright: ignore[reportInconsistentConstructor]
 
-    @deprecated("Replaced by ast.Constant; removed in Python 3.14")
+    @deprecated("Removed in Python 3.14. Use `ast.Constant` instead.")
     class Str(Constant, metaclass=_ABC):
         """Deprecated AST node class. Use ast.Constant instead"""
 
         def __new__(cls, s: str, **kwargs: Unpack[_Attributes]) -> Constant: ...  # type: ignore[misc]  # pyright: ignore[reportInconsistentConstructor]
 
-    @deprecated("Replaced by ast.Constant; removed in Python 3.14")
+    @deprecated("Removed in Python 3.14. Use `ast.Constant` instead.")
     class Bytes(Constant, metaclass=_ABC):
         """Deprecated AST node class. Use ast.Constant instead"""
 
         def __new__(cls, s: bytes, **kwargs: Unpack[_Attributes]) -> Constant: ...  # type: ignore[misc]  # pyright: ignore[reportInconsistentConstructor]
 
-    @deprecated("Replaced by ast.Constant; removed in Python 3.14")
+    @deprecated("Removed in Python 3.14. Use `ast.Constant` instead.")
     class NameConstant(Constant, metaclass=_ABC):
         """Deprecated AST node class. Use ast.Constant instead"""
 
         def __new__(cls, value: _ConstantValue, kind: str | None, **kwargs: Unpack[_Attributes]) -> Constant: ...  # type: ignore[misc]  # pyright: ignore[reportInconsistentConstructor]
 
-    @deprecated("Replaced by ast.Constant; removed in Python 3.14")
+    @deprecated("Removed in Python 3.14. Use `ast.Constant` instead.")
     class Ellipsis(Constant, metaclass=_ABC):
         """Deprecated AST node class. Use ast.Constant instead"""
 
@@ -2171,14 +2179,14 @@ _T = _TypeVar("_T", bound=AST)
 if sys.version_info >= (3, 13):
     @overload
     def parse(
-        source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
-        mode: Literal["exec"] = "exec",
+        source: _T,
+        filename: str | bytes | os.PathLike[Any] = "<unknown>",
+        mode: Literal["exec", "eval", "func_type", "single"] = "exec",
         *,
         type_comments: bool = False,
         feature_version: None | int | tuple[int, int] = None,
         optimize: Literal[-1, 0, 1, 2] = -1,
-    ) -> Module:
+    ) -> _T:
         """
         Parse the source into an AST node.
         Equivalent to compile(source, filename, mode, PyCF_ONLY_AST).
@@ -2188,7 +2196,17 @@ if sys.version_info >= (3, 13):
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any],
+        filename: str | bytes | os.PathLike[Any] = "<unknown>",
+        mode: Literal["exec"] = "exec",
+        *,
+        type_comments: bool = False,
+        feature_version: None | int | tuple[int, int] = None,
+        optimize: Literal[-1, 0, 1, 2] = -1,
+    ) -> Module: ...
+    @overload
+    def parse(
+        source: str | ReadableBuffer,
+        filename: str | bytes | os.PathLike[Any],
         mode: Literal["eval"],
         *,
         type_comments: bool = False,
@@ -2198,7 +2216,7 @@ if sys.version_info >= (3, 13):
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any],
+        filename: str | bytes | os.PathLike[Any],
         mode: Literal["func_type"],
         *,
         type_comments: bool = False,
@@ -2208,7 +2226,7 @@ if sys.version_info >= (3, 13):
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any],
+        filename: str | bytes | os.PathLike[Any],
         mode: Literal["single"],
         *,
         type_comments: bool = False,
@@ -2245,7 +2263,7 @@ if sys.version_info >= (3, 13):
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
+        filename: str | bytes | os.PathLike[Any] = "<unknown>",
         mode: str = "exec",
         *,
         type_comments: bool = False,
@@ -2256,13 +2274,13 @@ if sys.version_info >= (3, 13):
 else:
     @overload
     def parse(
-        source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
-        mode: Literal["exec"] = "exec",
+        source: _T,
+        filename: str | bytes | os.PathLike[Any] = "<unknown>",
+        mode: Literal["exec", "eval", "func_type", "single"] = "exec",
         *,
         type_comments: bool = False,
         feature_version: None | int | tuple[int, int] = None,
-    ) -> Module:
+    ) -> _T:
         """
         Parse the source into an AST node.
         Equivalent to compile(source, filename, mode, PyCF_ONLY_AST).
@@ -2272,7 +2290,16 @@ else:
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any],
+        filename: str | bytes | os.PathLike[Any] = "<unknown>",
+        mode: Literal["exec"] = "exec",
+        *,
+        type_comments: bool = False,
+        feature_version: None | int | tuple[int, int] = None,
+    ) -> Module: ...
+    @overload
+    def parse(
+        source: str | ReadableBuffer,
+        filename: str | bytes | os.PathLike[Any],
         mode: Literal["eval"],
         *,
         type_comments: bool = False,
@@ -2281,7 +2308,7 @@ else:
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any],
+        filename: str | bytes | os.PathLike[Any],
         mode: Literal["func_type"],
         *,
         type_comments: bool = False,
@@ -2290,7 +2317,7 @@ else:
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any],
+        filename: str | bytes | os.PathLike[Any],
         mode: Literal["single"],
         *,
         type_comments: bool = False,
@@ -2323,7 +2350,7 @@ else:
     @overload
     def parse(
         source: str | ReadableBuffer,
-        filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
+        filename: str | bytes | os.PathLike[Any] = "<unknown>",
         mode: str = "exec",
         *,
         type_comments: bool = False,
@@ -2605,15 +2632,15 @@ class NodeVisitor:
     def visit_Param(self, node: Param) -> Any: ...
 
     if sys.version_info < (3, 14):
-        @deprecated("Replaced by visit_Constant; removed in Python 3.14")
+        @deprecated("Removed in Python 3.14. Use `visit_Constant` instead.")
         def visit_Num(self, node: Num) -> Any: ...  # type: ignore[deprecated]
-        @deprecated("Replaced by visit_Constant; removed in Python 3.14")
+        @deprecated("Removed in Python 3.14. Use `visit_Constant` instead.")
         def visit_Str(self, node: Str) -> Any: ...  # type: ignore[deprecated]
-        @deprecated("Replaced by visit_Constant; removed in Python 3.14")
+        @deprecated("Removed in Python 3.14. Use `visit_Constant` instead.")
         def visit_Bytes(self, node: Bytes) -> Any: ...  # type: ignore[deprecated]
-        @deprecated("Replaced by visit_Constant; removed in Python 3.14")
+        @deprecated("Removed in Python 3.14. Use `visit_Constant` instead.")
         def visit_NameConstant(self, node: NameConstant) -> Any: ...  # type: ignore[deprecated]
-        @deprecated("Replaced by visit_Constant; removed in Python 3.14")
+        @deprecated("Removed in Python 3.14. Use `visit_Constant` instead.")
         def visit_Ellipsis(self, node: Ellipsis) -> Any: ...  # type: ignore[deprecated]
 
 class NodeTransformer(NodeVisitor):
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/base_events.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/base_events.pyi
index 8d9543fcca..82ab82d7c5 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/base_events.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/base_events.pyi
@@ -25,7 +25,7 @@ from asyncio.transports import BaseTransport, DatagramTransport, ReadTransport,
 from collections.abc import Callable, Iterable, Sequence
 from concurrent.futures import Executor, ThreadPoolExecutor
 from contextvars import Context
-from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket
+from socket import AddressFamily, AddressInfo, SocketKind, _Address, _RetAddress, socket
 from typing import IO, Any, Literal, TypeVar, overload
 from typing_extensions import TypeAlias, TypeVarTuple, Unpack
 
@@ -392,8 +392,8 @@ class BaseEventLoop(AbstractEventLoop):
             host: str | Sequence[str] | None = None,
             port: int = ...,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = 0,
+            flags: int = 1,
             sock: None = None,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -427,8 +427,8 @@ class BaseEventLoop(AbstractEventLoop):
             host: None = None,
             port: None = None,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = 0,
+            flags: int = 1,
             sock: socket = ...,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -447,8 +447,8 @@ class BaseEventLoop(AbstractEventLoop):
             host: str | Sequence[str] | None = None,
             port: int = ...,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: None = None,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -481,8 +481,8 @@ class BaseEventLoop(AbstractEventLoop):
             host: None = None,
             port: None = None,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: socket = ...,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -500,8 +500,8 @@ class BaseEventLoop(AbstractEventLoop):
             host: str | Sequence[str] | None = None,
             port: int = ...,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: None = None,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -533,8 +533,8 @@ class BaseEventLoop(AbstractEventLoop):
             host: None = None,
             port: None = None,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: socket = ...,
             backlog: int = 100,
             ssl: _SSLContext = None,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/events.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/events.pyi
index de3e1dec92..10d72b8fa8 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/events.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/events.pyi
@@ -13,7 +13,7 @@ from abc import ABCMeta, abstractmethod
 from collections.abc import Callable, Sequence
 from concurrent.futures import Executor
 from contextvars import Context
-from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket
+from socket import AddressFamily, AddressInfo, SocketKind, _Address, _RetAddress, socket
 from typing import IO, Any, Literal, Protocol, TypeVar, overload, type_check_only
 from typing_extensions import Self, TypeAlias, TypeVarTuple, Unpack, deprecated
 
@@ -77,6 +77,7 @@ class _TaskFactory(Protocol):
 class Handle:
     """Object returned by callback registration methods."""
 
+    __slots__ = ("_callback", "_args", "_cancelled", "_loop", "_source_traceback", "_repr", "__weakref__", "_context")
     _cancelled: bool
     _args: Sequence[Any]
     def __init__(
@@ -91,6 +92,7 @@ class Handle:
 class TimerHandle(Handle):
     """Object returned by timed callback registration methods."""
 
+    __slots__ = ["_scheduled", "_when"]
     def __init__(
         self,
         when: float,
@@ -350,8 +352,8 @@ class AbstractEventLoop:
             host: str | Sequence[str] | None = None,
             port: int = ...,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: None = None,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -422,8 +424,8 @@ class AbstractEventLoop:
             host: None = None,
             port: None = None,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: socket = ...,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -443,8 +445,8 @@ class AbstractEventLoop:
             host: str | Sequence[str] | None = None,
             port: int = ...,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: None = None,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -511,8 +513,8 @@ class AbstractEventLoop:
             host: None = None,
             port: None = None,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: socket = ...,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -531,8 +533,8 @@ class AbstractEventLoop:
             host: str | Sequence[str] | None = None,
             port: int = ...,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: None = None,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -594,8 +596,8 @@ class AbstractEventLoop:
             host: None = None,
             port: None = None,
             *,
-            family: int = ...,
-            flags: int = ...,
+            family: int = AddressFamily.AF_UNSPEC,
+            flags: int = AddressInfo.AI_PASSIVE,
             sock: socket = ...,
             backlog: int = 100,
             ssl: _SSLContext = None,
@@ -870,7 +872,7 @@ class AbstractEventLoop:
         bufsize: Literal[0] = 0,
         encoding: None = None,
         errors: None = None,
-        text: Literal[False] | None = ...,
+        text: Literal[False] | None = None,
         **kwargs: Any,
     ) -> tuple[SubprocessTransport, _ProtocolT]: ...
     @abstractmethod
@@ -937,41 +939,48 @@ class AbstractEventLoop:
     async def shutdown_default_executor(self) -> None:
         """Schedule the shutdown of the default executor."""
 
-# This class does not exist at runtime, but stubtest complains if it's marked as
-# @type_check_only because it has an alias that does exist at runtime. See mypy#19568.
-# @type_check_only
-class _AbstractEventLoopPolicy:
-    """Abstract policy for accessing the event loop."""
+if sys.version_info >= (3, 14):
+    class _AbstractEventLoopPolicy:
+        """Abstract policy for accessing the event loop."""
 
-    @abstractmethod
-    def get_event_loop(self) -> AbstractEventLoop:
-        """Get the event loop for the current context.
+        @abstractmethod
+        def get_event_loop(self) -> AbstractEventLoop:
+            """Get the event loop for the current context.
 
-        Returns an event loop object implementing the AbstractEventLoop interface,
-        or raises an exception in case no event loop has been set for the
-        current context and the current policy does not specify to create one.
+            Returns an event loop object implementing the AbstractEventLoop interface,
+            or raises an exception in case no event loop has been set for the
+            current context and the current policy does not specify to create one.
 
-        It should never return None.
-        """
+            It should never return None.
+            """
 
-    @abstractmethod
-    def set_event_loop(self, loop: AbstractEventLoop | None) -> None:
-        """Set the event loop for the current context to loop."""
+        @abstractmethod
+        def set_event_loop(self, loop: AbstractEventLoop | None) -> None:
+            """Set the event loop for the current context to loop."""
 
-    @abstractmethod
-    def new_event_loop(self) -> AbstractEventLoop:
-        """Create and return a new event loop object according to this
-        policy's rules. If there's need to set this loop as the event loop for
-        the current context, set_event_loop must be called explicitly.
-        """
-    # Child processes handling (Unix only).
-    if sys.version_info < (3, 14):
+        @abstractmethod
+        def new_event_loop(self) -> AbstractEventLoop:
+            """Create and return a new event loop object according to this
+            policy's rules. If there's need to set this loop as the event loop for
+            the current context, set_event_loop must be called explicitly.
+            """
+
+else:
+    @type_check_only
+    class _AbstractEventLoopPolicy:
+        @abstractmethod
+        def get_event_loop(self) -> AbstractEventLoop: ...
+        @abstractmethod
+        def set_event_loop(self, loop: AbstractEventLoop | None) -> None: ...
+        @abstractmethod
+        def new_event_loop(self) -> AbstractEventLoop: ...
+        # Child processes handling (Unix only).
         if sys.version_info >= (3, 12):
             @abstractmethod
-            @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+            @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
             def get_child_watcher(self) -> AbstractChildWatcher: ...
             @abstractmethod
-            @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+            @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
             def set_child_watcher(self, watcher: AbstractChildWatcher) -> None: ...
         else:
             @abstractmethod
@@ -979,7 +988,6 @@ class _AbstractEventLoopPolicy:
             @abstractmethod
             def set_child_watcher(self, watcher: AbstractChildWatcher) -> None: ...
 
-if sys.version_info < (3, 14):
     AbstractEventLoopPolicy = _AbstractEventLoopPolicy
 
 if sys.version_info >= (3, 14):
@@ -1052,9 +1060,9 @@ if sys.version_info >= (3, 14):
         If policy is None, the default policy is restored.
         """
 
-    @deprecated("Deprecated as of Python 3.14; will be removed in Python 3.16")
+    @deprecated("Deprecated since Python 3.14; will be removed in Python 3.16.")
     def get_event_loop_policy() -> _AbstractEventLoopPolicy: ...
-    @deprecated("Deprecated as of Python 3.14; will be removed in Python 3.16")
+    @deprecated("Deprecated since Python 3.14; will be removed in Python 3.16.")
     def set_event_loop_policy(policy: _AbstractEventLoopPolicy | None) -> None: ...
 
 else:
@@ -1075,11 +1083,11 @@ def new_event_loop() -> AbstractEventLoop:
 
 if sys.version_info < (3, 14):
     if sys.version_info >= (3, 12):
-        @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+        @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
         def get_child_watcher() -> AbstractChildWatcher:
             """Equivalent to calling get_event_loop_policy().get_child_watcher()."""
 
-        @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+        @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
         def set_child_watcher(watcher: AbstractChildWatcher) -> None:
             """Equivalent to calling
             get_event_loop_policy().set_child_watcher(watcher).
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/graph.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/graph.pyi
index 7266d6a7a7..2b9fb15f4f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/graph.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/graph.pyi
@@ -1,72 +1,74 @@
 """Introspection utils for tasks call graphs."""
 
+import sys
 from _typeshed import SupportsWrite
 from asyncio import Future
 from dataclasses import dataclass
 from types import FrameType
 from typing import Any, overload
 
-__all__ = ("capture_call_graph", "format_call_graph", "print_call_graph", "FrameCallGraphEntry", "FutureCallGraph")
+if sys.version_info >= (3, 14):
+    __all__ = ("capture_call_graph", "format_call_graph", "print_call_graph", "FrameCallGraphEntry", "FutureCallGraph")
 
-@dataclass(frozen=True)
-class FrameCallGraphEntry:
-    """FrameCallGraphEntry(frame: frame)"""
+    @dataclass(frozen=True, slots=True)
+    class FrameCallGraphEntry:
+        """FrameCallGraphEntry(frame: frame)"""
 
-    frame: FrameType
+        frame: FrameType
 
-@dataclass(frozen=True)
-class FutureCallGraph:
-    """FutureCallGraph(future: _asyncio.Future, call_stack: tuple['FrameCallGraphEntry', ...], awaited_by: tuple['FutureCallGraph', ...])"""
+    @dataclass(frozen=True, slots=True)
+    class FutureCallGraph:
+        """FutureCallGraph(future: _asyncio.Future, call_stack: tuple['FrameCallGraphEntry', ...], awaited_by: tuple['FutureCallGraph', ...])"""
 
-    future: Future[Any]
-    call_stack: tuple[FrameCallGraphEntry, ...]
-    awaited_by: tuple[FutureCallGraph, ...]
+        future: Future[Any]
+        call_stack: tuple[FrameCallGraphEntry, ...]
+        awaited_by: tuple[FutureCallGraph, ...]
 
-@overload
-def capture_call_graph(future: None = None, /, *, depth: int = 1, limit: int | None = None) -> FutureCallGraph | None:
-    """Capture the async call graph for the current task or the provided Future.
+    @overload
+    def capture_call_graph(future: None = None, /, *, depth: int = 1, limit: int | None = None) -> FutureCallGraph | None:
+        """Capture the async call graph for the current task or the provided Future.
 
-    The graph is represented with three data structures:
+        The graph is represented with three data structures:
 
-    * FutureCallGraph(future, call_stack, awaited_by)
+        * FutureCallGraph(future, call_stack, awaited_by)
 
-      Where 'future' is an instance of asyncio.Future or asyncio.Task.
+          Where 'future' is an instance of asyncio.Future or asyncio.Task.
 
-      'call_stack' is a tuple of FrameGraphEntry objects.
+          'call_stack' is a tuple of FrameGraphEntry objects.
 
-      'awaited_by' is a tuple of FutureCallGraph objects.
+          'awaited_by' is a tuple of FutureCallGraph objects.
 
-    * FrameCallGraphEntry(frame)
+        * FrameCallGraphEntry(frame)
 
-      Where 'frame' is a frame object of a regular Python function
-      in the call stack.
+          Where 'frame' is a frame object of a regular Python function
+          in the call stack.
 
-    Receives an optional 'future' argument. If not passed,
-    the current task will be used. If there's no current task, the function
-    returns None.
+        Receives an optional 'future' argument. If not passed,
+        the current task will be used. If there's no current task, the function
+        returns None.
 
-    If "capture_call_graph()" is introspecting *the current task*, the
-    optional keyword-only 'depth' argument can be used to skip the specified
-    number of frames from top of the stack.
+        If "capture_call_graph()" is introspecting *the current task*, the
+        optional keyword-only 'depth' argument can be used to skip the specified
+        number of frames from top of the stack.
 
-    If the optional keyword-only 'limit' argument is provided, each call stack
-    in the resulting graph is truncated to include at most ``abs(limit)``
-    entries. If 'limit' is positive, the entries left are the closest to
-    the invocation point. If 'limit' is negative, the topmost entries are
-    left. If 'limit' is omitted or None, all entries are present.
-    If 'limit' is 0, the call stack is not captured at all, only
-    "awaited by" information is present.
-    """
+        If the optional keyword-only 'limit' argument is provided, each call stack
+        in the resulting graph is truncated to include at most ``abs(limit)``
+        entries. If 'limit' is positive, the entries left are the closest to
+        the invocation point. If 'limit' is negative, the topmost entries are
+        left. If 'limit' is omitted or None, all entries are present.
+        If 'limit' is 0, the call stack is not captured at all, only
+        "awaited by" information is present.
+        """
 
-@overload
-def capture_call_graph(future: Future[Any], /, *, depth: int = 1, limit: int | None = None) -> FutureCallGraph | None: ...
-def format_call_graph(future: Future[Any] | None = None, /, *, depth: int = 1, limit: int | None = None) -> str:
-    """Return the async call graph as a string for `future`.
+    @overload
+    def capture_call_graph(future: Future[Any], /, *, depth: int = 1, limit: int | None = None) -> FutureCallGraph | None: ...
+    def format_call_graph(future: Future[Any] | None = None, /, *, depth: int = 1, limit: int | None = None) -> str:
+        """Return the async call graph as a string for `future`.
 
-    If `future` is not provided, format the call graph for the current task.
-    """
+        If `future` is not provided, format the call graph for the current task.
+        """
 
-def print_call_graph(
-    future: Future[Any] | None = None, /, *, file: SupportsWrite[str] | None = None, depth: int = 1, limit: int | None = None
-) -> None:
-    """Print the async call graph for the current task or the provided Future."""
+    def print_call_graph(
+        future: Future[Any] | None = None, /, *, file: SupportsWrite[str] | None = None, depth: int = 1, limit: int | None = None
+    ) -> None:
+        """Print the async call graph for the current task or the provided Future."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/protocols.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/protocols.pyi
index c5833d683e..bd2e9c1118 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/protocols.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/protocols.pyi
@@ -17,6 +17,7 @@ class BaseProtocol:
     write-only transport like write pipe
     """
 
+    __slots__ = ()
     def connection_made(self, transport: transports.BaseTransport) -> None:
         """Called when a connection is made.
 
@@ -87,6 +88,8 @@ class Protocol(BaseProtocol):
     * CL: connection_lost()
     """
 
+    # Need annotation or mypy will complain about 'Cannot determine type of "__slots__" in base class'
+    __slots__: tuple[()] = ()
     def data_received(self, data: bytes) -> None:
         """Called when some data is received.
 
@@ -125,6 +128,7 @@ class BufferedProtocol(BaseProtocol):
     * CL: connection_lost()
     """
 
+    __slots__ = ()
     def get_buffer(self, sizehint: int) -> ReadableBuffer:
         """Called to allocate a new receive buffer.
 
@@ -154,6 +158,7 @@ class BufferedProtocol(BaseProtocol):
 class DatagramProtocol(BaseProtocol):
     """Interface for datagram protocol."""
 
+    __slots__ = ()
     def connection_made(self, transport: transports.DatagramTransport) -> None:  # type: ignore[override]
         """Called when a connection is made.
 
@@ -177,6 +182,7 @@ class DatagramProtocol(BaseProtocol):
 class SubprocessProtocol(BaseProtocol):
     """Interface for protocol for subprocess calls."""
 
+    __slots__: tuple[()] = ()
     def pipe_data_received(self, fd: int, data: bytes) -> None:
         """Called when the subprocess writes data into stdout/stderr pipe.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/runners.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/runners.pyi
index 1b7a4d4894..25698e14a6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/runners.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/runners.pyi
@@ -56,7 +56,7 @@ if sys.version_info >= (3, 11):
 
 if sys.version_info >= (3, 12):
     def run(
-        main: Coroutine[Any, Any, _T], *, debug: bool | None = ..., loop_factory: Callable[[], AbstractEventLoop] | None = ...
+        main: Coroutine[Any, Any, _T], *, debug: bool | None = None, loop_factory: Callable[[], AbstractEventLoop] | None = None
     ) -> _T:
         """Execute the coroutine and return the result.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/streams.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/streams.pyi
index 7c145f01cb..968a5d08ee 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/streams.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/streams.pyi
@@ -34,7 +34,7 @@ if sys.version_info >= (3, 10):
         port: int | str | None = None,
         *,
         limit: int = 65536,
-        ssl_handshake_timeout: float | None = ...,
+        ssl_handshake_timeout: float | None = None,
         **kwds: Any,
     ) -> tuple[StreamReader, StreamWriter]:
         """A wrapper for create_connection() returning a (reader, writer) pair.
@@ -61,7 +61,7 @@ if sys.version_info >= (3, 10):
         port: int | str | None = None,
         *,
         limit: int = 65536,
-        ssl_handshake_timeout: float | None = ...,
+        ssl_handshake_timeout: float | None = None,
         **kwds: Any,
     ) -> Server:
         """Start a socket server, call back for each client connected.
@@ -92,7 +92,7 @@ else:
         *,
         loop: events.AbstractEventLoop | None = None,
         limit: int = 65536,
-        ssl_handshake_timeout: float | None = ...,
+        ssl_handshake_timeout: float | None = None,
         **kwds: Any,
     ) -> tuple[StreamReader, StreamWriter]:
         """A wrapper for create_connection() returning a (reader, writer) pair.
@@ -120,7 +120,7 @@ else:
         *,
         loop: events.AbstractEventLoop | None = None,
         limit: int = 65536,
-        ssl_handshake_timeout: float | None = ...,
+        ssl_handshake_timeout: float | None = None,
         **kwds: Any,
     ) -> Server:
         """Start a socket server, call back for each client connected.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/subprocess.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/subprocess.pyi
index c870fc1ef0..b82f0ba4ea 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/subprocess.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/subprocess.pyi
@@ -64,7 +64,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         group: None | str | int = None,
         extra_groups: None | Collection[str | int] = None,
         user: None | str | int = None,
@@ -96,7 +96,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         group: None | str | int = None,
         extra_groups: None | Collection[str | int] = None,
         user: None | str | int = None,
@@ -130,7 +130,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         group: None | str | int = None,
         extra_groups: None | Collection[str | int] = None,
         user: None | str | int = None,
@@ -161,7 +161,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         group: None | str | int = None,
         extra_groups: None | Collection[str | int] = None,
         user: None | str | int = None,
@@ -195,7 +195,7 @@ else:  # >= 3.9
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         group: None | str | int = None,
         extra_groups: None | Collection[str | int] = None,
         user: None | str | int = None,
@@ -226,7 +226,7 @@ else:  # >= 3.9
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         group: None | str | int = None,
         extra_groups: None | Collection[str | int] = None,
         user: None | str | int = None,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tasks.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tasks.pyi
index ebe927041a..61563b419a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tasks.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tasks.pyi
@@ -10,7 +10,7 @@ from _asyncio import (
     _unregister_task as _unregister_task,
 )
 from collections.abc import AsyncIterator, Awaitable, Coroutine, Generator, Iterable, Iterator
-from typing import Any, Literal, Protocol, TypeVar, overload, type_check_only
+from typing import Any, Final, Literal, Protocol, TypeVar, overload, type_check_only
 from typing_extensions import TypeAlias
 
 from . import _CoroutineLike
@@ -84,9 +84,9 @@ else:
 
 _TaskYieldType: TypeAlias = Future[object] | None
 
-FIRST_COMPLETED = concurrent.futures.FIRST_COMPLETED
-FIRST_EXCEPTION = concurrent.futures.FIRST_EXCEPTION
-ALL_COMPLETED = concurrent.futures.ALL_COMPLETED
+FIRST_COMPLETED: Final = concurrent.futures.FIRST_COMPLETED
+FIRST_EXCEPTION: Final = concurrent.futures.FIRST_EXCEPTION
+ALL_COMPLETED: Final = concurrent.futures.ALL_COMPLETED
 
 if sys.version_info >= (3, 13):
     @type_check_only
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tools.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tools.pyi
index 6fd9a3c430..e74fd30eb5 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tools.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/tools.pyi
@@ -1,5 +1,6 @@
 """Tools to analyze tasks running in asyncio programs."""
 
+import sys
 from collections.abc import Iterable
 from enum import Enum
 from typing import NamedTuple, SupportsIndex, type_check_only
@@ -48,6 +49,15 @@ def build_async_tree(result: Iterable[_AwaitedInfo], task_emoji: str = "(T)", co
     """
 
 def build_task_table(result: Iterable[_AwaitedInfo]) -> list[list[int | str]]: ...
+
+if sys.version_info >= (3, 14):
+    def exit_with_permission_help_text() -> None:
+        """
+        Prints a message pointing to platform-specific permission help text and exits the program.
+        This function is called when a PermissionError is encountered while trying
+        to attach to a process.
+        """
+
 def display_awaited_by_tasks_table(pid: SupportsIndex) -> None:
     """Build and print a table of all pending tasks under `pid`."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/transports.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/transports.pyi
index 4473bacc62..5b2f7d1248 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/transports.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/transports.pyi
@@ -12,6 +12,7 @@ __all__ = ("BaseTransport", "ReadTransport", "WriteTransport", "Transport", "Dat
 class BaseTransport:
     """Base class for transports."""
 
+    __slots__ = ("_extra",)
     def __init__(self, extra: Mapping[str, Any] | None = None) -> None: ...
     def get_extra_info(self, name: str, default: Any = None) -> Any:
         """Get optional transport information."""
@@ -37,6 +38,7 @@ class BaseTransport:
 class ReadTransport(BaseTransport):
     """Interface for read-only transports."""
 
+    __slots__ = ()
     def is_reading(self) -> bool:
         """Return True if the transport is receiving."""
 
@@ -57,6 +59,7 @@ class ReadTransport(BaseTransport):
 class WriteTransport(BaseTransport):
     """Interface for write-only transports."""
 
+    __slots__ = ()
     def set_write_buffer_limits(self, high: int | None = None, low: int | None = None) -> None:
         """Set the high- and low-water limits for write flow control.
 
@@ -140,9 +143,12 @@ class Transport(ReadTransport, WriteTransport):
     except writelines(), which calls write() in a loop.
     """
 
+    __slots__ = ()
+
 class DatagramTransport(BaseTransport):
     """Interface for datagram (UDP) transports."""
 
+    __slots__ = ()
     def sendto(self, data: bytes | bytearray | memoryview, addr: _Address | None = None) -> None:
         """Send data to the transport.
 
@@ -163,6 +169,7 @@ class DatagramTransport(BaseTransport):
         """
 
 class SubprocessTransport(BaseTransport):
+    __slots__ = ()
     def get_pid(self) -> int:
         """Get subprocess id."""
 
@@ -223,4 +230,5 @@ class _FlowControlMixin(Transport):
     resume_writing() may be called.
     """
 
+    __slots__ = ("_loop", "_protocol_paused", "_high_water", "_low_water")
     def __init__(self, extra: Mapping[str, Any] | None = None, loop: AbstractEventLoop | None = None) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/trsock.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/trsock.pyi
index c78f931c85..4d08d24016 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/trsock.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/trsock.pyi
@@ -21,6 +21,7 @@ class TransportSocket:
     operations (like "socket.close()") are banned.
     """
 
+    __slots__ = ("_sock",)
     def __init__(self, sock: socket.socket) -> None: ...
     @property
     def family(self) -> int: ...
@@ -69,7 +70,7 @@ class TransportSocket:
         @deprecated("Removed in Python 3.11")
         def makefile(self) -> BinaryIO: ...
         @deprecated("Rmoved in Python 3.11")
-        def sendfile(self, file: BinaryIO, offset: int = ..., count: int | None = ...) -> int: ...
+        def sendfile(self, file: BinaryIO, offset: int = 0, count: int | None = None) -> int: ...
         @deprecated("Removed in Python 3.11")
         def close(self) -> None: ...
         @deprecated("Removed in Python 3.11")
@@ -77,17 +78,22 @@ class TransportSocket:
         if sys.platform == "linux":
             @deprecated("Removed in Python 3.11")
             def sendmsg_afalg(
-                self, msg: Iterable[ReadableBuffer] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = ...
+                self, msg: Iterable[ReadableBuffer] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = 0
             ) -> int: ...
         else:
             @deprecated("Removed in Python 3.11.")
             def sendmsg_afalg(
-                self, msg: Iterable[ReadableBuffer] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = ...
+                self, msg: Iterable[ReadableBuffer] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = 0
             ) -> NoReturn: ...
 
         @deprecated("Removed in Python 3.11.")
         def sendmsg(
-            self, buffers: Iterable[ReadableBuffer], ancdata: Iterable[_CMSG] = ..., flags: int = ..., address: _Address = ..., /
+            self,
+            buffers: Iterable[ReadableBuffer],
+            ancdata: Iterable[_CMSG] = ...,
+            flags: int = 0,
+            address: _Address | None = None,
+            /,
         ) -> int: ...
         @overload
         @deprecated("Removed in Python 3.11.")
@@ -96,9 +102,9 @@ class TransportSocket:
         @deprecated("Removed in Python 3.11.")
         def sendto(self, data: ReadableBuffer, flags: int, address: _Address) -> int: ...
         @deprecated("Removed in Python 3.11.")
-        def send(self, data: ReadableBuffer, flags: int = ...) -> int: ...
+        def send(self, data: ReadableBuffer, flags: int = 0) -> int: ...
         @deprecated("Removed in Python 3.11.")
-        def sendall(self, data: ReadableBuffer, flags: int = ...) -> None: ...
+        def sendall(self, data: ReadableBuffer, flags: int = 0) -> None: ...
         @deprecated("Removed in Python 3.11.")
         def set_inheritable(self, inheritable: bool) -> None: ...
         if sys.platform == "win32":
@@ -109,19 +115,19 @@ class TransportSocket:
             def share(self, process_id: int) -> NoReturn: ...
 
         @deprecated("Removed in Python 3.11.")
-        def recv_into(self, buffer: _WriteBuffer, nbytes: int = ..., flags: int = ...) -> int: ...
+        def recv_into(self, buffer: _WriteBuffer, nbytes: int = 0, flags: int = 0) -> int: ...
         @deprecated("Removed in Python 3.11.")
-        def recvfrom_into(self, buffer: _WriteBuffer, nbytes: int = ..., flags: int = ...) -> tuple[int, _RetAddress]: ...
+        def recvfrom_into(self, buffer: _WriteBuffer, nbytes: int = 0, flags: int = 0) -> tuple[int, _RetAddress]: ...
         @deprecated("Removed in Python 3.11.")
         def recvmsg_into(
-            self, buffers: Iterable[_WriteBuffer], ancbufsize: int = ..., flags: int = ..., /
+            self, buffers: Iterable[_WriteBuffer], ancbufsize: int = 0, flags: int = 0, /
         ) -> tuple[int, list[_CMSG], int, Any]: ...
         @deprecated("Removed in Python 3.11.")
-        def recvmsg(self, bufsize: int, ancbufsize: int = ..., flags: int = ..., /) -> tuple[bytes, list[_CMSG], int, Any]: ...
+        def recvmsg(self, bufsize: int, ancbufsize: int = 0, flags: int = 0, /) -> tuple[bytes, list[_CMSG], int, Any]: ...
         @deprecated("Removed in Python 3.11.")
-        def recvfrom(self, bufsize: int, flags: int = ...) -> tuple[bytes, _RetAddress]: ...
+        def recvfrom(self, bufsize: int, flags: int = 0) -> tuple[bytes, _RetAddress]: ...
         @deprecated("Removed in Python 3.11.")
-        def recv(self, bufsize: int, flags: int = ...) -> bytes: ...
+        def recv(self, bufsize: int, flags: int = 0) -> bytes: ...
         @deprecated("Removed in Python 3.11.")
         def __enter__(self) -> socket.socket: ...
         @deprecated("Removed in Python 3.11.")
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/unix_events.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/unix_events.pyi
index a03ff6cfac..679f2e6734 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/unix_events.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/unix_events.pyi
@@ -50,7 +50,7 @@ if sys.platform != "win32":
 # So, it is special cased.
 if sys.version_info < (3, 14):
     if sys.version_info >= (3, 12):
-        @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+        @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
         class AbstractChildWatcher:
             """Abstract base class for monitoring child processes.
 
@@ -228,7 +228,7 @@ if sys.platform != "win32":
                 def is_active(self) -> bool: ...
                 def attach_loop(self, loop: events.AbstractEventLoop | None) -> None: ...
 
-            @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+            @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
             class SafeChildWatcher(BaseChildWatcher):
                 """'Safe' child watcher implementation.
 
@@ -249,7 +249,7 @@ if sys.platform != "win32":
                 ) -> None: ...
                 def remove_child_handler(self, pid: int) -> bool: ...
 
-            @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+            @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
             class FastChildWatcher(BaseChildWatcher):
                 """'Fast' child watcher implementation.
 
@@ -348,14 +348,14 @@ if sys.platform != "win32":
             """UNIX event loop policy with a watcher for child processes."""
 
             if sys.version_info >= (3, 12):
-                @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+                @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
                 def get_child_watcher(self) -> AbstractChildWatcher:
                     """Get the watcher for child processes.
 
                     If not yet set, a ThreadedChildWatcher object is automatically created.
                     """
 
-                @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+                @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
                 def set_child_watcher(self, watcher: AbstractChildWatcher | None) -> None:
                     """Set the watcher for child processes."""
             else:
@@ -380,7 +380,7 @@ if sys.platform != "win32":
 
     if sys.version_info < (3, 14):
         if sys.version_info >= (3, 12):
-            @deprecated("Deprecated as of Python 3.12; will be removed in Python 3.14")
+            @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
             class MultiLoopChildWatcher(AbstractChildWatcher):
                 """A watcher that doesn't require running loop in the main thread.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_events.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_events.pyi
index 5136d1c09f..99b9ec9565 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_events.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_events.pyi
@@ -140,6 +140,6 @@ if sys.platform == "win32":
     if sys.version_info >= (3, 14):
         _DefaultEventLoopPolicy = _WindowsProactorEventLoopPolicy
     else:
-        DefaultEventLoopPolicy = WindowsSelectorEventLoopPolicy
+        DefaultEventLoopPolicy = WindowsProactorEventLoopPolicy
     if sys.version_info >= (3, 13):
         EventLoop = ProactorEventLoop
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_utils.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_utils.pyi
index 31cb9b899e..1b1d0bcf62 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_utils.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/asyncio/windows_utils.pyi
@@ -11,8 +11,8 @@ if sys.platform == "win32":
     __all__ = ("pipe", "Popen", "PIPE", "PipeHandle")
 
     BUFSIZE: Final = 8192
-    PIPE = subprocess.PIPE
-    STDOUT = subprocess.STDOUT
+    PIPE: Final = subprocess.PIPE
+    STDOUT: Final = subprocess.STDOUT
     def pipe(*, duplex: bool = False, overlapped: tuple[bool, bool] = (True, True), bufsize: int = 8192) -> tuple[int, int]:
         """Like os.pipe() but with overlapped support and using handles not fds."""
 
@@ -47,9 +47,9 @@ if sys.platform == "win32":
         def __new__(
             cls,
             args: subprocess._CMD,
-            stdin: subprocess._FILE | None = ...,
-            stdout: subprocess._FILE | None = ...,
-            stderr: subprocess._FILE | None = ...,
+            stdin: subprocess._FILE | None = None,
+            stdout: subprocess._FILE | None = None,
+            stderr: subprocess._FILE | None = None,
             **kwds: Any,
         ) -> Self: ...
         def __init__(
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/binascii.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/binascii.pyi
index 136c245253..394c9ed001 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/binascii.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/binascii.pyi
@@ -64,7 +64,7 @@ def crc_hqx(data: ReadableBuffer, crc: int, /) -> int:
 def crc32(data: ReadableBuffer, crc: int = 0, /) -> int:
     """Compute CRC-32 incrementally."""
 
-def b2a_hex(data: ReadableBuffer, sep: str | bytes = ..., bytes_per_sep: int = ...) -> bytes:
+def b2a_hex(data: ReadableBuffer, sep: str | bytes = ..., bytes_per_sep: int = 1) -> bytes:
     """Hexadecimal representation of binary data.
 
       sep
@@ -85,7 +85,7 @@ def b2a_hex(data: ReadableBuffer, sep: str | bytes = ..., bytes_per_sep: int = .
     b'b9_01ef'
     """
 
-def hexlify(data: ReadableBuffer, sep: str | bytes = ..., bytes_per_sep: int = ...) -> bytes:
+def hexlify(data: ReadableBuffer, sep: str | bytes = ..., bytes_per_sep: int = 1) -> bytes:
     """Hexadecimal representation of binary data.
 
       sep
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/builtins.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/builtins.pyi
index 5226fadaf6..bcacb3857b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/builtins.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/builtins.pyi
@@ -83,6 +83,7 @@ from typing_extensions import (  # noqa: Y023
     TypeIs,
     TypeVarTuple,
     deprecated,
+    disjoint_base,
 )
 
 if sys.version_info >= (3, 14):
@@ -115,6 +116,7 @@ _StopT_co = TypeVar("_StopT_co", covariant=True, default=_StartT_co)  #  slice[A
 # FIXME: https://github.com/python/typing/issues/213 (replace step=start|stop with step=start&stop)
 _StepT_co = TypeVar("_StepT_co", covariant=True, default=_StartT_co | _StopT_co)  #  slice[A,B] -> slice[A, B, A|B]
 
+@disjoint_base
 class object:
     """The base class of the class hierarchy.
 
@@ -156,6 +158,7 @@ class object:
     @classmethod
     def __subclasshook__(cls, subclass: type, /) -> bool: ...
 
+@disjoint_base
 class staticmethod(Generic[_P, _R_co]):
     """Convert a function to be a static method.
 
@@ -197,6 +200,7 @@ class staticmethod(Generic[_P, _R_co]):
         def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
         __annotate__: AnnotateFunc | None
 
+@disjoint_base
 class classmethod(Generic[_T, _P, _R_co]):
     """Convert a function to be a class method.
 
@@ -238,6 +242,7 @@ class classmethod(Generic[_T, _P, _R_co]):
         def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
         __annotate__: AnnotateFunc | None
 
+@disjoint_base
 class type:
     """type(object) -> the object's type
     type(name, bases, dict, **kwds) -> a new type
@@ -296,10 +301,12 @@ class type:
     def __prepare__(metacls, name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]:
         """Create the namespace for the class statement"""
     if sys.version_info >= (3, 10):
-        def __or__(self, value: Any, /) -> types.UnionType:
+        # `int | str` produces an instance of `UnionType`, but `int | int` produces an instance of `type`,
+        # and `abc.ABC | abc.ABC` produces an instance of `abc.ABCMeta`.
+        def __or__(self: _typeshed.Self, value: Any, /) -> types.UnionType | _typeshed.Self:
             """Return self|value."""
 
-        def __ror__(self, value: Any, /) -> types.UnionType:
+        def __ror__(self: _typeshed.Self, value: Any, /) -> types.UnionType | _typeshed.Self:
             """Return value|self."""
     if sys.version_info >= (3, 12):
         __type_params__: tuple[TypeVar | ParamSpec | TypeVarTuple, ...]
@@ -307,6 +314,7 @@ class type:
     if sys.version_info >= (3, 14):
         __annotate__: AnnotateFunc | None
 
+@disjoint_base
 class super:
     """super() -> same as super(__class__, <first argument>)
     super(type) -> unbound super object
@@ -334,6 +342,7 @@ _PositiveInteger: TypeAlias = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
 _NegativeInteger: TypeAlias = Literal[-1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16, -17, -18, -19, -20]
 _LiteralInteger = _PositiveInteger | _NegativeInteger | Literal[0]  # noqa: Y026  # TODO: Use TypeAlias once mypy bugs are fixed
 
+@disjoint_base
 class int:
     """int([x]) -> integer
     int(x, base=10) -> integer
@@ -352,7 +361,7 @@ class int:
     """
 
     @overload
-    def __new__(cls, x: ConvertibleToInt = ..., /) -> Self: ...
+    def __new__(cls, x: ConvertibleToInt = 0, /) -> Self: ...
     @overload
     def __new__(cls, x: str | bytes | bytearray, /, base: SupportsIndex) -> Self: ...
     def as_integer_ratio(self) -> tuple[int, Literal[1]]:
@@ -646,10 +655,11 @@ class int:
     def __format__(self, format_spec: str, /) -> str:
         """Convert to a string according to format_spec."""
 
+@disjoint_base
 class float:
     """Convert a string or number to a floating-point number, if possible."""
 
-    def __new__(cls, x: ConvertibleToFloat = ..., /) -> Self: ...
+    def __new__(cls, x: ConvertibleToFloat = 0, /) -> Self: ...
     def as_integer_ratio(self) -> tuple[int, int]:
         """Return a pair of integers, whose ratio is exactly equal to the original float.
 
@@ -806,6 +816,7 @@ class float:
         def from_number(cls, number: float | SupportsIndex | SupportsFloat, /) -> Self:
             """Convert real number to a floating-point number."""
 
+@disjoint_base
 class complex:
     """Create a complex number from a string or numbers.
 
@@ -819,8 +830,8 @@ class complex:
     @overload
     def __new__(
         cls,
-        real: complex | SupportsComplex | SupportsFloat | SupportsIndex = ...,
-        imag: complex | SupportsFloat | SupportsIndex = ...,
+        real: complex | SupportsComplex | SupportsFloat | SupportsIndex = 0,
+        imag: complex | SupportsFloat | SupportsIndex = 0,
     ) -> Self: ...
     @overload
     def __new__(cls, real: str | SupportsComplex | SupportsFloat | SupportsIndex | complex) -> Self: ...
@@ -898,6 +909,7 @@ class _FormatMapMapping(Protocol):
 class _TranslateTable(Protocol):
     def __getitem__(self, key: int, /) -> str | int | None: ...
 
+@disjoint_base
 class str(Sequence[str]):
     """str(object='') -> str
     str(bytes_or_buffer[, encoding[, errors]]) -> str
@@ -912,9 +924,9 @@ class str(Sequence[str]):
     """
 
     @overload
-    def __new__(cls, object: object = ...) -> Self: ...
+    def __new__(cls, object: object = "") -> Self: ...
     @overload
-    def __new__(cls, object: ReadableBuffer, encoding: str = ..., errors: str = ...) -> Self: ...
+    def __new__(cls, object: ReadableBuffer, encoding: str = "utf-8", errors: str = "strict") -> Self: ...
     @overload
     def capitalize(self: LiteralString) -> LiteralString:
         """Return a capitalized version of the string.
@@ -940,7 +952,7 @@ class str(Sequence[str]):
 
     @overload
     def center(self, width: SupportsIndex, fillchar: str = " ", /) -> str: ...  # type: ignore[misc]
-    def count(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int:
+    def count(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int:
         """Return the number of non-overlapping occurrences of substring sub in string S[start:end].
 
         Optional arguments start and end are interpreted as in slice notation.
@@ -960,7 +972,7 @@ class str(Sequence[str]):
         """
 
     def endswith(
-        self, suffix: str | tuple[str, ...], start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, suffix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> bool:
         """Return True if the string ends with the specified suffix, False otherwise.
 
@@ -981,7 +993,7 @@ class str(Sequence[str]):
 
     @overload
     def expandtabs(self, tabsize: SupportsIndex = 8) -> str: ...  # type: ignore[misc]
-    def find(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int:
+    def find(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int:
         """Return the lowest index in S where substring sub is found, such that sub is contained within S[start:end].
 
         Optional arguments start and end are interpreted as in slice notation.
@@ -1001,7 +1013,7 @@ class str(Sequence[str]):
         The substitutions are identified by braces ('{' and '}').
         """
 
-    def index(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int:
+    def index(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int:
         """Return the lowest index in S where substring sub is found, such that sub is contained within S[start:end].
 
         Optional arguments start and end are interpreted as in slice notation.
@@ -1193,14 +1205,14 @@ class str(Sequence[str]):
 
     @overload
     def removesuffix(self, suffix: str, /) -> str: ...  # type: ignore[misc]
-    def rfind(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int:
+    def rfind(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int:
         """Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].
 
         Optional arguments start and end are interpreted as in slice notation.
         Return -1 on failure.
         """
 
-    def rindex(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int:
+    def rindex(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int:
         """Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].
 
         Optional arguments start and end are interpreted as in slice notation.
@@ -1292,7 +1304,7 @@ class str(Sequence[str]):
     @overload
     def splitlines(self, keepends: bool = False) -> list[str]: ...  # type: ignore[misc]
     def startswith(
-        self, prefix: str | tuple[str, ...], start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, prefix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> bool:
         """Return True if the string starts with the specified prefix, False otherwise.
 
@@ -1430,6 +1442,7 @@ class str(Sequence[str]):
     def __format__(self, format_spec: str, /) -> str:
         """Return a formatted version of the string as described by format_spec."""
 
+@disjoint_base
 class bytes(Sequence[int]):
     """bytes(iterable_of_ints) -> bytes
     bytes(string, encoding[, errors]) -> bytes
@@ -1447,7 +1460,7 @@ class bytes(Sequence[int]):
     @overload
     def __new__(cls, o: Iterable[SupportsIndex] | SupportsIndex | SupportsBytes | ReadableBuffer, /) -> Self: ...
     @overload
-    def __new__(cls, string: str, /, encoding: str, errors: str = ...) -> Self: ...
+    def __new__(cls, string: str, /, encoding: str, errors: str = "strict") -> Self: ...
     @overload
     def __new__(cls) -> Self: ...
     def capitalize(self) -> bytes:
@@ -1464,7 +1477,7 @@ class bytes(Sequence[int]):
         """
 
     def count(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the number of non-overlapping occurrences of subsection 'sub' in bytes B[start:end].
 
@@ -1490,8 +1503,8 @@ class bytes(Sequence[int]):
     def endswith(
         self,
         suffix: ReadableBuffer | tuple[ReadableBuffer, ...],
-        start: SupportsIndex | None = ...,
-        end: SupportsIndex | None = ...,
+        start: SupportsIndex | None = None,
+        end: SupportsIndex | None = None,
         /,
     ) -> bool:
         """Return True if the bytes ends with the specified suffix, False otherwise.
@@ -1511,7 +1524,7 @@ class bytes(Sequence[int]):
         """
 
     def find(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].
 
@@ -1523,7 +1536,7 @@ class bytes(Sequence[int]):
         Return -1 on failure.
         """
 
-    def hex(self, sep: str | bytes = ..., bytes_per_sep: SupportsIndex = ...) -> str:
+    def hex(self, sep: str | bytes = ..., bytes_per_sep: SupportsIndex = 1) -> str:
         """Create a string of hexadecimal numbers from a bytes object.
 
           sep
@@ -1545,7 +1558,7 @@ class bytes(Sequence[int]):
         """
 
     def index(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].
 
@@ -1681,7 +1694,7 @@ class bytes(Sequence[int]):
         """
 
     def rfind(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].
 
@@ -1694,7 +1707,7 @@ class bytes(Sequence[int]):
         """
 
     def rindex(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].
 
@@ -1765,8 +1778,8 @@ class bytes(Sequence[int]):
     def startswith(
         self,
         prefix: ReadableBuffer | tuple[ReadableBuffer, ...],
-        start: SupportsIndex | None = ...,
-        end: SupportsIndex | None = ...,
+        start: SupportsIndex | None = None,
+        end: SupportsIndex | None = None,
         /,
     ) -> bool:
         """Return True if the bytes starts with the specified prefix, False otherwise.
@@ -1881,6 +1894,7 @@ class bytes(Sequence[int]):
     def __buffer__(self, flags: int, /) -> memoryview:
         """Return a buffer object that exposes the underlying memory of the object."""
 
+@disjoint_base
 class bytearray(MutableSequence[int]):
     """bytearray(iterable_of_ints) -> bytearray
     bytearray(string, encoding[, errors]) -> bytearray
@@ -1901,7 +1915,7 @@ class bytearray(MutableSequence[int]):
     @overload
     def __init__(self, ints: Iterable[SupportsIndex] | SupportsIndex | ReadableBuffer, /) -> None: ...
     @overload
-    def __init__(self, string: str, /, encoding: str, errors: str = ...) -> None: ...
+    def __init__(self, string: str, /, encoding: str, errors: str = "strict") -> None: ...
     def append(self, item: SupportsIndex, /) -> None:
         """Append a single item to the end of the bytearray.
 
@@ -1923,7 +1937,7 @@ class bytearray(MutableSequence[int]):
         """
 
     def count(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the number of non-overlapping occurrences of subsection 'sub' in bytes B[start:end].
 
@@ -1952,8 +1966,8 @@ class bytearray(MutableSequence[int]):
     def endswith(
         self,
         suffix: ReadableBuffer | tuple[ReadableBuffer, ...],
-        start: SupportsIndex | None = ...,
-        end: SupportsIndex | None = ...,
+        start: SupportsIndex | None = None,
+        end: SupportsIndex | None = None,
         /,
     ) -> bool:
         """Return True if the bytearray ends with the specified suffix, False otherwise.
@@ -1980,7 +1994,7 @@ class bytearray(MutableSequence[int]):
         """
 
     def find(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].
 
@@ -1992,7 +2006,7 @@ class bytearray(MutableSequence[int]):
         Return -1 on failure.
         """
 
-    def hex(self, sep: str | bytes = ..., bytes_per_sep: SupportsIndex = ...) -> str:
+    def hex(self, sep: str | bytes = ..., bytes_per_sep: SupportsIndex = 1) -> str:
         """Create a string of hexadecimal numbers from a bytearray object.
 
           sep
@@ -2014,7 +2028,7 @@ class bytearray(MutableSequence[int]):
         """
 
     def index(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].
 
@@ -2175,7 +2189,7 @@ class bytearray(MutableSequence[int]):
         """
 
     def rfind(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].
 
@@ -2188,7 +2202,7 @@ class bytearray(MutableSequence[int]):
         """
 
     def rindex(
-        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
+        self, sub: ReadableBuffer | SupportsIndex, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
     ) -> int:
         """Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].
 
@@ -2260,8 +2274,8 @@ class bytearray(MutableSequence[int]):
     def startswith(
         self,
         prefix: ReadableBuffer | tuple[ReadableBuffer, ...],
-        start: SupportsIndex | None = ...,
-        end: SupportsIndex | None = ...,
+        start: SupportsIndex | None = None,
+        end: SupportsIndex | None = None,
         /,
     ) -> bool:
         """Return True if the bytearray starts with the specified prefix, False otherwise.
@@ -2537,7 +2551,7 @@ class memoryview(Sequence[_I]):
     def release(self) -> None:
         """Release the underlying buffer exposed by the memoryview object."""
 
-    def hex(self, sep: str | bytes = ..., bytes_per_sep: SupportsIndex = ...) -> str:
+    def hex(self, sep: str | bytes = ..., bytes_per_sep: SupportsIndex = 1) -> str:
         """Return the data in the buffer as a str of hexadecimal numbers.
 
           sep
@@ -2578,7 +2592,7 @@ class bool(int):
     The class bool is a subclass of the class int, and cannot be subclassed.
     """
 
-    def __new__(cls, o: object = ..., /) -> Self: ...
+    def __new__(cls, o: object = False, /) -> Self: ...
     # The following overloads could be represented more elegantly with a TypeVar("_B", bool, int),
     # however mypy has a bug regarding TypeVar constraints (https://github.com/python/mypy/issues/11880).
     @overload
@@ -2675,6 +2689,7 @@ class slice(Generic[_StartT_co, _StopT_co, _StepT_co]):
         handling of normal slices.
         """
 
+@disjoint_base
 class tuple(Sequence[_T_co]):
     """Built-in immutable sequence.
 
@@ -2684,7 +2699,7 @@ class tuple(Sequence[_T_co]):
     If the argument is a tuple, the return value is the same object.
     """
 
-    def __new__(cls, iterable: Iterable[_T_co] = ..., /) -> Self: ...
+    def __new__(cls, iterable: Iterable[_T_co] = (), /) -> Self: ...
     def __len__(self) -> int:
         """Return len(self)."""
 
@@ -2781,6 +2796,7 @@ class function:
     # mypy uses `builtins.function.__get__` to represent methods, properties, and getset_descriptors so we type the return as Any.
     def __get__(self, instance: object, owner: type | None = None, /) -> Any: ...
 
+@disjoint_base
 class list(MutableSequence[_T]):
     """Built-in mutable sequence.
 
@@ -2898,6 +2914,7 @@ class list(MutableSequence[_T]):
     def __class_getitem__(cls, item: Any, /) -> GenericAlias:
         """See PEP 585"""
 
+@disjoint_base
 class dict(MutableMapping[_KT, _VT]):
     """dict() -> new empty dictionary
     dict(mapping) -> new dictionary initialized from a mapping object's
@@ -3027,6 +3044,7 @@ class dict(MutableMapping[_KT, _VT]):
     @overload
     def __ior__(self, value: Iterable[tuple[_KT, _VT]], /) -> Self: ...
 
+@disjoint_base
 class set(MutableSet[_T]):
     """Build an unordered collection of unique elements."""
 
@@ -3131,6 +3149,7 @@ class set(MutableSet[_T]):
     def __class_getitem__(cls, item: Any, /) -> GenericAlias:
         """See PEP 585"""
 
+@disjoint_base
 class frozenset(AbstractSet[_T_co]):
     """Build an immutable unordered collection of unique elements."""
 
@@ -3192,6 +3211,7 @@ class frozenset(AbstractSet[_T_co]):
     def __class_getitem__(cls, item: Any, /) -> GenericAlias:
         """See PEP 585"""
 
+@disjoint_base
 class enumerate(Generic[_T]):
     """Return an enumerate object.
 
@@ -3236,7 +3256,7 @@ class range(Sequence[int]):
     @overload
     def __new__(cls, stop: SupportsIndex, /) -> Self: ...
     @overload
-    def __new__(cls, start: SupportsIndex, stop: SupportsIndex, step: SupportsIndex = ..., /) -> Self: ...
+    def __new__(cls, start: SupportsIndex, stop: SupportsIndex, step: SupportsIndex = 1, /) -> Self: ...
     def count(self, value: int, /) -> int:
         """rangeobject.count(value) -> integer -- return number of occurrences of value"""
 
@@ -3265,6 +3285,7 @@ class range(Sequence[int]):
     def __reversed__(self) -> Iterator[int]:
         """Return a reverse iterator."""
 
+@disjoint_base
 class property:
     """Property attribute.
 
@@ -3309,10 +3330,10 @@ class property:
 
     def __init__(
         self,
-        fget: Callable[[Any], Any] | None = ...,
-        fset: Callable[[Any, Any], None] | None = ...,
-        fdel: Callable[[Any], None] | None = ...,
-        doc: str | None = ...,
+        fget: Callable[[Any], Any] | None = None,
+        fset: Callable[[Any, Any], None] | None = None,
+        fdel: Callable[[Any], None] | None = None,
+        doc: str | None = None,
     ) -> None: ...
     def getter(self, fget: Callable[[Any], Any], /) -> property:
         """Descriptor to obtain a copy of the property with a different getter."""
@@ -3335,10 +3356,8 @@ class property:
     def __delete__(self, instance: Any, /) -> None:
         """Delete an attribute of instance."""
 
-# This class does not exist at runtime, but stubtest complains if it's marked as
-# @type_check_only because it has an alias that does exist at runtime. See mypy#19568.
-# @type_check_only
 @final
+@type_check_only
 class _NotImplementedType(Any):
     __call__: None
 
@@ -3420,7 +3439,7 @@ if sys.version_info >= (3, 10):
 @overload
 def compile(
     source: str | ReadableBuffer | _ast.Module | _ast.Expression | _ast.Interactive,
-    filename: str | ReadableBuffer | PathLike[Any],
+    filename: str | bytes | PathLike[Any],
     mode: str,
     flags: Literal[0],
     dont_inherit: bool = False,
@@ -3445,7 +3464,7 @@ def compile(
 @overload
 def compile(
     source: str | ReadableBuffer | _ast.Module | _ast.Expression | _ast.Interactive,
-    filename: str | ReadableBuffer | PathLike[Any],
+    filename: str | bytes | PathLike[Any],
     mode: str,
     *,
     dont_inherit: bool = False,
@@ -3455,7 +3474,7 @@ def compile(
 @overload
 def compile(
     source: str | ReadableBuffer | _ast.Module | _ast.Expression | _ast.Interactive,
-    filename: str | ReadableBuffer | PathLike[Any],
+    filename: str | bytes | PathLike[Any],
     mode: str,
     flags: Literal[1024],
     dont_inherit: bool = False,
@@ -3466,7 +3485,7 @@ def compile(
 @overload
 def compile(
     source: str | ReadableBuffer | _ast.Module | _ast.Expression | _ast.Interactive,
-    filename: str | ReadableBuffer | PathLike[Any],
+    filename: str | bytes | PathLike[Any],
     mode: str,
     flags: int,
     dont_inherit: bool = False,
@@ -3599,6 +3618,7 @@ else:
 
 exit: _sitebuiltins.Quitter
 
+@disjoint_base
 class filter(Generic[_T]):
     """Return an iterator yielding those items of iterable for which function(item)
     is true. If function is None, return the items that are true.
@@ -3752,6 +3772,7 @@ def locals() -> dict[str, Any]:
     covered by any backwards compatibility guarantees.
     """
 
+@disjoint_base
 class map(Generic[_S]):
     """Make an iterator that computes the function using arguments from
     each of the iterables.  Stops when the shortest iterable is exhausted.
@@ -4134,7 +4155,14 @@ def open(
     opener: _Opener | None = None,
 ) -> IO[Any]: ...
 def ord(c: str | bytes | bytearray, /) -> int:
-    """Return the Unicode code point for a one-character string."""
+    """Return the ordinal value of a character.
+
+    If the argument is a one-character string, return the Unicode code
+    point of that character.
+
+    If the argument is a bytes or bytearray object of length 1, return its
+    single byte value.
+    """
 
 @type_check_only
 class _SupportsWriteAndFlush(SupportsWrite[_T_contra], SupportsFlush, Protocol[_T_contra]): ...
@@ -4231,6 +4259,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
 
 quit: _sitebuiltins.Quitter
 
+@disjoint_base
 class reversed(Generic[_T]):
     """Return a reverse iterator over the values of the given sequence."""
 
@@ -4335,7 +4364,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]:
 
 @overload
 def vars(object: Any = ..., /) -> dict[str, Any]: ...
-
+@disjoint_base
 class zip(Generic[_T_co]):
     """The zip object yields n-length tuples, where n is the number of iterables
     passed as positional arguments to zip().  The i-th element in every tuple
@@ -4351,18 +4380,25 @@ class zip(Generic[_T_co]):
 
     if sys.version_info >= (3, 10):
         @overload
-        def __new__(cls, *, strict: bool = ...) -> zip[Any]: ...
+        def __new__(cls, *, strict: bool = False) -> zip[Any]: ...
         @overload
-        def __new__(cls, iter1: Iterable[_T1], /, *, strict: bool = ...) -> zip[tuple[_T1]]: ...
+        def __new__(cls, iter1: Iterable[_T1], /, *, strict: bool = False) -> zip[tuple[_T1]]: ...
         @overload
-        def __new__(cls, iter1: Iterable[_T1], iter2: Iterable[_T2], /, *, strict: bool = ...) -> zip[tuple[_T1, _T2]]: ...
+        def __new__(cls, iter1: Iterable[_T1], iter2: Iterable[_T2], /, *, strict: bool = False) -> zip[tuple[_T1, _T2]]: ...
         @overload
         def __new__(
-            cls, iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], /, *, strict: bool = ...
+            cls, iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], /, *, strict: bool = False
         ) -> zip[tuple[_T1, _T2, _T3]]: ...
         @overload
         def __new__(
-            cls, iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4], /, *, strict: bool = ...
+            cls,
+            iter1: Iterable[_T1],
+            iter2: Iterable[_T2],
+            iter3: Iterable[_T3],
+            iter4: Iterable[_T4],
+            /,
+            *,
+            strict: bool = False,
         ) -> zip[tuple[_T1, _T2, _T3, _T4]]: ...
         @overload
         def __new__(
@@ -4374,7 +4410,7 @@ class zip(Generic[_T_co]):
             iter5: Iterable[_T5],
             /,
             *,
-            strict: bool = ...,
+            strict: bool = False,
         ) -> zip[tuple[_T1, _T2, _T3, _T4, _T5]]: ...
         @overload
         def __new__(
@@ -4387,7 +4423,7 @@ class zip(Generic[_T_co]):
             iter6: Iterable[Any],
             /,
             *iterables: Iterable[Any],
-            strict: bool = ...,
+            strict: bool = False,
         ) -> zip[tuple[Any, ...]]: ...
     else:
         @overload
@@ -4431,7 +4467,7 @@ def __import__(
     name: str,
     globals: Mapping[str, object] | None = None,
     locals: Mapping[str, object] | None = None,
-    fromlist: Sequence[str] = (),
+    fromlist: Sequence[str] | None = (),
     level: int = 0,
 ) -> types.ModuleType:
     """Import a module.
@@ -4475,6 +4511,7 @@ else:
 
     Ellipsis: ellipsis
 
+@disjoint_base
 class BaseException:
     """Common base class for all exceptions"""
 
@@ -4500,6 +4537,7 @@ class GeneratorExit(BaseException):
 class KeyboardInterrupt(BaseException):
     """Program interrupted by user."""
 
+@disjoint_base
 class SystemExit(BaseException):
     """Request to exit from the interpreter."""
 
@@ -4508,11 +4546,13 @@ class SystemExit(BaseException):
 class Exception(BaseException):
     """Common base class for all non-exit exceptions."""
 
+@disjoint_base
 class StopIteration(Exception):
     """Signal the end from iterator.__next__()."""
 
     value: Any
 
+@disjoint_base
 class OSError(Exception):
     """Base class for I/O related errors."""
 
@@ -4535,24 +4575,30 @@ class ArithmeticError(Exception):
 class AssertionError(Exception):
     """Assertion failed."""
 
-class AttributeError(Exception):
-    """Attribute not found."""
+if sys.version_info >= (3, 10):
+    @disjoint_base
+    class AttributeError(Exception):
+        """Attribute not found."""
 
-    if sys.version_info >= (3, 10):
-        def __init__(self, *args: object, name: str | None = ..., obj: object = ...) -> None: ...
-        name: str
+        def __init__(self, *args: object, name: str | None = None, obj: object = None) -> None: ...
+        name: str | None
         obj: object
 
+else:
+    class AttributeError(Exception):
+        """Attribute not found."""
+
 class BufferError(Exception):
     """Buffer error."""
 
 class EOFError(Exception):
     """Read beyond end of file."""
 
+@disjoint_base
 class ImportError(Exception):
     """Import can't find module, or can't find name in module."""
 
-    def __init__(self, *args: object, name: str | None = ..., path: str | None = ...) -> None: ...
+    def __init__(self, *args: object, name: str | None = None, path: str | None = None) -> None: ...
     name: str | None
     path: str | None
     msg: str  # undocumented
@@ -4565,12 +4611,17 @@ class LookupError(Exception):
 class MemoryError(Exception):
     """Out of memory."""
 
-class NameError(Exception):
-    """Name not found globally."""
+if sys.version_info >= (3, 10):
+    @disjoint_base
+    class NameError(Exception):
+        """Name not found globally."""
 
-    if sys.version_info >= (3, 10):
-        def __init__(self, *args: object, name: str | None = ...) -> None: ...
-        name: str
+        def __init__(self, *args: object, name: str | None = None) -> None: ...
+        name: str | None
+
+else:
+    class NameError(Exception):
+        """Name not found globally."""
 
 class ReferenceError(Exception):
     """Weak ref proxy used after referent went away."""
@@ -4581,6 +4632,7 @@ class RuntimeError(Exception):
 class StopAsyncIteration(Exception):
     """Signal the end from iterator.__anext__()."""
 
+@disjoint_base
 class SyntaxError(Exception):
     """Invalid syntax."""
 
@@ -4708,6 +4760,7 @@ class TabError(IndentationError):
 class UnicodeError(ValueError):
     """Unicode related error."""
 
+@disjoint_base
 class UnicodeDecodeError(UnicodeError):
     """Unicode decoding error."""
 
@@ -4718,6 +4771,7 @@ class UnicodeDecodeError(UnicodeError):
     reason: str
     def __init__(self, encoding: str, object: ReadableBuffer, start: int, end: int, reason: str, /) -> None: ...
 
+@disjoint_base
 class UnicodeEncodeError(UnicodeError):
     """Unicode encoding error."""
 
@@ -4728,6 +4782,7 @@ class UnicodeEncodeError(UnicodeError):
     reason: str
     def __init__(self, encoding: str, object: str, start: int, end: int, reason: str, /) -> None: ...
 
+@disjoint_base
 class UnicodeTranslateError(UnicodeError):
     """Unicode translation error."""
 
@@ -4790,6 +4845,7 @@ if sys.version_info >= (3, 11):
     _ExceptionT = TypeVar("_ExceptionT", bound=Exception)
 
     # See `check_exception_group.py` for use-cases and comments.
+    @disjoint_base
     class BaseExceptionGroup(BaseException, Generic[_BaseExceptionT_co]):
         """A combination of multiple unrelated exceptions."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/calendar.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/calendar.pyi
index 2c5dd4ae6f..3b2aa61ceb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/calendar.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/calendar.pyi
@@ -380,18 +380,18 @@ if sys.version_info >= (3, 12):
         NOVEMBER = 11
         DECEMBER = 12
 
-    JANUARY = Month.JANUARY
-    FEBRUARY = Month.FEBRUARY
-    MARCH = Month.MARCH
-    APRIL = Month.APRIL
-    MAY = Month.MAY
-    JUNE = Month.JUNE
-    JULY = Month.JULY
-    AUGUST = Month.AUGUST
-    SEPTEMBER = Month.SEPTEMBER
-    OCTOBER = Month.OCTOBER
-    NOVEMBER = Month.NOVEMBER
-    DECEMBER = Month.DECEMBER
+    JANUARY: Final = Month.JANUARY
+    FEBRUARY: Final = Month.FEBRUARY
+    MARCH: Final = Month.MARCH
+    APRIL: Final = Month.APRIL
+    MAY: Final = Month.MAY
+    JUNE: Final = Month.JUNE
+    JULY: Final = Month.JULY
+    AUGUST: Final = Month.AUGUST
+    SEPTEMBER: Final = Month.SEPTEMBER
+    OCTOBER: Final = Month.OCTOBER
+    NOVEMBER: Final = Month.NOVEMBER
+    DECEMBER: Final = Month.DECEMBER
 
     class Day(enum.IntEnum):
         MONDAY = 0
@@ -402,13 +402,13 @@ if sys.version_info >= (3, 12):
         SATURDAY = 5
         SUNDAY = 6
 
-    MONDAY = Day.MONDAY
-    TUESDAY = Day.TUESDAY
-    WEDNESDAY = Day.WEDNESDAY
-    THURSDAY = Day.THURSDAY
-    FRIDAY = Day.FRIDAY
-    SATURDAY = Day.SATURDAY
-    SUNDAY = Day.SUNDAY
+    MONDAY: Final = Day.MONDAY
+    TUESDAY: Final = Day.TUESDAY
+    WEDNESDAY: Final = Day.WEDNESDAY
+    THURSDAY: Final = Day.THURSDAY
+    FRIDAY: Final = Day.FRIDAY
+    SATURDAY: Final = Day.SATURDAY
+    SUNDAY: Final = Day.SUNDAY
 else:
     MONDAY: Final = 0
     TUESDAY: Final = 1
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/cgi.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/cgi.pyi
index b3ed05365d..1154503deb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/cgi.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/cgi.pyi
@@ -9,6 +9,7 @@ ValueError being raised during parsing. The default value of this variable is 0,
 meaning the request size is unlimited.
 """
 
+import os
 from _typeshed import SupportsContainsAndGetItem, SupportsGetItem, SupportsItemAccess, Unused
 from builtins import list as _list, type as _type
 from collections.abc import Iterable, Iterator, Mapping
@@ -34,7 +35,7 @@ __all__ = [
 
 def parse(
     fp: IO[Any] | None = None,
-    environ: SupportsItemAccess[str, str] = ...,
+    environ: SupportsItemAccess[str, str] = os.environ,
     keep_blank_values: bool = ...,
     strict_parsing: bool = ...,
     separator: str = "&",
@@ -90,7 +91,7 @@ def parse_header(line: str) -> tuple[str, dict[str, str]]:
 
     """
 
-def test(environ: _Environ = ...) -> None:
+def test(environ: _Environ = os.environ) -> None:
     """Robust test CGI script, usable as main program.
 
     Write minimal HTTP headers and dump all information provided to
@@ -98,7 +99,7 @@ def test(environ: _Environ = ...) -> None:
 
     """
 
-def print_environ(environ: _Environ = ...) -> None:
+def print_environ(environ: _Environ = os.environ) -> None:
     """Dump the shell environment as HTML."""
 
 def print_form(form: dict[str, Any]) -> None:
@@ -197,7 +198,7 @@ class FieldStorage:
         fp: IO[Any] | None = None,
         headers: Mapping[str, str] | Message | None = None,
         outerboundary: bytes = b"",
-        environ: SupportsContainsAndGetItem[str, str] = ...,
+        environ: SupportsContainsAndGetItem[str, str] = os.environ,
         keep_blank_values: int = 0,
         strict_parsing: int = 0,
         limit: int | None = None,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/codecs.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/codecs.pyi
index e6ae5d53ac..5754989a3f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/codecs.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/codecs.pyi
@@ -7,13 +7,14 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
 
 """
 
+import sys
 import types
 from _codecs import *
 from _typeshed import ReadableBuffer
 from abc import abstractmethod
 from collections.abc import Callable, Generator, Iterable
 from typing import Any, BinaryIO, ClassVar, Final, Literal, Protocol, TextIO, overload, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 __all__ = [
     "register",
@@ -131,35 +132,68 @@ class _IncrementalDecoder(Protocol):
 class _BufferedIncrementalDecoder(Protocol):
     def __call__(self, errors: str = ...) -> BufferedIncrementalDecoder: ...
 
-class CodecInfo(tuple[_Encoder, _Decoder, _StreamReader, _StreamWriter]):
-    """Codec details when looking up the codec registry"""
+if sys.version_info >= (3, 12):
+    class CodecInfo(tuple[_Encoder, _Decoder, _StreamReader, _StreamWriter]):
+        """Codec details when looking up the codec registry"""
 
-    _is_text_encoding: bool
-    @property
-    def encode(self) -> _Encoder: ...
-    @property
-    def decode(self) -> _Decoder: ...
-    @property
-    def streamreader(self) -> _StreamReader: ...
-    @property
-    def streamwriter(self) -> _StreamWriter: ...
-    @property
-    def incrementalencoder(self) -> _IncrementalEncoder: ...
-    @property
-    def incrementaldecoder(self) -> _IncrementalDecoder: ...
-    name: str
-    def __new__(
-        cls,
-        encode: _Encoder,
-        decode: _Decoder,
-        streamreader: _StreamReader | None = None,
-        streamwriter: _StreamWriter | None = None,
-        incrementalencoder: _IncrementalEncoder | None = None,
-        incrementaldecoder: _IncrementalDecoder | None = None,
-        name: str | None = None,
-        *,
-        _is_text_encoding: bool | None = None,
-    ) -> Self: ...
+        _is_text_encoding: bool
+        @property
+        def encode(self) -> _Encoder: ...
+        @property
+        def decode(self) -> _Decoder: ...
+        @property
+        def streamreader(self) -> _StreamReader: ...
+        @property
+        def streamwriter(self) -> _StreamWriter: ...
+        @property
+        def incrementalencoder(self) -> _IncrementalEncoder: ...
+        @property
+        def incrementaldecoder(self) -> _IncrementalDecoder: ...
+        name: str
+        def __new__(
+            cls,
+            encode: _Encoder,
+            decode: _Decoder,
+            streamreader: _StreamReader | None = None,
+            streamwriter: _StreamWriter | None = None,
+            incrementalencoder: _IncrementalEncoder | None = None,
+            incrementaldecoder: _IncrementalDecoder | None = None,
+            name: str | None = None,
+            *,
+            _is_text_encoding: bool | None = None,
+        ) -> Self: ...
+
+else:
+    @disjoint_base
+    class CodecInfo(tuple[_Encoder, _Decoder, _StreamReader, _StreamWriter]):
+        """Codec details when looking up the codec registry"""
+
+        _is_text_encoding: bool
+        @property
+        def encode(self) -> _Encoder: ...
+        @property
+        def decode(self) -> _Decoder: ...
+        @property
+        def streamreader(self) -> _StreamReader: ...
+        @property
+        def streamwriter(self) -> _StreamWriter: ...
+        @property
+        def incrementalencoder(self) -> _IncrementalEncoder: ...
+        @property
+        def incrementaldecoder(self) -> _IncrementalDecoder: ...
+        name: str
+        def __new__(
+            cls,
+            encode: _Encoder,
+            decode: _Decoder,
+            streamreader: _StreamReader | None = None,
+            streamwriter: _StreamWriter | None = None,
+            incrementalencoder: _IncrementalEncoder | None = None,
+            incrementaldecoder: _IncrementalDecoder | None = None,
+            name: str | None = None,
+            *,
+            _is_text_encoding: bool | None = None,
+        ) -> Self: ...
 
 def getencoder(encoding: str) -> _Encoder:
     """Lookup up the codec for the given encoding and return
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/collections/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/collections/__init__.pyi
index c6b3b2a15c..adb79e5ff4 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/collections/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/collections/__init__.pyi
@@ -19,7 +19,7 @@ from _collections_abc import dict_items, dict_keys, dict_values
 from _typeshed import SupportsItems, SupportsKeysAndGetItem, SupportsRichComparison, SupportsRichComparisonT
 from types import GenericAlias
 from typing import Any, ClassVar, Generic, NoReturn, SupportsIndex, TypeVar, final, overload, type_check_only
-from typing_extensions import Self
+from typing_extensions import Self, disjoint_base
 
 if sys.version_info >= (3, 10):
     from collections.abc import (
@@ -271,6 +271,7 @@ class UserString(Sequence[UserString]):
     def upper(self) -> Self: ...
     def zfill(self, width: int) -> Self: ...
 
+@disjoint_base
 class deque(MutableSequence[_T]):
     """A list-like sequence optimized for data accesses near its endpoints."""
 
@@ -645,6 +646,7 @@ class _odict_items(dict_items[_KT_co, _VT_co]):  # type: ignore[misc]  # pyright
 class _odict_values(dict_values[_KT_co, _VT_co]):  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
     def __reversed__(self) -> Iterator[_VT_co]: ...
 
+@disjoint_base
 class OrderedDict(dict[_KT, _VT]):
     """Dictionary that remembers insertion order"""
 
@@ -717,6 +719,7 @@ class OrderedDict(dict[_KT, _VT]):
     @overload
     def __ror__(self, value: dict[_T1, _T2], /) -> OrderedDict[_KT | _T1, _VT | _T2]: ...  # type: ignore[misc]
 
+@disjoint_base
 class defaultdict(dict[_KT, _VT]):
     """defaultdict(default_factory=None, /, [...]) --> dict with default factory
 
@@ -852,15 +855,23 @@ class ChainMap(MutableMapping[_KT, _VT]):
     __copy__ = copy
     # All arguments to `fromkeys` are passed to `dict.fromkeys` at runtime,
     # so the signature should be kept in line with `dict.fromkeys`.
-    @classmethod
-    @overload
-    def fromkeys(cls, iterable: Iterable[_T]) -> ChainMap[_T, Any | None]:
-        """Create a new ChainMap with keys from iterable and values set to value."""
+    if sys.version_info >= (3, 13):
+        @classmethod
+        @overload
+        def fromkeys(cls, iterable: Iterable[_T], /) -> ChainMap[_T, Any | None]:
+            """Create a new ChainMap with keys from iterable and values set to value."""
+    else:
+        @classmethod
+        @overload
+        def fromkeys(cls, iterable: Iterable[_T]) -> ChainMap[_T, Any | None]:
+            """Create a ChainMap with a single dict created from the iterable."""
 
     @classmethod
     @overload
     # Special-case None: the user probably wants to add non-None values later.
-    def fromkeys(cls, iterable: Iterable[_T], value: None, /) -> ChainMap[_T, Any | None]: ...
+    def fromkeys(cls, iterable: Iterable[_T], value: None, /) -> ChainMap[_T, Any | None]:
+        """Create a new ChainMap with keys from iterable and values set to value."""
+
     @classmethod
     @overload
     def fromkeys(cls, iterable: Iterable[_T], value: _S, /) -> ChainMap[_T, _S]: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/colorsys.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/colorsys.pyi
index 8aaab8b0ea..9e674165b9 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/colorsys.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/colorsys.pyi
@@ -16,6 +16,8 @@ HLS: Hue, Luminance, Saturation
 HSV: Hue, Saturation, Value
 """
 
+from typing import Final
+
 __all__ = ["rgb_to_yiq", "yiq_to_rgb", "rgb_to_hls", "hls_to_rgb", "rgb_to_hsv", "hsv_to_rgb"]
 
 def rgb_to_yiq(r: float, g: float, b: float) -> tuple[float, float, float]: ...
@@ -26,6 +28,6 @@ def rgb_to_hsv(r: float, g: float, b: float) -> tuple[float, float, float]: ...
 def hsv_to_rgb(h: float, s: float, v: float) -> tuple[float, float, float]: ...
 
 # TODO: undocumented
-ONE_SIXTH: float
-ONE_THIRD: float
-TWO_THIRD: float
+ONE_SIXTH: Final[float]
+ONE_THIRD: Final[float]
+TWO_THIRD: Final[float]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/compression/zstd/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/compression/zstd/__init__.pyi
index d6481b8b81..d47f8eab3b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/compression/zstd/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/compression/zstd/__init__.pyi
@@ -39,6 +39,7 @@ COMPRESSION_LEVEL_DEFAULT: Final = _zstd.ZSTD_CLEVEL_DEFAULT
 class FrameInfo:
     """Information about a Zstandard frame."""
 
+    __slots__ = ("decompressed_size", "dictionary_id")
     decompressed_size: int
     dictionary_id: int
     def __init__(self, decompressed_size: int, dictionary_id: int) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/_base.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/_base.pyi
index 40a0525266..a1ab245dd8 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/_base.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/_base.pyi
@@ -15,8 +15,7 @@ RUNNING: Final = "RUNNING"
 CANCELLED: Final = "CANCELLED"
 CANCELLED_AND_NOTIFIED: Final = "CANCELLED_AND_NOTIFIED"
 FINISHED: Final = "FINISHED"
-_FUTURE_STATES: list[str]
-_STATE_TO_DESCRIPTION_MAP: dict[str, str]
+_STATE_TO_DESCRIPTION_MAP: Final[dict[str, str]]
 LOGGER: Logger
 
 class Error(Exception):
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/process.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/process.pyi
index d02bd67584..0264ceba46 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/process.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/futures/process.pyi
@@ -47,7 +47,7 @@ from multiprocessing.context import BaseContext, Process
 from multiprocessing.queues import Queue, SimpleQueue
 from threading import Lock, Semaphore, Thread
 from types import TracebackType
-from typing import Any, Generic, TypeVar, overload
+from typing import Any, Final, Generic, TypeVar, overload
 from typing_extensions import TypeVarTuple, Unpack
 from weakref import ref
 
@@ -70,9 +70,9 @@ class _ThreadWakeup:
 
 def _python_exit() -> None: ...
 
-EXTRA_QUEUED_CALLS: int
+EXTRA_QUEUED_CALLS: Final = 1
 
-_MAX_WINDOWS_WORKERS: int
+_MAX_WINDOWS_WORKERS: Final = 61
 
 class _RemoteTraceback(Exception):
     tb: str
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_crossinterp.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_crossinterp.pyi
index b2a01173ff..372ac39270 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_crossinterp.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_crossinterp.pyi
@@ -22,6 +22,7 @@ if sys.version_info >= (3, 13):  # needed to satisfy pyright checks for Python <
         cross-interpreter container is destroyed.
         """
 
+        __slots__ = ()
         def __new__(cls) -> Never: ...
         @classonly
         def singleton(cls, kind: str, module: str, name: str = "UNBOUND") -> Self:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_queues.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_queues.pyi
index 4eb08bfc81..e134d97e21 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_queues.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/concurrent/interpreters/_queues.pyi
@@ -71,60 +71,74 @@ if sys.version_info >= (3, 13):  # needed to satisfy pyright checks for Python <
         def empty(self) -> bool: ...
         def full(self) -> bool: ...
         def qsize(self) -> int: ...
-        def put(
-            self,
-            obj: object,
-            timeout: SupportsIndex | None = None,
-            *,
-            unbounditems: _AnyUnbound | None = None,
-            _delay: float = ...,
-        ) -> None:
-            """Add the object to the queue.
+        if sys.version_info >= (3, 14):
+            def put(
+                self,
+                obj: object,
+                block: bool = True,
+                timeout: SupportsIndex | None = None,
+                *,
+                unbounditems: _AnyUnbound | None = None,
+                _delay: float = 0.01,
+            ) -> None:
+                """Add the object to the queue.
 
-            This blocks while the queue is full.
+                If "block" is true, this blocks while the queue is full.
 
-            For most objects, the object received through Queue.get() will
-            be a new one, equivalent to the original and not sharing any
-            actual underlying data.  The notable exceptions include
-            cross-interpreter types (like Queue) and memoryview, where the
-            underlying data is actually shared.  Furthermore, some types
-            can be sent through a queue more efficiently than others.  This
-            group includes various immutable types like int, str, bytes, and
-            tuple (if the items are likewise efficiently shareable).  See interpreters.is_shareable().
+                For most objects, the object received through Queue.get() will
+                be a new one, equivalent to the original and not sharing any
+                actual underlying data.  The notable exceptions include
+                cross-interpreter types (like Queue) and memoryview, where the
+                underlying data is actually shared.  Furthermore, some types
+                can be sent through a queue more efficiently than others.  This
+                group includes various immutable types like int, str, bytes, and
+                tuple (if the items are likewise efficiently shareable).  See interpreters.is_shareable().
 
-            "unbounditems" controls the behavior of Queue.get() for the given
-            object if the current interpreter (calling put()) is later
-            destroyed.
+                "unbounditems" controls the behavior of Queue.get() for the given
+                object if the current interpreter (calling put()) is later
+                destroyed.
 
-            If "unbounditems" is None (the default) then it uses the
-            queue's default, set with create_queue(),
-            which is usually UNBOUND.
+                If "unbounditems" is None (the default) then it uses the
+                queue's default, set with create_queue(),
+                which is usually UNBOUND.
 
-            If "unbounditems" is UNBOUND_ERROR then get() will raise an
-            ItemInterpreterDestroyed exception if the original interpreter
-            has been destroyed.  This does not otherwise affect the queue;
-            the next call to put() will work like normal, returning the next
-            item in the queue.
+                If "unbounditems" is UNBOUND_ERROR then get() will raise an
+                ItemInterpreterDestroyed exception if the original interpreter
+                has been destroyed.  This does not otherwise affect the queue;
+                the next call to put() will work like normal, returning the next
+                item in the queue.
 
-            If "unbounditems" is UNBOUND_REMOVE then the item will be removed
-            from the queue as soon as the original interpreter is destroyed.
-            Be aware that this will introduce an imbalance between put()
-            and get() calls.
+                If "unbounditems" is UNBOUND_REMOVE then the item will be removed
+                from the queue as soon as the original interpreter is destroyed.
+                Be aware that this will introduce an imbalance between put()
+                and get() calls.
 
-            If "unbounditems" is UNBOUND then it is returned by get() in place
-            of the unbound item.
-            """
+                If "unbounditems" is UNBOUND then it is returned by get() in place
+                of the unbound item.
+                """
+        else:
+            def put(
+                self,
+                obj: object,
+                timeout: SupportsIndex | None = None,
+                *,
+                unbounditems: _AnyUnbound | None = None,
+                _delay: float = 0.01,
+            ) -> None: ...
 
         def put_nowait(self, obj: object, *, unbounditems: _AnyUnbound | None = None) -> None: ...
-        def get(self, timeout: SupportsIndex | None = None, *, _delay: float = ...) -> object:
-            """Return the next object from the queue.
+        if sys.version_info >= (3, 14):
+            def get(self, block: bool = True, timeout: SupportsIndex | None = None, *, _delay: float = 0.01) -> object:
+                """Return the next object from the queue.
 
-            This blocks while the queue is empty.
+                If "block" is true, this blocks while the queue is empty.
 
-            If the next item's original interpreter has been destroyed
-            then the "next object" is determined by the value of the
-            "unbounditems" argument to put().
-            """
+                If the next item's original interpreter has been destroyed
+                then the "next object" is determined by the value of the
+                "unbounditems" argument to put().
+                """
+        else:
+            def get(self, timeout: SupportsIndex | None = None, *, _delay: float = 0.01) -> object: ...
 
         def get_nowait(self) -> object:
             """Return the next object from the channel.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/configparser.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/configparser.pyi
index 979c97359e..18c687b763 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/configparser.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/configparser.pyi
@@ -429,9 +429,9 @@ class RawConfigParser(_Parser):
         ) -> None: ...
 
     def __len__(self) -> int: ...
-    def __getitem__(self, key: str) -> SectionProxy: ...
-    def __setitem__(self, key: str, value: _Section) -> None: ...
-    def __delitem__(self, key: str) -> None: ...
+    def __getitem__(self, key: _SectionName) -> SectionProxy: ...
+    def __setitem__(self, key: _SectionName, value: _Section) -> None: ...
+    def __delitem__(self, key: _SectionName) -> None: ...
     def __iter__(self) -> Iterator[str]: ...
     def __contains__(self, key: object) -> bool: ...
     def defaults(self) -> _Section: ...
@@ -784,10 +784,13 @@ class ParsingError(Error):
         def __init__(self, source: str) -> None: ...
     else:
         @overload
-        def __init__(self, source: str, filename: None = None) -> None: ...
+        def __init__(self, source: str) -> None: ...
         @overload
         @deprecated("The `filename` parameter removed in Python 3.12. Use `source` instead.")
-        def __init__(self, source: None = None, filename: str = ...) -> None: ...
+        def __init__(self, source: None, filename: str | None) -> None: ...
+        @overload
+        @deprecated("The `filename` parameter removed in Python 3.12. Use `source` instead.")
+        def __init__(self, source: None = None, *, filename: str | None) -> None: ...
 
     def append(self, lineno: int, line: str) -> None: ...
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/contextlib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/contextlib.pyi
index 1a1bb2c69c..2b05511c33 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/contextlib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/contextlib.pyi
@@ -51,6 +51,7 @@ _CM_EF = TypeVar("_CM_EF", bound=AbstractContextManager[Any, Any] | _ExitFunc)
 class AbstractContextManager(ABC, Protocol[_T_co, _ExitT_co]):  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
     """An abstract base class for context managers."""
 
+    __slots__ = ()
     def __enter__(self) -> _T_co:
         """Return `self` upon entering the runtime context."""
 
@@ -67,6 +68,7 @@ class AbstractContextManager(ABC, Protocol[_T_co, _ExitT_co]):  # type: ignore[m
 class AbstractAsyncContextManager(ABC, Protocol[_T_co, _ExitT_co]):  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
     """An abstract base class for asynchronous context managers."""
 
+    __slots__ = ()
     async def __aenter__(self) -> _T_co:
         """Return `self` upon entering the runtime context."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/copy.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/copy.pyi
index 9f143cf7fd..2f464f1e1c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/copy.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/copy.pyi
@@ -51,17 +51,16 @@ __getstate__() and __setstate__().  See the documentation for module
 
 import sys
 from typing import Any, Protocol, TypeVar, type_check_only
-from typing_extensions import Self
 
 __all__ = ["Error", "copy", "deepcopy"]
 
 _T = TypeVar("_T")
-_SR = TypeVar("_SR", bound=_SupportsReplace)
+_RT_co = TypeVar("_RT_co", covariant=True)
 
 @type_check_only
-class _SupportsReplace(Protocol):
-    # In reality doesn't support args, but there's no other great way to express this.
-    def __replace__(self, *args: Any, **kwargs: Any) -> Self: ...
+class _SupportsReplace(Protocol[_RT_co]):
+    # In reality doesn't support args, but there's no great way to express this.
+    def __replace__(self, /, *_: Any, **changes: Any) -> _RT_co: ...
 
 # None in CPython but non-None in Jython
 PyStringMap: Any
@@ -81,7 +80,8 @@ def copy(x: _T) -> _T:
 
 if sys.version_info >= (3, 13):
     __all__ += ["replace"]
-    def replace(obj: _SR, /, **changes: Any) -> _SR:
+    # The types accepted by `**changes` match those of `obj.__replace__`.
+    def replace(obj: _SupportsReplace[_RT_co], /, **changes: Any) -> _RT_co:
         """Return a new object replacing specified fields with new values.
 
         This is especially useful for immutable objects, like named tuples or
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/crypt.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/crypt.pyi
index 0830524b75..df7d315f06 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/crypt.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/crypt.pyi
@@ -2,6 +2,7 @@
 
 import sys
 from typing import Final, NamedTuple, type_check_only
+from typing_extensions import disjoint_base
 
 if sys.platform != "win32":
     @type_check_only
@@ -11,10 +12,18 @@ if sys.platform != "win32":
         salt_chars: int
         total_size: int
 
-    class _Method(_MethodBase):
-        """Class representing a salt method per the Modular Crypt Format or the
-        legacy 2-character crypt method.
-        """
+    if sys.version_info >= (3, 12):
+        class _Method(_MethodBase):
+            """Class representing a salt method per the Modular Crypt Format or the
+            legacy 2-character crypt method.
+            """
+
+    else:
+        @disjoint_base
+        class _Method(_MethodBase):
+            """Class representing a salt method per the Modular Crypt Format or the
+            legacy 2-character crypt method.
+            """
 
     METHOD_CRYPT: Final[_Method]
     METHOD_MD5: Final[_Method]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/__init__.pyi
index 2d30ef8b6a..03c62e5dd7 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/__init__.pyi
@@ -25,10 +25,10 @@ from _ctypes import (
     set_errno as set_errno,
     sizeof as sizeof,
 )
-from _typeshed import StrPath
+from _typeshed import StrPath, SupportsBool, SupportsLen
 from ctypes._endian import BigEndianStructure as BigEndianStructure, LittleEndianStructure as LittleEndianStructure
 from types import GenericAlias
-from typing import Any, ClassVar, Generic, Literal, TypeVar, overload, type_check_only
+from typing import Any, ClassVar, Final, Generic, Literal, TypeVar, overload, type_check_only
 from typing_extensions import Self, TypeAlias, deprecated
 
 if sys.platform == "win32":
@@ -69,7 +69,7 @@ if sys.version_info >= (3, 14):
 else:
     from _ctypes import POINTER as POINTER, pointer as pointer
 
-DEFAULT_MODE: int
+DEFAULT_MODE: Final[int]
 
 class ArgumentError(Exception): ...
 
@@ -231,8 +231,13 @@ def create_unicode_buffer(init: int | str, size: int | None = None) -> Array[c_w
     create_unicode_buffer(aString, anInteger) -> character array
     """
 
-@deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
+if sys.version_info >= (3, 13):
+    @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+    def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
+
+else:
+    def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
+
 def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...  # Soft Deprecated, no plans to remove
 
 if sys.platform == "win32":
@@ -296,7 +301,7 @@ class py_object(_CanCastTo, _SimpleCData[_T]):
 
 class c_bool(_SimpleCData[bool]):
     _type_: ClassVar[Literal["?"]]
-    def __init__(self, value: bool = ...) -> None: ...
+    def __init__(self, value: SupportsBool | SupportsLen | None = ...) -> None: ...
 
 class c_byte(_SimpleCData[int]):
     _type_: ClassVar[Literal["b"]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/_endian.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/_endian.pyi
index b6a5814991..007fd7d329 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/_endian.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/_endian.pyi
@@ -6,6 +6,8 @@ from ctypes import Structure, Union
 class BigEndianStructure(Structure):
     """Structure with big endian byte order"""
 
+    __slots__ = ()
+
 class LittleEndianStructure(Structure):
     """Structure base class"""
 
@@ -14,5 +16,7 @@ if sys.version_info >= (3, 11):
     class BigEndianUnion(Union):
         """Union with big endian byte order"""
 
+        __slots__ = ()
+
     class LittleEndianUnion(Union):
         """Union base class"""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/macholib/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/macholib/__init__.pyi
index 106c61e635..0d240b1f70 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/macholib/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/macholib/__init__.pyi
@@ -6,4 +6,6 @@ See the relevant header files in /usr/include/mach-o
 And also Apple's documentation.
 """
 
-__version__: str
+from typing import Final
+
+__version__: Final[str]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/wintypes.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/wintypes.pyi
index e9ed0df24d..0f0d61a396 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/wintypes.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ctypes/wintypes.pyi
@@ -21,7 +21,7 @@ from ctypes import (
     c_wchar,
     c_wchar_p,
 )
-from typing import Any, TypeVar
+from typing import Any, Final, TypeVar
 from typing_extensions import Self, TypeAlias
 
 if sys.version_info >= (3, 12):
@@ -177,7 +177,7 @@ class MSG(Structure):
     pt: _CField[POINT, POINT, POINT]
 
 tagMSG = MSG
-MAX_PATH: int
+MAX_PATH: Final = 260
 
 class WIN32_FIND_DATAA(Structure):
     dwFileAttributes: _CIntLikeField[DWORD]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/curses/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/curses/__init__.pyi
index 4c9e7f2beb..a6fcd958e4 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/curses/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/curses/__init__.pyi
@@ -26,12 +26,13 @@ _T = TypeVar("_T")
 _P = ParamSpec("_P")
 
 # available after calling `curses.initscr()`
+# not `Final` as it can change during the terminal resize:
 LINES: int
 COLS: int
 
 # available after calling `curses.start_color()`
-COLORS: int
-COLOR_PAIRS: int
+COLORS: Final[int]
+COLOR_PAIRS: Final[int]
 
 def wrapper(func: Callable[Concatenate[window, _P], _T], /, *arg: _P.args, **kwds: _P.kwargs) -> _T:
     """Wrapper function that initializes curses and calls another function,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/curses/ascii.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/curses/ascii.pyi
index 11e6ae55aa..823f98c139 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/curses/ascii.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/curses/ascii.pyi
@@ -1,47 +1,47 @@
 """Constants and membership tests for ASCII characters"""
 
-from typing import TypeVar
+from typing import Final, TypeVar
 
 _CharT = TypeVar("_CharT", str, int)
 
-NUL: int
-SOH: int
-STX: int
-ETX: int
-EOT: int
-ENQ: int
-ACK: int
-BEL: int
-BS: int
-TAB: int
-HT: int
-LF: int
-NL: int
-VT: int
-FF: int
-CR: int
-SO: int
-SI: int
-DLE: int
-DC1: int
-DC2: int
-DC3: int
-DC4: int
-NAK: int
-SYN: int
-ETB: int
-CAN: int
-EM: int
-SUB: int
-ESC: int
-FS: int
-GS: int
-RS: int
-US: int
-SP: int
-DEL: int
+NUL: Final = 0x00
+SOH: Final = 0x01
+STX: Final = 0x02
+ETX: Final = 0x03
+EOT: Final = 0x04
+ENQ: Final = 0x05
+ACK: Final = 0x06
+BEL: Final = 0x07
+BS: Final = 0x08
+TAB: Final = 0x09
+HT: Final = 0x09
+LF: Final = 0x0A
+NL: Final = 0x0A
+VT: Final = 0x0B
+FF: Final = 0x0C
+CR: Final = 0x0D
+SO: Final = 0x0E
+SI: Final = 0x0F
+DLE: Final = 0x10
+DC1: Final = 0x11
+DC2: Final = 0x12
+DC3: Final = 0x13
+DC4: Final = 0x14
+NAK: Final = 0x15
+SYN: Final = 0x16
+ETB: Final = 0x17
+CAN: Final = 0x18
+EM: Final = 0x19
+SUB: Final = 0x1A
+ESC: Final = 0x1B
+FS: Final = 0x1C
+GS: Final = 0x1D
+RS: Final = 0x1E
+US: Final = 0x1F
+SP: Final = 0x20
+DEL: Final = 0x7F
 
-controlnames: list[int]
+controlnames: Final[list[int]]
 
 def isalnum(c: str | int) -> bool: ...
 def isalpha(c: str | int) -> bool: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/dataclasses.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/dataclasses.pyi
index 3728c9d6d1..6a134c3df6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/dataclasses.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/dataclasses.pyi
@@ -5,7 +5,7 @@ from _typeshed import DataclassInstance
 from builtins import type as Type  # alias to avoid name clashes with fields named "type"
 from collections.abc import Callable, Iterable, Mapping
 from types import GenericAlias
-from typing import Any, Generic, Literal, Protocol, TypeVar, overload, type_check_only
+from typing import Any, Final, Generic, Literal, Protocol, TypeVar, overload, type_check_only
 from typing_extensions import Never, TypeIs
 
 _T = TypeVar("_T")
@@ -58,7 +58,7 @@ class _DataclassFactory(Protocol):
 class _MISSING_TYPE(enum.Enum):
     MISSING = enum.auto()
 
-MISSING = _MISSING_TYPE.MISSING
+MISSING: Final = _MISSING_TYPE.MISSING
 
 if sys.version_info >= (3, 10):
     class KW_ONLY: ...
@@ -248,6 +248,37 @@ class _DefaultFactory(Protocol[_T_co]):
     def __call__(self) -> _T_co: ...
 
 class Field(Generic[_T]):
+    if sys.version_info >= (3, 14):
+        __slots__ = (
+            "name",
+            "type",
+            "default",
+            "default_factory",
+            "repr",
+            "hash",
+            "init",
+            "compare",
+            "metadata",
+            "kw_only",
+            "doc",
+            "_field_type",
+        )
+    elif sys.version_info >= (3, 10):
+        __slots__ = (
+            "name",
+            "type",
+            "default",
+            "default_factory",
+            "repr",
+            "hash",
+            "init",
+            "compare",
+            "metadata",
+            "kw_only",
+            "_field_type",
+        )
+    else:
+        __slots__ = ("name", "type", "default", "default_factory", "repr", "hash", "init", "compare", "metadata", "_field_type")
     name: str
     type: Type[_T] | str | Any
     default: _T | Literal[_MISSING_TYPE.MISSING]
@@ -492,6 +523,7 @@ def is_dataclass(obj: object) -> TypeIs[DataclassInstance | type[DataclassInstan
 class FrozenInstanceError(AttributeError): ...
 
 class InitVar(Generic[_T]):
+    __slots__ = ("type",)
     type: Type[_T]
     def __init__(self, type: Type[_T]) -> None: ...
     @overload
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/datetime.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/datetime.pyi
index 4729c819c0..4571f2dcf6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/datetime.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/datetime.pyi
@@ -8,7 +8,7 @@ import sys
 from abc import abstractmethod
 from time import struct_time
 from typing import ClassVar, Final, NoReturn, SupportsIndex, final, overload, type_check_only
-from typing_extensions import CapsuleType, Self, TypeAlias, deprecated
+from typing_extensions import CapsuleType, Self, TypeAlias, deprecated, disjoint_base
 
 if sys.version_info >= (3, 11):
     __all__ = ("date", "datetime", "time", "timedelta", "timezone", "tzinfo", "MINYEAR", "MAXYEAR", "UTC")
@@ -74,6 +74,7 @@ class _IsoCalendarDate(tuple[int, int, int]):
     @property
     def weekday(self) -> int: ...
 
+@disjoint_base
 class date:
     """date(year, month, day) --> date object"""
 
@@ -181,6 +182,7 @@ class date:
     def isocalendar(self) -> _IsoCalendarDate:
         """Return a named tuple containing ISO year, week number, and weekday."""
 
+@disjoint_base
 class time:
     """time([hour[, minute[, second[, microsecond[, tzinfo]]]]]) --> a time object
 
@@ -284,6 +286,7 @@ class time:
 _Date: TypeAlias = date
 _Time: TypeAlias = time
 
+@disjoint_base
 class timedelta:
     """Difference between two datetime values.
 
@@ -376,6 +379,7 @@ class timedelta:
 
     def __hash__(self) -> int: ...
 
+@disjoint_base
 class datetime(date):
     """datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/dbm/sqlite3.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/dbm/sqlite3.pyi
index b4b53b0212..4f30544592 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/dbm/sqlite3.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/dbm/sqlite3.pyi
@@ -26,7 +26,7 @@ class _Database(MutableMapping[bytes, bytes]):
     def __enter__(self) -> Self: ...
     def __exit__(self, *args: Unused) -> None: ...
 
-def open(filename: StrOrBytesPath, /, flag: Literal["r", "w,", "c", "n"] = "r", mode: int = 0o666) -> _Database:
+def open(filename: StrOrBytesPath, /, flag: Literal["r", "w", "c", "n"] = "r", mode: int = 0o666) -> _Database:
     """Open a dbm.sqlite3 database and return the dbm object.
 
     The 'filename' parameter is the name of the database file.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/decimal.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/decimal.pyi
index a4e56372dc..1f6ba755df 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/decimal.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/decimal.pyi
@@ -127,7 +127,7 @@ from _decimal import (
 from collections.abc import Container, Sequence
 from types import TracebackType
 from typing import Any, ClassVar, Literal, NamedTuple, final, overload, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 if sys.version_info >= (3, 14):
     from _decimal import IEEE_CONTEXT_MAX_BITS as IEEE_CONTEXT_MAX_BITS, IEEEContext as IEEEContext
@@ -170,6 +170,7 @@ class Overflow(Inexact, Rounded): ...
 class Underflow(Inexact, Rounded, Subnormal): ...
 class FloatOperation(DecimalException, TypeError): ...
 
+@disjoint_base
 class Decimal:
     """Construct a new Decimal object. 'value' can be an integer, string, tuple,
     or another Decimal object. If no value is given, return Decimal('0'). The
@@ -693,6 +694,7 @@ class Decimal:
     def __deepcopy__(self, memo: Any, /) -> Self: ...
     def __format__(self, specifier: str, context: Context | None = None, /) -> str: ...
 
+@disjoint_base
 class Context:
     """The context affects almost all operations and controls rounding,
     Over/Underflow, raising of exceptions and much more.  A new context
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/dis.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/dis.pyi
index af64aa94c6..6da3dc252c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/dis.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/dis.pyi
@@ -4,8 +4,8 @@ import sys
 import types
 from collections.abc import Callable, Iterator
 from opcode import *  # `dis` re-exports it as a part of public API
-from typing import IO, Any, NamedTuple
-from typing_extensions import Self, TypeAlias
+from typing import IO, Any, Final, NamedTuple
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 __all__ = [
     "code_info",
@@ -98,28 +98,107 @@ else:
         starts_line: int | None
         is_jump_target: bool
 
-class Instruction(_Instruction):
-    """Details for a bytecode operation.
+if sys.version_info >= (3, 12):
+    class Instruction(_Instruction):
+        """Details for a bytecode operation.
 
-    Defined fields:
-      opname - human readable name for operation
-      opcode - numeric code for operation
-      arg - numeric argument to operation (if any), otherwise None
-      argval - resolved arg value (if known), otherwise same as arg
-      argrepr - human readable description of operation argument
-      offset - start index of operation within bytecode sequence
-      start_offset - start index of operation within bytecode sequence including extended args if present;
-                     otherwise equal to Instruction.offset
-      starts_line - True if this opcode starts a source line, otherwise False
-      line_number - source line number associated with this opcode (if any), otherwise None
-      label - A label if this instruction is a jump target, otherwise None
-      positions - Optional dis.Positions object holding the span of source code
-                  covered by this instruction
-      cache_info - information about the format and content of the instruction's cache
-                     entries (if any)
-    """
+        Defined fields:
+          opname - human readable name for operation
+          opcode - numeric code for operation
+          arg - numeric argument to operation (if any), otherwise None
+          argval - resolved arg value (if known), otherwise same as arg
+          argrepr - human readable description of operation argument
+          offset - start index of operation within bytecode sequence
+          start_offset - start index of operation within bytecode sequence including extended args if present;
+                         otherwise equal to Instruction.offset
+          starts_line - True if this opcode starts a source line, otherwise False
+          line_number - source line number associated with this opcode (if any), otherwise None
+          label - A label if this instruction is a jump target, otherwise None
+          positions - Optional dis.Positions object holding the span of source code
+                      covered by this instruction
+          cache_info - information about the format and content of the instruction's cache
+                         entries (if any)
+        """
+
+        if sys.version_info < (3, 13):
+            def _disassemble(self, lineno_width: int = 3, mark_as_current: bool = False, offset_width: int = 4) -> str:
+                """Format instruction details for inclusion in disassembly output
+
+                *lineno_width* sets the width of the line number field (0 omits it)
+                *mark_as_current* inserts a '-->' marker arrow as part of the line
+                *offset_width* sets the width of the instruction offset field
+                """
+        if sys.version_info >= (3, 13):
+            @property
+            def oparg(self) -> int:
+                """Alias for Instruction.arg."""
+
+            @property
+            def baseopcode(self) -> int:
+                """Numeric code for the base operation if operation is specialized.
+
+                Otherwise equal to Instruction.opcode.
+                """
+
+            @property
+            def baseopname(self) -> str:
+                """Human readable name for the base operation if operation is specialized.
+
+                Otherwise equal to Instruction.opname.
+                """
+
+            @property
+            def cache_offset(self) -> int:
+                """Start index of the cache entries following the operation."""
+
+            @property
+            def end_offset(self) -> int:
+                """End index of the cache entries following the operation."""
+
+            @property
+            def jump_target(self) -> int:
+                """Bytecode index of the jump target if this is a jump operation.
+
+                Otherwise return None.
+                """
+
+            @property
+            def is_jump_target(self) -> bool:
+                """True if other code jumps to here, otherwise False"""
+        if sys.version_info >= (3, 14):
+            @staticmethod
+            def make(
+                opname: str,
+                arg: int | None,
+                argval: Any,
+                argrepr: str,
+                offset: int,
+                start_offset: int,
+                starts_line: bool,
+                line_number: int | None,
+                label: int | None = None,
+                positions: Positions | None = None,
+                cache_info: list[tuple[str, int, Any]] | None = None,
+            ) -> Instruction: ...
+
+else:
+    @disjoint_base
+    class Instruction(_Instruction):
+        """Details for a bytecode operation
+
+        Defined fields:
+          opname - human readable name for operation
+          opcode - numeric code for operation
+          arg - numeric argument to operation (if any), otherwise None
+          argval - resolved arg value (if known), otherwise same as arg
+          argrepr - human readable description of operation argument
+          offset - start index of operation within bytecode sequence
+          starts_line - line started by this opcode (if any), otherwise None
+          is_jump_target - True if other code jumps to here, otherwise False
+          positions - Optional dis.Positions object holding the span of source code
+                      covered by this instruction
+        """
 
-    if sys.version_info < (3, 13):
         def _disassemble(self, lineno_width: int = 3, mark_as_current: bool = False, offset_width: int = 4) -> str:
             """Format instruction details for inclusion in disassembly output
 
@@ -127,58 +206,6 @@ class Instruction(_Instruction):
             *mark_as_current* inserts a '-->' marker arrow as part of the line
             *offset_width* sets the width of the instruction offset field
             """
-    if sys.version_info >= (3, 13):
-        @property
-        def oparg(self) -> int:
-            """Alias for Instruction.arg."""
-
-        @property
-        def baseopcode(self) -> int:
-            """Numeric code for the base operation if operation is specialized.
-
-            Otherwise equal to Instruction.opcode.
-            """
-
-        @property
-        def baseopname(self) -> str:
-            """Human readable name for the base operation if operation is specialized.
-
-            Otherwise equal to Instruction.opname.
-            """
-
-        @property
-        def cache_offset(self) -> int:
-            """Start index of the cache entries following the operation."""
-
-        @property
-        def end_offset(self) -> int:
-            """End index of the cache entries following the operation."""
-
-        @property
-        def jump_target(self) -> int:
-            """Bytecode index of the jump target if this is a jump operation.
-
-            Otherwise return None.
-            """
-
-        @property
-        def is_jump_target(self) -> bool:
-            """True if other code jumps to here, otherwise False"""
-    if sys.version_info >= (3, 14):
-        @staticmethod
-        def make(
-            opname: str,
-            arg: int | None,
-            argval: Any,
-            argrepr: str,
-            offset: int,
-            start_offset: int,
-            starts_line: bool,
-            line_number: int | None,
-            label: int | None = None,
-            positions: Positions | None = None,
-            cache_info: list[tuple[str, int, Any]] | None = None,
-        ) -> Instruction: ...
 
 class Bytecode:
     """The bytecode operations of a piece of code
@@ -249,7 +276,7 @@ class Bytecode:
     def dis(self) -> str:
         """Return a formatted view of the bytecode operations."""
 
-COMPILER_FLAG_NAMES: dict[int, str]
+COMPILER_FLAG_NAMES: Final[dict[int, str]]
 
 def findlabels(code: _HaveCodeType) -> list[int]:
     """Detect all offsets in a byte code which are jump targets.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/distutils/file_util.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/distutils/file_util.pyi
index cc7b10bfb5..ba4ded2abf 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/distutils/file_util.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/distutils/file_util.pyi
@@ -59,7 +59,7 @@ def copy_file(
 ) -> tuple[_BytesPathT | bytes, bool]: ...
 @overload
 def move_file(
-    src: StrPath, dst: _StrPathT, verbose: bool | Literal[0, 1] = 0, dry_run: bool | Literal[0, 1] = 0
+    src: StrPath, dst: _StrPathT, verbose: bool | Literal[0, 1] = 1, dry_run: bool | Literal[0, 1] = 0
 ) -> _StrPathT | str:
     """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
     be moved into it with the same name; otherwise, 'src' is just renamed
@@ -71,7 +71,7 @@ def move_file(
 
 @overload
 def move_file(
-    src: BytesPath, dst: _BytesPathT, verbose: bool | Literal[0, 1] = 0, dry_run: bool | Literal[0, 1] = 0
+    src: BytesPath, dst: _BytesPathT, verbose: bool | Literal[0, 1] = 1, dry_run: bool | Literal[0, 1] = 0
 ) -> _BytesPathT | bytes: ...
 def write_file(filename: StrOrBytesPath, contents: Iterable[str]) -> None:
     """Create a file with the specified name and write 'contents' (a
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/doctest.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/doctest.pyi
index 3b12009681..55a37fc365 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/doctest.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/doctest.pyi
@@ -42,7 +42,7 @@ import types
 import unittest
 from _typeshed import ExcInfo
 from collections.abc import Callable
-from typing import Any, NamedTuple, type_check_only
+from typing import Any, Final, NamedTuple, type_check_only
 from typing_extensions import Self, TypeAlias
 
 __all__ = [
@@ -98,29 +98,29 @@ else:
         failed: int
         attempted: int
 
-OPTIONFLAGS_BY_NAME: dict[str, int]
+OPTIONFLAGS_BY_NAME: Final[dict[str, int]]
 
 def register_optionflag(name: str) -> int: ...
 
-DONT_ACCEPT_TRUE_FOR_1: int
-DONT_ACCEPT_BLANKLINE: int
-NORMALIZE_WHITESPACE: int
-ELLIPSIS: int
-SKIP: int
-IGNORE_EXCEPTION_DETAIL: int
+DONT_ACCEPT_TRUE_FOR_1: Final = 1
+DONT_ACCEPT_BLANKLINE: Final = 2
+NORMALIZE_WHITESPACE: Final = 4
+ELLIPSIS: Final = 8
+SKIP: Final = 16
+IGNORE_EXCEPTION_DETAIL: Final = 32
 
-COMPARISON_FLAGS: int
+COMPARISON_FLAGS: Final = 63
 
-REPORT_UDIFF: int
-REPORT_CDIFF: int
-REPORT_NDIFF: int
-REPORT_ONLY_FIRST_FAILURE: int
-FAIL_FAST: int
+REPORT_UDIFF: Final = 64
+REPORT_CDIFF: Final = 128
+REPORT_NDIFF: Final = 256
+REPORT_ONLY_FIRST_FAILURE: Final = 512
+FAIL_FAST: Final = 1024
 
-REPORTING_FLAGS: int
+REPORTING_FLAGS: Final = 1984
 
-BLANKLINE_MARKER: str
-ELLIPSIS_MARKER: str
+BLANKLINE_MARKER: Final = "<BLANKLINE>"
+ELLIPSIS_MARKER: Final = "..."
 
 class Example:
     """
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/email/_header_value_parser.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/email/_header_value_parser.pyi
index f7c23cf676..1c73357b53 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/email/_header_value_parser.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/email/_header_value_parser.pyi
@@ -96,7 +96,7 @@ def make_quoted_pairs(value: Any) -> str:
 
 def quote_string(value: Any) -> str: ...
 
-rfc2047_matcher: Pattern[str]
+rfc2047_matcher: Final[Pattern[str]]
 
 class TokenList(list[TokenList | Terminal]):
     token_type: str | None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/email/charset.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/email/charset.pyi
index a1b44e899c..3688abc116 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/email/charset.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/email/charset.pyi
@@ -4,9 +4,16 @@ from typing import ClassVar, Final, overload
 
 __all__ = ["Charset", "add_alias", "add_charset", "add_codec"]
 
-QP: Final[int]  # undocumented
-BASE64: Final[int]  # undocumented
-SHORTEST: Final[int]  # undocumented
+QP: Final = 1  # undocumented
+BASE64: Final = 2  # undocumented
+SHORTEST: Final = 3  # undocumented
+RFC2047_CHROME_LEN: Final = 7  # undocumented
+DEFAULT_CHARSET: Final = "us-ascii"  # undocumented
+UNKNOWN8BIT: Final = "unknown-8bit"  # undocumented
+EMPTYSTRING: Final = ""  # undocumented
+CHARSETS: Final[dict[str, tuple[int | None, int | None, str | None]]]
+ALIASES: Final[dict[str, str]]
+CODEC_MAP: Final[dict[str, str | None]]  # undocumented
 
 class Charset:
     """Map character sets to their email properties.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/email/headerregistry.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/email/headerregistry.pyi
index 801bf612db..c75b8015f7 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/email/headerregistry.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/email/headerregistry.pyi
@@ -122,7 +122,7 @@ class DateHeader:
     max_count: ClassVar[Literal[1] | None]
     def init(self, name: str, *, parse_tree: TokenList, defects: Iterable[MessageDefect], datetime: _datetime) -> None: ...
     @property
-    def datetime(self) -> _datetime: ...
+    def datetime(self) -> _datetime | None: ...
     @staticmethod
     def value_parser(value: str) -> UnstructuredTokenList:
         """unstructured = (*([FWS] vchar) *WSP) / obs-unstruct
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/enum.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/enum.pyi
index 2258926c91..b9933de380 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/enum.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/enum.pyi
@@ -4,8 +4,8 @@ import types
 from _typeshed import SupportsKeysAndGetItem, Unused
 from builtins import property as _builtins_property
 from collections.abc import Callable, Iterable, Iterator, Mapping
-from typing import Any, Generic, Literal, TypeVar, overload
-from typing_extensions import Self, TypeAlias
+from typing import Any, Final, Generic, Literal, TypeVar, overload
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 __all__ = ["EnumMeta", "Enum", "IntEnum", "Flag", "IntFlag", "auto", "unique"]
 
@@ -464,22 +464,37 @@ if sys.version_info >= (3, 11):
         Only changes the repr(), leaving str() and format() to the mixed-in type.
         """
 
-if sys.version_info >= (3, 11):
-    _IntEnumBase = ReprEnum
+if sys.version_info >= (3, 12):
+    class IntEnum(int, ReprEnum):
+        """
+        Enum where members are also (and must be) ints
+        """
+
+        _value_: int
+        @_magic_enum_attr
+        def value(self) -> int:
+            """The value of the Enum member."""
+
+        def __new__(cls, value: int) -> Self: ...
+
 else:
-    _IntEnumBase = Enum
+    if sys.version_info >= (3, 11):
+        _IntEnumBase = ReprEnum
+    else:
+        _IntEnumBase = Enum
 
-class IntEnum(int, _IntEnumBase):
-    """
-    Enum where members are also (and must be) ints
-    """
+    @disjoint_base
+    class IntEnum(int, _IntEnumBase):
+        """
+        Enum where members are also (and must be) ints
+        """
 
-    _value_: int
-    @_magic_enum_attr
-    def value(self) -> int:
-        """The value of the Enum member."""
+        _value_: int
+        @_magic_enum_attr
+        def value(self) -> int:
+            """The value of the Enum member."""
 
-    def __new__(cls, value: int) -> Self: ...
+        def __new__(cls, value: int) -> Self: ...
 
 def unique(enumeration: _EnumerationT) -> _EnumerationT:
     """
@@ -551,9 +566,9 @@ if sys.version_info >= (3, 11):
         NAMED_FLAGS = "multi-flag aliases may not contain unnamed flags"
         UNIQUE = "one name per value"
 
-    CONTINUOUS = EnumCheck.CONTINUOUS
-    NAMED_FLAGS = EnumCheck.NAMED_FLAGS
-    UNIQUE = EnumCheck.UNIQUE
+    CONTINUOUS: Final = EnumCheck.CONTINUOUS
+    NAMED_FLAGS: Final = EnumCheck.NAMED_FLAGS
+    UNIQUE: Final = EnumCheck.UNIQUE
 
     class verify:
         """
@@ -577,10 +592,10 @@ if sys.version_info >= (3, 11):
         EJECT = "eject"
         KEEP = "keep"
 
-    STRICT = FlagBoundary.STRICT
-    CONFORM = FlagBoundary.CONFORM
-    EJECT = FlagBoundary.EJECT
-    KEEP = FlagBoundary.KEEP
+    STRICT: Final = FlagBoundary.STRICT
+    CONFORM: Final = FlagBoundary.CONFORM
+    EJECT: Final = FlagBoundary.EJECT
+    KEEP: Final = FlagBoundary.KEEP
 
     def global_str(self: Enum) -> str:
         """
@@ -608,7 +623,7 @@ if sys.version_info >= (3, 11):
         the module is the last module in case of a multi-module name
         """
 
-if sys.version_info >= (3, 11):
+if sys.version_info >= (3, 12):
     # The body of the class is the same, but the base classes are different.
     class IntFlag(int, ReprEnum, Flag, boundary=KEEP):  # type: ignore[misc]  # complaints about incompatible bases
         """
@@ -624,7 +639,25 @@ if sys.version_info >= (3, 11):
         __rand__ = __and__
         __rxor__ = __xor__
 
+elif sys.version_info >= (3, 11):
+    # The body of the class is the same, but the base classes are different.
+    @disjoint_base
+    class IntFlag(int, ReprEnum, Flag, boundary=KEEP):  # type: ignore[misc]  # complaints about incompatible bases
+        """
+        Support for integer-based Flags
+        """
+
+        def __new__(cls, value: int) -> Self: ...
+        def __or__(self, other: int) -> Self: ...
+        def __and__(self, other: int) -> Self: ...
+        def __xor__(self, other: int) -> Self: ...
+        def __invert__(self) -> Self: ...
+        __ror__ = __or__
+        __rand__ = __and__
+        __rxor__ = __xor__
+
 else:
+    @disjoint_base
     class IntFlag(int, Flag):  # type: ignore[misc]  # complaints about incompatible bases
         """
         Support for integer-based Flags
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/errno.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/errno.pyi
index 1efac527bd..386c055ae2 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/errno.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/errno.pyi
@@ -14,226 +14,228 @@ e.g. os.strerror(2) could return 'No such file or directory'.
 
 import sys
 from collections.abc import Mapping
+from typing import Final
 
 errorcode: Mapping[int, str]
 
-EPERM: int
-ENOENT: int
-ESRCH: int
-EINTR: int
-EIO: int
-ENXIO: int
-E2BIG: int
-ENOEXEC: int
-EBADF: int
-ECHILD: int
-EAGAIN: int
-ENOMEM: int
-EACCES: int
-EFAULT: int
-EBUSY: int
-EEXIST: int
-EXDEV: int
-ENODEV: int
-ENOTDIR: int
-EISDIR: int
-EINVAL: int
-ENFILE: int
-EMFILE: int
-ENOTTY: int
-ETXTBSY: int
-EFBIG: int
-ENOSPC: int
-ESPIPE: int
-EROFS: int
-EMLINK: int
-EPIPE: int
-EDOM: int
-ERANGE: int
-EDEADLK: int
-ENAMETOOLONG: int
-ENOLCK: int
-ENOSYS: int
-ENOTEMPTY: int
-ELOOP: int
-EWOULDBLOCK: int
-ENOMSG: int
-EIDRM: int
-ENOSTR: int
-ENODATA: int
-ETIME: int
-ENOSR: int
-EREMOTE: int
-ENOLINK: int
-EPROTO: int
-EBADMSG: int
-EOVERFLOW: int
-EILSEQ: int
-EUSERS: int
-ENOTSOCK: int
-EDESTADDRREQ: int
-EMSGSIZE: int
-EPROTOTYPE: int
-ENOPROTOOPT: int
-EPROTONOSUPPORT: int
-ESOCKTNOSUPPORT: int
-ENOTSUP: int
-EOPNOTSUPP: int
-EPFNOSUPPORT: int
-EAFNOSUPPORT: int
-EADDRINUSE: int
-EADDRNOTAVAIL: int
-ENETDOWN: int
-ENETUNREACH: int
-ENETRESET: int
-ECONNABORTED: int
-ECONNRESET: int
-ENOBUFS: int
-EISCONN: int
-ENOTCONN: int
-ESHUTDOWN: int
-ETOOMANYREFS: int
-ETIMEDOUT: int
-ECONNREFUSED: int
-EHOSTDOWN: int
-EHOSTUNREACH: int
-EALREADY: int
-EINPROGRESS: int
-ESTALE: int
-EDQUOT: int
-ECANCELED: int  # undocumented
-ENOTRECOVERABLE: int  # undocumented
-EOWNERDEAD: int  # undocumented
+EPERM: Final[int]
+ENOENT: Final[int]
+ESRCH: Final[int]
+EINTR: Final[int]
+EIO: Final[int]
+ENXIO: Final[int]
+E2BIG: Final[int]
+ENOEXEC: Final[int]
+EBADF: Final[int]
+ECHILD: Final[int]
+EAGAIN: Final[int]
+ENOMEM: Final[int]
+EACCES: Final[int]
+EFAULT: Final[int]
+EBUSY: Final[int]
+EEXIST: Final[int]
+EXDEV: Final[int]
+ENODEV: Final[int]
+ENOTDIR: Final[int]
+EISDIR: Final[int]
+EINVAL: Final[int]
+ENFILE: Final[int]
+EMFILE: Final[int]
+ENOTTY: Final[int]
+ETXTBSY: Final[int]
+EFBIG: Final[int]
+ENOSPC: Final[int]
+ESPIPE: Final[int]
+EROFS: Final[int]
+EMLINK: Final[int]
+EPIPE: Final[int]
+EDOM: Final[int]
+ERANGE: Final[int]
+EDEADLK: Final[int]
+ENAMETOOLONG: Final[int]
+ENOLCK: Final[int]
+ENOSYS: Final[int]
+ENOTEMPTY: Final[int]
+ELOOP: Final[int]
+EWOULDBLOCK: Final[int]
+ENOMSG: Final[int]
+EIDRM: Final[int]
+ENOSTR: Final[int]
+ENODATA: Final[int]
+ETIME: Final[int]
+ENOSR: Final[int]
+EREMOTE: Final[int]
+ENOLINK: Final[int]
+EPROTO: Final[int]
+EBADMSG: Final[int]
+EOVERFLOW: Final[int]
+EILSEQ: Final[int]
+EUSERS: Final[int]
+ENOTSOCK: Final[int]
+EDESTADDRREQ: Final[int]
+EMSGSIZE: Final[int]
+EPROTOTYPE: Final[int]
+ENOPROTOOPT: Final[int]
+EPROTONOSUPPORT: Final[int]
+ESOCKTNOSUPPORT: Final[int]
+ENOTSUP: Final[int]
+EOPNOTSUPP: Final[int]
+EPFNOSUPPORT: Final[int]
+EAFNOSUPPORT: Final[int]
+EADDRINUSE: Final[int]
+EADDRNOTAVAIL: Final[int]
+ENETDOWN: Final[int]
+ENETUNREACH: Final[int]
+ENETRESET: Final[int]
+ECONNABORTED: Final[int]
+ECONNRESET: Final[int]
+ENOBUFS: Final[int]
+EISCONN: Final[int]
+ENOTCONN: Final[int]
+ESHUTDOWN: Final[int]
+ETOOMANYREFS: Final[int]
+ETIMEDOUT: Final[int]
+ECONNREFUSED: Final[int]
+EHOSTDOWN: Final[int]
+EHOSTUNREACH: Final[int]
+EALREADY: Final[int]
+EINPROGRESS: Final[int]
+ESTALE: Final[int]
+EDQUOT: Final[int]
+ECANCELED: Final[int]  # undocumented
+ENOTRECOVERABLE: Final[int]  # undocumented
+EOWNERDEAD: Final[int]  # undocumented
 
 if sys.platform == "sunos5" or sys.platform == "solaris":  # noqa: Y008
-    ELOCKUNMAPPED: int
-    ENOTACTIVE: int
+    ELOCKUNMAPPED: Final[int]
+    ENOTACTIVE: Final[int]
 
 if sys.platform != "win32":
-    ENOTBLK: int
-    EMULTIHOP: int
+    ENOTBLK: Final[int]
+    EMULTIHOP: Final[int]
 
 if sys.platform == "darwin":
     # All of the below are undocumented
-    EAUTH: int
-    EBADARCH: int
-    EBADEXEC: int
-    EBADMACHO: int
-    EBADRPC: int
-    EDEVERR: int
-    EFTYPE: int
-    ENEEDAUTH: int
-    ENOATTR: int
-    ENOPOLICY: int
-    EPROCLIM: int
-    EPROCUNAVAIL: int
-    EPROGMISMATCH: int
-    EPROGUNAVAIL: int
-    EPWROFF: int
-    ERPCMISMATCH: int
-    ESHLIBVERS: int
+    EAUTH: Final[int]
+    EBADARCH: Final[int]
+    EBADEXEC: Final[int]
+    EBADMACHO: Final[int]
+    EBADRPC: Final[int]
+    EDEVERR: Final[int]
+    EFTYPE: Final[int]
+    ENEEDAUTH: Final[int]
+    ENOATTR: Final[int]
+    ENOPOLICY: Final[int]
+    EPROCLIM: Final[int]
+    EPROCUNAVAIL: Final[int]
+    EPROGMISMATCH: Final[int]
+    EPROGUNAVAIL: Final[int]
+    EPWROFF: Final[int]
+    ERPCMISMATCH: Final[int]
+    ESHLIBVERS: Final[int]
     if sys.version_info >= (3, 11):
-        EQFULL: int
+        EQFULL: Final[int]
+        ENOTCAPABLE: Final[int]  # available starting with 3.11.1
 
 if sys.platform != "darwin":
-    EDEADLOCK: int
+    EDEADLOCK: Final[int]
 
 if sys.platform != "win32" and sys.platform != "darwin":
-    ECHRNG: int
-    EL2NSYNC: int
-    EL3HLT: int
-    EL3RST: int
-    ELNRNG: int
-    EUNATCH: int
-    ENOCSI: int
-    EL2HLT: int
-    EBADE: int
-    EBADR: int
-    EXFULL: int
-    ENOANO: int
-    EBADRQC: int
-    EBADSLT: int
-    EBFONT: int
-    ENONET: int
-    ENOPKG: int
-    EADV: int
-    ESRMNT: int
-    ECOMM: int
-    EDOTDOT: int
-    ENOTUNIQ: int
-    EBADFD: int
-    EREMCHG: int
-    ELIBACC: int
-    ELIBBAD: int
-    ELIBSCN: int
-    ELIBMAX: int
-    ELIBEXEC: int
-    ERESTART: int
-    ESTRPIPE: int
-    EUCLEAN: int
-    ENOTNAM: int
-    ENAVAIL: int
-    EISNAM: int
-    EREMOTEIO: int
+    ECHRNG: Final[int]
+    EL2NSYNC: Final[int]
+    EL3HLT: Final[int]
+    EL3RST: Final[int]
+    ELNRNG: Final[int]
+    EUNATCH: Final[int]
+    ENOCSI: Final[int]
+    EL2HLT: Final[int]
+    EBADE: Final[int]
+    EBADR: Final[int]
+    EXFULL: Final[int]
+    ENOANO: Final[int]
+    EBADRQC: Final[int]
+    EBADSLT: Final[int]
+    EBFONT: Final[int]
+    ENONET: Final[int]
+    ENOPKG: Final[int]
+    EADV: Final[int]
+    ESRMNT: Final[int]
+    ECOMM: Final[int]
+    EDOTDOT: Final[int]
+    ENOTUNIQ: Final[int]
+    EBADFD: Final[int]
+    EREMCHG: Final[int]
+    ELIBACC: Final[int]
+    ELIBBAD: Final[int]
+    ELIBSCN: Final[int]
+    ELIBMAX: Final[int]
+    ELIBEXEC: Final[int]
+    ERESTART: Final[int]
+    ESTRPIPE: Final[int]
+    EUCLEAN: Final[int]
+    ENOTNAM: Final[int]
+    ENAVAIL: Final[int]
+    EISNAM: Final[int]
+    EREMOTEIO: Final[int]
     # All of the below are undocumented
-    EKEYEXPIRED: int
-    EKEYREJECTED: int
-    EKEYREVOKED: int
-    EMEDIUMTYPE: int
-    ENOKEY: int
-    ENOMEDIUM: int
-    ERFKILL: int
+    EKEYEXPIRED: Final[int]
+    EKEYREJECTED: Final[int]
+    EKEYREVOKED: Final[int]
+    EMEDIUMTYPE: Final[int]
+    ENOKEY: Final[int]
+    ENOMEDIUM: Final[int]
+    ERFKILL: Final[int]
 
     if sys.version_info >= (3, 14):
-        EHWPOISON: int
+        EHWPOISON: Final[int]
 
 if sys.platform == "win32":
     # All of these are undocumented
-    WSABASEERR: int
-    WSAEACCES: int
-    WSAEADDRINUSE: int
-    WSAEADDRNOTAVAIL: int
-    WSAEAFNOSUPPORT: int
-    WSAEALREADY: int
-    WSAEBADF: int
-    WSAECONNABORTED: int
-    WSAECONNREFUSED: int
-    WSAECONNRESET: int
-    WSAEDESTADDRREQ: int
-    WSAEDISCON: int
-    WSAEDQUOT: int
-    WSAEFAULT: int
-    WSAEHOSTDOWN: int
-    WSAEHOSTUNREACH: int
-    WSAEINPROGRESS: int
-    WSAEINTR: int
-    WSAEINVAL: int
-    WSAEISCONN: int
-    WSAELOOP: int
-    WSAEMFILE: int
-    WSAEMSGSIZE: int
-    WSAENAMETOOLONG: int
-    WSAENETDOWN: int
-    WSAENETRESET: int
-    WSAENETUNREACH: int
-    WSAENOBUFS: int
-    WSAENOPROTOOPT: int
-    WSAENOTCONN: int
-    WSAENOTEMPTY: int
-    WSAENOTSOCK: int
-    WSAEOPNOTSUPP: int
-    WSAEPFNOSUPPORT: int
-    WSAEPROCLIM: int
-    WSAEPROTONOSUPPORT: int
-    WSAEPROTOTYPE: int
-    WSAEREMOTE: int
-    WSAESHUTDOWN: int
-    WSAESOCKTNOSUPPORT: int
-    WSAESTALE: int
-    WSAETIMEDOUT: int
-    WSAETOOMANYREFS: int
-    WSAEUSERS: int
-    WSAEWOULDBLOCK: int
-    WSANOTINITIALISED: int
-    WSASYSNOTREADY: int
-    WSAVERNOTSUPPORTED: int
+    WSABASEERR: Final[int]
+    WSAEACCES: Final[int]
+    WSAEADDRINUSE: Final[int]
+    WSAEADDRNOTAVAIL: Final[int]
+    WSAEAFNOSUPPORT: Final[int]
+    WSAEALREADY: Final[int]
+    WSAEBADF: Final[int]
+    WSAECONNABORTED: Final[int]
+    WSAECONNREFUSED: Final[int]
+    WSAECONNRESET: Final[int]
+    WSAEDESTADDRREQ: Final[int]
+    WSAEDISCON: Final[int]
+    WSAEDQUOT: Final[int]
+    WSAEFAULT: Final[int]
+    WSAEHOSTDOWN: Final[int]
+    WSAEHOSTUNREACH: Final[int]
+    WSAEINPROGRESS: Final[int]
+    WSAEINTR: Final[int]
+    WSAEINVAL: Final[int]
+    WSAEISCONN: Final[int]
+    WSAELOOP: Final[int]
+    WSAEMFILE: Final[int]
+    WSAEMSGSIZE: Final[int]
+    WSAENAMETOOLONG: Final[int]
+    WSAENETDOWN: Final[int]
+    WSAENETRESET: Final[int]
+    WSAENETUNREACH: Final[int]
+    WSAENOBUFS: Final[int]
+    WSAENOPROTOOPT: Final[int]
+    WSAENOTCONN: Final[int]
+    WSAENOTEMPTY: Final[int]
+    WSAENOTSOCK: Final[int]
+    WSAEOPNOTSUPP: Final[int]
+    WSAEPFNOSUPPORT: Final[int]
+    WSAEPROCLIM: Final[int]
+    WSAEPROTONOSUPPORT: Final[int]
+    WSAEPROTOTYPE: Final[int]
+    WSAEREMOTE: Final[int]
+    WSAESHUTDOWN: Final[int]
+    WSAESOCKTNOSUPPORT: Final[int]
+    WSAESTALE: Final[int]
+    WSAETIMEDOUT: Final[int]
+    WSAETOOMANYREFS: Final[int]
+    WSAEUSERS: Final[int]
+    WSAEWOULDBLOCK: Final[int]
+    WSANOTINITIALISED: Final[int]
+    WSASYSNOTREADY: Final[int]
+    WSAVERNOTSUPPORTED: Final[int]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/faulthandler.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/faulthandler.pyi
index d52bf3a681..561223b39b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/faulthandler.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/faulthandler.pyi
@@ -21,8 +21,13 @@ def dump_traceback_later(timeout: float, repeat: bool = ..., file: FileDescripto
     or each timeout seconds if repeat is True. If exit is True, call _exit(1) which is not safe.
     """
 
-def enable(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None:
-    """Enable the fault handler."""
+if sys.version_info >= (3, 14):
+    def enable(file: FileDescriptorLike = ..., all_threads: bool = ..., c_stack: bool = True) -> None:
+        """Enable the fault handler."""
+
+else:
+    def enable(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None:
+        """Enable the fault handler."""
 
 def is_enabled() -> bool:
     """Check if the handler is enabled."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/filecmp.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/filecmp.pyi
index ddcce673d1..33e29bcc32 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/filecmp.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/filecmp.pyi
@@ -18,7 +18,7 @@ from typing import Any, AnyStr, Final, Generic, Literal
 
 __all__ = ["clear_cache", "cmp", "dircmp", "cmpfiles", "DEFAULT_IGNORES"]
 
-DEFAULT_IGNORES: list[str]
+DEFAULT_IGNORES: Final[list[str]]
 BUFSIZE: Final = 8192
 
 def cmp(f1: StrOrBytesPath, f2: StrOrBytesPath, shallow: bool | Literal[0, 1] = True) -> bool:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/fractions.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/fractions.pyi
index 7175a93952..07e88ca468 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/fractions.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/fractions.pyi
@@ -36,6 +36,7 @@ class Fraction(Rational):
 
     """
 
+    __slots__ = ("_numerator", "_denominator")
     @overload
     def __new__(cls, numerator: int | Rational = 0, denominator: int | Rational | None = None) -> Self:
         """Constructs a Rational.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/functools.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/functools.pyi
index 171c5d6fc3..cd65e31ae8 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/functools.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/functools.pyi
@@ -6,7 +6,7 @@ from _typeshed import SupportsAllComparisons, SupportsItems
 from collections.abc import Callable, Hashable, Iterable, Sized
 from types import GenericAlias
 from typing import Any, Final, Generic, Literal, NamedTuple, TypedDict, TypeVar, final, overload, type_check_only
-from typing_extensions import ParamSpec, Self, TypeAlias
+from typing_extensions import ParamSpec, Self, TypeAlias, disjoint_base
 
 __all__ = [
     "update_wrapper",
@@ -169,7 +169,7 @@ else:
         tuple[Literal["__module__"], Literal["__name__"], Literal["__qualname__"], Literal["__doc__"], Literal["__annotations__"]]
     ]
 
-WRAPPER_UPDATES: tuple[Literal["__dict__"]]
+WRAPPER_UPDATES: Final[tuple[Literal["__dict__"]]]
 
 @type_check_only
 class _Wrapped(Generic[_PWrapped, _RWrapped, _PWrapper, _RWrapper]):
@@ -292,6 +292,7 @@ def cmp_to_key(mycmp: Callable[[_T, _T], int]) -> Callable[[_T], SupportsAllComp
       Function that compares two objects.
     """
 
+@disjoint_base
 class partial(Generic[_T]):
     """Create a new function with partial application of the given arguments
     and keywords.
@@ -330,10 +331,17 @@ class partialmethod(Generic[_T]):
     func: Callable[..., _T] | _Descriptor
     args: tuple[Any, ...]
     keywords: dict[str, Any]
-    @overload
-    def __init__(self, func: Callable[..., _T], /, *args: Any, **keywords: Any) -> None: ...
-    @overload
-    def __init__(self, func: _Descriptor, /, *args: Any, **keywords: Any) -> None: ...
+    if sys.version_info >= (3, 14):
+        @overload
+        def __new__(self, func: Callable[..., _T], /, *args: Any, **keywords: Any) -> Self: ...
+        @overload
+        def __new__(self, func: _Descriptor, /, *args: Any, **keywords: Any) -> Self: ...
+    else:
+        @overload
+        def __init__(self, func: Callable[..., _T], /, *args: Any, **keywords: Any) -> None: ...
+        @overload
+        def __init__(self, func: _Descriptor, /, *args: Any, **keywords: Any) -> None: ...
+
     def __get__(self, obj: Any, cls: type[Any] | None = None) -> Callable[..., _T]: ...
     @property
     def __isabstractmethod__(self) -> bool: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/gc.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/gc.pyi
index c5aae2462f..6b231fa7bc 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/gc.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/gc.pyi
@@ -9,7 +9,7 @@ get_stats() -- Return list of dictionaries containing per-generation stats.
 set_debug() -- Set debugging flags.
 get_debug() -- Get debugging flags.
 set_threshold() -- Set the collection thresholds.
-get_threshold() -- Return the current the collection thresholds.
+get_threshold() -- Return the current collection thresholds.
 get_objects() -- Return a list of all objects tracked by the collector.
 is_tracked() -- Returns true if a given object is tracked.
 is_finalized() -- Returns true if a given object has been already finalized.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/getpass.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/getpass.pyi
index 3f5afa80ef..3242fd5779 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/getpass.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/getpass.pyi
@@ -24,8 +24,8 @@ if sys.version_info >= (3, 14):
           prompt: Written on stream to ask for the input.  Default: 'Password: '
           stream: A writable file object to display the prompt.  Defaults to
                   the tty.  If no tty is available defaults to sys.stderr.
-          echo_char: A string used to mask input (e.g., '*').  If None, input is
-                    hidden.
+          echo_char: A single ASCII character to mask input (e.g., '*').
+                  If None, input is hidden.
         Returns:
           The seKr3t input.
         Raises:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/gettext.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/gettext.pyi
index c5db318457..9b61fdad98 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/gettext.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/gettext.pyi
@@ -132,7 +132,7 @@ else:
         languages: Iterable[str] | None = None,
         class_: None = None,
         fallback: Literal[False] = False,
-        codeset: str | None = None,
+        codeset: str | None = ...,
     ) -> GNUTranslations: ...
     @overload
     def translation(
@@ -142,7 +142,7 @@ else:
         *,
         class_: Callable[[io.BufferedReader], _NullTranslationsT],
         fallback: Literal[False] = False,
-        codeset: str | None = None,
+        codeset: str | None = ...,
     ) -> _NullTranslationsT: ...
     @overload
     def translation(
@@ -151,7 +151,7 @@ else:
         languages: Iterable[str] | None,
         class_: Callable[[io.BufferedReader], _NullTranslationsT],
         fallback: Literal[False] = False,
-        codeset: str | None = None,
+        codeset: str | None = ...,
     ) -> _NullTranslationsT: ...
     @overload
     def translation(
@@ -160,18 +160,18 @@ else:
         languages: Iterable[str] | None = None,
         class_: Callable[[io.BufferedReader], NullTranslations] | None = None,
         fallback: bool = False,
-        codeset: str | None = None,
+        codeset: str | None = ...,
     ) -> NullTranslations: ...
     @overload
+    def install(domain: str, localedir: StrPath | None = None, names: Container[str] | None = None) -> None: ...
+    @overload
+    @deprecated("The `codeset` parameter is deprecated since Python 3.8; removed in Python 3.11.")
+    def install(domain: str, localedir: StrPath | None, codeset: str | None, /, names: Container[str] | None = None) -> None: ...
+    @overload
+    @deprecated("The `codeset` parameter is deprecated since Python 3.8; removed in Python 3.11.")
     def install(
-        domain: str, localedir: StrPath | None = None, codeset: None = None, names: Container[str] | None = None
+        domain: str, localedir: StrPath | None = None, *, codeset: str | None, names: Container[str] | None = None
     ) -> None: ...
-    @overload
-    @deprecated("The `codeset` parameter is deprecated since Python 3.8; removed in Python 3.11.")
-    def install(domain: str, localedir: StrPath | None, codeset: str, /, names: Container[str] | None = None) -> None: ...
-    @overload
-    @deprecated("The `codeset` parameter is deprecated since Python 3.8; removed in Python 3.11.")
-    def install(domain: str, localedir: StrPath | None = None, *, codeset: str, names: Container[str] | None = None) -> None: ...
 
 def textdomain(domain: str | None = None) -> str: ...
 def bindtextdomain(domain: str, localedir: StrPath | None = None) -> str: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/glob.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/glob.pyi
index d9863ba3b2..d3a6642a4c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/glob.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/glob.pyi
@@ -12,9 +12,13 @@ if sys.version_info >= (3, 13):
     __all__ += ["translate"]
 
 if sys.version_info >= (3, 10):
-    @deprecated("Will be removed in Python 3.15; Use `glob.glob` and pass *root_dir* argument instead.")
+    @deprecated(
+        "Deprecated since Python 3.10; will be removed in Python 3.15. Use `glob.glob()` with the *root_dir* argument instead."
+    )
     def glob0(dirname: AnyStr, pattern: AnyStr) -> list[AnyStr]: ...
-    @deprecated("Will be removed in Python 3.15; Use `glob.glob` and pass *root_dir* argument instead.")
+    @deprecated(
+        "Deprecated since Python 3.10; will be removed in Python 3.15. Use `glob.glob()` with the *root_dir* argument instead."
+    )
     def glob1(dirname: AnyStr, pattern: AnyStr) -> list[AnyStr]: ...
 
 else:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/hmac.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/hmac.pyi
index 1e103ef558..4aa8aea3cd 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/hmac.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/hmac.pyi
@@ -47,6 +47,7 @@ class HMAC:
     This supports the API for Cryptographic Hash Functions (PEP 247).
     """
 
+    __slots__ = ("_hmac", "_inner", "_outer", "block_size", "digest_size")
     digest_size: int
     block_size: int
     @property
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/html/entities.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/html/entities.pyi
index a44d3e10e2..0f7b8b04bb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/html/entities.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/html/entities.pyi
@@ -1,8 +1,10 @@
 """HTML character entity references."""
 
+from typing import Final
+
 __all__ = ["html5", "name2codepoint", "codepoint2name", "entitydefs"]
 
-name2codepoint: dict[str, int]
-html5: dict[str, str]
-codepoint2name: dict[int, str]
-entitydefs: dict[str, str]
+name2codepoint: Final[dict[str, int]]
+html5: Final[dict[str, str]]
+codepoint2name: Final[dict[int, str]]
+entitydefs: Final[dict[str, str]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/html/parser.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/html/parser.pyi
index cc71c2cb41..085b51186d 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/html/parser.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/html/parser.pyi
@@ -1,6 +1,5 @@
 """A parser for HTML and XHTML."""
 
-import sys
 from _markupbase import ParserBase
 from re import Pattern
 from typing import Final
@@ -30,9 +29,8 @@ class HTMLParser(ParserBase):
     """
 
     CDATA_CONTENT_ELEMENTS: Final[tuple[str, ...]]
-    if sys.version_info >= (3, 13):
-        # Added in 3.13.6
-        RCDATA_CONTENT_ELEMENTS: Final[tuple[str, ...]]
+    # Added in Python 3.9.23, 3.10.18, 3.11.13, 3.12.11, 3.13.6
+    RCDATA_CONTENT_ELEMENTS: Final[tuple[str, ...]]
 
     def __init__(self, *, convert_charrefs: bool = True) -> None:
         """Initialize and reset this instance.
@@ -71,11 +69,8 @@ class HTMLParser(ParserBase):
     def parse_html_declaration(self, i: int) -> int: ...  # undocumented
     def parse_pi(self, i: int) -> int: ...  # undocumented
     def parse_starttag(self, i: int) -> int: ...  # undocumented
-    if sys.version_info >= (3, 13):
-        # `escapable` parameter added in 3.13.6
-        def set_cdata_mode(self, elem: str, *, escapable: bool = False) -> None: ...  # undocumented
-    else:
-        def set_cdata_mode(self, elem: str) -> None: ...  # undocumented
+    # `escapable` parameter added in Python 3.9.23, 3.10.18, 3.11.13, 3.12.11, 3.13.6
+    def set_cdata_mode(self, elem: str, *, escapable: bool = False) -> None: ...  # undocumented
     rawdata: str  # undocumented
     cdata_elem: str | None  # undocumented
     convert_charrefs: bool  # undocumented
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/http/client.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/http/client.pyi
index 14a7dd6347..4fe786738c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/http/client.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/http/client.pyi
@@ -77,7 +77,7 @@ from _typeshed import MaybeNone, ReadableBuffer, SupportsRead, SupportsReadline,
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from email._policybase import _MessageT
 from socket import socket
-from typing import BinaryIO, Literal, TypeVar, overload
+from typing import BinaryIO, Final, TypeVar, overload
 from typing_extensions import Self, TypeAlias
 
 __all__ = [
@@ -106,85 +106,85 @@ _DataType: TypeAlias = SupportsRead[bytes] | Iterable[ReadableBuffer] | Readable
 _T = TypeVar("_T")
 _HeaderValue: TypeAlias = ReadableBuffer | str | int
 
-HTTP_PORT: int
-HTTPS_PORT: int
+HTTP_PORT: Final = 80
+HTTPS_PORT: Final = 443
 
 # Keep these global constants in sync with http.HTTPStatus (http/__init__.pyi).
 # They are present for backward compatibility reasons.
-CONTINUE: Literal[100]
-SWITCHING_PROTOCOLS: Literal[101]
-PROCESSING: Literal[102]
-EARLY_HINTS: Literal[103]
+CONTINUE: Final = 100
+SWITCHING_PROTOCOLS: Final = 101
+PROCESSING: Final = 102
+EARLY_HINTS: Final = 103
 
-OK: Literal[200]
-CREATED: Literal[201]
-ACCEPTED: Literal[202]
-NON_AUTHORITATIVE_INFORMATION: Literal[203]
-NO_CONTENT: Literal[204]
-RESET_CONTENT: Literal[205]
-PARTIAL_CONTENT: Literal[206]
-MULTI_STATUS: Literal[207]
-ALREADY_REPORTED: Literal[208]
-IM_USED: Literal[226]
+OK: Final = 200
+CREATED: Final = 201
+ACCEPTED: Final = 202
+NON_AUTHORITATIVE_INFORMATION: Final = 203
+NO_CONTENT: Final = 204
+RESET_CONTENT: Final = 205
+PARTIAL_CONTENT: Final = 206
+MULTI_STATUS: Final = 207
+ALREADY_REPORTED: Final = 208
+IM_USED: Final = 226
 
-MULTIPLE_CHOICES: Literal[300]
-MOVED_PERMANENTLY: Literal[301]
-FOUND: Literal[302]
-SEE_OTHER: Literal[303]
-NOT_MODIFIED: Literal[304]
-USE_PROXY: Literal[305]
-TEMPORARY_REDIRECT: Literal[307]
-PERMANENT_REDIRECT: Literal[308]
+MULTIPLE_CHOICES: Final = 300
+MOVED_PERMANENTLY: Final = 301
+FOUND: Final = 302
+SEE_OTHER: Final = 303
+NOT_MODIFIED: Final = 304
+USE_PROXY: Final = 305
+TEMPORARY_REDIRECT: Final = 307
+PERMANENT_REDIRECT: Final = 308
 
-BAD_REQUEST: Literal[400]
-UNAUTHORIZED: Literal[401]
-PAYMENT_REQUIRED: Literal[402]
-FORBIDDEN: Literal[403]
-NOT_FOUND: Literal[404]
-METHOD_NOT_ALLOWED: Literal[405]
-NOT_ACCEPTABLE: Literal[406]
-PROXY_AUTHENTICATION_REQUIRED: Literal[407]
-REQUEST_TIMEOUT: Literal[408]
-CONFLICT: Literal[409]
-GONE: Literal[410]
-LENGTH_REQUIRED: Literal[411]
-PRECONDITION_FAILED: Literal[412]
+BAD_REQUEST: Final = 400
+UNAUTHORIZED: Final = 401
+PAYMENT_REQUIRED: Final = 402
+FORBIDDEN: Final = 403
+NOT_FOUND: Final = 404
+METHOD_NOT_ALLOWED: Final = 405
+NOT_ACCEPTABLE: Final = 406
+PROXY_AUTHENTICATION_REQUIRED: Final = 407
+REQUEST_TIMEOUT: Final = 408
+CONFLICT: Final = 409
+GONE: Final = 410
+LENGTH_REQUIRED: Final = 411
+PRECONDITION_FAILED: Final = 412
 if sys.version_info >= (3, 13):
-    CONTENT_TOO_LARGE: Literal[413]
-REQUEST_ENTITY_TOO_LARGE: Literal[413]
+    CONTENT_TOO_LARGE: Final = 413
+REQUEST_ENTITY_TOO_LARGE: Final = 413
 if sys.version_info >= (3, 13):
-    URI_TOO_LONG: Literal[414]
-REQUEST_URI_TOO_LONG: Literal[414]
-UNSUPPORTED_MEDIA_TYPE: Literal[415]
+    URI_TOO_LONG: Final = 414
+REQUEST_URI_TOO_LONG: Final = 414
+UNSUPPORTED_MEDIA_TYPE: Final = 415
 if sys.version_info >= (3, 13):
-    RANGE_NOT_SATISFIABLE: Literal[416]
-REQUESTED_RANGE_NOT_SATISFIABLE: Literal[416]
-EXPECTATION_FAILED: Literal[417]
-IM_A_TEAPOT: Literal[418]
-MISDIRECTED_REQUEST: Literal[421]
+    RANGE_NOT_SATISFIABLE: Final = 416
+REQUESTED_RANGE_NOT_SATISFIABLE: Final = 416
+EXPECTATION_FAILED: Final = 417
+IM_A_TEAPOT: Final = 418
+MISDIRECTED_REQUEST: Final = 421
 if sys.version_info >= (3, 13):
-    UNPROCESSABLE_CONTENT: Literal[422]
-UNPROCESSABLE_ENTITY: Literal[422]
-LOCKED: Literal[423]
-FAILED_DEPENDENCY: Literal[424]
-TOO_EARLY: Literal[425]
-UPGRADE_REQUIRED: Literal[426]
-PRECONDITION_REQUIRED: Literal[428]
-TOO_MANY_REQUESTS: Literal[429]
-REQUEST_HEADER_FIELDS_TOO_LARGE: Literal[431]
-UNAVAILABLE_FOR_LEGAL_REASONS: Literal[451]
+    UNPROCESSABLE_CONTENT: Final = 422
+UNPROCESSABLE_ENTITY: Final = 422
+LOCKED: Final = 423
+FAILED_DEPENDENCY: Final = 424
+TOO_EARLY: Final = 425
+UPGRADE_REQUIRED: Final = 426
+PRECONDITION_REQUIRED: Final = 428
+TOO_MANY_REQUESTS: Final = 429
+REQUEST_HEADER_FIELDS_TOO_LARGE: Final = 431
+UNAVAILABLE_FOR_LEGAL_REASONS: Final = 451
 
-INTERNAL_SERVER_ERROR: Literal[500]
-NOT_IMPLEMENTED: Literal[501]
-BAD_GATEWAY: Literal[502]
-SERVICE_UNAVAILABLE: Literal[503]
-GATEWAY_TIMEOUT: Literal[504]
-HTTP_VERSION_NOT_SUPPORTED: Literal[505]
-VARIANT_ALSO_NEGOTIATES: Literal[506]
-INSUFFICIENT_STORAGE: Literal[507]
-LOOP_DETECTED: Literal[508]
-NOT_EXTENDED: Literal[510]
-NETWORK_AUTHENTICATION_REQUIRED: Literal[511]
+INTERNAL_SERVER_ERROR: Final = 500
+NOT_IMPLEMENTED: Final = 501
+BAD_GATEWAY: Final = 502
+SERVICE_UNAVAILABLE: Final = 503
+GATEWAY_TIMEOUT: Final = 504
+HTTP_VERSION_NOT_SUPPORTED: Final = 505
+VARIANT_ALSO_NEGOTIATES: Final = 506
+INSUFFICIENT_STORAGE: Final = 507
+LOOP_DETECTED: Final = 508
+NOT_EXTENDED: Final = 510
+NETWORK_AUTHENTICATION_REQUIRED: Final = 511
 
 responses: dict[int, str]
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/http/server.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/http/server.pyi
index 214d5bb8f8..f558baca6b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/http/server.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/http/server.pyi
@@ -433,46 +433,91 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
 def executable(path: StrPath) -> bool:  # undocumented
     """Test for executable file."""
 
-@deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
-    """Complete HTTP server with GET, HEAD and POST commands.
+if sys.version_info >= (3, 13):
+    @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+    class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
+        """Complete HTTP server with GET, HEAD and POST commands.
 
-    GET and HEAD also support running CGI scripts.
+        GET and HEAD also support running CGI scripts.
 
-    The POST command is *only* implemented for CGI scripts.
-
-    """
-
-    cgi_directories: list[str]
-    have_fork: bool  # undocumented
-    def do_POST(self) -> None:
-        """Serve a POST request.
-
-        This is only implemented for CGI scripts.
+        The POST command is *only* implemented for CGI scripts.
 
         """
 
-    def is_cgi(self) -> bool:  # undocumented
-        """Test whether self.path corresponds to a CGI script.
+        cgi_directories: list[str]
+        have_fork: bool  # undocumented
+        def do_POST(self) -> None:
+            """Serve a POST request.
 
-        Returns True and updates the cgi_info attribute to the tuple
-        (dir, rest) if self.path requires running a CGI script.
-        Returns False otherwise.
+            This is only implemented for CGI scripts.
 
-        If any exception is raised, the caller should assume that
-        self.path was rejected as invalid and act accordingly.
+            """
 
-        The default implementation tests whether the normalized url
-        path begins with one of the strings in self.cgi_directories
-        (and the next character is a '/' or the end of the string).
+        def is_cgi(self) -> bool:  # undocumented
+            """Test whether self.path corresponds to a CGI script.
+
+            Returns True and updates the cgi_info attribute to the tuple
+            (dir, rest) if self.path requires running a CGI script.
+            Returns False otherwise.
+
+            If any exception is raised, the caller should assume that
+            self.path was rejected as invalid and act accordingly.
+
+            The default implementation tests whether the normalized url
+            path begins with one of the strings in self.cgi_directories
+            (and the next character is a '/' or the end of the string).
+
+            """
+
+        def is_executable(self, path: StrPath) -> bool:  # undocumented
+            """Test whether argument path is an executable file."""
+
+        def is_python(self, path: StrPath) -> bool:  # undocumented
+            """Test whether argument path is a Python script."""
+
+        def run_cgi(self) -> None:  # undocumented
+            """Execute a CGI script."""
+
+else:
+    class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
+        """Complete HTTP server with GET, HEAD and POST commands.
+
+        GET and HEAD also support running CGI scripts.
+
+        The POST command is *only* implemented for CGI scripts.
 
         """
 
-    def is_executable(self, path: StrPath) -> bool:  # undocumented
-        """Test whether argument path is an executable file."""
+        cgi_directories: list[str]
+        have_fork: bool  # undocumented
+        def do_POST(self) -> None:
+            """Serve a POST request.
 
-    def is_python(self, path: StrPath) -> bool:  # undocumented
-        """Test whether argument path is a Python script."""
+            This is only implemented for CGI scripts.
 
-    def run_cgi(self) -> None:  # undocumented
-        """Execute a CGI script."""
+            """
+
+        def is_cgi(self) -> bool:  # undocumented
+            """Test whether self.path corresponds to a CGI script.
+
+            Returns True and updates the cgi_info attribute to the tuple
+            (dir, rest) if self.path requires running a CGI script.
+            Returns False otherwise.
+
+            If any exception is raised, the caller should assume that
+            self.path was rejected as invalid and act accordingly.
+
+            The default implementation tests whether the normalized url
+            path begins with one of the strings in self.cgi_directories
+            (and the next character is a '/' or the end of the string).
+
+            """
+
+        def is_executable(self, path: StrPath) -> bool:  # undocumented
+            """Test whether argument path is an executable file."""
+
+        def is_python(self, path: StrPath) -> bool:  # undocumented
+            """Test whether argument path is a Python script."""
+
+        def run_cgi(self) -> None:  # undocumented
+            """Execute a CGI script."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/imp.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/imp.pyi
index 0131b6ae8a..119a9a497d 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/imp.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/imp.pyi
@@ -21,18 +21,18 @@ from _imp import (
 from _typeshed import StrPath
 from os import PathLike
 from types import TracebackType
-from typing import IO, Any, Protocol, type_check_only
+from typing import IO, Any, Final, Protocol, type_check_only
 
-SEARCH_ERROR: int
-PY_SOURCE: int
-PY_COMPILED: int
-C_EXTENSION: int
-PY_RESOURCE: int
-PKG_DIRECTORY: int
-C_BUILTIN: int
-PY_FROZEN: int
-PY_CODERESOURCE: int
-IMP_HOOK: int
+SEARCH_ERROR: Final = 0
+PY_SOURCE: Final = 1
+PY_COMPILED: Final = 2
+C_EXTENSION: Final = 3
+PY_RESOURCE: Final = 4
+PKG_DIRECTORY: Final = 5
+C_BUILTIN: Final = 6
+PY_FROZEN: Final = 7
+PY_CODERESOURCE: Final = 8
+IMP_HOOK: Final = 9
 
 def new_module(name: str) -> types.ModuleType:
     """**DEPRECATED**
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/abc.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/abc.pyi
index 5dfe7c7272..ae2f291d55 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/abc.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/abc.pyi
@@ -81,7 +81,7 @@ if sys.version_info < (3, 12):
         Deprecated since Python 3.3
         """
 
-@deprecated("Deprecated as of Python 3.7: Use importlib.resources.abc.TraversableResources instead.")
+@deprecated("Deprecated since Python 3.7. Use `importlib.resources.abc.TraversableResources` instead.")
 class ResourceLoader(Loader):
     """Abstract base class for loaders which can return data from their
     back-end storage to facilitate reading data to perform an import.
@@ -136,7 +136,7 @@ class InspectLoader(Loader):
 
     @staticmethod
     def source_to_code(
-        data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: ReadableBuffer | StrPath = "<string>"
+        data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: bytes | StrPath = "<string>"
     ) -> types.CodeType:
         """Compile 'data' into a code object.
 
@@ -176,7 +176,7 @@ class SourceLoader(_bootstrap_external.SourceLoader, ResourceLoader, ExecutionLo
 
     """
 
-    @deprecated("Deprecated as of Python 3.3: Use importlib.resources.abc.SourceLoader.path_stats instead.")
+    @deprecated("Deprecated since Python 3.3. Use `importlib.resources.abc.SourceLoader.path_stats` instead.")
     def path_mtime(self, path: str) -> float:
         """Return the (int) modification time for the path (str)."""
 
@@ -342,10 +342,10 @@ class FileLoader(_bootstrap_external.FileLoader, ResourceLoader, ExecutionLoader
     def get_data(self, path: str) -> bytes:
         """Return the data from path as raw bytes."""
 
-    def get_filename(self, name: str | None = None) -> str:
+    def get_filename(self, fullname: str | None = None) -> str:
         """Return the path to the source file as found by the finder."""
 
-    def load_module(self, name: str | None = None) -> types.ModuleType:
+    def load_module(self, fullname: str | None = None) -> types.ModuleType:
         """Load a module from a file.
 
         This method is deprecated.  Use exec_module() instead.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/metadata/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/metadata/__init__.pyi
index 478aa35139..f2e832714a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/metadata/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/metadata/__init__.pyi
@@ -11,7 +11,7 @@ from os import PathLike
 from pathlib import Path
 from re import Pattern
 from typing import Any, ClassVar, Generic, NamedTuple, TypeVar, overload
-from typing_extensions import Self, TypeAlias, deprecated
+from typing_extensions import Self, TypeAlias, deprecated, disjoint_base
 
 _T = TypeVar("_T")
 _KT = TypeVar("_KT")
@@ -83,44 +83,42 @@ else:
         value: str
         group: str
 
-class EntryPoint(_EntryPointBase):
-    """An entry point as defined by Python packaging conventions.
+if sys.version_info >= (3, 11):
+    class EntryPoint(_EntryPointBase):
+        """An entry point as defined by Python packaging conventions.
 
-    See `the packaging docs on entry points
-    <https://packaging.python.org/specifications/entry-points/>`_
-    for more information.
+        See `the packaging docs on entry points
+        <https://packaging.python.org/specifications/entry-points/>`_
+        for more information.
 
-    >>> ep = EntryPoint(
-    ...     name=None, group=None, value='package.module:attr [extra1, extra2]')
-    >>> ep.module
-    'package.module'
-    >>> ep.attr
-    'attr'
-    >>> ep.extras
-    ['extra1', 'extra2']
-    """
+        >>> ep = EntryPoint(
+        ...     name=None, group=None, value='package.module:attr [extra1, extra2]')
+        >>> ep.module
+        'package.module'
+        >>> ep.attr
+        'attr'
+        >>> ep.extras
+        ['extra1', 'extra2']
+        """
 
-    pattern: ClassVar[Pattern[str]]
-    if sys.version_info >= (3, 11):
+        pattern: ClassVar[Pattern[str]]
         name: str
         value: str
         group: str
 
         def __init__(self, name: str, value: str, group: str) -> None: ...
+        def load(self) -> Any:  # Callable[[], Any] or an importable module
+            """Load the entry point from its definition. If only a module
+            is indicated by the value, return that module. Otherwise,
+            return the named object.
+            """
 
-    def load(self) -> Any:  # Callable[[], Any] or an importable module
-        """Load the entry point from its definition. If only a module
-        is indicated by the value, return that module. Otherwise,
-        return the named object.
-        """
-
-    @property
-    def extras(self) -> list[str]: ...
-    @property
-    def module(self) -> str: ...
-    @property
-    def attr(self) -> str: ...
-    if sys.version_info >= (3, 10):
+        @property
+        def extras(self) -> list[str]: ...
+        @property
+        def module(self) -> str: ...
+        @property
+        def attr(self) -> str: ...
         dist: ClassVar[Distribution | None]
         def matches(
             self,
@@ -152,11 +150,81 @@ class EntryPoint(_EntryPointBase):
             True
             """
 
-    def __hash__(self) -> int: ...
-    if sys.version_info >= (3, 11):
+        def __hash__(self) -> int: ...
         def __eq__(self, other: object) -> bool: ...
         def __lt__(self, other: object) -> bool: ...
-    if sys.version_info < (3, 12):
+        if sys.version_info < (3, 12):
+            def __iter__(self) -> Iterator[Any]:  # result of iter((str, Self)), really
+                """
+                Supply iter so one may construct dicts of EntryPoints by name.
+                """
+
+else:
+    @disjoint_base
+    class EntryPoint(_EntryPointBase):
+        """An entry point as defined by Python packaging conventions.
+
+        See `the packaging docs on entry points
+        <https://packaging.python.org/specifications/entry-points/>`_
+        for more information.
+
+        >>> ep = EntryPoint(
+        ...     name=None, group=None, value='package.module:attr [extra1, extra2]')
+        >>> ep.module
+        'package.module'
+        >>> ep.attr
+        'attr'
+        >>> ep.extras
+        ['extra1', 'extra2']
+        """
+
+        pattern: ClassVar[Pattern[str]]
+
+        def load(self) -> Any:  # Callable[[], Any] or an importable module
+            """Load the entry point from its definition. If only a module
+            is indicated by the value, return that module. Otherwise,
+            return the named object.
+            """
+
+        @property
+        def extras(self) -> list[str]: ...
+        @property
+        def module(self) -> str: ...
+        @property
+        def attr(self) -> str: ...
+        if sys.version_info >= (3, 10):
+            dist: ClassVar[Distribution | None]
+            def matches(
+                self,
+                *,
+                name: str = ...,
+                value: str = ...,
+                group: str = ...,
+                module: str = ...,
+                attr: str = ...,
+                extras: list[str] = ...,
+            ) -> bool:  # undocumented
+                """
+                EntryPoint matches the given parameters.
+
+                >>> ep = EntryPoint(group='foo', name='bar', value='bing:bong [extra1, extra2]')
+                >>> ep.matches(group='foo')
+                True
+                >>> ep.matches(name='bar', value='bing:bong [extra1, extra2]')
+                True
+                >>> ep.matches(group='foo', name='other')
+                False
+                >>> ep.matches()
+                True
+                >>> ep.matches(extras=['extra1', 'extra2'])
+                True
+                >>> ep.matches(module='bing')
+                True
+                >>> ep.matches(attr='bong')
+                True
+                """
+
+        def __hash__(self) -> int: ...
         def __iter__(self) -> Iterator[Any]:  # result of iter((str, Self)), really
             """
             Supply iter so one may construct dicts of EntryPoints by name.
@@ -168,6 +236,7 @@ if sys.version_info >= (3, 12):
         An immutable collection of selectable EntryPoint objects.
         """
 
+        __slots__ = ()
         def __getitem__(self, name: str) -> EntryPoint:  # type: ignore[override]
             """
             Get the EntryPoint in self matching name.
@@ -233,12 +302,15 @@ elif sys.version_info >= (3, 10):
         1
         """
 
+        __slots__ = ()
+
     class EntryPoints(DeprecatedList[EntryPoint]):  # use as list is deprecated since 3.10
         """
         An immutable collection of selectable EntryPoint objects.
         """
 
         # int argument is deprecated since 3.10
+        __slots__ = ()
         def __getitem__(self, name: int | str) -> EntryPoint:  # type: ignore[override]
             """
             Get the EntryPoint in self matching name.
@@ -507,7 +579,7 @@ class Distribution(_distribution_parent):
             """Return the 'Name' metadata for the distribution package."""
     if sys.version_info >= (3, 13):
         @property
-        def origin(self) -> types.SimpleNamespace: ...
+        def origin(self) -> types.SimpleNamespace | None: ...
 
 class DistributionFinder(MetaPathFinder):
     """
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/__init__.pyi
index fb0ac53ac1..bc87745ca6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/__init__.pyi
@@ -14,7 +14,7 @@ from contextlib import AbstractContextManager
 from pathlib import Path
 from types import ModuleType
 from typing import Any, BinaryIO, Literal, TextIO
-from typing_extensions import TypeAlias
+from typing_extensions import TypeAlias, deprecated
 
 if sys.version_info >= (3, 11):
     from importlib.resources.abc import Traversable
@@ -98,14 +98,23 @@ else:
 
         Directories are *not* resources.
         """
+    if sys.version_info >= (3, 11):
+        @deprecated("Deprecated since Python 3.11. Use `files(anchor).iterdir()`.")
+        def contents(package: Package) -> Iterator[str]:
+            """Return an iterable of entries in `package`.
 
-    def contents(package: Package) -> Iterator[str]:
-        """Return an iterable of entries in `package`.
+            Note that not all entries are resources.  Specifically, directories are
+            not considered resources.  Use `is_resource()` on each entry returned here
+            to check if it is a resource or not.
+            """
+    else:
+        def contents(package: Package) -> Iterator[str]:
+            """Return an iterable of entries in 'package'.
 
-        Note that not all entries are resources.  Specifically, directories are
-        not considered resources.  Use `is_resource()` on each entry returned here
-        to check if it is a resource or not.
-        """
+            Note that not all entries are resources.  Specifically, directories are
+            not considered resources.  Use `is_resource()` on each entry returned here
+            to check if it is a resource or not.
+            """
 
 if sys.version_info >= (3, 11):
     from importlib.resources._common import as_file as as_file
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_common.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_common.pyi
index 83371a58a4..c4250d4e27 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_common.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_common.pyi
@@ -37,7 +37,7 @@ if sys.version_info >= (3, 11):
             """
 
         @overload
-        @deprecated("First parameter to files is renamed to 'anchor'")
+        @deprecated("Deprecated since Python 3.12; will be removed in Python 3.15. Use `anchor` parameter instead.")
         def files(package: Anchor | None = None) -> Traversable: ...
 
     else:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_functional.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_functional.pyi
index e25c9a8e3a..9bea507086 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_functional.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/importlib/resources/_functional.pyi
@@ -11,7 +11,7 @@ if sys.version_info >= (3, 13):
     from io import TextIOWrapper
     from pathlib import Path
     from typing import BinaryIO, Literal, overload
-    from typing_extensions import Unpack
+    from typing_extensions import Unpack, deprecated
 
     def open_binary(anchor: Anchor, *path_names: StrPath) -> BinaryIO:
         """Open for binary reading the *resource* within *package*."""
@@ -44,6 +44,7 @@ if sys.version_info >= (3, 13):
         Otherwise returns ``False``.
         """
 
+    @deprecated("Deprecated since Python 3.11. Use `files(anchor).iterdir()`.")
     def contents(anchor: Anchor, *path_names: StrPath) -> Iterator[str]:
         """Return an iterable over the named resources within the package.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/inspect.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/inspect.pyi
index bfa55f2f72..08d3d9d299 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/inspect.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/inspect.pyi
@@ -54,7 +54,7 @@ from types import (
     WrapperDescriptorType,
 )
 from typing import Any, ClassVar, Final, Literal, NamedTuple, Protocol, TypeVar, overload, type_check_only
-from typing_extensions import ParamSpec, Self, TypeAlias, TypeGuard, TypeIs, deprecated
+from typing_extensions import ParamSpec, Self, TypeAlias, TypeGuard, TypeIs, deprecated, disjoint_base
 
 if sys.version_info >= (3, 14):
     from annotationlib import Format
@@ -640,6 +640,7 @@ class Signature:
         to parameters (simulating 'functools.partial' behavior.)
     """
 
+    __slots__ = ("_return_annotation", "_parameters")
     def __init__(
         self, parameters: Sequence[Parameter] | None = None, *, return_annotation: Any = ..., __validate_parameters__: bool = True
     ) -> None:
@@ -842,6 +843,7 @@ class Parameter:
         `Parameter.KEYWORD_ONLY`, `Parameter.VAR_KEYWORD`.
     """
 
+    __slots__ = ("_name", "_kind", "_default", "_annotation")
     def __init__(self, name: str, kind: _ParameterKind, *, default: Any = ..., annotation: Any = ...) -> None: ...
     empty = _empty
 
@@ -890,6 +892,7 @@ class BoundArguments:
         Dict of keyword arguments values.
     """
 
+    __slots__ = ("arguments", "_signature", "__weakref__")
     arguments: OrderedDict[str, Any]
     @property
     def args(self) -> tuple[Any, ...]: ...
@@ -1140,19 +1143,6 @@ if sys.version_info >= (3, 11):
         code_context: list[str] | None
         index: int | None  # type: ignore[assignment]
 
-    class Traceback(_Traceback):
-        positions: dis.Positions | None
-        def __new__(
-            cls,
-            filename: str,
-            lineno: int,
-            function: str,
-            code_context: list[str] | None,
-            index: int | None,
-            *,
-            positions: dis.Positions | None = None,
-        ) -> Self: ...
-
     class _FrameInfo(NamedTuple):
         """_FrameInfo(frame, filename, lineno, function, code_context, index)"""
 
@@ -1163,19 +1153,63 @@ if sys.version_info >= (3, 11):
         code_context: list[str] | None
         index: int | None  # type: ignore[assignment]
 
-    class FrameInfo(_FrameInfo):
-        positions: dis.Positions | None
-        def __new__(
-            cls,
-            frame: FrameType,
-            filename: str,
-            lineno: int,
-            function: str,
-            code_context: list[str] | None,
-            index: int | None,
-            *,
-            positions: dis.Positions | None = None,
-        ) -> Self: ...
+    if sys.version_info >= (3, 12):
+        class Traceback(_Traceback):
+            positions: dis.Positions | None
+            def __new__(
+                cls,
+                filename: str,
+                lineno: int,
+                function: str,
+                code_context: list[str] | None,
+                index: int | None,
+                *,
+                positions: dis.Positions | None = None,
+            ) -> Self: ...
+
+        class FrameInfo(_FrameInfo):
+            positions: dis.Positions | None
+            def __new__(
+                cls,
+                frame: FrameType,
+                filename: str,
+                lineno: int,
+                function: str,
+                code_context: list[str] | None,
+                index: int | None,
+                *,
+                positions: dis.Positions | None = None,
+            ) -> Self: ...
+
+    else:
+        @disjoint_base
+        class Traceback(_Traceback):
+            positions: dis.Positions | None
+            def __new__(
+                cls,
+                filename: str,
+                lineno: int,
+                function: str,
+                code_context: list[str] | None,
+                index: int | None,
+                *,
+                positions: dis.Positions | None = None,
+            ) -> Self: ...
+
+        @disjoint_base
+        class FrameInfo(_FrameInfo):
+            positions: dis.Positions | None
+            def __new__(
+                cls,
+                frame: FrameType,
+                filename: str,
+                lineno: int,
+                function: str,
+                code_context: list[str] | None,
+                index: int | None,
+                *,
+                positions: dis.Positions | None = None,
+            ) -> Self: ...
 
 else:
     class Traceback(NamedTuple):
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/io.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/io.pyi
index 34366c036f..94d8ed0257 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/io.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/io.pyi
@@ -162,6 +162,7 @@ if sys.version_info >= (3, 14):
         This protocol only supports blocking I/O.
         """
 
+        __slots__ = ()
         def read(self, size: int = ..., /) -> _T_co:
             """Read data from the input stream and return it.
 
@@ -175,5 +176,6 @@ if sys.version_info >= (3, 14):
         This protocol only supports blocking I/O.
         """
 
+        __slots__ = ()
         def write(self, data: _T_contra, /) -> int:
             """Write *data* to the output stream and return the number of items written."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ipaddress.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ipaddress.pyi
index 4e8137a5f1..f8397ff5b3 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ipaddress.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ipaddress.pyi
@@ -83,6 +83,7 @@ def ip_interface(
 class _IPAddressBase:
     """The mother class."""
 
+    __slots__ = ()
     @property
     def compressed(self) -> str:
         """Return the shorthand version of the IP address as a string."""
@@ -111,6 +112,7 @@ class _BaseAddress(_IPAddressBase):
     used by single IP addresses.
     """
 
+    __slots__ = ()
     def __add__(self, other: int) -> Self: ...
     def __hash__(self) -> int: ...
     def __int__(self) -> int: ...
@@ -255,7 +257,7 @@ class _BaseNetwork(_IPAddressBase, Generic[_A]):
 
         """
 
-    def hosts(self) -> Iterator[_A]:
+    def hosts(self) -> Iterator[_A] | list[_A]:
         """Generate Iterator over usable hosts in a network.
 
         This is like __iter__ except it doesn't return the network
@@ -413,6 +415,7 @@ class _BaseV4:
 
     """
 
+    __slots__ = ()
     if sys.version_info >= (3, 14):
         version: Final = 4
         max_prefixlen: Final = 32
@@ -425,6 +428,7 @@ class _BaseV4:
 class IPv4Address(_BaseV4, _BaseAddress):
     """Represent and manipulate single IPv4 Addresses."""
 
+    __slots__ = ("_ip", "__weakref__")
     def __init__(self, address: object) -> None:
         """
         Args:
@@ -607,6 +611,7 @@ class _BaseV6:
 
     """
 
+    __slots__ = ()
     if sys.version_info >= (3, 14):
         version: Final = 6
         max_prefixlen: Final = 128
@@ -619,6 +624,7 @@ class _BaseV6:
 class IPv6Address(_BaseV6, _BaseAddress):
     """Represent and manipulate single IPv6 Addresses."""
 
+    __slots__ = ("_ip", "_scope_id", "__weakref__")
     def __init__(self, address: object) -> None:
         """Instantiate a new IPv6 address object.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/itertools.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/itertools.pyi
index 453ec01c94..4c1eaf164d 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/itertools.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/itertools.pyi
@@ -34,7 +34,7 @@ from _typeshed import MaybeNone
 from collections.abc import Callable, Iterable, Iterator
 from types import GenericAlias
 from typing import Any, Generic, Literal, SupportsComplex, SupportsFloat, SupportsIndex, SupportsInt, TypeVar, overload
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 _T = TypeVar("_T")
 _S = TypeVar("_S")
@@ -58,6 +58,7 @@ _Predicate: TypeAlias = Callable[[_T], object]
 
 # Technically count can take anything that implements a number protocol and has an add method
 # but we can't enforce the add method
+@disjoint_base
 class count(Generic[_N]):
     """Return a count object whose .__next__() method returns consecutive values.
 
@@ -81,6 +82,7 @@ class count(Generic[_N]):
     def __iter__(self) -> Self:
         """Implement iter(self)."""
 
+@disjoint_base
 class cycle(Generic[_T]):
     """Return elements from the iterable until it is exhausted. Then repeat the sequence indefinitely."""
 
@@ -91,6 +93,7 @@ class cycle(Generic[_T]):
     def __iter__(self) -> Self:
         """Implement iter(self)."""
 
+@disjoint_base
 class repeat(Generic[_T]):
     """repeat(object [,times]) -> create an iterator which returns the object
     for the specified number of times.  If not specified, returns the object
@@ -110,6 +113,7 @@ class repeat(Generic[_T]):
     def __length_hint__(self) -> int:
         """Private method returning an estimate of len(list(it))."""
 
+@disjoint_base
 class accumulate(Generic[_T]):
     """Return series of accumulated sums (or other binary function results)."""
 
@@ -123,6 +127,7 @@ class accumulate(Generic[_T]):
     def __next__(self) -> _T:
         """Implement next(self)."""
 
+@disjoint_base
 class chain(Generic[_T]):
     """Return a chain object whose .__next__() method returns elements from the
     first iterable until it is exhausted, then elements from the next
@@ -144,6 +149,7 @@ class chain(Generic[_T]):
     def __class_getitem__(cls, item: Any, /) -> GenericAlias:
         """See PEP 585"""
 
+@disjoint_base
 class compress(Generic[_T]):
     """Return data elements corresponding to true selector elements.
 
@@ -158,6 +164,7 @@ class compress(Generic[_T]):
     def __next__(self) -> _T:
         """Implement next(self)."""
 
+@disjoint_base
 class dropwhile(Generic[_T]):
     """Drop items from the iterable while predicate(item) is true.
 
@@ -171,6 +178,7 @@ class dropwhile(Generic[_T]):
     def __next__(self) -> _T:
         """Implement next(self)."""
 
+@disjoint_base
 class filterfalse(Generic[_T]):
     """Return those items of iterable for which function(item) is false.
 
@@ -184,6 +192,7 @@ class filterfalse(Generic[_T]):
     def __next__(self) -> _T:
         """Implement next(self)."""
 
+@disjoint_base
 class groupby(Generic[_T_co, _S_co]):
     """make an iterator that returns consecutive keys and groups from the iterable
 
@@ -205,6 +214,7 @@ class groupby(Generic[_T_co, _S_co]):
     def __next__(self) -> tuple[_T_co, Iterator[_S_co]]:
         """Implement next(self)."""
 
+@disjoint_base
 class islice(Generic[_T]):
     """islice(iterable, stop) --> islice object
     islice(iterable, start, stop[, step]) --> islice object
@@ -227,6 +237,7 @@ class islice(Generic[_T]):
     def __next__(self) -> _T:
         """Implement next(self)."""
 
+@disjoint_base
 class starmap(Generic[_T_co]):
     """Return an iterator whose values are returned from the function evaluated with an argument tuple taken from the given sequence."""
 
@@ -237,6 +248,7 @@ class starmap(Generic[_T_co]):
     def __next__(self) -> _T_co:
         """Implement next(self)."""
 
+@disjoint_base
 class takewhile(Generic[_T]):
     """Return successive entries from an iterable as long as the predicate evaluates to true for each entry."""
 
@@ -250,6 +262,7 @@ class takewhile(Generic[_T]):
 def tee(iterable: Iterable[_T], n: int = 2, /) -> tuple[Iterator[_T], ...]:
     """Returns a tuple of n independent iterators."""
 
+@disjoint_base
 class zip_longest(Generic[_T_co]):
     """Return a zip_longest object whose .__next__() method returns a tuple where
     the i-th element comes from the i-th iterable argument.  The .__next__()
@@ -339,6 +352,7 @@ class zip_longest(Generic[_T_co]):
     def __next__(self) -> _T_co:
         """Implement next(self)."""
 
+@disjoint_base
 class product(Generic[_T_co]):
     """Cartesian product of input iterables.  Equivalent to nested for-loops.
 
@@ -442,6 +456,7 @@ class product(Generic[_T_co]):
     def __next__(self) -> _T_co:
         """Implement next(self)."""
 
+@disjoint_base
 class permutations(Generic[_T_co]):
     """Return successive r-length permutations of elements in the iterable.
 
@@ -464,6 +479,7 @@ class permutations(Generic[_T_co]):
     def __next__(self) -> _T_co:
         """Implement next(self)."""
 
+@disjoint_base
 class combinations(Generic[_T_co]):
     """Return successive r-length combinations of elements in the iterable.
 
@@ -486,6 +502,7 @@ class combinations(Generic[_T_co]):
     def __next__(self) -> _T_co:
         """Implement next(self)."""
 
+@disjoint_base
 class combinations_with_replacement(Generic[_T_co]):
     """Return successive r-length combinations of elements in the iterable allowing individual elements to have successive repeats.
 
@@ -509,6 +526,7 @@ class combinations_with_replacement(Generic[_T_co]):
         """Implement next(self)."""
 
 if sys.version_info >= (3, 10):
+    @disjoint_base
     class pairwise(Generic[_T_co]):
         """Return an iterator of overlapping pairs taken from the input iterator.
 
@@ -523,6 +541,7 @@ if sys.version_info >= (3, 10):
             """Implement next(self)."""
 
 if sys.version_info >= (3, 12):
+    @disjoint_base
     class batched(Generic[_T_co]):
         """Batch data into tuples of length n. The last batch may be shorter than n.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/lib2to3/fixes/fix_tuple_params.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/lib2to3/fixes/fix_tuple_params.pyi
index f61837d19d..263a340f47 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/lib2to3/fixes/fix_tuple_params.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/lib2to3/fixes/fix_tuple_params.pyi
@@ -17,7 +17,6 @@ It will also support lambdas:
     lambda (x): x + y -> lambda x: x + y
 """
 
-from _typeshed import Incomplete
 from typing import ClassVar, Literal
 
 from .. import fixer_base
@@ -32,5 +31,5 @@ class FixTupleParams(fixer_base.BaseFix):
 
 def simplify_args(node): ...
 def find_params(node): ...
-def map_to_index(param_list, prefix=..., d: Incomplete | None = ...): ...
+def map_to_index(param_list, prefix=[], d=None): ...
 def tuple_name(param_list): ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/logging/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/logging/__init__.pyi
index 0c47d8bd65..657c65a8b6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/logging/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/logging/__init__.pyi
@@ -314,7 +314,7 @@ class Logger(Filterer):
         logger.warning("Houston, we have a %s", "bit of a problem", exc_info=True)
         """
 
-    @deprecated("Deprecated; use warning() instead.")
+    @deprecated("Deprecated since Python 3.3. Use `Logger.warning()` instead.")
     def warn(
         self,
         msg: object,
@@ -1005,7 +1005,7 @@ class LoggerAdapter(Generic[_L]):
         Delegate a warning call to the underlying logger.
         """
 
-    @deprecated("Deprecated; use warning() instead.")
+    @deprecated("Deprecated since Python 3.3. Use `LoggerAdapter.warning()` instead.")
     def warn(
         self,
         msg: object,
@@ -1189,7 +1189,7 @@ def warning(
     format.
     """
 
-@deprecated("Deprecated; use warning() instead.")
+@deprecated("Deprecated since Python 3.3. Use `warning()` instead.")
 def warn(
     msg: object,
     *args: object,
@@ -1548,4 +1548,4 @@ class StringTemplateStyle(PercentStyle):  # undocumented
 
 _STYLES: Final[dict[str, tuple[PercentStyle, str]]]
 
-BASIC_FORMAT: Final[str]
+BASIC_FORMAT: Final = "%(levelname)s:%(name)s:%(message)s"
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/logging/config.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/logging/config.pyi
index 51f3439661..7c083b255c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/logging/config.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/logging/config.pyi
@@ -15,11 +15,11 @@ from configparser import RawConfigParser
 from re import Pattern
 from threading import Thread
 from typing import IO, Any, Final, Literal, SupportsIndex, TypedDict, overload, type_check_only
-from typing_extensions import Required, TypeAlias
+from typing_extensions import Required, TypeAlias, disjoint_base
 
 from . import Filter, Filterer, Formatter, Handler, Logger, _FilterType, _FormatStyle, _Level
 
-DEFAULT_LOGGING_CONFIG_PORT: int
+DEFAULT_LOGGING_CONFIG_PORT: Final = 9030
 RESET_ERROR: Final[int]  # undocumented
 IDENTIFIER: Final[Pattern[str]]  # undocumented
 
@@ -155,15 +155,26 @@ class ConvertingList(list[Any], ConvertingMixin):  # undocumented
     def __getitem__(self, key: slice) -> Any: ...
     def pop(self, idx: SupportsIndex = -1) -> Any: ...
 
-class ConvertingTuple(tuple[Any, ...], ConvertingMixin):  # undocumented
-    """A converting tuple wrapper."""
+if sys.version_info >= (3, 12):
+    class ConvertingTuple(tuple[Any, ...], ConvertingMixin):  # undocumented
+        """A converting tuple wrapper."""
 
-    @overload
-    def __getitem__(self, key: SupportsIndex) -> Any: ...
-    @overload
-    def __getitem__(self, key: slice) -> Any: ...
+        @overload
+        def __getitem__(self, key: SupportsIndex) -> Any: ...
+        @overload
+        def __getitem__(self, key: slice) -> Any: ...
 
-class BaseConfigurator:  # undocumented
+else:
+    @disjoint_base
+    class ConvertingTuple(tuple[Any, ...], ConvertingMixin):  # undocumented
+        """A converting tuple wrapper."""
+
+        @overload
+        def __getitem__(self, key: SupportsIndex) -> Any: ...
+        @overload
+        def __getitem__(self, key: slice) -> Any: ...
+
+class BaseConfigurator:
     """
     The configurator base class which defines some useful defaults.
     """
@@ -176,6 +187,8 @@ class BaseConfigurator:  # undocumented
     value_converters: dict[str, str]
     importer: Callable[..., Any]
 
+    config: dict[str, Any]  # undocumented
+
     def __init__(self, config: _DictConfigArgs | dict[str, Any]) -> None: ...
     def resolve(self, s: str) -> Any:
         """
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/logging/handlers.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/logging/handlers.pyi
index 26d811b3ce..cbf27e4b69 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/logging/handlers.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/logging/handlers.pyi
@@ -23,12 +23,12 @@ from typing_extensions import Self
 
 _T = TypeVar("_T")
 
-DEFAULT_TCP_LOGGING_PORT: Final[int]
-DEFAULT_UDP_LOGGING_PORT: Final[int]
-DEFAULT_HTTP_LOGGING_PORT: Final[int]
-DEFAULT_SOAP_LOGGING_PORT: Final[int]
-SYSLOG_UDP_PORT: Final[int]
-SYSLOG_TCP_PORT: Final[int]
+DEFAULT_TCP_LOGGING_PORT: Final = 9020
+DEFAULT_UDP_LOGGING_PORT: Final = 9021
+DEFAULT_HTTP_LOGGING_PORT: Final = 9022
+DEFAULT_SOAP_LOGGING_PORT: Final = 9023
+SYSLOG_UDP_PORT: Final = 514
+SYSLOG_TCP_PORT: Final = 514
 
 class WatchedFileHandler(FileHandler):
     """
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/mmap.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/mmap.pyi
index cffd27128e..42214fb31a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/mmap.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/mmap.pyi
@@ -3,7 +3,7 @@ import sys
 from _typeshed import ReadableBuffer, Unused
 from collections.abc import Iterator
 from typing import Final, Literal, NoReturn, overload
-from typing_extensions import Self
+from typing_extensions import Self, disjoint_base
 
 ACCESS_DEFAULT: Final = 0
 ACCESS_READ: Final = 1
@@ -31,6 +31,7 @@ if sys.platform != "win32":
 
 PAGESIZE: Final[int]
 
+@disjoint_base
 class mmap:
     """Windows: mmap(fileno, length[, tagname[, access[, offset]]])
 
@@ -56,7 +57,7 @@ class mmap:
     """
 
     if sys.platform == "win32":
-        def __init__(self, fileno: int, length: int, tagname: str | None = None, access: int = 0, offset: int = 0) -> None: ...
+        def __new__(self, fileno: int, length: int, tagname: str | None = None, access: int = 0, offset: int = 0) -> Self: ...
     else:
         if sys.version_info >= (3, 13):
             def __new__(
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/__init__.pyi
index fdf3e44dba..0983860e54 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/__init__.pyi
@@ -1,26 +1,26 @@
 import sys
 from collections.abc import Container, Iterable, Sequence
 from types import ModuleType
-from typing import Any, Literal
+from typing import Any, Final
 
 if sys.platform == "win32":
     from _msi import *
     from _msi import _Database
 
-    AMD64: bool
-    Win64: bool
+    AMD64: Final[bool]
+    Win64: Final[bool]
 
-    datasizemask: Literal[0x00FF]
-    type_valid: Literal[0x0100]
-    type_localizable: Literal[0x0200]
-    typemask: Literal[0x0C00]
-    type_long: Literal[0x0000]
-    type_short: Literal[0x0400]
-    type_string: Literal[0x0C00]
-    type_binary: Literal[0x0800]
-    type_nullable: Literal[0x1000]
-    type_key: Literal[0x2000]
-    knownbits: Literal[0x3FFF]
+    datasizemask: Final = 0x00FF
+    type_valid: Final = 0x0100
+    type_localizable: Final = 0x0200
+    typemask: Final = 0x0C00
+    type_long: Final = 0x0000
+    type_short: Final = 0x0400
+    type_string: Final = 0x0C00
+    type_binary: Final = 0x0800
+    type_nullable: Final = 0x1000
+    type_key: Final = 0x2000
+    knownbits: Final = 0x3FFF
 
     class Table:
         name: str
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/schema.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/schema.pyi
index 4ad9a1783f..3bbdc41a1e 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/schema.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/schema.pyi
@@ -1,4 +1,5 @@
 import sys
+from typing import Final
 
 if sys.platform == "win32":
     from . import Table
@@ -89,6 +90,6 @@ if sys.platform == "win32":
     Upgrade: Table
     Verb: Table
 
-    tables: list[Table]
+    tables: Final[list[Table]]
 
     _Validation_records: list[tuple[str, str, str, int | None, int | None, str | None, int | None, str | None, str | None, str]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/sequence.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/sequence.pyi
index b8af09f46e..a9f5c24717 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/sequence.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/sequence.pyi
@@ -1,13 +1,14 @@
 import sys
+from typing import Final
 from typing_extensions import TypeAlias
 
 if sys.platform == "win32":
     _SequenceType: TypeAlias = list[tuple[str, str | None, int]]
 
-    AdminExecuteSequence: _SequenceType
-    AdminUISequence: _SequenceType
-    AdvtExecuteSequence: _SequenceType
-    InstallExecuteSequence: _SequenceType
-    InstallUISequence: _SequenceType
+    AdminExecuteSequence: Final[_SequenceType]
+    AdminUISequence: Final[_SequenceType]
+    AdvtExecuteSequence: Final[_SequenceType]
+    InstallExecuteSequence: Final[_SequenceType]
+    InstallUISequence: Final[_SequenceType]
 
-    tables: list[str]
+    tables: Final[list[str]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/text.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/text.pyi
index 441c843ca6..da3c5fd0fb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/msilib/text.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/msilib/text.pyi
@@ -1,7 +1,8 @@
 import sys
+from typing import Final
 
 if sys.platform == "win32":
-    ActionText: list[tuple[str, str, str | None]]
-    UIText: list[tuple[str, str | None]]
+    ActionText: Final[list[tuple[str, str, str | None]]]
+    UIText: Final[list[tuple[str, str | None]]]
     dirname: str
-    tables: list[str]
+    tables: Final[list[str]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/msvcrt.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/msvcrt.pyi
index b630b4b80b..2a11014103 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/msvcrt.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/msvcrt.pyi
@@ -9,10 +9,10 @@ if sys.platform == "win32":
     LK_NBLCK: Final = 2
     LK_RLCK: Final = 3
     LK_NBRLCK: Final = 4
-    SEM_FAILCRITICALERRORS: int
-    SEM_NOALIGNMENTFAULTEXCEPT: int
-    SEM_NOGPFAULTERRORBOX: int
-    SEM_NOOPENFILEERRORBOX: int
+    SEM_FAILCRITICALERRORS: Final = 0x0001
+    SEM_NOALIGNMENTFAULTEXCEPT: Final = 0x0004
+    SEM_NOGPFAULTERRORBOX: Final = 0x0002
+    SEM_NOOPENFILEERRORBOX: Final = 0x8000
     def locking(fd: int, mode: int, nbytes: int, /) -> None:
         """Lock part of a file based on file descriptor fd from the C runtime.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/managers.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/managers.pyi
index 049d0bc8b1..c4c8182c1a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/managers.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/managers.pyi
@@ -42,6 +42,7 @@ class Token:
     Type to uniquely identify a shared object
     """
 
+    __slots__ = ("typeid", "address", "id")
     typeid: str | bytes | None
     address: _Address | None
     id: str | bytes | int | None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/shared_memory.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/shared_memory.pyi
index 4f0097e06b..1d7059758d 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/shared_memory.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/shared_memory.pyi
@@ -37,7 +37,7 @@ class SharedMemory:
         def __init__(self, name: str | None = None, create: bool = False, size: int = 0) -> None: ...
 
     @property
-    def buf(self) -> memoryview:
+    def buf(self) -> memoryview | None:
         """A memoryview of contents of the shared memory block."""
 
     @property
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/util.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/util.pyi
index fefd35a607..c3592f8bc9 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/util.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/multiprocessing/util.pyi
@@ -60,7 +60,7 @@ def log_to_stderr(level: _LoggingLevel | None = None) -> Logger:
 
 def is_abstract_socket_namespace(address: str | bytes | None) -> bool: ...
 
-abstract_sockets_supported: bool
+abstract_sockets_supported: Final[bool]
 
 def get_temp_dir() -> str: ...
 def register_after_fork(obj: _T, func: Callable[[_T], object]) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/nturl2path.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/nturl2path.pyi
index ff01fc19c8..b4341638fe 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/nturl2path.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/nturl2path.pyi
@@ -8,13 +8,13 @@ import sys
 from typing_extensions import deprecated
 
 if sys.version_info >= (3, 14):
-    @deprecated("nturl2path module was deprecated since Python 3.14")
+    @deprecated("The `nturl2path` module is deprecated since Python 3.14.")
     def url2pathname(url: str) -> str:
         """OS-specific conversion from a relative URL of the 'file' scheme
         to a file system path; not recommended for general use.
         """
 
-    @deprecated("nturl2path module was deprecated since Python 3.14")
+    @deprecated("The `nturl2path` module is deprecated since Python 3.14.")
     def pathname2url(p: str) -> str:
         """OS-specific conversion from a file system path to a relative URL
         of the 'file' scheme; not recommended for general use.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/numbers.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/numbers.pyi
index 9565050b2b..dcd77c4188 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/numbers.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/numbers.pyi
@@ -72,6 +72,7 @@ class Number(metaclass=ABCMeta):
     caring what kind, use isinstance(x, Number).
     """
 
+    __slots__ = ()
     @abstractmethod
     def __hash__(self) -> int:
         """The type of the None singleton."""
@@ -89,6 +90,7 @@ class Complex(Number, _ComplexLike):
     type as described below.
     """
 
+    __slots__ = ()
     @abstractmethod
     def __complex__(self) -> complex:
         """Return a builtin complex instance. Called for complex(self)."""
@@ -182,6 +184,7 @@ class Real(Complex, _RealLike):
     Real also provides defaults for the derived operations.
     """
 
+    __slots__ = ()
     @abstractmethod
     def __float__(self) -> float:
         """Any Real can be converted to a native float object.
@@ -290,6 +293,7 @@ class Real(Complex, _RealLike):
 class Rational(Real):
     """.numerator and .denominator should be in lowest terms."""
 
+    __slots__ = ()
     @property
     @abstractmethod
     def numerator(self) -> _IntegralLike:
@@ -321,6 +325,7 @@ class Integral(Rational, _IntegralLike):
     bit-string operations.
     """
 
+    __slots__ = ()
     @abstractmethod
     def __int__(self) -> int:
         """int(self)"""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/opcode.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/opcode.pyi
index 3afb98232d..080a968911 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/opcode.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/opcode.pyi
@@ -4,7 +4,7 @@ operate on bytecodes (e.g. peephole optimizers).
 """
 
 import sys
-from typing import Literal
+from typing import Final, Literal
 
 __all__ = [
     "cmp_op",
@@ -29,25 +29,25 @@ if sys.version_info >= (3, 13):
     __all__ += ["hasjump"]
 
 cmp_op: tuple[Literal["<"], Literal["<="], Literal["=="], Literal["!="], Literal[">"], Literal[">="]]
-hasconst: list[int]
-hasname: list[int]
-hasjrel: list[int]
-hasjabs: list[int]
-haslocal: list[int]
-hascompare: list[int]
-hasfree: list[int]
+hasconst: Final[list[int]]
+hasname: Final[list[int]]
+hasjrel: Final[list[int]]
+hasjabs: Final[list[int]]
+haslocal: Final[list[int]]
+hascompare: Final[list[int]]
+hasfree: Final[list[int]]
 if sys.version_info >= (3, 12):
-    hasarg: list[int]
-    hasexc: list[int]
+    hasarg: Final[list[int]]
+    hasexc: Final[list[int]]
 else:
-    hasnargs: list[int]
+    hasnargs: Final[list[int]]
 if sys.version_info >= (3, 13):
-    hasjump: list[int]
-opname: list[str]
+    hasjump: Final[list[int]]
+opname: Final[list[str]]
 
-opmap: dict[str, int]
-HAVE_ARGUMENT: int
-EXTENDED_ARG: int
+opmap: Final[dict[str, int]]
+HAVE_ARGUMENT: Final = 43
+EXTENDED_ARG: Final = 69
 
 def stack_effect(opcode: int, oparg: int | None = None, /, *, jump: bool | None = None) -> int:
     """Compute the stack effect of the opcode."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/operator.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/operator.pyi
index 790288021b..000e90a72e 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/operator.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/operator.pyi
@@ -227,8 +227,10 @@ class itemgetter(Generic[_T_co]):
     #   "tuple[int, int]" is incompatible with protocol "SupportsIndex"
     # preventing [_T_co, ...] instead of [Any, ...]
     #
-    # A suspected mypy issue prevents using [..., _T] instead of [..., Any] here.
-    # https://github.com/python/mypy/issues/14032
+    # If we can't infer a literal key from __new__ (ie: `itemgetter[Literal[0]]` for `itemgetter(0)`),
+    # then we can't annotate __call__'s return type or it'll break on tuples
+    #
+    # These issues are best demonstrated by the `itertools.check_itertools_recipes.unique_justseen` test.
     def __call__(self, obj: SupportsGetItem[Any, Any]) -> Any:
         """Call self as a function."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/os/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/os/__init__.pyi
index 187f60d797..88f6a919a1 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/os/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/os/__init__.pyi
@@ -532,22 +532,22 @@ supports_follow_symlinks: set[Callable[..., Any]]
 
 if sys.platform != "win32":
     # Unix only
-    PRIO_PROCESS: int
-    PRIO_PGRP: int
-    PRIO_USER: int
+    PRIO_PROCESS: Final[int]
+    PRIO_PGRP: Final[int]
+    PRIO_USER: Final[int]
 
-    F_LOCK: int
-    F_TLOCK: int
-    F_ULOCK: int
-    F_TEST: int
+    F_LOCK: Final[int]
+    F_TLOCK: Final[int]
+    F_ULOCK: Final[int]
+    F_TEST: Final[int]
 
     if sys.platform != "darwin":
-        POSIX_FADV_NORMAL: int
-        POSIX_FADV_SEQUENTIAL: int
-        POSIX_FADV_RANDOM: int
-        POSIX_FADV_NOREUSE: int
-        POSIX_FADV_WILLNEED: int
-        POSIX_FADV_DONTNEED: int
+        POSIX_FADV_NORMAL: Final[int]
+        POSIX_FADV_SEQUENTIAL: Final[int]
+        POSIX_FADV_RANDOM: Final[int]
+        POSIX_FADV_NOREUSE: Final[int]
+        POSIX_FADV_WILLNEED: Final[int]
+        POSIX_FADV_DONTNEED: Final[int]
 
     if sys.platform != "linux" and sys.platform != "darwin":
         # In the os-module docs, these are marked as being available
@@ -557,69 +557,69 @@ if sys.platform != "win32":
         # so the sys-module docs recommend doing `if sys.platform.startswith('freebsd')`
         # to detect FreeBSD builds. Unfortunately that would be too dynamic
         # for type checkers, however.
-        SF_NODISKIO: int
-        SF_MNOWAIT: int
-        SF_SYNC: int
+        SF_NODISKIO: Final[int]
+        SF_MNOWAIT: Final[int]
+        SF_SYNC: Final[int]
 
         if sys.version_info >= (3, 11):
-            SF_NOCACHE: int
+            SF_NOCACHE: Final[int]
 
     if sys.platform == "linux":
-        XATTR_SIZE_MAX: int
-        XATTR_CREATE: int
-        XATTR_REPLACE: int
+        XATTR_SIZE_MAX: Final[int]
+        XATTR_CREATE: Final[int]
+        XATTR_REPLACE: Final[int]
 
-    P_PID: int
-    P_PGID: int
-    P_ALL: int
+    P_PID: Final[int]
+    P_PGID: Final[int]
+    P_ALL: Final[int]
 
     if sys.platform == "linux":
-        P_PIDFD: int
+        P_PIDFD: Final[int]
 
-    WEXITED: int
-    WSTOPPED: int
-    WNOWAIT: int
+    WEXITED: Final[int]
+    WSTOPPED: Final[int]
+    WNOWAIT: Final[int]
 
-    CLD_EXITED: int
-    CLD_DUMPED: int
-    CLD_TRAPPED: int
-    CLD_CONTINUED: int
-    CLD_KILLED: int
-    CLD_STOPPED: int
+    CLD_EXITED: Final[int]
+    CLD_DUMPED: Final[int]
+    CLD_TRAPPED: Final[int]
+    CLD_CONTINUED: Final[int]
+    CLD_KILLED: Final[int]
+    CLD_STOPPED: Final[int]
 
-    SCHED_OTHER: int
-    SCHED_FIFO: int
-    SCHED_RR: int
+    SCHED_OTHER: Final[int]
+    SCHED_FIFO: Final[int]
+    SCHED_RR: Final[int]
     if sys.platform != "darwin" and sys.platform != "linux":
-        SCHED_SPORADIC: int
+        SCHED_SPORADIC: Final[int]
 
 if sys.platform == "linux":
-    SCHED_BATCH: int
-    SCHED_IDLE: int
-    SCHED_RESET_ON_FORK: int
+    SCHED_BATCH: Final[int]
+    SCHED_IDLE: Final[int]
+    SCHED_RESET_ON_FORK: Final[int]
 
 if sys.version_info >= (3, 14) and sys.platform == "linux":
-    SCHED_DEADLINE: int
-    SCHED_NORMAL: int
+    SCHED_DEADLINE: Final[int]
+    SCHED_NORMAL: Final[int]
 
 if sys.platform != "win32":
-    RTLD_LAZY: int
-    RTLD_NOW: int
-    RTLD_GLOBAL: int
-    RTLD_LOCAL: int
-    RTLD_NODELETE: int
-    RTLD_NOLOAD: int
+    RTLD_LAZY: Final[int]
+    RTLD_NOW: Final[int]
+    RTLD_GLOBAL: Final[int]
+    RTLD_LOCAL: Final[int]
+    RTLD_NODELETE: Final[int]
+    RTLD_NOLOAD: Final[int]
 
 if sys.platform == "linux":
-    RTLD_DEEPBIND: int
-    GRND_NONBLOCK: int
-    GRND_RANDOM: int
+    RTLD_DEEPBIND: Final[int]
+    GRND_NONBLOCK: Final[int]
+    GRND_RANDOM: Final[int]
 
 if sys.platform == "darwin" and sys.version_info >= (3, 12):
-    PRIO_DARWIN_BG: int
-    PRIO_DARWIN_NONUI: int
-    PRIO_DARWIN_PROCESS: int
-    PRIO_DARWIN_THREAD: int
+    PRIO_DARWIN_BG: Final[int]
+    PRIO_DARWIN_NONUI: Final[int]
+    PRIO_DARWIN_PROCESS: Final[int]
+    PRIO_DARWIN_THREAD: Final[int]
 
 SEEK_SET: Final = 0
 SEEK_CUR: Final = 1
@@ -628,74 +628,74 @@ if sys.platform != "win32":
     SEEK_DATA: Final = 3
     SEEK_HOLE: Final = 4
 
-O_RDONLY: int
-O_WRONLY: int
-O_RDWR: int
-O_APPEND: int
-O_CREAT: int
-O_EXCL: int
-O_TRUNC: int
+O_RDONLY: Final[int]
+O_WRONLY: Final[int]
+O_RDWR: Final[int]
+O_APPEND: Final[int]
+O_CREAT: Final[int]
+O_EXCL: Final[int]
+O_TRUNC: Final[int]
 if sys.platform == "win32":
-    O_BINARY: int
-    O_NOINHERIT: int
-    O_SHORT_LIVED: int
-    O_TEMPORARY: int
-    O_RANDOM: int
-    O_SEQUENTIAL: int
-    O_TEXT: int
+    O_BINARY: Final[int]
+    O_NOINHERIT: Final[int]
+    O_SHORT_LIVED: Final[int]
+    O_TEMPORARY: Final[int]
+    O_RANDOM: Final[int]
+    O_SEQUENTIAL: Final[int]
+    O_TEXT: Final[int]
 
 if sys.platform != "win32":
-    O_DSYNC: int
-    O_SYNC: int
-    O_NDELAY: int
-    O_NONBLOCK: int
-    O_NOCTTY: int
-    O_CLOEXEC: int
-    O_ASYNC: int  # Gnu extension if in C library
-    O_DIRECTORY: int  # Gnu extension if in C library
-    O_NOFOLLOW: int  # Gnu extension if in C library
-    O_ACCMODE: int  # TODO: when does this exist?
+    O_DSYNC: Final[int]
+    O_SYNC: Final[int]
+    O_NDELAY: Final[int]
+    O_NONBLOCK: Final[int]
+    O_NOCTTY: Final[int]
+    O_CLOEXEC: Final[int]
+    O_ASYNC: Final[int]  # Gnu extension if in C library
+    O_DIRECTORY: Final[int]  # Gnu extension if in C library
+    O_NOFOLLOW: Final[int]  # Gnu extension if in C library
+    O_ACCMODE: Final[int]  # TODO: when does this exist?
 
 if sys.platform == "linux":
-    O_RSYNC: int
-    O_DIRECT: int  # Gnu extension if in C library
-    O_NOATIME: int  # Gnu extension if in C library
-    O_PATH: int  # Gnu extension if in C library
-    O_TMPFILE: int  # Gnu extension if in C library
-    O_LARGEFILE: int  # Gnu extension if in C library
+    O_RSYNC: Final[int]
+    O_DIRECT: Final[int]  # Gnu extension if in C library
+    O_NOATIME: Final[int]  # Gnu extension if in C library
+    O_PATH: Final[int]  # Gnu extension if in C library
+    O_TMPFILE: Final[int]  # Gnu extension if in C library
+    O_LARGEFILE: Final[int]  # Gnu extension if in C library
 
 if sys.platform != "linux" and sys.platform != "win32":
-    O_SHLOCK: int
-    O_EXLOCK: int
+    O_SHLOCK: Final[int]
+    O_EXLOCK: Final[int]
 
 if sys.platform == "darwin" and sys.version_info >= (3, 10):
-    O_EVTONLY: int
-    O_NOFOLLOW_ANY: int
-    O_SYMLINK: int
+    O_EVTONLY: Final[int]
+    O_NOFOLLOW_ANY: Final[int]
+    O_SYMLINK: Final[int]
 
 if sys.platform != "win32" and sys.version_info >= (3, 10):
-    O_FSYNC: int
+    O_FSYNC: Final[int]
 
 if sys.platform != "linux" and sys.platform != "win32" and sys.version_info >= (3, 13):
-    O_EXEC: int
-    O_SEARCH: int
+    O_EXEC: Final[int]
+    O_SEARCH: Final[int]
 
 if sys.platform != "win32" and sys.platform != "darwin":
     # posix, but apparently missing on macos
-    ST_APPEND: int
-    ST_MANDLOCK: int
-    ST_NOATIME: int
-    ST_NODEV: int
-    ST_NODIRATIME: int
-    ST_NOEXEC: int
-    ST_RELATIME: int
-    ST_SYNCHRONOUS: int
-    ST_WRITE: int
+    ST_APPEND: Final[int]
+    ST_MANDLOCK: Final[int]
+    ST_NOATIME: Final[int]
+    ST_NODEV: Final[int]
+    ST_NODIRATIME: Final[int]
+    ST_NOEXEC: Final[int]
+    ST_RELATIME: Final[int]
+    ST_SYNCHRONOUS: Final[int]
+    ST_WRITE: Final[int]
 
 if sys.platform != "win32":
-    NGROUPS_MAX: int
-    ST_NOSUID: int
-    ST_RDONLY: int
+    NGROUPS_MAX: Final[int]
+    ST_NOSUID: Final[int]
+    ST_RDONLY: Final[int]
 
 curdir: str
 pardir: str
@@ -711,10 +711,10 @@ linesep: Literal["\n", "\r\n"]
 devnull: str
 name: str
 
-F_OK: int
-R_OK: int
-W_OK: int
-X_OK: int
+F_OK: Final = 0
+R_OK: Final = 4
+W_OK: Final = 2
+X_OK: Final = 1
 
 _EnvironCodeFunc: TypeAlias = Callable[[AnyStr], AnyStr]
 
@@ -753,47 +753,47 @@ if sys.platform != "win32":
     environb: _Environ[bytes]
 
 if sys.version_info >= (3, 11) or sys.platform != "win32":
-    EX_OK: int
+    EX_OK: Final[int]
 
 if sys.platform != "win32":
     confstr_names: dict[str, int]
     pathconf_names: dict[str, int]
     sysconf_names: dict[str, int]
 
-    EX_USAGE: int
-    EX_DATAERR: int
-    EX_NOINPUT: int
-    EX_NOUSER: int
-    EX_NOHOST: int
-    EX_UNAVAILABLE: int
-    EX_SOFTWARE: int
-    EX_OSERR: int
-    EX_OSFILE: int
-    EX_CANTCREAT: int
-    EX_IOERR: int
-    EX_TEMPFAIL: int
-    EX_PROTOCOL: int
-    EX_NOPERM: int
-    EX_CONFIG: int
+    EX_USAGE: Final[int]
+    EX_DATAERR: Final[int]
+    EX_NOINPUT: Final[int]
+    EX_NOUSER: Final[int]
+    EX_NOHOST: Final[int]
+    EX_UNAVAILABLE: Final[int]
+    EX_SOFTWARE: Final[int]
+    EX_OSERR: Final[int]
+    EX_OSFILE: Final[int]
+    EX_CANTCREAT: Final[int]
+    EX_IOERR: Final[int]
+    EX_TEMPFAIL: Final[int]
+    EX_PROTOCOL: Final[int]
+    EX_NOPERM: Final[int]
+    EX_CONFIG: Final[int]
 
 # Exists on some Unix platforms, e.g. Solaris.
 if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
-    EX_NOTFOUND: int
+    EX_NOTFOUND: Final[int]
 
-P_NOWAIT: int
-P_NOWAITO: int
-P_WAIT: int
+P_NOWAIT: Final[int]
+P_NOWAITO: Final[int]
+P_WAIT: Final[int]
 if sys.platform == "win32":
-    P_DETACH: int
-    P_OVERLAY: int
+    P_DETACH: Final[int]
+    P_OVERLAY: Final[int]
 
 # wait()/waitpid() options
 if sys.platform != "win32":
-    WNOHANG: int  # Unix only
-    WCONTINUED: int  # some Unix systems
-    WUNTRACED: int  # Unix only
+    WNOHANG: Final[int]  # Unix only
+    WCONTINUED: Final[int]  # some Unix systems
+    WUNTRACED: Final[int]  # Unix only
 
-TMP_MAX: int  # Undocumented, but used by tempfile
+TMP_MAX: Final[int]  # Undocumented, but used by tempfile
 
 # ----- os classes (structures) -----
 @final
@@ -937,6 +937,7 @@ In the future, this property will contain the last metadata change time."""
 class PathLike(ABC, Protocol[AnyStr_co]):  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
     """Abstract base class for implementing the file system path protocol."""
 
+    __slots__ = ()
     @abstractmethod
     def __fspath__(self) -> AnyStr_co:
         """Return the file system path representation of the object."""
@@ -1575,11 +1576,11 @@ if sys.platform != "win32":
         """
     if sys.platform != "darwin":
         if sys.version_info >= (3, 10):
-            RWF_APPEND: int  # docs say available on 3.7+, stubtest says otherwise
-        RWF_DSYNC: int
-        RWF_SYNC: int
-        RWF_HIPRI: int
-        RWF_NOWAIT: int
+            RWF_APPEND: Final[int]  # docs say available on 3.7+, stubtest says otherwise
+        RWF_DSYNC: Final[int]
+        RWF_SYNC: Final[int]
+        RWF_HIPRI: Final[int]
+        RWF_NOWAIT: Final[int]
 
     if sys.platform == "linux":
         def sendfile(out_fd: FileDescriptor, in_fd: FileDescriptor, offset: int | None, count: int) -> int:
@@ -1590,8 +1591,8 @@ if sys.platform != "win32":
             in_fd: FileDescriptor,
             offset: int,
             count: int,
-            headers: Sequence[ReadableBuffer] = ...,
-            trailers: Sequence[ReadableBuffer] = ...,
+            headers: Sequence[ReadableBuffer] = (),
+            trailers: Sequence[ReadableBuffer] = (),
             flags: int = 0,
         ) -> int:  # FreeBSD and Mac OS X only
             """Copy count bytes from file descriptor in_fd to file descriptor out_fd."""
@@ -1745,7 +1746,7 @@ def getcwd() -> str:
 def getcwdb() -> bytes:
     """Return a bytes string representing the current working directory."""
 
-def chmod(path: FileDescriptorOrPath, mode: int, *, dir_fd: int | None = None, follow_symlinks: bool = ...) -> None:
+def chmod(path: FileDescriptorOrPath, mode: int, *, dir_fd: int | None = None, follow_symlinks: bool = True) -> None:
     """Change the access permissions of a file.
 
       path
@@ -2816,9 +2817,9 @@ else:
         scheduler
           A tuple with the scheduler policy (optional) and parameters.
         """
-    POSIX_SPAWN_OPEN: int
-    POSIX_SPAWN_CLOSE: int
-    POSIX_SPAWN_DUP2: int
+    POSIX_SPAWN_OPEN: Final = 0
+    POSIX_SPAWN_CLOSE: Final = 1
+    POSIX_SPAWN_DUP2: Final = 2
 
 if sys.platform != "win32":
     @final
@@ -2978,23 +2979,23 @@ if sys.platform == "win32":
         """
 
 if sys.platform == "linux":
-    MFD_CLOEXEC: int
-    MFD_ALLOW_SEALING: int
-    MFD_HUGETLB: int
-    MFD_HUGE_SHIFT: int
-    MFD_HUGE_MASK: int
-    MFD_HUGE_64KB: int
-    MFD_HUGE_512KB: int
-    MFD_HUGE_1MB: int
-    MFD_HUGE_2MB: int
-    MFD_HUGE_8MB: int
-    MFD_HUGE_16MB: int
-    MFD_HUGE_32MB: int
-    MFD_HUGE_256MB: int
-    MFD_HUGE_512MB: int
-    MFD_HUGE_1GB: int
-    MFD_HUGE_2GB: int
-    MFD_HUGE_16GB: int
+    MFD_CLOEXEC: Final[int]
+    MFD_ALLOW_SEALING: Final[int]
+    MFD_HUGETLB: Final[int]
+    MFD_HUGE_SHIFT: Final[int]
+    MFD_HUGE_MASK: Final[int]
+    MFD_HUGE_64KB: Final[int]
+    MFD_HUGE_512KB: Final[int]
+    MFD_HUGE_1MB: Final[int]
+    MFD_HUGE_2MB: Final[int]
+    MFD_HUGE_8MB: Final[int]
+    MFD_HUGE_16MB: Final[int]
+    MFD_HUGE_32MB: Final[int]
+    MFD_HUGE_256MB: Final[int]
+    MFD_HUGE_512MB: Final[int]
+    MFD_HUGE_1GB: Final[int]
+    MFD_HUGE_2GB: Final[int]
+    MFD_HUGE_16GB: Final[int]
     def memfd_create(name: str, flags: int = ...) -> int: ...
     def copy_file_range(src: int, dst: int, count: int, offset_src: int | None = ..., offset_dst: int | None = ...) -> int:
         """Copy count bytes from one file descriptor to another.
@@ -3061,12 +3062,12 @@ if sys.version_info >= (3, 12) and sys.platform == "win32":
         """
 
 if sys.version_info >= (3, 10) and sys.platform == "linux":
-    EFD_CLOEXEC: int
-    EFD_NONBLOCK: int
-    EFD_SEMAPHORE: int
-    SPLICE_F_MORE: int
-    SPLICE_F_MOVE: int
-    SPLICE_F_NONBLOCK: int
+    EFD_CLOEXEC: Final[int]
+    EFD_NONBLOCK: Final[int]
+    EFD_SEMAPHORE: Final[int]
+    SPLICE_F_MORE: Final[int]
+    SPLICE_F_MOVE: Final[int]
+    SPLICE_F_NONBLOCK: Final[int]
     def eventfd(initval: int, flags: int = 524288) -> FileDescriptor:
         """Creates and returns an event notification file descriptor."""
 
@@ -3105,20 +3106,20 @@ if sys.version_info >= (3, 10) and sys.platform == "linux":
         """
 
 if sys.version_info >= (3, 12) and sys.platform == "linux":
-    CLONE_FILES: int
-    CLONE_FS: int
-    CLONE_NEWCGROUP: int  # Linux 4.6+
-    CLONE_NEWIPC: int  # Linux 2.6.19+
-    CLONE_NEWNET: int  # Linux 2.6.24+
-    CLONE_NEWNS: int
-    CLONE_NEWPID: int  # Linux 3.8+
-    CLONE_NEWTIME: int  # Linux 5.6+
-    CLONE_NEWUSER: int  # Linux 3.8+
-    CLONE_NEWUTS: int  # Linux 2.6.19+
-    CLONE_SIGHAND: int
-    CLONE_SYSVSEM: int  # Linux 2.6.26+
-    CLONE_THREAD: int
-    CLONE_VM: int
+    CLONE_FILES: Final[int]
+    CLONE_FS: Final[int]
+    CLONE_NEWCGROUP: Final[int]  # Linux 4.6+
+    CLONE_NEWIPC: Final[int]  # Linux 2.6.19+
+    CLONE_NEWNET: Final[int]  # Linux 2.6.24+
+    CLONE_NEWNS: Final[int]
+    CLONE_NEWPID: Final[int]  # Linux 3.8+
+    CLONE_NEWTIME: Final[int]  # Linux 5.6+
+    CLONE_NEWUSER: Final[int]  # Linux 3.8+
+    CLONE_NEWUTS: Final[int]  # Linux 2.6.19+
+    CLONE_SIGHAND: Final[int]
+    CLONE_SYSVSEM: Final[int]  # Linux 2.6.26+
+    CLONE_THREAD: Final[int]
+    CLONE_VM: Final[int]
     def unshare(flags: int) -> None:
         """Disassociate parts of a process (or thread) execution context.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ossaudiodev.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ossaudiodev.pyi
index b9ee3edab0..f8230b4f02 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ossaudiodev.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ossaudiodev.pyi
@@ -1,119 +1,120 @@
 import sys
-from typing import Any, Literal, overload
+from typing import Any, Final, Literal, overload
 
 if sys.platform != "win32" and sys.platform != "darwin":
-    AFMT_AC3: int
-    AFMT_A_LAW: int
-    AFMT_IMA_ADPCM: int
-    AFMT_MPEG: int
-    AFMT_MU_LAW: int
-    AFMT_QUERY: int
-    AFMT_S16_BE: int
-    AFMT_S16_LE: int
-    AFMT_S16_NE: int
-    AFMT_S8: int
-    AFMT_U16_BE: int
-    AFMT_U16_LE: int
-    AFMT_U8: int
-    SNDCTL_COPR_HALT: int
-    SNDCTL_COPR_LOAD: int
-    SNDCTL_COPR_RCODE: int
-    SNDCTL_COPR_RCVMSG: int
-    SNDCTL_COPR_RDATA: int
-    SNDCTL_COPR_RESET: int
-    SNDCTL_COPR_RUN: int
-    SNDCTL_COPR_SENDMSG: int
-    SNDCTL_COPR_WCODE: int
-    SNDCTL_COPR_WDATA: int
-    SNDCTL_DSP_BIND_CHANNEL: int
-    SNDCTL_DSP_CHANNELS: int
-    SNDCTL_DSP_GETBLKSIZE: int
-    SNDCTL_DSP_GETCAPS: int
-    SNDCTL_DSP_GETCHANNELMASK: int
-    SNDCTL_DSP_GETFMTS: int
-    SNDCTL_DSP_GETIPTR: int
-    SNDCTL_DSP_GETISPACE: int
-    SNDCTL_DSP_GETODELAY: int
-    SNDCTL_DSP_GETOPTR: int
-    SNDCTL_DSP_GETOSPACE: int
-    SNDCTL_DSP_GETSPDIF: int
-    SNDCTL_DSP_GETTRIGGER: int
-    SNDCTL_DSP_MAPINBUF: int
-    SNDCTL_DSP_MAPOUTBUF: int
-    SNDCTL_DSP_NONBLOCK: int
-    SNDCTL_DSP_POST: int
-    SNDCTL_DSP_PROFILE: int
-    SNDCTL_DSP_RESET: int
-    SNDCTL_DSP_SAMPLESIZE: int
-    SNDCTL_DSP_SETDUPLEX: int
-    SNDCTL_DSP_SETFMT: int
-    SNDCTL_DSP_SETFRAGMENT: int
-    SNDCTL_DSP_SETSPDIF: int
-    SNDCTL_DSP_SETSYNCRO: int
-    SNDCTL_DSP_SETTRIGGER: int
-    SNDCTL_DSP_SPEED: int
-    SNDCTL_DSP_STEREO: int
-    SNDCTL_DSP_SUBDIVIDE: int
-    SNDCTL_DSP_SYNC: int
-    SNDCTL_FM_4OP_ENABLE: int
-    SNDCTL_FM_LOAD_INSTR: int
-    SNDCTL_MIDI_INFO: int
-    SNDCTL_MIDI_MPUCMD: int
-    SNDCTL_MIDI_MPUMODE: int
-    SNDCTL_MIDI_PRETIME: int
-    SNDCTL_SEQ_CTRLRATE: int
-    SNDCTL_SEQ_GETINCOUNT: int
-    SNDCTL_SEQ_GETOUTCOUNT: int
-    SNDCTL_SEQ_GETTIME: int
-    SNDCTL_SEQ_NRMIDIS: int
-    SNDCTL_SEQ_NRSYNTHS: int
-    SNDCTL_SEQ_OUTOFBAND: int
-    SNDCTL_SEQ_PANIC: int
-    SNDCTL_SEQ_PERCMODE: int
-    SNDCTL_SEQ_RESET: int
-    SNDCTL_SEQ_RESETSAMPLES: int
-    SNDCTL_SEQ_SYNC: int
-    SNDCTL_SEQ_TESTMIDI: int
-    SNDCTL_SEQ_THRESHOLD: int
-    SNDCTL_SYNTH_CONTROL: int
-    SNDCTL_SYNTH_ID: int
-    SNDCTL_SYNTH_INFO: int
-    SNDCTL_SYNTH_MEMAVL: int
-    SNDCTL_SYNTH_REMOVESAMPLE: int
-    SNDCTL_TMR_CONTINUE: int
-    SNDCTL_TMR_METRONOME: int
-    SNDCTL_TMR_SELECT: int
-    SNDCTL_TMR_SOURCE: int
-    SNDCTL_TMR_START: int
-    SNDCTL_TMR_STOP: int
-    SNDCTL_TMR_TEMPO: int
-    SNDCTL_TMR_TIMEBASE: int
-    SOUND_MIXER_ALTPCM: int
-    SOUND_MIXER_BASS: int
-    SOUND_MIXER_CD: int
-    SOUND_MIXER_DIGITAL1: int
-    SOUND_MIXER_DIGITAL2: int
-    SOUND_MIXER_DIGITAL3: int
-    SOUND_MIXER_IGAIN: int
-    SOUND_MIXER_IMIX: int
-    SOUND_MIXER_LINE: int
-    SOUND_MIXER_LINE1: int
-    SOUND_MIXER_LINE2: int
-    SOUND_MIXER_LINE3: int
-    SOUND_MIXER_MIC: int
-    SOUND_MIXER_MONITOR: int
-    SOUND_MIXER_NRDEVICES: int
-    SOUND_MIXER_OGAIN: int
-    SOUND_MIXER_PCM: int
-    SOUND_MIXER_PHONEIN: int
-    SOUND_MIXER_PHONEOUT: int
-    SOUND_MIXER_RADIO: int
-    SOUND_MIXER_RECLEV: int
-    SOUND_MIXER_SPEAKER: int
-    SOUND_MIXER_SYNTH: int
-    SOUND_MIXER_TREBLE: int
-    SOUND_MIXER_VIDEO: int
-    SOUND_MIXER_VOLUME: int
+    # Depends on soundcard.h
+    AFMT_AC3: Final[int]
+    AFMT_A_LAW: Final[int]
+    AFMT_IMA_ADPCM: Final[int]
+    AFMT_MPEG: Final[int]
+    AFMT_MU_LAW: Final[int]
+    AFMT_QUERY: Final[int]
+    AFMT_S16_BE: Final[int]
+    AFMT_S16_LE: Final[int]
+    AFMT_S16_NE: Final[int]
+    AFMT_S8: Final[int]
+    AFMT_U16_BE: Final[int]
+    AFMT_U16_LE: Final[int]
+    AFMT_U8: Final[int]
+    SNDCTL_COPR_HALT: Final[int]
+    SNDCTL_COPR_LOAD: Final[int]
+    SNDCTL_COPR_RCODE: Final[int]
+    SNDCTL_COPR_RCVMSG: Final[int]
+    SNDCTL_COPR_RDATA: Final[int]
+    SNDCTL_COPR_RESET: Final[int]
+    SNDCTL_COPR_RUN: Final[int]
+    SNDCTL_COPR_SENDMSG: Final[int]
+    SNDCTL_COPR_WCODE: Final[int]
+    SNDCTL_COPR_WDATA: Final[int]
+    SNDCTL_DSP_BIND_CHANNEL: Final[int]
+    SNDCTL_DSP_CHANNELS: Final[int]
+    SNDCTL_DSP_GETBLKSIZE: Final[int]
+    SNDCTL_DSP_GETCAPS: Final[int]
+    SNDCTL_DSP_GETCHANNELMASK: Final[int]
+    SNDCTL_DSP_GETFMTS: Final[int]
+    SNDCTL_DSP_GETIPTR: Final[int]
+    SNDCTL_DSP_GETISPACE: Final[int]
+    SNDCTL_DSP_GETODELAY: Final[int]
+    SNDCTL_DSP_GETOPTR: Final[int]
+    SNDCTL_DSP_GETOSPACE: Final[int]
+    SNDCTL_DSP_GETSPDIF: Final[int]
+    SNDCTL_DSP_GETTRIGGER: Final[int]
+    SNDCTL_DSP_MAPINBUF: Final[int]
+    SNDCTL_DSP_MAPOUTBUF: Final[int]
+    SNDCTL_DSP_NONBLOCK: Final[int]
+    SNDCTL_DSP_POST: Final[int]
+    SNDCTL_DSP_PROFILE: Final[int]
+    SNDCTL_DSP_RESET: Final[int]
+    SNDCTL_DSP_SAMPLESIZE: Final[int]
+    SNDCTL_DSP_SETDUPLEX: Final[int]
+    SNDCTL_DSP_SETFMT: Final[int]
+    SNDCTL_DSP_SETFRAGMENT: Final[int]
+    SNDCTL_DSP_SETSPDIF: Final[int]
+    SNDCTL_DSP_SETSYNCRO: Final[int]
+    SNDCTL_DSP_SETTRIGGER: Final[int]
+    SNDCTL_DSP_SPEED: Final[int]
+    SNDCTL_DSP_STEREO: Final[int]
+    SNDCTL_DSP_SUBDIVIDE: Final[int]
+    SNDCTL_DSP_SYNC: Final[int]
+    SNDCTL_FM_4OP_ENABLE: Final[int]
+    SNDCTL_FM_LOAD_INSTR: Final[int]
+    SNDCTL_MIDI_INFO: Final[int]
+    SNDCTL_MIDI_MPUCMD: Final[int]
+    SNDCTL_MIDI_MPUMODE: Final[int]
+    SNDCTL_MIDI_PRETIME: Final[int]
+    SNDCTL_SEQ_CTRLRATE: Final[int]
+    SNDCTL_SEQ_GETINCOUNT: Final[int]
+    SNDCTL_SEQ_GETOUTCOUNT: Final[int]
+    SNDCTL_SEQ_GETTIME: Final[int]
+    SNDCTL_SEQ_NRMIDIS: Final[int]
+    SNDCTL_SEQ_NRSYNTHS: Final[int]
+    SNDCTL_SEQ_OUTOFBAND: Final[int]
+    SNDCTL_SEQ_PANIC: Final[int]
+    SNDCTL_SEQ_PERCMODE: Final[int]
+    SNDCTL_SEQ_RESET: Final[int]
+    SNDCTL_SEQ_RESETSAMPLES: Final[int]
+    SNDCTL_SEQ_SYNC: Final[int]
+    SNDCTL_SEQ_TESTMIDI: Final[int]
+    SNDCTL_SEQ_THRESHOLD: Final[int]
+    SNDCTL_SYNTH_CONTROL: Final[int]
+    SNDCTL_SYNTH_ID: Final[int]
+    SNDCTL_SYNTH_INFO: Final[int]
+    SNDCTL_SYNTH_MEMAVL: Final[int]
+    SNDCTL_SYNTH_REMOVESAMPLE: Final[int]
+    SNDCTL_TMR_CONTINUE: Final[int]
+    SNDCTL_TMR_METRONOME: Final[int]
+    SNDCTL_TMR_SELECT: Final[int]
+    SNDCTL_TMR_SOURCE: Final[int]
+    SNDCTL_TMR_START: Final[int]
+    SNDCTL_TMR_STOP: Final[int]
+    SNDCTL_TMR_TEMPO: Final[int]
+    SNDCTL_TMR_TIMEBASE: Final[int]
+    SOUND_MIXER_ALTPCM: Final[int]
+    SOUND_MIXER_BASS: Final[int]
+    SOUND_MIXER_CD: Final[int]
+    SOUND_MIXER_DIGITAL1: Final[int]
+    SOUND_MIXER_DIGITAL2: Final[int]
+    SOUND_MIXER_DIGITAL3: Final[int]
+    SOUND_MIXER_IGAIN: Final[int]
+    SOUND_MIXER_IMIX: Final[int]
+    SOUND_MIXER_LINE: Final[int]
+    SOUND_MIXER_LINE1: Final[int]
+    SOUND_MIXER_LINE2: Final[int]
+    SOUND_MIXER_LINE3: Final[int]
+    SOUND_MIXER_MIC: Final[int]
+    SOUND_MIXER_MONITOR: Final[int]
+    SOUND_MIXER_NRDEVICES: Final[int]
+    SOUND_MIXER_OGAIN: Final[int]
+    SOUND_MIXER_PCM: Final[int]
+    SOUND_MIXER_PHONEIN: Final[int]
+    SOUND_MIXER_PHONEOUT: Final[int]
+    SOUND_MIXER_RADIO: Final[int]
+    SOUND_MIXER_RECLEV: Final[int]
+    SOUND_MIXER_SPEAKER: Final[int]
+    SOUND_MIXER_SYNTH: Final[int]
+    SOUND_MIXER_TREBLE: Final[int]
+    SOUND_MIXER_VIDEO: Final[int]
+    SOUND_MIXER_VOLUME: Final[int]
 
     control_labels: list[str]
     control_names: list[str]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/pathlib/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/pathlib/__init__.pyi
index 6d9b4eccee..bfd6d681e6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/pathlib/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/pathlib/__init__.pyi
@@ -45,6 +45,31 @@ class PurePath(PathLike[str]):
     directly, regardless of your system.
     """
 
+    if sys.version_info >= (3, 13):
+        __slots__ = (
+            "_raw_paths",
+            "_drv",
+            "_root",
+            "_tail_cached",
+            "_str",
+            "_str_normcase_cached",
+            "_parts_normcase_cached",
+            "_hash",
+        )
+    elif sys.version_info >= (3, 12):
+        __slots__ = (
+            "_raw_paths",
+            "_drv",
+            "_root",
+            "_tail_cached",
+            "_str",
+            "_str_normcase_cached",
+            "_parts_normcase_cached",
+            "_lines_cached",
+            "_hash",
+        )
+    else:
+        __slots__ = ("_drv", "_root", "_parts", "_str", "_hash", "_pparts", "_cached_cparts")
     if sys.version_info >= (3, 13):
         parser: ClassVar[types.ModuleType]
         def full_match(self, pattern: StrPath, *, case_sensitive: bool | None = None) -> bool:
@@ -240,6 +265,8 @@ class PurePosixPath(PurePath):
     However, you can also instantiate it directly on any system.
     """
 
+    __slots__ = ()
+
 class PureWindowsPath(PurePath):
     """PurePath subclass for Windows systems.
 
@@ -247,6 +274,8 @@ class PureWindowsPath(PurePath):
     However, you can also instantiate it directly on any system.
     """
 
+    __slots__ = ()
+
 class Path(PurePath):
     """PurePath subclass that can make system calls.
 
@@ -257,6 +286,13 @@ class Path(PurePath):
     but cannot instantiate a WindowsPath on a POSIX system or vice versa.
     """
 
+    if sys.version_info >= (3, 14):
+        __slots__ = ("_info",)
+    elif sys.version_info >= (3, 10):
+        __slots__ = ()
+    else:
+        __slots__ = ("_accessor",)
+
     if sys.version_info >= (3, 12):
         def __new__(cls, *args: StrPath, **kwargs: Unused) -> Self: ...  # pyright: ignore[reportInconsistentConstructor]
     else:
@@ -737,7 +773,7 @@ class Path(PurePath):
                 """
     if sys.version_info >= (3, 12):
         def walk(
-            self, top_down: bool = ..., on_error: Callable[[OSError], object] | None = ..., follow_symlinks: bool = ...
+            self, top_down: bool = True, on_error: Callable[[OSError], object] | None = None, follow_symlinks: bool = False
         ) -> Iterator[tuple[Self, list[str], list[str]]]:
             """Walk the directory tree from this directory, similar to os.walk()."""
 
@@ -747,12 +783,16 @@ class PosixPath(Path, PurePosixPath):
     On a POSIX system, instantiating a Path should return this object.
     """
 
+    __slots__ = ()
+
 class WindowsPath(Path, PureWindowsPath):
     """Path subclass for Windows systems.
 
     On a Windows system, instantiating a Path should return this object.
     """
 
+    __slots__ = ()
+
 if sys.version_info >= (3, 13):
     class UnsupportedOperation(NotImplementedError):
         """An exception that is raised when an unsupported operation is attempted."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/pdb.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/pdb.pyi
index a8d81ead57..6fc9e2a4fc 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/pdb.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/pdb.pyi
@@ -343,6 +343,7 @@ from cmd import Cmd
 from collections.abc import Callable, Iterable, Mapping, Sequence
 from inspect import _SourceObjectType
 from linecache import _ModuleGlobals
+from rlcompleter import Completer
 from types import CodeType, FrameType, TracebackType
 from typing import IO, Any, ClassVar, Final, Literal, TypeVar
 from typing_extensions import ParamSpec, Self, TypeAlias
@@ -355,7 +356,7 @@ _T = TypeVar("_T")
 _P = ParamSpec("_P")
 _Mode: TypeAlias = Literal["inline", "cli"]
 
-line_prefix: str  # undocumented
+line_prefix: Final[str]  # undocumented
 
 class Restart(Exception):
     """Causes a debugger to be restarted for the debugged python program."""
@@ -606,23 +607,40 @@ class Pdb(Bdb, Cmd):
         print anything, you will see no sign that the breakpoint was
         reached.
         """
+    if sys.version_info >= (3, 14):
+        def do_break(self, arg: str, temporary: bool = False) -> bool | None:
+            """b(reak) [ ([filename:]lineno | function) [, condition] ]
 
-    def do_break(self, arg: str, temporary: bool = ...) -> bool | None:
-        """b(reak) [ ([filename:]lineno | function) [, condition] ]
+            Without argument, list all breaks.
 
-        Without argument, list all breaks.
+            With a line number argument, set a break at this line in the
+            current file.  With a function name, set a break at the first
+            executable line of that function.  If a second argument is
+            present, it is a string specifying an expression which must
+            evaluate to true before the breakpoint is honored.
 
-        With a line number argument, set a break at this line in the
-        current file.  With a function name, set a break at the first
-        executable line of that function.  If a second argument is
-        present, it is a string specifying an expression which must
-        evaluate to true before the breakpoint is honored.
+            The line number may be prefixed with a filename and a colon,
+            to specify a breakpoint in another file (probably one that
+            hasn't been loaded yet).  The file is searched for on
+            sys.path; the .py suffix may be omitted.
+            """
+    else:
+        def do_break(self, arg: str, temporary: bool | Literal[0, 1] = 0) -> bool | None:
+            """b(reak) [ ([filename:]lineno | function) [, condition] ]
 
-        The line number may be prefixed with a filename and a colon,
-        to specify a breakpoint in another file (probably one that
-        hasn't been loaded yet).  The file is searched for on
-        sys.path; the .py suffix may be omitted.
-        """
+            Without argument, list all breaks.
+
+            With a line number argument, set a break at this line in the
+            current file.  With a function name, set a break at the first
+            executable line of that function.  If a second argument is
+            present, it is a string specifying an expression which must
+            evaluate to true before the breakpoint is honored.
+
+            The line number may be prefixed with a filename and a colon,
+            to specify a breakpoint in another file (probably one that
+            hasn't been loaded yet).  The file is searched for on
+            sys.path; the .py suffix may be omitted.
+            """
 
     def do_tbreak(self, arg: str) -> bool | None:
         """tbreak [ ([filename:]lineno | function) [, condition] ]
@@ -926,6 +944,17 @@ class Pdb(Bdb, Cmd):
         def completenames(self, text: str, line: str, begidx: int, endidx: int) -> list[str]: ...  # type: ignore[override]
     if sys.version_info >= (3, 12):
         def set_convenience_variable(self, frame: FrameType, name: str, value: Any) -> None: ...
+    if sys.version_info >= (3, 13) and sys.version_info < (3, 14):
+        # Added in 3.13.8.
+        @property
+        def rlcompleter(self) -> type[Completer]:
+            """Return the `Completer` class from `rlcompleter`, while avoiding the
+            side effects of changing the completer from `import rlcompleter`.
+
+            This is a compromise between GH-138860 and GH-139289. If GH-139289 is
+            fixed, then we don't need this and we can just `import rlcompleter` in
+            `Pdb.__init__`.
+            """
 
     def _select_frame(self, number: int) -> None: ...
     def _getval_except(self, arg: str, frame: FrameType | None = None) -> object: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/pickle.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/pickle.pyi
index 071214bdc5..1348b91018 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/pickle.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/pickle.pyi
@@ -39,7 +39,7 @@ from _pickle import (
 )
 from _typeshed import ReadableBuffer, SupportsWrite
 from collections.abc import Callable, Iterable, Mapping
-from typing import Any, ClassVar, SupportsBytes, SupportsIndex, final
+from typing import Any, ClassVar, Final, SupportsBytes, SupportsIndex, final
 from typing_extensions import Self
 
 __all__ = [
@@ -127,8 +127,8 @@ __all__ = [
     "UNICODE",
 ]
 
-HIGHEST_PROTOCOL: int
-DEFAULT_PROTOCOL: int
+HIGHEST_PROTOCOL: Final = 5
+DEFAULT_PROTOCOL: Final = 5
 
 bytes_types: tuple[type[Any], ...]  # undocumented
 
@@ -151,85 +151,85 @@ class PickleBuffer:
     def __release_buffer__(self, buffer: memoryview, /) -> None:
         """Release the buffer object that exposes the underlying memory of the object."""
 
-MARK: bytes
-STOP: bytes
-POP: bytes
-POP_MARK: bytes
-DUP: bytes
-FLOAT: bytes
-INT: bytes
-BININT: bytes
-BININT1: bytes
-LONG: bytes
-BININT2: bytes
-NONE: bytes
-PERSID: bytes
-BINPERSID: bytes
-REDUCE: bytes
-STRING: bytes
-BINSTRING: bytes
-SHORT_BINSTRING: bytes
-UNICODE: bytes
-BINUNICODE: bytes
-APPEND: bytes
-BUILD: bytes
-GLOBAL: bytes
-DICT: bytes
-EMPTY_DICT: bytes
-APPENDS: bytes
-GET: bytes
-BINGET: bytes
-INST: bytes
-LONG_BINGET: bytes
-LIST: bytes
-EMPTY_LIST: bytes
-OBJ: bytes
-PUT: bytes
-BINPUT: bytes
-LONG_BINPUT: bytes
-SETITEM: bytes
-TUPLE: bytes
-EMPTY_TUPLE: bytes
-SETITEMS: bytes
-BINFLOAT: bytes
+MARK: Final = b"("
+STOP: Final = b"."
+POP: Final = b"0"
+POP_MARK: Final = b"1"
+DUP: Final = b"2"
+FLOAT: Final = b"F"
+INT: Final = b"I"
+BININT: Final = b"J"
+BININT1: Final = b"K"
+LONG: Final = b"L"
+BININT2: Final = b"M"
+NONE: Final = b"N"
+PERSID: Final = b"P"
+BINPERSID: Final = b"Q"
+REDUCE: Final = b"R"
+STRING: Final = b"S"
+BINSTRING: Final = b"T"
+SHORT_BINSTRING: Final = b"U"
+UNICODE: Final = b"V"
+BINUNICODE: Final = b"X"
+APPEND: Final = b"a"
+BUILD: Final = b"b"
+GLOBAL: Final = b"c"
+DICT: Final = b"d"
+EMPTY_DICT: Final = b"}"
+APPENDS: Final = b"e"
+GET: Final = b"g"
+BINGET: Final = b"h"
+INST: Final = b"i"
+LONG_BINGET: Final = b"j"
+LIST: Final = b"l"
+EMPTY_LIST: Final = b"]"
+OBJ: Final = b"o"
+PUT: Final = b"p"
+BINPUT: Final = b"q"
+LONG_BINPUT: Final = b"r"
+SETITEM: Final = b"s"
+TUPLE: Final = b"t"
+EMPTY_TUPLE: Final = b")"
+SETITEMS: Final = b"u"
+BINFLOAT: Final = b"G"
 
-TRUE: bytes
-FALSE: bytes
+TRUE: Final = b"I01\n"
+FALSE: Final = b"I00\n"
 
 # protocol 2
-PROTO: bytes
-NEWOBJ: bytes
-EXT1: bytes
-EXT2: bytes
-EXT4: bytes
-TUPLE1: bytes
-TUPLE2: bytes
-TUPLE3: bytes
-NEWTRUE: bytes
-NEWFALSE: bytes
-LONG1: bytes
-LONG4: bytes
+PROTO: Final = b"\x80"
+NEWOBJ: Final = b"\x81"
+EXT1: Final = b"\x82"
+EXT2: Final = b"\x83"
+EXT4: Final = b"\x84"
+TUPLE1: Final = b"\x85"
+TUPLE2: Final = b"\x86"
+TUPLE3: Final = b"\x87"
+NEWTRUE: Final = b"\x88"
+NEWFALSE: Final = b"\x89"
+LONG1: Final = b"\x8a"
+LONG4: Final = b"\x8b"
 
 # protocol 3
-BINBYTES: bytes
-SHORT_BINBYTES: bytes
+BINBYTES: Final = b"B"
+SHORT_BINBYTES: Final = b"C"
 
 # protocol 4
-SHORT_BINUNICODE: bytes
-BINUNICODE8: bytes
-BINBYTES8: bytes
-EMPTY_SET: bytes
-ADDITEMS: bytes
-FROZENSET: bytes
-NEWOBJ_EX: bytes
-STACK_GLOBAL: bytes
-MEMOIZE: bytes
-FRAME: bytes
+SHORT_BINUNICODE: Final = b"\x8c"
+BINUNICODE8: Final = b"\x8d"
+BINBYTES8: Final = b"\x8e"
+EMPTY_SET: Final = b"\x8f"
+ADDITEMS: Final = b"\x90"
+FROZENSET: Final = b"\x91"
+NEWOBJ_EX: Final = b"\x92"
+STACK_GLOBAL: Final = b"\x93"
+MEMOIZE: Final = b"\x94"
+FRAME: Final = b"\x95"
 
 # protocol 5
-BYTEARRAY8: bytes
-NEXT_BUFFER: bytes
-READONLY_BUFFER: bytes
+BYTEARRAY8: Final = b"\x96"
+NEXT_BUFFER: Final = b"\x97"
+READONLY_BUFFER: Final = b"\x98"
 
 def encode_long(x: int) -> bytes:  # undocumented
     """Encode a long to a two's complement little-endian binary string.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/pickletools.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/pickletools.pyi
index 17f51626d1..e5497b1ecb 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/pickletools.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/pickletools.pyi
@@ -12,7 +12,7 @@ dis(pickle, out=None, memo=None, indentlevel=4)
 
 import sys
 from collections.abc import Callable, Iterator, MutableMapping
-from typing import IO, Any
+from typing import IO, Any, Final
 from typing_extensions import TypeAlias
 
 __all__ = ["dis", "genops", "optimize"]
@@ -20,13 +20,14 @@ __all__ = ["dis", "genops", "optimize"]
 _Reader: TypeAlias = Callable[[IO[bytes]], Any]
 bytes_types: tuple[type[Any], ...]
 
-UP_TO_NEWLINE: int
-TAKEN_FROM_ARGUMENT1: int
-TAKEN_FROM_ARGUMENT4: int
-TAKEN_FROM_ARGUMENT4U: int
-TAKEN_FROM_ARGUMENT8U: int
+UP_TO_NEWLINE: Final = -1
+TAKEN_FROM_ARGUMENT1: Final = -2
+TAKEN_FROM_ARGUMENT4: Final = -3
+TAKEN_FROM_ARGUMENT4U: Final = -4
+TAKEN_FROM_ARGUMENT8U: Final = -5
 
 class ArgumentDescriptor:
+    __slots__ = ("name", "n", "reader", "doc")
     name: str
     n: int
     reader: _Reader
@@ -376,6 +377,7 @@ def read_long4(f: IO[bytes]) -> int:
 long4: ArgumentDescriptor
 
 class StackObject:
+    __slots__ = ("name", "obtype", "doc")
     name: str
     obtype: type[Any] | tuple[type[Any], ...]
     doc: str
@@ -401,6 +403,7 @@ markobject: StackObject
 stackslice: StackObject
 
 class OpcodeInfo:
+    __slots__ = ("name", "code", "arg", "stack_before", "stack_after", "proto", "doc")
     name: str
     code: str
     arg: ArgumentDescriptor | None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/platform.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/platform.pyi
index bb9cd3d717..cc2e1aa569 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/platform.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/platform.pyi
@@ -9,7 +9,7 @@ format is usable as part of a filename.
 
 import sys
 from typing import NamedTuple, type_check_only
-from typing_extensions import Self, deprecated
+from typing_extensions import Self, deprecated, disjoint_base
 
 def libc_ver(executable: str | None = None, lib: str = "", version: str = "", chunksize: int = 16384) -> tuple[str, str]:
     """Tries to determine the libc version that the file executable
@@ -123,22 +123,41 @@ class _uname_result_base(NamedTuple):
 
 # uname_result emulates a 6-field named tuple, but the processor field
 # is lazily evaluated rather than being passed in to the constructor.
-class uname_result(_uname_result_base):
-    """
-    A uname_result that's largely compatible with a
-    simple namedtuple except that 'processor' is
-    resolved late and cached to avoid calling "uname"
-    except when needed.
-    """
+if sys.version_info >= (3, 12):
+    class uname_result(_uname_result_base):
+        """
+        A uname_result that's largely compatible with a
+        simple namedtuple except that 'processor' is
+        resolved late and cached to avoid calling "uname"
+        except when needed.
+        """
 
-    if sys.version_info >= (3, 10):
         __match_args__ = ("system", "node", "release", "version", "machine")  # pyright: ignore[reportAssignmentType]
 
-    def __new__(_cls, system: str, node: str, release: str, version: str, machine: str) -> Self:
-        """Create new instance of uname_result_base(system, node, release, version, machine)"""
+        def __new__(_cls, system: str, node: str, release: str, version: str, machine: str) -> Self:
+            """Create new instance of uname_result_base(system, node, release, version, machine)"""
 
-    @property
-    def processor(self) -> str: ...
+        @property
+        def processor(self) -> str: ...
+
+else:
+    @disjoint_base
+    class uname_result(_uname_result_base):
+        """
+        A uname_result that's largely compatible with a
+        simple namedtuple except that 'processor' is
+        resolved late and cached to avoid calling "uname"
+        except when needed.
+        """
+
+        if sys.version_info >= (3, 10):
+            __match_args__ = ("system", "node", "release", "version", "machine")  # pyright: ignore[reportAssignmentType]
+
+        def __new__(_cls, system: str, node: str, release: str, version: str, machine: str) -> Self:
+            """Create new instance of uname_result_base(system, node, release, version, machine)"""
+
+        @property
+        def processor(self) -> str: ...
 
 def uname() -> uname_result:
     """Fairly portable uname interface. Returns a tuple
@@ -259,7 +278,7 @@ def python_compiler() -> str:
 
     """
 
-def platform(aliased: bool = ..., terse: bool = ...) -> str:
+def platform(aliased: bool = False, terse: bool = False) -> str:
     """Returns a single string identifying the underlying platform
     with as much useful information as possible (but no more :).
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/plistlib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/plistlib.pyi
index 33d659c787..845d5a7d2d 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/plistlib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/plistlib.pyi
@@ -60,7 +60,7 @@ from _typeshed import ReadableBuffer
 from collections.abc import Mapping, MutableMapping
 from datetime import datetime
 from enum import Enum
-from typing import IO, Any
+from typing import IO, Any, Final
 from typing_extensions import Self
 
 __all__ = ["InvalidFileException", "FMT_XML", "FMT_BINARY", "load", "dump", "loads", "dumps", "UID"]
@@ -71,8 +71,8 @@ class PlistFormat(Enum):
     FMT_XML = 1
     FMT_BINARY = 2
 
-FMT_XML = PlistFormat.FMT_XML
-FMT_BINARY = PlistFormat.FMT_BINARY
+FMT_XML: Final = PlistFormat.FMT_XML
+FMT_BINARY: Final = PlistFormat.FMT_BINARY
 if sys.version_info >= (3, 13):
     def load(
         fp: IO[bytes],
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/poplib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/poplib.pyi
index 25a5f84d62..c5c59d710f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/poplib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/poplib.pyi
@@ -22,7 +22,7 @@ POP3_SSL_PORT: Final = 995
 CR: Final = b"\r"
 LF: Final = b"\n"
 CRLF: Final = b"\r\n"
-HAVE_SSL: bool
+HAVE_SSL: Final[bool]
 
 class POP3:
     """This class supports both the minimal and optional command sets.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/pydoc.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/pydoc.pyi
index 0a056f84f9..cd5a5c1b94 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/pydoc.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/pydoc.pyi
@@ -92,12 +92,12 @@ def classify_class_attrs(object: object) -> list[tuple[str, str, type, str]]:
     """Wrap inspect.classify_class_attrs, with fixup for data descriptors and bound methods."""
 
 if sys.version_info >= (3, 13):
-    @deprecated("Deprecated in Python 3.13.")
-    def ispackage(path: str) -> bool:
+    @deprecated("Deprecated since Python 3.13.")
+    def ispackage(path: str) -> bool:  # undocumented
         """Guess whether a path refers to a package directory."""
 
 else:
-    def ispackage(path: str) -> bool:
+    def ispackage(path: str) -> bool:  # undocumented
         """Guess whether a path refers to a package directory."""
 
 def source_synopsis(file: IO[AnyStr]) -> AnyStr | None:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/pydoc_data/topics.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/pydoc_data/topics.pyi
index 091d343001..ce907a41c0 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/pydoc_data/topics.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/pydoc_data/topics.pyi
@@ -1 +1,3 @@
-topics: dict[str, str]
+from typing import Final
+
+topics: Final[dict[str, str]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/random.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/random.pyi
index b46488f02e..1ba0e21064 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/random.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/random.pyi
@@ -52,6 +52,7 @@ from _typeshed import SupportsLenAndGetItem
 from collections.abc import Callable, Iterable, MutableSequence, Sequence, Set as AbstractSet
 from fractions import Fraction
 from typing import Any, ClassVar, NoReturn, TypeVar
+from typing_extensions import Self
 
 __all__ = [
     "Random",
@@ -109,6 +110,10 @@ class Random(_random.Random):
     # Using other `seed` types is deprecated since 3.9 and removed in 3.11
     # Ignore Y041, since random.seed doesn't treat int like a float subtype. Having an explicit
     # int better documents conventional usage of random.seed.
+    if sys.version_info < (3, 10):
+        # this is a workaround for pyright correctly flagging an inconsistent inherited constructor, see #14624
+        def __new__(cls, x: int | float | str | bytes | bytearray | None = None) -> Self: ...  # noqa: Y041
+
     def seed(self, a: int | float | str | bytes | bytearray | None = None, version: int = 2) -> None:  # type: ignore[override]  # noqa: Y041
         """Initialize internal state from a seed.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/resource.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/resource.pyi
index be5ee3eb14..f5b27d28ce 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/resource.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/resource.pyi
@@ -3,27 +3,28 @@ from _typeshed import structseq
 from typing import Final, final
 
 if sys.platform != "win32":
-    RLIMIT_AS: int
-    RLIMIT_CORE: int
-    RLIMIT_CPU: int
-    RLIMIT_DATA: int
-    RLIMIT_FSIZE: int
-    RLIMIT_MEMLOCK: int
-    RLIMIT_NOFILE: int
-    RLIMIT_NPROC: int
-    RLIMIT_RSS: int
-    RLIMIT_STACK: int
-    RLIM_INFINITY: int
-    RUSAGE_CHILDREN: int
-    RUSAGE_SELF: int
+    # Depends on resource.h
+    RLIMIT_AS: Final[int]
+    RLIMIT_CORE: Final[int]
+    RLIMIT_CPU: Final[int]
+    RLIMIT_DATA: Final[int]
+    RLIMIT_FSIZE: Final[int]
+    RLIMIT_MEMLOCK: Final[int]
+    RLIMIT_NOFILE: Final[int]
+    RLIMIT_NPROC: Final[int]
+    RLIMIT_RSS: Final[int]
+    RLIMIT_STACK: Final[int]
+    RLIM_INFINITY: Final[int]
+    RUSAGE_CHILDREN: Final[int]
+    RUSAGE_SELF: Final[int]
     if sys.platform == "linux":
-        RLIMIT_MSGQUEUE: int
-        RLIMIT_NICE: int
-        RLIMIT_OFILE: int
-        RLIMIT_RTPRIO: int
-        RLIMIT_RTTIME: int
-        RLIMIT_SIGPENDING: int
-        RUSAGE_THREAD: int
+        RLIMIT_MSGQUEUE: Final[int]
+        RLIMIT_NICE: Final[int]
+        RLIMIT_OFILE: Final[int]
+        RLIMIT_RTPRIO: Final[int]
+        RLIMIT_RTTIME: Final[int]
+        RLIMIT_SIGPENDING: Final[int]
+        RUSAGE_THREAD: Final[int]
 
     @final
     class struct_rusage(
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/select.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/select.pyi
index 71d08a1ee2..93d3b5a72f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/select.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/select.pyi
@@ -8,25 +8,25 @@ import sys
 from _typeshed import FileDescriptorLike
 from collections.abc import Iterable
 from types import TracebackType
-from typing import Any, ClassVar, final
+from typing import Any, ClassVar, Final, final
 from typing_extensions import Self
 
 if sys.platform != "win32":
-    PIPE_BUF: int
-    POLLERR: int
-    POLLHUP: int
-    POLLIN: int
+    PIPE_BUF: Final[int]
+    POLLERR: Final[int]
+    POLLHUP: Final[int]
+    POLLIN: Final[int]
     if sys.platform == "linux":
-        POLLMSG: int
-    POLLNVAL: int
-    POLLOUT: int
-    POLLPRI: int
-    POLLRDBAND: int
+        POLLMSG: Final[int]
+    POLLNVAL: Final[int]
+    POLLOUT: Final[int]
+    POLLPRI: Final[int]
+    POLLRDBAND: Final[int]
     if sys.platform == "linux":
-        POLLRDHUP: int
-    POLLRDNORM: int
-    POLLWRBAND: int
-    POLLWRNORM: int
+        POLLRDHUP: Final[int]
+    POLLRDNORM: Final[int]
+    POLLWRBAND: Final[int]
+    POLLWRNORM: Final[int]
 
     # This is actually a function that returns an instance of a class.
     # The class is not accessible directly, and also calls itself select.poll.
@@ -155,45 +155,45 @@ if sys.platform != "linux" and sys.platform != "win32":
         def fromfd(cls, fd: FileDescriptorLike, /) -> kqueue:
             """Create a kqueue object from a given control fd."""
 
-    KQ_EV_ADD: int
-    KQ_EV_CLEAR: int
-    KQ_EV_DELETE: int
-    KQ_EV_DISABLE: int
-    KQ_EV_ENABLE: int
-    KQ_EV_EOF: int
-    KQ_EV_ERROR: int
-    KQ_EV_FLAG1: int
-    KQ_EV_ONESHOT: int
-    KQ_EV_SYSFLAGS: int
-    KQ_FILTER_AIO: int
+    KQ_EV_ADD: Final[int]
+    KQ_EV_CLEAR: Final[int]
+    KQ_EV_DELETE: Final[int]
+    KQ_EV_DISABLE: Final[int]
+    KQ_EV_ENABLE: Final[int]
+    KQ_EV_EOF: Final[int]
+    KQ_EV_ERROR: Final[int]
+    KQ_EV_FLAG1: Final[int]
+    KQ_EV_ONESHOT: Final[int]
+    KQ_EV_SYSFLAGS: Final[int]
+    KQ_FILTER_AIO: Final[int]
     if sys.platform != "darwin":
-        KQ_FILTER_NETDEV: int
-    KQ_FILTER_PROC: int
-    KQ_FILTER_READ: int
-    KQ_FILTER_SIGNAL: int
-    KQ_FILTER_TIMER: int
-    KQ_FILTER_VNODE: int
-    KQ_FILTER_WRITE: int
-    KQ_NOTE_ATTRIB: int
-    KQ_NOTE_CHILD: int
-    KQ_NOTE_DELETE: int
-    KQ_NOTE_EXEC: int
-    KQ_NOTE_EXIT: int
-    KQ_NOTE_EXTEND: int
-    KQ_NOTE_FORK: int
-    KQ_NOTE_LINK: int
+        KQ_FILTER_NETDEV: Final[int]
+    KQ_FILTER_PROC: Final[int]
+    KQ_FILTER_READ: Final[int]
+    KQ_FILTER_SIGNAL: Final[int]
+    KQ_FILTER_TIMER: Final[int]
+    KQ_FILTER_VNODE: Final[int]
+    KQ_FILTER_WRITE: Final[int]
+    KQ_NOTE_ATTRIB: Final[int]
+    KQ_NOTE_CHILD: Final[int]
+    KQ_NOTE_DELETE: Final[int]
+    KQ_NOTE_EXEC: Final[int]
+    KQ_NOTE_EXIT: Final[int]
+    KQ_NOTE_EXTEND: Final[int]
+    KQ_NOTE_FORK: Final[int]
+    KQ_NOTE_LINK: Final[int]
     if sys.platform != "darwin":
-        KQ_NOTE_LINKDOWN: int
-        KQ_NOTE_LINKINV: int
-        KQ_NOTE_LINKUP: int
-    KQ_NOTE_LOWAT: int
-    KQ_NOTE_PCTRLMASK: int
-    KQ_NOTE_PDATAMASK: int
-    KQ_NOTE_RENAME: int
-    KQ_NOTE_REVOKE: int
-    KQ_NOTE_TRACK: int
-    KQ_NOTE_TRACKERR: int
-    KQ_NOTE_WRITE: int
+        KQ_NOTE_LINKDOWN: Final[int]
+        KQ_NOTE_LINKINV: Final[int]
+        KQ_NOTE_LINKUP: Final[int]
+    KQ_NOTE_LOWAT: Final[int]
+    KQ_NOTE_PCTRLMASK: Final[int]
+    KQ_NOTE_PDATAMASK: Final[int]
+    KQ_NOTE_RENAME: Final[int]
+    KQ_NOTE_REVOKE: Final[int]
+    KQ_NOTE_TRACK: Final[int]
+    KQ_NOTE_TRACKERR: Final[int]
+    KQ_NOTE_WRITE: Final[int]
 
 if sys.platform == "linux":
     @final
@@ -207,7 +207,7 @@ if sys.platform == "linux":
         the maximum number of monitored events.
         """
 
-        def __init__(self, sizehint: int = ..., flags: int = ...) -> None: ...
+        def __new__(self, sizehint: int = ..., flags: int = ...) -> Self: ...
         def __enter__(self) -> Self: ...
         def __exit__(
             self,
@@ -269,23 +269,23 @@ if sys.platform == "linux":
         def fromfd(cls, fd: FileDescriptorLike, /) -> epoll:
             """Create an epoll object from a given control fd."""
 
-    EPOLLERR: int
-    EPOLLEXCLUSIVE: int
-    EPOLLET: int
-    EPOLLHUP: int
-    EPOLLIN: int
-    EPOLLMSG: int
-    EPOLLONESHOT: int
-    EPOLLOUT: int
-    EPOLLPRI: int
-    EPOLLRDBAND: int
-    EPOLLRDHUP: int
-    EPOLLRDNORM: int
-    EPOLLWRBAND: int
-    EPOLLWRNORM: int
-    EPOLL_CLOEXEC: int
+    EPOLLERR: Final[int]
+    EPOLLEXCLUSIVE: Final[int]
+    EPOLLET: Final[int]
+    EPOLLHUP: Final[int]
+    EPOLLIN: Final[int]
+    EPOLLMSG: Final[int]
+    EPOLLONESHOT: Final[int]
+    EPOLLOUT: Final[int]
+    EPOLLPRI: Final[int]
+    EPOLLRDBAND: Final[int]
+    EPOLLRDHUP: Final[int]
+    EPOLLRDNORM: Final[int]
+    EPOLLWRBAND: Final[int]
+    EPOLLWRNORM: Final[int]
+    EPOLL_CLOEXEC: Final[int]
     if sys.version_info >= (3, 14):
-        EPOLLWAKEUP: int
+        EPOLLWAKEUP: Final[int]
 
 if sys.platform != "linux" and sys.platform != "darwin" and sys.platform != "win32":
     # Solaris only
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/selectors.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/selectors.pyi
index d35e437034..ed95b56b13 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/selectors.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/selectors.pyi
@@ -8,13 +8,13 @@ import sys
 from _typeshed import FileDescriptor, FileDescriptorLike, Unused
 from abc import ABCMeta, abstractmethod
 from collections.abc import Mapping
-from typing import Any, NamedTuple
+from typing import Any, Final, NamedTuple
 from typing_extensions import Self, TypeAlias
 
 _EventMask: TypeAlias = int
 
-EVENT_READ: _EventMask
-EVENT_WRITE: _EventMask
+EVENT_READ: Final = 1
+EVENT_WRITE: Final = 2
 
 class SelectorKey(NamedTuple):
     """SelectorKey(fileobj, fd, events, data)
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/smtplib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/smtplib.pyi
index 9c5dc852c2..d2df39ff39 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/smtplib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/smtplib.pyi
@@ -39,7 +39,7 @@ from re import Pattern
 from socket import socket
 from ssl import SSLContext
 from types import TracebackType
-from typing import Any, Protocol, overload, type_check_only
+from typing import Any, Final, Protocol, overload, type_check_only
 from typing_extensions import Self, TypeAlias
 
 __all__ = [
@@ -62,12 +62,12 @@ __all__ = [
 _Reply: TypeAlias = tuple[int, bytes]
 _SendErrs: TypeAlias = dict[str, _Reply]
 
-SMTP_PORT: int
-SMTP_SSL_PORT: int
-CRLF: str
-bCRLF: bytes
+SMTP_PORT: Final = 25
+SMTP_SSL_PORT: Final = 465
+CRLF: Final[str]
+bCRLF: Final[bytes]
 
-OLDSTYLE_AUTH: Pattern[str]
+OLDSTYLE_AUTH: Final[Pattern[str]]
 
 class SMTPException(OSError):
     """Base class for all exceptions raised by this module."""
@@ -590,7 +590,7 @@ class SMTP_SSL(SMTP):
             context: SSLContext | None = None,
         ) -> None: ...
 
-LMTP_PORT: int
+LMTP_PORT: Final = 2003
 
 class LMTP(SMTP):
     """LMTP - Local Mail Transfer Protocol
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/socket.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/socket.pyi
index 9555181986..ad2af86292 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/socket.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/socket.pyi
@@ -183,7 +183,7 @@ from _typeshed import ReadableBuffer, Unused, WriteableBuffer
 from collections.abc import Iterable
 from enum import IntEnum, IntFlag
 from io import BufferedReader, BufferedRWPair, BufferedWriter, IOBase, RawIOBase, TextIOWrapper
-from typing import Any, Literal, Protocol, SupportsIndex, overload, type_check_only
+from typing import Any, Final, Literal, Protocol, SupportsIndex, overload, type_check_only
 from typing_extensions import Self
 
 __all__ = [
@@ -1106,9 +1106,9 @@ if sys.version_info >= (3, 14):
         __all__ += ["IP_FREEBIND", "IP_RECVORIGDSTADDR", "VMADDR_CID_LOCAL"]
 
 # Re-exported from errno
-EBADF: int
-EAGAIN: int
-EWOULDBLOCK: int
+EBADF: Final[int]
+EAGAIN: Final[int]
+EWOULDBLOCK: Final[int]
 
 # These errors are implemented in _socket at runtime
 # but they consider themselves to live in socket so we'll put them here.
@@ -1173,60 +1173,60 @@ class AddressFamily(IntEnum):
         # FreeBSD >= 14.0
         AF_DIVERT = 44
 
-AF_INET = AddressFamily.AF_INET
-AF_INET6 = AddressFamily.AF_INET6
-AF_APPLETALK = AddressFamily.AF_APPLETALK
-AF_DECnet: Literal[12]
-AF_IPX = AddressFamily.AF_IPX
-AF_SNA = AddressFamily.AF_SNA
-AF_UNSPEC = AddressFamily.AF_UNSPEC
+AF_INET: Final = AddressFamily.AF_INET
+AF_INET6: Final = AddressFamily.AF_INET6
+AF_APPLETALK: Final = AddressFamily.AF_APPLETALK
+AF_DECnet: Final = 12
+AF_IPX: Final = AddressFamily.AF_IPX
+AF_SNA: Final = AddressFamily.AF_SNA
+AF_UNSPEC: Final = AddressFamily.AF_UNSPEC
 
 if sys.platform != "darwin":
-    AF_IRDA = AddressFamily.AF_IRDA
+    AF_IRDA: Final = AddressFamily.AF_IRDA
 
 if sys.platform != "win32":
-    AF_ROUTE = AddressFamily.AF_ROUTE
-    AF_UNIX = AddressFamily.AF_UNIX
+    AF_ROUTE: Final = AddressFamily.AF_ROUTE
+    AF_UNIX: Final = AddressFamily.AF_UNIX
 
 if sys.platform == "darwin":
-    AF_SYSTEM = AddressFamily.AF_SYSTEM
+    AF_SYSTEM: Final = AddressFamily.AF_SYSTEM
 
 if sys.platform != "win32" and sys.platform != "darwin":
-    AF_ASH = AddressFamily.AF_ASH
-    AF_ATMPVC = AddressFamily.AF_ATMPVC
-    AF_ATMSVC = AddressFamily.AF_ATMSVC
-    AF_AX25 = AddressFamily.AF_AX25
-    AF_BRIDGE = AddressFamily.AF_BRIDGE
-    AF_ECONET = AddressFamily.AF_ECONET
-    AF_KEY = AddressFamily.AF_KEY
-    AF_LLC = AddressFamily.AF_LLC
-    AF_NETBEUI = AddressFamily.AF_NETBEUI
-    AF_NETROM = AddressFamily.AF_NETROM
-    AF_PPPOX = AddressFamily.AF_PPPOX
-    AF_ROSE = AddressFamily.AF_ROSE
-    AF_SECURITY = AddressFamily.AF_SECURITY
-    AF_WANPIPE = AddressFamily.AF_WANPIPE
-    AF_X25 = AddressFamily.AF_X25
+    AF_ASH: Final = AddressFamily.AF_ASH
+    AF_ATMPVC: Final = AddressFamily.AF_ATMPVC
+    AF_ATMSVC: Final = AddressFamily.AF_ATMSVC
+    AF_AX25: Final = AddressFamily.AF_AX25
+    AF_BRIDGE: Final = AddressFamily.AF_BRIDGE
+    AF_ECONET: Final = AddressFamily.AF_ECONET
+    AF_KEY: Final = AddressFamily.AF_KEY
+    AF_LLC: Final = AddressFamily.AF_LLC
+    AF_NETBEUI: Final = AddressFamily.AF_NETBEUI
+    AF_NETROM: Final = AddressFamily.AF_NETROM
+    AF_PPPOX: Final = AddressFamily.AF_PPPOX
+    AF_ROSE: Final = AddressFamily.AF_ROSE
+    AF_SECURITY: Final = AddressFamily.AF_SECURITY
+    AF_WANPIPE: Final = AddressFamily.AF_WANPIPE
+    AF_X25: Final = AddressFamily.AF_X25
 
 if sys.platform == "linux":
-    AF_CAN = AddressFamily.AF_CAN
-    AF_PACKET = AddressFamily.AF_PACKET
-    AF_RDS = AddressFamily.AF_RDS
-    AF_TIPC = AddressFamily.AF_TIPC
-    AF_ALG = AddressFamily.AF_ALG
-    AF_NETLINK = AddressFamily.AF_NETLINK
-    AF_VSOCK = AddressFamily.AF_VSOCK
-    AF_QIPCRTR = AddressFamily.AF_QIPCRTR
+    AF_CAN: Final = AddressFamily.AF_CAN
+    AF_PACKET: Final = AddressFamily.AF_PACKET
+    AF_RDS: Final = AddressFamily.AF_RDS
+    AF_TIPC: Final = AddressFamily.AF_TIPC
+    AF_ALG: Final = AddressFamily.AF_ALG
+    AF_NETLINK: Final = AddressFamily.AF_NETLINK
+    AF_VSOCK: Final = AddressFamily.AF_VSOCK
+    AF_QIPCRTR: Final = AddressFamily.AF_QIPCRTR
 
 if sys.platform != "linux":
-    AF_LINK = AddressFamily.AF_LINK
+    AF_LINK: Final = AddressFamily.AF_LINK
 if sys.platform != "darwin" and sys.platform != "linux":
-    AF_BLUETOOTH = AddressFamily.AF_BLUETOOTH
+    AF_BLUETOOTH: Final = AddressFamily.AF_BLUETOOTH
 if sys.platform == "win32" and sys.version_info >= (3, 12):
-    AF_HYPERV = AddressFamily.AF_HYPERV
+    AF_HYPERV: Final = AddressFamily.AF_HYPERV
 if sys.platform != "linux" and sys.platform != "win32" and sys.platform != "darwin" and sys.version_info >= (3, 12):
     # FreeBSD >= 14.0
-    AF_DIVERT = AddressFamily.AF_DIVERT
+    AF_DIVERT: Final = AddressFamily.AF_DIVERT
 
 class SocketKind(IntEnum):
     """An enumeration."""
@@ -1240,14 +1240,14 @@ class SocketKind(IntEnum):
         SOCK_CLOEXEC = 524288
         SOCK_NONBLOCK = 2048
 
-SOCK_STREAM = SocketKind.SOCK_STREAM
-SOCK_DGRAM = SocketKind.SOCK_DGRAM
-SOCK_RAW = SocketKind.SOCK_RAW
-SOCK_RDM = SocketKind.SOCK_RDM
-SOCK_SEQPACKET = SocketKind.SOCK_SEQPACKET
+SOCK_STREAM: Final = SocketKind.SOCK_STREAM
+SOCK_DGRAM: Final = SocketKind.SOCK_DGRAM
+SOCK_RAW: Final = SocketKind.SOCK_RAW
+SOCK_RDM: Final = SocketKind.SOCK_RDM
+SOCK_SEQPACKET: Final = SocketKind.SOCK_SEQPACKET
 if sys.platform == "linux":
-    SOCK_CLOEXEC = SocketKind.SOCK_CLOEXEC
-    SOCK_NONBLOCK = SocketKind.SOCK_NONBLOCK
+    SOCK_CLOEXEC: Final = SocketKind.SOCK_CLOEXEC
+    SOCK_NONBLOCK: Final = SocketKind.SOCK_NONBLOCK
 
 class MsgFlag(IntFlag):
     """An enumeration."""
@@ -1281,36 +1281,36 @@ class MsgFlag(IntFlag):
     if sys.platform != "win32" and sys.platform != "linux":
         MSG_EOF = 256
 
-MSG_CTRUNC = MsgFlag.MSG_CTRUNC
-MSG_DONTROUTE = MsgFlag.MSG_DONTROUTE
-MSG_OOB = MsgFlag.MSG_OOB
-MSG_PEEK = MsgFlag.MSG_PEEK
-MSG_TRUNC = MsgFlag.MSG_TRUNC
-MSG_WAITALL = MsgFlag.MSG_WAITALL
+MSG_CTRUNC: Final = MsgFlag.MSG_CTRUNC
+MSG_DONTROUTE: Final = MsgFlag.MSG_DONTROUTE
+MSG_OOB: Final = MsgFlag.MSG_OOB
+MSG_PEEK: Final = MsgFlag.MSG_PEEK
+MSG_TRUNC: Final = MsgFlag.MSG_TRUNC
+MSG_WAITALL: Final = MsgFlag.MSG_WAITALL
 
 if sys.platform == "win32":
-    MSG_BCAST = MsgFlag.MSG_BCAST
-    MSG_MCAST = MsgFlag.MSG_MCAST
+    MSG_BCAST: Final = MsgFlag.MSG_BCAST
+    MSG_MCAST: Final = MsgFlag.MSG_MCAST
 
 if sys.platform != "darwin":
-    MSG_ERRQUEUE = MsgFlag.MSG_ERRQUEUE
+    MSG_ERRQUEUE: Final = MsgFlag.MSG_ERRQUEUE
 
 if sys.platform != "win32":
-    MSG_DONTWAIT = MsgFlag.MSG_DONTWAIT
-    MSG_EOR = MsgFlag.MSG_EOR
-    MSG_NOSIGNAL = MsgFlag.MSG_NOSIGNAL  # Sometimes this exists on darwin, sometimes not
+    MSG_DONTWAIT: Final = MsgFlag.MSG_DONTWAIT
+    MSG_EOR: Final = MsgFlag.MSG_EOR
+    MSG_NOSIGNAL: Final = MsgFlag.MSG_NOSIGNAL  # Sometimes this exists on darwin, sometimes not
 
 if sys.platform != "win32" and sys.platform != "darwin":
-    MSG_CMSG_CLOEXEC = MsgFlag.MSG_CMSG_CLOEXEC
-    MSG_CONFIRM = MsgFlag.MSG_CONFIRM
-    MSG_FASTOPEN = MsgFlag.MSG_FASTOPEN
-    MSG_MORE = MsgFlag.MSG_MORE
+    MSG_CMSG_CLOEXEC: Final = MsgFlag.MSG_CMSG_CLOEXEC
+    MSG_CONFIRM: Final = MsgFlag.MSG_CONFIRM
+    MSG_FASTOPEN: Final = MsgFlag.MSG_FASTOPEN
+    MSG_MORE: Final = MsgFlag.MSG_MORE
 
 if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
-    MSG_NOTIFICATION = MsgFlag.MSG_NOTIFICATION
+    MSG_NOTIFICATION: Final = MsgFlag.MSG_NOTIFICATION
 
 if sys.platform != "win32" and sys.platform != "linux":
-    MSG_EOF = MsgFlag.MSG_EOF
+    MSG_EOF: Final = MsgFlag.MSG_EOF
 
 class AddressInfo(IntFlag):
     """An enumeration."""
@@ -1327,18 +1327,18 @@ class AddressInfo(IntFlag):
         AI_MASK = 5127
         AI_V4MAPPED_CFG = 512
 
-AI_ADDRCONFIG = AddressInfo.AI_ADDRCONFIG
-AI_ALL = AddressInfo.AI_ALL
-AI_CANONNAME = AddressInfo.AI_CANONNAME
-AI_NUMERICHOST = AddressInfo.AI_NUMERICHOST
-AI_NUMERICSERV = AddressInfo.AI_NUMERICSERV
-AI_PASSIVE = AddressInfo.AI_PASSIVE
-AI_V4MAPPED = AddressInfo.AI_V4MAPPED
+AI_ADDRCONFIG: Final = AddressInfo.AI_ADDRCONFIG
+AI_ALL: Final = AddressInfo.AI_ALL
+AI_CANONNAME: Final = AddressInfo.AI_CANONNAME
+AI_NUMERICHOST: Final = AddressInfo.AI_NUMERICHOST
+AI_NUMERICSERV: Final = AddressInfo.AI_NUMERICSERV
+AI_PASSIVE: Final = AddressInfo.AI_PASSIVE
+AI_V4MAPPED: Final = AddressInfo.AI_V4MAPPED
 
 if sys.platform != "win32" and sys.platform != "linux":
-    AI_DEFAULT = AddressInfo.AI_DEFAULT
-    AI_MASK = AddressInfo.AI_MASK
-    AI_V4MAPPED_CFG = AddressInfo.AI_V4MAPPED_CFG
+    AI_DEFAULT: Final = AddressInfo.AI_DEFAULT
+    AI_MASK: Final = AddressInfo.AI_MASK
+    AI_V4MAPPED_CFG: Final = AddressInfo.AI_V4MAPPED_CFG
 
 if sys.platform == "win32":
     errorTab: dict[int, str]  # undocumented
@@ -1357,6 +1357,7 @@ class _SendableFile(Protocol):
 class socket(_socket.socket):
     """A subclass of _socket.socket adding the makefile() method."""
 
+    __slots__ = ["__weakref__", "_io_refs", "_closed"]
     def __init__(
         self, family: AddressFamily | int = -1, type: SocketKind | int = -1, proto: int = -1, fileno: int | None = None
     ) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/__init__.pyi
index ae46b544a5..e378b4d434 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/__init__.pyi
@@ -97,7 +97,7 @@ from sqlite3.dbapi2 import (
 )
 from types import TracebackType
 from typing import Any, Literal, Protocol, SupportsIndex, TypeVar, final, overload, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 if sys.version_info < (3, 14):
     from sqlite3.dbapi2 import version_info as version_info
@@ -302,6 +302,7 @@ class OperationalError(DatabaseError): ...
 class ProgrammingError(DatabaseError): ...
 class Warning(Exception): ...
 
+@disjoint_base
 class Connection:
     """SQLite database connection object."""
 
@@ -610,6 +611,7 @@ class Connection:
         If there was any exception, a rollback takes place; otherwise we commit.
         """
 
+@disjoint_base
 class Cursor:
     """SQLite database cursor class."""
 
@@ -669,6 +671,7 @@ class PrepareProtocol:
 
     def __init__(self, *args: object, **kwargs: object) -> None: ...
 
+@disjoint_base
 class Row(Sequence[Any]):
     def __new__(cls, cursor: Cursor, data: tuple[Any, ...], /) -> Self: ...
     def keys(self) -> list[str]:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/dbapi2.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/dbapi2.pyi
index d37a0d391e..9e170a8124 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/dbapi2.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sqlite3/dbapi2.pyi
@@ -66,7 +66,8 @@ from sqlite3 import (
     Row as Row,
     Warning as Warning,
 )
-from typing import Literal
+from typing import Final, Literal
+from typing_extensions import deprecated
 
 if sys.version_info >= (3, 12):
     from _sqlite3 import (
@@ -211,11 +212,15 @@ if sys.version_info >= (3, 11):
 
 if sys.version_info < (3, 14):
     # Deprecated and removed from _sqlite3 in 3.12, but removed from here in 3.14.
-    version: str
+    version: Final[str]
 
 if sys.version_info < (3, 12):
     if sys.version_info >= (3, 10):
         # deprecation wrapper that has a different name for the argument...
+        @deprecated(
+            "Deprecated since Python 3.10; removed in Python 3.12. "
+            "Open database in URI mode using `cache=shared` parameter instead."
+        )
         def enable_shared_cache(enable: int) -> None: ...
     else:
         from _sqlite3 import enable_shared_cache as enable_shared_cache
@@ -223,9 +228,9 @@ if sys.version_info < (3, 12):
 if sys.version_info < (3, 10):
     from _sqlite3 import OptimizedUnicode as OptimizedUnicode
 
-paramstyle: str
+paramstyle: Final = "qmark"
 threadsafety: Literal[0, 1, 3]
-apilevel: str
+apilevel: Final[str]
 Date = date
 Time = time
 Timestamp = datetime
@@ -236,7 +241,7 @@ def TimestampFromTicks(ticks: float) -> Timestamp: ...
 
 if sys.version_info < (3, 14):
     # Deprecated in 3.12, removed in 3.14.
-    version_info: tuple[int, int, int]
+    version_info: Final[tuple[int, int, int]]
 
-sqlite_version_info: tuple[int, int, int]
+sqlite_version_info: Final[tuple[int, int, int]]
 Binary = memoryview
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sre_compile.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sre_compile.pyi
index 684f8d77f7..b3205231f6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sre_compile.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sre_compile.pyi
@@ -4,9 +4,9 @@ from re import Pattern
 from sre_constants import *
 from sre_constants import _NamedIntConstant
 from sre_parse import SubPattern
-from typing import Any
+from typing import Any, Final
 
-MAXCODE: int
+MAXCODE: Final[int]
 
 def dis(code: list[_NamedIntConstant]) -> None: ...
 def isstring(obj: Any) -> bool: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sre_constants.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sre_constants.pyi
index 0d22f3af5a..d1c52ccfb1 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sre_constants.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sre_constants.pyi
@@ -3,15 +3,22 @@
 import sys
 from re import error as error
 from typing import Final
-from typing_extensions import Self
+from typing_extensions import Self, disjoint_base
 
 MAXGROUPS: Final[int]
 
 MAGIC: Final[int]
 
-class _NamedIntConstant(int):
-    name: str
-    def __new__(cls, value: int, name: str) -> Self: ...
+if sys.version_info >= (3, 12):
+    class _NamedIntConstant(int):
+        name: str
+        def __new__(cls, value: int, name: str) -> Self: ...
+
+else:
+    @disjoint_base
+    class _NamedIntConstant(int):
+        name: str
+        def __new__(cls, value: int, name: str) -> Self: ...
 
 MAXREPEAT: Final[_NamedIntConstant]
 OPCODES: list[_NamedIntConstant]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sre_parse.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sre_parse.pyi
index ad121383c7..89d33fcdd2 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sre_parse.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sre_parse.pyi
@@ -5,24 +5,24 @@ from collections.abc import Iterable
 from re import Match, Pattern as _Pattern
 from sre_constants import *
 from sre_constants import _NamedIntConstant as _NIC, error as _Error
-from typing import Any, overload
+from typing import Any, Final, overload
 from typing_extensions import TypeAlias
 
-SPECIAL_CHARS: str
-REPEAT_CHARS: str
-DIGITS: frozenset[str]
-OCTDIGITS: frozenset[str]
-HEXDIGITS: frozenset[str]
-ASCIILETTERS: frozenset[str]
-WHITESPACE: frozenset[str]
-ESCAPES: dict[str, tuple[_NIC, int]]
-CATEGORIES: dict[str, tuple[_NIC, _NIC] | tuple[_NIC, list[tuple[_NIC, _NIC]]]]
-FLAGS: dict[str, int]
-TYPE_FLAGS: int
-GLOBAL_FLAGS: int
+SPECIAL_CHARS: Final = ".\\[{()*+?^$|"
+REPEAT_CHARS: Final = "*+?{"
+DIGITS: Final[frozenset[str]]
+OCTDIGITS: Final[frozenset[str]]
+HEXDIGITS: Final[frozenset[str]]
+ASCIILETTERS: Final[frozenset[str]]
+WHITESPACE: Final[frozenset[str]]
+ESCAPES: Final[dict[str, tuple[_NIC, int]]]
+CATEGORIES: Final[dict[str, tuple[_NIC, _NIC] | tuple[_NIC, list[tuple[_NIC, _NIC]]]]]
+FLAGS: Final[dict[str, int]]
+TYPE_FLAGS: Final[int]
+GLOBAL_FLAGS: Final[int]
 
 if sys.version_info >= (3, 11):
-    MAXWIDTH: int
+    MAXWIDTH: Final[int]
 
 if sys.version_info < (3, 11):
     class Verbose(Exception): ...
@@ -41,7 +41,7 @@ class State:
     lookbehindgroups: int | None
     @property
     def groups(self) -> int: ...
-    def opengroup(self, name: str | None = ...) -> int: ...
+    def opengroup(self, name: str | None = None) -> int: ...
     def closegroup(self, gid: int, p: SubPattern) -> None: ...
     def checkgroup(self, gid: int) -> bool: ...
     def checklookbehindgroup(self, gid: int, source: Tokenizer) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/ssl.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/ssl.pyi
index f81f51970a..b4540c8ca8 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/ssl.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/ssl.pyi
@@ -188,7 +188,7 @@ class SSLCertVerificationError(SSLError, ValueError):
 CertificateError = SSLCertVerificationError
 
 if sys.version_info < (3, 12):
-    @deprecated("Deprecated since Python 3.7. Removed in Python 3.12. Use `SSLContext.wrap_socket()` instead.")
+    @deprecated("Deprecated since Python 3.7; removed in Python 3.12. Use `SSLContext.wrap_socket()` instead.")
     def wrap_socket(
         sock: socket.socket,
         keyfile: StrOrBytesPath | None = None,
@@ -201,7 +201,7 @@ if sys.version_info < (3, 12):
         suppress_ragged_eofs: bool = True,
         ciphers: str | None = None,
     ) -> SSLSocket: ...
-    @deprecated("Deprecated since Python 3.7. Removed in Python 3.12.")
+    @deprecated("Deprecated since Python 3.7; removed in Python 3.12.")
     def match_hostname(cert: _PeerCertRetDictType, hostname: str) -> None:
         """Verify that *cert* (in decoded format as returned by
         SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 and RFC 6125
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/statistics.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/statistics.pyi
index 67deb3720b..f5f731c462 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/statistics.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/statistics.pyi
@@ -523,6 +523,7 @@ def variance(data: Iterable[_NumberT], xbar: _NumberT | None = None) -> _NumberT
 class NormalDist:
     """Normal distribution of a random variable"""
 
+    __slots__ = {"_mu": "Arithmetic mean of a normal distribution", "_sigma": "Standard deviation of a normal distribution"}
     def __init__(self, mu: float = 0.0, sigma: float = 1.0) -> None:
         """NormalDist where mu is the mean and sigma is the standard deviation."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/string/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/string/__init__.pyi
index e539981969..6d87737eff 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/string/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/string/__init__.pyi
@@ -18,7 +18,7 @@ import sys
 from _typeshed import StrOrLiteralStr
 from collections.abc import Iterable, Mapping, Sequence
 from re import Pattern, RegexFlag
-from typing import Any, ClassVar, overload
+from typing import Any, ClassVar, Final, overload
 from typing_extensions import LiteralString
 
 __all__ = [
@@ -36,15 +36,15 @@ __all__ = [
     "Template",
 ]
 
-ascii_letters: LiteralString
-ascii_lowercase: LiteralString
-ascii_uppercase: LiteralString
-digits: LiteralString
-hexdigits: LiteralString
-octdigits: LiteralString
-punctuation: LiteralString
-printable: LiteralString
-whitespace: LiteralString
+whitespace: Final = " \t\n\r\v\f"
+ascii_lowercase: Final = "abcdefghijklmnopqrstuvwxyz"
+ascii_uppercase: Final = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ascii_letters: Final[LiteralString]  # string too long
+digits: Final = "0123456789"
+hexdigits: Final = "0123456789abcdefABCDEF"
+octdigits: Final = "01234567"
+punctuation: Final = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+printable: Final[LiteralString]  # string too long
 
 def capwords(s: StrOrLiteralStr, sep: StrOrLiteralStr | None = None) -> StrOrLiteralStr:
     """capwords(s [,sep]) -> string
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/stringprep.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/stringprep.pyi
index 4d262df8d9..75a3545521 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/stringprep.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/stringprep.pyi
@@ -4,13 +4,15 @@ There are two kinds of tables: sets, for which a member test is provided,
 and mappings, for which a mapping function is provided.
 """
 
-b1_set: set[int]
-b3_exceptions: dict[int, str]
-c22_specials: set[int]
-c6_set: set[int]
-c7_set: set[int]
-c8_set: set[int]
-c9_set: set[int]
+from typing import Final
+
+b1_set: Final[set[int]]
+b3_exceptions: Final[dict[int, str]]
+c22_specials: Final[set[int]]
+c6_set: Final[set[int]]
+c7_set: Final[set[int]]
+c8_set: Final[set[int]]
+c9_set: Final[set[int]]
 
 def in_table_a1(code: str) -> bool: ...
 def in_table_b1(code: str) -> bool: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/subprocess.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/subprocess.pyi
index a199b8714b..60e4906577 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/subprocess.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/subprocess.pyi
@@ -157,7 +157,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -220,7 +220,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -254,7 +254,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -289,7 +289,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         # where the *real* keyword only args start
         capture_output: bool = False,
         check: bool = False,
@@ -323,7 +323,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -357,7 +357,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -394,7 +394,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -456,7 +456,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -489,7 +489,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -523,7 +523,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         # where the *real* keyword only args start
         capture_output: bool = False,
         check: bool = False,
@@ -556,7 +556,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -589,7 +589,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -625,7 +625,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -685,7 +685,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -717,7 +717,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -750,7 +750,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         # where the *real* keyword only args start
         capture_output: bool = False,
         check: bool = False,
@@ -782,7 +782,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -814,7 +814,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         capture_output: bool = False,
         check: bool = False,
@@ -849,7 +849,7 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         encoding: str | None = None,
         timeout: float | None = None,
@@ -888,7 +888,7 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         encoding: str | None = None,
         timeout: float | None = None,
@@ -925,7 +925,7 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         encoding: str | None = None,
         timeout: float | None = None,
@@ -963,8 +963,8 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
-        timeout: float | None = ...,
+        pass_fds: Collection[int] = (),
+        timeout: float | None = None,
         *,
         encoding: str | None = None,
         text: bool | None = None,
@@ -1004,8 +1004,8 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
-        timeout: float | None = ...,
+        pass_fds: Collection[int] = (),
+        timeout: float | None = None,
         *,
         encoding: str | None = None,
         text: bool | None = None,
@@ -1043,8 +1043,8 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
-        timeout: float | None = ...,
+        pass_fds: Collection[int] = (),
+        timeout: float | None = None,
         *,
         encoding: str | None = None,
         text: bool | None = None,
@@ -1082,10 +1082,10 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: Literal[True],
@@ -1148,10 +1148,10 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str,
         errors: str | None = None,
         text: bool | None = None,
@@ -1179,10 +1179,10 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str,
         text: bool | None = None,
@@ -1211,10 +1211,10 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         # where the real keyword only ones start
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: bool | None = None,
@@ -1242,10 +1242,10 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: None = None,
         errors: None = None,
         text: Literal[False] | None = None,
@@ -1273,10 +1273,10 @@ if sys.version_info >= (3, 11):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: bool | None = None,
@@ -1307,10 +1307,10 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: Literal[True],
@@ -1372,10 +1372,10 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str,
         errors: str | None = None,
         text: bool | None = None,
@@ -1402,10 +1402,10 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str,
         text: bool | None = None,
@@ -1433,10 +1433,10 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         # where the real keyword only ones start
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: bool | None = None,
@@ -1463,10 +1463,10 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: None = None,
         errors: None = None,
         text: Literal[False] | None = None,
@@ -1493,10 +1493,10 @@ elif sys.version_info >= (3, 10):
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: bool | None = None,
@@ -1525,10 +1525,10 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: Literal[True],
@@ -1589,10 +1589,10 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str,
         errors: str | None = None,
         text: bool | None = None,
@@ -1618,10 +1618,10 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str,
         text: bool | None = None,
@@ -1648,10 +1648,10 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         # where the real keyword only ones start
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: bool | None = None,
@@ -1677,10 +1677,10 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: None = None,
         errors: None = None,
         text: Literal[False] | None = None,
@@ -1706,10 +1706,10 @@ else:
         creationflags: int = 0,
         restore_signals: bool = True,
         start_new_session: bool = False,
-        pass_fds: Collection[int] = ...,
+        pass_fds: Collection[int] = (),
         *,
         timeout: float | None = None,
-        input: _InputString | None = ...,
+        input: _InputString | None = None,
         encoding: str | None = None,
         errors: str | None = None,
         text: bool | None = None,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sunau.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sunau.pyi
index 7ccb82de85..5dbcffbe89 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sunau.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sunau.pyi
@@ -104,27 +104,27 @@ is destroyed.
 """
 
 from _typeshed import Unused
-from typing import IO, Any, Literal, NamedTuple, NoReturn, overload
+from typing import IO, Any, Final, Literal, NamedTuple, NoReturn, overload
 from typing_extensions import Self, TypeAlias
 
 _File: TypeAlias = str | IO[bytes]
 
 class Error(Exception): ...
 
-AUDIO_FILE_MAGIC: int
-AUDIO_FILE_ENCODING_MULAW_8: int
-AUDIO_FILE_ENCODING_LINEAR_8: int
-AUDIO_FILE_ENCODING_LINEAR_16: int
-AUDIO_FILE_ENCODING_LINEAR_24: int
-AUDIO_FILE_ENCODING_LINEAR_32: int
-AUDIO_FILE_ENCODING_FLOAT: int
-AUDIO_FILE_ENCODING_DOUBLE: int
-AUDIO_FILE_ENCODING_ADPCM_G721: int
-AUDIO_FILE_ENCODING_ADPCM_G722: int
-AUDIO_FILE_ENCODING_ADPCM_G723_3: int
-AUDIO_FILE_ENCODING_ADPCM_G723_5: int
-AUDIO_FILE_ENCODING_ALAW_8: int
-AUDIO_UNKNOWN_SIZE: int
+AUDIO_FILE_MAGIC: Final = 0x2E736E64
+AUDIO_FILE_ENCODING_MULAW_8: Final = 1
+AUDIO_FILE_ENCODING_LINEAR_8: Final = 2
+AUDIO_FILE_ENCODING_LINEAR_16: Final = 3
+AUDIO_FILE_ENCODING_LINEAR_24: Final = 4
+AUDIO_FILE_ENCODING_LINEAR_32: Final = 5
+AUDIO_FILE_ENCODING_FLOAT: Final = 6
+AUDIO_FILE_ENCODING_DOUBLE: Final = 7
+AUDIO_FILE_ENCODING_ADPCM_G721: Final = 23
+AUDIO_FILE_ENCODING_ADPCM_G722: Final = 24
+AUDIO_FILE_ENCODING_ADPCM_G723_3: Final = 25
+AUDIO_FILE_ENCODING_ADPCM_G723_5: Final = 26
+AUDIO_FILE_ENCODING_ALAW_8: Final = 27
+AUDIO_UNKNOWN_SIZE: Final = 0xFFFFFFFF
 
 class _sunau_params(NamedTuple):
     """_sunau_params(nchannels, sampwidth, framerate, nframes, comptype, compname)"""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/symbol.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/symbol.pyi
index 1baab2b674..3eb6e5d171 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/symbol.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/symbol.pyi
@@ -1,95 +1,97 @@
 """Non-terminal symbols of Python grammar (from "graminit.h")."""
 
-single_input: int
-file_input: int
-eval_input: int
-decorator: int
-decorators: int
-decorated: int
-async_funcdef: int
-funcdef: int
-parameters: int
-typedargslist: int
-tfpdef: int
-varargslist: int
-vfpdef: int
-stmt: int
-simple_stmt: int
-small_stmt: int
-expr_stmt: int
-annassign: int
-testlist_star_expr: int
-augassign: int
-del_stmt: int
-pass_stmt: int
-flow_stmt: int
-break_stmt: int
-continue_stmt: int
-return_stmt: int
-yield_stmt: int
-raise_stmt: int
-import_stmt: int
-import_name: int
-import_from: int
-import_as_name: int
-dotted_as_name: int
-import_as_names: int
-dotted_as_names: int
-dotted_name: int
-global_stmt: int
-nonlocal_stmt: int
-assert_stmt: int
-compound_stmt: int
-async_stmt: int
-if_stmt: int
-while_stmt: int
-for_stmt: int
-try_stmt: int
-with_stmt: int
-with_item: int
-except_clause: int
-suite: int
-test: int
-test_nocond: int
-lambdef: int
-lambdef_nocond: int
-or_test: int
-and_test: int
-not_test: int
-comparison: int
-comp_op: int
-star_expr: int
-expr: int
-xor_expr: int
-and_expr: int
-shift_expr: int
-arith_expr: int
-term: int
-factor: int
-power: int
-atom_expr: int
-atom: int
-testlist_comp: int
-trailer: int
-subscriptlist: int
-subscript: int
-sliceop: int
-exprlist: int
-testlist: int
-dictorsetmaker: int
-classdef: int
-arglist: int
-argument: int
-comp_iter: int
-comp_for: int
-comp_if: int
-encoding_decl: int
-yield_expr: int
-yield_arg: int
-sync_comp_for: int
-func_body_suite: int
-func_type: int
-func_type_input: int
-namedexpr_test: int
-typelist: int
-sym_name: dict[int, str]
+from typing import Final
+
+single_input: Final[int]
+file_input: Final[int]
+eval_input: Final[int]
+decorator: Final[int]
+decorators: Final[int]
+decorated: Final[int]
+async_funcdef: Final[int]
+funcdef: Final[int]
+parameters: Final[int]
+typedargslist: Final[int]
+tfpdef: Final[int]
+varargslist: Final[int]
+vfpdef: Final[int]
+stmt: Final[int]
+simple_stmt: Final[int]
+small_stmt: Final[int]
+expr_stmt: Final[int]
+annassign: Final[int]
+testlist_star_expr: Final[int]
+augassign: Final[int]
+del_stmt: Final[int]
+pass_stmt: Final[int]
+flow_stmt: Final[int]
+break_stmt: Final[int]
+continue_stmt: Final[int]
+return_stmt: Final[int]
+yield_stmt: Final[int]
+raise_stmt: Final[int]
+import_stmt: Final[int]
+import_name: Final[int]
+import_from: Final[int]
+import_as_name: Final[int]
+dotted_as_name: Final[int]
+import_as_names: Final[int]
+dotted_as_names: Final[int]
+dotted_name: Final[int]
+global_stmt: Final[int]
+nonlocal_stmt: Final[int]
+assert_stmt: Final[int]
+compound_stmt: Final[int]
+async_stmt: Final[int]
+if_stmt: Final[int]
+while_stmt: Final[int]
+for_stmt: Final[int]
+try_stmt: Final[int]
+with_stmt: Final[int]
+with_item: Final[int]
+except_clause: Final[int]
+suite: Final[int]
+test: Final[int]
+test_nocond: Final[int]
+lambdef: Final[int]
+lambdef_nocond: Final[int]
+or_test: Final[int]
+and_test: Final[int]
+not_test: Final[int]
+comparison: Final[int]
+comp_op: Final[int]
+star_expr: Final[int]
+expr: Final[int]
+xor_expr: Final[int]
+and_expr: Final[int]
+shift_expr: Final[int]
+arith_expr: Final[int]
+term: Final[int]
+factor: Final[int]
+power: Final[int]
+atom_expr: Final[int]
+atom: Final[int]
+testlist_comp: Final[int]
+trailer: Final[int]
+subscriptlist: Final[int]
+subscript: Final[int]
+sliceop: Final[int]
+exprlist: Final[int]
+testlist: Final[int]
+dictorsetmaker: Final[int]
+classdef: Final[int]
+arglist: Final[int]
+argument: Final[int]
+comp_iter: Final[int]
+comp_for: Final[int]
+comp_if: Final[int]
+encoding_decl: Final[int]
+yield_expr: Final[int]
+yield_arg: Final[int]
+sync_comp_for: Final[int]
+func_body_suite: Final[int]
+func_type: Final[int]
+func_type_input: Final[int]
+namedexpr_test: Final[int]
+typelist: Final[int]
+sym_name: Final[dict[int, str]]
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/symtable.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/symtable.pyi
index 413dee3477..14d5f762b5 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/symtable.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/symtable.pyi
@@ -110,9 +110,13 @@ class Function(SymbolTable):
         """Return a tuple of nonlocals in the function."""
 
 class Class(SymbolTable):
-    @deprecated("deprecated in Python 3.14, will be removed in Python 3.16")
-    def get_methods(self) -> tuple[str, ...]:
-        """Return a tuple of methods declared in the class."""
+    if sys.version_info >= (3, 14):
+        @deprecated("Deprecated since Python 3.14; will be removed in Python 3.16.")
+        def get_methods(self) -> tuple[str, ...]:
+            """Return a tuple of methods declared in the class."""
+    else:
+        def get_methods(self) -> tuple[str, ...]:
+            """Return a tuple of methods declared in the class."""
 
 class Symbol:
     def __init__(
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sys/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sys/__init__.pyi
index 6f8783c351..21514c7609 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sys/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sys/__init__.pyi
@@ -552,7 +552,7 @@ def call_tracing(func: Callable[..., _T], args: Any, /) -> _T:
     """
 
 if sys.version_info >= (3, 13):
-    @deprecated("Deprecated in Python 3.13; use _clear_internal_caches() instead.")
+    @deprecated("Deprecated since Python 3.13. Use `_clear_internal_caches()` instead.")
     def _clear_type_cache() -> None:
         """Clear the internal type lookup cache."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sys/_monitoring.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sys/_monitoring.pyi
index 3a8292ea0d..5d231c7a93 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sys/_monitoring.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sys/_monitoring.pyi
@@ -11,10 +11,10 @@ from types import CodeType
 from typing import Any, Final, type_check_only
 from typing_extensions import deprecated
 
-DEBUGGER_ID: Final[int]
-COVERAGE_ID: Final[int]
-PROFILER_ID: Final[int]
-OPTIMIZER_ID: Final[int]
+DEBUGGER_ID: Final = 0
+COVERAGE_ID: Final = 1
+PROFILER_ID: Final = 2
+OPTIMIZER_ID: Final = 5
 
 def use_tool_id(tool_id: int, name: str, /) -> None: ...
 def free_tool_id(tool_id: int, /) -> None: ...
@@ -46,7 +46,7 @@ class _events:
         BRANCH_TAKEN: Final[int]
 
         @property
-        @deprecated("BRANCH is deprecated; use BRANCH_LEFT or BRANCH_TAKEN instead")
+        @deprecated("Deprecated since Python 3.14. Use `BRANCH_LEFT` or `BRANCH_TAKEN` instead.")
         def BRANCH(self) -> int: ...
 
     else:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/sysconfig.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/sysconfig.pyi
index 747771c9e9..8cdd3b1b2f 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/sysconfig.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/sysconfig.pyi
@@ -77,17 +77,22 @@ def get_platform() -> str:
     isn't particularly important.
 
     Examples of returned values:
-       linux-i586
-       linux-alpha (?)
-       solaris-2.6-sun4u
 
-    Windows will return one of:
-       win-amd64 (64-bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-       win-arm64 (64-bit Windows on ARM64 (aka AArch64)
-       win32 (all others - specifically, sys.platform is returned)
 
-    For other non-POSIX platforms, currently just returns 'sys.platform'.
+    Windows:
 
+    - win-amd64 (64-bit Windows on AMD64, aka x86_64, Intel64, and EM64T)
+    - win-arm64 (64-bit Windows on ARM64, aka AArch64)
+    - win32 (all others - specifically, sys.platform is returned)
+
+    POSIX based OS:
+
+    - linux-x86_64
+    - macosx-15.5-arm64
+    - macosx-26.0-universal2 (macOS on Apple Silicon or Intel)
+    - android-24-arm64_v8a
+
+    For other non-POSIX platforms, currently just returns :data:`sys.platform`.
     """
 
 if sys.version_info >= (3, 11):
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tarfile.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tarfile.pyi
index 1faae7bb4d..389e24eb4c 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tarfile.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tarfile.pyi
@@ -840,7 +840,7 @@ class TarFile:
         members: Iterable[TarInfo] | None = None,
         *,
         numeric_owner: bool = False,
-        filter: _TarfileFilter | None = ...,
+        filter: _TarfileFilter | None = None,
     ) -> None:
         """Extract all members from the archive to the current working
         directory and set owner, modification time and permissions on
@@ -862,7 +862,7 @@ class TarFile:
         set_attrs: bool = True,
         *,
         numeric_owner: bool = False,
-        filter: _TarfileFilter | None = ...,
+        filter: _TarfileFilter | None = None,
     ) -> None:
         """Extract a member from the archive to the current working directory,
         using its full name. Its file information is extracted as accurately
@@ -1053,6 +1053,28 @@ class TarInfo:
     usually created internally.
     """
 
+    __slots__ = (
+        "name",
+        "mode",
+        "uid",
+        "gid",
+        "size",
+        "mtime",
+        "chksum",
+        "type",
+        "linkname",
+        "uname",
+        "gname",
+        "devmajor",
+        "devminor",
+        "offset",
+        "offset_data",
+        "pax_headers",
+        "sparse",
+        "_tarfile",
+        "_sparse_structs",
+        "_link_target",
+    )
     name: str
     path: str
     size: int
@@ -1077,10 +1099,10 @@ class TarInfo:
         """
     if sys.version_info >= (3, 13):
         @property
-        @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.16")
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.16.")
         def tarfile(self) -> TarFile | None: ...
         @tarfile.setter
-        @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.16")
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.16.")
         def tarfile(self, tarfile: TarFile | None) -> None: ...
     else:
         tarfile: TarFile | None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/telnetlib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/telnetlib.pyi
index 02a97056df..24255fbb39 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/telnetlib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/telnetlib.pyi
@@ -35,89 +35,89 @@ import socket
 from collections.abc import Callable, MutableSequence, Sequence
 from re import Match, Pattern
 from types import TracebackType
-from typing import Any
+from typing import Any, Final
 from typing_extensions import Self
 
 __all__ = ["Telnet"]
 
-DEBUGLEVEL: int
-TELNET_PORT: int
+DEBUGLEVEL: Final = 0
+TELNET_PORT: Final = 23
 
-IAC: bytes
-DONT: bytes
-DO: bytes
-WONT: bytes
-WILL: bytes
-theNULL: bytes
+IAC: Final = b"\xff"
+DONT: Final = b"\xfe"
+DO: Final = b"\xfd"
+WONT: Final = b"\xfc"
+WILL: Final = b"\xfb"
+theNULL: Final = b"\x00"
 
-SE: bytes
-NOP: bytes
-DM: bytes
-BRK: bytes
-IP: bytes
-AO: bytes
-AYT: bytes
-EC: bytes
-EL: bytes
-GA: bytes
-SB: bytes
+SE: Final = b"\xf0"
+NOP: Final = b"\xf1"
+DM: Final = b"\xf2"
+BRK: Final = b"\xf3"
+IP: Final = b"\xf4"
+AO: Final = b"\xf5"
+AYT: Final = b"\xf6"
+EC: Final = b"\xf7"
+EL: Final = b"\xf8"
+GA: Final = b"\xf9"
+SB: Final = b"\xfa"
 
-BINARY: bytes
-ECHO: bytes
-RCP: bytes
-SGA: bytes
-NAMS: bytes
-STATUS: bytes
-TM: bytes
-RCTE: bytes
-NAOL: bytes
-NAOP: bytes
-NAOCRD: bytes
-NAOHTS: bytes
-NAOHTD: bytes
-NAOFFD: bytes
-NAOVTS: bytes
-NAOVTD: bytes
-NAOLFD: bytes
-XASCII: bytes
-LOGOUT: bytes
-BM: bytes
-DET: bytes
-SUPDUP: bytes
-SUPDUPOUTPUT: bytes
-SNDLOC: bytes
-TTYPE: bytes
-EOR: bytes
-TUID: bytes
-OUTMRK: bytes
-TTYLOC: bytes
-VT3270REGIME: bytes
-X3PAD: bytes
-NAWS: bytes
-TSPEED: bytes
-LFLOW: bytes
-LINEMODE: bytes
-XDISPLOC: bytes
-OLD_ENVIRON: bytes
-AUTHENTICATION: bytes
-ENCRYPT: bytes
-NEW_ENVIRON: bytes
+BINARY: Final = b"\x00"
+ECHO: Final = b"\x01"
+RCP: Final = b"\x02"
+SGA: Final = b"\x03"
+NAMS: Final = b"\x04"
+STATUS: Final = b"\x05"
+TM: Final = b"\x06"
+RCTE: Final = b"\x07"
+NAOL: Final = b"\x08"
+NAOP: Final = b"\t"
+NAOCRD: Final = b"\n"
+NAOHTS: Final = b"\x0b"
+NAOHTD: Final = b"\x0c"
+NAOFFD: Final = b"\r"
+NAOVTS: Final = b"\x0e"
+NAOVTD: Final = b"\x0f"
+NAOLFD: Final = b"\x10"
+XASCII: Final = b"\x11"
+LOGOUT: Final = b"\x12"
+BM: Final = b"\x13"
+DET: Final = b"\x14"
+SUPDUP: Final = b"\x15"
+SUPDUPOUTPUT: Final = b"\x16"
+SNDLOC: Final = b"\x17"
+TTYPE: Final = b"\x18"
+EOR: Final = b"\x19"
+TUID: Final = b"\x1a"
+OUTMRK: Final = b"\x1b"
+TTYLOC: Final = b"\x1c"
+VT3270REGIME: Final = b"\x1d"
+X3PAD: Final = b"\x1e"
+NAWS: Final = b"\x1f"
+TSPEED: Final = b" "
+LFLOW: Final = b"!"
+LINEMODE: Final = b'"'
+XDISPLOC: Final = b"#"
+OLD_ENVIRON: Final = b"$"
+AUTHENTICATION: Final = b"%"
+ENCRYPT: Final = b"&"
+NEW_ENVIRON: Final = b"'"
 
-TN3270E: bytes
-XAUTH: bytes
-CHARSET: bytes
-RSP: bytes
-COM_PORT_OPTION: bytes
-SUPPRESS_LOCAL_ECHO: bytes
-TLS: bytes
-KERMIT: bytes
-SEND_URL: bytes
-FORWARD_X: bytes
-PRAGMA_LOGON: bytes
-SSPI_LOGON: bytes
-PRAGMA_HEARTBEAT: bytes
-EXOPL: bytes
-NOOPT: bytes
+TN3270E: Final = b"("
+XAUTH: Final = b")"
+CHARSET: Final = b"*"
+RSP: Final = b"+"
+COM_PORT_OPTION: Final = b","
+SUPPRESS_LOCAL_ECHO: Final = b"-"
+TLS: Final = b"."
+KERMIT: Final = b"/"
+SEND_URL: Final = b"0"
+FORWARD_X: Final = b"1"
+PRAGMA_LOGON: Final = b"\x8a"
+SSPI_LOGON: Final = b"\x8b"
+PRAGMA_HEARTBEAT: Final = b"\x8c"
+EXOPL: Final = b"\xff"
+NOOPT: Final = b"\x00"
 
 class Telnet:
     """Telnet interface class.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tempfile.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tempfile.pyi
index a3b369f602..7b0af097ed 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tempfile.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tempfile.pyi
@@ -39,7 +39,7 @@ from _typeshed import (
 )
 from collections.abc import Iterable, Iterator
 from types import GenericAlias, TracebackType
-from typing import IO, Any, AnyStr, Generic, Literal, overload
+from typing import IO, Any, AnyStr, Final, Generic, Literal, overload
 from typing_extensions import Self, deprecated
 
 __all__ = [
@@ -59,7 +59,7 @@ __all__ = [
 ]
 
 # global variables
-TMP_MAX: int
+TMP_MAX: Final[int]
 tempdir: str | None
 template: str
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/threading.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/threading.pyi
index 502b8064c7..95244ee608 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/threading.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/threading.pyi
@@ -7,7 +7,7 @@ from _typeshed import ProfileFunction, TraceFunction
 from collections.abc import Callable, Iterable, Mapping
 from contextvars import ContextVar
 from types import TracebackType
-from typing import Any, TypeVar, final
+from typing import Any, Final, TypeVar, final
 from typing_extensions import deprecated
 
 _T = TypeVar("_T")
@@ -55,7 +55,7 @@ def active_count() -> int:
 
     """
 
-@deprecated("Use active_count() instead")
+@deprecated("Deprecated since Python 3.10. Use `active_count()` instead.")
 def activeCount() -> int:
     """Return the number of Thread objects currently alive.
 
@@ -71,7 +71,7 @@ def current_thread() -> Thread:
 
     """
 
-@deprecated("Use current_thread() instead")
+@deprecated("Deprecated since Python 3.10. Use `current_thread()` instead.")
 def currentThread() -> Thread:
     """Return the current Thread object, corresponding to the caller's thread of control.
 
@@ -162,7 +162,7 @@ def stack_size(size: int = 0, /) -> int:
     the suggested approach in the absence of more specific information).
     """
 
-TIMEOUT_MAX: float
+TIMEOUT_MAX: Final[float]
 
 ThreadError = _thread.error
 local = _thread._local
@@ -325,7 +325,7 @@ class Thread:
 
         """
 
-    @deprecated("Get the daemon attribute instead")
+    @deprecated("Deprecated since Python 3.10. Read the `daemon` attribute instead.")
     def isDaemon(self) -> bool:
         """Return whether this thread is a daemon.
 
@@ -333,7 +333,7 @@ class Thread:
 
         """
 
-    @deprecated("Set the daemon attribute instead")
+    @deprecated("Deprecated since Python 3.10. Set the `daemon` attribute instead.")
     def setDaemon(self, daemonic: bool) -> None:
         """Set whether this thread is a daemon.
 
@@ -341,7 +341,7 @@ class Thread:
 
         """
 
-    @deprecated("Use the name attribute instead")
+    @deprecated("Deprecated since Python 3.10. Read the `name` attribute instead.")
     def getName(self) -> str:
         """Return a string used for identification purposes only.
 
@@ -349,7 +349,7 @@ class Thread:
 
         """
 
-    @deprecated("Use the name attribute instead")
+    @deprecated("Deprecated since Python 3.10. Set the `name` attribute instead.")
     def setName(self, name: str) -> None:
         """Set the name string for this thread.
 
@@ -499,7 +499,7 @@ class Condition:
 
         """
 
-    @deprecated("Use notify_all() instead")
+    @deprecated("Deprecated since Python 3.10. Use `notify_all()` instead.")
     def notifyAll(self) -> None:
         """Wake up all threads waiting on this condition.
 
@@ -607,7 +607,7 @@ class Event:
     def is_set(self) -> bool:
         """Return true if and only if the internal flag is true."""
 
-    @deprecated("Use is_set() instead")
+    @deprecated("Deprecated since Python 3.10. Use `is_set()` instead.")
     def isSet(self) -> bool:
         """Return true if and only if the internal flag is true.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/time.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/time.pyi
index 5046965453..a9e363b9f6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/time.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/time.pyi
@@ -35,28 +35,28 @@ timezone: int
 tzname: tuple[str, str]
 
 if sys.platform == "linux":
-    CLOCK_BOOTTIME: int
+    CLOCK_BOOTTIME: Final[int]
 if sys.platform != "linux" and sys.platform != "win32" and sys.platform != "darwin":
-    CLOCK_PROF: int  # FreeBSD, NetBSD, OpenBSD
-    CLOCK_UPTIME: int  # FreeBSD, OpenBSD
+    CLOCK_PROF: Final[int]  # FreeBSD, NetBSD, OpenBSD
+    CLOCK_UPTIME: Final[int]  # FreeBSD, OpenBSD
 
 if sys.platform != "win32":
-    CLOCK_MONOTONIC: int
-    CLOCK_MONOTONIC_RAW: int
-    CLOCK_PROCESS_CPUTIME_ID: int
-    CLOCK_REALTIME: int
-    CLOCK_THREAD_CPUTIME_ID: int
+    CLOCK_MONOTONIC: Final[int]
+    CLOCK_MONOTONIC_RAW: Final[int]
+    CLOCK_PROCESS_CPUTIME_ID: Final[int]
+    CLOCK_REALTIME: Final[int]
+    CLOCK_THREAD_CPUTIME_ID: Final[int]
     if sys.platform != "linux" and sys.platform != "darwin":
-        CLOCK_HIGHRES: int  # Solaris only
+        CLOCK_HIGHRES: Final[int]  # Solaris only
 
 if sys.platform == "darwin":
-    CLOCK_UPTIME_RAW: int
+    CLOCK_UPTIME_RAW: Final[int]
     if sys.version_info >= (3, 13):
-        CLOCK_UPTIME_RAW_APPROX: int
-        CLOCK_MONOTONIC_RAW_APPROX: int
+        CLOCK_UPTIME_RAW_APPROX: Final[int]
+        CLOCK_MONOTONIC_RAW_APPROX: Final[int]
 
 if sys.platform == "linux":
-    CLOCK_TAI: int
+    CLOCK_TAI: Final[int]
 
 # Constructor takes an iterable of any type, of length between 9 and 11 elements.
 # However, it always *behaves* like a tuple of 9 elements,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/__init__.pyi
index 5625aac9c1..1f31c1fbb4 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/__init__.pyi
@@ -37,8 +37,8 @@ from collections.abc import Callable, Iterable, Mapping, Sequence
 from tkinter.constants import *
 from tkinter.font import _FontDescription
 from types import GenericAlias, TracebackType
-from typing import Any, ClassVar, Generic, Literal, NamedTuple, Protocol, TypedDict, TypeVar, overload, type_check_only
-from typing_extensions import TypeAlias, TypeVarTuple, Unpack, deprecated
+from typing import Any, ClassVar, Final, Generic, Literal, NamedTuple, Protocol, TypedDict, TypeVar, overload, type_check_only
+from typing_extensions import TypeAlias, TypeVarTuple, Unpack, deprecated, disjoint_base
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
@@ -185,11 +185,11 @@ __all__ = [
 
 TclError = _tkinter.TclError
 wantobjects: int
-TkVersion: float
-TclVersion: float
-READABLE = _tkinter.READABLE
-WRITABLE = _tkinter.WRITABLE
-EXCEPTION = _tkinter.EXCEPTION
+TkVersion: Final[float]
+TclVersion: Final[float]
+READABLE: Final = _tkinter.READABLE
+WRITABLE: Final = _tkinter.WRITABLE
+EXCEPTION: Final = _tkinter.EXCEPTION
 
 # Quick guide for figuring out which widget class to choose:
 #   - Misc: any widget (don't use BaseWidget because Tk doesn't inherit from BaseWidget)
@@ -205,21 +205,8 @@ EXCEPTION = _tkinter.EXCEPTION
 #
 # You can also read the manual pages online: https://www.tcl.tk/doc/
 
-# Some widgets have an option named -compound that accepts different values
-# than the _Compound defined here. Many other options have similar things.
-_Anchor: TypeAlias = Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"]  # manual page: Tk_GetAnchor
-_ButtonCommand: TypeAlias = str | Callable[[], Any]  # accepts string of tcl code, return value is returned from Button.invoke()
-_Compound: TypeAlias = Literal["top", "left", "center", "right", "bottom", "none"]  # -compound in manual page named 'options'
 # manual page: Tk_GetCursor
 _Cursor: TypeAlias = str | tuple[str] | tuple[str, str] | tuple[str, str, str] | tuple[str, str, str, str]
-# example when it's sequence:  entry['invalidcommand'] = [entry.register(print), '%P']
-_EntryValidateCommand: TypeAlias = str | list[str] | tuple[str, ...] | Callable[[], bool]
-_ImageSpec: TypeAlias = _Image | str  # str can be from e.g. tkinter.image_names()
-_Relief: TypeAlias = Literal["raised", "sunken", "flat", "ridge", "solid", "groove"]  # manual page: Tk_GetRelief
-_ScreenUnits: TypeAlias = str | float  # Often the right type instead of int. Manual page: Tk_GetPixels
-# -xscrollcommand and -yscrollcommand in 'options' manual page
-_XYScrollCommand: TypeAlias = str | Callable[[float, float], object]
-_TakeFocusValue: TypeAlias = bool | Literal[0, 1, ""] | Callable[[str], bool | None]  # -takefocus in manual page named 'options'
 
 if sys.version_info >= (3, 11):
     @type_check_only
@@ -230,7 +217,11 @@ if sys.version_info >= (3, 11):
         releaselevel: str
         serial: int
 
-    class _VersionInfoType(_VersionInfoTypeBase): ...
+    if sys.version_info >= (3, 12):
+        class _VersionInfoType(_VersionInfoTypeBase): ...
+    else:
+        @disjoint_base
+        class _VersionInfoType(_VersionInfoTypeBase): ...
 
 if sys.version_info >= (3, 11):
     class EventType(StrEnum):
@@ -445,53 +436,96 @@ class Variable:
 
     def trace_info(self) -> list[tuple[tuple[Literal["array", "read", "write", "unset"], ...], str]]:
         """Return all trace callback information."""
+    if sys.version_info >= (3, 14):
+        @deprecated("Deprecated since Python 3.14. Use `trace_add()` instead.")
+        def trace(self, mode, callback) -> str:
+            """Define a trace callback for the variable.
 
-    @deprecated("use trace_add() instead of trace()")
-    def trace(self, mode, callback):
-        """Define a trace callback for the variable.
+            MODE is one of "r", "w", "u" for read, write, undefine.
+            CALLBACK must be a function which is called when
+            the variable is read, written or undefined.
 
-        MODE is one of "r", "w", "u" for read, write, undefine.
-        CALLBACK must be a function which is called when
-        the variable is read, written or undefined.
+            Return the name of the callback.
 
-        Return the name of the callback.
+            This deprecated method wraps a deprecated Tcl method removed
+            in Tcl 9.0.  Use trace_add() instead.
+            """
 
-        This deprecated method wraps a deprecated Tcl method removed
-        in Tcl 9.0.  Use trace_add() instead.
-        """
+        @deprecated("Deprecated since Python 3.14. Use `trace_add()` instead.")
+        def trace_variable(self, mode, callback) -> str:
+            """Define a trace callback for the variable.
 
-    @deprecated("use trace_add() instead of trace_variable()")
-    def trace_variable(self, mode, callback):
-        """Define a trace callback for the variable.
+            MODE is one of "r", "w", "u" for read, write, undefine.
+            CALLBACK must be a function which is called when
+            the variable is read, written or undefined.
 
-        MODE is one of "r", "w", "u" for read, write, undefine.
-        CALLBACK must be a function which is called when
-        the variable is read, written or undefined.
+            Return the name of the callback.
 
-        Return the name of the callback.
+            This deprecated method wraps a deprecated Tcl method removed
+            in Tcl 9.0.  Use trace_add() instead.
+            """
 
-        This deprecated method wraps a deprecated Tcl method removed
-        in Tcl 9.0.  Use trace_add() instead.
-        """
+        @deprecated("Deprecated since Python 3.14. Use `trace_remove()` instead.")
+        def trace_vdelete(self, mode, cbname) -> None:
+            """Delete the trace callback for a variable.
 
-    @deprecated("use trace_remove() instead of trace_vdelete()")
-    def trace_vdelete(self, mode, cbname) -> None:
-        """Delete the trace callback for a variable.
+            MODE is one of "r", "w", "u" for read, write, undefine.
+            CBNAME is the name of the callback returned from trace_variable or trace.
 
-        MODE is one of "r", "w", "u" for read, write, undefine.
-        CBNAME is the name of the callback returned from trace_variable or trace.
+            This deprecated method wraps a deprecated Tcl method removed
+            in Tcl 9.0.  Use trace_remove() instead.
+            """
 
-        This deprecated method wraps a deprecated Tcl method removed
-        in Tcl 9.0.  Use trace_remove() instead.
-        """
+        @deprecated("Deprecated since Python 3.14. Use `trace_info()` instead.")
+        def trace_vinfo(self) -> list[Incomplete]:
+            """Return all trace callback information.
 
-    @deprecated("use trace_info() instead of trace_vinfo()")
-    def trace_vinfo(self):
-        """Return all trace callback information.
+            This deprecated method wraps a deprecated Tcl method removed
+            in Tcl 9.0.  Use trace_info() instead.
+            """
+    else:
+        def trace(self, mode, callback) -> str:
+            """Define a trace callback for the variable.
 
-        This deprecated method wraps a deprecated Tcl method removed
-        in Tcl 9.0.  Use trace_info() instead.
-        """
+            MODE is one of "r", "w", "u" for read, write, undefine.
+            CALLBACK must be a function which is called when
+            the variable is read, written or undefined.
+
+            Return the name of the callback.
+
+            This deprecated method wraps a deprecated Tcl method that will
+            likely be removed in the future.  Use trace_add() instead.
+            """
+
+        def trace_variable(self, mode, callback) -> str:
+            """Define a trace callback for the variable.
+
+            MODE is one of "r", "w", "u" for read, write, undefine.
+            CALLBACK must be a function which is called when
+            the variable is read, written or undefined.
+
+            Return the name of the callback.
+
+            This deprecated method wraps a deprecated Tcl method that will
+            likely be removed in the future.  Use trace_add() instead.
+            """
+
+        def trace_vdelete(self, mode, cbname) -> None:
+            """Delete the trace callback for a variable.
+
+            MODE is one of "r", "w", "u" for read, write, undefine.
+            CBNAME is the name of the callback returned from trace_variable or trace.
+
+            This deprecated method wraps a deprecated Tcl method that will
+            likely be removed in the future.  Use trace_remove() instead.
+            """
+
+        def trace_vinfo(self) -> list[Incomplete]:
+            """Return all trace callback information.
+
+            This deprecated method wraps a deprecated Tcl method that will
+            likely be removed in the future.  Use trace_info() instead.
+            """
 
     def __eq__(self, other: object) -> bool: ...
     def __del__(self) -> None:
@@ -581,18 +615,18 @@ class BooleanVar(Variable):
 def mainloop(n: int = 0) -> None:
     """Run the main loop of Tcl."""
 
-getint: Incomplete
-getdouble: Incomplete
+getint = int
+getdouble = float
 
-def getboolean(s):
+def getboolean(s) -> bool:
     """Convert Tcl object to True or False."""
 
 _Ts = TypeVarTuple("_Ts")
 
 @type_check_only
 class _GridIndexInfo(TypedDict, total=False):
-    minsize: _ScreenUnits
-    pad: _ScreenUnits
+    minsize: float | str
+    pad: float | str
     uniform: str | None
     weight: int
 
@@ -673,9 +707,9 @@ class Misc:
     def getvar(self, name: str = "PY_VAR"):
         """Return value of Tcl variable NAME."""
 
-    def getint(self, s): ...
-    def getdouble(self, s): ...
-    def getboolean(self, s):
+    def getint(self, s) -> int: ...
+    def getdouble(self, s) -> float: ...
+    def getboolean(self, s) -> bool:
         """Return a boolean value for Tcl boolean values true and false given as parameter."""
 
     def focus_set(self) -> None:
@@ -989,7 +1023,7 @@ class Misc:
     def winfo_cells(self) -> int:
         """Return number of cells in the colormap for this widget."""
 
-    def winfo_children(self) -> list[Widget]:  # Widget because it can't be Toplevel or Tk
+    def winfo_children(self) -> list[Widget | Toplevel]:
         """Return a list of all widgets which are children of this widget."""
 
     def winfo_class(self) -> str:
@@ -1007,7 +1041,7 @@ class Misc:
     def winfo_exists(self) -> bool:
         """Return true if this widget exists."""
 
-    def winfo_fpixels(self, number: _ScreenUnits) -> float:
+    def winfo_fpixels(self, number: float | str) -> float:
         """Return the number of pixels for the given distance NUMBER
         (e.g. "3c") as float.
         """
@@ -1039,7 +1073,7 @@ class Misc:
     def winfo_pathname(self, id: int, displayof: Literal[0] | Misc | None = 0):
         """Return the pathname of the widget given by ID."""
 
-    def winfo_pixels(self, number: _ScreenUnits) -> int:
+    def winfo_pixels(self, number: float | str) -> int:
         """Rounded integer value of winfo_fpixels."""
 
     def winfo_pointerx(self) -> int:
@@ -1341,7 +1375,7 @@ class Misc:
     @overload
     def pack_propagate(self) -> None: ...
     propagate = pack_propagate
-    def grid_anchor(self, anchor: _Anchor | None = None) -> None:
+    def grid_anchor(self, anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] | None = None) -> None:
         """The anchor value controls how to place the grid within the
         master when no row/column has any weight.
 
@@ -1374,8 +1408,8 @@ class Misc:
         index: int | str | list[int] | tuple[int, ...],
         cnf: _GridIndexInfo = {},
         *,
-        minsize: _ScreenUnits = ...,
-        pad: _ScreenUnits = ...,
+        minsize: float | str = ...,
+        pad: float | str = ...,
         uniform: str = ...,
         weight: int = ...,
     ) -> _GridIndexInfo | MaybeNone:  # can be None but annoying to check
@@ -1391,8 +1425,8 @@ class Misc:
         index: int | str | list[int] | tuple[int, ...],
         cnf: _GridIndexInfo = {},
         *,
-        minsize: _ScreenUnits = ...,
-        pad: _ScreenUnits = ...,
+        minsize: float | str = ...,
+        pad: float | str = ...,
         uniform: str = ...,
         weight: int = ...,
     ) -> _GridIndexInfo | MaybeNone:  # can be None but annoying to check
@@ -1404,7 +1438,7 @@ class Misc:
         """
     columnconfigure = grid_columnconfigure
     rowconfigure = grid_rowconfigure
-    def grid_location(self, x: _ScreenUnits, y: _ScreenUnits) -> tuple[int, int]:
+    def grid_location(self, x: float | str, y: float | str) -> tuple[int, int]:
         """Return a tuple of column and row which identify the cell
         at which the pixel at position X and Y inside the master
         widget is located.
@@ -1454,32 +1488,32 @@ class Misc:
         sequence: str,
         *,
         above: Misc | int = ...,
-        borderwidth: _ScreenUnits = ...,
+        borderwidth: float | str = ...,
         button: int = ...,
         count: int = ...,
         data: Any = ...,  # anything with usable str() value
         delta: int = ...,
         detail: str = ...,
         focus: bool = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         keycode: int = ...,
         keysym: str = ...,
         mode: str = ...,
         override: bool = ...,
         place: Literal["PlaceOnTop", "PlaceOnBottom"] = ...,
         root: Misc | int = ...,
-        rootx: _ScreenUnits = ...,
-        rooty: _ScreenUnits = ...,
+        rootx: float | str = ...,
+        rooty: float | str = ...,
         sendevent: bool = ...,
         serial: int = ...,
         state: int | str = ...,
         subwindow: Misc | int = ...,
         time: int = ...,
         warp: bool = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
         when: Literal["now", "tail", "head", "mark"] = ...,
-        x: _ScreenUnits = ...,
-        y: _ScreenUnits = ...,
+        x: float | str = ...,
+        y: float | str = ...,
     ) -> None:
         """Generate an event SEQUENCE. Additional
         keyword arguments specify parameter of the event
@@ -1538,7 +1572,7 @@ class XView:
         """Query and change the horizontal position of the view."""
 
     @overload
-    def xview(self, *args): ...
+    def xview(self, *args) -> None: ...
     def xview_moveto(self, fraction: float) -> None:
         """Adjusts the view in the window so that FRACTION of the
         total width of the canvas is off-screen to the left.
@@ -1551,7 +1585,7 @@ class XView:
         """
 
     @overload
-    def xview_scroll(self, number: _ScreenUnits, what: Literal["pixels"]) -> None: ...
+    def xview_scroll(self, number: float | str, what: Literal["pixels"]) -> None: ...
 
 class YView:
     """Mix-in class for querying and changing the vertical position
@@ -1563,7 +1597,7 @@ class YView:
         """Query and change the vertical position of the view."""
 
     @overload
-    def yview(self, *args): ...
+    def yview(self, *args) -> None: ...
     def yview_moveto(self, fraction: float) -> None:
         """Adjusts the view in the window so that FRACTION of the
         total height of the canvas is off-screen to the top.
@@ -1576,7 +1610,7 @@ class YView:
         """
 
     @overload
-    def yview_scroll(self, number: _ScreenUnits, what: Literal["pixels"]) -> None: ...
+    def yview_scroll(self, number: float | str, what: Literal["pixels"]) -> None: ...
 
 if sys.platform == "darwin":
     @type_check_only
@@ -2226,21 +2260,21 @@ class Tk(Misc, Wm):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         menu: Menu = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
-        takefocus: _TakeFocusValue = ...,
-        width: _ScreenUnits = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -2266,27 +2300,27 @@ class Tk(Misc, Wm):
     # Tk has __getattr__ so that tk_instance.foo falls back to tk_instance.tk.foo
     # Please keep in sync with _tkinter.TkappType.
     # Some methods are intentionally missing because they are inherited from Misc instead.
-    def adderrorinfo(self, msg, /): ...
+    def adderrorinfo(self, msg: str, /): ...
     def call(self, command: Any, /, *args: Any) -> Any: ...
-    def createcommand(self, name, func, /): ...
+    def createcommand(self, name: str, func, /): ...
     if sys.platform != "win32":
-        def createfilehandler(self, file, mask, func, /): ...
-        def deletefilehandler(self, file, /): ...
+        def createfilehandler(self, file, mask: int, func, /): ...
+        def deletefilehandler(self, file, /) -> None: ...
 
-    def createtimerhandler(self, milliseconds, func, /): ...
-    def dooneevent(self, flags: int = ..., /): ...
+    def createtimerhandler(self, milliseconds: int, func, /): ...
+    def dooneevent(self, flags: int = 0, /): ...
     def eval(self, script: str, /) -> str: ...
-    def evalfile(self, fileName, /): ...
-    def exprboolean(self, s, /): ...
-    def exprdouble(self, s, /): ...
-    def exprlong(self, s, /): ...
-    def exprstring(self, s, /): ...
+    def evalfile(self, fileName: str, /): ...
+    def exprboolean(self, s: str, /): ...
+    def exprdouble(self, s: str, /): ...
+    def exprlong(self, s: str, /): ...
+    def exprstring(self, s: str, /): ...
     def globalgetvar(self, *args, **kwargs): ...
     def globalsetvar(self, *args, **kwargs): ...
     def globalunsetvar(self, *args, **kwargs): ...
     def interpaddr(self) -> int: ...
     def loadtk(self) -> None: ...
-    def record(self, script, /): ...
+    def record(self, script: str, /): ...
     if sys.version_info < (3, 11):
         @deprecated("Deprecated since Python 3.9; removed in Python 3.11. Use `splitlist()` instead.")
         def split(self, arg, /): ...
@@ -2294,7 +2328,7 @@ class Tk(Misc, Wm):
     def splitlist(self, arg, /): ...
     def unsetvar(self, *args, **kwargs): ...
     def wantobjects(self, *args, **kwargs): ...
-    def willdispatch(self): ...
+    def willdispatch(self) -> None: ...
 
 def Tcl(screenName: str | None = None, baseName: str | None = None, className: str = "Tk", useTk: bool = False) -> Tk: ...
 
@@ -2304,11 +2338,11 @@ _InMiscNonTotal = TypedDict("_InMiscNonTotal", {"in": Misc}, total=False)
 @type_check_only
 class _PackInfo(_InMiscTotal):
     # 'before' and 'after' never appear in _PackInfo
-    anchor: _Anchor
+    anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"]
     expand: bool
     fill: Literal["none", "x", "y", "both"]
     side: Literal["left", "right", "top", "bottom"]
-    # Paddings come out as int or tuple of int, even though any _ScreenUnits
+    # Paddings come out as int or tuple of int, even though any screen units
     # can be specified in pack().
     ipadx: int
     ipady: int
@@ -2322,7 +2356,7 @@ class Pack:
     """
 
     # _PackInfo is not the valid type for cnf because pad stuff accepts any
-    # _ScreenUnits instead of int only. I didn't bother to create another
+    # screen units instead of int only. I didn't bother to create another
     # TypedDict for cnf because it appears to be a legacy thing that was
     # replaced by **kwargs.
     def pack_configure(
@@ -2330,15 +2364,15 @@ class Pack:
         cnf: Mapping[str, Any] | None = {},
         *,
         after: Misc = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         before: Misc = ...,
         expand: bool | Literal[0, 1] = 0,
         fill: Literal["none", "x", "y", "both"] = ...,
         side: Literal["left", "right", "top", "bottom"] = ...,
-        ipadx: _ScreenUnits = ...,
-        ipady: _ScreenUnits = ...,
-        padx: _ScreenUnits | tuple[_ScreenUnits, _ScreenUnits] = ...,
-        pady: _ScreenUnits | tuple[_ScreenUnits, _ScreenUnits] = ...,
+        ipadx: float | str = ...,
+        ipady: float | str = ...,
+        padx: float | str | tuple[float | str, float | str] = ...,
+        pady: float | str | tuple[float | str, float | str] = ...,
         in_: Misc = ...,
         **kw: Any,  # allow keyword argument named 'in', see #4836
     ) -> None:
@@ -2371,7 +2405,7 @@ class Pack:
 
 @type_check_only
 class _PlaceInfo(_InMiscNonTotal):  # empty dict if widget hasn't been placed
-    anchor: _Anchor
+    anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"]
     bordermode: Literal["inside", "outside", "ignore"]
     width: str  # can be int()ed (even after e.g. widget.place(height='2.3c') or similar)
     height: str  # can be int()ed
@@ -2392,12 +2426,12 @@ class Place:
         self,
         cnf: Mapping[str, Any] | None = {},
         *,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         bordermode: Literal["inside", "outside", "ignore"] = ...,
-        width: _ScreenUnits = ...,
-        height: _ScreenUnits = ...,
-        x: _ScreenUnits = ...,
-        y: _ScreenUnits = ...,
+        width: float | str = ...,
+        height: float | str = ...,
+        x: float | str = ...,
+        y: float | str = ...,
         # str allowed for compatibility with place_info()
         relheight: str | float = ...,
         relwidth: str | float = ...,
@@ -2464,10 +2498,10 @@ class Grid:
         columnspan: int = ...,
         row: int = ...,
         rowspan: int = ...,
-        ipadx: _ScreenUnits = ...,
-        ipady: _ScreenUnits = ...,
-        padx: _ScreenUnits | tuple[_ScreenUnits, _ScreenUnits] = ...,
-        pady: _ScreenUnits | tuple[_ScreenUnits, _ScreenUnits] = ...,
+        ipadx: float | str = ...,
+        ipady: float | str = ...,
+        padx: float | str | tuple[float | str, float | str] = ...,
+        pady: float | str | tuple[float | str, float | str] = ...,
         sticky: str = ...,  # consists of letters 'n', 's', 'w', 'e', may contain repeats, may be empty
         in_: Misc = ...,
         **kw: Any,  # allow keyword argument named 'in', see #4836
@@ -2505,8 +2539,8 @@ class BaseWidget(Misc):
     """Internal class."""
 
     master: Misc
-    widgetName: Incomplete
-    def __init__(self, master, widgetName, cnf={}, kw={}, extra=()) -> None:
+    widgetName: str
+    def __init__(self, master, widgetName: str, cnf={}, kw={}, extra=()) -> None:
         """Construct a widget with the parent widget MASTER, a name WIDGETNAME
         and appropriate options.
         """
@@ -2588,28 +2622,28 @@ class Toplevel(BaseWidget, Wm):
         cnf: dict[str, Any] | None = {},
         *,
         background: str = ...,
-        bd: _ScreenUnits = 0,
+        bd: float | str = 0,
         bg: str = ...,
-        border: _ScreenUnits = 0,
-        borderwidth: _ScreenUnits = 0,
+        border: float | str = 0,
+        borderwidth: float | str = 0,
         class_: str = "Toplevel",
         colormap: Literal["new", ""] | Misc = "",
         container: bool = False,
         cursor: _Cursor = "",
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
+        highlightthickness: float | str = 0,
         menu: Menu = ...,
         name: str = ...,
-        padx: _ScreenUnits = 0,
-        pady: _ScreenUnits = 0,
-        relief: _Relief = "flat",
+        padx: float | str = 0,
+        pady: float | str = 0,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         screen: str = "",  # can't be changed after creating widget
-        takefocus: _TakeFocusValue = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         use: int = ...,
         visual: str | tuple[str, int] = "",
-        width: _ScreenUnits = 0,
+        width: float | str = 0,
     ) -> None:
         """Construct a toplevel widget with the parent MASTER.
 
@@ -2625,21 +2659,21 @@ class Toplevel(BaseWidget, Wm):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         menu: Menu = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
-        takefocus: _TakeFocusValue = ...,
-        width: _ScreenUnits = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -2662,15 +2696,15 @@ class Button(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = "center",
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = "center",
         background: str = ...,
-        bd: _ScreenUnits = ...,  # same as borderwidth
+        bd: float | str = ...,  # same as borderwidth
         bg: str = ...,  # same as background
         bitmap: str = "",
-        border: _ScreenUnits = ...,  # same as borderwidth
-        borderwidth: _ScreenUnits = ...,
-        command: _ButtonCommand = "",
-        compound: _Compound = "none",
+        border: float | str = ...,  # same as borderwidth
+        borderwidth: float | str = ...,
+        command: str | Callable[[], Any] = "",
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = "none",
         cursor: _Cursor = "",
         default: Literal["normal", "active", "disabled"] = "disabled",
         disabledforeground: str = ...,
@@ -2678,30 +2712,30 @@ class Button(Widget):
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
         # width and height must be int for buttons containing just text, but
-        # ints are also valid _ScreenUnits
-        height: _ScreenUnits = 0,
+        # buttons with an image accept any screen units.
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 1,
-        image: _ImageSpec = "",
+        highlightthickness: float | str = 1,
+        image: _Image | str = "",
         justify: Literal["left", "center", "right"] = "center",
         name: str = ...,
-        overrelief: _Relief | Literal[""] = "",
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        overrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove", ""] = "",
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         repeatdelay: int = ...,
         repeatinterval: int = ...,
         state: Literal["normal", "active", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         text: float | str = "",
         # We allow the textvariable to be any Variable, not necessarily
         # StringVar. This is useful for e.g. a button that displays the value
         # of an IntVar.
         textvariable: Variable = ...,
         underline: int = -1,
-        width: _ScreenUnits = 0,
-        wraplength: _ScreenUnits = 0,
+        width: float | str = 0,
+        wraplength: float | str = 0,
     ) -> None:
         """Construct a button widget with the parent MASTER.
 
@@ -2729,40 +2763,40 @@ class Button(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        command: _ButtonCommand = ...,
-        compound: _Compound = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        command: str | Callable[[], Any] = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: _Cursor = ...,
         default: Literal["normal", "active", "disabled"] = ...,
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
-        image: _ImageSpec = ...,
+        highlightthickness: float | str = ...,
+        image: _Image | str = ...,
         justify: Literal["left", "center", "right"] = ...,
-        overrelief: _Relief | Literal[""] = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        overrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove", ""] = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         repeatdelay: int = ...,
         repeatinterval: int = ...,
         state: Literal["normal", "active", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: Variable = ...,
         underline: int = ...,
-        width: _ScreenUnits = ...,
-        wraplength: _ScreenUnits = ...,
+        width: float | str = ...,
+        wraplength: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -2803,41 +2837,39 @@ class Canvas(Widget, XView, YView):
         cnf: dict[str, Any] | None = {},
         *,
         background: str = ...,
-        bd: _ScreenUnits = 0,
+        bd: float | str = 0,
         bg: str = ...,
-        border: _ScreenUnits = 0,
-        borderwidth: _ScreenUnits = 0,
+        border: float | str = 0,
+        borderwidth: float | str = 0,
         closeenough: float = 1.0,
         confine: bool = True,
         cursor: _Cursor = "",
-        # canvas manual page has a section named COORDINATES, and the first
-        # part of it describes _ScreenUnits.
-        height: _ScreenUnits = ...,
+        height: float | str = ...,  # see COORDINATES in canvas manual page
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = 0,
+        insertborderwidth: float | str = 0,
         insertofftime: int = 300,
         insertontime: int = 600,
-        insertwidth: _ScreenUnits = 2,
+        insertwidth: float | str = 2,
         name: str = ...,
         offset=...,  # undocumented
-        relief: _Relief = "flat",
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         # Setting scrollregion to None doesn't reset it back to empty,
         # but setting it to () does.
-        scrollregion: tuple[_ScreenUnits, _ScreenUnits, _ScreenUnits, _ScreenUnits] | tuple[()] = (),
+        scrollregion: tuple[float | str, float | str, float | str, float | str] | tuple[()] = (),
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = 1,
+        selectborderwidth: float | str = 1,
         selectforeground: str = ...,
         # man page says that state can be 'hidden', but it can't
         state: Literal["normal", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = "",
-        width: _ScreenUnits = ...,
-        xscrollcommand: _XYScrollCommand = "",
-        xscrollincrement: _ScreenUnits = 0,
-        yscrollcommand: _XYScrollCommand = "",
-        yscrollincrement: _ScreenUnits = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
+        width: float | str = ...,
+        xscrollcommand: str | Callable[[float, float], object] = "",
+        xscrollincrement: float | str = 0,
+        yscrollcommand: str | Callable[[float, float], object] = "",
+        yscrollincrement: float | str = 0,
     ) -> None:
         """Construct a canvas widget with the parent MASTER.
 
@@ -2856,35 +2888,35 @@ class Canvas(Widget, XView, YView):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         closeenough: float = ...,
         confine: bool = ...,
         cursor: _Cursor = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = ...,
+        insertborderwidth: float | str = ...,
         insertofftime: int = ...,
         insertontime: int = ...,
-        insertwidth: _ScreenUnits = ...,
+        insertwidth: float | str = ...,
         offset=...,  # undocumented
-        relief: _Relief = ...,
-        scrollregion: tuple[_ScreenUnits, _ScreenUnits, _ScreenUnits, _ScreenUnits] | tuple[()] = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        scrollregion: tuple[float | str, float | str, float | str, float | str] | tuple[()] = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         state: Literal["normal", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
-        width: _ScreenUnits = ...,
-        xscrollcommand: _XYScrollCommand = ...,
-        xscrollincrement: _ScreenUnits = ...,
-        yscrollcommand: _XYScrollCommand = ...,
-        yscrollincrement: _ScreenUnits = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        width: float | str = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
+        xscrollincrement: float | str = ...,
+        yscrollcommand: str | Callable[[float, float], object] = ...,
+        yscrollincrement: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -2909,7 +2941,7 @@ class Canvas(Widget, XView, YView):
         """Add tag NEWTAG to all items below TAGORID."""
 
     def addtag_closest(
-        self, newtag: str, x: _ScreenUnits, y: _ScreenUnits, halo: _ScreenUnits | None = None, start: str | int | None = None
+        self, newtag: str, x: float | str, y: float | str, halo: float | str | None = None, start: str | int | None = None
     ) -> None:
         """Add tag NEWTAG to item which is closest to pixel at X, Y.
         If several match take the top-most.
@@ -2917,12 +2949,12 @@ class Canvas(Widget, XView, YView):
         closest). If START is specified the next below this tag is taken.
         """
 
-    def addtag_enclosed(self, newtag: str, x1: _ScreenUnits, y1: _ScreenUnits, x2: _ScreenUnits, y2: _ScreenUnits) -> None:
+    def addtag_enclosed(self, newtag: str, x1: float | str, y1: float | str, x2: float | str, y2: float | str) -> None:
         """Add tag NEWTAG to all items in the rectangle defined
         by X1,Y1,X2,Y2.
         """
 
-    def addtag_overlapping(self, newtag: str, x1: _ScreenUnits, y1: _ScreenUnits, x2: _ScreenUnits, y2: _ScreenUnits) -> None:
+    def addtag_overlapping(self, newtag: str, x1: float | str, y1: float | str, x2: float | str, y2: float | str) -> None:
         """Add tag NEWTAG to all items which overlap the rectangle
         defined by X1,Y1,X2,Y2.
         """
@@ -2943,7 +2975,7 @@ class Canvas(Widget, XView, YView):
         """Return all items below TAGORID."""
 
     def find_closest(
-        self, x: _ScreenUnits, y: _ScreenUnits, halo: _ScreenUnits | None = None, start: str | int | None = None
+        self, x: float | str, y: float | str, halo: float | str | None = None, start: str | int | None = None
     ) -> tuple[int, ...]:
         """Return item which is closest to pixel at X, Y.
         If several match take the top-most.
@@ -2951,12 +2983,12 @@ class Canvas(Widget, XView, YView):
         closest). If START is specified the next below this tag is taken.
         """
 
-    def find_enclosed(self, x1: _ScreenUnits, y1: _ScreenUnits, x2: _ScreenUnits, y2: _ScreenUnits) -> tuple[int, ...]:
+    def find_enclosed(self, x1: float | str, y1: float | str, x2: float | str, y2: float | str) -> tuple[int, ...]:
         """Return all items in rectangle defined
         by X1,Y1,X2,Y2.
         """
 
-    def find_overlapping(self, x1: _ScreenUnits, y1: _ScreenUnits, x2: _ScreenUnits, y2: float) -> tuple[int, ...]:
+    def find_overlapping(self, x1: float | str, y1: float | str, x2: float | str, y2: float) -> tuple[int, ...]:
         """Return all items which overlap the rectangle
         defined by X1,Y1,X2,Y2.
         """
@@ -3037,25 +3069,25 @@ class Canvas(Widget, XView, YView):
         activedash: str | int | list[int] | tuple[int, ...] = ...,
         activefill: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         arrow: Literal["first", "last", "both"] = ...,
         arrowshape: tuple[float, float, float] = ...,
         capstyle: Literal["round", "projecting", "butt"] = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
         joinstyle: Literal["round", "bevel", "miter"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         smooth: bool = ...,
         splinesteps: float = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int:
         """Create line with coordinates x1,y1,...,xn,yn."""
 
@@ -3069,25 +3101,25 @@ class Canvas(Widget, XView, YView):
         activedash: str | int | list[int] | tuple[int, ...] = ...,
         activefill: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         arrow: Literal["first", "last", "both"] = ...,
         arrowshape: tuple[float, float, float] = ...,
         capstyle: Literal["round", "projecting", "butt"] = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
         joinstyle: Literal["round", "bevel", "miter"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         smooth: bool = ...,
         splinesteps: float = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_line(
@@ -3105,25 +3137,25 @@ class Canvas(Widget, XView, YView):
         activedash: str | int | list[int] | tuple[int, ...] = ...,
         activefill: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         arrow: Literal["first", "last", "both"] = ...,
         arrowshape: tuple[float, float, float] = ...,
         capstyle: Literal["round", "projecting", "butt"] = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
         joinstyle: Literal["round", "bevel", "miter"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         smooth: bool = ...,
         splinesteps: float = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_oval(
@@ -3139,24 +3171,24 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int:
         """Create oval with coordinates x1,y1,x2,y2."""
 
@@ -3172,24 +3204,24 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_oval(
@@ -3209,24 +3241,24 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_polygon(
@@ -3242,27 +3274,27 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
         joinstyle: Literal["round", "bevel", "miter"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         smooth: bool = ...,
         splinesteps: float = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int:
         """Create polygon with coordinates x1,y1,...,xn,yn."""
 
@@ -3278,27 +3310,27 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
         joinstyle: Literal["round", "bevel", "miter"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         smooth: bool = ...,
         splinesteps: float = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_polygon(
@@ -3318,27 +3350,27 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
         joinstyle: Literal["round", "bevel", "miter"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         smooth: bool = ...,
         splinesteps: float = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_rectangle(
@@ -3354,24 +3386,24 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int:
         """Create rectangle with coordinates x1,y1,x2,y2."""
 
@@ -3387,24 +3419,24 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_rectangle(
@@ -3424,24 +3456,24 @@ class Canvas(Widget, XView, YView):
         activeoutline: str = ...,
         activeoutlinestipple: str = ...,
         activestipple: str = ...,
-        activewidth: _ScreenUnits = ...,
+        activewidth: float | str = ...,
         dash: str | int | list[int] | tuple[int, ...] = ...,
-        dashoffset: _ScreenUnits = ...,
+        dashoffset: float | str = ...,
         disableddash: str | int | list[int] | tuple[int, ...] = ...,
         disabledfill: str = ...,
         disabledoutline: str = ...,
         disabledoutlinestipple: str = ...,
         disabledstipple: str = ...,
-        disabledwidth: _ScreenUnits = ...,
+        disabledwidth: float | str = ...,
         fill: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         outline: str = ...,
-        outlineoffset: _ScreenUnits = ...,
+        outlineoffset: float | str = ...,
         outlinestipple: str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_text(
@@ -3452,19 +3484,19 @@ class Canvas(Widget, XView, YView):
         *,
         activefill: str = ...,
         activestipple: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         angle: float | str = ...,
         disabledfill: str = ...,
         disabledstipple: str = ...,
         fill: str = ...,
         font: _FontDescription = ...,
         justify: Literal["left", "center", "right"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
         text: float | str = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int:
         """Create text with coordinates x1,y1."""
 
@@ -3476,19 +3508,19 @@ class Canvas(Widget, XView, YView):
         *,
         activefill: str = ...,
         activestipple: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         angle: float | str = ...,
         disabledfill: str = ...,
         disabledstipple: str = ...,
         fill: str = ...,
         font: _FontDescription = ...,
         justify: Literal["left", "center", "right"] = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         stipple: str = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
         text: float | str = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> int: ...
     @overload
     def create_window(
@@ -3497,11 +3529,11 @@ class Canvas(Widget, XView, YView):
         y: float,
         /,
         *,
-        anchor: _Anchor = ...,
-        height: _ScreenUnits = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
+        height: float | str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
         window: Widget = ...,
     ) -> int:
         """Create window with coordinates x1,y1,x2,y2."""
@@ -3512,11 +3544,11 @@ class Canvas(Widget, XView, YView):
         coords: tuple[float, float] | list[int] | list[float],
         /,
         *,
-        anchor: _Anchor = ...,
-        height: _ScreenUnits = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
+        height: float | str = ...,
         state: Literal["normal", "hidden", "disabled"] = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
         window: Widget = ...,
     ) -> int: ...
     def dchars(self, *args) -> None:
@@ -3615,7 +3647,7 @@ class Canvas(Widget, XView, YView):
         (optional above another item).
         """
 
-    def scale(self, tagOrId: str | int, xOrigin: _ScreenUnits, yOrigin: _ScreenUnits, xScale: float, yScale: float, /) -> None:
+    def scale(self, tagOrId: str | int, xOrigin: float | str, yOrigin: float | str, xScale: float, yScale: float, /) -> None:
         """Scale item TAGORID with XORIGIN, YORIGIN, XSCALE, YSCALE."""
 
     def scan_mark(self, x, y) -> None:
@@ -3655,29 +3687,29 @@ class Checkbutton(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = "center",
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = "center",
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = "",
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        command: _ButtonCommand = "",
-        compound: _Compound = "none",
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        command: str | Callable[[], Any] = "",
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = "none",
         cursor: _Cursor = "",
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 1,
-        image: _ImageSpec = "",
+        highlightthickness: float | str = 1,
+        image: _Image | str = "",
         indicatoron: bool = True,
         justify: Literal["left", "center", "right"] = "center",
         name: str = ...,
-        offrelief: _Relief = ...,
+        offrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         # The checkbutton puts a value to its variable when it's checked or
         # unchecked. We don't restrict the type of that value here, so
         # Any-typing is fine.
@@ -3690,22 +3722,22 @@ class Checkbutton(Widget):
         # done by setting variable to empty string (the default).
         offvalue: Any = 0,
         onvalue: Any = 1,
-        overrelief: _Relief | Literal[""] = "",
-        padx: _ScreenUnits = 1,
-        pady: _ScreenUnits = 1,
-        relief: _Relief = "flat",
+        overrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove", ""] = "",
+        padx: float | str = 1,
+        pady: float | str = 1,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         selectcolor: str = ...,
-        selectimage: _ImageSpec = "",
+        selectimage: _Image | str = "",
         state: Literal["normal", "active", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         text: float | str = "",
         textvariable: Variable = ...,
-        tristateimage: _ImageSpec = "",
+        tristateimage: _Image | str = "",
         tristatevalue: Any = "",
         underline: int = -1,
         variable: Variable | Literal[""] = ...,
-        width: _ScreenUnits = 0,
-        wraplength: _ScreenUnits = 0,
+        width: float | str = 0,
+        wraplength: float | str = 0,
     ) -> None:
         """Construct a checkbutton widget with the parent MASTER.
 
@@ -3725,46 +3757,46 @@ class Checkbutton(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        command: _ButtonCommand = ...,
-        compound: _Compound = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        command: str | Callable[[], Any] = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: _Cursor = ...,
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
-        image: _ImageSpec = ...,
+        highlightthickness: float | str = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         justify: Literal["left", "center", "right"] = ...,
-        offrelief: _Relief = ...,
+        offrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         offvalue: Any = ...,
         onvalue: Any = ...,
-        overrelief: _Relief | Literal[""] = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        overrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove", ""] = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectcolor: str = ...,
-        selectimage: _ImageSpec = ...,
+        selectimage: _Image | str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: Variable = ...,
-        tristateimage: _ImageSpec = ...,
+        tristateimage: _Image | str = ...,
         tristatevalue: Any = ...,
         underline: int = ...,
         variable: Variable | Literal[""] = ...,
-        width: _ScreenUnits = ...,
-        wraplength: _ScreenUnits = ...,
+        width: float | str = ...,
+        wraplength: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -3800,10 +3832,10 @@ class Entry(Widget, XView):
         cnf: dict[str, Any] | None = {},
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = "xterm",
         disabledbackground: str = ...,
         disabledforeground: str = ...,
@@ -3813,30 +3845,30 @@ class Entry(Widget, XView):
         foreground: str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = 0,
+        insertborderwidth: float | str = 0,
         insertofftime: int = 300,
         insertontime: int = 600,
-        insertwidth: _ScreenUnits = ...,
-        invalidcommand: _EntryValidateCommand = "",
-        invcmd: _EntryValidateCommand = "",  # same as invalidcommand
+        insertwidth: float | str = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
+        invcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",  # same as invalidcommand
         justify: Literal["left", "center", "right"] = "left",
         name: str = ...,
         readonlybackground: str = ...,
-        relief: _Relief = "sunken",
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "sunken",
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         show: str = "",
         state: Literal["normal", "disabled", "readonly"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         textvariable: Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = "none",
-        validatecommand: _EntryValidateCommand = "",
-        vcmd: _EntryValidateCommand = "",  # same as validatecommand
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
+        vcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",  # same as validatecommand
         width: int = 20,
-        xscrollcommand: _XYScrollCommand = "",
+        xscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Construct an entry widget with the parent MASTER.
 
@@ -3856,10 +3888,10 @@ class Entry(Widget, XView):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
         disabledbackground: str = ...,
         disabledforeground: str = ...,
@@ -3869,29 +3901,29 @@ class Entry(Widget, XView):
         foreground: str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = ...,
+        insertborderwidth: float | str = ...,
         insertofftime: int = ...,
         insertontime: int = ...,
-        insertwidth: _ScreenUnits = ...,
-        invalidcommand: _EntryValidateCommand = ...,
-        invcmd: _EntryValidateCommand = ...,
+        insertwidth: float | str = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
+        invcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         readonlybackground: str = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         show: str = ...,
         state: Literal["normal", "disabled", "readonly"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: _EntryValidateCommand = ...,
-        vcmd: _EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
+        vcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         width: int = ...,
-        xscrollcommand: _XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -3962,25 +3994,25 @@ class Frame(Widget):
         cnf: dict[str, Any] | None = {},
         *,
         background: str = ...,
-        bd: _ScreenUnits = 0,
+        bd: float | str = 0,
         bg: str = ...,
-        border: _ScreenUnits = 0,
-        borderwidth: _ScreenUnits = 0,
+        border: float | str = 0,
+        borderwidth: float | str = 0,
         class_: str = "Frame",  # can't be changed with configure()
         colormap: Literal["new", ""] | Misc = "",  # can't be changed with configure()
         container: bool = False,  # can't be changed with configure()
         cursor: _Cursor = "",
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
+        highlightthickness: float | str = 0,
         name: str = ...,
-        padx: _ScreenUnits = 0,
-        pady: _ScreenUnits = 0,
-        relief: _Relief = "flat",
-        takefocus: _TakeFocusValue = 0,
+        padx: float | str = 0,
+        pady: float | str = 0,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         visual: str | tuple[str, int] = "",  # can't be changed with configure()
-        width: _ScreenUnits = 0,
+        width: float | str = 0,
     ) -> None:
         """Construct a frame widget with the parent MASTER.
 
@@ -3995,20 +4027,20 @@ class Frame(Widget):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
-        takefocus: _TakeFocusValue = ...,
-        width: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -4031,36 +4063,36 @@ class Label(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = "center",
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = "center",
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = "",
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        compound: _Compound = "none",
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = "none",
         cursor: _Cursor = "",
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
-        image: _ImageSpec = "",
+        highlightthickness: float | str = 0,
+        image: _Image | str = "",
         justify: Literal["left", "center", "right"] = "center",
         name: str = ...,
-        padx: _ScreenUnits = 1,
-        pady: _ScreenUnits = 1,
-        relief: _Relief = "flat",
+        padx: float | str = 1,
+        pady: float | str = 1,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         state: Literal["normal", "active", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         text: float | str = "",
         textvariable: Variable = ...,
         underline: int = -1,
-        width: _ScreenUnits = 0,
-        wraplength: _ScreenUnits = 0,
+        width: float | str = 0,
+        wraplength: float | str = 0,
     ) -> None:
         """Construct a label widget with the parent MASTER.
 
@@ -4087,35 +4119,35 @@ class Label(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        compound: _Compound = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: _Cursor = ...,
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
-        image: _ImageSpec = ...,
+        highlightthickness: float | str = ...,
+        image: _Image | str = ...,
         justify: Literal["left", "center", "right"] = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         state: Literal["normal", "active", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: Variable = ...,
         underline: int = ...,
-        width: _ScreenUnits = ...,
-        wraplength: _ScreenUnits = ...,
+        width: float | str = ...,
+        wraplength: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -4138,10 +4170,10 @@ class Listbox(Widget, XView, YView):
         *,
         activestyle: Literal["dotbox", "none", "underline"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = 1,
+        bd: float | str = 1,
         bg: str = ...,
-        border: _ScreenUnits = 1,
-        borderwidth: _ScreenUnits = 1,
+        border: float | str = 1,
+        borderwidth: float | str = 1,
         cursor: _Cursor = "",
         disabledforeground: str = ...,
         exportselection: bool | Literal[0, 1] = 1,
@@ -4151,7 +4183,7 @@ class Listbox(Widget, XView, YView):
         height: int = 10,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         justify: Literal["left", "center", "right"] = "left",
         # There's no tkinter.ListVar, but seems like bare tkinter.Variable
         # actually works for this:
@@ -4164,9 +4196,9 @@ class Listbox(Widget, XView, YView):
         #    ('foo', 'bar', 'baz')
         listvariable: Variable = ...,
         name: str = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = 0,
+        selectborderwidth: float | str = 0,
         selectforeground: str = ...,
         # from listbox man page: "The value of the [selectmode] option may be
         # arbitrary, but the default bindings expect it to be either single,
@@ -4177,10 +4209,10 @@ class Listbox(Widget, XView, YView):
         selectmode: str | Literal["single", "browse", "multiple", "extended"] = "browse",  # noqa: Y051
         setgrid: bool = False,
         state: Literal["normal", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         width: int = 20,
-        xscrollcommand: _XYScrollCommand = "",
-        yscrollcommand: _XYScrollCommand = "",
+        xscrollcommand: str | Callable[[float, float], object] = "",
+        yscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Construct a listbox widget with the parent MASTER.
 
@@ -4198,10 +4230,10 @@ class Listbox(Widget, XView, YView):
         *,
         activestyle: Literal["dotbox", "none", "underline"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
         disabledforeground: str = ...,
         exportselection: bool = ...,
@@ -4211,20 +4243,20 @@ class Listbox(Widget, XView, YView):
         height: int = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         justify: Literal["left", "center", "right"] = ...,
         listvariable: Variable = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         selectmode: str | Literal["single", "browse", "multiple", "extended"] = ...,  # noqa: Y051
         setgrid: bool = ...,
         state: Literal["normal", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         width: int = ...,
-        xscrollcommand: _XYScrollCommand = ...,
-        yscrollcommand: _XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
+        yscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -4314,13 +4346,13 @@ class Menu(Widget):
         cnf: dict[str, Any] | None = {},
         *,
         activebackground: str = ...,
-        activeborderwidth: _ScreenUnits = ...,
+        activeborderwidth: float | str = ...,
         activeforeground: str = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = "arrow",
         disabledforeground: str = ...,
         fg: str = ...,
@@ -4328,9 +4360,9 @@ class Menu(Widget):
         foreground: str = ...,
         name: str = ...,
         postcommand: Callable[[], object] | str = "",
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectcolor: str = ...,
-        takefocus: _TakeFocusValue = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         tearoff: bool | Literal[0, 1] = 1,
         # I guess tearoffcommand arguments are supposed to be widget objects,
         # but they are widget name strings. Use nametowidget() to handle the
@@ -4353,22 +4385,22 @@ class Menu(Widget):
         cnf: dict[str, Any] | None = None,
         *,
         activebackground: str = ...,
-        activeborderwidth: _ScreenUnits = ...,
+        activeborderwidth: float | str = ...,
         activeforeground: str = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         postcommand: Callable[[], object] | str = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectcolor: str = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         tearoff: bool = ...,
         tearoffcommand: Callable[[str, str], object] | str = ...,
         title: str = ...,
@@ -4407,11 +4439,11 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         label: str = ...,
         menu: Menu = ...,
         state: Literal["normal", "active", "disabled"] = ...,
@@ -4430,17 +4462,17 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         label: str = ...,
         offvalue: Any = ...,
         onvalue: Any = ...,
         selectcolor: str = ...,
-        selectimage: _ImageSpec = ...,
+        selectimage: _Image | str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
         underline: int = ...,
         variable: Variable = ...,
@@ -4458,11 +4490,11 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         label: str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
         underline: int = ...,
@@ -4480,15 +4512,15 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         label: str = ...,
         selectcolor: str = ...,
-        selectimage: _ImageSpec = ...,
+        selectimage: _Image | str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
         underline: int = ...,
         value: Any = ...,
@@ -4511,11 +4543,11 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         label: str = ...,
         menu: Menu = ...,
         state: Literal["normal", "active", "disabled"] = ...,
@@ -4535,17 +4567,17 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         label: str = ...,
         offvalue: Any = ...,
         onvalue: Any = ...,
         selectcolor: str = ...,
-        selectimage: _ImageSpec = ...,
+        selectimage: _Image | str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
         underline: int = ...,
         variable: Variable = ...,
@@ -4564,11 +4596,11 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         label: str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
         underline: int = ...,
@@ -4587,15 +4619,15 @@ class Menu(Widget):
         bitmap: str = ...,
         columnbreak: int = ...,
         command: Callable[[], object] | str = ...,
-        compound: _Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         hidemargin: bool = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         label: str = ...,
         selectcolor: str = ...,
-        selectimage: _ImageSpec = ...,
+        selectimage: _Image | str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
         underline: int = ...,
         value: Any = ...,
@@ -4652,39 +4684,39 @@ class Menubutton(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = "",
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        compound: _Compound = "none",
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = "none",
         cursor: _Cursor = "",
         direction: Literal["above", "below", "left", "right", "flush"] = "below",
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
-        image: _ImageSpec = "",
+        highlightthickness: float | str = 0,
+        image: _Image | str = "",
         indicatoron: bool = ...,
         justify: Literal["left", "center", "right"] = ...,
         menu: Menu = ...,
         name: str = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = "flat",
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         state: Literal["normal", "active", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         text: float | str = "",
         textvariable: Variable = ...,
         underline: int = -1,
-        width: _ScreenUnits = 0,
-        wraplength: _ScreenUnits = 0,
+        width: float | str = 0,
+        wraplength: float | str = 0,
     ) -> None: ...
     @overload
     def configure(
@@ -4693,38 +4725,38 @@ class Menubutton(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        compound: _Compound = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: _Cursor = ...,
         direction: Literal["above", "below", "left", "right", "flush"] = ...,
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
-        image: _ImageSpec = ...,
+        highlightthickness: float | str = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         justify: Literal["left", "center", "right"] = ...,
         menu: Menu = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         state: Literal["normal", "active", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: Variable = ...,
         underline: int = ...,
-        width: _ScreenUnits = ...,
-        wraplength: _ScreenUnits = ...,
+        width: float | str = ...,
+        wraplength: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -4745,58 +4777,58 @@ class Message(Widget):
         master: Misc | None = None,
         cnf: dict[str, Any] | None = {},
         *,
-        anchor: _Anchor = "center",
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = "center",
         aspect: int = 150,
         background: str = ...,
-        bd: _ScreenUnits = 1,
+        bd: float | str = 1,
         bg: str = ...,
-        border: _ScreenUnits = 1,
-        borderwidth: _ScreenUnits = 1,
+        border: float | str = 1,
+        borderwidth: float | str = 1,
         cursor: _Cursor = "",
         fg: str = ...,
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
+        highlightthickness: float | str = 0,
         justify: Literal["left", "center", "right"] = "left",
         name: str = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = "flat",
-        takefocus: _TakeFocusValue = 0,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         text: float | str = "",
         textvariable: Variable = ...,
         # there's width but no height
-        width: _ScreenUnits = 0,
+        width: float | str = 0,
     ) -> None: ...
     @overload
     def configure(
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         aspect: int = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         justify: Literal["left", "center", "right"] = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
-        takefocus: _TakeFocusValue = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: Variable = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -4819,46 +4851,46 @@ class Radiobutton(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = "center",
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = "center",
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = "",
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        command: _ButtonCommand = "",
-        compound: _Compound = "none",
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        command: str | Callable[[], Any] = "",
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = "none",
         cursor: _Cursor = "",
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 1,
-        image: _ImageSpec = "",
+        highlightthickness: float | str = 1,
+        image: _Image | str = "",
         indicatoron: bool = True,
         justify: Literal["left", "center", "right"] = "center",
         name: str = ...,
-        offrelief: _Relief = ...,
-        overrelief: _Relief | Literal[""] = "",
-        padx: _ScreenUnits = 1,
-        pady: _ScreenUnits = 1,
-        relief: _Relief = "flat",
+        offrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        overrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove", ""] = "",
+        padx: float | str = 1,
+        pady: float | str = 1,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         selectcolor: str = ...,
-        selectimage: _ImageSpec = "",
+        selectimage: _Image | str = "",
         state: Literal["normal", "active", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         text: float | str = "",
         textvariable: Variable = ...,
-        tristateimage: _ImageSpec = "",
+        tristateimage: _Image | str = "",
         tristatevalue: Any = "",
         underline: int = -1,
         value: Any = "",
         variable: Variable | Literal[""] = ...,
-        width: _ScreenUnits = 0,
-        wraplength: _ScreenUnits = 0,
+        width: float | str = 0,
+        wraplength: float | str = 0,
     ) -> None:
         """Construct a radiobutton widget with the parent MASTER.
 
@@ -4878,45 +4910,45 @@ class Radiobutton(Widget):
         *,
         activebackground: str = ...,
         activeforeground: str = ...,
-        anchor: _Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bitmap: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
-        command: _ButtonCommand = ...,
-        compound: _Compound = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        command: str | Callable[[], Any] = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: _Cursor = ...,
         disabledforeground: str = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
-        image: _ImageSpec = ...,
+        highlightthickness: float | str = ...,
+        image: _Image | str = ...,
         indicatoron: bool = ...,
         justify: Literal["left", "center", "right"] = ...,
-        offrelief: _Relief = ...,
-        overrelief: _Relief | Literal[""] = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        offrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        overrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove", ""] = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectcolor: str = ...,
-        selectimage: _ImageSpec = ...,
+        selectimage: _Image | str = ...,
         state: Literal["normal", "active", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: Variable = ...,
-        tristateimage: _ImageSpec = ...,
+        tristateimage: _Image | str = ...,
         tristatevalue: Any = ...,
         underline: int = ...,
         value: Any = ...,
         variable: Variable | Literal[""] = ...,
-        width: _ScreenUnits = ...,
-        wraplength: _ScreenUnits = ...,
+        width: float | str = ...,
+        wraplength: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -4950,11 +4982,11 @@ class Scale(Widget):
         *,
         activebackground: str = ...,
         background: str = ...,
-        bd: _ScreenUnits = 1,
+        bd: float | str = 1,
         bg: str = ...,
         bigincrement: float = 0.0,
-        border: _ScreenUnits = 1,
-        borderwidth: _ScreenUnits = 1,
+        border: float | str = 1,
+        borderwidth: float | str = 1,
         # don't know why the callback gets string instead of float
         command: str | Callable[[str], object] = "",
         cursor: _Cursor = "",
@@ -4965,25 +4997,25 @@ class Scale(Widget):
         from_: float = 0.0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         label: str = "",
-        length: _ScreenUnits = 100,
+        length: float | str = 100,
         name: str = ...,
         orient: Literal["horizontal", "vertical"] = "vertical",
-        relief: _Relief = "flat",
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         repeatdelay: int = 300,
         repeatinterval: int = 100,
         resolution: float = 1.0,
         showvalue: bool = True,
-        sliderlength: _ScreenUnits = 30,
-        sliderrelief: _Relief = "raised",
+        sliderlength: float | str = 30,
+        sliderrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "raised",
         state: Literal["normal", "active", "disabled"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         tickinterval: float = 0.0,
         to: float = 100.0,
         troughcolor: str = ...,
         variable: IntVar | DoubleVar = ...,
-        width: _ScreenUnits = 15,
+        width: float | str = 15,
     ) -> None:
         """Construct a scale widget with the parent MASTER.
 
@@ -5002,11 +5034,11 @@ class Scale(Widget):
         *,
         activebackground: str = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         bigincrement: float = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         command: str | Callable[[str], object] = ...,
         cursor: _Cursor = ...,
         digits: int = ...,
@@ -5016,24 +5048,24 @@ class Scale(Widget):
         from_: float = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         label: str = ...,
-        length: _ScreenUnits = ...,
+        length: float | str = ...,
         orient: Literal["horizontal", "vertical"] = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         repeatdelay: int = ...,
         repeatinterval: int = ...,
         resolution: float = ...,
         showvalue: bool = ...,
-        sliderlength: _ScreenUnits = ...,
-        sliderrelief: _Relief = ...,
+        sliderlength: float | str = ...,
+        sliderrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         state: Literal["normal", "active", "disabled"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         tickinterval: float = ...,
         to: float = ...,
         troughcolor: str = ...,
         variable: IntVar | DoubleVar = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -5071,31 +5103,31 @@ class Scrollbar(Widget):
         cnf: dict[str, Any] | None = {},
         *,
         activebackground: str = ...,
-        activerelief: _Relief = "raised",
+        activerelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "raised",
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         # There are many ways how the command may get called. Search for
         # 'SCROLLING COMMANDS' in scrollbar man page. There doesn't seem to
         # be any way to specify an overloaded callback function, so we say
         # that it can take any args while it can't in reality.
         command: Callable[..., tuple[float, float] | None] | str = "",
         cursor: _Cursor = "",
-        elementborderwidth: _ScreenUnits = -1,
+        elementborderwidth: float | str = -1,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
+        highlightthickness: float | str = 0,
         jump: bool = False,
         name: str = ...,
         orient: Literal["horizontal", "vertical"] = "vertical",
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         repeatdelay: int = 300,
         repeatinterval: int = 100,
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         troughcolor: str = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> None:
         """Construct a scrollbar widget with the parent MASTER.
 
@@ -5113,26 +5145,26 @@ class Scrollbar(Widget):
         cnf: dict[str, Any] | None = None,
         *,
         activebackground: str = ...,
-        activerelief: _Relief = ...,
+        activerelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         command: Callable[..., tuple[float, float] | None] | str = ...,
         cursor: _Cursor = ...,
-        elementborderwidth: _ScreenUnits = ...,
+        elementborderwidth: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         jump: bool = ...,
         orient: Literal["horizontal", "vertical"] = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         repeatdelay: int = ...,
         repeatinterval: int = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         troughcolor: str = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -5178,7 +5210,6 @@ class Scrollbar(Widget):
         lower ends as value between 0 and 1).
         """
 
-_TextIndex: TypeAlias = _tkinter.Tcl_Obj | str | float | Misc
 _WhatToCount: TypeAlias = Literal[
     "chars", "displaychars", "displayindices", "displaylines", "indices", "lines", "xpixels", "ypixels"
 ]
@@ -5193,54 +5224,54 @@ class Text(Widget, XView, YView):
         *,
         autoseparators: bool = True,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         blockcursor: bool = False,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = "xterm",
         endline: int | Literal[""] = "",
         exportselection: bool = True,
         fg: str = ...,
         font: _FontDescription = "TkFixedFont",
         foreground: str = ...,
-        # width is always int, but height is allowed to be ScreenUnits.
+        # width is always int, but height is allowed to be screen units.
         # This doesn't make any sense to me, and this isn't documented.
         # The docs seem to say that both should be integers.
-        height: _ScreenUnits = 24,
+        height: float | str = 24,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         inactiveselectbackground: str = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = 0,
+        insertborderwidth: float | str = 0,
         insertofftime: int = 300,
         insertontime: int = 600,
         insertunfocussed: Literal["none", "hollow", "solid"] = "none",
-        insertwidth: _ScreenUnits = ...,
+        insertwidth: float | str = ...,
         maxundo: int = 0,
         name: str = ...,
-        padx: _ScreenUnits = 1,
-        pady: _ScreenUnits = 1,
-        relief: _Relief = ...,
+        padx: float | str = 1,
+        pady: float | str = 1,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         setgrid: bool = False,
-        spacing1: _ScreenUnits = 0,
-        spacing2: _ScreenUnits = 0,
-        spacing3: _ScreenUnits = 0,
+        spacing1: float | str = 0,
+        spacing2: float | str = 0,
+        spacing3: float | str = 0,
         startline: int | Literal[""] = "",
         state: Literal["normal", "disabled"] = "normal",
         # Literal inside Tuple doesn't actually work
-        tabs: _ScreenUnits | str | tuple[_ScreenUnits | str, ...] = "",
+        tabs: float | str | tuple[float | str, ...] = "",
         tabstyle: Literal["tabular", "wordprocessor"] = "tabular",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         undo: bool = False,
         width: int = 80,
         wrap: Literal["none", "char", "word"] = "char",
-        xscrollcommand: _XYScrollCommand = "",
-        yscrollcommand: _XYScrollCommand = "",
+        xscrollcommand: str | Callable[[float, float], object] = "",
+        yscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Construct a text widget with the parent MASTER.
 
@@ -5272,49 +5303,49 @@ class Text(Widget, XView, YView):
         *,
         autoseparators: bool = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
         blockcursor: bool = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
         endline: int | Literal[""] = ...,
         exportselection: bool = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         inactiveselectbackground: str = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = ...,
+        insertborderwidth: float | str = ...,
         insertofftime: int = ...,
         insertontime: int = ...,
         insertunfocussed: Literal["none", "hollow", "solid"] = ...,
-        insertwidth: _ScreenUnits = ...,
+        insertwidth: float | str = ...,
         maxundo: int = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         setgrid: bool = ...,
-        spacing1: _ScreenUnits = ...,
-        spacing2: _ScreenUnits = ...,
-        spacing3: _ScreenUnits = ...,
+        spacing1: float | str = ...,
+        spacing2: float | str = ...,
+        spacing3: float | str = ...,
         startline: int | Literal[""] = ...,
         state: Literal["normal", "disabled"] = ...,
-        tabs: _ScreenUnits | str | tuple[_ScreenUnits | str, ...] = ...,
+        tabs: float | str | tuple[float | str, ...] = ...,
         tabstyle: Literal["tabular", "wordprocessor"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         undo: bool = ...,
         width: int = ...,
         wrap: Literal["none", "char", "word"] = ...,
-        xscrollcommand: _XYScrollCommand = ...,
-        yscrollcommand: _XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
+        yscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -5326,18 +5357,29 @@ class Text(Widget, XView, YView):
     @overload
     def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
     config = configure
-    def bbox(self, index: _TextIndex) -> tuple[int, int, int, int] | None:  # type: ignore[override]
+    def bbox(self, index: str | float | _tkinter.Tcl_Obj | Widget) -> tuple[int, int, int, int] | None:  # type: ignore[override]
         """Return a tuple of (x,y,width,height) which gives the bounding
         box of the visible part of the character at the given index.
         """
 
-    def compare(self, index1: _TextIndex, op: Literal["<", "<=", "==", ">=", ">", "!="], index2: _TextIndex) -> bool:
+    def compare(
+        self,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        op: Literal["<", "<=", "==", ">=", ">", "!="],
+        index2: str | float | _tkinter.Tcl_Obj | Widget,
+    ) -> bool:
         """Return whether between index INDEX1 and index INDEX2 the
         relation OP is satisfied. OP is one of <, <=, ==, >=, >, or !=.
         """
     if sys.version_info >= (3, 13):
         @overload
-        def count(self, index1: _TextIndex, index2: _TextIndex, *, return_ints: Literal[True]) -> int:
+        def count(
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            *,
+            return_ints: Literal[True],
+        ) -> int:
             """Counts the number of relevant things between the two indices.
 
             If INDEX1 is after INDEX2, the result will be a negative number
@@ -5357,13 +5399,19 @@ class Text(Widget, XView, YView):
 
         @overload
         def count(
-            self, index1: _TextIndex, index2: _TextIndex, arg: _WhatToCount | Literal["update"], /, *, return_ints: Literal[True]
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            arg: _WhatToCount | Literal["update"],
+            /,
+            *,
+            return_ints: Literal[True],
         ) -> int: ...
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: Literal["update"],
             arg2: _WhatToCount,
             /,
@@ -5373,8 +5421,8 @@ class Text(Widget, XView, YView):
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: _WhatToCount,
             arg2: Literal["update"],
             /,
@@ -5383,13 +5431,20 @@ class Text(Widget, XView, YView):
         ) -> int: ...
         @overload
         def count(
-            self, index1: _TextIndex, index2: _TextIndex, arg1: _WhatToCount, arg2: _WhatToCount, /, *, return_ints: Literal[True]
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            arg1: _WhatToCount,
+            arg2: _WhatToCount,
+            /,
+            *,
+            return_ints: Literal[True],
         ) -> tuple[int, int]: ...
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: _WhatToCount | Literal["update"],
             arg2: _WhatToCount | Literal["update"],
             arg3: _WhatToCount | Literal["update"],
@@ -5398,12 +5453,18 @@ class Text(Widget, XView, YView):
             return_ints: Literal[True],
         ) -> tuple[int, ...]: ...
         @overload
-        def count(self, index1: _TextIndex, index2: _TextIndex, *, return_ints: Literal[False] = False) -> tuple[int] | None: ...
+        def count(
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            *,
+            return_ints: Literal[False] = False,
+        ) -> tuple[int] | None: ...
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg: _WhatToCount | Literal["update"],
             /,
             *,
@@ -5412,8 +5473,8 @@ class Text(Widget, XView, YView):
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: Literal["update"],
             arg2: _WhatToCount,
             /,
@@ -5423,8 +5484,8 @@ class Text(Widget, XView, YView):
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: _WhatToCount,
             arg2: Literal["update"],
             /,
@@ -5434,8 +5495,8 @@ class Text(Widget, XView, YView):
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: _WhatToCount,
             arg2: _WhatToCount,
             /,
@@ -5445,8 +5506,8 @@ class Text(Widget, XView, YView):
         @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: _WhatToCount | Literal["update"],
             arg2: _WhatToCount | Literal["update"],
             arg3: _WhatToCount | Literal["update"],
@@ -5456,7 +5517,9 @@ class Text(Widget, XView, YView):
         ) -> tuple[int, ...]: ...
     else:
         @overload
-        def count(self, index1: _TextIndex, index2: _TextIndex) -> tuple[int] | None:
+        def count(
+            self, index1: str | float | _tkinter.Tcl_Obj | Widget, index2: str | float | _tkinter.Tcl_Obj | Widget
+        ) -> tuple[int] | None:
             """Counts the number of relevant things between the two indices.
             If index1 is after index2, the result will be a negative number
             (and this holds for each of the possible options).
@@ -5472,19 +5535,44 @@ class Text(Widget, XView, YView):
 
         @overload
         def count(
-            self, index1: _TextIndex, index2: _TextIndex, arg: _WhatToCount | Literal["update"], /
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            arg: _WhatToCount | Literal["update"],
+            /,
         ) -> tuple[int] | None: ...
         @overload
-        def count(self, index1: _TextIndex, index2: _TextIndex, arg1: Literal["update"], arg2: _WhatToCount, /) -> int | None: ...
-        @overload
-        def count(self, index1: _TextIndex, index2: _TextIndex, arg1: _WhatToCount, arg2: Literal["update"], /) -> int | None: ...
-        @overload
-        def count(self, index1: _TextIndex, index2: _TextIndex, arg1: _WhatToCount, arg2: _WhatToCount, /) -> tuple[int, int]: ...
-        @overload
         def count(
             self,
-            index1: _TextIndex,
-            index2: _TextIndex,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            arg1: Literal["update"],
+            arg2: _WhatToCount,
+            /,
+        ) -> int | None: ...
+        @overload
+        def count(
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            arg1: _WhatToCount,
+            arg2: Literal["update"],
+            /,
+        ) -> int | None: ...
+        @overload
+        def count(
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
+            arg1: _WhatToCount,
+            arg2: _WhatToCount,
+            /,
+        ) -> tuple[int, int]: ...
+        @overload
+        def count(
+            self,
+            index1: str | float | _tkinter.Tcl_Obj | Widget,
+            index2: str | float | _tkinter.Tcl_Obj | Widget,
             arg1: _WhatToCount | Literal["update"],
             arg2: _WhatToCount | Literal["update"],
             arg3: _WhatToCount | Literal["update"],
@@ -5500,10 +5588,12 @@ class Text(Widget, XView, YView):
 
     @overload
     def debug(self, boolean: bool) -> None: ...
-    def delete(self, index1: _TextIndex, index2: _TextIndex | None = None) -> None:
+    def delete(
+        self, index1: str | float | _tkinter.Tcl_Obj | Widget, index2: str | float | _tkinter.Tcl_Obj | Widget | None = None
+    ) -> None:
         """Delete the characters between INDEX1 and INDEX2 (not included)."""
 
-    def dlineinfo(self, index: _TextIndex) -> tuple[int, int, int, int, int] | None:
+    def dlineinfo(self, index: str | float | _tkinter.Tcl_Obj | Widget) -> tuple[int, int, int, int, int] | None:
         """Return tuple (x,y,width,height,baseline) giving the bounding box
         and baseline position of the visible part of the line containing
         the character at INDEX.
@@ -5512,8 +5602,8 @@ class Text(Widget, XView, YView):
     @overload
     def dump(
         self,
-        index1: _TextIndex,
-        index2: _TextIndex | None = None,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget | None = None,
         command: None = None,
         *,
         all: bool = ...,
@@ -5539,8 +5629,8 @@ class Text(Widget, XView, YView):
     @overload
     def dump(
         self,
-        index1: _TextIndex,
-        index2: _TextIndex | None,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget | None,
         command: Callable[[str, str, str], object] | str,
         *,
         all: bool = ...,
@@ -5553,8 +5643,8 @@ class Text(Widget, XView, YView):
     @overload
     def dump(
         self,
-        index1: _TextIndex,
-        index2: _TextIndex | None = None,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget | None = None,
         *,
         command: Callable[[str, str, str], object] | str,
         all: bool = ...,
@@ -5619,55 +5709,61 @@ class Text(Widget, XView, YView):
         when the undo option is false
         """
 
-    def get(self, index1: _TextIndex, index2: _TextIndex | None = None) -> str:
+    def get(
+        self, index1: str | float | _tkinter.Tcl_Obj | Widget, index2: str | float | _tkinter.Tcl_Obj | Widget | None = None
+    ) -> str:
         """Return the text from INDEX1 to INDEX2 (not included)."""
 
     @overload
-    def image_cget(self, index: _TextIndex, option: Literal["image", "name"]) -> str:
+    def image_cget(self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["image", "name"]) -> str:
         """Return the value of OPTION of an embedded image at INDEX."""
 
     @overload
-    def image_cget(self, index: _TextIndex, option: Literal["padx", "pady"]) -> int: ...
+    def image_cget(self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["padx", "pady"]) -> int: ...
     @overload
-    def image_cget(self, index: _TextIndex, option: Literal["align"]) -> Literal["baseline", "bottom", "center", "top"]: ...
+    def image_cget(
+        self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["align"]
+    ) -> Literal["baseline", "bottom", "center", "top"]: ...
     @overload
-    def image_cget(self, index: _TextIndex, option: str) -> Any: ...
+    def image_cget(self, index: str | float | _tkinter.Tcl_Obj | Widget, option: str) -> Any: ...
     @overload
-    def image_configure(self, index: _TextIndex, cnf: str) -> tuple[str, str, str, str, str | int]:
+    def image_configure(self, index: str | float | _tkinter.Tcl_Obj | Widget, cnf: str) -> tuple[str, str, str, str, str | int]:
         """Configure an embedded image at INDEX."""
 
     @overload
     def image_configure(
         self,
-        index: _TextIndex,
-        cnf: dict[str, Any] | None = {},
+        index: str | float | _tkinter.Tcl_Obj | Widget,
+        cnf: dict[str, Any] | None = None,
         *,
         align: Literal["baseline", "bottom", "center", "top"] = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         name: str = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
     ) -> dict[str, tuple[str, str, str, str, str | int]] | None: ...
     def image_create(
         self,
-        index: _TextIndex,
+        index: str | float | _tkinter.Tcl_Obj | Widget,
         cnf: dict[str, Any] | None = {},
         *,
         align: Literal["baseline", "bottom", "center", "top"] = ...,
-        image: _ImageSpec = ...,
+        image: _Image | str = ...,
         name: str = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
     ) -> str:
         """Create an embedded image at INDEX."""
 
     def image_names(self) -> tuple[str, ...]:
         """Return all names of embedded images in this widget."""
 
-    def index(self, index: _TextIndex) -> str:
+    def index(self, index: str | float | _tkinter.Tcl_Obj | Widget) -> str:
         """Return the index in the form line.char for INDEX."""
 
-    def insert(self, index: _TextIndex, chars: str, *args: str | list[str] | tuple[str, ...]) -> None:
+    def insert(
+        self, index: str | float | _tkinter.Tcl_Obj | Widget, chars: str, *args: str | list[str] | tuple[str, ...]
+    ) -> None:
         """Insert CHARS before the characters at INDEX. An additional
         tag can be given in ARGS. Additional CHARS and tags can follow in ARGS.
         """
@@ -5683,16 +5779,16 @@ class Text(Widget, XView, YView):
     def mark_names(self) -> tuple[str, ...]:
         """Return all mark names."""
 
-    def mark_set(self, markName: str, index: _TextIndex) -> None:
+    def mark_set(self, markName: str, index: str | float | _tkinter.Tcl_Obj | Widget) -> None:
         """Set mark MARKNAME before the character at INDEX."""
 
     def mark_unset(self, *markNames: str) -> None:
         """Delete all marks in MARKNAMES."""
 
-    def mark_next(self, index: _TextIndex) -> str | None:
+    def mark_next(self, index: str | float | _tkinter.Tcl_Obj | Widget) -> str | None:
         """Return the name of the next mark after INDEX."""
 
-    def mark_previous(self, index: _TextIndex) -> str | None:
+    def mark_previous(self, index: str | float | _tkinter.Tcl_Obj | Widget) -> str | None:
         """Return the name of the previous mark before INDEX."""
     # **kw of peer_create is same as the kwargs of Text.__init__
     def peer_create(self, newPathName: str | Text, cnf: dict[str, Any] = {}, **kw) -> None:
@@ -5707,7 +5803,13 @@ class Text(Widget, XView, YView):
         the widget itself).
         """
 
-    def replace(self, index1: _TextIndex, index2: _TextIndex, chars: str, *args: str | list[str] | tuple[str, ...]) -> None:
+    def replace(
+        self,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget,
+        chars: str,
+        *args: str | list[str] | tuple[str, ...],
+    ) -> None:
         """Replaces the range of characters between index1 and index2 with
         the given characters and tags specified by args.
 
@@ -5727,8 +5829,8 @@ class Text(Widget, XView, YView):
     def search(
         self,
         pattern: str,
-        index: _TextIndex,
-        stopindex: _TextIndex | None = None,
+        index: str | float | _tkinter.Tcl_Obj | Widget,
+        stopindex: str | float | _tkinter.Tcl_Obj | Widget | None = None,
         forwards: bool | None = None,
         backwards: bool | None = None,
         exact: bool | None = None,
@@ -5742,10 +5844,12 @@ class Text(Widget, XView, YView):
         empty string.
         """
 
-    def see(self, index: _TextIndex) -> None:
+    def see(self, index: str | float | _tkinter.Tcl_Obj | Widget) -> None:
         """Scroll such that the character at INDEX is visible."""
 
-    def tag_add(self, tagName: str, index1: _TextIndex, *args: _TextIndex) -> None:
+    def tag_add(
+        self, tagName: str, index1: str | float | _tkinter.Tcl_Obj | Widget, *args: str | float | _tkinter.Tcl_Obj | Widget
+    ) -> None:
         """Add tag TAGNAME to all characters between INDEX1 and index2 in ARGS.
         Additional pairs of indices may follow in ARGS.
         """
@@ -5783,27 +5887,27 @@ class Text(Widget, XView, YView):
         *,
         background: str = ...,
         bgstipple: str = ...,
-        borderwidth: _ScreenUnits = ...,
-        border: _ScreenUnits = ...,  # alias for borderwidth
+        borderwidth: float | str = ...,
+        border: float | str = ...,  # alias for borderwidth
         elide: bool = ...,
         fgstipple: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
         justify: Literal["left", "right", "center"] = ...,
-        lmargin1: _ScreenUnits = ...,
-        lmargin2: _ScreenUnits = ...,
+        lmargin1: float | str = ...,
+        lmargin2: float | str = ...,
         lmargincolor: str = ...,
-        offset: _ScreenUnits = ...,
+        offset: float | str = ...,
         overstrike: bool = ...,
         overstrikefg: str = ...,
-        relief: _Relief = ...,
-        rmargin: _ScreenUnits = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        rmargin: float | str = ...,
         rmargincolor: str = ...,
         selectbackground: str = ...,
         selectforeground: str = ...,
-        spacing1: _ScreenUnits = ...,
-        spacing2: _ScreenUnits = ...,
-        spacing3: _ScreenUnits = ...,
+        spacing1: float | str = ...,
+        spacing2: float | str = ...,
+        spacing3: float | str = ...,
         tabs: Any = ...,  # the exact type is kind of complicated, see manual page
         tabstyle: Literal["tabular", "wordprocessor"] = ...,
         underline: bool = ...,
@@ -5823,16 +5927,26 @@ class Text(Widget, XView, YView):
         than the priority of BELOWTHIS.
         """
 
-    def tag_names(self, index: _TextIndex | None = None) -> tuple[str, ...]:
+    def tag_names(self, index: str | float | _tkinter.Tcl_Obj | Widget | None = None) -> tuple[str, ...]:
         """Return a list of all tag names."""
 
-    def tag_nextrange(self, tagName: str, index1: _TextIndex, index2: _TextIndex | None = None) -> tuple[str, str] | tuple[()]:
+    def tag_nextrange(
+        self,
+        tagName: str,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget | None = None,
+    ) -> tuple[str, str] | tuple[()]:
         """Return a list of start and end index for the first sequence of
         characters between INDEX1 and INDEX2 which all have tag TAGNAME.
         The text is searched forward from INDEX1.
         """
 
-    def tag_prevrange(self, tagName: str, index1: _TextIndex, index2: _TextIndex | None = None) -> tuple[str, str] | tuple[()]:
+    def tag_prevrange(
+        self,
+        tagName: str,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget | None = None,
+    ) -> tuple[str, str] | tuple[()]:
         """Return a list of start and end index for the first sequence of
         characters between INDEX1 and INDEX2 which all have tag TAGNAME.
         The text is searched backwards from INDEX1.
@@ -5846,48 +5960,57 @@ class Text(Widget, XView, YView):
     def tag_ranges(self, tagName: str) -> tuple[_tkinter.Tcl_Obj, ...]:
         """Return a list of ranges of text which have tag TAGNAME."""
     # tag_remove and tag_delete are different
-    def tag_remove(self, tagName: str, index1: _TextIndex, index2: _TextIndex | None = None) -> None:
+    def tag_remove(
+        self,
+        tagName: str,
+        index1: str | float | _tkinter.Tcl_Obj | Widget,
+        index2: str | float | _tkinter.Tcl_Obj | Widget | None = None,
+    ) -> None:
         """Remove tag TAGNAME from all characters between INDEX1 and INDEX2."""
 
     @overload
-    def window_cget(self, index: _TextIndex, option: Literal["padx", "pady"]) -> int:
+    def window_cget(self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["padx", "pady"]) -> int:
         """Return the value of OPTION of an embedded window at INDEX."""
 
     @overload
-    def window_cget(self, index: _TextIndex, option: Literal["stretch"]) -> bool: ...  # actually returns Literal[0, 1]
+    def window_cget(
+        self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["stretch"]
+    ) -> bool: ...  # actually returns Literal[0, 1]
     @overload
-    def window_cget(self, index: _TextIndex, option: Literal["align"]) -> Literal["baseline", "bottom", "center", "top"]: ...
+    def window_cget(
+        self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["align"]
+    ) -> Literal["baseline", "bottom", "center", "top"]: ...
     @overload  # window is set to a widget, but read as the string name.
-    def window_cget(self, index: _TextIndex, option: Literal["create", "window"]) -> str: ...
+    def window_cget(self, index: str | float | _tkinter.Tcl_Obj | Widget, option: Literal["create", "window"]) -> str: ...
     @overload
-    def window_cget(self, index: _TextIndex, option: str) -> Any: ...
+    def window_cget(self, index: str | float | _tkinter.Tcl_Obj | Widget, option: str) -> Any: ...
     @overload
-    def window_configure(self, index: _TextIndex, cnf: str) -> tuple[str, str, str, str, str | int]:
+    def window_configure(self, index: str | float | _tkinter.Tcl_Obj | Widget, cnf: str) -> tuple[str, str, str, str, str | int]:
         """Configure an embedded window at INDEX."""
 
     @overload
     def window_configure(
         self,
-        index: _TextIndex,
+        index: str | float | _tkinter.Tcl_Obj | Widget,
         cnf: dict[str, Any] | None = None,
         *,
         align: Literal["baseline", "bottom", "center", "top"] = ...,
         create: str = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
         stretch: bool | Literal[0, 1] = ...,
         window: Misc | str = ...,
     ) -> dict[str, tuple[str, str, str, str, str | int]] | None: ...
     window_config = window_configure
     def window_create(
         self,
-        index: _TextIndex,
+        index: str | float | _tkinter.Tcl_Obj | Widget,
         cnf: dict[str, Any] | None = {},
         *,
         align: Literal["baseline", "bottom", "center", "top"] = ...,
         create: str = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
         stretch: bool | Literal[0, 1] = ...,
         window: Misc | str = ...,
     ) -> None:
@@ -5909,7 +6032,6 @@ class _setit:
 class OptionMenu(Menubutton):
     """OptionMenu which allows the user to select a value from a menu."""
 
-    widgetName: Incomplete
     menuname: Incomplete
     def __init__(
         # differs from other widgets
@@ -6284,14 +6406,14 @@ class Spinbox(Widget, XView):
         *,
         activebackground: str = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         buttonbackground: str = ...,
         buttoncursor: _Cursor = "",
-        buttondownrelief: _Relief = ...,
-        buttonuprelief: _Relief = ...,
+        buttondownrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        buttonuprelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         # percent substitutions don't seem to be supported, it's similar to Entry's validation stuff
         command: Callable[[], object] | str | list[str] | tuple[str, ...] = "",
         cursor: _Cursor = "xterm",
@@ -6305,35 +6427,35 @@ class Spinbox(Widget, XView):
         from_: float = 0.0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         increment: float = 1.0,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = 0,
+        insertborderwidth: float | str = 0,
         insertofftime: int = 300,
         insertontime: int = 600,
-        insertwidth: _ScreenUnits = ...,
-        invalidcommand: _EntryValidateCommand = "",
-        invcmd: _EntryValidateCommand = "",
+        insertwidth: float | str = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
+        invcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
         justify: Literal["left", "center", "right"] = "left",
         name: str = ...,
         readonlybackground: str = ...,
-        relief: _Relief = "sunken",
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "sunken",
         repeatdelay: int = 400,
         repeatinterval: int = 100,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         state: Literal["normal", "disabled", "readonly"] = "normal",
-        takefocus: _TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         textvariable: Variable = ...,
         to: float = 0.0,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = "none",
-        validatecommand: _EntryValidateCommand = "",
-        vcmd: _EntryValidateCommand = "",
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
+        vcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
         values: list[str] | tuple[str, ...] = ...,
         width: int = 20,
         wrap: bool = False,
-        xscrollcommand: _XYScrollCommand = "",
+        xscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Construct a spinbox widget with the parent MASTER.
 
@@ -6369,14 +6491,14 @@ class Spinbox(Widget, XView):
         *,
         activebackground: str = ...,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         buttonbackground: str = ...,
         buttoncursor: _Cursor = ...,
-        buttondownrelief: _Relief = ...,
-        buttonuprelief: _Relief = ...,
+        buttondownrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        buttonuprelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         command: Callable[[], object] | str | list[str] | tuple[str, ...] = ...,
         cursor: _Cursor = ...,
         disabledbackground: str = ...,
@@ -6389,34 +6511,34 @@ class Spinbox(Widget, XView):
         from_: float = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         increment: float = ...,
         insertbackground: str = ...,
-        insertborderwidth: _ScreenUnits = ...,
+        insertborderwidth: float | str = ...,
         insertofftime: int = ...,
         insertontime: int = ...,
-        insertwidth: _ScreenUnits = ...,
-        invalidcommand: _EntryValidateCommand = ...,
-        invcmd: _EntryValidateCommand = ...,
+        insertwidth: float | str = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
+        invcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         readonlybackground: str = ...,
-        relief: _Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         repeatdelay: int = ...,
         repeatinterval: int = ...,
         selectbackground: str = ...,
-        selectborderwidth: _ScreenUnits = ...,
+        selectborderwidth: float | str = ...,
         selectforeground: str = ...,
         state: Literal["normal", "disabled", "readonly"] = ...,
-        takefocus: _TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: Variable = ...,
         to: float = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: _EntryValidateCommand = ...,
-        vcmd: _EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
+        vcmd: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         values: list[str] | tuple[str, ...] = ...,
         width: int = ...,
         wrap: bool = ...,
-        xscrollcommand: _XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -6558,10 +6680,10 @@ class LabelFrame(Widget):
         cnf: dict[str, Any] | None = {},
         *,
         background: str = ...,
-        bd: _ScreenUnits = 2,
+        bd: float | str = 2,
         bg: str = ...,
-        border: _ScreenUnits = 2,
-        borderwidth: _ScreenUnits = 2,
+        border: float | str = 2,
+        borderwidth: float | str = 2,
         class_: str = "Labelframe",  # can't be changed with configure()
         colormap: Literal["new", ""] | Misc = "",  # can't be changed with configure()
         container: bool = False,  # undocumented, can't be changed with configure()
@@ -6569,21 +6691,21 @@ class LabelFrame(Widget):
         fg: str = ...,
         font: _FontDescription = "TkDefaultFont",
         foreground: str = ...,
-        height: _ScreenUnits = 0,
+        height: float | str = 0,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = 0,
+        highlightthickness: float | str = 0,
         # 'ne' and 'en' are valid labelanchors, but only 'ne' is a valid _Anchor.
         labelanchor: Literal["nw", "n", "ne", "en", "e", "es", "se", "s", "sw", "ws", "w", "wn"] = "nw",
         labelwidget: Misc = ...,
         name: str = ...,
-        padx: _ScreenUnits = 0,
-        pady: _ScreenUnits = 0,
-        relief: _Relief = "groove",
-        takefocus: _TakeFocusValue = 0,
+        padx: float | str = 0,
+        pady: float | str = 0,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "groove",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = 0,
         text: float | str = "",
         visual: str | tuple[str, int] = "",  # can't be changed with configure()
-        width: _ScreenUnits = 0,
+        width: float | str = 0,
     ) -> None:
         """Construct a labelframe widget with the parent MASTER.
 
@@ -6607,26 +6729,26 @@ class LabelFrame(Widget):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
         fg: str = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        height: _ScreenUnits = ...,
+        height: float | str = ...,
         highlightbackground: str = ...,
         highlightcolor: str = ...,
-        highlightthickness: _ScreenUnits = ...,
+        highlightthickness: float | str = ...,
         labelanchor: Literal["nw", "n", "ne", "en", "e", "es", "se", "s", "sw", "ws", "w", "wn"] = ...,
         labelwidget: Misc = ...,
-        padx: _ScreenUnits = ...,
-        pady: _ScreenUnits = ...,
-        relief: _Relief = ...,
-        takefocus: _TakeFocusValue = ...,
+        padx: float | str = ...,
+        pady: float | str = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -6648,27 +6770,27 @@ class PanedWindow(Widget):
         cnf: dict[str, Any] | None = {},
         *,
         background: str = ...,
-        bd: _ScreenUnits = 1,
+        bd: float | str = 1,
         bg: str = ...,
-        border: _ScreenUnits = 1,
-        borderwidth: _ScreenUnits = 1,
+        border: float | str = 1,
+        borderwidth: float | str = 1,
         cursor: _Cursor = "",
-        handlepad: _ScreenUnits = 8,
-        handlesize: _ScreenUnits = 8,
-        height: _ScreenUnits = "",
+        handlepad: float | str = 8,
+        handlesize: float | str = 8,
+        height: float | str = "",
         name: str = ...,
         opaqueresize: bool = True,
         orient: Literal["horizontal", "vertical"] = "horizontal",
         proxybackground: str = "",
-        proxyborderwidth: _ScreenUnits = 2,
-        proxyrelief: _Relief = "flat",
-        relief: _Relief = "flat",
+        proxyborderwidth: float | str = 2,
+        proxyrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
         sashcursor: _Cursor = "",
-        sashpad: _ScreenUnits = 0,
-        sashrelief: _Relief = "flat",
-        sashwidth: _ScreenUnits = 3,
+        sashpad: float | str = 0,
+        sashrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = "flat",
+        sashwidth: float | str = 3,
         showhandle: bool = False,
-        width: _ScreenUnits = "",
+        width: float | str = "",
     ) -> None:
         """Construct a panedwindow widget with the parent MASTER.
 
@@ -6690,26 +6812,26 @@ class PanedWindow(Widget):
         cnf: dict[str, Any] | None = None,
         *,
         background: str = ...,
-        bd: _ScreenUnits = ...,
+        bd: float | str = ...,
         bg: str = ...,
-        border: _ScreenUnits = ...,
-        borderwidth: _ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: _Cursor = ...,
-        handlepad: _ScreenUnits = ...,
-        handlesize: _ScreenUnits = ...,
-        height: _ScreenUnits = ...,
+        handlepad: float | str = ...,
+        handlesize: float | str = ...,
+        height: float | str = ...,
         opaqueresize: bool = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         proxybackground: str = ...,
-        proxyborderwidth: _ScreenUnits = ...,
-        proxyrelief: _Relief = ...,
-        relief: _Relief = ...,
+        proxyborderwidth: float | str = ...,
+        proxyrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         sashcursor: _Cursor = ...,
-        sashpad: _ScreenUnits = ...,
-        sashrelief: _Relief = ...,
-        sashwidth: _ScreenUnits = ...,
+        sashpad: float | str = ...,
+        sashrelief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
+        sashwidth: float | str = ...,
         showhandle: bool = ...,
-        width: _ScreenUnits = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -6735,7 +6857,7 @@ class PanedWindow(Widget):
 
         All geometry management options for child will be forgotten.
         """
-    forget: Incomplete
+    forget = remove  # type: ignore[assignment]
     def identify(self, x: int, y: int):
         """Identify the panedwindow component at point x, y
 
@@ -6747,22 +6869,22 @@ class PanedWindow(Widget):
         an empty list.
         """
 
-    def proxy(self, *args):
+    def proxy(self, *args) -> tuple[Incomplete, ...]:
         """Internal function."""
 
-    def proxy_coord(self):
+    def proxy_coord(self) -> tuple[Incomplete, ...]:
         """Return the x and y pair of the most recent proxy location"""
 
-    def proxy_forget(self):
+    def proxy_forget(self) -> tuple[Incomplete, ...]:
         """Remove the proxy from the display."""
 
-    def proxy_place(self, x, y):
+    def proxy_place(self, x, y) -> tuple[Incomplete, ...]:
         """Place the proxy at the given x and y coordinates."""
 
-    def sash(self, *args):
+    def sash(self, *args) -> tuple[Incomplete, ...]:
         """Internal function."""
 
-    def sash_coord(self, index):
+    def sash_coord(self, index) -> tuple[Incomplete, ...]:
         """Return the current x and y pair for the sash given by index.
 
         Index must be an integer between 0 and 1 less than the
@@ -6775,13 +6897,13 @@ class PanedWindow(Widget):
         empty string.
         """
 
-    def sash_mark(self, index):
+    def sash_mark(self, index) -> tuple[Incomplete, ...]:
         """Records x and y for the sash given by index;
 
         Used in conjunction with later dragto commands to move the sash.
         """
 
-    def sash_place(self, index, x, y):
+    def sash_place(self, index, x, y) -> tuple[Incomplete, ...]:
         """Place the sash given by index at the given coordinates"""
 
     def panecget(self, child, option):
@@ -6858,7 +6980,7 @@ class PanedWindow(Widget):
             Tk_GetPixels.
 
         """
-    paneconfig: Incomplete
+    paneconfig = paneconfigure
     def panes(self):
         """Returns an ordered list of the child panes."""
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/messagebox.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/messagebox.pyi
index c92e23f7b0..424e8903d6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/messagebox.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/messagebox.pyi
@@ -32,7 +32,7 @@ def showinfo(
     *,
     detail: str = ...,
     icon: Literal["error", "info", "question", "warning"] = ...,
-    default: Literal["ok"] = ...,
+    default: Literal["ok"] = "ok",
     parent: Misc = ...,
 ) -> str:
     """Show an info message"""
@@ -43,7 +43,7 @@ def showwarning(
     *,
     detail: str = ...,
     icon: Literal["error", "info", "question", "warning"] = ...,
-    default: Literal["ok"] = ...,
+    default: Literal["ok"] = "ok",
     parent: Misc = ...,
 ) -> str:
     """Show a warning message"""
@@ -54,7 +54,7 @@ def showerror(
     *,
     detail: str = ...,
     icon: Literal["error", "info", "question", "warning"] = ...,
-    default: Literal["ok"] = ...,
+    default: Literal["ok"] = "ok",
     parent: Misc = ...,
 ) -> str:
     """Show an error message"""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/ttk.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/ttk.pyi
index 2a3f476235..8c6d70c398 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/ttk.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tkinter/ttk.pyi
@@ -13,12 +13,13 @@ of the widgets appearance lies at Themes.
 """
 
 import _tkinter
+import sys
 import tkinter
-from _typeshed import Incomplete, MaybeNone
-from collections.abc import Callable
+from _typeshed import MaybeNone
+from collections.abc import Callable, Iterable
 from tkinter.font import _FontDescription
 from typing import Any, Literal, TypedDict, overload, type_check_only
-from typing_extensions import TypeAlias
+from typing_extensions import Never, TypeAlias, Unpack
 
 __all__ = [
     "Button",
@@ -53,7 +54,7 @@ def tclobjs_to_py(adict: dict[Any, Any]) -> dict[Any, Any]:
     objects.
     """
 
-def setup_master(master=None):
+def setup_master(master: tkinter.Misc | None = None):
     """If master is not None, itself is returned. If master is None,
     the default master is returned if there is one, otherwise a new
     master is created and returned.
@@ -63,23 +64,88 @@ def setup_master(master=None):
     """
 
 _Padding: TypeAlias = (
-    tkinter._ScreenUnits
-    | tuple[tkinter._ScreenUnits]
-    | tuple[tkinter._ScreenUnits, tkinter._ScreenUnits]
-    | tuple[tkinter._ScreenUnits, tkinter._ScreenUnits, tkinter._ScreenUnits]
-    | tuple[tkinter._ScreenUnits, tkinter._ScreenUnits, tkinter._ScreenUnits, tkinter._ScreenUnits]
+    float
+    | str
+    | tuple[float | str]
+    | tuple[float | str, float | str]
+    | tuple[float | str, float | str, float | str]
+    | tuple[float | str, float | str, float | str, float | str]
 )
 
-# from ttk_widget (aka ttk::widget) manual page, differs from tkinter._Compound
-_TtkCompound: TypeAlias = Literal["", "text", "image", tkinter._Compound]
+# Last item (option value to apply) varies between different options so use Any.
+# It could also be any iterable with items matching the tuple, but that case
+# hasn't been added here for consistency with _Padding above.
+_Statespec: TypeAlias = tuple[Unpack[tuple[str, ...]], Any]
+_ImageStatespec: TypeAlias = tuple[Unpack[tuple[str, ...]], tkinter._Image | str]
+_VsapiStatespec: TypeAlias = tuple[Unpack[tuple[str, ...]], int]
+
+class _Layout(TypedDict, total=False):
+    side: Literal["left", "right", "top", "bottom"]
+    sticky: str  # consists of letters 'n', 's', 'w', 'e', may contain repeats, may be empty
+    unit: Literal[0, 1] | bool
+    children: _LayoutSpec
+    # Note: there seem to be some other undocumented keys sometimes
+
+# This could be any sequence when passed as a parameter but will always be a list when returned.
+_LayoutSpec: TypeAlias = list[tuple[str, _Layout | None]]
+
+# Keep these in sync with the appropriate methods in Style
+class _ElementCreateImageKwargs(TypedDict, total=False):
+    border: _Padding
+    height: float | str
+    padding: _Padding
+    sticky: str
+    width: float | str
+
+_ElementCreateArgsCrossPlatform: TypeAlias = (
+    # Could be any sequence here but types are not homogenous so just type it as tuple
+    tuple[Literal["image"], tkinter._Image | str, Unpack[tuple[_ImageStatespec, ...]], _ElementCreateImageKwargs]
+    | tuple[Literal["from"], str, str]
+    | tuple[Literal["from"], str]  # (fromelement is optional)
+)
+if sys.platform == "win32" and sys.version_info >= (3, 13):
+    class _ElementCreateVsapiKwargsPadding(TypedDict, total=False):
+        padding: _Padding
+
+    class _ElementCreateVsapiKwargsMargin(TypedDict, total=False):
+        padding: _Padding
+
+    class _ElementCreateVsapiKwargsSize(TypedDict):
+        width: float | str
+        height: float | str
+
+    _ElementCreateVsapiKwargsDict: TypeAlias = (
+        _ElementCreateVsapiKwargsPadding | _ElementCreateVsapiKwargsMargin | _ElementCreateVsapiKwargsSize
+    )
+    _ElementCreateArgs: TypeAlias = (  # noqa: Y047  # It doesn't recognise the usage below for whatever reason
+        _ElementCreateArgsCrossPlatform
+        | tuple[Literal["vsapi"], str, int, _ElementCreateVsapiKwargsDict]
+        | tuple[Literal["vsapi"], str, int, _VsapiStatespec, _ElementCreateVsapiKwargsDict]
+    )
+else:
+    _ElementCreateArgs: TypeAlias = _ElementCreateArgsCrossPlatform
+_ThemeSettingsValue = TypedDict(
+    "_ThemeSettingsValue",
+    {
+        "configure": dict[str, Any],
+        "map": dict[str, Iterable[_Statespec]],
+        "layout": _LayoutSpec,
+        "element create": _ElementCreateArgs,
+    },
+    total=False,
+)
+_ThemeSettings: TypeAlias = dict[str, _ThemeSettingsValue]
 
 class Style:
     """Manipulate style database."""
 
-    master: Incomplete
+    master: tkinter.Misc
     tk: _tkinter.TkappType
     def __init__(self, master: tkinter.Misc | None = None) -> None: ...
-    def configure(self, style, query_opt=None, **kw):
+    # For these methods, values given vary between options. Returned values
+    # seem to be str, but this might not always be the case.
+    @overload
+    def configure(self, style: str) -> dict[str, Any] | None:  # Returns None if no configuration.
         """Query or sets the default value of the specified option(s) in
         style.
 
@@ -87,7 +153,12 @@ class Style:
         a sequence identifying the value for that option.
         """
 
-    def map(self, style, query_opt=None, **kw):
+    @overload
+    def configure(self, style: str, query_opt: str, **kw: Any) -> Any: ...
+    @overload
+    def configure(self, style: str, query_opt: None = None, **kw: Any) -> None: ...
+    @overload
+    def map(self, style: str, query_opt: str) -> _Statespec:
         """Query or sets dynamic values of the specified option(s) in
         style.
 
@@ -97,7 +168,9 @@ class Style:
         one or more states and then a value.
         """
 
-    def lookup(self, style, option, state=None, default=None):
+    @overload
+    def map(self, style: str, query_opt: None = None, **kw: Iterable[_Statespec]) -> dict[str, _Statespec]: ...
+    def lookup(self, style: str, option: str, state: Iterable[str] | None = None, default: Any | None = None) -> Any:
         """Returns the value specified for option in style.
 
         If state is specified it is expected to be a sequence of one
@@ -105,7 +178,8 @@ class Style:
         a fallback value in case no specification for option is found.
         """
 
-    def layout(self, style, layoutspec=None):
+    @overload
+    def layout(self, style: str, layoutspec: _LayoutSpec) -> list[Never]:  # Always seems to return an empty list
         """Define the widget layout for given style. If layoutspec is
         omitted, return the layout specification for given style.
 
@@ -139,16 +213,77 @@ class Style:
                     is a LAYOUT.
         """
 
-    def element_create(self, elementname, etype, *args, **kw) -> None:
+    @overload
+    def layout(self, style: str, layoutspec: None = None) -> _LayoutSpec: ...
+    @overload
+    def element_create(
+        self,
+        elementname: str,
+        etype: Literal["image"],
+        default_image: tkinter._Image | str,
+        /,
+        *imagespec: _ImageStatespec,
+        border: _Padding = ...,
+        height: float | str = ...,
+        padding: _Padding = ...,
+        sticky: str = ...,
+        width: float | str = ...,
+    ) -> None:
         """Create a new element in the current theme of given etype."""
 
-    def element_names(self):
+    @overload
+    def element_create(self, elementname: str, etype: Literal["from"], themename: str, fromelement: str = ..., /) -> None: ...
+    if sys.platform == "win32" and sys.version_info >= (3, 13):  # and tk version >= 8.6
+        # margin, padding, and (width + height) are mutually exclusive. width
+        # and height must either both be present or not present at all. Note:
+        # There are other undocumented options if you look at ttk's source code.
+        @overload
+        def element_create(
+            self,
+            elementname: str,
+            etype: Literal["vsapi"],
+            class_: str,
+            part: int,
+            vs_statespec: _VsapiStatespec = ...,
+            /,
+            *,
+            padding: _Padding = ...,
+        ) -> None:
+            """Create a new element in the current theme of given etype."""
+
+        @overload
+        def element_create(
+            self,
+            elementname: str,
+            etype: Literal["vsapi"],
+            class_: str,
+            part: int,
+            vs_statespec: _VsapiStatespec = ...,
+            /,
+            *,
+            margin: _Padding = ...,
+        ) -> None: ...
+        @overload
+        def element_create(
+            self,
+            elementname: str,
+            etype: Literal["vsapi"],
+            class_: str,
+            part: int,
+            vs_statespec: _VsapiStatespec = ...,
+            /,
+            *,
+            width: float | str,
+            height: float | str,
+        ) -> None: ...
+
+    def element_names(self) -> tuple[str, ...]:
         """Returns the list of elements defined in the current theme."""
 
-    def element_options(self, elementname):
+    def element_options(self, elementname: str) -> tuple[str, ...]:
         """Return the list of elementname's options."""
 
-    def theme_create(self, themename, parent=None, settings=None) -> None:
+    def theme_create(self, themename: str, parent: str | None = None, settings: _ThemeSettings | None = None) -> None:
         """Creates a new theme.
 
         It is an error if themename already exists. If parent is
@@ -157,7 +292,7 @@ class Style:
         they are expected to have the same syntax used for theme_settings.
         """
 
-    def theme_settings(self, themename, settings) -> None:
+    def theme_settings(self, themename: str, settings: _ThemeSettings) -> None:
         """Temporarily sets the current theme to themename, apply specified
         settings and then restore the previous theme.
 
@@ -239,16 +374,16 @@ class Button(Widget):
         master: tkinter.Misc | None = None,
         *,
         class_: str = "",
-        command: tkinter._ButtonCommand = "",
-        compound: _TtkCompound = "",
+        command: str | Callable[[], Any] = "",
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = "",
         cursor: tkinter._Cursor = "",
         default: Literal["normal", "active", "disabled"] = "normal",
-        image: tkinter._ImageSpec = "",
+        image: tkinter._Image | str = "",
         name: str = ...,
         padding=...,  # undocumented
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = "",
         textvariable: tkinter.Variable = ...,
         underline: int = -1,
@@ -271,15 +406,15 @@ class Button(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        command: tkinter._ButtonCommand = ...,
-        compound: _TtkCompound = ...,
+        command: str | Callable[[], Any] = ...,
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: tkinter._Cursor = ...,
         default: Literal["normal", "active", "disabled"] = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         padding=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: tkinter.Variable = ...,
         underline: int = ...,
@@ -306,17 +441,17 @@ class Checkbutton(Widget):
         master: tkinter.Misc | None = None,
         *,
         class_: str = "",
-        command: tkinter._ButtonCommand = "",
-        compound: _TtkCompound = "",
+        command: str | Callable[[], Any] = "",
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = "",
         cursor: tkinter._Cursor = "",
-        image: tkinter._ImageSpec = "",
+        image: tkinter._Image | str = "",
         name: str = ...,
         offvalue: Any = 0,
         onvalue: Any = 1,
         padding=...,  # undocumented
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = "",
         textvariable: tkinter.Variable = ...,
         underline: int = -1,
@@ -343,16 +478,16 @@ class Checkbutton(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        command: tkinter._ButtonCommand = ...,
-        compound: _TtkCompound = ...,
+        command: str | Callable[[], Any] = ...,
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: tkinter._Cursor = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         offvalue: Any = ...,
         onvalue: Any = ...,
         padding=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: tkinter.Variable = ...,
         underline: int = ...,
@@ -395,18 +530,18 @@ class Entry(Widget, tkinter.Entry):
         exportselection: bool = True,
         font: _FontDescription = "TkTextFont",
         foreground: str = "",
-        invalidcommand: tkinter._EntryValidateCommand = "",
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
         justify: Literal["left", "center", "right"] = "left",
         name: str = ...,
         show: str = "",
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = "none",
-        validatecommand: tkinter._EntryValidateCommand = "",
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
         width: int = 20,
-        xscrollcommand: tkinter._XYScrollCommand = "",
+        xscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Constructs a Ttk Entry widget with the parent master.
 
@@ -434,17 +569,17 @@ class Entry(Widget, tkinter.Entry):
         exportselection: bool = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        invalidcommand: tkinter._EntryValidateCommand = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         show: str = ...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: tkinter._EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         width: int = ...,
-        xscrollcommand: tkinter._XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -466,17 +601,17 @@ class Entry(Widget, tkinter.Entry):
         exportselection: bool = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        invalidcommand: tkinter._EntryValidateCommand = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         show: str = ...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: tkinter._EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         width: int = ...,
-        xscrollcommand: tkinter._XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -519,20 +654,20 @@ class Combobox(Entry):
         font: _FontDescription = ...,  # undocumented
         foreground: str = ...,  # undocumented
         height: int = 10,
-        invalidcommand: tkinter._EntryValidateCommand = ...,  # undocumented
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,  # undocumented
         justify: Literal["left", "center", "right"] = "left",
         name: str = ...,
         postcommand: Callable[[], object] | str = "",
         show=...,  # undocumented
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,  # undocumented
-        validatecommand: tkinter._EntryValidateCommand = ...,  # undocumented
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,  # undocumented
         values: list[str] | tuple[str, ...] = ...,
         width: int = 20,
-        xscrollcommand: tkinter._XYScrollCommand = ...,  # undocumented
+        xscrollcommand: str | Callable[[float, float], object] = ...,  # undocumented
     ) -> None:
         """Construct a Ttk Combobox widget with the parent master.
 
@@ -557,19 +692,19 @@ class Combobox(Entry):
         font: _FontDescription = ...,
         foreground: str = ...,
         height: int = ...,
-        invalidcommand: tkinter._EntryValidateCommand = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         postcommand: Callable[[], object] | str = ...,
         show=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: tkinter._EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         values: list[str] | tuple[str, ...] = ...,
         width: int = ...,
-        xscrollcommand: tkinter._XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -592,19 +727,19 @@ class Combobox(Entry):
         font: _FontDescription = ...,
         foreground: str = ...,
         height: int = ...,
-        invalidcommand: tkinter._EntryValidateCommand = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         postcommand: Callable[[], object] | str = ...,
         show=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: tkinter._EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         values: list[str] | tuple[str, ...] = ...,
         width: int = ...,
-        xscrollcommand: tkinter._XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -636,17 +771,17 @@ class Frame(Widget):
         self,
         master: tkinter.Misc | None = None,
         *,
-        border: tkinter._ScreenUnits = ...,
-        borderwidth: tkinter._ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         class_: str = "",
         cursor: tkinter._Cursor = "",
-        height: tkinter._ScreenUnits = 0,
+        height: float | str = 0,
         name: str = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
-        width: tkinter._ScreenUnits = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
+        width: float | str = 0,
     ) -> None:
         """Construct a Ttk Frame with parent master.
 
@@ -664,15 +799,15 @@ class Frame(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        border: tkinter._ScreenUnits = ...,
-        borderwidth: tkinter._ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: tkinter._Cursor = ...,
-        height: tkinter._ScreenUnits = ...,
+        height: float | str = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
-        width: tkinter._ScreenUnits = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -692,28 +827,28 @@ class Label(Widget):
         self,
         master: tkinter.Misc | None = None,
         *,
-        anchor: tkinter._Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = "",
-        border: tkinter._ScreenUnits = ...,  # alias for borderwidth
-        borderwidth: tkinter._ScreenUnits = ...,  # undocumented
+        border: float | str = ...,  # alias for borderwidth
+        borderwidth: float | str = ...,  # undocumented
         class_: str = "",
-        compound: _TtkCompound = "",
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = "",
         cursor: tkinter._Cursor = "",
         font: _FontDescription = ...,
         foreground: str = "",
-        image: tkinter._ImageSpec = "",
+        image: tkinter._Image | str = "",
         justify: Literal["left", "center", "right"] = ...,
         name: str = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         text: float | str = "",
         textvariable: tkinter.Variable = ...,
         underline: int = -1,
         width: int | Literal[""] = "",
-        wraplength: tkinter._ScreenUnits = ...,
+        wraplength: float | str = ...,
     ) -> None:
         """Construct a Ttk Label with parent master.
 
@@ -733,26 +868,26 @@ class Label(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        anchor: tkinter._Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         background: str = ...,
-        border: tkinter._ScreenUnits = ...,
-        borderwidth: tkinter._ScreenUnits = ...,
-        compound: _TtkCompound = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: tkinter._Cursor = ...,
         font: _FontDescription = ...,
         foreground: str = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         justify: Literal["left", "center", "right"] = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: tkinter.Variable = ...,
         underline: int = ...,
         width: int | Literal[""] = ...,
-        wraplength: tkinter._ScreenUnits = ...,
+        wraplength: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -775,21 +910,21 @@ class Labelframe(Widget):
         self,
         master: tkinter.Misc | None = None,
         *,
-        border: tkinter._ScreenUnits = ...,
-        borderwidth: tkinter._ScreenUnits = ...,  # undocumented
+        border: float | str = ...,
+        borderwidth: float | str = ...,  # undocumented
         class_: str = "",
         cursor: tkinter._Cursor = "",
-        height: tkinter._ScreenUnits = 0,
+        height: float | str = 0,
         labelanchor: Literal["nw", "n", "ne", "en", "e", "es", "se", "s", "sw", "ws", "w", "wn"] = ...,
         labelwidget: tkinter.Misc = ...,
         name: str = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,  # undocumented
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,  # undocumented
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         text: float | str = "",
         underline: int = -1,
-        width: tkinter._ScreenUnits = 0,
+        width: float | str = 0,
     ) -> None:
         """Construct a Ttk Labelframe with parent master.
 
@@ -807,19 +942,19 @@ class Labelframe(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        border: tkinter._ScreenUnits = ...,
-        borderwidth: tkinter._ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         cursor: tkinter._Cursor = ...,
-        height: tkinter._ScreenUnits = ...,
+        height: float | str = ...,
         labelanchor: Literal["nw", "n", "ne", "en", "e", "es", "se", "s", "sw", "ws", "w", "wn"] = ...,
         labelwidget: tkinter.Misc = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         underline: int = ...,
-        width: tkinter._ScreenUnits = ...,
+        width: float | str = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -844,16 +979,16 @@ class Menubutton(Widget):
         master: tkinter.Misc | None = None,
         *,
         class_: str = "",
-        compound: _TtkCompound = "",
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = "",
         cursor: tkinter._Cursor = "",
         direction: Literal["above", "below", "left", "right", "flush"] = "below",
-        image: tkinter._ImageSpec = "",
+        image: tkinter._Image | str = "",
         menu: tkinter.Menu = ...,
         name: str = ...,
         padding=...,  # undocumented
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = "",
         textvariable: tkinter.Variable = ...,
         underline: int = -1,
@@ -876,15 +1011,15 @@ class Menubutton(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        compound: _TtkCompound = ...,
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: tkinter._Cursor = ...,
         direction: Literal["above", "below", "left", "right", "flush"] = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         menu: tkinter.Menu = ...,
         padding=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: tkinter.Variable = ...,
         underline: int = ...,
@@ -917,7 +1052,7 @@ class Notebook(Widget):
         name: str = ...,
         padding: _Padding = ...,
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         width: int = 0,
     ) -> None:
         """Construct a Ttk Notebook with parent master.
@@ -958,7 +1093,7 @@ class Notebook(Widget):
         height: int = ...,
         padding: _Padding = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         width: int = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
@@ -982,7 +1117,7 @@ class Notebook(Widget):
         # `image` is a sequence of an image name, followed by zero or more
         # (sequences of one or more state names followed by an image name)
         image=...,
-        compound: tkinter._Compound = ...,
+        compound: Literal["top", "left", "center", "right", "bottom", "none"] = ...,
         underline: int = ...,
     ) -> None:
         """Adds a new tab to the notebook.
@@ -1080,7 +1215,7 @@ class Panedwindow(Widget, tkinter.PanedWindow):
         name: str = ...,
         orient: Literal["vertical", "horizontal"] = "vertical",  # can't be changed with configure()
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         width: int = 0,
     ) -> None:
         """Construct a Ttk Panedwindow with parent master.
@@ -1115,7 +1250,7 @@ class Panedwindow(Widget, tkinter.PanedWindow):
         cursor: tkinter._Cursor = ...,
         height: int = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         width: int = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
@@ -1136,7 +1271,7 @@ class Panedwindow(Widget, tkinter.PanedWindow):
         cursor: tkinter._Cursor = ...,
         height: int = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         width: int = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
@@ -1148,7 +1283,7 @@ class Panedwindow(Widget, tkinter.PanedWindow):
 
     @overload
     def config(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
-    forget: Incomplete
+    forget = tkinter.PanedWindow.forget
     def insert(self, pos, child, **kw) -> None:
         """Inserts a pane at the specified positions.
 
@@ -1192,14 +1327,14 @@ class Progressbar(Widget):
         *,
         class_: str = "",
         cursor: tkinter._Cursor = "",
-        length: tkinter._ScreenUnits = 100,
+        length: float | str = 100,
         maximum: float = 100,
         mode: Literal["determinate", "indeterminate"] = "determinate",
         name: str = ...,
         orient: Literal["horizontal", "vertical"] = "horizontal",
         phase: int = 0,  # docs say read-only but assigning int to this works
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
         value: float = 0.0,
         variable: tkinter.IntVar | tkinter.DoubleVar = ...,
     ) -> None:
@@ -1220,13 +1355,13 @@ class Progressbar(Widget):
         cnf: dict[str, Any] | None = None,
         *,
         cursor: tkinter._Cursor = ...,
-        length: tkinter._ScreenUnits = ...,
+        length: float | str = ...,
         maximum: float = ...,
         mode: Literal["determinate", "indeterminate"] = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         phase: int = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         value: float = ...,
         variable: tkinter.IntVar | tkinter.DoubleVar = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
@@ -1268,15 +1403,15 @@ class Radiobutton(Widget):
         master: tkinter.Misc | None = None,
         *,
         class_: str = "",
-        command: tkinter._ButtonCommand = "",
-        compound: _TtkCompound = "",
+        command: str | Callable[[], Any] = "",
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = "",
         cursor: tkinter._Cursor = "",
-        image: tkinter._ImageSpec = "",
+        image: tkinter._Image | str = "",
         name: str = ...,
         padding=...,  # undocumented
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = "",
         textvariable: tkinter.Variable = ...,
         underline: int = -1,
@@ -1301,14 +1436,14 @@ class Radiobutton(Widget):
         self,
         cnf: dict[str, Any] | None = None,
         *,
-        command: tkinter._ButtonCommand = ...,
-        compound: _TtkCompound = ...,
+        command: str | Callable[[], Any] = ...,
+        compound: Literal["", "text", "image", "top", "left", "center", "right", "bottom", "none"] = ...,
         cursor: tkinter._Cursor = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         padding=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         text: float | str = ...,
         textvariable: tkinter.Variable = ...,
         underline: int = ...,
@@ -1348,12 +1483,12 @@ class Scale(Widget, tkinter.Scale):  # type: ignore[misc]
         command: str | Callable[[str], object] = "",
         cursor: tkinter._Cursor = "",
         from_: float = 0,
-        length: tkinter._ScreenUnits = 100,
+        length: float | str = 100,
         name: str = ...,
         orient: Literal["horizontal", "vertical"] = "horizontal",
         state: str = ...,  # undocumented
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         to: float = 1.0,
         value: float = 0,
         variable: tkinter.IntVar | tkinter.DoubleVar = ...,
@@ -1377,11 +1512,11 @@ class Scale(Widget, tkinter.Scale):  # type: ignore[misc]
         command: str | Callable[[str], object] = ...,
         cursor: tkinter._Cursor = ...,
         from_: float = ...,
-        length: tkinter._ScreenUnits = ...,
+        length: float | str = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         to: float = ...,
         value: float = ...,
         variable: tkinter.IntVar | tkinter.DoubleVar = ...,
@@ -1403,11 +1538,11 @@ class Scale(Widget, tkinter.Scale):  # type: ignore[misc]
         command: str | Callable[[str], object] = ...,
         cursor: tkinter._Cursor = ...,
         from_: float = ...,
-        length: tkinter._ScreenUnits = ...,
+        length: float | str = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         to: float = ...,
         value: float = ...,
         variable: tkinter.IntVar | tkinter.DoubleVar = ...,
@@ -1443,7 +1578,7 @@ class Scrollbar(Widget, tkinter.Scrollbar):  # type: ignore[misc]
         name: str = ...,
         orient: Literal["horizontal", "vertical"] = "vertical",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
     ) -> None:
         """Construct a Ttk Scrollbar with parent master.
 
@@ -1465,7 +1600,7 @@ class Scrollbar(Widget, tkinter.Scrollbar):  # type: ignore[misc]
         cursor: tkinter._Cursor = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -1486,7 +1621,7 @@ class Scrollbar(Widget, tkinter.Scrollbar):  # type: ignore[misc]
         cursor: tkinter._Cursor = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -1512,7 +1647,7 @@ class Separator(Widget):
         name: str = ...,
         orient: Literal["horizontal", "vertical"] = "horizontal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
     ) -> None:
         """Construct a Ttk Separator with parent master.
 
@@ -1533,7 +1668,7 @@ class Separator(Widget):
         cursor: tkinter._Cursor = ...,
         orient: Literal["horizontal", "vertical"] = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -1559,7 +1694,7 @@ class Sizegrip(Widget):
         cursor: tkinter._Cursor = ...,
         name: str = ...,
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
     ) -> None:
         """Construct a Ttk Sizegrip with parent master.
 
@@ -1575,7 +1710,7 @@ class Sizegrip(Widget):
         *,
         cursor: tkinter._Cursor = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -1609,21 +1744,21 @@ class Spinbox(Entry):
         format: str = "",
         from_: float = 0,
         increment: float = 1,
-        invalidcommand: tkinter._EntryValidateCommand = ...,  # undocumented
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,  # undocumented
         justify: Literal["left", "center", "right"] = ...,  # undocumented
         name: str = ...,
         show=...,  # undocumented
         state: str = "normal",
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,  # undocumented
         to: float = 0,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = "none",
-        validatecommand: tkinter._EntryValidateCommand = "",
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = "",
         values: list[str] | tuple[str, ...] = ...,
         width: int = ...,  # undocumented
         wrap: bool = False,
-        xscrollcommand: tkinter._XYScrollCommand = "",
+        xscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Construct a Ttk Spinbox widget with the parent master.
 
@@ -1651,20 +1786,20 @@ class Spinbox(Entry):
         format: str = ...,
         from_: float = ...,
         increment: float = ...,
-        invalidcommand: tkinter._EntryValidateCommand = ...,
+        invalidcommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         justify: Literal["left", "center", "right"] = ...,
         show=...,
         state: str = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
         textvariable: tkinter.Variable = ...,
         to: float = ...,
         validate: Literal["none", "focus", "focusin", "focusout", "key", "all"] = ...,
-        validatecommand: tkinter._EntryValidateCommand = ...,
+        validatecommand: str | list[str] | tuple[str, ...] | Callable[[], bool] = ...,
         values: list[str] | tuple[str, ...] = ...,
         width: int = ...,
         wrap: bool = ...,
-        xscrollcommand: tkinter._XYScrollCommand = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -1699,7 +1834,7 @@ class _TreeviewTagDict(TypedDict):
 class _TreeviewHeaderDict(TypedDict):
     text: str
     image: list[str] | Literal[""]
-    anchor: tkinter._Anchor
+    anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"]
     command: str
     state: str  # Doesn't seem to appear anywhere else than in these dicts
 
@@ -1708,7 +1843,7 @@ class _TreeviewColumnDict(TypedDict):
     width: int
     minwidth: int
     stretch: bool  # actually 0 or 1
-    anchor: tkinter._Anchor
+    anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"]
     id: str
 
 class Treeview(Widget, tkinter.XView, tkinter.YView):
@@ -1737,9 +1872,9 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         # surprised if someone is using it.
         show: Literal["tree", "headings", "tree headings", ""] | list[str] | tuple[str, ...] = ("tree", "headings"),
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = ...,
-        xscrollcommand: tkinter._XYScrollCommand = "",
-        yscrollcommand: tkinter._XYScrollCommand = "",
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        xscrollcommand: str | Callable[[float, float], object] = "",
+        yscrollcommand: str | Callable[[float, float], object] = "",
     ) -> None:
         """Construct a Ttk Treeview with parent master.
 
@@ -1774,9 +1909,9 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         selectmode: Literal["extended", "browse", "none"] = ...,
         show: Literal["tree", "headings", "tree headings", ""] | list[str] | tuple[str, ...] = ...,
         style: str = ...,
-        takefocus: tkinter._TakeFocusValue = ...,
-        xscrollcommand: tkinter._XYScrollCommand = ...,
-        yscrollcommand: tkinter._XYScrollCommand = ...,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
+        xscrollcommand: str | Callable[[float, float], object] = ...,
+        yscrollcommand: str | Callable[[float, float], object] = ...,
     ) -> dict[str, tuple[str, str, str, Any, Any]] | None:
         """Configure resources of a widget.
 
@@ -1837,7 +1972,7 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         width: int = ...,
         minwidth: int = ...,
         stretch: bool = ...,
-        anchor: tkinter._Anchor = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         # id is read-only
     ) -> _TreeviewColumnDict | None: ...
     def delete(self, *items: str | int) -> None:
@@ -1907,8 +2042,8 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         option: None = None,
         *,
         text: str = ...,
-        image: tkinter._ImageSpec = ...,
-        anchor: tkinter._Anchor = ...,
+        image: tkinter._Image | str = ...,
+        anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
         command: str | Callable[[], object] = ...,
     ) -> None: ...
     # Internal Method. Leave untyped:
@@ -1957,7 +2092,7 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         *,
         id: str | int = ...,  # same as iid
         text: str = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         values: list[Any] | tuple[Any, ...] = ...,
         open: bool = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
@@ -2005,7 +2140,7 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         option: None = None,
         *,
         text: str = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
         values: list[Any] | tuple[Any, ...] | Literal[""] = ...,
         open: bool = ...,
         tags: str | list[str] | tuple[str, ...] = ...,
@@ -2122,7 +2257,7 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         foreground: str = ...,
         background: str = ...,
         font: _FontDescription = ...,
-        image: tkinter._ImageSpec = ...,
+        image: tkinter._Image | str = ...,
     ) -> _TreeviewTagDict | MaybeNone: ...  # can be None but annoying to check
     @overload
     def tag_has(self, tagname: str, item: None = None) -> tuple[str, ...]:
@@ -2155,18 +2290,18 @@ class LabeledScale(Frame):
         from_: float = 0,
         to: float = 10,
         *,
-        border: tkinter._ScreenUnits = ...,
-        borderwidth: tkinter._ScreenUnits = ...,
+        border: float | str = ...,
+        borderwidth: float | str = ...,
         class_: str = "",
         compound: Literal["top", "bottom"] = "top",
         cursor: tkinter._Cursor = "",
-        height: tkinter._ScreenUnits = 0,
+        height: float | str = 0,
         name: str = ...,
         padding: _Padding = ...,
-        relief: tkinter._Relief = ...,
+        relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
         style: str = "",
-        takefocus: tkinter._TakeFocusValue = "",
-        width: tkinter._ScreenUnits = 0,
+        takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
+        width: float | str = 0,
     ) -> None:
         """Construct a horizontal LabeledScale with parent master, a
         variable to be associated with the Ttk Scale widget and its range.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tokenize.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tokenize.pyi
index c049515d85..9dad927315 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tokenize.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tokenize.pyi
@@ -25,8 +25,8 @@ from _typeshed import FileDescriptorOrPath
 from collections.abc import Callable, Generator, Iterable, Sequence
 from re import Pattern
 from token import *
-from typing import Any, NamedTuple, TextIO, type_check_only
-from typing_extensions import TypeAlias
+from typing import Any, Final, NamedTuple, TextIO, type_check_only
+from typing_extensions import TypeAlias, disjoint_base
 
 if sys.version_info < (3, 12):
     # Avoid double assignment to Final name by imports, which pyright objects to.
@@ -123,8 +123,8 @@ if sys.version_info >= (3, 13):
 if sys.version_info >= (3, 14):
     __all__ += ["TSTRING_START", "TSTRING_MIDDLE", "TSTRING_END"]
 
-cookie_re: Pattern[str]
-blank_re: Pattern[bytes]
+cookie_re: Final[Pattern[str]]
+blank_re: Final[Pattern[bytes]]
 
 _Position: TypeAlias = tuple[int, int]
 
@@ -137,9 +137,16 @@ class _TokenInfo(NamedTuple):
     end: _Position
     line: str
 
-class TokenInfo(_TokenInfo):
-    @property
-    def exact_type(self) -> int: ...
+if sys.version_info >= (3, 12):
+    class TokenInfo(_TokenInfo):
+        @property
+        def exact_type(self) -> int: ...
+
+else:
+    @disjoint_base
+    class TokenInfo(_TokenInfo):
+        @property
+        def exact_type(self) -> int: ...
 
 # Backwards compatible tokens can be sequences of a shorter length too
 _Token: TypeAlias = TokenInfo | Sequence[int | str | _Position]
@@ -238,46 +245,46 @@ def group(*choices: str) -> str: ...  # undocumented
 def any(*choices: str) -> str: ...  # undocumented
 def maybe(*choices: str) -> str: ...  # undocumented
 
-Whitespace: str  # undocumented
-Comment: str  # undocumented
-Ignore: str  # undocumented
-Name: str  # undocumented
+Whitespace: Final[str]  # undocumented
+Comment: Final[str]  # undocumented
+Ignore: Final[str]  # undocumented
+Name: Final[str]  # undocumented
 
-Hexnumber: str  # undocumented
-Binnumber: str  # undocumented
-Octnumber: str  # undocumented
-Decnumber: str  # undocumented
-Intnumber: str  # undocumented
-Exponent: str  # undocumented
-Pointfloat: str  # undocumented
-Expfloat: str  # undocumented
-Floatnumber: str  # undocumented
-Imagnumber: str  # undocumented
-Number: str  # undocumented
+Hexnumber: Final[str]  # undocumented
+Binnumber: Final[str]  # undocumented
+Octnumber: Final[str]  # undocumented
+Decnumber: Final[str]  # undocumented
+Intnumber: Final[str]  # undocumented
+Exponent: Final[str]  # undocumented
+Pointfloat: Final[str]  # undocumented
+Expfloat: Final[str]  # undocumented
+Floatnumber: Final[str]  # undocumented
+Imagnumber: Final[str]  # undocumented
+Number: Final[str]  # undocumented
 
 def _all_string_prefixes() -> set[str]: ...  # undocumented
 
-StringPrefix: str  # undocumented
+StringPrefix: Final[str]  # undocumented
 
-Single: str  # undocumented
-Double: str  # undocumented
-Single3: str  # undocumented
-Double3: str  # undocumented
-Triple: str  # undocumented
-String: str  # undocumented
+Single: Final[str]  # undocumented
+Double: Final[str]  # undocumented
+Single3: Final[str]  # undocumented
+Double3: Final[str]  # undocumented
+Triple: Final[str]  # undocumented
+String: Final[str]  # undocumented
 
-Special: str  # undocumented
-Funny: str  # undocumented
+Special: Final[str]  # undocumented
+Funny: Final[str]  # undocumented
 
-PlainToken: str  # undocumented
-Token: str  # undocumented
+PlainToken: Final[str]  # undocumented
+Token: Final[str]  # undocumented
 
-ContStr: str  # undocumented
-PseudoExtras: str  # undocumented
-PseudoToken: str  # undocumented
+ContStr: Final[str]  # undocumented
+PseudoExtras: Final[str]  # undocumented
+PseudoToken: Final[str]  # undocumented
 
-endpats: dict[str, str]  # undocumented
-single_quoted: set[str]  # undocumented
-triple_quoted: set[str]  # undocumented
+endpats: Final[dict[str, str]]  # undocumented
+single_quoted: Final[set[str]]  # undocumented
+triple_quoted: Final[set[str]]  # undocumented
 
-tabsize: int  # undocumented
+tabsize: Final = 8  # undocumented
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tomllib.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tomllib.pyi
index c9024b51e8..81a39b0ded 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tomllib.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tomllib.pyi
@@ -26,7 +26,7 @@ if sys.version_info >= (3, 14):
         @overload
         def __init__(self, msg: str, doc: str, pos: int) -> None: ...
         @overload
-        @deprecated("Deprecated in Python 3.14; Please set 'msg', 'doc' and 'pos' arguments only.")
+        @deprecated("Deprecated since Python 3.14. Set the 'msg', 'doc' and 'pos' arguments only.")
         def __init__(self, msg: str | type = ..., doc: str | type = ..., pos: int | type = ..., *args: Any) -> None: ...
 
 else:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/traceback.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/traceback.pyi
index 2ae3020325..4aa3b7a492 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/traceback.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/traceback.pyi
@@ -333,7 +333,7 @@ class TracebackException:
         @property
         def exc_type_str(self) -> str: ...
         @property
-        @deprecated("Deprecated in 3.13. Use exc_type_str instead.")
+        @deprecated("Deprecated since Python 3.13. Use `exc_type_str` instead.")
         def exc_type(self) -> type[BaseException] | None: ...
     else:
         exc_type: type[BaseException]
@@ -505,6 +505,23 @@ class FrameSummary:
       mapping the name to the repr() of the variable.
     """
 
+    if sys.version_info >= (3, 13):
+        __slots__ = (
+            "filename",
+            "lineno",
+            "end_lineno",
+            "colno",
+            "end_colno",
+            "name",
+            "_lines",
+            "_lines_dedented",
+            "locals",
+            "_code",
+        )
+    elif sys.version_info >= (3, 11):
+        __slots__ = ("filename", "lineno", "end_lineno", "colno", "end_colno", "name", "_line", "locals")
+    else:
+        __slots__ = ("filename", "lineno", "name", "_line", "locals")
     if sys.version_info >= (3, 11):
         def __init__(
             self,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/tracemalloc.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/tracemalloc.pyi
index dd47525911..5a5bb84085 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/tracemalloc.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/tracemalloc.pyi
@@ -47,6 +47,7 @@ class Statistic:
     Statistic difference on memory allocations between two Snapshot instance.
     """
 
+    __slots__ = ("traceback", "size", "count")
     count: int
     size: int
     traceback: Traceback
@@ -60,6 +61,7 @@ class StatisticDiff:
     Snapshot instance.
     """
 
+    __slots__ = ("traceback", "size", "size_diff", "count", "count_diff")
     count: int
     count_diff: int
     size: int
@@ -76,6 +78,7 @@ class Frame:
     Frame of a traceback.
     """
 
+    __slots__ = ("_frame",)
     @property
     def filename(self) -> str: ...
     @property
@@ -110,6 +113,7 @@ class Trace:
     Trace of a memory block.
     """
 
+    __slots__ = ("_trace",)
     @property
     def domain(self) -> int: ...
     @property
@@ -126,6 +130,7 @@ class Traceback(Sequence[Frame]):
     to the most recent frame.
     """
 
+    __slots__ = ("_frames", "_total_nframe")
     @property
     def total_nframe(self) -> int | None: ...
     def __init__(self, frames: Sequence[_FrameTuple], total_nframe: int | None = None) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/turtle.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/turtle.pyi
index 8fbdfbc3be..b0e7c1bf29 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/turtle.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/turtle.pyi
@@ -81,7 +81,7 @@ from collections.abc import Callable, Generator, Sequence
 from contextlib import contextmanager
 from tkinter import Canvas, Frame, Misc, PhotoImage, Scrollbar
 from typing import Any, ClassVar, Literal, TypedDict, overload, type_check_only
-from typing_extensions import Self, TypeAlias, deprecated
+from typing_extensions import Self, TypeAlias, deprecated, disjoint_base
 
 __all__ = [
     "ScrolledCanvas",
@@ -240,33 +240,64 @@ class _PenState(TypedDict):
 _Speed: TypeAlias = str | float
 _PolygonCoords: TypeAlias = Sequence[tuple[float, float]]
 
-class Vec2D(tuple[float, float]):
-    """A 2 dimensional vector class, used as a helper class
-    for implementing turtle graphics.
-    May be useful for turtle graphics programs also.
-    Derived from tuple, so a vector is a tuple!
+if sys.version_info >= (3, 12):
+    class Vec2D(tuple[float, float]):
+        """A 2 dimensional vector class, used as a helper class
+        for implementing turtle graphics.
+        May be useful for turtle graphics programs also.
+        Derived from tuple, so a vector is a tuple!
 
-    Provides (for a, b vectors, k number):
-       a+b vector addition
-       a-b vector subtraction
-       a*b inner product
-       k*a and a*k multiplication with scalar
-       |a| absolute value of a
-       a.rotate(angle) rotation
-    """
+        Provides (for a, b vectors, k number):
+           a+b vector addition
+           a-b vector subtraction
+           a*b inner product
+           k*a and a*k multiplication with scalar
+           |a| absolute value of a
+           a.rotate(angle) rotation
+        """
 
-    def __new__(cls, x: float, y: float) -> Self: ...
-    def __add__(self, other: tuple[float, float]) -> Vec2D: ...  # type: ignore[override]
-    @overload  # type: ignore[override]
-    def __mul__(self, other: Vec2D) -> float: ...
-    @overload
-    def __mul__(self, other: float) -> Vec2D: ...
-    def __rmul__(self, other: float) -> Vec2D: ...  # type: ignore[override]
-    def __sub__(self, other: tuple[float, float]) -> Vec2D: ...
-    def __neg__(self) -> Vec2D: ...
-    def __abs__(self) -> float: ...
-    def rotate(self, angle: float) -> Vec2D:
-        """rotate self counterclockwise by angle"""
+        def __new__(cls, x: float, y: float) -> Self: ...
+        def __add__(self, other: tuple[float, float]) -> Vec2D: ...  # type: ignore[override]
+        @overload  # type: ignore[override]
+        def __mul__(self, other: Vec2D) -> float: ...
+        @overload
+        def __mul__(self, other: float) -> Vec2D: ...
+        def __rmul__(self, other: float) -> Vec2D: ...  # type: ignore[override]
+        def __sub__(self, other: tuple[float, float]) -> Vec2D: ...
+        def __neg__(self) -> Vec2D: ...
+        def __abs__(self) -> float: ...
+        def rotate(self, angle: float) -> Vec2D:
+            """rotate self counterclockwise by angle"""
+
+else:
+    @disjoint_base
+    class Vec2D(tuple[float, float]):
+        """A 2 dimensional vector class, used as a helper class
+        for implementing turtle graphics.
+        May be useful for turtle graphics programs also.
+        Derived from tuple, so a vector is a tuple!
+
+        Provides (for a, b vectors, k number):
+           a+b vector addition
+           a-b vector subtraction
+           a*b inner product
+           k*a and a*k multiplication with scalar
+           |a| absolute value of a
+           a.rotate(angle) rotation
+        """
+
+        def __new__(cls, x: float, y: float) -> Self: ...
+        def __add__(self, other: tuple[float, float]) -> Vec2D: ...  # type: ignore[override]
+        @overload  # type: ignore[override]
+        def __mul__(self, other: Vec2D) -> float: ...
+        @overload
+        def __mul__(self, other: float) -> Vec2D: ...
+        def __rmul__(self, other: float) -> Vec2D: ...  # type: ignore[override]
+        def __sub__(self, other: tuple[float, float]) -> Vec2D: ...
+        def __neg__(self) -> Vec2D: ...
+        def __abs__(self) -> float: ...
+        def rotate(self, angle: float) -> Vec2D:
+            """rotate self counterclockwise by angle"""
 
 # Does not actually inherit from Canvas, but dynamically gets all methods of Canvas
 class ScrolledCanvas(Canvas, Frame):  # type: ignore[misc]
@@ -368,7 +399,9 @@ class Shape:
     an image or a list constructed using the addcomponent method.
     """
 
-    def __init__(self, type_: str, data: _PolygonCoords | PhotoImage | None = None) -> None: ...
+    def __init__(
+        self, type_: Literal["polygon", "image", "compound"], data: _PolygonCoords | PhotoImage | None = None
+    ) -> None: ...
     def addcomponent(self, poly: _PolygonCoords, fill: _Color, outline: _Color | None = None) -> None:
         """Add component to a shape of type compound.
 
@@ -394,7 +427,9 @@ class TurtleScreen(TurtleScreenBase):
     which is Tkinter in this case.
     """
 
-    def __init__(self, cv: Canvas, mode: str = "standard", colormode: float = 1.0, delay: int = 10) -> None: ...
+    def __init__(
+        self, cv: Canvas, mode: Literal["standard", "logo", "world"] = "standard", colormode: float = 1.0, delay: int = 10
+    ) -> None: ...
     def clear(self) -> None:
         """Delete all drawings and all turtles from the TurtleScreen.
 
@@ -434,7 +469,7 @@ class TurtleScreen(TurtleScreenBase):
         """
 
     @overload
-    def mode(self, mode: str) -> None: ...
+    def mode(self, mode: Literal["standard", "logo", "world"]) -> None: ...
     def setworldcoordinates(self, llx: float, lly: float, urx: float, ury: float) -> None:
         """Set up a user defined coordinate-system.
 
@@ -801,7 +836,7 @@ class TNavigator:
     DEFAULT_MODE: str
     DEFAULT_ANGLEOFFSET: int
     DEFAULT_ANGLEORIENT: int
-    def __init__(self, mode: str = "standard") -> None: ...
+    def __init__(self, mode: Literal["standard", "logo", "world"] = "standard") -> None: ...
     def reset(self) -> None:
         """reset turtle to its initial values
 
@@ -1183,7 +1218,7 @@ class TPen:
     Implements drawing properties.
     """
 
-    def __init__(self, resizemode: str = "noresize") -> None: ...
+    def __init__(self, resizemode: Literal["auto", "user", "noresize"] = "noresize") -> None: ...
     @overload
     def resizemode(self, rmode: None = None) -> str:
         """Set resizemode to one of the values: "auto", "user", "noresize".
@@ -1209,7 +1244,7 @@ class TPen:
         """
 
     @overload
-    def resizemode(self, rmode: str) -> None: ...
+    def resizemode(self, rmode: Literal["auto", "user", "noresize"]) -> None: ...
     @overload
     def pensize(self, width: None = None) -> int:
         """Set or return the line thickness.
@@ -1512,7 +1547,7 @@ class TPen:
         fillcolor: _Color = ...,
         pensize: int = ...,
         speed: int = ...,
-        resizemode: str = ...,
+        resizemode: Literal["auto", "user", "noresize"] = ...,
         stretchfactor: tuple[float, float] = ...,
         outline: int = ...,
         tilt: float = ...,
@@ -1899,7 +1934,8 @@ class RawTurtle(TPen, TNavigator):  # type: ignore[misc]  # Conflicting methods
         >>> turtle.end_fill()
         """
 
-    def dot(self, size: int | None = None, *color: _Color) -> None:
+    @overload
+    def dot(self, size: int | _Color | None = None) -> None:
         """Draw a dot with diameter size, using color.
 
         Optional arguments:
@@ -1914,6 +1950,10 @@ class RawTurtle(TPen, TNavigator):  # type: ignore[misc]  # Conflicting methods
         >>> turtle.fd(50); turtle.dot(20, "blue"); turtle.fd(50)
         """
 
+    @overload
+    def dot(self, size: int | None, color: _Color, /) -> None: ...
+    @overload
+    def dot(self, size: int | None, r: float, g: float, b: float, /) -> None: ...
     def write(
         self, arg: object, move: bool = False, align: str = "left", font: tuple[str, int, str] = ("Arial", 8, "normal")
     ) -> None:
@@ -2288,7 +2328,7 @@ def mode(mode: None = None) -> str:
     """
 
 @overload
-def mode(mode: str) -> None: ...
+def mode(mode: Literal["standard", "logo", "world"]) -> None: ...
 def setworldcoordinates(llx: float, lly: float, urx: float, ury: float) -> None:
     """Set up a user defined coordinate-system.
 
@@ -3130,7 +3170,7 @@ def resizemode(rmode: None = None) -> str:
     """
 
 @overload
-def resizemode(rmode: str) -> None: ...
+def resizemode(rmode: Literal["auto", "user", "noresize"]) -> None: ...
 @overload
 def pensize(width: None = None) -> int:
     """Set or return the line thickness.
@@ -3427,7 +3467,7 @@ def pen(
     fillcolor: _Color = ...,
     pensize: int = ...,
     speed: int = ...,
-    resizemode: str = ...,
+    resizemode: Literal["auto", "user", "noresize"] = ...,
     stretchfactor: tuple[float, float] = ...,
     outline: int = ...,
     tilt: float = ...,
@@ -3796,7 +3836,8 @@ def end_fill() -> None:
     >>> end_fill()
     """
 
-def dot(size: int | None = None, *color: _Color) -> None:
+@overload
+def dot(size: int | _Color | None = None) -> None:
     """Draw a dot with diameter size, using color.
 
     Optional arguments:
@@ -3811,6 +3852,10 @@ def dot(size: int | None = None, *color: _Color) -> None:
     >>> fd(50); dot(20, "blue"); fd(50)
     """
 
+@overload
+def dot(size: int | None, color: _Color, /) -> None: ...
+@overload
+def dot(size: int | None, r: float, g: float, b: float, /) -> None: ...
 def write(arg: object, move: bool = False, align: str = "left", font: tuple[str, int, str] = ("Arial", 8, "normal")) -> None:
     """Write text at the current turtle position.
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/types.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/types.pyi
index d946703ee0..9c428718da 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/types.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/types.pyi
@@ -21,7 +21,7 @@ from collections.abc import (
 )
 from importlib.machinery import ModuleSpec
 from typing import Any, ClassVar, Literal, TypeVar, final, overload
-from typing_extensions import ParamSpec, Self, TypeAliasType, TypeVarTuple, deprecated
+from typing_extensions import ParamSpec, Self, TypeAliasType, TypeVarTuple, deprecated, disjoint_base
 
 if sys.version_info >= (3, 14):
     from _typeshed import AnnotateFunc
@@ -69,7 +69,7 @@ if sys.version_info >= (3, 13):
 
 _T1 = TypeVar("_T1")
 _T2 = TypeVar("_T2")
-_KT = TypeVar("_KT")
+_KT_co = TypeVar("_KT_co", covariant=True)
 _VT_co = TypeVar("_VT_co", covariant=True)
 
 # Make sure this class definition stays roughly in line with `builtins.function`
@@ -177,7 +177,7 @@ class CodeType:
     def co_firstlineno(self) -> int: ...
     if sys.version_info >= (3, 10):
         @property
-        @deprecated("Will be removed in Python 3.15. Use the co_lines() method instead.")
+        @deprecated("Deprecated since Python 3.10; will be removed in Python 3.15. Use `CodeType.co_lines()` instead.")
         def co_lnotab(self) -> bytes: ...
     else:
         @property
@@ -337,70 +337,89 @@ class CodeType:
         __replace__ = replace
 
 @final
-class MappingProxyType(Mapping[_KT, _VT_co]):
+class MappingProxyType(Mapping[_KT_co, _VT_co]):  # type: ignore[type-var]  # pyright: ignore[reportInvalidTypeArguments]
     """Read-only proxy of a mapping."""
 
     __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __new__(cls, mapping: SupportsKeysAndGetItem[_KT, _VT_co]) -> Self: ...
-    def __getitem__(self, key: _KT, /) -> _VT_co:
+    def __new__(cls, mapping: SupportsKeysAndGetItem[_KT_co, _VT_co]) -> Self: ...
+    def __getitem__(self, key: _KT_co, /) -> _VT_co:  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
         """Return self[key]."""
 
-    def __iter__(self) -> Iterator[_KT]:
+    def __iter__(self) -> Iterator[_KT_co]:
         """Implement iter(self)."""
 
     def __len__(self) -> int:
         """Return len(self)."""
 
     def __eq__(self, value: object, /) -> bool: ...
-    def copy(self) -> dict[_KT, _VT_co]:
+    def copy(self) -> dict[_KT_co, _VT_co]:
         """D.copy() -> a shallow copy of D"""
 
-    def keys(self) -> KeysView[_KT]:
+    def keys(self) -> KeysView[_KT_co]:
         """D.keys() -> a set-like object providing a view on D's keys"""
 
     def values(self) -> ValuesView[_VT_co]:
         """D.values() -> an object providing a view on D's values"""
 
-    def items(self) -> ItemsView[_KT, _VT_co]:
+    def items(self) -> ItemsView[_KT_co, _VT_co]:
         """D.items() -> a set-like object providing a view on D's items"""
 
     @overload
-    def get(self, key: _KT, /) -> _VT_co | None:
+    def get(self, key: _KT_co, /) -> _VT_co | None:  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
         """Return the value for key if key is in the mapping, else default."""
 
     @overload
-    def get(self, key: _KT, default: _VT_co, /) -> _VT_co: ...  # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
+    def get(self, key: _KT_co, default: _VT_co, /) -> _VT_co: ...  # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
     @overload
-    def get(self, key: _KT, default: _T2, /) -> _VT_co | _T2: ...
+    def get(self, key: _KT_co, default: _T2, /) -> _VT_co | _T2: ...  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
     def __class_getitem__(cls, item: Any, /) -> GenericAlias:
         """See PEP 585"""
 
-    def __reversed__(self) -> Iterator[_KT]:
+    def __reversed__(self) -> Iterator[_KT_co]:
         """D.__reversed__() -> reverse iterator"""
 
-    def __or__(self, value: Mapping[_T1, _T2], /) -> dict[_KT | _T1, _VT_co | _T2]:
+    def __or__(self, value: Mapping[_T1, _T2], /) -> dict[_KT_co | _T1, _VT_co | _T2]:
         """Return self|value."""
 
-    def __ror__(self, value: Mapping[_T1, _T2], /) -> dict[_KT | _T1, _VT_co | _T2]:
+    def __ror__(self, value: Mapping[_T1, _T2], /) -> dict[_KT_co | _T1, _VT_co | _T2]:
         """Return value|self."""
 
-class SimpleNamespace:
-    """A simple attribute-based namespace."""
+if sys.version_info >= (3, 12):
+    @disjoint_base
+    class SimpleNamespace:
+        """A simple attribute-based namespace."""
 
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    if sys.version_info >= (3, 13):
-        def __init__(self, mapping_or_iterable: Mapping[str, Any] | Iterable[tuple[str, Any]] = (), /, **kwargs: Any) -> None: ...
-    else:
+        __hash__: ClassVar[None]  # type: ignore[assignment]
+        if sys.version_info >= (3, 13):
+            def __init__(
+                self, mapping_or_iterable: Mapping[str, Any] | Iterable[tuple[str, Any]] = (), /, **kwargs: Any
+            ) -> None: ...
+        else:
+            def __init__(self, **kwargs: Any) -> None: ...
+
+        def __eq__(self, value: object, /) -> bool: ...
+        def __getattribute__(self, name: str, /) -> Any: ...
+        def __setattr__(self, name: str, value: Any, /) -> None: ...
+        def __delattr__(self, name: str, /) -> None: ...
+        if sys.version_info >= (3, 13):
+            def __replace__(self, **kwargs: Any) -> Self:
+                """Return a copy of the namespace object with new values for the specified attributes."""
+
+else:
+    class SimpleNamespace:
+        """A simple attribute-based namespace.
+
+        SimpleNamespace(**kwargs)
+        """
+
+        __hash__: ClassVar[None]  # type: ignore[assignment]
         def __init__(self, **kwargs: Any) -> None: ...
+        def __eq__(self, value: object, /) -> bool: ...
+        def __getattribute__(self, name: str, /) -> Any: ...
+        def __setattr__(self, name: str, value: Any, /) -> None: ...
+        def __delattr__(self, name: str, /) -> None: ...
 
-    def __eq__(self, value: object, /) -> bool: ...
-    def __getattribute__(self, name: str, /) -> Any: ...
-    def __setattr__(self, name: str, value: Any, /) -> None: ...
-    def __delattr__(self, name: str, /) -> None: ...
-    if sys.version_info >= (3, 13):
-        def __replace__(self, **kwargs: Any) -> Self:
-            """Return a copy of the namespace object with new values for the specified attributes."""
-
+@disjoint_base
 class ModuleType:
     """Create a module object.
 
@@ -448,8 +467,8 @@ class CellType:
     cell_contents: Any
 
 _YieldT_co = TypeVar("_YieldT_co", covariant=True)
-_SendT_contra = TypeVar("_SendT_contra", contravariant=True)
-_ReturnT_co = TypeVar("_ReturnT_co", covariant=True)
+_SendT_contra = TypeVar("_SendT_contra", contravariant=True, default=None)
+_ReturnT_co = TypeVar("_ReturnT_co", covariant=True, default=None)
 
 @final
 class GeneratorType(Generator[_YieldT_co, _SendT_contra, _ReturnT_co]):
@@ -542,8 +561,12 @@ class AsyncGeneratorType(AsyncGenerator[_YieldT_co, _SendT_contra]):
     def __class_getitem__(cls, item: Any, /) -> GenericAlias:
         """See PEP 585"""
 
+# Non-default variations to accommodate coroutines
+_SendT_nd_contra = TypeVar("_SendT_nd_contra", contravariant=True)
+_ReturnT_nd_co = TypeVar("_ReturnT_nd_co", covariant=True)
+
 @final
-class CoroutineType(Coroutine[_YieldT_co, _SendT_contra, _ReturnT_co]):
+class CoroutineType(Coroutine[_YieldT_co, _SendT_nd_contra, _ReturnT_nd_co]):
     __name__: str
     __qualname__: str
     @property
@@ -552,8 +575,13 @@ class CoroutineType(Coroutine[_YieldT_co, _SendT_contra, _ReturnT_co]):
 
     @property
     def cr_code(self) -> CodeType: ...
-    @property
-    def cr_frame(self) -> FrameType: ...
+    if sys.version_info >= (3, 12):
+        @property
+        def cr_frame(self) -> FrameType | None: ...
+    else:
+        @property
+        def cr_frame(self) -> FrameType: ...
+
     @property
     def cr_running(self) -> bool: ...
     @property
@@ -565,10 +593,10 @@ class CoroutineType(Coroutine[_YieldT_co, _SendT_contra, _ReturnT_co]):
     def close(self) -> None:
         """close() -> raise GeneratorExit inside coroutine."""
 
-    def __await__(self) -> Generator[Any, None, _ReturnT_co]:
+    def __await__(self) -> Generator[Any, None, _ReturnT_nd_co]:
         """Return an iterator to be used in await expression."""
 
-    def send(self, arg: _SendT_contra, /) -> _YieldT_co:
+    def send(self, arg: _SendT_nd_contra, /) -> _YieldT_co:
         """send(arg) -> send 'arg' into coroutine,
         return next iterated value or raise StopIteration.
         """
@@ -881,7 +909,7 @@ def coroutine(func: Callable[_P, Generator[Any, Any, _R]]) -> Callable[_P, Await
 
 @overload
 def coroutine(func: _Fn) -> _Fn: ...
-
+@disjoint_base
 class GenericAlias:
     """Represent a PEP 585 generic type
 
@@ -944,15 +972,24 @@ if sys.version_info >= (3, 10):
         @property
         def __parameters__(self) -> tuple[Any, ...]:
             """Type variables in the types.UnionType."""
-
-        def __or__(self, value: Any, /) -> UnionType:
+        # `(int | str) | Literal["foo"]` returns a generic alias to an instance of `_SpecialForm` (`Union`).
+        # Normally we'd express this using the return type of `_SpecialForm.__ror__`,
+        # but because `UnionType.__or__` accepts `Any`, type checkers will use
+        # the return type of `UnionType.__or__` to infer the result of this operation
+        # rather than `_SpecialForm.__ror__`. To mitigate this, we use `| Any`
+        # in the return type of `UnionType.__(r)or__`.
+        def __or__(self, value: Any, /) -> UnionType | Any:
             """Return self|value."""
 
-        def __ror__(self, value: Any, /) -> UnionType:
+        def __ror__(self, value: Any, /) -> UnionType | Any:
             """Return value|self."""
 
         def __eq__(self, value: object, /) -> bool: ...
         def __hash__(self) -> int: ...
+        # you can only subscript a `UnionType` instance if at least one of the elements
+        # in the union is a generic alias instance that has a non-empty `__parameters__`
+        def __getitem__(self, parameters: Any) -> object:
+            """Return self[key]."""
 
 if sys.version_info >= (3, 13):
     @final
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/typing.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/typing.pyi
index 90743a7cc3..b5533714ac 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/typing.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/typing.pyi
@@ -25,7 +25,7 @@ import collections  # noqa: F401  # pyright: ignore[reportUnusedImport]
 import sys
 import typing_extensions
 from _collections_abc import dict_items, dict_keys, dict_values
-from _typeshed import IdentityFunction, ReadableBuffer, SupportsKeysAndGetItem
+from _typeshed import IdentityFunction, ReadableBuffer, SupportsGetItem, SupportsGetItemViewable, SupportsKeysAndGetItem, Viewable
 from abc import ABCMeta, abstractmethod
 from re import Match as Match, Pattern as Pattern
 from types import (
@@ -61,6 +61,7 @@ __all__ = [
     "AsyncIterator",
     "Awaitable",
     "BinaryIO",
+    "ByteString",
     "Callable",
     "ChainMap",
     "ClassVar",
@@ -129,9 +130,6 @@ __all__ = [
     "runtime_checkable",
 ]
 
-if sys.version_info < (3, 14):
-    __all__ += ["ByteString"]
-
 if sys.version_info >= (3, 14):
     __all__ += ["evaluate_forward_ref"]
 
@@ -180,6 +178,8 @@ class Any:
 class _Final:
     """Mixin to prohibit subclassing."""
 
+    __slots__ = ("__weakref__",)
+
 def final(f: _T) -> _T:
     """Decorator to indicate final methods and final classes.
 
@@ -335,13 +335,13 @@ _promote = object()
 # N.B. Keep this definition in sync with typing_extensions._SpecialForm
 @final
 class _SpecialForm(_Final):
+    __slots__ = ("_name", "__doc__", "_getitem")
     def __getitem__(self, parameters: Any) -> object: ...
     if sys.version_info >= (3, 10):
         def __or__(self, other: Any) -> _SpecialForm: ...
         def __ror__(self, other: Any) -> _SpecialForm: ...
 
 Union: _SpecialForm
-Generic: _SpecialForm
 Protocol: _SpecialForm
 Callable: _SpecialForm
 Type: _SpecialForm
@@ -759,6 +759,20 @@ Annotated: _SpecialForm
 # Predefined type variables.
 AnyStr = TypeVar("AnyStr", str, bytes)  # noqa: Y001
 
+@type_check_only
+class _Generic:
+    if sys.version_info < (3, 12):
+        __slots__ = ()
+
+    if sys.version_info >= (3, 10):
+        @classmethod
+        def __class_getitem__(cls, args: TypeVar | ParamSpec | tuple[TypeVar | ParamSpec, ...]) -> _Final: ...
+    else:
+        @classmethod
+        def __class_getitem__(cls, args: TypeVar | tuple[TypeVar, ...]) -> _Final: ...
+
+Generic: type[_Generic]
+
 class _ProtocolMeta(ABCMeta):
     if sys.version_info >= (3, 12):
         def __init__(cls, *args: Any, **kwargs: Any) -> None: ...
@@ -789,6 +803,7 @@ def runtime_checkable(cls: _TC) -> _TC:
 class SupportsInt(Protocol, metaclass=ABCMeta):
     """An ABC with one abstract method __int__."""
 
+    __slots__ = ()
     @abstractmethod
     def __int__(self) -> int: ...
 
@@ -796,6 +811,7 @@ class SupportsInt(Protocol, metaclass=ABCMeta):
 class SupportsFloat(Protocol, metaclass=ABCMeta):
     """An ABC with one abstract method __float__."""
 
+    __slots__ = ()
     @abstractmethod
     def __float__(self) -> float: ...
 
@@ -803,6 +819,7 @@ class SupportsFloat(Protocol, metaclass=ABCMeta):
 class SupportsComplex(Protocol, metaclass=ABCMeta):
     """An ABC with one abstract method __complex__."""
 
+    __slots__ = ()
     @abstractmethod
     def __complex__(self) -> complex: ...
 
@@ -810,6 +827,7 @@ class SupportsComplex(Protocol, metaclass=ABCMeta):
 class SupportsBytes(Protocol, metaclass=ABCMeta):
     """An ABC with one abstract method __bytes__."""
 
+    __slots__ = ()
     @abstractmethod
     def __bytes__(self) -> bytes: ...
 
@@ -817,6 +835,7 @@ class SupportsBytes(Protocol, metaclass=ABCMeta):
 class SupportsIndex(Protocol, metaclass=ABCMeta):
     """An ABC with one abstract method __index__."""
 
+    __slots__ = ()
     @abstractmethod
     def __index__(self) -> int: ...
 
@@ -824,6 +843,7 @@ class SupportsIndex(Protocol, metaclass=ABCMeta):
 class SupportsAbs(Protocol[_T_co]):
     """An ABC with one abstract method __abs__ that is covariant in its return type."""
 
+    __slots__ = ()
     @abstractmethod
     def __abs__(self) -> _T_co: ...
 
@@ -831,6 +851,7 @@ class SupportsAbs(Protocol[_T_co]):
 class SupportsRound(Protocol[_T_co]):
     """An ABC with one abstract method __round__ that is covariant in its return type."""
 
+    __slots__ = ()
     @overload
     @abstractmethod
     def __round__(self) -> int: ...
@@ -926,7 +947,7 @@ class Awaitable(Protocol[_T_co]):
     @abstractmethod
     def __await__(self) -> Generator[Any, Any, _T_co]: ...
 
-# Non-default variations to accommodate couroutines, and `AwaitableGenerator` having a 4th type parameter.
+# Non-default variations to accommodate coroutines, and `AwaitableGenerator` having a 4th type parameter.
 _SendT_nd_contra = TypeVar("_SendT_nd_contra", contravariant=True)
 _ReturnT_nd_co = TypeVar("_ReturnT_nd_co", covariant=True)
 
@@ -1181,14 +1202,15 @@ class MutableSet(AbstractSet[_T]):
     def __isub__(self, it: AbstractSet[Any]) -> typing_extensions.Self: ...
 
 class MappingView(Sized):
-    def __init__(self, mapping: Mapping[Any, Any]) -> None: ...  # undocumented
+    __slots__ = ("_mapping",)
+    def __init__(self, mapping: Sized) -> None: ...  # undocumented
     def __len__(self) -> int: ...
 
 class ItemsView(MappingView, AbstractSet[tuple[_KT_co, _VT_co]], Generic[_KT_co, _VT_co]):
-    def __init__(self, mapping: Mapping[_KT_co, _VT_co]) -> None: ...  # undocumented
+    def __init__(self, mapping: SupportsGetItemViewable[_KT_co, _VT_co]) -> None: ...  # undocumented
     def __and__(self, other: Iterable[Any]) -> set[tuple[_KT_co, _VT_co]]: ...
     def __rand__(self, other: Iterable[_T]) -> set[_T]: ...
-    def __contains__(self, item: object) -> bool: ...
+    def __contains__(self, item: tuple[object, object]) -> bool: ...  # type: ignore[override]
     def __iter__(self) -> Iterator[tuple[_KT_co, _VT_co]]: ...
     def __or__(self, other: Iterable[_T]) -> set[tuple[_KT_co, _VT_co] | _T]: ...
     def __ror__(self, other: Iterable[_T]) -> set[tuple[_KT_co, _VT_co] | _T]: ...
@@ -1198,7 +1220,7 @@ class ItemsView(MappingView, AbstractSet[tuple[_KT_co, _VT_co]], Generic[_KT_co,
     def __rxor__(self, other: Iterable[_T]) -> set[tuple[_KT_co, _VT_co] | _T]: ...
 
 class KeysView(MappingView, AbstractSet[_KT_co]):
-    def __init__(self, mapping: Mapping[_KT_co, Any]) -> None: ...  # undocumented
+    def __init__(self, mapping: Viewable[_KT_co]) -> None: ...  # undocumented
     def __and__(self, other: Iterable[Any]) -> set[_KT_co]: ...
     def __rand__(self, other: Iterable[_T]) -> set[_T]: ...
     def __contains__(self, key: object) -> bool: ...
@@ -1211,7 +1233,7 @@ class KeysView(MappingView, AbstractSet[_KT_co]):
     def __rxor__(self, other: Iterable[_T]) -> set[_KT_co | _T]: ...
 
 class ValuesView(MappingView, Collection[_VT_co]):
-    def __init__(self, mapping: Mapping[Any, _VT_co]) -> None: ...  # undocumented
+    def __init__(self, mapping: SupportsGetItemViewable[Any, _VT_co]) -> None: ...  # undocumented
     def __contains__(self, value: object) -> bool: ...
     def __iter__(self) -> Iterator[_VT_co]: ...
 
@@ -1319,13 +1341,13 @@ class MutableMapping(Mapping[_KT, _VT]):
         """
 
     @overload
-    def update(self: Mapping[str, _VT], m: SupportsKeysAndGetItem[str, _VT], /, **kwargs: _VT) -> None: ...
+    def update(self: SupportsGetItem[str, _VT], m: SupportsKeysAndGetItem[str, _VT], /, **kwargs: _VT) -> None: ...
     @overload
     def update(self, m: Iterable[tuple[_KT, _VT]], /) -> None: ...
     @overload
-    def update(self: Mapping[str, _VT], m: Iterable[tuple[str, _VT]], /, **kwargs: _VT) -> None: ...
+    def update(self: SupportsGetItem[str, _VT], m: Iterable[tuple[str, _VT]], /, **kwargs: _VT) -> None: ...
     @overload
-    def update(self: Mapping[str, _VT], **kwargs: _VT) -> None: ...
+    def update(self: SupportsGetItem[str, _VT], **kwargs: _VT) -> None: ...
 
 Text = str
 
@@ -1350,6 +1372,7 @@ class IO(Generic[AnyStr]):
     # At runtime these are all abstract properties,
     # but making them abstract in the stub is hugely disruptive, for not much gain.
     # See #8726
+    __slots__ = ()
     @property
     def mode(self) -> str: ...
     # Usually str, but may be bytes if a bytes path was passed to open(). See #10737.
@@ -1410,6 +1433,7 @@ class IO(Generic[AnyStr]):
 class BinaryIO(IO[bytes]):
     """Typed version of the return of open() in binary mode."""
 
+    __slots__ = ()
     @abstractmethod
     def __enter__(self) -> BinaryIO: ...
 
@@ -1417,6 +1441,7 @@ class TextIO(IO[str]):
     """Typed version of the return of open() in text mode."""
 
     # See comment regarding the @properties in the `IO` class
+    __slots__ = ()
     @property
     def buffer(self) -> BinaryIO: ...
     @property
@@ -1430,8 +1455,7 @@ class TextIO(IO[str]):
     @abstractmethod
     def __enter__(self) -> TextIO: ...
 
-if sys.version_info < (3, 14):
-    ByteString: typing_extensions.TypeAlias = bytes | bytearray | memoryview
+ByteString: typing_extensions.TypeAlias = bytes | bytearray | memoryview
 
 # Functions
 
@@ -1854,6 +1878,15 @@ else:
     class ForwardRef(_Final):
         """Internal wrapper to hold a forward reference."""
 
+        __slots__ = (
+            "__forward_arg__",
+            "__forward_code__",
+            "__forward_evaluated__",
+            "__forward_value__",
+            "__forward_is_argument__",
+            "__forward_is_class__",
+            "__forward_module__",
+        )
         __forward_arg__: str
         __forward_code__: CodeType
         __forward_evaluated__: bool
@@ -1930,6 +1963,15 @@ def _type_repr(obj: object) -> str:
     """
 
 if sys.version_info >= (3, 12):
+    _TypeParameter: typing_extensions.TypeAlias = (
+        TypeVar
+        | typing_extensions.TypeVar
+        | ParamSpec
+        | typing_extensions.ParamSpec
+        | TypeVarTuple
+        | typing_extensions.TypeVarTuple
+    )
+
     def override(method: _F, /) -> _F:
         """Indicate that a method is intended to override a method in a base class.
 
@@ -1982,11 +2024,11 @@ if sys.version_info >= (3, 12):
         See PEP 695 for more information.
         """
 
-        def __new__(cls, name: str, value: Any, *, type_params: tuple[TypeVar | ParamSpec | TypeVarTuple, ...] = ()) -> Self: ...
+        def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
         @property
         def __value__(self) -> Any: ...  # AnnotationForm
         @property
-        def __type_params__(self) -> tuple[TypeVar | ParamSpec | TypeVarTuple, ...]: ...
+        def __type_params__(self) -> tuple[_TypeParameter, ...]: ...
         @property
         def __parameters__(self) -> tuple[Any, ...]: ...  # AnnotationForm
         @property
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/typing_extensions.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/typing_extensions.pyi
index 49a80fcd14..1e81194ead 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/typing_extensions.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/typing_extensions.pyi
@@ -120,6 +120,7 @@ __all__ = [
     "clear_overloads",
     "dataclass_transform",
     "deprecated",
+    "disjoint_base",
     "Doc",
     "evaluate_forward_ref",
     "get_overloads",
@@ -150,6 +151,7 @@ __all__ = [
     "TypeGuard",
     "TypeIs",
     "TYPE_CHECKING",
+    "type_repr",
     "Never",
     "NoReturn",
     "ReadOnly",
@@ -263,6 +265,28 @@ def final(f: _F) -> _F:
     object to allow runtime introspection.
     """
 
+def disjoint_base(cls: _TC) -> _TC:
+    """This decorator marks a class as a disjoint base.
+
+    Child classes of a disjoint base cannot inherit from other disjoint bases that are
+    not parent classes of the disjoint base.
+
+    For example:
+
+        @disjoint_base
+        class Disjoint1: pass
+
+        @disjoint_base
+        class Disjoint2: pass
+
+        class Disjoint3(Disjoint1, Disjoint2): pass  # Type checker error
+
+    Type checkers can use knowledge of disjoint bases to detect unreachable code
+    and determine when two types can overlap.
+
+    See PEP 800.
+    """
+
 Literal: _SpecialForm
 
 def IntVar(name: str) -> Any: ...  # returns a new TypeVar
@@ -279,7 +303,7 @@ class _TypedDict(Mapping[str, object], metaclass=abc.ABCMeta):
     __readonly_keys__: ClassVar[frozenset[str]]
     __mutable_keys__: ClassVar[frozenset[str]]
     # PEP 728
-    __closed__: ClassVar[bool]
+    __closed__: ClassVar[bool | None]
     __extra_items__: ClassVar[AnnotationForm]
     def copy(self) -> Self: ...
     # Using Never so that only calls using mypy plugin hook that specialize the signature
@@ -776,6 +800,7 @@ else:
     class SupportsInt(Protocol, metaclass=abc.ABCMeta):
         """An ABC with one abstract method __int__."""
 
+        __slots__ = ()
         @abc.abstractmethod
         def __int__(self) -> int: ...
 
@@ -783,6 +808,7 @@ else:
     class SupportsFloat(Protocol, metaclass=abc.ABCMeta):
         """An ABC with one abstract method __float__."""
 
+        __slots__ = ()
         @abc.abstractmethod
         def __float__(self) -> float: ...
 
@@ -790,6 +816,7 @@ else:
     class SupportsComplex(Protocol, metaclass=abc.ABCMeta):
         """An ABC with one abstract method __complex__."""
 
+        __slots__ = ()
         @abc.abstractmethod
         def __complex__(self) -> complex: ...
 
@@ -797,11 +824,13 @@ else:
     class SupportsBytes(Protocol, metaclass=abc.ABCMeta):
         """An ABC with one abstract method __bytes__."""
 
+        __slots__ = ()
         @abc.abstractmethod
         def __bytes__(self) -> bytes: ...
 
     @runtime_checkable
     class SupportsIndex(Protocol, metaclass=abc.ABCMeta):
+        __slots__ = ()
         @abc.abstractmethod
         def __index__(self) -> int: ...
 
@@ -811,6 +840,7 @@ else:
         An ABC with one abstract method __abs__ that is covariant in its return type.
         """
 
+        __slots__ = ()
         @abc.abstractmethod
         def __abs__(self) -> _T_co: ...
 
@@ -820,6 +850,7 @@ else:
         An ABC with one abstract method __round__ that is covariant in its return type.
         """
 
+        __slots__ = ()
         @overload
         @abc.abstractmethod
         def __round__(self) -> int: ...
@@ -837,6 +868,7 @@ else:
         This protocol only supports blocking I/O.
         """
 
+        __slots__ = ()
         @abc.abstractmethod
         def read(self, size: int = ..., /) -> _T_co:
             """Read data from the input stream and return it.
@@ -852,6 +884,7 @@ else:
         This protocol only supports blocking I/O.
         """
 
+        __slots__ = ()
         @abc.abstractmethod
         def write(self, data: _T_contra, /) -> int:
             """Write *data* to the output stream and return the number of items written."""
@@ -1163,7 +1196,7 @@ TypeForm: _SpecialForm
 if sys.version_info >= (3, 14):
     from typing import evaluate_forward_ref as evaluate_forward_ref
 
-    from annotationlib import Format as Format, get_annotations as get_annotations
+    from annotationlib import Format as Format, get_annotations as get_annotations, type_repr as type_repr
 else:
     class Format(enum.IntEnum):
         """An enumeration."""
@@ -1292,6 +1325,14 @@ else:
         format: Format | None = None,
         _recursive_guard: Container[str] = ...,
     ) -> AnnotationForm: ...
+    def type_repr(value: object) -> str:
+        """Convert a Python value to a format suitable for use with the STRING format.
+
+        This is intended as a helper for tools that support the STRING format but do
+        not have access to the code that originally produced the annotations. It uses
+        repr() for most objects.
+
+        """
 
 # PEP 661
 class Sentinel:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/unicodedata.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/unicodedata.pyi
index d0c1559e92..f0ef68d847 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/unicodedata.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/unicodedata.pyi
@@ -9,11 +9,11 @@ UnicodeData File Format 16.0.0.
 
 import sys
 from _typeshed import ReadOnlyBuffer
-from typing import Any, Literal, TypeVar, final, overload
+from typing import Any, Final, Literal, TypeVar, final, overload
 from typing_extensions import TypeAlias
 
 ucd_3_2_0: UCD
-unidata_version: str
+unidata_version: Final[str]
 
 if sys.version_info < (3, 10):
     ucnhash_CAPI: Any
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/loader.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/loader.pyi
index 5c01b4981d..9473618bb2 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/loader.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/loader.pyi
@@ -86,21 +86,38 @@ class TestLoader:
 defaultTestLoader: TestLoader
 
 if sys.version_info < (3, 13):
-    @deprecated("Deprecated in Python 3.11; removal scheduled for Python 3.13")
-    def getTestCaseNames(
-        testCaseClass: type[unittest.case.TestCase],
-        prefix: str,
-        sortUsing: _SortComparisonMethod = ...,
-        testNamePatterns: list[str] | None = None,
-    ) -> Sequence[str]: ...
-    @deprecated("Deprecated in Python 3.11; removal scheduled for Python 3.13")
-    def makeSuite(
-        testCaseClass: type[unittest.case.TestCase],
-        prefix: str = "test",
-        sortUsing: _SortComparisonMethod = ...,
-        suiteClass: _SuiteClass = ...,
-    ) -> unittest.suite.TestSuite: ...
-    @deprecated("Deprecated in Python 3.11; removal scheduled for Python 3.13")
-    def findTestCases(
-        module: ModuleType, prefix: str = "test", sortUsing: _SortComparisonMethod = ..., suiteClass: _SuiteClass = ...
-    ) -> unittest.suite.TestSuite: ...
+    if sys.version_info >= (3, 11):
+        @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+        def getTestCaseNames(
+            testCaseClass: type[unittest.case.TestCase],
+            prefix: str,
+            sortUsing: _SortComparisonMethod = ...,
+            testNamePatterns: list[str] | None = None,
+        ) -> Sequence[str]: ...
+        @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+        def makeSuite(
+            testCaseClass: type[unittest.case.TestCase],
+            prefix: str = "test",
+            sortUsing: _SortComparisonMethod = ...,
+            suiteClass: _SuiteClass = ...,
+        ) -> unittest.suite.TestSuite: ...
+        @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+        def findTestCases(
+            module: ModuleType, prefix: str = "test", sortUsing: _SortComparisonMethod = ..., suiteClass: _SuiteClass = ...
+        ) -> unittest.suite.TestSuite: ...
+    else:
+        def getTestCaseNames(
+            testCaseClass: type[unittest.case.TestCase],
+            prefix: str,
+            sortUsing: _SortComparisonMethod = ...,
+            testNamePatterns: list[str] | None = None,
+        ) -> Sequence[str]: ...
+        def makeSuite(
+            testCaseClass: type[unittest.case.TestCase],
+            prefix: str = "test",
+            sortUsing: _SortComparisonMethod = ...,
+            suiteClass: _SuiteClass = ...,
+        ) -> unittest.suite.TestSuite: ...
+        def findTestCases(
+            module: ModuleType, prefix: str = "test", sortUsing: _SortComparisonMethod = ..., suiteClass: _SuiteClass = ...
+        ) -> unittest.suite.TestSuite: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/main.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/main.pyi
index 924967d7f2..a4e8e9cb02 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/main.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/main.pyi
@@ -70,8 +70,11 @@ class TestProgram:
         ) -> None: ...
 
     if sys.version_info < (3, 13):
-        @deprecated("Deprecated in Python 3.11; removal scheduled for Python 3.13")
-        def usageExit(self, msg: Any = None) -> None: ...
+        if sys.version_info >= (3, 11):
+            @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+            def usageExit(self, msg: Any = None) -> None: ...
+        else:
+            def usageExit(self, msg: Any = None) -> None: ...
 
     def parseArgs(self, argv: list[str]) -> None: ...
     def createTests(self, from_discovery: bool = False, Loader: unittest.loader.TestLoader | None = None) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/mock.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/mock.pyi
index ba2ba19d86..615eec5fc4 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/mock.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/mock.pyi
@@ -4,7 +4,7 @@ from collections.abc import Awaitable, Callable, Coroutine, Iterable, Mapping, S
 from contextlib import _GeneratorContextManager
 from types import TracebackType
 from typing import Any, ClassVar, Final, Generic, Literal, TypeVar, overload, type_check_only
-from typing_extensions import ParamSpec, Self, TypeAlias
+from typing_extensions import ParamSpec, Self, TypeAlias, disjoint_base
 
 _T = TypeVar("_T")
 _TT = TypeVar("_TT", bound=type[Any])
@@ -52,7 +52,7 @@ else:
         "seal",
     )
 
-FILTER_DIR: Any
+FILTER_DIR: bool  # controls the way mock objects respond to `dir` function
 
 class _SentinelObject:
     """A unique, named, sentinel object."""
@@ -65,59 +65,119 @@ class _Sentinel:
 
     def __getattr__(self, name: str) -> Any: ...
 
-sentinel: Any
+sentinel: _Sentinel
 DEFAULT: Any
 
 _ArgsKwargs: TypeAlias = tuple[tuple[Any, ...], Mapping[str, Any]]
 _NameArgsKwargs: TypeAlias = tuple[str, tuple[Any, ...], Mapping[str, Any]]
 _CallValue: TypeAlias = str | tuple[Any, ...] | Mapping[str, Any] | _ArgsKwargs | _NameArgsKwargs
 
-class _Call(tuple[Any, ...]):
-    """
-    A tuple for holding the results of a call to a mock, either in the form
-    `(args, kwargs)` or `(name, args, kwargs)`.
-
-    If args or kwargs are empty then a call tuple will compare equal to
-    a tuple without those values. This makes comparisons less verbose::
-
-        _Call(('name', (), {})) == ('name',)
-        _Call(('name', (1,), {})) == ('name', (1,))
-        _Call(((), {'a': 'b'})) == ({'a': 'b'},)
-
-    The `_Call` object provides a useful shortcut for comparing with call::
-
-        _Call(((1, 2), {'a': 3})) == call(1, 2, a=3)
-        _Call(('foo', (1, 2), {'a': 3})) == call.foo(1, 2, a=3)
-
-    If the _Call has no name then it will match any name.
-    """
-
-    def __new__(
-        cls, value: _CallValue = (), name: str | None = "", parent: _Call | None = None, two: bool = False, from_kall: bool = True
-    ) -> Self: ...
-    def __init__(
-        self,
-        value: _CallValue = (),
-        name: str | None = None,
-        parent: _Call | None = None,
-        two: bool = False,
-        from_kall: bool = True,
-    ) -> None: ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __eq__(self, other: object) -> bool: ...
-    def __ne__(self, value: object, /) -> bool: ...
-    def __call__(self, *args: Any, **kwargs: Any) -> _Call: ...
-    def __getattr__(self, attr: str) -> Any: ...
-    def __getattribute__(self, attr: str) -> Any: ...
-    @property
-    def args(self) -> tuple[Any, ...]: ...
-    @property
-    def kwargs(self) -> Mapping[str, Any]: ...
-    def call_list(self) -> Any:
-        """For a call object that represents multiple calls, `call_list`
-        returns a list of all the intermediate calls as well as the
-        final call.
+if sys.version_info >= (3, 12):
+    class _Call(tuple[Any, ...]):
         """
+        A tuple for holding the results of a call to a mock, either in the form
+        `(args, kwargs)` or `(name, args, kwargs)`.
+
+        If args or kwargs are empty then a call tuple will compare equal to
+        a tuple without those values. This makes comparisons less verbose::
+
+            _Call(('name', (), {})) == ('name',)
+            _Call(('name', (1,), {})) == ('name', (1,))
+            _Call(((), {'a': 'b'})) == ({'a': 'b'},)
+
+        The `_Call` object provides a useful shortcut for comparing with call::
+
+            _Call(((1, 2), {'a': 3})) == call(1, 2, a=3)
+            _Call(('foo', (1, 2), {'a': 3})) == call.foo(1, 2, a=3)
+
+        If the _Call has no name then it will match any name.
+        """
+
+        def __new__(
+            cls,
+            value: _CallValue = (),
+            name: str | None = "",
+            parent: _Call | None = None,
+            two: bool = False,
+            from_kall: bool = True,
+        ) -> Self: ...
+        def __init__(
+            self,
+            value: _CallValue = (),
+            name: str | None = None,
+            parent: _Call | None = None,
+            two: bool = False,
+            from_kall: bool = True,
+        ) -> None: ...
+        __hash__: ClassVar[None]  # type: ignore[assignment]
+        def __eq__(self, other: object) -> bool: ...
+        def __ne__(self, value: object, /) -> bool: ...
+        def __call__(self, *args: Any, **kwargs: Any) -> _Call: ...
+        def __getattr__(self, attr: str) -> Any: ...
+        def __getattribute__(self, attr: str) -> Any: ...
+        @property
+        def args(self) -> tuple[Any, ...]: ...
+        @property
+        def kwargs(self) -> Mapping[str, Any]: ...
+        def call_list(self) -> Any:
+            """For a call object that represents multiple calls, `call_list`
+            returns a list of all the intermediate calls as well as the
+            final call.
+            """
+
+else:
+    @disjoint_base
+    class _Call(tuple[Any, ...]):
+        """
+        A tuple for holding the results of a call to a mock, either in the form
+        `(args, kwargs)` or `(name, args, kwargs)`.
+
+        If args or kwargs are empty then a call tuple will compare equal to
+        a tuple without those values. This makes comparisons less verbose::
+
+            _Call(('name', (), {})) == ('name',)
+            _Call(('name', (1,), {})) == ('name', (1,))
+            _Call(((), {'a': 'b'})) == ({'a': 'b'},)
+
+        The `_Call` object provides a useful shortcut for comparing with call::
+
+            _Call(((1, 2), {'a': 3})) == call(1, 2, a=3)
+            _Call(('foo', (1, 2), {'a': 3})) == call.foo(1, 2, a=3)
+
+        If the _Call has no name then it will match any name.
+        """
+
+        def __new__(
+            cls,
+            value: _CallValue = (),
+            name: str | None = "",
+            parent: _Call | None = None,
+            two: bool = False,
+            from_kall: bool = True,
+        ) -> Self: ...
+        def __init__(
+            self,
+            value: _CallValue = (),
+            name: str | None = None,
+            parent: _Call | None = None,
+            two: bool = False,
+            from_kall: bool = True,
+        ) -> None: ...
+        __hash__: ClassVar[None]  # type: ignore[assignment]
+        def __eq__(self, other: object) -> bool: ...
+        def __ne__(self, value: object, /) -> bool: ...
+        def __call__(self, *args: Any, **kwargs: Any) -> _Call: ...
+        def __getattr__(self, attr: str) -> Any: ...
+        def __getattribute__(self, attr: str) -> Any: ...
+        @property
+        def args(self) -> tuple[Any, ...]: ...
+        @property
+        def kwargs(self) -> Mapping[str, Any]: ...
+        def call_list(self) -> Any:
+            """For a call object that represents multiple calls, `call_list`
+            returns a list of all the intermediate calls as well as the
+            final call.
+            """
 
 call: _Call
 
@@ -523,27 +583,32 @@ class _patcher:
     # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock],
     # but that's impossible with the current type system.
     @overload
-    def __call__(
+    def __call__(  # type: ignore[overload-overlap]
         self,
         target: str,
         new: _T,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
-        new_callable: Callable[..., Any] | None = ...,
-        **kwargs: Any,
+        spec: Literal[False] | None = None,
+        create: bool = False,
+        spec_set: Literal[False] | None = None,
+        autospec: Literal[False] | None = None,
+        new_callable: None = None,
+        *,
+        unsafe: bool = False,
     ) -> _patch[_T]: ...
     @overload
     def __call__(
         self,
         target: str,
         *,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
+        # If not False or None, this is passed to new_callable
+        spec: Any | Literal[False] | None = None,
+        create: bool = False,
+        # If not False or None, this is passed to new_callable
+        spec_set: Any | Literal[False] | None = None,
+        autospec: Literal[False] | None = None,
         new_callable: Callable[..., _T],
+        unsafe: bool = False,
+        # kwargs are passed to new_callable
         **kwargs: Any,
     ) -> _patch_pass_arg[_T]: ...
     @overload
@@ -551,25 +616,31 @@ class _patcher:
         self,
         target: str,
         *,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
-        new_callable: None = ...,
+        spec: Any | bool | None = None,
+        create: bool = False,
+        spec_set: Any | bool | None = None,
+        autospec: Any | bool | None = None,
+        new_callable: None = None,
+        unsafe: bool = False,
+        # kwargs are passed to the MagicMock/AsyncMock constructor
         **kwargs: Any,
     ) -> _patch_pass_arg[MagicMock | AsyncMock]: ...
+    # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any].
+    # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock],
+    # but that's impossible with the current type system.
     @overload
     @staticmethod
     def object(
         target: Any,
         attribute: str,
         new: _T,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
-        new_callable: Callable[..., Any] | None = ...,
-        **kwargs: Any,
+        spec: Literal[False] | None = None,
+        create: bool = False,
+        spec_set: Literal[False] | None = None,
+        autospec: Literal[False] | None = None,
+        new_callable: None = None,
+        *,
+        unsafe: bool = False,
     ) -> _patch[_T]: ...
     @overload
     @staticmethod
@@ -577,11 +648,15 @@ class _patcher:
         target: Any,
         attribute: str,
         *,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
+        # If not False or None, this is passed to new_callable
+        spec: Any | Literal[False] | None = None,
+        create: bool = False,
+        # If not False or None, this is passed to new_callable
+        spec_set: Any | Literal[False] | None = None,
+        autospec: Literal[False] | None = None,
         new_callable: Callable[..., _T],
+        unsafe: bool = False,
+        # kwargs are passed to new_callable
         **kwargs: Any,
     ) -> _patch_pass_arg[_T]: ...
     @overload
@@ -590,21 +665,54 @@ class _patcher:
         target: Any,
         attribute: str,
         *,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
-        new_callable: None = ...,
+        spec: Any | bool | None = None,
+        create: bool = False,
+        spec_set: Any | bool | None = None,
+        autospec: Any | bool | None = None,
+        new_callable: None = None,
+        unsafe: bool = False,
+        # kwargs are passed to the MagicMock/AsyncMock constructor
         **kwargs: Any,
     ) -> _patch_pass_arg[MagicMock | AsyncMock]: ...
+    @overload
     @staticmethod
     def multiple(
-        target: Any,
-        spec: Any | None = ...,
-        create: bool = ...,
-        spec_set: Any | None = ...,
-        autospec: Any | None = ...,
-        new_callable: Any | None = ...,
+        target: Any | str,
+        # If not False or None, this is passed to new_callable
+        spec: Any | Literal[False] | None = None,
+        create: bool = False,
+        # If not False or None, this is passed to new_callable
+        spec_set: Any | Literal[False] | None = None,
+        autospec: Literal[False] | None = None,
+        *,
+        new_callable: Callable[..., _T],
+        # The kwargs must be DEFAULT
+        **kwargs: Any,
+    ) -> _patch_pass_arg[_T]: ...
+    @overload
+    @staticmethod
+    def multiple(
+        target: Any | str,
+        # If not False or None, this is passed to new_callable
+        spec: Any | Literal[False] | None,
+        create: bool,
+        # If not False or None, this is passed to new_callable
+        spec_set: Any | Literal[False] | None,
+        autospec: Literal[False] | None,
+        new_callable: Callable[..., _T],
+        # The kwargs must be DEFAULT
+        **kwargs: Any,
+    ) -> _patch_pass_arg[_T]: ...
+    @overload
+    @staticmethod
+    def multiple(
+        target: Any | str,
+        spec: Any | bool | None = None,
+        create: bool = False,
+        spec_set: Any | bool | None = None,
+        autospec: Any | bool | None = None,
+        new_callable: None = None,
+        # The kwargs are the mock objects or DEFAULT
         **kwargs: Any,
     ) -> _patch[Any]: ...
     @staticmethod
@@ -745,14 +853,15 @@ class MagicProxy(Base):
     def create_mock(self) -> Any: ...
     def __get__(self, obj: Any, _type: Any | None = None) -> Any: ...
 
-class _ANY:
+# See https://github.com/python/typeshed/issues/14701
+class _ANY(Any):
     """A helper object that compares equal to everything."""
 
     def __eq__(self, other: object) -> Literal[True]: ...
     def __ne__(self, other: object) -> Literal[False]: ...
     __hash__: ClassVar[None]  # type: ignore[assignment]
 
-ANY: Any
+ANY: _ANY
 
 if sys.version_info >= (3, 10):
     def create_autospec(
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/util.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/util.pyi
index d0e0dfbacd..0bed55dbcc 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/unittest/util.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/unittest/util.pyi
@@ -7,12 +7,12 @@ from typing_extensions import TypeAlias
 _T = TypeVar("_T")
 _Mismatch: TypeAlias = tuple[_T, _T, int]
 
-_MAX_LENGTH: Final[int]
-_PLACEHOLDER_LEN: Final[int]
-_MIN_BEGIN_LEN: Final[int]
-_MIN_END_LEN: Final[int]
-_MIN_COMMON_LEN: Final[int]
-_MIN_DIFF_LEN: Final[int]
+_MAX_LENGTH: Final = 80
+_PLACEHOLDER_LEN: Final = 12
+_MIN_BEGIN_LEN: Final = 5
+_MIN_END_LEN: Final = 5
+_MIN_COMMON_LEN: Final = 5
+_MIN_DIFF_LEN: Final = 41
 
 def _shorten(s: str, prefixlen: int, suffixlen: int) -> str: ...
 def _common_shorten_repr(*args: str) -> tuple[str, ...]: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/urllib/parse.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/urllib/parse.pyi
index c5c2004083..10b9bcf0b6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/urllib/parse.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/urllib/parse.pyi
@@ -34,7 +34,7 @@ It serves as a useful guide when making changes.
 import sys
 from collections.abc import Iterable, Mapping, Sequence
 from types import GenericAlias
-from typing import Any, AnyStr, Generic, Literal, NamedTuple, Protocol, overload, type_check_only
+from typing import Any, AnyStr, Final, Generic, Literal, NamedTuple, Protocol, overload, type_check_only
 from typing_extensions import TypeAlias
 
 __all__ = [
@@ -61,29 +61,32 @@ __all__ = [
     "SplitResultBytes",
 ]
 
-uses_relative: list[str]
-uses_netloc: list[str]
-uses_params: list[str]
-non_hierarchical: list[str]
-uses_query: list[str]
-uses_fragment: list[str]
-scheme_chars: str
+uses_relative: Final[list[str]]
+uses_netloc: Final[list[str]]
+uses_params: Final[list[str]]
+non_hierarchical: Final[list[str]]
+uses_query: Final[list[str]]
+uses_fragment: Final[list[str]]
+scheme_chars: Final[str]
 if sys.version_info < (3, 11):
-    MAX_CACHE_SIZE: int
+    MAX_CACHE_SIZE: Final[int]
 
 class _ResultMixinStr:
     """Standard approach to encoding parsed results from str to bytes"""
 
+    __slots__ = ()
     def encode(self, encoding: str = "ascii", errors: str = "strict") -> _ResultMixinBytes: ...
 
 class _ResultMixinBytes:
     """Standard approach to decoding parsed results from bytes to str"""
 
+    __slots__ = ()
     def decode(self, encoding: str = "ascii", errors: str = "strict") -> _ResultMixinStr: ...
 
 class _NetlocResultMixinBase(Generic[AnyStr]):
     """Shared methods for the parsed result objects containing a netloc element"""
 
+    __slots__ = ()
     @property
     def username(self) -> AnyStr | None: ...
     @property
@@ -98,8 +101,11 @@ class _NetlocResultMixinBase(Generic[AnyStr]):
         E.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).
         """
 
-class _NetlocResultMixinStr(_NetlocResultMixinBase[str], _ResultMixinStr): ...
-class _NetlocResultMixinBytes(_NetlocResultMixinBase[bytes], _ResultMixinBytes): ...
+class _NetlocResultMixinStr(_NetlocResultMixinBase[str], _ResultMixinStr):
+    __slots__ = ()
+
+class _NetlocResultMixinBytes(_NetlocResultMixinBase[bytes], _ResultMixinBytes):
+    __slots__ = ()
 
 class _DefragResultBase(NamedTuple, Generic[AnyStr]):
     """
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/uuid.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/uuid.pyi
index 4241f5b881..86a27772a7 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/uuid.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/uuid.pyi
@@ -133,6 +133,7 @@ class UUID:
                     uuid_generate_time_safe(3).
     """
 
+    __slots__ = ("int", "is_safe", "__weakref__")
     def __init__(
         self,
         hex: str | None = None,
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/venv/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/venv/__init__.pyi
index f5645f3fdc..aa09f42e01 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/venv/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/venv/__init__.pyi
@@ -9,10 +9,11 @@ import sys
 from _typeshed import StrOrBytesPath
 from collections.abc import Iterable, Sequence
 from types import SimpleNamespace
+from typing import Final
 
 logger: logging.Logger
 
-CORE_VENV_DEPS: tuple[str, ...]
+CORE_VENV_DEPS: Final[tuple[str, ...]]
 
 class EnvBuilder:
     """
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/wave.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/wave.pyi
index 11d79c127c..9819c4fa19 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/wave.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/wave.pyi
@@ -71,6 +71,7 @@ The close() method is called automatically when the class instance
 is destroyed.
 """
 
+import sys
 from _typeshed import ReadableBuffer, Unused
 from typing import IO, Any, BinaryIO, Final, Literal, NamedTuple, NoReturn, overload
 from typing_extensions import Self, TypeAlias, deprecated
@@ -81,7 +82,7 @@ _File: TypeAlias = str | IO[bytes]
 
 class Error(Exception): ...
 
-WAVE_FORMAT_PCM: Final = 1
+WAVE_FORMAT_PCM: Final = 0x0001
 
 class _wave_params(NamedTuple):
     """_wave_params(nchannels, sampwidth, framerate, nframes, comptype, compname)"""
@@ -139,10 +140,15 @@ class Wave_read:
     def getcomptype(self) -> str: ...
     def getcompname(self) -> str: ...
     def getparams(self) -> _wave_params: ...
-    @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-    def getmarkers(self) -> None: ...
-    @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-    def getmark(self, id: Any) -> NoReturn: ...
+    if sys.version_info >= (3, 13):
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        def getmarkers(self) -> None: ...
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        def getmark(self, id: Any) -> NoReturn: ...
+    else:
+        def getmarkers(self) -> None: ...
+        def getmark(self, id: Any) -> NoReturn: ...
+
     def setpos(self, pos: int) -> None: ...
     def readframes(self, nframes: int) -> bytes: ...
 
@@ -189,12 +195,18 @@ class Wave_write:
     def getcompname(self) -> str: ...
     def setparams(self, params: _wave_params | tuple[int, int, int, int, str, str]) -> None: ...
     def getparams(self) -> _wave_params: ...
-    @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-    def setmark(self, id: Any, pos: Any, name: Any) -> NoReturn: ...
-    @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-    def getmark(self, id: Any) -> NoReturn: ...
-    @deprecated("Deprecated in Python 3.13; removal scheduled for Python 3.15")
-    def getmarkers(self) -> None: ...
+    if sys.version_info >= (3, 13):
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        def setmark(self, id: Any, pos: Any, name: Any) -> NoReturn: ...
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        def getmark(self, id: Any) -> NoReturn: ...
+        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        def getmarkers(self) -> None: ...
+    else:
+        def setmark(self, id: Any, pos: Any, name: Any) -> NoReturn: ...
+        def getmark(self, id: Any) -> NoReturn: ...
+        def getmarkers(self) -> None: ...
+
     def tell(self) -> int: ...
     def writeframesraw(self, data: ReadableBuffer) -> None: ...
     def writeframes(self, data: ReadableBuffer) -> None: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/weakref.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/weakref.pyi
index e7487c089f..4dbec668b1 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/weakref.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/weakref.pyi
@@ -11,7 +11,7 @@ from _weakrefset import WeakSet as WeakSet
 from collections.abc import Callable, Iterable, Iterator, Mapping, MutableMapping
 from types import GenericAlias
 from typing import Any, ClassVar, Generic, TypeVar, final, overload
-from typing_extensions import ParamSpec, Self
+from typing_extensions import ParamSpec, Self, disjoint_base
 
 __all__ = [
     "ref",
@@ -59,6 +59,7 @@ class ProxyType(Generic[_T]):  # "weakproxy"
     def __getattr__(self, attr: str) -> Any: ...
     __hash__: ClassVar[None]  # type: ignore[assignment]
 
+@disjoint_base
 class ReferenceType(Generic[_T]):  # "weakref"
     __callback__: Callable[[Self], Any]
     def __new__(cls, o: _T, callback: Callable[[Self], Any] | None = ..., /) -> Self: ...
@@ -80,6 +81,7 @@ class WeakMethod(ref[_CallableT]):
     a bound method, working around the lifetime problem of bound methods.
     """
 
+    __slots__ = ("_func_ref", "_meth_type", "_alive", "__weakref__")
     def __new__(cls, meth: _CallableT, callback: Callable[[Self], Any] | None = None) -> Self: ...
     def __call__(self) -> _CallableT | None: ...
     def __eq__(self, other: object) -> bool: ...
@@ -180,6 +182,7 @@ class KeyedRef(ref[_T], Generic[_KT, _T]):
 
     """
 
+    __slots__ = ("key",)
     key: _KT
     def __new__(type, ob: _T, callback: Callable[[Self], Any], key: _KT) -> Self: ...
     def __init__(self, ob: _T, callback: Callable[[Self], Any], key: _KT) -> None: ...
@@ -267,6 +270,7 @@ class finalize(Generic[_P, _T]):
     By default atexit is true.
     """
 
+    __slots__ = ()
     def __init__(self, obj: _T, func: Callable[_P, Any], /, *args: _P.args, **kwargs: _P.kwargs) -> None: ...
     def __call__(self, _: Any = None) -> Any | None:
         """If alive then mark as dead and return func(*args, **kwargs);
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/webbrowser.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/webbrowser.pyi
index 84e1466005..f02ee7477a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/webbrowser.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/webbrowser.pyi
@@ -116,20 +116,36 @@ if sys.platform == "win32":
 
 if sys.platform == "darwin":
     if sys.version_info < (3, 13):
-        @deprecated("Deprecated in 3.11, to be removed in 3.13.")
-        class MacOSX(BaseBrowser):
-            """Launcher class for Aqua browsers on Mac OS X
+        if sys.version_info >= (3, 11):
+            @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+            class MacOSX(BaseBrowser):
+                """Launcher class for Aqua browsers on Mac OS X
 
-            Optionally specify a browser name on instantiation.  Note that this
-            will not work for Aqua browsers if the user has moved the application
-            package after installation.
+                Optionally specify a browser name on instantiation.  Note that this
+                will not work for Aqua browsers if the user has moved the application
+                package after installation.
 
-            If no browser is specified, the default browser, as specified in the
-            Internet System Preferences panel, will be used.
-            """
+                If no browser is specified, the default browser, as specified in the
+                Internet System Preferences panel, will be used.
+                """
 
-            def __init__(self, name: str) -> None: ...
-            def open(self, url: str, new: int = 0, autoraise: bool = True) -> bool: ...
+                def __init__(self, name: str) -> None: ...
+                def open(self, url: str, new: int = 0, autoraise: bool = True) -> bool: ...
+
+        else:
+            class MacOSX(BaseBrowser):
+                """Launcher class for Aqua browsers on Mac OS X
+
+                Optionally specify a browser name on instantiation.  Note that this
+                will not work for Aqua browsers if the user has moved the application
+                package after installation.
+
+                If no browser is specified, the default browser, as specified in the
+                Internet System Preferences panel, will be used.
+                """
+
+                def __init__(self, name: str) -> None: ...
+                def open(self, url: str, new: int = 0, autoraise: bool = True) -> bool: ...
 
     class MacOSXOSAScript(BaseBrowser):  # In runtime this class does not have `name` and `basename`
         if sys.version_info >= (3, 11):
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/winreg.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/winreg.pyi
index ca9a49b033..ae3009add5 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/winreg.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/winreg.pyi
@@ -460,13 +460,13 @@ if sys.platform == "win32":
 
         Will generally raise NotImplementedError if executed on a 32bit OS.
         """
-    HKEY_CLASSES_ROOT: int
-    HKEY_CURRENT_USER: int
-    HKEY_LOCAL_MACHINE: int
-    HKEY_USERS: int
-    HKEY_PERFORMANCE_DATA: int
-    HKEY_CURRENT_CONFIG: int
-    HKEY_DYN_DATA: int
+    HKEY_CLASSES_ROOT: Final[int]
+    HKEY_CURRENT_USER: Final[int]
+    HKEY_LOCAL_MACHINE: Final[int]
+    HKEY_USERS: Final[int]
+    HKEY_PERFORMANCE_DATA: Final[int]
+    HKEY_CURRENT_CONFIG: Final[int]
+    HKEY_DYN_DATA: Final[int]
 
     KEY_ALL_ACCESS: Final = 983103
     KEY_WRITE: Final = 131078
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/headers.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/headers.pyi
index 324876c9ab..6019972f31 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/headers.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/headers.pyi
@@ -6,12 +6,12 @@ written by Barry Warsaw.
 """
 
 from re import Pattern
-from typing import overload
+from typing import Final, overload
 from typing_extensions import TypeAlias
 
 _HeaderList: TypeAlias = list[tuple[str, str]]
 
-tspecials: Pattern[str]  # undocumented
+tspecials: Final[Pattern[str]]  # undocumented
 
 class Headers:
     """Manage a collection of HTTP response headers"""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/simple_server.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/simple_server.pyi
index 4dd421534e..87bdda21f2 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/simple_server.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/wsgiref/simple_server.pyi
@@ -12,15 +12,15 @@ module.  See also the BaseHTTPServer module docs for other API information.
 
 from _typeshed.wsgi import ErrorStream, StartResponse, WSGIApplication, WSGIEnvironment
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from typing import TypeVar, overload
+from typing import Final, TypeVar, overload
 
 from .handlers import SimpleHandler
 
 __all__ = ["WSGIServer", "WSGIRequestHandler", "demo_app", "make_server"]
 
-server_version: str  # undocumented
-sys_version: str  # undocumented
-software_version: str  # undocumented
+server_version: Final[str]  # undocumented
+sys_version: Final[str]  # undocumented
+software_version: Final[str]  # undocumented
 
 class ServerHandler(SimpleHandler):  # undocumented
     server_software: str
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/NodeFilter.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/NodeFilter.pyi
index b1c7d2059a..47f645764b 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/NodeFilter.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/NodeFilter.pyi
@@ -1,4 +1,4 @@
-from typing import Literal
+from typing import Final
 from xml.dom.minidom import Node
 
 class NodeFilter:
@@ -6,21 +6,21 @@ class NodeFilter:
     This is the DOM2 NodeFilter interface. It contains only constants.
     """
 
-    FILTER_ACCEPT: Literal[1]
-    FILTER_REJECT: Literal[2]
-    FILTER_SKIP: Literal[3]
+    FILTER_ACCEPT: Final = 1
+    FILTER_REJECT: Final = 2
+    FILTER_SKIP: Final = 3
 
-    SHOW_ALL: int
-    SHOW_ELEMENT: int
-    SHOW_ATTRIBUTE: int
-    SHOW_TEXT: int
-    SHOW_CDATA_SECTION: int
-    SHOW_ENTITY_REFERENCE: int
-    SHOW_ENTITY: int
-    SHOW_PROCESSING_INSTRUCTION: int
-    SHOW_COMMENT: int
-    SHOW_DOCUMENT: int
-    SHOW_DOCUMENT_TYPE: int
-    SHOW_DOCUMENT_FRAGMENT: int
-    SHOW_NOTATION: int
+    SHOW_ALL: Final = 0xFFFFFFFF
+    SHOW_ELEMENT: Final = 0x00000001
+    SHOW_ATTRIBUTE: Final = 0x00000002
+    SHOW_TEXT: Final = 0x00000004
+    SHOW_CDATA_SECTION: Final = 0x00000008
+    SHOW_ENTITY_REFERENCE: Final = 0x00000010
+    SHOW_ENTITY: Final = 0x00000020
+    SHOW_PROCESSING_INSTRUCTION: Final = 0x00000040
+    SHOW_COMMENT: Final = 0x00000080
+    SHOW_DOCUMENT: Final = 0x00000100
+    SHOW_DOCUMENT_TYPE: Final = 0x00000200
+    SHOW_DOCUMENT_FRAGMENT: Final = 0x00000400
+    SHOW_NOTATION: Final = 0x00000800
     def acceptNode(self, node: Node) -> int: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/__init__.pyi
index b620f0ac0c..2022c8dc42 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/__init__.pyi
@@ -21,18 +21,19 @@ from .domreg import getDOMImplementation as getDOMImplementation, registerDOMImp
 class Node:
     """Class giving the NodeType constants."""
 
-    ELEMENT_NODE: Literal[1]
-    ATTRIBUTE_NODE: Literal[2]
-    TEXT_NODE: Literal[3]
-    CDATA_SECTION_NODE: Literal[4]
-    ENTITY_REFERENCE_NODE: Literal[5]
-    ENTITY_NODE: Literal[6]
-    PROCESSING_INSTRUCTION_NODE: Literal[7]
-    COMMENT_NODE: Literal[8]
-    DOCUMENT_NODE: Literal[9]
-    DOCUMENT_TYPE_NODE: Literal[10]
-    DOCUMENT_FRAGMENT_NODE: Literal[11]
-    NOTATION_NODE: Literal[12]
+    __slots__ = ()
+    ELEMENT_NODE: Final = 1
+    ATTRIBUTE_NODE: Final = 2
+    TEXT_NODE: Final = 3
+    CDATA_SECTION_NODE: Final = 4
+    ENTITY_REFERENCE_NODE: Final = 5
+    ENTITY_NODE: Final = 6
+    PROCESSING_INSTRUCTION_NODE: Final = 7
+    COMMENT_NODE: Final = 8
+    DOCUMENT_NODE: Final = 9
+    DOCUMENT_TYPE_NODE: Final = 10
+    DOCUMENT_FRAGMENT_NODE: Final = 11
+    NOTATION_NODE: Final = 12
 
 # ExceptionCode
 INDEX_SIZE_ERR: Final = 1
@@ -112,10 +113,10 @@ class ValidationErr(DOMException):
 class UserDataHandler:
     """Class giving the operation constants for UserDataHandler.handle()."""
 
-    NODE_CLONED: Literal[1]
-    NODE_IMPORTED: Literal[2]
-    NODE_DELETED: Literal[3]
-    NODE_RENAMED: Literal[4]
+    NODE_CLONED: Final = 1
+    NODE_IMPORTED: Final = 2
+    NODE_DELETED: Final = 3
+    NODE_RENAMED: Final = 4
 
 XML_NAMESPACE: Final = "http://www.w3.org/XML/1998/namespace"
 XMLNS_NAMESPACE: Final = "http://www.w3.org/2000/xmlns/"
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/expatbuilder.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/expatbuilder.pyi
index 658d9830d8..e5536237d7 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/expatbuilder.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/expatbuilder.pyi
@@ -5,7 +5,7 @@ This avoids all the overhead of SAX and pulldom to gain performance.
 """
 
 from _typeshed import ReadableBuffer, SupportsRead
-from typing import Any, NoReturn
+from typing import Any, Final, NoReturn
 from typing_extensions import TypeAlias
 from xml.dom.minidom import Document, DocumentFragment, DOMImplementation, Element, Node, TypeInfo
 from xml.dom.xmlbuilder import DOMBuilderFilter, Options
@@ -13,16 +13,17 @@ from xml.parsers.expat import XMLParserType
 
 _Model: TypeAlias = tuple[int, int, str | None, tuple[Any, ...]]  # same as in pyexpat
 
-TEXT_NODE = Node.TEXT_NODE
-CDATA_SECTION_NODE = Node.CDATA_SECTION_NODE
-DOCUMENT_NODE = Node.DOCUMENT_NODE
-FILTER_ACCEPT = DOMBuilderFilter.FILTER_ACCEPT
-FILTER_REJECT = DOMBuilderFilter.FILTER_REJECT
-FILTER_SKIP = DOMBuilderFilter.FILTER_SKIP
-FILTER_INTERRUPT = DOMBuilderFilter.FILTER_INTERRUPT
+TEXT_NODE: Final = Node.TEXT_NODE
+CDATA_SECTION_NODE: Final = Node.CDATA_SECTION_NODE
+DOCUMENT_NODE: Final = Node.DOCUMENT_NODE
+FILTER_ACCEPT: Final = DOMBuilderFilter.FILTER_ACCEPT
+FILTER_REJECT: Final = DOMBuilderFilter.FILTER_REJECT
+FILTER_SKIP: Final = DOMBuilderFilter.FILTER_SKIP
+FILTER_INTERRUPT: Final = DOMBuilderFilter.FILTER_INTERRUPT
 theDOMImplementation: DOMImplementation
 
 class ElementInfo:
+    __slots__ = ("_attr_info", "_model", "tagName")
     tagName: str
     def __init__(self, tagName: str, model: _Model | None = None) -> None: ...
     def getAttributeType(self, aname: str) -> TypeInfo: ...
@@ -94,19 +95,23 @@ class FilterVisibilityController:
     to make the whatToShow filter attribute work.
     """
 
+    __slots__ = ("filter",)
     filter: DOMBuilderFilter
     def __init__(self, filter: DOMBuilderFilter) -> None: ...
     def startContainer(self, node: Node) -> int: ...
     def acceptNode(self, node: Node) -> int: ...
 
 class FilterCrutch:
+    __slots__ = ("_builder", "_level", "_old_start", "_old_end")
     def __init__(self, builder: ExpatBuilder) -> None: ...
 
 class Rejecter(FilterCrutch):
+    __slots__ = ()
     def start_element_handler(self, *args: Any) -> None: ...
     def end_element_handler(self, *args: Any) -> None: ...
 
 class Skipper(FilterCrutch):
+    __slots__ = ()
     def start_element_handler(self, *args: Any) -> None: ...
     def end_element_handler(self, *args: Any) -> None: ...
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minicompat.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minicompat.pyi
index 2ca37b881b..a0dffd6cc5 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minicompat.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minicompat.pyi
@@ -14,6 +14,7 @@ _T = TypeVar("_T")
 StringTypes: tuple[type[str]]
 
 class NodeList(list[_T]):
+    __slots__ = ()
     @property
     def length(self) -> int:
         """The number of nodes in the NodeList."""
@@ -21,6 +22,7 @@ class NodeList(list[_T]):
     def item(self, index: int) -> _T | None: ...
 
 class EmptyNodeList(tuple[()]):
+    __slots__ = ()
     @property
     def length(self) -> Literal[0]:
         """The number of nodes in the NodeList."""
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minidom.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minidom.pyi
index e455f0f4b2..6547439155 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minidom.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/minidom.pyi
@@ -219,6 +219,7 @@ _AttrChildrenVar = TypeVar("_AttrChildrenVar", bound=_AttrChildren)
 _AttrChildrenPlusFragment = TypeVar("_AttrChildrenPlusFragment", bound=_AttrChildren | DocumentFragment)
 
 class Attr(Node):
+    __slots__ = ("_name", "_value", "namespaceURI", "_prefix", "childNodes", "_localName", "ownerDocument", "ownerElement")
     nodeType: ClassVar[Literal[2]]
     nodeName: str  # same as Attr.name
     nodeValue: str  # same as Attr.value
@@ -276,6 +277,7 @@ class NamedNodeMap:
     attributes as found in an input document.
     """
 
+    __slots__ = ("_attrs", "_attrsNS", "_ownerElement")
     def __init__(self, attrs: dict[str, Attr], attrsNS: dict[_NSName, Attr], ownerElement: Element) -> None: ...
     @property
     def length(self) -> int:
@@ -309,6 +311,7 @@ class NamedNodeMap:
 AttributeList = NamedNodeMap
 
 class TypeInfo:
+    __slots__ = ("namespace", "name")
     namespace: str | None
     name: str | None
     def __init__(self, namespace: Incomplete | None, name: str | None) -> None: ...
@@ -317,6 +320,20 @@ _ElementChildrenVar = TypeVar("_ElementChildrenVar", bound=_ElementChildren)
 _ElementChildrenPlusFragment = TypeVar("_ElementChildrenPlusFragment", bound=_ElementChildren | DocumentFragment)
 
 class Element(Node):
+    __slots__ = (
+        "ownerDocument",
+        "parentNode",
+        "tagName",
+        "nodeName",
+        "prefix",
+        "namespaceURI",
+        "_localName",
+        "childNodes",
+        "_attrs",
+        "_attrsNS",
+        "nextSibling",
+        "previousSibling",
+    )
     nodeType: ClassVar[Literal[1]]
     nodeName: str  # same as Element.tagName
     nodeValue: None
@@ -411,6 +428,7 @@ class Childless:
     the complexity of the Node methods that deal with children.
     """
 
+    __slots__ = ()
     attributes: None
     childNodes: EmptyNodeList
     @property
@@ -431,6 +449,7 @@ class Childless:
     def replaceChild(self, newChild: _NodesThatAreChildren | DocumentFragment, oldChild: _NodesThatAreChildren) -> NoReturn: ...
 
 class ProcessingInstruction(Childless, Node):
+    __slots__ = ("target", "data")
     nodeType: ClassVar[Literal[7]]
     nodeName: str  # same as ProcessingInstruction.target
     nodeValue: str  # same as ProcessingInstruction.data
@@ -459,6 +478,7 @@ class ProcessingInstruction(Childless, Node):
     def writexml(self, writer: SupportsWrite[str], indent: str = "", addindent: str = "", newl: str = "") -> None: ...
 
 class CharacterData(Childless, Node):
+    __slots__ = ("_data", "ownerDocument", "parentNode", "previousSibling", "nextSibling")
     nodeValue: str
     attributes: None
 
@@ -485,6 +505,7 @@ class CharacterData(Childless, Node):
     def replaceData(self, offset: int, count: int, arg: str) -> None: ...
 
 class Text(CharacterData):
+    __slots__ = ()
     nodeType: ClassVar[Literal[3]]
     nodeName: Literal["#text"]
     nodeValue: str  # same as CharacterData.data, the content of the text node
@@ -545,6 +566,7 @@ class Comment(CharacterData):
     def writexml(self, writer: SupportsWrite[str], indent: str = "", addindent: str = "", newl: str = "") -> None: ...
 
 class CDATASection(Text):
+    __slots__ = ()
     nodeType: ClassVar[Literal[4]]  # type: ignore[assignment]
     nodeName: Literal["#cdata-section"]  # type: ignore[assignment]
     nodeValue: str  # same as CharacterData.data, the content of the CDATA Section
@@ -557,6 +579,7 @@ class CDATASection(Text):
     def writexml(self, writer: SupportsWrite[str], indent: str = "", addindent: str = "", newl: str = "") -> None: ...
 
 class ReadOnlySequentialNamedNodeMap(Generic[_N]):
+    __slots__ = ("_seq",)
     def __init__(self, seq: Sequence[_N] = ()) -> None: ...
     def __len__(self) -> int: ...
     def getNamedItem(self, name: str) -> _N | None: ...
@@ -574,6 +597,7 @@ class ReadOnlySequentialNamedNodeMap(Generic[_N]):
 class Identified:
     """Mix-in class that supports the publicId and systemId attributes."""
 
+    __slots__ = ("publicId", "systemId")
     publicId: str | None
     systemId: str | None
 
@@ -681,6 +705,7 @@ class ElementInfo:
 
     """
 
+    __slots__ = ("tagName",)
     tagName: str
     def __init__(self, name: str) -> None: ...
     def getAttributeType(self, aname: str) -> TypeInfo: ...
@@ -700,6 +725,7 @@ class ElementInfo:
 _DocumentChildrenPlusFragment = TypeVar("_DocumentChildrenPlusFragment", bound=_DocumentChildren | DocumentFragment)
 
 class Document(Node, DocumentLS):
+    __slots__ = ("_elem_info", "doctype", "_id_search_stack", "childNodes", "_id_cache")
     nodeType: ClassVar[Literal[9]]
     nodeName: Literal["#document"]
     nodeValue: None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/pulldom.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/pulldom.pyi
index aef911a90f..2518ca34cc 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/pulldom.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/pulldom.pyi
@@ -101,7 +101,7 @@ class SAX2DOM(PullDOM):
     def ignorableWhitespace(self, chars: str) -> None: ...
     def characters(self, chars: str) -> None: ...
 
-default_bufsize: int
+default_bufsize: Final[int]
 
 def parse(
     stream_or_string: str | _SupportsReadClose[bytes] | _SupportsReadClose[str],
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/xmlbuilder.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/xmlbuilder.pyi
index 6a03e23a8e..837803c472 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/xmlbuilder.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/dom/xmlbuilder.pyi
@@ -1,7 +1,7 @@
 """Implementation of the DOM Level 3 'LS-Load' feature."""
 
 from _typeshed import SupportsRead
-from typing import Any, Literal, NoReturn
+from typing import Any, Final, Literal, NoReturn
 from xml.dom.minidom import Document, Node, _DOMErrorHandler
 
 __all__ = ["DOMBuilder", "DOMEntityResolver", "DOMInputSource"]
@@ -37,10 +37,10 @@ class DOMBuilder:
     entityResolver: DOMEntityResolver | None
     errorHandler: _DOMErrorHandler | None
     filter: DOMBuilderFilter | None
-    ACTION_REPLACE: Literal[1]
-    ACTION_APPEND_AS_CHILDREN: Literal[2]
-    ACTION_INSERT_AFTER: Literal[3]
-    ACTION_INSERT_BEFORE: Literal[4]
+    ACTION_REPLACE: Final = 1
+    ACTION_APPEND_AS_CHILDREN: Final = 2
+    ACTION_INSERT_AFTER: Final = 3
+    ACTION_INSERT_BEFORE: Final = 4
     def __init__(self) -> None: ...
     def setFeature(self, name: str, state: int) -> None: ...
     def supportsFeature(self, name: str) -> bool: ...
@@ -52,9 +52,11 @@ class DOMBuilder:
     def parseWithContext(self, input: DOMInputSource, cnode: Node, action: Literal[1, 2, 3, 4]) -> NoReturn: ...
 
 class DOMEntityResolver:
+    __slots__ = ("_opener",)
     def resolveEntity(self, publicId: str | None, systemId: str) -> DOMInputSource: ...
 
 class DOMInputSource:
+    __slots__ = ("byteStream", "characterStream", "stringData", "encoding", "publicId", "systemId", "baseURI")
     byteStream: SupportsRead[bytes] | None
     characterStream: SupportsRead[str] | None
     stringData: str | None
@@ -68,10 +70,10 @@ class DOMBuilderFilter:
     a DOM instance.
     """
 
-    FILTER_ACCEPT: Literal[1]
-    FILTER_REJECT: Literal[2]
-    FILTER_SKIP: Literal[3]
-    FILTER_INTERRUPT: Literal[4]
+    FILTER_ACCEPT: Final = 1
+    FILTER_REJECT: Final = 2
+    FILTER_SKIP: Final = 3
+    FILTER_INTERRUPT: Final = 4
     whatToShow: int
     def acceptNode(self, element: Node) -> Literal[1, 2, 3, 4]: ...
     def startContainer(self, element: Node) -> Literal[1, 2, 3, 4]: ...
@@ -86,8 +88,8 @@ class DocumentLS:
     def saveXML(self, snode: Node | None) -> str: ...
 
 class DOMImplementationLS:
-    MODE_SYNCHRONOUS: Literal[1]
-    MODE_ASYNCHRONOUS: Literal[2]
+    MODE_SYNCHRONOUS: Final = 1
+    MODE_ASYNCHRONOUS: Final = 2
     def createDOMBuilder(self, mode: Literal[1], schemaType: None) -> DOMBuilder: ...
     def createDOMWriter(self) -> NoReturn: ...
     def createDOMInputSource(self) -> DOMInputSource: ...
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementInclude.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementInclude.pyi
index fd829fdaa5..10784e7d40 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementInclude.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementInclude.pyi
@@ -9,9 +9,10 @@ class _Loader(Protocol):
     @overload
     def __call__(self, href: FileDescriptorOrPath, parse: Literal["text"], encoding: str | None = None) -> str: ...
 
-XINCLUDE: Final[str]
-XINCLUDE_INCLUDE: Final[str]
-XINCLUDE_FALLBACK: Final[str]
+XINCLUDE: Final = "{http://www.w3.org/2001/XInclude}"
+
+XINCLUDE_INCLUDE: Final = "{http://www.w3.org/2001/XInclude}include"
+XINCLUDE_FALLBACK: Final = "{http://www.w3.org/2001/XInclude}fallback"
 
 DEFAULT_MAX_INCLUSION_DEPTH: Final = 6
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementPath.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementPath.pyi
index ebfb4f1ffb..80f3c55c14 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementPath.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementPath.pyi
@@ -1,10 +1,10 @@
 from collections.abc import Callable, Generator, Iterable
 from re import Pattern
-from typing import Any, Literal, TypeVar, overload
+from typing import Any, Final, Literal, TypeVar, overload
 from typing_extensions import TypeAlias
 from xml.etree.ElementTree import Element
 
-xpath_tokenizer_re: Pattern[str]
+xpath_tokenizer_re: Final[Pattern[str]]
 
 _Token: TypeAlias = tuple[str, str]
 _Next: TypeAlias = Callable[[], _Token]
@@ -20,7 +20,7 @@ def prepare_descendant(next: _Next, token: _Token) -> _Callback | None: ...
 def prepare_parent(next: _Next, token: _Token) -> _Callback: ...
 def prepare_predicate(next: _Next, token: _Token) -> _Callback | None: ...
 
-ops: dict[str, Callable[[_Next, _Token], _Callback | None]]
+ops: Final[dict[str, Callable[[_Next, _Token], _Callback | None]]]
 
 class _SelectorContext:
     parent_map: dict[Element, Element] | None
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementTree.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementTree.pyi
index a92ae79cbd..99c3f287b6 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementTree.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/etree/ElementTree.pyi
@@ -38,7 +38,7 @@ from _collections_abc import dict_keys
 from _typeshed import FileDescriptorOrPath, ReadableBuffer, SupportsRead, SupportsWrite
 from collections.abc import Callable, Generator, ItemsView, Iterable, Iterator, Mapping, Sequence
 from typing import Any, Final, Generic, Literal, Protocol, SupportsIndex, TypeVar, overload, type_check_only
-from typing_extensions import TypeAlias, TypeGuard, deprecated
+from typing_extensions import TypeAlias, TypeGuard, deprecated, disjoint_base
 from xml.parsers.expat import XMLParserType
 
 __all__ = [
@@ -128,14 +128,13 @@ def canonicalize(
 ) -> None: ...
 
 # The tag for Element can be set to the Comment or ProcessingInstruction
-# functions defined in this module. _ElementCallable could be a recursive
-# type, but defining it that way uncovered a bug in pytype.
-_ElementCallable: TypeAlias = Callable[..., Element[Any]]
-_CallableElement: TypeAlias = Element[_ElementCallable]
+# functions defined in this module.
+_ElementCallable: TypeAlias = Callable[..., Element[_ElementCallable]]
 
 _Tag = TypeVar("_Tag", default=str, bound=str | _ElementCallable)
 _OtherTag = TypeVar("_OtherTag", default=str, bound=str | _ElementCallable)
 
+@disjoint_base
 class Element(Generic[_Tag]):
     tag: _Tag
     attrib: dict[str, str]
@@ -144,7 +143,7 @@ class Element(Generic[_Tag]):
     def __init__(self, tag: _Tag, attrib: dict[str, str] = {}, **extra: str) -> None: ...
     def append(self, subelement: Element[Any], /) -> None: ...
     def clear(self) -> None: ...
-    def extend(self, elements: Iterable[Element], /) -> None: ...
+    def extend(self, elements: Iterable[Element[Any]], /) -> None: ...
     def find(self, path: str, namespaces: dict[str, str] | None = None) -> Element | None: ...
     def findall(self, path: str, namespaces: dict[str, str] | None = None) -> list[Element]: ...
     @overload
@@ -155,7 +154,7 @@ class Element(Generic[_Tag]):
     def get(self, key: str, default: None = None) -> str | None: ...
     @overload
     def get(self, key: str, default: _T) -> str | _T: ...
-    def insert(self, index: int, subelement: Element, /) -> None: ...
+    def insert(self, index: int, subelement: Element[Any], /) -> None: ...
     def items(self) -> ItemsView[str, str]: ...
     def iter(self, tag: str | None = None) -> Generator[Element, None, None]: ...
     @overload
@@ -166,7 +165,7 @@ class Element(Generic[_Tag]):
     def keys(self) -> dict_keys[str, str]: ...
     # makeelement returns the type of self in Python impl, but not in C impl
     def makeelement(self, tag: _OtherTag, attrib: dict[str, str], /) -> Element[_OtherTag]: ...
-    def remove(self, subelement: Element, /) -> None: ...
+    def remove(self, subelement: Element[Any], /) -> None: ...
     def set(self, key: str, value: str, /) -> None: ...
     def __copy__(self) -> Element[_Tag]: ...  # returns the type of self in Python impl, but not in C impl
     def __deepcopy__(self, memo: Any, /) -> Element: ...  # Only exists in C impl
@@ -184,19 +183,19 @@ class Element(Generic[_Tag]):
     # Doesn't actually exist at runtime, but instance of the class are indeed iterable due to __getitem__.
     def __iter__(self) -> Iterator[Element]: ...
     @overload
-    def __setitem__(self, key: SupportsIndex, value: Element, /) -> None:
+    def __setitem__(self, key: SupportsIndex, value: Element[Any], /) -> None:
         """Set self[key] to value."""
 
     @overload
-    def __setitem__(self, key: slice, value: Iterable[Element], /) -> None: ...
+    def __setitem__(self, key: slice, value: Iterable[Element[Any]], /) -> None: ...
 
     # Doesn't really exist in earlier versions, where __len__ is called implicitly instead
     @deprecated("Testing an element's truth value is deprecated.")
     def __bool__(self) -> bool:
         """True if self else False"""
 
-def SubElement(parent: Element, tag: str, attrib: dict[str, str] = ..., **extra: str) -> Element: ...
-def Comment(text: str | None = None) -> _CallableElement:
+def SubElement(parent: Element[Any], tag: str, attrib: dict[str, str] = ..., **extra: str) -> Element: ...
+def Comment(text: str | None = None) -> Element[_ElementCallable]:
     """Comment element factory.
 
     This function creates a special element which the standard serializer
@@ -206,7 +205,7 @@ def Comment(text: str | None = None) -> _CallableElement:
 
     """
 
-def ProcessingInstruction(target: str, text: str | None = None) -> _CallableElement:
+def ProcessingInstruction(target: str, text: str | None = None) -> Element[_ElementCallable]:
     """Processing Instruction element factory.
 
     This function creates a special element which the standard serializer
@@ -257,7 +256,7 @@ class ElementTree(Generic[_Root]):
 
     """
 
-    def __init__(self, element: Element | None = None, file: _FileRead | None = None) -> None: ...
+    def __init__(self, element: Element[Any] | None = None, file: _FileRead | None = None) -> None: ...
     def getroot(self) -> _Root:
         """Return root element of this tree."""
 
@@ -373,7 +372,7 @@ class ElementTree(Generic[_Root]):
 
     def write_c14n(self, file: _FileWriteC14N) -> None: ...
 
-HTML_EMPTY: set[str]
+HTML_EMPTY: Final[set[str]]
 
 def register_namespace(prefix: str, uri: str) -> None:
     """Register a namespace prefix.
@@ -390,7 +389,7 @@ def register_namespace(prefix: str, uri: str) -> None:
 
 @overload
 def tostring(
-    element: Element,
+    element: Element[Any],
     encoding: None = None,
     method: Literal["xml", "html", "text", "c14n"] | None = None,
     *,
@@ -414,7 +413,7 @@ def tostring(
 
 @overload
 def tostring(
-    element: Element,
+    element: Element[Any],
     encoding: Literal["unicode"],
     method: Literal["xml", "html", "text", "c14n"] | None = None,
     *,
@@ -424,7 +423,7 @@ def tostring(
 ) -> str: ...
 @overload
 def tostring(
-    element: Element,
+    element: Element[Any],
     encoding: str,
     method: Literal["xml", "html", "text", "c14n"] | None = None,
     *,
@@ -434,7 +433,7 @@ def tostring(
 ) -> Any: ...
 @overload
 def tostringlist(
-    element: Element,
+    element: Element[Any],
     encoding: None = None,
     method: Literal["xml", "html", "text", "c14n"] | None = None,
     *,
@@ -444,7 +443,7 @@ def tostringlist(
 ) -> list[bytes]: ...
 @overload
 def tostringlist(
-    element: Element,
+    element: Element[Any],
     encoding: Literal["unicode"],
     method: Literal["xml", "html", "text", "c14n"] | None = None,
     *,
@@ -454,7 +453,7 @@ def tostringlist(
 ) -> list[str]: ...
 @overload
 def tostringlist(
-    element: Element,
+    element: Element[Any],
     encoding: str,
     method: Literal["xml", "html", "text", "c14n"] | None = None,
     *,
@@ -462,7 +461,7 @@ def tostringlist(
     default_namespace: str | None = None,
     short_empty_elements: bool = True,
 ) -> list[Any]: ...
-def dump(elem: Element | ElementTree[Any]) -> None:
+def dump(elem: Element[Any] | ElementTree[Any]) -> None:
     """Write element tree or element structure to sys.stdout.
 
     This function should be used for debugging only.
@@ -473,7 +472,7 @@ def dump(elem: Element | ElementTree[Any]) -> None:
 
     """
 
-def indent(tree: Element | ElementTree[Any], space: str = "  ", level: int = 0) -> None:
+def indent(tree: Element[Any] | ElementTree[Any], space: str = "  ", level: int = 0) -> None:
     """Indent an XML document by inserting newlines and indentation space
     after elements.
 
@@ -594,6 +593,7 @@ def fromstringlist(sequence: Sequence[str | ReadableBuffer], parser: XMLParser |
 # elementfactories.
 _ElementFactory: TypeAlias = Callable[[Any, dict[Any, Any]], Element]
 
+@disjoint_base
 class TreeBuilder:
     # comment_factory can take None because passing None to Comment is not an error
     def __init__(
@@ -681,6 +681,7 @@ _E = TypeVar("_E", default=Element)
 # The default target is TreeBuilder, which returns Element.
 # C14NWriterTarget does not implement a close method, so using it results
 # in a type of XMLParser[None].
+@disjoint_base
 class XMLParser(Generic[_E]):
     parser: XMLParserType
     target: _Target
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/__init__.pyi
index e9f5a4de55..48fd8107f2 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/__init__.pyi
@@ -22,7 +22,7 @@ expatreader -- Driver that allows use of the Expat parser with SAX.
 import sys
 from _typeshed import ReadableBuffer, StrPath, SupportsRead, _T_co
 from collections.abc import Iterable
-from typing import Protocol, type_check_only
+from typing import Final, Protocol, type_check_only
 from typing_extensions import TypeAlias
 from xml.sax._exceptions import (
     SAXException as SAXException,
@@ -40,7 +40,7 @@ class _SupportsReadClose(SupportsRead[_T_co], Protocol[_T_co]):
 
 _Source: TypeAlias = StrPath | _SupportsReadClose[bytes] | _SupportsReadClose[str]
 
-default_parser_list: list[str]
+default_parser_list: Final[list[str]]
 
 def make_parser(parser_list: Iterable[str] = ()) -> XMLReader:
     """Creates and returns a SAX parser.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/expatreader.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/expatreader.pyi
index 366cb60c80..42e85c503a 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/expatreader.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/expatreader.pyi
@@ -6,7 +6,7 @@ pyexpat.__version__ == '2.22'.
 import sys
 from _typeshed import ReadableBuffer
 from collections.abc import Mapping
-from typing import Any, Literal, overload
+from typing import Any, Final, Literal, overload
 from typing_extensions import TypeAlias
 from xml.sax import _Source, xmlreader
 from xml.sax.handler import _ContentHandlerProtocol
@@ -16,7 +16,7 @@ if sys.version_info >= (3, 10):
 
 _BoolType: TypeAlias = Literal[0, 1] | bool
 
-version: str
+version: Final[str]
 AttributesImpl = xmlreader.AttributesImpl
 AttributesNSImpl = xmlreader.AttributesNSImpl
 
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/handler.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/handler.pyi
index d35ad8a713..97f8c2f4fa 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/handler.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/xml/sax/handler.pyi
@@ -10,10 +10,10 @@ $Id$
 """
 
 import sys
-from typing import Literal, NoReturn, Protocol, type_check_only
+from typing import Final, NoReturn, Protocol, type_check_only
 from xml.sax import xmlreader
 
-version: str
+version: Final[str]
 
 @type_check_only
 class _ErrorHandlerProtocol(Protocol):  # noqa: Y046  # Protocol is not used
@@ -261,20 +261,20 @@ class EntityResolver:
         to read from.
         """
 
-feature_namespaces: str
-feature_namespace_prefixes: str
-feature_string_interning: str
-feature_validation: str
-feature_external_ges: str
-feature_external_pes: str
-all_features: list[str]
-property_lexical_handler: Literal["http://xml.org/sax/properties/lexical-handler"]
-property_declaration_handler: Literal["http://xml.org/sax/properties/declaration-handler"]
-property_dom_node: Literal["http://xml.org/sax/properties/dom-node"]
-property_xml_string: Literal["http://xml.org/sax/properties/xml-string"]
-property_encoding: Literal["http://www.python.org/sax/properties/encoding"]
-property_interning_dict: Literal["http://www.python.org/sax/properties/interning-dict"]
-all_properties: list[str]
+feature_namespaces: Final = "http://xml.org/sax/features/namespaces"
+feature_namespace_prefixes: Final = "http://xml.org/sax/features/namespace-prefixes"
+feature_string_interning: Final = "http://xml.org/sax/features/string-interning"
+feature_validation: Final = "http://xml.org/sax/features/validation"
+feature_external_ges: Final[str]  # too long string
+feature_external_pes: Final[str]  # too long string
+all_features: Final[list[str]]
+property_lexical_handler: Final = "http://xml.org/sax/properties/lexical-handler"
+property_declaration_handler: Final = "http://xml.org/sax/properties/declaration-handler"
+property_dom_node: Final = "http://xml.org/sax/properties/dom-node"
+property_xml_string: Final = "http://xml.org/sax/properties/xml-string"
+property_encoding: Final = "http://www.python.org/sax/properties/encoding"
+property_interning_dict: Final[str]  # too long string
+all_properties: Final[list[str]]
 
 if sys.version_info >= (3, 10):
     class LexicalHandler:
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/__init__.pyi
index 945c3d7365..0389fe1cba 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/__init__.pyi
@@ -217,7 +217,7 @@ class ZipFile:
         def __init__(
             self,
             file: StrPath | _ZipWritable,
-            mode: Literal["w", "x"] = ...,
+            mode: Literal["w", "x"],
             compression: int = 0,
             allowZip64: bool = True,
             compresslevel: int | None = None,
@@ -229,7 +229,7 @@ class ZipFile:
         def __init__(
             self,
             file: StrPath | _ZipReadableTellable,
-            mode: Literal["a"] = ...,
+            mode: Literal["a"],
             compression: int = 0,
             allowZip64: bool = True,
             compresslevel: int | None = None,
@@ -268,7 +268,7 @@ class ZipFile:
         def __init__(
             self,
             file: StrPath | _ZipWritable,
-            mode: Literal["w", "x"] = ...,
+            mode: Literal["w", "x"],
             compression: int = 0,
             allowZip64: bool = True,
             compresslevel: int | None = None,
@@ -279,7 +279,7 @@ class ZipFile:
         def __init__(
             self,
             file: StrPath | _ZipReadableTellable,
-            mode: Literal["a"] = ...,
+            mode: Literal["a"],
             compression: int = 0,
             allowZip64: bool = True,
             compresslevel: int | None = None,
@@ -417,6 +417,29 @@ class PyZipFile(ZipFile):
 class ZipInfo:
     """Class with attributes describing each file in the ZIP archive."""
 
+    __slots__ = (
+        "orig_filename",
+        "filename",
+        "date_time",
+        "compress_type",
+        "compress_level",
+        "comment",
+        "extra",
+        "create_system",
+        "create_version",
+        "extract_version",
+        "reserved",
+        "flag_bits",
+        "volume",
+        "internal_attr",
+        "external_attr",
+        "header_offset",
+        "CRC",
+        "compress_size",
+        "file_size",
+        "_raw_time",
+        "_end_offset",
+    )
     filename: str
     date_time: _DateTuple
     compress_type: int
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/_path/glob.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/_path/glob.pyi
index 8722f25246..8c607b19d1 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/_path/glob.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/zipfile/_path/glob.pyi
@@ -16,7 +16,11 @@ if sys.version_info >= (3, 13):
         AssertionError: Invalid separators
         """
 
-        def __init__(self, seps: str = ...) -> None: ...
+        if sys.platform == "win32":
+            def __init__(self, seps: str = "\\/") -> None: ...
+        else:
+            def __init__(self, seps: str = "/") -> None: ...
+
         def translate(self, pattern: str) -> str:
             """
             Given a glob pattern, produce a regex that matches it.
diff --git a/crates/ty_vendored/vendor/typeshed/stdlib/zoneinfo/__init__.pyi b/crates/ty_vendored/vendor/typeshed/stdlib/zoneinfo/__init__.pyi
index 8a04019d39..9cae9b7de8 100644
--- a/crates/ty_vendored/vendor/typeshed/stdlib/zoneinfo/__init__.pyi
+++ b/crates/ty_vendored/vendor/typeshed/stdlib/zoneinfo/__init__.pyi
@@ -1,7 +1,7 @@
 import sys
 from collections.abc import Iterable
 from datetime import datetime, timedelta, tzinfo
-from typing_extensions import Self
+from typing_extensions import Self, disjoint_base
 from zoneinfo._common import ZoneInfoNotFoundError as ZoneInfoNotFoundError, _IOBytes
 from zoneinfo._tzpath import (
     TZPATH as TZPATH,
@@ -12,6 +12,7 @@ from zoneinfo._tzpath import (
 
 __all__ = ["ZoneInfo", "reset_tzpath", "available_timezones", "TZPATH", "ZoneInfoNotFoundError", "InvalidTZPathWarning"]
 
+@disjoint_base
 class ZoneInfo(tzinfo):
     @property
     def key(self) -> str: ...
diff --git a/crates/ty_wasm/Cargo.toml b/crates/ty_wasm/Cargo.toml
index 42dfb66118..4ce9913eda 100644
--- a/crates/ty_wasm/Cargo.toml
+++ b/crates/ty_wasm/Cargo.toml
@@ -40,6 +40,7 @@ log = { workspace = true }
 # See https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { workspace = true, features = ["wasm_js"] }
 serde-wasm-bindgen = { workspace = true }
+tracing = { workspace = true, features = ["log"] }
 # Not a direct dependency but required to compile for Wasm.
 uuid = { workspace = true, features = ["js"] }
 
@@ -50,3 +51,7 @@ wasm-bindgen-test = { workspace = true }
 
 [lints]
 workspace = true
+
+[package.metadata.cargo-shear]
+# Depended on only to enable `log` feature as of 2025-10-03.
+ignored = ["tracing"]
diff --git a/crates/ty_wasm/src/lib.rs b/crates/ty_wasm/src/lib.rs
index ced09a5164..ca16fbd36c 100644
--- a/crates/ty_wasm/src/lib.rs
+++ b/crates/ty_wasm/src/lib.rs
@@ -415,16 +415,37 @@ impl Workspace {
 
         let offset = position.to_text_size(&source, &index, self.position_encoding)?;
 
-        let completions = ty_ide::completion(&self.db, file_id.file, offset);
+        let settings = ty_ide::CompletionSettings { auto_import: true };
+        let completions = ty_ide::completion(&self.db, &settings, file_id.file, offset);
 
         Ok(completions
             .into_iter()
-            .map(|completion| Completion {
-                kind: completion.kind(&self.db).map(CompletionKind::from),
-                name: completion.inner.name.into(),
-                documentation: completion
-                    .documentation
-                    .map(|documentation| documentation.render_plaintext()),
+            .map(|comp| {
+                let kind = comp.kind(&self.db).map(CompletionKind::from);
+                let type_display = comp.ty.map(|ty| ty.display(&self.db).to_string());
+                let import_edit = comp.import.as_ref().map(|edit| {
+                    let range = Range::from_text_range(
+                        edit.range(),
+                        &index,
+                        &source,
+                        self.position_encoding,
+                    );
+                    TextEdit {
+                        range,
+                        new_text: edit.content().map(ToString::to_string).unwrap_or_default(),
+                    }
+                });
+                Completion {
+                    name: comp.name.into(),
+                    kind,
+                    detail: type_display,
+                    module_name: comp.module_name.map(ToString::to_string),
+                    insert_text: comp.insert.map(String::from),
+                    additional_text_edits: import_edit.map(|edit| vec![edit]),
+                    documentation: comp
+                        .documentation
+                        .map(|docstring| docstring.render_plaintext()),
+                }
             })
             .collect())
     }
@@ -448,13 +469,14 @@ impl Workspace {
         Ok(result
             .into_iter()
             .map(|hint| InlayHint {
-                markdown: hint.display(&self.db).to_string(),
+                markdown: hint.display().to_string(),
                 position: Position::from_text_size(
                     hint.position,
                     &index,
                     &source,
                     self.position_encoding,
                 ),
+                kind: hint.kind.into(),
             })
             .collect())
     }
@@ -912,7 +934,15 @@ pub struct Completion {
     pub name: String,
     pub kind: Option<CompletionKind>,
     #[wasm_bindgen(getter_with_clone)]
+    pub insert_text: Option<String>,
+    #[wasm_bindgen(getter_with_clone)]
+    pub additional_text_edits: Option<Vec<TextEdit>>,
+    #[wasm_bindgen(getter_with_clone)]
     pub documentation: Option<String>,
+    #[wasm_bindgen(getter_with_clone)]
+    pub detail: Option<String>,
+    #[wasm_bindgen(getter_with_clone)]
+    pub module_name: Option<String>,
 }
 
 #[wasm_bindgen]
@@ -945,34 +975,58 @@ pub enum CompletionKind {
     TypeParameter,
 }
 
-impl From<ty_python_semantic::CompletionKind> for CompletionKind {
-    fn from(value: ty_python_semantic::CompletionKind) -> Self {
+impl From<ty_ide::CompletionKind> for CompletionKind {
+    fn from(value: ty_ide::CompletionKind) -> Self {
         match value {
-            ty_python_semantic::CompletionKind::Text => Self::Text,
-            ty_python_semantic::CompletionKind::Method => Self::Method,
-            ty_python_semantic::CompletionKind::Function => Self::Function,
-            ty_python_semantic::CompletionKind::Constructor => Self::Constructor,
-            ty_python_semantic::CompletionKind::Field => Self::Field,
-            ty_python_semantic::CompletionKind::Variable => Self::Variable,
-            ty_python_semantic::CompletionKind::Class => Self::Class,
-            ty_python_semantic::CompletionKind::Interface => Self::Interface,
-            ty_python_semantic::CompletionKind::Module => Self::Module,
-            ty_python_semantic::CompletionKind::Property => Self::Property,
-            ty_python_semantic::CompletionKind::Unit => Self::Unit,
-            ty_python_semantic::CompletionKind::Value => Self::Value,
-            ty_python_semantic::CompletionKind::Enum => Self::Enum,
-            ty_python_semantic::CompletionKind::Keyword => Self::Keyword,
-            ty_python_semantic::CompletionKind::Snippet => Self::Snippet,
-            ty_python_semantic::CompletionKind::Color => Self::Color,
-            ty_python_semantic::CompletionKind::File => Self::File,
-            ty_python_semantic::CompletionKind::Reference => Self::Reference,
-            ty_python_semantic::CompletionKind::Folder => Self::Folder,
-            ty_python_semantic::CompletionKind::EnumMember => Self::EnumMember,
-            ty_python_semantic::CompletionKind::Constant => Self::Constant,
-            ty_python_semantic::CompletionKind::Struct => Self::Struct,
-            ty_python_semantic::CompletionKind::Event => Self::Event,
-            ty_python_semantic::CompletionKind::Operator => Self::Operator,
-            ty_python_semantic::CompletionKind::TypeParameter => Self::TypeParameter,
+            ty_ide::CompletionKind::Text => Self::Text,
+            ty_ide::CompletionKind::Method => Self::Method,
+            ty_ide::CompletionKind::Function => Self::Function,
+            ty_ide::CompletionKind::Constructor => Self::Constructor,
+            ty_ide::CompletionKind::Field => Self::Field,
+            ty_ide::CompletionKind::Variable => Self::Variable,
+            ty_ide::CompletionKind::Class => Self::Class,
+            ty_ide::CompletionKind::Interface => Self::Interface,
+            ty_ide::CompletionKind::Module => Self::Module,
+            ty_ide::CompletionKind::Property => Self::Property,
+            ty_ide::CompletionKind::Unit => Self::Unit,
+            ty_ide::CompletionKind::Value => Self::Value,
+            ty_ide::CompletionKind::Enum => Self::Enum,
+            ty_ide::CompletionKind::Keyword => Self::Keyword,
+            ty_ide::CompletionKind::Snippet => Self::Snippet,
+            ty_ide::CompletionKind::Color => Self::Color,
+            ty_ide::CompletionKind::File => Self::File,
+            ty_ide::CompletionKind::Reference => Self::Reference,
+            ty_ide::CompletionKind::Folder => Self::Folder,
+            ty_ide::CompletionKind::EnumMember => Self::EnumMember,
+            ty_ide::CompletionKind::Constant => Self::Constant,
+            ty_ide::CompletionKind::Struct => Self::Struct,
+            ty_ide::CompletionKind::Event => Self::Event,
+            ty_ide::CompletionKind::Operator => Self::Operator,
+            ty_ide::CompletionKind::TypeParameter => Self::TypeParameter,
+        }
+    }
+}
+
+#[wasm_bindgen]
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct TextEdit {
+    pub range: Range,
+    #[wasm_bindgen(getter_with_clone)]
+    pub new_text: String,
+}
+
+#[wasm_bindgen]
+#[derive(Debug, Clone, PartialEq, Eq, Copy)]
+pub enum InlayHintKind {
+    Type,
+    Parameter,
+}
+
+impl From<ty_ide::InlayHintKind> for InlayHintKind {
+    fn from(kind: ty_ide::InlayHintKind) -> Self {
+        match kind {
+            ty_ide::InlayHintKind::Type => Self::Type,
+            ty_ide::InlayHintKind::CallArgumentName => Self::Parameter,
         }
     }
 }
@@ -984,6 +1038,8 @@ pub struct InlayHint {
     pub markdown: String,
 
     pub position: Position,
+
+    pub kind: InlayHintKind,
 }
 
 #[wasm_bindgen]
@@ -1209,6 +1265,10 @@ impl System for WasmSystem {
     fn as_any_mut(&mut self) -> &mut dyn Any {
         self
     }
+
+    fn dyn_clone(&self) -> Box<dyn System> {
+        Box::new(self.clone())
+    }
 }
 
 fn not_found() -> std::io::Error {
diff --git a/dist-workspace.toml b/dist-workspace.toml
index ebbf36ab20..5d1b64992e 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -5,7 +5,7 @@ packages = ["ruff"]
 # Config for 'dist'
 [dist]
 # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.28.5-prerelease.1"
+cargo-dist-version = "0.30.0"
 # Whether to consider the binaries in a package for distribution (defaults true)
 dist = false
 # CI backends to support
@@ -54,11 +54,7 @@ local-artifacts-jobs = ["./build-binaries", "./build-docker"]
 # Publish jobs to run in CI
 publish-jobs = ["./publish-pypi", "./publish-wasm"]
 # Post-announce jobs to run in CI
-post-announce-jobs = [
-    "./notify-dependents",
-    "./publish-docs",
-    "./publish-playground"
-]
+post-announce-jobs = ["./notify-dependents", "./publish-docs", "./publish-playground"]
 # Custom permissions for GitHub Jobs
 github-custom-job-permissions = { "build-docker" = { packages = "write", contents = "read" }, "publish-wasm" = { contents = "read", id-token = "write", packages = "write" } }
 # Whether to install an updater program
@@ -70,7 +66,7 @@ install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 global = "depot-ubuntu-latest-4"
 
 [dist.github-action-commits]
-"actions/checkout" = "08c6903cd8c0fde910a37f88322edcfb5dd907a8" # v5.0.0
+"actions/checkout" = "ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v5.0.0
 "actions/upload-artifact" = "6027e3dd177782cd8ab9af838c04fd81a07f1d47" # v4.6.2
 "actions/download-artifact" = "634f93cb2916e3fdff6788551b99b062d0335ce0" # v5.0.0
 "actions/attest-build-provenance" = "c074443f1aee8d4aeeae555aebba3282517141b2" #v2.2.3
diff --git a/docs/configuration.md b/docs/configuration.md
index 0b79a20de9..8d3297fbca 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -727,6 +727,11 @@ Options:
       --preview
           Enable preview mode; enables unstable formatting. Use `--no-preview`
           to disable
+      --output-format <OUTPUT_FORMAT>
+          Output serialization format for violations, when used with `--check`.
+          The default serialization format is "full" [env: RUFF_OUTPUT_FORMAT=]
+          [possible values: concise, full, json, json-lines, junit, grouped,
+          github, gitlab, pylint, rdjson, azure, sarif]
   -h, --help
           Print help (see more with '--help')
 
diff --git a/docs/editors/settings.md b/docs/editors/settings.md
index d15d145ef0..035dd23852 100644
--- a/docs/editors/settings.md
+++ b/docs/editors/settings.md
@@ -971,6 +971,62 @@ Whether to enable Ruff's preview mode when formatting.
     }
     ```
 
+### `backend` {: #format_backend }
+
+The backend to use for formatting files. Following options are available:
+
+- `"internal"`: Use the built-in Ruff formatter
+- `"uv"`: Use uv for formatting (requires uv >= 0.8.13)
+
+For `internal`, the formatter version will match the selected Ruff version while for `uv`, the
+formatter version may differ.
+
+**Default value**: `"internal"`
+
+**Type**: `"internal" | "uv"`
+
+**Example usage**:
+
+=== "VS Code"
+
+    ```json
+    {
+        "ruff.format.backend": "uv"
+    }
+    ```
+
+=== "Neovim"
+
+    ```lua
+    require('lspconfig').ruff.setup {
+      init_options = {
+        settings = {
+          format = {
+            backend = "uv"
+          }
+        }
+      }
+    }
+    ```
+
+=== "Zed"
+
+    ```json
+    {
+      "lsp": {
+        "ruff": {
+          "initialization_options": {
+            "settings": {
+              "format": {
+                "backend": "uv"
+              }
+            }
+          }
+        }
+      }
+    }
+    ```
+
 ## VS Code specific
 
 Additionally, the Ruff extension provides the following settings specific to VS Code. These settings
diff --git a/docs/editors/setup.md b/docs/editors/setup.md
index f50f3abbd3..3d81935465 100644
--- a/docs/editors/setup.md
+++ b/docs/editors/setup.md
@@ -464,59 +464,46 @@ under the [`lsp.ruff.initialization_options.settings`](https://zed.dev/docs/conf
 }
 ```
 
-!!! note
-
-    Support for multiple formatters for a given language is only available in Zed version
-    `0.146.0` and later.
-
 You can configure Ruff to format Python code on-save by registering the Ruff formatter
 and enabling the [`format_on_save`](https://zed.dev/docs/configuring-zed#format-on-save) setting:
 
-=== "Zed 0.146.0+"
-
-    ```json
-    {
-      "languages": {
-        "Python": {
-          "language_servers": ["ruff"],
-          "format_on_save": "on",
-          "formatter": [
-            {
-              "language_server": {
-                "name": "ruff"
-              }
-            }
-          ]
+```json
+{
+  "languages": {
+    "Python": {
+      "language_servers": ["ruff"],
+      "format_on_save": "on",
+      "formatter": [
+        {
+          "language_server": {
+            "name": "ruff"
+          }
         }
-      }
+      ]
     }
-    ```
+  }
+}
+```
 
 You can configure Ruff to fix lint violations and/or organize imports on-save by enabling the
 `source.fixAll.ruff` and `source.organizeImports.ruff` code actions respectively:
 
-=== "Zed 0.146.0+"
-
-    ```json
-    {
-      "languages": {
-        "Python": {
-          "language_servers": ["ruff"],
-          "format_on_save": "on",
-          "formatter": [
-            {
-              "code_actions": {
-                // Fix all auto-fixable lint violations
-                "source.fixAll.ruff": true,
-                // Organize imports
-                "source.organizeImports.ruff": true
-              }
-            }
-          ]
-        }
-      }
+```json
+{
+  "languages": {
+    "Python": {
+      "language_servers": ["ruff"],
+      "format_on_save": "on",
+      "formatter": [
+        // Fix all auto-fixable lint violations
+        { "code_action": "source.fixAll.ruff" },
+        // Organize imports
+        { "code_action": "source.organizeImports.ruff" }
+      ]
     }
-    ```
+  }
+}
+```
 
 Taken together, you can configure Ruff to format, fix, and organize imports on-save via the
 following `settings.json`:
@@ -528,28 +515,18 @@ following `settings.json`:
     ensure that the formatter takes care of any remaining style issues after the code actions have
     been applied.
 
-=== "Zed 0.146.0+"
-
-    ```json
-    {
-      "languages": {
-        "Python": {
-          "language_servers": ["ruff"],
-          "format_on_save": "on",
-          "formatter": [
-            {
-              "code_actions": {
-                "source.organizeImports.ruff": true,
-                "source.fixAll.ruff": true
-              }
-            },
-            {
-              "language_server": {
-                "name": "ruff"
-              }
-            }
-          ]
-        }
-      }
+```json
+{
+  "languages": {
+    "Python": {
+      "language_servers": ["ruff"],
+      "format_on_save": "on",
+      "formatter": [
+        { "code_action": "source.fixAll.ruff" },
+        { "code_action": "source.organizeImports.ruff" },
+        { "language_server": { "name": "ruff" } }
+      ]
     }
-    ```
+  }
+}
+```
diff --git a/docs/faq.md b/docs/faq.md
index 6ed942e1f3..68e69ee9bd 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -310,8 +310,7 @@ my_project
 When Ruff sees an import like `import foo`, it will then iterate over the `src` directories,
 looking for a corresponding Python module (in reality, a directory named `foo` or a file named
 `foo.py`). For module paths with multiple components like `import foo.bar`,
-the default behavior is to search only for a directory named `foo` or a file
-named `foo.py`. However, if `preview` is enabled, Ruff will require that the full relative path `foo/bar` exists as a directory, or that `foo/bar.py` or `foo/bar.pyi` exist as files. Finally, imports of the form `from foo import bar`, Ruff will only use `foo` when determining whether a module is first-party or third-party. 
+Ruff will require that the full relative path `foo/bar` exists as a directory, or that `foo/bar.py` or `foo/bar.pyi` exist as files. Finally, for imports of the form `from foo import bar`, Ruff will only use `foo` when determining whether a module is first-party or third-party.
 
 If there is a directory
 whose name matches a third-party package, but does not contain Python code,
@@ -560,7 +559,7 @@ The PEP 257 convention includes all `D` errors apart from:
 [`D409`](rules/mismatched-section-underline-length.md),
 [`D410`](rules/no-blank-line-after-section.md),
 [`D411`](rules/no-blank-line-before-section.md),
-[`D413`](rules/no-blank-line-after-section.md),
+[`D413`](rules/missing-blank-line-after-last-section.md),
 [`D415`](rules/missing-terminal-punctuation.md),
 [`D416`](rules/missing-section-name-colon.md), and
 [`D417`](rules/undocumented-param.md).
@@ -571,7 +570,7 @@ The NumPy convention includes all `D` errors apart from:
 [`D212`](rules/multi-line-summary-first-line.md),
 [`D213`](rules/multi-line-summary-second-line.md),
 [`D402`](rules/signature-in-docstring.md),
-[`D413`](rules/no-blank-line-after-section.md),
+[`D413`](rules/missing-blank-line-after-last-section.md),
 [`D415`](rules/missing-terminal-punctuation.md),
 [`D416`](rules/missing-section-name-colon.md), and
 [`D417`](rules/undocumented-param.md).
@@ -588,7 +587,7 @@ The Google convention includes all `D` errors apart from:
 [`D407`](rules/missing-dashed-underline-after-section.md),
 [`D408`](rules/missing-section-underline-after-name.md),
 [`D409`](rules/mismatched-section-underline-length.md), and
-[`D413`](rules/no-blank-line-after-section.md).
+[`D413`](rules/missing-blank-line-after-last-section.md).
 
 By default, no [`convention`](settings.md#lint_pydocstyle_convention) is set, and so the enabled rules
 are determined by the [`select`](settings.md#lint_select) setting alone.
diff --git a/docs/integrations.md b/docs/integrations.md
index f6b2d10d4d..441845a474 100644
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -80,7 +80,7 @@ You can add the following configuration to `.gitlab-ci.yml` to run a `ruff forma
   stage: build
   interruptible: true
   image:
-    name: ghcr.io/astral-sh/ruff:0.12.9-alpine
+    name: ghcr.io/astral-sh/ruff:0.14.2-alpine
   before_script:
     - cd $CI_PROJECT_DIR
     - ruff --version
@@ -106,7 +106,7 @@ Ruff can be used as a [pre-commit](https://pre-commit.com) hook via [`ruff-pre-c
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.9
+  rev: v0.14.2
   hooks:
     # Run the linter.
     - id: ruff-check
@@ -119,7 +119,7 @@ To enable lint fixes, add the `--fix` argument to the lint hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.9
+  rev: v0.14.2
   hooks:
     # Run the linter.
     - id: ruff-check
@@ -133,7 +133,7 @@ To avoid running on Jupyter Notebooks, remove `jupyter` from the list of allowed
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.9
+  rev: v0.14.2
   hooks:
     # Run the linter.
     - id: ruff-check
diff --git a/docs/requirements-insiders.txt b/docs/requirements-insiders.txt
index 3da4b69557..a225850aff 100644
--- a/docs/requirements-insiders.txt
+++ b/docs/requirements-insiders.txt
@@ -1,8 +1,8 @@
-PyYAML==6.0.2
-ruff==0.12.9
+PyYAML==6.0.3
+ruff==0.13.3
 mkdocs==1.6.1
 mkdocs-material @ git+ssh://git@github.com/astral-sh/mkdocs-material-insiders.git@39da7a5e761410349e9a1b8abf593b0cdd5453ff
 mkdocs-redirects==1.2.2
 mdformat==0.7.22
-mdformat-mkdocs==4.3.0
+mdformat-mkdocs==4.4.1
 mkdocs-github-admonitions-plugin @ git+https://github.com/PGijsbers/admonitions.git#7343d2f4a92e4d1491094530ef3d0d02d93afbb7
diff --git a/docs/requirements.txt b/docs/requirements.txt
index baf3c32b4f..1062e321e7 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,8 +1,8 @@
-PyYAML==6.0.2
-ruff==0.12.9
+PyYAML==6.0.3
+ruff==0.13.3
 mkdocs==1.6.1
 mkdocs-material==9.5.38
 mkdocs-redirects==1.2.2
 mdformat==0.7.22
-mdformat-mkdocs==4.3.0
+mdformat-mkdocs==4.4.1
 mkdocs-github-admonitions-plugin @ git+https://github.com/PGijsbers/admonitions.git#7343d2f4a92e4d1491094530ef3d0d02d93afbb7
diff --git a/docs/tutorial.md b/docs/tutorial.md
index c111be14f3..f3f2a8b3dd 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -369,7 +369,7 @@ This tutorial has focused on Ruff's command-line interface, but Ruff can also be
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.9
+  rev: v0.14.2
   hooks:
     # Run the linter.
     - id: ruff
diff --git a/docs/versioning.md b/docs/versioning.md
index 2740cf2b6e..6c6ad920ba 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -20,6 +20,7 @@ Ruff uses a custom versioning scheme that uses the **minor** version number for
     - Stable rules are added to the default set
     - Stable rules are removed from the default set
     - A safe fix for a rule is promoted to stable
+    - A rule is deprecated
 - Formatter:
      - The stable style changed
 - Language server:
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 4fa0f0d77a..24034b4854 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -30,7 +30,7 @@ ty_python_semantic = { path = "../crates/ty_python_semantic" }
 ty_vendored = { path = "../crates/ty_vendored" }
 
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false }
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "a3ffa22cb26756473d56f867aedec3fd907c4dd9", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "d38145c29574758de7ffbe8a13cd4584c3b09161", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",
diff --git a/fuzz/fuzz_targets/ty_check_invalid_syntax.rs b/fuzz/fuzz_targets/ty_check_invalid_syntax.rs
index 9a6c6eb1f6..8bf19e88f7 100644
--- a/fuzz/fuzz_targets/ty_check_invalid_syntax.rs
+++ b/fuzz/fuzz_targets/ty_check_invalid_syntax.rs
@@ -93,6 +93,10 @@ impl SemanticDb for TestDb {
     fn lint_registry(&self) -> &LintRegistry {
         default_lint_registry()
     }
+
+    fn verbose(&self) -> bool {
+        false
+    }
 }
 
 #[salsa::db]
diff --git a/playground/api/package-lock.json b/playground/api/package-lock.json
index aeb69756cc..3fd2d47e16 100644
--- a/playground/api/package-lock.json
+++ b/playground/api/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@miniflare/kv": "^2.14.0",
         "@miniflare/storage-memory": "^2.14.0",
-        "uuid": "^11.0.0"
+        "uuid": "^13.0.0"
       },
       "devDependencies": {
         "@cloudflare/workers-types": "^4.20230801.0",
@@ -138,7 +138,8 @@
       "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20250726.0.tgz",
       "integrity": "sha512-NtM1yVBKJFX4LgSoZkVU0EDhWWvSb1vt6REO+uMYZRgx1HAfQz9GDN6bBB0B+fm2ZIxzt6FzlDbmrXpGJ2M/4Q==",
       "dev": true,
-      "license": "MIT OR Apache-2.0"
+      "license": "MIT OR Apache-2.0",
+      "peer": true
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
@@ -1694,6 +1695,7 @@
       "integrity": "sha512-B06u0wXkEd+o5gOCMl/ZHl5cfpYbDZKAT+HWTL+Hws6jWu7dCiqBBXXXzMFcFVJb8D4ytAnYmxJA83uwOQRSsg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "defu": "^6.1.4",
         "exsolve": "^1.0.4",
@@ -1703,16 +1705,16 @@
       }
     },
     "node_modules/uuid": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
-      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
+      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
       "license": "MIT",
       "bin": {
-        "uuid": "dist/esm/bin/uuid"
+        "uuid": "dist-node/bin/uuid"
       }
     },
     "node_modules/validate-npm-package-name": {
@@ -1747,6 +1749,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "workerd": "bin/workerd"
       },
diff --git a/playground/api/package.json b/playground/api/package.json
index 79e9d41c7d..37dc48fbde 100644
--- a/playground/api/package.json
+++ b/playground/api/package.json
@@ -15,6 +15,6 @@
   "dependencies": {
     "@miniflare/kv": "^2.14.0",
     "@miniflare/storage-memory": "^2.14.0",
-    "uuid": "^11.0.0"
+    "uuid": "^13.0.0"
   }
 }
diff --git a/playground/package-lock.json b/playground/package-lock.json
index 303a8ebbec..c8ddfc60a9 100644
--- a/playground/package-lock.json
+++ b/playground/package-lock.json
@@ -1774,6 +1774,7 @@
       "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -1788,6 +1789,12 @@
         "@types/react": "^19.0.0"
       }
     },
+    "node_modules/@types/trusted-types": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-1.0.6.tgz",
+      "integrity": "sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==",
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.38.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.38.0.tgz",
@@ -1834,6 +1841,7 @@
       "integrity": "sha512-Zhy8HCvBUEfBECzIl1PKqF4p11+d0aUJS1GeUiuqK9WmOug8YCmC4h4bjyBvMyAMI9sbRczmrYL5lKg/YMbrcQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.38.0",
         "@typescript-eslint/types": "8.38.0",
@@ -2079,6 +2087,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2989,6 +2998,7 @@
       "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -4831,10 +4841,14 @@
       }
     },
     "node_modules/monaco-editor": {
-      "version": "0.52.2",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz",
-      "integrity": "sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==",
-      "license": "MIT"
+      "version": "0.53.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.53.0.tgz",
+      "integrity": "sha512-0WNThgC6CMWNXXBxTbaYYcunj08iB5rnx4/G56UOPeL9UVIUGGHA1GR0EWIh9Ebabj7NpCRawQ5b0hfN1jQmYQ==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/trusted-types": "^1.0.6"
+      }
     },
     "node_modules/ms": {
       "version": "2.1.3",
@@ -5288,6 +5302,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
       "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5297,6 +5312,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
       "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.26.0"
       },
@@ -5994,6 +6010,7 @@
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6145,6 +6162,7 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6217,11 +6235,12 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.6.tgz",
-      "integrity": "sha512-MHFiOENNBd+Bd9uvc8GEsIzdkn1JxMmEeYX35tI3fv0sJBUTfW5tQsoaOwuY4KhBI09A3dUJ/DXf2yxPVPUceg==",
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.8.tgz",
+      "integrity": "sha512-cJBdq0/u+8rgstg9t7UkBilf8ipLmeXJO30NxD5HAHOivnj10ocV8YtR/XBvd2wQpN3TmcaxNKaHX3tN7o5F5A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.6",
@@ -6312,11 +6331,14 @@
       }
     },
     "node_modules/vite/node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -6332,6 +6354,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6523,9 +6546,9 @@
         "@monaco-editor/react": "^4.4.6",
         "classnames": "^2.3.2",
         "lz-string": "^1.5.0",
-        "monaco-editor": "^0.52.0",
-        "react": "^19.1.1",
-        "react-dom": "^19.1.1",
+        "monaco-editor": "^0.53.0",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
         "react-resizable-panels": "^3.0.0",
         "ruff_wasm": "file:ruff_wasm",
         "shared": "0.0.0",
@@ -6541,7 +6564,7 @@
       "dependencies": {
         "@monaco-editor/react": "^4.7.0",
         "classnames": "^2.3.2",
-        "react": "^19.1.1",
+        "react": "^19.0.0",
         "react-resizable-panels": "^3.0.0"
       }
     },
@@ -6552,10 +6575,10 @@
         "@monaco-editor/react": "^4.7.0",
         "classnames": "^2.5.1",
         "lz-string": "^1.5.0",
-        "monaco-editor": "^0.52.2",
+        "monaco-editor": "^0.53.0",
         "pyodide": "^0.28.0",
-        "react": "^19.1.1",
-        "react-dom": "^19.1.1",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
         "react-resizable-panels": "^3.0.0",
         "shared": "0.0.0",
         "smol-toml": "^1.3.1",
diff --git a/playground/ruff/package.json b/playground/ruff/package.json
index b14927998d..50f87a38d1 100644
--- a/playground/ruff/package.json
+++ b/playground/ruff/package.json
@@ -18,7 +18,7 @@
     "@monaco-editor/react": "^4.4.6",
     "classnames": "^2.3.2",
     "lz-string": "^1.5.0",
-    "monaco-editor": "^0.52.0",
+    "monaco-editor": "^0.53.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-resizable-panels": "^3.0.0",
diff --git a/playground/ruff/src/Editor/Editor.tsx b/playground/ruff/src/Editor/Editor.tsx
index de085185a7..6aa707c533 100644
--- a/playground/ruff/src/Editor/Editor.tsx
+++ b/playground/ruff/src/Editor/Editor.tsx
@@ -6,7 +6,7 @@ import {
   useState,
 } from "react";
 import { Panel, PanelGroup } from "react-resizable-panels";
-import { Diagnostic, Workspace } from "ruff_wasm";
+import { Diagnostic, Workspace, PositionEncoding } from "ruff_wasm";
 import {
   ErrorMessage,
   Theme,
@@ -173,7 +173,7 @@ export default function Editor({
 
     try {
       const config = JSON.parse(settingsSource);
-      const workspace = new Workspace(config);
+      const workspace = new Workspace(config, PositionEncoding.Utf16);
       const diagnostics = workspace.check(pythonSource);
 
       let secondary: SecondaryPanelResult = null;
diff --git a/playground/ruff/src/Editor/SourceEditor.tsx b/playground/ruff/src/Editor/SourceEditor.tsx
index a131a4e153..1dd8b20a64 100644
--- a/playground/ruff/src/Editor/SourceEditor.tsx
+++ b/playground/ruff/src/Editor/SourceEditor.tsx
@@ -124,7 +124,17 @@ class RuffCodeActionProvider implements CodeActionProvider {
     range: Range,
   ): languages.ProviderResult<languages.CodeActionList> {
     const actions = this.diagnostics
-      .filter((check) => range.startLineNumber === check.start_location.row)
+      // Show fixes for any diagnostic whose range intersects the requested range
+      .filter((check) => {
+        const diagnosticRange = new Range(
+          check.start_location.row,
+          check.start_location.column,
+          check.end_location.row,
+          check.end_location.column,
+        );
+
+        return Range.areIntersectingOrTouching(diagnosticRange, range);
+      })
       .filter(({ fix }) => fix)
       .map((check) => ({
         title: check.fix
@@ -173,6 +183,7 @@ function updateMarkers(monaco: Monaco, diagnostics: Array<Diagnostic>) {
     model,
     "owner",
     diagnostics.map((diagnostic) => ({
+      code: diagnostic.code ?? undefined,
       startLineNumber: diagnostic.start_location.row,
       startColumn: diagnostic.start_location.column,
       endLineNumber: diagnostic.end_location.row,
diff --git a/playground/ruff/src/Editor/settings.ts b/playground/ruff/src/Editor/settings.ts
index 411399da5d..7a7be3d95b 100644
--- a/playground/ruff/src/Editor/settings.ts
+++ b/playground/ruff/src/Editor/settings.ts
@@ -79,6 +79,15 @@ export function persistLocal({
   settingsSource: string;
   pythonSource: string;
 }) {
+  const totalLength = settingsSource.length + pythonSource.length;
+
+  // Don't persist large files to local storage because they can exceed the local storage quota
+  // The number here is picked rarely arbitrarily. Also note, JS uses UTF 16:
+  // that means the limit here is strings larger than 1MB (because UTf 16 uses 2 bytes per character)
+  if (totalLength > 500_000) {
+    return;
+  }
+
   localStorage.setItem(
     "source",
     JSON.stringify([settingsSource, pythonSource]),
diff --git a/playground/shared/src/setupMonaco.tsx b/playground/shared/src/setupMonaco.tsx
index 1d3660a3d9..186770eea0 100644
--- a/playground/shared/src/setupMonaco.tsx
+++ b/playground/shared/src/setupMonaco.tsx
@@ -290,6 +290,10 @@ function defineAyuThemes(monaco: Monaco) {
         foreground: COSMIC,
         token: "keyword",
       },
+      {
+        foreground: COSMIC,
+        token: "builtinConstant",
+      },
       {
         foreground: CONSTELLATION,
         token: "number",
@@ -575,6 +579,10 @@ function defineAyuThemes(monaco: Monaco) {
         foreground: RADIATE,
         token: "keyword",
       },
+      {
+        foreground: RADIATE,
+        token: "builtinConstant",
+      },
       {
         foreground: PROTON,
         token: "tag",
diff --git a/playground/ty/package.json b/playground/ty/package.json
index 4c4c5233e7..ad2b546980 100644
--- a/playground/ty/package.json
+++ b/playground/ty/package.json
@@ -18,7 +18,7 @@
     "@monaco-editor/react": "^4.7.0",
     "classnames": "^2.5.1",
     "lz-string": "^1.5.0",
-    "monaco-editor": "^0.52.2",
+    "monaco-editor": "^0.53.0",
     "pyodide": "^0.28.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
diff --git a/playground/ty/src/Editor/Editor.tsx b/playground/ty/src/Editor/Editor.tsx
index 7fd9dbfcec..c82250b9e1 100644
--- a/playground/ty/src/Editor/Editor.tsx
+++ b/playground/ty/src/Editor/Editor.tsx
@@ -27,6 +27,8 @@ import {
   type FileHandle,
   DocumentHighlight,
   DocumentHighlightKind,
+  InlayHintKind,
+  TextEdit,
 } from "ty_wasm";
 import { FileId, ReadonlyFiles } from "../Playground";
 import { isPythonFile } from "./Files";
@@ -312,14 +314,28 @@ class PlaygroundServer
 
     return {
       suggestions: completions.map((completion, i) => ({
-        label: completion.name,
+        label: {
+          label: completion.name,
+          detail:
+            completion.module_name == null
+              ? undefined
+              : ` (import ${completion.module_name})`,
+          description: completion.detail ?? undefined,
+        },
         sortText: String(i).padStart(digitsLength, "0"),
         kind:
           completion.kind == null
             ? CompletionItemKind.Variable
             : mapCompletionKind(completion.kind),
-        insertText: completion.name,
+        insertText: completion.insert_text ?? completion.name,
+        additionalTextEdits: completion.additional_text_edits?.map(
+          (edit: TextEdit) => ({
+            range: tyRangeToMonacoRange(edit.range),
+            text: edit.new_text,
+          }),
+        ),
         documentation: completion.documentation,
+        detail: completion.detail,
         // TODO(micha): It's unclear why this field is required for monaco but not VS Code.
         //  and omitting it works just fine? The LSP doesn't expose this information right now
         //  which is why we go with undefined for now.
@@ -405,6 +421,15 @@ class PlaygroundServer
       return undefined;
     }
 
+    function mapInlayHintKind(kind: InlayHintKind): languages.InlayHintKind {
+      switch (kind) {
+        case InlayHintKind.Type:
+          return languages.InlayHintKind.Type;
+        case InlayHintKind.Parameter:
+          return languages.InlayHintKind.Parameter;
+      }
+    }
+
     return {
       dispose: () => {},
       hints: inlayHints.map((hint) => ({
@@ -413,6 +438,7 @@ class PlaygroundServer
           lineNumber: hint.position.line,
           column: hint.position.column,
         },
+        kind: mapInlayHintKind(hint.kind),
       })),
     };
   }
diff --git a/playground/ty/src/Editor/persist.ts b/playground/ty/src/Editor/persist.ts
index 2adc5f3fe9..1767e14d0f 100644
--- a/playground/ty/src/Editor/persist.ts
+++ b/playground/ty/src/Editor/persist.ts
@@ -40,6 +40,18 @@ export async function restore(): Promise<Workspace | null> {
 }
 
 export function persistLocal(workspace: Workspace) {
+  let totalLength = 0;
+  for (const fileContent of Object.values(workspace.files)) {
+    totalLength += fileContent.length;
+
+    // Don't persist large files to local storage because they can exceed the local storage quota
+    // The number here is picked rarely arbitrarily. Also note, JS uses UTF 16:
+    // that means the limit here is strings larger than 1MB (because UTf 16 uses 2 bytes per character)
+    if (totalLength > 500_000) {
+      return;
+    }
+  }
+
   localStorage.setItem("workspace", JSON.stringify(workspace));
 }
 
diff --git a/playground/ty/src/Playground.tsx b/playground/ty/src/Playground.tsx
index e0e600c5ed..926861836b 100644
--- a/playground/ty/src/Playground.tsx
+++ b/playground/ty/src/Playground.tsx
@@ -96,6 +96,15 @@ export default function Playground() {
     file: FileId,
     newName: string,
   ) => {
+    if (newName.startsWith("/")) {
+      setError("File names cannot start with '/'.");
+      return;
+    }
+    if (newName.startsWith("vendored:")) {
+      setError("File names cannot start with 'vendored:'.");
+      return;
+    }
+
     const handle = files.handles[file];
     let newHandle: FileHandle | null = null;
     if (handle == null) {
@@ -205,7 +214,7 @@ export default function Playground() {
 export const DEFAULT_SETTINGS = JSON.stringify(
   {
     environment: {
-      "python-version": "3.13",
+      "python-version": "3.14",
     },
     rules: {
       "undefined-reveal": "ignore",
diff --git a/pyproject.toml b/pyproject.toml
index 3af299d9ee..91b5430a8e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.12.9"
+version = "0.14.2"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 authors = [{ name = "Astral Software Inc.", email = "hey@astral.sh" }]
 readme = "README.md"
@@ -111,30 +111,11 @@ force-exclude = '''
 major_labels = []  # Ruff never uses the major version number
 minor_labels = ["breaking"]   # Bump the minor version on breaking changes
 
-changelog_ignore_labels = ["internal", "ci", "testing", "ty"]
-
-changelog_sections.breaking = "Breaking changes"
-changelog_sections.preview = "Preview features"
-changelog_sections.bug = "Bug fixes"
-changelog_sections.rule = "Rule changes"
-changelog_sections.diagnostics = "Rule changes"
-changelog_sections.docstring = "Rule changes"
-changelog_sections.fixes = "Rule changes"
-changelog_sections.isort = "Rule changes"
-changelog_sections.performance = "Performance"
-changelog_sections.formatter = "Formatter"
-changelog_sections.server = "Server"
-changelog_sections.cli = "CLI"
-changelog_sections.configuration = "Configuration"
-changelog_sections.documentation = "Documentation"
-changelog_sections.__unknown__ = "Other changes"
-
-# We exclude contributors from the CHANGELOG file
-# Generate separately with `rooster contributors` for the GitHub release page
-changelog_contributors = false
+ignore_labels = ["internal", "ci", "testing", "ty"]
 
 version_files = [
     "README.md",
+    "pyproject.toml",
     "docs/integrations.md",
     "docs/tutorial.md",
     "crates/ruff/Cargo.toml",
@@ -142,3 +123,22 @@ version_files = [
     "crates/ruff_wasm/Cargo.toml",
     "scripts/benchmarks/pyproject.toml",
 ]
+
+[tool.rooster.section-labels]
+"Breaking changes" = ["breaking"]
+"Preview features" = ["preview"]
+"Bug fixes" = ["bug"]
+"Rule changes" = [
+    "diagnostics",
+    "docstrings",
+    "rule",
+    "fixes",
+    "isort",
+]
+"Performance" = ["performance"]
+"Formatter" = ["formatter"]
+"Server" = ["server"]
+"CLI" = ["cli"]
+"Configuration" = ["configuration"]
+"Documentation" = ["documentation"]
+"Other changes" = ["__unknown__"]
diff --git a/python/py-fuzzer/README.md b/python/py-fuzzer/README.md
index 5e6c713405..a4c54b0bdc 100644
--- a/python/py-fuzzer/README.md
+++ b/python/py-fuzzer/README.md
@@ -3,6 +3,6 @@
 A fuzzer script to run Ruff executables on randomly generated
 (but syntactically valid) Python source-code files.
 
-Run `uvx --from ./python/py-fuzzer fuzz -h` from the repository root
+Run `uv run --project=./python/py-fuzzer fuzz -h` from the repository root
 for more information and example invocations
 (requires [`uv`](https://github.com/astral-sh/uv) to be installed).
diff --git a/python/py-fuzzer/fuzz.py b/python/py-fuzzer/fuzz.py
index 895e74dad8..e113d7e179 100644
--- a/python/py-fuzzer/fuzz.py
+++ b/python/py-fuzzer/fuzz.py
@@ -4,24 +4,21 @@ Python source-code files.
 
 This script can be installed into a virtual environment using
 `uv pip install -e ./python/py-fuzzer` from the Ruff repository root,
-or can be run using `uvx --from ./python/py-fuzzer fuzz`
+or can be run using `uv run --project=./python/py-fuzzer fuzz`
 (in which case the virtual environment does not need to be activated).
+Note that using `uv run --project` rather than `uvx --from` means that
+uv will respect the script's lockfile.
 
 Example invocations of the script using `uv`:
 - Run the fuzzer on Ruff's parser using seeds 0, 1, 2, 78 and 93 to generate the code:
-  `uvx --from ./python/py-fuzzer fuzz --bin ruff 0-2 78 93`
+  `uv run --project=./python/py-fuzzer fuzz --bin ruff 0-2 78 93`
 - Run the fuzzer concurrently using seeds in range 0-10 inclusive,
   but only reporting bugs that are new on your branch:
-  `uvx --from ./python/py-fuzzer fuzz --bin ruff 0-10 --only-new-bugs`
+  `uv run --project=./python/py-fuzzer fuzz --bin ruff 0-10 --only-new-bugs`
 - Run the fuzzer concurrently on 10,000 different Python source-code files,
   using a random selection of seeds, and only print a summary at the end
   (the `shuf` command is Unix-specific):
-  `uvx --from ./python/py-fuzzer fuzz --bin ruff $(shuf -i 0-1000000 -n 10000) --quiet
-
-If you make local modifications to this script, you'll need to run the above
-with `--reinstall` to get your changes reflected in the uv-cached installed
-package. Alternatively, if iterating quickly on changes, you can add
-`--with-editable ./python/py-fuzzer`.
+  `uv run --project=./python/py-fuzzer fuzz --bin ruff $(shuf -i 0-1000000 -n 10000) --quiet
 """
 
 from __future__ import annotations
@@ -69,7 +66,7 @@ def ruff_contains_bug(code: str, *, ruff_executable: Path) -> bool:
             "lint.select=[]",
             "--no-cache",
             "--target-version",
-            "py313",
+            "py314",
             "--preview",
             "-",
         ],
diff --git a/python/py-fuzzer/pyproject.toml b/python/py-fuzzer/pyproject.toml
index d6e380395a..52bc17f25a 100644
--- a/python/py-fuzzer/pyproject.toml
+++ b/python/py-fuzzer/pyproject.toml
@@ -32,6 +32,10 @@ warn_unreachable = true
 local_partial_types = true
 enable_error_code = "ignore-without-code,redundant-expr,truthy-bool"
 
+[tool.ty.rules]
+possibly-unresolved-reference = "error"
+unused-ignore-comment = "error"
+
 [tool.ruff]
 fix = true
 preview = true
@@ -62,9 +66,6 @@ ignore = [
     # These are enforced by, or incompatible with, the ruff formatter:
     "E203",
     "E501",
-    # Makes code slower and more verbose
-    # https://github.com/astral-sh/ruff/issues/7871
-    "UP038",
 ]
 unfixable = [
     "F841",   # unused variable. ruff keeps the call, but mostly it's best to get rid of it all
diff --git a/python/py-fuzzer/uv.lock b/python/py-fuzzer/uv.lock
index 1be4ceed23..7716e16da9 100644
--- a/python/py-fuzzer/uv.lock
+++ b/python/py-fuzzer/uv.lock
@@ -1,58 +1,76 @@
 version = 1
-revision = 1
+revision = 3
 requires-python = ">=3.12"
 
 [[package]]
 name = "markdown-it-py"
-version = "3.0.0"
+version = "4.0.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "mdurl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb", size = 74596 }
+sdist = { url = "https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz", hash = "sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3", size = 73070, upload-time = "2025-08-11T12:57:52.854Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", size = 87528 },
+    { url = "https://files.pythonhosted.org/packages/94/54/e7d793b573f298e1c9013b8c4dade17d481164aa517d1d7148619c2cedbf/markdown_it_py-4.0.0-py3-none-any.whl", hash = "sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147", size = 87321, upload-time = "2025-08-11T12:57:51.923Z" },
 ]
 
 [[package]]
 name = "mdurl"
 version = "0.1.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729 }
+sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979 },
+    { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" },
 ]
 
 [[package]]
 name = "mypy"
-version = "1.13.0"
+version = "1.18.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "mypy-extensions" },
+    { name = "pathspec" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e8/21/7e9e523537991d145ab8a0a2fd98548d67646dc2aaaf6091c31ad883e7c1/mypy-1.13.0.tar.gz", hash = "sha256:0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e", size = 3152532 }
+sdist = { url = "https://files.pythonhosted.org/packages/c0/77/8f0d0001ffad290cef2f7f216f96c814866248a0b92a722365ed54648e7e/mypy-1.18.2.tar.gz", hash = "sha256:06a398102a5f203d7477b2923dda3634c36727fa5c237d8f859ef90c42a9924b", size = 3448846, upload-time = "2025-09-19T00:11:10.519Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fb/31/c526a7bd2e5c710ae47717c7a5f53f616db6d9097caf48ad650581e81748/mypy-1.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5c7051a3461ae84dfb5dd15eff5094640c61c5f22257c8b766794e6dd85e72d5", size = 11077900 },
-    { url = "https://files.pythonhosted.org/packages/83/67/b7419c6b503679d10bd26fc67529bc6a1f7a5f220bbb9f292dc10d33352f/mypy-1.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39bb21c69a5d6342f4ce526e4584bc5c197fd20a60d14a8624d8743fffb9472e", size = 10074818 },
-    { url = "https://files.pythonhosted.org/packages/ba/07/37d67048786ae84e6612575e173d713c9a05d0ae495dde1e68d972207d98/mypy-1.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:164f28cb9d6367439031f4c81e84d3ccaa1e19232d9d05d37cb0bd880d3f93c2", size = 12589275 },
-    { url = "https://files.pythonhosted.org/packages/1f/17/b1018c6bb3e9f1ce3956722b3bf91bff86c1cefccca71cec05eae49d6d41/mypy-1.13.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a4c1bfcdbce96ff5d96fc9b08e3831acb30dc44ab02671eca5953eadad07d6d0", size = 13037783 },
-    { url = "https://files.pythonhosted.org/packages/cb/32/cd540755579e54a88099aee0287086d996f5a24281a673f78a0e14dba150/mypy-1.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:a0affb3a79a256b4183ba09811e3577c5163ed06685e4d4b46429a271ba174d2", size = 9726197 },
-    { url = "https://files.pythonhosted.org/packages/11/bb/ab4cfdc562cad80418f077d8be9b4491ee4fb257440da951b85cbb0a639e/mypy-1.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a7b44178c9760ce1a43f544e595d35ed61ac2c3de306599fa59b38a6048e1aa7", size = 11069721 },
-    { url = "https://files.pythonhosted.org/packages/59/3b/a393b1607cb749ea2c621def5ba8c58308ff05e30d9dbdc7c15028bca111/mypy-1.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d5092efb8516d08440e36626f0153b5006d4088c1d663d88bf79625af3d1d62", size = 10063996 },
-    { url = "https://files.pythonhosted.org/packages/d1/1f/6b76be289a5a521bb1caedc1f08e76ff17ab59061007f201a8a18cc514d1/mypy-1.13.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2904956dac40ced10931ac967ae63c5089bd498542194b436eb097a9f77bc8", size = 12584043 },
-    { url = "https://files.pythonhosted.org/packages/a6/83/5a85c9a5976c6f96e3a5a7591aa28b4a6ca3a07e9e5ba0cec090c8b596d6/mypy-1.13.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:7bfd8836970d33c2105562650656b6846149374dc8ed77d98424b40b09340ba7", size = 13036996 },
-    { url = "https://files.pythonhosted.org/packages/b4/59/c39a6f752f1f893fccbcf1bdd2aca67c79c842402b5283563d006a67cf76/mypy-1.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:9f73dba9ec77acb86457a8fc04b5239822df0c14a082564737833d2963677dbc", size = 9737709 },
-    { url = "https://files.pythonhosted.org/packages/3b/86/72ce7f57431d87a7ff17d442f521146a6585019eb8f4f31b7c02801f78ad/mypy-1.13.0-py3-none-any.whl", hash = "sha256:9c250883f9fd81d212e0952c92dbfcc96fc237f4b7c92f56ac81fd48460b3e5a", size = 2647043 },
+    { url = "https://files.pythonhosted.org/packages/07/06/dfdd2bc60c66611dd8335f463818514733bc763e4760dee289dcc33df709/mypy-1.18.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:33eca32dd124b29400c31d7cf784e795b050ace0e1f91b8dc035672725617e34", size = 12908273, upload-time = "2025-09-19T00:10:58.321Z" },
+    { url = "https://files.pythonhosted.org/packages/81/14/6a9de6d13a122d5608e1a04130724caf9170333ac5a924e10f670687d3eb/mypy-1.18.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a3c47adf30d65e89b2dcd2fa32f3aeb5e94ca970d2c15fcb25e297871c8e4764", size = 11920910, upload-time = "2025-09-19T00:10:20.043Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/a9/b29de53e42f18e8cc547e38daa9dfa132ffdc64f7250e353f5c8cdd44bee/mypy-1.18.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5d6c838e831a062f5f29d11c9057c6009f60cb294fea33a98422688181fe2893", size = 12465585, upload-time = "2025-09-19T00:10:33.005Z" },
+    { url = "https://files.pythonhosted.org/packages/77/ae/6c3d2c7c61ff21f2bee938c917616c92ebf852f015fb55917fd6e2811db2/mypy-1.18.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01199871b6110a2ce984bde85acd481232d17413868c9807e95c1b0739a58914", size = 13348562, upload-time = "2025-09-19T00:10:11.51Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/31/aec68ab3b4aebdf8f36d191b0685d99faa899ab990753ca0fee60fb99511/mypy-1.18.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a2afc0fa0b0e91b4599ddfe0f91e2c26c2b5a5ab263737e998d6817874c5f7c8", size = 13533296, upload-time = "2025-09-19T00:10:06.568Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/83/abcb3ad9478fca3ebeb6a5358bb0b22c95ea42b43b7789c7fb1297ca44f4/mypy-1.18.2-cp312-cp312-win_amd64.whl", hash = "sha256:d8068d0afe682c7c4897c0f7ce84ea77f6de953262b12d07038f4d296d547074", size = 9828828, upload-time = "2025-09-19T00:10:28.203Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/04/7f462e6fbba87a72bc8097b93f6842499c428a6ff0c81dd46948d175afe8/mypy-1.18.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:07b8b0f580ca6d289e69209ec9d3911b4a26e5abfde32228a288eb79df129fcc", size = 12898728, upload-time = "2025-09-19T00:10:01.33Z" },
+    { url = "https://files.pythonhosted.org/packages/99/5b/61ed4efb64f1871b41fd0b82d29a64640f3516078f6c7905b68ab1ad8b13/mypy-1.18.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ed4482847168439651d3feee5833ccedbf6657e964572706a2adb1f7fa4dfe2e", size = 11910758, upload-time = "2025-09-19T00:10:42.607Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/46/d297d4b683cc89a6e4108c4250a6a6b717f5fa96e1a30a7944a6da44da35/mypy-1.18.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c3ad2afadd1e9fea5cf99a45a822346971ede8685cc581ed9cd4d42eaf940986", size = 12475342, upload-time = "2025-09-19T00:11:00.371Z" },
+    { url = "https://files.pythonhosted.org/packages/83/45/4798f4d00df13eae3bfdf726c9244bcb495ab5bd588c0eed93a2f2dd67f3/mypy-1.18.2-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a431a6f1ef14cf8c144c6b14793a23ec4eae3db28277c358136e79d7d062f62d", size = 13338709, upload-time = "2025-09-19T00:11:03.358Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/09/479f7358d9625172521a87a9271ddd2441e1dab16a09708f056e97007207/mypy-1.18.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7ab28cc197f1dd77a67e1c6f35cd1f8e8b73ed2217e4fc005f9e6a504e46e7ba", size = 13529806, upload-time = "2025-09-19T00:10:26.073Z" },
+    { url = "https://files.pythonhosted.org/packages/71/cf/ac0f2c7e9d0ea3c75cd99dff7aec1c9df4a1376537cb90e4c882267ee7e9/mypy-1.18.2-cp313-cp313-win_amd64.whl", hash = "sha256:0e2785a84b34a72ba55fb5daf079a1003a34c05b22238da94fcae2bbe46f3544", size = 9833262, upload-time = "2025-09-19T00:10:40.035Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/0c/7d5300883da16f0063ae53996358758b2a2df2a09c72a5061fa79a1f5006/mypy-1.18.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:62f0e1e988ad41c2a110edde6c398383a889d95b36b3e60bcf155f5164c4fdce", size = 12893775, upload-time = "2025-09-19T00:10:03.814Z" },
+    { url = "https://files.pythonhosted.org/packages/50/df/2cffbf25737bdb236f60c973edf62e3e7b4ee1c25b6878629e88e2cde967/mypy-1.18.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:8795a039bab805ff0c1dfdb8cd3344642c2b99b8e439d057aba30850b8d3423d", size = 11936852, upload-time = "2025-09-19T00:10:51.631Z" },
+    { url = "https://files.pythonhosted.org/packages/be/50/34059de13dd269227fb4a03be1faee6e2a4b04a2051c82ac0a0b5a773c9a/mypy-1.18.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6ca1e64b24a700ab5ce10133f7ccd956a04715463d30498e64ea8715236f9c9c", size = 12480242, upload-time = "2025-09-19T00:11:07.955Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/11/040983fad5132d85914c874a2836252bbc57832065548885b5bb5b0d4359/mypy-1.18.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d924eef3795cc89fecf6bedc6ed32b33ac13e8321344f6ddbf8ee89f706c05cb", size = 13326683, upload-time = "2025-09-19T00:09:55.572Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/ba/89b2901dd77414dd7a8c8729985832a5735053be15b744c18e4586e506ef/mypy-1.18.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:20c02215a080e3a2be3aa50506c67242df1c151eaba0dcbc1e4e557922a26075", size = 13514749, upload-time = "2025-09-19T00:10:44.827Z" },
+    { url = "https://files.pythonhosted.org/packages/25/bc/cc98767cffd6b2928ba680f3e5bc969c4152bf7c2d83f92f5a504b92b0eb/mypy-1.18.2-cp314-cp314-win_amd64.whl", hash = "sha256:749b5f83198f1ca64345603118a6f01a4e99ad4bf9d103ddc5a3200cc4614adf", size = 9982959, upload-time = "2025-09-19T00:10:37.344Z" },
+    { url = "https://files.pythonhosted.org/packages/87/e3/be76d87158ebafa0309946c4a73831974d4d6ab4f4ef40c3b53a385a66fd/mypy-1.18.2-py3-none-any.whl", hash = "sha256:22a1748707dd62b58d2ae53562ffc4d7f8bcc727e8ac7cbc69c053ddc874d47e", size = 2352367, upload-time = "2025-09-19T00:10:15.489Z" },
 ]
 
 [[package]]
 name = "mypy-extensions"
-version = "1.0.0"
+version = "1.1.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/98/a4/1ab47638b92648243faf97a5aeb6ea83059cc3624972ab6b8d2316078d3f/mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782", size = 4433 }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", size = 4695 },
+    { url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
+]
+
+[[package]]
+name = "pathspec"
+version = "0.12.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/bc/f35b8446f4531a7cb215605d100cd88b7ac6f44ab3fc94870c120ab3adbf/pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712", size = 51043, upload-time = "2023-12-10T22:30:45Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", size = 31191, upload-time = "2023-12-10T22:30:43.14Z" },
 ]
 
 [[package]]
@@ -90,98 +108,99 @@ dev = [
 
 [[package]]
 name = "pygments"
-version = "2.18.0"
+version = "2.19.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", size = 4891905 }
+sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f7/3f/01c8b82017c199075f8f788d0d906b9ffbbc5a47dc9918a945e13d5a2bda/pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a", size = 1205513 },
+    { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" },
 ]
 
 [[package]]
 name = "pysource-codegen"
-version = "0.6.0"
+version = "0.7.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/38/5d/1ab81f5f4eb3fb9203a91ea3cdb7da7b19b38993d669e39000a6454128e1/pysource_codegen-0.6.0.tar.gz", hash = "sha256:0337e3cf3639f017567ab298684c78eb15c877b093965259c725a13a4917be4e", size = 157342 }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/a8/2bbac069fef2361eaef2c23706fc0de051034c14cc1c4ab3d88b095cfe5f/pysource_codegen-0.7.1.tar.gz", hash = "sha256:1a72d29591a9732fa9a66ee4976307081e56dd8991231b19a0bddf87a31d4c8e", size = 71073, upload-time = "2025-08-29T19:27:58.964Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/45/e4/c3a105d7d43bf237b18169eb1a06e1b93dc0daa96e74efa14c6d908979b4/pysource_codegen-0.6.0-py3-none-any.whl", hash = "sha256:858f2bbed6de7a7b7e9bbea5cb8212ec7e66fa7f2a7ba433fe05f72438017b30", size = 19489 },
+    { url = "https://files.pythonhosted.org/packages/63/a5/c851b7fac516d7ffb8943991c3ac46d7d29808b773d270d8b6b820cb2e51/pysource_codegen-0.7.1-py3-none-any.whl", hash = "sha256:099e00d587a59babacaff902ad0b6d5b2f7344648c1e0baa981b30cc11a5c363", size = 20671, upload-time = "2025-08-29T19:27:57.756Z" },
 ]
 
 [[package]]
 name = "pysource-minimize"
-version = "0.8.0"
+version = "0.10.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/90/d3/6786a52121987875b2e9d273399504e2bdb868e7b80b603ecb29c900846f/pysource_minimize-0.8.0.tar.gz", hash = "sha256:e9a88c68717891dc7dc74beab769ef4c2e397599e1620b2046b89783fb500652", size = 715267 }
+sdist = { url = "https://files.pythonhosted.org/packages/03/e6/14136d4868c3ea2e46d7f83faef26d07fd9231b7bd3fc811b6b6f8688cf2/pysource_minimize-0.10.1.tar.gz", hash = "sha256:05000b5174207d10dbb6da1a67a6f3a6f61d295efa17e3c74283f0d9ece6401c", size = 9254623, upload-time = "2025-08-30T14:41:16.989Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4a/7d/4e9ed2a376bb7372d74fdec557f35f70c2bf5373f2c67e05535555d0a6d4/pysource_minimize-0.8.0-py3-none-any.whl", hash = "sha256:edee433c24a2e8f81701aa7e01ba4c1e63f481f683dd3a561610762bc03ed6c3", size = 14635 },
+    { url = "https://files.pythonhosted.org/packages/f5/de/847456f142124b242933a1cea17aea7041d297f1ac99b411c5dee69ac250/pysource_minimize-0.10.1-py3-none-any.whl", hash = "sha256:69b41fd2f0c1840ca281ec788c6ffb4e79680b06c7cc0e7c4d9a75321654b709", size = 18631, upload-time = "2025-08-30T14:41:15.588Z" },
 ]
 
 [[package]]
 name = "rich"
-version = "13.9.4"
+version = "14.2.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "markdown-it-py" },
     { name = "pygments" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ab/3a/0316b28d0761c6734d6bc14e770d85506c986c85ffb239e688eeaab2c2bc/rich-13.9.4.tar.gz", hash = "sha256:439594978a49a09530cff7ebc4b5c7103ef57baf48d5ea3184f21d9a2befa098", size = 223149 }
+sdist = { url = "https://files.pythonhosted.org/packages/fb/d2/8920e102050a0de7bfabeb4c4614a49248cf8d5d7a8d01885fbb24dc767a/rich-14.2.0.tar.gz", hash = "sha256:73ff50c7c0c1c77c8243079283f4edb376f0f6442433aecb8ce7e6d0b92d1fe4", size = 219990, upload-time = "2025-10-09T14:16:53.064Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/19/71/39c7c0d87f8d4e6c020a393182060eaefeeae6c01dab6a84ec346f2567df/rich-13.9.4-py3-none-any.whl", hash = "sha256:6049d5e6ec054bf2779ab3358186963bac2ea89175919d699e378b99738c2a90", size = 242424 },
+    { url = "https://files.pythonhosted.org/packages/25/7a/b0178788f8dc6cafce37a212c99565fa1fe7872c70c6c9c1e1a372d9d88f/rich-14.2.0-py3-none-any.whl", hash = "sha256:76bc51fe2e57d2b1be1f96c524b890b816e334ab4c1e45888799bfaab0021edd", size = 243393, upload-time = "2025-10-09T14:16:51.245Z" },
 ]
 
 [[package]]
 name = "rich-argparse"
-version = "1.7.0"
+version = "1.7.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "rich" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/aa/b9/ff53663ee7fa6a4195fa96d91da499f2e00ca067541e016d345cce1c9ad2/rich_argparse-1.7.0.tar.gz", hash = "sha256:f31d809c465ee43f367d599ccaf88b73bc2c4d75d74ed43f2d538838c53544ba", size = 38009 }
+sdist = { url = "https://files.pythonhosted.org/packages/71/a6/34460d81e5534f6d2fc8e8d91ff99a5835fdca53578eac89e4f37b3a7c6d/rich_argparse-1.7.1.tar.gz", hash = "sha256:d7a493cde94043e41ea68fb43a74405fa178de981bf7b800f7a3bd02ac5c27be", size = 38094, upload-time = "2025-05-25T20:20:35.335Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bb/9c/dc7cbeb99a7b7422392ed7f327efdbb958bc0faf424aef5f130309320bda/rich_argparse-1.7.0-py3-none-any.whl", hash = "sha256:b8ec8943588e9731967f4f97b735b03dc127c416f480a083060433a97baf2fd3", size = 25339 },
+    { url = "https://files.pythonhosted.org/packages/31/f6/5fc0574af5379606ffd57a4b68ed88f9b415eb222047fe023aefcc00a648/rich_argparse-1.7.1-py3-none-any.whl", hash = "sha256:a8650b42e4a4ff72127837632fba6b7da40784842f08d7395eb67a9cbd7b4bf9", size = 25357, upload-time = "2025-05-25T20:20:33.793Z" },
 ]
 
 [[package]]
 name = "ruff"
-version = "0.11.9"
+version = "0.14.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f5/e7/e55dda1c92cdcf34b677ebef17486669800de01e887b7831a1b8fdf5cb08/ruff-0.11.9.tar.gz", hash = "sha256:ebd58d4f67a00afb3a30bf7d383e52d0e036e6195143c6db7019604a05335517", size = 4132134 }
+sdist = { url = "https://files.pythonhosted.org/packages/9e/58/6ca66896635352812de66f71cdf9ff86b3a4f79071ca5730088c0cd0fc8d/ruff-0.14.1.tar.gz", hash = "sha256:1dd86253060c4772867c61791588627320abcb6ed1577a90ef432ee319729b69", size = 5513429, upload-time = "2025-10-16T18:05:41.766Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fb/71/75dfb7194fe6502708e547941d41162574d1f579c4676a8eb645bf1a6842/ruff-0.11.9-py3-none-linux_armv6l.whl", hash = "sha256:a31a1d143a5e6f499d1fb480f8e1e780b4dfdd580f86e05e87b835d22c5c6f8c", size = 10335453 },
-    { url = "https://files.pythonhosted.org/packages/74/fc/ad80c869b1732f53c4232bbf341f33c5075b2c0fb3e488983eb55964076a/ruff-0.11.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:66bc18ca783b97186a1f3100e91e492615767ae0a3be584e1266aa9051990722", size = 11072566 },
-    { url = "https://files.pythonhosted.org/packages/87/0d/0ccececef8a0671dae155cbf7a1f90ea2dd1dba61405da60228bbe731d35/ruff-0.11.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:bd576cd06962825de8aece49f28707662ada6a1ff2db848d1348e12c580acbf1", size = 10435020 },
-    { url = "https://files.pythonhosted.org/packages/52/01/e249e1da6ad722278094e183cbf22379a9bbe5f21a3e46cef24ccab76e22/ruff-0.11.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b1d18b4be8182cc6fddf859ce432cc9631556e9f371ada52f3eaefc10d878de", size = 10593935 },
-    { url = "https://files.pythonhosted.org/packages/ed/9a/40cf91f61e3003fe7bd43f1761882740e954506c5a0f9097b1cff861f04c/ruff-0.11.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0f3f46f759ac623e94824b1e5a687a0df5cd7f5b00718ff9c24f0a894a683be7", size = 10172971 },
-    { url = "https://files.pythonhosted.org/packages/61/12/d395203de1e8717d7a2071b5a340422726d4736f44daf2290aad1085075f/ruff-0.11.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f34847eea11932d97b521450cf3e1d17863cfa5a94f21a056b93fb86f3f3dba2", size = 11748631 },
-    { url = "https://files.pythonhosted.org/packages/66/d6/ef4d5eba77677eab511644c37c55a3bb8dcac1cdeb331123fe342c9a16c9/ruff-0.11.9-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:f33b15e00435773df97cddcd263578aa83af996b913721d86f47f4e0ee0ff271", size = 12409236 },
-    { url = "https://files.pythonhosted.org/packages/c5/8f/5a2c5fc6124dd925a5faf90e1089ee9036462118b619068e5b65f8ea03df/ruff-0.11.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7b27613a683b086f2aca8996f63cb3dd7bc49e6eccf590563221f7b43ded3f65", size = 11881436 },
-    { url = "https://files.pythonhosted.org/packages/39/d1/9683f469ae0b99b95ef99a56cfe8c8373c14eba26bd5c622150959ce9f64/ruff-0.11.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e0d88756e63e8302e630cee3ce2ffb77859797cc84a830a24473939e6da3ca6", size = 13982759 },
-    { url = "https://files.pythonhosted.org/packages/4e/0b/c53a664f06e0faab596397867c6320c3816df479e888fe3af63bc3f89699/ruff-0.11.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:537c82c9829d7811e3aa680205f94c81a2958a122ac391c0eb60336ace741a70", size = 11541985 },
-    { url = "https://files.pythonhosted.org/packages/23/a0/156c4d7e685f6526a636a60986ee4a3c09c8c4e2a49b9a08c9913f46c139/ruff-0.11.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:440ac6a7029f3dee7d46ab7de6f54b19e34c2b090bb4f2480d0a2d635228f381", size = 10465775 },
-    { url = "https://files.pythonhosted.org/packages/43/d5/88b9a6534d9d4952c355e38eabc343df812f168a2c811dbce7d681aeb404/ruff-0.11.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:71c539bac63d0788a30227ed4d43b81353c89437d355fdc52e0cda4ce5651787", size = 10170957 },
-    { url = "https://files.pythonhosted.org/packages/f0/b8/2bd533bdaf469dc84b45815ab806784d561fab104d993a54e1852596d581/ruff-0.11.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c67117bc82457e4501473c5f5217d49d9222a360794bfb63968e09e70f340abd", size = 11143307 },
-    { url = "https://files.pythonhosted.org/packages/2f/d9/43cfba291788459b9bfd4e09a0479aa94d05ab5021d381a502d61a807ec1/ruff-0.11.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e4b78454f97aa454586e8a5557facb40d683e74246c97372af3c2d76901d697b", size = 11603026 },
-    { url = "https://files.pythonhosted.org/packages/22/e6/7ed70048e89b01d728ccc950557a17ecf8df4127b08a56944b9d0bae61bc/ruff-0.11.9-py3-none-win32.whl", hash = "sha256:7fe1bc950e7d7b42caaee2a8a3bc27410547cc032c9558ee2e0f6d3b209e845a", size = 10548627 },
-    { url = "https://files.pythonhosted.org/packages/90/36/1da5d566271682ed10f436f732e5f75f926c17255c9c75cefb77d4bf8f10/ruff-0.11.9-py3-none-win_amd64.whl", hash = "sha256:52edaa4a6d70f8180343a5b7f030c7edd36ad180c9f4d224959c2d689962d964", size = 11634340 },
-    { url = "https://files.pythonhosted.org/packages/40/f7/70aad26e5877c8f7ee5b161c4c9fa0100e63fc4c944dc6d97b9c7e871417/ruff-0.11.9-py3-none-win_arm64.whl", hash = "sha256:bcf42689c22f2e240f496d0c183ef2c6f7b35e809f12c1db58f75d9aa8d630ca", size = 10741080 },
+    { url = "https://files.pythonhosted.org/packages/8d/39/9cc5ab181478d7a18adc1c1e051a84ee02bec94eb9bdfd35643d7c74ca31/ruff-0.14.1-py3-none-linux_armv6l.whl", hash = "sha256:083bfc1f30f4a391ae09c6f4f99d83074416b471775b59288956f5bc18e82f8b", size = 12445415, upload-time = "2025-10-16T18:04:48.227Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/2e/1226961855ccd697255988f5a2474890ac7c5863b080b15bd038df820818/ruff-0.14.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:f6fa757cd717f791009f7669fefb09121cc5f7d9bd0ef211371fad68c2b8b224", size = 12784267, upload-time = "2025-10-16T18:04:52.515Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/ea/fd9e95863124ed159cd0667ec98449ae461de94acda7101f1acb6066da00/ruff-0.14.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d6191903d39ac156921398e9c86b7354d15e3c93772e7dbf26c9fcae59ceccd5", size = 11781872, upload-time = "2025-10-16T18:04:55.396Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/5a/e890f7338ff537dba4589a5e02c51baa63020acfb7c8cbbaea4831562c96/ruff-0.14.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed04f0e04f7a4587244e5c9d7df50e6b5bf2705d75059f409a6421c593a35896", size = 12226558, upload-time = "2025-10-16T18:04:58.166Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/7a/8ab5c3377f5bf31e167b73651841217542bcc7aa1c19e83030835cc25204/ruff-0.14.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5c9e6cf6cd4acae0febbce29497accd3632fe2025c0c583c8b87e8dbdeae5f61", size = 12187898, upload-time = "2025-10-16T18:05:01.455Z" },
+    { url = "https://files.pythonhosted.org/packages/48/8d/ba7c33aa55406955fc124e62c8259791c3d42e3075a71710fdff9375134f/ruff-0.14.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a6fa2458527794ecdfbe45f654e42c61f2503a230545a91af839653a0a93dbc6", size = 12939168, upload-time = "2025-10-16T18:05:04.397Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/c2/70783f612b50f66d083380e68cbd1696739d88e9b4f6164230375532c637/ruff-0.14.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:39f1c392244e338b21d42ab29b8a6392a722c5090032eb49bb4d6defcdb34345", size = 14386942, upload-time = "2025-10-16T18:05:07.102Z" },
+    { url = "https://files.pythonhosted.org/packages/48/44/cd7abb9c776b66d332119d67f96acf15830d120f5b884598a36d9d3f4d83/ruff-0.14.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7382fa12a26cce1f95070ce450946bec357727aaa428983036362579eadcc5cf", size = 13990622, upload-time = "2025-10-16T18:05:09.882Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/56/4259b696db12ac152fe472764b4f78bbdd9b477afd9bc3a6d53c01300b37/ruff-0.14.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dd0bf2be3ae8521e1093a487c4aa3b455882f139787770698530d28ed3fbb37c", size = 13431143, upload-time = "2025-10-16T18:05:13.46Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/35/266a80d0eb97bd224b3265b9437bd89dde0dcf4faf299db1212e81824e7e/ruff-0.14.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cabcaa9ccf8089fb4fdb78d17cc0e28241520f50f4c2e88cb6261ed083d85151", size = 13132844, upload-time = "2025-10-16T18:05:16.1Z" },
+    { url = "https://files.pythonhosted.org/packages/65/6e/d31ce218acc11a8d91ef208e002a31acf315061a85132f94f3df7a252b18/ruff-0.14.1-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:747d583400f6125ec11a4c14d1c8474bf75d8b419ad22a111a537ec1a952d192", size = 13401241, upload-time = "2025-10-16T18:05:19.395Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/b5/dbc4221bf0b03774b3b2f0d47f39e848d30664157c15b965a14d890637d2/ruff-0.14.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5a6e74c0efd78515a1d13acbfe6c90f0f5bd822aa56b4a6d43a9ffb2ae6e56cd", size = 12132476, upload-time = "2025-10-16T18:05:22.163Z" },
+    { url = "https://files.pythonhosted.org/packages/98/4b/ac99194e790ccd092d6a8b5f341f34b6e597d698e3077c032c502d75ea84/ruff-0.14.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0ea6a864d2fb41a4b6d5b456ed164302a0d96f4daac630aeba829abfb059d020", size = 12139749, upload-time = "2025-10-16T18:05:25.162Z" },
+    { url = "https://files.pythonhosted.org/packages/47/26/7df917462c3bb5004e6fdfcc505a49e90bcd8a34c54a051953118c00b53a/ruff-0.14.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:0826b8764f94229604fa255918d1cc45e583e38c21c203248b0bfc9a0e930be5", size = 12544758, upload-time = "2025-10-16T18:05:28.018Z" },
+    { url = "https://files.pythonhosted.org/packages/64/d0/81e7f0648e9764ad9b51dd4be5e5dac3fcfff9602428ccbae288a39c2c22/ruff-0.14.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cbc52160465913a1a3f424c81c62ac8096b6a491468e7d872cb9444a860bc33d", size = 13221811, upload-time = "2025-10-16T18:05:30.707Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/07/3c45562c67933cc35f6d5df4ca77dabbcd88fddaca0d6b8371693d29fd56/ruff-0.14.1-py3-none-win32.whl", hash = "sha256:e037ea374aaaff4103240ae79168c0945ae3d5ae8db190603de3b4012bd1def6", size = 12319467, upload-time = "2025-10-16T18:05:33.261Z" },
+    { url = "https://files.pythonhosted.org/packages/02/88/0ee4ca507d4aa05f67e292d2e5eb0b3e358fbcfe527554a2eda9ac422d6b/ruff-0.14.1-py3-none-win_amd64.whl", hash = "sha256:59d599cdff9c7f925a017f6f2c256c908b094e55967f93f2821b1439928746a1", size = 13401123, upload-time = "2025-10-16T18:05:35.984Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/81/4b6387be7014858d924b843530e1b2a8e531846807516e9bea2ee0936bf7/ruff-0.14.1-py3-none-win_arm64.whl", hash = "sha256:e3b443c4c9f16ae850906b8d0a707b2a4c16f8d2f0a7fe65c475c5886665ce44", size = 12436636, upload-time = "2025-10-16T18:05:38.995Z" },
 ]
 
 [[package]]
 name = "termcolor"
 version = "3.1.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ca/6c/3d75c196ac07ac8749600b60b03f4f6094d54e132c4d94ebac6ee0e0add0/termcolor-3.1.0.tar.gz", hash = "sha256:6a6dd7fbee581909eeec6a756cff1d7f7c376063b14e4a298dc4980309e55970", size = 14324 }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/6c/3d75c196ac07ac8749600b60b03f4f6094d54e132c4d94ebac6ee0e0add0/termcolor-3.1.0.tar.gz", hash = "sha256:6a6dd7fbee581909eeec6a756cff1d7f7c376063b14e4a298dc4980309e55970", size = 14324, upload-time = "2025-04-30T11:37:53.791Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4f/bd/de8d508070629b6d84a30d01d57e4a65c69aa7f5abe7560b8fad3b50ea59/termcolor-3.1.0-py3-none-any.whl", hash = "sha256:591dd26b5c2ce03b9e43f391264626557873ce1d379019786f99b0c2bee140aa", size = 7684 },
+    { url = "https://files.pythonhosted.org/packages/4f/bd/de8d508070629b6d84a30d01d57e4a65c69aa7f5abe7560b8fad3b50ea59/termcolor-3.1.0-py3-none-any.whl", hash = "sha256:591dd26b5c2ce03b9e43f391264626557873ce1d379019786f99b0c2bee140aa", size = 7684, upload-time = "2025-04-30T11:37:52.382Z" },
 ]
 
 [[package]]
 name = "typing-extensions"
-version = "4.12.2"
+version = "4.15.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8", size = 85321 }
+sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", size = 37438 },
+    { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" },
 ]
diff --git a/ruff.schema.json b/ruff.schema.json
index 0866fc0426..04ef3fcc3d 100644
--- a/ruff.schema.json
+++ b/ruff.schema.json
@@ -4,12 +4,12 @@
   "type": "object",
   "properties": {
     "allowed-confusables": {
-      "description": "A list of allowed \"confusable\" Unicode characters to ignore when enforcing `RUF001`, `RUF002`, and `RUF003`.",
-      "deprecated": true,
+      "description": "A list of allowed \"confusable\" Unicode characters to ignore when\nenforcing `RUF001`, `RUF002`, and `RUF003`.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "type": "string",
         "maxLength": 1,
@@ -28,7 +28,7 @@
       ]
     },
     "builtins": {
-      "description": "A list of builtins to treat as defined references, in addition to the system builtins.",
+      "description": "A list of builtins to treat as defined references, in addition to the\nsystem builtins.",
       "type": [
         "array",
         "null"
@@ -38,22 +38,22 @@
       }
     },
     "cache-dir": {
-      "description": "A path to the cache directory.\n\nBy default, Ruff stores cache results in a `.ruff_cache` directory in the current project root.\n\nHowever, Ruff will also respect the `RUFF_CACHE_DIR` environment variable, which takes precedence over that default.\n\nThis setting will override even the `RUFF_CACHE_DIR` environment variable, if set.",
+      "description": "A path to the cache directory.\n\nBy default, Ruff stores cache results in a `.ruff_cache` directory in\nthe current project root.\n\nHowever, Ruff will also respect the `RUFF_CACHE_DIR` environment\nvariable, which takes precedence over that default.\n\nThis setting will override even the `RUFF_CACHE_DIR` environment\nvariable, if set.",
       "type": [
         "string",
         "null"
       ]
     },
     "dummy-variable-rgx": {
-      "description": "A regular expression used to identify \"dummy\" variables, or those which should be ignored when enforcing (e.g.) unused-variable rules. The default expression matches `_`, `__`, and `_var`, but not `_var_`.",
-      "deprecated": true,
+      "description": "A regular expression used to identify \"dummy\" variables, or those which\nshould be ignored when enforcing (e.g.) unused-variable rules. The\ndefault expression matches `_`, `__`, and `_var`, but not `_var_`.",
       "type": [
         "string",
         "null"
-      ]
+      ],
+      "deprecated": true
     },
     "exclude": {
-      "description": "A list of file patterns to exclude from formatting and linting.\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).\n\nNote that you'll typically want to use [`extend-exclude`](#extend-exclude) to modify the excluded paths.",
+      "description": "A list of file patterns to exclude from formatting and linting.\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory\n  named `.mypy_cache` in the tree), `foo.py` (to exclude any file named\n  `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ).\n- Relative patterns, like `directory/foo.py` (to exclude that specific\n  file) or `directory/*.py` (to exclude any Python files in\n  `directory`). Note that these paths are relative to the project root\n  (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).\n\nNote that you'll typically want to use\n[`extend-exclude`](#extend-exclude) to modify the excluded paths.",
       "type": [
         "array",
         "null"
@@ -63,22 +63,22 @@
       }
     },
     "explicit-preview-rules": {
-      "description": "Whether to require exact codes to select preview rules. When enabled, preview rules will not be selected by prefixes — the full code of each preview rule will be required to enable the rule.",
-      "deprecated": true,
+      "description": "Whether to require exact codes to select preview rules. When enabled,\npreview rules will not be selected by prefixes — the full code of each\npreview rule will be required to enable the rule.",
       "type": [
         "boolean",
         "null"
-      ]
+      ],
+      "deprecated": true
     },
     "extend": {
-      "description": "A path to a local `pyproject.toml` file to merge into this configuration. User home directory and environment variables will be expanded.\n\nTo resolve the current `pyproject.toml` file, Ruff will first resolve this base configuration file, then merge in any properties defined in the current configuration file.",
+      "description": "A path to a local `pyproject.toml` file to merge into this\nconfiguration. User home directory and environment variables will be\nexpanded.\n\nTo resolve the current `pyproject.toml` file, Ruff will first resolve\nthis base configuration file, then merge in any properties defined\nin the current configuration file.",
       "type": [
         "string",
         "null"
       ]
     },
     "extend-exclude": {
-      "description": "A list of file patterns to omit from formatting and linting, in addition to those specified by [`exclude`](#exclude).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+      "description": "A list of file patterns to omit from formatting and linting, in addition to those\nspecified by [`exclude`](#exclude).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory\n  named `.mypy_cache` in the tree), `foo.py` (to exclude any file named\n  `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ).\n- Relative patterns, like `directory/foo.py` (to exclude that specific\n  file) or `directory/*.py` (to exclude any Python files in\n  `directory`). Note that these paths are relative to the project root\n  (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
       "type": [
         "array",
         "null"
@@ -88,29 +88,29 @@
       }
     },
     "extend-fixable": {
-      "description": "A list of rule codes or prefixes to consider fixable, in addition to those specified by [`fixable`](#lint_fixable).",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to consider fixable, in addition to those\nspecified by [`fixable`](#lint_fixable).",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-ignore": {
-      "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to ignore, in addition to those\nspecified by `ignore`.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-include": {
-      "description": "A list of file patterns to include when linting, in addition to those specified by [`include`](#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).",
+      "description": "A list of file patterns to include when linting, in addition to those\nspecified by [`include`](#include).\n\nInclusion are based on globs, and should be single-path patterns, like\n`*.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": [
         "array",
         "null"
@@ -120,8 +120,7 @@
       }
     },
     "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`](#lint_per-file-ignores).",
-      "deprecated": true,
+      "description": "A list of mappings from file pattern to rule codes or prefixes to\nexclude, in addition to any rules excluded by [`per-file-ignores`](#lint_per-file-ignores).",
       "type": [
         "object",
         "null"
@@ -131,65 +130,66 @@
         "items": {
           "$ref": "#/definitions/RuleSelector"
         }
-      }
+      },
+      "deprecated": true
     },
     "extend-safe-fixes": {
-      "description": "A list of rule codes or prefixes for which unsafe fixes should be considered safe.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes for which unsafe fixes should be considered\nsafe.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-select": {
-      "description": "A list of rule codes or prefixes to enable, in addition to those specified by [`select`](#lint_select).",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to enable, in addition to those\nspecified by [`select`](#lint_select).",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-unfixable": {
-      "description": "A list of rule codes or prefixes to consider non-auto-fixable, in addition to those specified by [`unfixable`](#lint_unfixable).",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to consider non-auto-fixable, in addition to those\nspecified by [`unfixable`](#lint_unfixable).",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-unsafe-fixes": {
-      "description": "A list of rule codes or prefixes for which safe fixes should be considered unsafe.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes for which safe fixes should be considered\nunsafe.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "external": {
-      "description": "A list of rule codes or prefixes that are unsupported by Ruff, but should be preserved when (e.g.) validating `# noqa` directives. Useful for retaining `# noqa` directives that cover plugins not yet implemented by Ruff.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes that are unsupported by Ruff, but should be\npreserved when (e.g.) validating `# noqa` directives. Useful for\nretaining `# noqa` directives that cover plugins not yet implemented\nby Ruff.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "type": "string"
       }
     },
     "fix": {
-      "description": "Enable fix behavior by-default when running `ruff` (overridden by the `--fix` and `--no-fix` command-line flags). Only includes automatic fixes unless `--unsafe-fixes` is provided.",
+      "description": "Enable fix behavior by-default when running `ruff` (overridden\nby the `--fix` and `--no-fix` command-line flags).\nOnly includes automatic fixes unless `--unsafe-fixes` is provided.",
       "type": [
         "boolean",
         "null"
@@ -203,19 +203,18 @@
       ]
     },
     "fixable": {
-      "description": "A list of rule codes or prefixes to consider fixable. By default, all rules are considered fixable.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to consider fixable. By default,\nall rules are considered fixable.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "flake8-annotations": {
       "description": "Options for the `flake8-annotations` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8AnnotationsOptions"
@@ -223,11 +222,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-bandit": {
       "description": "Options for the `flake8-bandit` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8BanditOptions"
@@ -235,11 +234,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-boolean-trap": {
       "description": "Options for the `flake8-boolean-trap` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8BooleanTrapOptions"
@@ -247,11 +246,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-bugbear": {
       "description": "Options for the `flake8-bugbear` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8BugbearOptions"
@@ -259,11 +258,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-builtins": {
       "description": "Options for the `flake8-builtins` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8BuiltinsOptions"
@@ -271,11 +270,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-comprehensions": {
       "description": "Options for the `flake8-comprehensions` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8ComprehensionsOptions"
@@ -283,11 +282,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-copyright": {
       "description": "Options for the `flake8-copyright` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8CopyrightOptions"
@@ -295,11 +294,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-errmsg": {
       "description": "Options for the `flake8-errmsg` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8ErrMsgOptions"
@@ -307,11 +306,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-gettext": {
       "description": "Options for the `flake8-gettext` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8GetTextOptions"
@@ -319,11 +318,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-implicit-str-concat": {
       "description": "Options for the `flake8-implicit-str-concat` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8ImplicitStrConcatOptions"
@@ -331,11 +330,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-import-conventions": {
       "description": "Options for the `flake8-import-conventions` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8ImportConventionsOptions"
@@ -343,11 +342,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-pytest-style": {
       "description": "Options for the `flake8-pytest-style` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8PytestStyleOptions"
@@ -355,11 +354,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-quotes": {
       "description": "Options for the `flake8-quotes` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8QuotesOptions"
@@ -367,11 +366,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-self": {
       "description": "Options for the `flake8_self` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8SelfOptions"
@@ -379,11 +378,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-tidy-imports": {
       "description": "Options for the `flake8-tidy-imports` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8TidyImportsOptions"
@@ -391,11 +390,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-type-checking": {
       "description": "Options for the `flake8-type-checking` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8TypeCheckingOptions"
@@ -403,11 +402,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "flake8-unused-arguments": {
       "description": "Options for the `flake8-unused-arguments` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8UnusedArgumentsOptions"
@@ -415,10 +414,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "force-exclude": {
-      "description": "Whether to enforce [`exclude`](#exclude) and [`extend-exclude`](#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.",
+      "description": "Whether to enforce [`exclude`](#exclude) and [`extend-exclude`](#extend-exclude) patterns,\neven for paths that are passed to Ruff explicitly. Typically, Ruff will lint\nany paths passed in directly, even if they would typically be\nexcluded. Setting `force-exclude = true` will cause Ruff to\nrespect these exclusions unequivocally.\n\nThis is useful for [`pre-commit`](https://pre-commit.com/), which explicitly passes all\nchanged files to the [`ruff-pre-commit`](https://github.com/astral-sh/ruff-pre-commit)\nplugin, regardless of whether they're marked as excluded by Ruff's own\nsettings.",
       "type": [
         "boolean",
         "null"
@@ -436,26 +436,26 @@
       ]
     },
     "ignore": {
-      "description": "A list of rule codes or prefixes to ignore. Prefixes can specify exact rules (like `F841`), entire categories (like `F`), or anything in between.\n\nWhen breaking ties between enabled and disabled rules (via `select` and `ignore`, respectively), more specific prefixes override less specific prefixes. `ignore` takes precedence over `select` if the same prefix appears in both.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to ignore. Prefixes can specify exact\nrules (like `F841`), entire categories (like `F`), or anything in\nbetween.\n\nWhen breaking ties between enabled and disabled rules (via `select` and\n`ignore`, respectively), more specific prefixes override less\nspecific prefixes. `ignore` takes precedence over `select` if the same\nprefix appears in both.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "ignore-init-module-imports": {
-      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be flagged, but with a dedicated message suggesting that the import is either added to the module's `__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).\n\nThis option is enabled by default, but you can opt-in to removal of imports via an unsafe fix.",
-      "deprecated": true,
+      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such\nimports will still be flagged, but with a dedicated message suggesting\nthat the import is either added to the module's `__all__` symbol, or\nre-exported with a redundant alias (e.g., `import os as os`).\n\nThis option is enabled by default, but you can opt-in to removal of imports\nvia an unsafe fix.",
       "type": [
         "boolean",
         "null"
-      ]
+      ],
+      "deprecated": true
     },
     "include": {
-      "description": "A list of file patterns to include when linting.\n\nInclusion are based on globs, and should be single-path patterns, like `*.pyw`, to include any file with the `.pyw` extension. `pyproject.toml` is included here not for configuration but because we lint whether e.g. the `[project]` matches the schema.\n\nNotebook files (`.ipynb` extension) are included by default on Ruff 0.6.0+.\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+      "description": "A list of file patterns to include when linting.\n\nInclusion are based on globs, and should be single-path patterns, like\n`*.pyw`, to include any file with the `.pyw` extension. `pyproject.toml` is\nincluded here not for configuration but because we lint whether e.g. the\n`[project]` matches the schema.\n\nNotebook files (`.ipynb` extension) are included by default on Ruff 0.6.0+.\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
       "type": [
         "array",
         "null"
@@ -465,7 +465,7 @@
       }
     },
     "indent-width": {
-      "description": "The number of spaces per indentation level (tab).\n\nUsed by the formatter and when enforcing long-line violations (like `E501`) to determine the visual width of a tab.\n\nThis option changes the number of spaces the formatter inserts when using soft-tabs (`indent-style = space`).\n\nPEP 8 recommends using 4 spaces per [indentation level](https://peps.python.org/pep-0008/#indentation).",
+      "description": "The number of spaces per indentation level (tab).\n\nUsed by the formatter and when enforcing long-line violations (like `E501`) to determine the visual\nwidth of a tab.\n\nThis option changes the number of spaces the formatter inserts when\nusing soft-tabs (`indent-style = space`).\n\nPEP 8 recommends using 4 spaces per [indentation level](https://peps.python.org/pep-0008/#indentation).",
       "anyOf": [
         {
           "$ref": "#/definitions/IndentWidth"
@@ -477,7 +477,6 @@
     },
     "isort": {
       "description": "Options for the `isort` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/IsortOptions"
@@ -485,10 +484,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "line-length": {
-      "description": "The line length to use when enforcing long-lines violations (like `E501`) and at which `isort` and the formatter prefers to wrap lines.\n\nThe length is determined by the number of characters per line, except for lines containing East Asian characters or emojis. For these lines, the [unicode width](https://unicode.org/reports/tr11/) of each character is added up to determine the length.\n\nThe value must be greater than `0` and less than or equal to `320`.\n\nNote: While the formatter will attempt to format lines such that they remain within the `line-length`, it isn't a hard upper bound, and formatted lines may exceed the `line-length`.\n\nSee [`pycodestyle.max-line-length`](#lint_pycodestyle_max-line-length) to configure different lengths for `E501` and the formatter.",
+      "description": "The line length to use when enforcing long-lines violations (like `E501`)\nand at which `isort` and the formatter prefers to wrap lines.\n\nThe length is determined by the number of characters per line, except for lines containing East Asian characters or emojis.\nFor these lines, the [unicode width](https://unicode.org/reports/tr11/) of each character is added up to determine the length.\n\nThe value must be greater than `0` and less than or equal to `320`.\n\nNote: While the formatter will attempt to format lines such that they remain\nwithin the `line-length`, it isn't a hard upper bound, and formatted lines may\nexceed the `line-length`.\n\nSee [`pycodestyle.max-line-length`](#lint_pycodestyle_max-line-length) to configure different lengths for `E501` and the formatter.",
       "anyOf": [
         {
           "$ref": "#/definitions/LineLength"
@@ -509,19 +509,18 @@
       ]
     },
     "logger-objects": {
-      "description": "A list of objects that should be treated equivalently to a `logging.Logger` object.\n\nThis is useful for ensuring proper diagnostics (e.g., to identify `logging` deprecations and other best-practices) for projects that re-export a `logging.Logger` object from a common module.\n\nFor example, if you have a module `logging_setup.py` with the following contents: ```python import logging\n\nlogger = logging.getLogger(__name__) ```\n\nAdding `\"logging_setup.logger\"` to `logger-objects` will ensure that `logging_setup.logger` is treated as a `logging.Logger` object when imported from other modules (e.g., `from logging_setup import logger`).",
-      "deprecated": true,
+      "description": "A list of objects that should be treated equivalently to a\n`logging.Logger` object.\n\nThis is useful for ensuring proper diagnostics (e.g., to identify\n`logging` deprecations and other best-practices) for projects that\nre-export a `logging.Logger` object from a common module.\n\nFor example, if you have a module `logging_setup.py` with the following\ncontents:\n```python\nimport logging\n\nlogger = logging.getLogger(__name__)\n```\n\nAdding `\"logging_setup.logger\"` to `logger-objects` will ensure that\n`logging_setup.logger` is treated as a `logging.Logger` object when\nimported from other modules (e.g., `from logging_setup import logger`).",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "type": "string"
       }
     },
     "mccabe": {
       "description": "Options for the `mccabe` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/McCabeOptions"
@@ -529,10 +528,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "namespace-packages": {
-      "description": "Mark the specified directories as namespace packages. For the purpose of module resolution, Ruff will treat those directories and all their subdirectories as if they contained an `__init__.py` file.",
+      "description": "Mark the specified directories as namespace packages. For the purpose of\nmodule resolution, Ruff will treat those directories and all their subdirectories\nas if they contained an `__init__.py` file.",
       "type": [
         "array",
         "null"
@@ -542,7 +542,7 @@
       }
     },
     "output-format": {
-      "description": "The style in which violation messages should be formatted: `\"full\"` (default) (shows source), `\"concise\"`, `\"grouped\"` (group messages by file), `\"json\"` (machine-readable), `\"junit\"` (machine-readable XML), `\"github\"` (GitHub Actions annotations), `\"gitlab\"` (GitLab CI code quality report), `\"pylint\"` (Pylint text format) or `\"azure\"` (Azure Pipeline logging commands).",
+      "description": "The style in which violation messages should be formatted: `\"full\"` (default)\n(shows source), `\"concise\"`, `\"grouped\"` (group messages by file), `\"json\"`\n(machine-readable), `\"junit\"` (machine-readable XML), `\"github\"` (GitHub\nActions annotations), `\"gitlab\"` (GitLab CI code quality report),\n`\"pylint\"` (Pylint text format) or `\"azure\"` (Azure Pipeline logging commands).",
       "anyOf": [
         {
           "$ref": "#/definitions/OutputFormat"
@@ -554,7 +554,6 @@
     },
     "pep8-naming": {
       "description": "Options for the `pep8-naming` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/Pep8NamingOptions"
@@ -562,11 +561,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "per-file-ignores": {
-      "description": "A list of mappings from file pattern to rule codes or prefixes to exclude, when considering any matching files. An initial '!' negates the file pattern.",
-      "deprecated": true,
+      "description": "A list of mappings from file pattern to rule codes or prefixes to\nexclude, when considering any matching files. An initial '!' negates\nthe file pattern.",
       "type": [
         "object",
         "null"
@@ -576,10 +575,11 @@
         "items": {
           "$ref": "#/definitions/RuleSelector"
         }
-      }
+      },
+      "deprecated": true
     },
     "per-file-target-version": {
-      "description": "A list of mappings from glob-style file pattern to Python version to use when checking the corresponding file(s).\n\nThis may be useful for overriding the global Python version settings in `target-version` or `requires-python` for a subset of files. For example, if you have a project with a minimum supported Python version of 3.9 but a subdirectory of developer scripts that want to use a newer feature like the `match` statement from Python 3.10, you can use `per-file-target-version` to specify `\"developer_scripts/*.py\" = \"py310\"`.\n\nThis setting is used by the linter to enforce any enabled version-specific lint rules, as well as by the formatter for any version-specific formatting options, such as parenthesizing context managers on Python 3.10+.",
+      "description": "A list of mappings from glob-style file pattern to Python version to use when checking the\ncorresponding file(s).\n\nThis may be useful for overriding the global Python version settings in `target-version` or\n`requires-python` for a subset of files. For example, if you have a project with a minimum\nsupported Python version of 3.9 but a subdirectory of developer scripts that want to use a\nnewer feature like the `match` statement from Python 3.10, you can use\n`per-file-target-version` to specify `\"developer_scripts/*.py\" = \"py310\"`.\n\nThis setting is used by the linter to enforce any enabled version-specific lint rules, as\nwell as by the formatter for any version-specific formatting options, such as parenthesizing\ncontext managers on Python 3.10+.",
       "type": [
         "object",
         "null"
@@ -589,7 +589,7 @@
       }
     },
     "preview": {
-      "description": "Whether to enable preview mode. When preview mode is enabled, Ruff will use unstable rules, fixes, and formatting.",
+      "description": "Whether to enable preview mode. When preview mode is enabled, Ruff will\nuse unstable rules, fixes, and formatting.",
       "type": [
         "boolean",
         "null"
@@ -597,7 +597,6 @@
     },
     "pycodestyle": {
       "description": "Options for the `pycodestyle` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/PycodestyleOptions"
@@ -605,11 +604,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "pydocstyle": {
       "description": "Options for the `pydocstyle` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/PydocstyleOptions"
@@ -617,11 +616,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "pyflakes": {
       "description": "Options for the `pyflakes` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/PyflakesOptions"
@@ -629,11 +628,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "pylint": {
       "description": "Options for the `pylint` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/PylintOptions"
@@ -641,11 +640,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "pyupgrade": {
       "description": "Options for the `pyupgrade` plugin.",
-      "deprecated": true,
       "anyOf": [
         {
           "$ref": "#/definitions/PyUpgradeOptions"
@@ -653,10 +652,11 @@
         {
           "type": "null"
         }
-      ]
+      ],
+      "deprecated": true
     },
     "required-version": {
-      "description": "Enforce a requirement on the version of Ruff, to enforce at runtime. If the version of Ruff does not meet the requirement, Ruff will exit with an error.\n\nUseful for unifying results across many environments, e.g., with a `pyproject.toml` file.\n\nAccepts a [PEP 440](https://peps.python.org/pep-0440/) specifier, like `==0.3.1` or `>=0.3.1`.",
+      "description": "Enforce a requirement on the version of Ruff, to enforce at runtime.\nIf the version of Ruff does not meet the requirement, Ruff will exit\nwith an error.\n\nUseful for unifying results across many environments, e.g., with a\n`pyproject.toml` file.\n\nAccepts a [PEP 440](https://peps.python.org/pep-0440/) specifier, like `==0.3.1` or `>=0.3.1`.",
       "anyOf": [
         {
           "$ref": "#/definitions/RequiredVersion"
@@ -667,32 +667,32 @@
       ]
     },
     "respect-gitignore": {
-      "description": "Whether to automatically exclude files that are ignored by `.ignore`, `.gitignore`, `.git/info/exclude`, and global `gitignore` files. Enabled by default.",
+      "description": "Whether to automatically exclude files that are ignored by `.ignore`,\n`.gitignore`, `.git/info/exclude`, and global `gitignore` files.\nEnabled by default.",
       "type": [
         "boolean",
         "null"
       ]
     },
     "select": {
-      "description": "A list of rule codes or prefixes to enable. Prefixes can specify exact rules (like `F841`), entire categories (like `F`), or anything in between.\n\nWhen breaking ties between enabled and disabled rules (via `select` and `ignore`, respectively), more specific prefixes override less specific prefixes. `ignore` takes precedence over `select` if the same prefix appears in both.",
-      "deprecated": true,
+      "description": "A list of rule codes or prefixes to enable. Prefixes can specify exact\nrules (like `F841`), entire categories (like `F`), or anything in\nbetween.\n\nWhen breaking ties between enabled and disabled rules (via `select` and\n`ignore`, respectively), more specific prefixes override less\nspecific prefixes. `ignore` takes precedence over `select` if the\nsame prefix appears in both.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "show-fixes": {
-      "description": "Whether to show an enumeration of all fixed lint violations (overridden by the `--show-fixes` command-line flag).",
+      "description": "Whether to show an enumeration of all fixed lint violations\n(overridden by the `--show-fixes` command-line flag).",
       "type": [
         "boolean",
         "null"
       ]
     },
     "src": {
-      "description": "The directories to consider when resolving first- vs. third-party imports.\n\nWhen omitted, the `src` directory will typically default to including both:\n\n1. The directory containing the nearest `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (the \"project root\"). 2. The `\"src\"` subdirectory of the project root.\n\nThese defaults ensure that Ruff supports both flat layouts and `src` layouts out-of-the-box. (If a configuration file is explicitly provided (e.g., via the `--config` command-line flag), the current working directory will be considered the project root.)\n\nAs an example, consider an alternative project structure, like:\n\n```text my_project ├── pyproject.toml └── lib └── my_package ├── __init__.py ├── foo.py └── bar.py ```\n\nIn this case, the `./lib` directory should be included in the `src` option (e.g., `src = [\"lib\"]`), such that when resolving imports, `my_package.foo` is considered first-party.\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 packages in that directory. User home directory and environment variables will also be expanded.",
+      "description": "The directories to consider when resolving first- vs. third-party\nimports.\n\nWhen omitted, the `src` directory will typically default to including both:\n\n1. The directory containing the nearest `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (the \"project root\").\n2. The `\"src\"` subdirectory of the project root.\n\nThese defaults ensure that Ruff supports both flat layouts and `src` layouts out-of-the-box.\n(If a configuration file is explicitly provided (e.g., via the `--config` command-line\nflag), the current working directory will be considered the project root.)\n\nAs an example, consider an alternative project structure, like:\n\n```text\nmy_project\n├── pyproject.toml\n└── lib\n    └── my_package\n        ├── __init__.py\n        ├── foo.py\n        └── bar.py\n```\n\nIn this case, the `./lib` directory should be included in the `src` option\n(e.g., `src = [\"lib\"]`), such that when resolving imports, `my_package.foo`\nis considered first-party.\n\nThis field supports globs. For example, if you have a series of Python\npackages in a `python_modules` directory, `src = [\"python_modules/*\"]`\nwould expand to incorporate all packages in that directory. User home\ndirectory and environment variables will also be expanded.",
       "type": [
         "array",
         "null"
@@ -702,7 +702,7 @@
       }
     },
     "target-version": {
-      "description": "The minimum Python version to target, e.g., when considering automatic code upgrades, like rewriting type annotations. Ruff will not propose changes using features that are not available in the given version.\n\nFor example, to represent supporting Python >=3.10 or ==3.10 specify `target-version = \"py310\"`.\n\nIf you're already using a `pyproject.toml` file, we recommend `project.requires-python` instead, as it's based on Python packaging standards, and will be respected by other tools. For example, Ruff treats the following as identical to `target-version = \"py38\"`:\n\n```toml [project] requires-python = \">=3.8\" ```\n\nIf both are specified, `target-version` takes precedence over `requires-python`. See [_Inferring the Python version_](https://docs.astral.sh/ruff/configuration/#inferring-the-python-version) for a complete description of how the `target-version` is determined when left unspecified.\n\nNote that a stub file can [sometimes make use of a typing feature](https://typing.python.org/en/latest/spec/distributing.html#syntax) before it is available at runtime, as long as the stub does not make use of new *syntax*. For example, a type checker will understand `int | str` in a stub as being a `Union` type annotation, even if the type checker is run using Python 3.9, despite the fact that the `|` operator can only be used to create union types at runtime on Python 3.10+. As such, Ruff will often recommend newer features in a stub file than it would for an equivalent runtime file with the same target version.",
+      "description": "The minimum Python version to target, e.g., when considering automatic\ncode upgrades, like rewriting type annotations. Ruff will not propose\nchanges using features that are not available in the given version.\n\nFor example, to represent supporting Python >=3.11 or ==3.11\nspecify `target-version = \"py311\"`.\n\nIf you're already using a `pyproject.toml` file, we recommend\n`project.requires-python` instead, as it's based on Python packaging\nstandards, and will be respected by other tools. For example, Ruff\ntreats the following as identical to `target-version = \"py38\"`:\n\n```toml\n[project]\nrequires-python = \">=3.8\"\n```\n\nIf both are specified, `target-version` takes precedence over\n`requires-python`. See [_Inferring the Python version_](https://docs.astral.sh/ruff/configuration/#inferring-the-python-version)\nfor a complete description of how the `target-version` is determined\nwhen left unspecified.\n\nNote that a stub file can [sometimes make use of a typing feature](https://typing.python.org/en/latest/spec/distributing.html#syntax)\nbefore it is available at runtime, as long as the stub does not make\nuse of new *syntax*. For example, a type checker will understand\n`int | str` in a stub as being a `Union` type annotation, even if the\ntype checker is run using Python 3.9, despite the fact that the `|`\noperator can only be used to create union types at runtime on Python\n3.10+. As such, Ruff will often recommend newer features in a stub\nfile than it would for an equivalent runtime file with the same target\nversion.",
       "anyOf": [
         {
           "$ref": "#/definitions/PythonVersion"
@@ -713,40 +713,40 @@
       ]
     },
     "task-tags": {
-      "description": "A list of task tags to recognize (e.g., \"TODO\", \"FIXME\", \"XXX\").\n\nComments starting with these tags will be ignored by commented-out code detection (`ERA`), and skipped by line-length rules (`E501`) if [`ignore-overlong-task-comments`](#lint_pycodestyle_ignore-overlong-task-comments) is set to `true`.",
-      "deprecated": true,
+      "description": "A list of task tags to recognize (e.g., \"TODO\", \"FIXME\", \"XXX\").\n\nComments starting with these tags will be ignored by commented-out code\ndetection (`ERA`), and skipped by line-length rules (`E501`) if\n[`ignore-overlong-task-comments`](#lint_pycodestyle_ignore-overlong-task-comments) is set to `true`.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "type": "string"
       }
     },
     "typing-modules": {
-      "description": "A list of modules whose exports should be treated equivalently to members of the `typing` module.\n\nThis is useful for ensuring proper type annotation inference for projects that re-export `typing` and `typing_extensions` members from a compatibility module. If omitted, any members imported from modules apart from `typing` and `typing_extensions` will be treated as ordinary Python objects.",
-      "deprecated": true,
+      "description": "A list of modules whose exports should be treated equivalently to\nmembers of the `typing` module.\n\nThis is useful for ensuring proper type annotation inference for\nprojects that re-export `typing` and `typing_extensions` members\nfrom a compatibility module. If omitted, any members imported from\nmodules apart from `typing` and `typing_extensions` will be treated\nas ordinary Python objects.",
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "type": "string"
       }
     },
     "unfixable": {
       "description": "A list of rule codes or prefixes to consider non-fixable.",
-      "deprecated": true,
       "type": [
         "array",
         "null"
       ],
+      "deprecated": true,
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
     },
     "unsafe-fixes": {
-      "description": "Enable application of unsafe fixes. If excluded, a hint will be displayed when unsafe fixes are available. If set to false, the hint will be hidden.",
+      "description": "Enable application of unsafe fixes.\nIf excluded, a hint will be displayed when unsafe fixes are available.\nIf set to false, the hint will be hidden.",
       "type": [
         "boolean",
         "null"
@@ -763,14 +763,14 @@
       "type": "object",
       "properties": {
         "detect-string-imports": {
-          "description": "Whether to detect imports from string literals. When enabled, Ruff will search for string literals that \"look like\" import paths, and include them in the import map, if they resolve to valid Python modules.",
+          "description": "Whether to detect imports from string literals. When enabled, Ruff will search for string\nliterals that \"look like\" import paths, and include them in the import map, if they resolve\nto valid Python modules.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "direction": {
-          "description": "Whether to generate a map from file to files that it depends on (dependencies) or files that depend on it (dependents).",
+          "description": "Whether to generate a map from file to files that it depends on (dependencies) or files that\ndepend on it (dependents).",
           "anyOf": [
             {
               "$ref": "#/definitions/Direction"
@@ -781,7 +781,7 @@
           ]
         },
         "exclude": {
-          "description": "A list of file patterns to exclude from analysis in addition to the files excluded globally (see [`exclude`](#exclude), and [`extend-exclude`](#extend-exclude)).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of file patterns to exclude from analysis in addition to the files excluded globally (see [`exclude`](#exclude), and [`extend-exclude`](#extend-exclude)).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory\n  named `.mypy_cache` in the tree), `foo.py` (to exclude any file named\n  `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ).\n- Relative patterns, like `directory/foo.py` (to exclude that specific\n  file) or `directory/*.py` (to exclude any Python files in\n  `directory`). Note that these paths are relative to the project root\n  (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -791,7 +791,7 @@
           }
         },
         "include-dependencies": {
-          "description": "A map from file path to the list of Python or non-Python file paths or globs that should be considered dependencies of that file, regardless of whether relevant imports are detected.",
+          "description": "A map from file path to the list of Python or non-Python file paths or globs that should be\nconsidered dependencies of that file, regardless of whether relevant imports are detected.",
           "type": [
             "object",
             "null"
@@ -804,36 +804,36 @@
           }
         },
         "preview": {
-          "description": "Whether to enable preview mode. When preview mode is enabled, Ruff will expose unstable commands.",
+          "description": "Whether to enable preview mode. When preview mode is enabled, Ruff will expose unstable\ncommands.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "string-imports-min-dots": {
-          "description": "The minimum number of dots in a string to consider it a valid import.\n\nThis setting is only relevant when [`detect-string-imports`](#detect-string-imports) is enabled. For example, if this is set to `2`, then only strings with at least two dots (e.g., `\"path.to.module\"`) would be considered valid imports.",
+          "description": "The minimum number of dots in a string to consider it a valid import.\n\nThis setting is only relevant when [`detect-string-imports`](#detect-string-imports) is enabled.\nFor example, if this is set to `2`, then only strings with at least two dots (e.g., `\"path.to.module\"`)\nwould be considered valid imports.",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         }
       },
       "additionalProperties": false
     },
     "ApiBan": {
       "type": "object",
-      "required": [
-        "msg"
-      ],
       "properties": {
         "msg": {
           "description": "The message to display when the API is used.",
           "type": "string"
         }
       },
-      "additionalProperties": false
+      "additionalProperties": false,
+      "required": [
+        "msg"
+      ]
     },
     "BannedAliases": {
       "type": "array",
@@ -856,23 +856,17 @@
         {
           "description": "Use Google-style docstrings.",
           "type": "string",
-          "enum": [
-            "google"
-          ]
+          "const": "google"
         },
         {
           "description": "Use NumPy-style docstrings.",
           "type": "string",
-          "enum": [
-            "numpy"
-          ]
+          "const": "numpy"
         },
         {
           "description": "Use PEP257-style docstrings.",
           "type": "string",
-          "enum": [
-            "pep257"
-          ]
+          "const": "pep257"
         }
       ]
     },
@@ -881,16 +875,12 @@
         {
           "description": "Construct a map from module to its dependencies (i.e., the modules that it imports).",
           "type": "string",
-          "enum": [
-            "dependencies"
-          ]
+          "const": "dependencies"
         },
         {
           "description": "Construct a map from module to its dependents (i.e., the modules that import it).",
           "type": "string",
-          "enum": [
-            "dependents"
-          ]
+          "const": "dependents"
         }
       ]
     },
@@ -915,35 +905,35 @@
       "type": "object",
       "properties": {
         "allow-star-arg-any": {
-          "description": "Whether to suppress `ANN401` for dynamically typed `*args` and `**kwargs` arguments.",
+          "description": "Whether to suppress `ANN401` for dynamically typed `*args` and\n`**kwargs` arguments.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "ignore-fully-untyped": {
-          "description": "Whether to suppress `ANN*` rules for any declaration that hasn't been typed at all. This makes it easier to gradually add types to a codebase.",
+          "description": "Whether to suppress `ANN*` rules for any declaration\nthat hasn't been typed at all.\nThis makes it easier to gradually add types to a codebase.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "mypy-init-return": {
-          "description": "Whether to allow the omission of a return type hint for `__init__` if at least one argument is annotated.",
+          "description": "Whether to allow the omission of a return type hint for `__init__` if at\nleast one argument is annotated.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "suppress-dummy-args": {
-          "description": "Whether to suppress `ANN000`-level violations for arguments matching the \"dummy\" variable regex (like `_`).",
+          "description": "Whether to suppress `ANN000`-level violations for arguments matching the\n\"dummy\" variable regex (like `_`).",
           "type": [
             "boolean",
             "null"
           ]
         },
         "suppress-none-returning": {
-          "description": "Whether to suppress `ANN200`-level violations for functions that meet either of the following criteria:\n\n- Contain no `return` statement. - Explicit `return` statement(s) all return `None` (explicitly or implicitly).",
+          "description": "Whether to suppress `ANN200`-level violations for functions that meet\neither of the following criteria:\n\n- Contain no `return` statement.\n- Explicit `return` statement(s) all return `None` (explicitly or\n  implicitly).",
           "type": [
             "boolean",
             "null"
@@ -957,7 +947,7 @@
       "type": "object",
       "properties": {
         "allowed-markup-calls": {
-          "description": "A list of callable names, whose result may be safely passed into [`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `bleach.clean`, rather than `clean`).\n\nThis setting helps you avoid false positives in code like:\n\n```python from bleach import clean from markupsafe import Markup\n\ncleaned_markup = Markup(clean(some_user_input)) ```\n\nWhere the use of [`bleach.clean`](https://bleach.readthedocs.io/en/latest/clean.html) usually ensures that there's no XSS vulnerability.\n\nAlthough it is not recommended, you may also use this setting to whitelist other kinds of calls, e.g. calls to i18n translation functions, where how safe that is will depend on the implementation and how well the translations are audited.\n\nAnother common use-case is to wrap the output of functions that generate markup like [`xml.etree.ElementTree.tostring`](https://docs.python.org/3/library/xml.etree.elementtree.html#xml.etree.ElementTree.tostring) or template rendering engines where sanitization of potential user input is either already baked in or has to happen before rendering.",
+          "description": "A list of callable names, whose result may be safely passed into\n[`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `bleach.clean`, rather than `clean`).\n\nThis setting helps you avoid false positives in code like:\n\n```python\nfrom bleach import clean\nfrom markupsafe import Markup\n\ncleaned_markup = Markup(clean(some_user_input))\n```\n\nWhere the use of [`bleach.clean`](https://bleach.readthedocs.io/en/latest/clean.html)\nusually ensures that there's no XSS vulnerability.\n\nAlthough it is not recommended, you may also use this setting to whitelist other\nkinds of calls, e.g. calls to i18n translation functions, where how safe that is\nwill depend on the implementation and how well the translations are audited.\n\nAnother common use-case is to wrap the output of functions that generate markup\nlike [`xml.etree.ElementTree.tostring`](https://docs.python.org/3/library/xml.etree.elementtree.html#xml.etree.ElementTree.tostring)\nor template rendering engines where sanitization of potential user input is either\nalready baked in or has to happen before rendering.",
           "type": [
             "array",
             "null"
@@ -967,14 +957,14 @@
           }
         },
         "check-typed-exception": {
-          "description": "Whether to disallow `try`-`except`-`pass` (`S110`) for specific exception types. By default, `try`-`except`-`pass` is only disallowed for `Exception` and `BaseException`.",
+          "description": "Whether to disallow `try`-`except`-`pass` (`S110`) for specific\nexception types. By default, `try`-`except`-`pass` is only\ndisallowed for `Exception` and `BaseException`.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "extend-markup-names": {
-          "description": "A list of additional callable names that behave like [`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `webhelpers.html.literal`, rather than `literal`).",
+          "description": "A list of additional callable names that behave like\n[`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `webhelpers.html.literal`, rather than\n`literal`).",
           "type": [
             "array",
             "null"
@@ -994,7 +984,7 @@
           }
         },
         "hardcoded-tmp-directory-extend": {
-          "description": "A list of directories to consider temporary, in addition to those specified by [`hardcoded-tmp-directory`](#lint_flake8-bandit_hardcoded-tmp-directory) (see `S108`).",
+          "description": "A list of directories to consider temporary, in addition to those\nspecified by [`hardcoded-tmp-directory`](#lint_flake8-bandit_hardcoded-tmp-directory) (see `S108`).",
           "type": [
             "array",
             "null"
@@ -1011,7 +1001,7 @@
       "type": "object",
       "properties": {
         "extend-allowed-calls": {
-          "description": "Additional callable functions with which to allow boolean traps.\n\nExpects to receive a list of fully-qualified names (e.g., `pydantic.Field`, rather than `Field`).",
+          "description": "Additional callable functions with which to allow boolean traps.\n\nExpects to receive a list of fully-qualified names (e.g., `pydantic.Field`, rather than\n`Field`).",
           "type": [
             "array",
             "null"
@@ -1028,7 +1018,7 @@
       "type": "object",
       "properties": {
         "extend-immutable-calls": {
-          "description": "Additional callable functions to consider \"immutable\" when evaluating, e.g., the `function-call-in-default-argument` rule (`B008`) or `function-call-in-dataclass-defaults` rule (`RUF009`).\n\nExpects to receive a list of fully-qualified names (e.g., `fastapi.Query`, rather than `Query`).",
+          "description": "Additional callable functions to consider \"immutable\" when evaluating, e.g., the\n`function-call-in-default-argument` rule (`B008`) or `function-call-in-dataclass-defaults`\nrule (`RUF009`).\n\nExpects to receive a list of fully-qualified names (e.g., `fastapi.Query`, rather than\n`Query`).",
           "type": [
             "array",
             "null"
@@ -1056,33 +1046,33 @@
         },
         "builtins-allowed-modules": {
           "description": "DEPRECATED: This option has been renamed to `allowed-modules`. Use `allowed-modules` instead.\n\nList of builtin module names to allow.\n\nThis option is ignored if both `allowed-modules` and `builtins-allowed-modules` are set.",
-          "deprecated": true,
           "type": [
             "array",
             "null"
           ],
+          "deprecated": true,
           "items": {
             "type": "string"
           }
         },
         "builtins-ignorelist": {
           "description": "DEPRECATED: This option has been renamed to `ignorelist`. Use `ignorelist` instead.\n\nIgnore list of builtins.\n\nThis option is ignored if both `ignorelist` and `builtins-ignorelist` are set.",
-          "deprecated": true,
           "type": [
             "array",
             "null"
           ],
+          "deprecated": true,
           "items": {
             "type": "string"
           }
         },
         "builtins-strict-checking": {
           "description": "DEPRECATED: This option has been renamed to `strict-checking`. Use `strict-checking` instead.\n\nCompare module names instead of full module paths.\n\nThis option is ignored if both `strict-checking` and `builtins-strict-checking` are set.",
-          "deprecated": true,
           "type": [
             "boolean",
             "null"
-          ]
+          ],
+          "deprecated": true
         },
         "ignorelist": {
           "description": "Ignore list of builtins.",
@@ -1123,23 +1113,23 @@
       "type": "object",
       "properties": {
         "author": {
-          "description": "Author to enforce within the copyright notice. If provided, the author must be present immediately following the copyright notice.",
+          "description": "Author to enforce within the copyright notice. If provided, the\nauthor must be present immediately following the copyright notice.",
           "type": [
             "string",
             "null"
           ]
         },
         "min-file-size": {
-          "description": "A minimum file size (in bytes) required for a copyright notice to be enforced. By default, all files are validated.",
+          "description": "A minimum file size (in bytes) required for a copyright notice to\nbe enforced. By default, all files are validated.",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "notice-rgx": {
-          "description": "The regular expression used to match the copyright notice, compiled with the [`regex`](https://docs.rs/regex/latest/regex/) crate. Defaults to `(?i)Copyright\\s+((?:\\(C\\)|©)\\s+)?\\d{4}((-|,\\s)\\d{4})*`, which matches the following:\n\n- `Copyright 2023` - `Copyright (C) 2023` - `Copyright 2021-2023` - `Copyright (C) 2021-2023` - `Copyright (C) 2021, 2023`",
+          "description": "The regular expression used to match the copyright notice, compiled\nwith the [`regex`](https://docs.rs/regex/latest/regex/) crate.\nDefaults to `(?i)Copyright\\s+((?:\\(C\\)|©)\\s+)?\\d{4}((-|,\\s)\\d{4})*`, which matches\nthe following:\n\n- `Copyright 2023`\n- `Copyright (C) 2023`\n- `Copyright 2021-2023`\n- `Copyright (C) 2021-2023`\n- `Copyright (C) 2021, 2023`",
           "type": [
             "string",
             "null"
@@ -1159,7 +1149,7 @@
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         }
       },
       "additionalProperties": false
@@ -1169,7 +1159,7 @@
       "type": "object",
       "properties": {
         "extend-function-names": {
-          "description": "Additional function names to consider as internationalization calls, in addition to those included in [`function-names`](#lint_flake8-gettext_function-names).",
+          "description": "Additional function names to consider as internationalization calls, in addition to those\nincluded in [`function-names`](#lint_flake8-gettext_function-names).",
           "type": [
             "array",
             "null"
@@ -1196,7 +1186,7 @@
       "type": "object",
       "properties": {
         "allow-multiline": {
-          "description": "Whether to allow implicit string concatenations for multiline strings. By default, implicit concatenations of multiline strings are allowed (but continuation lines, delimited with a backslash, are prohibited).\n\nSetting `allow-multiline = false` will automatically disable the `explicit-string-concatenation` (`ISC003`) rule. Otherwise, both implicit and explicit multiline string concatenations would be seen as violations, making it impossible to write a linter-compliant multiline string.",
+          "description": "Whether to allow implicit string concatenations for multiline strings.\nBy default, implicit concatenations of multiline strings are\nallowed (but continuation lines, delimited with a backslash, are\nprohibited).\n\nSetting `allow-multiline = false` will automatically disable the\n`explicit-string-concatenation` (`ISC003`) rule. Otherwise, both\nimplicit and explicit multiline string concatenations would be seen\nas violations, making it impossible to write a linter-compliant multiline\nstring.",
           "type": [
             "boolean",
             "null"
@@ -1210,7 +1200,7 @@
       "type": "object",
       "properties": {
         "aliases": {
-          "description": "The conventional aliases for imports. These aliases can be extended by the [`extend-aliases`](#lint_flake8-import-conventions_extend-aliases) option.",
+          "description": "The conventional aliases for imports. These aliases can be extended by\nthe [`extend-aliases`](#lint_flake8-import-conventions_extend-aliases) option.",
           "type": [
             "object",
             "null"
@@ -1230,7 +1220,7 @@
           }
         },
         "banned-from": {
-          "description": "A list of modules that should not be imported from using the `from ... import ...` syntax.\n\nFor example, given `banned-from = [\"pandas\"]`, `from pandas import DataFrame` would be disallowed, while `import pandas` would be allowed.",
+          "description": "A list of modules that should not be imported from using the\n`from ... import ...` syntax.\n\nFor example, given `banned-from = [\"pandas\"]`, `from pandas import DataFrame`\nwould be disallowed, while `import pandas` would be allowed.",
           "type": [
             "array",
             "null"
@@ -1241,7 +1231,7 @@
           "uniqueItems": true
         },
         "extend-aliases": {
-          "description": "A mapping from module to conventional import alias. These aliases will be added to the [`aliases`](#lint_flake8-import-conventions_aliases) mapping.",
+          "description": "A mapping from module to conventional import alias. These aliases will\nbe added to the [`aliases`](#lint_flake8-import-conventions_aliases) mapping.",
           "type": [
             "object",
             "null"
@@ -1258,21 +1248,21 @@
       "type": "object",
       "properties": {
         "fixture-parentheses": {
-          "description": "Boolean flag specifying whether `@pytest.fixture()` without parameters should have parentheses. If the option is set to `false` (the default), `@pytest.fixture` is valid and `@pytest.fixture()` is invalid. If set to `true`, `@pytest.fixture()` is valid and `@pytest.fixture` is invalid.",
+          "description": "Boolean flag specifying whether `@pytest.fixture()` without parameters\nshould have parentheses. If the option is set to `false` (the default),\n`@pytest.fixture` is valid and `@pytest.fixture()` is invalid. If set\nto `true`, `@pytest.fixture()` is valid and `@pytest.fixture` is\ninvalid.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "mark-parentheses": {
-          "description": "Boolean flag specifying whether `@pytest.mark.foo()` without parameters should have parentheses. If the option is set to `false` (the default), `@pytest.mark.foo` is valid and `@pytest.mark.foo()` is invalid. If set to `true`, `@pytest.mark.foo()` is valid and `@pytest.mark.foo` is invalid.",
+          "description": "Boolean flag specifying whether `@pytest.mark.foo()` without parameters\nshould have parentheses. If the option is set to `false` (the\ndefault), `@pytest.mark.foo` is valid and `@pytest.mark.foo()` is\ninvalid. If set to `true`, `@pytest.mark.foo()` is valid and\n`@pytest.mark.foo` is invalid.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "parametrize-names-type": {
-          "description": "Expected type for multiple argument names in `@pytest.mark.parametrize`. The following values are supported:\n\n- `csv` — a comma-separated list, e.g. `@pytest.mark.parametrize(\"name1,name2\", ...)` - `tuple` (default) — e.g. `@pytest.mark.parametrize((\"name1\", \"name2\"), ...)` - `list` — e.g. `@pytest.mark.parametrize([\"name1\", \"name2\"], ...)`",
+          "description": "Expected type for multiple argument names in `@pytest.mark.parametrize`.\nThe following values are supported:\n\n- `csv` — a comma-separated list, e.g.\n  `@pytest.mark.parametrize(\"name1,name2\", ...)`\n- `tuple` (default) — e.g.\n  `@pytest.mark.parametrize((\"name1\", \"name2\"), ...)`\n- `list` — e.g. `@pytest.mark.parametrize([\"name1\", \"name2\"], ...)`",
           "anyOf": [
             {
               "$ref": "#/definitions/ParametrizeNameType"
@@ -1283,7 +1273,7 @@
           ]
         },
         "parametrize-values-row-type": {
-          "description": "Expected type for each row of values in `@pytest.mark.parametrize` in case of multiple parameters. The following values are supported:\n\n- `tuple` (default) — e.g. `@pytest.mark.parametrize((\"name1\", \"name2\"), [(1, 2), (3, 4)])` - `list` — e.g. `@pytest.mark.parametrize((\"name1\", \"name2\"), [[1, 2], [3, 4]])`",
+          "description": "Expected type for each row of values in `@pytest.mark.parametrize` in\ncase of multiple parameters. The following values are supported:\n\n- `tuple` (default) — e.g.\n  `@pytest.mark.parametrize((\"name1\", \"name2\"), [(1, 2), (3, 4)])`\n- `list` — e.g.\n  `@pytest.mark.parametrize((\"name1\", \"name2\"), [[1, 2], [3, 4]])`",
           "anyOf": [
             {
               "$ref": "#/definitions/ParametrizeValuesRowType"
@@ -1294,7 +1284,7 @@
           ]
         },
         "parametrize-values-type": {
-          "description": "Expected type for the list of values rows in `@pytest.mark.parametrize`. The following values are supported:\n\n- `tuple` — e.g. `@pytest.mark.parametrize(\"name\", (1, 2, 3))` - `list` (default) — e.g. `@pytest.mark.parametrize(\"name\", [1, 2, 3])`",
+          "description": "Expected type for the list of values rows in `@pytest.mark.parametrize`.\nThe following values are supported:\n\n- `tuple` — e.g. `@pytest.mark.parametrize(\"name\", (1, 2, 3))`\n- `list` (default) — e.g. `@pytest.mark.parametrize(\"name\", [1, 2, 3])`",
           "anyOf": [
             {
               "$ref": "#/definitions/ParametrizeValuesType"
@@ -1305,7 +1295,7 @@
           ]
         },
         "raises-extend-require-match-for": {
-          "description": "List of additional exception names that require a match= parameter in a `pytest.raises()` call. This extends the default list of exceptions that require a match= parameter. This option is useful if you want to extend the default list of exceptions that require a match= parameter without having to specify the entire list. Note that this option does not remove any exceptions from the default list.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "List of additional exception names that require a match= parameter in a\n`pytest.raises()` call. This extends the default list of exceptions\nthat require a match= parameter.\nThis option is useful if you want to extend the default list of\nexceptions that require a match= parameter without having to specify\nthe entire list.\nNote that this option does not remove any exceptions from the default\nlist.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1315,7 +1305,7 @@
           }
         },
         "raises-require-match-for": {
-          "description": "List of exception names that require a match= parameter in a `pytest.raises()` call.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "List of exception names that require a match= parameter in a\n`pytest.raises()` call.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1325,7 +1315,7 @@
           }
         },
         "warns-extend-require-match-for": {
-          "description": "List of additional warning names that require a match= parameter in a `pytest.warns()` call. This extends the default list of warnings that require a match= parameter.\n\nThis option is useful if you want to extend the default list of warnings that require a match= parameter without having to specify the entire list.\n\nNote that this option does not remove any warnings from the default list.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "List of additional warning names that require a match= parameter in a\n`pytest.warns()` call. This extends the default list of warnings that\nrequire a match= parameter.\n\nThis option is useful if you want to extend the default list of warnings\nthat require a match= parameter without having to specify the entire\nlist.\n\nNote that this option does not remove any warnings from the default\nlist.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1335,7 +1325,7 @@
           }
         },
         "warns-require-match-for": {
-          "description": "List of warning names that require a match= parameter in a `pytest.warns()` call.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "List of warning names that require a match= parameter in a\n`pytest.warns()` call.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1352,14 +1342,14 @@
       "type": "object",
       "properties": {
         "avoid-escape": {
-          "description": "Whether to avoid using single quotes if a string contains single quotes, or vice-versa with double quotes, as per [PEP 8](https://peps.python.org/pep-0008/#string-quotes). This minimizes the need to escape quotation marks within strings.",
+          "description": "Whether to avoid using single quotes if a string contains single quotes,\nor vice-versa with double quotes, as per [PEP 8](https://peps.python.org/pep-0008/#string-quotes).\nThis minimizes the need to escape quotation marks within strings.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "docstring-quotes": {
-          "description": "Quote style to prefer for docstrings (either \"single\" or \"double\").\n\nWhen using the formatter, only \"double\" is compatible, as the formatter enforces double quotes for docstrings strings.",
+          "description": "Quote style to prefer for docstrings (either \"single\" or \"double\").\n\nWhen using the formatter, only \"double\" is compatible, as the formatter\nenforces double quotes for docstrings strings.",
           "anyOf": [
             {
               "$ref": "#/definitions/Quote"
@@ -1370,7 +1360,7 @@
           ]
         },
         "inline-quotes": {
-          "description": "Quote style to prefer for inline strings (either \"single\" or \"double\").\n\nWhen using the formatter, ensure that [`format.quote-style`](#format_quote-style) is set to the same preferred quote style.",
+          "description": "Quote style to prefer for inline strings (either \"single\" or\n\"double\").\n\nWhen using the formatter, ensure that [`format.quote-style`](#format_quote-style) is set to\nthe same preferred quote style.",
           "anyOf": [
             {
               "$ref": "#/definitions/Quote"
@@ -1381,7 +1371,7 @@
           ]
         },
         "multiline-quotes": {
-          "description": "Quote style to prefer for multiline strings (either \"single\" or \"double\").\n\nWhen using the formatter, only \"double\" is compatible, as the formatter enforces double quotes for multiline strings.",
+          "description": "Quote style to prefer for multiline strings (either \"single\" or\n\"double\").\n\nWhen using the formatter, only \"double\" is compatible, as the formatter\nenforces double quotes for multiline strings.",
           "anyOf": [
             {
               "$ref": "#/definitions/Quote"
@@ -1399,7 +1389,7 @@
       "type": "object",
       "properties": {
         "extend-ignore-names": {
-          "description": "Additional names to ignore when considering `flake8-self` violations, in addition to those included in [`ignore-names`](#lint_flake8-self_ignore-names).",
+          "description": "Additional names to ignore when considering `flake8-self` violations,\nin addition to those included in [`ignore-names`](#lint_flake8-self_ignore-names).",
           "type": [
             "array",
             "null"
@@ -1426,7 +1416,7 @@
       "type": "object",
       "properties": {
         "ban-relative-imports": {
-          "description": "Whether to ban all relative imports (`\"all\"`), or only those imports that extend into the parent module or beyond (`\"parents\"`).",
+          "description": "Whether to ban all relative imports (`\"all\"`), or only those imports\nthat extend into the parent module or beyond (`\"parents\"`).",
           "anyOf": [
             {
               "$ref": "#/definitions/Strictness"
@@ -1437,7 +1427,7 @@
           ]
         },
         "banned-api": {
-          "description": "Specific modules or module members that may not be imported or accessed. Note that this rule is only meant to flag accidental uses, and can be circumvented via `eval` or `importlib`.",
+          "description": "Specific modules or module members that may not be imported or accessed.\nNote that this rule is only meant to flag accidental uses,\nand can be circumvented via `eval` or `importlib`.",
           "type": [
             "object",
             "null"
@@ -1447,7 +1437,7 @@
           }
         },
         "banned-module-level-imports": {
-          "description": "List of specific modules that may not be imported at module level, and should instead be imported lazily (e.g., within a function definition, or an `if TYPE_CHECKING:` block, or some other nested context). This also affects the rule `import-outside-top-level` if `banned-module-level-imports` is enabled.",
+          "description": "List of specific modules that may not be imported at module level, and should instead be\nimported lazily (e.g., within a function definition, or an `if TYPE_CHECKING:`\nblock, or some other nested context). This also affects the rule `import-outside-top-level`\nif `banned-module-level-imports` is enabled.",
           "type": [
             "array",
             "null"
@@ -1464,7 +1454,7 @@
       "type": "object",
       "properties": {
         "exempt-modules": {
-          "description": "Exempt certain modules from needing to be moved into type-checking blocks.",
+          "description": "Exempt certain modules from needing to be moved into type-checking\nblocks.",
           "type": [
             "array",
             "null"
@@ -1474,14 +1464,14 @@
           }
         },
         "quote-annotations": {
-          "description": "Whether to add quotes around type annotations, if doing so would allow the corresponding import to be moved into a type-checking block.\n\nFor example, in the following, Python requires that `Sequence` be available at runtime, despite the fact that it's only used in a type annotation:\n\n```python from collections.abc import Sequence\n\ndef func(value: Sequence[int]) -> None: ... ```\n\nIn other words, moving `from collections.abc import Sequence` into an `if TYPE_CHECKING:` block above would cause a runtime error, as the type would no longer be available at runtime.\n\nBy default, Ruff will respect such runtime semantics and avoid moving the import to prevent such runtime errors.\n\nSetting `quote-annotations` to `true` will instruct Ruff to add quotes around the annotation (e.g., `\"Sequence[int]\"`), which in turn enables Ruff to move the import into an `if TYPE_CHECKING:` block, like so:\n\n```python from typing import TYPE_CHECKING\n\nif TYPE_CHECKING: from collections.abc import Sequence\n\ndef func(value: \"Sequence[int]\") -> None: ... ```\n\nNote that this setting has no effect when `from __future__ import annotations` is present, as `__future__` annotations are always treated equivalently to quoted annotations.",
+          "description": "Whether to add quotes around type annotations, if doing so would allow\nthe corresponding import to be moved into a type-checking block.\n\nFor example, in the following, Python requires that `Sequence` be\navailable at runtime, despite the fact that it's only used in a type\nannotation:\n\n```python\nfrom collections.abc import Sequence\n\n\ndef func(value: Sequence[int]) -> None:\n    ...\n```\n\nIn other words, moving `from collections.abc import Sequence` into an\n`if TYPE_CHECKING:` block above would cause a runtime error, as the\ntype would no longer be available at runtime.\n\nBy default, Ruff will respect such runtime semantics and avoid moving\nthe import to prevent such runtime errors.\n\nSetting `quote-annotations` to `true` will instruct Ruff to add quotes\naround the annotation (e.g., `\"Sequence[int]\"`), which in turn enables\nRuff to move the import into an `if TYPE_CHECKING:` block, like so:\n\n```python\nfrom typing import TYPE_CHECKING\n\nif TYPE_CHECKING:\n    from collections.abc import Sequence\n\n\ndef func(value: \"Sequence[int]\") -> None:\n    ...\n```\n\nNote that this setting has no effect when `from __future__ import annotations`\nis present, as `__future__` annotations are always treated equivalently\nto quoted annotations. Similarly, this setting has no effect on Python\nversions after 3.14 because these annotations are also deferred.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "runtime-evaluated-base-classes": {
-          "description": "Exempt classes that list any of the enumerated classes as a base class from needing to be moved into type-checking blocks.\n\nCommon examples include Pydantic's `pydantic.BaseModel` and SQLAlchemy's `sqlalchemy.orm.DeclarativeBase`, but can also support user-defined classes that inherit from those base classes. For example, if you define a common `DeclarativeBase` subclass that's used throughout your project (e.g., `class Base(DeclarativeBase) ...` in `base.py`), you can add it to this list (`runtime-evaluated-base-classes = [\"base.Base\"]`) to exempt models from being moved into type-checking blocks.",
+          "description": "Exempt classes that list any of the enumerated classes as a base class\nfrom needing to be moved into type-checking blocks.\n\nCommon examples include Pydantic's `pydantic.BaseModel` and SQLAlchemy's\n`sqlalchemy.orm.DeclarativeBase`, but can also support user-defined\nclasses that inherit from those base classes. For example, if you define\na common `DeclarativeBase` subclass that's used throughout your project\n(e.g., `class Base(DeclarativeBase) ...` in `base.py`), you can add it to\nthis list (`runtime-evaluated-base-classes = [\"base.Base\"]`) to exempt\nmodels from being moved into type-checking blocks.",
           "type": [
             "array",
             "null"
@@ -1491,7 +1481,7 @@
           }
         },
         "runtime-evaluated-decorators": {
-          "description": "Exempt classes and functions decorated with any of the enumerated decorators from being moved into type-checking blocks.\n\nCommon examples include Pydantic's `@pydantic.validate_call` decorator (for functions) and attrs' `@attrs.define` decorator (for classes).\n\nThis also supports framework decorators like FastAPI's `fastapi.FastAPI.get` which will work across assignments in the same module.\n\nFor example: ```python import fastapi\n\napp = FastAPI(\"app\")\n\n@app.get(\"/home\") def home() -> str: ... ```\n\nHere `app.get` will correctly be identified as `fastapi.FastAPI.get`.",
+          "description": "Exempt classes and functions decorated with any of the enumerated\ndecorators from being moved into type-checking blocks.\n\nCommon examples include Pydantic's `@pydantic.validate_call` decorator\n(for functions) and attrs' `@attrs.define` decorator (for classes).\n\nThis also supports framework decorators like FastAPI's `fastapi.FastAPI.get`\nwhich will work across assignments in the same module.\n\nFor example:\n```python\nimport fastapi\n\napp = FastAPI(\"app\")\n\n@app.get(\"/home\")\ndef home() -> str: ...\n```\n\nHere `app.get` will correctly be identified as `fastapi.FastAPI.get`.",
           "type": [
             "array",
             "null"
@@ -1501,7 +1491,7 @@
           }
         },
         "strict": {
-          "description": "Enforce `TC001`, `TC002`, and `TC003` rules even when valid runtime imports are present for the same module.\n\nSee flake8-type-checking's [strict](https://github.com/snok/flake8-type-checking#strict) option.",
+          "description": "Enforce `TC001`, `TC002`, and `TC003` rules even when valid runtime imports\nare present for the same module.\n\nSee flake8-type-checking's [strict](https://github.com/snok/flake8-type-checking#strict) option.",
           "type": [
             "boolean",
             "null"
@@ -1529,14 +1519,14 @@
       "type": "object",
       "properties": {
         "docstring-code-format": {
-          "description": "Whether to format code snippets in docstrings.\n\nWhen this is enabled, Python code examples within docstrings are automatically reformatted.\n\nFor example, when this is enabled, the following code:\n\n```python def f(x): \"\"\" Something about `f`. And an example in doctest format:\n\n>>> f(  x  )\n\nMarkdown is also supported:\n\n```py f(  x  ) ```\n\nAs are reStructuredText literal blocks::\n\nf(  x  )\n\nAnd reStructuredText code blocks:\n\n.. code-block:: python\n\nf(  x  ) \"\"\" pass ```\n\n... will be reformatted (assuming the rest of the options are set to their defaults) as:\n\n```python def f(x): \"\"\" Something about `f`. And an example in doctest format:\n\n>>> f(x)\n\nMarkdown is also supported:\n\n```py f(x) ```\n\nAs are reStructuredText literal blocks::\n\nf(x)\n\nAnd reStructuredText code blocks:\n\n.. code-block:: python\n\nf(x) \"\"\" pass ```\n\nIf a code snippet in a docstring contains invalid Python code or if the formatter would otherwise write invalid Python code, then the code example is ignored by the formatter and kept as-is.\n\nCurrently, doctest, Markdown, reStructuredText literal blocks, and reStructuredText code blocks are all supported and automatically recognized. In the case of unlabeled fenced code blocks in Markdown and reStructuredText literal blocks, the contents are assumed to be Python and reformatted. As with any other format, if the contents aren't valid Python, then the block is left untouched automatically.",
+          "description": "Whether to format code snippets in docstrings.\n\nWhen this is enabled, Python code examples within docstrings are\nautomatically reformatted.\n\nFor example, when this is enabled, the following code:\n\n```python\ndef f(x):\n    \"\"\"\n    Something about `f`. And an example in doctest format:\n\n    >>> f(  x  )\n\n    Markdown is also supported:\n\n    ```py\n    f(  x  )\n    ```\n\n    As are reStructuredText literal blocks::\n\n        f(  x  )\n\n\n    And reStructuredText code blocks:\n\n    .. code-block:: python\n\n        f(  x  )\n    \"\"\"\n    pass\n```\n\n... will be reformatted (assuming the rest of the options are set to\ntheir defaults) as:\n\n```python\ndef f(x):\n    \"\"\"\n    Something about `f`. And an example in doctest format:\n\n    >>> f(x)\n\n    Markdown is also supported:\n\n    ```py\n    f(x)\n    ```\n\n    As are reStructuredText literal blocks::\n\n        f(x)\n\n\n    And reStructuredText code blocks:\n\n    .. code-block:: python\n\n        f(x)\n    \"\"\"\n    pass\n```\n\nIf a code snippet in a docstring contains invalid Python code or if the\nformatter would otherwise write invalid Python code, then the code\nexample is ignored by the formatter and kept as-is.\n\nCurrently, doctest, Markdown, reStructuredText literal blocks, and\nreStructuredText code blocks are all supported and automatically\nrecognized. In the case of unlabeled fenced code blocks in Markdown and\nreStructuredText literal blocks, the contents are assumed to be Python\nand reformatted. As with any other format, if the contents aren't valid\nPython, then the block is left untouched automatically.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "docstring-code-line-length": {
-          "description": "Set the line length used when formatting code snippets in docstrings.\n\nThis only has an effect when the `docstring-code-format` setting is enabled.\n\nThe default value for this setting is `\"dynamic\"`, which has the effect of ensuring that any reformatted code examples in docstrings adhere to the global line length configuration that is used for the surrounding Python code. The point of this setting is that it takes the indentation of the docstring into account when reformatting code examples.\n\nAlternatively, this can be set to a fixed integer, which will result in the same line length limit being applied to all reformatted code examples in docstrings. When set to a fixed integer, the indent of the docstring is not taken into account. That is, this may result in lines in the reformatted code example that exceed the globally configured line length limit.\n\nFor example, when this is set to `20` and [`docstring-code-format`](#docstring-code-format) is enabled, then this code:\n\n```python def f(x): ''' Something about `f`. And an example:\n\n.. code-block:: python\n\nfoo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear) ''' pass ```\n\n... will be reformatted (assuming the rest of the options are set to their defaults) as:\n\n```python def f(x): \"\"\" Something about `f`. And an example:\n\n.. code-block:: python\n\n( foo, bar, quux, ) = this_is_a_long_line( lion, hippo, lemur, bear, ) \"\"\" pass ```",
+          "description": "Set the line length used when formatting code snippets in docstrings.\n\nThis only has an effect when the `docstring-code-format` setting is\nenabled.\n\nThe default value for this setting is `\"dynamic\"`, which has the effect\nof ensuring that any reformatted code examples in docstrings adhere to\nthe global line length configuration that is used for the surrounding\nPython code. The point of this setting is that it takes the indentation\nof the docstring into account when reformatting code examples.\n\nAlternatively, this can be set to a fixed integer, which will result\nin the same line length limit being applied to all reformatted code\nexamples in docstrings. When set to a fixed integer, the indent of the\ndocstring is not taken into account. That is, this may result in lines\nin the reformatted code example that exceed the globally configured\nline length limit.\n\nFor example, when this is set to `20` and [`docstring-code-format`](#docstring-code-format)\nis enabled, then this code:\n\n```python\ndef f(x):\n    '''\n    Something about `f`. And an example:\n\n    .. code-block:: python\n\n        foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)\n    '''\n    pass\n```\n\n... will be reformatted (assuming the rest of the options are set\nto their defaults) as:\n\n```python\ndef f(x):\n    \"\"\"\n    Something about `f`. And an example:\n\n    .. code-block:: python\n\n        (\n            foo,\n            bar,\n            quux,\n        ) = this_is_a_long_line(\n            lion,\n            hippo,\n            lemur,\n            bear,\n        )\n    \"\"\"\n    pass\n```",
           "anyOf": [
             {
               "$ref": "#/definitions/DocstringCodeLineWidth"
@@ -1547,7 +1537,7 @@
           ]
         },
         "exclude": {
-          "description": "A list of file patterns to exclude from formatting in addition to the files excluded globally (see [`exclude`](#exclude), and [`extend-exclude`](#extend-exclude)).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of file patterns to exclude from formatting in addition to the files excluded globally (see [`exclude`](#exclude), and [`extend-exclude`](#extend-exclude)).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory\n  named `.mypy_cache` in the tree), `foo.py` (to exclude any file named\n  `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ).\n- Relative patterns, like `directory/foo.py` (to exclude that specific\n  file) or `directory/*.py` (to exclude any Python files in\n  `directory`). Note that these paths are relative to the project root\n  (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1557,7 +1547,7 @@
           }
         },
         "indent-style": {
-          "description": "Whether to use spaces or tabs for indentation.\n\n`indent-style = \"space\"` (default):\n\n```python def f(): print(\"Hello\") #  Spaces indent the `print` statement. ```\n\n`indent-style = \"tab\"`:\n\n```python def f(): print(\"Hello\") #  A tab `\\t` indents the `print` statement. ```\n\nPEP 8 recommends using spaces for [indentation](https://peps.python.org/pep-0008/#indentation). We care about accessibility; if you do not need tabs for accessibility, we do not recommend you use them.\n\nSee [`indent-width`](#indent-width) to configure the number of spaces per indentation and the tab width.",
+          "description": "Whether to use spaces or tabs for indentation.\n\n`indent-style = \"space\"` (default):\n\n```python\ndef f():\n    print(\"Hello\") #  Spaces indent the `print` statement.\n```\n\n`indent-style = \"tab\"`:\n\n```python\ndef f():\n    print(\"Hello\") #  A tab `\\t` indents the `print` statement.\n```\n\nPEP 8 recommends using spaces for [indentation](https://peps.python.org/pep-0008/#indentation).\nWe care about accessibility; if you do not need tabs for accessibility, we do not recommend you use them.\n\nSee [`indent-width`](#indent-width) to configure the number of spaces per indentation and the tab width.",
           "anyOf": [
             {
               "$ref": "#/definitions/IndentStyle"
@@ -1568,7 +1558,7 @@
           ]
         },
         "line-ending": {
-          "description": "The character Ruff uses at the end of a line.\n\n* `auto`: The newline style is detected automatically on a file per file basis. Files with mixed line endings will be converted to the first detected line ending. Defaults to `\\n` for files that contain no line endings. * `lf`: Line endings will be converted to `\\n`. The default line ending on Unix. * `cr-lf`: Line endings will be converted to `\\r\\n`. The default line ending on Windows. * `native`: Line endings will be converted to `\\n` on Unix and `\\r\\n` on Windows.",
+          "description": "The character Ruff uses at the end of a line.\n\n* `auto`: The newline style is detected automatically on a file per file basis. Files with mixed line endings will be converted to the first detected line ending. Defaults to `\\n` for files that contain no line endings.\n* `lf`: Line endings will be converted to `\\n`. The default line ending on Unix.\n* `cr-lf`: Line endings will be converted to `\\r\\n`. The default line ending on Windows.\n* `native`: Line endings will be converted to `\\n` on Unix and `\\r\\n` on Windows.",
           "anyOf": [
             {
               "$ref": "#/definitions/LineEnding"
@@ -1586,7 +1576,7 @@
           ]
         },
         "quote-style": {
-          "description": "Configures the preferred quote character for strings. The recommended options are\n\n* `double` (default): Use double quotes `\"` * `single`: Use single quotes `'`\n\nIn compliance with [PEP 8](https://peps.python.org/pep-0008/) and [PEP 257](https://peps.python.org/pep-0257/), Ruff prefers double quotes for triple quoted strings and docstrings even when using `quote-style = \"single\"`.\n\nRuff deviates from using the configured quotes if doing so prevents the need for escaping quote characters inside the string:\n\n```python a = \"a string without any quotes\" b = \"It's monday morning\" ```\n\nRuff will change the quotes of the string assigned to `a` to single quotes when using `quote-style = \"single\"`. However, Ruff uses double quotes for the string assigned to `b` because using single quotes would require escaping the `'`, which leads to the less readable code: `'It\\'s monday morning'`.\n\nIn addition, Ruff supports the quote style `preserve` for projects that already use a mixture of single and double quotes and can't migrate to the `double` or `single` style. The quote style `preserve` leaves the quotes of all strings unchanged.",
+          "description": "Configures the preferred quote character for strings. The recommended options are\n\n* `double` (default): Use double quotes `\"`\n* `single`: Use single quotes `'`\n\nIn compliance with [PEP 8](https://peps.python.org/pep-0008/) and [PEP 257](https://peps.python.org/pep-0257/),\nRuff prefers double quotes for triple quoted strings and docstrings even when using `quote-style = \"single\"`.\n\nRuff deviates from using the configured quotes if doing so prevents the need for\nescaping quote characters inside the string:\n\n```python\na = \"a string without any quotes\"\nb = \"It's monday morning\"\n```\n\nRuff will change the quotes of the string assigned to `a` to single quotes when using `quote-style = \"single\"`.\nHowever, Ruff uses double quotes for the string assigned to `b` because using single quotes would require escaping the `'`,\nwhich leads to the less readable code: `'It\\'s monday morning'`.\n\nIn addition, Ruff supports the quote style `preserve` for projects that already use\na mixture of single and double quotes and can't migrate to the `double` or `single` style.\nThe quote style `preserve` leaves the quotes of all strings unchanged.",
           "anyOf": [
             {
               "$ref": "#/definitions/QuoteStyle"
@@ -1597,7 +1587,7 @@
           ]
         },
         "skip-magic-trailing-comma": {
-          "description": "Ruff uses existing trailing commas as an indication that short lines should be left separate. If this option is set to `true`, the magic trailing comma is ignored.\n\nFor example, Ruff leaves the arguments separate even though collapsing the arguments to a single line doesn't exceed the line length if `skip-magic-trailing-comma = false`:\n\n```python # The arguments remain on separate lines because of the trailing comma after `b` def test( a, b, ): pass ```\n\nSetting `skip-magic-trailing-comma = true` changes the formatting to:\n\n```python # The arguments are collapsed to a single line because the trailing comma is ignored def test(a, b): pass ```",
+          "description": "Ruff uses existing trailing commas as an indication that short lines should be left separate.\nIf this option is set to `true`, the magic trailing comma is ignored.\n\nFor example, Ruff leaves the arguments separate even though\ncollapsing the arguments to a single line doesn't exceed the line length if `skip-magic-trailing-comma = false`:\n\n```python\n# The arguments remain on separate lines because of the trailing comma after `b`\ndef test(\n    a,\n    b,\n): pass\n```\n\nSetting `skip-magic-trailing-comma = true` changes the formatting to:\n\n```python\n# The arguments are collapsed to a single line because the trailing comma is ignored\ndef test(a, b):\n    pass\n```",
           "type": [
             "boolean",
             "null"
@@ -1631,16 +1621,12 @@
         {
           "description": "Use tabs to indent code.",
           "type": "string",
-          "enum": [
-            "tab"
-          ]
+          "const": "tab"
         },
         {
           "description": "Use [`IndentWidth`] spaces to indent code.",
           "type": "string",
-          "enum": [
-            "space"
-          ]
+          "const": "space"
         }
       ]
     },
@@ -1648,21 +1634,22 @@
       "description": "The size of a tab.",
       "type": "integer",
       "format": "uint8",
-      "minimum": 1.0
+      "maximum": 255,
+      "minimum": 1
     },
     "IsortOptions": {
       "description": "Options for the `isort` plugin.",
       "type": "object",
       "properties": {
         "case-sensitive": {
-          "description": "Sort imports taking into account case sensitivity.",
+          "description": "Sort imports taking into account case sensitivity.\n\nNote that the [`order-by-type`](#lint_isort_order-by-type) setting will\ntake precedence over this one when enabled.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "classes": {
-          "description": "An override list of tokens to always recognize as a Class for [`order-by-type`](#lint_isort_order-by-type) regardless of casing.",
+          "description": "An override list of tokens to always recognize as a Class for\n[`order-by-type`](#lint_isort_order-by-type) regardless of casing.",
           "type": [
             "array",
             "null"
@@ -1672,14 +1659,14 @@
           }
         },
         "combine-as-imports": {
-          "description": "Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports) option.",
+          "description": "Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports)\noption.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "constants": {
-          "description": "An override list of tokens to always recognize as a CONSTANT for [`order-by-type`](#lint_isort_order-by-type) regardless of casing.",
+          "description": "An override list of tokens to always recognize as a CONSTANT\nfor [`order-by-type`](#lint_isort_order-by-type) regardless of casing.",
           "type": [
             "array",
             "null"
@@ -1700,14 +1687,14 @@
           ]
         },
         "detect-same-package": {
-          "description": "Whether to automatically mark imports from within the same package as first-party. For example, when `detect-same-package = true`, then when analyzing files within the `foo` package, any imports from within the `foo` package will be considered first-party.\n\nThis heuristic is often unnecessary when `src` is configured to detect all first-party sources; however, if `src` is _not_ configured, this heuristic can be useful to detect first-party imports from _within_ (but not _across_) first-party packages.",
+          "description": "Whether to automatically mark imports from within the same package as first-party.\nFor example, when `detect-same-package = true`, then when analyzing files within the\n`foo` package, any imports from within the `foo` package will be considered first-party.\n\nThis heuristic is often unnecessary when `src` is configured to detect all first-party\nsources; however, if `src` is _not_ configured, this heuristic can be useful to detect\nfirst-party imports from _within_ (but not _across_) first-party packages.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "extra-standard-library": {
-          "description": "A list of modules to consider standard-library, in addition to those known to Ruff in advance.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of modules to consider standard-library, in addition to those\nknown to Ruff in advance.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1724,7 +1711,7 @@
           ]
         },
         "force-sort-within-sections": {
-          "description": "Don't sort straight-style imports (like `import sys`) before from-style imports (like `from itertools import groupby`). Instead, sort the imports by module, independent of import style.",
+          "description": "Don't sort straight-style imports (like `import sys`) before from-style\nimports (like `from itertools import groupby`). Instead, sort the\nimports by module, independent of import style.",
           "type": [
             "boolean",
             "null"
@@ -1741,14 +1728,14 @@
           }
         },
         "force-wrap-aliases": {
-          "description": "Force `import from` statements with multiple members and at least one alias (e.g., `import A as B`) to wrap such that every line contains exactly one member. For example, this formatting would be retained, rather than condensing to a single line:\n\n```python from .utils import ( test_directory as test_directory, test_id as test_id ) ```\n\nNote that this setting is only effective when combined with `combine-as-imports = true`. When [`combine-as-imports`](#lint_isort_combine-as-imports) isn't enabled, every aliased `import from` will be given its own line, in which case, wrapping is not necessary.\n\nWhen using the formatter, ensure that [`format.skip-magic-trailing-comma`](#format_skip-magic-trailing-comma) is set to `false` (default) when enabling `force-wrap-aliases` to avoid that the formatter collapses members if they all fit on a single line.",
+          "description": "Force `import from` statements with multiple members and at least one\nalias (e.g., `import A as B`) to wrap such that every line contains\nexactly one member. For example, this formatting would be retained,\nrather than condensing to a single line:\n\n```python\nfrom .utils import (\n    test_directory as test_directory,\n    test_id as test_id\n)\n```\n\nNote that this setting is only effective when combined with\n`combine-as-imports = true`. When [`combine-as-imports`](#lint_isort_combine-as-imports) isn't\nenabled, every aliased `import from` will be given its own line, in\nwhich case, wrapping is not necessary.\n\nWhen using the formatter, ensure that [`format.skip-magic-trailing-comma`](#format_skip-magic-trailing-comma) is set to `false` (default)\nwhen enabling `force-wrap-aliases` to avoid that the formatter collapses members if they all fit on a single line.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "forced-separate": {
-          "description": "A list of modules to separate into auxiliary block(s) of imports, in the order specified.",
+          "description": "A list of modules to separate into auxiliary block(s) of imports,\nin the order specified.",
           "type": [
             "array",
             "null"
@@ -1758,14 +1745,14 @@
           }
         },
         "from-first": {
-          "description": "Whether to place `import from` imports before straight imports when sorting.\n\nFor example, by default, imports will be sorted such that straight imports appear before `import from` imports, as in: ```python import os import sys from typing import List ```\n\nSetting `from-first = true` will instead sort such that `import from` imports appear before straight imports, as in: ```python from typing import List import os import sys ```",
+          "description": "Whether to place `import from` imports before straight imports when sorting.\n\nFor example, by default, imports will be sorted such that straight imports appear\nbefore `import from` imports, as in:\n```python\nimport os\nimport sys\nfrom typing import List\n```\n\nSetting `from-first = true` will instead sort such that `import from` imports appear\nbefore straight imports, as in:\n```python\nfrom typing import List\nimport os\nimport sys\n```",
           "type": [
             "boolean",
             "null"
           ]
         },
         "known-first-party": {
-          "description": "A list of modules to consider first-party, regardless of whether they can be identified as such via introspection of the local filesystem.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of modules to consider first-party, regardless of whether they\ncan be identified as such via introspection of the local filesystem.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1775,7 +1762,7 @@
           }
         },
         "known-local-folder": {
-          "description": "A list of modules to consider being a local folder. Generally, this is reserved for relative imports (`from . import module`).\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of modules to consider being a local folder.\nGenerally, this is reserved for relative imports (`from . import module`).\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1785,7 +1772,7 @@
           }
         },
         "known-third-party": {
-          "description": "A list of modules to consider third-party, regardless of whether they can be identified as such via introspection of the local filesystem.\n\nSupports glob patterns. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of modules to consider third-party, regardless of whether they\ncan be identified as such via introspection of the local filesystem.\n\nSupports glob patterns. For more information on the glob syntax, refer\nto the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -1795,21 +1782,21 @@
           }
         },
         "length-sort": {
-          "description": "Sort imports by their string length, such that shorter imports appear before longer imports. For example, by default, imports will be sorted alphabetically, as in: ```python import collections import os ```\n\nSetting `length-sort = true` will instead sort such that shorter imports appear before longer imports, as in: ```python import os import collections ```",
+          "description": "Sort imports by their string length, such that shorter imports appear\nbefore longer imports. For example, by default, imports will be sorted\nalphabetically, as in:\n```python\nimport collections\nimport os\n```\n\nSetting `length-sort = true` will instead sort such that shorter imports\nappear before longer imports, as in:\n```python\nimport os\nimport collections\n```",
           "type": [
             "boolean",
             "null"
           ]
         },
         "length-sort-straight": {
-          "description": "Sort straight imports by their string length. Similar to [`length-sort`](#lint_isort_length-sort), but applies only to straight imports and doesn't affect `from` imports.",
+          "description": "Sort straight imports by their string length. Similar to [`length-sort`](#lint_isort_length-sort),\nbut applies only to straight imports and doesn't affect `from` imports.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "lines-after-imports": {
-          "description": "The number of blank lines to place after imports. Use `-1` for automatic determination.\n\nRuff uses at most one blank line after imports in typing stub files (files with `.pyi` extension) in accordance to the typing style recommendations ([source](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)).\n\nWhen using the formatter, only the values `-1`, `1`, and `2` are compatible because it enforces at least one empty and at most two empty lines after imports.",
+          "description": "The number of blank lines to place after imports.\nUse `-1` for automatic determination.\n\nRuff uses at most one blank line after imports in typing stub files (files with `.pyi` extension) in accordance to\nthe typing style recommendations ([source](https://typing.python.org/en/latest/guides/writing_stubs.html#blank-lines)).\n\nWhen using the formatter, only the values `-1`, `1`, and `2` are compatible because\nit enforces at least one empty and at most two empty lines after imports.",
           "type": [
             "integer",
             "null"
@@ -1817,16 +1804,16 @@
           "format": "int"
         },
         "lines-between-types": {
-          "description": "The number of lines to place between \"direct\" and `import from` imports.\n\nWhen using the formatter, only the values `0` and `1` are compatible because it preserves up to one empty line after imports in nested blocks.",
+          "description": "The number of lines to place between \"direct\" and `import from` imports.\n\nWhen using the formatter, only the values `0` and `1` are compatible because\nit preserves up to one empty line after imports in nested blocks.",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "no-lines-before": {
-          "description": "A list of sections that should _not_ be delineated from the previous section via empty lines.",
+          "description": "A list of sections that should _not_ be delineated from the previous\nsection via empty lines.",
           "type": [
             "array",
             "null"
@@ -1836,21 +1823,21 @@
           }
         },
         "no-sections": {
-          "description": "Put all imports into the same section bucket.\n\nFor example, rather than separating standard library and third-party imports, as in: ```python import os import sys\n\nimport numpy import pandas ```\n\nSetting `no-sections = true` will instead group all imports into a single section: ```python import numpy import os import pandas import sys ```",
+          "description": "Put all imports into the same section bucket.\n\nFor example, rather than separating standard library and third-party imports, as in:\n```python\nimport os\nimport sys\n\nimport numpy\nimport pandas\n```\n\nSetting `no-sections = true` will instead group all imports into a single section:\n```python\nimport numpy\nimport os\nimport pandas\nimport sys\n```",
           "type": [
             "boolean",
             "null"
           ]
         },
         "order-by-type": {
-          "description": "Order imports by type, which is determined by case, in addition to alphabetically.",
+          "description": "Order imports by type, which is determined by case, in addition to\nalphabetically.\n\nNote that this option takes precedence over the\n[`case-sensitive`](#lint_isort_case-sensitive) setting when enabled.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "relative-imports-order": {
-          "description": "Whether to place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local), or vice versa.\n\nThe default (\"furthest-to-closest\") is equivalent to isort's [`reverse-relative`](https://pycqa.github.io/isort/docs/configuration/options.html#reverse-relative) default (`reverse-relative = false`); setting this to \"closest-to-furthest\" is equivalent to isort's `reverse-relative = true`.",
+          "description": "Whether to place \"closer\" imports (fewer `.` characters, most local)\nbefore \"further\" imports (more `.` characters, least local), or vice\nversa.\n\nThe default (\"furthest-to-closest\") is equivalent to isort's\n[`reverse-relative`](https://pycqa.github.io/isort/docs/configuration/options.html#reverse-relative) default (`reverse-relative = false`); setting\nthis to \"closest-to-furthest\" is equivalent to isort's\n`reverse-relative = true`.",
           "anyOf": [
             {
               "$ref": "#/definitions/RelativeImportsOrder"
@@ -1881,7 +1868,7 @@
           }
         },
         "sections": {
-          "description": "A list of mappings from section names to modules.\n\nBy default, imports are categorized according to their type (e.g., `future`, `third-party`, and so on). This setting allows you to group modules into custom sections, to augment or override the built-in sections.\n\nFor example, to group all testing utilities, you could create a `testing` section: ```toml testing = [\"pytest\", \"hypothesis\"] ```\n\nThe values in the list are treated as glob patterns. For example, to match all packages in the LangChain ecosystem (`langchain-core`, `langchain-openai`, etc.): ```toml langchain = [\"langchain-*\"] ```\n\nCustom sections should typically be inserted into the [`section-order`](#lint_isort_section-order) list to ensure that they're displayed as a standalone group and in the intended order, as in: ```toml section-order = [ \"future\", \"standard-library\", \"third-party\", \"first-party\", \"local-folder\", \"testing\" ] ```\n\nIf a custom section is omitted from [`section-order`](#lint_isort_section-order), imports in that section will be assigned to the [`default-section`](#lint_isort_default-section) (which defaults to `third-party`).",
+          "description": "A list of mappings from section names to modules.\n\nBy default, imports are categorized according to their type (e.g., `future`, `third-party`,\nand so on). This setting allows you to group modules into custom sections, to augment or\noverride the built-in sections.\n\nFor example, to group all testing utilities, you could create a `testing` section:\n```toml\ntesting = [\"pytest\", \"hypothesis\"]\n```\n\nThe values in the list are treated as glob patterns. For example, to match all packages in\nthe LangChain ecosystem (`langchain-core`, `langchain-openai`, etc.):\n```toml\nlangchain = [\"langchain-*\"]\n```\n\nCustom sections should typically be inserted into the [`section-order`](#lint_isort_section-order) list to ensure that\nthey're displayed as a standalone group and in the intended order, as in:\n```toml\nsection-order = [\n  \"future\",\n  \"standard-library\",\n  \"third-party\",\n  \"first-party\",\n  \"local-folder\",\n  \"testing\"\n]\n```\n\nIf a custom section is omitted from [`section-order`](#lint_isort_section-order), imports in that section will be\nassigned to the [`default-section`](#lint_isort_default-section) (which defaults to `third-party`).",
           "type": [
             "object",
             "null"
@@ -1904,14 +1891,14 @@
           }
         },
         "split-on-trailing-comma": {
-          "description": "If a comma is placed after the last member in a multi-line import, then the imports will never be folded into one line.\n\nSee isort's [`split-on-trailing-comma`](https://pycqa.github.io/isort/docs/configuration/options.html#split-on-trailing-comma) option.\n\nWhen using the formatter, ensure that [`format.skip-magic-trailing-comma`](#format_skip-magic-trailing-comma) is set to `false` (default) when enabling `split-on-trailing-comma` to avoid that the formatter removes the trailing commas.",
+          "description": "If a comma is placed after the last member in a multi-line import, then\nthe imports will never be folded into one line.\n\nSee isort's [`split-on-trailing-comma`](https://pycqa.github.io/isort/docs/configuration/options.html#split-on-trailing-comma) option.\n\nWhen using the formatter, ensure that [`format.skip-magic-trailing-comma`](#format_skip-magic-trailing-comma) is set to `false` (default) when enabling `split-on-trailing-comma`\nto avoid that the formatter removes the trailing commas.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "variables": {
-          "description": "An override list of tokens to always recognize as a var for [`order-by-type`](#lint_isort_order-by-type) regardless of casing.",
+          "description": "An override list of tokens to always recognize as a var\nfor [`order-by-type`](#lint_isort_order-by-type) regardless of casing.",
           "type": [
             "array",
             "null"
@@ -1926,32 +1913,24 @@
     "LineEnding": {
       "oneOf": [
         {
-          "description": "The newline style is detected automatically on a file per file basis. Files with mixed line endings will be converted to the first detected line ending. Defaults to [`LineEnding::Lf`] for a files that contain no line endings.",
+          "description": "The newline style is detected automatically on a file per file basis.\nFiles with mixed line endings will be converted to the first detected line ending.\nDefaults to [`LineEnding::Lf`] for a files that contain no line endings.",
           "type": "string",
-          "enum": [
-            "auto"
-          ]
+          "const": "auto"
         },
         {
           "description": "Line endings will be converted to `\\n` as is common on Unix.",
           "type": "string",
-          "enum": [
-            "lf"
-          ]
+          "const": "lf"
         },
         {
           "description": "Line endings will be converted to `\\r\\n` as is common on Windows.",
           "type": "string",
-          "enum": [
-            "cr-lf"
-          ]
+          "const": "cr-lf"
         },
         {
           "description": "Line endings will be converted to `\\n` on Unix and `\\r\\n` on Windows.",
           "type": "string",
-          "enum": [
-            "native"
-          ]
+          "const": "native"
         }
       ]
     },
@@ -1959,21 +1938,22 @@
       "description": "The length of a line of text that is considered too long.\n\nThe allowed range of values is 1..=320",
       "type": "integer",
       "format": "uint16",
-      "maximum": 320.0,
-      "minimum": 1.0
+      "maximum": 320,
+      "minimum": 1
     },
     "LineWidth": {
       "description": "The maximum visual width to which the formatter should try to limit a line.",
       "type": "integer",
       "format": "uint16",
-      "minimum": 1.0
+      "maximum": 65535,
+      "minimum": 1
     },
     "LintOptions": {
       "description": "Configures how Ruff checks your code.\n\nOptions specified in the `lint` section take precedence over the deprecated top-level settings.",
       "type": "object",
       "properties": {
         "allowed-confusables": {
-          "description": "A list of allowed \"confusable\" Unicode characters to ignore when enforcing `RUF001`, `RUF002`, and `RUF003`.",
+          "description": "A list of allowed \"confusable\" Unicode characters to ignore when\nenforcing `RUF001`, `RUF002`, and `RUF003`.",
           "type": [
             "array",
             "null"
@@ -1985,14 +1965,14 @@
           }
         },
         "dummy-variable-rgx": {
-          "description": "A regular expression used to identify \"dummy\" variables, or those which should be ignored when enforcing (e.g.) unused-variable rules. The default expression matches `_`, `__`, and `_var`, but not `_var_`.",
+          "description": "A regular expression used to identify \"dummy\" variables, or those which\nshould be ignored when enforcing (e.g.) unused-variable rules. The\ndefault expression matches `_`, `__`, and `_var`, but not `_var_`.",
           "type": [
             "string",
             "null"
           ]
         },
         "exclude": {
-          "description": "A list of file patterns to exclude from linting in addition to the files excluded globally (see [`exclude`](#exclude), and [`extend-exclude`](#extend-exclude)).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of file patterns to exclude from linting in addition to the files excluded globally (see [`exclude`](#exclude), and [`extend-exclude`](#extend-exclude)).\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory\n  named `.mypy_cache` in the tree), `foo.py` (to exclude any file named\n  `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ).\n- Relative patterns, like `directory/foo.py` (to exclude that specific\n  file) or `directory/*.py` (to exclude any Python files in\n  `directory`). Note that these paths are relative to the project root\n  (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -2002,14 +1982,14 @@
           }
         },
         "explicit-preview-rules": {
-          "description": "Whether to require exact codes to select preview rules. When enabled, preview rules will not be selected by prefixes — the full code of each preview rule will be required to enable the rule.",
+          "description": "Whether to require exact codes to select preview rules. When enabled,\npreview rules will not be selected by prefixes — the full code of each\npreview rule will be required to enable the rule.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "extend-fixable": {
-          "description": "A list of rule codes or prefixes to consider fixable, in addition to those specified by [`fixable`](#lint_fixable).",
+          "description": "A list of rule codes or prefixes to consider fixable, in addition to those\nspecified by [`fixable`](#lint_fixable).",
           "type": [
             "array",
             "null"
@@ -2019,18 +1999,18 @@
           }
         },
         "extend-ignore": {
-          "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.",
-          "deprecated": true,
+          "description": "A list of rule codes or prefixes to ignore, in addition to those\nspecified by `ignore`.",
           "type": [
             "array",
             "null"
           ],
+          "deprecated": true,
           "items": {
             "$ref": "#/definitions/RuleSelector"
           }
         },
         "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`](#lint_per-file-ignores).",
+          "description": "A list of mappings from file pattern to rule codes or prefixes to\nexclude, in addition to any rules excluded by [`per-file-ignores`](#lint_per-file-ignores).",
           "type": [
             "object",
             "null"
@@ -2043,7 +2023,7 @@
           }
         },
         "extend-safe-fixes": {
-          "description": "A list of rule codes or prefixes for which unsafe fixes should be considered safe.",
+          "description": "A list of rule codes or prefixes for which unsafe fixes should be considered\nsafe.",
           "type": [
             "array",
             "null"
@@ -2053,7 +2033,7 @@
           }
         },
         "extend-select": {
-          "description": "A list of rule codes or prefixes to enable, in addition to those specified by [`select`](#lint_select).",
+          "description": "A list of rule codes or prefixes to enable, in addition to those\nspecified by [`select`](#lint_select).",
           "type": [
             "array",
             "null"
@@ -2063,18 +2043,18 @@
           }
         },
         "extend-unfixable": {
-          "description": "A list of rule codes or prefixes to consider non-auto-fixable, in addition to those specified by [`unfixable`](#lint_unfixable).",
-          "deprecated": true,
+          "description": "A list of rule codes or prefixes to consider non-auto-fixable, in addition to those\nspecified by [`unfixable`](#lint_unfixable).",
           "type": [
             "array",
             "null"
           ],
+          "deprecated": true,
           "items": {
             "$ref": "#/definitions/RuleSelector"
           }
         },
         "extend-unsafe-fixes": {
-          "description": "A list of rule codes or prefixes for which safe fixes should be considered unsafe.",
+          "description": "A list of rule codes or prefixes for which safe fixes should be considered\nunsafe.",
           "type": [
             "array",
             "null"
@@ -2084,7 +2064,7 @@
           }
         },
         "external": {
-          "description": "A list of rule codes or prefixes that are unsupported by Ruff, but should be preserved when (e.g.) validating `# noqa` directives. Useful for retaining `# noqa` directives that cover plugins not yet implemented by Ruff.",
+          "description": "A list of rule codes or prefixes that are unsupported by Ruff, but should be\npreserved when (e.g.) validating `# noqa` directives. Useful for\nretaining `# noqa` directives that cover plugins not yet implemented\nby Ruff.",
           "type": [
             "array",
             "null"
@@ -2094,7 +2074,7 @@
           }
         },
         "fixable": {
-          "description": "A list of rule codes or prefixes to consider fixable. By default, all rules are considered fixable.",
+          "description": "A list of rule codes or prefixes to consider fixable. By default,\nall rules are considered fixable.",
           "type": [
             "array",
             "null"
@@ -2291,14 +2271,14 @@
           ]
         },
         "future-annotations": {
-          "description": "Whether to allow rules to add `from __future__ import annotations` in cases where this would simplify a fix or enable a new diagnostic.\n\nFor example, `TC001`, `TC002`, and `TC003` can move more imports into `TYPE_CHECKING` blocks if `__future__` annotations are enabled.\n\nThis setting is currently in [preview](https://docs.astral.sh/ruff/preview/) and requires preview mode to be enabled to have any effect.",
+          "description": "Whether to allow rules to add `from __future__ import annotations` in cases where this would\nsimplify a fix or enable a new diagnostic.\n\nFor example, `TC001`, `TC002`, and `TC003` can move more imports into `TYPE_CHECKING` blocks\nif `__future__` annotations are enabled.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "ignore": {
-          "description": "A list of rule codes or prefixes to ignore. Prefixes can specify exact rules (like `F841`), entire categories (like `F`), or anything in between.\n\nWhen breaking ties between enabled and disabled rules (via `select` and `ignore`, respectively), more specific prefixes override less specific prefixes. `ignore` takes precedence over `select` if the same prefix appears in both.",
+          "description": "A list of rule codes or prefixes to ignore. Prefixes can specify exact\nrules (like `F841`), entire categories (like `F`), or anything in\nbetween.\n\nWhen breaking ties between enabled and disabled rules (via `select` and\n`ignore`, respectively), more specific prefixes override less\nspecific prefixes. `ignore` takes precedence over `select` if the same\nprefix appears in both.",
           "type": [
             "array",
             "null"
@@ -2308,12 +2288,12 @@
           }
         },
         "ignore-init-module-imports": {
-          "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be flagged, but with a dedicated message suggesting that the import is either added to the module's `__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).\n\nThis option is enabled by default, but you can opt-in to removal of imports via an unsafe fix.",
-          "deprecated": true,
+          "description": "Avoid automatically removing unused imports in `__init__.py` files. Such\nimports will still be flagged, but with a dedicated message suggesting\nthat the import is either added to the module's `__all__` symbol, or\nre-exported with a redundant alias (e.g., `import os as os`).\n\nThis option is enabled by default, but you can opt-in to removal of imports\nvia an unsafe fix.",
           "type": [
             "boolean",
             "null"
-          ]
+          ],
+          "deprecated": true
         },
         "isort": {
           "description": "Options for the `isort` plugin.",
@@ -2327,7 +2307,7 @@
           ]
         },
         "logger-objects": {
-          "description": "A list of objects that should be treated equivalently to a `logging.Logger` object.\n\nThis is useful for ensuring proper diagnostics (e.g., to identify `logging` deprecations and other best-practices) for projects that re-export a `logging.Logger` object from a common module.\n\nFor example, if you have a module `logging_setup.py` with the following contents: ```python import logging\n\nlogger = logging.getLogger(__name__) ```\n\nAdding `\"logging_setup.logger\"` to `logger-objects` will ensure that `logging_setup.logger` is treated as a `logging.Logger` object when imported from other modules (e.g., `from logging_setup import logger`).",
+          "description": "A list of objects that should be treated equivalently to a\n`logging.Logger` object.\n\nThis is useful for ensuring proper diagnostics (e.g., to identify\n`logging` deprecations and other best-practices) for projects that\nre-export a `logging.Logger` object from a common module.\n\nFor example, if you have a module `logging_setup.py` with the following\ncontents:\n```python\nimport logging\n\nlogger = logging.getLogger(__name__)\n```\n\nAdding `\"logging_setup.logger\"` to `logger-objects` will ensure that\n`logging_setup.logger` is treated as a `logging.Logger` object when\nimported from other modules (e.g., `from logging_setup import logger`).",
           "type": [
             "array",
             "null"
@@ -2359,7 +2339,7 @@
           ]
         },
         "per-file-ignores": {
-          "description": "A list of mappings from file pattern to rule codes or prefixes to exclude, when considering any matching files. An initial '!' negates the file pattern.",
+          "description": "A list of mappings from file pattern to rule codes or prefixes to\nexclude, when considering any matching files. An initial '!' negates\nthe file pattern.",
           "type": [
             "object",
             "null"
@@ -2372,7 +2352,7 @@
           }
         },
         "preview": {
-          "description": "Whether to enable preview mode. When preview mode is enabled, Ruff will use unstable rules and fixes.",
+          "description": "Whether to enable preview mode. When preview mode is enabled, Ruff will\nuse unstable rules and fixes.",
           "type": [
             "boolean",
             "null"
@@ -2456,7 +2436,7 @@
           ]
         },
         "select": {
-          "description": "A list of rule codes or prefixes to enable. Prefixes can specify exact rules (like `F841`), entire categories (like `F`), or anything in between.\n\nWhen breaking ties between enabled and disabled rules (via `select` and `ignore`, respectively), more specific prefixes override less specific prefixes. `ignore` takes precedence over `select` if the same prefix appears in both.",
+          "description": "A list of rule codes or prefixes to enable. Prefixes can specify exact\nrules (like `F841`), entire categories (like `F`), or anything in\nbetween.\n\nWhen breaking ties between enabled and disabled rules (via `select` and\n`ignore`, respectively), more specific prefixes override less\nspecific prefixes. `ignore` takes precedence over `select` if the\nsame prefix appears in both.",
           "type": [
             "array",
             "null"
@@ -2466,7 +2446,7 @@
           }
         },
         "task-tags": {
-          "description": "A list of task tags to recognize (e.g., \"TODO\", \"FIXME\", \"XXX\").\n\nComments starting with these tags will be ignored by commented-out code detection (`ERA`), and skipped by line-length rules (`E501`) if [`ignore-overlong-task-comments`](#lint_pycodestyle_ignore-overlong-task-comments) is set to `true`.",
+          "description": "A list of task tags to recognize (e.g., \"TODO\", \"FIXME\", \"XXX\").\n\nComments starting with these tags will be ignored by commented-out code\ndetection (`ERA`), and skipped by line-length rules (`E501`) if\n[`ignore-overlong-task-comments`](#lint_pycodestyle_ignore-overlong-task-comments) is set to `true`.",
           "type": [
             "array",
             "null"
@@ -2476,14 +2456,14 @@
           }
         },
         "typing-extensions": {
-          "description": "Whether to allow imports from the third-party `typing_extensions` module for Python versions before a symbol was added to the first-party `typing` module.\n\nMany rules try to import symbols from the `typing` module but fall back to `typing_extensions` for earlier versions of Python. This option can be used to disable this fallback behavior in cases where `typing_extensions` is not installed.",
+          "description": "Whether to allow imports from the third-party `typing_extensions` module for Python versions\nbefore a symbol was added to the first-party `typing` module.\n\nMany rules try to import symbols from the `typing` module but fall back to\n`typing_extensions` for earlier versions of Python. This option can be used to disable this\nfallback behavior in cases where `typing_extensions` is not installed.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "typing-modules": {
-          "description": "A list of modules whose exports should be treated equivalently to members of the `typing` module.\n\nThis is useful for ensuring proper type annotation inference for projects that re-export `typing` and `typing_extensions` members from a compatibility module. If omitted, any members imported from modules apart from `typing` and `typing_extensions` will be treated as ordinary Python objects.",
+          "description": "A list of modules whose exports should be treated equivalently to\nmembers of the `typing` module.\n\nThis is useful for ensuring proper type annotation inference for\nprojects that re-export `typing` and `typing_extensions` members\nfrom a compatibility module. If omitted, any members imported from\nmodules apart from `typing` and `typing_extensions` will be treated\nas ordinary Python objects.",
           "type": [
             "array",
             "null"
@@ -2516,7 +2496,7 @@
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         }
       },
       "additionalProperties": false
@@ -2568,7 +2548,7 @@
       "type": "object",
       "properties": {
         "classmethod-decorators": {
-          "description": "A list of decorators that, when applied to a method, indicate that the method should be treated as a class method (in addition to the builtin `@classmethod`).\n\nFor example, Ruff will expect that any method decorated by a decorator in this list takes a `cls` argument as its first argument.\n\nExpects to receive a list of fully-qualified names (e.g., `pydantic.validator`, rather than `validator`) or alternatively a plain name which is then matched against the last segment in case the decorator itself consists of a dotted name.",
+          "description": "A list of decorators that, when applied to a method, indicate that the\nmethod should be treated as a class method (in addition to the builtin\n`@classmethod`).\n\nFor example, Ruff will expect that any method decorated by a decorator\nin this list takes a `cls` argument as its first argument.\n\nExpects to receive a list of fully-qualified names (e.g., `pydantic.validator`,\nrather than `validator`) or alternatively a plain name which is then matched against\nthe last segment in case the decorator itself consists of a dotted name.",
           "type": [
             "array",
             "null"
@@ -2578,7 +2558,7 @@
           }
         },
         "extend-ignore-names": {
-          "description": "Additional names (or patterns) to ignore when considering `pep8-naming` violations, in addition to those included in [`ignore-names`](#lint_pep8-naming_ignore-names).\n\nSupports glob patterns. For example, to ignore all names starting with `test_` or ending with `_test`, you could use `ignore-names = [\"test_*\", \"*_test\"]`. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "Additional names (or patterns) to ignore when considering `pep8-naming` violations,\nin addition to those included in [`ignore-names`](#lint_pep8-naming_ignore-names).\n\nSupports glob patterns. For example, to ignore all names starting with `test_`\nor ending with `_test`, you could use `ignore-names = [\"test_*\", \"*_test\"]`.\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -2588,7 +2568,7 @@
           }
         },
         "ignore-names": {
-          "description": "A list of names (or patterns) to ignore when considering `pep8-naming` violations.\n\nSupports glob patterns. For example, to ignore all names starting with `test_` or ending with `_test`, you could use `ignore-names = [\"test_*\", \"*_test\"]`. For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+          "description": "A list of names (or patterns) to ignore when considering `pep8-naming` violations.\n\nSupports glob patterns. For example, to ignore all names starting with `test_`\nor ending with `_test`, you could use `ignore-names = [\"test_*\", \"*_test\"]`.\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
           "type": [
             "array",
             "null"
@@ -2598,7 +2578,7 @@
           }
         },
         "staticmethod-decorators": {
-          "description": "A list of decorators that, when applied to a method, indicate that the method should be treated as a static method (in addition to the builtin `@staticmethod`).\n\nFor example, Ruff will expect that any method decorated by a decorator in this list has no `self` or `cls` argument.\n\nExpects to receive a list of fully-qualified names (e.g., `belay.Device.teardown`, rather than `teardown`) or alternatively a plain name which is then matched against the last segment in case the decorator itself consists of a dotted name.",
+          "description": "A list of decorators that, when applied to a method, indicate that the\nmethod should be treated as a static method (in addition to the builtin\n`@staticmethod`).\n\nFor example, Ruff will expect that any method decorated by a decorator\nin this list has no `self` or `cls` argument.\n\nExpects to receive a list of fully-qualified names (e.g., `belay.Device.teardown`,\nrather than `teardown`) or alternatively a plain name which is then matched against\nthe last segment in case the decorator itself consists of a dotted name.",
           "type": [
             "array",
             "null"
@@ -2615,7 +2595,7 @@
       "type": "object",
       "properties": {
         "keep-runtime-typing": {
-          "description": "Whether to avoid [PEP 585](https://peps.python.org/pep-0585/) (`List[int]` -> `list[int]`) and [PEP 604](https://peps.python.org/pep-0604/) (`Union[str, int]` -> `str | int`) rewrites even if a file imports `from __future__ import annotations`.\n\nThis setting is only applicable when the target Python version is below 3.9 and 3.10 respectively, and is most commonly used when working with libraries like Pydantic and FastAPI, which rely on the ability to parse type annotations at runtime. The use of `from __future__ import annotations` causes Python to treat the type annotations as strings, which typically allows for the use of language features that appear in later Python versions but are not yet supported by the current version (e.g., `str | int`). However, libraries that rely on runtime type annotations will break if the annotations are incompatible with the current Python version.\n\nFor example, while the following is valid Python 3.8 code due to the presence of `from __future__ import annotations`, the use of `str | int` prior to Python 3.10 will cause Pydantic to raise a `TypeError` at runtime:\n\n```python from __future__ import annotations\n\nimport pydantic\n\nclass Foo(pydantic.BaseModel): bar: str | int ```",
+          "description": "Whether to avoid [PEP 585](https://peps.python.org/pep-0585/) (`List[int]` -> `list[int]`) and [PEP 604](https://peps.python.org/pep-0604/)\n(`Union[str, int]` -> `str | int`) rewrites even if a file imports\n`from __future__ import annotations`.\n\nThis setting is only applicable when the target Python version is below\n3.9 and 3.10 respectively, and is most commonly used when working with\nlibraries like Pydantic and FastAPI, which rely on the ability to parse\ntype annotations at runtime. The use of `from __future__ import annotations`\ncauses Python to treat the type annotations as strings, which typically\nallows for the use of language features that appear in later Python\nversions but are not yet supported by the current version (e.g., `str |\nint`). However, libraries that rely on runtime type annotations will\nbreak if the annotations are incompatible with the current Python\nversion.\n\nFor example, while the following is valid Python 3.8 code due to the\npresence of `from __future__ import annotations`, the use of `str | int`\nprior to Python 3.10 will cause Pydantic to raise a `TypeError` at\nruntime:\n\n```python\nfrom __future__ import annotations\n\nimport pydantic\n\nclass Foo(pydantic.BaseModel):\n    bar: str | int\n```",
           "type": [
             "boolean",
             "null"
@@ -2629,14 +2609,14 @@
       "type": "object",
       "properties": {
         "ignore-overlong-task-comments": {
-          "description": "Whether line-length violations (`E501`) should be triggered for comments starting with [`task-tags`](#lint_task-tags) (by default: \"TODO\", \"FIXME\", and \"XXX\").",
+          "description": "Whether line-length violations (`E501`) should be triggered for\ncomments starting with [`task-tags`](#lint_task-tags) (by default: \"TODO\", \"FIXME\",\nand \"XXX\").",
           "type": [
             "boolean",
             "null"
           ]
         },
         "max-doc-length": {
-          "description": "The maximum line length to allow for [`doc-line-too-long`](https://docs.astral.sh/ruff/rules/doc-line-too-long/) violations within documentation (`W505`), including standalone comments. By default, this is set to `null` which disables reporting violations.\n\nThe length is determined by the number of characters per line, except for lines containing Asian characters or emojis. For these lines, the [unicode width](https://unicode.org/reports/tr11/) of each character is added up to determine the length.\n\nSee the [`doc-line-too-long`](https://docs.astral.sh/ruff/rules/doc-line-too-long/) rule for more information.",
+          "description": "The maximum line length to allow for [`doc-line-too-long`](https://docs.astral.sh/ruff/rules/doc-line-too-long/) violations within\ndocumentation (`W505`), including standalone comments. By default,\nthis is set to `null` which disables reporting violations.\n\nThe length is determined by the number of characters per line, except for lines containing Asian characters or emojis.\nFor these lines, the [unicode width](https://unicode.org/reports/tr11/) of each character is added up to determine the length.\n\nSee the [`doc-line-too-long`](https://docs.astral.sh/ruff/rules/doc-line-too-long/) rule for more information.",
           "anyOf": [
             {
               "$ref": "#/definitions/LineLength"
@@ -2647,7 +2627,7 @@
           ]
         },
         "max-line-length": {
-          "description": "The maximum line length to allow for [`line-too-long`](https://docs.astral.sh/ruff/rules/line-too-long/) violations. By default, this is set to the value of the [`line-length`](#line-length) option.\n\nUse this option when you want to detect extra-long lines that the formatter can't automatically split by setting `pycodestyle.line-length` to a value larger than [`line-length`](#line-length).\n\n```toml # The formatter wraps lines at a length of 88. line-length = 88\n\n[pycodestyle] # E501 reports lines that exceed the length of 100. max-line-length = 100 ```\n\nThe length is determined by the number of characters per line, except for lines containing East Asian characters or emojis. For these lines, the [unicode width](https://unicode.org/reports/tr11/) of each character is added up to determine the length.\n\nSee the [`line-too-long`](https://docs.astral.sh/ruff/rules/line-too-long/) rule for more information.",
+          "description": "The maximum line length to allow for [`line-too-long`](https://docs.astral.sh/ruff/rules/line-too-long/) violations. By default,\nthis is set to the value of the [`line-length`](#line-length) option.\n\nUse this option when you want to detect extra-long lines that the formatter can't automatically split by setting\n`pycodestyle.line-length` to a value larger than [`line-length`](#line-length).\n\n```toml\n# The formatter wraps lines at a length of 88.\nline-length = 88\n\n[pycodestyle]\n# E501 reports lines that exceed the length of 100.\nmax-line-length = 100\n```\n\nThe length is determined by the number of characters per line, except for lines containing East Asian characters or emojis.\nFor these lines, the [unicode width](https://unicode.org/reports/tr11/) of each character is added up to determine the length.\n\nSee the [`line-too-long`](https://docs.astral.sh/ruff/rules/line-too-long/) rule for more information.",
           "anyOf": [
             {
               "$ref": "#/definitions/LineLength"
@@ -2665,7 +2645,7 @@
       "type": "object",
       "properties": {
         "ignore-one-line-docstrings": {
-          "description": "Skip docstrings which fit on a single line.\n\nNote: The corresponding setting in `pydoclint` is named `skip-checking-short-docstrings`.",
+          "description": "Skip docstrings which fit on a single line.\n\nNote: The corresponding setting in `pydoclint`\nis named `skip-checking-short-docstrings`.",
           "type": [
             "boolean",
             "null"
@@ -2679,7 +2659,7 @@
       "type": "object",
       "properties": {
         "convention": {
-          "description": "Whether to use Google-style, NumPy-style conventions, or the [PEP 257](https://peps.python.org/pep-0257/) defaults when analyzing docstring sections.\n\nEnabling a convention will disable all rules that are not included in the specified convention. As such, the intended workflow is to enable a convention and then selectively enable or disable any additional rules on top of it.\n\nFor example, to use Google-style conventions but avoid requiring documentation for every function parameter:\n\n```toml [tool.ruff.lint] # Enable all `pydocstyle` rules, limiting to those that adhere to the # Google convention via `convention = \"google\"`, below. select = [\"D\"]\n\n# On top of the Google convention, disable `D417`, which requires # documentation for every function parameter. ignore = [\"D417\"]\n\n[tool.ruff.lint.pydocstyle] convention = \"google\" ```\n\nTo enable an additional rule that's excluded from the convention, select the desired rule via its fully qualified rule code (e.g., `D400` instead of `D4` or `D40`):\n\n```toml [tool.ruff.lint] # Enable D400 on top of the Google convention. extend-select = [\"D400\"]\n\n[tool.ruff.lint.pydocstyle] convention = \"google\" ```",
+          "description": "Whether to use Google-style, NumPy-style conventions, or the [PEP 257](https://peps.python.org/pep-0257/)\ndefaults when analyzing docstring sections.\n\nEnabling a convention will disable all rules that are not included in\nthe specified convention. As such, the intended workflow is to enable a\nconvention and then selectively enable or disable any additional rules\non top of it.\n\nFor example, to use Google-style conventions but avoid requiring\ndocumentation for every function parameter:\n\n```toml\n[tool.ruff.lint]\n# Enable all `pydocstyle` rules, limiting to those that adhere to the\n# Google convention via `convention = \"google\"`, below.\nselect = [\"D\"]\n\n# On top of the Google convention, disable `D417`, which requires\n# documentation for every function parameter.\nignore = [\"D417\"]\n\n[tool.ruff.lint.pydocstyle]\nconvention = \"google\"\n```\n\nTo enable an additional rule that's excluded from the convention,\nselect the desired rule via its fully qualified rule code (e.g.,\n`D400` instead of `D4` or `D40`):\n\n```toml\n[tool.ruff.lint]\n# Enable D400 on top of the Google convention.\nextend-select = [\"D400\"]\n\n[tool.ruff.lint.pydocstyle]\nconvention = \"google\"\n```",
           "anyOf": [
             {
               "$ref": "#/definitions/Convention"
@@ -2690,7 +2670,7 @@
           ]
         },
         "ignore-decorators": {
-          "description": "Ignore docstrings for functions or methods decorated with the specified fully-qualified decorators.",
+          "description": "Ignore docstrings for functions or methods decorated with the\nspecified fully-qualified decorators.",
           "type": [
             "array",
             "null"
@@ -2707,7 +2687,7 @@
           ]
         },
         "property-decorators": {
-          "description": "A list of decorators that, when applied to a method, indicate that the method should be treated as a property (in addition to the builtin `@property` and standard-library `@functools.cached_property`).\n\nFor example, Ruff will expect that any method decorated by a decorator in this list can use a non-imperative summary line.",
+          "description": "A list of decorators that, when applied to a method, indicate that the\nmethod should be treated as a property (in addition to the builtin\n`@property` and standard-library `@functools.cached_property`).\n\nFor example, Ruff will expect that any method decorated by a decorator\nin this list can use a non-imperative summary line.",
           "type": [
             "array",
             "null"
@@ -2724,7 +2704,7 @@
       "type": "object",
       "properties": {
         "allowed-unused-imports": {
-          "description": "A list of modules to ignore when considering unused imports.\n\nUsed to prevent violations for specific modules that are known to have side effects on import (e.g., `hvplot.pandas`).\n\nModules in this list are expected to be fully-qualified names (e.g., `hvplot.pandas`). Any submodule of a given module will also be ignored (e.g., given `hvplot`, `hvplot.pandas` will also be ignored).",
+          "description": "A list of modules to ignore when considering unused imports.\n\nUsed to prevent violations for specific modules that are known to have side effects on\nimport (e.g., `hvplot.pandas`).\n\nModules in this list are expected to be fully-qualified names (e.g., `hvplot.pandas`). Any\nsubmodule of a given module will also be ignored (e.g., given `hvplot`, `hvplot.pandas`\nwill also be ignored).",
           "type": [
             "array",
             "null"
@@ -2734,7 +2714,7 @@
           }
         },
         "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\"]`.\n\nExpects to receive a list of fully-qualified names (e.g., `django.db.models.ForeignKey`, rather than `ForeignKey`).",
+          "description": "Additional functions or classes to consider generic, such that any\nsubscripts should be treated as type annotation (e.g., `ForeignKey` in\n`django.db.models.ForeignKey[\"User\"]`.\n\nExpects to receive a list of fully-qualified names (e.g., `django.db.models.ForeignKey`,\nrather than `ForeignKey`).",
           "type": [
             "array",
             "null"
@@ -2751,7 +2731,7 @@
       "type": "object",
       "properties": {
         "allow-dunder-method-names": {
-          "description": "Dunder methods name to allow, in addition to the default set from the Python standard library (see `PLW3201`).",
+          "description": "Dunder methods name to allow, in addition to the default set from the\nPython standard library (see `PLW3201`).",
           "type": [
             "array",
             "null"
@@ -2772,22 +2752,22 @@
           }
         },
         "max-args": {
-          "description": "Maximum number of arguments allowed for a function or method definition (see `PLR0913`).",
+          "description": "Maximum number of arguments allowed for a function or method definition\n(see `PLR0913`).",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-bool-expr": {
-          "description": "Maximum number of Boolean expressions allowed within a single `if` statement (see `PLR0916`).",
+          "description": "Maximum number of Boolean expressions allowed within a single `if` statement\n(see `PLR0916`).",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-branches": {
           "description": "Maximum number of branches allowed for a function or method body (see `PLR0912`).",
@@ -2796,7 +2776,7 @@
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-locals": {
           "description": "Maximum number of local variables allowed for a function or method body (see `PLR0914`).",
@@ -2805,25 +2785,25 @@
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-nested-blocks": {
-          "description": "Maximum number of nested blocks allowed within a function or method body (see `PLR1702`).",
+          "description": "Maximum number of nested blocks allowed within a function or method body\n(see `PLR1702`).",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-positional-args": {
-          "description": "Maximum number of positional arguments allowed for a function or method definition (see `PLR0917`).\n\nIf not specified, defaults to the value of `max-args`.",
+          "description": "Maximum number of positional arguments allowed for a function or method definition\n(see `PLR0917`).\n\nIf not specified, defaults to the value of `max-args`.",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-public-methods": {
           "description": "Maximum number of public methods allowed for a class (see `PLR0904`).",
@@ -2832,16 +2812,16 @@
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-returns": {
-          "description": "Maximum number of return statements allowed for a function or method body (see `PLR0911`)",
+          "description": "Maximum number of return statements allowed for a function or method\nbody (see `PLR0911`)",
           "type": [
             "integer",
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         },
         "max-statements": {
           "description": "Maximum number of statements allowed for a function or method body (see `PLR0915`).",
@@ -2850,7 +2830,7 @@
             "null"
           ],
           "format": "uint",
-          "minimum": 0.0
+          "minimum": 0
         }
       },
       "additionalProperties": false
@@ -2873,16 +2853,12 @@
         {
           "description": "Use double quotes.",
           "type": "string",
-          "enum": [
-            "double"
-          ]
+          "const": "double"
         },
         {
           "description": "Use single quotes.",
           "type": "string",
-          "enum": [
-            "single"
-          ]
+          "const": "single"
         }
       ]
     },
@@ -2897,18 +2873,14 @@
     "RelativeImportsOrder": {
       "oneOf": [
         {
-          "description": "Place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local).",
+          "description": "Place \"closer\" imports (fewer `.` characters, most local) before\n\"further\" imports (more `.` characters, least local).",
           "type": "string",
-          "enum": [
-            "closest-to-furthest"
-          ]
+          "const": "closest-to-furthest"
         },
         {
-          "description": "Place \"further\" imports (more `.` characters, least local) imports before \"closer\" imports (fewer `.` characters, most local).",
+          "description": "Place \"further\" imports (more `.` characters, least local) imports\nbefore \"closer\" imports (fewer `.` characters, most local).",
           "type": "string",
-          "enum": [
-            "furthest-to-closest"
-          ]
+          "const": "furthest-to-closest"
         }
       ]
     },
@@ -2920,29 +2892,29 @@
       "type": "object",
       "properties": {
         "allowed-markup-calls": {
-          "description": "A list of callable names, whose result may be safely passed into [`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `bleach.clean`, rather than `clean`).\n\nThis setting helps you avoid false positives in code like:\n\n```python from bleach import clean from markupsafe import Markup\n\ncleaned_markup = Markup(clean(some_user_input)) ```\n\nWhere the use of [`bleach.clean`](https://bleach.readthedocs.io/en/latest/clean.html) usually ensures that there's no XSS vulnerability.\n\nAlthough it is not recommended, you may also use this setting to whitelist other kinds of calls, e.g. calls to i18n translation functions, where how safe that is will depend on the implementation and how well the translations are audited.\n\nAnother common use-case is to wrap the output of functions that generate markup like [`xml.etree.ElementTree.tostring`](https://docs.python.org/3/library/xml.etree.elementtree.html#xml.etree.ElementTree.tostring) or template rendering engines where sanitization of potential user input is either already baked in or has to happen before rendering.",
-          "deprecated": true,
+          "description": "A list of callable names, whose result may be safely passed into\n[`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `bleach.clean`, rather than `clean`).\n\nThis setting helps you avoid false positives in code like:\n\n```python\nfrom bleach import clean\nfrom markupsafe import Markup\n\ncleaned_markup = Markup(clean(some_user_input))\n```\n\nWhere the use of [`bleach.clean`](https://bleach.readthedocs.io/en/latest/clean.html)\nusually ensures that there's no XSS vulnerability.\n\nAlthough it is not recommended, you may also use this setting to whitelist other\nkinds of calls, e.g. calls to i18n translation functions, where how safe that is\nwill depend on the implementation and how well the translations are audited.\n\nAnother common use-case is to wrap the output of functions that generate markup\nlike [`xml.etree.ElementTree.tostring`](https://docs.python.org/3/library/xml.etree.elementtree.html#xml.etree.ElementTree.tostring)\nor template rendering engines where sanitization of potential user input is either\nalready baked in or has to happen before rendering.",
           "type": [
             "array",
             "null"
           ],
+          "deprecated": true,
           "items": {
             "type": "string"
           }
         },
         "extend-markup-names": {
-          "description": "A list of additional callable names that behave like [`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `webhelpers.html.literal`, rather than `literal`).",
-          "deprecated": true,
+          "description": "A list of additional callable names that behave like\n[`markupsafe.Markup`](https://markupsafe.palletsprojects.com/en/stable/escaping/#markupsafe.Markup).\n\nExpects to receive a list of fully-qualified names (e.g., `webhelpers.html.literal`, rather than\n`literal`).",
           "type": [
             "array",
             "null"
           ],
+          "deprecated": true,
           "items": {
             "type": "string"
           }
         },
         "parenthesize-tuple-in-subscript": {
-          "description": "Whether to prefer accessing items keyed by tuples with parentheses around the tuple (see `RUF031`).",
+          "description": "Whether to prefer accessing items keyed by tuples with\nparentheses around the tuple (see `RUF031`).",
           "type": [
             "boolean",
             "null"
@@ -3013,13 +2985,17 @@
         "ASYNC2",
         "ASYNC21",
         "ASYNC210",
+        "ASYNC212",
         "ASYNC22",
         "ASYNC220",
         "ASYNC221",
         "ASYNC222",
         "ASYNC23",
         "ASYNC230",
+        "ASYNC24",
+        "ASYNC240",
         "ASYNC25",
+        "ASYNC250",
         "ASYNC251",
         "B",
         "B0",
@@ -3071,6 +3047,7 @@
         "B909",
         "B91",
         "B911",
+        "B912",
         "BLE",
         "BLE0",
         "BLE00",
@@ -3181,6 +3158,9 @@
         "DJ012",
         "DJ013",
         "DOC",
+        "DOC1",
+        "DOC10",
+        "DOC102",
         "DOC2",
         "DOC20",
         "DOC201",
@@ -3555,9 +3535,6 @@
         "PD1",
         "PD10",
         "PD101",
-        "PD9",
-        "PD90",
-        "PD901",
         "PERF",
         "PERF1",
         "PERF10",
@@ -3738,6 +3715,7 @@
         "PLR170",
         "PLR1702",
         "PLR1704",
+        "PLR1708",
         "PLR171",
         "PLR1711",
         "PLR1714",
@@ -4058,6 +4036,7 @@
         "RUF061",
         "RUF063",
         "RUF064",
+        "RUF065",
         "RUF1",
         "RUF10",
         "RUF100",
@@ -4307,7 +4286,6 @@
         "UP035",
         "UP036",
         "UP037",
-        "UP038",
         "UP039",
         "UP04",
         "UP040",
@@ -4363,16 +4341,12 @@
         {
           "description": "Ban imports that extend into the parent module or beyond.",
           "type": "string",
-          "enum": [
-            "parents"
-          ]
+          "const": "parents"
         },
         {
           "description": "Ban all relative imports.",
           "type": "string",
-          "enum": [
-            "all"
-          ]
+          "const": "all"
         }
       ]
     }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 4f3e8c5218..73328e053b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.89"
+channel = "1.90"
diff --git a/scripts/add_rule.py b/scripts/add_rule.py
index 400c5ac6ec..48ecd34736 100755
--- a/scripts/add_rule.py
+++ b/scripts/add_rule.py
@@ -109,6 +109,7 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// ```
 #[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "TODO: current version + 1")]
 pub(crate) struct {name};
 
 impl Violation for {name} {{
@@ -140,7 +141,7 @@ pub(crate) fn {rule_name_snake}(checker: &mut Checker) {{}}
         linter_name = linter.split(" ")[0].replace("-", "_")
         rule = f"""rules::{linter_name}::rules::{name}"""
         lines.append(
-            " " * 8 + f"""({variant}, "{code}") => (RuleGroup::Preview, {rule}),\n""",
+            " " * 8 + f"""({variant}, "{code}") => {rule},\n""",
         )
         lines.sort()
         text += "".join(lines)
diff --git a/scripts/benchmarks/pyproject.toml b/scripts/benchmarks/pyproject.toml
index 5ad99debbc..df9f38e5db 100644
--- a/scripts/benchmarks/pyproject.toml
+++ b/scripts/benchmarks/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "scripts"
-version = "0.12.9"
+version = "0.14.2"
 description = ""
 authors = ["Charles Marsh <charlie.r.marsh@gmail.com>"]
 
diff --git a/scripts/mypy_primer.sh b/scripts/mypy_primer.sh
index 05b9bc5ac7..c140721745 100755
--- a/scripts/mypy_primer.sh
+++ b/scripts/mypy_primer.sh
@@ -20,10 +20,11 @@ cd ..
 echo "Project selector: ${PRIMER_SELECTOR}"
 # Allow the exit code to be 0 or 1, only fail for actual mypy_primer crashes/bugs
 uvx \
-  --from="git+https://github.com/hauntsaninja/mypy_primer@a3798a3d7b8470603e650179b0f82deb2154364d" \
+  --from="git+https://github.com/hauntsaninja/mypy_primer@ab5d30e2d4ecdaf7d6cc89395c7130143d6d3c82" \
   mypy_primer \
   --repo ruff \
   --type-checker ty \
+  --cargo-profile profiling \
   --old base_commit \
   --new "${GITHUB_SHA}" \
   --project-selector "/($PRIMER_SELECTOR)\$" \
diff --git a/scripts/release.sh b/scripts/release.sh
index 0d0454f1ec..ad97c20c8a 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -11,14 +11,8 @@ project_root="$(dirname "$script_root")"
 
 echo "Updating metadata with rooster..."
 cd "$project_root"
-uv tool run --from 'rooster-blue>=0.0.7' --python 3.12 --isolated -- \
-    rooster release "$@"
+uvx --python 3.12 --isolated -- \
+    rooster@0.1.0 release "$@"
 
 echo "Updating lockfile..."
 cargo update -p ruff
-
-echo "Generating contributors list..."
-echo ""
-echo ""
-uv tool run --from 'rooster-blue>=0.0.7' --python 3.12 --isolated -- \
-    rooster contributors --quiet
diff --git a/scripts/update_schemastore.py b/scripts/update_schemastore.py
index 5ec1ff9d3b..5394e571be 100644
--- a/scripts/update_schemastore.py
+++ b/scripts/update_schemastore.py
@@ -117,11 +117,11 @@ def update_schemastore(
             f"This updates ruff's JSON schema to [{current_sha}]({commit_url})"
         )
         # https://stackoverflow.com/a/22909204/3549270
+        check_call(["git", "add", (src / RUFF_JSON).as_posix()], cwd=schemastore_path)
         check_call(
             [
                 "git",
                 "commit",
-                "-a",
                 "-m",
                 "Update ruff's JSON schema",
                 "-m",
diff --git a/ty.schema.json b/ty.schema.json
index c8b9668506..270241fb28 100644
--- a/ty.schema.json
+++ b/ty.schema.json
@@ -15,17 +15,18 @@
       ]
     },
     "overrides": {
-      "description": "Override configurations for specific file patterns.\n\nEach override specifies include/exclude patterns and rule configurations that apply to matching files. Multiple overrides can match the same file, with later overrides taking precedence.",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/OverrideOptions"
-      }
+      "description": "Override configurations for specific file patterns.\n\nEach override specifies include/exclude patterns and rule configurations\nthat apply to matching files. Multiple overrides can match the same file,\nwith later overrides taking precedence.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/OverridesOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "rules": {
-      "description": "Configures the enabled rules and their severity.\n\nSee [the rules documentation](https://ty.dev/rules) for a list of all available rules.\n\nValid severities are:\n\n* `ignore`: Disable the rule. * `warn`: Enable the rule and create a warning diagnostic. * `error`: Enable the rule and create an error diagnostic. ty will exit with a non-zero code if any error diagnostics are emitted.",
+      "description": "Configures the enabled rules and their severity.\n\nSee [the rules documentation](https://ty.dev/rules) for a list of all available rules.\n\nValid severities are:\n\n* `ignore`: Disable the rule.\n* `warn`: Enable the rule and create a warning diagnostic.\n* `error`: Enable the rule and create an error diagnostic.\n  ty will exit with a non-zero code if any error diagnostics are emitted.",
       "anyOf": [
         {
           "$ref": "#/definitions/Rules"
@@ -58,28 +59,38 @@
   },
   "additionalProperties": false,
   "definitions": {
+    "Array_of_string": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/string"
+      }
+    },
     "EnvironmentOptions": {
       "type": "object",
       "properties": {
         "extra-paths": {
-          "description": "List of user-provided paths that should take first priority in the module resolution. Examples in other type checkers are mypy's `MYPYPATH` environment variable, or pyright's `stubPath` configuration setting.",
+          "description": "User-provided paths that should take first priority in module resolution.\n\nThis is an advanced option that should usually only be used for first-party or third-party\nmodules that are not installed into your Python environment in a conventional way.\nUse the `python` option to specify the location of your Python environment.\n\nThis option is similar to mypy's `MYPYPATH` environment variable and pyright's `stubPath`\nconfiguration setting.",
           "type": [
             "array",
             "null"
           ],
           "items": {
-            "type": "string"
+            "$ref": "#/definitions/RelativePathBuf"
           }
         },
         "python": {
-          "description": "Path to the Python installation from which ty resolves type information and third-party dependencies.\n\nty will search in the path's `site-packages` directories for type information and third-party imports.\n\nThis option is commonly used to specify the path to a virtual environment.",
-          "type": [
-            "string",
-            "null"
+          "description": "Path to your project's Python environment or interpreter.\n\nty uses the `site-packages` directory of your project's Python environment\nto resolve third-party (and, in some cases, first-party) imports in your code.\n\nIf you're using a project management tool such as uv, you should not generally need\nto specify this option, as commands such as `uv run` will set the `VIRTUAL_ENV`\nenvironment variable to point to your project's virtual environment. ty can also infer\nthe location of your environment from an activated Conda environment, and will look for\na `.venv` directory in the project root if none of the above apply.\n\nPassing a path to a Python executable is supported, but passing a path to a dynamic executable\n(such as a shim) is not currently supported.\n\nThis option can be used to point to virtual or system Python environments.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RelativePathBuf"
+            },
+            {
+              "type": "null"
+            }
           ]
         },
         "python-platform": {
-          "description": "Specifies the target platform that will be used to analyze the source code. If specified, ty will understand conditions based on comparisons with `sys.platform`, such as are commonly found in typeshed to reflect the differing contents of the standard library across platforms. If `all` is specified, ty will assume that the source code can run on any platform.\n\nIf no platform is specified, ty will use the current platform: - `win32` for Windows - `darwin` for macOS - `android` for Android - `ios` for iOS - `linux` for everything else",
+          "description": "Specifies the target platform that will be used to analyze the source code.\nIf specified, ty will understand conditions based on comparisons with `sys.platform`, such\nas are commonly found in typeshed to reflect the differing contents of the standard library across platforms.\nIf `all` is specified, ty will assume that the source code can run on any platform.\n\nIf no platform is specified, ty will use the current platform:\n- `win32` for Windows\n- `darwin` for macOS\n- `android` for Android\n- `ios` for iOS\n- `linux` for everything else",
           "anyOf": [
             {
               "$ref": "#/definitions/PythonPlatform"
@@ -90,7 +101,7 @@
           ]
         },
         "python-version": {
-          "description": "Specifies the version of Python that will be used to analyze the source code. The version should be specified as a string in the format `M.m` where `M` is the major version and `m` is the minor (e.g. `\"3.0\"` or `\"3.6\"`). If a version is provided, ty will generate errors if the source code makes use of language features that are not supported in that version.\n\nIf a version is not specified, ty will try the following techniques in order of preference to determine a value: 1. Check for the `project.requires-python` setting in a `pyproject.toml` file and use the minimum version from the specified range 2. Check for an activated or configured Python environment and attempt to infer the Python version of that environment 3. Fall back to the default value (see below)\n\nFor some language features, ty can also understand conditionals based on comparisons with `sys.version_info`. These are commonly found in typeshed, for example, to reflect the differing contents of the standard library across Python versions.",
+          "description": "Specifies the version of Python that will be used to analyze the source code.\nThe version should be specified as a string in the format `M.m` where `M` is the major version\nand `m` is the minor (e.g. `\"3.0\"` or `\"3.6\"`).\nIf a version is provided, ty will generate errors if the source code makes use of language features\nthat are not supported in that version.\n\nIf a version is not specified, ty will try the following techniques in order of preference\nto determine a value:\n1. Check for the `project.requires-python` setting in a `pyproject.toml` file\n   and use the minimum version from the specified range\n2. Check for an activated or configured Python environment\n   and attempt to infer the Python version of that environment\n3. Fall back to the default value (see below)\n\nFor some language features, ty can also understand conditionals based on comparisons\nwith `sys.version_info`. These are commonly found in typeshed, for example,\nto reflect the differing contents of the standard library across Python versions.",
           "anyOf": [
             {
               "$ref": "#/definitions/PythonVersion"
@@ -101,20 +112,24 @@
           ]
         },
         "root": {
-          "description": "The root paths of the project, used for finding first-party modules.\n\nAccepts a list of directory paths searched in priority order (first has highest priority).\n\nIf left unspecified, ty will try to detect common project layouts and initialize `root` accordingly:\n\n* if a `./src` directory exists, include `.` and `./src` in the first party search path (src layout or flat) * if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path * otherwise, default to `.` (flat layout)\n\nBesides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file), it will also be included in the first party search path.",
+          "description": "The root paths of the project, used for finding first-party modules.\n\nAccepts a list of directory paths searched in priority order (first has highest priority).\n\nIf left unspecified, ty will try to detect common project layouts and initialize `root` accordingly:\n\n* if a `./src` directory exists, include `.` and `./src` in the first party search path (src layout or flat)\n* if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path\n* otherwise, default to `.` (flat layout)\n\nBesides, if a `./python` or `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` or `__init__.pyi` file),\nit will also be included in the first party search path.",
           "type": [
             "array",
             "null"
           ],
           "items": {
-            "type": "string"
+            "$ref": "#/definitions/RelativePathBuf"
           }
         },
         "typeshed": {
-          "description": "Optional path to a \"typeshed\" directory on disk for us to use for standard-library types. If this is not provided, we will fallback to our vendored typeshed stubs for the stdlib, bundled as a zip file in the binary",
-          "type": [
-            "string",
-            "null"
+          "description": "Optional path to a \"typeshed\" directory on disk for us to use for standard-library types.\nIf this is not provided, we will fallback to our vendored typeshed stubs for the stdlib,\nbundled as a zip file in the binary",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RelativePathBuf"
+            },
+            {
+              "type": "null"
+            }
           ]
         }
       },
@@ -126,25 +141,19 @@
           "title": "Ignore",
           "description": "The lint is disabled and should not run.",
           "type": "string",
-          "enum": [
-            "ignore"
-          ]
+          "const": "ignore"
         },
         {
           "title": "Warn",
           "description": "The lint is enabled and diagnostic should have a warning severity.",
           "type": "string",
-          "enum": [
-            "warn"
-          ]
+          "const": "warn"
         },
         {
           "title": "Error",
           "description": "The lint is enabled and diagnostics have an error severity.",
           "type": "string",
-          "enum": [
-            "error"
-          ]
+          "const": "error"
         }
       ]
     },
@@ -152,18 +161,24 @@
       "description": "The diagnostic output format.",
       "oneOf": [
         {
-          "description": "The default full mode will print \"pretty\" diagnostics.\n\nThat is, color will be used when printing to a `tty`. Moreover, diagnostic messages may include additional context and annotations on the input to help understand the message.",
+          "description": "The default full mode will print \"pretty\" diagnostics.\n\nThat is, color will be used when printing to a `tty`.\nMoreover, diagnostic messages may include additional\ncontext and annotations on the input to help understand\nthe message.",
           "type": "string",
-          "enum": [
-            "full"
-          ]
+          "const": "full"
         },
         {
-          "description": "Print diagnostics in a concise mode.\n\nThis will guarantee that each diagnostic is printed on a single line. Only the most important or primary aspects of the diagnostic are included. Contextual information is dropped.\n\nThis may use color when printing to a `tty`.",
+          "description": "Print diagnostics in a concise mode.\n\nThis will guarantee that each diagnostic is printed on\na single line. Only the most important or primary aspects\nof the diagnostic are included. Contextual information is\ndropped.\n\nThis may use color when printing to a `tty`.",
           "type": "string",
-          "enum": [
-            "concise"
-          ]
+          "const": "concise"
+        },
+        {
+          "description": "Print diagnostics in the JSON format expected by GitLab [Code Quality] reports.\n\n[Code Quality]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format",
+          "type": "string",
+          "const": "gitlab"
+        },
+        {
+          "description": "Print diagnostics in the format used by [GitHub Actions] workflow error annotations.\n\n[GitHub Actions]: https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#setting-an-error-message",
+          "type": "string",
+          "const": "github"
         }
       ]
     },
@@ -171,27 +186,29 @@
       "type": "object",
       "properties": {
         "exclude": {
-          "description": "A list of file and directory patterns to exclude from this override.\n\nPatterns follow a syntax similar to `.gitignore`. Exclude patterns take precedence over include patterns within the same override.\n\nIf not specified, defaults to `[]` (excludes no files).",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
+          "description": "A list of file and directory patterns to exclude from this override.\n\nPatterns follow a syntax similar to `.gitignore`.\nExclude patterns take precedence over include patterns within the same override.\n\nIf not specified, defaults to `[]` (excludes no files).",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Array_of_string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "include": {
-          "description": "A list of file and directory patterns to include for this override.\n\nThe `include` option follows a similar syntax to `.gitignore` but reversed: Including a file or directory will make it so that it (and its contents) are affected by this override.\n\nIf not specified, defaults to `[\"**\"]` (matches all files).",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
+          "description": "A list of file and directory patterns to include for this override.\n\nThe `include` option follows a similar syntax to `.gitignore` but reversed:\nIncluding a file or directory will make it so that it (and its contents)\nare affected by this override.\n\nIf not specified, defaults to `[\"**\"]` (matches all files).",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Array_of_string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "rules": {
-          "description": "Rule overrides for files matching the include/exclude patterns.\n\nThese rules will be merged with the global rules, with override rules taking precedence for matching files. You can set rules to different severity levels or disable them entirely.",
+          "description": "Rule overrides for files matching the include/exclude patterns.\n\nThese rules will be merged with the global rules, with override rules\ntaking precedence for matching files. You can set rules to different\nseverity levels or disable them entirely.",
           "anyOf": [
             {
               "$ref": "#/definitions/Rules"
@@ -204,6 +221,13 @@
       },
       "additionalProperties": false
     },
+    "OverridesOptions": {
+      "description": "Configuration override that applies to specific files based on glob patterns.\n\nAn override allows you to apply different rule configurations to specific\nfiles or directories. Multiple overrides can match the same file, with\nlater overrides take precedence.\n\n### Precedence\n\n- Later overrides in the array take precedence over earlier ones\n- Override rules take precedence over global rules for matching files\n\n### Examples\n\n```toml\n# Relax rules for test files\n[[tool.ty.overrides]]\ninclude = [\"tests/**\", \"**/test_*.py\"]\n\n[tool.ty.overrides.rules]\npossibly-unresolved-reference = \"warn\"\n\n# Ignore generated files but still check important ones\n[[tool.ty.overrides]]\ninclude = [\"generated/**\"]\nexclude = [\"generated/important.py\"]\n\n[tool.ty.overrides.rules]\npossibly-unresolved-reference = \"ignore\"\n```",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/OverrideOptions"
+      }
+    },
     "PythonPlatform": {
       "description": "The target platform to assume when resolving types.\n",
       "anyOf": [
@@ -268,6 +292,14 @@
         }
       ]
     },
+    "RelativePathBuf": {
+      "description": "A possibly relative path in a configuration file.\n\nRelative paths in configuration files or from CLI options\nrequire different anchoring:\n\n* CLI: The path is relative to the current working directory\n* Configuration file: The path is relative to the project's root.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/SystemPathBuf"
+        }
+      ]
+    },
     "Rules": {
       "type": "object",
       "properties": {
@@ -401,6 +433,16 @@
             }
           ]
         },
+        "ignore-comment-unknown-rule": {
+          "title": "detects `ty: ignore` comments that reference unknown rules",
+          "description": "## What it does\nChecks for `ty: ignore[code]` where `code` isn't a known lint rule.\n\n## Why is this bad?\nA `ty: ignore[code]` directive with a `code` that doesn't match\nany known rule will not suppress any type errors, and is probably a mistake.\n\n## Examples\n```py\na = 20 / 0  # ty: ignore[division-by-zer]\n```\n\nUse instead:\n\n```py\na = 20 / 0  # ty: ignore[division-by-zero]\n```",
+          "default": "warn",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Level"
+            }
+          ]
+        },
         "implicit-concatenated-string-type-annotation": {
           "title": "detects implicit concatenated strings in type annotations",
           "description": "## What it does\nChecks for implicit concatenated strings in type annotation positions.\n\n## Why is this bad?\nStatic analysis tools like ty can't analyze type annotations that use implicit concatenated strings.\n\n## Examples\n```python\ndef test(): -> \"Literal[\" \"5\" \"]\":\n    ...\n```\n\nUse instead:\n```python\ndef test(): -> \"Literal[5]\":\n    ...\n```",
@@ -433,7 +475,7 @@
         },
         "instance-layout-conflict": {
           "title": "detects class definitions that raise `TypeError` due to instance layout conflict",
-          "description": "## What it does\nChecks for classes definitions which will fail at runtime due to\n\"instance memory layout conflicts\".\n\nThis error is usually caused by attempting to combine multiple classes\nthat define non-empty `__slots__` in a class's [Method Resolution Order]\n(MRO), or by attempting to combine multiple builtin classes in a class's\nMRO.\n\n## Why is this bad?\nInheriting from bases with conflicting instance memory layouts\nwill lead to a `TypeError` at runtime.\n\nAn instance memory layout conflict occurs when CPython cannot determine\nthe memory layout instances of a class should have, because the instance\nmemory layout of one of its bases conflicts with the instance memory layout\nof one or more of its other bases.\n\nFor example, if a Python class defines non-empty `__slots__`, this will\nimpact the memory layout of instances of that class. Multiple inheritance\nfrom more than one different class defining non-empty `__slots__` is not\nallowed:\n\n```python\nclass A:\n    __slots__ = (\"a\", \"b\")\n\nclass B:\n    __slots__ = (\"a\", \"b\")  # Even if the values are the same\n\n# TypeError: multiple bases have instance lay-out conflict\nclass C(A, B): ...\n```\n\nAn instance layout conflict can also be caused by attempting to use\nmultiple inheritance with two builtin classes, due to the way that these\nclasses are implemented in a CPython C extension:\n\n```python\nclass A(int, float): ...  # TypeError: multiple bases have instance lay-out conflict\n```\n\nNote that pure-Python classes with no `__slots__`, or pure-Python classes\nwith empty `__slots__`, are always compatible:\n\n```python\nclass A: ...\nclass B:\n    __slots__ = ()\nclass C:\n    __slots__ = (\"a\", \"b\")\n\n# fine\nclass D(A, B, C): ...\n```\n\n## Known problems\nClasses that have \"dynamic\" definitions of `__slots__` (definitions do not consist\nof string literals, or tuples of string literals) are not currently considered solid\nbases by ty.\n\nAdditionally, this check is not exhaustive: many C extensions (including several in\nthe standard library) define classes that use extended memory layouts and thus cannot\ncoexist in a single MRO. Since it is currently not possible to represent this fact in\nstub files, having a full knowledge of these classes is also impossible. When it comes\nto classes that do not define `__slots__` at the Python level, therefore, ty, currently\nonly hard-codes a number of cases where it knows that a class will produce instances with\nan atypical memory layout.\n\n## Further reading\n- [CPython documentation: `__slots__`](https://docs.python.org/3/reference/datamodel.html#slots)\n- [CPython documentation: Method Resolution Order](https://docs.python.org/3/glossary.html#term-method-resolution-order)\n\n[Method Resolution Order]: https://docs.python.org/3/glossary.html#term-method-resolution-order",
+          "description": "## What it does\nChecks for classes definitions which will fail at runtime due to\n\"instance memory layout conflicts\".\n\nThis error is usually caused by attempting to combine multiple classes\nthat define non-empty `__slots__` in a class's [Method Resolution Order]\n(MRO), or by attempting to combine multiple builtin classes in a class's\nMRO.\n\n## Why is this bad?\nInheriting from bases with conflicting instance memory layouts\nwill lead to a `TypeError` at runtime.\n\nAn instance memory layout conflict occurs when CPython cannot determine\nthe memory layout instances of a class should have, because the instance\nmemory layout of one of its bases conflicts with the instance memory layout\nof one or more of its other bases.\n\nFor example, if a Python class defines non-empty `__slots__`, this will\nimpact the memory layout of instances of that class. Multiple inheritance\nfrom more than one different class defining non-empty `__slots__` is not\nallowed:\n\n```python\nclass A:\n    __slots__ = (\"a\", \"b\")\n\nclass B:\n    __slots__ = (\"a\", \"b\")  # Even if the values are the same\n\n# TypeError: multiple bases have instance lay-out conflict\nclass C(A, B): ...\n```\n\nAn instance layout conflict can also be caused by attempting to use\nmultiple inheritance with two builtin classes, due to the way that these\nclasses are implemented in a CPython C extension:\n\n```python\nclass A(int, float): ...  # TypeError: multiple bases have instance lay-out conflict\n```\n\nNote that pure-Python classes with no `__slots__`, or pure-Python classes\nwith empty `__slots__`, are always compatible:\n\n```python\nclass A: ...\nclass B:\n    __slots__ = ()\nclass C:\n    __slots__ = (\"a\", \"b\")\n\n# fine\nclass D(A, B, C): ...\n```\n\n## Known problems\nClasses that have \"dynamic\" definitions of `__slots__` (definitions do not consist\nof string literals, or tuples of string literals) are not currently considered disjoint\nbases by ty.\n\nAdditionally, this check is not exhaustive: many C extensions (including several in\nthe standard library) define classes that use extended memory layouts and thus cannot\ncoexist in a single MRO. Since it is currently not possible to represent this fact in\nstub files, having a full knowledge of these classes is also impossible. When it comes\nto classes that do not define `__slots__` at the Python level, therefore, ty, currently\nonly hard-codes a number of cases where it knows that a class will produce instances with\nan atypical memory layout.\n\n## Further reading\n- [CPython documentation: `__slots__`](https://docs.python.org/3/reference/datamodel.html#slots)\n- [CPython documentation: Method Resolution Order](https://docs.python.org/3/glossary.html#term-method-resolution-order)\n\n[Method Resolution Order]: https://docs.python.org/3/glossary.html#term-method-resolution-order",
           "default": "error",
           "oneOf": [
             {
@@ -721,6 +763,16 @@
             }
           ]
         },
+        "missing-typed-dict-key": {
+          "title": "detects missing required keys in `TypedDict` constructors",
+          "description": "## What it does\nDetects missing required keys in `TypedDict` constructor calls.\n\n## Why is this bad?\n`TypedDict` requires all non-optional keys to be provided during construction.\nMissing items can lead to a `KeyError` at runtime.\n\n## Example\n```python\nfrom typing import TypedDict\n\nclass Person(TypedDict):\n    name: str\n    age: int\n\nalice: Person = {\"name\": \"Alice\"}  # missing required key 'age'\n\nalice[\"age\"]  # KeyError\n```",
+          "default": "error",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Level"
+            }
+          ]
+        },
         "no-matching-overload": {
           "title": "detects calls that do not match any overload",
           "description": "## What it does\nChecks for calls to an overloaded function that do not match any of the overloads.\n\n## Why is this bad?\nFailing to provide the correct arguments to one of the overloads will raise a `TypeError`\nat runtime.\n\n## Examples\n```python\n@overload\ndef func(x: int): ...\n@overload\ndef func(x: bool): ...\nfunc(\"string\")  # error: [no-matching-overload]\n```",
@@ -761,9 +813,19 @@
             }
           ]
         },
-        "possibly-unbound-attribute": {
-          "title": "detects references to possibly unbound attributes",
-          "description": "## What it does\nChecks for possibly unbound attributes.\n\n## Why is this bad?\nAttempting to access an unbound attribute will raise an `AttributeError` at runtime.\n\n## Examples\n```python\nclass A:\n    if b:\n        c = 0\n\nA.c  # AttributeError: type object 'A' has no attribute 'c'\n```",
+        "positional-only-parameter-as-kwarg": {
+          "title": "detects positional-only parameters passed as keyword arguments",
+          "description": "## What it does\nChecks for keyword arguments in calls that match positional-only parameters of the callable.\n\n## Why is this bad?\nProviding a positional-only parameter as a keyword argument will raise `TypeError` at runtime.\n\n## Example\n\n```python\ndef f(x: int, /) -> int: ...\n\nf(x=1)  # Error raised here\n```",
+          "default": "error",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Level"
+            }
+          ]
+        },
+        "possibly-missing-attribute": {
+          "title": "detects references to possibly missing attributes",
+          "description": "## What it does\nChecks for possibly missing attributes.\n\n## Why is this bad?\nAttempting to access a missing attribute will raise an `AttributeError` at runtime.\n\n## Examples\n```python\nclass A:\n    if b:\n        c = 0\n\nA.c  # AttributeError: type object 'A' has no attribute 'c'\n```",
           "default": "warn",
           "oneOf": [
             {
@@ -771,9 +833,9 @@
             }
           ]
         },
-        "possibly-unbound-implicit-call": {
-          "title": "detects implicit calls to possibly unbound methods",
-          "description": "## What it does\nChecks for implicit calls to possibly unbound methods.\n\n## Why is this bad?\nExpressions such as `x[y]` and `x * y` call methods\nunder the hood (`__getitem__` and `__mul__` respectively).\nCalling an unbound method will raise an `AttributeError` at runtime.\n\n## Examples\n```python\nimport datetime\n\nclass A:\n    if datetime.date.today().weekday() != 6:\n        def __getitem__(self, v): ...\n\nA()[0]  # TypeError: 'A' object is not subscriptable\n```",
+        "possibly-missing-implicit-call": {
+          "title": "detects implicit calls to possibly missing methods",
+          "description": "## What it does\nChecks for implicit calls to possibly missing methods.\n\n## Why is this bad?\nExpressions such as `x[y]` and `x * y` call methods\nunder the hood (`__getitem__` and `__mul__` respectively).\nCalling a missing method will raise an `AttributeError` at runtime.\n\n## Examples\n```python\nimport datetime\n\nclass A:\n    if datetime.date.today().weekday() != 6:\n        def __getitem__(self, v): ...\n\nA()[0]  # TypeError: 'A' object is not subscriptable\n```",
           "default": "warn",
           "oneOf": [
             {
@@ -781,9 +843,9 @@
             }
           ]
         },
-        "possibly-unbound-import": {
-          "title": "detects possibly unbound imports",
-          "description": "## What it does\nChecks for imports of symbols that may be unbound.\n\n## Why is this bad?\nImporting an unbound module or name will raise a `ModuleNotFoundError`\nor `ImportError` at runtime.\n\n## Examples\n```python\n# module.py\nimport datetime\n\nif datetime.date.today().weekday() != 6:\n    a = 1\n\n# main.py\nfrom module import a  # ImportError: cannot import name 'a' from 'module'\n```",
+        "possibly-missing-import": {
+          "title": "detects possibly missing imports",
+          "description": "## What it does\nChecks for imports of symbols that may be missing.\n\n## Why is this bad?\nImporting a missing module or name will raise a `ModuleNotFoundError`\nor `ImportError` at runtime.\n\n## Examples\n```python\n# module.py\nimport datetime\n\nif datetime.date.today().weekday() != 6:\n    a = 1\n\n# main.py\nfrom module import a  # ImportError: cannot import name 'a' from 'module'\n```",
           "default": "warn",
           "oneOf": [
             {
@@ -891,16 +953,6 @@
             }
           ]
         },
-        "unknown-rule": {
-          "title": "detects `ty: ignore` comments that reference unknown rules",
-          "description": "## What it does\nChecks for `ty: ignore[code]` where `code` isn't a known lint rule.\n\n## Why is this bad?\nA `ty: ignore[code]` directive with a `code` that doesn't match\nany known rule will not suppress any type errors, and is probably a mistake.\n\n## Examples\n```py\na = 20 / 0  # ty: ignore[division-by-zer]\n```\n\nUse instead:\n\n```py\na = 20 / 0  # ty: ignore[division-by-zero]\n```",
-          "default": "warn",
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Level"
-            }
-          ]
-        },
         "unresolved-attribute": {
           "title": "detects references to unresolved attributes",
           "description": "## What it does\nChecks for unresolved attributes.\n\n## Why is this bad?\nAccessing an unbound attribute will raise an `AttributeError` at runtime.\nAn unresolved attribute is not guaranteed to exist from the type alone,\nso this could also indicate that the object is not of the type that the user expects.\n\n## Examples\n```python\nclass A: ...\n\nA().foo  # AttributeError: 'A' object has no attribute 'foo'\n```",
@@ -913,7 +965,7 @@
         },
         "unresolved-global": {
           "title": "detects `global` statements with no definition in the global scope",
-          "description": "## What it does\nDetects variables declared as `global` in an inner scope that have no explicit\nbindings or declarations in the global scope.\n\n## Why is this bad?\nFunction bodies with `global` statements can run in any order (or not at all), which makes\nit hard for static analysis tools to infer the types of globals without\nexplicit definitions or declarations.\n\n## Example\n```python\ndef f():\n    global x  # unresolved global\n    x = 42\n\ndef g():\n    print(x)  # unresolved reference\n```\n\nUse instead:\n```python\nx: int\n\ndef f():\n    global x\n    x = 42\n\ndef g():\n    print(x)\n```\n\nOr:\n```python\nx: int | None = None\n\ndef f():\n    global x\n    x = 42\n\ndef g():\n    print(x)\n```",
+          "description": "## What it does\nDetects variables declared as `global` in an inner scope that have no explicit\nbindings or declarations in the global scope.\n\n## Why is this bad?\nFunction bodies with `global` statements can run in any order (or not at all), which makes\nit hard for static analysis tools to infer the types of globals without\nexplicit definitions or declarations.\n\n## Example\n```python\ndef f():\n    global x  # unresolved global\n    x = 42\n\ndef g():\n    print(x)  # unresolved reference\n```\n\nUse instead:\n\n```python\nx: int\n\ndef f():\n    global x\n    x = 42\n\ndef g():\n    print(x)\n```\n\nOr:\n\n```python\nx: int | None = None\n\ndef f():\n    global x\n    x = 42\n\ndef g():\n    print(x)\n```",
           "default": "warn",
           "oneOf": [
             {
@@ -981,6 +1033,16 @@
             }
           ]
         },
+        "useless-overload-body": {
+          "title": "detects `@overload`-decorated functions with non-stub bodies",
+          "description": "## What it does\nChecks for various `@overload`-decorated functions that have non-stub bodies.\n\n## Why is this bad?\nFunctions decorated with `@overload` are ignored at runtime; they are overridden\nby the implementation function that follows the series of overloads. While it is\nnot illegal to provide a body for an `@overload`-decorated function, it may indicate\na misunderstanding of how the `@overload` decorator works.\n\n## Example\n\n```py\nfrom typing import overload\n\n@overload\ndef foo(x: int) -> int:\n    return x + 1  # will never be executed\n\n@overload\ndef foo(x: str) -> str:\n    return \"Oh no, got a string\"  # will never be executed\n\ndef foo(x: int | str) -> int | str:\n    raise Exception(\"unexpected type encountered\")\n```\n\nUse instead:\n\n```py\nfrom typing import assert_never, overload\n\n@overload\ndef foo(x: int) -> int: ...\n\n@overload\ndef foo(x: str) -> str: ...\n\ndef foo(x: int | str) -> int | str:\n    if isinstance(x, int):\n        return x + 1\n    elif isinstance(x, str):\n        return \"Oh no, got a string\"\n    else:\n        assert_never(x)\n```\n\n## References\n- [Python documentation: `@overload`](https://docs.python.org/3/library/typing.html#typing.overload)",
+          "default": "warn",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Level"
+            }
+          ]
+        },
         "zero-stepsize-in-slice": {
           "title": "detects a slice step size of zero",
           "description": "## What it does\nChecks for step size 0 in slices.\n\n## Why is this bad?\nA slice with a step size of zero will raise a `ValueError` at runtime.\n\n## Examples\n```python\nl = list(range(10))\nl[1:10:0]  # ValueError: slice step cannot be zero\n```",
@@ -1000,43 +1062,53 @@
       "type": "object",
       "properties": {
         "exclude": {
-          "description": "A list of file and directory patterns to exclude from type checking.\n\nPatterns follow a syntax similar to `.gitignore`:\n\n- `./src/` matches only a directory - `./src` matches both files and directories - `src` matches files or directories named `src` - `*` matches any (possibly empty) sequence of characters (except `/`). - `**` matches zero or more path components. This sequence **must** form a single path component, so both `**a` and `b**` are invalid and will result in an error. A sequence of more than two consecutive `*` characters is also invalid. - `?` matches any single character except `/` - `[abc]` matches any character inside the brackets. Character sequences can also specify ranges of characters, as ordered by Unicode, so e.g. `[0-9]` specifies any character between `0` and `9` inclusive. An unclosed bracket is invalid. - `!pattern` negates a pattern (undoes the exclusion of files that would otherwise be excluded)\n\nAll paths are anchored relative to the project root (`src` only matches `<project_root>/src` and not `<project_root>/test/src`). To exclude any directory or file named `src`, use `**/src` instead.\n\nBy default, ty excludes commonly ignored directories:\n\n- `**/.bzr/` - `**/.direnv/` - `**/.eggs/` - `**/.git/` - `**/.git-rewrite/` - `**/.hg/` - `**/.mypy_cache/` - `**/.nox/` - `**/.pants.d/` - `**/.pytype/` - `**/.ruff_cache/` - `**/.svn/` - `**/.tox/` - `**/.venv/` - `**/__pypackages__/` - `**/_build/` - `**/buck-out/` - `**/dist/` - `**/node_modules/` - `**/venv/`\n\nYou can override any default exclude by using a negated pattern. For example, to re-include `dist` use `exclude = [\"!dist\"]`",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
+          "description": "A list of file and directory patterns to exclude from type checking.\n\nPatterns follow a syntax similar to `.gitignore`:\n\n- `./src/` matches only a directory\n- `./src` matches both files and directories\n- `src` matches files or directories named `src`\n- `*` matches any (possibly empty) sequence of characters (except `/`).\n- `**` matches zero or more path components.\n  This sequence **must** form a single path component, so both `**a` and `b**` are invalid and will result in an error.\n  A sequence of more than two consecutive `*` characters is also invalid.\n- `?` matches any single character except `/`\n- `[abc]` matches any character inside the brackets. Character sequences can also specify ranges of characters, as ordered by Unicode,\n  so e.g. `[0-9]` specifies any character between `0` and `9` inclusive. An unclosed bracket is invalid.\n- `!pattern` negates a pattern (undoes the exclusion of files that would otherwise be excluded)\n\nAll paths are anchored relative to the project root (`src` only\nmatches `<project_root>/src` and not `<project_root>/test/src`).\nTo exclude any directory or file named `src`, use `**/src` instead.\n\nBy default, ty excludes commonly ignored directories:\n\n- `**/.bzr/`\n- `**/.direnv/`\n- `**/.eggs/`\n- `**/.git/`\n- `**/.git-rewrite/`\n- `**/.hg/`\n- `**/.mypy_cache/`\n- `**/.nox/`\n- `**/.pants.d/`\n- `**/.pytype/`\n- `**/.ruff_cache/`\n- `**/.svn/`\n- `**/.tox/`\n- `**/.venv/`\n- `**/__pypackages__/`\n- `**/_build/`\n- `**/buck-out/`\n- `**/dist/`\n- `**/node_modules/`\n- `**/venv/`\n\nYou can override any default exclude by using a negated pattern. For example,\nto re-include `dist` use `exclude = [\"!dist\"]`",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Array_of_string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "include": {
-          "description": "A list of files and directories to check. The `include` option follows a similar syntax to `.gitignore` but reversed: Including a file or directory will make it so that it (and its contents) are type checked.\n\n- `./src/` matches only a directory - `./src` matches both files and directories - `src` matches a file or directory named `src` - `*` matches any (possibly empty) sequence of characters (except `/`). - `**` matches zero or more path components. This sequence **must** form a single path component, so both `**a` and `b**` are invalid and will result in an error. A sequence of more than two consecutive `*` characters is also invalid. - `?` matches any single character except `/` - `[abc]` matches any character inside the brackets. Character sequences can also specify ranges of characters, as ordered by Unicode, so e.g. `[0-9]` specifies any character between `0` and `9` inclusive. An unclosed bracket is invalid.\n\nAll paths are anchored relative to the project root (`src` only matches `<project_root>/src` and not `<project_root>/test/src`).\n\n`exclude` takes precedence over `include`.",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
+          "description": "A list of files and directories to check. The `include` option\nfollows a similar syntax to `.gitignore` but reversed:\nIncluding a file or directory will make it so that it (and its contents)\nare type checked.\n\n- `./src/` matches only a directory\n- `./src` matches both files and directories\n- `src` matches a file or directory named `src`\n- `*` matches any (possibly empty) sequence of characters (except `/`).\n- `**` matches zero or more path components.\n  This sequence **must** form a single path component, so both `**a` and `b**` are invalid and will result in an error.\n  A sequence of more than two consecutive `*` characters is also invalid.\n- `?` matches any single character except `/`\n- `[abc]` matches any character inside the brackets. Character sequences can also specify ranges of characters, as ordered by Unicode,\n  so e.g. `[0-9]` specifies any character between `0` and `9` inclusive. An unclosed bracket is invalid.\n\nAll paths are anchored relative to the project root (`src` only\nmatches `<project_root>/src` and not `<project_root>/test/src`).\n\n`exclude` takes precedence over `include`.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Array_of_string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "respect-ignore-files": {
-          "description": "Whether to automatically exclude files that are ignored by `.ignore`, `.gitignore`, `.git/info/exclude`, and global `gitignore` files. Enabled by default.",
+          "description": "Whether to automatically exclude files that are ignored by `.ignore`,\n`.gitignore`, `.git/info/exclude`, and global `gitignore` files.\nEnabled by default.",
           "type": [
             "boolean",
             "null"
           ]
         },
         "root": {
-          "description": "The root of the project, used for finding first-party modules.\n\nIf left unspecified, ty will try to detect common project layouts and initialize `src.root` accordingly:\n\n* if a `./src` directory exists, include `.` and `./src` in the first party search path (src layout or flat) * if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path * otherwise, default to `.` (flat layout)\n\nBesides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file), it will also be included in the first party search path.",
-          "deprecated": true,
-          "type": [
-            "string",
-            "null"
-          ]
+          "description": "The root of the project, used for finding first-party modules.\n\nIf left unspecified, ty will try to detect common project layouts and initialize `src.root` accordingly:\n\n* if a `./src` directory exists, include `.` and `./src` in the first party search path (src layout or flat)\n* if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path\n* otherwise, default to `.` (flat layout)\n\nBesides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file),\nit will also be included in the first party search path.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RelativePathBuf"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "deprecated": true
         }
       },
       "additionalProperties": false
     },
+    "SystemPathBuf": {
+      "description": "An owned, mutable path on [`System`](`super::System`) (akin to [`String`]).\n\nThe path is guaranteed to be valid UTF-8.",
+      "type": "string"
+    },
     "TerminalOptions": {
       "type": "object",
       "properties": {
@@ -1060,6 +1132,9 @@
         }
       },
       "additionalProperties": false
+    },
+    "string": {
+      "type": "string"
     }
   }
 }
\ No newline at end of file